Add Pause button to Folder Compare Progress dialog (sf.net#828,#1222,#1237)

diff --git a/Src/DiffThread.cpp b/Src/DiffThread.cpp
index 99ba123..c875234 100644 (file)
--- a/Src/DiffThread.cpp
+++ b/Src/DiffThread.cpp
@@ -59,6 +59,7 @@ public:
 CDiffThread::CDiffThread()
 : m_pDiffContext(NULL)
 , m_bAborting(false)
+, m_bPaused(false)
 , m_pDiffParm(new DiffFuncStruct)
 {
        m_pAbortgate.reset(new DiffThreadAbortable(this));
@@ -86,6 +87,8 @@ void CDiffThread::SetContext(CDiffContext * pCtx)
  */
 bool CDiffThread::ShouldAbort() const
 {
+       while (m_bPaused && !m_bAborting)
+               Poco::Thread::sleep(100);
        return m_bAborting;
 }
 
@@ -101,6 +104,7 @@ unsigned CDiffThread::CompareDirectories()
        m_pDiffParm->m_pAbortgate = m_pAbortgate.get();
        m_pDiffParm->bOnlyRequested = m_bOnlyRequested;
        m_bAborting = false;
+       m_bPaused = false;
 
        m_pDiffParm->nThreadState = THREAD_COMPARING;
 

diff --git a/Src/DiffThread.h b/Src/DiffThread.h
index 2d7de7a..9f81a9d 100644 (file)
--- a/Src/DiffThread.h
+++ b/Src/DiffThread.h
@@ -101,6 +101,9 @@ public:
        unsigned GetThreadState() const;
        void Abort() { m_bAborting = true; }
        bool IsAborting() const { return m_bAborting; }
+       void Pause() { m_bPaused = true; }
+       void Continue() { m_bPaused = false; }
+       bool IsPaused() const { return m_bPaused; }
 
 // runtime interface for child thread, called on child thread
        bool ShouldAbort() const;
@@ -111,5 +114,6 @@ private:
        std::unique_ptr<DiffFuncStruct> m_pDiffParm; /**< Structure for sending data to threads. */
        std::unique_ptr<DiffThreadAbortable> m_pAbortgate;
        bool m_bAborting; /**< Is compare aborting? */
+       bool m_bPaused; /**< Is compare paused? */
        bool m_bOnlyRequested; /**< Are we comparing only requested items (Update?) */
 };

diff --git a/Src/DirCompProgressBar.cpp b/Src/DirCompProgressBar.cpp
index 432f939..c29fa1d 100644 (file)
--- a/Src/DirCompProgressBar.cpp
+++ b/Src/DirCompProgressBar.cpp
@@ -183,3 +183,8 @@ void DirCompProgressBar::EndUpdating()
        KillTimer(IDT_UPDATE);
 }
 
+void DirCompProgressBar::SetPaused(bool paused)
+{
+       GetDlgItem(IDC_COMPARISON_PAUSE)->ShowWindow(paused ? SW_HIDE : SW_SHOW);
+       GetDlgItem(IDC_COMPARISON_CONTINUE)->ShowWindow(paused ? SW_SHOW : SW_HIDE);
+}

diff --git a/Src/DirCompProgressBar.h b/Src/DirCompProgressBar.h
index 1f66ab7..c816048 100644 (file)
--- a/Src/DirCompProgressBar.h
+++ b/Src/DirCompProgressBar.h
@@ -41,6 +41,7 @@ public:
        void SetCompareStat(CompareStats * pCompareStats);
        void StartUpdating();
        void EndUpdating();
+       void SetPaused(bool paused);
 
 // Dialog Data
        //{{AFX_DATA(DirCompProgressBar)

diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index ab791f5..248d2f9 100644 (file)
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -546,6 +546,22 @@ void CDirDoc::AbortCurrentScan()
 }
 
 /**
+ * @brief Send signal to thread to pause current scan
+ */
+void CDirDoc::PauseCurrentScan()
+{
+       m_diffThread.Pause();
+}
+
+/**
+ * @brief Send signal to thread to continue current scan
+ */
+void CDirDoc::ContinueCurrentScan()
+{
+       m_diffThread.Continue();
+}
+
+/**
  * @brief Returns true if there is an active scan that hasn't been aborted.
  */
 bool CDirDoc::IsCurrentScanAbortable() const

