Show confirmation message when closing a window that took a long time to compare...

diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index ff32977..b44270d 100644 (file)
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -52,6 +52,9 @@ using boost::begin;
 using boost::end;
 
 int CDirDoc::m_nDirsTemp = 2;
+// If a folder comparison takes longer than this threshold,
+// display a confirmation message when closing the folder comparison window.
+static constexpr int COMPARISON_TIME_THRESHOLD_SECONDS = 30;
 
 /////////////////////////////////////////////////////////////////////////////
 // CDirDoc
@@ -69,6 +72,8 @@ CDirDoc::CDirDoc()
 , m_pTempPathContext(nullptr)
 , m_bGeneratingReport(false)
 , m_pReport(nullptr)
+, m_compareStart(0)
+, m_elapsed(0)
 {
        m_nDirs = m_nDirsTemp;
 
@@ -222,6 +227,8 @@ void CDirDoc::LoadSubstitutionFiltersList(CDiffContext* pCtxt)
 
 void CDirDoc::DiffThreadCallback(int& state)
 {
+       if (state == CDiffThread::EVENT_COMPARE_COMPLETED)
+               m_elapsed = clock() - m_compareStart;
        PostMessage(m_pDirView->GetSafeHwnd(), MSG_UI_UPDATE, state, false);
 }
 
@@ -284,7 +291,8 @@ void CDirDoc::Rescan()
 
        if (!m_bGeneratingReport)
                m_pCompareStats->Reset();
-       m_pDirView->StartCompare(m_pCompareStats.get());
+
+       m_compareStart = clock();
 
        if (m_pCmpProgressBar == nullptr)
                m_pCmpProgressBar.reset(new DirCompProgressBar());
@@ -645,7 +653,7 @@ BOOL CDirDoc::SaveModified()
        // Do not allow closing if there is a thread running
        if (m_diffThread.GetThreadState() == CDiffThread::THREAD_COMPARING)
        {
-               int ans = LangMessageBox(IDS_CONFIRM_CLOSE_WINDOW, MB_YESNO | MB_ICONWARNING);
+               int ans = LangMessageBox(IDS_CONFIRM_CLOSE_WINDOW_COMPARING, MB_YESNO | MB_ICONWARNING);
                if (ans == IDNO)
                        return FALSE;
                m_diffThread.Abort();
@@ -653,7 +661,14 @@ BOOL CDirDoc::SaveModified()
                        Sleep(50);
                CompareReady();
        }
-       
+
+       if (m_elapsed >= COMPARISON_TIME_THRESHOLD_SECONDS * 1000)
+       {
+               int ans = LangMessageBox(IDS_CONFIRM_CLOSE_WINDOW_LONG_COMPARISON, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN);
+               if (ans == IDNO)
+                       return FALSE;
+       }
+
        return CDocument::SaveModified();
 }
 

diff --git a/Src/DirDoc.h b/Src/DirDoc.h
index 5c4ed0e..84454a0 100644 (file)
--- a/Src/DirDoc.h
+++ b/Src/DirDoc.h
@@ -86,6 +86,7 @@ public:
        bool HasDirView() const { return m_pDirView != nullptr; }
        void RefreshOptions();
        void CompareReady();
+       clock_t GetElapsedTime() const { return m_elapsed; }
        void UpdateChangedItem(const PathContext & paths,
                UINT nDiffs, UINT nTrivialDiffs, bool bIdentical);
        void UpdateResources();
@@ -157,6 +158,8 @@ private:
        std::unique_ptr<DirCmpReport> m_pReport;
        FileFilterHelper m_fileHelper; /**< File filter helper */
        std::unique_ptr<DirCompProgressBar> m_pCmpProgressBar;
