From dc2e445c775239e9dfc903894844c78037a063b9 Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Mon, 4 Apr 2022 12:21:05 -0400 Subject: [PATCH] Update all translation files --- po/cs.po | 427 ++++++++++++++++++++------------------- po/de.po | 413 +++++++++++++++++++------------------- po/diffuse.pot | 19 +- po/es.po | 427 +++++++++++++++++++-------------------- po/fr.po | 61 +++--- po/it.po | 441 +++++++++++++++++++++-------------------- po/ja.po | 414 +++++++++++++++++++------------------- po/ko.po | 421 +++++++++++++++++++-------------------- po/pl.po | 380 +++++++++++++++++------------------ po/pt.po | 424 +++++++++++++++++++-------------------- po/pt_BR.po | 426 +++++++++++++++++++-------------------- po/ru.po | 426 ++++++++++++++++++++------------------- po/sv.po | 417 +++++++++++++++++++------------------- po/th.po | 414 +++++++++++++++++++------------------- po/zh_CN.po | 371 +++++++++++++++++----------------- po/zh_TW.po | 411 +++++++++++++++++++------------------- src/diffuse/dialogs.py | 4 +- 17 files changed, 2921 insertions(+), 2975 deletions(-) diff --git a/po/cs.po b/po/cs.po index 8d3b173..967f733 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,18 +7,18 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-27 21:56-0500\n" -"PO-Revision-Date: 2020-06-29 14:49-0400\n" +"POT-Creation-Date: 2022-04-04 12:14-0400\n" +"PO-Revision-Date: 2022-04-04 12:16-0400\n" "Last-Translator: Jindřich Šesták \n" "Language-Team: NONE \n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.5\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2 ;\n" +"X-Generator: Poedit 3.0.1\n" "X-Poedit-SourceCharset: UTF-8\n" -"X-Poedit-Basepath: ..\\src\\usr\\bin\n" +"X-Poedit-Basepath: ../src/usr/bin\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" @@ -43,7 +43,7 @@ msgstr "" msgid "Main window: diff between two files" msgstr "" -#: src/diffuse/constants.py:24 +#: src/diffuse/constants.py:25 msgid "Copyright" msgstr "" @@ -55,36 +55,6 @@ msgstr "Diffuse je grafický nástroj pro slučování a porovnávání textový msgid "translator-credits" msgstr "Jindřich Šesták " -#: src/diffuse/dialogs.py:49 -#, fuzzy -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License along\n" -"with this program; if not, write to the Free Software Foundation, Inc.,\n" -"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." -msgstr "" -"Tento program je svobodný software. Můžete ho upravovat a distribuovat za " -"podmínky dodržení pravidel licence GNU General Public License verze 2 (dále jen " -"GPL), nebo (pokud chcete) některé z jejích novějších verzí.\n" -"\n" -"Tento program je distribuován v naději, že bude užitečný, ale BEZ JAKÉKOLIV " -"ZÁRUKY, tedy ani implicitní záruky OBCHODOVATELNOSTI nebo VHODNOSTI PRO URČITÝ " -"ÚČEL. Další podrobnosti získáte přečtením GPL.\n" -"\n" -"Spolu s tímto programem by jste měli obdržet i kopii GPL. GPL můžete také získat " -"na domovských stránkách Free Software Foundation (http://www.fsf.org/), nebo " -"můžete zaslat dopis na adresu Free Software Foundation, Inc., 51 Franclin St, " -"Fifth Floor, Boston, MA 02110-1301 USA\n" - #: src/diffuse/dialogs.py:83 msgid "Encoding: " msgstr "Kódování: " @@ -109,60 +79,60 @@ msgstr "Rozlišovat velikost písmen" msgid "Search Backwards" msgstr "Hledat od konce" -#: src/diffuse/main.py:79 +#: src/diffuse/main.py:85 msgid "Close Tab" msgstr "Zavřít panel" -#: src/diffuse/main.py:124 +#: src/diffuse/main.py:132 msgid "Open File..." msgstr "Otevřít soubor..." -#: src/diffuse/main.py:125 +#: src/diffuse/main.py:133 msgid "Reload File" msgstr "Znovu načíst soubor" -#: src/diffuse/main.py:126 +#: src/diffuse/main.py:134 msgid "Save File" msgstr "Uložit soubor" -#: src/diffuse/main.py:127 +#: src/diffuse/main.py:135 msgid "Save File As..." msgstr "Uložit soubor jako..." -#: src/diffuse/main.py:280 +#: src/diffuse/main.py:288 msgid "Save changes before loading the new file?" msgstr "Uložit změny před načtením nového souboru?" -#: src/diffuse/main.py:391 +#: src/diffuse/main.py:399 #, python-format msgid "Error reading revision %(rev)s of %(file)s." msgstr "Při čtení revize %(rev)s souboru %(file)s došlo k chybě." -#: src/diffuse/main.py:394 src/diffuse/main.py:1849 +#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #, python-format msgid "Error reading %s." msgstr "Při čtení souboru %s došlo k chybě." -#: src/diffuse/main.py:416 +#: src/diffuse/main.py:424 msgid "Open File" msgstr "Otevřít soubor" -#: src/diffuse/main.py:473 +#: src/diffuse/main.py:481 #, python-format 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?" -#: src/diffuse/main.py:499 +#: src/diffuse/main.py:507 #, python-format msgid "Save %(title)s Pane %(pane)d" msgstr "Uložit podokno %(pane)d %(title)s" -#: src/diffuse/main.py:531 +#: src/diffuse/main.py:539 #, python-format 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?" -#: src/diffuse/main.py:538 +#: src/diffuse/main.py:546 #, python-format msgid "" "The file %s has been modified by another process since reading it. If you save, " @@ -171,25 +141,25 @@ msgstr "" "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?" -#: src/diffuse/main.py:580 +#: src/diffuse/main.py:588 #, python-format msgid "Error encoding to %s." msgstr "Při změně kódování do %s došlo k chybě." -#: src/diffuse/main.py:584 src/diffuse/preferences.py:298 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 #, python-format msgid "Error writing %s." msgstr "Při ukládání %s došlo k chybě." -#: src/diffuse/main.py:614 +#: src/diffuse/main.py:622 msgid "Go To Line..." msgstr "Přejít na řádek..." -#: src/diffuse/main.py:615 +#: src/diffuse/main.py:623 msgid "Line Number: " msgstr "Řádek číslo: " -#: src/diffuse/main.py:646 +#: src/diffuse/main.py:654 msgid "" "Press the enter key or double click to edit. Press the space bar or use the RMB " "menu to manually align." @@ -198,11 +168,11 @@ msgstr "" "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." -#: src/diffuse/main.py:650 +#: src/diffuse/main.py:658 msgid "Press the escape key to finish editing." msgstr "Editaci ukončíte pomocí klávesy escape." -#: src/diffuse/main.py:653 +#: src/diffuse/main.py:661 msgid "" "Select target line and press the space bar to align. Press the escape key to " "cancel." @@ -210,426 +180,426 @@ msgstr "" "Vyberte cílový řádek a proveďte zarovnání stisknutím klávesy Mezerník. Pro " "zrušení stiskněte klávesu Escape." -#: src/diffuse/main.py:776 +#: src/diffuse/main.py:784 msgid "_File" msgstr "_Soubor" -#: src/diffuse/main.py:777 +#: src/diffuse/main.py:785 msgid "_Open File..." msgstr "_Otevřít soubor..." -#: src/diffuse/main.py:778 +#: src/diffuse/main.py:786 msgid "Open File In New _Tab..." msgstr "Otevřít soubor v novém _panelu..." -#: src/diffuse/main.py:779 +#: src/diffuse/main.py:787 msgid "Open _Modified Files..." msgstr "Otevřít změněné soubory..." -#: src/diffuse/main.py:780 +#: src/diffuse/main.py:788 msgid "Open Commi_t..." msgstr "Otevřít _revizi..." -#: src/diffuse/main.py:781 +#: src/diffuse/main.py:789 msgid "_Reload File" msgstr "_Znovu načíst soubor" -#: src/diffuse/main.py:783 +#: src/diffuse/main.py:791 msgid "_Save File" msgstr "_Uložit soubor" -#: src/diffuse/main.py:784 +#: src/diffuse/main.py:792 msgid "Save File _As..." msgstr "Uložit soubor ­_jako..." -#: src/diffuse/main.py:785 +#: src/diffuse/main.py:793 msgid "Save A_ll" msgstr "Uložit _vše" -#: src/diffuse/main.py:787 +#: src/diffuse/main.py:795 msgid "New _2-Way File Merge" msgstr "Nové _2směrné slučování" -#: src/diffuse/main.py:788 +#: src/diffuse/main.py:796 msgid "New _3-Way File Merge" msgstr "Nové _3směrné slučování" -#: src/diffuse/main.py:789 +#: src/diffuse/main.py:797 msgid "New _N-Way File Merge..." -msgstr "Nové _Nsměrné slučování" +msgstr "Nové _Nsměrné slučování..." -#: src/diffuse/main.py:791 +#: src/diffuse/main.py:799 msgid "_Close Tab" msgstr "_Zavřít panel" -#: src/diffuse/main.py:792 +#: src/diffuse/main.py:800 msgid "_Undo Close Tab" msgstr "_Obnovit zavřený panel" -#: src/diffuse/main.py:793 +#: src/diffuse/main.py:801 msgid "_Quit" msgstr "Kone_c" -#: src/diffuse/main.py:796 +#: src/diffuse/main.py:804 msgid "_Edit" msgstr "Úpr_avy" -#: src/diffuse/main.py:797 +#: src/diffuse/main.py:805 msgid "_Undo" msgstr "_Zpět" -#: src/diffuse/main.py:798 +#: src/diffuse/main.py:806 msgid "_Redo" msgstr "Z_novu" -#: src/diffuse/main.py:800 +#: src/diffuse/main.py:808 msgid "Cu_t" msgstr "_Vyjmout" -#: src/diffuse/main.py:801 +#: src/diffuse/main.py:809 msgid "_Copy" msgstr "_Kopírovat" -#: src/diffuse/main.py:802 +#: src/diffuse/main.py:810 msgid "_Paste" msgstr "V_ložit" -#: src/diffuse/main.py:804 +#: src/diffuse/main.py:812 msgid "Select _All" msgstr "V_ybrat vše" -#: src/diffuse/main.py:805 +#: src/diffuse/main.py:813 msgid "C_lear Edits" msgstr "_Smazat úpravy" -#: src/diffuse/main.py:806 +#: src/diffuse/main.py:814 msgid "_Dismiss All Edits" msgstr "Z_rušit všechny úpravy" -#: src/diffuse/main.py:808 +#: src/diffuse/main.py:816 msgid "_Find..." -msgstr "_Najít" +msgstr "_Najít..." -#: src/diffuse/main.py:809 +#: src/diffuse/main.py:817 msgid "Find _Next" msgstr "Najít _další" -#: src/diffuse/main.py:810 +#: src/diffuse/main.py:818 msgid "Find Pre_vious" msgstr "Najít _předchozí" -#: src/diffuse/main.py:811 +#: src/diffuse/main.py:819 msgid "_Go To Line..." msgstr "Pře_jít na řádek..." -#: src/diffuse/main.py:813 +#: src/diffuse/main.py:821 msgid "Pr_eferences..." msgstr "Př_edvolby..." -#: src/diffuse/main.py:817 +#: src/diffuse/main.py:825 msgid "None" msgstr "Nic" -#: src/diffuse/main.py:835 +#: src/diffuse/main.py:843 msgid "_View" msgstr "_Zobrazit" -#: src/diffuse/main.py:836 +#: src/diffuse/main.py:844 msgid "_Syntax Highlighting" msgstr "Zvýraznění _syntaxe" -#: src/diffuse/main.py:838 +#: src/diffuse/main.py:846 msgid "Re_align All" msgstr "Znovu _zarovnat" -#: src/diffuse/main.py:839 +#: src/diffuse/main.py:847 msgid "_Isolate" msgstr "_Izolovat" -#: src/diffuse/main.py:841 +#: src/diffuse/main.py:849 msgid "_First Difference" msgstr "Pr_vní rozdíl" -#: src/diffuse/main.py:842 +#: src/diffuse/main.py:850 msgid "_Previous Difference" msgstr "_Předchozí rozdíl" -#: src/diffuse/main.py:843 +#: src/diffuse/main.py:851 msgid "_Next Difference" msgstr "_Další rozdíl" -#: src/diffuse/main.py:844 +#: src/diffuse/main.py:852 msgid "_Last Difference" msgstr "P_oslední rozdíl" -#: src/diffuse/main.py:846 +#: src/diffuse/main.py:854 msgid "Fir_st Tab" msgstr "Prv_ní panel" -#: src/diffuse/main.py:847 +#: src/diffuse/main.py:855 msgid "Pre_vious Tab" msgstr "Předch_ozí panel" -#: src/diffuse/main.py:848 +#: src/diffuse/main.py:856 msgid "Next _Tab" msgstr "D_alší panel" -#: src/diffuse/main.py:849 +#: src/diffuse/main.py:857 msgid "Las_t Tab" msgstr "Posl_ední panel" -#: src/diffuse/main.py:851 +#: src/diffuse/main.py:859 msgid "Shift Pane _Right" msgstr "Přesunout podokno dop_rava" -#: src/diffuse/main.py:852 +#: src/diffuse/main.py:860 msgid "Shift Pane _Left" msgstr "Přesunout podokno do_leva" -#: src/diffuse/main.py:855 +#: src/diffuse/main.py:863 msgid "F_ormat" msgstr "F_ormát" -#: src/diffuse/main.py:856 +#: src/diffuse/main.py:864 msgid "Convert To _Upper Case" msgstr "Převést na _velká písmena" -#: src/diffuse/main.py:857 +#: src/diffuse/main.py:865 msgid "Convert To _Lower Case" msgstr "Převést na _malá písmena" -#: src/diffuse/main.py:859 +#: src/diffuse/main.py:867 msgid "Sort Lines In _Ascending Order" msgstr "Seřadit řádky v_zestupně" -#: src/diffuse/main.py:860 +#: src/diffuse/main.py:868 msgid "Sort Lines In D_escending Order" msgstr "Seřadit řádky _sestupně" -#: src/diffuse/main.py:862 +#: src/diffuse/main.py:870 msgid "Remove Trailing _White Space" msgstr "_Odstranit mezery na koncích řádků" -#: src/diffuse/main.py:863 +#: src/diffuse/main.py:871 msgid "Convert Tabs To _Spaces" msgstr "_Nahradit tabulátory mezerami" -#: src/diffuse/main.py:864 +#: src/diffuse/main.py:872 msgid "Convert Leading Spaces To _Tabs" msgstr "Nah_radit úvodní mezery tabulátory" -#: src/diffuse/main.py:866 +#: src/diffuse/main.py:874 msgid "_Increase Indenting" msgstr "Zvětš_it odsazení" -#: src/diffuse/main.py:867 +#: src/diffuse/main.py:875 msgid "De_crease Indenting" msgstr "Zmenši_t odsazení" -#: src/diffuse/main.py:869 +#: src/diffuse/main.py:877 msgid "Convert To _DOS Format" msgstr "Převést na _DOS formát" -#: src/diffuse/main.py:870 +#: src/diffuse/main.py:878 msgid "Convert To _Mac Format" msgstr "Převést na Ma_c formát" -#: src/diffuse/main.py:871 +#: src/diffuse/main.py:879 msgid "Convert To Uni_x Format" msgstr "Převést na Uni_x formát" -#: src/diffuse/main.py:874 +#: src/diffuse/main.py:882 msgid "_Merge" msgstr "S_loučit" -#: src/diffuse/main.py:875 +#: src/diffuse/main.py:883 msgid "Copy Selection _Right" msgstr "_Kopírovat výběr doprava" -#: src/diffuse/main.py:876 +#: src/diffuse/main.py:884 msgid "Copy Selection _Left" msgstr "K_opírovat výběr doleva" -#: src/diffuse/main.py:878 +#: src/diffuse/main.py:886 msgid "Copy Left _Into Selection" msgstr "Ko_pírovat zleva do výběru" -#: src/diffuse/main.py:879 +#: src/diffuse/main.py:887 msgid "Copy Right I_nto Selection" msgstr "Kopí_rovat zprava do výběru" -#: src/diffuse/main.py:880 +#: src/diffuse/main.py:888 msgid "_Merge From Left Then Right" msgstr "_Sloučit zleva a poté zprava" -#: src/diffuse/main.py:881 +#: src/diffuse/main.py:889 msgid "M_erge From Right Then Left" msgstr "S_loučit zprava a poté zleva" -#: src/diffuse/main.py:884 +#: src/diffuse/main.py:892 msgid "_Help" msgstr "Nápo_věda" -#: src/diffuse/main.py:885 +#: src/diffuse/main.py:893 msgid "_Help Contents..." -msgstr "_Zobrazit nápovědu" +msgstr "_Zobrazit nápovědu..." -#: src/diffuse/main.py:887 +#: src/diffuse/main.py:895 #, python-format msgid "_About %s..." msgstr "_O programu %s..." -#: src/diffuse/main.py:902 +#: src/diffuse/main.py:910 msgid "New 2-Way File Merge" msgstr "Nové 2směrné slučování" -#: src/diffuse/main.py:903 +#: src/diffuse/main.py:911 msgid "New 3-Way File Merge" msgstr "Nové 3směrné slučování" -#: src/diffuse/main.py:905 +#: src/diffuse/main.py:913 msgid "Realign All" msgstr "Znovu zarovnat" -#: src/diffuse/main.py:906 +#: src/diffuse/main.py:914 msgid "First Difference" msgstr "První rozdíl" -#: src/diffuse/main.py:907 +#: src/diffuse/main.py:915 msgid "Previous Difference" msgstr "Předchozí rozdíl" -#: src/diffuse/main.py:908 +#: src/diffuse/main.py:916 msgid "Next Difference" msgstr "Další rozdíl" -#: src/diffuse/main.py:909 +#: src/diffuse/main.py:917 msgid "Last Difference" msgstr "Poslední rozdíl" -#: src/diffuse/main.py:911 +#: src/diffuse/main.py:919 msgid "Copy Selection Right" msgstr "Kopírovat výběr doprava" -#: src/diffuse/main.py:912 +#: src/diffuse/main.py:920 msgid "Copy Selection Left" msgstr "Kopírovat výběr doleva" -#: src/diffuse/main.py:913 +#: src/diffuse/main.py:921 msgid "Copy Left Into Selection" msgstr "Kopírovat zleva do výběru" -#: src/diffuse/main.py:914 +#: src/diffuse/main.py:922 msgid "Copy Right Into Selection" msgstr "Kopírovat zprava do výběru" -#: src/diffuse/main.py:915 +#: src/diffuse/main.py:923 msgid "Merge From Left Then Right" msgstr "Sloučit zleva a poté zprava" -#: src/diffuse/main.py:916 +#: src/diffuse/main.py:924 msgid "Merge From Right Then Left" msgstr "Sloučit zprava a poté zleva" -#: src/diffuse/main.py:918 +#: src/diffuse/main.py:926 msgid "Undo" msgstr "Zpět" -#: src/diffuse/main.py:919 +#: src/diffuse/main.py:927 msgid "Redo" msgstr "Znovu" -#: src/diffuse/main.py:920 src/diffuse/widgets.py:1847 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 msgid "Cut" msgstr "Vyjmout" -#: src/diffuse/main.py:921 src/diffuse/widgets.py:1848 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 msgid "Copy" msgstr "Kopírovat" -#: src/diffuse/main.py:922 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 msgid "Paste" msgstr "Vložit" -#: src/diffuse/main.py:923 src/diffuse/widgets.py:1852 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 msgid "Clear Edits" msgstr "Smazat úpravy" -#: src/diffuse/main.py:1046 +#: src/diffuse/main.py:1054 msgid "Some files have unsaved changes. Select the files to save before closing." msgstr "" "Některé změněné soubory nebyly uloženy. Vyberte soubory, které chcete před " "zavřením uložit." -#: src/diffuse/main.py:1060 +#: src/diffuse/main.py:1068 msgid "Tab" msgstr "Panel" -#: src/diffuse/main.py:1065 +#: src/diffuse/main.py:1073 msgid "Pane" msgstr "Podokno" -#: src/diffuse/main.py:1076 +#: src/diffuse/main.py:1084 msgid "Close _Without Saving" msgstr "Zavřít _bez uložení" -#: src/diffuse/main.py:1115 +#: src/diffuse/main.py:1123 #, python-format msgid "Closing this tab will quit %s." msgstr "Zavřením tohoto panelu ukončíte %s." -#: src/diffuse/main.py:1198 +#: src/diffuse/main.py:1206 #, python-format msgid "File Merge %d" msgstr "Slučování %d" -#: src/diffuse/main.py:1304 +#: src/diffuse/main.py:1312 #, python-format msgid "Error retrieving commits for %s." msgstr "Revize pro %s se nepodařilo načíst." -#: src/diffuse/main.py:1336 +#: src/diffuse/main.py:1344 #, python-format msgid "Error retrieving modifications for %s." msgstr "Při načítání změn %s došlo k chybě." -#: src/diffuse/main.py:1369 +#: src/diffuse/main.py:1377 msgid "Open File In New Tab" msgstr "Otevřít soubor v novém panelu" -#: src/diffuse/main.py:1392 +#: src/diffuse/main.py:1400 msgid "Choose Folder With Modified Files" msgstr "Vyberte adresář se změněnými soubory" -#: src/diffuse/main.py:1410 +#: src/diffuse/main.py:1418 msgid "No modified files found." msgstr "Nebyly nalezeny žádné změněné soubory." -#: src/diffuse/main.py:1416 +#: src/diffuse/main.py:1424 msgid "Choose Folder With Commit" msgstr "Vyberte adresář se zapsanou revizí" -#: src/diffuse/main.py:1436 +#: src/diffuse/main.py:1444 msgid "No committed files found." msgstr "Nebyly nalezeny žádné zapsané soubory." -#: src/diffuse/main.py:1472 +#: src/diffuse/main.py:1480 msgid "New N-Way File Merge..." -msgstr "Nové Nsměrné slučování" +msgstr "Nové Nsměrné slučování..." -#: src/diffuse/main.py:1473 +#: src/diffuse/main.py:1481 msgid "Number of panes: " msgstr "Počet podoken: " -#: src/diffuse/main.py:1547 +#: src/diffuse/main.py:1555 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?" -#: src/diffuse/main.py:1549 +#: src/diffuse/main.py:1557 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?" -#: src/diffuse/main.py:1770 +#: src/diffuse/main.py:1778 #, fuzzy msgid "" "Usage:\n" @@ -715,174 +685,174 @@ msgstr "" " ( -w | --ignore-all-space ) Bude ignorovat změny pokud, jde o " "netisknutelné znaky" -#: src/diffuse/main.py:1937 +#: src/diffuse/main.py:1945 msgid "Error parsing line number." msgstr "Při analýze čísla řádku došlo k chybě." -#: src/diffuse/main.py:1947 +#: src/diffuse/main.py:1955 #, python-format msgid "Skipping unknown argument \"%s\"." msgstr "Ignorován neznámý parametr \"%s\"." -#: src/diffuse/main.py:1955 +#: src/diffuse/main.py:1963 #, python-format 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." -#: src/diffuse/preferences.py:79 +#: src/diffuse/preferences.py:80 msgid "Display" msgstr "Zobrazení" -#: src/diffuse/preferences.py:82 +#: src/diffuse/preferences.py:83 msgid "Font" msgstr "Písmo" -#: src/diffuse/preferences.py:83 +#: src/diffuse/preferences.py:84 msgid "Tab width" msgstr "Šířka tabulátoru" -#: src/diffuse/preferences.py:84 +#: src/diffuse/preferences.py:85 msgid "Show right margin" msgstr "Zobrazit pravý okraj" -#: src/diffuse/preferences.py:85 +#: src/diffuse/preferences.py:86 msgid "Right margin" msgstr "Pravý okraj" -#: src/diffuse/preferences.py:86 +#: src/diffuse/preferences.py:87 msgid "Show line numbers" msgstr "Zobrazit čísla řádků" -#: src/diffuse/preferences.py:87 +#: src/diffuse/preferences.py:88 msgid "Show white space characters" msgstr "Zobrazit netisknutelné znaky" -#: src/diffuse/preferences.py:88 +#: src/diffuse/preferences.py:89 msgid "Ignore case differences" msgstr "Ignorovat velikost písmen" -#: src/diffuse/preferences.py:89 +#: src/diffuse/preferences.py:90 msgid "Ignore white space differences" msgstr "Ignorovat netisknutelné znaky" -#: src/diffuse/preferences.py:90 src/diffuse/preferences.py:99 +#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100 msgid "Ignore changes to white space" msgstr "Ignorovat znaky mezer" -#: src/diffuse/preferences.py:91 +#: src/diffuse/preferences.py:92 msgid "Ignore blank line differences" msgstr "Ignorovat prázdné řádky" -#: src/diffuse/preferences.py:92 +#: src/diffuse/preferences.py:93 msgid "Ignore end of line differences" msgstr "Ignorovat znaky konce řádku" -#: src/diffuse/preferences.py:94 +#: src/diffuse/preferences.py:95 msgid "Alignment" msgstr "Zarovnání" -#: src/diffuse/preferences.py:97 +#: src/diffuse/preferences.py:98 msgid "Ignore case" msgstr "Ignorovat velikost písmen" -#: src/diffuse/preferences.py:98 +#: src/diffuse/preferences.py:99 msgid "Ignore white space" msgstr "Ignorovat netisknutelné znaky" -#: src/diffuse/preferences.py:100 +#: src/diffuse/preferences.py:101 msgid "Ignore blank lines" msgstr "Ignorovat prázdné řádky" -#: src/diffuse/preferences.py:101 +#: src/diffuse/preferences.py:102 msgid "Ignore end of line characters" msgstr "Ignorovat znaky konce řádku" -#: src/diffuse/preferences.py:103 +#: src/diffuse/preferences.py:104 msgid "Editor" msgstr "Editor" -#: src/diffuse/preferences.py:106 +#: src/diffuse/preferences.py:107 msgid "Auto indent" msgstr "Automaticky odsazovat" -#: src/diffuse/preferences.py:107 +#: src/diffuse/preferences.py:108 msgid "Expand tabs to spaces" msgstr "Nahradit tabulátory mezerami" -#: src/diffuse/preferences.py:108 +#: src/diffuse/preferences.py:109 msgid "Soft tab width" msgstr "Šířka tabulátoru" -#: src/diffuse/preferences.py:110 +#: src/diffuse/preferences.py:111 msgid "Tabs" msgstr "Panely" -#: src/diffuse/preferences.py:113 +#: src/diffuse/preferences.py:114 msgid "Default panes" msgstr "Výchozí počet podoken" -#: src/diffuse/preferences.py:114 +#: src/diffuse/preferences.py:115 msgid "Always show the tab bar" msgstr "Vždy zobrazovat lištu s panely" -#: src/diffuse/preferences.py:115 +#: src/diffuse/preferences.py:116 #, python-format msgid "Warn me when closing a tab will quit %s" msgstr "Zobrazit upozornění, pokud zavření panelu ukončí %s" -#: src/diffuse/preferences.py:117 +#: src/diffuse/preferences.py:118 msgid "Regional Settings" msgstr "Místní nastavení" -#: src/diffuse/preferences.py:120 +#: src/diffuse/preferences.py:121 msgid "Default codec" msgstr "Výchozí kódování" -#: src/diffuse/preferences.py:121 +#: src/diffuse/preferences.py:122 msgid "Order of codecs used to identify encoding" msgstr "Pořadí kodeků pro rozpoznání kódování" -#: src/diffuse/preferences.py:142 +#: src/diffuse/preferences.py:143 msgid "Cygwin" msgstr "Cygwin" -#: src/diffuse/preferences.py:144 +#: src/diffuse/preferences.py:145 msgid "Root directory" msgstr "Kořenový adresář" -#: src/diffuse/preferences.py:145 +#: src/diffuse/preferences.py:146 msgid "Cygdrive prefix" msgstr "Předpona cygdrive" -#: src/diffuse/preferences.py:164 +#: src/diffuse/preferences.py:165 msgid "Version control system search order" msgstr "" -#: src/diffuse/preferences.py:172 +#: src/diffuse/preferences.py:173 msgid "\"co\" command" msgstr "příkaz \"co\"" -#: src/diffuse/preferences.py:173 +#: src/diffuse/preferences.py:174 msgid "\"rlog\" command" msgstr "příkaz \"rlog\"" -#: src/diffuse/preferences.py:175 +#: src/diffuse/preferences.py:176 msgid "Command" msgstr "Příkaz" -#: src/diffuse/preferences.py:181 +#: src/diffuse/preferences.py:182 msgid "Launch from a Bash login shell" msgstr "Spustit z příkazové řádky terminálu Bash" -#: src/diffuse/preferences.py:188 +#: src/diffuse/preferences.py:189 msgid "Update paths for Cygwin" msgstr "Upravit cesty pro Cygwin" -#: src/diffuse/preferences.py:193 +#: src/diffuse/preferences.py:194 msgid "Version Control" msgstr "Správa verzí" -#: src/diffuse/preferences.py:258 +#: src/diffuse/preferences.py:259 msgid "Preferences" msgstr "Předvolby" @@ -914,7 +884,7 @@ msgstr "" #: src/diffuse/resources.py:409 #, python-brace-format -msgid "Options \"{option}\" is unknown" +msgid "Option \"{option}\" is unknown" msgstr "" #: src/diffuse/resources.py:416 @@ -967,40 +937,69 @@ msgstr "Při zpracování řádku {line} souboru {file} došlo k chybě." msgid "Unhandled error at line {line} of {file}." msgstr "Při zpracování řádku {line} souboru {file} došlo k chybě." -#: src/diffuse/utils.py:63 +#: src/diffuse/utils.py:66 msgid "Auto Detect" msgstr "Automaticky rozpoznat" -#: src/diffuse/vcs/cvs.py:53 src/diffuse/vcs/rcs.py:62 src/diffuse/vcs/svn.py:95 +#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97 #, python-format msgid "Error parsing revision %s." msgstr "Při analýze revize %s došlo k chybě." -#: src/diffuse/vcs/vcs_registry.py:233 +#: src/diffuse/vcs/vcs_registry.py:238 #, python-format msgid "Error parsing %s." msgstr "Při analýze %s došlo k chybě." -#: src/diffuse/widgets.py:1843 +#: src/diffuse/widgets.py:1845 msgid "Align with Selection" msgstr "Zarovnat s výběrem" -#: src/diffuse/widgets.py:1844 +#: src/diffuse/widgets.py:1846 msgid "Isolate" msgstr "Izolovat" -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1847 msgid "Merge Selection" msgstr "Sloučit výběr" -#: src/diffuse/widgets.py:1851 +#: src/diffuse/widgets.py:1853 msgid "Select All" msgstr "Vybrat vše" -#: src/diffuse/widgets.py:1854 +#: src/diffuse/widgets.py:1856 msgid "Swap with Selected Pane" msgstr "Prohodit s vybraným podoknem" +#, fuzzy +#~ msgid "" +#~ "This program is free software; you can redistribute it and/or modify\n" +#~ "it under the terms of the GNU General Public License as published by\n" +#~ "the Free Software Foundation; either version 2 of the License, or\n" +#~ "(at your option) any later version.\n" +#~ "\n" +#~ "This program is distributed in the hope that it will be useful,\n" +#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +#~ "GNU General Public License for more details.\n" +#~ "\n" +#~ "You should have received a copy of the GNU General Public License along\n" +#~ "with this program; if not, write to the Free Software Foundation, Inc.,\n" +#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." +#~ msgstr "" +#~ "Tento program je svobodný software. Můžete ho upravovat a distribuovat za " +#~ "podmínky dodržení pravidel licence GNU General Public License verze 2 (dále " +#~ "jen GPL), nebo (pokud chcete) některé z jejích novějších verzí.\n" +#~ "\n" +#~ "Tento program je distribuován v naději, že bude užitečný, ale BEZ JAKÉKOLIV " +#~ "ZÁRUKY, tedy ani implicitní záruky OBCHODOVATELNOSTI nebo VHODNOSTI PRO URČITÝ " +#~ "ÚČEL. Další podrobnosti získáte přečtením GPL.\n" +#~ "\n" +#~ "Spolu s tímto programem by jste měli obdržet i kopii GPL. GPL můžete také " +#~ "získat na domovských stránkách Free Software Foundation (http://www.fsf.org/), " +#~ "nebo můžete zaslat dopis na adresu Free Software Foundation, Inc., 51 Franclin " +#~ "St, Fifth Floor, Boston, MA 02110-1301 USA\n" + #~ msgid "Diffuse Merge Tool" #~ msgstr "Diffuse" diff --git a/po/de.po b/po/de.po index 675e44e..1805aec 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-27 21:56-0500\n" +"POT-Creation-Date: 2022-04-04 12:14-0400\n" "PO-Revision-Date: 2021-01-26 04:29+0100\n" "Last-Translator: Henri Menke \n" "Language-Team: German \n" @@ -41,7 +41,7 @@ msgstr "" msgid "Main window: diff between two files" msgstr "" -#: src/diffuse/constants.py:24 +#: src/diffuse/constants.py:25 msgid "Copyright" msgstr "Urheberrecht" @@ -55,36 +55,6 @@ msgstr "" msgid "translator-credits" msgstr "Henri Menke " -#: src/diffuse/dialogs.py:49 -#, fuzzy -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License along\n" -"with this program; if not, write to the Free Software Foundation, Inc.,\n" -"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." -msgstr "" -"Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU " -"General Public License, wie von der Free Software Foundation veröffentlicht, " -"weitergeben und/oder modifizieren, entweder gemäß Version 3 der Lizenz oder (nach " -"Ihrer Option) jeder späteren Version.\n" -"\n" -"Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, daß es Ihnen von " -"Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite " -"Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. " -"Details finden Sie in der GNU General Public License.\n" -"\n" -"Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem " -"Programm erhalten haben. Falls nicht, siehe .\n" - #: src/diffuse/dialogs.py:83 msgid "Encoding: " msgstr "Kodierung: " @@ -109,60 +79,60 @@ msgstr "Übereinstimmen von Groß- und Kleinschreibung" msgid "Search Backwards" msgstr "Rückwärts suchen" -#: src/diffuse/main.py:79 +#: src/diffuse/main.py:85 msgid "Close Tab" msgstr "Reiter schließen" -#: src/diffuse/main.py:124 +#: src/diffuse/main.py:132 msgid "Open File..." msgstr "Datei öffnen..." -#: src/diffuse/main.py:125 +#: src/diffuse/main.py:133 msgid "Reload File" msgstr "Datei neu laden" -#: src/diffuse/main.py:126 +#: src/diffuse/main.py:134 msgid "Save File" msgstr "Datei speichern" -#: src/diffuse/main.py:127 +#: src/diffuse/main.py:135 msgid "Save File As..." msgstr "Datei speichern unter..." -#: src/diffuse/main.py:280 +#: src/diffuse/main.py:288 msgid "Save changes before loading the new file?" msgstr "Änderungen speichern vor dem Laden der neuen Datei?" -#: src/diffuse/main.py:391 +#: src/diffuse/main.py:399 #, python-format msgid "Error reading revision %(rev)s of %(file)s." msgstr "Fehler beim lesen der Revision %(rev)s von %(file)s." -#: src/diffuse/main.py:394 src/diffuse/main.py:1849 +#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #, python-format msgid "Error reading %s." msgstr "Fehler beim Lesen von %s." -#: src/diffuse/main.py:416 +#: src/diffuse/main.py:424 msgid "Open File" msgstr "Datei öffnen" -#: src/diffuse/main.py:473 +#: src/diffuse/main.py:481 #, python-format 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?" -#: src/diffuse/main.py:499 +#: src/diffuse/main.py:507 #, python-format msgid "Save %(title)s Pane %(pane)d" msgstr "Speichern %(title)s Fenster %(pane)d" -#: src/diffuse/main.py:531 +#: src/diffuse/main.py:539 #, python-format msgid "A file named %s already exists. Do you want to overwrite it?" msgstr "Eine Datei mit dem Namen %s existiert bereits. Überschreiben?" -#: src/diffuse/main.py:538 +#: src/diffuse/main.py:546 #, python-format msgid "" "The file %s has been modified by another process since reading it. If you save, " @@ -171,25 +141,25 @@ msgstr "" "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?" -#: src/diffuse/main.py:580 +#: src/diffuse/main.py:588 #, python-format msgid "Error encoding to %s." msgstr "Fehler bei der Kodierung nach %s." -#: src/diffuse/main.py:584 src/diffuse/preferences.py:298 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 #, python-format msgid "Error writing %s." msgstr "Fehler beim Schreiben von %s." -#: src/diffuse/main.py:614 +#: src/diffuse/main.py:622 msgid "Go To Line..." msgstr "Gehe zu Zeile..." -#: src/diffuse/main.py:615 +#: src/diffuse/main.py:623 msgid "Line Number: " msgstr "Zeilennummer: " -#: src/diffuse/main.py:646 +#: src/diffuse/main.py:654 msgid "" "Press the enter key or double click to edit. Press the space bar or use the RMB " "menu to manually align." @@ -197,11 +167,11 @@ msgstr "" "Enter drücken, oder Doppelklicken zum editieren. Drücken Sie die Leertaste, oder " "nutzen sie das RMB Menü zum manuellen Ausrichten." -#: src/diffuse/main.py:650 +#: src/diffuse/main.py:658 msgid "Press the escape key to finish editing." msgstr "Drücken Sie die Escape Taste um die Bearbeitung zu beenden." -#: src/diffuse/main.py:653 +#: src/diffuse/main.py:661 msgid "" "Select target line and press the space bar to align. Press the escape key to " "cancel." @@ -209,426 +179,426 @@ msgstr "" "Zeile auswählen und Leertaste drücken zum Ausrichten. Drücken Sie die Escape " "Taste zum Abbrechen." -#: src/diffuse/main.py:776 +#: src/diffuse/main.py:784 msgid "_File" msgstr "_Datei" -#: src/diffuse/main.py:777 +#: src/diffuse/main.py:785 msgid "_Open File..." msgstr "_Öffne Datei..." -#: src/diffuse/main.py:778 +#: src/diffuse/main.py:786 msgid "Open File In New _Tab..." msgstr "Datei _in neuem Reiter öffnen..." -#: src/diffuse/main.py:779 +#: src/diffuse/main.py:787 msgid "Open _Modified Files..." msgstr "_Bearbeitete Dateien öffnen..." -#: src/diffuse/main.py:780 +#: src/diffuse/main.py:788 msgid "Open Commi_t..." msgstr "Revi_sion öffnen..." -#: src/diffuse/main.py:781 +#: src/diffuse/main.py:789 msgid "_Reload File" msgstr "Datei _neu laden" -#: src/diffuse/main.py:783 +#: src/diffuse/main.py:791 msgid "_Save File" msgstr "Datei _speichern" -#: src/diffuse/main.py:784 +#: src/diffuse/main.py:792 msgid "Save File _As..." msgstr "Datei speichern _unter..." -#: src/diffuse/main.py:785 +#: src/diffuse/main.py:793 msgid "Save A_ll" msgstr "_Alle speichern" -#: src/diffuse/main.py:787 +#: src/diffuse/main.py:795 msgid "New _2-Way File Merge" msgstr "Neues _2-Wege-Datei-Zusammenführen" -#: src/diffuse/main.py:788 +#: src/diffuse/main.py:796 msgid "New _3-Way File Merge" msgstr "Neues _3-Wege-Datei-Zusammenführen" -#: src/diffuse/main.py:789 +#: src/diffuse/main.py:797 msgid "New _N-Way File Merge..." msgstr "Neues _N-Wege-Datei-Zusammenführen..." -#: src/diffuse/main.py:791 +#: src/diffuse/main.py:799 msgid "_Close Tab" msgstr "_Reiter schließen" -#: src/diffuse/main.py:792 +#: src/diffuse/main.py:800 msgid "_Undo Close Tab" msgstr "_Reiter schließen rückgängig" -#: src/diffuse/main.py:793 +#: src/diffuse/main.py:801 msgid "_Quit" msgstr "_Beenden" -#: src/diffuse/main.py:796 +#: src/diffuse/main.py:804 msgid "_Edit" msgstr "_Bearbeiten" -#: src/diffuse/main.py:797 +#: src/diffuse/main.py:805 msgid "_Undo" msgstr "_Rückgängig" -#: src/diffuse/main.py:798 +#: src/diffuse/main.py:806 msgid "_Redo" msgstr "_Wiederholen" -#: src/diffuse/main.py:800 +#: src/diffuse/main.py:808 msgid "Cu_t" msgstr "_Ausschneiden" -#: src/diffuse/main.py:801 +#: src/diffuse/main.py:809 msgid "_Copy" msgstr "_Kopieren" -#: src/diffuse/main.py:802 +#: src/diffuse/main.py:810 msgid "_Paste" msgstr "_Einfügen" -#: src/diffuse/main.py:804 +#: src/diffuse/main.py:812 msgid "Select _All" msgstr "_Alles auswählen" -#: src/diffuse/main.py:805 +#: src/diffuse/main.py:813 msgid "C_lear Edits" msgstr "Alle _Änderungen rückgängig" -#: src/diffuse/main.py:806 +#: src/diffuse/main.py:814 msgid "_Dismiss All Edits" msgstr "Alle Än_derungen verwerfen" -#: src/diffuse/main.py:808 +#: src/diffuse/main.py:816 msgid "_Find..." msgstr "_Suchen..." -#: src/diffuse/main.py:809 +#: src/diffuse/main.py:817 msgid "Find _Next" msgstr "_Nächstes suchen" -#: src/diffuse/main.py:810 +#: src/diffuse/main.py:818 msgid "Find Pre_vious" msgstr "_Rückwärts suchen" -#: src/diffuse/main.py:811 +#: src/diffuse/main.py:819 msgid "_Go To Line..." msgstr "_Gehe zu Zeile..." -#: src/diffuse/main.py:813 +#: src/diffuse/main.py:821 msgid "Pr_eferences..." msgstr "_Einstellungen..." -#: src/diffuse/main.py:817 +#: src/diffuse/main.py:825 msgid "None" msgstr "Keine" -#: src/diffuse/main.py:835 +#: src/diffuse/main.py:843 msgid "_View" msgstr "_Ansicht" -#: src/diffuse/main.py:836 +#: src/diffuse/main.py:844 msgid "_Syntax Highlighting" msgstr "_Syntax Hervorhebung" -#: src/diffuse/main.py:838 +#: src/diffuse/main.py:846 msgid "Re_align All" msgstr "Alle neu _ausrichten" -#: src/diffuse/main.py:839 +#: src/diffuse/main.py:847 msgid "_Isolate" msgstr "_Isolieren" -#: src/diffuse/main.py:841 +#: src/diffuse/main.py:849 msgid "_First Difference" msgstr "_Erster Unterschied" -#: src/diffuse/main.py:842 +#: src/diffuse/main.py:850 msgid "_Previous Difference" msgstr "_Voriger Unterschied" -#: src/diffuse/main.py:843 +#: src/diffuse/main.py:851 msgid "_Next Difference" msgstr "_Nächster Unterschied" -#: src/diffuse/main.py:844 +#: src/diffuse/main.py:852 msgid "_Last Difference" msgstr "_Letzter Unterschied" -#: src/diffuse/main.py:846 +#: src/diffuse/main.py:854 msgid "Fir_st Tab" msgstr "Er_ster Reiter" -#: src/diffuse/main.py:847 +#: src/diffuse/main.py:855 msgid "Pre_vious Tab" msgstr "V_origer Reiter" -#: src/diffuse/main.py:848 +#: src/diffuse/main.py:856 msgid "Next _Tab" msgstr "N_ächster Reiter" -#: src/diffuse/main.py:849 +#: src/diffuse/main.py:857 msgid "Las_t Tab" msgstr "Letz_ter Reiter" -#: src/diffuse/main.py:851 +#: src/diffuse/main.py:859 msgid "Shift Pane _Right" msgstr "Fenster nach _rechts verschieben" -#: src/diffuse/main.py:852 +#: src/diffuse/main.py:860 msgid "Shift Pane _Left" msgstr "Fenster nach _links verschieben" -#: src/diffuse/main.py:855 +#: src/diffuse/main.py:863 msgid "F_ormat" msgstr "F_ormat" -#: src/diffuse/main.py:856 +#: src/diffuse/main.py:864 msgid "Convert To _Upper Case" msgstr "In Großb_uchstaben konvertieren" -#: src/diffuse/main.py:857 +#: src/diffuse/main.py:865 msgid "Convert To _Lower Case" msgstr "In K_leinbuchstaben konvertieren" -#: src/diffuse/main.py:859 +#: src/diffuse/main.py:867 msgid "Sort Lines In _Ascending Order" msgstr "Zeile in _aufsteigender Reihenfolge sortieren" -#: src/diffuse/main.py:860 +#: src/diffuse/main.py:868 msgid "Sort Lines In D_escending Order" msgstr "Zeile in abst_eigender Reihenfolge sortieren" -#: src/diffuse/main.py:862 +#: src/diffuse/main.py:870 msgid "Remove Trailing _White Space" msgstr "Entferne angehängte _Leerzeichen" -#: src/diffuse/main.py:863 +#: src/diffuse/main.py:871 msgid "Convert Tabs To _Spaces" msgstr "Tabulatoren in Leer_zeichen konvertieren" -#: src/diffuse/main.py:864 +#: src/diffuse/main.py:872 msgid "Convert Leading Spaces To _Tabs" msgstr "Vorangestellte Leerzeichen in _Tabulatoren konvertieren" -#: src/diffuse/main.py:866 +#: src/diffuse/main.py:874 msgid "_Increase Indenting" msgstr "Einzug er_höhen" -#: src/diffuse/main.py:867 +#: src/diffuse/main.py:875 msgid "De_crease Indenting" msgstr "Einzug _vermindern" -#: src/diffuse/main.py:869 +#: src/diffuse/main.py:877 msgid "Convert To _DOS Format" msgstr "Ins _DOS Format konvertieren" -#: src/diffuse/main.py:870 +#: src/diffuse/main.py:878 msgid "Convert To _Mac Format" msgstr "Ins _Mac Format konvertieren" -#: src/diffuse/main.py:871 +#: src/diffuse/main.py:879 msgid "Convert To Uni_x Format" msgstr "Ins Uni_x Format konvertieren" -#: src/diffuse/main.py:874 +#: src/diffuse/main.py:882 msgid "_Merge" msgstr "_Zusammenführen" -#: src/diffuse/main.py:875 +#: src/diffuse/main.py:883 msgid "Copy Selection _Right" msgstr "Auswahl nach _rechts kopieren" -#: src/diffuse/main.py:876 +#: src/diffuse/main.py:884 msgid "Copy Selection _Left" msgstr "Auswahl nach _links kopieren" -#: src/diffuse/main.py:878 +#: src/diffuse/main.py:886 msgid "Copy Left _Into Selection" msgstr "Von links _in die Auswahl kopieren" -#: src/diffuse/main.py:879 +#: src/diffuse/main.py:887 msgid "Copy Right I_nto Selection" msgstr "Von rechts i_n die Auswahl kopieren" -#: src/diffuse/main.py:880 +#: src/diffuse/main.py:888 msgid "_Merge From Left Then Right" msgstr "Zusammenführen von links, dann von rechts" -#: src/diffuse/main.py:881 +#: src/diffuse/main.py:889 msgid "M_erge From Right Then Left" msgstr "Zusammenführen von rechts, dann von links" -#: src/diffuse/main.py:884 +#: src/diffuse/main.py:892 msgid "_Help" msgstr "_Hilfe" -#: src/diffuse/main.py:885 +#: src/diffuse/main.py:893 msgid "_Help Contents..." msgstr "_Inhalt..." -#: src/diffuse/main.py:887 +#: src/diffuse/main.py:895 #, python-format msgid "_About %s..." msgstr "_Über %s..." -#: src/diffuse/main.py:902 +#: src/diffuse/main.py:910 msgid "New 2-Way File Merge" msgstr "Neues 2-Wege-Datei-Zusammenführen" -#: src/diffuse/main.py:903 +#: src/diffuse/main.py:911 msgid "New 3-Way File Merge" msgstr "Neues 3-Wege-Datei-Zusammenführen" -#: src/diffuse/main.py:905 +#: src/diffuse/main.py:913 msgid "Realign All" msgstr "Alle neu ausrichten" -#: src/diffuse/main.py:906 +#: src/diffuse/main.py:914 msgid "First Difference" msgstr "Erster Unterschied" -#: src/diffuse/main.py:907 +#: src/diffuse/main.py:915 msgid "Previous Difference" msgstr "Voriger Unterschied" -#: src/diffuse/main.py:908 +#: src/diffuse/main.py:916 msgid "Next Difference" msgstr "Nächster Unterschied" -#: src/diffuse/main.py:909 +#: src/diffuse/main.py:917 msgid "Last Difference" msgstr "Letzter Unterschied" -#: src/diffuse/main.py:911 +#: src/diffuse/main.py:919 msgid "Copy Selection Right" msgstr "Auswahl nach rechts kopieren" -#: src/diffuse/main.py:912 +#: src/diffuse/main.py:920 msgid "Copy Selection Left" msgstr "Auswahl nach links kopieren" -#: src/diffuse/main.py:913 +#: src/diffuse/main.py:921 msgid "Copy Left Into Selection" msgstr "Von links in die Auswahl kopieren" -#: src/diffuse/main.py:914 +#: src/diffuse/main.py:922 msgid "Copy Right Into Selection" msgstr "Von rechts in die Auswahl kopieren" -#: src/diffuse/main.py:915 +#: src/diffuse/main.py:923 msgid "Merge From Left Then Right" msgstr "Zusammenführen von links, dann von rechts" -#: src/diffuse/main.py:916 +#: src/diffuse/main.py:924 msgid "Merge From Right Then Left" msgstr "Zusammenführen von rechts, dann von links" -#: src/diffuse/main.py:918 +#: src/diffuse/main.py:926 msgid "Undo" msgstr "Rückgängig" -#: src/diffuse/main.py:919 +#: src/diffuse/main.py:927 msgid "Redo" msgstr "Wiederholen" -#: src/diffuse/main.py:920 src/diffuse/widgets.py:1847 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 msgid "Cut" msgstr "Ausschneiden" -#: src/diffuse/main.py:921 src/diffuse/widgets.py:1848 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 msgid "Copy" msgstr "Kopieren" -#: src/diffuse/main.py:922 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 msgid "Paste" msgstr "Einfügen" -#: src/diffuse/main.py:923 src/diffuse/widgets.py:1852 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 msgid "Clear Edits" msgstr "Alle Änderungen rückgängig" -#: src/diffuse/main.py:1046 +#: src/diffuse/main.py:1054 msgid "Some files have unsaved changes. Select the files to save before closing." msgstr "" "Einige Dateien haben ungespeicherte Änderungen. Wählen Sie die Dateien zum " "speichern aus, bevor Sie beenden." -#: src/diffuse/main.py:1060 +#: src/diffuse/main.py:1068 msgid "Tab" msgstr "Reiter" -#: src/diffuse/main.py:1065 +#: src/diffuse/main.py:1073 msgid "Pane" msgstr "Fenster" -#: src/diffuse/main.py:1076 +#: src/diffuse/main.py:1084 msgid "Close _Without Saving" msgstr "Ohne speichern schließen" -#: src/diffuse/main.py:1115 +#: src/diffuse/main.py:1123 #, python-format msgid "Closing this tab will quit %s." msgstr "Schließen des letzten Tabs beendet %s." -#: src/diffuse/main.py:1198 +#: src/diffuse/main.py:1206 #, python-format msgid "File Merge %d" msgstr "Dateien zusammenführen %d" -#: src/diffuse/main.py:1304 +#: src/diffuse/main.py:1312 #, python-format msgid "Error retrieving commits for %s." msgstr "Fehler beim Empfangen der Revisionen von %s." -#: src/diffuse/main.py:1336 +#: src/diffuse/main.py:1344 #, python-format msgid "Error retrieving modifications for %s." msgstr "Fehler beim Empfangen der Bearbeitungen von %s." -#: src/diffuse/main.py:1369 +#: src/diffuse/main.py:1377 msgid "Open File In New Tab" msgstr "Datei in neuem Reiter öffnen" -#: src/diffuse/main.py:1392 +#: src/diffuse/main.py:1400 msgid "Choose Folder With Modified Files" msgstr "Ordner mit bearbeiteten Dateien auswählen" -#: src/diffuse/main.py:1410 +#: src/diffuse/main.py:1418 msgid "No modified files found." msgstr "Keine bearbeiteten Dateien gefunden." -#: src/diffuse/main.py:1416 +#: src/diffuse/main.py:1424 msgid "Choose Folder With Commit" msgstr "Ordner mit Revisionen auswählen" -#: src/diffuse/main.py:1436 +#: src/diffuse/main.py:1444 msgid "No committed files found." msgstr "Keine revidierten Dateien gefunden." -#: src/diffuse/main.py:1472 +#: src/diffuse/main.py:1480 msgid "New N-Way File Merge..." msgstr "Neues N-Wege-Datei-Zusammenführen..." -#: src/diffuse/main.py:1473 +#: src/diffuse/main.py:1481 msgid "Number of panes: " msgstr "Anzahl der Fenster: " -#: src/diffuse/main.py:1547 +#: src/diffuse/main.py:1555 msgid "Phrase not found. Continue from the end of the file?" msgstr "Ausdruck nicht gefunden. Am Ende der Datei fortsetzen?" -#: src/diffuse/main.py:1549 +#: src/diffuse/main.py:1557 msgid "Phrase not found. Continue from the start of the file?" msgstr "Ausdruck nicht gefunden. Am Anfang der Datei fortsetzen?" -#: src/diffuse/main.py:1770 +#: src/diffuse/main.py:1778 #, fuzzy msgid "" "Usage:\n" @@ -710,174 +680,174 @@ msgstr "" "ignorieren\n" " ( -w | --ignore-all-space ) Unterschiede an Leerzeichen ignorieren" -#: src/diffuse/main.py:1937 +#: src/diffuse/main.py:1945 msgid "Error parsing line number." msgstr "Fehler bei der Analyse der Zeilennummer." -#: src/diffuse/main.py:1947 +#: src/diffuse/main.py:1955 #, python-format msgid "Skipping unknown argument \"%s\"." msgstr "Übergehe unbekannten Parameter \"%s\"." -#: src/diffuse/main.py:1955 +#: src/diffuse/main.py:1963 #, python-format msgid "Error processing argument \"%s\". Directory not expected." msgstr "Fehler beim Verarbeiten des Arguments \"%s\". Unerwartetes Verzeichnis." -#: src/diffuse/preferences.py:79 +#: src/diffuse/preferences.py:80 msgid "Display" msgstr "Anzeige" -#: src/diffuse/preferences.py:82 +#: src/diffuse/preferences.py:83 msgid "Font" msgstr "Schriftart" -#: src/diffuse/preferences.py:83 +#: src/diffuse/preferences.py:84 msgid "Tab width" msgstr "Tabulatorweite" -#: src/diffuse/preferences.py:84 +#: src/diffuse/preferences.py:85 msgid "Show right margin" msgstr "Zeige rechten Rand" -#: src/diffuse/preferences.py:85 +#: src/diffuse/preferences.py:86 msgid "Right margin" msgstr "Rechter Rand" -#: src/diffuse/preferences.py:86 +#: src/diffuse/preferences.py:87 msgid "Show line numbers" msgstr "Zeige Zeilennummern" -#: src/diffuse/preferences.py:87 +#: src/diffuse/preferences.py:88 msgid "Show white space characters" msgstr "Leerzeichen anzeigen" -#: src/diffuse/preferences.py:88 +#: src/diffuse/preferences.py:89 msgid "Ignore case differences" msgstr "Unterschiede bei Groß- und Kleinschreibung ignorieren" -#: src/diffuse/preferences.py:89 +#: src/diffuse/preferences.py:90 msgid "Ignore white space differences" msgstr "Unterschiede bei Leerzeichen ignorieren" -#: src/diffuse/preferences.py:90 src/diffuse/preferences.py:99 +#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100 msgid "Ignore changes to white space" msgstr "Änderungen an Leerzeichen ignorieren" -#: src/diffuse/preferences.py:91 +#: src/diffuse/preferences.py:92 msgid "Ignore blank line differences" msgstr "Unterschiede bei leeren Zeilen ignorieren" -#: src/diffuse/preferences.py:92 +#: src/diffuse/preferences.py:93 msgid "Ignore end of line differences" msgstr "Unterschiede bei Zeilenumbrüchen ignorieren" -#: src/diffuse/preferences.py:94 +#: src/diffuse/preferences.py:95 msgid "Alignment" msgstr "Ausrichtung" -#: src/diffuse/preferences.py:97 +#: src/diffuse/preferences.py:98 msgid "Ignore case" msgstr "Groß- und Kleinschreibung ignorieren" -#: src/diffuse/preferences.py:98 +#: src/diffuse/preferences.py:99 msgid "Ignore white space" msgstr "Leerzeichen ignorieren" -#: src/diffuse/preferences.py:100 +#: src/diffuse/preferences.py:101 msgid "Ignore blank lines" msgstr "Leere Zeilen ignorieren" -#: src/diffuse/preferences.py:101 +#: src/diffuse/preferences.py:102 msgid "Ignore end of line characters" msgstr "Zeilenumbrüche ignorieren" -#: src/diffuse/preferences.py:103 +#: src/diffuse/preferences.py:104 msgid "Editor" msgstr "Editor" -#: src/diffuse/preferences.py:106 +#: src/diffuse/preferences.py:107 msgid "Auto indent" msgstr "Automatischer Einzug" -#: src/diffuse/preferences.py:107 +#: src/diffuse/preferences.py:108 msgid "Expand tabs to spaces" msgstr "Tabulatoren zu Leerzeichen erweitern" -#: src/diffuse/preferences.py:108 +#: src/diffuse/preferences.py:109 msgid "Soft tab width" msgstr "Weiche Tabulatorweite" -#: src/diffuse/preferences.py:110 +#: src/diffuse/preferences.py:111 msgid "Tabs" msgstr "Reiter" -#: src/diffuse/preferences.py:113 +#: src/diffuse/preferences.py:114 msgid "Default panes" msgstr "Standard Fenster" -#: src/diffuse/preferences.py:114 +#: src/diffuse/preferences.py:115 msgid "Always show the tab bar" msgstr "Reiter-Leiste immer anzeigen" -#: src/diffuse/preferences.py:115 +#: src/diffuse/preferences.py:116 #, python-format msgid "Warn me when closing a tab will quit %s" msgstr "Warnen, wenn schließen des Tabs %s beendet" -#: src/diffuse/preferences.py:117 +#: src/diffuse/preferences.py:118 msgid "Regional Settings" msgstr "Lokalisierung" -#: src/diffuse/preferences.py:120 +#: src/diffuse/preferences.py:121 msgid "Default codec" msgstr "Standardkodierung" -#: src/diffuse/preferences.py:121 +#: src/diffuse/preferences.py:122 msgid "Order of codecs used to identify encoding" msgstr "Reihenfolge der Chiffren um die Kodierung zu erkennen" -#: src/diffuse/preferences.py:142 +#: src/diffuse/preferences.py:143 msgid "Cygwin" msgstr "Cygwin" -#: src/diffuse/preferences.py:144 +#: src/diffuse/preferences.py:145 msgid "Root directory" msgstr "Hauptverzeichnis" -#: src/diffuse/preferences.py:145 +#: src/diffuse/preferences.py:146 msgid "Cygdrive prefix" msgstr "Cygdrive Präfix" -#: src/diffuse/preferences.py:164 +#: src/diffuse/preferences.py:165 msgid "Version control system search order" msgstr "Suchreihenfolge des Versionskontrollsystems" -#: src/diffuse/preferences.py:172 +#: src/diffuse/preferences.py:173 msgid "\"co\" command" msgstr "\"co\" Befehl" -#: src/diffuse/preferences.py:173 +#: src/diffuse/preferences.py:174 msgid "\"rlog\" command" msgstr "\"rlog\" Befehl" -#: src/diffuse/preferences.py:175 +#: src/diffuse/preferences.py:176 msgid "Command" msgstr "Befehl" -#: src/diffuse/preferences.py:181 +#: src/diffuse/preferences.py:182 msgid "Launch from a Bash login shell" msgstr "Aus einer Bash login shell starten" -#: src/diffuse/preferences.py:188 +#: src/diffuse/preferences.py:189 msgid "Update paths for Cygwin" msgstr "Pfade für Cygwin aktualisieren" -#: src/diffuse/preferences.py:193 +#: src/diffuse/preferences.py:194 msgid "Version Control" msgstr "Versionsverwaltung" -#: src/diffuse/preferences.py:258 +#: src/diffuse/preferences.py:259 msgid "Preferences" msgstr "Einstellungen" @@ -909,7 +879,7 @@ msgstr "" #: src/diffuse/resources.py:409 #, python-brace-format -msgid "Options \"{option}\" is unknown" +msgid "Option \"{option}\" is unknown" msgstr "" #: src/diffuse/resources.py:416 @@ -962,40 +932,69 @@ msgstr "Fehler bei der Analyse der Zeilen {line} von {file}." msgid "Unhandled error at line {line} of {file}." msgstr "Fehler bei der Analyse der Zeilen {line} von {file}." -#: src/diffuse/utils.py:63 +#: src/diffuse/utils.py:66 msgid "Auto Detect" msgstr "Automatische Erkennung" -#: src/diffuse/vcs/cvs.py:53 src/diffuse/vcs/rcs.py:62 src/diffuse/vcs/svn.py:95 +#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97 #, python-format msgid "Error parsing revision %s." msgstr "Fehler bei der Analyse der Revision %s." -#: src/diffuse/vcs/vcs_registry.py:233 +#: src/diffuse/vcs/vcs_registry.py:238 #, python-format msgid "Error parsing %s." msgstr "Fehler bei der Analyse %s." -#: src/diffuse/widgets.py:1843 +#: src/diffuse/widgets.py:1845 msgid "Align with Selection" msgstr "Ausrichten an der Auswahl" -#: src/diffuse/widgets.py:1844 +#: src/diffuse/widgets.py:1846 msgid "Isolate" msgstr "Isolieren" -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1847 msgid "Merge Selection" msgstr "Auswahl zusammenführen" -#: src/diffuse/widgets.py:1851 +#: src/diffuse/widgets.py:1853 msgid "Select All" msgstr "Alles auswählen" -#: src/diffuse/widgets.py:1854 +#: src/diffuse/widgets.py:1856 msgid "Swap with Selected Pane" msgstr "Mit ausgewähltem Fenster tauschen" +#, fuzzy +#~ msgid "" +#~ "This program is free software; you can redistribute it and/or modify\n" +#~ "it under the terms of the GNU General Public License as published by\n" +#~ "the Free Software Foundation; either version 2 of the License, or\n" +#~ "(at your option) any later version.\n" +#~ "\n" +#~ "This program is distributed in the hope that it will be useful,\n" +#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +#~ "GNU General Public License for more details.\n" +#~ "\n" +#~ "You should have received a copy of the GNU General Public License along\n" +#~ "with this program; if not, write to the Free Software Foundation, Inc.,\n" +#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." +#~ msgstr "" +#~ "Dieses Programm ist freie Software. Sie können es unter den Bedingungen der " +#~ "GNU General Public License, wie von der Free Software Foundation " +#~ "veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 3 " +#~ "der Lizenz oder (nach Ihrer Option) jeder späteren Version.\n" +#~ "\n" +#~ "Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, daß es Ihnen " +#~ "von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite " +#~ "Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. " +#~ "Details finden Sie in der GNU General Public License.\n" +#~ "\n" +#~ "Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem " +#~ "Programm erhalten haben. Falls nicht, siehe .\n" + #~ msgid "Diffuse Merge Tool" #~ msgstr "Diffuse Mischwerkzeug" diff --git a/po/diffuse.pot b/po/diffuse.pot index 2376484..ea4597e 100644 --- a/po/diffuse.pot +++ b/po/diffuse.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-04 12:00-0400\n" +"POT-Creation-Date: 2022-04-04 12:14-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -50,23 +50,6 @@ msgstr "" msgid "translator-credits" msgstr "" -#: src/diffuse/dialogs.py:49 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License along\n" -"with this program; if not, write to the Free Software Foundation, Inc.,\n" -"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." -msgstr "" - #: src/diffuse/dialogs.py:83 msgid "Encoding: " msgstr "" diff --git a/po/es.po b/po/es.po index a0e7d33..65b29b3 100644 --- a/po/es.po +++ b/po/es.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-27 21:56-0500\n" -"PO-Revision-Date: 2020-06-29 14:49-0400\n" +"POT-Creation-Date: 2022-04-04 12:14-0400\n" +"PO-Revision-Date: 2022-04-04 12:17-0400\n" "Last-Translator: David Marín Carreño \n" "Language-Team: Spanish \n" "Language: es\n" @@ -17,6 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 3.0.1\n" #: data/io.github.mightycreak.Diffuse.desktop.in:3 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:4 @@ -39,7 +40,7 @@ msgstr "" msgid "Main window: diff between two files" msgstr "" -#: src/diffuse/constants.py:24 +#: src/diffuse/constants.py:25 msgid "Copyright" msgstr "" @@ -53,41 +54,9 @@ msgstr "" "Henri Menke \n" "David Marín Carreño " -#: src/diffuse/dialogs.py:49 -#, fuzzy -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License along\n" -"with this program; if not, write to the Free Software Foundation, Inc.,\n" -"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." -msgstr "" -"This program is free software; you can redistribute it and/or modify it under the " -"terms of the GNU General Public License as published by the Free Software " -"Foundation; either version 2 of the licence, or (at your option) any later " -"version.\n" -"\n" -"This program is distributed in the hope that it will be useful, but WITHOUT ANY " -"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A " -"PARTICULAR PURPOSE. See the GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License along with this " -"program. You may also obtain a copy of the GNU General Public License from the " -"Free Software Foundation by visiting their web site (http://www.fsf.org/) or by " -"writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, " -"Boston, MA 02110-1301 USA\n" - #: src/diffuse/dialogs.py:83 msgid "Encoding: " -msgstr "Codificación:" +msgstr "Codificación: " #: src/diffuse/dialogs.py:95 msgid "Revision: " @@ -109,60 +78,60 @@ msgstr "Coincidencia de capitalización" msgid "Search Backwards" msgstr "Buscar hacia atrás" -#: src/diffuse/main.py:79 +#: src/diffuse/main.py:85 msgid "Close Tab" msgstr "Cerrar pestaña" -#: src/diffuse/main.py:124 +#: src/diffuse/main.py:132 msgid "Open File..." msgstr "Abrir fichero..." -#: src/diffuse/main.py:125 +#: src/diffuse/main.py:133 msgid "Reload File" msgstr "Recargar fichero" -#: src/diffuse/main.py:126 +#: src/diffuse/main.py:134 msgid "Save File" msgstr "Guardar fichero" -#: src/diffuse/main.py:127 +#: src/diffuse/main.py:135 msgid "Save File As..." msgstr "Guardar fichero como..." -#: src/diffuse/main.py:280 +#: src/diffuse/main.py:288 msgid "Save changes before loading the new file?" msgstr "¿Guardar cambios antes de abrir nuevo fichero?" -#: src/diffuse/main.py:391 +#: src/diffuse/main.py:399 #, python-format msgid "Error reading revision %(rev)s of %(file)s." msgstr "Error leyendo revisión %(rev)s de %(file)s." -#: src/diffuse/main.py:394 src/diffuse/main.py:1849 +#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #, python-format msgid "Error reading %s." msgstr "Error leyendo %s." -#: src/diffuse/main.py:416 +#: src/diffuse/main.py:424 msgid "Open File" msgstr "Abrir fichero" -#: src/diffuse/main.py:473 +#: src/diffuse/main.py:481 #, python-format msgid "The file %s changed on disk. Do you want to reload the file?" msgstr "El fichero %s ha cambiado en disco. ¿Quieres recargarlo?" -#: src/diffuse/main.py:499 +#: src/diffuse/main.py:507 #, python-format msgid "Save %(title)s Pane %(pane)d" msgstr "Guardar Panel %(title)s %(pane)d" -#: src/diffuse/main.py:531 +#: src/diffuse/main.py:539 #, python-format msgid "A file named %s already exists. Do you want to overwrite it?" msgstr "Ya existe un archivo llamado %s. ¿Quiere reemplazarlo?" -#: src/diffuse/main.py:538 +#: src/diffuse/main.py:546 #, python-format msgid "" "The file %s has been modified by another process since reading it. If you save, " @@ -172,25 +141,25 @@ msgstr "" "guarda, todos los cambios realizados por procesos externos se perderán. ¿Deseas " "guardar de todos modos?" -#: src/diffuse/main.py:580 +#: src/diffuse/main.py:588 #, python-format msgid "Error encoding to %s." msgstr "Error codificando a %s." -#: src/diffuse/main.py:584 src/diffuse/preferences.py:298 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 #, python-format msgid "Error writing %s." msgstr "Error guardando %s." -#: src/diffuse/main.py:614 +#: src/diffuse/main.py:622 msgid "Go To Line..." msgstr "Ir a línea..." -#: src/diffuse/main.py:615 +#: src/diffuse/main.py:623 msgid "Line Number: " msgstr "Número de línea: " -#: src/diffuse/main.py:646 +#: src/diffuse/main.py:654 msgid "" "Press the enter key or double click to edit. Press the space bar or use the RMB " "menu to manually align." @@ -198,435 +167,435 @@ msgstr "" "Pulse Enter o haga doble clic para editar. Pulse el espaciador o use el menú RMB " "para alinear manualmente." -#: src/diffuse/main.py:650 +#: src/diffuse/main.py:658 msgid "Press the escape key to finish editing." msgstr "Pulse Escape para finalizar la edición." -#: src/diffuse/main.py:653 +#: src/diffuse/main.py:661 msgid "" "Select target line and press the space bar to align. Press the escape key to " "cancel." msgstr "" "Selecciona la línea y pulsa espacio para alinear. Pulsa Escape para cancelar." -#: src/diffuse/main.py:776 +#: src/diffuse/main.py:784 msgid "_File" msgstr "_Fichero" -#: src/diffuse/main.py:777 +#: src/diffuse/main.py:785 msgid "_Open File..." -msgstr "_Abrir fichero" +msgstr "_Abrir fichero..." -#: src/diffuse/main.py:778 +#: src/diffuse/main.py:786 msgid "Open File In New _Tab..." msgstr "Abrir fichero en nueva _pestaña..." -#: src/diffuse/main.py:779 +#: src/diffuse/main.py:787 msgid "Open _Modified Files..." msgstr "Abrir ficheros _modificados..." -#: src/diffuse/main.py:780 +#: src/diffuse/main.py:788 msgid "Open Commi_t..." msgstr "Abrir revi_sión..." -#: src/diffuse/main.py:781 +#: src/diffuse/main.py:789 msgid "_Reload File" msgstr "_Recargar fichero" -#: src/diffuse/main.py:783 +#: src/diffuse/main.py:791 msgid "_Save File" msgstr "_Guardar fichero" -#: src/diffuse/main.py:784 +#: src/diffuse/main.py:792 msgid "Save File _As..." msgstr "Guardar _fichero como..." -#: src/diffuse/main.py:785 +#: src/diffuse/main.py:793 msgid "Save A_ll" msgstr "Gu_ardar todo" -#: src/diffuse/main.py:787 +#: src/diffuse/main.py:795 msgid "New _2-Way File Merge" msgstr "Nueva mezcla de ficheros de _2 vías" -#: src/diffuse/main.py:788 +#: src/diffuse/main.py:796 msgid "New _3-Way File Merge" msgstr "Nueva mezcla de ficheros de _3 vías" -#: src/diffuse/main.py:789 +#: src/diffuse/main.py:797 msgid "New _N-Way File Merge..." msgstr "Nueva mezcla de ficheros de _N vías..." -#: src/diffuse/main.py:791 +#: src/diffuse/main.py:799 msgid "_Close Tab" msgstr "_Cerrar pestaña" -#: src/diffuse/main.py:792 +#: src/diffuse/main.py:800 msgid "_Undo Close Tab" msgstr "_Deshacer cerrar pestaña" -#: src/diffuse/main.py:793 +#: src/diffuse/main.py:801 msgid "_Quit" msgstr "_Salir" -#: src/diffuse/main.py:796 +#: src/diffuse/main.py:804 msgid "_Edit" msgstr "_Editar" -#: src/diffuse/main.py:797 +#: src/diffuse/main.py:805 msgid "_Undo" msgstr "_Deshacer" -#: src/diffuse/main.py:798 +#: src/diffuse/main.py:806 msgid "_Redo" msgstr "_Rehacer" -#: src/diffuse/main.py:800 +#: src/diffuse/main.py:808 msgid "Cu_t" msgstr "Cor_tar" -#: src/diffuse/main.py:801 +#: src/diffuse/main.py:809 msgid "_Copy" msgstr "_Copiar" -#: src/diffuse/main.py:802 +#: src/diffuse/main.py:810 msgid "_Paste" msgstr "_Pegar" -#: src/diffuse/main.py:804 +#: src/diffuse/main.py:812 msgid "Select _All" msgstr "Seleccion_ar todo" -#: src/diffuse/main.py:805 +#: src/diffuse/main.py:813 msgid "C_lear Edits" msgstr "_Deshacer todo" -#: src/diffuse/main.py:806 +#: src/diffuse/main.py:814 msgid "_Dismiss All Edits" msgstr "_Ignorar todas las ediciones" -#: src/diffuse/main.py:808 +#: src/diffuse/main.py:816 msgid "_Find..." msgstr "_Buscar..." -#: src/diffuse/main.py:809 +#: src/diffuse/main.py:817 msgid "Find _Next" msgstr "Buscar siguie_nte" -#: src/diffuse/main.py:810 +#: src/diffuse/main.py:818 msgid "Find Pre_vious" msgstr "Buscar an_terior" -#: src/diffuse/main.py:811 +#: src/diffuse/main.py:819 msgid "_Go To Line..." msgstr "_Ir a la línea..." -#: src/diffuse/main.py:813 +#: src/diffuse/main.py:821 msgid "Pr_eferences..." msgstr "Pr_eferencias..." -#: src/diffuse/main.py:817 +#: src/diffuse/main.py:825 msgid "None" msgstr "Ninguno" -#: src/diffuse/main.py:835 +#: src/diffuse/main.py:843 msgid "_View" msgstr "_Ver" -#: src/diffuse/main.py:836 +#: src/diffuse/main.py:844 msgid "_Syntax Highlighting" msgstr "Coloreado _sintáctico" -#: src/diffuse/main.py:838 +#: src/diffuse/main.py:846 msgid "Re_align All" msgstr "Re_alinear todo" -#: src/diffuse/main.py:839 +#: src/diffuse/main.py:847 msgid "_Isolate" msgstr "A_islar" -#: src/diffuse/main.py:841 +#: src/diffuse/main.py:849 msgid "_First Difference" msgstr "Primera di_ferencia" -#: src/diffuse/main.py:842 +#: src/diffuse/main.py:850 msgid "_Previous Difference" msgstr "Diferencia an_terior" -#: src/diffuse/main.py:843 +#: src/diffuse/main.py:851 msgid "_Next Difference" msgstr "Diferencia siguie_nte" -#: src/diffuse/main.py:844 +#: src/diffuse/main.py:852 msgid "_Last Difference" msgstr "Ú_ltima diferencia" -#: src/diffuse/main.py:846 +#: src/diffuse/main.py:854 msgid "Fir_st Tab" msgstr "Prime_ra pestaña" -#: src/diffuse/main.py:847 +#: src/diffuse/main.py:855 msgid "Pre_vious Tab" msgstr "Pestaña ante_rior" -#: src/diffuse/main.py:848 +#: src/diffuse/main.py:856 msgid "Next _Tab" msgstr "Siguiente _pestaña" -#: src/diffuse/main.py:849 +#: src/diffuse/main.py:857 msgid "Las_t Tab" msgstr "Ul_tima pestaña" -#: src/diffuse/main.py:851 +#: src/diffuse/main.py:859 msgid "Shift Pane _Right" msgstr "Cambiar panel _derecho" -#: src/diffuse/main.py:852 +#: src/diffuse/main.py:860 msgid "Shift Pane _Left" msgstr "Cambiar panel _izquierdo" -#: src/diffuse/main.py:855 +#: src/diffuse/main.py:863 msgid "F_ormat" msgstr "F_ormato" -#: src/diffuse/main.py:856 +#: src/diffuse/main.py:864 msgid "Convert To _Upper Case" msgstr "Transformar en letras mayúsculas" -#: src/diffuse/main.py:857 +#: src/diffuse/main.py:865 msgid "Convert To _Lower Case" msgstr "Transformar en letras minúsculas" -#: src/diffuse/main.py:859 +#: src/diffuse/main.py:867 msgid "Sort Lines In _Ascending Order" msgstr "Ordenar lineas en orden _ascendente" -#: src/diffuse/main.py:860 +#: src/diffuse/main.py:868 msgid "Sort Lines In D_escending Order" msgstr "Ordenar lineas en orden _descendente" -#: src/diffuse/main.py:862 +#: src/diffuse/main.py:870 msgid "Remove Trailing _White Space" msgstr "Quitar _espacios finales" -#: src/diffuse/main.py:863 +#: src/diffuse/main.py:871 msgid "Convert Tabs To _Spaces" msgstr "Transformar tabuladores en e_spacios" -#: src/diffuse/main.py:864 +#: src/diffuse/main.py:872 msgid "Convert Leading Spaces To _Tabs" msgstr "Transformar espacios iniciales en _tabuladores" -#: src/diffuse/main.py:866 +#: src/diffuse/main.py:874 msgid "_Increase Indenting" msgstr "Aumentar sangr_ía" -#: src/diffuse/main.py:867 +#: src/diffuse/main.py:875 msgid "De_crease Indenting" msgstr "Dis_minuir sangría" -#: src/diffuse/main.py:869 +#: src/diffuse/main.py:877 msgid "Convert To _DOS Format" msgstr "Transformar a formato _DOS" -#: src/diffuse/main.py:870 +#: src/diffuse/main.py:878 msgid "Convert To _Mac Format" msgstr "Transformar a formato _Mac" -#: src/diffuse/main.py:871 +#: src/diffuse/main.py:879 msgid "Convert To Uni_x Format" msgstr "Transformar a formato Uni_x" -#: src/diffuse/main.py:874 +#: src/diffuse/main.py:882 msgid "_Merge" msgstr "_Mezcla" -#: src/diffuse/main.py:875 +#: src/diffuse/main.py:883 msgid "Copy Selection _Right" msgstr "Copiar selección a la de_recha" -#: src/diffuse/main.py:876 +#: src/diffuse/main.py:884 msgid "Copy Selection _Left" msgstr "Copiar selección a la i_zquierda" -#: src/diffuse/main.py:878 +#: src/diffuse/main.py:886 msgid "Copy Left _Into Selection" msgstr "Copiar de _izquierda a la selección" -#: src/diffuse/main.py:879 +#: src/diffuse/main.py:887 msgid "Copy Right I_nto Selection" msgstr "Copiar de de_recha a la selección" -#: src/diffuse/main.py:880 +#: src/diffuse/main.py:888 msgid "_Merge From Left Then Right" msgstr "_Mezclar desde izquierda, después desde derecha" -#: src/diffuse/main.py:881 +#: src/diffuse/main.py:889 msgid "M_erge From Right Then Left" msgstr "M_ezclar desde derecha, después desde izquierda" -#: src/diffuse/main.py:884 +#: src/diffuse/main.py:892 msgid "_Help" msgstr "_Ayuda" -#: src/diffuse/main.py:885 +#: src/diffuse/main.py:893 msgid "_Help Contents..." msgstr "Índ_ice de ayuda..." -#: src/diffuse/main.py:887 +#: src/diffuse/main.py:895 #, python-format msgid "_About %s..." msgstr "_Acerca de %s..." -#: src/diffuse/main.py:902 +#: src/diffuse/main.py:910 msgid "New 2-Way File Merge" msgstr "Nueva mezcla de ficheros de 2 vías" -#: src/diffuse/main.py:903 +#: src/diffuse/main.py:911 msgid "New 3-Way File Merge" msgstr "Nueva mezcla de ficheros de 3 vías" -#: src/diffuse/main.py:905 +#: src/diffuse/main.py:913 msgid "Realign All" msgstr "Realinear todo" -#: src/diffuse/main.py:906 +#: src/diffuse/main.py:914 msgid "First Difference" msgstr "Primera diferencía" -#: src/diffuse/main.py:907 +#: src/diffuse/main.py:915 msgid "Previous Difference" msgstr "Diferencía anterior" -#: src/diffuse/main.py:908 +#: src/diffuse/main.py:916 msgid "Next Difference" msgstr "Siguiente diferencia" -#: src/diffuse/main.py:909 +#: src/diffuse/main.py:917 msgid "Last Difference" msgstr "Última diferencía" -#: src/diffuse/main.py:911 +#: src/diffuse/main.py:919 msgid "Copy Selection Right" msgstr "Copiar selección a la derecha" -#: src/diffuse/main.py:912 +#: src/diffuse/main.py:920 msgid "Copy Selection Left" msgstr "Copiar selección a la izquierda" -#: src/diffuse/main.py:913 +#: src/diffuse/main.py:921 msgid "Copy Left Into Selection" msgstr "Copiar de izquierda a la selección" -#: src/diffuse/main.py:914 +#: src/diffuse/main.py:922 msgid "Copy Right Into Selection" msgstr "Copiar de derecha a la selección" -#: src/diffuse/main.py:915 +#: src/diffuse/main.py:923 msgid "Merge From Left Then Right" msgstr "Mezclar desde izquierda, después desde derecha" -#: src/diffuse/main.py:916 +#: src/diffuse/main.py:924 msgid "Merge From Right Then Left" msgstr "Mezclar desde derecha, después desde izquierda" -#: src/diffuse/main.py:918 +#: src/diffuse/main.py:926 msgid "Undo" msgstr "Deshacer" -#: src/diffuse/main.py:919 +#: src/diffuse/main.py:927 msgid "Redo" msgstr "Rehacer" -#: src/diffuse/main.py:920 src/diffuse/widgets.py:1847 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 msgid "Cut" msgstr "Cortar" -#: src/diffuse/main.py:921 src/diffuse/widgets.py:1848 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 msgid "Copy" msgstr "Copiar" -#: src/diffuse/main.py:922 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 msgid "Paste" msgstr "Pegar" -#: src/diffuse/main.py:923 src/diffuse/widgets.py:1852 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 msgid "Clear Edits" msgstr "Deshacer todo" -#: src/diffuse/main.py:1046 +#: src/diffuse/main.py:1054 msgid "Some files have unsaved changes. Select the files to save before closing." msgstr "Unos ficheros tienen cambios. Elige los ficheros a guardar antes de cerrar." -#: src/diffuse/main.py:1060 +#: src/diffuse/main.py:1068 msgid "Tab" msgstr "Pestaña" -#: src/diffuse/main.py:1065 +#: src/diffuse/main.py:1073 msgid "Pane" msgstr "Panel" -#: src/diffuse/main.py:1076 +#: src/diffuse/main.py:1084 msgid "Close _Without Saving" msgstr "Cerrar _sin guardar" -#: src/diffuse/main.py:1115 +#: src/diffuse/main.py:1123 #, python-format msgid "Closing this tab will quit %s." msgstr "Cerrar esta pestaña terminará %s." -#: src/diffuse/main.py:1198 +#: src/diffuse/main.py:1206 #, python-format msgid "File Merge %d" msgstr "Mezcla de archivo %d" -#: src/diffuse/main.py:1304 +#: src/diffuse/main.py:1312 #, python-format msgid "Error retrieving commits for %s." msgstr "Error recibiendo commits de %s." -#: src/diffuse/main.py:1336 +#: src/diffuse/main.py:1344 #, python-format msgid "Error retrieving modifications for %s." msgstr "Error recibiendo modificaciones de %s." -#: src/diffuse/main.py:1369 +#: src/diffuse/main.py:1377 msgid "Open File In New Tab" msgstr "Abrir fichero en nueva pestaña" -#: src/diffuse/main.py:1392 +#: src/diffuse/main.py:1400 msgid "Choose Folder With Modified Files" msgstr "Seleccionar carpeta con archivos modificados" -#: src/diffuse/main.py:1410 +#: src/diffuse/main.py:1418 msgid "No modified files found." msgstr "No se encontraron ficheros modificados." -#: src/diffuse/main.py:1416 +#: src/diffuse/main.py:1424 msgid "Choose Folder With Commit" msgstr "Seleccionar carpeta con revisiónes" -#: src/diffuse/main.py:1436 +#: src/diffuse/main.py:1444 msgid "No committed files found." msgstr "No se encontraron ficheros confirmados." -#: src/diffuse/main.py:1472 +#: src/diffuse/main.py:1480 msgid "New N-Way File Merge..." msgstr "Nueva mezcla de ficheros de N vías..." -#: src/diffuse/main.py:1473 +#: src/diffuse/main.py:1481 msgid "Number of panes: " msgstr "Número de paneles: " -#: src/diffuse/main.py:1547 +#: src/diffuse/main.py:1555 msgid "Phrase not found. Continue from the end of the file?" msgstr "Frase no encontrada. ¿Continuar desde final del fichero?" -#: src/diffuse/main.py:1549 +#: src/diffuse/main.py:1557 msgid "Phrase not found. Continue from the start of the file?" msgstr "Frase no encontrada. ¿Continuar desde principio del fichero?" -#: src/diffuse/main.py:1770 +#: src/diffuse/main.py:1778 #, fuzzy msgid "" "Usage:\n" @@ -704,174 +673,174 @@ msgstr "" " ( -i | --ignore-case ) Ignorar cambios de capitalización\n" " ( -w | --ignore-all-space ) Ignorar todos los cambios en espaciado" -#: src/diffuse/main.py:1937 +#: src/diffuse/main.py:1945 msgid "Error parsing line number." msgstr "Error analizando número de líneas." -#: src/diffuse/main.py:1947 +#: src/diffuse/main.py:1955 #, python-format msgid "Skipping unknown argument \"%s\"." msgstr "Omitiendo argumento desconocido \"%s\"." -#: src/diffuse/main.py:1955 +#: src/diffuse/main.py:1963 #, python-format msgid "Error processing argument \"%s\". Directory not expected." msgstr "Error processando parámetro \"%s\". No se esperaba un directorio." -#: src/diffuse/preferences.py:79 +#: src/diffuse/preferences.py:80 msgid "Display" msgstr "Visualización" -#: src/diffuse/preferences.py:82 +#: src/diffuse/preferences.py:83 msgid "Font" msgstr "Tipo" -#: src/diffuse/preferences.py:83 +#: src/diffuse/preferences.py:84 msgid "Tab width" msgstr "Tamaño de tabulador" -#: src/diffuse/preferences.py:84 +#: src/diffuse/preferences.py:85 msgid "Show right margin" msgstr "Mostrar margen derecho" -#: src/diffuse/preferences.py:85 +#: src/diffuse/preferences.py:86 msgid "Right margin" msgstr "Margen derecho" -#: src/diffuse/preferences.py:86 +#: src/diffuse/preferences.py:87 msgid "Show line numbers" msgstr "Mostrar números de línea" -#: src/diffuse/preferences.py:87 +#: src/diffuse/preferences.py:88 msgid "Show white space characters" msgstr "Mostrar espacios" -#: src/diffuse/preferences.py:88 +#: src/diffuse/preferences.py:89 msgid "Ignore case differences" msgstr "Ignorar diferencías de capitalización" -#: src/diffuse/preferences.py:89 +#: src/diffuse/preferences.py:90 msgid "Ignore white space differences" msgstr "Ignorar diferencías de espacios" -#: src/diffuse/preferences.py:90 src/diffuse/preferences.py:99 +#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100 msgid "Ignore changes to white space" msgstr "Ignorar cambios de espacios" -#: src/diffuse/preferences.py:91 +#: src/diffuse/preferences.py:92 msgid "Ignore blank line differences" msgstr "Ignorar diferencías de líneas vacías" -#: src/diffuse/preferences.py:92 +#: src/diffuse/preferences.py:93 msgid "Ignore end of line differences" msgstr "Ignorar diferencias en caracteres de fin de línea" -#: src/diffuse/preferences.py:94 +#: src/diffuse/preferences.py:95 msgid "Alignment" msgstr "Alineación" -#: src/diffuse/preferences.py:97 +#: src/diffuse/preferences.py:98 msgid "Ignore case" msgstr "Ignorar capitalización" -#: src/diffuse/preferences.py:98 +#: src/diffuse/preferences.py:99 msgid "Ignore white space" msgstr "Ignorar espacios" -#: src/diffuse/preferences.py:100 +#: src/diffuse/preferences.py:101 msgid "Ignore blank lines" msgstr "Ignorar líneas vacías" -#: src/diffuse/preferences.py:101 +#: src/diffuse/preferences.py:102 msgid "Ignore end of line characters" msgstr "Ignorar caracteres de fin de línea" -#: src/diffuse/preferences.py:103 +#: src/diffuse/preferences.py:104 msgid "Editor" msgstr "Editor" -#: src/diffuse/preferences.py:106 +#: src/diffuse/preferences.py:107 msgid "Auto indent" msgstr "Sangría automática" -#: src/diffuse/preferences.py:107 +#: src/diffuse/preferences.py:108 msgid "Expand tabs to spaces" msgstr "Ampliar tabuladores a espacios" -#: src/diffuse/preferences.py:108 +#: src/diffuse/preferences.py:109 msgid "Soft tab width" msgstr "Tabuladores blandos" -#: src/diffuse/preferences.py:110 +#: src/diffuse/preferences.py:111 msgid "Tabs" msgstr "Pestañas" -#: src/diffuse/preferences.py:113 +#: src/diffuse/preferences.py:114 msgid "Default panes" msgstr "Paneles predeterminados" -#: src/diffuse/preferences.py:114 +#: src/diffuse/preferences.py:115 msgid "Always show the tab bar" msgstr "Mostrar siempre barra de pestañas" -#: src/diffuse/preferences.py:115 +#: src/diffuse/preferences.py:116 #, python-format msgid "Warn me when closing a tab will quit %s" msgstr "Avísar sí cerrar la ultima pestaña cerrará la aplicación %s" -#: src/diffuse/preferences.py:117 +#: src/diffuse/preferences.py:118 msgid "Regional Settings" msgstr "Ajustes regionales" -#: src/diffuse/preferences.py:120 +#: src/diffuse/preferences.py:121 msgid "Default codec" msgstr "Codificación estándar" -#: src/diffuse/preferences.py:121 +#: src/diffuse/preferences.py:122 msgid "Order of codecs used to identify encoding" msgstr "Orden de codificaciones en identificación" -#: src/diffuse/preferences.py:142 +#: src/diffuse/preferences.py:143 msgid "Cygwin" msgstr "Cygwin" -#: src/diffuse/preferences.py:144 +#: src/diffuse/preferences.py:145 msgid "Root directory" msgstr "Directorio raíz" -#: src/diffuse/preferences.py:145 +#: src/diffuse/preferences.py:146 msgid "Cygdrive prefix" msgstr "Prefijo de Cygdrive" -#: src/diffuse/preferences.py:164 +#: src/diffuse/preferences.py:165 msgid "Version control system search order" msgstr "" -#: src/diffuse/preferences.py:172 +#: src/diffuse/preferences.py:173 msgid "\"co\" command" msgstr "Comando \"co\"" -#: src/diffuse/preferences.py:173 +#: src/diffuse/preferences.py:174 msgid "\"rlog\" command" msgstr "Comando \"rlog\"" -#: src/diffuse/preferences.py:175 +#: src/diffuse/preferences.py:176 msgid "Command" msgstr "Comando" -#: src/diffuse/preferences.py:181 +#: src/diffuse/preferences.py:182 msgid "Launch from a Bash login shell" msgstr "Lanzar desde línea de comandos Bash" -#: src/diffuse/preferences.py:188 +#: src/diffuse/preferences.py:189 msgid "Update paths for Cygwin" msgstr "Actualizar rutas de Cygwin" -#: src/diffuse/preferences.py:193 +#: src/diffuse/preferences.py:194 msgid "Version Control" msgstr "Control de versión" -#: src/diffuse/preferences.py:258 +#: src/diffuse/preferences.py:259 msgid "Preferences" msgstr "Preferencias" @@ -903,7 +872,7 @@ msgstr "" #: src/diffuse/resources.py:409 #, python-brace-format -msgid "Options \"{option}\" is unknown" +msgid "Option \"{option}\" is unknown" msgstr "" #: src/diffuse/resources.py:416 @@ -956,40 +925,72 @@ msgstr "Error procesando línea {line} de {file}." msgid "Unhandled error at line {line} of {file}." msgstr "Error procesando línea {line} de {file}." -#: src/diffuse/utils.py:63 +#: src/diffuse/utils.py:66 msgid "Auto Detect" msgstr "Reconocimiento automático" -#: src/diffuse/vcs/cvs.py:53 src/diffuse/vcs/rcs.py:62 src/diffuse/vcs/svn.py:95 +#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97 #, python-format msgid "Error parsing revision %s." msgstr "Error analizando revisión %s." -#: src/diffuse/vcs/vcs_registry.py:233 +#: src/diffuse/vcs/vcs_registry.py:238 #, python-format msgid "Error parsing %s." msgstr "Error analizando %s." -#: src/diffuse/widgets.py:1843 +#: src/diffuse/widgets.py:1845 msgid "Align with Selection" -msgstr "Alinear con la selección." +msgstr "Alinear con la selección" -#: src/diffuse/widgets.py:1844 +#: src/diffuse/widgets.py:1846 msgid "Isolate" msgstr "Aislar" -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1847 msgid "Merge Selection" msgstr "Mezclar selección" -#: src/diffuse/widgets.py:1851 +#: src/diffuse/widgets.py:1853 msgid "Select All" msgstr "Seleccionar todo" -#: src/diffuse/widgets.py:1854 +#: src/diffuse/widgets.py:1856 msgid "Swap with Selected Pane" msgstr "Reemplazar con panel seleccionado" +#, fuzzy +#~ msgid "" +#~ "This program is free software; you can redistribute it and/or modify\n" +#~ "it under the terms of the GNU General Public License as published by\n" +#~ "the Free Software Foundation; either version 2 of the License, or\n" +#~ "(at your option) any later version.\n" +#~ "\n" +#~ "This program is distributed in the hope that it will be useful,\n" +#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +#~ "GNU General Public License for more details.\n" +#~ "\n" +#~ "You should have received a copy of the GNU General Public License along\n" +#~ "with this program; if not, write to the Free Software Foundation, Inc.,\n" +#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." +#~ msgstr "" +#~ "This program is free software; you can redistribute it and/or modify it under " +#~ "the terms of the GNU General Public License as published by the Free Software " +#~ "Foundation; either version 2 of the licence, or (at your option) any later " +#~ "version.\n" +#~ "\n" +#~ "This program is distributed in the hope that it will be useful, but WITHOUT " +#~ "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +#~ "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +#~ "details.\n" +#~ "\n" +#~ "You should have received a copy of the GNU General Public License along with " +#~ "this program. You may also obtain a copy of the GNU General Public License " +#~ "from the Free Software Foundation by visiting their web site (http://www.fsf." +#~ "org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, " +#~ "Fifth Floor, Boston, MA 02110-1301 USA\n" + #~ msgid "Diffuse Merge Tool" #~ msgstr "Diffuse utillaje de textos" diff --git a/po/fr.po b/po/fr.po index 06284e6..559cd4d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-04 12:00-0400\n" +"POT-Creation-Date: 2022-04-04 12:14-0400\n" "PO-Revision-Date: 2022-04-04 11:58-0400\n" "Last-Translator: Romain Failliot \n" "Language-Team: French\n" @@ -55,36 +55,6 @@ msgstr "" msgid "translator-credits" msgstr "Romain Failliot " -#: src/diffuse/dialogs.py:49 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License along\n" -"with this program; if not, write to the Free Software Foundation, Inc.,\n" -"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." -msgstr "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License along\n" -"with this program; if not, write to the Free Software Foundation, Inc.,\n" -"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." - #: src/diffuse/dialogs.py:83 msgid "Encoding: " msgstr "Encodage: " @@ -1001,3 +971,32 @@ msgstr "Tout sélectionner" #: src/diffuse/widgets.py:1856 msgid "Swap with Selected Pane" msgstr "Échanger avec le panneau sélectionné" + +#~ msgid "" +#~ "This program is free software; you can redistribute it and/or modify\n" +#~ "it under the terms of the GNU General Public License as published by\n" +#~ "the Free Software Foundation; either version 2 of the License, or\n" +#~ "(at your option) any later version.\n" +#~ "\n" +#~ "This program is distributed in the hope that it will be useful,\n" +#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +#~ "GNU General Public License for more details.\n" +#~ "\n" +#~ "You should have received a copy of the GNU General Public License along\n" +#~ "with this program; if not, write to the Free Software Foundation, Inc.,\n" +#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." +#~ msgstr "" +#~ "This program is free software; you can redistribute it and/or modify\n" +#~ "it under the terms of the GNU General Public License as published by\n" +#~ "the Free Software Foundation; either version 2 of the License, or\n" +#~ "(at your option) any later version.\n" +#~ "\n" +#~ "This program is distributed in the hope that it will be useful,\n" +#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +#~ "GNU General Public License for more details.\n" +#~ "\n" +#~ "You should have received a copy of the GNU General Public License along\n" +#~ "with this program; if not, write to the Free Software Foundation, Inc.,\n" +#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." diff --git a/po/it.po b/po/it.po index be2d383..ec22c43 100644 --- a/po/it.po +++ b/po/it.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Diffuse 0.4.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-27 21:56-0500\n" -"PO-Revision-Date: 2020-06-29 14:49-0400\n" +"POT-Creation-Date: 2022-04-04 12:14-0400\n" +"PO-Revision-Date: 2022-04-04 12:18-0400\n" "Last-Translator: Cristian Marchi \n" "Language-Team: Italian\n" "Language: it\n" @@ -16,6 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 3.0.1\n" #: data/io.github.mightycreak.Diffuse.desktop.in:3 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:4 @@ -38,7 +39,7 @@ msgstr "" msgid "Main window: diff between two files" msgstr "" -#: src/diffuse/constants.py:24 +#: src/diffuse/constants.py:25 msgid "Copyright" msgstr "" @@ -51,38 +52,6 @@ msgstr "" msgid "translator-credits" msgstr "Cristian Marchi , 2011." -#: src/diffuse/dialogs.py:49 -#, fuzzy -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License along\n" -"with this program; if not, write to the Free Software Foundation, Inc.,\n" -"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." -msgstr "" -"This program is free software; you can redistribute it and/or modify it under the " -"terms of the GNU General Public License as published by the Free Software " -"Foundation; either version 2 of the licence, or (at your option) any later " -"version.\n" -"\n" -"This program is distributed in the hope that it will be useful, but WITHOUT ANY " -"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A " -"PARTICULAR PURPOSE. See the GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License along with this " -"program. You may also obtain a copy of the GNU General Public License from the " -"Free Software Foundation by visiting their web site (http://www.fsf.org/) or by " -"writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, " -"Boston, MA 02110-1301 USA\n" - #: src/diffuse/dialogs.py:83 msgid "Encoding: " msgstr "Codifica: " @@ -107,60 +76,60 @@ msgstr "Distingui MAIUSCOLE/minuscole" msgid "Search Backwards" msgstr "Cerca all'indietro" -#: src/diffuse/main.py:79 +#: src/diffuse/main.py:85 msgid "Close Tab" msgstr "Chiudi scheda" -#: src/diffuse/main.py:124 +#: src/diffuse/main.py:132 msgid "Open File..." msgstr "Apri file..." -#: src/diffuse/main.py:125 +#: src/diffuse/main.py:133 msgid "Reload File" msgstr "Ricarica file" -#: src/diffuse/main.py:126 +#: src/diffuse/main.py:134 msgid "Save File" msgstr "Salva file" -#: src/diffuse/main.py:127 +#: src/diffuse/main.py:135 msgid "Save File As..." msgstr "Salva con nome..." -#: src/diffuse/main.py:280 +#: src/diffuse/main.py:288 msgid "Save changes before loading the new file?" msgstr "Salvare i cambiamenti prima di caricare il nuovo file?" -#: src/diffuse/main.py:391 +#: src/diffuse/main.py:399 #, python-format msgid "Error reading revision %(rev)s of %(file)s." msgstr "Errore durante la lettura della revisione \"%(rev)s\" di «%(file)s»." -#: src/diffuse/main.py:394 src/diffuse/main.py:1849 +#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #, python-format msgid "Error reading %s." msgstr "Errore leggendo il %s." -#: src/diffuse/main.py:416 +#: src/diffuse/main.py:424 msgid "Open File" msgstr "Apertura file" -#: src/diffuse/main.py:473 +#: src/diffuse/main.py:481 #, python-format msgid "The file %s changed on disk. Do you want to reload the file?" msgstr "Il file «%s» è cambiato sul disco. Ricaricarlo?" -#: src/diffuse/main.py:499 +#: src/diffuse/main.py:507 #, python-format msgid "Save %(title)s Pane %(pane)d" msgstr "Salva %(title)s riquadro %(pane)d" -#: src/diffuse/main.py:531 +#: src/diffuse/main.py:539 #, python-format msgid "A file named %s already exists. Do you want to overwrite it?" msgstr "Il file «%s» esiste già. Sovrascrivere?" -#: src/diffuse/main.py:538 +#: src/diffuse/main.py:546 #, python-format msgid "" "The file %s has been modified by another process since reading it. If you save, " @@ -169,25 +138,25 @@ msgstr "" "Il file «%s» è stato modificato da un'altro processo dopo la lettura. Se si " "salva, tutte le modifiche esterne potrebbero essere perdute. Salvare comunque?" -#: src/diffuse/main.py:580 +#: src/diffuse/main.py:588 #, python-format msgid "Error encoding to %s." -msgstr "Errore codificando %s" +msgstr "Errore codificando %s." -#: src/diffuse/main.py:584 src/diffuse/preferences.py:298 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 #, python-format msgid "Error writing %s." msgstr "Errore scrivendo il %s." -#: src/diffuse/main.py:614 +#: src/diffuse/main.py:622 msgid "Go To Line..." msgstr "Vai alla linea..." -#: src/diffuse/main.py:615 +#: src/diffuse/main.py:623 msgid "Line Number: " msgstr "Numero di riga: " -#: src/diffuse/main.py:646 +#: src/diffuse/main.py:654 msgid "" "Press the enter key or double click to edit. Press the space bar or use the RMB " "menu to manually align." @@ -195,11 +164,11 @@ msgstr "" "Premere il tasto \"Invio\" o fare doppio clic per modificare. Premere \"spazio\" " "o usare il tasto destro del mouse per allineare manualmente." -#: src/diffuse/main.py:650 +#: src/diffuse/main.py:658 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:653 +#: src/diffuse/main.py:661 msgid "" "Select target line and press the space bar to align. Press the escape key to " "cancel." @@ -207,426 +176,426 @@ msgstr "" "Selezionare la riga di destinazione e premere spazio per allineare. Premere \"Esc" "\" per annullare." -#: src/diffuse/main.py:776 +#: src/diffuse/main.py:784 msgid "_File" msgstr "_File" -#: src/diffuse/main.py:777 +#: src/diffuse/main.py:785 msgid "_Open File..." -msgstr "_Apri file" +msgstr "_Apri file..." -#: src/diffuse/main.py:778 +#: src/diffuse/main.py:786 msgid "Open File In New _Tab..." msgstr "Apri file in una nuova sc_heda..." -#: src/diffuse/main.py:779 +#: src/diffuse/main.py:787 msgid "Open _Modified Files..." msgstr "Apri file _modificati..." -#: src/diffuse/main.py:780 +#: src/diffuse/main.py:788 msgid "Open Commi_t..." msgstr "Apri c_ommit..." -#: src/diffuse/main.py:781 +#: src/diffuse/main.py:789 msgid "_Reload File" msgstr "_Ricarica file" -#: src/diffuse/main.py:783 +#: src/diffuse/main.py:791 msgid "_Save File" msgstr "_Salva file" -#: src/diffuse/main.py:784 +#: src/diffuse/main.py:792 msgid "Save File _As..." msgstr "S_alva con nome..." -#: src/diffuse/main.py:785 +#: src/diffuse/main.py:793 msgid "Save A_ll" msgstr "Salva _tutti" -#: src/diffuse/main.py:787 +#: src/diffuse/main.py:795 msgid "New _2-Way File Merge" msgstr "Nuova unione a _2 file" -#: src/diffuse/main.py:788 +#: src/diffuse/main.py:796 msgid "New _3-Way File Merge" msgstr "Nuova unione a _3 file" -#: src/diffuse/main.py:789 +#: src/diffuse/main.py:797 msgid "New _N-Way File Merge..." -msgstr "Nuova unione a _N file" +msgstr "Nuova unione a _N file..." -#: src/diffuse/main.py:791 +#: src/diffuse/main.py:799 msgid "_Close Tab" msgstr "_Chiudi scheda" -#: src/diffuse/main.py:792 +#: src/diffuse/main.py:800 msgid "_Undo Close Tab" msgstr "Annulla chi_usura scheda" -#: src/diffuse/main.py:793 +#: src/diffuse/main.py:801 msgid "_Quit" msgstr "_Esci" -#: src/diffuse/main.py:796 +#: src/diffuse/main.py:804 msgid "_Edit" msgstr "_Modifica" -#: src/diffuse/main.py:797 +#: src/diffuse/main.py:805 msgid "_Undo" msgstr "Ann_ulla" -#: src/diffuse/main.py:798 +#: src/diffuse/main.py:806 msgid "_Redo" msgstr "_Ripeti" -#: src/diffuse/main.py:800 +#: src/diffuse/main.py:808 msgid "Cu_t" msgstr "_Taglia" -#: src/diffuse/main.py:801 +#: src/diffuse/main.py:809 msgid "_Copy" msgstr "_Copia" -#: src/diffuse/main.py:802 +#: src/diffuse/main.py:810 msgid "_Paste" msgstr "_Incolla" -#: src/diffuse/main.py:804 +#: src/diffuse/main.py:812 msgid "Select _All" msgstr "Selezion_a tutto" -#: src/diffuse/main.py:805 +#: src/diffuse/main.py:813 msgid "C_lear Edits" msgstr "Annulla _modifiche" -#: src/diffuse/main.py:806 +#: src/diffuse/main.py:814 msgid "_Dismiss All Edits" msgstr "Scarta tutte le mo_difiche" -#: src/diffuse/main.py:808 +#: src/diffuse/main.py:816 msgid "_Find..." msgstr "Tr_ova..." -#: src/diffuse/main.py:809 +#: src/diffuse/main.py:817 msgid "Find _Next" msgstr "Trova _successivo" -#: src/diffuse/main.py:810 +#: src/diffuse/main.py:818 msgid "Find Pre_vious" msgstr "Trova _precedente" -#: src/diffuse/main.py:811 +#: src/diffuse/main.py:819 msgid "_Go To Line..." msgstr "_Vai alla riga..." -#: src/diffuse/main.py:813 +#: src/diffuse/main.py:821 msgid "Pr_eferences..." msgstr "Pr_eferenze..." -#: src/diffuse/main.py:817 +#: src/diffuse/main.py:825 msgid "None" msgstr "Nessuna" -#: src/diffuse/main.py:835 +#: src/diffuse/main.py:843 msgid "_View" msgstr "_Visualizza" -#: src/diffuse/main.py:836 +#: src/diffuse/main.py:844 msgid "_Syntax Highlighting" msgstr "Si_ntassi" -#: src/diffuse/main.py:838 +#: src/diffuse/main.py:846 msgid "Re_align All" msgstr "Ria_llinea tutti" -#: src/diffuse/main.py:839 +#: src/diffuse/main.py:847 msgid "_Isolate" msgstr "_Isola" -#: src/diffuse/main.py:841 +#: src/diffuse/main.py:849 msgid "_First Difference" msgstr "_Prima differenza" -#: src/diffuse/main.py:842 +#: src/diffuse/main.py:850 msgid "_Previous Difference" msgstr "Differenza p_recedente" -#: src/diffuse/main.py:843 +#: src/diffuse/main.py:851 msgid "_Next Difference" msgstr "Differenza s_uccessiva" -#: src/diffuse/main.py:844 +#: src/diffuse/main.py:852 msgid "_Last Difference" msgstr "Ulti_ma differenza" -#: src/diffuse/main.py:846 +#: src/diffuse/main.py:854 msgid "Fir_st Tab" msgstr "Prim_a scheda" -#: src/diffuse/main.py:847 +#: src/diffuse/main.py:855 msgid "Pre_vious Tab" msgstr "Scheda pr_ecedente" -#: src/diffuse/main.py:848 +#: src/diffuse/main.py:856 msgid "Next _Tab" msgstr "Scheda su_ccessiva" -#: src/diffuse/main.py:849 +#: src/diffuse/main.py:857 msgid "Las_t Tab" msgstr "Ul_tima scheda" -#: src/diffuse/main.py:851 +#: src/diffuse/main.py:859 msgid "Shift Pane _Right" msgstr "Sposta riquadro a _destra" -#: src/diffuse/main.py:852 +#: src/diffuse/main.py:860 msgid "Shift Pane _Left" msgstr "Sposta riquadro a _sinistra" -#: src/diffuse/main.py:855 +#: src/diffuse/main.py:863 msgid "F_ormat" msgstr "F_ormato" -#: src/diffuse/main.py:856 +#: src/diffuse/main.py:864 msgid "Convert To _Upper Case" msgstr "Converti in M_AIUSCOLO" -#: src/diffuse/main.py:857 +#: src/diffuse/main.py:865 msgid "Convert To _Lower Case" msgstr "Converti in m_inuscolo" -#: src/diffuse/main.py:859 +#: src/diffuse/main.py:867 msgid "Sort Lines In _Ascending Order" msgstr "Disponi le righe in ordine a_scendente" -#: src/diffuse/main.py:860 +#: src/diffuse/main.py:868 msgid "Sort Lines In D_escending Order" msgstr "Disponi le righe in ordine _discendente" -#: src/diffuse/main.py:862 +#: src/diffuse/main.py:870 msgid "Remove Trailing _White Space" msgstr "Rimuovi gli spazi _vuoti alla fine della riga" -#: src/diffuse/main.py:863 +#: src/diffuse/main.py:871 msgid "Convert Tabs To _Spaces" msgstr "Converti le _tabulazioni in spazi" -#: src/diffuse/main.py:864 +#: src/diffuse/main.py:872 msgid "Convert Leading Spaces To _Tabs" msgstr "Converti gli spa_zi iniziali in tabulazioni" -#: src/diffuse/main.py:866 +#: src/diffuse/main.py:874 msgid "_Increase Indenting" msgstr "Au_menta indentazione" -#: src/diffuse/main.py:867 +#: src/diffuse/main.py:875 msgid "De_crease Indenting" msgstr "Dimi_nuisci indentazione" -#: src/diffuse/main.py:869 +#: src/diffuse/main.py:877 msgid "Convert To _DOS Format" msgstr "Converti nel formato D_OS" -#: src/diffuse/main.py:870 +#: src/diffuse/main.py:878 msgid "Convert To _Mac Format" msgstr "Converti nel formato MA_C" -#: src/diffuse/main.py:871 +#: src/diffuse/main.py:879 msgid "Convert To Uni_x Format" msgstr "Converti nel formato Uni_x" -#: src/diffuse/main.py:874 +#: src/diffuse/main.py:882 msgid "_Merge" msgstr "_Unione" -#: src/diffuse/main.py:875 +#: src/diffuse/main.py:883 msgid "Copy Selection _Right" msgstr "Copia selezione a _destra" -#: src/diffuse/main.py:876 +#: src/diffuse/main.py:884 msgid "Copy Selection _Left" msgstr "Copia selezione a _sinistra" -#: src/diffuse/main.py:878 +#: src/diffuse/main.py:886 msgid "Copy Left _Into Selection" msgstr "Copia s_inistra nella selezione" -#: src/diffuse/main.py:879 +#: src/diffuse/main.py:887 msgid "Copy Right I_nto Selection" msgstr "Copia d_estra nella selezione" -#: src/diffuse/main.py:880 +#: src/diffuse/main.py:888 msgid "_Merge From Left Then Right" msgstr "_Unisci sinistra poi destra" -#: src/diffuse/main.py:881 +#: src/diffuse/main.py:889 msgid "M_erge From Right Then Left" msgstr "U_nisci destra poi sinistra" -#: src/diffuse/main.py:884 +#: src/diffuse/main.py:892 msgid "_Help" msgstr "A_iuto" -#: src/diffuse/main.py:885 +#: src/diffuse/main.py:893 msgid "_Help Contents..." -msgstr "_Sommario" +msgstr "_Sommario..." -#: src/diffuse/main.py:887 +#: src/diffuse/main.py:895 #, python-format msgid "_About %s..." -msgstr "I_nformazioni su %s" +msgstr "I_nformazioni su %s..." -#: src/diffuse/main.py:902 +#: src/diffuse/main.py:910 msgid "New 2-Way File Merge" msgstr "Nuova unione a 2 file" -#: src/diffuse/main.py:903 +#: src/diffuse/main.py:911 msgid "New 3-Way File Merge" msgstr "Nuova unione a 3 file" -#: src/diffuse/main.py:905 +#: src/diffuse/main.py:913 msgid "Realign All" msgstr "Riallinea tutti" -#: src/diffuse/main.py:906 +#: src/diffuse/main.py:914 msgid "First Difference" msgstr "Prima differenza" -#: src/diffuse/main.py:907 +#: src/diffuse/main.py:915 msgid "Previous Difference" msgstr "Differenza precedente" -#: src/diffuse/main.py:908 +#: src/diffuse/main.py:916 msgid "Next Difference" msgstr "Differenza successiva" -#: src/diffuse/main.py:909 +#: src/diffuse/main.py:917 msgid "Last Difference" msgstr "Ultima differenza" -#: src/diffuse/main.py:911 +#: src/diffuse/main.py:919 msgid "Copy Selection Right" msgstr "Copia la selezione a destra" -#: src/diffuse/main.py:912 +#: src/diffuse/main.py:920 msgid "Copy Selection Left" msgstr "Copia la selezione a sinistra" -#: src/diffuse/main.py:913 +#: src/diffuse/main.py:921 msgid "Copy Left Into Selection" msgstr "Copia sinistra nella selezione" -#: src/diffuse/main.py:914 +#: src/diffuse/main.py:922 msgid "Copy Right Into Selection" msgstr "Copia destra nella selezione" -#: src/diffuse/main.py:915 +#: src/diffuse/main.py:923 msgid "Merge From Left Then Right" msgstr "Unisce prima da sinistra poi da destra" -#: src/diffuse/main.py:916 +#: src/diffuse/main.py:924 msgid "Merge From Right Then Left" msgstr "Unisce prima da destra poi da sinistra" -#: src/diffuse/main.py:918 +#: src/diffuse/main.py:926 msgid "Undo" msgstr "Annulla" -#: src/diffuse/main.py:919 +#: src/diffuse/main.py:927 msgid "Redo" msgstr "Ripeti" -#: src/diffuse/main.py:920 src/diffuse/widgets.py:1847 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 msgid "Cut" msgstr "Taglia" -#: src/diffuse/main.py:921 src/diffuse/widgets.py:1848 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 msgid "Copy" msgstr "Copia" -#: src/diffuse/main.py:922 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 msgid "Paste" msgstr "Incolla" -#: src/diffuse/main.py:923 src/diffuse/widgets.py:1852 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 msgid "Clear Edits" msgstr "Annulla le modifiche" -#: src/diffuse/main.py:1046 +#: src/diffuse/main.py:1054 msgid "Some files have unsaved changes. Select the files to save before closing." msgstr "" "Alcune modifiche ai file non sono ancora state salvate. Selezionare i file da " "salvare prima di uscire." -#: src/diffuse/main.py:1060 +#: src/diffuse/main.py:1068 msgid "Tab" msgstr "Scheda" -#: src/diffuse/main.py:1065 +#: src/diffuse/main.py:1073 msgid "Pane" msgstr "Riquadro" -#: src/diffuse/main.py:1076 +#: src/diffuse/main.py:1084 msgid "Close _Without Saving" msgstr "_Chiudi senza salvare" -#: src/diffuse/main.py:1115 +#: src/diffuse/main.py:1123 #, python-format msgid "Closing this tab will quit %s." msgstr "Chiudendo questa scheda %s verrà chiuso." -#: src/diffuse/main.py:1198 +#: src/diffuse/main.py:1206 #, python-format msgid "File Merge %d" msgstr "Unione file # %d" -#: src/diffuse/main.py:1304 +#: src/diffuse/main.py:1312 #, python-format 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:1336 +#: src/diffuse/main.py:1344 #, python-format 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:1369 +#: src/diffuse/main.py:1377 msgid "Open File In New Tab" msgstr "Apre ilo file in una nuova scheda" -#: src/diffuse/main.py:1392 +#: src/diffuse/main.py:1400 msgid "Choose Folder With Modified Files" msgstr "Selezionare la cartella con i file modificati" -#: src/diffuse/main.py:1410 +#: src/diffuse/main.py:1418 msgid "No modified files found." msgstr "Non sono stati trovati file modificati." -#: src/diffuse/main.py:1416 +#: src/diffuse/main.py:1424 msgid "Choose Folder With Commit" msgstr "Selezionare la cartella con i commit" -#: src/diffuse/main.py:1436 +#: src/diffuse/main.py:1444 msgid "No committed files found." msgstr "Non sono stati trovati file di cui è stato eseguito il commit." -#: src/diffuse/main.py:1472 +#: src/diffuse/main.py:1480 msgid "New N-Way File Merge..." msgstr "Nuova unione a N file..." -#: src/diffuse/main.py:1473 +#: src/diffuse/main.py:1481 msgid "Number of panes: " -msgstr "Numero di riquadri" +msgstr "Numero di riquadri: " -#: src/diffuse/main.py:1547 +#: src/diffuse/main.py:1555 msgid "Phrase not found. Continue from the end of the file?" msgstr "Frase non trovata. Continuare dalla fine del file?" -#: src/diffuse/main.py:1549 +#: src/diffuse/main.py:1557 msgid "Phrase not found. Continue from the start of the file?" msgstr "Frase non trovata. Continuare dall'inizio del file?" -#: src/diffuse/main.py:1770 +#: src/diffuse/main.py:1778 #, fuzzy msgid "" "Usage:\n" @@ -707,174 +676,174 @@ msgstr "" " ( -i | --ignore-case ) Ignora differenze tra MAIUSCOLE/minuscole\n" " ( -w | --ignore-all-space ) Ignora le differenze tra spazi vuoti" -#: src/diffuse/main.py:1937 +#: src/diffuse/main.py:1945 msgid "Error parsing line number." msgstr "Errore nell'analizzare il numero di riga." -#: src/diffuse/main.py:1947 +#: src/diffuse/main.py:1955 #, python-format msgid "Skipping unknown argument \"%s\"." -msgstr "L'argomento sconosciuto \"%s\" verrà tralasciato" +msgstr "L'argomento sconosciuto \"%s\" verrà tralasciato." -#: src/diffuse/main.py:1955 +#: src/diffuse/main.py:1963 #, python-format msgid "Error processing argument \"%s\". Directory not expected." msgstr "Errore nell'elaborazione dell'argomento \"%s\". Cartella non attesa." -#: src/diffuse/preferences.py:79 +#: src/diffuse/preferences.py:80 msgid "Display" msgstr "Visualizzazione" -#: src/diffuse/preferences.py:82 +#: src/diffuse/preferences.py:83 msgid "Font" msgstr "Carattere" -#: src/diffuse/preferences.py:83 +#: src/diffuse/preferences.py:84 msgid "Tab width" msgstr "Larghezza scheda" -#: src/diffuse/preferences.py:84 +#: src/diffuse/preferences.py:85 msgid "Show right margin" msgstr "Mostra margine destro" -#: src/diffuse/preferences.py:85 +#: src/diffuse/preferences.py:86 msgid "Right margin" msgstr "Margine destro" -#: src/diffuse/preferences.py:86 +#: src/diffuse/preferences.py:87 msgid "Show line numbers" msgstr "Mostra i numeri di riga" -#: src/diffuse/preferences.py:87 +#: src/diffuse/preferences.py:88 msgid "Show white space characters" msgstr "Mostra i caratteri di spaziatura" -#: src/diffuse/preferences.py:88 +#: src/diffuse/preferences.py:89 msgid "Ignore case differences" msgstr "Ignora la differenza tra lettere maiuscole e minuscole" -#: src/diffuse/preferences.py:89 +#: src/diffuse/preferences.py:90 msgid "Ignore white space differences" msgstr "Ignora le differenze tra spazi vuoti" -#: src/diffuse/preferences.py:90 src/diffuse/preferences.py:99 +#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100 msgid "Ignore changes to white space" msgstr "Ignora le modifiche agli spazi vuoti" -#: src/diffuse/preferences.py:91 +#: src/diffuse/preferences.py:92 msgid "Ignore blank line differences" msgstr "Ignora le differenze tra le righe vuote" -#: src/diffuse/preferences.py:92 +#: src/diffuse/preferences.py:93 msgid "Ignore end of line differences" msgstr "Ignora le differenze alla fine della riga" -#: src/diffuse/preferences.py:94 +#: src/diffuse/preferences.py:95 msgid "Alignment" msgstr "Allineamento" -#: src/diffuse/preferences.py:97 +#: src/diffuse/preferences.py:98 msgid "Ignore case" msgstr "Ignora MAIUSCOLE/minuscole" -#: src/diffuse/preferences.py:98 +#: src/diffuse/preferences.py:99 msgid "Ignore white space" msgstr "Ignora gli spazi vuoti" -#: src/diffuse/preferences.py:100 +#: src/diffuse/preferences.py:101 msgid "Ignore blank lines" msgstr "Ignora le righe vuote" -#: src/diffuse/preferences.py:101 +#: src/diffuse/preferences.py:102 msgid "Ignore end of line characters" msgstr "Ignora i caratteri di fine linea" -#: src/diffuse/preferences.py:103 +#: src/diffuse/preferences.py:104 msgid "Editor" msgstr "Editor" -#: src/diffuse/preferences.py:106 +#: src/diffuse/preferences.py:107 msgid "Auto indent" msgstr "Indentazione automatica" -#: src/diffuse/preferences.py:107 +#: src/diffuse/preferences.py:108 msgid "Expand tabs to spaces" msgstr "Espandi le tabulazioni in spazi" -#: src/diffuse/preferences.py:108 +#: src/diffuse/preferences.py:109 msgid "Soft tab width" msgstr "Larghezza scheda" -#: src/diffuse/preferences.py:110 +#: src/diffuse/preferences.py:111 msgid "Tabs" msgstr "Schede" -#: src/diffuse/preferences.py:113 +#: src/diffuse/preferences.py:114 msgid "Default panes" msgstr "Riquadri predefiniti" -#: src/diffuse/preferences.py:114 +#: src/diffuse/preferences.py:115 msgid "Always show the tab bar" msgstr "Mostra sempre la barra delle schede" -#: src/diffuse/preferences.py:115 +#: src/diffuse/preferences.py:116 #, python-format msgid "Warn me when closing a tab will quit %s" msgstr "Avvisami se chiudendo una scheda anche %s verrà chiuso" -#: src/diffuse/preferences.py:117 +#: src/diffuse/preferences.py:118 msgid "Regional Settings" msgstr "Impostazioni regionali" -#: src/diffuse/preferences.py:120 +#: src/diffuse/preferences.py:121 msgid "Default codec" msgstr "Codec predefinito" -#: src/diffuse/preferences.py:121 +#: src/diffuse/preferences.py:122 msgid "Order of codecs used to identify encoding" msgstr "Ordine dei codici utilizzati per identificare la codifica" -#: src/diffuse/preferences.py:142 +#: src/diffuse/preferences.py:143 msgid "Cygwin" msgstr "Cygwin" -#: src/diffuse/preferences.py:144 +#: src/diffuse/preferences.py:145 msgid "Root directory" msgstr "Cartella radice" -#: src/diffuse/preferences.py:145 +#: src/diffuse/preferences.py:146 msgid "Cygdrive prefix" msgstr "Prefisso Cygdrive" -#: src/diffuse/preferences.py:164 +#: src/diffuse/preferences.py:165 msgid "Version control system search order" msgstr "" -#: src/diffuse/preferences.py:172 +#: src/diffuse/preferences.py:173 msgid "\"co\" command" msgstr "Comando \"co\"" -#: src/diffuse/preferences.py:173 +#: src/diffuse/preferences.py:174 msgid "\"rlog\" command" msgstr "Comando \"rlog\"" -#: src/diffuse/preferences.py:175 +#: src/diffuse/preferences.py:176 msgid "Command" msgstr "Comando" -#: src/diffuse/preferences.py:181 +#: src/diffuse/preferences.py:182 msgid "Launch from a Bash login shell" msgstr "Avvia dalla Bash di una shell di login" -#: src/diffuse/preferences.py:188 +#: src/diffuse/preferences.py:189 msgid "Update paths for Cygwin" msgstr "Aggiorna i percorsi per Cygwin" -#: src/diffuse/preferences.py:193 +#: src/diffuse/preferences.py:194 msgid "Version Control" msgstr "Controllo di versione" -#: src/diffuse/preferences.py:258 +#: src/diffuse/preferences.py:259 msgid "Preferences" msgstr "Preferenze" @@ -906,7 +875,7 @@ msgstr "" #: src/diffuse/resources.py:409 #, python-brace-format -msgid "Options \"{option}\" is unknown" +msgid "Option \"{option}\" is unknown" msgstr "" #: src/diffuse/resources.py:416 @@ -959,40 +928,72 @@ msgstr "Errore nell'elaborare la riga {line} di «{file}»." msgid "Unhandled error at line {line} of {file}." msgstr "Errore nell'elaborare la riga {line} di «{file}»." -#: src/diffuse/utils.py:63 +#: src/diffuse/utils.py:66 msgid "Auto Detect" msgstr "Automatico" -#: src/diffuse/vcs/cvs.py:53 src/diffuse/vcs/rcs.py:62 src/diffuse/vcs/svn.py:95 +#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97 #, python-format msgid "Error parsing revision %s." msgstr "Eroore analizzando la revisione %s." -#: src/diffuse/vcs/vcs_registry.py:233 +#: src/diffuse/vcs/vcs_registry.py:238 #, python-format msgid "Error parsing %s." msgstr "Errore analizzando %s." -#: src/diffuse/widgets.py:1843 +#: src/diffuse/widgets.py:1845 msgid "Align with Selection" msgstr "Allinea con la selezione" -#: src/diffuse/widgets.py:1844 +#: src/diffuse/widgets.py:1846 msgid "Isolate" msgstr "Isola" -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1847 msgid "Merge Selection" msgstr "Unisci selezione" -#: src/diffuse/widgets.py:1851 +#: src/diffuse/widgets.py:1853 msgid "Select All" msgstr "Seleziona tutto" -#: src/diffuse/widgets.py:1854 +#: src/diffuse/widgets.py:1856 msgid "Swap with Selected Pane" msgstr "Scambia con il riquadro selezionato" +#, fuzzy +#~ msgid "" +#~ "This program is free software; you can redistribute it and/or modify\n" +#~ "it under the terms of the GNU General Public License as published by\n" +#~ "the Free Software Foundation; either version 2 of the License, or\n" +#~ "(at your option) any later version.\n" +#~ "\n" +#~ "This program is distributed in the hope that it will be useful,\n" +#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +#~ "GNU General Public License for more details.\n" +#~ "\n" +#~ "You should have received a copy of the GNU General Public License along\n" +#~ "with this program; if not, write to the Free Software Foundation, Inc.,\n" +#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." +#~ msgstr "" +#~ "This program is free software; you can redistribute it and/or modify it under " +#~ "the terms of the GNU General Public License as published by the Free Software " +#~ "Foundation; either version 2 of the licence, or (at your option) any later " +#~ "version.\n" +#~ "\n" +#~ "This program is distributed in the hope that it will be useful, but WITHOUT " +#~ "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +#~ "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +#~ "details.\n" +#~ "\n" +#~ "You should have received a copy of the GNU General Public License along with " +#~ "this program. You may also obtain a copy of the GNU General Public License " +#~ "from the Free Software Foundation by visiting their web site (http://www.fsf." +#~ "org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, " +#~ "Fifth Floor, Boston, MA 02110-1301 USA\n" + #~ msgid "Diffuse Merge Tool" #~ msgstr "Diffuse - strumento di unione" diff --git a/po/ja.po b/po/ja.po index 54bbb7a..450f083 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn r316\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-27 21:56-0500\n" +"POT-Creation-Date: 2022-04-04 12:14-0400\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: Derrick Moser \n" "Language-Team: Japanese\n" @@ -38,7 +38,7 @@ msgstr "" msgid "Main window: diff between two files" msgstr "" -#: src/diffuse/constants.py:24 +#: src/diffuse/constants.py:25 msgid "Copyright" msgstr "" @@ -51,36 +51,6 @@ msgstr "" msgid "translator-credits" msgstr "Derrick Moser " -#: src/diffuse/dialogs.py:49 -#, fuzzy -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License along\n" -"with this program; if not, write to the Free Software Foundation, Inc.,\n" -"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." -msgstr "" -"このプログラムはフリーソフトウェアです。あなたはこれを、フリーソフトウェア財団に" -"よって発行された GNU 一般公衆利用許諾契約書(バージョン2か、希望によってはそれ以降" -"のバージョンのうちどれか)の定める条件の下で再頒布または改変することができます。\n" -"\n" -"このプログラムは有用であることを願って頒布されますが、*全くの無保証*です。商業可能" -"性の保証や特定の目的への適合性は、言外に示されたものも含め全く存在しません。詳しく" -"はGNU 一般公衆利用許諾契約書をご覧ください。\n" -"\n" -"あなたはこのプログラムと共に、GNU 一般公衆利用許諾契約書の複製物を一部受け取ったは" -"ずです。もし受け取っていなければ、フリーソフトウェア財団まで請求してください(宛先" -"は the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA " -"02111-1307 USA)。\n" - #: src/diffuse/dialogs.py:83 msgid "Encoding: " msgstr "エンコーディング: " @@ -105,60 +75,60 @@ msgstr "大文字/小文字を区別" msgid "Search Backwards" msgstr "先頭に向かって検索" -#: src/diffuse/main.py:79 +#: src/diffuse/main.py:85 msgid "Close Tab" msgstr "タブを閉じる" -#: src/diffuse/main.py:124 +#: src/diffuse/main.py:132 msgid "Open File..." msgstr "ファイルを開く..." -#: src/diffuse/main.py:125 +#: src/diffuse/main.py:133 msgid "Reload File" msgstr "ファイルを再読込み" -#: src/diffuse/main.py:126 +#: src/diffuse/main.py:134 msgid "Save File" msgstr "ファイルを保存" -#: src/diffuse/main.py:127 +#: src/diffuse/main.py:135 msgid "Save File As..." msgstr "ファイルとして保存..." -#: src/diffuse/main.py:280 +#: src/diffuse/main.py:288 msgid "Save changes before loading the new file?" msgstr "新しいファイルをロードする前に、変更したデータを保存しますか？" -#: src/diffuse/main.py:391 +#: src/diffuse/main.py:399 #, python-format msgid "Error reading revision %(rev)s of %(file)s." msgstr "%(file)s の %(rev)s というリビジョンを読み込む際にエラーが生じました。" -#: src/diffuse/main.py:394 src/diffuse/main.py:1849 +#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #, python-format msgid "Error reading %s." msgstr "%s を読み込む際にエラーが生じました。" -#: src/diffuse/main.py:416 +#: src/diffuse/main.py:424 msgid "Open File" msgstr "ファイルを開く" -#: src/diffuse/main.py:473 +#: src/diffuse/main.py:481 #, python-format msgid "The file %s changed on disk. Do you want to reload the file?" msgstr "ファイル %s が変更されたようです。そのファイルを再読み込みしますか？" -#: src/diffuse/main.py:499 +#: src/diffuse/main.py:507 #, python-format msgid "Save %(title)s Pane %(pane)d" msgstr "%(title)s の%(pane)d番目の枠を保存" -#: src/diffuse/main.py:531 +#: src/diffuse/main.py:539 #, python-format msgid "A file named %s already exists. Do you want to overwrite it?" msgstr "%s というファイルは既に存在しています。それを上書きしますか？" -#: src/diffuse/main.py:538 +#: src/diffuse/main.py:546 #, python-format msgid "" "The file %s has been modified by another process since reading it. If you save, " @@ -167,25 +137,25 @@ msgstr "" "ファイル %s は、変更されています。保存する場合は、これらの変更が失われることがあり" "ます。保存しますか?" -#: src/diffuse/main.py:580 +#: src/diffuse/main.py:588 #, python-format msgid "Error encoding to %s." msgstr "%s に変える際にエラーが生じました。" -#: src/diffuse/main.py:584 src/diffuse/preferences.py:298 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 #, python-format msgid "Error writing %s." msgstr "%s へ書き込む際にエラーが生じました。" -#: src/diffuse/main.py:614 +#: src/diffuse/main.py:622 msgid "Go To Line..." msgstr "指定行へジャンプ..." -#: src/diffuse/main.py:615 +#: src/diffuse/main.py:623 msgid "Line Number: " msgstr "行番号: " -#: src/diffuse/main.py:646 +#: src/diffuse/main.py:654 msgid "" "Press the enter key or double click to edit. Press the space bar or use the RMB " "menu to manually align." @@ -193,11 +163,11 @@ msgstr "" "編集するためにエンターキーを押すか、ダブルクリックします。手動で整列させるためにス" "ペースバーを押すか、RMBを使います。" -#: src/diffuse/main.py:650 +#: src/diffuse/main.py:658 msgid "Press the escape key to finish editing." msgstr "ESCキーを押して、編集を終了します。" -#: src/diffuse/main.py:653 +#: src/diffuse/main.py:661 msgid "" "Select target line and press the space bar to align. Press the escape key to " "cancel." @@ -205,425 +175,425 @@ msgstr "" "目標行を選択してスペースバーを押すと整列します。取り消す場合は、ESCキーを押しま" "す。" -#: src/diffuse/main.py:776 +#: src/diffuse/main.py:784 msgid "_File" msgstr "ファイル(_F)" -#: src/diffuse/main.py:777 +#: src/diffuse/main.py:785 msgid "_Open File..." msgstr "ファイルを開く...(_O)" -#: src/diffuse/main.py:778 +#: src/diffuse/main.py:786 msgid "Open File In New _Tab..." msgstr "新しいタブにファイルを開く...(_T)" -#: src/diffuse/main.py:779 +#: src/diffuse/main.py:787 msgid "Open _Modified Files..." msgstr "変更のあるファイルを開く...(_M)" -#: src/diffuse/main.py:780 +#: src/diffuse/main.py:788 msgid "Open Commi_t..." msgstr "コミットを開く...(_T)" -#: src/diffuse/main.py:781 +#: src/diffuse/main.py:789 msgid "_Reload File" msgstr "ファイルの再読込み(_R)" -#: src/diffuse/main.py:783 +#: src/diffuse/main.py:791 msgid "_Save File" msgstr "ファイルを保存(_S)" -#: src/diffuse/main.py:784 +#: src/diffuse/main.py:792 msgid "Save File _As..." msgstr "ファイルとして保存...(_A)" -#: src/diffuse/main.py:785 +#: src/diffuse/main.py:793 msgid "Save A_ll" msgstr "全て保存(_L)" -#: src/diffuse/main.py:787 +#: src/diffuse/main.py:795 msgid "New _2-Way File Merge" msgstr "新しい２つのファイルの比較(_2)" -#: src/diffuse/main.py:788 +#: src/diffuse/main.py:796 msgid "New _3-Way File Merge" msgstr "新しい３つのファイルの比較(_3)" -#: src/diffuse/main.py:789 +#: src/diffuse/main.py:797 msgid "New _N-Way File Merge..." msgstr "新しい複数のファイルの比較...(_N)" -#: src/diffuse/main.py:791 +#: src/diffuse/main.py:799 msgid "_Close Tab" msgstr "タブを閉じる(_C)" -#: src/diffuse/main.py:792 +#: src/diffuse/main.py:800 msgid "_Undo Close Tab" msgstr "閉じたタブを元に戻す(_U)" -#: src/diffuse/main.py:793 +#: src/diffuse/main.py:801 msgid "_Quit" msgstr "終了(_Q)" -#: src/diffuse/main.py:796 +#: src/diffuse/main.py:804 msgid "_Edit" msgstr "編集(_E)" -#: src/diffuse/main.py:797 +#: src/diffuse/main.py:805 msgid "_Undo" msgstr "元に戻す(_U)" -#: src/diffuse/main.py:798 +#: src/diffuse/main.py:806 msgid "_Redo" msgstr "やり直す(_R)" -#: src/diffuse/main.py:800 +#: src/diffuse/main.py:808 msgid "Cu_t" msgstr "切り取り(_T)" -#: src/diffuse/main.py:801 +#: src/diffuse/main.py:809 msgid "_Copy" msgstr "コピー(_C)" -#: src/diffuse/main.py:802 +#: src/diffuse/main.py:810 msgid "_Paste" msgstr "貼り付け(_P)" -#: src/diffuse/main.py:804 +#: src/diffuse/main.py:812 msgid "Select _All" msgstr "全て選択(_A)" -#: src/diffuse/main.py:805 +#: src/diffuse/main.py:813 msgid "C_lear Edits" msgstr "編集をクリア(_L)" -#: src/diffuse/main.py:806 +#: src/diffuse/main.py:814 msgid "_Dismiss All Edits" msgstr "全ての編集を破棄(_D)" -#: src/diffuse/main.py:808 +#: src/diffuse/main.py:816 msgid "_Find..." msgstr "検索...(_F)" -#: src/diffuse/main.py:809 +#: src/diffuse/main.py:817 msgid "Find _Next" msgstr "次の検索(_N)" -#: src/diffuse/main.py:810 +#: src/diffuse/main.py:818 msgid "Find Pre_vious" msgstr "前の検索(_V)" -#: src/diffuse/main.py:811 +#: src/diffuse/main.py:819 msgid "_Go To Line..." msgstr "指定行へジャンプ...(_G)" -#: src/diffuse/main.py:813 +#: src/diffuse/main.py:821 msgid "Pr_eferences..." msgstr "設定...(_E)" -#: src/diffuse/main.py:817 +#: src/diffuse/main.py:825 msgid "None" msgstr "なし" -#: src/diffuse/main.py:835 +#: src/diffuse/main.py:843 msgid "_View" msgstr "表示(_V)" -#: src/diffuse/main.py:836 +#: src/diffuse/main.py:844 msgid "_Syntax Highlighting" msgstr "構文の強調表示(_S)" -#: src/diffuse/main.py:838 +#: src/diffuse/main.py:846 msgid "Re_align All" msgstr "全て再整列(_A)" -#: src/diffuse/main.py:839 +#: src/diffuse/main.py:847 msgid "_Isolate" msgstr "分離(_I)" -#: src/diffuse/main.py:841 +#: src/diffuse/main.py:849 msgid "_First Difference" msgstr "最初の差分(_F)" -#: src/diffuse/main.py:842 +#: src/diffuse/main.py:850 msgid "_Previous Difference" msgstr "前の差分(_P)" -#: src/diffuse/main.py:843 +#: src/diffuse/main.py:851 msgid "_Next Difference" msgstr "次の差分(_N)" -#: src/diffuse/main.py:844 +#: src/diffuse/main.py:852 msgid "_Last Difference" msgstr "最後の差分(_L)" -#: src/diffuse/main.py:846 +#: src/diffuse/main.py:854 msgid "Fir_st Tab" msgstr "最初のタブ(_S)" -#: src/diffuse/main.py:847 +#: src/diffuse/main.py:855 msgid "Pre_vious Tab" msgstr "前のタブ(_V)" -#: src/diffuse/main.py:848 +#: src/diffuse/main.py:856 msgid "Next _Tab" msgstr "次のタブ(_T)" -#: src/diffuse/main.py:849 +#: src/diffuse/main.py:857 msgid "Las_t Tab" msgstr "最後のタブ(_T)" -#: src/diffuse/main.py:851 +#: src/diffuse/main.py:859 msgid "Shift Pane _Right" msgstr "枠を右に動かす(_R)" -#: src/diffuse/main.py:852 +#: src/diffuse/main.py:860 msgid "Shift Pane _Left" msgstr "枠を左に動かす(_L)" -#: src/diffuse/main.py:855 +#: src/diffuse/main.py:863 msgid "F_ormat" msgstr "フォーマット(_O)" -#: src/diffuse/main.py:856 +#: src/diffuse/main.py:864 msgid "Convert To _Upper Case" msgstr "大文字に変換(_U)" -#: src/diffuse/main.py:857 +#: src/diffuse/main.py:865 msgid "Convert To _Lower Case" msgstr "小文字に変換(_L)" -#: src/diffuse/main.py:859 +#: src/diffuse/main.py:867 msgid "Sort Lines In _Ascending Order" msgstr "行を昇順に並べる(_A)" -#: src/diffuse/main.py:860 +#: src/diffuse/main.py:868 msgid "Sort Lines In D_escending Order" msgstr "行を降順に並べる(_E)" -#: src/diffuse/main.py:862 +#: src/diffuse/main.py:870 msgid "Remove Trailing _White Space" msgstr "末尾の空白を削除(_W)" -#: src/diffuse/main.py:863 +#: src/diffuse/main.py:871 msgid "Convert Tabs To _Spaces" msgstr "タブをスペースに変換(_S)" -#: src/diffuse/main.py:864 +#: src/diffuse/main.py:872 msgid "Convert Leading Spaces To _Tabs" msgstr "先頭のスペースをタブに変換(_T)" -#: src/diffuse/main.py:866 +#: src/diffuse/main.py:874 msgid "_Increase Indenting" msgstr "インデントを増やす(_I)" -#: src/diffuse/main.py:867 +#: src/diffuse/main.py:875 msgid "De_crease Indenting" msgstr "インデントを減らす(_C)" -#: src/diffuse/main.py:869 +#: src/diffuse/main.py:877 msgid "Convert To _DOS Format" msgstr "DOS 形式に変換(_D)" -#: src/diffuse/main.py:870 +#: src/diffuse/main.py:878 msgid "Convert To _Mac Format" msgstr "Mac 形式に変換(_M)" -#: src/diffuse/main.py:871 +#: src/diffuse/main.py:879 msgid "Convert To Uni_x Format" msgstr "Unix 形式に変換(_X)" -#: src/diffuse/main.py:874 +#: src/diffuse/main.py:882 msgid "_Merge" msgstr "マージ(_M)" -#: src/diffuse/main.py:875 +#: src/diffuse/main.py:883 msgid "Copy Selection _Right" msgstr "選択を右にコピー(_R)" -#: src/diffuse/main.py:876 +#: src/diffuse/main.py:884 msgid "Copy Selection _Left" msgstr "選択を左にコピー(_L)" -#: src/diffuse/main.py:878 +#: src/diffuse/main.py:886 msgid "Copy Left _Into Selection" msgstr "左から選択枠にコピー(_I)" -#: src/diffuse/main.py:879 +#: src/diffuse/main.py:887 msgid "Copy Right I_nto Selection" msgstr "右から選択枠にコピー(_N)" -#: src/diffuse/main.py:880 +#: src/diffuse/main.py:888 msgid "_Merge From Left Then Right" msgstr "左からマージした後、右からマージ(_M)" -#: src/diffuse/main.py:881 +#: src/diffuse/main.py:889 msgid "M_erge From Right Then Left" msgstr "右からマージした後、左からマージ(_E)" -#: src/diffuse/main.py:884 +#: src/diffuse/main.py:892 msgid "_Help" msgstr "ヘルプ(_H)" -#: src/diffuse/main.py:885 +#: src/diffuse/main.py:893 msgid "_Help Contents..." msgstr "ヘルプの目次...(_H)" -#: src/diffuse/main.py:887 +#: src/diffuse/main.py:895 #, python-format msgid "_About %s..." msgstr "%s について...(_A)" -#: src/diffuse/main.py:902 +#: src/diffuse/main.py:910 msgid "New 2-Way File Merge" msgstr "新しい２つのファイルの比較" -#: src/diffuse/main.py:903 +#: src/diffuse/main.py:911 msgid "New 3-Way File Merge" msgstr "新しい３つのファイルの比較" -#: src/diffuse/main.py:905 +#: src/diffuse/main.py:913 msgid "Realign All" msgstr "全て再整列" -#: src/diffuse/main.py:906 +#: src/diffuse/main.py:914 msgid "First Difference" msgstr "最初の差分" -#: src/diffuse/main.py:907 +#: src/diffuse/main.py:915 msgid "Previous Difference" msgstr "前の差分" -#: src/diffuse/main.py:908 +#: src/diffuse/main.py:916 msgid "Next Difference" msgstr "次の差分" -#: src/diffuse/main.py:909 +#: src/diffuse/main.py:917 msgid "Last Difference" msgstr "最後の差分" -#: src/diffuse/main.py:911 +#: src/diffuse/main.py:919 msgid "Copy Selection Right" msgstr "選択を右にコピー" -#: src/diffuse/main.py:912 +#: src/diffuse/main.py:920 msgid "Copy Selection Left" msgstr "選択を左にコピー" -#: src/diffuse/main.py:913 +#: src/diffuse/main.py:921 msgid "Copy Left Into Selection" msgstr "左から選択枠にコピー" -#: src/diffuse/main.py:914 +#: src/diffuse/main.py:922 msgid "Copy Right Into Selection" msgstr "右から選択枠にコピー" -#: src/diffuse/main.py:915 +#: src/diffuse/main.py:923 msgid "Merge From Left Then Right" msgstr "左からマージした後、右からマージ" -#: src/diffuse/main.py:916 +#: src/diffuse/main.py:924 msgid "Merge From Right Then Left" msgstr "右からマージした後、左からマージ" -#: src/diffuse/main.py:918 +#: src/diffuse/main.py:926 msgid "Undo" msgstr "元に戻す" -#: src/diffuse/main.py:919 +#: src/diffuse/main.py:927 msgid "Redo" msgstr "やり直す" -#: src/diffuse/main.py:920 src/diffuse/widgets.py:1847 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 msgid "Cut" msgstr "切り取り" -#: src/diffuse/main.py:921 src/diffuse/widgets.py:1848 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 msgid "Copy" msgstr "コピー" -#: src/diffuse/main.py:922 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 msgid "Paste" msgstr "貼り付け" -#: src/diffuse/main.py:923 src/diffuse/widgets.py:1852 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 msgid "Clear Edits" msgstr "編集をクリア" -#: src/diffuse/main.py:1046 +#: src/diffuse/main.py:1054 msgid "Some files have unsaved changes. Select the files to save before closing." msgstr "" "変更が保存されていないファイルがあります。終了前に保存するファイルを選択します。" -#: src/diffuse/main.py:1060 +#: src/diffuse/main.py:1068 msgid "Tab" msgstr "タブ" -#: src/diffuse/main.py:1065 +#: src/diffuse/main.py:1073 msgid "Pane" msgstr "枠" -#: src/diffuse/main.py:1076 +#: src/diffuse/main.py:1084 msgid "Close _Without Saving" msgstr "保存せずに閉じる(_W)" -#: src/diffuse/main.py:1115 +#: src/diffuse/main.py:1123 #, python-format msgid "Closing this tab will quit %s." msgstr "このタブを閉じると、%sは終了します。" -#: src/diffuse/main.py:1198 +#: src/diffuse/main.py:1206 #, python-format msgid "File Merge %d" msgstr "ファイルマージ%d" -#: src/diffuse/main.py:1304 +#: src/diffuse/main.py:1312 #, python-format msgid "Error retrieving commits for %s." msgstr "%s のコミットの取得中にエラーが生じました。" -#: src/diffuse/main.py:1336 +#: src/diffuse/main.py:1344 #, python-format msgid "Error retrieving modifications for %s." msgstr "%s の変更の取得中にエラーが生じました。" -#: src/diffuse/main.py:1369 +#: src/diffuse/main.py:1377 msgid "Open File In New Tab" msgstr "新しいタブにファイルを開く" -#: src/diffuse/main.py:1392 +#: src/diffuse/main.py:1400 msgid "Choose Folder With Modified Files" msgstr "変更なったファイルがあるフォルダを選択" -#: src/diffuse/main.py:1410 +#: src/diffuse/main.py:1418 msgid "No modified files found." msgstr "変更なったファイルが見つかりませんでした。" -#: src/diffuse/main.py:1416 +#: src/diffuse/main.py:1424 msgid "Choose Folder With Commit" msgstr "コミットがあるフォルダを選択" -#: src/diffuse/main.py:1436 +#: src/diffuse/main.py:1444 msgid "No committed files found." msgstr "コミットされたファイルが見つかりませんでした。" -#: src/diffuse/main.py:1472 +#: src/diffuse/main.py:1480 msgid "New N-Way File Merge..." msgstr "新しい複数のファイルの比較..." -#: src/diffuse/main.py:1473 +#: src/diffuse/main.py:1481 msgid "Number of panes: " msgstr "枠の数: " -#: src/diffuse/main.py:1547 +#: src/diffuse/main.py:1555 msgid "Phrase not found. Continue from the end of the file?" msgstr "文字列が見つかりませんでした。ファイルの終わりから続けますか。" -#: src/diffuse/main.py:1549 +#: src/diffuse/main.py:1557 msgid "Phrase not found. Continue from the start of the file?" msgstr "文字列が見つかりませんでした。ファイルの始めから続けますか。" -#: src/diffuse/main.py:1770 +#: src/diffuse/main.py:1778 #, fuzzy msgid "" "Usage:\n" @@ -701,176 +671,176 @@ msgstr "" " ( -i | --ignore-case ) 大文字小文字の違いを無視\n" " ( -w | --ignore-all-space ) 空白の違いを無視" -#: src/diffuse/main.py:1937 +#: src/diffuse/main.py:1945 msgid "Error parsing line number." msgstr "行番号をパースする際にエラーが生じました。" -#: src/diffuse/main.py:1947 +#: src/diffuse/main.py:1955 #, python-format msgid "Skipping unknown argument \"%s\"." msgstr "未知の引数「%s」を飛ばします。" -#: src/diffuse/main.py:1955 +#: src/diffuse/main.py:1963 #, python-format msgid "Error processing argument \"%s\". Directory not expected." msgstr "" "%s の引数を処理しているときにエラーが生じました。ディレクトリは予測できませんでし" "た。" -#: src/diffuse/preferences.py:79 +#: src/diffuse/preferences.py:80 msgid "Display" msgstr "表示" -#: src/diffuse/preferences.py:82 +#: src/diffuse/preferences.py:83 msgid "Font" msgstr "フォント" -#: src/diffuse/preferences.py:83 +#: src/diffuse/preferences.py:84 msgid "Tab width" msgstr "タブの幅" -#: src/diffuse/preferences.py:84 +#: src/diffuse/preferences.py:85 msgid "Show right margin" msgstr "右マージンを表示" -#: src/diffuse/preferences.py:85 +#: src/diffuse/preferences.py:86 msgid "Right margin" msgstr "右マージン" -#: src/diffuse/preferences.py:86 +#: src/diffuse/preferences.py:87 msgid "Show line numbers" msgstr "行番号を表示" -#: src/diffuse/preferences.py:87 +#: src/diffuse/preferences.py:88 msgid "Show white space characters" msgstr "空白文字を表示" -#: src/diffuse/preferences.py:88 +#: src/diffuse/preferences.py:89 msgid "Ignore case differences" msgstr "大文字小文字の違いを無視" -#: src/diffuse/preferences.py:89 +#: src/diffuse/preferences.py:90 msgid "Ignore white space differences" msgstr "空白の違いを無視" -#: src/diffuse/preferences.py:90 src/diffuse/preferences.py:99 +#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100 msgid "Ignore changes to white space" msgstr "空白の変更を無視" -#: src/diffuse/preferences.py:91 +#: src/diffuse/preferences.py:92 msgid "Ignore blank line differences" msgstr "空白行の違いを無視" -#: src/diffuse/preferences.py:92 +#: src/diffuse/preferences.py:93 msgid "Ignore end of line differences" msgstr "行の最後の違いを無視" -#: src/diffuse/preferences.py:94 +#: src/diffuse/preferences.py:95 msgid "Alignment" msgstr "整列" -#: src/diffuse/preferences.py:97 +#: src/diffuse/preferences.py:98 msgid "Ignore case" msgstr "大文字小文字を無視" -#: src/diffuse/preferences.py:98 +#: src/diffuse/preferences.py:99 msgid "Ignore white space" msgstr "空白を無視" -#: src/diffuse/preferences.py:100 +#: src/diffuse/preferences.py:101 msgid "Ignore blank lines" msgstr "空白行を無視" -#: src/diffuse/preferences.py:101 +#: src/diffuse/preferences.py:102 msgid "Ignore end of line characters" msgstr "行の最後の文字を無視" -#: src/diffuse/preferences.py:103 +#: src/diffuse/preferences.py:104 msgid "Editor" msgstr "エディタ" -#: src/diffuse/preferences.py:106 +#: src/diffuse/preferences.py:107 msgid "Auto indent" msgstr "自動インデント" -#: src/diffuse/preferences.py:107 +#: src/diffuse/preferences.py:108 msgid "Expand tabs to spaces" msgstr "タブの代わりに空白を挿入" -#: src/diffuse/preferences.py:108 +#: src/diffuse/preferences.py:109 msgid "Soft tab width" msgstr "ソフトタブの幅" -#: src/diffuse/preferences.py:110 +#: src/diffuse/preferences.py:111 msgid "Tabs" msgstr "タブ" -#: src/diffuse/preferences.py:113 +#: src/diffuse/preferences.py:114 msgid "Default panes" msgstr "枠のデフォルトの数" -#: src/diffuse/preferences.py:114 +#: src/diffuse/preferences.py:115 msgid "Always show the tab bar" msgstr "常にタブバーを表示" -#: src/diffuse/preferences.py:115 +#: src/diffuse/preferences.py:116 #, python-format msgid "Warn me when closing a tab will quit %s" msgstr "タブを閉じるとき、%s を終了すると警告" -#: src/diffuse/preferences.py:117 +#: src/diffuse/preferences.py:118 msgid "Regional Settings" msgstr "地域設定" -#: src/diffuse/preferences.py:120 +#: src/diffuse/preferences.py:121 msgid "Default codec" msgstr "デフォルトのコーデック" -#: src/diffuse/preferences.py:121 +#: src/diffuse/preferences.py:122 msgid "Order of codecs used to identify encoding" msgstr "エンコーディングを特定するためのコーデックの優先順位" -#: src/diffuse/preferences.py:142 +#: src/diffuse/preferences.py:143 msgid "Cygwin" msgstr "Cygwin" -#: src/diffuse/preferences.py:144 +#: src/diffuse/preferences.py:145 msgid "Root directory" msgstr "ルートディレクトリ" -#: src/diffuse/preferences.py:145 +#: src/diffuse/preferences.py:146 msgid "Cygdrive prefix" msgstr "Cygdrive 接頭辞" -#: src/diffuse/preferences.py:164 +#: src/diffuse/preferences.py:165 msgid "Version control system search order" msgstr "" -#: src/diffuse/preferences.py:172 +#: src/diffuse/preferences.py:173 msgid "\"co\" command" msgstr "co というコマンド" -#: src/diffuse/preferences.py:173 +#: src/diffuse/preferences.py:174 msgid "\"rlog\" command" msgstr "rlog というコマンド" -#: src/diffuse/preferences.py:175 +#: src/diffuse/preferences.py:176 msgid "Command" msgstr "コマンド" -#: src/diffuse/preferences.py:181 +#: src/diffuse/preferences.py:182 msgid "Launch from a Bash login shell" msgstr "Bashログインシェルから始める" -#: src/diffuse/preferences.py:188 +#: src/diffuse/preferences.py:189 msgid "Update paths for Cygwin" msgstr "Cygwin のためにパスを更新" -#: src/diffuse/preferences.py:193 +#: src/diffuse/preferences.py:194 msgid "Version Control" msgstr "バージョンコントロール" -#: src/diffuse/preferences.py:258 +#: src/diffuse/preferences.py:259 msgid "Preferences" msgstr "設定" @@ -902,7 +872,7 @@ msgstr "" #: src/diffuse/resources.py:409 #, python-brace-format -msgid "Options \"{option}\" is unknown" +msgid "Option \"{option}\" is unknown" msgstr "" #: src/diffuse/resources.py:416 @@ -955,40 +925,70 @@ msgstr "{file} の {line}行 を処理しているときにエラーが生じま msgid "Unhandled error at line {line} of {file}." msgstr "{file} の {line}行 を処理しているときにエラーが生じました。" -#: src/diffuse/utils.py:63 +#: src/diffuse/utils.py:66 msgid "Auto Detect" msgstr "自動検出" -#: src/diffuse/vcs/cvs.py:53 src/diffuse/vcs/rcs.py:62 src/diffuse/vcs/svn.py:95 +#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97 #, python-format msgid "Error parsing revision %s." msgstr "%s というリビジョンをパースする際にエラーが生じました。" -#: src/diffuse/vcs/vcs_registry.py:233 +#: src/diffuse/vcs/vcs_registry.py:238 #, python-format msgid "Error parsing %s." msgstr "%s をパースする際にエラーが生じました。" -#: src/diffuse/widgets.py:1843 +#: src/diffuse/widgets.py:1845 msgid "Align with Selection" msgstr "選択と整列" -#: src/diffuse/widgets.py:1844 +#: src/diffuse/widgets.py:1846 msgid "Isolate" msgstr "分離" -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1847 msgid "Merge Selection" msgstr "選択をマージ" -#: src/diffuse/widgets.py:1851 +#: src/diffuse/widgets.py:1853 msgid "Select All" msgstr "全て選択" -#: src/diffuse/widgets.py:1854 +#: src/diffuse/widgets.py:1856 msgid "Swap with Selected Pane" msgstr "選択された枠と交換" +#, fuzzy +#~ msgid "" +#~ "This program is free software; you can redistribute it and/or modify\n" +#~ "it under the terms of the GNU General Public License as published by\n" +#~ "the Free Software Foundation; either version 2 of the License, or\n" +#~ "(at your option) any later version.\n" +#~ "\n" +#~ "This program is distributed in the hope that it will be useful,\n" +#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +#~ "GNU General Public License for more details.\n" +#~ "\n" +#~ "You should have received a copy of the GNU General Public License along\n" +#~ "with this program; if not, write to the Free Software Foundation, Inc.,\n" +#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." +#~ msgstr "" +#~ "このプログラムはフリーソフトウェアです。あなたはこれを、フリーソフトウェア財団" +#~ "によって発行された GNU 一般公衆利用許諾契約書(バージョン2か、希望によってはそれ" +#~ "以降のバージョンのうちどれか)の定める条件の下で再頒布または改変することができま" +#~ "す。\n" +#~ "\n" +#~ "このプログラムは有用であることを願って頒布されますが、*全くの無保証*です。商業" +#~ "可能性の保証や特定の目的への適合性は、言外に示されたものも含め全く存在しませ" +#~ "ん。詳しくはGNU 一般公衆利用許諾契約書をご覧ください。\n" +#~ "\n" +#~ "あなたはこのプログラムと共に、GNU 一般公衆利用許諾契約書の複製物を一部受け取っ" +#~ "たはずです。もし受け取っていなければ、フリーソフトウェア財団まで請求してくださ" +#~ "い(宛先は the Free Software Foundation, Inc., 59 Temple Place, Suite 330, " +#~ "Boston, MA 02111-1307 USA)。\n" + #~ msgid "Diffuse Merge Tool" #~ msgstr "Diffuse マージツール" diff --git a/po/ko.po b/po/ko.po index 5ffda66..559a8e5 100644 --- a/po/ko.po +++ b/po/ko.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn r316\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-27 21:56-0500\n" -"PO-Revision-Date: 2020-06-29 14:49-0400\n" +"POT-Creation-Date: 2022-04-04 12:14-0400\n" +"PO-Revision-Date: 2022-04-04 12:18-0400\n" "Last-Translator: Kang Bundo \n" "Language-Team: Korean\n" "Language: ko\n" @@ -16,6 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 3.0.1\n" #: data/io.github.mightycreak.Diffuse.desktop.in:3 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:4 @@ -38,7 +39,7 @@ msgstr "" msgid "Main window: diff between two files" msgstr "" -#: src/diffuse/constants.py:24 +#: src/diffuse/constants.py:25 msgid "Copyright" msgstr "" @@ -50,35 +51,6 @@ msgstr "Diffuse는 텍스트 파일을 병합하고 비교하기 위한 그래 msgid "translator-credits" msgstr "강분도 " -#: src/diffuse/dialogs.py:49 -#, fuzzy -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License along\n" -"with this program; if not, write to the Free Software Foundation, Inc.,\n" -"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." -msgstr "" -"이 프로그램은 자유 소프트웨어입니다. 당신은 이것을 자유 소프트웨어 재단에 의해 발" -"행된 GNU 일반 공중 사용 허가서 (버전 2, 희망은 이후 버전 중 하나)을 결정하는 조건 " -"하에서 재배포 또는 수정 할 수 있습니다.\n" -"\n" -"본 프로그램은 도움이 될 것이라는 희망 배포되지만, * 완전한 무보증 *입니다. 상업적" -"인 가능성의 보증이나 특정 목적에의 적합성은 안다 보이는 것도 포함 전혀 존재하지 않" -"습니다. 자세한 사항은 GNU 일반 공중 사용 허가서를 참조하십시오.\n" -"\n" -"당신은이 프로그램과 함께 GNU 일반 공중 사용 허가서의 복제물을 일부받은 것입니다. " -"만약받지면 자유 소프트웨어 재단으로 문의하시기 바랍니다 (주소는 the Free Software " -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA).\n" - #: src/diffuse/dialogs.py:83 msgid "Encoding: " msgstr "인코딩: " @@ -93,7 +65,7 @@ msgstr "찾기..." #: src/diffuse/dialogs.py:159 msgid "Search For: " -msgstr "검색 문자열:" +msgstr "검색 문자열: " #: src/diffuse/dialogs.py:184 msgid "Match Case" @@ -103,60 +75,60 @@ msgstr "대소문자 구분" msgid "Search Backwards" msgstr "위 방향으로 검색" -#: src/diffuse/main.py:79 +#: src/diffuse/main.py:85 msgid "Close Tab" msgstr "탭 닫기" -#: src/diffuse/main.py:124 +#: src/diffuse/main.py:132 msgid "Open File..." msgstr "열기..." -#: src/diffuse/main.py:125 +#: src/diffuse/main.py:133 msgid "Reload File" msgstr "파일을 다시 읽기" -#: src/diffuse/main.py:126 +#: src/diffuse/main.py:134 msgid "Save File" msgstr "파일로 저장" -#: src/diffuse/main.py:127 +#: src/diffuse/main.py:135 msgid "Save File As..." msgstr "파일로 저장..." -#: src/diffuse/main.py:280 +#: src/diffuse/main.py:288 msgid "Save changes before loading the new file?" msgstr "새 파일을 불러오기 전에 변경된 데이터를 저장할까요?" -#: src/diffuse/main.py:391 +#: src/diffuse/main.py:399 #, python-format msgid "Error reading revision %(rev)s of %(file)s." msgstr "%(file)s %(rev)s는 수정된점을 가져올 때 오류가 발생했습니다." -#: src/diffuse/main.py:394 src/diffuse/main.py:1849 +#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #, python-format msgid "Error reading %s." msgstr "%s를 읽어올 때 오류가 발생했습니다." -#: src/diffuse/main.py:416 +#: src/diffuse/main.py:424 msgid "Open File" msgstr "열기" -#: src/diffuse/main.py:473 +#: src/diffuse/main.py:481 #, python-format msgid "The file %s changed on disk. Do you want to reload the file?" msgstr "%s 파일이 변경된 것 같습니다. 해당 파일을 다시 불러 오시겠습니까?" -#: src/diffuse/main.py:499 +#: src/diffuse/main.py:507 #, python-format msgid "Save %(title)s Pane %(pane)d" msgstr "%(title)s %(pane)d번째 프레임을 저장" -#: src/diffuse/main.py:531 +#: src/diffuse/main.py:539 #, python-format msgid "A file named %s already exists. Do you want to overwrite it?" msgstr "%s라는 파일이 이미 있습니다. 그것을 덮어 쓰시겠습니까?" -#: src/diffuse/main.py:538 +#: src/diffuse/main.py:546 #, python-format msgid "" "The file %s has been modified by another process since reading it. If you save, " @@ -165,25 +137,25 @@ msgstr "" "%s 파일은 수정되었습니다. 저장하게되면 이러한 변경 내용이 손실될 수 있습니다. 저장" "하시겠습니까?" -#: src/diffuse/main.py:580 +#: src/diffuse/main.py:588 #, python-format msgid "Error encoding to %s." msgstr "%s 바꾸는 데 오류가 발생했습니다." -#: src/diffuse/main.py:584 src/diffuse/preferences.py:298 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 #, python-format msgid "Error writing %s." msgstr "%s에 쓸 때 오류가 발생했습니다." -#: src/diffuse/main.py:614 +#: src/diffuse/main.py:622 msgid "Go To Line..." msgstr "줄로 이동..." -#: src/diffuse/main.py:615 +#: src/diffuse/main.py:623 msgid "Line Number: " msgstr "줄번호: " -#: src/diffuse/main.py:646 +#: src/diffuse/main.py:654 msgid "" "Press the enter key or double click to edit. Press the space bar or use the RMB " "menu to manually align." @@ -191,11 +163,11 @@ msgstr "" "편집하려면 엔터키를 누르거나 두 번 클릭합니다. 수동으로 정렬하기 위해 스페이스 바" "를 누르거나, RMB를 사용합니다." -#: src/diffuse/main.py:650 +#: src/diffuse/main.py:658 msgid "Press the escape key to finish editing." msgstr "ESC 키를 눌러 편집을 끝냅니다." -#: src/diffuse/main.py:653 +#: src/diffuse/main.py:661 msgid "" "Select target line and press the space bar to align. Press the escape key to " "cancel." @@ -203,425 +175,425 @@ msgstr "" "목표 행을 선택하고 스페이스 바를 누르면 정렬합니다. 취소하려면 ESC 키를 누르십시" "오." -#: src/diffuse/main.py:776 +#: src/diffuse/main.py:784 msgid "_File" msgstr "파일(_F)" -#: src/diffuse/main.py:777 +#: src/diffuse/main.py:785 msgid "_Open File..." msgstr "파일 열기...(_O)" -#: src/diffuse/main.py:778 +#: src/diffuse/main.py:786 msgid "Open File In New _Tab..." msgstr "새 탭에서 열기...(_T)" -#: src/diffuse/main.py:779 +#: src/diffuse/main.py:787 msgid "Open _Modified Files..." msgstr "변경 파일 열기...(_M)" -#: src/diffuse/main.py:780 +#: src/diffuse/main.py:788 msgid "Open Commi_t..." msgstr "커밋 열기..." -#: src/diffuse/main.py:781 +#: src/diffuse/main.py:789 msgid "_Reload File" msgstr "파일 다시 읽기(_R)" -#: src/diffuse/main.py:783 +#: src/diffuse/main.py:791 msgid "_Save File" msgstr "파일 저장(_S)" -#: src/diffuse/main.py:784 +#: src/diffuse/main.py:792 msgid "Save File _As..." msgstr "파일로 저장...(_A)" -#: src/diffuse/main.py:785 +#: src/diffuse/main.py:793 msgid "Save A_ll" msgstr "전체 저장(_L)" -#: src/diffuse/main.py:787 +#: src/diffuse/main.py:795 msgid "New _2-Way File Merge" msgstr "새로운 2개의 파일 비교(_2)" -#: src/diffuse/main.py:788 +#: src/diffuse/main.py:796 msgid "New _3-Way File Merge" msgstr "새로운 3개의 파일 비교(_3)" -#: src/diffuse/main.py:789 +#: src/diffuse/main.py:797 msgid "New _N-Way File Merge..." msgstr "새로운 여러개의 파일 비교...(_N)" -#: src/diffuse/main.py:791 +#: src/diffuse/main.py:799 msgid "_Close Tab" msgstr "탭 닫기(_C)" -#: src/diffuse/main.py:792 +#: src/diffuse/main.py:800 msgid "_Undo Close Tab" msgstr "탭 닫기 취소(_U)" -#: src/diffuse/main.py:793 +#: src/diffuse/main.py:801 msgid "_Quit" msgstr "종료(_Q)" -#: src/diffuse/main.py:796 +#: src/diffuse/main.py:804 msgid "_Edit" msgstr "편집(_E)" -#: src/diffuse/main.py:797 +#: src/diffuse/main.py:805 msgid "_Undo" msgstr "실행 취소(_U)" -#: src/diffuse/main.py:798 +#: src/diffuse/main.py:806 msgid "_Redo" msgstr "다시(_R)" -#: src/diffuse/main.py:800 +#: src/diffuse/main.py:808 msgid "Cu_t" msgstr "잘라내기(_T)" -#: src/diffuse/main.py:801 +#: src/diffuse/main.py:809 msgid "_Copy" msgstr "복사(_C)" -#: src/diffuse/main.py:802 +#: src/diffuse/main.py:810 msgid "_Paste" msgstr "붙여넣기(_P)" -#: src/diffuse/main.py:804 +#: src/diffuse/main.py:812 msgid "Select _All" msgstr "모두 선택(_A)" -#: src/diffuse/main.py:805 +#: src/diffuse/main.py:813 msgid "C_lear Edits" msgstr "편집 삭제(_L)" -#: src/diffuse/main.py:806 +#: src/diffuse/main.py:814 msgid "_Dismiss All Edits" msgstr "모든 편집을 취소(_D)" -#: src/diffuse/main.py:808 +#: src/diffuse/main.py:816 msgid "_Find..." msgstr "찾기...(_F)" -#: src/diffuse/main.py:809 +#: src/diffuse/main.py:817 msgid "Find _Next" msgstr "다음 찾기(_N)" -#: src/diffuse/main.py:810 +#: src/diffuse/main.py:818 msgid "Find Pre_vious" msgstr "이전 찾기(_V)" -#: src/diffuse/main.py:811 +#: src/diffuse/main.py:819 msgid "_Go To Line..." msgstr "줄로 이동...(_G)" -#: src/diffuse/main.py:813 +#: src/diffuse/main.py:821 msgid "Pr_eferences..." msgstr "기본 설정...(_E)" -#: src/diffuse/main.py:817 +#: src/diffuse/main.py:825 msgid "None" msgstr "없음" -#: src/diffuse/main.py:835 +#: src/diffuse/main.py:843 msgid "_View" msgstr "보기(_V)" -#: src/diffuse/main.py:836 +#: src/diffuse/main.py:844 msgid "_Syntax Highlighting" msgstr "구문 강조(_S)" -#: src/diffuse/main.py:838 +#: src/diffuse/main.py:846 msgid "Re_align All" msgstr "전체 다시 정렬(_A)" -#: src/diffuse/main.py:839 +#: src/diffuse/main.py:847 msgid "_Isolate" msgstr "분리(_I)" -#: src/diffuse/main.py:841 +#: src/diffuse/main.py:849 msgid "_First Difference" msgstr "첫번째 차이(_F)" -#: src/diffuse/main.py:842 +#: src/diffuse/main.py:850 msgid "_Previous Difference" msgstr "이전 차이(_P)" -#: src/diffuse/main.py:843 +#: src/diffuse/main.py:851 msgid "_Next Difference" msgstr "다음 차이(_N)" -#: src/diffuse/main.py:844 +#: src/diffuse/main.py:852 msgid "_Last Difference" msgstr "마지막 차이(_L)" -#: src/diffuse/main.py:846 +#: src/diffuse/main.py:854 msgid "Fir_st Tab" msgstr "첫번째 탭(_S)" -#: src/diffuse/main.py:847 +#: src/diffuse/main.py:855 msgid "Pre_vious Tab" msgstr "이전 탭으로(_V)" -#: src/diffuse/main.py:848 +#: src/diffuse/main.py:856 msgid "Next _Tab" msgstr "다음 탭으로(_T)" -#: src/diffuse/main.py:849 +#: src/diffuse/main.py:857 msgid "Las_t Tab" msgstr "마지막 탭(_T)" -#: src/diffuse/main.py:851 +#: src/diffuse/main.py:859 msgid "Shift Pane _Right" msgstr "페널을 오른쪽으로 이동(_R)" -#: src/diffuse/main.py:852 +#: src/diffuse/main.py:860 msgid "Shift Pane _Left" msgstr "페널을 왼쪽으로 이동(_L)" -#: src/diffuse/main.py:855 +#: src/diffuse/main.py:863 msgid "F_ormat" msgstr "형식(_O)" -#: src/diffuse/main.py:856 +#: src/diffuse/main.py:864 msgid "Convert To _Upper Case" msgstr "대문자로 변환(_U)" -#: src/diffuse/main.py:857 +#: src/diffuse/main.py:865 msgid "Convert To _Lower Case" msgstr "소문자로 변환(_L)" -#: src/diffuse/main.py:859 +#: src/diffuse/main.py:867 msgid "Sort Lines In _Ascending Order" msgstr "행을 오름차순으로 정렬(_A)" -#: src/diffuse/main.py:860 +#: src/diffuse/main.py:868 msgid "Sort Lines In D_escending Order" msgstr "행을 내림차순으로 정렬(_E)" -#: src/diffuse/main.py:862 +#: src/diffuse/main.py:870 msgid "Remove Trailing _White Space" msgstr "후행 공백을 제거(_W)" -#: src/diffuse/main.py:863 +#: src/diffuse/main.py:871 msgid "Convert Tabs To _Spaces" msgstr "탭을 공백으로 변환(_S)" -#: src/diffuse/main.py:864 +#: src/diffuse/main.py:872 msgid "Convert Leading Spaces To _Tabs" msgstr "선행 공백을 탭으로 변환(_T)" -#: src/diffuse/main.py:866 +#: src/diffuse/main.py:874 msgid "_Increase Indenting" msgstr "들여쓰기(_I)" -#: src/diffuse/main.py:867 +#: src/diffuse/main.py:875 msgid "De_crease Indenting" msgstr "내어 쓰기(_C)" -#: src/diffuse/main.py:869 +#: src/diffuse/main.py:877 msgid "Convert To _DOS Format" msgstr "DOS 형식으로 변환(_D)" -#: src/diffuse/main.py:870 +#: src/diffuse/main.py:878 msgid "Convert To _Mac Format" msgstr "Mac 형식으로 변환(_M)" -#: src/diffuse/main.py:871 +#: src/diffuse/main.py:879 msgid "Convert To Uni_x Format" msgstr "Unix 형식으로 변환(_X)" -#: src/diffuse/main.py:874 +#: src/diffuse/main.py:882 msgid "_Merge" msgstr "병합(_M)" -#: src/diffuse/main.py:875 +#: src/diffuse/main.py:883 msgid "Copy Selection _Right" msgstr "선택을 오른쪽으로 복사(_R)" -#: src/diffuse/main.py:876 +#: src/diffuse/main.py:884 msgid "Copy Selection _Left" msgstr "선택을 왼쪽으로 복사(_L)" -#: src/diffuse/main.py:878 +#: src/diffuse/main.py:886 msgid "Copy Left _Into Selection" msgstr "왼쪽에서 선택한 프레임에 복사(_I)" -#: src/diffuse/main.py:879 +#: src/diffuse/main.py:887 msgid "Copy Right I_nto Selection" msgstr "오른쪽에서 선택한 프레임에 복사(_N)" -#: src/diffuse/main.py:880 +#: src/diffuse/main.py:888 msgid "_Merge From Left Then Right" msgstr "왼쪽에서 합병 후 오른쪽에서 병합(_M)" -#: src/diffuse/main.py:881 +#: src/diffuse/main.py:889 msgid "M_erge From Right Then Left" msgstr "오른쪽에서 병합 후 왼쪽에서 합병(_E)" -#: src/diffuse/main.py:884 +#: src/diffuse/main.py:892 msgid "_Help" msgstr "도움말(_H)" -#: src/diffuse/main.py:885 +#: src/diffuse/main.py:893 msgid "_Help Contents..." msgstr "도움말 목차...(_H)" -#: src/diffuse/main.py:887 +#: src/diffuse/main.py:895 #, python-format msgid "_About %s..." msgstr "%s 정보...(_A)" -#: src/diffuse/main.py:902 +#: src/diffuse/main.py:910 msgid "New 2-Way File Merge" msgstr "새로운 2개의 파일 비교" -#: src/diffuse/main.py:903 +#: src/diffuse/main.py:911 msgid "New 3-Way File Merge" msgstr "새로운 3개의 파일 비교" -#: src/diffuse/main.py:905 +#: src/diffuse/main.py:913 msgid "Realign All" msgstr "전체 다시 정렬" -#: src/diffuse/main.py:906 +#: src/diffuse/main.py:914 msgid "First Difference" msgstr "첫번째 차이" -#: src/diffuse/main.py:907 +#: src/diffuse/main.py:915 msgid "Previous Difference" msgstr "이전 차이" -#: src/diffuse/main.py:908 +#: src/diffuse/main.py:916 msgid "Next Difference" msgstr "다음 차이" -#: src/diffuse/main.py:909 +#: src/diffuse/main.py:917 msgid "Last Difference" msgstr "마지막 차이" -#: src/diffuse/main.py:911 +#: src/diffuse/main.py:919 msgid "Copy Selection Right" msgstr "선택을 오른쪽으로 복사" -#: src/diffuse/main.py:912 +#: src/diffuse/main.py:920 msgid "Copy Selection Left" msgstr "선택을 왼쪽으로 복사" -#: src/diffuse/main.py:913 +#: src/diffuse/main.py:921 msgid "Copy Left Into Selection" msgstr "왼쪽에서 선택한 프레임에 복사" -#: src/diffuse/main.py:914 +#: src/diffuse/main.py:922 msgid "Copy Right Into Selection" msgstr "오른쪽에서 선택한 프레임에 복사" -#: src/diffuse/main.py:915 +#: src/diffuse/main.py:923 msgid "Merge From Left Then Right" msgstr "왼쪽에서 합병 후 오른쪽에서 병합" -#: src/diffuse/main.py:916 +#: src/diffuse/main.py:924 msgid "Merge From Right Then Left" msgstr "오른쪽에서 병합 후 왼쪽에서 합병" -#: src/diffuse/main.py:918 +#: src/diffuse/main.py:926 msgid "Undo" msgstr "실행 취소" -#: src/diffuse/main.py:919 +#: src/diffuse/main.py:927 msgid "Redo" msgstr "작업 재 실행" -#: src/diffuse/main.py:920 src/diffuse/widgets.py:1847 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 msgid "Cut" msgstr "잘라내기" -#: src/diffuse/main.py:921 src/diffuse/widgets.py:1848 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 msgid "Copy" msgstr "복사" -#: src/diffuse/main.py:922 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 msgid "Paste" msgstr "붙여넣기" -#: src/diffuse/main.py:923 src/diffuse/widgets.py:1852 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 msgid "Clear Edits" msgstr "편집 삭제" -#: src/diffuse/main.py:1046 +#: src/diffuse/main.py:1054 msgid "Some files have unsaved changes. Select the files to save before closing." msgstr "" "변경 내용이 저장되지 않은 파일이 있습니다. 종료하기 전에 저장할 파일을 선택합니다." -#: src/diffuse/main.py:1060 +#: src/diffuse/main.py:1068 msgid "Tab" msgstr "탭" -#: src/diffuse/main.py:1065 +#: src/diffuse/main.py:1073 msgid "Pane" -msgstr " 패널" +msgstr "패널" -#: src/diffuse/main.py:1076 +#: src/diffuse/main.py:1084 msgid "Close _Without Saving" msgstr "저장하지 않고 닫기(_W)" -#: src/diffuse/main.py:1115 +#: src/diffuse/main.py:1123 #, python-format msgid "Closing this tab will quit %s." msgstr "이 탭을 닫으면, %s 종료합니다." -#: src/diffuse/main.py:1198 +#: src/diffuse/main.py:1206 #, python-format msgid "File Merge %d" msgstr "파일 병합 %d" -#: src/diffuse/main.py:1304 +#: src/diffuse/main.py:1312 #, python-format msgid "Error retrieving commits for %s." msgstr "%s의 커밋을 가져오는 동안 오류가 발생했습니다." -#: src/diffuse/main.py:1336 +#: src/diffuse/main.py:1344 #, python-format msgid "Error retrieving modifications for %s." msgstr "%s의 변경을 가져오는 중 오류가 발생했습니다." -#: src/diffuse/main.py:1369 +#: src/diffuse/main.py:1377 msgid "Open File In New Tab" msgstr "새 탭에서 열기" -#: src/diffuse/main.py:1392 +#: src/diffuse/main.py:1400 msgid "Choose Folder With Modified Files" msgstr "변경 된 파일이 있는 폴더를 선택" -#: src/diffuse/main.py:1410 +#: src/diffuse/main.py:1418 msgid "No modified files found." msgstr "변경 된 파일을 찾을 수 없습니다." -#: src/diffuse/main.py:1416 +#: src/diffuse/main.py:1424 msgid "Choose Folder With Commit" msgstr "커밋이있는 폴더를 선택" -#: src/diffuse/main.py:1436 +#: src/diffuse/main.py:1444 msgid "No committed files found." msgstr "커밋된 파일을 찾을 수 없습니다." -#: src/diffuse/main.py:1472 +#: src/diffuse/main.py:1480 msgid "New N-Way File Merge..." msgstr "새로운 여러개의 파일 비교..." -#: src/diffuse/main.py:1473 +#: src/diffuse/main.py:1481 msgid "Number of panes: " -msgstr " 패널수: " +msgstr "패널수: " -#: src/diffuse/main.py:1547 +#: src/diffuse/main.py:1555 msgid "Phrase not found. Continue from the end of the file?" msgstr "문자열을 찾을 수 없습니다. 파일의 끝에서 계속하시겠습니까?" -#: src/diffuse/main.py:1549 +#: src/diffuse/main.py:1557 msgid "Phrase not found. Continue from the start of the file?" msgstr "문자열을 찾을 수 없습니다. 파일의 시작에서 다시하시겠습니까?" -#: src/diffuse/main.py:1770 +#: src/diffuse/main.py:1778 #, fuzzy msgid "" "Usage:\n" @@ -699,174 +671,174 @@ msgstr "" " ( -i | --ignore-case ) 대소문자 차이를 무시\n" " ( -w | --ignore-all-space ) 공백을 무시" -#: src/diffuse/main.py:1937 +#: src/diffuse/main.py:1945 msgid "Error parsing line number." msgstr "줄 번호를 구문 분석하는 동안 오류가 발생했습니다." -#: src/diffuse/main.py:1947 +#: src/diffuse/main.py:1955 #, python-format msgid "Skipping unknown argument \"%s\"." msgstr "알수 없는 인수「%s」 유지 합니다." -#: src/diffuse/main.py:1955 +#: src/diffuse/main.py:1963 #, python-format msgid "Error processing argument \"%s\". Directory not expected." msgstr "%s 인수를 처리하는 동안 오류가 발생했습니다. 디렉토리를 예측할 수 없습니다." -#: src/diffuse/preferences.py:79 +#: src/diffuse/preferences.py:80 msgid "Display" msgstr "표시" -#: src/diffuse/preferences.py:82 +#: src/diffuse/preferences.py:83 msgid "Font" msgstr "글꼴" -#: src/diffuse/preferences.py:83 +#: src/diffuse/preferences.py:84 msgid "Tab width" msgstr "탭 너비" -#: src/diffuse/preferences.py:84 +#: src/diffuse/preferences.py:85 msgid "Show right margin" msgstr "오른쪽 여백 표시" -#: src/diffuse/preferences.py:85 +#: src/diffuse/preferences.py:86 msgid "Right margin" msgstr "오른쪽 여백" -#: src/diffuse/preferences.py:86 +#: src/diffuse/preferences.py:87 msgid "Show line numbers" msgstr "줄번호 표시" -#: src/diffuse/preferences.py:87 +#: src/diffuse/preferences.py:88 msgid "Show white space characters" msgstr "여백 표시" -#: src/diffuse/preferences.py:88 +#: src/diffuse/preferences.py:89 msgid "Ignore case differences" msgstr "대소문자 차이를 무시" -#: src/diffuse/preferences.py:89 +#: src/diffuse/preferences.py:90 msgid "Ignore white space differences" msgstr "공백을 차이를 무시" -#: src/diffuse/preferences.py:90 src/diffuse/preferences.py:99 +#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100 msgid "Ignore changes to white space" msgstr "빈 변화를 무시" -#: src/diffuse/preferences.py:91 +#: src/diffuse/preferences.py:92 msgid "Ignore blank line differences" msgstr "공백 행은 무시" -#: src/diffuse/preferences.py:92 +#: src/diffuse/preferences.py:93 msgid "Ignore end of line differences" msgstr "행의 마지막 차이를 무시" -#: src/diffuse/preferences.py:94 +#: src/diffuse/preferences.py:95 msgid "Alignment" msgstr "정렬" -#: src/diffuse/preferences.py:97 +#: src/diffuse/preferences.py:98 msgid "Ignore case" msgstr "대소문자 무시" -#: src/diffuse/preferences.py:98 +#: src/diffuse/preferences.py:99 msgid "Ignore white space" msgstr "공백을 무시" -#: src/diffuse/preferences.py:100 +#: src/diffuse/preferences.py:101 msgid "Ignore blank lines" msgstr "빈 줄을 무시" -#: src/diffuse/preferences.py:101 +#: src/diffuse/preferences.py:102 msgid "Ignore end of line characters" msgstr "행의 마지막 문자를 무시" -#: src/diffuse/preferences.py:103 +#: src/diffuse/preferences.py:104 msgid "Editor" msgstr "편집기" -#: src/diffuse/preferences.py:106 +#: src/diffuse/preferences.py:107 msgid "Auto indent" msgstr "자동 들여쓰기" -#: src/diffuse/preferences.py:107 +#: src/diffuse/preferences.py:108 msgid "Expand tabs to spaces" msgstr "탭 대신에 공백을 삽입" -#: src/diffuse/preferences.py:108 +#: src/diffuse/preferences.py:109 msgid "Soft tab width" msgstr "소프트 탭 너비" -#: src/diffuse/preferences.py:110 +#: src/diffuse/preferences.py:111 msgid "Tabs" msgstr "탭" -#: src/diffuse/preferences.py:113 +#: src/diffuse/preferences.py:114 msgid "Default panes" msgstr "프레임의 기본 수" -#: src/diffuse/preferences.py:114 +#: src/diffuse/preferences.py:115 msgid "Always show the tab bar" msgstr "항상 탭 모음 표시" -#: src/diffuse/preferences.py:115 +#: src/diffuse/preferences.py:116 #, python-format msgid "Warn me when closing a tab will quit %s" msgstr "탭을 닫을때 %s 종료 및 경고" -#: src/diffuse/preferences.py:117 +#: src/diffuse/preferences.py:118 msgid "Regional Settings" msgstr "국가별 설정" -#: src/diffuse/preferences.py:120 +#: src/diffuse/preferences.py:121 msgid "Default codec" msgstr "기본 코덱" -#: src/diffuse/preferences.py:121 +#: src/diffuse/preferences.py:122 msgid "Order of codecs used to identify encoding" msgstr "인코딩을 확인하기 위한 코덱을 주문" -#: src/diffuse/preferences.py:142 +#: src/diffuse/preferences.py:143 msgid "Cygwin" msgstr "Cygwin" -#: src/diffuse/preferences.py:144 +#: src/diffuse/preferences.py:145 msgid "Root directory" msgstr "루트 디렉터리" -#: src/diffuse/preferences.py:145 +#: src/diffuse/preferences.py:146 msgid "Cygdrive prefix" msgstr "Cygdrive 접두어" -#: src/diffuse/preferences.py:164 +#: src/diffuse/preferences.py:165 msgid "Version control system search order" msgstr "" -#: src/diffuse/preferences.py:172 +#: src/diffuse/preferences.py:173 msgid "\"co\" command" msgstr "co 명령어" -#: src/diffuse/preferences.py:173 +#: src/diffuse/preferences.py:174 msgid "\"rlog\" command" msgstr "rlog 명령어" -#: src/diffuse/preferences.py:175 +#: src/diffuse/preferences.py:176 msgid "Command" msgstr "명령어" -#: src/diffuse/preferences.py:181 +#: src/diffuse/preferences.py:182 msgid "Launch from a Bash login shell" msgstr "Bash 로그인 쉘에서 시작" -#: src/diffuse/preferences.py:188 +#: src/diffuse/preferences.py:189 msgid "Update paths for Cygwin" msgstr "Cygwin을 위해 경로를 업데이트" -#: src/diffuse/preferences.py:193 +#: src/diffuse/preferences.py:194 msgid "Version Control" msgstr "버전 컨트롤" -#: src/diffuse/preferences.py:258 +#: src/diffuse/preferences.py:259 msgid "Preferences" msgstr "기본 설정" @@ -898,7 +870,7 @@ msgstr "" #: src/diffuse/resources.py:409 #, python-brace-format -msgid "Options \"{option}\" is unknown" +msgid "Option \"{option}\" is unknown" msgstr "" #: src/diffuse/resources.py:416 @@ -951,40 +923,69 @@ msgstr "{file} {line} 행을 처리하는 도중 오류가 발생했습니다." msgid "Unhandled error at line {line} of {file}." msgstr "{file} {line} 행을 처리하는 도중 오류가 발생했습니다." -#: src/diffuse/utils.py:63 +#: src/diffuse/utils.py:66 msgid "Auto Detect" msgstr "자동추출" -#: src/diffuse/vcs/cvs.py:53 src/diffuse/vcs/rcs.py:62 src/diffuse/vcs/svn.py:95 +#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97 #, python-format msgid "Error parsing revision %s." msgstr "%s 버전을 구문 분석하는 동안 오류가 발생했습니다." -#: src/diffuse/vcs/vcs_registry.py:233 +#: src/diffuse/vcs/vcs_registry.py:238 #, python-format msgid "Error parsing %s." msgstr "%s를 구문 분석하는 동안 오류가 발생했습니다." -#: src/diffuse/widgets.py:1843 +#: src/diffuse/widgets.py:1845 msgid "Align with Selection" msgstr "선택 정렬" -#: src/diffuse/widgets.py:1844 +#: src/diffuse/widgets.py:1846 msgid "Isolate" msgstr "분리" -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1847 msgid "Merge Selection" msgstr "선택 병합" -#: src/diffuse/widgets.py:1851 +#: src/diffuse/widgets.py:1853 msgid "Select All" msgstr "모두 선택" -#: src/diffuse/widgets.py:1854 +#: src/diffuse/widgets.py:1856 msgid "Swap with Selected Pane" msgstr "선택된 프레임 대신" +#, fuzzy +#~ msgid "" +#~ "This program is free software; you can redistribute it and/or modify\n" +#~ "it under the terms of the GNU General Public License as published by\n" +#~ "the Free Software Foundation; either version 2 of the License, or\n" +#~ "(at your option) any later version.\n" +#~ "\n" +#~ "This program is distributed in the hope that it will be useful,\n" +#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +#~ "GNU General Public License for more details.\n" +#~ "\n" +#~ "You should have received a copy of the GNU General Public License along\n" +#~ "with this program; if not, write to the Free Software Foundation, Inc.,\n" +#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." +#~ msgstr "" +#~ "이 프로그램은 자유 소프트웨어입니다. 당신은 이것을 자유 소프트웨어 재단에 의해 " +#~ "발행된 GNU 일반 공중 사용 허가서 (버전 2, 희망은 이후 버전 중 하나)을 결정하는 " +#~ "조건 하에서 재배포 또는 수정 할 수 있습니다.\n" +#~ "\n" +#~ "본 프로그램은 도움이 될 것이라는 희망 배포되지만, * 완전한 무보증 *입니다. 상업" +#~ "적인 가능성의 보증이나 특정 목적에의 적합성은 안다 보이는 것도 포함 전혀 존재하" +#~ "지 않습니다. 자세한 사항은 GNU 일반 공중 사용 허가서를 참조하십시오.\n" +#~ "\n" +#~ "당신은이 프로그램과 함께 GNU 일반 공중 사용 허가서의 복제물을 일부받은 것입니" +#~ "다. 만약받지면 자유 소프트웨어 재단으로 문의하시기 바랍니다 (주소는 the Free " +#~ "Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 " +#~ "USA).\n" + #~ msgid "Diffuse Merge Tool" #~ msgstr "Diffuse 병합도구" diff --git a/po/pl.po b/po/pl.po index 589970f..3f0328d 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-0.4.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-27 21:56-0500\n" -"PO-Revision-Date: 2020-06-29 14:49-0400\n" +"POT-Creation-Date: 2022-04-04 12:14-0400\n" +"PO-Revision-Date: 2022-04-04 12:19-0400\n" "Last-Translator: Miś Uszatek , 2012\n" "Language-Team: Polish \n" "Language: pl\n" @@ -17,6 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n" "%100>=20) ? 1 : 2);\n" +"X-Generator: Poedit 3.0.1\n" #: data/io.github.mightycreak.Diffuse.desktop.in:3 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:4 @@ -39,7 +40,7 @@ msgstr "" msgid "Main window: diff between two files" msgstr "" -#: src/diffuse/constants.py:24 +#: src/diffuse/constants.py:25 msgid "Copyright" msgstr "" @@ -52,23 +53,6 @@ msgstr "" msgid "translator-credits" msgstr "Miś Uszatek " -#: src/diffuse/dialogs.py:49 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License along\n" -"with this program; if not, write to the Free Software Foundation, Inc.,\n" -"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." -msgstr "" - #: src/diffuse/dialogs.py:83 msgid "Encoding: " msgstr "Kodowanie znaków: " @@ -93,60 +77,60 @@ msgstr "Uwzględnij wielkość liter" msgid "Search Backwards" msgstr "Szukaj Wstecz" -#: src/diffuse/main.py:79 +#: src/diffuse/main.py:85 msgid "Close Tab" msgstr "Zamknij Kartę" -#: src/diffuse/main.py:124 +#: src/diffuse/main.py:132 msgid "Open File..." msgstr "Otwórz Plik..." -#: src/diffuse/main.py:125 +#: src/diffuse/main.py:133 msgid "Reload File" msgstr "Odśwież Plik" -#: src/diffuse/main.py:126 +#: src/diffuse/main.py:134 msgid "Save File" msgstr "Zapisz Plik" -#: src/diffuse/main.py:127 +#: src/diffuse/main.py:135 msgid "Save File As..." msgstr "Zapisz Plik Jako..." -#: src/diffuse/main.py:280 +#: src/diffuse/main.py:288 msgid "Save changes before loading the new file?" msgstr "Zapisać zmiany przed wczytaniem nowego pliku?" -#: src/diffuse/main.py:391 +#: src/diffuse/main.py:399 #, python-format msgid "Error reading revision %(rev)s of %(file)s." msgstr "Błąd odczytu rewizji %(rev)s z %(file)s." -#: src/diffuse/main.py:394 src/diffuse/main.py:1849 +#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #, python-format msgid "Error reading %s." msgstr "Błąd odczytu %s." -#: src/diffuse/main.py:416 +#: src/diffuse/main.py:424 msgid "Open File" msgstr "Otwórz Plik" -#: src/diffuse/main.py:473 +#: src/diffuse/main.py:481 #, python-format 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?" -#: src/diffuse/main.py:499 +#: src/diffuse/main.py:507 #, python-format msgid "Save %(title)s Pane %(pane)d" msgstr "Zapisz %(title)s Okno %(pane)d" -#: src/diffuse/main.py:531 +#: src/diffuse/main.py:539 #, python-format 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ć?" -#: src/diffuse/main.py:538 +#: src/diffuse/main.py:546 #, python-format msgid "" "The file %s has been modified by another process since reading it. If you save, " @@ -155,25 +139,25 @@ msgstr "" "Plik %s został zmodyfikowany przez inny proces od chwili jego wczytania. Jeśli " "zapiszesz, wszystkie zewnętrzne zmiany mogą zostać utracone. Zapisać pomimo to?" -#: src/diffuse/main.py:580 +#: src/diffuse/main.py:588 #, python-format msgid "Error encoding to %s." msgstr "Błąd kodowania dla %s." -#: src/diffuse/main.py:584 src/diffuse/preferences.py:298 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 #, python-format msgid "Error writing %s." msgstr "Błąd zapisu %s." -#: src/diffuse/main.py:614 +#: src/diffuse/main.py:622 msgid "Go To Line..." msgstr "Idź Do Linii..." -#: src/diffuse/main.py:615 +#: src/diffuse/main.py:623 msgid "Line Number: " msgstr "Numer Linii: " -#: src/diffuse/main.py:646 +#: src/diffuse/main.py:654 msgid "" "Press the enter key or double click to edit. Press the space bar or use the RMB " "menu to manually align." @@ -181,11 +165,11 @@ msgstr "" "Naciśnij klawisz Enter lub dwukrotnie kliknij aby edytować. Naciśnij klawisz " "spacji lub użyć menu RMB, aby ręcznie ustawić." -#: src/diffuse/main.py:650 +#: src/diffuse/main.py:658 msgid "Press the escape key to finish editing." msgstr "Naciśnij klawisz escape, aby zakończyć edycję." -#: src/diffuse/main.py:653 +#: src/diffuse/main.py:661 msgid "" "Select target line and press the space bar to align. Press the escape key to " "cancel." @@ -193,426 +177,426 @@ msgstr "" "Wybierz linie docelową i naciśnij klawisz spacji aby wyrównać. Naciśnij klawisz " "Escape, aby anulować." -#: src/diffuse/main.py:776 +#: src/diffuse/main.py:784 msgid "_File" msgstr "_Plik" -#: src/diffuse/main.py:777 +#: src/diffuse/main.py:785 msgid "_Open File..." msgstr "_Otwórz Plik..." -#: src/diffuse/main.py:778 +#: src/diffuse/main.py:786 msgid "Open File In New _Tab..." msgstr "Otwórz Plik w Nowej _Karcie..." -#: src/diffuse/main.py:779 +#: src/diffuse/main.py:787 msgid "Open _Modified Files..." msgstr "Otwórz _Zmodyfikowany Plik..." -#: src/diffuse/main.py:780 +#: src/diffuse/main.py:788 msgid "Open Commi_t..." msgstr "Otwórz Commi_t..." -#: src/diffuse/main.py:781 +#: src/diffuse/main.py:789 msgid "_Reload File" msgstr "_Odśwież Plik" -#: src/diffuse/main.py:783 +#: src/diffuse/main.py:791 msgid "_Save File" msgstr "_Zapisz plik" -#: src/diffuse/main.py:784 +#: src/diffuse/main.py:792 msgid "Save File _As..." msgstr "Zapisz Plik _Jako..." -#: src/diffuse/main.py:785 +#: src/diffuse/main.py:793 msgid "Save A_ll" msgstr "Zapisz W_szystko" -#: src/diffuse/main.py:787 +#: src/diffuse/main.py:795 msgid "New _2-Way File Merge" msgstr "Nowy Łączenia _2 Plików" -#: src/diffuse/main.py:788 +#: src/diffuse/main.py:796 msgid "New _3-Way File Merge" msgstr "Nowy Łączenia _3 Plików" -#: src/diffuse/main.py:789 +#: src/diffuse/main.py:797 msgid "New _N-Way File Merge..." msgstr "Nowy _N-Sposób Łączenia Pliku..." -#: src/diffuse/main.py:791 +#: src/diffuse/main.py:799 msgid "_Close Tab" msgstr "_Zamknij Kartę" -#: src/diffuse/main.py:792 +#: src/diffuse/main.py:800 msgid "_Undo Close Tab" msgstr "_Przywróć Zamkniętą Kartę" -#: src/diffuse/main.py:793 +#: src/diffuse/main.py:801 msgid "_Quit" msgstr "_Zamknij" -#: src/diffuse/main.py:796 +#: src/diffuse/main.py:804 msgid "_Edit" msgstr "_Edytuj" -#: src/diffuse/main.py:797 +#: src/diffuse/main.py:805 msgid "_Undo" msgstr "_Cofnij" -#: src/diffuse/main.py:798 +#: src/diffuse/main.py:806 msgid "_Redo" msgstr "_Ponów" -#: src/diffuse/main.py:800 +#: src/diffuse/main.py:808 msgid "Cu_t" msgstr "Wy_tnij" -#: src/diffuse/main.py:801 +#: src/diffuse/main.py:809 msgid "_Copy" msgstr "_Kopiuj" -#: src/diffuse/main.py:802 +#: src/diffuse/main.py:810 msgid "_Paste" msgstr "_Wklej" -#: src/diffuse/main.py:804 +#: src/diffuse/main.py:812 msgid "Select _All" msgstr "Zaznacz _Wszystko" -#: src/diffuse/main.py:805 +#: src/diffuse/main.py:813 msgid "C_lear Edits" msgstr "W_yczyść Edycje" -#: src/diffuse/main.py:806 +#: src/diffuse/main.py:814 msgid "_Dismiss All Edits" msgstr "_Odrzuć Wszystkie Edycje" -#: src/diffuse/main.py:808 +#: src/diffuse/main.py:816 msgid "_Find..." msgstr "_Znajdź..." -#: src/diffuse/main.py:809 +#: src/diffuse/main.py:817 msgid "Find _Next" msgstr "Znajdź _Następny" -#: src/diffuse/main.py:810 +#: src/diffuse/main.py:818 msgid "Find Pre_vious" msgstr "Znajdź Pop_rzedni" -#: src/diffuse/main.py:811 +#: src/diffuse/main.py:819 msgid "_Go To Line..." msgstr "_Idź Do Linii..." -#: src/diffuse/main.py:813 +#: src/diffuse/main.py:821 msgid "Pr_eferences..." msgstr "Pr_eferencje..." -#: src/diffuse/main.py:817 +#: src/diffuse/main.py:825 msgid "None" msgstr "Brak" -#: src/diffuse/main.py:835 +#: src/diffuse/main.py:843 msgid "_View" msgstr "_Widok" -#: src/diffuse/main.py:836 +#: src/diffuse/main.py:844 msgid "_Syntax Highlighting" msgstr "_Podświetlanie Składni" -#: src/diffuse/main.py:838 +#: src/diffuse/main.py:846 msgid "Re_align All" msgstr "Wy_równaj Wszystko" -#: src/diffuse/main.py:839 +#: src/diffuse/main.py:847 msgid "_Isolate" msgstr "_Odizoluj" -#: src/diffuse/main.py:841 +#: src/diffuse/main.py:849 msgid "_First Difference" msgstr "_Pierwsza Różnica" -#: src/diffuse/main.py:842 +#: src/diffuse/main.py:850 msgid "_Previous Difference" msgstr "_Poprzednia Różnica" -#: src/diffuse/main.py:843 +#: src/diffuse/main.py:851 msgid "_Next Difference" msgstr "_Następna Różnica" -#: src/diffuse/main.py:844 +#: src/diffuse/main.py:852 msgid "_Last Difference" msgstr "_Ostatnia Różnica" -#: src/diffuse/main.py:846 +#: src/diffuse/main.py:854 msgid "Fir_st Tab" msgstr "Pie_rwsza Karta" -#: src/diffuse/main.py:847 +#: src/diffuse/main.py:855 msgid "Pre_vious Tab" msgstr "Pop_rzednia Karta" -#: src/diffuse/main.py:848 +#: src/diffuse/main.py:856 msgid "Next _Tab" msgstr "Następna _Karta" -#: src/diffuse/main.py:849 +#: src/diffuse/main.py:857 msgid "Las_t Tab" msgstr "Osta_tnia Karta" -#: src/diffuse/main.py:851 +#: src/diffuse/main.py:859 msgid "Shift Pane _Right" msgstr "Przesuń Okno w _Prawo" -#: src/diffuse/main.py:852 +#: src/diffuse/main.py:860 msgid "Shift Pane _Left" msgstr "Przesuń Okno w _Lewo" -#: src/diffuse/main.py:855 +#: src/diffuse/main.py:863 msgid "F_ormat" msgstr "F_ormat" -#: src/diffuse/main.py:856 +#: src/diffuse/main.py:864 msgid "Convert To _Upper Case" msgstr "Konwertuj Na _Duże Litery" -#: src/diffuse/main.py:857 +#: src/diffuse/main.py:865 msgid "Convert To _Lower Case" msgstr "Konwertuj Na _Małe Litery" -#: src/diffuse/main.py:859 +#: src/diffuse/main.py:867 msgid "Sort Lines In _Ascending Order" msgstr "Sortuj Wiersze w Kolejności _Rosnącej" -#: src/diffuse/main.py:860 +#: src/diffuse/main.py:868 msgid "Sort Lines In D_escending Order" msgstr "Sortuj Wiersze w Kolejności M_alejącej" -#: src/diffuse/main.py:862 +#: src/diffuse/main.py:870 msgid "Remove Trailing _White Space" msgstr "Usuń Zbędne Spacje" -#: src/diffuse/main.py:863 +#: src/diffuse/main.py:871 msgid "Convert Tabs To _Spaces" msgstr "Konwertuj Tabulacje Na _Spacje" -#: src/diffuse/main.py:864 +#: src/diffuse/main.py:872 msgid "Convert Leading Spaces To _Tabs" msgstr "Konwertuj Spacje Na _Tabulacje" -#: src/diffuse/main.py:866 +#: src/diffuse/main.py:874 msgid "_Increase Indenting" msgstr "_Zwiększ Wcięcie" -#: src/diffuse/main.py:867 +#: src/diffuse/main.py:875 msgid "De_crease Indenting" msgstr "Zm_niejsz Wcięcie" -#: src/diffuse/main.py:869 +#: src/diffuse/main.py:877 msgid "Convert To _DOS Format" msgstr "Konwertuj Do Formatu _DOS" -#: src/diffuse/main.py:870 +#: src/diffuse/main.py:878 msgid "Convert To _Mac Format" msgstr "Konwertuj Do Formatu _Mac" -#: src/diffuse/main.py:871 +#: src/diffuse/main.py:879 msgid "Convert To Uni_x Format" msgstr "Konwertuj Do Formatu Uni_x" -#: src/diffuse/main.py:874 +#: src/diffuse/main.py:882 msgid "_Merge" msgstr "_Połącz" -#: src/diffuse/main.py:875 +#: src/diffuse/main.py:883 msgid "Copy Selection _Right" msgstr "Skopiuj Zaznaczenie w _Prawo" -#: src/diffuse/main.py:876 +#: src/diffuse/main.py:884 msgid "Copy Selection _Left" msgstr "Skopiuj Zaznaczenie w _Lewo" -#: src/diffuse/main.py:878 +#: src/diffuse/main.py:886 msgid "Copy Left _Into Selection" msgstr "Skopiuj z Lewej _Do Zaznaczenia" -#: src/diffuse/main.py:879 +#: src/diffuse/main.py:887 msgid "Copy Right I_nto Selection" msgstr "Skopiuj z Prawej _Do Zaznaczenia" -#: src/diffuse/main.py:880 +#: src/diffuse/main.py:888 msgid "_Merge From Left Then Right" msgstr "_Scal z Lewej Potem Prawej" -#: src/diffuse/main.py:881 +#: src/diffuse/main.py:889 msgid "M_erge From Right Then Left" msgstr "S_cal z Prawej Potem Lewej" -#: src/diffuse/main.py:884 +#: src/diffuse/main.py:892 msgid "_Help" msgstr "_Pomoc" -#: src/diffuse/main.py:885 +#: src/diffuse/main.py:893 msgid "_Help Contents..." msgstr "_Pomoc Ogólna..." -#: src/diffuse/main.py:887 +#: src/diffuse/main.py:895 #, python-format msgid "_About %s..." msgstr "_O %s..." -#: src/diffuse/main.py:902 +#: src/diffuse/main.py:910 msgid "New 2-Way File Merge" msgstr "Nowy Łączenia 2 Plików" -#: src/diffuse/main.py:903 +#: src/diffuse/main.py:911 msgid "New 3-Way File Merge" msgstr "Nowy Łączenia 3 Plików" -#: src/diffuse/main.py:905 +#: src/diffuse/main.py:913 msgid "Realign All" msgstr "Wyrównaj Wszystko" -#: src/diffuse/main.py:906 +#: src/diffuse/main.py:914 msgid "First Difference" msgstr "Pierwsza Różnica" -#: src/diffuse/main.py:907 +#: src/diffuse/main.py:915 msgid "Previous Difference" msgstr "Poprzednia Różnica" -#: src/diffuse/main.py:908 +#: src/diffuse/main.py:916 msgid "Next Difference" msgstr "Następna Różnica" -#: src/diffuse/main.py:909 +#: src/diffuse/main.py:917 msgid "Last Difference" msgstr "Ostatnia Różnica" -#: src/diffuse/main.py:911 +#: src/diffuse/main.py:919 msgid "Copy Selection Right" msgstr "Skopiuj Zaznaczenie w Prawo" -#: src/diffuse/main.py:912 +#: src/diffuse/main.py:920 msgid "Copy Selection Left" msgstr "Skopiuj Zaznaczenie w Lewo" -#: src/diffuse/main.py:913 +#: src/diffuse/main.py:921 msgid "Copy Left Into Selection" msgstr "Skopiuj z Lewej Do Zaznaczenia" -#: src/diffuse/main.py:914 +#: src/diffuse/main.py:922 msgid "Copy Right Into Selection" msgstr "Skopiuj z Prawej Do Zaznaczenia" -#: src/diffuse/main.py:915 +#: src/diffuse/main.py:923 msgid "Merge From Left Then Right" msgstr "Scal z Lewej Potem Prawej" -#: src/diffuse/main.py:916 +#: src/diffuse/main.py:924 msgid "Merge From Right Then Left" msgstr "Scal z Prawej Potem Lewej" -#: src/diffuse/main.py:918 +#: src/diffuse/main.py:926 msgid "Undo" msgstr "Cofnij" -#: src/diffuse/main.py:919 +#: src/diffuse/main.py:927 msgid "Redo" msgstr "Ponów" -#: src/diffuse/main.py:920 src/diffuse/widgets.py:1847 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 msgid "Cut" msgstr "Wytnij" -#: src/diffuse/main.py:921 src/diffuse/widgets.py:1848 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 msgid "Copy" msgstr "Kopiuj" -#: src/diffuse/main.py:922 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 msgid "Paste" msgstr "Wklej" -#: src/diffuse/main.py:923 src/diffuse/widgets.py:1852 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 msgid "Clear Edits" msgstr "Wyczyść Edycje" -#: src/diffuse/main.py:1046 +#: src/diffuse/main.py:1054 msgid "Some files have unsaved changes. Select the files to save before closing." msgstr "" "Niektóre pliki mają niezapisane zmiany. Wybierz pliki, aby zapisać przed " "zamknięciem." -#: src/diffuse/main.py:1060 +#: src/diffuse/main.py:1068 msgid "Tab" msgstr "Karta" -#: src/diffuse/main.py:1065 +#: src/diffuse/main.py:1073 msgid "Pane" msgstr "Okno" -#: src/diffuse/main.py:1076 +#: src/diffuse/main.py:1084 msgid "Close _Without Saving" msgstr "Zamknij _Bez Zapisywania" -#: src/diffuse/main.py:1115 +#: src/diffuse/main.py:1123 #, python-format msgid "Closing this tab will quit %s." msgstr "Zamknięcie tej karty zakończy %s." -#: src/diffuse/main.py:1198 +#: src/diffuse/main.py:1206 #, python-format msgid "File Merge %d" msgstr "Scal Plik %d" -#: src/diffuse/main.py:1304 +#: src/diffuse/main.py:1312 #, python-format msgid "Error retrieving commits for %s." msgstr "Błąd odzyskiwania commits dla %s." -#: src/diffuse/main.py:1336 +#: src/diffuse/main.py:1344 #, python-format msgid "Error retrieving modifications for %s." msgstr "Błąd odzyskiwania modyfikacji dla % s." -#: src/diffuse/main.py:1369 +#: src/diffuse/main.py:1377 msgid "Open File In New Tab" msgstr "Otwórz Plik w Nowej Karcie" -#: src/diffuse/main.py:1392 +#: src/diffuse/main.py:1400 msgid "Choose Folder With Modified Files" msgstr "Wybierz Folder z Zmodyfikowanymi Plikami" -#: src/diffuse/main.py:1410 +#: src/diffuse/main.py:1418 msgid "No modified files found." msgstr "Nie znaleziono zmodyfikowanych plików." -#: src/diffuse/main.py:1416 +#: src/diffuse/main.py:1424 msgid "Choose Folder With Commit" msgstr "Wybierz Folder z Commit" -#: src/diffuse/main.py:1436 +#: src/diffuse/main.py:1444 msgid "No committed files found." -msgstr "Nie znaleziono plików commit" +msgstr "Nie znaleziono plików commit." -#: src/diffuse/main.py:1472 +#: src/diffuse/main.py:1480 msgid "New N-Way File Merge..." msgstr "Nowy N-Sposób Łączenia Pliku..." -#: src/diffuse/main.py:1473 +#: src/diffuse/main.py:1481 msgid "Number of panes: " msgstr "Ilość okien: " -#: src/diffuse/main.py:1547 +#: src/diffuse/main.py:1555 msgid "Phrase not found. Continue from the end of the file?" msgstr "Frazy nie znaleziono. Kontynuowane od końca pliku?" -#: src/diffuse/main.py:1549 +#: src/diffuse/main.py:1557 msgid "Phrase not found. Continue from the start of the file?" msgstr "Frazy nie znaleziono. Kontynuowane od początku pliku?" -#: src/diffuse/main.py:1770 +#: src/diffuse/main.py:1778 #, fuzzy msgid "" "Usage:\n" @@ -693,174 +677,174 @@ msgstr "" " ( -i | --ignore-case ) Ignoruj wielkości liter\n" " ( -w | --ignore-all-space ) Ignoruj różnice w spacji" -#: src/diffuse/main.py:1937 +#: src/diffuse/main.py:1945 msgid "Error parsing line number." msgstr "Błąd analizowania numer linii." -#: src/diffuse/main.py:1947 +#: src/diffuse/main.py:1955 #, python-format msgid "Skipping unknown argument \"%s\"." msgstr "Pomijanie nieznanego argumentu \"%s\"." -#: src/diffuse/main.py:1955 +#: src/diffuse/main.py:1963 #, python-format msgid "Error processing argument \"%s\". Directory not expected." msgstr "Błąd przetwarzania argumentu \"%s\". Nie oczekiwano katalogu." -#: src/diffuse/preferences.py:79 +#: src/diffuse/preferences.py:80 msgid "Display" msgstr "Wyświetl" -#: src/diffuse/preferences.py:82 +#: src/diffuse/preferences.py:83 msgid "Font" msgstr "Czcionka" -#: src/diffuse/preferences.py:83 +#: src/diffuse/preferences.py:84 msgid "Tab width" msgstr "Szerokość tabulacji" -#: src/diffuse/preferences.py:84 +#: src/diffuse/preferences.py:85 msgid "Show right margin" msgstr "Pokaż prawy margines" -#: src/diffuse/preferences.py:85 +#: src/diffuse/preferences.py:86 msgid "Right margin" msgstr "Prawy margines" -#: src/diffuse/preferences.py:86 +#: src/diffuse/preferences.py:87 msgid "Show line numbers" msgstr "Pokaż numerowanie linii" -#: src/diffuse/preferences.py:87 +#: src/diffuse/preferences.py:88 msgid "Show white space characters" msgstr "Pokaż znaki spacji" -#: src/diffuse/preferences.py:88 +#: src/diffuse/preferences.py:89 msgid "Ignore case differences" msgstr "Ignoruj różnice w wielkość liter" -#: src/diffuse/preferences.py:89 +#: src/diffuse/preferences.py:90 msgid "Ignore white space differences" msgstr "Ignoruj różnice spacji" -#: src/diffuse/preferences.py:90 src/diffuse/preferences.py:99 +#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100 msgid "Ignore changes to white space" msgstr "Ignoruj zmiany w spacji" -#: src/diffuse/preferences.py:91 +#: src/diffuse/preferences.py:92 msgid "Ignore blank line differences" msgstr "Ignoruj różnice pustych linii" -#: src/diffuse/preferences.py:92 +#: src/diffuse/preferences.py:93 msgid "Ignore end of line differences" msgstr "Ignoruj różnice na końcu linii" -#: src/diffuse/preferences.py:94 +#: src/diffuse/preferences.py:95 msgid "Alignment" msgstr "Dostosowanie" -#: src/diffuse/preferences.py:97 +#: src/diffuse/preferences.py:98 msgid "Ignore case" msgstr "Ignoruj wielkość liter" -#: src/diffuse/preferences.py:98 +#: src/diffuse/preferences.py:99 msgid "Ignore white space" msgstr "Ignoruj spacje" -#: src/diffuse/preferences.py:100 +#: src/diffuse/preferences.py:101 msgid "Ignore blank lines" msgstr "Ignoruj puste wiersze" -#: src/diffuse/preferences.py:101 +#: src/diffuse/preferences.py:102 msgid "Ignore end of line characters" msgstr "Ignoruj końcowe znaki linii" -#: src/diffuse/preferences.py:103 +#: src/diffuse/preferences.py:104 msgid "Editor" msgstr "Edytor" -#: src/diffuse/preferences.py:106 +#: src/diffuse/preferences.py:107 msgid "Auto indent" msgstr "Automatyczne wcięcia" -#: src/diffuse/preferences.py:107 +#: src/diffuse/preferences.py:108 msgid "Expand tabs to spaces" msgstr "Zamiana tabulacji na spacje" -#: src/diffuse/preferences.py:108 +#: src/diffuse/preferences.py:109 msgid "Soft tab width" msgstr "Miękka szerokość tabulacji" -#: src/diffuse/preferences.py:110 +#: src/diffuse/preferences.py:111 msgid "Tabs" msgstr "Karty" -#: src/diffuse/preferences.py:113 +#: src/diffuse/preferences.py:114 msgid "Default panes" msgstr "Domyślne Okna" -#: src/diffuse/preferences.py:114 +#: src/diffuse/preferences.py:115 msgid "Always show the tab bar" msgstr "Zawsze pokazuj pasek kart" -#: src/diffuse/preferences.py:115 +#: src/diffuse/preferences.py:116 #, python-format msgid "Warn me when closing a tab will quit %s" -msgstr "Ostrzegaj mnie gdy zamknięcie karty zakończy %s." +msgstr "Ostrzegaj mnie gdy zamknięcie karty zakończy %s" -#: src/diffuse/preferences.py:117 +#: src/diffuse/preferences.py:118 msgid "Regional Settings" msgstr "Regionalne Ustawienia" -#: src/diffuse/preferences.py:120 +#: src/diffuse/preferences.py:121 msgid "Default codec" msgstr "Domyślne kodowanie znaków" -#: src/diffuse/preferences.py:121 +#: src/diffuse/preferences.py:122 msgid "Order of codecs used to identify encoding" msgstr "Kolejny kodek używany do identyfikacji kodowania" -#: src/diffuse/preferences.py:142 +#: src/diffuse/preferences.py:143 msgid "Cygwin" msgstr "Cygwin" -#: src/diffuse/preferences.py:144 +#: src/diffuse/preferences.py:145 msgid "Root directory" msgstr "Główny katalog" -#: src/diffuse/preferences.py:145 +#: src/diffuse/preferences.py:146 msgid "Cygdrive prefix" -msgstr "Cygdrive Prefiks " +msgstr "Cygdrive Prefiks" -#: src/diffuse/preferences.py:164 +#: src/diffuse/preferences.py:165 msgid "Version control system search order" msgstr "" -#: src/diffuse/preferences.py:172 +#: src/diffuse/preferences.py:173 msgid "\"co\" command" msgstr "\"co\" polecenie" -#: src/diffuse/preferences.py:173 +#: src/diffuse/preferences.py:174 msgid "\"rlog\" command" msgstr "\"rlog\" polecenie" -#: src/diffuse/preferences.py:175 +#: src/diffuse/preferences.py:176 msgid "Command" msgstr "Polecenie" -#: src/diffuse/preferences.py:181 +#: src/diffuse/preferences.py:182 msgid "Launch from a Bash login shell" msgstr "Uruchom z powłoki Bash" -#: src/diffuse/preferences.py:188 +#: src/diffuse/preferences.py:189 msgid "Update paths for Cygwin" msgstr "Aktualizacja ścieżki dla Cygwin" -#: src/diffuse/preferences.py:193 +#: src/diffuse/preferences.py:194 msgid "Version Control" msgstr "Wersja kontrolna" -#: src/diffuse/preferences.py:258 +#: src/diffuse/preferences.py:259 msgid "Preferences" msgstr "Preferencje" @@ -892,7 +876,7 @@ msgstr "" #: src/diffuse/resources.py:409 #, python-brace-format -msgid "Options \"{option}\" is unknown" +msgid "Option \"{option}\" is unknown" msgstr "" #: src/diffuse/resources.py:416 @@ -945,37 +929,37 @@ msgstr "Błąd przetwarzania linii {line} w {file}." msgid "Unhandled error at line {line} of {file}." msgstr "Błąd przetwarzania linii {line} w {file}." -#: src/diffuse/utils.py:63 +#: src/diffuse/utils.py:66 msgid "Auto Detect" msgstr "Automatyczne Wykrywanie" -#: src/diffuse/vcs/cvs.py:53 src/diffuse/vcs/rcs.py:62 src/diffuse/vcs/svn.py:95 +#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97 #, python-format msgid "Error parsing revision %s." msgstr "Błąd analizowania rewizji %s." -#: src/diffuse/vcs/vcs_registry.py:233 +#: src/diffuse/vcs/vcs_registry.py:238 #, python-format msgid "Error parsing %s." msgstr "Błędy analizowania %s." -#: src/diffuse/widgets.py:1843 +#: src/diffuse/widgets.py:1845 msgid "Align with Selection" msgstr "Wyrównaj do zaznaczenia" -#: src/diffuse/widgets.py:1844 +#: src/diffuse/widgets.py:1846 msgid "Isolate" msgstr "Oddziel" -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1847 msgid "Merge Selection" msgstr "Scal Zaznaczenie" -#: src/diffuse/widgets.py:1851 +#: src/diffuse/widgets.py:1853 msgid "Select All" msgstr "Zaznacz Wszystko" -#: src/diffuse/widgets.py:1854 +#: src/diffuse/widgets.py:1856 msgid "Swap with Selected Pane" msgstr "Zamień z Zaznaczonym Oknem" diff --git a/po/pt.po b/po/pt.po index c03d47c..6fe8084 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,18 +7,18 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-27 21:56-0500\n" -"PO-Revision-Date: 2020-06-29 14:49-0400\n" +"POT-Creation-Date: 2022-04-04 12:14-0400\n" +"PO-Revision-Date: 2022-04-04 12:19-0400\n" "Last-Translator: Pedro Albuquerque \n" "Language-Team: Português \n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Gtranslator 2.91.7\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 3.0.1\n" "X-Poedit-SourceCharset: UTF-8\n" -"X-Poedit-Basepath: ..\\src\\usr\\bin\n" +"X-Poedit-Basepath: ../src/usr/bin\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" @@ -43,7 +43,7 @@ msgstr "" msgid "Main window: diff between two files" msgstr "" -#: src/diffuse/constants.py:24 +#: src/diffuse/constants.py:25 msgid "Copyright" msgstr "" @@ -55,37 +55,6 @@ msgstr "O Diffuse é uma ferramenta gráfica para unir e comparar ficheiros de t msgid "translator-credits" msgstr "Pedro Albuquerque " -#: src/diffuse/dialogs.py:49 -#, fuzzy -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License along\n" -"with this program; if not, write to the Free Software Foundation, Inc.,\n" -"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." -msgstr "" -"Este programa é gratuito; pode redistribuí-lo e/ou modificá-lo sob os termos da " -"GNU General Public License como publicada pela Free Software Foundation; seja a " -"versão 2 da licença, ou (por opção sua) qualquer versão posterior.\n" -"\n" -"Este programa é distribuído na esperança de ser útil, mas SEM QUALQUER GARANTIA; " -"nem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO A UM PROPÓSITO EM " -"PARTICULAR. Veja a GNU General Public License para mais detalhes.\n" -"\n" -"Deverá ter recebido uma cópia da GNU General Public License juntamente com o " -"programa. Também pode obter uma cópia da GNU General Public License da Free " -"Software Foundation visitando a sua página web (http://www.fsf.org/) ou " -"escrevendo para Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, " -"Boston, MA 02110-1301 USA\n" - #: src/diffuse/dialogs.py:83 msgid "Encoding: " msgstr "Codificação: " @@ -110,60 +79,60 @@ msgstr "Comparar maiúsculas" msgid "Search Backwards" msgstr "Procurar para trás" -#: src/diffuse/main.py:79 +#: src/diffuse/main.py:85 msgid "Close Tab" msgstr "Fechar separador" -#: src/diffuse/main.py:124 +#: src/diffuse/main.py:132 msgid "Open File..." msgstr "Abrir ficheiro..." -#: src/diffuse/main.py:125 +#: src/diffuse/main.py:133 msgid "Reload File" msgstr "Recarregar ficheiro" -#: src/diffuse/main.py:126 +#: src/diffuse/main.py:134 msgid "Save File" msgstr "Gravar ficheiro" -#: src/diffuse/main.py:127 +#: src/diffuse/main.py:135 msgid "Save File As..." msgstr "Gravar ficheiro como..." -#: src/diffuse/main.py:280 +#: src/diffuse/main.py:288 msgid "Save changes before loading the new file?" msgstr "Gravar alterações antes de carregar o novo ficheiro?" -#: src/diffuse/main.py:391 +#: src/diffuse/main.py:399 #, python-format msgid "Error reading revision %(rev)s of %(file)s." msgstr "Erro ao ler a revisão %(rev)s de %(file)s." -#: src/diffuse/main.py:394 src/diffuse/main.py:1849 +#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #, python-format msgid "Error reading %s." msgstr "Erro ao ler %s." -#: src/diffuse/main.py:416 +#: src/diffuse/main.py:424 msgid "Open File" msgstr "Abrir ficheiro" -#: src/diffuse/main.py:473 +#: src/diffuse/main.py:481 #, python-format 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?" -#: src/diffuse/main.py:499 +#: src/diffuse/main.py:507 #, python-format msgid "Save %(title)s Pane %(pane)d" msgstr "Gravar %(title)s painel %(pane)d" -#: src/diffuse/main.py:531 +#: src/diffuse/main.py:539 #, python-format msgid "A file named %s already exists. Do you want to overwrite it?" msgstr "Já existe um ficheiro chamado %s. Deseja sobrescrevê-lo?" -#: src/diffuse/main.py:538 +#: src/diffuse/main.py:546 #, python-format msgid "" "The file %s has been modified by another process since reading it. If you save, " @@ -172,25 +141,25 @@ msgstr "" "O ficheiro %s foi modificado por outro processo desde a leitura. Se gravar, " "perderá todas as alterações externas. Gravar mesmo assim?" -#: src/diffuse/main.py:580 +#: src/diffuse/main.py:588 #, python-format msgid "Error encoding to %s." msgstr "Erro ao codificar para %s." -#: src/diffuse/main.py:584 src/diffuse/preferences.py:298 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 #, python-format msgid "Error writing %s." msgstr "Erro ao excrever %s." -#: src/diffuse/main.py:614 +#: src/diffuse/main.py:622 msgid "Go To Line..." msgstr "Ir para linha..." -#: src/diffuse/main.py:615 +#: src/diffuse/main.py:623 msgid "Line Number: " msgstr "Número de linha: " -#: src/diffuse/main.py:646 +#: src/diffuse/main.py:654 msgid "" "Press the enter key or double click to edit. Press the space bar or use the RMB " "menu to manually align." @@ -198,11 +167,11 @@ msgstr "" "Prima Enter ou faça duplo clique para editar. Prima a barra de espaços ou use o " "menu RMB para alinhar manualmente." -#: src/diffuse/main.py:650 +#: src/diffuse/main.py:658 msgid "Press the escape key to finish editing." msgstr "Prima Esc para terminar a edição." -#: src/diffuse/main.py:653 +#: src/diffuse/main.py:661 msgid "" "Select target line and press the space bar to align. Press the escape key to " "cancel." @@ -210,426 +179,426 @@ msgstr "" "Seleccione a linha alvo e prima a barra de espaço para alinhar. Prima Esc para " "cancelar." -#: src/diffuse/main.py:776 +#: src/diffuse/main.py:784 msgid "_File" msgstr "_Ficheiro" -#: src/diffuse/main.py:777 +#: src/diffuse/main.py:785 msgid "_Open File..." msgstr "Abrir ficheir_o..." -#: src/diffuse/main.py:778 +#: src/diffuse/main.py:786 msgid "Open File In New _Tab..." msgstr "Abrir ficheiro em no_vo separador..." -#: src/diffuse/main.py:779 +#: src/diffuse/main.py:787 msgid "Open _Modified Files..." msgstr "Abrir ficheiros _modificados..." -#: src/diffuse/main.py:780 +#: src/diffuse/main.py:788 msgid "Open Commi_t..." msgstr "Abrir rev_isão..." -#: src/diffuse/main.py:781 +#: src/diffuse/main.py:789 msgid "_Reload File" msgstr "_Recarregar ficheiro" -#: src/diffuse/main.py:783 +#: src/diffuse/main.py:791 msgid "_Save File" msgstr "_Gravar ficheiro" -#: src/diffuse/main.py:784 +#: src/diffuse/main.py:792 msgid "Save File _As..." msgstr "Gr_avar ficheiro como..." -#: src/diffuse/main.py:785 +#: src/diffuse/main.py:793 msgid "Save A_ll" msgstr "Gravar _tudo" -#: src/diffuse/main.py:787 +#: src/diffuse/main.py:795 msgid "New _2-Way File Merge" msgstr "Nova união de _2 vias" -#: src/diffuse/main.py:788 +#: src/diffuse/main.py:796 msgid "New _3-Way File Merge" msgstr "Nova união de _3 vias" -#: src/diffuse/main.py:789 +#: src/diffuse/main.py:797 msgid "New _N-Way File Merge..." -msgstr "Nova união de _N vias" +msgstr "Nova união de _N vias..." -#: src/diffuse/main.py:791 +#: src/diffuse/main.py:799 msgid "_Close Tab" msgstr "Fe_char separador" -#: src/diffuse/main.py:792 +#: src/diffuse/main.py:800 msgid "_Undo Close Tab" msgstr "Desfa_zer Fechar separador" -#: src/diffuse/main.py:793 +#: src/diffuse/main.py:801 msgid "_Quit" msgstr "_Sair" -#: src/diffuse/main.py:796 +#: src/diffuse/main.py:804 msgid "_Edit" msgstr "_Editar" -#: src/diffuse/main.py:797 +#: src/diffuse/main.py:805 msgid "_Undo" msgstr "_Desfazer" -#: src/diffuse/main.py:798 +#: src/diffuse/main.py:806 msgid "_Redo" msgstr "_Refazer" -#: src/diffuse/main.py:800 +#: src/diffuse/main.py:808 msgid "Cu_t" msgstr "Cor_tar" -#: src/diffuse/main.py:801 +#: src/diffuse/main.py:809 msgid "_Copy" msgstr "_Copiar" -#: src/diffuse/main.py:802 +#: src/diffuse/main.py:810 msgid "_Paste" msgstr "Co_lar" -#: src/diffuse/main.py:804 +#: src/diffuse/main.py:812 msgid "Select _All" msgstr "Seleccion_ar tudo" -#: src/diffuse/main.py:805 +#: src/diffuse/main.py:813 msgid "C_lear Edits" msgstr "_Limpar edição" -#: src/diffuse/main.py:806 +#: src/diffuse/main.py:814 msgid "_Dismiss All Edits" msgstr "_Descartar toda a edição" -#: src/diffuse/main.py:808 +#: src/diffuse/main.py:816 msgid "_Find..." msgstr "_Localizar..." -#: src/diffuse/main.py:809 +#: src/diffuse/main.py:817 msgid "Find _Next" msgstr "Localizar segui_nte" -#: src/diffuse/main.py:810 +#: src/diffuse/main.py:818 msgid "Find Pre_vious" msgstr "Localizar _anterior" -#: src/diffuse/main.py:811 +#: src/diffuse/main.py:819 msgid "_Go To Line..." msgstr "_Ir para linha..." -#: src/diffuse/main.py:813 +#: src/diffuse/main.py:821 msgid "Pr_eferences..." msgstr "Pr_eferências..." -#: src/diffuse/main.py:817 +#: src/diffuse/main.py:825 msgid "None" msgstr "Nada" -#: src/diffuse/main.py:835 +#: src/diffuse/main.py:843 msgid "_View" msgstr "_Ver" -#: src/diffuse/main.py:836 +#: src/diffuse/main.py:844 msgid "_Syntax Highlighting" msgstr "Realce de _sintaxe" -#: src/diffuse/main.py:838 +#: src/diffuse/main.py:846 msgid "Re_align All" msgstr "Re_alinhar tudo" -#: src/diffuse/main.py:839 +#: src/diffuse/main.py:847 msgid "_Isolate" msgstr "_Isolar" -#: src/diffuse/main.py:841 +#: src/diffuse/main.py:849 msgid "_First Difference" msgstr "_Primeira diferença" -#: src/diffuse/main.py:842 +#: src/diffuse/main.py:850 msgid "_Previous Difference" msgstr "Diferença _anterior" -#: src/diffuse/main.py:843 +#: src/diffuse/main.py:851 msgid "_Next Difference" msgstr "Diferença segui_nte" -#: src/diffuse/main.py:844 +#: src/diffuse/main.py:852 msgid "_Last Difference" msgstr "Ú_ltima diferença" -#: src/diffuse/main.py:846 +#: src/diffuse/main.py:854 msgid "Fir_st Tab" msgstr "P_rimeiro separador" -#: src/diffuse/main.py:847 +#: src/diffuse/main.py:855 msgid "Pre_vious Tab" msgstr "_Separador anterior" -#: src/diffuse/main.py:848 +#: src/diffuse/main.py:856 msgid "Next _Tab" msgstr "Separador seguin_te" -#: src/diffuse/main.py:849 +#: src/diffuse/main.py:857 msgid "Las_t Tab" msgstr "Úl_timo separador" -#: src/diffuse/main.py:851 +#: src/diffuse/main.py:859 msgid "Shift Pane _Right" msgstr "Mover separador à di_reita" -#: src/diffuse/main.py:852 +#: src/diffuse/main.py:860 msgid "Shift Pane _Left" msgstr "Mover separador à es_querda" -#: src/diffuse/main.py:855 +#: src/diffuse/main.py:863 msgid "F_ormat" msgstr "F_ormatar" -#: src/diffuse/main.py:856 +#: src/diffuse/main.py:864 msgid "Convert To _Upper Case" msgstr "Converter para maiúsc_ulas" -#: src/diffuse/main.py:857 +#: src/diffuse/main.py:865 msgid "Convert To _Lower Case" msgstr "Converter para minúscu_las" -#: src/diffuse/main.py:859 +#: src/diffuse/main.py:867 msgid "Sort Lines In _Ascending Order" msgstr "Ordenar linhas _ascendentemente" -#: src/diffuse/main.py:860 +#: src/diffuse/main.py:868 msgid "Sort Lines In D_escending Order" msgstr "Ordenar linhas d_escendentemente" -#: src/diffuse/main.py:862 +#: src/diffuse/main.py:870 msgid "Remove Trailing _White Space" msgstr "Remover espaços _finais" -#: src/diffuse/main.py:863 +#: src/diffuse/main.py:871 msgid "Convert Tabs To _Spaces" msgstr "Converter tabulações em e_spaços" -#: src/diffuse/main.py:864 +#: src/diffuse/main.py:872 msgid "Convert Leading Spaces To _Tabs" msgstr "Converter espaços iniciais em _tabulações" -#: src/diffuse/main.py:866 +#: src/diffuse/main.py:874 msgid "_Increase Indenting" msgstr "Aumentar _indentação" -#: src/diffuse/main.py:867 +#: src/diffuse/main.py:875 msgid "De_crease Indenting" msgstr "Di_minuir indentação" -#: src/diffuse/main.py:869 +#: src/diffuse/main.py:877 msgid "Convert To _DOS Format" msgstr "Converter para formato _DOS" -#: src/diffuse/main.py:870 +#: src/diffuse/main.py:878 msgid "Convert To _Mac Format" msgstr "Converter para formato _Mac" -#: src/diffuse/main.py:871 +#: src/diffuse/main.py:879 msgid "Convert To Uni_x Format" msgstr "Converter para formato Uni_x" -#: src/diffuse/main.py:874 +#: src/diffuse/main.py:882 msgid "_Merge" msgstr "_Unir" -#: src/diffuse/main.py:875 +#: src/diffuse/main.py:883 msgid "Copy Selection _Right" msgstr "Copiar selecção à di_reita" -#: src/diffuse/main.py:876 +#: src/diffuse/main.py:884 msgid "Copy Selection _Left" msgstr "Copiar selecção à es_querda" -#: src/diffuse/main.py:878 +#: src/diffuse/main.py:886 msgid "Copy Left _Into Selection" msgstr "Cop_iar esquerda para a selecção" -#: src/diffuse/main.py:879 +#: src/diffuse/main.py:887 msgid "Copy Right I_nto Selection" msgstr "Copiar _direita para a selecção" -#: src/diffuse/main.py:880 +#: src/diffuse/main.py:888 msgid "_Merge From Left Then Right" msgstr "U_nir da esquerda e depois da direita" -#: src/diffuse/main.py:881 +#: src/diffuse/main.py:889 msgid "M_erge From Right Then Left" msgstr "Unir da dir_eita e depois da esquerda" -#: src/diffuse/main.py:884 +#: src/diffuse/main.py:892 msgid "_Help" msgstr "A_juda" -#: src/diffuse/main.py:885 +#: src/diffuse/main.py:893 msgid "_Help Contents..." msgstr "Conteúdo da a_juda..." -#: src/diffuse/main.py:887 +#: src/diffuse/main.py:895 #, python-format msgid "_About %s..." msgstr "_Acerca do %s..." -#: src/diffuse/main.py:902 +#: src/diffuse/main.py:910 msgid "New 2-Way File Merge" msgstr "Nova união de _2 vias" -#: src/diffuse/main.py:903 +#: src/diffuse/main.py:911 msgid "New 3-Way File Merge" msgstr "Nova união de _3 vias" -#: src/diffuse/main.py:905 +#: src/diffuse/main.py:913 msgid "Realign All" msgstr "Realinhar tudo" -#: src/diffuse/main.py:906 +#: src/diffuse/main.py:914 msgid "First Difference" msgstr "Primeira diferença" -#: src/diffuse/main.py:907 +#: src/diffuse/main.py:915 msgid "Previous Difference" msgstr "Diferença anterior" -#: src/diffuse/main.py:908 +#: src/diffuse/main.py:916 msgid "Next Difference" msgstr "Diferença seguinte" -#: src/diffuse/main.py:909 +#: src/diffuse/main.py:917 msgid "Last Difference" msgstr "Última diferença" -#: src/diffuse/main.py:911 +#: src/diffuse/main.py:919 msgid "Copy Selection Right" msgstr "Copiar selecção à direita" -#: src/diffuse/main.py:912 +#: src/diffuse/main.py:920 msgid "Copy Selection Left" msgstr "Copiar selecção à esquerda" -#: src/diffuse/main.py:913 +#: src/diffuse/main.py:921 msgid "Copy Left Into Selection" msgstr "Copiar esquerda para a selecção" -#: src/diffuse/main.py:914 +#: src/diffuse/main.py:922 msgid "Copy Right Into Selection" msgstr "Copiar direita para a selecção" -#: src/diffuse/main.py:915 +#: src/diffuse/main.py:923 msgid "Merge From Left Then Right" msgstr "Unir da esquerda e depois da direita" -#: src/diffuse/main.py:916 +#: src/diffuse/main.py:924 msgid "Merge From Right Then Left" msgstr "Unir da direita e depois da esquerda" -#: src/diffuse/main.py:918 +#: src/diffuse/main.py:926 msgid "Undo" msgstr "Desfazer" -#: src/diffuse/main.py:919 +#: src/diffuse/main.py:927 msgid "Redo" msgstr "Refazer" -#: src/diffuse/main.py:920 src/diffuse/widgets.py:1847 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 msgid "Cut" msgstr "Cortar" -#: src/diffuse/main.py:921 src/diffuse/widgets.py:1848 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 msgid "Copy" msgstr "Copiar" -#: src/diffuse/main.py:922 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 msgid "Paste" msgstr "Colar" -#: src/diffuse/main.py:923 src/diffuse/widgets.py:1852 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 msgid "Clear Edits" msgstr "Limpar edição" -#: src/diffuse/main.py:1046 +#: src/diffuse/main.py:1054 msgid "Some files have unsaved changes. Select the files to save before closing." msgstr "" "Alguns ficheiros têm alterações por gravar. Seleccione os ficheiros a gravar " "antes de fechar." -#: src/diffuse/main.py:1060 +#: src/diffuse/main.py:1068 msgid "Tab" msgstr "Separador" -#: src/diffuse/main.py:1065 +#: src/diffuse/main.py:1073 msgid "Pane" msgstr "Painel" -#: src/diffuse/main.py:1076 +#: src/diffuse/main.py:1084 msgid "Close _Without Saving" msgstr "Fechar sem gra_var" -#: src/diffuse/main.py:1115 +#: src/diffuse/main.py:1123 #, python-format msgid "Closing this tab will quit %s." msgstr "Fechar este painel sai do %s." -#: src/diffuse/main.py:1198 +#: src/diffuse/main.py:1206 #, python-format msgid "File Merge %d" msgstr "União de ficheiros %d" -#: src/diffuse/main.py:1304 +#: src/diffuse/main.py:1312 #, python-format msgid "Error retrieving commits for %s." msgstr "Erro ao obter revisões de %s." -#: src/diffuse/main.py:1336 +#: src/diffuse/main.py:1344 #, python-format msgid "Error retrieving modifications for %s." msgstr "Erro ao obter modificações de %s." -#: src/diffuse/main.py:1369 +#: src/diffuse/main.py:1377 msgid "Open File In New Tab" msgstr "Abrir ficheiro em novo separador" -#: src/diffuse/main.py:1392 +#: src/diffuse/main.py:1400 msgid "Choose Folder With Modified Files" msgstr "Escolher pasta com ficheiros modificados" -#: src/diffuse/main.py:1410 +#: src/diffuse/main.py:1418 msgid "No modified files found." msgstr "Sem ficheiros modificados." -#: src/diffuse/main.py:1416 +#: src/diffuse/main.py:1424 msgid "Choose Folder With Commit" msgstr "Escolher pasta com revisão" -#: src/diffuse/main.py:1436 +#: src/diffuse/main.py:1444 msgid "No committed files found." msgstr "Sem ficheiros revistos." -#: src/diffuse/main.py:1472 +#: src/diffuse/main.py:1480 msgid "New N-Way File Merge..." msgstr "Nova união de N vias..." -#: src/diffuse/main.py:1473 +#: src/diffuse/main.py:1481 msgid "Number of panes: " msgstr "Número de painéis: " -#: src/diffuse/main.py:1547 +#: src/diffuse/main.py:1555 msgid "Phrase not found. Continue from the end of the file?" msgstr "Frase não encontrada. Continuar do final do ficheiro?" -#: src/diffuse/main.py:1549 +#: src/diffuse/main.py:1557 msgid "Phrase not found. Continue from the start of the file?" msgstr "Frase não encontrada. Continuar do início do ficheiro?" -#: src/diffuse/main.py:1770 +#: src/diffuse/main.py:1778 #, fuzzy msgid "" "Usage:\n" @@ -710,174 +679,174 @@ msgstr "" " ( -i | --ignore-case ) ignora diferenças entre maiúsculas\n" " ( -w | --ignore-all-space ) ignora diferenças de espaços" -#: src/diffuse/main.py:1937 +#: src/diffuse/main.py:1945 msgid "Error parsing line number." msgstr "Erro ao analisar o número de linha." -#: src/diffuse/main.py:1947 +#: src/diffuse/main.py:1955 #, python-format msgid "Skipping unknown argument \"%s\"." msgstr "A ignorar argumento desconhecido \"%s\"." -#: src/diffuse/main.py:1955 +#: src/diffuse/main.py:1963 #, python-format msgid "Error processing argument \"%s\". Directory not expected." msgstr "Erro ao processar o argumento \"%s\". Pasta inesperada." -#: src/diffuse/preferences.py:79 +#: src/diffuse/preferences.py:80 msgid "Display" msgstr "Mostrar" -#: src/diffuse/preferences.py:82 +#: src/diffuse/preferences.py:83 msgid "Font" msgstr "Letra" -#: src/diffuse/preferences.py:83 +#: src/diffuse/preferences.py:84 msgid "Tab width" msgstr "Largura de tabulação" -#: src/diffuse/preferences.py:84 +#: src/diffuse/preferences.py:85 msgid "Show right margin" msgstr "Mostrar margem direita" -#: src/diffuse/preferences.py:85 +#: src/diffuse/preferences.py:86 msgid "Right margin" msgstr "Margem direita" -#: src/diffuse/preferences.py:86 +#: src/diffuse/preferences.py:87 msgid "Show line numbers" msgstr "Mostrar números de linha" -#: src/diffuse/preferences.py:87 +#: src/diffuse/preferences.py:88 msgid "Show white space characters" msgstr "Mostrar espaços em branco" -#: src/diffuse/preferences.py:88 +#: src/diffuse/preferences.py:89 msgid "Ignore case differences" msgstr "Ignorar diferenças de maiúsculas" -#: src/diffuse/preferences.py:89 +#: src/diffuse/preferences.py:90 msgid "Ignore white space differences" msgstr "Ignorar diferenças de espaços" -#: src/diffuse/preferences.py:90 src/diffuse/preferences.py:99 +#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100 msgid "Ignore changes to white space" msgstr "Ignorar alterações a espaços" -#: src/diffuse/preferences.py:91 +#: src/diffuse/preferences.py:92 msgid "Ignore blank line differences" msgstr "Ignorar diferenças de linhas em branco" -#: src/diffuse/preferences.py:92 +#: src/diffuse/preferences.py:93 msgid "Ignore end of line differences" msgstr "Ignorar diferenças de fins de linha" -#: src/diffuse/preferences.py:94 +#: src/diffuse/preferences.py:95 msgid "Alignment" msgstr "Alinhamento" -#: src/diffuse/preferences.py:97 +#: src/diffuse/preferences.py:98 msgid "Ignore case" msgstr "Ignorar maiúsculas" -#: src/diffuse/preferences.py:98 +#: src/diffuse/preferences.py:99 msgid "Ignore white space" msgstr "Ignorar espaços" -#: src/diffuse/preferences.py:100 +#: src/diffuse/preferences.py:101 msgid "Ignore blank lines" msgstr "Ignorar linhas em branco" -#: src/diffuse/preferences.py:101 +#: src/diffuse/preferences.py:102 msgid "Ignore end of line characters" msgstr "Ignorar caracteres de fim de linha" -#: src/diffuse/preferences.py:103 +#: src/diffuse/preferences.py:104 msgid "Editor" msgstr "Editor" -#: src/diffuse/preferences.py:106 +#: src/diffuse/preferences.py:107 msgid "Auto indent" msgstr "Indentação automática" -#: src/diffuse/preferences.py:107 +#: src/diffuse/preferences.py:108 msgid "Expand tabs to spaces" msgstr "Expandir tabulações para espaços" -#: src/diffuse/preferences.py:108 +#: src/diffuse/preferences.py:109 msgid "Soft tab width" msgstr "Largura de tabulação suave" -#: src/diffuse/preferences.py:110 +#: src/diffuse/preferences.py:111 msgid "Tabs" msgstr "Separadores" -#: src/diffuse/preferences.py:113 +#: src/diffuse/preferences.py:114 msgid "Default panes" msgstr "Painéis predefinidos" -#: src/diffuse/preferences.py:114 +#: src/diffuse/preferences.py:115 msgid "Always show the tab bar" msgstr "Mostrar sempre a barra de separadores" -#: src/diffuse/preferences.py:115 +#: src/diffuse/preferences.py:116 #, python-format msgid "Warn me when closing a tab will quit %s" msgstr "Avisar se fechar um separador fecha o %s" -#: src/diffuse/preferences.py:117 +#: src/diffuse/preferences.py:118 msgid "Regional Settings" msgstr "Definições regionais" -#: src/diffuse/preferences.py:120 +#: src/diffuse/preferences.py:121 msgid "Default codec" msgstr "Codificação predefinida" -#: src/diffuse/preferences.py:121 +#: src/diffuse/preferences.py:122 msgid "Order of codecs used to identify encoding" msgstr "Ordem de codificações para identificar a codificação" -#: src/diffuse/preferences.py:142 +#: src/diffuse/preferences.py:143 msgid "Cygwin" msgstr "Cygwin" -#: src/diffuse/preferences.py:144 +#: src/diffuse/preferences.py:145 msgid "Root directory" msgstr "Pasta raiz" -#: src/diffuse/preferences.py:145 +#: src/diffuse/preferences.py:146 msgid "Cygdrive prefix" msgstr "Prefixo cygdrive" -#: src/diffuse/preferences.py:164 +#: src/diffuse/preferences.py:165 msgid "Version control system search order" msgstr "" -#: src/diffuse/preferences.py:172 +#: src/diffuse/preferences.py:173 msgid "\"co\" command" msgstr "comando \"co\"" -#: src/diffuse/preferences.py:173 +#: src/diffuse/preferences.py:174 msgid "\"rlog\" command" msgstr "comando \"rlog\"" -#: src/diffuse/preferences.py:175 +#: src/diffuse/preferences.py:176 msgid "Command" msgstr "Comando" -#: src/diffuse/preferences.py:181 +#: src/diffuse/preferences.py:182 msgid "Launch from a Bash login shell" msgstr "Iniciar numa consola de sessão bash" -#: src/diffuse/preferences.py:188 +#: src/diffuse/preferences.py:189 msgid "Update paths for Cygwin" msgstr "Actualizar caminhos para o Cygwin" -#: src/diffuse/preferences.py:193 +#: src/diffuse/preferences.py:194 msgid "Version Control" msgstr "Controlo de versões" -#: src/diffuse/preferences.py:258 +#: src/diffuse/preferences.py:259 msgid "Preferences" msgstr "Preferências" @@ -909,7 +878,7 @@ msgstr "" #: src/diffuse/resources.py:409 #, python-brace-format -msgid "Options \"{option}\" is unknown" +msgid "Option \"{option}\" is unknown" msgstr "" #: src/diffuse/resources.py:416 @@ -962,40 +931,71 @@ msgstr "Erro ao processar a linha {line} de {file}." msgid "Unhandled error at line {line} of {file}." msgstr "Erro ao processar a linha {line} de {file}." -#: src/diffuse/utils.py:63 +#: src/diffuse/utils.py:66 msgid "Auto Detect" msgstr "Detecção automática" -#: src/diffuse/vcs/cvs.py:53 src/diffuse/vcs/rcs.py:62 src/diffuse/vcs/svn.py:95 +#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97 #, python-format msgid "Error parsing revision %s." msgstr "Erro ao analisar a revisão %s." -#: src/diffuse/vcs/vcs_registry.py:233 +#: src/diffuse/vcs/vcs_registry.py:238 #, python-format msgid "Error parsing %s." msgstr "Erro ao analisar %s." -#: src/diffuse/widgets.py:1843 +#: src/diffuse/widgets.py:1845 msgid "Align with Selection" msgstr "Alinhar com a selecção" -#: src/diffuse/widgets.py:1844 +#: src/diffuse/widgets.py:1846 msgid "Isolate" msgstr "Isolar" -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1847 msgid "Merge Selection" msgstr "Unir selecção" -#: src/diffuse/widgets.py:1851 +#: src/diffuse/widgets.py:1853 msgid "Select All" msgstr "Seleccionar tudo" -#: src/diffuse/widgets.py:1854 +#: src/diffuse/widgets.py:1856 msgid "Swap with Selected Pane" msgstr "Trocar com o painel seleccionado" +#, fuzzy +#~ msgid "" +#~ "This program is free software; you can redistribute it and/or modify\n" +#~ "it under the terms of the GNU General Public License as published by\n" +#~ "the Free Software Foundation; either version 2 of the License, or\n" +#~ "(at your option) any later version.\n" +#~ "\n" +#~ "This program is distributed in the hope that it will be useful,\n" +#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +#~ "GNU General Public License for more details.\n" +#~ "\n" +#~ "You should have received a copy of the GNU General Public License along\n" +#~ "with this program; if not, write to the Free Software Foundation, Inc.,\n" +#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." +#~ msgstr "" +#~ "Este programa é gratuito; pode redistribuí-lo e/ou modificá-lo sob os termos " +#~ "da GNU General Public License como publicada pela Free Software Foundation; " +#~ "seja a versão 2 da licença, ou (por opção sua) qualquer versão posterior.\n" +#~ "\n" +#~ "Este programa é distribuído na esperança de ser útil, mas SEM QUALQUER " +#~ "GARANTIA; nem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO A UM " +#~ "PROPÓSITO EM PARTICULAR. Veja a GNU General Public License para mais " +#~ "detalhes.\n" +#~ "\n" +#~ "Deverá ter recebido uma cópia da GNU General Public License juntamente com o " +#~ "programa. Também pode obter uma cópia da GNU General Public License da Free " +#~ "Software Foundation visitando a sua página web (http://www.fsf.org/) ou " +#~ "escrevendo para Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, " +#~ "Boston, MA 02110-1301 USA\n" + #~ msgid "Diffuse Merge Tool" #~ msgstr "Diffuse Ferramenta de união" diff --git a/po/pt_BR.po b/po/pt_BR.po index 5432ca3..863686c 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,18 +7,18 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-27 21:56-0500\n" -"PO-Revision-Date: 2021-11-05 14:49-0400\n" +"POT-Creation-Date: 2022-04-04 12:14-0400\n" +"PO-Revision-Date: 2022-04-04 12:19-0400\n" "Last-Translator: Pedro Albuquerque \n" "Language-Team: Português \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Gtranslator 2.91.7\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 3.0.1\n" "X-Poedit-SourceCharset: UTF-8\n" -"X-Poedit-Basepath: ..\\src\\usr\\bin\n" +"X-Poedit-Basepath: ../src/usr/bin\n" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" @@ -43,7 +43,7 @@ msgstr "" msgid "Main window: diff between two files" msgstr "" -#: src/diffuse/constants.py:24 +#: src/diffuse/constants.py:25 msgid "Copyright" msgstr "Direitos autorais" @@ -56,38 +56,6 @@ msgstr "" msgid "translator-credits" msgstr "Pedro Albuquerque " -#: src/diffuse/dialogs.py:49 -#, fuzzy -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License along\n" -"with this program; if not, write to the Free Software Foundation, Inc.,\n" -"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." -msgstr "" -"Este programa é de software livre; pode redistribuí-lo e/ou modificá-lo sob os " -"termos da GNU General Public License como publicada pela Free Software " -"Foundation; seja a versão 2 da licença, ou (por opção sua) qualquer versão mais " -"recente.\n" -"\n" -"Este programa é distribuído na esperança de ser útil, mas SEM QUALQUER GARANTIA; " -"nem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO A UM PROPÓSITO EM " -"PARTICULAR. Veja a GNU General Public License para mais detalhes.\n" -"\n" -"Deverá ter recebido uma cópia da GNU General Public License juntamente com o " -"programa. Também pode obter uma cópia da GNU General Public License da Free " -"Software Foundation visitando a sua página web (http://www.fsf.org/) ou " -"escrevendo para Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, " -"Boston, MA 02110-1301 USA\n" - #: src/diffuse/dialogs.py:83 msgid "Encoding: " msgstr "Codificação: " @@ -112,60 +80,60 @@ msgstr "Combinar maiúsculas" msgid "Search Backwards" msgstr "Procurar para trás" -#: src/diffuse/main.py:79 +#: src/diffuse/main.py:85 msgid "Close Tab" msgstr "Fechar aba" -#: src/diffuse/main.py:124 +#: src/diffuse/main.py:132 msgid "Open File..." msgstr "Abrir arquivo..." -#: src/diffuse/main.py:125 +#: src/diffuse/main.py:133 msgid "Reload File" msgstr "Recarregar arquivo" -#: src/diffuse/main.py:126 +#: src/diffuse/main.py:134 msgid "Save File" msgstr "Salvar arquivo" -#: src/diffuse/main.py:127 +#: src/diffuse/main.py:135 msgid "Save File As..." msgstr "Salvar arquivo como..." -#: src/diffuse/main.py:280 +#: src/diffuse/main.py:288 msgid "Save changes before loading the new file?" msgstr "Salvar alterações antes de carregar o novo arquivo?" -#: src/diffuse/main.py:391 +#: src/diffuse/main.py:399 #, python-format msgid "Error reading revision %(rev)s of %(file)s." msgstr "Erro ao ler a revisão %(rev)s de %(file)s." -#: src/diffuse/main.py:394 src/diffuse/main.py:1849 +#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #, python-format msgid "Error reading %s." msgstr "Erro ao ler %s." -#: src/diffuse/main.py:416 +#: src/diffuse/main.py:424 msgid "Open File" msgstr "Abrir arquivo" -#: src/diffuse/main.py:473 +#: src/diffuse/main.py:481 #, python-format 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?" -#: src/diffuse/main.py:499 +#: src/diffuse/main.py:507 #, python-format msgid "Save %(title)s Pane %(pane)d" msgstr "Salvar %(title)s painel %(pane)d" -#: src/diffuse/main.py:531 +#: src/diffuse/main.py:539 #, python-format msgid "A file named %s already exists. Do you want to overwrite it?" msgstr "Já existe um arquivo chamado %s. Quer substituí-lo?" -#: src/diffuse/main.py:538 +#: src/diffuse/main.py:546 #, python-format msgid "" "The file %s has been modified by another process since reading it. If you save, " @@ -175,25 +143,25 @@ msgstr "" "salvar agora, perderá todas as alterações feitas fora deste programa. Salvar de " "qualquer forma?" -#: src/diffuse/main.py:580 +#: src/diffuse/main.py:588 #, python-format msgid "Error encoding to %s." msgstr "Erro ao codificar para %s." -#: src/diffuse/main.py:584 src/diffuse/preferences.py:298 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 #, python-format msgid "Error writing %s." msgstr "Erro ao salvar %s." -#: src/diffuse/main.py:614 +#: src/diffuse/main.py:622 msgid "Go To Line..." msgstr "Ir para linha..." -#: src/diffuse/main.py:615 +#: src/diffuse/main.py:623 msgid "Line Number: " msgstr "Número de linha: " -#: src/diffuse/main.py:646 +#: src/diffuse/main.py:654 msgid "" "Press the enter key or double click to edit. Press the space bar or use the RMB " "menu to manually align." @@ -201,11 +169,11 @@ msgstr "" "Pressione Enter ou faça duplo clique para editar. Pressione a barra de espaço ou " "use o menu RMB para alinhar manualmente." -#: src/diffuse/main.py:650 +#: src/diffuse/main.py:658 msgid "Press the escape key to finish editing." msgstr "Pressione Esc para terminar a edição." -#: src/diffuse/main.py:653 +#: src/diffuse/main.py:661 msgid "" "Select target line and press the space bar to align. Press the escape key to " "cancel." @@ -213,426 +181,426 @@ msgstr "" "Selecione a linha alvo e pressione a barra de espaço para alinhar. Pressione Esc " "para cancelar." -#: src/diffuse/main.py:776 +#: src/diffuse/main.py:784 msgid "_File" msgstr "Arquivo" -#: src/diffuse/main.py:777 +#: src/diffuse/main.py:785 msgid "_Open File..." msgstr "Abrir arquiv_o..." -#: src/diffuse/main.py:778 +#: src/diffuse/main.py:786 msgid "Open File In New _Tab..." msgstr "Abrir arquivo em no_va aba..." -#: src/diffuse/main.py:779 +#: src/diffuse/main.py:787 msgid "Open _Modified Files..." msgstr "Abrir arquivos _modificados..." -#: src/diffuse/main.py:780 +#: src/diffuse/main.py:788 msgid "Open Commi_t..." msgstr "Abrir rev_isão..." -#: src/diffuse/main.py:781 +#: src/diffuse/main.py:789 msgid "_Reload File" msgstr "_Recarregar arquivo" -#: src/diffuse/main.py:783 +#: src/diffuse/main.py:791 msgid "_Save File" msgstr "_Salvar arquivo" -#: src/diffuse/main.py:784 +#: src/diffuse/main.py:792 msgid "Save File _As..." msgstr "Salvar _arquivo como..." -#: src/diffuse/main.py:785 +#: src/diffuse/main.py:793 msgid "Save A_ll" msgstr "Sa_lvar tudo" -#: src/diffuse/main.py:787 +#: src/diffuse/main.py:795 msgid "New _2-Way File Merge" msgstr "Nova unificação de _2 vias" -#: src/diffuse/main.py:788 +#: src/diffuse/main.py:796 msgid "New _3-Way File Merge" msgstr "Nova unificação de _3 vias" -#: src/diffuse/main.py:789 +#: src/diffuse/main.py:797 msgid "New _N-Way File Merge..." -msgstr "Nova unificação de _N vias" +msgstr "Nova unificação de _N vias..." -#: src/diffuse/main.py:791 +#: src/diffuse/main.py:799 msgid "_Close Tab" msgstr "Fe_char aba" -#: src/diffuse/main.py:792 +#: src/diffuse/main.py:800 msgid "_Undo Close Tab" msgstr "Desfa_zer fechamento da aba" -#: src/diffuse/main.py:793 +#: src/diffuse/main.py:801 msgid "_Quit" msgstr "_Sair" -#: src/diffuse/main.py:796 +#: src/diffuse/main.py:804 msgid "_Edit" msgstr "_Editar" -#: src/diffuse/main.py:797 +#: src/diffuse/main.py:805 msgid "_Undo" msgstr "_Desfazer" -#: src/diffuse/main.py:798 +#: src/diffuse/main.py:806 msgid "_Redo" msgstr "_Refazer" -#: src/diffuse/main.py:800 +#: src/diffuse/main.py:808 msgid "Cu_t" msgstr "Cor_tar" -#: src/diffuse/main.py:801 +#: src/diffuse/main.py:809 msgid "_Copy" msgstr "_Copiar" -#: src/diffuse/main.py:802 +#: src/diffuse/main.py:810 msgid "_Paste" msgstr "Co_lar" -#: src/diffuse/main.py:804 +#: src/diffuse/main.py:812 msgid "Select _All" msgstr "Selecion_ar tudo" -#: src/diffuse/main.py:805 +#: src/diffuse/main.py:813 msgid "C_lear Edits" msgstr "_Limpar edições" -#: src/diffuse/main.py:806 +#: src/diffuse/main.py:814 msgid "_Dismiss All Edits" msgstr "_Descartar toda a edição" -#: src/diffuse/main.py:808 +#: src/diffuse/main.py:816 msgid "_Find..." msgstr "_Encontrar..." -#: src/diffuse/main.py:809 +#: src/diffuse/main.py:817 msgid "Find _Next" msgstr "Encontrar segui_nte" -#: src/diffuse/main.py:810 +#: src/diffuse/main.py:818 msgid "Find Pre_vious" msgstr "Encontrar _anterior" -#: src/diffuse/main.py:811 +#: src/diffuse/main.py:819 msgid "_Go To Line..." msgstr "_Ir para linha..." -#: src/diffuse/main.py:813 +#: src/diffuse/main.py:821 msgid "Pr_eferences..." msgstr "Pr_eferências..." -#: src/diffuse/main.py:817 +#: src/diffuse/main.py:825 msgid "None" msgstr "Nenhuma" -#: src/diffuse/main.py:835 +#: src/diffuse/main.py:843 msgid "_View" msgstr "_Ver" -#: src/diffuse/main.py:836 +#: src/diffuse/main.py:844 msgid "_Syntax Highlighting" msgstr "Destaque de _sintaxe" -#: src/diffuse/main.py:838 +#: src/diffuse/main.py:846 msgid "Re_align All" msgstr "Re_alinhar tudo" -#: src/diffuse/main.py:839 +#: src/diffuse/main.py:847 msgid "_Isolate" msgstr "_Isolar" -#: src/diffuse/main.py:841 +#: src/diffuse/main.py:849 msgid "_First Difference" msgstr "_Primeira diferença" -#: src/diffuse/main.py:842 +#: src/diffuse/main.py:850 msgid "_Previous Difference" msgstr "Diferença _anterior" -#: src/diffuse/main.py:843 +#: src/diffuse/main.py:851 msgid "_Next Difference" msgstr "Diferença segui_nte" -#: src/diffuse/main.py:844 +#: src/diffuse/main.py:852 msgid "_Last Difference" msgstr "Ú_ltima diferença" -#: src/diffuse/main.py:846 +#: src/diffuse/main.py:854 msgid "Fir_st Tab" msgstr "P_rimeira aba" -#: src/diffuse/main.py:847 +#: src/diffuse/main.py:855 msgid "Pre_vious Tab" msgstr "_Aba anterior" -#: src/diffuse/main.py:848 +#: src/diffuse/main.py:856 msgid "Next _Tab" msgstr "Aba seguin_te" -#: src/diffuse/main.py:849 +#: src/diffuse/main.py:857 msgid "Las_t Tab" msgstr "Úl_tima aba" -#: src/diffuse/main.py:851 +#: src/diffuse/main.py:859 msgid "Shift Pane _Right" msgstr "Mover painel à di_reita" -#: src/diffuse/main.py:852 +#: src/diffuse/main.py:860 msgid "Shift Pane _Left" msgstr "Mover painel à es_querda" -#: src/diffuse/main.py:855 +#: src/diffuse/main.py:863 msgid "F_ormat" msgstr "F_ormatar" -#: src/diffuse/main.py:856 +#: src/diffuse/main.py:864 msgid "Convert To _Upper Case" msgstr "Converter para maiúsc_ulas" -#: src/diffuse/main.py:857 +#: src/diffuse/main.py:865 msgid "Convert To _Lower Case" msgstr "Converter para minúscu_las" -#: src/diffuse/main.py:859 +#: src/diffuse/main.py:867 msgid "Sort Lines In _Ascending Order" msgstr "Ordenar linhas _ascendentemente" -#: src/diffuse/main.py:860 +#: src/diffuse/main.py:868 msgid "Sort Lines In D_escending Order" msgstr "Ordenar linhas d_escendentemente" -#: src/diffuse/main.py:862 +#: src/diffuse/main.py:870 msgid "Remove Trailing _White Space" msgstr "Remover espaços _finais" -#: src/diffuse/main.py:863 +#: src/diffuse/main.py:871 msgid "Convert Tabs To _Spaces" msgstr "Converter tabulações em e_spaços" -#: src/diffuse/main.py:864 +#: src/diffuse/main.py:872 msgid "Convert Leading Spaces To _Tabs" msgstr "Converter espaços iniciais em _tabulações" -#: src/diffuse/main.py:866 +#: src/diffuse/main.py:874 msgid "_Increase Indenting" msgstr "Aumentar _indentação" -#: src/diffuse/main.py:867 +#: src/diffuse/main.py:875 msgid "De_crease Indenting" msgstr "Di_minuir indentação" -#: src/diffuse/main.py:869 +#: src/diffuse/main.py:877 msgid "Convert To _DOS Format" msgstr "Converter para formato _DOS" -#: src/diffuse/main.py:870 +#: src/diffuse/main.py:878 msgid "Convert To _Mac Format" msgstr "Converter para formato _Mac" -#: src/diffuse/main.py:871 +#: src/diffuse/main.py:879 msgid "Convert To Uni_x Format" msgstr "Converter para formato Uni_x" -#: src/diffuse/main.py:874 +#: src/diffuse/main.py:882 msgid "_Merge" msgstr "_Unificar" -#: src/diffuse/main.py:875 +#: src/diffuse/main.py:883 msgid "Copy Selection _Right" msgstr "Copiar seleção à di_reita" -#: src/diffuse/main.py:876 +#: src/diffuse/main.py:884 msgid "Copy Selection _Left" msgstr "Copiar seleção à es_querda" -#: src/diffuse/main.py:878 +#: src/diffuse/main.py:886 msgid "Copy Left _Into Selection" msgstr "Cop_iar da esquerda para a seleção" -#: src/diffuse/main.py:879 +#: src/diffuse/main.py:887 msgid "Copy Right I_nto Selection" msgstr "Copiar da _direita para a seleção" -#: src/diffuse/main.py:880 +#: src/diffuse/main.py:888 msgid "_Merge From Left Then Right" msgstr "U_nificar da esquerda e depois da direita" -#: src/diffuse/main.py:881 +#: src/diffuse/main.py:889 msgid "M_erge From Right Then Left" msgstr "Unificar da dir_eita e depois da esquerda" -#: src/diffuse/main.py:884 +#: src/diffuse/main.py:892 msgid "_Help" msgstr "A_juda" -#: src/diffuse/main.py:885 +#: src/diffuse/main.py:893 msgid "_Help Contents..." msgstr "Conteúdo da a_juda..." -#: src/diffuse/main.py:887 +#: src/diffuse/main.py:895 #, python-format msgid "_About %s..." msgstr "_Sobre %s..." -#: src/diffuse/main.py:902 +#: src/diffuse/main.py:910 msgid "New 2-Way File Merge" msgstr "Nova unificação de _2 vias" -#: src/diffuse/main.py:903 +#: src/diffuse/main.py:911 msgid "New 3-Way File Merge" msgstr "Nova unificação de _3 vias" -#: src/diffuse/main.py:905 +#: src/diffuse/main.py:913 msgid "Realign All" msgstr "Realinhar tudo" -#: src/diffuse/main.py:906 +#: src/diffuse/main.py:914 msgid "First Difference" msgstr "Primeira diferença" -#: src/diffuse/main.py:907 +#: src/diffuse/main.py:915 msgid "Previous Difference" msgstr "Diferença anterior" -#: src/diffuse/main.py:908 +#: src/diffuse/main.py:916 msgid "Next Difference" msgstr "Diferença seguinte" -#: src/diffuse/main.py:909 +#: src/diffuse/main.py:917 msgid "Last Difference" msgstr "Última diferença" -#: src/diffuse/main.py:911 +#: src/diffuse/main.py:919 msgid "Copy Selection Right" msgstr "Copiar seleção à direita" -#: src/diffuse/main.py:912 +#: src/diffuse/main.py:920 msgid "Copy Selection Left" msgstr "Copiar seleção à esquerda" -#: src/diffuse/main.py:913 +#: src/diffuse/main.py:921 msgid "Copy Left Into Selection" msgstr "Copiar da esquerda para a seleção" -#: src/diffuse/main.py:914 +#: src/diffuse/main.py:922 msgid "Copy Right Into Selection" msgstr "Copiar da direita para a seleção" -#: src/diffuse/main.py:915 +#: src/diffuse/main.py:923 msgid "Merge From Left Then Right" msgstr "Unificar da esquerda e depois da direita" -#: src/diffuse/main.py:916 +#: src/diffuse/main.py:924 msgid "Merge From Right Then Left" msgstr "Unificar da direita e depois da esquerda" -#: src/diffuse/main.py:918 +#: src/diffuse/main.py:926 msgid "Undo" msgstr "Desfazer" -#: src/diffuse/main.py:919 +#: src/diffuse/main.py:927 msgid "Redo" msgstr "Refazer" -#: src/diffuse/main.py:920 src/diffuse/widgets.py:1847 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 msgid "Cut" msgstr "Cortar" -#: src/diffuse/main.py:921 src/diffuse/widgets.py:1848 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 msgid "Copy" msgstr "Copiar" -#: src/diffuse/main.py:922 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 msgid "Paste" msgstr "Colar" -#: src/diffuse/main.py:923 src/diffuse/widgets.py:1852 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 msgid "Clear Edits" msgstr "Limpar edições" -#: src/diffuse/main.py:1046 +#: src/diffuse/main.py:1054 msgid "Some files have unsaved changes. Select the files to save before closing." msgstr "" "Alguns arquivos têm alterações não salvas. Selecione os arquivos para salvar " "antes de fechar." -#: src/diffuse/main.py:1060 +#: src/diffuse/main.py:1068 msgid "Tab" msgstr "Aba" -#: src/diffuse/main.py:1065 +#: src/diffuse/main.py:1073 msgid "Pane" msgstr "Painel" -#: src/diffuse/main.py:1076 +#: src/diffuse/main.py:1084 msgid "Close _Without Saving" msgstr "Fechar sem sal_var" -#: src/diffuse/main.py:1115 +#: src/diffuse/main.py:1123 #, python-format msgid "Closing this tab will quit %s." msgstr "Fechamento da aba resultará em saída do %s." -#: src/diffuse/main.py:1198 +#: src/diffuse/main.py:1206 #, python-format msgid "File Merge %d" msgstr "Unificação de arquivos %d" -#: src/diffuse/main.py:1304 +#: src/diffuse/main.py:1312 #, python-format msgid "Error retrieving commits for %s." msgstr "Erro ao obter revisões de %s." -#: src/diffuse/main.py:1336 +#: src/diffuse/main.py:1344 #, python-format msgid "Error retrieving modifications for %s." msgstr "Erro ao obter modificações de %s." -#: src/diffuse/main.py:1369 +#: src/diffuse/main.py:1377 msgid "Open File In New Tab" msgstr "Abrir arquivo em nova aba" -#: src/diffuse/main.py:1392 +#: src/diffuse/main.py:1400 msgid "Choose Folder With Modified Files" msgstr "Escolher pasta com arquivos modificados" -#: src/diffuse/main.py:1410 +#: src/diffuse/main.py:1418 msgid "No modified files found." msgstr "Nenhum arquivo modificado." -#: src/diffuse/main.py:1416 +#: src/diffuse/main.py:1424 msgid "Choose Folder With Commit" msgstr "Escolher pasta com revisão" -#: src/diffuse/main.py:1436 +#: src/diffuse/main.py:1444 msgid "No committed files found." msgstr "Sem arquivos confirmados." -#: src/diffuse/main.py:1472 +#: src/diffuse/main.py:1480 msgid "New N-Way File Merge..." msgstr "Nova unificação de N vias..." -#: src/diffuse/main.py:1473 +#: src/diffuse/main.py:1481 msgid "Number of panes: " msgstr "Número de painéis: " -#: src/diffuse/main.py:1547 +#: src/diffuse/main.py:1555 msgid "Phrase not found. Continue from the end of the file?" msgstr "Frase não encontrada. Continuar a partir do final do arquivo?" -#: src/diffuse/main.py:1549 +#: src/diffuse/main.py:1557 msgid "Phrase not found. Continue from the start of the file?" msgstr "Frase não encontrada. Continuar desde o início do arquivo?" -#: src/diffuse/main.py:1770 +#: src/diffuse/main.py:1778 #, fuzzy msgid "" "Usage:\n" @@ -712,174 +680,174 @@ msgstr "" " ( -i | --ignore-case ) ignora diferenças entre maiúsculas\n" " ( -w | --ignore-all-space ) ignora diferenças de espaços" -#: src/diffuse/main.py:1937 +#: src/diffuse/main.py:1945 msgid "Error parsing line number." msgstr "Erro ao analisar o número de linha." -#: src/diffuse/main.py:1947 +#: src/diffuse/main.py:1955 #, python-format msgid "Skipping unknown argument \"%s\"." msgstr "Omitindo argumento desconhecido \"%s\"." -#: src/diffuse/main.py:1955 +#: src/diffuse/main.py:1963 #, python-format msgid "Error processing argument \"%s\". Directory not expected." msgstr "Erro ao processar o argumento \"%s\". Pasta inesperada." -#: src/diffuse/preferences.py:79 +#: src/diffuse/preferences.py:80 msgid "Display" msgstr "Mostrar" -#: src/diffuse/preferences.py:82 +#: src/diffuse/preferences.py:83 msgid "Font" msgstr "Letra" -#: src/diffuse/preferences.py:83 +#: src/diffuse/preferences.py:84 msgid "Tab width" msgstr "Largura de tabulação" -#: src/diffuse/preferences.py:84 +#: src/diffuse/preferences.py:85 msgid "Show right margin" msgstr "Mostrar margem direita" -#: src/diffuse/preferences.py:85 +#: src/diffuse/preferences.py:86 msgid "Right margin" msgstr "Margem direita" -#: src/diffuse/preferences.py:86 +#: src/diffuse/preferences.py:87 msgid "Show line numbers" msgstr "Mostrar números de linha" -#: src/diffuse/preferences.py:87 +#: src/diffuse/preferences.py:88 msgid "Show white space characters" msgstr "Mostrar espaços em branco" -#: src/diffuse/preferences.py:88 +#: src/diffuse/preferences.py:89 msgid "Ignore case differences" msgstr "Ignorar diferenças de maiúsculas" -#: src/diffuse/preferences.py:89 +#: src/diffuse/preferences.py:90 msgid "Ignore white space differences" msgstr "Ignorar diferenças de espaços" -#: src/diffuse/preferences.py:90 src/diffuse/preferences.py:99 +#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100 msgid "Ignore changes to white space" msgstr "Ignorar alterações para espaços" -#: src/diffuse/preferences.py:91 +#: src/diffuse/preferences.py:92 msgid "Ignore blank line differences" msgstr "Ignorar diferenças de linhas em branco" -#: src/diffuse/preferences.py:92 +#: src/diffuse/preferences.py:93 msgid "Ignore end of line differences" msgstr "Ignorar diferenças de fins de linha" -#: src/diffuse/preferences.py:94 +#: src/diffuse/preferences.py:95 msgid "Alignment" msgstr "Alinhamento" -#: src/diffuse/preferences.py:97 +#: src/diffuse/preferences.py:98 msgid "Ignore case" msgstr "Ignorar maiúsculas" -#: src/diffuse/preferences.py:98 +#: src/diffuse/preferences.py:99 msgid "Ignore white space" msgstr "Ignorar espaços" -#: src/diffuse/preferences.py:100 +#: src/diffuse/preferences.py:101 msgid "Ignore blank lines" msgstr "Ignorar linhas em branco" -#: src/diffuse/preferences.py:101 +#: src/diffuse/preferences.py:102 msgid "Ignore end of line characters" msgstr "Ignorar caracteres de fim de linha" -#: src/diffuse/preferences.py:103 +#: src/diffuse/preferences.py:104 msgid "Editor" msgstr "Editor" -#: src/diffuse/preferences.py:106 +#: src/diffuse/preferences.py:107 msgid "Auto indent" msgstr "Indentação automática" -#: src/diffuse/preferences.py:107 +#: src/diffuse/preferences.py:108 msgid "Expand tabs to spaces" msgstr "Expandir tabulações para espaços" -#: src/diffuse/preferences.py:108 +#: src/diffuse/preferences.py:109 msgid "Soft tab width" msgstr "Largura de tabulação suave" -#: src/diffuse/preferences.py:110 +#: src/diffuse/preferences.py:111 msgid "Tabs" msgstr "Abas" -#: src/diffuse/preferences.py:113 +#: src/diffuse/preferences.py:114 msgid "Default panes" msgstr "Painéis padrão" -#: src/diffuse/preferences.py:114 +#: src/diffuse/preferences.py:115 msgid "Always show the tab bar" msgstr "Mostrar sempre a barra de abas" -#: src/diffuse/preferences.py:115 +#: src/diffuse/preferences.py:116 #, python-format msgid "Warn me when closing a tab will quit %s" msgstr "Avise quando fechamento da aba resultará em saída do %s" -#: src/diffuse/preferences.py:117 +#: src/diffuse/preferences.py:118 msgid "Regional Settings" msgstr "Definições regionais" -#: src/diffuse/preferences.py:120 +#: src/diffuse/preferences.py:121 msgid "Default codec" msgstr "Codificação padrão" -#: src/diffuse/preferences.py:121 +#: src/diffuse/preferences.py:122 msgid "Order of codecs used to identify encoding" msgstr "Ordem de codificações para identificar a codificação" -#: src/diffuse/preferences.py:142 +#: src/diffuse/preferences.py:143 msgid "Cygwin" msgstr "Cygwin" -#: src/diffuse/preferences.py:144 +#: src/diffuse/preferences.py:145 msgid "Root directory" msgstr "Pasta Root" -#: src/diffuse/preferences.py:145 +#: src/diffuse/preferences.py:146 msgid "Cygdrive prefix" msgstr "Prefixo Cygdrive" -#: src/diffuse/preferences.py:164 +#: src/diffuse/preferences.py:165 msgid "Version control system search order" msgstr "" -#: src/diffuse/preferences.py:172 +#: src/diffuse/preferences.py:173 msgid "\"co\" command" msgstr "comando \"co\"" -#: src/diffuse/preferences.py:173 +#: src/diffuse/preferences.py:174 msgid "\"rlog\" command" msgstr "comando \"rlog\"" -#: src/diffuse/preferences.py:175 +#: src/diffuse/preferences.py:176 msgid "Command" msgstr "Comando" -#: src/diffuse/preferences.py:181 +#: src/diffuse/preferences.py:182 msgid "Launch from a Bash login shell" msgstr "Iniciar numa consola de sessão Bash" -#: src/diffuse/preferences.py:188 +#: src/diffuse/preferences.py:189 msgid "Update paths for Cygwin" msgstr "Actualizar caminhos para o Cygwin" -#: src/diffuse/preferences.py:193 +#: src/diffuse/preferences.py:194 msgid "Version Control" msgstr "Controlo de versões" -#: src/diffuse/preferences.py:258 +#: src/diffuse/preferences.py:259 msgid "Preferences" msgstr "Preferências" @@ -911,7 +879,7 @@ msgstr "" #: src/diffuse/resources.py:409 #, python-brace-format -msgid "Options \"{option}\" is unknown" +msgid "Option \"{option}\" is unknown" msgstr "" #: src/diffuse/resources.py:416 @@ -964,40 +932,72 @@ msgstr "Erro ao processar a linha {line} de {file}." msgid "Unhandled error at line {line} of {file}." msgstr "Erro ao processar a linha {line} de {file}." -#: src/diffuse/utils.py:63 +#: src/diffuse/utils.py:66 msgid "Auto Detect" msgstr "Detecção automática" -#: src/diffuse/vcs/cvs.py:53 src/diffuse/vcs/rcs.py:62 src/diffuse/vcs/svn.py:95 +#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97 #, python-format msgid "Error parsing revision %s." msgstr "Erro ao analisar a revisão %s." -#: src/diffuse/vcs/vcs_registry.py:233 +#: src/diffuse/vcs/vcs_registry.py:238 #, python-format msgid "Error parsing %s." msgstr "Erro ao analisar %s." -#: src/diffuse/widgets.py:1843 +#: src/diffuse/widgets.py:1845 msgid "Align with Selection" msgstr "Alinhar com a seleção" -#: src/diffuse/widgets.py:1844 +#: src/diffuse/widgets.py:1846 msgid "Isolate" msgstr "Isolar" -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1847 msgid "Merge Selection" msgstr "Unir seleção" -#: src/diffuse/widgets.py:1851 +#: src/diffuse/widgets.py:1853 msgid "Select All" msgstr "Selecionar tudo" -#: src/diffuse/widgets.py:1854 +#: src/diffuse/widgets.py:1856 msgid "Swap with Selected Pane" msgstr "Trocar com o painel selecionado" +#, fuzzy +#~ msgid "" +#~ "This program is free software; you can redistribute it and/or modify\n" +#~ "it under the terms of the GNU General Public License as published by\n" +#~ "the Free Software Foundation; either version 2 of the License, or\n" +#~ "(at your option) any later version.\n" +#~ "\n" +#~ "This program is distributed in the hope that it will be useful,\n" +#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +#~ "GNU General Public License for more details.\n" +#~ "\n" +#~ "You should have received a copy of the GNU General Public License along\n" +#~ "with this program; if not, write to the Free Software Foundation, Inc.,\n" +#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." +#~ msgstr "" +#~ "Este programa é de software livre; pode redistribuí-lo e/ou modificá-lo sob os " +#~ "termos da GNU General Public License como publicada pela Free Software " +#~ "Foundation; seja a versão 2 da licença, ou (por opção sua) qualquer versão " +#~ "mais recente.\n" +#~ "\n" +#~ "Este programa é distribuído na esperança de ser útil, mas SEM QUALQUER " +#~ "GARANTIA; nem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO A UM " +#~ "PROPÓSITO EM PARTICULAR. Veja a GNU General Public License para mais " +#~ "detalhes.\n" +#~ "\n" +#~ "Deverá ter recebido uma cópia da GNU General Public License juntamente com o " +#~ "programa. Também pode obter uma cópia da GNU General Public License da Free " +#~ "Software Foundation visitando a sua página web (http://www.fsf.org/) ou " +#~ "escrevendo para Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, " +#~ "Boston, MA 02110-1301 USA\n" + #~ msgid "Diffuse Merge Tool" #~ msgstr "Diffuse Ferramenta de unificação" diff --git a/po/ru.po b/po/ru.po index b888f88..9d4678c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-27 21:56-0500\n" -"PO-Revision-Date: 2020-06-29 14:49-0400\n" +"POT-Creation-Date: 2022-04-04 12:14-0400\n" +"PO-Revision-Date: 2022-04-04 12:19-0400\n" "Last-Translator: Oleg Pakhtusov \n" "Language-Team: Russian \n" "Language: ru\n" @@ -17,9 +17,8 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Poedit-Language: Russian\n" -"X-Poedit-Country: RUSSIAN FEDERATION\n" "X-Poedit-SourceCharset: utf-8\n" +"X-Generator: Poedit 3.0.1\n" #: data/io.github.mightycreak.Diffuse.desktop.in:3 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:4 @@ -42,7 +41,7 @@ msgstr "" msgid "Main window: diff between two files" msgstr "" -#: src/diffuse/constants.py:24 +#: src/diffuse/constants.py:25 msgid "Copyright" msgstr "" @@ -56,39 +55,6 @@ msgstr "" msgid "translator-credits" msgstr "v.01 О.Ю.Пахтусов (Oleg Pakhtusov) " -#: src/diffuse/dialogs.py:49 -#, fuzzy -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License along\n" -"with this program; if not, write to the Free Software Foundation, Inc.,\n" -"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." -msgstr "" -"Эта программа является бесплатным ПО; Вы можете распространять программу и/или " -"изменять ее в соответствии с GNU General Public License, как опубликовано Free " -"Software Foundation; либо версия 2 лицензии, либо (по вашему выбору) любая более " -"поздняя версия.\n" -"\n" -"Эта программа распространяется в надежде, что она будет полезна, но БЕЗ КАКИХ-" -"ЛИБО ГАРАНТИЙ; без даже подразумеваемой гарантии ТОВАРНОГО СОСТОЯНИЯ или " -"ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. Смотрите GNU General Public License для " -"дополнительных подробностей.\n" -"\n" -"Вам Следует получить копию GNU General Public License вместе с этой программой. " -"Вы можете также получить копию GNU General Public License от Free Software " -"Foundation, посетив их web-сайт (http://www.fsf.org/) или написав по адресу: Free " -"Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 " -"USA\n" - #: src/diffuse/dialogs.py:83 msgid "Encoding: " msgstr "Кодировка: " @@ -113,60 +79,60 @@ msgstr "Учитывать регистр" msgid "Search Backwards" msgstr "Поиск в обратном направлении" -#: src/diffuse/main.py:79 +#: src/diffuse/main.py:85 msgid "Close Tab" msgstr "Закрыть Вкладку" -#: src/diffuse/main.py:124 +#: src/diffuse/main.py:132 msgid "Open File..." msgstr "Открыть Файл..." -#: src/diffuse/main.py:125 +#: src/diffuse/main.py:133 msgid "Reload File" msgstr "Перезагрузить Файл" -#: src/diffuse/main.py:126 +#: src/diffuse/main.py:134 msgid "Save File" msgstr "Сохранить Файл" -#: src/diffuse/main.py:127 +#: src/diffuse/main.py:135 msgid "Save File As..." msgstr "Сохранить Файл Как..." -#: src/diffuse/main.py:280 +#: src/diffuse/main.py:288 msgid "Save changes before loading the new file?" msgstr "Сохранить изменения перед загрузкой нового файла?" -#: src/diffuse/main.py:391 +#: src/diffuse/main.py:399 #, python-format msgid "Error reading revision %(rev)s of %(file)s." msgstr "Ошибка считывания ревизии %(rev)s из %(file)s." -#: src/diffuse/main.py:394 src/diffuse/main.py:1849 +#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #, python-format msgid "Error reading %s." msgstr "Ошибка чтения %s." -#: src/diffuse/main.py:416 +#: src/diffuse/main.py:424 msgid "Open File" msgstr "Открыть Файл" -#: src/diffuse/main.py:473 +#: src/diffuse/main.py:481 #, python-format msgid "The file %s changed on disk. Do you want to reload the file?" msgstr "Файл %s изменен на диске. Вы хотите перезагрузить этот файл?" -#: src/diffuse/main.py:499 +#: src/diffuse/main.py:507 #, python-format msgid "Save %(title)s Pane %(pane)d" msgstr "Сохранить %(title)s Субокно %(pane)d" -#: src/diffuse/main.py:531 +#: src/diffuse/main.py:539 #, python-format msgid "A file named %s already exists. Do you want to overwrite it?" msgstr "Файл под именем %s уже существует. Вы хотите перезаписать его?" -#: src/diffuse/main.py:538 +#: src/diffuse/main.py:546 #, python-format msgid "" "The file %s has been modified by another process since reading it. If you save, " @@ -175,25 +141,25 @@ msgstr "" "Файл %s был изменен другим процессом после его прочтения. На сохранении все " "внешние изменения будут потеряны. Сохранить все равно?" -#: src/diffuse/main.py:580 +#: src/diffuse/main.py:588 #, python-format msgid "Error encoding to %s." msgstr "Ошибка кодирования в %s." -#: src/diffuse/main.py:584 src/diffuse/preferences.py:298 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 #, python-format msgid "Error writing %s." msgstr "Ошибка записи %s." -#: src/diffuse/main.py:614 +#: src/diffuse/main.py:622 msgid "Go To Line..." msgstr "Перейти на Строку..." -#: src/diffuse/main.py:615 +#: src/diffuse/main.py:623 msgid "Line Number: " msgstr "Номер строки: " -#: src/diffuse/main.py:646 +#: src/diffuse/main.py:654 msgid "" "Press the enter key or double click to edit. Press the space bar or use the RMB " "menu to manually align." @@ -201,11 +167,11 @@ msgstr "" "Нажатие Enter или двойной щелчок для редактирования. Нажатие Space или меню " "правого щелчка для выравнивания вручную." -#: src/diffuse/main.py:650 +#: src/diffuse/main.py:658 msgid "Press the escape key to finish editing." msgstr "Нажмите клавишу Escape, чтобы закончить редактирование." -#: src/diffuse/main.py:653 +#: src/diffuse/main.py:661 msgid "" "Select target line and press the space bar to align. Press the escape key to " "cancel." @@ -213,427 +179,427 @@ msgstr "" "Выберите целевую строку и нажмите клавишу Space, чтобы выровнять. Нажмите Еscape " "для отмены." -#: src/diffuse/main.py:776 +#: src/diffuse/main.py:784 msgid "_File" msgstr "Фа_йл" -#: src/diffuse/main.py:777 +#: src/diffuse/main.py:785 msgid "_Open File..." msgstr "О_ткрыть Файл..." -#: src/diffuse/main.py:778 +#: src/diffuse/main.py:786 msgid "Open File In New _Tab..." msgstr "Открыт_ь Файл в Новой Вкладке..." -#: src/diffuse/main.py:779 +#: src/diffuse/main.py:787 msgid "Open _Modified Files..." msgstr "Открыть И_змененные Файлы..." -#: src/diffuse/main.py:780 +#: src/diffuse/main.py:788 msgid "Open Commi_t..." msgstr "Открыть Зафи_ксированные..." -#: src/diffuse/main.py:781 +#: src/diffuse/main.py:789 msgid "_Reload File" msgstr "Пер_езагрузить Файл" -#: src/diffuse/main.py:783 +#: src/diffuse/main.py:791 msgid "_Save File" msgstr "С_охранить Файл" -#: src/diffuse/main.py:784 +#: src/diffuse/main.py:792 msgid "Save File _As..." msgstr "Сохра_нить Файл Как..." -#: src/diffuse/main.py:785 +#: src/diffuse/main.py:793 msgid "Save A_ll" msgstr "Сохран_ить Все" -#: src/diffuse/main.py:787 +#: src/diffuse/main.py:795 msgid "New _2-Way File Merge" msgstr "Новое _2-Оконное Слияние Файлов" -#: src/diffuse/main.py:788 +#: src/diffuse/main.py:796 msgid "New _3-Way File Merge" msgstr "Новое _3-Оконное Слияние Файлов" -#: src/diffuse/main.py:789 +#: src/diffuse/main.py:797 msgid "New _N-Way File Merge..." msgstr "Новое _Многооконное Слияние Файлов..." -#: src/diffuse/main.py:791 +#: src/diffuse/main.py:799 msgid "_Close Tab" msgstr "З_акрыть Вкладку" -#: src/diffuse/main.py:792 +#: src/diffuse/main.py:800 msgid "_Undo Close Tab" msgstr "От_менить Закрытие Вкладки" -#: src/diffuse/main.py:793 +#: src/diffuse/main.py:801 msgid "_Quit" msgstr "В_ыход" -#: src/diffuse/main.py:796 +#: src/diffuse/main.py:804 msgid "_Edit" msgstr "Пра_вка" -#: src/diffuse/main.py:797 +#: src/diffuse/main.py:805 msgid "_Undo" msgstr "От_менить" -#: src/diffuse/main.py:798 +#: src/diffuse/main.py:806 msgid "_Redo" msgstr "Вер_нуть" -#: src/diffuse/main.py:800 +#: src/diffuse/main.py:808 msgid "Cu_t" msgstr "Выре_зать" -#: src/diffuse/main.py:801 +#: src/diffuse/main.py:809 msgid "_Copy" msgstr "Ко_пировать" -#: src/diffuse/main.py:802 +#: src/diffuse/main.py:810 msgid "_Paste" msgstr "В_ставить" -#: src/diffuse/main.py:804 +#: src/diffuse/main.py:812 msgid "Select _All" msgstr "В_ыбрать Все" -#: src/diffuse/main.py:805 +#: src/diffuse/main.py:813 msgid "C_lear Edits" msgstr "Оч_истить Правки" -#: src/diffuse/main.py:806 +#: src/diffuse/main.py:814 msgid "_Dismiss All Edits" msgstr "Сбр_осить Все Правки" -#: src/diffuse/main.py:808 +#: src/diffuse/main.py:816 msgid "_Find..." msgstr "На_йти..." -#: src/diffuse/main.py:809 +#: src/diffuse/main.py:817 msgid "Find _Next" msgstr "Н_айти Следующее" -#: src/diffuse/main.py:810 +#: src/diffuse/main.py:818 msgid "Find Pre_vious" msgstr "Най_ти Предыдущее" -#: src/diffuse/main.py:811 +#: src/diffuse/main.py:819 msgid "_Go To Line..." msgstr "Пер_ейти на Строку..." -#: src/diffuse/main.py:813 +#: src/diffuse/main.py:821 msgid "Pr_eferences..." msgstr "Предпо_чтения..." -#: src/diffuse/main.py:817 +#: src/diffuse/main.py:825 msgid "None" msgstr "Нет" -#: src/diffuse/main.py:835 +#: src/diffuse/main.py:843 msgid "_View" msgstr "В_ид" -#: src/diffuse/main.py:836 +#: src/diffuse/main.py:844 msgid "_Syntax Highlighting" msgstr "Подсве_тка Синтаксиса" -#: src/diffuse/main.py:838 +#: src/diffuse/main.py:846 msgid "Re_align All" msgstr "Пере_строить Все" -#: src/diffuse/main.py:839 +#: src/diffuse/main.py:847 msgid "_Isolate" msgstr "И_золировать" -#: src/diffuse/main.py:841 +#: src/diffuse/main.py:849 msgid "_First Difference" msgstr "Пер_вое Различие" -#: src/diffuse/main.py:842 +#: src/diffuse/main.py:850 msgid "_Previous Difference" msgstr "Предыдуще_е Различие" -#: src/diffuse/main.py:843 +#: src/diffuse/main.py:851 msgid "_Next Difference" msgstr "Следу_ющее Различие" -#: src/diffuse/main.py:844 +#: src/diffuse/main.py:852 msgid "_Last Difference" msgstr "П_оследнее Различие" -#: src/diffuse/main.py:846 +#: src/diffuse/main.py:854 msgid "Fir_st Tab" msgstr "Перв_ая Вкладка" -#: src/diffuse/main.py:847 +#: src/diffuse/main.py:855 msgid "Pre_vious Tab" msgstr "Предыдуща_я Вкладка" -#: src/diffuse/main.py:848 +#: src/diffuse/main.py:856 msgid "Next _Tab" msgstr "С_ледующая Вкладка" -#: src/diffuse/main.py:849 +#: src/diffuse/main.py:857 msgid "Las_t Tab" msgstr "Послед_няя Вкладка" -#: src/diffuse/main.py:851 +#: src/diffuse/main.py:859 msgid "Shift Pane _Right" msgstr "Пере_местить Субокно Вправо" -#: src/diffuse/main.py:852 +#: src/diffuse/main.py:860 msgid "Shift Pane _Left" msgstr "Перемест_ить Субокно Влево" -#: src/diffuse/main.py:855 +#: src/diffuse/main.py:863 msgid "F_ormat" msgstr "Фор_мат" -#: src/diffuse/main.py:856 +#: src/diffuse/main.py:864 msgid "Convert To _Upper Case" msgstr "Пр_еобразовать в Верхний Регистр" -#: src/diffuse/main.py:857 +#: src/diffuse/main.py:865 msgid "Convert To _Lower Case" msgstr "Пре_образовать в Нижний Регистр" -#: src/diffuse/main.py:859 +#: src/diffuse/main.py:867 msgid "Sort Lines In _Ascending Order" msgstr "Сор_тировать Строки в Порядке Возрастания" -#: src/diffuse/main.py:860 +#: src/diffuse/main.py:868 msgid "Sort Lines In D_escending Order" msgstr "Сорт_ировать Строки в Порядке Убывания" -#: src/diffuse/main.py:862 +#: src/diffuse/main.py:870 msgid "Remove Trailing _White Space" msgstr "Уда_лить Замыкающие Пробелы" -#: src/diffuse/main.py:863 +#: src/diffuse/main.py:871 msgid "Convert Tabs To _Spaces" msgstr "Преобр_азовать Табуляторы в Пробелы" -#: src/diffuse/main.py:864 +#: src/diffuse/main.py:872 msgid "Convert Leading Spaces To _Tabs" msgstr "Преобра_зовать Вводные Пробелы в Табуляторы" -#: src/diffuse/main.py:866 +#: src/diffuse/main.py:874 msgid "_Increase Indenting" msgstr "У_величить Отступ" -#: src/diffuse/main.py:867 +#: src/diffuse/main.py:875 msgid "De_crease Indenting" msgstr "У_меньшить Отступ" -#: src/diffuse/main.py:869 +#: src/diffuse/main.py:877 msgid "Convert To _DOS Format" msgstr "Преобразоват_ь в DOS Формат" -#: src/diffuse/main.py:870 +#: src/diffuse/main.py:878 msgid "Convert To _Mac Format" msgstr "Преобразовать в Ma_с Формат" -#: src/diffuse/main.py:871 +#: src/diffuse/main.py:879 msgid "Convert To Uni_x Format" msgstr "Преобразовать в Uni_х Формат" -#: src/diffuse/main.py:874 +#: src/diffuse/main.py:882 msgid "_Merge" msgstr "С_лияние" -#: src/diffuse/main.py:875 +#: src/diffuse/main.py:883 msgid "Copy Selection _Right" msgstr "К_опировать Выборку Вправо" -#: src/diffuse/main.py:876 +#: src/diffuse/main.py:884 msgid "Copy Selection _Left" msgstr "Ко_пировать Выборку Влево" -#: src/diffuse/main.py:878 +#: src/diffuse/main.py:886 msgid "Copy Left _Into Selection" msgstr "Копиро_вать Слева в Выборку" -#: src/diffuse/main.py:879 +#: src/diffuse/main.py:887 msgid "Copy Right I_nto Selection" msgstr "Копиров_ать Справа в Выборку" -#: src/diffuse/main.py:880 +#: src/diffuse/main.py:888 msgid "_Merge From Left Then Right" msgstr "С_лияние Слева Затем Справа" -#: src/diffuse/main.py:881 +#: src/diffuse/main.py:889 msgid "M_erge From Right Then Left" msgstr "Сл_ияние Справа Затем Слева" -#: src/diffuse/main.py:884 +#: src/diffuse/main.py:892 msgid "_Help" msgstr "Спр_авка" -#: src/diffuse/main.py:885 +#: src/diffuse/main.py:893 msgid "_Help Contents..." msgstr "Содер_жание Справки..." -#: src/diffuse/main.py:887 +#: src/diffuse/main.py:895 #, python-format msgid "_About %s..." msgstr "О пр_ограмме %s..." -#: src/diffuse/main.py:902 +#: src/diffuse/main.py:910 msgid "New 2-Way File Merge" msgstr "Новое 2-Оконное Слияние Файлов" -#: src/diffuse/main.py:903 +#: src/diffuse/main.py:911 msgid "New 3-Way File Merge" msgstr "Новое 3-Оконное Слияние Файлов" -#: src/diffuse/main.py:905 +#: src/diffuse/main.py:913 msgid "Realign All" msgstr "Перестроить Все" -#: src/diffuse/main.py:906 +#: src/diffuse/main.py:914 msgid "First Difference" msgstr "Первое Различие" -#: src/diffuse/main.py:907 +#: src/diffuse/main.py:915 msgid "Previous Difference" msgstr "Предыдущее Различие" -#: src/diffuse/main.py:908 +#: src/diffuse/main.py:916 msgid "Next Difference" msgstr "Следующее Различие" -#: src/diffuse/main.py:909 +#: src/diffuse/main.py:917 msgid "Last Difference" msgstr "Последнее Различие" -#: src/diffuse/main.py:911 +#: src/diffuse/main.py:919 msgid "Copy Selection Right" msgstr "Копировать Выборку Вправо" -#: src/diffuse/main.py:912 +#: src/diffuse/main.py:920 msgid "Copy Selection Left" msgstr "Копировать Выборку Влево" -#: src/diffuse/main.py:913 +#: src/diffuse/main.py:921 msgid "Copy Left Into Selection" msgstr "Копировать Слева в Выборку" -#: src/diffuse/main.py:914 +#: src/diffuse/main.py:922 msgid "Copy Right Into Selection" msgstr "Копировать Справа в Выборку" -#: src/diffuse/main.py:915 +#: src/diffuse/main.py:923 msgid "Merge From Left Then Right" msgstr "Слияние Слева Затем Справа" -#: src/diffuse/main.py:916 +#: src/diffuse/main.py:924 msgid "Merge From Right Then Left" msgstr "Слияние Справа Затем Слева" -#: src/diffuse/main.py:918 +#: src/diffuse/main.py:926 msgid "Undo" msgstr "Отменить" -#: src/diffuse/main.py:919 +#: src/diffuse/main.py:927 msgid "Redo" msgstr "Вернуть" -#: src/diffuse/main.py:920 src/diffuse/widgets.py:1847 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 msgid "Cut" msgstr "Вырезать" -#: src/diffuse/main.py:921 src/diffuse/widgets.py:1848 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 msgid "Copy" msgstr "Копировать" -#: src/diffuse/main.py:922 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 msgid "Paste" msgstr "Вставить" -#: src/diffuse/main.py:923 src/diffuse/widgets.py:1852 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 msgid "Clear Edits" msgstr "Очистить Правки" -#: src/diffuse/main.py:1046 +#: src/diffuse/main.py:1054 #, fuzzy msgid "Some files have unsaved changes. Select the files to save before closing." msgstr "" "Некоторые файлы имеют несохраненные изменения.\n" "Выберите файлы для сохранения перед закрытием." -#: src/diffuse/main.py:1060 +#: src/diffuse/main.py:1068 msgid "Tab" msgstr "Вкладка" -#: src/diffuse/main.py:1065 +#: src/diffuse/main.py:1073 msgid "Pane" msgstr "Субокно" -#: src/diffuse/main.py:1076 +#: src/diffuse/main.py:1084 msgid "Close _Without Saving" msgstr "Закр_ыть Без Сохранения" -#: src/diffuse/main.py:1115 +#: src/diffuse/main.py:1123 #, python-format msgid "Closing this tab will quit %s." msgstr "Закрытие этой вкладки закроет %s." -#: src/diffuse/main.py:1198 +#: src/diffuse/main.py:1206 #, python-format msgid "File Merge %d" msgstr "Слияние Файлов %d" -#: src/diffuse/main.py:1304 +#: src/diffuse/main.py:1312 #, python-format msgid "Error retrieving commits for %s." msgstr "Ошибка извлечения фиксаций для %s." -#: src/diffuse/main.py:1336 +#: src/diffuse/main.py:1344 #, python-format msgid "Error retrieving modifications for %s." msgstr "Ошибка извлечения модификаций для %s." -#: src/diffuse/main.py:1369 +#: src/diffuse/main.py:1377 msgid "Open File In New Tab" msgstr "Открыть Файл в Новой Вкладке" -#: src/diffuse/main.py:1392 +#: src/diffuse/main.py:1400 msgid "Choose Folder With Modified Files" msgstr "Выбрать Папку с Измененными Файлами" -#: src/diffuse/main.py:1410 +#: src/diffuse/main.py:1418 msgid "No modified files found." msgstr "Модифицированные файлы не найдены." -#: src/diffuse/main.py:1416 +#: src/diffuse/main.py:1424 msgid "Choose Folder With Commit" msgstr "Выбрать Папку с Зафиксированными Изменениями" -#: src/diffuse/main.py:1436 +#: src/diffuse/main.py:1444 msgid "No committed files found." msgstr "Файлы с фиксациями не найдены." -#: src/diffuse/main.py:1472 +#: src/diffuse/main.py:1480 msgid "New N-Way File Merge..." msgstr "Новое Многооконное Слияние Файлов..." -#: src/diffuse/main.py:1473 +#: src/diffuse/main.py:1481 msgid "Number of panes: " msgstr "Количество субокна: " -#: src/diffuse/main.py:1547 +#: src/diffuse/main.py:1555 msgid "Phrase not found. Continue from the end of the file?" msgstr "Фраза не найдена. Продолжить с конца файла?" -#: src/diffuse/main.py:1549 +#: src/diffuse/main.py:1557 msgid "Phrase not found. Continue from the start of the file?" msgstr "Фраза не найдена. Продолжить с начала файла?" -#: src/diffuse/main.py:1770 +#: src/diffuse/main.py:1778 #, fuzzy msgid "" "Usage:\n" @@ -714,174 +680,174 @@ msgstr "" " ( -i | --ignore-case ) Игнорировать различия регистра символов\n" " ( -w | --ignore-all-space ) Игнорировать различия свободного места" -#: src/diffuse/main.py:1937 +#: src/diffuse/main.py:1945 msgid "Error parsing line number." msgstr "Ошибка анализа номера строки." -#: src/diffuse/main.py:1947 +#: src/diffuse/main.py:1955 #, python-format msgid "Skipping unknown argument \"%s\"." msgstr "Пропуск неизвестного параметра \"%s\"." -#: src/diffuse/main.py:1955 +#: src/diffuse/main.py:1963 #, python-format msgid "Error processing argument \"%s\". Directory not expected." msgstr "Ошибка обработки параметра \"%s\". Каталог не ожидался." -#: src/diffuse/preferences.py:79 +#: src/diffuse/preferences.py:80 msgid "Display" msgstr "Отображение" -#: src/diffuse/preferences.py:82 +#: src/diffuse/preferences.py:83 msgid "Font" msgstr "Шрифт" -#: src/diffuse/preferences.py:83 +#: src/diffuse/preferences.py:84 msgid "Tab width" msgstr "Ширина табулятора" -#: src/diffuse/preferences.py:84 +#: src/diffuse/preferences.py:85 msgid "Show right margin" msgstr "Показывать правое поле" -#: src/diffuse/preferences.py:85 +#: src/diffuse/preferences.py:86 msgid "Right margin" msgstr "Правое поле" -#: src/diffuse/preferences.py:86 +#: src/diffuse/preferences.py:87 msgid "Show line numbers" msgstr "Показывать номера строк" -#: src/diffuse/preferences.py:87 +#: src/diffuse/preferences.py:88 msgid "Show white space characters" msgstr "Показывать символы пробелов" -#: src/diffuse/preferences.py:88 +#: src/diffuse/preferences.py:89 msgid "Ignore case differences" msgstr "Игнорировать различия в регистре" -#: src/diffuse/preferences.py:89 +#: src/diffuse/preferences.py:90 msgid "Ignore white space differences" msgstr "Игнорировать различия пробелов, символов табуляции и пустой строки" -#: src/diffuse/preferences.py:90 src/diffuse/preferences.py:99 +#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100 msgid "Ignore changes to white space" msgstr "Игнорировать изменения пробелов, символов табуляции и пустой строки" -#: src/diffuse/preferences.py:91 +#: src/diffuse/preferences.py:92 msgid "Ignore blank line differences" msgstr "Игнорировать различия пустых строк" -#: src/diffuse/preferences.py:92 +#: src/diffuse/preferences.py:93 msgid "Ignore end of line differences" msgstr "Игнорировать различия окончания строк (терминаторы)" -#: src/diffuse/preferences.py:94 +#: src/diffuse/preferences.py:95 msgid "Alignment" msgstr "Выравнивание" -#: src/diffuse/preferences.py:97 +#: src/diffuse/preferences.py:98 msgid "Ignore case" msgstr "Игнорировать регистр символов" -#: src/diffuse/preferences.py:98 +#: src/diffuse/preferences.py:99 msgid "Ignore white space" msgstr "Игнорировать пробелы, символы табуляции и пустой строки" -#: src/diffuse/preferences.py:100 +#: src/diffuse/preferences.py:101 msgid "Ignore blank lines" msgstr "Игнорировать пустые строки" -#: src/diffuse/preferences.py:101 +#: src/diffuse/preferences.py:102 msgid "Ignore end of line characters" msgstr "Игнорировать символы окончания строк (терминаторы)" -#: src/diffuse/preferences.py:103 +#: src/diffuse/preferences.py:104 msgid "Editor" msgstr "Редактор" -#: src/diffuse/preferences.py:106 +#: src/diffuse/preferences.py:107 msgid "Auto indent" msgstr "Автоматический отступ" -#: src/diffuse/preferences.py:107 +#: src/diffuse/preferences.py:108 msgid "Expand tabs to spaces" msgstr "Расширить табуляторы до пробелов" -#: src/diffuse/preferences.py:108 +#: src/diffuse/preferences.py:109 msgid "Soft tab width" msgstr "Ширина мягкого табулятора" -#: src/diffuse/preferences.py:110 +#: src/diffuse/preferences.py:111 msgid "Tabs" msgstr "Вкладки" -#: src/diffuse/preferences.py:113 +#: src/diffuse/preferences.py:114 msgid "Default panes" msgstr "Субокон по умолчанию" -#: src/diffuse/preferences.py:114 +#: src/diffuse/preferences.py:115 msgid "Always show the tab bar" msgstr "Всегда показывать панель вкладок" -#: src/diffuse/preferences.py:115 +#: src/diffuse/preferences.py:116 #, python-format msgid "Warn me when closing a tab will quit %s" msgstr "Предупреждение, когда закрытие вкладки закроет %s" -#: src/diffuse/preferences.py:117 +#: src/diffuse/preferences.py:118 msgid "Regional Settings" msgstr "Настройки Региона" -#: src/diffuse/preferences.py:120 +#: src/diffuse/preferences.py:121 msgid "Default codec" msgstr "Кодек по умолчанию" -#: src/diffuse/preferences.py:121 +#: src/diffuse/preferences.py:122 msgid "Order of codecs used to identify encoding" msgstr "Порядок кодеков, используемых для распознания кодировки" -#: src/diffuse/preferences.py:142 +#: src/diffuse/preferences.py:143 msgid "Cygwin" msgstr "Cygwin" -#: src/diffuse/preferences.py:144 +#: src/diffuse/preferences.py:145 msgid "Root directory" msgstr "Корневой каталог" -#: src/diffuse/preferences.py:145 +#: src/diffuse/preferences.py:146 msgid "Cygdrive prefix" msgstr "Cygdrive префикс" -#: src/diffuse/preferences.py:164 +#: src/diffuse/preferences.py:165 msgid "Version control system search order" msgstr "" -#: src/diffuse/preferences.py:172 +#: src/diffuse/preferences.py:173 msgid "\"co\" command" msgstr "\"co\" команда" -#: src/diffuse/preferences.py:173 +#: src/diffuse/preferences.py:174 msgid "\"rlog\" command" msgstr "\"rlog\" команда" -#: src/diffuse/preferences.py:175 +#: src/diffuse/preferences.py:176 msgid "Command" msgstr "Команда" -#: src/diffuse/preferences.py:181 +#: src/diffuse/preferences.py:182 msgid "Launch from a Bash login shell" msgstr "Запуск из оболочки Bash login" -#: src/diffuse/preferences.py:188 +#: src/diffuse/preferences.py:189 msgid "Update paths for Cygwin" msgstr "Обновлять пути для Cygwin" -#: src/diffuse/preferences.py:193 +#: src/diffuse/preferences.py:194 msgid "Version Control" msgstr "Контроль Версий" -#: src/diffuse/preferences.py:258 +#: src/diffuse/preferences.py:259 msgid "Preferences" msgstr "Предпочтения" @@ -913,7 +879,7 @@ msgstr "" #: src/diffuse/resources.py:409 #, python-brace-format -msgid "Options \"{option}\" is unknown" +msgid "Option \"{option}\" is unknown" msgstr "" #: src/diffuse/resources.py:416 @@ -966,40 +932,72 @@ msgstr "Ошибка обработки строки {line} из {file}." msgid "Unhandled error at line {line} of {file}." msgstr "Ошибка обработки строки {line} из {file}." -#: src/diffuse/utils.py:63 +#: src/diffuse/utils.py:66 msgid "Auto Detect" -msgstr "Автообнаружение " +msgstr "Автообнаружение" -#: src/diffuse/vcs/cvs.py:53 src/diffuse/vcs/rcs.py:62 src/diffuse/vcs/svn.py:95 +#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97 #, python-format msgid "Error parsing revision %s." msgstr "Ошибка анализа ревизии %s." -#: src/diffuse/vcs/vcs_registry.py:233 +#: src/diffuse/vcs/vcs_registry.py:238 #, python-format msgid "Error parsing %s." msgstr "Ошибка анализа %s." -#: src/diffuse/widgets.py:1843 +#: src/diffuse/widgets.py:1845 msgid "Align with Selection" msgstr "Выровнять с Выборкой" -#: src/diffuse/widgets.py:1844 +#: src/diffuse/widgets.py:1846 msgid "Isolate" msgstr "Изолировать" -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1847 msgid "Merge Selection" msgstr "Объединить Выборку" -#: src/diffuse/widgets.py:1851 +#: src/diffuse/widgets.py:1853 msgid "Select All" msgstr "Выбрать Все" -#: src/diffuse/widgets.py:1854 +#: src/diffuse/widgets.py:1856 msgid "Swap with Selected Pane" msgstr "Обменять с Выбранным Субокном" +#, fuzzy +#~ msgid "" +#~ "This program is free software; you can redistribute it and/or modify\n" +#~ "it under the terms of the GNU General Public License as published by\n" +#~ "the Free Software Foundation; either version 2 of the License, or\n" +#~ "(at your option) any later version.\n" +#~ "\n" +#~ "This program is distributed in the hope that it will be useful,\n" +#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +#~ "GNU General Public License for more details.\n" +#~ "\n" +#~ "You should have received a copy of the GNU General Public License along\n" +#~ "with this program; if not, write to the Free Software Foundation, Inc.,\n" +#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." +#~ msgstr "" +#~ "Эта программа является бесплатным ПО; Вы можете распространять программу и/или " +#~ "изменять ее в соответствии с GNU General Public License, как опубликовано Free " +#~ "Software Foundation; либо версия 2 лицензии, либо (по вашему выбору) любая " +#~ "более поздняя версия.\n" +#~ "\n" +#~ "Эта программа распространяется в надежде, что она будет полезна, но БЕЗ КАКИХ-" +#~ "ЛИБО ГАРАНТИЙ; без даже подразумеваемой гарантии ТОВАРНОГО СОСТОЯНИЯ или " +#~ "ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. Смотрите GNU General Public License для " +#~ "дополнительных подробностей.\n" +#~ "\n" +#~ "Вам Следует получить копию GNU General Public License вместе с этой " +#~ "программой. Вы можете также получить копию GNU General Public License от Free " +#~ "Software Foundation, посетив их web-сайт (http://www.fsf.org/) или написав по " +#~ "адресу: Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, " +#~ "MA 02110-1301 USA\n" + #~ msgid "Diffuse Merge Tool" #~ msgstr "Diffuse Инструмент Слияния" diff --git a/po/sv.po b/po/sv.po index acfaf4e..ca248e9 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-27 21:56-0500\n" +"POT-Creation-Date: 2022-04-04 12:14-0400\n" "PO-Revision-Date: 2021-01-17 22:14+0100\n" "Last-Translator: Åke Engelbrektson \n" "Language-Team: Svenska Språkfiler \n" @@ -39,7 +39,7 @@ msgstr "" msgid "Main window: diff between two files" msgstr "" -#: src/diffuse/constants.py:24 +#: src/diffuse/constants.py:25 msgid "Copyright" msgstr "Copyright" @@ -51,38 +51,6 @@ msgstr "Diffuse är ett grafiskt verktyg för att jämföra och sammanfoga textf msgid "translator-credits" msgstr "Åke Engelbrektson" -#: src/diffuse/dialogs.py:49 -#, fuzzy -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License along\n" -"with this program; if not, write to the Free Software Foundation, Inc.,\n" -"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." -msgstr "" -"Detta program är fri mjukvara! Du kan återdistribuera det och/eller modifiera " -"det, under villkoren för GNU General Public License som den publiceras av Free " -"Software Foundation. Antingen version 2 av licensen, eller valfri senare " -"version.\n" -"\n" -"Programmet distribueras i hopp om att det skall vara användbart, men UTAN NÅGRA " -"GARANTIER. Utan ens underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR ETT " -"VISST ÄNDAMÅL. Se GNU General Public License för mer detaljerad info.\n" -"\n" -"Du bör ha fått en kopia av GNU General Public License tillsammans med det här " -"programmet. Du kan också hämta en kopia av GNU General Public License från Free " -"Software Foundation genom att besöka deras webbsida (http://www.fsf.org/) eller " -"skriva till Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, " -"MA 02110-1301 USA.\n" - #: src/diffuse/dialogs.py:83 msgid "Encoding: " msgstr "Teckentabell: " @@ -107,60 +75,60 @@ msgstr "Skiftlägeskänslig" msgid "Search Backwards" msgstr "Sök bakifrån" -#: src/diffuse/main.py:79 +#: src/diffuse/main.py:85 msgid "Close Tab" msgstr "Stäng fliken" -#: src/diffuse/main.py:124 +#: src/diffuse/main.py:132 msgid "Open File..." msgstr "Öppna fil..." -#: src/diffuse/main.py:125 +#: src/diffuse/main.py:133 msgid "Reload File" msgstr "Läs in filen igen" -#: src/diffuse/main.py:126 +#: src/diffuse/main.py:134 msgid "Save File" msgstr "Spara filen" -#: src/diffuse/main.py:127 +#: src/diffuse/main.py:135 msgid "Save File As..." msgstr "Spara filen som..." -#: src/diffuse/main.py:280 +#: src/diffuse/main.py:288 msgid "Save changes before loading the new file?" msgstr "Vill du spara ändringar före inläsning av den ny filen?" -#: src/diffuse/main.py:391 +#: src/diffuse/main.py:399 #, python-format msgid "Error reading revision %(rev)s of %(file)s." msgstr "Fel vid läsning av revision %(rev)s i %(file)s." -#: src/diffuse/main.py:394 src/diffuse/main.py:1849 +#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #, python-format msgid "Error reading %s." msgstr "Fel vid läsning av %s." -#: src/diffuse/main.py:416 +#: src/diffuse/main.py:424 msgid "Open File" msgstr "Öppna fil" -#: src/diffuse/main.py:473 +#: src/diffuse/main.py:481 #, python-format 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?" -#: src/diffuse/main.py:499 +#: src/diffuse/main.py:507 #, python-format msgid "Save %(title)s Pane %(pane)d" msgstr "Spara %(title)s Panel %(pane)d" -#: src/diffuse/main.py:531 +#: src/diffuse/main.py:539 #, python-format 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?" -#: src/diffuse/main.py:538 +#: src/diffuse/main.py:546 #, python-format msgid "" "The file %s has been modified by another process since reading it. If you save, " @@ -169,25 +137,25 @@ msgstr "" "Filen %s har ändrats av en annan process sedan inläsning. Om du sparar kan alla " "externa ändringar förloras. Vill du spara ändå?" -#: src/diffuse/main.py:580 +#: src/diffuse/main.py:588 #, python-format msgid "Error encoding to %s." msgstr "Fel vid kodning till %s." -#: src/diffuse/main.py:584 src/diffuse/preferences.py:298 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 #, python-format msgid "Error writing %s." msgstr "Fel vid skrivning av %s." -#: src/diffuse/main.py:614 +#: src/diffuse/main.py:622 msgid "Go To Line..." msgstr "Gå till rad..." -#: src/diffuse/main.py:615 +#: src/diffuse/main.py:623 msgid "Line Number: " msgstr "Radnummer: " -#: src/diffuse/main.py:646 +#: src/diffuse/main.py:654 msgid "" "Press the enter key or double click to edit. Press the space bar or use the RMB " "menu to manually align." @@ -195,435 +163,435 @@ msgstr "" "Tryck på returtangenten eller dubbelklicka för att redigera. Tryck blanksteg " "eller använd kontextmenyn för att justera manuellt." -#: src/diffuse/main.py:650 +#: src/diffuse/main.py:658 msgid "Press the escape key to finish editing." msgstr "Tryck på Esc-tangenten för att avsluta redigering." -#: src/diffuse/main.py:653 +#: src/diffuse/main.py:661 msgid "" "Select target line and press the space bar to align. Press the escape key to " "cancel." msgstr "Välj målrad och tryck blanksteg för att justera. Tryck Esc för att avbryta." -#: src/diffuse/main.py:776 +#: src/diffuse/main.py:784 msgid "_File" msgstr "_Arkiv" -#: src/diffuse/main.py:777 +#: src/diffuse/main.py:785 msgid "_Open File..." msgstr "_Öppna fil..." -#: src/diffuse/main.py:778 +#: src/diffuse/main.py:786 msgid "Open File In New _Tab..." msgstr "Öppna fil i ny _flik..." -#: src/diffuse/main.py:779 +#: src/diffuse/main.py:787 msgid "Open _Modified Files..." msgstr "Öppna _ändrade filer..." -#: src/diffuse/main.py:780 +#: src/diffuse/main.py:788 msgid "Open Commi_t..." msgstr "_Öppna arkivering..." -#: src/diffuse/main.py:781 +#: src/diffuse/main.py:789 msgid "_Reload File" msgstr "_Läs in filen igen" -#: src/diffuse/main.py:783 +#: src/diffuse/main.py:791 msgid "_Save File" msgstr "_Spara filen" -#: src/diffuse/main.py:784 +#: src/diffuse/main.py:792 msgid "Save File _As..." msgstr "Spara filen _som..." -#: src/diffuse/main.py:785 +#: src/diffuse/main.py:793 msgid "Save A_ll" msgstr "Spara a_lla" -#: src/diffuse/main.py:787 +#: src/diffuse/main.py:795 msgid "New _2-Way File Merge" msgstr "Ny _2-vägs filsammanslagning" -#: src/diffuse/main.py:788 +#: src/diffuse/main.py:796 msgid "New _3-Way File Merge" msgstr "Ny _3-vägs filsammanslagning" -#: src/diffuse/main.py:789 +#: src/diffuse/main.py:797 msgid "New _N-Way File Merge..." msgstr "Ny _x-vägs filsammanslagning..." -#: src/diffuse/main.py:791 +#: src/diffuse/main.py:799 msgid "_Close Tab" msgstr "_Stäng fliken" -#: src/diffuse/main.py:792 +#: src/diffuse/main.py:800 msgid "_Undo Close Tab" msgstr "_Ångra flikstängning" -#: src/diffuse/main.py:793 +#: src/diffuse/main.py:801 msgid "_Quit" msgstr "_Avsluta" -#: src/diffuse/main.py:796 +#: src/diffuse/main.py:804 msgid "_Edit" msgstr "_Redigera" -#: src/diffuse/main.py:797 +#: src/diffuse/main.py:805 msgid "_Undo" msgstr "_Ångra" -#: src/diffuse/main.py:798 +#: src/diffuse/main.py:806 msgid "_Redo" msgstr "_Upprepa" -#: src/diffuse/main.py:800 +#: src/diffuse/main.py:808 msgid "Cu_t" msgstr "Klipp _ut" -#: src/diffuse/main.py:801 +#: src/diffuse/main.py:809 msgid "_Copy" msgstr "_Kopiera" -#: src/diffuse/main.py:802 +#: src/diffuse/main.py:810 msgid "_Paste" msgstr "_Klistra in" -#: src/diffuse/main.py:804 +#: src/diffuse/main.py:812 msgid "Select _All" msgstr "Markera _alla" -#: src/diffuse/main.py:805 +#: src/diffuse/main.py:813 msgid "C_lear Edits" msgstr "_Rensa bort ändringar" -#: src/diffuse/main.py:806 +#: src/diffuse/main.py:814 msgid "_Dismiss All Edits" msgstr "_Förkasta alla ändringar" -#: src/diffuse/main.py:808 +#: src/diffuse/main.py:816 msgid "_Find..." msgstr "_Sök..." -#: src/diffuse/main.py:809 +#: src/diffuse/main.py:817 msgid "Find _Next" msgstr "Sök _nästa" -#: src/diffuse/main.py:810 +#: src/diffuse/main.py:818 msgid "Find Pre_vious" msgstr "Sök _föregående" -#: src/diffuse/main.py:811 +#: src/diffuse/main.py:819 msgid "_Go To Line..." msgstr "_Gå till rad..." -#: src/diffuse/main.py:813 +#: src/diffuse/main.py:821 msgid "Pr_eferences..." msgstr "_Inställningar..." -#: src/diffuse/main.py:817 +#: src/diffuse/main.py:825 msgid "None" msgstr "Ingen" -#: src/diffuse/main.py:835 +#: src/diffuse/main.py:843 msgid "_View" msgstr "_Visa" -#: src/diffuse/main.py:836 +#: src/diffuse/main.py:844 msgid "_Syntax Highlighting" msgstr "_Syntaxmarkering" -#: src/diffuse/main.py:838 +#: src/diffuse/main.py:846 msgid "Re_align All" msgstr "_Omjustera alla" -#: src/diffuse/main.py:839 +#: src/diffuse/main.py:847 msgid "_Isolate" msgstr "_Isolera" -#: src/diffuse/main.py:841 +#: src/diffuse/main.py:849 msgid "_First Difference" msgstr "_Första olikheten" -#: src/diffuse/main.py:842 +#: src/diffuse/main.py:850 msgid "_Previous Difference" msgstr "_Föregående olikhet" -#: src/diffuse/main.py:843 +#: src/diffuse/main.py:851 msgid "_Next Difference" msgstr "_Nästa olikhet" -#: src/diffuse/main.py:844 +#: src/diffuse/main.py:852 msgid "_Last Difference" msgstr "_Sista olikheten" -#: src/diffuse/main.py:846 +#: src/diffuse/main.py:854 msgid "Fir_st Tab" msgstr "F_örsta fliken" -#: src/diffuse/main.py:847 +#: src/diffuse/main.py:855 msgid "Pre_vious Tab" msgstr "Före_gående flik" -#: src/diffuse/main.py:848 +#: src/diffuse/main.py:856 msgid "Next _Tab" msgstr "Nästa _flik" -#: src/diffuse/main.py:849 +#: src/diffuse/main.py:857 msgid "Las_t Tab" msgstr "S_ista fliken" -#: src/diffuse/main.py:851 +#: src/diffuse/main.py:859 msgid "Shift Pane _Right" msgstr "Växla panel _höger" -#: src/diffuse/main.py:852 +#: src/diffuse/main.py:860 msgid "Shift Pane _Left" msgstr "Växla panel _vänster" -#: src/diffuse/main.py:855 +#: src/diffuse/main.py:863 msgid "F_ormat" msgstr "F_ormat" -#: src/diffuse/main.py:856 +#: src/diffuse/main.py:864 msgid "Convert To _Upper Case" msgstr "Konvertera till _VERSALER" -#: src/diffuse/main.py:857 +#: src/diffuse/main.py:865 msgid "Convert To _Lower Case" msgstr "Konvertera till _gemener" -#: src/diffuse/main.py:859 +#: src/diffuse/main.py:867 msgid "Sort Lines In _Ascending Order" msgstr "Sortera rader i _stigande ordning" -#: src/diffuse/main.py:860 +#: src/diffuse/main.py:868 msgid "Sort Lines In D_escending Order" msgstr "Sortera rader i _fallande ordning" -#: src/diffuse/main.py:862 +#: src/diffuse/main.py:870 msgid "Remove Trailing _White Space" msgstr "Ta bort avslutande blanksteg" -#: src/diffuse/main.py:863 +#: src/diffuse/main.py:871 msgid "Convert Tabs To _Spaces" msgstr "Konvertera tabbar till _blanksteg" -#: src/diffuse/main.py:864 +#: src/diffuse/main.py:872 msgid "Convert Leading Spaces To _Tabs" msgstr "Konvertera inledande blanksteg till _tabbar" -#: src/diffuse/main.py:866 +#: src/diffuse/main.py:874 msgid "_Increase Indenting" msgstr "_Utöka indrag" -#: src/diffuse/main.py:867 +#: src/diffuse/main.py:875 msgid "De_crease Indenting" msgstr "Mi_nska indrag" -#: src/diffuse/main.py:869 +#: src/diffuse/main.py:877 msgid "Convert To _DOS Format" msgstr "Konvertera till _DOS-format" -#: src/diffuse/main.py:870 +#: src/diffuse/main.py:878 msgid "Convert To _Mac Format" msgstr "Konvertera till _MAC-format" -#: src/diffuse/main.py:871 +#: src/diffuse/main.py:879 msgid "Convert To Uni_x Format" msgstr "Konvertera till _Unix-format" -#: src/diffuse/main.py:874 +#: src/diffuse/main.py:882 msgid "_Merge" msgstr "_Sammanfoga" -#: src/diffuse/main.py:875 +#: src/diffuse/main.py:883 msgid "Copy Selection _Right" msgstr "Kopiera från markerat till _höger" -#: src/diffuse/main.py:876 +#: src/diffuse/main.py:884 msgid "Copy Selection _Left" msgstr "Kopiera från markerat till _vänster" -#: src/diffuse/main.py:878 +#: src/diffuse/main.py:886 msgid "Copy Left _Into Selection" msgstr "Kopiera från vänster till _markerat" -#: src/diffuse/main.py:879 +#: src/diffuse/main.py:887 msgid "Copy Right I_nto Selection" msgstr "Kopiera från höger till m_arkerat" -#: src/diffuse/main.py:880 +#: src/diffuse/main.py:888 msgid "_Merge From Left Then Right" msgstr "_Sammanfoga från vänster, sedan höger" -#: src/diffuse/main.py:881 +#: src/diffuse/main.py:889 msgid "M_erge From Right Then Left" msgstr "S_ammanfoga från höger, sedan vänster" -#: src/diffuse/main.py:884 +#: src/diffuse/main.py:892 msgid "_Help" msgstr "_Hjälp" -#: src/diffuse/main.py:885 +#: src/diffuse/main.py:893 msgid "_Help Contents..." msgstr "_Hjälpinnehåll..." -#: src/diffuse/main.py:887 +#: src/diffuse/main.py:895 #, python-format msgid "_About %s..." msgstr "_Om %s..." -#: src/diffuse/main.py:902 +#: src/diffuse/main.py:910 msgid "New 2-Way File Merge" msgstr "Ny 2-vägs filsammanslagning" -#: src/diffuse/main.py:903 +#: src/diffuse/main.py:911 msgid "New 3-Way File Merge" msgstr "Ny 3-vägs filsammanslagning" -#: src/diffuse/main.py:905 +#: src/diffuse/main.py:913 msgid "Realign All" msgstr "Omjustera alla" -#: src/diffuse/main.py:906 +#: src/diffuse/main.py:914 msgid "First Difference" msgstr "Första olikheten" -#: src/diffuse/main.py:907 +#: src/diffuse/main.py:915 msgid "Previous Difference" msgstr "Föregående olikhet" -#: src/diffuse/main.py:908 +#: src/diffuse/main.py:916 msgid "Next Difference" msgstr "Nästa olikhet" -#: src/diffuse/main.py:909 +#: src/diffuse/main.py:917 msgid "Last Difference" msgstr "Sista olikheten" -#: src/diffuse/main.py:911 +#: src/diffuse/main.py:919 msgid "Copy Selection Right" msgstr "Kopiera från markerat till höger" -#: src/diffuse/main.py:912 +#: src/diffuse/main.py:920 msgid "Copy Selection Left" msgstr "Kopiera från markerat till vänster" -#: src/diffuse/main.py:913 +#: src/diffuse/main.py:921 msgid "Copy Left Into Selection" msgstr "Kopiera från vänster till markerat" -#: src/diffuse/main.py:914 +#: src/diffuse/main.py:922 msgid "Copy Right Into Selection" msgstr "Kopiera från höger till markerat" -#: src/diffuse/main.py:915 +#: src/diffuse/main.py:923 msgid "Merge From Left Then Right" msgstr "Sammanfoga från vänster, sedan höger" -#: src/diffuse/main.py:916 +#: src/diffuse/main.py:924 msgid "Merge From Right Then Left" msgstr "Sammanfoga från höger, sedan vänster" -#: src/diffuse/main.py:918 +#: src/diffuse/main.py:926 msgid "Undo" msgstr "Ångra" -#: src/diffuse/main.py:919 +#: src/diffuse/main.py:927 msgid "Redo" msgstr "Upprepa" -#: src/diffuse/main.py:920 src/diffuse/widgets.py:1847 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 msgid "Cut" msgstr "Klipp ut" -#: src/diffuse/main.py:921 src/diffuse/widgets.py:1848 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 msgid "Copy" msgstr "Kopiera" -#: src/diffuse/main.py:922 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 msgid "Paste" msgstr "Klistra in" -#: src/diffuse/main.py:923 src/diffuse/widgets.py:1852 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 msgid "Clear Edits" msgstr "Rensa bort ändringar" -#: src/diffuse/main.py:1046 +#: src/diffuse/main.py:1054 msgid "Some files have unsaved changes. Select the files to save before closing." msgstr "" "Vissa filer har ändringar som inte sparats. Välj filer att spara före stängning." -#: src/diffuse/main.py:1060 +#: src/diffuse/main.py:1068 msgid "Tab" msgstr "Flik" -#: src/diffuse/main.py:1065 +#: src/diffuse/main.py:1073 msgid "Pane" msgstr "Panel" -#: src/diffuse/main.py:1076 +#: src/diffuse/main.py:1084 msgid "Close _Without Saving" msgstr "Stäng _utan att spara" -#: src/diffuse/main.py:1115 +#: src/diffuse/main.py:1123 #, python-format msgid "Closing this tab will quit %s." msgstr "Stängning av denna flik, avslutar %s." -#: src/diffuse/main.py:1198 +#: src/diffuse/main.py:1206 #, python-format msgid "File Merge %d" msgstr "Filsammanslagning %d" -#: src/diffuse/main.py:1304 +#: src/diffuse/main.py:1312 #, python-format msgid "Error retrieving commits for %s." msgstr "Fel vid hämtning av arkiveringar för %s." -#: src/diffuse/main.py:1336 +#: src/diffuse/main.py:1344 #, python-format msgid "Error retrieving modifications for %s." msgstr "Fel vid hämtning av ändringar för %s." -#: src/diffuse/main.py:1369 +#: src/diffuse/main.py:1377 msgid "Open File In New Tab" msgstr "Öppna fil i ny flik" -#: src/diffuse/main.py:1392 +#: src/diffuse/main.py:1400 msgid "Choose Folder With Modified Files" msgstr "Välj mapp med ändrade filer" -#: src/diffuse/main.py:1410 +#: src/diffuse/main.py:1418 msgid "No modified files found." msgstr "Inga ändrade filer hittades." -#: src/diffuse/main.py:1416 +#: src/diffuse/main.py:1424 msgid "Choose Folder With Commit" msgstr "Välj mapp för arkiveringar" -#: src/diffuse/main.py:1436 +#: src/diffuse/main.py:1444 msgid "No committed files found." msgstr "Inga arkiverade filer hittades." -#: src/diffuse/main.py:1472 +#: src/diffuse/main.py:1480 msgid "New N-Way File Merge..." msgstr "Ny x-vägs filsammanslagning..." -#: src/diffuse/main.py:1473 +#: src/diffuse/main.py:1481 msgid "Number of panes: " msgstr "Antal paneler: " -#: src/diffuse/main.py:1547 +#: src/diffuse/main.py:1555 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?" -#: src/diffuse/main.py:1549 +#: src/diffuse/main.py:1557 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?" -#: src/diffuse/main.py:1770 +#: src/diffuse/main.py:1778 #, fuzzy msgid "" "Usage:\n" @@ -702,174 +670,174 @@ msgstr "" " ( -i | --ignore-case ) Ignorera olikheter i skiftläge\n" " ( -w | --ignore-all-space ) Ignorera olikheter i blanksteg" -#: src/diffuse/main.py:1937 +#: src/diffuse/main.py:1945 msgid "Error parsing line number." msgstr "Fel vid tolkning av radnummer." -#: src/diffuse/main.py:1947 +#: src/diffuse/main.py:1955 #, python-format msgid "Skipping unknown argument \"%s\"." msgstr "Undantar okänt argument \"%s\"." -#: src/diffuse/main.py:1955 +#: src/diffuse/main.py:1963 #, python-format msgid "Error processing argument \"%s\". Directory not expected." msgstr "Fel vid bearbetning av argumentet \"%s\". Katalogen inte den förväntade." -#: src/diffuse/preferences.py:79 +#: src/diffuse/preferences.py:80 msgid "Display" msgstr "Visning" -#: src/diffuse/preferences.py:82 +#: src/diffuse/preferences.py:83 msgid "Font" msgstr "Teckensnitt" -#: src/diffuse/preferences.py:83 +#: src/diffuse/preferences.py:84 msgid "Tab width" msgstr "Tabulatorbredd" -#: src/diffuse/preferences.py:84 +#: src/diffuse/preferences.py:85 msgid "Show right margin" msgstr "Visa höger marginal" -#: src/diffuse/preferences.py:85 +#: src/diffuse/preferences.py:86 msgid "Right margin" msgstr "Höger marginal" -#: src/diffuse/preferences.py:86 +#: src/diffuse/preferences.py:87 msgid "Show line numbers" msgstr "Visa radnummer" -#: src/diffuse/preferences.py:87 +#: src/diffuse/preferences.py:88 msgid "Show white space characters" msgstr "Visa blankstegstecken" -#: src/diffuse/preferences.py:88 +#: src/diffuse/preferences.py:89 msgid "Ignore case differences" msgstr "Ignorera olikheter i skiftläge" -#: src/diffuse/preferences.py:89 +#: src/diffuse/preferences.py:90 msgid "Ignore white space differences" msgstr "Ignorera olikheter i blanksteg" -#: src/diffuse/preferences.py:90 src/diffuse/preferences.py:99 +#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100 msgid "Ignore changes to white space" msgstr "Ignorera ändringar i blanksteg" -#: src/diffuse/preferences.py:91 +#: src/diffuse/preferences.py:92 msgid "Ignore blank line differences" msgstr "Ignorera olikheter i tomma rader" -#: src/diffuse/preferences.py:92 +#: src/diffuse/preferences.py:93 msgid "Ignore end of line differences" msgstr "Ignorera olikheter i radavslut" -#: src/diffuse/preferences.py:94 +#: src/diffuse/preferences.py:95 msgid "Alignment" msgstr "Justering" -#: src/diffuse/preferences.py:97 +#: src/diffuse/preferences.py:98 msgid "Ignore case" msgstr "Ignorera skiftläge" -#: src/diffuse/preferences.py:98 +#: src/diffuse/preferences.py:99 msgid "Ignore white space" msgstr "Ignorera blanksteg" -#: src/diffuse/preferences.py:100 +#: src/diffuse/preferences.py:101 msgid "Ignore blank lines" msgstr "Ignorera tomma rader" -#: src/diffuse/preferences.py:101 +#: src/diffuse/preferences.py:102 msgid "Ignore end of line characters" msgstr "Ignorera tecken för radavslut" -#: src/diffuse/preferences.py:103 +#: src/diffuse/preferences.py:104 msgid "Editor" msgstr "Redigerare" -#: src/diffuse/preferences.py:106 +#: src/diffuse/preferences.py:107 msgid "Auto indent" msgstr "Automatiskt indrag" -#: src/diffuse/preferences.py:107 +#: src/diffuse/preferences.py:108 msgid "Expand tabs to spaces" msgstr "Expandera tabbar till blanksteg" -#: src/diffuse/preferences.py:108 +#: src/diffuse/preferences.py:109 msgid "Soft tab width" msgstr "Mjuk tabulatorbredd" -#: src/diffuse/preferences.py:110 +#: src/diffuse/preferences.py:111 msgid "Tabs" msgstr "Flikar" -#: src/diffuse/preferences.py:113 +#: src/diffuse/preferences.py:114 msgid "Default panes" msgstr "Standardpaneler" -#: src/diffuse/preferences.py:114 +#: src/diffuse/preferences.py:115 msgid "Always show the tab bar" msgstr "Visa alltid flikfältet" -#: src/diffuse/preferences.py:115 +#: src/diffuse/preferences.py:116 #, python-format msgid "Warn me when closing a tab will quit %s" msgstr "Varna mig när flikstängning kommer att avsluta %s" -#: src/diffuse/preferences.py:117 +#: src/diffuse/preferences.py:118 msgid "Regional Settings" msgstr "Regionala inställningar" -#: src/diffuse/preferences.py:120 +#: src/diffuse/preferences.py:121 msgid "Default codec" msgstr "Standardkodning" -#: src/diffuse/preferences.py:121 +#: src/diffuse/preferences.py:122 msgid "Order of codecs used to identify encoding" msgstr "Tabellordning för att identifiera kodning" -#: src/diffuse/preferences.py:142 +#: src/diffuse/preferences.py:143 msgid "Cygwin" msgstr "Cygwin" -#: src/diffuse/preferences.py:144 +#: src/diffuse/preferences.py:145 msgid "Root directory" msgstr "Root-mapp" -#: src/diffuse/preferences.py:145 +#: src/diffuse/preferences.py:146 msgid "Cygdrive prefix" msgstr "Cygdrive-prefix" -#: src/diffuse/preferences.py:164 +#: src/diffuse/preferences.py:165 msgid "Version control system search order" msgstr "Sökordning för versionskontrollsystem" -#: src/diffuse/preferences.py:172 +#: src/diffuse/preferences.py:173 msgid "\"co\" command" msgstr "\"co\" kommando" -#: src/diffuse/preferences.py:173 +#: src/diffuse/preferences.py:174 msgid "\"rlog\" command" msgstr "\"rlog\" kommando" -#: src/diffuse/preferences.py:175 +#: src/diffuse/preferences.py:176 msgid "Command" msgstr "Kommando" -#: src/diffuse/preferences.py:181 +#: src/diffuse/preferences.py:182 msgid "Launch from a Bash login shell" msgstr "Starta från ett Bash inloggningsskal" -#: src/diffuse/preferences.py:188 +#: src/diffuse/preferences.py:189 msgid "Update paths for Cygwin" msgstr "Uppdatera sökvägar för Cygwin" -#: src/diffuse/preferences.py:193 +#: src/diffuse/preferences.py:194 msgid "Version Control" msgstr "Versionskontroll" -#: src/diffuse/preferences.py:258 +#: src/diffuse/preferences.py:259 msgid "Preferences" msgstr "Inställningar" @@ -901,7 +869,7 @@ msgstr "" #: src/diffuse/resources.py:409 #, python-brace-format -msgid "Options \"{option}\" is unknown" +msgid "Option \"{option}\" is unknown" msgstr "" #: src/diffuse/resources.py:416 @@ -954,40 +922,71 @@ msgstr "Fel vid bearbetning av rad {line} i {file}." msgid "Unhandled error at line {line} of {file}." msgstr "Fel vid bearbetning av rad {line} i {file}." -#: src/diffuse/utils.py:63 +#: src/diffuse/utils.py:66 msgid "Auto Detect" msgstr "Identifiera automatiskt" -#: src/diffuse/vcs/cvs.py:53 src/diffuse/vcs/rcs.py:62 src/diffuse/vcs/svn.py:95 +#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97 #, python-format msgid "Error parsing revision %s." msgstr "Fel vid tolkning av revision %s." -#: src/diffuse/vcs/vcs_registry.py:233 +#: src/diffuse/vcs/vcs_registry.py:238 #, python-format msgid "Error parsing %s." msgstr "Fel vid tolkning av %s." -#: src/diffuse/widgets.py:1843 +#: src/diffuse/widgets.py:1845 msgid "Align with Selection" msgstr "Justera till markerat" -#: src/diffuse/widgets.py:1844 +#: src/diffuse/widgets.py:1846 msgid "Isolate" msgstr "Isolera" -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1847 msgid "Merge Selection" msgstr "Sammanfoga markerat" -#: src/diffuse/widgets.py:1851 +#: src/diffuse/widgets.py:1853 msgid "Select All" msgstr "Markera alla" -#: src/diffuse/widgets.py:1854 +#: src/diffuse/widgets.py:1856 msgid "Swap with Selected Pane" msgstr "Växla med markerad panel" +#, fuzzy +#~ msgid "" +#~ "This program is free software; you can redistribute it and/or modify\n" +#~ "it under the terms of the GNU General Public License as published by\n" +#~ "the Free Software Foundation; either version 2 of the License, or\n" +#~ "(at your option) any later version.\n" +#~ "\n" +#~ "This program is distributed in the hope that it will be useful,\n" +#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +#~ "GNU General Public License for more details.\n" +#~ "\n" +#~ "You should have received a copy of the GNU General Public License along\n" +#~ "with this program; if not, write to the Free Software Foundation, Inc.,\n" +#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." +#~ msgstr "" +#~ "Detta program är fri mjukvara! Du kan återdistribuera det och/eller modifiera " +#~ "det, under villkoren för GNU General Public License som den publiceras av Free " +#~ "Software Foundation. Antingen version 2 av licensen, eller valfri senare " +#~ "version.\n" +#~ "\n" +#~ "Programmet distribueras i hopp om att det skall vara användbart, men UTAN " +#~ "NÅGRA GARANTIER. Utan ens underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET " +#~ "FÖR ETT VISST ÄNDAMÅL. Se GNU General Public License för mer detaljerad info.\n" +#~ "\n" +#~ "Du bör ha fått en kopia av GNU General Public License tillsammans med det här " +#~ "programmet. Du kan också hämta en kopia av GNU General Public License från " +#~ "Free Software Foundation genom att besöka deras webbsida (http://www.fsf.org/) " +#~ "eller skriva till Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, " +#~ "Boston, MA 02110-1301 USA.\n" + #~ msgid "Diffuse Merge Tool" #~ msgstr "Diffuse sammanfogningsverktyg" diff --git a/po/th.po b/po/th.po index 75c7298..72c965d 100644 --- a/po/th.po +++ b/po/th.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffuse 0.4.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-27 21:56-0500\n" +"POT-Creation-Date: 2022-04-04 12:14-0400\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: Akom Chotiphantawanon \n" "Language-Team: Thai \n" @@ -39,7 +39,7 @@ msgstr "" msgid "Main window: diff between two files" msgstr "" -#: src/diffuse/constants.py:24 +#: src/diffuse/constants.py:25 msgid "Copyright" msgstr "" @@ -51,36 +51,6 @@ msgstr "Diffuse เป็นเครื่องมือแบบกราฟ msgid "translator-credits" msgstr "Akom Chotiphantawanon " -#: src/diffuse/dialogs.py:49 -#, fuzzy -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License along\n" -"with this program; if not, write to the Free Software Foundation, Inc.,\n" -"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." -msgstr "" -"โปรแกรมนี้เป็นซอฟต์แวร์เสรี คุณสามารถแจกจ่ายต่อ และ/หรือ แก้ไขโปรแกรมได้ ภายใต้เงื่อนไขของ GNU " -"General Public License ที่เผยแพร่โดยมูลนิธิซอฟต์แวร์เสรี ไม่ว่าจะเป็นสัญญาอนุญาตรุ่นที่ 2 หรือรุ่นถัดมา " -"(ตามแต่คุณจะเลือก)\n" -"\n" -"โปรแกรมนี้ เผยแพร่ด้วยความหวังว่าโปรแกรมจะมีประโยชน์ แต่ *ไม่มีการรับประกันใดๆ* " -"ไม่มีแม้การรับประกัน *อรรถประโยชน์เชิงพาณิชย์* หรือ *ความเหมาะสมสำหรับวัตถุประสงค์เฉพาะกิจใดๆ* " -"กรุณาอ่าน GNU General Public License เพื่อดูรายละเอียดเพิ่มเติม\n" -"\n" -"คุณควรจะได้รับสำเนาของ GNU General Public License มาพร้อมกับโปรแกรมนี้ " -"และคุณยังอาจรับสำเนาของ GNU General Public License จาก Free Software Foundation " -"โดยเข้าเยี่ยมชมเว็บไซต์ของมูลนิธิ (http://www.fsf.org/) หรือโดยการเขียนไปที่ Free Software " -"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n" - #: src/diffuse/dialogs.py:83 msgid "Encoding: " msgstr "รหัสอักขระ: " @@ -105,60 +75,60 @@ msgstr "ตัวพิมพ์ใหญ่-เล็กตรงกัน" msgid "Search Backwards" msgstr "ค้นถอยหลัง" -#: src/diffuse/main.py:79 +#: src/diffuse/main.py:85 msgid "Close Tab" msgstr "ปิดแท็บ" -#: src/diffuse/main.py:124 +#: src/diffuse/main.py:132 msgid "Open File..." msgstr "เปิดแฟ้ม..." -#: src/diffuse/main.py:125 +#: src/diffuse/main.py:133 msgid "Reload File" msgstr "โหลดแฟ้มซ้ำ" -#: src/diffuse/main.py:126 +#: src/diffuse/main.py:134 msgid "Save File" msgstr "บันทึกแฟ้ม" -#: src/diffuse/main.py:127 +#: src/diffuse/main.py:135 msgid "Save File As..." msgstr "บันทึกแฟ้มเป็น..." -#: src/diffuse/main.py:280 +#: src/diffuse/main.py:288 msgid "Save changes before loading the new file?" msgstr "บันทึกการเปลี่ยนแปลงก่อนโหลดแฟ้มใหม่หรือไม่?" -#: src/diffuse/main.py:391 +#: src/diffuse/main.py:399 #, python-format msgid "Error reading revision %(rev)s of %(file)s." msgstr "เกิดข้อผิดพลาดขณะอ่านฉบับแก้ไข %(rev)s ของ %(file)s" -#: src/diffuse/main.py:394 src/diffuse/main.py:1849 +#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #, python-format msgid "Error reading %s." msgstr "เกิดข้อผิดพลาดขณะอ่าน %s" -#: src/diffuse/main.py:416 +#: src/diffuse/main.py:424 msgid "Open File" msgstr "เปิดแฟ้ม" -#: src/diffuse/main.py:473 +#: src/diffuse/main.py:481 #, python-format msgid "The file %s changed on disk. Do you want to reload the file?" msgstr "แฟ้ม \"%s\" มีการเปลี่ยนแปลงในดิสก์ คุณต้องการโหลดแฟ้มซ้ำหรือไม่?" -#: src/diffuse/main.py:499 +#: src/diffuse/main.py:507 #, python-format msgid "Save %(title)s Pane %(pane)d" msgstr "บันทึก %(title)s ช่อง %(pane)d" -#: src/diffuse/main.py:531 +#: src/diffuse/main.py:539 #, python-format msgid "A file named %s already exists. Do you want to overwrite it?" msgstr "แฟ้มชื่อ \"%s\" มีอยู่ก่อนแล้ว คุณต้องการเขียนทับหรือไม่?" -#: src/diffuse/main.py:538 +#: src/diffuse/main.py:546 #, python-format msgid "" "The file %s has been modified by another process since reading it. If you save, " @@ -167,458 +137,458 @@ msgstr "" "แฟ้ม \"%s\" ถูกเปลี่ยนแปลงโดยโพรเซสอื่นนับตั้งแต่ที่อ่านไว้ ถ้าคุณบันทึก " "การเปลี่ยนแปลงภายนอกทั้งหมดอาจสูญหายได้ ยังคงบันทึกหรือไม่?" -#: src/diffuse/main.py:580 +#: src/diffuse/main.py:588 #, python-format msgid "Error encoding to %s." msgstr "เกิดข้อผิดพลาดขณะลงรหัส %s" -#: src/diffuse/main.py:584 src/diffuse/preferences.py:298 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 #, python-format msgid "Error writing %s." msgstr "เกิดข้อผิดพลาดขณะเขียน %s" -#: src/diffuse/main.py:614 +#: src/diffuse/main.py:622 msgid "Go To Line..." msgstr "ไปที่บรรทัด..." -#: src/diffuse/main.py:615 +#: src/diffuse/main.py:623 msgid "Line Number: " msgstr "หมายเลขบรรทัด: " -#: src/diffuse/main.py:646 +#: src/diffuse/main.py:654 msgid "" "Press the enter key or double click to edit. Press the space bar or use the RMB " "menu to manually align." msgstr "กดปุ่ม Enter หรือดับเบิลคลิกเพื่อแก้ไข กดแคร่เว้นวรรคหรือใช้เมนูคลิกขวาเพื่อจัดเรียงด้วยมือ" -#: src/diffuse/main.py:650 +#: src/diffuse/main.py:658 msgid "Press the escape key to finish editing." msgstr "กดปุ่ม Escape เพื่อจบการแก้ไข" -#: src/diffuse/main.py:653 +#: src/diffuse/main.py:661 msgid "" "Select target line and press the space bar to align. Press the escape key to " "cancel." msgstr "เลือกบรรทัดเป้าหมายแล้วกดแคร่เว้นวรรคเพื่อจัดเรียง กดปุ่ม Escape เพื่อยกเลิก" -#: src/diffuse/main.py:776 +#: src/diffuse/main.py:784 msgid "_File" msgstr "แ_ฟ้ม" -#: src/diffuse/main.py:777 +#: src/diffuse/main.py:785 msgid "_Open File..." msgstr "_เปิดแฟ้ม..." -#: src/diffuse/main.py:778 +#: src/diffuse/main.py:786 msgid "Open File In New _Tab..." msgstr "เปิดแฟ้มในแ_ท็บใหม่..." -#: src/diffuse/main.py:779 +#: src/diffuse/main.py:787 msgid "Open _Modified Files..." msgstr "เปิดแฟ้มที่เ_ปลี่ยนแปลง..." -#: src/diffuse/main.py:780 +#: src/diffuse/main.py:788 msgid "Open Commi_t..." msgstr "เปิด Commi_t..." -#: src/diffuse/main.py:781 +#: src/diffuse/main.py:789 msgid "_Reload File" msgstr "โ_หลดแฟ้มซ้ำ" -#: src/diffuse/main.py:783 +#: src/diffuse/main.py:791 msgid "_Save File" msgstr "_บันทึกแฟ้ม" -#: src/diffuse/main.py:784 +#: src/diffuse/main.py:792 msgid "Save File _As..." msgstr "บันทึกแฟ้มเป็_น..." -#: src/diffuse/main.py:785 +#: src/diffuse/main.py:793 msgid "Save A_ll" msgstr "บันทึกทั้งห_มด" -#: src/diffuse/main.py:787 +#: src/diffuse/main.py:795 msgid "New _2-Way File Merge" msgstr "การผสานแฟ้ม _2 ทางชุดใหม่" -#: src/diffuse/main.py:788 +#: src/diffuse/main.py:796 msgid "New _3-Way File Merge" msgstr "การผสานแฟ้ม _3 ทางชุดใหม่" -#: src/diffuse/main.py:789 +#: src/diffuse/main.py:797 msgid "New _N-Way File Merge..." msgstr "การผสานแฟ้ม _N ทางชุดใหม่..." -#: src/diffuse/main.py:791 +#: src/diffuse/main.py:799 msgid "_Close Tab" msgstr "ปิ_ดแท็บ" -#: src/diffuse/main.py:792 +#: src/diffuse/main.py:800 msgid "_Undo Close Tab" msgstr "เ_รียกคืนการปิดแท็บ" -#: src/diffuse/main.py:793 +#: src/diffuse/main.py:801 msgid "_Quit" msgstr "_ออก" -#: src/diffuse/main.py:796 +#: src/diffuse/main.py:804 msgid "_Edit" msgstr "แ_ก้ไข" -#: src/diffuse/main.py:797 +#: src/diffuse/main.py:805 msgid "_Undo" msgstr "เ_รียกคืน" -#: src/diffuse/main.py:798 +#: src/diffuse/main.py:806 msgid "_Redo" msgstr "_ทำซ้ำ" -#: src/diffuse/main.py:800 +#: src/diffuse/main.py:808 msgid "Cu_t" msgstr "_ตัด" -#: src/diffuse/main.py:801 +#: src/diffuse/main.py:809 msgid "_Copy" msgstr "_คัดลอก" -#: src/diffuse/main.py:802 +#: src/diffuse/main.py:810 msgid "_Paste" msgstr "_แปะ" -#: src/diffuse/main.py:804 +#: src/diffuse/main.py:812 msgid "Select _All" msgstr "เลือกทั้ง_หมด" -#: src/diffuse/main.py:805 +#: src/diffuse/main.py:813 msgid "C_lear Edits" msgstr "_ล้างการแก้ไขต่างๆ" -#: src/diffuse/main.py:806 +#: src/diffuse/main.py:814 msgid "_Dismiss All Edits" msgstr "ไ_ม่สนใจการแก้ไขทั้งหมด" -#: src/diffuse/main.py:808 +#: src/diffuse/main.py:816 msgid "_Find..." msgstr "_หา..." -#: src/diffuse/main.py:809 +#: src/diffuse/main.py:817 msgid "Find _Next" msgstr "หา_ถัดไป" -#: src/diffuse/main.py:810 +#: src/diffuse/main.py:818 msgid "Find Pre_vious" msgstr "หา_ก่อนหน้า" -#: src/diffuse/main.py:811 +#: src/diffuse/main.py:819 msgid "_Go To Line..." msgstr "ไปที่_บรรทัด..." -#: src/diffuse/main.py:813 +#: src/diffuse/main.py:821 msgid "Pr_eferences..." msgstr "_ปรับแต่ง..." -#: src/diffuse/main.py:817 +#: src/diffuse/main.py:825 msgid "None" msgstr "ไม่มี" -#: src/diffuse/main.py:835 +#: src/diffuse/main.py:843 msgid "_View" msgstr "มุ_มมอง" -#: src/diffuse/main.py:836 +#: src/diffuse/main.py:844 msgid "_Syntax Highlighting" msgstr "การเน้นไ_วยากรณ์" -#: src/diffuse/main.py:838 +#: src/diffuse/main.py:846 msgid "Re_align All" msgstr "จัดเรียงให_ม่ทั้งหมด" -#: src/diffuse/main.py:839 +#: src/diffuse/main.py:847 msgid "_Isolate" msgstr "แ_ยก" -#: src/diffuse/main.py:841 +#: src/diffuse/main.py:849 msgid "_First Difference" msgstr "ความแตกต่างแ_รก" -#: src/diffuse/main.py:842 +#: src/diffuse/main.py:850 msgid "_Previous Difference" msgstr "ความแตกต่าง_ก่อนหน้า" -#: src/diffuse/main.py:843 +#: src/diffuse/main.py:851 msgid "_Next Difference" msgstr "ความแตกต่าง_ถัดไป" -#: src/diffuse/main.py:844 +#: src/diffuse/main.py:852 msgid "_Last Difference" msgstr "ความแตกต่าง_ล่าสุด" -#: src/diffuse/main.py:846 +#: src/diffuse/main.py:854 msgid "Fir_st Tab" msgstr "แท็บ_แรก" -#: src/diffuse/main.py:847 +#: src/diffuse/main.py:855 msgid "Pre_vious Tab" msgstr "แท็บก่อ_นหน้า" -#: src/diffuse/main.py:848 +#: src/diffuse/main.py:856 msgid "Next _Tab" msgstr "แ_ท็บถัดไป" -#: src/diffuse/main.py:849 +#: src/diffuse/main.py:857 msgid "Las_t Tab" msgstr "แท็บสุ_ดท้าย" -#: src/diffuse/main.py:851 +#: src/diffuse/main.py:859 msgid "Shift Pane _Right" msgstr "เลื่อนช่องไปทาง_ขวา" -#: src/diffuse/main.py:852 +#: src/diffuse/main.py:860 msgid "Shift Pane _Left" msgstr "เลื่อนช่องไปทางซ้_าย" -#: src/diffuse/main.py:855 +#: src/diffuse/main.py:863 msgid "F_ormat" msgstr "จัดรูปแ_บบ" -#: src/diffuse/main.py:856 +#: src/diffuse/main.py:864 msgid "Convert To _Upper Case" msgstr "แปลงเป็นตัวพิมพ์ใ_หญ่" -#: src/diffuse/main.py:857 +#: src/diffuse/main.py:865 msgid "Convert To _Lower Case" msgstr "แปลงเป็นตัวพิมพ์เล็_ก" -#: src/diffuse/main.py:859 +#: src/diffuse/main.py:867 msgid "Sort Lines In _Ascending Order" msgstr "เรียงบรรทัดจากน้_อยไปหามาก" -#: src/diffuse/main.py:860 +#: src/diffuse/main.py:868 msgid "Sort Lines In D_escending Order" msgstr "เรียงบรรทัดจาก_มากไปหาน้อย" -#: src/diffuse/main.py:862 +#: src/diffuse/main.py:870 msgid "Remove Trailing _White Space" msgstr "ลบช่องว่างท้า_ยบรรทัด" -#: src/diffuse/main.py:863 +#: src/diffuse/main.py:871 msgid "Convert Tabs To _Spaces" msgstr "แปลงแท็บเป็น_ช่องว่าง" -#: src/diffuse/main.py:864 +#: src/diffuse/main.py:872 msgid "Convert Leading Spaces To _Tabs" msgstr "แปลงช่องว่างที่ต้นบรรทัดเป็นแ_ท็บ" -#: src/diffuse/main.py:866 +#: src/diffuse/main.py:874 msgid "_Increase Indenting" msgstr "เ_พิ่มการร่นย่อหน้า" -#: src/diffuse/main.py:867 +#: src/diffuse/main.py:875 msgid "De_crease Indenting" msgstr "_ลดการร่นย่อหน้า" -#: src/diffuse/main.py:869 +#: src/diffuse/main.py:877 msgid "Convert To _DOS Format" msgstr "แปลงเป็นรูปแบบ_ดอส" -#: src/diffuse/main.py:870 +#: src/diffuse/main.py:878 msgid "Convert To _Mac Format" msgstr "แปลงเป็นรูปแบบแ_ม็ค" -#: src/diffuse/main.py:871 +#: src/diffuse/main.py:879 msgid "Convert To Uni_x Format" msgstr "แปลงเป็นรูปแบบยู_นิกซ์" -#: src/diffuse/main.py:874 +#: src/diffuse/main.py:882 msgid "_Merge" msgstr "_ผสาน" -#: src/diffuse/main.py:875 +#: src/diffuse/main.py:883 msgid "Copy Selection _Right" msgstr "คัดลอกบรรทัดที่เลือกไปช่อง_ขวา" -#: src/diffuse/main.py:876 +#: src/diffuse/main.py:884 msgid "Copy Selection _Left" msgstr "คัดลอกบรรทัดที่เลือกไปช่องซ้า_ย" -#: src/diffuse/main.py:878 +#: src/diffuse/main.py:886 msgid "Copy Left _Into Selection" msgstr "คัดลอกช่องซ้าย_เข้าในบรรทัดที่เลือก" -#: src/diffuse/main.py:879 +#: src/diffuse/main.py:887 msgid "Copy Right I_nto Selection" msgstr "คัดลอกช่องขวาเข้าใ_นบรรทัดที่เลือก" -#: src/diffuse/main.py:880 +#: src/diffuse/main.py:888 msgid "_Merge From Left Then Right" msgstr "_ผสานจากช่องซ้ายแล้วตามด้วยขวา" -#: src/diffuse/main.py:881 +#: src/diffuse/main.py:889 msgid "M_erge From Right Then Left" msgstr "ผ_สานจากช่องขวาแล้วตามด้วยซ้าย" -#: src/diffuse/main.py:884 +#: src/diffuse/main.py:892 msgid "_Help" msgstr "_วิธีใช้" -#: src/diffuse/main.py:885 +#: src/diffuse/main.py:893 msgid "_Help Contents..." msgstr "เ_นื้อหาวิธีใช้..." -#: src/diffuse/main.py:887 +#: src/diffuse/main.py:895 #, python-format msgid "_About %s..." msgstr "เ_กี่ยวกับ %s..." -#: src/diffuse/main.py:902 +#: src/diffuse/main.py:910 msgid "New 2-Way File Merge" msgstr "การผสานแฟ้ม 2 ทางชุดใหม่" -#: src/diffuse/main.py:903 +#: src/diffuse/main.py:911 msgid "New 3-Way File Merge" msgstr "การผสานแฟ้ม 3 ทางชุดใหม่" -#: src/diffuse/main.py:905 +#: src/diffuse/main.py:913 msgid "Realign All" msgstr "จัดเรียงใหม่ทั้งหมด" -#: src/diffuse/main.py:906 +#: src/diffuse/main.py:914 msgid "First Difference" msgstr "ความแตกต่างแรก" -#: src/diffuse/main.py:907 +#: src/diffuse/main.py:915 msgid "Previous Difference" msgstr "ความแตกต่างก่อนหน้า" -#: src/diffuse/main.py:908 +#: src/diffuse/main.py:916 msgid "Next Difference" msgstr "ความแตกต่างถัดไป" -#: src/diffuse/main.py:909 +#: src/diffuse/main.py:917 msgid "Last Difference" msgstr "ความแตกต่างสุดท้าย" -#: src/diffuse/main.py:911 +#: src/diffuse/main.py:919 msgid "Copy Selection Right" msgstr "คัดลอกบรรทัดที่เลือกไปช่องขวา" -#: src/diffuse/main.py:912 +#: src/diffuse/main.py:920 msgid "Copy Selection Left" msgstr "คัดลอกบรรทัดที่เลือกไปช่องซ้าย" -#: src/diffuse/main.py:913 +#: src/diffuse/main.py:921 msgid "Copy Left Into Selection" msgstr "คัดลอกช่องซ้ายเข้าในบรรทัดที่เลือก" -#: src/diffuse/main.py:914 +#: src/diffuse/main.py:922 msgid "Copy Right Into Selection" msgstr "คัดลอกช่องขวาเข้าในบรรทัดที่เลือก" -#: src/diffuse/main.py:915 +#: src/diffuse/main.py:923 msgid "Merge From Left Then Right" msgstr "ผสานจากช่องซ้ายแล้วตามด้วยขวา" -#: src/diffuse/main.py:916 +#: src/diffuse/main.py:924 msgid "Merge From Right Then Left" msgstr "ผสานจากช่องขวาแล้วตามด้วยซ้าย" -#: src/diffuse/main.py:918 +#: src/diffuse/main.py:926 msgid "Undo" msgstr "เรียกคืน" -#: src/diffuse/main.py:919 +#: src/diffuse/main.py:927 msgid "Redo" msgstr "ทำซ้ำ" -#: src/diffuse/main.py:920 src/diffuse/widgets.py:1847 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 msgid "Cut" msgstr "ตัด" -#: src/diffuse/main.py:921 src/diffuse/widgets.py:1848 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 msgid "Copy" msgstr "คัดลอก" -#: src/diffuse/main.py:922 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 msgid "Paste" msgstr "แปะ" -#: src/diffuse/main.py:923 src/diffuse/widgets.py:1852 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 msgid "Clear Edits" msgstr "ล้างการแก้ไข" -#: src/diffuse/main.py:1046 +#: src/diffuse/main.py:1054 msgid "Some files have unsaved changes. Select the files to save before closing." msgstr "บางแฟ้มมีการเปลี่ยนแปลงที่ไม่ได้บันทึก เลือกแฟ้มเพื่อบันทึกก่อนปิด" -#: src/diffuse/main.py:1060 +#: src/diffuse/main.py:1068 msgid "Tab" msgstr "แท็บ" -#: src/diffuse/main.py:1065 +#: src/diffuse/main.py:1073 msgid "Pane" msgstr "ช่อง" -#: src/diffuse/main.py:1076 +#: src/diffuse/main.py:1084 msgid "Close _Without Saving" msgstr "ปิ_ดโดยไม่บันทึก" -#: src/diffuse/main.py:1115 +#: src/diffuse/main.py:1123 #, python-format msgid "Closing this tab will quit %s." msgstr "การปิดแท็บนี้จะออกจาก %s" -#: src/diffuse/main.py:1198 +#: src/diffuse/main.py:1206 #, python-format msgid "File Merge %d" msgstr "การผสานแฟ้ม %d" -#: src/diffuse/main.py:1304 +#: src/diffuse/main.py:1312 #, python-format msgid "Error retrieving commits for %s." msgstr "เกิดข้อผิดพลาดขณะดึง commit ต่างๆ สำหรับ %s" -#: src/diffuse/main.py:1336 +#: src/diffuse/main.py:1344 #, python-format msgid "Error retrieving modifications for %s." msgstr "เกิดข้อผิดพลาดขณะดึงการเปลี่ยนแปลงสำหรับ %s" -#: src/diffuse/main.py:1369 +#: src/diffuse/main.py:1377 msgid "Open File In New Tab" msgstr "เปิดแฟ้มในแท็บใหม่" -#: src/diffuse/main.py:1392 +#: src/diffuse/main.py:1400 msgid "Choose Folder With Modified Files" msgstr "เลือกโฟลเดอร์ที่มีแฟ้มที่เปลี่ยนแปลง" -#: src/diffuse/main.py:1410 +#: src/diffuse/main.py:1418 msgid "No modified files found." msgstr "ไม่พบแฟ้มที่เปลี่ยนแปลง" -#: src/diffuse/main.py:1416 +#: src/diffuse/main.py:1424 msgid "Choose Folder With Commit" msgstr "เลือกโฟลเดอร์ที่มีการ commit" -#: src/diffuse/main.py:1436 +#: src/diffuse/main.py:1444 msgid "No committed files found." msgstr "ไม่พบแฟ้มที่มีการ commit" -#: src/diffuse/main.py:1472 +#: src/diffuse/main.py:1480 msgid "New N-Way File Merge..." msgstr "การผสานแฟ้ม N ทางชุดใหม่..." -#: src/diffuse/main.py:1473 +#: src/diffuse/main.py:1481 msgid "Number of panes: " msgstr "จำนวนช่อง: " -#: src/diffuse/main.py:1547 +#: src/diffuse/main.py:1555 msgid "Phrase not found. Continue from the end of the file?" msgstr "ไม่พบคำที่ค้น จะหาต่อจากท้ายแฟ้มหรือไม่?" -#: src/diffuse/main.py:1549 +#: src/diffuse/main.py:1557 msgid "Phrase not found. Continue from the start of the file?" msgstr "ไม่พบคำที่ค้น จะหาต่อจากต้นแฟ้มหรือไม่?" -#: src/diffuse/main.py:1770 +#: src/diffuse/main.py:1778 #, fuzzy msgid "" "Usage:\n" @@ -696,174 +666,174 @@ msgstr "" " ( -i | --ignore-case ) ไม่สนใจความแตกต่างของตัวพิมพ์ใหญ่-เล็ก\n" " ( -w | --ignore-all-space ) ไม่สนใจความแตกต่างของช่องว่างทั้งหมด" -#: src/diffuse/main.py:1937 +#: src/diffuse/main.py:1945 msgid "Error parsing line number." msgstr "เกิดข้อผิดพลาดขณะแจงหมายเลขบรรทัด" -#: src/diffuse/main.py:1947 +#: src/diffuse/main.py:1955 #, python-format msgid "Skipping unknown argument \"%s\"." msgstr "ขอข้ามอาร์กิวเมนต์ \"%s\" ที่ไม่ทราบ" -#: src/diffuse/main.py:1955 +#: src/diffuse/main.py:1963 #, python-format msgid "Error processing argument \"%s\". Directory not expected." msgstr "เกิดข้อผิดพลาดขณะประมวลผลอาร์กิวเมนต์ \"%s\" ไม่คาดหมายว่าจะพบไดเรกทอรี" -#: src/diffuse/preferences.py:79 +#: src/diffuse/preferences.py:80 msgid "Display" msgstr "การแสดงผล" -#: src/diffuse/preferences.py:82 +#: src/diffuse/preferences.py:83 msgid "Font" msgstr "แบบอักษร" -#: src/diffuse/preferences.py:83 +#: src/diffuse/preferences.py:84 msgid "Tab width" msgstr "ความกว้างแท็บ" -#: src/diffuse/preferences.py:84 +#: src/diffuse/preferences.py:85 msgid "Show right margin" msgstr "แสดงขอบขวา" -#: src/diffuse/preferences.py:85 +#: src/diffuse/preferences.py:86 msgid "Right margin" msgstr "ขอบขวา" -#: src/diffuse/preferences.py:86 +#: src/diffuse/preferences.py:87 msgid "Show line numbers" msgstr "แสดงเลขบรรทัด" -#: src/diffuse/preferences.py:87 +#: src/diffuse/preferences.py:88 msgid "Show white space characters" msgstr "แสดงอักขระช่องว่าง" -#: src/diffuse/preferences.py:88 +#: src/diffuse/preferences.py:89 msgid "Ignore case differences" msgstr "ไม่สนใจความแตกต่างของตัวพิมพ์ใหญ่-เล็ก" -#: src/diffuse/preferences.py:89 +#: src/diffuse/preferences.py:90 msgid "Ignore white space differences" msgstr "ไม่สนใจความแตกต่างของช่องว่างทั้งหมด" -#: src/diffuse/preferences.py:90 src/diffuse/preferences.py:99 +#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100 msgid "Ignore changes to white space" msgstr "ไม่สนใจการเปลี่ยนแปลงของช่องว่าง" -#: src/diffuse/preferences.py:91 +#: src/diffuse/preferences.py:92 msgid "Ignore blank line differences" msgstr "ไม่สนใจความแตกต่างของบรรทัดเปล่า" -#: src/diffuse/preferences.py:92 +#: src/diffuse/preferences.py:93 msgid "Ignore end of line differences" msgstr "ไม่สนใจความแตกต่างของอักขระจบบรรทัด" -#: src/diffuse/preferences.py:94 +#: src/diffuse/preferences.py:95 msgid "Alignment" msgstr "การจัดเรียง" -#: src/diffuse/preferences.py:97 +#: src/diffuse/preferences.py:98 msgid "Ignore case" msgstr "ไม่สนใจตัวพิมพ์ใหญ่-เล็ก" -#: src/diffuse/preferences.py:98 +#: src/diffuse/preferences.py:99 msgid "Ignore white space" msgstr "ไม่สนใจช่องว่าง" -#: src/diffuse/preferences.py:100 +#: src/diffuse/preferences.py:101 msgid "Ignore blank lines" msgstr "ไม่สนใจบรรทัดเปล่า" -#: src/diffuse/preferences.py:101 +#: src/diffuse/preferences.py:102 msgid "Ignore end of line characters" msgstr "ไม่สนใจอักขระจบบรรทัด" -#: src/diffuse/preferences.py:103 +#: src/diffuse/preferences.py:104 msgid "Editor" msgstr "เครื่องมือแก้ไข" -#: src/diffuse/preferences.py:106 +#: src/diffuse/preferences.py:107 msgid "Auto indent" msgstr "ร่นบรรทัดอัตโนมัติ" -#: src/diffuse/preferences.py:107 +#: src/diffuse/preferences.py:108 msgid "Expand tabs to spaces" msgstr "กระจายแท็บเป็นช่องว่าง" -#: src/diffuse/preferences.py:108 +#: src/diffuse/preferences.py:109 msgid "Soft tab width" msgstr "ความกว้างของแท็บแบบซอฟต์" -#: src/diffuse/preferences.py:110 +#: src/diffuse/preferences.py:111 msgid "Tabs" msgstr "แท็บ" -#: src/diffuse/preferences.py:113 +#: src/diffuse/preferences.py:114 msgid "Default panes" msgstr "ช่องปริยาย" -#: src/diffuse/preferences.py:114 +#: src/diffuse/preferences.py:115 msgid "Always show the tab bar" msgstr "แสดงแถบแท็บเสมอ" -#: src/diffuse/preferences.py:115 +#: src/diffuse/preferences.py:116 #, python-format msgid "Warn me when closing a tab will quit %s" msgstr "เตือนเมื่อการปิดแท็บจะออกจาก %s" -#: src/diffuse/preferences.py:117 +#: src/diffuse/preferences.py:118 msgid "Regional Settings" msgstr "ค่าตั้งภูมิภาค" -#: src/diffuse/preferences.py:120 +#: src/diffuse/preferences.py:121 msgid "Default codec" msgstr "ตัวอ่าน-ลงรหัสปริยาย" -#: src/diffuse/preferences.py:121 +#: src/diffuse/preferences.py:122 msgid "Order of codecs used to identify encoding" msgstr "ลำดับตัวอ่าน-ลงรหัสที่ใช้ในการตรวจสอบรหัสอักขระ" -#: src/diffuse/preferences.py:142 +#: src/diffuse/preferences.py:143 msgid "Cygwin" msgstr "Cygwin" -#: src/diffuse/preferences.py:144 +#: src/diffuse/preferences.py:145 msgid "Root directory" msgstr "ไดเรกทอรีราก" -#: src/diffuse/preferences.py:145 +#: src/diffuse/preferences.py:146 msgid "Cygdrive prefix" msgstr "พาธส่วนต้นของ Cygdrive" -#: src/diffuse/preferences.py:164 +#: src/diffuse/preferences.py:165 msgid "Version control system search order" msgstr "" -#: src/diffuse/preferences.py:172 +#: src/diffuse/preferences.py:173 msgid "\"co\" command" msgstr "คำสั่ง \"co\"" -#: src/diffuse/preferences.py:173 +#: src/diffuse/preferences.py:174 msgid "\"rlog\" command" msgstr "คำสั่ง \"rlog\"" -#: src/diffuse/preferences.py:175 +#: src/diffuse/preferences.py:176 msgid "Command" msgstr "คำสั่ง" -#: src/diffuse/preferences.py:181 +#: src/diffuse/preferences.py:182 msgid "Launch from a Bash login shell" msgstr "เรียกจากเชลล์ล็อกอินของ Bash" -#: src/diffuse/preferences.py:188 +#: src/diffuse/preferences.py:189 msgid "Update paths for Cygwin" msgstr "ปรับข้อมูลพาธสำหรับ Cygwin" -#: src/diffuse/preferences.py:193 +#: src/diffuse/preferences.py:194 msgid "Version Control" msgstr "การควบคุมรุ่น" -#: src/diffuse/preferences.py:258 +#: src/diffuse/preferences.py:259 msgid "Preferences" msgstr "ปรับแต่ง" @@ -895,7 +865,7 @@ msgstr "" #: src/diffuse/resources.py:409 #, python-brace-format -msgid "Options \"{option}\" is unknown" +msgid "Option \"{option}\" is unknown" msgstr "" #: src/diffuse/resources.py:416 @@ -948,40 +918,70 @@ msgstr "เกิดข้อผิดพลาดขณะประมวลผ msgid "Unhandled error at line {line} of {file}." msgstr "เกิดข้อผิดพลาดขณะประมวลผลบรรทัดที่ {line} ของ {file}" -#: src/diffuse/utils.py:63 +#: src/diffuse/utils.py:66 msgid "Auto Detect" msgstr "ตรวจสอบอัตโนมัติ" -#: src/diffuse/vcs/cvs.py:53 src/diffuse/vcs/rcs.py:62 src/diffuse/vcs/svn.py:95 +#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97 #, python-format msgid "Error parsing revision %s." msgstr "เกิดข้อผิดพลาดขณะแจงฉบับแก้ไข %s" -#: src/diffuse/vcs/vcs_registry.py:233 +#: src/diffuse/vcs/vcs_registry.py:238 #, python-format msgid "Error parsing %s." msgstr "เกิดข้อผิดพลาดขณะแจง %s" -#: src/diffuse/widgets.py:1843 +#: src/diffuse/widgets.py:1845 msgid "Align with Selection" msgstr "เรียงตรงกับบรรทัดที่เลือก" -#: src/diffuse/widgets.py:1844 +#: src/diffuse/widgets.py:1846 msgid "Isolate" msgstr "แยก" -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1847 msgid "Merge Selection" msgstr "ผสานบรรทัดที่เลือก" -#: src/diffuse/widgets.py:1851 +#: src/diffuse/widgets.py:1853 msgid "Select All" msgstr "เลือกทั้งหมด" -#: src/diffuse/widgets.py:1854 +#: src/diffuse/widgets.py:1856 msgid "Swap with Selected Pane" msgstr "สลับกับช่องที่เลือก" +#, fuzzy +#~ msgid "" +#~ "This program is free software; you can redistribute it and/or modify\n" +#~ "it under the terms of the GNU General Public License as published by\n" +#~ "the Free Software Foundation; either version 2 of the License, or\n" +#~ "(at your option) any later version.\n" +#~ "\n" +#~ "This program is distributed in the hope that it will be useful,\n" +#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +#~ "GNU General Public License for more details.\n" +#~ "\n" +#~ "You should have received a copy of the GNU General Public License along\n" +#~ "with this program; if not, write to the Free Software Foundation, Inc.,\n" +#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." +#~ msgstr "" +#~ "โปรแกรมนี้เป็นซอฟต์แวร์เสรี คุณสามารถแจกจ่ายต่อ และ/หรือ แก้ไขโปรแกรมได้ ภายใต้เงื่อนไขของ " +#~ "GNU General Public License ที่เผยแพร่โดยมูลนิธิซอฟต์แวร์เสรี ไม่ว่าจะเป็นสัญญาอนุญาตรุ่นที่ 2 " +#~ "หรือรุ่นถัดมา (ตามแต่คุณจะเลือก)\n" +#~ "\n" +#~ "โปรแกรมนี้ เผยแพร่ด้วยความหวังว่าโปรแกรมจะมีประโยชน์ แต่ *ไม่มีการรับประกันใดๆ* " +#~ "ไม่มีแม้การรับประกัน *อรรถประโยชน์เชิงพาณิชย์* หรือ " +#~ "*ความเหมาะสมสำหรับวัตถุประสงค์เฉพาะกิจใดๆ* กรุณาอ่าน GNU General Public License " +#~ "เพื่อดูรายละเอียดเพิ่มเติม\n" +#~ "\n" +#~ "คุณควรจะได้รับสำเนาของ GNU General Public License มาพร้อมกับโปรแกรมนี้ " +#~ "และคุณยังอาจรับสำเนาของ GNU General Public License จาก Free Software Foundation " +#~ "โดยเข้าเยี่ยมชมเว็บไซต์ของมูลนิธิ (http://www.fsf.org/) หรือโดยการเขียนไปที่ Free Software " +#~ "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n" + #~ msgid "Diffuse Merge Tool" #~ msgstr "Diffuse - เครื่องมือผสานแฟ้ม" diff --git a/po/zh_CN.po b/po/zh_CN.po index f3fd048..8f1330d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Diffuse svn 316\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-27 21:56-0500\n" +"POT-Creation-Date: 2022-04-04 12:14-0400\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: \n" "Language-Team: Chinese (simplified)\n" @@ -38,7 +38,7 @@ msgstr "" msgid "Main window: diff between two files" msgstr "" -#: src/diffuse/constants.py:24 +#: src/diffuse/constants.py:25 msgid "Copyright" msgstr "版权所有" @@ -50,23 +50,6 @@ msgstr "Diffuse是一个合并和比较文本文件的图形化程序。" msgid "translator-credits" msgstr "Liu Hao " -#: src/diffuse/dialogs.py:49 -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License along\n" -"with this program; if not, write to the Free Software Foundation, Inc.,\n" -"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." -msgstr "" - #: src/diffuse/dialogs.py:83 msgid "Encoding: " msgstr "编码：" @@ -91,518 +74,518 @@ msgstr "符合大小写" msgid "Search Backwards" msgstr "反向搜索" -#: src/diffuse/main.py:79 +#: src/diffuse/main.py:85 msgid "Close Tab" msgstr "关闭标签" -#: src/diffuse/main.py:124 +#: src/diffuse/main.py:132 msgid "Open File..." msgstr "打开文件" -#: src/diffuse/main.py:125 +#: src/diffuse/main.py:133 msgid "Reload File" msgstr "重新加载文件" -#: src/diffuse/main.py:126 +#: src/diffuse/main.py:134 msgid "Save File" msgstr "保存文件" -#: src/diffuse/main.py:127 +#: src/diffuse/main.py:135 msgid "Save File As..." msgstr "另存为" -#: src/diffuse/main.py:280 +#: src/diffuse/main.py:288 msgid "Save changes before loading the new file?" msgstr "加载新文件之前保存更改吗？" -#: src/diffuse/main.py:391 +#: src/diffuse/main.py:399 #, python-format msgid "Error reading revision %(rev)s of %(file)s." msgstr "无法读取文件%(file)s中的修订版本%(rev)s。" -#: src/diffuse/main.py:394 src/diffuse/main.py:1849 +#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #, python-format msgid "Error reading %s." msgstr "无法读取%s。" -#: src/diffuse/main.py:416 +#: src/diffuse/main.py:424 msgid "Open File" msgstr "打开文件" -#: src/diffuse/main.py:473 +#: src/diffuse/main.py:481 #, python-format msgid "The file %s changed on disk. Do you want to reload the file?" msgstr "磁盘文件%s已被更改，是否重新载入？" -#: src/diffuse/main.py:499 +#: src/diffuse/main.py:507 #, python-format msgid "Save %(title)s Pane %(pane)d" msgstr "保存%(title)s窗格%(pane)d" -#: src/diffuse/main.py:531 +#: src/diffuse/main.py:539 #, python-format msgid "A file named %s already exists. Do you want to overwrite it?" msgstr "已存在名为%s的文件，您希望覆盖它吗？" -#: src/diffuse/main.py:538 +#: src/diffuse/main.py:546 #, python-format msgid "" "The file %s has been modified by another process since reading it. If you save, " "all the external changes could be lost. Save anyways?" msgstr "文件%s打开后被其他进程更改过了，如果保存，其他程序的修改将会丢失，保存吗？" -#: src/diffuse/main.py:580 +#: src/diffuse/main.py:588 #, python-format msgid "Error encoding to %s." msgstr "无法编码为%s。" -#: src/diffuse/main.py:584 src/diffuse/preferences.py:298 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 #, python-format msgid "Error writing %s." msgstr "无法写入%s" -#: src/diffuse/main.py:614 +#: src/diffuse/main.py:622 msgid "Go To Line..." msgstr "跳到行..." -#: src/diffuse/main.py:615 +#: src/diffuse/main.py:623 msgid "Line Number: " msgstr "行数：" -#: src/diffuse/main.py:646 +#: src/diffuse/main.py:654 msgid "" "Press the enter key or double click to edit. Press the space bar or use the RMB " "menu to manually align." msgstr "按回车或者鼠标双击进行编译。空格键或者右键菜单手动对齐。" -#: src/diffuse/main.py:650 +#: src/diffuse/main.py:658 msgid "Press the escape key to finish editing." msgstr "按ESC键结束编辑" -#: src/diffuse/main.py:653 +#: src/diffuse/main.py:661 msgid "" "Select target line and press the space bar to align. Press the escape key to " "cancel." msgstr "选择目标行然后按空格键进行对齐，按ESC取消。" -#: src/diffuse/main.py:776 +#: src/diffuse/main.py:784 msgid "_File" msgstr "文件(_F)" -#: src/diffuse/main.py:777 +#: src/diffuse/main.py:785 msgid "_Open File..." msgstr "打开文件(_O)" -#: src/diffuse/main.py:778 +#: src/diffuse/main.py:786 msgid "Open File In New _Tab..." msgstr "在新标签里打开文件(_T)" -#: src/diffuse/main.py:779 +#: src/diffuse/main.py:787 msgid "Open _Modified Files..." msgstr "打开修改过的文件(_M)" -#: src/diffuse/main.py:780 +#: src/diffuse/main.py:788 msgid "Open Commi_t..." msgstr "打开提交(_T)" -#: src/diffuse/main.py:781 +#: src/diffuse/main.py:789 msgid "_Reload File" msgstr "重新加载文件(_R)" -#: src/diffuse/main.py:783 +#: src/diffuse/main.py:791 msgid "_Save File" msgstr "保存(_S)" -#: src/diffuse/main.py:784 +#: src/diffuse/main.py:792 msgid "Save File _As..." msgstr "另存为(_A)" -#: src/diffuse/main.py:785 +#: src/diffuse/main.py:793 msgid "Save A_ll" msgstr "保存所有(_L)" -#: src/diffuse/main.py:787 +#: src/diffuse/main.py:795 msgid "New _2-Way File Merge" msgstr "新建2方文件合并(_2)" -#: src/diffuse/main.py:788 +#: src/diffuse/main.py:796 msgid "New _3-Way File Merge" msgstr "新建3方文件合并(_3)" -#: src/diffuse/main.py:789 +#: src/diffuse/main.py:797 msgid "New _N-Way File Merge..." msgstr "新建多方文件合并(_N)" -#: src/diffuse/main.py:791 +#: src/diffuse/main.py:799 msgid "_Close Tab" msgstr "关闭标签(_C)" -#: src/diffuse/main.py:792 +#: src/diffuse/main.py:800 msgid "_Undo Close Tab" msgstr "恢复关闭的标签" -#: src/diffuse/main.py:793 +#: src/diffuse/main.py:801 msgid "_Quit" msgstr "退出(_Q)" -#: src/diffuse/main.py:796 +#: src/diffuse/main.py:804 msgid "_Edit" msgstr "编辑(_E)" -#: src/diffuse/main.py:797 +#: src/diffuse/main.py:805 msgid "_Undo" msgstr "恢复(_U)" -#: src/diffuse/main.py:798 +#: src/diffuse/main.py:806 msgid "_Redo" msgstr "重做(_R)" -#: src/diffuse/main.py:800 +#: src/diffuse/main.py:808 msgid "Cu_t" msgstr "剪切(_T)" -#: src/diffuse/main.py:801 +#: src/diffuse/main.py:809 msgid "_Copy" msgstr "复制(_C)" -#: src/diffuse/main.py:802 +#: src/diffuse/main.py:810 msgid "_Paste" msgstr "粘贴(_P)" -#: src/diffuse/main.py:804 +#: src/diffuse/main.py:812 msgid "Select _All" msgstr "选择所有(_A)" -#: src/diffuse/main.py:805 +#: src/diffuse/main.py:813 msgid "C_lear Edits" msgstr "取消编辑(L)" -#: src/diffuse/main.py:806 +#: src/diffuse/main.py:814 msgid "_Dismiss All Edits" msgstr "撤销所有更改(_D)" -#: src/diffuse/main.py:808 +#: src/diffuse/main.py:816 msgid "_Find..." msgstr "查找(_F)" -#: src/diffuse/main.py:809 +#: src/diffuse/main.py:817 msgid "Find _Next" msgstr "找下一个(_N)" -#: src/diffuse/main.py:810 +#: src/diffuse/main.py:818 msgid "Find Pre_vious" msgstr "找上一个(_V)" -#: src/diffuse/main.py:811 +#: src/diffuse/main.py:819 msgid "_Go To Line..." msgstr "跳到行(_G)" -#: src/diffuse/main.py:813 +#: src/diffuse/main.py:821 msgid "Pr_eferences..." msgstr "首选项(_E)" -#: src/diffuse/main.py:817 +#: src/diffuse/main.py:825 msgid "None" msgstr "无" -#: src/diffuse/main.py:835 +#: src/diffuse/main.py:843 msgid "_View" msgstr "视图(_V)" -#: src/diffuse/main.py:836 +#: src/diffuse/main.py:844 msgid "_Syntax Highlighting" msgstr "_Syntax高亮" -#: src/diffuse/main.py:838 +#: src/diffuse/main.py:846 msgid "Re_align All" msgstr "重新对齐所有(_A)" -#: src/diffuse/main.py:839 +#: src/diffuse/main.py:847 msgid "_Isolate" msgstr "分离(_I)" -#: src/diffuse/main.py:841 +#: src/diffuse/main.py:849 msgid "_First Difference" msgstr "第一个不同之处(_F)" -#: src/diffuse/main.py:842 +#: src/diffuse/main.py:850 msgid "_Previous Difference" msgstr "前一个不同之处(_P)" -#: src/diffuse/main.py:843 +#: src/diffuse/main.py:851 msgid "_Next Difference" msgstr "下一个不同之处(_N)" -#: src/diffuse/main.py:844 +#: src/diffuse/main.py:852 msgid "_Last Difference" msgstr "最后一个不同之处(_L)" -#: src/diffuse/main.py:846 +#: src/diffuse/main.py:854 msgid "Fir_st Tab" msgstr "第一个标签(_S)" -#: src/diffuse/main.py:847 +#: src/diffuse/main.py:855 msgid "Pre_vious Tab" msgstr "前一个标签(_V)" -#: src/diffuse/main.py:848 +#: src/diffuse/main.py:856 msgid "Next _Tab" msgstr "下一个标签(_T)" -#: src/diffuse/main.py:849 +#: src/diffuse/main.py:857 msgid "Las_t Tab" msgstr "最后一个标签(_T)" -#: src/diffuse/main.py:851 +#: src/diffuse/main.py:859 msgid "Shift Pane _Right" msgstr "右移窗格(_R)" -#: src/diffuse/main.py:852 +#: src/diffuse/main.py:860 msgid "Shift Pane _Left" msgstr "左移窗格(_L)" -#: src/diffuse/main.py:855 +#: src/diffuse/main.py:863 msgid "F_ormat" msgstr "格式(_O)" -#: src/diffuse/main.py:856 +#: src/diffuse/main.py:864 msgid "Convert To _Upper Case" msgstr "转换成大写" -#: src/diffuse/main.py:857 +#: src/diffuse/main.py:865 msgid "Convert To _Lower Case" msgstr "转换成小写" -#: src/diffuse/main.py:859 +#: src/diffuse/main.py:867 msgid "Sort Lines In _Ascending Order" msgstr "以递增的顺序排列行" -#: src/diffuse/main.py:860 +#: src/diffuse/main.py:868 msgid "Sort Lines In D_escending Order" msgstr "以递减的顺序排列行" -#: src/diffuse/main.py:862 +#: src/diffuse/main.py:870 msgid "Remove Trailing _White Space" msgstr "删除多余的空格(_W)" -#: src/diffuse/main.py:863 +#: src/diffuse/main.py:871 msgid "Convert Tabs To _Spaces" msgstr "转换制表符为空格(_S)" -#: src/diffuse/main.py:864 +#: src/diffuse/main.py:872 msgid "Convert Leading Spaces To _Tabs" msgstr "转换开头的空格为制表符(_T)" -#: src/diffuse/main.py:866 +#: src/diffuse/main.py:874 msgid "_Increase Indenting" msgstr "减少缩进(_I)" -#: src/diffuse/main.py:867 +#: src/diffuse/main.py:875 msgid "De_crease Indenting" msgstr "减少缩进" -#: src/diffuse/main.py:869 +#: src/diffuse/main.py:877 msgid "Convert To _DOS Format" msgstr "转换为DOS格式(_D)" -#: src/diffuse/main.py:870 +#: src/diffuse/main.py:878 msgid "Convert To _Mac Format" msgstr "转换为Mac格式(_M)" -#: src/diffuse/main.py:871 +#: src/diffuse/main.py:879 msgid "Convert To Uni_x Format" msgstr "转换为Unix格式(_X)" -#: src/diffuse/main.py:874 +#: src/diffuse/main.py:882 msgid "_Merge" msgstr "合并(_M)" -#: src/diffuse/main.py:875 +#: src/diffuse/main.py:883 msgid "Copy Selection _Right" msgstr "复制选择之处到右边(_R)" -#: src/diffuse/main.py:876 +#: src/diffuse/main.py:884 msgid "Copy Selection _Left" msgstr "复制选择之处到左边(_L)" -#: src/diffuse/main.py:878 +#: src/diffuse/main.py:886 msgid "Copy Left _Into Selection" msgstr "复制左边内容到选择之处(_L)" -#: src/diffuse/main.py:879 +#: src/diffuse/main.py:887 msgid "Copy Right I_nto Selection" msgstr "复制右边内容到选择之处(_L)" -#: src/diffuse/main.py:880 +#: src/diffuse/main.py:888 msgid "_Merge From Left Then Right" msgstr "先左再右合并(_M)" -#: src/diffuse/main.py:881 +#: src/diffuse/main.py:889 msgid "M_erge From Right Then Left" msgstr "先右后左合并(_E)" -#: src/diffuse/main.py:884 +#: src/diffuse/main.py:892 msgid "_Help" msgstr "帮助(_H)" -#: src/diffuse/main.py:885 +#: src/diffuse/main.py:893 msgid "_Help Contents..." msgstr "帮助内容(_H)" -#: src/diffuse/main.py:887 +#: src/diffuse/main.py:895 #, python-format msgid "_About %s..." msgstr "关于%s(_A)" -#: src/diffuse/main.py:902 +#: src/diffuse/main.py:910 msgid "New 2-Way File Merge" msgstr "新建2方文件合并" -#: src/diffuse/main.py:903 +#: src/diffuse/main.py:911 msgid "New 3-Way File Merge" msgstr "新建3方文件合并" -#: src/diffuse/main.py:905 +#: src/diffuse/main.py:913 msgid "Realign All" msgstr "重新对齐所有" -#: src/diffuse/main.py:906 +#: src/diffuse/main.py:914 msgid "First Difference" msgstr "第一个不同之处" -#: src/diffuse/main.py:907 +#: src/diffuse/main.py:915 msgid "Previous Difference" msgstr "前一个不同之处" -#: src/diffuse/main.py:908 +#: src/diffuse/main.py:916 msgid "Next Difference" msgstr "下一个不同之处" -#: src/diffuse/main.py:909 +#: src/diffuse/main.py:917 msgid "Last Difference" msgstr "最后一个不同之处" -#: src/diffuse/main.py:911 +#: src/diffuse/main.py:919 msgid "Copy Selection Right" msgstr "复制选择之处到右边" -#: src/diffuse/main.py:912 +#: src/diffuse/main.py:920 msgid "Copy Selection Left" msgstr "复制选择之处到左边" -#: src/diffuse/main.py:913 +#: src/diffuse/main.py:921 msgid "Copy Left Into Selection" msgstr "复制左边内容到选择之处" -#: src/diffuse/main.py:914 +#: src/diffuse/main.py:922 msgid "Copy Right Into Selection" msgstr "复制右边内容到选择之处" -#: src/diffuse/main.py:915 +#: src/diffuse/main.py:923 msgid "Merge From Left Then Right" msgstr "先左后右合并" -#: src/diffuse/main.py:916 +#: src/diffuse/main.py:924 msgid "Merge From Right Then Left" msgstr "先右后左合并(_T)" -#: src/diffuse/main.py:918 +#: src/diffuse/main.py:926 msgid "Undo" msgstr "恢复" -#: src/diffuse/main.py:919 +#: src/diffuse/main.py:927 msgid "Redo" msgstr "重做" -#: src/diffuse/main.py:920 src/diffuse/widgets.py:1847 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 msgid "Cut" msgstr "剪切" -#: src/diffuse/main.py:921 src/diffuse/widgets.py:1848 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 msgid "Copy" msgstr "复制" -#: src/diffuse/main.py:922 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 msgid "Paste" msgstr "粘贴" -#: src/diffuse/main.py:923 src/diffuse/widgets.py:1852 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 msgid "Clear Edits" msgstr "取消编辑" -#: src/diffuse/main.py:1046 +#: src/diffuse/main.py:1054 msgid "Some files have unsaved changes. Select the files to save before closing." msgstr "一些文件包含未保存的更改。请在关闭前保存这些文件。" -#: src/diffuse/main.py:1060 +#: src/diffuse/main.py:1068 msgid "Tab" msgstr "标签" -#: src/diffuse/main.py:1065 +#: src/diffuse/main.py:1073 msgid "Pane" msgstr "窗格" -#: src/diffuse/main.py:1076 +#: src/diffuse/main.py:1084 msgid "Close _Without Saving" msgstr "不保存而关闭" -#: src/diffuse/main.py:1115 +#: src/diffuse/main.py:1123 #, python-format msgid "Closing this tab will quit %s." msgstr "关闭此标签将会退出%s" -#: src/diffuse/main.py:1198 +#: src/diffuse/main.py:1206 #, python-format msgid "File Merge %d" msgstr "文件合并%d" -#: src/diffuse/main.py:1304 +#: src/diffuse/main.py:1312 #, python-format msgid "Error retrieving commits for %s." msgstr "錯誤修改提交%s。" -#: src/diffuse/main.py:1336 +#: src/diffuse/main.py:1344 #, python-format msgid "Error retrieving modifications for %s." msgstr "无法恢复对%s的修改。" -#: src/diffuse/main.py:1369 +#: src/diffuse/main.py:1377 msgid "Open File In New Tab" msgstr "在新标签里打开文件" -#: src/diffuse/main.py:1392 +#: src/diffuse/main.py:1400 msgid "Choose Folder With Modified Files" msgstr "选择更改过的文件夹" -#: src/diffuse/main.py:1410 +#: src/diffuse/main.py:1418 msgid "No modified files found." msgstr "没有找到修改过的文件。" -#: src/diffuse/main.py:1416 +#: src/diffuse/main.py:1424 msgid "Choose Folder With Commit" msgstr "选择提交的文件夹" -#: src/diffuse/main.py:1436 +#: src/diffuse/main.py:1444 msgid "No committed files found." msgstr "没有找到提交的文件。" -#: src/diffuse/main.py:1472 +#: src/diffuse/main.py:1480 msgid "New N-Way File Merge..." msgstr "新建多方文件合并" -#: src/diffuse/main.py:1473 +#: src/diffuse/main.py:1481 msgid "Number of panes: " msgstr "窗格数: " -#: src/diffuse/main.py:1547 +#: src/diffuse/main.py:1555 msgid "Phrase not found. Continue from the end of the file?" msgstr "短语未找到，从文件结尾继续吗？" -#: src/diffuse/main.py:1549 +#: src/diffuse/main.py:1557 msgid "Phrase not found. Continue from the start of the file?" msgstr "短语未找到，从文件开头继续吗？" -#: src/diffuse/main.py:1770 +#: src/diffuse/main.py:1778 #, fuzzy msgid "" "Usage:\n" @@ -680,174 +663,174 @@ msgstr "" " ( -i | --ignore-case ) 忽略小结的不同\n" " ( -w | --ignore-all-space ) 忽略所有空白的不同" -#: src/diffuse/main.py:1937 +#: src/diffuse/main.py:1945 msgid "Error parsing line number." msgstr "解析行数时错误。" -#: src/diffuse/main.py:1947 +#: src/diffuse/main.py:1955 #, python-format msgid "Skipping unknown argument \"%s\"." msgstr "跳过未知参数\"%s\"。" -#: src/diffuse/main.py:1955 +#: src/diffuse/main.py:1963 #, python-format msgid "Error processing argument \"%s\". Directory not expected." msgstr "无法处理\"%s\"。目录不存在。" -#: src/diffuse/preferences.py:79 +#: src/diffuse/preferences.py:80 msgid "Display" msgstr "显示" -#: src/diffuse/preferences.py:82 +#: src/diffuse/preferences.py:83 msgid "Font" msgstr "字体" -#: src/diffuse/preferences.py:83 +#: src/diffuse/preferences.py:84 msgid "Tab width" msgstr "制表符宽度" -#: src/diffuse/preferences.py:84 +#: src/diffuse/preferences.py:85 msgid "Show right margin" msgstr "显示右边距" -#: src/diffuse/preferences.py:85 +#: src/diffuse/preferences.py:86 msgid "Right margin" msgstr "右边距" -#: src/diffuse/preferences.py:86 +#: src/diffuse/preferences.py:87 msgid "Show line numbers" msgstr "显示行号" -#: src/diffuse/preferences.py:87 +#: src/diffuse/preferences.py:88 msgid "Show white space characters" msgstr "显示空格字符" -#: src/diffuse/preferences.py:88 +#: src/diffuse/preferences.py:89 msgid "Ignore case differences" msgstr "忽略大小写的不同" -#: src/diffuse/preferences.py:89 +#: src/diffuse/preferences.py:90 msgid "Ignore white space differences" msgstr "忽略空格的不同" -#: src/diffuse/preferences.py:90 src/diffuse/preferences.py:99 +#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100 msgid "Ignore changes to white space" msgstr "忽略对空格的改变" -#: src/diffuse/preferences.py:91 +#: src/diffuse/preferences.py:92 msgid "Ignore blank line differences" msgstr "忽略空行的不同" -#: src/diffuse/preferences.py:92 +#: src/diffuse/preferences.py:93 msgid "Ignore end of line differences" msgstr "忽略行尾的不同" -#: src/diffuse/preferences.py:94 +#: src/diffuse/preferences.py:95 msgid "Alignment" msgstr "对齐" -#: src/diffuse/preferences.py:97 +#: src/diffuse/preferences.py:98 msgid "Ignore case" msgstr "忽略大小写" -#: src/diffuse/preferences.py:98 +#: src/diffuse/preferences.py:99 msgid "Ignore white space" msgstr "忽略空格" -#: src/diffuse/preferences.py:100 +#: src/diffuse/preferences.py:101 msgid "Ignore blank lines" msgstr "忽略空行" -#: src/diffuse/preferences.py:101 +#: src/diffuse/preferences.py:102 msgid "Ignore end of line characters" msgstr "忽略行尾结束符" -#: src/diffuse/preferences.py:103 +#: src/diffuse/preferences.py:104 msgid "Editor" msgstr "编辑器" -#: src/diffuse/preferences.py:106 +#: src/diffuse/preferences.py:107 msgid "Auto indent" msgstr "自动缩进" -#: src/diffuse/preferences.py:107 +#: src/diffuse/preferences.py:108 msgid "Expand tabs to spaces" msgstr "展开制表符为空格" -#: src/diffuse/preferences.py:108 +#: src/diffuse/preferences.py:109 msgid "Soft tab width" msgstr "软制表符宽度" -#: src/diffuse/preferences.py:110 +#: src/diffuse/preferences.py:111 msgid "Tabs" msgstr "标签" -#: src/diffuse/preferences.py:113 +#: src/diffuse/preferences.py:114 msgid "Default panes" msgstr "默认窗格" -#: src/diffuse/preferences.py:114 +#: src/diffuse/preferences.py:115 msgid "Always show the tab bar" msgstr "总是显示标签栏" -#: src/diffuse/preferences.py:115 +#: src/diffuse/preferences.py:116 #, python-format msgid "Warn me when closing a tab will quit %s" msgstr "当关闭标签会退出%s的时候提醒我" -#: src/diffuse/preferences.py:117 +#: src/diffuse/preferences.py:118 msgid "Regional Settings" msgstr "区域性设置" -#: src/diffuse/preferences.py:120 +#: src/diffuse/preferences.py:121 msgid "Default codec" msgstr "默认编码" -#: src/diffuse/preferences.py:121 +#: src/diffuse/preferences.py:122 msgid "Order of codecs used to identify encoding" msgstr "用来识别编码的编码顺序" -#: src/diffuse/preferences.py:142 +#: src/diffuse/preferences.py:143 msgid "Cygwin" msgstr "" -#: src/diffuse/preferences.py:144 +#: src/diffuse/preferences.py:145 msgid "Root directory" msgstr "根目录" -#: src/diffuse/preferences.py:145 +#: src/diffuse/preferences.py:146 msgid "Cygdrive prefix" msgstr "" -#: src/diffuse/preferences.py:164 +#: src/diffuse/preferences.py:165 msgid "Version control system search order" msgstr "" -#: src/diffuse/preferences.py:172 +#: src/diffuse/preferences.py:173 msgid "\"co\" command" msgstr "\"co\"命令" -#: src/diffuse/preferences.py:173 +#: src/diffuse/preferences.py:174 msgid "\"rlog\" command" msgstr "\"rlog\"命令" -#: src/diffuse/preferences.py:175 +#: src/diffuse/preferences.py:176 msgid "Command" msgstr "命令" -#: src/diffuse/preferences.py:181 +#: src/diffuse/preferences.py:182 msgid "Launch from a Bash login shell" msgstr "从命令行登录界面加载" -#: src/diffuse/preferences.py:188 +#: src/diffuse/preferences.py:189 msgid "Update paths for Cygwin" msgstr "为Cygwin更新路径" -#: src/diffuse/preferences.py:193 +#: src/diffuse/preferences.py:194 msgid "Version Control" msgstr "版本控制" -#: src/diffuse/preferences.py:258 +#: src/diffuse/preferences.py:259 msgid "Preferences" msgstr "首选项" @@ -879,7 +862,7 @@ msgstr "" #: src/diffuse/resources.py:409 #, python-brace-format -msgid "Options \"{option}\" is unknown" +msgid "Option \"{option}\" is unknown" msgstr "" #: src/diffuse/resources.py:416 @@ -932,37 +915,37 @@ msgstr "处理到文件{file}的{line}行时出错。" msgid "Unhandled error at line {line} of {file}." msgstr "处理到文件{file}的{line}行时出错。" -#: src/diffuse/utils.py:63 +#: src/diffuse/utils.py:66 msgid "Auto Detect" msgstr "自动探测" -#: src/diffuse/vcs/cvs.py:53 src/diffuse/vcs/rcs.py:62 src/diffuse/vcs/svn.py:95 +#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97 #, python-format msgid "Error parsing revision %s." msgstr "无法解析修订版本%s。" -#: src/diffuse/vcs/vcs_registry.py:233 +#: src/diffuse/vcs/vcs_registry.py:238 #, python-format msgid "Error parsing %s." msgstr "无法解析%s。" -#: src/diffuse/widgets.py:1843 +#: src/diffuse/widgets.py:1845 msgid "Align with Selection" msgstr "向选中的对齐" -#: src/diffuse/widgets.py:1844 +#: src/diffuse/widgets.py:1846 msgid "Isolate" msgstr "分离" -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1847 msgid "Merge Selection" msgstr "合并选择之处" -#: src/diffuse/widgets.py:1851 +#: src/diffuse/widgets.py:1853 msgid "Select All" msgstr "选择所有" -#: src/diffuse/widgets.py:1854 +#: src/diffuse/widgets.py:1856 msgid "Swap with Selected Pane" msgstr "交换选中的窗格" diff --git a/po/zh_TW.po b/po/zh_TW.po index f890268..20b7ac8 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: diffuse 0.4.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-27 21:56-0500\n" +"POT-Creation-Date: 2022-04-04 12:14-0400\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: Wei-Lun Chao \n" "Language-Team: Chinese (traditional) \n" @@ -40,7 +40,7 @@ msgstr "" msgid "Main window: diff between two files" msgstr "" -#: src/diffuse/constants.py:24 +#: src/diffuse/constants.py:25 msgid "Copyright" msgstr "著作權" @@ -54,35 +54,6 @@ msgstr "" "紀明村 \n" "趙惟倫 " -#: src/diffuse/dialogs.py:49 -#, fuzzy -msgid "" -"This program is free software; you can redistribute it and/or modify\n" -"it under the terms of the GNU General Public License as published by\n" -"the Free Software Foundation; either version 2 of the License, or\n" -"(at your option) any later version.\n" -"\n" -"This program is distributed in the hope that it will be useful,\n" -"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -"GNU General Public License for more details.\n" -"\n" -"You should have received a copy of the GNU General Public License along\n" -"with this program; if not, write to the Free Software Foundation, Inc.,\n" -"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." -msgstr "" -"這個程式是自由軟體；您可以遵循由自由軟體基金會所發布的 GNU 通用公共授權條款來再次" -"散布它與/或修改它；無論您依據的是本授權的第二版、或 (您自行選擇的) 任何後續版" -"本。\n" -"\n" -"發行本程式是希望它能夠有用，但是沒有任何擔保；亦無對於某一特定目的之適售性與適用性" -"的暗示性擔保。 請參看 GNU 通用公共授權以獲得更多細節。\n" -"\n" -"您應該已經收到隨附於這個程式的 GNU 通用公共授權複本。 您也可以藉由造訪它們的網站 " -"(http://www.fsf.org/)，從自由軟體基金會得到 GNU 通用公共授權的複本，或是寫信給 " -"Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA " -"02110-1301 USA\n" - #: src/diffuse/dialogs.py:83 msgid "Encoding: " msgstr "編碼：" @@ -107,60 +78,60 @@ msgstr "符合大小寫" msgid "Search Backwards" msgstr "反向搜尋" -#: src/diffuse/main.py:79 +#: src/diffuse/main.py:85 msgid "Close Tab" msgstr "關閉分頁" -#: src/diffuse/main.py:124 +#: src/diffuse/main.py:132 msgid "Open File..." msgstr "開啟檔案…" -#: src/diffuse/main.py:125 +#: src/diffuse/main.py:133 msgid "Reload File" msgstr "重新載入" -#: src/diffuse/main.py:126 +#: src/diffuse/main.py:134 msgid "Save File" msgstr "儲存檔案" -#: src/diffuse/main.py:127 +#: src/diffuse/main.py:135 msgid "Save File As..." msgstr "另存為…" -#: src/diffuse/main.py:280 +#: src/diffuse/main.py:288 msgid "Save changes before loading the new file?" msgstr "載入新檔前儲存更改嗎？" -#: src/diffuse/main.py:391 +#: src/diffuse/main.py:399 #, python-format msgid "Error reading revision %(rev)s of %(file)s." msgstr "無法讀取檔案 %(file)s 中的修訂版本 %(rev)s。" -#: src/diffuse/main.py:394 src/diffuse/main.py:1849 +#: src/diffuse/main.py:402 src/diffuse/main.py:1857 #, python-format msgid "Error reading %s." msgstr "無法讀取 %s。" -#: src/diffuse/main.py:416 +#: src/diffuse/main.py:424 msgid "Open File" msgstr "開啟檔案" -#: src/diffuse/main.py:473 +#: src/diffuse/main.py:481 #, python-format msgid "The file %s changed on disk. Do you want to reload the file?" msgstr "檔案 %s 已被更改，是否重新載入？" -#: src/diffuse/main.py:499 +#: src/diffuse/main.py:507 #, python-format msgid "Save %(title)s Pane %(pane)d" msgstr "儲存 %(title)s 窗格 %(pane)d" -#: src/diffuse/main.py:531 +#: src/diffuse/main.py:539 #, python-format msgid "A file named %s already exists. Do you want to overwrite it?" msgstr "%s 的檔案已存在，您希望覆蓋它嗎？" -#: src/diffuse/main.py:538 +#: src/diffuse/main.py:546 #, python-format msgid "" "The file %s has been modified by another process since reading it. If you save, " @@ -168,458 +139,458 @@ msgid "" msgstr "" "檔案 %s 打開後被其他程式變更過了，如果儲存，其他程式的變更修改將會不見，儲存嗎？" -#: src/diffuse/main.py:580 +#: src/diffuse/main.py:588 #, python-format msgid "Error encoding to %s." msgstr "無法編碼為 %s。" -#: src/diffuse/main.py:584 src/diffuse/preferences.py:298 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 #, python-format msgid "Error writing %s." msgstr "無法寫入 %s" -#: src/diffuse/main.py:614 +#: src/diffuse/main.py:622 msgid "Go To Line..." msgstr "跳到列號…" -#: src/diffuse/main.py:615 +#: src/diffuse/main.py:623 msgid "Line Number: " msgstr "列數：" -#: src/diffuse/main.py:646 +#: src/diffuse/main.py:654 msgid "" "Press the enter key or double click to edit. Press the space bar or use the RMB " "menu to manually align." msgstr "按確定鍵或雙擊滑鼠進行編輯。空格鍵或者右鍵選單手動對齊。" -#: src/diffuse/main.py:650 +#: src/diffuse/main.py:658 msgid "Press the escape key to finish editing." msgstr "按 ESC 鍵結束編輯" -#: src/diffuse/main.py:653 +#: src/diffuse/main.py:661 msgid "" "Select target line and press the space bar to align. Press the escape key to " "cancel." msgstr "選擇目標列然後按空格鍵進行對齊，按 ESC 取消。" -#: src/diffuse/main.py:776 +#: src/diffuse/main.py:784 msgid "_File" msgstr "檔案(_F)" -#: src/diffuse/main.py:777 +#: src/diffuse/main.py:785 msgid "_Open File..." msgstr "開啟檔案(_O)…" -#: src/diffuse/main.py:778 +#: src/diffuse/main.py:786 msgid "Open File In New _Tab..." msgstr "在新分頁裡開啟檔案(_T)…" -#: src/diffuse/main.py:779 +#: src/diffuse/main.py:787 msgid "Open _Modified Files..." msgstr "開啟修改過的檔案(_M)…" -#: src/diffuse/main.py:780 +#: src/diffuse/main.py:788 msgid "Open Commi_t..." msgstr "開啟認可(_T)…" -#: src/diffuse/main.py:781 +#: src/diffuse/main.py:789 msgid "_Reload File" msgstr "重新載入(_R)" -#: src/diffuse/main.py:783 +#: src/diffuse/main.py:791 msgid "_Save File" msgstr "儲存(_S)" -#: src/diffuse/main.py:784 +#: src/diffuse/main.py:792 msgid "Save File _As..." msgstr "另存為(_A)…" -#: src/diffuse/main.py:785 +#: src/diffuse/main.py:793 msgid "Save A_ll" msgstr "儲存所有(_L)" -#: src/diffuse/main.py:787 +#: src/diffuse/main.py:795 msgid "New _2-Way File Merge" msgstr "新的二重檔案合併(_2)" -#: src/diffuse/main.py:788 +#: src/diffuse/main.py:796 msgid "New _3-Way File Merge" msgstr "新的三重檔案合併(_3)" -#: src/diffuse/main.py:789 +#: src/diffuse/main.py:797 msgid "New _N-Way File Merge..." msgstr "新的多重檔案合併(_N)…" -#: src/diffuse/main.py:791 +#: src/diffuse/main.py:799 msgid "_Close Tab" msgstr "關閉分頁(_C)" -#: src/diffuse/main.py:792 +#: src/diffuse/main.py:800 msgid "_Undo Close Tab" msgstr "復原關閉的分頁" -#: src/diffuse/main.py:793 +#: src/diffuse/main.py:801 msgid "_Quit" msgstr "退出(_Q)" -#: src/diffuse/main.py:796 +#: src/diffuse/main.py:804 msgid "_Edit" msgstr "編輯(_E)" -#: src/diffuse/main.py:797 +#: src/diffuse/main.py:805 msgid "_Undo" msgstr "復原(_U)" -#: src/diffuse/main.py:798 +#: src/diffuse/main.py:806 msgid "_Redo" msgstr "重做(_R)" -#: src/diffuse/main.py:800 +#: src/diffuse/main.py:808 msgid "Cu_t" msgstr "剪下(_T)" -#: src/diffuse/main.py:801 +#: src/diffuse/main.py:809 msgid "_Copy" msgstr "複製(_C)" -#: src/diffuse/main.py:802 +#: src/diffuse/main.py:810 msgid "_Paste" msgstr "貼上(_P)" -#: src/diffuse/main.py:804 +#: src/diffuse/main.py:812 msgid "Select _All" msgstr "全選(_A)" -#: src/diffuse/main.py:805 +#: src/diffuse/main.py:813 msgid "C_lear Edits" msgstr "取消編輯(L)" -#: src/diffuse/main.py:806 +#: src/diffuse/main.py:814 msgid "_Dismiss All Edits" msgstr "放棄所有的變更(_D)" -#: src/diffuse/main.py:808 +#: src/diffuse/main.py:816 msgid "_Find..." msgstr "搜尋(_F)…" -#: src/diffuse/main.py:809 +#: src/diffuse/main.py:817 msgid "Find _Next" msgstr "找下一個(_N)" -#: src/diffuse/main.py:810 +#: src/diffuse/main.py:818 msgid "Find Pre_vious" msgstr "找上一個(_V)" -#: src/diffuse/main.py:811 +#: src/diffuse/main.py:819 msgid "_Go To Line..." msgstr "跳到列號(_G)…" -#: src/diffuse/main.py:813 +#: src/diffuse/main.py:821 msgid "Pr_eferences..." msgstr "選項(_E)…" -#: src/diffuse/main.py:817 +#: src/diffuse/main.py:825 msgid "None" msgstr "無" -#: src/diffuse/main.py:835 +#: src/diffuse/main.py:843 msgid "_View" msgstr "檢視(_V)" -#: src/diffuse/main.py:836 +#: src/diffuse/main.py:844 msgid "_Syntax Highlighting" msgstr "高亮度語法(_S)" -#: src/diffuse/main.py:838 +#: src/diffuse/main.py:846 msgid "Re_align All" msgstr "全部重新對齊(_A)" -#: src/diffuse/main.py:839 +#: src/diffuse/main.py:847 msgid "_Isolate" msgstr "分離(_I)" -#: src/diffuse/main.py:841 +#: src/diffuse/main.py:849 msgid "_First Difference" msgstr "第一個差異(_F)" -#: src/diffuse/main.py:842 +#: src/diffuse/main.py:850 msgid "_Previous Difference" msgstr "上一個差異(_P)" -#: src/diffuse/main.py:843 +#: src/diffuse/main.py:851 msgid "_Next Difference" msgstr "下一個差異(_N)" -#: src/diffuse/main.py:844 +#: src/diffuse/main.py:852 msgid "_Last Difference" msgstr "最後一個差異(_L)" -#: src/diffuse/main.py:846 +#: src/diffuse/main.py:854 msgid "Fir_st Tab" msgstr "第一個分頁(_S)" -#: src/diffuse/main.py:847 +#: src/diffuse/main.py:855 msgid "Pre_vious Tab" msgstr "上一個分頁(_V)" -#: src/diffuse/main.py:848 +#: src/diffuse/main.py:856 msgid "Next _Tab" msgstr "下一個分頁(_T)" -#: src/diffuse/main.py:849 +#: src/diffuse/main.py:857 msgid "Las_t Tab" msgstr "最後一個分頁(_T)" -#: src/diffuse/main.py:851 +#: src/diffuse/main.py:859 msgid "Shift Pane _Right" msgstr "右移窗格(_R)" -#: src/diffuse/main.py:852 +#: src/diffuse/main.py:860 msgid "Shift Pane _Left" msgstr "左移窗格(_L)" -#: src/diffuse/main.py:855 +#: src/diffuse/main.py:863 msgid "F_ormat" msgstr "格式(_O)" -#: src/diffuse/main.py:856 +#: src/diffuse/main.py:864 msgid "Convert To _Upper Case" msgstr "轉換成大寫" -#: src/diffuse/main.py:857 +#: src/diffuse/main.py:865 msgid "Convert To _Lower Case" msgstr "轉換成小寫" -#: src/diffuse/main.py:859 +#: src/diffuse/main.py:867 msgid "Sort Lines In _Ascending Order" msgstr "以遞增的順序排列" -#: src/diffuse/main.py:860 +#: src/diffuse/main.py:868 msgid "Sort Lines In D_escending Order" msgstr "以遞減的順序排列" -#: src/diffuse/main.py:862 +#: src/diffuse/main.py:870 msgid "Remove Trailing _White Space" msgstr "刪除多餘的空格(_W)" -#: src/diffuse/main.py:863 +#: src/diffuse/main.py:871 msgid "Convert Tabs To _Spaces" msgstr "轉換跳格字元為空格(_S)" -#: src/diffuse/main.py:864 +#: src/diffuse/main.py:872 msgid "Convert Leading Spaces To _Tabs" msgstr "轉換開頭的空格為跳格字元(_T)" -#: src/diffuse/main.py:866 +#: src/diffuse/main.py:874 msgid "_Increase Indenting" msgstr "減少縮排(_I)" -#: src/diffuse/main.py:867 +#: src/diffuse/main.py:875 msgid "De_crease Indenting" msgstr "減少縮排" -#: src/diffuse/main.py:869 +#: src/diffuse/main.py:877 msgid "Convert To _DOS Format" msgstr "轉換為 DOS 格式(_D)" -#: src/diffuse/main.py:870 +#: src/diffuse/main.py:878 msgid "Convert To _Mac Format" msgstr "轉換為 Mac 格式(_M)" -#: src/diffuse/main.py:871 +#: src/diffuse/main.py:879 msgid "Convert To Uni_x Format" msgstr "轉換為 Unix 格式(_X)" -#: src/diffuse/main.py:874 +#: src/diffuse/main.py:882 msgid "_Merge" msgstr "合併(_M)" -#: src/diffuse/main.py:875 +#: src/diffuse/main.py:883 msgid "Copy Selection _Right" msgstr "複製選擇區域到右邊(_R)" -#: src/diffuse/main.py:876 +#: src/diffuse/main.py:884 msgid "Copy Selection _Left" msgstr "複製選擇區域到左邊(_L)" -#: src/diffuse/main.py:878 +#: src/diffuse/main.py:886 msgid "Copy Left _Into Selection" msgstr "複製左邊內容到選擇區域(_L)" -#: src/diffuse/main.py:879 +#: src/diffuse/main.py:887 msgid "Copy Right I_nto Selection" msgstr "複製右邊內容到選擇區域(_L)" -#: src/diffuse/main.py:880 +#: src/diffuse/main.py:888 msgid "_Merge From Left Then Right" msgstr "先左再右合併(_M)" -#: src/diffuse/main.py:881 +#: src/diffuse/main.py:889 msgid "M_erge From Right Then Left" msgstr "從右向左合併(_E)" -#: src/diffuse/main.py:884 +#: src/diffuse/main.py:892 msgid "_Help" msgstr "求助(_H)" -#: src/diffuse/main.py:885 +#: src/diffuse/main.py:893 msgid "_Help Contents..." msgstr "說明內容(_H)…" -#: src/diffuse/main.py:887 +#: src/diffuse/main.py:895 #, python-format msgid "_About %s..." msgstr "關於 %s(_A)…" -#: src/diffuse/main.py:902 +#: src/diffuse/main.py:910 msgid "New 2-Way File Merge" msgstr "新的二重檔案合併" -#: src/diffuse/main.py:903 +#: src/diffuse/main.py:911 msgid "New 3-Way File Merge" msgstr "新的三重檔案合併" -#: src/diffuse/main.py:905 +#: src/diffuse/main.py:913 msgid "Realign All" msgstr "全部重新對齊" -#: src/diffuse/main.py:906 +#: src/diffuse/main.py:914 msgid "First Difference" msgstr "第一個差異" -#: src/diffuse/main.py:907 +#: src/diffuse/main.py:915 msgid "Previous Difference" msgstr "上一個差異" -#: src/diffuse/main.py:908 +#: src/diffuse/main.py:916 msgid "Next Difference" msgstr "下一個差異" -#: src/diffuse/main.py:909 +#: src/diffuse/main.py:917 msgid "Last Difference" msgstr "最後一個差異" -#: src/diffuse/main.py:911 +#: src/diffuse/main.py:919 msgid "Copy Selection Right" msgstr "複製選擇區域到右邊" -#: src/diffuse/main.py:912 +#: src/diffuse/main.py:920 msgid "Copy Selection Left" msgstr "複製選擇區域到左邊" -#: src/diffuse/main.py:913 +#: src/diffuse/main.py:921 msgid "Copy Left Into Selection" msgstr "複製左邊內容到選擇區域" -#: src/diffuse/main.py:914 +#: src/diffuse/main.py:922 msgid "Copy Right Into Selection" msgstr "複製右邊內容到選擇區域" -#: src/diffuse/main.py:915 +#: src/diffuse/main.py:923 msgid "Merge From Left Then Right" msgstr "先左後右合併" -#: src/diffuse/main.py:916 +#: src/diffuse/main.py:924 msgid "Merge From Right Then Left" msgstr "先右後左合併(_T)" -#: src/diffuse/main.py:918 +#: src/diffuse/main.py:926 msgid "Undo" msgstr "復原" -#: src/diffuse/main.py:919 +#: src/diffuse/main.py:927 msgid "Redo" msgstr "重做" -#: src/diffuse/main.py:920 src/diffuse/widgets.py:1847 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 msgid "Cut" msgstr "剪下" -#: src/diffuse/main.py:921 src/diffuse/widgets.py:1848 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 msgid "Copy" msgstr "複製" -#: src/diffuse/main.py:922 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 msgid "Paste" msgstr "貼上" -#: src/diffuse/main.py:923 src/diffuse/widgets.py:1852 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 msgid "Clear Edits" msgstr "取消編輯" -#: src/diffuse/main.py:1046 +#: src/diffuse/main.py:1054 msgid "Some files have unsaved changes. Select the files to save before closing." msgstr "一些檔案已變更但未儲存，請在關閉前儲存這些檔案。" -#: src/diffuse/main.py:1060 +#: src/diffuse/main.py:1068 msgid "Tab" msgstr "跳格字元" -#: src/diffuse/main.py:1065 +#: src/diffuse/main.py:1073 msgid "Pane" msgstr "窗格" -#: src/diffuse/main.py:1076 +#: src/diffuse/main.py:1084 msgid "Close _Without Saving" msgstr "不儲存而關閉" -#: src/diffuse/main.py:1115 +#: src/diffuse/main.py:1123 #, python-format msgid "Closing this tab will quit %s." msgstr "關閉此分頁將會退出 %s" -#: src/diffuse/main.py:1198 +#: src/diffuse/main.py:1206 #, python-format msgid "File Merge %d" msgstr "檔案合併 %d" -#: src/diffuse/main.py:1304 +#: src/diffuse/main.py:1312 #, python-format msgid "Error retrieving commits for %s." msgstr "無法恢復對 %s 的認可。" -#: src/diffuse/main.py:1336 +#: src/diffuse/main.py:1344 #, python-format msgid "Error retrieving modifications for %s." msgstr "無法恢復對 %s 的修改。" -#: src/diffuse/main.py:1369 +#: src/diffuse/main.py:1377 msgid "Open File In New Tab" msgstr "在新分頁裡開啟檔案" -#: src/diffuse/main.py:1392 +#: src/diffuse/main.py:1400 msgid "Choose Folder With Modified Files" msgstr "選擇更改過的檔案夾" -#: src/diffuse/main.py:1410 +#: src/diffuse/main.py:1418 msgid "No modified files found." msgstr "找不到已修改的檔案。" -#: src/diffuse/main.py:1416 +#: src/diffuse/main.py:1424 msgid "Choose Folder With Commit" msgstr "選擇認可過的檔案夾" -#: src/diffuse/main.py:1436 +#: src/diffuse/main.py:1444 msgid "No committed files found." msgstr "找不到已認可的檔案。" -#: src/diffuse/main.py:1472 +#: src/diffuse/main.py:1480 msgid "New N-Way File Merge..." msgstr "新的多重檔案合併…" -#: src/diffuse/main.py:1473 +#: src/diffuse/main.py:1481 msgid "Number of panes: " msgstr "窗格數: " -#: src/diffuse/main.py:1547 +#: src/diffuse/main.py:1555 msgid "Phrase not found. Continue from the end of the file?" msgstr "語詞未找到，從檔案結尾繼續嗎？" -#: src/diffuse/main.py:1549 +#: src/diffuse/main.py:1557 msgid "Phrase not found. Continue from the start of the file?" msgstr "語詞未找到，從檔案開頭繼續嗎？" -#: src/diffuse/main.py:1770 +#: src/diffuse/main.py:1778 #, fuzzy msgid "" "Usage:\n" @@ -697,174 +668,174 @@ msgstr "" " ( -i | --ignore-case ) 忽略大小寫差異\n" " ( -w | --ignore-all-space ) 忽略空白差異" -#: src/diffuse/main.py:1937 +#: src/diffuse/main.py:1945 msgid "Error parsing line number." msgstr "解析列數時錯誤。" -#: src/diffuse/main.py:1947 +#: src/diffuse/main.py:1955 #, python-format msgid "Skipping unknown argument \"%s\"." msgstr "跳過未知引數「%s」。" -#: src/diffuse/main.py:1955 +#: src/diffuse/main.py:1963 #, python-format msgid "Error processing argument \"%s\". Directory not expected." msgstr "無法處理「%s」。目錄不存在。" -#: src/diffuse/preferences.py:79 +#: src/diffuse/preferences.py:80 msgid "Display" msgstr "顯示" -#: src/diffuse/preferences.py:82 +#: src/diffuse/preferences.py:83 msgid "Font" msgstr "字型" -#: src/diffuse/preferences.py:83 +#: src/diffuse/preferences.py:84 msgid "Tab width" msgstr "跳格寬度" -#: src/diffuse/preferences.py:84 +#: src/diffuse/preferences.py:85 msgid "Show right margin" msgstr "顯示右邊距" -#: src/diffuse/preferences.py:85 +#: src/diffuse/preferences.py:86 msgid "Right margin" msgstr "右邊距" -#: src/diffuse/preferences.py:86 +#: src/diffuse/preferences.py:87 msgid "Show line numbers" msgstr "顯示列號" -#: src/diffuse/preferences.py:87 +#: src/diffuse/preferences.py:88 msgid "Show white space characters" msgstr "顯示空格" -#: src/diffuse/preferences.py:88 +#: src/diffuse/preferences.py:89 msgid "Ignore case differences" msgstr "忽略大小寫的差異" -#: src/diffuse/preferences.py:89 +#: src/diffuse/preferences.py:90 msgid "Ignore white space differences" msgstr "忽略空格的差異" -#: src/diffuse/preferences.py:90 src/diffuse/preferences.py:99 +#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100 msgid "Ignore changes to white space" msgstr "忽略對空格的改變" -#: src/diffuse/preferences.py:91 +#: src/diffuse/preferences.py:92 msgid "Ignore blank line differences" msgstr "忽略空列的差異" -#: src/diffuse/preferences.py:92 +#: src/diffuse/preferences.py:93 msgid "Ignore end of line differences" msgstr "忽略列尾的差異" -#: src/diffuse/preferences.py:94 +#: src/diffuse/preferences.py:95 msgid "Alignment" msgstr "對齊" -#: src/diffuse/preferences.py:97 +#: src/diffuse/preferences.py:98 msgid "Ignore case" msgstr "忽略大小寫" -#: src/diffuse/preferences.py:98 +#: src/diffuse/preferences.py:99 msgid "Ignore white space" msgstr "忽略空格" -#: src/diffuse/preferences.py:100 +#: src/diffuse/preferences.py:101 msgid "Ignore blank lines" msgstr "忽略空列" -#: src/diffuse/preferences.py:101 +#: src/diffuse/preferences.py:102 msgid "Ignore end of line characters" msgstr "忽略列尾字元" -#: src/diffuse/preferences.py:103 +#: src/diffuse/preferences.py:104 msgid "Editor" msgstr "編輯器" -#: src/diffuse/preferences.py:106 +#: src/diffuse/preferences.py:107 msgid "Auto indent" msgstr "自動縮排" -#: src/diffuse/preferences.py:107 +#: src/diffuse/preferences.py:108 msgid "Expand tabs to spaces" msgstr "展開跳格字元為空格" -#: src/diffuse/preferences.py:108 +#: src/diffuse/preferences.py:109 msgid "Soft tab width" msgstr "跳格寬度" -#: src/diffuse/preferences.py:110 +#: src/diffuse/preferences.py:111 msgid "Tabs" msgstr "分頁" -#: src/diffuse/preferences.py:113 +#: src/diffuse/preferences.py:114 msgid "Default panes" msgstr "預設窗格" -#: src/diffuse/preferences.py:114 +#: src/diffuse/preferences.py:115 msgid "Always show the tab bar" msgstr "總是顯示分頁欄" -#: src/diffuse/preferences.py:115 +#: src/diffuse/preferences.py:116 #, python-format msgid "Warn me when closing a tab will quit %s" msgstr "當關閉分頁會退出 %s 的時候提醒我" -#: src/diffuse/preferences.py:117 +#: src/diffuse/preferences.py:118 msgid "Regional Settings" msgstr "設定" -#: src/diffuse/preferences.py:120 +#: src/diffuse/preferences.py:121 msgid "Default codec" msgstr "預設解碼器" -#: src/diffuse/preferences.py:121 +#: src/diffuse/preferences.py:122 msgid "Order of codecs used to identify encoding" msgstr "用來識別編碼的解碼器順序" -#: src/diffuse/preferences.py:142 +#: src/diffuse/preferences.py:143 msgid "Cygwin" msgstr "Cygwin" -#: src/diffuse/preferences.py:144 +#: src/diffuse/preferences.py:145 msgid "Root directory" msgstr "根目錄" -#: src/diffuse/preferences.py:145 +#: src/diffuse/preferences.py:146 msgid "Cygdrive prefix" msgstr "Cygdrive 前綴" -#: src/diffuse/preferences.py:164 +#: src/diffuse/preferences.py:165 msgid "Version control system search order" msgstr "" -#: src/diffuse/preferences.py:172 +#: src/diffuse/preferences.py:173 msgid "\"co\" command" msgstr "「co」命令" -#: src/diffuse/preferences.py:173 +#: src/diffuse/preferences.py:174 msgid "\"rlog\" command" msgstr "「rlog」命令" -#: src/diffuse/preferences.py:175 +#: src/diffuse/preferences.py:176 msgid "Command" msgstr "命令" -#: src/diffuse/preferences.py:181 +#: src/diffuse/preferences.py:182 msgid "Launch from a Bash login shell" msgstr "從登入命令列介面啟動" -#: src/diffuse/preferences.py:188 +#: src/diffuse/preferences.py:189 msgid "Update paths for Cygwin" msgstr "為 Cygwin 更新路徑" -#: src/diffuse/preferences.py:193 +#: src/diffuse/preferences.py:194 msgid "Version Control" msgstr "版本控制" -#: src/diffuse/preferences.py:258 +#: src/diffuse/preferences.py:259 msgid "Preferences" msgstr "選項" @@ -896,7 +867,7 @@ msgstr "" #: src/diffuse/resources.py:409 #, python-brace-format -msgid "Options \"{option}\" is unknown" +msgid "Option \"{option}\" is unknown" msgstr "" #: src/diffuse/resources.py:416 @@ -949,40 +920,68 @@ msgstr "處理到檔案 {file} 的第 {line} 列時出錯。" msgid "Unhandled error at line {line} of {file}." msgstr "處理到檔案 {file} 的第 {line} 列時出錯。" -#: src/diffuse/utils.py:63 +#: src/diffuse/utils.py:66 msgid "Auto Detect" msgstr "自動偵測" -#: src/diffuse/vcs/cvs.py:53 src/diffuse/vcs/rcs.py:62 src/diffuse/vcs/svn.py:95 +#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97 #, python-format msgid "Error parsing revision %s." msgstr "無法解析修訂版本 %s。" -#: src/diffuse/vcs/vcs_registry.py:233 +#: src/diffuse/vcs/vcs_registry.py:238 #, python-format msgid "Error parsing %s." msgstr "無法解析 %s。" -#: src/diffuse/widgets.py:1843 +#: src/diffuse/widgets.py:1845 msgid "Align with Selection" msgstr "對齊選擇區域" -#: src/diffuse/widgets.py:1844 +#: src/diffuse/widgets.py:1846 msgid "Isolate" msgstr "分離" -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1847 msgid "Merge Selection" msgstr "合併選擇區域" -#: src/diffuse/widgets.py:1851 +#: src/diffuse/widgets.py:1853 msgid "Select All" msgstr "全選" -#: src/diffuse/widgets.py:1854 +#: src/diffuse/widgets.py:1856 msgid "Swap with Selected Pane" msgstr "交換選中的窗格" +#, fuzzy +#~ msgid "" +#~ "This program is free software; you can redistribute it and/or modify\n" +#~ "it under the terms of the GNU General Public License as published by\n" +#~ "the Free Software Foundation; either version 2 of the License, or\n" +#~ "(at your option) any later version.\n" +#~ "\n" +#~ "This program is distributed in the hope that it will be useful,\n" +#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +#~ "GNU General Public License for more details.\n" +#~ "\n" +#~ "You should have received a copy of the GNU General Public License along\n" +#~ "with this program; if not, write to the Free Software Foundation, Inc.,\n" +#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." +#~ msgstr "" +#~ "這個程式是自由軟體；您可以遵循由自由軟體基金會所發布的 GNU 通用公共授權條款來再" +#~ "次散布它與/或修改它；無論您依據的是本授權的第二版、或 (您自行選擇的) 任何後續版" +#~ "本。\n" +#~ "\n" +#~ "發行本程式是希望它能夠有用，但是沒有任何擔保；亦無對於某一特定目的之適售性與適" +#~ "用性的暗示性擔保。 請參看 GNU 通用公共授權以獲得更多細節。\n" +#~ "\n" +#~ "您應該已經收到隨附於這個程式的 GNU 通用公共授權複本。 您也可以藉由造訪它們的網" +#~ "站 (http://www.fsf.org/)，從自由軟體基金會得到 GNU 通用公共授權的複本，或是寫信" +#~ "給 Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA " +#~ "02110-1301 USA\n" + #~ msgid "Diffuse Merge Tool" #~ msgstr "Diffuse 比較合併工具" diff --git a/src/diffuse/dialogs.py b/src/diffuse/dialogs.py index 6f5cc94..517050a 100644 --- a/src/diffuse/dialogs.py +++ b/src/diffuse/dialogs.py @@ -46,7 +46,7 @@ class AboutDialog(Gtk.AboutDialog): license_text = [ constants.APP_NAME + ' ' + constants.VERSION + '\n\n', constants.COPYRIGHT + '\n\n', - _('''This program is free software; you can redistribute it and/or modify + '''This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. @@ -58,7 +58,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.''')] +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.'''] self.set_license(''.join(license_text))