Fix translation files

The POTFILES didn't include the recently created files, removing a bunch
of translations during the update.

docs/translators.md

@@ -14,9 +14,13 @@ To create or update the PO template (`po/diffuse.pot`), use this command at the
 repo root:
 
 ```sh
-xgettext -o po/diffuse.pot -f po/POTFILES.in
+xgettext -w 84 -o po/diffuse.pot -f po/POTFILES.in
 ```
 
+_Note:_ why 84 characters, you ask? because the usage text has to be 80-char
+wide, plus the beginning and ending `"` and the final `\n` (literally two
+characters).
+
 ## Create a new translation
 
 To create a new translation file, you'll need a PO template. If not already

po/POTFILES

@@ -4,9 +4,22 @@
 data/io.github.mightycreak.Diffuse.desktop.in
 data/io.github.mightycreak.Diffuse.appdata.xml.in
 src/diffuse/constants.py.in
+src/diffuse/dialogs.py
 src/diffuse/diffuse.in
 src/diffuse/main.py
+src/diffuse/preferences.py
+src/diffuse/resources.py
+src/diffuse/utils.py
+src/diffuse/vcs/bzr.py
 src/diffuse/vcs/cvs.py
+src/diffuse/vcs/darcs.py
+src/diffuse/vcs/folder_set.py
+src/diffuse/vcs/git.py
+src/diffuse/vcs/hg.py
+src/diffuse/vcs/mtn.py
 src/diffuse/vcs/rcs.py
+src/diffuse/vcs/svk.py
 src/diffuse/vcs/svn.py
+src/diffuse/vcs/vcs_interface.py
 src/diffuse/vcs/vcs_registry.py
+src/diffuse/widgets.py

po/cs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse-svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 10:26-0500\n"
+"POT-Creation-Date: 2021-11-24 13:44-0500\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator: Jindřich Šesták <khagaroth@gmail.com>\n"
 "Language-Team: NONE <NONE>\n"
@@ -34,9 +34,9 @@ msgstr "Grafický nástroj pro slučování a porovnávání textových souborů
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:7
 msgid ""
-"Diffuse is a graphical tool for comparing and merging text files. It can "
-"retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, "
-"Monotone, RCS, Subversion, and SVK repositories."
+"Diffuse is a graphical tool for comparing and merging text files. It can retrieve "
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, "
+"Subversion, and SVK repositories."
 msgstr ""
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
@@ -47,6 +47,68 @@ msgstr ""
 msgid "Copyright"
 msgstr ""
 
+#: src/diffuse/dialogs.py:38
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr "Diffuse je grafický nástroj pro slučování a porovnávání textových souborů."
+
+#: src/diffuse/dialogs.py:43
+msgid "translator-credits"
+msgstr "Jindřich Šesták <khagaroth@gmail.com>"
+
+#: src/diffuse/dialogs.py:47
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"Tento program je svobodný software. Můžete ho upravovat a distribuovat za "
+"podmínky dodržení pravidel licence GNU General Public License verze 2 (dále jen "
+"GPL), nebo (pokud chcete) některé z jejích novějších verzí.\n"
+"\n"
+"Tento program je distribuován v naději, že bude užitečný, ale BEZ JAKÉKOLIV "
+"ZÁRUKY, tedy ani implicitní záruky OBCHODOVATELNOSTI nebo VHODNOSTI PRO URČITÝ "
+"ÚČEL. Další podrobnosti získáte přečtením GPL.\n"
+"\n"
+"Spolu s tímto programem by jste měli obdržet i kopii GPL. GPL můžete také získat "
+"na domovských stránkách Free Software Foundation (http://www.fsf.org/), nebo "
+"můžete zaslat dopis na adresu Free Software Foundation, Inc., 51 Franclin St, "
+"Fifth Floor, Boston, MA 02110-1301 USA\n"
+
+#: src/diffuse/dialogs.py:81
+msgid "Encoding: "
+msgstr "Kódování: "
+
+#: src/diffuse/dialogs.py:93
+msgid "Revision: "
+msgstr "Revize: "
+
+#: src/diffuse/dialogs.py:149
+msgid "Find..."
+msgstr "Najít..."
+
+#: src/diffuse/dialogs.py:157
+msgid "Search For: "
+msgstr "Vyhledat: "
+
+#: src/diffuse/dialogs.py:182
+msgid "Match Case"
+msgstr "Rozlišovat velikost písmen"
+
+#: src/diffuse/dialogs.py:187
+msgid "Search Backwards"
+msgstr "Hledat od konce"
+
 #: src/diffuse/main.py:77
 msgid "Close Tab"
 msgstr "Zavřít panel"
@@ -103,19 +165,18 @@ msgstr "Soubor s názvem %s již existuje. Chcete ho přepsat?"
 #: src/diffuse/main.py:501
 #, python-format
 msgid ""
-"The file %s has been modified by another process since reading it.  If you "
-"save, all the external changes could be lost.  Save anyways?"
+"The file %s has been modified by another process since reading it.  If you save, "
+"all the external changes could be lost.  Save anyways?"
 msgstr ""
 "Soubor %s byl od načtení změněn jiným procesem. Pokud ho nyní uložíte, změny "
-"provedené tímto externím procesem mohou být ztraceny. Chcete ho přesto "
-"uložit?"
+"provedené tímto externím procesem mohou být ztraceny. Chcete ho přesto uložit?"
 
 #: src/diffuse/main.py:540
 #, python-format
 msgid "Error encoding to %s."
 msgstr "Při změně kódování do %s došlo k chybě."
 
-#: src/diffuse/main.py:542
+#: src/diffuse/main.py:542 src/diffuse/preferences.py:296
 #, python-format
 msgid "Error writing %s."
 msgstr "Při ukládání %s došlo k chybě."
@@ -130,12 +191,12 @@ msgstr "Řádek číslo: "
 
 #: src/diffuse/main.py:596
 msgid ""
-"Press the enter key or double click to edit.  Press the space bar or use the "
-"RMB menu to manually align."
+"Press the enter key or double click to edit.  Press the space bar or use the RMB "
+"menu to manually align."
 msgstr ""
-"Pro aktivaci úprav stiskněte klávesu Enter, nebo na řádek dvakrát klikněte "
-"myší. Pro ruční zarovnání stiskněte Mezerník, nebo použijte místní nabídku "
-"dostupnou po kliknutí pravým tlačítkem myši."
+"Pro aktivaci úprav stiskněte klávesu Enter, nebo na řádek dvakrát klikněte myší. "
+"Pro ruční zarovnání stiskněte Mezerník, nebo použijte místní nabídku dostupnou po "
+"kliknutí pravým tlačítkem myši."
 
 #: src/diffuse/main.py:598
 msgid "Press the escape key to finish editing."
@@ -143,8 +204,8 @@ msgstr "Editaci ukončíte pomocí klávesy escape."
 
 #: src/diffuse/main.py:600
 msgid ""
-"Select target line and press the space bar to align.  Press the escape key "
-"to cancel."
+"Select target line and press the space bar to align.  Press the escape key to "
+"cancel."
 msgstr ""
 "Vyberte cílový řádek a proveďte zarovnání stisknutím klávesy Mezerník. Pro "
 "zrušení stiskněte klávesu Escape."
@@ -478,25 +539,24 @@ msgstr "Zpět"
 msgid "Redo"
 msgstr "Znovu"
 
-#: src/diffuse/main.py:838
+#: src/diffuse/main.py:838 src/diffuse/widgets.py:1846
 msgid "Cut"
 msgstr "Vyjmout"
 
-#: src/diffuse/main.py:839
+#: src/diffuse/main.py:839 src/diffuse/widgets.py:1847
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: src/diffuse/main.py:840
+#: src/diffuse/main.py:840 src/diffuse/widgets.py:1848
 msgid "Paste"
 msgstr "Vložit"
 
-#: src/diffuse/main.py:841
+#: src/diffuse/main.py:841 src/diffuse/widgets.py:1851
 msgid "Clear Edits"
 msgstr "Smazat úpravy"
 
 #: src/diffuse/main.py:961
-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 ""
 "Některé změněné soubory nebyly uloženy. Vyberte soubory, které chcete před "
 "zavřením uložit."
@@ -575,19 +635,15 @@ msgid ""
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse is a graphical tool for merging and comparing text files.  Diffuse "
-"is\n"
-"able to compare an arbitrary number of files side-by-side and gives users "
-"the\n"
-"ability to manually adjust line matching and directly edit files.  Diffuse "
-"can\n"
+"Diffuse is a graphical tool for merging and comparing text files.  Diffuse is\n"
+"able to compare an arbitrary number of files side-by-side and gives users the\n"
+"ability to manually adjust line matching and directly edit files.  Diffuse can\n"
 "also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
 "Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
 "\n"
 "Help Options:\n"
 "  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright "
-"information\n"
+"  ( -v | --version )               Display version and copyright information\n"
 "\n"
 "Configuration Options:\n"
 "  --no-rcfile                      Do not read any resource files\n"
@@ -621,10 +677,9 @@ msgstr ""
 "Diffuse\n"
 "dokáže porovnat libovolný počet souborů a nabízí uživatelům možnost ručně "
 "upravit\n"
-"zarovnání řádků a přímo upravovat porovnávané soubory.  Diffuse také umí "
-"načíst k\n"
-"porovnání a slučování revize souborů přímo z repozitářů Bazaar, CVS, Darcs, "
-"Git,\n"
+"zarovnání řádků a přímo upravovat porovnávané soubory.  Diffuse také umí načíst "
+"k\n"
+"porovnání a slučování revize souborů přímo z repozitářů Bazaar, CVS, Darcs, Git,\n"
 "Mercurial, Monotone,RCS, Subversion, a SVK.\n"
 "\n"
 "Nápověda:\n"
@@ -636,33 +691,27 @@ msgstr ""
 "  --rcfile <file>                  Použije zadaný zdrojový soubor\n"
 "\n"
 "Obecné:\n"
-"  ( -c | --commit ) <rev>          Revize souboru ve formátu <rev-1> a "
-"<rev>\n"
+"  ( -c | --commit ) <rev>          Revize souboru ve formátu <rev-1> a <rev>\n"
 "  ( -D | --close-if-same )         Zavře panely s identickým obsahem\n"
 "  ( -e | --encoding ) <kodek>      Použije pro čtení a zápis souborů uvedený "
 "<kodek>\n"
-"  ( -L | --label ) <název>         Místo názvu soboru zobrazí uvedený "
-"<název>\n"
-"  ( -m | --modified )              Vytvoří pro každý změněný soubor nový "
-"panel\n"
+"  ( -L | --label ) <název>         Místo názvu soboru zobrazí uvedený <název>\n"
+"  ( -m | --modified )              Vytvoří pro každý změněný soubor nový panel\n"
 "  ( -r | --revision ) <rev>        Revize souboru <rev>\n"
-"  ( -s | --separate )              Vytvoří pro každý soubor samostatný "
-"panel\n"
+"  ( -s | --separate )              Vytvoří pro každý soubor samostatný panel\n"
 "  ( -t | --tab )                   Vytvoří nový panel\n"
 "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
 "  --line <řádek>                   Po spuštění přejde na <řádek>\n"
-"  --null-file                      Vytvoří prázdné podokno pro porovnání "
-"souborů\n"
+"  --null-file                      Vytvoří prázdné podokno pro porovnání souborů\n"
 "\n"
 "Zobrazení:\n"
-"  ( -b | --ignore-space-change )   Bude ignorovat změny, pokud jde o znaky "
-"mezer\n"
+"  ( -b | --ignore-space-change )   Bude ignorovat změny, pokud jde o znaky mezer\n"
 "  ( -B | --ignore-blank-lines )    Bude ignorovat změny pokud, jde o prázdné "
 "řádky\n"
-"  ( -E | --ignore-end-of-line )    Bude ignorovat změny pokud, jde o znaky "
-"konců řádek\n"
-"  ( -i | --ignore-case )           Bude ignorovat změny pokud, jde jen o "
-"změnu velikosti písmen\n"
+"  ( -E | --ignore-end-of-line )    Bude ignorovat změny pokud, jde o znaky konců "
+"řádek\n"
+"  ( -i | --ignore-case )           Bude ignorovat změny pokud, jde jen o změnu "
+"velikosti písmen\n"
 "  ( -w | --ignore-all-space )      Bude ignorovat změny pokud, jde o "
 "netisknutelné znaky"
 
@@ -680,8 +729,173 @@ msgstr "Ignorován neznámý parametr \"%s\"."
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Při zpracování parametru \"%s\" došlo k chybě. Adresář nebyl očekáván."
 
-#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60
-#: src/diffuse/vcs/svn.py:93
+#: src/diffuse/preferences.py:77
+msgid "Display"
+msgstr "Zobrazení"
+
+#: src/diffuse/preferences.py:80
+msgid "Font"
+msgstr "Písmo"
+
+#: src/diffuse/preferences.py:81
+msgid "Tab width"
+msgstr "Šířka tabulátoru"
+
+#: src/diffuse/preferences.py:82
+msgid "Show right margin"
+msgstr "Zobrazit pravý okraj"
+
+#: src/diffuse/preferences.py:83
+msgid "Right margin"
+msgstr "Pravý okraj"
+
+#: src/diffuse/preferences.py:84
+msgid "Show line numbers"
+msgstr "Zobrazit čísla řádků"
+
+#: src/diffuse/preferences.py:85
+msgid "Show white space characters"
+msgstr "Zobrazit netisknutelné znaky"
+
+#: src/diffuse/preferences.py:86
+msgid "Ignore case differences"
+msgstr "Ignorovat velikost písmen"
+
+#: src/diffuse/preferences.py:87
+msgid "Ignore white space differences"
+msgstr "Ignorovat netisknutelné znaky"
+
+#: src/diffuse/preferences.py:88 src/diffuse/preferences.py:97
+msgid "Ignore changes to white space"
+msgstr "Ignorovat znaky mezer"
+
+#: src/diffuse/preferences.py:89
+msgid "Ignore blank line differences"
+msgstr "Ignorovat prázdné řádky"
+
+#: src/diffuse/preferences.py:90
+msgid "Ignore end of line differences"
+msgstr "Ignorovat znaky konce řádku"
+
+#: src/diffuse/preferences.py:92
+msgid "Alignment"
+msgstr "Zarovnání"
+
+#: src/diffuse/preferences.py:95
+msgid "Ignore case"
+msgstr "Ignorovat velikost písmen"
+
+#: src/diffuse/preferences.py:96
+msgid "Ignore white space"
+msgstr "Ignorovat netisknutelné znaky"
+
+#: src/diffuse/preferences.py:98
+msgid "Ignore blank lines"
+msgstr "Ignorovat prázdné řádky"
+
+#: src/diffuse/preferences.py:99
+msgid "Ignore end of line characters"
+msgstr "Ignorovat znaky konce řádku"
+
+#: src/diffuse/preferences.py:101
+msgid "Editor"
+msgstr "Editor"
+
+#: src/diffuse/preferences.py:104
+msgid "Auto indent"
+msgstr "Automaticky odsazovat"
+
+#: src/diffuse/preferences.py:105
+msgid "Expand tabs to spaces"
+msgstr "Nahradit tabulátory mezerami"
+
+#: src/diffuse/preferences.py:106
+msgid "Soft tab width"
+msgstr "Šířka tabulátoru"
+
+#: src/diffuse/preferences.py:108
+msgid "Tabs"
+msgstr "Panely"
+
+#: src/diffuse/preferences.py:111
+msgid "Default panes"
+msgstr "Výchozí počet podoken"
+
+#: src/diffuse/preferences.py:112
+msgid "Always show the tab bar"
+msgstr "Vždy zobrazovat lištu s panely"
+
+#: src/diffuse/preferences.py:113
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "Zobrazit upozornění, pokud zavření panelu ukončí %s"
+
+#: src/diffuse/preferences.py:115
+msgid "Regional Settings"
+msgstr "Místní nastavení"
+
+#: src/diffuse/preferences.py:118
+msgid "Default codec"
+msgstr "Výchozí kódování"
+
+#: src/diffuse/preferences.py:119
+msgid "Order of codecs used to identify encoding"
+msgstr "Pořadí kodeků pro rozpoznání kódování"
+
+#: src/diffuse/preferences.py:140
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/diffuse/preferences.py:142
+msgid "Root directory"
+msgstr "Kořenový adresář"
+
+#: src/diffuse/preferences.py:143
+msgid "Cygdrive prefix"
+msgstr "Předpona cygdrive"
+
+#: src/diffuse/preferences.py:162
+msgid "Version control system search order"
+msgstr ""
+
+#: src/diffuse/preferences.py:170
+msgid "\"co\" command"
+msgstr "příkaz \"co\""
+
+#: src/diffuse/preferences.py:171
+msgid "\"rlog\" command"
+msgstr "příkaz \"rlog\""
+
+#: src/diffuse/preferences.py:173
+msgid "Command"
+msgstr "Příkaz"
+
+#: src/diffuse/preferences.py:179
+msgid "Launch from a Bash login shell"
+msgstr "Spustit z příkazové řádky terminálu Bash"
+
+#: src/diffuse/preferences.py:186
+msgid "Update paths for Cygwin"
+msgstr "Upravit cesty pro Cygwin"
+
+#: src/diffuse/preferences.py:191
+msgid "Version Control"
+msgstr "Správa verzí"
+
+#: src/diffuse/preferences.py:256
+msgid "Preferences"
+msgstr "Předvolby"
+
+#: src/diffuse/resources.py:465
+#, fuzzy
+msgid "Error processing line {i + 1} of {file_name}."
+msgstr "Při zpracování řádku %(line)d souboru %(file)s došlo k chybě."
+
+#: src/diffuse/utils.py:60
+msgid "Auto Detect"
+msgstr "Automaticky rozpoznat"
+
+#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60 src/diffuse/vcs/svn.py:93
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "Při analýze revize %s došlo k chybě."
@@ -690,3 +904,27 @@ msgstr "Při analýze revize %s došlo k chybě."
 #, python-format
 msgid "Error parsing %s."
 msgstr "Při analýze %s došlo k chybě."
+
+#: src/diffuse/widgets.py:1842
+msgid "Align with Selection"
+msgstr "Zarovnat s výběrem"
+
+#: src/diffuse/widgets.py:1843
+msgid "Isolate"
+msgstr "Izolovat"
+
+#: src/diffuse/widgets.py:1844
+msgid "Merge Selection"
+msgstr "Sloučit výběr"
+
+#: src/diffuse/widgets.py:1850
+msgid "Select All"
+msgstr "Vybrat vše"
+
+#: src/diffuse/widgets.py:1853
+msgid "Swap with Selected Pane"
+msgstr "Prohodit s vybraným podoknem"
+
+#, python-format
+#~ msgid "Column %d"
+#~ msgstr "Sloupec %d"

po/de.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse-svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 10:26-0500\n"
+"POT-Creation-Date: 2021-11-24 13:44-0500\n"
 "PO-Revision-Date: 2021-01-26 04:29+0100\n"
 "Last-Translator: Henri Menke <henrimenke4@aim.com>\n"
 "Language-Team: German <henrimenke4@aim.com>\n"
@@ -32,9 +32,9 @@ msgstr "Werkzeug zum Mischen und Vergleichen von Textdateien"
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:7
 msgid ""
-"Diffuse is a graphical tool for comparing and merging text files. It can "
-"retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, "
-"Monotone, RCS, Subversion, and SVK repositories."
+"Diffuse is a graphical tool for comparing and merging text files. It can retrieve "
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, "
+"Subversion, and SVK repositories."
 msgstr ""
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
@@ -45,6 +45,70 @@ msgstr ""
 msgid "Copyright"
 msgstr "Urheberrecht"
 
+#: src/diffuse/dialogs.py:38
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr ""
+"Diffuse ist ein graphisches Werkzeug zum Zusammenführen und Vergleichen von "
+"Textdateien."
+
+#: src/diffuse/dialogs.py:43
+msgid "translator-credits"
+msgstr "Henri Menke <henrimenke4@aim.com>"
+
+#: src/diffuse/dialogs.py:47
+#, 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:81
+msgid "Encoding: "
+msgstr "Kodierung: "
+
+#: src/diffuse/dialogs.py:93
+msgid "Revision: "
+msgstr "Revision: "
+
+#: src/diffuse/dialogs.py:149
+msgid "Find..."
+msgstr "Suchen..."
+
+#: src/diffuse/dialogs.py:157
+msgid "Search For: "
+msgstr "Suchen nach: "
+
+#: src/diffuse/dialogs.py:182
+msgid "Match Case"
+msgstr "Übereinstimmen von Groß- und Kleinschreibung"
+
+#: src/diffuse/dialogs.py:187
+msgid "Search Backwards"
+msgstr "Rückwärts suchen"
+
 #: src/diffuse/main.py:77
 msgid "Close Tab"
 msgstr "Reiter schließen"
@@ -101,19 +165,18 @@ msgstr "Eine Datei mit dem Namen %s existiert bereits. Überschreiben?"
 #: src/diffuse/main.py:501
 #, python-format
 msgid ""
-"The file %s has been modified by another process since reading it.  If you "
-"save, all the external changes could be lost.  Save anyways?"
+"The file %s has been modified by another process since reading it.  If you save, "
+"all the external changes could be lost.  Save anyways?"
 msgstr ""
-"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?"
+"Die Datei %s wurde seit dem letzten Mal von einem anderen Prozess verändert. Wenn "
+"Sie speichern werden alle externen Änderungen verloren gehen.  Trotzdem Speichern?"
 
 #: src/diffuse/main.py:540
 #, python-format
 msgid "Error encoding to %s."
 msgstr "Fehler bei der Kodierung nach %s."
 
-#: src/diffuse/main.py:542
+#: src/diffuse/main.py:542 src/diffuse/preferences.py:296
 #, python-format
 msgid "Error writing %s."
 msgstr "Fehler beim Schreiben von %s."
@@ -128,11 +191,11 @@ msgstr "Zeilennummer: "
 
 #: src/diffuse/main.py:596
 msgid ""
-"Press the enter key or double click to edit.  Press the space bar or use the "
-"RMB menu to manually align."
+"Press the enter key or double click to edit.  Press the space bar or use the RMB "
+"menu to manually align."
 msgstr ""
-"Enter drücken, oder Doppelklicken zum editieren.  Drücken Sie die Leertaste, "
-"oder nutzen sie das RMB Menü zum manuellen Ausrichten."
+"Enter drücken, oder Doppelklicken zum editieren.  Drücken Sie die Leertaste, oder "
+"nutzen sie das RMB Menü zum manuellen Ausrichten."
 
 #: src/diffuse/main.py:598
 msgid "Press the escape key to finish editing."
@@ -140,11 +203,11 @@ msgstr "Drücken Sie die Escape Taste um die Bearbeitung zu beenden."
 
 #: src/diffuse/main.py:600
 msgid ""
-"Select target line and press the space bar to align.  Press the escape key "
-"to cancel."
+"Select target line and press the space bar to align.  Press the escape key to "
+"cancel."
 msgstr ""
-"Zeile auswählen und Leertaste drücken zum Ausrichten.  Drücken Sie die "
-"Escape Taste zum Abbrechen."
+"Zeile auswählen und Leertaste drücken zum Ausrichten.  Drücken Sie die Escape "
+"Taste zum Abbrechen."
 
 #: src/diffuse/main.py:711
 msgid "_File"
@@ -475,25 +538,24 @@ msgstr "Rückgängig"
 msgid "Redo"
 msgstr "Wiederholen"
 
-#: src/diffuse/main.py:838
+#: src/diffuse/main.py:838 src/diffuse/widgets.py:1846
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: src/diffuse/main.py:839
+#: src/diffuse/main.py:839 src/diffuse/widgets.py:1847
 msgid "Copy"
 msgstr "Kopieren"
 
-#: src/diffuse/main.py:840
+#: src/diffuse/main.py:840 src/diffuse/widgets.py:1848
 msgid "Paste"
 msgstr "Einfügen"
 
-#: src/diffuse/main.py:841
+#: src/diffuse/main.py:841 src/diffuse/widgets.py:1851
 msgid "Clear Edits"
 msgstr "Alle Änderungen rückgängig"
 
 #: src/diffuse/main.py:961
-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 ""
 "Einige Dateien haben ungespeicherte Änderungen. Wählen Sie die Dateien zum "
 "speichern aus, bevor Sie beenden."
@@ -572,19 +634,15 @@ msgid ""
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse is a graphical tool for merging and comparing text files.  Diffuse "
-"is\n"
-"able to compare an arbitrary number of files side-by-side and gives users "
-"the\n"
-"ability to manually adjust line matching and directly edit files.  Diffuse "
-"can\n"
+"Diffuse is a graphical tool for merging and comparing text files.  Diffuse is\n"
+"able to compare an arbitrary number of files side-by-side and gives users the\n"
+"ability to manually adjust line matching and directly edit files.  Diffuse can\n"
 "also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
 "Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
 "\n"
 "Help Options:\n"
 "  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright "
-"information\n"
+"  ( -v | --version )               Display version and copyright information\n"
 "\n"
 "Configuration Options:\n"
 "  --no-rcfile                      Do not read any resource files\n"
@@ -615,13 +673,10 @@ msgstr ""
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
 "Diffuse ist ein graphisches Werkzeug zum Zusammenführen und Vergleichen von\n"
-"Textdateien.  Diffuse ist in der Lage eine beliebige Anzahl von Dateien "
-"direkt\n"
+"Textdateien.  Diffuse ist in der Lage eine beliebige Anzahl von Dateien direkt\n"
 "zu vergleichen und gibt Nutzern die Möglichkeit manuell die Übereinstimmung\n"
-"anzupassen und Dateien direkt zu bearbeiten.  Diffuse kann ebenfalls "
-"Revisionen\n"
-"von Bazaar, CVS, Darcs, Git und Mercurial, Monotone, RCS, Subversion und "
-"SVK\n"
+"anzupassen und Dateien direkt zu bearbeiten.  Diffuse kann ebenfalls Revisionen\n"
+"von Bazaar, CVS, Darcs, Git und Mercurial, Monotone, RCS, Subversion und SVK\n"
 "Depots empfangen um sie zu Vergleichen und zusammenzuführen.\n"
 "\n"
 "Hilfe Optionen:\n"
@@ -635,8 +690,7 @@ msgstr ""
 "Generelle Optionen:\n"
 "  ( -c | --commit ) <rev>          Datei Revisionen <rev-1> und <rev>\n"
 "  ( -D | --close-if-same )         Alle Reiter ohne Unterschiede schließen\n"
-"  ( -e | --encoding ) <codec>      <codec> verwenden zum Lesen und Schreiben "
-"von\n"
+"  ( -e | --encoding ) <codec>      <codec> verwenden zum Lesen und Schreiben von\n"
 "                                  Dateien\n"
 "  ( -L | --label ) <label>         <label> anstatt des Dateinamens anzeigen\n"
 "  ( -m | --modified )              Neuen Reiter für jede modifizierte Datei "
@@ -646,14 +700,12 @@ msgstr ""
 "  ( -t | --tab )                   Neuen Reiter öffnen\n"
 "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
 "  --line <line>                    Beim Starten Zeile <line> markieren\n"
