Fix issus #923: Put the diff patch to the clipboard rather than to files

diff --git a/Src/Merge.rc b/Src/Merge.rc
index bf9fdf6..c76098e 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1431,6 +1431,7 @@ BEGIN
     COMBOBOX        IDC_DIFF_FILE2,48,24,230,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP\r
     PUSHBUTTON      "Br&owse...",IDC_DIFF_BROWSE_FILE2,283,24,52,14\r
     PUSHBUTTON      "&Swap",IDC_DIFF_SWAPFILES,283,41,52,14\r
+    CONTROL         "&Copy to Clipboard",IDC_DIFF_COPYCLIPBOARD,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,48,40,230,10\r
     CONTROL         "&Append to existing file",IDC_DIFF_APPENDFILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,51,230,10\r
     LTEXT           "&Result:",IDC_STATIC,7,66,37,10\r
     COMBOBOX        IDC_DIFF_FILERESULT,48,63,230,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP\r
@@ -1440,17 +1441,8 @@ BEGIN
     COMBOBOX        IDC_DIFF_STYLE,63,92,80,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
     LTEXT           "&Context:",IDC_STATIC,13,109,46,10\r
     COMBOBOX        IDC_DIFF_CONTEXT,63,108,80,65,CBS_DROPDOWN | CBS_SORT | WS_DISABLED | WS_VSCROLL | WS_TABSTOP\r
-    GROUPBOX        "W&hitespaces",IDC_STATIC,155,81,123,46\r
-    CONTROL         "Com&pare",IDC_DIFF_WHITESPACE_COMPARE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,162,92,110,10\r
-    CONTROL         "I&gnore changes",IDC_DIFF_WHITESPACE_IGNORE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,162,102,110,10\r
-    CONTROL         "Ig&nore all",IDC_DIFF_WHITESPACE_IGNOREALL,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,162,112,110,10\r
-    CONTROL         "Ignor&e blank lines",IDC_DIFF_WHITESPACE_IGNOREBLANKS,\r
-                    "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,134,142,10\r
-    CONTROL         "Ignore &case",IDC_DIFF_IGNORECASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,142,10\r
-    CONTROL         "Igno&re carriage return differences (Windows/Unix/Mac)",IDC_DIFF_IGNOREEOL,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,156,281,10\r
-    CONTROL         "Inclu&de command line",IDC_DIFF_INCLCMDLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,134,170,10\r
-    CONTROL         "Open to e&xternal editor",IDC_DIFF_OPENTOEDITOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,145,170,10\r
+    CONTROL         "Inclu&de command line",IDC_DIFF_INCLCMDLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,134,170,10\r
+    CONTROL         "Open to e&xternal editor",IDC_DIFF_OPENTOEDITOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,170,10\r
     PUSHBUTTON      "Defaults",IDC_DIFF_DEFAULTS,7,170,70,14\r
     DEFPUSHBUTTON   "OK",IDOK,230,170,52,14\r
     PUSHBUTTON      "Cancel",IDCANCEL,283,170,52,14\r

diff --git a/Src/OptionsDef.h b/Src/OptionsDef.h
index 6276ee5..dec1c07 100644 (file)
--- a/Src/OptionsDef.h
+++ b/Src/OptionsDef.h
@@ -260,12 +260,9 @@ inline const String OPT_ARCHIVE_FILTER_INDEX {_T("Merge7z/FilterIndex"s)};
 // Patch Creator
 inline const String OPT_PATCHCREATOR_PATCH_STYLE {_T("PatchCreator/PatchStyle"s)};
 inline const String OPT_PATCHCREATOR_CONTEXT_LINES {_T("PatchCreator/ContextLines"s)};
-inline const String OPT_PATCHCREATOR_CASE_SENSITIVE {_T("PatchCreator/CaseSensitive"s)};
-inline const String OPT_PATCHCREATOR_EOL_SENSITIVE {_T("PatchCreator/EOLSensitive"s)};
-inline const String OPT_PATCHCREATOR_IGNORE_BLANK_LINES {_T("PatchCreator/IgnoreBlankLines"s)};
-inline const String OPT_PATCHCREATOR_WHITESPACE {_T("PatchCreator/Whitespace"s)};
 inline const String OPT_PATCHCREATOR_OPEN_TO_EDITOR {_T("PatchCreator/OpenToEditor"s)};
 inline const String OPT_PATCHCREATOR_INCLUDE_CMD_LINE {_T("PatchCreator/IncludeCmdLine"s)};
+inline const String OPT_PATCHCREATOR_COPY_TO_CLIPBOARD {_T("PatchCreator/CopyToClipboard"s)};
 
 // Plugins
 inline const String OPT_PLUGINS_ENABLED {_T("Settings/PluginsEnabled"s)};

diff --git a/Src/OptionsInit.cpp b/Src/OptionsInit.cpp
index 9e55c6a..6bd1085 100644 (file)
--- a/Src/OptionsInit.cpp
+++ b/Src/OptionsInit.cpp
@@ -210,12 +210,9 @@ void Init(COptionsMgr *pOptions)
 
        pOptions->InitOption(OPT_PATCHCREATOR_PATCH_STYLE, 0, 0, 3);
        pOptions->InitOption(OPT_PATCHCREATOR_CONTEXT_LINES, 0);
-       pOptions->InitOption(OPT_PATCHCREATOR_CASE_SENSITIVE, true);
-       pOptions->InitOption(OPT_PATCHCREATOR_EOL_SENSITIVE, true);
-       pOptions->InitOption(OPT_PATCHCREATOR_IGNORE_BLANK_LINES, false);
-       pOptions->InitOption(OPT_PATCHCREATOR_WHITESPACE, WHITESPACE_COMPARE_ALL, WHITESPACE_COMPARE_ALL, WHITESPACE_IGNORE_ALL);
        pOptions->InitOption(OPT_PATCHCREATOR_OPEN_TO_EDITOR, false);
        pOptions->InitOption(OPT_PATCHCREATOR_INCLUDE_CMD_LINE, false);
+       pOptions->InitOption(OPT_PATCHCREATOR_COPY_TO_CLIPBOARD, false);
 
        pOptions->InitOption(OPT_TABBAR_AUTO_MAXWIDTH, true);
        pOptions->InitOption(OPT_ACTIVE_FRAME_MAX, true);

diff --git a/Src/PatchDlg.cpp b/Src/PatchDlg.cpp
index fd267fa..503aeaa 100644 (file)
--- a/Src/PatchDlg.cpp
+++ b/Src/PatchDlg.cpp
@@ -30,17 +30,12 @@ using std::swap;
  */
 CPatchDlg::CPatchDlg(CWnd* pParent /*= nullptr*/)
        : CTrDialog(CPatchDlg::IDD, pParent)
-       , m_ignoreCase(false)
-       , m_ignoreBlanks(false)
-       , m_ignoreEOLDifference(false)
-       , m_whitespaceCompare(0)
+       , m_copyToClipboard(false)
        , m_appendFile(false)
        , m_openToEditor(false)
        , m_includeCmdLine(false)
        , m_outputStyle(OUTPUT_NORMAL)
        , m_contextLines(0)
-       , m_diffAlgorithm(DIFF_ALGORITHM_DEFAULT)
-       , m_indentHeuristic(true)
 {
 }
 
@@ -53,10 +48,7 @@ void CPatchDlg::DoDataExchange(CDataExchange* pDX)
        //{{AFX_DATA_MAP(CPatchDlg)
        DDX_Control(pDX, IDC_DIFF_STYLE, m_comboStyle);
        DDX_Control(pDX, IDC_DIFF_CONTEXT, m_comboContext);
-       DDX_Check(pDX, IDC_DIFF_IGNORECASE, m_ignoreCase);
-       DDX_Check(pDX, IDC_DIFF_WHITESPACE_IGNOREBLANKS, m_ignoreBlanks);
-       DDX_Radio(pDX, IDC_DIFF_WHITESPACE_COMPARE, m_whitespaceCompare);
-       DDX_Check(pDX, IDC_DIFF_IGNOREEOL, m_ignoreEOLDifference);
+       DDX_Check(pDX, IDC_DIFF_COPYCLIPBOARD, m_copyToClipboard);
        DDX_Check(pDX, IDC_DIFF_APPENDFILE, m_appendFile);
        DDX_Control(pDX, IDC_DIFF_FILE1, m_ctlFile1);
        DDX_Control(pDX, IDC_DIFF_FILE2, m_ctlFile2);
@@ -178,8 +170,6 @@ void CPatchDlg::OnOK()
        }
 
        m_contextLines = GetDlgItemInt(IDC_DIFF_CONTEXT);
-       m_diffAlgorithm = static_cast<DiffAlgorithm>(GetOptionsMgr()->GetInt(OPT_CMP_DIFF_ALGORITHM));
-       m_indentHeuristic = GetOptionsMgr()->GetBool(OPT_CMP_INDENT_HEURISTIC);
 
        SaveSettings();
 
@@ -397,19 +387,9 @@ void CPatchDlg::LoadSettings()
        if (m_contextLines < 0 || m_contextLines > 50)
                m_contextLines = 0;
 
-       m_ignoreCase = !GetOptionsMgr()->GetBool(OPT_PATCHCREATOR_CASE_SENSITIVE);
-       m_ignoreEOLDifference = GetOptionsMgr()->GetBool(OPT_PATCHCREATOR_EOL_SENSITIVE);
-       m_ignoreBlanks = GetOptionsMgr()->GetBool(OPT_PATCHCREATOR_IGNORE_BLANK_LINES);
-       
-       m_whitespaceCompare = GetOptionsMgr()->GetInt(OPT_PATCHCREATOR_WHITESPACE);
-       if (m_whitespaceCompare < WHITESPACE_COMPARE_ALL ||
-               m_whitespaceCompare > WHITESPACE_IGNORE_ALL)
-       {
-               m_whitespaceCompare = WHITESPACE_COMPARE_ALL;
-       }
-       
        m_openToEditor = GetOptionsMgr()->GetBool(OPT_PATCHCREATOR_OPEN_TO_EDITOR);
        m_includeCmdLine = GetOptionsMgr()->GetBool(OPT_PATCHCREATOR_INCLUDE_CMD_LINE);
+       m_copyToClipboard = GetOptionsMgr()->GetBool(OPT_PATCHCREATOR_COPY_TO_CLIPBOARD);
 
        UpdateSettings();
 }
@@ -422,12 +402,9 @@ void CPatchDlg::SaveSettings()
        COptionsMgr *pOptions = GetOptionsMgr();
        pOptions->SaveOption(OPT_PATCHCREATOR_PATCH_STYLE, m_outputStyle);
        pOptions->SaveOption(OPT_PATCHCREATOR_CONTEXT_LINES, m_contextLines);
-       pOptions->SaveOption(OPT_PATCHCREATOR_CASE_SENSITIVE, !m_ignoreCase);
-       pOptions->SaveOption(OPT_PATCHCREATOR_EOL_SENSITIVE, m_ignoreEOLDifference);
-       pOptions->SaveOption(OPT_PATCHCREATOR_IGNORE_BLANK_LINES, m_ignoreBlanks);
-       pOptions->SaveOption(OPT_PATCHCREATOR_WHITESPACE, m_whitespaceCompare);
        pOptions->SaveOption(OPT_PATCHCREATOR_OPEN_TO_EDITOR, m_openToEditor);
        pOptions->SaveOption(OPT_PATCHCREATOR_INCLUDE_CMD_LINE, m_includeCmdLine);