+       clock_t m_compareStart; /**< Starting process time of the compare */
+       clock_t m_elapsed; /**< Elapsed time of the compare */
 };
 
 /**

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index 8a6f8a0..f809354 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -86,7 +86,6 @@ IMPLEMENT_DYNCREATE(CDirView, CListView)
 
 CDirView::CDirView()
                : m_pList(nullptr)
-               , m_compareStart(0)
                , m_elapsed(0)
                , m_bTreeMode(false)
                , m_dirfilter(std::bind(&COptionsMgr::GetBool, GetOptionsMgr(), _1))
@@ -492,7 +491,7 @@ BOOL CDirView::PreCreateWindow(CREATESTRUCT& cs)
  */
 void CDirView::StartCompare(CompareStats *pCompareStats)
 {
-       m_compareStart = clock();
+       m_elapsed = 0;
 }
 
 /**
@@ -2529,7 +2528,7 @@ LRESULT CDirView::OnUpdateUIMessage(WPARAM wParam, LPARAM lParam)
                        MoveFocus(0, 0, 0);
 
                // If compare took more than TimeToSignalCompare seconds, notify user
-               m_elapsed = clock() - m_compareStart;
+               m_elapsed = pDoc->GetElapsedTime();
                SetTimer(STATUSBAR_UPDATE, 150, nullptr);
                if (m_elapsed > TimeToSignalCompare * CLOCKS_PER_SEC)
                        MessageBeep(IDOK);

diff --git a/Src/DirView.h b/Src/DirView.h
index eb4487e..331c2a8 100644 (file)
--- a/Src/DirView.h
+++ b/Src/DirView.h
@@ -205,7 +205,6 @@ protected:
        CFont m_font; /**< User-selected font */
        bool m_bTreeMode; /**< `true` if tree mode is on*/
        DirViewFilterSettings m_dirfilter;
-       clock_t m_compareStart; /**< Starting process time of the compare */
        clock_t m_elapsed; /**< Elapsed time of the compare */
        bool m_bUserCancelEdit; /**< `true` if the user cancels rename */
        String m_lastCopyFolder; /**< Last Copy To -target folder. */

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 68f2a94..42785b7 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -3500,8 +3500,10 @@ BEGIN
     IDS_CONFIRM_MULTIPLE_MOVE "Are you sure you want to move %d items?"\r
     IDS_CONFIRM_COPY_CAPTION "Confirm Copy"\r
     IDS_CONFIRM_MOVE_CAPTION "Confirm Move"\r
-    IDS_CONFIRM_CLOSE_WINDOW \r
+    IDS_CONFIRM_CLOSE_WINDOW_COMPARING \r
                             "You are about to close the window that is comparing folders. Are you sure you want to close the window?"\r
+    IDS_CONFIRM_CLOSE_WINDOW_LONG_COMPARISON\r
+                            "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"\r
     IDS_ERROR_INVALID_DIR_FILE_NAME\r
                             "The file or folder name is invalid."\r
 END\r

diff --git a/Src/PropMessageBoxes.cpp b/Src/PropMessageBoxes.cpp
index 1f8320a..00ee205 100644 (file)
--- a/Src/PropMessageBoxes.cpp
+++ b/Src/PropMessageBoxes.cpp
@@ -24,6 +24,7 @@ static struct MessageBox
        // folder compare window
        { IDS_CREATE_PAIR_FOLDER, IDS_CREATE_PAIR_FOLDER, nullptr, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN },
        { IDS_CONFIRM_SINGLE_COPY, 0, _T("FolderCopyConfirmDlgDontAskAgain"), MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN },
+       { IDS_CONFIRM_CLOSE_WINDOW_LONG_COMPARISON, IDS_CONFIRM_CLOSE_WINDOW_LONG_COMPARISON, nullptr, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN },
        // file compare window
        { IDS_COMPARE_LARGE_FILES, 0, _T("CompareLargeFiles"), MB_YESNOCANCEL | MB_ICONQUESTION | MB_DONT_ASK_AGAIN},
        { IDS_FILESSAME, IDS_FILESSAME, nullptr, MB_ICONINFORMATION | MB_DONT_DISPLAY_AGAIN},

diff --git a/Src/resource.h b/Src/resource.h
index 8fee451..2c43483 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -1277,8 +1277,9 @@
 #define IDS_CONFIRM_MULTIPLE_MOVE       41697\r
 #define IDS_CONFIRM_COPY_CAPTION        41698\r
 #define IDS_CONFIRM_MOVE_CAPTION        41699\r