-"  --null-file                      Starte mit leerem Datei-"
-"Vergleichsfenster\n"
+"  --null-file                      Starte mit leerem Datei-Vergleichsfenster\n"
 "\n"
 "Anzeige Optionen:\n"
 "  ( -b | --ignore-space-change )   Änderungen an Leerzeichen ignorieren\n"
 "  ( -B | --ignore-blank-lines )    Änderungen an leeren Zeilen ignorieren\n"
-"  ( -E | --ignore-end-of-line )    Unterschiede an Zeilenumbrüchen "
-"ignorieren\n"
+"  ( -E | --ignore-end-of-line )    Unterschiede an Zeilenumbrüchen ignorieren\n"
 "  ( -i | --ignore-case )           Unterschiede an Groß- und Kleinschreibung "
 "ignorieren\n"
 "  ( -w | --ignore-all-space )      Unterschiede an Leerzeichen ignorieren"
@@ -670,11 +722,175 @@ msgstr "Übergehe unbekannten Parameter \"%s\"."
 #: src/diffuse/main.py:1819
 #, python-format
 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/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60
-#: src/diffuse/vcs/svn.py:93
+#: src/diffuse/preferences.py:77
+msgid "Display"
+msgstr "Anzeige"
+
+#: src/diffuse/preferences.py:80
+msgid "Font"
+msgstr "Schriftart"
+
+#: src/diffuse/preferences.py:81
+msgid "Tab width"
+msgstr "Tabulatorweite"
+
+#: src/diffuse/preferences.py:82
+msgid "Show right margin"
+msgstr "Zeige rechten Rand"
+
+#: src/diffuse/preferences.py:83
+msgid "Right margin"
+msgstr "Rechter Rand"
+
+#: src/diffuse/preferences.py:84
+msgid "Show line numbers"
+msgstr "Zeige Zeilennummern"
+
+#: src/diffuse/preferences.py:85
+msgid "Show white space characters"
+msgstr "Leerzeichen anzeigen"
+
+#: src/diffuse/preferences.py:86
+msgid "Ignore case differences"
+msgstr "Unterschiede bei Groß- und Kleinschreibung ignorieren"
+
+#: src/diffuse/preferences.py:87
+msgid "Ignore white space differences"
+msgstr "Unterschiede bei Leerzeichen ignorieren"
+
+#: src/diffuse/preferences.py:88 src/diffuse/preferences.py:97
+msgid "Ignore changes to white space"
+msgstr "Änderungen an Leerzeichen ignorieren"
+
+#: src/diffuse/preferences.py:89
+msgid "Ignore blank line differences"
+msgstr "Unterschiede bei leeren Zeilen ignorieren"
+
+#: src/diffuse/preferences.py:90
+msgid "Ignore end of line differences"
+msgstr "Unterschiede bei Zeilenumbrüchen ignorieren"
+
+#: src/diffuse/preferences.py:92
+msgid "Alignment"
+msgstr "Ausrichtung"
+
+#: src/diffuse/preferences.py:95
+msgid "Ignore case"
+msgstr "Groß- und Kleinschreibung ignorieren"
+
+#: src/diffuse/preferences.py:96
+msgid "Ignore white space"
+msgstr "Leerzeichen ignorieren"
+
+#: src/diffuse/preferences.py:98
+msgid "Ignore blank lines"
+msgstr "Leere Zeilen ignorieren"
+
+#: src/diffuse/preferences.py:99
+msgid "Ignore end of line characters"
+msgstr "Zeilenumbrüche ignorieren"
+
+#: src/diffuse/preferences.py:101
+msgid "Editor"
+msgstr "Editor"
+
+#: src/diffuse/preferences.py:104
+msgid "Auto indent"
+msgstr "Automatischer Einzug"
+
+#: src/diffuse/preferences.py:105
+msgid "Expand tabs to spaces"
+msgstr "Tabulatoren zu Leerzeichen erweitern"
+
+#: src/diffuse/preferences.py:106
+msgid "Soft tab width"
+msgstr "Weiche Tabulatorweite"
+
+#: src/diffuse/preferences.py:108
+msgid "Tabs"
+msgstr "Reiter"
+
+#: src/diffuse/preferences.py:111
+msgid "Default panes"
+msgstr "Standard Fenster"
+
+#: src/diffuse/preferences.py:112
+msgid "Always show the tab bar"
+msgstr "Reiter-Leiste immer anzeigen"
+
+#: src/diffuse/preferences.py:113
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "Warnen, wenn schließen des Tabs %s beendet"
+
+#: src/diffuse/preferences.py:115
+msgid "Regional Settings"
+msgstr "Lokalisierung"
+
+#: src/diffuse/preferences.py:118
+msgid "Default codec"
+msgstr "Standardkodierung"
+
+#: src/diffuse/preferences.py:119
+msgid "Order of codecs used to identify encoding"
+msgstr "Reihenfolge der Chiffren um die Kodierung zu erkennen"
+
+#: src/diffuse/preferences.py:140
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/diffuse/preferences.py:142
+msgid "Root directory"
+msgstr "Hauptverzeichnis"
+
+#: src/diffuse/preferences.py:143
+msgid "Cygdrive prefix"
+msgstr "Cygdrive Präfix"
+
+#: src/diffuse/preferences.py:162
+msgid "Version control system search order"
+msgstr "Suchreihenfolge des Versionskontrollsystems"
+
+#: src/diffuse/preferences.py:170
+msgid "\"co\" command"
+msgstr "\"co\" Befehl"
+
+#: src/diffuse/preferences.py:171
+msgid "\"rlog\" command"
+msgstr "\"rlog\" Befehl"
+
+#: src/diffuse/preferences.py:173
+msgid "Command"
+msgstr "Befehl"
+
+#: src/diffuse/preferences.py:179
+msgid "Launch from a Bash login shell"
+msgstr "Aus einer Bash login shell starten"
+
+#: src/diffuse/preferences.py:186
+msgid "Update paths for Cygwin"
+msgstr "Pfade für Cygwin aktualisieren"
+
+#: src/diffuse/preferences.py:191
+msgid "Version Control"
+msgstr "Versionsverwaltung"
+
+#: src/diffuse/preferences.py:256
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: src/diffuse/resources.py:465
+#, fuzzy
+msgid "Error processing line {i + 1} of {file_name}."
+msgstr "Fehler bei der Analyse der Zeilen %(line)d von %(file)s."
+
+#: src/diffuse/utils.py:60
+msgid "Auto Detect"
+msgstr "Automatische Erkennung"
+
+#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60 src/diffuse/vcs/svn.py:93
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "Fehler bei der Analyse der Revision %s."
@@ -683,3 +899,27 @@ msgstr "Fehler bei der Analyse der Revision %s."
 #, python-format
 msgid "Error parsing %s."
 msgstr "Fehler bei der Analyse %s."
+
+#: src/diffuse/widgets.py:1842
+msgid "Align with Selection"
+msgstr "Ausrichten an der Auswahl"
+
+#: src/diffuse/widgets.py:1843
+msgid "Isolate"
+msgstr "Isolieren"
+
+#: src/diffuse/widgets.py:1844
+msgid "Merge Selection"
+msgstr "Auswahl zusammenführen"
+
+#: src/diffuse/widgets.py:1850
+msgid "Select All"
+msgstr "Alles auswählen"
+
+#: src/diffuse/widgets.py:1853
+msgid "Swap with Selected Pane"
+msgstr "Mit ausgewähltem Fenster tauschen"
+
+#, python-format
+#~ msgid "Column %d"
+#~ msgstr "Spalte %d"

po/diffuse.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 10:26-0500\n"
+"POT-Creation-Date: 2021-11-24 14:06-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,9 +29,9 @@ msgstr ""
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:7
 msgid ""
-"Diffuse is a graphical tool for comparing and merging text files. It can "
-"retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, "
-"Monotone, RCS, Subversion, and SVK repositories."
+"Diffuse is a graphical tool for comparing and merging text files. It can retrieve "
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, "
+"Subversion, and SVK repositories."
 msgstr ""
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
@@ -42,6 +42,55 @@ msgstr ""
 msgid "Copyright"
 msgstr ""
 
+#: src/diffuse/dialogs.py:38
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr ""
+
+#: src/diffuse/dialogs.py:43
+msgid "translator-credits"
+msgstr ""
+
+#: src/diffuse/dialogs.py:47
+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:81
+msgid "Encoding: "
+msgstr ""
+
+#: src/diffuse/dialogs.py:93
+msgid "Revision: "
+msgstr ""
+
+#: src/diffuse/dialogs.py:149
+msgid "Find..."
+msgstr ""
+
+#: src/diffuse/dialogs.py:157
+msgid "Search For: "
+msgstr ""
+
+#: src/diffuse/dialogs.py:182
+msgid "Match Case"
+msgstr ""
+
+#: src/diffuse/dialogs.py:187
+msgid "Search Backwards"
+msgstr ""
+
 #: src/diffuse/main.py:77
 msgid "Close Tab"
 msgstr ""
@@ -98,8 +147,8 @@ msgstr ""
 #: src/diffuse/main.py:501
 #, python-format
 msgid ""
-"The file %s has been modified by another process since reading it.  If you "
-"save, all the external changes could be lost.  Save anyways?"
+"The file %s has been modified by another process since reading it.  If you save, "
+"all the external changes could be lost.  Save anyways?"
 msgstr ""
 
 #: src/diffuse/main.py:540
@@ -107,7 +156,7 @@ msgstr ""
 msgid "Error encoding to %s."
 msgstr ""
 
-#: src/diffuse/main.py:542
+#: src/diffuse/main.py:542 src/diffuse/preferences.py:296
 #, python-format
 msgid "Error writing %s."
 msgstr ""
@@ -122,8 +171,8 @@ msgstr ""
 
 #: src/diffuse/main.py:596
 msgid ""
-"Press the enter key or double click to edit.  Press the space bar or use the "
-"RMB menu to manually align."
+"Press the enter key or double click to edit.  Press the space bar or use the RMB "
+"menu to manually align."
 msgstr ""
 
 #: src/diffuse/main.py:598
@@ -132,8 +181,8 @@ msgstr ""
 
 #: src/diffuse/main.py:600
 msgid ""
-"Select target line and press the space bar to align.  Press the escape key "
-"to cancel."
+"Select target line and press the space bar to align.  Press the escape key to "
+"cancel."
 msgstr ""
 
 #: src/diffuse/main.py:711
@@ -465,25 +514,24 @@ msgstr ""
 msgid "Redo"
 msgstr ""
 
-#: src/diffuse/main.py:838
+#: src/diffuse/main.py:838 src/diffuse/widgets.py:1846
 msgid "Cut"
 msgstr ""
 
-#: src/diffuse/main.py:839
+#: src/diffuse/main.py:839 src/diffuse/widgets.py:1847
 msgid "Copy"
 msgstr ""
 
-#: src/diffuse/main.py:840
+#: src/diffuse/main.py:840 src/diffuse/widgets.py:1848
 msgid "Paste"
 msgstr ""
 
-#: src/diffuse/main.py:841
+#: src/diffuse/main.py:841 src/diffuse/widgets.py:1851
 msgid "Clear Edits"
 msgstr ""
 
 #: src/diffuse/main.py:961
-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 ""
 
 #: src/diffuse/main.py:974
@@ -560,19 +608,15 @@ msgid ""
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse is a graphical tool for merging and comparing text files.  Diffuse "
-"is\n"
-"able to compare an arbitrary number of files side-by-side and gives users "
-"the\n"
-"ability to manually adjust line matching and directly edit files.  Diffuse "
-"can\n"
+"Diffuse is a graphical tool for merging and comparing text files.  Diffuse is\n"
+"able to compare an arbitrary number of files side-by-side and gives users the\n"
+"ability to manually adjust line matching and directly edit files.  Diffuse can\n"
 "also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
 "Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
 "\n"
 "Help Options:\n"
 "  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright "
-"information\n"
+"  ( -v | --version )               Display version and copyright information\n"
 "\n"
 "Configuration Options:\n"
 "  --no-rcfile                      Do not read any resource files\n"
@@ -613,8 +657,172 @@ msgstr ""
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr ""
 
-#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60
-#: src/diffuse/vcs/svn.py:93
+#: src/diffuse/preferences.py:77
+msgid "Display"
+msgstr ""
+
+#: src/diffuse/preferences.py:80
+msgid "Font"
+msgstr ""
+
+#: src/diffuse/preferences.py:81
+msgid "Tab width"
+msgstr ""
+
+#: src/diffuse/preferences.py:82
+msgid "Show right margin"
+msgstr ""
+
+#: src/diffuse/preferences.py:83
+msgid "Right margin"
+msgstr ""
+
+#: src/diffuse/preferences.py:84
+msgid "Show line numbers"
+msgstr ""
+
+#: src/diffuse/preferences.py:85
+msgid "Show white space characters"
+msgstr ""
+
+#: src/diffuse/preferences.py:86
+msgid "Ignore case differences"
+msgstr ""
+
+#: src/diffuse/preferences.py:87
+msgid "Ignore white space differences"
+msgstr ""
+
+#: src/diffuse/preferences.py:88 src/diffuse/preferences.py:97
+msgid "Ignore changes to white space"
+msgstr ""
+
+#: src/diffuse/preferences.py:89
+msgid "Ignore blank line differences"
+msgstr ""
+
+#: src/diffuse/preferences.py:90
+msgid "Ignore end of line differences"
+msgstr ""
+
+#: src/diffuse/preferences.py:92
+msgid "Alignment"
+msgstr ""
+
+#: src/diffuse/preferences.py:95
+msgid "Ignore case"
+msgstr ""
+
+#: src/diffuse/preferences.py:96
+msgid "Ignore white space"
+msgstr ""
+
+#: src/diffuse/preferences.py:98
+msgid "Ignore blank lines"
+msgstr ""
+
+#: src/diffuse/preferences.py:99
+msgid "Ignore end of line characters"
+msgstr ""
+
+#: src/diffuse/preferences.py:101
+msgid "Editor"
+msgstr ""
+
+#: src/diffuse/preferences.py:104
+msgid "Auto indent"
+msgstr ""
+
+#: src/diffuse/preferences.py:105
+msgid "Expand tabs to spaces"
+msgstr ""
+
+#: src/diffuse/preferences.py:106
+msgid "Soft tab width"
+msgstr ""
+
+#: src/diffuse/preferences.py:108
+msgid "Tabs"
+msgstr ""
+
+#: src/diffuse/preferences.py:111
+msgid "Default panes"
+msgstr ""
+
+#: src/diffuse/preferences.py:112
+msgid "Always show the tab bar"
+msgstr ""
+
+#: src/diffuse/preferences.py:113
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr ""
+
+#: src/diffuse/preferences.py:115
+msgid "Regional Settings"
+msgstr ""
+
+#: src/diffuse/preferences.py:118
+msgid "Default codec"
+msgstr ""
+
+#: src/diffuse/preferences.py:119
+msgid "Order of codecs used to identify encoding"
+msgstr ""
+
+#: src/diffuse/preferences.py:140
+msgid "Cygwin"
+msgstr ""
+
+#: src/diffuse/preferences.py:142
+msgid "Root directory"
+msgstr ""
+
+#: src/diffuse/preferences.py:143
+msgid "Cygdrive prefix"
+msgstr ""
+
+#: src/diffuse/preferences.py:162
+msgid "Version control system search order"
+msgstr ""
+
+#: src/diffuse/preferences.py:170
+msgid "\"co\" command"
+msgstr ""
+
+#: src/diffuse/preferences.py:171
+msgid "\"rlog\" command"
+msgstr ""
+
+#: src/diffuse/preferences.py:173
+msgid "Command"
+msgstr ""
+
+#: src/diffuse/preferences.py:179
+msgid "Launch from a Bash login shell"
+msgstr ""
+
+#: src/diffuse/preferences.py:186
+msgid "Update paths for Cygwin"
+msgstr ""
+
+#: src/diffuse/preferences.py:191
+msgid "Version Control"
+msgstr ""
+
+#: src/diffuse/preferences.py:256
+msgid "Preferences"
+msgstr ""
+
+#: src/diffuse/resources.py:465
+msgid "Error processing line {i + 1} of {file_name}."
+msgstr ""
+
+#: src/diffuse/utils.py:60
+msgid "Auto Detect"
+msgstr ""
+
+#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60 src/diffuse/vcs/svn.py:93
 #, python-format
 msgid "Error parsing revision %s."
 msgstr ""
@@ -623,3 +831,23 @@ msgstr ""
 #, python-format
 msgid "Error parsing %s."
 msgstr ""
+
+#: src/diffuse/widgets.py:1842
+msgid "Align with Selection"
+msgstr ""
+
+#: src/diffuse/widgets.py:1843
+msgid "Isolate"
+msgstr ""
+
+#: src/diffuse/widgets.py:1844
+msgid "Merge Selection"
+msgstr ""
+
+#: src/diffuse/widgets.py:1850
+msgid "Select All"
+msgstr ""
+
+#: src/diffuse/widgets.py:1853
+msgid "Swap with Selected Pane"
+msgstr ""

po/es.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse-svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 10:26-0500\n"
+"POT-Creation-Date: 2021-11-24 13:44-0500\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator: David Marín Carreño <davefx@gmail.com>\n"
 "Language-Team: Spanish <henrimenke4@aim.com>\n"
@@ -30,9 +30,9 @@ msgstr "Un utillaje para juntar y comparar archivos de texto"
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:7
 msgid ""
-"Diffuse is a graphical tool for comparing and merging text files. It can "
-"retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, "
-"Monotone, RCS, Subversion, and SVK repositories."
+"Diffuse is a graphical tool for comparing and merging text files. It can retrieve "
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, "
+"Subversion, and SVK repositories."
 msgstr ""
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
@@ -43,6 +43,72 @@ msgstr ""
 msgid "Copyright"
 msgstr ""
 
+#: src/diffuse/dialogs.py:38
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr "Diffuse es una herramienta para mezclar y comparar archivos de texto."
+
+#: src/diffuse/dialogs.py:43
+msgid "translator-credits"
+msgstr ""
+"Henri Menke <henrimenke4@aim.com>\n"
+"David Marín Carreño <davefx@gmail.com>"
+
+#: src/diffuse/dialogs.py:47
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"This program is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the licence, or (at your option) any later "
+"version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A "
+"PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with this "
+"program.  You may also obtain a copy of the GNU General Public License from the "
+"Free Software Foundation by visiting their web site (http://www.fsf.org/) or by "
+"writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, "
+"Boston, MA  02110-1301  USA\n"
+
+#: src/diffuse/dialogs.py:81
+msgid "Encoding: "
+msgstr "Codificación:"
+
+#: src/diffuse/dialogs.py:93
+msgid "Revision: "
+msgstr "Revision: "
+
+#: src/diffuse/dialogs.py:149
+msgid "Find..."
+msgstr "Buscar..."
+
+#: src/diffuse/dialogs.py:157
+msgid "Search For: "
+msgstr "Buscar: "
+
+#: src/diffuse/dialogs.py:182
+msgid "Match Case"
+msgstr "Coincidencia de capitalización"
+
+#: src/diffuse/dialogs.py:187
+msgid "Search Backwards"
+msgstr "Buscar hacia atrás"
+
 #: src/diffuse/main.py:77
 msgid "Close Tab"
 msgstr "Cerrar pestaña"
@@ -99,19 +165,19 @@ msgstr "Ya existe un archivo llamado %s. ¿Quiere reemplazarlo?"
 #: src/diffuse/main.py:501
 #, python-format
 msgid ""
-"The file %s has been modified by another process since reading it.  If you "
-"save, all the external changes could be lost.  Save anyways?"
+"The file %s has been modified by another process since reading it.  If you save, "
+"all the external changes could be lost.  Save anyways?"
 msgstr ""
 "El fichero %s ha sido modificado por otro proceso desde que se cargó. Sí se "
-"guarda, todos los cambios realizados por procesos externos se perderán.  "
-"¿Deseas guardar de todos modos?"
+"guarda, todos los cambios realizados por procesos externos se perderán.  ¿Deseas "
+"guardar de todos modos?"
 
 #: src/diffuse/main.py:540
 #, python-format
 msgid "Error encoding to %s."
 msgstr "Error codificando a %s."
 
-#: src/diffuse/main.py:542
+#: src/diffuse/main.py:542 src/diffuse/preferences.py:296
 #, python-format
 msgid "Error writing %s."
 msgstr "Error guardando %s."
@@ -126,11 +192,11 @@ msgstr "Número de línea: "
 
 #: src/diffuse/main.py:596
 msgid ""
-"Press the enter key or double click to edit.  Press the space bar or use the "
-"RMB menu to manually align."
+"Press the enter key or double click to edit.  Press the space bar or use the RMB "
+"menu to manually align."
 msgstr ""
-"Pulse Enter o haga doble clic para editar.  Pulse el espaciador o use el "
-"menú RMB para alinear manualmente."
+"Pulse Enter o haga doble clic para editar.  Pulse el espaciador o use el menú RMB "
+"para alinear manualmente."
 
 #: src/diffuse/main.py:598
 msgid "Press the escape key to finish editing."
@@ -138,11 +204,10 @@ msgstr "Pulse Escape para finalizar la edición."
 
 #: src/diffuse/main.py:600
 msgid ""
-"Select target line and press the space bar to align.  Press the escape key "
-"to cancel."
+"Select target line and press the space bar to align.  Press the escape key to "
+"cancel."
 msgstr ""
-"Selecciona la línea y pulsa espacio para alinear.  Pulsa Escape para "
-"cancelar."
+"Selecciona la línea y pulsa espacio para alinear.  Pulsa Escape para cancelar."
 
 #: src/diffuse/main.py:711
 msgid "_File"
@@ -473,27 +538,25 @@ msgstr "Deshacer"
 msgid "Redo"
 msgstr "Rehacer"
 
-#: src/diffuse/main.py:838
+#: src/diffuse/main.py:838 src/diffuse/widgets.py:1846
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/diffuse/main.py:839
+#: src/diffuse/main.py:839 src/diffuse/widgets.py:1847
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/diffuse/main.py:840
+#: src/diffuse/main.py:840 src/diffuse/widgets.py:1848
 msgid "Paste"
 msgstr "Pegar"
 
-#: src/diffuse/main.py:841
+#: src/diffuse/main.py:841 src/diffuse/widgets.py:1851
 msgid "Clear Edits"
 msgstr "Deshacer todo"
 
 #: src/diffuse/main.py:961
-msgid ""
-"Some files have unsaved changes.  Select the files to save before closing."
-msgstr ""
-"Unos ficheros tienen cambios. Elige los ficheros a guardar antes de cerrar."
+msgid "Some files have unsaved changes.  Select the files to save before closing."
+msgstr "Unos ficheros tienen cambios. Elige los ficheros a guardar antes de cerrar."
 
 #: src/diffuse/main.py:974
 msgid "Tab"
@@ -569,19 +632,15 @@ msgid ""
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse is a graphical tool for merging and comparing text files.  Diffuse "
-"is\n"
-"able to compare an arbitrary number of files side-by-side and gives users "
-"the\n"
-"ability to manually adjust line matching and directly edit files.  Diffuse "
-"can\n"
+"Diffuse is a graphical tool for merging and comparing text files.  Diffuse is\n"
+"able to compare an arbitrary number of files side-by-side and gives users the\n"
+"ability to manually adjust line matching and directly edit files.  Diffuse can\n"
 "also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
 "Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
 "\n"
 "Help Options:\n"
 "  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright "
-"information\n"
+"  ( -v | --version )               Display version and copyright information\n"
 "\n"
 "Configuration Options:\n"
 "  --no-rcfile                      Do not read any resource files\n"
@@ -611,10 +670,8 @@ msgstr ""
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse es una herramienta gráfica para la mezcla y comparación de ficheros "
-"de\n"
-"texto. Diffuse puede comparar un número arbitrario de ficheros lado a lado "
-"y\n"
+"Diffuse es una herramienta gráfica para la mezcla y comparación de ficheros de\n"
+"texto. Diffuse puede comparar un número arbitrario de ficheros lado a lado y\n"
 "da a los usuarior la capacidad de realizar un ajuste de lineas manual y de\n"
 "editar los ficheros directamente. Diffuse puede también recuperar versiones\n"
 "de ficheros a partir de repositorios de Bazaar, CVS, Darcs, Git, Mercurial,\n"
@@ -622,28 +679,23 @@ msgstr ""
 "\n"
 "Opciones de ayuda:\n"
 "  ( -h | -? | --help )           Muestra esta información de uso\n"
-"  ( -v | --version )             Muestra información de versionado y "
-"copyright\n"
+"  ( -v | --version )             Muestra información de versionado y copyright\n"
 "\n"
 "Opciones de configuración:\n"
 "  --no-rcfile                    No leer ficheros de recursos\n"
-"  --rcfile <file>                Especificar fichero de recursos "
-"explícitamente\n"
+"  --rcfile <file>                Especificar fichero de recursos explícitamente\n"
 "\n"
 "Opciones generales:\n"
 "  ( -c | --commit ) <rev>        Revisiones de fich. <rev-1> y <rev>\n"
 "  ( -D | --close-if-same )       Cerrar pestañas sin diferencias\n"
-"  ( -e | --encoding ) <codec>    Usa codificación <codec> al leer y "
-"escribir\n"
-"  ( -m | --modified )            Crea nueva pestaña para cada fich. "
-"modificado\n"
+"  ( -e | --encoding ) <codec>    Usa codificación <codec> al leer y escribir\n"
+"  ( -m | --modified )            Crea nueva pestaña para cada fich. modificado\n"
 "  ( -r | --revision ) <rev>      Revisión de fichero <rev>\n"
 "  ( -s | --separate )            Crea nueva pestaña para cada fichero\n"
 "  ( -t | --tab )                 Inicia pestaña nueva\n"
 "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
 "  --line <line>                    Start with line <line> selected\n"
-"  --null-file                    Crea panel vacío de comparación de "
-"ficheros\n"
+"  --null-file                    Crea panel vacío de comparación de ficheros\n"
 "\n"
 "Opciones de visualización:\n"
 "  ( -b | --ignore-space-change ) Ignorar cambios en espaciado\n"
@@ -666,8 +718,173 @@ msgstr "Omitiendo argumento desconocido \"%s\"."
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Error processando parámetro \"%s\".  No se esperaba un directorio."
 