+       pOptions->SaveOption(OPT_PATCHCREATOR_COPY_TO_CLIPBOARD, m_copyToClipboard);
 }
 
 /** 
@@ -437,12 +414,9 @@ void CPatchDlg::OnDefaultSettings()
 {
        m_outputStyle = (enum output_style) DIFF_OUTPUT_NORMAL;
        m_contextLines = 0;
-       m_ignoreCase = false;
-       m_ignoreEOLDifference = false;
-       m_ignoreBlanks = false;
-       m_whitespaceCompare = WHITESPACE_COMPARE_ALL;
        m_openToEditor = false;
        m_includeCmdLine = false;
+       m_copyToClipboard = false;
 
        UpdateSettings();
 }

diff --git a/Src/PatchDlg.h b/Src/PatchDlg.h
index 6f4444f..2584681 100644 (file)
--- a/Src/PatchDlg.h
+++ b/Src/PatchDlg.h
@@ -38,16 +38,13 @@ public:
        enum { IDD = IDD_GENERATE_PATCH };
        CComboBox m_comboStyle;
        CSuperComboBox m_comboContext;
-       bool m_ignoreCase;
        CSuperComboBox m_ctlFile1;
        CSuperComboBox m_ctlFile2;
        CSuperComboBox m_ctlResult;
        String  m_file1;
        String  m_file2;
        String  m_fileResult;
-       bool m_ignoreBlanks;
-       bool m_ignoreEOLDifference;
-       int m_whitespaceCompare;
+       bool m_copyToClipboard;
        bool m_appendFile;
        bool m_openToEditor;
        bool m_includeCmdLine;
@@ -55,8 +52,6 @@ public:
 
        enum output_style m_outputStyle; /**< Patch style (context, unified etc.) */
        int m_contextLines; /**< How many context lines are added. */
-       enum DiffAlgorithm m_diffAlgorithm;
-       bool m_indentHeuristic;
 
 // Overrides
        // ClassWizard generated virtual function overrides

diff --git a/Src/PatchTool.cpp b/Src/PatchTool.cpp
index d029b7a..f9e4740 100644 (file)
--- a/Src/PatchTool.cpp
+++ b/Src/PatchTool.cpp
@@ -14,6 +14,12 @@
 #include "paths.h"
 #include "Merge.h"
 #include "DirTravel.h"
+#include "OptionsDiffOptions.h"
+#include "UniFile.h"
+#include "codepage_detect.h"
+#include "OptionsMgr.h"
+#include "OptionsDef.h"
+#include "ClipBoard.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -22,7 +28,7 @@
 /**
  * @brief Default constructor.
  */
-CPatchTool::CPatchTool() : m_bOpenToEditor(false)
+CPatchTool::CPatchTool() : m_bOpenToEditor(false), m_bCopyToClipbard(false)
 {
 }
 
@@ -186,6 +192,7 @@ int CPatchTool::CreatePatch()
                        
                        m_sPatchFile = dlgPatch.m_fileResult;
                        m_bOpenToEditor = dlgPatch.m_openToEditor;
+                       m_bCopyToClipbard = dlgPatch.m_copyToClipboard;
                        retVal = 1;
                }
        }
@@ -194,6 +201,24 @@ int CPatchTool::CreatePatch()
        {
                if (m_bOpenToEditor)
                        CMergeApp::OpenFileToExternalEditor(m_sPatchFile);
+               if (m_bCopyToClipbard)
+               {
+                       UniMemFile file;
+                       if (file.OpenReadOnly(m_sPatchFile))
+                       {
+                               int iGuessEncodingType = GetOptionsMgr()->GetInt(OPT_CP_DETECT);
+                               FileTextEncoding encoding = codepage_detect::Guess(m_sPatchFile, iGuessEncodingType);
+                               file.SetUnicoding(encoding.m_unicoding);
+                               file.SetCodepage(encoding.m_codepage);
+                               file.SetBom(encoding.m_bom);
+                               if (encoding.m_bom)
+                                       file.ReadBom();
+                               String lines;
+                               file.ReadStringAll(lines);
+                               file.Close();
+                               PutToClipboard(lines, AfxGetMainWnd()->m_hWnd);
+                       }
+               }
        }
        return retVal;
 }
@@ -223,17 +248,8 @@ bool CPatchTool::ShowDialog(CPatchDlg *pDlgPatch)
                m_diffWrapper.SetPatchOptions(&patchOptions);
 
                // These are from checkboxes and radiobuttons - can't be wrong
-               diffOptions.nIgnoreWhitespace = pDlgPatch->m_whitespaceCompare;
-               diffOptions.bIgnoreBlankLines = pDlgPatch->m_ignoreBlanks;
                m_diffWrapper.SetAppendFiles(pDlgPatch->m_appendFile);
-
-               // Use this because non-sensitive setting can't write
-               // patch file EOLs correctly
-               diffOptions.bIgnoreEol = pDlgPatch->m_ignoreEOLDifference;
-               
-               diffOptions.bIgnoreCase = pDlgPatch->m_ignoreCase;
-               diffOptions.nDiffAlgorithm = pDlgPatch->m_diffAlgorithm;
-               diffOptions.bIndentHeuristic = pDlgPatch->m_indentHeuristic;
+               Options::DiffOptions::Load(GetOptionsMgr(), diffOptions);
                m_diffWrapper.SetOptions(&diffOptions);
        }
        else

diff --git a/Src/PatchTool.h b/Src/PatchTool.h
index aa32482..2c0d206 100644 (file)
--- a/Src/PatchTool.h
+++ b/Src/PatchTool.h
@@ -66,4 +66,5 @@ private:
        CDiffWrapper m_diffWrapper; /**< DiffWrapper instance we use to create patch. */
        String m_sPatchFile; /**< Patch file path and filename. */
        bool m_bOpenToEditor; /**< Is patch file opened to external editor? */
+       bool m_bCopyToClipbard; /**< Is patch file copied to clipboard? */
 };

diff --git a/Src/resource.h b/Src/resource.h
index 641c137..74166d2 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -240,16 +240,11 @@
 #define IDC_DIFF_FILERESULT             1067\r
 #define IDC_DIFF_STYLE                  1068\r
 #define IDC_DIFF_CONTEXT                1069\r
-#define IDC_DIFF_IGNORECASE             1070\r
-#define IDC_DIFF_WHITESPACE_IGNOREBLANKS 1071\r
-#define IDC_DIFF_WHITESPACE_COMPARE     1072\r
-#define IDC_DIFF_WHITESPACE_IGNORE      1073\r
-#define IDC_DIFF_WHITESPACE_IGNOREALL   1074\r
 #define IDC_DIFF_BROWSE_FILE1           1075\r
 #define IDC_DIFF_BROWSE_FILE2           1076\r
 #define IDC_DIFF_BROWSE_RESULT          1077\r
 #define IDC_DIFF_APPENDFILE             1078\r
-#define IDC_DIFF_IGNOREEOL              1079\r
+#define IDC_DIFF_COPYCLIPBOARD          1079\r
 #define IDC_TRIVIAL_DIFF_COLOR          1080\r
 #define IDC_TRIVIAL_DIFF_DELETED_COLOR  1081\r
 #define IDC_FILES_DIRS_GROUP0           1082\r

diff --git a/Testing/GoogleTest/GUITests/ConfigTest.cpp b/Testing/GoogleTest/GUITests/ConfigTest.cpp
index 54bcf67..2710c80 100644 (file)
--- a/Testing/GoogleTest/GUITests/ConfigTest.cpp
+++ b/Testing/GoogleTest/GUITests/ConfigTest.cpp
@@ -260,12 +260,9 @@ namespace
                // Patch Creator
                { OPT_PATCHCREATOR_PATCH_STYLE, varprop::VT_BOOL, {}, {}},
                { OPT_PATCHCREATOR_CONTEXT_LINES, varprop::VT_INT, {0, 1, 2, 3, 5, 7}, {}},
-               { OPT_PATCHCREATOR_CASE_SENSITIVE, varprop::VT_BOOL, {}, {}},
-               { OPT_PATCHCREATOR_EOL_SENSITIVE, varprop::VT_BOOL, {}, {}},
-               { OPT_PATCHCREATOR_IGNORE_BLANK_LINES, varprop::VT_BOOL, {}, {}},
-               { OPT_PATCHCREATOR_WHITESPACE, varprop::VT_BOOL, {}, {}},
                { OPT_PATCHCREATOR_OPEN_TO_EDITOR, varprop::VT_BOOL, {}, {}},
                { OPT_PATCHCREATOR_INCLUDE_CMD_LINE, varprop::VT_BOOL, {}, {}},
+               { OPT_PATCHCREATOR_COPY_TO_CLIPBOARD, varprop::VT_BOOL, {}, {}},
                // Plugins
                { OPT_PLUGINS_ENABLED, varprop::VT_BOOL, {}, {}},
                { OPT_PLUGINS_CUSTOM_SETTINGS_LIST, varprop::VT_STRING, {}, {L"EDITOR_SCRIPT.PrettifyHTML=arguments:-indent --tab-size 1 --indent-spaces 1 -wrap 0 --sort-attributes alpha \tFILE_PACK_UNPACK.PrettifyHTML=arguments:-indent --indent-attributes yes --tab-size 2 --indent-spaces 2 -wrap 0 --sort-attributes alpha     FILE_PACK_UNPACK.PrettifyXML=arguments:-xml -indent --indent-attributes yes --tab-size 2 --indent-spaces 2 -wrap 0 --sort-attributes alpha|automatic:true       FILE_PACK_UNPACK.PrettifyJSON=automatic:true"}},

diff --git a/Translations/TranslationsStatus.html b/Translations/TranslationsStatus.html
index 4110b66..112f248 100644 (file)
--- a/Translations/TranslationsStatus.html
+++ b/Translations/TranslationsStatus.html
@@ -37,7 +37,7 @@
 </head>
 <body>
 <h1>Translations Status</h1>
-<p>Status from <strong>2021-10-27</strong>:</p>
+<p>Status from <strong>2021-11-21</strong>:</p>
 <h2>WinMerge</h2>
 <table class="status">
   <tr>
@@ -52,99 +52,99 @@
   <tr>
     <td class="left">Arabic</td>
     <td class="right">1136</td>
-    <td class="right translated">905</td>
+    <td class="right translated">904</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">231</td>
+    <td class="right untranslated">232</td>
     <td class="right">80 %</td>
     <td class="center">2019-12-30</td>
   </tr>
   <tr>
     <td class="left">Basque</td>
     <td class="right">1136</td>
-    <td class="right translated">642</td>
+    <td class="right translated">641</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">494</td>
-    <td class="right">57 %</td>
+    <td class="right untranslated">495</td>
+    <td class="right">56 %</td>
     <td class="center">2013-02-03</td>
   </tr>
   <tr>
     <td class="left">Brazilian</td>
     <td class="right">1136</td>
-    <td class="right translated">1089</td>
+    <td class="right translated">1088</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">47</td>
+    <td class="right untranslated">48</td>
     <td class="right">96 %</td>
     <td class="center">2021-08-09</td>
   </tr>
   <tr>
     <td class="left">Bulgarian</td>
     <td class="right">1136</td>
-    <td class="right translated">970</td>
+    <td class="right translated">969</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">166</td>
+    <td class="right untranslated">167</td>
     <td class="right">85 %</td>
     <td class="center">2021-06-28</td>
   </tr>
   <tr>
     <td class="left">Catalan</td>
     <td class="right">1136</td>
