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

Merge pull request #152 from MightyCreak/update-translations 

Update all translation files
This commit is contained in:
Creak 2022-04-04 12:25:51 -04:00 committed by GitHub
parent 41f6e1c9c7 dc2e445c77
commit a0225ff5ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 2921 additions and 2975 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

427
po/cs.po
View File

File diff suppressed because it is too large Load Diff

413
po/de.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: diffuse-svn\n" "Project-Id-Version: diffuse-svn\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-11-27 21:56-0500\n" "POT-Creation-Date: 2022-04-04 12:14-0400\n"
"PO-Revision-Date: 2021-01-26 04:29+0100\n" "PO-Revision-Date: 2021-01-26 04:29+0100\n"
"Last-Translator: Henri Menke <henrimenke4@aim.com>\n" "Last-Translator: Henri Menke <henrimenke4@aim.com>\n"
"Language-Team: German <henrimenke4@aim.com>\n" "Language-Team: German <henrimenke4@aim.com>\n"
@ -41,7 +41,7 @@ msgstr ""
msgid "Main window: diff between two files" msgid "Main window: diff between two files"
msgstr "" msgstr ""
#: src/diffuse/constants.py:24 #: src/diffuse/constants.py:25
msgid "Copyright" msgid "Copyright"
msgstr "Urheberrecht" msgstr "Urheberrecht"
@ -55,36 +55,6 @@ msgstr ""
msgid "translator-credits" msgid "translator-credits"
msgstr "Henri Menke <henrimenke4@aim.com>" msgstr "Henri Menke <henrimenke4@aim.com>"
#: src/diffuse/dialogs.py:49
#, fuzzy
msgid ""
"This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
"the Free Software Foundation; either version 2 of the License, or\n"
"(at your option) any later version.\n"
"\n"
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
"GNU General Public License for more details.\n"
"\n"
"You should have received a copy of the GNU General Public License along\n"
"with this program; if not, write to the Free Software Foundation, Inc.,\n"
"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
msgstr ""
"Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU "
"General Public License, wie von der Free Software Foundation veröffentlicht, "
"weitergeben und/oder modifizieren, entweder gemäß Version 3 der Lizenz oder (nach "
"Ihrer Option) jeder späteren Version.\n"
"\n"
"Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, daß es Ihnen von "
"Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite "
"Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. "
"Details finden Sie in der GNU General Public License.\n"
"\n"
"Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem "
"Programm erhalten haben. Falls nicht, siehe <http://www.gnu.org/licenses/>.\n"
#: src/diffuse/dialogs.py:83 #: src/diffuse/dialogs.py:83
msgid "Encoding: " msgid "Encoding: "
msgstr "Kodierung: " msgstr "Kodierung: "
@ -109,60 +79,60 @@ msgstr "Übereinstimmen von Groß- und Kleinschreibung"
msgid "Search Backwards" msgid "Search Backwards"
msgstr "Rückwärts suchen" msgstr "Rückwärts suchen"
#: src/diffuse/main.py:79 #: src/diffuse/main.py:85
msgid "Close Tab" msgid "Close Tab"
msgstr "Reiter schließen" msgstr "Reiter schließen"
#: src/diffuse/main.py:124 #: src/diffuse/main.py:132
msgid "Open File..." msgid "Open File..."
msgstr "Datei öffnen..." msgstr "Datei öffnen..."
#: src/diffuse/main.py:125 #: src/diffuse/main.py:133
msgid "Reload File" msgid "Reload File"
msgstr "Datei neu laden" msgstr "Datei neu laden"
#: src/diffuse/main.py:126 #: src/diffuse/main.py:134
msgid "Save File" msgid "Save File"
msgstr "Datei speichern" msgstr "Datei speichern"
#: src/diffuse/main.py:127 #: src/diffuse/main.py:135
msgid "Save File As..." msgid "Save File As..."
msgstr "Datei speichern unter..." msgstr "Datei speichern unter..."
#: src/diffuse/main.py:280 #: src/diffuse/main.py:288
msgid "Save changes before loading the new file?" msgid "Save changes before loading the new file?"
msgstr "Änderungen speichern vor dem Laden der neuen Datei?" msgstr "Änderungen speichern vor dem Laden der neuen Datei?"
#: src/diffuse/main.py:391 #: src/diffuse/main.py:399
#, python-format #, python-format
msgid "Error reading revision %(rev)s of %(file)s." msgid "Error reading revision %(rev)s of %(file)s."
msgstr "Fehler beim lesen der Revision %(rev)s von %(file)s." msgstr "Fehler beim lesen der Revision %(rev)s von %(file)s."
#: src/diffuse/main.py:394 src/diffuse/main.py:1849 #: src/diffuse/main.py:402 src/diffuse/main.py:1857
#, python-format #, python-format
msgid "Error reading %s." msgid "Error reading %s."
msgstr "Fehler beim Lesen von %s." msgstr "Fehler beim Lesen von %s."
#: src/diffuse/main.py:416 #: src/diffuse/main.py:424
msgid "Open File" msgid "Open File"
msgstr "Datei öffnen" msgstr "Datei öffnen"
#: src/diffuse/main.py:473 #: src/diffuse/main.py:481
#, python-format #, python-format
msgid "The file %s changed on disk. Do you want to reload the file?" msgid "The file %s changed on disk. Do you want to reload the file?"
msgstr "Die Datei %s wurde auf geändert. Wollen Sie die Datei neu laden?" msgstr "Die Datei %s wurde auf geändert. Wollen Sie die Datei neu laden?"
#: src/diffuse/main.py:499 #: src/diffuse/main.py:507
#, python-format #, python-format
msgid "Save %(title)s Pane %(pane)d" msgid "Save %(title)s Pane %(pane)d"
msgstr "Speichern %(title)s Fenster %(pane)d" msgstr "Speichern %(title)s Fenster %(pane)d"
#: src/diffuse/main.py:531 #: src/diffuse/main.py:539
#, python-format #, python-format
msgid "A file named %s already exists. Do you want to overwrite it?" msgid "A file named %s already exists. Do you want to overwrite it?"
msgstr "Eine Datei mit dem Namen %s existiert bereits. Überschreiben?" msgstr "Eine Datei mit dem Namen %s existiert bereits. Überschreiben?"
#: src/diffuse/main.py:538 #: src/diffuse/main.py:546
#, python-format #, python-format
msgid "" msgid ""
"The file %s has been modified by another process since reading it. If you save, " "The file %s has been modified by another process since reading it. If you save, "
@ -171,25 +141,25 @@ msgstr ""
"Die Datei %s wurde seit dem letzten Mal von einem anderen Prozess verändert. Wenn " "Die Datei %s wurde seit dem letzten Mal von einem anderen Prozess verändert. Wenn "
"Sie speichern werden alle externen Änderungen verloren gehen. Trotzdem Speichern?" "Sie speichern werden alle externen Änderungen verloren gehen. Trotzdem Speichern?"
#: src/diffuse/main.py:580 #: src/diffuse/main.py:588
#, python-format #, python-format
msgid "Error encoding to %s." msgid "Error encoding to %s."
msgstr "Fehler bei der Kodierung nach %s." msgstr "Fehler bei der Kodierung nach %s."
#: src/diffuse/main.py:584 src/diffuse/preferences.py:298 #: src/diffuse/main.py:592 src/diffuse/preferences.py:299
#, python-format #, python-format
msgid "Error writing %s." msgid "Error writing %s."
msgstr "Fehler beim Schreiben von %s." msgstr "Fehler beim Schreiben von %s."
#: src/diffuse/main.py:614 #: src/diffuse/main.py:622
msgid "Go To Line..." msgid "Go To Line..."
msgstr "Gehe zu Zeile..." msgstr "Gehe zu Zeile..."
#: src/diffuse/main.py:615 #: src/diffuse/main.py:623
msgid "Line Number: " msgid "Line Number: "
msgstr "Zeilennummer: " msgstr "Zeilennummer: "
#: src/diffuse/main.py:646 #: src/diffuse/main.py:654
msgid "" msgid ""
"Press the enter key or double click to edit. Press the space bar or use the RMB " "Press the enter key or double click to edit. Press the space bar or use the RMB "
"menu to manually align." "menu to manually align."
@ -197,11 +167,11 @@ msgstr ""
"Enter drücken, oder Doppelklicken zum editieren. Drücken Sie die Leertaste, oder " "Enter drücken, oder Doppelklicken zum editieren. Drücken Sie die Leertaste, oder "
"nutzen sie das RMB Menü zum manuellen Ausrichten." "nutzen sie das RMB Menü zum manuellen Ausrichten."
#: src/diffuse/main.py:650 #: src/diffuse/main.py:658
msgid "Press the escape key to finish editing." msgid "Press the escape key to finish editing."
msgstr "Drücken Sie die Escape Taste um die Bearbeitung zu beenden." msgstr "Drücken Sie die Escape Taste um die Bearbeitung zu beenden."
#: src/diffuse/main.py:653 #: src/diffuse/main.py:661
msgid "" msgid ""
"Select target line and press the space bar to align. Press the escape key to " "Select target line and press the space bar to align. Press the escape key to "
"cancel." "cancel."
@ -209,426 +179,426 @@ msgstr ""
"Zeile auswählen und Leertaste drücken zum Ausrichten. Drücken Sie die Escape " "Zeile auswählen und Leertaste drücken zum Ausrichten. Drücken Sie die Escape "
"Taste zum Abbrechen." "Taste zum Abbrechen."
#: src/diffuse/main.py:776 #: src/diffuse/main.py:784
msgid "_File" msgid "_File"
msgstr "_Datei" msgstr "_Datei"
#: src/diffuse/main.py:777 #: src/diffuse/main.py:785
msgid "_Open File..." msgid "_Open File..."
msgstr "_Öffne Datei..." msgstr "_Öffne Datei..."
#: src/diffuse/main.py:778 #: src/diffuse/main.py:786
msgid "Open File In New _Tab..." msgid "Open File In New _Tab..."
msgstr "Datei _in neuem Reiter öffnen..." msgstr "Datei _in neuem Reiter öffnen..."
#: src/diffuse/main.py:779 #: src/diffuse/main.py:787
msgid "Open _Modified Files..." msgid "Open _Modified Files..."
msgstr "_Bearbeitete Dateien öffnen..." msgstr "_Bearbeitete Dateien öffnen..."
#: src/diffuse/main.py:780 #: src/diffuse/main.py:788
msgid "Open Commi_t..." msgid "Open Commi_t..."
msgstr "Revi_sion öffnen..." msgstr "Revi_sion öffnen..."
#: src/diffuse/main.py:781 #: src/diffuse/main.py:789
msgid "_Reload File" msgid "_Reload File"
msgstr "Datei _neu laden" msgstr "Datei _neu laden"
#: src/diffuse/main.py:783 #: src/diffuse/main.py:791
msgid "_Save File" msgid "_Save File"
msgstr "Datei _speichern" msgstr "Datei _speichern"
#: src/diffuse/main.py:784 #: src/diffuse/main.py:792
msgid "Save File _As..." msgid "Save File _As..."
msgstr "Datei speichern _unter..." msgstr "Datei speichern _unter..."
#: src/diffuse/main.py:785 #: src/diffuse/main.py:793
msgid "Save A_ll" msgid "Save A_ll"
msgstr "_Alle speichern" msgstr "_Alle speichern"
#: src/diffuse/main.py:787 #: src/diffuse/main.py:795
msgid "New _2-Way File Merge" msgid "New _2-Way File Merge"
msgstr "Neues _2-Wege-Datei-Zusammenführen" msgstr "Neues _2-Wege-Datei-Zusammenführen"
#: src/diffuse/main.py:788 #: src/diffuse/main.py:796
msgid "New _3-Way File Merge" msgid "New _3-Way File Merge"
msgstr "Neues _3-Wege-Datei-Zusammenführen" msgstr "Neues _3-Wege-Datei-Zusammenführen"
#: src/diffuse/main.py:789 #: src/diffuse/main.py:797
msgid "New _N-Way File Merge..." msgid "New _N-Way File Merge..."
msgstr "Neues _N-Wege-Datei-Zusammenführen..." msgstr "Neues _N-Wege-Datei-Zusammenführen..."
#: src/diffuse/main.py:791 #: src/diffuse/main.py:799
msgid "_Close Tab" msgid "_Close Tab"
msgstr "_Reiter schließen" msgstr "_Reiter schließen"
#: src/diffuse/main.py:792 #: src/diffuse/main.py:800
msgid "_Undo Close Tab" msgid "_Undo Close Tab"
msgstr "_Reiter schließen rückgängig" msgstr "_Reiter schließen rückgängig"
#: src/diffuse/main.py:793 #: src/diffuse/main.py:801
msgid "_Quit" msgid "_Quit"
msgstr "_Beenden" msgstr "_Beenden"
#: src/diffuse/main.py:796 #: src/diffuse/main.py:804
msgid "_Edit" msgid "_Edit"
msgstr "_Bearbeiten" msgstr "_Bearbeiten"
#: src/diffuse/main.py:797 #: src/diffuse/main.py:805
msgid "_Undo" msgid "_Undo"
msgstr "_Rückgängig" msgstr "_Rückgängig"
#: src/diffuse/main.py:798 #: src/diffuse/main.py:806
msgid "_Redo" msgid "_Redo"
msgstr "_Wiederholen" msgstr "_Wiederholen"
#: src/diffuse/main.py:800 #: src/diffuse/main.py:808
msgid "Cu_t" msgid "Cu_t"
msgstr "_Ausschneiden" msgstr "_Ausschneiden"
#: src/diffuse/main.py:801 #: src/diffuse/main.py:809
msgid "_Copy" msgid "_Copy"
msgstr "_Kopieren" msgstr "_Kopieren"
#: src/diffuse/main.py:802 #: src/diffuse/main.py:810
msgid "_Paste" msgid "_Paste"
msgstr "_Einfügen" msgstr "_Einfügen"
#: src/diffuse/main.py:804 #: src/diffuse/main.py:812
msgid "Select _All" msgid "Select _All"
msgstr "_Alles auswählen" msgstr "_Alles auswählen"
#: src/diffuse/main.py:805 #: src/diffuse/main.py:813
msgid "C_lear Edits" msgid "C_lear Edits"
msgstr "Alle _Änderungen rückgängig" msgstr "Alle _Änderungen rückgängig"
#: src/diffuse/main.py:806 #: src/diffuse/main.py:814
msgid "_Dismiss All Edits" msgid "_Dismiss All Edits"
msgstr "Alle Än_derungen verwerfen" msgstr "Alle Än_derungen verwerfen"
#: src/diffuse/main.py:808 #: src/diffuse/main.py:816
msgid "_Find..." msgid "_Find..."
msgstr "_Suchen..." msgstr "_Suchen..."
#: src/diffuse/main.py:809 #: src/diffuse/main.py:817
msgid "Find _Next" msgid "Find _Next"
msgstr "_Nächstes suchen" msgstr "_Nächstes suchen"
#: src/diffuse/main.py:810 #: src/diffuse/main.py:818
msgid "Find Pre_vious" msgid "Find Pre_vious"
msgstr "_Rückwärts suchen" msgstr "_Rückwärts suchen"
#: src/diffuse/main.py:811 #: src/diffuse/main.py:819
msgid "_Go To Line..." msgid "_Go To Line..."
msgstr "_Gehe zu Zeile..." msgstr "_Gehe zu Zeile..."
#: src/diffuse/main.py:813 #: src/diffuse/main.py:821
msgid "Pr_eferences..." msgid "Pr_eferences..."
msgstr "_Einstellungen..." msgstr "_Einstellungen..."
#: src/diffuse/main.py:817 #: src/diffuse/main.py:825
msgid "None" msgid "None"
msgstr "Keine" msgstr "Keine"
#: src/diffuse/main.py:835 #: src/diffuse/main.py:843
msgid "_View" msgid "_View"
msgstr "_Ansicht" msgstr "_Ansicht"
#: src/diffuse/main.py:836 #: src/diffuse/main.py:844
msgid "_Syntax Highlighting" msgid "_Syntax Highlighting"
msgstr "_Syntax Hervorhebung" msgstr "_Syntax Hervorhebung"
#: src/diffuse/main.py:838 #: src/diffuse/main.py:846
msgid "Re_align All" msgid "Re_align All"
msgstr "Alle neu _ausrichten" msgstr "Alle neu _ausrichten"
#: src/diffuse/main.py:839 #: src/diffuse/main.py:847
msgid "_Isolate" msgid "_Isolate"
msgstr "_Isolieren" msgstr "_Isolieren"
#: src/diffuse/main.py:841 #: src/diffuse/main.py:849
msgid "_First Difference" msgid "_First Difference"
msgstr "_Erster Unterschied" msgstr "_Erster Unterschied"
#: src/diffuse/main.py:842 #: src/diffuse/main.py:850
msgid "_Previous Difference" msgid "_Previous Difference"
msgstr "_Voriger Unterschied" msgstr "_Voriger Unterschied"
#: src/diffuse/main.py:843 #: src/diffuse/main.py:851
msgid "_Next Difference" msgid "_Next Difference"
msgstr "_Nächster Unterschied" msgstr "_Nächster Unterschied"
#: src/diffuse/main.py:844 #: src/diffuse/main.py:852
msgid "_Last Difference" msgid "_Last Difference"
msgstr "_Letzter Unterschied" msgstr "_Letzter Unterschied"
#: src/diffuse/main.py:846 #: src/diffuse/main.py:854
msgid "Fir_st Tab" msgid "Fir_st Tab"
msgstr "Er_ster Reiter" msgstr "Er_ster Reiter"
#: src/diffuse/main.py:847 #: src/diffuse/main.py:855
msgid "Pre_vious Tab" msgid "Pre_vious Tab"
msgstr "V_origer Reiter" msgstr "V_origer Reiter"
#: src/diffuse/main.py:848 #: src/diffuse/main.py:856
msgid "Next _Tab" msgid "Next _Tab"
msgstr "N_ächster Reiter" msgstr "N_ächster Reiter"
#: src/diffuse/main.py:849 #: src/diffuse/main.py:857
msgid "Las_t Tab" msgid "Las_t Tab"
msgstr "Letz_ter Reiter" msgstr "Letz_ter Reiter"
#: src/diffuse/main.py:851 #: src/diffuse/main.py:859
msgid "Shift Pane _Right" msgid "Shift Pane _Right"
msgstr "Fenster nach _rechts verschieben" msgstr "Fenster nach _rechts verschieben"
#: src/diffuse/main.py:852 #: src/diffuse/main.py:860
msgid "Shift Pane _Left" msgid "Shift Pane _Left"
msgstr "Fenster nach _links verschieben" msgstr "Fenster nach _links verschieben"
#: src/diffuse/main.py:855 #: src/diffuse/main.py:863
msgid "F_ormat" msgid "F_ormat"
msgstr "F_ormat" msgstr "F_ormat"
#: src/diffuse/main.py:856 #: src/diffuse/main.py:864
msgid "Convert To _Upper Case" msgid "Convert To _Upper Case"
msgstr "In Großb_uchstaben konvertieren" msgstr "In Großb_uchstaben konvertieren"
#: src/diffuse/main.py:857 #: src/diffuse/main.py:865
msgid "Convert To _Lower Case" msgid "Convert To _Lower Case"
msgstr "In K_leinbuchstaben konvertieren" msgstr "In K_leinbuchstaben konvertieren"
#: src/diffuse/main.py:859 #: src/diffuse/main.py:867
msgid "Sort Lines In _Ascending Order" msgid "Sort Lines In _Ascending Order"
msgstr "Zeile in _aufsteigender Reihenfolge sortieren" msgstr "Zeile in _aufsteigender Reihenfolge sortieren"
#: src/diffuse/main.py:860 #: src/diffuse/main.py:868
msgid "Sort Lines In D_escending Order" msgid "Sort Lines In D_escending Order"
msgstr "Zeile in abst_eigender Reihenfolge sortieren" msgstr "Zeile in abst_eigender Reihenfolge sortieren"
#: src/diffuse/main.py:862 #: src/diffuse/main.py:870
msgid "Remove Trailing _White Space" msgid "Remove Trailing _White Space"
msgstr "Entferne angehängte _Leerzeichen" msgstr "Entferne angehängte _Leerzeichen"
#: src/diffuse/main.py:863 #: src/diffuse/main.py:871
msgid "Convert Tabs To _Spaces" msgid "Convert Tabs To _Spaces"
msgstr "Tabulatoren in Leer_zeichen konvertieren" msgstr "Tabulatoren in Leer_zeichen konvertieren"
#: src/diffuse/main.py:864 #: src/diffuse/main.py:872
msgid "Convert Leading Spaces To _Tabs" msgid "Convert Leading Spaces To _Tabs"
msgstr "Vorangestellte Leerzeichen in _Tabulatoren konvertieren" msgstr "Vorangestellte Leerzeichen in _Tabulatoren konvertieren"
#: src/diffuse/main.py:866 #: src/diffuse/main.py:874
msgid "_Increase Indenting" msgid "_Increase Indenting"
msgstr "Einzug er_höhen" msgstr "Einzug er_höhen"
#: src/diffuse/main.py:867 #: src/diffuse/main.py:875
msgid "De_crease Indenting" msgid "De_crease Indenting"
msgstr "Einzug _vermindern" msgstr "Einzug _vermindern"
#: src/diffuse/main.py:869 #: src/diffuse/main.py:877
msgid "Convert To _DOS Format" msgid "Convert To _DOS Format"
msgstr "Ins _DOS Format konvertieren" msgstr "Ins _DOS Format konvertieren"
#: src/diffuse/main.py:870 #: src/diffuse/main.py:878
msgid "Convert To _Mac Format" msgid "Convert To _Mac Format"
msgstr "Ins _Mac Format konvertieren" msgstr "Ins _Mac Format konvertieren"
#: src/diffuse/main.py:871 #: src/diffuse/main.py:879
msgid "Convert To Uni_x Format" msgid "Convert To Uni_x Format"
msgstr "Ins Uni_x Format konvertieren" msgstr "Ins Uni_x Format konvertieren"
#: src/diffuse/main.py:874 #: src/diffuse/main.py:882
msgid "_Merge" msgid "_Merge"
msgstr "_Zusammenführen" msgstr "_Zusammenführen"
#: src/diffuse/main.py:875 #: src/diffuse/main.py:883
msgid "Copy Selection _Right" msgid "Copy Selection _Right"
msgstr "Auswahl nach _rechts kopieren" msgstr "Auswahl nach _rechts kopieren"
#: src/diffuse/main.py:876 #: src/diffuse/main.py:884
msgid "Copy Selection _Left" msgid "Copy Selection _Left"
msgstr "Auswahl nach _links kopieren" msgstr "Auswahl nach _links kopieren"
#: src/diffuse/main.py:878 #: src/diffuse/main.py:886
msgid "Copy Left _Into Selection" msgid "Copy Left _Into Selection"
msgstr "Von links _in die Auswahl kopieren" msgstr "Von links _in die Auswahl kopieren"
#: src/diffuse/main.py:879 #: src/diffuse/main.py:887
msgid "Copy Right I_nto Selection" msgid "Copy Right I_nto Selection"
msgstr "Von rechts i_n die Auswahl kopieren" msgstr "Von rechts i_n die Auswahl kopieren"
#: src/diffuse/main.py:880 #: src/diffuse/main.py:888
msgid "_Merge From Left Then Right" msgid "_Merge From Left Then Right"
msgstr "Zusammenführen von links, dann von rechts" msgstr "Zusammenführen von links, dann von rechts"
#: src/diffuse/main.py:881 #: src/diffuse/main.py:889
msgid "M_erge From Right Then Left" msgid "M_erge From Right Then Left"
msgstr "Zusammenführen von rechts, dann von links" msgstr "Zusammenführen von rechts, dann von links"
#: src/diffuse/main.py:884 #: src/diffuse/main.py:892
msgid "_Help" msgid "_Help"
msgstr "_Hilfe" msgstr "_Hilfe"
#: src/diffuse/main.py:885 #: src/diffuse/main.py:893
msgid "_Help Contents..." msgid "_Help Contents..."
msgstr "_Inhalt..." msgstr "_Inhalt..."
#: src/diffuse/main.py:887 #: src/diffuse/main.py:895
#, python-format #, python-format
msgid "_About %s..." msgid "_About %s..."
msgstr "_Über %s..." msgstr "_Über %s..."
#: src/diffuse/main.py:902 #: src/diffuse/main.py:910
msgid "New 2-Way File Merge" msgid "New 2-Way File Merge"
msgstr "Neues 2-Wege-Datei-Zusammenführen" msgstr "Neues 2-Wege-Datei-Zusammenführen"
#: src/diffuse/main.py:903 #: src/diffuse/main.py:911
msgid "New 3-Way File Merge" msgid "New 3-Way File Merge"
msgstr "Neues 3-Wege-Datei-Zusammenführen" msgstr "Neues 3-Wege-Datei-Zusammenführen"
#: src/diffuse/main.py:905 #: src/diffuse/main.py:913
msgid "Realign All" msgid "Realign All"
msgstr "Alle neu ausrichten" msgstr "Alle neu ausrichten"
#: src/diffuse/main.py:906 #: src/diffuse/main.py:914
msgid "First Difference" msgid "First Difference"
msgstr "Erster Unterschied" msgstr "Erster Unterschied"
#: src/diffuse/main.py:907 #: src/diffuse/main.py:915
msgid "Previous Difference" msgid "Previous Difference"
msgstr "Voriger Unterschied" msgstr "Voriger Unterschied"
#: src/diffuse/main.py:908 #: src/diffuse/main.py:916
msgid "Next Difference" msgid "Next Difference"
msgstr "Nächster Unterschied" msgstr "Nächster Unterschied"
#: src/diffuse/main.py:909 #: src/diffuse/main.py:917
msgid "Last Difference" msgid "Last Difference"
msgstr "Letzter Unterschied" msgstr "Letzter Unterschied"
#: src/diffuse/main.py:911 #: src/diffuse/main.py:919
msgid "Copy Selection Right" msgid "Copy Selection Right"
msgstr "Auswahl nach rechts kopieren" msgstr "Auswahl nach rechts kopieren"
#: src/diffuse/main.py:912 #: src/diffuse/main.py:920
msgid "Copy Selection Left" msgid "Copy Selection Left"
msgstr "Auswahl nach links kopieren" msgstr "Auswahl nach links kopieren"
#: src/diffuse/main.py:913 #: src/diffuse/main.py:921
msgid "Copy Left Into Selection" msgid "Copy Left Into Selection"
msgstr "Von links in die Auswahl kopieren" msgstr "Von links in die Auswahl kopieren"
#: src/diffuse/main.py:914 #: src/diffuse/main.py:922
msgid "Copy Right Into Selection" msgid "Copy Right Into Selection"
msgstr "Von rechts in die Auswahl kopieren" msgstr "Von rechts in die Auswahl kopieren"
#: src/diffuse/main.py:915 #: src/diffuse/main.py:923
msgid "Merge From Left Then Right" msgid "Merge From Left Then Right"
msgstr "Zusammenführen von links, dann von rechts" msgstr "Zusammenführen von links, dann von rechts"
#: src/diffuse/main.py:916 #: src/diffuse/main.py:924
msgid "Merge From Right Then Left" msgid "Merge From Right Then Left"
msgstr "Zusammenführen von rechts, dann von links" msgstr "Zusammenführen von rechts, dann von links"
#: src/diffuse/main.py:918 #: src/diffuse/main.py:926
msgid "Undo" msgid "Undo"
msgstr "Rückgängig" msgstr "Rückgängig"
#: src/diffuse/main.py:919 #: src/diffuse/main.py:927
msgid "Redo" msgid "Redo"
msgstr "Wiederholen" msgstr "Wiederholen"
#: src/diffuse/main.py:920 src/diffuse/widgets.py:1847 #: src/diffuse/main.py:928 src/diffuse/widgets.py:1849
msgid "Cut" msgid "Cut"
msgstr "Ausschneiden" msgstr "Ausschneiden"
#: src/diffuse/main.py:921 src/diffuse/widgets.py:1848 #: src/diffuse/main.py:929 src/diffuse/widgets.py:1850
msgid "Copy" msgid "Copy"
msgstr "Kopieren" msgstr "Kopieren"
#: src/diffuse/main.py:922 src/diffuse/widgets.py:1849 #: src/diffuse/main.py:930 src/diffuse/widgets.py:1851
msgid "Paste" msgid "Paste"
msgstr "Einfügen" msgstr "Einfügen"
#: src/diffuse/main.py:923 src/diffuse/widgets.py:1852 #: src/diffuse/main.py:931 src/diffuse/widgets.py:1854
msgid "Clear Edits" msgid "Clear Edits"
msgstr "Alle Änderungen rückgängig" msgstr "Alle Änderungen rückgängig"
#: src/diffuse/main.py:1046 #: src/diffuse/main.py:1054
msgid "Some files have unsaved changes. Select the files to save before closing." msgid "Some files have unsaved changes. Select the files to save before closing."
msgstr "" msgstr ""
"Einige Dateien haben ungespeicherte Änderungen. Wählen Sie die Dateien zum " "Einige Dateien haben ungespeicherte Änderungen. Wählen Sie die Dateien zum "
"speichern aus, bevor Sie beenden." "speichern aus, bevor Sie beenden."
#: src/diffuse/main.py:1060 #: src/diffuse/main.py:1068
msgid "Tab" msgid "Tab"
msgstr "Reiter" msgstr "Reiter"
#: src/diffuse/main.py:1065 #: src/diffuse/main.py:1073
msgid "Pane" msgid "Pane"
msgstr "Fenster" msgstr "Fenster"
#: src/diffuse/main.py:1076 #: src/diffuse/main.py:1084
msgid "Close _Without Saving" msgid "Close _Without Saving"
msgstr "Ohne speichern schließen" msgstr "Ohne speichern schließen"
#: src/diffuse/main.py:1115 #: src/diffuse/main.py:1123
#, python-format #, python-format
msgid "Closing this tab will quit %s." msgid "Closing this tab will quit %s."
msgstr "Schließen des letzten Tabs beendet %s." msgstr "Schließen des letzten Tabs beendet %s."
#: src/diffuse/main.py:1198 #: src/diffuse/main.py:1206
#, python-format #, python-format
msgid "File Merge %d" msgid "File Merge %d"
msgstr "Dateien zusammenführen %d" msgstr "Dateien zusammenführen %d"
#: src/diffuse/main.py:1304 #: src/diffuse/main.py:1312
#, python-format #, python-format
msgid "Error retrieving commits for %s." msgid "Error retrieving commits for %s."
msgstr "Fehler beim Empfangen der Revisionen von %s." msgstr "Fehler beim Empfangen der Revisionen von %s."
#: src/diffuse/main.py:1336 #: src/diffuse/main.py:1344
#, python-format #, python-format
msgid "Error retrieving modifications for %s." msgid "Error retrieving modifications for %s."
msgstr "Fehler beim Empfangen der Bearbeitungen von %s." msgstr "Fehler beim Empfangen der Bearbeitungen von %s."
#: src/diffuse/main.py:1369 #: src/diffuse/main.py:1377
msgid "Open File In New Tab" msgid "Open File In New Tab"
msgstr "Datei in neuem Reiter öffnen" msgstr "Datei in neuem Reiter öffnen"
#: src/diffuse/main.py:1392 #: src/diffuse/main.py:1400
msgid "Choose Folder With Modified Files" msgid "Choose Folder With Modified Files"
msgstr "Ordner mit bearbeiteten Dateien auswählen" msgstr "Ordner mit bearbeiteten Dateien auswählen"
#: src/diffuse/main.py:1410 #: src/diffuse/main.py:1418
msgid "No modified files found." msgid "No modified files found."
msgstr "Keine bearbeiteten Dateien gefunden." msgstr "Keine bearbeiteten Dateien gefunden."
#: src/diffuse/main.py:1416 #: src/diffuse/main.py:1424
msgid "Choose Folder With Commit" msgid "Choose Folder With Commit"
msgstr "Ordner mit Revisionen auswählen" msgstr "Ordner mit Revisionen auswählen"
#: src/diffuse/main.py:1436 #: src/diffuse/main.py:1444
msgid "No committed files found." msgid "No committed files found."
msgstr "Keine revidierten Dateien gefunden." msgstr "Keine revidierten Dateien gefunden."
#: src/diffuse/main.py:1472 #: src/diffuse/main.py:1480
msgid "New N-Way File Merge..." msgid "New N-Way File Merge..."
msgstr "Neues N-Wege-Datei-Zusammenführen..." msgstr "Neues N-Wege-Datei-Zusammenführen..."
#: src/diffuse/main.py:1473 #: src/diffuse/main.py:1481
msgid "Number of panes: " msgid "Number of panes: "
msgstr "Anzahl der Fenster: " msgstr "Anzahl der Fenster: "
#: src/diffuse/main.py:1547 #: src/diffuse/main.py:1555
msgid "Phrase not found. Continue from the end of the file?" msgid "Phrase not found. Continue from the end of the file?"
msgstr "Ausdruck nicht gefunden. Am Ende der Datei fortsetzen?" msgstr "Ausdruck nicht gefunden. Am Ende der Datei fortsetzen?"
#: src/diffuse/main.py:1549 #: src/diffuse/main.py:1557
msgid "Phrase not found. Continue from the start of the file?" msgid "Phrase not found. Continue from the start of the file?"
msgstr "Ausdruck nicht gefunden. Am Anfang der Datei fortsetzen?" msgstr "Ausdruck nicht gefunden. Am Anfang der Datei fortsetzen?"
#: src/diffuse/main.py:1770 #: src/diffuse/main.py:1778
#, fuzzy #, fuzzy
msgid "" msgid ""
"Usage:\n" "Usage:\n"
@ -710,174 +680,174 @@ msgstr ""
"ignorieren\n" "ignorieren\n"
" ( -w | --ignore-all-space ) Unterschiede an Leerzeichen ignorieren" " ( -w | --ignore-all-space ) Unterschiede an Leerzeichen ignorieren"
#: src/diffuse/main.py:1937 #: src/diffuse/main.py:1945
msgid "Error parsing line number." msgid "Error parsing line number."
msgstr "Fehler bei der Analyse der Zeilennummer." msgstr "Fehler bei der Analyse der Zeilennummer."
#: src/diffuse/main.py:1947 #: src/diffuse/main.py:1955
#, python-format #, python-format
msgid "Skipping unknown argument \"%s\"." msgid "Skipping unknown argument \"%s\"."
msgstr "Übergehe unbekannten Parameter \"%s\"." msgstr "Übergehe unbekannten Parameter \"%s\"."
#: src/diffuse/main.py:1955 #: src/diffuse/main.py:1963
#, python-format #, python-format
msgid "Error processing argument \"%s\". Directory not expected." msgid "Error processing argument \"%s\". Directory not expected."
msgstr "Fehler beim Verarbeiten des Arguments \"%s\". Unerwartetes Verzeichnis." msgstr "Fehler beim Verarbeiten des Arguments \"%s\". Unerwartetes Verzeichnis."
#: src/diffuse/preferences.py:79 #: src/diffuse/preferences.py:80
msgid "Display" msgid "Display"
msgstr "Anzeige" msgstr "Anzeige"
#: src/diffuse/preferences.py:82 #: src/diffuse/preferences.py:83
msgid "Font" msgid "Font"
msgstr "Schriftart" msgstr "Schriftart"
#: src/diffuse/preferences.py:83 #: src/diffuse/preferences.py:84
msgid "Tab width" msgid "Tab width"
msgstr "Tabulatorweite" msgstr "Tabulatorweite"
#: src/diffuse/preferences.py:84 #: src/diffuse/preferences.py:85
msgid "Show right margin" msgid "Show right margin"
msgstr "Zeige rechten Rand" msgstr "Zeige rechten Rand"
#: src/diffuse/preferences.py:85 #: src/diffuse/preferences.py:86
msgid "Right margin" msgid "Right margin"
msgstr "Rechter Rand" msgstr "Rechter Rand"
#: src/diffuse/preferences.py:86 #: src/diffuse/preferences.py:87
msgid "Show line numbers" msgid "Show line numbers"
msgstr "Zeige Zeilennummern" msgstr "Zeige Zeilennummern"
#: src/diffuse/preferences.py:87 #: src/diffuse/preferences.py:88
msgid "Show white space characters" msgid "Show white space characters"
msgstr "Leerzeichen anzeigen" msgstr "Leerzeichen anzeigen"
#: src/diffuse/preferences.py:88 #: src/diffuse/preferences.py:89
msgid "Ignore case differences" msgid "Ignore case differences"
msgstr "Unterschiede bei Groß- und Kleinschreibung ignorieren" msgstr "Unterschiede bei Groß- und Kleinschreibung ignorieren"
#: src/diffuse/preferences.py:89 #: src/diffuse/preferences.py:90
msgid "Ignore white space differences" msgid "Ignore white space differences"
msgstr "Unterschiede bei Leerzeichen ignorieren" msgstr "Unterschiede bei Leerzeichen ignorieren"
#: src/diffuse/preferences.py:90 src/diffuse/preferences.py:99 #: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100
msgid "Ignore changes to white space" msgid "Ignore changes to white space"
msgstr "Änderungen an Leerzeichen ignorieren" msgstr "Änderungen an Leerzeichen ignorieren"
#: src/diffuse/preferences.py:91 #: src/diffuse/preferences.py:92
msgid "Ignore blank line differences" msgid "Ignore blank line differences"
msgstr "Unterschiede bei leeren Zeilen ignorieren" msgstr "Unterschiede bei leeren Zeilen ignorieren"
#: src/diffuse/preferences.py:92 #: src/diffuse/preferences.py:93
msgid "Ignore end of line differences" msgid "Ignore end of line differences"
msgstr "Unterschiede bei Zeilenumbrüchen ignorieren" msgstr "Unterschiede bei Zeilenumbrüchen ignorieren"
#: src/diffuse/preferences.py:94 #: src/diffuse/preferences.py:95
msgid "Alignment" msgid "Alignment"
msgstr "Ausrichtung" msgstr "Ausrichtung"
#: src/diffuse/preferences.py:97 #: src/diffuse/preferences.py:98
msgid "Ignore case" msgid "Ignore case"
msgstr "Groß- und Kleinschreibung ignorieren" msgstr "Groß- und Kleinschreibung ignorieren"
#: src/diffuse/preferences.py:98 #: src/diffuse/preferences.py:99
msgid "Ignore white space" msgid "Ignore white space"
msgstr "Leerzeichen ignorieren" msgstr "Leerzeichen ignorieren"
#: src/diffuse/preferences.py:100 #: src/diffuse/preferences.py:101
msgid "Ignore blank lines" msgid "Ignore blank lines"
msgstr "Leere Zeilen ignorieren" msgstr "Leere Zeilen ignorieren"
#: src/diffuse/preferences.py:101 #: src/diffuse/preferences.py:102
msgid "Ignore end of line characters" msgid "Ignore end of line characters"
msgstr "Zeilenumbrüche ignorieren" msgstr "Zeilenumbrüche ignorieren"
#: src/diffuse/preferences.py:103 #: src/diffuse/preferences.py:104
msgid "Editor" msgid "Editor"
msgstr "Editor" msgstr "Editor"
#: src/diffuse/preferences.py:106 #: src/diffuse/preferences.py:107
msgid "Auto indent" msgid "Auto indent"
msgstr "Automatischer Einzug" msgstr "Automatischer Einzug"
#: src/diffuse/preferences.py:107 #: src/diffuse/preferences.py:108
msgid "Expand tabs to spaces" msgid "Expand tabs to spaces"
msgstr "Tabulatoren zu Leerzeichen erweitern" msgstr "Tabulatoren zu Leerzeichen erweitern"
#: src/diffuse/preferences.py:108 #: src/diffuse/preferences.py:109
msgid "Soft tab width" msgid "Soft tab width"
msgstr "Weiche Tabulatorweite" msgstr "Weiche Tabulatorweite"
#: src/diffuse/preferences.py:110 #: src/diffuse/preferences.py:111
msgid "Tabs" msgid "Tabs"
msgstr "Reiter" msgstr "Reiter"
#: src/diffuse/preferences.py:113 #: src/diffuse/preferences.py:114
msgid "Default panes" msgid "Default panes"
msgstr "Standard Fenster" msgstr "Standard Fenster"
#: src/diffuse/preferences.py:114 #: src/diffuse/preferences.py:115
msgid "Always show the tab bar" msgid "Always show the tab bar"
msgstr "Reiter-Leiste immer anzeigen" msgstr "Reiter-Leiste immer anzeigen"
#: src/diffuse/preferences.py:115 #: src/diffuse/preferences.py:116
#, python-format #, python-format
msgid "Warn me when closing a tab will quit %s" msgid "Warn me when closing a tab will quit %s"
msgstr "Warnen, wenn schließen des Tabs %s beendet" msgstr "Warnen, wenn schließen des Tabs %s beendet"
#: src/diffuse/preferences.py:117 #: src/diffuse/preferences.py:118
msgid "Regional Settings" msgid "Regional Settings"
msgstr "Lokalisierung" msgstr "Lokalisierung"
#: src/diffuse/preferences.py:120 #: src/diffuse/preferences.py:121
msgid "Default codec" msgid "Default codec"
msgstr "Standardkodierung" msgstr "Standardkodierung"
#: src/diffuse/preferences.py:121 #: src/diffuse/preferences.py:122
msgid "Order of codecs used to identify encoding" msgid "Order of codecs used to identify encoding"
msgstr "Reihenfolge der Chiffren um die Kodierung zu erkennen" msgstr "Reihenfolge der Chiffren um die Kodierung zu erkennen"
#: src/diffuse/preferences.py:142 #: src/diffuse/preferences.py:143
msgid "Cygwin" msgid "Cygwin"
msgstr "Cygwin" msgstr "Cygwin"
#: src/diffuse/preferences.py:144 #: src/diffuse/preferences.py:145
msgid "Root directory" msgid "Root directory"
msgstr "Hauptverzeichnis" msgstr "Hauptverzeichnis"
#: src/diffuse/preferences.py:145 #: src/diffuse/preferences.py:146
msgid "Cygdrive prefix" msgid "Cygdrive prefix"
msgstr "Cygdrive Präfix" msgstr "Cygdrive Präfix"
#: src/diffuse/preferences.py:164 #: src/diffuse/preferences.py:165
msgid "Version control system search order" msgid "Version control system search order"
msgstr "Suchreihenfolge des Versionskontrollsystems" msgstr "Suchreihenfolge des Versionskontrollsystems"
#: src/diffuse/preferences.py:172 #: src/diffuse/preferences.py:173
msgid "\"co\" command" msgid "\"co\" command"
msgstr "\"co\" Befehl" msgstr "\"co\" Befehl"
#: src/diffuse/preferences.py:173 #: src/diffuse/preferences.py:174
msgid "\"rlog\" command" msgid "\"rlog\" command"
msgstr "\"rlog\" Befehl" msgstr "\"rlog\" Befehl"
#: src/diffuse/preferences.py:175 #: src/diffuse/preferences.py:176
msgid "Command" msgid "Command"
msgstr "Befehl" msgstr "Befehl"
#: src/diffuse/preferences.py:181 #: src/diffuse/preferences.py:182
msgid "Launch from a Bash login shell" msgid "Launch from a Bash login shell"
msgstr "Aus einer Bash login shell starten" msgstr "Aus einer Bash login shell starten"
#: src/diffuse/preferences.py:188 #: src/diffuse/preferences.py:189
msgid "Update paths for Cygwin" msgid "Update paths for Cygwin"
msgstr "Pfade für Cygwin aktualisieren" msgstr "Pfade für Cygwin aktualisieren"
#: src/diffuse/preferences.py:193 #: src/diffuse/preferences.py:194
msgid "Version Control" msgid "Version Control"
msgstr "Versionsverwaltung" msgstr "Versionsverwaltung"
#: src/diffuse/preferences.py:258 #: src/diffuse/preferences.py:259
msgid "Preferences" msgid "Preferences"
msgstr "Einstellungen" msgstr "Einstellungen"
@ -909,7 +879,7 @@ msgstr ""
#: src/diffuse/resources.py:409 #: src/diffuse/resources.py:409
#, python-brace-format #, python-brace-format
msgid "Options \"{option}\" is unknown" msgid "Option \"{option}\" is unknown"
msgstr "" msgstr ""
#: src/diffuse/resources.py:416 #: src/diffuse/resources.py:416
@ -962,40 +932,69 @@ msgstr "Fehler bei der Analyse der Zeilen {line} von {file}."
msgid "Unhandled error at line {line} of {file}." msgid "Unhandled error at line {line} of {file}."
msgstr "Fehler bei der Analyse der Zeilen {line} von {file}." msgstr "Fehler bei der Analyse der Zeilen {line} von {file}."
#: src/diffuse/utils.py:63 #: src/diffuse/utils.py:66
msgid "Auto Detect" msgid "Auto Detect"
msgstr "Automatische Erkennung" msgstr "Automatische Erkennung"
#: src/diffuse/vcs/cvs.py:53 src/diffuse/vcs/rcs.py:62 src/diffuse/vcs/svn.py:95 #: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97
#, python-format #, python-format
msgid "Error parsing revision %s." msgid "Error parsing revision %s."
msgstr "Fehler bei der Analyse der Revision %s." msgstr "Fehler bei der Analyse der Revision %s."
#: src/diffuse/vcs/vcs_registry.py:233 #: src/diffuse/vcs/vcs_registry.py:238
#, python-format #, python-format
msgid "Error parsing %s." msgid "Error parsing %s."
msgstr "Fehler bei der Analyse %s." msgstr "Fehler bei der Analyse %s."
#: src/diffuse/widgets.py:1843 #: src/diffuse/widgets.py:1845
msgid "Align with Selection" msgid "Align with Selection"
msgstr "Ausrichten an der Auswahl" msgstr "Ausrichten an der Auswahl"
#: src/diffuse/widgets.py:1844 #: src/diffuse/widgets.py:1846
msgid "Isolate" msgid "Isolate"
msgstr "Isolieren" msgstr "Isolieren"
#: src/diffuse/widgets.py:1845 #: src/diffuse/widgets.py:1847
msgid "Merge Selection" msgid "Merge Selection"
msgstr "Auswahl zusammenführen" msgstr "Auswahl zusammenführen"
#: src/diffuse/widgets.py:1851 #: src/diffuse/widgets.py:1853
msgid "Select All" msgid "Select All"
msgstr "Alles auswählen" msgstr "Alles auswählen"
#: src/diffuse/widgets.py:1854 #: src/diffuse/widgets.py:1856
msgid "Swap with Selected Pane" msgid "Swap with Selected Pane"
msgstr "Mit ausgewähltem Fenster tauschen" 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 <http://www.gnu.org/licenses/>.\n"
#~ msgid "Diffuse Merge Tool" #~ msgid "Diffuse Merge Tool"
#~ msgstr "Diffuse Mischwerkzeug" #~ msgstr "Diffuse Mischwerkzeug"

