Skip to content

Commit

Permalink
Add Copy Selected Difference to Clipboard (#2429) (3). Resolve duplic…
Browse files Browse the repository at this point in the history
…ate menu accelerators
  • Loading branch information
sdottaka committed Sep 28, 2024
1 parent 3580866 commit ed7c4f4
Show file tree
Hide file tree
Showing 39 changed files with 127 additions and 127 deletions.
6 changes: 3 additions & 3 deletions Src/Merge.rc
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@ BEGIN
MENUITEM "Copy Selected Line(s) from Middle", ID_COPY_LINES_FROM_MIDDLE_R
MENUITEM "Copy Selected Line(s) from Left", ID_COPY_LINES_FROM_LEFT_R
MENUITEM SEPARATOR
MENUITEM "&Copy Selected Diff (Left) to Clipboard\tCtrl+1", ID_SEL_DIFF_COPY_L
MENUITEM "&Copy Selected Diff (Middle) to Clipboard\tCtrl+2", ID_SEL_DIFF_COPY_M
MENUITEM "&Copy Selected Diff (Right) to Clipboard\tCtrl+3", ID_SEL_DIFF_COPY_R
MENUITEM "Copy Selected Diff (Left) to Clipboard\tCtrl+1", ID_SEL_DIFF_COPY_L
MENUITEM "Copy Selected Diff (Middle) to Clipboard\tCtrl+2", ID_SEL_DIFF_COPY_M
MENUITEM "Copy Selected Diff (Right) to Clipboard\tCtrl+3", ID_SEL_DIFF_COPY_R
MENUITEM SEPARATOR
MENUITEM "Select Line &Difference\tF4", ID_SELECTLINEDIFF
MENUITEM "Add this change to Substitution &Filters", ID_ADD_TO_IGNORED_SUBSTITUTIONS
Expand Down
6 changes: 3 additions & 3 deletions Translations/WinMerge/Arabic.po
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ msgstr ""
msgid "Copy Selected Line(s) from Left"
msgstr ""

msgid "&Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgid "Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr ""

msgid "&Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr ""

msgid "&Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr ""

msgid "Select Line &Difference\tF4"
Expand Down
6 changes: 3 additions & 3 deletions Translations/WinMerge/Basque.po
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ msgstr ""
msgid "Copy Selected Line(s) from Left"
msgstr ""

msgid "&Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgid "Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr ""

msgid "&Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr ""

msgid "&Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr ""

#, c-format
Expand Down
6 changes: 3 additions & 3 deletions Translations/WinMerge/Brazilian.po
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ msgstr "Copiar a(s) linha(s) selecionada(s) pra esquerda"
msgid "Copy Selected Line(s) from Left"
msgstr "Copiar a(s) linha(s) selecionada(s) da esquerda"

msgid "&Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgid "Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr "Copiar as Diferenças Selecionadas (da Esquerda) para a Área de Transferência\tCtrl+1"

msgid "&Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr "Copiar as Diferenças Selecionadas (do Meio) para a Área de Transferência\tCtrl+2"

msgid "&Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr "Copiar as Diferenças Selecionadas (da Direita) para a Área de Transferência\tCtrl+3"

msgid "Select Line &Difference\tF4"
Expand Down
6 changes: 3 additions & 3 deletions Translations/WinMerge/Bulgarian.po
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ msgstr "Копиране избраните редове вляво"
msgid "Copy Selected Line(s) from Left"
msgstr "Копиране избраните редове от ляво"

msgid "&Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgid "Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr ""

msgid "&Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr ""

msgid "&Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr ""

msgid "Select Line &Difference\tF4"
Expand Down
6 changes: 3 additions & 3 deletions Translations/WinMerge/Catalan.po
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ msgstr "Copia les línies seleccionades a l'esquerra"
msgid "Copy Selected Line(s) from Left"
msgstr "Copia les línies seleccionades de l'esquerra"

msgid "&Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgid "Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr ""

msgid "&Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr ""

msgid "&Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr ""

#, c-format
Expand Down
6 changes: 3 additions & 3 deletions Translations/WinMerge/ChineseSimplified.po
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ msgstr "复制选中行到左侧"
msgid "Copy Selected Line(s) from Left"
msgstr "从左侧复制选中行"

msgid "&Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgid "Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr "复制选中差异(左)到剪贴板\tCtrl+1"

msgid "&Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr "复制选中差异(中)到剪贴板\tCtrl+2"

msgid "&Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr "复制选中差异(右)到剪贴板\tCtrl+3"

msgid "Select Line &Difference\tF4"
Expand Down
6 changes: 3 additions & 3 deletions Translations/WinMerge/ChineseTraditional.po
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ msgstr "將所選行複製到左側"
msgid "Copy Selected Line(s) from Left"
msgstr "從左側複製所選行"

msgid "&Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgid "Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr ""

msgid "&Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr ""

msgid "&Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr ""

#, c-format
Expand Down
6 changes: 3 additions & 3 deletions Translations/WinMerge/Corsican.po
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ msgstr "Cupià a(e) linea(e) selezziunata(e) versu a manca"
msgid "Copy Selected Line(s) from Left"
msgstr "Cupià a(e) linea(e) selezziunata(e) da a manca"

msgid "&Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgid "Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr ""

msgid "&Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr ""

msgid "&Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr ""

msgid "Select Line &Difference\tF4"
Expand Down
6 changes: 3 additions & 3 deletions Translations/WinMerge/Croatian.po
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ msgstr ""
msgid "Copy Selected Line(s) from Left"
msgstr ""

msgid "&Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgid "Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr ""

msgid "&Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr ""

msgid "&Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr ""

#, c-format
Expand Down
6 changes: 3 additions & 3 deletions Translations/WinMerge/Czech.po
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ msgstr ""
msgid "Copy Selected Line(s) from Left"
msgstr ""

msgid "&Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgid "Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr ""

msgid "&Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr ""

msgid "&Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr ""

#, c-format
Expand Down
6 changes: 3 additions & 3 deletions Translations/WinMerge/Danish.po
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ msgstr ""
msgid "Copy Selected Line(s) from Left"
msgstr ""

msgid "&Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgid "Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr ""

msgid "&Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr ""

msgid "&Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr ""

#, c-format
Expand Down
6 changes: 3 additions & 3 deletions Translations/WinMerge/Dutch.po
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ msgstr "Geselecteerde regel(s) naar links kopiëren"
msgid "Copy Selected Line(s) from Left"
msgstr "Geselecteerde regel(s) van links kopiëren"

msgid "&Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgid "Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr ""

msgid "&Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr ""

msgid "&Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr ""

msgid "Select Line &Difference\tF4"
Expand Down
8 changes: 4 additions & 4 deletions Translations/WinMerge/English.pot
Original file line number Diff line number Diff line change
Expand Up @@ -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-28 16:54+0000\n"
"POT-Creation-Date: 2024-09-29 07:18+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
Expand Down Expand Up @@ -56,13 +56,13 @@ msgstr ""
msgid "Copy Selected Line(s) from Left"
msgstr ""

msgid "&Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgid "Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr ""

msgid "&Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr ""

msgid "&Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr ""

msgid "Select Line &Difference\tF4"
Expand Down
6 changes: 3 additions & 3 deletions Translations/WinMerge/Finnish.po
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ msgstr "Kopioi valittu(t) rivi(t) vasemmalle"
msgid "Copy Selected Line(s) from Left"
msgstr "Kopioi valittu(t) rivi(t) vasemmalta"

msgid "&Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgid "Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr ""

msgid "&Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr ""

msgid "&Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr ""

msgid "Select Line &Difference\tF4"
Expand Down
12 changes: 6 additions & 6 deletions Translations/WinMerge/French.po
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@ msgstr "Copier les lignes sélectionnées vers la Gauche"
msgid "Copy Selected Line(s) from Left"
msgstr "Copier les lignes sélectionnées depuis la Gauche"

msgid "&Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr "&Copier la différence sélectionnée (Gauche) dans le presse-papiers\tCtrl+1"
msgid "Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr "Copier la différence sélectionnée (Gauche) dans le presse-papiers\tCtrl+1"

msgid "&Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr "&Copier la différence sélectionnée (Milieu) dans le presse-papiers\tCtrl+2"
msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr "Copier la différence sélectionnée (Milieu) dans le presse-papiers\tCtrl+2"

msgid "&Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr "&Copier la différence sélectionnée (Droite) dans le presse-papiers\tCtrl+3"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr "Copier la différence sélectionnée (Droite) dans le presse-papiers\tCtrl+3"

#, c-format
msgid "Select Line &Difference\tF4"
Expand Down
6 changes: 3 additions & 3 deletions Translations/WinMerge/Galician.po
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ msgstr "Copiar liñas(s) seleccionada(s) no esquerdo"
msgid "Copy Selected Line(s) from Left"
msgstr "Copiar liña(s) seleccionada(s) desde o esquerdo"

msgid "&Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgid "Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr ""

msgid "&Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr ""

msgid "&Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr ""

msgid "Select Line &Difference\tF4"
Expand Down
6 changes: 3 additions & 3 deletions Translations/WinMerge/German.po
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ msgstr "Ausgewählte Zeile(n) nach links kopieren"
msgid "Copy Selected Line(s) from Left"
msgstr "Ausgewählte Zeile(n) von links kopieren"

msgid "&Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgid "Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr ""

msgid "&Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr ""

msgid "&Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr ""

#, c-format
Expand Down
6 changes: 3 additions & 3 deletions Translations/WinMerge/Greek.po
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ msgstr ""
msgid "Copy Selected Line(s) from Left"
msgstr ""

msgid "&Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgid "Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr ""

msgid "&Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr ""

msgid "&Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr ""

#, c-format
Expand Down
6 changes: 3 additions & 3 deletions Translations/WinMerge/Hungarian.po
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ msgstr "A kijelölt sor(ok) balra másolása"
msgid "Copy Selected Line(s) from Left"
msgstr "A kijelölt sor(ok) másolása balról"

msgid "&Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgid "Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr "A kijelölt különbség (bal) vágólapra &másolása"

msgid "&Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr "A kijelölt különbség (középső) vágólapra &másolása"

msgid "&Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr "A kijelölt különbség (jobb) vágólapra &másolása"

#, c-format
Expand Down
12 changes: 6 additions & 6 deletions Translations/WinMerge/Italian.po
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ msgstr "Copia a sinistra le righe selezionate"
msgid "Copy Selected Line(s) from Left"
msgstr "Copia le righe selezionate da sinistra"

msgid "&Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr "&Copia negli appunti differenze selezionate (sinistra)\tCtrl+1"
msgid "Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr "Copia negli appunti differenze selezionate (sinistra)\tCtrl+1"

msgid "&Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr "&Copia negli appunti differenze selezionate (al centro)\tCtrl+2"
msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr "Copia negli appunti differenze selezionate (al centro)\tCtrl+2"

msgid "&Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr "&Copia negli appunti differenze selezionate (destra)\tCtrl+3"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr "Copia negli appunti differenze selezionate (destra)\tCtrl+3"

msgid "Select Line &Difference\tF4"
msgstr "Seleziona &differenze di riga\tF4"
Expand Down
12 changes: 6 additions & 6 deletions Translations/WinMerge/Japanese.po
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@ msgstr "選択した行を左側にコピー"
msgid "Copy Selected Line(s) from Left"
msgstr "選択した行を左側からコピー"

msgid "&Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr "選択した差異(左側)をクリップボードへコピー(&C)\tCtrl+1"
msgid "Copy Selected Diff (Left) to Clipboard\tCtrl+1"
msgstr "選択した差異(左側)をクリップボードへコピー\tCtrl+1"

msgid "&Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr "選択した差異(中央)をクリップボードへコピー(&C)\tCtrl+2"
msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr "選択した差異(中央)をクリップボードへコピー\tCtrl+2"

msgid "&Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr "選択した差異(右側)をクリップボードへコピー(&C)\tCtrl+3"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr "選択した差異(右側)をクリップボードへコピー\tCtrl+3"

msgid "Select Line &Difference\tF4"
msgstr "行内差異を選択(&D)\tF4"
Expand Down
Loading

0 comments on commit ed7c4f4

Please sign in to comment.