-    <td class="right translated">568</td>
+    <td class="right translated">567</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">568</td>
+    <td class="right untranslated">569</td>
     <td class="right">50 %</td>
     <td class="center"></td>
   </tr>
   <tr>
     <td class="left">ChineseSimplified</td>
     <td class="right">1136</td>
-    <td class="right translated">978</td>
+    <td class="right translated">977</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">158</td>
+    <td class="right untranslated">159</td>
     <td class="right">86 %</td>
     <td class="center"></td>
   </tr>
   <tr>
     <td class="left">ChineseTraditional</td>
     <td class="right">1136</td>
-    <td class="right translated">858</td>
+    <td class="right translated">857</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">278</td>
-    <td class="right">76 %</td>
+    <td class="right untranslated">279</td>
+    <td class="right">75 %</td>
     <td class="center">2010-02-19</td>
   </tr>
   <tr>
     <td class="left">Croatian</td>
     <td class="right">1136</td>
-    <td class="right translated">633</td>
+    <td class="right translated">632</td>
     <td class="right fuzzy">1</td>
-    <td class="right untranslated">502</td>
+    <td class="right untranslated">503</td>
     <td class="right">56 %</td>
     <td class="center">2009-02-13</td>
   </tr>
   <tr>
     <td class="left">Czech</td>
     <td class="right">1136</td>
-    <td class="right translated">608</td>
+    <td class="right translated">607</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">528</td>
-    <td class="right">54 %</td>
+    <td class="right untranslated">529</td>
+    <td class="right">53 %</td>
     <td class="center"></td>
   </tr>
   <tr>
     <td class="left">Danish</td>
     <td class="right">1136</td>
-    <td class="right translated">642</td>
+    <td class="right translated">641</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">494</td>
-    <td class="right">57 %</td>
+    <td class="right untranslated">495</td>
+    <td class="right">56 %</td>
     <td class="center">2013-01-13</td>
   </tr>
   <tr>
     <td class="left">Dutch</td>
     <td class="right">1136</td>
-    <td class="right translated">1102</td>
+    <td class="right translated">1101</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">34</td>
+    <td class="right untranslated">35</td>
     <td class="right">97 %</td>
     <td class="center">2018-09-06</td>
   </tr>
@@ -155,32 +155,32 @@
     <td class="right fuzzy">0</td>
     <td class="right untranslated">0</td>
     <td class="right">100 %</td>
-    <td class="center">2021-10-23</td>
+    <td class="center">2021-11-21</td>
   </tr>
   <tr>
     <td class="left">Finnish</td>
     <td class="right">1136</td>
-    <td class="right translated">905</td>
+    <td class="right translated">904</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">231</td>
+    <td class="right untranslated">232</td>
     <td class="right">80 %</td>
     <td class="center"></td>
   </tr>
   <tr>
     <td class="left">French</td>
     <td class="right">1136</td>
-    <td class="right translated">1022</td>
+    <td class="right translated">1021</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">114</td>
+    <td class="right untranslated">115</td>
     <td class="right">90 %</td>
     <td class="center">2021-04-29</td>
   </tr>
   <tr>
     <td class="left">Galician</td>
     <td class="right">1136</td>
-    <td class="right translated">1102</td>
+    <td class="right translated">1101</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">34</td>
+    <td class="right untranslated">35</td>
     <td class="right">97 %</td>
     <td class="center">2021-10-12</td>
   </tr>
@@ -196,9 +196,9 @@
   <tr>
     <td class="left">Greek</td>
     <td class="right">1136</td>
-    <td class="right translated">606</td>
+    <td class="right translated">605</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">530</td>
+    <td class="right untranslated">531</td>
     <td class="right">53 %</td>
     <td class="center"></td>
   </tr>
@@ -214,162 +214,162 @@
   <tr>
     <td class="left">Italian</td>
     <td class="right">1136</td>
-    <td class="right translated">995</td>
+    <td class="right translated">994</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">141</td>
+    <td class="right untranslated">142</td>
     <td class="right">88 %</td>
     <td class="center">2021-08-09</td>
   </tr>
   <tr>
     <td class="left">Japanese</td>
     <td class="right">1136</td>
-    <td class="right translated">1136</td>
+    <td class="right translated">1135</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">0</td>
+    <td class="right untranslated">1</td>
     <td class="right">100 %</td>
     <td class="center">2021-10-20</td>
   </tr>
   <tr>
     <td class="left">Korean</td>
     <td class="right">1136</td>
-    <td class="right translated">1038</td>
+    <td class="right translated">1037</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">98</td>
+    <td class="right untranslated">99</td>
     <td class="right">91 %</td>
     <td class="center">2021-08-23</td>
   </tr>
   <tr>
     <td class="left">Lithuanian</td>
     <td class="right">1136</td>
-    <td class="right translated">1098</td>
+    <td class="right translated">1114</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">38</td>
-    <td class="right">97 %</td>
-    <td class="center">2021-09-20</td>
+    <td class="right untranslated">22</td>
+    <td class="right">98 %</td>
+    <td class="center">2021-11-10</td>
   </tr>
   <tr>
     <td class="left">Norwegian</td>
     <td class="right">1136</td>
-    <td class="right translated">634</td>
+    <td class="right translated">633</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">502</td>
+    <td class="right untranslated">503</td>
     <td class="right">56 %</td>
     <td class="center"></td>
   </tr>
   <tr>
     <td class="left">Persian</td>
     <td class="right">1136</td>
-    <td class="right translated">645</td>
+    <td class="right translated">644</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">491</td>
+    <td class="right untranslated">492</td>
     <td class="right">57 %</td>
     <td class="center">2013-08-15</td>
   </tr>
   <tr>
     <td class="left">Polish</td>
     <td class="right">1136</td>
-    <td class="right translated">1012</td>
+    <td class="right translated">1112</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">124</td>
-    <td class="right">89 %</td>
+    <td class="right untranslated">24</td>
+    <td class="right">98 %</td>
     <td class="center"></td>
   </tr>
   <tr>
     <td class="left">Portuguese</td>
     <td class="right">1136</td>
-    <td class="right translated">1102</td>
+    <td class="right translated">1136</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">34</td>
-    <td class="right">97 %</td>
-    <td class="center">2021-09-16</td>
+    <td class="right untranslated">0</td>
+    <td class="right">100 %</td>
+    <td class="center">2021-11-05</td>
   </tr>
   <tr>
     <td class="left">Romanian</td>
     <td class="right">1136</td>
-    <td class="right translated">563</td>
+    <td class="right translated">562</td>
     <td class="right fuzzy">44</td>
-    <td class="right untranslated">529</td>
+    <td class="right untranslated">530</td>
     <td class="right">53 %</td>
     <td class="center"></td>
   </tr>
   <tr>
     <td class="left">Russian</td>
     <td class="right">1136</td>
-    <td class="right translated">1081</td>
+    <td class="right translated">1094</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">55</td>
-    <td class="right">95 %</td>
-    <td class="center">2021-09-11</td>
+    <td class="right untranslated">42</td>
+    <td class="right">96 %</td>
+    <td class="center">2021-10-28</td>
   </tr>
   <tr>
     <td class="left">Serbian</td>
     <td class="right">1136</td>
-    <td class="right translated">634</td>
+    <td class="right translated">633</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">502</td>
+    <td class="right untranslated">503</td>
     <td class="right">56 %</td>
     <td class="center"></td>
   </tr>
   <tr>
     <td class="left">Sinhala</td>
     <td class="right">1136</td>
-    <td class="right translated">568</td>
+    <td class="right translated">567</td>
     <td class="right fuzzy">59</td>
-    <td class="right untranslated">509</td>
+    <td class="right untranslated">510</td>
     <td class="right">55 %</td>
     <td class="center">2010-12-12</td>
   </tr>
   <tr>
     <td class="left">Slovak</td>
     <td class="right">1136</td>
-    <td class="right translated">978</td>
+    <td class="right translated">977</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">158</td>
+    <td class="right untranslated">159</td>
     <td class="right">86 %</td>
     <td class="center">2020-11-02</td>
   </tr>
   <tr>
     <td class="left">Slovenian</td>
     <td class="right">1136</td>
-    <td class="right translated">1136</td>
+    <td class="right translated">1135</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">0</td>
+    <td class="right untranslated">1</td>
     <td class="right">100 %</td>
     <td class="center">2021-10-26</td>
   </tr>
   <tr>
     <td class="left">Spanish</td>
     <td class="right">1136</td>
-    <td class="right translated">874</td>
+    <td class="right translated">873</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">262</td>
+    <td class="right untranslated">263</td>
     <td class="right">77 %</td>
     <td class="center">2020-04-03</td>
   </tr>
   <tr>
     <td class="left">Swedish</td>
     <td class="right">1136</td>
-    <td class="right translated">1097</td>
+    <td class="right translated">1096</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">39</td>
-    <td class="right">97 %</td>
+    <td class="right untranslated">40</td>
+    <td class="right">96 %</td>
     <td class="center">2021-09-15</td>
   </tr>
   <tr>
     <td class="left">Turkish</td>
     <td class="right">1136</td>
-    <td class="right translated">1102</td>
+    <td class="right translated">1101</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">34</td>
+    <td class="right untranslated">35</td>
     <td class="right">97 %</td>
     <td class="center">2021-09-21</td>
   </tr>
   <tr>
     <td class="left">Ukrainian</td>
     <td class="right">1136</td>
-    <td class="right translated">639</td>
+    <td class="right translated">638</td>
     <td class="right fuzzy">0</td>
-    <td class="right untranslated">497</td>
+    <td class="right untranslated">498</td>
     <td class="right">56 %</td>
     <td class="center">2009-06-13</td>
   </tr>
@@ -1462,7 +1462,7 @@
   </tr>
   <tr>
     <td>Polish</td>
-    <td><a href="mailto:traduc at kki.pl">Pawel Wawrzysko</a><br><a href="mailto:skiffatsf at users.sourceforge.net">Skiff</a><br><a href="mailto:hippie_1968@hotmail.com">Michał Trzebiatowski</a><br>Mirosław Żylewicz<br></td>
+    <td><a href="mailto:traduc at kki.pl">Pawel Wawrzysko</a><br><a href="mailto:skiffatsf at users.sourceforge.net">Skiff</a><br><a href="mailto:hippie_1968@hotmail.com">Michał Trzebiatowski</a><br>Mirosław Żylewicz<br>Michał Lipok<br></td>
     <td></td>
     <td></td>
     <td></td>

diff --git a/Translations/TranslationsStatus.md b/Translations/TranslationsStatus.md
index 07b1e6e..1525949 100644 (file)
--- a/Translations/TranslationsStatus.md
+++ b/Translations/TranslationsStatus.md
@@ -1,47 +1,47 @@
 # Translations Status
 
-Status from **2021-10-27**:
+Status from **2021-11-21**:
 
 ## WinMerge
 
 | Language             | Total | Translated | Fuzzy | Untranslated | Complete | Last Update |
 |:---------------------|------:|-----------:|------:|-------------:|---------:|:-----------:|