19
po/diffuse.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-04-04 12:00-0400\n" "POT-Creation-Date: 2022-04-04 12:14-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -50,23 +50,6 @@ msgstr ""
msgid "translator-credits" msgid "translator-credits"
msgstr "" msgstr ""
#: src/diffuse/dialogs.py:49
msgid ""
"This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
"the Free Software Foundation; either version 2 of the License, or\n"
"(at your option) any later version.\n"
"\n"
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
"GNU General Public License for more details.\n"
"\n"
"You should have received a copy of the GNU General Public License along\n"
"with this program; if not, write to the Free Software Foundation, Inc.,\n"
"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
msgstr ""
#: src/diffuse/dialogs.py:83 #: src/diffuse/dialogs.py:83
msgid "Encoding: " msgid "Encoding: "
msgstr "" msgstr ""

425
po/es.po
View File

File diff suppressed because it is too large Load Diff

61
po/fr.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-04-04 12:00-0400\n" "POT-Creation-Date: 2022-04-04 12:14-0400\n"
"PO-Revision-Date: 2022-04-04 11:58-0400\n" "PO-Revision-Date: 2022-04-04 11:58-0400\n"
"Last-Translator: Romain Failliot <romain.failliot@foolstep.com>\n" "Last-Translator: Romain Failliot <romain.failliot@foolstep.com>\n"
"Language-Team: French\n" "Language-Team: French\n"
@ -55,36 +55,6 @@ msgstr ""
msgid "translator-credits" msgid "translator-credits"
msgstr "Romain Failliot <romain.failliot@foolstep.com>" msgstr "Romain Failliot <romain.failliot@foolstep.com>"
#: src/diffuse/dialogs.py:49
msgid ""
"This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
"the Free Software Foundation; either version 2 of the License, or\n"
"(at your option) any later version.\n"
"\n"
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
"GNU General Public License for more details.\n"
"\n"
"You should have received a copy of the GNU General Public License along\n"
"with this program; if not, write to the Free Software Foundation, Inc.,\n"
"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
msgstr ""
"This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
"the Free Software Foundation; either version 2 of the License, or\n"
"(at your option) any later version.\n"
"\n"
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
"GNU General Public License for more details.\n"
"\n"
"You should have received a copy of the GNU General Public License along\n"
"with this program; if not, write to the Free Software Foundation, Inc.,\n"
"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
#: src/diffuse/dialogs.py:83 #: src/diffuse/dialogs.py:83
msgid "Encoding: " msgid "Encoding: "
msgstr "Encodage: " msgstr "Encodage: "
@ -1001,3 +971,32 @@ msgstr "Tout sélectionner"
#: src/diffuse/widgets.py:1856 #: src/diffuse/widgets.py:1856
msgid "Swap with Selected Pane" msgid "Swap with Selected Pane"
msgstr "Échanger avec le panneau sélectionné" 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."

441
po/it.po
View File

File diff suppressed because it is too large Load Diff

414
po/ja.po
View File

File diff suppressed because it is too large Load Diff

415
po/ko.po
View File

File diff suppressed because it is too large Load Diff