diff --git a/Src/DirDoc.h b/Src/DirDoc.h
index 11cd4a6..680a53c 100644 (file)
--- a/Src/DirDoc.h
+++ b/Src/DirDoc.h
@@ -105,6 +105,8 @@ public:
        CDiffThread m_diffThread;
        void UpdateHeaderPath(int nIndex);
        void AbortCurrentScan();
+       void PauseCurrentScan();
+       void ContinueCurrentScan();
        bool IsCurrentScanAbortable() const;
        void SetDescriptions(const String strDesc[]);
        void ApplyDisplayRoot(int nIndex, String &);

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index 14af976..2c892e7 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -343,6 +343,8 @@ BEGIN_MESSAGE_MAP(CDirView, CListView)
        ON_NOTIFY_REFLECT(LVN_BEGINDRAG, OnBeginDrag)
        ON_NOTIFY_REFLECT(NM_CUSTOMDRAW, OnCustomDraw)
        ON_BN_CLICKED(IDC_COMPARISON_STOP, OnBnClickedComparisonStop)
+       ON_BN_CLICKED(IDC_COMPARISON_PAUSE, OnBnClickedComparisonPause)
+       ON_BN_CLICKED(IDC_COMPARISON_CONTINUE, OnBnClickedComparisonContinue)
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
@@ -3660,6 +3662,20 @@ void CDirView::OnBnClickedComparisonStop()
        GetDocument()->AbortCurrentScan();
 }
 
+void CDirView::OnBnClickedComparisonPause()
+{
+       if (m_pCmpProgressBar)
+               m_pCmpProgressBar->SetPaused(true);
+       GetDocument()->PauseCurrentScan();
+}
+
+void CDirView::OnBnClickedComparisonContinue()
+{
+       if (m_pCmpProgressBar)
+               m_pCmpProgressBar->SetPaused(false);
+       GetDocument()->ContinueCurrentScan();
+}
+
 /**
  * @brief Populate colors for items in view, depending on difference status
  */

diff --git a/Src/DirView.h b/Src/DirView.h
index 834553f..56a986a 100644 (file)
--- a/Src/DirView.h
+++ b/Src/DirView.h
@@ -382,6 +382,8 @@ protected:
        afx_msg void OnCollapseFolder();
        afx_msg void OnBeginDrag(NMHDR* pNMHDR, LRESULT* pResult);
        afx_msg void OnBnClickedComparisonStop();
+       afx_msg void OnBnClickedComparisonPause();
+       afx_msg void OnBnClickedComparisonContinue();
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
        BOOL OnHeaderBeginDrag(LPNMHEADER hdr, LRESULT* pResult);

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 40fa27f..50c95f3 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1241,11 +1241,13 @@ IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 256, 60
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD\r
 FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
 BEGIN\r
-    DEFPUSHBUTTON   "Stop",IDC_COMPARISON_STOP,167,15,83,14\r
+    DEFPUSHBUTTON   "Stop",IDC_COMPARISON_STOP,184,9,65,14\r
+    PUSHBUTTON      "Pause",IDC_COMPARISON_PAUSE,113,9,65,14\r
+    PUSHBUTTON      "Continue",IDC_COMPARISON_CONTINUE,113,9,65,14,NOT WS_VISIBLE\r
     CONTROL         "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,7,44,241,10\r
     RTEXT           "0",IDC_ITEMSCOMPARED,75,29,30,10\r
     RTEXT           "0",IDC_ITEMSTOTAL,75,19,30,10\r
-    LTEXT           "Comparing items...",IDC_STATIC,7,7,150,10\r
+    LTEXT           "Comparing items...",IDC_STATIC,7,7,98,10\r
     LTEXT           "Items compared:",IDC_STATIC,7,29,85,10\r
     LTEXT           "Items total:",IDC_STATIC,7,19,85,10\r
     LTEXT           "",IDC_PATH_COMPARING,137,29,111,10\r