-#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60
-#: src/diffuse/vcs/svn.py:93
+#: src/diffuse/preferences.py:77
+msgid "Display"
+msgstr "Visualización"
+
+#: src/diffuse/preferences.py:80
+msgid "Font"
+msgstr "Tipo"
+
+#: src/diffuse/preferences.py:81
+msgid "Tab width"
+msgstr "Tamaño de tabulador"
+
+#: src/diffuse/preferences.py:82
+msgid "Show right margin"
+msgstr "Mostrar margen derecho"
+
+#: src/diffuse/preferences.py:83
+msgid "Right margin"
+msgstr "Margen derecho"
+
+#: src/diffuse/preferences.py:84
+msgid "Show line numbers"
+msgstr "Mostrar números de línea"
+
+#: src/diffuse/preferences.py:85
+msgid "Show white space characters"
+msgstr "Mostrar espacios"
+
+#: src/diffuse/preferences.py:86
+msgid "Ignore case differences"
+msgstr "Ignorar diferencías de capitalización"
+
+#: src/diffuse/preferences.py:87
+msgid "Ignore white space differences"
+msgstr "Ignorar diferencías de espacios"
+
+#: src/diffuse/preferences.py:88 src/diffuse/preferences.py:97
+msgid "Ignore changes to white space"
+msgstr "Ignorar cambios de espacios"
+
+#: src/diffuse/preferences.py:89
+msgid "Ignore blank line differences"
+msgstr "Ignorar diferencías de líneas vacías"
+
+#: src/diffuse/preferences.py:90
+msgid "Ignore end of line differences"
+msgstr "Ignorar diferencias en caracteres de fin de línea"
+
+#: src/diffuse/preferences.py:92
+msgid "Alignment"
+msgstr "Alineación"
+
+#: src/diffuse/preferences.py:95
+msgid "Ignore case"
+msgstr "Ignorar capitalización"
+
+#: src/diffuse/preferences.py:96
+msgid "Ignore white space"
+msgstr "Ignorar espacios"
+
+#: src/diffuse/preferences.py:98
+msgid "Ignore blank lines"
+msgstr "Ignorar líneas vacías"
+
+#: src/diffuse/preferences.py:99
+msgid "Ignore end of line characters"
+msgstr "Ignorar caracteres de fin de línea"
+
+#: src/diffuse/preferences.py:101
+msgid "Editor"
+msgstr "Editor"
+
+#: src/diffuse/preferences.py:104
+msgid "Auto indent"
+msgstr "Sangría automática"
+
+#: src/diffuse/preferences.py:105
+msgid "Expand tabs to spaces"
+msgstr "Ampliar tabuladores a espacios"
+
+#: src/diffuse/preferences.py:106
+msgid "Soft tab width"
+msgstr "Tabuladores blandos"
+
+#: src/diffuse/preferences.py:108
+msgid "Tabs"
+msgstr "Pestañas"
+
+#: src/diffuse/preferences.py:111
+msgid "Default panes"
+msgstr "Paneles predeterminados"
+
+#: src/diffuse/preferences.py:112
+msgid "Always show the tab bar"
+msgstr "Mostrar siempre barra de pestañas"
+
+#: src/diffuse/preferences.py:113
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "Avísar sí cerrar la ultima pestaña cerrará la aplicación %s"
+
+#: src/diffuse/preferences.py:115
+msgid "Regional Settings"
+msgstr "Ajustes regionales"
+
+#: src/diffuse/preferences.py:118
+msgid "Default codec"
+msgstr "Codificación estándar"
+
+#: src/diffuse/preferences.py:119
+msgid "Order of codecs used to identify encoding"
+msgstr "Orden de codificaciones en identificación"
+
+#: src/diffuse/preferences.py:140
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/diffuse/preferences.py:142
+msgid "Root directory"
+msgstr "Directorio raíz"
+
+#: src/diffuse/preferences.py:143
+msgid "Cygdrive prefix"
+msgstr "Prefijo de Cygdrive"
+
+#: src/diffuse/preferences.py:162
+msgid "Version control system search order"
+msgstr ""
+
+#: src/diffuse/preferences.py:170
+msgid "\"co\" command"
+msgstr "Comando \"co\""
+
+#: src/diffuse/preferences.py:171
+msgid "\"rlog\" command"
+msgstr "Comando \"rlog\""
+
+#: src/diffuse/preferences.py:173
+msgid "Command"
+msgstr "Comando"
+
+#: src/diffuse/preferences.py:179
+msgid "Launch from a Bash login shell"
+msgstr "Lanzar desde línea de comandos Bash"
+
+#: src/diffuse/preferences.py:186
+msgid "Update paths for Cygwin"
+msgstr "Actualizar rutas de Cygwin"
+
+#: src/diffuse/preferences.py:191
+msgid "Version Control"
+msgstr "Control de versión"
+
+#: src/diffuse/preferences.py:256
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: src/diffuse/resources.py:465
+#, fuzzy
+msgid "Error processing line {i + 1} of {file_name}."
+msgstr "Error procesando línea %(line)d de %(file)s."
+
+#: src/diffuse/utils.py:60
+msgid "Auto Detect"
+msgstr "Reconocimiento automático"
+
+#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60 src/diffuse/vcs/svn.py:93
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "Error analizando revisión %s."
@@ -676,3 +893,27 @@ msgstr "Error analizando revisión %s."
 #, python-format
 msgid "Error parsing %s."
 msgstr "Error analizando %s."
+
+#: src/diffuse/widgets.py:1842
+msgid "Align with Selection"
+msgstr "Alinear con la selección."
+
+#: src/diffuse/widgets.py:1843
+msgid "Isolate"
+msgstr "Aislar"
+
+#: src/diffuse/widgets.py:1844
+msgid "Merge Selection"
+msgstr "Mezclar selección"
+
+#: src/diffuse/widgets.py:1850
+msgid "Select All"
+msgstr "Seleccionar todo"
+
+#: src/diffuse/widgets.py:1853
+msgid "Swap with Selected Pane"
+msgstr "Reemplazar con panel seleccionado"
+
+#, python-format
+#~ msgid "Column %d"
+#~ msgstr "Columna %d"

po/it.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Diffuse 0.4.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 10:26-0500\n"
+"POT-Creation-Date: 2021-11-24 13:44-0500\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator: Cristian Marchi <cri.penta@gmail.com>\n"
 "Language-Team: Italian\n"
@@ -29,9 +29,9 @@ msgstr "Strumento grafico per l'unione e il confronto di file"
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:7
 msgid ""
-"Diffuse is a graphical tool for comparing and merging text files. It can "
-"retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, "
-"Monotone, RCS, Subversion, and SVK repositories."
+"Diffuse is a graphical tool for comparing and merging text files. It can retrieve "
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, "
+"Subversion, and SVK repositories."
 msgstr ""
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
@@ -42,6 +42,71 @@ msgstr ""
 msgid "Copyright"
 msgstr ""
 
+#: src/diffuse/dialogs.py:38
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr ""
+"Diffuse è uno strumento grafico per l'unione e la comparazione di file di testo."
+
+#: src/diffuse/dialogs.py:43
+msgid "translator-credits"
+msgstr "Cristian Marchi <cri.penta@gmail.com>,  2011."
+
+#: src/diffuse/dialogs.py:47
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"This program is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the licence, or (at your option) any later "
+"version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A "
+"PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with this "
+"program.  You may also obtain a copy of the GNU General Public License from the "
+"Free Software Foundation by visiting their web site (http://www.fsf.org/) or by "
+"writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, "
+"Boston, MA  02110-1301  USA\n"
+
+#: src/diffuse/dialogs.py:81
+msgid "Encoding: "
+msgstr "Codifica: "
+
+#: src/diffuse/dialogs.py:93
+msgid "Revision: "
+msgstr "Revisione: "
+
+#: src/diffuse/dialogs.py:149
+msgid "Find..."
+msgstr "Trova..."
+
+#: src/diffuse/dialogs.py:157
+msgid "Search For: "
+msgstr "Cerca: "
+
+#: src/diffuse/dialogs.py:182
+msgid "Match Case"
+msgstr "Distingui MAIUSCOLE/minuscole"
+
+#: src/diffuse/dialogs.py:187
+msgid "Search Backwards"
+msgstr "Cerca all'indietro"
+
 #: src/diffuse/main.py:77
 msgid "Close Tab"
 msgstr "Chiudi scheda"
@@ -98,19 +163,18 @@ msgstr "Il file «%s» esiste già. Sovrascrivere?"
 #: src/diffuse/main.py:501
 #, python-format
 msgid ""
-"The file %s has been modified by another process since reading it.  If you "
-"save, all the external changes could be lost.  Save anyways?"
+"The file %s has been modified by another process since reading it.  If you save, "
+"all the external changes could be lost.  Save anyways?"
 msgstr ""
 "Il file «%s» è stato modificato da un'altro processo dopo la lettura. Se si "
-"salva, tutte le modifiche esterne potrebbero essere perdute. Salvare "
-"comunque?"
+"salva, tutte le modifiche esterne potrebbero essere perdute. Salvare comunque?"
 
 #: src/diffuse/main.py:540
 #, python-format
 msgid "Error encoding to %s."
 msgstr "Errore codificando %s"
 
-#: src/diffuse/main.py:542
+#: src/diffuse/main.py:542 src/diffuse/preferences.py:296
 #, python-format
 msgid "Error writing %s."
 msgstr "Errore scrivendo il %s."
@@ -125,11 +189,11 @@ msgstr "Numero di riga: "
 
 #: src/diffuse/main.py:596
 msgid ""
-"Press the enter key or double click to edit.  Press the space bar or use the "
-"RMB menu to manually align."
+"Press the enter key or double click to edit.  Press the space bar or use the RMB "
+"menu to manually align."
 msgstr ""
-"Premere il tasto \"Invio\" o fare doppio clic per modificare. Premere "
-"\"spazio\" o usare il tasto destro del mouse per allineare manualmente."
+"Premere il tasto \"Invio\" o fare doppio clic per modificare. Premere \"spazio\" "
+"o usare il tasto destro del mouse per allineare manualmente."
 
 #: src/diffuse/main.py:598
 msgid "Press the escape key to finish editing."
@@ -137,11 +201,11 @@ msgstr "Premere il tasto \"Esc\" per terminare le modifiche"
 
 #: src/diffuse/main.py:600
 msgid ""
-"Select target line and press the space bar to align.  Press the escape key "
-"to cancel."
+"Select target line and press the space bar to align.  Press the escape key to "
+"cancel."
 msgstr ""
-"Selezionare la riga di destinazione e premere spazio per allineare. Premere "
-"\"Esc\" per annullare."
+"Selezionare la riga di destinazione e premere spazio per allineare. Premere \"Esc"
+"\" per annullare."
 
 #: src/diffuse/main.py:711
 msgid "_File"
@@ -472,28 +536,27 @@ msgstr "Annulla"
 msgid "Redo"
 msgstr "Ripeti"
 
-#: src/diffuse/main.py:838
+#: src/diffuse/main.py:838 src/diffuse/widgets.py:1846
 msgid "Cut"
 msgstr "Taglia"
 
-#: src/diffuse/main.py:839
+#: src/diffuse/main.py:839 src/diffuse/widgets.py:1847
 msgid "Copy"
 msgstr "Copia"
 
-#: src/diffuse/main.py:840
+#: src/diffuse/main.py:840 src/diffuse/widgets.py:1848
 msgid "Paste"
 msgstr "Incolla"
 
-#: src/diffuse/main.py:841
+#: src/diffuse/main.py:841 src/diffuse/widgets.py:1851
 msgid "Clear Edits"
 msgstr "Annulla le modifiche"
 
 #: src/diffuse/main.py:961
-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 ""
-"Alcune modifiche ai file non sono ancora state salvate. Selezionare i file "
-"da salvare prima di uscire."
+"Alcune modifiche ai file non sono ancora state salvate. Selezionare i file da "
+"salvare prima di uscire."
 
 #: src/diffuse/main.py:974
 msgid "Tab"
@@ -569,19 +632,15 @@ msgid ""
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse is a graphical tool for merging and comparing text files.  Diffuse "
-"is\n"
-"able to compare an arbitrary number of files side-by-side and gives users "
-"the\n"
-"ability to manually adjust line matching and directly edit files.  Diffuse "
-"can\n"
+"Diffuse is a graphical tool for merging and comparing text files.  Diffuse is\n"
+"able to compare an arbitrary number of files side-by-side and gives users the\n"
+"ability to manually adjust line matching and directly edit files.  Diffuse can\n"
 "also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
 "Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
 "\n"
 "Help Options:\n"
 "  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright "
-"information\n"
+"  ( -v | --version )               Display version and copyright information\n"
 "\n"
 "Configuration Options:\n"
 "  --no-rcfile                      Do not read any resource files\n"
@@ -611,13 +670,10 @@ msgstr ""
 "    diffuse [ [OPZIONE...] [FILE...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse è uno strumento grafico per l'unione e il confronto di file di "
-"testo.\n"
-"Diffuse è in grado di confrontare uno a fianco dell'altro un qualsiasi "
-"numero\n"
+"Diffuse è uno strumento grafico per l'unione e il confronto di file di testo.\n"
+"Diffuse è in grado di confrontare uno a fianco dell'altro un qualsiasi numero\n"
 "di file e fornisce all'utente la possibilità di correggere manualmente la\n"
-"corrispondenza fra le righe e di modificare i file. Diffuse è anche in "
-"grado\n"
+"corrispondenza fra le righe e di modificare i file. Diffuse è anche in grado\n"
 "di recuperare le revisioni dei file dai repository Bazaar, CVS, Darcs, Git,\n"
 "Mercurial, Monotone, RCS, Subversion e SVK per confrontarle e unirle.\n"
 "\n"
@@ -632,10 +688,9 @@ msgstr ""
 "Opzioni generali:\n"
 "  ( -c | --commit ) <rev>          Revisioni file <rev-1> e <rev>\n"
 "  ( -D | --close-if-same )         Chiude tutte le schede senza differenze\n"
-"  ( -e | --encoding ) <codec>      Usa <codec> per leggere e scrivere i "
+"  ( -e | --encoding ) <codec>      Usa <codec> per leggere e scrivere i file\n"
+"  ( -L | --label ) <etichetta>     Visualizza <etichetta> invece del nome del "
 "file\n"
-"  ( -L | --label ) <etichetta>     Visualizza <etichetta> invece del nome "
-"del file\n"
 "  ( -m | --modified )              Crea una nuova scheda per ogni file "
 "modificato\n"
 "  ( -r | --revision ) <rev>        Revisione file <rev>\n"
@@ -649,8 +704,7 @@ msgstr ""
 "  ( -b | --ignore-space-change )   Ignora le modifiche agli spazi vuoti\n"
 "  ( -B | --ignore-blank-lines )    Ignora le modifiche alle righe vuote\n"
 "  ( -E | --ignore-end-of-line )    Ignora le differenze di fine riga\n"
-"  ( -i | --ignore-case )           Ignora differenze tra MAIUSCOLE/"
-"minuscole\n"
+"  ( -i | --ignore-case )           Ignora differenze tra MAIUSCOLE/minuscole\n"
 "  ( -w | --ignore-all-space )      Ignora le differenze tra spazi vuoti"
 
 #: src/diffuse/main.py:1802
@@ -667,8 +721,173 @@ msgstr "L'argomento sconosciuto \"%s\" verrà tralasciato"
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Errore nell'elaborazione dell'argomento \"%s\". Cartella non attesa."
 
-#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60
-#: src/diffuse/vcs/svn.py:93
+#: src/diffuse/preferences.py:77
+msgid "Display"
+msgstr "Visualizzazione"
+
+#: src/diffuse/preferences.py:80
+msgid "Font"
+msgstr "Carattere"
+
+#: src/diffuse/preferences.py:81
+msgid "Tab width"
+msgstr "Larghezza scheda"
+
+#: src/diffuse/preferences.py:82
+msgid "Show right margin"
+msgstr "Mostra margine destro"
+
+#: src/diffuse/preferences.py:83
+msgid "Right margin"
+msgstr "Margine destro"
+
+#: src/diffuse/preferences.py:84
+msgid "Show line numbers"
+msgstr "Mostra i numeri di riga"
+
+#: src/diffuse/preferences.py:85
+msgid "Show white space characters"
+msgstr "Mostra i caratteri di spaziatura"
+
+#: src/diffuse/preferences.py:86
+msgid "Ignore case differences"
+msgstr "Ignora la differenza tra lettere maiuscole e minuscole"
+
+#: src/diffuse/preferences.py:87
+msgid "Ignore white space differences"
+msgstr "Ignora le differenze tra spazi vuoti"
+
+#: src/diffuse/preferences.py:88 src/diffuse/preferences.py:97
+msgid "Ignore changes to white space"
+msgstr "Ignora le modifiche agli spazi vuoti"
+
+#: src/diffuse/preferences.py:89
+msgid "Ignore blank line differences"
+msgstr "Ignora le differenze tra le righe vuote"
+
+#: src/diffuse/preferences.py:90
+msgid "Ignore end of line differences"
+msgstr "Ignora le differenze alla fine della riga"
+
+#: src/diffuse/preferences.py:92
+msgid "Alignment"
+msgstr "Allineamento"
+
+#: src/diffuse/preferences.py:95
+msgid "Ignore case"
+msgstr "Ignora MAIUSCOLE/minuscole"
+
+#: src/diffuse/preferences.py:96
+msgid "Ignore white space"
+msgstr "Ignora gli spazi vuoti"
+
+#: src/diffuse/preferences.py:98
+msgid "Ignore blank lines"
+msgstr "Ignora le righe vuote"
+
+#: src/diffuse/preferences.py:99
+msgid "Ignore end of line characters"
+msgstr "Ignora i caratteri di fine linea"
+
+#: src/diffuse/preferences.py:101
+msgid "Editor"
+msgstr "Editor"
+
+#: src/diffuse/preferences.py:104
+msgid "Auto indent"
+msgstr "Indentazione automatica"
+
+#: src/diffuse/preferences.py:105
+msgid "Expand tabs to spaces"
+msgstr "Espandi le tabulazioni in spazi"
+
+#: src/diffuse/preferences.py:106
+msgid "Soft tab width"
+msgstr "Larghezza scheda"
+
+#: src/diffuse/preferences.py:108
+msgid "Tabs"
+msgstr "Schede"
+
+#: src/diffuse/preferences.py:111
+msgid "Default panes"
+msgstr "Riquadri predefiniti"
+
+#: src/diffuse/preferences.py:112
+msgid "Always show the tab bar"
+msgstr "Mostra sempre la barra delle schede"
+
+#: src/diffuse/preferences.py:113
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "Avvisami se chiudendo una scheda anche %s verrà chiuso"
+
+#: src/diffuse/preferences.py:115
+msgid "Regional Settings"
+msgstr "Impostazioni regionali"
+
+#: src/diffuse/preferences.py:118
+msgid "Default codec"
+msgstr "Codec predefinito"
+
+#: src/diffuse/preferences.py:119
+msgid "Order of codecs used to identify encoding"
+msgstr "Ordine dei codici utilizzati per identificare la codifica"
+
+#: src/diffuse/preferences.py:140
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/diffuse/preferences.py:142
+msgid "Root directory"
+msgstr "Cartella radice"
+
+#: src/diffuse/preferences.py:143
+msgid "Cygdrive prefix"
+msgstr "Prefisso Cygdrive"
+
+#: src/diffuse/preferences.py:162
+msgid "Version control system search order"
+msgstr ""
+
+#: src/diffuse/preferences.py:170
+msgid "\"co\" command"
+msgstr "Comando \"co\""
+
+#: src/diffuse/preferences.py:171
+msgid "\"rlog\" command"
+msgstr "Comando \"rlog\""
+
+#: src/diffuse/preferences.py:173
+msgid "Command"
+msgstr "Comando"
+
+#: src/diffuse/preferences.py:179
+msgid "Launch from a Bash login shell"
+msgstr "Avvia dalla Bash di una shell di login"
+
+#: src/diffuse/preferences.py:186
+msgid "Update paths for Cygwin"
+msgstr "Aggiorna i percorsi per Cygwin"
+
+#: src/diffuse/preferences.py:191
+msgid "Version Control"
+msgstr "Controllo di versione"
+
+#: src/diffuse/preferences.py:256
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: src/diffuse/resources.py:465
+#, fuzzy
+msgid "Error processing line {i + 1} of {file_name}."
+msgstr "Errore nell'elaborare la riga  %(line)d di «%(file)s»."
+
+#: src/diffuse/utils.py:60
+msgid "Auto Detect"
+msgstr "Automatico"
+
+#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60 src/diffuse/vcs/svn.py:93
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "Eroore analizzando la revisione %s."
@@ -677,3 +896,27 @@ msgstr "Eroore analizzando la revisione %s."
 #, python-format
 msgid "Error parsing %s."
 msgstr "Errore analizzando %s."
+
+#: src/diffuse/widgets.py:1842
+msgid "Align with Selection"
+msgstr "Allinea con la selezione"
+
+#: src/diffuse/widgets.py:1843
+msgid "Isolate"
+msgstr "Isola"
+
+#: src/diffuse/widgets.py:1844
+msgid "Merge Selection"
+msgstr "Unisci selezione"
+
+#: src/diffuse/widgets.py:1850
+msgid "Select All"
+msgstr "Seleziona tutto"
+
+#: src/diffuse/widgets.py:1853
+msgid "Swap with Selected Pane"
+msgstr "Scambia con il riquadro selezionato"
+
+#, python-format
+#~ msgid "Column %d"
+#~ msgstr "Colonna %d"

po/ja.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse-svn r316\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 10:26-0500\n"
+"POT-Creation-Date: 2021-11-24 13:44-0500\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator: Derrick Moser <derrick_moser@yahoo.com>\n"
 "Language-Team: Japanese\n"
@@ -29,9 +29,9 @@ msgstr "テキストファイルをマージして比較するためのグラフ
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:7
 msgid ""
-"Diffuse is a graphical tool for comparing and merging text files. It can "
-"retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, "
-"Monotone, RCS, Subversion, and SVK repositories."
+"Diffuse is a graphical tool for comparing and merging text files. It can retrieve "
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, "
+"Subversion, and SVK repositories."
 msgstr ""
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
@@ -42,6 +42,69 @@ msgstr ""
 msgid "Copyright"
 msgstr ""
 
+#: src/diffuse/dialogs.py:38
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr ""
+"Diffuse は、テキストファイルをマージして比較するためのグラフィックツールです。"
+
+#: src/diffuse/dialogs.py:43
+msgid "translator-credits"
+msgstr "Derrick Moser <derrick_moser@yahoo.com>"
+
+#: src/diffuse/dialogs.py:47
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"このプログラムはフリーソフトウェアです。あなたはこれを、フリーソフトウェア財団に"
+"よって発行された GNU 一般公衆利用許諾契約書(バージョン2か、希望によってはそれ以降"
+"のバージョンのうちどれか)の定める条件の下で再頒布または改変することができます。\n"
+"\n"
+"このプログラムは有用であることを願って頒布されますが、*全くの無保証*です。商業可能"
+"性の保証や特定の目的への適合性は、言外に示されたものも含め全く存在しません。詳しく"
+"はGNU 一般公衆利用許諾契約書をご覧ください。\n"
+"\n"
+"あなたはこのプログラムと共に、GNU 一般公衆利用許諾契約書の複製物を一部受け取ったは"
+"ずです。もし受け取っていなければ、フリーソフトウェア財団まで請求してください(宛先"
+"は the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA "
+"02111-1307 USA)。\n"
+
+#: src/diffuse/dialogs.py:81
+msgid "Encoding: "
+msgstr "エンコーディング: "
+
+#: src/diffuse/dialogs.py:93
+msgid "Revision: "
+msgstr "リビジョン: "
+
+#: src/diffuse/dialogs.py:149
+msgid "Find..."
+msgstr "検索..."
+
+#: src/diffuse/dialogs.py:157
+msgid "Search For: "
+msgstr "検索する文字列: "
+
+#: src/diffuse/dialogs.py:182
+msgid "Match Case"
+msgstr "大文字/小文字を区別"
+
+#: src/diffuse/dialogs.py:187
+msgid "Search Backwards"
+msgstr "先頭に向かって検索"
+
 #: src/diffuse/main.py:77
 msgid "Close Tab"
 msgstr "タブを閉じる"
@@ -98,18 +161,18 @@ msgstr "%s というファイルは既に存在しています。それを上書
 #: src/diffuse/main.py:501
 #, python-format
 msgid ""
-"The file %s has been modified by another process since reading it.  If you "
-"save, all the external changes could be lost.  Save anyways?"
+"The file %s has been modified by another process since reading it.  If you save, "
+"all the external changes could be lost.  Save anyways?"
 msgstr ""
-"ファイル %s は、変更されています。保存する場合は、これらの変更が失われること"
-"があります。保存しますか?"
+"ファイル %s は、変更されています。保存する場合は、これらの変更が失われることがあり"
+"ます。保存しますか?"
 
 #: src/diffuse/main.py:540
 #, python-format
 msgid "Error encoding to %s."
 msgstr "%s に変える際にエラーが生じました。"
 
-#: src/diffuse/main.py:542
+#: src/diffuse/main.py:542 src/diffuse/preferences.py:296
 #, python-format
 msgid "Error writing %s."
 msgstr "%s へ書き込む際にエラーが生じました。"
@@ -124,11 +187,11 @@ msgstr "行番号: "
 
 #: src/diffuse/main.py:596
 msgid ""
-"Press the enter key or double click to edit.  Press the space bar or use the "
-"RMB menu to manually align."
+"Press the enter key or double click to edit.  Press the space bar or use the RMB "
+"menu to manually align."
 msgstr ""
-"編集するためにエンターキーを押すか、ダブルクリックします。手動で整列させるた"
-"めにスペースバーを押すか、RMBを使います。"
+"編集するためにエンターキーを押すか、ダブルクリックします。手動で整列させるためにス"
+"ペースバーを押すか、RMBを使います。"
 
 #: src/diffuse/main.py:598
 msgid "Press the escape key to finish editing."
@@ -136,11 +199,11 @@ msgstr "ESCキーを押して、編集を終了します。"
 
 #: src/diffuse/main.py:600
 msgid ""
-"Select target line and press the space bar to align.  Press the escape key "
-"to cancel."
+"Select target line and press the space bar to align.  Press the escape key to "
+"cancel."
 msgstr ""
-"目標行を選択してスペースバーを押すと整列します。取り消す場合は、ESCキーを押し"
-"ます。"
+"目標行を選択してスペースバーを押すと整列します。取り消す場合は、ESCキーを押しま"
+"す。"
 
 #: src/diffuse/main.py:711
 msgid "_File"
@@ -471,28 +534,26 @@ msgstr "元に戻す"
 msgid "Redo"
 msgstr "やり直す"
 
-#: src/diffuse/main.py:838
+#: src/diffuse/main.py:838 src/diffuse/widgets.py:1846
 msgid "Cut"
 msgstr "切り取り"
 
-#: src/diffuse/main.py:839
+#: src/diffuse/main.py:839 src/diffuse/widgets.py:1847
 msgid "Copy"
 msgstr "コピー"
 
-#: src/diffuse/main.py:840
+#: src/diffuse/main.py:840 src/diffuse/widgets.py:1848
 msgid "Paste"
 msgstr "貼り付け"
 
-#: src/diffuse/main.py:841
+#: src/diffuse/main.py:841 src/diffuse/widgets.py:1851
 msgid "Clear Edits"
 msgstr "編集をクリア"
 
 #: src/diffuse/main.py:961
-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 ""
-"変更が保存されていないファイルがあります。終了前に保存するファイルを選択しま"
-"す。"
+"変更が保存されていないファイルがあります。終了前に保存するファイルを選択します。"
 
 #: src/diffuse/main.py:974
 msgid "Tab"
@@ -568,19 +629,15 @@ msgid ""
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse is a graphical tool for merging and comparing text files.  Diffuse "
-"is\n"
-"able to compare an arbitrary number of files side-by-side and gives users "
-"the\n"
-"ability to manually adjust line matching and directly edit files.  Diffuse "
-"can\n"
+"Diffuse is a graphical tool for merging and comparing text files.  Diffuse is\n"
+"able to compare an arbitrary number of files side-by-side and gives users the\n"
+"ability to manually adjust line matching and directly edit files.  Diffuse can\n"
 "also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
 "Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
 "\n"
 "Help Options:\n"
 "  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright "
-"information\n"
+"  ( -v | --version )               Display version and copyright information\n"
 "\n"
 "Configuration Options:\n"
 "  --no-rcfile                      Do not read any resource files\n"