378
po/pl.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: diffuse-0.4.8\n" "Project-Id-Version: diffuse-0.4.8\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-11-27 21:56-0500\n" "POT-Creation-Date: 2022-04-04 12:14-0400\n"
"PO-Revision-Date: 2020-06-29 14:49-0400\n" "PO-Revision-Date: 2022-04-04 12:19-0400\n"
"Last-Translator: Miś Uszatek <adres.email@ymail.com>, 2012\n" "Last-Translator: Miś Uszatek <adres.email@ymail.com>, 2012\n"
"Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n" "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
"Language: pl\n" "Language: pl\n"
@ -17,6 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n"
"%100>=20) ? 1 : 2);\n" "%100>=20) ? 1 : 2);\n"
"X-Generator: Poedit 3.0.1\n"
#: data/io.github.mightycreak.Diffuse.desktop.in:3 #: data/io.github.mightycreak.Diffuse.desktop.in:3
#: data/io.github.mightycreak.Diffuse.appdata.xml.in:4 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:4
@ -39,7 +40,7 @@ msgstr ""
msgid "Main window: diff between two files" msgid "Main window: diff between two files"
msgstr "" msgstr ""
#: src/diffuse/constants.py:24 #: src/diffuse/constants.py:25
msgid "Copyright" msgid "Copyright"
msgstr "" msgstr ""
@ -52,23 +53,6 @@ msgstr ""
msgid "translator-credits" msgid "translator-credits"
msgstr "Miś Uszatek <adres.email@ymail.com>" msgstr "Miś Uszatek <adres.email@ymail.com>"
#: src/diffuse/dialogs.py:49
msgid ""
"This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
"the Free Software Foundation; either version 2 of the License, or\n"
"(at your option) any later version.\n"
"\n"
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
"GNU General Public License for more details.\n"
"\n"
"You should have received a copy of the GNU General Public License along\n"
"with this program; if not, write to the Free Software Foundation, Inc.,\n"
"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
msgstr ""
#: src/diffuse/dialogs.py:83 #: src/diffuse/dialogs.py:83
msgid "Encoding: " msgid "Encoding: "
msgstr "Kodowanie znaków: " msgstr "Kodowanie znaków: "
@ -93,60 +77,60 @@ msgstr "Uwzględnij wielkość liter"
msgid "Search Backwards" msgid "Search Backwards"
msgstr "Szukaj Wstecz" msgstr "Szukaj Wstecz"
#: src/diffuse/main.py:79 #: src/diffuse/main.py:85
msgid "Close Tab" msgid "Close Tab"
msgstr "Zamknij Kartę" msgstr "Zamknij Kartę"
#: src/diffuse/main.py:124 #: src/diffuse/main.py:132
msgid "Open File..." msgid "Open File..."
msgstr "Otwórz Plik..." msgstr "Otwórz Plik..."
#: src/diffuse/main.py:125 #: src/diffuse/main.py:133
msgid "Reload File" msgid "Reload File"
msgstr "Odśwież Plik" msgstr "Odśwież Plik"
#: src/diffuse/main.py:126 #: src/diffuse/main.py:134
msgid "Save File" msgid "Save File"
msgstr "Zapisz Plik" msgstr "Zapisz Plik"
#: src/diffuse/main.py:127 #: src/diffuse/main.py:135
msgid "Save File As..." msgid "Save File As..."
msgstr "Zapisz Plik Jako..." msgstr "Zapisz Plik Jako..."
#: src/diffuse/main.py:280 #: src/diffuse/main.py:288
msgid "Save changes before loading the new file?" msgid "Save changes before loading the new file?"
msgstr "Zapisać zmiany przed wczytaniem nowego pliku?" msgstr "Zapisać zmiany przed wczytaniem nowego pliku?"
#: src/diffuse/main.py:391 #: src/diffuse/main.py:399
#, python-format #, python-format
msgid "Error reading revision %(rev)s of %(file)s." msgid "Error reading revision %(rev)s of %(file)s."
msgstr "Błąd odczytu rewizji %(rev)s z %(file)s." msgstr "Błąd odczytu rewizji %(rev)s z %(file)s."
#: src/diffuse/main.py:394 src/diffuse/main.py:1849 #: src/diffuse/main.py:402 src/diffuse/main.py:1857
#, python-format #, python-format
msgid "Error reading %s." msgid "Error reading %s."
msgstr "Błąd odczytu %s." msgstr "Błąd odczytu %s."
#: src/diffuse/main.py:416 #: src/diffuse/main.py:424
msgid "Open File" msgid "Open File"
msgstr "Otwórz Plik" msgstr "Otwórz Plik"
#: src/diffuse/main.py:473 #: src/diffuse/main.py:481
#, python-format #, python-format
msgid "The file %s changed on disk. Do you want to reload the file?" msgid "The file %s changed on disk. Do you want to reload the file?"
msgstr "Plik %s został zmieniony na dysku. Czy chcesz odświeżyć plik?" msgstr "Plik %s został zmieniony na dysku. Czy chcesz odświeżyć plik?"
#: src/diffuse/main.py:499 #: src/diffuse/main.py:507
#, python-format #, python-format
msgid "Save %(title)s Pane %(pane)d" msgid "Save %(title)s Pane %(pane)d"
msgstr "Zapisz %(title)s Okno %(pane)d" msgstr "Zapisz %(title)s Okno %(pane)d"
#: src/diffuse/main.py:531 #: src/diffuse/main.py:539
#, python-format #, python-format
msgid "A file named %s already exists. Do you want to overwrite it?" msgid "A file named %s already exists. Do you want to overwrite it?"
msgstr "Plik o nazwie %s już istnieje. Czy chcesz go zastąpić?" msgstr "Plik o nazwie %s już istnieje. Czy chcesz go zastąpić?"
#: src/diffuse/main.py:538 #: src/diffuse/main.py:546
#, python-format #, python-format
msgid "" msgid ""
"The file %s has been modified by another process since reading it. If you save, " "The file %s has been modified by another process since reading it. If you save, "
@ -155,25 +139,25 @@ msgstr ""
"Plik %s został zmodyfikowany przez inny proces od chwili jego wczytania. Jeśli " "Plik %s został zmodyfikowany przez inny proces od chwili jego wczytania. Jeśli "
"zapiszesz, wszystkie zewnętrzne zmiany mogą zostać utracone. Zapisać pomimo to?" "zapiszesz, wszystkie zewnętrzne zmiany mogą zostać utracone. Zapisać pomimo to?"
#: src/diffuse/main.py:580 #: src/diffuse/main.py:588
#, python-format #, python-format
msgid "Error encoding to %s." msgid "Error encoding to %s."
msgstr "Błąd kodowania dla %s." msgstr "Błąd kodowania dla %s."
#: src/diffuse/main.py:584 src/diffuse/preferences.py:298 #: src/diffuse/main.py:592 src/diffuse/preferences.py:299
#, python-format #, python-format
msgid "Error writing %s." msgid "Error writing %s."
msgstr "Błąd zapisu %s." msgstr "Błąd zapisu %s."
#: src/diffuse/main.py:614 #: src/diffuse/main.py:622
msgid "Go To Line..." msgid "Go To Line..."
msgstr "Idź Do Linii..." msgstr "Idź Do Linii..."
#: src/diffuse/main.py:615 #: src/diffuse/main.py:623
msgid "Line Number: " msgid "Line Number: "
msgstr "Numer Linii: " msgstr "Numer Linii: "
#: src/diffuse/main.py:646 #: src/diffuse/main.py:654
msgid "" msgid ""
"Press the enter key or double click to edit. Press the space bar or use the RMB " "Press the enter key or double click to edit. Press the space bar or use the RMB "
"menu to manually align." "menu to manually align."
@ -181,11 +165,11 @@ msgstr ""
"Naciśnij klawisz Enter lub dwukrotnie kliknij aby edytować. Naciśnij klawisz " "Naciśnij klawisz Enter lub dwukrotnie kliknij aby edytować. Naciśnij klawisz "
"spacji lub użyć menu RMB, aby ręcznie ustawić." "spacji lub użyć menu RMB, aby ręcznie ustawić."
#: src/diffuse/main.py:650 #: src/diffuse/main.py:658
msgid "Press the escape key to finish editing." msgid "Press the escape key to finish editing."
msgstr "Naciśnij klawisz escape, aby zakończyć edycję." msgstr "Naciśnij klawisz escape, aby zakończyć edycję."
#: src/diffuse/main.py:653 #: src/diffuse/main.py:661
msgid "" msgid ""
"Select target line and press the space bar to align. Press the escape key to " "Select target line and press the space bar to align. Press the escape key to "
"cancel." "cancel."
@ -193,426 +177,426 @@ msgstr ""
"Wybierz linie docelową i naciśnij klawisz spacji aby wyrównać. Naciśnij klawisz " "Wybierz linie docelową i naciśnij klawisz spacji aby wyrównać. Naciśnij klawisz "
"Escape, aby anulować." "Escape, aby anulować."
#: src/diffuse/main.py:776 #: src/diffuse/main.py:784
msgid "_File" msgid "_File"
msgstr "_Plik" msgstr "_Plik"
#: src/diffuse/main.py:777 #: src/diffuse/main.py:785
msgid "_Open File..." msgid "_Open File..."
msgstr "_Otwórz Plik..." msgstr "_Otwórz Plik..."
#: src/diffuse/main.py:778 #: src/diffuse/main.py:786
msgid "Open File In New _Tab..." msgid "Open File In New _Tab..."
msgstr "Otwórz Plik w Nowej _Karcie..." msgstr "Otwórz Plik w Nowej _Karcie..."
#: src/diffuse/main.py:779 #: src/diffuse/main.py:787
msgid "Open _Modified Files..." msgid "Open _Modified Files..."
msgstr "Otwórz _Zmodyfikowany Plik..." msgstr "Otwórz _Zmodyfikowany Plik..."
#: src/diffuse/main.py:780 #: src/diffuse/main.py:788
msgid "Open Commi_t..." msgid "Open Commi_t..."
msgstr "Otwórz Commi_t..." msgstr "Otwórz Commi_t..."
#: src/diffuse/main.py:781 #: src/diffuse/main.py:789
msgid "_Reload File" msgid "_Reload File"
msgstr "_Odśwież Plik" msgstr "_Odśwież Plik"
#: src/diffuse/main.py:783 #: src/diffuse/main.py:791
msgid "_Save File" msgid "_Save File"
msgstr "_Zapisz plik" msgstr "_Zapisz plik"
#: src/diffuse/main.py:784 #: src/diffuse/main.py:792
msgid "Save File _As..." msgid "Save File _As..."
msgstr "Zapisz Plik _Jako..." msgstr "Zapisz Plik _Jako..."
#: src/diffuse/main.py:785 #: src/diffuse/main.py:793
msgid "Save A_ll" msgid "Save A_ll"
msgstr "Zapisz W_szystko" msgstr "Zapisz W_szystko"
#: src/diffuse/main.py:787 #: src/diffuse/main.py:795
msgid "New _2-Way File Merge" msgid "New _2-Way File Merge"
msgstr "Nowy Łączenia _2 Plików" msgstr "Nowy Łączenia _2 Plików"
#: src/diffuse/main.py:788 #: src/diffuse/main.py:796
msgid "New _3-Way File Merge" msgid "New _3-Way File Merge"
msgstr "Nowy Łączenia _3 Plików" msgstr "Nowy Łączenia _3 Plików"
#: src/diffuse/main.py:789 #: src/diffuse/main.py:797
msgid "New _N-Way File Merge..." msgid "New _N-Way File Merge..."
msgstr "Nowy _N-Sposób Łączenia Pliku..." msgstr "Nowy _N-Sposób Łączenia Pliku..."
#: src/diffuse/main.py:791 #: src/diffuse/main.py:799
msgid "_Close Tab" msgid "_Close Tab"
msgstr "_Zamknij Kartę" msgstr "_Zamknij Kartę"
#: src/diffuse/main.py:792 #: src/diffuse/main.py:800
msgid "_Undo Close Tab" msgid "_Undo Close Tab"
msgstr "_Przywróć Zamkniętą Kartę" msgstr "_Przywróć Zamkniętą Kartę"
#: src/diffuse/main.py:793 #: src/diffuse/main.py:801
msgid "_Quit" msgid "_Quit"
msgstr "_Zamknij" msgstr "_Zamknij"
#: src/diffuse/main.py:796 #: src/diffuse/main.py:804
msgid "_Edit" msgid "_Edit"
msgstr "_Edytuj" msgstr "_Edytuj"
#: src/diffuse/main.py:797 #: src/diffuse/main.py:805
msgid "_Undo" msgid "_Undo"
msgstr "_Cofnij" msgstr "_Cofnij"
#: src/diffuse/main.py:798 #: src/diffuse/main.py:806
msgid "_Redo" msgid "_Redo"
msgstr "_Ponów" msgstr "_Ponów"
#: src/diffuse/main.py:800 #: src/diffuse/main.py:808
msgid "Cu_t" msgid "Cu_t"
msgstr "Wy_tnij" msgstr "Wy_tnij"
#: src/diffuse/main.py:801 #: src/diffuse/main.py:809
msgid "_Copy" msgid "_Copy"
msgstr "_Kopiuj" msgstr "_Kopiuj"
#: src/diffuse/main.py:802 #: src/diffuse/main.py:810
msgid "_Paste" msgid "_Paste"
msgstr "_Wklej" msgstr "_Wklej"
#: src/diffuse/main.py:804 #: src/diffuse/main.py:812
msgid "Select _All" msgid "Select _All"
msgstr "Zaznacz _Wszystko" msgstr "Zaznacz _Wszystko"
#: src/diffuse/main.py:805 #: src/diffuse/main.py:813
msgid "C_lear Edits" msgid "C_lear Edits"
msgstr "W_yczyść Edycje" msgstr "W_yczyść Edycje"
#: src/diffuse/main.py:806 #: src/diffuse/main.py:814
msgid "_Dismiss All Edits" msgid "_Dismiss All Edits"
msgstr "_Odrzuć Wszystkie Edycje" msgstr "_Odrzuć Wszystkie Edycje"
#: src/diffuse/main.py:808 #: src/diffuse/main.py:816
msgid "_Find..." msgid "_Find..."
msgstr "_Znajdź..." msgstr "_Znajdź..."
#: src/diffuse/main.py:809 #: src/diffuse/main.py:817
msgid "Find _Next" msgid "Find _Next"
msgstr "Znajdź _Następny" msgstr "Znajdź _Następny"
#: src/diffuse/main.py:810 #: src/diffuse/main.py:818
msgid "Find Pre_vious" msgid "Find Pre_vious"
msgstr "Znajdź Pop_rzedni" msgstr "Znajdź Pop_rzedni"
#: src/diffuse/main.py:811 #: src/diffuse/main.py:819
msgid "_Go To Line..." msgid "_Go To Line..."
msgstr "_Idź Do Linii..." msgstr "_Idź Do Linii..."
#: src/diffuse/main.py:813 #: src/diffuse/main.py:821
msgid "Pr_eferences..." msgid "Pr_eferences..."
msgstr "Pr_eferencje..." msgstr "Pr_eferencje..."
#: src/diffuse/main.py:817 #: src/diffuse/main.py:825
msgid "None" msgid "None"
msgstr "Brak" msgstr "Brak"
#: src/diffuse/main.py:835 #: src/diffuse/main.py:843
msgid "_View" msgid "_View"
msgstr "_Widok" msgstr "_Widok"
#: src/diffuse/main.py:836 #: src/diffuse/main.py:844
msgid "_Syntax Highlighting" msgid "_Syntax Highlighting"
msgstr "_Podświetlanie Składni" msgstr "_Podświetlanie Składni"
#: src/diffuse/main.py:838 #: src/diffuse/main.py:846
msgid "Re_align All" msgid "Re_align All"
msgstr "Wy_równaj Wszystko" msgstr "Wy_równaj Wszystko"
#: src/diffuse/main.py:839 #: src/diffuse/main.py:847
msgid "_Isolate" msgid "_Isolate"
msgstr "_Odizoluj" msgstr "_Odizoluj"
#: src/diffuse/main.py:841 #: src/diffuse/main.py:849
msgid "_First Difference" msgid "_First Difference"
msgstr "_Pierwsza Różnica" msgstr "_Pierwsza Różnica"
#: src/diffuse/main.py:842 #: src/diffuse/main.py:850
msgid "_Previous Difference" msgid "_Previous Difference"
msgstr "_Poprzednia Różnica" msgstr "_Poprzednia Różnica"
#: src/diffuse/main.py:843 #: src/diffuse/main.py:851
msgid "_Next Difference" msgid "_Next Difference"
msgstr "_Następna Różnica" msgstr "_Następna Różnica"
#: src/diffuse/main.py:844 #: src/diffuse/main.py:852
msgid "_Last Difference" msgid "_Last Difference"
msgstr "_Ostatnia Różnica" msgstr "_Ostatnia Różnica"
#: src/diffuse/main.py:846 #: src/diffuse/main.py:854
msgid "Fir_st Tab" msgid "Fir_st Tab"
msgstr "Pie_rwsza Karta" msgstr "Pie_rwsza Karta"
#: src/diffuse/main.py:847 #: src/diffuse/main.py:855
msgid "Pre_vious Tab" msgid "Pre_vious Tab"
msgstr "Pop_rzednia Karta" msgstr "Pop_rzednia Karta"
#: src/diffuse/main.py:848 #: src/diffuse/main.py:856
msgid "Next _Tab" msgid "Next _Tab"
msgstr "Następna _Karta" msgstr "Następna _Karta"
#: src/diffuse/main.py:849 #: src/diffuse/main.py:857
msgid "Las_t Tab" msgid "Las_t Tab"
msgstr "Osta_tnia Karta" msgstr "Osta_tnia Karta"
#: src/diffuse/main.py:851 #: src/diffuse/main.py:859
msgid "Shift Pane _Right" msgid "Shift Pane _Right"
msgstr "Przesuń Okno w _Prawo" msgstr "Przesuń Okno w _Prawo"
#: src/diffuse/main.py:852 #: src/diffuse/main.py:860
msgid "Shift Pane _Left" msgid "Shift Pane _Left"
msgstr "Przesuń Okno w _Lewo" msgstr "Przesuń Okno w _Lewo"
#: src/diffuse/main.py:855 #: src/diffuse/main.py:863
msgid "F_ormat" msgid "F_ormat"
msgstr "F_ormat" msgstr "F_ormat"
#: src/diffuse/main.py:856 #: src/diffuse/main.py:864
msgid "Convert To _Upper Case" msgid "Convert To _Upper Case"
msgstr "Konwertuj Na _Duże Litery" msgstr "Konwertuj Na _Duże Litery"
#: src/diffuse/main.py:857 #: src/diffuse/main.py:865
msgid "Convert To _Lower Case" msgid "Convert To _Lower Case"
msgstr "Konwertuj Na _Małe Litery" msgstr "Konwertuj Na _Małe Litery"
#: src/diffuse/main.py:859 #: src/diffuse/main.py:867
msgid "Sort Lines In _Ascending Order" msgid "Sort Lines In _Ascending Order"
msgstr "Sortuj Wiersze w Kolejności _Rosnącej" msgstr "Sortuj Wiersze w Kolejności _Rosnącej"
#: src/diffuse/main.py:860 #: src/diffuse/main.py:868
msgid "Sort Lines In D_escending Order" msgid "Sort Lines In D_escending Order"
msgstr "Sortuj Wiersze w Kolejności M_alejącej" msgstr "Sortuj Wiersze w Kolejności M_alejącej"
#: src/diffuse/main.py:862 #: src/diffuse/main.py:870
msgid "Remove Trailing _White Space" msgid "Remove Trailing _White Space"
msgstr "Usuń Zbędne Spacje" msgstr "Usuń Zbędne Spacje"
#: src/diffuse/main.py:863 #: src/diffuse/main.py:871
msgid "Convert Tabs To _Spaces" msgid "Convert Tabs To _Spaces"
msgstr "Konwertuj Tabulacje Na _Spacje" msgstr "Konwertuj Tabulacje Na _Spacje"
#: src/diffuse/main.py:864 #: src/diffuse/main.py:872
msgid "Convert Leading Spaces To _Tabs" msgid "Convert Leading Spaces To _Tabs"
msgstr "Konwertuj Spacje Na _Tabulacje" msgstr "Konwertuj Spacje Na _Tabulacje"
#: src/diffuse/main.py:866 #: src/diffuse/main.py:874
msgid "_Increase Indenting" msgid "_Increase Indenting"
msgstr "_Zwiększ Wcięcie" msgstr "_Zwiększ Wcięcie"
#: src/diffuse/main.py:867 #: src/diffuse/main.py:875
msgid "De_crease Indenting" msgid "De_crease Indenting"
msgstr "Zm_niejsz Wcięcie" msgstr "Zm_niejsz Wcięcie"
#: src/diffuse/main.py:869 #: src/diffuse/main.py:877
msgid "Convert To _DOS Format" msgid "Convert To _DOS Format"
msgstr "Konwertuj Do Formatu _DOS" msgstr "Konwertuj Do Formatu _DOS"
#: src/diffuse/main.py:870 #: src/diffuse/main.py:878
msgid "Convert To _Mac Format" msgid "Convert To _Mac Format"
msgstr "Konwertuj Do Formatu _Mac" msgstr "Konwertuj Do Formatu _Mac"
#: src/diffuse/main.py:871 #: src/diffuse/main.py:879
msgid "Convert To Uni_x Format" msgid "Convert To Uni_x Format"
msgstr "Konwertuj Do Formatu Uni_x" msgstr "Konwertuj Do Formatu Uni_x"
#: src/diffuse/main.py:874 #: src/diffuse/main.py:882
msgid "_Merge" msgid "_Merge"
msgstr "_Połącz" msgstr "_Połącz"
#: src/diffuse/main.py:875 #: src/diffuse/main.py:883
msgid "Copy Selection _Right" msgid "Copy Selection _Right"
msgstr "Skopiuj Zaznaczenie w _Prawo" msgstr "Skopiuj Zaznaczenie w _Prawo"
#: src/diffuse/main.py:876 #: src/diffuse/main.py:884
msgid "Copy Selection _Left" msgid "Copy Selection _Left"
msgstr "Skopiuj Zaznaczenie w _Lewo" msgstr "Skopiuj Zaznaczenie w _Lewo"
#: src/diffuse/main.py:878 #: src/diffuse/main.py:886
msgid "Copy Left _Into Selection" msgid "Copy Left _Into Selection"
msgstr "Skopiuj z Lewej _Do Zaznaczenia" msgstr "Skopiuj z Lewej _Do Zaznaczenia"
#: src/diffuse/main.py:879 #: src/diffuse/main.py:887
msgid "Copy Right I_nto Selection" msgid "Copy Right I_nto Selection"
msgstr "Skopiuj z Prawej _Do Zaznaczenia" msgstr "Skopiuj z Prawej _Do Zaznaczenia"
#: src/diffuse/main.py:880 #: src/diffuse/main.py:888
msgid "_Merge From Left Then Right" msgid "_Merge From Left Then Right"
msgstr "_Scal z Lewej Potem Prawej" msgstr "_Scal z Lewej Potem Prawej"
#: src/diffuse/main.py:881 #: src/diffuse/main.py:889
msgid "M_erge From Right Then Left" msgid "M_erge From Right Then Left"
msgstr "S_cal z Prawej Potem Lewej" msgstr "S_cal z Prawej Potem Lewej"
#: src/diffuse/main.py:884 #: src/diffuse/main.py:892
msgid "_Help" msgid "_Help"
msgstr "_Pomoc" msgstr "_Pomoc"
#: src/diffuse/main.py:885 #: src/diffuse/main.py:893
msgid "_Help Contents..." msgid "_Help Contents..."
msgstr "_Pomoc Ogólna..." msgstr "_Pomoc Ogólna..."
#: src/diffuse/main.py:887 #: src/diffuse/main.py:895
#, python-format #, python-format
msgid "_About %s..." msgid "_About %s..."
msgstr "_O %s..." msgstr "_O %s..."
#: src/diffuse/main.py:902 #: src/diffuse/main.py:910
msgid "New 2-Way File Merge" msgid "New 2-Way File Merge"
msgstr "Nowy Łączenia 2 Plików" msgstr "Nowy Łączenia 2 Plików"
#: src/diffuse/main.py:903 #: src/diffuse/main.py:911
msgid "New 3-Way File Merge" msgid "New 3-Way File Merge"
msgstr "Nowy Łączenia 3 Plików" msgstr "Nowy Łączenia 3 Plików"
#: src/diffuse/main.py:905 #: src/diffuse/main.py:913
msgid "Realign All" msgid "Realign All"
msgstr "Wyrównaj Wszystko" msgstr "Wyrównaj Wszystko"
#: src/diffuse/main.py:906 #: src/diffuse/main.py:914
msgid "First Difference" msgid "First Difference"
msgstr "Pierwsza Różnica" msgstr "Pierwsza Różnica"
#: src/diffuse/main.py:907 #: src/diffuse/main.py:915
msgid "Previous Difference" msgid "Previous Difference"
msgstr "Poprzednia Różnica" msgstr "Poprzednia Różnica"
#: src/diffuse/main.py:908 #: src/diffuse/main.py:916
msgid "Next Difference" msgid "Next Difference"
msgstr "Następna Różnica" msgstr "Następna Różnica"
#: src/diffuse/main.py:909 #: src/diffuse/main.py:917
msgid "Last Difference" msgid "Last Difference"
msgstr "Ostatnia Różnica" msgstr "Ostatnia Różnica"
#: src/diffuse/main.py:911 #: src/diffuse/main.py:919
msgid "Copy Selection Right" msgid "Copy Selection Right"
msgstr "Skopiuj Zaznaczenie w Prawo" msgstr "Skopiuj Zaznaczenie w Prawo"
#: src/diffuse/main.py:912 #: src/diffuse/main.py:920
msgid "Copy Selection Left" msgid "Copy Selection Left"
msgstr "Skopiuj Zaznaczenie w Lewo" msgstr "Skopiuj Zaznaczenie w Lewo"
#: src/diffuse/main.py:913 #: src/diffuse/main.py:921
msgid "Copy Left Into Selection" msgid "Copy Left Into Selection"
msgstr "Skopiuj z Lewej Do Zaznaczenia" msgstr "Skopiuj z Lewej Do Zaznaczenia"
#: src/diffuse/main.py:914 #: src/diffuse/main.py:922
msgid "Copy Right Into Selection" msgid "Copy Right Into Selection"
msgstr "Skopiuj z Prawej Do Zaznaczenia" msgstr "Skopiuj z Prawej Do Zaznaczenia"
#: src/diffuse/main.py:915 #: src/diffuse/main.py:923
msgid "Merge From Left Then Right" msgid "Merge From Left Then Right"
msgstr "Scal z Lewej Potem Prawej" msgstr "Scal z Lewej Potem Prawej"
#: src/diffuse/main.py:916 #: src/diffuse/main.py:924
msgid "Merge From Right Then Left" msgid "Merge From Right Then Left"
msgstr "Scal z Prawej Potem Lewej" msgstr "Scal z Prawej Potem Lewej"
#: src/diffuse/main.py:918 #: src/diffuse/main.py:926
msgid "Undo" msgid "Undo"
msgstr "Cofnij" msgstr "Cofnij"
#: src/diffuse/main.py:919 #: src/diffuse/main.py:927
msgid "Redo" msgid "Redo"
msgstr "Ponów" msgstr "Ponów"
#: src/diffuse/main.py:920 src/diffuse/widgets.py:1847 #: src/diffuse/main.py:928 src/diffuse/widgets.py:1849
msgid "Cut" msgid "Cut"
msgstr "Wytnij" msgstr "Wytnij"
#: src/diffuse/main.py:921 src/diffuse/widgets.py:1848 #: src/diffuse/main.py:929 src/diffuse/widgets.py:1850
msgid "Copy" msgid "Copy"
msgstr "Kopiuj" msgstr "Kopiuj"
#: src/diffuse/main.py:922 src/diffuse/widgets.py:1849 #: src/diffuse/main.py:930 src/diffuse/widgets.py:1851
msgid "Paste" msgid "Paste"
msgstr "Wklej" msgstr "Wklej"
#: src/diffuse/main.py:923 src/diffuse/widgets.py:1852 #: src/diffuse/main.py:931 src/diffuse/widgets.py:1854
msgid "Clear Edits" msgid "Clear Edits"
msgstr "Wyczyść Edycje" msgstr "Wyczyść Edycje"
#: src/diffuse/main.py:1046 #: src/diffuse/main.py:1054
msgid "Some files have unsaved changes. Select the files to save before closing." msgid "Some files have unsaved changes. Select the files to save before closing."
msgstr "" msgstr ""
"Niektóre pliki mają niezapisane zmiany. Wybierz pliki, aby zapisać przed " "Niektóre pliki mają niezapisane zmiany. Wybierz pliki, aby zapisać przed "
"zamknięciem." "zamknięciem."
#: src/diffuse/main.py:1060 #: src/diffuse/main.py:1068
msgid "Tab" msgid "Tab"
msgstr "Karta" msgstr "Karta"
#: src/diffuse/main.py:1065 #: src/diffuse/main.py:1073
msgid "Pane" msgid "Pane"
msgstr "Okno" msgstr "Okno"
#: src/diffuse/main.py:1076 #: src/diffuse/main.py:1084
msgid "Close _Without Saving" msgid "Close _Without Saving"
msgstr "Zamknij _Bez Zapisywania" msgstr "Zamknij _Bez Zapisywania"
#: src/diffuse/main.py:1115 #: src/diffuse/main.py:1123
#, python-format #, python-format
msgid "Closing this tab will quit %s." msgid "Closing this tab will quit %s."
msgstr "Zamknięcie tej karty zakończy %s." msgstr "Zamknięcie tej karty zakończy %s."
#: src/diffuse/main.py:1198 #: src/diffuse/main.py:1206
#, python-format #, python-format
msgid "File Merge %d" msgid "File Merge %d"
msgstr "Scal Plik %d" msgstr "Scal Plik %d"
#: src/diffuse/main.py:1304 #: src/diffuse/main.py:1312
#, python-format #, python-format
msgid "Error retrieving commits for %s." msgid "Error retrieving commits for %s."
msgstr "Błąd odzyskiwania commits dla %s." msgstr "Błąd odzyskiwania commits dla %s."
#: src/diffuse/main.py:1336 #: src/diffuse/main.py:1344
#, python-format #, python-format
msgid "Error retrieving modifications for %s." msgid "Error retrieving modifications for %s."
msgstr "Błąd odzyskiwania modyfikacji dla % s." msgstr "Błąd odzyskiwania modyfikacji dla % s."
#: src/diffuse/main.py:1369 #: src/diffuse/main.py:1377
msgid "Open File In New Tab" msgid "Open File In New Tab"
msgstr "Otwórz Plik w Nowej Karcie" msgstr "Otwórz Plik w Nowej Karcie"
#: src/diffuse/main.py:1392 #: src/diffuse/main.py:1400
msgid "Choose Folder With Modified Files" msgid "Choose Folder With Modified Files"
msgstr "Wybierz Folder z Zmodyfikowanymi Plikami" msgstr "Wybierz Folder z Zmodyfikowanymi Plikami"
#: src/diffuse/main.py:1410 #: src/diffuse/main.py:1418
msgid "No modified files found." msgid "No modified files found."
msgstr "Nie znaleziono zmodyfikowanych plików." msgstr "Nie znaleziono zmodyfikowanych plików."
#: src/diffuse/main.py:1416 #: src/diffuse/main.py:1424
msgid "Choose Folder With Commit" msgid "Choose Folder With Commit"
msgstr "Wybierz Folder z Commit" msgstr "Wybierz Folder z Commit"
#: src/diffuse/main.py:1436 #: src/diffuse/main.py:1444
msgid "No committed files found." msgid "No committed files found."
msgstr "Nie znaleziono plików commit" msgstr "Nie znaleziono plików commit."
#: src/diffuse/main.py:1472 #: src/diffuse/main.py:1480
msgid "New N-Way File Merge..." msgid "New N-Way File Merge..."
msgstr "Nowy N-Sposób Łączenia Pliku..." msgstr "Nowy N-Sposób Łączenia Pliku..."
#: src/diffuse/main.py:1473 #: src/diffuse/main.py:1481
msgid "Number of panes: " msgid "Number of panes: "
msgstr "Ilość okien: " msgstr "Ilość okien: "
#: src/diffuse/main.py:1547 #: src/diffuse/main.py:1555
msgid "Phrase not found. Continue from the end of the file?" msgid "Phrase not found. Continue from the end of the file?"
msgstr "Frazy nie znaleziono. Kontynuowane od końca pliku?" msgstr "Frazy nie znaleziono. Kontynuowane od końca pliku?"
#: src/diffuse/main.py:1549 #: src/diffuse/main.py:1557
msgid "Phrase not found. Continue from the start of the file?" msgid "Phrase not found. Continue from the start of the file?"
msgstr "Frazy nie znaleziono. Kontynuowane od początku pliku?" msgstr "Frazy nie znaleziono. Kontynuowane od początku pliku?"
#: src/diffuse/main.py:1770 #: src/diffuse/main.py:1778
#, fuzzy #, fuzzy
msgid "" msgid ""
"Usage:\n" "Usage:\n"
@ -693,174 +677,174 @@ msgstr ""
" ( -i | --ignore-case ) Ignoruj wielkości liter\n" " ( -i | --ignore-case ) Ignoruj wielkości liter\n"
" ( -w | --ignore-all-space ) Ignoruj różnice w spacji" " ( -w | --ignore-all-space ) Ignoruj różnice w spacji"
#: src/diffuse/main.py:1937 #: src/diffuse/main.py:1945
msgid "Error parsing line number." msgid "Error parsing line number."
msgstr "Błąd analizowania numer linii." msgstr "Błąd analizowania numer linii."
#: src/diffuse/main.py:1947 #: src/diffuse/main.py:1955
#, python-format #, python-format
msgid "Skipping unknown argument \"%s\"." msgid "Skipping unknown argument \"%s\"."
msgstr "Pomijanie nieznanego argumentu \"%s\"." msgstr "Pomijanie nieznanego argumentu \"%s\"."
#: src/diffuse/main.py:1955 #: src/diffuse/main.py:1963
#, python-format #, python-format
msgid "Error processing argument \"%s\". Directory not expected." msgid "Error processing argument \"%s\". Directory not expected."
msgstr "Błąd przetwarzania argumentu \"%s\". Nie oczekiwano katalogu." msgstr "Błąd przetwarzania argumentu \"%s\". Nie oczekiwano katalogu."
#: src/diffuse/preferences.py:79 #: src/diffuse/preferences.py:80
msgid "Display" msgid "Display"
msgstr "Wyświetl" msgstr "Wyświetl"
#: src/diffuse/preferences.py:82 #: src/diffuse/preferences.py:83
msgid "Font" msgid "Font"
msgstr "Czcionka" msgstr "Czcionka"
#: src/diffuse/preferences.py:83 #: src/diffuse/preferences.py:84
msgid "Tab width" msgid "Tab width"
msgstr "Szerokość tabulacji" msgstr "Szerokość tabulacji"
#: src/diffuse/preferences.py:84 #: src/diffuse/preferences.py:85
msgid "Show right margin" msgid "Show right margin"
msgstr "Pokaż prawy margines" msgstr "Pokaż prawy margines"
#: src/diffuse/preferences.py:85 #: src/diffuse/preferences.py:86
msgid "Right margin" msgid "Right margin"
msgstr "Prawy margines" msgstr "Prawy margines"
#: src/diffuse/preferences.py:86 #: src/diffuse/preferences.py:87
msgid "Show line numbers" msgid "Show line numbers"
msgstr "Pokaż numerowanie linii" msgstr "Pokaż numerowanie linii"
#: src/diffuse/preferences.py:87 #: src/diffuse/preferences.py:88
msgid "Show white space characters" msgid "Show white space characters"
msgstr "Pokaż znaki spacji" msgstr "Pokaż znaki spacji"
#: src/diffuse/preferences.py:88 #: src/diffuse/preferences.py:89
msgid "Ignore case differences" msgid "Ignore case differences"
msgstr "Ignoruj różnice w wielkość liter" msgstr "Ignoruj różnice w wielkość liter"
#: src/diffuse/preferences.py:89 #: src/diffuse/preferences.py:90
msgid "Ignore white space differences" msgid "Ignore white space differences"
msgstr "Ignoruj różnice spacji" msgstr "Ignoruj różnice spacji"
#: src/diffuse/preferences.py:90 src/diffuse/preferences.py:99 #: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100
msgid "Ignore changes to white space" msgid "Ignore changes to white space"
msgstr "Ignoruj zmiany w spacji" msgstr "Ignoruj zmiany w spacji"
#: src/diffuse/preferences.py:91 #: src/diffuse/preferences.py:92
msgid "Ignore blank line differences" msgid "Ignore blank line differences"
msgstr "Ignoruj różnice pustych linii" msgstr "Ignoruj różnice pustych linii"
#: src/diffuse/preferences.py:92 #: src/diffuse/preferences.py:93
msgid "Ignore end of line differences" msgid "Ignore end of line differences"
msgstr "Ignoruj różnice na końcu linii" msgstr "Ignoruj różnice na końcu linii"
#: src/diffuse/preferences.py:94 #: src/diffuse/preferences.py:95
msgid "Alignment" msgid "Alignment"
msgstr "Dostosowanie" msgstr "Dostosowanie"
#: src/diffuse/preferences.py:97 #: src/diffuse/preferences.py:98
msgid "Ignore case" msgid "Ignore case"
msgstr "Ignoruj wielkość liter" msgstr "Ignoruj wielkość liter"
#: src/diffuse/preferences.py:98 #: src/diffuse/preferences.py:99
msgid "Ignore white space" msgid "Ignore white space"
msgstr "Ignoruj spacje" msgstr "Ignoruj spacje"
#: src/diffuse/preferences.py:100 #: src/diffuse/preferences.py:101
msgid "Ignore blank lines" msgid "Ignore blank lines"
msgstr "Ignoruj puste wiersze" msgstr "Ignoruj puste wiersze"
#: src/diffuse/preferences.py:101 #: src/diffuse/preferences.py:102
msgid "Ignore end of line characters" msgid "Ignore end of line characters"
msgstr "Ignoruj końcowe znaki linii" msgstr "Ignoruj końcowe znaki linii"
#: src/diffuse/preferences.py:103 #: src/diffuse/preferences.py:104
msgid "Editor" msgid "Editor"
msgstr "Edytor" msgstr "Edytor"
#: src/diffuse/preferences.py:106 #: src/diffuse/preferences.py:107
msgid "Auto indent" msgid "Auto indent"
msgstr "Automatyczne wcięcia" msgstr "Automatyczne wcięcia"
#: src/diffuse/preferences.py:107 #: src/diffuse/preferences.py:108
msgid "Expand tabs to spaces" msgid "Expand tabs to spaces"
msgstr "Zamiana tabulacji na spacje" msgstr "Zamiana tabulacji na spacje"
#: src/diffuse/preferences.py:108 #: src/diffuse/preferences.py:109
msgid "Soft tab width" msgid "Soft tab width"
msgstr "Miękka szerokość tabulacji" msgstr "Miękka szerokość tabulacji"
#: src/diffuse/preferences.py:110 #: src/diffuse/preferences.py:111
msgid "Tabs" msgid "Tabs"
msgstr "Karty" msgstr "Karty"
#: src/diffuse/preferences.py:113 #: src/diffuse/preferences.py:114
msgid "Default panes" msgid "Default panes"
msgstr "Domyślne Okna" msgstr "Domyślne Okna"
#: src/diffuse/preferences.py:114 #: src/diffuse/preferences.py:115
msgid "Always show the tab bar" msgid "Always show the tab bar"
msgstr "Zawsze pokazuj pasek kart" msgstr "Zawsze pokazuj pasek kart"
#: src/diffuse/preferences.py:115 #: src/diffuse/preferences.py:116
#, python-format #, python-format
msgid "Warn me when closing a tab will quit %s" msgid "Warn me when closing a tab will quit %s"
msgstr "Ostrzegaj mnie gdy zamknięcie karty zakończy %s." msgstr "Ostrzegaj mnie gdy zamknięcie karty zakończy %s"
#: src/diffuse/preferences.py:117 #: src/diffuse/preferences.py:118
msgid "Regional Settings" msgid "Regional Settings"
msgstr "Regionalne Ustawienia" msgstr "Regionalne Ustawienia"
#: src/diffuse/preferences.py:120 #: src/diffuse/preferences.py:121
msgid "Default codec" msgid "Default codec"
msgstr "Domyślne kodowanie znaków" msgstr "Domyślne kodowanie znaków"
#: src/diffuse/preferences.py:121 #: src/diffuse/preferences.py:122
msgid "Order of codecs used to identify encoding" msgid "Order of codecs used to identify encoding"
msgstr "Kolejny kodek używany do identyfikacji kodowania" msgstr "Kolejny kodek używany do identyfikacji kodowania"
#: src/diffuse/preferences.py:142 #: src/diffuse/preferences.py:143
msgid "Cygwin" msgid "Cygwin"
msgstr "Cygwin" msgstr "Cygwin"
#: src/diffuse/preferences.py:144 #: src/diffuse/preferences.py:145
msgid "Root directory" msgid "Root directory"
msgstr "Główny katalog" msgstr "Główny katalog"
#: src/diffuse/preferences.py:145 #: src/diffuse/preferences.py:146
msgid "Cygdrive prefix" msgid "Cygdrive prefix"
msgstr "Cygdrive Prefiks" msgstr "Cygdrive Prefiks"
#: src/diffuse/preferences.py:164 #: src/diffuse/preferences.py:165
msgid "Version control system search order" msgid "Version control system search order"
msgstr "" msgstr ""
#: src/diffuse/preferences.py:172 #: src/diffuse/preferences.py:173
msgid "\"co\" command" msgid "\"co\" command"
msgstr "\"co\" polecenie" msgstr "\"co\" polecenie"
#: src/diffuse/preferences.py:173 #: src/diffuse/preferences.py:174
msgid "\"rlog\" command" msgid "\"rlog\" command"
msgstr "\"rlog\" polecenie" msgstr "\"rlog\" polecenie"
#: src/diffuse/preferences.py:175 #: src/diffuse/preferences.py:176
msgid "Command" msgid "Command"
msgstr "Polecenie" msgstr "Polecenie"
#: src/diffuse/preferences.py:181 #: src/diffuse/preferences.py:182
msgid "Launch from a Bash login shell" msgid "Launch from a Bash login shell"
msgstr "Uruchom z powłoki Bash" msgstr "Uruchom z powłoki Bash"
#: src/diffuse/preferences.py:188 #: src/diffuse/preferences.py:189
msgid "Update paths for Cygwin" msgid "Update paths for Cygwin"
msgstr "Aktualizacja ścieżki dla Cygwin" msgstr "Aktualizacja ścieżki dla Cygwin"
#: src/diffuse/preferences.py:193 #: src/diffuse/preferences.py:194
msgid "Version Control" msgid "Version Control"
msgstr "Wersja kontrolna" msgstr "Wersja kontrolna"
#: src/diffuse/preferences.py:258 #: src/diffuse/preferences.py:259
msgid "Preferences" msgid "Preferences"
msgstr "Preferencje" msgstr "Preferencje"
@ -892,7 +876,7 @@ msgstr ""
#: src/diffuse/resources.py:409 #: src/diffuse/resources.py:409
#, python-brace-format #, python-brace-format
msgid "Options \"{option}\" is unknown" msgid "Option \"{option}\" is unknown"
msgstr "" msgstr ""
#: src/diffuse/resources.py:416 #: src/diffuse/resources.py:416
@ -945,37 +929,37 @@ msgstr "Błąd przetwarzania linii {line} w {file}."
msgid "Unhandled error at line {line} of {file}." msgid "Unhandled error at line {line} of {file}."
msgstr "Błąd przetwarzania linii {line} w {file}." msgstr "Błąd przetwarzania linii {line} w {file}."
#: src/diffuse/utils.py:63 #: src/diffuse/utils.py:66
msgid "Auto Detect" msgid "Auto Detect"
msgstr "Automatyczne Wykrywanie" msgstr "Automatyczne Wykrywanie"
#: src/diffuse/vcs/cvs.py:53 src/diffuse/vcs/rcs.py:62 src/diffuse/vcs/svn.py:95 #: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97
#, python-format #, python-format
msgid "Error parsing revision %s." msgid "Error parsing revision %s."
msgstr "Błąd analizowania rewizji %s." msgstr "Błąd analizowania rewizji %s."
#: src/diffuse/vcs/vcs_registry.py:233 #: src/diffuse/vcs/vcs_registry.py:238
#, python-format #, python-format
msgid "Error parsing %s." msgid "Error parsing %s."
msgstr "Błędy analizowania %s." msgstr "Błędy analizowania %s."
#: src/diffuse/widgets.py:1843 #: src/diffuse/widgets.py:1845
msgid "Align with Selection" msgid "Align with Selection"
msgstr "Wyrównaj do zaznaczenia" msgstr "Wyrównaj do zaznaczenia"
#: src/diffuse/widgets.py:1844 #: src/diffuse/widgets.py:1846
msgid "Isolate" msgid "Isolate"
msgstr "Oddziel" msgstr "Oddziel"
#: src/diffuse/widgets.py:1845 #: src/diffuse/widgets.py:1847
msgid "Merge Selection" msgid "Merge Selection"
msgstr "Scal Zaznaczenie" msgstr "Scal Zaznaczenie"
#: src/diffuse/widgets.py:1851 #: src/diffuse/widgets.py:1853
msgid "Select All" msgid "Select All"
msgstr "Zaznacz Wszystko" msgstr "Zaznacz Wszystko"
#: src/diffuse/widgets.py:1854 #: src/diffuse/widgets.py:1856
msgid "Swap with Selected Pane" msgid "Swap with Selected Pane"
msgstr "Zamień z Zaznaczonym Oknem" msgstr "Zamień z Zaznaczonym Oknem"

