diff --git a/Src/Merge.rc b/Src/Merge.rc index bf9fdf6d848..c76098ec202 100644 --- 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 PUSHBUTTON "Br&owse...",IDC_DIFF_BROWSE_FILE2,283,24,52,14 PUSHBUTTON "&Swap",IDC_DIFF_SWAPFILES,283,41,52,14 + CONTROL "&Copy to Clipboard",IDC_DIFF_COPYCLIPBOARD,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,48,40,230,10 CONTROL "&Append to existing file",IDC_DIFF_APPENDFILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,51,230,10 LTEXT "&Result:",IDC_STATIC,7,66,37,10 COMBOBOX IDC_DIFF_FILERESULT,48,63,230,96,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -1440,17 +1441,8 @@ BEGIN COMBOBOX IDC_DIFF_STYLE,63,92,80,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "&Context:",IDC_STATIC,13,109,46,10 COMBOBOX IDC_DIFF_CONTEXT,63,108,80,65,CBS_DROPDOWN | CBS_SORT | WS_DISABLED | WS_VSCROLL | WS_TABSTOP - GROUPBOX "W&hitespaces",IDC_STATIC,155,81,123,46 - CONTROL "Com&pare",IDC_DIFF_WHITESPACE_COMPARE,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,162,92,110,10 - CONTROL "I&gnore changes",IDC_DIFF_WHITESPACE_IGNORE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,162,102,110,10 - CONTROL "Ig&nore all",IDC_DIFF_WHITESPACE_IGNOREALL,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,162,112,110,10 - CONTROL "Ignor&e blank lines",IDC_DIFF_WHITESPACE_IGNOREBLANKS, - "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,7,134,142,10 - CONTROL "Ignore &case",IDC_DIFF_IGNORECASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,142,10 - CONTROL "Igno&re carriage return differences (Windows/Unix/Mac)",IDC_DIFF_IGNOREEOL, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,156,281,10 - CONTROL "Inclu&de command line",IDC_DIFF_INCLCMDLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,134,170,10 - CONTROL "Open to e&xternal editor",IDC_DIFF_OPENTOEDITOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,145,170,10 + CONTROL "Inclu&de command line",IDC_DIFF_INCLCMDLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,134,170,10 + CONTROL "Open to e&xternal editor",IDC_DIFF_OPENTOEDITOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,170,10 PUSHBUTTON "Defaults",IDC_DIFF_DEFAULTS,7,170,70,14 DEFPUSHBUTTON "OK",IDOK,230,170,52,14 PUSHBUTTON "Cancel",IDCANCEL,283,170,52,14 diff --git a/Src/OptionsDef.h b/Src/OptionsDef.h index 6276ee5d7d6..dec1c074ccd 100644 --- 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 9e55c6aff26..6bd10859894 100644 --- 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 fd267fa030b..503aeaa36b8 100644 --- 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(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 6f4444f6093..2584681f746 100644 --- a/Src/PatchDlg.h +++ b/Src/PatchDlg.h @@ -38,16 +38,13 @@ class CPatchDlg : public CTrDialog 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 @@ class CPatchDlg : public CTrDialog 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 d029b7a5a2f..f9e47404da2 100644 --- 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 aa3248219f7..2c0d206cdc4 100644 --- a/Src/PatchTool.h +++ b/Src/PatchTool.h @@ -66,4 +66,5 @@ class CPatchTool 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 641c1372367..74166d214a9 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -240,16 +240,11 @@ #define IDC_DIFF_FILERESULT 1067 #define IDC_DIFF_STYLE 1068 #define IDC_DIFF_CONTEXT 1069 -#define IDC_DIFF_IGNORECASE 1070 -#define IDC_DIFF_WHITESPACE_IGNOREBLANKS 1071 -#define IDC_DIFF_WHITESPACE_COMPARE 1072 -#define IDC_DIFF_WHITESPACE_IGNORE 1073 -#define IDC_DIFF_WHITESPACE_IGNOREALL 1074 #define IDC_DIFF_BROWSE_FILE1 1075 #define IDC_DIFF_BROWSE_FILE2 1076 #define IDC_DIFF_BROWSE_RESULT 1077 #define IDC_DIFF_APPENDFILE 1078 -#define IDC_DIFF_IGNOREEOL 1079 +#define IDC_DIFF_COPYCLIPBOARD 1079 #define IDC_TRIVIAL_DIFF_COLOR 1080 #define IDC_TRIVIAL_DIFF_DELETED_COLOR 1081 #define IDC_FILES_DIRS_GROUP0 1082 diff --git a/Testing/GoogleTest/GUITests/ConfigTest.cpp b/Testing/GoogleTest/GUITests/ConfigTest.cpp index 54bcf670c03..2710c805574 100644 --- 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 4110b660318..112f2483bf1 100644 --- a/Translations/TranslationsStatus.html +++ b/Translations/TranslationsStatus.html @@ -37,7 +37,7 @@

