Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Press 1-3 to copy current diff line to clipbd while popup menu is open #2532

Merged
merged 2 commits into from
Nov 10, 2024
Merged

Press 1-3 to copy current diff line to clipbd while popup menu is open #2532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf0beec
Press 1-3 to copy current diff line to clipboard while popup menu is …
lededev Nov 10, 2024
49f0f2b
remove extra &
lededev Nov 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Src/Merge.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ 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_1ST
MENUITEM "Copy Selected Diff (Right) to Clipboard\tCtrl+2", ID_SEL_DIFF_COPY_2ND
MENUITEM "Copy Selected Diff (Middle) to Clipboard\tCtrl+2", ID_SEL_DIFF_COPY_2ND_3WAY
MENUITEM "Copy Selected Diff (Right) to Clipboard\tCtrl+3", ID_SEL_DIFF_COPY_3RD
MENUITEM "Copy Selected Diff (Left) to Clipboard\tCtrl+&1", ID_SEL_DIFF_COPY_1ST
MENUITEM "Copy Selected Diff (Right) to Clipboard\tCtrl+&2", ID_SEL_DIFF_COPY_2ND
MENUITEM "Copy Selected Diff (Middle) to Clipboard\tCtrl+&2", ID_SEL_DIFF_COPY_2ND_3WAY
MENUITEM "Copy Selected Diff (Right) to Clipboard\tCtrl+&3", ID_SEL_DIFF_COPY_3RD
MENUITEM SEPARATOR
MENUITEM "Select Line &Difference\tF4", ID_SELECTLINEDIFF
MENUITEM "Add this change to Substitution &Filters", ID_ADD_TO_IGNORED_SUBSTITUTIONS
Expand Down
8 changes: 4 additions & 4 deletions Translations/WinMerge/Arabic.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,16 @@ 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 (Right) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&2"
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/Basque.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,16 @@ 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 (Right) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&2"
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
16 changes: 8 additions & 8 deletions Translations/WinMerge/Brazilian.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,17 @@ 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"
msgstr "Copiar as Diferenças Selecionadas (da Esquerda) para a Área de Transferência\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 (Right) to Clipboard\tCtrl+2"
msgstr "Copiar as Diferenças Selecionadas (da Direita) para a Área de Transferência\tCtrl+2"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&2"
msgstr "Copiar as Diferenças Selecionadas (da Direita) para a Área de Transferência\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 (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"
msgstr "Copiar as Diferenças Selecionadas (da Direita) para a Área de Transferência\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"
msgstr "Selecionar a &Diferença da Linha\tF4"
Expand Down
8 changes: 4 additions & 4 deletions Translations/WinMerge/Bulgarian.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,16 @@ 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 (Right) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&2"
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/Catalan.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,16 @@ 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 (Right) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&2"
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
18 changes: 9 additions & 9 deletions Translations/WinMerge/ChineseSimplified.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,17 @@ msgstr "复制选中行到左侧"
msgid "Copy Selected Line(s) from Left"
msgstr "从左侧复制选中行"

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

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

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

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

msgid "Select Line &Difference\tF4"
msgstr "选中行内差异(&D)\tF4"
Expand Down Expand Up @@ -753,7 +753,7 @@ msgid "View &Margins"
msgstr "显示页边距(&M)"

msgid "View To&p Margins"
msgstr "查看上页边距(&P)"
msgstr "显示列标尺(&P)"

msgid "W&rap Lines"
msgstr "自动换行(&R)"
Expand Down
8 changes: 4 additions & 4 deletions Translations/WinMerge/ChineseTraditional.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,16 @@ 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 (Right) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&2"
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
16 changes: 8 additions & 8 deletions Translations/WinMerge/Corsican.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,17 @@ 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"
msgstr "Cupià a sfarenza selezziunata (manca) in u preme’papei\tCtrl+1"
msgid "Copy Selected Diff (Left) to Clipboard\tCtrl+&1"
msgstr "Cupià a sfarenza selezziunata (manca) in u preme’papei\tCtrl+&1"

msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+2"
msgstr "Cupià a sfarenza selezziunata (diritta) in u preme’papei\tCtrl+2"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&2"
msgstr "Cupià a sfarenza selezziunata (diritta) in u preme’papei\tCtrl+&2"

msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr "Cupià a sfarenza selezziunata (centru) in u preme’papei\tCtrl+2"
msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+&2"
msgstr "Cupià a sfarenza selezziunata (centru) in u preme’papei\tCtrl+&2"

msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr "Cupià a sfarenza selezziunata (diritta) in u preme’papei\tCtrl+3"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr "Cupià a sfarenza selezziunata (diritta) in u preme’papei\tCtrl+&3"

msgid "Select Line &Difference\tF4"
msgstr "&Selezziunà a sfarenza di linea\tF4"
Expand Down
8 changes: 4 additions & 4 deletions Translations/WinMerge/Croatian.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,16 @@ 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 (Right) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&2"
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
8 changes: 4 additions & 4 deletions Translations/WinMerge/Czech.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,16 @@ 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 (Right) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&2"
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
8 changes: 4 additions & 4 deletions Translations/WinMerge/Danish.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,16 @@ 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 (Right) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&2"
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
16 changes: 8 additions & 8 deletions Translations/WinMerge/Dutch.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,17 @@ 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"
msgstr "Geselecteerd verschil (links) naar klembord kopiëren\tCtrl+1"
msgid "Copy Selected Diff (Left) to Clipboard\tCtrl+&1"
msgstr "Geselecteerd verschil (links) naar klembord kopiëren\tCtrl+&1"

msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+2"
msgstr "Geselecteerd verschil (rechts) naar klembord kopiëren\tCtrl+2"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&2"
msgstr "Geselecteerd verschil (rechts) naar klembord kopiëren\tCtrl+&2"

msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+2"
msgstr "Geselecteerd verschil (midden) naar klembord kopiëren\tCtrl+2"
msgid "Copy Selected Diff (Middle) to Clipboard\tCtrl+&2"
msgstr "Geselecteerd verschil (midden) naar klembord kopiëren\tCtrl+&2"

msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+3"
msgstr "Geselecteerd verschil (rechts) naar klembord kopiëren\tCtrl+3"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&3"
msgstr "Geselecteerd verschil (rechts) naar klembord kopiëren\tCtrl+&3"

msgid "Select Line &Difference\tF4"
msgstr "Regelverschil selecteren\tF4"
Expand Down
8 changes: 4 additions & 4 deletions Translations/WinMerge/English.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,16 @@ 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 (Right) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&2"
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/Finnish.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,16 @@ 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 (Right) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&2"
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
16 changes: 8 additions & 8 deletions Translations/WinMerge/French.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,17 @@ 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 (Right) to Clipboard\tCtrl+2"
msgstr "Copier la différence sélectionnée (Droite) dans le presse-papiers\tCtrl+2"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&2"
msgstr "Copier la différence sélectionnée (Droite) 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 (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
8 changes: 4 additions & 4 deletions Translations/WinMerge/Galician.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,16 @@ 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 (Right) to Clipboard\tCtrl+2"
msgid "Copy Selected Diff (Right) to Clipboard\tCtrl+&2"
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
Loading
Loading