@@ -1808,6 +1810,8 @@ IDD_DIRCOMP_PROGRESS AFX_DIALOG_LAYOUT
 BEGIN\r
     0,\r
     100, 0, 0, 0,\r
+    100, 0, 0, 0,\r
+    100, 0, 0, 0,\r
     0, 0, 100, 0,\r
     0, 0, 0, 0,\r
     0, 0, 0, 0,\r

diff --git a/Src/resource.h b/Src/resource.h
index e1423c0..9d12549 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -252,7 +252,9 @@
 #define IDC_EXT_EDITOR_PATH             1096\r
 #define IDC_DIFF_SWAPFILES              1097\r
 #define IDC_DIFF_OPENTOEDITOR           1098\r
-#define IDC_COMPARISON_STOP             1106\r
+#define IDC_COMPARISON_STOP             1105\r
+#define IDC_COMPARISON_PAUSE            1106\r
+#define IDC_COMPARISON_CONTINUE         1107\r
 #define IDC_DIFF_INCLCMDLINE            1108\r
 #define IDC_WMGOTO_FILELEFT             1109\r
 #define IDC_WMGOTO_FILEMIDDLE           1110\r

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index e6729a1..8167fb5 100644 (file)
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -1979,6 +1979,16 @@ msgstr "Azalpena:"
 msgid "Stop"
 msgstr "Gelditu"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2234,7 +2244,7 @@ msgstr "B&aztertu aldaketak"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Kode-orrialdea"
@@ -2623,7 +2633,7 @@ msgstr "Hautapena:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Helburuak"

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index 123a8bb..54b4c22 100644 (file)
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -1978,6 +1978,16 @@ msgstr "Descrição:"
 msgid "Stop"
 msgstr "Parar"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2233,7 +2243,7 @@ msgstr "Des&cartar mudanças"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Código da página"
@@ -2622,7 +2632,7 @@ msgstr "Seleção:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Caminhos"

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index c8013f4..16f487e 100644 (file)
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -1976,6 +1976,16 @@ msgstr "Описание:"
 msgid "Stop"
 msgstr "Спри"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2231,7 +2241,7 @@ msgstr "О&тмени промените"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Кодировка"
@@ -2616,7 +2626,7 @@ msgstr "Избран:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Пътища"

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index c8e2b2d..65d94cc 100644 (file)
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -1975,6 +1975,16 @@ msgstr "&Descripció:"
 msgid "Stop"
 msgstr "&Atura"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2230,7 +2240,7 @@ msgstr "Des&carta'n els canvis"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Pàgina de codis"
@@ -2615,7 +2625,7 @@ msgstr "Selecció:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Camins"

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index cad311b..b0bb7bb 100644 (file)
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -1977,6 +1977,16 @@ msgstr "描述:"
 msgid "Stop"
 msgstr "停止"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2232,7 +2242,7 @@ msgstr "放弃修改(&C)"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "代码页"
@@ -2617,7 +2627,7 @@ msgstr "选中区域:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "路径"

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index 9360540..22bc2aa 100644 (file)
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -1986,6 +1986,16 @@ msgstr "描述："
 msgid "Stop"
 msgstr "停止"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2241,7 +2251,7 @@ msgstr "放棄變更(&C)"
 msgid "Disca&rd All"
 msgstr "放棄全部(&R)"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "編碼頁"
@@ -2631,7 +2641,7 @@ msgstr "選取："
 msgid "Margin:"
 msgstr "邊距："
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "路徑"

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index d5bc33d..bf698db 100644 (file)
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -1976,6 +1976,16 @@ msgstr "Opis:"
 msgid "Stop"
 msgstr "Stani"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2231,7 +2241,7 @@ msgstr "Odustajem od izmjena"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Kodna stranica"
