diff --git a/Docs/Users/ChangeLog.html b/Docs/Users/ChangeLog.html
index 1a6087e01ec..2a85c8ead8c 100644
--- a/Docs/Users/ChangeLog.html
+++ b/Docs/Users/ChangeLog.html
@@ -35,6 +35,11 @@
File compare
Folder compare
- BugFix: Treeview scrolls to the wrong position. (#1915)
+- Allow changing the number of CPU cores to use while doing folder comparison (PR #1945)
+
+Webpage compare
+
+- Add support for generating report files (PR #1941)
Command line
@@ -198,7 +203,7 @@ Image compare
- BugFix: Fixed issue preventing saving image comparison reports to a network share
-Webpage compare
+Webpage compare
- BugFix: Fixed issue with missing file path in header bar
@@ -280,7 +285,7 @@ Binary compare
- BugFix: Fixed issue where the Open menu item in file path bar of binary comparison window was disabled.
-Webpage compare
+Webpage compare
- BugFix: Deleted color of Word Difference in Options dialog was not used.
- Implemented Ignore numbers comparison option.
@@ -466,7 +471,7 @@ Table compare
- Bugfix: Inline differences ware not displayed even if the caret is moved to the position of an inline difference that is hidden due to the narrow column width.
-Webpage compare
+Webpage compare
- [EXPERIMENTAL] Webpage Compare: Highlight differences (PR #1357)
@@ -580,7 +585,7 @@ Image compare
- BugFix: Fix an issue where the pane was split vertically the next time the window was displayed, even though the "Split Vertically" menu item was unchecked.
- Make patience and histogram diff algorithm selectable.
-Webpage compare
+Webpage compare
- BugFix: Fix text disappearing when pressing the 'K' key in the address bar
- BugFix: Fix an issue where the pane was split vertically the next time the window was displayed, even though the "Split Vertically" menu item was unchecked.
@@ -656,7 +661,7 @@ File compare
- BugFix: Fixed a problem where the caret would not display in the correct position on lines containing tab characters, depending on the font in use (osdn.net #44417)
-Webpage compare
+Webpage compare
- Webpage Compare [EXPERIMENTAL] (PR #1182)
diff --git a/Docs/Users/ChangeLog.md b/Docs/Users/ChangeLog.md
index 049b19ad58e..becb134d7a9 100644
--- a/Docs/Users/ChangeLog.md
+++ b/Docs/Users/ChangeLog.md
@@ -16,6 +16,12 @@
### Folder compare
- BugFix: Treeview scrolls to the wrong position. (#1915)
+- Allow changing the number of CPU cores to use while doing folder comparison
+ (PR #1945)
+
+### Webpage compare
+
+- Add support for generating report files (PR #1941)
### Command line
diff --git a/Docs/Users/ReleaseNotes.html b/Docs/Users/ReleaseNotes.html
index aedde634e8e..b9ffa20b572 100644
--- a/Docs/Users/ReleaseNotes.html
+++ b/Docs/Users/ReleaseNotes.html
@@ -45,6 +45,11 @@ File compare
Folder compare
- BugFix: Treeview scrolls to the wrong position. (#1915)
+- Allow changing the number of CPU cores to use while doing folder comparison (PR #1945)
+
+Webpage compare
+
+- Add support for generating report files (PR #1941)
Command line
diff --git a/Docs/Users/ReleaseNotes.md b/Docs/Users/ReleaseNotes.md
index 26f6e6ecfb3..e863761664d 100644
--- a/Docs/Users/ReleaseNotes.md
+++ b/Docs/Users/ReleaseNotes.md
@@ -30,6 +30,12 @@ Please submit bug reports to our bug-tracker.
### Folder compare
- BugFix: Treeview scrolls to the wrong position. (#1915)
+- Allow changing the number of CPU cores to use while doing folder comparison
+ (PR #1945)
+
+### Webpage compare
+
+- Add support for generating report files (PR #1941)
### Command line
diff --git a/Src/CompareStats.cpp b/Src/CompareStats.cpp
index 689d4f040a7..e8a5f2bc47e 100644
--- a/Src/CompareStats.cpp
+++ b/Src/CompareStats.cpp
@@ -21,6 +21,7 @@ CompareStats::CompareStats(int nDirs)
, m_bCompareDone(false)
, m_nDirs(nDirs)
, m_counts()
+, m_nIdleCompareThreadCount(0)
{
}
diff --git a/Src/CompareStats.h b/Src/CompareStats.h
index 5d432cd618c..dbd185f096a 100644
--- a/Src/CompareStats.h
+++ b/Src/CompareStats.h
@@ -69,11 +69,27 @@ class CompareStats
explicit CompareStats(int nDirs);
~CompareStats();
+ int GetCompareThreadCount()
+ {
+ return static_cast(m_rgThreadState.size());
+ }
void SetCompareThreadCount(int nCompareThreads)
{
m_rgThreadState.clear();
m_rgThreadState.resize(nCompareThreads);
}
+ int GetIdleCompareThreadCount() const
+ {
+ return m_nIdleCompareThreadCount;
+ }
+ void SetIdleCompareThreadCount(int nIdleCompareThreadCount)
+ {
+ m_nIdleCompareThreadCount = nIdleCompareThreadCount;
+ }
+ bool IsIdleCompareThread(int iCompareThread) const
+ {
+ return iCompareThread >= (m_rgThreadState.size() - m_nIdleCompareThreadCount);
+ }
void BeginCompare(const DIFFITEM *di, int iCompareThread)
{
ThreadState &rThreadState = m_rgThreadState[iCompareThread];
@@ -109,7 +125,7 @@ class CompareStats
const DIFFITEM *m_pDiffItem;
};
std::vector m_rgThreadState;
-
+ int m_nIdleCompareThreadCount;
};
/**
diff --git a/Src/DirCompProgressBar.cpp b/Src/DirCompProgressBar.cpp
index 5ffaa853d50..f411f078149 100644
--- a/Src/DirCompProgressBar.cpp
+++ b/Src/DirCompProgressBar.cpp
@@ -90,10 +90,16 @@ BOOL DirCompProgressBar::Create(CWnd* pParentWnd)
void DirCompProgressBar::SetProgressState(int comparedItems, int totalItems)
{
CProgressCtrl *pProg = (CProgressCtrl*) GetDlgItem(IDC_PROGRESSCOMPARE);
+ String itemsPerSecond = m_prevComparedItems.empty() ? _T("") : strutils::format(_("%.1f[items/sec]"),
+ (double)(comparedItems - m_prevComparedItems.front()) * 1000.0 / (UPDATE_INTERVAL * m_prevComparedItems.size()));
SetDlgItemInt(IDC_ITEMSTOTAL, totalItems);
SetDlgItemInt(IDC_ITEMSCOMPARED, comparedItems);
+ SetDlgItemText(IDC_ITEMS_PER_SEC, itemsPerSecond);
pProg->SetPos(comparedItems);
pProg->SetRange32(0, totalItems);
+ m_prevComparedItems.push_back(comparedItems);
+ if (m_prevComparedItems.size() > 10)
+ m_prevComparedItems.pop_front();
#ifdef __ITaskbarList3_INTERFACE_DEFINED__
if (m_pTaskbarList != nullptr)
@@ -101,6 +107,31 @@ void DirCompProgressBar::SetProgressState(int comparedItems, int totalItems)
#endif
}
+void DirCompProgressBar::SetNumberOfCPUCoresToUseMax(int max)
+{
+ CComboBox * cbo = (CComboBox *)GetDlgItem(IDC_COMPARISON_CPUCORES);
+ if (!cbo)
+ return;
+ cbo->ResetContent();
+ for (int i = 1; i <= max; ++i)
+ cbo->AddString(strutils::format(_T("%3d"), i).c_str());
+}
+
+int DirCompProgressBar::GetNumberOfCPUCoresToUse() const
+{
+ CComboBox * cbo = (CComboBox *)GetDlgItem(IDC_COMPARISON_CPUCORES);
+ if (!cbo)
+ return 0;
+ return cbo->GetCurSel() + 1;
+}
+
+void DirCompProgressBar::SetNumberOfCPUCoresToUse(int num)
+{
+ CComboBox * cbo = (CComboBox *)GetDlgItem(IDC_COMPARISON_CPUCORES);
+ if (cbo)
+ cbo->SetCurSel(num - 1);
+}
+
/**
* @brief Timer message received.
* Handle timer messages. When timer fires, update the dialog.
@@ -131,6 +162,8 @@ void DirCompProgressBar::OnTimer(UINT_PTR nIDEvent)
{
// Start comparing, init progressDlg
SetProgressState(m_pCompareStats->GetComparedItems(), m_pCompareStats->GetTotalItems());
+ SetNumberOfCPUCoresToUseMax(m_pCompareStats->GetCompareThreadCount());
+ SetNumberOfCPUCoresToUse(m_pCompareStats->GetCompareThreadCount());
m_prevState = CompareStats::STATE_COMPARE;
}
// Comparing items
diff --git a/Src/DirCompProgressBar.h b/Src/DirCompProgressBar.h
index 972486113cf..c887bced531 100644
--- a/Src/DirCompProgressBar.h
+++ b/Src/DirCompProgressBar.h
@@ -42,6 +42,8 @@ class DirCompProgressBar : public CTrDialogBar
void StartUpdating();
void EndUpdating();
void SetPaused(bool paused);
+ int GetNumberOfCPUCoresToUse() const;
+ void SetNumberOfCPUCoresToUse(int num);
// Dialog Data
//{{AFX_DATA(DirCompProgressBar)
@@ -52,6 +54,7 @@ class DirCompProgressBar : public CTrDialogBar
protected:
void ClearStat();
void SetProgressState(int comparedItems, int totalItems);
+ void SetNumberOfCPUCoresToUseMax(int max);
// Generated message map functions
//{{AFX_MSG(DirCompProgressBar)
@@ -63,6 +66,7 @@ class DirCompProgressBar : public CTrDialogBar
CompareStats *m_pCompareStats; /**< Pointer to comparestats */
CompareStats::CMP_STATE m_prevState; /**< Previous state for compare (to track changes) */
bool m_bCompareReady; /**< Compare ready, waiting for closing? */
+ std::list m_prevComparedItems;
#ifdef __ITaskbarList3_INTERFACE_DEFINED__
ITaskbarList3 *m_pTaskbarList;
#endif
diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index 44bf01637e8..ff32977beeb 100644
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -113,6 +113,7 @@ BEGIN_MESSAGE_MAP(CDirDoc, CDocument)
ON_BN_CLICKED(IDC_COMPARISON_STOP, OnBnClickedComparisonStop)
ON_BN_CLICKED(IDC_COMPARISON_PAUSE, OnBnClickedComparisonPause)
ON_BN_CLICKED(IDC_COMPARISON_CONTINUE, OnBnClickedComparisonContinue)
+ ON_CBN_SELCHANGE(IDC_COMPARISON_CPUCORES, OnCbnSelChangeCPUCores)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
@@ -333,6 +334,7 @@ void CDirDoc::Rescan()
pf->GetHeaderInterface()->Resize();
int nPane = GetOptionsMgr()->GetInt(OPT_ACTIVE_PANE);
m_pDirView->SetActivePane((nPane >= 0 && nPane < m_nDirs) ? nPane : 0);
+ m_pDirView->GetParentFrame()->SetStatus(_("Comparing items...").c_str());
// Show current compare method name and active filter name in statusbar
pf->SetFilterStatusDisplay(theApp.GetGlobalFileFilter()->GetFilterNameOrMask().c_str());
@@ -1026,3 +1028,11 @@ void CDirDoc::OnBnClickedComparisonContinue()
ContinueCurrentScan();
}
+void CDirDoc::OnCbnSelChangeCPUCores()
+{
+ if (!m_pCmpProgressBar)
+ return;
+ m_pCtxt->m_pCompareStats->SetIdleCompareThreadCount(
+ m_pCtxt->m_pCompareStats->GetCompareThreadCount() - m_pCmpProgressBar->GetNumberOfCPUCoresToUse()
+ );
+}
diff --git a/Src/DirDoc.h b/Src/DirDoc.h
index b4543b5e9c4..5c4ed0e1d6d 100644
--- a/Src/DirDoc.h
+++ b/Src/DirDoc.h
@@ -137,6 +137,7 @@ class CDirDoc : public CDocument, public IMDITab
afx_msg void OnBnClickedComparisonStop();
afx_msg void OnBnClickedComparisonPause();
afx_msg void OnBnClickedComparisonContinue();
+ afx_msg void OnCbnSelChangeCPUCores();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
diff --git a/Src/DirScan.cpp b/Src/DirScan.cpp
index 58865d8a990..880ef2e56df 100644
--- a/Src/DirScan.cpp
+++ b/Src/DirScan.cpp
@@ -100,6 +100,13 @@ class DiffWorker: public Runnable
CompareDiffItem(fc, pWorkNf->data());
pWorkNf->queueResult().enqueueNotification(new WorkCompletedNotification(pWorkNf->data()));
}
+ if (m_pCtxt->m_pCompareStats->IsIdleCompareThread(m_id))
+ {
+ m_pCtxt->m_pCompareStats->BeginCompare(nullptr, m_id);
+ while (!m_pCtxt->ShouldAbort() && m_pCtxt->m_pCompareStats->IsIdleCompareThread(m_id))
+ Poco::Thread::sleep(10);
+ }
+
pNf = m_queue.waitDequeueNotification();
}
}
@@ -499,6 +506,7 @@ int DirScan_CompareItems(DiffFuncStruct *myStruct, DIFFITEM *parentdiffpos)
int res = CompareItems(queue, myStruct, parentdiffpos);
+ myStruct->context->m_pCompareStats->SetIdleCompareThreadCount(0);
Thread::sleep(100);
queue.wakeUpAll();
threadPool.joinAll();
diff --git a/Src/Merge.rc b/Src/Merge.rc
index b9d2f76ab37..e4aa2ee5145 100644
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1643,16 +1643,18 @@ IDD_DIRCOMP_PROGRESS DIALOGEX 0, 0, 256, 60
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,184,9,65,14
- PUSHBUTTON "Pause",IDC_COMPARISON_PAUSE,113,9,65,14
+ DEFPUSHBUTTON "Stop",IDC_COMPARISON_STOP,184,4,65,14
+ PUSHBUTTON "Pause",IDC_COMPARISON_PAUSE,113,4,65,14
PUSHBUTTON "Continue",IDC_COMPARISON_CONTINUE,113,9,65,14,NOT WS_VISIBLE
CONTROL "",IDC_PROGRESSCOMPARE,"msctls_progress32",WS_BORDER,7,44,241,10
- RTEXT "0",IDC_ITEMSCOMPARED,95,29,60,10
- RTEXT "0",IDC_ITEMSTOTAL,95,19,60,10
- LTEXT "Comparing items...",IDC_STATIC,7,7,98,10
- LTEXT "Items compared:",IDC_STATIC,7,29,85,10
+ LTEXT "&Number of CPU cores to use:",IDC_STATIC,7,7,110,10
LTEXT "Items total:",IDC_STATIC,7,19,85,10
- LTEXT "",IDC_PATH_COMPARING,167,29,111,10
+ LTEXT "Items compared:",IDC_STATIC,7,31,85,10
+ COMBOBOX IDC_COMPARISON_CPUCORES,125,5,30,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ RTEXT "0",IDC_ITEMSTOTAL,95,19,60,10
+ RTEXT "0",IDC_ITEMSCOMPARED,95,31,60,10
+ LTEXT "",IDC_ITEMS_PER_SEC,167,19,85,10
+ LTEXT "",IDC_PATH_COMPARING,167,31,111,10
END
IDD_WMGOTO DIALOGEX 0, 0, 218, 80
@@ -2488,6 +2490,8 @@ BEGIN
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
+ 0, 0, 0, 0,
+ 0, 0, 0, 0,
0, 0, 100, 0
END
@@ -3314,6 +3318,8 @@ STRINGTABLE
BEGIN
IDS_DIRVIEW_STATUS_FMT_FOCUS "Item %1 of %2"
IDS_DIRVIEW_STATUS_FMT_NOFOCUS "Items: %1"
+ IDS_DIRVIEW_STATUS_COMPARING "Comparing items..."
+ IDS_ITEMS_PER_SEC "%.1f[items/sec]"
END
// OPEN DIALOG
diff --git a/Src/resource.h b/Src/resource.h
index 7b517e22bec..061be30c1ca 100644
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -294,27 +294,28 @@
#define IDC_COMPARISON_STOP 1108
#define IDC_COMPARISON_PAUSE 1109
#define IDC_COMPARISON_CONTINUE 1110
-#define IDC_DIFF_INCLCMDLINE 1111
-#define IDC_WMGOTO_FILELEFT 1112
-#define IDC_WMGOTO_FILEMIDDLE 1113
-#define IDC_WMGOTO_FILERIGHT 1114
-#define IDC_WMGOTO_TOLINE 1115
-#define IDC_WMGOTO_TODIFF 1116
-#define IDC_WMGOTO_PARAM 1117
-#define IDC_WMGOTO_RANGE 1118
-#define IDC_OPEN_CONTRIBUTORS 1119
-#define IDC_COMPAREMETHODCOMBO 1120
-#define IDC_USE_RECYCLE_BIN 1121
-#define IDC_COMPARE_DEFAULTS 1122
-#define IDC_DIFF_DEFAULTS 1123
-#define IDC_MOVED_BLOCKS 1124
-#define IDC_RESET_ALL_MESSAGE_BOXES 1125
-#define IDC_COLDLG_DEFAULTS 1126
-#define IDC_COLDLG_ADDITIONAL_PROPERTIES 1127
-#define IDC_OPEN_STATUS 1128
-#define IDC_FILTERFILE_EDITBTN 1129
-#define IDC_FILTERFILE_LIST 1130
-#define IDC_ESC_CLOSES_WINDOW 1131
+#define IDC_COMPARISON_CPUCORES 1111
+#define IDC_DIFF_INCLCMDLINE 1112
+#define IDC_WMGOTO_FILELEFT 1113
+#define IDC_WMGOTO_FILEMIDDLE 1114
+#define IDC_WMGOTO_FILERIGHT 1115
+#define IDC_WMGOTO_TOLINE 1116
+#define IDC_WMGOTO_TODIFF 1117
+#define IDC_WMGOTO_PARAM 1118
+#define IDC_WMGOTO_RANGE 1119
+#define IDC_OPEN_CONTRIBUTORS 1120
+#define IDC_COMPAREMETHODCOMBO 1121
+#define IDC_USE_RECYCLE_BIN 1122
+#define IDC_COMPARE_DEFAULTS 1123
+#define IDC_DIFF_DEFAULTS 1124
+#define IDC_MOVED_BLOCKS 1125
+#define IDC_RESET_ALL_MESSAGE_BOXES 1126
+#define IDC_COLDLG_DEFAULTS 1127
+#define IDC_COLDLG_ADDITIONAL_PROPERTIES 1128
+#define IDC_OPEN_STATUS 1129
+#define IDC_FILTERFILE_EDITBTN 1130
+#define IDC_FILTERFILE_LIST 1131
+#define IDC_ESC_CLOSES_WINDOW 1132
#define IDC_STATIC_TITLE_PANE0 1133
#define IDC_STATIC_TITLE_PANE1 1134
#define IDC_STATIC_TITLE_PANE2 1135
@@ -592,6 +593,7 @@
#define IDC_COMPAREWEBPAGE_URLPATTERNTOEXCLUDE 1428
#define IDC_JUMP_LIST 1429
#define IDC_CLEAR_ALL_RECENT_ITEMS 1430
+#define IDC_ITEMS_PER_SEC 1431
#define IDC_EXPAND_SUBDIRS 1600
#define IDC_FILEENCODING 1601
#define IDC_PLUGIN 1602
@@ -1183,6 +1185,7 @@
#define IDS_STATUSBAR_READONLY 40839
#define IDS_DIRVIEW_STATUS_FMT_FOCUS 40840
#define IDS_DIRVIEW_STATUS_FMT_NOFOCUS 40841
+#define IDS_DIRVIEW_STATUS_COMPARING 40842
#define IDS_ERROR_INCOMPARABLE 41200
#define IDS_DIRSEL_TAG 41201
#define IDS_OPEN_FILESDIRS 41202
@@ -1632,6 +1635,7 @@
#define IDS_JUMPLIST_NEW_IMAGE_COMPARE 44523
#define IDS_JUMPLIST_NEW_WEBPAGE_COMPARE 44524
#define IDS_JUMPLIST_CLIPBOARD_COMPARE 44525
+#define IDS_ITEMS_PER_SEC 44526
// Next default values for new objects
//
diff --git a/Translations/TranslationsStatus.md b/Translations/TranslationsStatus.md
index f82bc13e3a9..30f34b64a64 100644
--- a/Translations/TranslationsStatus.md
+++ b/Translations/TranslationsStatus.md
@@ -1,49 +1,49 @@
# Translations Status
-Status from **2023-07-25**:
+Status from **2023-07-26**:
## WinMerge
| Language | Total | Translated | Fuzzy | Untranslated | Complete | Last Update |
|:---------------------|------:|-----------:|------:|-------------:|---------:|:-----------:|
-| Arabic | 1300 | 897 | 0 | 403 | 69 % | 2019-12-30 |
-| Basque | 1300 | 639 | 0 | 661 | 49 % | 2013-02-03 |
-| Brazilian | 1300 | 1300 | 0 | 0 | 100 % | 2023-06-18 |
-| Bulgarian | 1300 | 1040 | 0 | 260 | 80 % | 2021-06-28 |
-| Catalan | 1300 | 1181 | 0 | 119 | 90 % | |
-| ChineseSimplified | 1300 | 1300 | 0 | 0 | 100 % | |
-| ChineseTraditional | 1300 | 1300 | 0 | 0 | 100 % | 2022-02-19 |
-| Corsican | 1300 | 1300 | 0 | 0 | 100 % | 2023-07-06 |
-| Croatian | 1300 | 631 | 1 | 668 | 48 % | 2009-02-13 |
-| Czech | 1300 | 606 | 0 | 694 | 46 % | |
-| Danish | 1300 | 640 | 0 | 660 | 49 % | 2013-01-13 |
-| Dutch | 1300 | 1287 | 0 | 13 | 99 % | 2023-05-02 |
-| English | 1300 | 1300 | 0 | 0 | 100 % | 2023-06-12 |
-| Finnish | 1300 | 1192 | 0 | 108 | 91 % | |
-| French | 1300 | 1300 | 0 | 0 | 100 % | 2023-07-02 |
-| Galician | 1300 | 1286 | 0 | 14 | 98 % | 2023-05-01 |
-| German | 1300 | 1300 | 0 | 0 | 100 % | 2023-06-20 |
-| Greek | 1300 | 605 | 0 | 695 | 46 % | |
-| Hungarian | 1300 | 1300 | 0 | 0 | 100 % | 2021-03-15 |
-| Italian | 1300 | 1103 | 0 | 197 | 84 % | 2022-06-01 |
-| Japanese | 1300 | 1300 | 0 | 0 | 100 % | 2023-05-01 |
-| Korean | 1300 | 1300 | 0 | 0 | 100 % | 2023-06-21 |
-| Lithuanian | 1300 | 1255 | 0 | 45 | 96 % | 2023-06-19 |
-| Norwegian | 1300 | 731 | 0 | 569 | 56 % | |
-| Persian | 1300 | 642 | 0 | 658 | 49 % | 2013-08-15 |
-| Polish | 1300 | 1292 | 0 | 8 | 99 % | 2023-05-24 |
-| Portuguese | 1300 | 1300 | 0 | 0 | 100 % | 2023-07-04 |
-| Romanian | 1300 | 561 | 44 | 695 | 46 % | |
-| Russian | 1300 | 1286 | 0 | 14 | 98 % | 2023-04-27 |
-| Serbian | 1300 | 633 | 0 | 667 | 48 % | |
-| Sinhala | 1300 | 564 | 58 | 678 | 47 % | 2010-12-12 |
-| Slovak | 1300 | 1191 | 0 | 109 | 91 % | 2022-02-17 |
-| Slovenian | 1300 | 1300 | 0 | 0 | 100 % | 2023-07-03 |
-| Spanish | 1300 | 1286 | 0 | 14 | 98 % | 2023-05-02 |
-| Swedish | 1300 | 1239 | 2 | 59 | 95 % | 2023-02-08 |
-| Tamil | 1300 | 1225 | 0 | 75 | 94 % | 2023-07-24 |
-| Turkish | 1300 | 1300 | 0 | 0 | 100 % | 2023-07-06 |
-| Ukrainian | 1300 | 637 | 0 | 663 | 49 % | 2009-06-13 |
+| Arabic | 1301 | 897 | 0 | 404 | 68 % | 2019-12-30 |
+| Basque | 1301 | 639 | 0 | 662 | 49 % | 2013-02-03 |
+| Brazilian | 1301 | 1300 | 0 | 1 | 99 % | 2023-06-18 |
+| Bulgarian | 1301 | 1040 | 0 | 261 | 79 % | 2021-06-28 |
+| Catalan | 1301 | 1181 | 0 | 120 | 90 % | |
+| ChineseSimplified | 1301 | 1300 | 0 | 1 | 99 % | |
+| ChineseTraditional | 1301 | 1300 | 0 | 1 | 99 % | 2022-02-19 |
+| Corsican | 1301 | 1300 | 0 | 1 | 99 % | 2023-07-06 |
+| Croatian | 1301 | 631 | 1 | 669 | 48 % | 2009-02-13 |
+| Czech | 1301 | 606 | 0 | 695 | 46 % | |
+| Danish | 1301 | 640 | 0 | 661 | 49 % | 2013-01-13 |
+| Dutch | 1301 | 1287 | 0 | 14 | 98 % | 2023-05-02 |
+| English | 1301 | 1301 | 0 | 0 | 100 % | 2023-07-23 |
+| Finnish | 1301 | 1192 | 0 | 109 | 91 % | |
+| French | 1301 | 1300 | 0 | 1 | 99 % | 2023-07-02 |
+| Galician | 1301 | 1286 | 0 | 15 | 98 % | 2023-05-01 |
+| German | 1301 | 1300 | 0 | 1 | 99 % | 2023-06-20 |
+| Greek | 1301 | 605 | 0 | 696 | 46 % | |
+| Hungarian | 1301 | 1300 | 0 | 1 | 99 % | 2021-03-15 |
+| Italian | 1301 | 1103 | 0 | 198 | 84 % | 2022-06-01 |
+| Japanese | 1301 | 1301 | 0 | 0 | 100 % | 2023-05-01 |
+| Korean | 1301 | 1300 | 0 | 1 | 99 % | 2023-06-21 |
+| Lithuanian | 1301 | 1255 | 0 | 46 | 96 % | 2023-06-19 |
+| Norwegian | 1301 | 731 | 0 | 570 | 56 % | |
+| Persian | 1301 | 642 | 0 | 659 | 49 % | 2013-08-15 |
+| Polish | 1301 | 1292 | 0 | 9 | 99 % | 2023-05-24 |
+| Portuguese | 1301 | 1300 | 0 | 1 | 99 % | 2023-07-04 |
+| Romanian | 1301 | 561 | 44 | 696 | 46 % | |
+| Russian | 1301 | 1286 | 0 | 15 | 98 % | 2023-04-27 |
+| Serbian | 1301 | 633 | 0 | 668 | 48 % | |
+| Sinhala | 1301 | 564 | 58 | 679 | 47 % | 2010-12-12 |
+| Slovak | 1301 | 1191 | 0 | 110 | 91 % | 2022-02-17 |
+| Slovenian | 1301 | 1300 | 0 | 1 | 99 % | 2023-07-03 |
+| Spanish | 1301 | 1286 | 0 | 15 | 98 % | 2023-05-02 |
+| Swedish | 1301 | 1239 | 2 | 60 | 95 % | 2023-02-08 |
+| Tamil | 1301 | 1225 | 0 | 76 | 94 % | 2023-07-24 |
+| Turkish | 1301 | 1300 | 0 | 1 | 99 % | 2023-07-06 |
+| Ukrainian | 1301 | 637 | 0 | 664 | 48 % | 2009-06-13 |
## ShellExtension
diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po
index d05786802cc..6980d64465a 100644
--- a/Translations/WinMerge/Arabic.po
+++ b/Translations/WinMerge/Arabic.po
@@ -1458,15 +1458,15 @@ msgstr "إيقاف مؤقت"
msgid "Continue"
msgstr "استمرار"
-msgid "Comparing items..."
-msgstr "يتم مقارنة العناصر..."
-
-msgid "Items compared:"
-msgstr "العناصر التي تمت مقارنتها:"
+msgid "&Number of CPU cores to use:"
+msgstr ""
msgid "Items total:"
msgstr "كل العناصر:"
+msgid "Items compared:"
+msgstr "العناصر التي تمت مقارنتها:"
+
msgid "Go to"
msgstr "الذهاب إلى"
@@ -1990,9 +1990,6 @@ msgstr ""
msgid "Threshold for switching to &binary compare (MB):"
msgstr ""
-msgid "&Number of CPU cores to use:"
-msgstr ""
-
msgid "File patterns:"
msgstr ""
@@ -2467,6 +2464,13 @@ msgstr "العنصر %1 من %2"
msgid "Items: %1"
msgstr "العناصر: %1"
+msgid "Comparing items..."
+msgstr "يتم مقارنة العناصر..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "اختر ملفين أو مجلدين للمقارنة."
diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index 864fb8e0062..049f0096568 100644
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -1788,18 +1788,17 @@ msgstr ""
msgid "Continue"
msgstr ""
+msgid "&Number of CPU cores to use:"
+msgstr ""
+
#, c-format
-msgid "Comparing items..."
-msgstr "Gaiak alderatzen..."
+msgid "Items total:"
+msgstr "Gaiak guztira:"
#, c-format
msgid "Items compared:"
msgstr "Alderatutako gaiak:"
-#, c-format
-msgid "Items total:"
-msgstr "Gaiak guztira:"
-
msgid "Go to"
msgstr "Joan Hona"
@@ -2452,9 +2451,6 @@ msgstr ""
msgid "Threshold for switching to &binary compare (MB):"
msgstr ""
-msgid "&Number of CPU cores to use:"
-msgstr ""
-
msgid "File patterns:"
msgstr ""
@@ -2974,6 +2970,14 @@ msgstr "Gaiak %1 %2-tik"
msgid "Items: %1"
msgstr "Gaiak:%1"
+#, c-format
+msgid "Comparing items..."
+msgstr "Gaiak alderatzen..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Hautatu badauden bi agiritegi edo agiri alderatzeko."
diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index 797dac16e8d..c06d379eea6 100644
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -1455,15 +1455,15 @@ msgstr "Pausar"
msgid "Continue"
msgstr "Continuar"
-msgid "Comparing items..."
-msgstr "Comparando os itens..."
-
-msgid "Items compared:"
-msgstr "Itens comparados:"
+msgid "&Number of CPU cores to use:"
+msgstr "&Número de núcleos de CPU a serem utilizados:"
msgid "Items total:"
msgstr "Total de itens:"
+msgid "Items compared:"
+msgstr "Itens comparados:"
+
msgid "Go to"
msgstr "Ir para"
@@ -1981,9 +1981,6 @@ msgstr "Limite para alternar para comparação rápida (MB):"
msgid "Threshold for switching to &binary compare (MB):"
msgstr "Limite para alternar para comparação binária (MB):"
-msgid "&Number of CPU cores to use:"
-msgstr "&Número de núcleos de CPU a serem utilizados:"
-
msgid "File patterns:"
msgstr "Modelos de Arquivos:"
@@ -2363,6 +2360,13 @@ msgstr "Item %1 de %2"
msgid "Items: %1"
msgstr "Itens: %1"
+msgid "Comparing items..."
+msgstr "Comparando os itens..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Selecione duas pastas ou arquivos existentes pra comparar."
diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index 0a7808d474b..0147d1e01f9 100644
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -1454,15 +1454,15 @@ msgstr "Пауза"
msgid "Continue"
msgstr "Продължаване"
-msgid "Comparing items..."
-msgstr "Сравняване на…"
-
-msgid "Items compared:"
-msgstr "Сравнени:"
+msgid "&Number of CPU cores to use:"
+msgstr "Използа&не на брой процесорни ядра:"
msgid "Items total:"
msgstr "Всичко:"
+msgid "Items compared:"
+msgstr "Сравнени:"
+
msgid "Go to"
msgstr "Отиване към"
@@ -1992,9 +1992,6 @@ msgstr "Ограничение за превключване към &бързо
msgid "Threshold for switching to &binary compare (MB):"
msgstr "Ограничение за превключване към &двоично сравняване (МБ):"
-msgid "&Number of CPU cores to use:"
-msgstr "Използа&не на брой процесорни ядра:"
-
msgid "File patterns:"
msgstr "Шаблони за име на файл:"
@@ -2475,6 +2472,13 @@ msgstr "Елемент %1 от %2"
msgid "Items: %1"
msgstr "Общо: %1"
+msgid "Comparing items..."
+msgstr "Сравняване на…"
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Изберете две съществуващи папки или файла за сравняване."
diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index 0a9aa5190e8..afbdf9f7ab7 100644
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -1785,18 +1785,17 @@ msgstr "Pausa"
msgid "Continue"
msgstr "Continua"
+msgid "&Number of CPU cores to use:"
+msgstr ""
+
#, c-format
-msgid "Comparing items..."
-msgstr "Comparant elements..."
+msgid "Items total:"
+msgstr "Elements totals:"
#, c-format
msgid "Items compared:"
msgstr "Elements comparats:"
-#, c-format
-msgid "Items total:"
-msgstr "Elements totals:"
-
msgid "Go to"
msgstr "Anar"
@@ -2456,9 +2455,6 @@ msgstr "Llindar per realitzar una comparació ràpida (MB):"
msgid "Threshold for switching to &binary compare (MB):"
msgstr "Llindar per realitzar una comparació binària (MB):"
-msgid "&Number of CPU cores to use:"
-msgstr ""
-
msgid "File patterns:"
msgstr "Patrons de fitxer:"
@@ -2995,6 +2991,14 @@ msgstr "Element %1 de %2"
msgid "Items: %1"
msgstr "Elements: %1"
+#, c-format
+msgid "Comparing items..."
+msgstr "Comparant elements..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Selecciona dos directoris o fitxers existents per a comparar."
diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index 3423e31b53d..8b4d7988d93 100644
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -1460,15 +1460,15 @@ msgstr "暂停"
msgid "Continue"
msgstr "继续"
-msgid "Comparing items..."
-msgstr "正在比较条目..."
-
-msgid "Items compared:"
-msgstr "已比较条目:"
+msgid "&Number of CPU cores to use:"
+msgstr "可以使用的处理器核心数(&N):"
msgid "Items total:"
msgstr "条目总计:"
+msgid "Items compared:"
+msgstr "已比较条目:"
+
msgid "Go to"
msgstr "转到"
@@ -1995,9 +1995,6 @@ msgstr "切换到快速比较的最小值(&Q) (MB):"
msgid "Threshold for switching to &binary compare (MB):"
msgstr "切换到二进制比较的最小值(&B) (MB):"
-msgid "&Number of CPU cores to use:"
-msgstr "可以使用的处理器核心数(&N):"
-
msgid "File patterns:"
msgstr "文件模式:"
@@ -2477,6 +2474,13 @@ msgstr "第 %1 项,共 %2 项"
msgid "Items: %1"
msgstr "项目: %1"
+msgid "Comparing items..."
+msgstr "正在比较条目..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "选择两个现有的文件或文件夹来进行比较。"
diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index ef0d541dea3..0abcc155d71 100644
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -1795,18 +1795,17 @@ msgstr "暫停"
msgid "Continue"
msgstr "繼續"
+msgid "&Number of CPU cores to use:"
+msgstr "使用的 CPU 核心數量(&N):"
+
#, c-format
-msgid "Comparing items..."
-msgstr "比較項目中..."
+msgid "Items total:"
+msgstr "項目總數:"
#, c-format
msgid "Items compared:"
msgstr "比較過的項目:"
-#, c-format
-msgid "Items total:"
-msgstr "項目總數:"
-
msgid "Go to"
msgstr "移至"
@@ -2467,9 +2466,6 @@ msgstr "切換至快速比較的閾值 (MB)(&Q):"
msgid "Threshold for switching to &binary compare (MB):"
msgstr "切換至二進制比較的閾值 (MB)(&B):"
-msgid "&Number of CPU cores to use:"
-msgstr "使用的 CPU 核心數量(&N):"
-
msgid "File patterns:"
msgstr "檔案模式:"
@@ -3013,6 +3009,14 @@ msgstr "%2 個項目之第 %1"
msgid "Items: %1"
msgstr "項目:%1"
+#, c-format
+msgid "Comparing items..."
+msgstr "比較項目中..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "選取兩個現存資料夾或檔案做比對。"
diff --git a/Translations/WinMerge/Corsican.po b/Translations/WinMerge/Corsican.po
index d97f22f58c4..ae39b03375f 100644
--- a/Translations/WinMerge/Corsican.po
+++ b/Translations/WinMerge/Corsican.po
@@ -1459,15 +1459,15 @@ msgstr "Pausa"
msgid "Continue"
msgstr "Cuntinuà"
-msgid "Comparing items..."
-msgstr "Paragone di l’elementi…"
-
-msgid "Items compared:"
-msgstr "Elementi paragunati :"
+msgid "&Number of CPU cores to use:"
+msgstr "&Numeru di cori CPU à impiegà :"
msgid "Items total:"
msgstr "Tutale di l’elementi :"
+msgid "Items compared:"
+msgstr "Elementi paragunati :"
+
msgid "Go to"
msgstr "Andà à"
@@ -1993,9 +1993,6 @@ msgstr "Sogliu per passà à u paragone &rapidu (Mo) :"
msgid "Threshold for switching to &binary compare (MB):"
msgstr "Sogliu per passà à u paragone &binariu (Mo) :"
-msgid "&Number of CPU cores to use:"
-msgstr "&Numeru di cori CPU à impiegà :"
-
msgid "File patterns:"
msgstr "Mudelli di schedariu :"
@@ -2476,6 +2473,13 @@ msgstr "Elementu %1 nant’à %2"
msgid "Items: %1"
msgstr "Elementi : %1"
+msgid "Comparing items..."
+msgstr "Paragone di l’elementi…"
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Selezziunà dui cartulari o schedarii esistente à paragunà."
diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index e445453b8cf..f2a78f641e5 100644
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -1785,18 +1785,17 @@ msgstr ""
msgid "Continue"
msgstr ""
+msgid "&Number of CPU cores to use:"
+msgstr ""
+
#, c-format
-msgid "Comparing items..."
-msgstr "Usporedba stavki..."
+msgid "Items total:"
+msgstr "Stavki ukupno:"
#, c-format
msgid "Items compared:"
msgstr "Stavki uspoređeno:"
-#, c-format
-msgid "Items total:"
-msgstr "Stavki ukupno:"
-
msgid "Go to"
msgstr "Idi na"
@@ -2450,9 +2449,6 @@ msgstr ""
msgid "Threshold for switching to &binary compare (MB):"
msgstr ""
-msgid "&Number of CPU cores to use:"
-msgstr ""
-
msgid "File patterns:"
msgstr ""
@@ -2972,6 +2968,14 @@ msgstr "Stavka %1 od %2"
msgid "Items: %1"
msgstr "Stavke: %1"
+#, c-format
+msgid "Comparing items..."
+msgstr "Usporedba stavki..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Odaberite dvije datoteke ili mape za usporedbu."
diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index 1095c772b7d..006eb0f3f6f 100644
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -1785,18 +1785,17 @@ msgstr ""
msgid "Continue"
msgstr ""
+msgid "&Number of CPU cores to use:"
+msgstr ""
+
#, c-format
-msgid "Comparing items..."
-msgstr "Porovnávají se položky..."
+msgid "Items total:"
+msgstr "Celkem:"
#, c-format
msgid "Items compared:"
msgstr "Porovnáno:"
-#, c-format
-msgid "Items total:"
-msgstr "Celkem:"
-
msgid "Go to"
msgstr "Přejít"
@@ -2450,9 +2449,6 @@ msgstr ""
msgid "Threshold for switching to &binary compare (MB):"
msgstr ""
-msgid "&Number of CPU cores to use:"
-msgstr ""
-
msgid "File patterns:"
msgstr ""
@@ -2941,6 +2937,14 @@ msgstr "Položka %1 z %2"
msgid "Items: %1"
msgstr "Položek: %1"
+#, c-format
+msgid "Comparing items..."
+msgstr "Porovnávají se položky..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Vyberte dvě existující složky nebo soubory k porovnání."
diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index b821fdfdf13..bcdad1550aa 100644
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -1786,18 +1786,17 @@ msgstr ""
msgid "Continue"
msgstr ""
+msgid "&Number of CPU cores to use:"
+msgstr ""
+
#, c-format
-msgid "Comparing items..."
-msgstr "Sammenligner emner..."
+msgid "Items total:"
+msgstr "Emner ialt:"
#, c-format
msgid "Items compared:"
msgstr "Emner sammenlignet:"
-#, c-format
-msgid "Items total:"
-msgstr "Emner ialt:"
-
msgid "Go to"
msgstr "Gå til"
@@ -2455,9 +2454,6 @@ msgstr ""
msgid "Threshold for switching to &binary compare (MB):"
msgstr ""
-msgid "&Number of CPU cores to use:"
-msgstr ""
-
msgid "File patterns:"
msgstr ""
@@ -2987,6 +2983,14 @@ msgstr "Emne %1 of %2"
msgid "Items: %1"
msgstr "Emner: %1"
+#, c-format
+msgid "Comparing items..."
+msgstr "Sammenligner emner..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Vælg to eksisterende mapper eller filer at sammenligne."
diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index 988067aad69..f61aa88ea95 100644
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -1455,15 +1455,15 @@ msgstr "Pauzeren"
msgid "Continue"
msgstr "Doorgaan"
-msgid "Comparing items..."
-msgstr "Items vergelijken..."
-
-msgid "Items compared:"
-msgstr "Items vergeleken:"
+msgid "&Number of CPU cores to use:"
+msgstr "Aantal CPU-kernen te gebruiken:"
msgid "Items total:"
msgstr "Totaal aantal items:"
+msgid "Items compared:"
+msgstr "Items vergeleken:"
+
msgid "Go to"
msgstr "Gaan naar"
@@ -1989,9 +1989,6 @@ msgstr "Drempel voor overschakelen naar snel vergelijken (MB):"
msgid "Threshold for switching to &binary compare (MB):"
msgstr "Drempel voor overschakelen naar binair vergelijken (MB):"
-msgid "&Number of CPU cores to use:"
-msgstr "Aantal CPU-kernen te gebruiken:"
-
msgid "File patterns:"
msgstr "Bestandspatronen:"
@@ -2467,6 +2464,13 @@ msgstr "Item %1 van %2"
msgid "Items: %1"
msgstr "Items: %1"
+msgid "Comparing items..."
+msgstr "Items vergelijken..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Twee bestaande mappen of bestanden selecteren om te vergelijken."
diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index d6c409c17fb..c9e962c8300 100644
--- 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-06-12 00:06+0000\n"
+"POT-Creation-Date: 2023-07-26 07:00+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English \n"
@@ -1449,13 +1449,13 @@ msgstr ""
msgid "Continue"
msgstr ""
-msgid "Comparing items..."
+msgid "&Number of CPU cores to use:"
msgstr ""
-msgid "Items compared:"
+msgid "Items total:"
msgstr ""
-msgid "Items total:"
+msgid "Items compared:"
msgstr ""
msgid "Go to"
@@ -1975,9 +1975,6 @@ msgstr ""
msgid "Threshold for switching to &binary compare (MB):"
msgstr ""
-msgid "&Number of CPU cores to use:"
-msgstr ""
-
msgid "File patterns:"
msgstr ""
@@ -2357,6 +2354,13 @@ msgstr ""
msgid "Items: %1"
msgstr ""
+msgid "Comparing items..."
+msgstr ""
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr ""
diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
index 16426e4afa3..b6a3de8c4b8 100644
--- a/Translations/WinMerge/Finnish.po
+++ b/Translations/WinMerge/Finnish.po
@@ -1460,15 +1460,15 @@ msgstr "Tauko"
msgid "Continue"
msgstr "Jatka"
-msgid "Comparing items..."
-msgstr "Verrataan kohteita..."
-
-msgid "Items compared:"
-msgstr "Verratut kohteet:"
+msgid "&Number of CPU cores to use:"
+msgstr ""
msgid "Items total:"
msgstr "Kohteita yhteensä:"
+msgid "Items compared:"
+msgstr "Verratut kohteet:"
+
msgid "Go to"
msgstr "Siirry >"
@@ -1996,9 +1996,6 @@ msgstr "Kynnysarvo, jossa siirrytään &nopeaan vertailuun (MB):"
msgid "Threshold for switching to &binary compare (MB):"
msgstr "Kynnysarvo, jossa siirrytään &binaariseen vertailuun (MB):"
-msgid "&Number of CPU cores to use:"
-msgstr ""
-
msgid "File patterns:"
msgstr "Tiedostomallit:"
@@ -2482,6 +2479,13 @@ msgstr "Kohta %1 / %2"
msgid "Items: %1"
msgstr "Kohdat: %1"
+msgid "Comparing items..."
+msgstr "Verrataan kohteita..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Valitse vertailuun kaksi olemassa olevaa kansioita tai tiedostoa."
diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index c7b2ec2c853..7f72e74039e 100644
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -1793,18 +1793,17 @@ msgstr "Pause"
msgid "Continue"
msgstr "Continuer"
+msgid "&Number of CPU cores to use:"
+msgstr "&Nombre de cœurs de processeur à utiliser :"
+
#, c-format
-msgid "Comparing items..."
-msgstr "Comparaison des éléments..."
+msgid "Items total:"
+msgstr "Éléments au total :"
#, c-format
msgid "Items compared:"
msgstr "Éléments comparés :"
-#, c-format
-msgid "Items total:"
-msgstr "Éléments au total :"
-
msgid "Go to"
msgstr "Atteindre"
@@ -2464,9 +2463,6 @@ msgstr "Seuil de passage en comparaison &rapide (Mo) :"
msgid "Threshold for switching to &binary compare (MB):"
msgstr "Seuil de passage à la comparaison &binaire (Mo) :"
-msgid "&Number of CPU cores to use:"
-msgstr "&Nombre de cœurs de processeur à utiliser :"
-
msgid "File patterns:"
msgstr "Modèles de fichiers :"
@@ -3017,6 +3013,14 @@ msgstr "Élément %1 de %2"
msgid "Items: %1"
msgstr "Élément: %1"
+#, c-format
+msgid "Comparing items..."
+msgstr "Comparaison des éléments..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Sélectionner : 2 Fichiers - ou : 2 Dossiers - existants à comparer."
diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index 9f6d3107b87..3034df5f7ba 100644
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -1456,15 +1456,15 @@ msgstr "Pausar"
msgid "Continue"
msgstr "Continuar"
-msgid "Comparing items..."
-msgstr "Comparando elementos..."
-
-msgid "Items compared:"
-msgstr "Elementos comparados:"
+msgid "&Number of CPU cores to use:"
+msgstr "&Número de núcleos de CPU a utilizar:"
msgid "Items total:"
msgstr "Total:"
+msgid "Items compared:"
+msgstr "Elementos comparados:"
+
msgid "Go to"
msgstr "Ir a"
@@ -1990,9 +1990,6 @@ msgstr "Li&miar para cambiar a comparación rápida (MB):"
msgid "Threshold for switching to &binary compare (MB):"
msgstr "Limiar para cambiar a comparación &binaria (MB):"
-msgid "&Number of CPU cores to use:"
-msgstr "&Número de núcleos de CPU a utilizar:"
-
msgid "File patterns:"
msgstr "Padróns de ficheiro:"
@@ -2468,6 +2465,13 @@ msgstr "Elemento %1 de %2"
msgid "Items: %1"
msgstr "Elementos: %1"
+msgid "Comparing items..."
+msgstr "Comparando elementos..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Seleccione dúas carpetas ou ficheiros para comparar."
diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index 163fcdd9a42..97e5e5b077e 100644
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -1789,18 +1789,17 @@ msgstr "Pause"
msgid "Continue"
msgstr "Fortsetzen"
+msgid "&Number of CPU cores to use:"
+msgstr "Anzahl der zu verwendenden &CPU-Kerne:"
+
#, c-format
-msgid "Comparing items..."
-msgstr "Objekte vergleichen..."
+msgid "Items total:"
+msgstr "Objekte gesamt:"
#, c-format
msgid "Items compared:"
msgstr "Objekte verglichen:"
-#, c-format
-msgid "Items total:"
-msgstr "Objekte gesamt:"
-
msgid "Go to"
msgstr "Gehe zu"
@@ -2452,9 +2451,6 @@ msgstr "Schwellenwert für den Wechsel zum &Schnellvergleich (MB):"
msgid "Threshold for switching to &binary compare (MB):"
msgstr "Schwellenwert für den Wechsel zum &Binärvergleich (MB):"
-msgid "&Number of CPU cores to use:"
-msgstr "Anzahl der zu verwendenden &CPU-Kerne:"
-
msgid "File patterns:"
msgstr "&Dateimuster:"
@@ -2909,6 +2905,14 @@ msgstr "Objekt %1 von %2"
msgid "Items: %1"
msgstr "Objekte: %1"
+#, c-format
+msgid "Comparing items..."
+msgstr "Objekte vergleichen..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Wählen Sie zwei Dateien oder Ordner zum Vergleichen aus."
diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index 4eba9cd37ab..edff7d03ce1 100644
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -1784,18 +1784,17 @@ msgstr ""
msgid "Continue"
msgstr ""
+msgid "&Number of CPU cores to use:"
+msgstr ""
+
#, c-format
-msgid "Comparing items..."
-msgstr "Σύγκριση αντικειμένων..."
+msgid "Items total:"
+msgstr "Σύνολο αντικειμένων:"
#, c-format
msgid "Items compared:"
msgstr "Συγκριθέντα αντικείμενα:"
-#, c-format
-msgid "Items total:"
-msgstr "Σύνολο αντικειμένων:"
-
msgid "Go to"
msgstr "Μετάβαση"
@@ -2447,9 +2446,6 @@ msgstr ""
msgid "Threshold for switching to &binary compare (MB):"
msgstr ""
-msgid "&Number of CPU cores to use:"
-msgstr ""
-
msgid "File patterns:"
msgstr ""
@@ -2966,6 +2962,14 @@ msgstr "Αντικείμενο %1 από %2"
msgid "Items: %1"
msgstr "Αντικείμενα: %1"
+#, c-format
+msgid "Comparing items..."
+msgstr "Σύγκριση αντικειμένων..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Επιλέξατε δύο υπάρχοντες φακέλους ή αρχεία προς σύγκριση."
diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index 35c691937a0..eff8743dd72 100644
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -1787,18 +1787,17 @@ msgstr "Szünet"
msgid "Continue"
msgstr "Folytatás"
+msgid "&Number of CPU cores to use:"
+msgstr "Használandó CPU magok száma:"
+
#, c-format
-msgid "Comparing items..."
-msgstr "Elemek összehasonlítása..."
+msgid "Items total:"
+msgstr "Összes elem:"
#, c-format
msgid "Items compared:"
msgstr "Összehasonlított elemek:"
-#, c-format
-msgid "Items total:"
-msgstr "Összes elem:"
-
msgid "Go to"
msgstr "Ugrás"
@@ -2458,9 +2457,6 @@ msgstr "A gyors összehasonlítás méretkorlátja (MB):"
msgid "Threshold for switching to &binary compare (MB):"
msgstr "A bináris összehasonlítás méretkorlátja (MB):"
-msgid "&Number of CPU cores to use:"
-msgstr "Használandó CPU magok száma:"
-
msgid "File patterns:"
msgstr "Fájlfajták:"
@@ -3003,6 +2999,14 @@ msgstr "elem: %1 / %2"
msgid "Items: %1"
msgstr "%1 elem"
+#, c-format
+msgid "Comparing items..."
+msgstr "Elemek összehasonlítása..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Válassz ki két összehasonlítandó fájlt vagy könyvtárat."
diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index 9a62ad45011..988651a101a 100644
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -1453,15 +1453,15 @@ msgstr "Pausa"
msgid "Continue"
msgstr "Continua"
-msgid "Comparing items..."
-msgstr "Confronto elementi..."
-
-msgid "Items compared:"
-msgstr "Elementi confrontati:"
+msgid "&Number of CPU cores to use:"
+msgstr ""
msgid "Items total:"
msgstr "Totale elementi:"
+msgid "Items compared:"
+msgstr "Elementi confrontati:"
+
msgid "Go to"
msgstr "Vai a"
@@ -1987,9 +1987,6 @@ msgstr "Soglia per passare al confronto &rapido (MB):"
msgid "Threshold for switching to &binary compare (MB):"
msgstr "Soglia per passare al confronto &binario (MB):"
-msgid "&Number of CPU cores to use:"
-msgstr ""
-
msgid "File patterns:"
msgstr "Pattern di file:"
@@ -2460,6 +2457,13 @@ msgstr "Elemento %1 di %2"
msgid "Items: %1"
msgstr "Elementi: %1"
+msgid "Comparing items..."
+msgstr "Confronto elementi..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Seleziona due cartelle o file esistenti da confrontare."
diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index 639effbab31..4d55b6a247f 100644
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -1458,15 +1458,15 @@ msgstr "一時停止"
msgid "Continue"
msgstr "再開"
-msgid "Comparing items..."
-msgstr "項目を比較しています..."
-
-msgid "Items compared:"
-msgstr "比較した項目:"
+msgid "&Number of CPU cores to use:"
+msgstr "使用するCPUコアの数(&N):"
msgid "Items total:"
msgstr "全項目数:"
+msgid "Items compared:"
+msgstr "比較した項目:"
+
msgid "Go to"
msgstr "移動"
@@ -1992,9 +1992,6 @@ msgstr "クイック比較切替閾値 (MB)(&Q):"
msgid "Threshold for switching to &binary compare (MB):"
msgstr "バイナリ比較切替閾値 (MB)(&B):"
-msgid "&Number of CPU cores to use:"
-msgstr "使用するCPUコアの数(&N):"
-
msgid "File patterns:"
msgstr "ファイル パターン:"
@@ -2468,6 +2465,13 @@ msgstr "項目 %1 / %2"
msgid "Items: %1"
msgstr "項目: %1"
+msgid "Comparing items..."
+msgstr "項目を比較しています..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr "%.1f[項目/秒]"
+
msgid "Select two existing folders or files to compare."
msgstr "存在するフォルダーまたはファイルを選択してください。"
diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index 006fb2f3453..297ea6379c2 100644
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -1794,18 +1794,17 @@ msgstr "일시 중지"
msgid "Continue"
msgstr "계속"
+msgid "&Number of CPU cores to use:"
+msgstr "사용할 CPU 코어 수(&N):"
+
#, c-format
-msgid "Comparing items..."
-msgstr "항목 비교 중..."
+msgid "Items total:"
+msgstr "전체 항목:"
#, c-format
msgid "Items compared:"
msgstr "비교된 항목:"
-#, c-format
-msgid "Items total:"
-msgstr "전체 항목:"
-
msgid "Go to"
msgstr "이동"
@@ -2465,9 +2464,6 @@ msgstr "빠른 비교로 전환하기 위한 임계값 (MB)(&Q):"
msgid "Threshold for switching to &binary compare (MB):"
msgstr "바이너리 비교로 전환하기 위한 임계값 (MB)(&B):"
-msgid "&Number of CPU cores to use:"
-msgstr "사용할 CPU 코어 수(&N):"
-
msgid "File patterns:"
msgstr "파일 패턴:"
@@ -3018,6 +3014,14 @@ msgstr "항목 %1 / %2"
msgid "Items: %1"
msgstr "항목: %1"
+#, c-format
+msgid "Comparing items..."
+msgstr "항목 비교 중..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "비교할 기존의 폴더나 파일 두 개를 선택하세요."
diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po
index 24ee73414f7..5a7407239aa 100644
--- a/Translations/WinMerge/Lithuanian.po
+++ b/Translations/WinMerge/Lithuanian.po
@@ -1455,15 +1455,15 @@ msgstr "Pristabdyti"
msgid "Continue"
msgstr "Tęsti"
-msgid "Comparing items..."
-msgstr "Lygina elementus..."
-
-msgid "Items compared:"
-msgstr "Elementų palyginta:"
+msgid "&Number of CPU cores to use:"
+msgstr "&Naudojamas procesoriaus branduolių skaičius:"
msgid "Items total:"
msgstr "Iš viso elementų:"
+msgid "Items compared:"
+msgstr "Elementų palyginta:"
+
msgid "Go to"
msgstr "Pereiti į"
@@ -1981,9 +1981,6 @@ msgstr "Persijungimo į &spartųjį palyginimą riba (MB):"
msgid "Threshold for switching to &binary compare (MB):"
msgstr "Persijungimo į &binarinį palyginimą riba (MB):"
-msgid "&Number of CPU cores to use:"
-msgstr "&Naudojamas procesoriaus branduolių skaičius:"
-
msgid "File patterns:"
msgstr "Failų šablonai:"
@@ -2363,6 +2360,13 @@ msgstr "Elementas %1 iš %2"
msgid "Items: %1"
msgstr "Elementų: %1"
+msgid "Comparing items..."
+msgstr "Lygina elementus..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Nurodykite lyginimui du egzistuojančius katalogus ar failus."
diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index 3e1f42fabdd..9b47ed490d5 100644
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -1456,15 +1456,15 @@ msgstr ""
msgid "Continue"
msgstr ""
-msgid "Comparing items..."
-msgstr "Sammenligner objekter..."
-
-msgid "Items compared:"
-msgstr "Objekter sammenlignet:"
+msgid "&Number of CPU cores to use:"
+msgstr ""
msgid "Items total:"
msgstr "Objekter totalt:"
+msgid "Items compared:"
+msgstr "Objekter sammenlignet:"
+
msgid "Go to"
msgstr "Gå til"
@@ -1993,9 +1993,6 @@ msgstr ""
msgid "Threshold for switching to &binary compare (MB):"
msgstr ""
-msgid "&Number of CPU cores to use:"
-msgstr ""
-
msgid "File patterns:"
msgstr ""
@@ -2478,6 +2475,13 @@ msgstr "Objekt %1 av %2"
msgid "Items: %1"
msgstr "Objekter: %1"
+msgid "Comparing items..."
+msgstr "Sammenligner objekter..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Velg to eksisterende mapper eller filer for å sammenligne."
diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index 547303aef29..d208501625b 100644
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -1788,18 +1788,17 @@ msgstr ""
msgid "Continue"
msgstr ""
+msgid "&Number of CPU cores to use:"
+msgstr ""
+
#, c-format
-msgid "Comparing items..."
-msgstr " همسنجي موارد ... "
+msgid "Items total:"
+msgstr " کل موارد : "
#, c-format
msgid "Items compared:"
msgstr " موارد مقايسه شده : "
-#, c-format
-msgid "Items total:"
-msgstr " کل موارد : "
-
msgid "Go to"
msgstr " برو به "
@@ -2457,9 +2456,6 @@ msgstr ""
msgid "Threshold for switching to &binary compare (MB):"
msgstr ""
-msgid "&Number of CPU cores to use:"
-msgstr ""
-
msgid "File patterns:"
msgstr ""
@@ -2995,6 +2991,14 @@ msgstr " مورد %1 از %2"
msgid "Items: %1"
msgstr " موارد : %1"
+#, c-format
+msgid "Comparing items..."
+msgstr " همسنجي موارد ... "
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr " انتخاب دو پوشه يا پرونده موجود براي مقايسه؟ "
diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index ab77474ab79..96b01a9ac73 100644
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -1456,15 +1456,15 @@ msgstr "Wstrzymaj"
msgid "Continue"
msgstr "kontynuuj"
-msgid "Comparing items..."
-msgstr "Porównywanie elementów..."
-
-msgid "Items compared:"
-msgstr "Porównano elementów:"
+msgid "&Number of CPU cores to use:"
+msgstr "Liczba rdzeni CPU do wykorzystania:"
msgid "Items total:"
msgstr "Łącznie elementów:"
+msgid "Items compared:"
+msgstr "Porównano elementów:"
+
msgid "Go to"
msgstr "Idź do"
@@ -1982,9 +1982,6 @@ msgstr "Próg przejścia na szybkie porównywanie (MB):"
msgid "Threshold for switching to &binary compare (MB):"
msgstr "Próg przejścia na binarne porównywanie (MB):"
-msgid "&Number of CPU cores to use:"
-msgstr "Liczba rdzeni CPU do wykorzystania:"
-
msgid "File patterns:"
msgstr "Szablony pliku:"
@@ -2364,6 +2361,13 @@ msgstr "Element %1 z %2"
msgid "Items: %1"
msgstr "Elementy: %1"
+msgid "Comparing items..."
+msgstr "Porównywanie elementów..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Wybierz dwa istniejące foldery lub pliki do porównania."
diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index 107734ca58b..2dcb46e3876 100644
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -1460,15 +1460,15 @@ msgstr "Pausa"
msgid "Continue"
msgstr "Continuar"
-msgid "Comparing items..."
-msgstr "A comparar itens..."
-
-msgid "Items compared:"
-msgstr "Itens comparados:"
+msgid "&Number of CPU cores to use:"
+msgstr "&Número de núcleos de CPU a utilizar:"
msgid "Items total:"
msgstr "Total de itens:"
+msgid "Items compared:"
+msgstr "Itens comparados:"
+
msgid "Go to"
msgstr "Ir para"
@@ -1996,9 +1996,6 @@ msgstr "Limite para trocar para comparação &rápida (MB):"
msgid "Threshold for switching to &binary compare (MB):"
msgstr "Limite para trocar para comparação &binária (MB):"
-msgid "&Number of CPU cores to use:"
-msgstr "&Número de núcleos de CPU a utilizar:"
-
msgid "File patterns:"
msgstr "Padrões de ficheiros:"
@@ -2481,6 +2478,13 @@ msgstr "Item %1 de %2"
msgid "Items: %1"
msgstr "Itens: %1"
+msgid "Comparing items..."
+msgstr "A comparar itens..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Selecione duas pastas existentes ou ficheiros para comparar."
diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index 239780b3fae..1b1996f423e 100644
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -1785,18 +1785,17 @@ msgstr ""
msgid "Continue"
msgstr ""
+msgid "&Number of CPU cores to use:"
+msgstr ""
+
#, c-format
-msgid "Comparing items..."
-msgstr "Comparare elemente..."
+msgid "Items total:"
+msgstr "Elemente total:"
#, c-format
msgid "Items compared:"
msgstr "Elemente comparate:"
-#, c-format
-msgid "Items total:"
-msgstr "Elemente total:"
-
msgid "Go to"
msgstr "Mergi la"
@@ -2448,9 +2447,6 @@ msgstr ""
msgid "Threshold for switching to &binary compare (MB):"
msgstr ""
-msgid "&Number of CPU cores to use:"
-msgstr ""
-
msgid "File patterns:"
msgstr ""
@@ -2971,6 +2967,14 @@ msgstr "Element %1 din %2"
msgid "Items: %1"
msgstr "Elemente: %1"
+#, c-format
+msgid "Comparing items..."
+msgstr "Comparare elemente..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Selectaţi două directoare sau fişiere existente pentru comparare."
diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index fdc90477c7b..a873d2bb4bc 100644
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -1457,15 +1457,15 @@ msgstr "Пауза"
msgid "Continue"
msgstr "Продолжить"
-msgid "Comparing items..."
-msgstr "Идет сравнение..."
-
-msgid "Items compared:"
-msgstr "Обработано:"
+msgid "&Number of CPU cores to use:"
+msgstr "&Число доступных для использования ядер ЦП:"
msgid "Items total:"
msgstr "Всего:"
+msgid "Items compared:"
+msgstr "Обработано:"
+
msgid "Go to"
msgstr "Перейти"
@@ -1983,9 +1983,6 @@ msgstr "Порог для перехода к быстрому сравнени
msgid "Threshold for switching to &binary compare (MB):"
msgstr "Порог для перехода к двоичному сравнению (MB)"
-msgid "&Number of CPU cores to use:"
-msgstr "&Число доступных для использования ядер ЦП:"
-
msgid "File patterns:"
msgstr "Шаблоны файлов:"
@@ -2365,6 +2362,13 @@ msgstr "Элемент %1 из %2"
msgid "Items: %1"
msgstr "Элементов: %1"
+msgid "Comparing items..."
+msgstr "Идет сравнение..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Выберите для сравнения 2 существующих папки или файла."
diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index a27823beb70..b13b4acf8fb 100644
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -1768,18 +1768,17 @@ msgstr ""
msgid "Continue"
msgstr ""
+msgid "&Number of CPU cores to use:"
+msgstr ""
+
#, c-format
-msgid "Comparing items..."
-msgstr "Упоређивање ставки..."
+msgid "Items total:"
+msgstr "Укупно ставки:"
#, c-format
msgid "Items compared:"
msgstr "Поређење ставки:"
-#, c-format
-msgid "Items total:"
-msgstr "Укупно ставки:"
-
msgid "Go to"
msgstr "Иди на"
@@ -2433,9 +2432,6 @@ msgstr ""
msgid "Threshold for switching to &binary compare (MB):"
msgstr ""
-msgid "&Number of CPU cores to use:"
-msgstr ""
-
msgid "File patterns:"
msgstr ""
@@ -2955,6 +2951,14 @@ msgstr "Ставке %1 од %2"
msgid "Items: %1"
msgstr "Ставке: %1"
+#, c-format
+msgid "Comparing items..."
+msgstr "Упоређивање ставки..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Одабери две постојеће датотеке или фасцикле за поређење."
diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po
index dc6f4763b56..a5d2180f2f4 100644
--- a/Translations/WinMerge/Sinhala.po
+++ b/Translations/WinMerge/Sinhala.po
@@ -1785,18 +1785,17 @@ msgstr ""
msgid "Continue"
msgstr ""
+msgid "&Number of CPU cores to use:"
+msgstr ""
+
#, c-format
-msgid "Comparing items..."
-msgstr "අයිතම සැසඳීම..."
+msgid "Items total:"
+msgstr "අයිතම එකතුව:"
#, c-format
msgid "Items compared:"
msgstr "සැසඳූ අයිතම:"
-#, c-format
-msgid "Items total:"
-msgstr "අයිතම එකතුව:"
-
msgid "Go to"
msgstr "වෙත යන්න"
@@ -2448,9 +2447,6 @@ msgstr ""
msgid "Threshold for switching to &binary compare (MB):"
msgstr ""
-msgid "&Number of CPU cores to use:"
-msgstr ""
-
msgid "File patterns:"
msgstr ""
@@ -2967,6 +2963,14 @@ msgstr "අයිතමය %1 ගෙන් %2"
msgid "Items: %1"
msgstr "අයිතම : %1"
+#, c-format
+msgid "Comparing items..."
+msgstr "අයිතම සැසඳීම..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "සංසන්දනය කිරීම සඳහා පවතින ෆෝල්ඩර හෝ ලිපිගොනු දෙකක් තෝරන්න !"
diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index c9aaa6783e3..a1e15ca3d76 100644
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -1455,15 +1455,15 @@ msgstr "Pozastaviť"
msgid "Continue"
msgstr "Pokračovať"
-msgid "Comparing items..."
-msgstr "Porovnávanie položiek..."
-
-msgid "Items compared:"
-msgstr "Porovnané položky:"
+msgid "&Number of CPU cores to use:"
+msgstr ""
msgid "Items total:"
msgstr "Položky celkom:"
+msgid "Items compared:"
+msgstr "Porovnané položky:"
+
msgid "Go to"
msgstr "Prejsť na"
@@ -1989,9 +1989,6 @@ msgstr "Prahová hodnota pre prepnutie pre &rýchle porovnanie (MB):"
msgid "Threshold for switching to &binary compare (MB):"
msgstr "Prahová hodnota pre prepnutie na &binárne porovnanie (MB):"
-msgid "&Number of CPU cores to use:"
-msgstr ""
-
msgid "File patterns:"
msgstr "Vzory súborov:"
@@ -2463,6 +2460,13 @@ msgstr "Položka %1 of %2"
msgid "Items: %1"
msgstr "Položky: %1"
+msgid "Comparing items..."
+msgstr "Porovnávanie položiek..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Vyberte dva existujúce priečinky alebo súbory na porovnanie."
diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index 8d2839660a6..b6f7e88a7d3 100644
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -1455,15 +1455,15 @@ msgstr "Pavza"
msgid "Continue"
msgstr "Nadaljuj"
-msgid "Comparing items..."
-msgstr "Primerjava vnosov..."
-
-msgid "Items compared:"
-msgstr "Primerjanih vnosov:"
+msgid "&Number of CPU cores to use:"
+msgstr "Š&tevilo jeder procesorja za uporabo:"
msgid "Items total:"
msgstr "Skupaj vnosov:"
+msgid "Items compared:"
+msgstr "Primerjanih vnosov:"
+
msgid "Go to"
msgstr "Pojdi na"
@@ -1989,9 +1989,6 @@ msgstr "Prag za preklop na &hitro primerjavo (MB):"
msgid "Threshold for switching to &binary compare (MB):"
msgstr "Prag za preklop na &dvojiško primerjavo (MB):"
-msgid "&Number of CPU cores to use:"
-msgstr "Š&tevilo jeder procesorja za uporabo:"
-
msgid "File patterns:"
msgstr "Vzorci datotek:"
@@ -2467,6 +2464,13 @@ msgstr "Vnos %1 od %2"
msgid "Items: %1"
msgstr "Vnosov: %1"
+msgid "Comparing items..."
+msgstr "Primerjava vnosov..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Za primerjavo izberite dve obstoječi mapi ali datoteki."
diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index b46d908d1ab..63127aa0e58 100644
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -1458,15 +1458,15 @@ msgstr "Pausar"
msgid "Continue"
msgstr "Reanudar"
-msgid "Comparing items..."
-msgstr "Comparando elementos..."
-
-msgid "Items compared:"
-msgstr "Elementos comparados:"
+msgid "&Number of CPU cores to use:"
+msgstr "&Número de núcleos de CPU a utilizar:"
msgid "Items total:"
msgstr "Total:"
+msgid "Items compared:"
+msgstr "Elementos comparados:"
+
msgid "Go to"
msgstr "Ir a"
@@ -1992,9 +1992,6 @@ msgstr "Lí&mite para cambiar a comparación rápida (MB):"
msgid "Threshold for switching to &binary compare (MB):"
msgstr "Límite para cambiar a comparación &binaria (MB):"
-msgid "&Number of CPU cores to use:"
-msgstr "&Número de núcleos de CPU a utilizar:"
-
msgid "File patterns:"
msgstr "Patrones de archivo:"
@@ -2470,6 +2467,13 @@ msgstr "Elemento %1 de %2"
msgid "Items: %1"
msgstr "Elementos: %1"
+msgid "Comparing items..."
+msgstr "Comparando elementos..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Seleccione dos carpetas o archivos para comparar."
diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index a34f7243742..e6787cd0890 100644
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -1464,15 +1464,15 @@ msgstr "Paus"
msgid "Continue"
msgstr "Fortsätt"
-msgid "Comparing items..."
-msgstr "Jämför objekt..."
-
-msgid "Items compared:"
-msgstr "Jämförda objekt:"
+msgid "&Number of CPU cores to use:"
+msgstr "Antal CPU-kärnor att använda:"
msgid "Items total:"
msgstr "Objekt totalt:"
+msgid "Items compared:"
+msgstr "Jämförda objekt:"
+
msgid "Go to"
msgstr "Gå till"
@@ -2002,9 +2002,6 @@ msgstr "Tröskelvärde för växling till snabbjämförelse (MB):"
msgid "Threshold for switching to &binary compare (MB):"
msgstr "Tröskelvärde för växling till binär jämförelse (MB):"
-msgid "&Number of CPU cores to use:"
-msgstr "Antal CPU-kärnor att använda:"
-
msgid "File patterns:"
msgstr "Filnamnsmönster:"
@@ -2496,6 +2493,13 @@ msgstr "Förekomst %1 av %2"
msgid "Items: %1"
msgstr "Förekomster: %1"
+msgid "Comparing items..."
+msgstr "Jämför objekt..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Välj två befintliga mappar eller filer att jämföra."
diff --git a/Translations/WinMerge/Tamil.po b/Translations/WinMerge/Tamil.po
index a8539cbb186..06ff6c8973d 100644
--- a/Translations/WinMerge/Tamil.po
+++ b/Translations/WinMerge/Tamil.po
@@ -1453,15 +1453,15 @@ msgstr "இடைநிறுத்தம்"
msgid "Continue"
msgstr "தொடரவும்"
-msgid "Comparing items..."
-msgstr "உருப்படிகளை ஒப்பிடுகிறது..."
-
-msgid "Items compared:"
-msgstr "ஒப்பிடப்பட்ட உருப்படிகள்:"
+msgid "&Number of CPU cores to use:"
+msgstr "&பயன்படுத்த வேண்டிய CPU கோர்களின் எண்ணிக்கை:"
msgid "Items total:"
msgstr "உருப்படிகள் மொத்தம்:"
+msgid "Items compared:"
+msgstr "ஒப்பிடப்பட்ட உருப்படிகள்:"
+
msgid "Go to"
msgstr "செல்"
@@ -1987,9 +1987,6 @@ msgstr "&விரைவு ஒப்பீடு (MB) க்கு மாறு
msgid "Threshold for switching to &binary compare (MB):"
msgstr "&பைனரி ஒப்பீடு (MB) க்கு மாறுவதற்கான நுழைவாயில்:"
-msgid "&Number of CPU cores to use:"
-msgstr "&பயன்படுத்த வேண்டிய CPU கோர்களின் எண்ணிக்கை:"
-
msgid "File patterns:"
msgstr "கோப்பு வடிவங்கள்:"
@@ -2465,6 +2462,13 @@ msgstr "%2 இல் உருப்படி %1"
msgid "Items: %1"
msgstr "உருப்படிகள்: %1"
+msgid "Comparing items..."
+msgstr "உருப்படிகளை ஒப்பிடுகிறது..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "ஒப்பிடுவதற்கு ஏற்கனவே உள்ள இரண்டு கோப்புறைகள் அல்லது கோப்புகளைத் தேர்ந்தெடுக்கவும்."
diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index a4a4b060032..bcbefde1be5 100644
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -1460,15 +1460,15 @@ msgstr "Duraklat"
msgid "Continue"
msgstr "Sürdür"
-msgid "Comparing items..."
-msgstr "Ögeler karşılaştırılıyor..."
-
-msgid "Items compared:"
-msgstr "Karşılaştırılan öge:"
+msgid "&Number of CPU cores to use:"
+msgstr "&Kullanılacak işlemci çekirdeği sayısı:"
msgid "Items total:"
msgstr "Toplam öge:"
+msgid "Items compared:"
+msgstr "Karşılaştırılan öge:"
+
msgid "Go to"
msgstr "Git"
@@ -1998,9 +1998,6 @@ msgstr "&Hızlı karşılaştırmaya geçilecek eşik değeri (MB):"
msgid "Threshold for switching to &binary compare (MB):"
msgstr "&Binary karşılaştırmaya geçilecek eşik değeri (MB):"
-msgid "&Number of CPU cores to use:"
-msgstr "&Kullanılacak işlemci çekirdeği sayısı:"
-
msgid "File patterns:"
msgstr "Dosya modelleri:"
@@ -2494,6 +2491,13 @@ msgstr "Öge %1 / %2"
msgid "Items: %1"
msgstr "Ögeler: %1"
+msgid "Comparing items..."
+msgstr "Ögeler karşılaştırılıyor..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Karşılaştırmak için var olan iki klasör ya da dosya seçin."
diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index 132a93e0ac8..1a50c760830 100644
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -1786,18 +1786,17 @@ msgstr ""
msgid "Continue"
msgstr ""
+msgid "&Number of CPU cores to use:"
+msgstr ""
+
#, c-format
-msgid "Comparing items..."
-msgstr "Триває порівняння..."
+msgid "Items total:"
+msgstr "Всього:"
#, c-format
msgid "Items compared:"
msgstr "Опрацьованих:"
-#, c-format
-msgid "Items total:"
-msgstr "Всього:"
-
msgid "Go to"
msgstr "Перейти"
@@ -2451,9 +2450,6 @@ msgstr ""
msgid "Threshold for switching to &binary compare (MB):"
msgstr ""
-msgid "&Number of CPU cores to use:"
-msgstr ""
-
msgid "File patterns:"
msgstr ""
@@ -2977,6 +2973,14 @@ msgstr "Елемент %1 з %2"
msgid "Items: %1"
msgstr "Елементів: %1"
+#, c-format
+msgid "Comparing items..."
+msgstr "Триває порівняння..."
+
+#, c-format
+msgid "%.1f[items/sec]"
+msgstr ""
+
msgid "Select two existing folders or files to compare."
msgstr "Виберіть дві ІСНУЮЧІ теки або файли для порівняння."