• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Révision29450 (tree)
l'heure2022-09-22 14:41:20
Auteurstefankueng

Message de Log

update translations from transifex

Change Summary

Modification

--- trunk/Languages/cs/TortoiseDoc.po (revision 29449)
+++ trunk/Languages/cs/TortoiseDoc.po (revision 29450)
@@ -19,8 +19,8 @@
1919 "Project-Id-Version: TortoiseSVN\n"
2020 "Report-Msgid-Bugs-To: \n"
2121 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
22-"PO-Revision-Date: 2021-08-28 09:24+0000\n"
23-"Last-Translator: Transifex Bot <>\n"
22+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
23+"Last-Translator: Lübbe Onken <luebbe.opensource@gmail.com>, 2011\n"
2424 "Language-Team: Czech (http://www.transifex.com/luebbe/tortoisesvn/language/cs/)\n"
2525 "MIME-Version: 1.0\n"
2626 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15247,6 +15247,23 @@
1524715247
1524815248 #. (para)
1524915249 msgid ""
15250+"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15251+" is set to 0 (see above)."
15252+msgstr "Toto nemá žádný vliv, pokud je možnost <literal>GroupTaskbarIconsPerRepo</literal> nastavena na 0 (viz výše)."
15253+
15254+#. (title)
15255+msgid "Taskbar grouping with repository color overlays"
15256+msgstr "Seskupení v hlavním panelu s překryvnými barvami úložiště"
15257+
15258+#. (para)
15259+msgid ""
15260+"If this option is set to <literal>true</literal>, then every icon on the "
15261+"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15262+"repository the dialogs/windows are used for. <placeholder-1/>"
15263+msgstr "Pokud je tato možnost nastavena na <literal>true</literal>, pak každá ikona na hlavním panelu Win7 bude zobrazena s malým překryvným barevným obdélníkem, označující úložiště, pro které jsou dialogová okna/okna použita. <placeholder-1/>"
15264+
15265+#. (para)
15266+msgid ""
1525015267 "If this is set to <literal>false</literal>, then every "
1525115268 "<literal>svn:externals</literal> is shown during an update separately."
1525215269 msgstr "Pokud je toto nastaveno na <literal>false</literal>, pak každé <literal>svn:externals</literal> je při aktualizaci zobrazeno odděleně."
@@ -15261,23 +15278,13 @@
1526115278
1526215279 #. (para)
1526315280 msgid ""
15264-"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15265-" is set to 0 (see above)."
15266-msgstr "Toto nemá žádný vliv, pokud je možnost <literal>GroupTaskbarIconsPerRepo</literal> nastavena na 0 (viz výše)."
15281+"If this is set to <literal>true</literal>, then cancelling the dialog to "
15282+"approve a hook script to run will show an error dialog indicating the user "
15283+"cancelled."
15284+msgstr ""
1526715285
15268-#. (title)
15269-msgid "Taskbar grouping with repository color overlays"
15270-msgstr "Seskupení v hlavním panelu s překryvnými barvami úložiště"
15271-
1527215286 #. (para)
1527315287 msgid ""
15274-"If this option is set to <literal>true</literal>, then every icon on the "
15275-"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15276-"repository the dialogs/windows are used for. <placeholder-1/>"
15277-msgstr "Pokud je tato možnost nastavena na <literal>true</literal>, pak každá ikona na hlavním panelu Win7 bude zobrazena s malým překryvným barevným obdélníkem, označující úložiště, pro které jsou dialogová okna/okna použita. <placeholder-1/>"
15278-
15279-#. (para)
15280-msgid ""
1528115288 "By default, TortoiseSVN always runs an update with externals included. This "
1528215289 "avoids problems with inconsistent working copies. If you have however a lot "
1528315290 "of externals set, an update can take quite a while. Set this value to "
@@ -21404,6 +21411,10 @@
2140421411 msgid "List of keyboard shortcuts and commands."
2140521412 msgstr "Seznam klávesových zkratek a příkazů."
2140621413
21414+#. (title)
21415+msgid "General Keyboard Shortcuts"
21416+msgstr ""
21417+
2140721418 #. (term)
2140821419 msgid "Ctrl-Q, Ctrl-W, Escape"
2140921420 msgstr "Ctrl-Q, Ctrl-W, Escape"
@@ -21489,30 +21500,6 @@
2148921500 msgstr "Přejít na předchozí rozdíl"
2149021501
2149121502 #. (term)
21492-msgid "F8"
21493-msgstr "F8"
21494-
21495-#. (para)
21496-msgid "Go to next conflict"
21497-msgstr "Přejít na další konflikt"
21498-
21499-#. (term)
21500-msgid "Shift-F8"
21501-msgstr "Shift-F8"
21502-
21503-#. (para)
21504-msgid "Go to previous conflict"
21505-msgstr "Přejít na předchozí konflikt"
21506-
21507-#. (term)
21508-msgid "Ctrl-D"
21509-msgstr "Ctrl-D"
21510-
21511-#. (para)
21512-msgid "Toggle between one-pane diff and two-pane diff"
21513-msgstr "Přepínat mezi jedno panelovým a dvou panelovým porovnáním"
21514-
21515-#. (term)
2151621503 msgid "Ctrl-R"
2151721504 msgstr "Ctrl-R"
2151821505
@@ -21557,14 +21544,6 @@
2155721544 msgstr "Vybrat všechen text"
2155821545
2155921546 #. (term)
21560-msgid "Ctrl-U"
21561-msgstr "Ctrl-U"
21562-
21563-#. (para)
21564-msgid "Switches views"
21565-msgstr "Přepnout zobrazení"
21566-
21567-#. (term)
2156821547 msgid "Ctrl-mousewheel"
2156921548 msgstr "Ctrl-kolečko myši"
2157021549
@@ -21581,14 +21560,93 @@
2158121560 msgstr "Přepínání mezi levým/pravým/spodním zobrazením"
2158221561
2158321562 #. (term)
21563+#. (term)
2158421564 msgid "Ctrl-M"
2158521565 msgstr ""
2158621566
2158721567 #. (para)
21568+#. (para)
2158821569 msgid "Toggles between marking the selected change"
2158921570 msgstr ""
2159021571
2159121572 #. (title)
21573+msgid "Diff-Mode Keyboard Shortcuts"
21574+msgstr ""
21575+
21576+#. (term)
21577+msgid "Ctrl-D"
21578+msgstr "Ctrl-D"
21579+
21580+#. (para)
21581+msgid "Toggle between one-pane diff and two-pane diff"
21582+msgstr "Přepínat mezi jedno panelovým a dvou panelovým porovnáním"
21583+
21584+#. (term)
21585+msgid "Ctrl-U"
21586+msgstr "Ctrl-U"
21587+
21588+#. (para)
21589+msgid "Switches views"
21590+msgstr "Přepnout zobrazení"
21591+
21592+#. (term)
21593+msgid "F12"
21594+msgstr ""
21595+
21596+#. (para)
21597+#. (para)
21598+msgid "Use left block"
21599+msgstr "Použít blok vlevo"
21600+
21601+#. (title)
21602+msgid "Conflict Resolution Mode Keyboard Shortcuts"
21603+msgstr ""
21604+
21605+#. (term)
21606+msgid "F8"
21607+msgstr "F8"
21608+
21609+#. (para)
21610+msgid "Go to next conflict"
21611+msgstr "Přejít na další konflikt"
21612+
21613+#. (term)
21614+msgid "Shift-F8"
21615+msgstr "Shift-F8"
21616+
21617+#. (para)
21618+msgid "Go to previous conflict"
21619+msgstr "Přejít na předchozí konflikt"
21620+
21621+#. (term)
21622+msgid "Ctrl-F9"
21623+msgstr ""
21624+
21625+#. (term)
21626+msgid "Ctrl-Shift-F9"
21627+msgstr ""
21628+
21629+#. (para)
21630+msgid "Use left block then right block"
21631+msgstr ""
21632+
21633+#. (term)
21634+msgid "Ctrl-F10"
21635+msgstr ""
21636+
21637+#. (para)
21638+msgid "Use right block"
21639+msgstr "Použít blok vpravo"
21640+
21641+#. (term)
21642+msgid "Ctrl-Shift-F10"
21643+msgstr ""
21644+
21645+#. (para)
21646+msgid "Use right block then left block"
21647+msgstr ""
21648+
21649+#. (title)
2159221650 msgid "Automating TortoiseMerge"
2159321651 msgstr "Automatizace TortoiseMerge"
2159421652
--- trunk/Languages/de/TortoiseDoc.po (revision 29449)
+++ trunk/Languages/de/TortoiseDoc.po (revision 29450)
@@ -33,7 +33,7 @@
3333 # r lvnt <michael.steinbrueck@airbus.com>, 2018
3434 # rs_bitbucket, 2017
3535 # rs_bitbucket, 2017
36-# Stefan Kueng <tortoisesvn@gmail.com>, 2011,2020-2021
36+# Stefan Kueng <tortoisesvn@gmail.com>, 2011,2020-2022
3737 # Thomas Franck <transifex@digitalchaos.de>, 2017
3838 # Wolf Peuker <wolfpeuker@gmail.com>, 2021
3939 msgid ""
@@ -41,8 +41,8 @@
4141 "Project-Id-Version: TortoiseSVN\n"
4242 "Report-Msgid-Bugs-To: \n"
4343 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
44-"PO-Revision-Date: 2021-12-21 19:02+0000\n"
45-"Last-Translator: Stefan Kueng <tortoisesvn@gmail.com>\n"
44+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
45+"Last-Translator: Stefan Kueng <tortoisesvn@gmail.com>, 2011,2020-2022\n"
4646 "Language-Team: German (http://www.transifex.com/luebbe/tortoisesvn/language/de/)\n"
4747 "MIME-Version: 1.0\n"
4848 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15269,6 +15269,23 @@
1526915269
1527015270 #. (para)
1527115271 msgid ""
15272+"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15273+" is set to 0 (see above)."
15274+msgstr "Dies hat keine Auswirkungen, wenn die Option <literal>GroupTaskbarIconsPerRepo</literal> auf null (siehe oben) gesetzt ist."
15275+
15276+#. (title)
15277+msgid "Taskbar grouping with repository color overlays"
15278+msgstr "Gruppierte Anwendungsleiste mit überlagerten Farben für die Projektarchive"
15279+
15280+#. (para)
15281+msgid ""
15282+"If this option is set to <literal>true</literal>, then every icon on the "
15283+"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15284+"repository the dialogs/windows are used for. <placeholder-1/>"
15285+msgstr "Wenn diese Option auf <literal>true</literal> gesetzt wird, erhält jedes Symbol in der Anwendungsleiste von Windows 7 ein kleines farbiges Rechteck, welches das zu den Fenstern bzw. Dialogen gehörende Projektarchiv anzeigt. <placeholder-1/>"
15286+
15287+#. (para)
15288+msgid ""
1527215289 "If this is set to <literal>false</literal>, then every "
1527315290 "<literal>svn:externals</literal> is shown during an update separately."
1527415291 msgstr "Wenn der Wert auf <literal>false</literal> gesetzt ist, wird jeder <literal>svn:externals</literal>-Verweis während einer Aktualisierung gesondert angezeigt."
@@ -15283,23 +15300,13 @@
1528315300
1528415301 #. (para)
1528515302 msgid ""
15286-"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15287-" is set to 0 (see above)."
15288-msgstr "Dies hat keine Auswirkungen, wenn die Option <literal>GroupTaskbarIconsPerRepo</literal> auf null (siehe oben) gesetzt ist."
15303+"If this is set to <literal>true</literal>, then cancelling the dialog to "
15304+"approve a hook script to run will show an error dialog indicating the user "
15305+"cancelled."
15306+msgstr "Wenn diese Einstellung auf <literal>true</literal> gesetzt wird, dann führt ein Abbrechen des Bestätigungsdialogs für die Ausführung eines Hook-Skripts zu einer Fehlermeldung welche sagt dass der Benutzer abgebrochen hat."
1528915307
15290-#. (title)
15291-msgid "Taskbar grouping with repository color overlays"
15292-msgstr "Gruppierte Anwendungsleiste mit überlagerten Farben für die Projektarchive"
15293-
1529415308 #. (para)
1529515309 msgid ""
15296-"If this option is set to <literal>true</literal>, then every icon on the "
15297-"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15298-"repository the dialogs/windows are used for. <placeholder-1/>"
15299-msgstr "Wenn diese Option auf <literal>true</literal> gesetzt wird, erhält jedes Symbol in der Anwendungsleiste von Windows 7 ein kleines farbiges Rechteck, welches das zu den Fenstern bzw. Dialogen gehörende Projektarchiv anzeigt. <placeholder-1/>"
15300-
15301-#. (para)
15302-msgid ""
1530315310 "By default, TortoiseSVN always runs an update with externals included. This "
1530415311 "avoids problems with inconsistent working copies. If you have however a lot "
1530515312 "of externals set, an update can take quite a while. Set this value to "
@@ -21426,6 +21433,10 @@
2142621433 msgid "List of keyboard shortcuts and commands."
2142721434 msgstr "Liste der Tastaturkürzel und Befehle."
2142821435
21436+#. (title)
21437+msgid "General Keyboard Shortcuts"
21438+msgstr "Allgemeine Tastaturkürzel"
21439+
2142921440 #. (term)
2143021441 msgid "Ctrl-Q, Ctrl-W, Escape"
2143121442 msgstr "Strg+Q, Strg+W, Escape"
@@ -21511,30 +21522,6 @@
2151121522 msgstr "Zum vorherigen Unterschied gehen"
2151221523
2151321524 #. (term)
21514-msgid "F8"
21515-msgstr "F8"
21516-
21517-#. (para)
21518-msgid "Go to next conflict"
21519-msgstr "Zum nächsten Konflikt gehen"
21520-
21521-#. (term)
21522-msgid "Shift-F8"
21523-msgstr "Umschalt+F8"
21524-
21525-#. (para)
21526-msgid "Go to previous conflict"
21527-msgstr "Zum vorherigen Konflikt gehen"
21528-
21529-#. (term)
21530-msgid "Ctrl-D"
21531-msgstr "Strg+D"
21532-
21533-#. (para)
21534-msgid "Toggle between one-pane diff and two-pane diff"
21535-msgstr "Zwischen Einfensteransicht und Zweifensteransicht wechseln"
21536-
21537-#. (term)
2153821525 msgid "Ctrl-R"
2153921526 msgstr "Strg+R"
2154021527
@@ -21579,14 +21566,6 @@
2157921566 msgstr "Gesamten Text auswählen"
2158021567
2158121568 #. (term)
21582-msgid "Ctrl-U"
21583-msgstr "Strg+U"
21584-
21585-#. (para)
21586-msgid "Switches views"
21587-msgstr "Ansichten umschalten"
21588-
21589-#. (term)
2159021569 msgid "Ctrl-mousewheel"
2159121570 msgstr "Strg+Mausrad"
2159221571
@@ -21603,14 +21582,93 @@
2160321582 msgstr "Zwischen linker/rechter/unterer Ansicht wechseln"
2160421583
2160521584 #. (term)
21585+#. (term)
2160621586 msgid "Ctrl-M"
2160721587 msgstr "Strg+M"
2160821588
2160921589 #. (para)
21590+#. (para)
2161021591 msgid "Toggles between marking the selected change"
2161121592 msgstr "Ausgewählte Änderung markieren/nicht markieren"
2161221593
2161321594 #. (title)
21595+msgid "Diff-Mode Keyboard Shortcuts"
21596+msgstr "Diff-Modus Tastaturkürzel"
21597+
21598+#. (term)
21599+msgid "Ctrl-D"
21600+msgstr "Strg+D"
21601+
21602+#. (para)
21603+msgid "Toggle between one-pane diff and two-pane diff"
21604+msgstr "Zwischen Einfensteransicht und Zweifensteransicht wechseln"
21605+
21606+#. (term)
21607+msgid "Ctrl-U"
21608+msgstr "Strg+U"
21609+
21610+#. (para)
21611+msgid "Switches views"
21612+msgstr "Ansichten umschalten"
21613+
21614+#. (term)
21615+msgid "F12"
21616+msgstr "F12"
21617+
21618+#. (para)
21619+#. (para)
21620+msgid "Use left block"
21621+msgstr "Verwende den linken Block"
21622+
21623+#. (title)
21624+msgid "Conflict Resolution Mode Keyboard Shortcuts"
21625+msgstr "Konfliktauflösungs-Modus Tastaturkürzel"
21626+
21627+#. (term)
21628+msgid "F8"
21629+msgstr "F8"
21630+
21631+#. (para)
21632+msgid "Go to next conflict"
21633+msgstr "Zum nächsten Konflikt gehen"
21634+
21635+#. (term)
21636+msgid "Shift-F8"
21637+msgstr "Umschalt+F8"
21638+
21639+#. (para)
21640+msgid "Go to previous conflict"
21641+msgstr "Zum vorherigen Konflikt gehen"
21642+
21643+#. (term)
21644+msgid "Ctrl-F9"
21645+msgstr "Strg-F9"
21646+
21647+#. (term)
21648+msgid "Ctrl-Shift-F9"
21649+msgstr "Strg-Shift-F9"
21650+
21651+#. (para)
21652+msgid "Use left block then right block"
21653+msgstr "Verwende linken vor rechtem Block"
21654+
21655+#. (term)
21656+msgid "Ctrl-F10"
21657+msgstr "Strg-F10"
21658+
21659+#. (para)
21660+msgid "Use right block"
21661+msgstr "Verwende den rechten Block"
21662+
21663+#. (term)
21664+msgid "Ctrl-Shift-F10"
21665+msgstr "Strg-Shift-F10"
21666+
21667+#. (para)
21668+msgid "Use right block then left block"
21669+msgstr "Verwende rechten vor linkem Block"
21670+
21671+#. (title)
2161421672 msgid "Automating TortoiseMerge"
2161521673 msgstr "TortoiseMerge automatisieren"
2161621674
--- trunk/Languages/es/TortoiseDoc.po (revision 29449)
+++ trunk/Languages/es/TortoiseDoc.po (revision 29450)
@@ -51,14 +51,14 @@
5151 "Project-Id-Version: TortoiseSVN\n"
5252 "Report-Msgid-Bugs-To: \n"
5353 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
54-"PO-Revision-Date: 2022-03-11 20:31+0000\n"
55-"Last-Translator: Lübbe Onken <luebbe.opensource@gmail.com>\n"
54+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
55+"Last-Translator: augusto wloch <augustowloch@gmail.com>, 2014,2016,2019,2021\n"
5656 "Language-Team: Spanish (http://www.transifex.com/luebbe/tortoisesvn/language/es/)\n"
5757 "MIME-Version: 1.0\n"
5858 "Content-Type: text/plain; charset=UTF-8\n"
5959 "Content-Transfer-Encoding: 8bit\n"
6060 "Language: es\n"
61-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
61+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
6262
6363 #. (title)
6464 #. (secondary)
@@ -15279,6 +15279,23 @@
1527915279
1528015280 #. (para)
1528115281 msgid ""
15282+"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15283+" is set to 0 (see above)."
15284+msgstr "Esto no tiene efecto si la opción <literal>GroupTaskbarIconsPerRepo</literal> se establece en 0 (ver arriba)."
15285+
15286+#. (title)
15287+msgid "Taskbar grouping with repository color overlays"
15288+msgstr "Agrupamiento de barra de tareas con superposición de colores de repositorio"
15289+
15290+#. (para)
15291+msgid ""
15292+"If this option is set to <literal>true</literal>, then every icon on the "
15293+"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15294+"repository the dialogs/windows are used for. <placeholder-1/>"
15295+msgstr ""
15296+
15297+#. (para)
15298+msgid ""
1528215299 "If this is set to <literal>false</literal>, then every "
1528315300 "<literal>svn:externals</literal> is shown during an update separately."
1528415301 msgstr ""
@@ -15293,19 +15310,9 @@
1529315310
1529415311 #. (para)
1529515312 msgid ""
15296-"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15297-" is set to 0 (see above)."
15298-msgstr "Esto no tiene efecto si la opción <literal>GroupTaskbarIconsPerRepo</literal> se establece en 0 (ver arriba)."
15299-
15300-#. (title)
15301-msgid "Taskbar grouping with repository color overlays"
15302-msgstr "Agrupamiento de barra de tareas con superposición de colores de repositorio"
15303-
15304-#. (para)
15305-msgid ""
15306-"If this option is set to <literal>true</literal>, then every icon on the "
15307-"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15308-"repository the dialogs/windows are used for. <placeholder-1/>"
15313+"If this is set to <literal>true</literal>, then cancelling the dialog to "
15314+"approve a hook script to run will show an error dialog indicating the user "
15315+"cancelled."
1530915316 msgstr ""
1531015317
1531115318 #. (para)
@@ -21436,6 +21443,10 @@
2143621443 msgid "List of keyboard shortcuts and commands."
2143721444 msgstr "Lista de atajos y comandos de teclado"
2143821445
21446+#. (title)
21447+msgid "General Keyboard Shortcuts"
21448+msgstr ""
21449+
2143921450 #. (term)
2144021451 msgid "Ctrl-Q, Ctrl-W, Escape"
2144121452 msgstr "Ctrl-Q, Ctrl-W, Escape"
@@ -21521,30 +21532,6 @@
2152121532 msgstr "Ir a la diferencia previa"
2152221533
2152321534 #. (term)
21524-msgid "F8"
21525-msgstr "F8"
21526-
21527-#. (para)
21528-msgid "Go to next conflict"
21529-msgstr "Ir al siguiente conflicto"
21530-
21531-#. (term)
21532-msgid "Shift-F8"
21533-msgstr "Mayús-F8"
21534-
21535-#. (para)
21536-msgid "Go to previous conflict"
21537-msgstr "Ir al conflicto previo"
21538-
21539-#. (term)
21540-msgid "Ctrl-D"
21541-msgstr "Ctrl-D"
21542-
21543-#. (para)
21544-msgid "Toggle between one-pane diff and two-pane diff"
21545-msgstr "Cambia entre la vista de un panel y la vista de dos paneles"
21546-
21547-#. (term)
2154821535 msgid "Ctrl-R"
2154921536 msgstr "Ctrl-R"
2155021537
@@ -21589,14 +21576,6 @@
2158921576 msgstr "Seleccionar todo el texto"
2159021577
2159121578 #. (term)
21592-msgid "Ctrl-U"
21593-msgstr "Ctrl-U"
21594-
21595-#. (para)
21596-msgid "Switches views"
21597-msgstr "Cambia las vistas"
21598-
21599-#. (term)
2160021579 msgid "Ctrl-mousewheel"
2160121580 msgstr "Ctrl-rueda del ratón"
2160221581
@@ -21613,14 +21592,93 @@
2161321592 msgstr ""
2161421593
2161521594 #. (term)
21595+#. (term)
2161621596 msgid "Ctrl-M"
2161721597 msgstr ""
2161821598
2161921599 #. (para)
21600+#. (para)
2162021601 msgid "Toggles between marking the selected change"
2162121602 msgstr ""
2162221603
2162321604 #. (title)
21605+msgid "Diff-Mode Keyboard Shortcuts"
21606+msgstr ""
21607+
21608+#. (term)
21609+msgid "Ctrl-D"
21610+msgstr "Ctrl-D"
21611+
21612+#. (para)
21613+msgid "Toggle between one-pane diff and two-pane diff"
21614+msgstr "Cambia entre la vista de un panel y la vista de dos paneles"
21615+
21616+#. (term)
21617+msgid "Ctrl-U"
21618+msgstr "Ctrl-U"
21619+
21620+#. (para)
21621+msgid "Switches views"
21622+msgstr "Cambia las vistas"
21623+
21624+#. (term)
21625+msgid "F12"
21626+msgstr ""
21627+
21628+#. (para)
21629+#. (para)
21630+msgid "Use left block"
21631+msgstr "Usar bloque izquierdo"
21632+
21633+#. (title)
21634+msgid "Conflict Resolution Mode Keyboard Shortcuts"
21635+msgstr ""
21636+
21637+#. (term)
21638+msgid "F8"
21639+msgstr "F8"
21640+
21641+#. (para)
21642+msgid "Go to next conflict"
21643+msgstr "Ir al siguiente conflicto"
21644+
21645+#. (term)
21646+msgid "Shift-F8"
21647+msgstr "Mayús-F8"
21648+
21649+#. (para)
21650+msgid "Go to previous conflict"
21651+msgstr "Ir al conflicto previo"
21652+
21653+#. (term)
21654+msgid "Ctrl-F9"
21655+msgstr ""
21656+
21657+#. (term)
21658+msgid "Ctrl-Shift-F9"
21659+msgstr ""
21660+
21661+#. (para)
21662+msgid "Use left block then right block"
21663+msgstr ""
21664+
21665+#. (term)
21666+msgid "Ctrl-F10"
21667+msgstr ""
21668+
21669+#. (para)
21670+msgid "Use right block"
21671+msgstr "Usar el bloque de la derecha"
21672+
21673+#. (term)
21674+msgid "Ctrl-Shift-F10"
21675+msgstr ""
21676+
21677+#. (para)
21678+msgid "Use right block then left block"
21679+msgstr ""
21680+
21681+#. (title)
2162421682 msgid "Automating TortoiseMerge"
2162521683 msgstr "Automatizando TortoiseMerge"
2162621684
--- trunk/Languages/fi/TortoiseDoc.po (revision 29449)
+++ trunk/Languages/fi/TortoiseDoc.po (revision 29450)
@@ -18,8 +18,8 @@
1818 "Project-Id-Version: TortoiseSVN\n"
1919 "Report-Msgid-Bugs-To: \n"
2020 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
21-"PO-Revision-Date: 2021-12-05 13:44+0000\n"
22-"Last-Translator: Kari Granö <kari.grano@gmail.com>\n"
21+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
22+"Last-Translator: Kari Granö <kari.grano@gmail.com>, 2011-2018,2020-2021\n"
2323 "Language-Team: Finnish (http://www.transifex.com/luebbe/tortoisesvn/language/fi/)\n"
2424 "MIME-Version: 1.0\n"
2525 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15246,6 +15246,23 @@
1524615246
1524715247 #. (para)
1524815248 msgid ""
15249+"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15250+" is set to 0 (see above)."
15251+msgstr "Tällä ei kuitenkaan ole merkitystä, mikäli valinnan <literal>GroupTaskbarIconsPerRepo</literal> arvona on 0 (ks. yllä)."
15252+
15253+#. (title)
15254+msgid "Taskbar grouping with repository color overlays"
15255+msgstr "Tehtäväpalkin ryhmittely arkistoväripäällyksillä"
15256+
15257+#. (para)
15258+msgid ""
15259+"If this option is set to <literal>true</literal>, then every icon on the "
15260+"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15261+"repository the dialogs/windows are used for. <placeholder-1/>"
15262+msgstr "Kun tämä valitsin on asetettu arvoon <literal>true</literal>, Windows 7 -ympäristön tehtäväpalkin kuvakkeisiin lisätään pieni värillinen päällys, joka kertoo, mihin arkistoon ikkunat liittyvät. <placeholder-1/>"
15263+
15264+#. (para)
15265+msgid ""
1524915266 "If this is set to <literal>false</literal>, then every "
1525015267 "<literal>svn:externals</literal> is shown during an update separately."
1525115268 msgstr "Mikäli arvona on <literal>false</literal>, jokainen <literal>svn:externals</literal> näytetään päivityksen aikana erikseen."
@@ -15260,23 +15277,13 @@
1526015277
1526115278 #. (para)
1526215279 msgid ""
15263-"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15264-" is set to 0 (see above)."
15265-msgstr "Tällä ei kuitenkaan ole merkitystä, mikäli valinnan <literal>GroupTaskbarIconsPerRepo</literal> arvona on 0 (ks. yllä)."
15280+"If this is set to <literal>true</literal>, then cancelling the dialog to "
15281+"approve a hook script to run will show an error dialog indicating the user "
15282+"cancelled."
15283+msgstr ""
1526615284
15267-#. (title)
15268-msgid "Taskbar grouping with repository color overlays"
15269-msgstr "Tehtäväpalkin ryhmittely arkistoväripäällyksillä"
15270-
1527115285 #. (para)
1527215286 msgid ""
15273-"If this option is set to <literal>true</literal>, then every icon on the "
15274-"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15275-"repository the dialogs/windows are used for. <placeholder-1/>"
15276-msgstr "Kun tämä valitsin on asetettu arvoon <literal>true</literal>, Windows 7 -ympäristön tehtäväpalkin kuvakkeisiin lisätään pieni värillinen päällys, joka kertoo, mihin arkistoon ikkunat liittyvät. <placeholder-1/>"
15277-
15278-#. (para)
15279-msgid ""
1528015287 "By default, TortoiseSVN always runs an update with externals included. This "
1528115288 "avoids problems with inconsistent working copies. If you have however a lot "
1528215289 "of externals set, an update can take quite a while. Set this value to "
@@ -21403,6 +21410,10 @@
2140321410 msgid "List of keyboard shortcuts and commands."
2140421411 msgstr "Luettelo pikanäppäimistä ja komennoista."
2140521412
21413+#. (title)
21414+msgid "General Keyboard Shortcuts"
21415+msgstr ""
21416+
2140621417 #. (term)
2140721418 msgid "Ctrl-Q, Ctrl-W, Escape"
2140821419 msgstr "Ctrl-Q, Ctrl-W, Escape"
@@ -21488,30 +21499,6 @@
2148821499 msgstr "Siirry edelliseen eroon"
2148921500
2149021501 #. (term)
21491-msgid "F8"
21492-msgstr "F8"
21493-
21494-#. (para)
21495-msgid "Go to next conflict"
21496-msgstr "Siirry seuraavaan ristiriitaan"
21497-
21498-#. (term)
21499-msgid "Shift-F8"
21500-msgstr "Shift-F8"
21501-
21502-#. (para)
21503-msgid "Go to previous conflict"
21504-msgstr "Siirry edelliseen ristiriitaan"
21505-
21506-#. (term)
21507-msgid "Ctrl-D"
21508-msgstr "Ctrl-D"
21509-
21510-#. (para)
21511-msgid "Toggle between one-pane diff and two-pane diff"
21512-msgstr "Vaihda yhden ja kahden paneelin vertailun välillä"
21513-
21514-#. (term)
2151521502 msgid "Ctrl-R"
2151621503 msgstr "Ctrl-R"
2151721504
@@ -21556,14 +21543,6 @@
2155621543 msgstr "Valitse kaikki"
2155721544
2155821545 #. (term)
21559-msgid "Ctrl-U"
21560-msgstr "Ctrl-U"
21561-
21562-#. (para)
21563-msgid "Switches views"
21564-msgstr "Vaihtaa näkymiä"
21565-
21566-#. (term)
2156721546 msgid "Ctrl-mousewheel"
2156821547 msgstr "Ctrl-rullahiiri"
2156921548
@@ -21580,14 +21559,93 @@
2158021559 msgstr "Vaihda oikean/vasemman/alanäkymän välillä"
2158121560
2158221561 #. (term)
21562+#. (term)
2158321563 msgid "Ctrl-M"
2158421564 msgstr "Ctrl-M"
2158521565
2158621566 #. (para)
21567+#. (para)
2158721568 msgid "Toggles between marking the selected change"
2158821569 msgstr "Vaihtaa muutoksen valinnan"
2158921570
2159021571 #. (title)
21572+msgid "Diff-Mode Keyboard Shortcuts"
21573+msgstr ""
21574+
21575+#. (term)
21576+msgid "Ctrl-D"
21577+msgstr "Ctrl-D"
21578+
21579+#. (para)
21580+msgid "Toggle between one-pane diff and two-pane diff"
21581+msgstr "Vaihda yhden ja kahden paneelin vertailun välillä"
21582+
21583+#. (term)
21584+msgid "Ctrl-U"
21585+msgstr "Ctrl-U"
21586+
21587+#. (para)
21588+msgid "Switches views"
21589+msgstr "Vaihtaa näkymiä"
21590+
21591+#. (term)
21592+msgid "F12"
21593+msgstr ""
21594+
21595+#. (para)
21596+#. (para)
21597+msgid "Use left block"
21598+msgstr "Käytä vasenta lohkoa"
21599+
21600+#. (title)
21601+msgid "Conflict Resolution Mode Keyboard Shortcuts"
21602+msgstr ""
21603+
21604+#. (term)
21605+msgid "F8"
21606+msgstr "F8"
21607+
21608+#. (para)
21609+msgid "Go to next conflict"
21610+msgstr "Siirry seuraavaan ristiriitaan"
21611+
21612+#. (term)
21613+msgid "Shift-F8"
21614+msgstr "Shift-F8"
21615+
21616+#. (para)
21617+msgid "Go to previous conflict"
21618+msgstr "Siirry edelliseen ristiriitaan"
21619+
21620+#. (term)
21621+msgid "Ctrl-F9"
21622+msgstr ""
21623+
21624+#. (term)
21625+msgid "Ctrl-Shift-F9"
21626+msgstr ""
21627+
21628+#. (para)
21629+msgid "Use left block then right block"
21630+msgstr ""
21631+
21632+#. (term)
21633+msgid "Ctrl-F10"
21634+msgstr ""
21635+
21636+#. (para)
21637+msgid "Use right block"
21638+msgstr "Käytä oikeaa lohkoa"
21639+
21640+#. (term)
21641+msgid "Ctrl-Shift-F10"
21642+msgstr ""
21643+
21644+#. (para)
21645+msgid "Use right block then left block"
21646+msgstr ""
21647+
21648+#. (title)
2159121649 msgid "Automating TortoiseMerge"
2159221650 msgstr "TortoiseMergen automatisointi"
2159321651
--- trunk/Languages/fr/TortoiseDoc.po (revision 29449)
+++ trunk/Languages/fr/TortoiseDoc.po (revision 29450)
@@ -57,14 +57,14 @@
5757 "Project-Id-Version: TortoiseSVN\n"
5858 "Report-Msgid-Bugs-To: \n"
5959 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
60-"PO-Revision-Date: 2022-03-11 20:31+0000\n"
61-"Last-Translator: Lübbe Onken <luebbe.opensource@gmail.com>\n"
60+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
61+"Last-Translator: Thomas Lemoine, 2019-2021\n"
6262 "Language-Team: French (http://www.transifex.com/luebbe/tortoisesvn/language/fr/)\n"
6363 "MIME-Version: 1.0\n"
6464 "Content-Type: text/plain; charset=UTF-8\n"
6565 "Content-Transfer-Encoding: 8bit\n"
6666 "Language: fr\n"
67-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
67+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
6868
6969 #. (title)
7070 #. (secondary)
@@ -15285,6 +15285,23 @@
1528515285
1528615286 #. (para)
1528715287 msgid ""
15288+"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15289+" is set to 0 (see above)."
15290+msgstr "Ceci n'a pas d'effet si l'option <literal>GroupTaskbarIconsPerRepo</literal> est définie à 0 (voir ci-dessus)."
15291+
15292+#. (title)
15293+msgid "Taskbar grouping with repository color overlays"
15294+msgstr ""
15295+
15296+#. (para)
15297+msgid ""
15298+"If this option is set to <literal>true</literal>, then every icon on the "
15299+"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15300+"repository the dialogs/windows are used for. <placeholder-1/>"
15301+msgstr "Si cette option est mise à <literal>true</literal>, alors chaque icône de la barre des tâches de Win7 affiche un petit rectangle coloré en surimpression, indiquant pour quel dépôt les boîtes de dialogue/fenêtres sont utilisées. <placeholder-1/>"
15302+
15303+#. (para)
15304+msgid ""
1528815305 "If this is set to <literal>false</literal>, then every "
1528915306 "<literal>svn:externals</literal> is shown during an update separately."
1529015307 msgstr ""
@@ -15299,23 +15316,13 @@
1529915316
1530015317 #. (para)
1530115318 msgid ""
15302-"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15303-" is set to 0 (see above)."
15304-msgstr "Ceci n'a pas d'effet si l'option <literal>GroupTaskbarIconsPerRepo</literal> est définie à 0 (voir ci-dessus)."
15305-
15306-#. (title)
15307-msgid "Taskbar grouping with repository color overlays"
15319+"If this is set to <literal>true</literal>, then cancelling the dialog to "
15320+"approve a hook script to run will show an error dialog indicating the user "
15321+"cancelled."
1530815322 msgstr ""
1530915323
1531015324 #. (para)
1531115325 msgid ""
15312-"If this option is set to <literal>true</literal>, then every icon on the "
15313-"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15314-"repository the dialogs/windows are used for. <placeholder-1/>"
15315-msgstr "Si cette option est mise à <literal>true</literal>, alors chaque icône de la barre des tâches de Win7 affiche un petit rectangle coloré en surimpression, indiquant pour quel dépôt les boîtes de dialogue/fenêtres sont utilisées. <placeholder-1/>"
15316-
15317-#. (para)
15318-msgid ""
1531915326 "By default, TortoiseSVN always runs an update with externals included. This "
1532015327 "avoids problems with inconsistent working copies. If you have however a lot "
1532115328 "of externals set, an update can take quite a while. Set this value to "
@@ -21442,6 +21449,10 @@
2144221449 msgid "List of keyboard shortcuts and commands."
2144321450 msgstr "Liste des raccourcis claviers et des commandes."
2144421451
21452+#. (title)
21453+msgid "General Keyboard Shortcuts"
21454+msgstr ""
21455+
2144521456 #. (term)
2144621457 msgid "Ctrl-Q, Ctrl-W, Escape"
2144721458 msgstr "Ctrl-Q, Ctrl-W, Echape"
@@ -21527,30 +21538,6 @@
2152721538 msgstr "Aller à la différence précédente"
2152821539
2152921540 #. (term)
21530-msgid "F8"
21531-msgstr "F8"
21532-
21533-#. (para)
21534-msgid "Go to next conflict"
21535-msgstr "Aller au prochain conflit"
21536-
21537-#. (term)
21538-msgid "Shift-F8"
21539-msgstr "Shift-F8"
21540-
21541-#. (para)
21542-msgid "Go to previous conflict"
21543-msgstr "Aller au conflit précédent"
21544-
21545-#. (term)
21546-msgid "Ctrl-D"
21547-msgstr "Ctrl-D"
21548-
21549-#. (para)
21550-msgid "Toggle between one-pane diff and two-pane diff"
21551-msgstr "Bascule entre la vue panneau unique et la vue panneau double"
21552-
21553-#. (term)
2155421541 msgid "Ctrl-R"
2155521542 msgstr "Ctrl-R"
2155621543
@@ -21595,14 +21582,6 @@
2159521582 msgstr "Sélectionner tout le texte"
2159621583
2159721584 #. (term)
21598-msgid "Ctrl-U"
21599-msgstr "Ctrl-U"
21600-
21601-#. (para)
21602-msgid "Switches views"
21603-msgstr "Basculer entre les vues"
21604-
21605-#. (term)
2160621585 msgid "Ctrl-mousewheel"
2160721586 msgstr "Ctrl-molette"
2160821587
@@ -21619,14 +21598,93 @@
2161921598 msgstr "Basculer entre les vues gauche / droite / bas"
2162021599
2162121600 #. (term)
21601+#. (term)
2162221602 msgid "Ctrl-M"
2162321603 msgstr ""
2162421604
2162521605 #. (para)
21606+#. (para)
2162621607 msgid "Toggles between marking the selected change"
2162721608 msgstr ""
2162821609
2162921610 #. (title)
21611+msgid "Diff-Mode Keyboard Shortcuts"
21612+msgstr ""
21613+
21614+#. (term)
21615+msgid "Ctrl-D"
21616+msgstr "Ctrl-D"
21617+
21618+#. (para)
21619+msgid "Toggle between one-pane diff and two-pane diff"
21620+msgstr "Bascule entre la vue panneau unique et la vue panneau double"
21621+
21622+#. (term)
21623+msgid "Ctrl-U"
21624+msgstr "Ctrl-U"
21625+
21626+#. (para)
21627+msgid "Switches views"
21628+msgstr "Basculer entre les vues"
21629+
21630+#. (term)
21631+msgid "F12"
21632+msgstr ""
21633+
21634+#. (para)
21635+#. (para)
21636+msgid "Use left block"
21637+msgstr "Utiliser le bloc de gauche"
21638+
21639+#. (title)
21640+msgid "Conflict Resolution Mode Keyboard Shortcuts"
21641+msgstr ""
21642+
21643+#. (term)
21644+msgid "F8"
21645+msgstr "F8"
21646+
21647+#. (para)
21648+msgid "Go to next conflict"
21649+msgstr "Aller au prochain conflit"
21650+
21651+#. (term)
21652+msgid "Shift-F8"
21653+msgstr "Shift-F8"
21654+
21655+#. (para)
21656+msgid "Go to previous conflict"
21657+msgstr "Aller au conflit précédent"
21658+
21659+#. (term)
21660+msgid "Ctrl-F9"
21661+msgstr ""
21662+
21663+#. (term)
21664+msgid "Ctrl-Shift-F9"
21665+msgstr ""
21666+
21667+#. (para)
21668+msgid "Use left block then right block"
21669+msgstr ""
21670+
21671+#. (term)
21672+msgid "Ctrl-F10"
21673+msgstr ""
21674+
21675+#. (para)
21676+msgid "Use right block"
21677+msgstr "Utiliser le bloc de droite"
21678+
21679+#. (term)
21680+msgid "Ctrl-Shift-F10"
21681+msgstr ""
21682+
21683+#. (para)
21684+msgid "Use right block then left block"
21685+msgstr ""
21686+
21687+#. (title)
2163021688 msgid "Automating TortoiseMerge"
2163121689 msgstr "Automatiser TortoiseMerge"
2163221690
--- trunk/Languages/it/TortoiseDoc.po (revision 29449)
+++ trunk/Languages/it/TortoiseDoc.po (revision 29450)
@@ -37,14 +37,14 @@
3737 "Project-Id-Version: TortoiseSVN\n"
3838 "Report-Msgid-Bugs-To: \n"
3939 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
40-"PO-Revision-Date: 2021-10-31 09:03+0000\n"
41-"Last-Translator: ROBERTO BORIOTTI <roberto.boriotti@canon.it>\n"
40+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
41+"Last-Translator: Silvia, 2013,2019\n"
4242 "Language-Team: Italian (http://www.transifex.com/luebbe/tortoisesvn/language/it/)\n"
4343 "MIME-Version: 1.0\n"
4444 "Content-Type: text/plain; charset=UTF-8\n"
4545 "Content-Transfer-Encoding: 8bit\n"
4646 "Language: it\n"
47-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
47+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
4848
4949 #. (title)
5050 #. (secondary)
@@ -15265,6 +15265,23 @@
1526515265
1526615266 #. (para)
1526715267 msgid ""
15268+"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15269+" is set to 0 (see above)."
15270+msgstr ""
15271+
15272+#. (title)
15273+msgid "Taskbar grouping with repository color overlays"
15274+msgstr ""
15275+
15276+#. (para)
15277+msgid ""
15278+"If this option is set to <literal>true</literal>, then every icon on the "
15279+"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15280+"repository the dialogs/windows are used for. <placeholder-1/>"
15281+msgstr ""
15282+
15283+#. (para)
15284+msgid ""
1526815285 "If this is set to <literal>false</literal>, then every "
1526915286 "<literal>svn:externals</literal> is shown during an update separately."
1527015287 msgstr ""
@@ -15279,23 +15296,13 @@
1527915296
1528015297 #. (para)
1528115298 msgid ""
15282-"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15283-" is set to 0 (see above)."
15299+"If this is set to <literal>true</literal>, then cancelling the dialog to "
15300+"approve a hook script to run will show an error dialog indicating the user "
15301+"cancelled."
1528415302 msgstr ""
1528515303
15286-#. (title)
15287-msgid "Taskbar grouping with repository color overlays"
15288-msgstr ""
15289-
1529015304 #. (para)
1529115305 msgid ""
15292-"If this option is set to <literal>true</literal>, then every icon on the "
15293-"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15294-"repository the dialogs/windows are used for. <placeholder-1/>"
15295-msgstr ""
15296-
15297-#. (para)
15298-msgid ""
1529915306 "By default, TortoiseSVN always runs an update with externals included. This "
1530015307 "avoids problems with inconsistent working copies. If you have however a lot "
1530115308 "of externals set, an update can take quite a while. Set this value to "
@@ -21422,6 +21429,10 @@
2142221429 msgid "List of keyboard shortcuts and commands."
2142321430 msgstr "Lista di scorciatoie da tastiera e comandi."
2142421431
21432+#. (title)
21433+msgid "General Keyboard Shortcuts"
21434+msgstr ""
21435+
2142521436 #. (term)
2142621437 msgid "Ctrl-Q, Ctrl-W, Escape"
2142721438 msgstr ""
@@ -21507,72 +21518,86 @@
2150721518 msgstr ""
2150821519
2150921520 #. (term)
21510-msgid "F8"
21521+msgid "Ctrl-R"
2151121522 msgstr ""
2151221523
2151321524 #. (para)
21514-msgid "Go to next conflict"
21515-msgstr "Passa a prossimo conflitto"
21525+msgid "Reload the files and revert all changes made"
21526+msgstr ""
2151621527
2151721528 #. (term)
21518-msgid "Shift-F8"
21529+msgid "Ctrl-T"
2151921530 msgstr ""
2152021531
2152121532 #. (para)
21522-msgid "Go to previous conflict"
21533+msgid "Toggles between showing whitespaces or not"
2152321534 msgstr ""
2152421535
2152521536 #. (term)
21526-msgid "Ctrl-D"
21537+msgid "Ctrl-L"
2152721538 msgstr ""
2152821539
2152921540 #. (para)
21530-msgid "Toggle between one-pane diff and two-pane diff"
21541+msgid "Toggles between collapsing unchanged sections or not"
2153121542 msgstr ""
2153221543
2153321544 #. (term)
21534-msgid "Ctrl-R"
21545+msgid "Ctrl-P"
2153521546 msgstr ""
2153621547
2153721548 #. (para)
21538-msgid "Reload the files and revert all changes made"
21549+msgid "Toggles between line wrapping"
2153921550 msgstr ""
2154021551
2154121552 #. (term)
21542-msgid "Ctrl-T"
21553+msgid "Ctrl-G"
2154321554 msgstr ""
2154421555
2154521556 #. (para)
21546-msgid "Toggles between showing whitespaces or not"
21547-msgstr ""
21557+msgid "Go to line"
21558+msgstr "Vai alla linea"
2154821559
21560+#. (para)
21561+msgid "Select all text"
21562+msgstr "Seleziona tutto il testo"
21563+
2154921564 #. (term)
21550-msgid "Ctrl-L"
21565+msgid "Ctrl-mousewheel"
2155121566 msgstr ""
2155221567
2155321568 #. (para)
21554-msgid "Toggles between collapsing unchanged sections or not"
21569+msgid "Scroll the display left/right"
2155521570 msgstr ""
2155621571
2155721572 #. (term)
21558-msgid "Ctrl-P"
21559-msgstr ""
21573+msgid "Ctrl-Tab"
21574+msgstr "Ctrl-Tab"
2156021575
2156121576 #. (para)
21562-msgid "Toggles between line wrapping"
21577+msgid "Switch between left/right/bottom view"
2156321578 msgstr ""
2156421579
2156521580 #. (term)
21566-msgid "Ctrl-G"
21581+#. (term)
21582+msgid "Ctrl-M"
2156721583 msgstr ""
2156821584
2156921585 #. (para)
21570-msgid "Go to line"
21571-msgstr "Vai alla linea"
21586+#. (para)
21587+msgid "Toggles between marking the selected change"
21588+msgstr ""
2157221589
21590+#. (title)
21591+msgid "Diff-Mode Keyboard Shortcuts"
21592+msgstr ""
21593+
21594+#. (term)
21595+msgid "Ctrl-D"
21596+msgstr ""
21597+
2157321598 #. (para)
21574-msgid "Select all text"
21575-msgstr "Seleziona tutto il testo"
21599+msgid "Toggle between one-pane diff and two-pane diff"
21600+msgstr ""
2157621601
2157721602 #. (term)
2157821603 msgid "Ctrl-U"
@@ -21583,29 +21608,62 @@
2158321608 msgstr ""
2158421609
2158521610 #. (term)
21586-msgid "Ctrl-mousewheel"
21611+msgid "F12"
2158721612 msgstr ""
2158821613
2158921614 #. (para)
21590-msgid "Scroll the display left/right"
21615+#. (para)
21616+msgid "Use left block"
21617+msgstr "Usa blocchi a sinistra"
21618+
21619+#. (title)
21620+msgid "Conflict Resolution Mode Keyboard Shortcuts"
2159121621 msgstr ""
2159221622
2159321623 #. (term)
21594-msgid "Ctrl-Tab"
21595-msgstr "Ctrl-Tab"
21624+msgid "F8"
21625+msgstr ""
2159621626
2159721627 #. (para)
21598-msgid "Switch between left/right/bottom view"
21628+msgid "Go to next conflict"
21629+msgstr "Passa a prossimo conflitto"
21630+
21631+#. (term)
21632+msgid "Shift-F8"
2159921633 msgstr ""
2160021634
21635+#. (para)
21636+msgid "Go to previous conflict"
21637+msgstr ""
21638+
2160121639 #. (term)
21602-msgid "Ctrl-M"
21640+msgid "Ctrl-F9"
2160321641 msgstr ""
2160421642
21643+#. (term)
21644+msgid "Ctrl-Shift-F9"
21645+msgstr ""
21646+
2160521647 #. (para)
21606-msgid "Toggles between marking the selected change"
21648+msgid "Use left block then right block"
2160721649 msgstr ""
2160821650
21651+#. (term)
21652+msgid "Ctrl-F10"
21653+msgstr ""
21654+
21655+#. (para)
21656+msgid "Use right block"
21657+msgstr "Usa il blocco destro"
21658+
21659+#. (term)
21660+msgid "Ctrl-Shift-F10"
21661+msgstr ""
21662+
21663+#. (para)
21664+msgid "Use right block then left block"
21665+msgstr ""
21666+
2160921667 #. (title)
2161021668 msgid "Automating TortoiseMerge"
2161121669 msgstr ""
--- trunk/Languages/ja/TortoiseDoc.po (revision 29449)
+++ trunk/Languages/ja/TortoiseDoc.po (revision 29450)
@@ -28,8 +28,8 @@
2828 "Project-Id-Version: TortoiseSVN\n"
2929 "Report-Msgid-Bugs-To: \n"
3030 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
31-"PO-Revision-Date: 2021-08-28 09:24+0000\n"
32-"Last-Translator: Transifex Bot <>\n"
31+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
32+"Last-Translator: Masahiro FUJIMOTO <mfujimot@gmail.com>, 2017-2018,2021\n"
3333 "Language-Team: Japanese (http://www.transifex.com/luebbe/tortoisesvn/language/ja/)\n"
3434 "MIME-Version: 1.0\n"
3535 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15256,6 +15256,23 @@
1525615256
1525715257 #. (para)
1525815258 msgid ""
15259+"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15260+" is set to 0 (see above)."
15261+msgstr "<literal>GroupTaskbarIconsPerRepo</literal> オプションを0に設定した場合は、効果がありません(上記参照)。"
15262+
15263+#. (title)
15264+msgid "Taskbar grouping with repository color overlays"
15265+msgstr "タスクバーでのグループ化にリポジトリのカラーオーバーレイが付いた様子"
15266+
15267+#. (para)
15268+msgid ""
15269+"If this option is set to <literal>true</literal>, then every icon on the "
15270+"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15271+"repository the dialogs/windows are used for. <placeholder-1/>"
15272+msgstr "このオプションを <literal>true</literal> に設定すると、 Windows 7 のタスクバーにはダイアログやウィンドウで使用されているリポジトリを識別するための、色のついた四角の小さいオーバーレイが表示されます。 <placeholder-1/>"
15273+
15274+#. (para)
15275+msgid ""
1525915276 "If this is set to <literal>false</literal>, then every "
1526015277 "<literal>svn:externals</literal> is shown during an update separately."
1526115278 msgstr "<literal>false</literal>に設定すると、すべての<literal>svn:externals</literal>がアップデート中に個別に表示されます。"
@@ -15270,23 +15287,13 @@
1527015287
1527115288 #. (para)
1527215289 msgid ""
15273-"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15274-" is set to 0 (see above)."
15275-msgstr "<literal>GroupTaskbarIconsPerRepo</literal> オプションを0に設定した場合は、効果がありません(上記参照)。"
15290+"If this is set to <literal>true</literal>, then cancelling the dialog to "
15291+"approve a hook script to run will show an error dialog indicating the user "
15292+"cancelled."
15293+msgstr ""
1527615294
15277-#. (title)
15278-msgid "Taskbar grouping with repository color overlays"
15279-msgstr "タスクバーでのグループ化にリポジトリのカラーオーバーレイが付いた様子"
15280-
1528115295 #. (para)
1528215296 msgid ""
15283-"If this option is set to <literal>true</literal>, then every icon on the "
15284-"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15285-"repository the dialogs/windows are used for. <placeholder-1/>"
15286-msgstr "このオプションを <literal>true</literal> に設定すると、 Windows 7 のタスクバーにはダイアログやウィンドウで使用されているリポジトリを識別するための、色のついた四角の小さいオーバーレイが表示されます。 <placeholder-1/>"
15287-
15288-#. (para)
15289-msgid ""
1529015297 "By default, TortoiseSVN always runs an update with externals included. This "
1529115298 "avoids problems with inconsistent working copies. If you have however a lot "
1529215299 "of externals set, an update can take quite a while. Set this value to "
@@ -21413,6 +21420,10 @@
2141321420 msgid "List of keyboard shortcuts and commands."
2141421421 msgstr "キーボードのショートカットとコマンドの一覧です。"
2141521422
21423+#. (title)
21424+msgid "General Keyboard Shortcuts"
21425+msgstr ""
21426+
2141621427 #. (term)
2141721428 msgid "Ctrl-Q, Ctrl-W, Escape"
2141821429 msgstr "Ctrl+Q、Ctrl+W、Escape"
@@ -21498,30 +21509,6 @@
2149821509 msgstr "前の相違点へ移動"
2149921510
2150021511 #. (term)
21501-msgid "F8"
21502-msgstr "F8"
21503-
21504-#. (para)
21505-msgid "Go to next conflict"
21506-msgstr "次の競合点へ移動"
21507-
21508-#. (term)
21509-msgid "Shift-F8"
21510-msgstr "Shift+F8"
21511-
21512-#. (para)
21513-msgid "Go to previous conflict"
21514-msgstr "前の競合点へ移動"
21515-
21516-#. (term)
21517-msgid "Ctrl-D"
21518-msgstr "Ctrl+D"
21519-
21520-#. (para)
21521-msgid "Toggle between one-pane diff and two-pane diff"
21522-msgstr "1画面表示と2画面表示を切り替え"
21523-
21524-#. (term)
2152521512 msgid "Ctrl-R"
2152621513 msgstr "Ctrl+R"
2152721514
@@ -21566,14 +21553,6 @@
2156621553 msgstr "文字列全体を選択"
2156721554
2156821555 #. (term)
21569-msgid "Ctrl-U"
21570-msgstr "Ctrl+U"
21571-
21572-#. (para)
21573-msgid "Switches views"
21574-msgstr "画面表示の切り替え"
21575-
21576-#. (term)
2157721556 msgid "Ctrl-mousewheel"
2157821557 msgstr "Ctrl+マウスホイール"
2157921558
@@ -21590,14 +21569,93 @@
2159021569 msgstr "左画面/右画面/下画面の切り替え"
2159121570
2159221571 #. (term)
21572+#. (term)
2159321573 msgid "Ctrl-M"
2159421574 msgstr ""
2159521575
2159621576 #. (para)
21577+#. (para)
2159721578 msgid "Toggles between marking the selected change"
2159821579 msgstr ""
2159921580
2160021581 #. (title)
21582+msgid "Diff-Mode Keyboard Shortcuts"
21583+msgstr ""
21584+
21585+#. (term)
21586+msgid "Ctrl-D"
21587+msgstr "Ctrl+D"
21588+
21589+#. (para)
21590+msgid "Toggle between one-pane diff and two-pane diff"
21591+msgstr "1画面表示と2画面表示を切り替え"
21592+
21593+#. (term)
21594+msgid "Ctrl-U"
21595+msgstr "Ctrl+U"
21596+
21597+#. (para)
21598+msgid "Switches views"
21599+msgstr "画面表示の切り替え"
21600+
21601+#. (term)
21602+msgid "F12"
21603+msgstr ""
21604+
21605+#. (para)
21606+#. (para)
21607+msgid "Use left block"
21608+msgstr "左のブロックを使用"
21609+
21610+#. (title)
21611+msgid "Conflict Resolution Mode Keyboard Shortcuts"
21612+msgstr ""
21613+
21614+#. (term)
21615+msgid "F8"
21616+msgstr "F8"
21617+
21618+#. (para)
21619+msgid "Go to next conflict"
21620+msgstr "次の競合点へ移動"
21621+
21622+#. (term)
21623+msgid "Shift-F8"
21624+msgstr "Shift+F8"
21625+
21626+#. (para)
21627+msgid "Go to previous conflict"
21628+msgstr "前の競合点へ移動"
21629+
21630+#. (term)
21631+msgid "Ctrl-F9"
21632+msgstr ""
21633+
21634+#. (term)
21635+msgid "Ctrl-Shift-F9"
21636+msgstr ""
21637+
21638+#. (para)
21639+msgid "Use left block then right block"
21640+msgstr ""
21641+
21642+#. (term)
21643+msgid "Ctrl-F10"
21644+msgstr ""
21645+
21646+#. (para)
21647+msgid "Use right block"
21648+msgstr "右ブロックを使用"
21649+
21650+#. (term)
21651+msgid "Ctrl-Shift-F10"
21652+msgstr ""
21653+
21654+#. (para)
21655+msgid "Use right block then left block"
21656+msgstr ""
21657+
21658+#. (title)
2160121659 msgid "Automating TortoiseMerge"
2160221660 msgstr "TortoiseMergeの自動化"
2160321661
--- trunk/Languages/nl/TortoiseDoc.po (revision 29449)
+++ trunk/Languages/nl/TortoiseDoc.po (revision 29450)
@@ -29,8 +29,8 @@
2929 "Project-Id-Version: TortoiseSVN\n"
3030 "Report-Msgid-Bugs-To: \n"
3131 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
32-"PO-Revision-Date: 2021-08-28 09:24+0000\n"
33-"Last-Translator: Transifex Bot <>\n"
32+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
33+"Last-Translator: Peter Wokke <peter@woksoft.nl>, 2020\n"
3434 "Language-Team: Dutch (http://www.transifex.com/luebbe/tortoisesvn/language/nl/)\n"
3535 "MIME-Version: 1.0\n"
3636 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15257,6 +15257,23 @@
1525715257
1525815258 #. (para)
1525915259 msgid ""
15260+"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15261+" is set to 0 (see above)."
15262+msgstr ""
15263+
15264+#. (title)
15265+msgid "Taskbar grouping with repository color overlays"
15266+msgstr ""
15267+
15268+#. (para)
15269+msgid ""
15270+"If this option is set to <literal>true</literal>, then every icon on the "
15271+"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15272+"repository the dialogs/windows are used for. <placeholder-1/>"
15273+msgstr ""
15274+
15275+#. (para)
15276+msgid ""
1526015277 "If this is set to <literal>false</literal>, then every "
1526115278 "<literal>svn:externals</literal> is shown during an update separately."
1526215279 msgstr ""
@@ -15271,23 +15288,13 @@
1527115288
1527215289 #. (para)
1527315290 msgid ""
15274-"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15275-" is set to 0 (see above)."
15291+"If this is set to <literal>true</literal>, then cancelling the dialog to "
15292+"approve a hook script to run will show an error dialog indicating the user "
15293+"cancelled."
1527615294 msgstr ""
1527715295
15278-#. (title)
15279-msgid "Taskbar grouping with repository color overlays"
15280-msgstr ""
15281-
1528215296 #. (para)
1528315297 msgid ""
15284-"If this option is set to <literal>true</literal>, then every icon on the "
15285-"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15286-"repository the dialogs/windows are used for. <placeholder-1/>"
15287-msgstr ""
15288-
15289-#. (para)
15290-msgid ""
1529115298 "By default, TortoiseSVN always runs an update with externals included. This "
1529215299 "avoids problems with inconsistent working copies. If you have however a lot "
1529315300 "of externals set, an update can take quite a while. Set this value to "
@@ -21414,6 +21421,10 @@
2141421421 msgid "List of keyboard shortcuts and commands."
2141521422 msgstr "Lijst met toetsenbord snelkoppelingen en commandos"
2141621423
21424+#. (title)
21425+msgid "General Keyboard Shortcuts"
21426+msgstr ""
21427+
2141721428 #. (term)
2141821429 msgid "Ctrl-Q, Ctrl-W, Escape"
2141921430 msgstr "Ctrl-Q, Ctrl-W, Escape"
@@ -21499,30 +21510,6 @@
2149921510 msgstr "Ga naar het vorige verschil"
2150021511
2150121512 #. (term)
21502-msgid "F8"
21503-msgstr "F8"
21504-
21505-#. (para)
21506-msgid "Go to next conflict"
21507-msgstr "Ga naar het volgende konflikt"
21508-
21509-#. (term)
21510-msgid "Shift-F8"
21511-msgstr "Shift-F8"
21512-
21513-#. (para)
21514-msgid "Go to previous conflict"
21515-msgstr "Ga naar het vorige konflikt"
21516-
21517-#. (term)
21518-msgid "Ctrl-D"
21519-msgstr "Ctrl-D"
21520-
21521-#. (para)
21522-msgid "Toggle between one-pane diff and two-pane diff"
21523-msgstr "Schakel tussen een scherm diff of twee schermen diff"
21524-
21525-#. (term)
2152621513 msgid "Ctrl-R"
2152721514 msgstr "Ctrl-R"
2152821515
@@ -21567,14 +21554,6 @@
2156721554 msgstr "Alle tekst selecteren"
2156821555
2156921556 #. (term)
21570-msgid "Ctrl-U"
21571-msgstr "Ctrl-U"
21572-
21573-#. (para)
21574-msgid "Switches views"
21575-msgstr ""
21576-
21577-#. (term)
2157821557 msgid "Ctrl-mousewheel"
2157921558 msgstr "Ctrl-muiswiel"
2158021559
@@ -21591,14 +21570,93 @@
2159121570 msgstr ""
2159221571
2159321572 #. (term)
21573+#. (term)
2159421574 msgid "Ctrl-M"
2159521575 msgstr ""
2159621576
2159721577 #. (para)
21578+#. (para)
2159821579 msgid "Toggles between marking the selected change"
2159921580 msgstr ""
2160021581
2160121582 #. (title)
21583+msgid "Diff-Mode Keyboard Shortcuts"
21584+msgstr ""
21585+
21586+#. (term)
21587+msgid "Ctrl-D"
21588+msgstr "Ctrl-D"
21589+
21590+#. (para)
21591+msgid "Toggle between one-pane diff and two-pane diff"
21592+msgstr "Schakel tussen een scherm diff of twee schermen diff"
21593+
21594+#. (term)
21595+msgid "Ctrl-U"
21596+msgstr "Ctrl-U"
21597+
21598+#. (para)
21599+msgid "Switches views"
21600+msgstr ""
21601+
21602+#. (term)
21603+msgid "F12"
21604+msgstr ""
21605+
21606+#. (para)
21607+#. (para)
21608+msgid "Use left block"
21609+msgstr "Gebruik linker blok"
21610+
21611+#. (title)
21612+msgid "Conflict Resolution Mode Keyboard Shortcuts"
21613+msgstr ""
21614+
21615+#. (term)
21616+msgid "F8"
21617+msgstr "F8"
21618+
21619+#. (para)
21620+msgid "Go to next conflict"
21621+msgstr "Ga naar het volgende konflikt"
21622+
21623+#. (term)
21624+msgid "Shift-F8"
21625+msgstr "Shift-F8"
21626+
21627+#. (para)
21628+msgid "Go to previous conflict"
21629+msgstr "Ga naar het vorige konflikt"
21630+
21631+#. (term)
21632+msgid "Ctrl-F9"
21633+msgstr ""
21634+
21635+#. (term)
21636+msgid "Ctrl-Shift-F9"
21637+msgstr ""
21638+
21639+#. (para)
21640+msgid "Use left block then right block"
21641+msgstr ""
21642+
21643+#. (term)
21644+msgid "Ctrl-F10"
21645+msgstr ""
21646+
21647+#. (para)
21648+msgid "Use right block"
21649+msgstr "Gebruik rechter blok"
21650+
21651+#. (term)
21652+msgid "Ctrl-Shift-F10"
21653+msgstr ""
21654+
21655+#. (para)
21656+msgid "Use right block then left block"
21657+msgstr ""
21658+
21659+#. (title)
2160221660 msgid "Automating TortoiseMerge"
2160321661 msgstr "Automatiseer TortoiseMerge"
2160421662
--- trunk/Languages/pl/TortoiseDoc.po (revision 29449)
+++ trunk/Languages/pl/TortoiseDoc.po (revision 29450)
@@ -17,13 +17,14 @@
1717 # Lübbe Onken <luebbe.opensource@gmail.com>, 2012
1818 # Lübbe Onken <luebbe.opensource@gmail.com>, 2012
1919 # Lübbe Onken <luebbe.opensource@gmail.com>, 2011-2012
20+# Paweł Koczy, 2022
2021 msgid ""
2122 msgstr ""
2223 "Project-Id-Version: TortoiseSVN\n"
2324 "Report-Msgid-Bugs-To: \n"
2425 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
25-"PO-Revision-Date: 2021-08-28 09:24+0000\n"
26-"Last-Translator: Transifex Bot <>\n"
26+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
27+"Last-Translator: Paweł Koczy, 2022\n"
2728 "Language-Team: Polish (http://www.transifex.com/luebbe/tortoisesvn/language/pl/)\n"
2829 "MIME-Version: 1.0\n"
2930 "Content-Type: text/plain; charset=UTF-8\n"
@@ -4604,7 +4605,7 @@
46044605
46054606 #. (primary)
46064607 msgid "(+)"
4607-msgstr ""
4608+msgstr "(+)"
46084609
46094610 #. (title)
46104611 #. (title)
@@ -5008,7 +5009,7 @@
50085009
50095010 #. (title)
50105011 msgid "Experimental"
5011-msgstr ""
5012+msgstr "Eksperymentalne"
50125013
50135014 #. (para)
50145015 msgid ""
@@ -13081,7 +13082,7 @@
1308113082
1308213083 #. (term)
1308313084 msgid "V2"
13084-msgstr ""
13085+msgstr "V2"
1308513086
1308613087 #. (para)
1308713088 msgid ""
@@ -13097,7 +13098,7 @@
1309713098
1309813099 #. (term)
1309913100 msgid "V3"
13100-msgstr ""
13101+msgstr "V3"
1310113102
1310213103 #. (para)
1310313104 msgid ""
@@ -13234,7 +13235,7 @@
1323413235
1323513236 #. (term)
1323613237 msgid "Dark theme"
13237-msgstr ""
13238+msgstr "Ciemny motyw"
1323813239
1323913240 #. (para)
1324013241 msgid ""
@@ -13249,7 +13250,7 @@
1324913250
1325013251 #. (para)
1325113252 msgid "other settings: <placeholder-1/>"
13252-msgstr ""
13253+msgstr "inne ustawienia: <placeholder-1/>"
1325313254
1325413255 #. (title)
1325513256 msgid "Revision Graph Settings"
@@ -15250,6 +15251,23 @@
1525015251
1525115252 #. (para)
1525215253 msgid ""
15254+"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15255+" is set to 0 (see above)."
15256+msgstr "Nie ma to zastosowania, jeśli opcja <literal>GroupTaskbarIconsPerRepo</literal> jest ustawiona na 0 (patrz wyżej)."
15257+
15258+#. (title)
15259+msgid "Taskbar grouping with repository color overlays"
15260+msgstr "Grupowanie na pasku zadań z nakładkami koloru repozytorium"
15261+
15262+#. (para)
15263+msgid ""
15264+"If this option is set to <literal>true</literal>, then every icon on the "
15265+"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15266+"repository the dialogs/windows are used for. <placeholder-1/>"
15267+msgstr "Jeśli ta opcja jest ustawiona na<literal>true</literal>, każda ikona na pasku zadań Win7 pokazuje się z małą kolorową prostokątną nakładką, wskazując repozytorium, do którego odnoszą się dialogi lub okna. <placeholder-1/>"
15268+
15269+#. (para)
15270+msgid ""
1525315271 "If this is set to <literal>false</literal>, then every "
1525415272 "<literal>svn:externals</literal> is shown during an update separately."
1525515273 msgstr "Jeśli ustawiono na <literal>false</literal>, wtedy każda z <literal>svn:externals</literal> jest pokazywana sosbno podczas aktualizacji."
@@ -15264,23 +15282,13 @@
1526415282
1526515283 #. (para)
1526615284 msgid ""
15267-"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15268-" is set to 0 (see above)."
15269-msgstr "Nie ma to zastosowania, jeśli opcja <literal>GroupTaskbarIconsPerRepo</literal> jest ustawiona na 0 (patrz wyżej)."
15285+"If this is set to <literal>true</literal>, then cancelling the dialog to "
15286+"approve a hook script to run will show an error dialog indicating the user "
15287+"cancelled."
15288+msgstr ""
1527015289
15271-#. (title)
15272-msgid "Taskbar grouping with repository color overlays"
15273-msgstr "Grupowanie na pasku zadań z nakładkami koloru repozytorium"
15274-
1527515290 #. (para)
1527615291 msgid ""
15277-"If this option is set to <literal>true</literal>, then every icon on the "
15278-"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15279-"repository the dialogs/windows are used for. <placeholder-1/>"
15280-msgstr "Jeśli ta opcja jest ustawiona na<literal>true</literal>, każda ikona na pasku zadań Win7 pokazuje się z małą kolorową prostokątną nakładką, wskazując repozytorium, do którego odnoszą się dialogi lub okna. <placeholder-1/>"
15281-
15282-#. (para)
15283-msgid ""
1528415292 "By default, TortoiseSVN always runs an update with externals included. This "
1528515293 "avoids problems with inconsistent working copies. If you have however a lot "
1528615294 "of externals set, an update can take quite a while. Set this value to "
@@ -21391,7 +21399,7 @@
2139121399
2139221400 #. (term)
2139321401 msgid "Use dark mode"
21394-msgstr ""
21402+msgstr "Użyj ciemnego motywu"
2139521403
2139621404 #. (listitem)
2139721405 msgid ""
@@ -21407,6 +21415,10 @@
2140721415 msgid "List of keyboard shortcuts and commands."
2140821416 msgstr "Lista skrótów klawiszowych i poleceń."
2140921417
21418+#. (title)
21419+msgid "General Keyboard Shortcuts"
21420+msgstr ""
21421+
2141021422 #. (term)
2141121423 msgid "Ctrl-Q, Ctrl-W, Escape"
2141221424 msgstr "Ctrl-Q, Ctrl-W, Escape"
@@ -21477,7 +21489,7 @@
2147721489
2147821490 #. (term)
2147921491 msgid "F7, Ctrl-Down"
21480-msgstr ""
21492+msgstr "F7, Ctrl-Down"
2148121493
2148221494 #. (para)
2148321495 msgid "Go to next difference"
@@ -21485,7 +21497,7 @@
2148521497
2148621498 #. (term)
2148721499 msgid "Shift-F7, Ctrl-Up"
21488-msgstr ""
21500+msgstr "Shift-F7, Ctrl-Up"
2148921501
2149021502 #. (para)
2149121503 msgid "Go to previous difference"
@@ -21492,30 +21504,6 @@
2149221504 msgstr "Przejdź do poprzedniej różnicy"
2149321505
2149421506 #. (term)
21495-msgid "F8"
21496-msgstr "F8"
21497-
21498-#. (para)
21499-msgid "Go to next conflict"
21500-msgstr "Idź do następnego konfliktu"
21501-
21502-#. (term)
21503-msgid "Shift-F8"
21504-msgstr "Shift-F8"
21505-
21506-#. (para)
21507-msgid "Go to previous conflict"
21508-msgstr "Idź do poprzedniego konfliktu"
21509-
21510-#. (term)
21511-msgid "Ctrl-D"
21512-msgstr "Ctrl-D"
21513-
21514-#. (para)
21515-msgid "Toggle between one-pane diff and two-pane diff"
21516-msgstr "Przełączanie między porównaniem w jednym panelu i porównaniem dwóch panelach"
21517-
21518-#. (term)
2151921507 msgid "Ctrl-R"
2152021508 msgstr "Ctrl-R"
2152121509
@@ -21560,14 +21548,6 @@
2156021548 msgstr "Zaznacza cały tekst"
2156121549
2156221550 #. (term)
21563-msgid "Ctrl-U"
21564-msgstr "Ctrl-U"
21565-
21566-#. (para)
21567-msgid "Switches views"
21568-msgstr "Przełącza widoki"
21569-
21570-#. (term)
2157121551 msgid "Ctrl-mousewheel"
2157221552 msgstr "Ctrl-kółko myszy"
2157321553
@@ -21584,14 +21564,93 @@
2158421564 msgstr "Przełącz między lewym/prawym/dolnym widokiem"
2158521565
2158621566 #. (term)
21567+#. (term)
2158721568 msgid "Ctrl-M"
21588-msgstr ""
21569+msgstr "Ctrl-M"
2158921570
2159021571 #. (para)
21572+#. (para)
2159121573 msgid "Toggles between marking the selected change"
2159221574 msgstr ""
2159321575
2159421576 #. (title)
21577+msgid "Diff-Mode Keyboard Shortcuts"
21578+msgstr ""
21579+
21580+#. (term)
21581+msgid "Ctrl-D"
21582+msgstr "Ctrl-D"
21583+
21584+#. (para)
21585+msgid "Toggle between one-pane diff and two-pane diff"
21586+msgstr "Przełączanie między porównaniem w jednym panelu i porównaniem dwóch panelach"
21587+
21588+#. (term)
21589+msgid "Ctrl-U"
21590+msgstr "Ctrl-U"
21591+
21592+#. (para)
21593+msgid "Switches views"
21594+msgstr "Przełącza widoki"
21595+
21596+#. (term)
21597+msgid "F12"
21598+msgstr ""
21599+
21600+#. (para)
21601+#. (para)
21602+msgid "Use left block"
21603+msgstr "Użyj lewego bloku"
21604+
21605+#. (title)
21606+msgid "Conflict Resolution Mode Keyboard Shortcuts"
21607+msgstr ""
21608+
21609+#. (term)
21610+msgid "F8"
21611+msgstr "F8"
21612+
21613+#. (para)
21614+msgid "Go to next conflict"
21615+msgstr "Idź do następnego konfliktu"
21616+
21617+#. (term)
21618+msgid "Shift-F8"
21619+msgstr "Shift-F8"
21620+
21621+#. (para)
21622+msgid "Go to previous conflict"
21623+msgstr "Idź do poprzedniego konfliktu"
21624+
21625+#. (term)
21626+msgid "Ctrl-F9"
21627+msgstr ""
21628+
21629+#. (term)
21630+msgid "Ctrl-Shift-F9"
21631+msgstr ""
21632+
21633+#. (para)
21634+msgid "Use left block then right block"
21635+msgstr ""
21636+
21637+#. (term)
21638+msgid "Ctrl-F10"
21639+msgstr ""
21640+
21641+#. (para)
21642+msgid "Use right block"
21643+msgstr "Użyj prawego bloku"
21644+
21645+#. (term)
21646+msgid "Ctrl-Shift-F10"
21647+msgstr ""
21648+
21649+#. (para)
21650+msgid "Use right block then left block"
21651+msgstr ""
21652+
21653+#. (title)
2159521654 msgid "Automating TortoiseMerge"
2159621655 msgstr "Automatyzacja TortoiseMerge"
2159721656
--- trunk/Languages/pl/TortoiseUI.po (revision 29449)
+++ trunk/Languages/pl/TortoiseUI.po (revision 29450)
@@ -21,6 +21,7 @@
2121 # Lübbe Onken <luebbe.opensource@gmail.com>, 2013-2014
2222 # Michał Lipok <michal@lipok.pl>, 2015
2323 # mkrawiecki <michal.krawiecki@erlkoenig.pl>, 2011
24+# Paweł Koczy, 2022
2425 # Stefan Kueng <tortoisesvn@gmail.com>, 2021
2526 msgid ""
2627 msgstr ""
@@ -27,8 +28,8 @@
2728 "Project-Id-Version: TortoiseSVN\n"
2829 "Report-Msgid-Bugs-To: \n"
2930 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
30-"PO-Revision-Date: 2022-01-29 10:23+0000\n"
31-"Last-Translator: Lübbe Onken <luebbe.opensource@gmail.com>\n"
31+"PO-Revision-Date: 2010-11-30 05:14+0000\n"
32+"Last-Translator: Paweł Koczy, 2022\n"
3233 "Language-Team: Polish (http://www.transifex.com/luebbe/tortoisesvn/language/pl/)\n"
3334 "MIME-Version: 1.0\n"
3435 "Content-Type: text/plain; charset=UTF-8\n"
@@ -127,7 +128,7 @@
127128 #. Resource IDs: (3667)
128129 #, c-format
129130 msgid "%1!ls! from %2!ls!"
130-msgstr ""
131+msgstr "%1!ls! z %2!ls!"
131132
132133 #. Resource IDs: (3603)
133134 #, c-format
@@ -355,7 +356,7 @@
355356
356357 #. Resource IDs: (1)
357358 msgid "&Apply"
358-msgstr ""
359+msgstr "&Zatwierdź"
359360
360361 #. Resource IDs: (1294)
361362 msgid "&Apply property recursively"
@@ -564,7 +565,7 @@
564565
565566 #. Resource IDs: (1678)
566567 msgid "&Checkpoint"
567-msgstr ""
568+msgstr "&Punkt kontrolny"
568569
569570 #. Resource IDs: (1606)
570571 msgid "&Choose items..."
@@ -644,11 +645,11 @@
644645
645646 #. Resource IDs: (ID_VIEW_DARKMODE - Menu)
646647 msgid "&Dark Mode"
647-msgstr ""
648+msgstr "&Ciemny motyw"
648649
649650 #. Resource IDs: (ID_VIEW_DARKMODE - Menu)
650651 msgid "&Dark Mode\t(D)"
651-msgstr ""
652+msgstr "&Ciemny motyw\t(D)"
652653
653654 #. Resource IDs: (1638, 1641)
654655 msgid "&Date"
@@ -982,7 +983,7 @@
982983
983984 #. Resource IDs: (1673)
984985 msgid "&Log message:"
985-msgstr ""
986+msgstr "&Opis zmian:"
986987
987988 #. Resource IDs: (1591)
988989 msgid "&Mac (CR)"
@@ -1296,11 +1297,11 @@
12961297
12971298 #. Resource IDs: (1488)
12981299 msgid "&Restore defaults"
1299-msgstr "&Restore defaults"
1300+msgstr "&Przywróć domyślne"
13001301
13011302 #. Resource IDs: (1542)
13021303 msgid "&Retry"
1303-msgstr ""
1304+msgstr "&Ponów"
13041305
13051306 #. Resource IDs: (1545)
13061307 msgid "&Retry as different user"
@@ -1372,7 +1373,7 @@
13721373
13731374 #. Resource IDs: (1)
13741375 msgid "&Shelve"
1375-msgstr ""
1376+msgstr "&Odłóż"
13761377
13771378 #. Resource IDs: (32815 - Menu)
13781379 msgid "&Show HEAD revisions"
@@ -1570,7 +1571,7 @@
15701571
15711572 #. Resource IDs: (1674)
15721573 msgid "&Version"
1573-msgstr ""
1574+msgstr "&Wersja"
15741575
15751576 #. Resource IDs: (65535 - PopupMenu)
15761577 msgid "&View"
@@ -1759,7 +1760,7 @@
17591760 msgid ""
17601761 "=&Check Now=&Add Project=E&dit=&Remove=&Mark all as read=&Clear "
17611762 "errors=&Update all=&Options=="
1762-msgstr ""
1763+msgstr "=&Sprawdź teraz=&Dodaj Projekt=&Edytuj=&Usuń=&Oznacz wszystko jako przeczytane=&Wyczyść błędy=U&aktualnij wszystko=O&pcje="
17631764
17641765 #. Resource IDs: (ID_ABOUT - Menu)
17651766 msgid "?"
@@ -2067,7 +2068,7 @@
20672068
20682069 #. Resource IDs: (1481)
20692070 msgid "Allow mixed revisions (not recommended)"
2070-msgstr ""
2071+msgstr "Zezwól na wymieszane rewizje (niezalecane)"
20712072
20722073 #. Resource IDs: (1896)
20732074 msgid "Already merged"
@@ -2134,7 +2135,7 @@
21342135 #. Resource IDs: (IDS_ERR_PATCH_UNKOWNLINETYPE)
21352136 #, c-format
21362137 msgid "An unknown line type was found in line %d!"
2137-msgstr ""
2138+msgstr "Nieznany typ linii został znaleziony w linii %d!"
21382139
21392140 #. Resource IDs: (4010)
21402141 msgid ""
@@ -2430,7 +2431,7 @@
24302431
24312432 #. Resource IDs: (385)
24322433 msgid "Bug-Urls"
2433-msgstr ""
2434+msgstr "URLe błędu"
24342435
24352436 #. Resource IDs: (327)
24362437 msgid "Bugtraq Regex Tester - TortoiseSVN"
@@ -2438,7 +2439,7 @@
24382439
24392440 #. Resource IDs: (cmdCopy_Keytip_RESID)
24402441 msgid "C"
2441-msgstr ""
2442+msgstr "C"
24422443
24432444 #. Resource IDs: (1215)
24442445 msgid "C&heck now"
@@ -2914,7 +2915,7 @@
29142915 #. Resource IDs: (IDS_INDICATOR_COLUMN)
29152916 #, c-format
29162917 msgid "Column: %d"
2917-msgstr ""
2918+msgstr "Kolumna: %d"
29182919
29192920 #. Resource IDs: (3506)
29202921 msgid "Command"
@@ -3153,7 +3154,7 @@
31533154
31543155 #. Resource IDs: (195)
31553156 msgid "Context Menu"
3156-msgstr ""
3157+msgstr "Menu kontekstowe"
31573158
31583159 #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535)
31593160 msgid "Context lines for patches"
@@ -3481,7 +3482,7 @@
34813482 msgid ""
34823483 "Create a checkpoint.\n"
34833484 "The selected modifications are saved to a shelf, but the local modifications are kept."
3484-msgstr ""
3485+msgstr "Stwórz punkt kontrolny.\nWybrane zmiany zostaną zapisane na półce, ale lokalne zmiany zostaną zachowane."
34853486
34863487 #. Resource IDs: (1015)
34873488 msgid "Create code collaborator revie&w..."
@@ -3541,7 +3542,7 @@
35413542 #. Resource IDs: (1060)
35423543 #, c-format
35433544 msgid "Creating checkpoint \"%s\""
3544-msgstr ""
3545+msgstr "Tworzenie punktu kontrolnego \"%s\""
35453546
35463547 #. Resource IDs: (65535)
35473548 msgid "Credits:"
@@ -3585,13 +3586,13 @@
35853586
35863587 #. Resource IDs: (1682)
35873588 msgid "Dark theme"
3588-msgstr ""
3589+msgstr "Ciemny motyw"
35893590
35903591 #. Resource IDs: (1683)
35913592 msgid ""
35923593 "Dark theme requires at least Win10 1803, and it must be enabled in the "
35933594 "Windows system settings."
3594-msgstr ""
3595+msgstr "Ciemny motyw wymaga co najmniej Win10 1803 i musi być włączony w ustawieniach systemowych Windows."
35953596
35963597 #. Resource IDs: (1210, 1529, 3312, IDS_HEADER_DATE)
35973598 msgid "Date"
@@ -3758,15 +3759,15 @@
37583759
37593760 #. Resource IDs: (196)
37603761 msgid "Dialogs 1"
3761-msgstr ""
3762+msgstr "Dialogi 1"
37623763
37633764 #. Resource IDs: (213)
37643765 msgid "Dialogs 2"
3765-msgstr ""
3766+msgstr "Dialogi 2"
37663767
37673768 #. Resource IDs: (332)
37683769 msgid "Dialogs 3"
3769-msgstr ""
3770+msgstr "Dialogi 3"
37703771
37713772 #. Resource IDs: (cmdGroupDiff_LabelTitle_RESID)
37723773 msgid "Diff"
@@ -4071,7 +4072,7 @@
40714072
40724073 #. Resource IDs: (cmdEditEnabled_Keytip_RESID, cmdTabEdit_Keytip_RESID)
40734074 msgid "E"
4074-msgstr ""
4075+msgstr "E"
40754076
40764077 #. Resource IDs: (32816 - Menu)
40774078 msgid "E&xact copy sources"
@@ -4137,11 +4138,11 @@
41374138
41384139 #. Resource IDs: (2322)
41394140 msgid "Edit Property Conflicts"
4140-msgstr ""
4141+msgstr "Edytuj konflikty atrybutów"
41414142
41424143 #. Resource IDs: (2321)
41434144 msgid "Edit Text Conflicts"
4144-msgstr ""
4145+msgstr "Edytuj konflikty tekstu"
41454146
41464147 #. Resource IDs: (2318)
41474148 msgid "Edit Tree Conflicts"
@@ -4190,7 +4191,7 @@
41904191 msgid ""
41914192 "Edit\n"
41924193 "Edit text conflicts"
4193-msgstr ""
4194+msgstr "Edytuj\nEdytuj konflikty tekstu"
41944195
41954196 #. Resource IDs: (1049)
41964197 msgid ""
@@ -4477,7 +4478,7 @@
44774478 #. Resource IDs: (3659)
44784479 #, c-format
44794480 msgid "Export from %1!ls!"
4480-msgstr ""
4481+msgstr "Wyeksportuj z %1!ls!"
44814482
44824483 #. Resource IDs: (1667)
44834484 msgid "Export settings to file..."
@@ -4550,7 +4551,7 @@
45504551
45514552 #. Resource IDs: (cmdFind_Keytip_RESID)
45524553 msgid "F"
4553-msgstr ""
4554+msgstr "F"
45544555
45554556 #. Resource IDs: (1480)
45564557 msgid "F&orce the merge"
@@ -4832,23 +4833,23 @@
48324833
48334834 #. Resource IDs: (cmdFindNext_LabelTitle_RESID)
48344835 msgid "Find Next"
4835-msgstr ""
4836+msgstr "Znajdź następne"
48364837
48374838 #. Resource IDs: (cmdFindPrev_LabelTitle_RESID)
48384839 msgid "Find Previous"
4839-msgstr ""
4840+msgstr "Znajdź poprzednie"
48404841
48414842 #. Resource IDs: (cmdFindPrev)
48424843 msgid ""
48434844 "Find the last occurrence of the selected text\n"
48444845 "Search Previous"
4845-msgstr ""
4846+msgstr "Znajdź poprzednie wystąpienie wybranego tekstu\nZnajdź poprzednie"
48464847
48474848 #. Resource IDs: (cmdFindNext)
48484849 msgid ""
48494850 "Find the next occurrence of the selected text\n"
48504851 "Search Next"
4851-msgstr ""
4852+msgstr "Znajdź następne wystąpienie wybranego tekstu\nZnajdź następne"
48524853
48534854 #. Resource IDs: (cmdFind)
48544855 msgid ""
@@ -4956,7 +4957,7 @@
49564957
49574958 #. Resource IDs: (cmdGotoLine_Keytip_RESID)
49584959 msgid "G"
4959-msgstr ""
4960+msgstr "G"
49604961
49614962 #. Resource IDs: (4360)
49624963 msgid "GDI+ couldn't be initialized!"
@@ -5288,7 +5289,7 @@
52885289
52895290 #. Accelerator Entry for Menu ID:32819; '&Dark Mode\t(D)'
52905291 msgid "ID:32819:V +D"
5291-msgstr ""
5292+msgstr "ID:32819:V +D"
52925293
52935294 #. Accelerator Entry for Menu ID:32824; ''
52945295 msgid "ID:32824:V C +F"
@@ -5390,7 +5391,7 @@
53905391
53915392 #. Resource IDs: (184)
53925393 msgid "Icon Set"
5393-msgstr ""
5394+msgstr "Zestaw ikon"
53945395
53955396 #. Resource IDs: (Dialog IDD_ABOUT: Control id 65535)
53965397 msgid "Icons/Design/Code:\t\tLuebbe Onken"
@@ -5530,7 +5531,7 @@
55305531
55315532 #. Resource IDs: (IDS_DIFF_IGNORE_EOL)
55325533 msgid "Ignore EOL changes"
5533-msgstr ""
5534+msgstr "Ignoruj różnice EOL"
55345535
55355536 #. Resource IDs: (ID_VIEW_IGNOREALLWHITESPACECHANGES - Menu,
55365537 #. cmdIgnoreAllWhitespaceChanges_LabelTitle_RESID)
@@ -5883,7 +5884,7 @@
58835884
58845885 #. Resource IDs: (cmdViewWrapLines_Keytip_RESID)
58855886 msgid "L"
5886-msgstr ""
5887+msgstr "L"
58875888
58885889 #. Resource IDs: (65535)
58895890 msgid "L&imit:"
@@ -6193,7 +6194,7 @@
61936194
61946195 #. Resource IDs: (1039)
61956196 msgid "Mark all projects as read"
6196-msgstr ""
6197+msgstr "Zaznacz wszystkie projekty jako przeczytane"
61976198
61986199 #. Resource IDs: (3608)
61996200 msgid ""
@@ -6235,7 +6236,7 @@
62356236 #. Resource IDs: (IDS_INDICATOR_MARKEDWORDCOUNT)
62366237 #, c-format
62376238 msgid "Marked words: %s"
6238-msgstr ""
6239+msgstr "Zaznaczone słowa: %s"
62396240
62406241 #. Resource IDs: (65535)
62416242 msgid "Markers"
@@ -6602,15 +6603,15 @@
66026603
66036604 #. Resource IDs: (cmdNavigateNextConflict_Keytip_RESID)
66046605 msgid "NC"
6605-msgstr ""
6606+msgstr "NC"
66066607
66076608 #. Resource IDs: (cmdNavigateNextDifference_Keytip_RESID)
66086609 msgid "ND"
6609-msgstr ""
6610+msgstr "ND"
66106611
66116612 #. Resource IDs: (cmdNavigateNextInlineDiff_Keytip_RESID)
66126613 msgid "NI"
6613-msgstr ""
6614+msgstr "NI"
66146615
66156616 #. Resource IDs: (59138)
66166617 msgid "NUM"
@@ -6759,7 +6760,7 @@
67596760
67606761 #. Resource IDs: (1058)
67616762 msgid "No path was shelved."
6762-msgstr ""
6763+msgstr "Żadna ścieżka nie została odłożona na półkę."
67636764
67646765 #. Resource IDs: (3125)
67656766 msgid ""
@@ -6836,7 +6837,7 @@
68366837
68376838 #. Resource IDs: (1052)
68386839 msgid "Nothing is shelved!"
6839-msgstr ""
6840+msgstr "Półki są puste!"
68406841
68416842 #. Resource IDs: (1406)
68426843 msgid "Notice"
@@ -6960,7 +6961,7 @@
69606961 "One or more paths could not be shelved.\n"
69616962 "The following paths failed:\n"
69626963 "%s"
6963-msgstr ""
6964+msgstr "Jedna lub więcej ścieżek nie mogła zostać odłożona na półkę.\nŚcieżki, których dotyczy problem:\n%s"
69646965
69656966 #. Resource IDs: (1023)
69666967 msgid "One project has updates:"
@@ -7086,7 +7087,7 @@
70867087
70877088 #. Resource IDs: (308)
70887089 msgid "Overlay Handlers"
7089-msgstr ""
7090+msgstr "Uchwyty nakładek"
70907091
70917092 #. Resource IDs: (65535)
70927093 msgid "Overlays"
@@ -7106,15 +7107,15 @@
71067107
71077108 #. Resource IDs: (cmdNavigatePreviousConflict_Keytip_RESID)
71087109 msgid "PC"
7109-msgstr ""
7110+msgstr "PC"
71107111
71117112 #. Resource IDs: (cmdNavigatePreviousDifference_Keytip_RESID)
71127113 msgid "PD"
7113-msgstr ""
7114+msgstr "PD"
71147115
71157116 #. Resource IDs: (cmdNavigatePreviousInlineDiff_Keytip_RESID)
71167117 msgid "PI"
7117-msgstr ""
7118+msgstr "PI"
71187119
71197120 #. Resource IDs: (65535 - PopupMenu)
71207121 msgid "POPUP"
@@ -7548,7 +7549,7 @@
75487549
75497550 #. Resource IDs: (cmdReload_Keytip_RESID)
75507551 msgid "R"
7551-msgstr ""
7552+msgstr "R"
75527553
75537554 #. Resource IDs: (1073)
75547555 msgid "R&AM drives"
@@ -8042,7 +8043,7 @@
80428043
80438044 #. Resource IDs: (3681)
80448045 msgid "Resolve conflicts"
8045-msgstr ""
8046+msgstr "Rozwiąż konflikty"
80468047
80478048 #. Resource IDs: (1168, 3332)
80488049 msgid "Resolved"
@@ -8225,7 +8226,7 @@
82258226
82268227 #. Resource IDs: (cmdSave_Keytip_RESID)
82278228 msgid "S"
8228-msgstr ""
8229+msgstr "S"
82298230
82308231 #. Resource IDs: (1132)
82318232 msgid "S&tatistics"
@@ -8561,7 +8562,7 @@
85618562 msgid ""
85628563 "Select an existing shelf to create a new version, or enter a new name to "
85638564 "create a new shelf"
8564-msgstr ""
8565+msgstr "Wybierz istniejącą półkę by stworzyć nową wersję lub wprowadź nową nazwę by stworzyć nową półkę"
85658566
85668567 #. Resource IDs: (57346)
85678568 msgid "Select an object on which to get Help"
@@ -8727,15 +8728,15 @@
87278728 #. Resource IDs: (1053)
87288729 #, c-format
87298730 msgid "Shelf \"%s\" has %ld version(s)"
8730-msgstr ""
8731+msgstr "Półka \"%s\" ma %ld wersję (wersje)"
87318732
87328733 #. Resource IDs: (1345)
87338734 msgid "Shelf name can not be empty!"
8734-msgstr ""
8735+msgstr "Nazwa półki nie może być pusta!"
87358736
87368737 #. Resource IDs: (65535)
87378738 msgid "Shelfing"
8738-msgstr ""
8739+msgstr "Odkładanie na półkę"
87398740
87408741 #. Resource IDs: (1270, 3349)
87418742 msgid "Shell"
@@ -8751,7 +8752,7 @@
87518752
87528753 #. Resource IDs: (1054)
87538754 msgid "Shelve the selected files and revert the changes."
8754-msgstr ""
8755+msgstr "Odłóż na półkę wybrane pliki i wycofaj zmiany."
87558756
87568757 #. Resource IDs: (286)
87578758 msgid "Shelve..."
@@ -8760,7 +8761,7 @@
87608761 #. Resource IDs: (1059)
87618762 #, c-format
87628763 msgid "Shelving to \"%s\""
8763-msgstr ""
8764+msgstr "Odkładanie na półkę \"%s\""
87648765
87658766 #. Resource IDs: (32822)
87668767 msgid ""
@@ -9680,7 +9681,7 @@
96809681 #. Resource IDs: (IDS_ERR_PATCH_NOEQUATIONCHARLINE)
96819682 #, c-format
96829683 msgid "The line '====' was expected in line %d!"
9683-msgstr ""
9684+msgstr "Linia '====' była oczekiwana w linii %d!"
96849685
96859686 #. Resource IDs: (IDS_ERR_PATCH_NOINDEX)
96869687 msgid ""
@@ -9691,7 +9692,7 @@
96919692 #. Resource IDs: (IDS_ERR_PATCH_NOADDFILELINE)
96929693 #, c-format
96939694 msgid "The line indicating the new file was expected in line %d!"
9694-msgstr ""
9695+msgstr "Linia wskazująca nowy plik była oczekiwana w linii %d!"
96959696
96969697 #. Resource IDs: (IDS_GOTO_OUTOFRANGE)
96979698 #, c-format
@@ -9889,7 +9890,7 @@
98899890 msgid ""
98909891 "There are currently %d overlay handlers installed besides the ones Tortoise "
98919892 "uses."
9892-msgstr "Obecnie zainstalowane jest %d uchwytów nakładekpoza używanymi przez Tortoise."
9893+msgstr "Obecnie zainstalowane jest %d uchwytów nakładek poza używanymi przez Tortoise."
98939894
98949895 #. Resource IDs: (IDS_SAVE_MORE)
98959896 msgid ""
@@ -9925,7 +9926,7 @@
99259926 "incomplete or even misleading due to incomplete history data.\n"
99269927 "\n"
99279928 "The error was:"
9928-msgstr ""
9929+msgstr "Wystąpił problem podczas łączenia się z serwerem.\nChcesz wyświetlić dane buforowane lokalnie?\n\nMiej świadomość, że dane buforowane lokalnie mogą być nieaktualne,\nniekompletne lub nawet mylące z powodu niekompletnej historii.\n\nBłąd:"
99299930
99309931 #. Resource IDs: (1306)
99319932 msgid ""
@@ -10089,7 +10090,7 @@
1008910090
1009010091 #. Resource IDs: (65535)
1009110092 msgid "Top context menu on Windows 11"
10092-msgstr ""
10093+msgstr "Menu kontekstowe w Windows 11"
1009310094
1009410095 #. Resource IDs: (244, IDS_APP_TITLE)
1009510096 msgid "TortoiseBlame"
@@ -10319,11 +10320,11 @@
1031910320
1032010321 #. Resource IDs: (381)
1032110322 msgid "URLs to view revision in webviewer"
10322-msgstr ""
10323+msgstr "URLe do przeglądania wersji w przeglądarce"
1032310324
1032410325 #. Resource IDs: (1847)
1032510326 msgid "URLs with revision"
10326-msgstr ""
10327+msgstr "URLe z wersją"
1032710328
1032810329 #. Resource IDs: (1209)
1032910330 msgid "Un&modified"
@@ -10386,7 +10387,7 @@
1038610387 #. Resource IDs: (65535)
1038710388 msgid ""
1038810389 "Unchecked items are not shown in the top menu but only in the original menu"
10389-msgstr ""
10390+msgstr "Wpisy, które nie są zaznaczone, nie są wyświetlane w menu kontekstowym Win11"
1039010391
1039110392 #. Resource IDs: (65535)
1039210393 msgid ""
@@ -10582,7 +10583,7 @@
1058210583
1058310584 #. Resource IDs: (1684)
1058410585 msgid "Url points to SVNParentPath list"
10585-msgstr ""
10586+msgstr "Url wskazuje na listę SVNParentPath "
1058610587
1058710588 #. Resource IDs: (1843)
1058810589 msgid "Urls"
@@ -10680,7 +10681,7 @@
1068010681
1068110682 #. Resource IDs: (Dialog IDD_SETCOLORPAGE: Control id 1513)
1068210683 msgid "Use dark mode"
10683-msgstr ""
10684+msgstr "Użyj ciemnego motywu"
1068410685
1068510686 #. Resource IDs: (ID_EDIT_USELEFTBLOCK - Menu,
1068610687 #. cmdUseLeftBlock_LabelTitle_RESID)
@@ -10824,15 +10825,15 @@
1082410825
1082510826 #. Resource IDs: (cmdPaste_Keytip_RESID)
1082610827 msgid "V"
10827-msgstr ""
10828+msgstr "V"
1082810829
1082910830 #. Resource IDs: (1680)
1083010831 msgid "V2: Faster, no server connection required (recommended)"
10831-msgstr ""
10832+msgstr "V2: Szybsze, nie wymaga połączenia z serwerem (zalecane)"
1083210833
1083310834 #. Resource IDs: (1681)
1083410835 msgid "V3: Slower, requires server connection."
10835-msgstr ""
10836+msgstr "V3: Wolniejsze, wymaga połączenia z serwerem."
1083610837
1083710838 #. Resource IDs: (IDS_COMMANDLINEHELP)
1083810839 msgid ""
@@ -10873,7 +10874,7 @@
1087310874 #. Resource IDs: (1061)
1087410875 #, c-format
1087510876 msgid "Version %d - %s"
10876-msgstr ""
10877+msgstr "Wersja %d - %s"
1087710878
1087810879 #. Resource IDs: (IDS_VERSION)
1087910880 #, c-format
@@ -10910,7 +10911,7 @@
1091010911
1091110912 #. Resource IDs: (cmdShowWhitespaces_Keytip_RESID)
1091210913 msgid "W"
10913-msgstr ""
10914+msgstr "W"
1091410915
1091510916 #. Resource IDs: (65535)
1091610917 msgid ""
@@ -11003,7 +11004,7 @@
1100311004
1100411005 #. Resource IDs: (197)
1100511006 msgid "Win 11 Context Menu"
11006-msgstr ""
11007+msgstr "Menu kontekstowe Win 11"
1100711008
1100811009 #. Resource IDs: (1493, 1496, 158)
1100911010 msgid "Working Copy"
@@ -11045,7 +11046,7 @@
1104511046
1104611047 #. Resource IDs: (cmdRedo_Keytip_RESID)
1104711048 msgid "Y"
11048-msgstr ""
11049+msgstr "Y"
1104911050
1105011051 #. Resource IDs: (3202)
1105111052 msgid "You already have the latest version installed."
@@ -11169,7 +11170,7 @@
1116911170
1117011171 #. Resource IDs: (cmdUndo_Keytip_RESID)
1117111172 msgid "Z"
11172-msgstr ""
11173+msgstr "Z"
1117311174
1117411175 #. Resource IDs: (ID_VIEW_ZOOMOUT - Menu)
1117511176 msgid "Zoo&m out\t(-)"
@@ -11599,7 +11600,7 @@
1159911600
1160011601 #. Resource IDs: (cmdOpen_Keytip_RESID)
1160111602 msgid "o1"
11602-msgstr ""
11603+msgstr "o1"
1160311604
1160411605 #. Resource IDs: (162)
1160511606 msgid "obstructed"
--- trunk/Languages/pt/TortoiseDoc.po (revision 29449)
+++ trunk/Languages/pt/TortoiseDoc.po (revision 29450)
@@ -28,14 +28,14 @@
2828 "Project-Id-Version: TortoiseSVN\n"
2929 "Report-Msgid-Bugs-To: \n"
3030 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
31-"PO-Revision-Date: 2022-03-11 20:32+0000\n"
32-"Last-Translator: Lübbe Onken <luebbe.opensource@gmail.com>\n"
31+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
32+"Last-Translator: Rui <xymarior@yandex.com>, 2019\n"
3333 "Language-Team: Portuguese (http://www.transifex.com/luebbe/tortoisesvn/language/pt/)\n"
3434 "MIME-Version: 1.0\n"
3535 "Content-Type: text/plain; charset=UTF-8\n"
3636 "Content-Transfer-Encoding: 8bit\n"
3737 "Language: pt\n"
38-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
38+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
3939
4040 #. (title)
4141 #. (secondary)
@@ -15256,6 +15256,23 @@
1525615256
1525715257 #. (para)
1525815258 msgid ""
15259+"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15260+" is set to 0 (see above)."
15261+msgstr "Isto não tem efeito se a opção <literal> GroupTaskbarIconsPerRepo </literal> está definida para 0 (veja acima)."
15262+
15263+#. (title)
15264+msgid "Taskbar grouping with repository color overlays"
15265+msgstr "Agrupamento da barra de tarefas com sobreposições de cores do repositório"
15266+
15267+#. (para)
15268+msgid ""
15269+"If this option is set to <literal>true</literal>, then every icon on the "
15270+"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15271+"repository the dialogs/windows are used for. <placeholder-1/>"
15272+msgstr "Se esta opção estiver definida para <literal>true</literal> , Então cada ícone na barra de tarefas do Win7 mostra uma sobreposição de cor no pequeno rectângulo, indicando o repositório os diálogos/janelas são usados. <placeholder-1/>"
15273+
15274+#. (para)
15275+msgid ""
1525915276 "If this is set to <literal>false</literal>, then every "
1526015277 "<literal>svn:externals</literal> is shown during an update separately."
1526115278 msgstr "Se for posto a <literal>false</literal>, então é mostrado em separado cada <literal>svn:externals</literal> durante uma actualização."
@@ -15270,23 +15287,13 @@
1527015287
1527115288 #. (para)
1527215289 msgid ""
15273-"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15274-" is set to 0 (see above)."
15275-msgstr "Isto não tem efeito se a opção <literal> GroupTaskbarIconsPerRepo </literal> está definida para 0 (veja acima)."
15290+"If this is set to <literal>true</literal>, then cancelling the dialog to "
15291+"approve a hook script to run will show an error dialog indicating the user "
15292+"cancelled."
15293+msgstr ""
1527615294
15277-#. (title)
15278-msgid "Taskbar grouping with repository color overlays"
15279-msgstr "Agrupamento da barra de tarefas com sobreposições de cores do repositório"
15280-
1528115295 #. (para)
1528215296 msgid ""
15283-"If this option is set to <literal>true</literal>, then every icon on the "
15284-"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15285-"repository the dialogs/windows are used for. <placeholder-1/>"
15286-msgstr "Se esta opção estiver definida para <literal>true</literal> , Então cada ícone na barra de tarefas do Win7 mostra uma sobreposição de cor no pequeno rectângulo, indicando o repositório os diálogos/janelas são usados. <placeholder-1/>"
15287-
15288-#. (para)
15289-msgid ""
1529015297 "By default, TortoiseSVN always runs an update with externals included. This "
1529115298 "avoids problems with inconsistent working copies. If you have however a lot "
1529215299 "of externals set, an update can take quite a while. Set this value to "
@@ -21413,6 +21420,10 @@
2141321420 msgid "List of keyboard shortcuts and commands."
2141421421 msgstr "Lista de atalhos e commandos de teclado."
2141521422
21423+#. (title)
21424+msgid "General Keyboard Shortcuts"
21425+msgstr ""
21426+
2141621427 #. (term)
2141721428 msgid "Ctrl-Q, Ctrl-W, Escape"
2141821429 msgstr "Ctrl-Q, Ctrl-W, Escape"
@@ -21498,30 +21509,6 @@
2149821509 msgstr "Avançar para a diferença anterior"
2149921510
2150021511 #. (term)
21501-msgid "F8"
21502-msgstr "F8"
21503-
21504-#. (para)
21505-msgid "Go to next conflict"
21506-msgstr "Avançar para o próximo conflito"
21507-
21508-#. (term)
21509-msgid "Shift-F8"
21510-msgstr "Shift-F8"
21511-
21512-#. (para)
21513-msgid "Go to previous conflict"
21514-msgstr "Avançar para o conflito anterior"
21515-
21516-#. (term)
21517-msgid "Ctrl-D"
21518-msgstr "Ctrl-D"
21519-
21520-#. (para)
21521-msgid "Toggle between one-pane diff and two-pane diff"
21522-msgstr "Alternar entre a comparação com um ou dois painéis."
21523-
21524-#. (term)
2152521512 msgid "Ctrl-R"
2152621513 msgstr "Ctrl-R"
2152721514
@@ -21566,14 +21553,6 @@
2156621553 msgstr "Seleccionar todo texto"
2156721554
2156821555 #. (term)
21569-msgid "Ctrl-U"
21570-msgstr "Ctrl-U"
21571-
21572-#. (para)
21573-msgid "Switches views"
21574-msgstr "Trocar vistas"
21575-
21576-#. (term)
2157721556 msgid "Ctrl-mousewheel"
2157821557 msgstr "Ctrl-roda-do-rato"
2157921558
@@ -21590,14 +21569,93 @@
2159021569 msgstr "Alternar entre visualização esquerda/direita/base"
2159121570
2159221571 #. (term)
21572+#. (term)
2159321573 msgid "Ctrl-M"
2159421574 msgstr ""
2159521575
2159621576 #. (para)
21577+#. (para)
2159721578 msgid "Toggles between marking the selected change"
2159821579 msgstr ""
2159921580
2160021581 #. (title)
21582+msgid "Diff-Mode Keyboard Shortcuts"
21583+msgstr ""
21584+
21585+#. (term)
21586+msgid "Ctrl-D"
21587+msgstr "Ctrl-D"
21588+
21589+#. (para)
21590+msgid "Toggle between one-pane diff and two-pane diff"
21591+msgstr "Alternar entre a comparação com um ou dois painéis."
21592+
21593+#. (term)
21594+msgid "Ctrl-U"
21595+msgstr "Ctrl-U"
21596+
21597+#. (para)
21598+msgid "Switches views"
21599+msgstr "Trocar vistas"
21600+
21601+#. (term)
21602+msgid "F12"
21603+msgstr ""
21604+
21605+#. (para)
21606+#. (para)
21607+msgid "Use left block"
21608+msgstr "Usar bloco esquerdo"
21609+
21610+#. (title)
21611+msgid "Conflict Resolution Mode Keyboard Shortcuts"
21612+msgstr ""
21613+
21614+#. (term)
21615+msgid "F8"
21616+msgstr "F8"
21617+
21618+#. (para)
21619+msgid "Go to next conflict"
21620+msgstr "Avançar para o próximo conflito"
21621+
21622+#. (term)
21623+msgid "Shift-F8"
21624+msgstr "Shift-F8"
21625+
21626+#. (para)
21627+msgid "Go to previous conflict"
21628+msgstr "Avançar para o conflito anterior"
21629+
21630+#. (term)
21631+msgid "Ctrl-F9"
21632+msgstr ""
21633+
21634+#. (term)
21635+msgid "Ctrl-Shift-F9"
21636+msgstr ""
21637+
21638+#. (para)
21639+msgid "Use left block then right block"
21640+msgstr ""
21641+
21642+#. (term)
21643+msgid "Ctrl-F10"
21644+msgstr ""
21645+
21646+#. (para)
21647+msgid "Use right block"
21648+msgstr "Usar bloco direito"
21649+
21650+#. (term)
21651+msgid "Ctrl-Shift-F10"
21652+msgstr ""
21653+
21654+#. (para)
21655+msgid "Use right block then left block"
21656+msgstr ""
21657+
21658+#. (title)
2160121659 msgid "Automating TortoiseMerge"
2160221660 msgstr "Automatizar o TortoiseMerge"
2160321661
--- trunk/Languages/pt_BR/TortoiseDoc.po (revision 29449)
+++ trunk/Languages/pt_BR/TortoiseDoc.po (revision 29450)
@@ -47,14 +47,14 @@
4747 "Project-Id-Version: TortoiseSVN\n"
4848 "Report-Msgid-Bugs-To: \n"
4949 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
50-"PO-Revision-Date: 2022-03-11 20:32+0000\n"
51-"Last-Translator: Lübbe Onken <luebbe.opensource@gmail.com>\n"
50+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
51+"Last-Translator: Caldas, 2020\n"
5252 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/luebbe/tortoisesvn/language/pt_BR/)\n"
5353 "MIME-Version: 1.0\n"
5454 "Content-Type: text/plain; charset=UTF-8\n"
5555 "Content-Transfer-Encoding: 8bit\n"
5656 "Language: pt_BR\n"
57-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
57+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
5858
5959 #. (title)
6060 #. (secondary)
@@ -15275,6 +15275,23 @@
1527515275
1527615276 #. (para)
1527715277 msgid ""
15278+"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15279+" is set to 0 (see above)."
15280+msgstr "Isto não tem efeito se a opção <literal> GroupTaskbarIconsPerRepo </literal> está definida para 0 (veja acima)."
15281+
15282+#. (title)
15283+msgid "Taskbar grouping with repository color overlays"
15284+msgstr "Agrupamento da barra de tarefas com sobreposições de cores do repositório"
15285+
15286+#. (para)
15287+msgid ""
15288+"If this option is set to <literal>true</literal>, then every icon on the "
15289+"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15290+"repository the dialogs/windows are used for. <placeholder-1/>"
15291+msgstr "Se esta opção estiver definida para <literal>true</literal> , Então cada ícone na barra de tarefas do Win7 mostra uma sobreposição de cor no pequeno rectângulo, indicando o repositório os diálogos/janelas são usados. <placeholder-1/>"
15292+
15293+#. (para)
15294+msgid ""
1527815295 "If this is set to <literal>false</literal>, then every "
1527915296 "<literal>svn:externals</literal> is shown during an update separately."
1528015297 msgstr "Se for posto a <literal>false</literal>, então é mostrado em separado cada <literal>svn:externals</literal> durante uma actualização."
@@ -15289,23 +15306,13 @@
1528915306
1529015307 #. (para)
1529115308 msgid ""
15292-"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15293-" is set to 0 (see above)."
15294-msgstr "Isto não tem efeito se a opção <literal> GroupTaskbarIconsPerRepo </literal> está definida para 0 (veja acima)."
15309+"If this is set to <literal>true</literal>, then cancelling the dialog to "
15310+"approve a hook script to run will show an error dialog indicating the user "
15311+"cancelled."
15312+msgstr ""
1529515313
15296-#. (title)
15297-msgid "Taskbar grouping with repository color overlays"
15298-msgstr "Agrupamento da barra de tarefas com sobreposições de cores do repositório"
15299-
1530015314 #. (para)
1530115315 msgid ""
15302-"If this option is set to <literal>true</literal>, then every icon on the "
15303-"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15304-"repository the dialogs/windows are used for. <placeholder-1/>"
15305-msgstr "Se esta opção estiver definida para <literal>true</literal> , Então cada ícone na barra de tarefas do Win7 mostra uma sobreposição de cor no pequeno rectângulo, indicando o repositório os diálogos/janelas são usados. <placeholder-1/>"
15306-
15307-#. (para)
15308-msgid ""
1530915316 "By default, TortoiseSVN always runs an update with externals included. This "
1531015317 "avoids problems with inconsistent working copies. If you have however a lot "
1531115318 "of externals set, an update can take quite a while. Set this value to "
@@ -21432,6 +21439,10 @@
2143221439 msgid "List of keyboard shortcuts and commands."
2143321440 msgstr "Lista de atalhos do teclado e comandos."
2143421441
21442+#. (title)
21443+msgid "General Keyboard Shortcuts"
21444+msgstr ""
21445+
2143521446 #. (term)
2143621447 msgid "Ctrl-Q, Ctrl-W, Escape"
2143721448 msgstr "Ctrl-Q, Ctrl-W, Escape"
@@ -21517,30 +21528,6 @@
2151721528 msgstr "Ir para a diferença anterior"
2151821529
2151921530 #. (term)
21520-msgid "F8"
21521-msgstr "F8"
21522-
21523-#. (para)
21524-msgid "Go to next conflict"
21525-msgstr "Ir para o próximo conflito"
21526-
21527-#. (term)
21528-msgid "Shift-F8"
21529-msgstr "Shift-F8"
21530-
21531-#. (para)
21532-msgid "Go to previous conflict"
21533-msgstr "Ir para o conflito anterior"
21534-
21535-#. (term)
21536-msgid "Ctrl-D"
21537-msgstr "Ctrl-D"
21538-
21539-#. (para)
21540-msgid "Toggle between one-pane diff and two-pane diff"
21541-msgstr "Anternar entre um painel com diferenças e dois painéis com diferenças"
21542-
21543-#. (term)
2154421531 msgid "Ctrl-R"
2154521532 msgstr "Ctrl-R"
2154621533
@@ -21585,14 +21572,6 @@
2158521572 msgstr "Selecionar todo o texto"
2158621573
2158721574 #. (term)
21588-msgid "Ctrl-U"
21589-msgstr "Ctrl-U"
21590-
21591-#. (para)
21592-msgid "Switches views"
21593-msgstr "Alternar visões"
21594-
21595-#. (term)
2159621575 msgid "Ctrl-mousewheel"
2159721576 msgstr "Ctrl-botão rolagem"
2159821577
@@ -21609,14 +21588,93 @@
2160921588 msgstr "Alternar entre visualização a esquerda/direita/inferior"
2161021589
2161121590 #. (term)
21591+#. (term)
2161221592 msgid "Ctrl-M"
2161321593 msgstr ""
2161421594
2161521595 #. (para)
21596+#. (para)
2161621597 msgid "Toggles between marking the selected change"
2161721598 msgstr ""
2161821599
2161921600 #. (title)
21601+msgid "Diff-Mode Keyboard Shortcuts"
21602+msgstr ""
21603+
21604+#. (term)
21605+msgid "Ctrl-D"
21606+msgstr "Ctrl-D"
21607+
21608+#. (para)
21609+msgid "Toggle between one-pane diff and two-pane diff"
21610+msgstr "Anternar entre um painel com diferenças e dois painéis com diferenças"
21611+
21612+#. (term)
21613+msgid "Ctrl-U"
21614+msgstr "Ctrl-U"
21615+
21616+#. (para)
21617+msgid "Switches views"
21618+msgstr "Alternar visões"
21619+
21620+#. (term)
21621+msgid "F12"
21622+msgstr ""
21623+
21624+#. (para)
21625+#. (para)
21626+msgid "Use left block"
21627+msgstr "Usar bloco da esquerda"
21628+
21629+#. (title)
21630+msgid "Conflict Resolution Mode Keyboard Shortcuts"
21631+msgstr ""
21632+
21633+#. (term)
21634+msgid "F8"
21635+msgstr "F8"
21636+
21637+#. (para)
21638+msgid "Go to next conflict"
21639+msgstr "Ir para o próximo conflito"
21640+
21641+#. (term)
21642+msgid "Shift-F8"
21643+msgstr "Shift-F8"
21644+
21645+#. (para)
21646+msgid "Go to previous conflict"
21647+msgstr "Ir para o conflito anterior"
21648+
21649+#. (term)
21650+msgid "Ctrl-F9"
21651+msgstr ""
21652+
21653+#. (term)
21654+msgid "Ctrl-Shift-F9"
21655+msgstr ""
21656+
21657+#. (para)
21658+msgid "Use left block then right block"
21659+msgstr ""
21660+
21661+#. (term)
21662+msgid "Ctrl-F10"
21663+msgstr ""
21664+
21665+#. (para)
21666+msgid "Use right block"
21667+msgstr "Usar bloco direito"
21668+
21669+#. (term)
21670+msgid "Ctrl-Shift-F10"
21671+msgstr ""
21672+
21673+#. (para)
21674+msgid "Use right block then left block"
21675+msgstr ""
21676+
21677+#. (title)
2162021678 msgid "Automating TortoiseMerge"
2162121679 msgstr "Automatizando TortoiseMerge"
2162221680
--- trunk/Languages/ru/TortoiseDoc.po (revision 29449)
+++ trunk/Languages/ru/TortoiseDoc.po (revision 29450)
@@ -35,8 +35,8 @@
3535 "Project-Id-Version: TortoiseSVN\n"
3636 "Report-Msgid-Bugs-To: \n"
3737 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
38-"PO-Revision-Date: 2021-08-28 09:24+0000\n"
39-"Last-Translator: Transifex Bot <>\n"
38+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
39+"Last-Translator: Сергей Аксёнов <aksenov007bond@gmail.com>, 2016\n"
4040 "Language-Team: Russian (http://www.transifex.com/luebbe/tortoisesvn/language/ru/)\n"
4141 "MIME-Version: 1.0\n"
4242 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15263,6 +15263,23 @@
1526315263
1526415264 #. (para)
1526515265 msgid ""
15266+"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15267+" is set to 0 (see above)."
15268+msgstr "Это не работает если настройка <literal>GroupTaskbarIconsPerRepo</literal> установлена в значение 0 (см. выше)."
15269+
15270+#. (title)
15271+msgid "Taskbar grouping with repository color overlays"
15272+msgstr "Группировка панели задач с цветным оверлеем хранилища"
15273+
15274+#. (para)
15275+msgid ""
15276+"If this option is set to <literal>true</literal>, then every icon on the "
15277+"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15278+"repository the dialogs/windows are used for. <placeholder-1/>"
15279+msgstr "Если эта настройка установлена в <literal>true</literal>, то каждая иконка на панели задач Windows 7 отображает маленький цветной прямоугольник с оверлейным значком, показывающий для какого хранилища используется диалог/окно. <placeholder-1/>"
15280+
15281+#. (para)
15282+msgid ""
1526615283 "If this is set to <literal>false</literal>, then every "
1526715284 "<literal>svn:externals</literal> is shown during an update separately."
1526815285 msgstr "Если установлено <literal>false</literal>, то каждое <literal>svn:externals</literal> при обновлении отображается отдельно."
@@ -15277,23 +15294,13 @@
1527715294
1527815295 #. (para)
1527915296 msgid ""
15280-"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15281-" is set to 0 (see above)."
15282-msgstr "Это не работает если настройка <literal>GroupTaskbarIconsPerRepo</literal> установлена в значение 0 (см. выше)."
15297+"If this is set to <literal>true</literal>, then cancelling the dialog to "
15298+"approve a hook script to run will show an error dialog indicating the user "
15299+"cancelled."
15300+msgstr ""
1528315301
15284-#. (title)
15285-msgid "Taskbar grouping with repository color overlays"
15286-msgstr "Группировка панели задач с цветным оверлеем хранилища"
15287-
1528815302 #. (para)
1528915303 msgid ""
15290-"If this option is set to <literal>true</literal>, then every icon on the "
15291-"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15292-"repository the dialogs/windows are used for. <placeholder-1/>"
15293-msgstr "Если эта настройка установлена в <literal>true</literal>, то каждая иконка на панели задач Windows 7 отображает маленький цветной прямоугольник с оверлейным значком, показывающий для какого хранилища используется диалог/окно. <placeholder-1/>"
15294-
15295-#. (para)
15296-msgid ""
1529715304 "By default, TortoiseSVN always runs an update with externals included. This "
1529815305 "avoids problems with inconsistent working copies. If you have however a lot "
1529915306 "of externals set, an update can take quite a while. Set this value to "
@@ -21420,6 +21427,10 @@
2142021427 msgid "List of keyboard shortcuts and commands."
2142121428 msgstr "Список клавиатурных сокращений и команд."
2142221429
21430+#. (title)
21431+msgid "General Keyboard Shortcuts"
21432+msgstr ""
21433+
2142321434 #. (term)
2142421435 msgid "Ctrl-Q, Ctrl-W, Escape"
2142521436 msgstr "Ctrl-Q, Ctrl-W, Escape"
@@ -21505,30 +21516,6 @@
2150521516 msgstr "Перейти к предыдущему различию"
2150621517
2150721518 #. (term)
21508-msgid "F8"
21509-msgstr "F8"
21510-
21511-#. (para)
21512-msgid "Go to next conflict"
21513-msgstr "Перейти к следующему конфликту"
21514-
21515-#. (term)
21516-msgid "Shift-F8"
21517-msgstr "Shift-F8"
21518-
21519-#. (para)
21520-msgid "Go to previous conflict"
21521-msgstr "Перейти к предыдущему конфликту"
21522-
21523-#. (term)
21524-msgid "Ctrl-D"
21525-msgstr "Ctrl-D"
21526-
21527-#. (para)
21528-msgid "Toggle between one-pane diff and two-pane diff"
21529-msgstr "Переключиться между одно- и двухпанельным видами"
21530-
21531-#. (term)
2153221519 msgid "Ctrl-R"
2153321520 msgstr "Ctrl-R"
2153421521
@@ -21573,14 +21560,6 @@
2157321560 msgstr "Выбрать весь текст"
2157421561
2157521562 #. (term)
21576-msgid "Ctrl-U"
21577-msgstr "Ctrl-U"
21578-
21579-#. (para)
21580-msgid "Switches views"
21581-msgstr "Переключает виды"
21582-
21583-#. (term)
2158421563 msgid "Ctrl-mousewheel"
2158521564 msgstr "Ctrl-колёсико мыши"
2158621565
@@ -21597,14 +21576,93 @@
2159721576 msgstr "Переключить между левым/правым/нижним видом"
2159821577
2159921578 #. (term)
21579+#. (term)
2160021580 msgid "Ctrl-M"
2160121581 msgstr ""
2160221582
2160321583 #. (para)
21584+#. (para)
2160421585 msgid "Toggles between marking the selected change"
2160521586 msgstr ""
2160621587
2160721588 #. (title)
21589+msgid "Diff-Mode Keyboard Shortcuts"
21590+msgstr ""
21591+
21592+#. (term)
21593+msgid "Ctrl-D"
21594+msgstr "Ctrl-D"
21595+
21596+#. (para)
21597+msgid "Toggle between one-pane diff and two-pane diff"
21598+msgstr "Переключиться между одно- и двухпанельным видами"
21599+
21600+#. (term)
21601+msgid "Ctrl-U"
21602+msgstr "Ctrl-U"
21603+
21604+#. (para)
21605+msgid "Switches views"
21606+msgstr "Переключает виды"
21607+
21608+#. (term)
21609+msgid "F12"
21610+msgstr ""
21611+
21612+#. (para)
21613+#. (para)
21614+msgid "Use left block"
21615+msgstr "Использовать левый блок"
21616+
21617+#. (title)
21618+msgid "Conflict Resolution Mode Keyboard Shortcuts"
21619+msgstr ""
21620+
21621+#. (term)
21622+msgid "F8"
21623+msgstr "F8"
21624+
21625+#. (para)
21626+msgid "Go to next conflict"
21627+msgstr "Перейти к следующему конфликту"
21628+
21629+#. (term)
21630+msgid "Shift-F8"
21631+msgstr "Shift-F8"
21632+
21633+#. (para)
21634+msgid "Go to previous conflict"
21635+msgstr "Перейти к предыдущему конфликту"
21636+
21637+#. (term)
21638+msgid "Ctrl-F9"
21639+msgstr ""
21640+
21641+#. (term)
21642+msgid "Ctrl-Shift-F9"
21643+msgstr ""
21644+
21645+#. (para)
21646+msgid "Use left block then right block"
21647+msgstr ""
21648+
21649+#. (term)
21650+msgid "Ctrl-F10"
21651+msgstr ""
21652+
21653+#. (para)
21654+msgid "Use right block"
21655+msgstr "Использовать правый блок"
21656+
21657+#. (term)
21658+msgid "Ctrl-Shift-F10"
21659+msgstr ""
21660+
21661+#. (para)
21662+msgid "Use right block then left block"
21663+msgstr ""
21664+
21665+#. (title)
2160821666 msgid "Automating TortoiseMerge"
2160921667 msgstr "Автоматизация TortoiseMerge"
2161021668
--- trunk/Languages/sk/TortoiseDoc.po (revision 29449)
+++ trunk/Languages/sk/TortoiseDoc.po (revision 29450)
@@ -19,8 +19,8 @@
1919 "Project-Id-Version: TortoiseSVN\n"
2020 "Report-Msgid-Bugs-To: \n"
2121 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
22-"PO-Revision-Date: 2021-09-24 09:24+0000\n"
23-"Last-Translator: Jozef Matta <jozef.m923@gmail.com>\n"
22+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
23+"Last-Translator: Jozef Matta <jozef.m923@gmail.com>, 2020-2021\n"
2424 "Language-Team: Slovak (http://www.transifex.com/luebbe/tortoisesvn/language/sk/)\n"
2525 "MIME-Version: 1.0\n"
2626 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15247,6 +15247,23 @@
1524715247
1524815248 #. (para)
1524915249 msgid ""
15250+"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15251+" is set to 0 (see above)."
15252+msgstr "Toto nemá žiadny vplyv, ak je táto možnosť k dispozícii <literal>GroupTaskbarIconsPerRepo</literal> je nastavená na 0 (pozri vyššie)."
15253+
15254+#. (title)
15255+msgid "Taskbar grouping with repository color overlays"
15256+msgstr "Zoskupenie na hlavnom paneli s farbami prekrytia úložiska"
15257+
15258+#. (para)
15259+msgid ""
15260+"If this option is set to <literal>true</literal>, then every icon on the "
15261+"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15262+"repository the dialogs/windows are used for. <placeholder-1/>"
15263+msgstr "Ak je táto možnosť nastavená na <literal>true</literal>, potom každá ikona na paneli úloh Win7 zobrazuje malé farebné obdĺžnikové prekrytie, ktoré označuje úložisko, pre ktoré sa používajú dialógy/okná. <placeholder-1/>"
15264+
15265+#. (para)
15266+msgid ""
1525015267 "If this is set to <literal>false</literal>, then every "
1525115268 "<literal>svn:externals</literal> is shown during an update separately."
1525215269 msgstr "Ak to je nastavené na <literal>false</literal>, potom každý <literal>svn:externals</literal> sa počas aktualizácie zobrazuje osobitne."
@@ -15261,23 +15278,13 @@
1526115278
1526215279 #. (para)
1526315280 msgid ""
15264-"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15265-" is set to 0 (see above)."
15266-msgstr "Toto nemá žiadny vplyv, ak je táto možnosť k dispozícii <literal>GroupTaskbarIconsPerRepo</literal> je nastavená na 0 (pozri vyššie)."
15281+"If this is set to <literal>true</literal>, then cancelling the dialog to "
15282+"approve a hook script to run will show an error dialog indicating the user "
15283+"cancelled."
15284+msgstr ""
1526715285
15268-#. (title)
15269-msgid "Taskbar grouping with repository color overlays"
15270-msgstr "Zoskupenie na hlavnom paneli s farbami prekrytia úložiska"
15271-
1527215286 #. (para)
1527315287 msgid ""
15274-"If this option is set to <literal>true</literal>, then every icon on the "
15275-"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15276-"repository the dialogs/windows are used for. <placeholder-1/>"
15277-msgstr "Ak je táto možnosť nastavená na <literal>true</literal>, potom každá ikona na paneli úloh Win7 zobrazuje malé farebné obdĺžnikové prekrytie, ktoré označuje úložisko, pre ktoré sa používajú dialógy/okná. <placeholder-1/>"
15278-
15279-#. (para)
15280-msgid ""
1528115288 "By default, TortoiseSVN always runs an update with externals included. This "
1528215289 "avoids problems with inconsistent working copies. If you have however a lot "
1528315290 "of externals set, an update can take quite a while. Set this value to "
@@ -21404,6 +21411,10 @@
2140421411 msgid "List of keyboard shortcuts and commands."
2140521412 msgstr "Zoznam klávesových skratiek a príkazov."
2140621413
21414+#. (title)
21415+msgid "General Keyboard Shortcuts"
21416+msgstr ""
21417+
2140721418 #. (term)
2140821419 msgid "Ctrl-Q, Ctrl-W, Escape"
2140921420 msgstr "Ctrl-Q, Ctrl-W, Escape"
@@ -21489,30 +21500,6 @@
2148921500 msgstr "Prejsť na predošlý rozdiel"
2149021501
2149121502 #. (term)
21492-msgid "F8"
21493-msgstr "F8"
21494-
21495-#. (para)
21496-msgid "Go to next conflict"
21497-msgstr "Prejsť na nasledujúci konflikt"
21498-
21499-#. (term)
21500-msgid "Shift-F8"
21501-msgstr "Shift-F8"
21502-
21503-#. (para)
21504-msgid "Go to previous conflict"
21505-msgstr "Prejsť na predošlý konflikt"
21506-
21507-#. (term)
21508-msgid "Ctrl-D"
21509-msgstr "Ctrl-D"
21510-
21511-#. (para)
21512-msgid "Toggle between one-pane diff and two-pane diff"
21513-msgstr "Prepnúť medzi jednopanelovým a dvojpanelovým porovnaním odlišností"
21514-
21515-#. (term)
2151621503 msgid "Ctrl-R"
2151721504 msgstr "Ctrl-R"
2151821505
@@ -21557,14 +21544,6 @@
2155721544 msgstr "Vybrať celý text"
2155821545
2155921546 #. (term)
21560-msgid "Ctrl-U"
21561-msgstr "Ctrl-U"
21562-
21563-#. (para)
21564-msgid "Switches views"
21565-msgstr "Prepína zobrazenia"
21566-
21567-#. (term)
2156821547 msgid "Ctrl-mousewheel"
2156921548 msgstr "Ctrl+koliesko myši"
2157021549
@@ -21581,14 +21560,93 @@
2158121560 msgstr "Prepínanie medzi ľavým/pravým/spodným zobrazením"
2158221561
2158321562 #. (term)
21563+#. (term)
2158421564 msgid "Ctrl-M"
2158521565 msgstr "Ctrl-M"
2158621566
2158721567 #. (para)
21568+#. (para)
2158821569 msgid "Toggles between marking the selected change"
2158921570 msgstr "Prepína medzi označením vybranej zmeny"
2159021571
2159121572 #. (title)
21573+msgid "Diff-Mode Keyboard Shortcuts"
21574+msgstr ""
21575+
21576+#. (term)
21577+msgid "Ctrl-D"
21578+msgstr "Ctrl-D"
21579+
21580+#. (para)
21581+msgid "Toggle between one-pane diff and two-pane diff"
21582+msgstr "Prepnúť medzi jednopanelovým a dvojpanelovým porovnaním odlišností"
21583+
21584+#. (term)
21585+msgid "Ctrl-U"
21586+msgstr "Ctrl-U"
21587+
21588+#. (para)
21589+msgid "Switches views"
21590+msgstr "Prepína zobrazenia"
21591+
21592+#. (term)
21593+msgid "F12"
21594+msgstr ""
21595+
21596+#. (para)
21597+#. (para)
21598+msgid "Use left block"
21599+msgstr "Použiť ľavý blok"
21600+
21601+#. (title)
21602+msgid "Conflict Resolution Mode Keyboard Shortcuts"
21603+msgstr ""
21604+
21605+#. (term)
21606+msgid "F8"
21607+msgstr "F8"
21608+
21609+#. (para)
21610+msgid "Go to next conflict"
21611+msgstr "Prejsť na nasledujúci konflikt"
21612+
21613+#. (term)
21614+msgid "Shift-F8"
21615+msgstr "Shift-F8"
21616+
21617+#. (para)
21618+msgid "Go to previous conflict"
21619+msgstr "Prejsť na predošlý konflikt"
21620+
21621+#. (term)
21622+msgid "Ctrl-F9"
21623+msgstr ""
21624+
21625+#. (term)
21626+msgid "Ctrl-Shift-F9"
21627+msgstr ""
21628+
21629+#. (para)
21630+msgid "Use left block then right block"
21631+msgstr ""
21632+
21633+#. (term)
21634+msgid "Ctrl-F10"
21635+msgstr ""
21636+
21637+#. (para)
21638+msgid "Use right block"
21639+msgstr "Použiť pravý blok"
21640+
21641+#. (term)
21642+msgid "Ctrl-Shift-F10"
21643+msgstr ""
21644+
21645+#. (para)
21646+msgid "Use right block then left block"
21647+msgstr ""
21648+
21649+#. (title)
2159221650 msgid "Automating TortoiseMerge"
2159321651 msgstr "Automatizácia TortoiseMerge"
2159421652
--- trunk/Languages/sr/TortoiseDoc.po (revision 29449)
+++ trunk/Languages/sr/TortoiseDoc.po (revision 29450)
@@ -21,8 +21,8 @@
2121 "Project-Id-Version: TortoiseSVN\n"
2222 "Report-Msgid-Bugs-To: \n"
2323 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
24-"PO-Revision-Date: 2021-08-28 09:24+0000\n"
25-"Last-Translator: Transifex Bot <>\n"
24+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
25+"Last-Translator: Stefan Kueng <tortoisesvn@gmail.com>, 2013,2021\n"
2626 "Language-Team: Serbian (http://www.transifex.com/luebbe/tortoisesvn/language/sr/)\n"
2727 "MIME-Version: 1.0\n"
2828 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15249,6 +15249,23 @@
1524915249
1525015250 #. (para)
1525115251 msgid ""
15252+"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15253+" is set to 0 (see above)."
15254+msgstr "Ово нема утицаја ако је опција <literal>GroupTaskbarIconsPerRepo</literal> сетована на 0 (види горе)."
15255+
15256+#. (title)
15257+msgid "Taskbar grouping with repository color overlays"
15258+msgstr "Алатни пулт груписање са колор прекривачима спремишта"
15259+
15260+#. (para)
15261+msgid ""
15262+"If this option is set to <literal>true</literal>, then every icon on the "
15263+"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15264+"repository the dialogs/windows are used for. <placeholder-1/>"
15265+msgstr "Ова опција је подешена на <literal>истина</literal>, онда свака икона на Вин7 алат пулту приказује мали обојени квадратни прекривач, означавајући да су дијалози/прозори заузети. <placeholder-1/>"
15266+
15267+#. (para)
15268+msgid ""
1525215269 "If this is set to <literal>false</literal>, then every "
1525315270 "<literal>svn:externals</literal> is shown during an update separately."
1525415271 msgstr "Ако је то подешено на <literal>лаж</literal>, онда сваки <literal>svn:externals</literal> је приказан у току усклађивања посебно."
@@ -15263,23 +15280,13 @@
1526315280
1526415281 #. (para)
1526515282 msgid ""
15266-"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15267-" is set to 0 (see above)."
15268-msgstr "Ово нема утицаја ако је опција <literal>GroupTaskbarIconsPerRepo</literal> сетована на 0 (види горе)."
15283+"If this is set to <literal>true</literal>, then cancelling the dialog to "
15284+"approve a hook script to run will show an error dialog indicating the user "
15285+"cancelled."
15286+msgstr ""
1526915287
15270-#. (title)
15271-msgid "Taskbar grouping with repository color overlays"
15272-msgstr "Алатни пулт груписање са колор прекривачима спремишта"
15273-
1527415288 #. (para)
1527515289 msgid ""
15276-"If this option is set to <literal>true</literal>, then every icon on the "
15277-"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15278-"repository the dialogs/windows are used for. <placeholder-1/>"
15279-msgstr "Ова опција је подешена на <literal>истина</literal>, онда свака икона на Вин7 алат пулту приказује мали обојени квадратни прекривач, означавајући да су дијалози/прозори заузети. <placeholder-1/>"
15280-
15281-#. (para)
15282-msgid ""
1528315290 "By default, TortoiseSVN always runs an update with externals included. This "
1528415291 "avoids problems with inconsistent working copies. If you have however a lot "
1528515292 "of externals set, an update can take quite a while. Set this value to "
@@ -21406,6 +21413,10 @@
2140621413 msgid "List of keyboard shortcuts and commands."
2140721414 msgstr "Листа скраћеница тастатуре и команди."
2140821415
21416+#. (title)
21417+msgid "General Keyboard Shortcuts"
21418+msgstr ""
21419+
2140921420 #. (term)
2141021421 msgid "Ctrl-Q, Ctrl-W, Escape"
2141121422 msgstr "Ctrl-Q, Ctrl-W, Escape"
@@ -21491,30 +21502,6 @@
2149121502 msgstr "Иди на претходну разлику"
2149221503
2149321504 #. (term)
21494-msgid "F8"
21495-msgstr "Ф8"
21496-
21497-#. (para)
21498-msgid "Go to next conflict"
21499-msgstr "Иди на следећи конфликт"
21500-
21501-#. (term)
21502-msgid "Shift-F8"
21503-msgstr "Шифт-Ф8"
21504-
21505-#. (para)
21506-msgid "Go to previous conflict"
21507-msgstr "Иди на претходни конфликт"
21508-
21509-#. (term)
21510-msgid "Ctrl-D"
21511-msgstr "Цтрл-Д"
21512-
21513-#. (para)
21514-msgid "Toggle between one-pane diff and two-pane diff"
21515-msgstr "Пређи између један-панел дифф и два-панела разл"
21516-
21517-#. (term)
2151821505 msgid "Ctrl-R"
2151921506 msgstr "Цтрл-Р"
2152021507
@@ -21559,14 +21546,6 @@
2155921546 msgstr "Изабери цео текст"
2156021547
2156121548 #. (term)
21562-msgid "Ctrl-U"
21563-msgstr "ЦТРЛ-У"
21564-
21565-#. (para)
21566-msgid "Switches views"
21567-msgstr "Замењује прегледе"
21568-
21569-#. (term)
2157021549 msgid "Ctrl-mousewheel"
2157121550 msgstr "Цтрл-мишточкић"
2157221551
@@ -21583,14 +21562,93 @@
2158321562 msgstr "Прелаз између левог/десног/доњег прегледа"
2158421563
2158521564 #. (term)
21565+#. (term)
2158621566 msgid "Ctrl-M"
2158721567 msgstr ""
2158821568
2158921569 #. (para)
21570+#. (para)
2159021571 msgid "Toggles between marking the selected change"
2159121572 msgstr ""
2159221573
2159321574 #. (title)
21575+msgid "Diff-Mode Keyboard Shortcuts"
21576+msgstr ""
21577+
21578+#. (term)
21579+msgid "Ctrl-D"
21580+msgstr "Цтрл-Д"
21581+
21582+#. (para)
21583+msgid "Toggle between one-pane diff and two-pane diff"
21584+msgstr "Пређи између један-панел дифф и два-панела разл"
21585+
21586+#. (term)
21587+msgid "Ctrl-U"
21588+msgstr "ЦТРЛ-У"
21589+
21590+#. (para)
21591+msgid "Switches views"
21592+msgstr "Замењује прегледе"
21593+
21594+#. (term)
21595+msgid "F12"
21596+msgstr ""
21597+
21598+#. (para)
21599+#. (para)
21600+msgid "Use left block"
21601+msgstr "Користи леви блок"
21602+
21603+#. (title)
21604+msgid "Conflict Resolution Mode Keyboard Shortcuts"
21605+msgstr ""
21606+
21607+#. (term)
21608+msgid "F8"
21609+msgstr "Ф8"
21610+
21611+#. (para)
21612+msgid "Go to next conflict"
21613+msgstr "Иди на следећи конфликт"
21614+
21615+#. (term)
21616+msgid "Shift-F8"
21617+msgstr "Шифт-Ф8"
21618+
21619+#. (para)
21620+msgid "Go to previous conflict"
21621+msgstr "Иди на претходни конфликт"
21622+
21623+#. (term)
21624+msgid "Ctrl-F9"
21625+msgstr ""
21626+
21627+#. (term)
21628+msgid "Ctrl-Shift-F9"
21629+msgstr ""
21630+
21631+#. (para)
21632+msgid "Use left block then right block"
21633+msgstr ""
21634+
21635+#. (term)
21636+msgid "Ctrl-F10"
21637+msgstr ""
21638+
21639+#. (para)
21640+msgid "Use right block"
21641+msgstr "Користи десни блок"
21642+
21643+#. (term)
21644+msgid "Ctrl-Shift-F10"
21645+msgstr ""
21646+
21647+#. (para)
21648+msgid "Use right block then left block"
21649+msgstr ""
21650+
21651+#. (title)
2159421652 msgid "Automating TortoiseMerge"
2159521653 msgstr "Аутоматизуј ТортоисеМерге"
2159621654
--- trunk/Languages/sr@latin/TortoiseDoc.po (revision 29449)
+++ trunk/Languages/sr@latin/TortoiseDoc.po (revision 29450)
@@ -21,8 +21,8 @@
2121 "Project-Id-Version: TortoiseSVN\n"
2222 "Report-Msgid-Bugs-To: \n"
2323 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
24-"PO-Revision-Date: 2021-08-28 09:24+0000\n"
25-"Last-Translator: Transifex Bot <>\n"
24+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
25+"Last-Translator: Stefan Kueng <tortoisesvn@gmail.com>, 2013\n"
2626 "Language-Team: Serbian (Latin) (http://www.transifex.com/luebbe/tortoisesvn/language/sr@latin/)\n"
2727 "MIME-Version: 1.0\n"
2828 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15249,6 +15249,23 @@
1524915249
1525015250 #. (para)
1525115251 msgid ""
15252+"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15253+" is set to 0 (see above)."
15254+msgstr "Ovo nema uticaja ako je opcija <literal>GroupTaskbarIconsPerRepo</literal> setovana na 0 (vidi gore)."
15255+
15256+#. (title)
15257+msgid "Taskbar grouping with repository color overlays"
15258+msgstr "Alatni pult grupisanje sa kolor prekrivačima spremišta"
15259+
15260+#. (para)
15261+msgid ""
15262+"If this option is set to <literal>true</literal>, then every icon on the "
15263+"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15264+"repository the dialogs/windows are used for. <placeholder-1/>"
15265+msgstr "Ova opcija je podešena na <literal>istina</literal>, onda svaka ikona na Vin7 alat pultu prikazuje mali obojeni kvadratni prekrivač, označavajući da su dijalozi/prozori zauzeti. <placeholder-1/>"
15266+
15267+#. (para)
15268+msgid ""
1525215269 "If this is set to <literal>false</literal>, then every "
1525315270 "<literal>svn:externals</literal> is shown during an update separately."
1525415271 msgstr "Ako je to podešeno na <literal>laž</literal>, onda svaki <literal>svn:externals</literal> je prikazan u toku usklađivanja posebno."
@@ -15263,23 +15280,13 @@
1526315280
1526415281 #. (para)
1526515282 msgid ""
15266-"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15267-" is set to 0 (see above)."
15268-msgstr "Ovo nema uticaja ako je opcija <literal>GroupTaskbarIconsPerRepo</literal> setovana na 0 (vidi gore)."
15283+"If this is set to <literal>true</literal>, then cancelling the dialog to "
15284+"approve a hook script to run will show an error dialog indicating the user "
15285+"cancelled."
15286+msgstr ""
1526915287
15270-#. (title)
15271-msgid "Taskbar grouping with repository color overlays"
15272-msgstr "Alatni pult grupisanje sa kolor prekrivačima spremišta"
15273-
1527415288 #. (para)
1527515289 msgid ""
15276-"If this option is set to <literal>true</literal>, then every icon on the "
15277-"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15278-"repository the dialogs/windows are used for. <placeholder-1/>"
15279-msgstr "Ova opcija je podešena na <literal>istina</literal>, onda svaka ikona na Vin7 alat pultu prikazuje mali obojeni kvadratni prekrivač, označavajući da su dijalozi/prozori zauzeti. <placeholder-1/>"
15280-
15281-#. (para)
15282-msgid ""
1528315290 "By default, TortoiseSVN always runs an update with externals included. This "
1528415291 "avoids problems with inconsistent working copies. If you have however a lot "
1528515292 "of externals set, an update can take quite a while. Set this value to "
@@ -21406,6 +21413,10 @@
2140621413 msgid "List of keyboard shortcuts and commands."
2140721414 msgstr "Lista skraćenica tastature i komandi."
2140821415
21416+#. (title)
21417+msgid "General Keyboard Shortcuts"
21418+msgstr ""
21419+
2140921420 #. (term)
2141021421 msgid "Ctrl-Q, Ctrl-W, Escape"
2141121422 msgstr "Ctrl-Q, Ctrl-W, Escape"
@@ -21491,30 +21502,6 @@
2149121502 msgstr "Idi na prethodnu razliku"
2149221503
2149321504 #. (term)
21494-msgid "F8"
21495-msgstr "F8"
21496-
21497-#. (para)
21498-msgid "Go to next conflict"
21499-msgstr "Idi na sledeći konflikt"
21500-
21501-#. (term)
21502-msgid "Shift-F8"
21503-msgstr "Šift-F8"
21504-
21505-#. (para)
21506-msgid "Go to previous conflict"
21507-msgstr "Idi na prethodni konflikt"
21508-
21509-#. (term)
21510-msgid "Ctrl-D"
21511-msgstr "Ctrl-D"
21512-
21513-#. (para)
21514-msgid "Toggle between one-pane diff and two-pane diff"
21515-msgstr "Pređi između jedan-panel diff i dva-panela razl"
21516-
21517-#. (term)
2151821505 msgid "Ctrl-R"
2151921506 msgstr "Ctrl-R"
2152021507
@@ -21559,14 +21546,6 @@
2155921546 msgstr "Izaberi ceo tekst"
2156021547
2156121548 #. (term)
21562-msgid "Ctrl-U"
21563-msgstr "CTRL-U"
21564-
21565-#. (para)
21566-msgid "Switches views"
21567-msgstr "Zamenjuje preglede"
21568-
21569-#. (term)
2157021549 msgid "Ctrl-mousewheel"
2157121550 msgstr "Ctrl-mištočkić"
2157221551
@@ -21583,14 +21562,93 @@
2158321562 msgstr "Prelaz između levog/desnog/donjeg pregleda"
2158421563
2158521564 #. (term)
21565+#. (term)
2158621566 msgid "Ctrl-M"
2158721567 msgstr ""
2158821568
2158921569 #. (para)
21570+#. (para)
2159021571 msgid "Toggles between marking the selected change"
2159121572 msgstr ""
2159221573
2159321574 #. (title)
21575+msgid "Diff-Mode Keyboard Shortcuts"
21576+msgstr ""
21577+
21578+#. (term)
21579+msgid "Ctrl-D"
21580+msgstr "Ctrl-D"
21581+
21582+#. (para)
21583+msgid "Toggle between one-pane diff and two-pane diff"
21584+msgstr "Pređi između jedan-panel diff i dva-panela razl"
21585+
21586+#. (term)
21587+msgid "Ctrl-U"
21588+msgstr "CTRL-U"
21589+
21590+#. (para)
21591+msgid "Switches views"
21592+msgstr "Zamenjuje preglede"
21593+
21594+#. (term)
21595+msgid "F12"
21596+msgstr ""
21597+
21598+#. (para)
21599+#. (para)
21600+msgid "Use left block"
21601+msgstr "Koristi levi blok"
21602+
21603+#. (title)
21604+msgid "Conflict Resolution Mode Keyboard Shortcuts"
21605+msgstr ""
21606+
21607+#. (term)
21608+msgid "F8"
21609+msgstr "F8"
21610+
21611+#. (para)
21612+msgid "Go to next conflict"
21613+msgstr "Idi na sledeći konflikt"
21614+
21615+#. (term)
21616+msgid "Shift-F8"
21617+msgstr "Šift-F8"
21618+
21619+#. (para)
21620+msgid "Go to previous conflict"
21621+msgstr "Idi na prethodni konflikt"
21622+
21623+#. (term)
21624+msgid "Ctrl-F9"
21625+msgstr ""
21626+
21627+#. (term)
21628+msgid "Ctrl-Shift-F9"
21629+msgstr ""
21630+
21631+#. (para)
21632+msgid "Use left block then right block"
21633+msgstr ""
21634+
21635+#. (term)
21636+msgid "Ctrl-F10"
21637+msgstr ""
21638+
21639+#. (para)
21640+msgid "Use right block"
21641+msgstr "Koristi desni blok"
21642+
21643+#. (term)
21644+msgid "Ctrl-Shift-F10"
21645+msgstr ""
21646+
21647+#. (para)
21648+msgid "Use right block then left block"
21649+msgstr ""
21650+
21651+#. (title)
2159421652 msgid "Automating TortoiseMerge"
2159521653 msgstr "Automatizuj TortoiseMerge"
2159621654
--- trunk/Languages/sv/TortoiseUI.po (revision 29449)
+++ trunk/Languages/sv/TortoiseUI.po (revision 29450)
@@ -11,7 +11,7 @@
1111 # Authors:
1212 # Translators:
1313 # Christian Siegert <csi@xautomation.se>, 2019
14-# Daniel Sahlberg <daniel.l.sahlberg@gmail.com>, 2015,2019,2021
14+# Daniel Sahlberg <daniel.l.sahlberg@gmail.com>, 2015,2019,2021-2022
1515 # Fredrik Velin <figgemail@gmail.com>, 2014
1616 # Johan Foglemark <johanfoglemark@gmail.com>, 2011,2013
1717 # LordDaimos <karl.sjogren@gmail.com>, 2011
@@ -28,8 +28,8 @@
2828 "Project-Id-Version: TortoiseSVN\n"
2929 "Report-Msgid-Bugs-To: \n"
3030 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
31-"PO-Revision-Date: 2022-03-11 20:32+0000\n"
32-"Last-Translator: Lübbe Onken <luebbe.opensource@gmail.com>\n"
31+"PO-Revision-Date: 2010-11-30 05:14+0000\n"
32+"Last-Translator: Daniel Sahlberg <daniel.l.sahlberg@gmail.com>, 2015,2019,2021-2022\n"
3333 "Language-Team: Swedish (http://www.transifex.com/luebbe/tortoisesvn/language/sv/)\n"
3434 "MIME-Version: 1.0\n"
3535 "Content-Type: text/plain; charset=UTF-8\n"
@@ -537,7 +537,7 @@
537537 msgid ""
538538 "&Cancel\n"
539539 "The tagged revision of the external is left as is."
540-msgstr ""
540+msgstr "Avbryt\nDen märkta revisionen av den externa filen behålls."
541541
542542 #. Resource IDs: (2341)
543543 msgid ""
@@ -565,7 +565,7 @@
565565
566566 #. Resource IDs: (1678)
567567 msgid "&Checkpoint"
568-msgstr ""
568+msgstr "&Kontrollpunkt"
569569
570570 #. Resource IDs: (1606)
571571 msgid "&Choose items..."
@@ -589,7 +589,7 @@
589589
590590 #. Resource IDs: (65535)
591591 msgid "&Collaborator username"
592-msgstr ""
592+msgstr "Användarnamn i &Collaborator"
593593
594594 #. Resource IDs: (122)
595595 msgid "&Commit..."
@@ -1116,7 +1116,7 @@
11161116
11171117 #. Resource IDs: (ID_VIEW_OVERLAPIMAGES - Menu)
11181118 msgid "&Overlay images\t(O)"
1119-msgstr ""
1119+msgstr "&Statusikoner\n(S)"
11201120
11211121 #. Resource IDs: (1440)
11221122 msgid ""
@@ -1184,23 +1184,23 @@
11841184 msgid ""
11851185 "&Proceed anyway\n"
11861186 "Ignore the hook script and run the command anyway."
1187-msgstr ""
1187+msgstr "&Fortsätt ändå\nIgnorera krokskriptet och kör kommandot ändå."
11881188
11891189 #. Resource IDs: (1417)
11901190 msgid ""
11911191 "&Proceed with the entered path\n"
11921192 "I'm aware of the possible problems."
1193-msgstr ""
1193+msgstr "&Fortsätt med den angivna sökvägen\nJag är införstådd med de potentiella problemen."
11941194
11951195 #. Resource IDs: (4460)
11961196 msgid "&Proceed with the merge."
1197-msgstr ""
1197+msgstr "&Fortsätt med sammanslagningen"
11981198
11991199 #. Resource IDs: (2753)
12001200 msgid ""
12011201 "&Proceed without an issue number\n"
12021202 "The commit won't be assigned to an issue."
1203-msgstr ""
1203+msgstr "&Fortsätt utan ett ärendenummer\nDenna arkivering kommer inte kopplas till ett ärende."
12041204
12051205 #. Resource IDs: (1265)
12061206 msgid "&Properties"
@@ -1226,13 +1226,13 @@
12261226 msgid ""
12271227 "&Reject the certificate\n"
12281228 "Cancel the connection."
1229-msgstr ""
1229+msgstr "&Avslå certifikatet\nAvbryt anslutningen."
12301230
12311231 #. Resource IDs: (1422)
12321232 msgid ""
12331233 "&Relocate\n"
12341234 "The working copy is relocated to the new URL."
1235-msgstr ""
1235+msgstr "&Omlokalisera\nArbetskopian omlokaliseras till den nya URLen."
12361236
12371237 #. Resource IDs: (1562)
12381238 msgid "&Remind me to enter a bug-ID"
@@ -1246,7 +1246,7 @@
12461246 msgid ""
12471247 "&Remove from version control\n"
12481248 "All .svn folders are removed"
1249-msgstr ""
1249+msgstr "&Tag bort från versionshantering\nAlla .svn-mappar raderas"
12501250
12511251 #. Resource IDs: (1035)
12521252 msgid "&Remove project"
@@ -1256,13 +1256,13 @@
12561256 msgid ""
12571257 "&Remove\n"
12581258 "Force the removal"
1259-msgstr ""
1259+msgstr "&Tag bort\nTvinga borttagningen"
12601260
12611261 #. Resource IDs: (9411)
12621262 msgid ""
12631263 "&Remove\n"
12641264 "Remove the property only from this item."
1265-msgstr ""
1265+msgstr "&Tag bort\nTag bort egenskapen från detta objekt."
12661266
12671267 #. Resource IDs: (1031)
12681268 msgid ""
@@ -1279,7 +1279,7 @@
12791279 msgid ""
12801280 "&Rename\n"
12811281 "The folder is exported as '%ls'."
1282-msgstr ""
1282+msgstr "&Döp om\nMappen exporteras som '%ls'."
12831283
12841284 #. Resource IDs: (Dialog IDD_FIND: Control id 1511)
12851285 msgid "&Replace"
@@ -1293,7 +1293,7 @@
12931293 msgid ""
12941294 "&Resolve\n"
12951295 "The item is marked as resolved."
1296-msgstr ""
1296+msgstr "&Lös\nObjektet markeras som \"löst\"."
12971297
12981298 #. Resource IDs: (1488)
12991299 msgid "&Restore defaults"
@@ -1301,11 +1301,11 @@
13011301
13021302 #. Resource IDs: (1542)
13031303 msgid "&Retry"
1304-msgstr ""
1304+msgstr "&Försök igen"
13051305
13061306 #. Resource IDs: (1545)
13071307 msgid "&Retry as different user"
1308-msgstr ""
1308+msgstr "&Försök igen med annan användare"
13091309
13101310 #. Resource IDs: (1542, 9020)
13111311 msgid "&Retry without hooks"
@@ -1373,7 +1373,7 @@
13731373
13741374 #. Resource IDs: (1)
13751375 msgid "&Shelve"
1376-msgstr ""
1376+msgstr "Lägg på &hylla"
13771377
13781378 #. Resource IDs: (32815 - Menu)
13791379 msgid "&Show HEAD revisions"
@@ -1521,7 +1521,7 @@
15211521
15221522 #. Resource IDs: (32877 - Menu)
15231523 msgid "&Update all"
1524-msgstr ""
1524+msgstr "&Uppdatera alla"
15251525
15261526 #. Resource IDs: (1215)
15271527 msgid "&Update item to revision"
@@ -1539,19 +1539,19 @@
15391539 msgid ""
15401540 "&Update\n"
15411541 "Update the file and try locking again."
1542-msgstr ""
1542+msgstr "&Uppdatera\nUppdatera filen och försök låsa igen."
15431543
15441544 #. Resource IDs: (1433)
15451545 msgid ""
15461546 "&Update\n"
15471547 "Update the working copy and reopen the commit dialog to try again."
1548-msgstr ""
1548+msgstr "&Uppdatera\nUppdatera arbetskopian och öppna arkivdialogen för att försöka igen."
15491549
15501550 #. Resource IDs: (4653)
15511551 msgid ""
15521552 "&Update\n"
15531553 "Update to the HEAD revision"
1554-msgstr ""
1554+msgstr "&Uppdatera\nUppdatera till HEAD-revisionen."
15551555
15561556 #. Resource IDs: (1184)
15571557 msgid "&Use auto-completion of file paths and keywords"
@@ -1567,11 +1567,11 @@
15671567
15681568 #. Resource IDs: (1647)
15691569 msgid "&Vacuum pristine copies"
1570-msgstr ""
1570+msgstr "&Städa ursprungsfilerna"
15711571
15721572 #. Resource IDs: (1674)
15731573 msgid "&Version"
1574-msgstr ""
1574+msgstr "&Version"
15751575
15761576 #. Resource IDs: (65535 - PopupMenu)
15771577 msgid "&View"
@@ -1737,7 +1737,7 @@
17371737 #. Resource IDs: (1057)
17381738 #, c-format
17391739 msgid "...and %d more paths."
1740-msgstr ""
1740+msgstr "... och %d ytterligare sökväg(ar)."
17411741
17421742 #. Resource IDs: (2403)
17431743 #, c-format
@@ -1778,7 +1778,7 @@
17781778 msgid ""
17791779 "A newer version is available.\r\n"
17801780 "Please go to https://tortoisesvn.net and download the current version."
1781-msgstr ""
1781+msgstr "En nyare version finns tillgänglig.\nGå till https://tortoisesvn.net och ladda ner den senaste versionen."
17821782
17831783 #. Resource IDs: (3104)
17841784 msgid ""
@@ -1792,7 +1792,7 @@
17921792 "A newline separated list of paths for which no context menu is shown.\r\n"
17931793 "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n"
17941794 "An empty list will allow the context menu on all paths."
1795-msgstr "En lista med sökvägar (en per rad), för vilka inga statusikoner ska visas.\r\nOm du avslutar en sökväg med en asterisk ('*'), exkluderas även alla filer och undermappar.\r\nEn tom lista tillåter visning av statussymboler för alla sökvägar."
1795+msgstr "En lista med sökvägar (en per rad), för vilka ingen snabbmeny ska visas.\r\nOm du avslutar en sökväg med en asterisk ('*'), exkluderas även alla filer och undermappar.\r\nEn tom lista tillåter visning av snabbmeny för alla sökvägar."
17961796
17971797 #. Resource IDs: (3103)
17981798 msgid ""
@@ -1838,7 +1838,7 @@
18381838
18391839 #. Resource IDs: (cmdAbout_LabelTitle_RESID)
18401840 msgid "Abou&t TortoiseMerge"
1841-msgstr ""
1841+msgstr "Om &TortoiseMerge"
18421842
18431843 #. Resource IDs: (134)
18441844 msgid "About"
@@ -1856,7 +1856,7 @@
18561856 msgid ""
18571857 "Accept the certificate &permanently\n"
18581858 "You won't get asked about this certificate again."
1859-msgstr ""
1859+msgstr "Godkänn detta certifikat &permanent\nDu kommer inte tillfrågas om detta certifikat igen."
18601860
18611861 #. Resource IDs: (61861)
18621862 #, c-format
@@ -1890,7 +1890,7 @@
18901890 msgid ""
18911891 "Ad&just case\n"
18921892 "The file is not added."
1893-msgstr ""
1893+msgstr "&Justera tecken\nFilen läggs inte till."
18941894
18951895 #. Resource IDs: (1229, 155, 3330, 3657)
18961896 msgid "Add"
@@ -1936,7 +1936,7 @@
19361936 #. Resource IDs: (9804)
19371937 #, c-format
19381938 msgid "Add to %1"
1939-msgstr ""
1939+msgstr "Lägg till i %1"
19401940
19411941 #. Resource IDs: (194)
19421942 msgid "Add to &ignore list"
@@ -2003,7 +2003,7 @@
20032003
20042004 #. Resource IDs: (9443)
20052005 msgid "Adjust to HEAD revision"
2006-msgstr ""
2006+msgstr "Ändra till HEAD-revisionen."
20072007
20082008 #. Resource IDs: (307, 32848 - Menu)
20092009 msgid "Advanced"
@@ -2023,7 +2023,7 @@
20232023
20242024 #. Resource IDs: (1675)
20252025 msgid "Affected &files:"
2026-msgstr ""
2026+msgstr "Påverkade &filer:"
20272027
20282028 #. Resource IDs: (65535)
20292029 msgid "Age"
@@ -2068,7 +2068,7 @@
20682068
20692069 #. Resource IDs: (1481)
20702070 msgid "Allow mixed revisions (not recommended)"
2071-msgstr ""
2071+msgstr "Tillåt blandade revisioner (ej rekommenderat)"
20722072
20732073 #. Resource IDs: (1896)
20742074 msgid "Already merged"
@@ -2177,11 +2177,11 @@
21772177
21782178 #. Resource IDs: (5801)
21792179 msgid "Approve or reject client-side hook script"
2180-msgstr ""
2180+msgstr "Godkänn eller avvisa klient-baserade krokskript"
21812181
21822182 #. Resource IDs: (1282)
21832183 msgid "Approved hook scripts"
2184-msgstr ""
2184+msgstr "Godkända krokskript"
21852185
21862186 #. Resource IDs: (1565)
21872187 msgid "Arb&itrary text"
@@ -2403,7 +2403,7 @@
24032403
24042404 #. Resource IDs: (289)
24052405 msgid "Brings a shelved change back to the working copy"
2406-msgstr ""
2406+msgstr "Återför ändringar från hylla till arbetskopian"
24072407
24082408 #. Resource IDs: (1069)
24092409 msgid "Browse..."
@@ -2672,7 +2672,7 @@
26722672
26732673 #. Resource IDs: (1536)
26742674 msgid "Check the authentication items you want to delete below"
2675-msgstr ""
2675+msgstr "Kontrollera autenticeringsuppgifterna du vill radera nedan"
26762676
26772677 #. Resource IDs: (4000)
26782678 msgid "Check the path and/or URL you've entered."
@@ -3154,7 +3154,7 @@
31543154
31553155 #. Resource IDs: (195)
31563156 msgid "Context Menu"
3157-msgstr ""
3157+msgstr "Snabbmeny"
31583158
31593159 #. Resource IDs: (Dialog IDD_SETMAINPAGE: Control id 65535)
31603160 msgid "Context lines for patches"
@@ -3162,7 +3162,7 @@
31623162
31633163 #. Resource IDs: (1543)
31643164 msgid "Continue &Merge"
3165-msgstr ""
3165+msgstr "Fortsätt &Sammanslagning"
31663166
31673167 #. Resource IDs: (IDS_EDIT_SPACE2TAB)
31683168 msgid "Convert spaces to tabs"
@@ -3218,7 +3218,7 @@
32183218
32193219 #. Resource IDs: (ID_COPYTOCLIPBOARD_REV - Menu)
32203220 msgid "Copy &revision number to clipboard"
3221-msgstr ""
3221+msgstr "Kopiera &revisionsnummer till urklipp"
32223222
32233223 #. Resource IDs: (142)
32243224 msgid "Copy (Branch / Tag)"
@@ -3263,7 +3263,7 @@
32633263 #. Resource IDs: (9802)
32643264 #, c-format
32653265 msgid "Copy to %1"
3266-msgstr ""
3266+msgstr "Kopiera till %1"
32673267
32683268 #. Resource IDs: (1809)
32693269 msgid "Copy to clipboard"
@@ -3464,7 +3464,7 @@
34643464
34653465 #. Resource IDs: (cmdCreateUnifiedDiff_LabelTitle_RESID)
34663466 msgid "Create &patch file"
3467-msgstr ""
3467+msgstr "Skapa &patchfil"
34683468
34693469 #. Resource IDs: (206)
34703470 msgid "Create &patch..."
@@ -3482,7 +3482,7 @@
34823482 msgid ""
34833483 "Create a checkpoint.\n"
34843484 "The selected modifications are saved to a shelf, but the local modifications are kept."
3485-msgstr ""
3485+msgstr "Skapa en kontrollpunkt.\nDe valda ändringarna sparas på en hylla, men lokala ändringar behålls i arbetskopian."
34863486
34873487 #. Resource IDs: (1015)
34883488 msgid "Create code collaborator revie&w..."
@@ -3542,7 +3542,7 @@
35423542 #. Resource IDs: (1060)
35433543 #, c-format
35443544 msgid "Creating checkpoint \"%s\""
3545-msgstr ""
3545+msgstr "Skapar kontrollpunkt \"%s\""
35463546
35473547 #. Resource IDs: (65535)
35483548 msgid "Credits:"
@@ -3586,7 +3586,7 @@
35863586
35873587 #. Resource IDs: (1682)
35883588 msgid "Dark theme"
3589-msgstr ""
3589+msgstr "Mörkt tema"
35903590
35913591 #. Resource IDs: (1683)
35923592 msgid ""
@@ -4233,7 +4233,7 @@
42334233
42344234 #. Resource IDs: (1648)
42354235 msgid "Enable drag context menu"
4236-msgstr ""
4236+msgstr "Aktivera drag-snabbmenyn"
42374237
42384238 #. Resource IDs: (5500)
42394239 msgid "Enable log caching to speed up log and revision graph dialogs"
@@ -6170,7 +6170,7 @@
61706170
61716171 #. Resource IDs: (65535)
61726172 msgid "Main context menu"
6173-msgstr ""
6173+msgstr "Primär snabbmeny"
61746174
61756175 #. Resource IDs: (1431)
61766176 msgid "Make this the default"
@@ -7087,7 +7087,7 @@
70877087
70887088 #. Resource IDs: (308)
70897089 msgid "Overlay Handlers"
7090-msgstr ""
7090+msgstr "Hanterare för statusikoner"
70917091
70927092 #. Resource IDs: (65535)
70937093 msgid "Overlays"
@@ -7683,7 +7683,7 @@
76837683
76847684 #. Resource IDs: (1615)
76857685 msgid "Refresh &shell overlays"
7686-msgstr ""
7686+msgstr "Uppdatera &statusikoner"
76877687
76887688 #. Resource IDs: (2366)
76897689 #, c-format
@@ -9387,7 +9387,7 @@
93879387
93889388 #. Resource IDs: (1018)
93899389 msgid "Success"
9390-msgstr ""
9390+msgstr "Lyckat"
93919391
93929392 #. Resource IDs: (1232)
93939393 msgid "Swit&ch working copy to new branch/tag"
@@ -9423,7 +9423,7 @@
94239423 #. Resource IDs: (ID_VIEW_ONEWAYDIFF - Menu,
94249424 #. cmdViewOneWayDiff_LabelTitle_RESID)
94259425 msgid "Switch between single and double pane view"
9426-msgstr ""
9426+msgstr "Byt mellan enkel och dubbel vy"
94279427
94289428 #. Resource IDs: (cmdViewOneWayDiff)
94299429 msgid ""
@@ -9434,7 +9434,7 @@
94349434 #. Resource IDs: (ID_VIEW_SWITCHLEFT - Menu,
94359435 #. cmdViewSwitchLeft_LabelTitle_RESID)
94369436 msgid "Switch left and right view"
9437-msgstr ""
9437+msgstr "Byt vänster och höger vy"
94389438
94399439 #. Resource IDs: (cmdViewSwitchLeft)
94409440 msgid ""
@@ -9587,7 +9587,7 @@
95879587 #. Resource IDs: (2370)
95889588 #, c-format
95899589 msgid "The file %ls is not versioned. How do you want to proceed?"
9590-msgstr ""
9590+msgstr "Filen %ls är inte versionshanterad. Hur vill du fortsätta?"
95919591
95929592 #. Resource IDs: (IDS_ERR_PATCH_FILENOTINPATCH)
95939593 #, c-format
@@ -9632,7 +9632,7 @@
96329632 "The file\n"
96339633 "%ls\n"
96349634 "is not a valid text file!"
9635-msgstr ""
9635+msgstr "Filen\n%ls\när inte en giltig textfil!"
96369636
96379637 #. Resource IDs: (1573)
96389638 #, c-format
@@ -9655,7 +9655,7 @@
96559655
96569656 #. Resource IDs: (1339)
96579657 msgid "The hook script was not approved to run"
9658-msgstr ""
9658+msgstr "Krokskriptet godkändes inte för körning"
96599659
96609660 #. Resource IDs: (IDS_INVALIDIMAGEINFO)
96619661 msgid "The image can not be shown."
@@ -9697,7 +9697,7 @@
96979697 #. Resource IDs: (IDS_GOTO_OUTOFRANGE)
96989698 #, c-format
96999699 msgid "The line number must be in between %d and %d"
9700-msgstr ""
9700+msgstr "Radnumret måste vara mellan %d och %d"
97019701
97029702 #. Resource IDs: (4005)
97039703 msgid "The lock has already been broken from another working copy"
@@ -9890,7 +9890,7 @@
98909890 msgid ""
98919891 "There are currently %d overlay handlers installed besides the ones Tortoise "
98929892 "uses."
9893-msgstr ""
9893+msgstr "Det finns just nu %d hanterare för statusikoner utöver de Tortoise använder."
98949894
98959895 #. Resource IDs: (IDS_SAVE_MORE)
98969896 msgid ""
@@ -10014,13 +10014,13 @@
1001410014 msgid ""
1001510015 "This product includes software developed by the OpenSSL Project for use in "
1001610016 "the OpenSSL Toolkit (https://www.openssl.org/)"
10017-msgstr ""
10017+msgstr "Den här produkten innehåller programvara utvecklat av OpenSSL-projektet för OpenSSL Toolkit (https://www.openssl.org/)"
1001810018
1001910019 #. Resource IDs: (1531)
1002010020 msgid ""
1002110021 "This product includes software from Apache™ Subversion® "
1002210022 "(https://subversion.apache.org)"
10023-msgstr ""
10023+msgstr "Den här produkten innehåller programvara från Apache™ Subversion® (https://subversion.apache.org)"
1002410024
1002510025 #. Resource IDs: (61710)
1002610026 #, c-format
@@ -10033,7 +10033,7 @@
1003310033 #, c-format
1003410034 msgid ""
1003510035 "This program requires the file %Ts, which was not found on this system."
10036-msgstr ""
10036+msgstr "Det här programmet behöver filen %Ts som inte kunde hittas på datorn."
1003710037
1003810038 #. Resource IDs: (230)
1003910039 msgid "This property is only allowed on folders, not files."
@@ -10055,7 +10055,7 @@
1005510055 "This working copy has a client-side hook script configured. Do you want this script to run?\n"
1005610056 "The command line to run is:\n"
1005710057 "%ls"
10058-msgstr ""
10058+msgstr "Denna arbetskopia har ett klient-krokskript. Vill du köra skriptet?\nKommandoraden är:\n%ls"
1005910059
1006010060 #. Resource IDs: (65535)
1006110061 msgid "Timeouts"
@@ -10090,7 +10090,7 @@
1009010090
1009110091 #. Resource IDs: (65535)
1009210092 msgid "Top context menu on Windows 11"
10093-msgstr ""
10093+msgstr "Primär snabbmeny för Windows 11"
1009410094
1009510095 #. Resource IDs: (244, IDS_APP_TITLE)
1009610096 msgid "TortoiseBlame"
@@ -10144,7 +10144,7 @@
1014410144 "libsvn_diff %d.%d.%d, %ls\r\n"
1014510145 "apr %d.%d.%d\r\n"
1014610146 "apr-util %d.%d.%d"
10147-msgstr ""
10147+msgstr "TortoiseMerge %d.%d.%d, Build %d - %ls, %ls\r\nlibsvn_diff %d.%d.%d, %ls\r\napr %d.%d.%d\r\napr-util %d.%d.%d"
1014810148
1014910149 #. Resource IDs: (1271, 65535)
1015010150 msgid "TortoiseSVN"
@@ -10161,7 +10161,7 @@
1016110161 "%ls\r\n"
1016210162 "zlib %ls\r\n"
1016310163 "SQLite %ls"
10164-msgstr ""
10164+msgstr "TortoiseSVN %d.%d.%d, Build %d - %ls, %ls%ls\r\nSubversion %d.%d.%d, %ls\r\napr %d.%d.%d\r\napr-util %d.%d.%d\r\nserf %d.%d.%d\r\n%ls\r\nzlib %ls\r\nSQLite %ls"
1016510165
1016610166 #. Resource IDs: (1021)
1016710167 msgid "TortoiseSVN Project Monitor"
@@ -10194,7 +10194,7 @@
1019410194 msgid ""
1019510195 "TortoiseSVN detected a serious slowdown when moving %1!ld! items to the recycle bin. The recycle bin currently contains %2!ld! items, which most likely is the reason for this slowdown.\n"
1019610196 "To fix this, you should empty the recycle bin now."
10197-msgstr ""
10197+msgstr "TortoiseSVN har upptäckt en avsevärd fördröjning vid förflyttning av %1!ld! objekt till papperskorgen. Papperskorgen innehåller just nu %2!ld! objekt vilket troligen är orsaken till denna fördröjning.\nFör att åtgärda detta bör du tömma papperskorgen nu."
1019810198
1019910199 #. Resource IDs: (1560)
1020010200 #, c-format
@@ -10215,7 +10215,7 @@
1021510215 #. Resource IDs: (3186)
1021610216 #, c-format
1021710217 msgid "TortoiseSVN will not show the following overlays: %ls"
10218-msgstr ""
10218+msgstr "TortoiseSVN kommer inte visa följande ikoner: %ls"
1021910219
1022010220 #. Resource IDs: (371)
1022110221 msgid "TortoiseUDiff"
@@ -10393,7 +10393,7 @@
1039310393 msgid ""
1039410394 "Unchecked items are shown in the submenu, checked items on the main context "
1039510395 "menu"
10396-msgstr ""
10396+msgstr "Omarkerade val visas i undermenyn, markerade val visas i den primära snabbmenyn"
1039710397
1039810398 #. Resource IDs: (cmdUndo_LabelTitle_RESID)
1039910399 msgid "Undo"
@@ -10979,7 +10979,7 @@
1097910979 msgid ""
1098010980 "When enabled, TortoiseSVN move/copy context menu items will be available "
1098110981 "when dragging folders / files"
10982-msgstr ""
10982+msgstr "Om aktiverad så blir snabbmenyn TortoiseSVN flytta/kopiera tillgänglig vid dragning av mappar/filer"
1098310983
1098410984 #. Resource IDs: (3141)
1098510985 msgid ""
@@ -11004,7 +11004,7 @@
1100411004
1100511005 #. Resource IDs: (197)
1100611006 msgid "Win 11 Context Menu"
11007-msgstr ""
11007+msgstr "Snabbmeny Windows 11"
1100811008
1100911009 #. Resource IDs: (1493, 1496, 158)
1101011010 msgid "Working Copy"
@@ -11454,7 +11454,7 @@
1145411454
1145511455 #. Resource IDs: (Dialog IDD_ABOUT: Control id 1005)
1145611456 msgid "https://tortoisesvn.net"
11457-msgstr ""
11457+msgstr "https://tortoisesvn.net"
1145811458
1145911459 #. Resource IDs: (197)
1146011460 msgid "ignored"
--- trunk/Languages/vi/TortoiseDoc.po (revision 29449)
+++ trunk/Languages/vi/TortoiseDoc.po (revision 29450)
@@ -17,8 +17,8 @@
1717 "Project-Id-Version: TortoiseSVN\n"
1818 "Report-Msgid-Bugs-To: \n"
1919 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
20-"PO-Revision-Date: 2022-03-11 20:31+0000\n"
21-"Last-Translator: Lübbe Onken <luebbe.opensource@gmail.com>\n"
20+"PO-Revision-Date: 2010-11-30 05:04+0000\n"
21+"Last-Translator: Nguyeexn DDwsc <zxcduc@outlook.com>, 2014\n"
2222 "Language-Team: Vietnamese (http://www.transifex.com/luebbe/tortoisesvn/language/vi/)\n"
2323 "MIME-Version: 1.0\n"
2424 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15245,6 +15245,23 @@
1524515245
1524615246 #. (para)
1524715247 msgid ""
15248+"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15249+" is set to 0 (see above)."
15250+msgstr "Điều này không có tác dụng nếu tùy chọn <literal> GroupTaskbarIconsPerRepo </literal> được thiết lập là 0 (xem ở trên)."
15251+
15252+#. (title)
15253+msgid "Taskbar grouping with repository color overlays"
15254+msgstr "Nhóm thanh tác vụ với lớp phủ màu cho kho lưu trữ"
15255+
15256+#. (para)
15257+msgid ""
15258+"If this option is set to <literal>true</literal>, then every icon on the "
15259+"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15260+"repository the dialogs/windows are used for. <placeholder-1/>"
15261+msgstr "Nếu tùy chọn này được thiết lập thành <literal> đúng </literal> , thì mỗi biểu tượng trên thanh tác vụ Win7 hiển thị một lớp phủ hình chữ nhật nhỏ có màu, cho thấy các kho lưu trữ mà các hộp thoại / cửa sổ được sử dụng cho. <placeholder-1/>"
15262+
15263+#. (para)
15264+msgid ""
1524815265 "If this is set to <literal>false</literal>, then every "
1524915266 "<literal>svn:externals</literal> is shown during an update separately."
1525015267 msgstr "Nếu được đặt thành <literal>false</literal>, thì mọi <literal>svn:externals</literal> sẽ được hiển thị riêng rẽ trong quá trình cập nhật."
@@ -15259,23 +15276,13 @@
1525915276
1526015277 #. (para)
1526115278 msgid ""
15262-"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15263-" is set to 0 (see above)."
15264-msgstr "Điều này không có tác dụng nếu tùy chọn <literal> GroupTaskbarIconsPerRepo </literal> được thiết lập là 0 (xem ở trên)."
15279+"If this is set to <literal>true</literal>, then cancelling the dialog to "
15280+"approve a hook script to run will show an error dialog indicating the user "
15281+"cancelled."
15282+msgstr ""
1526515283
15266-#. (title)
15267-msgid "Taskbar grouping with repository color overlays"
15268-msgstr "Nhóm thanh tác vụ với lớp phủ màu cho kho lưu trữ"
15269-
1527015284 #. (para)
1527115285 msgid ""
15272-"If this option is set to <literal>true</literal>, then every icon on the "
15273-"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15274-"repository the dialogs/windows are used for. <placeholder-1/>"
15275-msgstr "Nếu tùy chọn này được thiết lập thành <literal> đúng </literal> , thì mỗi biểu tượng trên thanh tác vụ Win7 hiển thị một lớp phủ hình chữ nhật nhỏ có màu, cho thấy các kho lưu trữ mà các hộp thoại / cửa sổ được sử dụng cho. <placeholder-1/>"
15276-
15277-#. (para)
15278-msgid ""
1527915286 "By default, TortoiseSVN always runs an update with externals included. This "
1528015287 "avoids problems with inconsistent working copies. If you have however a lot "
1528115288 "of externals set, an update can take quite a while. Set this value to "
@@ -21402,6 +21409,10 @@
2140221409 msgid "List of keyboard shortcuts and commands."
2140321410 msgstr "Danh sách các phím tắt và các lệnh bàn phím."
2140421411
21412+#. (title)
21413+msgid "General Keyboard Shortcuts"
21414+msgstr ""
21415+
2140521416 #. (term)
2140621417 msgid "Ctrl-Q, Ctrl-W, Escape"
2140721418 msgstr "Ctrl-Q, Ctrl-W, Escape"
@@ -21487,30 +21498,6 @@
2148721498 msgstr "Đi đến khác biệt trước"
2148821499
2148921500 #. (term)
21490-msgid "F8"
21491-msgstr "F8"
21492-
21493-#. (para)
21494-msgid "Go to next conflict"
21495-msgstr "Đi tới xung đột tiếp theo"
21496-
21497-#. (term)
21498-msgid "Shift-F8"
21499-msgstr "Shift-F8"
21500-
21501-#. (para)
21502-msgid "Go to previous conflict"
21503-msgstr "Đi tới xung đột trước"
21504-
21505-#. (term)
21506-msgid "Ctrl-D"
21507-msgstr "Ctrl-D"
21508-
21509-#. (para)
21510-msgid "Toggle between one-pane diff and two-pane diff"
21511-msgstr "Đảo giữa việc tìm khác biệt một cửa sổ và hai cửa sổ"
21512-
21513-#. (term)
2151421501 msgid "Ctrl-R"
2151521502 msgstr "Ctrl-R"
2151621503
@@ -21555,14 +21542,6 @@
2155521542 msgstr "Chọn tất cả văn bản"
2155621543
2155721544 #. (term)
21558-msgid "Ctrl-U"
21559-msgstr "Ctrl-U"
21560-
21561-#. (para)
21562-msgid "Switches views"
21563-msgstr "Chuyển đổi màn xem"
21564-
21565-#. (term)
2156621545 msgid "Ctrl-mousewheel"
2156721546 msgstr "Ctrl-mousewheel"
2156821547
@@ -21579,14 +21558,93 @@
2157921558 msgstr ""
2158021559
2158121560 #. (term)
21561+#. (term)
2158221562 msgid "Ctrl-M"
2158321563 msgstr ""
2158421564
2158521565 #. (para)
21566+#. (para)
2158621567 msgid "Toggles between marking the selected change"
2158721568 msgstr ""
2158821569
2158921570 #. (title)
21571+msgid "Diff-Mode Keyboard Shortcuts"
21572+msgstr ""
21573+
21574+#. (term)
21575+msgid "Ctrl-D"
21576+msgstr "Ctrl-D"
21577+
21578+#. (para)
21579+msgid "Toggle between one-pane diff and two-pane diff"
21580+msgstr "Đảo giữa việc tìm khác biệt một cửa sổ và hai cửa sổ"
21581+
21582+#. (term)
21583+msgid "Ctrl-U"
21584+msgstr "Ctrl-U"
21585+
21586+#. (para)
21587+msgid "Switches views"
21588+msgstr "Chuyển đổi màn xem"
21589+
21590+#. (term)
21591+msgid "F12"
21592+msgstr ""
21593+
21594+#. (para)
21595+#. (para)
21596+msgid "Use left block"
21597+msgstr "Sử dụng khối bên trái"
21598+
21599+#. (title)
21600+msgid "Conflict Resolution Mode Keyboard Shortcuts"
21601+msgstr ""
21602+
21603+#. (term)
21604+msgid "F8"
21605+msgstr "F8"
21606+
21607+#. (para)
21608+msgid "Go to next conflict"
21609+msgstr "Đi tới xung đột tiếp theo"
21610+
21611+#. (term)
21612+msgid "Shift-F8"
21613+msgstr "Shift-F8"
21614+
21615+#. (para)
21616+msgid "Go to previous conflict"
21617+msgstr "Đi tới xung đột trước"
21618+
21619+#. (term)
21620+msgid "Ctrl-F9"
21621+msgstr ""
21622+
21623+#. (term)
21624+msgid "Ctrl-Shift-F9"
21625+msgstr ""
21626+
21627+#. (para)
21628+msgid "Use left block then right block"
21629+msgstr ""
21630+
21631+#. (term)
21632+msgid "Ctrl-F10"
21633+msgstr ""
21634+
21635+#. (para)
21636+msgid "Use right block"
21637+msgstr ""
21638+
21639+#. (term)
21640+msgid "Ctrl-Shift-F10"
21641+msgstr ""
21642+
21643+#. (para)
21644+msgid "Use right block then left block"
21645+msgstr ""
21646+
21647+#. (title)
2159021648 msgid "Automating TortoiseMerge"
2159121649 msgstr "Tự động hoá TortoiseMerge"
2159221650
--- trunk/Languages/zh_CN/TortoiseDoc.po (revision 29449)
+++ trunk/Languages/zh_CN/TortoiseDoc.po (revision 29450)
@@ -15286,6 +15286,23 @@
1528615286
1528715287 #. (para)
1528815288 msgid ""
15289+"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15290+" is set to 0 (see above)."
15291+msgstr ""
15292+
15293+#. (title)
15294+msgid "Taskbar grouping with repository color overlays"
15295+msgstr ""
15296+
15297+#. (para)
15298+msgid ""
15299+"If this option is set to <literal>true</literal>, then every icon on the "
15300+"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15301+"repository the dialogs/windows are used for. <placeholder-1/>"
15302+msgstr ""
15303+
15304+#. (para)
15305+msgid ""
1528915306 "If this is set to <literal>false</literal>, then every "
1529015307 "<literal>svn:externals</literal> is shown during an update separately."
1529115308 msgstr ""
@@ -15300,23 +15317,13 @@
1530015317
1530115318 #. (para)
1530215319 msgid ""
15303-"This has no effect if the option <literal>GroupTaskbarIconsPerRepo</literal>"
15304-" is set to 0 (see above)."
15320+"If this is set to <literal>true</literal>, then cancelling the dialog to "
15321+"approve a hook script to run will show an error dialog indicating the user "
15322+"cancelled."
1530515323 msgstr ""
1530615324
15307-#. (title)
15308-msgid "Taskbar grouping with repository color overlays"
15309-msgstr ""
15310-
1531115325 #. (para)
1531215326 msgid ""
15313-"If this option is set to <literal>true</literal>, then every icon on the "
15314-"Win7 taskbar shows a small colored rectangle overlay, indicating the "
15315-"repository the dialogs/windows are used for. <placeholder-1/>"
15316-msgstr ""
15317-
15318-#. (para)
15319-msgid ""
1532015327 "By default, TortoiseSVN always runs an update with externals included. This "
1532115328 "avoids problems with inconsistent working copies. If you have however a lot "
1532215329 "of externals set, an update can take quite a while. Set this value to "
@@ -21443,6 +21450,10 @@
2144321450 msgid "List of keyboard shortcuts and commands."
2144421451 msgstr "列出所有的快捷键和命令。"
2144521452
21453+#. (title)
21454+msgid "General Keyboard Shortcuts"
21455+msgstr ""
21456+
2144621457 #. (term)
2144721458 msgid "Ctrl-Q, Ctrl-W, Escape"
2144821459 msgstr "Ctrl-Q, Ctrl-W, Escape"
@@ -21528,30 +21539,6 @@
2152821539 msgstr "跳转到上一个不同点"
2152921540
2153021541 #. (term)
21531-msgid "F8"
21532-msgstr "F8"
21533-
21534-#. (para)
21535-msgid "Go to next conflict"
21536-msgstr "跳转到下一个不同点"
21537-
21538-#. (term)
21539-msgid "Shift-F8"
21540-msgstr "Shift-F8"
21541-
21542-#. (para)
21543-msgid "Go to previous conflict"
21544-msgstr "跳转到上一个不同点"
21545-
21546-#. (term)
21547-msgid "Ctrl-D"
21548-msgstr "Ctrl-D"
21549-
21550-#. (para)
21551-msgid "Toggle between one-pane diff and two-pane diff"
21552-msgstr "切换单窗口方式或双窗口方式"
21553-
21554-#. (term)
2155521542 msgid "Ctrl-R"
2155621543 msgstr "Ctrl-R"
2155721544
@@ -21596,14 +21583,6 @@
2159621583 msgstr "选取所有文本"
2159721584
2159821585 #. (term)
21599-msgid "Ctrl-U"
21600-msgstr "Ctrl-U"
21601-
21602-#. (para)
21603-msgid "Switches views"
21604-msgstr "切换视图"
21605-
21606-#. (term)
2160721586 msgid "Ctrl-mousewheel"
2160821587 msgstr "Ctrl-鼠标滚轮"
2160921588
@@ -21620,14 +21599,93 @@
2162021599 msgstr "切换视图左侧/右侧/底部视图"
2162121600
2162221601 #. (term)
21602+#. (term)
2162321603 msgid "Ctrl-M"
2162421604 msgstr ""
2162521605
2162621606 #. (para)
21607+#. (para)
2162721608 msgid "Toggles between marking the selected change"
2162821609 msgstr ""
2162921610
2163021611 #. (title)
21612+msgid "Diff-Mode Keyboard Shortcuts"
21613+msgstr ""
21614+
21615+#. (term)
21616+msgid "Ctrl-D"
21617+msgstr "Ctrl-D"
21618+
21619+#. (para)
21620+msgid "Toggle between one-pane diff and two-pane diff"
21621+msgstr "切换单窗口方式或双窗口方式"
21622+
21623+#. (term)
21624+msgid "Ctrl-U"
21625+msgstr "Ctrl-U"
21626+
21627+#. (para)
21628+msgid "Switches views"
21629+msgstr "切换视图"
21630+
21631+#. (term)
21632+msgid "F12"
21633+msgstr ""
21634+
21635+#. (para)
21636+#. (para)
21637+msgid "Use left block"
21638+msgstr "使用左边文件块"
21639+
21640+#. (title)
21641+msgid "Conflict Resolution Mode Keyboard Shortcuts"
21642+msgstr ""
21643+
21644+#. (term)
21645+msgid "F8"
21646+msgstr "F8"
21647+
21648+#. (para)
21649+msgid "Go to next conflict"
21650+msgstr "跳转到下一个不同点"
21651+
21652+#. (term)
21653+msgid "Shift-F8"
21654+msgstr "Shift-F8"
21655+
21656+#. (para)
21657+msgid "Go to previous conflict"
21658+msgstr "跳转到上一个不同点"
21659+
21660+#. (term)
21661+msgid "Ctrl-F9"
21662+msgstr ""
21663+
21664+#. (term)
21665+msgid "Ctrl-Shift-F9"
21666+msgstr ""
21667+
21668+#. (para)
21669+msgid "Use left block then right block"
21670+msgstr ""
21671+
21672+#. (term)
21673+msgid "Ctrl-F10"
21674+msgstr ""
21675+
21676+#. (para)
21677+msgid "Use right block"
21678+msgstr "使用左侧区块"
21679+
21680+#. (term)
21681+msgid "Ctrl-Shift-F10"
21682+msgstr ""
21683+
21684+#. (para)
21685+msgid "Use right block then left block"
21686+msgstr ""
21687+
21688+#. (title)
2163121689 msgid "Automating TortoiseMerge"
2163221690 msgstr "TortoiseMerge 操作"
2163321691
Afficher sur ancien navigateur de dépôt.