-| Arabic               |  1136 |        905 |     0 |          231 |     80 % |  2019-12-30 |
-| Basque               |  1136 |        642 |     0 |          494 |     57 % |  2013-02-03 |
-| Brazilian            |  1136 |       1089 |     0 |           47 |     96 % |  2021-08-09 |
-| Bulgarian            |  1136 |        970 |     0 |          166 |     85 % |  2021-06-28 |
-| Catalan              |  1136 |        568 |     0 |          568 |     50 % |             |
-| ChineseSimplified    |  1136 |        978 |     0 |          158 |     86 % |             |
-| ChineseTraditional   |  1136 |        858 |     0 |          278 |     76 % |  2010-02-19 |
-| Croatian             |  1136 |        633 |     1 |          502 |     56 % |  2009-02-13 |
-| Czech                |  1136 |        608 |     0 |          528 |     54 % |             |
-| Danish               |  1136 |        642 |     0 |          494 |     57 % |  2013-01-13 |
-| Dutch                |  1136 |       1102 |     0 |           34 |     97 % |  2018-09-06 |
-| English              |  1137 |       1137 |     0 |            0 |    100 % |  2021-10-23 |
-| Finnish              |  1136 |        905 |     0 |          231 |     80 % |             |
-| French               |  1136 |       1022 |     0 |          114 |     90 % |  2021-04-29 |
-| Galician             |  1136 |       1102 |     0 |           34 |     97 % |  2021-10-12 |
+| Arabic               |  1136 |        904 |     0 |          232 |     80 % |  2019-12-30 |
+| Basque               |  1136 |        641 |     0 |          495 |     56 % |  2013-02-03 |
+| Brazilian            |  1136 |       1088 |     0 |           48 |     96 % |  2021-08-09 |
+| Bulgarian            |  1136 |        969 |     0 |          167 |     85 % |  2021-06-28 |
+| Catalan              |  1136 |        567 |     0 |          569 |     50 % |             |
+| ChineseSimplified    |  1136 |        977 |     0 |          159 |     86 % |             |
+| ChineseTraditional   |  1136 |        857 |     0 |          279 |     75 % |  2010-02-19 |
+| Croatian             |  1136 |        632 |     1 |          503 |     56 % |  2009-02-13 |
+| Czech                |  1136 |        607 |     0 |          529 |     53 % |             |
+| Danish               |  1136 |        641 |     0 |          495 |     56 % |  2013-01-13 |
+| Dutch                |  1136 |       1101 |     0 |           35 |     97 % |  2018-09-06 |
+| English              |  1137 |       1137 |     0 |            0 |    100 % |  2021-11-21 |
+| Finnish              |  1136 |        904 |     0 |          232 |     80 % |             |
+| French               |  1136 |       1021 |     0 |          115 |     90 % |  2021-04-29 |
+| Galician             |  1136 |       1101 |     0 |           35 |     97 % |  2021-10-12 |
 | German               |  1136 |       1136 |     0 |            0 |    100 % |  2021-10-26 |
-| Greek                |  1136 |        606 |     0 |          530 |     53 % |             |
+| Greek                |  1136 |        605 |     0 |          531 |     53 % |             |
 | Hungarian            |  1136 |       1136 |     0 |            0 |    100 % |  2021-03-15 |
-| Italian              |  1136 |        995 |     0 |          141 |     88 % |  2021-08-09 |
-| Japanese             |  1136 |       1136 |     0 |            0 |    100 % |  2021-10-20 |
-| Korean               |  1136 |       1038 |     0 |           98 |     91 % |  2021-08-23 |
-| Lithuanian           |  1136 |       1098 |     0 |           38 |     97 % |  2021-09-20 |
-| Norwegian            |  1136 |        634 |     0 |          502 |     56 % |             |
-| Persian              |  1136 |        645 |     0 |          491 |     57 % |  2013-08-15 |
-| Polish               |  1136 |       1012 |     0 |          124 |     89 % |             |
-| Portuguese           |  1136 |       1102 |     0 |           34 |     97 % |  2021-09-16 |
-| Romanian             |  1136 |        563 |    44 |          529 |     53 % |             |
-| Russian              |  1136 |       1081 |     0 |           55 |     95 % |  2021-09-11 |
-| Serbian              |  1136 |        634 |     0 |          502 |     56 % |             |
-| Sinhala              |  1136 |        568 |    59 |          509 |     55 % |  2010-12-12 |
-| Slovak               |  1136 |        978 |     0 |          158 |     86 % |  2020-11-02 |
-| Slovenian            |  1136 |       1136 |     0 |            0 |    100 % |  2021-10-26 |
-| Spanish              |  1136 |        874 |     0 |          262 |     77 % |  2020-04-03 |
-| Swedish              |  1136 |       1097 |     0 |           39 |     97 % |  2021-09-15 |
-| Turkish              |  1136 |       1102 |     0 |           34 |     97 % |  2021-09-21 |
-| Ukrainian            |  1136 |        639 |     0 |          497 |     56 % |  2009-06-13 |
+| Italian              |  1136 |        994 |     0 |          142 |     88 % |  2021-08-09 |
+| Japanese             |  1136 |       1135 |     0 |            1 |    100 % |  2021-10-20 |
+| Korean               |  1136 |       1037 |     0 |           99 |     91 % |  2021-08-23 |
+| Lithuanian           |  1136 |       1114 |     0 |           22 |     98 % |  2021-11-10 |
+| Norwegian            |  1136 |        633 |     0 |          503 |     56 % |             |
+| Persian              |  1136 |        644 |     0 |          492 |     57 % |  2013-08-15 |
+| Polish               |  1136 |       1112 |     0 |           24 |     98 % |             |
+| Portuguese           |  1136 |       1136 |     0 |            0 |    100 % |  2021-11-05 |
+| Romanian             |  1136 |        562 |    44 |          530 |     53 % |             |
+| Russian              |  1136 |       1094 |     0 |           42 |     96 % |  2021-10-28 |
+| Serbian              |  1136 |        633 |     0 |          503 |     56 % |             |
+| Sinhala              |  1136 |        567 |    59 |          510 |     55 % |  2010-12-12 |
+| Slovak               |  1136 |        977 |     0 |          159 |     86 % |  2020-11-02 |
+| Slovenian            |  1136 |       1135 |     0 |            1 |    100 % |  2021-10-26 |
+| Spanish              |  1136 |        873 |     0 |          263 |     77 % |  2020-04-03 |
+| Swedish              |  1136 |       1096 |     0 |           40 |     96 % |  2021-09-15 |
+| Turkish              |  1136 |       1101 |     0 |           35 |     97 % |  2021-09-21 |
+| Ukrainian            |  1136 |        638 |     0 |          498 |     56 % |  2009-06-13 |
 
 ## ShellExtension
 
@@ -257,6 +257,7 @@ Status from **2021-10-27**:
    - [Skiff](mailto:skiffatsf%20at%20users.sourceforge.net)
    - [Michał Trzebiatowski](mailto:hippie_1968@hotmail.com)
    - Mirosław Żylewicz
+   - Michał Lipok
 
  * Portuguese
    - Nelson Simão

diff --git a/Translations/TranslationsStatus.xml b/Translations/TranslationsStatus.xml
index 62d4e80..90e1d90 100644 (file)
--- a/Translations/TranslationsStatus.xml
+++ b/Translations/TranslationsStatus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <status>
-  <update>2021-10-27</update>
+  <update>2021-11-21</update>
   <translations project="WinMerge">
     <translation>
       <language>Arabic</language>
@@ -8,9 +8,9 @@
       <update>2019-12-30</update>
       <strings>
         <count>1136</count>
-        <translated>905</translated>
+        <translated>904</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>231</untranslated>
+        <untranslated>232</untranslated>
       </strings>
     </translation>
     <translation>
@@ -19,9 +19,9 @@
       <update>2013-02-03</update>
       <strings>
         <count>1136</count>
-        <translated>642</translated>
+        <translated>641</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>494</untranslated>
+        <untranslated>495</untranslated>
       </strings>
       <translators>
         <translator>
@@ -36,9 +36,9 @@
       <update>2021-08-09</update>
       <strings>
         <count>1136</count>
-        <translated>1089</translated>
+        <translated>1088</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>47</untranslated>
+        <untranslated>48</untranslated>
       </strings>
       <translators>
         <translator>
@@ -61,9 +61,9 @@
       <update>2021-06-28</update>
       <strings>
         <count>1136</count>
-        <translated>970</translated>
+        <translated>969</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>166</untranslated>
+        <untranslated>167</untranslated>
       </strings>
       <translators>
         <translator>
@@ -86,9 +86,9 @@
       <update></update>
       <strings>
         <count>1136</count>
-        <translated>568</translated>
+        <translated>567</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>568</untranslated>
+        <untranslated>569</untranslated>
       </strings>
       <translators>
         <translator>
@@ -103,9 +103,9 @@
       <update></update>
       <strings>
         <count>1136</count>
-        <translated>978</translated>
+        <translated>977</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>158</untranslated>
+        <untranslated>159</untranslated>
       </strings>
       <translators>
         <translator>
@@ -128,9 +128,9 @@
       <update>2010-02-19</update>
       <strings>
         <count>1136</count>
-        <translated>858</translated>
+        <translated>857</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>278</untranslated>
+        <untranslated>279</untranslated>
       </strings>
       <translators>
         <translator>
@@ -153,9 +153,9 @@
       <update>2009-02-13</update>
       <strings>
         <count>1136</count>
-        <translated>633</translated>
+        <translated>632</translated>
         <fuzzy>1</fuzzy>
-        <untranslated>502</untranslated>
+        <untranslated>503</untranslated>
       </strings>
       <translators>
         <translator>
@@ -170,9 +170,9 @@
       <update></update>
       <strings>
         <count>1136</count>
-        <translated>608</translated>
+        <translated>607</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>528</untranslated>
+        <untranslated>529</untranslated>
       </strings>
       <translators>
         <translator>
@@ -191,9 +191,9 @@
       <update>2013-01-13</update>
       <strings>
         <count>1136</count>
-        <translated>642</translated>
+        <translated>641</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>494</untranslated>
+        <untranslated>495</untranslated>
       </strings>
       <translators>
         <translator>
@@ -212,9 +212,9 @@
       <update>2018-09-06</update>
       <strings>
         <count>1136</count>
-        <translated>1102</translated>
+        <translated>1101</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>34</untranslated>
+        <untranslated>35</untranslated>
       </strings>
       <translators>
         <translator>
@@ -229,7 +229,7 @@
     <translation template="1">
       <language>English</language>
       <file>English.pot</file>
-      <update>2021-10-23</update>
+      <update>2021-11-21</update>
       <strings>
         <count>1137</count>
         <translated>1137</translated>
@@ -243,9 +243,9 @@
       <update></update>
       <strings>
         <count>1136</count>
-        <translated>905</translated>
+        <translated>904</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>231</untranslated>
+        <untranslated>232</untranslated>
       </strings>
     </translation>
     <translation>
@@ -254,9 +254,9 @@
       <update>2021-04-29</update>
       <strings>
         <count>1136</count>
-        <translated>1022</translated>
+        <translated>1021</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>114</untranslated>
+        <untranslated>115</untranslated>
       </strings>
       <translators>
         <translator maintainer="1">
@@ -291,9 +291,9 @@
       <update>2021-10-12</update>
       <strings>
         <count>1136</count>
-        <translated>1102</translated>
+        <translated>1101</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>34</untranslated>
+        <untranslated>35</untranslated>
       </strings>
       <translators>
         <translator>
@@ -336,9 +336,9 @@
       <update></update>
       <strings>
         <count>1136</count>