424
po/pt.po
View File

File diff suppressed because it is too large Load Diff

426
po/pt_BR.po
View File

File diff suppressed because it is too large Load Diff

424
po/ru.po
View File

File diff suppressed because it is too large Load Diff

417
po/sv.po
View File

File diff suppressed because it is too large Load Diff

414
po/th.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: diffuse 0.4.7\n" "Project-Id-Version: diffuse 0.4.7\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-11-27 21:56-0500\n" "POT-Creation-Date: 2022-04-04 12:14-0400\n"
"PO-Revision-Date: 2020-06-29 14:49-0400\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n"
"Last-Translator: Akom Chotiphantawanon <knight2000@gmail.com>\n" "Last-Translator: Akom Chotiphantawanon <knight2000@gmail.com>\n"
"Language-Team: Thai <thai-l10n@googlegroups.com>\n" "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@ -39,7 +39,7 @@ msgstr ""
msgid "Main window: diff between two files" msgid "Main window: diff between two files"
msgstr "" msgstr ""
#: src/diffuse/constants.py:24 #: src/diffuse/constants.py:25
msgid "Copyright" msgid "Copyright"
msgstr "" msgstr ""
@ -51,36 +51,6 @@ msgstr "Diffuse เป็นเครื่องมือแบบกราฟ
msgid "translator-credits" msgid "translator-credits"
msgstr "Akom Chotiphantawanon <knight2000@gmail.com> " msgstr "Akom Chotiphantawanon <knight2000@gmail.com> "
#: src/diffuse/dialogs.py:49
#, fuzzy
msgid ""
"This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
"the Free Software Foundation; either version 2 of the License, or\n"
"(at your option) any later version.\n"
"\n"
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
"GNU General Public License for more details.\n"
"\n"
"You should have received a copy of the GNU General Public License along\n"
"with this program; if not, write to the Free Software Foundation, Inc.,\n"
"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
msgstr ""
"โปรแกรมนี้เป็นซอฟต์แวร์เสรี คุณสามารถแจกจ่ายต่อ และ/หรือ แก้ไขโปรแกรมได้ ภายใต้เงื่อนไขของ GNU "
"General Public License ที่เผยแพร่โดยมูลนิธิซอฟต์แวร์เสรี ไม่ว่าจะเป็นสัญญาอนุญาตรุ่นที่ 2 หรือรุ่นถัดมา "
"(ตามแต่คุณจะเลือก)\n"
"\n"
"โปรแกรมนี้ เผยแพร่ด้วยความหวังว่าโปรแกรมจะมีประโยชน์ แต่ *ไม่มีการรับประกันใดๆ* "
"ไม่มีแม้การรับประกัน *อรรถประโยชน์เชิงพาณิชย์* หรือ *ความเหมาะสมสำหรับวัตถุประสงค์เฉพาะกิจใดๆ* "
"กรุณาอ่าน GNU General Public License เพื่อดูรายละเอียดเพิ่มเติม\n"
"\n"
"คุณควรจะได้รับสำเนาของ GNU General Public License มาพร้อมกับโปรแกรมนี้ "
"และคุณยังอาจรับสำเนาของ GNU General Public License จาก Free Software Foundation "
"โดยเข้าเยี่ยมชมเว็บไซต์ของมูลนิธิ (http://www.fsf.org/) หรือโดยการเขียนไปที่ Free Software "
"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n"
#: src/diffuse/dialogs.py:83 #: src/diffuse/dialogs.py:83
msgid "Encoding: " msgid "Encoding: "
msgstr "รหัสอักขระ: " msgstr "รหัสอักขระ: "
@ -105,60 +75,60 @@ msgstr "ตัวพิมพ์ใหญ่-เล็กตรงกัน"
msgid "Search Backwards" msgid "Search Backwards"
msgstr "ค้นถอยหลัง" msgstr "ค้นถอยหลัง"
#: src/diffuse/main.py:79 #: src/diffuse/main.py:85
msgid "Close Tab" msgid "Close Tab"
msgstr "ปิดแท็บ" msgstr "ปิดแท็บ"
#: src/diffuse/main.py:124 #: src/diffuse/main.py:132
msgid "Open File..." msgid "Open File..."
msgstr "เปิดแฟ้ม..." msgstr "เปิดแฟ้ม..."
#: src/diffuse/main.py:125 #: src/diffuse/main.py:133
msgid "Reload File" msgid "Reload File"
msgstr "โหลดแฟ้มซ้ำ" msgstr "โหลดแฟ้มซ้ำ"
#: src/diffuse/main.py:126 #: src/diffuse/main.py:134
msgid "Save File" msgid "Save File"
msgstr "บันทึกแฟ้ม" msgstr "บันทึกแฟ้ม"
#: src/diffuse/main.py:127 #: src/diffuse/main.py:135
msgid "Save File As..." msgid "Save File As..."
msgstr "บันทึกแฟ้มเป็น..." msgstr "บันทึกแฟ้มเป็น..."
#: src/diffuse/main.py:280 #: src/diffuse/main.py:288
msgid "Save changes before loading the new file?" msgid "Save changes before loading the new file?"
msgstr "บันทึกการเปลี่ยนแปลงก่อนโหลดแฟ้มใหม่หรือไม่?" msgstr "บันทึกการเปลี่ยนแปลงก่อนโหลดแฟ้มใหม่หรือไม่?"
#: src/diffuse/main.py:391 #: src/diffuse/main.py:399
#, python-format #, python-format
msgid "Error reading revision %(rev)s of %(file)s." msgid "Error reading revision %(rev)s of %(file)s."
msgstr "เกิดข้อผิดพลาดขณะอ่านฉบับแก้ไข %(rev)s ของ %(file)s" msgstr "เกิดข้อผิดพลาดขณะอ่านฉบับแก้ไข %(rev)s ของ %(file)s"
#: src/diffuse/main.py:394 src/diffuse/main.py:1849 #: src/diffuse/main.py:402 src/diffuse/main.py:1857
#, python-format #, python-format
msgid "Error reading %s." msgid "Error reading %s."
msgstr "เกิดข้อผิดพลาดขณะอ่าน %s" msgstr "เกิดข้อผิดพลาดขณะอ่าน %s"
#: src/diffuse/main.py:416 #: src/diffuse/main.py:424
msgid "Open File" msgid "Open File"
msgstr "เปิดแฟ้ม" msgstr "เปิดแฟ้ม"
#: src/diffuse/main.py:473 #: src/diffuse/main.py:481
#, python-format #, python-format
msgid "The file %s changed on disk. Do you want to reload the file?" msgid "The file %s changed on disk. Do you want to reload the file?"
msgstr "แฟ้ม \"%s\" มีการเปลี่ยนแปลงในดิสก์ คุณต้องการโหลดแฟ้มซ้ำหรือไม่?" msgstr "แฟ้ม \"%s\" มีการเปลี่ยนแปลงในดิสก์ คุณต้องการโหลดแฟ้มซ้ำหรือไม่?"
#: src/diffuse/main.py:499 #: src/diffuse/main.py:507
#, python-format #, python-format
msgid "Save %(title)s Pane %(pane)d" msgid "Save %(title)s Pane %(pane)d"
msgstr "บันทึก %(title)s ช่อง %(pane)d" msgstr "บันทึก %(title)s ช่อง %(pane)d"
#: src/diffuse/main.py:531 #: src/diffuse/main.py:539
#, python-format #, python-format
msgid "A file named %s already exists. Do you want to overwrite it?" msgid "A file named %s already exists. Do you want to overwrite it?"
msgstr "แฟ้มชื่อ \"%s\" มีอยู่ก่อนแล้ว คุณต้องการเขียนทับหรือไม่?" msgstr "แฟ้มชื่อ \"%s\" มีอยู่ก่อนแล้ว คุณต้องการเขียนทับหรือไม่?"
#: src/diffuse/main.py:538 #: src/diffuse/main.py:546
#, python-format #, python-format
msgid "" msgid ""
"The file %s has been modified by another process since reading it. If you save, " "The file %s has been modified by another process since reading it. If you save, "
@ -167,458 +137,458 @@ msgstr ""
"แฟ้ม \"%s\" ถูกเปลี่ยนแปลงโดยโพรเซสอื่นนับตั้งแต่ที่อ่านไว้ ถ้าคุณบันทึก " "แฟ้ม \"%s\" ถูกเปลี่ยนแปลงโดยโพรเซสอื่นนับตั้งแต่ที่อ่านไว้ ถ้าคุณบันทึก "
"การเปลี่ยนแปลงภายนอกทั้งหมดอาจสูญหายได้ ยังคงบันทึกหรือไม่?" "การเปลี่ยนแปลงภายนอกทั้งหมดอาจสูญหายได้ ยังคงบันทึกหรือไม่?"
#: src/diffuse/main.py:580 #: src/diffuse/main.py:588
#, python-format #, python-format
msgid "Error encoding to %s." msgid "Error encoding to %s."
msgstr "เกิดข้อผิดพลาดขณะลงรหัส %s" msgstr "เกิดข้อผิดพลาดขณะลงรหัส %s"
#: src/diffuse/main.py:584 src/diffuse/preferences.py:298 #: src/diffuse/main.py:592 src/diffuse/preferences.py:299
#, python-format #, python-format
msgid "Error writing %s." msgid "Error writing %s."
msgstr "เกิดข้อผิดพลาดขณะเขียน %s" msgstr "เกิดข้อผิดพลาดขณะเขียน %s"
#: src/diffuse/main.py:614 #: src/diffuse/main.py:622
msgid "Go To Line..." msgid "Go To Line..."
msgstr "ไปที่บรรทัด..." msgstr "ไปที่บรรทัด..."
#: src/diffuse/main.py:615 #: src/diffuse/main.py:623
msgid "Line Number: " msgid "Line Number: "
msgstr "หมายเลขบรรทัด: " msgstr "หมายเลขบรรทัด: "
#: src/diffuse/main.py:646 #: src/diffuse/main.py:654
msgid "" msgid ""
"Press the enter key or double click to edit. Press the space bar or use the RMB " "Press the enter key or double click to edit. Press the space bar or use the RMB "
"menu to manually align." "menu to manually align."
msgstr "กดปุ่ม Enter หรือดับเบิลคลิกเพื่อแก้ไข กดแคร่เว้นวรรคหรือใช้เมนูคลิกขวาเพื่อจัดเรียงด้วยมือ" msgstr "กดปุ่ม Enter หรือดับเบิลคลิกเพื่อแก้ไข กดแคร่เว้นวรรคหรือใช้เมนูคลิกขวาเพื่อจัดเรียงด้วยมือ"
#: src/diffuse/main.py:650 #: src/diffuse/main.py:658
msgid "Press the escape key to finish editing." msgid "Press the escape key to finish editing."
msgstr "กดปุ่ม Escape เพื่อจบการแก้ไข" msgstr "กดปุ่ม Escape เพื่อจบการแก้ไข"
#: src/diffuse/main.py:653 #: src/diffuse/main.py:661
msgid "" msgid ""
"Select target line and press the space bar to align. Press the escape key to " "Select target line and press the space bar to align. Press the escape key to "
"cancel." "cancel."
msgstr "เลือกบรรทัดเป้าหมายแล้วกดแคร่เว้นวรรคเพื่อจัดเรียง กดปุ่ม Escape เพื่อยกเลิก" msgstr "เลือกบรรทัดเป้าหมายแล้วกดแคร่เว้นวรรคเพื่อจัดเรียง กดปุ่ม Escape เพื่อยกเลิก"
#: src/diffuse/main.py:776 #: src/diffuse/main.py:784
msgid "_File" msgid "_File"
msgstr "แ_ฟ้ม" msgstr "แ_ฟ้ม"
#: src/diffuse/main.py:777 #: src/diffuse/main.py:785
msgid "_Open File..." msgid "_Open File..."
msgstr "_เปิดแฟ้ม..." msgstr "_เปิดแฟ้ม..."
#: src/diffuse/main.py:778 #: src/diffuse/main.py:786
msgid "Open File In New _Tab..." msgid "Open File In New _Tab..."
msgstr "เปิดแฟ้มในแ_ท็บใหม่..." msgstr "เปิดแฟ้มในแ_ท็บใหม่..."
#: src/diffuse/main.py:779 #: src/diffuse/main.py:787
msgid "Open _Modified Files..." msgid "Open _Modified Files..."
msgstr "เปิดแฟ้มที่เ_ปลี่ยนแปลง..." msgstr "เปิดแฟ้มที่เ_ปลี่ยนแปลง..."
#: src/diffuse/main.py:780 #: src/diffuse/main.py:788
msgid "Open Commi_t..." msgid "Open Commi_t..."
msgstr "เปิด Commi_t..." msgstr "เปิด Commi_t..."
#: src/diffuse/main.py:781 #: src/diffuse/main.py:789
msgid "_Reload File" msgid "_Reload File"
msgstr "โ_หลดแฟ้มซ้ำ" msgstr "โ_หลดแฟ้มซ้ำ"
#: src/diffuse/main.py:783 #: src/diffuse/main.py:791
msgid "_Save File" msgid "_Save File"
msgstr "_บันทึกแฟ้ม" msgstr "_บันทึกแฟ้ม"
#: src/diffuse/main.py:784 #: src/diffuse/main.py:792
msgid "Save File _As..." msgid "Save File _As..."
msgstr "บันทึกแฟ้มเป็_น..." msgstr "บันทึกแฟ้มเป็_น..."
#: src/diffuse/main.py:785 #: src/diffuse/main.py:793
msgid "Save A_ll" msgid "Save A_ll"
msgstr "บันทึกทั้งห_มด" msgstr "บันทึกทั้งห_มด"
#: src/diffuse/main.py:787 #: src/diffuse/main.py:795
msgid "New _2-Way File Merge" msgid "New _2-Way File Merge"
msgstr "การผสานแฟ้ม _2 ทางชุดใหม่" msgstr "การผสานแฟ้ม _2 ทางชุดใหม่"
#: src/diffuse/main.py:788 #: src/diffuse/main.py:796
msgid "New _3-Way File Merge" msgid "New _3-Way File Merge"
msgstr "การผสานแฟ้ม _3 ทางชุดใหม่" msgstr "การผสานแฟ้ม _3 ทางชุดใหม่"
#: src/diffuse/main.py:789 #: src/diffuse/main.py:797
msgid "New _N-Way File Merge..." msgid "New _N-Way File Merge..."
msgstr "การผสานแฟ้ม _N ทางชุดใหม่..." msgstr "การผสานแฟ้ม _N ทางชุดใหม่..."
#: src/diffuse/main.py:791 #: src/diffuse/main.py:799
msgid "_Close Tab" msgid "_Close Tab"
msgstr "ปิ_ดแท็บ" msgstr "ปิ_ดแท็บ"
#: src/diffuse/main.py:792 #: src/diffuse/main.py:800
msgid "_Undo Close Tab" msgid "_Undo Close Tab"
msgstr "เ_รียกคืนการปิดแท็บ" msgstr "เ_รียกคืนการปิดแท็บ"
#: src/diffuse/main.py:793 #: src/diffuse/main.py:801
msgid "_Quit" msgid "_Quit"
msgstr "_ออก" msgstr "_ออก"
#: src/diffuse/main.py:796 #: src/diffuse/main.py:804
msgid "_Edit" msgid "_Edit"
msgstr "แ_ก้ไข" msgstr "แ_ก้ไข"
#: src/diffuse/main.py:797 #: src/diffuse/main.py:805
msgid "_Undo" msgid "_Undo"
msgstr "เ_รียกคืน" msgstr "เ_รียกคืน"
#: src/diffuse/main.py:798 #: src/diffuse/main.py:806
msgid "_Redo" msgid "_Redo"
msgstr "_ทำซ้ำ" msgstr "_ทำซ้ำ"
#: src/diffuse/main.py:800 #: src/diffuse/main.py:808
msgid "Cu_t" msgid "Cu_t"
msgstr "_ตัด" msgstr "_ตัด"
#: src/diffuse/main.py:801 #: src/diffuse/main.py:809
msgid "_Copy" msgid "_Copy"
msgstr "_คัดลอก" msgstr "_คัดลอก"
#: src/diffuse/main.py:802 #: src/diffuse/main.py:810
msgid "_Paste" msgid "_Paste"
msgstr "_แปะ" msgstr "_แปะ"
#: src/diffuse/main.py:804 #: src/diffuse/main.py:812
msgid "Select _All" msgid "Select _All"
msgstr "เลือกทั้ง_หมด" msgstr "เลือกทั้ง_หมด"
#: src/diffuse/main.py:805 #: src/diffuse/main.py:813
msgid "C_lear Edits" msgid "C_lear Edits"
msgstr "_ล้างการแก้ไขต่างๆ" msgstr "_ล้างการแก้ไขต่างๆ"
#: src/diffuse/main.py:806 #: src/diffuse/main.py:814
msgid "_Dismiss All Edits" msgid "_Dismiss All Edits"
msgstr "ไ_ม่สนใจการแก้ไขทั้งหมด" msgstr "ไ_ม่สนใจการแก้ไขทั้งหมด"
#: src/diffuse/main.py:808 #: src/diffuse/main.py:816
msgid "_Find..." msgid "_Find..."
msgstr "_หา..." msgstr "_หา..."
#: src/diffuse/main.py:809 #: src/diffuse/main.py:817
msgid "Find _Next" msgid "Find _Next"
msgstr "หา_ถัดไป" msgstr "หา_ถัดไป"
#: src/diffuse/main.py:810 #: src/diffuse/main.py:818
msgid "Find Pre_vious" msgid "Find Pre_vious"
msgstr "หา_ก่อนหน้า" msgstr "หา_ก่อนหน้า"
#: src/diffuse/main.py:811 #: src/diffuse/main.py:819
msgid "_Go To Line..." msgid "_Go To Line..."
msgstr "ไปที่_บรรทัด..." msgstr "ไปที่_บรรทัด..."
#: src/diffuse/main.py:813 #: src/diffuse/main.py:821
msgid "Pr_eferences..." msgid "Pr_eferences..."
msgstr "_ปรับแต่ง..." msgstr "_ปรับแต่ง..."
#: src/diffuse/main.py:817 #: src/diffuse/main.py:825
msgid "None" msgid "None"
msgstr "ไม่มี" msgstr "ไม่มี"
#: src/diffuse/main.py:835 #: src/diffuse/main.py:843
msgid "_View" msgid "_View"
msgstr "มุ_มมอง" msgstr "มุ_มมอง"
#: src/diffuse/main.py:836 #: src/diffuse/main.py:844
msgid "_Syntax Highlighting" msgid "_Syntax Highlighting"
msgstr "การเน้นไ_วยากรณ์" msgstr "การเน้นไ_วยากรณ์"
#: src/diffuse/main.py:838 #: src/diffuse/main.py:846
msgid "Re_align All" msgid "Re_align All"
msgstr "จัดเรียงให_ม่ทั้งหมด" msgstr "จัดเรียงให_ม่ทั้งหมด"
#: src/diffuse/main.py:839 #: src/diffuse/main.py:847
msgid "_Isolate" msgid "_Isolate"
msgstr "แ_ยก" msgstr "แ_ยก"
#: src/diffuse/main.py:841 #: src/diffuse/main.py:849
msgid "_First Difference" msgid "_First Difference"
msgstr "ความแตกต่างแ_รก" msgstr "ความแตกต่างแ_รก"
#: src/diffuse/main.py:842 #: src/diffuse/main.py:850
msgid "_Previous Difference" msgid "_Previous Difference"
msgstr "ความแตกต่าง_ก่อนหน้า" msgstr "ความแตกต่าง_ก่อนหน้า"
#: src/diffuse/main.py:843 #: src/diffuse/main.py:851
msgid "_Next Difference" msgid "_Next Difference"
msgstr "ความแตกต่าง_ถัดไป" msgstr "ความแตกต่าง_ถัดไป"
#: src/diffuse/main.py:844 #: src/diffuse/main.py:852
msgid "_Last Difference" msgid "_Last Difference"
msgstr "ความแตกต่าง_ล่าสุด" msgstr "ความแตกต่าง_ล่าสุด"
#: src/diffuse/main.py:846 #: src/diffuse/main.py:854
msgid "Fir_st Tab" msgid "Fir_st Tab"
msgstr "แท็บ_แรก" msgstr "แท็บ_แรก"
#: src/diffuse/main.py:847 #: src/diffuse/main.py:855
msgid "Pre_vious Tab" msgid "Pre_vious Tab"
msgstr "แท็บก่อ_นหน้า" msgstr "แท็บก่อ_นหน้า"
#: src/diffuse/main.py:848 #: src/diffuse/main.py:856
msgid "Next _Tab" msgid "Next _Tab"
msgstr "แ_ท็บถัดไป" msgstr "แ_ท็บถัดไป"
#: src/diffuse/main.py:849 #: src/diffuse/main.py:857
msgid "Las_t Tab" msgid "Las_t Tab"
msgstr "แท็บสุ_ดท้าย" msgstr "แท็บสุ_ดท้าย"
#: src/diffuse/main.py:851 #: src/diffuse/main.py:859
msgid "Shift Pane _Right" msgid "Shift Pane _Right"
msgstr "เลื่อนช่องไปทาง_ขวา" msgstr "เลื่อนช่องไปทาง_ขวา"
#: src/diffuse/main.py:852 #: src/diffuse/main.py:860
msgid "Shift Pane _Left" msgid "Shift Pane _Left"
msgstr "เลื่อนช่องไปทางซ้_าย" msgstr "เลื่อนช่องไปทางซ้_าย"
#: src/diffuse/main.py:855 #: src/diffuse/main.py:863
msgid "F_ormat" msgid "F_ormat"
msgstr "จัดรูปแ_บบ" msgstr "จัดรูปแ_บบ"
#: src/diffuse/main.py:856 #: src/diffuse/main.py:864
msgid "Convert To _Upper Case" msgid "Convert To _Upper Case"
msgstr "แปลงเป็นตัวพิมพ์ใ_หญ่" msgstr "แปลงเป็นตัวพิมพ์ใ_หญ่"
#: src/diffuse/main.py:857 #: src/diffuse/main.py:865
msgid "Convert To _Lower Case" msgid "Convert To _Lower Case"
msgstr "แปลงเป็นตัวพิมพ์เล็_ก" msgstr "แปลงเป็นตัวพิมพ์เล็_ก"
#: src/diffuse/main.py:859 #: src/diffuse/main.py:867
msgid "Sort Lines In _Ascending Order" msgid "Sort Lines In _Ascending Order"
msgstr "เรียงบรรทัดจากน้_อยไปหามาก" msgstr "เรียงบรรทัดจากน้_อยไปหามาก"
#: src/diffuse/main.py:860 #: src/diffuse/main.py:868
msgid "Sort Lines In D_escending Order" msgid "Sort Lines In D_escending Order"
msgstr "เรียงบรรทัดจาก_มากไปหาน้อย" msgstr "เรียงบรรทัดจาก_มากไปหาน้อย"
#: src/diffuse/main.py:862 #: src/diffuse/main.py:870
msgid "Remove Trailing _White Space" msgid "Remove Trailing _White Space"
msgstr "ลบช่องว่างท้า_ยบรรทัด" msgstr "ลบช่องว่างท้า_ยบรรทัด"
#: src/diffuse/main.py:863 #: src/diffuse/main.py:871
msgid "Convert Tabs To _Spaces" msgid "Convert Tabs To _Spaces"
msgstr "แปลงแท็บเป็น_ช่องว่าง" msgstr "แปลงแท็บเป็น_ช่องว่าง"
#: src/diffuse/main.py:864 #: src/diffuse/main.py:872
msgid "Convert Leading Spaces To _Tabs" msgid "Convert Leading Spaces To _Tabs"
msgstr "แปลงช่องว่างที่ต้นบรรทัดเป็นแ_ท็บ" msgstr "แปลงช่องว่างที่ต้นบรรทัดเป็นแ_ท็บ"
#: src/diffuse/main.py:866 #: src/diffuse/main.py:874
msgid "_Increase Indenting" msgid "_Increase Indenting"
msgstr "เ_พิ่มการร่นย่อหน้า" msgstr "เ_พิ่มการร่นย่อหน้า"
#: src/diffuse/main.py:867 #: src/diffuse/main.py:875
msgid "De_crease Indenting" msgid "De_crease Indenting"
msgstr "_ลดการร่นย่อหน้า" msgstr "_ลดการร่นย่อหน้า"
#: src/diffuse/main.py:869 #: src/diffuse/main.py:877
msgid "Convert To _DOS Format" msgid "Convert To _DOS Format"
msgstr "แปลงเป็นรูปแบบ_ดอส" msgstr "แปลงเป็นรูปแบบ_ดอส"
#: src/diffuse/main.py:870 #: src/diffuse/main.py:878
msgid "Convert To _Mac Format" msgid "Convert To _Mac Format"
msgstr "แปลงเป็นรูปแบบแ_ม็ค" msgstr "แปลงเป็นรูปแบบแ_ม็ค"
#: src/diffuse/main.py:871 #: src/diffuse/main.py:879
msgid "Convert To Uni_x Format" msgid "Convert To Uni_x Format"
msgstr "แปลงเป็นรูปแบบยู_นิกซ์" msgstr "แปลงเป็นรูปแบบยู_นิกซ์"
#: src/diffuse/main.py:874 #: src/diffuse/main.py:882
msgid "_Merge" msgid "_Merge"
msgstr "_ผสาน" msgstr "_ผสาน"
#: src/diffuse/main.py:875 #: src/diffuse/main.py:883
msgid "Copy Selection _Right" msgid "Copy Selection _Right"
msgstr "คัดลอกบรรทัดที่เลือกไปช่อง_ขวา" msgstr "คัดลอกบรรทัดที่เลือกไปช่อง_ขวา"
#: src/diffuse/main.py:876 #: src/diffuse/main.py:884
msgid "Copy Selection _Left" msgid "Copy Selection _Left"
msgstr "คัดลอกบรรทัดที่เลือกไปช่องซ้า_ย" msgstr "คัดลอกบรรทัดที่เลือกไปช่องซ้า_ย"
#: src/diffuse/main.py:878 #: src/diffuse/main.py:886
msgid "Copy Left _Into Selection" msgid "Copy Left _Into Selection"
msgstr "คัดลอกช่องซ้าย_เข้าในบรรทัดที่เลือก" msgstr "คัดลอกช่องซ้าย_เข้าในบรรทัดที่เลือก"
#: src/diffuse/main.py:879 #: src/diffuse/main.py:887
msgid "Copy Right I_nto Selection" msgid "Copy Right I_nto Selection"
msgstr "คัดลอกช่องขวาเข้าใ_นบรรทัดที่เลือก" msgstr "คัดลอกช่องขวาเข้าใ_นบรรทัดที่เลือก"
#: src/diffuse/main.py:880 #: src/diffuse/main.py:888
msgid "_Merge From Left Then Right" msgid "_Merge From Left Then Right"
msgstr "_ผสานจากช่องซ้ายแล้วตามด้วยขวา" msgstr "_ผสานจากช่องซ้ายแล้วตามด้วยขวา"
#: src/diffuse/main.py:881 #: src/diffuse/main.py:889
msgid "M_erge From Right Then Left" msgid "M_erge From Right Then Left"
msgstr "ผ_สานจากช่องขวาแล้วตามด้วยซ้าย" msgstr "ผ_สานจากช่องขวาแล้วตามด้วยซ้าย"
#: src/diffuse/main.py:884 #: src/diffuse/main.py:892
msgid "_Help" msgid "_Help"
msgstr "_วิธีใช้" msgstr "_วิธีใช้"
#: src/diffuse/main.py:885 #: src/diffuse/main.py:893
msgid "_Help Contents..." msgid "_Help Contents..."
msgstr "เ_นื้อหาวิธีใช้..." msgstr "เ_นื้อหาวิธีใช้..."
#: src/diffuse/main.py:887 #: src/diffuse/main.py:895
#, python-format #, python-format
msgid "_About %s..." msgid "_About %s..."
msgstr "เ_กี่ยวกับ %s..." msgstr "เ_กี่ยวกับ %s..."
#: src/diffuse/main.py:902 #: src/diffuse/main.py:910
msgid "New 2-Way File Merge" msgid "New 2-Way File Merge"
msgstr "การผสานแฟ้ม 2 ทางชุดใหม่" msgstr "การผสานแฟ้ม 2 ทางชุดใหม่"
#: src/diffuse/main.py:903 #: src/diffuse/main.py:911
msgid "New 3-Way File Merge" msgid "New 3-Way File Merge"
msgstr "การผสานแฟ้ม 3 ทางชุดใหม่" msgstr "การผสานแฟ้ม 3 ทางชุดใหม่"
#: src/diffuse/main.py:905 #: src/diffuse/main.py:913
msgid "Realign All" msgid "Realign All"
msgstr "จัดเรียงใหม่ทั้งหมด" msgstr "จัดเรียงใหม่ทั้งหมด"
#: src/diffuse/main.py:906 #: src/diffuse/main.py:914
msgid "First Difference" msgid "First Difference"
msgstr "ความแตกต่างแรก" msgstr "ความแตกต่างแรก"
#: src/diffuse/main.py:907 #: src/diffuse/main.py:915
msgid "Previous Difference" msgid "Previous Difference"
msgstr "ความแตกต่างก่อนหน้า" msgstr "ความแตกต่างก่อนหน้า"
#: src/diffuse/main.py:908 #: src/diffuse/main.py:916
msgid "Next Difference" msgid "Next Difference"
msgstr "ความแตกต่างถัดไป" msgstr "ความแตกต่างถัดไป"
#: src/diffuse/main.py:909 #: src/diffuse/main.py:917
msgid "Last Difference" msgid "Last Difference"
msgstr "ความแตกต่างสุดท้าย" msgstr "ความแตกต่างสุดท้าย"
#: src/diffuse/main.py:911 #: src/diffuse/main.py:919
msgid "Copy Selection Right" msgid "Copy Selection Right"
msgstr "คัดลอกบรรทัดที่เลือกไปช่องขวา" msgstr "คัดลอกบรรทัดที่เลือกไปช่องขวา"
#: src/diffuse/main.py:912 #: src/diffuse/main.py:920
msgid "Copy Selection Left" msgid "Copy Selection Left"
msgstr "คัดลอกบรรทัดที่เลือกไปช่องซ้าย" msgstr "คัดลอกบรรทัดที่เลือกไปช่องซ้าย"
#: src/diffuse/main.py:913 #: src/diffuse/main.py:921
msgid "Copy Left Into Selection" msgid "Copy Left Into Selection"
msgstr "คัดลอกช่องซ้ายเข้าในบรรทัดที่เลือก" msgstr "คัดลอกช่องซ้ายเข้าในบรรทัดที่เลือก"
#: src/diffuse/main.py:914 #: src/diffuse/main.py:922
msgid "Copy Right Into Selection" msgid "Copy Right Into Selection"
msgstr "คัดลอกช่องขวาเข้าในบรรทัดที่เลือก" msgstr "คัดลอกช่องขวาเข้าในบรรทัดที่เลือก"
#: src/diffuse/main.py:915 #: src/diffuse/main.py:923
msgid "Merge From Left Then Right" msgid "Merge From Left Then Right"
msgstr "ผสานจากช่องซ้ายแล้วตามด้วยขวา" msgstr "ผสานจากช่องซ้ายแล้วตามด้วยขวา"
#: src/diffuse/main.py:916 #: src/diffuse/main.py:924
msgid "Merge From Right Then Left" msgid "Merge From Right Then Left"
msgstr "ผสานจากช่องขวาแล้วตามด้วยซ้าย" msgstr "ผสานจากช่องขวาแล้วตามด้วยซ้าย"
#: src/diffuse/main.py:918 #: src/diffuse/main.py:926
msgid "Undo" msgid "Undo"
msgstr "เรียกคืน" msgstr "เรียกคืน"
#: src/diffuse/main.py:919 #: src/diffuse/main.py:927
msgid "Redo" msgid "Redo"
msgstr "ทำซ้ำ" msgstr "ทำซ้ำ"
#: src/diffuse/main.py:920 src/diffuse/widgets.py:1847 #: src/diffuse/main.py:928 src/diffuse/widgets.py:1849
msgid "Cut" msgid "Cut"
msgstr "ตัด" msgstr "ตัด"
#: src/diffuse/main.py:921 src/diffuse/widgets.py:1848 #: src/diffuse/main.py:929 src/diffuse/widgets.py:1850
msgid "Copy" msgid "Copy"
msgstr "คัดลอก" msgstr "คัดลอก"
#: src/diffuse/main.py:922 src/diffuse/widgets.py:1849 #: src/diffuse/main.py:930 src/diffuse/widgets.py:1851
msgid "Paste" msgid "Paste"
msgstr "แปะ" msgstr "แปะ"
#: src/diffuse/main.py:923 src/diffuse/widgets.py:1852 #: src/diffuse/main.py:931 src/diffuse/widgets.py:1854
msgid "Clear Edits" msgid "Clear Edits"
msgstr "ล้างการแก้ไข" msgstr "ล้างการแก้ไข"
#: src/diffuse/main.py:1046 #: src/diffuse/main.py:1054
msgid "Some files have unsaved changes. Select the files to save before closing." msgid "Some files have unsaved changes. Select the files to save before closing."
msgstr "บางแฟ้มมีการเปลี่ยนแปลงที่ไม่ได้บันทึก เลือกแฟ้มเพื่อบันทึกก่อนปิด" msgstr "บางแฟ้มมีการเปลี่ยนแปลงที่ไม่ได้บันทึก เลือกแฟ้มเพื่อบันทึกก่อนปิด"
#: src/diffuse/main.py:1060 #: src/diffuse/main.py:1068
msgid "Tab" msgid "Tab"
msgstr "แท็บ" msgstr "แท็บ"
#: src/diffuse/main.py:1065 #: src/diffuse/main.py:1073
msgid "Pane" msgid "Pane"
msgstr "ช่อง" msgstr "ช่อง"
#: src/diffuse/main.py:1076 #: src/diffuse/main.py:1084
msgid "Close _Without Saving" msgid "Close _Without Saving"
msgstr "ปิ_ดโดยไม่บันทึก" msgstr "ปิ_ดโดยไม่บันทึก"
#: src/diffuse/main.py:1115 #: src/diffuse/main.py:1123
#, python-format #, python-format
msgid "Closing this tab will quit %s." msgid "Closing this tab will quit %s."
msgstr "การปิดแท็บนี้จะออกจาก %s" msgstr "การปิดแท็บนี้จะออกจาก %s"
#: src/diffuse/main.py:1198 #: src/diffuse/main.py:1206
#, python-format #, python-format
msgid "File Merge %d" msgid "File Merge %d"
msgstr "การผสานแฟ้ม %d" msgstr "การผสานแฟ้ม %d"
#: src/diffuse/main.py:1304 #: src/diffuse/main.py:1312
#, python-format #, python-format
msgid "Error retrieving commits for %s." msgid "Error retrieving commits for %s."
msgstr "เกิดข้อผิดพลาดขณะดึง commit ต่างๆ สำหรับ %s" msgstr "เกิดข้อผิดพลาดขณะดึง commit ต่างๆ สำหรับ %s"
#: src/diffuse/main.py:1336 #: src/diffuse/main.py:1344
#, python-format #, python-format
msgid "Error retrieving modifications for %s." msgid "Error retrieving modifications for %s."
msgstr "เกิดข้อผิดพลาดขณะดึงการเปลี่ยนแปลงสำหรับ %s" msgstr "เกิดข้อผิดพลาดขณะดึงการเปลี่ยนแปลงสำหรับ %s"
#: src/diffuse/main.py:1369 #: src/diffuse/main.py:1377
msgid "Open File In New Tab" msgid "Open File In New Tab"
msgstr "เปิดแฟ้มในแท็บใหม่" msgstr "เปิดแฟ้มในแท็บใหม่"
#: src/diffuse/main.py:1392 #: src/diffuse/main.py:1400
msgid "Choose Folder With Modified Files" msgid "Choose Folder With Modified Files"
msgstr "เลือกโฟลเดอร์ที่มีแฟ้มที่เปลี่ยนแปลง" msgstr "เลือกโฟลเดอร์ที่มีแฟ้มที่เปลี่ยนแปลง"
#: src/diffuse/main.py:1410 #: src/diffuse/main.py:1418
msgid "No modified files found." msgid "No modified files found."
msgstr "ไม่พบแฟ้มที่เปลี่ยนแปลง" msgstr "ไม่พบแฟ้มที่เปลี่ยนแปลง"
#: src/diffuse/main.py:1416 #: src/diffuse/main.py:1424
msgid "Choose Folder With Commit" msgid "Choose Folder With Commit"
msgstr "เลือกโฟลเดอร์ที่มีการ commit" msgstr "เลือกโฟลเดอร์ที่มีการ commit"
#: src/diffuse/main.py:1436 #: src/diffuse/main.py:1444
msgid "No committed files found." msgid "No committed files found."
msgstr "ไม่พบแฟ้มที่มีการ commit" msgstr "ไม่พบแฟ้มที่มีการ commit"
#: src/diffuse/main.py:1472 #: src/diffuse/main.py:1480
msgid "New N-Way File Merge..." msgid "New N-Way File Merge..."
msgstr "การผสานแฟ้ม N ทางชุดใหม่..." msgstr "การผสานแฟ้ม N ทางชุดใหม่..."
#: src/diffuse/main.py:1473 #: src/diffuse/main.py:1481
msgid "Number of panes: " msgid "Number of panes: "
msgstr "จำนวนช่อง: " msgstr "จำนวนช่อง: "
#: src/diffuse/main.py:1547 #: src/diffuse/main.py:1555
msgid "Phrase not found. Continue from the end of the file?" msgid "Phrase not found. Continue from the end of the file?"
msgstr "ไม่พบคำที่ค้น จะหาต่อจากท้ายแฟ้มหรือไม่?" msgstr "ไม่พบคำที่ค้น จะหาต่อจากท้ายแฟ้มหรือไม่?"
#: src/diffuse/main.py:1549 #: src/diffuse/main.py:1557
msgid "Phrase not found. Continue from the start of the file?" msgid "Phrase not found. Continue from the start of the file?"
msgstr "ไม่พบคำที่ค้น จะหาต่อจากต้นแฟ้มหรือไม่?" msgstr "ไม่พบคำที่ค้น จะหาต่อจากต้นแฟ้มหรือไม่?"
#: src/diffuse/main.py:1770 #: src/diffuse/main.py:1778
#, fuzzy #, fuzzy
msgid "" msgid ""
"Usage:\n" "Usage:\n"
@ -696,174 +666,174 @@ msgstr ""
" ( -i | --ignore-case ) ไม่สนใจความแตกต่างของตัวพิมพ์ใหญ่-เล็ก\n" " ( -i | --ignore-case ) ไม่สนใจความแตกต่างของตัวพิมพ์ใหญ่-เล็ก\n"
" ( -w | --ignore-all-space ) ไม่สนใจความแตกต่างของช่องว่างทั้งหมด" " ( -w | --ignore-all-space ) ไม่สนใจความแตกต่างของช่องว่างทั้งหมด"
#: src/diffuse/main.py:1937 #: src/diffuse/main.py:1945
msgid "Error parsing line number." msgid "Error parsing line number."
msgstr "เกิดข้อผิดพลาดขณะแจงหมายเลขบรรทัด" msgstr "เกิดข้อผิดพลาดขณะแจงหมายเลขบรรทัด"
#: src/diffuse/main.py:1947 #: src/diffuse/main.py:1955
#, python-format #, python-format
msgid "Skipping unknown argument \"%s\"." msgid "Skipping unknown argument \"%s\"."
msgstr "ขอข้ามอาร์กิวเมนต์ \"%s\" ที่ไม่ทราบ" msgstr "ขอข้ามอาร์กิวเมนต์ \"%s\" ที่ไม่ทราบ"
#: src/diffuse/main.py:1955 #: src/diffuse/main.py:1963
#, python-format #, python-format
msgid "Error processing argument \"%s\". Directory not expected." msgid "Error processing argument \"%s\". Directory not expected."
msgstr "เกิดข้อผิดพลาดขณะประมวลผลอาร์กิวเมนต์ \"%s\" ไม่คาดหมายว่าจะพบไดเรกทอรี" msgstr "เกิดข้อผิดพลาดขณะประมวลผลอาร์กิวเมนต์ \"%s\" ไม่คาดหมายว่าจะพบไดเรกทอรี"
#: src/diffuse/preferences.py:79 #: src/diffuse/preferences.py:80
msgid "Display" msgid "Display"
msgstr "การแสดงผล" msgstr "การแสดงผล"
#: src/diffuse/preferences.py:82 #: src/diffuse/preferences.py:83
msgid "Font" msgid "Font"
msgstr "แบบอักษร" msgstr "แบบอักษร"
#: src/diffuse/preferences.py:83 #: src/diffuse/preferences.py:84
msgid "Tab width" msgid "Tab width"
msgstr "ความกว้างแท็บ" msgstr "ความกว้างแท็บ"
#: src/diffuse/preferences.py:84 #: src/diffuse/preferences.py:85
msgid "Show right margin" msgid "Show right margin"
msgstr "แสดงขอบขวา" msgstr "แสดงขอบขวา"
#: src/diffuse/preferences.py:85 #: src/diffuse/preferences.py:86
msgid "Right margin" msgid "Right margin"
msgstr "ขอบขวา" msgstr "ขอบขวา"
#: src/diffuse/preferences.py:86 #: src/diffuse/preferences.py:87
msgid "Show line numbers" msgid "Show line numbers"
msgstr "แสดงเลขบรรทัด" msgstr "แสดงเลขบรรทัด"
#: src/diffuse/preferences.py:87 #: src/diffuse/preferences.py:88
msgid "Show white space characters" msgid "Show white space characters"
msgstr "แสดงอักขระช่องว่าง" msgstr "แสดงอักขระช่องว่าง"
#: src/diffuse/preferences.py:88 #: src/diffuse/preferences.py:89
msgid "Ignore case differences" msgid "Ignore case differences"
msgstr "ไม่สนใจความแตกต่างของตัวพิมพ์ใหญ่-เล็ก" msgstr "ไม่สนใจความแตกต่างของตัวพิมพ์ใหญ่-เล็ก"
#: src/diffuse/preferences.py:89 #: src/diffuse/preferences.py:90
msgid "Ignore white space differences" msgid "Ignore white space differences"
msgstr "ไม่สนใจความแตกต่างของช่องว่างทั้งหมด" msgstr "ไม่สนใจความแตกต่างของช่องว่างทั้งหมด"
#: src/diffuse/preferences.py:90 src/diffuse/preferences.py:99 #: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100
msgid "Ignore changes to white space" msgid "Ignore changes to white space"
msgstr "ไม่สนใจการเปลี่ยนแปลงของช่องว่าง" msgstr "ไม่สนใจการเปลี่ยนแปลงของช่องว่าง"
#: src/diffuse/preferences.py:91 #: src/diffuse/preferences.py:92
msgid "Ignore blank line differences" msgid "Ignore blank line differences"
msgstr "ไม่สนใจความแตกต่างของบรรทัดเปล่า" msgstr "ไม่สนใจความแตกต่างของบรรทัดเปล่า"
#: src/diffuse/preferences.py:92 #: src/diffuse/preferences.py:93
msgid "Ignore end of line differences" msgid "Ignore end of line differences"
msgstr "ไม่สนใจความแตกต่างของอักขระจบบรรทัด" msgstr "ไม่สนใจความแตกต่างของอักขระจบบรรทัด"
#: src/diffuse/preferences.py:94 #: src/diffuse/preferences.py:95
msgid "Alignment" msgid "Alignment"
msgstr "การจัดเรียง" msgstr "การจัดเรียง"
#: src/diffuse/preferences.py:97 #: src/diffuse/preferences.py:98
msgid "Ignore case" msgid "Ignore case"
msgstr "ไม่สนใจตัวพิมพ์ใหญ่-เล็ก" msgstr "ไม่สนใจตัวพิมพ์ใหญ่-เล็ก"
#: src/diffuse/preferences.py:98 #: src/diffuse/preferences.py:99
msgid "Ignore white space" msgid "Ignore white space"
msgstr "ไม่สนใจช่องว่าง" msgstr "ไม่สนใจช่องว่าง"
#: src/diffuse/preferences.py:100 #: src/diffuse/preferences.py:101
msgid "Ignore blank lines" msgid "Ignore blank lines"
msgstr "ไม่สนใจบรรทัดเปล่า" msgstr "ไม่สนใจบรรทัดเปล่า"
#: src/diffuse/preferences.py:101 #: src/diffuse/preferences.py:102
msgid "Ignore end of line characters" msgid "Ignore end of line characters"
msgstr "ไม่สนใจอักขระจบบรรทัด" msgstr "ไม่สนใจอักขระจบบรรทัด"
#: src/diffuse/preferences.py:103 #: src/diffuse/preferences.py:104
msgid "Editor" msgid "Editor"
msgstr "เครื่องมือแก้ไข" msgstr "เครื่องมือแก้ไข"
#: src/diffuse/preferences.py:106 #: src/diffuse/preferences.py:107
msgid "Auto indent" msgid "Auto indent"
msgstr "ร่นบรรทัดอัตโนมัติ" msgstr "ร่นบรรทัดอัตโนมัติ"
#: src/diffuse/preferences.py:107 #: src/diffuse/preferences.py:108
msgid "Expand tabs to spaces" msgid "Expand tabs to spaces"
msgstr "กระจายแท็บเป็นช่องว่าง" msgstr "กระจายแท็บเป็นช่องว่าง"
#: src/diffuse/preferences.py:108 #: src/diffuse/preferences.py:109
msgid "Soft tab width" msgid "Soft tab width"
msgstr "ความกว้างของแท็บแบบซอฟต์" msgstr "ความกว้างของแท็บแบบซอฟต์"
#: src/diffuse/preferences.py:110 #: src/diffuse/preferences.py:111
msgid "Tabs" msgid "Tabs"
msgstr "แท็บ" msgstr "แท็บ"
#: src/diffuse/preferences.py:113 #: src/diffuse/preferences.py:114
msgid "Default panes" msgid "Default panes"
msgstr "ช่องปริยาย" msgstr "ช่องปริยาย"
#: src/diffuse/preferences.py:114 #: src/diffuse/preferences.py:115
msgid "Always show the tab bar" msgid "Always show the tab bar"
msgstr "แสดงแถบแท็บเสมอ" msgstr "แสดงแถบแท็บเสมอ"
#: src/diffuse/preferences.py:115 #: src/diffuse/preferences.py:116
#, python-format #, python-format
msgid "Warn me when closing a tab will quit %s" msgid "Warn me when closing a tab will quit %s"
msgstr "เตือนเมื่อการปิดแท็บจะออกจาก %s" msgstr "เตือนเมื่อการปิดแท็บจะออกจาก %s"
#: src/diffuse/preferences.py:117 #: src/diffuse/preferences.py:118
msgid "Regional Settings" msgid "Regional Settings"
msgstr "ค่าตั้งภูมิภาค" msgstr "ค่าตั้งภูมิภาค"
#: src/diffuse/preferences.py:120 #: src/diffuse/preferences.py:121
msgid "Default codec" msgid "Default codec"
msgstr "ตัวอ่าน-ลงรหัสปริยาย" msgstr "ตัวอ่าน-ลงรหัสปริยาย"
#: src/diffuse/preferences.py:121 #: src/diffuse/preferences.py:122
msgid "Order of codecs used to identify encoding" msgid "Order of codecs used to identify encoding"
msgstr "ลำดับตัวอ่าน-ลงรหัสที่ใช้ในการตรวจสอบรหัสอักขระ" msgstr "ลำดับตัวอ่าน-ลงรหัสที่ใช้ในการตรวจสอบรหัสอักขระ"
#: src/diffuse/preferences.py:142 #: src/diffuse/preferences.py:143
msgid "Cygwin" msgid "Cygwin"
msgstr "Cygwin" msgstr "Cygwin"
#: src/diffuse/preferences.py:144 #: src/diffuse/preferences.py:145
msgid "Root directory" msgid "Root directory"
msgstr "ไดเรกทอรีราก" msgstr "ไดเรกทอรีราก"
#: src/diffuse/preferences.py:145 #: src/diffuse/preferences.py:146
msgid "Cygdrive prefix" msgid "Cygdrive prefix"
msgstr "พาธส่วนต้นของ Cygdrive" msgstr "พาธส่วนต้นของ Cygdrive"
#: src/diffuse/preferences.py:164 #: src/diffuse/preferences.py:165
msgid "Version control system search order" msgid "Version control system search order"
msgstr "" msgstr ""
#: src/diffuse/preferences.py:172 #: src/diffuse/preferences.py:173
msgid "\"co\" command" msgid "\"co\" command"
msgstr "คำสั่ง \"co\"" msgstr "คำสั่ง \"co\""
#: src/diffuse/preferences.py:173 #: src/diffuse/preferences.py:174
msgid "\"rlog\" command" msgid "\"rlog\" command"
msgstr "คำสั่ง \"rlog\"" msgstr "คำสั่ง \"rlog\""
#: src/diffuse/preferences.py:175 #: src/diffuse/preferences.py:176
msgid "Command" msgid "Command"
msgstr "คำสั่ง" msgstr "คำสั่ง"
#: src/diffuse/preferences.py:181 #: src/diffuse/preferences.py:182
msgid "Launch from a Bash login shell" msgid "Launch from a Bash login shell"
msgstr "เรียกจากเชลล์ล็อกอินของ Bash" msgstr "เรียกจากเชลล์ล็อกอินของ Bash"
#: src/diffuse/preferences.py:188 #: src/diffuse/preferences.py:189
msgid "Update paths for Cygwin" msgid "Update paths for Cygwin"
msgstr "ปรับข้อมูลพาธสำหรับ Cygwin" msgstr "ปรับข้อมูลพาธสำหรับ Cygwin"
#: src/diffuse/preferences.py:193 #: src/diffuse/preferences.py:194
msgid "Version Control" msgid "Version Control"
msgstr "การควบคุมรุ่น" msgstr "การควบคุมรุ่น"
#: src/diffuse/preferences.py:258 #: src/diffuse/preferences.py:259
msgid "Preferences" msgid "Preferences"
msgstr "ปรับแต่ง" msgstr "ปรับแต่ง"
@ -895,7 +865,7 @@ msgstr ""
#: src/diffuse/resources.py:409 #: src/diffuse/resources.py:409
#, python-brace-format #, python-brace-format
msgid "Options \"{option}\" is unknown" msgid "Option \"{option}\" is unknown"
msgstr "" msgstr ""
#: src/diffuse/resources.py:416 #: src/diffuse/resources.py:416
@ -948,40 +918,70 @@ msgstr "เกิดข้อผิดพลาดขณะประมวลผ
msgid "Unhandled error at line {line} of {file}." msgid "Unhandled error at line {line} of {file}."
msgstr "เกิดข้อผิดพลาดขณะประมวลผลบรรทัดที่ {line} ของ {file}" msgstr "เกิดข้อผิดพลาดขณะประมวลผลบรรทัดที่ {line} ของ {file}"
#: src/diffuse/utils.py:63 #: src/diffuse/utils.py:66
msgid "Auto Detect" msgid "Auto Detect"
msgstr "ตรวจสอบอัตโนมัติ" msgstr "ตรวจสอบอัตโนมัติ"
#: src/diffuse/vcs/cvs.py:53 src/diffuse/vcs/rcs.py:62 src/diffuse/vcs/svn.py:95 #: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97
#, python-format #, python-format
msgid "Error parsing revision %s." msgid "Error parsing revision %s."
msgstr "เกิดข้อผิดพลาดขณะแจงฉบับแก้ไข %s" msgstr "เกิดข้อผิดพลาดขณะแจงฉบับแก้ไข %s"
#: src/diffuse/vcs/vcs_registry.py:233 #: src/diffuse/vcs/vcs_registry.py:238
#, python-format #, python-format
msgid "Error parsing %s." msgid "Error parsing %s."
msgstr "เกิดข้อผิดพลาดขณะแจง %s" msgstr "เกิดข้อผิดพลาดขณะแจง %s"
#: src/diffuse/widgets.py:1843 #: src/diffuse/widgets.py:1845
msgid "Align with Selection" msgid "Align with Selection"
msgstr "เรียงตรงกับบรรทัดที่เลือก" msgstr "เรียงตรงกับบรรทัดที่เลือก"
#: src/diffuse/widgets.py:1844 #: src/diffuse/widgets.py:1846
msgid "Isolate" msgid "Isolate"
msgstr "แยก" msgstr "แยก"
#: src/diffuse/widgets.py:1845 #: src/diffuse/widgets.py:1847
msgid "Merge Selection" msgid "Merge Selection"
msgstr "ผสานบรรทัดที่เลือก" msgstr "ผสานบรรทัดที่เลือก"
#: src/diffuse/widgets.py:1851 #: src/diffuse/widgets.py:1853
msgid "Select All" msgid "Select All"
msgstr "เลือกทั้งหมด" msgstr "เลือกทั้งหมด"
#: src/diffuse/widgets.py:1854 #: src/diffuse/widgets.py:1856
msgid "Swap with Selected Pane" msgid "Swap with Selected Pane"
msgstr "สลับกับช่องที่เลือก" 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" #~ msgid "Diffuse Merge Tool"
#~ msgstr "Diffuse - เครื่องมือผสานแฟ้ม" #~ msgstr "Diffuse - เครื่องมือผสานแฟ้ม"