@@ -610,11 +667,9 @@ msgstr ""
 "    diffuse [ [オプション...] [ファイル...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse は、テキストファイルをマージして比較するためのグラフィックツールで"
-"す。\n"
+"Diffuse は、テキストファイルをマージして比較するためのグラフィックツールです。\n"
 "任意の数の並行なファイルを比較できます。ユーザは、手動で行を再整列し、\n"
-"ファイルを直接編集できます。また、Diffuse は比較やマージするためにBazaar、"
-"CVS、\n"
+"ファイルを直接編集できます。また、Diffuse は比較やマージするためにBazaar、CVS、\n"
 "Darcs、Git、Mercurial、Monotone、RCS、Subversion、および SVK リポジトリから\n"
 "ファイルリビジョンを取得できます。\n"
 "\n"
@@ -627,13 +682,11 @@ msgstr ""
 "  --rcfile <file>                  指定されたリソースファイルを読む\n"
 "\n"
 "一般的なオプション:\n"
-"  ( -c | --commit ) <rev>          <rev-1> と <rev> というファイルリビジョ"
-"ン\n"
+"  ( -c | --commit ) <rev>          <rev-1> と <rev> というファイルリビジョン\n"
 "  ( -D | --close-if-same )         差分がないタブを閉じる\n"
 "  ( -e | --encoding ) <codec>      <codec> でファイルを読み書き\n"
 "  ( -L | --label ) <label>         ファイル名の代わりに <label> を表示\n"
-"  ( -m | --modified )              変更になったファイルのために新しいタブを作"
-"る\n"
+"  ( -m | --modified )              変更になったファイルのために新しいタブを作る\n"
 "  ( -r | --revision ) <rev>        <rev> というファイルリビジョン\n"
 "  ( -s | --separate )              各ファイルのために新しいタブを作る\n"
 "  ( -t | --tab )                   新しいタブを始める\n"
@@ -661,11 +714,176 @@ msgstr "未知の引数「%s」を飛ばします。"
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr ""
-"%s の引数を処理しているときにエラーが生じました。ディレクトリは予測できません"
-"でした。"
+"%s の引数を処理しているときにエラーが生じました。ディレクトリは予測できませんでし"
+"た。"
 
-#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60
-#: src/diffuse/vcs/svn.py:93
+#: src/diffuse/preferences.py:77
+msgid "Display"
+msgstr "表示"
+
+#: src/diffuse/preferences.py:80
+msgid "Font"
+msgstr "フォント"
+
+#: src/diffuse/preferences.py:81
+msgid "Tab width"
+msgstr "タブの幅"
+
+#: src/diffuse/preferences.py:82
+msgid "Show right margin"
+msgstr "右マージンを表示"
+
+#: src/diffuse/preferences.py:83
+msgid "Right margin"
+msgstr "右マージン"
+
+#: src/diffuse/preferences.py:84
+msgid "Show line numbers"
+msgstr "行番号を表示"
+
+#: src/diffuse/preferences.py:85
+msgid "Show white space characters"
+msgstr "空白文字を表示"
+
+#: src/diffuse/preferences.py:86
+msgid "Ignore case differences"
+msgstr "大文字小文字の違いを無視"
+
+#: src/diffuse/preferences.py:87
+msgid "Ignore white space differences"
+msgstr "空白の違いを無視"
+
+#: src/diffuse/preferences.py:88 src/diffuse/preferences.py:97
+msgid "Ignore changes to white space"
+msgstr "空白の変更を無視"
+
+#: src/diffuse/preferences.py:89
+msgid "Ignore blank line differences"
+msgstr "空白行の違いを無視"
+
+#: src/diffuse/preferences.py:90
+msgid "Ignore end of line differences"
+msgstr "行の最後の違いを無視"
+
+#: src/diffuse/preferences.py:92
+msgid "Alignment"
+msgstr "整列"
+
+#: src/diffuse/preferences.py:95
+msgid "Ignore case"
+msgstr "大文字小文字を無視"
+
+#: src/diffuse/preferences.py:96
+msgid "Ignore white space"
+msgstr "空白を無視"
+
+#: src/diffuse/preferences.py:98
+msgid "Ignore blank lines"
+msgstr "空白行を無視"
+
+#: src/diffuse/preferences.py:99
+msgid "Ignore end of line characters"
+msgstr "行の最後の文字を無視"
+
+#: src/diffuse/preferences.py:101
+msgid "Editor"
+msgstr "エディタ"
+
+#: src/diffuse/preferences.py:104
+msgid "Auto indent"
+msgstr "自動インデント"
+
+#: src/diffuse/preferences.py:105
+msgid "Expand tabs to spaces"
+msgstr "タブの代わりに空白を挿入"
+
+#: src/diffuse/preferences.py:106
+msgid "Soft tab width"
+msgstr "ソフトタブの幅"
+
+#: src/diffuse/preferences.py:108
+msgid "Tabs"
+msgstr "タブ"
+
+#: src/diffuse/preferences.py:111
+msgid "Default panes"
+msgstr "枠のデフォルトの数"
+
+#: src/diffuse/preferences.py:112
+msgid "Always show the tab bar"
+msgstr "常にタブバーを表示"
+
+#: src/diffuse/preferences.py:113
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "タブを閉じるとき、%s を終了すると警告"
+
+#: src/diffuse/preferences.py:115
+msgid "Regional Settings"
+msgstr "地域設定"
+
+#: src/diffuse/preferences.py:118
+msgid "Default codec"
+msgstr "デフォルトのコーデック"
+
+#: src/diffuse/preferences.py:119
+msgid "Order of codecs used to identify encoding"
+msgstr "エンコーディングを特定するためのコーデックの優先順位"
+
+#: src/diffuse/preferences.py:140
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/diffuse/preferences.py:142
+msgid "Root directory"
+msgstr "ルートディレクトリ"
+
+#: src/diffuse/preferences.py:143
+msgid "Cygdrive prefix"
+msgstr "Cygdrive 接頭辞"
+
+#: src/diffuse/preferences.py:162
+msgid "Version control system search order"
+msgstr ""
+
+#: src/diffuse/preferences.py:170
+msgid "\"co\" command"
+msgstr "co というコマンド"
+
+#: src/diffuse/preferences.py:171
+msgid "\"rlog\" command"
+msgstr "rlog というコマンド"
+
+#: src/diffuse/preferences.py:173
+msgid "Command"
+msgstr "コマンド"
+
+#: src/diffuse/preferences.py:179
+msgid "Launch from a Bash login shell"
+msgstr "Bashログインシェルから始める"
+
+#: src/diffuse/preferences.py:186
+msgid "Update paths for Cygwin"
+msgstr "Cygwin のためにパスを更新"
+
+#: src/diffuse/preferences.py:191
+msgid "Version Control"
+msgstr "バージョンコントロール"
+
+#: src/diffuse/preferences.py:256
+msgid "Preferences"
+msgstr "設定"
+
+#: src/diffuse/resources.py:465
+#, fuzzy
+msgid "Error processing line {i + 1} of {file_name}."
+msgstr "%(file)s の %(line)d行 を処理しているときにエラーが生じました。"
+
+#: src/diffuse/utils.py:60
+msgid "Auto Detect"
+msgstr "自動検出"
+
+#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60 src/diffuse/vcs/svn.py:93
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "%s というリビジョンをパースする際にエラーが生じました。"
@@ -674,3 +892,27 @@ msgstr "%s というリビジョンをパースする際にエラーが生じま
 #, python-format
 msgid "Error parsing %s."
 msgstr "%s をパースする際にエラーが生じました。"
+
+#: src/diffuse/widgets.py:1842
+msgid "Align with Selection"
+msgstr "選択と整列"
+
+#: src/diffuse/widgets.py:1843
+msgid "Isolate"
+msgstr "分離"
+
+#: src/diffuse/widgets.py:1844
+msgid "Merge Selection"
+msgstr "選択をマージ"
+
+#: src/diffuse/widgets.py:1850
+msgid "Select All"
+msgstr "全て選択"
+
+#: src/diffuse/widgets.py:1853
+msgid "Swap with Selected Pane"
+msgstr "選択された枠と交換"
+
+#, python-format
+#~ msgid "Column %d"
+#~ msgstr "%d列"

po/ko.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse-svn r316\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 10:26-0500\n"
+"POT-Creation-Date: 2021-11-24 13:44-0500\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator: Kang Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean\n"
@@ -29,9 +29,9 @@ msgstr "텍스트 파일을 병합하고 비교하기위한 도구"
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:7
 msgid ""
-"Diffuse is a graphical tool for comparing and merging text files. It can "
-"retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, "
-"Monotone, RCS, Subversion, and SVK repositories."
+"Diffuse is a graphical tool for comparing and merging text files. It can retrieve "
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, "
+"Subversion, and SVK repositories."
 msgstr ""
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
@@ -42,6 +42,67 @@ msgstr ""
 msgid "Copyright"
 msgstr ""
 
+#: src/diffuse/dialogs.py:38
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr "Diffuse는 텍스트 파일을 병합하고 비교하기 위한 그래픽 도구입니다."
+
+#: src/diffuse/dialogs.py:43
+msgid "translator-credits"
+msgstr "강분도 <bundo@bundo.biz>"
+
+#: src/diffuse/dialogs.py:47
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"이 프로그램은 자유 소프트웨어입니다. 당신은 이것을 자유 소프트웨어 재단에 의해 발"
+"행된 GNU 일반 공중 사용 허가서 (버전 2, 희망은 이후 버전 중 하나)을 결정하는 조건 "
+"하에서 재배포 또는 수정 할 수 있습니다.\n"
+"\n"
+"본 프로그램은 도움이 될 것이라는 희망 배포되지만, * 완전한 무보증 *입니다. 상업적"
+"인 가능성의 보증이나 특정 목적에의 적합성은 안다 보이는 것도 포함 전혀 존재하지 않"
+"습니다. 자세한 사항은 GNU 일반 공중 사용 허가서를 참조하십시오.\n"
+"\n"
+"당신은이 프로그램과 함께 GNU 일반 공중 사용 허가서의 복제물을 일부받은 것입니다. "
+"만약받지면 자유 소프트웨어 재단으로 문의하시기 바랍니다 (주소는 the Free Software "
+"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA).\n"
+
+#: src/diffuse/dialogs.py:81
+msgid "Encoding: "
+msgstr "인코딩: "
+
+#: src/diffuse/dialogs.py:93
+msgid "Revision: "
+msgstr "수정: "
+
+#: src/diffuse/dialogs.py:149
+msgid "Find..."
+msgstr "찾기..."
+
+#: src/diffuse/dialogs.py:157
+msgid "Search For: "
+msgstr "검색 문자열:"
+
+#: src/diffuse/dialogs.py:182
+msgid "Match Case"
+msgstr "대소문자 구분"
+
+#: src/diffuse/dialogs.py:187
+msgid "Search Backwards"
+msgstr "위 방향으로 검색"
+
 #: src/diffuse/main.py:77
 msgid "Close Tab"
 msgstr "탭 닫기"
@@ -98,18 +159,18 @@ msgstr "%s라는 파일이 이미 있습니다. 그것을 덮어 쓰시겠습니
 #: src/diffuse/main.py:501
 #, python-format
 msgid ""
-"The file %s has been modified by another process since reading it.  If you "
-"save, all the external changes could be lost.  Save anyways?"
+"The file %s has been modified by another process since reading it.  If you save, "
+"all the external changes could be lost.  Save anyways?"
 msgstr ""
-"%s 파일은 수정되었습니다. 저장하게되면 이러한 변경 내용이 손실될 수 있습니"
-"다. 저장하시겠습니까?"
+"%s 파일은 수정되었습니다. 저장하게되면 이러한 변경 내용이 손실될 수 있습니다. 저장"
+"하시겠습니까?"
 
 #: src/diffuse/main.py:540
 #, python-format
 msgid "Error encoding to %s."
 msgstr "%s 바꾸는 데 오류가 발생했습니다."
 
-#: src/diffuse/main.py:542
+#: src/diffuse/main.py:542 src/diffuse/preferences.py:296
 #, python-format
 msgid "Error writing %s."
 msgstr "%s에 쓸 때 오류가 발생했습니다."
@@ -124,11 +185,11 @@ msgstr "줄번호: "
 
 #: src/diffuse/main.py:596
 msgid ""
-"Press the enter key or double click to edit.  Press the space bar or use the "
-"RMB menu to manually align."
+"Press the enter key or double click to edit.  Press the space bar or use the RMB "
+"menu to manually align."
 msgstr ""
-"편집하려면 엔터키를 누르거나 두 번 클릭합니다. 수동으로 정렬하기 위해 스페이"
-"스 바를 누르거나, RMB를 사용합니다."
+"편집하려면 엔터키를 누르거나 두 번 클릭합니다. 수동으로 정렬하기 위해 스페이스 바"
+"를 누르거나, RMB를 사용합니다."
 
 #: src/diffuse/main.py:598
 msgid "Press the escape key to finish editing."
@@ -136,11 +197,11 @@ msgstr "ESC 키를 눌러 편집을 끝냅니다."
 
 #: src/diffuse/main.py:600
 msgid ""
-"Select target line and press the space bar to align.  Press the escape key "
-"to cancel."
+"Select target line and press the space bar to align.  Press the escape key to "
+"cancel."
 msgstr ""
-"목표 행을 선택하고 스페이스 바를 누르면 정렬합니다. 취소하려면 ESC 키를 누르"
-"십시오."
+"목표 행을 선택하고 스페이스 바를 누르면 정렬합니다. 취소하려면 ESC 키를 누르십시"
+"오."
 
 #: src/diffuse/main.py:711
 msgid "_File"
@@ -471,28 +532,26 @@ msgstr "실행 취소"
 msgid "Redo"
 msgstr "작업 재 실행"
 
-#: src/diffuse/main.py:838
+#: src/diffuse/main.py:838 src/diffuse/widgets.py:1846
 msgid "Cut"
 msgstr "잘라내기"
 
-#: src/diffuse/main.py:839
+#: src/diffuse/main.py:839 src/diffuse/widgets.py:1847
 msgid "Copy"
 msgstr "복사"
 
-#: src/diffuse/main.py:840
+#: src/diffuse/main.py:840 src/diffuse/widgets.py:1848
 msgid "Paste"
 msgstr "붙여넣기"
 
-#: src/diffuse/main.py:841
+#: src/diffuse/main.py:841 src/diffuse/widgets.py:1851
 msgid "Clear Edits"
 msgstr "편집 삭제"
 
 #: src/diffuse/main.py:961
-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 ""
-"변경 내용이 저장되지 않은 파일이 있습니다. 종료하기 전에 저장할 파일을 선택합"
-"니다."
+"변경 내용이 저장되지 않은 파일이 있습니다. 종료하기 전에 저장할 파일을 선택합니다."
 
 #: src/diffuse/main.py:974
 msgid "Tab"
@@ -568,19 +627,15 @@ msgid ""
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse is a graphical tool for merging and comparing text files.  Diffuse "
-"is\n"
-"able to compare an arbitrary number of files side-by-side and gives users "
-"the\n"
-"ability to manually adjust line matching and directly edit files.  Diffuse "
-"can\n"
+"Diffuse is a graphical tool for merging and comparing text files.  Diffuse is\n"
+"able to compare an arbitrary number of files side-by-side and gives users the\n"
+"ability to manually adjust line matching and directly edit files.  Diffuse can\n"
 "also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
 "Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
 "\n"
 "Help Options:\n"
 "  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright "
-"information\n"
+"  ( -v | --version )               Display version and copyright information\n"
 "\n"
 "Configuration Options:\n"
 "  --no-rcfile                      Do not read any resource files\n"
@@ -611,10 +666,8 @@ msgstr ""
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
 "Diffuse은 텍스트 파일을 병합하며 비교를 위한 그래픽 도구입니다.  사용자가\n"
-"수동으로 행을 다시 정렬하고, 임의의 숫자를 병행하여 파일을 비교할 수 있습니"
-"다.\n"
-"파일을 직접 편집할 수 있습니다. 또한 Diffuse 비교 및 병합하기 위해 Bazaar, "
-"CVS,\n"
+"수동으로 행을 다시 정렬하고, 임의의 숫자를 병행하여 파일을 비교할 수 있습니다.\n"
+"파일을 직접 편집할 수 있습니다. 또한 Diffuse 비교 및 병합하기 위해 Bazaar, CVS,\n"
 "Darcs, Git, Mercurial, Monotone, RCS, Subversion 및 SVK 저장소에서 파일\n"
 "수정된것을 얻을 수 있습니다.\n"
 "\n"
@@ -658,11 +711,175 @@ msgstr "알수 없는 인수「%s」 유지 합니다."
 #: src/diffuse/main.py:1819
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
-msgstr ""
-"%s 인수를 처리하는 동안 오류가 발생했습니다. 디렉토리를 예측할 수 없습니다."
+msgstr "%s 인수를 처리하는 동안 오류가 발생했습니다. 디렉토리를 예측할 수 없습니다."
 
-#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60
-#: src/diffuse/vcs/svn.py:93
+#: src/diffuse/preferences.py:77
+msgid "Display"
+msgstr "표시"
+
+#: src/diffuse/preferences.py:80
+msgid "Font"
+msgstr "글꼴"
+
+#: src/diffuse/preferences.py:81
+msgid "Tab width"
+msgstr "탭 너비"
+
+#: src/diffuse/preferences.py:82
+msgid "Show right margin"
+msgstr "오른쪽 여백 표시"
+
+#: src/diffuse/preferences.py:83
+msgid "Right margin"
+msgstr "오른쪽 여백"
+
+#: src/diffuse/preferences.py:84
+msgid "Show line numbers"
+msgstr "줄번호 표시"
+
+#: src/diffuse/preferences.py:85
+msgid "Show white space characters"
+msgstr "여백 표시"
+
+#: src/diffuse/preferences.py:86
+msgid "Ignore case differences"
+msgstr "대소문자 차이를 무시"
+
+#: src/diffuse/preferences.py:87
+msgid "Ignore white space differences"
+msgstr "공백을 차이를 무시"
+
+#: src/diffuse/preferences.py:88 src/diffuse/preferences.py:97
+msgid "Ignore changes to white space"
+msgstr "빈 변화를 무시"
+
+#: src/diffuse/preferences.py:89
+msgid "Ignore blank line differences"
+msgstr "공백 행은 무시"
+
+#: src/diffuse/preferences.py:90
+msgid "Ignore end of line differences"
+msgstr "행의 마지막 차이를 무시"
+
+#: src/diffuse/preferences.py:92
+msgid "Alignment"
+msgstr "정렬"
+
+#: src/diffuse/preferences.py:95
+msgid "Ignore case"
+msgstr "대소문자 무시"
+
+#: src/diffuse/preferences.py:96
+msgid "Ignore white space"
+msgstr "공백을 무시"
+
+#: src/diffuse/preferences.py:98
+msgid "Ignore blank lines"
+msgstr "빈 줄을 무시"
+
+#: src/diffuse/preferences.py:99
+msgid "Ignore end of line characters"
+msgstr "행의 마지막 문자를 무시"
+
+#: src/diffuse/preferences.py:101
+msgid "Editor"
+msgstr "편집기"
+
+#: src/diffuse/preferences.py:104
+msgid "Auto indent"
+msgstr "자동 들여쓰기"
+
+#: src/diffuse/preferences.py:105
+msgid "Expand tabs to spaces"
+msgstr "탭 대신에 공백을 삽입"
+
+#: src/diffuse/preferences.py:106
+msgid "Soft tab width"
+msgstr "소프트 탭 너비"
+
+#: src/diffuse/preferences.py:108
+msgid "Tabs"
+msgstr "탭"
+
+#: src/diffuse/preferences.py:111
+msgid "Default panes"
+msgstr "프레임의 기본 수"
+
+#: src/diffuse/preferences.py:112
+msgid "Always show the tab bar"
+msgstr "항상 탭 모음 표시"
+
+#: src/diffuse/preferences.py:113
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "탭을 닫을때 %s 종료 및 경고"
+
+#: src/diffuse/preferences.py:115
+msgid "Regional Settings"
+msgstr "국가별 설정"
+
+#: src/diffuse/preferences.py:118
+msgid "Default codec"
+msgstr "기본 코덱"
+
+#: src/diffuse/preferences.py:119
+msgid "Order of codecs used to identify encoding"
+msgstr "인코딩을 확인하기 위한 코덱을 주문"
+
+#: src/diffuse/preferences.py:140
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/diffuse/preferences.py:142
+msgid "Root directory"
+msgstr "루트 디렉터리"
+
+#: src/diffuse/preferences.py:143
+msgid "Cygdrive prefix"
+msgstr "Cygdrive 접두어"
+
+#: src/diffuse/preferences.py:162
+msgid "Version control system search order"
+msgstr ""
+
+#: src/diffuse/preferences.py:170
+msgid "\"co\" command"
+msgstr "co 명령어"
+
+#: src/diffuse/preferences.py:171
+msgid "\"rlog\" command"
+msgstr "rlog 명령어"
+
+#: src/diffuse/preferences.py:173
+msgid "Command"
+msgstr "명령어"
+
+#: src/diffuse/preferences.py:179
+msgid "Launch from a Bash login shell"
+msgstr "Bash 로그인 쉘에서 시작"
+
+#: src/diffuse/preferences.py:186
+msgid "Update paths for Cygwin"
+msgstr "Cygwin을 위해 경로를 업데이트"
+
+#: src/diffuse/preferences.py:191
+msgid "Version Control"
+msgstr "버전 컨트롤"
+
+#: src/diffuse/preferences.py:256
+msgid "Preferences"
+msgstr "기본 설정"
+
+#: src/diffuse/resources.py:465
+#, fuzzy
+msgid "Error processing line {i + 1} of {file_name}."
+msgstr "%(file)s %(line)d 행을 처리하는 도중 오류가 발생했습니다."
+
+#: src/diffuse/utils.py:60
+msgid "Auto Detect"
+msgstr "자동추출"
+
+#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60 src/diffuse/vcs/svn.py:93
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "%s 버전을 구문 분석하는 동안 오류가 발생했습니다."
@@ -671,3 +888,27 @@ msgstr "%s 버전을 구문 분석하는 동안 오류가 발생했습니다."
 #, python-format
 msgid "Error parsing %s."
 msgstr "%s를 구문 분석하는 동안 오류가 발생했습니다."
+
+#: src/diffuse/widgets.py:1842
+msgid "Align with Selection"
+msgstr "선택 정렬"
+
+#: src/diffuse/widgets.py:1843
+msgid "Isolate"
+msgstr "분리"
+
+#: src/diffuse/widgets.py:1844
+msgid "Merge Selection"
+msgstr "선택 병합"
+
+#: src/diffuse/widgets.py:1850
+msgid "Select All"
+msgstr "모두 선택"
+
+#: src/diffuse/widgets.py:1853
+msgid "Swap with Selected Pane"
+msgstr "선택된 프레임 대신"
+
+#, python-format
+#~ msgid "Column %d"
+#~ msgstr "%d열"

po/pl.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse-0.4.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 10:26-0500\n"
+"POT-Creation-Date: 2021-11-24 13:44-0500\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator: Miś Uszatek <adres.email@ymail.com>, 2012\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n"
+"%100>=20) ? 1 : 2);\n"
 
 #: data/io.github.mightycreak.Diffuse.desktop.in:3
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:4
@@ -30,9 +30,9 @@ msgstr "Graficzne narzędzie do łączenia i porównywania plików tekstowych"
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:7
 msgid ""
-"Diffuse is a graphical tool for comparing and merging text files. It can "
-"retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, "
-"Monotone, RCS, Subversion, and SVK repositories."
+"Diffuse is a graphical tool for comparing and merging text files. It can retrieve "
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, "
+"Subversion, and SVK repositories."
 msgstr ""
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
@@ -43,6 +43,56 @@ msgstr ""
 msgid "Copyright"
 msgstr ""
 
+#: src/diffuse/dialogs.py:38
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr ""
+"Diffuse jest graficznym narzędziem do łączenia i porównywania plików tekstowych."
+
+#: src/diffuse/dialogs.py:43
+msgid "translator-credits"
+msgstr "Miś Uszatek <adres.email@ymail.com>"
+
+#: src/diffuse/dialogs.py:47
+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:81
+msgid "Encoding: "
+msgstr "Kodowanie znaków: "
+
+#: src/diffuse/dialogs.py:93
+msgid "Revision: "
+msgstr "Rewizia: "
+
+#: src/diffuse/dialogs.py:149
+msgid "Find..."
+msgstr "Szukaj..."
+
+#: src/diffuse/dialogs.py:157
+msgid "Search For: "
+msgstr "Szukaj Dla: "
+
+#: src/diffuse/dialogs.py:182
+msgid "Match Case"
+msgstr "Uwzględnij wielkość liter"
+
+#: src/diffuse/dialogs.py:187
+msgid "Search Backwards"
+msgstr "Szukaj Wstecz"
+
 #: src/diffuse/main.py:77
 msgid "Close Tab"
 msgstr "Zamknij Kartę"
@@ -99,19 +149,18 @@ msgstr "Plik o nazwie %s już istnieje. Czy chcesz go zastąpić?"
 #: src/diffuse/main.py:501
 #, python-format
 msgid ""
-"The file %s has been modified by another process since reading it.  If you "
-"save, all the external changes could be lost.  Save anyways?"
+"The file %s has been modified by another process since reading it.  If you save, "
+"all the external changes could be lost.  Save anyways?"
 msgstr ""
-"Plik %s został zmodyfikowany przez inny proces od chwili jego wczytania. "
-"Jeśli zapiszesz, wszystkie zewnętrzne zmiany mogą zostać utracone. Zapisać "
-"pomimo to?"
+"Plik %s został zmodyfikowany przez inny proces od chwili jego wczytania. Jeśli "
+"zapiszesz, wszystkie zewnętrzne zmiany mogą zostać utracone. Zapisać pomimo to?"
 
 #: src/diffuse/main.py:540
 #, python-format
 msgid "Error encoding to %s."
 msgstr "Błąd kodowania dla %s."
 
-#: src/diffuse/main.py:542
+#: src/diffuse/main.py:542 src/diffuse/preferences.py:296
 #, python-format
 msgid "Error writing %s."
 msgstr "Błąd zapisu %s."
@@ -126,11 +175,11 @@ msgstr "Numer Linii: "
 
 #: src/diffuse/main.py:596
 msgid ""
-"Press the enter key or double click to edit.  Press the space bar or use the "
-"RMB menu to manually align."
+"Press the enter key or double click to edit.  Press the space bar or use the RMB "
+"menu to manually align."
 msgstr ""
-"Naciśnij klawisz Enter lub dwukrotnie kliknij aby edytować.  Naciśnij "
-"klawisz spacji lub użyć menu RMB, aby ręcznie ustawić."
+"Naciśnij klawisz Enter lub dwukrotnie kliknij aby edytować.  Naciśnij klawisz "
+"spacji lub użyć menu RMB, aby ręcznie ustawić."
 
 #: src/diffuse/main.py:598
 msgid "Press the escape key to finish editing."
@@ -138,11 +187,11 @@ msgstr "Naciśnij klawisz escape, aby zakończyć edycję."
 
 #: src/diffuse/main.py:600
 msgid ""
-"Select target line and press the space bar to align.  Press the escape key "
-"to cancel."
+"Select target line and press the space bar to align.  Press the escape key to "
+"cancel."
 msgstr ""