-        <translated>606</translated>
+        <translated>605</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>530</untranslated>
+        <untranslated>531</untranslated>
       </strings>
       <translators>
         <translator>
@@ -378,9 +378,9 @@
       <update>2021-08-09</update>
       <strings>
         <count>1136</count>
-        <translated>995</translated>
+        <translated>994</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>141</untranslated>
+        <untranslated>142</untranslated>
       </strings>
       <translators>
         <translator>
@@ -407,9 +407,9 @@
       <update>2021-10-20</update>
       <strings>
         <count>1136</count>
-        <translated>1136</translated>
+        <translated>1135</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>0</untranslated>
+        <untranslated>1</untranslated>
       </strings>
       <translators>
         <translator>
@@ -424,9 +424,9 @@
       <update>2021-08-23</update>
       <strings>
         <count>1136</count>
-        <translated>1038</translated>
+        <translated>1037</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>98</untranslated>
+        <untranslated>99</untranslated>
       </strings>
       <translators>
         <translator>
@@ -458,12 +458,12 @@
     <translation>
       <language>Lithuanian</language>
       <file>Lithuanian.po</file>
-      <update>2021-09-20</update>
+      <update>2021-11-10</update>
       <strings>
         <count>1136</count>
-        <translated>1098</translated>
+        <translated>1114</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>38</untranslated>
+        <untranslated>22</untranslated>
       </strings>
       <translators>
         <translator>
@@ -478,9 +478,9 @@
       <update></update>
       <strings>
         <count>1136</count>
-        <translated>634</translated>
+        <translated>633</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>502</untranslated>
+        <untranslated>503</untranslated>
       </strings>
       <translators>
         <translator>
@@ -499,9 +499,9 @@
       <update>2013-08-15</update>
       <strings>
         <count>1136</count>
-        <translated>645</translated>
+        <translated>644</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>491</untranslated>
+        <untranslated>492</untranslated>
       </strings>
       <translators>
         <translator>
@@ -516,9 +516,9 @@
       <update></update>
       <strings>
         <count>1136</count>
-        <translated>1012</translated>
+        <translated>1112</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>124</untranslated>
+        <untranslated>24</untranslated>
       </strings>
       <translators>
         <translator>
@@ -536,17 +536,20 @@
         <translator>
           <name>Mirosław Żylewicz</name>
         </translator>
+        <translator>
+          <name>Michał Lipok</name>
+        </translator>
       </translators>
     </translation>
     <translation>
       <language>Portuguese</language>
       <file>Portuguese.po</file>
-      <update>2021-09-16</update>
+      <update>2021-11-05</update>
       <strings>
         <count>1136</count>
-        <translated>1102</translated>
+        <translated>1136</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>34</untranslated>
+        <untranslated>0</untranslated>
       </strings>
       <translators>
         <translator>
@@ -567,9 +570,9 @@
       <update></update>
       <strings>
         <count>1136</count>
-        <translated>563</translated>
+        <translated>562</translated>
         <fuzzy>44</fuzzy>
-        <untranslated>529</untranslated>
+        <untranslated>530</untranslated>
       </strings>
       <translators>
         <translator>
@@ -581,12 +584,12 @@
     <translation>
       <language>Russian</language>
       <file>Russian.po</file>
-      <update>2021-09-11</update>
+      <update>2021-10-28</update>
       <strings>
         <count>1136</count>
-        <translated>1081</translated>
+        <translated>1094</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>55</untranslated>
+        <untranslated>42</untranslated>
       </strings>
       <translators>
         <translator>
@@ -617,9 +620,9 @@
       <update></update>
       <strings>
         <count>1136</count>
-        <translated>634</translated>
+        <translated>633</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>502</untranslated>
+        <untranslated>503</untranslated>
       </strings>
       <translators>
         <translator>
@@ -634,9 +637,9 @@
       <update>2010-12-12</update>
       <strings>
         <count>1136</count>
-        <translated>568</translated>
+        <translated>567</translated>
         <fuzzy>59</fuzzy>
-        <untranslated>509</untranslated>
+        <untranslated>510</untranslated>
       </strings>
       <translators>
         <translator>
@@ -650,9 +653,9 @@
       <update>2020-11-02</update>
       <strings>
         <count>1136</count>
-        <translated>978</translated>
+        <translated>977</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>158</untranslated>
+        <untranslated>159</untranslated>
       </strings>
       <translators>
         <translator>
@@ -675,9 +678,9 @@
       <update>2021-10-26</update>
       <strings>
         <count>1136</count>
-        <translated>1136</translated>
+        <translated>1135</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>0</untranslated>
+        <untranslated>1</untranslated>
       </strings>
       <translators>
         <translator>
@@ -700,9 +703,9 @@
       <update>2020-04-03</update>
       <strings>
         <count>1136</count>
-        <translated>874</translated>
+        <translated>873</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>262</untranslated>
+        <untranslated>263</untranslated>
       </strings>
       <translators>
         <translator>
@@ -729,9 +732,9 @@
       <update>2021-09-15</update>
       <strings>
         <count>1136</count>
-        <translated>1097</translated>
+        <translated>1096</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>39</untranslated>
+        <untranslated>40</untranslated>
       </strings>
       <translators>
         <translator>
@@ -758,9 +761,9 @@
       <update>2021-09-21</update>
       <strings>
         <count>1136</count>
-        <translated>1102</translated>
+        <translated>1101</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>34</untranslated>
+        <untranslated>35</untranslated>
       </strings>
       <translators>
         <translator>
@@ -783,9 +786,9 @@
       <update>2009-06-13</update>
       <strings>
         <count>1136</count>
-        <translated>639</translated>
+        <translated>638</translated>
         <fuzzy>0</fuzzy>
-        <untranslated>497</untranslated>
+        <untranslated>498</untranslated>
       </strings>
       <translators>
         <translator>

diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po
index a3e1df1..4d7b525 100644 (file)
--- a/Translations/WinMerge/Arabic.po
+++ b/Translations/WinMerge/Arabic.po
@@ -1272,6 +1272,9 @@ msgstr "الملف &2:"
 msgid "&Swap"
 msgstr "&تبديل"
 
+msgid "&Copy to Clipboard"
+msgstr "ال&نسخ للحافظة"
+
 msgid "&Append to existing file"
 msgstr "إ&ضافة للملف الحالي"
 
@@ -1290,9 +1293,6 @@ msgstr "الأ&سلوب:"
 msgid "&Context:"
 msgstr "&الحالة:"
 
-msgid "Ignor&e blank lines"
-msgstr "تجاهل الأسطر الفارغة"
-
 msgid "Inclu&de command line"
 msgstr "دمج سطر الأوامر"
 
@@ -1617,9 +1617,6 @@ msgstr "الأسل&وب:"
 msgid "&Include File Compare Report"
 msgstr "ت&ضمين ملف التقرير الخاص بالمقارنة"
 
-msgid "&Copy to Clipboard"
-msgstr "ال&نسخ للحافظة"
-
 msgid "Shared or Private Filter"
 msgstr "مرشح مشترك أو خاص"
 

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index ec4bd19..1562079 100644 (file)
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -1594,6 +1594,10 @@ msgid "&Swap"
 msgstr "A&ldaketa"
 
 #, c-format
+msgid "&Copy to Clipboard"
+msgstr "&Kopiatu Gakoan"
+
+#, c-format
 msgid "&Append to existing file"
 msgstr "E&rantsi dagoen agirira"
 
@@ -1618,10 +1622,6 @@ msgid "&Context:"
 msgstr "Hitzi&ngurua:"
 
 #, c-format
-msgid "Ignor&e blank lines"
-msgstr "Ezi&kusi lerro zuriak"
-
-#, c-format
 msgid "Inclu&de command line"
 msgstr "Ko&mando lerroa barne"
 
@@ -2022,10 +2022,6 @@ msgid "&Include File Compare Report"
 msgstr ""
 
 #, c-format
-msgid "&Copy to Clipboard"
-msgstr "&Kopiatu Gakoan"
-
-#, c-format
 msgid "Shared or Private Filter"
 msgstr "Iragazki Partekatua edo Pribatua"
 

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index fbd1c66..cbb734a 100644 (file)
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -1277,6 +1277,9 @@ msgstr "Arquivo&2:"
 msgid "&Swap"
 msgstr "&Trocar"
 
+msgid "&Copy to Clipboard"
+msgstr "&Copiar pra Área de Transferência"
+
 msgid "&Append to existing file"
 msgstr "&Anexar ao arquivo existente"
 
@@ -1295,9 +1298,6 @@ msgstr "Es&tilo:"
 msgid "&Context:"
 msgstr "&Contexto:"
 
-msgid "Ignor&e blank lines"
-msgstr "Ignor&ar as linhas em branco"
-
 msgid "Inclu&de command line"
 msgstr "Inclu&ir a linha de comando"
 
@@ -1631,9 +1631,6 @@ msgstr "&Estilo:"
 msgid "&Include File Compare Report"
 msgstr "&Incluir o Relatório da Comparação do Arquivo"
 
-msgid "&Copy to Clipboard"
-msgstr "&Copiar pra Área de Transferência"
-
 msgid "Shared or Private Filter"
 msgstr "Filtro Compartilhado ou Privado"
 

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index 75d4449..8d7b8ec 100644 (file)
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -1268,6 +1268,9 @@ msgstr "Файл&2:"
 msgid "&Swap"
 msgstr "&Разменяне"
 
+msgid "&Copy to Clipboard"
+msgstr "&Копиране в системния буфер"
+
 msgid "&Append to existing file"
 msgstr "&Прилагане към съществуващ файл"
 
@@ -1286,9 +1289,6 @@ msgstr "Сти&л:"
 msgid "&Context:"
 msgstr "&Контекст:"
 
-msgid "Ignor&e blank lines"
-msgstr "Пренебрегва&не на празни редове"
-
 msgid "Inclu&de command line"
 msgstr "Включително командния &ред"
 
@@ -1619,9 +1619,6 @@ msgstr "&Стил:"
 msgid "&Include File Compare Report"
 msgstr ""
 
-msgid "&Copy to Clipboard"
-msgstr "&Копиране в системния буфер"
-
 msgid "Shared or Private Filter"
 msgstr "Споделен или личен филтър"
 

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index bcc22b4..c3599df 100644 (file)
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -1591,6 +1591,10 @@ msgid "&Swap"
 msgstr "Inter&canvia"
 
 #, c-format
+msgid "&Copy to Clipboard"
+msgstr "&Copia al Porta-retalls"
+
+#, c-format
 msgid "&Append to existing file"
 msgstr "A&fegeix al final del fitxer existent"
 
@@ -1615,10 +1619,6 @@ msgid "&Context:"
 msgstr ""
 
 #, c-format
-msgid "Ignor&e blank lines"
-msgstr "Ign&ora les línies en blanc"
-
-#, c-format
 msgid "Inclu&de command line"
 msgstr "Inc&lou-hi la línia de comandes"
 
@@ -2018,10 +2018,6 @@ msgid "&Include File Compare Report"
 msgstr ""
 
 #, c-format
-msgid "&Copy to Clipboard"
-msgstr "&Copia al Porta-retalls"
-
-#, c-format
 msgid "Shared or Private Filter"
 msgstr "Filtre compartit o privat"
 

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index edf50e4..ea03be6 100644 (file)
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -1272,6 +1272,9 @@ msgstr "文件&2:"
 msgid "&Swap"
 msgstr "上下交换(&S)"
 
