diff --git a/Docs/Manual/EN/Command_line.xml b/Docs/Manual/EN/Command_line.xml
index ee2b89b200b..ccd87e9cfeb 100644
--- a/Docs/Manual/EN/Command_line.xml
+++ b/Docs/Manual/EN/Command_line.xml
@@ -65,6 +65,8 @@
+
+
@@ -389,6 +391,13 @@
+
+
+
+ Compares the two most recent contents of the clipboard history.
+
+
+
WinMerge window
diff --git a/Docs/Manual/JP/Command_line.xml b/Docs/Manual/JP/Command_line.xml
index e90e28dc136..5ad5d610d61 100644
--- a/Docs/Manual/JP/Command_line.xml
+++ b/Docs/Manual/JP/Command_line.xml
@@ -65,6 +65,8 @@
+
+
@@ -388,6 +390,13 @@
+
+
+
+ クリップボード履歴の直近2つの内容を比較します。
+
+
+
WinMergeウインドウ
diff --git a/Src/ClipboardHistory.cpp b/Src/ClipboardHistory.cpp
new file mode 100644
index 00000000000..2c9ffdeb943
--- /dev/null
+++ b/Src/ClipboardHistory.cpp
@@ -0,0 +1,152 @@
+/**
+ * @file ClipboardHistory.cpp
+ *
+ * @brief Implementation for Clipboard history functions
+ */
+
+#include "StdAfx.h"
+#include "ClipboardHistory.h"
+#include "ClipBoard.h"
+#include "Concurrent.h"
+#include "UniFile.h"
+
+#ifdef _WIN64
+
+#include
+#include
+#include
+#include
+
+using namespace winrt::Windows::ApplicationModel::DataTransfer;
+using namespace winrt::Windows::Graphics::Imaging;
+using namespace winrt::Windows::Storage;
+
+#endif
+
+namespace ClipboardHistory
+{
+ namespace impl
+ {
+ std::shared_ptr CreateTempTextFile(const String& text)
+ {
+ std::shared_ptr pTempFile(new TempFile());
+ pTempFile->Create(_T("CLP"), L".txt");
+ String path = pTempFile->GetPath();
+ UniStdioFile file;
+ if (file.OpenCreateUtf8(path))
+ {
+ file.WriteString(text);
+ file.Close();
+ }
+ return pTempFile;
+ }
+
+ String GetClipboardText()
+ {
+ String text;
+ GetFromClipboard(text, nullptr);
+ return text;
+ }
+
+#ifdef _WIN64
+ std::shared_ptr CreateTempBitmapFile(const DataPackageView& dataPackageView)
+ {
+ std::shared_ptr pTempFile(new TempFile());
+ pTempFile->Create(_T("CLP"), _T(".png"));
+
+ auto streamReference = dataPackageView.GetBitmapAsync().get();
+ auto inputStream = streamReference.OpenReadAsync().get();
+ auto decoder = BitmapDecoder::CreateAsync(inputStream).get();
+ auto bitmap = decoder.GetSoftwareBitmapAsync().get();
+
+ auto outputFile = StorageFile::GetFileFromPathAsync(pTempFile->GetPath()).get();
+ auto outputStream = outputFile.OpenAsync(FileAccessMode::ReadWrite).get();
+ auto encoder = BitmapEncoder::CreateAsync(BitmapEncoder::PngEncoderId(), outputStream).get();
+ encoder.SetSoftwareBitmap(bitmap);
+ encoder.FlushAsync().get();
+
+ return pTempFile;
+ }
+#endif
+
+ std::vector- GetItems(unsigned num)
+ {
+ std::vector
- result;
+#ifdef _WIN64
+ try
+ {
+ auto historyItems = Clipboard::GetHistoryItemsAsync().get();
+ auto items = historyItems.Items();
+ for (unsigned int i = 0; i < num; ++i)
+ {
+ result.emplace_back();
+ auto& item = result.back();
+ if (i < items.Size())
+ {
+ try
+ {
+ auto dataPackageView = items.GetAt(i).Content();
+ item.timestamp = winrt::clock::to_time_t(items.GetAt(i).Timestamp());
+ if (dataPackageView.Contains(StandardDataFormats::Text()))
+ {
+ item.pTextTempFile = CreateTempTextFile(dataPackageView.GetTextAsync().get().c_str());
+ }
+ if (dataPackageView.Contains(StandardDataFormats::Bitmap()))
+ {
+ item.pBitmapTempFile = CreateTempBitmapFile(dataPackageView);
+ }
+ if (!item.pTextTempFile && !item.pBitmapTempFile)
+ {
+ item.pTextTempFile = CreateTempTextFile(_T(""));
+ }
+ }
+ catch (const winrt::hresult_error& e)
+ {
+ item.pTextTempFile = CreateTempTextFile(e.message().c_str());
+ }
+ }
+ else
+ {
+ if (i == 0)
+ time(&item.timestamp);
+ item.pTextTempFile = CreateTempTextFile(i == 0 ?
+ GetClipboardText() :
+ (!Clipboard::IsHistoryEnabled() ? _("Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button.") : _T("")));
+ }
+ }
+ }
+ catch (const winrt::hresult_error&)
+ {
+ for (unsigned int i = 0; i < num; ++i)
+ {
+ result.emplace_back();
+ auto& item = result.back();
+ if (i == 0)
+ time(&item.timestamp);
+ item.pTextTempFile = CreateTempTextFile(
+ i == 0 ? GetClipboardText() : _("This system does not support clipboard history."));
+ }
+ }
+#else
+ for (unsigned int i = 0; i < num; ++i)
+ {
+ result.emplace_back();
+ auto& item = result.back();
+ if (i == 0)
+ time(&item.timestamp);
+ item.pTextTempFile = CreateTempTextFile(
+ i == 0 ? GetClipboardText() : _("The 32-bit version of WinMerge does not support Clipboard Compare"));
+ }
+#endif
+ return result;
+ }
+ }
+
+ std::vector
- GetItems(unsigned num)
+ {
+ auto task = Concurrent::CreateTask([num] {
+ return impl::GetItems(num);
+ });
+ return task.Get();
+ }
+}
diff --git a/Src/ClipboardHistory.h b/Src/ClipboardHistory.h
new file mode 100644
index 00000000000..c9a3cb012f6
--- /dev/null
+++ b/Src/ClipboardHistory.h
@@ -0,0 +1,23 @@
+/**
+ * @file ClipboardHistory.h
+ *
+ * @brief Declaration file for Clipboard history functions
+ */
+#pragma once
+
+#include "UnicodeString.h"
+#include "TempFile.h"
+#include
+#include
+#include
+
+namespace ClipboardHistory
+{
+ struct Item
+ {
+ time_t timestamp;
+ std::shared_ptr pTextTempFile;
+ std::shared_ptr pBitmapTempFile;
+ };
+ std::vector
- GetItems(unsigned num);
+}
diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 9d3f50b8240..8ca8f5a239c 100644
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -67,6 +67,8 @@
#include "TFile.h"
#include "Shell.h"
#include "WindowsManagerDialog.h"
+#include "ClipboardHistory.h"
+#include "locality.h"
using std::vector;
using boost::begin;
@@ -223,6 +225,8 @@ BEGIN_MESSAGE_MAP(CMainFrame, CMDIFrameWnd)
ON_COMMAND(ID_FILE_OPENPROJECT, OnFileOpenProject)
ON_COMMAND(ID_FILE_SAVEPROJECT, OnSaveProject)
ON_COMMAND(ID_FILE_OPENCONFLICT, OnFileOpenConflict)
+ ON_COMMAND(ID_FILE_OPENCLIPBOARD, OnFileOpenClipboard)
+ ON_COMMAND(ID_EDIT_PASTE, OnFileOpenClipboard)
ON_COMMAND_RANGE(ID_MRU_FIRST, ID_MRU_LAST, OnMRUs)
ON_UPDATE_COMMAND_UI(ID_MRU_FIRST, OnUpdateNoMRUs)
ON_UPDATE_COMMAND_UI(ID_NO_MRU, OnUpdateNoMRUs)
@@ -2536,6 +2540,53 @@ void CMainFrame::OnFileOpenConflict()
}
}
+/**
+ * @brief Called when user selects File/Open Clipboard
+ */
+void CMainFrame::OnFileOpenClipboard()
+{
+ DoOpenClipboard();
+}
+
+bool CMainFrame::DoOpenClipboard(UINT nID, int nBuffers /*= 2*/, const DWORD dwFlags[] /*= nullptr*/,
+ const String strDesc[] /*= nullptr*/, const PackingInfo* infoUnpacker /*= nullptr*/,
+ const PrediffingInfo* infoPrediffer /*= nullptr*/, const OpenFileParams* pOpenParams /*= nullptr*/)
+{
+ auto historyItems = ClipboardHistory::GetItems(nBuffers);
+
+ String strDesc2[3];
+ DWORD dwFlags2[3];
+ for (int i = 0; i < nBuffers; ++i)
+ {
+ int64_t t = historyItems[nBuffers - i - 1].timestamp;
+ String timestr = t == 0 ? _T("---") : locality::TimeString(&t);
+ strDesc2[i] = (strDesc && !strDesc[i].empty()) ?
+ strDesc[i] : strutils::format(_("Clipboard at %s"), timestr);
+ dwFlags2[i] = (dwFlags ? dwFlags[i] : 0) | FFILEOPEN_NOMRU;
+ }
+ for (int i = 0; i < 2; ++i)
+ {
+ PathContext tmpPathContext;
+ for (int pane = 0; pane < nBuffers; ++pane)
+ {
+ auto item = historyItems[nBuffers - pane - 1];
+ if (i == 0 && item.pBitmapTempFile)
+ {
+ tmpPathContext.SetPath(pane, item.pBitmapTempFile->GetPath());
+ m_tempFiles.push_back(item.pBitmapTempFile);
+ }
+ if (i == 1 && item.pTextTempFile)
+ {
+ tmpPathContext.SetPath(pane, item.pTextTempFile->GetPath());
+ m_tempFiles.push_back(item.pTextTempFile);
+ }
+ }
+ if (tmpPathContext.GetSize() == nBuffers)
+ DoFileOpen(nID, &tmpPathContext, dwFlags2, strDesc2, _T(""), infoUnpacker, infoPrediffer, pOpenParams);
+ }
+ return true;
+}
+
/**
* @brief Select and open conflict file for resolving.
* This function lets user to select conflict file to resolve.
diff --git a/Src/MainFrm.h b/Src/MainFrm.h
index 0104ab1be2b..e4e4c2355ba 100644
--- a/Src/MainFrm.h
+++ b/Src/MainFrm.h
@@ -142,6 +142,9 @@ class CMainFrame : public CMDIFrameWnd
const PrediffingInfo * infoPrediffer = nullptr,
const OpenFileParams *pOpenParams = nullptr);
bool DoOpenConflict(const String& conflictFile, const String strDesc[] = nullptr, bool checked = false);
+ bool DoOpenClipboard(UINT nID = 0, int nBuffers = 2, const DWORD dwFlags[] = nullptr, const String strDesc[] = nullptr,
+ const PackingInfo* infoUnpacker = nullptr, const PrediffingInfo * infoPrediffer = nullptr,
+ const OpenFileParams* pOpenParams = nullptr);
bool DoSelfCompare(UINT nID, const String& file, const String strDesc[] = nullptr,
const PackingInfo* infoUnpacker = nullptr, const PrediffingInfo * infoPrediffer = nullptr,
const OpenFileParams* pOpenParams = nullptr);
@@ -332,6 +335,7 @@ class CMainFrame : public CMDIFrameWnd
afx_msg void OnHelpReleasenotes();
afx_msg void OnHelpTranslations();
afx_msg void OnFileOpenConflict();
+ afx_msg void OnFileOpenClipboard();
afx_msg void OnPluginsList();
afx_msg void OnUpdatePluginName(CCmdUI* pCmdUI);
afx_msg void OnUpdateStatusNum(CCmdUI* pCmdUI);
diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index 515171d94ce..5bb8cb2a067 100644
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -795,15 +795,20 @@ bool CMergeApp::ParseArgsAndDoOpen(MergeCmdLineInfo& cmdInfo, CMainFrame* pMainF
}
else if (cmdInfo.m_Files.GetSize() == 0) // if there are no input args, we can check the display file dialog flag
{
- if (!cmdInfo.m_bNewCompare)
+ if (cmdInfo.m_bNewCompare)
{
- bool showFiles = m_pOptions->GetBool(OPT_SHOW_SELECT_FILES_AT_STARTUP);
- if (showFiles)
- pMainFrame->DoFileOrFolderOpen();
+ bCompared = pMainFrame->DoFileNew(nID, 2, strDesc, infoPrediffer.get(), pOpenParams.get());
+ }
+ else if (cmdInfo.m_bClipboardCompare)
+ {
+ DWORD dwFlags[3] = {cmdInfo.m_dwLeftFlags, cmdInfo.m_dwRightFlags, FFILEOPEN_NONE};
+ bCompared = pMainFrame->DoOpenClipboard(nID, 2, dwFlags, strDesc, infoUnpacker.get(), infoPrediffer.get(), pOpenParams.get());
}
else
{
- bCompared = pMainFrame->DoFileNew(nID, 2, strDesc, infoPrediffer.get(), pOpenParams.get());
+ bool showFiles = m_pOptions->GetBool(OPT_SHOW_SELECT_FILES_AT_STARTUP);
+ if (showFiles)
+ pMainFrame->DoFileOrFolderOpen();
}
}
}
diff --git a/Src/Merge.rc b/Src/Merge.rc
index 490212a31fc..d58f7432e50 100644
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -230,6 +230,7 @@ BEGIN
END
MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN
MENUITEM "Open Conflic&t File...", ID_FILE_OPENCONFLICT
+ MENUITEM "Open C&lipboard", ID_FILE_OPENCLIPBOARD
MENUITEM SEPARATOR
MENUITEM "Open Pro&ject...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT
@@ -244,6 +245,8 @@ BEGIN
END
POPUP "&Edit"
BEGIN
+ MENUITEM "&Paste\tCtrl+V", ID_EDIT_PASTE
+ MENUITEM SEPARATOR
MENUITEM "&Options...", ID_OPTIONS
END
POPUP "&View"
@@ -319,6 +322,7 @@ BEGIN
END
MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN
MENUITEM "Open Conflic&t File...", ID_FILE_OPENCONFLICT
+ MENUITEM "Open C&lipboard", ID_FILE_OPENCLIPBOARD
MENUITEM SEPARATOR
MENUITEM "Open Pro&ject...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT
@@ -477,6 +481,7 @@ BEGIN
END
MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN
MENUITEM "Open Conflic&t File...", ID_FILE_OPENCONFLICT
+ MENUITEM "Open C&lipboard", ID_FILE_OPENCLIPBOARD
MENUITEM SEPARATOR
MENUITEM "Open Pro&ject...\tCtrl+J", ID_FILE_OPENPROJECT
MENUITEM "Sa&ve Project...", ID_FILE_SAVEPROJECT
@@ -4011,6 +4016,14 @@ BEGIN
IDS_FILTER_APPLIED "Filter applied"
END
+STRINGTABLE
+BEGIN
+ IDS_CLIPBOARDHISTORY_TIME "Clipboard at %s"
+ IDS_CLIPBOARDHISTORY_DISABLED "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+ IDS_CLIPBOARDHISTORY_NOT_SUPPORTED1 "This system does not support clipboard history."
+ IDS_CLIPBOARDHISTORY_NOT_SUPPORTED2 "The 32-bit version of WinMerge does not support Clipboard Compare"
+END
+
#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/Src/Merge.vcxproj b/Src/Merge.vcxproj
index 87b3eec5558..b1308c970ec 100644
--- a/Src/Merge.vcxproj
+++ b/Src/Merge.vcxproj
@@ -92,7 +92,7 @@
Application
Static
Unicode
- 10.0.17763.0
+ 10.0.22000.0
v141
v142
v143
@@ -119,7 +119,7 @@
Application
Static
Unicode
- 10.0.17763.0
+ 10.0.22000.0
v141
v142
v143
@@ -146,7 +146,7 @@
Application
Static
Unicode
- 10.0.17763.0
+ 10.0.22000.0
v141
v142
v143
@@ -902,6 +902,7 @@
+
pch.h
$(IntDir)$(TargetName)2.pch
@@ -1418,6 +1419,7 @@
+
diff --git a/Src/Merge.vcxproj.filters b/Src/Merge.vcxproj.filters
index b98a4e6ea16..564d556038a 100644
--- a/Src/Merge.vcxproj.filters
+++ b/Src/Merge.vcxproj.filters
@@ -690,6 +690,9 @@
MFCGui\Dialogs\Source Files
+
+ Source Files
+
@@ -1313,6 +1316,9 @@
MFCGui\Common\Header Files
+
+ Header Files
+
diff --git a/Src/MergeCmdLineInfo.cpp b/Src/MergeCmdLineInfo.cpp
index dc703039004..464f2830724 100644
--- a/Src/MergeCmdLineInfo.cpp
+++ b/Src/MergeCmdLineInfo.cpp
@@ -127,6 +127,7 @@ MergeCmdLineInfo::MergeCmdLineInfo(const TCHAR* q)
, m_bNoPrefs(false)
, m_nCodepage(0)
, m_bSelfCompare(false)
+ , m_bClipboardCompare(false)
, m_bNewCompare(false)
, m_dwLeftFlags(FFILEOPEN_NONE)
, m_dwMiddleFlags(FFILEOPEN_NONE)
@@ -317,6 +318,11 @@ void MergeCmdLineInfo::ParseWinMergeCmdLine(const TCHAR *q)
// -self-compare means compare a specified file with a copy of the file
m_bSelfCompare = true;
}
+ else if (param == _T("clipboard-compare"))
+ {
+ // -clipboard-compare means to compare the two most recent contents of the clipboard history.
+ m_bClipboardCompare = true;
+ }
else if (param == _T("new"))
{
// -new means to display a new blank window
diff --git a/Src/MergeCmdLineInfo.h b/Src/MergeCmdLineInfo.h
index 01be3febdc3..8889950cc09 100644
--- a/Src/MergeCmdLineInfo.h
+++ b/Src/MergeCmdLineInfo.h
@@ -74,6 +74,7 @@ class MergeCmdLineInfo
int m_nCodepage; /**< Codepage. */
bool m_bNoPrefs; /**< Do not load or remember options (preferences) */
bool m_bSelfCompare; /**< Compares the specified file with a copy of the file */
+ bool m_bClipboardCompare; /**< Compare text or bitmaps in the clipboard history */
bool m_bNewCompare; /**< Show a new blank window */
bool m_bEnableExitCode; /**< Returns the comparison result as a process exit code */
int m_nLineIndex; /**< Line number to jump after loading files */
diff --git a/Src/resource.h b/Src/resource.h
index e265cc367ad..18f7fe23582 100644
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -840,6 +840,7 @@
#define ID_PROJECT_DIFF_OPTIONS_COMPMETHOD_MODDATE 33136
#define ID_PROJECT_DIFF_OPTIONS_COMPMETHOD_DATESIZE 33137
#define ID_PROJECT_DIFF_OPTIONS_COMPMETHOD_SIZE 33138
+#define ID_FILE_OPENCLIPBOARD 33140
#define ID_EDIT_TOGGLE_BOOKMARK 33145
#define ID_EDIT_GOTO_NEXT_BOOKMARK 33146
#define ID_EDIT_GOTO_PREV_BOOKMARK 33147
@@ -1642,6 +1643,10 @@
#define IDS_R2MNEXT 44505
#define IDS_ALL_MIDDLE 44506
#define IDS_FILTER_APPLIED 44507
+#define IDS_CLIPBOARDHISTORY_TIME 44510
+#define IDS_CLIPBOARDHISTORY_DISABLED 44511
+#define IDS_CLIPBOARDHISTORY_NOT_SUPPORTED1 44512
+#define IDS_CLIPBOARDHISTORY_NOT_SUPPORTED2 44513
// Next default values for new objects
//
diff --git a/Translations/TranslationsStatus.html b/Translations/TranslationsStatus.html
index ef9c0bc0f88..4179be1cc76 100644
--- a/Translations/TranslationsStatus.html
+++ b/Translations/TranslationsStatus.html
@@ -37,7 +37,7 @@
Translations Status
-Status from 2022-01-19:
+Status from 2022-01-23:
WinMerge
@@ -51,334 +51,334 @@ WinMerge
Arabic |
- 1194 |
+ 1199 |
901 |
0 |
- 293 |
+ 298 |
75 % |
2019-12-30 |
Basque |
- 1194 |
+ 1199 |
639 |
0 |
- 555 |
- 54 % |
+ 560 |
+ 53 % |
2013-02-03 |
Brazilian |
- 1194 |
+ 1199 |
1086 |
0 |
- 108 |
+ 113 |
91 % |
2021-08-09 |
Bulgarian |
- 1194 |
+ 1199 |
966 |
0 |
- 228 |
+ 233 |
81 % |
2021-06-28 |
Catalan |
- 1194 |
+ 1199 |
566 |
0 |
- 628 |
+ 633 |
47 % |
|
ChineseSimplified |
- 1194 |
+ 1199 |
1184 |
0 |
- 10 |
+ 15 |
99 % |
|
ChineseTraditional |
- 1194 |
+ 1199 |
1091 |
0 |
- 103 |
+ 108 |
91 % |
2021-12-11 |
Corsican |
- 1194 |
- 1193 |
+ 1199 |
+ 1195 |
0 |
- 1 |
+ 4 |
100 % |
- 2022-01-16 |
+ 2022-01-19 |
Croatian |
- 1194 |
+ 1199 |
631 |
1 |
- 562 |
+ 567 |
53 % |
2009-02-13 |
Czech |
- 1194 |
+ 1199 |
605 |
0 |
- 589 |
- 51 % |
+ 594 |
+ 50 % |
|
Danish |
- 1194 |
+ 1199 |
639 |
0 |
- 555 |
- 54 % |
+ 560 |
+ 53 % |
2013-01-13 |
Dutch |
- 1194 |
+ 1199 |
1193 |
0 |
- 1 |
- 100 % |
+ 6 |
+ 99 % |
2018-09-06 |
English |
- 1195 |
- 1195 |
+ 1200 |
+ 1200 |
0 |
0 |
100 % |
- 2022-01-19 |
+ 2022-01-22 |
Finnish |
- 1194 |
+ 1199 |
901 |
0 |
- 293 |
+ 298 |
75 % |
|
French |
- 1194 |
+ 1199 |
1193 |
0 |
- 1 |
- 100 % |
+ 6 |
+ 99 % |
2022-01-09 |
Galician |
- 1194 |
+ 1199 |
1136 |
0 |
- 58 |
+ 63 |
95 % |
2021-12-18 |
German |
- 1194 |
- 1193 |
+ 1199 |
+ 1195 |
0 |
- 1 |
+ 4 |
100 % |
- 2022-01-05 |
+ 2022-01-19 |
Greek |
- 1194 |
+ 1199 |
604 |
0 |
- 590 |
- 51 % |
+ 595 |
+ 50 % |
|
Hungarian |
- 1194 |
- 1193 |
+ 1199 |
+ 1195 |
0 |
- 1 |
+ 4 |
100 % |
2021-03-15 |
Italian |
- 1194 |
+ 1199 |
991 |
0 |
- 203 |
+ 208 |
83 % |
2021-08-09 |
Japanese |
- 1194 |
- 1193 |
+ 1199 |
+ 1199 |
0 |
- 1 |
+ 0 |
100 % |
2021-11-21 |
Korean |
- 1194 |
+ 1199 |
1034 |
0 |
- 160 |
- 87 % |
+ 165 |
+ 86 % |
2021-12-10 |
Lithuanian |
- 1194 |
- 1152 |
+ 1199 |
+ 1154 |
0 |
- 42 |
+ 45 |
96 % |
- 2022-01-11 |
+ 2022-01-20 |
Norwegian |
- 1194 |
+ 1199 |
632 |
0 |
- 562 |
+ 567 |
53 % |
|
Persian |
- 1194 |
+ 1199 |
642 |
0 |
- 552 |
+ 557 |
54 % |
2013-08-15 |
Polish |
- 1194 |
+ 1199 |
1110 |
0 |
- 84 |
+ 89 |
93 % |
|
Portuguese |
- 1194 |
- 1193 |
+ 1199 |
+ 1195 |
0 |
- 1 |
+ 4 |
100 % |
- 2022-01-15 |
+ 2022-01-22 |
Romanian |
- 1194 |
+ 1199 |
561 |
44 |
- 589 |
- 51 % |
+ 594 |
+ 50 % |
|
Russian |
- 1194 |
+ 1199 |
1092 |
0 |
- 102 |
+ 107 |
91 % |
2021-10-28 |
Serbian |
- 1194 |
+ 1199 |
632 |
0 |
- 562 |
+ 567 |
53 % |
|
Sinhala |
- 1194 |
+ 1199 |
566 |
59 |
- 569 |
+ 574 |
52 % |
2010-12-12 |
Slovak |
- 1194 |
+ 1199 |
974 |
0 |
- 220 |
- 82 % |
+ 225 |
+ 81 % |
2020-11-02 |
Slovenian |
- 1194 |
- 1155 |
+ 1199 |
+ 1194 |
0 |
- 39 |
- 97 % |
+ 5 |
+ 100 % |
2022-01-03 |
Spanish |
- 1194 |
+ 1199 |
870 |
0 |
- 324 |
+ 329 |
73 % |
2020-04-03 |
Swedish |
- 1194 |
+ 1199 |
1094 |
0 |
- 100 |
- 92 % |
+ 105 |
+ 91 % |
2021-09-15 |
Turkish |
- 1194 |
+ 1199 |
1136 |
0 |
- 58 |
+ 63 |
95 % |
2021-12-21 |
Ukrainian |
- 1194 |
+ 1199 |
637 |
0 |
- 557 |
+ 562 |
53 % |
2009-06-13 |
diff --git a/Translations/TranslationsStatus.md b/Translations/TranslationsStatus.md
index e6a1cddafa6..5bf577b08ac 100644
--- a/Translations/TranslationsStatus.md
+++ b/Translations/TranslationsStatus.md
@@ -1,48 +1,48 @@
# Translations Status
-Status from **2022-01-19**:
+Status from **2022-01-23**:
## WinMerge
| Language | Total | Translated | Fuzzy | Untranslated | Complete | Last Update |
|:---------------------|------:|-----------:|------:|-------------:|---------:|:-----------:|
-| Arabic | 1194 | 901 | 0 | 293 | 75 % | 2019-12-30 |
-| Basque | 1194 | 639 | 0 | 555 | 54 % | 2013-02-03 |
-| Brazilian | 1194 | 1086 | 0 | 108 | 91 % | 2021-08-09 |
-| Bulgarian | 1194 | 966 | 0 | 228 | 81 % | 2021-06-28 |
-| Catalan | 1194 | 566 | 0 | 628 | 47 % | |
-| ChineseSimplified | 1194 | 1184 | 0 | 10 | 99 % | |
-| ChineseTraditional | 1194 | 1091 | 0 | 103 | 91 % | 2021-12-11 |
-| Corsican | 1194 | 1193 | 0 | 1 | 100 % | 2022-01-16 |
-| Croatian | 1194 | 631 | 1 | 562 | 53 % | 2009-02-13 |
-| Czech | 1194 | 605 | 0 | 589 | 51 % | |
-| Danish | 1194 | 639 | 0 | 555 | 54 % | 2013-01-13 |
-| Dutch | 1194 | 1193 | 0 | 1 | 100 % | 2018-09-06 |
-| English | 1195 | 1195 | 0 | 0 | 100 % | 2022-01-19 |
-| Finnish | 1194 | 901 | 0 | 293 | 75 % | |
-| French | 1194 | 1193 | 0 | 1 | 100 % | 2022-01-09 |
-| Galician | 1194 | 1136 | 0 | 58 | 95 % | 2021-12-18 |
-| German | 1194 | 1193 | 0 | 1 | 100 % | 2022-01-05 |
-| Greek | 1194 | 604 | 0 | 590 | 51 % | |
-| Hungarian | 1194 | 1193 | 0 | 1 | 100 % | 2021-03-15 |
-| Italian | 1194 | 991 | 0 | 203 | 83 % | 2021-08-09 |
-| Japanese | 1194 | 1193 | 0 | 1 | 100 % | 2021-11-21 |
-| Korean | 1194 | 1034 | 0 | 160 | 87 % | 2021-12-10 |
-| Lithuanian | 1194 | 1152 | 0 | 42 | 96 % | 2022-01-11 |
-| Norwegian | 1194 | 632 | 0 | 562 | 53 % | |
-| Persian | 1194 | 642 | 0 | 552 | 54 % | 2013-08-15 |
-| Polish | 1194 | 1110 | 0 | 84 | 93 % | |
-| Portuguese | 1194 | 1193 | 0 | 1 | 100 % | 2022-01-15 |
-| Romanian | 1194 | 561 | 44 | 589 | 51 % | |
-| Russian | 1194 | 1092 | 0 | 102 | 91 % | 2021-10-28 |
-| Serbian | 1194 | 632 | 0 | 562 | 53 % | |
-| Sinhala | 1194 | 566 | 59 | 569 | 52 % | 2010-12-12 |
-| Slovak | 1194 | 974 | 0 | 220 | 82 % | 2020-11-02 |
-| Slovenian | 1194 | 1155 | 0 | 39 | 97 % | 2022-01-03 |
-| Spanish | 1194 | 870 | 0 | 324 | 73 % | 2020-04-03 |
-| Swedish | 1194 | 1094 | 0 | 100 | 92 % | 2021-09-15 |
-| Turkish | 1194 | 1136 | 0 | 58 | 95 % | 2021-12-21 |
-| Ukrainian | 1194 | 637 | 0 | 557 | 53 % | 2009-06-13 |
+| Arabic | 1199 | 901 | 0 | 298 | 75 % | 2019-12-30 |
+| Basque | 1199 | 639 | 0 | 560 | 53 % | 2013-02-03 |
+| Brazilian | 1199 | 1086 | 0 | 113 | 91 % | 2021-08-09 |
+| Bulgarian | 1199 | 966 | 0 | 233 | 81 % | 2021-06-28 |
+| Catalan | 1199 | 566 | 0 | 633 | 47 % | |
+| ChineseSimplified | 1199 | 1184 | 0 | 15 | 99 % | |
+| ChineseTraditional | 1199 | 1091 | 0 | 108 | 91 % | 2021-12-11 |
+| Corsican | 1199 | 1195 | 0 | 4 | 100 % | 2022-01-19 |
+| Croatian | 1199 | 631 | 1 | 567 | 53 % | 2009-02-13 |
+| Czech | 1199 | 605 | 0 | 594 | 50 % | |
+| Danish | 1199 | 639 | 0 | 560 | 53 % | 2013-01-13 |
+| Dutch | 1199 | 1193 | 0 | 6 | 99 % | 2018-09-06 |
+| English | 1200 | 1200 | 0 | 0 | 100 % | 2022-01-22 |
+| Finnish | 1199 | 901 | 0 | 298 | 75 % | |
+| French | 1199 | 1193 | 0 | 6 | 99 % | 2022-01-09 |
+| Galician | 1199 | 1136 | 0 | 63 | 95 % | 2021-12-18 |
+| German | 1199 | 1195 | 0 | 4 | 100 % | 2022-01-19 |
+| Greek | 1199 | 604 | 0 | 595 | 50 % | |
+| Hungarian | 1199 | 1195 | 0 | 4 | 100 % | 2021-03-15 |
+| Italian | 1199 | 991 | 0 | 208 | 83 % | 2021-08-09 |
+| Japanese | 1199 | 1199 | 0 | 0 | 100 % | 2021-11-21 |
+| Korean | 1199 | 1034 | 0 | 165 | 86 % | 2021-12-10 |
+| Lithuanian | 1199 | 1154 | 0 | 45 | 96 % | 2022-01-20 |
+| Norwegian | 1199 | 632 | 0 | 567 | 53 % | |
+| Persian | 1199 | 642 | 0 | 557 | 54 % | 2013-08-15 |
+| Polish | 1199 | 1110 | 0 | 89 | 93 % | |
+| Portuguese | 1199 | 1195 | 0 | 4 | 100 % | 2022-01-22 |
+| Romanian | 1199 | 561 | 44 | 594 | 50 % | |
+| Russian | 1199 | 1092 | 0 | 107 | 91 % | 2021-10-28 |
+| Serbian | 1199 | 632 | 0 | 567 | 53 % | |
+| Sinhala | 1199 | 566 | 59 | 574 | 52 % | 2010-12-12 |
+| Slovak | 1199 | 974 | 0 | 225 | 81 % | 2020-11-02 |
+| Slovenian | 1199 | 1194 | 0 | 5 | 100 % | 2022-01-03 |
+| Spanish | 1199 | 870 | 0 | 329 | 73 % | 2020-04-03 |
+| Swedish | 1199 | 1094 | 0 | 105 | 91 % | 2021-09-15 |
+| Turkish | 1199 | 1136 | 0 | 63 | 95 % | 2021-12-21 |
+| Ukrainian | 1199 | 637 | 0 | 562 | 53 % | 2009-06-13 |
## ShellExtension
diff --git a/Translations/TranslationsStatus.xml b/Translations/TranslationsStatus.xml
index 2f57b998cb5..a1ed1fb966d 100644
--- a/Translations/TranslationsStatus.xml
+++ b/Translations/TranslationsStatus.xml
@@ -1,16 +1,16 @@
- 2022-01-19
+ 2022-01-23
Arabic
Arabic.po
2019-12-30
- 1194
+ 1199
901
0
- 293
+ 298
@@ -18,10 +18,10 @@
Basque.po
2013-02-03
- 1194
+ 1199
639
0
- 555
+ 560
@@ -35,10 +35,10 @@
Brazilian.po
2021-08-09
- 1194
+ 1199
1086
0
- 108
+ 113
@@ -60,10 +60,10 @@
Bulgarian.po
2021-06-28
- 1194
+ 1199
966
0
- 228
+ 233
@@ -85,10 +85,10 @@
Catalan.po
- 1194
+ 1199
566
0
- 628
+ 633
@@ -102,10 +102,10 @@
ChineseSimplified.po
- 1194
+ 1199
1184
0
- 10
+ 15
@@ -131,10 +131,10 @@
ChineseTraditional.po
2021-12-11
- 1194
+ 1199
1091
0
- 103
+ 108
@@ -158,12 +158,12 @@
Corsican
Corsican.po
- 2022-01-16
+ 2022-01-19
- 1194
- 1193
+ 1199
+ 1195
0
- 1
+ 4
@@ -179,10 +179,10 @@
Croatian.po
2009-02-13
- 1194
+ 1199
631
1
- 562
+ 567
@@ -196,10 +196,10 @@
Czech.po
- 1194
+ 1199
605
0
- 589
+ 594
@@ -217,10 +217,10 @@
Danish.po
2013-01-13
- 1194
+ 1199
639
0
- 555
+ 560
@@ -238,10 +238,10 @@
Dutch.po
2018-09-06
- 1194
+ 1199
1193
0
- 1
+ 6
@@ -256,10 +256,10 @@
English
English.pot
- 2022-01-19
+ 2022-01-22
- 1195
- 1195
+ 1200
+ 1200
0
0
@@ -269,10 +269,10 @@
Finnish.po
- 1194
+ 1199
901
0
- 293
+ 298
@@ -280,10 +280,10 @@
French.po
2022-01-09
- 1194
+ 1199
1193
0
- 1
+ 6
@@ -317,10 +317,10 @@
Galician.po
2021-12-18
- 1194
+ 1199
1136
0
- 58
+ 63
@@ -335,12 +335,12 @@
German
German.po
- 2022-01-05
+ 2022-01-19
- 1194
- 1193
+ 1199
+ 1195
0
- 1
+ 4
@@ -362,10 +362,10 @@
Greek.po
- 1194
+ 1199
604
0
- 590
+ 595
@@ -379,10 +379,10 @@
Hungarian.po
2021-03-15
- 1194
- 1193
+ 1199
+ 1195
0
- 1
+ 4
@@ -404,10 +404,10 @@
Italian.po
2021-08-09
- 1194
+ 1199
991
0
- 203
+ 208
@@ -433,10 +433,10 @@
Japanese.po
2021-11-21
- 1194
- 1193
+ 1199
+ 1199
0
- 1
+ 0
@@ -450,10 +450,10 @@
Korean.po
2021-12-10
- 1194
+ 1199
1034
0
- 160
+ 165
@@ -489,12 +489,12 @@
Lithuanian
Lithuanian.po
- 2022-01-11
+ 2022-01-20
- 1194
- 1152
+ 1199
+ 1154
0
- 42
+ 45
@@ -508,10 +508,10 @@
Norwegian.po
- 1194
+ 1199
632
0
- 562
+ 567
@@ -529,10 +529,10 @@
Persian.po
2013-08-15
- 1194
+ 1199
642
0
- 552
+ 557
@@ -546,10 +546,10 @@
Polish.po
- 1194
+ 1199
1110
0
- 84
+ 89
@@ -575,12 +575,12 @@
Portuguese
Portuguese.po
- 2022-01-15
+ 2022-01-22
- 1194
- 1193
+ 1199
+ 1195
0
- 1
+ 4
@@ -600,10 +600,10 @@
Romanian.po
- 1194
+ 1199
561
44
- 589
+ 594
@@ -617,10 +617,10 @@
Russian.po
2021-10-28
- 1194
+ 1199
1092
0
- 102
+ 107
@@ -650,10 +650,10 @@
Serbian.po
- 1194
+ 1199
632
0
- 562
+ 567
@@ -667,10 +667,10 @@
Sinhala.po
2010-12-12
- 1194
+ 1199
566
59
- 569
+ 574
@@ -683,10 +683,10 @@
Slovak.po
2020-11-02
- 1194
+ 1199
974
0
- 220
+ 225
@@ -708,10 +708,10 @@
Slovenian.po
2022-01-03
- 1194
- 1155
+ 1199
+ 1194
0
- 39
+ 5
@@ -733,10 +733,10 @@
Spanish.po
2020-04-03
- 1194
+ 1199
870
0
- 324
+ 329
@@ -762,10 +762,10 @@
Swedish.po
2021-09-15
- 1194
+ 1199
1094
0
- 100
+ 105
@@ -791,10 +791,10 @@
Turkish.po
2021-12-21
- 1194
+ 1199
1136
0
- 58
+ 63
@@ -816,10 +816,10 @@
Ukrainian.po
2009-06-13
- 1194
+ 1199
637
0
- 557
+ 562
diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po
index a28f9c70a13..e4947863800 100644
--- a/Translations/WinMerge/Arabic.po
+++ b/Translations/WinMerge/Arabic.po
@@ -239,6 +239,9 @@ msgstr "&فتح...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "ف&تح ملف التعارض..."
+msgid "Open C&lipboard"
+msgstr ""
+
msgid "Open Pro&ject...\tCtrl+J"
msgstr "فتح مشروع...\tCtrl+J"
@@ -257,6 +260,9 @@ msgstr "&خروج\tCtrl+Q"
msgid "&Edit"
msgstr "&تحرير"
+msgid "&Paste\tCtrl+V"
+msgstr "&لصق"
+
msgid "&Options..."
msgstr "خ&يارات..."
@@ -551,9 +557,6 @@ msgstr "&قص"
msgid "&Copy\tCtrl+C"
msgstr "&نسخ"
-msgid "&Paste\tCtrl+V"
-msgstr "&لصق"
-
msgid "F&ind...\tCtrl+F"
msgstr "&بحث"
@@ -4085,3 +4088,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index 31610715b7d..4b53f843d94 100644
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -278,6 +278,9 @@ msgstr "&Ireki...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Ire&ki Gatazka Agiria..."
+msgid "Open C&lipboard"
+msgstr ""
+
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Ireki Egit&asmoa...\tCtrl+J"
@@ -301,6 +304,10 @@ msgstr "Ir&ten\tCtrl+Q"
msgid "&Edit"
msgstr "&Editatu"
+#, c-format
+msgid "&Paste\tCtrl+V"
+msgstr "&Itsatsi\tCtrl+V"
+
#, c-format
msgid "&Options..."
msgstr "&Aukerak..."
@@ -683,10 +690,6 @@ msgstr "&Ebaki\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "&Kopiatu\tCtrl+C"
-#, c-format
-msgid "&Paste\tCtrl+V"
-msgstr "&Itsatsi\tCtrl+V"
-
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "&Bilatu...\tCtrl+F"
@@ -4686,3 +4689,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index 44a64ebca22..80cc2e9d27d 100644
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -238,6 +238,9 @@ msgstr "&Abrir...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Abrir o Arquiv&o do Conflito..."
+msgid "Open C&lipboard"
+msgstr ""
+
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Abrir Pro&jeto...\tCtrl+J"
@@ -256,6 +259,9 @@ msgstr "S&air\tCtrl+Q"
msgid "&Edit"
msgstr "&Editar"
+msgid "&Paste\tCtrl+V"
+msgstr "&Colar\tCtrl+V"
+
msgid "&Options..."
msgstr "&Opções..."
@@ -550,9 +556,6 @@ msgstr "Co&rtar\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "&Copiar\tCtrl+C"
-msgid "&Paste\tCtrl+V"
-msgstr "&Colar\tCtrl+V"
-
msgid "F&ind...\tCtrl+F"
msgstr "A&char...\tCtrl+F"
@@ -4202,3 +4205,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index 6ae10a3b97a..cd594d3cdad 100644
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -235,6 +235,9 @@ msgstr "&Отваряне…\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Отваряне на файл с &конфликти…"
+msgid "Open C&lipboard"
+msgstr ""
+
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Отваряне на &проект…\tCtrl+J"
@@ -253,6 +256,9 @@ msgstr "&Изход\tCtrl+Q"
msgid "&Edit"
msgstr "П&роменяне"
+msgid "&Paste\tCtrl+V"
+msgstr "&Поставяне\tCtrl+V"
+
msgid "&Options..."
msgstr "&Настройки…"
@@ -547,9 +553,6 @@ msgstr "Из&рязване\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "&Копиране\tCtrl+C"
-msgid "&Paste\tCtrl+V"
-msgstr "&Поставяне\tCtrl+V"
-
msgid "F&ind...\tCtrl+F"
msgstr "Търс&ене…\tCtrl+F"
@@ -4174,3 +4177,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index 923d3a12728..e95a081f163 100644
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -274,6 +274,9 @@ msgstr "&Obre...\tControl+O"
msgid "Open Conflic&t File..."
msgstr ""
+msgid "Open C&lipboard"
+msgstr ""
+
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Obre un &projecte...\tControl+J"
@@ -297,6 +300,10 @@ msgstr "&Surt\tCtrl+Q"
msgid "&Edit"
msgstr "E&dita"
+#, c-format
+msgid "&Paste\tCtrl+V"
+msgstr "Engan&xa\tControl+V"
+
#, c-format
msgid "&Options..."
msgstr "O&pcions..."
@@ -679,10 +686,6 @@ msgstr "&Retalla\tControl+X"
msgid "&Copy\tCtrl+C"
msgstr "C&opia\tControl+C"
-#, c-format
-msgid "&Paste\tCtrl+V"
-msgstr "Engan&xa\tControl+V"
-
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "&Cerca...\tControl+F"
@@ -4617,3 +4620,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index c48e64de661..9c180866d5a 100644
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -239,6 +239,9 @@ msgstr "打开(&O)...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "打开冲突文件(&T)..."
+msgid "Open C&lipboard"
+msgstr ""
+
msgid "Open Pro&ject...\tCtrl+J"
msgstr "打开工程(J)...\tCtrl+J"
@@ -257,6 +260,9 @@ msgstr "退出(&X)\tCtrl+Q"
msgid "&Edit"
msgstr "编辑(&E)"
+msgid "&Paste\tCtrl+V"
+msgstr "粘贴(&P)\tCtrl+V"
+
msgid "&Options..."
msgstr "选项(&O)..."
@@ -551,9 +557,6 @@ msgstr "剪切(&T)\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "复制(&C)\tCtrl+C"
-msgid "&Paste\tCtrl+V"
-msgstr "粘贴(&P)\tCtrl+V"
-
msgid "F&ind...\tCtrl+F"
msgstr "查找(&I)...\tCtrl+F"
@@ -4121,3 +4124,16 @@ msgstr "用于上下文菜单的基本文本功能"
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index a914a24e1bf..8eb406feff7 100644
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -276,6 +276,9 @@ msgstr "開啟 (&O)...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "開啟衝突檔 (&T)..."
+msgid "Open C&lipboard"
+msgstr ""
+
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "開啟專案 (&J)...\tCtrl+J"
@@ -299,6 +302,10 @@ msgstr "結束 (&X)\tCtrl+Q"
msgid "&Edit"
msgstr "編輯 (&E)"
+#, c-format
+msgid "&Paste\tCtrl+V"
+msgstr "貼上 (&P)\tCtrl+V"
+
#, c-format
msgid "&Options..."
msgstr "選項 (&O)..."
@@ -683,10 +690,6 @@ msgstr "剪下 (&U)\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "複製 (&C)\tCtrl+C"
-#, c-format
-msgid "&Paste\tCtrl+V"
-msgstr "貼上 (&P)\tCtrl+V"
-
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "尋找 (&I)...\tCtrl+F"
@@ -4865,3 +4868,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Corsican.po b/Translations/WinMerge/Corsican.po
index 2e8383b7dea..e76042844ad 100644
--- a/Translations/WinMerge/Corsican.po
+++ b/Translations/WinMerge/Corsican.po
@@ -241,6 +241,9 @@ msgstr "A&pre…\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Apre u schedariu in &cunflittu…"
+msgid "Open C&lipboard"
+msgstr ""
+
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Apre u prughje&ttu…\tCtrl+J"
@@ -259,6 +262,9 @@ msgstr "&Esce\tCtrl+Q"
msgid "&Edit"
msgstr "&Mudificà"
+msgid "&Paste\tCtrl+V"
+msgstr "&Incullà\tCtrl+V"
+
msgid "&Options..."
msgstr "&Ozzioni…"
@@ -553,9 +559,6 @@ msgstr "&Taglià\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "&Cupià\tCtrl+C"
-msgid "&Paste\tCtrl+V"
-msgstr "&Incullà\tCtrl+V"
-
msgid "F&ind...\tCtrl+F"
msgstr "Ri&cercà…\tCtrl+F"
@@ -4323,3 +4326,16 @@ msgstr "Funzioni basiche di testu per u listinu cuntestuale"
msgid "Filter applied"
msgstr "Filtru appiecatu"
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index 9a14e206fb3..51684b1a85c 100644
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -275,6 +275,9 @@ msgstr "&Usporedi...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Otvori &konfliktne..."
+msgid "Open C&lipboard"
+msgstr ""
+
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Otvori &usporedbu...\tCtrl+J"
@@ -298,6 +301,10 @@ msgstr "I&zlaz\tCtrl+Q"
msgid "&Edit"
msgstr "&Uređivanje"
+#, c-format
+msgid "&Paste\tCtrl+V"
+msgstr "&Zalijepi\tCtrl+V"
+
#, c-format
msgid "&Options..."
msgstr "Pos&tavke..."
@@ -680,10 +687,6 @@ msgstr "Od&reži\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "&Kopiraj\tCtrl+C"
-#, c-format
-msgid "&Paste\tCtrl+V"
-msgstr "&Zalijepi\tCtrl+V"
-
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "&Nađi...\tCtrl+F"
@@ -4686,3 +4689,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index 90d62c7a9fe..a71736eaba9 100644
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -275,6 +275,9 @@ msgstr "&Otevřít...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr ""
+msgid "Open C&lipboard"
+msgstr ""
+
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Otevřít pro&jekt...\tCtrl+J"
@@ -298,6 +301,10 @@ msgstr "&Konec\tCtrl+Q"
msgid "&Edit"
msgstr "Úpr&avy"
+#, c-format
+msgid "&Paste\tCtrl+V"
+msgstr "&Vložit\tCtrl+V"
+
#, c-format
msgid "&Options..."
msgstr "Možnost&i..."
@@ -680,10 +687,6 @@ msgstr "Vyj&mout\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "&Kopírovat\tCtrl+C"
-#, c-format
-msgid "&Paste\tCtrl+V"
-msgstr "&Vložit\tCtrl+V"
-
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "&Najít...\tCtrl+F"
@@ -4619,3 +4622,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index 8ab646353db..11367fe5bdb 100644
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -276,6 +276,9 @@ msgstr "&Åben...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Åben konflik&tfil..."
+msgid "Open C&lipboard"
+msgstr ""
+
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Åben pro&jekt...\tCtrl+J"
@@ -299,6 +302,10 @@ msgstr "&Afslut\tCtrl+Q"
msgid "&Edit"
msgstr "&Rediger"
+#, c-format
+msgid "&Paste\tCtrl+V"
+msgstr "&Indsæt\tCtrl+V"
+
#, c-format
msgid "&Options..."
msgstr "I&ndstillinger..."
@@ -681,10 +688,6 @@ msgstr "&Klip\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "Ko&pier\tCtrl+C"
-#, c-format
-msgid "&Paste\tCtrl+V"
-msgstr "&Indsæt\tCtrl+V"
-
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "S&øg...\tCtrl+F"
@@ -4724,3 +4727,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index 7af964407ae..2ab65f9c830 100644
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -239,6 +239,9 @@ msgstr "Openen...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Conflictbestand openen..."
+msgid "Open C&lipboard"
+msgstr ""
+
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Project openen...\tCtrl+J"
@@ -257,6 +260,9 @@ msgstr "Afsluiten\tCtrl+Q"
msgid "&Edit"
msgstr "Bewerken"
+msgid "&Paste\tCtrl+V"
+msgstr "Plakken\tCtrl+V"
+
msgid "&Options..."
msgstr "Opties..."
@@ -551,9 +557,6 @@ msgstr "Knippen\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "Kopiëren\tCtrl+C"
-msgid "&Paste\tCtrl+V"
-msgstr "Plakken\tCtrl+V"
-
msgid "F&ind...\tCtrl+F"
msgstr "Zoeken...\tCtrl+F"
@@ -4299,3 +4302,16 @@ msgstr "Basis-tekstfuncties voor het contextmenu"
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index b9a29db337c..6821480d63e 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: 2022-01-16 09:06+0000\n"
+"POT-Creation-Date: 2022-01-22 21:51+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English \n"
@@ -232,6 +232,9 @@ msgstr ""
msgid "Open Conflic&t File..."
msgstr ""
+msgid "Open C&lipboard"
+msgstr ""
+
msgid "Open Pro&ject...\tCtrl+J"
msgstr ""
@@ -250,6 +253,9 @@ msgstr ""
msgid "&Edit"
msgstr ""
+msgid "&Paste\tCtrl+V"
+msgstr ""
+
msgid "&Options..."
msgstr ""
@@ -544,9 +550,6 @@ msgstr ""
msgid "&Copy\tCtrl+C"
msgstr ""
-msgid "&Paste\tCtrl+V"
-msgstr ""
-
msgid "F&ind...\tCtrl+F"
msgstr ""
@@ -3729,3 +3732,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
+
diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
index 3a2c1b3f1f5..4b0a74a3438 100644
--- a/Translations/WinMerge/Finnish.po
+++ b/Translations/WinMerge/Finnish.po
@@ -273,6 +273,9 @@ msgstr "Avaa...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Avaa ristiriitatiedosto..."
+msgid "Open C&lipboard"
+msgstr ""
+
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Avaa pro&jekti...\tCtrl+J"
@@ -296,6 +299,10 @@ msgstr "Poistu\tCtrl+Q"
msgid "&Edit"
msgstr "Muokkaa"
+#, c-format
+msgid "&Paste\tCtrl+V"
+msgstr "Liitä\tCtrl+V"
+
#, c-format
msgid "&Options..."
msgstr "Asetukset..."
@@ -678,10 +685,6 @@ msgstr "Leikkaa\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "Kopioi\tCtrl+C"
-#, c-format
-msgid "&Paste\tCtrl+V"
-msgstr "Liitä\tCtrl+V"
-
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "Ets&i...\tCtrl+F"
@@ -4786,3 +4789,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index db49ec3f77f..b18560194a2 100644
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -282,6 +282,9 @@ msgstr "&Ouvrir...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Ouvrir le fichier en conflit..."
+msgid "Open C&lipboard"
+msgstr ""
+
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Ouvrir un &projet...\tCtrl+J"
@@ -305,6 +308,10 @@ msgstr "&Quitter\tCtrl+Q"
msgid "&Edit"
msgstr "&Edition"
+#, c-format
+msgid "&Paste\tCtrl+V"
+msgstr "Co&ller\tCtrl+V"
+
#, c-format
msgid "&Options..."
msgstr "&Préférences..."
@@ -687,10 +694,6 @@ msgstr "&Couper\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "Cop&ier\tCtrl+C"
-#, c-format
-msgid "&Paste\tCtrl+V"
-msgstr "Co&ller\tCtrl+V"
-
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "Rec&hercher...\tCtrl+F"
@@ -4975,3 +4978,16 @@ msgstr "Intitulé simplifié pour les fonctions du menu contextuel"
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index c78b9d6da5c..cd023b77d50 100644
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -276,6 +276,9 @@ msgstr "&Abrir…\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Abrir arquivo de con&flito…"
+msgid "Open C&lipboard"
+msgstr ""
+
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Abrir pro&xecto…\tCtrl+J"
@@ -299,6 +302,10 @@ msgstr "S&aír\tCtrl+Q"
msgid "&Edit"
msgstr "&Editar"
+#, c-format
+msgid "&Paste\tCtrl+V"
+msgstr "&Pegar\tCtrl+V"
+
#, c-format
msgid "&Options..."
msgstr "&Opcións…"
@@ -681,10 +688,6 @@ msgstr "Cor&tar\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "&Copiar\tCtrl+C"
-#, c-format
-msgid "&Paste\tCtrl+V"
-msgstr "&Pegar\tCtrl+V"
-
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "B&uscar…\tCtrl+F"
@@ -4853,3 +4856,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index d0e508a42b8..ccf27ea3cf0 100644
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -278,6 +278,9 @@ msgstr "Ö&ffnen...\tStrg+O"
msgid "Open Conflic&t File..."
msgstr "&Konfliktdatei öffnen..."
+msgid "Open C&lipboard"
+msgstr ""
+
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Pro&jekt öffnen...\tStrg+J"
@@ -301,6 +304,10 @@ msgstr "&Beenden\tStrg+Q"
msgid "&Edit"
msgstr "&Bearbeiten"
+#, c-format
+msgid "&Paste\tCtrl+V"
+msgstr "&Einfügen\tStrg+V"
+
#, c-format
msgid "&Options..."
msgstr "Einstellunge&n..."
@@ -683,10 +690,6 @@ msgstr "Auss&chneiden\tStrg+X"
msgid "&Copy\tCtrl+C"
msgstr "&Kopieren\tStrg+C"
-#, c-format
-msgid "&Paste\tCtrl+V"
-msgstr "&Einfügen\tStrg+V"
-
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "&Suchen...\tStrg+F"
@@ -4474,3 +4477,16 @@ msgstr "Grundlegende Textfunktionen für das Kontextmenü"
msgid "Filter applied"
msgstr "Angewandter Filter"
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index f205680bf86..baba012b89b 100644
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -274,6 +274,9 @@ msgstr "Άν&οιγμα...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Άνοιγμα Αρχείου &Διενέξεων..."
+msgid "Open C&lipboard"
+msgstr ""
+
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Άνοιγμα Έρ&γου...\tCtrl+J"
@@ -297,6 +300,10 @@ msgstr "Έξοδο&ς\tCtrl+Q"
msgid "&Edit"
msgstr "&Επεξεργασία"
+#, c-format
+msgid "&Paste\tCtrl+V"
+msgstr "Προ&σάρτηση\tCtrl+V"
+
#, c-format
msgid "&Options..."
msgstr "Επιλ&ογές..."
@@ -679,10 +686,6 @@ msgstr "Απο&κοπή\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "Αντι&γραφή\tCtrl+C"
-#, c-format
-msgid "&Paste\tCtrl+V"
-msgstr "Προ&σάρτηση\tCtrl+V"
-
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "Ανα&ζήτηση...\tCtrl+F"
@@ -4664,3 +4667,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index 4851bc3e423..3b8b2d6921a 100644
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -277,6 +277,9 @@ msgstr "M&egnyitás...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Konfliktus fájl megnyitása..."
+msgid "Open C&lipboard"
+msgstr ""
+
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Projekt megnyitása...\tCtrl+J"
@@ -300,6 +303,10 @@ msgstr "&Kilépés\tCtrl+Q"
msgid "&Edit"
msgstr "S&zerkesztés"
+#, c-format
+msgid "&Paste\tCtrl+V"
+msgstr "&Beillesztés\tCtrl+V"
+
#, c-format
msgid "&Options..."
msgstr "&Beállítások..."
@@ -682,10 +689,6 @@ msgstr "&Kivágás\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "&Másolás\tCtrl+C"
-#, c-format
-msgid "&Paste\tCtrl+V"
-msgstr "&Beillesztés\tCtrl+V"
-
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "Keresé&s...\tCtrl+F"
@@ -4853,3 +4856,16 @@ msgstr "Alapvető szöveges funkciók a helyi menühöz"
msgid "Filter applied"
msgstr "Szűrő alkalmazva"
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index f511e1e4006..2d8583a9cb7 100644
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -236,6 +236,9 @@ msgstr "&Apri...\tCtrl+A"
msgid "Open Conflic&t File..."
msgstr "Apr&i file conflittuale..."
+msgid "Open C&lipboard"
+msgstr ""
+
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Apri pro&getto...\tCtrl+J"
@@ -254,6 +257,9 @@ msgstr "&Esci\tCtrl+Q"
msgid "&Edit"
msgstr "&Modifica"
+msgid "&Paste\tCtrl+V"
+msgstr "I&ncolla\tCtrl+V"
+
msgid "&Options..."
msgstr "Op&zioni..."
@@ -548,9 +554,6 @@ msgstr "&Taglia\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "C&opia\tCtrl+C"
-msgid "&Paste\tCtrl+V"
-msgstr "I&ncolla\tCtrl+V"
-
msgid "F&ind...\tCtrl+F"
msgstr "Tro&va...\tCtrl+F"
@@ -4127,3 +4130,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index 6d502b9fc1e..13148f471ca 100644
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -236,6 +236,9 @@ msgstr "開く(&O)...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "コンフリクト ファイルを開く(&T)..."
+msgid "Open C&lipboard"
+msgstr "クリップボードを開く(&L)"
+
msgid "Open Pro&ject...\tCtrl+J"
msgstr "プロジェクトを開く(&J)...\tCtrl+J"
@@ -254,6 +257,9 @@ msgstr "終了(&X)\tCtrl+Q"
msgid "&Edit"
msgstr "編集(&E)"
+msgid "&Paste\tCtrl+V"
+msgstr "貼り付け(&P)\tCtrl+V"
+
msgid "&Options..."
msgstr "設定(&O)..."
@@ -548,9 +554,6 @@ msgstr "切り取り(&T)\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "コピー(&C)\tCtrl+C"
-msgid "&Paste\tCtrl+V"
-msgstr "貼り付け(&P)\tCtrl+V"
-
msgid "F&ind...\tCtrl+F"
msgstr "検索(&I)...\tCtrl+F"
@@ -4231,3 +4234,16 @@ msgstr "基本的なテキスト処理"
msgid "Filter applied"
msgstr "フィルタ適用"
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr "クリップボード %s"
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr "クリップボード履歴が無効になっています。\r\nクリップボード履歴を有効にするには、Windowsロゴキー + Vを押下後、[有効にする]ボタンをクリックしてください。"
+
+msgid "This system does not support clipboard history."
+msgstr "このシステムではクリップボード履歴はサポートされていません。"
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr "32bit版WinMergeではクリップボード比較はサポートされていません。"
diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index bfbe3774d79..c06d29cdfb5 100644
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -282,6 +282,9 @@ msgstr "열기(&O)...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "충돌 파일 열기(&T)..."
+msgid "Open C&lipboard"
+msgstr ""
+
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "프로젝트 열기(&J)...\tCtrl+J"
@@ -305,6 +308,10 @@ msgstr "종료(&X)\tCtrl+Q"
msgid "&Edit"
msgstr "편집(&E)"
+#, c-format
+msgid "&Paste\tCtrl+V"
+msgstr "붙여넣기(&P)\tCtrl+V"
+
#, c-format
msgid "&Options..."
msgstr "옵션(&O)..."
@@ -687,10 +694,6 @@ msgstr "잘라내기(&T)\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "복사(&C)\tCtrl+C"
-#, c-format
-msgid "&Paste\tCtrl+V"
-msgstr "붙여넣기(&P)\tCtrl+V"
-
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "찾기(&I)...\tCtrl+F"
@@ -4858,3 +4861,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po
index 02cfe2ecdf3..2383b6dc274 100644
--- a/Translations/WinMerge/Lithuanian.po
+++ b/Translations/WinMerge/Lithuanian.po
@@ -238,6 +238,9 @@ msgstr "&Atverti...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Atver&ti konfliktų failą..."
+msgid "Open C&lipboard"
+msgstr ""
+
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Atverti pro&jektą...\tCtrl+J"
@@ -256,6 +259,9 @@ msgstr "&Išeiti\tCtrl+Q"
msgid "&Edit"
msgstr "R&edaguoti"
+msgid "&Paste\tCtrl+V"
+msgstr "Įter&pti\tCtrl+V"
+
msgid "&Options..."
msgstr "Nu&ostatos..."
@@ -550,9 +556,6 @@ msgstr "Iškirp&ti\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "&Kopijuoti\tCtrl+C"
-msgid "&Paste\tCtrl+V"
-msgstr "Įter&pti\tCtrl+V"
-
msgid "F&ind...\tCtrl+F"
msgstr "R&asti...\tCtrl+F"
@@ -3734,3 +3737,16 @@ msgstr "Pagrindinės kontekstinio meniu teksto funkcijos"
msgid "Filter applied"
msgstr "Pritaikytas filtras"
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index f9e0cd06625..1bdab81d1f0 100644
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -275,6 +275,9 @@ msgstr "&Åpne...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Åpne konflik&tfil...
+msgid "Open C&lipboard"
+msgstr ""
+
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Åpne p&rosjekt...\tCtrl+J"
@@ -298,6 +301,10 @@ msgstr "&Avslutt\tCtrl+Q"
msgid "&Edit"
msgstr "&Rediger"
+#, c-format
+msgid "&Paste\tCtrl+V"
+msgstr "&Lim inn\tCtrl+V"
+
#, c-format
msgid "&Options..."
msgstr "&Innstillinger..."
@@ -680,10 +687,6 @@ msgstr "&Klipp ut\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "Ko&pier\tCtrl+C"
-#, c-format
-msgid "&Paste\tCtrl+V"
-msgstr "&Lim inn\tCtrl+V"
-
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "S&øk...\tCtrl+F"
@@ -4686,3 +4689,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index 52ddb6d3b53..848a7aa2a50 100644
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -276,6 +276,9 @@ msgstr "&O باز کردن ... \tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "&t باز کردن پرونده تعارض ... "
+msgid "Open C&lipboard"
+msgstr ""
+
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "&j باز کردن (پروژه) طرح ... \tCtrl+J"
@@ -299,6 +302,10 @@ msgstr "&x خروج \tCtrl+Q"
msgid "&Edit"
msgstr "&E ويرايش "
+#, c-format
+msgid "&Paste\tCtrl+V"
+msgstr "&P چسباندن \tCtrl+V"
+
#, c-format
msgid "&Options..."
msgstr "&O خيارات ... "
@@ -681,10 +688,6 @@ msgstr "&t برش \tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "&C رونوشت برداري \tCtrl+C"
-#, c-format
-msgid "&Paste\tCtrl+V"
-msgstr "&P چسباندن \tCtrl+V"
-
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "&i يافتن ... \tCtrl+F"
@@ -4729,3 +4732,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index 66c3e0f9300..a5be36363fb 100644
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -239,6 +239,9 @@ msgstr "Otwórz...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Otwórz plik konfliktu..."
+msgid "Open C&lipboard"
+msgstr ""
+
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Otwórz projekt...\tCtrl+J"
@@ -257,6 +260,9 @@ msgstr "Zakończ\tCtrl+Q"
msgid "&Edit"
msgstr "Edycja"
+msgid "&Paste\tCtrl+V"
+msgstr "Wklej\tCtrl+V"
+
msgid "&Options..."
msgstr "Opcje..."
@@ -551,9 +557,6 @@ msgstr "Wy&tnij\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "Kopiuj\tCtrl+C"
-msgid "&Paste\tCtrl+V"
-msgstr "Wklej\tCtrl+V"
-
msgid "F&ind...\tCtrl+F"
msgstr "Znajdź...\tCtrl+F"
@@ -3735,3 +3738,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index f97f54e7cd0..6c57d3a9df2 100644
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -239,6 +239,9 @@ msgstr "&Abrir...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Ab&rir ficheiro de conflito..."
+msgid "Open C&lipboard"
+msgstr ""
+
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Abrir pro&jeto...\tCtrl+J"
@@ -257,6 +260,9 @@ msgstr "S&air\tCtrl+Q"
msgid "&Edit"
msgstr "&Editar"
+msgid "&Paste\tCtrl+V"
+msgstr "&Colar\tCtrl+V"
+
msgid "&Options..."
msgstr "&Opções..."
@@ -551,9 +557,6 @@ msgstr "Co&rtar\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "&Copiar...\tCtrl+C"
-msgid "&Paste\tCtrl+V"
-msgstr "&Colar\tCtrl+V"
-
msgid "F&ind...\tCtrl+F"
msgstr "Localizar...\tCtrl+F"
@@ -4230,3 +4233,16 @@ msgstr "Funções básicas de texto para o menu de contexto"
msgid "Filter applied"
msgstr "Filtro aplicado"
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index 4533e57c5a1..c222eef988a 100644
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -275,6 +275,9 @@ msgstr "D&eschide...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Deschide fişierul cu conflic&te..."
+msgid "Open C&lipboard"
+msgstr ""
+
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Deschide pro&iectul...\tCtrl+J"
@@ -298,6 +301,10 @@ msgstr "Ieşir&e\tCtrl+Q"
msgid "&Edit"
msgstr "&Editare"
+#, c-format
+msgid "&Paste\tCtrl+V"
+msgstr "Li&peşte\tCtrl+V"
+
#, c-format
msgid "&Options..."
msgstr "&Opţiuni..."
@@ -680,10 +687,6 @@ msgstr "&Taie\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "&Copie\tCtrl+C"
-#, c-format
-msgid "&Paste\tCtrl+V"
-msgstr "Li&peşte\tCtrl+V"
-
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "&Găseşte...\tCtrl+F"
@@ -4665,3 +4668,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index 1a39c355fd1..5efd71e0dd7 100644
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -240,6 +240,9 @@ msgstr "&Открыть...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Открыть файл конфликтов..."
+msgid "Open C&lipboard"
+msgstr ""
+
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Открыть проект...\tCtrl+J"
@@ -258,6 +261,9 @@ msgstr "В&ыход\tCtrl+Q"
msgid "&Edit"
msgstr "&Правка"
+msgid "&Paste\tCtrl+V"
+msgstr "&Вставить\tCtrl+V"
+
msgid "&Options..."
msgstr "&Настройки..."
@@ -552,9 +558,6 @@ msgstr "Вы&резать\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "&Копировать\tCtrl+C"
-msgid "&Paste\tCtrl+V"
-msgstr "&Вставить\tCtrl+V"
-
msgid "F&ind...\tCtrl+F"
msgstr "&Найти...\tCtrl+F"
@@ -3736,3 +3739,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index c40299ac7ee..77b976dcbee 100644
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -273,6 +273,9 @@ msgstr "&Упореди...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Отвори пробл&ематичне..."
+msgid "Open C&lipboard"
+msgstr ""
+
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Отвори поре&ђење...\tCtrl+J"
@@ -296,6 +299,10 @@ msgstr "Изла&з\tCtrl+Q"
msgid "&Edit"
msgstr "Ур&еди"
+#, c-format
+msgid "&Paste\tCtrl+V"
+msgstr "&Налепи\tCtrl+V"
+
#, c-format
msgid "&Options..."
msgstr "Изб&ор..."
@@ -678,10 +685,6 @@ msgstr "Исе&ци\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "Умно&жи\tCtrl+C"
-#, c-format
-msgid "&Paste\tCtrl+V"
-msgstr "&Налепи\tCtrl+V"
-
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "Претраж&и...\tCtrl+F"
@@ -4658,3 +4661,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po
index 5a72d90d8fe..425c863f08f 100644
--- a/Translations/WinMerge/Sinhala.po
+++ b/Translations/WinMerge/Sinhala.po
@@ -275,6 +275,9 @@ msgstr "&විවෘත කිරීම\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Open Conflic&t File..."
+msgid "Open C&lipboard"
+msgstr ""
+
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "ව්යාපෘතිය විවෘත කිරීම\tCtrl+J"
@@ -298,6 +301,10 @@ msgstr " නික්මීම\tCtrl+Q"
msgid "&Edit"
msgstr "&සංස්කරණය කරන්න"
+#, c-format
+msgid "&Paste\tCtrl+V"
+msgstr "ඇලවීම\tCtrl+V"
+
#, c-format
msgid "&Options..."
msgstr "&විකල්පයන්..."
@@ -680,10 +687,6 @@ msgstr "වෙන් කීරීම\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "පිටපත් කිරීම\tCtrl+C"
-#, c-format
-msgid "&Paste\tCtrl+V"
-msgstr "ඇලවීම\tCtrl+V"
-
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "සොයන්න...\tCtrl+F"
@@ -4679,3 +4682,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index f39a81f97a3..dd2ca94f4fd 100644
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -238,6 +238,9 @@ msgstr "&Otvoriť...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Otvoriť kon&fliktný súbor..."
+msgid "Open C&lipboard"
+msgstr ""
+
msgid "Open Pro&ject...\tCtrl+J"
msgstr "O&tvoriť projekt...\tCtrl+J"
@@ -256,6 +259,9 @@ msgstr "&Koniec\tCtrl+Q"
msgid "&Edit"
msgstr "&Upraviť"
+msgid "&Paste\tCtrl+V"
+msgstr "&Prilepiť\tCtrl+V"
+
msgid "&Options..."
msgstr "&Nastavenia..."
@@ -550,9 +556,6 @@ msgstr "Vy&strihnúť\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "&Kopírovať\tCtrl+C"
-msgid "&Paste\tCtrl+V"
-msgstr "&Prilepiť\tCtrl+V"
-
msgid "F&ind...\tCtrl+F"
msgstr "&Hľadať...\tCtrl+F"
@@ -4142,3 +4145,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index 360737be6a6..c63ef8a6a8d 100644
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -238,6 +238,9 @@ msgstr "&Odpri... \tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Od&pri datoteko v sporu..."
+msgid "Open C&lipboard"
+msgstr ""
+
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Odpri pro&jekt... \tCtrl+J"
@@ -256,6 +259,9 @@ msgstr "I&zhod\tCtrl+Q"
msgid "&Edit"
msgstr "&Uredi"
+msgid "&Paste\tCtrl+V"
+msgstr "&Prilepi\tCtrl+V"
+
msgid "&Options..."
msgstr "&Možnosti..."
@@ -550,9 +556,6 @@ msgstr "Iz&reži\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "&Kopiraj\tCtrl+C"
-msgid "&Paste\tCtrl+V"
-msgstr "&Prilepi\tCtrl+V"
-
msgid "F&ind...\tCtrl+F"
msgstr "&Najdi... \tCtrl+F"
@@ -4186,3 +4189,16 @@ msgstr "Osnovne funkcije besedila za priročni meni"
msgid "Filter applied"
msgstr "Filter je uporabljen"
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index d1b64eaab70..abbbf053139 100644
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -239,6 +239,9 @@ msgstr "A&brir...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Abrir Archivo Conflic&tivo..."
+msgid "Open C&lipboard"
+msgstr ""
+
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Abrir Pro&yecto...\tCtrl+J"
@@ -257,6 +260,9 @@ msgstr "&Salir\tCtrl+Q"
msgid "&Edit"
msgstr "&Editar"
+msgid "&Paste\tCtrl+V"
+msgstr "&Pegar\tCtrl+V"
+
msgid "&Options..."
msgstr "Configuració&n..."
@@ -551,9 +557,6 @@ msgstr "Cor&tar\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "&Copiar\tCtrl+C"
-msgid "&Paste\tCtrl+V"
-msgstr "&Pegar\tCtrl+V"
-
msgid "F&ind...\tCtrl+F"
msgstr "&Buscar...\tCtrl+F"
@@ -4120,3 +4123,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index 21a59336c61..1d277bc3cfd 100644
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -239,6 +239,9 @@ msgstr "Öppna...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Öppna konfliktfil..."
+msgid "Open C&lipboard"
+msgstr ""
+
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Öppna projekt...\tCtrl+J"
@@ -257,6 +260,9 @@ msgstr "Avsluta\tCtrl+Q"
msgid "&Edit"
msgstr "Redigera"
+msgid "&Paste\tCtrl+V"
+msgstr "Klistra in\tCtrl+V"
+
msgid "&Options..."
msgstr "Alternativ..."
@@ -551,9 +557,6 @@ msgstr "Klipp ut\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "Kopiera\tCtrl+C"
-msgid "&Paste\tCtrl+V"
-msgstr "Klistra in\tCtrl+V"
-
msgid "F&ind...\tCtrl+F"
msgstr "Sök...\tCtrl+F"
@@ -4117,3 +4120,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index b667bcd9cdc..e59739824ad 100644
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -238,6 +238,9 @@ msgstr "&Aç...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "&Fark dosyası aç..."
+msgid "Open C&lipboard"
+msgstr ""
+
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Pro&je dosyası aç...\tCtrl+J"
@@ -256,6 +259,9 @@ msgstr "Çı&kış\tCtrl+Q"
msgid "&Edit"
msgstr "Düz&enle"
+msgid "&Paste\tCtrl+V"
+msgstr "Ya&pıştır\tCtrl+V"
+
msgid "&Options..."
msgstr "&Ayarlar..."
@@ -550,9 +556,6 @@ msgstr "K&es\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "&Kopyala\tCtrl+C"
-msgid "&Paste\tCtrl+V"
-msgstr "Ya&pıştır\tCtrl+V"
-
msgid "F&ind...\tCtrl+F"
msgstr "&Bul...\tCtrl+F"
@@ -4188,3 +4191,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""
diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index 997caef0976..185992c48e0 100644
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -276,6 +276,9 @@ msgstr "&Відкрити...\tCtrl+O"
msgid "Open Conflic&t File..."
msgstr "Відкрити файл з кон&фліктами..."
+msgid "Open C&lipboard"
+msgstr ""
+
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
msgstr "Відкрити &проект...\tCtrl+J"
@@ -299,6 +302,10 @@ msgstr "В&ихід\tCtrl+Q"
msgid "&Edit"
msgstr "&Редакція"
+#, c-format
+msgid "&Paste\tCtrl+V"
+msgstr "&Вставити\tCtrl+V"
+
#, c-format
msgid "&Options..."
msgstr "&Налаштування..."
@@ -681,10 +688,6 @@ msgstr "Ви&різати\tCtrl+X"
msgid "&Copy\tCtrl+C"
msgstr "&Копіювати\tCtrl+C"
-#, c-format
-msgid "&Paste\tCtrl+V"
-msgstr "&Вставити\tCtrl+V"
-
#, c-format
msgid "F&ind...\tCtrl+F"
msgstr "Зна&йти...\tCtrl+F"
@@ -4686,3 +4689,16 @@ msgstr ""
msgid "Filter applied"
msgstr ""
+
+#, c-format
+msgid "Clipboard at %s"
+msgstr ""
+
+msgid "Clipboard history is disabled.\r\nTo enable clipboard history, press Windows logo key + V and then click the Turn on button."
+msgstr ""
+
+msgid "This system does not support clipboard history."
+msgstr ""
+
+msgid "The 32-bit version of WinMerge does not support Clipboard Compare"
+msgstr ""