-"Wybierz linie docelową i naciśnij klawisz spacji aby wyrównać.  Naciśnij "
-"klawisz Escape, aby anulować."
+"Wybierz linie docelową i naciśnij klawisz spacji aby wyrównać.  Naciśnij klawisz "
+"Escape, aby anulować."
 
 #: src/diffuse/main.py:711
 msgid "_File"
@@ -473,25 +522,24 @@ msgstr "Cofnij"
 msgid "Redo"
 msgstr "Ponów"
 
-#: src/diffuse/main.py:838
+#: src/diffuse/main.py:838 src/diffuse/widgets.py:1846
 msgid "Cut"
 msgstr "Wytnij"
 
-#: src/diffuse/main.py:839
+#: src/diffuse/main.py:839 src/diffuse/widgets.py:1847
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: src/diffuse/main.py:840
+#: src/diffuse/main.py:840 src/diffuse/widgets.py:1848
 msgid "Paste"
 msgstr "Wklej"
 
-#: src/diffuse/main.py:841
+#: src/diffuse/main.py:841 src/diffuse/widgets.py:1851
 msgid "Clear Edits"
 msgstr "Wyczyść Edycje"
 
 #: src/diffuse/main.py:961
-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 ""
 "Niektóre pliki mają niezapisane zmiany. Wybierz pliki, aby zapisać przed "
 "zamknięciem."
@@ -570,19 +618,15 @@ msgid ""
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse is a graphical tool for merging and comparing text files.  Diffuse "
-"is\n"
-"able to compare an arbitrary number of files side-by-side and gives users "
-"the\n"
-"ability to manually adjust line matching and directly edit files.  Diffuse "
-"can\n"
+"Diffuse is a graphical tool for merging and comparing text files.  Diffuse is\n"
+"able to compare an arbitrary number of files side-by-side and gives users the\n"
+"ability to manually adjust line matching and directly edit files.  Diffuse can\n"
 "also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
 "Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
 "\n"
 "Help Options:\n"
 "  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright "
-"information\n"
+"  ( -v | --version )               Display version and copyright information\n"
 "\n"
 "Configuration Options:\n"
 "  --no-rcfile                      Do not read any resource files\n"
@@ -612,13 +656,10 @@ msgstr ""
 "    diffuse [ [OPCJA...] [PLIK...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse jest graficznym narzędzie do łączenia i porównywania plików "
-"tekstowych.\n"
+"Diffuse jest graficznym narzędzie do łączenia i porównywania plików tekstowych.\n"
 "Diffusejest w stanie porównać dowolną liczbę plików obok siebie i daje\n"
-"użytkownikowi możliwość ręcznego dopasowania linii i bezpośrednie "
-"edytowanie\n"
-"plików. Diffuse może również pobrać wersje plików z Bazaar, CVS, Darcs, "
-"Git,\n"
+"użytkownikowi możliwość ręcznego dopasowania linii i bezpośrednie edytowanie\n"
+"plików. Diffuse może również pobrać wersje plików z Bazaar, CVS, Darcs, Git,\n"
 "Mercurial, Monotone, RCS, Subversion, i SVK  repozytorium do porównania i "
 "łączenia.\n"
 "\n"
@@ -628,8 +669,7 @@ msgstr ""
 "autorskich\n"
 "\n"
 "Opcje Konfiguracyjne:\n"
-"  --no-rcfile                      Nie czytaj żadnych plików "
-"konfiguracyjnych\n"
+"  --no-rcfile                      Nie czytaj żadnych plików konfiguracyjnych\n"
 "  --rcfile <file>                  Określ wyraźnie plik konfiguracyjny\n"
 "\n"
 "Opcje Ogólne:\n"
@@ -637,8 +677,8 @@ msgstr ""
 "  ( -D | --close-if-same )         Zamknij wszystkie karty bez różnic\n"
 "  ( -e | --encoding ) <codec>      Użyj <kod> do odczytu i zapisu plików\n"
 "  ( -L | --label ) <label>         Wyświetla <etykieta> zamiast nazwy pliku\n"
-"  ( -m | --modified )              Utwórz nową kartę dla każdego "
-"zmodyfikowanego pliku\n"
+"  ( -m | --modified )              Utwórz nową kartę dla każdego zmodyfikowanego "
+"pliku\n"
 "  ( -r | --revision ) <rev>        Plik rewizji <rev>\n"
 "  ( -s | --separate )              Utwórzy nową kartę dla każdego pliku\n"
 "  ( -t | --tab )                   Rozpocznij z nową kartą\n"
@@ -667,8 +707,173 @@ msgstr "Pomijanie nieznanego argumentu \"%s\"."
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Błąd przetwarzania argumentu \"%s\". Nie oczekiwano katalogu."
 
-#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60
-#: src/diffuse/vcs/svn.py:93
+#: src/diffuse/preferences.py:77
+msgid "Display"
+msgstr "Wyświetl"
+
+#: src/diffuse/preferences.py:80
+msgid "Font"
+msgstr "Czcionka"
+
+#: src/diffuse/preferences.py:81
+msgid "Tab width"
+msgstr "Szerokość tabulacji"
+
+#: src/diffuse/preferences.py:82
+msgid "Show right margin"
+msgstr "Pokaż prawy margines"
+
+#: src/diffuse/preferences.py:83
+msgid "Right margin"
+msgstr "Prawy margines"
+
+#: src/diffuse/preferences.py:84
+msgid "Show line numbers"
+msgstr "Pokaż numerowanie linii"
+
+#: src/diffuse/preferences.py:85
+msgid "Show white space characters"
+msgstr "Pokaż znaki spacji"
+
+#: src/diffuse/preferences.py:86
+msgid "Ignore case differences"
+msgstr "Ignoruj różnice w wielkość liter"
+
+#: src/diffuse/preferences.py:87
+msgid "Ignore white space differences"
+msgstr "Ignoruj różnice spacji"
+
+#: src/diffuse/preferences.py:88 src/diffuse/preferences.py:97
+msgid "Ignore changes to white space"
+msgstr "Ignoruj zmiany w spacji"
+
+#: src/diffuse/preferences.py:89
+msgid "Ignore blank line differences"
+msgstr "Ignoruj różnice pustych linii"
+
+#: src/diffuse/preferences.py:90
+msgid "Ignore end of line differences"
+msgstr "Ignoruj różnice na końcu linii"
+
+#: src/diffuse/preferences.py:92
+msgid "Alignment"
+msgstr "Dostosowanie"
+
+#: src/diffuse/preferences.py:95
+msgid "Ignore case"
+msgstr "Ignoruj wielkość liter"
+
+#: src/diffuse/preferences.py:96
+msgid "Ignore white space"
+msgstr "Ignoruj spacje"
+
+#: src/diffuse/preferences.py:98
+msgid "Ignore blank lines"
+msgstr "Ignoruj puste wiersze"
+
+#: src/diffuse/preferences.py:99
+msgid "Ignore end of line characters"
+msgstr "Ignoruj końcowe znaki linii"
+
+#: src/diffuse/preferences.py:101
+msgid "Editor"
+msgstr "Edytor"
+
+#: src/diffuse/preferences.py:104
+msgid "Auto indent"
+msgstr "Automatyczne wcięcia"
+
+#: src/diffuse/preferences.py:105
+msgid "Expand tabs to spaces"
+msgstr "Zamiana tabulacji na spacje"
+
+#: src/diffuse/preferences.py:106
+msgid "Soft tab width"
+msgstr "Miękka szerokość tabulacji"
+
+#: src/diffuse/preferences.py:108
+msgid "Tabs"
+msgstr "Karty"
+
+#: src/diffuse/preferences.py:111
+msgid "Default panes"
+msgstr "Domyślne Okna"
+
+#: src/diffuse/preferences.py:112
+msgid "Always show the tab bar"
+msgstr "Zawsze pokazuj pasek kart"
+
+#: src/diffuse/preferences.py:113
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "Ostrzegaj mnie gdy zamknięcie karty zakończy %s."
+
+#: src/diffuse/preferences.py:115
+msgid "Regional Settings"
+msgstr "Regionalne Ustawienia"
+
+#: src/diffuse/preferences.py:118
+msgid "Default codec"
+msgstr "Domyślne kodowanie znaków"
+
+#: src/diffuse/preferences.py:119
+msgid "Order of codecs used to identify encoding"
+msgstr "Kolejny kodek używany do identyfikacji kodowania"
+
+#: src/diffuse/preferences.py:140
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/diffuse/preferences.py:142
+msgid "Root directory"
+msgstr "Główny katalog"
+
+#: src/diffuse/preferences.py:143
+msgid "Cygdrive prefix"
+msgstr "Cygdrive Prefiks "
+
+#: src/diffuse/preferences.py:162
+msgid "Version control system search order"
+msgstr ""
+
+#: src/diffuse/preferences.py:170
+msgid "\"co\" command"
+msgstr "\"co\" polecenie"
+
+#: src/diffuse/preferences.py:171
+msgid "\"rlog\" command"
+msgstr "\"rlog\" polecenie"
+
+#: src/diffuse/preferences.py:173
+msgid "Command"
+msgstr "Polecenie"
+
+#: src/diffuse/preferences.py:179
+msgid "Launch from a Bash login shell"
+msgstr "Uruchom z powłoki Bash"
+
+#: src/diffuse/preferences.py:186
+msgid "Update paths for Cygwin"
+msgstr "Aktualizacja ścieżki dla Cygwin"
+
+#: src/diffuse/preferences.py:191
+msgid "Version Control"
+msgstr "Wersja kontrolna"
+
+#: src/diffuse/preferences.py:256
+msgid "Preferences"
+msgstr "Preferencje"
+
+#: src/diffuse/resources.py:465
+#, fuzzy
+msgid "Error processing line {i + 1} of {file_name}."
+msgstr "Błąd przetwarzania linii %(line)d w %(file)s."
+
+#: src/diffuse/utils.py:60
+msgid "Auto Detect"
+msgstr "Automatyczne Wykrywanie"
+
+#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60 src/diffuse/vcs/svn.py:93
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "Błąd analizowania rewizji %s."
@@ -677,3 +882,27 @@ msgstr "Błąd analizowania rewizji %s."
 #, python-format
 msgid "Error parsing %s."
 msgstr "Błędy analizowania %s."
+
+#: src/diffuse/widgets.py:1842
+msgid "Align with Selection"
+msgstr "Wyrównaj do zaznaczenia"
+
+#: src/diffuse/widgets.py:1843
+msgid "Isolate"
+msgstr "Oddziel"
+
+#: src/diffuse/widgets.py:1844
+msgid "Merge Selection"
+msgstr "Scal Zaznaczenie"
+
+#: src/diffuse/widgets.py:1850
+msgid "Select All"
+msgstr "Zaznacz Wszystko"
+
+#: src/diffuse/widgets.py:1853
+msgid "Swap with Selected Pane"
+msgstr "Zamień z Zaznaczonym Oknem"
+
+#, python-format
+#~ msgid "Column %d"
+#~ msgstr "Kolumna%d"

po/pt.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse-svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 10:26-0500\n"
+"POT-Creation-Date: 2021-11-24 13:44-0500\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator: Pedro Albuquerque <pmra@gmx.com>\n"
 "Language-Team: Português <pmra@gmx.com>\n"
@@ -34,9 +34,9 @@ msgstr "Ferramenta gráfica para unir e comparar ficheiros de texto"
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:7
 msgid ""
-"Diffuse is a graphical tool for comparing and merging text files. It can "
-"retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, "
-"Monotone, RCS, Subversion, and SVK repositories."
+"Diffuse is a graphical tool for comparing and merging text files. It can retrieve "
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, "
+"Subversion, and SVK repositories."
 msgstr ""
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
@@ -47,6 +47,69 @@ msgstr ""
 msgid "Copyright"
 msgstr ""
 
+#: src/diffuse/dialogs.py:38
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr "O Diffuse é uma ferramenta gráfica para unir e comparar ficheiros de texto."
+
+#: src/diffuse/dialogs.py:43
+msgid "translator-credits"
+msgstr "Pedro Albuquerque <pmra@gmx.com>"
+
+#: src/diffuse/dialogs.py:47
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"Este programa é gratuito; pode redistribuí-lo e/ou modificá-lo sob os termos da "
+"GNU General Public License como publicada pela Free Software Foundation; seja a "
+"versão 2 da licença, ou (por opção sua) qualquer versão posterior.\n"
+"\n"
+"Este programa é distribuído na esperança de ser útil, mas SEM QUALQUER GARANTIA; "
+"nem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO A UM PROPÓSITO EM "
+"PARTICULAR. Veja a GNU General Public License para mais detalhes.\n"
+"\n"
+"Deverá ter recebido uma cópia da GNU General Public License juntamente com o "
+"programa. Também pode obter uma cópia da GNU General Public License da Free "
+"Software Foundation visitando a sua página web (http://www.fsf.org/) ou "
+"escrevendo para Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, "
+"Boston, MA  02110-1301  USA\n"
+
+#: src/diffuse/dialogs.py:81
+msgid "Encoding: "
+msgstr "Codificação: "
+
+#: src/diffuse/dialogs.py:93
+msgid "Revision: "
+msgstr "Revisão: "
+
+#: src/diffuse/dialogs.py:149
+msgid "Find..."
+msgstr "Localizar..."
+
+#: src/diffuse/dialogs.py:157
+msgid "Search For: "
+msgstr "Procurar por: "
+
+#: src/diffuse/dialogs.py:182
+msgid "Match Case"
+msgstr "Comparar maiúsculas"
+
+#: src/diffuse/dialogs.py:187
+msgid "Search Backwards"
+msgstr "Procurar para trás"
+
 #: src/diffuse/main.py:77
 msgid "Close Tab"
 msgstr "Fechar separador"
@@ -103,8 +166,8 @@ msgstr "Já existe um ficheiro chamado %s. Deseja sobrescrevê-lo?"
 #: src/diffuse/main.py:501
 #, python-format
 msgid ""
-"The file %s has been modified by another process since reading it.  If you "
-"save, all the external changes could be lost.  Save anyways?"
+"The file %s has been modified by another process since reading it.  If you save, "
+"all the external changes could be lost.  Save anyways?"
 msgstr ""
 "O ficheiro %s foi modificado por outro processo desde a leitura. Se gravar, "
 "perderá todas as alterações externas. Gravar mesmo assim?"
@@ -114,7 +177,7 @@ msgstr ""
 msgid "Error encoding to %s."
 msgstr "Erro ao codificar para %s."
 
-#: src/diffuse/main.py:542
+#: src/diffuse/main.py:542 src/diffuse/preferences.py:296
 #, python-format
 msgid "Error writing %s."
 msgstr "Erro ao excrever %s."
@@ -129,11 +192,11 @@ msgstr "Número de linha: "
 
 #: src/diffuse/main.py:596
 msgid ""
-"Press the enter key or double click to edit.  Press the space bar or use the "
-"RMB menu to manually align."
+"Press the enter key or double click to edit.  Press the space bar or use the RMB "
+"menu to manually align."
 msgstr ""
-"Prima Enter ou faça duplo clique para editar. Prima a barra de espaços ou "
-"use o menu RMB para alinhar manualmente."
+"Prima Enter ou faça duplo clique para editar. Prima a barra de espaços ou use o "
+"menu RMB para alinhar manualmente."
 
 #: src/diffuse/main.py:598
 msgid "Press the escape key to finish editing."
@@ -141,11 +204,11 @@ msgstr "Prima Esc para terminar a edição."
 
 #: src/diffuse/main.py:600
 msgid ""
-"Select target line and press the space bar to align.  Press the escape key "
-"to cancel."
+"Select target line and press the space bar to align.  Press the escape key to "
+"cancel."
 msgstr ""
-"Seleccione a linha alvo e prima a barra de espaço para alinhar. Prima Esc "
-"para cancelar."
+"Seleccione a linha alvo e prima a barra de espaço para alinhar. Prima Esc para "
+"cancelar."
 
 #: src/diffuse/main.py:711
 msgid "_File"
@@ -476,25 +539,24 @@ msgstr "Desfazer"
 msgid "Redo"
 msgstr "Refazer"
 
-#: src/diffuse/main.py:838
+#: src/diffuse/main.py:838 src/diffuse/widgets.py:1846
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/diffuse/main.py:839
+#: src/diffuse/main.py:839 src/diffuse/widgets.py:1847
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/diffuse/main.py:840
+#: src/diffuse/main.py:840 src/diffuse/widgets.py:1848
 msgid "Paste"
 msgstr "Colar"
 
-#: src/diffuse/main.py:841
+#: src/diffuse/main.py:841 src/diffuse/widgets.py:1851
 msgid "Clear Edits"
 msgstr "Limpar edição"
 
 #: src/diffuse/main.py:961
-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 ""
 "Alguns ficheiros têm alterações por gravar. Seleccione os ficheiros a gravar "
 "antes de fechar."
@@ -573,19 +635,15 @@ msgid ""
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse is a graphical tool for merging and comparing text files.  Diffuse "
-"is\n"
-"able to compare an arbitrary number of files side-by-side and gives users "
-"the\n"
-"ability to manually adjust line matching and directly edit files.  Diffuse "
-"can\n"
+"Diffuse is a graphical tool for merging and comparing text files.  Diffuse is\n"
+"able to compare an arbitrary number of files side-by-side and gives users the\n"
+"ability to manually adjust line matching and directly edit files.  Diffuse can\n"
 "also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
 "Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
 "\n"
 "Help Options:\n"
 "  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright "
-"information\n"
+"  ( -v | --version )               Display version and copyright information\n"
 "\n"
 "Configuration Options:\n"
 "  --no-rcfile                      Do not read any resource files\n"
@@ -619,8 +677,7 @@ msgstr ""
 "É capaz de comparar um número arbitrário de ficheiros lado-a-lado e dá aos\n"
 "utilizadores a possibilidade de ajustar manualmente as linhas com edição "
 "directa.\n"
-"Pode ainda obter revisões de ficheiros de repositórios Bazaar, CVS, Darcs, "
-"Git,\n"
+"Pode ainda obter revisões de ficheiros de repositórios Bazaar, CVS, Darcs, Git,\n"
 "Mercurial, Monotone, RCS, Subversion e SVK para comparação e união.\n"
 "\n"
 "Opções de ajuda:\n"
@@ -630,21 +687,17 @@ msgstr ""
 "\n"
 "Opções de configuração:\n"
 "  --no-rcfile                      não lê qualquer ficheiro de recursos\n"
-"  --rcfile <file>                  especifica um ficheiro de recursos "
-"especifico\n"
+"  --rcfile <file>                  especifica um ficheiro de recursos especifico\n"
 "\n"
 "Opções gerais:\n"
 "  ( -c | --commit ) <rev>          revisões de ficheiros <rev-1> e <rev>\n"
-"  ( -D | --close-if-same )         fecha todos os separadores sem "
-"diferenças\n"
+"  ( -D | --close-if-same )         fecha todos os separadores sem diferenças\n"
 "  ( -e | --encoding ) <codec>      usa <codec> para ler e escreve ficheiros\n"
-"  ( -L | --label ) <etiqueta>      mostra <etiqueta> em vez do nome do "
-"ficheiro\n"
+"  ( -L | --label ) <etiqueta>      mostra <etiqueta> em vez do nome do ficheiro\n"
 "  ( -m | --modified )              cria um novo separador para cada ficheiro "
 "modificado\n"
 "  ( -r | --revision ) <rev>        revisão de ficheiro <rev>\n"
-"  ( -s | --separate )              cria um novo separador para cada "
-"ficheiro\n"
+"  ( -s | --separate )              cria um novo separador para cada ficheiro\n"
 "  ( -t | --tab )                   começa um novo separador\n"
 "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
 "  --line <linha>                   começa com a linha <linha> seleccionada\n"
@@ -671,8 +724,173 @@ msgstr "A ignorar argumento desconhecido \"%s\"."
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Erro ao processar o argumento \"%s\". Pasta inesperada."
 
-#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60
-#: src/diffuse/vcs/svn.py:93
+#: src/diffuse/preferences.py:77
+msgid "Display"
+msgstr "Mostrar"
+
+#: src/diffuse/preferences.py:80
+msgid "Font"
+msgstr "Letra"
+
+#: src/diffuse/preferences.py:81
+msgid "Tab width"
+msgstr "Largura de tabulação"
+
+#: src/diffuse/preferences.py:82
+msgid "Show right margin"
+msgstr "Mostrar margem direita"
+
+#: src/diffuse/preferences.py:83
+msgid "Right margin"
+msgstr "Margem direita"
+
+#: src/diffuse/preferences.py:84
+msgid "Show line numbers"
+msgstr "Mostrar números de linha"
+
+#: src/diffuse/preferences.py:85
+msgid "Show white space characters"
+msgstr "Mostrar espaços em branco"
+
+#: src/diffuse/preferences.py:86
+msgid "Ignore case differences"
+msgstr "Ignorar diferenças de maiúsculas"
+
+#: src/diffuse/preferences.py:87
+msgid "Ignore white space differences"
+msgstr "Ignorar diferenças de espaços"
+
+#: src/diffuse/preferences.py:88 src/diffuse/preferences.py:97
+msgid "Ignore changes to white space"
+msgstr "Ignorar alterações a espaços"
+
+#: src/diffuse/preferences.py:89
+msgid "Ignore blank line differences"
+msgstr "Ignorar diferenças de linhas em branco"
+
+#: src/diffuse/preferences.py:90
+msgid "Ignore end of line differences"
+msgstr "Ignorar diferenças de fins de linha"
+
+#: src/diffuse/preferences.py:92
+msgid "Alignment"
+msgstr "Alinhamento"
+
+#: src/diffuse/preferences.py:95
+msgid "Ignore case"
+msgstr "Ignorar maiúsculas"
+
+#: src/diffuse/preferences.py:96
+msgid "Ignore white space"
+msgstr "Ignorar espaços"
+
+#: src/diffuse/preferences.py:98
+msgid "Ignore blank lines"
+msgstr "Ignorar linhas em branco"
+
+#: src/diffuse/preferences.py:99
+msgid "Ignore end of line characters"
+msgstr "Ignorar caracteres de fim de linha"
+
+#: src/diffuse/preferences.py:101
+msgid "Editor"
+msgstr "Editor"
+
+#: src/diffuse/preferences.py:104
+msgid "Auto indent"
+msgstr "Indentação automática"
+
+#: src/diffuse/preferences.py:105
+msgid "Expand tabs to spaces"
+msgstr "Expandir tabulações para espaços"
+
+#: src/diffuse/preferences.py:106
+msgid "Soft tab width"
+msgstr "Largura de tabulação suave"
+
+#: src/diffuse/preferences.py:108
+msgid "Tabs"
+msgstr "Separadores"
+
+#: src/diffuse/preferences.py:111
+msgid "Default panes"
+msgstr "Painéis predefinidos"
+
+#: src/diffuse/preferences.py:112
+msgid "Always show the tab bar"
+msgstr "Mostrar sempre a barra de separadores"
+
+#: src/diffuse/preferences.py:113
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "Avisar se fechar um separador fecha o %s"
+
+#: src/diffuse/preferences.py:115
+msgid "Regional Settings"
+msgstr "Definições regionais"
+
+#: src/diffuse/preferences.py:118
+msgid "Default codec"
+msgstr "Codificação predefinida"
+
+#: src/diffuse/preferences.py:119
+msgid "Order of codecs used to identify encoding"
+msgstr "Ordem de codificações para identificar a codificação"
+
+#: src/diffuse/preferences.py:140
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/diffuse/preferences.py:142
+msgid "Root directory"
+msgstr "Pasta raiz"
+
+#: src/diffuse/preferences.py:143
+msgid "Cygdrive prefix"
+msgstr "Prefixo cygdrive"
+
+#: src/diffuse/preferences.py:162
+msgid "Version control system search order"
+msgstr ""
+
+#: src/diffuse/preferences.py:170
+msgid "\"co\" command"
+msgstr "comando \"co\""
+
+#: src/diffuse/preferences.py:171
+msgid "\"rlog\" command"
+msgstr "comando \"rlog\""
+
+#: src/diffuse/preferences.py:173
+msgid "Command"
+msgstr "Comando"
+
+#: src/diffuse/preferences.py:179
+msgid "Launch from a Bash login shell"
+msgstr "Iniciar numa consola de sessão bash"
+
+#: src/diffuse/preferences.py:186
+msgid "Update paths for Cygwin"
+msgstr "Actualizar caminhos para o Cygwin"
+
+#: src/diffuse/preferences.py:191
+msgid "Version Control"
+msgstr "Controlo de versões"
+
+#: src/diffuse/preferences.py:256
+msgid "Preferences"
+msgstr "Preferências"
+
+#: src/diffuse/resources.py:465
+#, fuzzy
+msgid "Error processing line {i + 1} of {file_name}."
+msgstr "Erro ao processar a linha %(line)d de %(file)s."
+
+#: src/diffuse/utils.py:60
+msgid "Auto Detect"
+msgstr "Detecção automática"
+
+#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60 src/diffuse/vcs/svn.py:93
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "Erro ao analisar a revisão %s."
@@ -681,3 +899,27 @@ msgstr "Erro ao analisar a revisão %s."
 #, python-format
 msgid "Error parsing %s."
 msgstr "Erro ao analisar %s."
+
+#: src/diffuse/widgets.py:1842
+msgid "Align with Selection"
+msgstr "Alinhar com a selecção"
+
+#: src/diffuse/widgets.py:1843
+msgid "Isolate"
+msgstr "Isolar"
+
+#: src/diffuse/widgets.py:1844
+msgid "Merge Selection"
+msgstr "Unir selecção"
+
+#: src/diffuse/widgets.py:1850
+msgid "Select All"
+msgstr "Seleccionar tudo"
+
+#: src/diffuse/widgets.py:1853
+msgid "Swap with Selected Pane"
+msgstr "Trocar com o painel seleccionado"
+
+#, python-format
+#~ msgid "Column %d"
+#~ msgstr "Coluna %d"

po/pt_BR.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse-svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 10:26-0500\n"
+"POT-Creation-Date: 2021-11-24 13:44-0500\n"
 "PO-Revision-Date: 2021-11-05 14:49-0400\n"
 "Last-Translator: Pedro Albuquerque <pmra@gmx.com>\n"
 "Language-Team: Português <pmra@gmx.com>\n"
@@ -34,9 +34,9 @@ msgstr "Ferramenta gráfica para unificar e comparar arquivos de texto"
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:7
 msgid ""
-"Diffuse is a graphical tool for comparing and merging text files. It can "
-"retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, "
-"Monotone, RCS, Subversion, and SVK repositories."
+"Diffuse is a graphical tool for comparing and merging text files. It can retrieve "
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, "
+"Subversion, and SVK repositories."
 msgstr ""
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
@@ -47,6 +47,71 @@ msgstr ""
 msgid "Copyright"
 msgstr "Direitos autorais"
 