+msgid "&Copy to Clipboard"
+msgstr "复制到剪贴板(&C)"
+
 msgid "&Append to existing file"
 msgstr "追加到现有文件末尾(&A)"
 
@@ -1290,9 +1293,6 @@ msgstr "样式(&Y):"
 msgid "&Context:"
 msgstr "内容(&C):"
 
-msgid "Ignor&e blank lines"
-msgstr "忽略空行(&E)"
-
 msgid "Inclu&de command line"
 msgstr "包含命令行(&D)"
 
@@ -1622,9 +1622,6 @@ msgstr "样式(&S):"
 msgid "&Include File Compare Report"
 msgstr "包括文件比较报告(&I)"
 
-msgid "&Copy to Clipboard"
-msgstr "复制到剪贴板(&C)"
-
 msgid "Shared or Private Filter"
 msgstr "共享或私有过滤器"
 

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index 00ba293..83204d2 100644 (file)
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -1602,6 +1602,10 @@ msgid "&Swap"
 msgstr "對調(&S)"
 
 #, c-format
+msgid "&Copy to Clipboard"
+msgstr "複製到剪貼簿(&C)"
+
+#, c-format
 msgid "&Append to existing file"
 msgstr "附加到現有檔案(&A)"
 
@@ -1626,10 +1630,6 @@ msgid "&Context:"
 msgstr "上下文(&C)："
 
 #, c-format
-msgid "Ignor&e blank lines"
-msgstr "忽略空白行(&E)"
-
-#, c-format
 msgid "Inclu&de command line"
 msgstr "附加 diff 命令於檔首(&P)"
 
@@ -2032,10 +2032,6 @@ msgid "&Include File Compare Report"
 msgstr "包括檔案比較報告(&I)"
 
 #, c-format
-msgid "&Copy to Clipboard"
-msgstr "複製到剪貼簿(&C)"
-
-#, c-format
 msgid "Shared or Private Filter"
 msgstr "共用或個人篩選器"
 

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index f643ae9..d04a92f 100644 (file)
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -1592,6 +1592,10 @@ msgid "&Swap"
 msgstr "&Obrni D<->L"
 
 #, c-format
+msgid "&Copy to Clipboard"
+msgstr "&Kopiraj u međumemoriju"
+
+#, c-format
 msgid "&Append to existing file"
 msgstr "&Priključi postojećoj datoteci"
 
@@ -1616,10 +1620,6 @@ msgid "&Context:"
 msgstr "&Dubina:"
 
 #, c-format
-msgid "Ignor&e blank lines"
-msgstr "&Zanemari prazne retke"
-
-#, c-format
 msgid "Inclu&de command line"
 msgstr "&Uključi naredbeni redak"
 
@@ -2021,10 +2021,6 @@ msgid "&Include File Compare Report"
 msgstr ""
 
 #, c-format
-msgid "&Copy to Clipboard"
-msgstr "&Kopiraj u međumemoriju"
-
-#, c-format
 msgid "Shared or Private Filter"
 msgstr "Zajednički ili osobni filtar"
 

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index cb7a6cb..827c09a 100644 (file)
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -1592,6 +1592,10 @@ msgid "&Swap"
 msgstr "Z&aměnit"
 
 #, c-format
+msgid "&Copy to Clipboard"
+msgstr "&Kopírovat do schránky"
+
+#, c-format
 msgid "&Append to existing file"
 msgstr "Př&ipojit ke stávajícímu souboru"
 
@@ -1616,10 +1620,6 @@ msgid "&Context:"
 msgstr "O&bsah:"
 
 #, c-format
-msgid "Ignor&e blank lines"
-msgstr "Ignorovat prázdné řá&dky"
-
-#, c-format
 msgid "Inclu&de command line"
 msgstr "Vložit pří&kazový řádek"
 
@@ -2021,10 +2021,6 @@ msgid "&Include File Compare Report"
 msgstr ""
 
 #, c-format
-msgid "&Copy to Clipboard"
-msgstr "&Kopírovat do schránky"
-
-#, c-format
 msgid "Shared or Private Filter"
 msgstr "Typ filtru"
 

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index 65839b1..59f7f77 100644 (file)
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -1593,6 +1593,10 @@ msgid "&Swap"
 msgstr "&Byt"
 
 #, c-format
+msgid "&Copy to Clipboard"
+msgstr "&Kopier til Udklipsholder"
+
+#, c-format
 msgid "&Append to existing file"
 msgstr "&Tilføj til eksisterende fil"
 
@@ -1617,10 +1621,6 @@ msgid "&Context:"
 msgstr "&Sammenhæng:"
 
 #, c-format
-msgid "Ignor&e blank lines"
-msgstr "Igno&rer blanke linjer"
-
-#, c-format
 msgid "Inclu&de command line"
 msgstr "Inkluder &kommandolinjen"
 
@@ -2026,10 +2026,6 @@ msgid "&Include File Compare Report"
 msgstr ""
 
 #, c-format
-msgid "&Copy to Clipboard"
-msgstr "&Kopier til Udklipsholder"
-
-#, c-format
 msgid "Shared or Private Filter"
 msgstr "Delt eller Privat Filter "
 

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index bed22c1..bfa86b8 100644 (file)
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -1275,6 +1275,9 @@ msgstr "Bestand 2:"
 msgid "&Swap"
 msgstr "Wisselen"
 
+msgid "&Copy to Clipboard"
+msgstr "Naar klembord kopiëren"
+
 msgid "&Append to existing file"
 msgstr "Toevoegen aan bestaand bestand"
 
@@ -1293,9 +1296,6 @@ msgstr "Stijl:"
 msgid "&Context:"
 msgstr "Context:"
 
-msgid "Ignor&e blank lines"
-msgstr "Lege regels overslaan"
-
 msgid "Inclu&de command line"
 msgstr "Inclusief opdrachtregel"
 
@@ -1629,9 +1629,6 @@ msgstr "Stijl:"
 msgid "&Include File Compare Report"
 msgstr "Bestandsvergelijkingsrapport bijvoegen"
 
-msgid "&Copy to Clipboard"
-msgstr "Naar klembord kopiëren"
-
 msgid "Shared or Private Filter"
 msgstr "Gedeelde of persoonlijke filter"
 

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index 7454be8..04e09ff 100644 (file)
--- a/Translations/WinMerge/English.pot
+++ b/Translations/WinMerge/English.pot
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2021-10-23 10:36+0000\n"
+"POT-Creation-Date: 2021-11-21 20:57+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -1263,6 +1263,9 @@ msgstr ""
 msgid "&Swap"
 msgstr ""
 
+msgid "&Copy to Clipboard"
+msgstr ""
+
 msgid "&Append to existing file"
 msgstr ""
 
@@ -1281,9 +1284,6 @@ msgstr ""
 msgid "&Context:"
 msgstr ""
 
-msgid "Ignor&e blank lines"
-msgstr ""
-
 msgid "Inclu&de command line"
 msgstr ""
 
@@ -1602,9 +1602,6 @@ msgstr ""
 msgid "&Include File Compare Report"
 msgstr ""
 
-msgid "&Copy to Clipboard"
-msgstr ""
-
 msgid "Shared or Private Filter"
 msgstr ""
 

diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
index 2051b77..c1331cc 100644 (file)
--- a/Translations/WinMerge/Finnish.po
+++ b/Translations/WinMerge/Finnish.po
@@ -1592,6 +1592,10 @@ msgid "&Swap"
 msgstr "Vaihda"
 
 #, c-format
+msgid "&Copy to Clipboard"
+msgstr "Kopioi leikepöydälle"
+
+#, c-format
 msgid "&Append to existing file"
 msgstr "Lisää olem&assa olevaan tiedostoon"
 
@@ -1616,10 +1620,6 @@ msgid "&Context:"
 msgstr "Konteksti:"
 
 #, c-format
-msgid "Ignor&e blank lines"
-msgstr "Ohita tyhjät rivit"
-
-#, c-format
 msgid "Inclu&de command line"
 msgstr "Sisällytä komentorivi"
 
@@ -2024,10 +2024,6 @@ msgid "&Include File Compare Report"
 msgstr "S&isällytä tiedoston vertailuraportti"
 
 #, c-format
-msgid "&Copy to Clipboard"
-msgstr "Kopioi leikepöydälle"
-
-#, c-format
 msgid "Shared or Private Filter"
 msgstr "Yhteinen tai yksityinen suodatin"
 

diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index 245f0b7..b449d95 100644 (file)
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -1599,6 +1599,10 @@ msgid "&Swap"
 msgstr "&Intervertir"
 
 #, c-format
+msgid "&Copy to Clipboard"
+msgstr "&Copier vers le presse-papiers"
+
+#, c-format
 msgid "&Append to existing file"
 msgstr "A&jouter au fichier existant"
 
@@ -1623,10 +1627,6 @@ msgid "&Context:"
 msgstr "&Contexte :"
 
 #, c-format
-msgid "Ignor&e blank lines"
-msgstr "Ignorer les lignes &vides"
-
-#, c-format
 msgid "Inclu&de command line"
 msgstr "Inclure la ligne de co&mmande"
 
@@ -2034,10 +2034,6 @@ msgid "&Include File Compare Report"
 msgstr "&Inclure le rapport de comparaison de fichier"
 
 #, c-format
-msgid "&Copy to Clipboard"
-msgstr "&Copier vers le presse-papiers"
-
-#, c-format
 msgid "Shared or Private Filter"
 msgstr "Filtre partagé ou privé"
 

diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index dbf3503..b0cc5de 100644 (file)
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -1593,6 +1593,10 @@ msgid "&Swap"
 msgstr "&Intercambiar"
 
 #, c-format
+msgid "&Copy to Clipboard"
+msgstr "&Copiar ao portapapeis"
+
+#, c-format
 msgid "&Append to existing file"
 msgstr "&Anexar a arquivo existente"
 
@@ -1617,10 +1621,6 @@ msgid "&Context:"
 msgstr "&Contexto:"
 
 #, c-format
-msgid "Ignor&e blank lines"
-msgstr "Ignor&ar liñas en branco"
-
-#, c-format
 msgid "Inclu&de command line"
 msgstr "Inclu&ír liña de comandos"
 
@@ -2028,10 +2028,6 @@ msgid "&Include File Compare Report"
 msgstr "&Incluír informe de comparación de arquivos"
 
 #, c-format
-msgid "&Copy to Clipboard"
-msgstr "&Copiar ao portapapeis"
-
-#, c-format
 msgid "Shared or Private Filter"
 msgstr "Filtro privado ou compartido"
 

diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index e6fb81a..5c26c4a 100644 (file)
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -1593,6 +1593,10 @@ msgid "&Swap"
 msgstr "Ver&tauschen"
 
 #, c-format
+msgid "&Copy to Clipboard"
+msgstr "In die &Zwischenablage kopieren"
+
+#, c-format
 msgid "&Append to existing file"
 msgstr "A&n vorhandene Datei anfügen"
 
@@ -1617,10 +1621,6 @@ msgid "&Context:"
 msgstr "&Kontext:"
 
 #, c-format
-msgid "Ignor&e blank lines"
-msgstr "&Leerzeilen ignorieren"
-
-#, c-format
 msgid "Inclu&de command line"
 msgstr "&Befehlszeile einfügen"
 
@@ -2020,10 +2020,6 @@ msgid "&Include File Compare Report"
 msgstr "Dateivergleichsbericht einschließen"
 
 #, c-format
