Rinma
/
Tough_Crowd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed the "Column %d" fuzzy translations

This commit is contained in:
Romain Failliot 2022-10-23 20:02:16 -04:00
parent b564abcda2
commit 883b69c6ba
17 changed files with 2051 additions and 2019 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

255
po/cs.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: diffuse-svn\n" "Project-Id-Version: diffuse-svn\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-23 19:48-0400\n" "POT-Creation-Date: 2022-10-23 20:00-0400\n"
"PO-Revision-Date: 2022-04-04 12:16-0400\n" "PO-Revision-Date: 2022-04-04 12:16-0400\n"
"Last-Translator: Jindřich Šesták <khagaroth@gmail.com>\n" "Last-Translator: Jindřich Šesták <khagaroth@gmail.com>\n"
"Language-Team: NONE <NONE>\n" "Language-Team: NONE <NONE>\n"
@ -99,40 +99,45 @@ msgstr "Uložit soubor"
msgid "Save File As..." msgid "Save File As..."
msgstr "Uložit soubor jako..." msgstr "Uložit soubor jako..."
#: src/diffuse/main.py:288 #: src/diffuse/main.py:217
#, python-format
msgid "Column %d"
msgstr "Sloupec %d"
#: src/diffuse/main.py:291
msgid "Save changes before loading the new file?" msgid "Save changes before loading the new file?"
msgstr "Uložit změny před načtením nového souboru?" msgstr "Uložit změny před načtením nového souboru?"
#: src/diffuse/main.py:399 #: src/diffuse/main.py:402
#, python-format #, python-format
msgid "Error reading revision %(rev)s of %(file)s." msgid "Error reading revision %(rev)s of %(file)s."
msgstr "Při čtení revize %(rev)s souboru %(file)s došlo k chybě." msgstr "Při čtení revize %(rev)s souboru %(file)s došlo k chybě."
#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #: src/diffuse/main.py:405 src/diffuse/main.py:1860
#, python-format #, python-format
msgid "Error reading %s." msgid "Error reading %s."
msgstr "Při čtení souboru %s došlo k chybě." msgstr "Při čtení souboru %s došlo k chybě."
#: src/diffuse/main.py:424 #: src/diffuse/main.py:427
msgid "Open File" msgid "Open File"
msgstr "Otevřít soubor" msgstr "Otevřít soubor"
#: src/diffuse/main.py:481 #: src/diffuse/main.py:484
#, python-format #, python-format
msgid "The file %s changed on disk. Do you want to reload the file?" msgid "The file %s changed on disk. Do you want to reload the file?"
msgstr "Soubor %s byl změněn. Chcete ho znovu načíst?" msgstr "Soubor %s byl změněn. Chcete ho znovu načíst?"
#: src/diffuse/main.py:507 #: src/diffuse/main.py:510
#, python-format #, python-format
msgid "Save %(title)s Pane %(pane)d" msgid "Save %(title)s Pane %(pane)d"
msgstr "Uložit podokno %(pane)d %(title)s" msgstr "Uložit podokno %(pane)d %(title)s"
#: src/diffuse/main.py:539 #: src/diffuse/main.py:542
#, python-format #, python-format
msgid "A file named %s already exists. Do you want to overwrite it?" msgid "A file named %s already exists. Do you want to overwrite it?"
msgstr "Soubor s názvem %s již existuje. Chcete ho přepsat?" msgstr "Soubor s názvem %s již existuje. Chcete ho přepsat?"
#: src/diffuse/main.py:546 #: src/diffuse/main.py:549
#, python-format #, python-format
msgid "" msgid ""
"The file %s has been modified by another process since reading it. If you save, " "The file %s has been modified by another process since reading it. If you save, "
@ -141,25 +146,25 @@ msgstr ""
"Soubor %s byl od načtení změněn jiným procesem. Pokud ho nyní uložíte, změny " "Soubor %s byl od načtení změněn jiným procesem. Pokud ho nyní uložíte, změny "
"provedené tímto externím procesem mohou být ztraceny. Chcete ho přesto uložit?" "provedené tímto externím procesem mohou být ztraceny. Chcete ho přesto uložit?"
#: src/diffuse/main.py:588 #: src/diffuse/main.py:591
#, python-format #, python-format
msgid "Error encoding to %s." msgid "Error encoding to %s."
msgstr "Při změně kódování do %s došlo k chybě." msgstr "Při změně kódování do %s došlo k chybě."
#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #: src/diffuse/main.py:595 src/diffuse/preferences.py:300
#, python-format #, python-format
msgid "Error writing %s." msgid "Error writing %s."
msgstr "Při ukládání %s došlo k chybě." msgstr "Při ukládání %s došlo k chybě."
#: src/diffuse/main.py:622 #: src/diffuse/main.py:625
msgid "Go To Line..." msgid "Go To Line..."
msgstr "Přejít na řádek..." msgstr "Přejít na řádek..."
#: src/diffuse/main.py:623 #: src/diffuse/main.py:626
msgid "Line Number: " msgid "Line Number: "
msgstr "Řádek číslo: " msgstr "Řádek číslo: "
#: src/diffuse/main.py:654 #: src/diffuse/main.py:657
msgid "" msgid ""
"Press the enter key or double click to edit. Press the space bar or use the RMB " "Press the enter key or double click to edit. Press the space bar or use the RMB "
"menu to manually align." "menu to manually align."
@ -168,11 +173,11 @@ msgstr ""
"Pro ruční zarovnání stiskněte Mezerník, nebo použijte místní nabídku dostupnou po " "Pro ruční zarovnání stiskněte Mezerník, nebo použijte místní nabídku dostupnou po "
"kliknutí pravým tlačítkem myši." "kliknutí pravým tlačítkem myši."
#: src/diffuse/main.py:658 #: src/diffuse/main.py:661
msgid "Press the escape key to finish editing." msgid "Press the escape key to finish editing."
msgstr "Editaci ukončíte pomocí klávesy escape." msgstr "Editaci ukončíte pomocí klávesy escape."
#: src/diffuse/main.py:661 #: src/diffuse/main.py:664
msgid "" msgid ""
"Select target line and press the space bar to align. Press the escape key to " "Select target line and press the space bar to align. Press the escape key to "
"cancel." "cancel."
@ -180,426 +185,426 @@ msgstr ""
"Vyberte cílový řádek a proveďte zarovnání stisknutím klávesy Mezerník. Pro " "Vyberte cílový řádek a proveďte zarovnání stisknutím klávesy Mezerník. Pro "
"zrušení stiskněte klávesu Escape." "zrušení stiskněte klávesu Escape."
#: src/diffuse/main.py:784 #: src/diffuse/main.py:787
msgid "_File" msgid "_File"
msgstr "_Soubor" msgstr "_Soubor"
#: src/diffuse/main.py:785 #: src/diffuse/main.py:788
msgid "_Open File..." msgid "_Open File..."
msgstr "_Otevřít soubor..." msgstr "_Otevřít soubor..."
#: src/diffuse/main.py:786 #: src/diffuse/main.py:789
msgid "Open File In New _Tab..." msgid "Open File In New _Tab..."
msgstr "Otevřít soubor v novém _panelu..." msgstr "Otevřít soubor v novém _panelu..."
#: src/diffuse/main.py:787 #: src/diffuse/main.py:790
msgid "Open _Modified Files..." msgid "Open _Modified Files..."
msgstr "Otevřít změněné soubory..." msgstr "Otevřít změněné soubory..."
#: src/diffuse/main.py:788 #: src/diffuse/main.py:791
msgid "Open Commi_t..." msgid "Open Commi_t..."
msgstr "Otevřít _revizi..." msgstr "Otevřít _revizi..."
#: src/diffuse/main.py:789 #: src/diffuse/main.py:792
msgid "_Reload File" msgid "_Reload File"
msgstr "_Znovu načíst soubor" msgstr "_Znovu načíst soubor"
#: src/diffuse/main.py:791 #: src/diffuse/main.py:794
msgid "_Save File" msgid "_Save File"
msgstr "_Uložit soubor" msgstr "_Uložit soubor"
#: src/diffuse/main.py:792 #: src/diffuse/main.py:795
msgid "Save File _As..." msgid "Save File _As..."
msgstr "Uložit soubor ­_jako..." msgstr "Uložit soubor ­_jako..."
#: src/diffuse/main.py:793 #: src/diffuse/main.py:796
msgid "Save A_ll" msgid "Save A_ll"
msgstr "Uložit _vše" msgstr "Uložit _vše"
#: src/diffuse/main.py:795 #: src/diffuse/main.py:798
msgid "New _2-Way File Merge" msgid "New _2-Way File Merge"
msgstr "Nové _2směrné slučování" msgstr "Nové _2směrné slučování"
#: src/diffuse/main.py:796 #: src/diffuse/main.py:799
msgid "New _3-Way File Merge" msgid "New _3-Way File Merge"
msgstr "Nové _3směrné slučování" msgstr "Nové _3směrné slučování"
#: src/diffuse/main.py:797 #: src/diffuse/main.py:800
msgid "New _N-Way File Merge..." msgid "New _N-Way File Merge..."
msgstr "Nové _Nsměrné slučování..." msgstr "Nové _Nsměrné slučování..."
#: src/diffuse/main.py:799 #: src/diffuse/main.py:802
msgid "_Close Tab" msgid "_Close Tab"
msgstr "_Zavřít panel" msgstr "_Zavřít panel"
#: src/diffuse/main.py:800 #: src/diffuse/main.py:803
msgid "_Undo Close Tab" msgid "_Undo Close Tab"
msgstr "_Obnovit zavřený panel" msgstr "_Obnovit zavřený panel"
#: src/diffuse/main.py:801 #: src/diffuse/main.py:804
msgid "_Quit" msgid "_Quit"
msgstr "Kone_c" msgstr "Kone_c"
#: src/diffuse/main.py:804 #: src/diffuse/main.py:807
msgid "_Edit" msgid "_Edit"
msgstr "Úpr_avy" msgstr "Úpr_avy"
#: src/diffuse/main.py:805 #: src/diffuse/main.py:808
msgid "_Undo" msgid "_Undo"
msgstr "_Zpět" msgstr "_Zpět"
#: src/diffuse/main.py:806 #: src/diffuse/main.py:809
msgid "_Redo" msgid "_Redo"
msgstr "Z_novu" msgstr "Z_novu"
#: src/diffuse/main.py:808 #: src/diffuse/main.py:811
msgid "Cu_t" msgid "Cu_t"
msgstr "_Vyjmout" msgstr "_Vyjmout"
#: src/diffuse/main.py:809 #: src/diffuse/main.py:812
msgid "_Copy" msgid "_Copy"
msgstr "_Kopírovat" msgstr "_Kopírovat"
#: src/diffuse/main.py:810 #: src/diffuse/main.py:813
msgid "_Paste" msgid "_Paste"
msgstr "V_ložit" msgstr "V_ložit"
#: src/diffuse/main.py:812 #: src/diffuse/main.py:815
msgid "Select _All" msgid "Select _All"
msgstr "V_ybrat vše" msgstr "V_ybrat vše"
#: src/diffuse/main.py:813 #: src/diffuse/main.py:816
msgid "C_lear Edits" msgid "C_lear Edits"
msgstr "_Smazat úpravy" msgstr "_Smazat úpravy"
#: src/diffuse/main.py:814 #: src/diffuse/main.py:817
msgid "_Dismiss All Edits" msgid "_Dismiss All Edits"
msgstr "Z_rušit všechny úpravy" msgstr "Z_rušit všechny úpravy"
#: src/diffuse/main.py:816 #: src/diffuse/main.py:819
msgid "_Find..." msgid "_Find..."
msgstr "_Najít..." msgstr "_Najít..."
#: src/diffuse/main.py:817 #: src/diffuse/main.py:820
msgid "Find _Next" msgid "Find _Next"
msgstr "Najít _další" msgstr "Najít _další"
#: src/diffuse/main.py:818 #: src/diffuse/main.py:821
msgid "Find Pre_vious" msgid "Find Pre_vious"
msgstr "Najít _předchozí" msgstr "Najít _předchozí"
#: src/diffuse/main.py:819 #: src/diffuse/main.py:822
msgid "_Go To Line..." msgid "_Go To Line..."
msgstr "Pře_jít na řádek..." msgstr "Pře_jít na řádek..."
#: src/diffuse/main.py:821 #: src/diffuse/main.py:824
msgid "Pr_eferences..." msgid "Pr_eferences..."
msgstr "Př_edvolby..." msgstr "Př_edvolby..."
#: src/diffuse/main.py:825 #: src/diffuse/main.py:828
msgid "None" msgid "None"
msgstr "Nic" msgstr "Nic"
#: src/diffuse/main.py:843 #: src/diffuse/main.py:846
msgid "_View" msgid "_View"
msgstr "_Zobrazit" msgstr "_Zobrazit"
#: src/diffuse/main.py:844 #: src/diffuse/main.py:847
msgid "_Syntax Highlighting" msgid "_Syntax Highlighting"
msgstr "Zvýraznění _syntaxe" msgstr "Zvýraznění _syntaxe"
#: src/diffuse/main.py:846 #: src/diffuse/main.py:849
msgid "Re_align All" msgid "Re_align All"
msgstr "Znovu _zarovnat" msgstr "Znovu _zarovnat"
#: src/diffuse/main.py:847 #: src/diffuse/main.py:850
msgid "_Isolate" msgid "_Isolate"
msgstr "_Izolovat" msgstr "_Izolovat"
#: src/diffuse/main.py:849 #: src/diffuse/main.py:852
msgid "_First Difference" msgid "_First Difference"
msgstr "Pr_vní rozdíl" msgstr "Pr_vní rozdíl"
#: src/diffuse/main.py:850 #: src/diffuse/main.py:853
msgid "_Previous Difference" msgid "_Previous Difference"
msgstr "_Předchozí rozdíl" msgstr "_Předchozí rozdíl"
#: src/diffuse/main.py:851 #: src/diffuse/main.py:854
msgid "_Next Difference" msgid "_Next Difference"
msgstr "_Další rozdíl" msgstr "_Další rozdíl"
#: src/diffuse/main.py:852 #: src/diffuse/main.py:855
msgid "_Last Difference" msgid "_Last Difference"
msgstr "P_oslední rozdíl" msgstr "P_oslední rozdíl"
#: src/diffuse/main.py:854 #: src/diffuse/main.py:857
msgid "Fir_st Tab" msgid "Fir_st Tab"
msgstr "Prv_ní panel" msgstr "Prv_ní panel"
#: src/diffuse/main.py:855 #: src/diffuse/main.py:858
msgid "Pre_vious Tab" msgid "Pre_vious Tab"
msgstr "Předch_ozí panel" msgstr "Předch_ozí panel"
#: src/diffuse/main.py:856 #: src/diffuse/main.py:859
msgid "Next _Tab" msgid "Next _Tab"
msgstr "D_alší panel" msgstr "D_alší panel"
#: src/diffuse/main.py:857 #: src/diffuse/main.py:860
msgid "Las_t Tab" msgid "Las_t Tab"
msgstr "Posl_ední panel" msgstr "Posl_ední panel"
#: src/diffuse/main.py:859 #: src/diffuse/main.py:862
msgid "Shift Pane _Right" msgid "Shift Pane _Right"
msgstr "Přesunout podokno dop_rava" msgstr "Přesunout podokno dop_rava"
#: src/diffuse/main.py:860 #: src/diffuse/main.py:863
msgid "Shift Pane _Left" msgid "Shift Pane _Left"
msgstr "Přesunout podokno do_leva" msgstr "Přesunout podokno do_leva"
#: src/diffuse/main.py:863 #: src/diffuse/main.py:866
msgid "F_ormat" msgid "F_ormat"
msgstr "F_ormát" msgstr "F_ormát"
#: src/diffuse/main.py:864 #: src/diffuse/main.py:867
msgid "Convert To _Upper Case" msgid "Convert To _Upper Case"
msgstr "Převést na _velká písmena" msgstr "Převést na _velká písmena"
#: src/diffuse/main.py:865 #: src/diffuse/main.py:868
msgid "Convert To _Lower Case" msgid "Convert To _Lower Case"
msgstr "Převést na _malá písmena" msgstr "Převést na _malá písmena"
#: src/diffuse/main.py:867 #: src/diffuse/main.py:870
msgid "Sort Lines In _Ascending Order" msgid "Sort Lines In _Ascending Order"
msgstr "Seřadit řádky v_zestupně" msgstr "Seřadit řádky v_zestupně"
#: src/diffuse/main.py:868 #: src/diffuse/main.py:871
msgid "Sort Lines In D_escending Order" msgid "Sort Lines In D_escending Order"
msgstr "Seřadit řádky _sestupně" msgstr "Seřadit řádky _sestupně"
#: src/diffuse/main.py:870 #: src/diffuse/main.py:873
msgid "Remove Trailing _White Space" msgid "Remove Trailing _White Space"
msgstr "_Odstranit mezery na koncích řádků" msgstr "_Odstranit mezery na koncích řádků"
#: src/diffuse/main.py:871 #: src/diffuse/main.py:874
msgid "Convert Tabs To _Spaces" msgid "Convert Tabs To _Spaces"
msgstr "_Nahradit tabulátory mezerami" msgstr "_Nahradit tabulátory mezerami"
#: src/diffuse/main.py:872 #: src/diffuse/main.py:875
msgid "Convert Leading Spaces To _Tabs" msgid "Convert Leading Spaces To _Tabs"
msgstr "Nah_radit úvodní mezery tabulátory" msgstr "Nah_radit úvodní mezery tabulátory"
#: src/diffuse/main.py:874 #: src/diffuse/main.py:877
msgid "_Increase Indenting" msgid "_Increase Indenting"
msgstr "Zvětš_it odsazení" msgstr "Zvětš_it odsazení"
#: src/diffuse/main.py:875 #: src/diffuse/main.py:878
msgid "De_crease Indenting" msgid "De_crease Indenting"
msgstr "Zmenši_t odsazení" msgstr "Zmenši_t odsazení"
#: src/diffuse/main.py:877 #: src/diffuse/main.py:880
msgid "Convert To _DOS Format" msgid "Convert To _DOS Format"
msgstr "Převést na _DOS formát" msgstr "Převést na _DOS formát"
#: src/diffuse/main.py:878 #: src/diffuse/main.py:881
msgid "Convert To _Mac Format" msgid "Convert To _Mac Format"
msgstr "Převést na Ma_c formát" msgstr "Převést na Ma_c formát"
#: src/diffuse/main.py:879 #: src/diffuse/main.py:882
msgid "Convert To Uni_x Format" msgid "Convert To Uni_x Format"
msgstr "Převést na Uni_x formát" msgstr "Převést na Uni_x formát"
#: src/diffuse/main.py:882 #: src/diffuse/main.py:885
msgid "_Merge" msgid "_Merge"
msgstr "S_loučit" msgstr "S_loučit"
#: src/diffuse/main.py:883 #: src/diffuse/main.py:886
msgid "Copy Selection _Right" msgid "Copy Selection _Right"
msgstr "_Kopírovat výběr doprava" msgstr "_Kopírovat výběr doprava"
#: src/diffuse/main.py:884 #: src/diffuse/main.py:887
msgid "Copy Selection _Left" msgid "Copy Selection _Left"
msgstr "K_opírovat výběr doleva" msgstr "K_opírovat výběr doleva"
#: src/diffuse/main.py:886 #: src/diffuse/main.py:889
msgid "Copy Left _Into Selection" msgid "Copy Left _Into Selection"
msgstr "Ko_pírovat zleva do výběru" msgstr "Ko_pírovat zleva do výběru"
#: src/diffuse/main.py:887 #: src/diffuse/main.py:890
msgid "Copy Right I_nto Selection" msgid "Copy Right I_nto Selection"
msgstr "Kopí_rovat zprava do výběru" msgstr "Kopí_rovat zprava do výběru"
#: src/diffuse/main.py:888 #: src/diffuse/main.py:891
msgid "_Merge From Left Then Right" msgid "_Merge From Left Then Right"
msgstr "_Sloučit zleva a poté zprava" msgstr "_Sloučit zleva a poté zprava"
#: src/diffuse/main.py:889 #: src/diffuse/main.py:892
msgid "M_erge From Right Then Left" msgid "M_erge From Right Then Left"
msgstr "S_loučit zprava a poté zleva" msgstr "S_loučit zprava a poté zleva"
#: src/diffuse/main.py:892 #: src/diffuse/main.py:895
msgid "_Help" msgid "_Help"
msgstr "Nápo_věda" msgstr "Nápo_věda"
#: src/diffuse/main.py:893 #: src/diffuse/main.py:896
msgid "_Help Contents..." msgid "_Help Contents..."
msgstr "_Zobrazit nápovědu..." msgstr "_Zobrazit nápovědu..."
#: src/diffuse/main.py:895 #: src/diffuse/main.py:898
#, python-format #, python-format
msgid "_About %s..." msgid "_About %s..."
msgstr "_O programu %s..." msgstr "_O programu %s..."
#: src/diffuse/main.py:910 #: src/diffuse/main.py:913
msgid "New 2-Way File Merge" msgid "New 2-Way File Merge"
msgstr "Nové 2směrné slučování" msgstr "Nové 2směrné slučování"
#: src/diffuse/main.py:911 #: src/diffuse/main.py:914
msgid "New 3-Way File Merge" msgid "New 3-Way File Merge"
msgstr "Nové 3směrné slučování" msgstr "Nové 3směrné slučování"
#: src/diffuse/main.py:913 #: src/diffuse/main.py:916
msgid "Realign All" msgid "Realign All"
msgstr "Znovu zarovnat" msgstr "Znovu zarovnat"
#: src/diffuse/main.py:914 #: src/diffuse/main.py:917
msgid "First Difference" msgid "First Difference"
msgstr "První rozdíl" msgstr "První rozdíl"
#: src/diffuse/main.py:915 #: src/diffuse/main.py:918
msgid "Previous Difference" msgid "Previous Difference"
msgstr "Předchozí rozdíl" msgstr "Předchozí rozdíl"
#: src/diffuse/main.py:916 #: src/diffuse/main.py:919
msgid "Next Difference" msgid "Next Difference"
msgstr "Další rozdíl" msgstr "Další rozdíl"
#: src/diffuse/main.py:917 #: src/diffuse/main.py:920
msgid "Last Difference" msgid "Last Difference"
msgstr "Poslední rozdíl" msgstr "Poslední rozdíl"
#: src/diffuse/main.py:919 #: src/diffuse/main.py:922
msgid "Copy Selection Right" msgid "Copy Selection Right"
msgstr "Kopírovat výběr doprava" msgstr "Kopírovat výběr doprava"
#: src/diffuse/main.py:920 #: src/diffuse/main.py:923
msgid "Copy Selection Left" msgid "Copy Selection Left"
msgstr "Kopírovat výběr doleva" msgstr "Kopírovat výběr doleva"
#: src/diffuse/main.py:921 #: src/diffuse/main.py:924
msgid "Copy Left Into Selection" msgid "Copy Left Into Selection"
msgstr "Kopírovat zleva do výběru" msgstr "Kopírovat zleva do výběru"
#: src/diffuse/main.py:922 #: src/diffuse/main.py:925
msgid "Copy Right Into Selection" msgid "Copy Right Into Selection"
msgstr "Kopírovat zprava do výběru" msgstr "Kopírovat zprava do výběru"
#: src/diffuse/main.py:923 #: src/diffuse/main.py:926
msgid "Merge From Left Then Right" msgid "Merge From Left Then Right"
msgstr "Sloučit zleva a poté zprava" msgstr "Sloučit zleva a poté zprava"
#: src/diffuse/main.py:924 #: src/diffuse/main.py:927
msgid "Merge From Right Then Left" msgid "Merge From Right Then Left"
msgstr "Sloučit zprava a poté zleva" msgstr "Sloučit zprava a poté zleva"
#: src/diffuse/main.py:926 #: src/diffuse/main.py:929
msgid "Undo" msgid "Undo"
msgstr "Zpět" msgstr "Zpět"
#: src/diffuse/main.py:927 #: src/diffuse/main.py:930
msgid "Redo" msgid "Redo"
msgstr "Znovu" msgstr "Znovu"
#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 #: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
msgid "Cut" msgid "Cut"
msgstr "Vyjmout" msgstr "Vyjmout"
#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 #: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
msgid "Copy" msgid "Copy"
msgstr "Kopírovat" msgstr "Kopírovat"
#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 #: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
msgid "Paste" msgid "Paste"
msgstr "Vložit" msgstr "Vložit"
#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 #: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
msgid "Clear Edits" msgid "Clear Edits"
msgstr "Smazat úpravy" msgstr "Smazat úpravy"
#: src/diffuse/main.py:1054 #: src/diffuse/main.py:1057
msgid "Some files have unsaved changes. Select the files to save before closing." msgid "Some files have unsaved changes. Select the files to save before closing."
msgstr "" msgstr ""
"Některé změněné soubory nebyly uloženy. Vyberte soubory, které chcete před " "Některé změněné soubory nebyly uloženy. Vyberte soubory, které chcete před "
"zavřením uložit." "zavřením uložit."
#: src/diffuse/main.py:1068 #: src/diffuse/main.py:1071
msgid "Tab" msgid "Tab"
msgstr "Panel" msgstr "Panel"
#: src/diffuse/main.py:1073 #: src/diffuse/main.py:1076
msgid "Pane" msgid "Pane"
msgstr "Podokno" msgstr "Podokno"
#: src/diffuse/main.py:1084 #: src/diffuse/main.py:1087
msgid "Close _Without Saving" msgid "Close _Without Saving"
msgstr "Zavřít _bez uložení" msgstr "Zavřít _bez uložení"
#: src/diffuse/main.py:1123 #: src/diffuse/main.py:1126
#, python-format #, python-format
msgid "Closing this tab will quit %s." msgid "Closing this tab will quit %s."
msgstr "Zavřením tohoto panelu ukončíte %s." msgstr "Zavřením tohoto panelu ukončíte %s."
#: src/diffuse/main.py:1206 #: src/diffuse/main.py:1209
#, python-format #, python-format
msgid "File Merge %d" msgid "File Merge %d"
msgstr "Slučování %d" msgstr "Slučování %d"
#: src/diffuse/main.py:1312 #: src/diffuse/main.py:1315
#, python-format #, python-format
msgid "Error retrieving commits for %s." msgid "Error retrieving commits for %s."
msgstr "Revize pro %s se nepodařilo načíst." msgstr "Revize pro %s se nepodařilo načíst."
#: src/diffuse/main.py:1344 #: src/diffuse/main.py:1347
#, python-format #, python-format
msgid "Error retrieving modifications for %s." msgid "Error retrieving modifications for %s."
msgstr "Při načítání změn %s došlo k chybě." msgstr "Při načítání změn %s došlo k chybě."
#: src/diffuse/main.py:1377 #: src/diffuse/main.py:1380
msgid "Open File In New Tab" msgid "Open File In New Tab"
msgstr "Otevřít soubor v novém panelu" msgstr "Otevřít soubor v novém panelu"
#: src/diffuse/main.py:1400 #: src/diffuse/main.py:1403
msgid "Choose Folder With Modified Files" msgid "Choose Folder With Modified Files"
msgstr "Vyberte adresář se změněnými soubory" msgstr "Vyberte adresář se změněnými soubory"
#: src/diffuse/main.py:1418 #: src/diffuse/main.py:1421
msgid "No modified files found." msgid "No modified files found."
msgstr "Nebyly nalezeny žádné změněné soubory." msgstr "Nebyly nalezeny žádné změněné soubory."
#: src/diffuse/main.py:1424 #: src/diffuse/main.py:1427
msgid "Choose Folder With Commit" msgid "Choose Folder With Commit"
msgstr "Vyberte adresář se zapsanou revizí" msgstr "Vyberte adresář se zapsanou revizí"
#: src/diffuse/main.py:1444 #: src/diffuse/main.py:1447
msgid "No committed files found." msgid "No committed files found."
msgstr "Nebyly nalezeny žádné zapsané soubory." msgstr "Nebyly nalezeny žádné zapsané soubory."
#: src/diffuse/main.py:1480 #: src/diffuse/main.py:1483
msgid "New N-Way File Merge..." msgid "New N-Way File Merge..."
msgstr "Nové Nsměrné slučování..." msgstr "Nové Nsměrné slučování..."
#: src/diffuse/main.py:1481 #: src/diffuse/main.py:1484
msgid "Number of panes: " msgid "Number of panes: "
msgstr "Počet podoken: " msgstr "Počet podoken: "
#: src/diffuse/main.py:1555 #: src/diffuse/main.py:1558
msgid "Phrase not found. Continue from the end of the file?" msgid "Phrase not found. Continue from the end of the file?"
msgstr "Hledaný výraz nebyl nalezen. Pokračovat v hledání od konce souboru?" msgstr "Hledaný výraz nebyl nalezen. Pokračovat v hledání od konce souboru?"
#: src/diffuse/main.py:1557 #: src/diffuse/main.py:1560
msgid "Phrase not found. Continue from the start of the file?" msgid "Phrase not found. Continue from the start of the file?"
msgstr "Hledaný výraz nebyl nalezen. Pokračovat v hledání od začátku souboru?" msgstr "Hledaný výraz nebyl nalezen. Pokračovat v hledání od začátku souboru?"
#: src/diffuse/main.py:1778 #: src/diffuse/main.py:1781
#, fuzzy #, fuzzy
msgid "" msgid ""
"Usage:\n" "Usage:\n"
@ -685,16 +690,16 @@ msgstr ""
" ( -w | --ignore-all-space ) Bude ignorovat změny pokud, jde o " " ( -w | --ignore-all-space ) Bude ignorovat změny pokud, jde o "
"netisknutelné znaky" "netisknutelné znaky"
#: src/diffuse/main.py:1945 #: src/diffuse/main.py:1948
msgid "Error parsing line number." msgid "Error parsing line number."
msgstr "Při analýze čísla řádku došlo k chybě." msgstr "Při analýze čísla řádku došlo k chybě."
#: src/diffuse/main.py:1955 #: src/diffuse/main.py:1958
#, python-format #, python-format
msgid "Skipping unknown argument \"%s\"." msgid "Skipping unknown argument \"%s\"."
msgstr "Ignorován neznámý parametr \"%s\"." msgstr "Ignorován neznámý parametr \"%s\"."
#: src/diffuse/main.py:1963 #: src/diffuse/main.py:1966
#, python-format #, python-format
msgid "Error processing argument \"%s\". Directory not expected." msgid "Error processing argument \"%s\". Directory not expected."
msgstr "Při zpracování parametru \"%s\" došlo k chybě. Adresář nebyl očekáván." msgstr "Při zpracování parametru \"%s\" došlo k chybě. Adresář nebyl očekáván."
@ -970,7 +975,3 @@ msgstr "Vybrat vše"
#: src/diffuse/widgets.py:1868 #: src/diffuse/widgets.py:1868
msgid "Swap with Selected Pane" msgid "Swap with Selected Pane"
msgstr "Prohodit s vybraným podoknem" msgstr "Prohodit s vybraným podoknem"
#, python-format
#~ msgid "Column %d"
#~ msgstr "Sloupec %d"

255
po/de.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: diffuse-svn\n" "Project-Id-Version: diffuse-svn\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-23 19:48-0400\n" "POT-Creation-Date: 2022-10-23 20:00-0400\n"
"PO-Revision-Date: 2021-01-26 04:29+0100\n" "PO-Revision-Date: 2021-01-26 04:29+0100\n"
"Last-Translator: Henri Menke <henrimenke4@aim.com>\n" "Last-Translator: Henri Menke <henrimenke4@aim.com>\n"
"Language-Team: German <henrimenke4@aim.com>\n" "Language-Team: German <henrimenke4@aim.com>\n"
@ -99,40 +99,45 @@ msgstr "Datei speichern"
msgid "Save File As..." msgid "Save File As..."
msgstr "Datei speichern unter..." msgstr "Datei speichern unter..."
#: src/diffuse/main.py:288 #: src/diffuse/main.py:217
#, python-format
msgid "Column %d"
msgstr "Spalte %d"
#: src/diffuse/main.py:291
msgid "Save changes before loading the new file?" msgid "Save changes before loading the new file?"
msgstr "Änderungen speichern vor dem Laden der neuen Datei?" msgstr "Änderungen speichern vor dem Laden der neuen Datei?"
#: src/diffuse/main.py:399 #: src/diffuse/main.py:402
#, python-format #, python-format
msgid "Error reading revision %(rev)s of %(file)s." msgid "Error reading revision %(rev)s of %(file)s."
msgstr "Fehler beim lesen der Revision %(rev)s von %(file)s." msgstr "Fehler beim lesen der Revision %(rev)s von %(file)s."
#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #: src/diffuse/main.py:405 src/diffuse/main.py:1860
#, python-format #, python-format
msgid "Error reading %s." msgid "Error reading %s."
msgstr "Fehler beim Lesen von %s." msgstr "Fehler beim Lesen von %s."
#: src/diffuse/main.py:424 #: src/diffuse/main.py:427
msgid "Open File" msgid "Open File"
msgstr "Datei öffnen" msgstr "Datei öffnen"
#: src/diffuse/main.py:481 #: src/diffuse/main.py:484
#, python-format #, python-format
msgid "The file %s changed on disk. Do you want to reload the file?" msgid "The file %s changed on disk. Do you want to reload the file?"
msgstr "Die Datei %s wurde auf geändert. Wollen Sie die Datei neu laden?" msgstr "Die Datei %s wurde auf geändert. Wollen Sie die Datei neu laden?"
#: src/diffuse/main.py:507 #: src/diffuse/main.py:510
#, python-format #, python-format
msgid "Save %(title)s Pane %(pane)d" msgid "Save %(title)s Pane %(pane)d"
msgstr "Speichern %(title)s Fenster %(pane)d" msgstr "Speichern %(title)s Fenster %(pane)d"
#: src/diffuse/main.py:539 #: src/diffuse/main.py:542
#, python-format #, python-format
msgid "A file named %s already exists. Do you want to overwrite it?" msgid "A file named %s already exists. Do you want to overwrite it?"
msgstr "Eine Datei mit dem Namen %s existiert bereits. Überschreiben?" msgstr "Eine Datei mit dem Namen %s existiert bereits. Überschreiben?"
#: src/diffuse/main.py:546 #: src/diffuse/main.py:549
#, python-format #, python-format
msgid "" msgid ""
"The file %s has been modified by another process since reading it. If you save, " "The file %s has been modified by another process since reading it. If you save, "
@ -141,25 +146,25 @@ msgstr ""
"Die Datei %s wurde seit dem letzten Mal von einem anderen Prozess verändert. Wenn " "Die Datei %s wurde seit dem letzten Mal von einem anderen Prozess verändert. Wenn "
"Sie speichern werden alle externen Änderungen verloren gehen. Trotzdem Speichern?" "Sie speichern werden alle externen Änderungen verloren gehen. Trotzdem Speichern?"
#: src/diffuse/main.py:588 #: src/diffuse/main.py:591
#, python-format #, python-format
msgid "Error encoding to %s." msgid "Error encoding to %s."
msgstr "Fehler bei der Kodierung nach %s." msgstr "Fehler bei der Kodierung nach %s."
#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #: src/diffuse/main.py:595 src/diffuse/preferences.py:300
#, python-format #, python-format
msgid "Error writing %s." msgid "Error writing %s."
msgstr "Fehler beim Schreiben von %s." msgstr "Fehler beim Schreiben von %s."
#: src/diffuse/main.py:622 #: src/diffuse/main.py:625
msgid "Go To Line..." msgid "Go To Line..."
msgstr "Gehe zu Zeile..." msgstr "Gehe zu Zeile..."
#: src/diffuse/main.py:623 #: src/diffuse/main.py:626
msgid "Line Number: " msgid "Line Number: "
msgstr "Zeilennummer: " msgstr "Zeilennummer: "
#: src/diffuse/main.py:654 #: src/diffuse/main.py:657
msgid "" msgid ""
"Press the enter key or double click to edit. Press the space bar or use the RMB " "Press the enter key or double click to edit. Press the space bar or use the RMB "
"menu to manually align." "menu to manually align."
@ -167,11 +172,11 @@ msgstr ""
"Enter drücken, oder Doppelklicken zum editieren. Drücken Sie die Leertaste, oder " "Enter drücken, oder Doppelklicken zum editieren. Drücken Sie die Leertaste, oder "
"nutzen sie das RMB Menü zum manuellen Ausrichten." "nutzen sie das RMB Menü zum manuellen Ausrichten."
#: src/diffuse/main.py:658 #: src/diffuse/main.py:661
msgid "Press the escape key to finish editing." msgid "Press the escape key to finish editing."
msgstr "Drücken Sie die Escape Taste um die Bearbeitung zu beenden." msgstr "Drücken Sie die Escape Taste um die Bearbeitung zu beenden."
#: src/diffuse/main.py:661 #: src/diffuse/main.py:664
msgid "" msgid ""
"Select target line and press the space bar to align. Press the escape key to " "Select target line and press the space bar to align. Press the escape key to "
"cancel." "cancel."
@ -179,426 +184,426 @@ msgstr ""
"Zeile auswählen und Leertaste drücken zum Ausrichten. Drücken Sie die Escape " "Zeile auswählen und Leertaste drücken zum Ausrichten. Drücken Sie die Escape "
"Taste zum Abbrechen." "Taste zum Abbrechen."
#: src/diffuse/main.py:784 #: src/diffuse/main.py:787
msgid "_File" msgid "_File"
msgstr "_Datei" msgstr "_Datei"
#: src/diffuse/main.py:785 #: src/diffuse/main.py:788
msgid "_Open File..." msgid "_Open File..."
msgstr "_Öffne Datei..." msgstr "_Öffne Datei..."
#: src/diffuse/main.py:786 #: src/diffuse/main.py:789
msgid "Open File In New _Tab..." msgid "Open File In New _Tab..."
msgstr "Datei _in neuem Reiter öffnen..." msgstr "Datei _in neuem Reiter öffnen..."
#: src/diffuse/main.py:787 #: src/diffuse/main.py:790
msgid "Open _Modified Files..." msgid "Open _Modified Files..."
msgstr "_Bearbeitete Dateien öffnen..." msgstr "_Bearbeitete Dateien öffnen..."
#: src/diffuse/main.py:788 #: src/diffuse/main.py:791
msgid "Open Commi_t..." msgid "Open Commi_t..."
msgstr "Revi_sion öffnen..." msgstr "Revi_sion öffnen..."
#: src/diffuse/main.py:789 #: src/diffuse/main.py:792
msgid "_Reload File" msgid "_Reload File"
msgstr "Datei _neu laden" msgstr "Datei _neu laden"
#: src/diffuse/main.py:791 #: src/diffuse/main.py:794
msgid "_Save File" msgid "_Save File"
msgstr "Datei _speichern" msgstr "Datei _speichern"
#: src/diffuse/main.py:792 #: src/diffuse/main.py:795
msgid "Save File _As..." msgid "Save File _As..."
msgstr "Datei speichern _unter..." msgstr "Datei speichern _unter..."
#: src/diffuse/main.py:793 #: src/diffuse/main.py:796
msgid "Save A_ll" msgid "Save A_ll"
msgstr "_Alle speichern" msgstr "_Alle speichern"
#: src/diffuse/main.py:795 #: src/diffuse/main.py:798
msgid "New _2-Way File Merge" msgid "New _2-Way File Merge"
msgstr "Neues _2-Wege-Datei-Zusammenführen" msgstr "Neues _2-Wege-Datei-Zusammenführen"
#: src/diffuse/main.py:796 #: src/diffuse/main.py:799
msgid "New _3-Way File Merge" msgid "New _3-Way File Merge"
msgstr "Neues _3-Wege-Datei-Zusammenführen" msgstr "Neues _3-Wege-Datei-Zusammenführen"
#: src/diffuse/main.py:797 #: src/diffuse/main.py:800
msgid "New _N-Way File Merge..." msgid "New _N-Way File Merge..."
msgstr "Neues _N-Wege-Datei-Zusammenführen..." msgstr "Neues _N-Wege-Datei-Zusammenführen..."
#: src/diffuse/main.py:799 #: src/diffuse/main.py:802
msgid "_Close Tab" msgid "_Close Tab"
msgstr "_Reiter schließen" msgstr "_Reiter schließen"
#: src/diffuse/main.py:800 #: src/diffuse/main.py:803
msgid "_Undo Close Tab" msgid "_Undo Close Tab"
msgstr "_Reiter schließen rückgängig" msgstr "_Reiter schließen rückgängig"
#: src/diffuse/main.py:801 #: src/diffuse/main.py:804
msgid "_Quit" msgid "_Quit"
msgstr "_Beenden" msgstr "_Beenden"
#: src/diffuse/main.py:804 #: src/diffuse/main.py:807
msgid "_Edit" msgid "_Edit"
msgstr "_Bearbeiten" msgstr "_Bearbeiten"
#: src/diffuse/main.py:805 #: src/diffuse/main.py:808
msgid "_Undo" msgid "_Undo"
msgstr "_Rückgängig" msgstr "_Rückgängig"
#: src/diffuse/main.py:806 #: src/diffuse/main.py:809
msgid "_Redo" msgid "_Redo"
msgstr "_Wiederholen" msgstr "_Wiederholen"
#: src/diffuse/main.py:808 #: src/diffuse/main.py:811
msgid "Cu_t" msgid "Cu_t"
msgstr "_Ausschneiden" msgstr "_Ausschneiden"
#: src/diffuse/main.py:809 #: src/diffuse/main.py:812
msgid "_Copy" msgid "_Copy"
msgstr "_Kopieren" msgstr "_Kopieren"
#: src/diffuse/main.py:810 #: src/diffuse/main.py:813
msgid "_Paste" msgid "_Paste"
msgstr "_Einfügen" msgstr "_Einfügen"
#: src/diffuse/main.py:812 #: src/diffuse/main.py:815
msgid "Select _All" msgid "Select _All"
msgstr "_Alles auswählen" msgstr "_Alles auswählen"
#: src/diffuse/main.py:813 #: src/diffuse/main.py:816
msgid "C_lear Edits" msgid "C_lear Edits"
msgstr "Alle _Änderungen rückgängig" msgstr "Alle _Änderungen rückgängig"
#: src/diffuse/main.py:814 #: src/diffuse/main.py:817
msgid "_Dismiss All Edits" msgid "_Dismiss All Edits"
msgstr "Alle Än_derungen verwerfen" msgstr "Alle Än_derungen verwerfen"
#: src/diffuse/main.py:816 #: src/diffuse/main.py:819
msgid "_Find..." msgid "_Find..."
msgstr "_Suchen..." msgstr "_Suchen..."
#: src/diffuse/main.py:817 #: src/diffuse/main.py:820
msgid "Find _Next" msgid "Find _Next"
msgstr "_Nächstes suchen" msgstr "_Nächstes suchen"
#: src/diffuse/main.py:818 #: src/diffuse/main.py:821
msgid "Find Pre_vious" msgid "Find Pre_vious"
msgstr "_Rückwärts suchen" msgstr "_Rückwärts suchen"
#: src/diffuse/main.py:819 #: src/diffuse/main.py:822
msgid "_Go To Line..." msgid "_Go To Line..."
msgstr "_Gehe zu Zeile..." msgstr "_Gehe zu Zeile..."
#: src/diffuse/main.py:821 #: src/diffuse/main.py:824
msgid "Pr_eferences..." msgid "Pr_eferences..."
msgstr "_Einstellungen..." msgstr "_Einstellungen..."
#: src/diffuse/main.py:825 #: src/diffuse/main.py:828
msgid "None" msgid "None"
msgstr "Keine" msgstr "Keine"
#: src/diffuse/main.py:843 #: src/diffuse/main.py:846
msgid "_View" msgid "_View"
msgstr "_Ansicht" msgstr "_Ansicht"
#: src/diffuse/main.py:844 #: src/diffuse/main.py:847
msgid "_Syntax Highlighting" msgid "_Syntax Highlighting"
msgstr "_Syntax Hervorhebung" msgstr "_Syntax Hervorhebung"
#: src/diffuse/main.py:846 #: src/diffuse/main.py:849
msgid "Re_align All" msgid "Re_align All"
msgstr "Alle neu _ausrichten" msgstr "Alle neu _ausrichten"
#: src/diffuse/main.py:847 #: src/diffuse/main.py:850
msgid "_Isolate" msgid "_Isolate"
msgstr "_Isolieren" msgstr "_Isolieren"
#: src/diffuse/main.py:849 #: src/diffuse/main.py:852
msgid "_First Difference" msgid "_First Difference"
msgstr "_Erster Unterschied" msgstr "_Erster Unterschied"
#: src/diffuse/main.py:850 #: src/diffuse/main.py:853
msgid "_Previous Difference" msgid "_Previous Difference"
msgstr "_Voriger Unterschied" msgstr "_Voriger Unterschied"
#: src/diffuse/main.py:851 #: src/diffuse/main.py:854
msgid "_Next Difference" msgid "_Next Difference"
msgstr "_Nächster Unterschied" msgstr "_Nächster Unterschied"
#: src/diffuse/main.py:852 #: src/diffuse/main.py:855
msgid "_Last Difference" msgid "_Last Difference"
msgstr "_Letzter Unterschied" msgstr "_Letzter Unterschied"
#: src/diffuse/main.py:854 #: src/diffuse/main.py:857
msgid "Fir_st Tab" msgid "Fir_st Tab"
msgstr "Er_ster Reiter" msgstr "Er_ster Reiter"
#: src/diffuse/main.py:855 #: src/diffuse/main.py:858
msgid "Pre_vious Tab" msgid "Pre_vious Tab"
msgstr "V_origer Reiter" msgstr "V_origer Reiter"
#: src/diffuse/main.py:856 #: src/diffuse/main.py:859
msgid "Next _Tab" msgid "Next _Tab"
msgstr "N_ächster Reiter" msgstr "N_ächster Reiter"
#: src/diffuse/main.py:857 #: src/diffuse/main.py:860
msgid "Las_t Tab" msgid "Las_t Tab"
msgstr "Letz_ter Reiter" msgstr "Letz_ter Reiter"
#: src/diffuse/main.py:859 #: src/diffuse/main.py:862
msgid "Shift Pane _Right" msgid "Shift Pane _Right"
msgstr "Fenster nach _rechts verschieben" msgstr "Fenster nach _rechts verschieben"
#: src/diffuse/main.py:860 #: src/diffuse/main.py:863
msgid "Shift Pane _Left" msgid "Shift Pane _Left"
msgstr "Fenster nach _links verschieben" msgstr "Fenster nach _links verschieben"
#: src/diffuse/main.py:863 #: src/diffuse/main.py:866
msgid "F_ormat" msgid "F_ormat"
msgstr "F_ormat" msgstr "F_ormat"
#: src/diffuse/main.py:864 #: src/diffuse/main.py:867
msgid "Convert To _Upper Case" msgid "Convert To _Upper Case"
msgstr "In Großb_uchstaben konvertieren" msgstr "In Großb_uchstaben konvertieren"
#: src/diffuse/main.py:865 #: src/diffuse/main.py:868
msgid "Convert To _Lower Case" msgid "Convert To _Lower Case"
msgstr "In K_leinbuchstaben konvertieren" msgstr "In K_leinbuchstaben konvertieren"
#: src/diffuse/main.py:867 #: src/diffuse/main.py:870
msgid "Sort Lines In _Ascending Order" msgid "Sort Lines In _Ascending Order"
msgstr "Zeile in _aufsteigender Reihenfolge sortieren" msgstr "Zeile in _aufsteigender Reihenfolge sortieren"
#: src/diffuse/main.py:868 #: src/diffuse/main.py:871
msgid "Sort Lines In D_escending Order" msgid "Sort Lines In D_escending Order"
msgstr "Zeile in abst_eigender Reihenfolge sortieren" msgstr "Zeile in abst_eigender Reihenfolge sortieren"
#: src/diffuse/main.py:870 #: src/diffuse/main.py:873
msgid "Remove Trailing _White Space" msgid "Remove Trailing _White Space"
msgstr "Entferne angehängte _Leerzeichen" msgstr "Entferne angehängte _Leerzeichen"
#: src/diffuse/main.py:871 #: src/diffuse/main.py:874
msgid "Convert Tabs To _Spaces" msgid "Convert Tabs To _Spaces"
msgstr "Tabulatoren in Leer_zeichen konvertieren" msgstr "Tabulatoren in Leer_zeichen konvertieren"
#: src/diffuse/main.py:872 #: src/diffuse/main.py:875
msgid "Convert Leading Spaces To _Tabs" msgid "Convert Leading Spaces To _Tabs"
msgstr "Vorangestellte Leerzeichen in _Tabulatoren konvertieren" msgstr "Vorangestellte Leerzeichen in _Tabulatoren konvertieren"
#: src/diffuse/main.py:874 #: src/diffuse/main.py:877
msgid "_Increase Indenting" msgid "_Increase Indenting"
msgstr "Einzug er_höhen" msgstr "Einzug er_höhen"
#: src/diffuse/main.py:875 #: src/diffuse/main.py:878
msgid "De_crease Indenting" msgid "De_crease Indenting"
msgstr "Einzug _vermindern" msgstr "Einzug _vermindern"
#: src/diffuse/main.py:877 #: src/diffuse/main.py:880
msgid "Convert To _DOS Format" msgid "Convert To _DOS Format"
msgstr "Ins _DOS Format konvertieren" msgstr "Ins _DOS Format konvertieren"
#: src/diffuse/main.py:878 #: src/diffuse/main.py:881
msgid "Convert To _Mac Format" msgid "Convert To _Mac Format"
msgstr "Ins _Mac Format konvertieren" msgstr "Ins _Mac Format konvertieren"
#: src/diffuse/main.py:879 #: src/diffuse/main.py:882
msgid "Convert To Uni_x Format" msgid "Convert To Uni_x Format"
msgstr "Ins Uni_x Format konvertieren" msgstr "Ins Uni_x Format konvertieren"
#: src/diffuse/main.py:882 #: src/diffuse/main.py:885
msgid "_Merge" msgid "_Merge"
msgstr "_Zusammenführen" msgstr "_Zusammenführen"
#: src/diffuse/main.py:883 #: src/diffuse/main.py:886
msgid "Copy Selection _Right" msgid "Copy Selection _Right"
msgstr "Auswahl nach _rechts kopieren" msgstr "Auswahl nach _rechts kopieren"
#: src/diffuse/main.py:884 #: src/diffuse/main.py:887
msgid "Copy Selection _Left" msgid "Copy Selection _Left"
msgstr "Auswahl nach _links kopieren" msgstr "Auswahl nach _links kopieren"
#: src/diffuse/main.py:886 #: src/diffuse/main.py:889
msgid "Copy Left _Into Selection" msgid "Copy Left _Into Selection"
msgstr "Von links _in die Auswahl kopieren" msgstr "Von links _in die Auswahl kopieren"
#: src/diffuse/main.py:887 #: src/diffuse/main.py:890
msgid "Copy Right I_nto Selection" msgid "Copy Right I_nto Selection"
msgstr "Von rechts i_n die Auswahl kopieren" msgstr "Von rechts i_n die Auswahl kopieren"
#: src/diffuse/main.py:888 #: src/diffuse/main.py:891
msgid "_Merge From Left Then Right" msgid "_Merge From Left Then Right"
msgstr "Zusammenführen von links, dann von rechts" msgstr "Zusammenführen von links, dann von rechts"
#: src/diffuse/main.py:889 #: src/diffuse/main.py:892
msgid "M_erge From Right Then Left" msgid "M_erge From Right Then Left"
msgstr "Zusammenführen von rechts, dann von links" msgstr "Zusammenführen von rechts, dann von links"
#: src/diffuse/main.py:892 #: src/diffuse/main.py:895
msgid "_Help" msgid "_Help"
msgstr "_Hilfe" msgstr "_Hilfe"
#: src/diffuse/main.py:893 #: src/diffuse/main.py:896
msgid "_Help Contents..." msgid "_Help Contents..."
msgstr "_Inhalt..." msgstr "_Inhalt..."
#: src/diffuse/main.py:895 #: src/diffuse/main.py:898
#, python-format #, python-format
msgid "_About %s..." msgid "_About %s..."
msgstr "_Über %s..." msgstr "_Über %s..."
#: src/diffuse/main.py:910 #: src/diffuse/main.py:913
msgid "New 2-Way File Merge" msgid "New 2-Way File Merge"
msgstr "Neues 2-Wege-Datei-Zusammenführen" msgstr "Neues 2-Wege-Datei-Zusammenführen"
#: src/diffuse/main.py:911 #: src/diffuse/main.py:914
msgid "New 3-Way File Merge" msgid "New 3-Way File Merge"
msgstr "Neues 3-Wege-Datei-Zusammenführen" msgstr "Neues 3-Wege-Datei-Zusammenführen"
#: src/diffuse/main.py:913 #: src/diffuse/main.py:916
msgid "Realign All" msgid "Realign All"
msgstr "Alle neu ausrichten" msgstr "Alle neu ausrichten"
#: src/diffuse/main.py:914 #: src/diffuse/main.py:917
msgid "First Difference" msgid "First Difference"
msgstr "Erster Unterschied" msgstr "Erster Unterschied"
#: src/diffuse/main.py:915 #: src/diffuse/main.py:918
msgid "Previous Difference" msgid "Previous Difference"
msgstr "Voriger Unterschied" msgstr "Voriger Unterschied"
#: src/diffuse/main.py:916 #: src/diffuse/main.py:919
msgid "Next Difference" msgid "Next Difference"
msgstr "Nächster Unterschied" msgstr "Nächster Unterschied"
#: src/diffuse/main.py:917 #: src/diffuse/main.py:920
msgid "Last Difference" msgid "Last Difference"
msgstr "Letzter Unterschied" msgstr "Letzter Unterschied"
#: src/diffuse/main.py:919 #: src/diffuse/main.py:922
msgid "Copy Selection Right" msgid "Copy Selection Right"
msgstr "Auswahl nach rechts kopieren" msgstr "Auswahl nach rechts kopieren"
#: src/diffuse/main.py:920 #: src/diffuse/main.py:923
msgid "Copy Selection Left" msgid "Copy Selection Left"
msgstr "Auswahl nach links kopieren" msgstr "Auswahl nach links kopieren"
#: src/diffuse/main.py:921 #: src/diffuse/main.py:924
msgid "Copy Left Into Selection" msgid "Copy Left Into Selection"
msgstr "Von links in die Auswahl kopieren" msgstr "Von links in die Auswahl kopieren"
#: src/diffuse/main.py:922 #: src/diffuse/main.py:925
msgid "Copy Right Into Selection" msgid "Copy Right Into Selection"
msgstr "Von rechts in die Auswahl kopieren" msgstr "Von rechts in die Auswahl kopieren"
#: src/diffuse/main.py:923 #: src/diffuse/main.py:926
msgid "Merge From Left Then Right" msgid "Merge From Left Then Right"
msgstr "Zusammenführen von links, dann von rechts" msgstr "Zusammenführen von links, dann von rechts"
#: src/diffuse/main.py:924 #: src/diffuse/main.py:927
msgid "Merge From Right Then Left" msgid "Merge From Right Then Left"
msgstr "Zusammenführen von rechts, dann von links" msgstr "Zusammenführen von rechts, dann von links"
#: src/diffuse/main.py:926 #: src/diffuse/main.py:929
msgid "Undo" msgid "Undo"
msgstr "Rückgängig" msgstr "Rückgängig"
#: src/diffuse/main.py:927 #: src/diffuse/main.py:930
msgid "Redo" msgid "Redo"
msgstr "Wiederholen" msgstr "Wiederholen"
#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 #: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
msgid "Cut" msgid "Cut"
msgstr "Ausschneiden" msgstr "Ausschneiden"
#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 #: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
msgid "Copy" msgid "Copy"
msgstr "Kopieren" msgstr "Kopieren"
#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 #: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
msgid "Paste" msgid "Paste"
msgstr "Einfügen" msgstr "Einfügen"
#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 #: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
msgid "Clear Edits" msgid "Clear Edits"
msgstr "Alle Änderungen rückgängig" msgstr "Alle Änderungen rückgängig"
#: src/diffuse/main.py:1054 #: src/diffuse/main.py:1057
msgid "Some files have unsaved changes. Select the files to save before closing." msgid "Some files have unsaved changes. Select the files to save before closing."
msgstr "" msgstr ""
"Einige Dateien haben ungespeicherte Änderungen. Wählen Sie die Dateien zum " "Einige Dateien haben ungespeicherte Änderungen. Wählen Sie die Dateien zum "
"speichern aus, bevor Sie beenden." "speichern aus, bevor Sie beenden."
#: src/diffuse/main.py:1068 #: src/diffuse/main.py:1071
msgid "Tab" msgid "Tab"
msgstr "Reiter" msgstr "Reiter"
#: src/diffuse/main.py:1073 #: src/diffuse/main.py:1076
msgid "Pane" msgid "Pane"
msgstr "Fenster" msgstr "Fenster"
#: src/diffuse/main.py:1084 #: src/diffuse/main.py:1087
msgid "Close _Without Saving" msgid "Close _Without Saving"
msgstr "Ohne speichern schließen" msgstr "Ohne speichern schließen"
#: src/diffuse/main.py:1123 #: src/diffuse/main.py:1126
#, python-format #, python-format
msgid "Closing this tab will quit %s." msgid "Closing this tab will quit %s."
msgstr "Schließen des letzten Tabs beendet %s." msgstr "Schließen des letzten Tabs beendet %s."
#: src/diffuse/main.py:1206 #: src/diffuse/main.py:1209
#, python-format #, python-format
msgid "File Merge %d" msgid "File Merge %d"
msgstr "Dateien zusammenführen %d" msgstr "Dateien zusammenführen %d"
#: src/diffuse/main.py:1312 #: src/diffuse/main.py:1315
#, python-format #, python-format
msgid "Error retrieving commits for %s." msgid "Error retrieving commits for %s."
msgstr "Fehler beim Empfangen der Revisionen von %s." msgstr "Fehler beim Empfangen der Revisionen von %s."
#: src/diffuse/main.py:1344 #: src/diffuse/main.py:1347
#, python-format #, python-format
msgid "Error retrieving modifications for %s." msgid "Error retrieving modifications for %s."
msgstr "Fehler beim Empfangen der Bearbeitungen von %s." msgstr "Fehler beim Empfangen der Bearbeitungen von %s."
#: src/diffuse/main.py:1377 #: src/diffuse/main.py:1380
msgid "Open File In New Tab" msgid "Open File In New Tab"
msgstr "Datei in neuem Reiter öffnen" msgstr "Datei in neuem Reiter öffnen"
#: src/diffuse/main.py:1400 #: src/diffuse/main.py:1403
msgid "Choose Folder With Modified Files" msgid "Choose Folder With Modified Files"
msgstr "Ordner mit bearbeiteten Dateien auswählen" msgstr "Ordner mit bearbeiteten Dateien auswählen"
#: src/diffuse/main.py:1418 #: src/diffuse/main.py:1421
msgid "No modified files found." msgid "No modified files found."
msgstr "Keine bearbeiteten Dateien gefunden." msgstr "Keine bearbeiteten Dateien gefunden."
#: src/diffuse/main.py:1424 #: src/diffuse/main.py:1427
msgid "Choose Folder With Commit" msgid "Choose Folder With Commit"
msgstr "Ordner mit Revisionen auswählen" msgstr "Ordner mit Revisionen auswählen"
#: src/diffuse/main.py:1444 #: src/diffuse/main.py:1447
msgid "No committed files found." msgid "No committed files found."
msgstr "Keine revidierten Dateien gefunden." msgstr "Keine revidierten Dateien gefunden."
#: src/diffuse/main.py:1480 #: src/diffuse/main.py:1483
msgid "New N-Way File Merge..." msgid "New N-Way File Merge..."
msgstr "Neues N-Wege-Datei-Zusammenführen..." msgstr "Neues N-Wege-Datei-Zusammenführen..."
#: src/diffuse/main.py:1481 #: src/diffuse/main.py:1484
msgid "Number of panes: " msgid "Number of panes: "
msgstr "Anzahl der Fenster: " msgstr "Anzahl der Fenster: "
#: src/diffuse/main.py:1555 #: src/diffuse/main.py:1558
msgid "Phrase not found. Continue from the end of the file?" msgid "Phrase not found. Continue from the end of the file?"
msgstr "Ausdruck nicht gefunden. Am Ende der Datei fortsetzen?" msgstr "Ausdruck nicht gefunden. Am Ende der Datei fortsetzen?"
#: src/diffuse/main.py:1557 #: src/diffuse/main.py:1560
msgid "Phrase not found. Continue from the start of the file?" msgid "Phrase not found. Continue from the start of the file?"
msgstr "Ausdruck nicht gefunden. Am Anfang der Datei fortsetzen?" msgstr "Ausdruck nicht gefunden. Am Anfang der Datei fortsetzen?"
#: src/diffuse/main.py:1778 #: src/diffuse/main.py:1781
#, fuzzy #, fuzzy
msgid "" msgid ""
"Usage:\n" "Usage:\n"
@ -680,16 +685,16 @@ msgstr ""
"ignorieren\n" "ignorieren\n"
" ( -w | --ignore-all-space ) Unterschiede an Leerzeichen ignorieren" " ( -w | --ignore-all-space ) Unterschiede an Leerzeichen ignorieren"
#: src/diffuse/main.py:1945 #: src/diffuse/main.py:1948
msgid "Error parsing line number." msgid "Error parsing line number."
msgstr "Fehler bei der Analyse der Zeilennummer." msgstr "Fehler bei der Analyse der Zeilennummer."
#: src/diffuse/main.py:1955 #: src/diffuse/main.py:1958
#, python-format #, python-format
msgid "Skipping unknown argument \"%s\"." msgid "Skipping unknown argument \"%s\"."
msgstr "Übergehe unbekannten Parameter \"%s\"." msgstr "Übergehe unbekannten Parameter \"%s\"."
#: src/diffuse/main.py:1963 #: src/diffuse/main.py:1966
#, python-format #, python-format
msgid "Error processing argument \"%s\". Directory not expected." msgid "Error processing argument \"%s\". Directory not expected."
msgstr "Fehler beim Verarbeiten des Arguments \"%s\". Unerwartetes Verzeichnis." msgstr "Fehler beim Verarbeiten des Arguments \"%s\". Unerwartetes Verzeichnis."
@ -965,7 +970,3 @@ msgstr "Alles auswählen"
#: src/diffuse/widgets.py:1868 #: src/diffuse/widgets.py:1868
msgid "Swap with Selected Pane" msgid "Swap with Selected Pane"
msgstr "Mit ausgewähltem Fenster tauschen" msgstr "Mit ausgewähltem Fenster tauschen"
#, python-format
#~ msgid "Column %d"
#~ msgstr "Spalte %d"

251
po/diffuse.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-23 19:48-0400\n" "POT-Creation-Date: 2022-10-23 20:00-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -94,498 +94,503 @@ msgstr ""
msgid "Save File As..." msgid "Save File As..."
msgstr "" msgstr ""
#: src/diffuse/main.py:288 #: src/diffuse/main.py:217
#, python-format
msgid "Column %d"
msgstr ""
#: src/diffuse/main.py:291
msgid "Save changes before loading the new file?" msgid "Save changes before loading the new file?"
msgstr "" msgstr ""
#: src/diffuse/main.py:399 #: src/diffuse/main.py:402
#, python-format #, python-format
msgid "Error reading revision %(rev)s of %(file)s." msgid "Error reading revision %(rev)s of %(file)s."
msgstr "" msgstr ""
#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #: src/diffuse/main.py:405 src/diffuse/main.py:1860
#, python-format #, python-format
msgid "Error reading %s." msgid "Error reading %s."
msgstr "" msgstr ""
#: src/diffuse/main.py:424 #: src/diffuse/main.py:427
msgid "Open File" msgid "Open File"
msgstr "" msgstr ""
#: src/diffuse/main.py:481 #: src/diffuse/main.py:484
#, python-format #, python-format
msgid "The file %s changed on disk. Do you want to reload the file?" msgid "The file %s changed on disk. Do you want to reload the file?"
msgstr "" msgstr ""
#: src/diffuse/main.py:507 #: src/diffuse/main.py:510
#, python-format #, python-format
msgid "Save %(title)s Pane %(pane)d" msgid "Save %(title)s Pane %(pane)d"
msgstr "" msgstr ""
#: src/diffuse/main.py:539 #: src/diffuse/main.py:542
#, python-format #, python-format
msgid "A file named %s already exists. Do you want to overwrite it?" msgid "A file named %s already exists. Do you want to overwrite it?"
msgstr "" msgstr ""
#: src/diffuse/main.py:546 #: src/diffuse/main.py:549
#, python-format #, python-format
msgid "" msgid ""
"The file %s has been modified by another process since reading it. If you save, " "The file %s has been modified by another process since reading it. If you save, "
"all the external changes could be lost. Save anyways?" "all the external changes could be lost. Save anyways?"
msgstr "" msgstr ""
#: src/diffuse/main.py:588 #: src/diffuse/main.py:591
#, python-format #, python-format
msgid "Error encoding to %s." msgid "Error encoding to %s."
msgstr "" msgstr ""
#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #: src/diffuse/main.py:595 src/diffuse/preferences.py:300
#, python-format #, python-format
msgid "Error writing %s." msgid "Error writing %s."
msgstr "" msgstr ""
#: src/diffuse/main.py:622 #: src/diffuse/main.py:625
msgid "Go To Line..." msgid "Go To Line..."
msgstr "" msgstr ""
#: src/diffuse/main.py:623 #: src/diffuse/main.py:626
msgid "Line Number: " msgid "Line Number: "
msgstr "" msgstr ""
#: src/diffuse/main.py:654 #: src/diffuse/main.py:657
msgid "" msgid ""
"Press the enter key or double click to edit. Press the space bar or use the RMB " "Press the enter key or double click to edit. Press the space bar or use the RMB "
"menu to manually align." "menu to manually align."
msgstr "" msgstr ""
#: src/diffuse/main.py:658 #: src/diffuse/main.py:661
msgid "Press the escape key to finish editing." msgid "Press the escape key to finish editing."
msgstr "" msgstr ""
#: src/diffuse/main.py:661 #: src/diffuse/main.py:664
msgid "" msgid ""
"Select target line and press the space bar to align. Press the escape key to " "Select target line and press the space bar to align. Press the escape key to "
"cancel." "cancel."
msgstr "" msgstr ""
#: src/diffuse/main.py:784 #: src/diffuse/main.py:787
msgid "_File" msgid "_File"
msgstr "" msgstr ""
#: src/diffuse/main.py:785 #: src/diffuse/main.py:788
msgid "_Open File..." msgid "_Open File..."
msgstr "" msgstr ""
#: src/diffuse/main.py:786 #: src/diffuse/main.py:789
msgid "Open File In New _Tab..." msgid "Open File In New _Tab..."
msgstr "" msgstr ""
#: src/diffuse/main.py:787 #: src/diffuse/main.py:790
msgid "Open _Modified Files..." msgid "Open _Modified Files..."
msgstr "" msgstr ""
#: src/diffuse/main.py:788 #: src/diffuse/main.py:791
msgid "Open Commi_t..." msgid "Open Commi_t..."
msgstr "" msgstr ""
#: src/diffuse/main.py:789 #: src/diffuse/main.py:792
msgid "_Reload File" msgid "_Reload File"
msgstr "" msgstr ""
#: src/diffuse/main.py:791 #: src/diffuse/main.py:794
msgid "_Save File" msgid "_Save File"
msgstr "" msgstr ""
#: src/diffuse/main.py:792 #: src/diffuse/main.py:795
msgid "Save File _As..." msgid "Save File _As..."
msgstr "" msgstr ""
#: src/diffuse/main.py:793 #: src/diffuse/main.py:796
msgid "Save A_ll" msgid "Save A_ll"
msgstr "" msgstr ""
#: src/diffuse/main.py:795 #: src/diffuse/main.py:798
msgid "New _2-Way File Merge" msgid "New _2-Way File Merge"
msgstr "" msgstr ""
#: src/diffuse/main.py:796 #: src/diffuse/main.py:799
msgid "New _3-Way File Merge" msgid "New _3-Way File Merge"
msgstr "" msgstr ""
#: src/diffuse/main.py:797 #: src/diffuse/main.py:800
msgid "New _N-Way File Merge..." msgid "New _N-Way File Merge..."
msgstr "" msgstr ""
#: src/diffuse/main.py:799 #: src/diffuse/main.py:802
msgid "_Close Tab" msgid "_Close Tab"
msgstr "" msgstr ""
#: src/diffuse/main.py:800 #: src/diffuse/main.py:803
msgid "_Undo Close Tab" msgid "_Undo Close Tab"
msgstr "" msgstr ""
#: src/diffuse/main.py:801 #: src/diffuse/main.py:804
msgid "_Quit" msgid "_Quit"
msgstr "" msgstr ""
#: src/diffuse/main.py:804 #: src/diffuse/main.py:807
msgid "_Edit" msgid "_Edit"
msgstr "" msgstr ""
#: src/diffuse/main.py:805 #: src/diffuse/main.py:808
msgid "_Undo" msgid "_Undo"
msgstr "" msgstr ""
#: src/diffuse/main.py:806 #: src/diffuse/main.py:809
msgid "_Redo" msgid "_Redo"
msgstr "" msgstr ""
#: src/diffuse/main.py:808 #: src/diffuse/main.py:811
msgid "Cu_t" msgid "Cu_t"
msgstr "" msgstr ""
#: src/diffuse/main.py:809 #: src/diffuse/main.py:812
msgid "_Copy" msgid "_Copy"
msgstr "" msgstr ""
#: src/diffuse/main.py:810 #: src/diffuse/main.py:813
msgid "_Paste" msgid "_Paste"
msgstr "" msgstr ""
#: src/diffuse/main.py:812 #: src/diffuse/main.py:815
msgid "Select _All" msgid "Select _All"
msgstr "" msgstr ""
#: src/diffuse/main.py:813 #: src/diffuse/main.py:816
msgid "C_lear Edits" msgid "C_lear Edits"
msgstr "" msgstr ""
#: src/diffuse/main.py:814 #: src/diffuse/main.py:817
msgid "_Dismiss All Edits" msgid "_Dismiss All Edits"
msgstr "" msgstr ""
#: src/diffuse/main.py:816 #: src/diffuse/main.py:819
msgid "_Find..." msgid "_Find..."
msgstr "" msgstr ""
#: src/diffuse/main.py:817 #: src/diffuse/main.py:820
msgid "Find _Next" msgid "Find _Next"
msgstr "" msgstr ""
#: src/diffuse/main.py:818 #: src/diffuse/main.py:821
msgid "Find Pre_vious" msgid "Find Pre_vious"
msgstr "" msgstr ""
#: src/diffuse/main.py:819 #: src/diffuse/main.py:822
msgid "_Go To Line..." msgid "_Go To Line..."
msgstr "" msgstr ""
#: src/diffuse/main.py:821 #: src/diffuse/main.py:824
msgid "Pr_eferences..." msgid "Pr_eferences..."
msgstr "" msgstr ""
#: src/diffuse/main.py:825 #: src/diffuse/main.py:828
msgid "None" msgid "None"
msgstr "" msgstr ""
#: src/diffuse/main.py:843 #: src/diffuse/main.py:846
msgid "_View" msgid "_View"
msgstr "" msgstr ""
#: src/diffuse/main.py:844 #: src/diffuse/main.py:847
msgid "_Syntax Highlighting" msgid "_Syntax Highlighting"
msgstr "" msgstr ""
#: src/diffuse/main.py:846 #: src/diffuse/main.py:849
msgid "Re_align All" msgid "Re_align All"
msgstr "" msgstr ""
#: src/diffuse/main.py:847 #: src/diffuse/main.py:850
msgid "_Isolate" msgid "_Isolate"
msgstr "" msgstr ""
#: src/diffuse/main.py:849 #: src/diffuse/main.py:852
msgid "_First Difference" msgid "_First Difference"
msgstr "" msgstr ""
#: src/diffuse/main.py:850 #: src/diffuse/main.py:853
msgid "_Previous Difference" msgid "_Previous Difference"
msgstr "" msgstr ""
#: src/diffuse/main.py:851 #: src/diffuse/main.py:854
msgid "_Next Difference" msgid "_Next Difference"
msgstr "" msgstr ""
#: src/diffuse/main.py:852 #: src/diffuse/main.py:855
msgid "_Last Difference" msgid "_Last Difference"
msgstr "" msgstr ""
#: src/diffuse/main.py:854 #: src/diffuse/main.py:857
msgid "Fir_st Tab" msgid "Fir_st Tab"
msgstr "" msgstr ""
#: src/diffuse/main.py:855 #: src/diffuse/main.py:858
msgid "Pre_vious Tab" msgid "Pre_vious Tab"
msgstr "" msgstr ""
#: src/diffuse/main.py:856 #: src/diffuse/main.py:859
msgid "Next _Tab" msgid "Next _Tab"
msgstr "" msgstr ""
#: src/diffuse/main.py:857 #: src/diffuse/main.py:860
msgid "Las_t Tab" msgid "Las_t Tab"
msgstr "" msgstr ""
#: src/diffuse/main.py:859 #: src/diffuse/main.py:862
msgid "Shift Pane _Right" msgid "Shift Pane _Right"
msgstr "" msgstr ""
#: src/diffuse/main.py:860 #: src/diffuse/main.py:863
msgid "Shift Pane _Left" msgid "Shift Pane _Left"
msgstr "" msgstr ""
#: src/diffuse/main.py:863 #: src/diffuse/main.py:866
msgid "F_ormat" msgid "F_ormat"
msgstr "" msgstr ""
#: src/diffuse/main.py:864 #: src/diffuse/main.py:867
msgid "Convert To _Upper Case" msgid "Convert To _Upper Case"
msgstr "" msgstr ""
#: src/diffuse/main.py:865 #: src/diffuse/main.py:868
msgid "Convert To _Lower Case" msgid "Convert To _Lower Case"
msgstr "" msgstr ""
#: src/diffuse/main.py:867 #: src/diffuse/main.py:870
msgid "Sort Lines In _Ascending Order" msgid "Sort Lines In _Ascending Order"
msgstr "" msgstr ""
#: src/diffuse/main.py:868 #: src/diffuse/main.py:871
msgid "Sort Lines In D_escending Order" msgid "Sort Lines In D_escending Order"
msgstr "" msgstr ""
#: src/diffuse/main.py:870 #: src/diffuse/main.py:873
msgid "Remove Trailing _White Space" msgid "Remove Trailing _White Space"
msgstr "" msgstr ""
#: src/diffuse/main.py:871 #: src/diffuse/main.py:874
msgid "Convert Tabs To _Spaces" msgid "Convert Tabs To _Spaces"
msgstr "" msgstr ""
#: src/diffuse/main.py:872 #: src/diffuse/main.py:875
msgid "Convert Leading Spaces To _Tabs" msgid "Convert Leading Spaces To _Tabs"
msgstr "" msgstr ""
#: src/diffuse/main.py:874 #: src/diffuse/main.py:877
msgid "_Increase Indenting" msgid "_Increase Indenting"
msgstr "" msgstr ""
#: src/diffuse/main.py:875 #: src/diffuse/main.py:878
msgid "De_crease Indenting" msgid "De_crease Indenting"
msgstr "" msgstr ""
#: src/diffuse/main.py:877 #: src/diffuse/main.py:880
msgid "Convert To _DOS Format" msgid "Convert To _DOS Format"
msgstr "" msgstr ""
#: src/diffuse/main.py:878 #: src/diffuse/main.py:881
msgid "Convert To _Mac Format" msgid "Convert To _Mac Format"
msgstr "" msgstr ""
#: src/diffuse/main.py:879 #: src/diffuse/main.py:882
msgid "Convert To Uni_x Format" msgid "Convert To Uni_x Format"
msgstr "" msgstr ""
#: src/diffuse/main.py:882 #: src/diffuse/main.py:885
msgid "_Merge" msgid "_Merge"
msgstr "" msgstr ""
#: src/diffuse/main.py:883 #: src/diffuse/main.py:886
msgid "Copy Selection _Right" msgid "Copy Selection _Right"
msgstr "" msgstr ""
#: src/diffuse/main.py:884 #: src/diffuse/main.py:887
msgid "Copy Selection _Left" msgid "Copy Selection _Left"
msgstr "" msgstr ""
#: src/diffuse/main.py:886 #: src/diffuse/main.py:889
msgid "Copy Left _Into Selection" msgid "Copy Left _Into Selection"
msgstr "" msgstr ""
#: src/diffuse/main.py:887 #: src/diffuse/main.py:890
msgid "Copy Right I_nto Selection" msgid "Copy Right I_nto Selection"
msgstr "" msgstr ""
#: src/diffuse/main.py:888 #: src/diffuse/main.py:891
msgid "_Merge From Left Then Right" msgid "_Merge From Left Then Right"
msgstr "" msgstr ""
#: src/diffuse/main.py:889 #: src/diffuse/main.py:892
msgid "M_erge From Right Then Left" msgid "M_erge From Right Then Left"
msgstr "" msgstr ""
#: src/diffuse/main.py:892 #: src/diffuse/main.py:895
msgid "_Help" msgid "_Help"
msgstr "" msgstr ""
#: src/diffuse/main.py:893 #: src/diffuse/main.py:896
msgid "_Help Contents..." msgid "_Help Contents..."
msgstr "" msgstr ""
#: src/diffuse/main.py:895 #: src/diffuse/main.py:898
#, python-format #, python-format
msgid "_About %s..." msgid "_About %s..."
msgstr "" msgstr ""
#: src/diffuse/main.py:910 #: src/diffuse/main.py:913
msgid "New 2-Way File Merge" msgid "New 2-Way File Merge"
msgstr "" msgstr ""
#: src/diffuse/main.py:911 #: src/diffuse/main.py:914
msgid "New 3-Way File Merge" msgid "New 3-Way File Merge"
msgstr "" msgstr ""
#: src/diffuse/main.py:913 #: src/diffuse/main.py:916
msgid "Realign All" msgid "Realign All"
msgstr "" msgstr ""
#: src/diffuse/main.py:914 #: src/diffuse/main.py:917
msgid "First Difference" msgid "First Difference"
msgstr "" msgstr ""
#: src/diffuse/main.py:915 #: src/diffuse/main.py:918
msgid "Previous Difference" msgid "Previous Difference"
msgstr "" msgstr ""
#: src/diffuse/main.py:916 #: src/diffuse/main.py:919
msgid "Next Difference" msgid "Next Difference"
msgstr "" msgstr ""
#: src/diffuse/main.py:917 #: src/diffuse/main.py:920
msgid "Last Difference" msgid "Last Difference"
msgstr "" msgstr ""
#: src/diffuse/main.py:919 #: src/diffuse/main.py:922
msgid "Copy Selection Right" msgid "Copy Selection Right"
msgstr "" msgstr ""
#: src/diffuse/main.py:920 #: src/diffuse/main.py:923
msgid "Copy Selection Left" msgid "Copy Selection Left"
msgstr "" msgstr ""
#: src/diffuse/main.py:921 #: src/diffuse/main.py:924
msgid "Copy Left Into Selection" msgid "Copy Left Into Selection"
msgstr "" msgstr ""
#: src/diffuse/main.py:922 #: src/diffuse/main.py:925
msgid "Copy Right Into Selection" msgid "Copy Right Into Selection"
msgstr "" msgstr ""
#: src/diffuse/main.py:923 #: src/diffuse/main.py:926
msgid "Merge From Left Then Right" msgid "Merge From Left Then Right"
msgstr "" msgstr ""
#: src/diffuse/main.py:924 #: src/diffuse/main.py:927
msgid "Merge From Right Then Left" msgid "Merge From Right Then Left"
msgstr "" msgstr ""
#: src/diffuse/main.py:926 #: src/diffuse/main.py:929
msgid "Undo" msgid "Undo"
msgstr "" msgstr ""
#: src/diffuse/main.py:927 #: src/diffuse/main.py:930
msgid "Redo" msgid "Redo"
msgstr "" msgstr ""
#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 #: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
msgid "Cut" msgid "Cut"
msgstr "" msgstr ""
#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 #: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
msgid "Copy" msgid "Copy"
msgstr "" msgstr ""
#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 #: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
msgid "Paste" msgid "Paste"
msgstr "" msgstr ""
#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 #: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
msgid "Clear Edits" msgid "Clear Edits"
msgstr "" msgstr ""
#: src/diffuse/main.py:1054 #: src/diffuse/main.py:1057
msgid "Some files have unsaved changes. Select the files to save before closing." msgid "Some files have unsaved changes. Select the files to save before closing."
msgstr "" msgstr ""
#: src/diffuse/main.py:1068 #: src/diffuse/main.py:1071
msgid "Tab" msgid "Tab"
msgstr "" msgstr ""
#: src/diffuse/main.py:1073 #: src/diffuse/main.py:1076
msgid "Pane" msgid "Pane"
msgstr "" msgstr ""
#: src/diffuse/main.py:1084 #: src/diffuse/main.py:1087
msgid "Close _Without Saving" msgid "Close _Without Saving"
msgstr "" msgstr ""
#: src/diffuse/main.py:1123 #: src/diffuse/main.py:1126
#, python-format #, python-format
msgid "Closing this tab will quit %s." msgid "Closing this tab will quit %s."
msgstr "" msgstr ""
#: src/diffuse/main.py:1206 #: src/diffuse/main.py:1209
#, python-format #, python-format
msgid "File Merge %d" msgid "File Merge %d"
msgstr "" msgstr ""
#: src/diffuse/main.py:1312 #: src/diffuse/main.py:1315
#, python-format #, python-format
msgid "Error retrieving commits for %s." msgid "Error retrieving commits for %s."
msgstr "" msgstr ""
#: src/diffuse/main.py:1344 #: src/diffuse/main.py:1347
#, python-format #, python-format
msgid "Error retrieving modifications for %s." msgid "Error retrieving modifications for %s."
msgstr "" msgstr ""
#: src/diffuse/main.py:1377 #: src/diffuse/main.py:1380
msgid "Open File In New Tab" msgid "Open File In New Tab"
msgstr "" msgstr ""
#: src/diffuse/main.py:1400 #: src/diffuse/main.py:1403
msgid "Choose Folder With Modified Files" msgid "Choose Folder With Modified Files"
msgstr "" msgstr ""
#: src/diffuse/main.py:1418 #: src/diffuse/main.py:1421
msgid "No modified files found." msgid "No modified files found."
msgstr "" msgstr ""
#: src/diffuse/main.py:1424 #: src/diffuse/main.py:1427
msgid "Choose Folder With Commit" msgid "Choose Folder With Commit"
msgstr "" msgstr ""
#: src/diffuse/main.py:1444 #: src/diffuse/main.py:1447
msgid "No committed files found." msgid "No committed files found."
msgstr "" msgstr ""
#: src/diffuse/main.py:1480 #: src/diffuse/main.py:1483
msgid "New N-Way File Merge..." msgid "New N-Way File Merge..."
msgstr "" msgstr ""
#: src/diffuse/main.py:1481 #: src/diffuse/main.py:1484
msgid "Number of panes: " msgid "Number of panes: "
msgstr "" msgstr ""
#: src/diffuse/main.py:1555 #: src/diffuse/main.py:1558
msgid "Phrase not found. Continue from the end of the file?" msgid "Phrase not found. Continue from the end of the file?"
msgstr "" msgstr ""
#: src/diffuse/main.py:1557 #: src/diffuse/main.py:1560
msgid "Phrase not found. Continue from the start of the file?" msgid "Phrase not found. Continue from the start of the file?"
msgstr "" msgstr ""
#: src/diffuse/main.py:1778 #: src/diffuse/main.py:1781
msgid "" msgid ""
"Usage:\n" "Usage:\n"
" diffuse [OPTION...] [FILE...]\n" " diffuse [OPTION...] [FILE...]\n"
@ -625,16 +630,16 @@ msgid ""
" ( -w | --ignore-all-space ) Ignore white space differences" " ( -w | --ignore-all-space ) Ignore white space differences"
msgstr "" msgstr ""
#: src/diffuse/main.py:1945 #: src/diffuse/main.py:1948
msgid "Error parsing line number." msgid "Error parsing line number."
msgstr "" msgstr ""
#: src/diffuse/main.py:1955 #: src/diffuse/main.py:1958
#, python-format #, python-format
msgid "Skipping unknown argument \"%s\"." msgid "Skipping unknown argument \"%s\"."
msgstr "" msgstr ""
#: src/diffuse/main.py:1963 #: src/diffuse/main.py:1966
#, python-format #, python-format
msgid "Error processing argument \"%s\". Directory not expected." msgid "Error processing argument \"%s\". Directory not expected."
msgstr "" msgstr ""

251
po/es.po
View File

@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: diffuse-svn\n" "Project-Id-Version: diffuse-svn\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-23 19:48-0400\n" "POT-Creation-Date: 2022-10-23 20:00-0400\n"
"PO-Revision-Date: 2022-06-13 23:21+0200\n" "PO-Revision-Date: 2022-06-13 23:21+0200\n"
"Last-Translator: Óscar Fernández Díaz <oscfdezdz@tuta.io>\n" "Last-Translator: Óscar Fernández Díaz <oscfdezdz@tuta.io>\n"
"Language-Team: \n" "Language-Team: \n"
@ -103,40 +103,45 @@ msgstr "Guardar archivo"
msgid "Save File As..." msgid "Save File As..."
msgstr "Guardar archivo como..." msgstr "Guardar archivo como..."
#: src/diffuse/main.py:288 #: src/diffuse/main.py:217
#, python-format
msgid "Column %d"
msgstr ""
#: src/diffuse/main.py:291
msgid "Save changes before loading the new file?" msgid "Save changes before loading the new file?"
msgstr "¿Guardar cambios antes de abrir el archivo nuevo?" msgstr "¿Guardar cambios antes de abrir el archivo nuevo?"
#: src/diffuse/main.py:399 #: src/diffuse/main.py:402
#, python-format #, python-format
msgid "Error reading revision %(rev)s of %(file)s." msgid "Error reading revision %(rev)s of %(file)s."
msgstr "Error leyendo revisión %(rev)s de %(file)s." msgstr "Error leyendo revisión %(rev)s de %(file)s."
#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #: src/diffuse/main.py:405 src/diffuse/main.py:1860
#, python-format #, python-format
msgid "Error reading %s." msgid "Error reading %s."
msgstr "Error leyendo %s." msgstr "Error leyendo %s."
#: src/diffuse/main.py:424 #: src/diffuse/main.py:427
msgid "Open File" msgid "Open File"
msgstr "Abrir archivo" msgstr "Abrir archivo"
#: src/diffuse/main.py:481 #: src/diffuse/main.py:484
#, python-format #, python-format
msgid "The file %s changed on disk. Do you want to reload the file?" msgid "The file %s changed on disk. Do you want to reload the file?"
msgstr "El archivo %s ha cambiado en disco. ¿Quiere recargarlo?" msgstr "El archivo %s ha cambiado en disco. ¿Quiere recargarlo?"
#: src/diffuse/main.py:507 #: src/diffuse/main.py:510
#, python-format #, python-format
msgid "Save %(title)s Pane %(pane)d" msgid "Save %(title)s Pane %(pane)d"
msgstr "Guardar Panel %(title)s %(pane)d" msgstr "Guardar Panel %(title)s %(pane)d"
#: src/diffuse/main.py:539 #: src/diffuse/main.py:542
#, python-format #, python-format
msgid "A file named %s already exists. Do you want to overwrite it?" msgid "A file named %s already exists. Do you want to overwrite it?"
msgstr "Ya existe un archivo llamado %s. ¿Quiere reemplazarlo?" msgstr "Ya existe un archivo llamado %s. ¿Quiere reemplazarlo?"
#: src/diffuse/main.py:546 #: src/diffuse/main.py:549
#, python-format #, python-format
msgid "" msgid ""
"The file %s has been modified by another process since reading it. If you save, " "The file %s has been modified by another process since reading it. If you save, "
@ -146,25 +151,25 @@ msgstr ""
"guarda, todos los cambios realizados por procesos externos se perderán. ¿Desea " "guarda, todos los cambios realizados por procesos externos se perderán. ¿Desea "
"guardar de todos modos?" "guardar de todos modos?"
#: src/diffuse/main.py:588 #: src/diffuse/main.py:591
#, python-format #, python-format
msgid "Error encoding to %s." msgid "Error encoding to %s."
msgstr "Error codificando a %s." msgstr "Error codificando a %s."
#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #: src/diffuse/main.py:595 src/diffuse/preferences.py:300
#, python-format #, python-format
msgid "Error writing %s." msgid "Error writing %s."
msgstr "Error guardando %s." msgstr "Error guardando %s."
#: src/diffuse/main.py:622 #: src/diffuse/main.py:625
msgid "Go To Line..." msgid "Go To Line..."
msgstr "Ir a línea..." msgstr "Ir a línea..."
#: src/diffuse/main.py:623 #: src/diffuse/main.py:626
msgid "Line Number: " msgid "Line Number: "
msgstr "Número de línea: " msgstr "Número de línea: "
#: src/diffuse/main.py:654 #: src/diffuse/main.py:657
msgid "" msgid ""
"Press the enter key or double click to edit. Press the space bar or use the RMB " "Press the enter key or double click to edit. Press the space bar or use the RMB "
"menu to manually align." "menu to manually align."
@ -172,436 +177,436 @@ msgstr ""
"Pulse Enter o haga doble clic para editar. Pulse el espaciador o use el menú RMB " "Pulse Enter o haga doble clic para editar. Pulse el espaciador o use el menú RMB "
"para alinear manualmente." "para alinear manualmente."
#: src/diffuse/main.py:658 #: src/diffuse/main.py:661
msgid "Press the escape key to finish editing." msgid "Press the escape key to finish editing."
msgstr "Pulse Escape para finalizar la edición." msgstr "Pulse Escape para finalizar la edición."
#: src/diffuse/main.py:661 #: src/diffuse/main.py:664
msgid "" msgid ""
"Select target line and press the space bar to align. Press the escape key to " "Select target line and press the space bar to align. Press the escape key to "
"cancel." "cancel."
msgstr "" msgstr ""
"Selecciona la línea y pulsa espacio para alinear. Pulsa Escape para cancelar." "Selecciona la línea y pulsa espacio para alinear. Pulsa Escape para cancelar."
#: src/diffuse/main.py:784 #: src/diffuse/main.py:787
msgid "_File" msgid "_File"
msgstr "_Archivo" msgstr "_Archivo"
#: src/diffuse/main.py:785 #: src/diffuse/main.py:788
msgid "_Open File..." msgid "_Open File..."
msgstr "_Abrir archivo..." msgstr "_Abrir archivo..."
#: src/diffuse/main.py:786 #: src/diffuse/main.py:789
msgid "Open File In New _Tab..." msgid "Open File In New _Tab..."
msgstr "Abrir archivo en nueva _pestaña..." msgstr "Abrir archivo en nueva _pestaña..."
#: src/diffuse/main.py:787 #: src/diffuse/main.py:790
msgid "Open _Modified Files..." msgid "Open _Modified Files..."
msgstr "Abrir archivos _modificados..." msgstr "Abrir archivos _modificados..."
#: src/diffuse/main.py:788 #: src/diffuse/main.py:791
msgid "Open Commi_t..." msgid "Open Commi_t..."
msgstr "Abrir revi_sión..." msgstr "Abrir revi_sión..."
#: src/diffuse/main.py:789 #: src/diffuse/main.py:792
msgid "_Reload File" msgid "_Reload File"
msgstr "_Recargar archivo" msgstr "_Recargar archivo"
#: src/diffuse/main.py:791 #: src/diffuse/main.py:794
msgid "_Save File" msgid "_Save File"
msgstr "_Guardar archivo" msgstr "_Guardar archivo"
#: src/diffuse/main.py:792 #: src/diffuse/main.py:795
msgid "Save File _As..." msgid "Save File _As..."
msgstr "Guardar _archivo como..." msgstr "Guardar _archivo como..."
#: src/diffuse/main.py:793 #: src/diffuse/main.py:796
msgid "Save A_ll" msgid "Save A_ll"
msgstr "Gu_ardar todo" msgstr "Gu_ardar todo"
#: src/diffuse/main.py:795 #: src/diffuse/main.py:798
msgid "New _2-Way File Merge" msgid "New _2-Way File Merge"
msgstr "Nueva mezcla de archivos de _2 vías" msgstr "Nueva mezcla de archivos de _2 vías"
#: src/diffuse/main.py:796 #: src/diffuse/main.py:799
msgid "New _3-Way File Merge" msgid "New _3-Way File Merge"
msgstr "Nueva mezcla de archivos de _3 vías" msgstr "Nueva mezcla de archivos de _3 vías"
#: src/diffuse/main.py:797 #: src/diffuse/main.py:800
msgid "New _N-Way File Merge..." msgid "New _N-Way File Merge..."
msgstr "Nueva mezcla de archivos de _N vías..." msgstr "Nueva mezcla de archivos de _N vías..."
#: src/diffuse/main.py:799 #: src/diffuse/main.py:802
msgid "_Close Tab" msgid "_Close Tab"
msgstr "_Cerrar pestaña" msgstr "_Cerrar pestaña"
#: src/diffuse/main.py:800 #: src/diffuse/main.py:803
msgid "_Undo Close Tab" msgid "_Undo Close Tab"
msgstr "_Deshacer cerrar pestaña" msgstr "_Deshacer cerrar pestaña"
#: src/diffuse/main.py:801 #: src/diffuse/main.py:804
msgid "_Quit" msgid "_Quit"
msgstr "_Salir" msgstr "_Salir"
#: src/diffuse/main.py:804 #: src/diffuse/main.py:807
msgid "_Edit" msgid "_Edit"
msgstr "_Editar" msgstr "_Editar"
#: src/diffuse/main.py:805 #: src/diffuse/main.py:808
msgid "_Undo" msgid "_Undo"
msgstr "_Deshacer" msgstr "_Deshacer"
#: src/diffuse/main.py:806 #: src/diffuse/main.py:809
msgid "_Redo" msgid "_Redo"
msgstr "_Rehacer" msgstr "_Rehacer"
#: src/diffuse/main.py:808 #: src/diffuse/main.py:811
msgid "Cu_t" msgid "Cu_t"
msgstr "Cor_tar" msgstr "Cor_tar"
#: src/diffuse/main.py:809 #: src/diffuse/main.py:812
msgid "_Copy" msgid "_Copy"
msgstr "_Copiar" msgstr "_Copiar"
#: src/diffuse/main.py:810 #: src/diffuse/main.py:813
msgid "_Paste" msgid "_Paste"
msgstr "_Pegar" msgstr "_Pegar"
#: src/diffuse/main.py:812 #: src/diffuse/main.py:815
msgid "Select _All" msgid "Select _All"
msgstr "Seleccion_ar todo" msgstr "Seleccion_ar todo"
#: src/diffuse/main.py:813 #: src/diffuse/main.py:816
msgid "C_lear Edits" msgid "C_lear Edits"
msgstr "_Deshacer todo" msgstr "_Deshacer todo"
#: src/diffuse/main.py:814 #: src/diffuse/main.py:817
msgid "_Dismiss All Edits" msgid "_Dismiss All Edits"
msgstr "_Ignorar todas las ediciones" msgstr "_Ignorar todas las ediciones"
#: src/diffuse/main.py:816 #: src/diffuse/main.py:819
msgid "_Find..." msgid "_Find..."
msgstr "_Buscar..." msgstr "_Buscar..."
#: src/diffuse/main.py:817 #: src/diffuse/main.py:820
msgid "Find _Next" msgid "Find _Next"
msgstr "Buscar siguie_nte" msgstr "Buscar siguie_nte"
#: src/diffuse/main.py:818 #: src/diffuse/main.py:821
msgid "Find Pre_vious" msgid "Find Pre_vious"
msgstr "Buscar an_terior" msgstr "Buscar an_terior"
#: src/diffuse/main.py:819 #: src/diffuse/main.py:822
msgid "_Go To Line..." msgid "_Go To Line..."
msgstr "_Ir a la línea..." msgstr "_Ir a la línea..."
#: src/diffuse/main.py:821 #: src/diffuse/main.py:824
msgid "Pr_eferences..." msgid "Pr_eferences..."
msgstr "Pr_eferencias..." msgstr "Pr_eferencias..."
#: src/diffuse/main.py:825 #: src/diffuse/main.py:828
msgid "None" msgid "None"
msgstr "Ninguno" msgstr "Ninguno"
#: src/diffuse/main.py:843 #: src/diffuse/main.py:846
msgid "_View" msgid "_View"
msgstr "_Ver" msgstr "_Ver"
#: src/diffuse/main.py:844 #: src/diffuse/main.py:847
msgid "_Syntax Highlighting" msgid "_Syntax Highlighting"
msgstr "Coloreado _sintáctico" msgstr "Coloreado _sintáctico"
#: src/diffuse/main.py:846 #: src/diffuse/main.py:849
msgid "Re_align All" msgid "Re_align All"
msgstr "Re_alinear todo" msgstr "Re_alinear todo"
#: src/diffuse/main.py:847 #: src/diffuse/main.py:850
msgid "_Isolate" msgid "_Isolate"
msgstr "A_islar" msgstr "A_islar"
#: src/diffuse/main.py:849 #: src/diffuse/main.py:852
msgid "_First Difference" msgid "_First Difference"
msgstr "Primera di_ferencia" msgstr "Primera di_ferencia"
#: src/diffuse/main.py:850 #: src/diffuse/main.py:853
msgid "_Previous Difference" msgid "_Previous Difference"
msgstr "Diferencia an_terior" msgstr "Diferencia an_terior"
#: src/diffuse/main.py:851 #: src/diffuse/main.py:854
msgid "_Next Difference" msgid "_Next Difference"
msgstr "Diferencia siguie_nte" msgstr "Diferencia siguie_nte"
#: src/diffuse/main.py:852 #: src/diffuse/main.py:855
msgid "_Last Difference" msgid "_Last Difference"
msgstr "Ú_ltima diferencia" msgstr "Ú_ltima diferencia"
#: src/diffuse/main.py:854 #: src/diffuse/main.py:857
msgid "Fir_st Tab" msgid "Fir_st Tab"
msgstr "Prime_ra pestaña" msgstr "Prime_ra pestaña"
#: src/diffuse/main.py:855 #: src/diffuse/main.py:858
msgid "Pre_vious Tab" msgid "Pre_vious Tab"
msgstr "Pestaña ante_rior" msgstr "Pestaña ante_rior"
#: src/diffuse/main.py:856 #: src/diffuse/main.py:859
msgid "Next _Tab" msgid "Next _Tab"
msgstr "Siguiente _pestaña" msgstr "Siguiente _pestaña"
#: src/diffuse/main.py:857 #: src/diffuse/main.py:860
msgid "Las_t Tab" msgid "Las_t Tab"
msgstr "Ul_tima pestaña" msgstr "Ul_tima pestaña"
#: src/diffuse/main.py:859 #: src/diffuse/main.py:862
msgid "Shift Pane _Right" msgid "Shift Pane _Right"
msgstr "Cambiar panel _derecho" msgstr "Cambiar panel _derecho"
#: src/diffuse/main.py:860 #: src/diffuse/main.py:863
msgid "Shift Pane _Left" msgid "Shift Pane _Left"
msgstr "Cambiar panel _izquierdo" msgstr "Cambiar panel _izquierdo"
#: src/diffuse/main.py:863 #: src/diffuse/main.py:866
msgid "F_ormat" msgid "F_ormat"
msgstr "F_ormato" msgstr "F_ormato"
#: src/diffuse/main.py:864 #: src/diffuse/main.py:867
msgid "Convert To _Upper Case" msgid "Convert To _Upper Case"
msgstr "Transformar en letras mayúsculas" msgstr "Transformar en letras mayúsculas"
#: src/diffuse/main.py:865 #: src/diffuse/main.py:868
msgid "Convert To _Lower Case" msgid "Convert To _Lower Case"
msgstr "Transformar en letras minúsculas" msgstr "Transformar en letras minúsculas"
#: src/diffuse/main.py:867 #: src/diffuse/main.py:870
msgid "Sort Lines In _Ascending Order" msgid "Sort Lines In _Ascending Order"
msgstr "Ordenar lineas en orden _ascendente" msgstr "Ordenar lineas en orden _ascendente"
#: src/diffuse/main.py:868 #: src/diffuse/main.py:871
msgid "Sort Lines In D_escending Order" msgid "Sort Lines In D_escending Order"
msgstr "Ordenar lineas en orden _descendente" msgstr "Ordenar lineas en orden _descendente"
#: src/diffuse/main.py:870 #: src/diffuse/main.py:873
msgid "Remove Trailing _White Space" msgid "Remove Trailing _White Space"
msgstr "Quitar _espacios finales" msgstr "Quitar _espacios finales"
#: src/diffuse/main.py:871 #: src/diffuse/main.py:874
msgid "Convert Tabs To _Spaces" msgid "Convert Tabs To _Spaces"
msgstr "Transformar tabuladores en e_spacios" msgstr "Transformar tabuladores en e_spacios"
#: src/diffuse/main.py:872 #: src/diffuse/main.py:875
msgid "Convert Leading Spaces To _Tabs" msgid "Convert Leading Spaces To _Tabs"
msgstr "Transformar espacios iniciales en _tabuladores" msgstr "Transformar espacios iniciales en _tabuladores"
#: src/diffuse/main.py:874 #: src/diffuse/main.py:877
msgid "_Increase Indenting" msgid "_Increase Indenting"
msgstr "Aumentar sangr_ía" msgstr "Aumentar sangr_ía"
#: src/diffuse/main.py:875 #: src/diffuse/main.py:878
msgid "De_crease Indenting" msgid "De_crease Indenting"
msgstr "Dis_minuir sangría" msgstr "Dis_minuir sangría"
#: src/diffuse/main.py:877 #: src/diffuse/main.py:880
msgid "Convert To _DOS Format" msgid "Convert To _DOS Format"
msgstr "Transformar a formato _DOS" msgstr "Transformar a formato _DOS"
#: src/diffuse/main.py:878 #: src/diffuse/main.py:881
msgid "Convert To _Mac Format" msgid "Convert To _Mac Format"
msgstr "Transformar a formato _Mac" msgstr "Transformar a formato _Mac"
#: src/diffuse/main.py:879 #: src/diffuse/main.py:882
msgid "Convert To Uni_x Format" msgid "Convert To Uni_x Format"
msgstr "Transformar a formato Uni_x" msgstr "Transformar a formato Uni_x"
#: src/diffuse/main.py:882 #: src/diffuse/main.py:885
msgid "_Merge" msgid "_Merge"
msgstr "_Mezcla" msgstr "_Mezcla"
#: src/diffuse/main.py:883 #: src/diffuse/main.py:886
msgid "Copy Selection _Right" msgid "Copy Selection _Right"
msgstr "Copiar selección a la de_recha" msgstr "Copiar selección a la de_recha"
#: src/diffuse/main.py:884 #: src/diffuse/main.py:887
msgid "Copy Selection _Left" msgid "Copy Selection _Left"
msgstr "Copiar selección a la i_zquierda" msgstr "Copiar selección a la i_zquierda"
#: src/diffuse/main.py:886 #: src/diffuse/main.py:889
msgid "Copy Left _Into Selection" msgid "Copy Left _Into Selection"
msgstr "Copiar de _izquierda a la selección" msgstr "Copiar de _izquierda a la selección"
#: src/diffuse/main.py:887 #: src/diffuse/main.py:890
msgid "Copy Right I_nto Selection" msgid "Copy Right I_nto Selection"
msgstr "Copiar de de_recha a la selección" msgstr "Copiar de de_recha a la selección"
#: src/diffuse/main.py:888 #: src/diffuse/main.py:891
msgid "_Merge From Left Then Right" msgid "_Merge From Left Then Right"
msgstr "_Mezclar desde izquierda, después desde derecha" msgstr "_Mezclar desde izquierda, después desde derecha"
#: src/diffuse/main.py:889 #: src/diffuse/main.py:892
msgid "M_erge From Right Then Left" msgid "M_erge From Right Then Left"
msgstr "M_ezclar desde derecha, después desde izquierda" msgstr "M_ezclar desde derecha, después desde izquierda"
#: src/diffuse/main.py:892 #: src/diffuse/main.py:895
msgid "_Help" msgid "_Help"
msgstr "_Ayuda" msgstr "_Ayuda"
#: src/diffuse/main.py:893 #: src/diffuse/main.py:896
msgid "_Help Contents..." msgid "_Help Contents..."
msgstr "Índ_ice de ayuda..." msgstr "Índ_ice de ayuda..."
#: src/diffuse/main.py:895 #: src/diffuse/main.py:898
#, python-format #, python-format
msgid "_About %s..." msgid "_About %s..."
msgstr "_Acerca de %s..." msgstr "_Acerca de %s..."
#: src/diffuse/main.py:910 #: src/diffuse/main.py:913
msgid "New 2-Way File Merge" msgid "New 2-Way File Merge"
msgstr "Nueva mezcla de archivos de 2 vías" msgstr "Nueva mezcla de archivos de 2 vías"
#: src/diffuse/main.py:911 #: src/diffuse/main.py:914
msgid "New 3-Way File Merge" msgid "New 3-Way File Merge"
msgstr "Nueva mezcla de archivos de 3 vías" msgstr "Nueva mezcla de archivos de 3 vías"
#: src/diffuse/main.py:913 #: src/diffuse/main.py:916
msgid "Realign All" msgid "Realign All"
msgstr "Realinear todo" msgstr "Realinear todo"
#: src/diffuse/main.py:914 #: src/diffuse/main.py:917
msgid "First Difference" msgid "First Difference"
msgstr "Primera diferencía" msgstr "Primera diferencía"
#: src/diffuse/main.py:915 #: src/diffuse/main.py:918
msgid "Previous Difference" msgid "Previous Difference"
msgstr "Diferencía anterior" msgstr "Diferencía anterior"
#: src/diffuse/main.py:916 #: src/diffuse/main.py:919
msgid "Next Difference" msgid "Next Difference"
msgstr "Siguiente diferencia" msgstr "Siguiente diferencia"
#: src/diffuse/main.py:917 #: src/diffuse/main.py:920
msgid "Last Difference" msgid "Last Difference"
msgstr "Última diferencía" msgstr "Última diferencía"
#: src/diffuse/main.py:919 #: src/diffuse/main.py:922
msgid "Copy Selection Right" msgid "Copy Selection Right"
msgstr "Copiar selección a la derecha" msgstr "Copiar selección a la derecha"
#: src/diffuse/main.py:920 #: src/diffuse/main.py:923
msgid "Copy Selection Left" msgid "Copy Selection Left"
msgstr "Copiar selección a la izquierda" msgstr "Copiar selección a la izquierda"
#: src/diffuse/main.py:921 #: src/diffuse/main.py:924
msgid "Copy Left Into Selection" msgid "Copy Left Into Selection"
msgstr "Copiar de izquierda a la selección" msgstr "Copiar de izquierda a la selección"
#: src/diffuse/main.py:922 #: src/diffuse/main.py:925
msgid "Copy Right Into Selection" msgid "Copy Right Into Selection"
msgstr "Copiar de derecha a la selección" msgstr "Copiar de derecha a la selección"
#: src/diffuse/main.py:923 #: src/diffuse/main.py:926
msgid "Merge From Left Then Right" msgid "Merge From Left Then Right"
msgstr "Mezclar desde izquierda, después desde derecha" msgstr "Mezclar desde izquierda, después desde derecha"
#: src/diffuse/main.py:924 #: src/diffuse/main.py:927
msgid "Merge From Right Then Left" msgid "Merge From Right Then Left"
msgstr "Mezclar desde derecha, después desde izquierda" msgstr "Mezclar desde derecha, después desde izquierda"
#: src/diffuse/main.py:926 #: src/diffuse/main.py:929
msgid "Undo" msgid "Undo"
msgstr "Deshacer" msgstr "Deshacer"
#: src/diffuse/main.py:927 #: src/diffuse/main.py:930
msgid "Redo" msgid "Redo"
msgstr "Rehacer" msgstr "Rehacer"
#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 #: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
msgid "Cut" msgid "Cut"
msgstr "Cortar" msgstr "Cortar"
#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 #: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
msgid "Copy" msgid "Copy"
msgstr "Copiar" msgstr "Copiar"
#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 #: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
msgid "Paste" msgid "Paste"
msgstr "Pegar" msgstr "Pegar"
#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 #: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
msgid "Clear Edits" msgid "Clear Edits"
msgstr "Deshacer todo" msgstr "Deshacer todo"
#: src/diffuse/main.py:1054 #: src/diffuse/main.py:1057
msgid "Some files have unsaved changes. Select the files to save before closing." msgid "Some files have unsaved changes. Select the files to save before closing."
msgstr "" msgstr ""
"Algunos archivos tienen cambios. Elija los archivos a guardar antes de cerrar." "Algunos archivos tienen cambios. Elija los archivos a guardar antes de cerrar."
#: src/diffuse/main.py:1068 #: src/diffuse/main.py:1071
msgid "Tab" msgid "Tab"
msgstr "Pestaña" msgstr "Pestaña"
#: src/diffuse/main.py:1073 #: src/diffuse/main.py:1076
msgid "Pane" msgid "Pane"
msgstr "Panel" msgstr "Panel"
#: src/diffuse/main.py:1084 #: src/diffuse/main.py:1087
msgid "Close _Without Saving" msgid "Close _Without Saving"
msgstr "Cerrar _sin guardar" msgstr "Cerrar _sin guardar"
#: src/diffuse/main.py:1123 #: src/diffuse/main.py:1126
#, python-format #, python-format
msgid "Closing this tab will quit %s." msgid "Closing this tab will quit %s."
msgstr "Cerrar esta pestaña terminará %s." msgstr "Cerrar esta pestaña terminará %s."
#: src/diffuse/main.py:1206 #: src/diffuse/main.py:1209
#, python-format #, python-format
msgid "File Merge %d" msgid "File Merge %d"
msgstr "Mezcla de archivo %d" msgstr "Mezcla de archivo %d"
#: src/diffuse/main.py:1312 #: src/diffuse/main.py:1315
#, python-format #, python-format
msgid "Error retrieving commits for %s." msgid "Error retrieving commits for %s."
msgstr "Error recibiendo commits de %s." msgstr "Error recibiendo commits de %s."
#: src/diffuse/main.py:1344 #: src/diffuse/main.py:1347
#, python-format #, python-format
msgid "Error retrieving modifications for %s." msgid "Error retrieving modifications for %s."
msgstr "Error recibiendo modificaciones de %s." msgstr "Error recibiendo modificaciones de %s."
#: src/diffuse/main.py:1377 #: src/diffuse/main.py:1380
msgid "Open File In New Tab" msgid "Open File In New Tab"
msgstr "Abrir archivo en una pestaña nueva" msgstr "Abrir archivo en una pestaña nueva"
#: src/diffuse/main.py:1400 #: src/diffuse/main.py:1403
msgid "Choose Folder With Modified Files" msgid "Choose Folder With Modified Files"
msgstr "Seleccionar carpeta con archivos modificados" msgstr "Seleccionar carpeta con archivos modificados"
#: src/diffuse/main.py:1418 #: src/diffuse/main.py:1421
msgid "No modified files found." msgid "No modified files found."
msgstr "No se encontraron archivos modificados." msgstr "No se encontraron archivos modificados."
#: src/diffuse/main.py:1424 #: src/diffuse/main.py:1427
msgid "Choose Folder With Commit" msgid "Choose Folder With Commit"
msgstr "Seleccionar carpeta con revisiónes" msgstr "Seleccionar carpeta con revisiónes"
#: src/diffuse/main.py:1444 #: src/diffuse/main.py:1447
msgid "No committed files found." msgid "No committed files found."
msgstr "No se encontraron archivos confirmados." msgstr "No se encontraron archivos confirmados."
#: src/diffuse/main.py:1480 #: src/diffuse/main.py:1483
msgid "New N-Way File Merge..." msgid "New N-Way File Merge..."
msgstr "Nueva mezcla de archivos de N vías..." msgstr "Nueva mezcla de archivos de N vías..."
#: src/diffuse/main.py:1481 #: src/diffuse/main.py:1484
msgid "Number of panes: " msgid "Number of panes: "
msgstr "Número de paneles: " msgstr "Número de paneles: "
#: src/diffuse/main.py:1555 #: src/diffuse/main.py:1558
msgid "Phrase not found. Continue from the end of the file?" msgid "Phrase not found. Continue from the end of the file?"
msgstr "Frase no encontrada. ¿Continuar desde final del archivo?" msgstr "Frase no encontrada. ¿Continuar desde final del archivo?"
#: src/diffuse/main.py:1557 #: src/diffuse/main.py:1560
msgid "Phrase not found. Continue from the start of the file?" msgid "Phrase not found. Continue from the start of the file?"
msgstr "Frase no encontrada. ¿Continuar desde principio del archivo?" msgstr "Frase no encontrada. ¿Continuar desde principio del archivo?"
#: src/diffuse/main.py:1778 #: src/diffuse/main.py:1781
msgid "" msgid ""
"Usage:\n" "Usage:\n"
" diffuse [OPTION...] [FILE...]\n" " diffuse [OPTION...] [FILE...]\n"
@ -684,16 +689,16 @@ msgstr ""
" ( -i | --ignore-case ) Ignorar cambios de capitalización\n" " ( -i | --ignore-case ) Ignorar cambios de capitalización\n"
" ( -w | --ignore-all-space ) Ignorar todos los cambios en espaciado" " ( -w | --ignore-all-space ) Ignorar todos los cambios en espaciado"
#: src/diffuse/main.py:1945 #: src/diffuse/main.py:1948
msgid "Error parsing line number." msgid "Error parsing line number."
msgstr "Error analizando número de líneas." msgstr "Error analizando número de líneas."
#: src/diffuse/main.py:1955 #: src/diffuse/main.py:1958
#, python-format #, python-format
msgid "Skipping unknown argument \"%s\"." msgid "Skipping unknown argument \"%s\"."
msgstr "Omitiendo argumento desconocido \"%s\"." msgstr "Omitiendo argumento desconocido \"%s\"."
#: src/diffuse/main.py:1963 #: src/diffuse/main.py:1966
#, python-format #, python-format
msgid "Error processing argument \"%s\". Directory not expected." msgid "Error processing argument \"%s\". Directory not expected."
msgstr "Error processando parámetro \"%s\". No se esperaba un directorio." msgstr "Error processando parámetro \"%s\". No se esperaba un directorio."

251
po/fr.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-23 19:48-0400\n" "POT-Creation-Date: 2022-10-23 20:00-0400\n"
"PO-Revision-Date: 2022-04-04 11:58-0400\n" "PO-Revision-Date: 2022-04-04 11:58-0400\n"
"Last-Translator: Romain Failliot <romain.failliot@foolstep.com>\n" "Last-Translator: Romain Failliot <romain.failliot@foolstep.com>\n"
"Language-Team: French\n" "Language-Team: French\n"
@ -99,40 +99,45 @@ msgstr "Enregistrer le fichier"
msgid "Save File As..." msgid "Save File As..."
msgstr "Enregistrer le fichier sous..." msgstr "Enregistrer le fichier sous..."
#: src/diffuse/main.py:288 #: src/diffuse/main.py:217
#, python-format
msgid "Column %d"
msgstr "Colonne %d"
#: src/diffuse/main.py:291
msgid "Save changes before loading the new file?" msgid "Save changes before loading the new file?"
msgstr "Sauvegarder les changements avant de charger le nouveau fichier?" msgstr "Sauvegarder les changements avant de charger le nouveau fichier?"
#: src/diffuse/main.py:399 #: src/diffuse/main.py:402
#, python-format #, python-format
msgid "Error reading revision %(rev)s of %(file)s." msgid "Error reading revision %(rev)s of %(file)s."
msgstr "Erreur durant la lecture de %(file)s à la révision %(rev)s." msgstr "Erreur durant la lecture de %(file)s à la révision %(rev)s."
#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #: src/diffuse/main.py:405 src/diffuse/main.py:1860
#, python-format #, python-format
msgid "Error reading %s." msgid "Error reading %s."
msgstr "Erreur durant la lecture de %s." msgstr "Erreur durant la lecture de %s."
#: src/diffuse/main.py:424 #: src/diffuse/main.py:427
msgid "Open File" msgid "Open File"
msgstr "Ouvrir un fichier" msgstr "Ouvrir un fichier"
#: src/diffuse/main.py:481 #: src/diffuse/main.py:484
#, python-format #, python-format
msgid "The file %s changed on disk. Do you want to reload the file?" msgid "The file %s changed on disk. Do you want to reload the file?"
msgstr "Le fichier %s a changé sur le disque. Voulez-vous recharger le fichier?" msgstr "Le fichier %s a changé sur le disque. Voulez-vous recharger le fichier?"
#: src/diffuse/main.py:507 #: src/diffuse/main.py:510
#, python-format #, python-format
msgid "Save %(title)s Pane %(pane)d" msgid "Save %(title)s Pane %(pane)d"
msgstr "Sauvegarder %(title)s Panel %(pane)d" msgstr "Sauvegarder %(title)s Panel %(pane)d"
#: src/diffuse/main.py:539 #: src/diffuse/main.py:542
#, python-format #, python-format
msgid "A file named %s already exists. Do you want to overwrite it?" msgid "A file named %s already exists. Do you want to overwrite it?"
msgstr "Un fichier nommé %s existe déjà. Voulez-vous l'écraser?" msgstr "Un fichier nommé %s existe déjà. Voulez-vous l'écraser?"
#: src/diffuse/main.py:546 #: src/diffuse/main.py:549
#, python-format #, python-format
msgid "" msgid ""
"The file %s has been modified by another process since reading it. If you save, " "The file %s has been modified by another process since reading it. If you save, "
@ -142,25 +147,25 @@ msgstr ""
"vous sauvegardez, tous les changements externes pourraient être perdus. " "vous sauvegardez, tous les changements externes pourraient être perdus. "
"Sauvegarder quand même?" "Sauvegarder quand même?"
#: src/diffuse/main.py:588 #: src/diffuse/main.py:591
#, python-format #, python-format
msgid "Error encoding to %s." msgid "Error encoding to %s."
msgstr "Erreur durant l'encodage vers %s." msgstr "Erreur durant l'encodage vers %s."
#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #: src/diffuse/main.py:595 src/diffuse/preferences.py:300
#, python-format #, python-format
msgid "Error writing %s." msgid "Error writing %s."
msgstr "Erreur à l'écriture de %s." msgstr "Erreur à l'écriture de %s."
#: src/diffuse/main.py:622 #: src/diffuse/main.py:625
msgid "Go To Line..." msgid "Go To Line..."
msgstr "Aller à la ligne..." msgstr "Aller à la ligne..."
#: src/diffuse/main.py:623 #: src/diffuse/main.py:626
msgid "Line Number: " msgid "Line Number: "
msgstr "Numéro de la ligne: " msgstr "Numéro de la ligne: "
#: src/diffuse/main.py:654 #: src/diffuse/main.py:657
msgid "" msgid ""
"Press the enter key or double click to edit. Press the space bar or use the RMB " "Press the enter key or double click to edit. Press the space bar or use the RMB "
"menu to manually align." "menu to manually align."
@ -168,11 +173,11 @@ msgstr ""
"Appuyez sur Entrée ou double-cliquer pour éditer. Appuyez sur la barre Espace ou " "Appuyez sur Entrée ou double-cliquer pour éditer. Appuyez sur la barre Espace ou "
"utiliser le menu du clic droit pour aligner manuellement." "utiliser le menu du clic droit pour aligner manuellement."
#: src/diffuse/main.py:658 #: src/diffuse/main.py:661
msgid "Press the escape key to finish editing." msgid "Press the escape key to finish editing."
msgstr "Appuyez sur Échap pour finir l'édition." msgstr "Appuyez sur Échap pour finir l'édition."
#: src/diffuse/main.py:661 #: src/diffuse/main.py:664
msgid "" msgid ""
"Select target line and press the space bar to align. Press the escape key to " "Select target line and press the space bar to align. Press the escape key to "
"cancel." "cancel."
@ -180,426 +185,426 @@ msgstr ""
"Sélectionner la ligne de destination et appuyez sur la barre Espace pour aligner. " "Sélectionner la ligne de destination et appuyez sur la barre Espace pour aligner. "
"Appuyez sur Échap pour annuler." "Appuyez sur Échap pour annuler."
#: src/diffuse/main.py:784 #: src/diffuse/main.py:787
msgid "_File" msgid "_File"
msgstr "_Fichier" msgstr "_Fichier"
#: src/diffuse/main.py:785 #: src/diffuse/main.py:788
msgid "_Open File..." msgid "_Open File..."
msgstr "_Ouvrir un fichier..." msgstr "_Ouvrir un fichier..."
#: src/diffuse/main.py:786 #: src/diffuse/main.py:789
msgid "Open File In New _Tab..." msgid "Open File In New _Tab..."
msgstr "Ouvrir un fichier dans un nouvel ongle_t..." msgstr "Ouvrir un fichier dans un nouvel ongle_t..."
#: src/diffuse/main.py:787 #: src/diffuse/main.py:790
msgid "Open _Modified Files..." msgid "Open _Modified Files..."
msgstr "Ouvrir les fichiers _modifiés..." msgstr "Ouvrir les fichiers _modifiés..."
#: src/diffuse/main.py:788 #: src/diffuse/main.py:791
msgid "Open Commi_t..." msgid "Open Commi_t..."
msgstr "Ouvrir un commi_t..." msgstr "Ouvrir un commi_t..."
#: src/diffuse/main.py:789 #: src/diffuse/main.py:792
msgid "_Reload File" msgid "_Reload File"
msgstr "Recharger le fichier" msgstr "Recharger le fichier"
#: src/diffuse/main.py:791 #: src/diffuse/main.py:794
msgid "_Save File" msgid "_Save File"
msgstr "_Enregistrer le fichier" msgstr "_Enregistrer le fichier"
#: src/diffuse/main.py:792 #: src/diffuse/main.py:795
msgid "Save File _As..." msgid "Save File _As..."
msgstr "_Enregistrer le fichier sous..." msgstr "_Enregistrer le fichier sous..."
#: src/diffuse/main.py:793 #: src/diffuse/main.py:796
msgid "Save A_ll" msgid "Save A_ll"
msgstr "_Enregistrer tous" msgstr "_Enregistrer tous"
#: src/diffuse/main.py:795 #: src/diffuse/main.py:798
msgid "New _2-Way File Merge" msgid "New _2-Way File Merge"
msgstr "Nouvelle fusion à _2 panneaux" msgstr "Nouvelle fusion à _2 panneaux"
#: src/diffuse/main.py:796 #: src/diffuse/main.py:799
msgid "New _3-Way File Merge" msgid "New _3-Way File Merge"
msgstr "Nouvelle fusion à _3 panneaux" msgstr "Nouvelle fusion à _3 panneaux"
#: src/diffuse/main.py:797 #: src/diffuse/main.py:800
msgid "New _N-Way File Merge..." msgid "New _N-Way File Merge..."
msgstr "Nouvelle fusion à _N panneaux..." msgstr "Nouvelle fusion à _N panneaux..."
#: src/diffuse/main.py:799 #: src/diffuse/main.py:802
msgid "_Close Tab" msgid "_Close Tab"
msgstr "Fermer l'onglet" msgstr "Fermer l'onglet"
#: src/diffuse/main.py:800 #: src/diffuse/main.py:803
msgid "_Undo Close Tab" msgid "_Undo Close Tab"
msgstr "Annuler la fermeture de l'onglet" msgstr "Annuler la fermeture de l'onglet"
#: src/diffuse/main.py:801 #: src/diffuse/main.py:804
msgid "_Quit" msgid "_Quit"
msgstr "_Quitter" msgstr "_Quitter"
#: src/diffuse/main.py:804 #: src/diffuse/main.py:807
msgid "_Edit" msgid "_Edit"
msgstr "_Édition" msgstr "_Édition"
#: src/diffuse/main.py:805 #: src/diffuse/main.py:808
msgid "_Undo" msgid "_Undo"
msgstr "Annuler" msgstr "Annuler"
#: src/diffuse/main.py:806 #: src/diffuse/main.py:809
msgid "_Redo" msgid "_Redo"
msgstr "Refaire" msgstr "Refaire"
#: src/diffuse/main.py:808 #: src/diffuse/main.py:811
msgid "Cu_t" msgid "Cu_t"
msgstr "Cou_per" msgstr "Cou_per"
#: src/diffuse/main.py:809 #: src/diffuse/main.py:812
msgid "_Copy" msgid "_Copy"
msgstr "_Copier" msgstr "_Copier"
#: src/diffuse/main.py:810 #: src/diffuse/main.py:813
msgid "_Paste" msgid "_Paste"
msgstr "Co_ller" msgstr "Co_ller"
#: src/diffuse/main.py:812 #: src/diffuse/main.py:815
msgid "Select _All" msgid "Select _All"
msgstr "_Tout sélectionner" msgstr "_Tout sélectionner"
#: src/diffuse/main.py:813 #: src/diffuse/main.py:816
msgid "C_lear Edits" msgid "C_lear Edits"
msgstr "Effacer les changements" msgstr "Effacer les changements"
#: src/diffuse/main.py:814 #: src/diffuse/main.py:817
msgid "_Dismiss All Edits" msgid "_Dismiss All Edits"
msgstr "Effacer tous les changements" msgstr "Effacer tous les changements"
#: src/diffuse/main.py:816 #: src/diffuse/main.py:819
msgid "_Find..." msgid "_Find..."
msgstr "_Rechercher..." msgstr "_Rechercher..."
#: src/diffuse/main.py:817 #: src/diffuse/main.py:820
msgid "Find _Next" msgid "Find _Next"
msgstr "Recherche _suivante" msgstr "Recherche _suivante"
#: src/diffuse/main.py:818 #: src/diffuse/main.py:821
msgid "Find Pre_vious" msgid "Find Pre_vious"
msgstr "Rechercher _précédente" msgstr "Rechercher _précédente"
#: src/diffuse/main.py:819 #: src/diffuse/main.py:822
msgid "_Go To Line..." msgid "_Go To Line..."
msgstr "_Aller à la ligne..." msgstr "_Aller à la ligne..."
#: src/diffuse/main.py:821 #: src/diffuse/main.py:824
msgid "Pr_eferences..." msgid "Pr_eferences..."
msgstr "_Préférences..." msgstr "_Préférences..."
#: src/diffuse/main.py:825 #: src/diffuse/main.py:828
msgid "None" msgid "None"
msgstr "Aucune" msgstr "Aucune"
#: src/diffuse/main.py:843 #: src/diffuse/main.py:846
msgid "_View" msgid "_View"
msgstr "_Vue" msgstr "_Vue"
#: src/diffuse/main.py:844 #: src/diffuse/main.py:847
msgid "_Syntax Highlighting" msgid "_Syntax Highlighting"
msgstr "Coloration _syntaxique" msgstr "Coloration _syntaxique"
#: src/diffuse/main.py:846 #: src/diffuse/main.py:849
msgid "Re_align All" msgid "Re_align All"
msgstr "Tout _réaligner" msgstr "Tout _réaligner"
#: src/diffuse/main.py:847 #: src/diffuse/main.py:850
msgid "_Isolate" msgid "_Isolate"
msgstr "_Isoler" msgstr "_Isoler"
#: src/diffuse/main.py:849 #: src/diffuse/main.py:852
msgid "_First Difference" msgid "_First Difference"
msgstr "_Première différence" msgstr "_Première différence"
#: src/diffuse/main.py:850 #: src/diffuse/main.py:853
msgid "_Previous Difference" msgid "_Previous Difference"
msgstr "Différence _précédente" msgstr "Différence _précédente"
#: src/diffuse/main.py:851 #: src/diffuse/main.py:854
msgid "_Next Difference" msgid "_Next Difference"
msgstr "Différence _suivante" msgstr "Différence _suivante"
#: src/diffuse/main.py:852 #: src/diffuse/main.py:855
msgid "_Last Difference" msgid "_Last Difference"
msgstr "_Dernière différence" msgstr "_Dernière différence"
#: src/diffuse/main.py:854 #: src/diffuse/main.py:857
msgid "Fir_st Tab" msgid "Fir_st Tab"
msgstr "_Premier onglet" msgstr "_Premier onglet"
#: src/diffuse/main.py:855 #: src/diffuse/main.py:858
msgid "Pre_vious Tab" msgid "Pre_vious Tab"
msgstr "Onglet _précédent" msgstr "Onglet _précédent"
#: src/diffuse/main.py:856 #: src/diffuse/main.py:859
msgid "Next _Tab" msgid "Next _Tab"
msgstr "Onglet _suivant" msgstr "Onglet _suivant"
#: src/diffuse/main.py:857 #: src/diffuse/main.py:860
msgid "Las_t Tab" msgid "Las_t Tab"
msgstr "_Dernier onglet" msgstr "_Dernier onglet"
#: src/diffuse/main.py:859 #: src/diffuse/main.py:862
msgid "Shift Pane _Right" msgid "Shift Pane _Right"
msgstr "Décaler le panneau à droite" msgstr "Décaler le panneau à droite"
#: src/diffuse/main.py:860 #: src/diffuse/main.py:863
msgid "Shift Pane _Left" msgid "Shift Pane _Left"
msgstr "Décaler le panneau à gauche" msgstr "Décaler le panneau à gauche"
#: src/diffuse/main.py:863 #: src/diffuse/main.py:866
msgid "F_ormat" msgid "F_ormat"
msgstr "F_ormater" msgstr "F_ormater"
#: src/diffuse/main.py:864 #: src/diffuse/main.py:867
msgid "Convert To _Upper Case" msgid "Convert To _Upper Case"
msgstr "Convertir en majuscules" msgstr "Convertir en majuscules"
#: src/diffuse/main.py:865 #: src/diffuse/main.py:868
msgid "Convert To _Lower Case" msgid "Convert To _Lower Case"
msgstr "Convertir en minuscules" msgstr "Convertir en minuscules"
#: src/diffuse/main.py:867 #: src/diffuse/main.py:870
msgid "Sort Lines In _Ascending Order" msgid "Sort Lines In _Ascending Order"
msgstr "Trier les lignes en ordre croissant" msgstr "Trier les lignes en ordre croissant"
#: src/diffuse/main.py:868 #: src/diffuse/main.py:871
msgid "Sort Lines In D_escending Order" msgid "Sort Lines In D_escending Order"
msgstr "Trier les lignes en ordre décroissant" msgstr "Trier les lignes en ordre décroissant"
#: src/diffuse/main.py:870 #: src/diffuse/main.py:873
msgid "Remove Trailing _White Space" msgid "Remove Trailing _White Space"
msgstr "Supprimer les espaces en fin de ligne" msgstr "Supprimer les espaces en fin de ligne"
#: src/diffuse/main.py:871 #: src/diffuse/main.py:874
msgid "Convert Tabs To _Spaces" msgid "Convert Tabs To _Spaces"
msgstr "Convertir les tabulations en espaces" msgstr "Convertir les tabulations en espaces"
#: src/diffuse/main.py:872 #: src/diffuse/main.py:875
msgid "Convert Leading Spaces To _Tabs" msgid "Convert Leading Spaces To _Tabs"
msgstr "Convertir les espaces de début de ligne en tabulations" msgstr "Convertir les espaces de début de ligne en tabulations"
#: src/diffuse/main.py:874 #: src/diffuse/main.py:877
msgid "_Increase Indenting" msgid "_Increase Indenting"
msgstr "Augmenter l'indentation" msgstr "Augmenter l'indentation"
#: src/diffuse/main.py:875 #: src/diffuse/main.py:878
msgid "De_crease Indenting" msgid "De_crease Indenting"
msgstr "Diminuer l'indentation" msgstr "Diminuer l'indentation"
#: src/diffuse/main.py:877 #: src/diffuse/main.py:880
msgid "Convert To _DOS Format" msgid "Convert To _DOS Format"
msgstr "Convertir au format _DOS" msgstr "Convertir au format _DOS"
#: src/diffuse/main.py:878 #: src/diffuse/main.py:881
msgid "Convert To _Mac Format" msgid "Convert To _Mac Format"
msgstr "Convertir au format _Mac" msgstr "Convertir au format _Mac"
#: src/diffuse/main.py:879 #: src/diffuse/main.py:882
msgid "Convert To Uni_x Format" msgid "Convert To Uni_x Format"
msgstr "Convertir au format Uni_x" msgstr "Convertir au format Uni_x"
#: src/diffuse/main.py:882 #: src/diffuse/main.py:885
msgid "_Merge" msgid "_Merge"
msgstr "Fusionner" msgstr "Fusionner"
#: src/diffuse/main.py:883 #: src/diffuse/main.py:886
msgid "Copy Selection _Right" msgid "Copy Selection _Right"
msgstr "Copier la sélection vers la droite" msgstr "Copier la sélection vers la droite"
#: src/diffuse/main.py:884 #: src/diffuse/main.py:887
msgid "Copy Selection _Left" msgid "Copy Selection _Left"
msgstr "Copier la sélection vers la gauche" msgstr "Copier la sélection vers la gauche"
#: src/diffuse/main.py:886 #: src/diffuse/main.py:889
msgid "Copy Left _Into Selection" msgid "Copy Left _Into Selection"
msgstr "Copier la gauche vers la sélection" msgstr "Copier la gauche vers la sélection"
#: src/diffuse/main.py:887 #: src/diffuse/main.py:890
msgid "Copy Right I_nto Selection" msgid "Copy Right I_nto Selection"
msgstr "Copier la droite vers la sélection" msgstr "Copier la droite vers la sélection"
#: src/diffuse/main.py:888 #: src/diffuse/main.py:891
msgid "_Merge From Left Then Right" msgid "_Merge From Left Then Right"
msgstr "Fusionner de la gauche puis la droite" msgstr "Fusionner de la gauche puis la droite"
#: src/diffuse/main.py:889 #: src/diffuse/main.py:892
msgid "M_erge From Right Then Left" msgid "M_erge From Right Then Left"
msgstr "Fusionner de la droite puis la gauche" msgstr "Fusionner de la droite puis la gauche"
#: src/diffuse/main.py:892 #: src/diffuse/main.py:895
msgid "_Help" msgid "_Help"
msgstr "Aide" msgstr "Aide"
#: src/diffuse/main.py:893 #: src/diffuse/main.py:896
msgid "_Help Contents..." msgid "_Help Contents..."
msgstr "Contenu de l'aide..." msgstr "Contenu de l'aide..."
#: src/diffuse/main.py:895 #: src/diffuse/main.py:898
#, python-format #, python-format
msgid "_About %s..." msgid "_About %s..."
msgstr "À propos de %s..." msgstr "À propos de %s..."
#: src/diffuse/main.py:910 #: src/diffuse/main.py:913
msgid "New 2-Way File Merge" msgid "New 2-Way File Merge"
msgstr "Nouvelle fusion à 2 panneaux" msgstr "Nouvelle fusion à 2 panneaux"
#: src/diffuse/main.py:911 #: src/diffuse/main.py:914
msgid "New 3-Way File Merge" msgid "New 3-Way File Merge"
msgstr "Nouvelle fusion à 3 panneaux" msgstr "Nouvelle fusion à 3 panneaux"
#: src/diffuse/main.py:913 #: src/diffuse/main.py:916
msgid "Realign All" msgid "Realign All"
msgstr "Tout réaligner" msgstr "Tout réaligner"
#: src/diffuse/main.py:914 #: src/diffuse/main.py:917
msgid "First Difference" msgid "First Difference"
msgstr "Première différence" msgstr "Première différence"
#: src/diffuse/main.py:915 #: src/diffuse/main.py:918
msgid "Previous Difference" msgid "Previous Difference"
msgstr "Différence précédente" msgstr "Différence précédente"
#: src/diffuse/main.py:916 #: src/diffuse/main.py:919
msgid "Next Difference" msgid "Next Difference"
msgstr "Différence suivante" msgstr "Différence suivante"
#: src/diffuse/main.py:917 #: src/diffuse/main.py:920
msgid "Last Difference" msgid "Last Difference"
msgstr "Dernière différence" msgstr "Dernière différence"
#: src/diffuse/main.py:919 #: src/diffuse/main.py:922
msgid "Copy Selection Right" msgid "Copy Selection Right"
msgstr "Copier la sélection vers la droite" msgstr "Copier la sélection vers la droite"
#: src/diffuse/main.py:920 #: src/diffuse/main.py:923
msgid "Copy Selection Left" msgid "Copy Selection Left"
msgstr "Copier la sélection vers la gauche" msgstr "Copier la sélection vers la gauche"
#: src/diffuse/main.py:921 #: src/diffuse/main.py:924
msgid "Copy Left Into Selection" msgid "Copy Left Into Selection"
msgstr "Copier la gauche vers la sélection" msgstr "Copier la gauche vers la sélection"
#: src/diffuse/main.py:922 #: src/diffuse/main.py:925
msgid "Copy Right Into Selection" msgid "Copy Right Into Selection"
msgstr "Copier la droite vers la sélection" msgstr "Copier la droite vers la sélection"
#: src/diffuse/main.py:923 #: src/diffuse/main.py:926
msgid "Merge From Left Then Right" msgid "Merge From Left Then Right"
msgstr "Fusionner de la gauche puis la droite" msgstr "Fusionner de la gauche puis la droite"
#: src/diffuse/main.py:924 #: src/diffuse/main.py:927
msgid "Merge From Right Then Left" msgid "Merge From Right Then Left"
msgstr "Fusionner de la droite puis la gauche" msgstr "Fusionner de la droite puis la gauche"
#: src/diffuse/main.py:926 #: src/diffuse/main.py:929
msgid "Undo" msgid "Undo"
msgstr "Annuler" msgstr "Annuler"
#: src/diffuse/main.py:927 #: src/diffuse/main.py:930
msgid "Redo" msgid "Redo"
msgstr "Refaire" msgstr "Refaire"
#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 #: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
msgid "Cut" msgid "Cut"
msgstr "Couper" msgstr "Couper"
#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 #: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
msgid "Copy" msgid "Copy"
msgstr "Copier" msgstr "Copier"
#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 #: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
msgid "Paste" msgid "Paste"
msgstr "Coller" msgstr "Coller"
#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 #: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
msgid "Clear Edits" msgid "Clear Edits"
msgstr "Effacer les changements" msgstr "Effacer les changements"
#: src/diffuse/main.py:1054 #: src/diffuse/main.py:1057
msgid "Some files have unsaved changes. Select the files to save before closing." msgid "Some files have unsaved changes. Select the files to save before closing."
msgstr "" msgstr ""
"Certains fichiers ne sont pas encore sauvegarder. Sélectionner les fichiers à " "Certains fichiers ne sont pas encore sauvegarder. Sélectionner les fichiers à "
"sauvegarder avant de fermer." "sauvegarder avant de fermer."
#: src/diffuse/main.py:1068 #: src/diffuse/main.py:1071
msgid "Tab" msgid "Tab"
msgstr "Onglet" msgstr "Onglet"
#: src/diffuse/main.py:1073 #: src/diffuse/main.py:1076
msgid "Pane" msgid "Pane"
msgstr "Panneau" msgstr "Panneau"
#: src/diffuse/main.py:1084 #: src/diffuse/main.py:1087
msgid "Close _Without Saving" msgid "Close _Without Saving"
msgstr "Fermer sans sauvegarder" msgstr "Fermer sans sauvegarder"
#: src/diffuse/main.py:1123 #: src/diffuse/main.py:1126
#, python-format #, python-format
msgid "Closing this tab will quit %s." msgid "Closing this tab will quit %s."
msgstr "Fermer cet onglet fermera %s." msgstr "Fermer cet onglet fermera %s."
#: src/diffuse/main.py:1206 #: src/diffuse/main.py:1209
#, python-format #, python-format
msgid "File Merge %d" msgid "File Merge %d"
msgstr "Ficher fusionné %d" msgstr "Ficher fusionné %d"
#: src/diffuse/main.py:1312 #: src/diffuse/main.py:1315
#, python-format #, python-format
msgid "Error retrieving commits for %s." msgid "Error retrieving commits for %s."
msgstr "Erreur à la récupération des commits de %s." msgstr "Erreur à la récupération des commits de %s."
#: src/diffuse/main.py:1344 #: src/diffuse/main.py:1347
#, python-format #, python-format
msgid "Error retrieving modifications for %s." msgid "Error retrieving modifications for %s."
msgstr "Erreur à la récupération des changements de %s." msgstr "Erreur à la récupération des changements de %s."
#: src/diffuse/main.py:1377 #: src/diffuse/main.py:1380
msgid "Open File In New Tab" msgid "Open File In New Tab"
msgstr "Ouvrir le fichier dans un nouvel onglet" msgstr "Ouvrir le fichier dans un nouvel onglet"
#: src/diffuse/main.py:1400 #: src/diffuse/main.py:1403
msgid "Choose Folder With Modified Files" msgid "Choose Folder With Modified Files"
msgstr "Choisir un dossier avec les fichiers modifiés" msgstr "Choisir un dossier avec les fichiers modifiés"
#: src/diffuse/main.py:1418 #: src/diffuse/main.py:1421
msgid "No modified files found." msgid "No modified files found."
msgstr "Aucun fichier modifié trouvé." msgstr "Aucun fichier modifié trouvé."
#: src/diffuse/main.py:1424 #: src/diffuse/main.py:1427
msgid "Choose Folder With Commit" msgid "Choose Folder With Commit"
msgstr "Choisir un dossier avec des commits" msgstr "Choisir un dossier avec des commits"
#: src/diffuse/main.py:1444 #: src/diffuse/main.py:1447
msgid "No committed files found." msgid "No committed files found."
msgstr "Aucun fichier commité trouvé." msgstr "Aucun fichier commité trouvé."
#: src/diffuse/main.py:1480 #: src/diffuse/main.py:1483
msgid "New N-Way File Merge..." msgid "New N-Way File Merge..."
msgstr "Nouvelle fusion à N panneaux..." msgstr "Nouvelle fusion à N panneaux..."
#: src/diffuse/main.py:1481 #: src/diffuse/main.py:1484
msgid "Number of panes: " msgid "Number of panes: "
msgstr "Nombre de panneaux: " msgstr "Nombre de panneaux: "
#: src/diffuse/main.py:1555 #: src/diffuse/main.py:1558
msgid "Phrase not found. Continue from the end of the file?" msgid "Phrase not found. Continue from the end of the file?"
msgstr "Phrase non trouvée. Continuer à partir de la fin du fichier?" msgstr "Phrase non trouvée. Continuer à partir de la fin du fichier?"
#: src/diffuse/main.py:1557 #: src/diffuse/main.py:1560
msgid "Phrase not found. Continue from the start of the file?" msgid "Phrase not found. Continue from the start of the file?"
msgstr "Phrase non trouvée. Continuer à partir du début du fichier?" msgstr "Phrase non trouvée. Continuer à partir du début du fichier?"
#: src/diffuse/main.py:1778 #: src/diffuse/main.py:1781
msgid "" msgid ""
"Usage:\n" "Usage:\n"
" diffuse [OPTION...] [FILE...]\n" " diffuse [OPTION...] [FILE...]\n"
@ -686,16 +691,16 @@ msgstr ""
" ( -w | --ignore-all-space ) Ignorer les différences avec tous types\n" " ( -w | --ignore-all-space ) Ignorer les différences avec tous types\n"
" d'espaces" " d'espaces"
#: src/diffuse/main.py:1945 #: src/diffuse/main.py:1948
msgid "Error parsing line number." msgid "Error parsing line number."
msgstr "Erreur à l'analyse du numéro de ligne." msgstr "Erreur à l'analyse du numéro de ligne."
#: src/diffuse/main.py:1955 #: src/diffuse/main.py:1958
#, python-format #, python-format
msgid "Skipping unknown argument \"%s\"." msgid "Skipping unknown argument \"%s\"."
msgstr "Passe l'argument inconnu \"%s\"." msgstr "Passe l'argument inconnu \"%s\"."
#: src/diffuse/main.py:1963 #: src/diffuse/main.py:1966
#, python-format #, python-format
msgid "Error processing argument \"%s\". Directory not expected." msgid "Error processing argument \"%s\". Directory not expected."
msgstr "Erreur au traitement de l'argument \"%s\". Dossier non attendu." msgstr "Erreur au traitement de l'argument \"%s\". Dossier non attendu."

255
po/it.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Diffuse 0.4.4\n" "Project-Id-Version: Diffuse 0.4.4\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-23 19:48-0400\n" "POT-Creation-Date: 2022-10-23 20:00-0400\n"
"PO-Revision-Date: 2022-04-04 12:18-0400\n" "PO-Revision-Date: 2022-04-04 12:18-0400\n"
"Last-Translator: Cristian Marchi <cri.penta@gmail.com>\n" "Last-Translator: Cristian Marchi <cri.penta@gmail.com>\n"
"Language-Team: Italian\n" "Language-Team: Italian\n"
@ -96,40 +96,45 @@ msgstr "Salva file"
msgid "Save File As..." msgid "Save File As..."
msgstr "Salva con nome..." msgstr "Salva con nome..."
#: src/diffuse/main.py:288 #: src/diffuse/main.py:217
#, python-format
msgid "Column %d"
msgstr "Colonna %d"
#: src/diffuse/main.py:291
msgid "Save changes before loading the new file?" msgid "Save changes before loading the new file?"
msgstr "Salvare i cambiamenti prima di caricare il nuovo file?" msgstr "Salvare i cambiamenti prima di caricare il nuovo file?"
#: src/diffuse/main.py:399 #: src/diffuse/main.py:402
#, python-format #, python-format
msgid "Error reading revision %(rev)s of %(file)s." msgid "Error reading revision %(rev)s of %(file)s."
msgstr "Errore durante la lettura della revisione \"%(rev)s\" di «%(file)s»." msgstr "Errore durante la lettura della revisione \"%(rev)s\" di «%(file)s»."
#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #: src/diffuse/main.py:405 src/diffuse/main.py:1860
#, python-format #, python-format
msgid "Error reading %s." msgid "Error reading %s."
msgstr "Errore leggendo il %s." msgstr "Errore leggendo il %s."
#: src/diffuse/main.py:424 #: src/diffuse/main.py:427
msgid "Open File" msgid "Open File"
msgstr "Apertura file" msgstr "Apertura file"
#: src/diffuse/main.py:481 #: src/diffuse/main.py:484
#, python-format #, python-format
msgid "The file %s changed on disk. Do you want to reload the file?" msgid "The file %s changed on disk. Do you want to reload the file?"
msgstr "Il file «%s» è cambiato sul disco. Ricaricarlo?" msgstr "Il file «%s» è cambiato sul disco. Ricaricarlo?"
#: src/diffuse/main.py:507 #: src/diffuse/main.py:510
#, python-format #, python-format
msgid "Save %(title)s Pane %(pane)d" msgid "Save %(title)s Pane %(pane)d"
msgstr "Salva %(title)s riquadro %(pane)d" msgstr "Salva %(title)s riquadro %(pane)d"
#: src/diffuse/main.py:539 #: src/diffuse/main.py:542
#, python-format #, python-format
msgid "A file named %s already exists. Do you want to overwrite it?" msgid "A file named %s already exists. Do you want to overwrite it?"
msgstr "Il file «%s» esiste già. Sovrascrivere?" msgstr "Il file «%s» esiste già. Sovrascrivere?"
#: src/diffuse/main.py:546 #: src/diffuse/main.py:549
#, python-format #, python-format
msgid "" msgid ""
"The file %s has been modified by another process since reading it. If you save, " "The file %s has been modified by another process since reading it. If you save, "
@ -138,25 +143,25 @@ msgstr ""
"Il file «%s» è stato modificato da un'altro processo dopo la lettura. Se si " "Il file «%s» è stato modificato da un'altro processo dopo la lettura. Se si "
"salva, tutte le modifiche esterne potrebbero essere perdute. Salvare comunque?" "salva, tutte le modifiche esterne potrebbero essere perdute. Salvare comunque?"
#: src/diffuse/main.py:588 #: src/diffuse/main.py:591
#, python-format #, python-format
msgid "Error encoding to %s." msgid "Error encoding to %s."
msgstr "Errore codificando %s." msgstr "Errore codificando %s."
#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #: src/diffuse/main.py:595 src/diffuse/preferences.py:300
#, python-format #, python-format
msgid "Error writing %s." msgid "Error writing %s."
msgstr "Errore scrivendo il %s." msgstr "Errore scrivendo il %s."
#: src/diffuse/main.py:622 #: src/diffuse/main.py:625
msgid "Go To Line..." msgid "Go To Line..."
msgstr "Vai alla linea..." msgstr "Vai alla linea..."
#: src/diffuse/main.py:623 #: src/diffuse/main.py:626
msgid "Line Number: " msgid "Line Number: "
msgstr "Numero di riga: " msgstr "Numero di riga: "
#: src/diffuse/main.py:654 #: src/diffuse/main.py:657
msgid "" msgid ""
"Press the enter key or double click to edit. Press the space bar or use the RMB " "Press the enter key or double click to edit. Press the space bar or use the RMB "
"menu to manually align." "menu to manually align."
@ -164,11 +169,11 @@ msgstr ""
"Premere il tasto \"Invio\" o fare doppio clic per modificare. Premere \"spazio\" " "Premere il tasto \"Invio\" o fare doppio clic per modificare. Premere \"spazio\" "
"o usare il tasto destro del mouse per allineare manualmente." "o usare il tasto destro del mouse per allineare manualmente."
#: src/diffuse/main.py:658 #: src/diffuse/main.py:661
msgid "Press the escape key to finish editing." msgid "Press the escape key to finish editing."
msgstr "Premere il tasto \"Esc\" per terminare le modifiche." msgstr "Premere il tasto \"Esc\" per terminare le modifiche."
#: src/diffuse/main.py:661 #: src/diffuse/main.py:664
msgid "" msgid ""
"Select target line and press the space bar to align. Press the escape key to " "Select target line and press the space bar to align. Press the escape key to "
"cancel." "cancel."
@ -176,426 +181,426 @@ msgstr ""
"Selezionare la riga di destinazione e premere spazio per allineare. Premere " "Selezionare la riga di destinazione e premere spazio per allineare. Premere "
"\"Esc\" per annullare." "\"Esc\" per annullare."
#: src/diffuse/main.py:784 #: src/diffuse/main.py:787
msgid "_File" msgid "_File"
msgstr "_File" msgstr "_File"
#: src/diffuse/main.py:785 #: src/diffuse/main.py:788
msgid "_Open File..." msgid "_Open File..."
msgstr "_Apri file..." msgstr "_Apri file..."
#: src/diffuse/main.py:786 #: src/diffuse/main.py:789
msgid "Open File In New _Tab..." msgid "Open File In New _Tab..."
msgstr "Apri file in una nuova sc_heda..." msgstr "Apri file in una nuova sc_heda..."
#: src/diffuse/main.py:787 #: src/diffuse/main.py:790
msgid "Open _Modified Files..." msgid "Open _Modified Files..."
msgstr "Apri file _modificati..." msgstr "Apri file _modificati..."
#: src/diffuse/main.py:788 #: src/diffuse/main.py:791
msgid "Open Commi_t..." msgid "Open Commi_t..."
msgstr "Apri c_ommit..." msgstr "Apri c_ommit..."
#: src/diffuse/main.py:789 #: src/diffuse/main.py:792
msgid "_Reload File" msgid "_Reload File"
msgstr "_Ricarica file" msgstr "_Ricarica file"
#: src/diffuse/main.py:791 #: src/diffuse/main.py:794
msgid "_Save File" msgid "_Save File"
msgstr "_Salva file" msgstr "_Salva file"
#: src/diffuse/main.py:792 #: src/diffuse/main.py:795
msgid "Save File _As..." msgid "Save File _As..."
msgstr "S_alva con nome..." msgstr "S_alva con nome..."
#: src/diffuse/main.py:793 #: src/diffuse/main.py:796
msgid "Save A_ll" msgid "Save A_ll"
msgstr "Salva _tutti" msgstr "Salva _tutti"
#: src/diffuse/main.py:795 #: src/diffuse/main.py:798
msgid "New _2-Way File Merge" msgid "New _2-Way File Merge"
msgstr "Nuova unione a _2 file" msgstr "Nuova unione a _2 file"
#: src/diffuse/main.py:796 #: src/diffuse/main.py:799
msgid "New _3-Way File Merge" msgid "New _3-Way File Merge"
msgstr "Nuova unione a _3 file" msgstr "Nuova unione a _3 file"
#: src/diffuse/main.py:797 #: src/diffuse/main.py:800
msgid "New _N-Way File Merge..." msgid "New _N-Way File Merge..."
msgstr "Nuova unione a _N file..." msgstr "Nuova unione a _N file..."
#: src/diffuse/main.py:799 #: src/diffuse/main.py:802
msgid "_Close Tab" msgid "_Close Tab"
msgstr "_Chiudi scheda" msgstr "_Chiudi scheda"
#: src/diffuse/main.py:800 #: src/diffuse/main.py:803
msgid "_Undo Close Tab" msgid "_Undo Close Tab"
msgstr "Annulla chi_usura scheda" msgstr "Annulla chi_usura scheda"
#: src/diffuse/main.py:801 #: src/diffuse/main.py:804
msgid "_Quit" msgid "_Quit"
msgstr "_Esci" msgstr "_Esci"
#: src/diffuse/main.py:804 #: src/diffuse/main.py:807
msgid "_Edit" msgid "_Edit"
msgstr "_Modifica" msgstr "_Modifica"
#: src/diffuse/main.py:805 #: src/diffuse/main.py:808
msgid "_Undo" msgid "_Undo"
msgstr "Ann_ulla" msgstr "Ann_ulla"
#: src/diffuse/main.py:806 #: src/diffuse/main.py:809
msgid "_Redo" msgid "_Redo"
msgstr "_Ripeti" msgstr "_Ripeti"
#: src/diffuse/main.py:808 #: src/diffuse/main.py:811
msgid "Cu_t" msgid "Cu_t"
msgstr "_Taglia" msgstr "_Taglia"
#: src/diffuse/main.py:809 #: src/diffuse/main.py:812
msgid "_Copy" msgid "_Copy"
msgstr "_Copia" msgstr "_Copia"
#: src/diffuse/main.py:810 #: src/diffuse/main.py:813
msgid "_Paste" msgid "_Paste"
msgstr "_Incolla" msgstr "_Incolla"
#: src/diffuse/main.py:812 #: src/diffuse/main.py:815
msgid "Select _All" msgid "Select _All"
msgstr "Selezion_a tutto" msgstr "Selezion_a tutto"
#: src/diffuse/main.py:813 #: src/diffuse/main.py:816
msgid "C_lear Edits" msgid "C_lear Edits"
msgstr "Annulla _modifiche" msgstr "Annulla _modifiche"
#: src/diffuse/main.py:814 #: src/diffuse/main.py:817
msgid "_Dismiss All Edits" msgid "_Dismiss All Edits"
msgstr "Scarta tutte le mo_difiche" msgstr "Scarta tutte le mo_difiche"
#: src/diffuse/main.py:816 #: src/diffuse/main.py:819
msgid "_Find..." msgid "_Find..."
msgstr "Tr_ova..." msgstr "Tr_ova..."
#: src/diffuse/main.py:817 #: src/diffuse/main.py:820
msgid "Find _Next" msgid "Find _Next"
msgstr "Trova _successivo" msgstr "Trova _successivo"
#: src/diffuse/main.py:818 #: src/diffuse/main.py:821
msgid "Find Pre_vious" msgid "Find Pre_vious"
msgstr "Trova _precedente" msgstr "Trova _precedente"
#: src/diffuse/main.py:819 #: src/diffuse/main.py:822
msgid "_Go To Line..." msgid "_Go To Line..."
msgstr "_Vai alla riga..." msgstr "_Vai alla riga..."
#: src/diffuse/main.py:821 #: src/diffuse/main.py:824
msgid "Pr_eferences..." msgid "Pr_eferences..."
msgstr "Pr_eferenze..." msgstr "Pr_eferenze..."
#: src/diffuse/main.py:825 #: src/diffuse/main.py:828
msgid "None" msgid "None"
msgstr "Nessuna" msgstr "Nessuna"
#: src/diffuse/main.py:843 #: src/diffuse/main.py:846
msgid "_View" msgid "_View"
msgstr "_Visualizza" msgstr "_Visualizza"
#: src/diffuse/main.py:844 #: src/diffuse/main.py:847
msgid "_Syntax Highlighting" msgid "_Syntax Highlighting"
msgstr "Si_ntassi" msgstr "Si_ntassi"
#: src/diffuse/main.py:846 #: src/diffuse/main.py:849
msgid "Re_align All" msgid "Re_align All"
msgstr "Ria_llinea tutti" msgstr "Ria_llinea tutti"
#: src/diffuse/main.py:847 #: src/diffuse/main.py:850
msgid "_Isolate" msgid "_Isolate"
msgstr "_Isola" msgstr "_Isola"
#: src/diffuse/main.py:849 #: src/diffuse/main.py:852
msgid "_First Difference" msgid "_First Difference"
msgstr "_Prima differenza" msgstr "_Prima differenza"
#: src/diffuse/main.py:850 #: src/diffuse/main.py:853
msgid "_Previous Difference" msgid "_Previous Difference"
msgstr "Differenza p_recedente" msgstr "Differenza p_recedente"
#: src/diffuse/main.py:851 #: src/diffuse/main.py:854
msgid "_Next Difference" msgid "_Next Difference"
msgstr "Differenza s_uccessiva" msgstr "Differenza s_uccessiva"
#: src/diffuse/main.py:852 #: src/diffuse/main.py:855
msgid "_Last Difference" msgid "_Last Difference"
msgstr "Ulti_ma differenza" msgstr "Ulti_ma differenza"
#: src/diffuse/main.py:854 #: src/diffuse/main.py:857
msgid "Fir_st Tab" msgid "Fir_st Tab"
msgstr "Prim_a scheda" msgstr "Prim_a scheda"
#: src/diffuse/main.py:855 #: src/diffuse/main.py:858
msgid "Pre_vious Tab" msgid "Pre_vious Tab"
msgstr "Scheda pr_ecedente" msgstr "Scheda pr_ecedente"
#: src/diffuse/main.py:856 #: src/diffuse/main.py:859
msgid "Next _Tab" msgid "Next _Tab"
msgstr "Scheda su_ccessiva" msgstr "Scheda su_ccessiva"
#: src/diffuse/main.py:857 #: src/diffuse/main.py:860
msgid "Las_t Tab" msgid "Las_t Tab"
msgstr "Ul_tima scheda" msgstr "Ul_tima scheda"
#: src/diffuse/main.py:859 #: src/diffuse/main.py:862
msgid "Shift Pane _Right" msgid "Shift Pane _Right"
msgstr "Sposta riquadro a _destra" msgstr "Sposta riquadro a _destra"
#: src/diffuse/main.py:860 #: src/diffuse/main.py:863
msgid "Shift Pane _Left" msgid "Shift Pane _Left"
msgstr "Sposta riquadro a _sinistra" msgstr "Sposta riquadro a _sinistra"
#: src/diffuse/main.py:863 #: src/diffuse/main.py:866
msgid "F_ormat" msgid "F_ormat"
msgstr "F_ormato" msgstr "F_ormato"
#: src/diffuse/main.py:864 #: src/diffuse/main.py:867
msgid "Convert To _Upper Case" msgid "Convert To _Upper Case"
msgstr "Converti in M_AIUSCOLO" msgstr "Converti in M_AIUSCOLO"
#: src/diffuse/main.py:865 #: src/diffuse/main.py:868
msgid "Convert To _Lower Case" msgid "Convert To _Lower Case"
msgstr "Converti in m_inuscolo" msgstr "Converti in m_inuscolo"
#: src/diffuse/main.py:867 #: src/diffuse/main.py:870
msgid "Sort Lines In _Ascending Order" msgid "Sort Lines In _Ascending Order"
msgstr "Disponi le righe in ordine a_scendente" msgstr "Disponi le righe in ordine a_scendente"
#: src/diffuse/main.py:868 #: src/diffuse/main.py:871
msgid "Sort Lines In D_escending Order" msgid "Sort Lines In D_escending Order"
msgstr "Disponi le righe in ordine _discendente" msgstr "Disponi le righe in ordine _discendente"
#: src/diffuse/main.py:870 #: src/diffuse/main.py:873
msgid "Remove Trailing _White Space" msgid "Remove Trailing _White Space"
msgstr "Rimuovi gli spazi _vuoti alla fine della riga" msgstr "Rimuovi gli spazi _vuoti alla fine della riga"
#: src/diffuse/main.py:871 #: src/diffuse/main.py:874
msgid "Convert Tabs To _Spaces" msgid "Convert Tabs To _Spaces"
msgstr "Converti le _tabulazioni in spazi" msgstr "Converti le _tabulazioni in spazi"
#: src/diffuse/main.py:872 #: src/diffuse/main.py:875
msgid "Convert Leading Spaces To _Tabs" msgid "Convert Leading Spaces To _Tabs"
msgstr "Converti gli spa_zi iniziali in tabulazioni" msgstr "Converti gli spa_zi iniziali in tabulazioni"
#: src/diffuse/main.py:874 #: src/diffuse/main.py:877
msgid "_Increase Indenting" msgid "_Increase Indenting"
msgstr "Au_menta indentazione" msgstr "Au_menta indentazione"
#: src/diffuse/main.py:875 #: src/diffuse/main.py:878
msgid "De_crease Indenting" msgid "De_crease Indenting"
msgstr "Dimi_nuisci indentazione" msgstr "Dimi_nuisci indentazione"
#: src/diffuse/main.py:877 #: src/diffuse/main.py:880
msgid "Convert To _DOS Format" msgid "Convert To _DOS Format"
msgstr "Converti nel formato D_OS" msgstr "Converti nel formato D_OS"
#: src/diffuse/main.py:878 #: src/diffuse/main.py:881
msgid "Convert To _Mac Format" msgid "Convert To _Mac Format"
msgstr "Converti nel formato MA_C" msgstr "Converti nel formato MA_C"
#: src/diffuse/main.py:879 #: src/diffuse/main.py:882
msgid "Convert To Uni_x Format" msgid "Convert To Uni_x Format"
msgstr "Converti nel formato Uni_x" msgstr "Converti nel formato Uni_x"
#: src/diffuse/main.py:882 #: src/diffuse/main.py:885
msgid "_Merge" msgid "_Merge"
msgstr "_Unione" msgstr "_Unione"
#: src/diffuse/main.py:883 #: src/diffuse/main.py:886
msgid "Copy Selection _Right" msgid "Copy Selection _Right"
msgstr "Copia selezione a _destra" msgstr "Copia selezione a _destra"
#: src/diffuse/main.py:884 #: src/diffuse/main.py:887
msgid "Copy Selection _Left" msgid "Copy Selection _Left"
msgstr "Copia selezione a _sinistra" msgstr "Copia selezione a _sinistra"
#: src/diffuse/main.py:886 #: src/diffuse/main.py:889
msgid "Copy Left _Into Selection" msgid "Copy Left _Into Selection"
msgstr "Copia s_inistra nella selezione" msgstr "Copia s_inistra nella selezione"
#: src/diffuse/main.py:887 #: src/diffuse/main.py:890
msgid "Copy Right I_nto Selection" msgid "Copy Right I_nto Selection"
msgstr "Copia d_estra nella selezione" msgstr "Copia d_estra nella selezione"
#: src/diffuse/main.py:888 #: src/diffuse/main.py:891
msgid "_Merge From Left Then Right" msgid "_Merge From Left Then Right"
msgstr "_Unisci sinistra poi destra" msgstr "_Unisci sinistra poi destra"
#: src/diffuse/main.py:889 #: src/diffuse/main.py:892
msgid "M_erge From Right Then Left" msgid "M_erge From Right Then Left"
msgstr "U_nisci destra poi sinistra" msgstr "U_nisci destra poi sinistra"
#: src/diffuse/main.py:892 #: src/diffuse/main.py:895
msgid "_Help" msgid "_Help"
msgstr "A_iuto" msgstr "A_iuto"
#: src/diffuse/main.py:893 #: src/diffuse/main.py:896
msgid "_Help Contents..." msgid "_Help Contents..."
msgstr "_Sommario..." msgstr "_Sommario..."
#: src/diffuse/main.py:895 #: src/diffuse/main.py:898
#, python-format #, python-format
msgid "_About %s..." msgid "_About %s..."
msgstr "I_nformazioni su %s..." msgstr "I_nformazioni su %s..."
#: src/diffuse/main.py:910 #: src/diffuse/main.py:913
msgid "New 2-Way File Merge" msgid "New 2-Way File Merge"
msgstr "Nuova unione a 2 file" msgstr "Nuova unione a 2 file"
#: src/diffuse/main.py:911 #: src/diffuse/main.py:914
msgid "New 3-Way File Merge" msgid "New 3-Way File Merge"
msgstr "Nuova unione a 3 file" msgstr "Nuova unione a 3 file"
#: src/diffuse/main.py:913 #: src/diffuse/main.py:916
msgid "Realign All" msgid "Realign All"
msgstr "Riallinea tutti" msgstr "Riallinea tutti"
#: src/diffuse/main.py:914 #: src/diffuse/main.py:917
msgid "First Difference" msgid "First Difference"
msgstr "Prima differenza" msgstr "Prima differenza"
#: src/diffuse/main.py:915 #: src/diffuse/main.py:918
msgid "Previous Difference" msgid "Previous Difference"
msgstr "Differenza precedente" msgstr "Differenza precedente"
#: src/diffuse/main.py:916 #: src/diffuse/main.py:919
msgid "Next Difference" msgid "Next Difference"
msgstr "Differenza successiva" msgstr "Differenza successiva"
#: src/diffuse/main.py:917 #: src/diffuse/main.py:920
msgid "Last Difference" msgid "Last Difference"
msgstr "Ultima differenza" msgstr "Ultima differenza"
#: src/diffuse/main.py:919 #: src/diffuse/main.py:922
msgid "Copy Selection Right" msgid "Copy Selection Right"
msgstr "Copia la selezione a destra" msgstr "Copia la selezione a destra"
#: src/diffuse/main.py:920 #: src/diffuse/main.py:923
msgid "Copy Selection Left" msgid "Copy Selection Left"
msgstr "Copia la selezione a sinistra" msgstr "Copia la selezione a sinistra"
#: src/diffuse/main.py:921 #: src/diffuse/main.py:924
msgid "Copy Left Into Selection" msgid "Copy Left Into Selection"
msgstr "Copia sinistra nella selezione" msgstr "Copia sinistra nella selezione"
#: src/diffuse/main.py:922 #: src/diffuse/main.py:925
msgid "Copy Right Into Selection" msgid "Copy Right Into Selection"
msgstr "Copia destra nella selezione" msgstr "Copia destra nella selezione"
#: src/diffuse/main.py:923 #: src/diffuse/main.py:926
msgid "Merge From Left Then Right" msgid "Merge From Left Then Right"
msgstr "Unisce prima da sinistra poi da destra" msgstr "Unisce prima da sinistra poi da destra"
#: src/diffuse/main.py:924 #: src/diffuse/main.py:927
msgid "Merge From Right Then Left" msgid "Merge From Right Then Left"
msgstr "Unisce prima da destra poi da sinistra" msgstr "Unisce prima da destra poi da sinistra"
#: src/diffuse/main.py:926 #: src/diffuse/main.py:929
msgid "Undo" msgid "Undo"
msgstr "Annulla" msgstr "Annulla"
#: src/diffuse/main.py:927 #: src/diffuse/main.py:930
msgid "Redo" msgid "Redo"
msgstr "Ripeti" msgstr "Ripeti"
#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 #: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
msgid "Cut" msgid "Cut"
msgstr "Taglia" msgstr "Taglia"
#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 #: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
msgid "Copy" msgid "Copy"
msgstr "Copia" msgstr "Copia"
#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 #: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
msgid "Paste" msgid "Paste"
msgstr "Incolla" msgstr "Incolla"
#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 #: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
msgid "Clear Edits" msgid "Clear Edits"
msgstr "Annulla le modifiche" msgstr "Annulla le modifiche"
#: src/diffuse/main.py:1054 #: src/diffuse/main.py:1057
msgid "Some files have unsaved changes. Select the files to save before closing." msgid "Some files have unsaved changes. Select the files to save before closing."
msgstr "" msgstr ""
"Alcune modifiche ai file non sono ancora state salvate. Selezionare i file da " "Alcune modifiche ai file non sono ancora state salvate. Selezionare i file da "
"salvare prima di uscire." "salvare prima di uscire."
#: src/diffuse/main.py:1068 #: src/diffuse/main.py:1071
msgid "Tab" msgid "Tab"
msgstr "Scheda" msgstr "Scheda"
#: src/diffuse/main.py:1073 #: src/diffuse/main.py:1076
msgid "Pane" msgid "Pane"
msgstr "Riquadro" msgstr "Riquadro"
#: src/diffuse/main.py:1084 #: src/diffuse/main.py:1087
msgid "Close _Without Saving" msgid "Close _Without Saving"
msgstr "_Chiudi senza salvare" msgstr "_Chiudi senza salvare"
#: src/diffuse/main.py:1123 #: src/diffuse/main.py:1126
#, python-format #, python-format
msgid "Closing this tab will quit %s." msgid "Closing this tab will quit %s."
msgstr "Chiudendo questa scheda %s verrà chiuso." msgstr "Chiudendo questa scheda %s verrà chiuso."
#: src/diffuse/main.py:1206 #: src/diffuse/main.py:1209
#, python-format #, python-format
msgid "File Merge %d" msgid "File Merge %d"
msgstr "Unione file # %d" msgstr "Unione file # %d"
#: src/diffuse/main.py:1312 #: src/diffuse/main.py:1315
#, python-format #, python-format
msgid "Error retrieving commits for %s." msgid "Error retrieving commits for %s."
msgstr "Errore nel recupero dei commit per %s." msgstr "Errore nel recupero dei commit per %s."
#: src/diffuse/main.py:1344 #: src/diffuse/main.py:1347
#, python-format #, python-format
msgid "Error retrieving modifications for %s." msgid "Error retrieving modifications for %s."
msgstr "Errore nel recupero delle modifiche per %s." msgstr "Errore nel recupero delle modifiche per %s."
#: src/diffuse/main.py:1377 #: src/diffuse/main.py:1380
msgid "Open File In New Tab" msgid "Open File In New Tab"
msgstr "Apre ilo file in una nuova scheda" msgstr "Apre ilo file in una nuova scheda"
#: src/diffuse/main.py:1400 #: src/diffuse/main.py:1403
msgid "Choose Folder With Modified Files" msgid "Choose Folder With Modified Files"
msgstr "Selezionare la cartella con i file modificati" msgstr "Selezionare la cartella con i file modificati"
#: src/diffuse/main.py:1418 #: src/diffuse/main.py:1421
msgid "No modified files found." msgid "No modified files found."
msgstr "Non sono stati trovati file modificati." msgstr "Non sono stati trovati file modificati."
#: src/diffuse/main.py:1424 #: src/diffuse/main.py:1427
msgid "Choose Folder With Commit" msgid "Choose Folder With Commit"
msgstr "Selezionare la cartella con i commit" msgstr "Selezionare la cartella con i commit"
#: src/diffuse/main.py:1444 #: src/diffuse/main.py:1447
msgid "No committed files found." msgid "No committed files found."
msgstr "Non sono stati trovati file di cui è stato eseguito il commit." msgstr "Non sono stati trovati file di cui è stato eseguito il commit."
#: src/diffuse/main.py:1480 #: src/diffuse/main.py:1483
msgid "New N-Way File Merge..." msgid "New N-Way File Merge..."
msgstr "Nuova unione a N file..." msgstr "Nuova unione a N file..."
#: src/diffuse/main.py:1481 #: src/diffuse/main.py:1484
msgid "Number of panes: " msgid "Number of panes: "
msgstr "Numero di riquadri: " msgstr "Numero di riquadri: "
#: src/diffuse/main.py:1555 #: src/diffuse/main.py:1558
msgid "Phrase not found. Continue from the end of the file?" msgid "Phrase not found. Continue from the end of the file?"
msgstr "Frase non trovata. Continuare dalla fine del file?" msgstr "Frase non trovata. Continuare dalla fine del file?"
#: src/diffuse/main.py:1557 #: src/diffuse/main.py:1560
msgid "Phrase not found. Continue from the start of the file?" msgid "Phrase not found. Continue from the start of the file?"
msgstr "Frase non trovata. Continuare dall'inizio del file?" msgstr "Frase non trovata. Continuare dall'inizio del file?"
#: src/diffuse/main.py:1778 #: src/diffuse/main.py:1781
#, fuzzy #, fuzzy
msgid "" msgid ""
"Usage:\n" "Usage:\n"
@ -676,16 +681,16 @@ msgstr ""
" ( -i | --ignore-case ) Ignora differenze tra MAIUSCOLE/minuscole\n" " ( -i | --ignore-case ) Ignora differenze tra MAIUSCOLE/minuscole\n"
" ( -w | --ignore-all-space ) Ignora le differenze tra spazi vuoti" " ( -w | --ignore-all-space ) Ignora le differenze tra spazi vuoti"
#: src/diffuse/main.py:1945 #: src/diffuse/main.py:1948
msgid "Error parsing line number." msgid "Error parsing line number."
msgstr "Errore nell'analizzare il numero di riga." msgstr "Errore nell'analizzare il numero di riga."
#: src/diffuse/main.py:1955 #: src/diffuse/main.py:1958
#, python-format #, python-format
msgid "Skipping unknown argument \"%s\"." msgid "Skipping unknown argument \"%s\"."
msgstr "L'argomento sconosciuto \"%s\" verrà tralasciato." msgstr "L'argomento sconosciuto \"%s\" verrà tralasciato."
#: src/diffuse/main.py:1963 #: src/diffuse/main.py:1966
#, python-format #, python-format
msgid "Error processing argument \"%s\". Directory not expected." msgid "Error processing argument \"%s\". Directory not expected."
msgstr "Errore nell'elaborazione dell'argomento \"%s\". Cartella non attesa." msgstr "Errore nell'elaborazione dell'argomento \"%s\". Cartella non attesa."
@ -961,7 +966,3 @@ msgstr "Seleziona tutto"
#: src/diffuse/widgets.py:1868 #: src/diffuse/widgets.py:1868
msgid "Swap with Selected Pane" msgid "Swap with Selected Pane"
msgstr "Scambia con il riquadro selezionato" msgstr "Scambia con il riquadro selezionato"
#, python-format
#~ msgid "Column %d"
#~ msgstr "Colonna %d"

255
po/ja.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: diffuse-svn r316\n" "Project-Id-Version: diffuse-svn r316\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-23 19:48-0400\n" "POT-Creation-Date: 2022-10-23 20:00-0400\n"
"PO-Revision-Date: 2020-06-29 14:49-0400\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n"
"Last-Translator: Derrick Moser <derrick_moser@yahoo.com>\n" "Last-Translator: Derrick Moser <derrick_moser@yahoo.com>\n"
"Language-Team: Japanese\n" "Language-Team: Japanese\n"
@ -95,40 +95,45 @@ msgstr "ファイルを保存"
msgid "Save File As..." msgid "Save File As..."
msgstr "ファイルとして保存..." msgstr "ファイルとして保存..."
#: src/diffuse/main.py:288 #: src/diffuse/main.py:217
#, python-format
msgid "Column %d"
msgstr "%d列"
#: src/diffuse/main.py:291
msgid "Save changes before loading the new file?" msgid "Save changes before loading the new file?"
msgstr "新しいファイルをロードする前に、変更したデータを保存しますか？" msgstr "新しいファイルをロードする前に、変更したデータを保存しますか？"
#: src/diffuse/main.py:399 #: src/diffuse/main.py:402
#, python-format #, python-format
msgid "Error reading revision %(rev)s of %(file)s." msgid "Error reading revision %(rev)s of %(file)s."
msgstr "%(file)s の %(rev)s というリビジョンを読み込む際にエラーが生じました。" msgstr "%(file)s の %(rev)s というリビジョンを読み込む際にエラーが生じました。"
#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #: src/diffuse/main.py:405 src/diffuse/main.py:1860
#, python-format #, python-format
msgid "Error reading %s." msgid "Error reading %s."
msgstr "%s を読み込む際にエラーが生じました。" msgstr "%s を読み込む際にエラーが生じました。"
#: src/diffuse/main.py:424 #: src/diffuse/main.py:427
msgid "Open File" msgid "Open File"
msgstr "ファイルを開く" msgstr "ファイルを開く"
#: src/diffuse/main.py:481 #: src/diffuse/main.py:484
#, python-format #, python-format
msgid "The file %s changed on disk. Do you want to reload the file?" msgid "The file %s changed on disk. Do you want to reload the file?"
msgstr "ファイル %s が変更されたようです。そのファイルを再読み込みしますか？" msgstr "ファイル %s が変更されたようです。そのファイルを再読み込みしますか？"
#: src/diffuse/main.py:507 #: src/diffuse/main.py:510
#, python-format #, python-format
msgid "Save %(title)s Pane %(pane)d" msgid "Save %(title)s Pane %(pane)d"
msgstr "%(title)s の%(pane)d番目の枠を保存" msgstr "%(title)s の%(pane)d番目の枠を保存"
#: src/diffuse/main.py:539 #: src/diffuse/main.py:542
#, python-format #, python-format
msgid "A file named %s already exists. Do you want to overwrite it?" msgid "A file named %s already exists. Do you want to overwrite it?"
msgstr "%s というファイルは既に存在しています。それを上書きしますか？" msgstr "%s というファイルは既に存在しています。それを上書きしますか？"
#: src/diffuse/main.py:546 #: src/diffuse/main.py:549
#, python-format #, python-format
msgid "" msgid ""
"The file %s has been modified by another process since reading it. If you save, " "The file %s has been modified by another process since reading it. If you save, "
@ -137,25 +142,25 @@ msgstr ""
"ファイル %s は、変更されています。保存する場合は、これらの変更が失われることがあり" "ファイル %s は、変更されています。保存する場合は、これらの変更が失われることがあり"
"ます。保存しますか?" "ます。保存しますか?"
#: src/diffuse/main.py:588 #: src/diffuse/main.py:591
#, python-format #, python-format
msgid "Error encoding to %s." msgid "Error encoding to %s."
msgstr "%s に変える際にエラーが生じました。" msgstr "%s に変える際にエラーが生じました。"
#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #: src/diffuse/main.py:595 src/diffuse/preferences.py:300
#, python-format #, python-format
msgid "Error writing %s." msgid "Error writing %s."
msgstr "%s へ書き込む際にエラーが生じました。" msgstr "%s へ書き込む際にエラーが生じました。"
#: src/diffuse/main.py:622 #: src/diffuse/main.py:625
msgid "Go To Line..." msgid "Go To Line..."
msgstr "指定行へジャンプ..." msgstr "指定行へジャンプ..."
#: src/diffuse/main.py:623 #: src/diffuse/main.py:626
msgid "Line Number: " msgid "Line Number: "
msgstr "行番号: " msgstr "行番号: "
#: src/diffuse/main.py:654 #: src/diffuse/main.py:657
msgid "" msgid ""
"Press the enter key or double click to edit. Press the space bar or use the RMB " "Press the enter key or double click to edit. Press the space bar or use the RMB "
"menu to manually align." "menu to manually align."
@ -163,11 +168,11 @@ msgstr ""
"編集するためにエンターキーを押すか、ダブルクリックします。手動で整列させるためにス" "編集するためにエンターキーを押すか、ダブルクリックします。手動で整列させるためにス"
"ペースバーを押すか、RMBを使います。" "ペースバーを押すか、RMBを使います。"
#: src/diffuse/main.py:658 #: src/diffuse/main.py:661
msgid "Press the escape key to finish editing." msgid "Press the escape key to finish editing."
msgstr "ESCキーを押して、編集を終了します。" msgstr "ESCキーを押して、編集を終了します。"
#: src/diffuse/main.py:661 #: src/diffuse/main.py:664
msgid "" msgid ""
"Select target line and press the space bar to align. Press the escape key to " "Select target line and press the space bar to align. Press the escape key to "
"cancel." "cancel."
@ -175,425 +180,425 @@ msgstr ""
"目標行を選択してスペースバーを押すと整列します。取り消す場合は、ESCキーを押しま" "目標行を選択してスペースバーを押すと整列します。取り消す場合は、ESCキーを押しま"
"す。" "す。"
#: src/diffuse/main.py:784 #: src/diffuse/main.py:787
msgid "_File" msgid "_File"
msgstr "ファイル(_F)" msgstr "ファイル(_F)"
#: src/diffuse/main.py:785 #: src/diffuse/main.py:788
msgid "_Open File..." msgid "_Open File..."
msgstr "ファイルを開く...(_O)" msgstr "ファイルを開く...(_O)"
#: src/diffuse/main.py:786 #: src/diffuse/main.py:789
msgid "Open File In New _Tab..." msgid "Open File In New _Tab..."
msgstr "新しいタブにファイルを開く...(_T)" msgstr "新しいタブにファイルを開く...(_T)"
#: src/diffuse/main.py:787 #: src/diffuse/main.py:790
msgid "Open _Modified Files..." msgid "Open _Modified Files..."
msgstr "変更のあるファイルを開く...(_M)" msgstr "変更のあるファイルを開く...(_M)"
#: src/diffuse/main.py:788 #: src/diffuse/main.py:791
msgid "Open Commi_t..." msgid "Open Commi_t..."
msgstr "コミットを開く...(_T)" msgstr "コミットを開く...(_T)"
#: src/diffuse/main.py:789 #: src/diffuse/main.py:792
msgid "_Reload File" msgid "_Reload File"
msgstr "ファイルの再読込み(_R)" msgstr "ファイルの再読込み(_R)"
#: src/diffuse/main.py:791 #: src/diffuse/main.py:794
msgid "_Save File" msgid "_Save File"
msgstr "ファイルを保存(_S)" msgstr "ファイルを保存(_S)"
#: src/diffuse/main.py:792 #: src/diffuse/main.py:795
msgid "Save File _As..." msgid "Save File _As..."
msgstr "ファイルとして保存...(_A)" msgstr "ファイルとして保存...(_A)"
#: src/diffuse/main.py:793 #: src/diffuse/main.py:796
msgid "Save A_ll" msgid "Save A_ll"
msgstr "全て保存(_L)" msgstr "全て保存(_L)"
#: src/diffuse/main.py:795 #: src/diffuse/main.py:798
msgid "New _2-Way File Merge" msgid "New _2-Way File Merge"
msgstr "新しい２つのファイルの比較(_2)" msgstr "新しい２つのファイルの比較(_2)"
#: src/diffuse/main.py:796 #: src/diffuse/main.py:799
msgid "New _3-Way File Merge" msgid "New _3-Way File Merge"
msgstr "新しい３つのファイルの比較(_3)" msgstr "新しい３つのファイルの比較(_3)"
#: src/diffuse/main.py:797 #: src/diffuse/main.py:800
msgid "New _N-Way File Merge..." msgid "New _N-Way File Merge..."
msgstr "新しい複数のファイルの比較...(_N)" msgstr "新しい複数のファイルの比較...(_N)"
#: src/diffuse/main.py:799 #: src/diffuse/main.py:802
msgid "_Close Tab" msgid "_Close Tab"
msgstr "タブを閉じる(_C)" msgstr "タブを閉じる(_C)"
#: src/diffuse/main.py:800 #: src/diffuse/main.py:803
msgid "_Undo Close Tab" msgid "_Undo Close Tab"
msgstr "閉じたタブを元に戻す(_U)" msgstr "閉じたタブを元に戻す(_U)"
#: src/diffuse/main.py:801 #: src/diffuse/main.py:804
msgid "_Quit" msgid "_Quit"
msgstr "終了(_Q)" msgstr "終了(_Q)"
#: src/diffuse/main.py:804 #: src/diffuse/main.py:807
msgid "_Edit" msgid "_Edit"
msgstr "編集(_E)" msgstr "編集(_E)"
#: src/diffuse/main.py:805 #: src/diffuse/main.py:808
msgid "_Undo" msgid "_Undo"
msgstr "元に戻す(_U)" msgstr "元に戻す(_U)"
#: src/diffuse/main.py:806 #: src/diffuse/main.py:809
msgid "_Redo" msgid "_Redo"
msgstr "やり直す(_R)" msgstr "やり直す(_R)"
#: src/diffuse/main.py:808 #: src/diffuse/main.py:811
msgid "Cu_t" msgid "Cu_t"
msgstr "切り取り(_T)" msgstr "切り取り(_T)"
#: src/diffuse/main.py:809 #: src/diffuse/main.py:812
msgid "_Copy" msgid "_Copy"
msgstr "コピー(_C)" msgstr "コピー(_C)"
#: src/diffuse/main.py:810 #: src/diffuse/main.py:813
msgid "_Paste" msgid "_Paste"
msgstr "貼り付け(_P)" msgstr "貼り付け(_P)"
#: src/diffuse/main.py:812 #: src/diffuse/main.py:815
msgid "Select _All" msgid "Select _All"
msgstr "全て選択(_A)" msgstr "全て選択(_A)"
#: src/diffuse/main.py:813 #: src/diffuse/main.py:816
msgid "C_lear Edits" msgid "C_lear Edits"
msgstr "編集をクリア(_L)" msgstr "編集をクリア(_L)"
#: src/diffuse/main.py:814 #: src/diffuse/main.py:817
msgid "_Dismiss All Edits" msgid "_Dismiss All Edits"
msgstr "全ての編集を破棄(_D)" msgstr "全ての編集を破棄(_D)"
#: src/diffuse/main.py:816 #: src/diffuse/main.py:819
msgid "_Find..." msgid "_Find..."
msgstr "検索...(_F)" msgstr "検索...(_F)"
#: src/diffuse/main.py:817 #: src/diffuse/main.py:820
msgid "Find _Next" msgid "Find _Next"
msgstr "次の検索(_N)" msgstr "次の検索(_N)"
#: src/diffuse/main.py:818 #: src/diffuse/main.py:821
msgid "Find Pre_vious" msgid "Find Pre_vious"
msgstr "前の検索(_V)" msgstr "前の検索(_V)"
#: src/diffuse/main.py:819 #: src/diffuse/main.py:822
msgid "_Go To Line..." msgid "_Go To Line..."
msgstr "指定行へジャンプ...(_G)" msgstr "指定行へジャンプ...(_G)"
#: src/diffuse/main.py:821 #: src/diffuse/main.py:824
msgid "Pr_eferences..." msgid "Pr_eferences..."
msgstr "設定...(_E)" msgstr "設定...(_E)"
#: src/diffuse/main.py:825 #: src/diffuse/main.py:828
msgid "None" msgid "None"
msgstr "なし" msgstr "なし"
#: src/diffuse/main.py:843 #: src/diffuse/main.py:846
msgid "_View" msgid "_View"
msgstr "表示(_V)" msgstr "表示(_V)"
#: src/diffuse/main.py:844 #: src/diffuse/main.py:847
msgid "_Syntax Highlighting" msgid "_Syntax Highlighting"
msgstr "構文の強調表示(_S)" msgstr "構文の強調表示(_S)"
#: src/diffuse/main.py:846 #: src/diffuse/main.py:849
msgid "Re_align All" msgid "Re_align All"
msgstr "全て再整列(_A)" msgstr "全て再整列(_A)"
#: src/diffuse/main.py:847 #: src/diffuse/main.py:850
msgid "_Isolate" msgid "_Isolate"
msgstr "分離(_I)" msgstr "分離(_I)"
#: src/diffuse/main.py:849 #: src/diffuse/main.py:852
msgid "_First Difference" msgid "_First Difference"
msgstr "最初の差分(_F)" msgstr "最初の差分(_F)"
#: src/diffuse/main.py:850 #: src/diffuse/main.py:853
msgid "_Previous Difference" msgid "_Previous Difference"
msgstr "前の差分(_P)" msgstr "前の差分(_P)"
#: src/diffuse/main.py:851 #: src/diffuse/main.py:854
msgid "_Next Difference" msgid "_Next Difference"
msgstr "次の差分(_N)" msgstr "次の差分(_N)"
#: src/diffuse/main.py:852 #: src/diffuse/main.py:855
msgid "_Last Difference" msgid "_Last Difference"
msgstr "最後の差分(_L)" msgstr "最後の差分(_L)"
#: src/diffuse/main.py:854 #: src/diffuse/main.py:857
msgid "Fir_st Tab" msgid "Fir_st Tab"
msgstr "最初のタブ(_S)" msgstr "最初のタブ(_S)"
#: src/diffuse/main.py:855 #: src/diffuse/main.py:858
msgid "Pre_vious Tab" msgid "Pre_vious Tab"
msgstr "前のタブ(_V)" msgstr "前のタブ(_V)"
#: src/diffuse/main.py:856 #: src/diffuse/main.py:859
msgid "Next _Tab" msgid "Next _Tab"
msgstr "次のタブ(_T)" msgstr "次のタブ(_T)"
#: src/diffuse/main.py:857 #: src/diffuse/main.py:860
msgid "Las_t Tab" msgid "Las_t Tab"
msgstr "最後のタブ(_T)" msgstr "最後のタブ(_T)"
#: src/diffuse/main.py:859 #: src/diffuse/main.py:862
msgid "Shift Pane _Right" msgid "Shift Pane _Right"
msgstr "枠を右に動かす(_R)" msgstr "枠を右に動かす(_R)"
#: src/diffuse/main.py:860 #: src/diffuse/main.py:863
msgid "Shift Pane _Left" msgid "Shift Pane _Left"
msgstr "枠を左に動かす(_L)" msgstr "枠を左に動かす(_L)"
#: src/diffuse/main.py:863 #: src/diffuse/main.py:866
msgid "F_ormat" msgid "F_ormat"
msgstr "フォーマット(_O)" msgstr "フォーマット(_O)"
#: src/diffuse/main.py:864 #: src/diffuse/main.py:867
msgid "Convert To _Upper Case" msgid "Convert To _Upper Case"
msgstr "大文字に変換(_U)" msgstr "大文字に変換(_U)"
#: src/diffuse/main.py:865 #: src/diffuse/main.py:868
msgid "Convert To _Lower Case" msgid "Convert To _Lower Case"
msgstr "小文字に変換(_L)" msgstr "小文字に変換(_L)"
#: src/diffuse/main.py:867 #: src/diffuse/main.py:870
msgid "Sort Lines In _Ascending Order" msgid "Sort Lines In _Ascending Order"
msgstr "行を昇順に並べる(_A)" msgstr "行を昇順に並べる(_A)"
#: src/diffuse/main.py:868 #: src/diffuse/main.py:871
msgid "Sort Lines In D_escending Order" msgid "Sort Lines In D_escending Order"
msgstr "行を降順に並べる(_E)" msgstr "行を降順に並べる(_E)"
#: src/diffuse/main.py:870 #: src/diffuse/main.py:873
msgid "Remove Trailing _White Space" msgid "Remove Trailing _White Space"
msgstr "末尾の空白を削除(_W)" msgstr "末尾の空白を削除(_W)"
#: src/diffuse/main.py:871 #: src/diffuse/main.py:874
msgid "Convert Tabs To _Spaces" msgid "Convert Tabs To _Spaces"
msgstr "タブをスペースに変換(_S)" msgstr "タブをスペースに変換(_S)"
#: src/diffuse/main.py:872 #: src/diffuse/main.py:875
msgid "Convert Leading Spaces To _Tabs" msgid "Convert Leading Spaces To _Tabs"
msgstr "先頭のスペースをタブに変換(_T)" msgstr "先頭のスペースをタブに変換(_T)"
#: src/diffuse/main.py:874 #: src/diffuse/main.py:877
msgid "_Increase Indenting" msgid "_Increase Indenting"
msgstr "インデントを増やす(_I)" msgstr "インデントを増やす(_I)"
#: src/diffuse/main.py:875 #: src/diffuse/main.py:878
msgid "De_crease Indenting" msgid "De_crease Indenting"
msgstr "インデントを減らす(_C)" msgstr "インデントを減らす(_C)"
#: src/diffuse/main.py:877 #: src/diffuse/main.py:880
msgid "Convert To _DOS Format" msgid "Convert To _DOS Format"
msgstr "DOS 形式に変換(_D)" msgstr "DOS 形式に変換(_D)"
#: src/diffuse/main.py:878 #: src/diffuse/main.py:881
msgid "Convert To _Mac Format" msgid "Convert To _Mac Format"
msgstr "Mac 形式に変換(_M)" msgstr "Mac 形式に変換(_M)"
#: src/diffuse/main.py:879 #: src/diffuse/main.py:882
msgid "Convert To Uni_x Format" msgid "Convert To Uni_x Format"
msgstr "Unix 形式に変換(_X)" msgstr "Unix 形式に変換(_X)"
#: src/diffuse/main.py:882 #: src/diffuse/main.py:885
msgid "_Merge" msgid "_Merge"
msgstr "マージ(_M)" msgstr "マージ(_M)"
#: src/diffuse/main.py:883 #: src/diffuse/main.py:886
msgid "Copy Selection _Right" msgid "Copy Selection _Right"
msgstr "選択を右にコピー(_R)" msgstr "選択を右にコピー(_R)"
#: src/diffuse/main.py:884 #: src/diffuse/main.py:887
msgid "Copy Selection _Left" msgid "Copy Selection _Left"
msgstr "選択を左にコピー(_L)" msgstr "選択を左にコピー(_L)"
#: src/diffuse/main.py:886 #: src/diffuse/main.py:889
msgid "Copy Left _Into Selection" msgid "Copy Left _Into Selection"
msgstr "左から選択枠にコピー(_I)" msgstr "左から選択枠にコピー(_I)"
#: src/diffuse/main.py:887 #: src/diffuse/main.py:890
msgid "Copy Right I_nto Selection" msgid "Copy Right I_nto Selection"
msgstr "右から選択枠にコピー(_N)" msgstr "右から選択枠にコピー(_N)"
#: src/diffuse/main.py:888 #: src/diffuse/main.py:891
msgid "_Merge From Left Then Right" msgid "_Merge From Left Then Right"
msgstr "左からマージした後、右からマージ(_M)" msgstr "左からマージした後、右からマージ(_M)"
#: src/diffuse/main.py:889 #: src/diffuse/main.py:892
msgid "M_erge From Right Then Left" msgid "M_erge From Right Then Left"
msgstr "右からマージした後、左からマージ(_E)" msgstr "右からマージした後、左からマージ(_E)"
#: src/diffuse/main.py:892 #: src/diffuse/main.py:895
msgid "_Help" msgid "_Help"
msgstr "ヘルプ(_H)" msgstr "ヘルプ(_H)"
#: src/diffuse/main.py:893 #: src/diffuse/main.py:896
msgid "_Help Contents..." msgid "_Help Contents..."
msgstr "ヘルプの目次...(_H)" msgstr "ヘルプの目次...(_H)"
#: src/diffuse/main.py:895 #: src/diffuse/main.py:898
#, python-format #, python-format
msgid "_About %s..." msgid "_About %s..."
msgstr "%s について...(_A)" msgstr "%s について...(_A)"
#: src/diffuse/main.py:910 #: src/diffuse/main.py:913
msgid "New 2-Way File Merge" msgid "New 2-Way File Merge"
msgstr "新しい２つのファイルの比較" msgstr "新しい２つのファイルの比較"
#: src/diffuse/main.py:911 #: src/diffuse/main.py:914
msgid "New 3-Way File Merge" msgid "New 3-Way File Merge"
msgstr "新しい３つのファイルの比較" msgstr "新しい３つのファイルの比較"
#: src/diffuse/main.py:913 #: src/diffuse/main.py:916
msgid "Realign All" msgid "Realign All"
msgstr "全て再整列" msgstr "全て再整列"
#: src/diffuse/main.py:914 #: src/diffuse/main.py:917
msgid "First Difference" msgid "First Difference"
msgstr "最初の差分" msgstr "最初の差分"
#: src/diffuse/main.py:915 #: src/diffuse/main.py:918
msgid "Previous Difference" msgid "Previous Difference"
msgstr "前の差分" msgstr "前の差分"
#: src/diffuse/main.py:916 #: src/diffuse/main.py:919
msgid "Next Difference" msgid "Next Difference"
msgstr "次の差分" msgstr "次の差分"
#: src/diffuse/main.py:917 #: src/diffuse/main.py:920
msgid "Last Difference" msgid "Last Difference"
msgstr "最後の差分" msgstr "最後の差分"
#: src/diffuse/main.py:919 #: src/diffuse/main.py:922
msgid "Copy Selection Right" msgid "Copy Selection Right"
msgstr "選択を右にコピー" msgstr "選択を右にコピー"
#: src/diffuse/main.py:920 #: src/diffuse/main.py:923
msgid "Copy Selection Left" msgid "Copy Selection Left"
msgstr "選択を左にコピー" msgstr "選択を左にコピー"
#: src/diffuse/main.py:921 #: src/diffuse/main.py:924
msgid "Copy Left Into Selection" msgid "Copy Left Into Selection"
msgstr "左から選択枠にコピー" msgstr "左から選択枠にコピー"
#: src/diffuse/main.py:922 #: src/diffuse/main.py:925
msgid "Copy Right Into Selection" msgid "Copy Right Into Selection"
msgstr "右から選択枠にコピー" msgstr "右から選択枠にコピー"
#: src/diffuse/main.py:923 #: src/diffuse/main.py:926
msgid "Merge From Left Then Right" msgid "Merge From Left Then Right"
msgstr "左からマージした後、右からマージ" msgstr "左からマージした後、右からマージ"
#: src/diffuse/main.py:924 #: src/diffuse/main.py:927
msgid "Merge From Right Then Left" msgid "Merge From Right Then Left"
msgstr "右からマージした後、左からマージ" msgstr "右からマージした後、左からマージ"
#: src/diffuse/main.py:926 #: src/diffuse/main.py:929
msgid "Undo" msgid "Undo"
msgstr "元に戻す" msgstr "元に戻す"
#: src/diffuse/main.py:927 #: src/diffuse/main.py:930
msgid "Redo" msgid "Redo"
msgstr "やり直す" msgstr "やり直す"
#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 #: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
msgid "Cut" msgid "Cut"
msgstr "切り取り" msgstr "切り取り"
#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 #: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
msgid "Copy" msgid "Copy"
msgstr "コピー" msgstr "コピー"
#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 #: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
msgid "Paste" msgid "Paste"
msgstr "貼り付け" msgstr "貼り付け"
#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 #: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
msgid "Clear Edits" msgid "Clear Edits"
msgstr "編集をクリア" msgstr "編集をクリア"
#: src/diffuse/main.py:1054 #: src/diffuse/main.py:1057
msgid "Some files have unsaved changes. Select the files to save before closing." msgid "Some files have unsaved changes. Select the files to save before closing."
msgstr "" msgstr ""
"変更が保存されていないファイルがあります。終了前に保存するファイルを選択します。" "変更が保存されていないファイルがあります。終了前に保存するファイルを選択します。"
#: src/diffuse/main.py:1068 #: src/diffuse/main.py:1071
msgid "Tab" msgid "Tab"
msgstr "タブ" msgstr "タブ"
#: src/diffuse/main.py:1073 #: src/diffuse/main.py:1076
msgid "Pane" msgid "Pane"
msgstr "枠" msgstr "枠"
#: src/diffuse/main.py:1084 #: src/diffuse/main.py:1087
msgid "Close _Without Saving" msgid "Close _Without Saving"
msgstr "保存せずに閉じる(_W)" msgstr "保存せずに閉じる(_W)"
#: src/diffuse/main.py:1123 #: src/diffuse/main.py:1126
#, python-format #, python-format
msgid "Closing this tab will quit %s." msgid "Closing this tab will quit %s."
msgstr "このタブを閉じると、%sは終了します。" msgstr "このタブを閉じると、%sは終了します。"
#: src/diffuse/main.py:1206 #: src/diffuse/main.py:1209
#, python-format #, python-format
msgid "File Merge %d" msgid "File Merge %d"
msgstr "ファイルマージ%d" msgstr "ファイルマージ%d"
#: src/diffuse/main.py:1312 #: src/diffuse/main.py:1315
#, python-format #, python-format
msgid "Error retrieving commits for %s." msgid "Error retrieving commits for %s."
msgstr "%s のコミットの取得中にエラーが生じました。" msgstr "%s のコミットの取得中にエラーが生じました。"
#: src/diffuse/main.py:1344 #: src/diffuse/main.py:1347
#, python-format #, python-format
msgid "Error retrieving modifications for %s." msgid "Error retrieving modifications for %s."
msgstr "%s の変更の取得中にエラーが生じました。" msgstr "%s の変更の取得中にエラーが生じました。"
#: src/diffuse/main.py:1377 #: src/diffuse/main.py:1380
msgid "Open File In New Tab" msgid "Open File In New Tab"
msgstr "新しいタブにファイルを開く" msgstr "新しいタブにファイルを開く"
#: src/diffuse/main.py:1400 #: src/diffuse/main.py:1403
msgid "Choose Folder With Modified Files" msgid "Choose Folder With Modified Files"
msgstr "変更なったファイルがあるフォルダを選択" msgstr "変更なったファイルがあるフォルダを選択"
#: src/diffuse/main.py:1418 #: src/diffuse/main.py:1421
msgid "No modified files found." msgid "No modified files found."
msgstr "変更なったファイルが見つかりませんでした。" msgstr "変更なったファイルが見つかりませんでした。"
#: src/diffuse/main.py:1424 #: src/diffuse/main.py:1427
msgid "Choose Folder With Commit" msgid "Choose Folder With Commit"
msgstr "コミットがあるフォルダを選択" msgstr "コミットがあるフォルダを選択"
#: src/diffuse/main.py:1444 #: src/diffuse/main.py:1447
msgid "No committed files found." msgid "No committed files found."
msgstr "コミットされたファイルが見つかりませんでした。" msgstr "コミットされたファイルが見つかりませんでした。"
#: src/diffuse/main.py:1480 #: src/diffuse/main.py:1483
msgid "New N-Way File Merge..." msgid "New N-Way File Merge..."
msgstr "新しい複数のファイルの比較..." msgstr "新しい複数のファイルの比較..."
#: src/diffuse/main.py:1481 #: src/diffuse/main.py:1484
msgid "Number of panes: " msgid "Number of panes: "
msgstr "枠の数: " msgstr "枠の数: "
#: src/diffuse/main.py:1555 #: src/diffuse/main.py:1558
msgid "Phrase not found. Continue from the end of the file?" msgid "Phrase not found. Continue from the end of the file?"
msgstr "文字列が見つかりませんでした。ファイルの終わりから続けますか。" msgstr "文字列が見つかりませんでした。ファイルの終わりから続けますか。"
#: src/diffuse/main.py:1557 #: src/diffuse/main.py:1560
msgid "Phrase not found. Continue from the start of the file?" msgid "Phrase not found. Continue from the start of the file?"
msgstr "文字列が見つかりませんでした。ファイルの始めから続けますか。" msgstr "文字列が見つかりませんでした。ファイルの始めから続けますか。"
#: src/diffuse/main.py:1778 #: src/diffuse/main.py:1781
#, fuzzy #, fuzzy
msgid "" msgid ""
"Usage:\n" "Usage:\n"
@ -671,16 +676,16 @@ msgstr ""
" ( -i | --ignore-case ) 大文字小文字の違いを無視\n" " ( -i | --ignore-case ) 大文字小文字の違いを無視\n"
" ( -w | --ignore-all-space ) 空白の違いを無視" " ( -w | --ignore-all-space ) 空白の違いを無視"
#: src/diffuse/main.py:1945 #: src/diffuse/main.py:1948
msgid "Error parsing line number." msgid "Error parsing line number."
msgstr "行番号をパースする際にエラーが生じました。" msgstr "行番号をパースする際にエラーが生じました。"
#: src/diffuse/main.py:1955 #: src/diffuse/main.py:1958
#, python-format #, python-format
msgid "Skipping unknown argument \"%s\"." msgid "Skipping unknown argument \"%s\"."
msgstr "未知の引数「%s」を飛ばします。" msgstr "未知の引数「%s」を飛ばします。"
#: src/diffuse/main.py:1963 #: src/diffuse/main.py:1966
#, python-format #, python-format
msgid "Error processing argument \"%s\". Directory not expected." msgid "Error processing argument \"%s\". Directory not expected."
msgstr "" msgstr ""
@ -958,7 +963,3 @@ msgstr "全て選択"
#: src/diffuse/widgets.py:1868 #: src/diffuse/widgets.py:1868
msgid "Swap with Selected Pane" msgid "Swap with Selected Pane"
msgstr "選択された枠と交換" msgstr "選択された枠と交換"
#, python-format
#~ msgid "Column %d"
#~ msgstr "%d列"

255
po/ko.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: diffuse-svn r316\n" "Project-Id-Version: diffuse-svn r316\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-23 19:48-0400\n" "POT-Creation-Date: 2022-10-23 20:00-0400\n"
"PO-Revision-Date: 2022-04-04 12:18-0400\n" "PO-Revision-Date: 2022-04-04 12:18-0400\n"
"Last-Translator: Kang Bundo <bundo@bundo.biz>\n" "Last-Translator: Kang Bundo <bundo@bundo.biz>\n"
"Language-Team: Korean\n" "Language-Team: Korean\n"
@ -95,40 +95,45 @@ msgstr "파일로 저장"
msgid "Save File As..." msgid "Save File As..."
msgstr "파일로 저장..." msgstr "파일로 저장..."
#: src/diffuse/main.py:288 #: src/diffuse/main.py:217
#, python-format
msgid "Column %d"
msgstr "%d열"
#: src/diffuse/main.py:291
msgid "Save changes before loading the new file?" msgid "Save changes before loading the new file?"
msgstr "새 파일을 불러오기 전에 변경된 데이터를 저장할까요?" msgstr "새 파일을 불러오기 전에 변경된 데이터를 저장할까요?"
#: src/diffuse/main.py:399 #: src/diffuse/main.py:402
#, python-format #, python-format
msgid "Error reading revision %(rev)s of %(file)s." msgid "Error reading revision %(rev)s of %(file)s."
msgstr "%(file)s %(rev)s는 수정된점을 가져올 때 오류가 발생했습니다." msgstr "%(file)s %(rev)s는 수정된점을 가져올 때 오류가 발생했습니다."
#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #: src/diffuse/main.py:405 src/diffuse/main.py:1860
#, python-format #, python-format
msgid "Error reading %s." msgid "Error reading %s."
msgstr "%s를 읽어올 때 오류가 발생했습니다." msgstr "%s를 읽어올 때 오류가 발생했습니다."
#: src/diffuse/main.py:424 #: src/diffuse/main.py:427
msgid "Open File" msgid "Open File"
msgstr "열기" msgstr "열기"
#: src/diffuse/main.py:481 #: src/diffuse/main.py:484
#, python-format #, python-format
msgid "The file %s changed on disk. Do you want to reload the file?" msgid "The file %s changed on disk. Do you want to reload the file?"
msgstr "%s 파일이 변경된 것 같습니다. 해당 파일을 다시 불러 오시겠습니까?" msgstr "%s 파일이 변경된 것 같습니다. 해당 파일을 다시 불러 오시겠습니까?"
#: src/diffuse/main.py:507 #: src/diffuse/main.py:510
#, python-format #, python-format
msgid "Save %(title)s Pane %(pane)d" msgid "Save %(title)s Pane %(pane)d"
msgstr "%(title)s %(pane)d번째 프레임을 저장" msgstr "%(title)s %(pane)d번째 프레임을 저장"
#: src/diffuse/main.py:539 #: src/diffuse/main.py:542
#, python-format #, python-format
msgid "A file named %s already exists. Do you want to overwrite it?" msgid "A file named %s already exists. Do you want to overwrite it?"
msgstr "%s라는 파일이 이미 있습니다. 그것을 덮어 쓰시겠습니까?" msgstr "%s라는 파일이 이미 있습니다. 그것을 덮어 쓰시겠습니까?"
#: src/diffuse/main.py:546 #: src/diffuse/main.py:549
#, python-format #, python-format
msgid "" msgid ""
"The file %s has been modified by another process since reading it. If you save, " "The file %s has been modified by another process since reading it. If you save, "
@ -137,25 +142,25 @@ msgstr ""
"%s 파일은 수정되었습니다. 저장하게되면 이러한 변경 내용이 손실될 수 있습니다. 저장" "%s 파일은 수정되었습니다. 저장하게되면 이러한 변경 내용이 손실될 수 있습니다. 저장"
"하시겠습니까?" "하시겠습니까?"
#: src/diffuse/main.py:588 #: src/diffuse/main.py:591
#, python-format #, python-format
msgid "Error encoding to %s." msgid "Error encoding to %s."
msgstr "%s 바꾸는 데 오류가 발생했습니다." msgstr "%s 바꾸는 데 오류가 발생했습니다."
#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #: src/diffuse/main.py:595 src/diffuse/preferences.py:300
#, python-format #, python-format
msgid "Error writing %s." msgid "Error writing %s."
msgstr "%s에 쓸 때 오류가 발생했습니다." msgstr "%s에 쓸 때 오류가 발생했습니다."
#: src/diffuse/main.py:622 #: src/diffuse/main.py:625
msgid "Go To Line..." msgid "Go To Line..."
msgstr "줄로 이동..." msgstr "줄로 이동..."
#: src/diffuse/main.py:623 #: src/diffuse/main.py:626
msgid "Line Number: " msgid "Line Number: "
msgstr "줄번호: " msgstr "줄번호: "
#: src/diffuse/main.py:654 #: src/diffuse/main.py:657
msgid "" msgid ""
"Press the enter key or double click to edit. Press the space bar or use the RMB " "Press the enter key or double click to edit. Press the space bar or use the RMB "
"menu to manually align." "menu to manually align."
@ -163,11 +168,11 @@ msgstr ""
"편집하려면 엔터키를 누르거나 두 번 클릭합니다. 수동으로 정렬하기 위해 스페이스 바" "편집하려면 엔터키를 누르거나 두 번 클릭합니다. 수동으로 정렬하기 위해 스페이스 바"
"를 누르거나, RMB를 사용합니다." "를 누르거나, RMB를 사용합니다."
#: src/diffuse/main.py:658 #: src/diffuse/main.py:661
msgid "Press the escape key to finish editing." msgid "Press the escape key to finish editing."
msgstr "ESC 키를 눌러 편집을 끝냅니다." msgstr "ESC 키를 눌러 편집을 끝냅니다."
#: src/diffuse/main.py:661 #: src/diffuse/main.py:664
msgid "" msgid ""
"Select target line and press the space bar to align. Press the escape key to " "Select target line and press the space bar to align. Press the escape key to "
"cancel." "cancel."
@ -175,425 +180,425 @@ msgstr ""
"목표 행을 선택하고 스페이스 바를 누르면 정렬합니다. 취소하려면 ESC 키를 누르십시" "목표 행을 선택하고 스페이스 바를 누르면 정렬합니다. 취소하려면 ESC 키를 누르십시"
"오." "오."
#: src/diffuse/main.py:784 #: src/diffuse/main.py:787
msgid "_File" msgid "_File"
msgstr "파일(_F)" msgstr "파일(_F)"
#: src/diffuse/main.py:785 #: src/diffuse/main.py:788
msgid "_Open File..." msgid "_Open File..."
msgstr "파일 열기...(_O)" msgstr "파일 열기...(_O)"
#: src/diffuse/main.py:786 #: src/diffuse/main.py:789
msgid "Open File In New _Tab..." msgid "Open File In New _Tab..."
msgstr "새 탭에서 열기...(_T)" msgstr "새 탭에서 열기...(_T)"
#: src/diffuse/main.py:787 #: src/diffuse/main.py:790
msgid "Open _Modified Files..." msgid "Open _Modified Files..."
msgstr "변경 파일 열기...(_M)" msgstr "변경 파일 열기...(_M)"
#: src/diffuse/main.py:788 #: src/diffuse/main.py:791
msgid "Open Commi_t..." msgid "Open Commi_t..."
msgstr "커밋 열기..." msgstr "커밋 열기..."
#: src/diffuse/main.py:789 #: src/diffuse/main.py:792
msgid "_Reload File" msgid "_Reload File"
msgstr "파일 다시 읽기(_R)" msgstr "파일 다시 읽기(_R)"
#: src/diffuse/main.py:791 #: src/diffuse/main.py:794
msgid "_Save File" msgid "_Save File"
msgstr "파일 저장(_S)" msgstr "파일 저장(_S)"
#: src/diffuse/main.py:792 #: src/diffuse/main.py:795
msgid "Save File _As..." msgid "Save File _As..."
msgstr "파일로 저장...(_A)" msgstr "파일로 저장...(_A)"
#: src/diffuse/main.py:793 #: src/diffuse/main.py:796
msgid "Save A_ll" msgid "Save A_ll"
msgstr "전체 저장(_L)" msgstr "전체 저장(_L)"
#: src/diffuse/main.py:795 #: src/diffuse/main.py:798
msgid "New _2-Way File Merge" msgid "New _2-Way File Merge"
msgstr "새로운 2개의 파일 비교(_2)" msgstr "새로운 2개의 파일 비교(_2)"
#: src/diffuse/main.py:796 #: src/diffuse/main.py:799
msgid "New _3-Way File Merge" msgid "New _3-Way File Merge"
msgstr "새로운 3개의 파일 비교(_3)" msgstr "새로운 3개의 파일 비교(_3)"
#: src/diffuse/main.py:797 #: src/diffuse/main.py:800
msgid "New _N-Way File Merge..." msgid "New _N-Way File Merge..."
msgstr "새로운 여러개의 파일 비교...(_N)" msgstr "새로운 여러개의 파일 비교...(_N)"
#: src/diffuse/main.py:799 #: src/diffuse/main.py:802
msgid "_Close Tab" msgid "_Close Tab"
msgstr "탭 닫기(_C)" msgstr "탭 닫기(_C)"
#: src/diffuse/main.py:800 #: src/diffuse/main.py:803
msgid "_Undo Close Tab" msgid "_Undo Close Tab"
msgstr "탭 닫기 취소(_U)" msgstr "탭 닫기 취소(_U)"
#: src/diffuse/main.py:801 #: src/diffuse/main.py:804
msgid "_Quit" msgid "_Quit"
msgstr "종료(_Q)" msgstr "종료(_Q)"
#: src/diffuse/main.py:804 #: src/diffuse/main.py:807
msgid "_Edit" msgid "_Edit"
msgstr "편집(_E)" msgstr "편집(_E)"
#: src/diffuse/main.py:805 #: src/diffuse/main.py:808
msgid "_Undo" msgid "_Undo"
msgstr "실행 취소(_U)" msgstr "실행 취소(_U)"
#: src/diffuse/main.py:806 #: src/diffuse/main.py:809
msgid "_Redo" msgid "_Redo"
msgstr "다시(_R)" msgstr "다시(_R)"
#: src/diffuse/main.py:808 #: src/diffuse/main.py:811
msgid "Cu_t" msgid "Cu_t"
msgstr "잘라내기(_T)" msgstr "잘라내기(_T)"
#: src/diffuse/main.py:809 #: src/diffuse/main.py:812
msgid "_Copy" msgid "_Copy"
msgstr "복사(_C)" msgstr "복사(_C)"
#: src/diffuse/main.py:810 #: src/diffuse/main.py:813
msgid "_Paste" msgid "_Paste"
msgstr "붙여넣기(_P)" msgstr "붙여넣기(_P)"
#: src/diffuse/main.py:812 #: src/diffuse/main.py:815
msgid "Select _All" msgid "Select _All"
msgstr "모두 선택(_A)" msgstr "모두 선택(_A)"
#: src/diffuse/main.py:813 #: src/diffuse/main.py:816
msgid "C_lear Edits" msgid "C_lear Edits"
msgstr "편집 삭제(_L)" msgstr "편집 삭제(_L)"
#: src/diffuse/main.py:814 #: src/diffuse/main.py:817
msgid "_Dismiss All Edits" msgid "_Dismiss All Edits"
msgstr "모든 편집을 취소(_D)" msgstr "모든 편집을 취소(_D)"
#: src/diffuse/main.py:816 #: src/diffuse/main.py:819
msgid "_Find..." msgid "_Find..."
msgstr "찾기...(_F)" msgstr "찾기...(_F)"
#: src/diffuse/main.py:817 #: src/diffuse/main.py:820
msgid "Find _Next" msgid "Find _Next"
msgstr "다음 찾기(_N)" msgstr "다음 찾기(_N)"
#: src/diffuse/main.py:818 #: src/diffuse/main.py:821
msgid "Find Pre_vious" msgid "Find Pre_vious"
msgstr "이전 찾기(_V)" msgstr "이전 찾기(_V)"
#: src/diffuse/main.py:819 #: src/diffuse/main.py:822
msgid "_Go To Line..." msgid "_Go To Line..."
msgstr "줄로 이동...(_G)" msgstr "줄로 이동...(_G)"
#: src/diffuse/main.py:821 #: src/diffuse/main.py:824
msgid "Pr_eferences..." msgid "Pr_eferences..."
msgstr "기본 설정...(_E)" msgstr "기본 설정...(_E)"
#: src/diffuse/main.py:825 #: src/diffuse/main.py:828
msgid "None" msgid "None"
msgstr "없음" msgstr "없음"
#: src/diffuse/main.py:843 #: src/diffuse/main.py:846
msgid "_View" msgid "_View"
msgstr "보기(_V)" msgstr "보기(_V)"
#: src/diffuse/main.py:844 #: src/diffuse/main.py:847
msgid "_Syntax Highlighting" msgid "_Syntax Highlighting"
msgstr "구문 강조(_S)" msgstr "구문 강조(_S)"
#: src/diffuse/main.py:846 #: src/diffuse/main.py:849
msgid "Re_align All" msgid "Re_align All"
msgstr "전체 다시 정렬(_A)" msgstr "전체 다시 정렬(_A)"
#: src/diffuse/main.py:847 #: src/diffuse/main.py:850
msgid "_Isolate" msgid "_Isolate"
msgstr "분리(_I)" msgstr "분리(_I)"
#: src/diffuse/main.py:849 #: src/diffuse/main.py:852
msgid "_First Difference" msgid "_First Difference"
msgstr "첫번째 차이(_F)" msgstr "첫번째 차이(_F)"
#: src/diffuse/main.py:850 #: src/diffuse/main.py:853
msgid "_Previous Difference" msgid "_Previous Difference"
msgstr "이전 차이(_P)" msgstr "이전 차이(_P)"
#: src/diffuse/main.py:851 #: src/diffuse/main.py:854
msgid "_Next Difference" msgid "_Next Difference"
msgstr "다음 차이(_N)" msgstr "다음 차이(_N)"
#: src/diffuse/main.py:852 #: src/diffuse/main.py:855
msgid "_Last Difference" msgid "_Last Difference"
msgstr "마지막 차이(_L)" msgstr "마지막 차이(_L)"
#: src/diffuse/main.py:854 #: src/diffuse/main.py:857
msgid "Fir_st Tab" msgid "Fir_st Tab"
msgstr "첫번째 탭(_S)" msgstr "첫번째 탭(_S)"
#: src/diffuse/main.py:855 #: src/diffuse/main.py:858
msgid "Pre_vious Tab" msgid "Pre_vious Tab"
msgstr "이전 탭으로(_V)" msgstr "이전 탭으로(_V)"
#: src/diffuse/main.py:856 #: src/diffuse/main.py:859
msgid "Next _Tab" msgid "Next _Tab"
msgstr "다음 탭으로(_T)" msgstr "다음 탭으로(_T)"
#: src/diffuse/main.py:857 #: src/diffuse/main.py:860
msgid "Las_t Tab" msgid "Las_t Tab"
msgstr "마지막 탭(_T)" msgstr "마지막 탭(_T)"
#: src/diffuse/main.py:859 #: src/diffuse/main.py:862
msgid "Shift Pane _Right" msgid "Shift Pane _Right"
msgstr "페널을 오른쪽으로 이동(_R)" msgstr "페널을 오른쪽으로 이동(_R)"
#: src/diffuse/main.py:860 #: src/diffuse/main.py:863
msgid "Shift Pane _Left" msgid "Shift Pane _Left"
msgstr "페널을 왼쪽으로 이동(_L)" msgstr "페널을 왼쪽으로 이동(_L)"
#: src/diffuse/main.py:863 #: src/diffuse/main.py:866
msgid "F_ormat" msgid "F_ormat"
msgstr "형식(_O)" msgstr "형식(_O)"
#: src/diffuse/main.py:864 #: src/diffuse/main.py:867
msgid "Convert To _Upper Case" msgid "Convert To _Upper Case"
msgstr "대문자로 변환(_U)" msgstr "대문자로 변환(_U)"
#: src/diffuse/main.py:865 #: src/diffuse/main.py:868
msgid "Convert To _Lower Case" msgid "Convert To _Lower Case"
msgstr "소문자로 변환(_L)" msgstr "소문자로 변환(_L)"
#: src/diffuse/main.py:867 #: src/diffuse/main.py:870
msgid "Sort Lines In _Ascending Order" msgid "Sort Lines In _Ascending Order"
msgstr "행을 오름차순으로 정렬(_A)" msgstr "행을 오름차순으로 정렬(_A)"
#: src/diffuse/main.py:868 #: src/diffuse/main.py:871
msgid "Sort Lines In D_escending Order" msgid "Sort Lines In D_escending Order"
msgstr "행을 내림차순으로 정렬(_E)" msgstr "행을 내림차순으로 정렬(_E)"
#: src/diffuse/main.py:870 #: src/diffuse/main.py:873
msgid "Remove Trailing _White Space" msgid "Remove Trailing _White Space"
msgstr "후행 공백을 제거(_W)" msgstr "후행 공백을 제거(_W)"
#: src/diffuse/main.py:871 #: src/diffuse/main.py:874
msgid "Convert Tabs To _Spaces" msgid "Convert Tabs To _Spaces"
msgstr "탭을 공백으로 변환(_S)" msgstr "탭을 공백으로 변환(_S)"
#: src/diffuse/main.py:872 #: src/diffuse/main.py:875
msgid "Convert Leading Spaces To _Tabs" msgid "Convert Leading Spaces To _Tabs"
msgstr "선행 공백을 탭으로 변환(_T)" msgstr "선행 공백을 탭으로 변환(_T)"
#: src/diffuse/main.py:874 #: src/diffuse/main.py:877
msgid "_Increase Indenting" msgid "_Increase Indenting"
msgstr "들여쓰기(_I)" msgstr "들여쓰기(_I)"
#: src/diffuse/main.py:875 #: src/diffuse/main.py:878
msgid "De_crease Indenting" msgid "De_crease Indenting"
msgstr "내어 쓰기(_C)" msgstr "내어 쓰기(_C)"
#: src/diffuse/main.py:877 #: src/diffuse/main.py:880
msgid "Convert To _DOS Format" msgid "Convert To _DOS Format"
msgstr "DOS 형식으로 변환(_D)" msgstr "DOS 형식으로 변환(_D)"
#: src/diffuse/main.py:878 #: src/diffuse/main.py:881
msgid "Convert To _Mac Format" msgid "Convert To _Mac Format"
msgstr "Mac 형식으로 변환(_M)" msgstr "Mac 형식으로 변환(_M)"
#: src/diffuse/main.py:879 #: src/diffuse/main.py:882
msgid "Convert To Uni_x Format" msgid "Convert To Uni_x Format"
msgstr "Unix 형식으로 변환(_X)" msgstr "Unix 형식으로 변환(_X)"
#: src/diffuse/main.py:882 #: src/diffuse/main.py:885
msgid "_Merge" msgid "_Merge"
msgstr "병합(_M)" msgstr "병합(_M)"
#: src/diffuse/main.py:883 #: src/diffuse/main.py:886
msgid "Copy Selection _Right" msgid "Copy Selection _Right"
msgstr "선택을 오른쪽으로 복사(_R)" msgstr "선택을 오른쪽으로 복사(_R)"
#: src/diffuse/main.py:884 #: src/diffuse/main.py:887
msgid "Copy Selection _Left" msgid "Copy Selection _Left"
msgstr "선택을 왼쪽으로 복사(_L)" msgstr "선택을 왼쪽으로 복사(_L)"
#: src/diffuse/main.py:886 #: src/diffuse/main.py:889
msgid "Copy Left _Into Selection" msgid "Copy Left _Into Selection"
msgstr "왼쪽에서 선택한 프레임에 복사(_I)" msgstr "왼쪽에서 선택한 프레임에 복사(_I)"
#: src/diffuse/main.py:887 #: src/diffuse/main.py:890
msgid "Copy Right I_nto Selection" msgid "Copy Right I_nto Selection"
msgstr "오른쪽에서 선택한 프레임에 복사(_N)" msgstr "오른쪽에서 선택한 프레임에 복사(_N)"
#: src/diffuse/main.py:888 #: src/diffuse/main.py:891
msgid "_Merge From Left Then Right" msgid "_Merge From Left Then Right"
msgstr "왼쪽에서 합병 후 오른쪽에서 병합(_M)" msgstr "왼쪽에서 합병 후 오른쪽에서 병합(_M)"
#: src/diffuse/main.py:889 #: src/diffuse/main.py:892
msgid "M_erge From Right Then Left" msgid "M_erge From Right Then Left"
msgstr "오른쪽에서 병합 후 왼쪽에서 합병(_E)" msgstr "오른쪽에서 병합 후 왼쪽에서 합병(_E)"
#: src/diffuse/main.py:892 #: src/diffuse/main.py:895
msgid "_Help" msgid "_Help"
msgstr "도움말(_H)" msgstr "도움말(_H)"
#: src/diffuse/main.py:893 #: src/diffuse/main.py:896
msgid "_Help Contents..." msgid "_Help Contents..."
msgstr "도움말 목차...(_H)" msgstr "도움말 목차...(_H)"
#: src/diffuse/main.py:895 #: src/diffuse/main.py:898
#, python-format #, python-format
msgid "_About %s..." msgid "_About %s..."
msgstr "%s 정보...(_A)" msgstr "%s 정보...(_A)"
#: src/diffuse/main.py:910 #: src/diffuse/main.py:913
msgid "New 2-Way File Merge" msgid "New 2-Way File Merge"
msgstr "새로운 2개의 파일 비교" msgstr "새로운 2개의 파일 비교"
#: src/diffuse/main.py:911 #: src/diffuse/main.py:914
msgid "New 3-Way File Merge" msgid "New 3-Way File Merge"
msgstr "새로운 3개의 파일 비교" msgstr "새로운 3개의 파일 비교"
#: src/diffuse/main.py:913 #: src/diffuse/main.py:916
msgid "Realign All" msgid "Realign All"
msgstr "전체 다시 정렬" msgstr "전체 다시 정렬"
#: src/diffuse/main.py:914 #: src/diffuse/main.py:917
msgid "First Difference" msgid "First Difference"
msgstr "첫번째 차이" msgstr "첫번째 차이"
#: src/diffuse/main.py:915 #: src/diffuse/main.py:918
msgid "Previous Difference" msgid "Previous Difference"
msgstr "이전 차이" msgstr "이전 차이"
#: src/diffuse/main.py:916 #: src/diffuse/main.py:919
msgid "Next Difference" msgid "Next Difference"
msgstr "다음 차이" msgstr "다음 차이"
#: src/diffuse/main.py:917 #: src/diffuse/main.py:920
msgid "Last Difference" msgid "Last Difference"
msgstr "마지막 차이" msgstr "마지막 차이"
#: src/diffuse/main.py:919 #: src/diffuse/main.py:922
msgid "Copy Selection Right" msgid "Copy Selection Right"
msgstr "선택을 오른쪽으로 복사" msgstr "선택을 오른쪽으로 복사"
#: src/diffuse/main.py:920 #: src/diffuse/main.py:923
msgid "Copy Selection Left" msgid "Copy Selection Left"
msgstr "선택을 왼쪽으로 복사" msgstr "선택을 왼쪽으로 복사"
#: src/diffuse/main.py:921 #: src/diffuse/main.py:924
msgid "Copy Left Into Selection" msgid "Copy Left Into Selection"
msgstr "왼쪽에서 선택한 프레임에 복사" msgstr "왼쪽에서 선택한 프레임에 복사"
#: src/diffuse/main.py:922 #: src/diffuse/main.py:925
msgid "Copy Right Into Selection" msgid "Copy Right Into Selection"
msgstr "오른쪽에서 선택한 프레임에 복사" msgstr "오른쪽에서 선택한 프레임에 복사"
#: src/diffuse/main.py:923 #: src/diffuse/main.py:926
msgid "Merge From Left Then Right" msgid "Merge From Left Then Right"
msgstr "왼쪽에서 합병 후 오른쪽에서 병합" msgstr "왼쪽에서 합병 후 오른쪽에서 병합"
#: src/diffuse/main.py:924 #: src/diffuse/main.py:927
msgid "Merge From Right Then Left" msgid "Merge From Right Then Left"
msgstr "오른쪽에서 병합 후 왼쪽에서 합병" msgstr "오른쪽에서 병합 후 왼쪽에서 합병"
#: src/diffuse/main.py:926 #: src/diffuse/main.py:929
msgid "Undo" msgid "Undo"
msgstr "실행 취소" msgstr "실행 취소"
#: src/diffuse/main.py:927 #: src/diffuse/main.py:930
msgid "Redo" msgid "Redo"
msgstr "작업 재 실행" msgstr "작업 재 실행"
#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 #: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
msgid "Cut" msgid "Cut"
msgstr "잘라내기" msgstr "잘라내기"
#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 #: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
msgid "Copy" msgid "Copy"
msgstr "복사" msgstr "복사"
#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 #: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
msgid "Paste" msgid "Paste"
msgstr "붙여넣기" msgstr "붙여넣기"
#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 #: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
msgid "Clear Edits" msgid "Clear Edits"
msgstr "편집 삭제" msgstr "편집 삭제"
#: src/diffuse/main.py:1054 #: src/diffuse/main.py:1057
msgid "Some files have unsaved changes. Select the files to save before closing." msgid "Some files have unsaved changes. Select the files to save before closing."
msgstr "" msgstr ""
"변경 내용이 저장되지 않은 파일이 있습니다. 종료하기 전에 저장할 파일을 선택합니다." "변경 내용이 저장되지 않은 파일이 있습니다. 종료하기 전에 저장할 파일을 선택합니다."
#: src/diffuse/main.py:1068 #: src/diffuse/main.py:1071
msgid "Tab" msgid "Tab"
msgstr "탭" msgstr "탭"
#: src/diffuse/main.py:1073 #: src/diffuse/main.py:1076
msgid "Pane" msgid "Pane"
msgstr "패널" msgstr "패널"
#: src/diffuse/main.py:1084 #: src/diffuse/main.py:1087
msgid "Close _Without Saving" msgid "Close _Without Saving"
msgstr "저장하지 않고 닫기(_W)" msgstr "저장하지 않고 닫기(_W)"
#: src/diffuse/main.py:1123 #: src/diffuse/main.py:1126
#, python-format #, python-format
msgid "Closing this tab will quit %s." msgid "Closing this tab will quit %s."
msgstr "이 탭을 닫으면, %s 종료합니다." msgstr "이 탭을 닫으면, %s 종료합니다."
#: src/diffuse/main.py:1206 #: src/diffuse/main.py:1209
#, python-format #, python-format
msgid "File Merge %d" msgid "File Merge %d"
msgstr "파일 병합 %d" msgstr "파일 병합 %d"
#: src/diffuse/main.py:1312 #: src/diffuse/main.py:1315
#, python-format #, python-format
msgid "Error retrieving commits for %s." msgid "Error retrieving commits for %s."
msgstr "%s의 커밋을 가져오는 동안 오류가 발생했습니다." msgstr "%s의 커밋을 가져오는 동안 오류가 발생했습니다."
#: src/diffuse/main.py:1344 #: src/diffuse/main.py:1347
#, python-format #, python-format
msgid "Error retrieving modifications for %s." msgid "Error retrieving modifications for %s."
msgstr "%s의 변경을 가져오는 중 오류가 발생했습니다." msgstr "%s의 변경을 가져오는 중 오류가 발생했습니다."
#: src/diffuse/main.py:1377 #: src/diffuse/main.py:1380
msgid "Open File In New Tab" msgid "Open File In New Tab"
msgstr "새 탭에서 열기" msgstr "새 탭에서 열기"
#: src/diffuse/main.py:1400 #: src/diffuse/main.py:1403
msgid "Choose Folder With Modified Files" msgid "Choose Folder With Modified Files"
msgstr "변경 된 파일이 있는 폴더를 선택" msgstr "변경 된 파일이 있는 폴더를 선택"
#: src/diffuse/main.py:1418 #: src/diffuse/main.py:1421
msgid "No modified files found." msgid "No modified files found."
msgstr "변경 된 파일을 찾을 수 없습니다." msgstr "변경 된 파일을 찾을 수 없습니다."
#: src/diffuse/main.py:1424 #: src/diffuse/main.py:1427
msgid "Choose Folder With Commit" msgid "Choose Folder With Commit"
msgstr "커밋이있는 폴더를 선택" msgstr "커밋이있는 폴더를 선택"
#: src/diffuse/main.py:1444 #: src/diffuse/main.py:1447
msgid "No committed files found." msgid "No committed files found."
msgstr "커밋된 파일을 찾을 수 없습니다." msgstr "커밋된 파일을 찾을 수 없습니다."
#: src/diffuse/main.py:1480 #: src/diffuse/main.py:1483
msgid "New N-Way File Merge..." msgid "New N-Way File Merge..."
msgstr "새로운 여러개의 파일 비교..." msgstr "새로운 여러개의 파일 비교..."
#: src/diffuse/main.py:1481 #: src/diffuse/main.py:1484
msgid "Number of panes: " msgid "Number of panes: "
msgstr "패널수: " msgstr "패널수: "
#: src/diffuse/main.py:1555 #: src/diffuse/main.py:1558
msgid "Phrase not found. Continue from the end of the file?" msgid "Phrase not found. Continue from the end of the file?"
msgstr "문자열을 찾을 수 없습니다. 파일의 끝에서 계속하시겠습니까?" msgstr "문자열을 찾을 수 없습니다. 파일의 끝에서 계속하시겠습니까?"
#: src/diffuse/main.py:1557 #: src/diffuse/main.py:1560
msgid "Phrase not found. Continue from the start of the file?" msgid "Phrase not found. Continue from the start of the file?"
msgstr "문자열을 찾을 수 없습니다. 파일의 시작에서 다시하시겠습니까?" msgstr "문자열을 찾을 수 없습니다. 파일의 시작에서 다시하시겠습니까?"
#: src/diffuse/main.py:1778 #: src/diffuse/main.py:1781
#, fuzzy #, fuzzy
msgid "" msgid ""
"Usage:\n" "Usage:\n"
@ -671,16 +676,16 @@ msgstr ""
" ( -i | --ignore-case ) 대소문자 차이를 무시\n" " ( -i | --ignore-case ) 대소문자 차이를 무시\n"
" ( -w | --ignore-all-space ) 공백을 무시" " ( -w | --ignore-all-space ) 공백을 무시"
#: src/diffuse/main.py:1945 #: src/diffuse/main.py:1948
msgid "Error parsing line number." msgid "Error parsing line number."
msgstr "줄 번호를 구문 분석하는 동안 오류가 발생했습니다." msgstr "줄 번호를 구문 분석하는 동안 오류가 발생했습니다."
#: src/diffuse/main.py:1955 #: src/diffuse/main.py:1958
#, python-format #, python-format
msgid "Skipping unknown argument \"%s\"." msgid "Skipping unknown argument \"%s\"."
msgstr "알수 없는 인수「%s」 유지 합니다." msgstr "알수 없는 인수「%s」 유지 합니다."
#: src/diffuse/main.py:1963 #: src/diffuse/main.py:1966
#, python-format #, python-format
msgid "Error processing argument \"%s\". Directory not expected." msgid "Error processing argument \"%s\". Directory not expected."
msgstr "%s 인수를 처리하는 동안 오류가 발생했습니다. 디렉토리를 예측할 수 없습니다." msgstr "%s 인수를 처리하는 동안 오류가 발생했습니다. 디렉토리를 예측할 수 없습니다."
@ -956,7 +961,3 @@ msgstr "모두 선택"
#: src/diffuse/widgets.py:1868 #: src/diffuse/widgets.py:1868
msgid "Swap with Selected Pane" msgid "Swap with Selected Pane"
msgstr "선택된 프레임 대신" msgstr "선택된 프레임 대신"
#, python-format
#~ msgid "Column %d"
#~ msgstr "%d열"

255
po/pl.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: diffuse-0.4.8\n" "Project-Id-Version: diffuse-0.4.8\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-23 19:48-0400\n" "POT-Creation-Date: 2022-10-23 20:00-0400\n"
"PO-Revision-Date: 2022-04-04 12:19-0400\n" "PO-Revision-Date: 2022-04-04 12:19-0400\n"
"Last-Translator: Miś Uszatek <adres.email@ymail.com>, 2012\n" "Last-Translator: Miś Uszatek <adres.email@ymail.com>, 2012\n"
"Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n" "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@ -97,40 +97,45 @@ msgstr "Zapisz Plik"
msgid "Save File As..." msgid "Save File As..."
msgstr "Zapisz Plik Jako..." msgstr "Zapisz Plik Jako..."
#: src/diffuse/main.py:288 #: src/diffuse/main.py:217
#, python-format
msgid "Column %d"
msgstr "Kolumna %d"
#: src/diffuse/main.py:291
msgid "Save changes before loading the new file?" msgid "Save changes before loading the new file?"
msgstr "Zapisać zmiany przed wczytaniem nowego pliku?" msgstr "Zapisać zmiany przed wczytaniem nowego pliku?"
#: src/diffuse/main.py:399 #: src/diffuse/main.py:402
#, python-format #, python-format
msgid "Error reading revision %(rev)s of %(file)s." msgid "Error reading revision %(rev)s of %(file)s."
msgstr "Błąd odczytu rewizji %(rev)s z %(file)s." msgstr "Błąd odczytu rewizji %(rev)s z %(file)s."
#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #: src/diffuse/main.py:405 src/diffuse/main.py:1860
#, python-format #, python-format
msgid "Error reading %s." msgid "Error reading %s."
msgstr "Błąd odczytu %s." msgstr "Błąd odczytu %s."
#: src/diffuse/main.py:424 #: src/diffuse/main.py:427
msgid "Open File" msgid "Open File"
msgstr "Otwórz Plik" msgstr "Otwórz Plik"
#: src/diffuse/main.py:481 #: src/diffuse/main.py:484
#, python-format #, python-format
msgid "The file %s changed on disk. Do you want to reload the file?" msgid "The file %s changed on disk. Do you want to reload the file?"
msgstr "Plik %s został zmieniony na dysku. Czy chcesz odświeżyć plik?" msgstr "Plik %s został zmieniony na dysku. Czy chcesz odświeżyć plik?"
#: src/diffuse/main.py:507 #: src/diffuse/main.py:510
#, python-format #, python-format
msgid "Save %(title)s Pane %(pane)d" msgid "Save %(title)s Pane %(pane)d"
msgstr "Zapisz %(title)s Okno %(pane)d" msgstr "Zapisz %(title)s Okno %(pane)d"
#: src/diffuse/main.py:539 #: src/diffuse/main.py:542
#, python-format #, python-format
msgid "A file named %s already exists. Do you want to overwrite it?" msgid "A file named %s already exists. Do you want to overwrite it?"
msgstr "Plik o nazwie %s już istnieje. Czy chcesz go zastąpić?" msgstr "Plik o nazwie %s już istnieje. Czy chcesz go zastąpić?"
#: src/diffuse/main.py:546 #: src/diffuse/main.py:549
#, python-format #, python-format
msgid "" msgid ""
"The file %s has been modified by another process since reading it. If you save, " "The file %s has been modified by another process since reading it. If you save, "
@ -139,25 +144,25 @@ msgstr ""
"Plik %s został zmodyfikowany przez inny proces od chwili jego wczytania. Jeśli " "Plik %s został zmodyfikowany przez inny proces od chwili jego wczytania. Jeśli "
"zapiszesz, wszystkie zewnętrzne zmiany mogą zostać utracone. Zapisać pomimo to?" "zapiszesz, wszystkie zewnętrzne zmiany mogą zostać utracone. Zapisać pomimo to?"
#: src/diffuse/main.py:588 #: src/diffuse/main.py:591
#, python-format #, python-format
msgid "Error encoding to %s." msgid "Error encoding to %s."
msgstr "Błąd kodowania dla %s." msgstr "Błąd kodowania dla %s."
#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #: src/diffuse/main.py:595 src/diffuse/preferences.py:300
#, python-format #, python-format
msgid "Error writing %s." msgid "Error writing %s."
msgstr "Błąd zapisu %s." msgstr "Błąd zapisu %s."
#: src/diffuse/main.py:622 #: src/diffuse/main.py:625
msgid "Go To Line..." msgid "Go To Line..."
msgstr "Idź Do Linii..." msgstr "Idź Do Linii..."
#: src/diffuse/main.py:623 #: src/diffuse/main.py:626
msgid "Line Number: " msgid "Line Number: "
msgstr "Numer Linii: " msgstr "Numer Linii: "
#: src/diffuse/main.py:654 #: src/diffuse/main.py:657
msgid "" msgid ""
"Press the enter key or double click to edit. Press the space bar or use the RMB " "Press the enter key or double click to edit. Press the space bar or use the RMB "
"menu to manually align." "menu to manually align."
@ -165,11 +170,11 @@ msgstr ""
"Naciśnij klawisz Enter lub dwukrotnie kliknij aby edytować. Naciśnij klawisz " "Naciśnij klawisz Enter lub dwukrotnie kliknij aby edytować. Naciśnij klawisz "
"spacji lub użyć menu RMB, aby ręcznie ustawić." "spacji lub użyć menu RMB, aby ręcznie ustawić."
#: src/diffuse/main.py:658 #: src/diffuse/main.py:661
msgid "Press the escape key to finish editing." msgid "Press the escape key to finish editing."
msgstr "Naciśnij klawisz escape, aby zakończyć edycję." msgstr "Naciśnij klawisz escape, aby zakończyć edycję."
#: src/diffuse/main.py:661 #: src/diffuse/main.py:664
msgid "" msgid ""
"Select target line and press the space bar to align. Press the escape key to " "Select target line and press the space bar to align. Press the escape key to "
"cancel." "cancel."
@ -177,426 +182,426 @@ msgstr ""
"Wybierz linie docelową i naciśnij klawisz spacji aby wyrównać. Naciśnij klawisz " "Wybierz linie docelową i naciśnij klawisz spacji aby wyrównać. Naciśnij klawisz "
"Escape, aby anulować." "Escape, aby anulować."
#: src/diffuse/main.py:784 #: src/diffuse/main.py:787
msgid "_File" msgid "_File"
msgstr "_Plik" msgstr "_Plik"
#: src/diffuse/main.py:785 #: src/diffuse/main.py:788
msgid "_Open File..." msgid "_Open File..."
msgstr "_Otwórz Plik..." msgstr "_Otwórz Plik..."
#: src/diffuse/main.py:786 #: src/diffuse/main.py:789
msgid "Open File In New _Tab..." msgid "Open File In New _Tab..."
msgstr "Otwórz Plik w Nowej _Karcie..." msgstr "Otwórz Plik w Nowej _Karcie..."
#: src/diffuse/main.py:787 #: src/diffuse/main.py:790
msgid "Open _Modified Files..." msgid "Open _Modified Files..."
msgstr "Otwórz _Zmodyfikowany Plik..." msgstr "Otwórz _Zmodyfikowany Plik..."
#: src/diffuse/main.py:788 #: src/diffuse/main.py:791
msgid "Open Commi_t..." msgid "Open Commi_t..."
msgstr "Otwórz Commi_t..." msgstr "Otwórz Commi_t..."
#: src/diffuse/main.py:789 #: src/diffuse/main.py:792
msgid "_Reload File" msgid "_Reload File"
msgstr "_Odśwież Plik" msgstr "_Odśwież Plik"
#: src/diffuse/main.py:791 #: src/diffuse/main.py:794
msgid "_Save File" msgid "_Save File"
msgstr "_Zapisz plik" msgstr "_Zapisz plik"
#: src/diffuse/main.py:792 #: src/diffuse/main.py:795
msgid "Save File _As..." msgid "Save File _As..."
msgstr "Zapisz Plik _Jako..." msgstr "Zapisz Plik _Jako..."
#: src/diffuse/main.py:793 #: src/diffuse/main.py:796
msgid "Save A_ll" msgid "Save A_ll"
msgstr "Zapisz W_szystko" msgstr "Zapisz W_szystko"
#: src/diffuse/main.py:795 #: src/diffuse/main.py:798
msgid "New _2-Way File Merge" msgid "New _2-Way File Merge"
msgstr "Nowy Łączenia _2 Plików" msgstr "Nowy Łączenia _2 Plików"
#: src/diffuse/main.py:796 #: src/diffuse/main.py:799
msgid "New _3-Way File Merge" msgid "New _3-Way File Merge"
msgstr "Nowy Łączenia _3 Plików" msgstr "Nowy Łączenia _3 Plików"
#: src/diffuse/main.py:797 #: src/diffuse/main.py:800
msgid "New _N-Way File Merge..." msgid "New _N-Way File Merge..."
msgstr "Nowy _N-Sposób Łączenia Pliku..." msgstr "Nowy _N-Sposób Łączenia Pliku..."
#: src/diffuse/main.py:799 #: src/diffuse/main.py:802
msgid "_Close Tab" msgid "_Close Tab"
msgstr "_Zamknij Kartę" msgstr "_Zamknij Kartę"
#: src/diffuse/main.py:800 #: src/diffuse/main.py:803
msgid "_Undo Close Tab" msgid "_Undo Close Tab"
msgstr "_Przywróć Zamkniętą Kartę" msgstr "_Przywróć Zamkniętą Kartę"
#: src/diffuse/main.py:801 #: src/diffuse/main.py:804
msgid "_Quit" msgid "_Quit"
msgstr "_Zamknij" msgstr "_Zamknij"
#: src/diffuse/main.py:804 #: src/diffuse/main.py:807
msgid "_Edit" msgid "_Edit"
msgstr "_Edytuj" msgstr "_Edytuj"
#: src/diffuse/main.py:805 #: src/diffuse/main.py:808
msgid "_Undo" msgid "_Undo"
msgstr "_Cofnij" msgstr "_Cofnij"
#: src/diffuse/main.py:806 #: src/diffuse/main.py:809
msgid "_Redo" msgid "_Redo"
msgstr "_Ponów" msgstr "_Ponów"
#: src/diffuse/main.py:808 #: src/diffuse/main.py:811
msgid "Cu_t" msgid "Cu_t"
msgstr "Wy_tnij" msgstr "Wy_tnij"
#: src/diffuse/main.py:809 #: src/diffuse/main.py:812
msgid "_Copy" msgid "_Copy"
msgstr "_Kopiuj" msgstr "_Kopiuj"
#: src/diffuse/main.py:810 #: src/diffuse/main.py:813
msgid "_Paste" msgid "_Paste"
msgstr "_Wklej" msgstr "_Wklej"
#: src/diffuse/main.py:812 #: src/diffuse/main.py:815
msgid "Select _All" msgid "Select _All"
msgstr "Zaznacz _Wszystko" msgstr "Zaznacz _Wszystko"
#: src/diffuse/main.py:813 #: src/diffuse/main.py:816
msgid "C_lear Edits" msgid "C_lear Edits"
msgstr "W_yczyść Edycje" msgstr "W_yczyść Edycje"
#: src/diffuse/main.py:814 #: src/diffuse/main.py:817
msgid "_Dismiss All Edits" msgid "_Dismiss All Edits"
msgstr "_Odrzuć Wszystkie Edycje" msgstr "_Odrzuć Wszystkie Edycje"
#: src/diffuse/main.py:816 #: src/diffuse/main.py:819
msgid "_Find..." msgid "_Find..."
msgstr "_Znajdź..." msgstr "_Znajdź..."
#: src/diffuse/main.py:817 #: src/diffuse/main.py:820
msgid "Find _Next" msgid "Find _Next"
msgstr "Znajdź _Następny" msgstr "Znajdź _Następny"
#: src/diffuse/main.py:818 #: src/diffuse/main.py:821
msgid "Find Pre_vious" msgid "Find Pre_vious"
msgstr "Znajdź Pop_rzedni" msgstr "Znajdź Pop_rzedni"
#: src/diffuse/main.py:819 #: src/diffuse/main.py:822
msgid "_Go To Line..." msgid "_Go To Line..."
msgstr "_Idź Do Linii..." msgstr "_Idź Do Linii..."
#: src/diffuse/main.py:821 #: src/diffuse/main.py:824
msgid "Pr_eferences..." msgid "Pr_eferences..."
msgstr "Pr_eferencje..." msgstr "Pr_eferencje..."
#: src/diffuse/main.py:825 #: src/diffuse/main.py:828
msgid "None" msgid "None"
msgstr "Brak" msgstr "Brak"
#: src/diffuse/main.py:843 #: src/diffuse/main.py:846
msgid "_View" msgid "_View"
msgstr "_Widok" msgstr "_Widok"
#: src/diffuse/main.py:844 #: src/diffuse/main.py:847
msgid "_Syntax Highlighting" msgid "_Syntax Highlighting"
msgstr "_Podświetlanie Składni" msgstr "_Podświetlanie Składni"
#: src/diffuse/main.py:846 #: src/diffuse/main.py:849
msgid "Re_align All" msgid "Re_align All"
msgstr "Wy_równaj Wszystko" msgstr "Wy_równaj Wszystko"
#: src/diffuse/main.py:847 #: src/diffuse/main.py:850
msgid "_Isolate" msgid "_Isolate"
msgstr "_Odizoluj" msgstr "_Odizoluj"
#: src/diffuse/main.py:849 #: src/diffuse/main.py:852
msgid "_First Difference" msgid "_First Difference"
msgstr "_Pierwsza Różnica" msgstr "_Pierwsza Różnica"
#: src/diffuse/main.py:850 #: src/diffuse/main.py:853
msgid "_Previous Difference" msgid "_Previous Difference"
msgstr "_Poprzednia Różnica" msgstr "_Poprzednia Różnica"
#: src/diffuse/main.py:851 #: src/diffuse/main.py:854
msgid "_Next Difference" msgid "_Next Difference"
msgstr "_Następna Różnica" msgstr "_Następna Różnica"
#: src/diffuse/main.py:852 #: src/diffuse/main.py:855
msgid "_Last Difference" msgid "_Last Difference"
msgstr "_Ostatnia Różnica" msgstr "_Ostatnia Różnica"
#: src/diffuse/main.py:854 #: src/diffuse/main.py:857
msgid "Fir_st Tab" msgid "Fir_st Tab"
msgstr "Pie_rwsza Karta" msgstr "Pie_rwsza Karta"
#: src/diffuse/main.py:855 #: src/diffuse/main.py:858
msgid "Pre_vious Tab" msgid "Pre_vious Tab"
msgstr "Pop_rzednia Karta" msgstr "Pop_rzednia Karta"
#: src/diffuse/main.py:856 #: src/diffuse/main.py:859
msgid "Next _Tab" msgid "Next _Tab"
msgstr "Następna _Karta" msgstr "Następna _Karta"
#: src/diffuse/main.py:857 #: src/diffuse/main.py:860
msgid "Las_t Tab" msgid "Las_t Tab"
msgstr "Osta_tnia Karta" msgstr "Osta_tnia Karta"
#: src/diffuse/main.py:859 #: src/diffuse/main.py:862
msgid "Shift Pane _Right" msgid "Shift Pane _Right"
msgstr "Przesuń Okno w _Prawo" msgstr "Przesuń Okno w _Prawo"
#: src/diffuse/main.py:860 #: src/diffuse/main.py:863
msgid "Shift Pane _Left" msgid "Shift Pane _Left"
msgstr "Przesuń Okno w _Lewo" msgstr "Przesuń Okno w _Lewo"
#: src/diffuse/main.py:863 #: src/diffuse/main.py:866
msgid "F_ormat" msgid "F_ormat"
msgstr "F_ormat" msgstr "F_ormat"
#: src/diffuse/main.py:864 #: src/diffuse/main.py:867
msgid "Convert To _Upper Case" msgid "Convert To _Upper Case"
msgstr "Konwertuj Na _Duże Litery" msgstr "Konwertuj Na _Duże Litery"
#: src/diffuse/main.py:865 #: src/diffuse/main.py:868
msgid "Convert To _Lower Case" msgid "Convert To _Lower Case"
msgstr "Konwertuj Na _Małe Litery" msgstr "Konwertuj Na _Małe Litery"
#: src/diffuse/main.py:867 #: src/diffuse/main.py:870
msgid "Sort Lines In _Ascending Order" msgid "Sort Lines In _Ascending Order"
msgstr "Sortuj Wiersze w Kolejności _Rosnącej" msgstr "Sortuj Wiersze w Kolejności _Rosnącej"
#: src/diffuse/main.py:868 #: src/diffuse/main.py:871
msgid "Sort Lines In D_escending Order" msgid "Sort Lines In D_escending Order"
msgstr "Sortuj Wiersze w Kolejności M_alejącej" msgstr "Sortuj Wiersze w Kolejności M_alejącej"
#: src/diffuse/main.py:870 #: src/diffuse/main.py:873
msgid "Remove Trailing _White Space" msgid "Remove Trailing _White Space"
msgstr "Usuń Zbędne Spacje" msgstr "Usuń Zbędne Spacje"
#: src/diffuse/main.py:871 #: src/diffuse/main.py:874
msgid "Convert Tabs To _Spaces" msgid "Convert Tabs To _Spaces"
msgstr "Konwertuj Tabulacje Na _Spacje" msgstr "Konwertuj Tabulacje Na _Spacje"
#: src/diffuse/main.py:872 #: src/diffuse/main.py:875
msgid "Convert Leading Spaces To _Tabs" msgid "Convert Leading Spaces To _Tabs"
msgstr "Konwertuj Spacje Na _Tabulacje" msgstr "Konwertuj Spacje Na _Tabulacje"
#: src/diffuse/main.py:874 #: src/diffuse/main.py:877
msgid "_Increase Indenting" msgid "_Increase Indenting"
msgstr "_Zwiększ Wcięcie" msgstr "_Zwiększ Wcięcie"
#: src/diffuse/main.py:875 #: src/diffuse/main.py:878
msgid "De_crease Indenting" msgid "De_crease Indenting"
msgstr "Zm_niejsz Wcięcie" msgstr "Zm_niejsz Wcięcie"
#: src/diffuse/main.py:877 #: src/diffuse/main.py:880
msgid "Convert To _DOS Format" msgid "Convert To _DOS Format"
msgstr "Konwertuj Do Formatu _DOS" msgstr "Konwertuj Do Formatu _DOS"
#: src/diffuse/main.py:878 #: src/diffuse/main.py:881
msgid "Convert To _Mac Format" msgid "Convert To _Mac Format"
msgstr "Konwertuj Do Formatu _Mac" msgstr "Konwertuj Do Formatu _Mac"
#: src/diffuse/main.py:879 #: src/diffuse/main.py:882
msgid "Convert To Uni_x Format" msgid "Convert To Uni_x Format"
msgstr "Konwertuj Do Formatu Uni_x" msgstr "Konwertuj Do Formatu Uni_x"
#: src/diffuse/main.py:882 #: src/diffuse/main.py:885
msgid "_Merge" msgid "_Merge"
msgstr "_Połącz" msgstr "_Połącz"
#: src/diffuse/main.py:883 #: src/diffuse/main.py:886
msgid "Copy Selection _Right" msgid "Copy Selection _Right"
msgstr "Skopiuj Zaznaczenie w _Prawo" msgstr "Skopiuj Zaznaczenie w _Prawo"
#: src/diffuse/main.py:884 #: src/diffuse/main.py:887
msgid "Copy Selection _Left" msgid "Copy Selection _Left"
msgstr "Skopiuj Zaznaczenie w _Lewo" msgstr "Skopiuj Zaznaczenie w _Lewo"
#: src/diffuse/main.py:886 #: src/diffuse/main.py:889
msgid "Copy Left _Into Selection" msgid "Copy Left _Into Selection"
msgstr "Skopiuj z Lewej _Do Zaznaczenia" msgstr "Skopiuj z Lewej _Do Zaznaczenia"
#: src/diffuse/main.py:887 #: src/diffuse/main.py:890
msgid "Copy Right I_nto Selection" msgid "Copy Right I_nto Selection"
msgstr "Skopiuj z Prawej _Do Zaznaczenia" msgstr "Skopiuj z Prawej _Do Zaznaczenia"
#: src/diffuse/main.py:888 #: src/diffuse/main.py:891
msgid "_Merge From Left Then Right" msgid "_Merge From Left Then Right"
msgstr "_Scal z Lewej Potem Prawej" msgstr "_Scal z Lewej Potem Prawej"
#: src/diffuse/main.py:889 #: src/diffuse/main.py:892
msgid "M_erge From Right Then Left" msgid "M_erge From Right Then Left"
msgstr "S_cal z Prawej Potem Lewej" msgstr "S_cal z Prawej Potem Lewej"
#: src/diffuse/main.py:892 #: src/diffuse/main.py:895
msgid "_Help" msgid "_Help"
msgstr "_Pomoc" msgstr "_Pomoc"
#: src/diffuse/main.py:893 #: src/diffuse/main.py:896
msgid "_Help Contents..." msgid "_Help Contents..."
msgstr "_Pomoc Ogólna..." msgstr "_Pomoc Ogólna..."
#: src/diffuse/main.py:895 #: src/diffuse/main.py:898
#, python-format #, python-format
msgid "_About %s..." msgid "_About %s..."
msgstr "_O %s..." msgstr "_O %s..."
#: src/diffuse/main.py:910 #: src/diffuse/main.py:913
msgid "New 2-Way File Merge" msgid "New 2-Way File Merge"
msgstr "Nowy Łączenia 2 Plików" msgstr "Nowy Łączenia 2 Plików"
#: src/diffuse/main.py:911 #: src/diffuse/main.py:914
msgid "New 3-Way File Merge" msgid "New 3-Way File Merge"
msgstr "Nowy Łączenia 3 Plików" msgstr "Nowy Łączenia 3 Plików"
#: src/diffuse/main.py:913 #: src/diffuse/main.py:916
msgid "Realign All" msgid "Realign All"
msgstr "Wyrównaj Wszystko" msgstr "Wyrównaj Wszystko"
#: src/diffuse/main.py:914 #: src/diffuse/main.py:917
msgid "First Difference" msgid "First Difference"
msgstr "Pierwsza Różnica" msgstr "Pierwsza Różnica"
#: src/diffuse/main.py:915 #: src/diffuse/main.py:918
msgid "Previous Difference" msgid "Previous Difference"
msgstr "Poprzednia Różnica" msgstr "Poprzednia Różnica"
#: src/diffuse/main.py:916 #: src/diffuse/main.py:919
msgid "Next Difference" msgid "Next Difference"
msgstr "Następna Różnica" msgstr "Następna Różnica"
#: src/diffuse/main.py:917 #: src/diffuse/main.py:920
msgid "Last Difference" msgid "Last Difference"
msgstr "Ostatnia Różnica" msgstr "Ostatnia Różnica"
#: src/diffuse/main.py:919 #: src/diffuse/main.py:922
msgid "Copy Selection Right" msgid "Copy Selection Right"
msgstr "Skopiuj Zaznaczenie w Prawo" msgstr "Skopiuj Zaznaczenie w Prawo"
#: src/diffuse/main.py:920 #: src/diffuse/main.py:923
msgid "Copy Selection Left" msgid "Copy Selection Left"
msgstr "Skopiuj Zaznaczenie w Lewo" msgstr "Skopiuj Zaznaczenie w Lewo"
#: src/diffuse/main.py:921 #: src/diffuse/main.py:924
msgid "Copy Left Into Selection" msgid "Copy Left Into Selection"
msgstr "Skopiuj z Lewej Do Zaznaczenia" msgstr "Skopiuj z Lewej Do Zaznaczenia"
#: src/diffuse/main.py:922 #: src/diffuse/main.py:925
msgid "Copy Right Into Selection" msgid "Copy Right Into Selection"
msgstr "Skopiuj z Prawej Do Zaznaczenia" msgstr "Skopiuj z Prawej Do Zaznaczenia"
#: src/diffuse/main.py:923 #: src/diffuse/main.py:926
msgid "Merge From Left Then Right" msgid "Merge From Left Then Right"
msgstr "Scal z Lewej Potem Prawej" msgstr "Scal z Lewej Potem Prawej"
#: src/diffuse/main.py:924 #: src/diffuse/main.py:927
msgid "Merge From Right Then Left" msgid "Merge From Right Then Left"
msgstr "Scal z Prawej Potem Lewej" msgstr "Scal z Prawej Potem Lewej"
#: src/diffuse/main.py:926 #: src/diffuse/main.py:929
msgid "Undo" msgid "Undo"
msgstr "Cofnij" msgstr "Cofnij"
#: src/diffuse/main.py:927 #: src/diffuse/main.py:930
msgid "Redo" msgid "Redo"
msgstr "Ponów" msgstr "Ponów"
#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 #: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
msgid "Cut" msgid "Cut"
msgstr "Wytnij" msgstr "Wytnij"
#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 #: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
msgid "Copy" msgid "Copy"
msgstr "Kopiuj" msgstr "Kopiuj"
#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 #: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
msgid "Paste" msgid "Paste"
msgstr "Wklej" msgstr "Wklej"
#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 #: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
msgid "Clear Edits" msgid "Clear Edits"
msgstr "Wyczyść Edycje" msgstr "Wyczyść Edycje"
#: src/diffuse/main.py:1054 #: src/diffuse/main.py:1057
msgid "Some files have unsaved changes. Select the files to save before closing." msgid "Some files have unsaved changes. Select the files to save before closing."
msgstr "" msgstr ""
"Niektóre pliki mają niezapisane zmiany. Wybierz pliki, aby zapisać przed " "Niektóre pliki mają niezapisane zmiany. Wybierz pliki, aby zapisać przed "
"zamknięciem." "zamknięciem."
#: src/diffuse/main.py:1068 #: src/diffuse/main.py:1071
msgid "Tab" msgid "Tab"
msgstr "Karta" msgstr "Karta"
#: src/diffuse/main.py:1073 #: src/diffuse/main.py:1076
msgid "Pane" msgid "Pane"
msgstr "Okno" msgstr "Okno"
#: src/diffuse/main.py:1084 #: src/diffuse/main.py:1087
msgid "Close _Without Saving" msgid "Close _Without Saving"
msgstr "Zamknij _Bez Zapisywania" msgstr "Zamknij _Bez Zapisywania"
#: src/diffuse/main.py:1123 #: src/diffuse/main.py:1126
#, python-format #, python-format
msgid "Closing this tab will quit %s." msgid "Closing this tab will quit %s."
msgstr "Zamknięcie tej karty zakończy %s." msgstr "Zamknięcie tej karty zakończy %s."
#: src/diffuse/main.py:1206 #: src/diffuse/main.py:1209
#, python-format #, python-format
msgid "File Merge %d" msgid "File Merge %d"
msgstr "Scal Plik %d" msgstr "Scal Plik %d"
#: src/diffuse/main.py:1312 #: src/diffuse/main.py:1315
#, python-format #, python-format
msgid "Error retrieving commits for %s." msgid "Error retrieving commits for %s."
msgstr "Błąd odzyskiwania commits dla %s." msgstr "Błąd odzyskiwania commits dla %s."
#: src/diffuse/main.py:1344 #: src/diffuse/main.py:1347
#, python-format #, python-format
msgid "Error retrieving modifications for %s." msgid "Error retrieving modifications for %s."
msgstr "Błąd odzyskiwania modyfikacji dla % s." msgstr "Błąd odzyskiwania modyfikacji dla % s."
#: src/diffuse/main.py:1377 #: src/diffuse/main.py:1380
msgid "Open File In New Tab" msgid "Open File In New Tab"
msgstr "Otwórz Plik w Nowej Karcie" msgstr "Otwórz Plik w Nowej Karcie"
#: src/diffuse/main.py:1400 #: src/diffuse/main.py:1403
msgid "Choose Folder With Modified Files" msgid "Choose Folder With Modified Files"
msgstr "Wybierz Folder z Zmodyfikowanymi Plikami" msgstr "Wybierz Folder z Zmodyfikowanymi Plikami"
#: src/diffuse/main.py:1418 #: src/diffuse/main.py:1421
msgid "No modified files found." msgid "No modified files found."
msgstr "Nie znaleziono zmodyfikowanych plików." msgstr "Nie znaleziono zmodyfikowanych plików."
#: src/diffuse/main.py:1424 #: src/diffuse/main.py:1427
msgid "Choose Folder With Commit" msgid "Choose Folder With Commit"
msgstr "Wybierz Folder z Commit" msgstr "Wybierz Folder z Commit"
#: src/diffuse/main.py:1444 #: src/diffuse/main.py:1447
msgid "No committed files found." msgid "No committed files found."
msgstr "Nie znaleziono plików commit." msgstr "Nie znaleziono plików commit."
#: src/diffuse/main.py:1480 #: src/diffuse/main.py:1483
msgid "New N-Way File Merge..." msgid "New N-Way File Merge..."
msgstr "Nowy N-Sposób Łączenia Pliku..." msgstr "Nowy N-Sposób Łączenia Pliku..."
#: src/diffuse/main.py:1481 #: src/diffuse/main.py:1484
msgid "Number of panes: " msgid "Number of panes: "
msgstr "Ilość okien: " msgstr "Ilość okien: "
#: src/diffuse/main.py:1555 #: src/diffuse/main.py:1558
msgid "Phrase not found. Continue from the end of the file?" msgid "Phrase not found. Continue from the end of the file?"
msgstr "Frazy nie znaleziono. Kontynuowane od końca pliku?" msgstr "Frazy nie znaleziono. Kontynuowane od końca pliku?"
#: src/diffuse/main.py:1557 #: src/diffuse/main.py:1560
msgid "Phrase not found. Continue from the start of the file?" msgid "Phrase not found. Continue from the start of the file?"
msgstr "Frazy nie znaleziono. Kontynuowane od początku pliku?" msgstr "Frazy nie znaleziono. Kontynuowane od początku pliku?"
#: src/diffuse/main.py:1778 #: src/diffuse/main.py:1781
#, fuzzy #, fuzzy
msgid "" msgid ""
"Usage:\n" "Usage:\n"
@ -677,16 +682,16 @@ msgstr ""
" ( -i | --ignore-case ) Ignoruj wielkości liter\n" " ( -i | --ignore-case ) Ignoruj wielkości liter\n"
" ( -w | --ignore-all-space ) Ignoruj różnice w spacji" " ( -w | --ignore-all-space ) Ignoruj różnice w spacji"
#: src/diffuse/main.py:1945 #: src/diffuse/main.py:1948
msgid "Error parsing line number." msgid "Error parsing line number."
msgstr "Błąd analizowania numer linii." msgstr "Błąd analizowania numer linii."
#: src/diffuse/main.py:1955 #: src/diffuse/main.py:1958
#, python-format #, python-format
msgid "Skipping unknown argument \"%s\"." msgid "Skipping unknown argument \"%s\"."
msgstr "Pomijanie nieznanego argumentu \"%s\"." msgstr "Pomijanie nieznanego argumentu \"%s\"."
#: src/diffuse/main.py:1963 #: src/diffuse/main.py:1966
#, python-format #, python-format
msgid "Error processing argument \"%s\". Directory not expected." msgid "Error processing argument \"%s\". Directory not expected."
msgstr "Błąd przetwarzania argumentu \"%s\". Nie oczekiwano katalogu." msgstr "Błąd przetwarzania argumentu \"%s\". Nie oczekiwano katalogu."
@ -962,7 +967,3 @@ msgstr "Zaznacz Wszystko"
#: src/diffuse/widgets.py:1868 #: src/diffuse/widgets.py:1868
msgid "Swap with Selected Pane" msgid "Swap with Selected Pane"
msgstr "Zamień z Zaznaczonym Oknem" msgstr "Zamień z Zaznaczonym Oknem"
#, python-format
#~ msgid "Column %d"
#~ msgstr "Kolumna%d"

255
po/pt.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: diffuse-svn\n" "Project-Id-Version: diffuse-svn\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-23 19:48-0400\n" "POT-Creation-Date: 2022-10-23 20:00-0400\n"
"PO-Revision-Date: 2022-04-04 12:19-0400\n" "PO-Revision-Date: 2022-04-04 12:19-0400\n"
"Last-Translator: Pedro Albuquerque <pmra@gmx.com>\n" "Last-Translator: Pedro Albuquerque <pmra@gmx.com>\n"
"Language-Team: Português <pmra@gmx.com>\n" "Language-Team: Português <pmra@gmx.com>\n"
@ -99,40 +99,45 @@ msgstr "Gravar ficheiro"
msgid "Save File As..." msgid "Save File As..."
msgstr "Gravar ficheiro como..." msgstr "Gravar ficheiro como..."
#: src/diffuse/main.py:288 #: src/diffuse/main.py:217
#, python-format
msgid "Column %d"
msgstr "Coluna %d"
#: src/diffuse/main.py:291
msgid "Save changes before loading the new file?" msgid "Save changes before loading the new file?"
msgstr "Gravar alterações antes de carregar o novo ficheiro?" msgstr "Gravar alterações antes de carregar o novo ficheiro?"
#: src/diffuse/main.py:399 #: src/diffuse/main.py:402
#, python-format #, python-format
msgid "Error reading revision %(rev)s of %(file)s." msgid "Error reading revision %(rev)s of %(file)s."
msgstr "Erro ao ler a revisão %(rev)s de %(file)s." msgstr "Erro ao ler a revisão %(rev)s de %(file)s."
#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #: src/diffuse/main.py:405 src/diffuse/main.py:1860
#, python-format #, python-format
msgid "Error reading %s." msgid "Error reading %s."
msgstr "Erro ao ler %s." msgstr "Erro ao ler %s."
#: src/diffuse/main.py:424 #: src/diffuse/main.py:427
msgid "Open File" msgid "Open File"
msgstr "Abrir ficheiro" msgstr "Abrir ficheiro"
#: src/diffuse/main.py:481 #: src/diffuse/main.py:484
#, python-format #, python-format
msgid "The file %s changed on disk. Do you want to reload the file?" msgid "The file %s changed on disk. Do you want to reload the file?"
msgstr "O ficheiro %s foi alterado no disco. Deseja recarregá-lo?" msgstr "O ficheiro %s foi alterado no disco. Deseja recarregá-lo?"
#: src/diffuse/main.py:507 #: src/diffuse/main.py:510
#, python-format #, python-format
msgid "Save %(title)s Pane %(pane)d" msgid "Save %(title)s Pane %(pane)d"
msgstr "Gravar %(title)s painel %(pane)d" msgstr "Gravar %(title)s painel %(pane)d"
#: src/diffuse/main.py:539 #: src/diffuse/main.py:542
#, python-format #, python-format
msgid "A file named %s already exists. Do you want to overwrite it?" msgid "A file named %s already exists. Do you want to overwrite it?"
msgstr "Já existe um ficheiro chamado %s. Deseja sobrescrevê-lo?" msgstr "Já existe um ficheiro chamado %s. Deseja sobrescrevê-lo?"
#: src/diffuse/main.py:546 #: src/diffuse/main.py:549
#, python-format #, python-format
msgid "" msgid ""
"The file %s has been modified by another process since reading it. If you save, " "The file %s has been modified by another process since reading it. If you save, "
@ -141,25 +146,25 @@ msgstr ""
"O ficheiro %s foi modificado por outro processo desde a leitura. Se gravar, " "O ficheiro %s foi modificado por outro processo desde a leitura. Se gravar, "
"perderá todas as alterações externas. Gravar mesmo assim?" "perderá todas as alterações externas. Gravar mesmo assim?"
#: src/diffuse/main.py:588 #: src/diffuse/main.py:591
#, python-format #, python-format
msgid "Error encoding to %s." msgid "Error encoding to %s."
msgstr "Erro ao codificar para %s." msgstr "Erro ao codificar para %s."
#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #: src/diffuse/main.py:595 src/diffuse/preferences.py:300
#, python-format #, python-format
msgid "Error writing %s." msgid "Error writing %s."
msgstr "Erro ao excrever %s." msgstr "Erro ao excrever %s."
#: src/diffuse/main.py:622 #: src/diffuse/main.py:625
msgid "Go To Line..." msgid "Go To Line..."
msgstr "Ir para linha..." msgstr "Ir para linha..."
#: src/diffuse/main.py:623 #: src/diffuse/main.py:626
msgid "Line Number: " msgid "Line Number: "
msgstr "Número de linha: " msgstr "Número de linha: "
#: src/diffuse/main.py:654 #: src/diffuse/main.py:657
msgid "" msgid ""
"Press the enter key or double click to edit. Press the space bar or use the RMB " "Press the enter key or double click to edit. Press the space bar or use the RMB "
"menu to manually align." "menu to manually align."
@ -167,11 +172,11 @@ msgstr ""
"Prima Enter ou faça duplo clique para editar. Prima a barra de espaços ou use o " "Prima Enter ou faça duplo clique para editar. Prima a barra de espaços ou use o "
"menu RMB para alinhar manualmente." "menu RMB para alinhar manualmente."
#: src/diffuse/main.py:658 #: src/diffuse/main.py:661
msgid "Press the escape key to finish editing." msgid "Press the escape key to finish editing."
msgstr "Prima Esc para terminar a edição." msgstr "Prima Esc para terminar a edição."
#: src/diffuse/main.py:661 #: src/diffuse/main.py:664
msgid "" msgid ""
"Select target line and press the space bar to align. Press the escape key to " "Select target line and press the space bar to align. Press the escape key to "
"cancel." "cancel."
@ -179,426 +184,426 @@ msgstr ""
"Seleccione a linha alvo e prima a barra de espaço para alinhar. Prima Esc para " "Seleccione a linha alvo e prima a barra de espaço para alinhar. Prima Esc para "
"cancelar." "cancelar."
#: src/diffuse/main.py:784 #: src/diffuse/main.py:787
msgid "_File" msgid "_File"
msgstr "_Ficheiro" msgstr "_Ficheiro"
#: src/diffuse/main.py:785 #: src/diffuse/main.py:788
msgid "_Open File..." msgid "_Open File..."
msgstr "Abrir ficheir_o..." msgstr "Abrir ficheir_o..."
#: src/diffuse/main.py:786 #: src/diffuse/main.py:789
msgid "Open File In New _Tab..." msgid "Open File In New _Tab..."
msgstr "Abrir ficheiro em no_vo separador..." msgstr "Abrir ficheiro em no_vo separador..."
#: src/diffuse/main.py:787 #: src/diffuse/main.py:790
msgid "Open _Modified Files..." msgid "Open _Modified Files..."
msgstr "Abrir ficheiros _modificados..." msgstr "Abrir ficheiros _modificados..."
#: src/diffuse/main.py:788 #: src/diffuse/main.py:791
msgid "Open Commi_t..." msgid "Open Commi_t..."
msgstr "Abrir rev_isão..." msgstr "Abrir rev_isão..."
#: src/diffuse/main.py:789 #: src/diffuse/main.py:792
msgid "_Reload File" msgid "_Reload File"
msgstr "_Recarregar ficheiro" msgstr "_Recarregar ficheiro"
#: src/diffuse/main.py:791 #: src/diffuse/main.py:794
msgid "_Save File" msgid "_Save File"
msgstr "_Gravar ficheiro" msgstr "_Gravar ficheiro"
#: src/diffuse/main.py:792 #: src/diffuse/main.py:795
msgid "Save File _As..." msgid "Save File _As..."
msgstr "Gr_avar ficheiro como..." msgstr "Gr_avar ficheiro como..."
#: src/diffuse/main.py:793 #: src/diffuse/main.py:796
msgid "Save A_ll" msgid "Save A_ll"
msgstr "Gravar _tudo" msgstr "Gravar _tudo"
#: src/diffuse/main.py:795 #: src/diffuse/main.py:798
msgid "New _2-Way File Merge" msgid "New _2-Way File Merge"
msgstr "Nova união de _2 vias" msgstr "Nova união de _2 vias"
#: src/diffuse/main.py:796 #: src/diffuse/main.py:799
msgid "New _3-Way File Merge" msgid "New _3-Way File Merge"
msgstr "Nova união de _3 vias" msgstr "Nova união de _3 vias"
#: src/diffuse/main.py:797 #: src/diffuse/main.py:800
msgid "New _N-Way File Merge..." msgid "New _N-Way File Merge..."
msgstr "Nova união de _N vias..." msgstr "Nova união de _N vias..."
#: src/diffuse/main.py:799 #: src/diffuse/main.py:802
msgid "_Close Tab" msgid "_Close Tab"
msgstr "Fe_char separador" msgstr "Fe_char separador"
#: src/diffuse/main.py:800 #: src/diffuse/main.py:803
msgid "_Undo Close Tab" msgid "_Undo Close Tab"
msgstr "Desfa_zer Fechar separador" msgstr "Desfa_zer Fechar separador"
#: src/diffuse/main.py:801 #: src/diffuse/main.py:804
msgid "_Quit" msgid "_Quit"
msgstr "_Sair" msgstr "_Sair"
#: src/diffuse/main.py:804 #: src/diffuse/main.py:807
msgid "_Edit" msgid "_Edit"
msgstr "_Editar" msgstr "_Editar"
#: src/diffuse/main.py:805 #: src/diffuse/main.py:808
msgid "_Undo" msgid "_Undo"
msgstr "_Desfazer" msgstr "_Desfazer"
#: src/diffuse/main.py:806 #: src/diffuse/main.py:809
msgid "_Redo" msgid "_Redo"
msgstr "_Refazer" msgstr "_Refazer"
#: src/diffuse/main.py:808 #: src/diffuse/main.py:811
msgid "Cu_t" msgid "Cu_t"
msgstr "Cor_tar" msgstr "Cor_tar"
#: src/diffuse/main.py:809 #: src/diffuse/main.py:812
msgid "_Copy" msgid "_Copy"
msgstr "_Copiar" msgstr "_Copiar"
#: src/diffuse/main.py:810 #: src/diffuse/main.py:813
msgid "_Paste" msgid "_Paste"
msgstr "Co_lar" msgstr "Co_lar"
#: src/diffuse/main.py:812 #: src/diffuse/main.py:815
msgid "Select _All" msgid "Select _All"
msgstr "Seleccion_ar tudo" msgstr "Seleccion_ar tudo"
#: src/diffuse/main.py:813 #: src/diffuse/main.py:816
msgid "C_lear Edits" msgid "C_lear Edits"
msgstr "_Limpar edição" msgstr "_Limpar edição"
#: src/diffuse/main.py:814 #: src/diffuse/main.py:817
msgid "_Dismiss All Edits" msgid "_Dismiss All Edits"
msgstr "_Descartar toda a edição" msgstr "_Descartar toda a edição"
#: src/diffuse/main.py:816 #: src/diffuse/main.py:819
msgid "_Find..." msgid "_Find..."
msgstr "_Localizar..." msgstr "_Localizar..."
#: src/diffuse/main.py:817 #: src/diffuse/main.py:820
msgid "Find _Next" msgid "Find _Next"
msgstr "Localizar segui_nte" msgstr "Localizar segui_nte"
#: src/diffuse/main.py:818 #: src/diffuse/main.py:821
msgid "Find Pre_vious" msgid "Find Pre_vious"
msgstr "Localizar _anterior" msgstr "Localizar _anterior"
#: src/diffuse/main.py:819 #: src/diffuse/main.py:822
msgid "_Go To Line..." msgid "_Go To Line..."
msgstr "_Ir para linha..." msgstr "_Ir para linha..."
#: src/diffuse/main.py:821 #: src/diffuse/main.py:824
msgid "Pr_eferences..." msgid "Pr_eferences..."
msgstr "Pr_eferências..." msgstr "Pr_eferências..."
#: src/diffuse/main.py:825 #: src/diffuse/main.py:828
msgid "None" msgid "None"
msgstr "Nada" msgstr "Nada"
#: src/diffuse/main.py:843 #: src/diffuse/main.py:846
msgid "_View" msgid "_View"
msgstr "_Ver" msgstr "_Ver"
#: src/diffuse/main.py:844 #: src/diffuse/main.py:847
msgid "_Syntax Highlighting" msgid "_Syntax Highlighting"
msgstr "Realce de _sintaxe" msgstr "Realce de _sintaxe"
#: src/diffuse/main.py:846 #: src/diffuse/main.py:849
msgid "Re_align All" msgid "Re_align All"
msgstr "Re_alinhar tudo" msgstr "Re_alinhar tudo"
#: src/diffuse/main.py:847 #: src/diffuse/main.py:850
msgid "_Isolate" msgid "_Isolate"
msgstr "_Isolar" msgstr "_Isolar"
#: src/diffuse/main.py:849 #: src/diffuse/main.py:852
msgid "_First Difference" msgid "_First Difference"
msgstr "_Primeira diferença" msgstr "_Primeira diferença"
#: src/diffuse/main.py:850 #: src/diffuse/main.py:853
msgid "_Previous Difference" msgid "_Previous Difference"
msgstr "Diferença _anterior" msgstr "Diferença _anterior"
#: src/diffuse/main.py:851 #: src/diffuse/main.py:854
msgid "_Next Difference" msgid "_Next Difference"
msgstr "Diferença segui_nte" msgstr "Diferença segui_nte"
#: src/diffuse/main.py:852 #: src/diffuse/main.py:855
msgid "_Last Difference" msgid "_Last Difference"
msgstr "Ú_ltima diferença" msgstr "Ú_ltima diferença"
#: src/diffuse/main.py:854 #: src/diffuse/main.py:857
msgid "Fir_st Tab" msgid "Fir_st Tab"
msgstr "P_rimeiro separador" msgstr "P_rimeiro separador"
#: src/diffuse/main.py:855 #: src/diffuse/main.py:858
msgid "Pre_vious Tab" msgid "Pre_vious Tab"
msgstr "_Separador anterior" msgstr "_Separador anterior"
#: src/diffuse/main.py:856 #: src/diffuse/main.py:859
msgid "Next _Tab" msgid "Next _Tab"
msgstr "Separador seguin_te" msgstr "Separador seguin_te"
#: src/diffuse/main.py:857 #: src/diffuse/main.py:860
msgid "Las_t Tab" msgid "Las_t Tab"
msgstr "Úl_timo separador" msgstr "Úl_timo separador"
#: src/diffuse/main.py:859 #: src/diffuse/main.py:862
msgid "Shift Pane _Right" msgid "Shift Pane _Right"
msgstr "Mover separador à di_reita" msgstr "Mover separador à di_reita"
#: src/diffuse/main.py:860 #: src/diffuse/main.py:863
msgid "Shift Pane _Left" msgid "Shift Pane _Left"
msgstr "Mover separador à es_querda" msgstr "Mover separador à es_querda"
#: src/diffuse/main.py:863 #: src/diffuse/main.py:866
msgid "F_ormat" msgid "F_ormat"
msgstr "F_ormatar" msgstr "F_ormatar"
#: src/diffuse/main.py:864 #: src/diffuse/main.py:867
msgid "Convert To _Upper Case" msgid "Convert To _Upper Case"
msgstr "Converter para maiúsc_ulas" msgstr "Converter para maiúsc_ulas"
#: src/diffuse/main.py:865 #: src/diffuse/main.py:868
msgid "Convert To _Lower Case" msgid "Convert To _Lower Case"
msgstr "Converter para minúscu_las" msgstr "Converter para minúscu_las"
#: src/diffuse/main.py:867 #: src/diffuse/main.py:870
msgid "Sort Lines In _Ascending Order" msgid "Sort Lines In _Ascending Order"
msgstr "Ordenar linhas _ascendentemente" msgstr "Ordenar linhas _ascendentemente"
#: src/diffuse/main.py:868 #: src/diffuse/main.py:871
msgid "Sort Lines In D_escending Order" msgid "Sort Lines In D_escending Order"
msgstr "Ordenar linhas d_escendentemente" msgstr "Ordenar linhas d_escendentemente"
#: src/diffuse/main.py:870 #: src/diffuse/main.py:873
msgid "Remove Trailing _White Space" msgid "Remove Trailing _White Space"
msgstr "Remover espaços _finais" msgstr "Remover espaços _finais"
#: src/diffuse/main.py:871 #: src/diffuse/main.py:874
msgid "Convert Tabs To _Spaces" msgid "Convert Tabs To _Spaces"
msgstr "Converter tabulações em e_spaços" msgstr "Converter tabulações em e_spaços"
#: src/diffuse/main.py:872 #: src/diffuse/main.py:875
msgid "Convert Leading Spaces To _Tabs" msgid "Convert Leading Spaces To _Tabs"
msgstr "Converter espaços iniciais em _tabulações" msgstr "Converter espaços iniciais em _tabulações"
#: src/diffuse/main.py:874 #: src/diffuse/main.py:877
msgid "_Increase Indenting" msgid "_Increase Indenting"
msgstr "Aumentar _indentação" msgstr "Aumentar _indentação"
#: src/diffuse/main.py:875 #: src/diffuse/main.py:878
msgid "De_crease Indenting" msgid "De_crease Indenting"
msgstr "Di_minuir indentação" msgstr "Di_minuir indentação"
#: src/diffuse/main.py:877 #: src/diffuse/main.py:880
msgid "Convert To _DOS Format" msgid "Convert To _DOS Format"
msgstr "Converter para formato _DOS" msgstr "Converter para formato _DOS"
#: src/diffuse/main.py:878 #: src/diffuse/main.py:881
msgid "Convert To _Mac Format" msgid "Convert To _Mac Format"
msgstr "Converter para formato _Mac" msgstr "Converter para formato _Mac"
#: src/diffuse/main.py:879 #: src/diffuse/main.py:882
msgid "Convert To Uni_x Format" msgid "Convert To Uni_x Format"
msgstr "Converter para formato Uni_x" msgstr "Converter para formato Uni_x"
#: src/diffuse/main.py:882 #: src/diffuse/main.py:885
msgid "_Merge" msgid "_Merge"
msgstr "_Unir" msgstr "_Unir"
#: src/diffuse/main.py:883 #: src/diffuse/main.py:886
msgid "Copy Selection _Right" msgid "Copy Selection _Right"
msgstr "Copiar selecção à di_reita" msgstr "Copiar selecção à di_reita"
#: src/diffuse/main.py:884 #: src/diffuse/main.py:887
msgid "Copy Selection _Left" msgid "Copy Selection _Left"
msgstr "Copiar selecção à es_querda" msgstr "Copiar selecção à es_querda"
#: src/diffuse/main.py:886 #: src/diffuse/main.py:889
msgid "Copy Left _Into Selection" msgid "Copy Left _Into Selection"
msgstr "Cop_iar esquerda para a selecção" msgstr "Cop_iar esquerda para a selecção"
#: src/diffuse/main.py:887 #: src/diffuse/main.py:890
msgid "Copy Right I_nto Selection" msgid "Copy Right I_nto Selection"
msgstr "Copiar _direita para a selecção" msgstr "Copiar _direita para a selecção"
#: src/diffuse/main.py:888 #: src/diffuse/main.py:891
msgid "_Merge From Left Then Right" msgid "_Merge From Left Then Right"
msgstr "U_nir da esquerda e depois da direita" msgstr "U_nir da esquerda e depois da direita"
#: src/diffuse/main.py:889 #: src/diffuse/main.py:892
msgid "M_erge From Right Then Left" msgid "M_erge From Right Then Left"
msgstr "Unir da dir_eita e depois da esquerda" msgstr "Unir da dir_eita e depois da esquerda"
#: src/diffuse/main.py:892 #: src/diffuse/main.py:895
msgid "_Help" msgid "_Help"
msgstr "A_juda" msgstr "A_juda"
#: src/diffuse/main.py:893 #: src/diffuse/main.py:896
msgid "_Help Contents..." msgid "_Help Contents..."
msgstr "Conteúdo da a_juda..." msgstr "Conteúdo da a_juda..."
#: src/diffuse/main.py:895 #: src/diffuse/main.py:898
#, python-format #, python-format
msgid "_About %s..." msgid "_About %s..."
msgstr "_Acerca do %s..." msgstr "_Acerca do %s..."
#: src/diffuse/main.py:910 #: src/diffuse/main.py:913
msgid "New 2-Way File Merge" msgid "New 2-Way File Merge"
msgstr "Nova união de _2 vias" msgstr "Nova união de _2 vias"
#: src/diffuse/main.py:911 #: src/diffuse/main.py:914
msgid "New 3-Way File Merge" msgid "New 3-Way File Merge"
msgstr "Nova união de _3 vias" msgstr "Nova união de _3 vias"
#: src/diffuse/main.py:913 #: src/diffuse/main.py:916
msgid "Realign All" msgid "Realign All"
msgstr "Realinhar tudo" msgstr "Realinhar tudo"
#: src/diffuse/main.py:914 #: src/diffuse/main.py:917
msgid "First Difference" msgid "First Difference"
msgstr "Primeira diferença" msgstr "Primeira diferença"
#: src/diffuse/main.py:915 #: src/diffuse/main.py:918
msgid "Previous Difference" msgid "Previous Difference"
msgstr "Diferença anterior" msgstr "Diferença anterior"
#: src/diffuse/main.py:916 #: src/diffuse/main.py:919
msgid "Next Difference" msgid "Next Difference"
msgstr "Diferença seguinte" msgstr "Diferença seguinte"
#: src/diffuse/main.py:917 #: src/diffuse/main.py:920
msgid "Last Difference" msgid "Last Difference"
msgstr "Última diferença" msgstr "Última diferença"
#: src/diffuse/main.py:919 #: src/diffuse/main.py:922
msgid "Copy Selection Right" msgid "Copy Selection Right"
msgstr "Copiar selecção à direita" msgstr "Copiar selecção à direita"
#: src/diffuse/main.py:920 #: src/diffuse/main.py:923
msgid "Copy Selection Left" msgid "Copy Selection Left"
msgstr "Copiar selecção à esquerda" msgstr "Copiar selecção à esquerda"
#: src/diffuse/main.py:921 #: src/diffuse/main.py:924
msgid "Copy Left Into Selection" msgid "Copy Left Into Selection"
msgstr "Copiar esquerda para a selecção" msgstr "Copiar esquerda para a selecção"
#: src/diffuse/main.py:922 #: src/diffuse/main.py:925
msgid "Copy Right Into Selection" msgid "Copy Right Into Selection"
msgstr "Copiar direita para a selecção" msgstr "Copiar direita para a selecção"
#: src/diffuse/main.py:923 #: src/diffuse/main.py:926
msgid "Merge From Left Then Right" msgid "Merge From Left Then Right"
msgstr "Unir da esquerda e depois da direita" msgstr "Unir da esquerda e depois da direita"
#: src/diffuse/main.py:924 #: src/diffuse/main.py:927
msgid "Merge From Right Then Left" msgid "Merge From Right Then Left"
msgstr "Unir da direita e depois da esquerda" msgstr "Unir da direita e depois da esquerda"
#: src/diffuse/main.py:926 #: src/diffuse/main.py:929
msgid "Undo" msgid "Undo"
msgstr "Desfazer" msgstr "Desfazer"
#: src/diffuse/main.py:927 #: src/diffuse/main.py:930
msgid "Redo" msgid "Redo"
msgstr "Refazer" msgstr "Refazer"
#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 #: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
msgid "Cut" msgid "Cut"
msgstr "Cortar" msgstr "Cortar"
#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 #: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
msgid "Copy" msgid "Copy"
msgstr "Copiar" msgstr "Copiar"
#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 #: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
msgid "Paste" msgid "Paste"
msgstr "Colar" msgstr "Colar"
#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 #: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
msgid "Clear Edits" msgid "Clear Edits"
msgstr "Limpar edição" msgstr "Limpar edição"
#: src/diffuse/main.py:1054 #: src/diffuse/main.py:1057
msgid "Some files have unsaved changes. Select the files to save before closing." msgid "Some files have unsaved changes. Select the files to save before closing."
msgstr "" msgstr ""
"Alguns ficheiros têm alterações por gravar. Seleccione os ficheiros a gravar " "Alguns ficheiros têm alterações por gravar. Seleccione os ficheiros a gravar "
"antes de fechar." "antes de fechar."
#: src/diffuse/main.py:1068 #: src/diffuse/main.py:1071
msgid "Tab" msgid "Tab"
msgstr "Separador" msgstr "Separador"
#: src/diffuse/main.py:1073 #: src/diffuse/main.py:1076
msgid "Pane" msgid "Pane"
msgstr "Painel" msgstr "Painel"
#: src/diffuse/main.py:1084 #: src/diffuse/main.py:1087
msgid "Close _Without Saving" msgid "Close _Without Saving"
msgstr "Fechar sem gra_var" msgstr "Fechar sem gra_var"
#: src/diffuse/main.py:1123 #: src/diffuse/main.py:1126
#, python-format #, python-format
msgid "Closing this tab will quit %s." msgid "Closing this tab will quit %s."
msgstr "Fechar este painel sai do %s." msgstr "Fechar este painel sai do %s."
#: src/diffuse/main.py:1206 #: src/diffuse/main.py:1209
#, python-format #, python-format
msgid "File Merge %d" msgid "File Merge %d"
msgstr "União de ficheiros %d" msgstr "União de ficheiros %d"
#: src/diffuse/main.py:1312 #: src/diffuse/main.py:1315
#, python-format #, python-format
msgid "Error retrieving commits for %s." msgid "Error retrieving commits for %s."
msgstr "Erro ao obter revisões de %s." msgstr "Erro ao obter revisões de %s."
#: src/diffuse/main.py:1344 #: src/diffuse/main.py:1347
#, python-format #, python-format
msgid "Error retrieving modifications for %s." msgid "Error retrieving modifications for %s."
msgstr "Erro ao obter modificações de %s." msgstr "Erro ao obter modificações de %s."
#: src/diffuse/main.py:1377 #: src/diffuse/main.py:1380
msgid "Open File In New Tab" msgid "Open File In New Tab"
msgstr "Abrir ficheiro em novo separador" msgstr "Abrir ficheiro em novo separador"
#: src/diffuse/main.py:1400 #: src/diffuse/main.py:1403
msgid "Choose Folder With Modified Files" msgid "Choose Folder With Modified Files"
msgstr "Escolher pasta com ficheiros modificados" msgstr "Escolher pasta com ficheiros modificados"
#: src/diffuse/main.py:1418 #: src/diffuse/main.py:1421
msgid "No modified files found." msgid "No modified files found."
msgstr "Sem ficheiros modificados." msgstr "Sem ficheiros modificados."
#: src/diffuse/main.py:1424 #: src/diffuse/main.py:1427
msgid "Choose Folder With Commit" msgid "Choose Folder With Commit"
msgstr "Escolher pasta com revisão" msgstr "Escolher pasta com revisão"
#: src/diffuse/main.py:1444 #: src/diffuse/main.py:1447
msgid "No committed files found." msgid "No committed files found."
msgstr "Sem ficheiros revistos." msgstr "Sem ficheiros revistos."
#: src/diffuse/main.py:1480 #: src/diffuse/main.py:1483
msgid "New N-Way File Merge..." msgid "New N-Way File Merge..."
msgstr "Nova união de N vias..." msgstr "Nova união de N vias..."
#: src/diffuse/main.py:1481 #: src/diffuse/main.py:1484
msgid "Number of panes: " msgid "Number of panes: "
msgstr "Número de painéis: " msgstr "Número de painéis: "
#: src/diffuse/main.py:1555 #: src/diffuse/main.py:1558
msgid "Phrase not found. Continue from the end of the file?" msgid "Phrase not found. Continue from the end of the file?"
msgstr "Frase não encontrada. Continuar do final do ficheiro?" msgstr "Frase não encontrada. Continuar do final do ficheiro?"
#: src/diffuse/main.py:1557 #: src/diffuse/main.py:1560
msgid "Phrase not found. Continue from the start of the file?" msgid "Phrase not found. Continue from the start of the file?"
msgstr "Frase não encontrada. Continuar do início do ficheiro?" msgstr "Frase não encontrada. Continuar do início do ficheiro?"
#: src/diffuse/main.py:1778 #: src/diffuse/main.py:1781
#, fuzzy #, fuzzy
msgid "" msgid ""
"Usage:\n" "Usage:\n"
@ -679,16 +684,16 @@ msgstr ""
" ( -i | --ignore-case ) ignora diferenças entre maiúsculas\n" " ( -i | --ignore-case ) ignora diferenças entre maiúsculas\n"
" ( -w | --ignore-all-space ) ignora diferenças de espaços" " ( -w | --ignore-all-space ) ignora diferenças de espaços"
#: src/diffuse/main.py:1945 #: src/diffuse/main.py:1948
msgid "Error parsing line number." msgid "Error parsing line number."
msgstr "Erro ao analisar o número de linha." msgstr "Erro ao analisar o número de linha."
#: src/diffuse/main.py:1955 #: src/diffuse/main.py:1958
#, python-format #, python-format
msgid "Skipping unknown argument \"%s\"." msgid "Skipping unknown argument \"%s\"."
msgstr "A ignorar argumento desconhecido \"%s\"." msgstr "A ignorar argumento desconhecido \"%s\"."
#: src/diffuse/main.py:1963 #: src/diffuse/main.py:1966
#, python-format #, python-format
msgid "Error processing argument \"%s\". Directory not expected." msgid "Error processing argument \"%s\". Directory not expected."
msgstr "Erro ao processar o argumento \"%s\". Pasta inesperada." msgstr "Erro ao processar o argumento \"%s\". Pasta inesperada."
@ -964,7 +969,3 @@ msgstr "Seleccionar tudo"
#: src/diffuse/widgets.py:1868 #: src/diffuse/widgets.py:1868
msgid "Swap with Selected Pane" msgid "Swap with Selected Pane"
msgstr "Trocar com o painel seleccionado" msgstr "Trocar com o painel seleccionado"
#, python-format
#~ msgid "Column %d"
#~ msgstr "Coluna %d"

255
po/pt_BR.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: diffuse-svn\n" "Project-Id-Version: diffuse-svn\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-23 19:48-0400\n" "POT-Creation-Date: 2022-10-23 20:00-0400\n"
"PO-Revision-Date: 2022-04-04 12:19-0400\n" "PO-Revision-Date: 2022-04-04 12:19-0400\n"
"Last-Translator: Pedro Albuquerque <pmra@gmx.com>\n" "Last-Translator: Pedro Albuquerque <pmra@gmx.com>\n"
"Language-Team: Português do Brasil <pmra@gmx.com>\n" "Language-Team: Português do Brasil <pmra@gmx.com>\n"
@ -103,40 +103,45 @@ msgstr "Salvar arquivo"
msgid "Save File As..." msgid "Save File As..."
msgstr "Salvar arquivo como..." msgstr "Salvar arquivo como..."
#: src/diffuse/main.py:288 #: src/diffuse/main.py:217
#, python-format
msgid "Column %d"
msgstr "Coluna %d"
#: src/diffuse/main.py:291
msgid "Save changes before loading the new file?" msgid "Save changes before loading the new file?"
msgstr "Salvar alterações antes de carregar o novo arquivo?" msgstr "Salvar alterações antes de carregar o novo arquivo?"
#: src/diffuse/main.py:399 #: src/diffuse/main.py:402
#, python-format #, python-format
msgid "Error reading revision %(rev)s of %(file)s." msgid "Error reading revision %(rev)s of %(file)s."
msgstr "Erro ao ler a revisão %(rev)s de %(file)s." msgstr "Erro ao ler a revisão %(rev)s de %(file)s."
#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #: src/diffuse/main.py:405 src/diffuse/main.py:1860
#, python-format #, python-format
msgid "Error reading %s." msgid "Error reading %s."
msgstr "Erro ao ler %s." msgstr "Erro ao ler %s."
#: src/diffuse/main.py:424 #: src/diffuse/main.py:427
msgid "Open File" msgid "Open File"
msgstr "Abrir arquivo" msgstr "Abrir arquivo"
#: src/diffuse/main.py:481 #: src/diffuse/main.py:484
#, python-format #, python-format
msgid "The file %s changed on disk. Do you want to reload the file?" msgid "The file %s changed on disk. Do you want to reload the file?"
msgstr "O arquivo %s foi alterado no armazenamento. Quer recarregá-lo?" msgstr "O arquivo %s foi alterado no armazenamento. Quer recarregá-lo?"
#: src/diffuse/main.py:507 #: src/diffuse/main.py:510
#, python-format #, python-format
msgid "Save %(title)s Pane %(pane)d" msgid "Save %(title)s Pane %(pane)d"
msgstr "Salvar %(title)s painel %(pane)d" msgstr "Salvar %(title)s painel %(pane)d"
#: src/diffuse/main.py:539 #: src/diffuse/main.py:542
#, python-format #, python-format
msgid "A file named %s already exists. Do you want to overwrite it?" msgid "A file named %s already exists. Do you want to overwrite it?"
msgstr "Já existe um arquivo chamado %s. Quer substituí-lo?" msgstr "Já existe um arquivo chamado %s. Quer substituí-lo?"
#: src/diffuse/main.py:546 #: src/diffuse/main.py:549
#, python-format #, python-format
msgid "" msgid ""
"The file %s has been modified by another process since reading it. If you save, " "The file %s has been modified by another process since reading it. If you save, "
@ -146,25 +151,25 @@ msgstr ""
"salvar agora, perderá todas as alterações feitas fora deste programa. Salvar de " "salvar agora, perderá todas as alterações feitas fora deste programa. Salvar de "
"qualquer forma?" "qualquer forma?"
#: src/diffuse/main.py:588 #: src/diffuse/main.py:591
#, python-format #, python-format
msgid "Error encoding to %s." msgid "Error encoding to %s."
msgstr "Erro ao codificar para %s." msgstr "Erro ao codificar para %s."
#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #: src/diffuse/main.py:595 src/diffuse/preferences.py:300
#, python-format #, python-format
msgid "Error writing %s." msgid "Error writing %s."
msgstr "Erro ao salvar %s." msgstr "Erro ao salvar %s."
#: src/diffuse/main.py:622 #: src/diffuse/main.py:625
msgid "Go To Line..." msgid "Go To Line..."
msgstr "Ir para linha..." msgstr "Ir para linha..."
#: src/diffuse/main.py:623 #: src/diffuse/main.py:626
msgid "Line Number: " msgid "Line Number: "
msgstr "Número de linha: " msgstr "Número de linha: "
#: src/diffuse/main.py:654 #: src/diffuse/main.py:657
msgid "" msgid ""
"Press the enter key or double click to edit. Press the space bar or use the RMB " "Press the enter key or double click to edit. Press the space bar or use the RMB "
"menu to manually align." "menu to manually align."
@ -172,11 +177,11 @@ msgstr ""
"Pressione Enter ou faça duplo clique para editar. Pressione a barra de espaço ou " "Pressione Enter ou faça duplo clique para editar. Pressione a barra de espaço ou "
"use o menu RMB para alinhar manualmente." "use o menu RMB para alinhar manualmente."
#: src/diffuse/main.py:658 #: src/diffuse/main.py:661
msgid "Press the escape key to finish editing." msgid "Press the escape key to finish editing."
msgstr "Pressione Esc para terminar a edição." msgstr "Pressione Esc para terminar a edição."
#: src/diffuse/main.py:661 #: src/diffuse/main.py:664
msgid "" msgid ""
"Select target line and press the space bar to align. Press the escape key to " "Select target line and press the space bar to align. Press the escape key to "
"cancel." "cancel."
@ -184,426 +189,426 @@ msgstr ""
"Selecione a linha alvo e pressione a barra de espaço para alinhar. Pressione Esc " "Selecione a linha alvo e pressione a barra de espaço para alinhar. Pressione Esc "
"para cancelar." "para cancelar."
#: src/diffuse/main.py:784 #: src/diffuse/main.py:787
msgid "_File" msgid "_File"
msgstr "Arquivo" msgstr "Arquivo"
#: src/diffuse/main.py:785 #: src/diffuse/main.py:788
msgid "_Open File..." msgid "_Open File..."
msgstr "Abrir arquiv_o..." msgstr "Abrir arquiv_o..."
#: src/diffuse/main.py:786 #: src/diffuse/main.py:789
msgid "Open File In New _Tab..." msgid "Open File In New _Tab..."
msgstr "Abrir arquivo em no_va aba..." msgstr "Abrir arquivo em no_va aba..."
#: src/diffuse/main.py:787 #: src/diffuse/main.py:790
msgid "Open _Modified Files..." msgid "Open _Modified Files..."
msgstr "Abrir arquivos _modificados..." msgstr "Abrir arquivos _modificados..."
#: src/diffuse/main.py:788 #: src/diffuse/main.py:791
msgid "Open Commi_t..." msgid "Open Commi_t..."
msgstr "Abrir rev_isão..." msgstr "Abrir rev_isão..."
#: src/diffuse/main.py:789 #: src/diffuse/main.py:792
msgid "_Reload File" msgid "_Reload File"
msgstr "_Recarregar arquivo" msgstr "_Recarregar arquivo"
#: src/diffuse/main.py:791 #: src/diffuse/main.py:794
msgid "_Save File" msgid "_Save File"
msgstr "_Salvar arquivo" msgstr "_Salvar arquivo"
#: src/diffuse/main.py:792 #: src/diffuse/main.py:795
msgid "Save File _As..." msgid "Save File _As..."
msgstr "Salvar _arquivo como..." msgstr "Salvar _arquivo como..."
#: src/diffuse/main.py:793 #: src/diffuse/main.py:796
msgid "Save A_ll" msgid "Save A_ll"
msgstr "Sa_lvar tudo" msgstr "Sa_lvar tudo"
#: src/diffuse/main.py:795 #: src/diffuse/main.py:798
msgid "New _2-Way File Merge" msgid "New _2-Way File Merge"
msgstr "Nova unificação de _2 vias" msgstr "Nova unificação de _2 vias"
#: src/diffuse/main.py:796 #: src/diffuse/main.py:799
msgid "New _3-Way File Merge" msgid "New _3-Way File Merge"
msgstr "Nova unificação de _3 vias" msgstr "Nova unificação de _3 vias"
#: src/diffuse/main.py:797 #: src/diffuse/main.py:800
msgid "New _N-Way File Merge..." msgid "New _N-Way File Merge..."
msgstr "Nova unificação de _N vias..." msgstr "Nova unificação de _N vias..."
#: src/diffuse/main.py:799 #: src/diffuse/main.py:802
msgid "_Close Tab" msgid "_Close Tab"
msgstr "Fe_char aba" msgstr "Fe_char aba"
#: src/diffuse/main.py:800 #: src/diffuse/main.py:803
msgid "_Undo Close Tab" msgid "_Undo Close Tab"
msgstr "Desfa_zer fechamento da aba" msgstr "Desfa_zer fechamento da aba"
#: src/diffuse/main.py:801 #: src/diffuse/main.py:804
msgid "_Quit" msgid "_Quit"
msgstr "_Sair" msgstr "_Sair"
#: src/diffuse/main.py:804 #: src/diffuse/main.py:807
msgid "_Edit" msgid "_Edit"
msgstr "_Editar" msgstr "_Editar"
#: src/diffuse/main.py:805 #: src/diffuse/main.py:808
msgid "_Undo" msgid "_Undo"
msgstr "_Desfazer" msgstr "_Desfazer"
#: src/diffuse/main.py:806 #: src/diffuse/main.py:809
msgid "_Redo" msgid "_Redo"
msgstr "_Refazer" msgstr "_Refazer"
#: src/diffuse/main.py:808 #: src/diffuse/main.py:811
msgid "Cu_t" msgid "Cu_t"
msgstr "Cor_tar" msgstr "Cor_tar"
#: src/diffuse/main.py:809 #: src/diffuse/main.py:812
msgid "_Copy" msgid "_Copy"
msgstr "_Copiar" msgstr "_Copiar"
#: src/diffuse/main.py:810 #: src/diffuse/main.py:813
msgid "_Paste" msgid "_Paste"
msgstr "Co_lar" msgstr "Co_lar"
#: src/diffuse/main.py:812 #: src/diffuse/main.py:815
msgid "Select _All" msgid "Select _All"
msgstr "Selecion_ar tudo" msgstr "Selecion_ar tudo"
#: src/diffuse/main.py:813 #: src/diffuse/main.py:816
msgid "C_lear Edits" msgid "C_lear Edits"
msgstr "_Limpar edições" msgstr "_Limpar edições"
#: src/diffuse/main.py:814 #: src/diffuse/main.py:817
msgid "_Dismiss All Edits" msgid "_Dismiss All Edits"
msgstr "_Descartar toda a edição" msgstr "_Descartar toda a edição"
#: src/diffuse/main.py:816 #: src/diffuse/main.py:819
msgid "_Find..." msgid "_Find..."
msgstr "_Encontrar..." msgstr "_Encontrar..."
#: src/diffuse/main.py:817 #: src/diffuse/main.py:820
msgid "Find _Next" msgid "Find _Next"
msgstr "Encontrar segui_nte" msgstr "Encontrar segui_nte"
#: src/diffuse/main.py:818 #: src/diffuse/main.py:821
msgid "Find Pre_vious" msgid "Find Pre_vious"
msgstr "Encontrar _anterior" msgstr "Encontrar _anterior"
#: src/diffuse/main.py:819 #: src/diffuse/main.py:822
msgid "_Go To Line..." msgid "_Go To Line..."
msgstr "_Ir para linha..." msgstr "_Ir para linha..."
#: src/diffuse/main.py:821 #: src/diffuse/main.py:824
msgid "Pr_eferences..." msgid "Pr_eferences..."
msgstr "Pr_eferências..." msgstr "Pr_eferências..."
#: src/diffuse/main.py:825 #: src/diffuse/main.py:828
msgid "None" msgid "None"
msgstr "Nenhuma" msgstr "Nenhuma"
#: src/diffuse/main.py:843 #: src/diffuse/main.py:846
msgid "_View" msgid "_View"
msgstr "_Ver" msgstr "_Ver"
#: src/diffuse/main.py:844 #: src/diffuse/main.py:847
msgid "_Syntax Highlighting" msgid "_Syntax Highlighting"
msgstr "Destaque de _sintaxe" msgstr "Destaque de _sintaxe"
#: src/diffuse/main.py:846 #: src/diffuse/main.py:849
msgid "Re_align All" msgid "Re_align All"
msgstr "Re_alinhar tudo" msgstr "Re_alinhar tudo"
#: src/diffuse/main.py:847 #: src/diffuse/main.py:850
msgid "_Isolate" msgid "_Isolate"
msgstr "_Isolar" msgstr "_Isolar"
#: src/diffuse/main.py:849 #: src/diffuse/main.py:852
msgid "_First Difference" msgid "_First Difference"
msgstr "_Primeira diferença" msgstr "_Primeira diferença"
#: src/diffuse/main.py:850 #: src/diffuse/main.py:853
msgid "_Previous Difference" msgid "_Previous Difference"
msgstr "Diferença _anterior" msgstr "Diferença _anterior"
#: src/diffuse/main.py:851 #: src/diffuse/main.py:854
msgid "_Next Difference" msgid "_Next Difference"
msgstr "Diferença segui_nte" msgstr "Diferença segui_nte"
#: src/diffuse/main.py:852 #: src/diffuse/main.py:855
msgid "_Last Difference" msgid "_Last Difference"
msgstr "Ú_ltima diferença" msgstr "Ú_ltima diferença"
#: src/diffuse/main.py:854 #: src/diffuse/main.py:857
msgid "Fir_st Tab" msgid "Fir_st Tab"
msgstr "P_rimeira aba" msgstr "P_rimeira aba"
#: src/diffuse/main.py:855 #: src/diffuse/main.py:858
msgid "Pre_vious Tab" msgid "Pre_vious Tab"
msgstr "_Aba anterior" msgstr "_Aba anterior"
#: src/diffuse/main.py:856 #: src/diffuse/main.py:859
msgid "Next _Tab" msgid "Next _Tab"
msgstr "Aba seguin_te" msgstr "Aba seguin_te"
#: src/diffuse/main.py:857 #: src/diffuse/main.py:860
msgid "Las_t Tab" msgid "Las_t Tab"
msgstr "Úl_tima aba" msgstr "Úl_tima aba"
#: src/diffuse/main.py:859 #: src/diffuse/main.py:862
msgid "Shift Pane _Right" msgid "Shift Pane _Right"
msgstr "Mover painel à di_reita" msgstr "Mover painel à di_reita"
#: src/diffuse/main.py:860 #: src/diffuse/main.py:863
msgid "Shift Pane _Left" msgid "Shift Pane _Left"
msgstr "Mover painel à es_querda" msgstr "Mover painel à es_querda"
#: src/diffuse/main.py:863 #: src/diffuse/main.py:866
msgid "F_ormat" msgid "F_ormat"
msgstr "F_ormatar" msgstr "F_ormatar"
#: src/diffuse/main.py:864 #: src/diffuse/main.py:867
msgid "Convert To _Upper Case" msgid "Convert To _Upper Case"
msgstr "Converter para maiúsc_ulas" msgstr "Converter para maiúsc_ulas"
#: src/diffuse/main.py:865 #: src/diffuse/main.py:868
msgid "Convert To _Lower Case" msgid "Convert To _Lower Case"
msgstr "Converter para minúscu_las" msgstr "Converter para minúscu_las"
#: src/diffuse/main.py:867 #: src/diffuse/main.py:870
msgid "Sort Lines In _Ascending Order" msgid "Sort Lines In _Ascending Order"
msgstr "Organizar linhas em ordem _ascendente" msgstr "Organizar linhas em ordem _ascendente"
#: src/diffuse/main.py:868 #: src/diffuse/main.py:871
msgid "Sort Lines In D_escending Order" msgid "Sort Lines In D_escending Order"
msgstr "Organizar linhas em ordem d_escendente" msgstr "Organizar linhas em ordem d_escendente"
#: src/diffuse/main.py:870 #: src/diffuse/main.py:873
msgid "Remove Trailing _White Space" msgid "Remove Trailing _White Space"
msgstr "Remover espaços _finais" msgstr "Remover espaços _finais"
#: src/diffuse/main.py:871 #: src/diffuse/main.py:874
msgid "Convert Tabs To _Spaces" msgid "Convert Tabs To _Spaces"
msgstr "Converter tabulações em e_spaços" msgstr "Converter tabulações em e_spaços"
#: src/diffuse/main.py:872 #: src/diffuse/main.py:875
msgid "Convert Leading Spaces To _Tabs" msgid "Convert Leading Spaces To _Tabs"
msgstr "Converter espaços iniciais em _tabulações" msgstr "Converter espaços iniciais em _tabulações"
#: src/diffuse/main.py:874 #: src/diffuse/main.py:877
msgid "_Increase Indenting" msgid "_Increase Indenting"
msgstr "Aumentar _indentação" msgstr "Aumentar _indentação"
#: src/diffuse/main.py:875 #: src/diffuse/main.py:878
msgid "De_crease Indenting" msgid "De_crease Indenting"
msgstr "Di_minuir indentação" msgstr "Di_minuir indentação"
#: src/diffuse/main.py:877 #: src/diffuse/main.py:880
msgid "Convert To _DOS Format" msgid "Convert To _DOS Format"
msgstr "Converter para formato _DOS" msgstr "Converter para formato _DOS"
#: src/diffuse/main.py:878 #: src/diffuse/main.py:881
msgid "Convert To _Mac Format" msgid "Convert To _Mac Format"
msgstr "Converter para formato _Mac" msgstr "Converter para formato _Mac"
#: src/diffuse/main.py:879 #: src/diffuse/main.py:882
msgid "Convert To Uni_x Format" msgid "Convert To Uni_x Format"
msgstr "Converter para formato Uni_x" msgstr "Converter para formato Uni_x"
#: src/diffuse/main.py:882 #: src/diffuse/main.py:885
msgid "_Merge" msgid "_Merge"
msgstr "_Unificar" msgstr "_Unificar"
#: src/diffuse/main.py:883 #: src/diffuse/main.py:886
msgid "Copy Selection _Right" msgid "Copy Selection _Right"
msgstr "Copiar seleção à di_reita" msgstr "Copiar seleção à di_reita"
#: src/diffuse/main.py:884 #: src/diffuse/main.py:887
msgid "Copy Selection _Left" msgid "Copy Selection _Left"
msgstr "Copiar seleção à es_querda" msgstr "Copiar seleção à es_querda"
#: src/diffuse/main.py:886 #: src/diffuse/main.py:889
msgid "Copy Left _Into Selection" msgid "Copy Left _Into Selection"
msgstr "Cop_iar da esquerda para a seleção" msgstr "Cop_iar da esquerda para a seleção"
#: src/diffuse/main.py:887 #: src/diffuse/main.py:890
msgid "Copy Right I_nto Selection" msgid "Copy Right I_nto Selection"
msgstr "Copiar da _direita para a seleção" msgstr "Copiar da _direita para a seleção"
#: src/diffuse/main.py:888 #: src/diffuse/main.py:891
msgid "_Merge From Left Then Right" msgid "_Merge From Left Then Right"
msgstr "U_nificar da esquerda e depois da direita" msgstr "U_nificar da esquerda e depois da direita"
#: src/diffuse/main.py:889 #: src/diffuse/main.py:892
msgid "M_erge From Right Then Left" msgid "M_erge From Right Then Left"
msgstr "Unificar da dir_eita e depois da esquerda" msgstr "Unificar da dir_eita e depois da esquerda"
#: src/diffuse/main.py:892 #: src/diffuse/main.py:895
msgid "_Help" msgid "_Help"
msgstr "A_juda" msgstr "A_juda"
#: src/diffuse/main.py:893 #: src/diffuse/main.py:896
msgid "_Help Contents..." msgid "_Help Contents..."
msgstr "Conteúdo da a_juda..." msgstr "Conteúdo da a_juda..."
#: src/diffuse/main.py:895 #: src/diffuse/main.py:898
#, python-format #, python-format
msgid "_About %s..." msgid "_About %s..."
msgstr "_Sobre %s..." msgstr "_Sobre %s..."
#: src/diffuse/main.py:910 #: src/diffuse/main.py:913
msgid "New 2-Way File Merge" msgid "New 2-Way File Merge"
msgstr "Nova unificação de _2 vias" msgstr "Nova unificação de _2 vias"
#: src/diffuse/main.py:911 #: src/diffuse/main.py:914
msgid "New 3-Way File Merge" msgid "New 3-Way File Merge"
msgstr "Nova unificação de _3 vias" msgstr "Nova unificação de _3 vias"
#: src/diffuse/main.py:913 #: src/diffuse/main.py:916
msgid "Realign All" msgid "Realign All"
msgstr "Realinhar tudo" msgstr "Realinhar tudo"
#: src/diffuse/main.py:914 #: src/diffuse/main.py:917
msgid "First Difference" msgid "First Difference"
msgstr "Primeira diferença" msgstr "Primeira diferença"
#: src/diffuse/main.py:915 #: src/diffuse/main.py:918
msgid "Previous Difference" msgid "Previous Difference"
msgstr "Diferença anterior" msgstr "Diferença anterior"
#: src/diffuse/main.py:916 #: src/diffuse/main.py:919
msgid "Next Difference" msgid "Next Difference"
msgstr "Diferença seguinte" msgstr "Diferença seguinte"
#: src/diffuse/main.py:917 #: src/diffuse/main.py:920
msgid "Last Difference" msgid "Last Difference"
msgstr "Última diferença" msgstr "Última diferença"
#: src/diffuse/main.py:919 #: src/diffuse/main.py:922
msgid "Copy Selection Right" msgid "Copy Selection Right"
msgstr "Copiar seleção à direita" msgstr "Copiar seleção à direita"
#: src/diffuse/main.py:920 #: src/diffuse/main.py:923
msgid "Copy Selection Left" msgid "Copy Selection Left"
msgstr "Copiar seleção à esquerda" msgstr "Copiar seleção à esquerda"
#: src/diffuse/main.py:921 #: src/diffuse/main.py:924
msgid "Copy Left Into Selection" msgid "Copy Left Into Selection"
msgstr "Copiar da esquerda para a seleção" msgstr "Copiar da esquerda para a seleção"
#: src/diffuse/main.py:922 #: src/diffuse/main.py:925
msgid "Copy Right Into Selection" msgid "Copy Right Into Selection"
msgstr "Copiar da direita para a seleção" msgstr "Copiar da direita para a seleção"
#: src/diffuse/main.py:923 #: src/diffuse/main.py:926
msgid "Merge From Left Then Right" msgid "Merge From Left Then Right"
msgstr "Unificar da esquerda e depois da direita" msgstr "Unificar da esquerda e depois da direita"
#: src/diffuse/main.py:924 #: src/diffuse/main.py:927
msgid "Merge From Right Then Left" msgid "Merge From Right Then Left"
msgstr "Unificar da direita e depois da esquerda" msgstr "Unificar da direita e depois da esquerda"
#: src/diffuse/main.py:926 #: src/diffuse/main.py:929
msgid "Undo" msgid "Undo"
msgstr "Desfazer" msgstr "Desfazer"
#: src/diffuse/main.py:927 #: src/diffuse/main.py:930
msgid "Redo" msgid "Redo"
msgstr "Refazer" msgstr "Refazer"
#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 #: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
msgid "Cut" msgid "Cut"
msgstr "Cortar" msgstr "Cortar"
#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 #: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
msgid "Copy" msgid "Copy"
msgstr "Copiar" msgstr "Copiar"
#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 #: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
msgid "Paste" msgid "Paste"
msgstr "Colar" msgstr "Colar"
#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 #: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
msgid "Clear Edits" msgid "Clear Edits"
msgstr "Limpar edições" msgstr "Limpar edições"
#: src/diffuse/main.py:1054 #: src/diffuse/main.py:1057
msgid "Some files have unsaved changes. Select the files to save before closing." msgid "Some files have unsaved changes. Select the files to save before closing."
msgstr "" msgstr ""
"Alguns arquivos têm alterações não salvas. Selecione os arquivos para salvar " "Alguns arquivos têm alterações não salvas. Selecione os arquivos para salvar "
"antes de fechar." "antes de fechar."
#: src/diffuse/main.py:1068 #: src/diffuse/main.py:1071
msgid "Tab" msgid "Tab"
msgstr "Aba" msgstr "Aba"
#: src/diffuse/main.py:1073 #: src/diffuse/main.py:1076
msgid "Pane" msgid "Pane"
msgstr "Painel" msgstr "Painel"
#: src/diffuse/main.py:1084 #: src/diffuse/main.py:1087
msgid "Close _Without Saving" msgid "Close _Without Saving"
msgstr "Fechar sem sal_var" msgstr "Fechar sem sal_var"
#: src/diffuse/main.py:1123 #: src/diffuse/main.py:1126
#, python-format #, python-format
msgid "Closing this tab will quit %s." msgid "Closing this tab will quit %s."
msgstr "Fechamento da aba resultará em saída do %s." msgstr "Fechamento da aba resultará em saída do %s."
#: src/diffuse/main.py:1206 #: src/diffuse/main.py:1209
#, python-format #, python-format
msgid "File Merge %d" msgid "File Merge %d"
msgstr "Unificação de arquivos %d" msgstr "Unificação de arquivos %d"
#: src/diffuse/main.py:1312 #: src/diffuse/main.py:1315
#, python-format #, python-format
msgid "Error retrieving commits for %s." msgid "Error retrieving commits for %s."
msgstr "Erro ao obter revisões de %s." msgstr "Erro ao obter revisões de %s."
#: src/diffuse/main.py:1344 #: src/diffuse/main.py:1347
#, python-format #, python-format
msgid "Error retrieving modifications for %s." msgid "Error retrieving modifications for %s."
msgstr "Erro ao obter modificações de %s." msgstr "Erro ao obter modificações de %s."
#: src/diffuse/main.py:1377 #: src/diffuse/main.py:1380
msgid "Open File In New Tab" msgid "Open File In New Tab"
msgstr "Abrir arquivo em nova aba" msgstr "Abrir arquivo em nova aba"
#: src/diffuse/main.py:1400 #: src/diffuse/main.py:1403
msgid "Choose Folder With Modified Files" msgid "Choose Folder With Modified Files"
msgstr "Escolha pasta com arquivos modificados" msgstr "Escolha pasta com arquivos modificados"
#: src/diffuse/main.py:1418 #: src/diffuse/main.py:1421
msgid "No modified files found." msgid "No modified files found."
msgstr "Nenhum arquivo modificado." msgstr "Nenhum arquivo modificado."
#: src/diffuse/main.py:1424 #: src/diffuse/main.py:1427
msgid "Choose Folder With Commit" msgid "Choose Folder With Commit"
msgstr "Escolha pasta com revisão" msgstr "Escolha pasta com revisão"
#: src/diffuse/main.py:1444 #: src/diffuse/main.py:1447
msgid "No committed files found." msgid "No committed files found."
msgstr "Nenhum arquivo revisado encontrado." msgstr "Nenhum arquivo revisado encontrado."
#: src/diffuse/main.py:1480 #: src/diffuse/main.py:1483
msgid "New N-Way File Merge..." msgid "New N-Way File Merge..."
msgstr "Nova unificação de N vias..." msgstr "Nova unificação de N vias..."
#: src/diffuse/main.py:1481 #: src/diffuse/main.py:1484
msgid "Number of panes: " msgid "Number of panes: "
msgstr "Número de painéis: " msgstr "Número de painéis: "
#: src/diffuse/main.py:1555 #: src/diffuse/main.py:1558
msgid "Phrase not found. Continue from the end of the file?" msgid "Phrase not found. Continue from the end of the file?"
msgstr "Frase não encontrada. Continuar a partir do final do arquivo?" msgstr "Frase não encontrada. Continuar a partir do final do arquivo?"
#: src/diffuse/main.py:1557 #: src/diffuse/main.py:1560
msgid "Phrase not found. Continue from the start of the file?" msgid "Phrase not found. Continue from the start of the file?"
msgstr "Frase não encontrada. Continuar desde o início do arquivo?" msgstr "Frase não encontrada. Continuar desde o início do arquivo?"
#: src/diffuse/main.py:1778 #: src/diffuse/main.py:1781
#, fuzzy #, fuzzy
msgid "" msgid ""
"Usage:\n" "Usage:\n"
@ -681,16 +686,16 @@ msgstr ""
" ( -i | --ignore-case ) ignora diferenças entre maiúsculas\n" " ( -i | --ignore-case ) ignora diferenças entre maiúsculas\n"
" ( -w | --ignore-all-space ) ignora diferenças de espaços" " ( -w | --ignore-all-space ) ignora diferenças de espaços"
#: src/diffuse/main.py:1945 #: src/diffuse/main.py:1948
msgid "Error parsing line number." msgid "Error parsing line number."
msgstr "Erro ao analisar o número de linha." msgstr "Erro ao analisar o número de linha."
#: src/diffuse/main.py:1955 #: src/diffuse/main.py:1958
#, python-format #, python-format
msgid "Skipping unknown argument \"%s\"." msgid "Skipping unknown argument \"%s\"."
msgstr "Omitindo argumento desconhecido \"%s\"." msgstr "Omitindo argumento desconhecido \"%s\"."
#: src/diffuse/main.py:1963 #: src/diffuse/main.py:1966
#, python-format #, python-format
msgid "Error processing argument \"%s\". Directory not expected." msgid "Error processing argument \"%s\". Directory not expected."
msgstr "Erro ao processar o argumento \"%s\". Pasta imprevista." msgstr "Erro ao processar o argumento \"%s\". Pasta imprevista."
@ -966,7 +971,3 @@ msgstr "Selecionar tudo"
#: src/diffuse/widgets.py:1868 #: src/diffuse/widgets.py:1868
msgid "Swap with Selected Pane" msgid "Swap with Selected Pane"
msgstr "Trocar com o painel selecionado" msgstr "Trocar com o painel selecionado"
#, python-format
#~ msgid "Column %d"
#~ msgstr "Coluna %d"

255
po/ru.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: diffuse-svn\n" "Project-Id-Version: diffuse-svn\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-23 19:48-0400\n" "POT-Creation-Date: 2022-10-23 20:00-0400\n"
"PO-Revision-Date: 2022-04-04 12:19-0400\n" "PO-Revision-Date: 2022-04-04 12:19-0400\n"
"Last-Translator: Oleg Pakhtusov <opakhtusov@gmail.com>\n" "Last-Translator: Oleg Pakhtusov <opakhtusov@gmail.com>\n"
"Language-Team: Russian <opakhtusov@gmail.com>\n" "Language-Team: Russian <opakhtusov@gmail.com>\n"
@ -99,40 +99,45 @@ msgstr "Сохранить Файл"
msgid "Save File As..." msgid "Save File As..."
msgstr "Сохранить Файл Как..." msgstr "Сохранить Файл Как..."
#: src/diffuse/main.py:288 #: src/diffuse/main.py:217
#, python-format
msgid "Column %d"
msgstr "Столбец %d"
#: src/diffuse/main.py:291
msgid "Save changes before loading the new file?" msgid "Save changes before loading the new file?"
msgstr "Сохранить изменения перед загрузкой нового файла?" msgstr "Сохранить изменения перед загрузкой нового файла?"
#: src/diffuse/main.py:399 #: src/diffuse/main.py:402
#, python-format #, python-format
msgid "Error reading revision %(rev)s of %(file)s." msgid "Error reading revision %(rev)s of %(file)s."
msgstr "Ошибка считывания ревизии %(rev)s из %(file)s." msgstr "Ошибка считывания ревизии %(rev)s из %(file)s."
#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #: src/diffuse/main.py:405 src/diffuse/main.py:1860
#, python-format #, python-format
msgid "Error reading %s." msgid "Error reading %s."
msgstr "Ошибка чтения %s." msgstr "Ошибка чтения %s."
#: src/diffuse/main.py:424 #: src/diffuse/main.py:427
msgid "Open File" msgid "Open File"
msgstr "Открыть Файл" msgstr "Открыть Файл"
#: src/diffuse/main.py:481 #: src/diffuse/main.py:484
#, python-format #, python-format
msgid "The file %s changed on disk. Do you want to reload the file?" msgid "The file %s changed on disk. Do you want to reload the file?"
msgstr "Файл %s изменен на диске. Вы хотите перезагрузить этот файл?" msgstr "Файл %s изменен на диске. Вы хотите перезагрузить этот файл?"
#: src/diffuse/main.py:507 #: src/diffuse/main.py:510
#, python-format #, python-format
msgid "Save %(title)s Pane %(pane)d" msgid "Save %(title)s Pane %(pane)d"
msgstr "Сохранить %(title)s Субокно %(pane)d" msgstr "Сохранить %(title)s Субокно %(pane)d"
#: src/diffuse/main.py:539 #: src/diffuse/main.py:542
#, python-format #, python-format
msgid "A file named %s already exists. Do you want to overwrite it?" msgid "A file named %s already exists. Do you want to overwrite it?"
msgstr "Файл под именем %s уже существует. Вы хотите перезаписать его?" msgstr "Файл под именем %s уже существует. Вы хотите перезаписать его?"
#: src/diffuse/main.py:546 #: src/diffuse/main.py:549
#, python-format #, python-format
msgid "" msgid ""
"The file %s has been modified by another process since reading it. If you save, " "The file %s has been modified by another process since reading it. If you save, "
@ -141,25 +146,25 @@ msgstr ""
"Файл %s был изменен другим процессом после его прочтения. На сохранении все " "Файл %s был изменен другим процессом после его прочтения. На сохранении все "
"внешние изменения будут потеряны. Сохранить все равно?" "внешние изменения будут потеряны. Сохранить все равно?"
#: src/diffuse/main.py:588 #: src/diffuse/main.py:591
#, python-format #, python-format
msgid "Error encoding to %s." msgid "Error encoding to %s."
msgstr "Ошибка кодирования в %s." msgstr "Ошибка кодирования в %s."
#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #: src/diffuse/main.py:595 src/diffuse/preferences.py:300
#, python-format #, python-format
msgid "Error writing %s." msgid "Error writing %s."
msgstr "Ошибка записи %s." msgstr "Ошибка записи %s."
#: src/diffuse/main.py:622 #: src/diffuse/main.py:625
msgid "Go To Line..." msgid "Go To Line..."
msgstr "Перейти на Строку..." msgstr "Перейти на Строку..."
#: src/diffuse/main.py:623 #: src/diffuse/main.py:626
msgid "Line Number: " msgid "Line Number: "
msgstr "Номер строки: " msgstr "Номер строки: "
#: src/diffuse/main.py:654 #: src/diffuse/main.py:657
msgid "" msgid ""
"Press the enter key or double click to edit. Press the space bar or use the RMB " "Press the enter key or double click to edit. Press the space bar or use the RMB "
"menu to manually align." "menu to manually align."
@ -167,11 +172,11 @@ msgstr ""
"Нажатие Enter или двойной щелчок для редактирования. Нажатие Space или меню " "Нажатие Enter или двойной щелчок для редактирования. Нажатие Space или меню "
"правого щелчка для выравнивания вручную." "правого щелчка для выравнивания вручную."
#: src/diffuse/main.py:658 #: src/diffuse/main.py:661
msgid "Press the escape key to finish editing." msgid "Press the escape key to finish editing."
msgstr "Нажмите клавишу Escape, чтобы закончить редактирование." msgstr "Нажмите клавишу Escape, чтобы закончить редактирование."
#: src/diffuse/main.py:661 #: src/diffuse/main.py:664
msgid "" msgid ""
"Select target line and press the space bar to align. Press the escape key to " "Select target line and press the space bar to align. Press the escape key to "
"cancel." "cancel."
@ -179,427 +184,427 @@ msgstr ""
"Выберите целевую строку и нажмите клавишу Space, чтобы выровнять. Нажмите Еscape " "Выберите целевую строку и нажмите клавишу Space, чтобы выровнять. Нажмите Еscape "
"для отмены." "для отмены."
#: src/diffuse/main.py:784 #: src/diffuse/main.py:787
msgid "_File" msgid "_File"
msgstr "Фа_йл" msgstr "Фа_йл"
#: src/diffuse/main.py:785 #: src/diffuse/main.py:788
msgid "_Open File..." msgid "_Open File..."
msgstr "О_ткрыть Файл..." msgstr "О_ткрыть Файл..."
#: src/diffuse/main.py:786 #: src/diffuse/main.py:789
msgid "Open File In New _Tab..." msgid "Open File In New _Tab..."
msgstr "Открыт_ь Файл в Новой Вкладке..." msgstr "Открыт_ь Файл в Новой Вкладке..."
#: src/diffuse/main.py:787 #: src/diffuse/main.py:790
msgid "Open _Modified Files..." msgid "Open _Modified Files..."
msgstr "Открыть И_змененные Файлы..." msgstr "Открыть И_змененные Файлы..."
#: src/diffuse/main.py:788 #: src/diffuse/main.py:791
msgid "Open Commi_t..." msgid "Open Commi_t..."
msgstr "Открыть Зафи_ксированные..." msgstr "Открыть Зафи_ксированные..."
#: src/diffuse/main.py:789 #: src/diffuse/main.py:792
msgid "_Reload File" msgid "_Reload File"
msgstr "Пер_езагрузить Файл" msgstr "Пер_езагрузить Файл"
#: src/diffuse/main.py:791 #: src/diffuse/main.py:794
msgid "_Save File" msgid "_Save File"
msgstr "С_охранить Файл" msgstr "С_охранить Файл"
#: src/diffuse/main.py:792 #: src/diffuse/main.py:795
msgid "Save File _As..." msgid "Save File _As..."
msgstr "Сохра_нить Файл Как..." msgstr "Сохра_нить Файл Как..."
#: src/diffuse/main.py:793 #: src/diffuse/main.py:796
msgid "Save A_ll" msgid "Save A_ll"
msgstr "Сохран_ить Все" msgstr "Сохран_ить Все"
#: src/diffuse/main.py:795 #: src/diffuse/main.py:798
msgid "New _2-Way File Merge" msgid "New _2-Way File Merge"
msgstr "Новое _2-Оконное Слияние Файлов" msgstr "Новое _2-Оконное Слияние Файлов"
#: src/diffuse/main.py:796 #: src/diffuse/main.py:799
msgid "New _3-Way File Merge" msgid "New _3-Way File Merge"
msgstr "Новое _3-Оконное Слияние Файлов" msgstr "Новое _3-Оконное Слияние Файлов"
#: src/diffuse/main.py:797 #: src/diffuse/main.py:800
msgid "New _N-Way File Merge..." msgid "New _N-Way File Merge..."
msgstr "Новое _Многооконное Слияние Файлов..." msgstr "Новое _Многооконное Слияние Файлов..."
#: src/diffuse/main.py:799 #: src/diffuse/main.py:802
msgid "_Close Tab" msgid "_Close Tab"
msgstr "З_акрыть Вкладку" msgstr "З_акрыть Вкладку"
#: src/diffuse/main.py:800 #: src/diffuse/main.py:803
msgid "_Undo Close Tab" msgid "_Undo Close Tab"
msgstr "От_менить Закрытие Вкладки" msgstr "От_менить Закрытие Вкладки"
#: src/diffuse/main.py:801 #: src/diffuse/main.py:804
msgid "_Quit" msgid "_Quit"
msgstr "В_ыход" msgstr "В_ыход"
#: src/diffuse/main.py:804 #: src/diffuse/main.py:807
msgid "_Edit" msgid "_Edit"
msgstr "Пра_вка" msgstr "Пра_вка"
#: src/diffuse/main.py:805 #: src/diffuse/main.py:808
msgid "_Undo" msgid "_Undo"
msgstr "От_менить" msgstr "От_менить"
#: src/diffuse/main.py:806 #: src/diffuse/main.py:809
msgid "_Redo" msgid "_Redo"
msgstr "Вер_нуть" msgstr "Вер_нуть"
#: src/diffuse/main.py:808 #: src/diffuse/main.py:811
msgid "Cu_t" msgid "Cu_t"
msgstr "Выре_зать" msgstr "Выре_зать"
#: src/diffuse/main.py:809 #: src/diffuse/main.py:812
msgid "_Copy" msgid "_Copy"
msgstr "Ко_пировать" msgstr "Ко_пировать"
#: src/diffuse/main.py:810 #: src/diffuse/main.py:813
msgid "_Paste" msgid "_Paste"
msgstr "В_ставить" msgstr "В_ставить"
#: src/diffuse/main.py:812 #: src/diffuse/main.py:815
msgid "Select _All" msgid "Select _All"
msgstr "В_ыбрать Все" msgstr "В_ыбрать Все"
#: src/diffuse/main.py:813 #: src/diffuse/main.py:816
msgid "C_lear Edits" msgid "C_lear Edits"
msgstr "Оч_истить Правки" msgstr "Оч_истить Правки"
#: src/diffuse/main.py:814 #: src/diffuse/main.py:817
msgid "_Dismiss All Edits" msgid "_Dismiss All Edits"
msgstr "Сбр_осить Все Правки" msgstr "Сбр_осить Все Правки"
#: src/diffuse/main.py:816 #: src/diffuse/main.py:819
msgid "_Find..." msgid "_Find..."
msgstr "На_йти..." msgstr "На_йти..."
#: src/diffuse/main.py:817 #: src/diffuse/main.py:820
msgid "Find _Next" msgid "Find _Next"
msgstr "Н_айти Следующее" msgstr "Н_айти Следующее"
#: src/diffuse/main.py:818 #: src/diffuse/main.py:821
msgid "Find Pre_vious" msgid "Find Pre_vious"
msgstr "Най_ти Предыдущее" msgstr "Най_ти Предыдущее"
#: src/diffuse/main.py:819 #: src/diffuse/main.py:822
msgid "_Go To Line..." msgid "_Go To Line..."
msgstr "Пер_ейти на Строку..." msgstr "Пер_ейти на Строку..."
#: src/diffuse/main.py:821 #: src/diffuse/main.py:824
msgid "Pr_eferences..." msgid "Pr_eferences..."
msgstr "Предпо_чтения..." msgstr "Предпо_чтения..."
#: src/diffuse/main.py:825 #: src/diffuse/main.py:828
msgid "None" msgid "None"
msgstr "Нет" msgstr "Нет"
#: src/diffuse/main.py:843 #: src/diffuse/main.py:846
msgid "_View" msgid "_View"
msgstr "В_ид" msgstr "В_ид"
#: src/diffuse/main.py:844 #: src/diffuse/main.py:847
msgid "_Syntax Highlighting" msgid "_Syntax Highlighting"
msgstr "Подсве_тка Синтаксиса" msgstr "Подсве_тка Синтаксиса"
#: src/diffuse/main.py:846 #: src/diffuse/main.py:849
msgid "Re_align All" msgid "Re_align All"
msgstr "Пере_строить Все" msgstr "Пере_строить Все"
#: src/diffuse/main.py:847 #: src/diffuse/main.py:850
msgid "_Isolate" msgid "_Isolate"
msgstr "И_золировать" msgstr "И_золировать"
#: src/diffuse/main.py:849 #: src/diffuse/main.py:852
msgid "_First Difference" msgid "_First Difference"
msgstr "Пер_вое Различие" msgstr "Пер_вое Различие"
#: src/diffuse/main.py:850 #: src/diffuse/main.py:853
msgid "_Previous Difference" msgid "_Previous Difference"
msgstr "Предыдуще_е Различие" msgstr "Предыдуще_е Различие"
#: src/diffuse/main.py:851 #: src/diffuse/main.py:854
msgid "_Next Difference" msgid "_Next Difference"
msgstr "Следу_ющее Различие" msgstr "Следу_ющее Различие"
#: src/diffuse/main.py:852 #: src/diffuse/main.py:855
msgid "_Last Difference" msgid "_Last Difference"
msgstr "П_оследнее Различие" msgstr "П_оследнее Различие"
#: src/diffuse/main.py:854 #: src/diffuse/main.py:857
msgid "Fir_st Tab" msgid "Fir_st Tab"
msgstr "Перв_ая Вкладка" msgstr "Перв_ая Вкладка"
#: src/diffuse/main.py:855 #: src/diffuse/main.py:858
msgid "Pre_vious Tab" msgid "Pre_vious Tab"
msgstr "Предыдуща_я Вкладка" msgstr "Предыдуща_я Вкладка"
#: src/diffuse/main.py:856 #: src/diffuse/main.py:859
msgid "Next _Tab" msgid "Next _Tab"
msgstr "С_ледующая Вкладка" msgstr "С_ледующая Вкладка"
#: src/diffuse/main.py:857 #: src/diffuse/main.py:860
msgid "Las_t Tab" msgid "Las_t Tab"
msgstr "Послед_няя Вкладка" msgstr "Послед_няя Вкладка"
#: src/diffuse/main.py:859 #: src/diffuse/main.py:862
msgid "Shift Pane _Right" msgid "Shift Pane _Right"
msgstr "Пере_местить Субокно Вправо" msgstr "Пере_местить Субокно Вправо"
#: src/diffuse/main.py:860 #: src/diffuse/main.py:863
msgid "Shift Pane _Left" msgid "Shift Pane _Left"
msgstr "Перемест_ить Субокно Влево" msgstr "Перемест_ить Субокно Влево"
#: src/diffuse/main.py:863 #: src/diffuse/main.py:866
msgid "F_ormat" msgid "F_ormat"
msgstr "Фор_мат" msgstr "Фор_мат"
#: src/diffuse/main.py:864 #: src/diffuse/main.py:867
msgid "Convert To _Upper Case" msgid "Convert To _Upper Case"
msgstr "Пр_еобразовать в Верхний Регистр" msgstr "Пр_еобразовать в Верхний Регистр"
#: src/diffuse/main.py:865 #: src/diffuse/main.py:868
msgid "Convert To _Lower Case" msgid "Convert To _Lower Case"
msgstr "Пре_образовать в Нижний Регистр" msgstr "Пре_образовать в Нижний Регистр"
#: src/diffuse/main.py:867 #: src/diffuse/main.py:870
msgid "Sort Lines In _Ascending Order" msgid "Sort Lines In _Ascending Order"
msgstr "Сор_тировать Строки в Порядке Возрастания" msgstr "Сор_тировать Строки в Порядке Возрастания"
#: src/diffuse/main.py:868 #: src/diffuse/main.py:871
msgid "Sort Lines In D_escending Order" msgid "Sort Lines In D_escending Order"
msgstr "Сорт_ировать Строки в Порядке Убывания" msgstr "Сорт_ировать Строки в Порядке Убывания"
#: src/diffuse/main.py:870 #: src/diffuse/main.py:873
msgid "Remove Trailing _White Space" msgid "Remove Trailing _White Space"
msgstr "Уда_лить Замыкающие Пробелы" msgstr "Уда_лить Замыкающие Пробелы"
#: src/diffuse/main.py:871 #: src/diffuse/main.py:874
msgid "Convert Tabs To _Spaces" msgid "Convert Tabs To _Spaces"
msgstr "Преобр_азовать Табуляторы в Пробелы" msgstr "Преобр_азовать Табуляторы в Пробелы"
#: src/diffuse/main.py:872 #: src/diffuse/main.py:875
msgid "Convert Leading Spaces To _Tabs" msgid "Convert Leading Spaces To _Tabs"
msgstr "Преобра_зовать Вводные Пробелы в Табуляторы" msgstr "Преобра_зовать Вводные Пробелы в Табуляторы"
#: src/diffuse/main.py:874 #: src/diffuse/main.py:877
msgid "_Increase Indenting" msgid "_Increase Indenting"
msgstr "У_величить Отступ" msgstr "У_величить Отступ"
#: src/diffuse/main.py:875 #: src/diffuse/main.py:878
msgid "De_crease Indenting" msgid "De_crease Indenting"
msgstr "У_меньшить Отступ" msgstr "У_меньшить Отступ"
#: src/diffuse/main.py:877 #: src/diffuse/main.py:880
msgid "Convert To _DOS Format" msgid "Convert To _DOS Format"
msgstr "Преобразоват_ь в DOS Формат" msgstr "Преобразоват_ь в DOS Формат"
#: src/diffuse/main.py:878 #: src/diffuse/main.py:881
msgid "Convert To _Mac Format" msgid "Convert To _Mac Format"
msgstr "Преобразовать в Ma_с Формат" msgstr "Преобразовать в Ma_с Формат"
#: src/diffuse/main.py:879 #: src/diffuse/main.py:882
msgid "Convert To Uni_x Format" msgid "Convert To Uni_x Format"
msgstr "Преобразовать в Uni_х Формат" msgstr "Преобразовать в Uni_х Формат"
#: src/diffuse/main.py:882 #: src/diffuse/main.py:885
msgid "_Merge" msgid "_Merge"
msgstr "С_лияние" msgstr "С_лияние"
#: src/diffuse/main.py:883 #: src/diffuse/main.py:886
msgid "Copy Selection _Right" msgid "Copy Selection _Right"
msgstr "К_опировать Выборку Вправо" msgstr "К_опировать Выборку Вправо"
#: src/diffuse/main.py:884 #: src/diffuse/main.py:887
msgid "Copy Selection _Left" msgid "Copy Selection _Left"
msgstr "Ко_пировать Выборку Влево" msgstr "Ко_пировать Выборку Влево"
#: src/diffuse/main.py:886 #: src/diffuse/main.py:889
msgid "Copy Left _Into Selection" msgid "Copy Left _Into Selection"
msgstr "Копиро_вать Слева в Выборку" msgstr "Копиро_вать Слева в Выборку"
#: src/diffuse/main.py:887 #: src/diffuse/main.py:890
msgid "Copy Right I_nto Selection" msgid "Copy Right I_nto Selection"
msgstr "Копиров_ать Справа в Выборку" msgstr "Копиров_ать Справа в Выборку"
#: src/diffuse/main.py:888 #: src/diffuse/main.py:891
msgid "_Merge From Left Then Right" msgid "_Merge From Left Then Right"
msgstr "С_лияние Слева Затем Справа" msgstr "С_лияние Слева Затем Справа"
#: src/diffuse/main.py:889 #: src/diffuse/main.py:892
msgid "M_erge From Right Then Left" msgid "M_erge From Right Then Left"
msgstr "Сл_ияние Справа Затем Слева" msgstr "Сл_ияние Справа Затем Слева"
#: src/diffuse/main.py:892 #: src/diffuse/main.py:895
msgid "_Help" msgid "_Help"
msgstr "Спр_авка" msgstr "Спр_авка"
#: src/diffuse/main.py:893 #: src/diffuse/main.py:896
msgid "_Help Contents..." msgid "_Help Contents..."
msgstr "Содер_жание Справки..." msgstr "Содер_жание Справки..."
#: src/diffuse/main.py:895 #: src/diffuse/main.py:898
#, python-format #, python-format
msgid "_About %s..." msgid "_About %s..."
msgstr "О пр_ограмме %s..." msgstr "О пр_ограмме %s..."
#: src/diffuse/main.py:910 #: src/diffuse/main.py:913
msgid "New 2-Way File Merge" msgid "New 2-Way File Merge"
msgstr "Новое 2-Оконное Слияние Файлов" msgstr "Новое 2-Оконное Слияние Файлов"
#: src/diffuse/main.py:911 #: src/diffuse/main.py:914
msgid "New 3-Way File Merge" msgid "New 3-Way File Merge"
msgstr "Новое 3-Оконное Слияние Файлов" msgstr "Новое 3-Оконное Слияние Файлов"
#: src/diffuse/main.py:913 #: src/diffuse/main.py:916
msgid "Realign All" msgid "Realign All"
msgstr "Перестроить Все" msgstr "Перестроить Все"
#: src/diffuse/main.py:914 #: src/diffuse/main.py:917
msgid "First Difference" msgid "First Difference"
msgstr "Первое Различие" msgstr "Первое Различие"
#: src/diffuse/main.py:915 #: src/diffuse/main.py:918
msgid "Previous Difference" msgid "Previous Difference"
msgstr "Предыдущее Различие" msgstr "Предыдущее Различие"
#: src/diffuse/main.py:916 #: src/diffuse/main.py:919
msgid "Next Difference" msgid "Next Difference"
msgstr "Следующее Различие" msgstr "Следующее Различие"
#: src/diffuse/main.py:917 #: src/diffuse/main.py:920
msgid "Last Difference" msgid "Last Difference"
msgstr "Последнее Различие" msgstr "Последнее Различие"
#: src/diffuse/main.py:919 #: src/diffuse/main.py:922
msgid "Copy Selection Right" msgid "Copy Selection Right"
msgstr "Копировать Выборку Вправо" msgstr "Копировать Выборку Вправо"
#: src/diffuse/main.py:920 #: src/diffuse/main.py:923
msgid "Copy Selection Left" msgid "Copy Selection Left"
msgstr "Копировать Выборку Влево" msgstr "Копировать Выборку Влево"
#: src/diffuse/main.py:921 #: src/diffuse/main.py:924
msgid "Copy Left Into Selection" msgid "Copy Left Into Selection"
msgstr "Копировать Слева в Выборку" msgstr "Копировать Слева в Выборку"
#: src/diffuse/main.py:922 #: src/diffuse/main.py:925
msgid "Copy Right Into Selection" msgid "Copy Right Into Selection"
msgstr "Копировать Справа в Выборку" msgstr "Копировать Справа в Выборку"
#: src/diffuse/main.py:923 #: src/diffuse/main.py:926
msgid "Merge From Left Then Right" msgid "Merge From Left Then Right"
msgstr "Слияние Слева Затем Справа" msgstr "Слияние Слева Затем Справа"
#: src/diffuse/main.py:924 #: src/diffuse/main.py:927
msgid "Merge From Right Then Left" msgid "Merge From Right Then Left"
msgstr "Слияние Справа Затем Слева" msgstr "Слияние Справа Затем Слева"
#: src/diffuse/main.py:926 #: src/diffuse/main.py:929
msgid "Undo" msgid "Undo"
msgstr "Отменить" msgstr "Отменить"
#: src/diffuse/main.py:927 #: src/diffuse/main.py:930
msgid "Redo" msgid "Redo"
msgstr "Вернуть" msgstr "Вернуть"
#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 #: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
msgid "Cut" msgid "Cut"
msgstr "Вырезать" msgstr "Вырезать"
#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 #: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
msgid "Copy" msgid "Copy"
msgstr "Копировать" msgstr "Копировать"
#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 #: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
msgid "Paste" msgid "Paste"
msgstr "Вставить" msgstr "Вставить"
#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 #: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
msgid "Clear Edits" msgid "Clear Edits"
msgstr "Очистить Правки" msgstr "Очистить Правки"
#: src/diffuse/main.py:1054 #: src/diffuse/main.py:1057
#, fuzzy #, fuzzy
msgid "Some files have unsaved changes. Select the files to save before closing." msgid "Some files have unsaved changes. Select the files to save before closing."
msgstr "" msgstr ""
"Некоторые файлы имеют несохраненные изменения.\n" "Некоторые файлы имеют несохраненные изменения.\n"
"Выберите файлы для сохранения перед закрытием." "Выберите файлы для сохранения перед закрытием."
#: src/diffuse/main.py:1068 #: src/diffuse/main.py:1071
msgid "Tab" msgid "Tab"
msgstr "Вкладка" msgstr "Вкладка"
#: src/diffuse/main.py:1073 #: src/diffuse/main.py:1076
msgid "Pane" msgid "Pane"
msgstr "Субокно" msgstr "Субокно"
#: src/diffuse/main.py:1084 #: src/diffuse/main.py:1087
msgid "Close _Without Saving" msgid "Close _Without Saving"
msgstr "Закр_ыть Без Сохранения" msgstr "Закр_ыть Без Сохранения"
#: src/diffuse/main.py:1123 #: src/diffuse/main.py:1126
#, python-format #, python-format
msgid "Closing this tab will quit %s." msgid "Closing this tab will quit %s."
msgstr "Закрытие этой вкладки закроет %s." msgstr "Закрытие этой вкладки закроет %s."
#: src/diffuse/main.py:1206 #: src/diffuse/main.py:1209
#, python-format #, python-format
msgid "File Merge %d" msgid "File Merge %d"
msgstr "Слияние Файлов %d" msgstr "Слияние Файлов %d"
#: src/diffuse/main.py:1312 #: src/diffuse/main.py:1315
#, python-format #, python-format
msgid "Error retrieving commits for %s." msgid "Error retrieving commits for %s."
msgstr "Ошибка извлечения фиксаций для %s." msgstr "Ошибка извлечения фиксаций для %s."
#: src/diffuse/main.py:1344 #: src/diffuse/main.py:1347
#, python-format #, python-format
msgid "Error retrieving modifications for %s." msgid "Error retrieving modifications for %s."
msgstr "Ошибка извлечения модификаций для %s." msgstr "Ошибка извлечения модификаций для %s."
#: src/diffuse/main.py:1377 #: src/diffuse/main.py:1380
msgid "Open File In New Tab" msgid "Open File In New Tab"
msgstr "Открыть Файл в Новой Вкладке" msgstr "Открыть Файл в Новой Вкладке"
#: src/diffuse/main.py:1400 #: src/diffuse/main.py:1403
msgid "Choose Folder With Modified Files" msgid "Choose Folder With Modified Files"
msgstr "Выбрать Папку с Измененными Файлами" msgstr "Выбрать Папку с Измененными Файлами"
#: src/diffuse/main.py:1418 #: src/diffuse/main.py:1421
msgid "No modified files found." msgid "No modified files found."
msgstr "Модифицированные файлы не найдены." msgstr "Модифицированные файлы не найдены."
#: src/diffuse/main.py:1424 #: src/diffuse/main.py:1427
msgid "Choose Folder With Commit" msgid "Choose Folder With Commit"
msgstr "Выбрать Папку с Зафиксированными Изменениями" msgstr "Выбрать Папку с Зафиксированными Изменениями"
#: src/diffuse/main.py:1444 #: src/diffuse/main.py:1447
msgid "No committed files found." msgid "No committed files found."
msgstr "Файлы с фиксациями не найдены." msgstr "Файлы с фиксациями не найдены."
#: src/diffuse/main.py:1480 #: src/diffuse/main.py:1483
msgid "New N-Way File Merge..." msgid "New N-Way File Merge..."
msgstr "Новое Многооконное Слияние Файлов..." msgstr "Новое Многооконное Слияние Файлов..."
#: src/diffuse/main.py:1481 #: src/diffuse/main.py:1484
msgid "Number of panes: " msgid "Number of panes: "
msgstr "Количество субокна: " msgstr "Количество субокна: "
#: src/diffuse/main.py:1555 #: src/diffuse/main.py:1558
msgid "Phrase not found. Continue from the end of the file?" msgid "Phrase not found. Continue from the end of the file?"
msgstr "Фраза не найдена. Продолжить с конца файла?" msgstr "Фраза не найдена. Продолжить с конца файла?"
#: src/diffuse/main.py:1557 #: src/diffuse/main.py:1560
msgid "Phrase not found. Continue from the start of the file?" msgid "Phrase not found. Continue from the start of the file?"
msgstr "Фраза не найдена. Продолжить с начала файла?" msgstr "Фраза не найдена. Продолжить с начала файла?"
#: src/diffuse/main.py:1778 #: src/diffuse/main.py:1781
#, fuzzy #, fuzzy
msgid "" msgid ""
"Usage:\n" "Usage:\n"
@ -680,16 +685,16 @@ msgstr ""
" ( -i | --ignore-case ) Игнорировать различия регистра символов\n" " ( -i | --ignore-case ) Игнорировать различия регистра символов\n"
" ( -w | --ignore-all-space ) Игнорировать различия свободного места" " ( -w | --ignore-all-space ) Игнорировать различия свободного места"
#: src/diffuse/main.py:1945 #: src/diffuse/main.py:1948
msgid "Error parsing line number." msgid "Error parsing line number."
msgstr "Ошибка анализа номера строки." msgstr "Ошибка анализа номера строки."
#: src/diffuse/main.py:1955 #: src/diffuse/main.py:1958
#, python-format #, python-format
msgid "Skipping unknown argument \"%s\"." msgid "Skipping unknown argument \"%s\"."
msgstr "Пропуск неизвестного параметра \"%s\"." msgstr "Пропуск неизвестного параметра \"%s\"."
#: src/diffuse/main.py:1963 #: src/diffuse/main.py:1966
#, python-format #, python-format
msgid "Error processing argument \"%s\". Directory not expected." msgid "Error processing argument \"%s\". Directory not expected."
msgstr "Ошибка обработки параметра \"%s\". Каталог не ожидался." msgstr "Ошибка обработки параметра \"%s\". Каталог не ожидался."
@ -965,7 +970,3 @@ msgstr "Выбрать Все"
#: src/diffuse/widgets.py:1868 #: src/diffuse/widgets.py:1868
msgid "Swap with Selected Pane" msgid "Swap with Selected Pane"
msgstr "Обменять с Выбранным Субокном" msgstr "Обменять с Выбранным Субокном"
#, python-format
#~ msgid "Column %d"
#~ msgstr "Столбец %d"

254
po/sv.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-23 19:48-0400\n" "POT-Creation-Date: 2022-10-23 20:00-0400\n"
"PO-Revision-Date: 2021-01-17 22:14+0100\n" "PO-Revision-Date: 2021-01-17 22:14+0100\n"
"Last-Translator: Åke Engelbrektson <eson@svenskasprakfiler.se>\n" "Last-Translator: Åke Engelbrektson <eson@svenskasprakfiler.se>\n"
"Language-Team: Svenska Språkfiler <contactform@svenskasprakfiler.se>\n" "Language-Team: Svenska Språkfiler <contactform@svenskasprakfiler.se>\n"
@ -95,40 +95,45 @@ msgstr "Spara filen"
msgid "Save File As..." msgid "Save File As..."
msgstr "Spara filen som..." msgstr "Spara filen som..."
#: src/diffuse/main.py:288 #: src/diffuse/main.py:217
#, python-format
msgid "Column %d"
msgstr "Kolumn %d"
#: src/diffuse/main.py:291
msgid "Save changes before loading the new file?" msgid "Save changes before loading the new file?"
msgstr "Vill du spara ändringar före inläsning av den ny filen?" msgstr "Vill du spara ändringar före inläsning av den ny filen?"
#: src/diffuse/main.py:399 #: src/diffuse/main.py:402
#, python-format #, python-format
msgid "Error reading revision %(rev)s of %(file)s." msgid "Error reading revision %(rev)s of %(file)s."
msgstr "Fel vid läsning av revision %(rev)s i %(file)s." msgstr "Fel vid läsning av revision %(rev)s i %(file)s."
#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #: src/diffuse/main.py:405 src/diffuse/main.py:1860
#, python-format #, python-format
msgid "Error reading %s." msgid "Error reading %s."
msgstr "Fel vid läsning av %s." msgstr "Fel vid läsning av %s."
#: src/diffuse/main.py:424 #: src/diffuse/main.py:427
msgid "Open File" msgid "Open File"
msgstr "Öppna fil" msgstr "Öppna fil"
#: src/diffuse/main.py:481 #: src/diffuse/main.py:484
#, python-format #, python-format
msgid "The file %s changed on disk. Do you want to reload the file?" msgid "The file %s changed on disk. Do you want to reload the file?"
msgstr "Filen %s har ändrats på disk. Vill du läsa in filen igen?" msgstr "Filen %s har ändrats på disk. Vill du läsa in filen igen?"
#: src/diffuse/main.py:507 #: src/diffuse/main.py:510
#, python-format #, python-format
msgid "Save %(title)s Pane %(pane)d" msgid "Save %(title)s Pane %(pane)d"
msgstr "Spara %(title)s Panel %(pane)d" msgstr "Spara %(title)s Panel %(pane)d"
#: src/diffuse/main.py:539 #: src/diffuse/main.py:542
#, python-format #, python-format
msgid "A file named %s already exists. Do you want to overwrite it?" msgid "A file named %s already exists. Do you want to overwrite it?"
msgstr "Det finns redan en fil som heter %s. Vill du skriva över den?" msgstr "Det finns redan en fil som heter %s. Vill du skriva över den?"
#: src/diffuse/main.py:546 #: src/diffuse/main.py:549
#, python-format #, python-format
msgid "" msgid ""
"The file %s has been modified by another process since reading it. If you save, " "The file %s has been modified by another process since reading it. If you save, "
@ -137,25 +142,25 @@ msgstr ""
"Filen %s har ändrats av en annan process sedan inläsning. Om du sparar kan alla " "Filen %s har ändrats av en annan process sedan inläsning. Om du sparar kan alla "
"externa ändringar förloras. Vill du spara ändå?" "externa ändringar förloras. Vill du spara ändå?"
#: src/diffuse/main.py:588 #: src/diffuse/main.py:591
#, python-format #, python-format
msgid "Error encoding to %s." msgid "Error encoding to %s."
msgstr "Fel vid kodning till %s." msgstr "Fel vid kodning till %s."
#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #: src/diffuse/main.py:595 src/diffuse/preferences.py:300
#, python-format #, python-format
msgid "Error writing %s." msgid "Error writing %s."
msgstr "Fel vid skrivning av %s." msgstr "Fel vid skrivning av %s."
#: src/diffuse/main.py:622 #: src/diffuse/main.py:625
msgid "Go To Line..." msgid "Go To Line..."
msgstr "Gå till rad..." msgstr "Gå till rad..."
#: src/diffuse/main.py:623 #: src/diffuse/main.py:626
msgid "Line Number: " msgid "Line Number: "
msgstr "Radnummer: " msgstr "Radnummer: "
#: src/diffuse/main.py:654 #: src/diffuse/main.py:657
msgid "" msgid ""
"Press the enter key or double click to edit. Press the space bar or use the RMB " "Press the enter key or double click to edit. Press the space bar or use the RMB "
"menu to manually align." "menu to manually align."
@ -163,435 +168,435 @@ msgstr ""
"Tryck på returtangenten eller dubbelklicka för att redigera. Tryck blanksteg " "Tryck på returtangenten eller dubbelklicka för att redigera. Tryck blanksteg "
"eller använd kontextmenyn för att justera manuellt." "eller använd kontextmenyn för att justera manuellt."
#: src/diffuse/main.py:658 #: src/diffuse/main.py:661
msgid "Press the escape key to finish editing." msgid "Press the escape key to finish editing."
msgstr "Tryck på Esc-tangenten för att avsluta redigering." msgstr "Tryck på Esc-tangenten för att avsluta redigering."
#: src/diffuse/main.py:661 #: src/diffuse/main.py:664
msgid "" msgid ""
"Select target line and press the space bar to align. Press the escape key to " "Select target line and press the space bar to align. Press the escape key to "
"cancel." "cancel."
msgstr "Välj målrad och tryck blanksteg för att justera. Tryck Esc för att avbryta." msgstr "Välj målrad och tryck blanksteg för att justera. Tryck Esc för att avbryta."
#: src/diffuse/main.py:784 #: src/diffuse/main.py:787
msgid "_File" msgid "_File"
msgstr "_Arkiv" msgstr "_Arkiv"
#: src/diffuse/main.py:785 #: src/diffuse/main.py:788
msgid "_Open File..." msgid "_Open File..."
msgstr "_Öppna fil..." msgstr "_Öppna fil..."
#: src/diffuse/main.py:786 #: src/diffuse/main.py:789
msgid "Open File In New _Tab..." msgid "Open File In New _Tab..."
msgstr "Öppna fil i ny _flik..." msgstr "Öppna fil i ny _flik..."
#: src/diffuse/main.py:787 #: src/diffuse/main.py:790
msgid "Open _Modified Files..." msgid "Open _Modified Files..."
msgstr "Öppna _ändrade filer..." msgstr "Öppna _ändrade filer..."
#: src/diffuse/main.py:788 #: src/diffuse/main.py:791
msgid "Open Commi_t..." msgid "Open Commi_t..."
msgstr "_Öppna arkivering..." msgstr "_Öppna arkivering..."
#: src/diffuse/main.py:789 #: src/diffuse/main.py:792
msgid "_Reload File" msgid "_Reload File"
msgstr "_Läs in filen igen" msgstr "_Läs in filen igen"
#: src/diffuse/main.py:791 #: src/diffuse/main.py:794
msgid "_Save File" msgid "_Save File"
msgstr "_Spara filen" msgstr "_Spara filen"
#: src/diffuse/main.py:792 #: src/diffuse/main.py:795
msgid "Save File _As..." msgid "Save File _As..."
msgstr "Spara filen _som..." msgstr "Spara filen _som..."
#: src/diffuse/main.py:793 #: src/diffuse/main.py:796
msgid "Save A_ll" msgid "Save A_ll"
msgstr "Spara a_lla" msgstr "Spara a_lla"
#: src/diffuse/main.py:795 #: src/diffuse/main.py:798
msgid "New _2-Way File Merge" msgid "New _2-Way File Merge"
msgstr "Ny _2-vägs filsammanslagning" msgstr "Ny _2-vägs filsammanslagning"
#: src/diffuse/main.py:796 #: src/diffuse/main.py:799
msgid "New _3-Way File Merge" msgid "New _3-Way File Merge"
msgstr "Ny _3-vägs filsammanslagning" msgstr "Ny _3-vägs filsammanslagning"
#: src/diffuse/main.py:797 #: src/diffuse/main.py:800
msgid "New _N-Way File Merge..." msgid "New _N-Way File Merge..."
msgstr "Ny _x-vägs filsammanslagning..." msgstr "Ny _x-vägs filsammanslagning..."
#: src/diffuse/main.py:799 #: src/diffuse/main.py:802
msgid "_Close Tab" msgid "_Close Tab"
msgstr "_Stäng fliken" msgstr "_Stäng fliken"
#: src/diffuse/main.py:800 #: src/diffuse/main.py:803
msgid "_Undo Close Tab" msgid "_Undo Close Tab"
msgstr "_Ångra flikstängning" msgstr "_Ångra flikstängning"
#: src/diffuse/main.py:801 #: src/diffuse/main.py:804
msgid "_Quit" msgid "_Quit"
msgstr "_Avsluta" msgstr "_Avsluta"
#: src/diffuse/main.py:804 #: src/diffuse/main.py:807
msgid "_Edit" msgid "_Edit"
msgstr "_Redigera" msgstr "_Redigera"
#: src/diffuse/main.py:805 #: src/diffuse/main.py:808
msgid "_Undo" msgid "_Undo"
msgstr "_Ångra" msgstr "_Ångra"
#: src/diffuse/main.py:806 #: src/diffuse/main.py:809
msgid "_Redo" msgid "_Redo"
msgstr "_Upprepa" msgstr "_Upprepa"
#: src/diffuse/main.py:808 #: src/diffuse/main.py:811
msgid "Cu_t" msgid "Cu_t"
msgstr "Klipp _ut" msgstr "Klipp _ut"
#: src/diffuse/main.py:809 #: src/diffuse/main.py:812
msgid "_Copy" msgid "_Copy"
msgstr "_Kopiera" msgstr "_Kopiera"
#: src/diffuse/main.py:810 #: src/diffuse/main.py:813
msgid "_Paste" msgid "_Paste"
msgstr "_Klistra in" msgstr "_Klistra in"
#: src/diffuse/main.py:812 #: src/diffuse/main.py:815
msgid "Select _All" msgid "Select _All"
msgstr "Markera _alla" msgstr "Markera _alla"
#: src/diffuse/main.py:813 #: src/diffuse/main.py:816
msgid "C_lear Edits" msgid "C_lear Edits"
msgstr "_Rensa bort ändringar" msgstr "_Rensa bort ändringar"
#: src/diffuse/main.py:814 #: src/diffuse/main.py:817
msgid "_Dismiss All Edits" msgid "_Dismiss All Edits"
msgstr "_Förkasta alla ändringar" msgstr "_Förkasta alla ändringar"
#: src/diffuse/main.py:816 #: src/diffuse/main.py:819
msgid "_Find..." msgid "_Find..."
msgstr "_Sök..." msgstr "_Sök..."
#: src/diffuse/main.py:817 #: src/diffuse/main.py:820
msgid "Find _Next" msgid "Find _Next"
msgstr "Sök _nästa" msgstr "Sök _nästa"
#: src/diffuse/main.py:818 #: src/diffuse/main.py:821
msgid "Find Pre_vious" msgid "Find Pre_vious"
msgstr "Sök _föregående" msgstr "Sök _föregående"
#: src/diffuse/main.py:819 #: src/diffuse/main.py:822
msgid "_Go To Line..." msgid "_Go To Line..."
msgstr "_Gå till rad..." msgstr "_Gå till rad..."
#: src/diffuse/main.py:821 #: src/diffuse/main.py:824
msgid "Pr_eferences..." msgid "Pr_eferences..."
msgstr "_Inställningar..." msgstr "_Inställningar..."
#: src/diffuse/main.py:825 #: src/diffuse/main.py:828
msgid "None" msgid "None"
msgstr "Ingen" msgstr "Ingen"
#: src/diffuse/main.py:843 #: src/diffuse/main.py:846
msgid "_View" msgid "_View"
msgstr "_Visa" msgstr "_Visa"
#: src/diffuse/main.py:844 #: src/diffuse/main.py:847
msgid "_Syntax Highlighting" msgid "_Syntax Highlighting"
msgstr "_Syntaxmarkering" msgstr "_Syntaxmarkering"
#: src/diffuse/main.py:846 #: src/diffuse/main.py:849
msgid "Re_align All" msgid "Re_align All"
msgstr "_Omjustera alla" msgstr "_Omjustera alla"
#: src/diffuse/main.py:847 #: src/diffuse/main.py:850
msgid "_Isolate" msgid "_Isolate"
msgstr "_Isolera" msgstr "_Isolera"
#: src/diffuse/main.py:849 #: src/diffuse/main.py:852
msgid "_First Difference" msgid "_First Difference"
msgstr "_Första olikheten" msgstr "_Första olikheten"
#: src/diffuse/main.py:850 #: src/diffuse/main.py:853
msgid "_Previous Difference" msgid "_Previous Difference"
msgstr "_Föregående olikhet" msgstr "_Föregående olikhet"
#: src/diffuse/main.py:851 #: src/diffuse/main.py:854
msgid "_Next Difference" msgid "_Next Difference"
msgstr "_Nästa olikhet" msgstr "_Nästa olikhet"
#: src/diffuse/main.py:852 #: src/diffuse/main.py:855
msgid "_Last Difference" msgid "_Last Difference"
msgstr "_Sista olikheten" msgstr "_Sista olikheten"
#: src/diffuse/main.py:854 #: src/diffuse/main.py:857
msgid "Fir_st Tab" msgid "Fir_st Tab"
msgstr "F_örsta fliken" msgstr "F_örsta fliken"
#: src/diffuse/main.py:855 #: src/diffuse/main.py:858
msgid "Pre_vious Tab" msgid "Pre_vious Tab"
msgstr "Före_gående flik" msgstr "Före_gående flik"
#: src/diffuse/main.py:856 #: src/diffuse/main.py:859
msgid "Next _Tab" msgid "Next _Tab"
msgstr "Nästa _flik" msgstr "Nästa _flik"
#: src/diffuse/main.py:857 #: src/diffuse/main.py:860
msgid "Las_t Tab" msgid "Las_t Tab"
msgstr "S_ista fliken" msgstr "S_ista fliken"
#: src/diffuse/main.py:859 #: src/diffuse/main.py:862
msgid "Shift Pane _Right" msgid "Shift Pane _Right"
msgstr "Växla panel _höger" msgstr "Växla panel _höger"
#: src/diffuse/main.py:860 #: src/diffuse/main.py:863
msgid "Shift Pane _Left" msgid "Shift Pane _Left"
msgstr "Växla panel _vänster" msgstr "Växla panel _vänster"
#: src/diffuse/main.py:863 #: src/diffuse/main.py:866
msgid "F_ormat" msgid "F_ormat"
msgstr "F_ormat" msgstr "F_ormat"
#: src/diffuse/main.py:864 #: src/diffuse/main.py:867
msgid "Convert To _Upper Case" msgid "Convert To _Upper Case"
msgstr "Konvertera till _VERSALER" msgstr "Konvertera till _VERSALER"
#: src/diffuse/main.py:865 #: src/diffuse/main.py:868
msgid "Convert To _Lower Case" msgid "Convert To _Lower Case"
msgstr "Konvertera till _gemener" msgstr "Konvertera till _gemener"
#: src/diffuse/main.py:867 #: src/diffuse/main.py:870
msgid "Sort Lines In _Ascending Order" msgid "Sort Lines In _Ascending Order"
msgstr "Sortera rader i _stigande ordning" msgstr "Sortera rader i _stigande ordning"
#: src/diffuse/main.py:868 #: src/diffuse/main.py:871
msgid "Sort Lines In D_escending Order" msgid "Sort Lines In D_escending Order"
msgstr "Sortera rader i _fallande ordning" msgstr "Sortera rader i _fallande ordning"
#: src/diffuse/main.py:870 #: src/diffuse/main.py:873
msgid "Remove Trailing _White Space" msgid "Remove Trailing _White Space"
msgstr "Ta bort avslutande blanksteg" msgstr "Ta bort avslutande blanksteg"
#: src/diffuse/main.py:871 #: src/diffuse/main.py:874
msgid "Convert Tabs To _Spaces" msgid "Convert Tabs To _Spaces"
msgstr "Konvertera tabbar till _blanksteg" msgstr "Konvertera tabbar till _blanksteg"
#: src/diffuse/main.py:872 #: src/diffuse/main.py:875
msgid "Convert Leading Spaces To _Tabs" msgid "Convert Leading Spaces To _Tabs"
msgstr "Konvertera inledande blanksteg till _tabbar" msgstr "Konvertera inledande blanksteg till _tabbar"
#: src/diffuse/main.py:874 #: src/diffuse/main.py:877
msgid "_Increase Indenting" msgid "_Increase Indenting"
msgstr "_Utöka indrag" msgstr "_Utöka indrag"
#: src/diffuse/main.py:875 #: src/diffuse/main.py:878
msgid "De_crease Indenting" msgid "De_crease Indenting"
msgstr "Mi_nska indrag" msgstr "Mi_nska indrag"
#: src/diffuse/main.py:877 #: src/diffuse/main.py:880
msgid "Convert To _DOS Format" msgid "Convert To _DOS Format"
msgstr "Konvertera till _DOS-format" msgstr "Konvertera till _DOS-format"
#: src/diffuse/main.py:878 #: src/diffuse/main.py:881
msgid "Convert To _Mac Format" msgid "Convert To _Mac Format"
msgstr "Konvertera till _MAC-format" msgstr "Konvertera till _MAC-format"
#: src/diffuse/main.py:879 #: src/diffuse/main.py:882
msgid "Convert To Uni_x Format" msgid "Convert To Uni_x Format"
msgstr "Konvertera till _Unix-format" msgstr "Konvertera till _Unix-format"
#: src/diffuse/main.py:882 #: src/diffuse/main.py:885
msgid "_Merge" msgid "_Merge"
msgstr "_Sammanfoga" msgstr "_Sammanfoga"
#: src/diffuse/main.py:883 #: src/diffuse/main.py:886
msgid "Copy Selection _Right" msgid "Copy Selection _Right"
msgstr "Kopiera från markerat till _höger" msgstr "Kopiera från markerat till _höger"
#: src/diffuse/main.py:884 #: src/diffuse/main.py:887
msgid "Copy Selection _Left" msgid "Copy Selection _Left"
msgstr "Kopiera från markerat till _vänster" msgstr "Kopiera från markerat till _vänster"
#: src/diffuse/main.py:886 #: src/diffuse/main.py:889
msgid "Copy Left _Into Selection" msgid "Copy Left _Into Selection"
msgstr "Kopiera från vänster till _markerat" msgstr "Kopiera från vänster till _markerat"
#: src/diffuse/main.py:887 #: src/diffuse/main.py:890
msgid "Copy Right I_nto Selection" msgid "Copy Right I_nto Selection"
msgstr "Kopiera från höger till m_arkerat" msgstr "Kopiera från höger till m_arkerat"
#: src/diffuse/main.py:888 #: src/diffuse/main.py:891
msgid "_Merge From Left Then Right" msgid "_Merge From Left Then Right"
msgstr "_Sammanfoga från vänster, sedan höger" msgstr "_Sammanfoga från vänster, sedan höger"
#: src/diffuse/main.py:889 #: src/diffuse/main.py:892
msgid "M_erge From Right Then Left" msgid "M_erge From Right Then Left"
msgstr "S_ammanfoga från höger, sedan vänster" msgstr "S_ammanfoga från höger, sedan vänster"
#: src/diffuse/main.py:892 #: src/diffuse/main.py:895
msgid "_Help" msgid "_Help"
msgstr "_Hjälp" msgstr "_Hjälp"
#: src/diffuse/main.py:893 #: src/diffuse/main.py:896
msgid "_Help Contents..." msgid "_Help Contents..."
msgstr "_Hjälpinnehåll..." msgstr "_Hjälpinnehåll..."
#: src/diffuse/main.py:895 #: src/diffuse/main.py:898
#, python-format #, python-format
msgid "_About %s..." msgid "_About %s..."
msgstr "_Om %s..." msgstr "_Om %s..."
#: src/diffuse/main.py:910 #: src/diffuse/main.py:913
msgid "New 2-Way File Merge" msgid "New 2-Way File Merge"
msgstr "Ny 2-vägs filsammanslagning" msgstr "Ny 2-vägs filsammanslagning"
#: src/diffuse/main.py:911 #: src/diffuse/main.py:914
msgid "New 3-Way File Merge" msgid "New 3-Way File Merge"
msgstr "Ny 3-vägs filsammanslagning" msgstr "Ny 3-vägs filsammanslagning"
#: src/diffuse/main.py:913 #: src/diffuse/main.py:916
msgid "Realign All" msgid "Realign All"
msgstr "Omjustera alla" msgstr "Omjustera alla"
#: src/diffuse/main.py:914 #: src/diffuse/main.py:917
msgid "First Difference" msgid "First Difference"
msgstr "Första olikheten" msgstr "Första olikheten"
#: src/diffuse/main.py:915 #: src/diffuse/main.py:918
msgid "Previous Difference" msgid "Previous Difference"
msgstr "Föregående olikhet" msgstr "Föregående olikhet"
#: src/diffuse/main.py:916 #: src/diffuse/main.py:919
msgid "Next Difference" msgid "Next Difference"
msgstr "Nästa olikhet" msgstr "Nästa olikhet"
#: src/diffuse/main.py:917 #: src/diffuse/main.py:920
msgid "Last Difference" msgid "Last Difference"
msgstr "Sista olikheten" msgstr "Sista olikheten"
#: src/diffuse/main.py:919 #: src/diffuse/main.py:922
msgid "Copy Selection Right" msgid "Copy Selection Right"
msgstr "Kopiera från markerat till höger" msgstr "Kopiera från markerat till höger"
#: src/diffuse/main.py:920 #: src/diffuse/main.py:923
msgid "Copy Selection Left" msgid "Copy Selection Left"
msgstr "Kopiera från markerat till vänster" msgstr "Kopiera från markerat till vänster"
#: src/diffuse/main.py:921 #: src/diffuse/main.py:924
msgid "Copy Left Into Selection" msgid "Copy Left Into Selection"
msgstr "Kopiera från vänster till markerat" msgstr "Kopiera från vänster till markerat"
#: src/diffuse/main.py:922 #: src/diffuse/main.py:925
msgid "Copy Right Into Selection" msgid "Copy Right Into Selection"
msgstr "Kopiera från höger till markerat" msgstr "Kopiera från höger till markerat"
#: src/diffuse/main.py:923 #: src/diffuse/main.py:926
msgid "Merge From Left Then Right" msgid "Merge From Left Then Right"
msgstr "Sammanfoga från vänster, sedan höger" msgstr "Sammanfoga från vänster, sedan höger"
#: src/diffuse/main.py:924 #: src/diffuse/main.py:927
msgid "Merge From Right Then Left" msgid "Merge From Right Then Left"
msgstr "Sammanfoga från höger, sedan vänster" msgstr "Sammanfoga från höger, sedan vänster"
#: src/diffuse/main.py:926 #: src/diffuse/main.py:929
msgid "Undo" msgid "Undo"
msgstr "Ångra" msgstr "Ångra"
#: src/diffuse/main.py:927 #: src/diffuse/main.py:930
msgid "Redo" msgid "Redo"
msgstr "Upprepa" msgstr "Upprepa"
#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 #: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
msgid "Cut" msgid "Cut"
msgstr "Klipp ut" msgstr "Klipp ut"
#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 #: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
msgid "Copy" msgid "Copy"
msgstr "Kopiera" msgstr "Kopiera"
#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 #: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
msgid "Paste" msgid "Paste"
msgstr "Klistra in" msgstr "Klistra in"
#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 #: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
msgid "Clear Edits" msgid "Clear Edits"
msgstr "Rensa bort ändringar" msgstr "Rensa bort ändringar"
#: src/diffuse/main.py:1054 #: src/diffuse/main.py:1057
msgid "Some files have unsaved changes. Select the files to save before closing." msgid "Some files have unsaved changes. Select the files to save before closing."
msgstr "" msgstr ""
"Vissa filer har ändringar som inte sparats. Välj filer att spara före stängning." "Vissa filer har ändringar som inte sparats. Välj filer att spara före stängning."
#: src/diffuse/main.py:1068 #: src/diffuse/main.py:1071
msgid "Tab" msgid "Tab"
msgstr "Flik" msgstr "Flik"
#: src/diffuse/main.py:1073 #: src/diffuse/main.py:1076
msgid "Pane" msgid "Pane"
msgstr "Panel" msgstr "Panel"
#: src/diffuse/main.py:1084 #: src/diffuse/main.py:1087
msgid "Close _Without Saving" msgid "Close _Without Saving"
msgstr "Stäng _utan att spara" msgstr "Stäng _utan att spara"
#: src/diffuse/main.py:1123 #: src/diffuse/main.py:1126
#, python-format #, python-format
msgid "Closing this tab will quit %s." msgid "Closing this tab will quit %s."
msgstr "Stängning av denna flik, avslutar %s." msgstr "Stängning av denna flik, avslutar %s."
#: src/diffuse/main.py:1206 #: src/diffuse/main.py:1209
#, python-format #, python-format
msgid "File Merge %d" msgid "File Merge %d"
msgstr "Filsammanslagning %d" msgstr "Filsammanslagning %d"
#: src/diffuse/main.py:1312 #: src/diffuse/main.py:1315
#, python-format #, python-format
msgid "Error retrieving commits for %s." msgid "Error retrieving commits for %s."
msgstr "Fel vid hämtning av arkiveringar för %s." msgstr "Fel vid hämtning av arkiveringar för %s."
#: src/diffuse/main.py:1344 #: src/diffuse/main.py:1347
#, python-format #, python-format
msgid "Error retrieving modifications for %s." msgid "Error retrieving modifications for %s."
msgstr "Fel vid hämtning av ändringar för %s." msgstr "Fel vid hämtning av ändringar för %s."
#: src/diffuse/main.py:1377 #: src/diffuse/main.py:1380
msgid "Open File In New Tab" msgid "Open File In New Tab"
msgstr "Öppna fil i ny flik" msgstr "Öppna fil i ny flik"
#: src/diffuse/main.py:1400 #: src/diffuse/main.py:1403
msgid "Choose Folder With Modified Files" msgid "Choose Folder With Modified Files"
msgstr "Välj mapp med ändrade filer" msgstr "Välj mapp med ändrade filer"
#: src/diffuse/main.py:1418 #: src/diffuse/main.py:1421
msgid "No modified files found." msgid "No modified files found."
msgstr "Inga ändrade filer hittades." msgstr "Inga ändrade filer hittades."
#: src/diffuse/main.py:1424 #: src/diffuse/main.py:1427
msgid "Choose Folder With Commit" msgid "Choose Folder With Commit"
msgstr "Välj mapp för arkiveringar" msgstr "Välj mapp för arkiveringar"
#: src/diffuse/main.py:1444 #: src/diffuse/main.py:1447
msgid "No committed files found." msgid "No committed files found."
msgstr "Inga arkiverade filer hittades." msgstr "Inga arkiverade filer hittades."
#: src/diffuse/main.py:1480 #: src/diffuse/main.py:1483
msgid "New N-Way File Merge..." msgid "New N-Way File Merge..."
msgstr "Ny x-vägs filsammanslagning..." msgstr "Ny x-vägs filsammanslagning..."
#: src/diffuse/main.py:1481 #: src/diffuse/main.py:1484
msgid "Number of panes: " msgid "Number of panes: "
msgstr "Antal paneler: " msgstr "Antal paneler: "
#: src/diffuse/main.py:1555 #: src/diffuse/main.py:1558
msgid "Phrase not found. Continue from the end of the file?" msgid "Phrase not found. Continue from the end of the file?"
msgstr "Frasen kan inte hittas. Vill du fortsätta från slutet på filen?" msgstr "Frasen kan inte hittas. Vill du fortsätta från slutet på filen?"
#: src/diffuse/main.py:1557 #: src/diffuse/main.py:1560
msgid "Phrase not found. Continue from the start of the file?" msgid "Phrase not found. Continue from the start of the file?"
msgstr "Frasen kan inte hittas. Vill du fortsätta från början på filen?" msgstr "Frasen kan inte hittas. Vill du fortsätta från början på filen?"
#: src/diffuse/main.py:1778 #: src/diffuse/main.py:1781
#, fuzzy #, fuzzy
msgid "" msgid ""
"Usage:\n" "Usage:\n"
@ -670,16 +675,16 @@ msgstr ""
" ( -i | --ignore-case ) Ignorera olikheter i skiftläge\n" " ( -i | --ignore-case ) Ignorera olikheter i skiftläge\n"
" ( -w | --ignore-all-space ) Ignorera olikheter i blanksteg" " ( -w | --ignore-all-space ) Ignorera olikheter i blanksteg"
#: src/diffuse/main.py:1945 #: src/diffuse/main.py:1948
msgid "Error parsing line number." msgid "Error parsing line number."
msgstr "Fel vid tolkning av radnummer." msgstr "Fel vid tolkning av radnummer."
#: src/diffuse/main.py:1955 #: src/diffuse/main.py:1958
#, python-format #, python-format
msgid "Skipping unknown argument \"%s\"." msgid "Skipping unknown argument \"%s\"."
msgstr "Undantar okänt argument \"%s\"." msgstr "Undantar okänt argument \"%s\"."
#: src/diffuse/main.py:1963 #: src/diffuse/main.py:1966
#, python-format #, python-format
msgid "Error processing argument \"%s\". Directory not expected." msgid "Error processing argument \"%s\". Directory not expected."
msgstr "Fel vid bearbetning av argumentet \"%s\". Katalogen inte den förväntade." msgstr "Fel vid bearbetning av argumentet \"%s\". Katalogen inte den förväntade."
@ -955,6 +960,3 @@ msgstr "Markera alla"
#: src/diffuse/widgets.py:1868 #: src/diffuse/widgets.py:1868
msgid "Swap with Selected Pane" msgid "Swap with Selected Pane"
msgstr "Växla med markerad panel" msgstr "Växla med markerad panel"
#~ msgid "Column %d"
#~ msgstr "Kolumn %d"

255
po/th.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: diffuse 0.4.7\n" "Project-Id-Version: diffuse 0.4.7\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-23 19:48-0400\n" "POT-Creation-Date: 2022-10-23 20:00-0400\n"
"PO-Revision-Date: 2020-06-29 14:49-0400\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n"
"Last-Translator: Akom Chotiphantawanon <knight2000@gmail.com>\n" "Last-Translator: Akom Chotiphantawanon <knight2000@gmail.com>\n"
"Language-Team: Thai <thai-l10n@googlegroups.com>\n" "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@ -95,40 +95,45 @@ msgstr "บันทึกแฟ้ม"
msgid "Save File As..." msgid "Save File As..."
msgstr "บันทึกแฟ้มเป็น..." msgstr "บันทึกแฟ้มเป็น..."
#: src/diffuse/main.py:288 #: src/diffuse/main.py:217
#, python-format
msgid "Column %d"
msgstr "คอลัมน์ %d"
#: src/diffuse/main.py:291
msgid "Save changes before loading the new file?" msgid "Save changes before loading the new file?"
msgstr "บันทึกการเปลี่ยนแปลงก่อนโหลดแฟ้มใหม่หรือไม่?" msgstr "บันทึกการเปลี่ยนแปลงก่อนโหลดแฟ้มใหม่หรือไม่?"
#: src/diffuse/main.py:399 #: src/diffuse/main.py:402
#, python-format #, python-format
msgid "Error reading revision %(rev)s of %(file)s." msgid "Error reading revision %(rev)s of %(file)s."
msgstr "เกิดข้อผิดพลาดขณะอ่านฉบับแก้ไข %(rev)s ของ %(file)s" msgstr "เกิดข้อผิดพลาดขณะอ่านฉบับแก้ไข %(rev)s ของ %(file)s"
#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #: src/diffuse/main.py:405 src/diffuse/main.py:1860
#, python-format #, python-format
msgid "Error reading %s." msgid "Error reading %s."
msgstr "เกิดข้อผิดพลาดขณะอ่าน %s" msgstr "เกิดข้อผิดพลาดขณะอ่าน %s"
#: src/diffuse/main.py:424 #: src/diffuse/main.py:427
msgid "Open File" msgid "Open File"
msgstr "เปิดแฟ้ม" msgstr "เปิดแฟ้ม"
#: src/diffuse/main.py:481 #: src/diffuse/main.py:484
#, python-format #, python-format
msgid "The file %s changed on disk. Do you want to reload the file?" msgid "The file %s changed on disk. Do you want to reload the file?"
msgstr "แฟ้ม \"%s\" มีการเปลี่ยนแปลงในดิสก์ คุณต้องการโหลดแฟ้มซ้ำหรือไม่?" msgstr "แฟ้ม \"%s\" มีการเปลี่ยนแปลงในดิสก์ คุณต้องการโหลดแฟ้มซ้ำหรือไม่?"
#: src/diffuse/main.py:507 #: src/diffuse/main.py:510
#, python-format #, python-format
msgid "Save %(title)s Pane %(pane)d" msgid "Save %(title)s Pane %(pane)d"
msgstr "บันทึก %(title)s ช่อง %(pane)d" msgstr "บันทึก %(title)s ช่อง %(pane)d"
#: src/diffuse/main.py:539 #: src/diffuse/main.py:542
#, python-format #, python-format
msgid "A file named %s already exists. Do you want to overwrite it?" msgid "A file named %s already exists. Do you want to overwrite it?"
msgstr "แฟ้มชื่อ \"%s\" มีอยู่ก่อนแล้ว คุณต้องการเขียนทับหรือไม่?" msgstr "แฟ้มชื่อ \"%s\" มีอยู่ก่อนแล้ว คุณต้องการเขียนทับหรือไม่?"
#: src/diffuse/main.py:546 #: src/diffuse/main.py:549
#, python-format #, python-format
msgid "" msgid ""
"The file %s has been modified by another process since reading it. If you save, " "The file %s has been modified by another process since reading it. If you save, "
@ -137,458 +142,458 @@ msgstr ""
"แฟ้ม \"%s\" ถูกเปลี่ยนแปลงโดยโพรเซสอื่นนับตั้งแต่ที่อ่านไว้ ถ้าคุณบันทึก " "แฟ้ม \"%s\" ถูกเปลี่ยนแปลงโดยโพรเซสอื่นนับตั้งแต่ที่อ่านไว้ ถ้าคุณบันทึก "
"การเปลี่ยนแปลงภายนอกทั้งหมดอาจสูญหายได้ ยังคงบันทึกหรือไม่?" "การเปลี่ยนแปลงภายนอกทั้งหมดอาจสูญหายได้ ยังคงบันทึกหรือไม่?"
#: src/diffuse/main.py:588 #: src/diffuse/main.py:591
#, python-format #, python-format
msgid "Error encoding to %s." msgid "Error encoding to %s."
msgstr "เกิดข้อผิดพลาดขณะลงรหัส %s" msgstr "เกิดข้อผิดพลาดขณะลงรหัส %s"
#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #: src/diffuse/main.py:595 src/diffuse/preferences.py:300
#, python-format #, python-format
msgid "Error writing %s." msgid "Error writing %s."
msgstr "เกิดข้อผิดพลาดขณะเขียน %s" msgstr "เกิดข้อผิดพลาดขณะเขียน %s"
#: src/diffuse/main.py:622 #: src/diffuse/main.py:625
msgid "Go To Line..." msgid "Go To Line..."
msgstr "ไปที่บรรทัด..." msgstr "ไปที่บรรทัด..."
#: src/diffuse/main.py:623 #: src/diffuse/main.py:626
msgid "Line Number: " msgid "Line Number: "
msgstr "หมายเลขบรรทัด: " msgstr "หมายเลขบรรทัด: "
#: src/diffuse/main.py:654 #: src/diffuse/main.py:657
msgid "" msgid ""
"Press the enter key or double click to edit. Press the space bar or use the RMB " "Press the enter key or double click to edit. Press the space bar or use the RMB "
"menu to manually align." "menu to manually align."
msgstr "กดปุ่ม Enter หรือดับเบิลคลิกเพื่อแก้ไข กดแคร่เว้นวรรคหรือใช้เมนูคลิกขวาเพื่อจัดเรียงด้วยมือ" msgstr "กดปุ่ม Enter หรือดับเบิลคลิกเพื่อแก้ไข กดแคร่เว้นวรรคหรือใช้เมนูคลิกขวาเพื่อจัดเรียงด้วยมือ"
#: src/diffuse/main.py:658 #: src/diffuse/main.py:661
msgid "Press the escape key to finish editing." msgid "Press the escape key to finish editing."
msgstr "กดปุ่ม Escape เพื่อจบการแก้ไข" msgstr "กดปุ่ม Escape เพื่อจบการแก้ไข"
#: src/diffuse/main.py:661 #: src/diffuse/main.py:664
msgid "" msgid ""
"Select target line and press the space bar to align. Press the escape key to " "Select target line and press the space bar to align. Press the escape key to "
"cancel." "cancel."
msgstr "เลือกบรรทัดเป้าหมายแล้วกดแคร่เว้นวรรคเพื่อจัดเรียง กดปุ่ม Escape เพื่อยกเลิก" msgstr "เลือกบรรทัดเป้าหมายแล้วกดแคร่เว้นวรรคเพื่อจัดเรียง กดปุ่ม Escape เพื่อยกเลิก"
#: src/diffuse/main.py:784 #: src/diffuse/main.py:787
msgid "_File" msgid "_File"
msgstr "แ_ฟ้ม" msgstr "แ_ฟ้ม"
#: src/diffuse/main.py:785 #: src/diffuse/main.py:788
msgid "_Open File..." msgid "_Open File..."
msgstr "_เปิดแฟ้ม..." msgstr "_เปิดแฟ้ม..."
#: src/diffuse/main.py:786 #: src/diffuse/main.py:789
msgid "Open File In New _Tab..." msgid "Open File In New _Tab..."
msgstr "เปิดแฟ้มในแ_ท็บใหม่..." msgstr "เปิดแฟ้มในแ_ท็บใหม่..."
#: src/diffuse/main.py:787 #: src/diffuse/main.py:790
msgid "Open _Modified Files..." msgid "Open _Modified Files..."
msgstr "เปิดแฟ้มที่เ_ปลี่ยนแปลง..." msgstr "เปิดแฟ้มที่เ_ปลี่ยนแปลง..."
#: src/diffuse/main.py:788 #: src/diffuse/main.py:791
msgid "Open Commi_t..." msgid "Open Commi_t..."
msgstr "เปิด Commi_t..." msgstr "เปิด Commi_t..."
#: src/diffuse/main.py:789 #: src/diffuse/main.py:792
msgid "_Reload File" msgid "_Reload File"
msgstr "โ_หลดแฟ้มซ้ำ" msgstr "โ_หลดแฟ้มซ้ำ"
#: src/diffuse/main.py:791 #: src/diffuse/main.py:794
msgid "_Save File" msgid "_Save File"
msgstr "_บันทึกแฟ้ม" msgstr "_บันทึกแฟ้ม"
#: src/diffuse/main.py:792 #: src/diffuse/main.py:795
msgid "Save File _As..." msgid "Save File _As..."
msgstr "บันทึกแฟ้มเป็_น..." msgstr "บันทึกแฟ้มเป็_น..."
#: src/diffuse/main.py:793 #: src/diffuse/main.py:796
msgid "Save A_ll" msgid "Save A_ll"
msgstr "บันทึกทั้งห_มด" msgstr "บันทึกทั้งห_มด"
#: src/diffuse/main.py:795 #: src/diffuse/main.py:798
msgid "New _2-Way File Merge" msgid "New _2-Way File Merge"
msgstr "การผสานแฟ้ม _2 ทางชุดใหม่" msgstr "การผสานแฟ้ม _2 ทางชุดใหม่"
#: src/diffuse/main.py:796 #: src/diffuse/main.py:799
msgid "New _3-Way File Merge" msgid "New _3-Way File Merge"
msgstr "การผสานแฟ้ม _3 ทางชุดใหม่" msgstr "การผสานแฟ้ม _3 ทางชุดใหม่"
#: src/diffuse/main.py:797 #: src/diffuse/main.py:800
msgid "New _N-Way File Merge..." msgid "New _N-Way File Merge..."
msgstr "การผสานแฟ้ม _N ทางชุดใหม่..." msgstr "การผสานแฟ้ม _N ทางชุดใหม่..."
#: src/diffuse/main.py:799 #: src/diffuse/main.py:802
msgid "_Close Tab" msgid "_Close Tab"
msgstr "ปิ_ดแท็บ" msgstr "ปิ_ดแท็บ"
#: src/diffuse/main.py:800 #: src/diffuse/main.py:803
msgid "_Undo Close Tab" msgid "_Undo Close Tab"
msgstr "เ_รียกคืนการปิดแท็บ" msgstr "เ_รียกคืนการปิดแท็บ"
#: src/diffuse/main.py:801 #: src/diffuse/main.py:804
msgid "_Quit" msgid "_Quit"
msgstr "_ออก" msgstr "_ออก"
#: src/diffuse/main.py:804 #: src/diffuse/main.py:807
msgid "_Edit" msgid "_Edit"
msgstr "แ_ก้ไข" msgstr "แ_ก้ไข"
#: src/diffuse/main.py:805 #: src/diffuse/main.py:808
msgid "_Undo" msgid "_Undo"
msgstr "เ_รียกคืน" msgstr "เ_รียกคืน"
#: src/diffuse/main.py:806 #: src/diffuse/main.py:809
msgid "_Redo" msgid "_Redo"
msgstr "_ทำซ้ำ" msgstr "_ทำซ้ำ"
#: src/diffuse/main.py:808 #: src/diffuse/main.py:811
msgid "Cu_t" msgid "Cu_t"
msgstr "_ตัด" msgstr "_ตัด"
#: src/diffuse/main.py:809 #: src/diffuse/main.py:812
msgid "_Copy" msgid "_Copy"
msgstr "_คัดลอก" msgstr "_คัดลอก"
#: src/diffuse/main.py:810 #: src/diffuse/main.py:813
msgid "_Paste" msgid "_Paste"
msgstr "_แปะ" msgstr "_แปะ"
#: src/diffuse/main.py:812 #: src/diffuse/main.py:815
msgid "Select _All" msgid "Select _All"
msgstr "เลือกทั้ง_หมด" msgstr "เลือกทั้ง_หมด"
#: src/diffuse/main.py:813 #: src/diffuse/main.py:816
msgid "C_lear Edits" msgid "C_lear Edits"
msgstr "_ล้างการแก้ไขต่างๆ" msgstr "_ล้างการแก้ไขต่างๆ"
#: src/diffuse/main.py:814 #: src/diffuse/main.py:817
msgid "_Dismiss All Edits" msgid "_Dismiss All Edits"
msgstr "ไ_ม่สนใจการแก้ไขทั้งหมด" msgstr "ไ_ม่สนใจการแก้ไขทั้งหมด"
#: src/diffuse/main.py:816 #: src/diffuse/main.py:819
msgid "_Find..." msgid "_Find..."
msgstr "_หา..." msgstr "_หา..."
#: src/diffuse/main.py:817 #: src/diffuse/main.py:820
msgid "Find _Next" msgid "Find _Next"
msgstr "หา_ถัดไป" msgstr "หา_ถัดไป"
#: src/diffuse/main.py:818 #: src/diffuse/main.py:821
msgid "Find Pre_vious" msgid "Find Pre_vious"
msgstr "หา_ก่อนหน้า" msgstr "หา_ก่อนหน้า"
#: src/diffuse/main.py:819 #: src/diffuse/main.py:822
msgid "_Go To Line..." msgid "_Go To Line..."
msgstr "ไปที่_บรรทัด..." msgstr "ไปที่_บรรทัด..."
#: src/diffuse/main.py:821 #: src/diffuse/main.py:824
msgid "Pr_eferences..." msgid "Pr_eferences..."
msgstr "_ปรับแต่ง..." msgstr "_ปรับแต่ง..."
#: src/diffuse/main.py:825 #: src/diffuse/main.py:828
msgid "None" msgid "None"
msgstr "ไม่มี" msgstr "ไม่มี"
#: src/diffuse/main.py:843 #: src/diffuse/main.py:846
msgid "_View" msgid "_View"
msgstr "มุ_มมอง" msgstr "มุ_มมอง"
#: src/diffuse/main.py:844 #: src/diffuse/main.py:847
msgid "_Syntax Highlighting" msgid "_Syntax Highlighting"
msgstr "การเน้นไ_วยากรณ์" msgstr "การเน้นไ_วยากรณ์"
#: src/diffuse/main.py:846 #: src/diffuse/main.py:849
msgid "Re_align All" msgid "Re_align All"
msgstr "จัดเรียงให_ม่ทั้งหมด" msgstr "จัดเรียงให_ม่ทั้งหมด"
#: src/diffuse/main.py:847 #: src/diffuse/main.py:850
msgid "_Isolate" msgid "_Isolate"
msgstr "แ_ยก" msgstr "แ_ยก"
#: src/diffuse/main.py:849 #: src/diffuse/main.py:852
msgid "_First Difference" msgid "_First Difference"
msgstr "ความแตกต่างแ_รก" msgstr "ความแตกต่างแ_รก"
#: src/diffuse/main.py:850 #: src/diffuse/main.py:853
msgid "_Previous Difference" msgid "_Previous Difference"
msgstr "ความแตกต่าง_ก่อนหน้า" msgstr "ความแตกต่าง_ก่อนหน้า"
#: src/diffuse/main.py:851 #: src/diffuse/main.py:854
msgid "_Next Difference" msgid "_Next Difference"
msgstr "ความแตกต่าง_ถัดไป" msgstr "ความแตกต่าง_ถัดไป"
#: src/diffuse/main.py:852 #: src/diffuse/main.py:855
msgid "_Last Difference" msgid "_Last Difference"
msgstr "ความแตกต่าง_ล่าสุด" msgstr "ความแตกต่าง_ล่าสุด"
#: src/diffuse/main.py:854 #: src/diffuse/main.py:857
msgid "Fir_st Tab" msgid "Fir_st Tab"
msgstr "แท็บ_แรก" msgstr "แท็บ_แรก"
#: src/diffuse/main.py:855 #: src/diffuse/main.py:858
msgid "Pre_vious Tab" msgid "Pre_vious Tab"
msgstr "แท็บก่อ_นหน้า" msgstr "แท็บก่อ_นหน้า"
#: src/diffuse/main.py:856 #: src/diffuse/main.py:859
msgid "Next _Tab" msgid "Next _Tab"
msgstr "แ_ท็บถัดไป" msgstr "แ_ท็บถัดไป"
#: src/diffuse/main.py:857 #: src/diffuse/main.py:860
msgid "Las_t Tab" msgid "Las_t Tab"
msgstr "แท็บสุ_ดท้าย" msgstr "แท็บสุ_ดท้าย"
#: src/diffuse/main.py:859 #: src/diffuse/main.py:862
msgid "Shift Pane _Right" msgid "Shift Pane _Right"
msgstr "เลื่อนช่องไปทาง_ขวา" msgstr "เลื่อนช่องไปทาง_ขวา"
#: src/diffuse/main.py:860 #: src/diffuse/main.py:863
msgid "Shift Pane _Left" msgid "Shift Pane _Left"
msgstr "เลื่อนช่องไปทางซ้_าย" msgstr "เลื่อนช่องไปทางซ้_าย"
#: src/diffuse/main.py:863 #: src/diffuse/main.py:866
msgid "F_ormat" msgid "F_ormat"
msgstr "จัดรูปแ_บบ" msgstr "จัดรูปแ_บบ"
#: src/diffuse/main.py:864 #: src/diffuse/main.py:867
msgid "Convert To _Upper Case" msgid "Convert To _Upper Case"
msgstr "แปลงเป็นตัวพิมพ์ใ_หญ่" msgstr "แปลงเป็นตัวพิมพ์ใ_หญ่"
#: src/diffuse/main.py:865 #: src/diffuse/main.py:868
msgid "Convert To _Lower Case" msgid "Convert To _Lower Case"
msgstr "แปลงเป็นตัวพิมพ์เล็_ก" msgstr "แปลงเป็นตัวพิมพ์เล็_ก"
#: src/diffuse/main.py:867 #: src/diffuse/main.py:870
msgid "Sort Lines In _Ascending Order" msgid "Sort Lines In _Ascending Order"
msgstr "เรียงบรรทัดจากน้_อยไปหามาก" msgstr "เรียงบรรทัดจากน้_อยไปหามาก"
#: src/diffuse/main.py:868 #: src/diffuse/main.py:871
msgid "Sort Lines In D_escending Order" msgid "Sort Lines In D_escending Order"
msgstr "เรียงบรรทัดจาก_มากไปหาน้อย" msgstr "เรียงบรรทัดจาก_มากไปหาน้อย"
#: src/diffuse/main.py:870 #: src/diffuse/main.py:873
msgid "Remove Trailing _White Space" msgid "Remove Trailing _White Space"
msgstr "ลบช่องว่างท้า_ยบรรทัด" msgstr "ลบช่องว่างท้า_ยบรรทัด"
#: src/diffuse/main.py:871 #: src/diffuse/main.py:874
msgid "Convert Tabs To _Spaces" msgid "Convert Tabs To _Spaces"
msgstr "แปลงแท็บเป็น_ช่องว่าง" msgstr "แปลงแท็บเป็น_ช่องว่าง"
#: src/diffuse/main.py:872 #: src/diffuse/main.py:875
msgid "Convert Leading Spaces To _Tabs" msgid "Convert Leading Spaces To _Tabs"
msgstr "แปลงช่องว่างที่ต้นบรรทัดเป็นแ_ท็บ" msgstr "แปลงช่องว่างที่ต้นบรรทัดเป็นแ_ท็บ"
#: src/diffuse/main.py:874 #: src/diffuse/main.py:877
msgid "_Increase Indenting" msgid "_Increase Indenting"
msgstr "เ_พิ่มการร่นย่อหน้า" msgstr "เ_พิ่มการร่นย่อหน้า"
#: src/diffuse/main.py:875 #: src/diffuse/main.py:878
msgid "De_crease Indenting" msgid "De_crease Indenting"
msgstr "_ลดการร่นย่อหน้า" msgstr "_ลดการร่นย่อหน้า"
#: src/diffuse/main.py:877 #: src/diffuse/main.py:880
msgid "Convert To _DOS Format" msgid "Convert To _DOS Format"
msgstr "แปลงเป็นรูปแบบ_ดอส" msgstr "แปลงเป็นรูปแบบ_ดอส"
#: src/diffuse/main.py:878 #: src/diffuse/main.py:881
msgid "Convert To _Mac Format" msgid "Convert To _Mac Format"
msgstr "แปลงเป็นรูปแบบแ_ม็ค" msgstr "แปลงเป็นรูปแบบแ_ม็ค"
#: src/diffuse/main.py:879 #: src/diffuse/main.py:882
msgid "Convert To Uni_x Format" msgid "Convert To Uni_x Format"
msgstr "แปลงเป็นรูปแบบยู_นิกซ์" msgstr "แปลงเป็นรูปแบบยู_นิกซ์"
#: src/diffuse/main.py:882 #: src/diffuse/main.py:885
msgid "_Merge" msgid "_Merge"
msgstr "_ผสาน" msgstr "_ผสาน"
#: src/diffuse/main.py:883 #: src/diffuse/main.py:886
msgid "Copy Selection _Right" msgid "Copy Selection _Right"
msgstr "คัดลอกบรรทัดที่เลือกไปช่อง_ขวา" msgstr "คัดลอกบรรทัดที่เลือกไปช่อง_ขวา"
#: src/diffuse/main.py:884 #: src/diffuse/main.py:887
msgid "Copy Selection _Left" msgid "Copy Selection _Left"
msgstr "คัดลอกบรรทัดที่เลือกไปช่องซ้า_ย" msgstr "คัดลอกบรรทัดที่เลือกไปช่องซ้า_ย"
#: src/diffuse/main.py:886 #: src/diffuse/main.py:889
msgid "Copy Left _Into Selection" msgid "Copy Left _Into Selection"
msgstr "คัดลอกช่องซ้าย_เข้าในบรรทัดที่เลือก" msgstr "คัดลอกช่องซ้าย_เข้าในบรรทัดที่เลือก"
#: src/diffuse/main.py:887 #: src/diffuse/main.py:890
msgid "Copy Right I_nto Selection" msgid "Copy Right I_nto Selection"
msgstr "คัดลอกช่องขวาเข้าใ_นบรรทัดที่เลือก" msgstr "คัดลอกช่องขวาเข้าใ_นบรรทัดที่เลือก"
#: src/diffuse/main.py:888 #: src/diffuse/main.py:891
msgid "_Merge From Left Then Right" msgid "_Merge From Left Then Right"
msgstr "_ผสานจากช่องซ้ายแล้วตามด้วยขวา" msgstr "_ผสานจากช่องซ้ายแล้วตามด้วยขวา"
#: src/diffuse/main.py:889 #: src/diffuse/main.py:892
msgid "M_erge From Right Then Left" msgid "M_erge From Right Then Left"
msgstr "ผ_สานจากช่องขวาแล้วตามด้วยซ้าย" msgstr "ผ_สานจากช่องขวาแล้วตามด้วยซ้าย"
#: src/diffuse/main.py:892 #: src/diffuse/main.py:895
msgid "_Help" msgid "_Help"
msgstr "_วิธีใช้" msgstr "_วิธีใช้"
#: src/diffuse/main.py:893 #: src/diffuse/main.py:896
msgid "_Help Contents..." msgid "_Help Contents..."
msgstr "เ_นื้อหาวิธีใช้..." msgstr "เ_นื้อหาวิธีใช้..."
#: src/diffuse/main.py:895 #: src/diffuse/main.py:898
#, python-format #, python-format
msgid "_About %s..." msgid "_About %s..."
msgstr "เ_กี่ยวกับ %s..." msgstr "เ_กี่ยวกับ %s..."
#: src/diffuse/main.py:910 #: src/diffuse/main.py:913
msgid "New 2-Way File Merge" msgid "New 2-Way File Merge"
msgstr "การผสานแฟ้ม 2 ทางชุดใหม่" msgstr "การผสานแฟ้ม 2 ทางชุดใหม่"
#: src/diffuse/main.py:911 #: src/diffuse/main.py:914
msgid "New 3-Way File Merge" msgid "New 3-Way File Merge"
msgstr "การผสานแฟ้ม 3 ทางชุดใหม่" msgstr "การผสานแฟ้ม 3 ทางชุดใหม่"
#: src/diffuse/main.py:913 #: src/diffuse/main.py:916
msgid "Realign All" msgid "Realign All"
msgstr "จัดเรียงใหม่ทั้งหมด" msgstr "จัดเรียงใหม่ทั้งหมด"
#: src/diffuse/main.py:914 #: src/diffuse/main.py:917
msgid "First Difference" msgid "First Difference"
msgstr "ความแตกต่างแรก" msgstr "ความแตกต่างแรก"
#: src/diffuse/main.py:915 #: src/diffuse/main.py:918
msgid "Previous Difference" msgid "Previous Difference"
msgstr "ความแตกต่างก่อนหน้า" msgstr "ความแตกต่างก่อนหน้า"
#: src/diffuse/main.py:916 #: src/diffuse/main.py:919
msgid "Next Difference" msgid "Next Difference"
msgstr "ความแตกต่างถัดไป" msgstr "ความแตกต่างถัดไป"
#: src/diffuse/main.py:917 #: src/diffuse/main.py:920
msgid "Last Difference" msgid "Last Difference"
msgstr "ความแตกต่างสุดท้าย" msgstr "ความแตกต่างสุดท้าย"
#: src/diffuse/main.py:919 #: src/diffuse/main.py:922
msgid "Copy Selection Right" msgid "Copy Selection Right"
msgstr "คัดลอกบรรทัดที่เลือกไปช่องขวา" msgstr "คัดลอกบรรทัดที่เลือกไปช่องขวา"
#: src/diffuse/main.py:920 #: src/diffuse/main.py:923
msgid "Copy Selection Left" msgid "Copy Selection Left"
msgstr "คัดลอกบรรทัดที่เลือกไปช่องซ้าย" msgstr "คัดลอกบรรทัดที่เลือกไปช่องซ้าย"
#: src/diffuse/main.py:921 #: src/diffuse/main.py:924
msgid "Copy Left Into Selection" msgid "Copy Left Into Selection"
msgstr "คัดลอกช่องซ้ายเข้าในบรรทัดที่เลือก" msgstr "คัดลอกช่องซ้ายเข้าในบรรทัดที่เลือก"
#: src/diffuse/main.py:922 #: src/diffuse/main.py:925
msgid "Copy Right Into Selection" msgid "Copy Right Into Selection"
msgstr "คัดลอกช่องขวาเข้าในบรรทัดที่เลือก" msgstr "คัดลอกช่องขวาเข้าในบรรทัดที่เลือก"
#: src/diffuse/main.py:923 #: src/diffuse/main.py:926
msgid "Merge From Left Then Right" msgid "Merge From Left Then Right"
msgstr "ผสานจากช่องซ้ายแล้วตามด้วยขวา" msgstr "ผสานจากช่องซ้ายแล้วตามด้วยขวา"
#: src/diffuse/main.py:924 #: src/diffuse/main.py:927
msgid "Merge From Right Then Left" msgid "Merge From Right Then Left"
msgstr "ผสานจากช่องขวาแล้วตามด้วยซ้าย" msgstr "ผสานจากช่องขวาแล้วตามด้วยซ้าย"
#: src/diffuse/main.py:926 #: src/diffuse/main.py:929
msgid "Undo" msgid "Undo"
msgstr "เรียกคืน" msgstr "เรียกคืน"
#: src/diffuse/main.py:927 #: src/diffuse/main.py:930
msgid "Redo" msgid "Redo"
msgstr "ทำซ้ำ" msgstr "ทำซ้ำ"
#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 #: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
msgid "Cut" msgid "Cut"
msgstr "ตัด" msgstr "ตัด"
#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 #: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
msgid "Copy" msgid "Copy"
msgstr "คัดลอก" msgstr "คัดลอก"
#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 #: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
msgid "Paste" msgid "Paste"
msgstr "แปะ" msgstr "แปะ"
#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 #: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
msgid "Clear Edits" msgid "Clear Edits"
msgstr "ล้างการแก้ไข" msgstr "ล้างการแก้ไข"
#: src/diffuse/main.py:1054 #: src/diffuse/main.py:1057
msgid "Some files have unsaved changes. Select the files to save before closing." msgid "Some files have unsaved changes. Select the files to save before closing."
msgstr "บางแฟ้มมีการเปลี่ยนแปลงที่ไม่ได้บันทึก เลือกแฟ้มเพื่อบันทึกก่อนปิด" msgstr "บางแฟ้มมีการเปลี่ยนแปลงที่ไม่ได้บันทึก เลือกแฟ้มเพื่อบันทึกก่อนปิด"
#: src/diffuse/main.py:1068 #: src/diffuse/main.py:1071
msgid "Tab" msgid "Tab"
msgstr "แท็บ" msgstr "แท็บ"
#: src/diffuse/main.py:1073 #: src/diffuse/main.py:1076
msgid "Pane" msgid "Pane"
msgstr "ช่อง" msgstr "ช่อง"
#: src/diffuse/main.py:1084 #: src/diffuse/main.py:1087
msgid "Close _Without Saving" msgid "Close _Without Saving"
msgstr "ปิ_ดโดยไม่บันทึก" msgstr "ปิ_ดโดยไม่บันทึก"
#: src/diffuse/main.py:1123 #: src/diffuse/main.py:1126
#, python-format #, python-format
msgid "Closing this tab will quit %s." msgid "Closing this tab will quit %s."
msgstr "การปิดแท็บนี้จะออกจาก %s" msgstr "การปิดแท็บนี้จะออกจาก %s"
#: src/diffuse/main.py:1206 #: src/diffuse/main.py:1209
#, python-format #, python-format
msgid "File Merge %d" msgid "File Merge %d"
msgstr "การผสานแฟ้ม %d" msgstr "การผสานแฟ้ม %d"
#: src/diffuse/main.py:1312 #: src/diffuse/main.py:1315
#, python-format #, python-format
msgid "Error retrieving commits for %s." msgid "Error retrieving commits for %s."
msgstr "เกิดข้อผิดพลาดขณะดึง commit ต่างๆ สำหรับ %s" msgstr "เกิดข้อผิดพลาดขณะดึง commit ต่างๆ สำหรับ %s"
#: src/diffuse/main.py:1344 #: src/diffuse/main.py:1347
#, python-format #, python-format
msgid "Error retrieving modifications for %s." msgid "Error retrieving modifications for %s."
msgstr "เกิดข้อผิดพลาดขณะดึงการเปลี่ยนแปลงสำหรับ %s" msgstr "เกิดข้อผิดพลาดขณะดึงการเปลี่ยนแปลงสำหรับ %s"
#: src/diffuse/main.py:1377 #: src/diffuse/main.py:1380
msgid "Open File In New Tab" msgid "Open File In New Tab"
msgstr "เปิดแฟ้มในแท็บใหม่" msgstr "เปิดแฟ้มในแท็บใหม่"
#: src/diffuse/main.py:1400 #: src/diffuse/main.py:1403
msgid "Choose Folder With Modified Files" msgid "Choose Folder With Modified Files"
msgstr "เลือกโฟลเดอร์ที่มีแฟ้มที่เปลี่ยนแปลง" msgstr "เลือกโฟลเดอร์ที่มีแฟ้มที่เปลี่ยนแปลง"
#: src/diffuse/main.py:1418 #: src/diffuse/main.py:1421
msgid "No modified files found." msgid "No modified files found."
msgstr "ไม่พบแฟ้มที่เปลี่ยนแปลง" msgstr "ไม่พบแฟ้มที่เปลี่ยนแปลง"
#: src/diffuse/main.py:1424 #: src/diffuse/main.py:1427
msgid "Choose Folder With Commit" msgid "Choose Folder With Commit"
msgstr "เลือกโฟลเดอร์ที่มีการ commit" msgstr "เลือกโฟลเดอร์ที่มีการ commit"
#: src/diffuse/main.py:1444 #: src/diffuse/main.py:1447
msgid "No committed files found." msgid "No committed files found."
msgstr "ไม่พบแฟ้มที่มีการ commit" msgstr "ไม่พบแฟ้มที่มีการ commit"
#: src/diffuse/main.py:1480 #: src/diffuse/main.py:1483
msgid "New N-Way File Merge..." msgid "New N-Way File Merge..."
msgstr "การผสานแฟ้ม N ทางชุดใหม่..." msgstr "การผสานแฟ้ม N ทางชุดใหม่..."
#: src/diffuse/main.py:1481 #: src/diffuse/main.py:1484
msgid "Number of panes: " msgid "Number of panes: "
msgstr "จำนวนช่อง: " msgstr "จำนวนช่อง: "
#: src/diffuse/main.py:1555 #: src/diffuse/main.py:1558
msgid "Phrase not found. Continue from the end of the file?" msgid "Phrase not found. Continue from the end of the file?"
msgstr "ไม่พบคำที่ค้น จะหาต่อจากท้ายแฟ้มหรือไม่?" msgstr "ไม่พบคำที่ค้น จะหาต่อจากท้ายแฟ้มหรือไม่?"
#: src/diffuse/main.py:1557 #: src/diffuse/main.py:1560
msgid "Phrase not found. Continue from the start of the file?" msgid "Phrase not found. Continue from the start of the file?"
msgstr "ไม่พบคำที่ค้น จะหาต่อจากต้นแฟ้มหรือไม่?" msgstr "ไม่พบคำที่ค้น จะหาต่อจากต้นแฟ้มหรือไม่?"
#: src/diffuse/main.py:1778 #: src/diffuse/main.py:1781
#, fuzzy #, fuzzy
msgid "" msgid ""
"Usage:\n" "Usage:\n"
@ -666,16 +671,16 @@ msgstr ""
" ( -i | --ignore-case ) ไม่สนใจความแตกต่างของตัวพิมพ์ใหญ่-เล็ก\n" " ( -i | --ignore-case ) ไม่สนใจความแตกต่างของตัวพิมพ์ใหญ่-เล็ก\n"
" ( -w | --ignore-all-space ) ไม่สนใจความแตกต่างของช่องว่างทั้งหมด" " ( -w | --ignore-all-space ) ไม่สนใจความแตกต่างของช่องว่างทั้งหมด"
#: src/diffuse/main.py:1945 #: src/diffuse/main.py:1948
msgid "Error parsing line number." msgid "Error parsing line number."
msgstr "เกิดข้อผิดพลาดขณะแจงหมายเลขบรรทัด" msgstr "เกิดข้อผิดพลาดขณะแจงหมายเลขบรรทัด"
#: src/diffuse/main.py:1955 #: src/diffuse/main.py:1958
#, python-format #, python-format
msgid "Skipping unknown argument \"%s\"." msgid "Skipping unknown argument \"%s\"."
msgstr "ขอข้ามอาร์กิวเมนต์ \"%s\" ที่ไม่ทราบ" msgstr "ขอข้ามอาร์กิวเมนต์ \"%s\" ที่ไม่ทราบ"
#: src/diffuse/main.py:1963 #: src/diffuse/main.py:1966
#, python-format #, python-format
msgid "Error processing argument \"%s\". Directory not expected." msgid "Error processing argument \"%s\". Directory not expected."
msgstr "เกิดข้อผิดพลาดขณะประมวลผลอาร์กิวเมนต์ \"%s\" ไม่คาดหมายว่าจะพบไดเรกทอรี" msgstr "เกิดข้อผิดพลาดขณะประมวลผลอาร์กิวเมนต์ \"%s\" ไม่คาดหมายว่าจะพบไดเรกทอรี"
@ -951,7 +956,3 @@ msgstr "เลือกทั้งหมด"
#: src/diffuse/widgets.py:1868 #: src/diffuse/widgets.py:1868
msgid "Swap with Selected Pane" msgid "Swap with Selected Pane"
msgstr "สลับกับช่องที่เลือก" msgstr "สลับกับช่องที่เลือก"
#, python-format
#~ msgid "Column %d"
#~ msgstr "คอลัมน์ %d"

255
po/zh_CN.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Diffuse svn 316\n" "Project-Id-Version: Diffuse svn 316\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-23 19:48-0400\n" "POT-Creation-Date: 2022-10-23 20:00-0400\n"
"PO-Revision-Date: 2020-06-29 14:49-0400\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n"
"Last-Translator: <jarryson@gmail.com>\n" "Last-Translator: <jarryson@gmail.com>\n"
"Language-Team: Chinese (simplified)\n" "Language-Team: Chinese (simplified)\n"
@ -94,498 +94,503 @@ msgstr "保存文件"
msgid "Save File As..." msgid "Save File As..."
msgstr "另存为" msgstr "另存为"
#: src/diffuse/main.py:288 #: src/diffuse/main.py:217
#, python-format
msgid "Column %d"
msgstr "%d列"
#: src/diffuse/main.py:291
msgid "Save changes before loading the new file?" msgid "Save changes before loading the new file?"
msgstr "加载新文件之前保存更改吗？" msgstr "加载新文件之前保存更改吗？"
#: src/diffuse/main.py:399 #: src/diffuse/main.py:402
#, python-format #, python-format
msgid "Error reading revision %(rev)s of %(file)s." msgid "Error reading revision %(rev)s of %(file)s."
msgstr "无法读取文件%(file)s中的修订版本%(rev)s。" msgstr "无法读取文件%(file)s中的修订版本%(rev)s。"
#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #: src/diffuse/main.py:405 src/diffuse/main.py:1860
#, python-format #, python-format
msgid "Error reading %s." msgid "Error reading %s."
msgstr "无法读取%s。" msgstr "无法读取%s。"
#: src/diffuse/main.py:424 #: src/diffuse/main.py:427
msgid "Open File" msgid "Open File"
msgstr "打开文件" msgstr "打开文件"
#: src/diffuse/main.py:481 #: src/diffuse/main.py:484
#, python-format #, python-format
msgid "The file %s changed on disk. Do you want to reload the file?" msgid "The file %s changed on disk. Do you want to reload the file?"
msgstr "磁盘文件%s已被更改，是否重新载入？" msgstr "磁盘文件%s已被更改，是否重新载入？"
#: src/diffuse/main.py:507 #: src/diffuse/main.py:510
#, python-format #, python-format
msgid "Save %(title)s Pane %(pane)d" msgid "Save %(title)s Pane %(pane)d"
msgstr "保存%(title)s窗格%(pane)d" msgstr "保存%(title)s窗格%(pane)d"
#: src/diffuse/main.py:539 #: src/diffuse/main.py:542
#, python-format #, python-format
msgid "A file named %s already exists. Do you want to overwrite it?" msgid "A file named %s already exists. Do you want to overwrite it?"
msgstr "已存在名为%s的文件，您希望覆盖它吗？" msgstr "已存在名为%s的文件，您希望覆盖它吗？"
#: src/diffuse/main.py:546 #: src/diffuse/main.py:549
#, python-format #, python-format
msgid "" msgid ""
"The file %s has been modified by another process since reading it. If you save, " "The file %s has been modified by another process since reading it. If you save, "
"all the external changes could be lost. Save anyways?" "all the external changes could be lost. Save anyways?"
msgstr "文件%s打开后被其他进程更改过了，如果保存，其他程序的修改将会丢失，保存吗？" msgstr "文件%s打开后被其他进程更改过了，如果保存，其他程序的修改将会丢失，保存吗？"
#: src/diffuse/main.py:588 #: src/diffuse/main.py:591
#, python-format #, python-format
msgid "Error encoding to %s." msgid "Error encoding to %s."
msgstr "无法编码为%s。" msgstr "无法编码为%s。"
#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #: src/diffuse/main.py:595 src/diffuse/preferences.py:300
#, python-format #, python-format
msgid "Error writing %s." msgid "Error writing %s."
msgstr "无法写入%s" msgstr "无法写入%s"
#: src/diffuse/main.py:622 #: src/diffuse/main.py:625
msgid "Go To Line..." msgid "Go To Line..."
msgstr "跳到行..." msgstr "跳到行..."
#: src/diffuse/main.py:623 #: src/diffuse/main.py:626
msgid "Line Number: " msgid "Line Number: "
msgstr "行数：" msgstr "行数："
#: src/diffuse/main.py:654 #: src/diffuse/main.py:657
msgid "" msgid ""
"Press the enter key or double click to edit. Press the space bar or use the RMB " "Press the enter key or double click to edit. Press the space bar or use the RMB "
"menu to manually align." "menu to manually align."
msgstr "按回车或者鼠标双击进行编译。空格键或者右键菜单手动对齐。" msgstr "按回车或者鼠标双击进行编译。空格键或者右键菜单手动对齐。"
#: src/diffuse/main.py:658 #: src/diffuse/main.py:661
msgid "Press the escape key to finish editing." msgid "Press the escape key to finish editing."
msgstr "按ESC键结束编辑" msgstr "按ESC键结束编辑"
#: src/diffuse/main.py:661 #: src/diffuse/main.py:664
msgid "" msgid ""
"Select target line and press the space bar to align. Press the escape key to " "Select target line and press the space bar to align. Press the escape key to "
"cancel." "cancel."
msgstr "选择目标行然后按空格键进行对齐，按ESC取消。" msgstr "选择目标行然后按空格键进行对齐，按ESC取消。"
#: src/diffuse/main.py:784 #: src/diffuse/main.py:787
msgid "_File" msgid "_File"
msgstr "文件(_F)" msgstr "文件(_F)"
#: src/diffuse/main.py:785 #: src/diffuse/main.py:788
msgid "_Open File..." msgid "_Open File..."
msgstr "打开文件(_O)" msgstr "打开文件(_O)"
#: src/diffuse/main.py:786 #: src/diffuse/main.py:789
msgid "Open File In New _Tab..." msgid "Open File In New _Tab..."
msgstr "在新标签里打开文件(_T)" msgstr "在新标签里打开文件(_T)"
#: src/diffuse/main.py:787 #: src/diffuse/main.py:790
msgid "Open _Modified Files..." msgid "Open _Modified Files..."
msgstr "打开修改过的文件(_M)" msgstr "打开修改过的文件(_M)"
#: src/diffuse/main.py:788 #: src/diffuse/main.py:791
msgid "Open Commi_t..." msgid "Open Commi_t..."
msgstr "打开提交(_T)" msgstr "打开提交(_T)"
#: src/diffuse/main.py:789 #: src/diffuse/main.py:792
msgid "_Reload File" msgid "_Reload File"
msgstr "重新加载文件(_R)" msgstr "重新加载文件(_R)"
#: src/diffuse/main.py:791 #: src/diffuse/main.py:794
msgid "_Save File" msgid "_Save File"
msgstr "保存(_S)" msgstr "保存(_S)"
#: src/diffuse/main.py:792 #: src/diffuse/main.py:795
msgid "Save File _As..." msgid "Save File _As..."
msgstr "另存为(_A)" msgstr "另存为(_A)"
#: src/diffuse/main.py:793 #: src/diffuse/main.py:796
msgid "Save A_ll" msgid "Save A_ll"
msgstr "保存所有(_L)" msgstr "保存所有(_L)"
#: src/diffuse/main.py:795 #: src/diffuse/main.py:798
msgid "New _2-Way File Merge" msgid "New _2-Way File Merge"
msgstr "新建2方文件合并(_2)" msgstr "新建2方文件合并(_2)"
#: src/diffuse/main.py:796 #: src/diffuse/main.py:799
msgid "New _3-Way File Merge" msgid "New _3-Way File Merge"
msgstr "新建3方文件合并(_3)" msgstr "新建3方文件合并(_3)"
#: src/diffuse/main.py:797 #: src/diffuse/main.py:800
msgid "New _N-Way File Merge..." msgid "New _N-Way File Merge..."
msgstr "新建多方文件合并(_N)" msgstr "新建多方文件合并(_N)"
#: src/diffuse/main.py:799 #: src/diffuse/main.py:802
msgid "_Close Tab" msgid "_Close Tab"
msgstr "关闭标签(_C)" msgstr "关闭标签(_C)"
#: src/diffuse/main.py:800 #: src/diffuse/main.py:803
msgid "_Undo Close Tab" msgid "_Undo Close Tab"
msgstr "恢复关闭的标签" msgstr "恢复关闭的标签"
#: src/diffuse/main.py:801 #: src/diffuse/main.py:804
msgid "_Quit" msgid "_Quit"
msgstr "退出(_Q)" msgstr "退出(_Q)"
#: src/diffuse/main.py:804 #: src/diffuse/main.py:807
msgid "_Edit" msgid "_Edit"
msgstr "编辑(_E)" msgstr "编辑(_E)"
#: src/diffuse/main.py:805 #: src/diffuse/main.py:808
msgid "_Undo" msgid "_Undo"
msgstr "恢复(_U)" msgstr "恢复(_U)"
#: src/diffuse/main.py:806 #: src/diffuse/main.py:809
msgid "_Redo" msgid "_Redo"
msgstr "重做(_R)" msgstr "重做(_R)"
#: src/diffuse/main.py:808 #: src/diffuse/main.py:811
msgid "Cu_t" msgid "Cu_t"
msgstr "剪切(_T)" msgstr "剪切(_T)"
#: src/diffuse/main.py:809 #: src/diffuse/main.py:812
msgid "_Copy" msgid "_Copy"
msgstr "复制(_C)" msgstr "复制(_C)"
#: src/diffuse/main.py:810 #: src/diffuse/main.py:813
msgid "_Paste" msgid "_Paste"
msgstr "粘贴(_P)" msgstr "粘贴(_P)"
#: src/diffuse/main.py:812 #: src/diffuse/main.py:815
msgid "Select _All" msgid "Select _All"
msgstr "选择所有(_A)" msgstr "选择所有(_A)"
#: src/diffuse/main.py:813 #: src/diffuse/main.py:816
msgid "C_lear Edits" msgid "C_lear Edits"
msgstr "取消编辑(L)" msgstr "取消编辑(L)"
#: src/diffuse/main.py:814 #: src/diffuse/main.py:817
msgid "_Dismiss All Edits" msgid "_Dismiss All Edits"
msgstr "撤销所有更改(_D)" msgstr "撤销所有更改(_D)"
#: src/diffuse/main.py:816 #: src/diffuse/main.py:819
msgid "_Find..." msgid "_Find..."
msgstr "查找(_F)" msgstr "查找(_F)"
#: src/diffuse/main.py:817 #: src/diffuse/main.py:820
msgid "Find _Next" msgid "Find _Next"
msgstr "找下一个(_N)" msgstr "找下一个(_N)"
#: src/diffuse/main.py:818 #: src/diffuse/main.py:821
msgid "Find Pre_vious" msgid "Find Pre_vious"
msgstr "找上一个(_V)" msgstr "找上一个(_V)"
#: src/diffuse/main.py:819 #: src/diffuse/main.py:822
msgid "_Go To Line..." msgid "_Go To Line..."
msgstr "跳到行(_G)" msgstr "跳到行(_G)"
#: src/diffuse/main.py:821 #: src/diffuse/main.py:824
msgid "Pr_eferences..." msgid "Pr_eferences..."
msgstr "首选项(_E)" msgstr "首选项(_E)"
#: src/diffuse/main.py:825 #: src/diffuse/main.py:828
msgid "None" msgid "None"
msgstr "无" msgstr "无"
#: src/diffuse/main.py:843 #: src/diffuse/main.py:846
msgid "_View" msgid "_View"
msgstr "视图(_V)" msgstr "视图(_V)"
#: src/diffuse/main.py:844 #: src/diffuse/main.py:847
msgid "_Syntax Highlighting" msgid "_Syntax Highlighting"
msgstr "_Syntax高亮" msgstr "_Syntax高亮"
#: src/diffuse/main.py:846 #: src/diffuse/main.py:849
msgid "Re_align All" msgid "Re_align All"
msgstr "重新对齐所有(_A)" msgstr "重新对齐所有(_A)"
#: src/diffuse/main.py:847 #: src/diffuse/main.py:850
msgid "_Isolate" msgid "_Isolate"
msgstr "分离(_I)" msgstr "分离(_I)"
#: src/diffuse/main.py:849 #: src/diffuse/main.py:852
msgid "_First Difference" msgid "_First Difference"
msgstr "第一个不同之处(_F)" msgstr "第一个不同之处(_F)"
#: src/diffuse/main.py:850 #: src/diffuse/main.py:853
msgid "_Previous Difference" msgid "_Previous Difference"
msgstr "前一个不同之处(_P)" msgstr "前一个不同之处(_P)"
#: src/diffuse/main.py:851 #: src/diffuse/main.py:854
msgid "_Next Difference" msgid "_Next Difference"
msgstr "下一个不同之处(_N)" msgstr "下一个不同之处(_N)"
#: src/diffuse/main.py:852 #: src/diffuse/main.py:855
msgid "_Last Difference" msgid "_Last Difference"
msgstr "最后一个不同之处(_L)" msgstr "最后一个不同之处(_L)"
#: src/diffuse/main.py:854 #: src/diffuse/main.py:857
msgid "Fir_st Tab" msgid "Fir_st Tab"
msgstr "第一个标签(_S)" msgstr "第一个标签(_S)"
#: src/diffuse/main.py:855 #: src/diffuse/main.py:858
msgid "Pre_vious Tab" msgid "Pre_vious Tab"
msgstr "前一个标签(_V)" msgstr "前一个标签(_V)"
#: src/diffuse/main.py:856 #: src/diffuse/main.py:859
msgid "Next _Tab" msgid "Next _Tab"
msgstr "下一个标签(_T)" msgstr "下一个标签(_T)"
#: src/diffuse/main.py:857 #: src/diffuse/main.py:860
msgid "Las_t Tab" msgid "Las_t Tab"
msgstr "最后一个标签(_T)" msgstr "最后一个标签(_T)"
#: src/diffuse/main.py:859 #: src/diffuse/main.py:862
msgid "Shift Pane _Right" msgid "Shift Pane _Right"
msgstr "右移窗格(_R)" msgstr "右移窗格(_R)"
#: src/diffuse/main.py:860 #: src/diffuse/main.py:863
msgid "Shift Pane _Left" msgid "Shift Pane _Left"
msgstr "左移窗格(_L)" msgstr "左移窗格(_L)"
#: src/diffuse/main.py:863 #: src/diffuse/main.py:866
msgid "F_ormat" msgid "F_ormat"
msgstr "格式(_O)" msgstr "格式(_O)"
#: src/diffuse/main.py:864 #: src/diffuse/main.py:867
msgid "Convert To _Upper Case" msgid "Convert To _Upper Case"
msgstr "转换成大写" msgstr "转换成大写"
#: src/diffuse/main.py:865 #: src/diffuse/main.py:868
msgid "Convert To _Lower Case" msgid "Convert To _Lower Case"
msgstr "转换成小写" msgstr "转换成小写"
#: src/diffuse/main.py:867 #: src/diffuse/main.py:870
msgid "Sort Lines In _Ascending Order" msgid "Sort Lines In _Ascending Order"
msgstr "以递增的顺序排列行" msgstr "以递增的顺序排列行"
#: src/diffuse/main.py:868 #: src/diffuse/main.py:871
msgid "Sort Lines In D_escending Order" msgid "Sort Lines In D_escending Order"
msgstr "以递减的顺序排列行" msgstr "以递减的顺序排列行"
#: src/diffuse/main.py:870 #: src/diffuse/main.py:873
msgid "Remove Trailing _White Space" msgid "Remove Trailing _White Space"
msgstr "删除多余的空格(_W)" msgstr "删除多余的空格(_W)"
#: src/diffuse/main.py:871 #: src/diffuse/main.py:874
msgid "Convert Tabs To _Spaces" msgid "Convert Tabs To _Spaces"
msgstr "转换制表符为空格(_S)" msgstr "转换制表符为空格(_S)"
#: src/diffuse/main.py:872 #: src/diffuse/main.py:875
msgid "Convert Leading Spaces To _Tabs" msgid "Convert Leading Spaces To _Tabs"
msgstr "转换开头的空格为制表符(_T)" msgstr "转换开头的空格为制表符(_T)"
#: src/diffuse/main.py:874 #: src/diffuse/main.py:877
msgid "_Increase Indenting" msgid "_Increase Indenting"
msgstr "减少缩进(_I)" msgstr "减少缩进(_I)"
#: src/diffuse/main.py:875 #: src/diffuse/main.py:878
msgid "De_crease Indenting" msgid "De_crease Indenting"
msgstr "减少缩进" msgstr "减少缩进"
#: src/diffuse/main.py:877 #: src/diffuse/main.py:880
msgid "Convert To _DOS Format" msgid "Convert To _DOS Format"
msgstr "转换为DOS格式(_D)" msgstr "转换为DOS格式(_D)"
#: src/diffuse/main.py:878 #: src/diffuse/main.py:881
msgid "Convert To _Mac Format" msgid "Convert To _Mac Format"
msgstr "转换为Mac格式(_M)" msgstr "转换为Mac格式(_M)"
#: src/diffuse/main.py:879 #: src/diffuse/main.py:882
msgid "Convert To Uni_x Format" msgid "Convert To Uni_x Format"
msgstr "转换为Unix格式(_X)" msgstr "转换为Unix格式(_X)"
#: src/diffuse/main.py:882 #: src/diffuse/main.py:885
msgid "_Merge" msgid "_Merge"
msgstr "合并(_M)" msgstr "合并(_M)"
#: src/diffuse/main.py:883 #: src/diffuse/main.py:886
msgid "Copy Selection _Right" msgid "Copy Selection _Right"
msgstr "复制选择之处到右边(_R)" msgstr "复制选择之处到右边(_R)"
#: src/diffuse/main.py:884 #: src/diffuse/main.py:887
msgid "Copy Selection _Left" msgid "Copy Selection _Left"
msgstr "复制选择之处到左边(_L)" msgstr "复制选择之处到左边(_L)"
#: src/diffuse/main.py:886 #: src/diffuse/main.py:889
msgid "Copy Left _Into Selection" msgid "Copy Left _Into Selection"
msgstr "复制左边内容到选择之处(_L)" msgstr "复制左边内容到选择之处(_L)"
#: src/diffuse/main.py:887 #: src/diffuse/main.py:890
msgid "Copy Right I_nto Selection" msgid "Copy Right I_nto Selection"
msgstr "复制右边内容到选择之处(_L)" msgstr "复制右边内容到选择之处(_L)"
#: src/diffuse/main.py:888 #: src/diffuse/main.py:891
msgid "_Merge From Left Then Right" msgid "_Merge From Left Then Right"
msgstr "先左再右合并(_M)" msgstr "先左再右合并(_M)"
#: src/diffuse/main.py:889 #: src/diffuse/main.py:892
msgid "M_erge From Right Then Left" msgid "M_erge From Right Then Left"
msgstr "先右后左合并(_E)" msgstr "先右后左合并(_E)"
#: src/diffuse/main.py:892 #: src/diffuse/main.py:895
msgid "_Help" msgid "_Help"
msgstr "帮助(_H)" msgstr "帮助(_H)"
#: src/diffuse/main.py:893 #: src/diffuse/main.py:896
msgid "_Help Contents..." msgid "_Help Contents..."
msgstr "帮助内容(_H)" msgstr "帮助内容(_H)"
#: src/diffuse/main.py:895 #: src/diffuse/main.py:898
#, python-format #, python-format
msgid "_About %s..." msgid "_About %s..."
msgstr "关于%s(_A)" msgstr "关于%s(_A)"
#: src/diffuse/main.py:910 #: src/diffuse/main.py:913
msgid "New 2-Way File Merge" msgid "New 2-Way File Merge"
msgstr "新建2方文件合并" msgstr "新建2方文件合并"
#: src/diffuse/main.py:911 #: src/diffuse/main.py:914
msgid "New 3-Way File Merge" msgid "New 3-Way File Merge"
msgstr "新建3方文件合并" msgstr "新建3方文件合并"
#: src/diffuse/main.py:913 #: src/diffuse/main.py:916
msgid "Realign All" msgid "Realign All"
msgstr "重新对齐所有" msgstr "重新对齐所有"
#: src/diffuse/main.py:914 #: src/diffuse/main.py:917
msgid "First Difference" msgid "First Difference"
msgstr "第一个不同之处" msgstr "第一个不同之处"
#: src/diffuse/main.py:915 #: src/diffuse/main.py:918
msgid "Previous Difference" msgid "Previous Difference"
msgstr "前一个不同之处" msgstr "前一个不同之处"
#: src/diffuse/main.py:916 #: src/diffuse/main.py:919
msgid "Next Difference" msgid "Next Difference"
msgstr "下一个不同之处" msgstr "下一个不同之处"
#: src/diffuse/main.py:917 #: src/diffuse/main.py:920
msgid "Last Difference" msgid "Last Difference"
msgstr "最后一个不同之处" msgstr "最后一个不同之处"
#: src/diffuse/main.py:919 #: src/diffuse/main.py:922
msgid "Copy Selection Right" msgid "Copy Selection Right"
msgstr "复制选择之处到右边" msgstr "复制选择之处到右边"
#: src/diffuse/main.py:920 #: src/diffuse/main.py:923
msgid "Copy Selection Left" msgid "Copy Selection Left"
msgstr "复制选择之处到左边" msgstr "复制选择之处到左边"
#: src/diffuse/main.py:921 #: src/diffuse/main.py:924
msgid "Copy Left Into Selection" msgid "Copy Left Into Selection"
msgstr "复制左边内容到选择之处" msgstr "复制左边内容到选择之处"
#: src/diffuse/main.py:922 #: src/diffuse/main.py:925
msgid "Copy Right Into Selection" msgid "Copy Right Into Selection"
msgstr "复制右边内容到选择之处" msgstr "复制右边内容到选择之处"
#: src/diffuse/main.py:923 #: src/diffuse/main.py:926
msgid "Merge From Left Then Right" msgid "Merge From Left Then Right"
msgstr "先左后右合并" msgstr "先左后右合并"
#: src/diffuse/main.py:924 #: src/diffuse/main.py:927
msgid "Merge From Right Then Left" msgid "Merge From Right Then Left"
msgstr "先右后左合并(_T)" msgstr "先右后左合并(_T)"
#: src/diffuse/main.py:926 #: src/diffuse/main.py:929
msgid "Undo" msgid "Undo"
msgstr "恢复" msgstr "恢复"
#: src/diffuse/main.py:927 #: src/diffuse/main.py:930
msgid "Redo" msgid "Redo"
msgstr "重做" msgstr "重做"
#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 #: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
msgid "Cut" msgid "Cut"
msgstr "剪切" msgstr "剪切"
#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 #: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
msgid "Copy" msgid "Copy"
msgstr "复制" msgstr "复制"
#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 #: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
msgid "Paste" msgid "Paste"
msgstr "粘贴" msgstr "粘贴"
#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 #: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
msgid "Clear Edits" msgid "Clear Edits"
msgstr "取消编辑" msgstr "取消编辑"
#: src/diffuse/main.py:1054 #: src/diffuse/main.py:1057
msgid "Some files have unsaved changes. Select the files to save before closing." msgid "Some files have unsaved changes. Select the files to save before closing."
msgstr "一些文件包含未保存的更改。请在关闭前保存这些文件。" msgstr "一些文件包含未保存的更改。请在关闭前保存这些文件。"
#: src/diffuse/main.py:1068 #: src/diffuse/main.py:1071
msgid "Tab" msgid "Tab"
msgstr "标签" msgstr "标签"
#: src/diffuse/main.py:1073 #: src/diffuse/main.py:1076
msgid "Pane" msgid "Pane"
msgstr "窗格" msgstr "窗格"
#: src/diffuse/main.py:1084 #: src/diffuse/main.py:1087
msgid "Close _Without Saving" msgid "Close _Without Saving"
msgstr "不保存而关闭" msgstr "不保存而关闭"
#: src/diffuse/main.py:1123 #: src/diffuse/main.py:1126
#, python-format #, python-format
msgid "Closing this tab will quit %s." msgid "Closing this tab will quit %s."
msgstr "关闭此标签将会退出%s" msgstr "关闭此标签将会退出%s"
#: src/diffuse/main.py:1206 #: src/diffuse/main.py:1209
#, python-format #, python-format
msgid "File Merge %d" msgid "File Merge %d"
msgstr "文件合并%d" msgstr "文件合并%d"
#: src/diffuse/main.py:1312 #: src/diffuse/main.py:1315
#, python-format #, python-format
msgid "Error retrieving commits for %s." msgid "Error retrieving commits for %s."
msgstr "錯誤修改提交%s。" msgstr "錯誤修改提交%s。"
#: src/diffuse/main.py:1344 #: src/diffuse/main.py:1347
#, python-format #, python-format
msgid "Error retrieving modifications for %s." msgid "Error retrieving modifications for %s."
msgstr "无法恢复对%s的修改。" msgstr "无法恢复对%s的修改。"
#: src/diffuse/main.py:1377 #: src/diffuse/main.py:1380
msgid "Open File In New Tab" msgid "Open File In New Tab"
msgstr "在新标签里打开文件" msgstr "在新标签里打开文件"
#: src/diffuse/main.py:1400 #: src/diffuse/main.py:1403
msgid "Choose Folder With Modified Files" msgid "Choose Folder With Modified Files"
msgstr "选择更改过的文件夹" msgstr "选择更改过的文件夹"
#: src/diffuse/main.py:1418 #: src/diffuse/main.py:1421
msgid "No modified files found." msgid "No modified files found."
msgstr "没有找到修改过的文件。" msgstr "没有找到修改过的文件。"
#: src/diffuse/main.py:1424 #: src/diffuse/main.py:1427
msgid "Choose Folder With Commit" msgid "Choose Folder With Commit"
msgstr "选择提交的文件夹" msgstr "选择提交的文件夹"
#: src/diffuse/main.py:1444 #: src/diffuse/main.py:1447
msgid "No committed files found." msgid "No committed files found."
msgstr "没有找到提交的文件。" msgstr "没有找到提交的文件。"
#: src/diffuse/main.py:1480 #: src/diffuse/main.py:1483
msgid "New N-Way File Merge..." msgid "New N-Way File Merge..."
msgstr "新建多方文件合并" msgstr "新建多方文件合并"
#: src/diffuse/main.py:1481 #: src/diffuse/main.py:1484
msgid "Number of panes: " msgid "Number of panes: "
msgstr "窗格数: " msgstr "窗格数: "
#: src/diffuse/main.py:1555 #: src/diffuse/main.py:1558
msgid "Phrase not found. Continue from the end of the file?" msgid "Phrase not found. Continue from the end of the file?"
msgstr "短语未找到，从文件结尾继续吗？" msgstr "短语未找到，从文件结尾继续吗？"
#: src/diffuse/main.py:1557 #: src/diffuse/main.py:1560
msgid "Phrase not found. Continue from the start of the file?" msgid "Phrase not found. Continue from the start of the file?"
msgstr "短语未找到，从文件开头继续吗？" msgstr "短语未找到，从文件开头继续吗？"
#: src/diffuse/main.py:1778 #: src/diffuse/main.py:1781
#, fuzzy #, fuzzy
msgid "" msgid ""
"Usage:\n" "Usage:\n"
@ -663,16 +668,16 @@ msgstr ""
" ( -i | --ignore-case ) 忽略小结的不同\n" " ( -i | --ignore-case ) 忽略小结的不同\n"
" ( -w | --ignore-all-space ) 忽略所有空白的不同" " ( -w | --ignore-all-space ) 忽略所有空白的不同"
#: src/diffuse/main.py:1945 #: src/diffuse/main.py:1948
msgid "Error parsing line number." msgid "Error parsing line number."
msgstr "解析行数时错误。" msgstr "解析行数时错误。"
#: src/diffuse/main.py:1955 #: src/diffuse/main.py:1958
#, python-format #, python-format
msgid "Skipping unknown argument \"%s\"." msgid "Skipping unknown argument \"%s\"."
msgstr "跳过未知参数\"%s\"。" msgstr "跳过未知参数\"%s\"。"
#: src/diffuse/main.py:1963 #: src/diffuse/main.py:1966
#, python-format #, python-format
msgid "Error processing argument \"%s\". Directory not expected." msgid "Error processing argument \"%s\". Directory not expected."
msgstr "无法处理\"%s\"。目录不存在。" msgstr "无法处理\"%s\"。目录不存在。"
@ -948,7 +953,3 @@ msgstr "选择所有"
#: src/diffuse/widgets.py:1868 #: src/diffuse/widgets.py:1868
msgid "Swap with Selected Pane" msgid "Swap with Selected Pane"
msgstr "交换选中的窗格" msgstr "交换选中的窗格"
#, python-format
#~ msgid "Column %d"
#~ msgstr "%d列"

255
po/zh_TW.po
View File

@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: diffuse 0.4.8\n" "Project-Id-Version: diffuse 0.4.8\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-23 19:48-0400\n" "POT-Creation-Date: 2022-10-23 20:00-0400\n"
"PO-Revision-Date: 2020-06-29 14:49-0400\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n"
"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n" "Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@ -98,40 +98,45 @@ msgstr "儲存檔案"
msgid "Save File As..." msgid "Save File As..."
msgstr "另存為…" msgstr "另存為…"
#: src/diffuse/main.py:288 #: src/diffuse/main.py:217
#, python-format
msgid "Column %d"
msgstr "第 %d 行"
#: src/diffuse/main.py:291
msgid "Save changes before loading the new file?" msgid "Save changes before loading the new file?"
msgstr "載入新檔前儲存更改嗎？" msgstr "載入新檔前儲存更改嗎？"
#: src/diffuse/main.py:399 #: src/diffuse/main.py:402
#, python-format #, python-format
msgid "Error reading revision %(rev)s of %(file)s." msgid "Error reading revision %(rev)s of %(file)s."
msgstr "無法讀取檔案 %(file)s 中的修訂版本 %(rev)s。" msgstr "無法讀取檔案 %(file)s 中的修訂版本 %(rev)s。"
#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #: src/diffuse/main.py:405 src/diffuse/main.py:1860
#, python-format #, python-format
msgid "Error reading %s." msgid "Error reading %s."
msgstr "無法讀取 %s。" msgstr "無法讀取 %s。"
#: src/diffuse/main.py:424 #: src/diffuse/main.py:427
msgid "Open File" msgid "Open File"
msgstr "開啟檔案" msgstr "開啟檔案"
#: src/diffuse/main.py:481 #: src/diffuse/main.py:484
#, python-format #, python-format
msgid "The file %s changed on disk. Do you want to reload the file?" msgid "The file %s changed on disk. Do you want to reload the file?"
msgstr "檔案 %s 已被更改，是否重新載入？" msgstr "檔案 %s 已被更改，是否重新載入？"
#: src/diffuse/main.py:507 #: src/diffuse/main.py:510
#, python-format #, python-format
msgid "Save %(title)s Pane %(pane)d" msgid "Save %(title)s Pane %(pane)d"
msgstr "儲存 %(title)s 窗格 %(pane)d" msgstr "儲存 %(title)s 窗格 %(pane)d"
#: src/diffuse/main.py:539 #: src/diffuse/main.py:542
#, python-format #, python-format
msgid "A file named %s already exists. Do you want to overwrite it?" msgid "A file named %s already exists. Do you want to overwrite it?"
msgstr "%s 的檔案已存在，您希望覆蓋它嗎？" msgstr "%s 的檔案已存在，您希望覆蓋它嗎？"
#: src/diffuse/main.py:546 #: src/diffuse/main.py:549
#, python-format #, python-format
msgid "" msgid ""
"The file %s has been modified by another process since reading it. If you save, " "The file %s has been modified by another process since reading it. If you save, "
@ -139,458 +144,458 @@ msgid ""
msgstr "" msgstr ""
"檔案 %s 打開後被其他程式變更過了，如果儲存，其他程式的變更修改將會不見，儲存嗎？" "檔案 %s 打開後被其他程式變更過了，如果儲存，其他程式的變更修改將會不見，儲存嗎？"
#: src/diffuse/main.py:588 #: src/diffuse/main.py:591
#, python-format #, python-format
msgid "Error encoding to %s." msgid "Error encoding to %s."
msgstr "無法編碼為 %s。" msgstr "無法編碼為 %s。"
#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #: src/diffuse/main.py:595 src/diffuse/preferences.py:300
#, python-format #, python-format
msgid "Error writing %s." msgid "Error writing %s."
msgstr "無法寫入 %s" msgstr "無法寫入 %s"
#: src/diffuse/main.py:622 #: src/diffuse/main.py:625
msgid "Go To Line..." msgid "Go To Line..."
msgstr "跳到列號…" msgstr "跳到列號…"
#: src/diffuse/main.py:623 #: src/diffuse/main.py:626
msgid "Line Number: " msgid "Line Number: "
msgstr "列數：" msgstr "列數："
#: src/diffuse/main.py:654 #: src/diffuse/main.py:657
msgid "" msgid ""
"Press the enter key or double click to edit. Press the space bar or use the RMB " "Press the enter key or double click to edit. Press the space bar or use the RMB "
"menu to manually align." "menu to manually align."
msgstr "按確定鍵或雙擊滑鼠進行編輯。空格鍵或者右鍵選單手動對齊。" msgstr "按確定鍵或雙擊滑鼠進行編輯。空格鍵或者右鍵選單手動對齊。"
#: src/diffuse/main.py:658 #: src/diffuse/main.py:661
msgid "Press the escape key to finish editing." msgid "Press the escape key to finish editing."
msgstr "按 ESC 鍵結束編輯" msgstr "按 ESC 鍵結束編輯"
#: src/diffuse/main.py:661 #: src/diffuse/main.py:664
msgid "" msgid ""
"Select target line and press the space bar to align. Press the escape key to " "Select target line and press the space bar to align. Press the escape key to "
"cancel." "cancel."
msgstr "選擇目標列然後按空格鍵進行對齊，按 ESC 取消。" msgstr "選擇目標列然後按空格鍵進行對齊，按 ESC 取消。"
#: src/diffuse/main.py:784 #: src/diffuse/main.py:787
msgid "_File" msgid "_File"
msgstr "檔案(_F)" msgstr "檔案(_F)"
#: src/diffuse/main.py:785 #: src/diffuse/main.py:788
msgid "_Open File..." msgid "_Open File..."
msgstr "開啟檔案(_O)…" msgstr "開啟檔案(_O)…"
#: src/diffuse/main.py:786 #: src/diffuse/main.py:789
msgid "Open File In New _Tab..." msgid "Open File In New _Tab..."
msgstr "在新分頁裡開啟檔案(_T)…" msgstr "在新分頁裡開啟檔案(_T)…"
#: src/diffuse/main.py:787 #: src/diffuse/main.py:790
msgid "Open _Modified Files..." msgid "Open _Modified Files..."
msgstr "開啟修改過的檔案(_M)…" msgstr "開啟修改過的檔案(_M)…"
#: src/diffuse/main.py:788 #: src/diffuse/main.py:791
msgid "Open Commi_t..." msgid "Open Commi_t..."
msgstr "開啟認可(_T)…" msgstr "開啟認可(_T)…"
#: src/diffuse/main.py:789 #: src/diffuse/main.py:792
msgid "_Reload File" msgid "_Reload File"
msgstr "重新載入(_R)" msgstr "重新載入(_R)"
#: src/diffuse/main.py:791 #: src/diffuse/main.py:794
msgid "_Save File" msgid "_Save File"
msgstr "儲存(_S)" msgstr "儲存(_S)"
#: src/diffuse/main.py:792 #: src/diffuse/main.py:795
msgid "Save File _As..." msgid "Save File _As..."
msgstr "另存為(_A)…" msgstr "另存為(_A)…"
#: src/diffuse/main.py:793 #: src/diffuse/main.py:796
msgid "Save A_ll" msgid "Save A_ll"
msgstr "儲存所有(_L)" msgstr "儲存所有(_L)"
#: src/diffuse/main.py:795 #: src/diffuse/main.py:798
msgid "New _2-Way File Merge" msgid "New _2-Way File Merge"
msgstr "新的二重檔案合併(_2)" msgstr "新的二重檔案合併(_2)"
#: src/diffuse/main.py:796 #: src/diffuse/main.py:799
msgid "New _3-Way File Merge" msgid "New _3-Way File Merge"
msgstr "新的三重檔案合併(_3)" msgstr "新的三重檔案合併(_3)"
#: src/diffuse/main.py:797 #: src/diffuse/main.py:800
msgid "New _N-Way File Merge..." msgid "New _N-Way File Merge..."
msgstr "新的多重檔案合併(_N)…" msgstr "新的多重檔案合併(_N)…"
#: src/diffuse/main.py:799 #: src/diffuse/main.py:802
msgid "_Close Tab" msgid "_Close Tab"
msgstr "關閉分頁(_C)" msgstr "關閉分頁(_C)"
#: src/diffuse/main.py:800 #: src/diffuse/main.py:803
msgid "_Undo Close Tab" msgid "_Undo Close Tab"
msgstr "復原關閉的分頁" msgstr "復原關閉的分頁"
#: src/diffuse/main.py:801 #: src/diffuse/main.py:804
msgid "_Quit" msgid "_Quit"
msgstr "退出(_Q)" msgstr "退出(_Q)"
#: src/diffuse/main.py:804 #: src/diffuse/main.py:807
msgid "_Edit" msgid "_Edit"
msgstr "編輯(_E)" msgstr "編輯(_E)"
#: src/diffuse/main.py:805 #: src/diffuse/main.py:808
msgid "_Undo" msgid "_Undo"
msgstr "復原(_U)" msgstr "復原(_U)"
#: src/diffuse/main.py:806 #: src/diffuse/main.py:809
msgid "_Redo" msgid "_Redo"
msgstr "重做(_R)" msgstr "重做(_R)"
#: src/diffuse/main.py:808 #: src/diffuse/main.py:811
msgid "Cu_t" msgid "Cu_t"
msgstr "剪下(_T)" msgstr "剪下(_T)"
#: src/diffuse/main.py:809 #: src/diffuse/main.py:812
msgid "_Copy" msgid "_Copy"
msgstr "複製(_C)" msgstr "複製(_C)"
#: src/diffuse/main.py:810 #: src/diffuse/main.py:813
msgid "_Paste" msgid "_Paste"
msgstr "貼上(_P)" msgstr "貼上(_P)"
#: src/diffuse/main.py:812 #: src/diffuse/main.py:815
msgid "Select _All" msgid "Select _All"
msgstr "全選(_A)" msgstr "全選(_A)"
#: src/diffuse/main.py:813 #: src/diffuse/main.py:816
msgid "C_lear Edits" msgid "C_lear Edits"
msgstr "取消編輯(L)" msgstr "取消編輯(L)"
#: src/diffuse/main.py:814 #: src/diffuse/main.py:817
msgid "_Dismiss All Edits" msgid "_Dismiss All Edits"
msgstr "放棄所有的變更(_D)" msgstr "放棄所有的變更(_D)"
#: src/diffuse/main.py:816 #: src/diffuse/main.py:819
msgid "_Find..." msgid "_Find..."
msgstr "搜尋(_F)…" msgstr "搜尋(_F)…"
#: src/diffuse/main.py:817 #: src/diffuse/main.py:820
msgid "Find _Next" msgid "Find _Next"
msgstr "找下一個(_N)" msgstr "找下一個(_N)"
#: src/diffuse/main.py:818 #: src/diffuse/main.py:821
msgid "Find Pre_vious" msgid "Find Pre_vious"
msgstr "找上一個(_V)" msgstr "找上一個(_V)"
#: src/diffuse/main.py:819 #: src/diffuse/main.py:822
msgid "_Go To Line..." msgid "_Go To Line..."
msgstr "跳到列號(_G)…" msgstr "跳到列號(_G)…"
#: src/diffuse/main.py:821 #: src/diffuse/main.py:824
msgid "Pr_eferences..." msgid "Pr_eferences..."
msgstr "選項(_E)…" msgstr "選項(_E)…"
#: src/diffuse/main.py:825 #: src/diffuse/main.py:828
msgid "None" msgid "None"
msgstr "無" msgstr "無"
#: src/diffuse/main.py:843 #: src/diffuse/main.py:846
msgid "_View" msgid "_View"
msgstr "檢視(_V)" msgstr "檢視(_V)"
#: src/diffuse/main.py:844 #: src/diffuse/main.py:847
msgid "_Syntax Highlighting" msgid "_Syntax Highlighting"
msgstr "高亮度語法(_S)" msgstr "高亮度語法(_S)"
#: src/diffuse/main.py:846 #: src/diffuse/main.py:849
msgid "Re_align All" msgid "Re_align All"
msgstr "全部重新對齊(_A)" msgstr "全部重新對齊(_A)"
#: src/diffuse/main.py:847 #: src/diffuse/main.py:850
msgid "_Isolate" msgid "_Isolate"
msgstr "分離(_I)" msgstr "分離(_I)"
#: src/diffuse/main.py:849 #: src/diffuse/main.py:852
msgid "_First Difference" msgid "_First Difference"
msgstr "第一個差異(_F)" msgstr "第一個差異(_F)"
#: src/diffuse/main.py:850 #: src/diffuse/main.py:853
msgid "_Previous Difference" msgid "_Previous Difference"
msgstr "上一個差異(_P)" msgstr "上一個差異(_P)"
#: src/diffuse/main.py:851 #: src/diffuse/main.py:854
msgid "_Next Difference" msgid "_Next Difference"
msgstr "下一個差異(_N)" msgstr "下一個差異(_N)"
#: src/diffuse/main.py:852 #: src/diffuse/main.py:855
msgid "_Last Difference" msgid "_Last Difference"
msgstr "最後一個差異(_L)" msgstr "最後一個差異(_L)"
#: src/diffuse/main.py:854 #: src/diffuse/main.py:857
msgid "Fir_st Tab" msgid "Fir_st Tab"
msgstr "第一個分頁(_S)" msgstr "第一個分頁(_S)"
#: src/diffuse/main.py:855 #: src/diffuse/main.py:858
msgid "Pre_vious Tab" msgid "Pre_vious Tab"
msgstr "上一個分頁(_V)" msgstr "上一個分頁(_V)"
#: src/diffuse/main.py:856 #: src/diffuse/main.py:859
msgid "Next _Tab" msgid "Next _Tab"
msgstr "下一個分頁(_T)" msgstr "下一個分頁(_T)"
#: src/diffuse/main.py:857 #: src/diffuse/main.py:860
msgid "Las_t Tab" msgid "Las_t Tab"
msgstr "最後一個分頁(_T)" msgstr "最後一個分頁(_T)"
#: src/diffuse/main.py:859 #: src/diffuse/main.py:862
msgid "Shift Pane _Right" msgid "Shift Pane _Right"
msgstr "右移窗格(_R)" msgstr "右移窗格(_R)"
#: src/diffuse/main.py:860 #: src/diffuse/main.py:863
msgid "Shift Pane _Left" msgid "Shift Pane _Left"
msgstr "左移窗格(_L)" msgstr "左移窗格(_L)"
#: src/diffuse/main.py:863 #: src/diffuse/main.py:866
msgid "F_ormat" msgid "F_ormat"
msgstr "格式(_O)" msgstr "格式(_O)"
#: src/diffuse/main.py:864 #: src/diffuse/main.py:867
msgid "Convert To _Upper Case" msgid "Convert To _Upper Case"
msgstr "轉換成大寫" msgstr "轉換成大寫"
#: src/diffuse/main.py:865 #: src/diffuse/main.py:868
msgid "Convert To _Lower Case" msgid "Convert To _Lower Case"
msgstr "轉換成小寫" msgstr "轉換成小寫"
#: src/diffuse/main.py:867 #: src/diffuse/main.py:870
msgid "Sort Lines In _Ascending Order" msgid "Sort Lines In _Ascending Order"
msgstr "以遞增的順序排列" msgstr "以遞增的順序排列"
#: src/diffuse/main.py:868 #: src/diffuse/main.py:871
msgid "Sort Lines In D_escending Order" msgid "Sort Lines In D_escending Order"
msgstr "以遞減的順序排列" msgstr "以遞減的順序排列"
#: src/diffuse/main.py:870 #: src/diffuse/main.py:873
msgid "Remove Trailing _White Space" msgid "Remove Trailing _White Space"
msgstr "刪除多餘的空格(_W)" msgstr "刪除多餘的空格(_W)"
#: src/diffuse/main.py:871 #: src/diffuse/main.py:874
msgid "Convert Tabs To _Spaces" msgid "Convert Tabs To _Spaces"
msgstr "轉換跳格字元為空格(_S)" msgstr "轉換跳格字元為空格(_S)"
#: src/diffuse/main.py:872 #: src/diffuse/main.py:875
msgid "Convert Leading Spaces To _Tabs" msgid "Convert Leading Spaces To _Tabs"
msgstr "轉換開頭的空格為跳格字元(_T)" msgstr "轉換開頭的空格為跳格字元(_T)"
#: src/diffuse/main.py:874 #: src/diffuse/main.py:877
msgid "_Increase Indenting" msgid "_Increase Indenting"
msgstr "減少縮排(_I)" msgstr "減少縮排(_I)"
#: src/diffuse/main.py:875 #: src/diffuse/main.py:878
msgid "De_crease Indenting" msgid "De_crease Indenting"
msgstr "減少縮排" msgstr "減少縮排"
#: src/diffuse/main.py:877 #: src/diffuse/main.py:880
msgid "Convert To _DOS Format" msgid "Convert To _DOS Format"
msgstr "轉換為 DOS 格式(_D)" msgstr "轉換為 DOS 格式(_D)"
#: src/diffuse/main.py:878 #: src/diffuse/main.py:881
msgid "Convert To _Mac Format" msgid "Convert To _Mac Format"
msgstr "轉換為 Mac 格式(_M)" msgstr "轉換為 Mac 格式(_M)"
#: src/diffuse/main.py:879 #: src/diffuse/main.py:882
msgid "Convert To Uni_x Format" msgid "Convert To Uni_x Format"
msgstr "轉換為 Unix 格式(_X)" msgstr "轉換為 Unix 格式(_X)"
#: src/diffuse/main.py:882 #: src/diffuse/main.py:885
msgid "_Merge" msgid "_Merge"
msgstr "合併(_M)" msgstr "合併(_M)"
#: src/diffuse/main.py:883 #: src/diffuse/main.py:886
msgid "Copy Selection _Right" msgid "Copy Selection _Right"
msgstr "複製選擇區域到右邊(_R)" msgstr "複製選擇區域到右邊(_R)"
#: src/diffuse/main.py:884 #: src/diffuse/main.py:887
msgid "Copy Selection _Left" msgid "Copy Selection _Left"
msgstr "複製選擇區域到左邊(_L)" msgstr "複製選擇區域到左邊(_L)"
#: src/diffuse/main.py:886 #: src/diffuse/main.py:889
msgid "Copy Left _Into Selection" msgid "Copy Left _Into Selection"
msgstr "複製左邊內容到選擇區域(_L)" msgstr "複製左邊內容到選擇區域(_L)"
#: src/diffuse/main.py:887 #: src/diffuse/main.py:890
msgid "Copy Right I_nto Selection" msgid "Copy Right I_nto Selection"
msgstr "複製右邊內容到選擇區域(_L)" msgstr "複製右邊內容到選擇區域(_L)"
#: src/diffuse/main.py:888 #: src/diffuse/main.py:891
msgid "_Merge From Left Then Right" msgid "_Merge From Left Then Right"
msgstr "先左再右合併(_M)" msgstr "先左再右合併(_M)"
#: src/diffuse/main.py:889 #: src/diffuse/main.py:892
msgid "M_erge From Right Then Left" msgid "M_erge From Right Then Left"
msgstr "從右向左合併(_E)" msgstr "從右向左合併(_E)"
#: src/diffuse/main.py:892 #: src/diffuse/main.py:895
msgid "_Help" msgid "_Help"
msgstr "求助(_H)" msgstr "求助(_H)"
#: src/diffuse/main.py:893 #: src/diffuse/main.py:896
msgid "_Help Contents..." msgid "_Help Contents..."
msgstr "說明內容(_H)…" msgstr "說明內容(_H)…"
#: src/diffuse/main.py:895 #: src/diffuse/main.py:898
#, python-format #, python-format
msgid "_About %s..." msgid "_About %s..."
msgstr "關於 %s(_A)…" msgstr "關於 %s(_A)…"
#: src/diffuse/main.py:910 #: src/diffuse/main.py:913
msgid "New 2-Way File Merge" msgid "New 2-Way File Merge"
msgstr "新的二重檔案合併" msgstr "新的二重檔案合併"
#: src/diffuse/main.py:911 #: src/diffuse/main.py:914
msgid "New 3-Way File Merge" msgid "New 3-Way File Merge"
msgstr "新的三重檔案合併" msgstr "新的三重檔案合併"
#: src/diffuse/main.py:913 #: src/diffuse/main.py:916
msgid "Realign All" msgid "Realign All"
msgstr "全部重新對齊" msgstr "全部重新對齊"
#: src/diffuse/main.py:914 #: src/diffuse/main.py:917
msgid "First Difference" msgid "First Difference"
msgstr "第一個差異" msgstr "第一個差異"
#: src/diffuse/main.py:915 #: src/diffuse/main.py:918
msgid "Previous Difference" msgid "Previous Difference"
msgstr "上一個差異" msgstr "上一個差異"
#: src/diffuse/main.py:916 #: src/diffuse/main.py:919
msgid "Next Difference" msgid "Next Difference"
msgstr "下一個差異" msgstr "下一個差異"
#: src/diffuse/main.py:917 #: src/diffuse/main.py:920
msgid "Last Difference" msgid "Last Difference"
msgstr "最後一個差異" msgstr "最後一個差異"
#: src/diffuse/main.py:919 #: src/diffuse/main.py:922
msgid "Copy Selection Right" msgid "Copy Selection Right"
msgstr "複製選擇區域到右邊" msgstr "複製選擇區域到右邊"
#: src/diffuse/main.py:920 #: src/diffuse/main.py:923
msgid "Copy Selection Left" msgid "Copy Selection Left"
msgstr "複製選擇區域到左邊" msgstr "複製選擇區域到左邊"
#: src/diffuse/main.py:921 #: src/diffuse/main.py:924
msgid "Copy Left Into Selection" msgid "Copy Left Into Selection"
msgstr "複製左邊內容到選擇區域" msgstr "複製左邊內容到選擇區域"
#: src/diffuse/main.py:922 #: src/diffuse/main.py:925
msgid "Copy Right Into Selection" msgid "Copy Right Into Selection"
msgstr "複製右邊內容到選擇區域" msgstr "複製右邊內容到選擇區域"
#: src/diffuse/main.py:923 #: src/diffuse/main.py:926
msgid "Merge From Left Then Right" msgid "Merge From Left Then Right"
msgstr "先左後右合併" msgstr "先左後右合併"
#: src/diffuse/main.py:924 #: src/diffuse/main.py:927
msgid "Merge From Right Then Left" msgid "Merge From Right Then Left"
msgstr "先右後左合併(_T)" msgstr "先右後左合併(_T)"
#: src/diffuse/main.py:926 #: src/diffuse/main.py:929
msgid "Undo" msgid "Undo"
msgstr "復原" msgstr "復原"
#: src/diffuse/main.py:927 #: src/diffuse/main.py:930
msgid "Redo" msgid "Redo"
msgstr "重做" msgstr "重做"
#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 #: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
msgid "Cut" msgid "Cut"
msgstr "剪下" msgstr "剪下"
#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 #: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
msgid "Copy" msgid "Copy"
msgstr "複製" msgstr "複製"
#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 #: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
msgid "Paste" msgid "Paste"
msgstr "貼上" msgstr "貼上"
#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 #: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
msgid "Clear Edits" msgid "Clear Edits"
msgstr "取消編輯" msgstr "取消編輯"
#: src/diffuse/main.py:1054 #: src/diffuse/main.py:1057
msgid "Some files have unsaved changes. Select the files to save before closing." msgid "Some files have unsaved changes. Select the files to save before closing."
msgstr "一些檔案已變更但未儲存，請在關閉前儲存這些檔案。" msgstr "一些檔案已變更但未儲存，請在關閉前儲存這些檔案。"
#: src/diffuse/main.py:1068 #: src/diffuse/main.py:1071
msgid "Tab" msgid "Tab"
msgstr "跳格字元" msgstr "跳格字元"
#: src/diffuse/main.py:1073 #: src/diffuse/main.py:1076
msgid "Pane" msgid "Pane"
msgstr "窗格" msgstr "窗格"
#: src/diffuse/main.py:1084 #: src/diffuse/main.py:1087
msgid "Close _Without Saving" msgid "Close _Without Saving"
msgstr "不儲存而關閉" msgstr "不儲存而關閉"
#: src/diffuse/main.py:1123 #: src/diffuse/main.py:1126
#, python-format #, python-format
msgid "Closing this tab will quit %s." msgid "Closing this tab will quit %s."
msgstr "關閉此分頁將會退出 %s" msgstr "關閉此分頁將會退出 %s"
#: src/diffuse/main.py:1206 #: src/diffuse/main.py:1209
#, python-format #, python-format
msgid "File Merge %d" msgid "File Merge %d"
msgstr "檔案合併 %d" msgstr "檔案合併 %d"
#: src/diffuse/main.py:1312 #: src/diffuse/main.py:1315
#, python-format #, python-format
msgid "Error retrieving commits for %s." msgid "Error retrieving commits for %s."
msgstr "無法恢復對 %s 的認可。" msgstr "無法恢復對 %s 的認可。"
#: src/diffuse/main.py:1344 #: src/diffuse/main.py:1347
#, python-format #, python-format
msgid "Error retrieving modifications for %s." msgid "Error retrieving modifications for %s."
msgstr "無法恢復對 %s 的修改。" msgstr "無法恢復對 %s 的修改。"
#: src/diffuse/main.py:1377 #: src/diffuse/main.py:1380
msgid "Open File In New Tab" msgid "Open File In New Tab"
msgstr "在新分頁裡開啟檔案" msgstr "在新分頁裡開啟檔案"
#: src/diffuse/main.py:1400 #: src/diffuse/main.py:1403
msgid "Choose Folder With Modified Files" msgid "Choose Folder With Modified Files"
msgstr "選擇更改過的檔案夾" msgstr "選擇更改過的檔案夾"
#: src/diffuse/main.py:1418 #: src/diffuse/main.py:1421
msgid "No modified files found." msgid "No modified files found."
msgstr "找不到已修改的檔案。" msgstr "找不到已修改的檔案。"
#: src/diffuse/main.py:1424 #: src/diffuse/main.py:1427
msgid "Choose Folder With Commit" msgid "Choose Folder With Commit"
msgstr "選擇認可過的檔案夾" msgstr "選擇認可過的檔案夾"
#: src/diffuse/main.py:1444 #: src/diffuse/main.py:1447
msgid "No committed files found." msgid "No committed files found."
msgstr "找不到已認可的檔案。" msgstr "找不到已認可的檔案。"
#: src/diffuse/main.py:1480 #: src/diffuse/main.py:1483
msgid "New N-Way File Merge..." msgid "New N-Way File Merge..."
msgstr "新的多重檔案合併…" msgstr "新的多重檔案合併…"
#: src/diffuse/main.py:1481 #: src/diffuse/main.py:1484
msgid "Number of panes: " msgid "Number of panes: "
msgstr "窗格數: " msgstr "窗格數: "
#: src/diffuse/main.py:1555 #: src/diffuse/main.py:1558
msgid "Phrase not found. Continue from the end of the file?" msgid "Phrase not found. Continue from the end of the file?"
msgstr "語詞未找到，從檔案結尾繼續嗎？" msgstr "語詞未找到，從檔案結尾繼續嗎？"
#: src/diffuse/main.py:1557 #: src/diffuse/main.py:1560
msgid "Phrase not found. Continue from the start of the file?" msgid "Phrase not found. Continue from the start of the file?"
msgstr "語詞未找到，從檔案開頭繼續嗎？" msgstr "語詞未找到，從檔案開頭繼續嗎？"
#: src/diffuse/main.py:1778 #: src/diffuse/main.py:1781
#, fuzzy #, fuzzy
msgid "" msgid ""
"Usage:\n" "Usage:\n"
@ -668,16 +673,16 @@ msgstr ""
" ( -i | --ignore-case ) 忽略大小寫差異\n" " ( -i | --ignore-case ) 忽略大小寫差異\n"
" ( -w | --ignore-all-space ) 忽略空白差異" " ( -w | --ignore-all-space ) 忽略空白差異"
#: src/diffuse/main.py:1945 #: src/diffuse/main.py:1948
msgid "Error parsing line number." msgid "Error parsing line number."
msgstr "解析列數時錯誤。" msgstr "解析列數時錯誤。"
#: src/diffuse/main.py:1955 #: src/diffuse/main.py:1958
#, python-format #, python-format
msgid "Skipping unknown argument \"%s\"." msgid "Skipping unknown argument \"%s\"."
msgstr "跳過未知引數「%s」。" msgstr "跳過未知引數「%s」。"
#: src/diffuse/main.py:1963 #: src/diffuse/main.py:1966
#, python-format #, python-format
msgid "Error processing argument \"%s\". Directory not expected." msgid "Error processing argument \"%s\". Directory not expected."
msgstr "無法處理「%s」。目錄不存在。" msgstr "無法處理「%s」。目錄不存在。"
@ -953,7 +958,3 @@ msgstr "全選"
#: src/diffuse/widgets.py:1868 #: src/diffuse/widgets.py:1868
msgid "Swap with Selected Pane" msgid "Swap with Selected Pane"
msgstr "交換選中的窗格" msgstr "交換選中的窗格"
#, python-format
#~ msgid "Column %d"
#~ msgstr "第 %d 行"

3
src/diffuse/main.py
View File

@ -212,6 +212,9 @@ class Diffuse(Gtk.Window):
# text = viewer.getLineText(viewer.current_pane, viewer.current_line)[:j] # text = viewer.getLineText(viewer.current_pane, viewer.current_line)[:j]
# j = viewer.stringWidth(text) # j = viewer.stringWidth(text)
# s = _('Column %d') % (j, ) # s = _('Column %d') % (j, )
#
# In the meantime, keep this line of code in order to keep the translations
s = _('Column %d') % (0, )
s = '' s = ''
else: else:
s = '' s = ''