@@ -2620,7 +2630,7 @@ msgstr "Odabir:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Staze"

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index 5431f69..5cc64f0 100644 (file)
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -1978,6 +1978,16 @@ msgstr "Popis:"
 msgid "Stop"
 msgstr "Zastavit"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2233,7 +2243,7 @@ msgstr "Zr&ušit změny"
 msgid "Disca&rd All"
 msgstr "Zrušit &vše"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Kódování"
@@ -2618,7 +2628,7 @@ msgstr "Výběr:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Cesty"

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index f5c5d61..b6e22a6 100644 (file)
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -1981,6 +1981,16 @@ msgstr "Beskrivelse:"
 msgid "Stop"
 msgstr "Stop"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2236,7 +2246,7 @@ msgstr "F&jern ændringer"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Codepage"
@@ -2627,7 +2637,7 @@ msgstr "Udvalgt:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Stier"

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index ffec71f..c40b35f 100644 (file)
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -1982,6 +1982,16 @@ msgstr "Beschrijving:"
 msgid "Stop"
 msgstr "Stoppen"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2237,7 +2247,7 @@ msgstr "Wijzigingen nege&ren"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Tekenset"
@@ -2628,7 +2638,7 @@ msgstr "Selectie:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Paden"

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index 8159e23..5821869 100644 (file)
--- a/Translations/WinMerge/English.pot
+++ b/Translations/WinMerge/English.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2018-02-24 13:41+0000\n"
+"POT-Creation-Date: 2018-03-17 14:33+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -1972,6 +1972,16 @@ msgstr ""
 msgid "Stop"
 msgstr ""
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2227,7 +2237,7 @@ msgstr ""
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr ""
@@ -2612,7 +2622,7 @@ msgstr ""
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr ""

diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
index 7a51a99..1e831da 100644 (file)
--- a/Translations/WinMerge/Finnish.po
+++ b/Translations/WinMerge/Finnish.po
@@ -1973,6 +1973,16 @@ msgstr "Kuvaus:"
 msgid "Stop"
 msgstr "Pysäytä"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2228,7 +2238,7 @@ msgstr "Hylkää muutokset"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Koodisivu"
@@ -2613,7 +2623,7 @@ msgstr "Valinta:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Polut"

diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index ff73fd8..aa26791 100644 (file)
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -1980,6 +1980,16 @@ msgstr "Description:"
 msgid "Stop"
 msgstr "Arrêter"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2235,7 +2245,7 @@ msgstr "I&gnorer les changements"
 msgid "Disca&rd All"
 msgstr "Ignorer tout"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Page de code"
@@ -2624,7 +2634,7 @@ msgstr "Sélection:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Chemins"

diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index 12c1c51..4420f76 100644 (file)
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -1976,6 +1976,16 @@ msgstr "Descrición:"
 msgid "Stop"
 msgstr "Parar"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2231,7 +2241,7 @@ msgstr "Desbo&tar trocos"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Páxina de códigos"
@@ -2621,7 +2631,7 @@ msgstr "Selección:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Camiños"

diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index f8add29..344b684 100644 (file)
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -1981,6 +1981,16 @@ msgstr "Beschreibung:"
 msgid "Stop"
 msgstr "Stop"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2236,7 +2246,7 @@ msgstr "Änderungen ver&werfen"
 msgid "Disca&rd All"
 msgstr "&Alle verwerfen"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Zeichensatz"
@@ -2625,7 +2635,7 @@ msgstr "Auswahl:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Pfade"

diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index f77eede..6705db0 100644 (file)
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -1975,6 +1975,16 @@ msgstr "Περιγραφή:"
 msgid "Stop"
 msgstr "Τερματισμός"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2230,7 +2240,7 @@ msgstr "Από&ρριψη αλλαγών"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Κωδικοσελίδα"
@@ -2615,7 +2625,7 @@ msgstr "Επιλογή:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Διαδρομές"

diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index bda5be4..b218312 100644 (file)
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -1976,6 +1976,16 @@ msgstr "Leírás:"
 msgid "Stop"
 msgstr "Leállítás"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2231,7 +2241,7 @@ msgstr "Változtatások e&lvetése"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Kódlap"
@@ -2616,7 +2626,7 @@ msgstr "Kijelölés:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr ""

diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index 207a49c..74c64b3 100644 (file)
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -1976,6 +1976,16 @@ msgstr "Descrizione:"
 msgid "Stop"
 msgstr "Stop"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2231,7 +2241,7 @@ msgstr "Sca&rta le modifiche"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Codice di pagina"
@@ -2616,7 +2626,7 @@ msgstr "Selezione:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Percorsi"

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index 7375464..96a83d8 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -1984,6 +1984,16 @@ msgstr "説明:"
 msgid "Stop"
 msgstr "停止"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr "一時停止"
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr "再開"
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2239,7 +2249,7 @@ msgstr "変更を破棄する(&C)"
 msgid "Disca&rd All"
 msgstr "すべて破棄する(&R)"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "コードページ"
@@ -2634,7 +2644,7 @@ msgstr "選択:"
 msgid "Margin:"
 msgstr "マージン:"
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "パス"

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index 2e59101..b4df26d 100644 (file)
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -1980,6 +1980,16 @@ msgstr "설명:"
 msgid "Stop"
 msgstr "중지"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2235,7 +2245,7 @@ msgstr "변경사항 취소(&C)"
 msgid "Disca&rd All"
 msgstr "전부 취소(&R)"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "코드페이지"
@@ -2628,7 +2638,7 @@ msgstr "선택:"
 msgid "Margin:"
 msgstr "여백:"
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "경로"

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index 10aa326..e884c13 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -1976,6 +1976,16 @@ msgstr "Beskrivelse:"
 msgid "Stop"
 msgstr "Stopp"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2231,7 +2241,7 @@ msgstr "Fork&ast endringer"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Tegnsett"
@@ -2620,7 +2630,7 @@ msgstr "Markering:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Baner"

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index fe38783..0aa924e 100644 (file)
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -1983,6 +1983,16 @@ msgstr " توصيف : "
 msgid "Stop"
 msgstr " ايست "
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2238,7 +2248,7 @@ msgstr "&c دورانداختن تغييرات "
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr " صفحه کد "
@@ -2629,7 +2639,7 @@ msgstr " انتخاب : "
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr " مسيرها "

diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index ac231a0..3f1d079 100644 (file)
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -1977,6 +1977,16 @@ msgstr "Opis:"
 msgid "Stop"
 msgstr "Zatrzymaj"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2232,7 +2242,7 @@ msgstr "Odr&zuć zmiany"
 msgid "Disca&rd All"
 msgstr "Odrzuć &wszystkie"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Strona kodowa"
@@ -2621,7 +2631,7 @@ msgstr "Zaznaczenie:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Ścieżki"

diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index 3b4009f..dbb1f97 100644 (file)
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -1976,6 +1976,16 @@ msgstr "Descrição:"
 msgid "Stop"
 msgstr "Parar"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2231,7 +2241,7 @@ msgstr "Rejeitar alterações"
 msgid "Disca&rd All"
 msgstr "Rejei&tar Tudo"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Página de código"
@@ -2616,7 +2626,7 @@ msgstr "Seleção:"
 msgid "Margin:"
 msgstr "Margem"
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Destino"

diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index 14037f6..b644833 100644 (file)
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -1976,6 +1976,16 @@ msgstr "Descriere:"
 msgid "Stop"
 msgstr "Stop"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2231,7 +2241,7 @@ msgstr "Renunţă la s&chimbări"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Codare caractere"
@@ -2616,7 +2626,7 @@ msgstr "Selecţie:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Căi"

diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index c8f3b9f..520b5c8 100644 (file)
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -1978,6 +1978,16 @@ msgstr "Описание:"
 msgid "Stop"
 msgstr "Остановить"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2233,7 +2243,7 @@ msgstr "О&тклонить изменения"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Кодовая страница"
@@ -2622,7 +2632,7 @@ msgstr "Выделенный текст:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Пути"

diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index 6075e55..0cdea1b 100644 (file)
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -1975,6 +1975,16 @@ msgstr "Îïèñ:"
 msgid "Stop"
 msgstr "Ñòàíè"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2230,7 +2240,7 @@ msgstr "Îäóñ&òàíè îä èçìåíà"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Êîäíà ñòðàíèöà"