-msgid "&Copy to Clipboard"
-msgstr "In die &Zwischenablage kopieren"
-
-#, c-format
 msgid "Shared or Private Filter"
 msgstr "Gemeinsamer oder privater Filter"
 

diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index a62950b..609ecd3 100644 (file)
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -1591,6 +1591,10 @@ msgid "&Swap"
 msgstr "Αντιμετά&θεση"
 
 #, c-format
+msgid "&Copy to Clipboard"
+msgstr "Αντι&γραφή στο Πρόχειρο"
+
+#, c-format
 msgid "&Append to existing file"
 msgstr "Προσάρτηση σε υπάρχον αρχείο"
 
@@ -1615,10 +1619,6 @@ msgid "&Context:"
 msgstr "&Περιβ. Κείμ.:"
 
 #, c-format
-msgid "Ignor&e blank lines"
-msgstr "Οι κενές γραμμές να αγνοούνται"
-
-#, c-format
 msgid "Inclu&de command line"
 msgstr "Η γραμμή εντολής να συμπεριλαμβάνεται"
 
@@ -2018,10 +2018,6 @@ msgid "&Include File Compare Report"
 msgstr ""
 
 #, c-format
-msgid "&Copy to Clipboard"
-msgstr "Αντι&γραφή στο Πρόχειρο"
-
-#, c-format
 msgid "Shared or Private Filter"
 msgstr "Κοινό ή Ιδιωτικό Φίλτρο"
 

diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index b45259f..67941d9 100644 (file)
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -1594,6 +1594,10 @@ msgid "&Swap"
 msgstr "Csere"
 
 #, c-format
+msgid "&Copy to Clipboard"
+msgstr "Másolás vágólapra"
+
+#, c-format
 msgid "&Append to existing file"
 msgstr "&Hozzáfűzés a létező fájlhoz"
 
@@ -1618,10 +1622,6 @@ msgid "&Context:"
 msgstr "&Környezet:"
 
 #, c-format
-msgid "Ignor&e blank lines"
-msgstr "Üres sorok mellőzése"
-
-#, c-format
 msgid "Inclu&de command line"
 msgstr "&Parancssor is"
 
@@ -2029,10 +2029,6 @@ msgid "&Include File Compare Report"
 msgstr "Fájl-összehasonlító jelentés hozzáadása"
 
 #, c-format
-msgid "&Copy to Clipboard"
-msgstr "Másolás vágólapra"
-
-#, c-format
 msgid "Shared or Private Filter"
 msgstr "Megosztott vagy saját szűrő"
 

diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index 4abe71d..cb2d35e 100644 (file)
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -1269,6 +1269,9 @@ msgstr "File&2:"
 msgid "&Swap"
 msgstr "&Scambia"
 
+msgid "&Copy to Clipboard"
+msgstr "&Copia negli Appunti"
+
 msgid "&Append to existing file"
 msgstr "&Appendi a file esistente"
 
@@ -1287,9 +1290,6 @@ msgstr "Sti&le:"
 msgid "&Context:"
 msgstr "&Contesto:"
 
-msgid "Ignor&e blank lines"
-msgstr "Ignora lin&ee vuote"
-
 msgid "Inclu&de command line"
 msgstr "Includi &linea di comando"
 
@@ -1616,9 +1616,6 @@ msgstr "&Stile:"
 msgid "&Include File Compare Report"
 msgstr "&Includi il rapporto sul confronto tra file"
 
-msgid "&Copy to Clipboard"
-msgstr "&Copia negli Appunti"
-
 msgid "Shared or Private Filter"
 msgstr "Filtro condiviso o privato"
 

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index f1a88dd..a6d02dd 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
 "POT-Creation-Date: 2020-12-05 22:07+0000\n"
-"PO-Revision-Date: 2021-10-20 08:26+0900\n"
+"PO-Revision-Date: 2021-11-21 21:41+0900\n"
 "Last-Translator: Takashi Sawanaka <sawanaka@d1.dion.ne.jp>\n"
 "Language-Team: Japanese <winmerge-translate@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -932,7 +932,7 @@ msgid "Ignore codepage &differences"
 msgstr "コードページの違いを無視する(&D)"
 
 msgid "Ignore num&bers"
-msgstr ""
+msgstr "数字を無視する(&B)"
 
 msgid "Ignore c&omment differences"
 msgstr "コメントの違いを無視する(&O)"
@@ -1274,6 +1274,9 @@ msgstr "ファイル &2:"
 msgid "&Swap"
 msgstr "交換(&S)"
 
+msgid "&Copy to Clipboard"
+msgstr "クリップボードにコピー(&C)"
+
 msgid "&Append to existing file"
 msgstr "既存のファイルに追加する(&A)"
 
@@ -1292,9 +1295,6 @@ msgstr "スタイル(&Y):"
 msgid "&Context:"
 msgstr "コンテキスト(&C):"
 
-msgid "Ignor&e blank lines"
-msgstr "空白行を無視する(&E)"
-
 msgid "Inclu&de command line"
 msgstr "コマンド行を含める(&D)"
 
@@ -1621,9 +1621,6 @@ msgstr "スタイル(&S):"
 msgid "&Include File Compare Report"
 msgstr "ファイル比較レポートを含める(&I)"
 
-msgid "&Copy to Clipboard"
-msgstr "クリップボードにコピー(&C)"
-
 msgid "Shared or Private Filter"
 msgstr "共有/プライベート フィルター"
 

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index 5289461..dd0e584 100644 (file)
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -1598,6 +1598,10 @@ msgid "&Swap"
 msgstr "맞바꾸기(&S)"
 
 #, c-format
+msgid "&Copy to Clipboard"
+msgstr "클립보드로 복사(&C)"
+
+#, c-format
 msgid "&Append to existing file"
 msgstr "기존 파일에 덧붙이기(&A)"
 
@@ -1622,10 +1626,6 @@ msgid "&Context:"
 msgstr "차이점전후:"
 
 #, c-format
-msgid "Ignor&e blank lines"
-msgstr "공백 줄 무시하기(&E)"
-
-#, c-format
 msgid "Inclu&de command line"
 msgstr "명령행 포함하기(&D)"
 
@@ -2033,10 +2033,6 @@ msgid "&Include File Compare Report"
 msgstr "파일 비교 보고서 포함(&I)"
 
 #, c-format
-msgid "&Copy to Clipboard"
-msgstr "클립보드로 복사(&C)"
-
-#, c-format
 msgid "Shared or Private Filter"
 msgstr "공유/개인 필터"
 

diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po
index fb6a556..d98df77 100644 (file)
--- a/Translations/WinMerge/Lithuanian.po
+++ b/Translations/WinMerge/Lithuanian.po
@@ -1272,6 +1272,9 @@ msgstr "Failas&2:"
 msgid "&Swap"
 msgstr "&Sukeisti"
 
+msgid "&Copy to Clipboard"
+msgstr "&Kopijuoti į mainų sritį"
+
 msgid "&Append to existing file"
 msgstr "Pridėti prie es&amo failo"
 
@@ -1290,9 +1293,6 @@ msgstr "St&ilius:"
 msgid "&Context:"
 msgstr "&Kontekstas:"
 
-msgid "Ignor&e blank lines"
-msgstr "Ignoruoti tuščias &eilutes"
-
 msgid "Inclu&de command line"
 msgstr "Įterpti koman&dinę eilutę"
 
@@ -1611,9 +1611,6 @@ msgstr "&Stilius:"
 msgid "&Include File Compare Report"
 msgstr "Įtraukt&i failų palyginimo ataskaitą"
 
-msgid "&Copy to Clipboard"
-msgstr "&Kopijuoti į mainų sritį"
-
 msgid "Shared or Private Filter"
 msgstr "Bendro naudojimo ar asmeninis filtras"
 

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index ad47531..e363fdd 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -1592,6 +1592,10 @@ msgid "&Swap"
 msgstr "B&ytt"
 
 #, c-format
+msgid "&Copy to Clipboard"
+msgstr "&Kopier til utklippstavle"
+
+#, c-format
 msgid "&Append to existing file"
 msgstr "&Legg til i eksisterende fil"
 
@@ -1616,10 +1620,6 @@ msgid "&Context:"
 msgstr "&Kontekst:"
 
 #, c-format
-msgid "Ignor&e blank lines"
-msgstr "Ignor&er tomme linjer"
-
-#, c-format
 msgid "Inclu&de command line"
 msgstr "Inklud&er kommandolinje"
 
@@ -2021,10 +2021,6 @@ msgid "&Include File Compare Report"
 msgstr ""
 
 #, c-format
-msgid "&Copy to Clipboard"
-msgstr "&Kopier til utklippstavle"
-
-#, c-format
 msgid "Shared or Private Filter"
 msgstr "Delt eller privat filter"
 

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index aad6336..b578456 100644 (file)
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -1595,6 +1595,10 @@ msgid "&Swap"
 msgstr "&S معاوضه "
 
 #, c-format
+msgid "&Copy to Clipboard"
+msgstr "&C رونوشت برداري به حافظه يادداشت / کليپ بورد "
+
+#, c-format
 msgid "&Append to existing file"
 msgstr "&A پيوند زدن به پرونده موجود "
 
@@ -1619,10 +1623,6 @@ msgid "&Context:"
 msgstr "&C متن : "
 
 #, c-format
-msgid "Ignor&e blank lines"
-msgstr "&e چشم پوشي از خطوط خالي "
-
-#, c-format
 msgid "Inclu&de command line"
 msgstr "&d شامل خط فرمان "
 
@@ -2028,10 +2028,6 @@ msgid "&Include File Compare Report"
 msgstr ""
 
 #, c-format
-msgid "&Copy to Clipboard"
-msgstr "&C رونوشت برداري به حافظه يادداشت / کليپ بورد "
-
-#, c-format
 msgid "Shared or Private Filter"
 msgstr " صافي شخصي يا اشتراکي "
 

diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index 7c7a638..df83400 100644 (file)
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -1270,6 +1270,9 @@ msgstr "Plik &2:"
 msgid "&Swap"
 msgstr "Zamień"
 
+msgid "&Copy to Clipboard"
+msgstr "Kopiuj do schowka"
+
 msgid "&Append to existing file"
 msgstr "Dod&aj do istniejącego pliku"
 
@@ -1288,9 +1291,6 @@ msgstr "St&yl:"
 msgid "&Context:"
 msgstr "Kontekst:"
 
-msgid "Ignor&e blank lines"
-msgstr "Ignoruj puste wiersze"
-
 msgid "Inclu&de command line"
 msgstr "Uwzględnij wiersz poleceń"
 
@@ -1609,9 +1609,6 @@ msgstr "Styl:"
 msgid "&Include File Compare Report"
 msgstr "Uwzględnij raport porównania plików"
 
-msgid "&Copy to Clipboard"
-msgstr "Kopiuj do schowka"
-
 msgid "Shared or Private Filter"
 msgstr "Filtr współdzielony lub prywatny"
 

diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index 125af62..1c6fb00 100644 (file)
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -1277,6 +1277,9 @@ msgstr "Ficheiro&2:"
 msgid "&Swap"
 msgstr "&Troca"
 
+msgid "&Copy to Clipboard"
+msgstr "Copiar para a área de transferência"
+
 msgid "&Append to existing file"
 msgstr "&Anexar a ficheiro existente"
 
@@ -1295,9 +1298,6 @@ msgstr "Est&ilo:"
 msgid "&Context:"
 msgstr "&Contexto:"
 
