From 474fcd70f5aeb5a7e2bcc95fc824fe75f038692b Mon Sep 17 00:00:00 2001 From: Jun Tajima <56220423+tjmprm77@users.noreply.github.com> Date: Sun, 22 Nov 2020 10:43:15 +0900 Subject: [PATCH] Add the feature "Go to Moved Line". (#484) This feature can be performed in the file compare window in the following ways: - The Context menu of the File pane or the Diff pane - Shortcut key "Ctrl + Alt + G" or "Ctrl + Shift + G" --- Src/Merge.rc | 10 ++ Src/MergeEditView.cpp | 146 ++++++++++++++++++++++++++++ Src/MergeEditView.h | 4 + Src/resource.h | 3 + Translations/WinMerge/Arabic.po | 9 ++ Translations/WinMerge/Basque.po | 9 ++ Translations/WinMerge/Brazilian.po | 9 ++ Translations/WinMerge/Bulgarian.po | 9 ++ Translations/WinMerge/Catalan.po | 9 ++ Translations/WinMerge/ChineseSimplified.po | 9 ++ Translations/WinMerge/ChineseTraditional.po | 9 ++ Translations/WinMerge/Croatian.po | 9 ++ Translations/WinMerge/Czech.po | 9 ++ Translations/WinMerge/Danish.po | 9 ++ Translations/WinMerge/Dutch.po | 9 ++ Translations/WinMerge/English.pot | 11 ++- Translations/WinMerge/Finnish.po | 9 ++ Translations/WinMerge/French.po | 9 ++ Translations/WinMerge/Galician.po | 9 ++ Translations/WinMerge/German.po | 9 ++ Translations/WinMerge/Greek.po | 9 ++ Translations/WinMerge/Hungarian.po | 9 ++ Translations/WinMerge/Italian.po | 9 ++ Translations/WinMerge/Japanese.po | 9 ++ Translations/WinMerge/Korean.po | 9 ++ Translations/WinMerge/Lithuanian.po | 9 ++ Translations/WinMerge/Norwegian.po | 9 ++ Translations/WinMerge/Persian.po | 9 ++ Translations/WinMerge/Polish.po | 9 ++ Translations/WinMerge/Portuguese.po | 9 ++ Translations/WinMerge/Romanian.po | 9 ++ Translations/WinMerge/Russian.po | 9 ++ Translations/WinMerge/Serbian.po | 9 ++ Translations/WinMerge/Sinhala.po | 9 ++ Translations/WinMerge/Slovak.po | 9 ++ Translations/WinMerge/Slovenian.po | 9 ++ Translations/WinMerge/Spanish.po | 9 ++ Translations/WinMerge/Swedish.po | 9 ++ Translations/WinMerge/Turkish.po | 9 ++ Translations/WinMerge/Ukrainian.po | 9 ++ 40 files changed, 488 insertions(+), 1 deletion(-) diff --git a/Src/Merge.rc b/Src/Merge.rc index 0d02be53f..7145e1660 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -81,6 +81,8 @@ BEGIN MENUITEM "&Paste", ID_EDIT_PASTE MENUITEM SEPARATOR MENUITEM "&Goto...", ID_EDIT_WMGOTO + MENUITEM "Go to Moved Line Between Left and Middle\tCtrl+Shift+G", ID_GOTO_MOVED_LINE_LM + MENUITEM "Go to Moved Line Between Middle and Right\tCtrl+Alt+G", ID_GOTO_MOVED_LINE_MR MENUITEM SEPARATOR POPUP "Op&en" BEGIN @@ -869,6 +871,8 @@ BEGIN "C", ID_EDIT_COPY_LINENUMBERS, VIRTKEY, SHIFT, CONTROL, NOINVERT "F", ID_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT "G", ID_EDIT_WMGOTO, VIRTKEY, CONTROL, NOINVERT + "G", ID_GOTO_MOVED_LINE_LM, VIRTKEY, SHIFT, CONTROL, NOINVERT + "G", ID_GOTO_MOVED_LINE_MR, VIRTKEY, CONTROL, ALT, NOINVERT "H", ID_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT "J", ID_FILE_OPENPROJECT, VIRTKEY, CONTROL, NOINVERT "M", ID_EDIT_MARK, VIRTKEY, SHIFT, CONTROL, NOINVERT @@ -3291,6 +3295,12 @@ BEGIN IDS_LOCBAR_GOTOLINE_FMT "G&oto Line %1" END +// MERGEVIEW CONTEXT MENU +STRINGTABLE +BEGIN + IDS_GOTO_MOVED_LINE "Go to Moved Line\tCtrl+Shift+G" +END + // AUTOCOMPLETE COMBOBOX OPTIONS STRINGTABLE BEGIN diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp index 02b09e5fd..82f74b2df 100644 --- a/Src/MergeEditView.cpp +++ b/Src/MergeEditView.cpp @@ -182,6 +182,10 @@ BEGIN_MESSAGE_MAP(CMergeEditView, CCrystalEditViewEx) ON_COMMAND(ID_WINDOW_CHANGE_PANE, OnChangePane) ON_COMMAND(ID_NEXT_PANE, OnChangePane) ON_COMMAND(ID_EDIT_WMGOTO, OnWMGoto) + ON_COMMAND(ID_GOTO_MOVED_LINE_LM, OnGotoMovedLineLM) + ON_UPDATE_COMMAND_UI(ID_GOTO_MOVED_LINE_LM, OnUpdateGotoMovedLineLM) + ON_COMMAND(ID_GOTO_MOVED_LINE_MR, OnGotoMovedLineMR) + ON_UPDATE_COMMAND_UI(ID_GOTO_MOVED_LINE_MR, OnUpdateGotoMovedLineMR) ON_COMMAND(ID_FILE_SHELLMENU, OnShellMenu) ON_UPDATE_COMMAND_UI(ID_FILE_SHELLMENU, OnUpdateShellMenu) ON_COMMAND_RANGE(ID_SCRIPT_FIRST, ID_SCRIPT_LAST, OnScripts) @@ -2873,6 +2877,15 @@ void CMergeEditView::OnContextMenu(CWnd* pWnd, CPoint point) menu.RemoveMenu(ID_COPY_FROM_RIGHT, MF_BYCOMMAND); } + // Remove "Go to Moved Line Between Middle and Right" if in 2-way file comparison. + // Remove "Go to Moved Line Between Middle and Right" if the right pane is active in 3-way file comparison. + // Remove "Go to Moved Line Between Left and Middle" if the right pane is active in 3-way file comparison. + int nBuffers = GetDocument()->m_nBuffers; + if (nBuffers == 2 || (nBuffers == 3 && m_nThisPane == 0)) + menu.RemoveMenu(ID_GOTO_MOVED_LINE_MR, MF_BYCOMMAND); + else if (nBuffers == 3 && m_nThisPane == 2) + menu.RemoveMenu(ID_GOTO_MOVED_LINE_LM, MF_BYCOMMAND); + VERIFY(menu.LoadToolbar(IDR_MAINFRAME)); theApp.TranslateMenu(menu.m_hMenu); @@ -3106,6 +3119,139 @@ void CMergeEditView::OnWMGoto() } } +/** +* @brief Called when "Go to Moved Line Between Left and Middle" item is selected. +* Go to moved line between the left and right panes when in 2-way file comparison. +* Go to moved line between the left and middle panes when in 3-way file comparison. +*/ +void CMergeEditView::OnGotoMovedLineLM() +{ + if (!GetOptionsMgr()->GetBool(OPT_CMP_MOVED_BLOCKS)) + return; + + CMergeDoc* pDoc = GetDocument(); + CPoint pos = GetCursorPos(); + + ASSERT(m_nThisPane >= 0 && m_nThisPane < 3); + ASSERT(pDoc != nullptr); + ASSERT(pDoc->m_nBuffers == 2 || pDoc->m_nBuffers == 3); + ASSERT(pos.y >= 0); + + if (m_nThisPane == 0) + { + int line = pDoc->RightLineInMovedBlock(m_nThisPane, pos.y); + if (line >= 0) + GotoLine(line, false, 1); + } + else if (m_nThisPane == 1) + { + int line = pDoc->LeftLineInMovedBlock(m_nThisPane, pos.y); + if (line >= 0) + GotoLine(line, false, 0); + } +} + +/** + * @brief Called when "Go to Moved Line Between Left and Middle" item is updated. + * @param [in] pCmdUI UI component to update. + * @note The item label is changed to "Go to Moved Line" when 2-way file comparison. + */ +void CMergeEditView::OnUpdateGotoMovedLineLM(CCmdUI* pCmdUI) +{ + CMergeDoc* pDoc = GetDocument(); + CPoint pos = GetCursorPos(); + + ASSERT(m_nThisPane >= 0 && m_nThisPane < 3); + ASSERT(pCmdUI != nullptr); + ASSERT(pDoc != nullptr); + ASSERT(pDoc->m_nBuffers == 2 || pDoc->m_nBuffers == 3); + ASSERT(pos.y >= 0); + + if (pDoc->m_nBuffers == 2) + pCmdUI->SetText(_("Go to Moved Line\tCtrl+Shift+G").c_str()); + + if (!GetOptionsMgr()->GetBool(OPT_CMP_MOVED_BLOCKS) || m_nThisPane == 2) + { + pCmdUI->Enable(false); + return; + } + + if (m_nThisPane == 0) + { + bool bOn = (pDoc->RightLineInMovedBlock(m_nThisPane, pos.y) >= 0); + pCmdUI->Enable(bOn); + } + else if (m_nThisPane == 1) + { + bool bOn = (pDoc->LeftLineInMovedBlock(m_nThisPane, pos.y) >= 0); + pCmdUI->Enable(bOn); + } +} + +/** +* @brief Called when "Go to Moved Line Between Middle and Right" item is selected. +* Go to moved line between the middle and right panes when in 3-way file comparison. +*/ +void CMergeEditView::OnGotoMovedLineMR() +{ + if (!GetOptionsMgr()->GetBool(OPT_CMP_MOVED_BLOCKS)) + return; + + CMergeDoc* pDoc = GetDocument(); + CPoint pos = GetCursorPos(); + + ASSERT(m_nThisPane >= 0 && m_nThisPane < 3); + ASSERT(pDoc != nullptr); + ASSERT(pDoc->m_nBuffers == 2 || pDoc->m_nBuffers == 3); + ASSERT(pos.y >= 0); + + if (m_nThisPane == 1) + { + int line = pDoc->RightLineInMovedBlock(m_nThisPane, pos.y); + if (line >= 0) + GotoLine(line, false, 2); + } + else if (m_nThisPane == 2) + { + int line = pDoc->LeftLineInMovedBlock(m_nThisPane, pos.y); + if (line >= 0) + GotoLine(line, false, 1); + } +} + +/** + * @brief Called when "Go to Moved Line Between Middle and Right" item is updated. + * @param [in] pCmdUI UI component to update. + */ +void CMergeEditView::OnUpdateGotoMovedLineMR(CCmdUI* pCmdUI) +{ + CMergeDoc* pDoc = GetDocument(); + CPoint pos = GetCursorPos(); + + ASSERT(m_nThisPane >= 0 && m_nThisPane < 3); + ASSERT(pCmdUI != nullptr); + ASSERT(pDoc != nullptr); + ASSERT(pDoc->m_nBuffers == 2 || pDoc->m_nBuffers == 3); + ASSERT(pos.y >= 0); + + if (!GetOptionsMgr()->GetBool(OPT_CMP_MOVED_BLOCKS) || pDoc->m_nBuffers == 2 || m_nThisPane == 0) + { + pCmdUI->Enable(false); + return; + } + + if (m_nThisPane == 1) + { + bool bOn = (pDoc->RightLineInMovedBlock(m_nThisPane, pos.y) >= 0); + pCmdUI->Enable(bOn); + } + else if (m_nThisPane == 2) + { + bool bOn = (pDoc->LeftLineInMovedBlock(m_nThisPane, pos.y) >= 0); + pCmdUI->Enable(bOn); + } +} + void CMergeEditView::OnShellMenu() { CFrameWnd *pFrame = GetTopLevelFrame(); diff --git a/Src/MergeEditView.h b/Src/MergeEditView.h index a4680ca79..11b561f0c 100644 --- a/Src/MergeEditView.h +++ b/Src/MergeEditView.h @@ -301,6 +301,10 @@ protected: afx_msg void OnUpdateR2LNext(CCmdUI* pCmdUI); afx_msg void OnChangePane(); afx_msg void OnWMGoto(); + afx_msg void OnGotoMovedLineLM(); + afx_msg void OnUpdateGotoMovedLineLM(CCmdUI* pCmdUI); + afx_msg void OnGotoMovedLineMR(); + afx_msg void OnUpdateGotoMovedLineMR(CCmdUI* pCmdUI); afx_msg void OnShellMenu(); afx_msg void OnUpdateShellMenu(CCmdUI* pCmdUI); afx_msg void OnScripts(UINT nID ); diff --git a/Src/resource.h b/Src/resource.h index c99315da2..8c9c41e15 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -979,6 +979,9 @@ #define ID_REFRESH 32787 #define ID_EDIT_COPY_LINENUMBERS 32788 #define ID_RESCAN 32789 +#define ID_GOTO_MOVED_LINE_LM 32790 +#define ID_GOTO_MOVED_LINE_MR 32791 +#define IDS_GOTO_MOVED_LINE 32792 #define ID_EDIT_FIND_PREVIOUS 32799 #define ID_OPTIONS_SHOWIDENTICAL 32800 #define ID_OPTIONS_SHOWDIFFERENT 32801 diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po index 6a4349384..38dd364a4 100644 --- a/Translations/WinMerge/Arabic.po +++ b/Translations/WinMerge/Arabic.po @@ -60,6 +60,12 @@ msgstr "&لصق" msgid "&Goto..." msgstr "ال&ذهاب إلى..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + msgid "Op&en" msgstr "&فتح" @@ -3305,6 +3311,9 @@ msgstr "<تلقائي>" msgid "G&oto Line %1" msgstr "إ&ذهب إلى السطر %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + msgid "Disabled" msgstr "معطل" diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po index a1292e22f..a5855057d 100644 --- a/Translations/WinMerge/Basque.po +++ b/Translations/WinMerge/Basque.po @@ -75,6 +75,12 @@ msgstr "&Itsatsi" msgid "&Goto..." msgstr "&Joan hona..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + #, c-format msgid "Op&en" msgstr "Ire&ki" @@ -3922,6 +3928,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "&Joan lerro honetara: %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + #, c-format msgid "Disabled" msgstr "Ezgaituta" diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po index f53a389fc..11a9d9210 100644 --- a/Translations/WinMerge/Brazilian.po +++ b/Translations/WinMerge/Brazilian.po @@ -74,6 +74,12 @@ msgstr "&Colar" msgid "&Goto..." msgstr "&Ir para..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + #, c-format msgid "Op&en" msgstr "Ab&rir" @@ -4036,6 +4042,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "I&r pra Linha %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + #, c-format msgid "Disabled" msgstr "Desativado" diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po index 57302f9f2..1f1d16a12 100644 --- a/Translations/WinMerge/Bulgarian.po +++ b/Translations/WinMerge/Bulgarian.po @@ -56,6 +56,12 @@ msgstr "По&ставяне" msgid "&Goto..." msgstr "Отиване &към…" +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + msgid "Op&en" msgstr "&Отваряне" @@ -3279,6 +3285,9 @@ msgstr "<Автоматично>" msgid "G&oto Line %1" msgstr "От&иване на ред %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + msgid "Disabled" msgstr "Забранено" diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po index 1a7477d5a..0db17c162 100644 --- a/Translations/WinMerge/Catalan.po +++ b/Translations/WinMerge/Catalan.po @@ -71,6 +71,12 @@ msgstr "Engan&xa" msgid "&Goto..." msgstr "&Vés a..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + #, c-format msgid "Op&en" msgstr "O&bre" @@ -3850,6 +3856,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "Va fins a la línia %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + #, c-format msgid "Disabled" msgstr "Inhabilitat" diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po index e599f8336..be3bbdda8 100644 --- a/Translations/WinMerge/ChineseSimplified.po +++ b/Translations/WinMerge/ChineseSimplified.po @@ -62,6 +62,12 @@ msgstr "粘贴(&P)" msgid "&Goto..." msgstr "转到(&G)..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + msgid "Op&en" msgstr "打开(&E)" @@ -3344,6 +3350,9 @@ msgstr "<自动>" msgid "G&oto Line %1" msgstr "转到第 %1 行(&O)" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + msgid "Disabled" msgstr "禁用" diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po index b75bff839..747179e29 100644 --- a/Translations/WinMerge/ChineseTraditional.po +++ b/Translations/WinMerge/ChineseTraditional.po @@ -74,6 +74,12 @@ msgstr "貼上(&P)" msgid "&Goto..." msgstr "跳至(&G)..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + #, c-format msgid "Op&en" msgstr "開啟(&E)" @@ -3930,6 +3936,9 @@ msgstr "<自動>" msgid "G&oto Line %1" msgstr "至第 %1 行(&O)" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + #, c-format msgid "Disabled" msgstr "關閉" diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po index 87908459c..f05e7a0f3 100644 --- a/Translations/WinMerge/Croatian.po +++ b/Translations/WinMerge/Croatian.po @@ -72,6 +72,12 @@ msgstr "&Zalijepi" msgid "&Goto..." msgstr "Idi &na redak" +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + #, c-format msgid "Op&en" msgstr "&Otvori" @@ -3921,6 +3927,9 @@ msgstr "Automatski" msgid "G&oto Line %1" msgstr "Idi &na redak" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + #, c-format msgid "Disabled" msgstr "Onemogućeno" diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po index 8a572da90..6b7ce32b3 100644 --- a/Translations/WinMerge/Czech.po +++ b/Translations/WinMerge/Czech.po @@ -72,6 +72,12 @@ msgstr "&Vložit" msgid "&Goto..." msgstr "Př&ejít na..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + #, c-format msgid "Op&en" msgstr "&Otevřít" @@ -3852,6 +3858,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "&Přejít na řádek %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + #, c-format msgid "Disabled" msgstr "Vypnuto" diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po index c2bbbbab1..f8861cf1f 100644 --- a/Translations/WinMerge/Danish.po +++ b/Translations/WinMerge/Danish.po @@ -73,6 +73,12 @@ msgstr "&Indsæt" msgid "&Goto..." msgstr "Gå &til..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + #, c-format msgid "Op&en" msgstr "Åb&en" @@ -3961,6 +3967,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "G&å til linje %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + #, c-format msgid "Disabled" msgstr "Deaktiveret" diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po index 551a63203..0f7bfb66d 100644 --- a/Translations/WinMerge/Dutch.po +++ b/Translations/WinMerge/Dutch.po @@ -60,6 +60,12 @@ msgstr "Plakken" msgid "&Goto..." msgstr "Ga naar..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + msgid "Op&en" msgstr "Openen" @@ -3352,6 +3358,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "Naar regel %1 gaan" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + msgid "Disabled" msgstr "Uitgeschakeld" diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot index 97fbe73a7..301629ef0 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: 2020-11-21 13:50+0000\n" +"POT-Creation-Date: 2020-11-21 22:58+0000\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: English \n" @@ -53,6 +53,12 @@ msgstr "" msgid "&Goto..." msgstr "" +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + msgid "Op&en" msgstr "" @@ -2942,6 +2948,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + msgid "Disabled" msgstr "" diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po index d396e1203..3472f0b22 100644 --- a/Translations/WinMerge/Finnish.po +++ b/Translations/WinMerge/Finnish.po @@ -70,6 +70,12 @@ msgstr "Lii&tä" msgid "&Goto..." msgstr "&Siirry..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + #, c-format msgid "Op&en" msgstr "Av&aa" @@ -4017,6 +4023,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "Siirry riville %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + #, c-format msgid "Disabled" msgstr "Ei käytössä" diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po index 0e1c84b21..f87633ec6 100644 --- a/Translations/WinMerge/French.po +++ b/Translations/WinMerge/French.po @@ -77,6 +77,12 @@ msgstr "Co&ller" msgid "&Goto..." msgstr "&Atteindre..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + #, c-format msgid "Op&en" msgstr "&Ouvrir" @@ -4091,6 +4097,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "Atteindre la ligne %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + #, c-format msgid "Disabled" msgstr "Désactivé" diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po index d2638efa4..3ef313603 100644 --- a/Translations/WinMerge/Galician.po +++ b/Translations/WinMerge/Galician.po @@ -72,6 +72,12 @@ msgstr "&Pegar" msgid "&Goto..." msgstr "Ir &a…" +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + #, c-format msgid "Op&en" msgstr "A&brir" @@ -4054,6 +4060,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "I&r á liña %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + #, c-format msgid "Disabled" msgstr "Desactivado" diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po index d001fd1af..2cde920bb 100644 --- a/Translations/WinMerge/German.po +++ b/Translations/WinMerge/German.po @@ -72,6 +72,12 @@ msgstr "E&infügen" msgid "&Goto..." msgstr "&Gehe zu..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + #, c-format msgid "Op&en" msgstr "Ö&ffnen" @@ -3700,6 +3706,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "Gehe zu &Zeile %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + #, c-format msgid "Disabled" msgstr "Deaktiviert" diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po index 0aa82ff18..9eda9e0d6 100644 --- a/Translations/WinMerge/Greek.po +++ b/Translations/WinMerge/Greek.po @@ -71,6 +71,12 @@ msgstr "Προ&σάρτηση" msgid "&Goto..." msgstr "Μετά&βαση..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + #, c-format msgid "Op&en" msgstr "Άν&οιγμα" @@ -3899,6 +3905,9 @@ msgstr "<Αυτόματο>" msgid "G&oto Line %1" msgstr "Μετά&βαση στη Γραμμή %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + #, c-format msgid "Disabled" msgstr "Απενεργοποιημένη" diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po index 2e9b24e49..bc42527bc 100644 --- a/Translations/WinMerge/Hungarian.po +++ b/Translations/WinMerge/Hungarian.po @@ -72,6 +72,12 @@ msgstr "&Beillesztés" msgid "&Goto..." msgstr "&Ugrás..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + #, c-format msgid "Op&en" msgstr "Meg&nyitás" @@ -3826,6 +3832,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "&Ugrás a(z) %1. sorra" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + #, c-format msgid "Disabled" msgstr "" diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po index 8c98a841c..16de82d33 100644 --- a/Translations/WinMerge/Italian.po +++ b/Translations/WinMerge/Italian.po @@ -59,6 +59,12 @@ msgstr "I&ncolla" msgid "&Goto..." msgstr "&Vai a..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + msgid "Op&en" msgstr "&Apri" @@ -3326,6 +3332,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "Vai alla &linea %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + msgid "Disabled" msgstr "Disattivato" diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po index 27e1122d1..241ee23a8 100644 --- a/Translations/WinMerge/Japanese.po +++ b/Translations/WinMerge/Japanese.po @@ -60,6 +60,12 @@ msgstr "貼り付け(&P)" msgid "&Goto..." msgstr "移動(&G)..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "左側と中央の移動行に移動\tCtrl+Shift+G" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "中央と右側の移動行に移動\tCtrl+Alt+G" + msgid "Op&en" msgstr "開く(&E)" @@ -3306,6 +3312,9 @@ msgstr "<自動>" msgid "G&oto Line %1" msgstr "行 %1 に移動(&O)" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "移動行に移動\tCtrl+Shift+G" + msgid "Disabled" msgstr "無効" diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po index b09b45124..8ac990b10 100644 --- a/Translations/WinMerge/Korean.po +++ b/Translations/WinMerge/Korean.po @@ -76,6 +76,12 @@ msgstr "붙여넣기(&P)" msgid "&Goto..." msgstr "이동(&G)" +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + #, c-format msgid "Op&en" msgstr "열기(&E)" @@ -4023,6 +4029,9 @@ msgstr "<자동>" msgid "G&oto Line %1" msgstr "%1줄로 이동(&O)" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + #, c-format msgid "Disabled" msgstr "사용 안 함" diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po index 4576e9e65..5a30d1b6a 100644 --- a/Translations/WinMerge/Lithuanian.po +++ b/Translations/WinMerge/Lithuanian.po @@ -62,6 +62,12 @@ msgstr "Įter&pti" msgid "&Goto..." msgstr "&Eiti į..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + msgid "Op&en" msgstr "Atv&erti" @@ -2951,6 +2957,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "E&iti į %1 eilutę" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + msgid "Disabled" msgstr "Išjungta" diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po index 87de2b2fc..49071695b 100644 --- a/Translations/WinMerge/Norwegian.po +++ b/Translations/WinMerge/Norwegian.po @@ -72,6 +72,12 @@ msgstr "&Lim inn" msgid "&Goto..." msgstr "Gå &til..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + #, c-format msgid "Op&en" msgstr "&Åpne" @@ -3921,6 +3927,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "G&å til linje %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + #, c-format msgid "Disabled" msgstr "Deaktivert" diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po index 250cd1473..1e5c37f5b 100644 --- a/Translations/WinMerge/Persian.po +++ b/Translations/WinMerge/Persian.po @@ -73,6 +73,12 @@ msgstr "&P چسباندن " msgid "&Goto..." msgstr "&G برو به ... " +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + #, c-format msgid "Op&en" msgstr "&e باز " @@ -3965,6 +3971,9 @@ msgstr "<خودکار>" msgid "G&oto Line %1" msgstr "&G برو به خط %1 " +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + #, c-format msgid "Disabled" msgstr " غير فعال " diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po index 1545950dd..b5440fb65 100644 --- a/Translations/WinMerge/Polish.po +++ b/Translations/WinMerge/Polish.po @@ -59,6 +59,12 @@ msgstr "Wklej" msgid "&Goto..." msgstr "Idź do..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + msgid "Op&en" msgstr "Otwórz" @@ -2949,6 +2955,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "Idź do linii %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + msgid "Disabled" msgstr "Wyłączone" diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po index 6f06b4350..7ff068ae8 100644 --- a/Translations/WinMerge/Portuguese.po +++ b/Translations/WinMerge/Portuguese.po @@ -62,6 +62,12 @@ msgstr "Co&lar" msgid "&Goto..." msgstr "&Ir para..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + msgid "Op&en" msgstr "&Abrir" @@ -3303,6 +3309,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "I&r para a Linha %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + msgid "Disabled" msgstr "Desativado" diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po index 9de38215c..160230543 100644 --- a/Translations/WinMerge/Romanian.po +++ b/Translations/WinMerge/Romanian.po @@ -72,6 +72,12 @@ msgstr "Li&peşte" msgid "&Goto..." msgstr "&Mergi la..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + #, c-format msgid "Op&en" msgstr "D&eschide" @@ -3900,6 +3906,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "&Mergi la linia %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + #, c-format msgid "Disabled" msgstr "Inactiv" diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po index b01a0f8b8..c7d28f7e1 100644 --- a/Translations/WinMerge/Russian.po +++ b/Translations/WinMerge/Russian.po @@ -64,6 +64,12 @@ msgstr "&Вставить" msgid "&Goto..." msgstr "Перейти к..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + msgid "Op&en" msgstr "От&крыть" @@ -2953,6 +2959,9 @@ msgstr "<Автоматически>" msgid "G&oto Line %1" msgstr "Перейти к &строке %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + msgid "Disabled" msgstr "Отключен" diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po index ebdfe6314..82aa7d615 100644 --- a/Translations/WinMerge/Serbian.po +++ b/Translations/WinMerge/Serbian.po @@ -71,6 +71,12 @@ msgstr "&Налепи" msgid "&Goto..." msgstr "&Иди на..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + #, c-format msgid "Op&en" msgstr "&Отвори" @@ -3893,6 +3899,9 @@ msgstr "<Аутоматски>" msgid "G&oto Line %1" msgstr "И&ди на ред %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + #, c-format msgid "Disabled" msgstr "Онемогући" diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po index ca5cc8515..dbfebe6d0 100644 --- a/Translations/WinMerge/Sinhala.po +++ b/Translations/WinMerge/Sinhala.po @@ -69,6 +69,12 @@ msgstr "ඇලවීම" msgid "&Goto..." msgstr "යන්න" +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + #, c-format msgid "Op&en" msgstr "විවෘත කිරීම" @@ -3911,6 +3917,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "G&oto Line %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + #, c-format msgid "Disabled" msgstr "Disabled" diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po index 552c6973a..9e7ffac00 100644 --- a/Translations/WinMerge/Slovak.po +++ b/Translations/WinMerge/Slovak.po @@ -62,6 +62,12 @@ msgstr "&Prilepiť" msgid "&Goto..." msgstr "&Prejsť na..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + msgid "Op&en" msgstr "&Otvoriť" @@ -3367,6 +3373,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "Ch&oď na riadok %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + msgid "Disabled" msgstr "Zakázané" diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po index f22bdc211..a020ef054 100644 --- a/Translations/WinMerge/Slovenian.po +++ b/Translations/WinMerge/Slovenian.po @@ -73,6 +73,12 @@ msgstr "&Prilepi" msgid "&Goto..." msgstr "Pojdi &na..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + #, c-format msgid "Op&en" msgstr "&Odpri" @@ -4035,6 +4041,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "Pojdi &na vrstico %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + #, c-format msgid "Disabled" msgstr "Onemogočeno" diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po index ce2547d28..e72fcbf34 100644 --- a/Translations/WinMerge/Spanish.po +++ b/Translations/WinMerge/Spanish.po @@ -63,6 +63,12 @@ msgstr "&Pegar" msgid "&Goto..." msgstr "Ir &a..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + msgid "Op&en" msgstr "A&brir" @@ -3343,6 +3349,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "Ir a &línea %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + msgid "Disabled" msgstr "Deshabilitado" diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po index 524a2c27d..cea1e50fd 100644 --- a/Translations/WinMerge/Swedish.po +++ b/Translations/WinMerge/Swedish.po @@ -74,6 +74,12 @@ msgstr "Klistra in" msgid "&Goto..." msgstr "Gå till ..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + #, c-format msgid "Op&en" msgstr "Öppna" @@ -4000,6 +4006,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "Gå till rad %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + #, c-format msgid "Disabled" msgstr "Förhindrad" diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po index 254f7bb6f..17c16046d 100644 --- a/Translations/WinMerge/Turkish.po +++ b/Translations/WinMerge/Turkish.po @@ -59,6 +59,12 @@ msgstr "Ya&pıştır" msgid "&Goto..." msgstr "&Git..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + msgid "Op&en" msgstr "&Aç" @@ -3338,6 +3344,9 @@ msgstr "" msgid "G&oto Line %1" msgstr "%1. &Satıra Git" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + msgid "Disabled" msgstr "Etkisizleştirildi" diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po index 6bdae9277..0c058c2bd 100644 --- a/Translations/WinMerge/Ukrainian.po +++ b/Translations/WinMerge/Ukrainian.po @@ -73,6 +73,12 @@ msgstr "&Вставити" msgid "&Goto..." msgstr "Перейти до рядка..." +msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G" +msgstr "" + +msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G" +msgstr "" + #, c-format msgid "Op&en" msgstr "&Відкрити" @@ -3921,6 +3927,9 @@ msgstr "<Автоматично>" msgid "G&oto Line %1" msgstr "Перейти до &рядка %1" +msgid "Go to Moved Line\tCtrl+Shift+G" +msgstr "" + #, c-format msgid "Disabled" msgstr "Вимкнутий" -- 2.11.0