+#: src/diffuse/dialogs.py:38
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr ""
+"O Diffuse é uma ferramenta gráfica para unificar e comparar arquivos de texto."
+
+#: src/diffuse/dialogs.py:43
+msgid "translator-credits"
+msgstr "Pedro Albuquerque <pmra@gmx.com>"
+
+#: src/diffuse/dialogs.py:47
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"Este programa é de software livre; pode redistribuí-lo e/ou modificá-lo sob os "
+"termos da GNU General Public License como publicada pela Free Software "
+"Foundation; seja a versão 2 da licença, ou (por opção sua) qualquer versão mais "
+"recente.\n"
+"\n"
+"Este programa é distribuído na esperança de ser útil, mas SEM QUALQUER GARANTIA; "
+"nem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO A UM PROPÓSITO EM "
+"PARTICULAR. Veja a GNU General Public License para mais detalhes.\n"
+"\n"
+"Deverá ter recebido uma cópia da GNU General Public License juntamente com o "
+"programa. Também pode obter uma cópia da GNU General Public License da Free "
+"Software Foundation visitando a sua página web (http://www.fsf.org/) ou "
+"escrevendo para Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, "
+"Boston, MA  02110-1301  USA\n"
+
+#: src/diffuse/dialogs.py:81
+msgid "Encoding: "
+msgstr "Codificação: "
+
+#: src/diffuse/dialogs.py:93
+msgid "Revision: "
+msgstr "Revisão: "
+
+#: src/diffuse/dialogs.py:149
+msgid "Find..."
+msgstr "Encontrar..."
+
+#: src/diffuse/dialogs.py:157
+msgid "Search For: "
+msgstr "Procurar por: "
+
+#: src/diffuse/dialogs.py:182
+msgid "Match Case"
+msgstr "Combinar maiúsculas"
+
+#: src/diffuse/dialogs.py:187
+msgid "Search Backwards"
+msgstr "Procurar para trás"
+
 #: src/diffuse/main.py:77
 msgid "Close Tab"
 msgstr "Fechar aba"
@@ -103,19 +168,19 @@ msgstr "Já existe um arquivo chamado %s. Quer substituí-lo?"
 #: src/diffuse/main.py:501
 #, python-format
 msgid ""
-"The file %s has been modified by another process since reading it.  If you "
-"save, all the external changes could be lost.  Save anyways?"
+"The file %s has been modified by another process since reading it.  If you save, "
+"all the external changes could be lost.  Save anyways?"
 msgstr ""
-"O arquivo %s foi modificado por outro processo desde o último carregamento. "
-"Se salvar agora, perderá todas as alterações feitas fora deste programa. "
-"Salvar de qualquer forma?"
+"O arquivo %s foi modificado por outro processo desde o último carregamento. Se "
+"salvar agora, perderá todas as alterações feitas fora deste programa. Salvar de "
+"qualquer forma?"
 
 #: src/diffuse/main.py:540
 #, python-format
 msgid "Error encoding to %s."
 msgstr "Erro ao codificar para %s."
 
-#: src/diffuse/main.py:542
+#: src/diffuse/main.py:542 src/diffuse/preferences.py:296
 #, python-format
 msgid "Error writing %s."
 msgstr "Erro ao salvar %s."
@@ -130,11 +195,11 @@ msgstr "Número de linha: "
 
 #: src/diffuse/main.py:596
 msgid ""
-"Press the enter key or double click to edit.  Press the space bar or use the "
-"RMB menu to manually align."
+"Press the enter key or double click to edit.  Press the space bar or use the RMB "
+"menu to manually align."
 msgstr ""
-"Pressione Enter ou faça duplo clique para editar. Pressione a barra de "
-"espaço ou use o menu RMB para alinhar manualmente."
+"Pressione Enter ou faça duplo clique para editar. Pressione a barra de espaço ou "
+"use o menu RMB para alinhar manualmente."
 
 #: src/diffuse/main.py:598
 msgid "Press the escape key to finish editing."
@@ -142,11 +207,11 @@ msgstr "Pressione Esc para terminar a edição."
 
 #: src/diffuse/main.py:600
 msgid ""
-"Select target line and press the space bar to align.  Press the escape key "
-"to cancel."
+"Select target line and press the space bar to align.  Press the escape key to "
+"cancel."
 msgstr ""
-"Selecione a linha alvo e pressione a barra de espaço para alinhar. Pressione "
-"Esc para cancelar."
+"Selecione a linha alvo e pressione a barra de espaço para alinhar. Pressione Esc "
+"para cancelar."
 
 #: src/diffuse/main.py:711
 msgid "_File"
@@ -477,25 +542,24 @@ msgstr "Desfazer"
 msgid "Redo"
 msgstr "Refazer"
 
-#: src/diffuse/main.py:838
+#: src/diffuse/main.py:838 src/diffuse/widgets.py:1846
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/diffuse/main.py:839
+#: src/diffuse/main.py:839 src/diffuse/widgets.py:1847
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/diffuse/main.py:840
+#: src/diffuse/main.py:840 src/diffuse/widgets.py:1848
 msgid "Paste"
 msgstr "Colar"
 
-#: src/diffuse/main.py:841
+#: src/diffuse/main.py:841 src/diffuse/widgets.py:1851
 msgid "Clear Edits"
 msgstr "Limpar edições"
 
 #: src/diffuse/main.py:961
-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 ""
 "Alguns arquivos têm alterações não salvas. Selecione os arquivos para salvar "
 "antes de fechar."
@@ -574,19 +638,15 @@ msgid ""
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse is a graphical tool for merging and comparing text files.  Diffuse "
-"is\n"
-"able to compare an arbitrary number of files side-by-side and gives users "
-"the\n"
-"ability to manually adjust line matching and directly edit files.  Diffuse "
-"can\n"
+"Diffuse is a graphical tool for merging and comparing text files.  Diffuse is\n"
+"able to compare an arbitrary number of files side-by-side and gives users the\n"
+"ability to manually adjust line matching and directly edit files.  Diffuse can\n"
 "also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
 "Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
 "\n"
 "Help Options:\n"
 "  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright "
-"information\n"
+"  ( -v | --version )               Display version and copyright information\n"
 "\n"
 "Configuration Options:\n"
 "  --no-rcfile                      Do not read any resource files\n"
@@ -616,13 +676,10 @@ msgstr ""
 "    diffuse [ [OPÇÃO...] [ARQUIVO...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"O Diffuse é uma ferramenta gráfica para unificar e comparar arquivos de "
-"texto.\n"
+"O Diffuse é uma ferramenta gráfica para unificar e comparar arquivos de texto.\n"
 "É capaz de comparar um número arbitrário de arquivos lado-a-lado e dá aos\n"
-"usuários a possibilidade de ajustar manualmente as linhas com edição "
-"directa.\n"
-"Também pode obter revisões de arquivos de repositórios Bazaar, CVS, Darcs, "
-"Git,\n"
+"usuários a possibilidade de ajustar manualmente as linhas com edição directa.\n"
+"Também pode obter revisões de arquivos de repositórios Bazaar, CVS, Darcs, Git,\n"
 "Mercurial, Monotone, RCS, Subversion e SVK para comparação e unificação.\n"
 "\n"
 "Opções de ajuda:\n"
@@ -638,8 +695,7 @@ msgstr ""
 "  ( -c | --commit ) <rev>          revisões de arquivos <rev-1> e <rev>\n"
 "  ( -D | --close-if-same )         fecha todas as abas sem diferenças\n"
 "  ( -e | --encoding ) <codec>      usa <codec> para ler e escrever arquivos\n"
-"  ( -L | --label ) <etiqueta>      mostra <etiqueta> em vez do nome do "
-"arquivos\n"
+"  ( -L | --label ) <etiqueta>      mostra <etiqueta> em vez do nome do arquivos\n"
 "  ( -m | --modified )              cria uma nova aba para cada arquivo "
 "modificado\n"
 "  ( -r | --revision ) <rev>        revisão de arquivo <rev>\n"
@@ -670,8 +726,173 @@ msgstr "Omitindo argumento desconhecido \"%s\"."
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Erro ao processar o argumento \"%s\". Pasta inesperada."
 
-#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60
-#: src/diffuse/vcs/svn.py:93
+#: src/diffuse/preferences.py:77
+msgid "Display"
+msgstr "Mostrar"
+
+#: src/diffuse/preferences.py:80
+msgid "Font"
+msgstr "Letra"
+
+#: src/diffuse/preferences.py:81
+msgid "Tab width"
+msgstr "Largura de tabulação"
+
+#: src/diffuse/preferences.py:82
+msgid "Show right margin"
+msgstr "Mostrar margem direita"
+
+#: src/diffuse/preferences.py:83
+msgid "Right margin"
+msgstr "Margem direita"
+
+#: src/diffuse/preferences.py:84
+msgid "Show line numbers"
+msgstr "Mostrar números de linha"
+
+#: src/diffuse/preferences.py:85
+msgid "Show white space characters"
+msgstr "Mostrar espaços em branco"
+
+#: src/diffuse/preferences.py:86
+msgid "Ignore case differences"
+msgstr "Ignorar diferenças de maiúsculas"
+
+#: src/diffuse/preferences.py:87
+msgid "Ignore white space differences"
+msgstr "Ignorar diferenças de espaços"
+
+#: src/diffuse/preferences.py:88 src/diffuse/preferences.py:97
+msgid "Ignore changes to white space"
+msgstr "Ignorar alterações para espaços"
+
+#: src/diffuse/preferences.py:89
+msgid "Ignore blank line differences"
+msgstr "Ignorar diferenças de linhas em branco"
+
+#: src/diffuse/preferences.py:90
+msgid "Ignore end of line differences"
+msgstr "Ignorar diferenças de fins de linha"
+
+#: src/diffuse/preferences.py:92
+msgid "Alignment"
+msgstr "Alinhamento"
+
+#: src/diffuse/preferences.py:95
+msgid "Ignore case"
+msgstr "Ignorar maiúsculas"
+
+#: src/diffuse/preferences.py:96
+msgid "Ignore white space"
+msgstr "Ignorar espaços"
+
+#: src/diffuse/preferences.py:98
+msgid "Ignore blank lines"
+msgstr "Ignorar linhas em branco"
+
+#: src/diffuse/preferences.py:99
+msgid "Ignore end of line characters"
+msgstr "Ignorar caracteres de fim de linha"
+
+#: src/diffuse/preferences.py:101
+msgid "Editor"
+msgstr "Editor"
+
+#: src/diffuse/preferences.py:104
+msgid "Auto indent"
+msgstr "Indentação automática"
+
+#: src/diffuse/preferences.py:105
+msgid "Expand tabs to spaces"
+msgstr "Expandir tabulações para espaços"
+
+#: src/diffuse/preferences.py:106
+msgid "Soft tab width"
+msgstr "Largura de tabulação suave"
+
+#: src/diffuse/preferences.py:108
+msgid "Tabs"
+msgstr "Abas"
+
+#: src/diffuse/preferences.py:111
+msgid "Default panes"
+msgstr "Painéis padrão"
+
+#: src/diffuse/preferences.py:112
+msgid "Always show the tab bar"
+msgstr "Mostrar sempre a barra de abas"
+
+#: src/diffuse/preferences.py:113
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "Avise quando fechamento da aba resultará em saída do %s"
+
+#: src/diffuse/preferences.py:115
+msgid "Regional Settings"
+msgstr "Definições regionais"
+
+#: src/diffuse/preferences.py:118
+msgid "Default codec"
+msgstr "Codificação padrão"
+
+#: src/diffuse/preferences.py:119
+msgid "Order of codecs used to identify encoding"
+msgstr "Ordem de codificações para identificar a codificação"
+
+#: src/diffuse/preferences.py:140
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/diffuse/preferences.py:142
+msgid "Root directory"
+msgstr "Pasta Root"
+
+#: src/diffuse/preferences.py:143
+msgid "Cygdrive prefix"
+msgstr "Prefixo Cygdrive"
+
+#: src/diffuse/preferences.py:162
+msgid "Version control system search order"
+msgstr ""
+
+#: src/diffuse/preferences.py:170
+msgid "\"co\" command"
+msgstr "comando \"co\""
+
+#: src/diffuse/preferences.py:171
+msgid "\"rlog\" command"
+msgstr "comando \"rlog\""
+
+#: src/diffuse/preferences.py:173
+msgid "Command"
+msgstr "Comando"
+
+#: src/diffuse/preferences.py:179
+msgid "Launch from a Bash login shell"
+msgstr "Iniciar numa consola de sessão Bash"
+
+#: src/diffuse/preferences.py:186
+msgid "Update paths for Cygwin"
+msgstr "Actualizar caminhos para o Cygwin"
+
+#: src/diffuse/preferences.py:191
+msgid "Version Control"
+msgstr "Controlo de versões"
+
+#: src/diffuse/preferences.py:256
+msgid "Preferences"
+msgstr "Preferências"
+
+#: src/diffuse/resources.py:465
+#, fuzzy
+msgid "Error processing line {i + 1} of {file_name}."
+msgstr "Erro ao processar a linha %(line)d de %(file)s."
+
+#: src/diffuse/utils.py:60
+msgid "Auto Detect"
+msgstr "Detecção automática"
+
+#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60 src/diffuse/vcs/svn.py:93
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "Erro ao analisar a revisão %s."
@@ -680,3 +901,27 @@ msgstr "Erro ao analisar a revisão %s."
 #, python-format
 msgid "Error parsing %s."
 msgstr "Erro ao analisar %s."
+
+#: src/diffuse/widgets.py:1842
+msgid "Align with Selection"
+msgstr "Alinhar com a seleção"
+
+#: src/diffuse/widgets.py:1843
+msgid "Isolate"
+msgstr "Isolar"
+
+#: src/diffuse/widgets.py:1844
+msgid "Merge Selection"
+msgstr "Unir seleção"
+
+#: src/diffuse/widgets.py:1850
+msgid "Select All"
+msgstr "Selecionar tudo"
+
+#: src/diffuse/widgets.py:1853
+msgid "Swap with Selected Pane"
+msgstr "Trocar com o painel selecionado"
+
+#, python-format
+#~ msgid "Column %d"
+#~ msgstr "Coluna %d"

po/ru.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse-svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 10:26-0500\n"
+"POT-Creation-Date: 2021-11-24 13:44-0500\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator: Oleg Pakhtusov <opakhtusov@gmail.com>\n"
 "Language-Team: Russian <opakhtusov@gmail.com>\n"
@@ -33,9 +33,9 @@ msgstr "Графический инструмент для слияния и с
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:7
 msgid ""
-"Diffuse is a graphical tool for comparing and merging text files. It can "
-"retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, "
-"Monotone, RCS, Subversion, and SVK repositories."
+"Diffuse is a graphical tool for comparing and merging text files. It can retrieve "
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, "
+"Subversion, and SVK repositories."
 msgstr ""
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
@@ -46,6 +46,73 @@ msgstr ""
 msgid "Copyright"
 msgstr ""
 
+#: src/diffuse/dialogs.py:38
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr ""
+"Diffuse является графическим инструментом для слияния и сравнения текстовых "
+"файлов."
+
+#: src/diffuse/dialogs.py:43
+msgid "translator-credits"
+msgstr "v.01 О.Ю.Пахтусов (Oleg Pakhtusov) <oupakhtusov@gmail.com> "
+
+#: src/diffuse/dialogs.py:47
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"Эта программа является бесплатным ПО; Вы можете распространять программу и/или "
+"изменять ее в соответствии с GNU General Public License, как опубликовано Free "
+"Software Foundation; либо версия 2 лицензии, либо (по вашему выбору) любая более "
+"поздняя версия.\n"
+"\n"
+"Эта программа распространяется в надежде, что она будет полезна, но БЕЗ КАКИХ-"
+"ЛИБО ГАРАНТИЙ; без даже подразумеваемой гарантии ТОВАРНОГО СОСТОЯНИЯ или "
+"ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. Смотрите GNU General Public License для "
+"дополнительных подробностей.\n"
+"\n"
+"Вам Следует получить копию GNU General Public License вместе с этой программой.  "
+"Вы можете также получить копию GNU General Public License от Free Software "
+"Foundation, посетив их web-сайт (http://www.fsf.org/) или написав по адресу: Free "
+"Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
+"USA\n"
+
+#: src/diffuse/dialogs.py:81
+msgid "Encoding: "
+msgstr "Кодировка: "
+
+#: src/diffuse/dialogs.py:93
+msgid "Revision: "
+msgstr "Ревизия: "
+
+#: src/diffuse/dialogs.py:149
+msgid "Find..."
+msgstr "Найти..."
+
+#: src/diffuse/dialogs.py:157
+msgid "Search For: "
+msgstr "Искать: "
+
+#: src/diffuse/dialogs.py:182
+msgid "Match Case"
+msgstr "Учитывать регистр"
+
+#: src/diffuse/dialogs.py:187
+msgid "Search Backwards"
+msgstr "Поиск в обратном направлении"
+
 #: src/diffuse/main.py:77
 msgid "Close Tab"
 msgstr "Закрыть Вкладку"
@@ -102,8 +169,8 @@ msgstr "Файл под именем %s уже существует.  Вы хо
 #: src/diffuse/main.py:501
 #, python-format
 msgid ""
-"The file %s has been modified by another process since reading it.  If you "
-"save, all the external changes could be lost.  Save anyways?"
+"The file %s has been modified by another process since reading it.  If you save, "
+"all the external changes could be lost.  Save anyways?"
 msgstr ""
 "Файл %s был изменен другим процессом после его прочтения.  На сохранении все "
 "внешние изменения будут потеряны.  Сохранить все равно?"
@@ -113,7 +180,7 @@ msgstr ""
 msgid "Error encoding to %s."
 msgstr "Ошибка кодирования в %s."
 
-#: src/diffuse/main.py:542
+#: src/diffuse/main.py:542 src/diffuse/preferences.py:296
 #, python-format
 msgid "Error writing %s."
 msgstr "Ошибка записи %s."
@@ -128,8 +195,8 @@ msgstr "Номер строки: "
 
 #: src/diffuse/main.py:596
 msgid ""
-"Press the enter key or double click to edit.  Press the space bar or use the "
-"RMB menu to manually align."
+"Press the enter key or double click to edit.  Press the space bar or use the RMB "
+"menu to manually align."
 msgstr ""
 "Нажатие Enter или двойной щелчок для редактирования.  Нажатие Space или меню "
 "правого щелчка для выравнивания вручную."
@@ -140,11 +207,11 @@ msgstr "Нажмите клавишу Escape, чтобы закончить ре
 
 #: src/diffuse/main.py:600
 msgid ""
-"Select target line and press the space bar to align.  Press the escape key "
-"to cancel."
+"Select target line and press the space bar to align.  Press the escape key to "
+"cancel."
 msgstr ""
-"Выберите целевую строку и нажмите клавишу Space, чтобы выровнять.  Нажмите "
-"Еscape для отмены."
+"Выберите целевую строку и нажмите клавишу Space, чтобы выровнять.  Нажмите Еscape "
+"для отмены."
 
 #: src/diffuse/main.py:711
 msgid "_File"
@@ -475,25 +542,24 @@ msgstr "Отменить"
 msgid "Redo"
 msgstr "Вернуть"
 
-#: src/diffuse/main.py:838
+#: src/diffuse/main.py:838 src/diffuse/widgets.py:1846
 msgid "Cut"
 msgstr "Вырезать"
 
-#: src/diffuse/main.py:839
+#: src/diffuse/main.py:839 src/diffuse/widgets.py:1847
 msgid "Copy"
 msgstr "Копировать"
 
-#: src/diffuse/main.py:840
+#: src/diffuse/main.py:840 src/diffuse/widgets.py:1848
 msgid "Paste"
 msgstr "Вставить"
 
-#: src/diffuse/main.py:841
+#: src/diffuse/main.py:841 src/diffuse/widgets.py:1851
 msgid "Clear Edits"
 msgstr "Очистить Правки"
 
 #: src/diffuse/main.py:961
-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 ""
 "Некоторые файлы имеют несохраненные изменения.\n"
 "Выберите файлы для сохранения перед закрытием."
@@ -572,19 +638,15 @@ msgid ""
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse is a graphical tool for merging and comparing text files.  Diffuse "
-"is\n"
-"able to compare an arbitrary number of files side-by-side and gives users "
-"the\n"
-"ability to manually adjust line matching and directly edit files.  Diffuse "
-"can\n"
+"Diffuse is a graphical tool for merging and comparing text files.  Diffuse is\n"
+"able to compare an arbitrary number of files side-by-side and gives users the\n"
+"ability to manually adjust line matching and directly edit files.  Diffuse can\n"
 "also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
 "Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
 "\n"
 "Help Options:\n"
 "  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright "
-"information\n"
+"  ( -v | --version )               Display version and copyright information\n"
 "\n"
 "Configuration Options:\n"
 "  --no-rcfile                      Do not read any resource files\n"
@@ -618,14 +680,12 @@ msgstr ""
 "файлов. Может сравнить произвольное число файлов в представлении бок о бок,\n"
 "предоставляет пользователям возможность вручную корректировать соответствие\n"
 "строк и редактировать файлы напрямую. Diffuse может также извлекать ревизии\n"
-"файлов из Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion и "
-"SVK\n"
+"файлов из Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion и SVK\n"
 "репозиториев для их сравнения и слияния.\n"
 "\n"
 "Параметры Справки:\n"
 "  ( -h | -? | --help )             Отобразить информацию по использованию\n"
-"  ( -v | --version )               Отобразить номер версии и авторские "
-"права\n"
+"  ( -v | --version )               Отобразить номер версии и авторские права\n"
 "\n"
 "Параметры Конфигурации:\n"
 "  --no-rcfile                      Не читать файлы инициализации\n"
@@ -636,13 +696,11 @@ msgstr ""
 "  ( -D | --close-if-same )         Закрыть все не имеющие различий вкладки\n"
 "  ( -e | --encoding ) <codec>      Использовать <codec> для чтения и записи "
 "файлов\n"
-"  ( -L | --label ) <label>         Отображать <label> ярлык вместо имени "
-"файла\n"
+"  ( -L | --label ) <label>         Отображать <label> ярлык вместо имени файла\n"
 "  ( -m | --modified )              Создавать новую вкладку для каждого "
 "измененного файла\n"
 "  ( -r | --revision ) <rev>        Файл ревизии <rev>\n"
-"  ( -s | --separate )              Создавать новую вкладку для каждого "
-"файла\n"
+"  ( -s | --separate )              Создавать новую вкладку для каждого файла\n"
 "  ( -t | --tab )                   Запустить новую вкладку\n"
 "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
 "  --line <line>                    Начать с выбранной <line> строки\n"
@@ -669,8 +727,173 @@ msgstr "Пропуск неизвестного параметра \"%s\"."
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Ошибка обработки параметра \"%s\".  Каталог не ожидался."
 
-#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60
-#: src/diffuse/vcs/svn.py:93
+#: src/diffuse/preferences.py:77
+msgid "Display"
+msgstr "Отображение"
+
+#: src/diffuse/preferences.py:80
+msgid "Font"
+msgstr "Шрифт"
+
+#: src/diffuse/preferences.py:81
+msgid "Tab width"
+msgstr "Ширина табулятора"
+
+#: src/diffuse/preferences.py:82
+msgid "Show right margin"
+msgstr "Показывать правое поле"
+
+#: src/diffuse/preferences.py:83
+msgid "Right margin"
+msgstr "Правое поле"
+
+#: src/diffuse/preferences.py:84
+msgid "Show line numbers"
+msgstr "Показывать номера строк"
+
+#: src/diffuse/preferences.py:85
+msgid "Show white space characters"
+msgstr "Показывать символы пробелов"
+
+#: src/diffuse/preferences.py:86
+msgid "Ignore case differences"
+msgstr "Игнорировать различия в регистре"
+
+#: src/diffuse/preferences.py:87
+msgid "Ignore white space differences"
+msgstr "Игнорировать различия пробелов, символов табуляции и пустой строки"
+
+#: src/diffuse/preferences.py:88 src/diffuse/preferences.py:97
+msgid "Ignore changes to white space"
+msgstr "Игнорировать изменения пробелов, символов табуляции и пустой строки"
+
+#: src/diffuse/preferences.py:89
+msgid "Ignore blank line differences"
+msgstr "Игнорировать различия пустых строк"
+
+#: src/diffuse/preferences.py:90
+msgid "Ignore end of line differences"
+msgstr "Игнорировать различия окончания строк (терминаторы)"
+
+#: src/diffuse/preferences.py:92
+msgid "Alignment"
+msgstr "Выравнивание"
+
+#: src/diffuse/preferences.py:95
+msgid "Ignore case"
+msgstr "Игнорировать регистр символов"
+
+#: src/diffuse/preferences.py:96
+msgid "Ignore white space"
+msgstr "Игнорировать пробелы, символы табуляции и пустой строки"
+
+#: src/diffuse/preferences.py:98
+msgid "Ignore blank lines"
+msgstr "Игнорировать пустые строки"
+
+#: src/diffuse/preferences.py:99
+msgid "Ignore end of line characters"
+msgstr "Игнорировать символы окончания строк (терминаторы)"
+
+#: src/diffuse/preferences.py:101
+msgid "Editor"
+msgstr "Редактор"
+
+#: src/diffuse/preferences.py:104
+msgid "Auto indent"
+msgstr "Автоматический отступ"
+
+#: src/diffuse/preferences.py:105
+msgid "Expand tabs to spaces"
+msgstr "Расширить табуляторы до пробелов"
+
+#: src/diffuse/preferences.py:106
+msgid "Soft tab width"
+msgstr "Ширина мягкого табулятора"
+
+#: src/diffuse/preferences.py:108
+msgid "Tabs"
+msgstr "Вкладки"
+
+#: src/diffuse/preferences.py:111
+msgid "Default panes"
+msgstr "Субокон по умолчанию"
+
+#: src/diffuse/preferences.py:112
+msgid "Always show the tab bar"
+msgstr "Всегда показывать панель вкладок"
+
+#: src/diffuse/preferences.py:113
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "Предупреждение, когда закрытие вкладки закроет %s"
+
+#: src/diffuse/preferences.py:115
+msgid "Regional Settings"
+msgstr "Настройки Региона"
+
+#: src/diffuse/preferences.py:118
+msgid "Default codec"
+msgstr "Кодек по умолчанию"
+
+#: src/diffuse/preferences.py:119
+msgid "Order of codecs used to identify encoding"
+msgstr "Порядок кодеков, используемых для распознания кодировки"
+
+#: src/diffuse/preferences.py:140
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/diffuse/preferences.py:142
+msgid "Root directory"
+msgstr "Корневой каталог"
+
+#: src/diffuse/preferences.py:143
+msgid "Cygdrive prefix"
+msgstr "Cygdrive префикс"
+
+#: src/diffuse/preferences.py:162
+msgid "Version control system search order"
+msgstr ""
+
+#: src/diffuse/preferences.py:170
+msgid "\"co\" command"
+msgstr "\"co\" команда"
+
+#: src/diffuse/preferences.py:171
+msgid "\"rlog\" command"
+msgstr "\"rlog\" команда"
+
+#: src/diffuse/preferences.py:173
+msgid "Command"
+msgstr "Команда"
+
+#: src/diffuse/preferences.py:179
+msgid "Launch from a Bash login shell"
+msgstr "Запуск из оболочки Bash login"
+
+#: src/diffuse/preferences.py:186
+msgid "Update paths for Cygwin"
+msgstr "Обновлять пути для Cygwin"
+
+#: src/diffuse/preferences.py:191
+msgid "Version Control"
+msgstr "Контроль Версий"
+
+#: src/diffuse/preferences.py:256
+msgid "Preferences"
+msgstr "Предпочтения"
+
+#: src/diffuse/resources.py:465
+#, fuzzy
+msgid "Error processing line {i + 1} of {file_name}."
+msgstr "Ошибка обработки строки %(line)d из %(file)s."
+
+#: src/diffuse/utils.py:60
+msgid "Auto Detect"
+msgstr "Автообнаружение "
+
+#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60 src/diffuse/vcs/svn.py:93
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "Ошибка анализа ревизии %s."
@@ -679,3 +902,27 @@ msgstr "Ошибка анализа ревизии %s."
 #, python-format
 msgid "Error parsing %s."
 msgstr "Ошибка анализа %s."