-msgid "Ignor&e blank lines"
-msgstr "Ignorar linhas &em branco"
-
 msgid "Inclu&de command line"
 msgstr "Incluir linha &de comandos"
 
@@ -1631,9 +1631,6 @@ msgstr "Estilo:"
 msgid "&Include File Compare Report"
 msgstr "Incluir relatório de comparação de ficheiros"
 
-msgid "&Copy to Clipboard"
-msgstr "Copiar para a área de transferência"
-
 msgid "Shared or Private Filter"
 msgstr "Filtro partilhado ou privado"
 

diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index 45b655d..6293b65 100644 (file)
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -1591,6 +1591,10 @@ msgstr "F&işier 2:"
 msgid "&Swap"
 msgstr "Interschim&bă"
 
+#, fuzzy, c-format
+msgid "&Copy to Clipboard"
+msgstr "&Copie în memorie"
+
 #, c-format
 msgid "&Append to existing file"
 msgstr "&Adaugă la fişier existent"
@@ -1616,10 +1620,6 @@ msgid "&Context:"
 msgstr "&Context:"
 
 #, c-format
-msgid "Ignor&e blank lines"
-msgstr "Ignoră linii goal&e"
-
-#, c-format
 msgid "Inclu&de command line"
 msgstr "Inclu&de linia de comandă"
 
@@ -2018,10 +2018,6 @@ msgstr "&Stil:"
 msgid "&Include File Compare Report"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "&Copy to Clipboard"
-msgstr "&Copie în memorie"
-
 #, c-format
 msgid "Shared or Private Filter"
 msgstr "Filtru public sau privat"

diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index e608b4d..e8043d9 100644 (file)
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -1271,6 +1271,9 @@ msgstr "Файл&2:"
 msgid "&Swap"
 msgstr "Поменять"
 
+msgid "&Copy to Clipboard"
+msgstr "Копировать в буфер обмена"
+
 msgid "&Append to existing file"
 msgstr "Добавить в существующий файл"
 
@@ -1289,9 +1292,6 @@ msgstr "Стиль:"
 msgid "&Context:"
 msgstr "Контекст:"
 
-msgid "Ignor&e blank lines"
-msgstr "Игнорировать пустые строки"
-
 msgid "Inclu&de command line"
 msgstr "Вкл&ючать командную строку"
 
@@ -1610,9 +1610,6 @@ msgstr "&Стиль:"
 msgid "&Include File Compare Report"
 msgstr "Включить отчет сравнения файлов"
 
-msgid "&Copy to Clipboard"
-msgstr "Копировать в буфер обмена"
-
 msgid "Shared or Private Filter"
 msgstr "Общие и личные фильтры"
 

diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index 0e56d02..2b72870 100644 (file)
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -1577,6 +1577,10 @@ msgid "&Swap"
 msgstr "&Замени"
 
 #, c-format
+msgid "&Copy to Clipboard"
+msgstr "Сачувај у остави"
+
+#, c-format
 msgid "&Append to existing file"
 msgstr "Прикључи постојећој датотеци"
 
@@ -1601,10 +1605,6 @@ msgid "&Context:"
 msgstr "У &оквиру"
 
 #, c-format
-msgid "Ignor&e blank lines"
-msgstr "Зан&емари празне редове"
-
-#, c-format
 msgid "Inclu&de command line"
 msgstr "Укључи наредбени ред"
 
@@ -2004,10 +2004,6 @@ msgid "&Include File Compare Report"
 msgstr ""
 
 #, c-format
-msgid "&Copy to Clipboard"
-msgstr "Сачувај у остави"
-
-#, c-format
 msgid "Shared or Private Filter"
 msgstr "Заједнички или лични филтер"
 

diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po
index 291e63b..a773e5b 100644 (file)
--- a/Translations/WinMerge/Sinhala.po
+++ b/Translations/WinMerge/Sinhala.po
@@ -1588,6 +1588,10 @@ msgstr "ගොනුව 2:"
 msgid "&Swap"
 msgstr "&හුවමාරු කරන්න"
 
+#, fuzzy, c-format
+msgid "&Copy to Clipboard"
+msgstr "&Copy to Clipboard"
+
 #, c-format
 msgid "&Append to existing file"
 msgstr "පවතින ගොනුවට එකතු කරන්න"
@@ -1613,10 +1617,6 @@ msgid "&Context:"
 msgstr "&පෙළ යෙදුම:"
 
 #, c-format
-msgid "Ignor&e blank lines"
-msgstr "හිස් පේළි නොසලකා හරින්න"
-
-#, c-format
 msgid "Inclu&de command line"
 msgstr "Inclu&de command line"
 
@@ -2015,10 +2015,6 @@ msgstr "විලාසය"
 msgid "&Include File Compare Report"
 msgstr ""
 
-#, fuzzy, c-format
-msgid "&Copy to Clipboard"
-msgstr "&Copy to Clipboard"
-
 #, c-format
 msgid "Shared or Private Filter"
 msgstr "හවුල් කරගත් හෝ පෞද්ගලික  පෙරහන"

diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index 524b792..678063b 100644 (file)
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -1274,6 +1274,9 @@ msgstr "Súbor&2:"
 msgid "&Swap"
 msgstr "&Prehodiť"
 
+msgid "&Copy to Clipboard"
+msgstr "&Kopírovať do schránky"
+
 msgid "&Append to existing file"
 msgstr "&Rozšíriť existujúci súbor"
 
@@ -1292,9 +1295,6 @@ msgstr "Š&týl:"
 msgid "&Context:"
 msgstr "&Kontext:"
 
-msgid "Ignor&e blank lines"
-msgstr "Ignor&ovať prázdne riadky"
-
 msgid "Inclu&de command line"
 msgstr "Zahrnúť príkazový ria&dok"
 
@@ -1621,9 +1621,6 @@ msgstr "&Štýl:"
 msgid "&Include File Compare Report"
 msgstr "&Zahrnúť správu o porovnaní súborov"
 
-msgid "&Copy to Clipboard"
-msgstr "&Kopírovať do schránky"
-
 msgid "Shared or Private Filter"
 msgstr "Zdieľaný alebo súkromný filter"
 

diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index 6a16354..3a0dbb7 100644 (file)
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -1591,6 +1591,10 @@ msgid "&Swap"
 msgstr "&Zamenjaj"
 
 #, c-format
+msgid "&Copy to Clipboard"
+msgstr "&Kopiraj v odložišče"
+
+#, c-format
 msgid "&Append to existing file"
 msgstr "&Dodaj v obstoječo datoteko"
 
@@ -1615,10 +1619,6 @@ msgid "&Context:"
 msgstr "&Skladnost:"
 
 #, c-format
-msgid "Ignor&e blank lines"
-msgstr "P&rezri prazne vrstice"
-
-#, c-format
 msgid "Inclu&de command line"
 msgstr "&Vključi ukazno vrstico"
 
@@ -2023,10 +2023,6 @@ msgid "&Include File Compare Report"
 msgstr "Vključi &poročilo o primerjavi datoteke"
 
 #, c-format
-msgid "&Copy to Clipboard"
-msgstr "&Kopiraj v odložišče"
-
-#, c-format
 msgid "Shared or Private Filter"
 msgstr "Deljen ali zasebni filter"
 

diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index 51ec695..735fa9c 100644 (file)
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -1273,6 +1273,9 @@ msgstr "Archivo &2:"
 msgid "&Swap"
 msgstr "&Intercambiar"
 
+msgid "&Copy to Clipboard"
+msgstr "&Copiar al Portapapeles"
+
 msgid "&Append to existing file"
 msgstr "&Anexar a archivo existente"
 
@@ -1291,9 +1294,6 @@ msgstr "Es&tilo:"
 msgid "&Context:"
 msgstr "&Contexto:"
 
-msgid "Ignor&e blank lines"
-msgstr "Ignorar lín&eas en blanco"
-
 msgid "Inclu&de command line"
 msgstr "Incluir línea de coman&do"
 
@@ -1620,9 +1620,6 @@ msgstr "E&stilo:"
 msgid "&Include File Compare Report"
 msgstr "&Incluir informe de comparación de archivos"
 
-msgid "&Copy to Clipboard"
-msgstr "&Copiar al Portapapeles"
-
 msgid "Shared or Private Filter"
 msgstr "Filtro Compartido o Privado"
 

diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index 2269fe2..18489f2 100644 (file)
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -1270,6 +1270,9 @@ msgstr "Fil 2:"
 msgid "&Swap"
 msgstr "Skifta"
 
+msgid "&Copy to Clipboard"
+msgstr "Kopiera till urklipp"
+
 msgid "&Append to existing file"
 msgstr "Lägg till i befintlig fil"
 
@@ -1288,9 +1291,6 @@ msgstr "Stil:"
 msgid "&Context:"
 msgstr "Innehåll:"
 
-msgid "Ignor&e blank lines"
-msgstr "Ignorera blanka rader"
-
 msgid "Inclu&de command line"
 msgstr "Inkludera kommandorad"
 
@@ -1617,9 +1617,6 @@ msgstr "Stil:"
 msgid "&Include File Compare Report"
 msgstr "Inkludera rapport för katalogjämförelse"
 
-msgid "&Copy to Clipboard"
-msgstr "Kopiera till urklipp"
-
 msgid "Shared or Private Filter"
 msgstr "Delat eller privat filter"
 

diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index 1b61960..d567ff0 100644 (file)
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -1273,6 +1273,9 @@ msgstr "&2. dosya:"
 msgid "&Swap"
 msgstr "&Değiştir"
 
+msgid "&Copy to Clipboard"
+msgstr "Panoya &kopyala"
+
 msgid "&Append to existing file"
 msgstr "&Var olan bir dosyaya eklensin"
 
@@ -1291,9 +1294,6 @@ msgstr "Biç&em:"
 msgid "&Context:"
 msgstr "B&ağlam:"
 
-msgid "Ignor&e blank lines"
-msgstr "Boş satırlar yok sayılsı&n"
-
 msgid "Inclu&de command line"
 msgstr "Ko&mut satırı katılsın"
 
@@ -1624,9 +1624,6 @@ msgstr "&Biçem:"
 msgid "&Include File Compare Report"
 msgstr "K&lasör karşılaştırma raporu eklensin"
 
-msgid "&Copy to Clipboard"
-msgstr "Panoya &kopyala"
-
 msgid "Shared or Private Filter"
 msgstr "Ortak ya da özel süzgeç"
 

diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index 732ca25..006f3e8 100644 (file)
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -1593,6 +1593,10 @@ msgid "&Swap"
 msgstr "Поміняти"
 
 #, c-format
+msgid "&Copy to Clipboard"
+msgstr "Копіювати в буфер обміну"
+
+#, c-format
 msgid "&Append to existing file"
 msgstr "Додати в існуючий файл"
 
@@ -1617,10 +1621,6 @@ msgid "&Context:"
 msgstr "Контекст:"
 
 #, c-format
-msgid "Ignor&e blank lines"
-msgstr "Пропускати порожні рядки"
-
-#, c-format
 msgid "Inclu&de command line"
 msgstr "Ввім&кнути командний рядок"
 
@@ -2022,10 +2022,6 @@ msgid "&Include File Compare Report"
 msgstr ""
 
 #, c-format
-msgid "&Copy to Clipboard"
-msgstr "Копіювати в буфер обміну"
-
-#, c-format
 msgid "Shared or Private Filter"
 msgstr "Загальні і особисті фільтри"