371
po/zh_CN.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Diffuse svn 316\n" "Project-Id-Version: Diffuse svn 316\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-11-27 21:56-0500\n" "POT-Creation-Date: 2022-04-04 12:14-0400\n"
"PO-Revision-Date: 2020-06-29 14:49-0400\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n"
"Last-Translator: <jarryson@gmail.com>\n" "Last-Translator: <jarryson@gmail.com>\n"
"Language-Team: Chinese (simplified)\n" "Language-Team: Chinese (simplified)\n"
@ -38,7 +38,7 @@ msgstr ""
msgid "Main window: diff between two files" msgid "Main window: diff between two files"
msgstr "" msgstr ""
#: src/diffuse/constants.py:24 #: src/diffuse/constants.py:25
msgid "Copyright" msgid "Copyright"
msgstr "版权所有" msgstr "版权所有"
@ -50,23 +50,6 @@ msgstr "Diffuse是一个合并和比较文本文件的图形化程序。"
msgid "translator-credits" msgid "translator-credits"
msgstr "Liu Hao <jarryson@gmail.com>" msgstr "Liu Hao <jarryson@gmail.com>"
#: src/diffuse/dialogs.py:49
msgid ""
"This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
"the Free Software Foundation; either version 2 of the License, or\n"
"(at your option) any later version.\n"
"\n"
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
"GNU General Public License for more details.\n"
"\n"
"You should have received a copy of the GNU General Public License along\n"
"with this program; if not, write to the Free Software Foundation, Inc.,\n"
"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
msgstr ""
#: src/diffuse/dialogs.py:83 #: src/diffuse/dialogs.py:83
msgid "Encoding: " msgid "Encoding: "
msgstr "编码：" msgstr "编码："
@ -91,518 +74,518 @@ msgstr "符合大小写"
msgid "Search Backwards" msgid "Search Backwards"
msgstr "反向搜索" msgstr "反向搜索"
#: src/diffuse/main.py:79 #: src/diffuse/main.py:85
msgid "Close Tab" msgid "Close Tab"
msgstr "关闭标签" msgstr "关闭标签"
#: src/diffuse/main.py:124 #: src/diffuse/main.py:132
msgid "Open File..." msgid "Open File..."
msgstr "打开文件" msgstr "打开文件"
#: src/diffuse/main.py:125 #: src/diffuse/main.py:133
msgid "Reload File" msgid "Reload File"
msgstr "重新加载文件" msgstr "重新加载文件"
#: src/diffuse/main.py:126 #: src/diffuse/main.py:134
msgid "Save File" msgid "Save File"
msgstr "保存文件" msgstr "保存文件"
#: src/diffuse/main.py:127 #: src/diffuse/main.py:135
msgid "Save File As..." msgid "Save File As..."
msgstr "另存为" msgstr "另存为"
#: src/diffuse/main.py:280 #: src/diffuse/main.py:288
msgid "Save changes before loading the new file?" msgid "Save changes before loading the new file?"
msgstr "加载新文件之前保存更改吗？" msgstr "加载新文件之前保存更改吗？"
#: src/diffuse/main.py:391 #: src/diffuse/main.py:399
#, python-format #, python-format
msgid "Error reading revision %(rev)s of %(file)s." msgid "Error reading revision %(rev)s of %(file)s."
msgstr "无法读取文件%(file)s中的修订版本%(rev)s。" msgstr "无法读取文件%(file)s中的修订版本%(rev)s。"
#: src/diffuse/main.py:394 src/diffuse/main.py:1849 #: src/diffuse/main.py:402 src/diffuse/main.py:1857
#, python-format #, python-format
msgid "Error reading %s." msgid "Error reading %s."
msgstr "无法读取%s。" msgstr "无法读取%s。"
#: src/diffuse/main.py:416 #: src/diffuse/main.py:424
msgid "Open File" msgid "Open File"
msgstr "打开文件" msgstr "打开文件"
#: src/diffuse/main.py:473 #: src/diffuse/main.py:481
#, python-format #, python-format
msgid "The file %s changed on disk. Do you want to reload the file?" msgid "The file %s changed on disk. Do you want to reload the file?"
msgstr "磁盘文件%s已被更改，是否重新载入？" msgstr "磁盘文件%s已被更改，是否重新载入？"
#: src/diffuse/main.py:499 #: src/diffuse/main.py:507
#, python-format #, python-format
msgid "Save %(title)s Pane %(pane)d" msgid "Save %(title)s Pane %(pane)d"
msgstr "保存%(title)s窗格%(pane)d" msgstr "保存%(title)s窗格%(pane)d"
#: src/diffuse/main.py:531 #: src/diffuse/main.py:539
#, python-format #, python-format
msgid "A file named %s already exists. Do you want to overwrite it?" msgid "A file named %s already exists. Do you want to overwrite it?"
msgstr "已存在名为%s的文件，您希望覆盖它吗？" msgstr "已存在名为%s的文件，您希望覆盖它吗？"
#: src/diffuse/main.py:538 #: src/diffuse/main.py:546
#, python-format #, python-format
msgid "" msgid ""
"The file %s has been modified by another process since reading it. If you save, " "The file %s has been modified by another process since reading it. If you save, "
"all the external changes could be lost. Save anyways?" "all the external changes could be lost. Save anyways?"
msgstr "文件%s打开后被其他进程更改过了，如果保存，其他程序的修改将会丢失，保存吗？" msgstr "文件%s打开后被其他进程更改过了，如果保存，其他程序的修改将会丢失，保存吗？"
#: src/diffuse/main.py:580 #: src/diffuse/main.py:588
#, python-format #, python-format
msgid "Error encoding to %s." msgid "Error encoding to %s."
msgstr "无法编码为%s。" msgstr "无法编码为%s。"
#: src/diffuse/main.py:584 src/diffuse/preferences.py:298 #: src/diffuse/main.py:592 src/diffuse/preferences.py:299
#, python-format #, python-format
msgid "Error writing %s." msgid "Error writing %s."
msgstr "无法写入%s" msgstr "无法写入%s"
#: src/diffuse/main.py:614 #: src/diffuse/main.py:622
msgid "Go To Line..." msgid "Go To Line..."
msgstr "跳到行..." msgstr "跳到行..."
#: src/diffuse/main.py:615 #: src/diffuse/main.py:623
msgid "Line Number: " msgid "Line Number: "
msgstr "行数：" msgstr "行数："
#: src/diffuse/main.py:646 #: src/diffuse/main.py:654
msgid "" msgid ""
"Press the enter key or double click to edit. Press the space bar or use the RMB " "Press the enter key or double click to edit. Press the space bar or use the RMB "
"menu to manually align." "menu to manually align."
msgstr "按回车或者鼠标双击进行编译。空格键或者右键菜单手动对齐。" msgstr "按回车或者鼠标双击进行编译。空格键或者右键菜单手动对齐。"
#: src/diffuse/main.py:650 #: src/diffuse/main.py:658
msgid "Press the escape key to finish editing." msgid "Press the escape key to finish editing."
msgstr "按ESC键结束编辑" msgstr "按ESC键结束编辑"
#: src/diffuse/main.py:653 #: src/diffuse/main.py:661
msgid "" msgid ""
"Select target line and press the space bar to align. Press the escape key to " "Select target line and press the space bar to align. Press the escape key to "
"cancel." "cancel."
msgstr "选择目标行然后按空格键进行对齐，按ESC取消。" msgstr "选择目标行然后按空格键进行对齐，按ESC取消。"
#: src/diffuse/main.py:776 #: src/diffuse/main.py:784
msgid "_File" msgid "_File"
msgstr "文件(_F)" msgstr "文件(_F)"
#: src/diffuse/main.py:777 #: src/diffuse/main.py:785
msgid "_Open File..." msgid "_Open File..."
msgstr "打开文件(_O)" msgstr "打开文件(_O)"
#: src/diffuse/main.py:778 #: src/diffuse/main.py:786
msgid "Open File In New _Tab..." msgid "Open File In New _Tab..."
msgstr "在新标签里打开文件(_T)" msgstr "在新标签里打开文件(_T)"
#: src/diffuse/main.py:779 #: src/diffuse/main.py:787
msgid "Open _Modified Files..." msgid "Open _Modified Files..."
msgstr "打开修改过的文件(_M)" msgstr "打开修改过的文件(_M)"
#: src/diffuse/main.py:780 #: src/diffuse/main.py:788
msgid "Open Commi_t..." msgid "Open Commi_t..."
msgstr "打开提交(_T)" msgstr "打开提交(_T)"
#: src/diffuse/main.py:781 #: src/diffuse/main.py:789
msgid "_Reload File" msgid "_Reload File"
msgstr "重新加载文件(_R)" msgstr "重新加载文件(_R)"
#: src/diffuse/main.py:783 #: src/diffuse/main.py:791
msgid "_Save File" msgid "_Save File"
msgstr "保存(_S)" msgstr "保存(_S)"
#: src/diffuse/main.py:784 #: src/diffuse/main.py:792
msgid "Save File _As..." msgid "Save File _As..."
msgstr "另存为(_A)" msgstr "另存为(_A)"
#: src/diffuse/main.py:785 #: src/diffuse/main.py:793
msgid "Save A_ll" msgid "Save A_ll"
msgstr "保存所有(_L)" msgstr "保存所有(_L)"
#: src/diffuse/main.py:787 #: src/diffuse/main.py:795
msgid "New _2-Way File Merge" msgid "New _2-Way File Merge"
msgstr "新建2方文件合并(_2)" msgstr "新建2方文件合并(_2)"
#: src/diffuse/main.py:788 #: src/diffuse/main.py:796
msgid "New _3-Way File Merge" msgid "New _3-Way File Merge"
msgstr "新建3方文件合并(_3)" msgstr "新建3方文件合并(_3)"
#: src/diffuse/main.py:789 #: src/diffuse/main.py:797
msgid "New _N-Way File Merge..." msgid "New _N-Way File Merge..."
msgstr "新建多方文件合并(_N)" msgstr "新建多方文件合并(_N)"
#: src/diffuse/main.py:791 #: src/diffuse/main.py:799
msgid "_Close Tab" msgid "_Close Tab"
msgstr "关闭标签(_C)" msgstr "关闭标签(_C)"
#: src/diffuse/main.py:792 #: src/diffuse/main.py:800
msgid "_Undo Close Tab" msgid "_Undo Close Tab"
msgstr "恢复关闭的标签" msgstr "恢复关闭的标签"
#: src/diffuse/main.py:793 #: src/diffuse/main.py:801
msgid "_Quit" msgid "_Quit"
msgstr "退出(_Q)" msgstr "退出(_Q)"
#: src/diffuse/main.py:796 #: src/diffuse/main.py:804
msgid "_Edit" msgid "_Edit"
msgstr "编辑(_E)" msgstr "编辑(_E)"
#: src/diffuse/main.py:797 #: src/diffuse/main.py:805
msgid "_Undo" msgid "_Undo"
msgstr "恢复(_U)" msgstr "恢复(_U)"
#: src/diffuse/main.py:798 #: src/diffuse/main.py:806
msgid "_Redo" msgid "_Redo"
msgstr "重做(_R)" msgstr "重做(_R)"
#: src/diffuse/main.py:800 #: src/diffuse/main.py:808
msgid "Cu_t" msgid "Cu_t"
msgstr "剪切(_T)" msgstr "剪切(_T)"
#: src/diffuse/main.py:801 #: src/diffuse/main.py:809
msgid "_Copy" msgid "_Copy"
msgstr "复制(_C)" msgstr "复制(_C)"
#: src/diffuse/main.py:802 #: src/diffuse/main.py:810
msgid "_Paste" msgid "_Paste"
msgstr "粘贴(_P)" msgstr "粘贴(_P)"
#: src/diffuse/main.py:804 #: src/diffuse/main.py:812
msgid "Select _All" msgid "Select _All"
msgstr "选择所有(_A)" msgstr "选择所有(_A)"
#: src/diffuse/main.py:805 #: src/diffuse/main.py:813
msgid "C_lear Edits" msgid "C_lear Edits"
msgstr "取消编辑(L)" msgstr "取消编辑(L)"
#: src/diffuse/main.py:806 #: src/diffuse/main.py:814
msgid "_Dismiss All Edits" msgid "_Dismiss All Edits"
msgstr "撤销所有更改(_D)" msgstr "撤销所有更改(_D)"
#: src/diffuse/main.py:808 #: src/diffuse/main.py:816
msgid "_Find..." msgid "_Find..."
msgstr "查找(_F)" msgstr "查找(_F)"
#: src/diffuse/main.py:809 #: src/diffuse/main.py:817
msgid "Find _Next" msgid "Find _Next"
msgstr "找下一个(_N)" msgstr "找下一个(_N)"
#: src/diffuse/main.py:810 #: src/diffuse/main.py:818
msgid "Find Pre_vious" msgid "Find Pre_vious"
msgstr "找上一个(_V)" msgstr "找上一个(_V)"
#: src/diffuse/main.py:811 #: src/diffuse/main.py:819
msgid "_Go To Line..." msgid "_Go To Line..."
msgstr "跳到行(_G)" msgstr "跳到行(_G)"
#: src/diffuse/main.py:813 #: src/diffuse/main.py:821
msgid "Pr_eferences..." msgid "Pr_eferences..."
msgstr "首选项(_E)" msgstr "首选项(_E)"
#: src/diffuse/main.py:817 #: src/diffuse/main.py:825
msgid "None" msgid "None"
msgstr "无" msgstr "无"
#: src/diffuse/main.py:835 #: src/diffuse/main.py:843
msgid "_View" msgid "_View"
msgstr "视图(_V)" msgstr "视图(_V)"
#: src/diffuse/main.py:836 #: src/diffuse/main.py:844
msgid "_Syntax Highlighting" msgid "_Syntax Highlighting"
msgstr "_Syntax高亮" msgstr "_Syntax高亮"
#: src/diffuse/main.py:838 #: src/diffuse/main.py:846
msgid "Re_align All" msgid "Re_align All"
msgstr "重新对齐所有(_A)" msgstr "重新对齐所有(_A)"
#: src/diffuse/main.py:839 #: src/diffuse/main.py:847
msgid "_Isolate" msgid "_Isolate"
msgstr "分离(_I)" msgstr "分离(_I)"
#: src/diffuse/main.py:841 #: src/diffuse/main.py:849
msgid "_First Difference" msgid "_First Difference"
msgstr "第一个不同之处(_F)" msgstr "第一个不同之处(_F)"
#: src/diffuse/main.py:842 #: src/diffuse/main.py:850
msgid "_Previous Difference" msgid "_Previous Difference"
msgstr "前一个不同之处(_P)" msgstr "前一个不同之处(_P)"
#: src/diffuse/main.py:843 #: src/diffuse/main.py:851
msgid "_Next Difference" msgid "_Next Difference"
msgstr "下一个不同之处(_N)" msgstr "下一个不同之处(_N)"
#: src/diffuse/main.py:844 #: src/diffuse/main.py:852
msgid "_Last Difference" msgid "_Last Difference"
msgstr "最后一个不同之处(_L)" msgstr "最后一个不同之处(_L)"
#: src/diffuse/main.py:846 #: src/diffuse/main.py:854
msgid "Fir_st Tab" msgid "Fir_st Tab"
msgstr "第一个标签(_S)" msgstr "第一个标签(_S)"
#: src/diffuse/main.py:847 #: src/diffuse/main.py:855
msgid "Pre_vious Tab" msgid "Pre_vious Tab"
msgstr "前一个标签(_V)" msgstr "前一个标签(_V)"
#: src/diffuse/main.py:848 #: src/diffuse/main.py:856
msgid "Next _Tab" msgid "Next _Tab"
msgstr "下一个标签(_T)" msgstr "下一个标签(_T)"
#: src/diffuse/main.py:849 #: src/diffuse/main.py:857
msgid "Las_t Tab" msgid "Las_t Tab"
msgstr "最后一个标签(_T)" msgstr "最后一个标签(_T)"
#: src/diffuse/main.py:851 #: src/diffuse/main.py:859
msgid "Shift Pane _Right" msgid "Shift Pane _Right"
msgstr "右移窗格(_R)" msgstr "右移窗格(_R)"
#: src/diffuse/main.py:852 #: src/diffuse/main.py:860
msgid "Shift Pane _Left" msgid "Shift Pane _Left"
msgstr "左移窗格(_L)" msgstr "左移窗格(_L)"
#: src/diffuse/main.py:855 #: src/diffuse/main.py:863
msgid "F_ormat" msgid "F_ormat"
msgstr "格式(_O)" msgstr "格式(_O)"
#: src/diffuse/main.py:856 #: src/diffuse/main.py:864
msgid "Convert To _Upper Case" msgid "Convert To _Upper Case"
msgstr "转换成大写" msgstr "转换成大写"
#: src/diffuse/main.py:857 #: src/diffuse/main.py:865
msgid "Convert To _Lower Case" msgid "Convert To _Lower Case"
msgstr "转换成小写" msgstr "转换成小写"
#: src/diffuse/main.py:859 #: src/diffuse/main.py:867
msgid "Sort Lines In _Ascending Order" msgid "Sort Lines In _Ascending Order"
msgstr "以递增的顺序排列行" msgstr "以递增的顺序排列行"
#: src/diffuse/main.py:860 #: src/diffuse/main.py:868
msgid "Sort Lines In D_escending Order" msgid "Sort Lines In D_escending Order"
msgstr "以递减的顺序排列行" msgstr "以递减的顺序排列行"
#: src/diffuse/main.py:862 #: src/diffuse/main.py:870
msgid "Remove Trailing _White Space" msgid "Remove Trailing _White Space"
msgstr "删除多余的空格(_W)" msgstr "删除多余的空格(_W)"
#: src/diffuse/main.py:863 #: src/diffuse/main.py:871
msgid "Convert Tabs To _Spaces" msgid "Convert Tabs To _Spaces"
msgstr "转换制表符为空格(_S)" msgstr "转换制表符为空格(_S)"
#: src/diffuse/main.py:864 #: src/diffuse/main.py:872
msgid "Convert Leading Spaces To _Tabs" msgid "Convert Leading Spaces To _Tabs"
msgstr "转换开头的空格为制表符(_T)" msgstr "转换开头的空格为制表符(_T)"
#: src/diffuse/main.py:866 #: src/diffuse/main.py:874
msgid "_Increase Indenting" msgid "_Increase Indenting"
msgstr "减少缩进(_I)" msgstr "减少缩进(_I)"
#: src/diffuse/main.py:867 #: src/diffuse/main.py:875
msgid "De_crease Indenting" msgid "De_crease Indenting"
msgstr "减少缩进" msgstr "减少缩进"
#: src/diffuse/main.py:869 #: src/diffuse/main.py:877
msgid "Convert To _DOS Format" msgid "Convert To _DOS Format"
msgstr "转换为DOS格式(_D)" msgstr "转换为DOS格式(_D)"
#: src/diffuse/main.py:870 #: src/diffuse/main.py:878
msgid "Convert To _Mac Format" msgid "Convert To _Mac Format"
msgstr "转换为Mac格式(_M)" msgstr "转换为Mac格式(_M)"
#: src/diffuse/main.py:871 #: src/diffuse/main.py:879
msgid "Convert To Uni_x Format" msgid "Convert To Uni_x Format"
msgstr "转换为Unix格式(_X)" msgstr "转换为Unix格式(_X)"
#: src/diffuse/main.py:874 #: src/diffuse/main.py:882
msgid "_Merge" msgid "_Merge"
msgstr "合并(_M)" msgstr "合并(_M)"
#: src/diffuse/main.py:875 #: src/diffuse/main.py:883
msgid "Copy Selection _Right" msgid "Copy Selection _Right"
msgstr "复制选择之处到右边(_R)" msgstr "复制选择之处到右边(_R)"
#: src/diffuse/main.py:876 #: src/diffuse/main.py:884
msgid "Copy Selection _Left" msgid "Copy Selection _Left"
msgstr "复制选择之处到左边(_L)" msgstr "复制选择之处到左边(_L)"
#: src/diffuse/main.py:878 #: src/diffuse/main.py:886
msgid "Copy Left _Into Selection" msgid "Copy Left _Into Selection"
msgstr "复制左边内容到选择之处(_L)" msgstr "复制左边内容到选择之处(_L)"
#: src/diffuse/main.py:879 #: src/diffuse/main.py:887
msgid "Copy Right I_nto Selection" msgid "Copy Right I_nto Selection"
msgstr "复制右边内容到选择之处(_L)" msgstr "复制右边内容到选择之处(_L)"
#: src/diffuse/main.py:880 #: src/diffuse/main.py:888
msgid "_Merge From Left Then Right" msgid "_Merge From Left Then Right"
msgstr "先左再右合并(_M)" msgstr "先左再右合并(_M)"
#: src/diffuse/main.py:881 #: src/diffuse/main.py:889
msgid "M_erge From Right Then Left" msgid "M_erge From Right Then Left"
msgstr "先右后左合并(_E)" msgstr "先右后左合并(_E)"
#: src/diffuse/main.py:884 #: src/diffuse/main.py:892
msgid "_Help" msgid "_Help"
msgstr "帮助(_H)" msgstr "帮助(_H)"
#: src/diffuse/main.py:885 #: src/diffuse/main.py:893
msgid "_Help Contents..." msgid "_Help Contents..."
msgstr "帮助内容(_H)" msgstr "帮助内容(_H)"
#: src/diffuse/main.py:887 #: src/diffuse/main.py:895
#, python-format #, python-format
msgid "_About %s..." msgid "_About %s..."
msgstr "关于%s(_A)" msgstr "关于%s(_A)"
#: src/diffuse/main.py:902 #: src/diffuse/main.py:910
msgid "New 2-Way File Merge" msgid "New 2-Way File Merge"
msgstr "新建2方文件合并" msgstr "新建2方文件合并"
#: src/diffuse/main.py:903 #: src/diffuse/main.py:911
msgid "New 3-Way File Merge" msgid "New 3-Way File Merge"
msgstr "新建3方文件合并" msgstr "新建3方文件合并"
#: src/diffuse/main.py:905 #: src/diffuse/main.py:913
msgid "Realign All" msgid "Realign All"
msgstr "重新对齐所有" msgstr "重新对齐所有"
#: src/diffuse/main.py:906 #: src/diffuse/main.py:914
msgid "First Difference" msgid "First Difference"
msgstr "第一个不同之处" msgstr "第一个不同之处"
#: src/diffuse/main.py:907 #: src/diffuse/main.py:915
msgid "Previous Difference" msgid "Previous Difference"
msgstr "前一个不同之处" msgstr "前一个不同之处"
#: src/diffuse/main.py:908 #: src/diffuse/main.py:916
msgid "Next Difference" msgid "Next Difference"
msgstr "下一个不同之处" msgstr "下一个不同之处"
#: src/diffuse/main.py:909 #: src/diffuse/main.py:917
msgid "Last Difference" msgid "Last Difference"
msgstr "最后一个不同之处" msgstr "最后一个不同之处"
#: src/diffuse/main.py:911 #: src/diffuse/main.py:919
msgid "Copy Selection Right" msgid "Copy Selection Right"
msgstr "复制选择之处到右边" msgstr "复制选择之处到右边"
#: src/diffuse/main.py:912 #: src/diffuse/main.py:920
msgid "Copy Selection Left" msgid "Copy Selection Left"
msgstr "复制选择之处到左边" msgstr "复制选择之处到左边"
#: src/diffuse/main.py:913 #: src/diffuse/main.py:921
msgid "Copy Left Into Selection" msgid "Copy Left Into Selection"
msgstr "复制左边内容到选择之处" msgstr "复制左边内容到选择之处"
#: src/diffuse/main.py:914 #: src/diffuse/main.py:922
msgid "Copy Right Into Selection" msgid "Copy Right Into Selection"
msgstr "复制右边内容到选择之处" msgstr "复制右边内容到选择之处"
#: src/diffuse/main.py:915 #: src/diffuse/main.py:923
msgid "Merge From Left Then Right" msgid "Merge From Left Then Right"
msgstr "先左后右合并" msgstr "先左后右合并"
#: src/diffuse/main.py:916 #: src/diffuse/main.py:924
msgid "Merge From Right Then Left" msgid "Merge From Right Then Left"
msgstr "先右后左合并(_T)" msgstr "先右后左合并(_T)"
#: src/diffuse/main.py:918 #: src/diffuse/main.py:926
msgid "Undo" msgid "Undo"
msgstr "恢复" msgstr "恢复"
#: src/diffuse/main.py:919 #: src/diffuse/main.py:927
msgid "Redo" msgid "Redo"
msgstr "重做" msgstr "重做"
#: src/diffuse/main.py:920 src/diffuse/widgets.py:1847 #: src/diffuse/main.py:928 src/diffuse/widgets.py:1849
msgid "Cut" msgid "Cut"
msgstr "剪切" msgstr "剪切"
#: src/diffuse/main.py:921 src/diffuse/widgets.py:1848 #: src/diffuse/main.py:929 src/diffuse/widgets.py:1850
msgid "Copy" msgid "Copy"
msgstr "复制" msgstr "复制"
#: src/diffuse/main.py:922 src/diffuse/widgets.py:1849 #: src/diffuse/main.py:930 src/diffuse/widgets.py:1851
msgid "Paste" msgid "Paste"
msgstr "粘贴" msgstr "粘贴"
#: src/diffuse/main.py:923 src/diffuse/widgets.py:1852 #: src/diffuse/main.py:931 src/diffuse/widgets.py:1854
msgid "Clear Edits" msgid "Clear Edits"
msgstr "取消编辑" msgstr "取消编辑"
#: src/diffuse/main.py:1046 #: src/diffuse/main.py:1054
msgid "Some files have unsaved changes. Select the files to save before closing." msgid "Some files have unsaved changes. Select the files to save before closing."
msgstr "一些文件包含未保存的更改。请在关闭前保存这些文件。" msgstr "一些文件包含未保存的更改。请在关闭前保存这些文件。"
#: src/diffuse/main.py:1060 #: src/diffuse/main.py:1068
msgid "Tab" msgid "Tab"
msgstr "标签" msgstr "标签"
#: src/diffuse/main.py:1065 #: src/diffuse/main.py:1073
msgid "Pane" msgid "Pane"
msgstr "窗格" msgstr "窗格"
#: src/diffuse/main.py:1076 #: src/diffuse/main.py:1084
msgid "Close _Without Saving" msgid "Close _Without Saving"
msgstr "不保存而关闭" msgstr "不保存而关闭"
#: src/diffuse/main.py:1115 #: src/diffuse/main.py:1123
#, python-format #, python-format
msgid "Closing this tab will quit %s." msgid "Closing this tab will quit %s."
msgstr "关闭此标签将会退出%s" msgstr "关闭此标签将会退出%s"
#: src/diffuse/main.py:1198 #: src/diffuse/main.py:1206
#, python-format #, python-format
msgid "File Merge %d" msgid "File Merge %d"
msgstr "文件合并%d" msgstr "文件合并%d"
#: src/diffuse/main.py:1304 #: src/diffuse/main.py:1312
#, python-format #, python-format
msgid "Error retrieving commits for %s." msgid "Error retrieving commits for %s."
msgstr "錯誤修改提交%s。" msgstr "錯誤修改提交%s。"
#: src/diffuse/main.py:1336 #: src/diffuse/main.py:1344
#, python-format #, python-format
msgid "Error retrieving modifications for %s." msgid "Error retrieving modifications for %s."
msgstr "无法恢复对%s的修改。" msgstr "无法恢复对%s的修改。"
#: src/diffuse/main.py:1369 #: src/diffuse/main.py:1377
msgid "Open File In New Tab" msgid "Open File In New Tab"
msgstr "在新标签里打开文件" msgstr "在新标签里打开文件"
#: src/diffuse/main.py:1392 #: src/diffuse/main.py:1400
msgid "Choose Folder With Modified Files" msgid "Choose Folder With Modified Files"
msgstr "选择更改过的文件夹" msgstr "选择更改过的文件夹"
#: src/diffuse/main.py:1410 #: src/diffuse/main.py:1418
msgid "No modified files found." msgid "No modified files found."
msgstr "没有找到修改过的文件。" msgstr "没有找到修改过的文件。"
#: src/diffuse/main.py:1416 #: src/diffuse/main.py:1424
msgid "Choose Folder With Commit" msgid "Choose Folder With Commit"
msgstr "选择提交的文件夹" msgstr "选择提交的文件夹"
#: src/diffuse/main.py:1436 #: src/diffuse/main.py:1444
msgid "No committed files found." msgid "No committed files found."
msgstr "没有找到提交的文件。" msgstr "没有找到提交的文件。"
#: src/diffuse/main.py:1472 #: src/diffuse/main.py:1480
msgid "New N-Way File Merge..." msgid "New N-Way File Merge..."
msgstr "新建多方文件合并" msgstr "新建多方文件合并"
#: src/diffuse/main.py:1473 #: src/diffuse/main.py:1481
msgid "Number of panes: " msgid "Number of panes: "
msgstr "窗格数: " msgstr "窗格数: "
#: src/diffuse/main.py:1547 #: src/diffuse/main.py:1555
msgid "Phrase not found. Continue from the end of the file?" msgid "Phrase not found. Continue from the end of the file?"
msgstr "短语未找到，从文件结尾继续吗？" msgstr "短语未找到，从文件结尾继续吗？"
#: src/diffuse/main.py:1549 #: src/diffuse/main.py:1557
msgid "Phrase not found. Continue from the start of the file?" msgid "Phrase not found. Continue from the start of the file?"
msgstr "短语未找到，从文件开头继续吗？" msgstr "短语未找到，从文件开头继续吗？"
#: src/diffuse/main.py:1770 #: src/diffuse/main.py:1778
#, fuzzy #, fuzzy
msgid "" msgid ""
"Usage:\n" "Usage:\n"
@ -680,174 +663,174 @@ msgstr ""
" ( -i | --ignore-case ) 忽略小结的不同\n" " ( -i | --ignore-case ) 忽略小结的不同\n"
" ( -w | --ignore-all-space ) 忽略所有空白的不同" " ( -w | --ignore-all-space ) 忽略所有空白的不同"
#: src/diffuse/main.py:1937 #: src/diffuse/main.py:1945
msgid "Error parsing line number." msgid "Error parsing line number."
msgstr "解析行数时错误。" msgstr "解析行数时错误。"
#: src/diffuse/main.py:1947 #: src/diffuse/main.py:1955
#, python-format #, python-format
msgid "Skipping unknown argument \"%s\"." msgid "Skipping unknown argument \"%s\"."
msgstr "跳过未知参数\"%s\"。" msgstr "跳过未知参数\"%s\"。"
#: src/diffuse/main.py:1955 #: src/diffuse/main.py:1963
#, python-format #, python-format
msgid "Error processing argument \"%s\". Directory not expected." msgid "Error processing argument \"%s\". Directory not expected."
msgstr "无法处理\"%s\"。目录不存在。" msgstr "无法处理\"%s\"。目录不存在。"
#: src/diffuse/preferences.py:79 #: src/diffuse/preferences.py:80
msgid "Display" msgid "Display"
msgstr "显示" msgstr "显示"
#: src/diffuse/preferences.py:82 #: src/diffuse/preferences.py:83
msgid "Font" msgid "Font"
msgstr "字体" msgstr "字体"
#: src/diffuse/preferences.py:83 #: src/diffuse/preferences.py:84
msgid "Tab width" msgid "Tab width"
msgstr "制表符宽度" msgstr "制表符宽度"
#: src/diffuse/preferences.py:84 #: src/diffuse/preferences.py:85
msgid "Show right margin" msgid "Show right margin"
msgstr "显示右边距" msgstr "显示右边距"
#: src/diffuse/preferences.py:85 #: src/diffuse/preferences.py:86
msgid "Right margin" msgid "Right margin"
msgstr "右边距" msgstr "右边距"
#: src/diffuse/preferences.py:86 #: src/diffuse/preferences.py:87
msgid "Show line numbers" msgid "Show line numbers"
msgstr "显示行号" msgstr "显示行号"
#: src/diffuse/preferences.py:87 #: src/diffuse/preferences.py:88
msgid "Show white space characters" msgid "Show white space characters"
msgstr "显示空格字符" msgstr "显示空格字符"
#: src/diffuse/preferences.py:88 #: src/diffuse/preferences.py:89
msgid "Ignore case differences" msgid "Ignore case differences"
msgstr "忽略大小写的不同" msgstr "忽略大小写的不同"
#: src/diffuse/preferences.py:89 #: src/diffuse/preferences.py:90
msgid "Ignore white space differences" msgid "Ignore white space differences"
msgstr "忽略空格的不同" msgstr "忽略空格的不同"
#: src/diffuse/preferences.py:90 src/diffuse/preferences.py:99 #: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100
msgid "Ignore changes to white space" msgid "Ignore changes to white space"
msgstr "忽略对空格的改变" msgstr "忽略对空格的改变"
#: src/diffuse/preferences.py:91 #: src/diffuse/preferences.py:92
msgid "Ignore blank line differences" msgid "Ignore blank line differences"
msgstr "忽略空行的不同" msgstr "忽略空行的不同"
#: src/diffuse/preferences.py:92 #: src/diffuse/preferences.py:93
msgid "Ignore end of line differences" msgid "Ignore end of line differences"
msgstr "忽略行尾的不同" msgstr "忽略行尾的不同"
#: src/diffuse/preferences.py:94 #: src/diffuse/preferences.py:95
msgid "Alignment" msgid "Alignment"
msgstr "对齐" msgstr "对齐"
#: src/diffuse/preferences.py:97 #: src/diffuse/preferences.py:98
msgid "Ignore case" msgid "Ignore case"
msgstr "忽略大小写" msgstr "忽略大小写"
#: src/diffuse/preferences.py:98 #: src/diffuse/preferences.py:99
msgid "Ignore white space" msgid "Ignore white space"
msgstr "忽略空格" msgstr "忽略空格"
#: src/diffuse/preferences.py:100 #: src/diffuse/preferences.py:101
msgid "Ignore blank lines" msgid "Ignore blank lines"
msgstr "忽略空行" msgstr "忽略空行"
#: src/diffuse/preferences.py:101 #: src/diffuse/preferences.py:102
msgid "Ignore end of line characters" msgid "Ignore end of line characters"
msgstr "忽略行尾结束符" msgstr "忽略行尾结束符"
#: src/diffuse/preferences.py:103 #: src/diffuse/preferences.py:104
msgid "Editor" msgid "Editor"
msgstr "编辑器" msgstr "编辑器"
#: src/diffuse/preferences.py:106 #: src/diffuse/preferences.py:107
msgid "Auto indent" msgid "Auto indent"
msgstr "自动缩进" msgstr "自动缩进"
#: src/diffuse/preferences.py:107 #: src/diffuse/preferences.py:108
msgid "Expand tabs to spaces" msgid "Expand tabs to spaces"
msgstr "展开制表符为空格" msgstr "展开制表符为空格"
#: src/diffuse/preferences.py:108 #: src/diffuse/preferences.py:109
msgid "Soft tab width" msgid "Soft tab width"
msgstr "软制表符宽度" msgstr "软制表符宽度"
#: src/diffuse/preferences.py:110 #: src/diffuse/preferences.py:111
msgid "Tabs" msgid "Tabs"
msgstr "标签" msgstr "标签"
#: src/diffuse/preferences.py:113 #: src/diffuse/preferences.py:114
msgid "Default panes" msgid "Default panes"
msgstr "默认窗格" msgstr "默认窗格"
#: src/diffuse/preferences.py:114 #: src/diffuse/preferences.py:115
msgid "Always show the tab bar" msgid "Always show the tab bar"
msgstr "总是显示标签栏" msgstr "总是显示标签栏"
#: src/diffuse/preferences.py:115 #: src/diffuse/preferences.py:116
#, python-format #, python-format
msgid "Warn me when closing a tab will quit %s" msgid "Warn me when closing a tab will quit %s"
msgstr "当关闭标签会退出%s的时候提醒我" msgstr "当关闭标签会退出%s的时候提醒我"
#: src/diffuse/preferences.py:117 #: src/diffuse/preferences.py:118
msgid "Regional Settings" msgid "Regional Settings"
msgstr "区域性设置" msgstr "区域性设置"
#: src/diffuse/preferences.py:120 #: src/diffuse/preferences.py:121
msgid "Default codec" msgid "Default codec"
msgstr "默认编码" msgstr "默认编码"
#: src/diffuse/preferences.py:121 #: src/diffuse/preferences.py:122
msgid "Order of codecs used to identify encoding" msgid "Order of codecs used to identify encoding"
msgstr "用来识别编码的编码顺序" msgstr "用来识别编码的编码顺序"
#: src/diffuse/preferences.py:142 #: src/diffuse/preferences.py:143
msgid "Cygwin" msgid "Cygwin"
msgstr "" msgstr ""
#: src/diffuse/preferences.py:144 #: src/diffuse/preferences.py:145
msgid "Root directory" msgid "Root directory"
msgstr "根目录" msgstr "根目录"
#: src/diffuse/preferences.py:145 #: src/diffuse/preferences.py:146
msgid "Cygdrive prefix" msgid "Cygdrive prefix"
msgstr "" msgstr ""
#: src/diffuse/preferences.py:164 #: src/diffuse/preferences.py:165
msgid "Version control system search order" msgid "Version control system search order"
msgstr "" msgstr ""
#: src/diffuse/preferences.py:172 #: src/diffuse/preferences.py:173
msgid "\"co\" command" msgid "\"co\" command"
msgstr "\"co\"命令" msgstr "\"co\"命令"
#: src/diffuse/preferences.py:173 #: src/diffuse/preferences.py:174
msgid "\"rlog\" command" msgid "\"rlog\" command"
msgstr "\"rlog\"命令" msgstr "\"rlog\"命令"
#: src/diffuse/preferences.py:175 #: src/diffuse/preferences.py:176
msgid "Command" msgid "Command"
msgstr "命令" msgstr "命令"
#: src/diffuse/preferences.py:181 #: src/diffuse/preferences.py:182
msgid "Launch from a Bash login shell" msgid "Launch from a Bash login shell"
msgstr "从命令行登录界面加载" msgstr "从命令行登录界面加载"
#: src/diffuse/preferences.py:188 #: src/diffuse/preferences.py:189
msgid "Update paths for Cygwin" msgid "Update paths for Cygwin"
msgstr "为Cygwin更新路径" msgstr "为Cygwin更新路径"
#: src/diffuse/preferences.py:193 #: src/diffuse/preferences.py:194
msgid "Version Control" msgid "Version Control"
msgstr "版本控制" msgstr "版本控制"
#: src/diffuse/preferences.py:258 #: src/diffuse/preferences.py:259
msgid "Preferences" msgid "Preferences"
msgstr "首选项" msgstr "首选项"
@ -879,7 +862,7 @@ msgstr ""
#: src/diffuse/resources.py:409 #: src/diffuse/resources.py:409
#, python-brace-format #, python-brace-format
msgid "Options \"{option}\" is unknown" msgid "Option \"{option}\" is unknown"
msgstr "" msgstr ""
#: src/diffuse/resources.py:416 #: src/diffuse/resources.py:416
@ -932,37 +915,37 @@ msgstr "处理到文件{file}的{line}行时出错。"
msgid "Unhandled error at line {line} of {file}." msgid "Unhandled error at line {line} of {file}."
msgstr "处理到文件{file}的{line}行时出错。" msgstr "处理到文件{file}的{line}行时出错。"
#: src/diffuse/utils.py:63 #: src/diffuse/utils.py:66
msgid "Auto Detect" msgid "Auto Detect"
msgstr "自动探测" msgstr "自动探测"
#: src/diffuse/vcs/cvs.py:53 src/diffuse/vcs/rcs.py:62 src/diffuse/vcs/svn.py:95 #: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97
#, python-format #, python-format
msgid "Error parsing revision %s." msgid "Error parsing revision %s."
msgstr "无法解析修订版本%s。" msgstr "无法解析修订版本%s。"
#: src/diffuse/vcs/vcs_registry.py:233 #: src/diffuse/vcs/vcs_registry.py:238
#, python-format #, python-format
msgid "Error parsing %s." msgid "Error parsing %s."
msgstr "无法解析%s。" msgstr "无法解析%s。"
#: src/diffuse/widgets.py:1843 #: src/diffuse/widgets.py:1845
msgid "Align with Selection" msgid "Align with Selection"
msgstr "向选中的对齐" msgstr "向选中的对齐"
#: src/diffuse/widgets.py:1844 #: src/diffuse/widgets.py:1846
msgid "Isolate" msgid "Isolate"
msgstr "分离" msgstr "分离"
#: src/diffuse/widgets.py:1845 #: src/diffuse/widgets.py:1847
msgid "Merge Selection" msgid "Merge Selection"
msgstr "合并选择之处" msgstr "合并选择之处"
#: src/diffuse/widgets.py:1851 #: src/diffuse/widgets.py:1853
msgid "Select All" msgid "Select All"
msgstr "选择所有" msgstr "选择所有"
#: src/diffuse/widgets.py:1854 #: src/diffuse/widgets.py:1856
msgid "Swap with Selected Pane" msgid "Swap with Selected Pane"
msgstr "交换选中的窗格" msgstr "交换选中的窗格"