+
+#: src/diffuse/widgets.py:1842
+msgid "Align with Selection"
+msgstr "Выровнять с Выборкой"
+
+#: src/diffuse/widgets.py:1843
+msgid "Isolate"
+msgstr "Изолировать"
+
+#: src/diffuse/widgets.py:1844
+msgid "Merge Selection"
+msgstr "Объединить Выборку"
+
+#: src/diffuse/widgets.py:1850
+msgid "Select All"
+msgstr "Выбрать Все"
+
+#: src/diffuse/widgets.py:1853
+msgid "Swap with Selected Pane"
+msgstr "Обменять с Выбранным Субокном"
+
+#, python-format
+#~ msgid "Column %d"
+#~ msgstr "Столбец %d"

po/sv.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 10:26-0500\n"
+"POT-Creation-Date: 2021-11-24 13:44-0500\n"
 "PO-Revision-Date: 2021-01-17 22:14+0100\n"
 "Last-Translator: Åke Engelbrektson <eson@svenskasprakfiler.se>\n"
 "Language-Team: Svenska Språkfiler <contactform@svenskasprakfiler.se>\n"
@@ -30,9 +30,9 @@ msgstr "Grafiskt verktyg för jämförelse och sammanfogning av textfiler"
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:7
 msgid ""
-"Diffuse is a graphical tool for comparing and merging text files. It can "
-"retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, "
-"Monotone, RCS, Subversion, and SVK repositories."
+"Diffuse is a graphical tool for comparing and merging text files. It can retrieve "
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, "
+"Subversion, and SVK repositories."
 msgstr ""
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
@@ -43,6 +43,70 @@ msgstr ""
 msgid "Copyright"
 msgstr "Copyright"
 
+#: src/diffuse/dialogs.py:38
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr "Diffuse är ett grafiskt verktyg för att jämföra och sammanfoga textfiler."
+
+#: src/diffuse/dialogs.py:43
+msgid "translator-credits"
+msgstr "Åke Engelbrektson"
+
+#: src/diffuse/dialogs.py:47
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"Detta program är fri mjukvara! Du kan återdistribuera det och/eller modifiera "
+"det, under villkoren för GNU General Public License som den publiceras av Free "
+"Software Foundation. Antingen version 2 av licensen, eller valfri senare "
+"version.\n"
+"\n"
+"Programmet distribueras i hopp om att det skall vara användbart, men UTAN NÅGRA "
+"GARANTIER. Utan ens underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR ETT "
+"VISST ÄNDAMÅL. Se GNU General Public License för mer detaljerad info.\n"
+"\n"
+"Du bör ha fått en kopia av GNU General Public License tillsammans med det här "
+"programmet. Du kan också hämta en kopia av GNU General Public License från Free "
+"Software Foundation genom att besöka deras webbsida (http://www.fsf.org/) eller "
+"skriva till Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, "
+"MA  02110-1301  USA.\n"
+
+#: src/diffuse/dialogs.py:81
+msgid "Encoding: "
+msgstr "Teckentabell: "
+
+#: src/diffuse/dialogs.py:93
+msgid "Revision: "
+msgstr "Revision: "
+
+#: src/diffuse/dialogs.py:149
+msgid "Find..."
+msgstr "Sök..."
+
+#: src/diffuse/dialogs.py:157
+msgid "Search For: "
+msgstr "Sök efter: "
+
+#: src/diffuse/dialogs.py:182
+msgid "Match Case"
+msgstr "Skiftlägeskänslig"
+
+#: src/diffuse/dialogs.py:187
+msgid "Search Backwards"
+msgstr "Sök bakifrån"
+
 #: src/diffuse/main.py:77
 msgid "Close Tab"
 msgstr "Stäng fliken"
@@ -99,18 +163,18 @@ msgstr "Det finns redan en fil som heter %s. Vill du skriva över den?"
 #: src/diffuse/main.py:501
 #, python-format
 msgid ""
-"The file %s has been modified by another process since reading it.  If you "
-"save, all the external changes could be lost.  Save anyways?"
+"The file %s has been modified by another process since reading it.  If you save, "
+"all the external changes could be lost.  Save anyways?"
 msgstr ""
-"Filen %s har ändrats av en annan process sedan inläsning. Om du sparar kan "
-"alla externa ändringar förloras. Vill du spara ändå?"
+"Filen %s har ändrats av en annan process sedan inläsning. Om du sparar kan alla "
+"externa ändringar förloras. Vill du spara ändå?"
 
 #: src/diffuse/main.py:540
 #, python-format
 msgid "Error encoding to %s."
 msgstr "Fel vid kodning till %s."
 
-#: src/diffuse/main.py:542
+#: src/diffuse/main.py:542 src/diffuse/preferences.py:296
 #, python-format
 msgid "Error writing %s."
 msgstr "Fel vid skrivning av %s."
@@ -125,8 +189,8 @@ msgstr "Radnummer: "
 
 #: src/diffuse/main.py:596
 msgid ""
-"Press the enter key or double click to edit.  Press the space bar or use the "
-"RMB menu to manually align."
+"Press the enter key or double click to edit.  Press the space bar or use the RMB "
+"menu to manually align."
 msgstr ""
 "Tryck på returtangenten eller dubbelklicka för att redigera. Tryck blanksteg "
 "eller använd kontextmenyn för att justera manuellt."
@@ -137,10 +201,9 @@ msgstr "Tryck på Esc-tangenten för att avsluta redigering."
 
 #: src/diffuse/main.py:600
 msgid ""
-"Select target line and press the space bar to align.  Press the escape key "
-"to cancel."
-msgstr ""
-"Välj målrad och tryck blanksteg för att justera. Tryck Esc för att avbryta."
+"Select target line and press the space bar to align.  Press the escape key to "
+"cancel."
+msgstr "Välj målrad och tryck blanksteg för att justera. Tryck Esc för att avbryta."
 
 #: src/diffuse/main.py:711
 msgid "_File"
@@ -471,28 +534,26 @@ msgstr "Ångra"
 msgid "Redo"
 msgstr "Upprepa"
 
-#: src/diffuse/main.py:838
+#: src/diffuse/main.py:838 src/diffuse/widgets.py:1846
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: src/diffuse/main.py:839
+#: src/diffuse/main.py:839 src/diffuse/widgets.py:1847
 msgid "Copy"
 msgstr "Kopiera"
 
-#: src/diffuse/main.py:840
+#: src/diffuse/main.py:840 src/diffuse/widgets.py:1848
 msgid "Paste"
 msgstr "Klistra in"
 
-#: src/diffuse/main.py:841
+#: src/diffuse/main.py:841 src/diffuse/widgets.py:1851
 msgid "Clear Edits"
 msgstr "Rensa bort ändringar"
 
 #: src/diffuse/main.py:961
-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 ""
-"Vissa filer har ändringar som inte sparats. Välj filer att spara före "
-"stängning."
+"Vissa filer har ändringar som inte sparats. Välj filer att spara före stängning."
 
 #: src/diffuse/main.py:974
 msgid "Tab"
@@ -568,19 +629,15 @@ msgid ""
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse is a graphical tool for merging and comparing text files.  Diffuse "
-"is\n"
-"able to compare an arbitrary number of files side-by-side and gives users "
-"the\n"
-"ability to manually adjust line matching and directly edit files.  Diffuse "
-"can\n"
+"Diffuse is a graphical tool for merging and comparing text files.  Diffuse is\n"
+"able to compare an arbitrary number of files side-by-side and gives users the\n"
+"ability to manually adjust line matching and directly edit files.  Diffuse can\n"
 "also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
 "Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
 "\n"
 "Help Options:\n"
 "  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright "
-"information\n"
+"  ( -v | --version )               Display version and copyright information\n"
 "\n"
 "Configuration Options:\n"
 "  --no-rcfile                      Do not read any resource files\n"
@@ -610,15 +667,11 @@ msgstr ""
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse är ett grafiskt verktyg för sammanfogning och jämförelse av "
-"textfiler. \n"
-"Diffuse kan jämföra ett godtyckligt antal filer sida vid sida och ger "
-"användaren\n"
-"en möjlighet att manuellt justera radmatchning och att direktredigera "
-"filer.\n"
+"Diffuse är ett grafiskt verktyg för sammanfogning och jämförelse av textfiler. \n"
+"Diffuse kan jämföra ett godtyckligt antal filer sida vid sida och ger användaren\n"
+"en möjlighet att manuellt justera radmatchning och att direktredigera filer.\n"
 "Diffuse kan också hämta revideringar av filer från Bazaar, CVS, Darcs, Git,\n"
-"Mercurial, Monotone, RCS, Subversion, och SVK för jämförelse och "
-"sammanfogning.\n"
+"Mercurial, Monotone, RCS, Subversion, och SVK för jämförelse och sammanfogning.\n"
 "\n"
 "Hjälpalternativ:\n"
 "  ( -h | -? | --help )             Visa användningsinformation\n"
@@ -631,8 +684,8 @@ msgstr ""
 "General Options:\n"
 "  ( -c | --commit ) <rev>          Filrevisioner <rev-1> och <rev>\n"
 "  ( -D | --close-if-same )         Stäng alla flikar som saknar olikheter\n"
-"  ( -e | --encoding ) <codec>      Använd <teckentabell> för att läsa och "
-"skriva filer\n"
+"  ( -e | --encoding ) <codec>      Använd <teckentabell> för att läsa och skriva "
+"filer\n"
 "  ( -L | --label ) <label>         Visa <etikett> istället för filnamn\n"
 "  ( -m | --modified )              Skapa ny flik för varje ändrad fil\n"
 "  ( -r | --revision ) <rev>        Filrevision <rev>\n"
@@ -661,11 +714,175 @@ msgstr "Undantar okänt argument \"%s\"."
 #: src/diffuse/main.py:1819
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
-msgstr ""
-"Fel vid bearbetning av argumentet \"%s\". Katalogen inte den förväntade."
+msgstr "Fel vid bearbetning av argumentet \"%s\". Katalogen inte den förväntade."
 
-#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60
-#: src/diffuse/vcs/svn.py:93
+#: src/diffuse/preferences.py:77
+msgid "Display"
+msgstr "Visning"
+
+#: src/diffuse/preferences.py:80
+msgid "Font"
+msgstr "Teckensnitt"
+
+#: src/diffuse/preferences.py:81
+msgid "Tab width"
+msgstr "Tabulatorbredd"
+
+#: src/diffuse/preferences.py:82
+msgid "Show right margin"
+msgstr "Visa höger marginal"
+
+#: src/diffuse/preferences.py:83
+msgid "Right margin"
+msgstr "Höger marginal"
+
+#: src/diffuse/preferences.py:84
+msgid "Show line numbers"
+msgstr "Visa radnummer"
+
+#: src/diffuse/preferences.py:85
+msgid "Show white space characters"
+msgstr "Visa blankstegstecken"
+
+#: src/diffuse/preferences.py:86
+msgid "Ignore case differences"
+msgstr "Ignorera olikheter i skiftläge"
+
+#: src/diffuse/preferences.py:87
+msgid "Ignore white space differences"
+msgstr "Ignorera olikheter i blanksteg"
+
+#: src/diffuse/preferences.py:88 src/diffuse/preferences.py:97
+msgid "Ignore changes to white space"
+msgstr "Ignorera ändringar i blanksteg"
+
+#: src/diffuse/preferences.py:89
+msgid "Ignore blank line differences"
+msgstr "Ignorera olikheter i tomma rader"
+
+#: src/diffuse/preferences.py:90
+msgid "Ignore end of line differences"
+msgstr "Ignorera olikheter i radavslut"
+
+#: src/diffuse/preferences.py:92
+msgid "Alignment"
+msgstr "Justering"
+
+#: src/diffuse/preferences.py:95
+msgid "Ignore case"
+msgstr "Ignorera skiftläge"
+
+#: src/diffuse/preferences.py:96
+msgid "Ignore white space"
+msgstr "Ignorera blanksteg"
+
+#: src/diffuse/preferences.py:98
+msgid "Ignore blank lines"
+msgstr "Ignorera tomma rader"
+
+#: src/diffuse/preferences.py:99
+msgid "Ignore end of line characters"
+msgstr "Ignorera tecken för radavslut"
+
+#: src/diffuse/preferences.py:101
+msgid "Editor"
+msgstr "Redigerare"
+
+#: src/diffuse/preferences.py:104
+msgid "Auto indent"
+msgstr "Automatiskt indrag"
+
+#: src/diffuse/preferences.py:105
+msgid "Expand tabs to spaces"
+msgstr "Expandera tabbar till blanksteg"
+
+#: src/diffuse/preferences.py:106
+msgid "Soft tab width"
+msgstr "Mjuk tabulatorbredd"
+
+#: src/diffuse/preferences.py:108
+msgid "Tabs"
+msgstr "Flikar"
+
+#: src/diffuse/preferences.py:111
+msgid "Default panes"
+msgstr "Standardpaneler"
+
+#: src/diffuse/preferences.py:112
+msgid "Always show the tab bar"
+msgstr "Visa alltid flikfältet"
+
+#: src/diffuse/preferences.py:113
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "Varna mig när flikstängning kommer att avsluta %s"
+
+#: src/diffuse/preferences.py:115
+msgid "Regional Settings"
+msgstr "Regionala inställningar"
+
+#: src/diffuse/preferences.py:118
+msgid "Default codec"
+msgstr "Standardkodning"
+
+#: src/diffuse/preferences.py:119
+msgid "Order of codecs used to identify encoding"
+msgstr "Tabellordning för att identifiera kodning"
+
+#: src/diffuse/preferences.py:140
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/diffuse/preferences.py:142
+msgid "Root directory"
+msgstr "Root-mapp"
+
+#: src/diffuse/preferences.py:143
+msgid "Cygdrive prefix"
+msgstr "Cygdrive-prefix"
+
+#: src/diffuse/preferences.py:162
+msgid "Version control system search order"
+msgstr "Sökordning för versionskontrollsystem"
+
+#: src/diffuse/preferences.py:170
+msgid "\"co\" command"
+msgstr "\"co\" kommando"
+
+#: src/diffuse/preferences.py:171
+msgid "\"rlog\" command"
+msgstr "\"rlog\" kommando"
+
+#: src/diffuse/preferences.py:173
+msgid "Command"
+msgstr "Kommando"
+
+#: src/diffuse/preferences.py:179
+msgid "Launch from a Bash login shell"
+msgstr "Starta från ett Bash inloggningsskal"
+
+#: src/diffuse/preferences.py:186
+msgid "Update paths for Cygwin"
+msgstr "Uppdatera sökvägar för Cygwin"
+
+#: src/diffuse/preferences.py:191
+msgid "Version Control"
+msgstr "Versionskontroll"
+
+#: src/diffuse/preferences.py:256
+msgid "Preferences"
+msgstr "Inställningar"
+
+#: src/diffuse/resources.py:465
+#, fuzzy
+msgid "Error processing line {i + 1} of {file_name}."
+msgstr "Fel vid bearbetning av rad %(line)d i %(file)s."
+
+#: src/diffuse/utils.py:60
+msgid "Auto Detect"
+msgstr "Identifiera automatiskt"
+
+#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60 src/diffuse/vcs/svn.py:93
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "Fel vid tolkning av revision %s."
@@ -674,3 +891,26 @@ msgstr "Fel vid tolkning av revision %s."
 #, python-format
 msgid "Error parsing %s."
 msgstr "Fel vid tolkning av %s."
+
+#: src/diffuse/widgets.py:1842
+msgid "Align with Selection"
+msgstr "Justera till markerat"
+
+#: src/diffuse/widgets.py:1843
+msgid "Isolate"
+msgstr "Isolera"
+
+#: src/diffuse/widgets.py:1844
+msgid "Merge Selection"
+msgstr "Sammanfoga markerat"
+
+#: src/diffuse/widgets.py:1850
+msgid "Select All"
+msgstr "Markera alla"
+
+#: src/diffuse/widgets.py:1853
+msgid "Swap with Selected Pane"
+msgstr "Växla med markerad panel"
+
+#~ msgid "Column %d"
+#~ msgstr "Kolumn %d"

po/th.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse 0.4.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 10:26-0500\n"
+"POT-Creation-Date: 2021-11-24 13:44-0500\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator: Akom Chotiphantawanon <knight2000@gmail.com>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -30,9 +30,9 @@ msgstr "เครื่องมือแบบกราฟิกสำหรั
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:7
 msgid ""
-"Diffuse is a graphical tool for comparing and merging text files. It can "
-"retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, "
-"Monotone, RCS, Subversion, and SVK repositories."
+"Diffuse is a graphical tool for comparing and merging text files. It can retrieve "
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, "
+"Subversion, and SVK repositories."
 msgstr ""
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
@@ -43,6 +43,68 @@ msgstr ""
 msgid "Copyright"
 msgstr ""
 
+#: src/diffuse/dialogs.py:38
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr "Diffuse เป็นเครื่องมือแบบกราฟิกสำหรับผสานและเปรียบเทียบแฟ้มข้อความ"
+
+#: src/diffuse/dialogs.py:43
+msgid "translator-credits"
+msgstr "Akom Chotiphantawanon <knight2000@gmail.com> "
+
+#: src/diffuse/dialogs.py:47
+#, 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:81
+msgid "Encoding: "
+msgstr "รหัสอักขระ: "
+
+#: src/diffuse/dialogs.py:93
+msgid "Revision: "
+msgstr "ฉบับแก้ไข: "
+
+#: src/diffuse/dialogs.py:149
+msgid "Find..."
+msgstr "หา..."
+
+#: src/diffuse/dialogs.py:157
+msgid "Search For: "
+msgstr "ค้นหา: "
+
+#: src/diffuse/dialogs.py:182
+msgid "Match Case"
+msgstr "ตัวพิมพ์ใหญ่-เล็กตรงกัน"
+
+#: src/diffuse/dialogs.py:187
+msgid "Search Backwards"
+msgstr "ค้นถอยหลัง"
+
 #: src/diffuse/main.py:77
 msgid "Close Tab"
 msgstr "ปิดแท็บ"
@@ -99,8 +161,8 @@ msgstr "แฟ้มชื่อ \"%s\" มีอยู่ก่อนแล้
 #: src/diffuse/main.py:501
 #, python-format
 msgid ""
-"The file %s has been modified by another process since reading it.  If you "
-"save, all the external changes could be lost.  Save anyways?"
+"The file %s has been modified by another process since reading it.  If you save, "
+"all the external changes could be lost.  Save anyways?"
 msgstr ""
 "แฟ้ม \"%s\" ถูกเปลี่ยนแปลงโดยโพรเซสอื่นนับตั้งแต่ที่อ่านไว้  ถ้าคุณบันทึก "
 "การเปลี่ยนแปลงภายนอกทั้งหมดอาจสูญหายได้  ยังคงบันทึกหรือไม่?"
@@ -110,7 +172,7 @@ msgstr ""
 msgid "Error encoding to %s."
 msgstr "เกิดข้อผิดพลาดขณะลงรหัส %s"
 
-#: src/diffuse/main.py:542
+#: src/diffuse/main.py:542 src/diffuse/preferences.py:296
 #, python-format
 msgid "Error writing %s."
 msgstr "เกิดข้อผิดพลาดขณะเขียน %s"
@@ -125,10 +187,9 @@ msgstr "หมายเลขบรรทัด: "
 
 #: src/diffuse/main.py:596
 msgid ""
-"Press the enter key or double click to edit.  Press the space bar or use the "
-"RMB menu to manually align."
-msgstr ""
-"กดปุ่ม Enter หรือดับเบิลคลิกเพื่อแก้ไข  กดแคร่เว้นวรรคหรือใช้เมนูคลิกขวาเพื่อจัดเรียงด้วยมือ"
+"Press the enter key or double click to edit.  Press the space bar or use the RMB "
+"menu to manually align."
+msgstr "กดปุ่ม Enter หรือดับเบิลคลิกเพื่อแก้ไข  กดแคร่เว้นวรรคหรือใช้เมนูคลิกขวาเพื่อจัดเรียงด้วยมือ"
 
 #: src/diffuse/main.py:598
 msgid "Press the escape key to finish editing."
@@ -136,8 +197,8 @@ msgstr "กดปุ่ม Escape เพื่อจบการแก้ไข"
 
 #: src/diffuse/main.py:600
 msgid ""
-"Select target line and press the space bar to align.  Press the escape key "
-"to cancel."
+"Select target line and press the space bar to align.  Press the escape key to "
+"cancel."
 msgstr "เลือกบรรทัดเป้าหมายแล้วกดแคร่เว้นวรรคเพื่อจัดเรียง  กดปุ่ม Escape เพื่อยกเลิก"
 
 #: src/diffuse/main.py:711
@@ -469,25 +530,24 @@ msgstr "เรียกคืน"
 msgid "Redo"
 msgstr "ทำซ้ำ"
 
-#: src/diffuse/main.py:838
+#: src/diffuse/main.py:838 src/diffuse/widgets.py:1846
 msgid "Cut"
 msgstr "ตัด"
 
-#: src/diffuse/main.py:839
+#: src/diffuse/main.py:839 src/diffuse/widgets.py:1847
 msgid "Copy"
 msgstr "คัดลอก"
 
-#: src/diffuse/main.py:840
+#: src/diffuse/main.py:840 src/diffuse/widgets.py:1848
 msgid "Paste"
 msgstr "แปะ"
 
-#: src/diffuse/main.py:841
+#: src/diffuse/main.py:841 src/diffuse/widgets.py:1851
 msgid "Clear Edits"
 msgstr "ล้างการแก้ไข"
 
 #: src/diffuse/main.py:961
-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 "บางแฟ้มมีการเปลี่ยนแปลงที่ไม่ได้บันทึก เลือกแฟ้มเพื่อบันทึกก่อนปิด"
 
 #: src/diffuse/main.py:974
@@ -564,19 +624,15 @@ msgid ""
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse is a graphical tool for merging and comparing text files.  Diffuse "
-"is\n"
-"able to compare an arbitrary number of files side-by-side and gives users "
-"the\n"
-"ability to manually adjust line matching and directly edit files.  Diffuse "
-"can\n"
+"Diffuse is a graphical tool for merging and comparing text files.  Diffuse is\n"
+"able to compare an arbitrary number of files side-by-side and gives users the\n"
+"ability to manually adjust line matching and directly edit files.  Diffuse can\n"
 "also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
 "Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
 "\n"
 "Help Options:\n"
 "  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright "
-"information\n"
+"  ( -v | --version )               Display version and copyright information\n"
 "\n"
 "Configuration Options:\n"
 "  --no-rcfile                      Do not read any resource files\n"
@@ -654,8 +710,173 @@ msgstr "ขอข้ามอาร์กิวเมนต์ \"%s\" ที่
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "เกิดข้อผิดพลาดขณะประมวลผลอาร์กิวเมนต์ \"%s\"  ไม่คาดหมายว่าจะพบไดเรกทอรี"
 
-#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60
-#: src/diffuse/vcs/svn.py:93
+#: src/diffuse/preferences.py:77
+msgid "Display"
+msgstr "การแสดงผล"
+
+#: src/diffuse/preferences.py:80
+msgid "Font"
+msgstr "แบบอักษร"
+
+#: src/diffuse/preferences.py:81
+msgid "Tab width"
+msgstr "ความกว้างแท็บ"
+
+#: src/diffuse/preferences.py:82
+msgid "Show right margin"
+msgstr "แสดงขอบขวา"
+
+#: src/diffuse/preferences.py:83
+msgid "Right margin"
+msgstr "ขอบขวา"
+
+#: src/diffuse/preferences.py:84
+msgid "Show line numbers"
+msgstr "แสดงเลขบรรทัด"
+
+#: src/diffuse/preferences.py:85
+msgid "Show white space characters"
+msgstr "แสดงอักขระช่องว่าง"
+
+#: src/diffuse/preferences.py:86
+msgid "Ignore case differences"
+msgstr "ไม่สนใจความแตกต่างของตัวพิมพ์ใหญ่-เล็ก"
+
+#: src/diffuse/preferences.py:87
+msgid "Ignore white space differences"
+msgstr "ไม่สนใจความแตกต่างของช่องว่างทั้งหมด"
+
+#: src/diffuse/preferences.py:88 src/diffuse/preferences.py:97
+msgid "Ignore changes to white space"
+msgstr "ไม่สนใจการเปลี่ยนแปลงของช่องว่าง"
+
+#: src/diffuse/preferences.py:89
+msgid "Ignore blank line differences"
+msgstr "ไม่สนใจความแตกต่างของบรรทัดเปล่า"
+
+#: src/diffuse/preferences.py:90
+msgid "Ignore end of line differences"
+msgstr "ไม่สนใจความแตกต่างของอักขระจบบรรทัด"
+
+#: src/diffuse/preferences.py:92
+msgid "Alignment"
+msgstr "การจัดเรียง"
+
+#: src/diffuse/preferences.py:95
+msgid "Ignore case"
+msgstr "ไม่สนใจตัวพิมพ์ใหญ่-เล็ก"
+
+#: src/diffuse/preferences.py:96
+msgid "Ignore white space"
+msgstr "ไม่สนใจช่องว่าง"
+
+#: src/diffuse/preferences.py:98
+msgid "Ignore blank lines"
+msgstr "ไม่สนใจบรรทัดเปล่า"
+
+#: src/diffuse/preferences.py:99
+msgid "Ignore end of line characters"
+msgstr "ไม่สนใจอักขระจบบรรทัด"
+
+#: src/diffuse/preferences.py:101
+msgid "Editor"
+msgstr "เครื่องมือแก้ไข"
+
+#: src/diffuse/preferences.py:104
+msgid "Auto indent"
+msgstr "ร่นบรรทัดอัตโนมัติ"
+
+#: src/diffuse/preferences.py:105
+msgid "Expand tabs to spaces"
+msgstr "กระจายแท็บเป็นช่องว่าง"
+
+#: src/diffuse/preferences.py:106
+msgid "Soft tab width"
+msgstr "ความกว้างของแท็บแบบซอฟต์"
+
+#: src/diffuse/preferences.py:108
+msgid "Tabs"
+msgstr "แท็บ"
+
+#: src/diffuse/preferences.py:111
+msgid "Default panes"
+msgstr "ช่องปริยาย"
+
+#: src/diffuse/preferences.py:112
+msgid "Always show the tab bar"
+msgstr "แสดงแถบแท็บเสมอ"
+
+#: src/diffuse/preferences.py:113
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "เตือนเมื่อการปิดแท็บจะออกจาก %s"
+
+#: src/diffuse/preferences.py:115
+msgid "Regional Settings"
+msgstr "ค่าตั้งภูมิภาค"
+
+#: src/diffuse/preferences.py:118
+msgid "Default codec"
+msgstr "ตัวอ่าน-ลงรหัสปริยาย"
+
+#: src/diffuse/preferences.py:119
+msgid "Order of codecs used to identify encoding"
+msgstr "ลำดับตัวอ่าน-ลงรหัสที่ใช้ในการตรวจสอบรหัสอักขระ"
+
+#: src/diffuse/preferences.py:140
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/diffuse/preferences.py:142
+msgid "Root directory"
+msgstr "ไดเรกทอรีราก"
+
+#: src/diffuse/preferences.py:143
+msgid "Cygdrive prefix"
+msgstr "พาธส่วนต้นของ Cygdrive"
+
+#: src/diffuse/preferences.py:162
+msgid "Version control system search order"
+msgstr ""
+
+#: src/diffuse/preferences.py:170
+msgid "\"co\" command"
+msgstr "คำสั่ง \"co\""
+
+#: src/diffuse/preferences.py:171
+msgid "\"rlog\" command"
+msgstr "คำสั่ง \"rlog\""
+
+#: src/diffuse/preferences.py:173
+msgid "Command"
+msgstr "คำสั่ง"
+
+#: src/diffuse/preferences.py:179
+msgid "Launch from a Bash login shell"
+msgstr "เรียกจากเชลล์ล็อกอินของ Bash"
+
+#: src/diffuse/preferences.py:186
+msgid "Update paths for Cygwin"
+msgstr "ปรับข้อมูลพาธสำหรับ Cygwin"
+
+#: src/diffuse/preferences.py:191
+msgid "Version Control"
+msgstr "การควบคุมรุ่น"
+
+#: src/diffuse/preferences.py:256
+msgid "Preferences"
+msgstr "ปรับแต่ง"
+
+#: src/diffuse/resources.py:465
+#, fuzzy
+msgid "Error processing line {i + 1} of {file_name}."
+msgstr "เกิดข้อผิดพลาดขณะประมวลผลบรรทัดที่ %(line)d ของ %(file)s"
+
+#: src/diffuse/utils.py:60
+msgid "Auto Detect"
+msgstr "ตรวจสอบอัตโนมัติ"
+
+#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60 src/diffuse/vcs/svn.py:93
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "เกิดข้อผิดพลาดขณะแจงฉบับแก้ไข %s"
@@ -664,3 +885,27 @@ msgstr "เกิดข้อผิดพลาดขณะแจงฉบับ
 #, python-format
 msgid "Error parsing %s."
 msgstr "เกิดข้อผิดพลาดขณะแจง %s"