-#define IDS_CONFIRM_CLOSE_WINDOW        41700\r
-#define IDS_ERROR_INVALID_DIR_FILE_NAME 41701\r
+#define IDS_CONFIRM_CLOSE_WINDOW_COMPARING 41700\r
+#define IDS_CONFIRM_CLOSE_WINDOW_LONG_COMPARISON 41701\r
+#define IDS_ERROR_INVALID_DIR_FILE_NAME 41702\r
 #define IDS_ERROR_EXECUTE_FILE          41719\r
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      41731\r
 #define IDS_FAILED_EXTRACT_ARCHIVE_FILES 41732\r

diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po
index 2fa664d..e9985ff 100644 (file)
--- a/Translations/WinMerge/Arabic.po
+++ b/Translations/WinMerge/Arabic.po
@@ -2867,6 +2867,9 @@ msgstr ""
 "أنت على وشك إغلاق النافذة التي تقوم بالمقارنة بين المجلدات. هل أنت متأكد "
 "برغبتك في إغلاقها؟"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr ""
 

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index 84370fb..cf50221 100644 (file)
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -3391,6 +3391,9 @@ msgstr "Berretsi Mugitzea"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr ""
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr ""
 

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index d9e7f5f..739157a 100644 (file)
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -2654,6 +2654,9 @@ msgstr "Confirmar a Movimentação"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr "Você está pra fechar a janela que está comparando as pastas. Você tem certeza que você quer fechar a janela?"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr "Nome de arquivo ou pasta inválido."
 

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index 6aea6dd..4e96170 100644 (file)
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -2905,6 +2905,9 @@ msgstr ""
 "На път сте да затворите прозореца, в който се сравняват папки. Наистина ли "
 "искате да затворите този прозорец?"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr "Името на файла или папката е недействително."
 

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index a2b7011..292c77e 100644 (file)
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -3436,6 +3436,9 @@ msgstr "Confirmeu l'acció de moure"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr "Esteu a punt de tancar la finestra que compara els directoris. Esteu segurs de tancar la finestra?"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr ""
 

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index 5224c96..40f463b 100644 (file)
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -2896,6 +2896,9 @@ msgstr "确认移动"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr "您即将关闭比较文件夹的窗口。确定关闭该窗口？"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr "文件或文件夹的名称不合法。"
 

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index acc35e5..c0ff5b2 100644 (file)
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -3451,6 +3451,9 @@ msgstr "確認移除"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr "您要關閉一個正在比較資料夾的視窗，您確定要關閉視窗嗎？"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr "檔案或資料夾名稱無效。"
 

diff --git a/Translations/WinMerge/Corsican.po b/Translations/WinMerge/Corsican.po
index c5aa32b..2051894 100644 (file)
--- a/Translations/WinMerge/Corsican.po
+++ b/Translations/WinMerge/Corsican.po
@@ -2895,6 +2895,9 @@ msgstr "Cunfirmà u dispiazzamentu"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr "State per chjode a finestra chì paraguneghja i cartulari. Da veru vulete chjode a finestra ?"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr "U nome di u schedariu o di u cartulare hè inaccettevule."
 

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index 957a598..7685b4e 100644 (file)
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -3389,6 +3389,9 @@ msgstr "Potvrdite premještanje"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr ""
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr ""
 

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index 3ff473a..1af8ce6 100644 (file)
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -3336,6 +3336,9 @@ msgstr "Potvrdit přesunutí"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr ""
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr ""
 

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index 0853887..660097a 100644 (file)
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -3409,6 +3409,9 @@ msgstr "Bekræft flytning"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr ""
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr ""
 

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index 6e73761..081ca2d 100644 (file)
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -2883,6 +2883,9 @@ msgstr "Verplaatsen bevestigen"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr "U staat op het punt om het venster te sluiten dat mappen aan het vergelijken is. Weet u zeker dat u het venster wilt sluiten?"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr "Bestands- of mapnaam is ongeldig."
 

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index faabad3..4d21e3d 100644 (file)
--- a/Translations/WinMerge/English.pot
+++ b/Translations/WinMerge/English.pot
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2023-08-05 10:45+0000\n"
+"POT-Creation-Date: 2023-08-27 15:32+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -2648,6 +2648,9 @@ msgstr ""
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr ""
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr ""
 

diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
index d347da1..09b941a 100644 (file)
--- a/Translations/WinMerge/Finnish.po
+++ b/Translations/WinMerge/Finnish.po
@@ -2912,6 +2912,9 @@ msgid ""
 msgstr ""
 "Olet sulkemassa kansioiden vertailuikkunaa. Haluatko varmasti sulkea ikkunan?"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr "Tiedoston tai kansion nimi on virheellinen."
 

diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index 2e10f4d..90e7f23 100644 (file)
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -3460,6 +3460,9 @@ msgstr "Confirmer le déplacement"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr "Vous êtes sur le point de fermer la fenêtre qui compare les dossiers. Êtes-vous sûr de vouloir fermer la fenêtre ?"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr "Le nom du fichier ou du dossier n'est pas valide."
 

diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index 42f40f5..51cb311 100644 (file)
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -2887,6 +2887,9 @@ msgstr "Confirmar movemento"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr "Vai pechar a ventá de comparación de carpetas. ¿Seguro que quere cerrala?"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr "O nome do arquivo ou carpeta non é válido."
 

diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index a34480f..497bda5 100644 (file)
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -3222,6 +3222,9 @@ msgstr "Verschieben bestätigen"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr "Sie schließen gerade das Fenster, in dem Ordner verglichen werden. Möchten Sie das Fenster wirklich schließen?"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr "Der Datei- oder Ordnername ist ungültig."
 

diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index 620c211..bafc5f2 100644 (file)
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -3367,6 +3367,9 @@ msgstr "Επιβεβαιώσατε Μετακίνηση"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr ""
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr ""
 

diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index 7cb7035..bb74cdc 100644 (file)
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -3444,6 +3444,9 @@ msgstr "Áthelyezés megerősítése"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr "Bezárni készülsz a mappákat összehasonlító ablakot. Biztosan bezárod az ablakot?"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr "A fájl- vagy a mappanév érvénytelen"
 

diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index 5cb9322..aec3068 100644 (file)
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -2876,6 +2876,9 @@ msgstr ""
 "Si sta per chiudere la finestra che sta confrontando le cartelle.\n"
 "Vuoi chiudere la finestra?"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr ""
 

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index d10c930..091f14a 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -2885,6 +2885,9 @@ msgstr "移動の確認"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr "フォルダー比較中のウィンドウを閉じようとしています。本当にウィンドウを閉じますか?"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr "比較にかなりの時間を要したウィンドウを閉じようとしています。本当にウィンドウを閉じますか?"
+
 msgid "The file or folder name is invalid."
 msgstr "ファイル名またはフォルダー名が無効です。"
 

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index 6922349..fb585a9 100644 (file)
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -3457,6 +3457,9 @@ msgstr "이동 확인"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr "폴더를 비교하는 창을 닫으려고 합니다. 창을 닫으시겠습니까?"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr "파일 또는 폴더 이름이 잘못되었습니다."
 

diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po
index 0e709b6..d10c2ce 100644 (file)
--- a/Translations/WinMerge/Lithuanian.po
+++ b/Translations/WinMerge/Lithuanian.po
@@ -2654,6 +2654,9 @@ msgstr "Patvirtinti perkėlimą"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr "Jūs ketinate užverti langą, kuriame lyginami katalogai. Ar tikrai norite užverti langą?"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr "Netinkamas failo ar katalogo pavadinimas."
 

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index 8b0797b..180f6d4 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -2897,6 +2897,9 @@ msgid ""
 "you want to close the window?"
 msgstr ""
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr ""
 

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index 110d768..94c0afc 100644 (file)
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -3416,6 +3416,9 @@ msgstr " تاييد جابجايي "
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr ""
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr ""
 

diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index c85a8ed..876454f 100644 (file)
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -2655,6 +2655,9 @@ msgstr "Potwierdzenie przenoszenia"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr "Zamierzasz zamknąć okno porównujące foldery. Czy na pewno chcesz zamknąć okno?"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr "Nazwa pliku lub folderu jest nieprawidłowa."
 

diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index a729beb..e7542f8 100644 (file)
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -2899,6 +2899,9 @@ msgstr "Confirmar"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr "Está prestes a fechar a janela que está a comparar as pastas. Tem a certeza que deseja fechar a janela?"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr "O nome do ficheiro ou pasta é inválido."
 

diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index 656434c..039c933 100644 (file)
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -3372,6 +3372,9 @@ msgstr ""
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr ""
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr ""
 

diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index 14085b9..5aebf11 100644 (file)
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -2656,6 +2656,9 @@ msgstr "Подтвердите перемещение"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr "Вы собираетесь закрыть окно сравнения. Действительно закрыть окно?"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr "Неверное имя файла или папки."
 

diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index e4d46f6..29a1ed5 100644 (file)
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -3364,6 +3364,9 @@ msgstr "Потврди премештај"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr ""
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr ""
 

diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po
index 2d38317..684087c 100644 (file)
--- a/Translations/WinMerge/Sinhala.po
+++ b/Translations/WinMerge/Sinhala.po
@@ -3384,6 +3384,9 @@ msgstr "ගෙන යෑම තහවුරු කරන්න"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr ""
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr ""
 

diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index cae612d..795859d 100644 (file)
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -2882,6 +2882,9 @@ msgstr "Potvrdiť presun"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr "Chystáte sa zavrieť okno s porovnaním priečinkov. Naozaj chcete zavrieť okno?"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr ""
 

diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index 54747d7..a9d8f16 100644 (file)
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -2881,6 +2881,9 @@ msgstr "Potrdi premik"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr "Zaklenili boste okno za primerjavo map. Ali ste prepričani, da želite zapreti okno?"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr "Ime datoteke ali mape ni veljavno."
 

diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index 0d22b5e..ec0ed90 100644 (file)
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -2889,6 +2889,9 @@ msgstr "Confirmar movimiento"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr "Va a cerrar la ventana que está comparando carpetas. ¿Seguro que quiere cerrarla?"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr "El nombre del archivo o carpeta no es válido."
 

diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index b02da7a..4f99f2b 100644 (file)
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -2927,6 +2927,9 @@ msgstr ""
 "Du är på väg att stänga fönstret som jämför kataloger. Är du säker på att du "
 "vill stänga fönstret?"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr "Den angivna filen eller mappen är ogiltig."
 

diff --git a/Translations/WinMerge/Tamil.po b/Translations/WinMerge/Tamil.po
index bd00bf1..c121a22 100644 (file)
--- a/Translations/WinMerge/Tamil.po
+++ b/Translations/WinMerge/Tamil.po
@@ -2884,6 +2884,9 @@ msgstr "நகர்த்தலை உறுதிப்படுத்து"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr "கோப்புறைகளை ஒப்பிடும் சாளரத்தை மூட உள்ளீர்கள். நிச்சயமாக நீங்கள் சாளரத்தை மூட விரும்புகிறீர்களா?"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr "கோப்பு அல்லது கோப்புறையின் பெயர் தவறானது."
 

diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index 4d26b5f..09ac4bd 100644 (file)
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -2927,6 +2927,9 @@ msgstr ""
 "Klasör karşılaştırma penceresini kapatmak üzeresiniz. Bunu yapmak "
 "istediğinize emin misiniz?"
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr "Dosya ya da klasör adı geçersiz."
 

diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index 322dbdd..c443dd3 100644 (file)
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -3375,6 +3375,9 @@ msgstr "Підтвердження переміщення"
 msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
 msgstr ""
 
+msgid "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
+msgstr ""
+
 msgid "The file or folder name is invalid."
 msgstr ""