Translations Status

-

Status from 2021-10-27:

+

Status from 2021-11-21:

WinMerge

@@ -52,99 +52,99 @@

WinMerge

- + - + - + - - + + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - - + + - + - - + + - + - + @@ -155,32 +155,32 @@

WinMerge

- + - + - + - + - + - + - + @@ -196,9 +196,9 @@

WinMerge

- + - + @@ -214,162 +214,162 @@

WinMerge

- + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - - + + - + - - - + + + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + @@ -1462,7 +1462,7 @@

Translators

- + diff --git a/Translations/TranslationsStatus.md b/Translations/TranslationsStatus.md index 07b1e6e6db7..15259499902 100644 --- 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 62d4e804f0b..90e1d90dcf3 100644 --- a/Translations/TranslationsStatus.xml +++ b/Translations/TranslationsStatus.xml @@ -1,6 +1,6 @@ - 2021-10-27 + 2021-11-21 Arabic @@ -8,9 +8,9 @@ 2019-12-30 1136 - 905 + 904 0 - 231 + 232 @@ -19,9 +19,9 @@ 2013-02-03 1136 - 642 + 641 0 - 494 + 495 @@ -36,9 +36,9 @@ 2021-08-09 1136 - 1089 + 1088 0 - 47 + 48 @@ -61,9 +61,9 @@ 2021-06-28 1136 - 970 + 969 0 - 166 + 167 @@ -86,9 +86,9 @@ 1136 - 568 + 567 0 - 568 + 569 @@ -103,9 +103,9 @@ 1136 - 978 + 977 0 - 158 + 159 @@ -128,9 +128,9 @@ 2010-02-19 1136 - 858 + 857 0 - 278 + 279 @@ -153,9 +153,9 @@ 2009-02-13 1136 - 633 + 632 1 - 502 + 503 @@ -170,9 +170,9 @@ 1136 - 608 + 607 0 - 528 + 529 @@ -191,9 +191,9 @@ 2013-01-13 1136 - 642 + 641 0 - 494 + 495 @@ -212,9 +212,9 @@ 2018-09-06 1136 - 1102 + 1101 0 - 34 + 35 @@ -229,7 +229,7 @@ English English.pot - 2021-10-23 + 2021-11-21 1137 1137 @@ -243,9 +243,9 @@ 1136 - 905 + 904 0 - 231 + 232 @@ -254,9 +254,9 @@ 2021-04-29 1136 - 1022 + 1021 0 - 114 + 115 @@ -291,9 +291,9 @@ 2021-10-12 1136 - 1102 + 1101 0 - 34 + 35 @@ -336,9 +336,9 @@ 1136 - 606 + 605 0 - 530 + 531 @@ -378,9 +378,9 @@ 2021-08-09 1136 - 995 + 994 0 - 141 + 142 @@ -407,9 +407,9 @@ 2021-10-20 1136 - 1136 + 1135 0 - 0 + 1 @@ -424,9 +424,9 @@ 2021-08-23 1136 - 1038 + 1037 0 - 98 + 99 @@ -458,12 +458,12 @@ Lithuanian Lithuanian.po - 2021-09-20 + 2021-11-10 1136 - 1098 + 1114 0 - 38 + 22 @@ -478,9 +478,9 @@ 1136 - 634 + 633 0 - 502 + 503 @@ -499,9 +499,9 @@ 2013-08-15 1136 - 645 + 644 0 - 491 + 492 @@ -516,9 +516,9 @@ 1136 - 1012 + 1112 0 - 124 + 24 @@ -536,17 +536,20 @@ Mirosław Żylewicz + + Michał Lipok + Portuguese Portuguese.po - 2021-09-16 + 2021-11-05 1136 - 1102 + 1136 0 - 34 + 0 @@ -567,9 +570,9 @@ 1136 - 563 + 562 44 - 529 + 530 @@ -581,12 +584,12 @@ Russian Russian.po - 2021-09-11 + 2021-10-28 1136 - 1081 + 1094 0 - 55 + 42 @@ -617,9 +620,9 @@ 1136 - 634 + 633 0 - 502 + 503 @@ -634,9 +637,9 @@ 2010-12-12 1136 - 568 + 567 59 - 509 + 510 @@ -650,9 +653,9 @@ 2020-11-02 1136 - 978 + 977 0 - 158 + 159 @@ -675,9 +678,9 @@ 2021-10-26 1136 - 1136 + 1135 0 - 0 + 1 @@ -700,9 +703,9 @@ 2020-04-03 1136 - 874 + 873 0 - 262 + 263 @@ -729,9 +732,9 @@ 2021-09-15 1136 - 1097 + 1096 0 - 39 + 40 @@ -758,9 +761,9 @@ 2021-09-21 1136 - 1102 + 1101 0 - 34 + 35 @@ -783,9 +786,9 @@ 2009-06-13 1136 - 639 + 638 0 - 497 + 498 diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po index a3e1df1edf7..4d7b5252eba 100644 --- 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 ec4bd1916cf..1562079a196 100644 --- a/Translations/WinMerge/Basque.po +++ b/Translations/WinMerge/Basque.po @@ -1593,6 +1593,10 @@ msgstr "&2 Agiria:" 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" @@ -1617,10 +1621,6 @@ msgstr "Estil&oa:" 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" @@ -2021,10 +2021,6 @@ msgstr "&Estiloa" 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 fbd1c6685ec..cbb734ab6b8 100644 --- 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 75d4449f1a4..8d7b8ec8dfe 100644 --- 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 bcc22b40cc2..c3599df98cc 100644 --- a/Translations/WinMerge/Catalan.po +++ b/Translations/WinMerge/Catalan.po @@ -1590,6 +1590,10 @@ msgstr "Fitxer &2:" 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" @@ -1614,10 +1618,6 @@ msgstr "E&stil:" 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" @@ -2017,10 +2017,6 @@ msgstr "&Estil:" 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 edf50e4becb..ea03be6b5a4 100644 --- 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 00ba2938622..83204d29a45 100644 --- a/Translations/WinMerge/ChineseTraditional.po +++ b/Translations/WinMerge/ChineseTraditional.po @@ -1601,6 +1601,10 @@ msgstr "檔案2(&2)：" msgid "&Swap" msgstr "對調(&S)" +#, c-format +msgid "&Copy to Clipboard" +msgstr "複製到剪貼簿(&C)" + #, c-format msgid "&Append to existing file" msgstr "附加到現有檔案(&A)" @@ -1625,10 +1629,6 @@ msgstr "樣式(&Y)：" msgid "&Context:" msgstr "上下文(&C)：" -#, c-format -msgid "Ignor&e blank lines" -msgstr "忽略空白行(&E)" - #, c-format msgid "Inclu&de command line" msgstr "附加 diff 命令於檔首(&P)" @@ -2031,10 +2031,6 @@ msgstr "樣式(&S)：" 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 f643ae966e0..d04a92f3f03 100644 --- a/Translations/WinMerge/Croatian.po +++ b/Translations/WinMerge/Croatian.po @@ -1591,6 +1591,10 @@ msgstr "&Desna dat." 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" @@ -1615,10 +1619,6 @@ msgstr "St&il" 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" @@ -2020,10 +2020,6 @@ msgstr "&Stil:" 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 cb7a6cb31d1..827c09aca1a 100644 --- a/Translations/WinMerge/Czech.po +++ b/Translations/WinMerge/Czech.po @@ -1591,6 +1591,10 @@ msgstr "Soubor &2:" 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" @@ -1615,10 +1619,6 @@ msgstr "Me&toda:" 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" @@ -2020,10 +2020,6 @@ msgstr "Uložit jako &typ:" 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 65839b1eb3a..59f7f777809 100644 --- a/Translations/WinMerge/Danish.po +++ b/Translations/WinMerge/Danish.po @@ -1592,6 +1592,10 @@ msgstr "Fil&2:" 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" @@ -1616,10 +1620,6 @@ msgstr "Sti&l:" 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" @@ -2025,10 +2025,6 @@ msgstr "&Stil" 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 bed22c1d655..bfa86b8ec78 100644 --- 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 7454be8151b..04e09ff7af2 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: 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 \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 2051b77c41d..c1331cc73bb 100644 --- a/Translations/WinMerge/Finnish.po +++ b/Translations/WinMerge/Finnish.po @@ -1591,6 +1591,10 @@ msgstr "Tiedosto2:" 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" @@ -1615,10 +1619,6 @@ msgstr "Ty&yli:" 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" @@ -2023,10 +2023,6 @@ msgstr "Tyyli:" 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 245f0b72ca9..b449d9572fc 100644 --- a/Translations/WinMerge/French.po +++ b/Translations/WinMerge/French.po @@ -1598,6 +1598,10 @@ msgstr "Fichier&2 :" 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" @@ -1622,10 +1626,6 @@ msgstr "St&yle :" 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" @@ -2033,10 +2033,6 @@ msgstr "&Style :" 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 dbf35031d65..b0cc5de128a 100644 --- a/Translations/WinMerge/Galician.po +++ b/Translations/WinMerge/Galician.po @@ -1592,6 +1592,10 @@ msgstr "Arquivo&2:" 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" @@ -1616,10 +1620,6 @@ msgstr "Est&ilo:" 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" @@ -2027,10 +2027,6 @@ msgstr "&Estilo:" 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 e6fb81afca2..5c26c4ac41a 100644 --- a/Translations/WinMerge/German.po +++ b/Translations/WinMerge/German.po @@ -1592,6 +1592,10 @@ msgstr "Datei &2:" 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" @@ -1616,10 +1620,6 @@ msgstr "Sti&l:" 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" @@ -2019,10 +2019,6 @@ msgstr "&Stil:" 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 a62950b1502..609ecd39eb6 100644 --- a/Translations/WinMerge/Greek.po +++ b/Translations/WinMerge/Greek.po @@ -1590,6 +1590,10 @@ msgstr "Αρχείο&2:" msgid "&Swap" msgstr "Αντιμετά&θεση" +#, c-format +msgid "&Copy to Clipboard" +msgstr "Αντι&γραφή στο Πρόχειρο" + #, c-format msgid "&Append to existing file" msgstr "Προσάρτηση σε υπάρχον αρχείο" @@ -1614,10 +1618,6 @@ msgstr "Στ&υλ:" msgid "&Context:" msgstr "&Περιβ. Κείμ.:" -#, c-format -msgid "Ignor&e blank lines" -msgstr "Οι κενές γραμμές να αγνοούνται" - #, c-format msgid "Inclu&de command line" msgstr "Η γραμμή εντολής να συμπεριλαμβάνεται" @@ -2017,10 +2017,6 @@ msgstr "&Στυλ:" 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 b45259fbb63..67941d90677 100644 --- a/Translations/WinMerge/Hungarian.po +++ b/Translations/WinMerge/Hungarian.po @@ -1593,6 +1593,10 @@ msgstr "2.fájl:" 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" @@ -1617,10 +1621,6 @@ msgstr "St&ílus:" 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" @@ -2028,10 +2028,6 @@ msgstr "&Stílus:" 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 4abe71d7278..cb2d35e1ced 100644 --- 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 f1a88ddb2f3..a6d02dd6c33 100644 --- 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 \n" "Language-Team: Japanese \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 5289461dd3a..dd0e58483f6 100644 --- a/Translations/WinMerge/Korean.po +++ b/Translations/WinMerge/Korean.po @@ -1597,6 +1597,10 @@ msgstr "파일&2:" msgid "&Swap" msgstr "맞바꾸기(&S)" +#, c-format +msgid "&Copy to Clipboard" +msgstr "클립보드로 복사(&C)" + #, c-format msgid "&Append to existing file" msgstr "기존 파일에 덧붙이기(&A)" @@ -1621,10 +1625,6 @@ msgstr "스타일(&Y):" msgid "&Context:" msgstr "차이점전후:" -#, c-format -msgid "Ignor&e blank lines" -msgstr "공백 줄 무시하기(&E)" - #, c-format msgid "Inclu&de command line" msgstr "명령행 포함하기(&D)" @@ -2032,10 +2032,6 @@ msgstr "스타일(&S):" 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 fb6a556aad4..d98df770a32 100644 --- 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 ad47531cd5f..e363fddd0ef 100644 --- a/Translations/WinMerge/Norwegian.po +++ b/Translations/WinMerge/Norwegian.po @@ -1591,6 +1591,10 @@ msgstr "Fil&2:" 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" @@ -1615,10 +1619,6 @@ msgstr "St&il:" 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" @@ -2020,10 +2020,6 @@ msgstr "&Stil:" 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 aad6336fe13..b57845666de 100644 --- a/Translations/WinMerge/Persian.po +++ b/Translations/WinMerge/Persian.po @@ -1594,6 +1594,10 @@ msgstr "&2 پرونده : " msgid "&Swap" msgstr "&S معاوضه " +#, c-format +msgid "&Copy to Clipboard" +msgstr "&C رونوشت برداري به حافظه يادداشت / کليپ بورد " + #, c-format msgid "&Append to existing file" msgstr "&A پيوند زدن به پرونده موجود " @@ -1618,10 +1622,6 @@ msgstr "&y سبک : " msgid "&Context:" msgstr "&C متن : " -#, c-format -msgid "Ignor&e blank lines" -msgstr "&e چشم پوشي از خطوط خالي " - #, c-format msgid "Inclu&de command line" msgstr "&d شامل خط فرمان " @@ -2027,10 +2027,6 @@ msgstr "&S سبک " 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 7c7a6386d05..df834001106 100644 --- 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 125af62e5ab..1c6fb00bdc2 100644 --- 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 45b655d067b..6293b653892 100644 --- 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" @@ -1615,10 +1619,6 @@ msgstr "S&til:" 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 e608b4da8eb..e8043d94da6 100644 --- 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 0e56d025cac..2b728700dbd 100644 --- a/Translations/WinMerge/Serbian.po +++ b/Translations/WinMerge/Serbian.po @@ -1576,6 +1576,10 @@ msgstr "Датотека&2:" msgid "&Swap" msgstr "&Замени" +#, c-format +msgid "&Copy to Clipboard" +msgstr "Сачувај у остави" + #, c-format msgid "&Append to existing file" msgstr "Прикључи постојећој датотеци" @@ -1600,10 +1604,6 @@ msgstr "На&чин" msgid "&Context:" msgstr "У &оквиру" -#, c-format -msgid "Ignor&e blank lines" -msgstr "Зан&емари празне редове" - #, c-format msgid "Inclu&de command line" msgstr "Укључи наредбени ред" @@ -2003,10 +2003,6 @@ msgstr "&Начин" 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 291e63bbb1b..a773e5b6200 100644 --- 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 "පවතින ගොනුවට එකතු කරන්න" @@ -1612,10 +1616,6 @@ msgstr "විලාසය:" 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 524b79290e0..678063baafa 100644 --- 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 6a16354865f..3a0dbb783dc 100644 --- a/Translations/WinMerge/Slovenian.po +++ b/Translations/WinMerge/Slovenian.po @@ -1590,6 +1590,10 @@ msgstr "Datoteka&2:" 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" @@ -1614,10 +1618,6 @@ msgstr "S&log:" 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" @@ -2022,10 +2022,6 @@ msgstr "S&log:" 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 51ec695ac08..735fa9c5d1a 100644 --- 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 2269fe27c89..18489f22bf1 100644 --- 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 1b619607831..d567ff0c422 100644 --- 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 732ca259fa3..006f3e8dd63 100644 --- a/Translations/WinMerge/Ukrainian.po +++ b/Translations/WinMerge/Ukrainian.po @@ -1592,6 +1592,10 @@ msgstr "Файл 2:" msgid "&Swap" msgstr "Поміняти" +#, c-format +msgid "&Copy to Clipboard" +msgstr "Копіювати в буфер обміну" + #, c-format msgid "&Append to existing file" msgstr "Додати в існуючий файл" @@ -1616,10 +1620,6 @@ msgstr "Стиль:" msgid "&Context:" msgstr "Контекст:" -#, c-format -msgid "Ignor&e blank lines" -msgstr "Пропускати порожні рядки" - #, c-format msgid "Inclu&de command line" msgstr "Ввім&кнути командний рядок" @@ -2021,10 +2021,6 @@ msgstr "&Стиль:" msgid "&Include File Compare Report" msgstr "" -#, c-format -msgid "&Copy to Clipboard" -msgstr "Копіювати в буфер обміну" - #, c-format msgid "Shared or Private Filter" msgstr "Загальні і особисті фільтри"
Arabic 1136905904 0231232 80 % 2019-12-30
Basque 1136642641 049457 %49556 % 2013-02-03
Brazilian 113610891088 04748 96 % 2021-08-09
Bulgarian 1136970969 0166167 85 % 2021-06-28
Catalan 1136568567 0568569 50 %
ChineseSimplified 1136978977 0158159 86 %
ChineseTraditional 1136858857 027876 %27975 % 2010-02-19
Croatian 1136633632 1502503 56 % 2009-02-13
Czech 1136608607 052854 %52953 %
Danish 1136642641 049457 %49556 % 2013-01-13
Dutch 113611021101 03435 97 % 2018-09-06
0 0 100 %2021-10-232021-11-21
Finnish 1136905904 0231232 80 %
French 113610221021 0114115 90 % 2021-04-29
Galician 113611021101 03435 97 % 2021-10-12
Greek 1136606605 0530531 53 %
Italian 1136995994 0141142 88 % 2021-08-09
Japanese 113611361135 001 100 % 2021-10-20
Korean 113610381037 09899 91 % 2021-08-23
Lithuanian 113610981114 03897 %2021-09-202298 %2021-11-10
Norwegian 1136634633 0502503 56 %
Persian 1136645644 0491492 57 % 2013-08-15
Polish 113610121112 012489 %2498 %
Portuguese 113611021136 03497 %2021-09-160100 %2021-11-05
Romanian 1136563562 44529530 53 %
Russian 113610811094 05595 %2021-09-114296 %2021-10-28
Serbian 1136634633 0502503 56 %
Sinhala 1136568567 59509510 55 % 2010-12-12
Slovak 1136978977 0158159 86 % 2020-11-02
Slovenian 113611361135 001 100 % 2021-10-26
Spanish 1136874873 0262263 77 % 2020-04-03
Swedish 113610971096 03997 %4096 % 2021-09-15
Turkish 113611021101 03435 97 % 2021-09-21
Ukrainian 1136639638 0497498 56 % 2009-06-13
PolishPawel Wawrzysko
Skiff
Michał Trzebiatowski
Mirosław Żylewicz
Pawel Wawrzysko
Skiff
Michał Trzebiatowski
Mirosław Żylewicz
Michał Lipok