diff --git a/po/cs.po b/po/cs.po index 967f733..fe04fcb 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-04 12:14-0400\n" +"POT-Creation-Date: 2022-10-23 19:48-0400\n" "PO-Revision-Date: 2022-04-04 12:16-0400\n" "Last-Translator: Jindřich Šesták \n" "Language-Team: NONE \n" @@ -55,27 +55,27 @@ 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:83 +#: src/diffuse/dialogs.py:82 msgid "Encoding: " msgstr "Kódování: " -#: src/diffuse/dialogs.py:95 +#: src/diffuse/dialogs.py:94 msgid "Revision: " msgstr "Revize: " -#: src/diffuse/dialogs.py:151 +#: src/diffuse/dialogs.py:156 msgid "Find..." msgstr "Najít..." -#: src/diffuse/dialogs.py:159 +#: src/diffuse/dialogs.py:164 msgid "Search For: " msgstr "Vyhledat: " -#: src/diffuse/dialogs.py:184 +#: src/diffuse/dialogs.py:189 msgid "Match Case" msgstr "Rozlišovat velikost písmen" -#: src/diffuse/dialogs.py:189 +#: src/diffuse/dialogs.py:194 msgid "Search Backwards" msgstr "Hledat od konce" @@ -146,7 +146,7 @@ msgstr "" msgid "Error encoding to %s." msgstr "Při změně kódování do %s došlo k chybě." -#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #, python-format msgid "Error writing %s." msgstr "Při ukládání %s došlo k chybě." @@ -509,19 +509,19 @@ msgstr "Zpět" msgid "Redo" msgstr "Znovu" -#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 msgid "Cut" msgstr "Vyjmout" -#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 msgid "Copy" msgstr "Kopírovat" -#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 msgid "Paste" msgstr "Vložit" -#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 msgid "Clear Edits" msgstr "Smazat úpravy" @@ -856,83 +856,83 @@ msgstr "Správa verzí" msgid "Preferences" msgstr "Předvolby" -#: src/diffuse/resources.py:238 src/diffuse/resources.py:242 -#: src/diffuse/resources.py:245 +#: src/diffuse/resources.py:242 src/diffuse/resources.py:246 +#: src/diffuse/resources.py:249 #, python-brace-format msgid "The key binding \"{key}\" is invalid" msgstr "" -#: src/diffuse/resources.py:372 +#: src/diffuse/resources.py:376 msgid "Imports must have one argument" msgstr "" -#: src/diffuse/resources.py:388 +#: src/diffuse/resources.py:392 msgid "Key bindings must have three arguments" msgstr "" -#: src/diffuse/resources.py:394 +#: src/diffuse/resources.py:398 msgid "Colors must have four arguments" msgstr "" -#: src/diffuse/resources.py:400 +#: src/diffuse/resources.py:404 msgid "Floats must have two arguments" msgstr "" -#: src/diffuse/resources.py:406 +#: src/diffuse/resources.py:410 msgid "Options must have two arguments" msgstr "" -#: src/diffuse/resources.py:409 +#: src/diffuse/resources.py:413 #, python-brace-format msgid "Option \"{option}\" is unknown" msgstr "" -#: src/diffuse/resources.py:416 +#: src/diffuse/resources.py:420 msgid "Strings must have two arguments" msgstr "" -#: src/diffuse/resources.py:427 +#: src/diffuse/resources.py:431 msgid "Syntaxes must have two or three arguments" msgstr "" -#: src/diffuse/resources.py:455 +#: src/diffuse/resources.py:459 msgid "Syntax patterns must have at least four arguments" msgstr "" -#: src/diffuse/resources.py:461 src/diffuse/resources.py:505 +#: src/diffuse/resources.py:465 src/diffuse/resources.py:509 #, python-brace-format msgid "Value \"{value}\" is unknown" msgstr "" -#: src/diffuse/resources.py:472 +#: src/diffuse/resources.py:476 msgid "Syntax files must have one or two arguments" msgstr "" -#: src/diffuse/resources.py:490 +#: src/diffuse/resources.py:494 msgid "Syntax magics must have at least one argument" msgstr "" -#: src/diffuse/resources.py:509 +#: src/diffuse/resources.py:513 #, python-brace-format msgid "Keyword \"{keyword}\" is unknown" msgstr "" -#: src/diffuse/resources.py:511 +#: src/diffuse/resources.py:515 #, fuzzy, python-brace-format msgid "Syntax error at line {line} of {file}" msgstr "Při zpracování řádku {line} souboru {file} došlo k chybě." -#: src/diffuse/resources.py:517 +#: src/diffuse/resources.py:521 #, fuzzy, python-brace-format msgid "Value error at line {line} of {file}" msgstr "Při zpracování řádku {line} souboru {file} došlo k chybě." -#: src/diffuse/resources.py:523 +#: src/diffuse/resources.py:527 #, fuzzy, python-brace-format msgid "Regex error at line {line} of {file}." msgstr "Při zpracování řádku {line} souboru {file} došlo k chybě." -#: src/diffuse/resources.py:526 +#: src/diffuse/resources.py:530 #, fuzzy, python-brace-format msgid "Unhandled error at line {line} of {file}." msgstr "Při zpracování řádku {line} souboru {file} došlo k chybě." @@ -951,58 +951,26 @@ msgstr "Při analýze revize %s došlo k chybě." msgid "Error parsing %s." msgstr "Při analýze %s došlo k chybě." -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1857 msgid "Align with Selection" msgstr "Zarovnat s výběrem" -#: src/diffuse/widgets.py:1846 +#: src/diffuse/widgets.py:1858 msgid "Isolate" msgstr "Izolovat" -#: src/diffuse/widgets.py:1847 +#: src/diffuse/widgets.py:1859 msgid "Merge Selection" msgstr "Sloučit výběr" -#: src/diffuse/widgets.py:1853 +#: src/diffuse/widgets.py:1865 msgid "Select All" msgstr "Vybrat vše" -#: src/diffuse/widgets.py:1856 +#: src/diffuse/widgets.py:1868 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" - #, python-format #~ msgid "Column %d" #~ msgstr "Sloupec %d" diff --git a/po/de.po b/po/de.po index 1805aec..95dd03e 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: 2022-04-04 12:14-0400\n" +"POT-Creation-Date: 2022-10-23 19:48-0400\n" "PO-Revision-Date: 2021-01-26 04:29+0100\n" "Last-Translator: Henri Menke \n" "Language-Team: German \n" @@ -55,27 +55,27 @@ msgstr "" msgid "translator-credits" msgstr "Henri Menke " -#: src/diffuse/dialogs.py:83 +#: src/diffuse/dialogs.py:82 msgid "Encoding: " msgstr "Kodierung: " -#: src/diffuse/dialogs.py:95 +#: src/diffuse/dialogs.py:94 msgid "Revision: " msgstr "Revision: " -#: src/diffuse/dialogs.py:151 +#: src/diffuse/dialogs.py:156 msgid "Find..." msgstr "Suchen..." -#: src/diffuse/dialogs.py:159 +#: src/diffuse/dialogs.py:164 msgid "Search For: " msgstr "Suchen nach: " -#: src/diffuse/dialogs.py:184 +#: src/diffuse/dialogs.py:189 msgid "Match Case" msgstr "Übereinstimmen von Groß- und Kleinschreibung" -#: src/diffuse/dialogs.py:189 +#: src/diffuse/dialogs.py:194 msgid "Search Backwards" msgstr "Rückwärts suchen" @@ -146,7 +146,7 @@ msgstr "" msgid "Error encoding to %s." msgstr "Fehler bei der Kodierung nach %s." -#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #, python-format msgid "Error writing %s." msgstr "Fehler beim Schreiben von %s." @@ -508,19 +508,19 @@ msgstr "Rückgängig" msgid "Redo" msgstr "Wiederholen" -#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 msgid "Cut" msgstr "Ausschneiden" -#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 msgid "Copy" msgstr "Kopieren" -#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 msgid "Paste" msgstr "Einfügen" -#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 msgid "Clear Edits" msgstr "Alle Änderungen rückgängig" @@ -851,83 +851,83 @@ msgstr "Versionsverwaltung" msgid "Preferences" msgstr "Einstellungen" -#: src/diffuse/resources.py:238 src/diffuse/resources.py:242 -#: src/diffuse/resources.py:245 +#: src/diffuse/resources.py:242 src/diffuse/resources.py:246 +#: src/diffuse/resources.py:249 #, python-brace-format msgid "The key binding \"{key}\" is invalid" msgstr "" -#: src/diffuse/resources.py:372 +#: src/diffuse/resources.py:376 msgid "Imports must have one argument" msgstr "" -#: src/diffuse/resources.py:388 +#: src/diffuse/resources.py:392 msgid "Key bindings must have three arguments" msgstr "" -#: src/diffuse/resources.py:394 +#: src/diffuse/resources.py:398 msgid "Colors must have four arguments" msgstr "" -#: src/diffuse/resources.py:400 +#: src/diffuse/resources.py:404 msgid "Floats must have two arguments" msgstr "" -#: src/diffuse/resources.py:406 +#: src/diffuse/resources.py:410 msgid "Options must have two arguments" msgstr "" -#: src/diffuse/resources.py:409 +#: src/diffuse/resources.py:413 #, python-brace-format msgid "Option \"{option}\" is unknown" msgstr "" -#: src/diffuse/resources.py:416 +#: src/diffuse/resources.py:420 msgid "Strings must have two arguments" msgstr "" -#: src/diffuse/resources.py:427 +#: src/diffuse/resources.py:431 msgid "Syntaxes must have two or three arguments" msgstr "" -#: src/diffuse/resources.py:455 +#: src/diffuse/resources.py:459 msgid "Syntax patterns must have at least four arguments" msgstr "" -#: src/diffuse/resources.py:461 src/diffuse/resources.py:505 +#: src/diffuse/resources.py:465 src/diffuse/resources.py:509 #, python-brace-format msgid "Value \"{value}\" is unknown" msgstr "" -#: src/diffuse/resources.py:472 +#: src/diffuse/resources.py:476 msgid "Syntax files must have one or two arguments" msgstr "" -#: src/diffuse/resources.py:490 +#: src/diffuse/resources.py:494 msgid "Syntax magics must have at least one argument" msgstr "" -#: src/diffuse/resources.py:509 +#: src/diffuse/resources.py:513 #, python-brace-format msgid "Keyword \"{keyword}\" is unknown" msgstr "" -#: src/diffuse/resources.py:511 +#: src/diffuse/resources.py:515 #, fuzzy, python-brace-format msgid "Syntax error at line {line} of {file}" msgstr "Fehler bei der Analyse der Zeilen {line} von {file}." -#: src/diffuse/resources.py:517 +#: src/diffuse/resources.py:521 #, fuzzy, python-brace-format msgid "Value error at line {line} of {file}" msgstr "Fehler bei der Analyse der Zeilen {line} von {file}." -#: src/diffuse/resources.py:523 +#: src/diffuse/resources.py:527 #, fuzzy, python-brace-format msgid "Regex error at line {line} of {file}." msgstr "Fehler bei der Analyse der Zeilen {line} von {file}." -#: src/diffuse/resources.py:526 +#: src/diffuse/resources.py:530 #, fuzzy, python-brace-format msgid "Unhandled error at line {line} of {file}." msgstr "Fehler bei der Analyse der Zeilen {line} von {file}." @@ -946,58 +946,26 @@ msgstr "Fehler bei der Analyse der Revision %s." msgid "Error parsing %s." msgstr "Fehler bei der Analyse %s." -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1857 msgid "Align with Selection" msgstr "Ausrichten an der Auswahl" -#: src/diffuse/widgets.py:1846 +#: src/diffuse/widgets.py:1858 msgid "Isolate" msgstr "Isolieren" -#: src/diffuse/widgets.py:1847 +#: src/diffuse/widgets.py:1859 msgid "Merge Selection" msgstr "Auswahl zusammenführen" -#: src/diffuse/widgets.py:1853 +#: src/diffuse/widgets.py:1865 msgid "Select All" msgstr "Alles auswählen" -#: src/diffuse/widgets.py:1856 +#: src/diffuse/widgets.py:1868 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" - #, python-format #~ msgid "Column %d" #~ msgstr "Spalte %d" diff --git a/po/diffuse.pot b/po/diffuse.pot index ea4597e..7a775ce 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:14-0400\n" +"POT-Creation-Date: 2022-10-23 19:48-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -50,27 +50,27 @@ msgstr "" msgid "translator-credits" msgstr "" -#: src/diffuse/dialogs.py:83 +#: src/diffuse/dialogs.py:82 msgid "Encoding: " msgstr "" -#: src/diffuse/dialogs.py:95 +#: src/diffuse/dialogs.py:94 msgid "Revision: " msgstr "" -#: src/diffuse/dialogs.py:151 +#: src/diffuse/dialogs.py:156 msgid "Find..." msgstr "" -#: src/diffuse/dialogs.py:159 +#: src/diffuse/dialogs.py:164 msgid "Search For: " msgstr "" -#: src/diffuse/dialogs.py:184 +#: src/diffuse/dialogs.py:189 msgid "Match Case" msgstr "" -#: src/diffuse/dialogs.py:189 +#: src/diffuse/dialogs.py:194 msgid "Search Backwards" msgstr "" @@ -139,7 +139,7 @@ msgstr "" msgid "Error encoding to %s." msgstr "" -#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #, python-format msgid "Error writing %s." msgstr "" @@ -497,19 +497,19 @@ msgstr "" msgid "Redo" msgstr "" -#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 msgid "Cut" msgstr "" -#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 msgid "Copy" msgstr "" -#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 msgid "Paste" msgstr "" -#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 msgid "Clear Edits" msgstr "" @@ -796,83 +796,83 @@ msgstr "" msgid "Preferences" msgstr "" -#: src/diffuse/resources.py:238 src/diffuse/resources.py:242 -#: src/diffuse/resources.py:245 +#: src/diffuse/resources.py:242 src/diffuse/resources.py:246 +#: src/diffuse/resources.py:249 #, python-brace-format msgid "The key binding \"{key}\" is invalid" msgstr "" -#: src/diffuse/resources.py:372 +#: src/diffuse/resources.py:376 msgid "Imports must have one argument" msgstr "" -#: src/diffuse/resources.py:388 +#: src/diffuse/resources.py:392 msgid "Key bindings must have three arguments" msgstr "" -#: src/diffuse/resources.py:394 +#: src/diffuse/resources.py:398 msgid "Colors must have four arguments" msgstr "" -#: src/diffuse/resources.py:400 +#: src/diffuse/resources.py:404 msgid "Floats must have two arguments" msgstr "" -#: src/diffuse/resources.py:406 +#: src/diffuse/resources.py:410 msgid "Options must have two arguments" msgstr "" -#: src/diffuse/resources.py:409 +#: src/diffuse/resources.py:413 #, python-brace-format msgid "Option \"{option}\" is unknown" msgstr "" -#: src/diffuse/resources.py:416 +#: src/diffuse/resources.py:420 msgid "Strings must have two arguments" msgstr "" -#: src/diffuse/resources.py:427 +#: src/diffuse/resources.py:431 msgid "Syntaxes must have two or three arguments" msgstr "" -#: src/diffuse/resources.py:455 +#: src/diffuse/resources.py:459 msgid "Syntax patterns must have at least four arguments" msgstr "" -#: src/diffuse/resources.py:461 src/diffuse/resources.py:505 +#: src/diffuse/resources.py:465 src/diffuse/resources.py:509 #, python-brace-format msgid "Value \"{value}\" is unknown" msgstr "" -#: src/diffuse/resources.py:472 +#: src/diffuse/resources.py:476 msgid "Syntax files must have one or two arguments" msgstr "" -#: src/diffuse/resources.py:490 +#: src/diffuse/resources.py:494 msgid "Syntax magics must have at least one argument" msgstr "" -#: src/diffuse/resources.py:509 +#: src/diffuse/resources.py:513 #, python-brace-format msgid "Keyword \"{keyword}\" is unknown" msgstr "" -#: src/diffuse/resources.py:511 +#: src/diffuse/resources.py:515 #, python-brace-format msgid "Syntax error at line {line} of {file}" msgstr "" -#: src/diffuse/resources.py:517 +#: src/diffuse/resources.py:521 #, python-brace-format msgid "Value error at line {line} of {file}" msgstr "" -#: src/diffuse/resources.py:523 +#: src/diffuse/resources.py:527 #, python-brace-format msgid "Regex error at line {line} of {file}." msgstr "" -#: src/diffuse/resources.py:526 +#: src/diffuse/resources.py:530 #, python-brace-format msgid "Unhandled error at line {line} of {file}." msgstr "" @@ -891,22 +891,22 @@ msgstr "" msgid "Error parsing %s." msgstr "" -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1857 msgid "Align with Selection" msgstr "" -#: src/diffuse/widgets.py:1846 +#: src/diffuse/widgets.py:1858 msgid "Isolate" msgstr "" -#: src/diffuse/widgets.py:1847 +#: src/diffuse/widgets.py:1859 msgid "Merge Selection" msgstr "" -#: src/diffuse/widgets.py:1853 +#: src/diffuse/widgets.py:1865 msgid "Select All" msgstr "" -#: src/diffuse/widgets.py:1856 +#: src/diffuse/widgets.py:1868 msgid "Swap with Selected Pane" msgstr "" diff --git a/po/es.po b/po/es.po index 7071355..1cec4f5 100644 --- a/po/es.po +++ b/po/es.po @@ -4,12 +4,12 @@ # Henri Menke , 2010. # David Marín Carreño , 2020. # Óscar Fernández Díaz , 2022. - +# msgid "" msgstr "" "Project-Id-Version: diffuse-svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-04 12:14-0400\n" +"POT-Creation-Date: 2022-10-23 19:48-0400\n" "PO-Revision-Date: 2022-06-13 23:21+0200\n" "Last-Translator: Óscar Fernández Díaz \n" "Language-Team: \n" @@ -59,27 +59,27 @@ msgstr "" "David Marín Carreño \n" "Óscar Fernández Díaz " -#: src/diffuse/dialogs.py:83 +#: src/diffuse/dialogs.py:82 msgid "Encoding: " msgstr "Codificación: " -#: src/diffuse/dialogs.py:95 +#: src/diffuse/dialogs.py:94 msgid "Revision: " msgstr "Revision: " -#: src/diffuse/dialogs.py:151 +#: src/diffuse/dialogs.py:156 msgid "Find..." msgstr "Buscar..." -#: src/diffuse/dialogs.py:159 +#: src/diffuse/dialogs.py:164 msgid "Search For: " msgstr "Buscar: " -#: src/diffuse/dialogs.py:184 +#: src/diffuse/dialogs.py:189 msgid "Match Case" msgstr "Coincidencia de capitalización" -#: src/diffuse/dialogs.py:189 +#: src/diffuse/dialogs.py:194 msgid "Search Backwards" msgstr "Buscar hacia atrás" @@ -151,7 +151,7 @@ msgstr "" msgid "Error encoding to %s." msgstr "Error codificando a %s." -#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #, python-format msgid "Error writing %s." msgstr "Error guardando %s." @@ -512,19 +512,19 @@ msgstr "Deshacer" msgid "Redo" msgstr "Rehacer" -#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 msgid "Cut" msgstr "Cortar" -#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 msgid "Copy" msgstr "Copiar" -#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 msgid "Paste" msgstr "Pegar" -#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 msgid "Clear Edits" msgstr "Deshacer todo" @@ -855,83 +855,83 @@ msgstr "Control de versión" msgid "Preferences" msgstr "Preferencias" -#: src/diffuse/resources.py:238 src/diffuse/resources.py:242 -#: src/diffuse/resources.py:245 +#: src/diffuse/resources.py:242 src/diffuse/resources.py:246 +#: src/diffuse/resources.py:249 #, python-brace-format msgid "The key binding \"{key}\" is invalid" msgstr "El enlace de la clave \"{key}\" no es válido" -#: src/diffuse/resources.py:372 +#: src/diffuse/resources.py:376 msgid "Imports must have one argument" msgstr "Las importaciones deben tener un argumento" -#: src/diffuse/resources.py:388 +#: src/diffuse/resources.py:392 msgid "Key bindings must have three arguments" msgstr "Los atajos del teclado deben tener tres argumentos" -#: src/diffuse/resources.py:394 +#: src/diffuse/resources.py:398 msgid "Colors must have four arguments" msgstr "Los colores deben tener cuatro argumentos" -#: src/diffuse/resources.py:400 +#: src/diffuse/resources.py:404 msgid "Floats must have two arguments" msgstr "Los flotantes deben tener dos argumentos" -#: src/diffuse/resources.py:406 +#: src/diffuse/resources.py:410 msgid "Options must have two arguments" msgstr "Las opciones deben tener dos argumentos" -#: src/diffuse/resources.py:409 +#: src/diffuse/resources.py:413 #, python-brace-format msgid "Option \"{option}\" is unknown" msgstr "La opción \"{option}\" es desconocida" -#: src/diffuse/resources.py:416 +#: src/diffuse/resources.py:420 msgid "Strings must have two arguments" msgstr "Las cadenas deben tener dos argumentos" -#: src/diffuse/resources.py:427 +#: src/diffuse/resources.py:431 msgid "Syntaxes must have two or three arguments" msgstr "Las sintaxis deben tener dos o tres argumentos" -#: src/diffuse/resources.py:455 +#: src/diffuse/resources.py:459 msgid "Syntax patterns must have at least four arguments" msgstr "Los patrones sintácticos deben tener al menos cuatro argumentos" -#: src/diffuse/resources.py:461 src/diffuse/resources.py:505 +#: src/diffuse/resources.py:465 src/diffuse/resources.py:509 #, python-brace-format msgid "Value \"{value}\" is unknown" msgstr "El valor \"{value}\" es desconocido" -#: src/diffuse/resources.py:472 +#: src/diffuse/resources.py:476 msgid "Syntax files must have one or two arguments" msgstr "Los archivos de sintaxis deben tener uno o dos argumentos" -#: src/diffuse/resources.py:490 +#: src/diffuse/resources.py:494 msgid "Syntax magics must have at least one argument" msgstr "Las magias sintácticas deben tener al menos un argumento" -#: src/diffuse/resources.py:509 +#: src/diffuse/resources.py:513 #, python-brace-format msgid "Keyword \"{keyword}\" is unknown" msgstr "La palabra clave \"{keyword}\" es desconocida" -#: src/diffuse/resources.py:511 +#: src/diffuse/resources.py:515 #, python-brace-format msgid "Syntax error at line {line} of {file}" msgstr "Error de sintaxis en la línea {line} de {file}" -#: src/diffuse/resources.py:517 +#: src/diffuse/resources.py:521 #, python-brace-format msgid "Value error at line {line} of {file}" msgstr "Error de valor en la línea {line} de {file}" -#: src/diffuse/resources.py:523 +#: src/diffuse/resources.py:527 #, python-brace-format msgid "Regex error at line {line} of {file}." msgstr "Error regex en la línea {line} de {file}." -#: src/diffuse/resources.py:526 +#: src/diffuse/resources.py:530 #, python-brace-format msgid "Unhandled error at line {line} of {file}." msgstr "Error no controlado en la línea {line} de {file}." @@ -950,22 +950,22 @@ msgstr "Error analizando revisión %s." msgid "Error parsing %s." msgstr "Error analizando %s." -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1857 msgid "Align with Selection" msgstr "Alinear con la selección" -#: src/diffuse/widgets.py:1846 +#: src/diffuse/widgets.py:1858 msgid "Isolate" msgstr "Aislar" -#: src/diffuse/widgets.py:1847 +#: src/diffuse/widgets.py:1859 msgid "Merge Selection" msgstr "Mezclar selección" -#: src/diffuse/widgets.py:1853 +#: src/diffuse/widgets.py:1865 msgid "Select All" msgstr "Seleccionar todo" -#: src/diffuse/widgets.py:1856 +#: src/diffuse/widgets.py:1868 msgid "Swap with Selected Pane" msgstr "Reemplazar con panel seleccionado" diff --git a/po/fr.po b/po/fr.po index 559cd4d..87e8d77 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:14-0400\n" +"POT-Creation-Date: 2022-10-23 19:48-0400\n" "PO-Revision-Date: 2022-04-04 11:58-0400\n" "Last-Translator: Romain Failliot \n" "Language-Team: French\n" @@ -55,27 +55,27 @@ msgstr "" msgid "translator-credits" msgstr "Romain Failliot " -#: src/diffuse/dialogs.py:83 +#: src/diffuse/dialogs.py:82 msgid "Encoding: " msgstr "Encodage: " -#: src/diffuse/dialogs.py:95 +#: src/diffuse/dialogs.py:94 msgid "Revision: " msgstr "Révision: " -#: src/diffuse/dialogs.py:151 +#: src/diffuse/dialogs.py:156 msgid "Find..." msgstr "Rechercher..." -#: src/diffuse/dialogs.py:159 +#: src/diffuse/dialogs.py:164 msgid "Search For: " msgstr "Rechercher: " -#: src/diffuse/dialogs.py:184 +#: src/diffuse/dialogs.py:189 msgid "Match Case" msgstr "Respecter la casse" -#: src/diffuse/dialogs.py:189 +#: src/diffuse/dialogs.py:194 msgid "Search Backwards" msgstr "Rechercher vers le haut" @@ -147,7 +147,7 @@ msgstr "" msgid "Error encoding to %s." msgstr "Erreur durant l'encodage vers %s." -#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #, python-format msgid "Error writing %s." msgstr "Erreur à l'écriture de %s." @@ -509,19 +509,19 @@ msgstr "Annuler" msgid "Redo" msgstr "Refaire" -#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 msgid "Cut" msgstr "Couper" -#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 msgid "Copy" msgstr "Copier" -#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 msgid "Paste" msgstr "Coller" -#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 msgid "Clear Edits" msgstr "Effacer les changements" @@ -857,83 +857,83 @@ msgstr "Contrôle de version" msgid "Preferences" msgstr "Préférences" -#: src/diffuse/resources.py:238 src/diffuse/resources.py:242 -#: src/diffuse/resources.py:245 +#: src/diffuse/resources.py:242 src/diffuse/resources.py:246 +#: src/diffuse/resources.py:249 #, python-brace-format msgid "The key binding \"{key}\" is invalid" msgstr "Le raccourci \"{key}\" est invalide" -#: src/diffuse/resources.py:372 +#: src/diffuse/resources.py:376 msgid "Imports must have one argument" msgstr "Les importations doivent avoir un argument" -#: src/diffuse/resources.py:388 +#: src/diffuse/resources.py:392 msgid "Key bindings must have three arguments" msgstr "Les raccourcis doivent avoir trois arguments" -#: src/diffuse/resources.py:394 +#: src/diffuse/resources.py:398 msgid "Colors must have four arguments" msgstr "Les couleurs doivent avoir quatre arguments" -#: src/diffuse/resources.py:400 +#: src/diffuse/resources.py:404 msgid "Floats must have two arguments" msgstr "Les flottants doivent avoir deux arguments" -#: src/diffuse/resources.py:406 +#: src/diffuse/resources.py:410 msgid "Options must have two arguments" msgstr "Les options doivent avoir deux arguments" -#: src/diffuse/resources.py:409 +#: src/diffuse/resources.py:413 #, python-brace-format msgid "Option \"{option}\" is unknown" msgstr "L'option \"{option}\" est inconnue" -#: src/diffuse/resources.py:416 +#: src/diffuse/resources.py:420 msgid "Strings must have two arguments" msgstr "Les chaînes de caractères doivent avoir deux arguments" -#: src/diffuse/resources.py:427 +#: src/diffuse/resources.py:431 msgid "Syntaxes must have two or three arguments" msgstr "Les syntaxes doivent avoir deux ou trois arguments" -#: src/diffuse/resources.py:455 +#: src/diffuse/resources.py:459 msgid "Syntax patterns must have at least four arguments" msgstr "Les patrons de syntaxe doivent avoir au moins quatre arguments" -#: src/diffuse/resources.py:461 src/diffuse/resources.py:505 +#: src/diffuse/resources.py:465 src/diffuse/resources.py:509 #, python-brace-format msgid "Value \"{value}\" is unknown" msgstr "La valeur \"{value}\" est inconnue" -#: src/diffuse/resources.py:472 +#: src/diffuse/resources.py:476 msgid "Syntax files must have one or two arguments" msgstr "Les fichiers de syntaxe doivent avoir un ou deux arguments" -#: src/diffuse/resources.py:490 +#: src/diffuse/resources.py:494 msgid "Syntax magics must have at least one argument" msgstr "Les syntaxes magiques doivent avoir au moins un argument" -#: src/diffuse/resources.py:509 +#: src/diffuse/resources.py:513 #, python-brace-format msgid "Keyword \"{keyword}\" is unknown" msgstr "Le mot clé \"{keyword}\" est inconnu" -#: src/diffuse/resources.py:511 +#: src/diffuse/resources.py:515 #, python-brace-format msgid "Syntax error at line {line} of {file}" msgstr "Erreur de syntaxe à la ligne {line} de {file}" -#: src/diffuse/resources.py:517 +#: src/diffuse/resources.py:521 #, python-brace-format msgid "Value error at line {line} of {file}" msgstr "Erreur de valeur à la ligne {line} de {file}" -#: src/diffuse/resources.py:523 +#: src/diffuse/resources.py:527 #, python-brace-format msgid "Regex error at line {line} of {file}." msgstr "Erreur de regex à la ligne {line} de {file}." -#: src/diffuse/resources.py:526 +#: src/diffuse/resources.py:530 #, python-brace-format msgid "Unhandled error at line {line} of {file}." msgstr "Erreur inconnue à la ligne {line} de {file}" @@ -952,51 +952,22 @@ msgstr "Erreur à l'analyse de la révision %s." msgid "Error parsing %s." msgstr "Erreur à l'analyse de %s." -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1857 msgid "Align with Selection" msgstr "Aligner avec la sélection" -#: src/diffuse/widgets.py:1846 +#: src/diffuse/widgets.py:1858 msgid "Isolate" msgstr "Isoler" -#: src/diffuse/widgets.py:1847 +#: src/diffuse/widgets.py:1859 msgid "Merge Selection" msgstr "Fusionner la sélection" -#: src/diffuse/widgets.py:1853 +#: src/diffuse/widgets.py:1865 msgid "Select All" msgstr "Tout sélectionner" -#: src/diffuse/widgets.py:1856 +#: src/diffuse/widgets.py:1868 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 ec22c43..e1c0f52 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Diffuse 0.4.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-04 12:14-0400\n" +"POT-Creation-Date: 2022-10-23 19:48-0400\n" "PO-Revision-Date: 2022-04-04 12:18-0400\n" "Last-Translator: Cristian Marchi \n" "Language-Team: Italian\n" @@ -52,27 +52,27 @@ msgstr "" msgid "translator-credits" msgstr "Cristian Marchi , 2011." -#: src/diffuse/dialogs.py:83 +#: src/diffuse/dialogs.py:82 msgid "Encoding: " msgstr "Codifica: " -#: src/diffuse/dialogs.py:95 +#: src/diffuse/dialogs.py:94 msgid "Revision: " msgstr "Revisione: " -#: src/diffuse/dialogs.py:151 +#: src/diffuse/dialogs.py:156 msgid "Find..." msgstr "Trova..." -#: src/diffuse/dialogs.py:159 +#: src/diffuse/dialogs.py:164 msgid "Search For: " msgstr "Cerca: " -#: src/diffuse/dialogs.py:184 +#: src/diffuse/dialogs.py:189 msgid "Match Case" msgstr "Distingui MAIUSCOLE/minuscole" -#: src/diffuse/dialogs.py:189 +#: src/diffuse/dialogs.py:194 msgid "Search Backwards" msgstr "Cerca all'indietro" @@ -143,7 +143,7 @@ msgstr "" msgid "Error encoding to %s." msgstr "Errore codificando %s." -#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #, python-format msgid "Error writing %s." msgstr "Errore scrivendo il %s." @@ -173,8 +173,8 @@ msgid "" "Select target line and press the space bar to align. Press the escape key to " "cancel." msgstr "" -"Selezionare la riga di destinazione e premere spazio per allineare. Premere \"Esc" -"\" per annullare." +"Selezionare la riga di destinazione e premere spazio per allineare. Premere " +"\"Esc\" per annullare." #: src/diffuse/main.py:784 msgid "_File" @@ -505,19 +505,19 @@ msgstr "Annulla" msgid "Redo" msgstr "Ripeti" -#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 msgid "Cut" msgstr "Taglia" -#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 msgid "Copy" msgstr "Copia" -#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 msgid "Paste" msgstr "Incolla" -#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 msgid "Clear Edits" msgstr "Annulla le modifiche" @@ -847,83 +847,83 @@ msgstr "Controllo di versione" msgid "Preferences" msgstr "Preferenze" -#: src/diffuse/resources.py:238 src/diffuse/resources.py:242 -#: src/diffuse/resources.py:245 +#: src/diffuse/resources.py:242 src/diffuse/resources.py:246 +#: src/diffuse/resources.py:249 #, python-brace-format msgid "The key binding \"{key}\" is invalid" msgstr "" -#: src/diffuse/resources.py:372 +#: src/diffuse/resources.py:376 msgid "Imports must have one argument" msgstr "" -#: src/diffuse/resources.py:388 +#: src/diffuse/resources.py:392 msgid "Key bindings must have three arguments" msgstr "" -#: src/diffuse/resources.py:394 +#: src/diffuse/resources.py:398 msgid "Colors must have four arguments" msgstr "" -#: src/diffuse/resources.py:400 +#: src/diffuse/resources.py:404 msgid "Floats must have two arguments" msgstr "" -#: src/diffuse/resources.py:406 +#: src/diffuse/resources.py:410 msgid "Options must have two arguments" msgstr "" -#: src/diffuse/resources.py:409 +#: src/diffuse/resources.py:413 #, python-brace-format msgid "Option \"{option}\" is unknown" msgstr "" -#: src/diffuse/resources.py:416 +#: src/diffuse/resources.py:420 msgid "Strings must have two arguments" msgstr "" -#: src/diffuse/resources.py:427 +#: src/diffuse/resources.py:431 msgid "Syntaxes must have two or three arguments" msgstr "" -#: src/diffuse/resources.py:455 +#: src/diffuse/resources.py:459 msgid "Syntax patterns must have at least four arguments" msgstr "" -#: src/diffuse/resources.py:461 src/diffuse/resources.py:505 +#: src/diffuse/resources.py:465 src/diffuse/resources.py:509 #, python-brace-format msgid "Value \"{value}\" is unknown" msgstr "" -#: src/diffuse/resources.py:472 +#: src/diffuse/resources.py:476 msgid "Syntax files must have one or two arguments" msgstr "" -#: src/diffuse/resources.py:490 +#: src/diffuse/resources.py:494 msgid "Syntax magics must have at least one argument" msgstr "" -#: src/diffuse/resources.py:509 +#: src/diffuse/resources.py:513 #, python-brace-format msgid "Keyword \"{keyword}\" is unknown" msgstr "" -#: src/diffuse/resources.py:511 +#: src/diffuse/resources.py:515 #, fuzzy, python-brace-format msgid "Syntax error at line {line} of {file}" msgstr "Errore nell'elaborare la riga {line} di «{file}»." -#: src/diffuse/resources.py:517 +#: src/diffuse/resources.py:521 #, fuzzy, python-brace-format msgid "Value error at line {line} of {file}" msgstr "Errore nell'elaborare la riga {line} di «{file}»." -#: src/diffuse/resources.py:523 +#: src/diffuse/resources.py:527 #, fuzzy, python-brace-format msgid "Regex error at line {line} of {file}." msgstr "Errore nell'elaborare la riga {line} di «{file}»." -#: src/diffuse/resources.py:526 +#: src/diffuse/resources.py:530 #, fuzzy, python-brace-format msgid "Unhandled error at line {line} of {file}." msgstr "Errore nell'elaborare la riga {line} di «{file}»." @@ -942,61 +942,26 @@ msgstr "Eroore analizzando la revisione %s." msgid "Error parsing %s." msgstr "Errore analizzando %s." -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1857 msgid "Align with Selection" msgstr "Allinea con la selezione" -#: src/diffuse/widgets.py:1846 +#: src/diffuse/widgets.py:1858 msgid "Isolate" msgstr "Isola" -#: src/diffuse/widgets.py:1847 +#: src/diffuse/widgets.py:1859 msgid "Merge Selection" msgstr "Unisci selezione" -#: src/diffuse/widgets.py:1853 +#: src/diffuse/widgets.py:1865 msgid "Select All" msgstr "Seleziona tutto" -#: src/diffuse/widgets.py:1856 +#: src/diffuse/widgets.py:1868 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" - #, python-format #~ msgid "Column %d" #~ msgstr "Colonna %d" diff --git a/po/ja.po b/po/ja.po index 450f083..97f3794 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: 2022-04-04 12:14-0400\n" +"POT-Creation-Date: 2022-10-23 19:48-0400\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: Derrick Moser \n" "Language-Team: Japanese\n" @@ -51,27 +51,27 @@ msgstr "" msgid "translator-credits" msgstr "Derrick Moser " -#: src/diffuse/dialogs.py:83 +#: src/diffuse/dialogs.py:82 msgid "Encoding: " msgstr "エンコーディング: " -#: src/diffuse/dialogs.py:95 +#: src/diffuse/dialogs.py:94 msgid "Revision: " msgstr "リビジョン: " -#: src/diffuse/dialogs.py:151 +#: src/diffuse/dialogs.py:156 msgid "Find..." msgstr "検索..." -#: src/diffuse/dialogs.py:159 +#: src/diffuse/dialogs.py:164 msgid "Search For: " msgstr "検索する文字列: " -#: src/diffuse/dialogs.py:184 +#: src/diffuse/dialogs.py:189 msgid "Match Case" msgstr "大文字/小文字を区別" -#: src/diffuse/dialogs.py:189 +#: src/diffuse/dialogs.py:194 msgid "Search Backwards" msgstr "先頭に向かって検索" @@ -142,7 +142,7 @@ msgstr "" msgid "Error encoding to %s." msgstr "%s に変える際にエラーが生じました。" -#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #, python-format msgid "Error writing %s." msgstr "%s へ書き込む際にエラーが生じました。" @@ -504,19 +504,19 @@ msgstr "元に戻す" msgid "Redo" msgstr "やり直す" -#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 msgid "Cut" msgstr "切り取り" -#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 msgid "Copy" msgstr "コピー" -#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 msgid "Paste" msgstr "貼り付け" -#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 msgid "Clear Edits" msgstr "編集をクリア" @@ -844,83 +844,83 @@ msgstr "バージョンコントロール" msgid "Preferences" msgstr "設定" -#: src/diffuse/resources.py:238 src/diffuse/resources.py:242 -#: src/diffuse/resources.py:245 +#: src/diffuse/resources.py:242 src/diffuse/resources.py:246 +#: src/diffuse/resources.py:249 #, python-brace-format msgid "The key binding \"{key}\" is invalid" msgstr "" -#: src/diffuse/resources.py:372 +#: src/diffuse/resources.py:376 msgid "Imports must have one argument" msgstr "" -#: src/diffuse/resources.py:388 +#: src/diffuse/resources.py:392 msgid "Key bindings must have three arguments" msgstr "" -#: src/diffuse/resources.py:394 +#: src/diffuse/resources.py:398 msgid "Colors must have four arguments" msgstr "" -#: src/diffuse/resources.py:400 +#: src/diffuse/resources.py:404 msgid "Floats must have two arguments" msgstr "" -#: src/diffuse/resources.py:406 +#: src/diffuse/resources.py:410 msgid "Options must have two arguments" msgstr "" -#: src/diffuse/resources.py:409 +#: src/diffuse/resources.py:413 #, python-brace-format msgid "Option \"{option}\" is unknown" msgstr "" -#: src/diffuse/resources.py:416 +#: src/diffuse/resources.py:420 msgid "Strings must have two arguments" msgstr "" -#: src/diffuse/resources.py:427 +#: src/diffuse/resources.py:431 msgid "Syntaxes must have two or three arguments" msgstr "" -#: src/diffuse/resources.py:455 +#: src/diffuse/resources.py:459 msgid "Syntax patterns must have at least four arguments" msgstr "" -#: src/diffuse/resources.py:461 src/diffuse/resources.py:505 +#: src/diffuse/resources.py:465 src/diffuse/resources.py:509 #, python-brace-format msgid "Value \"{value}\" is unknown" msgstr "" -#: src/diffuse/resources.py:472 +#: src/diffuse/resources.py:476 msgid "Syntax files must have one or two arguments" msgstr "" -#: src/diffuse/resources.py:490 +#: src/diffuse/resources.py:494 msgid "Syntax magics must have at least one argument" msgstr "" -#: src/diffuse/resources.py:509 +#: src/diffuse/resources.py:513 #, python-brace-format msgid "Keyword \"{keyword}\" is unknown" msgstr "" -#: src/diffuse/resources.py:511 +#: src/diffuse/resources.py:515 #, fuzzy, python-brace-format msgid "Syntax error at line {line} of {file}" msgstr "{file} の {line}行 を処理しているときにエラーが生じました。" -#: src/diffuse/resources.py:517 +#: src/diffuse/resources.py:521 #, fuzzy, python-brace-format msgid "Value error at line {line} of {file}" msgstr "{file} の {line}行 を処理しているときにエラーが生じました。" -#: src/diffuse/resources.py:523 +#: src/diffuse/resources.py:527 #, fuzzy, python-brace-format msgid "Regex error at line {line} of {file}." msgstr "{file} の {line}行 を処理しているときにエラーが生じました。" -#: src/diffuse/resources.py:526 +#: src/diffuse/resources.py:530 #, fuzzy, python-brace-format msgid "Unhandled error at line {line} of {file}." msgstr "{file} の {line}行 を処理しているときにエラーが生じました。" @@ -939,59 +939,26 @@ msgstr "%s というリビジョンをパースする際にエラーが生じま msgid "Error parsing %s." msgstr "%s をパースする際にエラーが生じました。" -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1857 msgid "Align with Selection" msgstr "選択と整列" -#: src/diffuse/widgets.py:1846 +#: src/diffuse/widgets.py:1858 msgid "Isolate" msgstr "分離" -#: src/diffuse/widgets.py:1847 +#: src/diffuse/widgets.py:1859 msgid "Merge Selection" msgstr "選択をマージ" -#: src/diffuse/widgets.py:1853 +#: src/diffuse/widgets.py:1865 msgid "Select All" msgstr "全て選択" -#: src/diffuse/widgets.py:1856 +#: src/diffuse/widgets.py:1868 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 マージツール" - #, python-format #~ msgid "Column %d" #~ msgstr "%d列" diff --git a/po/ko.po b/po/ko.po index 559a8e5..5af7140 100644 --- a/po/ko.po +++ b/po/ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn r316\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-04 12:14-0400\n" +"POT-Creation-Date: 2022-10-23 19:48-0400\n" "PO-Revision-Date: 2022-04-04 12:18-0400\n" "Last-Translator: Kang Bundo \n" "Language-Team: Korean\n" @@ -51,27 +51,27 @@ msgstr "Diffuse는 텍스트 파일을 병합하고 비교하기 위한 그래 msgid "translator-credits" msgstr "강분도 " -#: src/diffuse/dialogs.py:83 +#: src/diffuse/dialogs.py:82 msgid "Encoding: " msgstr "인코딩: " -#: src/diffuse/dialogs.py:95 +#: src/diffuse/dialogs.py:94 msgid "Revision: " msgstr "수정: " -#: src/diffuse/dialogs.py:151 +#: src/diffuse/dialogs.py:156 msgid "Find..." msgstr "찾기..." -#: src/diffuse/dialogs.py:159 +#: src/diffuse/dialogs.py:164 msgid "Search For: " msgstr "검색 문자열: " -#: src/diffuse/dialogs.py:184 +#: src/diffuse/dialogs.py:189 msgid "Match Case" msgstr "대소문자 구분" -#: src/diffuse/dialogs.py:189 +#: src/diffuse/dialogs.py:194 msgid "Search Backwards" msgstr "위 방향으로 검색" @@ -142,7 +142,7 @@ msgstr "" msgid "Error encoding to %s." msgstr "%s 바꾸는 데 오류가 발생했습니다." -#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #, python-format msgid "Error writing %s." msgstr "%s에 쓸 때 오류가 발생했습니다." @@ -504,19 +504,19 @@ msgstr "실행 취소" msgid "Redo" msgstr "작업 재 실행" -#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 msgid "Cut" msgstr "잘라내기" -#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 msgid "Copy" msgstr "복사" -#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 msgid "Paste" msgstr "붙여넣기" -#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 msgid "Clear Edits" msgstr "편집 삭제" @@ -842,83 +842,83 @@ msgstr "버전 컨트롤" msgid "Preferences" msgstr "기본 설정" -#: src/diffuse/resources.py:238 src/diffuse/resources.py:242 -#: src/diffuse/resources.py:245 +#: src/diffuse/resources.py:242 src/diffuse/resources.py:246 +#: src/diffuse/resources.py:249 #, python-brace-format msgid "The key binding \"{key}\" is invalid" msgstr "" -#: src/diffuse/resources.py:372 +#: src/diffuse/resources.py:376 msgid "Imports must have one argument" msgstr "" -#: src/diffuse/resources.py:388 +#: src/diffuse/resources.py:392 msgid "Key bindings must have three arguments" msgstr "" -#: src/diffuse/resources.py:394 +#: src/diffuse/resources.py:398 msgid "Colors must have four arguments" msgstr "" -#: src/diffuse/resources.py:400 +#: src/diffuse/resources.py:404 msgid "Floats must have two arguments" msgstr "" -#: src/diffuse/resources.py:406 +#: src/diffuse/resources.py:410 msgid "Options must have two arguments" msgstr "" -#: src/diffuse/resources.py:409 +#: src/diffuse/resources.py:413 #, python-brace-format msgid "Option \"{option}\" is unknown" msgstr "" -#: src/diffuse/resources.py:416 +#: src/diffuse/resources.py:420 msgid "Strings must have two arguments" msgstr "" -#: src/diffuse/resources.py:427 +#: src/diffuse/resources.py:431 msgid "Syntaxes must have two or three arguments" msgstr "" -#: src/diffuse/resources.py:455 +#: src/diffuse/resources.py:459 msgid "Syntax patterns must have at least four arguments" msgstr "" -#: src/diffuse/resources.py:461 src/diffuse/resources.py:505 +#: src/diffuse/resources.py:465 src/diffuse/resources.py:509 #, python-brace-format msgid "Value \"{value}\" is unknown" msgstr "" -#: src/diffuse/resources.py:472 +#: src/diffuse/resources.py:476 msgid "Syntax files must have one or two arguments" msgstr "" -#: src/diffuse/resources.py:490 +#: src/diffuse/resources.py:494 msgid "Syntax magics must have at least one argument" msgstr "" -#: src/diffuse/resources.py:509 +#: src/diffuse/resources.py:513 #, python-brace-format msgid "Keyword \"{keyword}\" is unknown" msgstr "" -#: src/diffuse/resources.py:511 +#: src/diffuse/resources.py:515 #, fuzzy, python-brace-format msgid "Syntax error at line {line} of {file}" msgstr "{file} {line} 행을 처리하는 도중 오류가 발생했습니다." -#: src/diffuse/resources.py:517 +#: src/diffuse/resources.py:521 #, fuzzy, python-brace-format msgid "Value error at line {line} of {file}" msgstr "{file} {line} 행을 처리하는 도중 오류가 발생했습니다." -#: src/diffuse/resources.py:523 +#: src/diffuse/resources.py:527 #, fuzzy, python-brace-format msgid "Regex error at line {line} of {file}." msgstr "{file} {line} 행을 처리하는 도중 오류가 발생했습니다." -#: src/diffuse/resources.py:526 +#: src/diffuse/resources.py:530 #, fuzzy, python-brace-format msgid "Unhandled error at line {line} of {file}." msgstr "{file} {line} 행을 처리하는 도중 오류가 발생했습니다." @@ -937,58 +937,26 @@ msgstr "%s 버전을 구문 분석하는 동안 오류가 발생했습니다." msgid "Error parsing %s." msgstr "%s를 구문 분석하는 동안 오류가 발생했습니다." -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1857 msgid "Align with Selection" msgstr "선택 정렬" -#: src/diffuse/widgets.py:1846 +#: src/diffuse/widgets.py:1858 msgid "Isolate" msgstr "분리" -#: src/diffuse/widgets.py:1847 +#: src/diffuse/widgets.py:1859 msgid "Merge Selection" msgstr "선택 병합" -#: src/diffuse/widgets.py:1853 +#: src/diffuse/widgets.py:1865 msgid "Select All" msgstr "모두 선택" -#: src/diffuse/widgets.py:1856 +#: src/diffuse/widgets.py:1868 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 병합도구" - #, python-format #~ msgid "Column %d" #~ msgstr "%d열" diff --git a/po/pl.po b/po/pl.po index 3f0328d..6e58f5d 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-0.4.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-04 12:14-0400\n" +"POT-Creation-Date: 2022-10-23 19:48-0400\n" "PO-Revision-Date: 2022-04-04 12:19-0400\n" "Last-Translator: Miś Uszatek , 2012\n" "Language-Team: Polish \n" @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "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" +"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 @@ -53,27 +53,27 @@ msgstr "" msgid "translator-credits" msgstr "Miś Uszatek " -#: src/diffuse/dialogs.py:83 +#: src/diffuse/dialogs.py:82 msgid "Encoding: " msgstr "Kodowanie znaków: " -#: src/diffuse/dialogs.py:95 +#: src/diffuse/dialogs.py:94 msgid "Revision: " msgstr "Rewizia: " -#: src/diffuse/dialogs.py:151 +#: src/diffuse/dialogs.py:156 msgid "Find..." msgstr "Szukaj..." -#: src/diffuse/dialogs.py:159 +#: src/diffuse/dialogs.py:164 msgid "Search For: " msgstr "Szukaj Dla: " -#: src/diffuse/dialogs.py:184 +#: src/diffuse/dialogs.py:189 msgid "Match Case" msgstr "Uwzględnij wielkość liter" -#: src/diffuse/dialogs.py:189 +#: src/diffuse/dialogs.py:194 msgid "Search Backwards" msgstr "Szukaj Wstecz" @@ -144,7 +144,7 @@ msgstr "" msgid "Error encoding to %s." msgstr "Błąd kodowania dla %s." -#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #, python-format msgid "Error writing %s." msgstr "Błąd zapisu %s." @@ -506,19 +506,19 @@ msgstr "Cofnij" msgid "Redo" msgstr "Ponów" -#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 msgid "Cut" msgstr "Wytnij" -#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 msgid "Copy" msgstr "Kopiuj" -#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 msgid "Paste" msgstr "Wklej" -#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 msgid "Clear Edits" msgstr "Wyczyść Edycje" @@ -848,83 +848,83 @@ msgstr "Wersja kontrolna" msgid "Preferences" msgstr "Preferencje" -#: src/diffuse/resources.py:238 src/diffuse/resources.py:242 -#: src/diffuse/resources.py:245 +#: src/diffuse/resources.py:242 src/diffuse/resources.py:246 +#: src/diffuse/resources.py:249 #, python-brace-format msgid "The key binding \"{key}\" is invalid" msgstr "" -#: src/diffuse/resources.py:372 +#: src/diffuse/resources.py:376 msgid "Imports must have one argument" msgstr "" -#: src/diffuse/resources.py:388 +#: src/diffuse/resources.py:392 msgid "Key bindings must have three arguments" msgstr "" -#: src/diffuse/resources.py:394 +#: src/diffuse/resources.py:398 msgid "Colors must have four arguments" msgstr "" -#: src/diffuse/resources.py:400 +#: src/diffuse/resources.py:404 msgid "Floats must have two arguments" msgstr "" -#: src/diffuse/resources.py:406 +#: src/diffuse/resources.py:410 msgid "Options must have two arguments" msgstr "" -#: src/diffuse/resources.py:409 +#: src/diffuse/resources.py:413 #, python-brace-format msgid "Option \"{option}\" is unknown" msgstr "" -#: src/diffuse/resources.py:416 +#: src/diffuse/resources.py:420 msgid "Strings must have two arguments" msgstr "" -#: src/diffuse/resources.py:427 +#: src/diffuse/resources.py:431 msgid "Syntaxes must have two or three arguments" msgstr "" -#: src/diffuse/resources.py:455 +#: src/diffuse/resources.py:459 msgid "Syntax patterns must have at least four arguments" msgstr "" -#: src/diffuse/resources.py:461 src/diffuse/resources.py:505 +#: src/diffuse/resources.py:465 src/diffuse/resources.py:509 #, python-brace-format msgid "Value \"{value}\" is unknown" msgstr "" -#: src/diffuse/resources.py:472 +#: src/diffuse/resources.py:476 msgid "Syntax files must have one or two arguments" msgstr "" -#: src/diffuse/resources.py:490 +#: src/diffuse/resources.py:494 msgid "Syntax magics must have at least one argument" msgstr "" -#: src/diffuse/resources.py:509 +#: src/diffuse/resources.py:513 #, python-brace-format msgid "Keyword \"{keyword}\" is unknown" msgstr "" -#: src/diffuse/resources.py:511 +#: src/diffuse/resources.py:515 #, fuzzy, python-brace-format msgid "Syntax error at line {line} of {file}" msgstr "Błąd przetwarzania linii {line} w {file}." -#: src/diffuse/resources.py:517 +#: src/diffuse/resources.py:521 #, fuzzy, python-brace-format msgid "Value error at line {line} of {file}" msgstr "Błąd przetwarzania linii {line} w {file}." -#: src/diffuse/resources.py:523 +#: src/diffuse/resources.py:527 #, fuzzy, python-brace-format msgid "Regex error at line {line} of {file}." msgstr "Błąd przetwarzania linii {line} w {file}." -#: src/diffuse/resources.py:526 +#: src/diffuse/resources.py:530 #, fuzzy, python-brace-format msgid "Unhandled error at line {line} of {file}." msgstr "Błąd przetwarzania linii {line} w {file}." @@ -943,29 +943,26 @@ msgstr "Błąd analizowania rewizji %s." msgid "Error parsing %s." msgstr "Błędy analizowania %s." -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1857 msgid "Align with Selection" msgstr "Wyrównaj do zaznaczenia" -#: src/diffuse/widgets.py:1846 +#: src/diffuse/widgets.py:1858 msgid "Isolate" msgstr "Oddziel" -#: src/diffuse/widgets.py:1847 +#: src/diffuse/widgets.py:1859 msgid "Merge Selection" msgstr "Scal Zaznaczenie" -#: src/diffuse/widgets.py:1853 +#: src/diffuse/widgets.py:1865 msgid "Select All" msgstr "Zaznacz Wszystko" -#: src/diffuse/widgets.py:1856 +#: src/diffuse/widgets.py:1868 msgid "Swap with Selected Pane" msgstr "Zamień z Zaznaczonym Oknem" -#~ msgid "Diffuse Merge Tool" -#~ msgstr "Diffuse Narzędzie Scalania" - #, python-format #~ msgid "Column %d" #~ msgstr "Kolumna%d" diff --git a/po/pt.po b/po/pt.po index 6fe8084..6ec5aaa 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-04 12:14-0400\n" +"POT-Creation-Date: 2022-10-23 19:48-0400\n" "PO-Revision-Date: 2022-04-04 12:19-0400\n" "Last-Translator: Pedro Albuquerque \n" "Language-Team: Português \n" @@ -55,27 +55,27 @@ msgstr "O Diffuse é uma ferramenta gráfica para unir e comparar ficheiros de t msgid "translator-credits" msgstr "Pedro Albuquerque " -#: src/diffuse/dialogs.py:83 +#: src/diffuse/dialogs.py:82 msgid "Encoding: " msgstr "Codificação: " -#: src/diffuse/dialogs.py:95 +#: src/diffuse/dialogs.py:94 msgid "Revision: " msgstr "Revisão: " -#: src/diffuse/dialogs.py:151 +#: src/diffuse/dialogs.py:156 msgid "Find..." msgstr "Localizar..." -#: src/diffuse/dialogs.py:159 +#: src/diffuse/dialogs.py:164 msgid "Search For: " msgstr "Procurar por: " -#: src/diffuse/dialogs.py:184 +#: src/diffuse/dialogs.py:189 msgid "Match Case" msgstr "Comparar maiúsculas" -#: src/diffuse/dialogs.py:189 +#: src/diffuse/dialogs.py:194 msgid "Search Backwards" msgstr "Procurar para trás" @@ -146,7 +146,7 @@ msgstr "" msgid "Error encoding to %s." msgstr "Erro ao codificar para %s." -#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #, python-format msgid "Error writing %s." msgstr "Erro ao excrever %s." @@ -508,19 +508,19 @@ msgstr "Desfazer" msgid "Redo" msgstr "Refazer" -#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 msgid "Cut" msgstr "Cortar" -#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 msgid "Copy" msgstr "Copiar" -#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 msgid "Paste" msgstr "Colar" -#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 msgid "Clear Edits" msgstr "Limpar edição" @@ -850,83 +850,83 @@ msgstr "Controlo de versões" msgid "Preferences" msgstr "Preferências" -#: src/diffuse/resources.py:238 src/diffuse/resources.py:242 -#: src/diffuse/resources.py:245 +#: src/diffuse/resources.py:242 src/diffuse/resources.py:246 +#: src/diffuse/resources.py:249 #, python-brace-format msgid "The key binding \"{key}\" is invalid" msgstr "" -#: src/diffuse/resources.py:372 +#: src/diffuse/resources.py:376 msgid "Imports must have one argument" msgstr "" -#: src/diffuse/resources.py:388 +#: src/diffuse/resources.py:392 msgid "Key bindings must have three arguments" msgstr "" -#: src/diffuse/resources.py:394 +#: src/diffuse/resources.py:398 msgid "Colors must have four arguments" msgstr "" -#: src/diffuse/resources.py:400 +#: src/diffuse/resources.py:404 msgid "Floats must have two arguments" msgstr "" -#: src/diffuse/resources.py:406 +#: src/diffuse/resources.py:410 msgid "Options must have two arguments" msgstr "" -#: src/diffuse/resources.py:409 +#: src/diffuse/resources.py:413 #, python-brace-format msgid "Option \"{option}\" is unknown" msgstr "" -#: src/diffuse/resources.py:416 +#: src/diffuse/resources.py:420 msgid "Strings must have two arguments" msgstr "" -#: src/diffuse/resources.py:427 +#: src/diffuse/resources.py:431 msgid "Syntaxes must have two or three arguments" msgstr "" -#: src/diffuse/resources.py:455 +#: src/diffuse/resources.py:459 msgid "Syntax patterns must have at least four arguments" msgstr "" -#: src/diffuse/resources.py:461 src/diffuse/resources.py:505 +#: src/diffuse/resources.py:465 src/diffuse/resources.py:509 #, python-brace-format msgid "Value \"{value}\" is unknown" msgstr "" -#: src/diffuse/resources.py:472 +#: src/diffuse/resources.py:476 msgid "Syntax files must have one or two arguments" msgstr "" -#: src/diffuse/resources.py:490 +#: src/diffuse/resources.py:494 msgid "Syntax magics must have at least one argument" msgstr "" -#: src/diffuse/resources.py:509 +#: src/diffuse/resources.py:513 #, python-brace-format msgid "Keyword \"{keyword}\" is unknown" msgstr "" -#: src/diffuse/resources.py:511 +#: src/diffuse/resources.py:515 #, fuzzy, python-brace-format msgid "Syntax error at line {line} of {file}" msgstr "Erro ao processar a linha {line} de {file}." -#: src/diffuse/resources.py:517 +#: src/diffuse/resources.py:521 #, fuzzy, python-brace-format msgid "Value error at line {line} of {file}" msgstr "Erro ao processar a linha {line} de {file}." -#: src/diffuse/resources.py:523 +#: src/diffuse/resources.py:527 #, fuzzy, python-brace-format msgid "Regex error at line {line} of {file}." msgstr "Erro ao processar a linha {line} de {file}." -#: src/diffuse/resources.py:526 +#: src/diffuse/resources.py:530 #, fuzzy, python-brace-format msgid "Unhandled error at line {line} of {file}." msgstr "Erro ao processar a linha {line} de {file}." @@ -945,60 +945,26 @@ msgstr "Erro ao analisar a revisão %s." msgid "Error parsing %s." msgstr "Erro ao analisar %s." -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1857 msgid "Align with Selection" msgstr "Alinhar com a selecção" -#: src/diffuse/widgets.py:1846 +#: src/diffuse/widgets.py:1858 msgid "Isolate" msgstr "Isolar" -#: src/diffuse/widgets.py:1847 +#: src/diffuse/widgets.py:1859 msgid "Merge Selection" msgstr "Unir selecção" -#: src/diffuse/widgets.py:1853 +#: src/diffuse/widgets.py:1865 msgid "Select All" msgstr "Seleccionar tudo" -#: src/diffuse/widgets.py:1856 +#: src/diffuse/widgets.py:1868 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" - #, python-format #~ msgid "Column %d" #~ msgstr "Coluna %d" diff --git a/po/pt_BR.po b/po/pt_BR.po index 716beb5..18d2ea7 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-04 12:14-0400\n" +"POT-Creation-Date: 2022-10-23 19:48-0400\n" "PO-Revision-Date: 2022-04-04 12:19-0400\n" "Last-Translator: Pedro Albuquerque \n" "Language-Team: Português do Brasil \n" @@ -39,8 +39,8 @@ msgid "" "Subversion, and SVK repositories." msgstr "" "O Diffuse é uma ferramenta gráfica para unificar e comparar arquivos de texto. " -"Também pode obter revisões para comparar arquivos de repositórios Bazaar, " -"CVS, Darcs, Git, Mercurial, Monotone, RCS. " +"Também pode obter revisões para comparar arquivos de repositórios Bazaar, CVS, " +"Darcs, Git, Mercurial, Monotone, RCS. " #: data/io.github.mightycreak.Diffuse.appdata.xml.in:21 msgid "Main window: diff between two files" @@ -59,27 +59,27 @@ msgstr "" msgid "translator-credits" msgstr "Pedro Albuquerque " -#: src/diffuse/dialogs.py:83 +#: src/diffuse/dialogs.py:82 msgid "Encoding: " msgstr "Codificação: " -#: src/diffuse/dialogs.py:95 +#: src/diffuse/dialogs.py:94 msgid "Revision: " msgstr "Revisão: " -#: src/diffuse/dialogs.py:151 +#: src/diffuse/dialogs.py:156 msgid "Find..." msgstr "Encontrar..." -#: src/diffuse/dialogs.py:159 +#: src/diffuse/dialogs.py:164 msgid "Search For: " msgstr "Procurar por: " -#: src/diffuse/dialogs.py:184 +#: src/diffuse/dialogs.py:189 msgid "Match Case" msgstr "Combinar maiúsculas" -#: src/diffuse/dialogs.py:189 +#: src/diffuse/dialogs.py:194 msgid "Search Backwards" msgstr "Procurar para trás" @@ -151,7 +151,7 @@ msgstr "" msgid "Error encoding to %s." msgstr "Erro ao codificar para %s." -#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #, python-format msgid "Error writing %s." msgstr "Erro ao salvar %s." @@ -513,19 +513,19 @@ msgstr "Desfazer" msgid "Redo" msgstr "Refazer" -#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 msgid "Cut" msgstr "Cortar" -#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 msgid "Copy" msgstr "Copiar" -#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 msgid "Paste" msgstr "Colar" -#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 msgid "Clear Edits" msgstr "Limpar edições" @@ -651,7 +651,6 @@ msgstr "" "É capaz de comparar um número arbitrário de arquivos lado-a-lado e dá a\n" "possibilidade de ajustar manualmente as linhas com edição directa.\n" "Também pode obter revisões de arquivos de vários VCSs para comparar e unificar.\n" - "Opções de ajuda:\n" " ( -h | -? | --help ) mostra esta ajuda\n" " ( -v | --version ) mostra informação da versão e direitos " @@ -853,83 +852,83 @@ msgstr "Controle de versões" msgid "Preferences" msgstr "Preferências" -#: src/diffuse/resources.py:238 src/diffuse/resources.py:242 -#: src/diffuse/resources.py:245 +#: src/diffuse/resources.py:242 src/diffuse/resources.py:246 +#: src/diffuse/resources.py:249 #, python-brace-format msgid "The key binding \"{key}\" is invalid" msgstr "A tecla de atalho \"{key}\" é desconhecida" -#: src/diffuse/resources.py:372 +#: src/diffuse/resources.py:376 msgid "Imports must have one argument" msgstr "Importações devem ter um argumento" -#: src/diffuse/resources.py:388 +#: src/diffuse/resources.py:392 msgid "Key bindings must have three arguments" msgstr "Teclas de atalho devem ter três argumentos" -#: src/diffuse/resources.py:394 +#: src/diffuse/resources.py:398 msgid "Colors must have four arguments" msgstr "Cores devem ter quatro argumentos" -#: src/diffuse/resources.py:400 +#: src/diffuse/resources.py:404 msgid "Floats must have two arguments" msgstr "Floats devem ter dois argumentos" -#: src/diffuse/resources.py:406 +#: src/diffuse/resources.py:410 msgid "Options must have two arguments" msgstr "Opções devem ter dois argumentos" -#: src/diffuse/resources.py:409 +#: src/diffuse/resources.py:413 #, python-brace-format msgid "Option \"{option}\" is unknown" msgstr "Opção \"{option}\" é desconhecida" -#: src/diffuse/resources.py:416 +#: src/diffuse/resources.py:420 msgid "Strings must have two arguments" msgstr "Sequências de caracteres devem ter dois argumentos" -#: src/diffuse/resources.py:427 +#: src/diffuse/resources.py:431 msgid "Syntaxes must have two or three arguments" msgstr "Sintaxes devem ter dois ou três argumentos" -#: src/diffuse/resources.py:455 +#: src/diffuse/resources.py:459 msgid "Syntax patterns must have at least four arguments" msgstr "Modelos de sintaxe devem ter pelo menos quatro argumentos" -#: src/diffuse/resources.py:461 src/diffuse/resources.py:505 +#: src/diffuse/resources.py:465 src/diffuse/resources.py:509 #, python-brace-format msgid "Value \"{value}\" is unknown" msgstr "Valor \"{value}\" é desconhecido" -#: src/diffuse/resources.py:472 +#: src/diffuse/resources.py:476 msgid "Syntax files must have one or two arguments" msgstr "Arquivos de sintaxe devem ter um ou dois argumentos" -#: src/diffuse/resources.py:490 +#: src/diffuse/resources.py:494 msgid "Syntax magics must have at least one argument" msgstr "Sintaxe deve ter pelo menos um argumento" -#: src/diffuse/resources.py:509 +#: src/diffuse/resources.py:513 #, python-brace-format msgid "Keyword \"{keyword}\" is unknown" msgstr "Palavra-chave \"{keyword}\" é desconhecida" -#: src/diffuse/resources.py:511 +#: src/diffuse/resources.py:515 #, fuzzy, python-brace-format msgid "Syntax error at line {line} of {file}" msgstr "Erro da sintaxe na linha {line} de {file}." -#: src/diffuse/resources.py:517 +#: src/diffuse/resources.py:521 #, fuzzy, python-brace-format msgid "Value error at line {line} of {file}" msgstr "Erro do valor na linha {line} de {file}." -#: src/diffuse/resources.py:523 +#: src/diffuse/resources.py:527 #, fuzzy, python-brace-format msgid "Regex error at line {line} of {file}." msgstr "Erro do regex na linha {line} de {file}." -#: src/diffuse/resources.py:526 +#: src/diffuse/resources.py:530 #, fuzzy, python-brace-format msgid "Unhandled error at line {line} of {file}." msgstr "Erro incomum na linha {line} de {file}." @@ -948,61 +947,26 @@ msgstr "Erro ao analisar a revisão %s." msgid "Error parsing %s." msgstr "Erro ao analisar %s." -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1857 msgid "Align with Selection" msgstr "Alinhar com a seleção" -#: src/diffuse/widgets.py:1846 +#: src/diffuse/widgets.py:1858 msgid "Isolate" msgstr "Isolar" -#: src/diffuse/widgets.py:1847 +#: src/diffuse/widgets.py:1859 msgid "Merge Selection" msgstr "Unir seleção" -#: src/diffuse/widgets.py:1853 +#: src/diffuse/widgets.py:1865 msgid "Select All" msgstr "Selecionar tudo" -#: src/diffuse/widgets.py:1856 +#: src/diffuse/widgets.py:1868 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" - #, python-format #~ msgid "Column %d" #~ msgstr "Coluna %d" diff --git a/po/ru.po b/po/ru.po index 9d4678c..9def2f4 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-04 12:14-0400\n" +"POT-Creation-Date: 2022-10-23 19:48-0400\n" "PO-Revision-Date: 2022-04-04 12:19-0400\n" "Last-Translator: Oleg Pakhtusov \n" "Language-Team: Russian \n" @@ -55,27 +55,27 @@ msgstr "" msgid "translator-credits" msgstr "v.01 О.Ю.Пахтусов (Oleg Pakhtusov) " -#: src/diffuse/dialogs.py:83 +#: src/diffuse/dialogs.py:82 msgid "Encoding: " msgstr "Кодировка: " -#: src/diffuse/dialogs.py:95 +#: src/diffuse/dialogs.py:94 msgid "Revision: " msgstr "Ревизия: " -#: src/diffuse/dialogs.py:151 +#: src/diffuse/dialogs.py:156 msgid "Find..." msgstr "Найти..." -#: src/diffuse/dialogs.py:159 +#: src/diffuse/dialogs.py:164 msgid "Search For: " msgstr "Искать: " -#: src/diffuse/dialogs.py:184 +#: src/diffuse/dialogs.py:189 msgid "Match Case" msgstr "Учитывать регистр" -#: src/diffuse/dialogs.py:189 +#: src/diffuse/dialogs.py:194 msgid "Search Backwards" msgstr "Поиск в обратном направлении" @@ -146,7 +146,7 @@ msgstr "" msgid "Error encoding to %s." msgstr "Ошибка кодирования в %s." -#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #, python-format msgid "Error writing %s." msgstr "Ошибка записи %s." @@ -508,19 +508,19 @@ msgstr "Отменить" msgid "Redo" msgstr "Вернуть" -#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 msgid "Cut" msgstr "Вырезать" -#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 msgid "Copy" msgstr "Копировать" -#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 msgid "Paste" msgstr "Вставить" -#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 msgid "Clear Edits" msgstr "Очистить Правки" @@ -851,83 +851,83 @@ msgstr "Контроль Версий" msgid "Preferences" msgstr "Предпочтения" -#: src/diffuse/resources.py:238 src/diffuse/resources.py:242 -#: src/diffuse/resources.py:245 +#: src/diffuse/resources.py:242 src/diffuse/resources.py:246 +#: src/diffuse/resources.py:249 #, python-brace-format msgid "The key binding \"{key}\" is invalid" msgstr "" -#: src/diffuse/resources.py:372 +#: src/diffuse/resources.py:376 msgid "Imports must have one argument" msgstr "" -#: src/diffuse/resources.py:388 +#: src/diffuse/resources.py:392 msgid "Key bindings must have three arguments" msgstr "" -#: src/diffuse/resources.py:394 +#: src/diffuse/resources.py:398 msgid "Colors must have four arguments" msgstr "" -#: src/diffuse/resources.py:400 +#: src/diffuse/resources.py:404 msgid "Floats must have two arguments" msgstr "" -#: src/diffuse/resources.py:406 +#: src/diffuse/resources.py:410 msgid "Options must have two arguments" msgstr "" -#: src/diffuse/resources.py:409 +#: src/diffuse/resources.py:413 #, python-brace-format msgid "Option \"{option}\" is unknown" msgstr "" -#: src/diffuse/resources.py:416 +#: src/diffuse/resources.py:420 msgid "Strings must have two arguments" msgstr "" -#: src/diffuse/resources.py:427 +#: src/diffuse/resources.py:431 msgid "Syntaxes must have two or three arguments" msgstr "" -#: src/diffuse/resources.py:455 +#: src/diffuse/resources.py:459 msgid "Syntax patterns must have at least four arguments" msgstr "" -#: src/diffuse/resources.py:461 src/diffuse/resources.py:505 +#: src/diffuse/resources.py:465 src/diffuse/resources.py:509 #, python-brace-format msgid "Value \"{value}\" is unknown" msgstr "" -#: src/diffuse/resources.py:472 +#: src/diffuse/resources.py:476 msgid "Syntax files must have one or two arguments" msgstr "" -#: src/diffuse/resources.py:490 +#: src/diffuse/resources.py:494 msgid "Syntax magics must have at least one argument" msgstr "" -#: src/diffuse/resources.py:509 +#: src/diffuse/resources.py:513 #, python-brace-format msgid "Keyword \"{keyword}\" is unknown" msgstr "" -#: src/diffuse/resources.py:511 +#: src/diffuse/resources.py:515 #, fuzzy, python-brace-format msgid "Syntax error at line {line} of {file}" msgstr "Ошибка обработки строки {line} из {file}." -#: src/diffuse/resources.py:517 +#: src/diffuse/resources.py:521 #, fuzzy, python-brace-format msgid "Value error at line {line} of {file}" msgstr "Ошибка обработки строки {line} из {file}." -#: src/diffuse/resources.py:523 +#: src/diffuse/resources.py:527 #, fuzzy, python-brace-format msgid "Regex error at line {line} of {file}." msgstr "Ошибка обработки строки {line} из {file}." -#: src/diffuse/resources.py:526 +#: src/diffuse/resources.py:530 #, fuzzy, python-brace-format msgid "Unhandled error at line {line} of {file}." msgstr "Ошибка обработки строки {line} из {file}." @@ -946,61 +946,26 @@ msgstr "Ошибка анализа ревизии %s." msgid "Error parsing %s." msgstr "Ошибка анализа %s." -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1857 msgid "Align with Selection" msgstr "Выровнять с Выборкой" -#: src/diffuse/widgets.py:1846 +#: src/diffuse/widgets.py:1858 msgid "Isolate" msgstr "Изолировать" -#: src/diffuse/widgets.py:1847 +#: src/diffuse/widgets.py:1859 msgid "Merge Selection" msgstr "Объединить Выборку" -#: src/diffuse/widgets.py:1853 +#: src/diffuse/widgets.py:1865 msgid "Select All" msgstr "Выбрать Все" -#: src/diffuse/widgets.py:1856 +#: src/diffuse/widgets.py:1868 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 Инструмент Слияния" - #, python-format #~ msgid "Column %d" #~ msgstr "Столбец %d" diff --git a/po/sv.po b/po/sv.po index ca248e9..3fdeeff 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: 2022-04-04 12:14-0400\n" +"POT-Creation-Date: 2022-10-23 19:48-0400\n" "PO-Revision-Date: 2021-01-17 22:14+0100\n" "Last-Translator: Åke Engelbrektson \n" "Language-Team: Svenska Språkfiler \n" @@ -51,27 +51,27 @@ 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:83 +#: src/diffuse/dialogs.py:82 msgid "Encoding: " msgstr "Teckentabell: " -#: src/diffuse/dialogs.py:95 +#: src/diffuse/dialogs.py:94 msgid "Revision: " msgstr "Revision: " -#: src/diffuse/dialogs.py:151 +#: src/diffuse/dialogs.py:156 msgid "Find..." msgstr "Sök..." -#: src/diffuse/dialogs.py:159 +#: src/diffuse/dialogs.py:164 msgid "Search For: " msgstr "Sök efter: " -#: src/diffuse/dialogs.py:184 +#: src/diffuse/dialogs.py:189 msgid "Match Case" msgstr "Skiftlägeskänslig" -#: src/diffuse/dialogs.py:189 +#: src/diffuse/dialogs.py:194 msgid "Search Backwards" msgstr "Sök bakifrån" @@ -142,7 +142,7 @@ msgstr "" msgid "Error encoding to %s." msgstr "Fel vid kodning till %s." -#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #, python-format msgid "Error writing %s." msgstr "Fel vid skrivning av %s." @@ -502,19 +502,19 @@ msgstr "Ångra" msgid "Redo" msgstr "Upprepa" -#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 msgid "Cut" msgstr "Klipp ut" -#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 msgid "Copy" msgstr "Kopiera" -#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 msgid "Paste" msgstr "Klistra in" -#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 msgid "Clear Edits" msgstr "Rensa bort ändringar" @@ -841,83 +841,83 @@ msgstr "Versionskontroll" msgid "Preferences" msgstr "Inställningar" -#: src/diffuse/resources.py:238 src/diffuse/resources.py:242 -#: src/diffuse/resources.py:245 +#: src/diffuse/resources.py:242 src/diffuse/resources.py:246 +#: src/diffuse/resources.py:249 #, python-brace-format msgid "The key binding \"{key}\" is invalid" msgstr "" -#: src/diffuse/resources.py:372 +#: src/diffuse/resources.py:376 msgid "Imports must have one argument" msgstr "" -#: src/diffuse/resources.py:388 +#: src/diffuse/resources.py:392 msgid "Key bindings must have three arguments" msgstr "" -#: src/diffuse/resources.py:394 +#: src/diffuse/resources.py:398 msgid "Colors must have four arguments" msgstr "" -#: src/diffuse/resources.py:400 +#: src/diffuse/resources.py:404 msgid "Floats must have two arguments" msgstr "" -#: src/diffuse/resources.py:406 +#: src/diffuse/resources.py:410 msgid "Options must have two arguments" msgstr "" -#: src/diffuse/resources.py:409 +#: src/diffuse/resources.py:413 #, python-brace-format msgid "Option \"{option}\" is unknown" msgstr "" -#: src/diffuse/resources.py:416 +#: src/diffuse/resources.py:420 msgid "Strings must have two arguments" msgstr "" -#: src/diffuse/resources.py:427 +#: src/diffuse/resources.py:431 msgid "Syntaxes must have two or three arguments" msgstr "" -#: src/diffuse/resources.py:455 +#: src/diffuse/resources.py:459 msgid "Syntax patterns must have at least four arguments" msgstr "" -#: src/diffuse/resources.py:461 src/diffuse/resources.py:505 +#: src/diffuse/resources.py:465 src/diffuse/resources.py:509 #, python-brace-format msgid "Value \"{value}\" is unknown" msgstr "" -#: src/diffuse/resources.py:472 +#: src/diffuse/resources.py:476 msgid "Syntax files must have one or two arguments" msgstr "" -#: src/diffuse/resources.py:490 +#: src/diffuse/resources.py:494 msgid "Syntax magics must have at least one argument" msgstr "" -#: src/diffuse/resources.py:509 +#: src/diffuse/resources.py:513 #, python-brace-format msgid "Keyword \"{keyword}\" is unknown" msgstr "" -#: src/diffuse/resources.py:511 +#: src/diffuse/resources.py:515 #, fuzzy, python-brace-format msgid "Syntax error at line {line} of {file}" msgstr "Fel vid bearbetning av rad {line} i {file}." -#: src/diffuse/resources.py:517 +#: src/diffuse/resources.py:521 #, fuzzy, python-brace-format msgid "Value error at line {line} of {file}" msgstr "Fel vid bearbetning av rad {line} i {file}." -#: src/diffuse/resources.py:523 +#: src/diffuse/resources.py:527 #, fuzzy, python-brace-format msgid "Regex error at line {line} of {file}." msgstr "Fel vid bearbetning av rad {line} i {file}." -#: src/diffuse/resources.py:526 +#: src/diffuse/resources.py:530 #, fuzzy, python-brace-format msgid "Unhandled error at line {line} of {file}." msgstr "Fel vid bearbetning av rad {line} i {file}." @@ -936,59 +936,25 @@ msgstr "Fel vid tolkning av revision %s." msgid "Error parsing %s." msgstr "Fel vid tolkning av %s." -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1857 msgid "Align with Selection" msgstr "Justera till markerat" -#: src/diffuse/widgets.py:1846 +#: src/diffuse/widgets.py:1858 msgid "Isolate" msgstr "Isolera" -#: src/diffuse/widgets.py:1847 +#: src/diffuse/widgets.py:1859 msgid "Merge Selection" msgstr "Sammanfoga markerat" -#: src/diffuse/widgets.py:1853 +#: src/diffuse/widgets.py:1865 msgid "Select All" msgstr "Markera alla" -#: src/diffuse/widgets.py:1856 +#: src/diffuse/widgets.py:1868 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" - #~ msgid "Column %d" #~ msgstr "Kolumn %d" diff --git a/po/th.po b/po/th.po index 72c965d..08c63b7 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: 2022-04-04 12:14-0400\n" +"POT-Creation-Date: 2022-10-23 19:48-0400\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: Akom Chotiphantawanon \n" "Language-Team: Thai \n" @@ -51,27 +51,27 @@ msgstr "Diffuse เป็นเครื่องมือแบบกราฟ msgid "translator-credits" msgstr "Akom Chotiphantawanon " -#: src/diffuse/dialogs.py:83 +#: src/diffuse/dialogs.py:82 msgid "Encoding: " msgstr "รหัสอักขระ: " -#: src/diffuse/dialogs.py:95 +#: src/diffuse/dialogs.py:94 msgid "Revision: " msgstr "ฉบับแก้ไข: " -#: src/diffuse/dialogs.py:151 +#: src/diffuse/dialogs.py:156 msgid "Find..." msgstr "หา..." -#: src/diffuse/dialogs.py:159 +#: src/diffuse/dialogs.py:164 msgid "Search For: " msgstr "ค้นหา: " -#: src/diffuse/dialogs.py:184 +#: src/diffuse/dialogs.py:189 msgid "Match Case" msgstr "ตัวพิมพ์ใหญ่-เล็กตรงกัน" -#: src/diffuse/dialogs.py:189 +#: src/diffuse/dialogs.py:194 msgid "Search Backwards" msgstr "ค้นถอยหลัง" @@ -142,7 +142,7 @@ msgstr "" msgid "Error encoding to %s." msgstr "เกิดข้อผิดพลาดขณะลงรหัส %s" -#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #, python-format msgid "Error writing %s." msgstr "เกิดข้อผิดพลาดขณะเขียน %s" @@ -500,19 +500,19 @@ msgstr "เรียกคืน" msgid "Redo" msgstr "ทำซ้ำ" -#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 msgid "Cut" msgstr "ตัด" -#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 msgid "Copy" msgstr "คัดลอก" -#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 msgid "Paste" msgstr "แปะ" -#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 msgid "Clear Edits" msgstr "ล้างการแก้ไข" @@ -837,83 +837,83 @@ msgstr "การควบคุมรุ่น" msgid "Preferences" msgstr "ปรับแต่ง" -#: src/diffuse/resources.py:238 src/diffuse/resources.py:242 -#: src/diffuse/resources.py:245 +#: src/diffuse/resources.py:242 src/diffuse/resources.py:246 +#: src/diffuse/resources.py:249 #, python-brace-format msgid "The key binding \"{key}\" is invalid" msgstr "" -#: src/diffuse/resources.py:372 +#: src/diffuse/resources.py:376 msgid "Imports must have one argument" msgstr "" -#: src/diffuse/resources.py:388 +#: src/diffuse/resources.py:392 msgid "Key bindings must have three arguments" msgstr "" -#: src/diffuse/resources.py:394 +#: src/diffuse/resources.py:398 msgid "Colors must have four arguments" msgstr "" -#: src/diffuse/resources.py:400 +#: src/diffuse/resources.py:404 msgid "Floats must have two arguments" msgstr "" -#: src/diffuse/resources.py:406 +#: src/diffuse/resources.py:410 msgid "Options must have two arguments" msgstr "" -#: src/diffuse/resources.py:409 +#: src/diffuse/resources.py:413 #, python-brace-format msgid "Option \"{option}\" is unknown" msgstr "" -#: src/diffuse/resources.py:416 +#: src/diffuse/resources.py:420 msgid "Strings must have two arguments" msgstr "" -#: src/diffuse/resources.py:427 +#: src/diffuse/resources.py:431 msgid "Syntaxes must have two or three arguments" msgstr "" -#: src/diffuse/resources.py:455 +#: src/diffuse/resources.py:459 msgid "Syntax patterns must have at least four arguments" msgstr "" -#: src/diffuse/resources.py:461 src/diffuse/resources.py:505 +#: src/diffuse/resources.py:465 src/diffuse/resources.py:509 #, python-brace-format msgid "Value \"{value}\" is unknown" msgstr "" -#: src/diffuse/resources.py:472 +#: src/diffuse/resources.py:476 msgid "Syntax files must have one or two arguments" msgstr "" -#: src/diffuse/resources.py:490 +#: src/diffuse/resources.py:494 msgid "Syntax magics must have at least one argument" msgstr "" -#: src/diffuse/resources.py:509 +#: src/diffuse/resources.py:513 #, python-brace-format msgid "Keyword \"{keyword}\" is unknown" msgstr "" -#: src/diffuse/resources.py:511 +#: src/diffuse/resources.py:515 #, fuzzy, python-brace-format msgid "Syntax error at line {line} of {file}" msgstr "เกิดข้อผิดพลาดขณะประมวลผลบรรทัดที่ {line} ของ {file}" -#: src/diffuse/resources.py:517 +#: src/diffuse/resources.py:521 #, fuzzy, python-brace-format msgid "Value error at line {line} of {file}" msgstr "เกิดข้อผิดพลาดขณะประมวลผลบรรทัดที่ {line} ของ {file}" -#: src/diffuse/resources.py:523 +#: src/diffuse/resources.py:527 #, fuzzy, python-brace-format msgid "Regex error at line {line} of {file}." msgstr "เกิดข้อผิดพลาดขณะประมวลผลบรรทัดที่ {line} ของ {file}" -#: src/diffuse/resources.py:526 +#: src/diffuse/resources.py:530 #, fuzzy, python-brace-format msgid "Unhandled error at line {line} of {file}." msgstr "เกิดข้อผิดพลาดขณะประมวลผลบรรทัดที่ {line} ของ {file}" @@ -932,59 +932,26 @@ msgstr "เกิดข้อผิดพลาดขณะแจงฉบับ msgid "Error parsing %s." msgstr "เกิดข้อผิดพลาดขณะแจง %s" -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1857 msgid "Align with Selection" msgstr "เรียงตรงกับบรรทัดที่เลือก" -#: src/diffuse/widgets.py:1846 +#: src/diffuse/widgets.py:1858 msgid "Isolate" msgstr "แยก" -#: src/diffuse/widgets.py:1847 +#: src/diffuse/widgets.py:1859 msgid "Merge Selection" msgstr "ผสานบรรทัดที่เลือก" -#: src/diffuse/widgets.py:1853 +#: src/diffuse/widgets.py:1865 msgid "Select All" msgstr "เลือกทั้งหมด" -#: src/diffuse/widgets.py:1856 +#: src/diffuse/widgets.py:1868 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 - เครื่องมือผสานแฟ้ม" - #, python-format #~ msgid "Column %d" #~ msgstr "คอลัมน์ %d" diff --git a/po/zh_CN.po b/po/zh_CN.po index 8f1330d..2d4a2a2 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: 2022-04-04 12:14-0400\n" +"POT-Creation-Date: 2022-10-23 19:48-0400\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: \n" "Language-Team: Chinese (simplified)\n" @@ -50,27 +50,27 @@ msgstr "Diffuse是一个合并和比较文本文件的图形化程序。" msgid "translator-credits" msgstr "Liu Hao " -#: src/diffuse/dialogs.py:83 +#: src/diffuse/dialogs.py:82 msgid "Encoding: " msgstr "编码：" -#: src/diffuse/dialogs.py:95 +#: src/diffuse/dialogs.py:94 msgid "Revision: " msgstr "修订：" -#: src/diffuse/dialogs.py:151 +#: src/diffuse/dialogs.py:156 msgid "Find..." msgstr "查找..." -#: src/diffuse/dialogs.py:159 +#: src/diffuse/dialogs.py:164 msgid "Search For: " msgstr "搜索：" -#: src/diffuse/dialogs.py:184 +#: src/diffuse/dialogs.py:189 msgid "Match Case" msgstr "符合大小写" -#: src/diffuse/dialogs.py:189 +#: src/diffuse/dialogs.py:194 msgid "Search Backwards" msgstr "反向搜索" @@ -139,7 +139,7 @@ msgstr "文件%s打开后被其他进程更改过了，如果保存，其他程 msgid "Error encoding to %s." msgstr "无法编码为%s。" -#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #, python-format msgid "Error writing %s." msgstr "无法写入%s" @@ -497,19 +497,19 @@ msgstr "恢复" msgid "Redo" msgstr "重做" -#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 msgid "Cut" msgstr "剪切" -#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 msgid "Copy" msgstr "复制" -#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 msgid "Paste" msgstr "粘贴" -#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 msgid "Clear Edits" msgstr "取消编辑" @@ -834,83 +834,83 @@ msgstr "版本控制" msgid "Preferences" msgstr "首选项" -#: src/diffuse/resources.py:238 src/diffuse/resources.py:242 -#: src/diffuse/resources.py:245 +#: src/diffuse/resources.py:242 src/diffuse/resources.py:246 +#: src/diffuse/resources.py:249 #, python-brace-format msgid "The key binding \"{key}\" is invalid" msgstr "" -#: src/diffuse/resources.py:372 +#: src/diffuse/resources.py:376 msgid "Imports must have one argument" msgstr "" -#: src/diffuse/resources.py:388 +#: src/diffuse/resources.py:392 msgid "Key bindings must have three arguments" msgstr "" -#: src/diffuse/resources.py:394 +#: src/diffuse/resources.py:398 msgid "Colors must have four arguments" msgstr "" -#: src/diffuse/resources.py:400 +#: src/diffuse/resources.py:404 msgid "Floats must have two arguments" msgstr "" -#: src/diffuse/resources.py:406 +#: src/diffuse/resources.py:410 msgid "Options must have two arguments" msgstr "" -#: src/diffuse/resources.py:409 +#: src/diffuse/resources.py:413 #, python-brace-format msgid "Option \"{option}\" is unknown" msgstr "" -#: src/diffuse/resources.py:416 +#: src/diffuse/resources.py:420 msgid "Strings must have two arguments" msgstr "" -#: src/diffuse/resources.py:427 +#: src/diffuse/resources.py:431 msgid "Syntaxes must have two or three arguments" msgstr "" -#: src/diffuse/resources.py:455 +#: src/diffuse/resources.py:459 msgid "Syntax patterns must have at least four arguments" msgstr "" -#: src/diffuse/resources.py:461 src/diffuse/resources.py:505 +#: src/diffuse/resources.py:465 src/diffuse/resources.py:509 #, python-brace-format msgid "Value \"{value}\" is unknown" msgstr "" -#: src/diffuse/resources.py:472 +#: src/diffuse/resources.py:476 msgid "Syntax files must have one or two arguments" msgstr "" -#: src/diffuse/resources.py:490 +#: src/diffuse/resources.py:494 msgid "Syntax magics must have at least one argument" msgstr "" -#: src/diffuse/resources.py:509 +#: src/diffuse/resources.py:513 #, python-brace-format msgid "Keyword \"{keyword}\" is unknown" msgstr "" -#: src/diffuse/resources.py:511 +#: src/diffuse/resources.py:515 #, fuzzy, python-brace-format msgid "Syntax error at line {line} of {file}" msgstr "处理到文件{file}的{line}行时出错。" -#: src/diffuse/resources.py:517 +#: src/diffuse/resources.py:521 #, fuzzy, python-brace-format msgid "Value error at line {line} of {file}" msgstr "处理到文件{file}的{line}行时出错。" -#: src/diffuse/resources.py:523 +#: src/diffuse/resources.py:527 #, fuzzy, python-brace-format msgid "Regex error at line {line} of {file}." msgstr "处理到文件{file}的{line}行时出错。" -#: src/diffuse/resources.py:526 +#: src/diffuse/resources.py:530 #, fuzzy, python-brace-format msgid "Unhandled error at line {line} of {file}." msgstr "处理到文件{file}的{line}行时出错。" @@ -929,29 +929,26 @@ msgstr "无法解析修订版本%s。" msgid "Error parsing %s." msgstr "无法解析%s。" -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1857 msgid "Align with Selection" msgstr "向选中的对齐" -#: src/diffuse/widgets.py:1846 +#: src/diffuse/widgets.py:1858 msgid "Isolate" msgstr "分离" -#: src/diffuse/widgets.py:1847 +#: src/diffuse/widgets.py:1859 msgid "Merge Selection" msgstr "合并选择之处" -#: src/diffuse/widgets.py:1853 +#: src/diffuse/widgets.py:1865 msgid "Select All" msgstr "选择所有" -#: src/diffuse/widgets.py:1856 +#: src/diffuse/widgets.py:1868 msgid "Swap with Selected Pane" msgstr "交换选中的窗格" -#~ msgid "Diffuse Merge Tool" -#~ msgstr "Diffuse 比较合并工具" - #, python-format #~ msgid "Column %d" #~ msgstr "%d列" diff --git a/po/zh_TW.po b/po/zh_TW.po index 20b7ac8..fb436b8 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: 2022-04-04 12:14-0400\n" +"POT-Creation-Date: 2022-10-23 19:48-0400\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: Wei-Lun Chao \n" "Language-Team: Chinese (traditional) \n" @@ -54,27 +54,27 @@ msgstr "" "紀明村 \n" "趙惟倫 " -#: src/diffuse/dialogs.py:83 +#: src/diffuse/dialogs.py:82 msgid "Encoding: " msgstr "編碼：" -#: src/diffuse/dialogs.py:95 +#: src/diffuse/dialogs.py:94 msgid "Revision: " msgstr "修訂：" -#: src/diffuse/dialogs.py:151 +#: src/diffuse/dialogs.py:156 msgid "Find..." msgstr "搜尋…" -#: src/diffuse/dialogs.py:159 +#: src/diffuse/dialogs.py:164 msgid "Search For: " msgstr "搜尋：" -#: src/diffuse/dialogs.py:184 +#: src/diffuse/dialogs.py:189 msgid "Match Case" msgstr "符合大小寫" -#: src/diffuse/dialogs.py:189 +#: src/diffuse/dialogs.py:194 msgid "Search Backwards" msgstr "反向搜尋" @@ -144,7 +144,7 @@ msgstr "" msgid "Error encoding to %s." msgstr "無法編碼為 %s。" -#: src/diffuse/main.py:592 src/diffuse/preferences.py:299 +#: src/diffuse/main.py:592 src/diffuse/preferences.py:300 #, python-format msgid "Error writing %s." msgstr "無法寫入 %s" @@ -502,19 +502,19 @@ msgstr "復原" msgid "Redo" msgstr "重做" -#: src/diffuse/main.py:928 src/diffuse/widgets.py:1849 +#: src/diffuse/main.py:928 src/diffuse/widgets.py:1861 msgid "Cut" msgstr "剪下" -#: src/diffuse/main.py:929 src/diffuse/widgets.py:1850 +#: src/diffuse/main.py:929 src/diffuse/widgets.py:1862 msgid "Copy" msgstr "複製" -#: src/diffuse/main.py:930 src/diffuse/widgets.py:1851 +#: src/diffuse/main.py:930 src/diffuse/widgets.py:1863 msgid "Paste" msgstr "貼上" -#: src/diffuse/main.py:931 src/diffuse/widgets.py:1854 +#: src/diffuse/main.py:931 src/diffuse/widgets.py:1866 msgid "Clear Edits" msgstr "取消編輯" @@ -839,83 +839,83 @@ msgstr "版本控制" msgid "Preferences" msgstr "選項" -#: src/diffuse/resources.py:238 src/diffuse/resources.py:242 -#: src/diffuse/resources.py:245 +#: src/diffuse/resources.py:242 src/diffuse/resources.py:246 +#: src/diffuse/resources.py:249 #, python-brace-format msgid "The key binding \"{key}\" is invalid" msgstr "" -#: src/diffuse/resources.py:372 +#: src/diffuse/resources.py:376 msgid "Imports must have one argument" msgstr "" -#: src/diffuse/resources.py:388 +#: src/diffuse/resources.py:392 msgid "Key bindings must have three arguments" msgstr "" -#: src/diffuse/resources.py:394 +#: src/diffuse/resources.py:398 msgid "Colors must have four arguments" msgstr "" -#: src/diffuse/resources.py:400 +#: src/diffuse/resources.py:404 msgid "Floats must have two arguments" msgstr "" -#: src/diffuse/resources.py:406 +#: src/diffuse/resources.py:410 msgid "Options must have two arguments" msgstr "" -#: src/diffuse/resources.py:409 +#: src/diffuse/resources.py:413 #, python-brace-format msgid "Option \"{option}\" is unknown" msgstr "" -#: src/diffuse/resources.py:416 +#: src/diffuse/resources.py:420 msgid "Strings must have two arguments" msgstr "" -#: src/diffuse/resources.py:427 +#: src/diffuse/resources.py:431 msgid "Syntaxes must have two or three arguments" msgstr "" -#: src/diffuse/resources.py:455 +#: src/diffuse/resources.py:459 msgid "Syntax patterns must have at least four arguments" msgstr "" -#: src/diffuse/resources.py:461 src/diffuse/resources.py:505 +#: src/diffuse/resources.py:465 src/diffuse/resources.py:509 #, python-brace-format msgid "Value \"{value}\" is unknown" msgstr "" -#: src/diffuse/resources.py:472 +#: src/diffuse/resources.py:476 msgid "Syntax files must have one or two arguments" msgstr "" -#: src/diffuse/resources.py:490 +#: src/diffuse/resources.py:494 msgid "Syntax magics must have at least one argument" msgstr "" -#: src/diffuse/resources.py:509 +#: src/diffuse/resources.py:513 #, python-brace-format msgid "Keyword \"{keyword}\" is unknown" msgstr "" -#: src/diffuse/resources.py:511 +#: src/diffuse/resources.py:515 #, fuzzy, python-brace-format msgid "Syntax error at line {line} of {file}" msgstr "處理到檔案 {file} 的第 {line} 列時出錯。" -#: src/diffuse/resources.py:517 +#: src/diffuse/resources.py:521 #, fuzzy, python-brace-format msgid "Value error at line {line} of {file}" msgstr "處理到檔案 {file} 的第 {line} 列時出錯。" -#: src/diffuse/resources.py:523 +#: src/diffuse/resources.py:527 #, fuzzy, python-brace-format msgid "Regex error at line {line} of {file}." msgstr "處理到檔案 {file} 的第 {line} 列時出錯。" -#: src/diffuse/resources.py:526 +#: src/diffuse/resources.py:530 #, fuzzy, python-brace-format msgid "Unhandled error at line {line} of {file}." msgstr "處理到檔案 {file} 的第 {line} 列時出錯。" @@ -934,57 +934,26 @@ msgstr "無法解析修訂版本 %s。" msgid "Error parsing %s." msgstr "無法解析 %s。" -#: src/diffuse/widgets.py:1845 +#: src/diffuse/widgets.py:1857 msgid "Align with Selection" msgstr "對齊選擇區域" -#: src/diffuse/widgets.py:1846 +#: src/diffuse/widgets.py:1858 msgid "Isolate" msgstr "分離" -#: src/diffuse/widgets.py:1847 +#: src/diffuse/widgets.py:1859 msgid "Merge Selection" msgstr "合併選擇區域" -#: src/diffuse/widgets.py:1853 +#: src/diffuse/widgets.py:1865 msgid "Select All" msgstr "全選" -#: src/diffuse/widgets.py:1856 +#: src/diffuse/widgets.py:1868 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 比較合併工具" - #, python-format #~ msgid "Column %d" #~ msgstr "第 %d 行"