@@ -2619,7 +2629,7 @@ msgstr "Èçàáåðè:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Ïóòàœå"

diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po
index 11871fe..a4932e1 100644 (file)
--- a/Translations/WinMerge/Sinhala.po
+++ b/Translations/WinMerge/Sinhala.po
@@ -1973,6 +1973,16 @@ msgstr " විස්තරය:"
 msgid "Stop"
 msgstr "නවත්වන්න"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2228,7 +2238,7 @@ msgstr "වෙනස්කම් ඉවතලන්න"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "ගුප්ත සංඥා "
@@ -2615,7 +2625,7 @@ msgstr "තෝරා ගැනීම:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "මාර්ගය"

diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index acdf2d7..e856674 100644 (file)
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -1976,6 +1976,16 @@ msgstr "Popis:"
 msgid "Stop"
 msgstr "Zastaviť"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2231,7 +2241,7 @@ msgstr "Z&ahodiť zmeny"
 msgid "Disca&rd All"
 msgstr "&Zahodiť všetky"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Kódová stránka"
@@ -2620,7 +2630,7 @@ msgstr "Výber:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Cesty"

diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index 86eb3a8..8267789 100644 (file)
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -1979,6 +1979,16 @@ msgstr "Opis:"
 msgid "Stop"
 msgstr "Ustavi"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2234,7 +2244,7 @@ msgstr "Zavrži spremembe"
 msgid "Disca&rd All"
 msgstr "&Zavrži vse"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Kodna tabela"
@@ -2623,7 +2633,7 @@ msgstr "Izbira:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Poti"

diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index 32bc95e..34bf093 100644 (file)
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -1978,6 +1978,16 @@ msgstr "Descripción:"
 msgid "Stop"
 msgstr "Detener"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2233,7 +2243,7 @@ msgstr "Des&cartar cambios"
 msgid "Disca&rd All"
 msgstr ""
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Página de códigos"
@@ -2622,7 +2632,7 @@ msgstr "Selección:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Rutas"

diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index 7371831..6fbd84e 100644 (file)
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -1976,6 +1976,16 @@ msgstr "Beskrivning:"
 msgid "Stop"
 msgstr "Stopp"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2231,7 +2241,7 @@ msgstr "Ign&orera ändringar"
 msgid "Disca&rd All"
 msgstr "Ign&orera allt"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Codepage"
@@ -2620,7 +2630,7 @@ msgstr "Markering:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Sökvägar"

diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index 4e17941..92a7ae4 100644 (file)
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -1982,6 +1982,16 @@ msgstr "Açıklama:"
 msgid "Stop"
 msgstr "Dur"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2237,7 +2247,7 @@ msgstr "Değişiklikleri kaydet&me"
 msgid "Disca&rd All"
 msgstr "&Tümünü Yok Say"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Kod Sayfası"
@@ -2630,7 +2640,7 @@ msgstr "Seçim:"
 msgid "Margin:"
 msgstr "Kenar Boşluğu:"
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Yollar"

diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index b33630e..0943a01 100644 (file)
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -1977,6 +1977,16 @@ msgstr "Опис:"
 msgid "Stop"
 msgstr "Зупинити"
 
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr ""
+
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Continue"
+msgstr ""
+
 #: Merge.rc:1AC98D0A
 #, c-format
 msgid "Comparing items..."
@@ -2232,7 +2242,7 @@ msgstr "Ві&дхилити зміни"
 msgid "Disca&rd All"
 msgstr "Скасу&вати все"
 
-#: Merge.rc:4C3E0A2F
+#: Merge.rc:4C3E0A30
 #, c-format
 msgid "Codepage"
 msgstr "Сторінка кодування"
@@ -2621,7 +2631,7 @@ msgstr "Відзнач. текст:"
 msgid "Margin:"
 msgstr ""
 
-#: Merge.rc:D109E01
+#: Merge.rc:D109E02
 #, c-format
 msgid "Paths"
 msgstr "Шляхи"