411
po/zh_TW.po
View File

@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: diffuse 0.4.8\n" "Project-Id-Version: diffuse 0.4.8\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-11-27 21:56-0500\n" "POT-Creation-Date: 2022-04-04 12:14-0400\n"
"PO-Revision-Date: 2020-06-29 14:49-0400\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n"
"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n" "Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@ -40,7 +40,7 @@ msgstr ""
msgid "Main window: diff between two files" msgid "Main window: diff between two files"
msgstr "" msgstr ""
#: src/diffuse/constants.py:24 #: src/diffuse/constants.py:25
msgid "Copyright" msgid "Copyright"
msgstr "著作權" msgstr "著作權"
@ -54,35 +54,6 @@ msgstr ""
"紀明村 <tw.chi.ming@gmail.com>\n" "紀明村 <tw.chi.ming@gmail.com>\n"
"趙惟倫 <bluebat@member.fsf.org>" "趙惟倫 <bluebat@member.fsf.org>"
#: src/diffuse/dialogs.py:49
#, fuzzy
msgid ""
"This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
"the Free Software Foundation; either version 2 of the License, or\n"
"(at your option) any later version.\n"
"\n"
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
"GNU General Public License for more details.\n"
"\n"
"You should have received a copy of the GNU General Public License along\n"
"with this program; if not, write to the Free Software Foundation, Inc.,\n"
"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
msgstr ""
"這個程式是自由軟體；您可以遵循由自由軟體基金會所發布的 GNU 通用公共授權條款來再次"
"散布它與/或修改它；無論您依據的是本授權的第二版、或 (您自行選擇的) 任何後續版"
"本。\n"
"\n"
"發行本程式是希望它能夠有用，但是沒有任何擔保；亦無對於某一特定目的之適售性與適用性"
"的暗示性擔保。 請參看 GNU 通用公共授權以獲得更多細節。\n"
"\n"
"您應該已經收到隨附於這個程式的 GNU 通用公共授權複本。 您也可以藉由造訪它們的網站 "
"(http://www.fsf.org/)，從自由軟體基金會得到 GNU 通用公共授權的複本，或是寫信給 "
"Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA "
"02110-1301 USA\n"
#: src/diffuse/dialogs.py:83 #: src/diffuse/dialogs.py:83
msgid "Encoding: " msgid "Encoding: "
msgstr "編碼：" msgstr "編碼："
@ -107,60 +78,60 @@ msgstr "符合大小寫"
msgid "Search Backwards" msgid "Search Backwards"
msgstr "反向搜尋" msgstr "反向搜尋"
#: src/diffuse/main.py:79 #: src/diffuse/main.py:85
msgid "Close Tab" msgid "Close Tab"
msgstr "關閉分頁" msgstr "關閉分頁"
#: src/diffuse/main.py:124 #: src/diffuse/main.py:132
msgid "Open File..." msgid "Open File..."
msgstr "開啟檔案…" msgstr "開啟檔案…"
#: src/diffuse/main.py:125 #: src/diffuse/main.py:133
msgid "Reload File" msgid "Reload File"
msgstr "重新載入" msgstr "重新載入"
#: src/diffuse/main.py:126 #: src/diffuse/main.py:134
msgid "Save File" msgid "Save File"
msgstr "儲存檔案" msgstr "儲存檔案"
#: src/diffuse/main.py:127 #: src/diffuse/main.py:135
msgid "Save File As..." msgid "Save File As..."
msgstr "另存為…" msgstr "另存為…"
#: src/diffuse/main.py:280 #: src/diffuse/main.py:288
msgid "Save changes before loading the new file?" msgid "Save changes before loading the new file?"
msgstr "載入新檔前儲存更改嗎？" msgstr "載入新檔前儲存更改嗎？"
#: src/diffuse/main.py:391 #: src/diffuse/main.py:399
#, python-format #, python-format
msgid "Error reading revision %(rev)s of %(file)s." msgid "Error reading revision %(rev)s of %(file)s."
msgstr "無法讀取檔案 %(file)s 中的修訂版本 %(rev)s。" msgstr "無法讀取檔案 %(file)s 中的修訂版本 %(rev)s。"
#: src/diffuse/main.py:394 src/diffuse/main.py:1849 #: src/diffuse/main.py:402 src/diffuse/main.py:1857
#, python-format #, python-format
msgid "Error reading %s." msgid "Error reading %s."
msgstr "無法讀取 %s。" msgstr "無法讀取 %s。"
#: src/diffuse/main.py:416 #: src/diffuse/main.py:424
msgid "Open File" msgid "Open File"
msgstr "開啟檔案" msgstr "開啟檔案"
#: src/diffuse/main.py:473 #: src/diffuse/main.py:481
#, python-format #, python-format
msgid "The file %s changed on disk. Do you want to reload the file?" msgid "The file %s changed on disk. Do you want to reload the file?"
msgstr "檔案 %s 已被更改，是否重新載入？" msgstr "檔案 %s 已被更改，是否重新載入？"
#: src/diffuse/main.py:499 #: src/diffuse/main.py:507
#, python-format #, python-format
msgid "Save %(title)s Pane %(pane)d" msgid "Save %(title)s Pane %(pane)d"
msgstr "儲存 %(title)s 窗格 %(pane)d" msgstr "儲存 %(title)s 窗格 %(pane)d"
#: src/diffuse/main.py:531 #: src/diffuse/main.py:539
#, python-format #, python-format
msgid "A file named %s already exists. Do you want to overwrite it?" msgid "A file named %s already exists. Do you want to overwrite it?"
msgstr "%s 的檔案已存在，您希望覆蓋它嗎？" msgstr "%s 的檔案已存在，您希望覆蓋它嗎？"
#: src/diffuse/main.py:538 #: src/diffuse/main.py:546
#, python-format #, python-format
msgid "" msgid ""
"The file %s has been modified by another process since reading it. If you save, " "The file %s has been modified by another process since reading it. If you save, "
@ -168,458 +139,458 @@ msgid ""
msgstr "" msgstr ""
"檔案 %s 打開後被其他程式變更過了，如果儲存，其他程式的變更修改將會不見，儲存嗎？" "檔案 %s 打開後被其他程式變更過了，如果儲存，其他程式的變更修改將會不見，儲存嗎？"
#: src/diffuse/main.py:580 #: src/diffuse/main.py:588
#, python-format #, python-format
msgid "Error encoding to %s." msgid "Error encoding to %s."
msgstr "無法編碼為 %s。" msgstr "無法編碼為 %s。"
#: src/diffuse/main.py:584 src/diffuse/preferences.py:298 #: src/diffuse/main.py:592 src/diffuse/preferences.py:299
#, python-format #, python-format
msgid "Error writing %s." msgid "Error writing %s."
msgstr "無法寫入 %s" msgstr "無法寫入 %s"
#: src/diffuse/main.py:614 #: src/diffuse/main.py:622
msgid "Go To Line..." msgid "Go To Line..."
msgstr "跳到列號…" msgstr "跳到列號…"
#: src/diffuse/main.py:615 #: src/diffuse/main.py:623
msgid "Line Number: " msgid "Line Number: "
msgstr "列數：" msgstr "列數："
#: src/diffuse/main.py:646 #: src/diffuse/main.py:654
msgid "" msgid ""
"Press the enter key or double click to edit. Press the space bar or use the RMB " "Press the enter key or double click to edit. Press the space bar or use the RMB "
"menu to manually align." "menu to manually align."
msgstr "按確定鍵或雙擊滑鼠進行編輯。空格鍵或者右鍵選單手動對齊。" msgstr "按確定鍵或雙擊滑鼠進行編輯。空格鍵或者右鍵選單手動對齊。"
#: src/diffuse/main.py:650 #: src/diffuse/main.py:658
msgid "Press the escape key to finish editing." msgid "Press the escape key to finish editing."
msgstr "按 ESC 鍵結束編輯" msgstr "按 ESC 鍵結束編輯"
#: src/diffuse/main.py:653 #: src/diffuse/main.py:661
msgid "" msgid ""
"Select target line and press the space bar to align. Press the escape key to " "Select target line and press the space bar to align. Press the escape key to "
"cancel." "cancel."
msgstr "選擇目標列然後按空格鍵進行對齊，按 ESC 取消。" msgstr "選擇目標列然後按空格鍵進行對齊，按 ESC 取消。"
#: src/diffuse/main.py:776 #: src/diffuse/main.py:784
msgid "_File" msgid "_File"
msgstr "檔案(_F)" msgstr "檔案(_F)"
#: src/diffuse/main.py:777 #: src/diffuse/main.py:785
msgid "_Open File..." msgid "_Open File..."
msgstr "開啟檔案(_O)…" msgstr "開啟檔案(_O)…"
#: src/diffuse/main.py:778 #: src/diffuse/main.py:786
msgid "Open File In New _Tab..." msgid "Open File In New _Tab..."
msgstr "在新分頁裡開啟檔案(_T)…" msgstr "在新分頁裡開啟檔案(_T)…"
#: src/diffuse/main.py:779 #: src/diffuse/main.py:787
msgid "Open _Modified Files..." msgid "Open _Modified Files..."
msgstr "開啟修改過的檔案(_M)…" msgstr "開啟修改過的檔案(_M)…"
#: src/diffuse/main.py:780 #: src/diffuse/main.py:788
msgid "Open Commi_t..." msgid "Open Commi_t..."
msgstr "開啟認可(_T)…" msgstr "開啟認可(_T)…"
#: src/diffuse/main.py:781 #: src/diffuse/main.py:789
msgid "_Reload File" msgid "_Reload File"
msgstr "重新載入(_R)" msgstr "重新載入(_R)"
#: src/diffuse/main.py:783 #: src/diffuse/main.py:791
msgid "_Save File" msgid "_Save File"
msgstr "儲存(_S)" msgstr "儲存(_S)"
#: src/diffuse/main.py:784 #: src/diffuse/main.py:792
msgid "Save File _As..." msgid "Save File _As..."
msgstr "另存為(_A)…" msgstr "另存為(_A)…"
#: src/diffuse/main.py:785 #: src/diffuse/main.py:793
msgid "Save A_ll" msgid "Save A_ll"
msgstr "儲存所有(_L)" msgstr "儲存所有(_L)"
#: src/diffuse/main.py:787 #: src/diffuse/main.py:795
msgid "New _2-Way File Merge" msgid "New _2-Way File Merge"
msgstr "新的二重檔案合併(_2)" msgstr "新的二重檔案合併(_2)"
#: src/diffuse/main.py:788 #: src/diffuse/main.py:796
msgid "New _3-Way File Merge" msgid "New _3-Way File Merge"
msgstr "新的三重檔案合併(_3)" msgstr "新的三重檔案合併(_3)"
#: src/diffuse/main.py:789 #: src/diffuse/main.py:797
msgid "New _N-Way File Merge..." msgid "New _N-Way File Merge..."
msgstr "新的多重檔案合併(_N)…" msgstr "新的多重檔案合併(_N)…"
#: src/diffuse/main.py:791 #: src/diffuse/main.py:799
msgid "_Close Tab" msgid "_Close Tab"
msgstr "關閉分頁(_C)" msgstr "關閉分頁(_C)"
#: src/diffuse/main.py:792 #: src/diffuse/main.py:800
msgid "_Undo Close Tab" msgid "_Undo Close Tab"
msgstr "復原關閉的分頁" msgstr "復原關閉的分頁"
#: src/diffuse/main.py:793 #: src/diffuse/main.py:801
msgid "_Quit" msgid "_Quit"
msgstr "退出(_Q)" msgstr "退出(_Q)"
#: src/diffuse/main.py:796 #: src/diffuse/main.py:804
msgid "_Edit" msgid "_Edit"
msgstr "編輯(_E)" msgstr "編輯(_E)"
#: src/diffuse/main.py:797 #: src/diffuse/main.py:805
msgid "_Undo" msgid "_Undo"
msgstr "復原(_U)" msgstr "復原(_U)"
#: src/diffuse/main.py:798 #: src/diffuse/main.py:806
msgid "_Redo" msgid "_Redo"
msgstr "重做(_R)" msgstr "重做(_R)"
#: src/diffuse/main.py:800 #: src/diffuse/main.py:808
msgid "Cu_t" msgid "Cu_t"
msgstr "剪下(_T)" msgstr "剪下(_T)"
#: src/diffuse/main.py:801 #: src/diffuse/main.py:809
msgid "_Copy" msgid "_Copy"
msgstr "複製(_C)" msgstr "複製(_C)"
#: src/diffuse/main.py:802 #: src/diffuse/main.py:810
msgid "_Paste" msgid "_Paste"
msgstr "貼上(_P)" msgstr "貼上(_P)"
#: src/diffuse/main.py:804 #: src/diffuse/main.py:812
msgid "Select _All" msgid "Select _All"
msgstr "全選(_A)" msgstr "全選(_A)"
#: src/diffuse/main.py:805 #: src/diffuse/main.py:813
msgid "C_lear Edits" msgid "C_lear Edits"
msgstr "取消編輯(L)" msgstr "取消編輯(L)"
#: src/diffuse/main.py:806 #: src/diffuse/main.py:814
msgid "_Dismiss All Edits" msgid "_Dismiss All Edits"
msgstr "放棄所有的變更(_D)" msgstr "放棄所有的變更(_D)"
#: src/diffuse/main.py:808 #: src/diffuse/main.py:816
msgid "_Find..." msgid "_Find..."
msgstr "搜尋(_F)…" msgstr "搜尋(_F)…"
#: src/diffuse/main.py:809 #: src/diffuse/main.py:817
msgid "Find _Next" msgid "Find _Next"
msgstr "找下一個(_N)" msgstr "找下一個(_N)"
#: src/diffuse/main.py:810 #: src/diffuse/main.py:818
msgid "Find Pre_vious" msgid "Find Pre_vious"
msgstr "找上一個(_V)" msgstr "找上一個(_V)"
#: src/diffuse/main.py:811 #: src/diffuse/main.py:819
msgid "_Go To Line..." msgid "_Go To Line..."
msgstr "跳到列號(_G)…" msgstr "跳到列號(_G)…"
#: src/diffuse/main.py:813 #: src/diffuse/main.py:821
msgid "Pr_eferences..." msgid "Pr_eferences..."
msgstr "選項(_E)…" msgstr "選項(_E)…"
#: src/diffuse/main.py:817 #: src/diffuse/main.py:825
msgid "None" msgid "None"
msgstr "無" msgstr "無"
#: src/diffuse/main.py:835 #: src/diffuse/main.py:843
msgid "_View" msgid "_View"
msgstr "檢視(_V)" msgstr "檢視(_V)"
#: src/diffuse/main.py:836 #: src/diffuse/main.py:844
msgid "_Syntax Highlighting" msgid "_Syntax Highlighting"
msgstr "高亮度語法(_S)" msgstr "高亮度語法(_S)"
#: src/diffuse/main.py:838 #: src/diffuse/main.py:846
msgid "Re_align All" msgid "Re_align All"
msgstr "全部重新對齊(_A)" msgstr "全部重新對齊(_A)"
#: src/diffuse/main.py:839 #: src/diffuse/main.py:847
msgid "_Isolate" msgid "_Isolate"
msgstr "分離(_I)" msgstr "分離(_I)"
#: src/diffuse/main.py:841 #: src/diffuse/main.py:849
msgid "_First Difference" msgid "_First Difference"
msgstr "第一個差異(_F)" msgstr "第一個差異(_F)"
#: src/diffuse/main.py:842 #: src/diffuse/main.py:850
msgid "_Previous Difference" msgid "_Previous Difference"
msgstr "上一個差異(_P)" msgstr "上一個差異(_P)"
#: src/diffuse/main.py:843 #: src/diffuse/main.py:851
msgid "_Next Difference" msgid "_Next Difference"
msgstr "下一個差異(_N)" msgstr "下一個差異(_N)"
#: src/diffuse/main.py:844 #: src/diffuse/main.py:852
msgid "_Last Difference" msgid "_Last Difference"
msgstr "最後一個差異(_L)" msgstr "最後一個差異(_L)"
#: src/diffuse/main.py:846 #: src/diffuse/main.py:854
msgid "Fir_st Tab" msgid "Fir_st Tab"
msgstr "第一個分頁(_S)" msgstr "第一個分頁(_S)"
#: src/diffuse/main.py:847 #: src/diffuse/main.py:855
msgid "Pre_vious Tab" msgid "Pre_vious Tab"
msgstr "上一個分頁(_V)" msgstr "上一個分頁(_V)"
#: src/diffuse/main.py:848 #: src/diffuse/main.py:856
msgid "Next _Tab" msgid "Next _Tab"
msgstr "下一個分頁(_T)" msgstr "下一個分頁(_T)"
#: src/diffuse/main.py:849 #: src/diffuse/main.py:857
msgid "Las_t Tab" msgid "Las_t Tab"
msgstr "最後一個分頁(_T)" msgstr "最後一個分頁(_T)"
#: src/diffuse/main.py:851 #: src/diffuse/main.py:859
msgid "Shift Pane _Right" msgid "Shift Pane _Right"
msgstr "右移窗格(_R)" msgstr "右移窗格(_R)"
#: src/diffuse/main.py:852 #: src/diffuse/main.py:860
msgid "Shift Pane _Left" msgid "Shift Pane _Left"
msgstr "左移窗格(_L)" msgstr "左移窗格(_L)"
#: src/diffuse/main.py:855 #: src/diffuse/main.py:863
msgid "F_ormat" msgid "F_ormat"
msgstr "格式(_O)" msgstr "格式(_O)"
#: src/diffuse/main.py:856 #: src/diffuse/main.py:864
msgid "Convert To _Upper Case" msgid "Convert To _Upper Case"
msgstr "轉換成大寫" msgstr "轉換成大寫"
#: src/diffuse/main.py:857 #: src/diffuse/main.py:865
msgid "Convert To _Lower Case" msgid "Convert To _Lower Case"
msgstr "轉換成小寫" msgstr "轉換成小寫"
#: src/diffuse/main.py:859 #: src/diffuse/main.py:867
msgid "Sort Lines In _Ascending Order" msgid "Sort Lines In _Ascending Order"
msgstr "以遞增的順序排列" msgstr "以遞增的順序排列"
#: src/diffuse/main.py:860 #: src/diffuse/main.py:868
msgid "Sort Lines In D_escending Order" msgid "Sort Lines In D_escending Order"
msgstr "以遞減的順序排列" msgstr "以遞減的順序排列"
#: src/diffuse/main.py:862 #: src/diffuse/main.py:870
msgid "Remove Trailing _White Space" msgid "Remove Trailing _White Space"
msgstr "刪除多餘的空格(_W)" msgstr "刪除多餘的空格(_W)"
#: src/diffuse/main.py:863 #: src/diffuse/main.py:871
msgid "Convert Tabs To _Spaces" msgid "Convert Tabs To _Spaces"
msgstr "轉換跳格字元為空格(_S)" msgstr "轉換跳格字元為空格(_S)"
#: src/diffuse/main.py:864 #: src/diffuse/main.py:872
msgid "Convert Leading Spaces To _Tabs" msgid "Convert Leading Spaces To _Tabs"
msgstr "轉換開頭的空格為跳格字元(_T)" msgstr "轉換開頭的空格為跳格字元(_T)"
#: src/diffuse/main.py:866 #: src/diffuse/main.py:874
msgid "_Increase Indenting" msgid "_Increase Indenting"
msgstr "減少縮排(_I)" msgstr "減少縮排(_I)"
#: src/diffuse/main.py:867 #: src/diffuse/main.py:875
msgid "De_crease Indenting" msgid "De_crease Indenting"
msgstr "減少縮排" msgstr "減少縮排"
#: src/diffuse/main.py:869 #: src/diffuse/main.py:877
msgid "Convert To _DOS Format" msgid "Convert To _DOS Format"
msgstr "轉換為 DOS 格式(_D)" msgstr "轉換為 DOS 格式(_D)"
#: src/diffuse/main.py:870 #: src/diffuse/main.py:878
msgid "Convert To _Mac Format" msgid "Convert To _Mac Format"
msgstr "轉換為 Mac 格式(_M)" msgstr "轉換為 Mac 格式(_M)"
#: src/diffuse/main.py:871 #: src/diffuse/main.py:879
msgid "Convert To Uni_x Format" msgid "Convert To Uni_x Format"
msgstr "轉換為 Unix 格式(_X)" msgstr "轉換為 Unix 格式(_X)"
#: src/diffuse/main.py:874 #: src/diffuse/main.py:882
msgid "_Merge" msgid "_Merge"
msgstr "合併(_M)" msgstr "合併(_M)"
#: src/diffuse/main.py:875 #: src/diffuse/main.py:883
msgid "Copy Selection _Right" msgid "Copy Selection _Right"
msgstr "複製選擇區域到右邊(_R)" msgstr "複製選擇區域到右邊(_R)"
#: src/diffuse/main.py:876 #: src/diffuse/main.py:884
msgid "Copy Selection _Left" msgid "Copy Selection _Left"
msgstr "複製選擇區域到左邊(_L)" msgstr "複製選擇區域到左邊(_L)"
#: src/diffuse/main.py:878 #: src/diffuse/main.py:886
msgid "Copy Left _Into Selection" msgid "Copy Left _Into Selection"
msgstr "複製左邊內容到選擇區域(_L)" msgstr "複製左邊內容到選擇區域(_L)"
#: src/diffuse/main.py:879 #: src/diffuse/main.py:887
msgid "Copy Right I_nto Selection" msgid "Copy Right I_nto Selection"
msgstr "複製右邊內容到選擇區域(_L)" msgstr "複製右邊內容到選擇區域(_L)"
#: src/diffuse/main.py:880 #: src/diffuse/main.py:888
msgid "_Merge From Left Then Right" msgid "_Merge From Left Then Right"
msgstr "先左再右合併(_M)" msgstr "先左再右合併(_M)"
#: src/diffuse/main.py:881 #: src/diffuse/main.py:889
msgid "M_erge From Right Then Left" msgid "M_erge From Right Then Left"
msgstr "從右向左合併(_E)" msgstr "從右向左合併(_E)"
#: src/diffuse/main.py:884 #: src/diffuse/main.py:892
msgid "_Help" msgid "_Help"
msgstr "求助(_H)" msgstr "求助(_H)"
#: src/diffuse/main.py:885 #: src/diffuse/main.py:893
msgid "_Help Contents..." msgid "_Help Contents..."
msgstr "說明內容(_H)…" msgstr "說明內容(_H)…"
#: src/diffuse/main.py:887 #: src/diffuse/main.py:895
#, python-format #, python-format
msgid "_About %s..." msgid "_About %s..."
msgstr "關於 %s(_A)…" msgstr "關於 %s(_A)…"
#: src/diffuse/main.py:902 #: src/diffuse/main.py:910
msgid "New 2-Way File Merge" msgid "New 2-Way File Merge"
msgstr "新的二重檔案合併" msgstr "新的二重檔案合併"
#: src/diffuse/main.py:903 #: src/diffuse/main.py:911
msgid "New 3-Way File Merge" msgid "New 3-Way File Merge"
msgstr "新的三重檔案合併" msgstr "新的三重檔案合併"
#: src/diffuse/main.py:905 #: src/diffuse/main.py:913
msgid "Realign All" msgid "Realign All"
msgstr "全部重新對齊" msgstr "全部重新對齊"
#: src/diffuse/main.py:906 #: src/diffuse/main.py:914
msgid "First Difference" msgid "First Difference"
msgstr "第一個差異" msgstr "第一個差異"
#: src/diffuse/main.py:907 #: src/diffuse/main.py:915
msgid "Previous Difference" msgid "Previous Difference"
msgstr "上一個差異" msgstr "上一個差異"
#: src/diffuse/main.py:908 #: src/diffuse/main.py:916
msgid "Next Difference" msgid "Next Difference"
msgstr "下一個差異" msgstr "下一個差異"
#: src/diffuse/main.py:909 #: src/diffuse/main.py:917
msgid "Last Difference" msgid "Last Difference"
msgstr "最後一個差異" msgstr "最後一個差異"
#: src/diffuse/main.py:911 #: src/diffuse/main.py:919
msgid "Copy Selection Right" msgid "Copy Selection Right"
msgstr "複製選擇區域到右邊" msgstr "複製選擇區域到右邊"
#: src/diffuse/main.py:912 #: src/diffuse/main.py:920
msgid "Copy Selection Left" msgid "Copy Selection Left"
msgstr "複製選擇區域到左邊" msgstr "複製選擇區域到左邊"
#: src/diffuse/main.py:913 #: src/diffuse/main.py:921
msgid "Copy Left Into Selection" msgid "Copy Left Into Selection"
msgstr "複製左邊內容到選擇區域" msgstr "複製左邊內容到選擇區域"
#: src/diffuse/main.py:914 #: src/diffuse/main.py:922
msgid "Copy Right Into Selection" msgid "Copy Right Into Selection"
msgstr "複製右邊內容到選擇區域" msgstr "複製右邊內容到選擇區域"
#: src/diffuse/main.py:915 #: src/diffuse/main.py:923
msgid "Merge From Left Then Right" msgid "Merge From Left Then Right"
msgstr "先左後右合併" msgstr "先左後右合併"
#: src/diffuse/main.py:916 #: src/diffuse/main.py:924
msgid "Merge From Right Then Left" msgid "Merge From Right Then Left"
msgstr "先右後左合併(_T)" msgstr "先右後左合併(_T)"
#: src/diffuse/main.py:918 #: src/diffuse/main.py:926
msgid "Undo" msgid "Undo"
msgstr "復原" msgstr "復原"
#: src/diffuse/main.py:919 #: src/diffuse/main.py:927
msgid "Redo" msgid "Redo"
msgstr "重做" msgstr "重做"
#: src/diffuse/main.py:920 src/diffuse/widgets.py:1847 #: src/diffuse/main.py:928 src/diffuse/widgets.py:1849
msgid "Cut" msgid "Cut"
msgstr "剪下" msgstr "剪下"
#: src/diffuse/main.py:921 src/diffuse/widgets.py:1848 #: src/diffuse/main.py:929 src/diffuse/widgets.py:1850
msgid "Copy" msgid "Copy"
msgstr "複製" msgstr "複製"
#: src/diffuse/main.py:922 src/diffuse/widgets.py:1849 #: src/diffuse/main.py:930 src/diffuse/widgets.py:1851
msgid "Paste" msgid "Paste"
msgstr "貼上" msgstr "貼上"
#: src/diffuse/main.py:923 src/diffuse/widgets.py:1852 #: src/diffuse/main.py:931 src/diffuse/widgets.py:1854
msgid "Clear Edits" msgid "Clear Edits"
msgstr "取消編輯" msgstr "取消編輯"
#: src/diffuse/main.py:1046 #: src/diffuse/main.py:1054
msgid "Some files have unsaved changes. Select the files to save before closing." msgid "Some files have unsaved changes. Select the files to save before closing."
msgstr "一些檔案已變更但未儲存，請在關閉前儲存這些檔案。" msgstr "一些檔案已變更但未儲存，請在關閉前儲存這些檔案。"
#: src/diffuse/main.py:1060 #: src/diffuse/main.py:1068
msgid "Tab" msgid "Tab"
msgstr "跳格字元" msgstr "跳格字元"
#: src/diffuse/main.py:1065 #: src/diffuse/main.py:1073
msgid "Pane" msgid "Pane"
msgstr "窗格" msgstr "窗格"
#: src/diffuse/main.py:1076 #: src/diffuse/main.py:1084
msgid "Close _Without Saving" msgid "Close _Without Saving"
msgstr "不儲存而關閉" msgstr "不儲存而關閉"
#: src/diffuse/main.py:1115 #: src/diffuse/main.py:1123
#, python-format #, python-format
msgid "Closing this tab will quit %s." msgid "Closing this tab will quit %s."
msgstr "關閉此分頁將會退出 %s" msgstr "關閉此分頁將會退出 %s"
#: src/diffuse/main.py:1198 #: src/diffuse/main.py:1206
#, python-format #, python-format
msgid "File Merge %d" msgid "File Merge %d"
msgstr "檔案合併 %d" msgstr "檔案合併 %d"
#: src/diffuse/main.py:1304 #: src/diffuse/main.py:1312
#, python-format #, python-format
msgid "Error retrieving commits for %s." msgid "Error retrieving commits for %s."
msgstr "無法恢復對 %s 的認可。" msgstr "無法恢復對 %s 的認可。"
#: src/diffuse/main.py:1336 #: src/diffuse/main.py:1344
#, python-format #, python-format
msgid "Error retrieving modifications for %s." msgid "Error retrieving modifications for %s."
msgstr "無法恢復對 %s 的修改。" msgstr "無法恢復對 %s 的修改。"
#: src/diffuse/main.py:1369 #: src/diffuse/main.py:1377
msgid "Open File In New Tab" msgid "Open File In New Tab"
msgstr "在新分頁裡開啟檔案" msgstr "在新分頁裡開啟檔案"
#: src/diffuse/main.py:1392 #: src/diffuse/main.py:1400
msgid "Choose Folder With Modified Files" msgid "Choose Folder With Modified Files"
msgstr "選擇更改過的檔案夾" msgstr "選擇更改過的檔案夾"
#: src/diffuse/main.py:1410 #: src/diffuse/main.py:1418
msgid "No modified files found." msgid "No modified files found."
msgstr "找不到已修改的檔案。" msgstr "找不到已修改的檔案。"
#: src/diffuse/main.py:1416 #: src/diffuse/main.py:1424
msgid "Choose Folder With Commit" msgid "Choose Folder With Commit"
msgstr "選擇認可過的檔案夾" msgstr "選擇認可過的檔案夾"
#: src/diffuse/main.py:1436 #: src/diffuse/main.py:1444
msgid "No committed files found." msgid "No committed files found."
msgstr "找不到已認可的檔案。" msgstr "找不到已認可的檔案。"
#: src/diffuse/main.py:1472 #: src/diffuse/main.py:1480
msgid "New N-Way File Merge..." msgid "New N-Way File Merge..."
msgstr "新的多重檔案合併…" msgstr "新的多重檔案合併…"
#: src/diffuse/main.py:1473 #: src/diffuse/main.py:1481
msgid "Number of panes: " msgid "Number of panes: "
msgstr "窗格數: " msgstr "窗格數: "
#: src/diffuse/main.py:1547 #: src/diffuse/main.py:1555
msgid "Phrase not found. Continue from the end of the file?" msgid "Phrase not found. Continue from the end of the file?"
msgstr "語詞未找到，從檔案結尾繼續嗎？" msgstr "語詞未找到，從檔案結尾繼續嗎？"
#: src/diffuse/main.py:1549 #: src/diffuse/main.py:1557
msgid "Phrase not found. Continue from the start of the file?" msgid "Phrase not found. Continue from the start of the file?"
msgstr "語詞未找到，從檔案開頭繼續嗎？" msgstr "語詞未找到，從檔案開頭繼續嗎？"
#: src/diffuse/main.py:1770 #: src/diffuse/main.py:1778
#, fuzzy #, fuzzy
msgid "" msgid ""
"Usage:\n" "Usage:\n"
@ -697,174 +668,174 @@ msgstr ""
" ( -i | --ignore-case ) 忽略大小寫差異\n" " ( -i | --ignore-case ) 忽略大小寫差異\n"
" ( -w | --ignore-all-space ) 忽略空白差異" " ( -w | --ignore-all-space ) 忽略空白差異"
#: src/diffuse/main.py:1937 #: src/diffuse/main.py:1945
msgid "Error parsing line number." msgid "Error parsing line number."
msgstr "解析列數時錯誤。" msgstr "解析列數時錯誤。"
#: src/diffuse/main.py:1947 #: src/diffuse/main.py:1955
#, python-format #, python-format
msgid "Skipping unknown argument \"%s\"." msgid "Skipping unknown argument \"%s\"."
msgstr "跳過未知引數「%s」。" msgstr "跳過未知引數「%s」。"
#: src/diffuse/main.py:1955 #: src/diffuse/main.py:1963
#, python-format #, python-format
msgid "Error processing argument \"%s\". Directory not expected." msgid "Error processing argument \"%s\". Directory not expected."
msgstr "無法處理「%s」。目錄不存在。" msgstr "無法處理「%s」。目錄不存在。"
#: src/diffuse/preferences.py:79 #: src/diffuse/preferences.py:80
msgid "Display" msgid "Display"
msgstr "顯示" msgstr "顯示"
#: src/diffuse/preferences.py:82 #: src/diffuse/preferences.py:83
msgid "Font" msgid "Font"
msgstr "字型" msgstr "字型"
#: src/diffuse/preferences.py:83 #: src/diffuse/preferences.py:84
msgid "Tab width" msgid "Tab width"
msgstr "跳格寬度" msgstr "跳格寬度"
#: src/diffuse/preferences.py:84 #: src/diffuse/preferences.py:85
msgid "Show right margin" msgid "Show right margin"
msgstr "顯示右邊距" msgstr "顯示右邊距"
#: src/diffuse/preferences.py:85 #: src/diffuse/preferences.py:86
msgid "Right margin" msgid "Right margin"
msgstr "右邊距" msgstr "右邊距"
#: src/diffuse/preferences.py:86 #: src/diffuse/preferences.py:87
msgid "Show line numbers" msgid "Show line numbers"
msgstr "顯示列號" msgstr "顯示列號"
#: src/diffuse/preferences.py:87 #: src/diffuse/preferences.py:88
msgid "Show white space characters" msgid "Show white space characters"
msgstr "顯示空格" msgstr "顯示空格"
#: src/diffuse/preferences.py:88 #: src/diffuse/preferences.py:89
msgid "Ignore case differences" msgid "Ignore case differences"
msgstr "忽略大小寫的差異" msgstr "忽略大小寫的差異"
#: src/diffuse/preferences.py:89 #: src/diffuse/preferences.py:90
msgid "Ignore white space differences" msgid "Ignore white space differences"
msgstr "忽略空格的差異" msgstr "忽略空格的差異"
#: src/diffuse/preferences.py:90 src/diffuse/preferences.py:99 #: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100
msgid "Ignore changes to white space" msgid "Ignore changes to white space"
msgstr "忽略對空格的改變" msgstr "忽略對空格的改變"
#: src/diffuse/preferences.py:91 #: src/diffuse/preferences.py:92
msgid "Ignore blank line differences" msgid "Ignore blank line differences"
msgstr "忽略空列的差異" msgstr "忽略空列的差異"
#: src/diffuse/preferences.py:92 #: src/diffuse/preferences.py:93
msgid "Ignore end of line differences" msgid "Ignore end of line differences"
msgstr "忽略列尾的差異" msgstr "忽略列尾的差異"
#: src/diffuse/preferences.py:94 #: src/diffuse/preferences.py:95
msgid "Alignment" msgid "Alignment"
msgstr "對齊" msgstr "對齊"
#: src/diffuse/preferences.py:97 #: src/diffuse/preferences.py:98
msgid "Ignore case" msgid "Ignore case"
msgstr "忽略大小寫" msgstr "忽略大小寫"
#: src/diffuse/preferences.py:98 #: src/diffuse/preferences.py:99
msgid "Ignore white space" msgid "Ignore white space"
msgstr "忽略空格" msgstr "忽略空格"
#: src/diffuse/preferences.py:100 #: src/diffuse/preferences.py:101
msgid "Ignore blank lines" msgid "Ignore blank lines"
msgstr "忽略空列" msgstr "忽略空列"
#: src/diffuse/preferences.py:101 #: src/diffuse/preferences.py:102
msgid "Ignore end of line characters" msgid "Ignore end of line characters"
msgstr "忽略列尾字元" msgstr "忽略列尾字元"
#: src/diffuse/preferences.py:103 #: src/diffuse/preferences.py:104
msgid "Editor" msgid "Editor"
msgstr "編輯器" msgstr "編輯器"
#: src/diffuse/preferences.py:106 #: src/diffuse/preferences.py:107
msgid "Auto indent" msgid "Auto indent"
msgstr "自動縮排" msgstr "自動縮排"
#: src/diffuse/preferences.py:107 #: src/diffuse/preferences.py:108
msgid "Expand tabs to spaces" msgid "Expand tabs to spaces"
msgstr "展開跳格字元為空格" msgstr "展開跳格字元為空格"
#: src/diffuse/preferences.py:108 #: src/diffuse/preferences.py:109
msgid "Soft tab width" msgid "Soft tab width"
msgstr "跳格寬度" msgstr "跳格寬度"
#: src/diffuse/preferences.py:110 #: src/diffuse/preferences.py:111
msgid "Tabs" msgid "Tabs"
msgstr "分頁" msgstr "分頁"
#: src/diffuse/preferences.py:113 #: src/diffuse/preferences.py:114
msgid "Default panes" msgid "Default panes"
msgstr "預設窗格" msgstr "預設窗格"
#: src/diffuse/preferences.py:114 #: src/diffuse/preferences.py:115
msgid "Always show the tab bar" msgid "Always show the tab bar"
msgstr "總是顯示分頁欄" msgstr "總是顯示分頁欄"
#: src/diffuse/preferences.py:115 #: src/diffuse/preferences.py:116
#, python-format #, python-format
msgid "Warn me when closing a tab will quit %s" msgid "Warn me when closing a tab will quit %s"
msgstr "當關閉分頁會退出 %s 的時候提醒我" msgstr "當關閉分頁會退出 %s 的時候提醒我"
#: src/diffuse/preferences.py:117 #: src/diffuse/preferences.py:118
msgid "Regional Settings" msgid "Regional Settings"
msgstr "設定" msgstr "設定"
#: src/diffuse/preferences.py:120 #: src/diffuse/preferences.py:121
msgid "Default codec" msgid "Default codec"
msgstr "預設解碼器" msgstr "預設解碼器"
#: src/diffuse/preferences.py:121 #: src/diffuse/preferences.py:122
msgid "Order of codecs used to identify encoding" msgid "Order of codecs used to identify encoding"
msgstr "用來識別編碼的解碼器順序" msgstr "用來識別編碼的解碼器順序"
#: src/diffuse/preferences.py:142 #: src/diffuse/preferences.py:143
msgid "Cygwin" msgid "Cygwin"
msgstr "Cygwin" msgstr "Cygwin"
#: src/diffuse/preferences.py:144 #: src/diffuse/preferences.py:145
msgid "Root directory" msgid "Root directory"
msgstr "根目錄" msgstr "根目錄"
#: src/diffuse/preferences.py:145 #: src/diffuse/preferences.py:146
msgid "Cygdrive prefix" msgid "Cygdrive prefix"
msgstr "Cygdrive 前綴" msgstr "Cygdrive 前綴"
#: src/diffuse/preferences.py:164 #: src/diffuse/preferences.py:165
msgid "Version control system search order" msgid "Version control system search order"
msgstr "" msgstr ""
#: src/diffuse/preferences.py:172 #: src/diffuse/preferences.py:173
msgid "\"co\" command" msgid "\"co\" command"
msgstr "「co」命令" msgstr "「co」命令"
#: src/diffuse/preferences.py:173 #: src/diffuse/preferences.py:174
msgid "\"rlog\" command" msgid "\"rlog\" command"
msgstr "「rlog」命令" msgstr "「rlog」命令"
#: src/diffuse/preferences.py:175 #: src/diffuse/preferences.py:176
msgid "Command" msgid "Command"
msgstr "命令" msgstr "命令"
#: src/diffuse/preferences.py:181 #: src/diffuse/preferences.py:182
msgid "Launch from a Bash login shell" msgid "Launch from a Bash login shell"
msgstr "從登入命令列介面啟動" msgstr "從登入命令列介面啟動"
#: src/diffuse/preferences.py:188 #: src/diffuse/preferences.py:189
msgid "Update paths for Cygwin" msgid "Update paths for Cygwin"
msgstr "為 Cygwin 更新路徑" msgstr "為 Cygwin 更新路徑"
#: src/diffuse/preferences.py:193 #: src/diffuse/preferences.py:194
msgid "Version Control" msgid "Version Control"
msgstr "版本控制" msgstr "版本控制"
#: src/diffuse/preferences.py:258 #: src/diffuse/preferences.py:259
msgid "Preferences" msgid "Preferences"
msgstr "選項" msgstr "選項"
@ -896,7 +867,7 @@ msgstr ""
#: src/diffuse/resources.py:409 #: src/diffuse/resources.py:409
#, python-brace-format #, python-brace-format
msgid "Options \"{option}\" is unknown" msgid "Option \"{option}\" is unknown"
msgstr "" msgstr ""
#: src/diffuse/resources.py:416 #: src/diffuse/resources.py:416
@ -949,40 +920,68 @@ msgstr "處理到檔案 {file} 的第 {line} 列時出錯。"
msgid "Unhandled error at line {line} of {file}." msgid "Unhandled error at line {line} of {file}."
msgstr "處理到檔案 {file} 的第 {line} 列時出錯。" msgstr "處理到檔案 {file} 的第 {line} 列時出錯。"
#: src/diffuse/utils.py:63 #: src/diffuse/utils.py:66
msgid "Auto Detect" msgid "Auto Detect"
msgstr "自動偵測" msgstr "自動偵測"
#: src/diffuse/vcs/cvs.py:53 src/diffuse/vcs/rcs.py:62 src/diffuse/vcs/svn.py:95 #: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97
#, python-format #, python-format
msgid "Error parsing revision %s." msgid "Error parsing revision %s."
msgstr "無法解析修訂版本 %s。" msgstr "無法解析修訂版本 %s。"
#: src/diffuse/vcs/vcs_registry.py:233 #: src/diffuse/vcs/vcs_registry.py:238
#, python-format #, python-format
msgid "Error parsing %s." msgid "Error parsing %s."
msgstr "無法解析 %s。" msgstr "無法解析 %s。"
#: src/diffuse/widgets.py:1843 #: src/diffuse/widgets.py:1845
msgid "Align with Selection" msgid "Align with Selection"
msgstr "對齊選擇區域" msgstr "對齊選擇區域"
#: src/diffuse/widgets.py:1844 #: src/diffuse/widgets.py:1846
msgid "Isolate" msgid "Isolate"
msgstr "分離" msgstr "分離"
#: src/diffuse/widgets.py:1845 #: src/diffuse/widgets.py:1847
msgid "Merge Selection" msgid "Merge Selection"
msgstr "合併選擇區域" msgstr "合併選擇區域"
#: src/diffuse/widgets.py:1851 #: src/diffuse/widgets.py:1853
msgid "Select All" msgid "Select All"
msgstr "全選" msgstr "全選"
#: src/diffuse/widgets.py:1854 #: src/diffuse/widgets.py:1856
msgid "Swap with Selected Pane" msgid "Swap with Selected Pane"
msgstr "交換選中的窗格" 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" #~ msgid "Diffuse Merge Tool"
#~ msgstr "Diffuse 比較合併工具" #~ msgstr "Diffuse 比較合併工具"

4
src/diffuse/dialogs.py
View File

@ -46,7 +46,7 @@ class AboutDialog(Gtk.AboutDialog):
license_text = [ license_text = [
constants.APP_NAME + ' ' + constants.VERSION + '\n\n', constants.APP_NAME + ' ' + constants.VERSION + '\n\n',
constants.COPYRIGHT + '\n\n', constants.COPYRIGHT + '\n\n',
_('''This program is free software; you can redistribute it and/or modify '''This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
@ -58,7 +58,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License along You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.''')] 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.''']
self.set_license(''.join(license_text)) self.set_license(''.join(license_text))