+
+#: src/diffuse/widgets.py:1842
+msgid "Align with Selection"
+msgstr "เรียงตรงกับบรรทัดที่เลือก"
+
+#: src/diffuse/widgets.py:1843
+msgid "Isolate"
+msgstr "แยก"
+
+#: src/diffuse/widgets.py:1844
+msgid "Merge Selection"
+msgstr "ผสานบรรทัดที่เลือก"
+
+#: src/diffuse/widgets.py:1850
+msgid "Select All"
+msgstr "เลือกทั้งหมด"
+
+#: src/diffuse/widgets.py:1853
+msgid "Swap with Selected Pane"
+msgstr "สลับกับช่องที่เลือก"
+
+#, python-format
+#~ msgid "Column %d"
+#~ msgstr "คอลัมน์ %d"

po/update-translations.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2020 Romain Failliot <romain.failliot@foolstep.com>
+# Copyright (C) 2021 Romain Failliot <romain.failliot@foolstep.com>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -46,15 +46,19 @@ def update_translation(filename):
         subprocess.run([
             'msginit',
             '--no-translator',
-            '-l',
-            lang,
-            '-o',
-            ftmp.name,
-            '-i',
-            'diffuse.pot'])
+            '--width=84',
+            f'--locale={lang}',
+            f'--output-file={ftmp.name}',
+            '--input=diffuse.pot'])
 
         # Merge with the previous translation
-        subprocess.run(['msgmerge', '-q', '--no-wrap', '-o', filename, filename, ftmp.name])
+        subprocess.run([
+            'msgmerge',
+            '--quiet',
+            '--width=84',
+            f'--output-file={filename}',
+            filename,
+            ftmp.name])
 
     # Validate translation
     check_translation(filename)

po/zh_CN.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Diffuse svn 316\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 10:26-0500\n"
+"POT-Creation-Date: 2021-11-24 13:44-0500\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator:  <jarryson@gmail.com>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -29,9 +29,9 @@ msgstr "图形化的比较和合并文本文件的工具"
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:7
 msgid ""
-"Diffuse is a graphical tool for comparing and merging text files. It can "
-"retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, "
-"Monotone, RCS, Subversion, and SVK repositories."
+"Diffuse is a graphical tool for comparing and merging text files. It can retrieve "
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, "
+"Subversion, and SVK repositories."
 msgstr ""
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
@@ -42,6 +42,55 @@ msgstr ""
 msgid "Copyright"
 msgstr "版权所有"
 
+#: src/diffuse/dialogs.py:38
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr "Diffuse是一个合并和比较文本文件的图形化程序。"
+
+#: src/diffuse/dialogs.py:43
+msgid "translator-credits"
+msgstr "Liu Hao <jarryson@gmail.com>"
+
+#: src/diffuse/dialogs.py:47
+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:81
+msgid "Encoding: "
+msgstr "编码："
+
+#: src/diffuse/dialogs.py:93
+msgid "Revision: "
+msgstr "修订："
+
+#: src/diffuse/dialogs.py:149
+msgid "Find..."
+msgstr "查找..."
+
+#: src/diffuse/dialogs.py:157
+msgid "Search For: "
+msgstr "搜索："
+
+#: src/diffuse/dialogs.py:182
+msgid "Match Case"
+msgstr "符合大小写"
+
+#: src/diffuse/dialogs.py:187
+msgid "Search Backwards"
+msgstr "反向搜索"
+
 #: src/diffuse/main.py:77
 msgid "Close Tab"
 msgstr "关闭标签"
@@ -98,17 +147,16 @@ msgstr "已存在名为%s的文件，您希望覆盖它吗？"
 #: src/diffuse/main.py:501
 #, python-format
 msgid ""
-"The file %s has been modified by another process since reading it.  If you "
-"save, all the external changes could be lost.  Save anyways?"
-msgstr ""
-"文件%s打开后被其他进程更改过了，如果保存，其他程序的修改将会丢失，保存吗？"
+"The file %s has been modified by another process since reading it.  If you save, "
+"all the external changes could be lost.  Save anyways?"
+msgstr "文件%s打开后被其他进程更改过了，如果保存，其他程序的修改将会丢失，保存吗？"
 
 #: src/diffuse/main.py:540
 #, python-format
 msgid "Error encoding to %s."
 msgstr "无法编码为%s。"
 
-#: src/diffuse/main.py:542
+#: src/diffuse/main.py:542 src/diffuse/preferences.py:296
 #, python-format
 msgid "Error writing %s."
 msgstr "无法写入%s"
@@ -123,8 +171,8 @@ msgstr "行数："
 
 #: src/diffuse/main.py:596
 msgid ""
-"Press the enter key or double click to edit.  Press the space bar or use the "
-"RMB menu to manually align."
+"Press the enter key or double click to edit.  Press the space bar or use the RMB "
+"menu to manually align."
 msgstr "按回车或者鼠标双击进行编译。空格键或者右键菜单手动对齐。"
 
 #: src/diffuse/main.py:598
@@ -133,8 +181,8 @@ msgstr "按ESC键结束编辑"
 
 #: src/diffuse/main.py:600
 msgid ""
-"Select target line and press the space bar to align.  Press the escape key "
-"to cancel."
+"Select target line and press the space bar to align.  Press the escape key to "
+"cancel."
 msgstr "选择目标行然后按空格键进行对齐，按ESC取消。"
 
 #: src/diffuse/main.py:711
@@ -466,25 +514,24 @@ msgstr "恢复"
 msgid "Redo"
 msgstr "重做"
 
-#: src/diffuse/main.py:838
+#: src/diffuse/main.py:838 src/diffuse/widgets.py:1846
 msgid "Cut"
 msgstr "剪切"
 
-#: src/diffuse/main.py:839
+#: src/diffuse/main.py:839 src/diffuse/widgets.py:1847
 msgid "Copy"
 msgstr "复制"
 
-#: src/diffuse/main.py:840
+#: src/diffuse/main.py:840 src/diffuse/widgets.py:1848
 msgid "Paste"
 msgstr "粘贴"
 
-#: src/diffuse/main.py:841
+#: src/diffuse/main.py:841 src/diffuse/widgets.py:1851
 msgid "Clear Edits"
 msgstr "取消编辑"
 
 #: src/diffuse/main.py:961
-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 "一些文件包含未保存的更改。请在关闭前保存这些文件。"
 
 #: src/diffuse/main.py:974
@@ -561,19 +608,15 @@ msgid ""
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse is a graphical tool for merging and comparing text files.  Diffuse "
-"is\n"
-"able to compare an arbitrary number of files side-by-side and gives users "
-"the\n"
-"ability to manually adjust line matching and directly edit files.  Diffuse "
-"can\n"
+"Diffuse is a graphical tool for merging and comparing text files.  Diffuse is\n"
+"able to compare an arbitrary number of files side-by-side and gives users the\n"
+"ability to manually adjust line matching and directly edit files.  Diffuse can\n"
 "also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
 "Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
 "\n"
 "Help Options:\n"
 "  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright "
-"information\n"
+"  ( -v | --version )               Display version and copyright information\n"
 "\n"
 "Configuration Options:\n"
 "  --no-rcfile                      Do not read any resource files\n"
@@ -603,12 +646,9 @@ msgstr ""
 "    diffuse [ [参数...] [文件...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse is a graphical tool for merging and comparing text files.  Diffuse "
-"is\n"
-"able to compare an arbitrary number of files side-by-side and gives users "
-"the\n"
-"ability to manually adjust line matching and directly edit files.  Diffuse "
-"can\n"
+"Diffuse is a graphical tool for merging and comparing text files.  Diffuse is\n"
+"able to compare an arbitrary number of files side-by-side and gives users the\n"
+"ability to manually adjust line matching and directly edit files.  Diffuse can\n"
 "also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
 "Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
 "\n"
@@ -654,8 +694,173 @@ msgstr "跳过未知参数\"%s\"。"
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "无法处理\"%s\"。目录不存在。"
 
-#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60
-#: src/diffuse/vcs/svn.py:93
+#: src/diffuse/preferences.py:77
+msgid "Display"
+msgstr "显示"
+
+#: src/diffuse/preferences.py:80
+msgid "Font"
+msgstr "字体"
+
+#: src/diffuse/preferences.py:81
+msgid "Tab width"
+msgstr "制表符宽度"
+
+#: src/diffuse/preferences.py:82
+msgid "Show right margin"
+msgstr "显示右边距"
+
+#: src/diffuse/preferences.py:83
+msgid "Right margin"
+msgstr "右边距"
+
+#: src/diffuse/preferences.py:84
+msgid "Show line numbers"
+msgstr "显示行号"
+
+#: src/diffuse/preferences.py:85
+msgid "Show white space characters"
+msgstr "显示空格字符"
+
+#: src/diffuse/preferences.py:86
+msgid "Ignore case differences"
+msgstr "忽略大小写的不同"
+
+#: src/diffuse/preferences.py:87
+msgid "Ignore white space differences"
+msgstr "忽略空格的不同"
+
+#: src/diffuse/preferences.py:88 src/diffuse/preferences.py:97
+msgid "Ignore changes to white space"
+msgstr "忽略对空格的改变"
+
+#: src/diffuse/preferences.py:89
+msgid "Ignore blank line differences"
+msgstr "忽略空行的不同"
+
+#: src/diffuse/preferences.py:90
+msgid "Ignore end of line differences"
+msgstr "忽略行尾的不同"
+
+#: src/diffuse/preferences.py:92
+msgid "Alignment"
+msgstr "对齐"
+
+#: src/diffuse/preferences.py:95
+msgid "Ignore case"
+msgstr "忽略大小写"
+
+#: src/diffuse/preferences.py:96
+msgid "Ignore white space"
+msgstr "忽略空格"
+
+#: src/diffuse/preferences.py:98
+msgid "Ignore blank lines"
+msgstr "忽略空行"
+
+#: src/diffuse/preferences.py:99
+msgid "Ignore end of line characters"
+msgstr "忽略行尾结束符"
+
+#: src/diffuse/preferences.py:101
+msgid "Editor"
+msgstr "编辑器"
+
+#: src/diffuse/preferences.py:104
+msgid "Auto indent"
+msgstr "自动缩进"
+
+#: src/diffuse/preferences.py:105
+msgid "Expand tabs to spaces"
+msgstr "展开制表符为空格"
+
+#: src/diffuse/preferences.py:106
+msgid "Soft tab width"
+msgstr "软制表符宽度"
+
+#: src/diffuse/preferences.py:108
+msgid "Tabs"
+msgstr "标签"
+
+#: src/diffuse/preferences.py:111
+msgid "Default panes"
+msgstr "默认窗格"
+
+#: src/diffuse/preferences.py:112
+msgid "Always show the tab bar"
+msgstr "总是显示标签栏"
+
+#: src/diffuse/preferences.py:113
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "当关闭标签会退出%s的时候提醒我"
+
+#: src/diffuse/preferences.py:115
+msgid "Regional Settings"
+msgstr "区域性设置"
+
+#: src/diffuse/preferences.py:118
+msgid "Default codec"
+msgstr "默认编码"
+
+#: src/diffuse/preferences.py:119
+msgid "Order of codecs used to identify encoding"
+msgstr "用来识别编码的编码顺序"
+
+#: src/diffuse/preferences.py:140
+msgid "Cygwin"
+msgstr ""
+
+#: src/diffuse/preferences.py:142
+msgid "Root directory"
+msgstr "根目录"
+
+#: src/diffuse/preferences.py:143
+msgid "Cygdrive prefix"
+msgstr ""
+
+#: src/diffuse/preferences.py:162
+msgid "Version control system search order"
+msgstr ""
+
+#: src/diffuse/preferences.py:170
+msgid "\"co\" command"
+msgstr "\"co\"命令"
+
+#: src/diffuse/preferences.py:171
+msgid "\"rlog\" command"
+msgstr "\"rlog\"命令"
+
+#: src/diffuse/preferences.py:173
+msgid "Command"
+msgstr "命令"
+
+#: src/diffuse/preferences.py:179
+msgid "Launch from a Bash login shell"
+msgstr "从命令行登录界面加载"
+
+#: src/diffuse/preferences.py:186
+msgid "Update paths for Cygwin"
+msgstr "为Cygwin更新路径"
+
+#: src/diffuse/preferences.py:191
+msgid "Version Control"
+msgstr "版本控制"
+
+#: src/diffuse/preferences.py:256
+msgid "Preferences"
+msgstr "首选项"
+
+#: src/diffuse/resources.py:465
+#, fuzzy
+msgid "Error processing line {i + 1} of {file_name}."
+msgstr "处理到文件%(file)s的%(line)d行时出错。"
+
+#: src/diffuse/utils.py:60
+msgid "Auto Detect"
+msgstr "自动探测"
+
+#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60 src/diffuse/vcs/svn.py:93
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "无法解析修订版本%s。"
@@ -664,3 +869,27 @@ msgstr "无法解析修订版本%s。"
 #, python-format
 msgid "Error parsing %s."
 msgstr "无法解析%s。"
+
+#: src/diffuse/widgets.py:1842
+msgid "Align with Selection"
+msgstr "向选中的对齐"
+
+#: src/diffuse/widgets.py:1843
+msgid "Isolate"
+msgstr "分离"
+
+#: src/diffuse/widgets.py:1844
+msgid "Merge Selection"
+msgstr "合并选择之处"
+
+#: src/diffuse/widgets.py:1850
+msgid "Select All"
+msgstr "选择所有"
+
+#: src/diffuse/widgets.py:1853
+msgid "Swap with Selected Pane"
+msgstr "交换选中的窗格"
+
+#, python-format
+#~ msgid "Column %d"
+#~ msgstr "%d列"

po/zh_TW.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse 0.4.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 10:26-0500\n"
+"POT-Creation-Date: 2021-11-24 13:44-0500\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -31,9 +31,9 @@ msgstr "比較與合併文字檔案的圖形化工具"
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:7
 msgid ""
-"Diffuse is a graphical tool for comparing and merging text files. It can "
-"retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, "
-"Monotone, RCS, Subversion, and SVK repositories."
+"Diffuse is a graphical tool for comparing and merging text files. It can retrieve "
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, "
+"Subversion, and SVK repositories."
 msgstr ""
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
@@ -44,6 +44,69 @@ msgstr ""
 msgid "Copyright"
 msgstr "著作權"
 
+#: src/diffuse/dialogs.py:38
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr "Diffuse 是一個合併與比較文字檔案的圖形工具。"
+
+#: src/diffuse/dialogs.py:43
+msgid "translator-credits"
+msgstr ""
+"紀明村 <tw.chi.ming@gmail.com>\n"
+"趙惟倫 <bluebat@member.fsf.org>"
+
+#: src/diffuse/dialogs.py:47
+#, 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:81
+msgid "Encoding: "
+msgstr "編碼："
+
+#: src/diffuse/dialogs.py:93
+msgid "Revision: "
+msgstr "修訂："
+
+#: src/diffuse/dialogs.py:149
+msgid "Find..."
+msgstr "搜尋…"
+
+#: src/diffuse/dialogs.py:157
+msgid "Search For: "
+msgstr "搜尋："
+
+#: src/diffuse/dialogs.py:182
+msgid "Match Case"
+msgstr "符合大小寫"
+
+#: src/diffuse/dialogs.py:187
+msgid "Search Backwards"
+msgstr "反向搜尋"
+
 #: src/diffuse/main.py:77
 msgid "Close Tab"
 msgstr "關閉分頁"
@@ -100,18 +163,17 @@ msgstr "%s 的檔案已存在，您希望覆蓋它嗎？"
 #: src/diffuse/main.py:501
 #, python-format
 msgid ""
-"The file %s has been modified by another process since reading it.  If you "
-"save, all the external changes could be lost.  Save anyways?"
+"The file %s has been modified by another process since reading it.  If you save, "
+"all the external changes could be lost.  Save anyways?"
 msgstr ""
-"檔案 %s 打開後被其他程式變更過了，如果儲存，其他程式的變更修改將會不見，儲存"
-"嗎？"
+"檔案 %s 打開後被其他程式變更過了，如果儲存，其他程式的變更修改將會不見，儲存嗎？"
 
 #: src/diffuse/main.py:540
 #, python-format
 msgid "Error encoding to %s."
 msgstr "無法編碼為 %s。"
 
-#: src/diffuse/main.py:542
+#: src/diffuse/main.py:542 src/diffuse/preferences.py:296
 #, python-format
 msgid "Error writing %s."
 msgstr "無法寫入 %s"
@@ -126,8 +188,8 @@ msgstr "列數："
 
 #: src/diffuse/main.py:596
 msgid ""
-"Press the enter key or double click to edit.  Press the space bar or use the "
-"RMB menu to manually align."
+"Press the enter key or double click to edit.  Press the space bar or use the RMB "
+"menu to manually align."
 msgstr "按確定鍵或雙擊滑鼠進行編輯。空格鍵或者右鍵選單手動對齊。"
 
 #: src/diffuse/main.py:598
@@ -136,8 +198,8 @@ msgstr "按 ESC 鍵結束編輯"
 
 #: src/diffuse/main.py:600
 msgid ""
-"Select target line and press the space bar to align.  Press the escape key "
-"to cancel."
+"Select target line and press the space bar to align.  Press the escape key to "
+"cancel."
 msgstr "選擇目標列然後按空格鍵進行對齊，按 ESC 取消。"
 
 #: src/diffuse/main.py:711
@@ -469,25 +531,24 @@ msgstr "復原"
 msgid "Redo"
 msgstr "重做"
 
-#: src/diffuse/main.py:838
+#: src/diffuse/main.py:838 src/diffuse/widgets.py:1846
 msgid "Cut"
 msgstr "剪下"
 
-#: src/diffuse/main.py:839
+#: src/diffuse/main.py:839 src/diffuse/widgets.py:1847
 msgid "Copy"
 msgstr "複製"
 
-#: src/diffuse/main.py:840
+#: src/diffuse/main.py:840 src/diffuse/widgets.py:1848
 msgid "Paste"
 msgstr "貼上"
 
-#: src/diffuse/main.py:841
+#: src/diffuse/main.py:841 src/diffuse/widgets.py:1851
 msgid "Clear Edits"
 msgstr "取消編輯"
 
 #: src/diffuse/main.py:961
-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 "一些檔案已變更但未儲存，請在關閉前儲存這些檔案。"
 
 #: src/diffuse/main.py:974
@@ -564,19 +625,15 @@ msgid ""
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
 "    diffuse ( -h | -? | --help | -v | --version )\n"
 "\n"
-"Diffuse is a graphical tool for merging and comparing text files.  Diffuse "
-"is\n"
-"able to compare an arbitrary number of files side-by-side and gives users "
-"the\n"
-"ability to manually adjust line matching and directly edit files.  Diffuse "
-"can\n"
+"Diffuse is a graphical tool for merging and comparing text files.  Diffuse is\n"
+"able to compare an arbitrary number of files side-by-side and gives users the\n"
+"ability to manually adjust line matching and directly edit files.  Diffuse can\n"
 "also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
 "Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
 "\n"
 "Help Options:\n"
 "  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright "
-"information\n"
+"  ( -v | --version )               Display version and copyright information\n"
 "\n"
 "Configuration Options:\n"
 "  --no-rcfile                      Do not read any resource files\n"
@@ -654,8 +711,173 @@ msgstr "跳過未知引數「%s」。"
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "無法處理「%s」。目錄不存在。"
 
-#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60
-#: src/diffuse/vcs/svn.py:93
+#: src/diffuse/preferences.py:77
+msgid "Display"
+msgstr "顯示"
+
+#: src/diffuse/preferences.py:80
+msgid "Font"
+msgstr "字型"
+
+#: src/diffuse/preferences.py:81
+msgid "Tab width"
+msgstr "跳格寬度"
+
+#: src/diffuse/preferences.py:82
+msgid "Show right margin"
+msgstr "顯示右邊距"
+
+#: src/diffuse/preferences.py:83
+msgid "Right margin"
+msgstr "右邊距"
+
+#: src/diffuse/preferences.py:84
+msgid "Show line numbers"
+msgstr "顯示列號"
+
+#: src/diffuse/preferences.py:85
+msgid "Show white space characters"
+msgstr "顯示空格"
+
+#: src/diffuse/preferences.py:86
+msgid "Ignore case differences"
+msgstr "忽略大小寫的差異"
+
+#: src/diffuse/preferences.py:87
+msgid "Ignore white space differences"
+msgstr "忽略空格的差異"
+
+#: src/diffuse/preferences.py:88 src/diffuse/preferences.py:97
+msgid "Ignore changes to white space"
+msgstr "忽略對空格的改變"
+
+#: src/diffuse/preferences.py:89
+msgid "Ignore blank line differences"
+msgstr "忽略空列的差異"
+
+#: src/diffuse/preferences.py:90
+msgid "Ignore end of line differences"
+msgstr "忽略列尾的差異"
+
+#: src/diffuse/preferences.py:92
+msgid "Alignment"
+msgstr "對齊"
+
+#: src/diffuse/preferences.py:95
+msgid "Ignore case"
+msgstr "忽略大小寫"
+
+#: src/diffuse/preferences.py:96
+msgid "Ignore white space"
+msgstr "忽略空格"
+
+#: src/diffuse/preferences.py:98
+msgid "Ignore blank lines"
+msgstr "忽略空列"
+
+#: src/diffuse/preferences.py:99
+msgid "Ignore end of line characters"
+msgstr "忽略列尾字元"
+
+#: src/diffuse/preferences.py:101
+msgid "Editor"
+msgstr "編輯器"
+
+#: src/diffuse/preferences.py:104
+msgid "Auto indent"
+msgstr "自動縮排"
+
+#: src/diffuse/preferences.py:105
+msgid "Expand tabs to spaces"
+msgstr "展開跳格字元為空格"
+
+#: src/diffuse/preferences.py:106
+msgid "Soft tab width"
+msgstr "跳格寬度"
+
+#: src/diffuse/preferences.py:108
+msgid "Tabs"
+msgstr "分頁"
+
+#: src/diffuse/preferences.py:111
+msgid "Default panes"
+msgstr "預設窗格"
+
+#: src/diffuse/preferences.py:112
+msgid "Always show the tab bar"
+msgstr "總是顯示分頁欄"
+
+#: src/diffuse/preferences.py:113
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "當關閉分頁會退出 %s 的時候提醒我"
+
+#: src/diffuse/preferences.py:115
+msgid "Regional Settings"
+msgstr "設定"
+
+#: src/diffuse/preferences.py:118
+msgid "Default codec"
+msgstr "預設解碼器"
+
+#: src/diffuse/preferences.py:119
+msgid "Order of codecs used to identify encoding"
+msgstr "用來識別編碼的解碼器順序"
+
+#: src/diffuse/preferences.py:140
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/diffuse/preferences.py:142
+msgid "Root directory"
+msgstr "根目錄"
+
+#: src/diffuse/preferences.py:143
+msgid "Cygdrive prefix"
+msgstr "Cygdrive 前綴"
+
+#: src/diffuse/preferences.py:162
+msgid "Version control system search order"
+msgstr ""
+
+#: src/diffuse/preferences.py:170
+msgid "\"co\" command"
+msgstr "「co」命令"
+
+#: src/diffuse/preferences.py:171
+msgid "\"rlog\" command"
+msgstr "「rlog」命令"
+
+#: src/diffuse/preferences.py:173
+msgid "Command"
+msgstr "命令"
+
+#: src/diffuse/preferences.py:179
+msgid "Launch from a Bash login shell"
+msgstr "從登入命令列介面啟動"
+
+#: src/diffuse/preferences.py:186
+msgid "Update paths for Cygwin"
+msgstr "為 Cygwin 更新路徑"
+
+#: src/diffuse/preferences.py:191
+msgid "Version Control"
+msgstr "版本控制"
+
+#: src/diffuse/preferences.py:256
+msgid "Preferences"
+msgstr "選項"
+
+#: src/diffuse/resources.py:465
+#, fuzzy
+msgid "Error processing line {i + 1} of {file_name}."
+msgstr "處理到檔案 %(file)s 的第 %(line)d 列時出錯。"
+
+#: src/diffuse/utils.py:60
+msgid "Auto Detect"
+msgstr "自動偵測"
+
+#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60 src/diffuse/vcs/svn.py:93
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "無法解析修訂版本 %s。"
@@ -664,3 +886,27 @@ msgstr "無法解析修訂版本 %s。"
 #, python-format
 msgid "Error parsing %s."
 msgstr "無法解析 %s。"
+
+#: src/diffuse/widgets.py:1842
+msgid "Align with Selection"
+msgstr "對齊選擇區域"
+
+#: src/diffuse/widgets.py:1843
+msgid "Isolate"
+msgstr "分離"
+
+#: src/diffuse/widgets.py:1844
+msgid "Merge Selection"
+msgstr "合併選擇區域"
+
+#: src/diffuse/widgets.py:1850
+msgid "Select All"
+msgstr "全選"
+
+#: src/diffuse/widgets.py:1853
+msgid "Swap with Selected Pane"
+msgstr "交換選中的窗格"
+
+#, python-format
+#~ msgid "Column %d"
+#~ msgstr "第 %d 行"