From e3670629a3b53ba4d3d70a7d2bf2c71ca2e54cc4 Mon Sep 17 00:00:00 2001 From: lededev <30518126+lededev@users.noreply.github.com> Date: Tue, 17 Sep 2024 16:02:12 +0800 Subject: [PATCH 1/4] Add One-Hand mice wheel scroll diff and merge --- Src/MainFrm.cpp | 33 ++++- Src/Merge.rc | 12 +- Src/MergeAppLib.h | 2 +- Src/MergeEditView.cpp | 133 ++++++++++++++++++++ Src/MergeEditView.h | 1 + Src/resource.h | 6 + Translations/TranslationsStatus.md | 78 ++++++------ Translations/WinMerge/Arabic.po | 18 +++ Translations/WinMerge/Basque.po | 18 +++ Translations/WinMerge/Brazilian.po | 18 +++ Translations/WinMerge/Bulgarian.po | 18 +++ Translations/WinMerge/Catalan.po | 18 +++ Translations/WinMerge/ChineseSimplified.po | 18 +++ Translations/WinMerge/ChineseTraditional.po | 18 +++ Translations/WinMerge/Corsican.po | 18 +++ Translations/WinMerge/Croatian.po | 18 +++ Translations/WinMerge/Czech.po | 18 +++ Translations/WinMerge/Danish.po | 18 +++ Translations/WinMerge/Dutch.po | 18 +++ Translations/WinMerge/English.pot | 20 ++- Translations/WinMerge/Finnish.po | 18 +++ Translations/WinMerge/French.po | 18 +++ Translations/WinMerge/Galician.po | 18 +++ Translations/WinMerge/German.po | 18 +++ Translations/WinMerge/Greek.po | 18 +++ Translations/WinMerge/Hungarian.po | 18 +++ Translations/WinMerge/Italian.po | 18 +++ Translations/WinMerge/Japanese.po | 18 +++ Translations/WinMerge/Korean.po | 18 +++ Translations/WinMerge/Lithuanian.po | 18 +++ Translations/WinMerge/Norwegian.po | 18 +++ Translations/WinMerge/Persian.po | 18 +++ Translations/WinMerge/Polish.po | 18 +++ Translations/WinMerge/Portuguese.po | 18 +++ Translations/WinMerge/Romanian.po | 18 +++ Translations/WinMerge/Russian.po | 18 +++ Translations/WinMerge/Serbian.po | 18 +++ Translations/WinMerge/Sinhala.po | 18 +++ Translations/WinMerge/Slovak.po | 18 +++ Translations/WinMerge/Slovenian.po | 18 +++ Translations/WinMerge/Spanish.po | 18 +++ Translations/WinMerge/Swedish.po | 18 +++ Translations/WinMerge/Tamil.po | 18 +++ Translations/WinMerge/Turkish.po | 18 +++ Translations/WinMerge/Ukrainian.po | 18 +++ 45 files changed, 908 insertions(+), 43 deletions(-) diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index 9264fb3b4cf..509ec9f3a3d 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -2649,13 +2649,44 @@ BOOL CMainFrame::OnToolTipText(UINT, NMHDR* pNMHDR, LRESULT* pResult) if (nID != 0) // will be zero on a separator { + // check replace mice scrolling multiline tooltips + const static std::unordered_map miceShortcut = + { + {ID_PREVDIFF, ID_MICE_PREVDIFF} + ,{ID_NEXTDIFF, ID_MICE_NEXTDIFF} + ,{ID_L2R, ID_MICE_L2R} + ,{ID_R2L, ID_MICE_R2L} + ,{ID_L2RNEXT, ID_MICE_L2RNEXT} + ,{ID_R2LNEXT, ID_MICE_R2LNEXT} + }; + auto mID = miceShortcut.find(nID); + if (mID != miceShortcut.end()) + { + nID = mID->second; + + static bool firstCall = true; + if (firstCall) + { + firstCall = false; + // Setup multiline tooltips + LONG_PTR dwStyle = ::GetWindowLongPtr(pNMHDR->hwndFrom, GWL_EXSTYLE); + dwStyle |= TTS_NOPREFIX; + ::SetWindowLongPtr(pNMHDR->hwndFrom, GWL_EXSTYLE, dwStyle); + ::SendMessage(pNMHDR->hwndFrom, TTM_SETMAXTIPWIDTH, 0, 1024); + } + } + strFullText = theApp.LoadString(static_cast(nID)); // don't handle the message if no string resource found if (strFullText.empty()) return FALSE; // this is the command id, not the button index - AfxExtractSubString(strTipText, strFullText.c_str(), 1, '\n'); + // skip first position of newline character, accept multiline + const auto newline1st = strFullText.find(_T("\n")); + if (newline1st == String::npos) + return FALSE; + strTipText = strFullText.substr(newline1st + 1).c_str(); } if (pNMHDR->code == TTN_NEEDTEXTA) _wcstombsz(pTTTA->szText, strTipText, static_cast(std::size(pTTTA->szText))); diff --git a/Src/Merge.rc b/Src/Merge.rc index 01673f29a68..0160f461996 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -1,4 +1,4 @@ -// Microsoft Visual C++ generated resource script. +// Microsoft Visual C++ generated resource script. // #include "resource.h" @@ -4520,6 +4520,16 @@ BEGIN IDS_COPY_GRANULARITY_Character "Character" END +STRINGTABLE +BEGIN + ID_MICE_PREVDIFF "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" + ID_MICE_NEXTDIFF "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" + ID_MICE_L2R "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" + ID_MICE_R2L "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" + ID_MICE_L2RNEXT "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" + ID_MICE_R2LNEXT "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +END + #endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/Src/MergeAppLib.h b/Src/MergeAppLib.h index 56ce5e5c3cd..1eecf685d08 100644 --- a/Src/MergeAppLib.h +++ b/Src/MergeAppLib.h @@ -4,7 +4,7 @@ /* File created by MIDL compiler version 8.01.0628 */ -/* at Tue Jan 19 12:14:07 2038 +/* at Tue Jan 19 11:14:07 2038 */ /* Compiler settings for MergeAppLib.idl: Oicf, W1, Zp8, env=Win64 (32b run), target_arch=AMD64 8.01.0628 diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp index a4808e4de0b..226e968a636 100644 --- a/Src/MergeEditView.cpp +++ b/Src/MergeEditView.cpp @@ -59,6 +59,7 @@ IMPLEMENT_DYNCREATE(CMergeEditView, CCrystalEditViewEx) CMergeEditView::CMergeEditView() : m_bCurrentLineIsDiff(false) +, m_bIgnoreRBUp(false) , m_nThisPane(0) , m_nThisGroup(0) , m_bDetailView(false) @@ -2881,6 +2882,12 @@ void CMergeEditView::OnUpdateEditReplace(CCmdUI* pCmdUI) */ void CMergeEditView::OnContextMenu(CWnd* pWnd, CPoint point) { + if (m_bIgnoreRBUp) + { + m_bIgnoreRBUp = false; + return; + } + CRect rect; GetClientRect(rect); ClientToScreen(rect); @@ -4264,6 +4271,77 @@ void CMergeEditView::OnUpdateChangeScheme(CCmdUI* pCmdUI) */ BOOL CMergeEditView::OnMouseWheel(UINT nFlags, short zDelta, CPoint pt) { + if (GetKeyState(VK_MENU) & 0x8000) + { + // When hold Alt key, use nFlags to check MK_CONTROL MK_SHIFT holding got problem, Use GetKeyState() instead. + const auto bShiftDown = GetKeyState(VK_SHIFT) & 0x8000; + const auto bControlDown = GetKeyState(VK_CONTROL) & 0x8000; + // zDelta > 0 scrool up, < 0 scrool down + if (zDelta > 0) + { + // Check Shift key hold for mice without HWheel function + if (bShiftDown) + { + // Alt+Shift+ScrollUp as Alt+Left + OnR2l(); + return TRUE; + } + else if (bShiftDown && bControlDown) + { + // Alt+Ctrl+Shift+ScrollUp as Alt+Ctrl+Left + OnR2LNext(); + return TRUE; + } + else if (nFlags == 0) + { + // Alt+ScrollUp as Alt+Up + OnPrevdiff(); + return TRUE; + } + } + else if (zDelta < 0) + { + // Check Shift key hold for mice without HWheel function + if (bShiftDown) + { + // Alt+Shift+ScrollDown as Alt+Right + OnL2r(); + return TRUE; + } + else if (bShiftDown && bControlDown) + { + // Alt+Ctrl+Shift+ScrollDown as Alt+Ctrl+Right + OnL2RNext(); + return TRUE; + } + else if (nFlags == 0) + { + // Alt+ScrollDown as Alt+Down + OnNextdiff(); + return TRUE; + } + } + } + + // Hold mice right button for One-handed operation + if (nFlags == MK_RBUTTON) + { + if (zDelta > 0) + { + // RButton+ScrollUp as Alt+Up + OnPrevdiff(); + m_bIgnoreRBUp = true; + return TRUE; + } + else if (zDelta < 0) + { + // RButton+ScrollDown as Alt+Down + OnNextdiff(); + m_bIgnoreRBUp = true; + return TRUE; + } + } + if ( nFlags == MK_CONTROL ) { short amount = zDelta < 0 ? -1: 1; @@ -4302,6 +4380,61 @@ BOOL CMergeEditView::OnMouseWheel(UINT nFlags, short zDelta, CPoint pt) */ void CMergeEditView::OnMouseHWheel(UINT nFlags, short zDelta, CPoint pt) { + if (GetKeyState(VK_MENU) & 0x8000) + { + const auto bControlDown = GetKeyState(VK_CONTROL) & 0x8000; + // zDelta > 0 scrool right, < 0 scrool left + if (zDelta > 0) + { + if (bControlDown) + { + // Alt+Ctrl+HScrollRight as Alt+Ctrl+Right + OnL2RNext(); + return; + } + else if (nFlags == 0) + { + // Alt+HScrollRight as Alt+Right + OnL2r(); + return; + } + } + else if (zDelta < 0) + { + if (bControlDown) + { + // Alt+Ctrl+HScrollLeft as Alt+Ctrl+Left + OnR2LNext(); + return; + } + else if (nFlags == 0) + { + // Alt+HScrollLeft as Alt+Left + OnR2l(); + return; + } + } + } + + // Hold mice right button for One-handed operation + if (nFlags == MK_RBUTTON) + { + if (zDelta > 0) + { + // RButton+ScrollRight as Alt+Right + OnL2r(); + m_bIgnoreRBUp = true; + return; + } + else if (zDelta < 0) + { + // RButton+ScrollLeft as Alt+Left + OnR2l(); + m_bIgnoreRBUp = true; + return; + } + } + SCROLLINFO si = { sizeof SCROLLINFO }; si.fMask = SIF_PAGE | SIF_POS | SIF_RANGE; diff --git a/Src/MergeEditView.h b/Src/MergeEditView.h index b65d69f059a..e2a02a3007a 100644 --- a/Src/MergeEditView.h +++ b/Src/MergeEditView.h @@ -86,6 +86,7 @@ class CMergeEditView : public CGhostTextView COLORSETTINGS m_cachedColors; /**< Cached color settings */ bool m_bCurrentLineIsDiff; /**< `true` if cursor is in diff line */ + bool m_bIgnoreRBUp; // Attributes public: diff --git a/Src/resource.h b/Src/resource.h index bea0086d315..daf1fabfef9 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -1022,9 +1022,15 @@ #define ID_COPY_LINES_FROM_RIGHT 33264 #define ID_LINES_L2R 33265 #define ID_LINES_R2L 33266 +#define ID_MICE_PREVDIFF 33267 +#define ID_MICE_NEXTDIFF 33268 +#define ID_MICE_L2R 33269 +#define ID_MICE_R2L 33270 #define ID_SEL_DIFF_COPY_L 33271 #define ID_SEL_DIFF_COPY_M 33272 #define ID_SEL_DIFF_COPY_R 33273 +#define ID_MICE_L2RNEXT 33274 +#define ID_MICE_R2LNEXT 33275 #define ID_TABBAR_AUTO_MAXWIDTH 33351 #define ID_IMG_VIEWDIFFERENCES 33353 #define ID_IMG_ZOOM_25 33354 diff --git a/Translations/TranslationsStatus.md b/Translations/TranslationsStatus.md index 1a140fb57d6..9d7af085fa6 100644 --- a/Translations/TranslationsStatus.md +++ b/Translations/TranslationsStatus.md @@ -1,49 +1,49 @@ # Translations Status -Status from **2024-09-15**: +Status from **2024-09-17**: ## WinMerge | Language | Total | Translated | Fuzzy | Untranslated | Complete | Last Update | |:---------------------|------:|-----------:|------:|-------------:|---------:|:-----------:| -| Arabic | 1395 | 895 | 0 | 500 | 64 % | 2019-12-30 | -| Basque | 1395 | 638 | 0 | 757 | 45 % | 2013-02-03 | -| Brazilian | 1395 | 1392 | 0 | 3 | 99 % | 2024-07-30 | -| Bulgarian | 1395 | 1078 | 0 | 317 | 77 % | 2023-11-14 | -| Catalan | 1395 | 1328 | 0 | 67 | 95 % | | -| ChineseSimplified | 1395 | 1392 | 0 | 3 | 99 % | | -| ChineseTraditional | 1395 | 1293 | 0 | 102 | 92 % | 2022-02-19 | -| Corsican | 1395 | 1389 | 0 | 6 | 99 % | 2024-06-21 | -| Croatian | 1395 | 630 | 1 | 764 | 45 % | 2009-02-13 | -| Czech | 1395 | 605 | 0 | 790 | 43 % | | -| Danish | 1395 | 639 | 0 | 756 | 45 % | 2013-01-13 | -| Dutch | 1395 | 1280 | 0 | 115 | 91 % | 2023-05-02 | -| English | 1395 | 1395 | 0 | 0 | 100 % | 2024-09-15 | -| Finnish | 1395 | 1185 | 0 | 210 | 84 % | | -| French | 1395 | 1392 | 0 | 3 | 99 % | 2024-08-01 | -| Galician | 1395 | 1317 | 0 | 78 | 94 % | 2023-11-24 | -| German | 1395 | 1342 | 0 | 53 | 96 % | 2023-08-08 | -| Greek | 1395 | 605 | 0 | 790 | 43 % | | -| Hungarian | 1395 | 1392 | 0 | 3 | 99 % | 2021-03-15 | -| Italian | 1395 | 1392 | 0 | 3 | 99 % | 2024-07-27 | -| Japanese | 1395 | 1392 | 0 | 3 | 99 % | 2024-07-27 | -| Korean | 1395 | 1392 | 0 | 3 | 99 % | 2024-09-13 | -| Lithuanian | 1395 | 1343 | 0 | 52 | 96 % | 2024-07-24 | -| Norwegian | 1395 | 730 | 0 | 665 | 52 % | | -| Persian | 1395 | 641 | 0 | 754 | 45 % | 2013-08-15 | -| Polish | 1395 | 1355 | 0 | 40 | 97 % | 2023-11-28 | -| Portuguese | 1395 | 1392 | 0 | 3 | 99 % | 2024-08-17 | -| Romanian | 1395 | 1306 | 0 | 89 | 93 % | 2023-11-07 | -| Russian | 1395 | 1318 | 0 | 77 | 94 % | 2023-04-27 | -| Serbian | 1395 | 632 | 0 | 763 | 45 % | | -| Sinhala | 1395 | 563 | 58 | 774 | 44 % | 2010-12-12 | -| Slovak | 1395 | 1184 | 0 | 211 | 84 % | 2022-02-17 | -| Slovenian | 1395 | 1320 | 0 | 75 | 94 % | 2024-01-28 | -| Spanish | 1395 | 1317 | 0 | 78 | 94 % | 2023-11-24 | -| Swedish | 1395 | 1232 | 2 | 161 | 88 % | 2023-02-08 | -| Tamil | 1395 | 1218 | 0 | 177 | 87 % | 2023-07-24 | -| Turkish | 1395 | 1326 | 0 | 69 | 95 % | 2023-10-28 | -| Ukrainian | 1395 | 708 | 0 | 687 | 50 % | 2009-06-13 | +| Arabic | 1401 | 895 | 0 | 506 | 63 % | 2019-12-30 | +| Basque | 1401 | 638 | 0 | 763 | 45 % | 2013-02-03 | +| Brazilian | 1401 | 1395 | 0 | 6 | 99 % | 2024-09-16 | +| Bulgarian | 1401 | 1078 | 0 | 323 | 76 % | 2023-11-14 | +| Catalan | 1401 | 1328 | 0 | 73 | 94 % | | +| ChineseSimplified | 1401 | 1395 | 0 | 6 | 99 % | | +| ChineseTraditional | 1401 | 1293 | 0 | 108 | 92 % | 2022-02-19 | +| Corsican | 1401 | 1389 | 0 | 12 | 99 % | 2024-06-21 | +| Croatian | 1401 | 630 | 1 | 770 | 45 % | 2009-02-13 | +| Czech | 1401 | 605 | 0 | 796 | 43 % | | +| Danish | 1401 | 639 | 0 | 762 | 45 % | 2013-01-13 | +| Dutch | 1401 | 1280 | 0 | 121 | 91 % | 2023-05-02 | +| English | 1401 | 1401 | 0 | 0 | 100 % | 2024-09-17 | +| Finnish | 1401 | 1185 | 0 | 216 | 84 % | | +| French | 1401 | 1392 | 0 | 9 | 99 % | 2024-08-01 | +| Galician | 1401 | 1317 | 0 | 84 | 94 % | 2023-11-24 | +| German | 1401 | 1342 | 0 | 59 | 95 % | 2023-08-08 | +| Greek | 1401 | 605 | 0 | 796 | 43 % | | +| Hungarian | 1401 | 1395 | 0 | 6 | 99 % | 2021-03-15 | +| Italian | 1401 | 1392 | 0 | 9 | 99 % | 2024-07-27 | +| Japanese | 1401 | 1392 | 0 | 9 | 99 % | 2024-07-27 | +| Korean | 1401 | 1392 | 0 | 9 | 99 % | 2024-09-13 | +| Lithuanian | 1401 | 1343 | 0 | 58 | 95 % | 2024-07-24 | +| Norwegian | 1401 | 730 | 0 | 671 | 52 % | | +| Persian | 1401 | 641 | 0 | 760 | 45 % | 2013-08-15 | +| Polish | 1401 | 1355 | 0 | 46 | 96 % | 2023-11-28 | +| Portuguese | 1401 | 1392 | 0 | 9 | 99 % | 2024-08-17 | +| Romanian | 1401 | 1306 | 0 | 95 | 93 % | 2023-11-07 | +| Russian | 1401 | 1318 | 0 | 83 | 94 % | 2023-04-27 | +| Serbian | 1401 | 632 | 0 | 769 | 45 % | | +| Sinhala | 1401 | 563 | 58 | 780 | 44 % | 2010-12-12 | +| Slovak | 1401 | 1184 | 0 | 217 | 84 % | 2022-02-17 | +| Slovenian | 1401 | 1320 | 0 | 81 | 94 % | 2024-01-28 | +| Spanish | 1401 | 1317 | 0 | 84 | 94 % | 2023-11-24 | +| Swedish | 1401 | 1232 | 2 | 167 | 88 % | 2023-02-08 | +| Tamil | 1401 | 1218 | 0 | 183 | 86 % | 2023-07-24 | +| Turkish | 1401 | 1326 | 0 | 75 | 94 % | 2023-10-28 | +| Ukrainian | 1401 | 708 | 0 | 693 | 50 % | 2009-06-13 | ## ShellExtension diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po index a0ea257e1ae..2cbbdd4418e 100644 --- a/Translations/WinMerge/Arabic.po +++ b/Translations/WinMerge/Arabic.po @@ -4236,6 +4236,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "" diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po index 304a14cb4c9..9fca980d0d8 100644 --- a/Translations/WinMerge/Basque.po +++ b/Translations/WinMerge/Basque.po @@ -4841,6 +4841,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "" diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po index 6124af6ff49..f464adfbefc 100644 --- a/Translations/WinMerge/Brazilian.po +++ b/Translations/WinMerge/Brazilian.po @@ -3918,6 +3918,24 @@ msgstr "Linha" msgid "Character" msgstr "Caracter" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "Embelezamento" diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po index 35f1f13f291..8ec8ea37eb2 100644 --- a/Translations/WinMerge/Bulgarian.po +++ b/Translations/WinMerge/Bulgarian.po @@ -4297,6 +4297,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "" diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po index ce497aa41cb..20bb493542b 100644 --- a/Translations/WinMerge/Catalan.po +++ b/Translations/WinMerge/Catalan.po @@ -5019,6 +5019,24 @@ msgstr "Línia" msgid "Character" msgstr "Caràcter" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "Embellir" diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po index 5a459b75450..b5cd2f62d8d 100644 --- a/Translations/WinMerge/ChineseSimplified.po +++ b/Translations/WinMerge/ChineseSimplified.po @@ -4351,6 +4351,24 @@ msgstr "整行" msgid "Character" msgstr "字符" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "\n上一处差异 (Alt+Up)\n(鼠标右键+滚轮上滚)\n(Alt+滚轮上滚)" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "\n下一处差异 (Alt+Down)\n(鼠标右键+滚轮下滚)\n(Alt+滚轮下滚)" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "\n复制到右侧 (Alt+Right)\n(鼠标右键+滚轮右滚)\n(Alt+滚轮右滚)\n(Alt+Shift+滚轮下滚)" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "\n复制到左侧 (Alt+Left)\n(鼠标右键+滚轮左滚)\n(Alt+滚轮左滚)\n(Alt+Shift+滚轮上滚)" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "\n复制到右侧再到下一处差异 (Ctrl+Alt+Right)\n(Ctrl+Alt+滚轮右滚)\n(Ctrl+Alt+Shift+滚轮下滚)" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "\n复制到左侧再到下一处差异 (Ctrl+Alt+Left)\n(Ctrl+Alt+滚轮左滚)\n(Ctrl+Alt+Shift+滚轮上滚)" + msgid "Prettification" msgstr "格式美化" diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po index 5aef2f556d9..64f6ad9a80b 100644 --- a/Translations/WinMerge/ChineseTraditional.po +++ b/Translations/WinMerge/ChineseTraditional.po @@ -5000,6 +5000,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "\n上一個差異 (Alt+Up)\n(滑鼠右鍵+滾輪上滾)\n(Alt+滾輪上滾)" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "\n下一個差異 (Alt+Down)\n(滑鼠右鍵+滾輪下滾)\n(Alt+滾輪下滾)" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "\n複製到右側 (Alt+Right)\n(滑鼠右鍵+滾輪右滾)\n(Alt+滾輪右滾)\n(Alt+Shift+滾輪下滾)" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "\n複製到左側 (Alt+Left)\n(滑鼠右鍵+滾輪左滾)\n(Alt+滾輪左滾)\n(Alt+Shift+滾輪上滾)" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "\n複製到右側後到下一個 (Ctrl+Alt+Right)\n(Ctrl+Alt+滾輪右滾)\n(Ctrl+Alt+Shift+滾輪下滾)" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "\n複製到左側後到下一個 (Ctrl+Alt+Left)\n(Ctrl+Alt+滾輪左滾)\n(Ctrl+Alt+Shift+滾輪上滾)" + msgid "Prettification" msgstr "美化" diff --git a/Translations/WinMerge/Corsican.po b/Translations/WinMerge/Corsican.po index 1f13b562b43..20967948ff0 100644 --- a/Translations/WinMerge/Corsican.po +++ b/Translations/WinMerge/Corsican.po @@ -4306,6 +4306,24 @@ msgstr "Linea" msgid "Character" msgstr "Caratteru" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "Imbellimentu" diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po index 183f45750f5..b03e372b2da 100644 --- a/Translations/WinMerge/Croatian.po +++ b/Translations/WinMerge/Croatian.po @@ -4840,6 +4840,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "" diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po index 0ca43e7c679..1ea5c7a2ab2 100644 --- a/Translations/WinMerge/Czech.po +++ b/Translations/WinMerge/Czech.po @@ -4773,6 +4773,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "" diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po index ef1401d77c0..182af832f9b 100644 --- a/Translations/WinMerge/Danish.po +++ b/Translations/WinMerge/Danish.po @@ -4878,6 +4878,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "" diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po index 465b5cde0f7..cfb28e77b58 100644 --- a/Translations/WinMerge/Dutch.po +++ b/Translations/WinMerge/Dutch.po @@ -4301,6 +4301,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "Mooi maken" diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot index 3a370e3ef62..3d64eff18c3 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: 2024-09-15 17:02+0000\n" +"POT-Creation-Date: 2024-09-17 17:37+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English \n" @@ -3913,6 +3913,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "" diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po index d4662f946b3..2ac61dfc263 100644 --- a/Translations/WinMerge/Finnish.po +++ b/Translations/WinMerge/Finnish.po @@ -4338,6 +4338,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "Kaunistelu" diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po index 986770ff3e1..600f1343eef 100644 --- a/Translations/WinMerge/French.po +++ b/Translations/WinMerge/French.po @@ -5030,6 +5030,24 @@ msgstr "Ligne" msgid "Character" msgstr "Caractère" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "Embellissement" diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po index 1d0ea946c37..c9399ac32b3 100644 --- a/Translations/WinMerge/Galician.po +++ b/Translations/WinMerge/Galician.po @@ -4305,6 +4305,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "Melloras" diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po index b26a312a6ba..f9545fbe790 100644 --- a/Translations/WinMerge/German.po +++ b/Translations/WinMerge/German.po @@ -4636,6 +4636,24 @@ msgstr "Zeile" msgid "Character" msgstr "Zeichen" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "Verschönerung" diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po index b8747781ae0..59aa367806e 100644 --- a/Translations/WinMerge/Greek.po +++ b/Translations/WinMerge/Greek.po @@ -4818,6 +4818,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "" diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po index 20f3fa10085..6e25db9bc63 100644 --- a/Translations/WinMerge/Hungarian.po +++ b/Translations/WinMerge/Hungarian.po @@ -4972,6 +4972,24 @@ msgstr "Sor" msgid "Character" msgstr "Karakter" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "Megjelenés optimalizálás" diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po index f3998a37734..c9a1c222c8d 100644 --- a/Translations/WinMerge/Italian.po +++ b/Translations/WinMerge/Italian.po @@ -4342,6 +4342,24 @@ msgstr "Linea" msgid "Character" msgstr "Carattere" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "Abbellimento" diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po index 986515adbe9..3a50d072d90 100644 --- a/Translations/WinMerge/Japanese.po +++ b/Translations/WinMerge/Japanese.po @@ -4306,6 +4306,24 @@ msgstr "行" msgid "Character" msgstr "文字" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "整形" diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po index 28cf130f2da..ec700320096 100644 --- a/Translations/WinMerge/Korean.po +++ b/Translations/WinMerge/Korean.po @@ -5025,6 +5025,24 @@ msgstr "줄" msgid "Character" msgstr "문자" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "꾸미기" diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po index 16d4857525c..997287ccf62 100644 --- a/Translations/WinMerge/Lithuanian.po +++ b/Translations/WinMerge/Lithuanian.po @@ -3918,6 +3918,24 @@ msgstr "Eilutė" msgid "Character" msgstr "Simbolis" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "Sutvarkymas" diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po index d9f22f8ea83..06940a059f1 100644 --- a/Translations/WinMerge/Norwegian.po +++ b/Translations/WinMerge/Norwegian.po @@ -4308,6 +4308,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "" diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po index 13a8029718e..100b3cb25a7 100644 --- a/Translations/WinMerge/Persian.po +++ b/Translations/WinMerge/Persian.po @@ -4887,6 +4887,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "" diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po index 2c932eed1c8..154d19baf49 100644 --- a/Translations/WinMerge/Polish.po +++ b/Translations/WinMerge/Polish.po @@ -3919,6 +3919,24 @@ msgstr "Wiersz" msgid "Character" msgstr "Znak" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "Upiększanie" diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po index 4f164018962..86091740d3b 100644 --- a/Translations/WinMerge/Portuguese.po +++ b/Translations/WinMerge/Portuguese.po @@ -4405,6 +4405,24 @@ msgstr "Linha" msgid "Character" msgstr "Caráter" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "Embelezamento" diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po index 232947df9e4..42ba8a47a13 100644 --- a/Translations/WinMerge/Romanian.po +++ b/Translations/WinMerge/Romanian.po @@ -4395,6 +4395,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "Înfrumusețare" diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po index 4ac06de5a62..41c4ba824c5 100644 --- a/Translations/WinMerge/Russian.po +++ b/Translations/WinMerge/Russian.po @@ -3920,6 +3920,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "Приукрашивание" diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po index 297ddbdbc36..705fe890add 100644 --- a/Translations/WinMerge/Serbian.po +++ b/Translations/WinMerge/Serbian.po @@ -4812,6 +4812,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "" diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po index 891cf366d92..17c388a59d6 100644 --- a/Translations/WinMerge/Sinhala.po +++ b/Translations/WinMerge/Sinhala.po @@ -4841,6 +4841,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "" diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po index fa88a32ac0c..475910b16a6 100644 --- a/Translations/WinMerge/Slovak.po +++ b/Translations/WinMerge/Slovak.po @@ -4280,6 +4280,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "Prikrášlenie" diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po index dbee0673ca1..9fd384c5945 100644 --- a/Translations/WinMerge/Slovenian.po +++ b/Translations/WinMerge/Slovenian.po @@ -4303,6 +4303,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "Polepšanje" diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po index 5fc7dd4878d..26041ced85e 100644 --- a/Translations/WinMerge/Spanish.po +++ b/Translations/WinMerge/Spanish.po @@ -4307,6 +4307,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "Mejoras" diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po index 436d7f7d82d..82d1cf7f06f 100644 --- a/Translations/WinMerge/Swedish.po +++ b/Translations/WinMerge/Swedish.po @@ -4385,6 +4385,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "Finputsning" diff --git a/Translations/WinMerge/Tamil.po b/Translations/WinMerge/Tamil.po index 950c6f98533..47803d94fb2 100644 --- a/Translations/WinMerge/Tamil.po +++ b/Translations/WinMerge/Tamil.po @@ -4302,6 +4302,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "அழகானமாக்கல்" diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po index 74054e45d20..f83a10a1175 100644 --- a/Translations/WinMerge/Turkish.po +++ b/Translations/WinMerge/Turkish.po @@ -3917,6 +3917,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "Sadeleştirme" diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po index e2fd267b7d2..f4e8fd5fd75 100644 --- a/Translations/WinMerge/Ukrainian.po +++ b/Translations/WinMerge/Ukrainian.po @@ -4827,6 +4827,24 @@ msgstr "" msgid "Character" msgstr "" +msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgstr "" + +msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgstr "" + +msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgstr "" + +msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgstr "" + +msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgstr "" + +msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgstr "" + msgid "Prettification" msgstr "" From 610ce6bbfa2af5c3d2bfb3cf3e88fd3aab6f8db4 Mon Sep 17 00:00:00 2001 From: lededev <30518126+lededev@users.noreply.github.com> Date: Tue, 17 Sep 2024 18:32:09 +0800 Subject: [PATCH 2/4] fix Ctrl+Alt+Shift+WheelX shortcut cannot reach --- Src/MergeEditView.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp index 226e968a636..72beefdc6a5 100644 --- a/Src/MergeEditView.cpp +++ b/Src/MergeEditView.cpp @@ -4280,16 +4280,16 @@ BOOL CMergeEditView::OnMouseWheel(UINT nFlags, short zDelta, CPoint pt) if (zDelta > 0) { // Check Shift key hold for mice without HWheel function - if (bShiftDown) + if (bShiftDown && bControlDown) { - // Alt+Shift+ScrollUp as Alt+Left - OnR2l(); + // Alt+Ctrl+Shift+ScrollUp as Alt+Ctrl+Left + OnR2LNext(); return TRUE; } - else if (bShiftDown && bControlDown) + else if (bShiftDown) { - // Alt+Ctrl+Shift+ScrollUp as Alt+Ctrl+Left - OnR2LNext(); + // Alt+Shift+ScrollUp as Alt+Left + OnR2l(); return TRUE; } else if (nFlags == 0) @@ -4302,16 +4302,16 @@ BOOL CMergeEditView::OnMouseWheel(UINT nFlags, short zDelta, CPoint pt) else if (zDelta < 0) { // Check Shift key hold for mice without HWheel function - if (bShiftDown) + if (bShiftDown && bControlDown) { - // Alt+Shift+ScrollDown as Alt+Right - OnL2r(); + // Alt+Ctrl+Shift+ScrollDown as Alt+Ctrl+Right + OnL2RNext(); return TRUE; } - else if (bShiftDown && bControlDown) + else if (bShiftDown) { - // Alt+Ctrl+Shift+ScrollDown as Alt+Ctrl+Right - OnL2RNext(); + // Alt+Shift+ScrollDown as Alt+Right + OnL2r(); return TRUE; } else if (nFlags == 0) From f3951023a75fb93525b6f94c6752ece229f094d8 Mon Sep 17 00:00:00 2001 From: lededev <30518126+lededev@users.noreply.github.com> Date: Wed, 18 Sep 2024 01:47:45 +0800 Subject: [PATCH 3/4] extend ToolTips text length to 256 --- Src/MainFrm.cpp | 12 ++++++++++-- Src/MainFrm.h | 2 ++ Src/Merge.rc | 12 ++++++------ Translations/TranslationsStatus.md | 8 ++++---- Translations/WinMerge/Arabic.po | 12 ++++++------ Translations/WinMerge/Basque.po | 12 ++++++------ Translations/WinMerge/Brazilian.po | 12 ++++++------ Translations/WinMerge/Bulgarian.po | 12 ++++++------ Translations/WinMerge/Catalan.po | 12 ++++++------ Translations/WinMerge/ChineseSimplified.po | 12 ++++++------ Translations/WinMerge/ChineseTraditional.po | 12 ++++++------ Translations/WinMerge/Corsican.po | 12 ++++++------ Translations/WinMerge/Croatian.po | 12 ++++++------ Translations/WinMerge/Czech.po | 12 ++++++------ Translations/WinMerge/Danish.po | 12 ++++++------ Translations/WinMerge/Dutch.po | 12 ++++++------ Translations/WinMerge/English.pot | 14 +++++++------- Translations/WinMerge/Finnish.po | 12 ++++++------ Translations/WinMerge/French.po | 12 ++++++------ Translations/WinMerge/Galician.po | 12 ++++++------ Translations/WinMerge/German.po | 12 ++++++------ Translations/WinMerge/Greek.po | 12 ++++++------ Translations/WinMerge/Hungarian.po | 12 ++++++------ Translations/WinMerge/Italian.po | 12 ++++++------ Translations/WinMerge/Japanese.po | 12 ++++++------ Translations/WinMerge/Korean.po | 12 ++++++------ Translations/WinMerge/Lithuanian.po | 12 ++++++------ Translations/WinMerge/Norwegian.po | 12 ++++++------ Translations/WinMerge/Persian.po | 12 ++++++------ Translations/WinMerge/Polish.po | 12 ++++++------ Translations/WinMerge/Portuguese.po | 12 ++++++------ Translations/WinMerge/Romanian.po | 12 ++++++------ Translations/WinMerge/Russian.po | 12 ++++++------ Translations/WinMerge/Serbian.po | 12 ++++++------ Translations/WinMerge/Sinhala.po | 12 ++++++------ Translations/WinMerge/Slovak.po | 12 ++++++------ Translations/WinMerge/Slovenian.po | 12 ++++++------ Translations/WinMerge/Spanish.po | 12 ++++++------ Translations/WinMerge/Swedish.po | 12 ++++++------ Translations/WinMerge/Tamil.po | 12 ++++++------ Translations/WinMerge/Turkish.po | 12 ++++++------ Translations/WinMerge/Ukrainian.po | 12 ++++++------ 42 files changed, 251 insertions(+), 241 deletions(-) diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index 509ec9f3a3d..f9f9b3545f1 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -2689,9 +2689,17 @@ BOOL CMainFrame::OnToolTipText(UINT, NMHDR* pNMHDR, LRESULT* pResult) strTipText = strFullText.substr(newline1st + 1).c_str(); } if (pNMHDR->code == TTN_NEEDTEXTA) - _wcstombsz(pTTTA->szText, strTipText, static_cast(std::size(pTTTA->szText))); + { + m_upszLongTextA.reset(new CHAR[256]); + pTTTA->lpszText = m_upszLongTextA.get(); + _wcstombsz(pTTTA->lpszText, strTipText, 256); + } else - lstrcpyn(pTTTW->szText, strTipText, static_cast(std::size(pTTTW->szText))); + { + m_upszLongTextW.reset(new WCHAR[256]); + pTTTW->lpszText = m_upszLongTextW.get(); + lstrcpyn(pTTTW->lpszText, strTipText, 256); + } *pResult = 0; // bring the tooltip window above other popup windows diff --git a/Src/MainFrm.h b/Src/MainFrm.h index c1b4046959a..a1f274427ea 100644 --- a/Src/MainFrm.h +++ b/Src/MainFrm.h @@ -446,4 +446,6 @@ class CMainFrame : public CMDIFrameWnd void LoadToolbarImages(); HMENU NewMenu( int view, int ID ); bool CompareFilesIfFilesAreLarge(IDirDoc* pDirDoc, int nFiles, const FileLocation ifileloc[]); + std::unique_ptr m_upszLongTextW; + std::unique_ptr m_upszLongTextA; }; diff --git a/Src/Merge.rc b/Src/Merge.rc index 0160f461996..175f75bd37c 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -4522,12 +4522,12 @@ END STRINGTABLE BEGIN - ID_MICE_PREVDIFF "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" - ID_MICE_NEXTDIFF "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" - ID_MICE_L2R "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" - ID_MICE_R2L "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" - ID_MICE_L2RNEXT "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" - ID_MICE_R2LNEXT "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" + ID_MICE_PREVDIFF "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" + ID_MICE_NEXTDIFF "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" + ID_MICE_L2R "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" + ID_MICE_R2L "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" + ID_MICE_L2RNEXT "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" + ID_MICE_R2LNEXT "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" END #endif // English (United States) resources diff --git a/Translations/TranslationsStatus.md b/Translations/TranslationsStatus.md index 9d7af085fa6..a4e166d6f9f 100644 --- a/Translations/TranslationsStatus.md +++ b/Translations/TranslationsStatus.md @@ -1,6 +1,6 @@ # Translations Status -Status from **2024-09-17**: +Status from **2024-09-18**: ## WinMerge @@ -11,14 +11,14 @@ Status from **2024-09-17**: | Brazilian | 1401 | 1395 | 0 | 6 | 99 % | 2024-09-16 | | Bulgarian | 1401 | 1078 | 0 | 323 | 76 % | 2023-11-14 | | Catalan | 1401 | 1328 | 0 | 73 | 94 % | | -| ChineseSimplified | 1401 | 1395 | 0 | 6 | 99 % | | -| ChineseTraditional | 1401 | 1293 | 0 | 108 | 92 % | 2022-02-19 | +| ChineseSimplified | 1401 | 1400 | 0 | 1 | 99 % | | +| ChineseTraditional | 1401 | 1298 | 0 | 103 | 92 % | 2022-02-19 | | Corsican | 1401 | 1389 | 0 | 12 | 99 % | 2024-06-21 | | Croatian | 1401 | 630 | 1 | 770 | 45 % | 2009-02-13 | | Czech | 1401 | 605 | 0 | 796 | 43 % | | | Danish | 1401 | 639 | 0 | 762 | 45 % | 2013-01-13 | | Dutch | 1401 | 1280 | 0 | 121 | 91 % | 2023-05-02 | -| English | 1401 | 1401 | 0 | 0 | 100 % | 2024-09-17 | +| English | 1401 | 1401 | 0 | 0 | 100 % | 2024-09-18 | | Finnish | 1401 | 1185 | 0 | 216 | 84 % | | | French | 1401 | 1392 | 0 | 9 | 99 % | 2024-08-01 | | Galician | 1401 | 1317 | 0 | 84 | 94 % | 2023-11-24 | diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po index 2cbbdd4418e..b80af5efdd6 100644 --- a/Translations/WinMerge/Arabic.po +++ b/Translations/WinMerge/Arabic.po @@ -4236,22 +4236,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po index 9fca980d0d8..dfd556a7370 100644 --- a/Translations/WinMerge/Basque.po +++ b/Translations/WinMerge/Basque.po @@ -4841,22 +4841,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po index f464adfbefc..9285a4ec870 100644 --- a/Translations/WinMerge/Brazilian.po +++ b/Translations/WinMerge/Brazilian.po @@ -3918,22 +3918,22 @@ msgstr "Linha" msgid "Character" msgstr "Caracter" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po index 8ec8ea37eb2..85dbfe71932 100644 --- a/Translations/WinMerge/Bulgarian.po +++ b/Translations/WinMerge/Bulgarian.po @@ -4297,22 +4297,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po index 20bb493542b..e4f94afd82d 100644 --- a/Translations/WinMerge/Catalan.po +++ b/Translations/WinMerge/Catalan.po @@ -5019,22 +5019,22 @@ msgstr "Línia" msgid "Character" msgstr "Caràcter" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po index b5cd2f62d8d..c53a400febe 100644 --- a/Translations/WinMerge/ChineseSimplified.po +++ b/Translations/WinMerge/ChineseSimplified.po @@ -4351,22 +4351,22 @@ msgstr "整行" msgid "Character" msgstr "字符" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "\n上一处差异 (Alt+Up)\n(鼠标右键+滚轮上滚)\n(Alt+滚轮上滚)" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "\n下一处差异 (Alt+Down)\n(鼠标右键+滚轮下滚)\n(Alt+滚轮下滚)" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "\n复制到右侧 (Alt+Right)\n(鼠标右键+滚轮右滚)\n(Alt+滚轮右滚)\n(Alt+Shift+滚轮下滚)" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "\n复制到左侧 (Alt+Left)\n(鼠标右键+滚轮左滚)\n(Alt+滚轮左滚)\n(Alt+Shift+滚轮上滚)" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "\n复制到右侧再到下一处差异 (Ctrl+Alt+Right)\n(Ctrl+Alt+滚轮右滚)\n(Ctrl+Alt+Shift+滚轮下滚)" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "\n复制到左侧再到下一处差异 (Ctrl+Alt+Left)\n(Ctrl+Alt+滚轮左滚)\n(Ctrl+Alt+Shift+滚轮上滚)" msgid "Prettification" diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po index 64f6ad9a80b..19471b3d3e9 100644 --- a/Translations/WinMerge/ChineseTraditional.po +++ b/Translations/WinMerge/ChineseTraditional.po @@ -5000,22 +5000,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "\n上一個差異 (Alt+Up)\n(滑鼠右鍵+滾輪上滾)\n(Alt+滾輪上滾)" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "\n下一個差異 (Alt+Down)\n(滑鼠右鍵+滾輪下滾)\n(Alt+滾輪下滾)" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "\n複製到右側 (Alt+Right)\n(滑鼠右鍵+滾輪右滾)\n(Alt+滾輪右滾)\n(Alt+Shift+滾輪下滾)" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "\n複製到左側 (Alt+Left)\n(滑鼠右鍵+滾輪左滾)\n(Alt+滾輪左滾)\n(Alt+Shift+滾輪上滾)" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "\n複製到右側後到下一個 (Ctrl+Alt+Right)\n(Ctrl+Alt+滾輪右滾)\n(Ctrl+Alt+Shift+滾輪下滾)" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "\n複製到左側後到下一個 (Ctrl+Alt+Left)\n(Ctrl+Alt+滾輪左滾)\n(Ctrl+Alt+Shift+滾輪上滾)" msgid "Prettification" diff --git a/Translations/WinMerge/Corsican.po b/Translations/WinMerge/Corsican.po index 20967948ff0..7ef60dbd75b 100644 --- a/Translations/WinMerge/Corsican.po +++ b/Translations/WinMerge/Corsican.po @@ -4306,22 +4306,22 @@ msgstr "Linea" msgid "Character" msgstr "Caratteru" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po index b03e372b2da..cf666c24739 100644 --- a/Translations/WinMerge/Croatian.po +++ b/Translations/WinMerge/Croatian.po @@ -4840,22 +4840,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po index 1ea5c7a2ab2..1f2e227f4ae 100644 --- a/Translations/WinMerge/Czech.po +++ b/Translations/WinMerge/Czech.po @@ -4773,22 +4773,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po index 182af832f9b..c41ec6e5b1f 100644 --- a/Translations/WinMerge/Danish.po +++ b/Translations/WinMerge/Danish.po @@ -4878,22 +4878,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po index cfb28e77b58..467c55604a1 100644 --- a/Translations/WinMerge/Dutch.po +++ b/Translations/WinMerge/Dutch.po @@ -4301,22 +4301,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot index 3d64eff18c3..6db9a3247b5 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: 2024-09-17 17:37+0000\n" +"POT-Creation-Date: 2024-09-18 01:37+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English \n" @@ -3913,22 +3913,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po index 2ac61dfc263..3429b159211 100644 --- a/Translations/WinMerge/Finnish.po +++ b/Translations/WinMerge/Finnish.po @@ -4338,22 +4338,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po index 600f1343eef..5ed3c708cb3 100644 --- a/Translations/WinMerge/French.po +++ b/Translations/WinMerge/French.po @@ -5030,22 +5030,22 @@ msgstr "Ligne" msgid "Character" msgstr "Caractère" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po index c9399ac32b3..a8f5d7c3f06 100644 --- a/Translations/WinMerge/Galician.po +++ b/Translations/WinMerge/Galician.po @@ -4305,22 +4305,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po index f9545fbe790..f8b13e08303 100644 --- a/Translations/WinMerge/German.po +++ b/Translations/WinMerge/German.po @@ -4636,22 +4636,22 @@ msgstr "Zeile" msgid "Character" msgstr "Zeichen" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po index 59aa367806e..374db110e33 100644 --- a/Translations/WinMerge/Greek.po +++ b/Translations/WinMerge/Greek.po @@ -4818,22 +4818,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po index 6e25db9bc63..cc29a5dd802 100644 --- a/Translations/WinMerge/Hungarian.po +++ b/Translations/WinMerge/Hungarian.po @@ -4972,22 +4972,22 @@ msgstr "Sor" msgid "Character" msgstr "Karakter" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po index c9a1c222c8d..301bc7c1a09 100644 --- a/Translations/WinMerge/Italian.po +++ b/Translations/WinMerge/Italian.po @@ -4342,22 +4342,22 @@ msgstr "Linea" msgid "Character" msgstr "Carattere" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po index 3a50d072d90..85a82dd932a 100644 --- a/Translations/WinMerge/Japanese.po +++ b/Translations/WinMerge/Japanese.po @@ -4306,22 +4306,22 @@ msgstr "行" msgid "Character" msgstr "文字" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po index ec700320096..64e5780cb55 100644 --- a/Translations/WinMerge/Korean.po +++ b/Translations/WinMerge/Korean.po @@ -5025,22 +5025,22 @@ msgstr "줄" msgid "Character" msgstr "문자" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po index 997287ccf62..6f74d4306bb 100644 --- a/Translations/WinMerge/Lithuanian.po +++ b/Translations/WinMerge/Lithuanian.po @@ -3918,22 +3918,22 @@ msgstr "Eilutė" msgid "Character" msgstr "Simbolis" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po index 06940a059f1..884f9f7c124 100644 --- a/Translations/WinMerge/Norwegian.po +++ b/Translations/WinMerge/Norwegian.po @@ -4308,22 +4308,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po index 100b3cb25a7..2035ee3be35 100644 --- a/Translations/WinMerge/Persian.po +++ b/Translations/WinMerge/Persian.po @@ -4887,22 +4887,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po index 154d19baf49..38bb55648de 100644 --- a/Translations/WinMerge/Polish.po +++ b/Translations/WinMerge/Polish.po @@ -3919,22 +3919,22 @@ msgstr "Wiersz" msgid "Character" msgstr "Znak" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po index 86091740d3b..84a2c991b0d 100644 --- a/Translations/WinMerge/Portuguese.po +++ b/Translations/WinMerge/Portuguese.po @@ -4405,22 +4405,22 @@ msgstr "Linha" msgid "Character" msgstr "Caráter" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po index 42ba8a47a13..130e7ff135b 100644 --- a/Translations/WinMerge/Romanian.po +++ b/Translations/WinMerge/Romanian.po @@ -4395,22 +4395,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po index 41c4ba824c5..512b60c65e5 100644 --- a/Translations/WinMerge/Russian.po +++ b/Translations/WinMerge/Russian.po @@ -3920,22 +3920,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po index 705fe890add..0c40561acf5 100644 --- a/Translations/WinMerge/Serbian.po +++ b/Translations/WinMerge/Serbian.po @@ -4812,22 +4812,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po index 17c388a59d6..15ebbf349a4 100644 --- a/Translations/WinMerge/Sinhala.po +++ b/Translations/WinMerge/Sinhala.po @@ -4841,22 +4841,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po index 475910b16a6..c1e62088740 100644 --- a/Translations/WinMerge/Slovak.po +++ b/Translations/WinMerge/Slovak.po @@ -4280,22 +4280,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po index 9fd384c5945..f4a2594c933 100644 --- a/Translations/WinMerge/Slovenian.po +++ b/Translations/WinMerge/Slovenian.po @@ -4303,22 +4303,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po index 26041ced85e..12342057718 100644 --- a/Translations/WinMerge/Spanish.po +++ b/Translations/WinMerge/Spanish.po @@ -4307,22 +4307,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po index 82d1cf7f06f..b4fee312c5d 100644 --- a/Translations/WinMerge/Swedish.po +++ b/Translations/WinMerge/Swedish.po @@ -4385,22 +4385,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Tamil.po b/Translations/WinMerge/Tamil.po index 47803d94fb2..08ae11cf9b4 100644 --- a/Translations/WinMerge/Tamil.po +++ b/Translations/WinMerge/Tamil.po @@ -4302,22 +4302,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po index f83a10a1175..ffd5b3948c5 100644 --- a/Translations/WinMerge/Turkish.po +++ b/Translations/WinMerge/Turkish.po @@ -3917,22 +3917,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po index f4e8fd5fd75..8bfdc1e025a 100644 --- a/Translations/WinMerge/Ukrainian.po +++ b/Translations/WinMerge/Ukrainian.po @@ -4827,22 +4827,22 @@ msgstr "" msgid "Character" msgstr "" -msgid "\nPrevious Difference |Alt+Up\nRightButton+ScrollUp\nAlt+ScrollUp" +msgid "\nPrevious Difference (Alt+Up)\n(Right Button+Wheel Up)\n(Alt+Wheel Up)" msgstr "" -msgid "\nNext Difference |Alt+Down\nRightButton+ScrollDown\nAlt+ScrollDown" +msgid "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" msgstr "" -msgid "\nCopy to Right |Alt+Right\nRightBtn+ScrollRight\nAlt+ScrollR\nAlt+Shift+ScrollDn" +msgid "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" msgstr "" -msgid "\nCopy to Left |Alt+Left\nRightBtn+ScrollLeft\nAlt+ScrollLeft\nAlt+Shift+ScrollUp" +msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance |Ctrl+Alt+Right\nCtrl+Alt+ScrollR\nCtrl+Alt+Shift+SDn" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" -msgid "\nCopy to Left and Advance |Ctrl+Alt+Left\nCtrl+Alt+ScrollL\nCtrl+Alt+Shift+SUp" +msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" msgstr "" msgid "Prettification" From 37fb06bb6986f9ee9e99c1ab56197be90374b807 Mon Sep 17 00:00:00 2001 From: lededev <30518126+lededev@users.noreply.github.com> Date: Wed, 18 Sep 2024 01:54:45 +0800 Subject: [PATCH 4/4] fix typo --- Src/Merge.rc | 2 +- Translations/WinMerge/Arabic.po | 2 +- Translations/WinMerge/Basque.po | 2 +- Translations/WinMerge/Brazilian.po | 2 +- Translations/WinMerge/Bulgarian.po | 2 +- Translations/WinMerge/Catalan.po | 2 +- Translations/WinMerge/ChineseSimplified.po | 2 +- Translations/WinMerge/ChineseTraditional.po | 2 +- Translations/WinMerge/Corsican.po | 2 +- Translations/WinMerge/Croatian.po | 2 +- Translations/WinMerge/Czech.po | 2 +- Translations/WinMerge/Danish.po | 2 +- Translations/WinMerge/Dutch.po | 2 +- Translations/WinMerge/English.pot | 4 ++-- Translations/WinMerge/Finnish.po | 2 +- Translations/WinMerge/French.po | 2 +- Translations/WinMerge/Galician.po | 2 +- Translations/WinMerge/German.po | 2 +- Translations/WinMerge/Greek.po | 2 +- Translations/WinMerge/Hungarian.po | 2 +- Translations/WinMerge/Italian.po | 2 +- Translations/WinMerge/Japanese.po | 2 +- Translations/WinMerge/Korean.po | 2 +- Translations/WinMerge/Lithuanian.po | 2 +- Translations/WinMerge/Norwegian.po | 2 +- Translations/WinMerge/Persian.po | 2 +- Translations/WinMerge/Polish.po | 2 +- Translations/WinMerge/Portuguese.po | 2 +- Translations/WinMerge/Romanian.po | 2 +- Translations/WinMerge/Russian.po | 2 +- Translations/WinMerge/Serbian.po | 2 +- Translations/WinMerge/Sinhala.po | 2 +- Translations/WinMerge/Slovak.po | 2 +- Translations/WinMerge/Slovenian.po | 2 +- Translations/WinMerge/Spanish.po | 2 +- Translations/WinMerge/Swedish.po | 2 +- Translations/WinMerge/Tamil.po | 2 +- Translations/WinMerge/Turkish.po | 2 +- Translations/WinMerge/Ukrainian.po | 2 +- 39 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Src/Merge.rc b/Src/Merge.rc index 175f75bd37c..910b0b2739e 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -4526,7 +4526,7 @@ BEGIN ID_MICE_NEXTDIFF "\nNext Difference (Alt+Down)\n(Right Button+Wheel Down)\n(Alt+Wheel Down)" ID_MICE_L2R "\nCopy to Right (Alt+Right)\n(Right Button+Wheel Right)\n(Alt+Wheel Right\nAlt+Shift+Wheel Down" ID_MICE_R2L "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" - ID_MICE_L2RNEXT "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" + ID_MICE_L2RNEXT "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" ID_MICE_R2LNEXT "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" END diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po index b80af5efdd6..201a833377d 100644 --- a/Translations/WinMerge/Arabic.po +++ b/Translations/WinMerge/Arabic.po @@ -4248,7 +4248,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po index dfd556a7370..d9d3e92b940 100644 --- a/Translations/WinMerge/Basque.po +++ b/Translations/WinMerge/Basque.po @@ -4853,7 +4853,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po index 9285a4ec870..1ef35a6f177 100644 --- a/Translations/WinMerge/Brazilian.po +++ b/Translations/WinMerge/Brazilian.po @@ -3930,7 +3930,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po index 85dbfe71932..89377bc1592 100644 --- a/Translations/WinMerge/Bulgarian.po +++ b/Translations/WinMerge/Bulgarian.po @@ -4309,7 +4309,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po index e4f94afd82d..b6c0752252e 100644 --- a/Translations/WinMerge/Catalan.po +++ b/Translations/WinMerge/Catalan.po @@ -5031,7 +5031,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po index c53a400febe..b6d043a6c4c 100644 --- a/Translations/WinMerge/ChineseSimplified.po +++ b/Translations/WinMerge/ChineseSimplified.po @@ -4363,7 +4363,7 @@ msgstr "\n复制到右侧 (Alt+Right)\n(鼠标右键+滚轮右滚)\n(Alt+滚轮 msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "\n复制到左侧 (Alt+Left)\n(鼠标右键+滚轮左滚)\n(Alt+滚轮左滚)\n(Alt+Shift+滚轮上滚)" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "\n复制到右侧再到下一处差异 (Ctrl+Alt+Right)\n(Ctrl+Alt+滚轮右滚)\n(Ctrl+Alt+Shift+滚轮下滚)" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po index 19471b3d3e9..4bf5bc5299d 100644 --- a/Translations/WinMerge/ChineseTraditional.po +++ b/Translations/WinMerge/ChineseTraditional.po @@ -5012,7 +5012,7 @@ msgstr "\n複製到右側 (Alt+Right)\n(滑鼠右鍵+滾輪右滾)\n(Alt+滾輪 msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "\n複製到左側 (Alt+Left)\n(滑鼠右鍵+滾輪左滾)\n(Alt+滾輪左滾)\n(Alt+Shift+滾輪上滾)" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "\n複製到右側後到下一個 (Ctrl+Alt+Right)\n(Ctrl+Alt+滾輪右滾)\n(Ctrl+Alt+Shift+滾輪下滾)" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Corsican.po b/Translations/WinMerge/Corsican.po index 7ef60dbd75b..239dd70258d 100644 --- a/Translations/WinMerge/Corsican.po +++ b/Translations/WinMerge/Corsican.po @@ -4318,7 +4318,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po index cf666c24739..2eb33e7e516 100644 --- a/Translations/WinMerge/Croatian.po +++ b/Translations/WinMerge/Croatian.po @@ -4852,7 +4852,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po index 1f2e227f4ae..df220346ce6 100644 --- a/Translations/WinMerge/Czech.po +++ b/Translations/WinMerge/Czech.po @@ -4785,7 +4785,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po index c41ec6e5b1f..598366d9799 100644 --- a/Translations/WinMerge/Danish.po +++ b/Translations/WinMerge/Danish.po @@ -4890,7 +4890,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po index 467c55604a1..e9b190c4059 100644 --- a/Translations/WinMerge/Dutch.po +++ b/Translations/WinMerge/Dutch.po @@ -4313,7 +4313,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot index 6db9a3247b5..86e3f64a66d 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: 2024-09-18 01:37+0000\n" +"POT-Creation-Date: 2024-09-18 01:50+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English \n" @@ -3925,7 +3925,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po index 3429b159211..8502e633598 100644 --- a/Translations/WinMerge/Finnish.po +++ b/Translations/WinMerge/Finnish.po @@ -4350,7 +4350,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po index 5ed3c708cb3..bf5297239ea 100644 --- a/Translations/WinMerge/French.po +++ b/Translations/WinMerge/French.po @@ -5042,7 +5042,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po index a8f5d7c3f06..d5eb302db0c 100644 --- a/Translations/WinMerge/Galician.po +++ b/Translations/WinMerge/Galician.po @@ -4317,7 +4317,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po index f8b13e08303..283f031851f 100644 --- a/Translations/WinMerge/German.po +++ b/Translations/WinMerge/German.po @@ -4648,7 +4648,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po index 374db110e33..7894e84b9d2 100644 --- a/Translations/WinMerge/Greek.po +++ b/Translations/WinMerge/Greek.po @@ -4830,7 +4830,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po index cc29a5dd802..072654ef6dd 100644 --- a/Translations/WinMerge/Hungarian.po +++ b/Translations/WinMerge/Hungarian.po @@ -4984,7 +4984,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po index 301bc7c1a09..bc2fa0e011f 100644 --- a/Translations/WinMerge/Italian.po +++ b/Translations/WinMerge/Italian.po @@ -4354,7 +4354,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po index 85a82dd932a..97114765310 100644 --- a/Translations/WinMerge/Japanese.po +++ b/Translations/WinMerge/Japanese.po @@ -4318,7 +4318,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po index 64e5780cb55..72bcf0c8138 100644 --- a/Translations/WinMerge/Korean.po +++ b/Translations/WinMerge/Korean.po @@ -5037,7 +5037,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po index 6f74d4306bb..e81ce4ea309 100644 --- a/Translations/WinMerge/Lithuanian.po +++ b/Translations/WinMerge/Lithuanian.po @@ -3930,7 +3930,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po index 884f9f7c124..f701bc3f719 100644 --- a/Translations/WinMerge/Norwegian.po +++ b/Translations/WinMerge/Norwegian.po @@ -4320,7 +4320,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po index 2035ee3be35..816cf2d460a 100644 --- a/Translations/WinMerge/Persian.po +++ b/Translations/WinMerge/Persian.po @@ -4899,7 +4899,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po index 38bb55648de..2440cefd0a3 100644 --- a/Translations/WinMerge/Polish.po +++ b/Translations/WinMerge/Polish.po @@ -3931,7 +3931,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po index 84a2c991b0d..1a59176d1b7 100644 --- a/Translations/WinMerge/Portuguese.po +++ b/Translations/WinMerge/Portuguese.po @@ -4417,7 +4417,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po index 130e7ff135b..4a28d8c7116 100644 --- a/Translations/WinMerge/Romanian.po +++ b/Translations/WinMerge/Romanian.po @@ -4407,7 +4407,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po index 512b60c65e5..ac3b1454415 100644 --- a/Translations/WinMerge/Russian.po +++ b/Translations/WinMerge/Russian.po @@ -3932,7 +3932,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po index 0c40561acf5..8e30ac11164 100644 --- a/Translations/WinMerge/Serbian.po +++ b/Translations/WinMerge/Serbian.po @@ -4824,7 +4824,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po index 15ebbf349a4..a00e4983f4c 100644 --- a/Translations/WinMerge/Sinhala.po +++ b/Translations/WinMerge/Sinhala.po @@ -4853,7 +4853,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po index c1e62088740..21994ab8de9 100644 --- a/Translations/WinMerge/Slovak.po +++ b/Translations/WinMerge/Slovak.po @@ -4292,7 +4292,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po index f4a2594c933..605df442888 100644 --- a/Translations/WinMerge/Slovenian.po +++ b/Translations/WinMerge/Slovenian.po @@ -4315,7 +4315,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po index 12342057718..a5890f92f4b 100644 --- a/Translations/WinMerge/Spanish.po +++ b/Translations/WinMerge/Spanish.po @@ -4319,7 +4319,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po index b4fee312c5d..4bb74d90113 100644 --- a/Translations/WinMerge/Swedish.po +++ b/Translations/WinMerge/Swedish.po @@ -4397,7 +4397,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Tamil.po b/Translations/WinMerge/Tamil.po index 08ae11cf9b4..50f41e48ef6 100644 --- a/Translations/WinMerge/Tamil.po +++ b/Translations/WinMerge/Tamil.po @@ -4314,7 +4314,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po index ffd5b3948c5..456200c2be1 100644 --- a/Translations/WinMerge/Turkish.po +++ b/Translations/WinMerge/Turkish.po @@ -3929,7 +3929,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)" diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po index 8bfdc1e025a..519aafe6cad 100644 --- a/Translations/WinMerge/Ukrainian.po +++ b/Translations/WinMerge/Ukrainian.po @@ -4839,7 +4839,7 @@ msgstr "" msgid "\nCopy to Left (Alt+Left)\n(Right Button+Wheel Left\n(Alt+Wheel Left)\n(Alt+Shift+Wheel Up)" msgstr "" -msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\nCtrl+Alt+Wheel Right\n(Ctrl+Alt+Shift+Wheel Down)" +msgid "\nCopy to Right and Advance (Ctrl+Alt+Right)\n(Ctrl+Alt+Wheel Right)\n(Ctrl+Alt+Shift+Wheel Down)" msgstr "" msgid "\nCopy to Left and Advance (Ctrl+Alt+Left)\n(Ctrl+Alt+Wheel Left)\n(Ctrl+Alt+Shift+Wheel Up)"