diff --git a/po/POTFILES b/po/POTFILES
index 1d60702..068e7bc 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -22,3 +22,4 @@ src/diffuse/vcs/svn.py
 src/diffuse/vcs/vcs_interface.py
 src/diffuse/vcs/vcs_registry.py
 src/diffuse/widgets.py
+src/diffuse/window.py
diff --git a/po/cs.po b/po/cs.po
index 85c0943..d6542cc 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse-svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-23 20:00-0400\n"
+"POT-Creation-Date: 2023-04-16 14:09-0400\n"
 "PO-Revision-Date: 2022-04-04 12:16-0400\n"
 "Last-Translator: Jindřich Šesták <khagaroth@gmail.com>\n"
 "Language-Team: NONE <NONE>\n"
@@ -35,832 +35,303 @@ 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."
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, and "
+"Subversion repositories."
 msgstr ""
 
-#: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
-msgid "Main window: diff between two files"
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:28
+msgid "Main window"
 msgstr ""
 
-#: src/diffuse/constants.py:25
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:32
+msgid "About window"
+msgstr ""
+
+#: src/diffuse/constants.py:26
 msgid "Copyright"
 msgstr ""
 
-#: src/diffuse/dialogs.py:40
-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:46 src/diffuse/dialogs.py:89 src/diffuse/dialogs.py:133
+#: src/diffuse/preferences.py:254 src/diffuse/preferences.py:483
+#: src/diffuse/window.py:309 src/diffuse/window.py:1107
+msgid "_Cancel"
+msgstr ""
 
-#: src/diffuse/dialogs.py:45
-msgid "translator-credits"
-msgstr "Jindřich Šesták <khagaroth@gmail.com>"
-
-#: src/diffuse/dialogs.py:82
+#: src/diffuse/dialogs.py:50
 msgid "Encoding: "
 msgstr "Kódování: "
 
-#: src/diffuse/dialogs.py:94
+#: src/diffuse/dialogs.py:62
 msgid "Revision: "
 msgstr "Revize: "
 
-#: src/diffuse/dialogs.py:156
+#: src/diffuse/dialogs.py:90 src/diffuse/dialogs.py:134
+#: src/diffuse/preferences.py:255
+msgid "_OK"
+msgstr ""
+
+#: src/diffuse/dialogs.py:130
 msgid "Find..."
 msgstr "Najít..."
 
-#: src/diffuse/dialogs.py:164
+#: src/diffuse/dialogs.py:140
 msgid "Search For: "
 msgstr "Vyhledat: "
 
-#: src/diffuse/dialogs.py:189
+#: src/diffuse/dialogs.py:165
 msgid "Match Case"
 msgstr "Rozlišovat velikost písmen"
 
-#: src/diffuse/dialogs.py:194
+#: src/diffuse/dialogs.py:170
 msgid "Search Backwards"
 msgstr "Hledat od konce"
 
+#: src/diffuse/main.py:53
+msgid "Display version and copyright information"
+msgstr "Zobrazí verzi a licenční údaje"
+
+#: src/diffuse/main.py:61
+msgid "Do not read any resource files"
+msgstr "Zakáže načítání zdrojových souborů"
+
+#: src/diffuse/main.py:69
+msgid "Specify explicit resource file"
+msgstr "Použije zadaný zdrojový soubor"
+
+#: src/diffuse/main.py:77
+msgid "File revisions <rev-1> and <rev>"
+msgstr "Revize souboru ve formátu <rev-1> a <rev>"
+
 #: src/diffuse/main.py:85
-msgid "Close Tab"
-msgstr "Zavřít panel"
+msgid "Close all tabs with no differences"
+msgstr "Zavře panely s identickým obsahem"
 
-#: src/diffuse/main.py:132
-msgid "Open File..."
-msgstr "Otevřít soubor..."
+#: src/diffuse/main.py:92
+msgid "Use <codec> to read and write files"
+msgstr "Použije pro čtení a zápis souborů uvedený"
 
-#: src/diffuse/main.py:133
-msgid "Reload File"
-msgstr "Znovu načíst soubor"
+#: src/diffuse/main.py:100
+msgid "Display <label> instead of the file name"
+msgstr "Místo názvu soboru zobrazí uvedený <label>"
 
-#: src/diffuse/main.py:134
-msgid "Save File"
-msgstr "Uložit soubor"
+#: src/diffuse/main.py:108
+msgid "Create a new tab for each modified file"
+msgstr "Vytvoří pro každý změněný soubor nový panel"
 
-#: src/diffuse/main.py:135
-msgid "Save File As..."
-msgstr "Uložit soubor jako..."
+#: src/diffuse/main.py:115
+msgid "File revision <rev>"
+msgstr "Revize souboru <rev>"
 
-#: src/diffuse/main.py:217
-#, python-format
-msgid "Column %d"
-msgstr "Sloupec %d"
+#: src/diffuse/main.py:123
+msgid "Create a new tab for each file"
+msgstr "Vytvoří pro každý soubor samostatný panel"
 
-#: src/diffuse/main.py:291
-msgid "Save changes before loading the new file?"
-msgstr "Uložit změny před načtením nového souboru?"
+#: src/diffuse/main.py:130
+msgid "Start a new tab"
+msgstr "Vytvoří nový panel"
 
-#: src/diffuse/main.py:402
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "Při čtení revize %(rev)s souboru %(file)s došlo k chybě."
+#: src/diffuse/main.py:137 src/diffuse/preferences.py:159
+msgid "Version control system search order"
+msgstr ""
 
-#: src/diffuse/main.py:405 src/diffuse/main.py:1860
+#: src/diffuse/main.py:145
+msgid "Start with line <line> selected"
+msgstr "Po spuštění přejde na <line>"
+
+#: src/diffuse/main.py:153
+msgid "Create a blank file comparison pane"
+msgstr "Vytvoří prázdné podokno pro porovnání souborů"
+
+#: src/diffuse/main.py:160 src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:95
+msgid "Ignore changes to white space"
+msgstr "Ignorovat znaky mezer"
+
+#: src/diffuse/main.py:167
+msgid "Ignore changes in blank lines"
+msgstr "Ignorovat prázdné řádky"
+
+#: src/diffuse/main.py:174 src/diffuse/preferences.py:88
+msgid "Ignore end of line differences"
+msgstr "Ignorovat znaky konce řádku"
+
+#: src/diffuse/main.py:181 src/diffuse/preferences.py:84
+msgid "Ignore case differences"
+msgstr "Ignorovat velikost písmen"
+
+#: src/diffuse/main.py:188 src/diffuse/preferences.py:85
+msgid "Ignore white space differences"
+msgstr "Ignorovat netisknutelné znaky"
+
+#: src/diffuse/main.py:191
+msgid ""
+"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 several VCSs for comparison and merging."
+msgstr ""
+
+#: src/diffuse/main.py:247 src/diffuse/window.py:420
 #, python-format
 msgid "Error reading %s."
 msgstr "Při čtení souboru %s došlo k chybě."
 
-#: src/diffuse/main.py:427
-msgid "Open File"
-msgstr "Otevřít soubor"
-
-#: src/diffuse/main.py:484
-#, python-format
-msgid "The file %s changed on disk. Do you want to reload the file?"
-msgstr "Soubor %s byl změněn. Chcete ho znovu načíst?"
-
-#: src/diffuse/main.py:510
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "Uložit podokno %(pane)d %(title)s"
-
-#: src/diffuse/main.py:542
-#, python-format
-msgid "A file named %s already exists. Do you want to overwrite it?"
-msgstr "Soubor s názvem %s již existuje. Chcete ho přepsat?"
-
-#: src/diffuse/main.py:549
-#, 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 ""
-"Soubor %s byl od načtení změněn jiným procesem. Pokud ho nyní uložíte, změny "
-"provedené tímto externím procesem mohou být ztraceny. Chcete ho přesto uložit?"
-
-#: src/diffuse/main.py:591
-#, 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:595 src/diffuse/preferences.py:300
-#, python-format
-msgid "Error writing %s."
-msgstr "Při ukládání %s došlo k chybě."
-
-#: src/diffuse/main.py:625
-msgid "Go To Line..."
-msgstr "Přejít na řádek..."
-
-#: src/diffuse/main.py:626
-msgid "Line Number: "
-msgstr "Řádek číslo: "
-
-#: src/diffuse/main.py:657
-msgid ""
-"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."
-
-#: src/diffuse/main.py:661
-msgid "Press the escape key to finish editing."
-msgstr "Editaci ukončíte pomocí klávesy escape."
-
-#: src/diffuse/main.py:664
-msgid ""
-"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."
-
-#: src/diffuse/main.py:787
-msgid "_File"
-msgstr "_Soubor"
-
-#: src/diffuse/main.py:788
-msgid "_Open File..."
-msgstr "_Otevřít soubor..."
-
-#: src/diffuse/main.py:789
-msgid "Open File In New _Tab..."
-msgstr "Otevřít soubor v novém _panelu..."
-
-#: src/diffuse/main.py:790
-msgid "Open _Modified Files..."
-msgstr "Otevřít změněné soubory..."
-
-#: src/diffuse/main.py:791
-msgid "Open Commi_t..."
-msgstr "Otevřít _revizi..."
-
-#: src/diffuse/main.py:792
-msgid "_Reload File"
-msgstr "_Znovu načíst soubor"
-
-#: src/diffuse/main.py:794
-msgid "_Save File"
-msgstr "_Uložit soubor"
-
-#: src/diffuse/main.py:795
-msgid "Save File _As..."
-msgstr "Uložit soubor ­_jako..."
-
-#: src/diffuse/main.py:796
-msgid "Save A_ll"
-msgstr "Uložit _vše"
-
-#: src/diffuse/main.py:798
-msgid "New _2-Way File Merge"
-msgstr "Nové _2směrné slučování"
-
-#: src/diffuse/main.py:799
-msgid "New _3-Way File Merge"
-msgstr "Nové _3směrné slučování"
-
-#: src/diffuse/main.py:800
-msgid "New _N-Way File Merge..."
-msgstr "Nové _Nsměrné slučování..."
-
-#: src/diffuse/main.py:802
-msgid "_Close Tab"
-msgstr "_Zavřít panel"
-
-#: src/diffuse/main.py:803
-msgid "_Undo Close Tab"
-msgstr "_Obnovit zavřený panel"
-
-#: src/diffuse/main.py:804
-msgid "_Quit"
-msgstr "Kone_c"
-
-#: src/diffuse/main.py:807
-msgid "_Edit"
-msgstr "Úpr_avy"
-
-#: src/diffuse/main.py:808
-msgid "_Undo"
-msgstr "_Zpět"
-
-#: src/diffuse/main.py:809
-msgid "_Redo"
-msgstr "Z_novu"
-
-#: src/diffuse/main.py:811
-msgid "Cu_t"
-msgstr "_Vyjmout"
-
-#: src/diffuse/main.py:812
-msgid "_Copy"
-msgstr "_Kopírovat"
-
-#: src/diffuse/main.py:813
-msgid "_Paste"
-msgstr "V_ložit"
-
-#: src/diffuse/main.py:815
-msgid "Select _All"
-msgstr "V_ybrat vše"
-
-#: src/diffuse/main.py:816
-msgid "C_lear Edits"
-msgstr "_Smazat úpravy"
-
-#: src/diffuse/main.py:817
-msgid "_Dismiss All Edits"
-msgstr "Z_rušit všechny úpravy"
-
-#: src/diffuse/main.py:819
-msgid "_Find..."
-msgstr "_Najít..."
-
-#: src/diffuse/main.py:820
-msgid "Find _Next"
-msgstr "Najít _další"
-
-#: src/diffuse/main.py:821
-msgid "Find Pre_vious"
-msgstr "Najít _předchozí"
-
-#: src/diffuse/main.py:822
-msgid "_Go To Line..."
-msgstr "Pře_jít na řádek..."
-
-#: src/diffuse/main.py:824
-msgid "Pr_eferences..."
-msgstr "Př_edvolby..."
-
-#: src/diffuse/main.py:828
-msgid "None"
-msgstr "Nic"
-
-#: src/diffuse/main.py:846
-msgid "_View"
-msgstr "_Zobrazit"
-
-#: src/diffuse/main.py:847
-msgid "_Syntax Highlighting"
-msgstr "Zvýraznění _syntaxe"
-
-#: src/diffuse/main.py:849
-msgid "Re_align All"
-msgstr "Znovu _zarovnat"
-
-#: src/diffuse/main.py:850
-msgid "_Isolate"
-msgstr "_Izolovat"
-
-#: src/diffuse/main.py:852
-msgid "_First Difference"
-msgstr "Pr_vní rozdíl"
-
-#: src/diffuse/main.py:853
-msgid "_Previous Difference"
-msgstr "_Předchozí rozdíl"
-
-#: src/diffuse/main.py:854
-msgid "_Next Difference"
-msgstr "_Další rozdíl"
-
-#: src/diffuse/main.py:855
-msgid "_Last Difference"
-msgstr "P_oslední rozdíl"
-
-#: src/diffuse/main.py:857
-msgid "Fir_st Tab"
-msgstr "Prv_ní panel"
-
-#: src/diffuse/main.py:858
-msgid "Pre_vious Tab"
-msgstr "Předch_ozí panel"
-
-#: src/diffuse/main.py:859
-msgid "Next _Tab"
-msgstr "D_alší panel"
-
-#: src/diffuse/main.py:860
-msgid "Las_t Tab"
-msgstr "Posl_ední panel"
-
-#: src/diffuse/main.py:862
-msgid "Shift Pane _Right"
-msgstr "Přesunout podokno dop_rava"
-
-#: src/diffuse/main.py:863
-msgid "Shift Pane _Left"
-msgstr "Přesunout podokno do_leva"
-
-#: src/diffuse/main.py:866
-msgid "F_ormat"
-msgstr "F_ormát"
-
-#: src/diffuse/main.py:867
-msgid "Convert To _Upper Case"
-msgstr "Převést na _velká písmena"
-
-#: src/diffuse/main.py:868
-msgid "Convert To _Lower Case"
-msgstr "Převést na _malá písmena"
-
-#: src/diffuse/main.py:870
-msgid "Sort Lines In _Ascending Order"
-msgstr "Seřadit řádky v_zestupně"
-
-#: src/diffuse/main.py:871
-msgid "Sort Lines In D_escending Order"
-msgstr "Seřadit řádky _sestupně"
-
-#: src/diffuse/main.py:873
-msgid "Remove Trailing _White Space"
-msgstr "_Odstranit mezery na koncích řádků"
-
-#: src/diffuse/main.py:874
-msgid "Convert Tabs To _Spaces"
-msgstr "_Nahradit tabulátory mezerami"
-
-#: src/diffuse/main.py:875
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "Nah_radit úvodní mezery tabulátory"
-
-#: src/diffuse/main.py:877
-msgid "_Increase Indenting"
-msgstr "Zvětš_it odsazení"
-
-#: src/diffuse/main.py:878
-msgid "De_crease Indenting"
-msgstr "Zmenši_t odsazení"
-
-#: src/diffuse/main.py:880
-msgid "Convert To _DOS Format"
-msgstr "Převést na _DOS formát"
-
-#: src/diffuse/main.py:881
-msgid "Convert To _Mac Format"
-msgstr "Převést na Ma_c formát"
-
-#: src/diffuse/main.py:882
-msgid "Convert To Uni_x Format"
-msgstr "Převést na Uni_x formát"
-
-#: src/diffuse/main.py:885
-msgid "_Merge"
-msgstr "S_loučit"
-
-#: src/diffuse/main.py:886
-msgid "Copy Selection _Right"
-msgstr "_Kopírovat výběr doprava"
-
-#: src/diffuse/main.py:887
-msgid "Copy Selection _Left"
-msgstr "K_opírovat výběr doleva"
-
-#: src/diffuse/main.py:889
-msgid "Copy Left _Into Selection"
-msgstr "Ko_pírovat zleva do výběru"
-
-#: src/diffuse/main.py:890
-msgid "Copy Right I_nto Selection"
-msgstr "Kopí_rovat zprava do výběru"
-
-#: src/diffuse/main.py:891
-msgid "_Merge From Left Then Right"
-msgstr "_Sloučit zleva a poté zprava"
-
-#: src/diffuse/main.py:892
-msgid "M_erge From Right Then Left"
-msgstr "S_loučit zprava a poté zleva"
-
-#: src/diffuse/main.py:895
-msgid "_Help"
-msgstr "Nápo_věda"
-
-#: src/diffuse/main.py:896
-msgid "_Help Contents..."
-msgstr "_Zobrazit nápovědu..."
-
-#: src/diffuse/main.py:898
-#, python-format
-msgid "_About %s..."
-msgstr "_O programu %s..."
-
-#: src/diffuse/main.py:913
-msgid "New 2-Way File Merge"
-msgstr "Nové 2směrné slučování"
-
-#: src/diffuse/main.py:914
-msgid "New 3-Way File Merge"
-msgstr "Nové 3směrné slučování"
-
-#: src/diffuse/main.py:916
-msgid "Realign All"
-msgstr "Znovu zarovnat"
-
-#: src/diffuse/main.py:917
-msgid "First Difference"
-msgstr "První rozdíl"
-
-#: src/diffuse/main.py:918
-msgid "Previous Difference"
-msgstr "Předchozí rozdíl"
-
-#: src/diffuse/main.py:919
-msgid "Next Difference"
-msgstr "Další rozdíl"
-
-#: src/diffuse/main.py:920
-msgid "Last Difference"
-msgstr "Poslední rozdíl"
-
-#: src/diffuse/main.py:922
-msgid "Copy Selection Right"
-msgstr "Kopírovat výběr doprava"
-
-#: src/diffuse/main.py:923
-msgid "Copy Selection Left"
-msgstr "Kopírovat výběr doleva"
-
-#: src/diffuse/main.py:924
-msgid "Copy Left Into Selection"
-msgstr "Kopírovat zleva do výběru"
-
-#: src/diffuse/main.py:925
-msgid "Copy Right Into Selection"
-msgstr "Kopírovat zprava do výběru"
-
-#: src/diffuse/main.py:926
-msgid "Merge From Left Then Right"
-msgstr "Sloučit zleva a poté zprava"
-
-#: src/diffuse/main.py:927
-msgid "Merge From Right Then Left"
-msgstr "Sloučit zprava a poté zleva"
-
-#: src/diffuse/main.py:929
-msgid "Undo"
-msgstr "Zpět"
-
-#: src/diffuse/main.py:930
-msgid "Redo"
-msgstr "Znovu"
-
-#: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
-msgid "Cut"
-msgstr "Vyjmout"
-
-#: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
-msgid "Copy"
-msgstr "Kopírovat"
-
-#: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
-msgid "Paste"
-msgstr "Vložit"
-
-#: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
-msgid "Clear Edits"
-msgstr "Smazat úpravy"
-
-#: src/diffuse/main.py:1057
-msgid "Some files have unsaved changes. Select the files to save before closing."
-msgstr ""
-"Některé změněné soubory nebyly uloženy. Vyberte soubory, které chcete před "
-"zavřením uložit."
-
-#: src/diffuse/main.py:1071
-msgid "Tab"
-msgstr "Panel"
-
-#: src/diffuse/main.py:1076
-msgid "Pane"
-msgstr "Podokno"
-
-#: src/diffuse/main.py:1087
-msgid "Close _Without Saving"
-msgstr "Zavřít _bez uložení"
-
-#: src/diffuse/main.py:1126
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "Zavřením tohoto panelu ukončíte %s."
-
-#: src/diffuse/main.py:1209
-#, python-format
-msgid "File Merge %d"
-msgstr "Slučování %d"
-
-#: src/diffuse/main.py:1315
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "Revize pro %s se nepodařilo načíst."
-
-#: src/diffuse/main.py:1347
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "Při načítání změn %s došlo k chybě."
-
-#: src/diffuse/main.py:1380
-msgid "Open File In New Tab"
-msgstr "Otevřít soubor v novém panelu"
-
-#: src/diffuse/main.py:1403
-msgid "Choose Folder With Modified Files"
-msgstr "Vyberte adresář se změněnými soubory"
-
-#: src/diffuse/main.py:1421
-msgid "No modified files found."
-msgstr "Nebyly nalezeny žádné změněné soubory."
-
-#: src/diffuse/main.py:1427
-msgid "Choose Folder With Commit"
-msgstr "Vyberte adresář se zapsanou revizí"
-
-#: src/diffuse/main.py:1447
-msgid "No committed files found."
-msgstr "Nebyly nalezeny žádné zapsané soubory."
-
-#: src/diffuse/main.py:1483
-msgid "New N-Way File Merge..."
-msgstr "Nové Nsměrné slučování..."
-
-#: src/diffuse/main.py:1484
-msgid "Number of panes: "
-msgstr "Počet podoken: "
-
-#: src/diffuse/main.py:1558
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "Hledaný výraz nebyl nalezen. Pokračovat v hledání od konce souboru?"
-
-#: src/diffuse/main.py:1560
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "Hledaný výraz nebyl nalezen. Pokračovat v hledání od začátku souboru?"
-
-#: src/diffuse/main.py:1781
-#, fuzzy
-msgid ""
-"Usage:\n"
-"    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"
-"also retrieve revisions of files from several VCSs for comparison and merging.\n"
-"\n"
-"Help Options:\n"
-"  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright information\n"
-"\n"
-"Configuration Options:\n"
-"  --no-rcfile                      Do not read any resource files\n"
-"  --rcfile <file>                  Specify explicit resource file\n"
-"\n"
-"General Options:\n"
-"  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
-"  ( -D | --close-if-same )         Close all tabs with no differences\n"
-"  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
-"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
-"  ( -m | --modified )              Create a new tab for each modified file\n"
-"  ( -r | --revision ) <rev>        File revision <rev>\n"
-"  ( -s | --separate )              Create a new tab for each file\n"
-"  ( -t | --tab )                   Start a new tab\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    Start with line <line> selected\n"
-"  --null-file                      Create a blank file comparison pane\n"
-"\n"
-"Display Options:\n"
-"  ( -b | --ignore-space-change )   Ignore changes to white space\n"
-"  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
-"  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
-"  ( -i | --ignore-case )           Ignore case differences\n"
-"  ( -w | --ignore-all-space )      Ignore white space differences"
-msgstr ""
-"Použití:\n"
-"    diffuse [ [PARAMETR...] [SOUBOR...] ]...\n"
-"    diffuse ( -h | -? | --help | -v | --version )\n"
-"\n"
-"Diffuse je grafický nástroj pro slučování a porovnávání textových souborů.  "
-"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"
-"Mercurial, Monotone,RCS, Subversion, a SVK.\n"
-"\n"
-"Nápověda:\n"
-"  ( -h | -? | --help )             Zobrazí tuto nápovědu\n"
-"  ( -v | --version )               Zobrazí verzi a licenční údaje\n"
-"\n"
-"Nastavení:\n"
-"  --no-rcfile                      Zakáže načítání zdrojových souborů\n"
-"  --rcfile <file>                  Použije zadaný zdrojový soubor\n"
-"\n"
-"Obecné:\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"
-"  ( -r | --revision ) <rev>        Revize souboru <rev>\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"
-"\n"
-"Zobrazení:\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"
-"  ( -w | --ignore-all-space )      Bude ignorovat změny pokud, jde o "
-"netisknutelné znaky"
-
-#: src/diffuse/main.py:1948
+#: src/diffuse/main.py:327
 msgid "Error parsing line number."
 msgstr "Při analýze čísla řádku došlo k chybě."
 
-#: src/diffuse/main.py:1958
-#, python-format
-msgid "Skipping unknown argument \"%s\"."
-msgstr "Ignorován neznámý parametr \"%s\"."
-
-#: src/diffuse/main.py:1966
+#: src/diffuse/main.py:343
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Při zpracování parametru \"%s\" došlo k chybě. Adresář nebyl očekáván."
 
-#: src/diffuse/preferences.py:80
+#: src/diffuse/preferences.py:75
 msgid "Display"
 msgstr "Zobrazení"
 
-#: src/diffuse/preferences.py:83
+#: src/diffuse/preferences.py:78
 msgid "Font"
 msgstr "Písmo"
 
-#: src/diffuse/preferences.py:84
+#: src/diffuse/preferences.py:79
 msgid "Tab width"
 msgstr "Šířka tabulátoru"
 
-#: src/diffuse/preferences.py:85
+#: src/diffuse/preferences.py:80
 msgid "Show right margin"
 msgstr "Zobrazit pravý okraj"
 
-#: src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:81
 msgid "Right margin"
 msgstr "Pravý okraj"
 
-#: src/diffuse/preferences.py:87
+#: src/diffuse/preferences.py:82
 msgid "Show line numbers"
 msgstr "Zobrazit čísla řádků"
 
-#: src/diffuse/preferences.py:88
+#: src/diffuse/preferences.py:83
 msgid "Show white space characters"
 msgstr "Zobrazit netisknutelné znaky"
 
-#: src/diffuse/preferences.py:89
-msgid "Ignore case differences"
-msgstr "Ignorovat velikost písmen"
-
-#: src/diffuse/preferences.py:90
-msgid "Ignore white space differences"
-msgstr "Ignorovat netisknutelné znaky"
-
-#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100
-msgid "Ignore changes to white space"
-msgstr "Ignorovat znaky mezer"
-
-#: src/diffuse/preferences.py:92
+#: src/diffuse/preferences.py:87
 msgid "Ignore blank line differences"
 msgstr "Ignorovat prázdné řádky"
 
-#: src/diffuse/preferences.py:93
-msgid "Ignore end of line differences"
-msgstr "Ignorovat znaky konce řádku"
-
-#: src/diffuse/preferences.py:95
+#: src/diffuse/preferences.py:90
 msgid "Alignment"
 msgstr "Zarovnání"
 
-#: src/diffuse/preferences.py:98
+#: src/diffuse/preferences.py:93
 msgid "Ignore case"
 msgstr "Ignorovat velikost písmen"
 
-#: src/diffuse/preferences.py:99
+#: src/diffuse/preferences.py:94
 msgid "Ignore white space"
 msgstr "Ignorovat netisknutelné znaky"
 
-#: src/diffuse/preferences.py:101
+#: src/diffuse/preferences.py:96
 msgid "Ignore blank lines"
 msgstr "Ignorovat prázdné řádky"
 
-#: src/diffuse/preferences.py:102
+#: src/diffuse/preferences.py:97
 msgid "Ignore end of line characters"
 msgstr "Ignorovat znaky konce řádku"
 
-#: src/diffuse/preferences.py:104
+#: src/diffuse/preferences.py:99
 msgid "Editor"
 msgstr "Editor"
 
-#: src/diffuse/preferences.py:107
+#: src/diffuse/preferences.py:102
 msgid "Auto indent"
 msgstr "Automaticky odsazovat"
 
-#: src/diffuse/preferences.py:108
+#: src/diffuse/preferences.py:103
 msgid "Expand tabs to spaces"
 msgstr "Nahradit tabulátory mezerami"
 
-#: src/diffuse/preferences.py:109
+#: src/diffuse/preferences.py:104
 msgid "Soft tab width"
 msgstr "Šířka tabulátoru"
 
-#: src/diffuse/preferences.py:111
+#: src/diffuse/preferences.py:106
 msgid "Tabs"
 msgstr "Panely"
 
-#: src/diffuse/preferences.py:114
+#: src/diffuse/preferences.py:109
 msgid "Default panes"
 msgstr "Výchozí počet podoken"
 
-#: src/diffuse/preferences.py:115
+#: src/diffuse/preferences.py:110
 msgid "Always show the tab bar"
 msgstr "Vždy zobrazovat lištu s panely"
 
-#: src/diffuse/preferences.py:116
+#: src/diffuse/preferences.py:111
 #, 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:118
+#: src/diffuse/preferences.py:113
 msgid "Regional Settings"
 msgstr "Místní nastavení"
 
-#: src/diffuse/preferences.py:121
+#: src/diffuse/preferences.py:116
 msgid "Default codec"
 msgstr "Výchozí kódování"
 
-#: src/diffuse/preferences.py:122
+#: src/diffuse/preferences.py:117
 msgid "Order of codecs used to identify encoding"
 msgstr "Pořadí kodeků pro rozpoznání kódování"
 
-#: src/diffuse/preferences.py:143
+#: src/diffuse/preferences.py:138
 msgid "Cygwin"
 msgstr "Cygwin"
 
-#: src/diffuse/preferences.py:145
+#: src/diffuse/preferences.py:140
 msgid "Root directory"
 msgstr "Kořenový adresář"
 
-#: src/diffuse/preferences.py:146
+#: src/diffuse/preferences.py:141
 msgid "Cygdrive prefix"
 msgstr "Předpona cygdrive"
 
-#: src/diffuse/preferences.py:165
-msgid "Version control system search order"
-msgstr ""
-
-#: src/diffuse/preferences.py:173
+#: src/diffuse/preferences.py:167
 msgid "\"co\" command"
 msgstr "příkaz \"co\""
 
-#: src/diffuse/preferences.py:174
+#: src/diffuse/preferences.py:168
 msgid "\"rlog\" command"
 msgstr "příkaz \"rlog\""
 
-#: src/diffuse/preferences.py:176
+#: src/diffuse/preferences.py:170
 msgid "Command"
 msgstr "Příkaz"
 
-#: src/diffuse/preferences.py:182
+#: src/diffuse/preferences.py:176
 msgid "Launch from a Bash login shell"
 msgstr "Spustit z příkazové řádky terminálu Bash"
 
-#: src/diffuse/preferences.py:189
+#: src/diffuse/preferences.py:183
 msgid "Update paths for Cygwin"
 msgstr "Upravit cesty pro Cygwin"
 
-#: src/diffuse/preferences.py:194
+#: src/diffuse/preferences.py:188
 msgid "Version Control"
 msgstr "Správa verzí"
 
-#: src/diffuse/preferences.py:259
+#: src/diffuse/preferences.py:253
 msgid "Preferences"
 msgstr "Předvolby"
 
+#: src/diffuse/preferences.py:294 src/diffuse/window.py:580
+#, python-format
+msgid "Error writing %s."
+msgstr "Při ukládání %s došlo k chybě."
+
+#: src/diffuse/preferences.py:483 src/diffuse/window.py:446
+#: src/diffuse/window.py:1413 src/diffuse/window.py:1436 src/diffuse/window.py:1459
+msgid "_Open"
+msgstr ""
+
 #: src/diffuse/resources.py:242 src/diffuse/resources.py:246
 #: src/diffuse/resources.py:249
 #, python-brace-format
@@ -946,16 +417,11 @@ msgstr "Při zpracování řádku {line} souboru {file} došlo k chybě."
 msgid "Auto Detect"
 msgstr "Automaticky rozpoznat"
 
-#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97
+#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:96
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "Při analýze revize %s došlo k chybě."
 
-#: src/diffuse/vcs/vcs_registry.py:238
-#, python-format
-msgid "Error parsing %s."
-msgstr "Při analýze %s došlo k chybě."
-
 #: src/diffuse/widgets.py:1857
 msgid "Align with Selection"
 msgstr "Zarovnat s výběrem"
@@ -968,10 +434,651 @@ msgstr "Izolovat"
 msgid "Merge Selection"
 msgstr "Sloučit výběr"
 
+#: src/diffuse/widgets.py:1861 src/diffuse/window.py:865
+msgid "Cut"
+msgstr "Vyjmout"
+
+#: src/diffuse/widgets.py:1862 src/diffuse/window.py:866
+msgid "Copy"
+msgstr "Kopírovat"
+
+#: src/diffuse/widgets.py:1863 src/diffuse/window.py:867
+msgid "Paste"
+msgstr "Vložit"
+
 #: src/diffuse/widgets.py:1865
 msgid "Select All"
 msgstr "Vybrat vše"
 
+#: src/diffuse/widgets.py:1866 src/diffuse/window.py:868
+msgid "Clear Edits"
+msgstr "Smazat úpravy"
+
 #: src/diffuse/widgets.py:1868
 msgid "Swap with Selected Pane"
 msgstr "Prohodit s vybraným podoknem"
+
+#: src/diffuse/window.py:83
+msgid "Close Tab"
+msgstr "Zavřít panel"
+
+#: src/diffuse/window.py:126
+msgid "Open File..."
+msgstr "Otevřít soubor..."
+
+#: src/diffuse/window.py:127
+msgid "Reload File"
+msgstr "Znovu načíst soubor"
+
+#: src/diffuse/window.py:128
+msgid "Save File"
+msgstr "Uložit soubor"
+
+#: src/diffuse/window.py:129
+msgid "Save File As..."
+msgstr "Uložit soubor jako..."
+
+#: src/diffuse/window.py:228
+#, python-format
+msgid "Column %d"
+msgstr "Sloupec %d"
+
+#: src/diffuse/window.py:306
+msgid "Save changes before loading the new file?"
+msgstr "Uložit změny před načtením nového souboru?"
+
+#: src/diffuse/window.py:310
+msgid "_No"
+msgstr ""
+
+#: src/diffuse/window.py:311
+msgid "_Yes"
+msgstr ""
+
+#: src/diffuse/window.py:417
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "Při čtení revize %(rev)s souboru %(file)s došlo k chybě."
+
+#: src/diffuse/window.py:442
+msgid "Open File"
+msgstr "Otevřít soubor"
+
+#: src/diffuse/window.py:495
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "Uložit podokno %(pane)d %(title)s"
+
+#: src/diffuse/window.py:499 src/diffuse/window.py:1111
+msgid "_Save"
+msgstr "_Uložit"
+
+#: src/diffuse/window.py:527
+#, python-format
+msgid "A file named %s already exists. Do you want to overwrite it?"
+msgstr "Soubor s názvem %s již existuje. Chcete ho přepsat?"
+
+#: src/diffuse/window.py:534
+#, 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 ""
+"Soubor %s byl od načtení změněn jiným procesem. Pokud ho nyní uložíte, změny "
+"provedené tímto externím procesem mohou být ztraceny. Chcete ho přesto uložit?"
+
+#: src/diffuse/window.py:576
+#, python-format
+msgid "Error encoding to %s."
+msgstr "Při změně kódování do %s došlo k chybě."
+
+#: src/diffuse/window.py:610
+msgid "Go To Line..."
+msgstr "Přejít na řádek..."
+
+#: src/diffuse/window.py:611
+msgid "Line Number: "
+msgstr "Řádek číslo: "
+
+#: src/diffuse/window.py:642
+msgid ""
+"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."
+
+#: src/diffuse/window.py:646
+msgid "Press the escape key to finish editing."
+msgstr "Editaci ukončíte pomocí klávesy escape."
+
+#: src/diffuse/window.py:649
+msgid ""
+"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."
+
+#: src/diffuse/window.py:710
+msgid "_File"
+msgstr "_Soubor"
+
+#: src/diffuse/window.py:712
+msgid "_Open File..."
+msgstr "_Otevřít soubor..."
+
+#: src/diffuse/window.py:713
+msgid "Open File In New _Tab..."
+msgstr "Otevřít soubor v novém _panelu..."
+
+#: src/diffuse/window.py:714
+msgid "Open _Modified Files..."
+msgstr "Otevřít změněné soubory..."
+
+#: src/diffuse/window.py:715
+msgid "Open Commi_t..."
+msgstr "Otevřít _revizi..."
+
+#: src/diffuse/window.py:716
+msgid "_Reload File"
+msgstr "_Znovu načíst soubor"
+
+#: src/diffuse/window.py:718
+msgid "_Save File"
+msgstr "_Uložit soubor"
+
+#: src/diffuse/window.py:719
+msgid "Save File _As..."
+msgstr "Uložit soubor _jako..."
+
+#: src/diffuse/window.py:720
+msgid "Save A_ll"
+msgstr "Uložit _vše"
+
+#: src/diffuse/window.py:722
+msgid "New _2-Way File Merge"
+msgstr "Nové _2směrné slučování"
+
+#: src/diffuse/window.py:723
+msgid "New _3-Way File Merge"
+msgstr "Nové _3směrné slučování"
+
+#: src/diffuse/window.py:724
+msgid "New _N-Way File Merge..."
+msgstr "Nové _Nsměrné slučování..."
+
+#: src/diffuse/window.py:726
+msgid "_Close Tab"
+msgstr "_Zavřít panel"
+
+#: src/diffuse/window.py:727
+msgid "_Undo Close Tab"
+msgstr "_Obnovit zavřený panel"
+
+#: src/diffuse/window.py:728
+msgid "_Quit"
+msgstr "Kone_c"
+
+#: src/diffuse/window.py:732
+msgid "_Edit"
+msgstr "Úpr_avy"
+
+#: src/diffuse/window.py:734
+msgid "_Undo"
+msgstr "_Zpět"
+
+#: src/diffuse/window.py:735
+msgid "_Redo"
+msgstr "Z_novu"
+
+#: src/diffuse/window.py:737
+msgid "Cu_t"
+msgstr "_Vyjmout"
+
+#: src/diffuse/window.py:738
+msgid "_Copy"
+msgstr "_Kopírovat"
+
+#: src/diffuse/window.py:739
+msgid "_Paste"
+msgstr "V_ložit"
+
+#: src/diffuse/window.py:741
+msgid "Select _All"
+msgstr "V_ybrat vše"
+
+#: src/diffuse/window.py:742
+msgid "C_lear Edits"
+msgstr "_Smazat úpravy"
+
+#: src/diffuse/window.py:743
+msgid "_Dismiss All Edits"
+msgstr "Z_rušit všechny úpravy"
+
+#: src/diffuse/window.py:745
+msgid "_Find..."
+msgstr "_Najít..."
+
+#: src/diffuse/window.py:746
+msgid "Find _Next"
+msgstr "Najít _další"
+
+#: src/diffuse/window.py:747
+msgid "Find Pre_vious"
+msgstr "Najít _předchozí"
+
+#: src/diffuse/window.py:748
+msgid "_Go To Line..."
+msgstr "Pře_jít na řádek..."
+
+#: src/diffuse/window.py:750
+msgid "Pr_eferences..."
+msgstr "Př_edvolby..."
+
+#: src/diffuse/window.py:754
+msgid "None"
+msgstr "Nic"
+
+#: src/diffuse/window.py:776
+msgid "_View"
+msgstr "_Zobrazit"
+
+#: src/diffuse/window.py:778
+msgid "_Syntax Highlighting"
+msgstr "Zvýraznění _syntaxe"
+
+#: src/diffuse/window.py:780
+msgid "Re_align All"
+msgstr "Znovu _zarovnat"
+
+#: src/diffuse/window.py:781
+msgid "_Isolate"
+msgstr "_Izolovat"
+
+#: src/diffuse/window.py:783
+msgid "_First Difference"
+msgstr "Pr_vní rozdíl"
+
+#: src/diffuse/window.py:784
+msgid "_Previous Difference"
+msgstr "_Předchozí rozdíl"
+
+#: src/diffuse/window.py:785
+msgid "_Next Difference"
+msgstr "_Další rozdíl"
+
+#: src/diffuse/window.py:786
+msgid "_Last Difference"
+msgstr "P_oslední rozdíl"
+
+#: src/diffuse/window.py:788
+msgid "Fir_st Tab"
+msgstr "Prv_ní panel"
+
+#: src/diffuse/window.py:789
+msgid "Pre_vious Tab"
+msgstr "Předch_ozí panel"
+
+#: src/diffuse/window.py:790
+msgid "Next _Tab"
+msgstr "D_alší panel"
+
+#: src/diffuse/window.py:791
+msgid "Las_t Tab"
+msgstr "Posl_ední panel"
+
+#: src/diffuse/window.py:793
+msgid "Shift Pane _Right"
+msgstr "Přesunout podokno dop_rava"
+
+#: src/diffuse/window.py:794
+msgid "Shift Pane _Left"
+msgstr "Přesunout podokno do_leva"
+
+#: src/diffuse/window.py:798
+msgid "F_ormat"
+msgstr "F_ormát"
+
+#: src/diffuse/window.py:800
+msgid "Convert To _Upper Case"
+msgstr "Převést na _velká písmena"
+
+#: src/diffuse/window.py:801
+msgid "Convert To _Lower Case"
+msgstr "Převést na _malá písmena"
+
+#: src/diffuse/window.py:803
+msgid "Sort Lines In _Ascending Order"
+msgstr "Seřadit řádky v_zestupně"
+
+#: src/diffuse/window.py:804
+msgid "Sort Lines In D_escending Order"
+msgstr "Seřadit řádky _sestupně"
+
+#: src/diffuse/window.py:806
+msgid "Remove Trailing _White Space"
+msgstr "_Odstranit mezery na koncích řádků"
+
+#: src/diffuse/window.py:807
+msgid "Convert Tabs To _Spaces"
+msgstr "_Nahradit tabulátory mezerami"
+
+#: src/diffuse/window.py:808
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "Nah_radit úvodní mezery tabulátory"
+
+#: src/diffuse/window.py:810
+msgid "_Increase Indenting"
+msgstr "Zvětš_it odsazení"
+
+#: src/diffuse/window.py:811
+msgid "De_crease Indenting"
+msgstr "Zmenši_t odsazení"
+
+#: src/diffuse/window.py:813
+msgid "Convert To _DOS Format"
+msgstr "Převést na _DOS formát"
+
+#: src/diffuse/window.py:814
+msgid "Convert To _Mac Format"
+msgstr "Převést na Ma_c formát"
+
+#: src/diffuse/window.py:815
+msgid "Convert To Uni_x Format"
+msgstr "Převést na Uni_x formát"
+
+#: src/diffuse/window.py:819
+msgid "_Merge"
+msgstr "S_loučit"
+
+#: src/diffuse/window.py:821
+msgid "Copy Selection _Right"
+msgstr "_Kopírovat výběr doprava"
+
+#: src/diffuse/window.py:822
+msgid "Copy Selection _Left"
+msgstr "K_opírovat výběr doleva"
+
+#: src/diffuse/window.py:824
+msgid "Copy Left _Into Selection"
+msgstr "Ko_pírovat zleva do výběru"
+
+#: src/diffuse/window.py:825
+msgid "Copy Right I_nto Selection"
+msgstr "Kopí_rovat zprava do výběru"
+
+#: src/diffuse/window.py:826
+msgid "_Merge From Left Then Right"
+msgstr "_Sloučit zleva a poté zprava"
+
+#: src/diffuse/window.py:827
+msgid "M_erge From Right Then Left"
+msgstr "S_loučit zprava a poté zleva"
+
+#: src/diffuse/window.py:831
+msgid "_Help"
+msgstr "Nápo_věda"
+
+#: src/diffuse/window.py:833
+msgid "_Help Contents..."
+msgstr "_Zobrazit nápovědu..."
+
+#: src/diffuse/window.py:835
+#, python-format
+msgid "_About %s..."
+msgstr "_O programu %s..."
+
+#: src/diffuse/window.py:847
+msgid "New 2-Way File Merge"
+msgstr "Nové 2směrné slučování"
+
+#: src/diffuse/window.py:848
+msgid "New 3-Way File Merge"
+msgstr "Nové 3směrné slučování"
+
+#: src/diffuse/window.py:850
+msgid "Realign All"
+msgstr "Znovu zarovnat"
+
+#: src/diffuse/window.py:851
+msgid "First Difference"
+msgstr "První rozdíl"
+
+#: src/diffuse/window.py:852
+msgid "Previous Difference"
+msgstr "Předchozí rozdíl"
+
+#: src/diffuse/window.py:853
+msgid "Next Difference"
+msgstr "Další rozdíl"
+
+#: src/diffuse/window.py:854
+msgid "Last Difference"
+msgstr "Poslední rozdíl"
+
+#: src/diffuse/window.py:856
+msgid "Copy Selection Right"
+msgstr "Kopírovat výběr doprava"
+
+#: src/diffuse/window.py:857
+msgid "Copy Selection Left"
+msgstr "Kopírovat výběr doleva"
+
+#: src/diffuse/window.py:858
+msgid "Copy Left Into Selection"
+msgstr "Kopírovat zleva do výběru"
+
+#: src/diffuse/window.py:859
+msgid "Copy Right Into Selection"
+msgstr "Kopírovat zprava do výběru"
+
+#: src/diffuse/window.py:860
+msgid "Merge From Left Then Right"
+msgstr "Sloučit zleva a poté zprava"
+
+#: src/diffuse/window.py:861
+msgid "Merge From Right Then Left"
+msgstr "Sloučit zprava a poté zleva"
+
+#: src/diffuse/window.py:863
+msgid "Undo"
+msgstr "Zpět"
+
+#: src/diffuse/window.py:864
+msgid "Redo"
+msgstr "Znovu"
+
+#: src/diffuse/window.py:950
+msgid "Changes detected"
+msgstr ""
+
+#: src/diffuse/window.py:954
+#, fuzzy, python-format
+msgid ""
+"The file \"%s\" changed on disk.\n"
+"\n"
+"Do you want to reload the file?"
+msgstr "Soubor %s byl změněn. Chcete ho znovu načíst?"
+
+#: src/diffuse/window.py:959
+#, fuzzy, python-format
+msgid ""
+"The following files changed on disk:\n"
+"%s\n"
+"\n"
+"Do you want to reload these files?"
+msgstr "Soubor %s byl změněn. Chcete ho znovu načíst?"
+
+#: src/diffuse/window.py:1078
+msgid "Some files have unsaved changes. Select the files to save before closing."
+msgstr ""
+"Některé změněné soubory nebyly uloženy. Vyberte soubory, které chcete před "
+"zavřením uložit."
+
+#: src/diffuse/window.py:1092
+msgid "Tab"
+msgstr "Panel"
+
+#: src/diffuse/window.py:1097
+msgid "Pane"
+msgstr "Podokno"
+
+#: src/diffuse/window.py:1108
+msgid "Close _Without Saving"
+msgstr "Zavřít _bez uložení"
+
+#: src/diffuse/window.py:1147
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "Zavřením tohoto panelu ukončíte %s."
+
+#: src/diffuse/window.py:1224
+#, python-format
+msgid "File Merge %d"
+msgstr "Slučování %d"
+
+#: src/diffuse/window.py:1344
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "Revize pro %s se nepodařilo načíst."
+
+#: src/diffuse/window.py:1376
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "Při načítání změn %s došlo k chybě."
+
+#: src/diffuse/window.py:1409
+msgid "Open File In New Tab"
+msgstr "Otevřít soubor v novém panelu"
+
+#: src/diffuse/window.py:1432
+msgid "Choose Folder With Modified Files"
+msgstr "Vyberte adresář se změněnými soubory"
+
+#: src/diffuse/window.py:1450
+msgid "No modified files found."
+msgstr "Nebyly nalezeny žádné změněné soubory."
+
+#: src/diffuse/window.py:1456
+msgid "Choose Folder With Commit"
+msgstr "Vyberte adresář se zapsanou revizí"
+
+#: src/diffuse/window.py:1476
+msgid "No committed files found."
+msgstr "Nebyly nalezeny žádné zapsané soubory."
+
+#: src/diffuse/window.py:1512
+msgid "New N-Way File Merge..."
+msgstr "Nové Nsměrné slučování..."
+
+#: src/diffuse/window.py:1513
+msgid "Number of panes: "
+msgstr "Počet podoken: "
+
+#: src/diffuse/window.py:1587
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "Hledaný výraz nebyl nalezen. Pokračovat v hledání od konce souboru?"
+
+#: src/diffuse/window.py:1589
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "Hledaný výraz nebyl nalezen. Pokračovat v hledání od začátku souboru?"
+
+#: src/diffuse/window.py:1762
+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/window.py:1766
+msgid "translator-credits"
+msgstr "Jindřich Šesták <khagaroth@gmail.com>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage:\n"
+#~ "    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"
+#~ "also retrieve revisions of files from several VCSs for comparison and "
+#~ "merging.\n"
+#~ "\n"
+#~ "Help Options:\n"
+#~ "  ( -h | -? | --help )             Display this usage information\n"
+#~ "  ( -v | --version )               Display version and copyright information\n"
+#~ "\n"
+#~ "Configuration Options:\n"
+#~ "  --no-rcfile                      Do not read any resource files\n"
+#~ "  --rcfile <file>                  Specify explicit resource file\n"
+#~ "\n"
+#~ "General Options:\n"
+#~ "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
+#~ "  ( -D | --close-if-same )         Close all tabs with no differences\n"
+#~ "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+#~ "  ( -L | --label ) <label>         Display <label> instead of the file name\n"
+#~ "  ( -m | --modified )              Create a new tab for each modified file\n"
+#~ "  ( -r | --revision ) <rev>        File revision <rev>\n"
+#~ "  ( -s | --separate )              Create a new tab for each file\n"
+#~ "  ( -t | --tab )                   Start a new tab\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    Start with line <line> selected\n"
+#~ "  --null-file                      Create a blank file comparison pane\n"
+#~ "\n"
+#~ "Display Options:\n"
+#~ "  ( -b | --ignore-space-change )   Ignore changes to white space\n"
+#~ "  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
+#~ "  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
+#~ "  ( -i | --ignore-case )           Ignore case differences\n"
+#~ "  ( -w | --ignore-all-space )      Ignore white space differences"
+#~ msgstr ""
+#~ "Použití:\n"
+#~ "    diffuse [ [PARAMETR...] [SOUBOR...] ]...\n"
+#~ "    diffuse ( -h | -? | --help | -v | --version )\n"
+#~ "\n"
+#~ "Diffuse je grafický nástroj pro slučování a porovnávání textových souborů.  "
+#~ "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"
+#~ "Mercurial, Monotone,RCS, Subversion, a SVK.\n"
+#~ "\n"
+#~ "Nápověda:\n"
+#~ "  ( -h | -? | --help )             Zobrazí tuto nápovědu\n"
+#~ "  ( -v | --version )               Zobrazí verzi a licenční údaje\n"
+#~ "\n"
+#~ "Nastavení:\n"
+#~ "  --no-rcfile                      Zakáže načítání zdrojových souborů\n"
+#~ "  --rcfile <file>                  Použije zadaný zdrojový soubor\n"
+#~ "\n"
+#~ "Obecné:\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"
+#~ "  ( -r | --revision ) <rev>        Revize souboru <rev>\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"
+#~ "\n"
+#~ "Zobrazení:\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"
+#~ "  ( -w | --ignore-all-space )      Bude ignorovat změny pokud, jde o "
+#~ "netisknutelné znaky"
diff --git a/po/de.po b/po/de.po
index cf373d1..5e5c61d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse-svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-23 20:00-0400\n"
+"POT-Creation-Date: 2023-04-16 14:09-0400\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"
@@ -33,829 +33,303 @@ 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."
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, and "
+"Subversion repositories."
 msgstr ""
 
-#: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
-msgid "Main window: diff between two files"
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:28
+msgid "Main window"
 msgstr ""
 
-#: src/diffuse/constants.py:25
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:32
+msgid "About window"
+msgstr ""
+
+#: src/diffuse/constants.py:26
 msgid "Copyright"
 msgstr "Urheberrecht"
 
-#: src/diffuse/dialogs.py:40
-msgid "Diffuse is a graphical tool for merging and comparing text files."
+#: src/diffuse/dialogs.py:46 src/diffuse/dialogs.py:89 src/diffuse/dialogs.py:133
+#: src/diffuse/preferences.py:254 src/diffuse/preferences.py:483
+#: src/diffuse/window.py:309 src/diffuse/window.py:1107
+msgid "_Cancel"
 msgstr ""
-"Diffuse ist ein graphisches Werkzeug zum Zusammenführen und Vergleichen von "
-"Textdateien."
 
-#: src/diffuse/dialogs.py:45
-msgid "translator-credits"
-msgstr "Henri Menke <henrimenke4@aim.com>"
-
-#: src/diffuse/dialogs.py:82
+#: src/diffuse/dialogs.py:50
 msgid "Encoding: "
 msgstr "Kodierung: "
 
-#: src/diffuse/dialogs.py:94
+#: src/diffuse/dialogs.py:62
 msgid "Revision: "
 msgstr "Revision: "
 
-#: src/diffuse/dialogs.py:156
+#: src/diffuse/dialogs.py:90 src/diffuse/dialogs.py:134
+#: src/diffuse/preferences.py:255
+msgid "_OK"
+msgstr ""
+
+#: src/diffuse/dialogs.py:130
 msgid "Find..."
 msgstr "Suchen..."
 
-#: src/diffuse/dialogs.py:164
+#: src/diffuse/dialogs.py:140
 msgid "Search For: "
 msgstr "Suchen nach: "
 
-#: src/diffuse/dialogs.py:189
+#: src/diffuse/dialogs.py:165
 msgid "Match Case"
 msgstr "Übereinstimmen von Groß- und Kleinschreibung"
 
-#: src/diffuse/dialogs.py:194
+#: src/diffuse/dialogs.py:170
 msgid "Search Backwards"
 msgstr "Rückwärts suchen"
 
+#: src/diffuse/main.py:53
+msgid "Display version and copyright information"
+msgstr "Version und Copyright anzeigen"
+
+#: src/diffuse/main.py:61
+msgid "Do not read any resource files"
+msgstr "Keine Einstellungsdatei lesen"
+
+#: src/diffuse/main.py:69
+msgid "Specify explicit resource file"
+msgstr "Explizit eine Einstellungsdatei angeben"
+
+#: src/diffuse/main.py:77
+msgid "File revisions <rev-1> and <rev>"
+msgstr "Datei Revisionen <rev-1> und <rev>"
+
 #: src/diffuse/main.py:85
-msgid "Close Tab"
-msgstr "Reiter schließen"
+msgid "Close all tabs with no differences"
+msgstr "Alle Reiter ohne Unterschiede schließen"
 
-#: src/diffuse/main.py:132
-msgid "Open File..."
-msgstr "Datei öffnen..."
+#: src/diffuse/main.py:92
+msgid "Use <codec> to read and write files"
+msgstr "<codec> verwenden zum Lesen und Schreiben von"
 
-#: src/diffuse/main.py:133
-msgid "Reload File"
-msgstr "Datei neu laden"
+#: src/diffuse/main.py:100
+msgid "Display <label> instead of the file name"
+msgstr "<label> anstatt des Dateinamens anzeigen"
 
-#: src/diffuse/main.py:134
-msgid "Save File"
-msgstr "Datei speichern"
+#: src/diffuse/main.py:108
+msgid "Create a new tab for each modified file"
+msgstr "Neuen Reiter für jede modifizierte Datei öffnen"
 
-#: src/diffuse/main.py:135
-msgid "Save File As..."
-msgstr "Datei speichern unter..."
+#: src/diffuse/main.py:115
+msgid "File revision <rev>"
+msgstr "Datei Revision <rev>"
 
-#: src/diffuse/main.py:217
-#, python-format
-msgid "Column %d"
-msgstr "Spalte %d"
+#: src/diffuse/main.py:123
+msgid "Create a new tab for each file"
+msgstr "Neuen Reiter für jede Datei erstellen"
 
-#: src/diffuse/main.py:291
-msgid "Save changes before loading the new file?"
-msgstr "Änderungen speichern vor dem Laden der neuen Datei?"
+#: src/diffuse/main.py:130
+msgid "Start a new tab"
+msgstr "Neuen Reiter öffnen"
 
-#: src/diffuse/main.py:402
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "Fehler beim lesen der Revision %(rev)s von %(file)s."
+#: src/diffuse/main.py:137 src/diffuse/preferences.py:159
+msgid "Version control system search order"
+msgstr "Suchreihenfolge des Versionskontrollsystems"
 
-#: src/diffuse/main.py:405 src/diffuse/main.py:1860
+#: src/diffuse/main.py:145
+msgid "Start with line <line> selected"
+msgstr "Beim Starten Zeile <line> markieren"
+
+#: src/diffuse/main.py:153
+msgid "Create a blank file comparison pane"
+msgstr "Starte mit leerem Datei-Vergleichsfenster"
+
+#: src/diffuse/main.py:160 src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:95
+msgid "Ignore changes to white space"
+msgstr "Änderungen an Leerzeichen ignorieren"
+
+#: src/diffuse/main.py:167
+msgid "Ignore changes in blank lines"
+msgstr "Änderungen an leeren Zeilen ignorieren"
+
+#: src/diffuse/main.py:174 src/diffuse/preferences.py:88
+msgid "Ignore end of line differences"
+msgstr "Unterschiede bei Zeilenumbrüchen ignorieren"
+
+#: src/diffuse/main.py:181 src/diffuse/preferences.py:84
+msgid "Ignore case differences"
+msgstr "Unterschiede bei Groß- und Kleinschreibung ignorieren"
+
+#: src/diffuse/main.py:188 src/diffuse/preferences.py:85
+msgid "Ignore white space differences"
+msgstr "Unterschiede bei Leerzeichen ignorieren"
+
+#: src/diffuse/main.py:191
+msgid ""
+"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 several VCSs for comparison and merging."
+msgstr ""
+
+#: src/diffuse/main.py:247 src/diffuse/window.py:420
 #, python-format
 msgid "Error reading %s."
 msgstr "Fehler beim Lesen von %s."
 
-#: src/diffuse/main.py:427
-msgid "Open File"
-msgstr "Datei öffnen"
-
-#: src/diffuse/main.py:484
-#, python-format
-msgid "The file %s changed on disk. Do you want to reload the file?"
-msgstr "Die Datei %s wurde auf geändert. Wollen Sie die Datei neu laden?"
-
-#: src/diffuse/main.py:510
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "Speichern %(title)s Fenster %(pane)d"
-
-#: src/diffuse/main.py:542
-#, python-format
-msgid "A file named %s already exists. Do you want to overwrite it?"
-msgstr "Eine Datei mit dem Namen %s existiert bereits. Überschreiben?"
-
-#: src/diffuse/main.py:549
-#, 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 ""
-"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:591
-#, python-format
-msgid "Error encoding to %s."
-msgstr "Fehler bei der Kodierung nach %s."
-
-#: src/diffuse/main.py:595 src/diffuse/preferences.py:300
-#, python-format
-msgid "Error writing %s."
-msgstr "Fehler beim Schreiben von %s."
-
-#: src/diffuse/main.py:625
-msgid "Go To Line..."
-msgstr "Gehe zu Zeile..."
-
-#: src/diffuse/main.py:626
-msgid "Line Number: "
-msgstr "Zeilennummer: "
-
-#: src/diffuse/main.py:657
-msgid ""
-"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."
-
-#: src/diffuse/main.py:661
-msgid "Press the escape key to finish editing."
-msgstr "Drücken Sie die Escape Taste um die Bearbeitung zu beenden."
-
-#: src/diffuse/main.py:664
-msgid ""
-"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."
-
-#: src/diffuse/main.py:787
-msgid "_File"
-msgstr "_Datei"
-
-#: src/diffuse/main.py:788
-msgid "_Open File..."
-msgstr "_Öffne Datei..."
-
-#: src/diffuse/main.py:789
-msgid "Open File In New _Tab..."
-msgstr "Datei _in neuem Reiter öffnen..."
-
-#: src/diffuse/main.py:790
-msgid "Open _Modified Files..."
-msgstr "_Bearbeitete Dateien öffnen..."
-
-#: src/diffuse/main.py:791
-msgid "Open Commi_t..."
-msgstr "Revi_sion öffnen..."
-
-#: src/diffuse/main.py:792
-msgid "_Reload File"
-msgstr "Datei _neu laden"
-
-#: src/diffuse/main.py:794
-msgid "_Save File"
-msgstr "Datei _speichern"
-
-#: src/diffuse/main.py:795
-msgid "Save File _As..."
-msgstr "Datei speichern _unter..."
-
-#: src/diffuse/main.py:796
-msgid "Save A_ll"
-msgstr "_Alle speichern"
-
-#: src/diffuse/main.py:798
-msgid "New _2-Way File Merge"
-msgstr "Neues _2-Wege-Datei-Zusammenführen"
-
-#: src/diffuse/main.py:799
-msgid "New _3-Way File Merge"
-msgstr "Neues _3-Wege-Datei-Zusammenführen"
-
-#: src/diffuse/main.py:800
-msgid "New _N-Way File Merge..."
-msgstr "Neues _N-Wege-Datei-Zusammenführen..."
-
-#: src/diffuse/main.py:802
-msgid "_Close Tab"
-msgstr "_Reiter schließen"
-
-#: src/diffuse/main.py:803
-msgid "_Undo Close Tab"
-msgstr "_Reiter schließen rückgängig"
-
-#: src/diffuse/main.py:804
-msgid "_Quit"
-msgstr "_Beenden"
-
-#: src/diffuse/main.py:807
-msgid "_Edit"
-msgstr "_Bearbeiten"
-
-#: src/diffuse/main.py:808
-msgid "_Undo"
-msgstr "_Rückgängig"
-
-#: src/diffuse/main.py:809
-msgid "_Redo"
-msgstr "_Wiederholen"
-
-#: src/diffuse/main.py:811
-msgid "Cu_t"
-msgstr "_Ausschneiden"
-
-#: src/diffuse/main.py:812
-msgid "_Copy"
-msgstr "_Kopieren"
-
-#: src/diffuse/main.py:813
-msgid "_Paste"
-msgstr "_Einfügen"
-
-#: src/diffuse/main.py:815
-msgid "Select _All"
-msgstr "_Alles auswählen"
-
-#: src/diffuse/main.py:816
-msgid "C_lear Edits"
-msgstr "Alle _Änderungen rückgängig"
-
-#: src/diffuse/main.py:817
-msgid "_Dismiss All Edits"
-msgstr "Alle Än_derungen verwerfen"
-
-#: src/diffuse/main.py:819
-msgid "_Find..."
-msgstr "_Suchen..."
-
-#: src/diffuse/main.py:820
-msgid "Find _Next"
-msgstr "_Nächstes suchen"
-
-#: src/diffuse/main.py:821
-msgid "Find Pre_vious"
-msgstr "_Rückwärts suchen"
-
-#: src/diffuse/main.py:822
-msgid "_Go To Line..."
-msgstr "_Gehe zu Zeile..."
-
-#: src/diffuse/main.py:824
-msgid "Pr_eferences..."
-msgstr "_Einstellungen..."
-
-#: src/diffuse/main.py:828
-msgid "None"
-msgstr "Keine"
-
-#: src/diffuse/main.py:846
-msgid "_View"
-msgstr "_Ansicht"
-
-#: src/diffuse/main.py:847
-msgid "_Syntax Highlighting"
-msgstr "_Syntax Hervorhebung"
-
-#: src/diffuse/main.py:849
-msgid "Re_align All"
-msgstr "Alle neu _ausrichten"
-
-#: src/diffuse/main.py:850
-msgid "_Isolate"
-msgstr "_Isolieren"
-
-#: src/diffuse/main.py:852
-msgid "_First Difference"
-msgstr "_Erster Unterschied"
-
-#: src/diffuse/main.py:853
-msgid "_Previous Difference"
-msgstr "_Voriger Unterschied"
-
-#: src/diffuse/main.py:854
-msgid "_Next Difference"
-msgstr "_Nächster Unterschied"
-
-#: src/diffuse/main.py:855
-msgid "_Last Difference"
-msgstr "_Letzter Unterschied"
-
-#: src/diffuse/main.py:857
-msgid "Fir_st Tab"
-msgstr "Er_ster Reiter"
-
-#: src/diffuse/main.py:858
-msgid "Pre_vious Tab"
-msgstr "V_origer Reiter"
-
-#: src/diffuse/main.py:859
-msgid "Next _Tab"
-msgstr "N_ächster Reiter"
-
-#: src/diffuse/main.py:860
-msgid "Las_t Tab"
-msgstr "Letz_ter Reiter"
-
-#: src/diffuse/main.py:862
-msgid "Shift Pane _Right"
-msgstr "Fenster nach _rechts verschieben"
-
-#: src/diffuse/main.py:863
-msgid "Shift Pane _Left"
-msgstr "Fenster nach _links verschieben"
-
-#: src/diffuse/main.py:866
-msgid "F_ormat"
-msgstr "F_ormat"
-
-#: src/diffuse/main.py:867
-msgid "Convert To _Upper Case"
-msgstr "In Großb_uchstaben konvertieren"
-
-#: src/diffuse/main.py:868
-msgid "Convert To _Lower Case"
-msgstr "In K_leinbuchstaben konvertieren"
-
-#: src/diffuse/main.py:870
-msgid "Sort Lines In _Ascending Order"
-msgstr "Zeile in _aufsteigender Reihenfolge sortieren"
-
-#: src/diffuse/main.py:871
-msgid "Sort Lines In D_escending Order"
-msgstr "Zeile in abst_eigender Reihenfolge sortieren"
-
-#: src/diffuse/main.py:873
-msgid "Remove Trailing _White Space"
-msgstr "Entferne angehängte _Leerzeichen"
-
-#: src/diffuse/main.py:874
-msgid "Convert Tabs To _Spaces"
-msgstr "Tabulatoren in Leer_zeichen konvertieren"
-
-#: src/diffuse/main.py:875
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "Vorangestellte Leerzeichen in _Tabulatoren konvertieren"
-
-#: src/diffuse/main.py:877
-msgid "_Increase Indenting"
-msgstr "Einzug er_höhen"
-
-#: src/diffuse/main.py:878
-msgid "De_crease Indenting"
-msgstr "Einzug _vermindern"
-
-#: src/diffuse/main.py:880
-msgid "Convert To _DOS Format"
-msgstr "Ins _DOS Format konvertieren"
-
-#: src/diffuse/main.py:881
-msgid "Convert To _Mac Format"
-msgstr "Ins _Mac Format konvertieren"
-
-#: src/diffuse/main.py:882
-msgid "Convert To Uni_x Format"
-msgstr "Ins Uni_x Format konvertieren"
-
-#: src/diffuse/main.py:885
-msgid "_Merge"
-msgstr "_Zusammenführen"
-
-#: src/diffuse/main.py:886
-msgid "Copy Selection _Right"
-msgstr "Auswahl nach _rechts kopieren"
-
-#: src/diffuse/main.py:887
-msgid "Copy Selection _Left"
-msgstr "Auswahl nach _links kopieren"
-
-#: src/diffuse/main.py:889
-msgid "Copy Left _Into Selection"
-msgstr "Von links _in die Auswahl kopieren"
-
-#: src/diffuse/main.py:890
-msgid "Copy Right I_nto Selection"
-msgstr "Von rechts i_n die Auswahl kopieren"
-
-#: src/diffuse/main.py:891
-msgid "_Merge From Left Then Right"
-msgstr "Zusammenführen von links, dann von rechts"
-
-#: src/diffuse/main.py:892
-msgid "M_erge From Right Then Left"
-msgstr "Zusammenführen von rechts, dann von links"
-
-#: src/diffuse/main.py:895
-msgid "_Help"
-msgstr "_Hilfe"
-
-#: src/diffuse/main.py:896
-msgid "_Help Contents..."
-msgstr "_Inhalt..."
-
-#: src/diffuse/main.py:898
-#, python-format
-msgid "_About %s..."
-msgstr "_Über %s..."
-
-#: src/diffuse/main.py:913
-msgid "New 2-Way File Merge"
-msgstr "Neues 2-Wege-Datei-Zusammenführen"
-
-#: src/diffuse/main.py:914
-msgid "New 3-Way File Merge"
-msgstr "Neues 3-Wege-Datei-Zusammenführen"
-
-#: src/diffuse/main.py:916
-msgid "Realign All"
-msgstr "Alle neu ausrichten"
-
-#: src/diffuse/main.py:917
-msgid "First Difference"
-msgstr "Erster Unterschied"
-
-#: src/diffuse/main.py:918
-msgid "Previous Difference"
-msgstr "Voriger Unterschied"
-
-#: src/diffuse/main.py:919
-msgid "Next Difference"
-msgstr "Nächster Unterschied"
-
-#: src/diffuse/main.py:920
-msgid "Last Difference"
-msgstr "Letzter Unterschied"
-
-#: src/diffuse/main.py:922
-msgid "Copy Selection Right"
-msgstr "Auswahl nach rechts kopieren"
-
-#: src/diffuse/main.py:923
-msgid "Copy Selection Left"
-msgstr "Auswahl nach links kopieren"
-
-#: src/diffuse/main.py:924
-msgid "Copy Left Into Selection"
-msgstr "Von links in die Auswahl kopieren"
-
-#: src/diffuse/main.py:925
-msgid "Copy Right Into Selection"
-msgstr "Von rechts in die Auswahl kopieren"
-
-#: src/diffuse/main.py:926
-msgid "Merge From Left Then Right"
-msgstr "Zusammenführen von links, dann von rechts"
-
-#: src/diffuse/main.py:927
-msgid "Merge From Right Then Left"
-msgstr "Zusammenführen von rechts, dann von links"
-
-#: src/diffuse/main.py:929
-msgid "Undo"
-msgstr "Rückgängig"
-
-#: src/diffuse/main.py:930
-msgid "Redo"
-msgstr "Wiederholen"
-
-#: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
-msgid "Cut"
-msgstr "Ausschneiden"
-
-#: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
-msgid "Copy"
-msgstr "Kopieren"
-
-#: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
-msgid "Paste"
-msgstr "Einfügen"
-
-#: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
-msgid "Clear Edits"
-msgstr "Alle Änderungen rückgängig"
-
-#: src/diffuse/main.py:1057
-msgid "Some files have unsaved changes. Select the files to save before closing."
-msgstr ""
-"Einige Dateien haben ungespeicherte Änderungen. Wählen Sie die Dateien zum "
-"speichern aus, bevor Sie beenden."
-
-#: src/diffuse/main.py:1071
-msgid "Tab"
-msgstr "Reiter"
-
-#: src/diffuse/main.py:1076
-msgid "Pane"
-msgstr "Fenster"
-
-#: src/diffuse/main.py:1087
-msgid "Close _Without Saving"
-msgstr "Ohne speichern schließen"
-
-#: src/diffuse/main.py:1126
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "Schließen des letzten Tabs beendet %s."
-
-#: src/diffuse/main.py:1209
-#, python-format
-msgid "File Merge %d"
-msgstr "Dateien zusammenführen %d"
-
-#: src/diffuse/main.py:1315
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "Fehler beim Empfangen der Revisionen von %s."
-
-#: src/diffuse/main.py:1347
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "Fehler beim Empfangen der Bearbeitungen von %s."
-
-#: src/diffuse/main.py:1380
-msgid "Open File In New Tab"
-msgstr "Datei in neuem Reiter öffnen"
-
-#: src/diffuse/main.py:1403
-msgid "Choose Folder With Modified Files"
-msgstr "Ordner mit bearbeiteten Dateien auswählen"
-
-#: src/diffuse/main.py:1421
-msgid "No modified files found."
-msgstr "Keine bearbeiteten Dateien gefunden."
-
-#: src/diffuse/main.py:1427
-msgid "Choose Folder With Commit"
-msgstr "Ordner mit Revisionen auswählen"
-
-#: src/diffuse/main.py:1447
-msgid "No committed files found."
-msgstr "Keine revidierten Dateien gefunden."
-
-#: src/diffuse/main.py:1483
-msgid "New N-Way File Merge..."
-msgstr "Neues N-Wege-Datei-Zusammenführen..."
-
-#: src/diffuse/main.py:1484
-msgid "Number of panes: "
-msgstr "Anzahl der Fenster: "
-
-#: src/diffuse/main.py:1558
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "Ausdruck nicht gefunden.  Am Ende der Datei fortsetzen?"
-
-#: src/diffuse/main.py:1560
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "Ausdruck nicht gefunden.  Am Anfang der Datei fortsetzen?"
-
-#: src/diffuse/main.py:1781
-#, fuzzy
-msgid ""
-"Usage:\n"
-"    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"
-"also retrieve revisions of files from several VCSs for comparison and merging.\n"
-"\n"
-"Help Options:\n"
-"  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright information\n"
-"\n"
-"Configuration Options:\n"
-"  --no-rcfile                      Do not read any resource files\n"
-"  --rcfile <file>                  Specify explicit resource file\n"
-"\n"
-"General Options:\n"
-"  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
-"  ( -D | --close-if-same )         Close all tabs with no differences\n"
-"  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
-"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
-"  ( -m | --modified )              Create a new tab for each modified file\n"
-"  ( -r | --revision ) <rev>        File revision <rev>\n"
-"  ( -s | --separate )              Create a new tab for each file\n"
-"  ( -t | --tab )                   Start a new tab\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    Start with line <line> selected\n"
-"  --null-file                      Create a blank file comparison pane\n"
-"\n"
-"Display Options:\n"
-"  ( -b | --ignore-space-change )   Ignore changes to white space\n"
-"  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
-"  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
-"  ( -i | --ignore-case )           Ignore case differences\n"
-"  ( -w | --ignore-all-space )      Ignore white space differences"
-msgstr ""
-"Verwendung:\n"
-"    diffuse [ [OPTION...] [DATEI...] ]...\n"
-"    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"
-"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"
-"Depots empfangen um sie zu Vergleichen und zusammenzuführen.\n"
-"\n"
-"Hilfe Optionen:\n"
-"  ( -h | -? | --help )             Diese Information anzeigen\n"
-"  ( -v | --version )               Version und Copyright anzeigen\n"
-"\n"
-"Konfigurations Optionen:\n"
-"  --no-rcfile                      Keine Einstellungsdatei lesen\n"
-"  --rcfile <file>                  Explizit eine Einstellungsdatei angeben\n"
-"\n"
-"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"
-"                                  Dateien\n"
-"  ( -L | --label ) <label>         <label> anstatt des Dateinamens anzeigen\n"
-"  ( -m | --modified )              Neuen Reiter für jede modifizierte Datei "
-"öffnen\n"
-"  ( -r | --revision ) <rev>        Datei Revision <rev>\n"
-"  ( -s | --separate )              Neuen Reiter für jede Datei erstellen\n"
-"  ( -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"
-"\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"
-"  ( -i | --ignore-case )           Unterschiede an Groß- und Kleinschreibung "
-"ignorieren\n"
-"  ( -w | --ignore-all-space )      Unterschiede an Leerzeichen ignorieren"
-
-#: src/diffuse/main.py:1948
+#: src/diffuse/main.py:327
 msgid "Error parsing line number."
 msgstr "Fehler bei der Analyse der Zeilennummer."
 
-#: src/diffuse/main.py:1958
-#, python-format
-msgid "Skipping unknown argument \"%s\"."
-msgstr "Übergehe unbekannten Parameter \"%s\"."
-
-#: src/diffuse/main.py:1966
+#: src/diffuse/main.py:343
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Fehler beim Verarbeiten des Arguments \"%s\".  Unerwartetes Verzeichnis."
 
-#: src/diffuse/preferences.py:80
+#: src/diffuse/preferences.py:75
 msgid "Display"
 msgstr "Anzeige"
 
-#: src/diffuse/preferences.py:83
+#: src/diffuse/preferences.py:78
 msgid "Font"
 msgstr "Schriftart"
 
-#: src/diffuse/preferences.py:84
+#: src/diffuse/preferences.py:79
 msgid "Tab width"
 msgstr "Tabulatorweite"
 
-#: src/diffuse/preferences.py:85
+#: src/diffuse/preferences.py:80
 msgid "Show right margin"
 msgstr "Zeige rechten Rand"
 
-#: src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:81
 msgid "Right margin"
 msgstr "Rechter Rand"
 
-#: src/diffuse/preferences.py:87
+#: src/diffuse/preferences.py:82
 msgid "Show line numbers"
 msgstr "Zeige Zeilennummern"
 
-#: src/diffuse/preferences.py:88
+#: src/diffuse/preferences.py:83
 msgid "Show white space characters"
 msgstr "Leerzeichen anzeigen"
 
-#: src/diffuse/preferences.py:89
-msgid "Ignore case differences"
-msgstr "Unterschiede bei Groß- und Kleinschreibung ignorieren"
-
-#: src/diffuse/preferences.py:90
-msgid "Ignore white space differences"
-msgstr "Unterschiede bei Leerzeichen ignorieren"
-
-#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100
-msgid "Ignore changes to white space"
-msgstr "Änderungen an Leerzeichen ignorieren"
-
-#: src/diffuse/preferences.py:92
+#: src/diffuse/preferences.py:87
 msgid "Ignore blank line differences"
 msgstr "Unterschiede bei leeren Zeilen ignorieren"
 
-#: src/diffuse/preferences.py:93
-msgid "Ignore end of line differences"
-msgstr "Unterschiede bei Zeilenumbrüchen ignorieren"
-
-#: src/diffuse/preferences.py:95
+#: src/diffuse/preferences.py:90
 msgid "Alignment"
 msgstr "Ausrichtung"
 
-#: src/diffuse/preferences.py:98
+#: src/diffuse/preferences.py:93
 msgid "Ignore case"
 msgstr "Groß- und Kleinschreibung ignorieren"
 
-#: src/diffuse/preferences.py:99
+#: src/diffuse/preferences.py:94
 msgid "Ignore white space"
 msgstr "Leerzeichen ignorieren"
 
-#: src/diffuse/preferences.py:101
+#: src/diffuse/preferences.py:96
 msgid "Ignore blank lines"
 msgstr "Leere Zeilen ignorieren"
 
-#: src/diffuse/preferences.py:102
+#: src/diffuse/preferences.py:97
 msgid "Ignore end of line characters"
 msgstr "Zeilenumbrüche ignorieren"
 
-#: src/diffuse/preferences.py:104
+#: src/diffuse/preferences.py:99
 msgid "Editor"
 msgstr "Editor"
 
-#: src/diffuse/preferences.py:107
+#: src/diffuse/preferences.py:102
 msgid "Auto indent"
 msgstr "Automatischer Einzug"
 
-#: src/diffuse/preferences.py:108
+#: src/diffuse/preferences.py:103
 msgid "Expand tabs to spaces"
 msgstr "Tabulatoren zu Leerzeichen erweitern"
 
-#: src/diffuse/preferences.py:109
+#: src/diffuse/preferences.py:104
 msgid "Soft tab width"
 msgstr "Weiche Tabulatorweite"
 
-#: src/diffuse/preferences.py:111
+#: src/diffuse/preferences.py:106
 msgid "Tabs"
 msgstr "Reiter"
 
-#: src/diffuse/preferences.py:114
+#: src/diffuse/preferences.py:109
 msgid "Default panes"
 msgstr "Standard Fenster"
 
-#: src/diffuse/preferences.py:115
+#: src/diffuse/preferences.py:110
 msgid "Always show the tab bar"
 msgstr "Reiter-Leiste immer anzeigen"
 
-#: src/diffuse/preferences.py:116
+#: src/diffuse/preferences.py:111
 #, 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:118
+#: src/diffuse/preferences.py:113
 msgid "Regional Settings"
 msgstr "Lokalisierung"
 
-#: src/diffuse/preferences.py:121
+#: src/diffuse/preferences.py:116
 msgid "Default codec"
 msgstr "Standardkodierung"
 
-#: src/diffuse/preferences.py:122
+#: src/diffuse/preferences.py:117
 msgid "Order of codecs used to identify encoding"
 msgstr "Reihenfolge der Chiffren um die Kodierung zu erkennen"
 
-#: src/diffuse/preferences.py:143
+#: src/diffuse/preferences.py:138
 msgid "Cygwin"
 msgstr "Cygwin"
 
-#: src/diffuse/preferences.py:145
+#: src/diffuse/preferences.py:140
 msgid "Root directory"
 msgstr "Hauptverzeichnis"
 
-#: src/diffuse/preferences.py:146
+#: src/diffuse/preferences.py:141
 msgid "Cygdrive prefix"
 msgstr "Cygdrive Präfix"
 
-#: src/diffuse/preferences.py:165
-msgid "Version control system search order"
-msgstr "Suchreihenfolge des Versionskontrollsystems"
-
-#: src/diffuse/preferences.py:173
+#: src/diffuse/preferences.py:167
 msgid "\"co\" command"
 msgstr "\"co\" Befehl"
 
-#: src/diffuse/preferences.py:174
+#: src/diffuse/preferences.py:168
 msgid "\"rlog\" command"
 msgstr "\"rlog\" Befehl"
 
-#: src/diffuse/preferences.py:176
+#: src/diffuse/preferences.py:170
 msgid "Command"
 msgstr "Befehl"
 
-#: src/diffuse/preferences.py:182
+#: src/diffuse/preferences.py:176
 msgid "Launch from a Bash login shell"
 msgstr "Aus einer Bash login shell starten"
 
-#: src/diffuse/preferences.py:189
+#: src/diffuse/preferences.py:183
 msgid "Update paths for Cygwin"
 msgstr "Pfade für Cygwin aktualisieren"
 
-#: src/diffuse/preferences.py:194
+#: src/diffuse/preferences.py:188
 msgid "Version Control"
 msgstr "Versionsverwaltung"
 
-#: src/diffuse/preferences.py:259
+#: src/diffuse/preferences.py:253
 msgid "Preferences"
 msgstr "Einstellungen"
 
+#: src/diffuse/preferences.py:294 src/diffuse/window.py:580
+#, python-format
+msgid "Error writing %s."
+msgstr "Fehler beim Schreiben von %s."
+
+#: src/diffuse/preferences.py:483 src/diffuse/window.py:446
+#: src/diffuse/window.py:1413 src/diffuse/window.py:1436 src/diffuse/window.py:1459
+msgid "_Open"
+msgstr ""
+
 #: src/diffuse/resources.py:242 src/diffuse/resources.py:246
 #: src/diffuse/resources.py:249
 #, python-brace-format
@@ -941,16 +415,11 @@ msgstr "Fehler bei der Analyse der Zeilen {line} von {file}."
 msgid "Auto Detect"
 msgstr "Automatische Erkennung"
 
-#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97
+#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:96
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "Fehler bei der Analyse der Revision %s."
 
-#: src/diffuse/vcs/vcs_registry.py:238
-#, python-format
-msgid "Error parsing %s."
-msgstr "Fehler bei der Analyse %s."
-
 #: src/diffuse/widgets.py:1857
 msgid "Align with Selection"
 msgstr "Ausrichten an der Auswahl"
@@ -963,10 +432,648 @@ msgstr "Isolieren"
 msgid "Merge Selection"
 msgstr "Auswahl zusammenführen"
 
+#: src/diffuse/widgets.py:1861 src/diffuse/window.py:865
+msgid "Cut"
+msgstr "Ausschneiden"
+
+#: src/diffuse/widgets.py:1862 src/diffuse/window.py:866
+msgid "Copy"
+msgstr "Kopieren"
+
+#: src/diffuse/widgets.py:1863 src/diffuse/window.py:867
+msgid "Paste"
+msgstr "Einfügen"
+
 #: src/diffuse/widgets.py:1865
 msgid "Select All"
 msgstr "Alles auswählen"
 
+#: src/diffuse/widgets.py:1866 src/diffuse/window.py:868
+msgid "Clear Edits"
+msgstr "Alle Änderungen rückgängig"
+
 #: src/diffuse/widgets.py:1868
 msgid "Swap with Selected Pane"
 msgstr "Mit ausgewähltem Fenster tauschen"
+
+#: src/diffuse/window.py:83
+msgid "Close Tab"
+msgstr "Reiter schließen"
+
+#: src/diffuse/window.py:126
+msgid "Open File..."
+msgstr "Datei öffnen..."
+
+#: src/diffuse/window.py:127
+msgid "Reload File"
+msgstr "Datei neu laden"
+
+#: src/diffuse/window.py:128
+msgid "Save File"
+msgstr "Datei speichern"
+
+#: src/diffuse/window.py:129
+msgid "Save File As..."
+msgstr "Datei speichern unter..."
+
+#: src/diffuse/window.py:228
+#, python-format
+msgid "Column %d"
+msgstr "Spalte %d"
+
+#: src/diffuse/window.py:306
+msgid "Save changes before loading the new file?"
+msgstr "Änderungen speichern vor dem Laden der neuen Datei?"
+
+#: src/diffuse/window.py:310
+msgid "_No"
+msgstr ""
+
+#: src/diffuse/window.py:311
+msgid "_Yes"
+msgstr ""
+
+#: src/diffuse/window.py:417
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "Fehler beim lesen der Revision %(rev)s von %(file)s."
+
+#: src/diffuse/window.py:442
+msgid "Open File"
+msgstr "Datei öffnen"
+
+#: src/diffuse/window.py:495
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "Speichern %(title)s Fenster %(pane)d"
+
+#: src/diffuse/window.py:499 src/diffuse/window.py:1111
+#, fuzzy
+msgid "_Save"
+msgstr "Datei _speichern"
+
+#: src/diffuse/window.py:527
+#, python-format
+msgid "A file named %s already exists. Do you want to overwrite it?"
+msgstr "Eine Datei mit dem Namen %s existiert bereits. Überschreiben?"
+
+#: src/diffuse/window.py:534
+#, 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 ""
+"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/window.py:576
+#, python-format
+msgid "Error encoding to %s."
+msgstr "Fehler bei der Kodierung nach %s."
+
+#: src/diffuse/window.py:610
+msgid "Go To Line..."
+msgstr "Gehe zu Zeile..."
+
+#: src/diffuse/window.py:611
+msgid "Line Number: "
+msgstr "Zeilennummer: "
+
+#: src/diffuse/window.py:642
+msgid ""
+"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."
+
+#: src/diffuse/window.py:646
+msgid "Press the escape key to finish editing."
+msgstr "Drücken Sie die Escape Taste um die Bearbeitung zu beenden."
+
+#: src/diffuse/window.py:649
+msgid ""
+"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."
+
+#: src/diffuse/window.py:710
+msgid "_File"
+msgstr "_Datei"
+
+#: src/diffuse/window.py:712
+msgid "_Open File..."
+msgstr "_Öffne Datei..."
+
+#: src/diffuse/window.py:713
+msgid "Open File In New _Tab..."
+msgstr "Datei _in neuem Reiter öffnen..."
+
+#: src/diffuse/window.py:714
+msgid "Open _Modified Files..."
+msgstr "_Bearbeitete Dateien öffnen..."
+
+#: src/diffuse/window.py:715
+msgid "Open Commi_t..."
+msgstr "Revi_sion öffnen..."
+
+#: src/diffuse/window.py:716
+msgid "_Reload File"
+msgstr "Datei _neu laden"
+
+#: src/diffuse/window.py:718
+msgid "_Save File"
+msgstr "Datei _speichern"
+
+#: src/diffuse/window.py:719
+msgid "Save File _As..."
+msgstr "Datei speichern _unter..."
+
+#: src/diffuse/window.py:720
+msgid "Save A_ll"
+msgstr "_Alle speichern"
+
+#: src/diffuse/window.py:722
+msgid "New _2-Way File Merge"
+msgstr "Neues _2-Wege-Datei-Zusammenführen"
+
+#: src/diffuse/window.py:723
+msgid "New _3-Way File Merge"
+msgstr "Neues _3-Wege-Datei-Zusammenführen"
+
+#: src/diffuse/window.py:724
+msgid "New _N-Way File Merge..."
+msgstr "Neues _N-Wege-Datei-Zusammenführen..."
+
+#: src/diffuse/window.py:726
+msgid "_Close Tab"
+msgstr "_Reiter schließen"
+
+#: src/diffuse/window.py:727
+msgid "_Undo Close Tab"
+msgstr "_Reiter schließen rückgängig"
+
+#: src/diffuse/window.py:728
+msgid "_Quit"
+msgstr "_Beenden"
+
+#: src/diffuse/window.py:732
+msgid "_Edit"
+msgstr "_Bearbeiten"
+
+#: src/diffuse/window.py:734
+msgid "_Undo"
+msgstr "_Rückgängig"
+
+#: src/diffuse/window.py:735
+msgid "_Redo"
+msgstr "_Wiederholen"
+
+#: src/diffuse/window.py:737
+msgid "Cu_t"
+msgstr "_Ausschneiden"
+
+#: src/diffuse/window.py:738
+msgid "_Copy"
+msgstr "_Kopieren"
+
+#: src/diffuse/window.py:739
+msgid "_Paste"
+msgstr "_Einfügen"
+
+#: src/diffuse/window.py:741
+msgid "Select _All"
+msgstr "_Alles auswählen"
+
+#: src/diffuse/window.py:742
+msgid "C_lear Edits"
+msgstr "Alle _Änderungen rückgängig"
+
+#: src/diffuse/window.py:743
+msgid "_Dismiss All Edits"
+msgstr "Alle Än_derungen verwerfen"
+
+#: src/diffuse/window.py:745
+msgid "_Find..."
+msgstr "_Suchen..."
+
+#: src/diffuse/window.py:746
+msgid "Find _Next"
+msgstr "_Nächstes suchen"
+
+#: src/diffuse/window.py:747
+msgid "Find Pre_vious"
+msgstr "_Rückwärts suchen"
+
+#: src/diffuse/window.py:748
+msgid "_Go To Line..."
+msgstr "_Gehe zu Zeile..."
+
+#: src/diffuse/window.py:750
+msgid "Pr_eferences..."
+msgstr "_Einstellungen..."
+
+#: src/diffuse/window.py:754
+msgid "None"
+msgstr "Keine"
+
+#: src/diffuse/window.py:776
+msgid "_View"
+msgstr "_Ansicht"
+
+#: src/diffuse/window.py:778
+msgid "_Syntax Highlighting"
+msgstr "_Syntax Hervorhebung"
+
+#: src/diffuse/window.py:780
+msgid "Re_align All"
+msgstr "Alle neu _ausrichten"
+
+#: src/diffuse/window.py:781
+msgid "_Isolate"
+msgstr "_Isolieren"
+
+#: src/diffuse/window.py:783
+msgid "_First Difference"
+msgstr "_Erster Unterschied"
+
+#: src/diffuse/window.py:784
+msgid "_Previous Difference"
+msgstr "_Voriger Unterschied"
+
+#: src/diffuse/window.py:785
+msgid "_Next Difference"
+msgstr "_Nächster Unterschied"
+
+#: src/diffuse/window.py:786
+msgid "_Last Difference"
+msgstr "_Letzter Unterschied"
+
+#: src/diffuse/window.py:788
+msgid "Fir_st Tab"
+msgstr "Er_ster Reiter"
+
+#: src/diffuse/window.py:789
+msgid "Pre_vious Tab"
+msgstr "V_origer Reiter"
+
+#: src/diffuse/window.py:790
+msgid "Next _Tab"
+msgstr "N_ächster Reiter"
+
+#: src/diffuse/window.py:791
+msgid "Las_t Tab"
+msgstr "Letz_ter Reiter"
+
+#: src/diffuse/window.py:793
+msgid "Shift Pane _Right"
+msgstr "Fenster nach _rechts verschieben"
+
+#: src/diffuse/window.py:794
+msgid "Shift Pane _Left"
+msgstr "Fenster nach _links verschieben"
+
+#: src/diffuse/window.py:798
+msgid "F_ormat"
+msgstr "F_ormat"
+
+#: src/diffuse/window.py:800
+msgid "Convert To _Upper Case"
+msgstr "In Großb_uchstaben konvertieren"
+
+#: src/diffuse/window.py:801
+msgid "Convert To _Lower Case"
+msgstr "In K_leinbuchstaben konvertieren"
+
+#: src/diffuse/window.py:803
+msgid "Sort Lines In _Ascending Order"
+msgstr "Zeile in _aufsteigender Reihenfolge sortieren"
+
+#: src/diffuse/window.py:804
+msgid "Sort Lines In D_escending Order"
+msgstr "Zeile in abst_eigender Reihenfolge sortieren"
+
+#: src/diffuse/window.py:806
+msgid "Remove Trailing _White Space"
+msgstr "Entferne angehängte _Leerzeichen"
+
+#: src/diffuse/window.py:807
+msgid "Convert Tabs To _Spaces"
+msgstr "Tabulatoren in Leer_zeichen konvertieren"
+
+#: src/diffuse/window.py:808
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "Vorangestellte Leerzeichen in _Tabulatoren konvertieren"
+
+#: src/diffuse/window.py:810
+msgid "_Increase Indenting"
+msgstr "Einzug er_höhen"
+
+#: src/diffuse/window.py:811
+msgid "De_crease Indenting"
+msgstr "Einzug _vermindern"
+
+#: src/diffuse/window.py:813
+msgid "Convert To _DOS Format"
+msgstr "Ins _DOS Format konvertieren"
+
+#: src/diffuse/window.py:814
+msgid "Convert To _Mac Format"
+msgstr "Ins _Mac Format konvertieren"
+
+#: src/diffuse/window.py:815
+msgid "Convert To Uni_x Format"
+msgstr "Ins Uni_x Format konvertieren"
+
+#: src/diffuse/window.py:819
+msgid "_Merge"
+msgstr "_Zusammenführen"
+
+#: src/diffuse/window.py:821
+msgid "Copy Selection _Right"
+msgstr "Auswahl nach _rechts kopieren"
+
+#: src/diffuse/window.py:822
+msgid "Copy Selection _Left"
+msgstr "Auswahl nach _links kopieren"
+
+#: src/diffuse/window.py:824
+msgid "Copy Left _Into Selection"
+msgstr "Von links _in die Auswahl kopieren"
+
+#: src/diffuse/window.py:825
+msgid "Copy Right I_nto Selection"
+msgstr "Von rechts i_n die Auswahl kopieren"
+
+#: src/diffuse/window.py:826
+msgid "_Merge From Left Then Right"
+msgstr "Zusammenführen von links, dann von rechts"
+
+#: src/diffuse/window.py:827
+msgid "M_erge From Right Then Left"
+msgstr "Zusammenführen von rechts, dann von links"
+
+#: src/diffuse/window.py:831
+msgid "_Help"
+msgstr "_Hilfe"
+
+#: src/diffuse/window.py:833
+msgid "_Help Contents..."
+msgstr "_Inhalt..."
+
+#: src/diffuse/window.py:835
+#, python-format
+msgid "_About %s..."
+msgstr "_Über %s..."
+
+#: src/diffuse/window.py:847
+msgid "New 2-Way File Merge"
+msgstr "Neues 2-Wege-Datei-Zusammenführen"
+
+#: src/diffuse/window.py:848
+msgid "New 3-Way File Merge"
+msgstr "Neues 3-Wege-Datei-Zusammenführen"
+
+#: src/diffuse/window.py:850
+msgid "Realign All"
+msgstr "Alle neu ausrichten"
+
+#: src/diffuse/window.py:851
+msgid "First Difference"
+msgstr "Erster Unterschied"
+
+#: src/diffuse/window.py:852
+msgid "Previous Difference"
+msgstr "Voriger Unterschied"
+
+#: src/diffuse/window.py:853
+msgid "Next Difference"
+msgstr "Nächster Unterschied"
+
+#: src/diffuse/window.py:854
+msgid "Last Difference"
+msgstr "Letzter Unterschied"
+
+#: src/diffuse/window.py:856
+msgid "Copy Selection Right"
+msgstr "Auswahl nach rechts kopieren"
+
+#: src/diffuse/window.py:857
+msgid "Copy Selection Left"
+msgstr "Auswahl nach links kopieren"
+
+#: src/diffuse/window.py:858
+msgid "Copy Left Into Selection"
+msgstr "Von links in die Auswahl kopieren"
+
+#: src/diffuse/window.py:859
+msgid "Copy Right Into Selection"
+msgstr "Von rechts in die Auswahl kopieren"
+
+#: src/diffuse/window.py:860
+msgid "Merge From Left Then Right"
+msgstr "Zusammenführen von links, dann von rechts"
+
+#: src/diffuse/window.py:861
+msgid "Merge From Right Then Left"
+msgstr "Zusammenführen von rechts, dann von links"
+
+#: src/diffuse/window.py:863
+msgid "Undo"
+msgstr "Rückgängig"
+
+#: src/diffuse/window.py:864
+msgid "Redo"
+msgstr "Wiederholen"
+
+#: src/diffuse/window.py:950
+msgid "Changes detected"
+msgstr ""
+
+#: src/diffuse/window.py:954
+#, fuzzy, python-format
+msgid ""
+"The file \"%s\" changed on disk.\n"
+"\n"
+"Do you want to reload the file?"
+msgstr "Die Datei %s wurde auf geändert. Wollen Sie die Datei neu laden?"
+
+#: src/diffuse/window.py:959
+#, fuzzy, python-format
+msgid ""
+"The following files changed on disk:\n"
+"%s\n"
+"\n"
+"Do you want to reload these files?"
+msgstr "Die Datei %s wurde auf geändert. Wollen Sie die Datei neu laden?"
+
+#: src/diffuse/window.py:1078
+msgid "Some files have unsaved changes. Select the files to save before closing."
+msgstr ""
+"Einige Dateien haben ungespeicherte Änderungen. Wählen Sie die Dateien zum "
+"speichern aus, bevor Sie beenden."
+
+#: src/diffuse/window.py:1092
+msgid "Tab"
+msgstr "Reiter"
+
+#: src/diffuse/window.py:1097
+msgid "Pane"
+msgstr "Fenster"
+
+#: src/diffuse/window.py:1108
+msgid "Close _Without Saving"
+msgstr "Ohne speichern schließen"
+
+#: src/diffuse/window.py:1147
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "Schließen des letzten Tabs beendet %s."
+
+#: src/diffuse/window.py:1224
+#, python-format
+msgid "File Merge %d"
+msgstr "Dateien zusammenführen %d"
+
+#: src/diffuse/window.py:1344
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "Fehler beim Empfangen der Revisionen von %s."
+
+#: src/diffuse/window.py:1376
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "Fehler beim Empfangen der Bearbeitungen von %s."
+
+#: src/diffuse/window.py:1409
+msgid "Open File In New Tab"
+msgstr "Datei in neuem Reiter öffnen"
+
+#: src/diffuse/window.py:1432
+msgid "Choose Folder With Modified Files"
+msgstr "Ordner mit bearbeiteten Dateien auswählen"
+
+#: src/diffuse/window.py:1450
+msgid "No modified files found."
+msgstr "Keine bearbeiteten Dateien gefunden."
+
+#: src/diffuse/window.py:1456
+msgid "Choose Folder With Commit"
+msgstr "Ordner mit Revisionen auswählen"
+
+#: src/diffuse/window.py:1476
+msgid "No committed files found."
+msgstr "Keine revidierten Dateien gefunden."
+
+#: src/diffuse/window.py:1512
+msgid "New N-Way File Merge..."
+msgstr "Neues N-Wege-Datei-Zusammenführen..."
+
+#: src/diffuse/window.py:1513
+msgid "Number of panes: "
+msgstr "Anzahl der Fenster: "
+
+#: src/diffuse/window.py:1587
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "Ausdruck nicht gefunden.  Am Ende der Datei fortsetzen?"
+
+#: src/diffuse/window.py:1589
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "Ausdruck nicht gefunden.  Am Anfang der Datei fortsetzen?"
+
+#: src/diffuse/window.py:1762
+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/window.py:1766
+msgid "translator-credits"
+msgstr "Henri Menke <henrimenke4@aim.com>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage:\n"
+#~ "    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"
+#~ "also retrieve revisions of files from several VCSs for comparison and "
+#~ "merging.\n"
+#~ "\n"
+#~ "Help Options:\n"
+#~ "  ( -h | -? | --help )             Display this usage information\n"
+#~ "  ( -v | --version )               Display version and copyright information\n"
+#~ "\n"
+#~ "Configuration Options:\n"
+#~ "  --no-rcfile                      Do not read any resource files\n"
+#~ "  --rcfile <file>                  Specify explicit resource file\n"
+#~ "\n"
+#~ "General Options:\n"
+#~ "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
+#~ "  ( -D | --close-if-same )         Close all tabs with no differences\n"
+#~ "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+#~ "  ( -L | --label ) <label>         Display <label> instead of the file name\n"
+#~ "  ( -m | --modified )              Create a new tab for each modified file\n"
+#~ "  ( -r | --revision ) <rev>        File revision <rev>\n"
+#~ "  ( -s | --separate )              Create a new tab for each file\n"
+#~ "  ( -t | --tab )                   Start a new tab\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    Start with line <line> selected\n"
+#~ "  --null-file                      Create a blank file comparison pane\n"
+#~ "\n"
+#~ "Display Options:\n"
+#~ "  ( -b | --ignore-space-change )   Ignore changes to white space\n"
+#~ "  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
+#~ "  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
+#~ "  ( -i | --ignore-case )           Ignore case differences\n"
+#~ "  ( -w | --ignore-all-space )      Ignore white space differences"
+#~ msgstr ""
+#~ "Verwendung:\n"
+#~ "    diffuse [ [OPTION...] [DATEI...] ]...\n"
+#~ "    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"
+#~ "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"
+#~ "Depots empfangen um sie zu Vergleichen und zusammenzuführen.\n"
+#~ "\n"
+#~ "Hilfe Optionen:\n"
+#~ "  ( -h | -? | --help )             Diese Information anzeigen\n"
+#~ "  ( -v | --version )               Version und Copyright anzeigen\n"
+#~ "\n"
+#~ "Konfigurations Optionen:\n"
+#~ "  --no-rcfile                      Keine Einstellungsdatei lesen\n"
+#~ "  --rcfile <file>                  Explizit eine Einstellungsdatei angeben\n"
+#~ "\n"
+#~ "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"
+#~ "                                  Dateien\n"
+#~ "  ( -L | --label ) <label>         <label> anstatt des Dateinamens anzeigen\n"
+#~ "  ( -m | --modified )              Neuen Reiter für jede modifizierte Datei "
+#~ "öffnen\n"
+#~ "  ( -r | --revision ) <rev>        Datei Revision <rev>\n"
+#~ "  ( -s | --separate )              Neuen Reiter für jede Datei erstellen\n"
+#~ "  ( -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"
+#~ "\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"
+#~ "  ( -i | --ignore-case )           Unterschiede an Groß- und Kleinschreibung "
+#~ "ignorieren\n"
+#~ "  ( -w | --ignore-all-space )      Unterschiede an Leerzeichen ignorieren"
diff --git a/po/diffuse.pot b/po/diffuse.pot
index 48a0c8e..aed0804 100644
--- a/po/diffuse.pot
+++ b/po/diffuse.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-14 16:24-0500\n"
+"POT-Creation-Date: 2023-04-16 14:09-0400\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"
@@ -30,656 +30,135 @@ 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."
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, and "
+"Subversion repositories."
 msgstr ""
 
-#: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
-msgid "Main window: diff between two files"
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:28
+msgid "Main window"
 msgstr ""
 
-#: src/diffuse/constants.py:25
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:32
+msgid "About window"
+msgstr ""
+
+#: src/diffuse/constants.py:26
 msgid "Copyright"
 msgstr ""
 
-#: src/diffuse/dialogs.py:41
-msgid "Diffuse is a graphical tool for merging and comparing text files."
+#: src/diffuse/dialogs.py:46 src/diffuse/dialogs.py:89 src/diffuse/dialogs.py:133
+#: src/diffuse/preferences.py:254 src/diffuse/preferences.py:483
+#: src/diffuse/window.py:309 src/diffuse/window.py:1107
+msgid "_Cancel"
 msgstr ""
 
-#: src/diffuse/dialogs.py:46
-msgid "translator-credits"
-msgstr ""
-
-#: src/diffuse/dialogs.py:83
+#: src/diffuse/dialogs.py:50
 msgid "Encoding: "
 msgstr ""
 
-#: src/diffuse/dialogs.py:95
+#: src/diffuse/dialogs.py:62
 msgid "Revision: "
 msgstr ""
 
-#: src/diffuse/dialogs.py:163
+#: src/diffuse/dialogs.py:90 src/diffuse/dialogs.py:134
+#: src/diffuse/preferences.py:255
+msgid "_OK"
+msgstr ""
+
+#: src/diffuse/dialogs.py:130
 msgid "Find..."
 msgstr ""
 
-#: src/diffuse/dialogs.py:173
+#: src/diffuse/dialogs.py:140
 msgid "Search For: "
 msgstr ""
 
-#: src/diffuse/dialogs.py:198
+#: src/diffuse/dialogs.py:165
 msgid "Match Case"
 msgstr ""
 
-#: src/diffuse/dialogs.py:203
+#: src/diffuse/dialogs.py:170
 msgid "Search Backwards"
 msgstr ""
 
-#: src/diffuse/main.py:84
-msgid "Close Tab"
+#: src/diffuse/main.py:53
+msgid "Display version and copyright information"
 msgstr ""
 
-#: src/diffuse/main.py:131
-msgid "Open File..."
-msgstr ""
-
-#: src/diffuse/main.py:132
-msgid "Reload File"
-msgstr ""
-
-#: src/diffuse/main.py:133
-msgid "Save File"
-msgstr ""
-
-#: src/diffuse/main.py:134
-msgid "Save File As..."
-msgstr ""
-
-#: src/diffuse/main.py:229
-#, python-format
-msgid "Column %d"
-msgstr ""
-
-#: src/diffuse/main.py:303
-msgid "Save changes before loading the new file?"
-msgstr ""
-
-#: src/diffuse/main.py:414
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr ""
-
-#: src/diffuse/main.py:417 src/diffuse/main.py:2004
-#, python-format
-msgid "Error reading %s."
-msgstr ""
-
-#: src/diffuse/main.py:439
-msgid "Open File"
-msgstr ""
-
-#: src/diffuse/main.py:492
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr ""
-
-#: src/diffuse/main.py:524
-#, python-format
-msgid "A file named %s already exists. Do you want to overwrite it?"
-msgstr ""
-
-#: src/diffuse/main.py:531
-#, 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 ""
-
-#: src/diffuse/main.py:573
-#, python-format
-msgid "Error encoding to %s."
-msgstr ""
-
-#: src/diffuse/main.py:577 src/diffuse/preferences.py:300
-#, python-format
-msgid "Error writing %s."
-msgstr ""
-
-#: src/diffuse/main.py:607
-msgid "Go To Line..."
-msgstr ""
-
-#: src/diffuse/main.py:608
-msgid "Line Number: "
-msgstr ""
-
-#: src/diffuse/main.py:639
-msgid ""
-"Press the enter key or double click to edit. Press the space bar or use the RMB "
-"menu to manually align."
-msgstr ""
-
-#: src/diffuse/main.py:643
-msgid "Press the escape key to finish editing."
-msgstr ""
-
-#: src/diffuse/main.py:646
-msgid ""
-"Select target line and press the space bar to align. Press the escape key to "
-"cancel."
-msgstr ""
-
-#: src/diffuse/main.py:768
-msgid "_File"
-msgstr ""
-
-#: src/diffuse/main.py:770
-msgid "_Open File..."
-msgstr ""
-
-#: src/diffuse/main.py:771
-msgid "Open File In New _Tab..."
-msgstr ""
-
-#: src/diffuse/main.py:772
-msgid "Open _Modified Files..."
-msgstr ""
-
-#: src/diffuse/main.py:773
-msgid "Open Commi_t..."
-msgstr ""
-
-#: src/diffuse/main.py:774
-msgid "_Reload File"
-msgstr ""
-
-#: src/diffuse/main.py:776
-msgid "_Save File"
-msgstr ""
-
-#: src/diffuse/main.py:777
-msgid "Save File _As..."
-msgstr ""
-
-#: src/diffuse/main.py:778
-msgid "Save A_ll"
-msgstr ""
-
-#: src/diffuse/main.py:780
-msgid "New _2-Way File Merge"
-msgstr ""
-
-#: src/diffuse/main.py:781
-msgid "New _3-Way File Merge"
-msgstr ""
-
-#: src/diffuse/main.py:782
-msgid "New _N-Way File Merge..."
-msgstr ""
-
-#: src/diffuse/main.py:784
-msgid "_Close Tab"
-msgstr ""
-
-#: src/diffuse/main.py:785
-msgid "_Undo Close Tab"
-msgstr ""
-
-#: src/diffuse/main.py:786
-msgid "_Quit"
-msgstr ""
-
-#: src/diffuse/main.py:790
-msgid "_Edit"
-msgstr ""
-
-#: src/diffuse/main.py:792
-msgid "_Undo"
-msgstr ""
-
-#: src/diffuse/main.py:793
-msgid "_Redo"
-msgstr ""
-
-#: src/diffuse/main.py:795
-msgid "Cu_t"
-msgstr ""
-
-#: src/diffuse/main.py:796
-msgid "_Copy"
-msgstr ""
-
-#: src/diffuse/main.py:797
-msgid "_Paste"
-msgstr ""
-
-#: src/diffuse/main.py:799
-msgid "Select _All"
-msgstr ""
-
-#: src/diffuse/main.py:800
-msgid "C_lear Edits"
-msgstr ""
-
-#: src/diffuse/main.py:801
-msgid "_Dismiss All Edits"
-msgstr ""
-
-#: src/diffuse/main.py:803
-msgid "_Find..."
-msgstr ""
-
-#: src/diffuse/main.py:804
-msgid "Find _Next"
-msgstr ""
-
-#: src/diffuse/main.py:805
-msgid "Find Pre_vious"
-msgstr ""
-
-#: src/diffuse/main.py:806
-msgid "_Go To Line..."
-msgstr ""
-
-#: src/diffuse/main.py:808
-msgid "Pr_eferences..."
-msgstr ""
-
-#: src/diffuse/main.py:812
-msgid "None"
-msgstr ""
-
-#: src/diffuse/main.py:834
-msgid "_View"
-msgstr ""
-
-#: src/diffuse/main.py:836
-msgid "_Syntax Highlighting"
-msgstr ""
-
-#: src/diffuse/main.py:838
-msgid "Re_align All"
-msgstr ""
-
-#: src/diffuse/main.py:839
-msgid "_Isolate"
-msgstr ""
-
-#: src/diffuse/main.py:841
-msgid "_First Difference"
-msgstr ""
-
-#: src/diffuse/main.py:842
-msgid "_Previous Difference"
-msgstr ""
-
-#: src/diffuse/main.py:843
-msgid "_Next Difference"
-msgstr ""
-
-#: src/diffuse/main.py:844
-msgid "_Last Difference"
-msgstr ""
-
-#: src/diffuse/main.py:846
-msgid "Fir_st Tab"
-msgstr ""
-
-#: src/diffuse/main.py:847
-msgid "Pre_vious Tab"
-msgstr ""
-
-#: src/diffuse/main.py:848
-msgid "Next _Tab"
-msgstr ""
-
-#: src/diffuse/main.py:849
-msgid "Las_t Tab"
-msgstr ""
-
-#: src/diffuse/main.py:851
-msgid "Shift Pane _Right"
-msgstr ""
-
-#: src/diffuse/main.py:852
-msgid "Shift Pane _Left"
-msgstr ""
-
-#: src/diffuse/main.py:856
-msgid "F_ormat"
-msgstr ""
-
-#: src/diffuse/main.py:858
-msgid "Convert To _Upper Case"
-msgstr ""
-
-#: src/diffuse/main.py:859
-msgid "Convert To _Lower Case"
-msgstr ""
-
-#: src/diffuse/main.py:861
-msgid "Sort Lines In _Ascending Order"
-msgstr ""
-
-#: src/diffuse/main.py:862
-msgid "Sort Lines In D_escending Order"
-msgstr ""
-
-#: src/diffuse/main.py:864
-msgid "Remove Trailing _White Space"
-msgstr ""
-
-#: src/diffuse/main.py:865
-msgid "Convert Tabs To _Spaces"
-msgstr ""
-
-#: src/diffuse/main.py:866
-msgid "Convert Leading Spaces To _Tabs"
-msgstr ""
-
-#: src/diffuse/main.py:868
-msgid "_Increase Indenting"
-msgstr ""
-
-#: src/diffuse/main.py:869
-msgid "De_crease Indenting"
-msgstr ""
-
-#: src/diffuse/main.py:871
-msgid "Convert To _DOS Format"
-msgstr ""
-
-#: src/diffuse/main.py:872
-msgid "Convert To _Mac Format"
-msgstr ""
-
-#: src/diffuse/main.py:873
-msgid "Convert To Uni_x Format"
-msgstr ""
-
-#: src/diffuse/main.py:877
-msgid "_Merge"
-msgstr ""
-
-#: src/diffuse/main.py:879
-msgid "Copy Selection _Right"
-msgstr ""
-
-#: src/diffuse/main.py:880
-msgid "Copy Selection _Left"
-msgstr ""
-
-#: src/diffuse/main.py:882
-msgid "Copy Left _Into Selection"
-msgstr ""
-
-#: src/diffuse/main.py:883
-msgid "Copy Right I_nto Selection"
-msgstr ""
-
-#: src/diffuse/main.py:884
-msgid "_Merge From Left Then Right"
-msgstr ""
-
-#: src/diffuse/main.py:885
-msgid "M_erge From Right Then Left"
-msgstr ""
-
-#: src/diffuse/main.py:889
-msgid "_Help"
-msgstr ""
-
-#: src/diffuse/main.py:891
-msgid "_Help Contents..."
-msgstr ""
-
-#: src/diffuse/main.py:893
-#, python-format
-msgid "_About %s..."
-msgstr ""
-
-#: src/diffuse/main.py:908
-msgid "New 2-Way File Merge"
-msgstr ""
-
-#: src/diffuse/main.py:909
-msgid "New 3-Way File Merge"
-msgstr ""
-
-#: src/diffuse/main.py:911
-msgid "Realign All"
-msgstr ""
-
-#: src/diffuse/main.py:912
-msgid "First Difference"
-msgstr ""
-
-#: src/diffuse/main.py:913
-msgid "Previous Difference"
-msgstr ""
-
-#: src/diffuse/main.py:914
-msgid "Next Difference"
-msgstr ""
-
-#: src/diffuse/main.py:915
-msgid "Last Difference"
-msgstr ""
-
-#: src/diffuse/main.py:917
-msgid "Copy Selection Right"
-msgstr ""
-
-#: src/diffuse/main.py:918
-msgid "Copy Selection Left"
-msgstr ""
-
-#: src/diffuse/main.py:919
-msgid "Copy Left Into Selection"
-msgstr ""
-
-#: src/diffuse/main.py:920
-msgid "Copy Right Into Selection"
-msgstr ""
-
-#: src/diffuse/main.py:921
-msgid "Merge From Left Then Right"
-msgstr ""
-
-#: src/diffuse/main.py:922
-msgid "Merge From Right Then Left"
-msgstr ""
-
-#: src/diffuse/main.py:924
-msgid "Undo"
-msgstr ""
-
-#: src/diffuse/main.py:925
-msgid "Redo"
-msgstr ""
-
-#: src/diffuse/main.py:926 src/diffuse/widgets.py:1861
-msgid "Cut"
-msgstr ""
-
-#: src/diffuse/main.py:927 src/diffuse/widgets.py:1862
-msgid "Copy"
-msgstr ""
-
-#: src/diffuse/main.py:928 src/diffuse/widgets.py:1863
-msgid "Paste"
-msgstr ""
-
-#: src/diffuse/main.py:929 src/diffuse/widgets.py:1866
-msgid "Clear Edits"
-msgstr ""
-
-#: src/diffuse/main.py:996
-msgid "Changes detected"
-msgstr ""
-
-#: src/diffuse/main.py:1000
-#, python-format
-msgid ""
-"The file \"%s\" changed on disk.\n"
-"\n"
-"Do you want to reload the file?"
-msgstr ""
-
-#: src/diffuse/main.py:1005
-#, python-format
-msgid ""
-"The following files changed on disk:\n"
-"%s\n"
-"\n"
-"Do you want to reload these files?"
-msgstr ""
-
-#: src/diffuse/main.py:1120
-msgid "Some files have unsaved changes. Select the files to save before closing."
-msgstr ""
-
-#: src/diffuse/main.py:1134
-msgid "Tab"
-msgstr ""
-
-#: src/diffuse/main.py:1139
-msgid "Pane"
-msgstr ""
-
-#: src/diffuse/main.py:1150
-msgid "Close _Without Saving"
-msgstr ""
-
-#: src/diffuse/main.py:1189
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr ""
-
-#: src/diffuse/main.py:1266
-#, python-format
-msgid "File Merge %d"
-msgstr ""
-
-#: src/diffuse/main.py:1372
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr ""
-
-#: src/diffuse/main.py:1404
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr ""
-
-#: src/diffuse/main.py:1437
-msgid "Open File In New Tab"
-msgstr ""
-
-#: src/diffuse/main.py:1460
-msgid "Choose Folder With Modified Files"
-msgstr ""
-
-#: src/diffuse/main.py:1478
-msgid "No modified files found."
-msgstr ""
-
-#: src/diffuse/main.py:1484
-msgid "Choose Folder With Commit"
-msgstr ""
-
-#: src/diffuse/main.py:1504
-msgid "No committed files found."
-msgstr ""
-
-#: src/diffuse/main.py:1540
-msgid "New N-Way File Merge..."
-msgstr ""
-
-#: src/diffuse/main.py:1541
-msgid "Number of panes: "
-msgstr ""
-
-#: src/diffuse/main.py:1615
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr ""
-
-#: src/diffuse/main.py:1617
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr ""
-
-#: src/diffuse/main.py:1827
+#: src/diffuse/main.py:61
 msgid "Do not read any resource files"
 msgstr ""
 
-#: src/diffuse/main.py:1835
+#: src/diffuse/main.py:69
 msgid "Specify explicit resource file"
 msgstr ""
 
-#: src/diffuse/main.py:1843
+#: src/diffuse/main.py:77
 msgid "File revisions <rev-1> and <rev>"
 msgstr ""
 
-#: src/diffuse/main.py:1851
+#: src/diffuse/main.py:85
 msgid "Close all tabs with no differences"
 msgstr ""
 
-#: src/diffuse/main.py:1858
+#: src/diffuse/main.py:92
 msgid "Use <codec> to read and write files"
 msgstr ""
 
-#: src/diffuse/main.py:1866
+#: src/diffuse/main.py:100
 msgid "Display <label> instead of the file name"
 msgstr ""
 
-#: src/diffuse/main.py:1874
+#: src/diffuse/main.py:108
 msgid "Create a new tab for each modified file"
 msgstr ""
 
-#: src/diffuse/main.py:1881
+#: src/diffuse/main.py:115
 msgid "File revision <rev>"
 msgstr ""
 
-#: src/diffuse/main.py:1889
+#: src/diffuse/main.py:123
 msgid "Create a new tab for each file"
 msgstr ""
 
-#: src/diffuse/main.py:1896
+#: src/diffuse/main.py:130
 msgid "Start a new tab"
 msgstr ""
 
-#: src/diffuse/main.py:1903 src/diffuse/preferences.py:165
+#: src/diffuse/main.py:137 src/diffuse/preferences.py:159
 msgid "Version control system search order"
 msgstr ""
 
-#: src/diffuse/main.py:1911
+#: src/diffuse/main.py:145
 msgid "Start with line <line> selected"
 msgstr ""
 
-#: src/diffuse/main.py:1919
+#: src/diffuse/main.py:153
 msgid "Create a blank file comparison pane"
 msgstr ""
 
-#: src/diffuse/main.py:1926 src/diffuse/preferences.py:91
-#: src/diffuse/preferences.py:100
+#: src/diffuse/main.py:160 src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:95
 msgid "Ignore changes to white space"
 msgstr ""
 
-#: src/diffuse/main.py:1933
+#: src/diffuse/main.py:167
 msgid "Ignore changes in blank lines"
 msgstr ""
 
-#: src/diffuse/main.py:1940 src/diffuse/preferences.py:93
+#: src/diffuse/main.py:174 src/diffuse/preferences.py:88
 msgid "Ignore end of line differences"
 msgstr ""
 
-#: src/diffuse/main.py:1947 src/diffuse/preferences.py:89
+#: src/diffuse/main.py:181 src/diffuse/preferences.py:84
 msgid "Ignore case differences"
 msgstr ""
 
-#: src/diffuse/main.py:1954 src/diffuse/preferences.py:90
+#: src/diffuse/main.py:188 src/diffuse/preferences.py:85
 msgid "Ignore white space differences"
 msgstr ""
 
-#: src/diffuse/main.py:1957
+#: src/diffuse/main.py:191
 msgid ""
 "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"
@@ -687,152 +166,167 @@ msgid ""
 "also retrieve revisions of files from several VCSs for comparison and merging."
 msgstr ""
 
-#: src/diffuse/main.py:2080
+#: src/diffuse/main.py:247 src/diffuse/window.py:420
+#, python-format
+msgid "Error reading %s."
+msgstr ""
+
+#: src/diffuse/main.py:327
 msgid "Error parsing line number."
 msgstr ""
 
-#: src/diffuse/main.py:2096
+#: src/diffuse/main.py:343
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr ""
 
-#: src/diffuse/preferences.py:80
+#: src/diffuse/preferences.py:75
 msgid "Display"
 msgstr ""
 
-#: src/diffuse/preferences.py:83
+#: src/diffuse/preferences.py:78
 msgid "Font"
 msgstr ""
 
-#: src/diffuse/preferences.py:84
+#: src/diffuse/preferences.py:79
 msgid "Tab width"
 msgstr ""
 
-#: src/diffuse/preferences.py:85
+#: src/diffuse/preferences.py:80
 msgid "Show right margin"
 msgstr ""
 
-#: src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:81
 msgid "Right margin"
 msgstr ""
 
-#: src/diffuse/preferences.py:87
+#: src/diffuse/preferences.py:82
 msgid "Show line numbers"
 msgstr ""
 
-#: src/diffuse/preferences.py:88
+#: src/diffuse/preferences.py:83
 msgid "Show white space characters"
 msgstr ""
 
-#: src/diffuse/preferences.py:92
+#: src/diffuse/preferences.py:87
 msgid "Ignore blank line differences"
 msgstr ""
 
-#: src/diffuse/preferences.py:95
+#: src/diffuse/preferences.py:90
 msgid "Alignment"
 msgstr ""
 
-#: src/diffuse/preferences.py:98
+#: src/diffuse/preferences.py:93
 msgid "Ignore case"
 msgstr ""
 
-#: src/diffuse/preferences.py:99
+#: src/diffuse/preferences.py:94
 msgid "Ignore white space"
 msgstr ""
 
-#: src/diffuse/preferences.py:101
+#: src/diffuse/preferences.py:96
 msgid "Ignore blank lines"
 msgstr ""
 
-#: src/diffuse/preferences.py:102
+#: src/diffuse/preferences.py:97
 msgid "Ignore end of line characters"
 msgstr ""
 
-#: src/diffuse/preferences.py:104
+#: src/diffuse/preferences.py:99
 msgid "Editor"
 msgstr ""
 
-#: src/diffuse/preferences.py:107
+#: src/diffuse/preferences.py:102
 msgid "Auto indent"
 msgstr ""
 
-#: src/diffuse/preferences.py:108
+#: src/diffuse/preferences.py:103
 msgid "Expand tabs to spaces"
 msgstr ""
 
-#: src/diffuse/preferences.py:109
+#: src/diffuse/preferences.py:104
 msgid "Soft tab width"
 msgstr ""
 
-#: src/diffuse/preferences.py:111
+#: src/diffuse/preferences.py:106
 msgid "Tabs"
 msgstr ""
 
-#: src/diffuse/preferences.py:114
+#: src/diffuse/preferences.py:109
 msgid "Default panes"
 msgstr ""
 
-#: src/diffuse/preferences.py:115
+#: src/diffuse/preferences.py:110
 msgid "Always show the tab bar"
 msgstr ""
 
-#: src/diffuse/preferences.py:116
+#: src/diffuse/preferences.py:111
 #, python-format
 msgid "Warn me when closing a tab will quit %s"
 msgstr ""
 
-#: src/diffuse/preferences.py:118
+#: src/diffuse/preferences.py:113
 msgid "Regional Settings"
 msgstr ""
 
-#: src/diffuse/preferences.py:121
+#: src/diffuse/preferences.py:116
 msgid "Default codec"
 msgstr ""
 
-#: src/diffuse/preferences.py:122
+#: src/diffuse/preferences.py:117
 msgid "Order of codecs used to identify encoding"
 msgstr ""
 
-#: src/diffuse/preferences.py:143
+#: src/diffuse/preferences.py:138
 msgid "Cygwin"
 msgstr ""
 
-#: src/diffuse/preferences.py:145
+#: src/diffuse/preferences.py:140
 msgid "Root directory"
 msgstr ""
 
-#: src/diffuse/preferences.py:146
+#: src/diffuse/preferences.py:141
 msgid "Cygdrive prefix"
 msgstr ""
 
-#: src/diffuse/preferences.py:173
+#: src/diffuse/preferences.py:167
 msgid "\"co\" command"
 msgstr ""
 
-#: src/diffuse/preferences.py:174
+#: src/diffuse/preferences.py:168
 msgid "\"rlog\" command"
 msgstr ""
 
-#: src/diffuse/preferences.py:176
+#: src/diffuse/preferences.py:170
 msgid "Command"
 msgstr ""
 
-#: src/diffuse/preferences.py:182
+#: src/diffuse/preferences.py:176
 msgid "Launch from a Bash login shell"
 msgstr ""
 
-#: src/diffuse/preferences.py:189
+#: src/diffuse/preferences.py:183
 msgid "Update paths for Cygwin"
 msgstr ""
 
-#: src/diffuse/preferences.py:194
+#: src/diffuse/preferences.py:188
 msgid "Version Control"
 msgstr ""
 
-#: src/diffuse/preferences.py:259
+#: src/diffuse/preferences.py:253
 msgid "Preferences"
 msgstr ""
 
+#: src/diffuse/preferences.py:294 src/diffuse/window.py:580
+#, python-format
+msgid "Error writing %s."
+msgstr ""
+
+#: src/diffuse/preferences.py:483 src/diffuse/window.py:446
+#: src/diffuse/window.py:1413 src/diffuse/window.py:1436 src/diffuse/window.py:1459
+msgid "_Open"
+msgstr ""
+
 #: src/diffuse/resources.py:242 src/diffuse/resources.py:246
 #: src/diffuse/resources.py:249
 #, python-brace-format
@@ -914,20 +408,15 @@ msgstr ""
 msgid "Unhandled error at line {line} of {file}."
 msgstr ""
 
-#: src/diffuse/utils.py:65
+#: src/diffuse/utils.py:66
 msgid "Auto Detect"
 msgstr ""
 
-#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97
+#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:96
 #, python-format
 msgid "Error parsing revision %s."
 msgstr ""
 
-#: src/diffuse/vcs/vcs_registry.py:238
-#, python-format
-msgid "Error parsing %s."
-msgstr ""
-
 #: src/diffuse/widgets.py:1857
 msgid "Align with Selection"
 msgstr ""
@@ -940,10 +429,552 @@ msgstr ""
 msgid "Merge Selection"
 msgstr ""
 
+#: src/diffuse/widgets.py:1861 src/diffuse/window.py:865
+msgid "Cut"
+msgstr ""
+
+#: src/diffuse/widgets.py:1862 src/diffuse/window.py:866
+msgid "Copy"
+msgstr ""
+
+#: src/diffuse/widgets.py:1863 src/diffuse/window.py:867
+msgid "Paste"
+msgstr ""
+
 #: src/diffuse/widgets.py:1865
 msgid "Select All"
 msgstr ""
 
+#: src/diffuse/widgets.py:1866 src/diffuse/window.py:868
+msgid "Clear Edits"
+msgstr ""
+
 #: src/diffuse/widgets.py:1868
 msgid "Swap with Selected Pane"
 msgstr ""
+
+#: src/diffuse/window.py:83
+msgid "Close Tab"
+msgstr ""
+
+#: src/diffuse/window.py:126
+msgid "Open File..."
+msgstr ""
+
+#: src/diffuse/window.py:127
+msgid "Reload File"
+msgstr ""
+
+#: src/diffuse/window.py:128
+msgid "Save File"
+msgstr ""
+
+#: src/diffuse/window.py:129
+msgid "Save File As..."
+msgstr ""
+
+#: src/diffuse/window.py:228
+#, python-format
+msgid "Column %d"
+msgstr ""
+
+#: src/diffuse/window.py:306
+msgid "Save changes before loading the new file?"
+msgstr ""
+
+#: src/diffuse/window.py:310
+msgid "_No"
+msgstr ""
+
+#: src/diffuse/window.py:311
+msgid "_Yes"
+msgstr ""
+
+#: src/diffuse/window.py:417
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr ""
+
+#: src/diffuse/window.py:442
+msgid "Open File"
+msgstr ""
+
+#: src/diffuse/window.py:495
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr ""
+
+#: src/diffuse/window.py:499 src/diffuse/window.py:1111
+msgid "_Save"
+msgstr ""
+
+#: src/diffuse/window.py:527
+#, python-format
+msgid "A file named %s already exists. Do you want to overwrite it?"
+msgstr ""
+
+#: src/diffuse/window.py:534
+#, 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 ""
+
+#: src/diffuse/window.py:576
+#, python-format
+msgid "Error encoding to %s."
+msgstr ""
+
+#: src/diffuse/window.py:610
+msgid "Go To Line..."
+msgstr ""
+
+#: src/diffuse/window.py:611
+msgid "Line Number: "
+msgstr ""
+
+#: src/diffuse/window.py:642
+msgid ""
+"Press the enter key or double click to edit. Press the space bar or use the RMB "
+"menu to manually align."
+msgstr ""
+
+#: src/diffuse/window.py:646
+msgid "Press the escape key to finish editing."
+msgstr ""
+
+#: src/diffuse/window.py:649
+msgid ""
+"Select target line and press the space bar to align. Press the escape key to "
+"cancel."
+msgstr ""
+
+#: src/diffuse/window.py:710
+msgid "_File"
+msgstr ""
+
+#: src/diffuse/window.py:712
+msgid "_Open File..."
+msgstr ""
+
+#: src/diffuse/window.py:713
+msgid "Open File In New _Tab..."
+msgstr ""
+
+#: src/diffuse/window.py:714
+msgid "Open _Modified Files..."
+msgstr ""
+
+#: src/diffuse/window.py:715
+msgid "Open Commi_t..."
+msgstr ""
+
+#: src/diffuse/window.py:716
+msgid "_Reload File"
+msgstr ""
+
+#: src/diffuse/window.py:718
+msgid "_Save File"
+msgstr ""
+
+#: src/diffuse/window.py:719
+msgid "Save File _As..."
+msgstr ""
+
+#: src/diffuse/window.py:720
+msgid "Save A_ll"
+msgstr ""
+
+#: src/diffuse/window.py:722
+msgid "New _2-Way File Merge"
+msgstr ""
+
+#: src/diffuse/window.py:723
+msgid "New _3-Way File Merge"
+msgstr ""
+
+#: src/diffuse/window.py:724
+msgid "New _N-Way File Merge..."
+msgstr ""
+
+#: src/diffuse/window.py:726
+msgid "_Close Tab"
+msgstr ""
+
+#: src/diffuse/window.py:727
+msgid "_Undo Close Tab"
+msgstr ""
+
+#: src/diffuse/window.py:728
+msgid "_Quit"
+msgstr ""
+
+#: src/diffuse/window.py:732
+msgid "_Edit"
+msgstr ""
+
+#: src/diffuse/window.py:734
+msgid "_Undo"
+msgstr ""
+
+#: src/diffuse/window.py:735
+msgid "_Redo"
+msgstr ""
+
+#: src/diffuse/window.py:737
+msgid "Cu_t"
+msgstr ""
+
+#: src/diffuse/window.py:738
+msgid "_Copy"
+msgstr ""
+
+#: src/diffuse/window.py:739
+msgid "_Paste"
+msgstr ""
+
+#: src/diffuse/window.py:741
+msgid "Select _All"
+msgstr ""
+
+#: src/diffuse/window.py:742
+msgid "C_lear Edits"
+msgstr ""
+
+#: src/diffuse/window.py:743
+msgid "_Dismiss All Edits"
+msgstr ""
+
+#: src/diffuse/window.py:745
+msgid "_Find..."
+msgstr ""
+
+#: src/diffuse/window.py:746
+msgid "Find _Next"
+msgstr ""
+
+#: src/diffuse/window.py:747
+msgid "Find Pre_vious"
+msgstr ""
+
+#: src/diffuse/window.py:748
+msgid "_Go To Line..."
+msgstr ""
+
+#: src/diffuse/window.py:750
+msgid "Pr_eferences..."
+msgstr ""
+
+#: src/diffuse/window.py:754
+msgid "None"
+msgstr ""
+
+#: src/diffuse/window.py:776
+msgid "_View"
+msgstr ""
+
+#: src/diffuse/window.py:778
+msgid "_Syntax Highlighting"
+msgstr ""
+
+#: src/diffuse/window.py:780
+msgid "Re_align All"
+msgstr ""
+
+#: src/diffuse/window.py:781
+msgid "_Isolate"
+msgstr ""
+
+#: src/diffuse/window.py:783
+msgid "_First Difference"
+msgstr ""
+
+#: src/diffuse/window.py:784
+msgid "_Previous Difference"
+msgstr ""
+
+#: src/diffuse/window.py:785
+msgid "_Next Difference"
+msgstr ""
+
+#: src/diffuse/window.py:786
+msgid "_Last Difference"
+msgstr ""
+
+#: src/diffuse/window.py:788
+msgid "Fir_st Tab"
+msgstr ""
+
+#: src/diffuse/window.py:789
+msgid "Pre_vious Tab"
+msgstr ""
+
+#: src/diffuse/window.py:790
+msgid "Next _Tab"
+msgstr ""
+
+#: src/diffuse/window.py:791
+msgid "Las_t Tab"
+msgstr ""
+
+#: src/diffuse/window.py:793
+msgid "Shift Pane _Right"
+msgstr ""
+
+#: src/diffuse/window.py:794
+msgid "Shift Pane _Left"
+msgstr ""
+
+#: src/diffuse/window.py:798
+msgid "F_ormat"
+msgstr ""
+
+#: src/diffuse/window.py:800
+msgid "Convert To _Upper Case"
+msgstr ""
+
+#: src/diffuse/window.py:801
+msgid "Convert To _Lower Case"
+msgstr ""
+
+#: src/diffuse/window.py:803
+msgid "Sort Lines In _Ascending Order"
+msgstr ""
+
+#: src/diffuse/window.py:804
+msgid "Sort Lines In D_escending Order"
+msgstr ""
+
+#: src/diffuse/window.py:806
+msgid "Remove Trailing _White Space"
+msgstr ""
+
+#: src/diffuse/window.py:807
+msgid "Convert Tabs To _Spaces"
+msgstr ""
+
+#: src/diffuse/window.py:808
+msgid "Convert Leading Spaces To _Tabs"
+msgstr ""
+
+#: src/diffuse/window.py:810
+msgid "_Increase Indenting"
+msgstr ""
+
+#: src/diffuse/window.py:811
+msgid "De_crease Indenting"
+msgstr ""
+
+#: src/diffuse/window.py:813
+msgid "Convert To _DOS Format"
+msgstr ""
+
+#: src/diffuse/window.py:814
+msgid "Convert To _Mac Format"
+msgstr ""
+
+#: src/diffuse/window.py:815
+msgid "Convert To Uni_x Format"
+msgstr ""
+
+#: src/diffuse/window.py:819
+msgid "_Merge"
+msgstr ""
+
+#: src/diffuse/window.py:821
+msgid "Copy Selection _Right"
+msgstr ""
+
+#: src/diffuse/window.py:822
+msgid "Copy Selection _Left"
+msgstr ""
+
+#: src/diffuse/window.py:824
+msgid "Copy Left _Into Selection"
+msgstr ""
+
+#: src/diffuse/window.py:825
+msgid "Copy Right I_nto Selection"
+msgstr ""
+
+#: src/diffuse/window.py:826
+msgid "_Merge From Left Then Right"
+msgstr ""
+
+#: src/diffuse/window.py:827
+msgid "M_erge From Right Then Left"
+msgstr ""
+
+#: src/diffuse/window.py:831
+msgid "_Help"
+msgstr ""
+
+#: src/diffuse/window.py:833
+msgid "_Help Contents..."
+msgstr ""
+
+#: src/diffuse/window.py:835
+#, python-format
+msgid "_About %s..."
+msgstr ""
+
+#: src/diffuse/window.py:847
+msgid "New 2-Way File Merge"
+msgstr ""
+
+#: src/diffuse/window.py:848
+msgid "New 3-Way File Merge"
+msgstr ""
+
+#: src/diffuse/window.py:850
+msgid "Realign All"
+msgstr ""
+
+#: src/diffuse/window.py:851
+msgid "First Difference"
+msgstr ""
+
+#: src/diffuse/window.py:852
+msgid "Previous Difference"
+msgstr ""
+
+#: src/diffuse/window.py:853
+msgid "Next Difference"
+msgstr ""
+
+#: src/diffuse/window.py:854
+msgid "Last Difference"
+msgstr ""
+
+#: src/diffuse/window.py:856
+msgid "Copy Selection Right"
+msgstr ""
+
+#: src/diffuse/window.py:857
+msgid "Copy Selection Left"
+msgstr ""
+
+#: src/diffuse/window.py:858
+msgid "Copy Left Into Selection"
+msgstr ""
+
+#: src/diffuse/window.py:859
+msgid "Copy Right Into Selection"
+msgstr ""
+
+#: src/diffuse/window.py:860
+msgid "Merge From Left Then Right"
+msgstr ""
+
+#: src/diffuse/window.py:861
+msgid "Merge From Right Then Left"
+msgstr ""
+
+#: src/diffuse/window.py:863
+msgid "Undo"
+msgstr ""
+
+#: src/diffuse/window.py:864
+msgid "Redo"
+msgstr ""
+
+#: src/diffuse/window.py:950
+msgid "Changes detected"
+msgstr ""
+
+#: src/diffuse/window.py:954
+#, python-format
+msgid ""
+"The file \"%s\" changed on disk.\n"
+"\n"
+"Do you want to reload the file?"
+msgstr ""
+
+#: src/diffuse/window.py:959
+#, python-format
+msgid ""
+"The following files changed on disk:\n"
+"%s\n"
+"\n"
+"Do you want to reload these files?"
+msgstr ""
+
+#: src/diffuse/window.py:1078
+msgid "Some files have unsaved changes. Select the files to save before closing."
+msgstr ""
+
+#: src/diffuse/window.py:1092
+msgid "Tab"
+msgstr ""
+
+#: src/diffuse/window.py:1097
+msgid "Pane"
+msgstr ""
+
+#: src/diffuse/window.py:1108
+msgid "Close _Without Saving"
+msgstr ""
+
+#: src/diffuse/window.py:1147
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr ""
+
+#: src/diffuse/window.py:1224
+#, python-format
+msgid "File Merge %d"
+msgstr ""
+
+#: src/diffuse/window.py:1344
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr ""
+
+#: src/diffuse/window.py:1376
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr ""
+
+#: src/diffuse/window.py:1409
+msgid "Open File In New Tab"
+msgstr ""
+
+#: src/diffuse/window.py:1432
+msgid "Choose Folder With Modified Files"
+msgstr ""
+
+#: src/diffuse/window.py:1450
+msgid "No modified files found."
+msgstr ""
+
+#: src/diffuse/window.py:1456
+msgid "Choose Folder With Commit"
+msgstr ""
+
+#: src/diffuse/window.py:1476
+msgid "No committed files found."
+msgstr ""
+
+#: src/diffuse/window.py:1512
+msgid "New N-Way File Merge..."
+msgstr ""
+
+#: src/diffuse/window.py:1513
+msgid "Number of panes: "
+msgstr ""
+
+#: src/diffuse/window.py:1587
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr ""
+
+#: src/diffuse/window.py:1589
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr ""
+
+#: src/diffuse/window.py:1762
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr ""
+
+#: src/diffuse/window.py:1766
+msgid "translator-credits"
+msgstr ""
diff --git a/po/es.po b/po/es.po
index c761b29..b28232e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse-svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-23 20:00-0400\n"
+"POT-Creation-Date: 2023-04-16 14:09-0400\n"
 "PO-Revision-Date: 2022-06-13 23:21+0200\n"
 "Last-Translator: Óscar Fernández Díaz <oscfdezdz@tuta.io>\n"
 "Language-Team: \n"
@@ -31,835 +31,309 @@ msgid "Graphical tool for merging and comparing text files"
 msgstr "Herramienta gráfica para fusionar y comparar archivos de texto"
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:7
+#, fuzzy
 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."
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, and "
+"Subversion repositories."
 msgstr ""
 "Diffuse es una herramienta gráfica para comparar y fusionar archivos de texto. "
 "Puede recuperar archivos para su comparación desde repositorios Bazaar, CVS, "
-"Darcs, Git, Mercurial, Monotone, RCS, Subversion y SVK."
+"Darcs, Git, Mercurial, Monotone, RCS, y Subversion."
 
-#: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
-msgid "Main window: diff between two files"
-msgstr "Ventana principal: diferencia entre dos archivos"
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:28
+msgid "Main window"
+msgstr ""
 
-#: src/diffuse/constants.py:25
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:32
+msgid "About window"
+msgstr ""
+
+#: src/diffuse/constants.py:26
 msgid "Copyright"
 msgstr "Copyright"
 
-#: src/diffuse/dialogs.py:40
-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:45
-msgid "translator-credits"
+#: src/diffuse/dialogs.py:46 src/diffuse/dialogs.py:89 src/diffuse/dialogs.py:133
+#: src/diffuse/preferences.py:254 src/diffuse/preferences.py:483
+#: src/diffuse/window.py:309 src/diffuse/window.py:1107
+msgid "_Cancel"
 msgstr ""
-"Henri Menke <henrimenke4@aim.com>\n"
-"David Marín Carreño <davefx@gmail.com>\n"
-"Óscar Fernández Díaz <oscfdezdz@tuta.io>"
 
-#: src/diffuse/dialogs.py:82
+#: src/diffuse/dialogs.py:50
 msgid "Encoding: "
 msgstr "Codificación: "
 
-#: src/diffuse/dialogs.py:94
+#: src/diffuse/dialogs.py:62
 msgid "Revision: "
 msgstr "Revision: "
 
-#: src/diffuse/dialogs.py:156
+#: src/diffuse/dialogs.py:90 src/diffuse/dialogs.py:134
+#: src/diffuse/preferences.py:255
+msgid "_OK"
+msgstr ""
+
+#: src/diffuse/dialogs.py:130
 msgid "Find..."
 msgstr "Buscar..."
 
-#: src/diffuse/dialogs.py:164
+#: src/diffuse/dialogs.py:140
 msgid "Search For: "
 msgstr "Buscar: "
 
-#: src/diffuse/dialogs.py:189
+#: src/diffuse/dialogs.py:165
 msgid "Match Case"
 msgstr "Coincidencia de capitalización"
 
-#: src/diffuse/dialogs.py:194
+#: src/diffuse/dialogs.py:170
 msgid "Search Backwards"
 msgstr "Buscar hacia atrás"
 
+#: src/diffuse/main.py:53
+msgid "Display version and copyright information"
+msgstr "Muestra información de versionado y copyright"
+
+#: src/diffuse/main.py:61
+msgid "Do not read any resource files"
+msgstr "No leer archivos de recursos"
+
+#: src/diffuse/main.py:69
+msgid "Specify explicit resource file"
+msgstr "Especificar ficherarchivoo de recursos explícitamente"
+
+#: src/diffuse/main.py:77
+msgid "File revisions <rev-1> and <rev>"
+msgstr "Revisiones de fich. <rev-1> y <rev>"
+
 #: src/diffuse/main.py:85
-msgid "Close Tab"
-msgstr "Cerrar pestaña"
+msgid "Close all tabs with no differences"
+msgstr "Cerrar pestañas sin diferencias"
 
-#: src/diffuse/main.py:132
-msgid "Open File..."
-msgstr "Abrir archivo..."
+#: src/diffuse/main.py:92
+msgid "Use <codec> to read and write files"
+msgstr "Usa codificación <codec> al leer y escribir"
 
-#: src/diffuse/main.py:133
-msgid "Reload File"
-msgstr "Recargar archivo"
+#: src/diffuse/main.py:100
+msgid "Display <label> instead of the file name"
+msgstr "Mostrar <label> en lugar del nombre del archivo"
 
-#: src/diffuse/main.py:134
-msgid "Save File"
-msgstr "Guardar archivo"
+#: src/diffuse/main.py:108
+msgid "Create a new tab for each modified file"
+msgstr "Crea nueva pestaña para cada fich. modificado"
 
-#: src/diffuse/main.py:135
-msgid "Save File As..."
-msgstr "Guardar archivo como..."
+#: src/diffuse/main.py:115
+msgid "File revision <rev>"
+msgstr "Revisión de archivo <rev>"
 
-#: src/diffuse/main.py:217
-#, python-format
-msgid "Column %d"
+#: src/diffuse/main.py:123
+msgid "Create a new tab for each file"
+msgstr "Crea nueva pestaña para cada archivo"
+
+#: src/diffuse/main.py:130
+msgid "Start a new tab"
+msgstr "Inicia pestaña nueva"
+
+#: src/diffuse/main.py:137 src/diffuse/preferences.py:159
+msgid "Version control system search order"
+msgstr "Orden de búsqueda del sistema de control de versiones"
+
+#: src/diffuse/main.py:145
+msgid "Start with line <line> selected"
+msgstr "Comienza con la línea <line> seleccionada"
+
+#: src/diffuse/main.py:153
+msgid "Create a blank file comparison pane"
+msgstr "Crea panel vacío de comparación de archivos"
+
+#: src/diffuse/main.py:160 src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:95
+msgid "Ignore changes to white space"
+msgstr "Ignorar cambios de espacios"
+
+#: src/diffuse/main.py:167
+msgid "Ignore changes in blank lines"
+msgstr "Ignorar líneas vacías"
+
+#: src/diffuse/main.py:174 src/diffuse/preferences.py:88
+msgid "Ignore end of line differences"
+msgstr "Ignorar diferencias en caracteres de fin de línea"
+
+#: src/diffuse/main.py:181 src/diffuse/preferences.py:84
+msgid "Ignore case differences"
+msgstr "Ignorar diferencías de capitalización"
+
+#: src/diffuse/main.py:188 src/diffuse/preferences.py:85
+msgid "Ignore white space differences"
+msgstr "Ignorar diferencías de espacios"
+
+#: src/diffuse/main.py:191
+msgid ""
+"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 several VCSs for comparison and merging."
 msgstr ""
 
-#: src/diffuse/main.py:291
-msgid "Save changes before loading the new file?"
-msgstr "¿Guardar cambios antes de abrir el archivo nuevo?"
-
-#: src/diffuse/main.py:402
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "Error leyendo revisión %(rev)s de %(file)s."
-
-#: src/diffuse/main.py:405 src/diffuse/main.py:1860
+#: src/diffuse/main.py:247 src/diffuse/window.py:420
 #, python-format
 msgid "Error reading %s."
 msgstr "Error leyendo %s."
 
-#: src/diffuse/main.py:427
-msgid "Open File"
-msgstr "Abrir archivo"
-
-#: src/diffuse/main.py:484
-#, python-format
-msgid "The file %s changed on disk. Do you want to reload the file?"
-msgstr "El archivo %s ha cambiado en disco. ¿Quiere recargarlo?"
-
-#: src/diffuse/main.py:510
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "Guardar Panel %(title)s %(pane)d"
-
-#: src/diffuse/main.py:542
-#, python-format
-msgid "A file named %s already exists. Do you want to overwrite it?"
-msgstr "Ya existe un archivo llamado %s. ¿Quiere reemplazarlo?"
-
-#: src/diffuse/main.py:549
-#, 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 ""
-"El archivo %s ha sido modificado por otro proceso desde que se cargó. Sí se "
-"guarda, todos los cambios realizados por procesos externos se perderán. ¿Desea "
-"guardar de todos modos?"
-
-#: src/diffuse/main.py:591
-#, python-format
-msgid "Error encoding to %s."
-msgstr "Error codificando a %s."
-
-#: src/diffuse/main.py:595 src/diffuse/preferences.py:300
-#, python-format
-msgid "Error writing %s."
-msgstr "Error guardando %s."
-
-#: src/diffuse/main.py:625
-msgid "Go To Line..."
-msgstr "Ir a línea..."
-
-#: src/diffuse/main.py:626
-msgid "Line Number: "
-msgstr "Número de línea: "
-
-#: src/diffuse/main.py:657
-msgid ""
-"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."
-
-#: src/diffuse/main.py:661
-msgid "Press the escape key to finish editing."
-msgstr "Pulse Escape para finalizar la edición."
-
-#: src/diffuse/main.py:664
-msgid ""
-"Select target line and press the space bar to align. Press the escape key to "
-"cancel."
-msgstr ""
-"Selecciona la línea y pulsa espacio para alinear. Pulsa Escape para cancelar."
-
-#: src/diffuse/main.py:787
-msgid "_File"
-msgstr "_Archivo"
-
-#: src/diffuse/main.py:788
-msgid "_Open File..."
-msgstr "_Abrir archivo..."
-
-#: src/diffuse/main.py:789
-msgid "Open File In New _Tab..."
-msgstr "Abrir archivo en nueva _pestaña..."
-
-#: src/diffuse/main.py:790
-msgid "Open _Modified Files..."
-msgstr "Abrir archivos _modificados..."
-
-#: src/diffuse/main.py:791
-msgid "Open Commi_t..."
-msgstr "Abrir revi_sión..."
-
-#: src/diffuse/main.py:792
-msgid "_Reload File"
-msgstr "_Recargar archivo"
-
-#: src/diffuse/main.py:794
-msgid "_Save File"
-msgstr "_Guardar archivo"
-
-#: src/diffuse/main.py:795
-msgid "Save File _As..."
-msgstr "Guardar _archivo como..."
-
-#: src/diffuse/main.py:796
-msgid "Save A_ll"
-msgstr "Gu_ardar todo"
-
-#: src/diffuse/main.py:798
-msgid "New _2-Way File Merge"
-msgstr "Nueva mezcla de archivos de _2 vías"
-
-#: src/diffuse/main.py:799
-msgid "New _3-Way File Merge"
-msgstr "Nueva mezcla de archivos de _3 vías"
-
-#: src/diffuse/main.py:800
-msgid "New _N-Way File Merge..."
-msgstr "Nueva mezcla de archivos de _N vías..."
-
-#: src/diffuse/main.py:802
-msgid "_Close Tab"
-msgstr "_Cerrar pestaña"
-
-#: src/diffuse/main.py:803
-msgid "_Undo Close Tab"
-msgstr "_Deshacer cerrar pestaña"
-
-#: src/diffuse/main.py:804
-msgid "_Quit"
-msgstr "_Salir"
-
-#: src/diffuse/main.py:807
-msgid "_Edit"
-msgstr "_Editar"
-
-#: src/diffuse/main.py:808
-msgid "_Undo"
-msgstr "_Deshacer"
-
-#: src/diffuse/main.py:809
-msgid "_Redo"
-msgstr "_Rehacer"
-
-#: src/diffuse/main.py:811
-msgid "Cu_t"
-msgstr "Cor_tar"
-
-#: src/diffuse/main.py:812
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: src/diffuse/main.py:813
-msgid "_Paste"
-msgstr "_Pegar"
-
-#: src/diffuse/main.py:815
-msgid "Select _All"
-msgstr "Seleccion_ar todo"
-
-#: src/diffuse/main.py:816
-msgid "C_lear Edits"
-msgstr "_Deshacer todo"
-
-#: src/diffuse/main.py:817
-msgid "_Dismiss All Edits"
-msgstr "_Ignorar todas las ediciones"
-
-#: src/diffuse/main.py:819
-msgid "_Find..."
-msgstr "_Buscar..."
-
-#: src/diffuse/main.py:820
-msgid "Find _Next"
-msgstr "Buscar siguie_nte"
-
-#: src/diffuse/main.py:821
-msgid "Find Pre_vious"
-msgstr "Buscar an_terior"
-
-#: src/diffuse/main.py:822
-msgid "_Go To Line..."
-msgstr "_Ir a la línea..."
-
-#: src/diffuse/main.py:824
-msgid "Pr_eferences..."
-msgstr "Pr_eferencias..."
-
-#: src/diffuse/main.py:828
-msgid "None"
-msgstr "Ninguno"
-
-#: src/diffuse/main.py:846
-msgid "_View"
-msgstr "_Ver"
-
-#: src/diffuse/main.py:847
-msgid "_Syntax Highlighting"
-msgstr "Coloreado _sintáctico"
-
-#: src/diffuse/main.py:849
-msgid "Re_align All"
-msgstr "Re_alinear todo"
-
-#: src/diffuse/main.py:850
-msgid "_Isolate"
-msgstr "A_islar"
-
-#: src/diffuse/main.py:852
-msgid "_First Difference"
-msgstr "Primera di_ferencia"
-
-#: src/diffuse/main.py:853
-msgid "_Previous Difference"
-msgstr "Diferencia an_terior"
-
-#: src/diffuse/main.py:854
-msgid "_Next Difference"
-msgstr "Diferencia siguie_nte"
-
-#: src/diffuse/main.py:855
-msgid "_Last Difference"
-msgstr "Ú_ltima diferencia"
-
-#: src/diffuse/main.py:857
-msgid "Fir_st Tab"
-msgstr "Prime_ra pestaña"
-
-#: src/diffuse/main.py:858
-msgid "Pre_vious Tab"
-msgstr "Pestaña ante_rior"
-
-#: src/diffuse/main.py:859
-msgid "Next _Tab"
-msgstr "Siguiente _pestaña"
-
-#: src/diffuse/main.py:860
-msgid "Las_t Tab"
-msgstr "Ul_tima pestaña"
-
-#: src/diffuse/main.py:862
-msgid "Shift Pane _Right"
-msgstr "Cambiar panel _derecho"
-
-#: src/diffuse/main.py:863
-msgid "Shift Pane _Left"
-msgstr "Cambiar panel _izquierdo"
-
-#: src/diffuse/main.py:866
-msgid "F_ormat"
-msgstr "F_ormato"
-
-#: src/diffuse/main.py:867
-msgid "Convert To _Upper Case"
-msgstr "Transformar en letras mayúsculas"
-
-#: src/diffuse/main.py:868
-msgid "Convert To _Lower Case"
-msgstr "Transformar en letras minúsculas"
-
-#: src/diffuse/main.py:870
-msgid "Sort Lines In _Ascending Order"
-msgstr "Ordenar lineas en orden _ascendente"
-
-#: src/diffuse/main.py:871
-msgid "Sort Lines In D_escending Order"
-msgstr "Ordenar lineas en orden _descendente"
-
-#: src/diffuse/main.py:873
-msgid "Remove Trailing _White Space"
-msgstr "Quitar _espacios finales"
-
-#: src/diffuse/main.py:874
-msgid "Convert Tabs To _Spaces"
-msgstr "Transformar tabuladores en e_spacios"
-
-#: src/diffuse/main.py:875
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "Transformar espacios iniciales en _tabuladores"
-
-#: src/diffuse/main.py:877
-msgid "_Increase Indenting"
-msgstr "Aumentar sangr_ía"
-
-#: src/diffuse/main.py:878
-msgid "De_crease Indenting"
-msgstr "Dis_minuir sangría"
-
-#: src/diffuse/main.py:880
-msgid "Convert To _DOS Format"
-msgstr "Transformar a formato _DOS"
-
-#: src/diffuse/main.py:881
-msgid "Convert To _Mac Format"
-msgstr "Transformar a formato _Mac"
-
-#: src/diffuse/main.py:882
-msgid "Convert To Uni_x Format"
-msgstr "Transformar a formato Uni_x"
-
-#: src/diffuse/main.py:885
-msgid "_Merge"
-msgstr "_Mezcla"
-
-#: src/diffuse/main.py:886
-msgid "Copy Selection _Right"
-msgstr "Copiar selección a la de_recha"
-
-#: src/diffuse/main.py:887
-msgid "Copy Selection _Left"
-msgstr "Copiar selección a la i_zquierda"
-
-#: src/diffuse/main.py:889
-msgid "Copy Left _Into Selection"
-msgstr "Copiar de _izquierda a la selección"
-
-#: src/diffuse/main.py:890
-msgid "Copy Right I_nto Selection"
-msgstr "Copiar de de_recha a la selección"
-
-#: src/diffuse/main.py:891
-msgid "_Merge From Left Then Right"
-msgstr "_Mezclar desde izquierda, después desde derecha"
-
-#: src/diffuse/main.py:892
-msgid "M_erge From Right Then Left"
-msgstr "M_ezclar desde derecha, después desde izquierda"
-
-#: src/diffuse/main.py:895
-msgid "_Help"
-msgstr "_Ayuda"
-
-#: src/diffuse/main.py:896
-msgid "_Help Contents..."
-msgstr "Índ_ice de ayuda..."
-
-#: src/diffuse/main.py:898
-#, python-format
-msgid "_About %s..."
-msgstr "_Acerca de %s..."
-
-#: src/diffuse/main.py:913
-msgid "New 2-Way File Merge"
-msgstr "Nueva mezcla de archivos de 2 vías"
-
-#: src/diffuse/main.py:914
-msgid "New 3-Way File Merge"
-msgstr "Nueva mezcla de archivos de 3 vías"
-
-#: src/diffuse/main.py:916
-msgid "Realign All"
-msgstr "Realinear todo"
-
-#: src/diffuse/main.py:917
-msgid "First Difference"
-msgstr "Primera diferencía"
-
-#: src/diffuse/main.py:918
-msgid "Previous Difference"
-msgstr "Diferencía anterior"
-
-#: src/diffuse/main.py:919
-msgid "Next Difference"
-msgstr "Siguiente diferencia"
-
-#: src/diffuse/main.py:920
-msgid "Last Difference"
-msgstr "Última diferencía"
-
-#: src/diffuse/main.py:922
-msgid "Copy Selection Right"
-msgstr "Copiar selección a la derecha"
-
-#: src/diffuse/main.py:923
-msgid "Copy Selection Left"
-msgstr "Copiar selección a la izquierda"
-
-#: src/diffuse/main.py:924
-msgid "Copy Left Into Selection"
-msgstr "Copiar de izquierda a la selección"
-
-#: src/diffuse/main.py:925
-msgid "Copy Right Into Selection"
-msgstr "Copiar de derecha a la selección"
-
-#: src/diffuse/main.py:926
-msgid "Merge From Left Then Right"
-msgstr "Mezclar desde izquierda, después desde derecha"
-
-#: src/diffuse/main.py:927
-msgid "Merge From Right Then Left"
-msgstr "Mezclar desde derecha, después desde izquierda"
-
-#: src/diffuse/main.py:929
-msgid "Undo"
-msgstr "Deshacer"
-
-#: src/diffuse/main.py:930
-msgid "Redo"
-msgstr "Rehacer"
-
-#: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
-msgid "Cut"
-msgstr "Cortar"
-
-#: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
-msgid "Copy"
-msgstr "Copiar"
-
-#: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
-msgid "Paste"
-msgstr "Pegar"
-
-#: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
-msgid "Clear Edits"
-msgstr "Deshacer todo"
-
-#: src/diffuse/main.py:1057
-msgid "Some files have unsaved changes. Select the files to save before closing."
-msgstr ""
-"Algunos archivos tienen cambios. Elija los archivos a guardar antes de cerrar."
-
-#: src/diffuse/main.py:1071
-msgid "Tab"
-msgstr "Pestaña"
-
-#: src/diffuse/main.py:1076
-msgid "Pane"
-msgstr "Panel"
-
-#: src/diffuse/main.py:1087
-msgid "Close _Without Saving"
-msgstr "Cerrar _sin guardar"
-
-#: src/diffuse/main.py:1126
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "Cerrar esta pestaña terminará %s."
-
-#: src/diffuse/main.py:1209
-#, python-format
-msgid "File Merge %d"
-msgstr "Mezcla de archivo %d"
-
-#: src/diffuse/main.py:1315
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "Error recibiendo commits de %s."
-
-#: src/diffuse/main.py:1347
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "Error recibiendo modificaciones de %s."
-
-#: src/diffuse/main.py:1380
-msgid "Open File In New Tab"
-msgstr "Abrir archivo en una pestaña nueva"
-
-#: src/diffuse/main.py:1403
-msgid "Choose Folder With Modified Files"
-msgstr "Seleccionar carpeta con archivos modificados"
-
-#: src/diffuse/main.py:1421
-msgid "No modified files found."
-msgstr "No se encontraron archivos modificados."
-
-#: src/diffuse/main.py:1427
-msgid "Choose Folder With Commit"
-msgstr "Seleccionar carpeta con revisiónes"
-
-#: src/diffuse/main.py:1447
-msgid "No committed files found."
-msgstr "No se encontraron archivos confirmados."
-
-#: src/diffuse/main.py:1483
-msgid "New N-Way File Merge..."
-msgstr "Nueva mezcla de archivos de N vías..."
-
-#: src/diffuse/main.py:1484
-msgid "Number of panes: "
-msgstr "Número de paneles: "
-
-#: src/diffuse/main.py:1558
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "Frase no encontrada. ¿Continuar desde final del archivo?"
-
-#: src/diffuse/main.py:1560
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "Frase no encontrada. ¿Continuar desde principio del archivo?"
-
-#: src/diffuse/main.py:1781
-msgid ""
-"Usage:\n"
-"    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"
-"also retrieve revisions of files from several VCSs for comparison and merging.\n"
-"\n"
-"Help Options:\n"
-"  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright information\n"
-"\n"
-"Configuration Options:\n"
-"  --no-rcfile                      Do not read any resource files\n"
-"  --rcfile <file>                  Specify explicit resource file\n"
-"\n"
-"General Options:\n"
-"  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
-"  ( -D | --close-if-same )         Close all tabs with no differences\n"
-"  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
-"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
-"  ( -m | --modified )              Create a new tab for each modified file\n"
-"  ( -r | --revision ) <rev>        File revision <rev>\n"
-"  ( -s | --separate )              Create a new tab for each file\n"
-"  ( -t | --tab )                   Start a new tab\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    Start with line <line> selected\n"
-"  --null-file                      Create a blank file comparison pane\n"
-"\n"
-"Display Options:\n"
-"  ( -b | --ignore-space-change )   Ignore changes to white space\n"
-"  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
-"  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
-"  ( -i | --ignore-case )           Ignore case differences\n"
-"  ( -w | --ignore-all-space )      Ignore white space differences"
-msgstr ""
-"Uso:\n"
-"    diffuse [ OPTION...] [FILE...]\n"
-"    diffuse ( -h | -? | --help | -v | --version )\n"
-"\n"
-"Diffuse es una herramienta gráfica para fusionar y comparar archivos de texto. "
-"Diffuse es\n"
-"capaz de comparar un número arbitrario de archivos uno al lado del otro y ofrece "
-"la posibilidad\n"
-"de ajustar manualmente la coincidencia de líneas y editar directamente los "
-"archivos. Diffuse\n"
-"también puede recuperar revisiones de archivos de varios VCS para su comparación "
-"y fusión.\n"
-"\n"
-"Opciones de ayuda:\n"
-"  ( -h | -? | --help )           Muestra esta información de uso\n"
-"  ( -v | --version )             Muestra información de versionado y copyright\n"
-"\n"
-"Opciones de configuración:\n"
-"  --no-rcfile                    No leer archivos de recursos\n"
-"  --rcfile <file>                Especificar ficherarchivoo 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"
-"  ( -L | --label ) <label>         Mostrar <label> en lugar del nombre del "
-"archivo\n"
-"  ( -m | --modified )            Crea nueva pestaña para cada fich. modificado\n"
-"  ( -r | --revision ) <rev>      Revisión de archivo <rev>\n"
-"  ( -s | --separate )            Crea nueva pestaña para cada archivo\n"
-"  ( -t | --tab )                 Inicia pestaña nueva\n"
-"  ( -V | --vcs ) <vcs-list>        Orden de búsqueda del sistema de control de "
-"versiones\n"
-"  --line <line>                    Comienza con la línea <line> seleccionada\n"
-"  --null-file                    Crea panel vacío de comparación de archivos\n"
-"\n"
-"Opciones de visualización:\n"
-"  ( -b | --ignore-space-change ) Ignorar cambios en espaciado\n"
-"  ( -B | --ignore-blank-lines )  Ignorar cambios en líneas vacías\n"
-"  ( -E | --ignore-end-of-line )  Ignorar cambios en fin de línea\n"
-"  ( -i | --ignore-case )         Ignorar cambios de capitalización\n"
-"  ( -w | --ignore-all-space )    Ignorar todos los cambios en espaciado"
-
-#: src/diffuse/main.py:1948
+#: src/diffuse/main.py:327
 msgid "Error parsing line number."
 msgstr "Error analizando número de líneas."
 
-#: src/diffuse/main.py:1958
-#, python-format
-msgid "Skipping unknown argument \"%s\"."
-msgstr "Omitiendo argumento desconocido \"%s\"."
-
-#: src/diffuse/main.py:1966
+#: src/diffuse/main.py:343
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Error processando parámetro \"%s\".  No se esperaba un directorio."
 
-#: src/diffuse/preferences.py:80
+#: src/diffuse/preferences.py:75
 msgid "Display"
 msgstr "Visualización"
 
-#: src/diffuse/preferences.py:83
+#: src/diffuse/preferences.py:78
 msgid "Font"
 msgstr "Tipo"
 
-#: src/diffuse/preferences.py:84
+#: src/diffuse/preferences.py:79
 msgid "Tab width"
 msgstr "Tamaño de tabulador"
 
-#: src/diffuse/preferences.py:85
+#: src/diffuse/preferences.py:80
 msgid "Show right margin"
 msgstr "Mostrar margen derecho"
 
-#: src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:81
 msgid "Right margin"
 msgstr "Margen derecho"
 
-#: src/diffuse/preferences.py:87
+#: src/diffuse/preferences.py:82
 msgid "Show line numbers"
 msgstr "Mostrar números de línea"
 
-#: src/diffuse/preferences.py:88
+#: src/diffuse/preferences.py:83
 msgid "Show white space characters"
 msgstr "Mostrar espacios"
 
-#: src/diffuse/preferences.py:89
-msgid "Ignore case differences"
-msgstr "Ignorar diferencías de capitalización"
-
-#: src/diffuse/preferences.py:90
-msgid "Ignore white space differences"
-msgstr "Ignorar diferencías de espacios"
-
-#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100
-msgid "Ignore changes to white space"
-msgstr "Ignorar cambios de espacios"
-
-#: src/diffuse/preferences.py:92
+#: src/diffuse/preferences.py:87
 msgid "Ignore blank line differences"
 msgstr "Ignorar diferencías de líneas vacías"
 
-#: src/diffuse/preferences.py:93
-msgid "Ignore end of line differences"
-msgstr "Ignorar diferencias en caracteres de fin de línea"
-
-#: src/diffuse/preferences.py:95
+#: src/diffuse/preferences.py:90
 msgid "Alignment"
 msgstr "Alineación"
 
-#: src/diffuse/preferences.py:98
+#: src/diffuse/preferences.py:93
 msgid "Ignore case"
 msgstr "Ignorar capitalización"
 
-#: src/diffuse/preferences.py:99
+#: src/diffuse/preferences.py:94
 msgid "Ignore white space"
 msgstr "Ignorar espacios"
 
-#: src/diffuse/preferences.py:101
+#: src/diffuse/preferences.py:96
 msgid "Ignore blank lines"
 msgstr "Ignorar líneas vacías"
 
-#: src/diffuse/preferences.py:102
+#: src/diffuse/preferences.py:97
 msgid "Ignore end of line characters"
 msgstr "Ignorar caracteres de fin de línea"
 
-#: src/diffuse/preferences.py:104
+#: src/diffuse/preferences.py:99
 msgid "Editor"
 msgstr "Editor"
 
-#: src/diffuse/preferences.py:107
+#: src/diffuse/preferences.py:102
 msgid "Auto indent"
 msgstr "Sangría automática"
 
-#: src/diffuse/preferences.py:108
+#: src/diffuse/preferences.py:103
 msgid "Expand tabs to spaces"
 msgstr "Ampliar tabuladores a espacios"
 
-#: src/diffuse/preferences.py:109
+#: src/diffuse/preferences.py:104
 msgid "Soft tab width"
 msgstr "Tabuladores blandos"
 
-#: src/diffuse/preferences.py:111
+#: src/diffuse/preferences.py:106
 msgid "Tabs"
 msgstr "Pestañas"
 
-#: src/diffuse/preferences.py:114
+#: src/diffuse/preferences.py:109
 msgid "Default panes"
 msgstr "Paneles predeterminados"
 
-#: src/diffuse/preferences.py:115
+#: src/diffuse/preferences.py:110
 msgid "Always show the tab bar"
 msgstr "Mostrar siempre barra de pestañas"
 
-#: src/diffuse/preferences.py:116
+#: src/diffuse/preferences.py:111
 #, 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:118
+#: src/diffuse/preferences.py:113
 msgid "Regional Settings"
 msgstr "Ajustes regionales"
 
-#: src/diffuse/preferences.py:121
+#: src/diffuse/preferences.py:116
 msgid "Default codec"
 msgstr "Codificación estándar"
 
-#: src/diffuse/preferences.py:122
+#: src/diffuse/preferences.py:117
 msgid "Order of codecs used to identify encoding"
 msgstr "Orden de codificaciones en identificación"
 
-#: src/diffuse/preferences.py:143
+#: src/diffuse/preferences.py:138
 msgid "Cygwin"
 msgstr "Cygwin"
 
-#: src/diffuse/preferences.py:145
+#: src/diffuse/preferences.py:140
 msgid "Root directory"
 msgstr "Directorio raíz"
 
-#: src/diffuse/preferences.py:146
+#: src/diffuse/preferences.py:141
 msgid "Cygdrive prefix"
 msgstr "Prefijo de Cygdrive"
 
-#: src/diffuse/preferences.py:165
-msgid "Version control system search order"
-msgstr "Orden de búsqueda del sistema de control de versiones"
-
-#: src/diffuse/preferences.py:173
+#: src/diffuse/preferences.py:167
 msgid "\"co\" command"
 msgstr "Comando \"co\""
 
-#: src/diffuse/preferences.py:174
+#: src/diffuse/preferences.py:168
 msgid "\"rlog\" command"
 msgstr "Comando \"rlog\""
 
-#: src/diffuse/preferences.py:176
+#: src/diffuse/preferences.py:170
 msgid "Command"
 msgstr "Comando"
 
-#: src/diffuse/preferences.py:182
+#: src/diffuse/preferences.py:176
 msgid "Launch from a Bash login shell"
 msgstr "Lanzar desde línea de comandos Bash"
 
-#: src/diffuse/preferences.py:189
+#: src/diffuse/preferences.py:183
 msgid "Update paths for Cygwin"
 msgstr "Actualizar rutas de Cygwin"
 
-#: src/diffuse/preferences.py:194
+#: src/diffuse/preferences.py:188
 msgid "Version Control"
 msgstr "Control de versión"
 
-#: src/diffuse/preferences.py:259
+#: src/diffuse/preferences.py:253
 msgid "Preferences"
 msgstr "Preferencias"
 
+#: src/diffuse/preferences.py:294 src/diffuse/window.py:580
+#, python-format
+msgid "Error writing %s."
+msgstr "Error guardando %s."
+
+#: src/diffuse/preferences.py:483 src/diffuse/window.py:446
+#: src/diffuse/window.py:1413 src/diffuse/window.py:1436 src/diffuse/window.py:1459
+msgid "_Open"
+msgstr ""
+
 #: src/diffuse/resources.py:242 src/diffuse/resources.py:246
 #: src/diffuse/resources.py:249
 #, python-brace-format
@@ -945,16 +419,11 @@ msgstr "Error no controlado en la línea {line} de {file}."
 msgid "Auto Detect"
 msgstr "Reconocimiento automático"
 
-#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97
+#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:96
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "Error analizando revisión %s."
 
-#: src/diffuse/vcs/vcs_registry.py:238
-#, python-format
-msgid "Error parsing %s."
-msgstr "Error analizando %s."
-
 #: src/diffuse/widgets.py:1857
 msgid "Align with Selection"
 msgstr "Alinear con la selección"
@@ -967,10 +436,651 @@ msgstr "Aislar"
 msgid "Merge Selection"
 msgstr "Mezclar selección"
 
+#: src/diffuse/widgets.py:1861 src/diffuse/window.py:865
+msgid "Cut"
+msgstr "Cortar"
+
+#: src/diffuse/widgets.py:1862 src/diffuse/window.py:866
+msgid "Copy"
+msgstr "Copiar"
+
+#: src/diffuse/widgets.py:1863 src/diffuse/window.py:867
+msgid "Paste"
+msgstr "Pegar"
+
 #: src/diffuse/widgets.py:1865
 msgid "Select All"
 msgstr "Seleccionar todo"
 
+#: src/diffuse/widgets.py:1866 src/diffuse/window.py:868
+msgid "Clear Edits"
+msgstr "Deshacer todo"
+
 #: src/diffuse/widgets.py:1868
 msgid "Swap with Selected Pane"
 msgstr "Reemplazar con panel seleccionado"
+
+#: src/diffuse/window.py:83
+msgid "Close Tab"
+msgstr "Cerrar pestaña"
+
+#: src/diffuse/window.py:126
+msgid "Open File..."
+msgstr "Abrir archivo..."
+
+#: src/diffuse/window.py:127
+msgid "Reload File"
+msgstr "Recargar archivo"
+
+#: src/diffuse/window.py:128
+msgid "Save File"
+msgstr "Guardar archivo"
+
+#: src/diffuse/window.py:129
+msgid "Save File As..."
+msgstr "Guardar archivo como..."
+
+#: src/diffuse/window.py:228
+#, python-format
+msgid "Column %d"
+msgstr ""
+
+#: src/diffuse/window.py:306
+msgid "Save changes before loading the new file?"
+msgstr "¿Guardar cambios antes de abrir el archivo nuevo?"
+
+#: src/diffuse/window.py:310
+msgid "_No"
+msgstr ""
+
+#: src/diffuse/window.py:311
+msgid "_Yes"
+msgstr ""
+
+#: src/diffuse/window.py:417
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "Error leyendo revisión %(rev)s de %(file)s."
+
+#: src/diffuse/window.py:442
+msgid "Open File"
+msgstr "Abrir archivo"
+
+#: src/diffuse/window.py:495
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "Guardar Panel %(title)s %(pane)d"
+
+#: src/diffuse/window.py:499 src/diffuse/window.py:1111
+#, fuzzy
+msgid "_Save"
+msgstr "_Guardar archivo"
+
+#: src/diffuse/window.py:527
+#, python-format
+msgid "A file named %s already exists. Do you want to overwrite it?"
+msgstr "Ya existe un archivo llamado %s. ¿Quiere reemplazarlo?"
+
+#: src/diffuse/window.py:534
+#, 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 ""
+"El archivo %s ha sido modificado por otro proceso desde que se cargó. Sí se "
+"guarda, todos los cambios realizados por procesos externos se perderán. ¿Desea "
+"guardar de todos modos?"
+
+#: src/diffuse/window.py:576
+#, python-format
+msgid "Error encoding to %s."
+msgstr "Error codificando a %s."
+
+#: src/diffuse/window.py:610
+msgid "Go To Line..."
+msgstr "Ir a línea..."
+
+#: src/diffuse/window.py:611
+msgid "Line Number: "
+msgstr "Número de línea: "
+
+#: src/diffuse/window.py:642
+msgid ""
+"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."
+
+#: src/diffuse/window.py:646
+msgid "Press the escape key to finish editing."
+msgstr "Pulse Escape para finalizar la edición."
+
+#: src/diffuse/window.py:649
+msgid ""
+"Select target line and press the space bar to align. Press the escape key to "
+"cancel."
+msgstr ""
+"Selecciona la línea y pulsa espacio para alinear. Pulsa Escape para cancelar."
+
+#: src/diffuse/window.py:710
+msgid "_File"
+msgstr "_Archivo"
+
+#: src/diffuse/window.py:712
+msgid "_Open File..."
+msgstr "_Abrir archivo..."
+
+#: src/diffuse/window.py:713
+msgid "Open File In New _Tab..."
+msgstr "Abrir archivo en nueva _pestaña..."
+
+#: src/diffuse/window.py:714
+msgid "Open _Modified Files..."
+msgstr "Abrir archivos _modificados..."
+
+#: src/diffuse/window.py:715
+msgid "Open Commi_t..."
+msgstr "Abrir revi_sión..."
+
+#: src/diffuse/window.py:716
+msgid "_Reload File"
+msgstr "_Recargar archivo"
+
+#: src/diffuse/window.py:718
+msgid "_Save File"
+msgstr "_Guardar archivo"
+
+#: src/diffuse/window.py:719
+msgid "Save File _As..."
+msgstr "Guardar _archivo como..."
+
+#: src/diffuse/window.py:720
+msgid "Save A_ll"
+msgstr "Gu_ardar todo"
+
+#: src/diffuse/window.py:722
+msgid "New _2-Way File Merge"
+msgstr "Nueva mezcla de archivos de _2 vías"
+
+#: src/diffuse/window.py:723
+msgid "New _3-Way File Merge"
+msgstr "Nueva mezcla de archivos de _3 vías"
+
+#: src/diffuse/window.py:724
+msgid "New _N-Way File Merge..."
+msgstr "Nueva mezcla de archivos de _N vías..."
+
+#: src/diffuse/window.py:726
+msgid "_Close Tab"
+msgstr "_Cerrar pestaña"
+
+#: src/diffuse/window.py:727
+msgid "_Undo Close Tab"
+msgstr "_Deshacer cerrar pestaña"
+
+#: src/diffuse/window.py:728
+msgid "_Quit"
+msgstr "_Salir"
+
+#: src/diffuse/window.py:732
+msgid "_Edit"
+msgstr "_Editar"
+
+#: src/diffuse/window.py:734
+msgid "_Undo"
+msgstr "_Deshacer"
+
+#: src/diffuse/window.py:735
+msgid "_Redo"
+msgstr "_Rehacer"
+
+#: src/diffuse/window.py:737
+msgid "Cu_t"
+msgstr "Cor_tar"
+
+#: src/diffuse/window.py:738
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: src/diffuse/window.py:739
+msgid "_Paste"
+msgstr "_Pegar"
+
+#: src/diffuse/window.py:741
+msgid "Select _All"
+msgstr "Seleccion_ar todo"
+
+#: src/diffuse/window.py:742
+msgid "C_lear Edits"
+msgstr "_Deshacer todo"
+
+#: src/diffuse/window.py:743
+msgid "_Dismiss All Edits"
+msgstr "_Ignorar todas las ediciones"
+
+#: src/diffuse/window.py:745
+msgid "_Find..."
+msgstr "_Buscar..."
+
+#: src/diffuse/window.py:746
+msgid "Find _Next"
+msgstr "Buscar siguie_nte"
+
+#: src/diffuse/window.py:747
+msgid "Find Pre_vious"
+msgstr "Buscar an_terior"
+
+#: src/diffuse/window.py:748
+msgid "_Go To Line..."
+msgstr "_Ir a la línea..."
+
+#: src/diffuse/window.py:750
+msgid "Pr_eferences..."
+msgstr "Pr_eferencias..."
+
+#: src/diffuse/window.py:754
+msgid "None"
+msgstr "Ninguno"
+
+#: src/diffuse/window.py:776
+msgid "_View"
+msgstr "_Ver"
+
+#: src/diffuse/window.py:778
+msgid "_Syntax Highlighting"
+msgstr "Coloreado _sintáctico"
+
+#: src/diffuse/window.py:780
+msgid "Re_align All"
+msgstr "Re_alinear todo"
+
+#: src/diffuse/window.py:781
+msgid "_Isolate"
+msgstr "A_islar"
+
+#: src/diffuse/window.py:783
+msgid "_First Difference"
+msgstr "Primera di_ferencia"
+
+#: src/diffuse/window.py:784
+msgid "_Previous Difference"
+msgstr "Diferencia an_terior"
+
+#: src/diffuse/window.py:785
+msgid "_Next Difference"
+msgstr "Diferencia siguie_nte"
+
+#: src/diffuse/window.py:786
+msgid "_Last Difference"
+msgstr "Ú_ltima diferencia"
+
+#: src/diffuse/window.py:788
+msgid "Fir_st Tab"
+msgstr "Prime_ra pestaña"
+
+#: src/diffuse/window.py:789
+msgid "Pre_vious Tab"
+msgstr "Pestaña ante_rior"
+
+#: src/diffuse/window.py:790
+msgid "Next _Tab"
+msgstr "Siguiente _pestaña"
+
+#: src/diffuse/window.py:791
+msgid "Las_t Tab"
+msgstr "Ul_tima pestaña"
+
+#: src/diffuse/window.py:793
+msgid "Shift Pane _Right"
+msgstr "Cambiar panel _derecho"
+
+#: src/diffuse/window.py:794
+msgid "Shift Pane _Left"
+msgstr "Cambiar panel _izquierdo"
+
+#: src/diffuse/window.py:798
+msgid "F_ormat"
+msgstr "F_ormato"
+
+#: src/diffuse/window.py:800
+msgid "Convert To _Upper Case"
+msgstr "Transformar en letras mayúsculas"
+
+#: src/diffuse/window.py:801
+msgid "Convert To _Lower Case"
+msgstr "Transformar en letras minúsculas"
+
+#: src/diffuse/window.py:803
+msgid "Sort Lines In _Ascending Order"
+msgstr "Ordenar lineas en orden _ascendente"
+
+#: src/diffuse/window.py:804
+msgid "Sort Lines In D_escending Order"
+msgstr "Ordenar lineas en orden _descendente"
+
+#: src/diffuse/window.py:806
+msgid "Remove Trailing _White Space"
+msgstr "Quitar _espacios finales"
+
+#: src/diffuse/window.py:807
+msgid "Convert Tabs To _Spaces"
+msgstr "Transformar tabuladores en e_spacios"
+
+#: src/diffuse/window.py:808
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "Transformar espacios iniciales en _tabuladores"
+
+#: src/diffuse/window.py:810
+msgid "_Increase Indenting"
+msgstr "Aumentar sangr_ía"
+
+#: src/diffuse/window.py:811
+msgid "De_crease Indenting"
+msgstr "Dis_minuir sangría"
+
+#: src/diffuse/window.py:813
+msgid "Convert To _DOS Format"
+msgstr "Transformar a formato _DOS"
+
+#: src/diffuse/window.py:814
+msgid "Convert To _Mac Format"
+msgstr "Transformar a formato _Mac"
+
+#: src/diffuse/window.py:815
+msgid "Convert To Uni_x Format"
+msgstr "Transformar a formato Uni_x"
+
+#: src/diffuse/window.py:819
+msgid "_Merge"
+msgstr "_Mezcla"
+
+#: src/diffuse/window.py:821
+msgid "Copy Selection _Right"
+msgstr "Copiar selección a la de_recha"
+
+#: src/diffuse/window.py:822
+msgid "Copy Selection _Left"
+msgstr "Copiar selección a la i_zquierda"
+
+#: src/diffuse/window.py:824
+msgid "Copy Left _Into Selection"
+msgstr "Copiar de _izquierda a la selección"
+
+#: src/diffuse/window.py:825
+msgid "Copy Right I_nto Selection"
+msgstr "Copiar de de_recha a la selección"
+
+#: src/diffuse/window.py:826
+msgid "_Merge From Left Then Right"
+msgstr "_Mezclar desde izquierda, después desde derecha"
+
+#: src/diffuse/window.py:827
+msgid "M_erge From Right Then Left"
+msgstr "M_ezclar desde derecha, después desde izquierda"
+
+#: src/diffuse/window.py:831
+msgid "_Help"
+msgstr "_Ayuda"
+
+#: src/diffuse/window.py:833
+msgid "_Help Contents..."
+msgstr "Índ_ice de ayuda..."
+
+#: src/diffuse/window.py:835
+#, python-format
+msgid "_About %s..."
+msgstr "_Acerca de %s..."
+
+#: src/diffuse/window.py:847
+msgid "New 2-Way File Merge"
+msgstr "Nueva mezcla de archivos de 2 vías"
+
+#: src/diffuse/window.py:848
+msgid "New 3-Way File Merge"
+msgstr "Nueva mezcla de archivos de 3 vías"
+
+#: src/diffuse/window.py:850
+msgid "Realign All"
+msgstr "Realinear todo"
+
+#: src/diffuse/window.py:851
+msgid "First Difference"
+msgstr "Primera diferencía"
+
+#: src/diffuse/window.py:852
+msgid "Previous Difference"
+msgstr "Diferencía anterior"
+
+#: src/diffuse/window.py:853
+msgid "Next Difference"
+msgstr "Siguiente diferencia"
+
+#: src/diffuse/window.py:854
+msgid "Last Difference"
+msgstr "Última diferencía"
+
+#: src/diffuse/window.py:856
+msgid "Copy Selection Right"
+msgstr "Copiar selección a la derecha"
+
+#: src/diffuse/window.py:857
+msgid "Copy Selection Left"
+msgstr "Copiar selección a la izquierda"
+
+#: src/diffuse/window.py:858
+msgid "Copy Left Into Selection"
+msgstr "Copiar de izquierda a la selección"
+
+#: src/diffuse/window.py:859
+msgid "Copy Right Into Selection"
+msgstr "Copiar de derecha a la selección"
+
+#: src/diffuse/window.py:860
+msgid "Merge From Left Then Right"
+msgstr "Mezclar desde izquierda, después desde derecha"
+
+#: src/diffuse/window.py:861
+msgid "Merge From Right Then Left"
+msgstr "Mezclar desde derecha, después desde izquierda"
+
+#: src/diffuse/window.py:863
+msgid "Undo"
+msgstr "Deshacer"
+
+#: src/diffuse/window.py:864
+msgid "Redo"
+msgstr "Rehacer"
+
+#: src/diffuse/window.py:950
+msgid "Changes detected"
+msgstr ""
+
+#: src/diffuse/window.py:954
+#, fuzzy, python-format
+msgid ""
+"The file \"%s\" changed on disk.\n"
+"\n"
+"Do you want to reload the file?"
+msgstr "El archivo %s ha cambiado en disco. ¿Quiere recargarlo?"
+
+#: src/diffuse/window.py:959
+#, fuzzy, python-format
+msgid ""
+"The following files changed on disk:\n"
+"%s\n"
+"\n"
+"Do you want to reload these files?"
+msgstr "El archivo %s ha cambiado en disco. ¿Quiere recargarlo?"
+
+#: src/diffuse/window.py:1078
+msgid "Some files have unsaved changes. Select the files to save before closing."
+msgstr ""
+"Algunos archivos tienen cambios. Elija los archivos a guardar antes de cerrar."
+
+#: src/diffuse/window.py:1092
+msgid "Tab"
+msgstr "Pestaña"
+
+#: src/diffuse/window.py:1097
+msgid "Pane"
+msgstr "Panel"
+
+#: src/diffuse/window.py:1108
+msgid "Close _Without Saving"
+msgstr "Cerrar _sin guardar"
+
+#: src/diffuse/window.py:1147
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "Cerrar esta pestaña terminará %s."
+
+#: src/diffuse/window.py:1224
+#, python-format
+msgid "File Merge %d"
+msgstr "Mezcla de archivo %d"
+
+#: src/diffuse/window.py:1344
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "Error recibiendo commits de %s."
+
+#: src/diffuse/window.py:1376
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "Error recibiendo modificaciones de %s."
+
+#: src/diffuse/window.py:1409
+msgid "Open File In New Tab"
+msgstr "Abrir archivo en una pestaña nueva"
+
+#: src/diffuse/window.py:1432
+msgid "Choose Folder With Modified Files"
+msgstr "Seleccionar carpeta con archivos modificados"
+
+#: src/diffuse/window.py:1450
+msgid "No modified files found."
+msgstr "No se encontraron archivos modificados."
+
+#: src/diffuse/window.py:1456
+msgid "Choose Folder With Commit"
+msgstr "Seleccionar carpeta con revisiónes"
+
+#: src/diffuse/window.py:1476
+msgid "No committed files found."
+msgstr "No se encontraron archivos confirmados."
+
+#: src/diffuse/window.py:1512
+msgid "New N-Way File Merge..."
+msgstr "Nueva mezcla de archivos de N vías..."
+
+#: src/diffuse/window.py:1513
+msgid "Number of panes: "
+msgstr "Número de paneles: "
+
+#: src/diffuse/window.py:1587
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "Frase no encontrada. ¿Continuar desde final del archivo?"
+
+#: src/diffuse/window.py:1589
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "Frase no encontrada. ¿Continuar desde principio del archivo?"
+
+#: src/diffuse/window.py:1762
+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/window.py:1766
+msgid "translator-credits"
+msgstr ""
+"Henri Menke <henrimenke4@aim.com>\n"
+"David Marín Carreño <davefx@gmail.com>\n"
+"Óscar Fernández Díaz <oscfdezdz@tuta.io>"
+
+#~ msgid "Main window: diff between two files"
+#~ msgstr "Ventana principal: diferencia entre dos archivos"
+
+#~ msgid ""
+#~ "Usage:\n"
+#~ "    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"
+#~ "also retrieve revisions of files from several VCSs for comparison and "
+#~ "merging.\n"
+#~ "\n"
+#~ "Help Options:\n"
+#~ "  ( -h | -? | --help )             Display this usage information\n"
+#~ "  ( -v | --version )               Display version and copyright information\n"
+#~ "\n"
+#~ "Configuration Options:\n"
+#~ "  --no-rcfile                      Do not read any resource files\n"
+#~ "  --rcfile <file>                  Specify explicit resource file\n"
+#~ "\n"
+#~ "General Options:\n"
+#~ "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
+#~ "  ( -D | --close-if-same )         Close all tabs with no differences\n"
+#~ "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+#~ "  ( -L | --label ) <label>         Display <label> instead of the file name\n"
+#~ "  ( -m | --modified )              Create a new tab for each modified file\n"
+#~ "  ( -r | --revision ) <rev>        File revision <rev>\n"
+#~ "  ( -s | --separate )              Create a new tab for each file\n"
+#~ "  ( -t | --tab )                   Start a new tab\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    Start with line <line> selected\n"
+#~ "  --null-file                      Create a blank file comparison pane\n"
+#~ "\n"
+#~ "Display Options:\n"
+#~ "  ( -b | --ignore-space-change )   Ignore changes to white space\n"
+#~ "  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
+#~ "  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
+#~ "  ( -i | --ignore-case )           Ignore case differences\n"
+#~ "  ( -w | --ignore-all-space )      Ignore white space differences"
+#~ msgstr ""
+#~ "Uso:\n"
+#~ "    diffuse [ OPTION...] [FILE...]\n"
+#~ "    diffuse ( -h | -? | --help | -v | --version )\n"
+#~ "\n"
+#~ "Diffuse es una herramienta gráfica para fusionar y comparar archivos de texto. "
+#~ "Diffuse es\n"
+#~ "capaz de comparar un número arbitrario de archivos uno al lado del otro y "
+#~ "ofrece la posibilidad\n"
+#~ "de ajustar manualmente la coincidencia de líneas y editar directamente los "
+#~ "archivos. Diffuse\n"
+#~ "también puede recuperar revisiones de archivos de varios VCS para su "
+#~ "comparación y fusión.\n"
+#~ "\n"
+#~ "Opciones de ayuda:\n"
+#~ "  ( -h | -? | --help )           Muestra esta información de uso\n"
+#~ "  ( -v | --version )             Muestra información de versionado y "
+#~ "copyright\n"
+#~ "\n"
+#~ "Opciones de configuración:\n"
+#~ "  --no-rcfile                    No leer archivos de recursos\n"
+#~ "  --rcfile <file>                Especificar ficherarchivoo 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"
+#~ "  ( -L | --label ) <label>         Mostrar <label> en lugar del nombre del "
+#~ "archivo\n"
+#~ "  ( -m | --modified )            Crea nueva pestaña para cada fich. "
+#~ "modificado\n"
+#~ "  ( -r | --revision ) <rev>      Revisión de archivo <rev>\n"
+#~ "  ( -s | --separate )            Crea nueva pestaña para cada archivo\n"
+#~ "  ( -t | --tab )                 Inicia pestaña nueva\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Orden de búsqueda del sistema de control de "
+#~ "versiones\n"
+#~ "  --line <line>                    Comienza con la línea <line> seleccionada\n"
+#~ "  --null-file                    Crea panel vacío de comparación de archivos\n"
+#~ "\n"
+#~ "Opciones de visualización:\n"
+#~ "  ( -b | --ignore-space-change ) Ignorar cambios en espaciado\n"
+#~ "  ( -B | --ignore-blank-lines )  Ignorar cambios en líneas vacías\n"
+#~ "  ( -E | --ignore-end-of-line )  Ignorar cambios en fin de línea\n"
+#~ "  ( -i | --ignore-case )         Ignorar cambios de capitalización\n"
+#~ "  ( -w | --ignore-all-space )    Ignorar todos los cambios en espaciado"
diff --git a/po/fr.po b/po/fr.po
index 9ae9e76..23cbcab 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-23 20:00-0400\n"
+"POT-Creation-Date: 2023-04-16 14:09-0400\n"
 "PO-Revision-Date: 2022-04-04 11:58-0400\n"
 "Last-Translator: Romain Failliot <romain.failliot@foolstep.com>\n"
 "Language-Team: French\n"
@@ -29,839 +29,309 @@ msgid "Graphical tool for merging and comparing text files"
 msgstr "Outil graphique pour fusionner et comparer des fichiers texte"
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:7
+#, fuzzy
 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."
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, and "
+"Subversion repositories."
 msgstr ""
 "Diffuse est un outil graphique pour comparer et fusionner des fichiers textes. Il "
 "peut récupérer et comparer les fichiers à partir de dépôts Bazaar, CVS, Darcs, "
 "Git, Mercurial, Monotone, RCS, Subversion, et SVK."
 
-#: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
-msgid "Main window: diff between two files"
-msgstr "Fenêtre principale: diff entre deux fichiers"
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:28
+msgid "Main window"
+msgstr "Fenêtre principale"
 
-#: src/diffuse/constants.py:25
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:32
+msgid "About window"
+msgstr "Fenêtre À Propos"
+
+#: src/diffuse/constants.py:26
 msgid "Copyright"
 msgstr "Copyright"
 
-#: src/diffuse/dialogs.py:40
-msgid "Diffuse is a graphical tool for merging and comparing text files."
+#: src/diffuse/dialogs.py:46 src/diffuse/dialogs.py:89 src/diffuse/dialogs.py:133
+#: src/diffuse/preferences.py:254 src/diffuse/preferences.py:483
+#: src/diffuse/window.py:309 src/diffuse/window.py:1107
+msgid "_Cancel"
 msgstr ""
-"Diffuse est un outil graphique pour fusionner et comparer des fichiers textes."
 
-#: src/diffuse/dialogs.py:45
-msgid "translator-credits"
-msgstr "Romain Failliot <romain.failliot@foolstep.com>"
-
-#: src/diffuse/dialogs.py:82
+#: src/diffuse/dialogs.py:50
 msgid "Encoding: "
 msgstr "Encodage: "
 
-#: src/diffuse/dialogs.py:94
+#: src/diffuse/dialogs.py:62
 msgid "Revision: "
 msgstr "Révision: "
 
-#: src/diffuse/dialogs.py:156
+#: src/diffuse/dialogs.py:90 src/diffuse/dialogs.py:134
+#: src/diffuse/preferences.py:255
+msgid "_OK"
+msgstr ""
+
+#: src/diffuse/dialogs.py:130
 msgid "Find..."
 msgstr "Rechercher..."
 
-#: src/diffuse/dialogs.py:164
+#: src/diffuse/dialogs.py:140
 msgid "Search For: "
 msgstr "Rechercher: "
 
-#: src/diffuse/dialogs.py:189
+#: src/diffuse/dialogs.py:165
 msgid "Match Case"
 msgstr "Respecter la casse"
 
-#: src/diffuse/dialogs.py:194
+#: src/diffuse/dialogs.py:170
 msgid "Search Backwards"
 msgstr "Rechercher vers le haut"
 
+#: src/diffuse/main.py:53
+msgid "Display version and copyright information"
+msgstr "Afficher les informations de version et de copyright"
+
+#: src/diffuse/main.py:61
+msgid "Do not read any resource files"
+msgstr "Ne lire aucun fichier de ressource"
+
+#: src/diffuse/main.py:69
+msgid "Specify explicit resource file"
+msgstr "Spécifier explicitement un fichier de ressource"
+
+#: src/diffuse/main.py:77
+msgid "File revisions <rev-1> and <rev>"
+msgstr "Comparer le fichier aux révisions <rev-1> et <rev>"
+
 #: src/diffuse/main.py:85
-msgid "Close Tab"
-msgstr "Fermer l'onglet"
+msgid "Close all tabs with no differences"
+msgstr "Fermer tous les onglets sans différences"
 
-#: src/diffuse/main.py:132
-msgid "Open File..."
-msgstr "Ouvrir un fichier..."
+#: src/diffuse/main.py:92
+msgid "Use <codec> to read and write files"
+msgstr "Utiliser le <codec> pour lire et écrire fichiers"
 
-#: src/diffuse/main.py:133
-msgid "Reload File"
-msgstr "Recharger le fichier"
+#: src/diffuse/main.py:100
+msgid "Display <label> instead of the file name"
+msgstr "Afficher <label> au lieu du nom du fichier"
 
-#: src/diffuse/main.py:134
-msgid "Save File"
-msgstr "Enregistrer le fichier"
+#: src/diffuse/main.py:108
+msgid "Create a new tab for each modified file"
+msgstr "Créer un nouvel onglet pour chaque fichier modifié"
 
-#: src/diffuse/main.py:135
-msgid "Save File As..."
-msgstr "Enregistrer le fichier sous..."
+#: src/diffuse/main.py:115
+msgid "File revision <rev>"
+msgstr "Fichier à la révision <rev>"
 
-#: src/diffuse/main.py:217
-#, python-format
-msgid "Column %d"
-msgstr "Colonne %d"
+#: src/diffuse/main.py:123
+msgid "Create a new tab for each file"
+msgstr "Créer un nouvel onglet pour chaque fichier"
 
-#: src/diffuse/main.py:291
-msgid "Save changes before loading the new file?"
-msgstr "Sauvegarder les changements avant de charger le nouveau fichier?"
+#: src/diffuse/main.py:130
+msgid "Start a new tab"
+msgstr "Commencer avec un nouvel onglet"
 
-#: src/diffuse/main.py:402
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "Erreur durant la lecture de %(file)s à la révision %(rev)s."
+#: src/diffuse/main.py:137 src/diffuse/preferences.py:159
+msgid "Version control system search order"
+msgstr "Ordre de recherche des système de gestion de versions"
 
-#: src/diffuse/main.py:405 src/diffuse/main.py:1860
+#: src/diffuse/main.py:145
+msgid "Start with line <line> selected"
+msgstr "Commencer avec la ligne <line> sélectionnée"
+
+#: src/diffuse/main.py:153
+msgid "Create a blank file comparison pane"
+msgstr "Créer un panneau de comparaison avec un fichier vide"
+
+#: src/diffuse/main.py:160 src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:95
+msgid "Ignore changes to white space"
+msgstr "Ignorer les changements d'espaces"
+
+#: src/diffuse/main.py:167
+msgid "Ignore changes in blank lines"
+msgstr "Ignorer les différences avec des lignes vides"
+
+#: src/diffuse/main.py:174 src/diffuse/preferences.py:88
+msgid "Ignore end of line differences"
+msgstr "Ignorer les différences de fin de ligne"
+
+#: src/diffuse/main.py:181 src/diffuse/preferences.py:84
+msgid "Ignore case differences"
+msgstr "Ignorer les différences de casse"
+
+#: src/diffuse/main.py:188 src/diffuse/preferences.py:85
+msgid "Ignore white space differences"
+msgstr "Ignorer les différences d'espaces"
+
+#: src/diffuse/main.py:191
+msgid ""
+"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 several VCSs for comparison and merging."
+msgstr ""
+
+#: src/diffuse/main.py:247 src/diffuse/window.py:420
 #, python-format
 msgid "Error reading %s."
 msgstr "Erreur durant la lecture de %s."
 
-#: src/diffuse/main.py:427
-msgid "Open File"
-msgstr "Ouvrir un fichier"
-
-#: src/diffuse/main.py:484
-#, python-format
-msgid "The file %s changed on disk. Do you want to reload the file?"
-msgstr "Le fichier %s a changé sur le disque. Voulez-vous recharger le fichier?"
-
-#: src/diffuse/main.py:510
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "Sauvegarder %(title)s Panel %(pane)d"
-
-#: src/diffuse/main.py:542
-#, python-format
-msgid "A file named %s already exists. Do you want to overwrite it?"
-msgstr "Un fichier nommé %s existe déjà. Voulez-vous l'écraser?"
-
-#: src/diffuse/main.py:549
-#, 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 ""
-"Le fichier %s a été modifié par un autre process depuis la dernière lecture. Si "
-"vous sauvegardez, tous les changements externes pourraient être perdus. "
-"Sauvegarder quand même?"
-
-#: src/diffuse/main.py:591
-#, python-format
-msgid "Error encoding to %s."
-msgstr "Erreur durant l'encodage vers %s."
-
-#: src/diffuse/main.py:595 src/diffuse/preferences.py:300
-#, python-format
-msgid "Error writing %s."
-msgstr "Erreur à l'écriture de %s."
-
-#: src/diffuse/main.py:625
-msgid "Go To Line..."
-msgstr "Aller à la ligne..."
-
-#: src/diffuse/main.py:626
-msgid "Line Number: "
-msgstr "Numéro de la ligne: "
-
-#: src/diffuse/main.py:657
-msgid ""
-"Press the enter key or double click to edit. Press the space bar or use the RMB "
-"menu to manually align."
-msgstr ""
-"Appuyez sur Entrée ou double-cliquer pour éditer. Appuyez sur la barre Espace ou "
-"utiliser le menu du clic droit pour aligner manuellement."
-
-#: src/diffuse/main.py:661
-msgid "Press the escape key to finish editing."
-msgstr "Appuyez sur Échap pour finir l'édition."
-
-#: src/diffuse/main.py:664
-msgid ""
-"Select target line and press the space bar to align. Press the escape key to "
-"cancel."
-msgstr ""
-"Sélectionner la ligne de destination et appuyez sur la barre Espace pour aligner. "
-"Appuyez sur Échap pour annuler."
-
-#: src/diffuse/main.py:787
-msgid "_File"
-msgstr "_Fichier"
-
-#: src/diffuse/main.py:788
-msgid "_Open File..."
-msgstr "_Ouvrir un fichier..."
-
-#: src/diffuse/main.py:789
-msgid "Open File In New _Tab..."
-msgstr "Ouvrir un fichier dans un nouvel ongle_t..."
-
-#: src/diffuse/main.py:790
-msgid "Open _Modified Files..."
-msgstr "Ouvrir les fichiers _modifiés..."
-
-#: src/diffuse/main.py:791
-msgid "Open Commi_t..."
-msgstr "Ouvrir un commi_t..."
-
-#: src/diffuse/main.py:792
-msgid "_Reload File"
-msgstr "Recharger le fichier"
-
-#: src/diffuse/main.py:794
-msgid "_Save File"
-msgstr "_Enregistrer le fichier"
-
-#: src/diffuse/main.py:795
-msgid "Save File _As..."
-msgstr "_Enregistrer le fichier sous..."
-
-#: src/diffuse/main.py:796
-msgid "Save A_ll"
-msgstr "_Enregistrer tous"
-
-#: src/diffuse/main.py:798
-msgid "New _2-Way File Merge"
-msgstr "Nouvelle fusion à _2 panneaux"
-
-#: src/diffuse/main.py:799
-msgid "New _3-Way File Merge"
-msgstr "Nouvelle fusion à _3 panneaux"
-
-#: src/diffuse/main.py:800
-msgid "New _N-Way File Merge..."
-msgstr "Nouvelle fusion à _N panneaux..."
-
-#: src/diffuse/main.py:802
-msgid "_Close Tab"
-msgstr "Fermer l'onglet"
-
-#: src/diffuse/main.py:803
-msgid "_Undo Close Tab"
-msgstr "Annuler la fermeture de l'onglet"
-
-#: src/diffuse/main.py:804
-msgid "_Quit"
-msgstr "_Quitter"
-
-#: src/diffuse/main.py:807
-msgid "_Edit"
-msgstr "_Édition"
-
-#: src/diffuse/main.py:808
-msgid "_Undo"
-msgstr "Annuler"
-
-#: src/diffuse/main.py:809
-msgid "_Redo"
-msgstr "Refaire"
-
-#: src/diffuse/main.py:811
-msgid "Cu_t"
-msgstr "Cou_per"
-
-#: src/diffuse/main.py:812
-msgid "_Copy"
-msgstr "_Copier"
-
-#: src/diffuse/main.py:813
-msgid "_Paste"
-msgstr "Co_ller"
-
-#: src/diffuse/main.py:815
-msgid "Select _All"
-msgstr "_Tout sélectionner"
-
-#: src/diffuse/main.py:816
-msgid "C_lear Edits"
-msgstr "Effacer les changements"
-
-#: src/diffuse/main.py:817
-msgid "_Dismiss All Edits"
-msgstr "Effacer tous les changements"
-
-#: src/diffuse/main.py:819
-msgid "_Find..."
-msgstr "_Rechercher..."
-
-#: src/diffuse/main.py:820
-msgid "Find _Next"
-msgstr "Recherche _suivante"
-
-#: src/diffuse/main.py:821
-msgid "Find Pre_vious"
-msgstr "Rechercher _précédente"
-
-#: src/diffuse/main.py:822
-msgid "_Go To Line..."
-msgstr "_Aller à la ligne..."
-
-#: src/diffuse/main.py:824
-msgid "Pr_eferences..."
-msgstr "_Préférences..."
-
-#: src/diffuse/main.py:828
-msgid "None"
-msgstr "Aucune"
-
-#: src/diffuse/main.py:846
-msgid "_View"
-msgstr "_Vue"
-
-#: src/diffuse/main.py:847
-msgid "_Syntax Highlighting"
-msgstr "Coloration _syntaxique"
-
-#: src/diffuse/main.py:849
-msgid "Re_align All"
-msgstr "Tout _réaligner"
-
-#: src/diffuse/main.py:850
-msgid "_Isolate"
-msgstr "_Isoler"
-
-#: src/diffuse/main.py:852
-msgid "_First Difference"
-msgstr "_Première différence"
-
-#: src/diffuse/main.py:853
-msgid "_Previous Difference"
-msgstr "Différence _précédente"
-
-#: src/diffuse/main.py:854
-msgid "_Next Difference"
-msgstr "Différence _suivante"
-
-#: src/diffuse/main.py:855
-msgid "_Last Difference"
-msgstr "_Dernière différence"
-
-#: src/diffuse/main.py:857
-msgid "Fir_st Tab"
-msgstr "_Premier onglet"
-
-#: src/diffuse/main.py:858
-msgid "Pre_vious Tab"
-msgstr "Onglet _précédent"
-
-#: src/diffuse/main.py:859
-msgid "Next _Tab"
-msgstr "Onglet _suivant"
-
-#: src/diffuse/main.py:860
-msgid "Las_t Tab"
-msgstr "_Dernier onglet"
-
-#: src/diffuse/main.py:862
-msgid "Shift Pane _Right"
-msgstr "Décaler le panneau à droite"
-
-#: src/diffuse/main.py:863
-msgid "Shift Pane _Left"
-msgstr "Décaler le panneau à gauche"
-
-#: src/diffuse/main.py:866
-msgid "F_ormat"
-msgstr "F_ormater"
-
-#: src/diffuse/main.py:867
-msgid "Convert To _Upper Case"
-msgstr "Convertir en majuscules"
-
-#: src/diffuse/main.py:868
-msgid "Convert To _Lower Case"
-msgstr "Convertir en minuscules"
-
-#: src/diffuse/main.py:870
-msgid "Sort Lines In _Ascending Order"
-msgstr "Trier les lignes en ordre croissant"
-
-#: src/diffuse/main.py:871
-msgid "Sort Lines In D_escending Order"
-msgstr "Trier les lignes en ordre décroissant"
-
-#: src/diffuse/main.py:873
-msgid "Remove Trailing _White Space"
-msgstr "Supprimer les espaces en fin de ligne"
-
-#: src/diffuse/main.py:874
-msgid "Convert Tabs To _Spaces"
-msgstr "Convertir les tabulations en espaces"
-
-#: src/diffuse/main.py:875
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "Convertir les espaces de début de ligne en tabulations"
-
-#: src/diffuse/main.py:877
-msgid "_Increase Indenting"
-msgstr "Augmenter l'indentation"
-
-#: src/diffuse/main.py:878
-msgid "De_crease Indenting"
-msgstr "Diminuer l'indentation"
-
-#: src/diffuse/main.py:880
-msgid "Convert To _DOS Format"
-msgstr "Convertir au format _DOS"
-
-#: src/diffuse/main.py:881
-msgid "Convert To _Mac Format"
-msgstr "Convertir au format _Mac"
-
-#: src/diffuse/main.py:882
-msgid "Convert To Uni_x Format"
-msgstr "Convertir au format Uni_x"
-
-#: src/diffuse/main.py:885
-msgid "_Merge"
-msgstr "Fusionner"
-
-#: src/diffuse/main.py:886
-msgid "Copy Selection _Right"
-msgstr "Copier la sélection vers la droite"
-
-#: src/diffuse/main.py:887
-msgid "Copy Selection _Left"
-msgstr "Copier la sélection vers la gauche"
-
-#: src/diffuse/main.py:889
-msgid "Copy Left _Into Selection"
-msgstr "Copier la gauche vers la sélection"
-
-#: src/diffuse/main.py:890
-msgid "Copy Right I_nto Selection"
-msgstr "Copier la droite vers la sélection"
-
-#: src/diffuse/main.py:891
-msgid "_Merge From Left Then Right"
-msgstr "Fusionner de la gauche puis la droite"
-
-#: src/diffuse/main.py:892
-msgid "M_erge From Right Then Left"
-msgstr "Fusionner de la droite puis la gauche"
-
-#: src/diffuse/main.py:895
-msgid "_Help"
-msgstr "Aide"
-
-#: src/diffuse/main.py:896
-msgid "_Help Contents..."
-msgstr "Contenu de l'aide..."
-
-#: src/diffuse/main.py:898
-#, python-format
-msgid "_About %s..."
-msgstr "À propos de %s..."
-
-#: src/diffuse/main.py:913
-msgid "New 2-Way File Merge"
-msgstr "Nouvelle fusion à 2 panneaux"
-
-#: src/diffuse/main.py:914
-msgid "New 3-Way File Merge"
-msgstr "Nouvelle fusion à 3 panneaux"
-
-#: src/diffuse/main.py:916
-msgid "Realign All"
-msgstr "Tout réaligner"
-
-#: src/diffuse/main.py:917
-msgid "First Difference"
-msgstr "Première différence"
-
-#: src/diffuse/main.py:918
-msgid "Previous Difference"
-msgstr "Différence précédente"
-
-#: src/diffuse/main.py:919
-msgid "Next Difference"
-msgstr "Différence suivante"
-
-#: src/diffuse/main.py:920
-msgid "Last Difference"
-msgstr "Dernière différence"
-
-#: src/diffuse/main.py:922
-msgid "Copy Selection Right"
-msgstr "Copier la sélection vers la droite"
-
-#: src/diffuse/main.py:923
-msgid "Copy Selection Left"
-msgstr "Copier la sélection vers la gauche"
-
-#: src/diffuse/main.py:924
-msgid "Copy Left Into Selection"
-msgstr "Copier la gauche vers la sélection"
-
-#: src/diffuse/main.py:925
-msgid "Copy Right Into Selection"
-msgstr "Copier la droite vers la sélection"
-
-#: src/diffuse/main.py:926
-msgid "Merge From Left Then Right"
-msgstr "Fusionner de la gauche puis la droite"
-
-#: src/diffuse/main.py:927
-msgid "Merge From Right Then Left"
-msgstr "Fusionner de la droite puis la gauche"
-
-#: src/diffuse/main.py:929
-msgid "Undo"
-msgstr "Annuler"
-
-#: src/diffuse/main.py:930
-msgid "Redo"
-msgstr "Refaire"
-
-#: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
-msgid "Cut"
-msgstr "Couper"
-
-#: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
-msgid "Copy"
-msgstr "Copier"
-
-#: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
-msgid "Paste"
-msgstr "Coller"
-
-#: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
-msgid "Clear Edits"
-msgstr "Effacer les changements"
-
-#: src/diffuse/main.py:1057
-msgid "Some files have unsaved changes. Select the files to save before closing."
-msgstr ""
-"Certains fichiers ne sont pas encore sauvegarder. Sélectionner les fichiers à "
-"sauvegarder avant de fermer."
-
-#: src/diffuse/main.py:1071
-msgid "Tab"
-msgstr "Onglet"
-
-#: src/diffuse/main.py:1076
-msgid "Pane"
-msgstr "Panneau"
-
-#: src/diffuse/main.py:1087
-msgid "Close _Without Saving"
-msgstr "Fermer sans sauvegarder"
-
-#: src/diffuse/main.py:1126
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "Fermer cet onglet fermera %s."
-
-#: src/diffuse/main.py:1209
-#, python-format
-msgid "File Merge %d"
-msgstr "Ficher fusionné %d"
-
-#: src/diffuse/main.py:1315
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "Erreur à la récupération des commits de %s."
-
-#: src/diffuse/main.py:1347
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "Erreur à la récupération des changements de %s."
-
-#: src/diffuse/main.py:1380
-msgid "Open File In New Tab"
-msgstr "Ouvrir le fichier dans un nouvel onglet"
-
-#: src/diffuse/main.py:1403
-msgid "Choose Folder With Modified Files"
-msgstr "Choisir un dossier avec les fichiers modifiés"
-
-#: src/diffuse/main.py:1421
-msgid "No modified files found."
-msgstr "Aucun fichier modifié trouvé."
-
-#: src/diffuse/main.py:1427
-msgid "Choose Folder With Commit"
-msgstr "Choisir un dossier avec des commits"
-
-#: src/diffuse/main.py:1447
-msgid "No committed files found."
-msgstr "Aucun fichier commité trouvé."
-
-#: src/diffuse/main.py:1483
-msgid "New N-Way File Merge..."
-msgstr "Nouvelle fusion à N panneaux..."
-
-#: src/diffuse/main.py:1484
-msgid "Number of panes: "
-msgstr "Nombre de panneaux: "
-
-#: src/diffuse/main.py:1558
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "Phrase non trouvée.  Continuer à partir de la fin du fichier?"
-
-#: src/diffuse/main.py:1560
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "Phrase non trouvée.  Continuer à partir du début du fichier?"
-
-#: src/diffuse/main.py:1781
-msgid ""
-"Usage:\n"
-"    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"
-"also retrieve revisions of files from several VCSs for comparison and merging.\n"
-"\n"
-"Help Options:\n"
-"  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright information\n"
-"\n"
-"Configuration Options:\n"
-"  --no-rcfile                      Do not read any resource files\n"
-"  --rcfile <file>                  Specify explicit resource file\n"
-"\n"
-"General Options:\n"
-"  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
-"  ( -D | --close-if-same )         Close all tabs with no differences\n"
-"  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
-"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
-"  ( -m | --modified )              Create a new tab for each modified file\n"
-"  ( -r | --revision ) <rev>        File revision <rev>\n"
-"  ( -s | --separate )              Create a new tab for each file\n"
-"  ( -t | --tab )                   Start a new tab\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    Start with line <line> selected\n"
-"  --null-file                      Create a blank file comparison pane\n"
-"\n"
-"Display Options:\n"
-"  ( -b | --ignore-space-change )   Ignore changes to white space\n"
-"  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
-"  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
-"  ( -i | --ignore-case )           Ignore case differences\n"
-"  ( -w | --ignore-all-space )      Ignore white space differences"
-msgstr ""
-"Utilisation:\n"
-"    diffuse [ [OPTION...] [FILE...] ]...\n"
-"    diffuse ( -h | -? | --help | -v | --version )\n"
-"\n"
-"Diffuse est un outil graphique pour fusionner et comparer des fichiers textes.\n"
-"Diffuse peut comparer un nombre arbitraire de fichiers côte-à-côte et donner\n"
-"aux utilisateurs la possibilité de manuellement ajuster l'alignement des\n"
-"lignes et éditer directement les fichiers. Diffuse peut aussi récupérer les\n"
-"révisions à partir de dépôts Bazaar, CVS, Darcs, Git, Mercurial, Monotone,\n"
-"RCS, Subversion, et SVK afin de les comparer et les fusionner.\n"
-"\n"
-"Options d'aide:\n"
-"  ( -h | -? | --help )             Affiche ce message d'aide\n"
-"  ( -v | --version )               Affiche les informations de version et de\n"
-"                                   copyright\n"
-"\n"
-"Options de configuration:\n"
-"  --no-rcfile                      Ne lire aucun fichier de ressource\n"
-"  --rcfile <file>                  Spécifier explicitement un fichier de\n"
-"                                   ressource\n"
-"\n"
-"Options générales:\n"
-"  ( -c | --commit ) <rev>          Comparer le fichier aux révisions <rev-1>\n"
-"                                   et <rev>\n"
-"  ( -D | --close-if-same )         Fermer tous les onglets sans différences\n"
-"  ( -e | --encoding ) <codec>      Utiliser le <codec> pour lire et écrire les\n"
-"                                   fichiers\n"
-"  ( -L | --label ) <label>         Afficher <label> au lieu du nom du fichier\n"
-"  ( -m | --modified )              Créer un nouvel onglet pour chaque fichier\n"
-"                                   modifié\n"
-"  ( -r | --revision ) <rev>        Fichier à la révision <rev>\n"
-"  ( -s | --separate )              Créer un nouvel onglet pour chaque fichier\n"
-"  ( -t | --tab )                   Commencer avec un nouvel onglet\n"
-"  ( -V | --vcs ) <vcs-list>        Ordre de recherche des système de gestion\n"
-"                                   de versions\n"
-"  --line <line>                    Commencer avec la ligne <line> sélectionnée\n"
-"  --null-file                      Créer un panneau de comparaison avec un\n"
-"                                   fichier vide\n"
-"\n"
-"Options d'affichage:\n"
-"  ( -b | --ignore-space-change )   Ignorer les différences avec des espaces\n"
-"  ( -B | --ignore-blank-lines )    Ignorer les différences avec des lignes\n"
-"                                   vides\n"
-"  ( -E | --ignore-end-of-line )    Ignorer les différences en fin de ligne\n"
-"  ( -i | --ignore-case )           Ignorer les différences de casse\n"
-"  ( -w | --ignore-all-space )      Ignorer les différences avec tous types\n"
-"                                   d'espaces"
-
-#: src/diffuse/main.py:1948
+#: src/diffuse/main.py:327
 msgid "Error parsing line number."
 msgstr "Erreur à l'analyse du numéro de ligne."
 
-#: src/diffuse/main.py:1958
-#, python-format
-msgid "Skipping unknown argument \"%s\"."
-msgstr "Passe l'argument inconnu \"%s\"."
-
-#: src/diffuse/main.py:1966
+#: src/diffuse/main.py:343
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Erreur au traitement de l'argument \"%s\".  Dossier non attendu."
 
-#: src/diffuse/preferences.py:80
+#: src/diffuse/preferences.py:75
 msgid "Display"
 msgstr "Afficher"
 
-#: src/diffuse/preferences.py:83
+#: src/diffuse/preferences.py:78
 msgid "Font"
 msgstr "Police"
 
-#: src/diffuse/preferences.py:84
+#: src/diffuse/preferences.py:79
 msgid "Tab width"
 msgstr "Largeur d'une tabulation"
 
-#: src/diffuse/preferences.py:85
+#: src/diffuse/preferences.py:80
 msgid "Show right margin"
 msgstr "Afficher la marge à droite"
 
-#: src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:81
 msgid "Right margin"
 msgstr "Marge de droite"
 
-#: src/diffuse/preferences.py:87
+#: src/diffuse/preferences.py:82
 msgid "Show line numbers"
 msgstr "Afficher les numéros de ligne"
 
-#: src/diffuse/preferences.py:88
+#: src/diffuse/preferences.py:83
 msgid "Show white space characters"
 msgstr "Afficher les espaces"
 
-#: src/diffuse/preferences.py:89
-msgid "Ignore case differences"
-msgstr "Ignorer les différences de casse"
-
-#: src/diffuse/preferences.py:90
-msgid "Ignore white space differences"
-msgstr "Ignorer les différences d'espaces"
-
-#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100
-msgid "Ignore changes to white space"
-msgstr "Ignorer les changements d'espaces"
-
-#: src/diffuse/preferences.py:92
+#: src/diffuse/preferences.py:87
 msgid "Ignore blank line differences"
 msgstr "Ignorer les différences de lignes vides"
 
-#: src/diffuse/preferences.py:93
-msgid "Ignore end of line differences"
-msgstr "Ignorer les différences de fin de ligne"
-
-#: src/diffuse/preferences.py:95
+#: src/diffuse/preferences.py:90
 msgid "Alignment"
 msgstr "Alignement"
 
-#: src/diffuse/preferences.py:98
+#: src/diffuse/preferences.py:93
 msgid "Ignore case"
 msgstr "Ignorer la casse"
 
-#: src/diffuse/preferences.py:99
+#: src/diffuse/preferences.py:94
 msgid "Ignore white space"
 msgstr "Ignorer les espaces"
 
-#: src/diffuse/preferences.py:101
+#: src/diffuse/preferences.py:96
 msgid "Ignore blank lines"
 msgstr "Ignorer les lignes vides"
 
-#: src/diffuse/preferences.py:102
+#: src/diffuse/preferences.py:97
 msgid "Ignore end of line characters"
 msgstr "Ignorer les caractères en fin de ligne"
 
-#: src/diffuse/preferences.py:104
+#: src/diffuse/preferences.py:99
 msgid "Editor"
 msgstr "Éditeur"
 
-#: src/diffuse/preferences.py:107
+#: src/diffuse/preferences.py:102
 msgid "Auto indent"
 msgstr "Indenter automatiquement"
 
-#: src/diffuse/preferences.py:108
+#: src/diffuse/preferences.py:103
 msgid "Expand tabs to spaces"
 msgstr "Convertir les tabulations en espaces"
 
-#: src/diffuse/preferences.py:109
+#: src/diffuse/preferences.py:104
 msgid "Soft tab width"
 msgstr "Largeur soft des tabulation"
 
-#: src/diffuse/preferences.py:111
+#: src/diffuse/preferences.py:106
 msgid "Tabs"
 msgstr "Onglets"
 
-#: src/diffuse/preferences.py:114
+#: src/diffuse/preferences.py:109
 msgid "Default panes"
 msgstr "Panneaux par défaut"
 
-#: src/diffuse/preferences.py:115
+#: src/diffuse/preferences.py:110
 msgid "Always show the tab bar"
 msgstr "Toujours afficher la barre d'onglets"
 
-#: src/diffuse/preferences.py:116
+#: src/diffuse/preferences.py:111
 #, python-format
 msgid "Warn me when closing a tab will quit %s"
 msgstr "Me prévenir quand fermer un onglet fermera %s"
 
-#: src/diffuse/preferences.py:118
+#: src/diffuse/preferences.py:113
 msgid "Regional Settings"
 msgstr "Configurations de région"
 
-#: src/diffuse/preferences.py:121
+#: src/diffuse/preferences.py:116
 msgid "Default codec"
 msgstr "Codec par défaut"
 
-#: src/diffuse/preferences.py:122
+#: src/diffuse/preferences.py:117
 msgid "Order of codecs used to identify encoding"
 msgstr "Ordre des codecs utilisés pour identifier l'encodage"
 
-#: src/diffuse/preferences.py:143
+#: src/diffuse/preferences.py:138
 msgid "Cygwin"
 msgstr "Cygwin"
 
-#: src/diffuse/preferences.py:145
+#: src/diffuse/preferences.py:140
 msgid "Root directory"
 msgstr "Dossier racine"
 
-#: src/diffuse/preferences.py:146
+#: src/diffuse/preferences.py:141
 msgid "Cygdrive prefix"
 msgstr "Préfixe Cygdrive"
 
-#: src/diffuse/preferences.py:165
-msgid "Version control system search order"
-msgstr "Ordre de recherche des système de gestion de versions"
-
-#: src/diffuse/preferences.py:173
+#: src/diffuse/preferences.py:167
 msgid "\"co\" command"
 msgstr "Commande \"co\""
 
-#: src/diffuse/preferences.py:174
+#: src/diffuse/preferences.py:168
 msgid "\"rlog\" command"
 msgstr "Commande \"rlog\""
 
-#: src/diffuse/preferences.py:176
+#: src/diffuse/preferences.py:170
 msgid "Command"
 msgstr "Commande"
 
-#: src/diffuse/preferences.py:182
+#: src/diffuse/preferences.py:176
 msgid "Launch from a Bash login shell"
 msgstr "Lancer à partir d'un shell Bash"
 
-#: src/diffuse/preferences.py:189
+#: src/diffuse/preferences.py:183
 msgid "Update paths for Cygwin"
 msgstr "Chemins de mise-à-jour pour Cygwin"
 
-#: src/diffuse/preferences.py:194
+#: src/diffuse/preferences.py:188
 msgid "Version Control"
 msgstr "Contrôle de version"
 
-#: src/diffuse/preferences.py:259
+#: src/diffuse/preferences.py:253
 msgid "Preferences"
 msgstr "Préférences"
 
+#: src/diffuse/preferences.py:294 src/diffuse/window.py:580
+#, python-format
+msgid "Error writing %s."
+msgstr "Erreur à l'écriture de %s."
+
+#: src/diffuse/preferences.py:483 src/diffuse/window.py:446
+#: src/diffuse/window.py:1413 src/diffuse/window.py:1436 src/diffuse/window.py:1459
+msgid "_Open"
+msgstr ""
+
 #: src/diffuse/resources.py:242 src/diffuse/resources.py:246
 #: src/diffuse/resources.py:249
 #, python-brace-format
@@ -947,16 +417,11 @@ msgstr "Erreur inconnue à la ligne {line} de {file}"
 msgid "Auto Detect"
 msgstr "Détecter automatiquement"
 
-#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97
+#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:96
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "Erreur à l'analyse de la révision %s."
 
-#: src/diffuse/vcs/vcs_registry.py:238
-#, python-format
-msgid "Error parsing %s."
-msgstr "Erreur à l'analyse de %s."
-
 #: src/diffuse/widgets.py:1857
 msgid "Align with Selection"
 msgstr "Aligner avec la sélection"
@@ -969,10 +434,660 @@ msgstr "Isoler"
 msgid "Merge Selection"
 msgstr "Fusionner la sélection"
 
+#: src/diffuse/widgets.py:1861 src/diffuse/window.py:865
+msgid "Cut"
+msgstr "Couper"
+
+#: src/diffuse/widgets.py:1862 src/diffuse/window.py:866
+msgid "Copy"
+msgstr "Copier"
+
+#: src/diffuse/widgets.py:1863 src/diffuse/window.py:867
+msgid "Paste"
+msgstr "Coller"
+
 #: src/diffuse/widgets.py:1865
 msgid "Select All"
 msgstr "Tout sélectionner"
 
+#: src/diffuse/widgets.py:1866 src/diffuse/window.py:868
+msgid "Clear Edits"
+msgstr "Effacer les changements"
+
 #: src/diffuse/widgets.py:1868
 msgid "Swap with Selected Pane"
 msgstr "Échanger avec le panneau sélectionné"
+
+#: src/diffuse/window.py:83
+msgid "Close Tab"
+msgstr "Fermer l'onglet"
+
+#: src/diffuse/window.py:126
+msgid "Open File..."
+msgstr "Ouvrir un fichier..."
+
+#: src/diffuse/window.py:127
+msgid "Reload File"
+msgstr "Recharger le fichier"
+
+#: src/diffuse/window.py:128
+msgid "Save File"
+msgstr "Enregistrer le fichier"
+
+#: src/diffuse/window.py:129
+msgid "Save File As..."
+msgstr "Enregistrer le fichier sous..."
+
+#: src/diffuse/window.py:228
+#, python-format
+msgid "Column %d"
+msgstr "Colonne %d"
+
+#: src/diffuse/window.py:306
+msgid "Save changes before loading the new file?"
+msgstr "Sauvegarder les changements avant de charger le nouveau fichier?"
+
+#: src/diffuse/window.py:310
+msgid "_No"
+msgstr ""
+
+#: src/diffuse/window.py:311
+msgid "_Yes"
+msgstr ""
+
+#: src/diffuse/window.py:417
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "Erreur durant la lecture de %(file)s à la révision %(rev)s."
+
+#: src/diffuse/window.py:442
+msgid "Open File"
+msgstr "Ouvrir un fichier"
+
+#: src/diffuse/window.py:495
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "Sauvegarder %(title)s Panel %(pane)d"
+
+#: src/diffuse/window.py:499 src/diffuse/window.py:1111
+#, fuzzy
+msgid "_Save"
+msgstr "_Enregistrer le fichier"
+
+#: src/diffuse/window.py:527
+#, python-format
+msgid "A file named %s already exists. Do you want to overwrite it?"
+msgstr "Un fichier nommé %s existe déjà. Voulez-vous l'écraser?"
+
+#: src/diffuse/window.py:534
+#, 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 ""
+"Le fichier %s a été modifié par un autre process depuis la dernière lecture. Si "
+"vous sauvegardez, tous les changements externes pourraient être perdus. "
+"Sauvegarder quand même?"
+
+#: src/diffuse/window.py:576
+#, python-format
+msgid "Error encoding to %s."
+msgstr "Erreur durant l'encodage vers %s."
+
+#: src/diffuse/window.py:610
+msgid "Go To Line..."
+msgstr "Aller à la ligne..."
+
+#: src/diffuse/window.py:611
+msgid "Line Number: "
+msgstr "Numéro de la ligne: "
+
+#: src/diffuse/window.py:642
+msgid ""
+"Press the enter key or double click to edit. Press the space bar or use the RMB "
+"menu to manually align."
+msgstr ""
+"Appuyez sur Entrée ou double-cliquer pour éditer. Appuyez sur la barre Espace ou "
+"utiliser le menu du clic droit pour aligner manuellement."
+
+#: src/diffuse/window.py:646
+msgid "Press the escape key to finish editing."
+msgstr "Appuyez sur Échap pour finir l'édition."
+
+#: src/diffuse/window.py:649
+msgid ""
+"Select target line and press the space bar to align. Press the escape key to "
+"cancel."
+msgstr ""
+"Sélectionner la ligne de destination et appuyez sur la barre Espace pour aligner. "
+"Appuyez sur Échap pour annuler."
+
+#: src/diffuse/window.py:710
+msgid "_File"
+msgstr "_Fichier"
+
+#: src/diffuse/window.py:712
+msgid "_Open File..."
+msgstr "_Ouvrir un fichier..."
+
+#: src/diffuse/window.py:713
+msgid "Open File In New _Tab..."
+msgstr "Ouvrir un fichier dans un nouvel ongle_t..."
+
+#: src/diffuse/window.py:714
+msgid "Open _Modified Files..."
+msgstr "Ouvrir les fichiers _modifiés..."
+
+#: src/diffuse/window.py:715
+msgid "Open Commi_t..."
+msgstr "Ouvrir un commi_t..."
+
+#: src/diffuse/window.py:716
+msgid "_Reload File"
+msgstr "Recharger le fichier"
+
+#: src/diffuse/window.py:718
+msgid "_Save File"
+msgstr "_Enregistrer le fichier"
+
+#: src/diffuse/window.py:719
+msgid "Save File _As..."
+msgstr "_Enregistrer le fichier sous..."
+
+#: src/diffuse/window.py:720
+msgid "Save A_ll"
+msgstr "_Enregistrer tous"
+
+#: src/diffuse/window.py:722
+msgid "New _2-Way File Merge"
+msgstr "Nouvelle fusion à _2 panneaux"
+
+#: src/diffuse/window.py:723
+msgid "New _3-Way File Merge"
+msgstr "Nouvelle fusion à _3 panneaux"
+
+#: src/diffuse/window.py:724
+msgid "New _N-Way File Merge..."
+msgstr "Nouvelle fusion à _N panneaux..."
+
+#: src/diffuse/window.py:726
+msgid "_Close Tab"
+msgstr "Fermer l'onglet"
+
+#: src/diffuse/window.py:727
+msgid "_Undo Close Tab"
+msgstr "Annuler la fermeture de l'onglet"
+
+#: src/diffuse/window.py:728
+msgid "_Quit"
+msgstr "_Quitter"
+
+#: src/diffuse/window.py:732
+msgid "_Edit"
+msgstr "_Édition"
+
+#: src/diffuse/window.py:734
+msgid "_Undo"
+msgstr "Annuler"
+
+#: src/diffuse/window.py:735
+msgid "_Redo"
+msgstr "Refaire"
+
+#: src/diffuse/window.py:737
+msgid "Cu_t"
+msgstr "Cou_per"
+
+#: src/diffuse/window.py:738
+msgid "_Copy"
+msgstr "_Copier"
+
+#: src/diffuse/window.py:739
+msgid "_Paste"
+msgstr "Co_ller"
+
+#: src/diffuse/window.py:741
+msgid "Select _All"
+msgstr "_Tout sélectionner"
+
+#: src/diffuse/window.py:742
+msgid "C_lear Edits"
+msgstr "Effacer les changements"
+
+#: src/diffuse/window.py:743
+msgid "_Dismiss All Edits"
+msgstr "Effacer tous les changements"
+
+#: src/diffuse/window.py:745
+msgid "_Find..."
+msgstr "_Rechercher..."
+
+#: src/diffuse/window.py:746
+msgid "Find _Next"
+msgstr "Recherche _suivante"
+
+#: src/diffuse/window.py:747
+msgid "Find Pre_vious"
+msgstr "Rechercher _précédente"
+
+#: src/diffuse/window.py:748
+msgid "_Go To Line..."
+msgstr "_Aller à la ligne..."
+
+#: src/diffuse/window.py:750
+msgid "Pr_eferences..."
+msgstr "_Préférences..."
+
+#: src/diffuse/window.py:754
+msgid "None"
+msgstr "Aucune"
+
+#: src/diffuse/window.py:776
+msgid "_View"
+msgstr "_Vue"
+
+#: src/diffuse/window.py:778
+msgid "_Syntax Highlighting"
+msgstr "Coloration _syntaxique"
+
+#: src/diffuse/window.py:780
+msgid "Re_align All"
+msgstr "Tout _réaligner"
+
+#: src/diffuse/window.py:781
+msgid "_Isolate"
+msgstr "_Isoler"
+
+#: src/diffuse/window.py:783
+msgid "_First Difference"
+msgstr "_Première différence"
+
+#: src/diffuse/window.py:784
+msgid "_Previous Difference"
+msgstr "Différence _précédente"
+
+#: src/diffuse/window.py:785
+msgid "_Next Difference"
+msgstr "Différence _suivante"
+
+#: src/diffuse/window.py:786
+msgid "_Last Difference"
+msgstr "_Dernière différence"
+
+#: src/diffuse/window.py:788
+msgid "Fir_st Tab"
+msgstr "_Premier onglet"
+
+#: src/diffuse/window.py:789
+msgid "Pre_vious Tab"
+msgstr "Onglet _précédent"
+
+#: src/diffuse/window.py:790
+msgid "Next _Tab"
+msgstr "Onglet _suivant"
+
+#: src/diffuse/window.py:791
+msgid "Las_t Tab"
+msgstr "_Dernier onglet"
+
+#: src/diffuse/window.py:793
+msgid "Shift Pane _Right"
+msgstr "Décaler le panneau à droite"
+
+#: src/diffuse/window.py:794
+msgid "Shift Pane _Left"
+msgstr "Décaler le panneau à gauche"
+
+#: src/diffuse/window.py:798
+msgid "F_ormat"
+msgstr "F_ormater"
+
+#: src/diffuse/window.py:800
+msgid "Convert To _Upper Case"
+msgstr "Convertir en majuscules"
+
+#: src/diffuse/window.py:801
+msgid "Convert To _Lower Case"
+msgstr "Convertir en minuscules"
+
+#: src/diffuse/window.py:803
+msgid "Sort Lines In _Ascending Order"
+msgstr "Trier les lignes en ordre croissant"
+
+#: src/diffuse/window.py:804
+msgid "Sort Lines In D_escending Order"
+msgstr "Trier les lignes en ordre décroissant"
+
+#: src/diffuse/window.py:806
+msgid "Remove Trailing _White Space"
+msgstr "Supprimer les espaces en fin de ligne"
+
+#: src/diffuse/window.py:807
+msgid "Convert Tabs To _Spaces"
+msgstr "Convertir les tabulations en espaces"
+
+#: src/diffuse/window.py:808
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "Convertir les espaces de début de ligne en tabulations"
+
+#: src/diffuse/window.py:810
+msgid "_Increase Indenting"
+msgstr "Augmenter l'indentation"
+
+#: src/diffuse/window.py:811
+msgid "De_crease Indenting"
+msgstr "Diminuer l'indentation"
+
+#: src/diffuse/window.py:813
+msgid "Convert To _DOS Format"
+msgstr "Convertir au format _DOS"
+
+#: src/diffuse/window.py:814
+msgid "Convert To _Mac Format"
+msgstr "Convertir au format _Mac"
+
+#: src/diffuse/window.py:815
+msgid "Convert To Uni_x Format"
+msgstr "Convertir au format Uni_x"
+
+#: src/diffuse/window.py:819
+msgid "_Merge"
+msgstr "Fusionner"
+
+#: src/diffuse/window.py:821
+msgid "Copy Selection _Right"
+msgstr "Copier la sélection vers la droite"
+
+#: src/diffuse/window.py:822
+msgid "Copy Selection _Left"
+msgstr "Copier la sélection vers la gauche"
+
+#: src/diffuse/window.py:824
+msgid "Copy Left _Into Selection"
+msgstr "Copier la gauche vers la sélection"
+
+#: src/diffuse/window.py:825
+msgid "Copy Right I_nto Selection"
+msgstr "Copier la droite vers la sélection"
+
+#: src/diffuse/window.py:826
+msgid "_Merge From Left Then Right"
+msgstr "Fusionner de la gauche puis la droite"
+
+#: src/diffuse/window.py:827
+msgid "M_erge From Right Then Left"
+msgstr "Fusionner de la droite puis la gauche"
+
+#: src/diffuse/window.py:831
+msgid "_Help"
+msgstr "Aide"
+
+#: src/diffuse/window.py:833
+msgid "_Help Contents..."
+msgstr "Contenu de l'aide..."
+
+#: src/diffuse/window.py:835
+#, python-format
+msgid "_About %s..."
+msgstr "À propos de %s..."
+
+#: src/diffuse/window.py:847
+msgid "New 2-Way File Merge"
+msgstr "Nouvelle fusion à 2 panneaux"
+
+#: src/diffuse/window.py:848
+msgid "New 3-Way File Merge"
+msgstr "Nouvelle fusion à 3 panneaux"
+
+#: src/diffuse/window.py:850
+msgid "Realign All"
+msgstr "Tout réaligner"
+
+#: src/diffuse/window.py:851
+msgid "First Difference"
+msgstr "Première différence"
+
+#: src/diffuse/window.py:852
+msgid "Previous Difference"
+msgstr "Différence précédente"
+
+#: src/diffuse/window.py:853
+msgid "Next Difference"
+msgstr "Différence suivante"
+
+#: src/diffuse/window.py:854
+msgid "Last Difference"
+msgstr "Dernière différence"
+
+#: src/diffuse/window.py:856
+msgid "Copy Selection Right"
+msgstr "Copier la sélection vers la droite"
+
+#: src/diffuse/window.py:857
+msgid "Copy Selection Left"
+msgstr "Copier la sélection vers la gauche"
+
+#: src/diffuse/window.py:858
+msgid "Copy Left Into Selection"
+msgstr "Copier la gauche vers la sélection"
+
+#: src/diffuse/window.py:859
+msgid "Copy Right Into Selection"
+msgstr "Copier la droite vers la sélection"
+
+#: src/diffuse/window.py:860
+msgid "Merge From Left Then Right"
+msgstr "Fusionner de la gauche puis la droite"
+
+#: src/diffuse/window.py:861
+msgid "Merge From Right Then Left"
+msgstr "Fusionner de la droite puis la gauche"
+
+#: src/diffuse/window.py:863
+msgid "Undo"
+msgstr "Annuler"
+
+#: src/diffuse/window.py:864
+msgid "Redo"
+msgstr "Refaire"
+
+#: src/diffuse/window.py:950
+msgid "Changes detected"
+msgstr ""
+
+#: src/diffuse/window.py:954
+#, python-format
+msgid ""
+"The file \"%s\" changed on disk.\n"
+"\n"
+"Do you want to reload the file?"
+msgstr ""
+"Le fichier \"%s\" a changé sur le disque.\n"
+"\n"
+"Voulez-vous recharger le fichier?"
+
+#: src/diffuse/window.py:959
+#, python-format
+msgid ""
+"The following files changed on disk:\n"
+"%s\n"
+"\n"
+"Do you want to reload these files?"
+msgstr ""
+"Les fichiers suivants ont été changés sur le disque:\n"
+"%s\n"
+"\n"
+"Voulez-vous recharger ces fichiers?"
+
+#: src/diffuse/window.py:1078
+msgid "Some files have unsaved changes. Select the files to save before closing."
+msgstr ""
+"Certains fichiers ne sont pas encore sauvegarder. Sélectionner les fichiers à "
+"sauvegarder avant de fermer."
+
+#: src/diffuse/window.py:1092
+msgid "Tab"
+msgstr "Onglet"
+
+#: src/diffuse/window.py:1097
+msgid "Pane"
+msgstr "Panneau"
+
+#: src/diffuse/window.py:1108
+msgid "Close _Without Saving"
+msgstr "Fermer sans sauvegarder"
+
+#: src/diffuse/window.py:1147
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "Fermer cet onglet fermera %s."
+
+#: src/diffuse/window.py:1224
+#, python-format
+msgid "File Merge %d"
+msgstr "Ficher fusionné %d"
+
+#: src/diffuse/window.py:1344
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "Erreur à la récupération des commits de %s."
+
+#: src/diffuse/window.py:1376
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "Erreur à la récupération des changements de %s."
+
+#: src/diffuse/window.py:1409
+msgid "Open File In New Tab"
+msgstr "Ouvrir le fichier dans un nouvel onglet"
+
+#: src/diffuse/window.py:1432
+msgid "Choose Folder With Modified Files"
+msgstr "Choisir un dossier avec les fichiers modifiés"
+
+#: src/diffuse/window.py:1450
+msgid "No modified files found."
+msgstr "Aucun fichier modifié trouvé."
+
+#: src/diffuse/window.py:1456
+msgid "Choose Folder With Commit"
+msgstr "Choisir un dossier avec des commits"
+
+#: src/diffuse/window.py:1476
+msgid "No committed files found."
+msgstr "Aucun fichier commité trouvé."
+
+#: src/diffuse/window.py:1512
+msgid "New N-Way File Merge..."
+msgstr "Nouvelle fusion à N panneaux..."
+
+#: src/diffuse/window.py:1513
+msgid "Number of panes: "
+msgstr "Nombre de panneaux: "
+
+#: src/diffuse/window.py:1587
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "Phrase non trouvée.  Continuer à partir de la fin du fichier?"
+
+#: src/diffuse/window.py:1589
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "Phrase non trouvée.  Continuer à partir du début du fichier?"
+
+#: src/diffuse/window.py:1762
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr ""
+"Diffuse est un outil graphique pour fusionner et comparer des fichiers textes."
+
+#: src/diffuse/window.py:1766
+msgid "translator-credits"
+msgstr "Romain Failliot <romain.failliot@foolstep.com>"
+
+#~ msgid ""
+#~ "Usage:\n"
+#~ "    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"
+#~ "also retrieve revisions of files from several VCSs for comparison and "
+#~ "merging.\n"
+#~ "\n"
+#~ "Help Options:\n"
+#~ "  ( -h | -? | --help )             Display this usage information\n"
+#~ "  ( -v | --version )               Display version and copyright information\n"
+#~ "\n"
+#~ "Configuration Options:\n"
+#~ "  --no-rcfile                      Do not read any resource files\n"
+#~ "  --rcfile <file>                  Specify explicit resource file\n"
+#~ "\n"
+#~ "General Options:\n"
+#~ "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
+#~ "  ( -D | --close-if-same )         Close all tabs with no differences\n"
+#~ "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+#~ "  ( -L | --label ) <label>         Display <label> instead of the file name\n"
+#~ "  ( -m | --modified )              Create a new tab for each modified file\n"
+#~ "  ( -r | --revision ) <rev>        File revision <rev>\n"
+#~ "  ( -s | --separate )              Create a new tab for each file\n"
+#~ "  ( -t | --tab )                   Start a new tab\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    Start with line <line> selected\n"
+#~ "  --null-file                      Create a blank file comparison pane\n"
+#~ "\n"
+#~ "Display Options:\n"
+#~ "  ( -b | --ignore-space-change )   Ignore changes to white space\n"
+#~ "  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
+#~ "  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
+#~ "  ( -i | --ignore-case )           Ignore case differences\n"
+#~ "  ( -w | --ignore-all-space )      Ignore white space differences"
+#~ msgstr ""
+#~ "Utilisation:\n"
+#~ "    diffuse [ [OPTION...] [FILE...] ]...\n"
+#~ "    diffuse ( -h | -? | --help | -v | --version )\n"
+#~ "\n"
+#~ "Diffuse est un outil graphique pour fusionner et comparer des fichiers "
+#~ "textes.\n"
+#~ "Diffuse peut comparer un nombre arbitraire de fichiers côte-à-côte et donner\n"
+#~ "aux utilisateurs la possibilité de manuellement ajuster l'alignement des\n"
+#~ "lignes et éditer directement les fichiers. Diffuse peut aussi récupérer les\n"
+#~ "révisions à partir de dépôts Bazaar, CVS, Darcs, Git, Mercurial, Monotone,\n"
+#~ "RCS, Subversion, et SVK afin de les comparer et les fusionner.\n"
+#~ "\n"
+#~ "Options d'aide:\n"
+#~ "  ( -h | -? | --help )             Affiche ce message d'aide\n"
+#~ "  ( -v | --version )               Affiche les informations de version et de\n"
+#~ "                                   copyright\n"
+#~ "\n"
+#~ "Options de configuration:\n"
+#~ "  --no-rcfile                      Ne lire aucun fichier de ressource\n"
+#~ "  --rcfile <file>                  Spécifier explicitement un fichier de\n"
+#~ "                                   ressource\n"
+#~ "\n"
+#~ "Options générales:\n"
+#~ "  ( -c | --commit ) <rev>          Comparer le fichier aux révisions <rev-1>\n"
+#~ "                                   et <rev>\n"
+#~ "  ( -D | --close-if-same )         Fermer tous les onglets sans différences\n"
+#~ "  ( -e | --encoding ) <codec>      Utiliser le <codec> pour lire et écrire "
+#~ "les\n"
+#~ "                                   fichiers\n"
+#~ "  ( -L | --label ) <label>         Afficher <label> au lieu du nom du fichier\n"
+#~ "  ( -m | --modified )              Créer un nouvel onglet pour chaque fichier\n"
+#~ "                                   modifié\n"
+#~ "  ( -r | --revision ) <rev>        Fichier à la révision <rev>\n"
+#~ "  ( -s | --separate )              Créer un nouvel onglet pour chaque fichier\n"
+#~ "  ( -t | --tab )                   Commencer avec un nouvel onglet\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Ordre de recherche des système de gestion\n"
+#~ "                                   de versions\n"
+#~ "  --line <line>                    Commencer avec la ligne <line> "
+#~ "sélectionnée\n"
+#~ "  --null-file                      Créer un panneau de comparaison avec un\n"
+#~ "                                   fichier vide\n"
+#~ "\n"
+#~ "Options d'affichage:\n"
+#~ "  ( -b | --ignore-space-change )   Ignorer les différences avec des espaces\n"
+#~ "  ( -B | --ignore-blank-lines )    Ignorer les différences avec des lignes\n"
+#~ "                                   vides\n"
+#~ "  ( -E | --ignore-end-of-line )    Ignorer les différences en fin de ligne\n"
+#~ "  ( -i | --ignore-case )           Ignorer les différences de casse\n"
+#~ "  ( -w | --ignore-all-space )      Ignorer les différences avec tous types\n"
+#~ "                                   d'espaces"
diff --git a/po/it.po b/po/it.po
index b3d0beb..67a7397 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Diffuse 0.4.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-23 20:00-0400\n"
+"POT-Creation-Date: 2023-04-16 14:09-0400\n"
 "PO-Revision-Date: 2022-04-04 12:18-0400\n"
 "Last-Translator: Cristian Marchi <cri.penta@gmail.com>\n"
 "Language-Team: Italian\n"
@@ -31,827 +31,303 @@ 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."
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, and "
+"Subversion repositories."
 msgstr ""
 
-#: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
-msgid "Main window: diff between two files"
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:28
+msgid "Main window"
 msgstr ""
 
-#: src/diffuse/constants.py:25
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:32
+msgid "About window"
+msgstr ""
+
+#: src/diffuse/constants.py:26
 msgid "Copyright"
 msgstr ""
 
-#: src/diffuse/dialogs.py:40
-msgid "Diffuse is a graphical tool for merging and comparing text files."
+#: src/diffuse/dialogs.py:46 src/diffuse/dialogs.py:89 src/diffuse/dialogs.py:133
+#: src/diffuse/preferences.py:254 src/diffuse/preferences.py:483
+#: src/diffuse/window.py:309 src/diffuse/window.py:1107
+msgid "_Cancel"
 msgstr ""
-"Diffuse è uno strumento grafico per l'unione e la comparazione di file di testo."
 
-#: src/diffuse/dialogs.py:45
-msgid "translator-credits"
-msgstr "Cristian Marchi <cri.penta@gmail.com>,  2011."
-
-#: src/diffuse/dialogs.py:82
+#: src/diffuse/dialogs.py:50
 msgid "Encoding: "
 msgstr "Codifica: "
 
-#: src/diffuse/dialogs.py:94
+#: src/diffuse/dialogs.py:62
 msgid "Revision: "
 msgstr "Revisione: "
 
-#: src/diffuse/dialogs.py:156
+#: src/diffuse/dialogs.py:90 src/diffuse/dialogs.py:134
+#: src/diffuse/preferences.py:255
+msgid "_OK"
+msgstr ""
+
+#: src/diffuse/dialogs.py:130
 msgid "Find..."
 msgstr "Trova..."
 
-#: src/diffuse/dialogs.py:164
+#: src/diffuse/dialogs.py:140
 msgid "Search For: "
 msgstr "Cerca: "
 
-#: src/diffuse/dialogs.py:189
+#: src/diffuse/dialogs.py:165
 msgid "Match Case"
 msgstr "Distingui MAIUSCOLE/minuscole"
 
-#: src/diffuse/dialogs.py:194
+#: src/diffuse/dialogs.py:170
 msgid "Search Backwards"
 msgstr "Cerca all'indietro"
 
+#: src/diffuse/main.py:53
+msgid "Display version and copyright information"
+msgstr "Mostra la versione e il copyright"
+
+#: src/diffuse/main.py:61
+msgid "Do not read any resource files"
+msgstr "Non leggere alcun file risorsa"
+
+#: src/diffuse/main.py:69
+msgid "Specify explicit resource file"
+msgstr "Specifica un file di risorsa"
+
+#: src/diffuse/main.py:77
+msgid "File revisions <rev-1> and <rev>"
+msgstr "Revisioni file <rev-1> e <rev>"
+
 #: src/diffuse/main.py:85
-msgid "Close Tab"
-msgstr "Chiudi scheda"
+msgid "Close all tabs with no differences"
+msgstr "Chiude tutte le schede senza differenze"
 
-#: src/diffuse/main.py:132
-msgid "Open File..."
-msgstr "Apri file..."
+#: src/diffuse/main.py:92
+msgid "Use <codec> to read and write files"
+msgstr "Usa <codec> per leggere e scrivere i file"
 
-#: src/diffuse/main.py:133
-msgid "Reload File"
-msgstr "Ricarica file"
+#: src/diffuse/main.py:100
+msgid "Display <label> instead of the file name"
+msgstr "Visualizza <etichetta> invece del nome del file"
 
-#: src/diffuse/main.py:134
-msgid "Save File"
-msgstr "Salva file"
+#: src/diffuse/main.py:108
+msgid "Create a new tab for each modified file"
+msgstr "Crea una nuova scheda per ogni file modificato"
 
-#: src/diffuse/main.py:135
-msgid "Save File As..."
-msgstr "Salva con nome..."
+#: src/diffuse/main.py:115
+msgid "File revision <rev>"
+msgstr "Revisione file <rev>"
 
-#: src/diffuse/main.py:217
-#, python-format
-msgid "Column %d"
-msgstr "Colonna %d"
+#: src/diffuse/main.py:123
+msgid "Create a new tab for each file"
+msgstr "Crea una nuova scheda per ogni file"
 
-#: src/diffuse/main.py:291
-msgid "Save changes before loading the new file?"
-msgstr "Salvare i cambiamenti prima di caricare il nuovo file?"
+#: src/diffuse/main.py:130
+msgid "Start a new tab"
+msgstr "Apre una nuova scheda"
 
-#: src/diffuse/main.py:402
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "Errore durante la lettura della revisione \"%(rev)s\" di «%(file)s»."
+#: src/diffuse/main.py:137 src/diffuse/preferences.py:159
+msgid "Version control system search order"
+msgstr ""
 
-#: src/diffuse/main.py:405 src/diffuse/main.py:1860
+#: src/diffuse/main.py:145
+msgid "Start with line <line> selected"
+msgstr "Inizia con la <linea> selezionata"
+
+#: src/diffuse/main.py:153
+msgid "Create a blank file comparison pane"
+msgstr "Crea un riquadro di comparazione vuoto"
+
+#: src/diffuse/main.py:160 src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:95
+msgid "Ignore changes to white space"
+msgstr "Ignora le modifiche agli spazi vuoti"
+
+#: src/diffuse/main.py:167
+msgid "Ignore changes in blank lines"
+msgstr "Ignora le modifiche alle righe vuote"
+
+#: src/diffuse/main.py:174 src/diffuse/preferences.py:88
+msgid "Ignore end of line differences"
+msgstr "Ignora le differenze alla fine della riga"
+
+#: src/diffuse/main.py:181 src/diffuse/preferences.py:84
+msgid "Ignore case differences"
+msgstr "Ignora la differenza tra lettere maiuscole e minuscole"
+
+#: src/diffuse/main.py:188 src/diffuse/preferences.py:85
+msgid "Ignore white space differences"
+msgstr "Ignora le differenze tra spazi vuoti"
+
+#: src/diffuse/main.py:191
+msgid ""
+"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 several VCSs for comparison and merging."
+msgstr ""
+
+#: src/diffuse/main.py:247 src/diffuse/window.py:420
 #, python-format
 msgid "Error reading %s."
 msgstr "Errore leggendo il %s."
 
-#: src/diffuse/main.py:427
-msgid "Open File"
-msgstr "Apertura file"
-
-#: src/diffuse/main.py:484
-#, python-format
-msgid "The file %s changed on disk. Do you want to reload the file?"
-msgstr "Il file «%s» è cambiato sul disco. Ricaricarlo?"
-
-#: src/diffuse/main.py:510
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "Salva %(title)s riquadro %(pane)d"
-
-#: src/diffuse/main.py:542
-#, python-format
-msgid "A file named %s already exists. Do you want to overwrite it?"
-msgstr "Il file «%s» esiste già. Sovrascrivere?"
-
-#: src/diffuse/main.py:549
-#, 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 ""
-"Il file «%s» è stato modificato da un'altro processo dopo la lettura. Se si "
-"salva, tutte le modifiche esterne potrebbero essere perdute. Salvare comunque?"
-
-#: src/diffuse/main.py:591
-#, python-format
-msgid "Error encoding to %s."
-msgstr "Errore codificando %s."
-
-#: src/diffuse/main.py:595 src/diffuse/preferences.py:300
-#, python-format
-msgid "Error writing %s."
-msgstr "Errore scrivendo il %s."
-
-#: src/diffuse/main.py:625
-msgid "Go To Line..."
-msgstr "Vai alla linea..."
-
-#: src/diffuse/main.py:626
-msgid "Line Number: "
-msgstr "Numero di riga: "
-
-#: src/diffuse/main.py:657
-msgid ""
-"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."
-
-#: src/diffuse/main.py:661
-msgid "Press the escape key to finish editing."
-msgstr "Premere il tasto \"Esc\" per terminare le modifiche."
-
-#: src/diffuse/main.py:664
-msgid ""
-"Select target line and press the space bar to align. Press the escape key to "
-"cancel."
-msgstr ""
-"Selezionare la riga di destinazione e premere spazio per allineare. Premere "
-"\"Esc\" per annullare."
-
-#: src/diffuse/main.py:787
-msgid "_File"
-msgstr "_File"
-
-#: src/diffuse/main.py:788
-msgid "_Open File..."
-msgstr "_Apri file..."
-
-#: src/diffuse/main.py:789
-msgid "Open File In New _Tab..."
-msgstr "Apri file in una nuova sc_heda..."
-
-#: src/diffuse/main.py:790
-msgid "Open _Modified Files..."
-msgstr "Apri file _modificati..."
-
-#: src/diffuse/main.py:791
-msgid "Open Commi_t..."
-msgstr "Apri c_ommit..."
-
-#: src/diffuse/main.py:792
-msgid "_Reload File"
-msgstr "_Ricarica file"
-
-#: src/diffuse/main.py:794
-msgid "_Save File"
-msgstr "_Salva file"
-
-#: src/diffuse/main.py:795
-msgid "Save File _As..."
-msgstr "S_alva con nome..."
-
-#: src/diffuse/main.py:796
-msgid "Save A_ll"
-msgstr "Salva _tutti"
-
-#: src/diffuse/main.py:798
-msgid "New _2-Way File Merge"
-msgstr "Nuova unione a _2 file"
-
-#: src/diffuse/main.py:799
-msgid "New _3-Way File Merge"
-msgstr "Nuova unione a _3 file"
-
-#: src/diffuse/main.py:800
-msgid "New _N-Way File Merge..."
-msgstr "Nuova unione a _N file..."
-
-#: src/diffuse/main.py:802
-msgid "_Close Tab"
-msgstr "_Chiudi scheda"
-
-#: src/diffuse/main.py:803
-msgid "_Undo Close Tab"
-msgstr "Annulla chi_usura scheda"
-
-#: src/diffuse/main.py:804
-msgid "_Quit"
-msgstr "_Esci"
-
-#: src/diffuse/main.py:807
-msgid "_Edit"
-msgstr "_Modifica"
-
-#: src/diffuse/main.py:808
-msgid "_Undo"
-msgstr "Ann_ulla"
-
-#: src/diffuse/main.py:809
-msgid "_Redo"
-msgstr "_Ripeti"
-
-#: src/diffuse/main.py:811
-msgid "Cu_t"
-msgstr "_Taglia"
-
-#: src/diffuse/main.py:812
-msgid "_Copy"
-msgstr "_Copia"
-
-#: src/diffuse/main.py:813
-msgid "_Paste"
-msgstr "_Incolla"
-
-#: src/diffuse/main.py:815
-msgid "Select _All"
-msgstr "Selezion_a tutto"
-
-#: src/diffuse/main.py:816
-msgid "C_lear Edits"
-msgstr "Annulla _modifiche"
-
-#: src/diffuse/main.py:817
-msgid "_Dismiss All Edits"
-msgstr "Scarta tutte le mo_difiche"
-
-#: src/diffuse/main.py:819
-msgid "_Find..."
-msgstr "Tr_ova..."
-
-#: src/diffuse/main.py:820
-msgid "Find _Next"
-msgstr "Trova _successivo"
-
-#: src/diffuse/main.py:821
-msgid "Find Pre_vious"
-msgstr "Trova _precedente"
-
-#: src/diffuse/main.py:822
-msgid "_Go To Line..."
-msgstr "_Vai alla riga..."
-
-#: src/diffuse/main.py:824
-msgid "Pr_eferences..."
-msgstr "Pr_eferenze..."
-
-#: src/diffuse/main.py:828
-msgid "None"
-msgstr "Nessuna"
-
-#: src/diffuse/main.py:846
-msgid "_View"
-msgstr "_Visualizza"
-
-#: src/diffuse/main.py:847
-msgid "_Syntax Highlighting"
-msgstr "Si_ntassi"
-
-#: src/diffuse/main.py:849
-msgid "Re_align All"
-msgstr "Ria_llinea tutti"
-
-#: src/diffuse/main.py:850
-msgid "_Isolate"
-msgstr "_Isola"
-
-#: src/diffuse/main.py:852
-msgid "_First Difference"
-msgstr "_Prima differenza"
-
-#: src/diffuse/main.py:853
-msgid "_Previous Difference"
-msgstr "Differenza p_recedente"
-
-#: src/diffuse/main.py:854
-msgid "_Next Difference"
-msgstr "Differenza s_uccessiva"
-
-#: src/diffuse/main.py:855
-msgid "_Last Difference"
-msgstr "Ulti_ma differenza"
-
-#: src/diffuse/main.py:857
-msgid "Fir_st Tab"
-msgstr "Prim_a scheda"
-
-#: src/diffuse/main.py:858
-msgid "Pre_vious Tab"
-msgstr "Scheda pr_ecedente"
-
-#: src/diffuse/main.py:859
-msgid "Next _Tab"
-msgstr "Scheda su_ccessiva"
-
-#: src/diffuse/main.py:860
-msgid "Las_t Tab"
-msgstr "Ul_tima scheda"
-
-#: src/diffuse/main.py:862
-msgid "Shift Pane _Right"
-msgstr "Sposta riquadro a _destra"
-
-#: src/diffuse/main.py:863
-msgid "Shift Pane _Left"
-msgstr "Sposta riquadro a _sinistra"
-
-#: src/diffuse/main.py:866
-msgid "F_ormat"
-msgstr "F_ormato"
-
-#: src/diffuse/main.py:867
-msgid "Convert To _Upper Case"
-msgstr "Converti in M_AIUSCOLO"
-
-#: src/diffuse/main.py:868
-msgid "Convert To _Lower Case"
-msgstr "Converti in m_inuscolo"
-
-#: src/diffuse/main.py:870
-msgid "Sort Lines In _Ascending Order"
-msgstr "Disponi le righe in ordine a_scendente"
-
-#: src/diffuse/main.py:871
-msgid "Sort Lines In D_escending Order"
-msgstr "Disponi le righe in ordine _discendente"
-
-#: src/diffuse/main.py:873
-msgid "Remove Trailing _White Space"
-msgstr "Rimuovi gli spazi _vuoti alla fine della riga"
-
-#: src/diffuse/main.py:874
-msgid "Convert Tabs To _Spaces"
-msgstr "Converti le _tabulazioni in spazi"
-
-#: src/diffuse/main.py:875
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "Converti gli spa_zi iniziali in tabulazioni"
-
-#: src/diffuse/main.py:877
-msgid "_Increase Indenting"
-msgstr "Au_menta indentazione"
-
-#: src/diffuse/main.py:878
-msgid "De_crease Indenting"
-msgstr "Dimi_nuisci indentazione"
-
-#: src/diffuse/main.py:880
-msgid "Convert To _DOS Format"
-msgstr "Converti nel formato D_OS"
-
-#: src/diffuse/main.py:881
-msgid "Convert To _Mac Format"
-msgstr "Converti nel formato MA_C"
-
-#: src/diffuse/main.py:882
-msgid "Convert To Uni_x Format"
-msgstr "Converti nel formato Uni_x"
-
-#: src/diffuse/main.py:885
-msgid "_Merge"
-msgstr "_Unione"
-
-#: src/diffuse/main.py:886
-msgid "Copy Selection _Right"
-msgstr "Copia selezione a _destra"
-
-#: src/diffuse/main.py:887
-msgid "Copy Selection _Left"
-msgstr "Copia selezione a _sinistra"
-
-#: src/diffuse/main.py:889
-msgid "Copy Left _Into Selection"
-msgstr "Copia s_inistra nella selezione"
-
-#: src/diffuse/main.py:890
-msgid "Copy Right I_nto Selection"
-msgstr "Copia d_estra nella selezione"
-
-#: src/diffuse/main.py:891
-msgid "_Merge From Left Then Right"
-msgstr "_Unisci sinistra poi destra"
-
-#: src/diffuse/main.py:892
-msgid "M_erge From Right Then Left"
-msgstr "U_nisci destra poi sinistra"
-
-#: src/diffuse/main.py:895
-msgid "_Help"
-msgstr "A_iuto"
-
-#: src/diffuse/main.py:896
-msgid "_Help Contents..."
-msgstr "_Sommario..."
-
-#: src/diffuse/main.py:898
-#, python-format
-msgid "_About %s..."
-msgstr "I_nformazioni su %s..."
-
-#: src/diffuse/main.py:913
-msgid "New 2-Way File Merge"
-msgstr "Nuova unione a 2 file"
-
-#: src/diffuse/main.py:914
-msgid "New 3-Way File Merge"
-msgstr "Nuova unione a 3 file"
-
-#: src/diffuse/main.py:916
-msgid "Realign All"
-msgstr "Riallinea tutti"
-
-#: src/diffuse/main.py:917
-msgid "First Difference"
-msgstr "Prima differenza"
-
-#: src/diffuse/main.py:918
-msgid "Previous Difference"
-msgstr "Differenza precedente"
-
-#: src/diffuse/main.py:919
-msgid "Next Difference"
-msgstr "Differenza successiva"
-
-#: src/diffuse/main.py:920
-msgid "Last Difference"
-msgstr "Ultima differenza"
-
-#: src/diffuse/main.py:922
-msgid "Copy Selection Right"
-msgstr "Copia la selezione a destra"
-
-#: src/diffuse/main.py:923
-msgid "Copy Selection Left"
-msgstr "Copia la selezione a sinistra"
-
-#: src/diffuse/main.py:924
-msgid "Copy Left Into Selection"
-msgstr "Copia sinistra nella selezione"
-
-#: src/diffuse/main.py:925
-msgid "Copy Right Into Selection"
-msgstr "Copia destra nella selezione"
-
-#: src/diffuse/main.py:926
-msgid "Merge From Left Then Right"
-msgstr "Unisce prima da sinistra poi da destra"
-
-#: src/diffuse/main.py:927
-msgid "Merge From Right Then Left"
-msgstr "Unisce prima da destra poi da sinistra"
-
-#: src/diffuse/main.py:929
-msgid "Undo"
-msgstr "Annulla"
-
-#: src/diffuse/main.py:930
-msgid "Redo"
-msgstr "Ripeti"
-
-#: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
-msgid "Cut"
-msgstr "Taglia"
-
-#: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
-msgid "Copy"
-msgstr "Copia"
-
-#: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
-msgid "Paste"
-msgstr "Incolla"
-
-#: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
-msgid "Clear Edits"
-msgstr "Annulla le modifiche"
-
-#: src/diffuse/main.py:1057
-msgid "Some files have unsaved changes. Select the files to save before closing."
-msgstr ""
-"Alcune modifiche ai file non sono ancora state salvate. Selezionare i file da "
-"salvare prima di uscire."
-
-#: src/diffuse/main.py:1071
-msgid "Tab"
-msgstr "Scheda"
-
-#: src/diffuse/main.py:1076
-msgid "Pane"
-msgstr "Riquadro"
-
-#: src/diffuse/main.py:1087
-msgid "Close _Without Saving"
-msgstr "_Chiudi senza salvare"
-
-#: src/diffuse/main.py:1126
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "Chiudendo questa scheda %s verrà chiuso."
-
-#: src/diffuse/main.py:1209
-#, python-format
-msgid "File Merge %d"
-msgstr "Unione file # %d"
-
-#: src/diffuse/main.py:1315
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "Errore nel recupero dei commit per %s."
-
-#: src/diffuse/main.py:1347
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "Errore nel recupero delle modifiche per %s."
-
-#: src/diffuse/main.py:1380
-msgid "Open File In New Tab"
-msgstr "Apre ilo file in una nuova scheda"
-
-#: src/diffuse/main.py:1403
-msgid "Choose Folder With Modified Files"
-msgstr "Selezionare la cartella con i file modificati"
-
-#: src/diffuse/main.py:1421
-msgid "No modified files found."
-msgstr "Non sono stati trovati file modificati."
-
-#: src/diffuse/main.py:1427
-msgid "Choose Folder With Commit"
-msgstr "Selezionare la cartella con i commit"
-
-#: src/diffuse/main.py:1447
-msgid "No committed files found."
-msgstr "Non sono stati trovati file di cui è stato eseguito il commit."
-
-#: src/diffuse/main.py:1483
-msgid "New N-Way File Merge..."
-msgstr "Nuova unione a N file..."
-
-#: src/diffuse/main.py:1484
-msgid "Number of panes: "
-msgstr "Numero di riquadri: "
-
-#: src/diffuse/main.py:1558
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "Frase non trovata. Continuare dalla fine del file?"
-
-#: src/diffuse/main.py:1560
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "Frase non trovata. Continuare dall'inizio del file?"
-
-#: src/diffuse/main.py:1781
-#, fuzzy
-msgid ""
-"Usage:\n"
-"    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"
-"also retrieve revisions of files from several VCSs for comparison and merging.\n"
-"\n"
-"Help Options:\n"
-"  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright information\n"
-"\n"
-"Configuration Options:\n"
-"  --no-rcfile                      Do not read any resource files\n"
-"  --rcfile <file>                  Specify explicit resource file\n"
-"\n"
-"General Options:\n"
-"  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
-"  ( -D | --close-if-same )         Close all tabs with no differences\n"
-"  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
-"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
-"  ( -m | --modified )              Create a new tab for each modified file\n"
-"  ( -r | --revision ) <rev>        File revision <rev>\n"
-"  ( -s | --separate )              Create a new tab for each file\n"
-"  ( -t | --tab )                   Start a new tab\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    Start with line <line> selected\n"
-"  --null-file                      Create a blank file comparison pane\n"
-"\n"
-"Display Options:\n"
-"  ( -b | --ignore-space-change )   Ignore changes to white space\n"
-"  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
-"  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
-"  ( -i | --ignore-case )           Ignore case differences\n"
-"  ( -w | --ignore-all-space )      Ignore white space differences"
-msgstr ""
-"Utilizzo:\n"
-"    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"
-"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"
-"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"
-"Opzioni di aiuto:\n"
-"  ( -h | -? | --help )             Mostra le informazioni di utilizzo\n"
-"  ( -v | --version )               Mostra la versione e il copyright\n"
-"\n"
-"Opzioni di configurazione:\n"
-"  --no-rcfile                      Non leggere alcun file risorsa\n"
-"  --rcfile <file>                  Specifica un file di risorsa\n"
-"\n"
-"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 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"
-"  ( -s | --separate )              Crea una nuova scheda per ogni file\n"
-"  ( -t | --tab )                   Apre una nuova scheda\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <linea>                   Inizia con la <linea> selezionata\n"
-"  --null-file                      Crea un riquadro di comparazione vuoto\n"
-"\n"
-"Opzioni di visualizzazione:\n"
-"  ( -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"
-"  ( -w | --ignore-all-space )      Ignora le differenze tra spazi vuoti"
-
-#: src/diffuse/main.py:1948
+#: src/diffuse/main.py:327
 msgid "Error parsing line number."
 msgstr "Errore nell'analizzare il numero di riga."
 
-#: src/diffuse/main.py:1958
-#, python-format
-msgid "Skipping unknown argument \"%s\"."
-msgstr "L'argomento sconosciuto \"%s\" verrà tralasciato."
-
-#: src/diffuse/main.py:1966
+#: src/diffuse/main.py:343
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Errore nell'elaborazione dell'argomento \"%s\". Cartella non attesa."
 
-#: src/diffuse/preferences.py:80
+#: src/diffuse/preferences.py:75
 msgid "Display"
 msgstr "Visualizzazione"
 
-#: src/diffuse/preferences.py:83
+#: src/diffuse/preferences.py:78
 msgid "Font"
 msgstr "Carattere"
 
-#: src/diffuse/preferences.py:84
+#: src/diffuse/preferences.py:79
 msgid "Tab width"
 msgstr "Larghezza scheda"
 
-#: src/diffuse/preferences.py:85
+#: src/diffuse/preferences.py:80
 msgid "Show right margin"
 msgstr "Mostra margine destro"
 
-#: src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:81
 msgid "Right margin"
 msgstr "Margine destro"
 
-#: src/diffuse/preferences.py:87
+#: src/diffuse/preferences.py:82
 msgid "Show line numbers"
 msgstr "Mostra i numeri di riga"
 
-#: src/diffuse/preferences.py:88
+#: src/diffuse/preferences.py:83
 msgid "Show white space characters"
 msgstr "Mostra i caratteri di spaziatura"
 
-#: src/diffuse/preferences.py:89
-msgid "Ignore case differences"
-msgstr "Ignora la differenza tra lettere maiuscole e minuscole"
-
-#: src/diffuse/preferences.py:90
-msgid "Ignore white space differences"
-msgstr "Ignora le differenze tra spazi vuoti"
-
-#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100
-msgid "Ignore changes to white space"
-msgstr "Ignora le modifiche agli spazi vuoti"
-
-#: src/diffuse/preferences.py:92
+#: src/diffuse/preferences.py:87
 msgid "Ignore blank line differences"
 msgstr "Ignora le differenze tra le righe vuote"
 
-#: src/diffuse/preferences.py:93
-msgid "Ignore end of line differences"
-msgstr "Ignora le differenze alla fine della riga"
-
-#: src/diffuse/preferences.py:95
+#: src/diffuse/preferences.py:90
 msgid "Alignment"
 msgstr "Allineamento"
 
-#: src/diffuse/preferences.py:98
+#: src/diffuse/preferences.py:93
 msgid "Ignore case"
 msgstr "Ignora MAIUSCOLE/minuscole"
 
-#: src/diffuse/preferences.py:99
+#: src/diffuse/preferences.py:94
 msgid "Ignore white space"
 msgstr "Ignora gli spazi vuoti"
 
-#: src/diffuse/preferences.py:101
+#: src/diffuse/preferences.py:96
 msgid "Ignore blank lines"
 msgstr "Ignora le righe vuote"
 
-#: src/diffuse/preferences.py:102
+#: src/diffuse/preferences.py:97
 msgid "Ignore end of line characters"
 msgstr "Ignora i caratteri di fine linea"
 
-#: src/diffuse/preferences.py:104
+#: src/diffuse/preferences.py:99
 msgid "Editor"
 msgstr "Editor"
 
-#: src/diffuse/preferences.py:107
+#: src/diffuse/preferences.py:102
 msgid "Auto indent"
 msgstr "Indentazione automatica"
 
-#: src/diffuse/preferences.py:108
+#: src/diffuse/preferences.py:103
 msgid "Expand tabs to spaces"
 msgstr "Espandi le tabulazioni in spazi"
 
-#: src/diffuse/preferences.py:109
+#: src/diffuse/preferences.py:104
 msgid "Soft tab width"
 msgstr "Larghezza scheda"
 
-#: src/diffuse/preferences.py:111
+#: src/diffuse/preferences.py:106
 msgid "Tabs"
 msgstr "Schede"
 
-#: src/diffuse/preferences.py:114
+#: src/diffuse/preferences.py:109
 msgid "Default panes"
 msgstr "Riquadri predefiniti"
 
-#: src/diffuse/preferences.py:115
+#: src/diffuse/preferences.py:110
 msgid "Always show the tab bar"
 msgstr "Mostra sempre la barra delle schede"
 
-#: src/diffuse/preferences.py:116
+#: src/diffuse/preferences.py:111
 #, 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:118
+#: src/diffuse/preferences.py:113
 msgid "Regional Settings"
 msgstr "Impostazioni regionali"
 
-#: src/diffuse/preferences.py:121
+#: src/diffuse/preferences.py:116
 msgid "Default codec"
 msgstr "Codec predefinito"
 
-#: src/diffuse/preferences.py:122
+#: src/diffuse/preferences.py:117
 msgid "Order of codecs used to identify encoding"
 msgstr "Ordine dei codici utilizzati per identificare la codifica"
 
-#: src/diffuse/preferences.py:143
+#: src/diffuse/preferences.py:138
 msgid "Cygwin"
 msgstr "Cygwin"
 
-#: src/diffuse/preferences.py:145
+#: src/diffuse/preferences.py:140
 msgid "Root directory"
 msgstr "Cartella radice"
 
-#: src/diffuse/preferences.py:146
+#: src/diffuse/preferences.py:141
 msgid "Cygdrive prefix"
 msgstr "Prefisso Cygdrive"
 
-#: src/diffuse/preferences.py:165
-msgid "Version control system search order"
-msgstr ""
-
-#: src/diffuse/preferences.py:173
+#: src/diffuse/preferences.py:167
 msgid "\"co\" command"
 msgstr "Comando \"co\""
 
-#: src/diffuse/preferences.py:174
+#: src/diffuse/preferences.py:168
 msgid "\"rlog\" command"
 msgstr "Comando \"rlog\""
 
-#: src/diffuse/preferences.py:176
+#: src/diffuse/preferences.py:170
 msgid "Command"
 msgstr "Comando"
 
-#: src/diffuse/preferences.py:182
+#: src/diffuse/preferences.py:176
 msgid "Launch from a Bash login shell"
 msgstr "Avvia dalla Bash di una shell di login"
 
-#: src/diffuse/preferences.py:189
+#: src/diffuse/preferences.py:183
 msgid "Update paths for Cygwin"
 msgstr "Aggiorna i percorsi per Cygwin"
 
-#: src/diffuse/preferences.py:194
+#: src/diffuse/preferences.py:188
 msgid "Version Control"
 msgstr "Controllo di versione"
 
-#: src/diffuse/preferences.py:259
+#: src/diffuse/preferences.py:253
 msgid "Preferences"
 msgstr "Preferenze"
 
+#: src/diffuse/preferences.py:294 src/diffuse/window.py:580
+#, python-format
+msgid "Error writing %s."
+msgstr "Errore scrivendo il %s."
+
+#: src/diffuse/preferences.py:483 src/diffuse/window.py:446
+#: src/diffuse/window.py:1413 src/diffuse/window.py:1436 src/diffuse/window.py:1459
+msgid "_Open"
+msgstr ""
+
 #: src/diffuse/resources.py:242 src/diffuse/resources.py:246
 #: src/diffuse/resources.py:249
 #, python-brace-format
@@ -937,16 +413,11 @@ msgstr "Errore nell'elaborare la riga {line} di «{file}»."
 msgid "Auto Detect"
 msgstr "Automatico"
 
-#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97
+#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:96
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "Eroore analizzando la revisione %s."
 
-#: src/diffuse/vcs/vcs_registry.py:238
-#, python-format
-msgid "Error parsing %s."
-msgstr "Errore analizzando %s."
-
 #: src/diffuse/widgets.py:1857
 msgid "Align with Selection"
 msgstr "Allinea con la selezione"
@@ -959,10 +430,643 @@ msgstr "Isola"
 msgid "Merge Selection"
 msgstr "Unisci selezione"
 
+#: src/diffuse/widgets.py:1861 src/diffuse/window.py:865
+msgid "Cut"
+msgstr "Taglia"
+
+#: src/diffuse/widgets.py:1862 src/diffuse/window.py:866
+msgid "Copy"
+msgstr "Copia"
+
+#: src/diffuse/widgets.py:1863 src/diffuse/window.py:867
+msgid "Paste"
+msgstr "Incolla"
+
 #: src/diffuse/widgets.py:1865
 msgid "Select All"
 msgstr "Seleziona tutto"
 
+#: src/diffuse/widgets.py:1866 src/diffuse/window.py:868
+msgid "Clear Edits"
+msgstr "Annulla le modifiche"
+
 #: src/diffuse/widgets.py:1868
 msgid "Swap with Selected Pane"
 msgstr "Scambia con il riquadro selezionato"
+
+#: src/diffuse/window.py:83
+msgid "Close Tab"
+msgstr "Chiudi scheda"
+
+#: src/diffuse/window.py:126
+msgid "Open File..."
+msgstr "Apri file..."
+
+#: src/diffuse/window.py:127
+msgid "Reload File"
+msgstr "Ricarica file"
+
+#: src/diffuse/window.py:128
+msgid "Save File"
+msgstr "Salva file"
+
+#: src/diffuse/window.py:129
+msgid "Save File As..."
+msgstr "Salva con nome..."
+
+#: src/diffuse/window.py:228
+#, python-format
+msgid "Column %d"
+msgstr "Colonna %d"
+
+#: src/diffuse/window.py:306
+msgid "Save changes before loading the new file?"
+msgstr "Salvare i cambiamenti prima di caricare il nuovo file?"
+
+#: src/diffuse/window.py:310
+msgid "_No"
+msgstr ""
+
+#: src/diffuse/window.py:311
+msgid "_Yes"
+msgstr ""
+
+#: src/diffuse/window.py:417
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "Errore durante la lettura della revisione \"%(rev)s\" di «%(file)s»."
+
+#: src/diffuse/window.py:442
+msgid "Open File"
+msgstr "Apertura file"
+
+#: src/diffuse/window.py:495
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "Salva %(title)s riquadro %(pane)d"
+
+#: src/diffuse/window.py:499 src/diffuse/window.py:1111
+#, fuzzy
+msgid "_Save"
+msgstr "_Salva file"
+
+#: src/diffuse/window.py:527
+#, python-format
+msgid "A file named %s already exists. Do you want to overwrite it?"
+msgstr "Il file «%s» esiste già. Sovrascrivere?"
+
+#: src/diffuse/window.py:534
+#, 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 ""
+"Il file «%s» è stato modificato da un'altro processo dopo la lettura. Se si "
+"salva, tutte le modifiche esterne potrebbero essere perdute. Salvare comunque?"
+
+#: src/diffuse/window.py:576
+#, python-format
+msgid "Error encoding to %s."
+msgstr "Errore codificando %s."
+
+#: src/diffuse/window.py:610
+msgid "Go To Line..."
+msgstr "Vai alla linea..."
+
+#: src/diffuse/window.py:611
+msgid "Line Number: "
+msgstr "Numero di riga: "
+
+#: src/diffuse/window.py:642
+msgid ""
+"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."
+
+#: src/diffuse/window.py:646
+msgid "Press the escape key to finish editing."
+msgstr "Premere il tasto \"Esc\" per terminare le modifiche."
+
+#: src/diffuse/window.py:649
+msgid ""
+"Select target line and press the space bar to align. Press the escape key to "
+"cancel."
+msgstr ""
+"Selezionare la riga di destinazione e premere spazio per allineare. Premere "
+"\"Esc\" per annullare."
+
+#: src/diffuse/window.py:710
+msgid "_File"
+msgstr "_File"
+
+#: src/diffuse/window.py:712
+msgid "_Open File..."
+msgstr "_Apri file..."
+
+#: src/diffuse/window.py:713
+msgid "Open File In New _Tab..."
+msgstr "Apri file in una nuova sc_heda..."
+
+#: src/diffuse/window.py:714
+msgid "Open _Modified Files..."
+msgstr "Apri file _modificati..."
+
+#: src/diffuse/window.py:715
+msgid "Open Commi_t..."
+msgstr "Apri c_ommit..."
+
+#: src/diffuse/window.py:716
+msgid "_Reload File"
+msgstr "_Ricarica file"
+
+#: src/diffuse/window.py:718
+msgid "_Save File"
+msgstr "_Salva file"
+
+#: src/diffuse/window.py:719
+msgid "Save File _As..."
+msgstr "S_alva con nome..."
+
+#: src/diffuse/window.py:720
+msgid "Save A_ll"
+msgstr "Salva _tutti"
+
+#: src/diffuse/window.py:722
+msgid "New _2-Way File Merge"
+msgstr "Nuova unione a _2 file"
+
+#: src/diffuse/window.py:723
+msgid "New _3-Way File Merge"
+msgstr "Nuova unione a _3 file"
+
+#: src/diffuse/window.py:724
+msgid "New _N-Way File Merge..."
+msgstr "Nuova unione a _N file..."
+
+#: src/diffuse/window.py:726
+msgid "_Close Tab"
+msgstr "_Chiudi scheda"
+
+#: src/diffuse/window.py:727
+msgid "_Undo Close Tab"
+msgstr "Annulla chi_usura scheda"
+
+#: src/diffuse/window.py:728
+msgid "_Quit"
+msgstr "_Esci"
+
+#: src/diffuse/window.py:732
+msgid "_Edit"
+msgstr "_Modifica"
+
+#: src/diffuse/window.py:734
+msgid "_Undo"
+msgstr "Ann_ulla"
+
+#: src/diffuse/window.py:735
+msgid "_Redo"
+msgstr "_Ripeti"
+
+#: src/diffuse/window.py:737
+msgid "Cu_t"
+msgstr "_Taglia"
+
+#: src/diffuse/window.py:738
+msgid "_Copy"
+msgstr "_Copia"
+
+#: src/diffuse/window.py:739
+msgid "_Paste"
+msgstr "_Incolla"
+
+#: src/diffuse/window.py:741
+msgid "Select _All"
+msgstr "Selezion_a tutto"
+
+#: src/diffuse/window.py:742
+msgid "C_lear Edits"
+msgstr "Annulla _modifiche"
+
+#: src/diffuse/window.py:743
+msgid "_Dismiss All Edits"
+msgstr "Scarta tutte le mo_difiche"
+
+#: src/diffuse/window.py:745
+msgid "_Find..."
+msgstr "Tr_ova..."
+
+#: src/diffuse/window.py:746
+msgid "Find _Next"
+msgstr "Trova _successivo"
+
+#: src/diffuse/window.py:747
+msgid "Find Pre_vious"
+msgstr "Trova _precedente"
+
+#: src/diffuse/window.py:748
+msgid "_Go To Line..."
+msgstr "_Vai alla riga..."
+
+#: src/diffuse/window.py:750
+msgid "Pr_eferences..."
+msgstr "Pr_eferenze..."
+
+#: src/diffuse/window.py:754
+msgid "None"
+msgstr "Nessuna"
+
+#: src/diffuse/window.py:776
+msgid "_View"
+msgstr "_Visualizza"
+
+#: src/diffuse/window.py:778
+msgid "_Syntax Highlighting"
+msgstr "Si_ntassi"
+
+#: src/diffuse/window.py:780
+msgid "Re_align All"
+msgstr "Ria_llinea tutti"
+
+#: src/diffuse/window.py:781
+msgid "_Isolate"
+msgstr "_Isola"
+
+#: src/diffuse/window.py:783
+msgid "_First Difference"
+msgstr "_Prima differenza"
+
+#: src/diffuse/window.py:784
+msgid "_Previous Difference"
+msgstr "Differenza p_recedente"
+
+#: src/diffuse/window.py:785
+msgid "_Next Difference"
+msgstr "Differenza s_uccessiva"
+
+#: src/diffuse/window.py:786
+msgid "_Last Difference"
+msgstr "Ulti_ma differenza"
+
+#: src/diffuse/window.py:788
+msgid "Fir_st Tab"
+msgstr "Prim_a scheda"
+
+#: src/diffuse/window.py:789
+msgid "Pre_vious Tab"
+msgstr "Scheda pr_ecedente"
+
+#: src/diffuse/window.py:790
+msgid "Next _Tab"
+msgstr "Scheda su_ccessiva"
+
+#: src/diffuse/window.py:791
+msgid "Las_t Tab"
+msgstr "Ul_tima scheda"
+
+#: src/diffuse/window.py:793
+msgid "Shift Pane _Right"
+msgstr "Sposta riquadro a _destra"
+
+#: src/diffuse/window.py:794
+msgid "Shift Pane _Left"
+msgstr "Sposta riquadro a _sinistra"
+
+#: src/diffuse/window.py:798
+msgid "F_ormat"
+msgstr "F_ormato"
+
+#: src/diffuse/window.py:800
+msgid "Convert To _Upper Case"
+msgstr "Converti in M_AIUSCOLO"
+
+#: src/diffuse/window.py:801
+msgid "Convert To _Lower Case"
+msgstr "Converti in m_inuscolo"
+
+#: src/diffuse/window.py:803
+msgid "Sort Lines In _Ascending Order"
+msgstr "Disponi le righe in ordine a_scendente"
+
+#: src/diffuse/window.py:804
+msgid "Sort Lines In D_escending Order"
+msgstr "Disponi le righe in ordine _discendente"
+
+#: src/diffuse/window.py:806
+msgid "Remove Trailing _White Space"
+msgstr "Rimuovi gli spazi _vuoti alla fine della riga"
+
+#: src/diffuse/window.py:807
+msgid "Convert Tabs To _Spaces"
+msgstr "Converti le _tabulazioni in spazi"
+
+#: src/diffuse/window.py:808
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "Converti gli spa_zi iniziali in tabulazioni"
+
+#: src/diffuse/window.py:810
+msgid "_Increase Indenting"
+msgstr "Au_menta indentazione"
+
+#: src/diffuse/window.py:811
+msgid "De_crease Indenting"
+msgstr "Dimi_nuisci indentazione"
+
+#: src/diffuse/window.py:813
+msgid "Convert To _DOS Format"
+msgstr "Converti nel formato D_OS"
+
+#: src/diffuse/window.py:814
+msgid "Convert To _Mac Format"
+msgstr "Converti nel formato MA_C"
+
+#: src/diffuse/window.py:815
+msgid "Convert To Uni_x Format"
+msgstr "Converti nel formato Uni_x"
+
+#: src/diffuse/window.py:819
+msgid "_Merge"
+msgstr "_Unione"
+
+#: src/diffuse/window.py:821
+msgid "Copy Selection _Right"
+msgstr "Copia selezione a _destra"
+
+#: src/diffuse/window.py:822
+msgid "Copy Selection _Left"
+msgstr "Copia selezione a _sinistra"
+
+#: src/diffuse/window.py:824
+msgid "Copy Left _Into Selection"
+msgstr "Copia s_inistra nella selezione"
+
+#: src/diffuse/window.py:825
+msgid "Copy Right I_nto Selection"
+msgstr "Copia d_estra nella selezione"
+
+#: src/diffuse/window.py:826
+msgid "_Merge From Left Then Right"
+msgstr "_Unisci sinistra poi destra"
+
+#: src/diffuse/window.py:827
+msgid "M_erge From Right Then Left"
+msgstr "U_nisci destra poi sinistra"
+
+#: src/diffuse/window.py:831
+msgid "_Help"
+msgstr "A_iuto"
+
+#: src/diffuse/window.py:833
+msgid "_Help Contents..."
+msgstr "_Sommario..."
+
+#: src/diffuse/window.py:835
+#, python-format
+msgid "_About %s..."
+msgstr "I_nformazioni su %s..."
+
+#: src/diffuse/window.py:847
+msgid "New 2-Way File Merge"
+msgstr "Nuova unione a 2 file"
+
+#: src/diffuse/window.py:848
+msgid "New 3-Way File Merge"
+msgstr "Nuova unione a 3 file"
+
+#: src/diffuse/window.py:850
+msgid "Realign All"
+msgstr "Riallinea tutti"
+
+#: src/diffuse/window.py:851
+msgid "First Difference"
+msgstr "Prima differenza"
+
+#: src/diffuse/window.py:852
+msgid "Previous Difference"
+msgstr "Differenza precedente"
+
+#: src/diffuse/window.py:853
+msgid "Next Difference"
+msgstr "Differenza successiva"
+
+#: src/diffuse/window.py:854
+msgid "Last Difference"
+msgstr "Ultima differenza"
+
+#: src/diffuse/window.py:856
+msgid "Copy Selection Right"
+msgstr "Copia la selezione a destra"
+
+#: src/diffuse/window.py:857
+msgid "Copy Selection Left"
+msgstr "Copia la selezione a sinistra"
+
+#: src/diffuse/window.py:858
+msgid "Copy Left Into Selection"
+msgstr "Copia sinistra nella selezione"
+
+#: src/diffuse/window.py:859
+msgid "Copy Right Into Selection"
+msgstr "Copia destra nella selezione"
+
+#: src/diffuse/window.py:860
+msgid "Merge From Left Then Right"
+msgstr "Unisce prima da sinistra poi da destra"
+
+#: src/diffuse/window.py:861
+msgid "Merge From Right Then Left"
+msgstr "Unisce prima da destra poi da sinistra"
+
+#: src/diffuse/window.py:863
+msgid "Undo"
+msgstr "Annulla"
+
+#: src/diffuse/window.py:864
+msgid "Redo"
+msgstr "Ripeti"
+
+#: src/diffuse/window.py:950
+msgid "Changes detected"
+msgstr ""
+
+#: src/diffuse/window.py:954
+#, fuzzy, python-format
+msgid ""
+"The file \"%s\" changed on disk.\n"
+"\n"
+"Do you want to reload the file?"
+msgstr "Il file «%s» è cambiato sul disco. Ricaricarlo?"
+
+#: src/diffuse/window.py:959
+#, fuzzy, python-format
+msgid ""
+"The following files changed on disk:\n"
+"%s\n"
+"\n"
+"Do you want to reload these files?"
+msgstr "Il file «%s» è cambiato sul disco. Ricaricarlo?"
+
+#: src/diffuse/window.py:1078
+msgid "Some files have unsaved changes. Select the files to save before closing."
+msgstr ""
+"Alcune modifiche ai file non sono ancora state salvate. Selezionare i file da "
+"salvare prima di uscire."
+
+#: src/diffuse/window.py:1092
+msgid "Tab"
+msgstr "Scheda"
+
+#: src/diffuse/window.py:1097
+msgid "Pane"
+msgstr "Riquadro"
+
+#: src/diffuse/window.py:1108
+msgid "Close _Without Saving"
+msgstr "_Chiudi senza salvare"
+
+#: src/diffuse/window.py:1147
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "Chiudendo questa scheda %s verrà chiuso."
+
+#: src/diffuse/window.py:1224
+#, python-format
+msgid "File Merge %d"
+msgstr "Unione file # %d"
+
+#: src/diffuse/window.py:1344
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "Errore nel recupero dei commit per %s."
+
+#: src/diffuse/window.py:1376
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "Errore nel recupero delle modifiche per %s."
+
+#: src/diffuse/window.py:1409
+msgid "Open File In New Tab"
+msgstr "Apre ilo file in una nuova scheda"
+
+#: src/diffuse/window.py:1432
+msgid "Choose Folder With Modified Files"
+msgstr "Selezionare la cartella con i file modificati"
+
+#: src/diffuse/window.py:1450
+msgid "No modified files found."
+msgstr "Non sono stati trovati file modificati."
+
+#: src/diffuse/window.py:1456
+msgid "Choose Folder With Commit"
+msgstr "Selezionare la cartella con i commit"
+
+#: src/diffuse/window.py:1476
+msgid "No committed files found."
+msgstr "Non sono stati trovati file di cui è stato eseguito il commit."
+
+#: src/diffuse/window.py:1512
+msgid "New N-Way File Merge..."
+msgstr "Nuova unione a N file..."
+
+#: src/diffuse/window.py:1513
+msgid "Number of panes: "
+msgstr "Numero di riquadri: "
+
+#: src/diffuse/window.py:1587
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "Frase non trovata. Continuare dalla fine del file?"
+
+#: src/diffuse/window.py:1589
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "Frase non trovata. Continuare dall'inizio del file?"
+
+#: src/diffuse/window.py:1762
+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/window.py:1766
+msgid "translator-credits"
+msgstr "Cristian Marchi <cri.penta@gmail.com>,  2011."
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage:\n"
+#~ "    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"
+#~ "also retrieve revisions of files from several VCSs for comparison and "
+#~ "merging.\n"
+#~ "\n"
+#~ "Help Options:\n"
+#~ "  ( -h | -? | --help )             Display this usage information\n"
+#~ "  ( -v | --version )               Display version and copyright information\n"
+#~ "\n"
+#~ "Configuration Options:\n"
+#~ "  --no-rcfile                      Do not read any resource files\n"
+#~ "  --rcfile <file>                  Specify explicit resource file\n"
+#~ "\n"
+#~ "General Options:\n"
+#~ "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
+#~ "  ( -D | --close-if-same )         Close all tabs with no differences\n"
+#~ "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+#~ "  ( -L | --label ) <label>         Display <label> instead of the file name\n"
+#~ "  ( -m | --modified )              Create a new tab for each modified file\n"
+#~ "  ( -r | --revision ) <rev>        File revision <rev>\n"
+#~ "  ( -s | --separate )              Create a new tab for each file\n"
+#~ "  ( -t | --tab )                   Start a new tab\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    Start with line <line> selected\n"
+#~ "  --null-file                      Create a blank file comparison pane\n"
+#~ "\n"
+#~ "Display Options:\n"
+#~ "  ( -b | --ignore-space-change )   Ignore changes to white space\n"
+#~ "  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
+#~ "  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
+#~ "  ( -i | --ignore-case )           Ignore case differences\n"
+#~ "  ( -w | --ignore-all-space )      Ignore white space differences"
+#~ msgstr ""
+#~ "Utilizzo:\n"
+#~ "    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"
+#~ "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"
+#~ "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"
+#~ "Opzioni di aiuto:\n"
+#~ "  ( -h | -? | --help )             Mostra le informazioni di utilizzo\n"
+#~ "  ( -v | --version )               Mostra la versione e il copyright\n"
+#~ "\n"
+#~ "Opzioni di configurazione:\n"
+#~ "  --no-rcfile                      Non leggere alcun file risorsa\n"
+#~ "  --rcfile <file>                  Specifica un file di risorsa\n"
+#~ "\n"
+#~ "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 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"
+#~ "  ( -s | --separate )              Crea una nuova scheda per ogni file\n"
+#~ "  ( -t | --tab )                   Apre una nuova scheda\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <linea>                   Inizia con la <linea> selezionata\n"
+#~ "  --null-file                      Crea un riquadro di comparazione vuoto\n"
+#~ "\n"
+#~ "Opzioni di visualizzazione:\n"
+#~ "  ( -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"
+#~ "  ( -w | --ignore-all-space )      Ignora le differenze tra spazi vuoti"
diff --git a/po/ja.po b/po/ja.po
index e217e01..a10a520 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse-svn r316\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-23 20:00-0400\n"
+"POT-Creation-Date: 2023-04-16 14:09-0400\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator: Derrick Moser <derrick_moser@yahoo.com>\n"
 "Language-Team: Japanese\n"
@@ -30,825 +30,305 @@ 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."
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, and "
+"Subversion repositories."
 msgstr ""
 
-#: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
-msgid "Main window: diff between two files"
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:28
+msgid "Main window"
 msgstr ""
 
-#: src/diffuse/constants.py:25
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:32
+msgid "About window"
+msgstr ""
+
+#: src/diffuse/constants.py:26
 msgid "Copyright"
 msgstr ""
 
-#: src/diffuse/dialogs.py:40
-msgid "Diffuse is a graphical tool for merging and comparing text files."
+#: src/diffuse/dialogs.py:46 src/diffuse/dialogs.py:89 src/diffuse/dialogs.py:133
+#: src/diffuse/preferences.py:254 src/diffuse/preferences.py:483
+#: src/diffuse/window.py:309 src/diffuse/window.py:1107
+msgid "_Cancel"
 msgstr ""
-"Diffuse は、テキストファイルをマージして比較するためのグラフィックツールです。"
 
-#: src/diffuse/dialogs.py:45
-msgid "translator-credits"
-msgstr "Derrick Moser <derrick_moser@yahoo.com>"
-
-#: src/diffuse/dialogs.py:82
+#: src/diffuse/dialogs.py:50
 msgid "Encoding: "
 msgstr "エンコーディング: "
 
-#: src/diffuse/dialogs.py:94
+#: src/diffuse/dialogs.py:62
 msgid "Revision: "
 msgstr "リビジョン: "
 
-#: src/diffuse/dialogs.py:156
+#: src/diffuse/dialogs.py:90 src/diffuse/dialogs.py:134
+#: src/diffuse/preferences.py:255
+msgid "_OK"
+msgstr ""
+
+#: src/diffuse/dialogs.py:130
 msgid "Find..."
 msgstr "検索..."
 
-#: src/diffuse/dialogs.py:164
+#: src/diffuse/dialogs.py:140
 msgid "Search For: "
 msgstr "検索する文字列: "
 
-#: src/diffuse/dialogs.py:189
+#: src/diffuse/dialogs.py:165
 msgid "Match Case"
 msgstr "大文字/小文字を区別"
 
-#: src/diffuse/dialogs.py:194
+#: src/diffuse/dialogs.py:170
 msgid "Search Backwards"
 msgstr "先頭に向かって検索"
 
+#: src/diffuse/main.py:53
+msgid "Display version and copyright information"
+msgstr "バージョンと著作権情報を表示"
+
+#: src/diffuse/main.py:61
+msgid "Do not read any resource files"
+msgstr "リソースファイルを読まない"
+
+#: src/diffuse/main.py:69
+msgid "Specify explicit resource file"
+msgstr "指定されたリソースファイルを読む"
+
+#: src/diffuse/main.py:77
+msgid "File revisions <rev-1> and <rev>"
+msgstr "<rev-1> と <rev> というファイルリビジョン"
+
 #: src/diffuse/main.py:85
-msgid "Close Tab"
-msgstr "タブを閉じる"
+msgid "Close all tabs with no differences"
+msgstr "差分がないタブを閉じる"
 
-#: src/diffuse/main.py:132
-msgid "Open File..."
-msgstr "ファイルを開く..."
+#: src/diffuse/main.py:92
+msgid "Use <codec> to read and write files"
+msgstr "<codec> でファイルを読み書き"
 
-#: src/diffuse/main.py:133
-msgid "Reload File"
-msgstr "ファイルを再読込み"
+#: src/diffuse/main.py:100
+msgid "Display <label> instead of the file name"
+msgstr "ファイル名の代わりに <label> を表示"
 
-#: src/diffuse/main.py:134
-msgid "Save File"
-msgstr "ファイルを保存"
+#: src/diffuse/main.py:108
+msgid "Create a new tab for each modified file"
+msgstr "変更になったファイルのために新しいタブを作る"
 
-#: src/diffuse/main.py:135
-msgid "Save File As..."
-msgstr "ファイルとして保存..."
+#: src/diffuse/main.py:115
+msgid "File revision <rev>"
+msgstr "<rev> というファイルリビジョン"
 
-#: src/diffuse/main.py:217
-#, python-format
-msgid "Column %d"
-msgstr "%d列"
+#: src/diffuse/main.py:123
+msgid "Create a new tab for each file"
+msgstr "各ファイルのために新しいタブを作る"
 
-#: src/diffuse/main.py:291
-msgid "Save changes before loading the new file?"
-msgstr "新しいファイルをロードする前に、変更したデータを保存しますか？"
+#: src/diffuse/main.py:130
+msgid "Start a new tab"
+msgstr "新しいタブを始める"
 
-#: src/diffuse/main.py:402
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "%(file)s の %(rev)s というリビジョンを読み込む際にエラーが生じました。"
+#: src/diffuse/main.py:137 src/diffuse/preferences.py:159
+msgid "Version control system search order"
+msgstr ""
 
-#: src/diffuse/main.py:405 src/diffuse/main.py:1860
+#: src/diffuse/main.py:145
+msgid "Start with line <line> selected"
+msgstr "初めに <line> 行を選択してから"
+
+#: src/diffuse/main.py:153
+msgid "Create a blank file comparison pane"
+msgstr "空白のファイル比較枠を作る"
+
+#: src/diffuse/main.py:160 src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:95
+msgid "Ignore changes to white space"
+msgstr "空白の変更を無視"
+
+#: src/diffuse/main.py:167
+msgid "Ignore changes in blank lines"
+msgstr "空白行の違いを無視"
+
+#: src/diffuse/main.py:174 src/diffuse/preferences.py:88
+msgid "Ignore end of line differences"
+msgstr "行の最後の違いを無視"
+
+#: src/diffuse/main.py:181 src/diffuse/preferences.py:84
+msgid "Ignore case differences"
+msgstr "大文字小文字の違いを無視"
+
+#: src/diffuse/main.py:188 src/diffuse/preferences.py:85
+msgid "Ignore white space differences"
+msgstr "空白の違いを無視"
+
+#: src/diffuse/main.py:191
+msgid ""
+"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 several VCSs for comparison and merging."
+msgstr ""
+
+#: src/diffuse/main.py:247 src/diffuse/window.py:420
 #, python-format
 msgid "Error reading %s."
 msgstr "%s を読み込む際にエラーが生じました。"
 
-#: src/diffuse/main.py:427
-msgid "Open File"
-msgstr "ファイルを開く"
-
-#: src/diffuse/main.py:484
-#, python-format
-msgid "The file %s changed on disk. Do you want to reload the file?"
-msgstr "ファイル %s が変更されたようです。そのファイルを再読み込みしますか？"
-
-#: src/diffuse/main.py:510
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "%(title)s の%(pane)d番目の枠を保存"
-
-#: src/diffuse/main.py:542
-#, python-format
-msgid "A file named %s already exists. Do you want to overwrite it?"
-msgstr "%s というファイルは既に存在しています。それを上書きしますか？"
-
-#: src/diffuse/main.py:549
-#, python-format
-msgid ""
-"The file %s has been modified by another process since reading it. If you save, "
-"all the external changes could be lost. Save anyways?"
-msgstr ""
-"ファイル %s は、変更されています。保存する場合は、これらの変更が失われることがあり"
-"ます。保存しますか?"
-
-#: src/diffuse/main.py:591
-#, python-format
-msgid "Error encoding to %s."
-msgstr "%s に変える際にエラーが生じました。"
-
-#: src/diffuse/main.py:595 src/diffuse/preferences.py:300
-#, python-format
-msgid "Error writing %s."
-msgstr "%s へ書き込む際にエラーが生じました。"
-
-#: src/diffuse/main.py:625
-msgid "Go To Line..."
-msgstr "指定行へジャンプ..."
-
-#: src/diffuse/main.py:626
-msgid "Line Number: "
-msgstr "行番号: "
-
-#: src/diffuse/main.py:657
-msgid ""
-"Press the enter key or double click to edit. Press the space bar or use the RMB "
-"menu to manually align."
-msgstr ""
-"編集するためにエンターキーを押すか、ダブルクリックします。手動で整列させるためにス"
-"ペースバーを押すか、RMBを使います。"
-
-#: src/diffuse/main.py:661
-msgid "Press the escape key to finish editing."
-msgstr "ESCキーを押して、編集を終了します。"
-
-#: src/diffuse/main.py:664
-msgid ""
-"Select target line and press the space bar to align. Press the escape key to "
-"cancel."
-msgstr ""
-"目標行を選択してスペースバーを押すと整列します。取り消す場合は、ESCキーを押しま"
-"す。"
-
-#: src/diffuse/main.py:787
-msgid "_File"
-msgstr "ファイル(_F)"
-
-#: src/diffuse/main.py:788
-msgid "_Open File..."
-msgstr "ファイルを開く...(_O)"
-
-#: src/diffuse/main.py:789
-msgid "Open File In New _Tab..."
-msgstr "新しいタブにファイルを開く...(_T)"
-
-#: src/diffuse/main.py:790
-msgid "Open _Modified Files..."
-msgstr "変更のあるファイルを開く...(_M)"
-
-#: src/diffuse/main.py:791
-msgid "Open Commi_t..."
-msgstr "コミットを開く...(_T)"
-
-#: src/diffuse/main.py:792
-msgid "_Reload File"
-msgstr "ファイルの再読込み(_R)"
-
-#: src/diffuse/main.py:794
-msgid "_Save File"
-msgstr "ファイルを保存(_S)"
-
-#: src/diffuse/main.py:795
-msgid "Save File _As..."
-msgstr "ファイルとして保存...(_A)"
-
-#: src/diffuse/main.py:796
-msgid "Save A_ll"
-msgstr "全て保存(_L)"
-
-#: src/diffuse/main.py:798
-msgid "New _2-Way File Merge"
-msgstr "新しい２つのファイルの比較(_2)"
-
-#: src/diffuse/main.py:799
-msgid "New _3-Way File Merge"
-msgstr "新しい３つのファイルの比較(_3)"
-
-#: src/diffuse/main.py:800
-msgid "New _N-Way File Merge..."
-msgstr "新しい複数のファイルの比較...(_N)"
-
-#: src/diffuse/main.py:802
-msgid "_Close Tab"
-msgstr "タブを閉じる(_C)"
-
-#: src/diffuse/main.py:803
-msgid "_Undo Close Tab"
-msgstr "閉じたタブを元に戻す(_U)"
-
-#: src/diffuse/main.py:804
-msgid "_Quit"
-msgstr "終了(_Q)"
-
-#: src/diffuse/main.py:807
-msgid "_Edit"
-msgstr "編集(_E)"
-
-#: src/diffuse/main.py:808
-msgid "_Undo"
-msgstr "元に戻す(_U)"
-
-#: src/diffuse/main.py:809
-msgid "_Redo"
-msgstr "やり直す(_R)"
-
-#: src/diffuse/main.py:811
-msgid "Cu_t"
-msgstr "切り取り(_T)"
-
-#: src/diffuse/main.py:812
-msgid "_Copy"
-msgstr "コピー(_C)"
-
-#: src/diffuse/main.py:813
-msgid "_Paste"
-msgstr "貼り付け(_P)"
-
-#: src/diffuse/main.py:815
-msgid "Select _All"
-msgstr "全て選択(_A)"
-
-#: src/diffuse/main.py:816
-msgid "C_lear Edits"
-msgstr "編集をクリア(_L)"
-
-#: src/diffuse/main.py:817
-msgid "_Dismiss All Edits"
-msgstr "全ての編集を破棄(_D)"
-
-#: src/diffuse/main.py:819
-msgid "_Find..."
-msgstr "検索...(_F)"
-
-#: src/diffuse/main.py:820
-msgid "Find _Next"
-msgstr "次の検索(_N)"
-
-#: src/diffuse/main.py:821
-msgid "Find Pre_vious"
-msgstr "前の検索(_V)"
-
-#: src/diffuse/main.py:822
-msgid "_Go To Line..."
-msgstr "指定行へジャンプ...(_G)"
-
-#: src/diffuse/main.py:824
-msgid "Pr_eferences..."
-msgstr "設定...(_E)"
-
-#: src/diffuse/main.py:828
-msgid "None"
-msgstr "なし"
-
-#: src/diffuse/main.py:846
-msgid "_View"
-msgstr "表示(_V)"
-
-#: src/diffuse/main.py:847
-msgid "_Syntax Highlighting"
-msgstr "構文の強調表示(_S)"
-
-#: src/diffuse/main.py:849
-msgid "Re_align All"
-msgstr "全て再整列(_A)"
-
-#: src/diffuse/main.py:850
-msgid "_Isolate"
-msgstr "分離(_I)"
-
-#: src/diffuse/main.py:852
-msgid "_First Difference"
-msgstr "最初の差分(_F)"
-
-#: src/diffuse/main.py:853
-msgid "_Previous Difference"
-msgstr "前の差分(_P)"
-
-#: src/diffuse/main.py:854
-msgid "_Next Difference"
-msgstr "次の差分(_N)"
-
-#: src/diffuse/main.py:855
-msgid "_Last Difference"
-msgstr "最後の差分(_L)"
-
-#: src/diffuse/main.py:857
-msgid "Fir_st Tab"
-msgstr "最初のタブ(_S)"
-
-#: src/diffuse/main.py:858
-msgid "Pre_vious Tab"
-msgstr "前のタブ(_V)"
-
-#: src/diffuse/main.py:859
-msgid "Next _Tab"
-msgstr "次のタブ(_T)"
-
-#: src/diffuse/main.py:860
-msgid "Las_t Tab"
-msgstr "最後のタブ(_T)"
-
-#: src/diffuse/main.py:862
-msgid "Shift Pane _Right"
-msgstr "枠を右に動かす(_R)"
-
-#: src/diffuse/main.py:863
-msgid "Shift Pane _Left"
-msgstr "枠を左に動かす(_L)"
-
-#: src/diffuse/main.py:866
-msgid "F_ormat"
-msgstr "フォーマット(_O)"
-
-#: src/diffuse/main.py:867
-msgid "Convert To _Upper Case"
-msgstr "大文字に変換(_U)"
-
-#: src/diffuse/main.py:868
-msgid "Convert To _Lower Case"
-msgstr "小文字に変換(_L)"
-
-#: src/diffuse/main.py:870
-msgid "Sort Lines In _Ascending Order"
-msgstr "行を昇順に並べる(_A)"
-
-#: src/diffuse/main.py:871
-msgid "Sort Lines In D_escending Order"
-msgstr "行を降順に並べる(_E)"
-
-#: src/diffuse/main.py:873
-msgid "Remove Trailing _White Space"
-msgstr "末尾の空白を削除(_W)"
-
-#: src/diffuse/main.py:874
-msgid "Convert Tabs To _Spaces"
-msgstr "タブをスペースに変換(_S)"
-
-#: src/diffuse/main.py:875
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "先頭のスペースをタブに変換(_T)"
-
-#: src/diffuse/main.py:877
-msgid "_Increase Indenting"
-msgstr "インデントを増やす(_I)"
-
-#: src/diffuse/main.py:878
-msgid "De_crease Indenting"
-msgstr "インデントを減らす(_C)"
-
-#: src/diffuse/main.py:880
-msgid "Convert To _DOS Format"
-msgstr "DOS 形式に変換(_D)"
-
-#: src/diffuse/main.py:881
-msgid "Convert To _Mac Format"
-msgstr "Mac 形式に変換(_M)"
-
-#: src/diffuse/main.py:882
-msgid "Convert To Uni_x Format"
-msgstr "Unix 形式に変換(_X)"
-
-#: src/diffuse/main.py:885
-msgid "_Merge"
-msgstr "マージ(_M)"
-
-#: src/diffuse/main.py:886
-msgid "Copy Selection _Right"
-msgstr "選択を右にコピー(_R)"
-
-#: src/diffuse/main.py:887
-msgid "Copy Selection _Left"
-msgstr "選択を左にコピー(_L)"
-
-#: src/diffuse/main.py:889
-msgid "Copy Left _Into Selection"
-msgstr "左から選択枠にコピー(_I)"
-
-#: src/diffuse/main.py:890
-msgid "Copy Right I_nto Selection"
-msgstr "右から選択枠にコピー(_N)"
-
-#: src/diffuse/main.py:891
-msgid "_Merge From Left Then Right"
-msgstr "左からマージした後、右からマージ(_M)"
-
-#: src/diffuse/main.py:892
-msgid "M_erge From Right Then Left"
-msgstr "右からマージした後、左からマージ(_E)"
-
-#: src/diffuse/main.py:895
-msgid "_Help"
-msgstr "ヘルプ(_H)"
-
-#: src/diffuse/main.py:896
-msgid "_Help Contents..."
-msgstr "ヘルプの目次...(_H)"
-
-#: src/diffuse/main.py:898
-#, python-format
-msgid "_About %s..."
-msgstr "%s について...(_A)"
-
-#: src/diffuse/main.py:913
-msgid "New 2-Way File Merge"
-msgstr "新しい２つのファイルの比較"
-
-#: src/diffuse/main.py:914
-msgid "New 3-Way File Merge"
-msgstr "新しい３つのファイルの比較"
-
-#: src/diffuse/main.py:916
-msgid "Realign All"
-msgstr "全て再整列"
-
-#: src/diffuse/main.py:917
-msgid "First Difference"
-msgstr "最初の差分"
-
-#: src/diffuse/main.py:918
-msgid "Previous Difference"
-msgstr "前の差分"
-
-#: src/diffuse/main.py:919
-msgid "Next Difference"
-msgstr "次の差分"
-
-#: src/diffuse/main.py:920
-msgid "Last Difference"
-msgstr "最後の差分"
-
-#: src/diffuse/main.py:922
-msgid "Copy Selection Right"
-msgstr "選択を右にコピー"
-
-#: src/diffuse/main.py:923
-msgid "Copy Selection Left"
-msgstr "選択を左にコピー"
-
-#: src/diffuse/main.py:924
-msgid "Copy Left Into Selection"
-msgstr "左から選択枠にコピー"
-
-#: src/diffuse/main.py:925
-msgid "Copy Right Into Selection"
-msgstr "右から選択枠にコピー"
-
-#: src/diffuse/main.py:926
-msgid "Merge From Left Then Right"
-msgstr "左からマージした後、右からマージ"
-
-#: src/diffuse/main.py:927
-msgid "Merge From Right Then Left"
-msgstr "右からマージした後、左からマージ"
-
-#: src/diffuse/main.py:929
-msgid "Undo"
-msgstr "元に戻す"
-
-#: src/diffuse/main.py:930
-msgid "Redo"
-msgstr "やり直す"
-
-#: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
-msgid "Cut"
-msgstr "切り取り"
-
-#: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
-msgid "Copy"
-msgstr "コピー"
-
-#: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
-msgid "Paste"
-msgstr "貼り付け"
-
-#: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
-msgid "Clear Edits"
-msgstr "編集をクリア"
-
-#: src/diffuse/main.py:1057
-msgid "Some files have unsaved changes. Select the files to save before closing."
-msgstr ""
-"変更が保存されていないファイルがあります。終了前に保存するファイルを選択します。"
-
-#: src/diffuse/main.py:1071
-msgid "Tab"
-msgstr "タブ"
-
-#: src/diffuse/main.py:1076
-msgid "Pane"
-msgstr "枠"
-
-#: src/diffuse/main.py:1087
-msgid "Close _Without Saving"
-msgstr "保存せずに閉じる(_W)"
-
-#: src/diffuse/main.py:1126
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "このタブを閉じると、%sは終了します。"
-
-#: src/diffuse/main.py:1209
-#, python-format
-msgid "File Merge %d"
-msgstr "ファイルマージ%d"
-
-#: src/diffuse/main.py:1315
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "%s のコミットの取得中にエラーが生じました。"
-
-#: src/diffuse/main.py:1347
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "%s の変更の取得中にエラーが生じました。"
-
-#: src/diffuse/main.py:1380
-msgid "Open File In New Tab"
-msgstr "新しいタブにファイルを開く"
-
-#: src/diffuse/main.py:1403
-msgid "Choose Folder With Modified Files"
-msgstr "変更なったファイルがあるフォルダを選択"
-
-#: src/diffuse/main.py:1421
-msgid "No modified files found."
-msgstr "変更なったファイルが見つかりませんでした。"
-
-#: src/diffuse/main.py:1427
-msgid "Choose Folder With Commit"
-msgstr "コミットがあるフォルダを選択"
-
-#: src/diffuse/main.py:1447
-msgid "No committed files found."
-msgstr "コミットされたファイルが見つかりませんでした。"
-
-#: src/diffuse/main.py:1483
-msgid "New N-Way File Merge..."
-msgstr "新しい複数のファイルの比較..."
-
-#: src/diffuse/main.py:1484
-msgid "Number of panes: "
-msgstr "枠の数: "
-
-#: src/diffuse/main.py:1558
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "文字列が見つかりませんでした。ファイルの終わりから続けますか。"
-
-#: src/diffuse/main.py:1560
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "文字列が見つかりませんでした。ファイルの始めから続けますか。"
-
-#: src/diffuse/main.py:1781
-#, fuzzy
-msgid ""
-"Usage:\n"
-"    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"
-"also retrieve revisions of files from several VCSs for comparison and merging.\n"
-"\n"
-"Help Options:\n"
-"  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright information\n"
-"\n"
-"Configuration Options:\n"
-"  --no-rcfile                      Do not read any resource files\n"
-"  --rcfile <file>                  Specify explicit resource file\n"
-"\n"
-"General Options:\n"
-"  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
-"  ( -D | --close-if-same )         Close all tabs with no differences\n"
-"  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
-"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
-"  ( -m | --modified )              Create a new tab for each modified file\n"
-"  ( -r | --revision ) <rev>        File revision <rev>\n"
-"  ( -s | --separate )              Create a new tab for each file\n"
-"  ( -t | --tab )                   Start a new tab\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    Start with line <line> selected\n"
-"  --null-file                      Create a blank file comparison pane\n"
-"\n"
-"Display Options:\n"
-"  ( -b | --ignore-space-change )   Ignore changes to white space\n"
-"  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
-"  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
-"  ( -i | --ignore-case )           Ignore case differences\n"
-"  ( -w | --ignore-all-space )      Ignore white space differences"
-msgstr ""
-"使用方法:\n"
-"    diffuse [ [オプション...] [ファイル...] ]...\n"
-"    diffuse ( -h | -? | --help | -v | --version )\n"
-"\n"
-"Diffuse は、テキストファイルをマージして比較するためのグラフィックツールです。\n"
-"任意の数の並行なファイルを比較できます。ユーザは、手動で行を再整列し、\n"
-"ファイルを直接編集できます。また、Diffuse は比較やマージするためにBazaar、CVS、\n"
-"Darcs、Git、Mercurial、Monotone、RCS、Subversion、および SVK リポジトリから\n"
-"ファイルリビジョンを取得できます。\n"
-"\n"
-"ヘルプオプション:\n"
-"  ( -h | -? | --help )             この使用方法の情報を表示\n"
-"  ( -v | --version )               バージョンと著作権情報を表示\n"
-"\n"
-"構成のオプション:\n"
-"  --no-rcfile                      リソースファイルを読まない\n"
-"  --rcfile <file>                  指定されたリソースファイルを読む\n"
-"\n"
-"一般的なオプション:\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"
-"  ( -r | --revision ) <rev>        <rev> というファイルリビジョン\n"
-"  ( -s | --separate )              各ファイルのために新しいタブを作る\n"
-"  ( -t | --tab )                   新しいタブを始める\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    初めに <line> 行を選択してから\n"
-"  --null-file                      空白のファイル比較枠を作る\n"
-"\n"
-"表示オプション:\n"
-"  ( -b | --ignore-space-change )   空白の変更を無視\n"
-"  ( -B | --ignore-blank-lines )    空白行の違いを無視\n"
-"  ( -E | --ignore-end-of-line )    行の最後の違いを無視\n"
-"  ( -i | --ignore-case )           大文字小文字の違いを無視\n"
-"  ( -w | --ignore-all-space )      空白の違いを無視"
-
-#: src/diffuse/main.py:1948
+#: src/diffuse/main.py:327
 msgid "Error parsing line number."
 msgstr "行番号をパースする際にエラーが生じました。"
 
-#: src/diffuse/main.py:1958
-#, python-format
-msgid "Skipping unknown argument \"%s\"."
-msgstr "未知の引数「%s」を飛ばします。"
-
-#: src/diffuse/main.py:1966
+#: src/diffuse/main.py:343
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr ""
 "%s の引数を処理しているときにエラーが生じました。ディレクトリは予測できませんでし"
 "た。"
 
-#: src/diffuse/preferences.py:80
+#: src/diffuse/preferences.py:75
 msgid "Display"
 msgstr "表示"
 
-#: src/diffuse/preferences.py:83
+#: src/diffuse/preferences.py:78
 msgid "Font"
 msgstr "フォント"
 
-#: src/diffuse/preferences.py:84
+#: src/diffuse/preferences.py:79
 msgid "Tab width"
 msgstr "タブの幅"
 
-#: src/diffuse/preferences.py:85
+#: src/diffuse/preferences.py:80
 msgid "Show right margin"
 msgstr "右マージンを表示"
 
-#: src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:81
 msgid "Right margin"
 msgstr "右マージン"
 
-#: src/diffuse/preferences.py:87
+#: src/diffuse/preferences.py:82
 msgid "Show line numbers"
 msgstr "行番号を表示"
 
-#: src/diffuse/preferences.py:88
+#: src/diffuse/preferences.py:83
 msgid "Show white space characters"
 msgstr "空白文字を表示"
 
-#: src/diffuse/preferences.py:89
-msgid "Ignore case differences"
-msgstr "大文字小文字の違いを無視"
-
-#: src/diffuse/preferences.py:90
-msgid "Ignore white space differences"
-msgstr "空白の違いを無視"
-
-#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100
-msgid "Ignore changes to white space"
-msgstr "空白の変更を無視"
-
-#: src/diffuse/preferences.py:92
+#: src/diffuse/preferences.py:87
 msgid "Ignore blank line differences"
 msgstr "空白行の違いを無視"
 
-#: src/diffuse/preferences.py:93
-msgid "Ignore end of line differences"
-msgstr "行の最後の違いを無視"
-
-#: src/diffuse/preferences.py:95
+#: src/diffuse/preferences.py:90
 msgid "Alignment"
 msgstr "整列"
 
-#: src/diffuse/preferences.py:98
+#: src/diffuse/preferences.py:93
 msgid "Ignore case"
 msgstr "大文字小文字を無視"
 
-#: src/diffuse/preferences.py:99
+#: src/diffuse/preferences.py:94
 msgid "Ignore white space"
 msgstr "空白を無視"
 
-#: src/diffuse/preferences.py:101
+#: src/diffuse/preferences.py:96
 msgid "Ignore blank lines"
 msgstr "空白行を無視"
 
-#: src/diffuse/preferences.py:102
+#: src/diffuse/preferences.py:97
 msgid "Ignore end of line characters"
 msgstr "行の最後の文字を無視"
 
-#: src/diffuse/preferences.py:104
+#: src/diffuse/preferences.py:99
 msgid "Editor"
 msgstr "エディタ"
 
-#: src/diffuse/preferences.py:107
+#: src/diffuse/preferences.py:102
 msgid "Auto indent"
 msgstr "自動インデント"
 
-#: src/diffuse/preferences.py:108
+#: src/diffuse/preferences.py:103
 msgid "Expand tabs to spaces"
 msgstr "タブの代わりに空白を挿入"
 
-#: src/diffuse/preferences.py:109
+#: src/diffuse/preferences.py:104
 msgid "Soft tab width"
 msgstr "ソフトタブの幅"
 
-#: src/diffuse/preferences.py:111
+#: src/diffuse/preferences.py:106
 msgid "Tabs"
 msgstr "タブ"
 
-#: src/diffuse/preferences.py:114
+#: src/diffuse/preferences.py:109
 msgid "Default panes"
 msgstr "枠のデフォルトの数"
 
-#: src/diffuse/preferences.py:115
+#: src/diffuse/preferences.py:110
 msgid "Always show the tab bar"
 msgstr "常にタブバーを表示"
 
-#: src/diffuse/preferences.py:116
+#: src/diffuse/preferences.py:111
 #, python-format
 msgid "Warn me when closing a tab will quit %s"
 msgstr "タブを閉じるとき、%s を終了すると警告"
 
-#: src/diffuse/preferences.py:118
+#: src/diffuse/preferences.py:113
 msgid "Regional Settings"
 msgstr "地域設定"
 
-#: src/diffuse/preferences.py:121
+#: src/diffuse/preferences.py:116
 msgid "Default codec"
 msgstr "デフォルトのコーデック"
 
-#: src/diffuse/preferences.py:122
+#: src/diffuse/preferences.py:117
 msgid "Order of codecs used to identify encoding"
 msgstr "エンコーディングを特定するためのコーデックの優先順位"
 
-#: src/diffuse/preferences.py:143
+#: src/diffuse/preferences.py:138
 msgid "Cygwin"
 msgstr "Cygwin"
 
-#: src/diffuse/preferences.py:145
+#: src/diffuse/preferences.py:140
 msgid "Root directory"
 msgstr "ルートディレクトリ"
 
-#: src/diffuse/preferences.py:146
+#: src/diffuse/preferences.py:141
 msgid "Cygdrive prefix"
 msgstr "Cygdrive 接頭辞"
 
-#: src/diffuse/preferences.py:165
-msgid "Version control system search order"
-msgstr ""
-
-#: src/diffuse/preferences.py:173
+#: src/diffuse/preferences.py:167
 msgid "\"co\" command"
 msgstr "co というコマンド"
 
-#: src/diffuse/preferences.py:174
+#: src/diffuse/preferences.py:168
 msgid "\"rlog\" command"
 msgstr "rlog というコマンド"
 
-#: src/diffuse/preferences.py:176
+#: src/diffuse/preferences.py:170
 msgid "Command"
 msgstr "コマンド"
 
-#: src/diffuse/preferences.py:182
+#: src/diffuse/preferences.py:176
 msgid "Launch from a Bash login shell"
 msgstr "Bashログインシェルから始める"
 
-#: src/diffuse/preferences.py:189
+#: src/diffuse/preferences.py:183
 msgid "Update paths for Cygwin"
 msgstr "Cygwin のためにパスを更新"
 
-#: src/diffuse/preferences.py:194
+#: src/diffuse/preferences.py:188
 msgid "Version Control"
 msgstr "バージョンコントロール"
 
-#: src/diffuse/preferences.py:259
+#: src/diffuse/preferences.py:253
 msgid "Preferences"
 msgstr "設定"
 
+#: src/diffuse/preferences.py:294 src/diffuse/window.py:580
+#, python-format
+msgid "Error writing %s."
+msgstr "%s へ書き込む際にエラーが生じました。"
+
+#: src/diffuse/preferences.py:483 src/diffuse/window.py:446
+#: src/diffuse/window.py:1413 src/diffuse/window.py:1436 src/diffuse/window.py:1459
+msgid "_Open"
+msgstr ""
+
 #: src/diffuse/resources.py:242 src/diffuse/resources.py:246
 #: src/diffuse/resources.py:249
 #, python-brace-format
@@ -934,16 +414,11 @@ msgstr "{file} の {line}行 を処理しているときにエラーが生じま
 msgid "Auto Detect"
 msgstr "自動検出"
 
-#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97
+#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:96
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "%s というリビジョンをパースする際にエラーが生じました。"
 
-#: src/diffuse/vcs/vcs_registry.py:238
-#, python-format
-msgid "Error parsing %s."
-msgstr "%s をパースする際にエラーが生じました。"
-
 #: src/diffuse/widgets.py:1857
 msgid "Align with Selection"
 msgstr "選択と整列"
@@ -956,10 +431,642 @@ msgstr "分離"
 msgid "Merge Selection"
 msgstr "選択をマージ"
 
+#: src/diffuse/widgets.py:1861 src/diffuse/window.py:865
+msgid "Cut"
+msgstr "切り取り"
+
+#: src/diffuse/widgets.py:1862 src/diffuse/window.py:866
+msgid "Copy"
+msgstr "コピー"
+
+#: src/diffuse/widgets.py:1863 src/diffuse/window.py:867
+msgid "Paste"
+msgstr "貼り付け"
+
 #: src/diffuse/widgets.py:1865
 msgid "Select All"
 msgstr "全て選択"
 
+#: src/diffuse/widgets.py:1866 src/diffuse/window.py:868
+msgid "Clear Edits"
+msgstr "編集をクリア"
+
 #: src/diffuse/widgets.py:1868
 msgid "Swap with Selected Pane"
 msgstr "選択された枠と交換"
+
+#: src/diffuse/window.py:83
+msgid "Close Tab"
+msgstr "タブを閉じる"
+
+#: src/diffuse/window.py:126
+msgid "Open File..."
+msgstr "ファイルを開く..."
+
+#: src/diffuse/window.py:127
+msgid "Reload File"
+msgstr "ファイルを再読込み"
+
+#: src/diffuse/window.py:128
+msgid "Save File"
+msgstr "ファイルを保存"
+
+#: src/diffuse/window.py:129
+msgid "Save File As..."
+msgstr "ファイルとして保存..."
+
+#: src/diffuse/window.py:228
+#, python-format
+msgid "Column %d"
+msgstr "%d列"
+
+#: src/diffuse/window.py:306
+msgid "Save changes before loading the new file?"
+msgstr "新しいファイルをロードする前に、変更したデータを保存しますか？"
+
+#: src/diffuse/window.py:310
+msgid "_No"
+msgstr ""
+
+#: src/diffuse/window.py:311
+msgid "_Yes"
+msgstr ""
+
+#: src/diffuse/window.py:417
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "%(file)s の %(rev)s というリビジョンを読み込む際にエラーが生じました。"
+
+#: src/diffuse/window.py:442
+msgid "Open File"
+msgstr "ファイルを開く"
+
+#: src/diffuse/window.py:495
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "%(title)s の%(pane)d番目の枠を保存"
+
+#: src/diffuse/window.py:499 src/diffuse/window.py:1111
+#, fuzzy
+msgid "_Save"
+msgstr "ファイルを保存(_S)"
+
+#: src/diffuse/window.py:527
+#, python-format
+msgid "A file named %s already exists. Do you want to overwrite it?"
+msgstr "%s というファイルは既に存在しています。それを上書きしますか？"
+
+#: src/diffuse/window.py:534
+#, python-format
+msgid ""
+"The file %s has been modified by another process since reading it. If you save, "
+"all the external changes could be lost. Save anyways?"
+msgstr ""
+"ファイル %s は、変更されています。保存する場合は、これらの変更が失われることがあり"
+"ます。保存しますか?"
+
+#: src/diffuse/window.py:576
+#, python-format
+msgid "Error encoding to %s."
+msgstr "%s に変える際にエラーが生じました。"
+
+#: src/diffuse/window.py:610
+msgid "Go To Line..."
+msgstr "指定行へジャンプ..."
+
+#: src/diffuse/window.py:611
+msgid "Line Number: "
+msgstr "行番号: "
+
+#: src/diffuse/window.py:642
+msgid ""
+"Press the enter key or double click to edit. Press the space bar or use the RMB "
+"menu to manually align."
+msgstr ""
+"編集するためにエンターキーを押すか、ダブルクリックします。手動で整列させるためにス"
+"ペースバーを押すか、RMBを使います。"
+
+#: src/diffuse/window.py:646
+msgid "Press the escape key to finish editing."
+msgstr "ESCキーを押して、編集を終了します。"
+
+#: src/diffuse/window.py:649
+msgid ""
+"Select target line and press the space bar to align. Press the escape key to "
+"cancel."
+msgstr ""
+"目標行を選択してスペースバーを押すと整列します。取り消す場合は、ESCキーを押しま"
+"す。"
+
+#: src/diffuse/window.py:710
+msgid "_File"
+msgstr "ファイル(_F)"
+
+#: src/diffuse/window.py:712
+msgid "_Open File..."
+msgstr "ファイルを開く...(_O)"
+
+#: src/diffuse/window.py:713
+msgid "Open File In New _Tab..."
+msgstr "新しいタブにファイルを開く...(_T)"
+
+#: src/diffuse/window.py:714
+msgid "Open _Modified Files..."
+msgstr "変更のあるファイルを開く...(_M)"
+
+#: src/diffuse/window.py:715
+msgid "Open Commi_t..."
+msgstr "コミットを開く...(_T)"
+
+#: src/diffuse/window.py:716
+msgid "_Reload File"
+msgstr "ファイルの再読込み(_R)"
+
+#: src/diffuse/window.py:718
+msgid "_Save File"
+msgstr "ファイルを保存(_S)"
+
+#: src/diffuse/window.py:719
+msgid "Save File _As..."
+msgstr "ファイルとして保存...(_A)"
+
+#: src/diffuse/window.py:720
+msgid "Save A_ll"
+msgstr "全て保存(_L)"
+
+#: src/diffuse/window.py:722
+msgid "New _2-Way File Merge"
+msgstr "新しい２つのファイルの比較(_2)"
+
+#: src/diffuse/window.py:723
+msgid "New _3-Way File Merge"
+msgstr "新しい３つのファイルの比較(_3)"
+
+#: src/diffuse/window.py:724
+msgid "New _N-Way File Merge..."
+msgstr "新しい複数のファイルの比較...(_N)"
+
+#: src/diffuse/window.py:726
+msgid "_Close Tab"
+msgstr "タブを閉じる(_C)"
+
+#: src/diffuse/window.py:727
+msgid "_Undo Close Tab"
+msgstr "閉じたタブを元に戻す(_U)"
+
+#: src/diffuse/window.py:728
+msgid "_Quit"
+msgstr "終了(_Q)"
+
+#: src/diffuse/window.py:732
+msgid "_Edit"
+msgstr "編集(_E)"
+
+#: src/diffuse/window.py:734
+msgid "_Undo"
+msgstr "元に戻す(_U)"
+
+#: src/diffuse/window.py:735
+msgid "_Redo"
+msgstr "やり直す(_R)"
+
+#: src/diffuse/window.py:737
+msgid "Cu_t"
+msgstr "切り取り(_T)"
+
+#: src/diffuse/window.py:738
+msgid "_Copy"
+msgstr "コピー(_C)"
+
+#: src/diffuse/window.py:739
+msgid "_Paste"
+msgstr "貼り付け(_P)"
+
+#: src/diffuse/window.py:741
+msgid "Select _All"
+msgstr "全て選択(_A)"
+
+#: src/diffuse/window.py:742
+msgid "C_lear Edits"
+msgstr "編集をクリア(_L)"
+
+#: src/diffuse/window.py:743
+msgid "_Dismiss All Edits"
+msgstr "全ての編集を破棄(_D)"
+
+#: src/diffuse/window.py:745
+msgid "_Find..."
+msgstr "検索...(_F)"
+
+#: src/diffuse/window.py:746
+msgid "Find _Next"
+msgstr "次の検索(_N)"
+
+#: src/diffuse/window.py:747
+msgid "Find Pre_vious"
+msgstr "前の検索(_V)"
+
+#: src/diffuse/window.py:748
+msgid "_Go To Line..."
+msgstr "指定行へジャンプ...(_G)"
+
+#: src/diffuse/window.py:750
+msgid "Pr_eferences..."
+msgstr "設定...(_E)"
+
+#: src/diffuse/window.py:754
+msgid "None"
+msgstr "なし"
+
+#: src/diffuse/window.py:776
+msgid "_View"
+msgstr "表示(_V)"
+
+#: src/diffuse/window.py:778
+msgid "_Syntax Highlighting"
+msgstr "構文の強調表示(_S)"
+
+#: src/diffuse/window.py:780
+msgid "Re_align All"
+msgstr "全て再整列(_A)"
+
+#: src/diffuse/window.py:781
+msgid "_Isolate"
+msgstr "分離(_I)"
+
+#: src/diffuse/window.py:783
+msgid "_First Difference"
+msgstr "最初の差分(_F)"
+
+#: src/diffuse/window.py:784
+msgid "_Previous Difference"
+msgstr "前の差分(_P)"
+
+#: src/diffuse/window.py:785
+msgid "_Next Difference"
+msgstr "次の差分(_N)"
+
+#: src/diffuse/window.py:786
+msgid "_Last Difference"
+msgstr "最後の差分(_L)"
+
+#: src/diffuse/window.py:788
+msgid "Fir_st Tab"
+msgstr "最初のタブ(_S)"
+
+#: src/diffuse/window.py:789
+msgid "Pre_vious Tab"
+msgstr "前のタブ(_V)"
+
+#: src/diffuse/window.py:790
+msgid "Next _Tab"
+msgstr "次のタブ(_T)"
+
+#: src/diffuse/window.py:791
+msgid "Las_t Tab"
+msgstr "最後のタブ(_T)"
+
+#: src/diffuse/window.py:793
+msgid "Shift Pane _Right"
+msgstr "枠を右に動かす(_R)"
+
+#: src/diffuse/window.py:794
+msgid "Shift Pane _Left"
+msgstr "枠を左に動かす(_L)"
+
+#: src/diffuse/window.py:798
+msgid "F_ormat"
+msgstr "フォーマット(_O)"
+
+#: src/diffuse/window.py:800
+msgid "Convert To _Upper Case"
+msgstr "大文字に変換(_U)"
+
+#: src/diffuse/window.py:801
+msgid "Convert To _Lower Case"
+msgstr "小文字に変換(_L)"
+
+#: src/diffuse/window.py:803
+msgid "Sort Lines In _Ascending Order"
+msgstr "行を昇順に並べる(_A)"
+
+#: src/diffuse/window.py:804
+msgid "Sort Lines In D_escending Order"
+msgstr "行を降順に並べる(_E)"
+
+#: src/diffuse/window.py:806
+msgid "Remove Trailing _White Space"
+msgstr "末尾の空白を削除(_W)"
+
+#: src/diffuse/window.py:807
+msgid "Convert Tabs To _Spaces"
+msgstr "タブをスペースに変換(_S)"
+
+#: src/diffuse/window.py:808
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "先頭のスペースをタブに変換(_T)"
+
+#: src/diffuse/window.py:810
+msgid "_Increase Indenting"
+msgstr "インデントを増やす(_I)"
+
+#: src/diffuse/window.py:811
+msgid "De_crease Indenting"
+msgstr "インデントを減らす(_C)"
+
+#: src/diffuse/window.py:813
+msgid "Convert To _DOS Format"
+msgstr "DOS 形式に変換(_D)"
+
+#: src/diffuse/window.py:814
+msgid "Convert To _Mac Format"
+msgstr "Mac 形式に変換(_M)"
+
+#: src/diffuse/window.py:815
+msgid "Convert To Uni_x Format"
+msgstr "Unix 形式に変換(_X)"
+
+#: src/diffuse/window.py:819
+msgid "_Merge"
+msgstr "マージ(_M)"
+
+#: src/diffuse/window.py:821
+msgid "Copy Selection _Right"
+msgstr "選択を右にコピー(_R)"
+
+#: src/diffuse/window.py:822
+msgid "Copy Selection _Left"
+msgstr "選択を左にコピー(_L)"
+
+#: src/diffuse/window.py:824
+msgid "Copy Left _Into Selection"
+msgstr "左から選択枠にコピー(_I)"
+
+#: src/diffuse/window.py:825
+msgid "Copy Right I_nto Selection"
+msgstr "右から選択枠にコピー(_N)"
+
+#: src/diffuse/window.py:826
+msgid "_Merge From Left Then Right"
+msgstr "左からマージした後、右からマージ(_M)"
+
+#: src/diffuse/window.py:827
+msgid "M_erge From Right Then Left"
+msgstr "右からマージした後、左からマージ(_E)"
+
+#: src/diffuse/window.py:831
+msgid "_Help"
+msgstr "ヘルプ(_H)"
+
+#: src/diffuse/window.py:833
+msgid "_Help Contents..."
+msgstr "ヘルプの目次...(_H)"
+
+#: src/diffuse/window.py:835
+#, python-format
+msgid "_About %s..."
+msgstr "%s について...(_A)"
+
+#: src/diffuse/window.py:847
+msgid "New 2-Way File Merge"
+msgstr "新しい２つのファイルの比較"
+
+#: src/diffuse/window.py:848
+msgid "New 3-Way File Merge"
+msgstr "新しい３つのファイルの比較"
+
+#: src/diffuse/window.py:850
+msgid "Realign All"
+msgstr "全て再整列"
+
+#: src/diffuse/window.py:851
+msgid "First Difference"
+msgstr "最初の差分"
+
+#: src/diffuse/window.py:852
+msgid "Previous Difference"
+msgstr "前の差分"
+
+#: src/diffuse/window.py:853
+msgid "Next Difference"
+msgstr "次の差分"
+
+#: src/diffuse/window.py:854
+msgid "Last Difference"
+msgstr "最後の差分"
+
+#: src/diffuse/window.py:856
+msgid "Copy Selection Right"
+msgstr "選択を右にコピー"
+
+#: src/diffuse/window.py:857
+msgid "Copy Selection Left"
+msgstr "選択を左にコピー"
+
+#: src/diffuse/window.py:858
+msgid "Copy Left Into Selection"
+msgstr "左から選択枠にコピー"
+
+#: src/diffuse/window.py:859
+msgid "Copy Right Into Selection"
+msgstr "右から選択枠にコピー"
+
+#: src/diffuse/window.py:860
+msgid "Merge From Left Then Right"
+msgstr "左からマージした後、右からマージ"
+
+#: src/diffuse/window.py:861
+msgid "Merge From Right Then Left"
+msgstr "右からマージした後、左からマージ"
+
+#: src/diffuse/window.py:863
+msgid "Undo"
+msgstr "元に戻す"
+
+#: src/diffuse/window.py:864
+msgid "Redo"
+msgstr "やり直す"
+
+#: src/diffuse/window.py:950
+msgid "Changes detected"
+msgstr ""
+
+#: src/diffuse/window.py:954
+#, fuzzy, python-format
+msgid ""
+"The file \"%s\" changed on disk.\n"
+"\n"
+"Do you want to reload the file?"
+msgstr "ファイル %s が変更されたようです。そのファイルを再読み込みしますか？"
+
+#: src/diffuse/window.py:959
+#, fuzzy, python-format
+msgid ""
+"The following files changed on disk:\n"
+"%s\n"
+"\n"
+"Do you want to reload these files?"
+msgstr "ファイル %s が変更されたようです。そのファイルを再読み込みしますか？"
+
+#: src/diffuse/window.py:1078
+msgid "Some files have unsaved changes. Select the files to save before closing."
+msgstr ""
+"変更が保存されていないファイルがあります。終了前に保存するファイルを選択します。"
+
+#: src/diffuse/window.py:1092
+msgid "Tab"
+msgstr "タブ"
+
+#: src/diffuse/window.py:1097
+msgid "Pane"
+msgstr "枠"
+
+#: src/diffuse/window.py:1108
+msgid "Close _Without Saving"
+msgstr "保存せずに閉じる(_W)"
+
+#: src/diffuse/window.py:1147
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "このタブを閉じると、%sは終了します。"
+
+#: src/diffuse/window.py:1224
+#, python-format
+msgid "File Merge %d"
+msgstr "ファイルマージ%d"
+
+#: src/diffuse/window.py:1344
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "%s のコミットの取得中にエラーが生じました。"
+
+#: src/diffuse/window.py:1376
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "%s の変更の取得中にエラーが生じました。"
+
+#: src/diffuse/window.py:1409
+msgid "Open File In New Tab"
+msgstr "新しいタブにファイルを開く"
+
+#: src/diffuse/window.py:1432
+msgid "Choose Folder With Modified Files"
+msgstr "変更なったファイルがあるフォルダを選択"
+
+#: src/diffuse/window.py:1450
+msgid "No modified files found."
+msgstr "変更なったファイルが見つかりませんでした。"
+
+#: src/diffuse/window.py:1456
+msgid "Choose Folder With Commit"
+msgstr "コミットがあるフォルダを選択"
+
+#: src/diffuse/window.py:1476
+msgid "No committed files found."
+msgstr "コミットされたファイルが見つかりませんでした。"
+
+#: src/diffuse/window.py:1512
+msgid "New N-Way File Merge..."
+msgstr "新しい複数のファイルの比較..."
+
+#: src/diffuse/window.py:1513
+msgid "Number of panes: "
+msgstr "枠の数: "
+
+#: src/diffuse/window.py:1587
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "文字列が見つかりませんでした。ファイルの終わりから続けますか。"
+
+#: src/diffuse/window.py:1589
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "文字列が見つかりませんでした。ファイルの始めから続けますか。"
+
+#: src/diffuse/window.py:1762
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr ""
+"Diffuse は、テキストファイルをマージして比較するためのグラフィックツールです。"
+
+#: src/diffuse/window.py:1766
+msgid "translator-credits"
+msgstr "Derrick Moser <derrick_moser@yahoo.com>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage:\n"
+#~ "    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"
+#~ "also retrieve revisions of files from several VCSs for comparison and "
+#~ "merging.\n"
+#~ "\n"
+#~ "Help Options:\n"
+#~ "  ( -h | -? | --help )             Display this usage information\n"
+#~ "  ( -v | --version )               Display version and copyright information\n"
+#~ "\n"
+#~ "Configuration Options:\n"
+#~ "  --no-rcfile                      Do not read any resource files\n"
+#~ "  --rcfile <file>                  Specify explicit resource file\n"
+#~ "\n"
+#~ "General Options:\n"
+#~ "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
+#~ "  ( -D | --close-if-same )         Close all tabs with no differences\n"
+#~ "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+#~ "  ( -L | --label ) <label>         Display <label> instead of the file name\n"
+#~ "  ( -m | --modified )              Create a new tab for each modified file\n"
+#~ "  ( -r | --revision ) <rev>        File revision <rev>\n"
+#~ "  ( -s | --separate )              Create a new tab for each file\n"
+#~ "  ( -t | --tab )                   Start a new tab\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    Start with line <line> selected\n"
+#~ "  --null-file                      Create a blank file comparison pane\n"
+#~ "\n"
+#~ "Display Options:\n"
+#~ "  ( -b | --ignore-space-change )   Ignore changes to white space\n"
+#~ "  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
+#~ "  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
+#~ "  ( -i | --ignore-case )           Ignore case differences\n"
+#~ "  ( -w | --ignore-all-space )      Ignore white space differences"
+#~ msgstr ""
+#~ "使用方法:\n"
+#~ "    diffuse [ [オプション...] [ファイル...] ]...\n"
+#~ "    diffuse ( -h | -? | --help | -v | --version )\n"
+#~ "\n"
+#~ "Diffuse は、テキストファイルをマージして比較するためのグラフィックツールで"
+#~ "す。\n"
+#~ "任意の数の並行なファイルを比較できます。ユーザは、手動で行を再整列し、\n"
+#~ "ファイルを直接編集できます。また、Diffuse は比較やマージするためにBazaar、"
+#~ "CVS、\n"
+#~ "Darcs、Git、Mercurial、Monotone、RCS、Subversion、および SVK リポジトリから\n"
+#~ "ファイルリビジョンを取得できます。\n"
+#~ "\n"
+#~ "ヘルプオプション:\n"
+#~ "  ( -h | -? | --help )             この使用方法の情報を表示\n"
+#~ "  ( -v | --version )               バージョンと著作権情報を表示\n"
+#~ "\n"
+#~ "構成のオプション:\n"
+#~ "  --no-rcfile                      リソースファイルを読まない\n"
+#~ "  --rcfile <file>                  指定されたリソースファイルを読む\n"
+#~ "\n"
+#~ "一般的なオプション:\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"
+#~ "  ( -r | --revision ) <rev>        <rev> というファイルリビジョン\n"
+#~ "  ( -s | --separate )              各ファイルのために新しいタブを作る\n"
+#~ "  ( -t | --tab )                   新しいタブを始める\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    初めに <line> 行を選択してから\n"
+#~ "  --null-file                      空白のファイル比較枠を作る\n"
+#~ "\n"
+#~ "表示オプション:\n"
+#~ "  ( -b | --ignore-space-change )   空白の変更を無視\n"
+#~ "  ( -B | --ignore-blank-lines )    空白行の違いを無視\n"
+#~ "  ( -E | --ignore-end-of-line )    行の最後の違いを無視\n"
+#~ "  ( -i | --ignore-case )           大文字小文字の違いを無視\n"
+#~ "  ( -w | --ignore-all-space )      空白の違いを無視"
diff --git a/po/ka.po b/po/ka.po
index ea204df..46682b8 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-14 16:24-0500\n"
+"POT-Creation-Date: 2023-04-16 14:09-0400\n"
 "PO-Revision-Date: 2023-02-25 18:36+0100\n"
 "Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
 "Language-Team: Georgian <(nothing)>\n"
@@ -30,685 +30,144 @@ 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, and "
+"Subversion repositories."
 msgstr ""
-"Diffuse გრაფიკული პროგრამაა ტექსტური ფაილების შესადარებლად და შერწყმისთვის. "
-"მას შეუძლია შესადარებელი ფაილები Bazaar, CVS, Darcs, Git, Mercurial, "
-"Monotones, RCS, Subversion და SVK რეპოზიტორიებიდან გამოითხოვოს."
+"Diffuse გრაფიკული პროგრამაა ტექსტური ფაილების შესადარებლად და შერწყმისთვის. მას "
+"შეუძლია შესადარებელი ფაილები Bazaar, CVS, Darcs, Git, Mercurial, Monotones, RCS, "
+"და Subversion რეპოზიტორიებიდან გამოითხოვოს."
 
-#: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
-msgid "Main window: diff between two files"
-msgstr "მთავარი ფანჯარა: სხვაობა ორ ფაილს შორის"
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:28
+msgid "Main window"
+msgstr "მთავარი ფანჯარა"
 
-#: src/diffuse/constants.py:25
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:32
+msgid "About window"
+msgstr ""
+
+#: src/diffuse/constants.py:26
 msgid "Copyright"
 msgstr "საავტორო უფლებები"
 
-#: src/diffuse/dialogs.py:41
-msgid "Diffuse is a graphical tool for merging and comparing text files."
-msgstr "გრაფიკული პროგრამა ტექსტური ფაილების შედარებისა და შერწყმისთვის."
+#: src/diffuse/dialogs.py:46 src/diffuse/dialogs.py:89 src/diffuse/dialogs.py:133
+#: src/diffuse/preferences.py:254 src/diffuse/preferences.py:483
+#: src/diffuse/window.py:309 src/diffuse/window.py:1107
+msgid "_Cancel"
+msgstr ""
 
-#: src/diffuse/dialogs.py:46
-msgid "translator-credits"
-msgstr "temuri Doghonadze"
-
-#: src/diffuse/dialogs.py:83
+#: src/diffuse/dialogs.py:50
 msgid "Encoding: "
 msgstr "კოდირება: "
 
-#: src/diffuse/dialogs.py:95
+#: src/diffuse/dialogs.py:62
 msgid "Revision: "
 msgstr "რევიზია: "
 
-#: src/diffuse/dialogs.py:163
+#: src/diffuse/dialogs.py:90 src/diffuse/dialogs.py:134
+#: src/diffuse/preferences.py:255
+msgid "_OK"
+msgstr ""
+
+#: src/diffuse/dialogs.py:130
 msgid "Find..."
 msgstr "მოძებნა…"
 
-#: src/diffuse/dialogs.py:173
+#: src/diffuse/dialogs.py:140
 msgid "Search For: "
 msgstr "ძებნა: "
 
-#: src/diffuse/dialogs.py:198
+#: src/diffuse/dialogs.py:165
 msgid "Match Case"
 msgstr "რეგისტრის დამთხვევა"
 
-#: src/diffuse/dialogs.py:203
+#: src/diffuse/dialogs.py:170
 msgid "Search Backwards"
 msgstr "უკან ძებნა"
 
-#: src/diffuse/main.py:84
-msgid "Close Tab"
-msgstr "ჩანართის დახურვა"
-
-#: src/diffuse/main.py:131
-msgid "Open File..."
-msgstr "ფაილის გახსნა..."
-
-#: src/diffuse/main.py:132
-msgid "Reload File"
-msgstr "ფაილის თავიდან ჩატვირთვა"
-
-#: src/diffuse/main.py:133
-msgid "Save File"
-msgstr "ფაილის შენახვა"
-
-#: src/diffuse/main.py:134
-msgid "Save File As..."
-msgstr "ფაილის შენახვა როგორც..."
-
-#: src/diffuse/main.py:229
-#, python-format
-msgid "Column %d"
-msgstr "სვეტი %d"
-
-#: src/diffuse/main.py:303
-msgid "Save changes before loading the new file?"
-msgstr "შევინახო ცვლილებები ახალი ფაილის ჩატვირთვამდე?"
-
-#: src/diffuse/main.py:414
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "ფაილის %(file)s %(rev)s რევიზიის წაკითხვის შეცდომა."
-
-#: src/diffuse/main.py:417 src/diffuse/main.py:2004
-#, python-format
-msgid "Error reading %s."
-msgstr "შეცდომა '%s'-ის კითხვისას."
-
-#: src/diffuse/main.py:439
-msgid "Open File"
-msgstr "ფაილის გახსნა"
-
-#: src/diffuse/main.py:492
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "შენახვა %(title)s პანელი %(pane)d"
-
-#: src/diffuse/main.py:524
-#, python-format
-msgid "A file named %s already exists. Do you want to overwrite it?"
-msgstr "ფაილი სახელით %s უკვე არსებობს. გნებავთ, გადააწეროთ?"
-
-#: src/diffuse/main.py:531
-#, 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?"
+#: src/diffuse/main.py:53
+msgid "Display version and copyright information"
 msgstr ""
-"ფაილი %s წაკითხვის შემდეგ სხვა პროცესის მიერ შეიცვალა. თუ შეინახავთ, ყველა "
-"გარე ცვლილება დაიკარგება. შევინახო მაინც?"
 
-#: src/diffuse/main.py:573
-#, python-format
-msgid "Error encoding to %s."
-msgstr "%s-ში დაშიფვრის შეცდომა."
-
-#: src/diffuse/main.py:577 src/diffuse/preferences.py:300
-#, python-format
-msgid "Error writing %s."
-msgstr "შეცდომა '%s'-ის ჩაწერისას."
-
-#: src/diffuse/main.py:607
-msgid "Go To Line..."
-msgstr "ხაზზე გადასვლა..."
-
-#: src/diffuse/main.py:608
-msgid "Line Number: "
-msgstr "ხაზის ნომერი: "
-
-#: src/diffuse/main.py:639
-msgid ""
-"Press the enter key or double click to edit. Press the space bar or use the "
-"RMB menu to manually align."
-msgstr ""
-"ჩასასწორებლად დააწექით ღილაკს Enter ან ორჯერ დააწკაპუნეთ. ხელით "
-"გასასწორებლად დააწექით გამოტოვების ღილაკს ან RMB მენიუ გამოიყენეთ."
-
-#: src/diffuse/main.py:643
-msgid "Press the escape key to finish editing."
-msgstr "ჩასწორების დასასრულებლად Escape ღილაკს დააწექით."
-
-#: src/diffuse/main.py:646
-msgid ""
-"Select target line and press the space bar to align. Press the escape key to "
-"cancel."
-msgstr ""
-"აირჩიეთ სამიზნე ხაზის და გასასწორებლად გამოტოვებას დააწექით. გასაუქმებლად "
-"დააწექით ღილაკს Escape."
-
-#: src/diffuse/main.py:768
-msgid "_File"
-msgstr "_ფაილი"
-
-#: src/diffuse/main.py:770
-msgid "_Open File..."
-msgstr "_ფაილის გახსნა..."
-
-#: src/diffuse/main.py:771
-msgid "Open File In New _Tab..."
-msgstr "ფაილის ახალ _ჩანართში გახსნა..."
-
-#: src/diffuse/main.py:772
-msgid "Open _Modified Files..."
-msgstr "_შეცვლილი ფაილების გახსნა..."
-
-#: src/diffuse/main.py:773
-msgid "Open Commi_t..."
-msgstr "_კომიტის გასსნა..."
-
-#: src/diffuse/main.py:774
-msgid "_Reload File"
-msgstr "ფაილის თავიდან _ჩატვირთვა"
-
-#: src/diffuse/main.py:776
-msgid "_Save File"
-msgstr "_ფაილის შენახვა"
-
-#: src/diffuse/main.py:777
-msgid "Save File _As..."
-msgstr "ფაილის შენახვა, _როგორც..."
-
-#: src/diffuse/main.py:778
-msgid "Save A_ll"
-msgstr "_ყველას შენახვა"
-
-#: src/diffuse/main.py:780
-msgid "New _2-Way File Merge"
-msgstr "ახალი _2-მხრივი ფაილების შერწყმა"
-
-#: src/diffuse/main.py:781
-msgid "New _3-Way File Merge"
-msgstr "ახალი _3-მხრივი ფაილების შერწყმა"
-
-#: src/diffuse/main.py:782
-msgid "New _N-Way File Merge..."
-msgstr "ახალი _N-მხრივი ფაილების შერწყმა..."
-
-#: src/diffuse/main.py:784
-msgid "_Close Tab"
-msgstr "დაფის დ_ახურვა"
-
-#: src/diffuse/main.py:785
-msgid "_Undo Close Tab"
-msgstr "_ჩანართის დახურვის გაუქმება"
-
-#: src/diffuse/main.py:786
-msgid "_Quit"
-msgstr "_დამთავრება"
-
-#: src/diffuse/main.py:790
-msgid "_Edit"
-msgstr "_ჩასწორება"
-
-#: src/diffuse/main.py:792
-msgid "_Undo"
-msgstr "გა_უქმება"
-
-#: src/diffuse/main.py:793
-msgid "_Redo"
-msgstr "_გამეორება"
-
-#: src/diffuse/main.py:795
-msgid "Cu_t"
-msgstr "ამო_ჭრა"
-
-#: src/diffuse/main.py:796
-msgid "_Copy"
-msgstr "_კოპირება"
-
-#: src/diffuse/main.py:797
-msgid "_Paste"
-msgstr "_ჩასმა"
-
-#: src/diffuse/main.py:799
-msgid "Select _All"
-msgstr "_ყველას მონიშვნა"
-
-#: src/diffuse/main.py:800
-msgid "C_lear Edits"
-msgstr "ჩასწორებების _გასუფთავება"
-
-#: src/diffuse/main.py:801
-msgid "_Dismiss All Edits"
-msgstr "_ყველა ჩასწორების გაუქმება"
-
-#: src/diffuse/main.py:803
-msgid "_Find..."
-msgstr "_ძიება..."
-
-#: src/diffuse/main.py:804
-msgid "Find _Next"
-msgstr "შემდეგის _პოვნა"
-
-#: src/diffuse/main.py:805
-msgid "Find Pre_vious"
-msgstr "წ_ინას მოძებნა"
-
-#: src/diffuse/main.py:806
-msgid "_Go To Line..."
-msgstr "_ხაზზე გადასვლა..."
-
-#: src/diffuse/main.py:808
-msgid "Pr_eferences..."
-msgstr "_მორგება…"
-
-#: src/diffuse/main.py:812
-msgid "None"
-msgstr "არაფერი"
-
-#: src/diffuse/main.py:834
-msgid "_View"
-msgstr "_ხედი"
-
-#: src/diffuse/main.py:836
-msgid "_Syntax Highlighting"
-msgstr "სინტაქსის _გამოკვეთა"
-
-#: src/diffuse/main.py:838
-msgid "Re_align All"
-msgstr "ყველას თავიდან _სწორება"
-
-#: src/diffuse/main.py:839
-msgid "_Isolate"
-msgstr "_იზოლირება"
-
-#: src/diffuse/main.py:841
-msgid "_First Difference"
-msgstr "პირველი _სხვაობა"
-
-#: src/diffuse/main.py:842
-msgid "_Previous Difference"
-msgstr "_წინა სხვაობა"
-
-#: src/diffuse/main.py:843
-msgid "_Next Difference"
-msgstr "_შემდეგ სხვაობა"
-
-#: src/diffuse/main.py:844
-msgid "_Last Difference"
-msgstr "_ბოლო სხვაობა"
-
-#: src/diffuse/main.py:846
-msgid "Fir_st Tab"
-msgstr "_პირველი ჩანართი"
-
-#: src/diffuse/main.py:847
-msgid "Pre_vious Tab"
-msgstr "_წინა ჩანართი"
-
-#: src/diffuse/main.py:848
-msgid "Next _Tab"
-msgstr "_შემდეგი ჩანართი"
-
-#: src/diffuse/main.py:849
-msgid "Las_t Tab"
-msgstr "_ბოლო ჩანართი"
-
-#: src/diffuse/main.py:851
-msgid "Shift Pane _Right"
-msgstr "პანელის _მარჯვნივ წანაცვლება"
-
-#: src/diffuse/main.py:852
-msgid "Shift Pane _Left"
-msgstr "პანელის მ_არცხნივ წანაცვლება"
-
-#: src/diffuse/main.py:856
-msgid "F_ormat"
-msgstr "_ფორმატი"
-
-#: src/diffuse/main.py:858
-msgid "Convert To _Upper Case"
-msgstr "_მაღალ რეგისტრში გადაყვანა"
-
-#: src/diffuse/main.py:859
-msgid "Convert To _Lower Case"
-msgstr "_დაბალ რეგისტრში გადაყვანა"
-
-#: src/diffuse/main.py:861
-msgid "Sort Lines In _Ascending Order"
-msgstr "ხაზების დალაგება _აღმავალი წყობით"
-
-#: src/diffuse/main.py:862
-msgid "Sort Lines In D_escending Order"
-msgstr "ხაზების დალაგება _დაღმავალი წყობით"
-
-#: src/diffuse/main.py:864
-msgid "Remove Trailing _White Space"
-msgstr "ბოლოში მოყოლილი გამოტოვების _მოცილება"
-
-#: src/diffuse/main.py:865
-msgid "Convert Tabs To _Spaces"
-msgstr "გამოტოვებების _ტაბულაციებად გარდაქმნა"
-
-#: src/diffuse/main.py:866
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "პრეფიქსული გამოტოვებების _ტაბულაციებად გარდაქმნა"
-
-#: src/diffuse/main.py:868
-msgid "_Increase Indenting"
-msgstr "_შეწევის გაზრდა"
-
-#: src/diffuse/main.py:869
-msgid "De_crease Indenting"
-msgstr "შეწევის _შემცირება"
-
-#: src/diffuse/main.py:871
-msgid "Convert To _DOS Format"
-msgstr "DOS ფორმატში _გადაყვანა"
-
-#: src/diffuse/main.py:872
-msgid "Convert To _Mac Format"
-msgstr "MAC ფორმატში გ_ადაყვანა"
-
-#: src/diffuse/main.py:873
-msgid "Convert To Uni_x Format"
-msgstr "Unix ფორმატში გა_დაყვანა"
-
-#: src/diffuse/main.py:877
-msgid "_Merge"
-msgstr "_შერწყმა"
-
-#: src/diffuse/main.py:879
-msgid "Copy Selection _Right"
-msgstr "მონიშნულის _მარჯვნივ კოპირება"
-
-#: src/diffuse/main.py:880
-msgid "Copy Selection _Left"
-msgstr "მონიშნულის მა_რცხნივ კოპირება"
-
-#: src/diffuse/main.py:882
-msgid "Copy Left _Into Selection"
-msgstr "_მარცხნივ კოპირება მონიშნულში"
-
-#: src/diffuse/main.py:883
-msgid "Copy Right I_nto Selection"
-msgstr "მ_არჯვნივ კოპირება მონიშნულში"
-
-#: src/diffuse/main.py:884
-msgid "_Merge From Left Then Right"
-msgstr "_ჯერ მარცხნიდან შერწყმა, შემდეგ მარჯვნიდან"
-
-#: src/diffuse/main.py:885
-msgid "M_erge From Right Then Left"
-msgstr "ჯ_ერ მარჯვნიდან შერწყმა, შემდეგ მარცხნიდან"
-
-#: src/diffuse/main.py:889
-msgid "_Help"
-msgstr "_დახმარება"
-
-#: src/diffuse/main.py:891
-msgid "_Help Contents..."
-msgstr "_დახმარების შემცველობა..."
-
-#: src/diffuse/main.py:893
-#, python-format
-msgid "_About %s..."
-msgstr "%s-ის _შესახებ..."
-
-#: src/diffuse/main.py:908
-msgid "New 2-Way File Merge"
-msgstr "ახალი _2-მხრივი ფაილების შერწყმა"
-
-#: src/diffuse/main.py:909
-msgid "New 3-Way File Merge"
-msgstr "ახალი _3-მხრივი ფაილების შერწყმა"
-
-#: src/diffuse/main.py:911
-msgid "Realign All"
-msgstr "თავიდან სწორება"
-
-#: src/diffuse/main.py:912
-msgid "First Difference"
-msgstr "პირველი სხვაობა"
-
-#: src/diffuse/main.py:913
-msgid "Previous Difference"
-msgstr "წინა სხვაობა"
-
-#: src/diffuse/main.py:914
-msgid "Next Difference"
-msgstr "შემდეგ სხვაობა"
-
-#: src/diffuse/main.py:915
-msgid "Last Difference"
-msgstr "ბოლო სხვაობა"
-
-#: src/diffuse/main.py:917
-msgid "Copy Selection Right"
-msgstr "მონიშნულის მარჯვნივ კოპირება"
-
-#: src/diffuse/main.py:918
-msgid "Copy Selection Left"
-msgstr "მონიშნულის მარცხნივ კოპირება"
-
-#: src/diffuse/main.py:919
-msgid "Copy Left Into Selection"
-msgstr "მარცხნივ კოპირება მონიშნულში"
-
-#: src/diffuse/main.py:920
-msgid "Copy Right Into Selection"
-msgstr "მარჯვნივ კოპირება მონიშნულში"
-
-#: src/diffuse/main.py:921
-msgid "Merge From Left Then Right"
-msgstr "ჯერ მარცხნიდან შერწყმა, შემდეგ მარჯვნიდან"
-
-#: src/diffuse/main.py:922
-msgid "Merge From Right Then Left"
-msgstr "ჯერ მარჯვნიდან შერწყმა, შემდეგ მარცხნიდან"
-
-#: src/diffuse/main.py:924
-msgid "Undo"
-msgstr "დაბრუნება"
-
-#: src/diffuse/main.py:925
-msgid "Redo"
-msgstr "თავიდან"
-
-#: src/diffuse/main.py:926 src/diffuse/widgets.py:1861
-msgid "Cut"
-msgstr "ამოჭრა"
-
-#: src/diffuse/main.py:927 src/diffuse/widgets.py:1862
-msgid "Copy"
-msgstr "კოპირება"
-
-#: src/diffuse/main.py:928 src/diffuse/widgets.py:1863
-msgid "Paste"
-msgstr "ჩასმა"
-
-#: src/diffuse/main.py:929 src/diffuse/widgets.py:1866
-msgid "Clear Edits"
-msgstr "ჩასწორებების გასუფთავება"
-
-#: src/diffuse/main.py:996
-msgid "Changes detected"
-msgstr "აღმოცენილია ცვლილებები"
-
-#: src/diffuse/main.py:1000
-#, python-format
-msgid ""
-"The file \"%s\" changed on disk.\n"
-"\n"
-"Do you want to reload the file?"
-msgstr ""
-"ფაილი \"%s\" დისკზე შეიცვალა.\n"
-"\n"
-"გნებავთ, ფაილი თავიდან ჩატვირთოთ?"
-
-#: src/diffuse/main.py:1005
-#, python-format
-msgid ""
-"The following files changed on disk:\n"
-"%s\n"
-"\n"
-"Do you want to reload these files?"
-msgstr ""
-"აღმოჩენილია შემდეგი ფაილების ცვლილება დასკზე:\n"
-"%s\n"
-"\n"
-"გნებავთ, ეს ფაილები თავიდან ჩავტვირთო?"
-
-#: src/diffuse/main.py:1120
-msgid ""
-"Some files have unsaved changes. Select the files to save before closing."
-msgstr ""
-"ზოგიერთ ფაილს შეუნახავი ცვლილებები გააჩნია. აირჩიეთ ფაილები და შეინახეთ, "
-"სანამ დახურავთ."
-
-#: src/diffuse/main.py:1134
-msgid "Tab"
-msgstr "ჩანართი"
-
-#: src/diffuse/main.py:1139
-msgid "Pane"
-msgstr "პანელი"
-
-#: src/diffuse/main.py:1150
-msgid "Close _Without Saving"
-msgstr "დახურვა _შენახვის გარეშე"
-
-#: src/diffuse/main.py:1189
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "ამ ჩანართის დახურვა %s-ს დახურავს."
-
-#: src/diffuse/main.py:1266
-#, python-format
-msgid "File Merge %d"
-msgstr "ფაილების შერწყმა %d"
-
-#: src/diffuse/main.py:1372
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "%s-ის კომიტების მიღების შეცდომა."
-
-#: src/diffuse/main.py:1404
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "შეცდომა %s-ის ცვლილებების მიღებისას."
-
-#: src/diffuse/main.py:1437
-msgid "Open File In New Tab"
-msgstr "ფაილის ახალ ჩანართში გახსნა"
-
-#: src/diffuse/main.py:1460
-msgid "Choose Folder With Modified Files"
-msgstr "აირჩიეთ შეცვლილი ფაილების შემცველი საქაღალდე"
-
-#: src/diffuse/main.py:1478
-msgid "No modified files found."
-msgstr "Secvlili failebi ver vipove."
-
-#: src/diffuse/main.py:1484
-msgid "Choose Folder With Commit"
-msgstr "აირჩიეთ კომიტის შემცელი საქაღალდე"
-
-#: src/diffuse/main.py:1504
-msgid "No committed files found."
-msgstr "დაკომიტებული ფაილები ვერ ვიპოვე."
-
-#: src/diffuse/main.py:1540
-msgid "New N-Way File Merge..."
-msgstr "ახალი N-მხრივი ფაილების შერწყმა..."
-
-#: src/diffuse/main.py:1541
-msgid "Number of panes: "
-msgstr "პანელების რაოდენობა: "
-
-#: src/diffuse/main.py:1615
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "ფრაზა ვერ ვიპოვე.  გავაგრძელო ფაილის ბოლოდან?"
-
-#: src/diffuse/main.py:1617
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "ფრაზა ვერ ვიპოვე.  გავაგრძელო ფაილის დასაწყისიდან?"
-
-#: src/diffuse/main.py:1827
+#: src/diffuse/main.py:61
 msgid "Do not read any resource files"
 msgstr "რესურსის ფაილები წაკითხული არ იქნება"
 
-#: src/diffuse/main.py:1835
+#: src/diffuse/main.py:69
 msgid "Specify explicit resource file"
 msgstr "რესურსის ფაილის მითითება"
 
-#: src/diffuse/main.py:1843
+#: src/diffuse/main.py:77
 msgid "File revisions <rev-1> and <rev>"
 msgstr "ფაილის რევიზიები <rev-1> და <rev>"
 
-#: src/diffuse/main.py:1851
+#: src/diffuse/main.py:85
 msgid "Close all tabs with no differences"
 msgstr "სხვაობების არმქონე ჩანართების დახურვა"
 
-#: src/diffuse/main.py:1858
+#: src/diffuse/main.py:92
 msgid "Use <codec> to read and write files"
 msgstr "ფაილების წასაკითხად და ჩასაწერად <codec>-ის გამოყენება"
 
-#: src/diffuse/main.py:1866
+#: src/diffuse/main.py:100
 msgid "Display <label> instead of the file name"
 msgstr "ფაილის სახელის მაგიერ <label>-ის ჩვენება"
 
-#: src/diffuse/main.py:1874
+#: src/diffuse/main.py:108
 msgid "Create a new tab for each modified file"
 msgstr "თითოეული შეცვლილი ფაილისთვის ცალკე ჩანართის შექმნა"
 
-#: src/diffuse/main.py:1881
+#: src/diffuse/main.py:115
 msgid "File revision <rev>"
 msgstr "ფაილის რევიზია <rev>"
 
-#: src/diffuse/main.py:1889
+#: src/diffuse/main.py:123
 msgid "Create a new tab for each file"
 msgstr "თითოეული ფაილისთვის ცალკე ჩანართის შექმნა"
 
-#: src/diffuse/main.py:1896
+#: src/diffuse/main.py:130
 msgid "Start a new tab"
 msgstr "ახალი ცანართის გაშვება"
 
-#: src/diffuse/main.py:1903 src/diffuse/preferences.py:165
+#: src/diffuse/main.py:137 src/diffuse/preferences.py:159
 msgid "Version control system search order"
 msgstr "ვერსიის კონტროლის სისტემის ძებნის მიმდევრობა"
 
-#: src/diffuse/main.py:1911
+#: src/diffuse/main.py:145
 msgid "Start with line <line> selected"
 msgstr "<line>-ე ხაზით გაშვება"
 
-#: src/diffuse/main.py:1919
+#: src/diffuse/main.py:153
 msgid "Create a blank file comparison pane"
 msgstr "შედარების პანელის მქონე ცარიელი ფაილის შექმნა"
 
-#: src/diffuse/main.py:1926 src/diffuse/preferences.py:91
-#: src/diffuse/preferences.py:100
+#: src/diffuse/main.py:160 src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:95
 msgid "Ignore changes to white space"
 msgstr "გამოტოვებების ცვლილებების იგნორი"
 
-#: src/diffuse/main.py:1933
+#: src/diffuse/main.py:167
 msgid "Ignore changes in blank lines"
 msgstr "ცარიელი ხაზების ცვლილების გამოტოვება"
 
-#: src/diffuse/main.py:1940 src/diffuse/preferences.py:93
+#: src/diffuse/main.py:174 src/diffuse/preferences.py:88
 msgid "Ignore end of line differences"
 msgstr "ხაზის დაბოლოების სიმბოლოების სხვაობის იგნორი"
 
-#: src/diffuse/main.py:1947 src/diffuse/preferences.py:89
+#: src/diffuse/main.py:181 src/diffuse/preferences.py:84
 msgid "Ignore case differences"
 msgstr "რეგისტრის სხვაობის იგნორი"
 
-#: src/diffuse/main.py:1954 src/diffuse/preferences.py:90
+#: src/diffuse/main.py:188 src/diffuse/preferences.py:85
 msgid "Ignore white space differences"
 msgstr "გამოტოვებების სხვაობის იგნორი"
 
-#: src/diffuse/main.py:1957
+#: src/diffuse/main.py:191
 msgid ""
-"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 several VCSs for comparison and "
-"merging."
+"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 several VCSs for comparison and merging."
 msgstr ""
 "Diffuse ტექსტური ფაილების შედარებისა და შერწყმის გრაფიკული აპლიკაციაა.\n"
 "მას აქვს საშუალება შეადაროს საკმაოდ დიდი რაოდენობის ფაილები გვერდიგვერდ და "
@@ -716,152 +175,167 @@ msgstr ""
 "მისცეს საშუალება, ხაზები პირდაპირ შეადაროს და ჩაასწოროს ისინი.\n"
 "Diffuse-ს ასევე შეუძლია ფაილების რევიზიები რამდენიმე VCS-დან გამოითხოვოს."
 
-#: src/diffuse/main.py:2080
+#: src/diffuse/main.py:247 src/diffuse/window.py:420
+#, python-format
+msgid "Error reading %s."
+msgstr "შეცდომა '%s'-ის კითხვისას."
+
+#: src/diffuse/main.py:327
 msgid "Error parsing line number."
 msgstr "ხაზის ნომრის დამუშავების შეცდომა."
 
-#: src/diffuse/main.py:2096
+#: src/diffuse/main.py:343
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "არგუმენტის \"%s\" დამუშავების შეცდომა.  საქაღალდე გატანილი არაა."
 
-#: src/diffuse/preferences.py:80
+#: src/diffuse/preferences.py:75
 msgid "Display"
 msgstr "დროის ჩვენება"
 
-#: src/diffuse/preferences.py:83
+#: src/diffuse/preferences.py:78
 msgid "Font"
 msgstr "ფონტი"
 
-#: src/diffuse/preferences.py:84
+#: src/diffuse/preferences.py:79
 msgid "Tab width"
 msgstr "ტაბულაციის სიგანე"
 
-#: src/diffuse/preferences.py:85
+#: src/diffuse/preferences.py:80
 msgid "Show right margin"
 msgstr "მარჯვენა ზღვრის ჩვენება"
 
-#: src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:81
 msgid "Right margin"
 msgstr "მარჯვენა კიდე"
 
-#: src/diffuse/preferences.py:87
+#: src/diffuse/preferences.py:82
 msgid "Show line numbers"
 msgstr "ხაზის ნომრების ჩვენება"
 
-#: src/diffuse/preferences.py:88
+#: src/diffuse/preferences.py:83
 msgid "Show white space characters"
 msgstr "გამოტოვების სიმბოლოს ჩვენება"
 
-#: src/diffuse/preferences.py:92
+#: src/diffuse/preferences.py:87
 msgid "Ignore blank line differences"
 msgstr "ცარიელი ხაზის სხვაობის იგნორი"
 
-#: src/diffuse/preferences.py:95
+#: src/diffuse/preferences.py:90
 msgid "Alignment"
 msgstr "სწორება"
 
-#: src/diffuse/preferences.py:98
+#: src/diffuse/preferences.py:93
 msgid "Ignore case"
 msgstr "რეგისტრის იგნორი"
 
-#: src/diffuse/preferences.py:99
+#: src/diffuse/preferences.py:94
 msgid "Ignore white space"
 msgstr "გამოტოვების იგნორი"
 
-#: src/diffuse/preferences.py:101
+#: src/diffuse/preferences.py:96
 msgid "Ignore blank lines"
 msgstr "ცარიელი ხაზების იგნორი"
 
-#: src/diffuse/preferences.py:102
+#: src/diffuse/preferences.py:97
 msgid "Ignore end of line characters"
 msgstr "ხაზის დაბოლოების სიმბოლოების იგნორი"
 
-#: src/diffuse/preferences.py:104
+#: src/diffuse/preferences.py:99
 msgid "Editor"
 msgstr "რედაქტორი"
 
-#: src/diffuse/preferences.py:107
+#: src/diffuse/preferences.py:102
 msgid "Auto indent"
 msgstr "ავტომატური სწორება"
 
-#: src/diffuse/preferences.py:108
+#: src/diffuse/preferences.py:103
 msgid "Expand tabs to spaces"
 msgstr "ტაბულაციის გამოტოვებებით შეცვლა"
 
-#: src/diffuse/preferences.py:109
+#: src/diffuse/preferences.py:104
 msgid "Soft tab width"
 msgstr "რბილი ტაბულაციის სიგანე"
 
-#: src/diffuse/preferences.py:111
+#: src/diffuse/preferences.py:106
 msgid "Tabs"
 msgstr "დაფები"
 
-#: src/diffuse/preferences.py:114
+#: src/diffuse/preferences.py:109
 msgid "Default panes"
 msgstr "ნაგულისხმები პანელები"
 
-#: src/diffuse/preferences.py:115
+#: src/diffuse/preferences.py:110
 msgid "Always show the tab bar"
 msgstr "ჩანართების ზოლის ყოველთვის ჩვენება"
 
-#: src/diffuse/preferences.py:116
+#: src/diffuse/preferences.py:111
 #, python-format
 msgid "Warn me when closing a tab will quit %s"
 msgstr "გამაფრთხილე, როცა ჩანართის დახურვა %s-საც დახურავს"
 
-#: src/diffuse/preferences.py:118
+#: src/diffuse/preferences.py:113
 msgid "Regional Settings"
 msgstr "რეგიონის მორგება"
 
-#: src/diffuse/preferences.py:121
+#: src/diffuse/preferences.py:116
 msgid "Default codec"
 msgstr "ნაგულისხმები კოდეკი"
 
-#: src/diffuse/preferences.py:122
+#: src/diffuse/preferences.py:117
 msgid "Order of codecs used to identify encoding"
 msgstr "კოდეკების მიმდევრობა, რომელიც კოდირების იდენტიფიკაციისთვის გამოიყენება"
 
-#: src/diffuse/preferences.py:143
+#: src/diffuse/preferences.py:138
 msgid "Cygwin"
 msgstr "Cygwin"
 
-#: src/diffuse/preferences.py:145
+#: src/diffuse/preferences.py:140
 msgid "Root directory"
 msgstr "Root საქაღალდე"
 
-#: src/diffuse/preferences.py:146
+#: src/diffuse/preferences.py:141
 msgid "Cygdrive prefix"
 msgstr "Cygdrive-ის პრეფიქსი"
 
-#: src/diffuse/preferences.py:173
+#: src/diffuse/preferences.py:167
 msgid "\"co\" command"
 msgstr "\"co\" ბრძანება"
 
-#: src/diffuse/preferences.py:174
+#: src/diffuse/preferences.py:168
 msgid "\"rlog\" command"
 msgstr "\"rlog\" ბრძანება"
 
-#: src/diffuse/preferences.py:176
+#: src/diffuse/preferences.py:170
 msgid "Command"
 msgstr "ბრძანება"
 
-#: src/diffuse/preferences.py:182
+#: src/diffuse/preferences.py:176
 msgid "Launch from a Bash login shell"
 msgstr "Bash-ის შესვლის გარემოდან გაშვება"
 
-#: src/diffuse/preferences.py:189
+#: src/diffuse/preferences.py:183
 msgid "Update paths for Cygwin"
 msgstr "ბილიკების განახლება Cygwin-სთვის"
 
-#: src/diffuse/preferences.py:194
+#: src/diffuse/preferences.py:188
 msgid "Version Control"
 msgstr "ვერსიის კონტროლი"
 
-#: src/diffuse/preferences.py:259
+#: src/diffuse/preferences.py:253
 msgid "Preferences"
 msgstr "გამართვა"
 
+#: src/diffuse/preferences.py:294 src/diffuse/window.py:580
+#, python-format
+msgid "Error writing %s."
+msgstr "შეცდომა '%s'-ის ჩაწერისას."
+
+#: src/diffuse/preferences.py:483 src/diffuse/window.py:446
+#: src/diffuse/window.py:1413 src/diffuse/window.py:1436 src/diffuse/window.py:1459
+msgid "_Open"
+msgstr ""
+
 #: src/diffuse/resources.py:242 src/diffuse/resources.py:246
 #: src/diffuse/resources.py:249
 #, python-brace-format
@@ -943,21 +417,15 @@ msgstr "რეგგამოს-ის შეცდომა ხაზზე {l
 msgid "Unhandled error at line {line} of {file}."
 msgstr "დაუმუშავებელი შეცდომა ხაზზე {line} ფაილისთვის {file}."
 
-#: src/diffuse/utils.py:65
+#: src/diffuse/utils.py:66
 msgid "Auto Detect"
 msgstr "ავტომატური გამოცნობა"
 
-#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63
-#: src/diffuse/vcs/svn.py:97
+#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:96
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "%s რევიზიის დამუშავების შეცდომა."
 
-#: src/diffuse/vcs/vcs_registry.py:238
-#, python-format
-msgid "Error parsing %s."
-msgstr "%s-ის დამუშავების შეცდომა."
-
 #: src/diffuse/widgets.py:1857
 msgid "Align with Selection"
 msgstr "მონიშნულთან სწორება"
@@ -970,10 +438,568 @@ msgstr "იზოლირება"
 msgid "Merge Selection"
 msgstr "მონიშნულის შერწყმა"
 
+#: src/diffuse/widgets.py:1861 src/diffuse/window.py:865
+msgid "Cut"
+msgstr "ამოჭრა"
+
+#: src/diffuse/widgets.py:1862 src/diffuse/window.py:866
+msgid "Copy"
+msgstr "კოპირება"
+
+#: src/diffuse/widgets.py:1863 src/diffuse/window.py:867
+msgid "Paste"
+msgstr "ჩასმა"
+
 #: src/diffuse/widgets.py:1865
 msgid "Select All"
 msgstr "ყველას მონიშვნა"
 
+#: src/diffuse/widgets.py:1866 src/diffuse/window.py:868
+msgid "Clear Edits"
+msgstr "ჩასწორებების გასუფთავება"
+
 #: src/diffuse/widgets.py:1868
 msgid "Swap with Selected Pane"
 msgstr "მონიშნულ პანელთან გაცვლა"
+
+#: src/diffuse/window.py:83
+msgid "Close Tab"
+msgstr "ჩანართის დახურვა"
+
+#: src/diffuse/window.py:126
+msgid "Open File..."
+msgstr "ფაილის გახსნა..."
+
+#: src/diffuse/window.py:127
+msgid "Reload File"
+msgstr "ფაილის თავიდან ჩატვირთვა"
+
+#: src/diffuse/window.py:128
+msgid "Save File"
+msgstr "ფაილის შენახვა"
+
+#: src/diffuse/window.py:129
+msgid "Save File As..."
+msgstr "ფაილის შენახვა როგორც..."
+
+#: src/diffuse/window.py:228
+#, python-format
+msgid "Column %d"
+msgstr "სვეტი %d"
+
+#: src/diffuse/window.py:306
+msgid "Save changes before loading the new file?"
+msgstr "შევინახო ცვლილებები ახალი ფაილის ჩატვირთვამდე?"
+
+#: src/diffuse/window.py:310
+msgid "_No"
+msgstr ""
+
+#: src/diffuse/window.py:311
+msgid "_Yes"
+msgstr ""
+
+#: src/diffuse/window.py:417
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "ფაილის %(file)s %(rev)s რევიზიის წაკითხვის შეცდომა."
+
+#: src/diffuse/window.py:442
+msgid "Open File"
+msgstr "ფაილის გახსნა"
+
+#: src/diffuse/window.py:495
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "შენახვა %(title)s პანელი %(pane)d"
+
+#: src/diffuse/window.py:499 src/diffuse/window.py:1111
+#, fuzzy
+msgid "_Save"
+msgstr "_ფაილის შენახვა"
+
+#: src/diffuse/window.py:527
+#, python-format
+msgid "A file named %s already exists. Do you want to overwrite it?"
+msgstr "ფაილი სახელით %s უკვე არსებობს. გნებავთ, გადააწეროთ?"
+
+#: src/diffuse/window.py:534
+#, python-format
+msgid ""
+"The file %s has been modified by another process since reading it. If you save, "
+"all the external changes could be lost. Save anyways?"
+msgstr ""
+"ფაილი %s წაკითხვის შემდეგ სხვა პროცესის მიერ შეიცვალა. თუ შეინახავთ, ყველა გარე "
+"ცვლილება დაიკარგება. შევინახო მაინც?"
+
+#: src/diffuse/window.py:576
+#, python-format
+msgid "Error encoding to %s."
+msgstr "%s-ში დაშიფვრის შეცდომა."
+
+#: src/diffuse/window.py:610
+msgid "Go To Line..."
+msgstr "ხაზზე გადასვლა..."
+
+#: src/diffuse/window.py:611
+msgid "Line Number: "
+msgstr "ხაზის ნომერი: "
+
+#: src/diffuse/window.py:642
+msgid ""
+"Press the enter key or double click to edit. Press the space bar or use the RMB "
+"menu to manually align."
+msgstr ""
+"ჩასასწორებლად დააწექით ღილაკს Enter ან ორჯერ დააწკაპუნეთ. ხელით გასასწორებლად "
+"დააწექით გამოტოვების ღილაკს ან RMB მენიუ გამოიყენეთ."
+
+#: src/diffuse/window.py:646
+msgid "Press the escape key to finish editing."
+msgstr "ჩასწორების დასასრულებლად Escape ღილაკს დააწექით."
+
+#: src/diffuse/window.py:649
+msgid ""
+"Select target line and press the space bar to align. Press the escape key to "
+"cancel."
+msgstr ""
+"აირჩიეთ სამიზნე ხაზის და გასასწორებლად გამოტოვებას დააწექით. გასაუქმებლად "
+"დააწექით ღილაკს Escape."
+
+#: src/diffuse/window.py:710
+msgid "_File"
+msgstr "_ფაილი"
+
+#: src/diffuse/window.py:712
+msgid "_Open File..."
+msgstr "_ფაილის გახსნა..."
+
+#: src/diffuse/window.py:713
+msgid "Open File In New _Tab..."
+msgstr "ფაილის ახალ _ჩანართში გახსნა..."
+
+#: src/diffuse/window.py:714
+msgid "Open _Modified Files..."
+msgstr "_შეცვლილი ფაილების გახსნა..."
+
+#: src/diffuse/window.py:715
+msgid "Open Commi_t..."
+msgstr "_კომიტის გასსნა..."
+
+#: src/diffuse/window.py:716
+msgid "_Reload File"
+msgstr "ფაილის თავიდან _ჩატვირთვა"
+
+#: src/diffuse/window.py:718
+msgid "_Save File"
+msgstr "_ფაილის შენახვა"
+
+#: src/diffuse/window.py:719
+msgid "Save File _As..."
+msgstr "ფაილის შენახვა, _როგორც..."
+
+#: src/diffuse/window.py:720
+msgid "Save A_ll"
+msgstr "_ყველას შენახვა"
+
+#: src/diffuse/window.py:722
+msgid "New _2-Way File Merge"
+msgstr "ახალი _2-მხრივი ფაილების შერწყმა"
+
+#: src/diffuse/window.py:723
+msgid "New _3-Way File Merge"
+msgstr "ახალი _3-მხრივი ფაილების შერწყმა"
+
+#: src/diffuse/window.py:724
+msgid "New _N-Way File Merge..."
+msgstr "ახალი _N-მხრივი ფაილების შერწყმა..."
+
+#: src/diffuse/window.py:726
+msgid "_Close Tab"
+msgstr "დაფის დ_ახურვა"
+
+#: src/diffuse/window.py:727
+msgid "_Undo Close Tab"
+msgstr "_ჩანართის დახურვის გაუქმება"
+
+#: src/diffuse/window.py:728
+msgid "_Quit"
+msgstr "_დამთავრება"
+
+#: src/diffuse/window.py:732
+msgid "_Edit"
+msgstr "_ჩასწორება"
+
+#: src/diffuse/window.py:734
+msgid "_Undo"
+msgstr "გა_უქმება"
+
+#: src/diffuse/window.py:735
+msgid "_Redo"
+msgstr "_გამეორება"
+
+#: src/diffuse/window.py:737
+msgid "Cu_t"
+msgstr "ამო_ჭრა"
+
+#: src/diffuse/window.py:738
+msgid "_Copy"
+msgstr "_კოპირება"
+
+#: src/diffuse/window.py:739
+msgid "_Paste"
+msgstr "_ჩასმა"
+
+#: src/diffuse/window.py:741
+msgid "Select _All"
+msgstr "_ყველას მონიშვნა"
+
+#: src/diffuse/window.py:742
+msgid "C_lear Edits"
+msgstr "ჩასწორებების _გასუფთავება"
+
+#: src/diffuse/window.py:743
+msgid "_Dismiss All Edits"
+msgstr "_ყველა ჩასწორების გაუქმება"
+
+#: src/diffuse/window.py:745
+msgid "_Find..."
+msgstr "_ძიება..."
+
+#: src/diffuse/window.py:746
+msgid "Find _Next"
+msgstr "შემდეგის _პოვნა"
+
+#: src/diffuse/window.py:747
+msgid "Find Pre_vious"
+msgstr "წ_ინას მოძებნა"
+
+#: src/diffuse/window.py:748
+msgid "_Go To Line..."
+msgstr "_ხაზზე გადასვლა..."
+
+#: src/diffuse/window.py:750
+msgid "Pr_eferences..."
+msgstr "_მორგება…"
+
+#: src/diffuse/window.py:754
+msgid "None"
+msgstr "არაფერი"
+
+#: src/diffuse/window.py:776
+msgid "_View"
+msgstr "_ხედი"
+
+#: src/diffuse/window.py:778
+msgid "_Syntax Highlighting"
+msgstr "სინტაქსის _გამოკვეთა"
+
+#: src/diffuse/window.py:780
+msgid "Re_align All"
+msgstr "ყველას თავიდან _სწორება"
+
+#: src/diffuse/window.py:781
+msgid "_Isolate"
+msgstr "_იზოლირება"
+
+#: src/diffuse/window.py:783
+msgid "_First Difference"
+msgstr "პირველი _სხვაობა"
+
+#: src/diffuse/window.py:784
+msgid "_Previous Difference"
+msgstr "_წინა სხვაობა"
+
+#: src/diffuse/window.py:785
+msgid "_Next Difference"
+msgstr "_შემდეგ სხვაობა"
+
+#: src/diffuse/window.py:786
+msgid "_Last Difference"
+msgstr "_ბოლო სხვაობა"
+
+#: src/diffuse/window.py:788
+msgid "Fir_st Tab"
+msgstr "_პირველი ჩანართი"
+
+#: src/diffuse/window.py:789
+msgid "Pre_vious Tab"
+msgstr "_წინა ჩანართი"
+
+#: src/diffuse/window.py:790
+msgid "Next _Tab"
+msgstr "_შემდეგი ჩანართი"
+
+#: src/diffuse/window.py:791
+msgid "Las_t Tab"
+msgstr "_ბოლო ჩანართი"
+
+#: src/diffuse/window.py:793
+msgid "Shift Pane _Right"
+msgstr "პანელის _მარჯვნივ წანაცვლება"
+
+#: src/diffuse/window.py:794
+msgid "Shift Pane _Left"
+msgstr "პანელის მ_არცხნივ წანაცვლება"
+
+#: src/diffuse/window.py:798
+msgid "F_ormat"
+msgstr "_ფორმატი"
+
+#: src/diffuse/window.py:800
+msgid "Convert To _Upper Case"
+msgstr "_მაღალ რეგისტრში გადაყვანა"
+
+#: src/diffuse/window.py:801
+msgid "Convert To _Lower Case"
+msgstr "_დაბალ რეგისტრში გადაყვანა"
+
+#: src/diffuse/window.py:803
+msgid "Sort Lines In _Ascending Order"
+msgstr "ხაზების დალაგება _აღმავალი წყობით"
+
+#: src/diffuse/window.py:804
+msgid "Sort Lines In D_escending Order"
+msgstr "ხაზების დალაგება _დაღმავალი წყობით"
+
+#: src/diffuse/window.py:806
+msgid "Remove Trailing _White Space"
+msgstr "ბოლოში მოყოლილი გამოტოვების _მოცილება"
+
+#: src/diffuse/window.py:807
+msgid "Convert Tabs To _Spaces"
+msgstr "გამოტოვებების _ტაბულაციებად გარდაქმნა"
+
+#: src/diffuse/window.py:808
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "პრეფიქსული გამოტოვებების _ტაბულაციებად გარდაქმნა"
+
+#: src/diffuse/window.py:810
+msgid "_Increase Indenting"
+msgstr "_შეწევის გაზრდა"
+
+#: src/diffuse/window.py:811
+msgid "De_crease Indenting"
+msgstr "შეწევის _შემცირება"
+
+#: src/diffuse/window.py:813
+msgid "Convert To _DOS Format"
+msgstr "DOS ფორმატში _გადაყვანა"
+
+#: src/diffuse/window.py:814
+msgid "Convert To _Mac Format"
+msgstr "MAC ფორმატში გ_ადაყვანა"
+
+#: src/diffuse/window.py:815
+msgid "Convert To Uni_x Format"
+msgstr "Unix ფორმატში გა_დაყვანა"
+
+#: src/diffuse/window.py:819
+msgid "_Merge"
+msgstr "_შერწყმა"
+
+#: src/diffuse/window.py:821
+msgid "Copy Selection _Right"
+msgstr "მონიშნულის _მარჯვნივ კოპირება"
+
+#: src/diffuse/window.py:822
+msgid "Copy Selection _Left"
+msgstr "მონიშნულის მა_რცხნივ კოპირება"
+
+#: src/diffuse/window.py:824
+msgid "Copy Left _Into Selection"
+msgstr "_მარცხნივ კოპირება მონიშნულში"
+
+#: src/diffuse/window.py:825
+msgid "Copy Right I_nto Selection"
+msgstr "მ_არჯვნივ კოპირება მონიშნულში"
+
+#: src/diffuse/window.py:826
+msgid "_Merge From Left Then Right"
+msgstr "_ჯერ მარცხნიდან შერწყმა, შემდეგ მარჯვნიდან"
+
+#: src/diffuse/window.py:827
+msgid "M_erge From Right Then Left"
+msgstr "ჯ_ერ მარჯვნიდან შერწყმა, შემდეგ მარცხნიდან"
+
+#: src/diffuse/window.py:831
+msgid "_Help"
+msgstr "_დახმარება"
+
+#: src/diffuse/window.py:833
+msgid "_Help Contents..."
+msgstr "_დახმარების შემცველობა..."
+
+#: src/diffuse/window.py:835
+#, python-format
+msgid "_About %s..."
+msgstr "%s-ის _შესახებ..."
+
+#: src/diffuse/window.py:847
+msgid "New 2-Way File Merge"
+msgstr "ახალი _2-მხრივი ფაილების შერწყმა"
+
+#: src/diffuse/window.py:848
+msgid "New 3-Way File Merge"
+msgstr "ახალი _3-მხრივი ფაილების შერწყმა"
+
+#: src/diffuse/window.py:850
+msgid "Realign All"
+msgstr "თავიდან სწორება"
+
+#: src/diffuse/window.py:851
+msgid "First Difference"
+msgstr "პირველი სხვაობა"
+
+#: src/diffuse/window.py:852
+msgid "Previous Difference"
+msgstr "წინა სხვაობა"
+
+#: src/diffuse/window.py:853
+msgid "Next Difference"
+msgstr "შემდეგ სხვაობა"
+
+#: src/diffuse/window.py:854
+msgid "Last Difference"
+msgstr "ბოლო სხვაობა"
+
+#: src/diffuse/window.py:856
+msgid "Copy Selection Right"
+msgstr "მონიშნულის მარჯვნივ კოპირება"
+
+#: src/diffuse/window.py:857
+msgid "Copy Selection Left"
+msgstr "მონიშნულის მარცხნივ კოპირება"
+
+#: src/diffuse/window.py:858
+msgid "Copy Left Into Selection"
+msgstr "მარცხნივ კოპირება მონიშნულში"
+
+#: src/diffuse/window.py:859
+msgid "Copy Right Into Selection"
+msgstr "მარჯვნივ კოპირება მონიშნულში"
+
+#: src/diffuse/window.py:860
+msgid "Merge From Left Then Right"
+msgstr "ჯერ მარცხნიდან შერწყმა, შემდეგ მარჯვნიდან"
+
+#: src/diffuse/window.py:861
+msgid "Merge From Right Then Left"
+msgstr "ჯერ მარჯვნიდან შერწყმა, შემდეგ მარცხნიდან"
+
+#: src/diffuse/window.py:863
+msgid "Undo"
+msgstr "დაბრუნება"
+
+#: src/diffuse/window.py:864
+msgid "Redo"
+msgstr "თავიდან"
+
+#: src/diffuse/window.py:950
+msgid "Changes detected"
+msgstr "აღმოცენილია ცვლილებები"
+
+#: src/diffuse/window.py:954
+#, python-format
+msgid ""
+"The file \"%s\" changed on disk.\n"
+"\n"
+"Do you want to reload the file?"
+msgstr ""
+"ფაილი \"%s\" დისკზე შეიცვალა.\n"
+"\n"
+"გნებავთ, ფაილი თავიდან ჩატვირთოთ?"
+
+#: src/diffuse/window.py:959
+#, python-format
+msgid ""
+"The following files changed on disk:\n"
+"%s\n"
+"\n"
+"Do you want to reload these files?"
+msgstr ""
+"აღმოჩენილია შემდეგი ფაილების ცვლილება დასკზე:\n"
+"%s\n"
+"\n"
+"გნებავთ, ეს ფაილები თავიდან ჩავტვირთო?"
+
+#: src/diffuse/window.py:1078
+msgid "Some files have unsaved changes. Select the files to save before closing."
+msgstr ""
+"ზოგიერთ ფაილს შეუნახავი ცვლილებები გააჩნია. აირჩიეთ ფაილები და შეინახეთ, სანამ "
+"დახურავთ."
+
+#: src/diffuse/window.py:1092
+msgid "Tab"
+msgstr "ჩანართი"
+
+#: src/diffuse/window.py:1097
+msgid "Pane"
+msgstr "პანელი"
+
+#: src/diffuse/window.py:1108
+msgid "Close _Without Saving"
+msgstr "დახურვა _შენახვის გარეშე"
+
+#: src/diffuse/window.py:1147
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "ამ ჩანართის დახურვა %s-ს დახურავს."
+
+#: src/diffuse/window.py:1224
+#, python-format
+msgid "File Merge %d"
+msgstr "ფაილების შერწყმა %d"
+
+#: src/diffuse/window.py:1344
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "%s-ის კომიტების მიღების შეცდომა."
+
+#: src/diffuse/window.py:1376
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "შეცდომა %s-ის ცვლილებების მიღებისას."
+
+#: src/diffuse/window.py:1409
+msgid "Open File In New Tab"
+msgstr "ფაილის ახალ ჩანართში გახსნა"
+
+#: src/diffuse/window.py:1432
+msgid "Choose Folder With Modified Files"
+msgstr "აირჩიეთ შეცვლილი ფაილების შემცველი საქაღალდე"
+
+#: src/diffuse/window.py:1450
+msgid "No modified files found."
+msgstr "Secvlili failebi ver vipove."
+
+#: src/diffuse/window.py:1456
+msgid "Choose Folder With Commit"
+msgstr "აირჩიეთ კომიტის შემცელი საქაღალდე"
+
+#: src/diffuse/window.py:1476
+msgid "No committed files found."
+msgstr "დაკომიტებული ფაილები ვერ ვიპოვე."
+
+#: src/diffuse/window.py:1512
+msgid "New N-Way File Merge..."
+msgstr "ახალი N-მხრივი ფაილების შერწყმა..."
+
+#: src/diffuse/window.py:1513
+msgid "Number of panes: "
+msgstr "პანელების რაოდენობა: "
+
+#: src/diffuse/window.py:1587
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "ფრაზა ვერ ვიპოვე.  გავაგრძელო ფაილის ბოლოდან?"
+
+#: src/diffuse/window.py:1589
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "ფრაზა ვერ ვიპოვე.  გავაგრძელო ფაილის დასაწყისიდან?"
+
+#: src/diffuse/window.py:1762
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr "გრაფიკული პროგრამა ტექსტური ფაილების შედარებისა და შერწყმისთვის."
+
+#: src/diffuse/window.py:1766
+msgid "translator-credits"
+msgstr "temuri Doghonadze"
diff --git a/po/ko.po b/po/ko.po
index 5e86649..0f19c16 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse-svn r316\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-23 20:00-0400\n"
+"POT-Creation-Date: 2023-04-16 14:09-0400\n"
 "PO-Revision-Date: 2022-04-04 12:18-0400\n"
 "Last-Translator: Kang Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean\n"
@@ -31,822 +31,303 @@ 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."
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, and "
+"Subversion repositories."
 msgstr ""
 
-#: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
-msgid "Main window: diff between two files"
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:28
+msgid "Main window"
 msgstr ""
 
-#: src/diffuse/constants.py:25
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:32
+msgid "About window"
+msgstr ""
+
+#: src/diffuse/constants.py:26
 msgid "Copyright"
 msgstr ""
 
-#: src/diffuse/dialogs.py:40
-msgid "Diffuse is a graphical tool for merging and comparing text files."
-msgstr "Diffuse는 텍스트 파일을 병합하고 비교하기 위한 그래픽 도구입니다."
+#: src/diffuse/dialogs.py:46 src/diffuse/dialogs.py:89 src/diffuse/dialogs.py:133
+#: src/diffuse/preferences.py:254 src/diffuse/preferences.py:483
+#: src/diffuse/window.py:309 src/diffuse/window.py:1107
+msgid "_Cancel"
+msgstr ""
 
-#: src/diffuse/dialogs.py:45
-msgid "translator-credits"
-msgstr "강분도 <bundo@bundo.biz>"
-
-#: src/diffuse/dialogs.py:82
+#: src/diffuse/dialogs.py:50
 msgid "Encoding: "
 msgstr "인코딩: "
 
-#: src/diffuse/dialogs.py:94
+#: src/diffuse/dialogs.py:62
 msgid "Revision: "
 msgstr "수정: "
 
-#: src/diffuse/dialogs.py:156
+#: src/diffuse/dialogs.py:90 src/diffuse/dialogs.py:134
+#: src/diffuse/preferences.py:255
+msgid "_OK"
+msgstr ""
+
+#: src/diffuse/dialogs.py:130
 msgid "Find..."
 msgstr "찾기..."
 
-#: src/diffuse/dialogs.py:164
+#: src/diffuse/dialogs.py:140
 msgid "Search For: "
 msgstr "검색 문자열: "
 
-#: src/diffuse/dialogs.py:189
+#: src/diffuse/dialogs.py:165
 msgid "Match Case"
 msgstr "대소문자 구분"
 
-#: src/diffuse/dialogs.py:194
+#: src/diffuse/dialogs.py:170
 msgid "Search Backwards"
 msgstr "위 방향으로 검색"
 
+#: src/diffuse/main.py:53
+msgid "Display version and copyright information"
+msgstr "버전과 저작권 정보를 표시"
+
+#: src/diffuse/main.py:61
+msgid "Do not read any resource files"
+msgstr "리소스 파일을 읽지 않는다"
+
+#: src/diffuse/main.py:69
+msgid "Specify explicit resource file"
+msgstr "지정된 리소스 파일을 읽습니다"
+
+#: src/diffuse/main.py:77
+msgid "File revisions <rev-1> and <rev>"
+msgstr "<rev> <rev-1>과 <rev>라는 파일 재버전"
+
 #: src/diffuse/main.py:85
-msgid "Close Tab"
-msgstr "탭 닫기"
+msgid "Close all tabs with no differences"
+msgstr "차이가 없다 탭 닫기"
 
-#: src/diffuse/main.py:132
-msgid "Open File..."
-msgstr "열기..."
+#: src/diffuse/main.py:92
+msgid "Use <codec> to read and write files"
+msgstr "<codec> <codec>에서 파일을 읽고"
 
-#: src/diffuse/main.py:133
-msgid "Reload File"
-msgstr "파일을 다시 읽기"
+#: src/diffuse/main.py:100
+msgid "Display <label> instead of the file name"
+msgstr "파일 이름 대신 <label> 표시"
 
-#: src/diffuse/main.py:134
-msgid "Save File"
-msgstr "파일로 저장"
+#: src/diffuse/main.py:108
+msgid "Create a new tab for each modified file"
+msgstr "변경된 파일을 위해 새로운 탭을 만듬"
 
-#: src/diffuse/main.py:135
-msgid "Save File As..."
-msgstr "파일로 저장..."
+#: src/diffuse/main.py:115
+msgid "File revision <rev>"
+msgstr "<rev> <rev>라는 파일 재버전"
 
-#: src/diffuse/main.py:217
-#, python-format
-msgid "Column %d"
-msgstr "%d열"
+#: src/diffuse/main.py:123
+msgid "Create a new tab for each file"
+msgstr "각 파일에 대한 새로운 탭을 만듬"
 
-#: src/diffuse/main.py:291
-msgid "Save changes before loading the new file?"
-msgstr "새 파일을 불러오기 전에 변경된 데이터를 저장할까요?"
+#: src/diffuse/main.py:130
+msgid "Start a new tab"
+msgstr "새 탭에서 시작"
 
-#: src/diffuse/main.py:402
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "%(file)s %(rev)s는 수정된점을 가져올 때 오류가 발생했습니다."
+#: src/diffuse/main.py:137 src/diffuse/preferences.py:159
+msgid "Version control system search order"
+msgstr ""
 
-#: src/diffuse/main.py:405 src/diffuse/main.py:1860
+#: src/diffuse/main.py:145
+msgid "Start with line <line> selected"
+msgstr "선택한 라인 <line>으로 시작"
+
+#: src/diffuse/main.py:153
+msgid "Create a blank file comparison pane"
+msgstr "빈 파일 비교 프레임을 만드는"
+
+#: src/diffuse/main.py:160 src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:95
+msgid "Ignore changes to white space"
+msgstr "빈 변화를 무시"
+
+#: src/diffuse/main.py:167
+msgid "Ignore changes in blank lines"
+msgstr "빈 줄을 무시"
+
+#: src/diffuse/main.py:174 src/diffuse/preferences.py:88
+msgid "Ignore end of line differences"
+msgstr "행의 마지막 차이를 무시"
+
+#: src/diffuse/main.py:181 src/diffuse/preferences.py:84
+msgid "Ignore case differences"
+msgstr "대소문자 차이를 무시"
+
+#: src/diffuse/main.py:188 src/diffuse/preferences.py:85
+msgid "Ignore white space differences"
+msgstr "공백을 차이를 무시"
+
+#: src/diffuse/main.py:191
+msgid ""
+"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 several VCSs for comparison and merging."
+msgstr ""
+
+#: src/diffuse/main.py:247 src/diffuse/window.py:420
 #, python-format
 msgid "Error reading %s."
 msgstr "%s를 읽어올 때 오류가 발생했습니다."
 
-#: src/diffuse/main.py:427
-msgid "Open File"
-msgstr "열기"
-
-#: src/diffuse/main.py:484
-#, python-format
-msgid "The file %s changed on disk. Do you want to reload the file?"
-msgstr "%s 파일이 변경된 것 같습니다. 해당 파일을 다시 불러 오시겠습니까?"
-
-#: src/diffuse/main.py:510
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "%(title)s %(pane)d번째 프레임을 저장"
-
-#: src/diffuse/main.py:542
-#, python-format
-msgid "A file named %s already exists. Do you want to overwrite it?"
-msgstr "%s라는 파일이 이미 있습니다. 그것을 덮어 쓰시겠습니까?"
-
-#: src/diffuse/main.py:549
-#, python-format
-msgid ""
-"The file %s has been modified by another process since reading it. If you save, "
-"all the external changes could be lost. Save anyways?"
-msgstr ""
-"%s 파일은 수정되었습니다. 저장하게되면 이러한 변경 내용이 손실될 수 있습니다. 저장"
-"하시겠습니까?"
-
-#: src/diffuse/main.py:591
-#, python-format
-msgid "Error encoding to %s."
-msgstr "%s 바꾸는 데 오류가 발생했습니다."
-
-#: src/diffuse/main.py:595 src/diffuse/preferences.py:300
-#, python-format
-msgid "Error writing %s."
-msgstr "%s에 쓸 때 오류가 발생했습니다."
-
-#: src/diffuse/main.py:625
-msgid "Go To Line..."
-msgstr "줄로 이동..."
-
-#: src/diffuse/main.py:626
-msgid "Line Number: "
-msgstr "줄번호: "
-
-#: src/diffuse/main.py:657
-msgid ""
-"Press the enter key or double click to edit. Press the space bar or use the RMB "
-"menu to manually align."
-msgstr ""
-"편집하려면 엔터키를 누르거나 두 번 클릭합니다. 수동으로 정렬하기 위해 스페이스 바"
-"를 누르거나, RMB를 사용합니다."
-
-#: src/diffuse/main.py:661
-msgid "Press the escape key to finish editing."
-msgstr "ESC 키를 눌러 편집을 끝냅니다."
-
-#: src/diffuse/main.py:664
-msgid ""
-"Select target line and press the space bar to align. Press the escape key to "
-"cancel."
-msgstr ""
-"목표 행을 선택하고 스페이스 바를 누르면 정렬합니다. 취소하려면 ESC 키를 누르십시"
-"오."
-
-#: src/diffuse/main.py:787
-msgid "_File"
-msgstr "파일(_F)"
-
-#: src/diffuse/main.py:788
-msgid "_Open File..."
-msgstr "파일 열기...(_O)"
-
-#: src/diffuse/main.py:789
-msgid "Open File In New _Tab..."
-msgstr "새 탭에서 열기...(_T)"
-
-#: src/diffuse/main.py:790
-msgid "Open _Modified Files..."
-msgstr "변경 파일 열기...(_M)"
-
-#: src/diffuse/main.py:791
-msgid "Open Commi_t..."
-msgstr "커밋 열기..."
-
-#: src/diffuse/main.py:792
-msgid "_Reload File"
-msgstr "파일 다시 읽기(_R)"
-
-#: src/diffuse/main.py:794
-msgid "_Save File"
-msgstr "파일 저장(_S)"
-
-#: src/diffuse/main.py:795
-msgid "Save File _As..."
-msgstr "파일로 저장...(_A)"
-
-#: src/diffuse/main.py:796
-msgid "Save A_ll"
-msgstr "전체 저장(_L)"
-
-#: src/diffuse/main.py:798
-msgid "New _2-Way File Merge"
-msgstr "새로운 2개의 파일 비교(_2)"
-
-#: src/diffuse/main.py:799
-msgid "New _3-Way File Merge"
-msgstr "새로운 3개의 파일 비교(_3)"
-
-#: src/diffuse/main.py:800
-msgid "New _N-Way File Merge..."
-msgstr "새로운 여러개의 파일 비교...(_N)"
-
-#: src/diffuse/main.py:802
-msgid "_Close Tab"
-msgstr "탭 닫기(_C)"
-
-#: src/diffuse/main.py:803
-msgid "_Undo Close Tab"
-msgstr "탭 닫기 취소(_U)"
-
-#: src/diffuse/main.py:804
-msgid "_Quit"
-msgstr "종료(_Q)"
-
-#: src/diffuse/main.py:807
-msgid "_Edit"
-msgstr "편집(_E)"
-
-#: src/diffuse/main.py:808
-msgid "_Undo"
-msgstr "실행 취소(_U)"
-
-#: src/diffuse/main.py:809
-msgid "_Redo"
-msgstr "다시(_R)"
-
-#: src/diffuse/main.py:811
-msgid "Cu_t"
-msgstr "잘라내기(_T)"
-
-#: src/diffuse/main.py:812
-msgid "_Copy"
-msgstr "복사(_C)"
-
-#: src/diffuse/main.py:813
-msgid "_Paste"
-msgstr "붙여넣기(_P)"
-
-#: src/diffuse/main.py:815
-msgid "Select _All"
-msgstr "모두 선택(_A)"
-
-#: src/diffuse/main.py:816
-msgid "C_lear Edits"
-msgstr "편집 삭제(_L)"
-
-#: src/diffuse/main.py:817
-msgid "_Dismiss All Edits"
-msgstr "모든 편집을 취소(_D)"
-
-#: src/diffuse/main.py:819
-msgid "_Find..."
-msgstr "찾기...(_F)"
-
-#: src/diffuse/main.py:820
-msgid "Find _Next"
-msgstr "다음 찾기(_N)"
-
-#: src/diffuse/main.py:821
-msgid "Find Pre_vious"
-msgstr "이전 찾기(_V)"
-
-#: src/diffuse/main.py:822
-msgid "_Go To Line..."
-msgstr "줄로 이동...(_G)"
-
-#: src/diffuse/main.py:824
-msgid "Pr_eferences..."
-msgstr "기본 설정...(_E)"
-
-#: src/diffuse/main.py:828
-msgid "None"
-msgstr "없음"
-
-#: src/diffuse/main.py:846
-msgid "_View"
-msgstr "보기(_V)"
-
-#: src/diffuse/main.py:847
-msgid "_Syntax Highlighting"
-msgstr "구문 강조(_S)"
-
-#: src/diffuse/main.py:849
-msgid "Re_align All"
-msgstr "전체 다시 정렬(_A)"
-
-#: src/diffuse/main.py:850
-msgid "_Isolate"
-msgstr "분리(_I)"
-
-#: src/diffuse/main.py:852
-msgid "_First Difference"
-msgstr "첫번째 차이(_F)"
-
-#: src/diffuse/main.py:853
-msgid "_Previous Difference"
-msgstr "이전 차이(_P)"
-
-#: src/diffuse/main.py:854
-msgid "_Next Difference"
-msgstr "다음 차이(_N)"
-
-#: src/diffuse/main.py:855
-msgid "_Last Difference"
-msgstr "마지막 차이(_L)"
-
-#: src/diffuse/main.py:857
-msgid "Fir_st Tab"
-msgstr "첫번째 탭(_S)"
-
-#: src/diffuse/main.py:858
-msgid "Pre_vious Tab"
-msgstr "이전 탭으로(_V)"
-
-#: src/diffuse/main.py:859
-msgid "Next _Tab"
-msgstr "다음 탭으로(_T)"
-
-#: src/diffuse/main.py:860
-msgid "Las_t Tab"
-msgstr "마지막 탭(_T)"
-
-#: src/diffuse/main.py:862
-msgid "Shift Pane _Right"
-msgstr "페널을 오른쪽으로 이동(_R)"
-
-#: src/diffuse/main.py:863
-msgid "Shift Pane _Left"
-msgstr "페널을 왼쪽으로 이동(_L)"
-
-#: src/diffuse/main.py:866
-msgid "F_ormat"
-msgstr "형식(_O)"
-
-#: src/diffuse/main.py:867
-msgid "Convert To _Upper Case"
-msgstr "대문자로 변환(_U)"
-
-#: src/diffuse/main.py:868
-msgid "Convert To _Lower Case"
-msgstr "소문자로 변환(_L)"
-
-#: src/diffuse/main.py:870
-msgid "Sort Lines In _Ascending Order"
-msgstr "행을 오름차순으로 정렬(_A)"
-
-#: src/diffuse/main.py:871
-msgid "Sort Lines In D_escending Order"
-msgstr "행을 내림차순으로 정렬(_E)"
-
-#: src/diffuse/main.py:873
-msgid "Remove Trailing _White Space"
-msgstr "후행 공백을 제거(_W)"
-
-#: src/diffuse/main.py:874
-msgid "Convert Tabs To _Spaces"
-msgstr "탭을 공백으로 변환(_S)"
-
-#: src/diffuse/main.py:875
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "선행 공백을 탭으로 변환(_T)"
-
-#: src/diffuse/main.py:877
-msgid "_Increase Indenting"
-msgstr "들여쓰기(_I)"
-
-#: src/diffuse/main.py:878
-msgid "De_crease Indenting"
-msgstr "내어 쓰기(_C)"
-
-#: src/diffuse/main.py:880
-msgid "Convert To _DOS Format"
-msgstr "DOS 형식으로 변환(_D)"
-
-#: src/diffuse/main.py:881
-msgid "Convert To _Mac Format"
-msgstr "Mac 형식으로 변환(_M)"
-
-#: src/diffuse/main.py:882
-msgid "Convert To Uni_x Format"
-msgstr "Unix 형식으로 변환(_X)"
-
-#: src/diffuse/main.py:885
-msgid "_Merge"
-msgstr "병합(_M)"
-
-#: src/diffuse/main.py:886
-msgid "Copy Selection _Right"
-msgstr "선택을 오른쪽으로 복사(_R)"
-
-#: src/diffuse/main.py:887
-msgid "Copy Selection _Left"
-msgstr "선택을 왼쪽으로 복사(_L)"
-
-#: src/diffuse/main.py:889
-msgid "Copy Left _Into Selection"
-msgstr "왼쪽에서 선택한 프레임에 복사(_I)"
-
-#: src/diffuse/main.py:890
-msgid "Copy Right I_nto Selection"
-msgstr "오른쪽에서 선택한 프레임에 복사(_N)"
-
-#: src/diffuse/main.py:891
-msgid "_Merge From Left Then Right"
-msgstr "왼쪽에서 합병 후 오른쪽에서 병합(_M)"
-
-#: src/diffuse/main.py:892
-msgid "M_erge From Right Then Left"
-msgstr "오른쪽에서 병합 후 왼쪽에서 합병(_E)"
-
-#: src/diffuse/main.py:895
-msgid "_Help"
-msgstr "도움말(_H)"
-
-#: src/diffuse/main.py:896
-msgid "_Help Contents..."
-msgstr "도움말 목차...(_H)"
-
-#: src/diffuse/main.py:898
-#, python-format
-msgid "_About %s..."
-msgstr "%s 정보...(_A)"
-
-#: src/diffuse/main.py:913
-msgid "New 2-Way File Merge"
-msgstr "새로운 2개의 파일 비교"
-
-#: src/diffuse/main.py:914
-msgid "New 3-Way File Merge"
-msgstr "새로운 3개의 파일 비교"
-
-#: src/diffuse/main.py:916
-msgid "Realign All"
-msgstr "전체 다시 정렬"
-
-#: src/diffuse/main.py:917
-msgid "First Difference"
-msgstr "첫번째 차이"
-
-#: src/diffuse/main.py:918
-msgid "Previous Difference"
-msgstr "이전 차이"
-
-#: src/diffuse/main.py:919
-msgid "Next Difference"
-msgstr "다음 차이"
-
-#: src/diffuse/main.py:920
-msgid "Last Difference"
-msgstr "마지막 차이"
-
-#: src/diffuse/main.py:922
-msgid "Copy Selection Right"
-msgstr "선택을 오른쪽으로 복사"
-
-#: src/diffuse/main.py:923
-msgid "Copy Selection Left"
-msgstr "선택을 왼쪽으로 복사"
-
-#: src/diffuse/main.py:924
-msgid "Copy Left Into Selection"
-msgstr "왼쪽에서 선택한 프레임에 복사"
-
-#: src/diffuse/main.py:925
-msgid "Copy Right Into Selection"
-msgstr "오른쪽에서 선택한 프레임에 복사"
-
-#: src/diffuse/main.py:926
-msgid "Merge From Left Then Right"
-msgstr "왼쪽에서 합병 후 오른쪽에서 병합"
-
-#: src/diffuse/main.py:927
-msgid "Merge From Right Then Left"
-msgstr "오른쪽에서 병합 후 왼쪽에서 합병"
-
-#: src/diffuse/main.py:929
-msgid "Undo"
-msgstr "실행 취소"
-
-#: src/diffuse/main.py:930
-msgid "Redo"
-msgstr "작업 재 실행"
-
-#: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
-msgid "Cut"
-msgstr "잘라내기"
-
-#: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
-msgid "Copy"
-msgstr "복사"
-
-#: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
-msgid "Paste"
-msgstr "붙여넣기"
-
-#: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
-msgid "Clear Edits"
-msgstr "편집 삭제"
-
-#: src/diffuse/main.py:1057
-msgid "Some files have unsaved changes. Select the files to save before closing."
-msgstr ""
-"변경 내용이 저장되지 않은 파일이 있습니다. 종료하기 전에 저장할 파일을 선택합니다."
-
-#: src/diffuse/main.py:1071
-msgid "Tab"
-msgstr "탭"
-
-#: src/diffuse/main.py:1076
-msgid "Pane"
-msgstr "패널"
-
-#: src/diffuse/main.py:1087
-msgid "Close _Without Saving"
-msgstr "저장하지 않고 닫기(_W)"
-
-#: src/diffuse/main.py:1126
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "이 탭을 닫으면, %s 종료합니다."
-
-#: src/diffuse/main.py:1209
-#, python-format
-msgid "File Merge %d"
-msgstr "파일 병합 %d"
-
-#: src/diffuse/main.py:1315
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "%s의 커밋을 가져오는 동안 오류가 발생했습니다."
-
-#: src/diffuse/main.py:1347
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "%s의 변경을 가져오는 중 오류가 발생했습니다."
-
-#: src/diffuse/main.py:1380
-msgid "Open File In New Tab"
-msgstr "새 탭에서 열기"
-
-#: src/diffuse/main.py:1403
-msgid "Choose Folder With Modified Files"
-msgstr "변경 된 파일이 있는 폴더를 선택"
-
-#: src/diffuse/main.py:1421
-msgid "No modified files found."
-msgstr "변경 된 파일을 찾을 수 없습니다."
-
-#: src/diffuse/main.py:1427
-msgid "Choose Folder With Commit"
-msgstr "커밋이있는 폴더를 선택"
-
-#: src/diffuse/main.py:1447
-msgid "No committed files found."
-msgstr "커밋된 파일을 찾을 수 없습니다."
-
-#: src/diffuse/main.py:1483
-msgid "New N-Way File Merge..."
-msgstr "새로운 여러개의 파일 비교..."
-
-#: src/diffuse/main.py:1484
-msgid "Number of panes: "
-msgstr "패널수: "
-
-#: src/diffuse/main.py:1558
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "문자열을 찾을 수 없습니다. 파일의 끝에서 계속하시겠습니까?"
-
-#: src/diffuse/main.py:1560
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "문자열을 찾을 수 없습니다. 파일의 시작에서 다시하시겠습니까?"
-
-#: src/diffuse/main.py:1781
-#, fuzzy
-msgid ""
-"Usage:\n"
-"    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"
-"also retrieve revisions of files from several VCSs for comparison and merging.\n"
-"\n"
-"Help Options:\n"
-"  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright information\n"
-"\n"
-"Configuration Options:\n"
-"  --no-rcfile                      Do not read any resource files\n"
-"  --rcfile <file>                  Specify explicit resource file\n"
-"\n"
-"General Options:\n"
-"  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
-"  ( -D | --close-if-same )         Close all tabs with no differences\n"
-"  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
-"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
-"  ( -m | --modified )              Create a new tab for each modified file\n"
-"  ( -r | --revision ) <rev>        File revision <rev>\n"
-"  ( -s | --separate )              Create a new tab for each file\n"
-"  ( -t | --tab )                   Start a new tab\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    Start with line <line> selected\n"
-"  --null-file                      Create a blank file comparison pane\n"
-"\n"
-"Display Options:\n"
-"  ( -b | --ignore-space-change )   Ignore changes to white space\n"
-"  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
-"  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
-"  ( -i | --ignore-case )           Ignore case differences\n"
-"  ( -w | --ignore-all-space )      Ignore white space differences"
-msgstr ""
-"사용법:\n"
-"    diffuse [옵션 ...] [파일 ...] ...\n"
-"    diffuse ( -h | -? | --help | -v | --version )\n"
-"\n"
-"Diffuse은 텍스트 파일을 병합하며 비교를 위한 그래픽 도구입니다.  사용자가\n"
-"수동으로 행을 다시 정렬하고, 임의의 숫자를 병행하여 파일을 비교할 수 있습니다.\n"
-"파일을 직접 편집할 수 있습니다. 또한 Diffuse 비교 및 병합하기 위해 Bazaar, CVS,\n"
-"Darcs, Git, Mercurial, Monotone, RCS, Subversion 및 SVK 저장소에서 파일\n"
-"수정된것을 얻을 수 있습니다.\n"
-"\n"
-"도움말 옵션:\n"
-"  ( -h | -? | --help )             이 사용 정보를 보려면\n"
-"  ( -v | --version )               버전과 저작권 정보를 표시\n"
-"\n"
-"구성 옵션\n"
-"  --no-rcfile                      리소스 파일을 읽지 않는다\n"
-"  --rcfile <file>                  지정된 리소스 파일을 읽습니다\n"
-"\n"
-"일반 옵션:\n"
-"  ( -c | --commit )                <rev> <rev-1>과 <rev>라는 파일 재버전\n"
-"  ( -D | --close-if-same )         차이가 없다 탭 닫기\n"
-"  ( -e | --encoding )              <codec> <codec>에서 파일을 읽고\n"
-"  ( -L | --label )                 파일 이름 대신 <label> 표시\n"
-"  ( -m | --modified )              변경된 파일을 위해 새로운 탭을 만듬\n"
-"  ( -r | --revision )              <rev> <rev>라는 파일 재버전\n"
-"  ( -s | --separate )              각 파일에 대한 새로운 탭을 만듬\n"
-"  ( -t | --tab )                   새 탭에서 시작\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    선택한 라인 <line>으로 시작\n"
-"  --null-file                      빈 파일 비교 프레임을 만드는\n"
-"\n"
-"표시 옵션:\n"
-"  ( -b | --ignore-space-change )   빈 변경 사항을 무시\n"
-"  ( -B | --ignore-blank-lines )    빈 줄을 무시\n"
-"  ( -E | --ignore-end-of-line )    행의 마지막을 무시\n"
-"  ( -i | --ignore-case )           대소문자 차이를 무시\n"
-"  ( -w | --ignore-all-space )      공백을 무시"
-
-#: src/diffuse/main.py:1948
+#: src/diffuse/main.py:327
 msgid "Error parsing line number."
 msgstr "줄 번호를 구문 분석하는 동안 오류가 발생했습니다."
 
-#: src/diffuse/main.py:1958
-#, python-format
-msgid "Skipping unknown argument \"%s\"."
-msgstr "알수 없는 인수「%s」 유지 합니다."
-
-#: src/diffuse/main.py:1966
+#: src/diffuse/main.py:343
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "%s 인수를 처리하는 동안 오류가 발생했습니다. 디렉토리를 예측할 수 없습니다."
 
-#: src/diffuse/preferences.py:80
+#: src/diffuse/preferences.py:75
 msgid "Display"
 msgstr "표시"
 
-#: src/diffuse/preferences.py:83
+#: src/diffuse/preferences.py:78
 msgid "Font"
 msgstr "글꼴"
 
-#: src/diffuse/preferences.py:84
+#: src/diffuse/preferences.py:79
 msgid "Tab width"
 msgstr "탭 너비"
 
-#: src/diffuse/preferences.py:85
+#: src/diffuse/preferences.py:80
 msgid "Show right margin"
 msgstr "오른쪽 여백 표시"
 
-#: src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:81
 msgid "Right margin"
 msgstr "오른쪽 여백"
 
-#: src/diffuse/preferences.py:87
+#: src/diffuse/preferences.py:82
 msgid "Show line numbers"
 msgstr "줄번호 표시"
 
-#: src/diffuse/preferences.py:88
+#: src/diffuse/preferences.py:83
 msgid "Show white space characters"
 msgstr "여백 표시"
 
-#: src/diffuse/preferences.py:89
-msgid "Ignore case differences"
-msgstr "대소문자 차이를 무시"
-
-#: src/diffuse/preferences.py:90
-msgid "Ignore white space differences"
-msgstr "공백을 차이를 무시"
-
-#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100
-msgid "Ignore changes to white space"
-msgstr "빈 변화를 무시"
-
-#: src/diffuse/preferences.py:92
+#: src/diffuse/preferences.py:87
 msgid "Ignore blank line differences"
 msgstr "공백 행은 무시"
 
-#: src/diffuse/preferences.py:93
-msgid "Ignore end of line differences"
-msgstr "행의 마지막 차이를 무시"
-
-#: src/diffuse/preferences.py:95
+#: src/diffuse/preferences.py:90
 msgid "Alignment"
 msgstr "정렬"
 
-#: src/diffuse/preferences.py:98
+#: src/diffuse/preferences.py:93
 msgid "Ignore case"
 msgstr "대소문자 무시"
 
-#: src/diffuse/preferences.py:99
+#: src/diffuse/preferences.py:94
 msgid "Ignore white space"
 msgstr "공백을 무시"
 
-#: src/diffuse/preferences.py:101
+#: src/diffuse/preferences.py:96
 msgid "Ignore blank lines"
 msgstr "빈 줄을 무시"
 
-#: src/diffuse/preferences.py:102
+#: src/diffuse/preferences.py:97
 msgid "Ignore end of line characters"
 msgstr "행의 마지막 문자를 무시"
 
-#: src/diffuse/preferences.py:104
+#: src/diffuse/preferences.py:99
 msgid "Editor"
 msgstr "편집기"
 
-#: src/diffuse/preferences.py:107
+#: src/diffuse/preferences.py:102
 msgid "Auto indent"
 msgstr "자동 들여쓰기"
 
-#: src/diffuse/preferences.py:108
+#: src/diffuse/preferences.py:103
 msgid "Expand tabs to spaces"
 msgstr "탭 대신에 공백을 삽입"
 
-#: src/diffuse/preferences.py:109
+#: src/diffuse/preferences.py:104
 msgid "Soft tab width"
 msgstr "소프트 탭 너비"
 
-#: src/diffuse/preferences.py:111
+#: src/diffuse/preferences.py:106
 msgid "Tabs"
 msgstr "탭"
 
-#: src/diffuse/preferences.py:114
+#: src/diffuse/preferences.py:109
 msgid "Default panes"
 msgstr "프레임의 기본 수"
 
-#: src/diffuse/preferences.py:115
+#: src/diffuse/preferences.py:110
 msgid "Always show the tab bar"
 msgstr "항상 탭 모음 표시"
 
-#: src/diffuse/preferences.py:116
+#: src/diffuse/preferences.py:111
 #, python-format
 msgid "Warn me when closing a tab will quit %s"
 msgstr "탭을 닫을때 %s 종료 및 경고"
 
-#: src/diffuse/preferences.py:118
+#: src/diffuse/preferences.py:113
 msgid "Regional Settings"
 msgstr "국가별 설정"
 
-#: src/diffuse/preferences.py:121
+#: src/diffuse/preferences.py:116
 msgid "Default codec"
 msgstr "기본 코덱"
 
-#: src/diffuse/preferences.py:122
+#: src/diffuse/preferences.py:117
 msgid "Order of codecs used to identify encoding"
 msgstr "인코딩을 확인하기 위한 코덱을 주문"
 
-#: src/diffuse/preferences.py:143
+#: src/diffuse/preferences.py:138
 msgid "Cygwin"
 msgstr "Cygwin"
 
-#: src/diffuse/preferences.py:145
+#: src/diffuse/preferences.py:140
 msgid "Root directory"
 msgstr "루트 디렉터리"
 
-#: src/diffuse/preferences.py:146
+#: src/diffuse/preferences.py:141
 msgid "Cygdrive prefix"
 msgstr "Cygdrive 접두어"
 
-#: src/diffuse/preferences.py:165
-msgid "Version control system search order"
-msgstr ""
-
-#: src/diffuse/preferences.py:173
+#: src/diffuse/preferences.py:167
 msgid "\"co\" command"
 msgstr "co 명령어"
 
-#: src/diffuse/preferences.py:174
+#: src/diffuse/preferences.py:168
 msgid "\"rlog\" command"
 msgstr "rlog 명령어"
 
-#: src/diffuse/preferences.py:176
+#: src/diffuse/preferences.py:170
 msgid "Command"
 msgstr "명령어"
 
-#: src/diffuse/preferences.py:182
+#: src/diffuse/preferences.py:176
 msgid "Launch from a Bash login shell"
 msgstr "Bash 로그인 쉘에서 시작"
 
-#: src/diffuse/preferences.py:189
+#: src/diffuse/preferences.py:183
 msgid "Update paths for Cygwin"
 msgstr "Cygwin을 위해 경로를 업데이트"
 
-#: src/diffuse/preferences.py:194
+#: src/diffuse/preferences.py:188
 msgid "Version Control"
 msgstr "버전 컨트롤"
 
-#: src/diffuse/preferences.py:259
+#: src/diffuse/preferences.py:253
 msgid "Preferences"
 msgstr "기본 설정"
 
+#: src/diffuse/preferences.py:294 src/diffuse/window.py:580
+#, python-format
+msgid "Error writing %s."
+msgstr "%s에 쓸 때 오류가 발생했습니다."
+
+#: src/diffuse/preferences.py:483 src/diffuse/window.py:446
+#: src/diffuse/window.py:1413 src/diffuse/window.py:1436 src/diffuse/window.py:1459
+msgid "_Open"
+msgstr ""
+
 #: src/diffuse/resources.py:242 src/diffuse/resources.py:246
 #: src/diffuse/resources.py:249
 #, python-brace-format
@@ -932,16 +413,11 @@ msgstr "{file} {line} 행을 처리하는 도중 오류가 발생했습니다."
 msgid "Auto Detect"
 msgstr "자동추출"
 
-#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97
+#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:96
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "%s 버전을 구문 분석하는 동안 오류가 발생했습니다."
 
-#: src/diffuse/vcs/vcs_registry.py:238
-#, python-format
-msgid "Error parsing %s."
-msgstr "%s를 구문 분석하는 동안 오류가 발생했습니다."
-
 #: src/diffuse/widgets.py:1857
 msgid "Align with Selection"
 msgstr "선택 정렬"
@@ -954,10 +430,640 @@ msgstr "분리"
 msgid "Merge Selection"
 msgstr "선택 병합"
 
+#: src/diffuse/widgets.py:1861 src/diffuse/window.py:865
+msgid "Cut"
+msgstr "잘라내기"
+
+#: src/diffuse/widgets.py:1862 src/diffuse/window.py:866
+msgid "Copy"
+msgstr "복사"
+
+#: src/diffuse/widgets.py:1863 src/diffuse/window.py:867
+msgid "Paste"
+msgstr "붙여넣기"
+
 #: src/diffuse/widgets.py:1865
 msgid "Select All"
 msgstr "모두 선택"
 
+#: src/diffuse/widgets.py:1866 src/diffuse/window.py:868
+msgid "Clear Edits"
+msgstr "편집 삭제"
+
 #: src/diffuse/widgets.py:1868
 msgid "Swap with Selected Pane"
 msgstr "선택된 프레임 대신"
+
+#: src/diffuse/window.py:83
+msgid "Close Tab"
+msgstr "탭 닫기"
+
+#: src/diffuse/window.py:126
+msgid "Open File..."
+msgstr "열기..."
+
+#: src/diffuse/window.py:127
+msgid "Reload File"
+msgstr "파일을 다시 읽기"
+
+#: src/diffuse/window.py:128
+msgid "Save File"
+msgstr "파일로 저장"
+
+#: src/diffuse/window.py:129
+msgid "Save File As..."
+msgstr "파일로 저장..."
+
+#: src/diffuse/window.py:228
+#, python-format
+msgid "Column %d"
+msgstr "%d열"
+
+#: src/diffuse/window.py:306
+msgid "Save changes before loading the new file?"
+msgstr "새 파일을 불러오기 전에 변경된 데이터를 저장할까요?"
+
+#: src/diffuse/window.py:310
+msgid "_No"
+msgstr ""
+
+#: src/diffuse/window.py:311
+msgid "_Yes"
+msgstr ""
+
+#: src/diffuse/window.py:417
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "%(file)s %(rev)s는 수정된점을 가져올 때 오류가 발생했습니다."
+
+#: src/diffuse/window.py:442
+msgid "Open File"
+msgstr "열기"
+
+#: src/diffuse/window.py:495
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "%(title)s %(pane)d번째 프레임을 저장"
+
+#: src/diffuse/window.py:499 src/diffuse/window.py:1111
+#, fuzzy
+msgid "_Save"
+msgstr "파일 저장(_S)"
+
+#: src/diffuse/window.py:527
+#, python-format
+msgid "A file named %s already exists. Do you want to overwrite it?"
+msgstr "%s라는 파일이 이미 있습니다. 그것을 덮어 쓰시겠습니까?"
+
+#: src/diffuse/window.py:534
+#, python-format
+msgid ""
+"The file %s has been modified by another process since reading it. If you save, "
+"all the external changes could be lost. Save anyways?"
+msgstr ""
+"%s 파일은 수정되었습니다. 저장하게되면 이러한 변경 내용이 손실될 수 있습니다. 저장"
+"하시겠습니까?"
+
+#: src/diffuse/window.py:576
+#, python-format
+msgid "Error encoding to %s."
+msgstr "%s 바꾸는 데 오류가 발생했습니다."
+
+#: src/diffuse/window.py:610
+msgid "Go To Line..."
+msgstr "줄로 이동..."
+
+#: src/diffuse/window.py:611
+msgid "Line Number: "
+msgstr "줄번호: "
+
+#: src/diffuse/window.py:642
+msgid ""
+"Press the enter key or double click to edit. Press the space bar or use the RMB "
+"menu to manually align."
+msgstr ""
+"편집하려면 엔터키를 누르거나 두 번 클릭합니다. 수동으로 정렬하기 위해 스페이스 바"
+"를 누르거나, RMB를 사용합니다."
+
+#: src/diffuse/window.py:646
+msgid "Press the escape key to finish editing."
+msgstr "ESC 키를 눌러 편집을 끝냅니다."
+
+#: src/diffuse/window.py:649
+msgid ""
+"Select target line and press the space bar to align. Press the escape key to "
+"cancel."
+msgstr ""
+"목표 행을 선택하고 스페이스 바를 누르면 정렬합니다. 취소하려면 ESC 키를 누르십시"
+"오."
+
+#: src/diffuse/window.py:710
+msgid "_File"
+msgstr "파일(_F)"
+
+#: src/diffuse/window.py:712
+msgid "_Open File..."
+msgstr "파일 열기...(_O)"
+
+#: src/diffuse/window.py:713
+msgid "Open File In New _Tab..."
+msgstr "새 탭에서 열기...(_T)"
+
+#: src/diffuse/window.py:714
+msgid "Open _Modified Files..."
+msgstr "변경 파일 열기...(_M)"
+
+#: src/diffuse/window.py:715
+msgid "Open Commi_t..."
+msgstr "커밋 열기..."
+
+#: src/diffuse/window.py:716
+msgid "_Reload File"
+msgstr "파일 다시 읽기(_R)"
+
+#: src/diffuse/window.py:718
+msgid "_Save File"
+msgstr "파일 저장(_S)"
+
+#: src/diffuse/window.py:719
+msgid "Save File _As..."
+msgstr "파일로 저장...(_A)"
+
+#: src/diffuse/window.py:720
+msgid "Save A_ll"
+msgstr "전체 저장(_L)"
+
+#: src/diffuse/window.py:722
+msgid "New _2-Way File Merge"
+msgstr "새로운 2개의 파일 비교(_2)"
+
+#: src/diffuse/window.py:723
+msgid "New _3-Way File Merge"
+msgstr "새로운 3개의 파일 비교(_3)"
+
+#: src/diffuse/window.py:724
+msgid "New _N-Way File Merge..."
+msgstr "새로운 여러개의 파일 비교...(_N)"
+
+#: src/diffuse/window.py:726
+msgid "_Close Tab"
+msgstr "탭 닫기(_C)"
+
+#: src/diffuse/window.py:727
+msgid "_Undo Close Tab"
+msgstr "탭 닫기 취소(_U)"
+
+#: src/diffuse/window.py:728
+msgid "_Quit"
+msgstr "종료(_Q)"
+
+#: src/diffuse/window.py:732
+msgid "_Edit"
+msgstr "편집(_E)"
+
+#: src/diffuse/window.py:734
+msgid "_Undo"
+msgstr "실행 취소(_U)"
+
+#: src/diffuse/window.py:735
+msgid "_Redo"
+msgstr "다시(_R)"
+
+#: src/diffuse/window.py:737
+msgid "Cu_t"
+msgstr "잘라내기(_T)"
+
+#: src/diffuse/window.py:738
+msgid "_Copy"
+msgstr "복사(_C)"
+
+#: src/diffuse/window.py:739
+msgid "_Paste"
+msgstr "붙여넣기(_P)"
+
+#: src/diffuse/window.py:741
+msgid "Select _All"
+msgstr "모두 선택(_A)"
+
+#: src/diffuse/window.py:742
+msgid "C_lear Edits"
+msgstr "편집 삭제(_L)"
+
+#: src/diffuse/window.py:743
+msgid "_Dismiss All Edits"
+msgstr "모든 편집을 취소(_D)"
+
+#: src/diffuse/window.py:745
+msgid "_Find..."
+msgstr "찾기...(_F)"
+
+#: src/diffuse/window.py:746
+msgid "Find _Next"
+msgstr "다음 찾기(_N)"
+
+#: src/diffuse/window.py:747
+msgid "Find Pre_vious"
+msgstr "이전 찾기(_V)"
+
+#: src/diffuse/window.py:748
+msgid "_Go To Line..."
+msgstr "줄로 이동...(_G)"
+
+#: src/diffuse/window.py:750
+msgid "Pr_eferences..."
+msgstr "기본 설정...(_E)"
+
+#: src/diffuse/window.py:754
+msgid "None"
+msgstr "없음"
+
+#: src/diffuse/window.py:776
+msgid "_View"
+msgstr "보기(_V)"
+
+#: src/diffuse/window.py:778
+msgid "_Syntax Highlighting"
+msgstr "구문 강조(_S)"
+
+#: src/diffuse/window.py:780
+msgid "Re_align All"
+msgstr "전체 다시 정렬(_A)"
+
+#: src/diffuse/window.py:781
+msgid "_Isolate"
+msgstr "분리(_I)"
+
+#: src/diffuse/window.py:783
+msgid "_First Difference"
+msgstr "첫번째 차이(_F)"
+
+#: src/diffuse/window.py:784
+msgid "_Previous Difference"
+msgstr "이전 차이(_P)"
+
+#: src/diffuse/window.py:785
+msgid "_Next Difference"
+msgstr "다음 차이(_N)"
+
+#: src/diffuse/window.py:786
+msgid "_Last Difference"
+msgstr "마지막 차이(_L)"
+
+#: src/diffuse/window.py:788
+msgid "Fir_st Tab"
+msgstr "첫번째 탭(_S)"
+
+#: src/diffuse/window.py:789
+msgid "Pre_vious Tab"
+msgstr "이전 탭으로(_V)"
+
+#: src/diffuse/window.py:790
+msgid "Next _Tab"
+msgstr "다음 탭으로(_T)"
+
+#: src/diffuse/window.py:791
+msgid "Las_t Tab"
+msgstr "마지막 탭(_T)"
+
+#: src/diffuse/window.py:793
+msgid "Shift Pane _Right"
+msgstr "페널을 오른쪽으로 이동(_R)"
+
+#: src/diffuse/window.py:794
+msgid "Shift Pane _Left"
+msgstr "페널을 왼쪽으로 이동(_L)"
+
+#: src/diffuse/window.py:798
+msgid "F_ormat"
+msgstr "형식(_O)"
+
+#: src/diffuse/window.py:800
+msgid "Convert To _Upper Case"
+msgstr "대문자로 변환(_U)"
+
+#: src/diffuse/window.py:801
+msgid "Convert To _Lower Case"
+msgstr "소문자로 변환(_L)"
+
+#: src/diffuse/window.py:803
+msgid "Sort Lines In _Ascending Order"
+msgstr "행을 오름차순으로 정렬(_A)"
+
+#: src/diffuse/window.py:804
+msgid "Sort Lines In D_escending Order"
+msgstr "행을 내림차순으로 정렬(_E)"
+
+#: src/diffuse/window.py:806
+msgid "Remove Trailing _White Space"
+msgstr "후행 공백을 제거(_W)"
+
+#: src/diffuse/window.py:807
+msgid "Convert Tabs To _Spaces"
+msgstr "탭을 공백으로 변환(_S)"
+
+#: src/diffuse/window.py:808
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "선행 공백을 탭으로 변환(_T)"
+
+#: src/diffuse/window.py:810
+msgid "_Increase Indenting"
+msgstr "들여쓰기(_I)"
+
+#: src/diffuse/window.py:811
+msgid "De_crease Indenting"
+msgstr "내어 쓰기(_C)"
+
+#: src/diffuse/window.py:813
+msgid "Convert To _DOS Format"
+msgstr "DOS 형식으로 변환(_D)"
+
+#: src/diffuse/window.py:814
+msgid "Convert To _Mac Format"
+msgstr "Mac 형식으로 변환(_M)"
+
+#: src/diffuse/window.py:815
+msgid "Convert To Uni_x Format"
+msgstr "Unix 형식으로 변환(_X)"
+
+#: src/diffuse/window.py:819
+msgid "_Merge"
+msgstr "병합(_M)"
+
+#: src/diffuse/window.py:821
+msgid "Copy Selection _Right"
+msgstr "선택을 오른쪽으로 복사(_R)"
+
+#: src/diffuse/window.py:822
+msgid "Copy Selection _Left"
+msgstr "선택을 왼쪽으로 복사(_L)"
+
+#: src/diffuse/window.py:824
+msgid "Copy Left _Into Selection"
+msgstr "왼쪽에서 선택한 프레임에 복사(_I)"
+
+#: src/diffuse/window.py:825
+msgid "Copy Right I_nto Selection"
+msgstr "오른쪽에서 선택한 프레임에 복사(_N)"
+
+#: src/diffuse/window.py:826
+msgid "_Merge From Left Then Right"
+msgstr "왼쪽에서 합병 후 오른쪽에서 병합(_M)"
+
+#: src/diffuse/window.py:827
+msgid "M_erge From Right Then Left"
+msgstr "오른쪽에서 병합 후 왼쪽에서 합병(_E)"
+
+#: src/diffuse/window.py:831
+msgid "_Help"
+msgstr "도움말(_H)"
+
+#: src/diffuse/window.py:833
+msgid "_Help Contents..."
+msgstr "도움말 목차...(_H)"
+
+#: src/diffuse/window.py:835
+#, python-format
+msgid "_About %s..."
+msgstr "%s 정보...(_A)"
+
+#: src/diffuse/window.py:847
+msgid "New 2-Way File Merge"
+msgstr "새로운 2개의 파일 비교"
+
+#: src/diffuse/window.py:848
+msgid "New 3-Way File Merge"
+msgstr "새로운 3개의 파일 비교"
+
+#: src/diffuse/window.py:850
+msgid "Realign All"
+msgstr "전체 다시 정렬"
+
+#: src/diffuse/window.py:851
+msgid "First Difference"
+msgstr "첫번째 차이"
+
+#: src/diffuse/window.py:852
+msgid "Previous Difference"
+msgstr "이전 차이"
+
+#: src/diffuse/window.py:853
+msgid "Next Difference"
+msgstr "다음 차이"
+
+#: src/diffuse/window.py:854
+msgid "Last Difference"
+msgstr "마지막 차이"
+
+#: src/diffuse/window.py:856
+msgid "Copy Selection Right"
+msgstr "선택을 오른쪽으로 복사"
+
+#: src/diffuse/window.py:857
+msgid "Copy Selection Left"
+msgstr "선택을 왼쪽으로 복사"
+
+#: src/diffuse/window.py:858
+msgid "Copy Left Into Selection"
+msgstr "왼쪽에서 선택한 프레임에 복사"
+
+#: src/diffuse/window.py:859
+msgid "Copy Right Into Selection"
+msgstr "오른쪽에서 선택한 프레임에 복사"
+
+#: src/diffuse/window.py:860
+msgid "Merge From Left Then Right"
+msgstr "왼쪽에서 합병 후 오른쪽에서 병합"
+
+#: src/diffuse/window.py:861
+msgid "Merge From Right Then Left"
+msgstr "오른쪽에서 병합 후 왼쪽에서 합병"
+
+#: src/diffuse/window.py:863
+msgid "Undo"
+msgstr "실행 취소"
+
+#: src/diffuse/window.py:864
+msgid "Redo"
+msgstr "작업 재 실행"
+
+#: src/diffuse/window.py:950
+msgid "Changes detected"
+msgstr ""
+
+#: src/diffuse/window.py:954
+#, fuzzy, python-format
+msgid ""
+"The file \"%s\" changed on disk.\n"
+"\n"
+"Do you want to reload the file?"
+msgstr "%s 파일이 변경된 것 같습니다. 해당 파일을 다시 불러 오시겠습니까?"
+
+#: src/diffuse/window.py:959
+#, fuzzy, python-format
+msgid ""
+"The following files changed on disk:\n"
+"%s\n"
+"\n"
+"Do you want to reload these files?"
+msgstr "%s 파일이 변경된 것 같습니다. 해당 파일을 다시 불러 오시겠습니까?"
+
+#: src/diffuse/window.py:1078
+msgid "Some files have unsaved changes. Select the files to save before closing."
+msgstr ""
+"변경 내용이 저장되지 않은 파일이 있습니다. 종료하기 전에 저장할 파일을 선택합니다."
+
+#: src/diffuse/window.py:1092
+msgid "Tab"
+msgstr "탭"
+
+#: src/diffuse/window.py:1097
+msgid "Pane"
+msgstr "패널"
+
+#: src/diffuse/window.py:1108
+msgid "Close _Without Saving"
+msgstr "저장하지 않고 닫기(_W)"
+
+#: src/diffuse/window.py:1147
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "이 탭을 닫으면, %s 종료합니다."
+
+#: src/diffuse/window.py:1224
+#, python-format
+msgid "File Merge %d"
+msgstr "파일 병합 %d"
+
+#: src/diffuse/window.py:1344
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "%s의 커밋을 가져오는 동안 오류가 발생했습니다."
+
+#: src/diffuse/window.py:1376
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "%s의 변경을 가져오는 중 오류가 발생했습니다."
+
+#: src/diffuse/window.py:1409
+msgid "Open File In New Tab"
+msgstr "새 탭에서 열기"
+
+#: src/diffuse/window.py:1432
+msgid "Choose Folder With Modified Files"
+msgstr "변경 된 파일이 있는 폴더를 선택"
+
+#: src/diffuse/window.py:1450
+msgid "No modified files found."
+msgstr "변경 된 파일을 찾을 수 없습니다."
+
+#: src/diffuse/window.py:1456
+msgid "Choose Folder With Commit"
+msgstr "커밋이있는 폴더를 선택"
+
+#: src/diffuse/window.py:1476
+msgid "No committed files found."
+msgstr "커밋된 파일을 찾을 수 없습니다."
+
+#: src/diffuse/window.py:1512
+msgid "New N-Way File Merge..."
+msgstr "새로운 여러개의 파일 비교..."
+
+#: src/diffuse/window.py:1513
+msgid "Number of panes: "
+msgstr "패널수: "
+
+#: src/diffuse/window.py:1587
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "문자열을 찾을 수 없습니다. 파일의 끝에서 계속하시겠습니까?"
+
+#: src/diffuse/window.py:1589
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "문자열을 찾을 수 없습니다. 파일의 시작에서 다시하시겠습니까?"
+
+#: src/diffuse/window.py:1762
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr "Diffuse는 텍스트 파일을 병합하고 비교하기 위한 그래픽 도구입니다."
+
+#: src/diffuse/window.py:1766
+msgid "translator-credits"
+msgstr "강분도 <bundo@bundo.biz>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage:\n"
+#~ "    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"
+#~ "also retrieve revisions of files from several VCSs for comparison and "
+#~ "merging.\n"
+#~ "\n"
+#~ "Help Options:\n"
+#~ "  ( -h | -? | --help )             Display this usage information\n"
+#~ "  ( -v | --version )               Display version and copyright information\n"
+#~ "\n"
+#~ "Configuration Options:\n"
+#~ "  --no-rcfile                      Do not read any resource files\n"
+#~ "  --rcfile <file>                  Specify explicit resource file\n"
+#~ "\n"
+#~ "General Options:\n"
+#~ "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
+#~ "  ( -D | --close-if-same )         Close all tabs with no differences\n"
+#~ "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+#~ "  ( -L | --label ) <label>         Display <label> instead of the file name\n"
+#~ "  ( -m | --modified )              Create a new tab for each modified file\n"
+#~ "  ( -r | --revision ) <rev>        File revision <rev>\n"
+#~ "  ( -s | --separate )              Create a new tab for each file\n"
+#~ "  ( -t | --tab )                   Start a new tab\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    Start with line <line> selected\n"
+#~ "  --null-file                      Create a blank file comparison pane\n"
+#~ "\n"
+#~ "Display Options:\n"
+#~ "  ( -b | --ignore-space-change )   Ignore changes to white space\n"
+#~ "  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
+#~ "  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
+#~ "  ( -i | --ignore-case )           Ignore case differences\n"
+#~ "  ( -w | --ignore-all-space )      Ignore white space differences"
+#~ msgstr ""
+#~ "사용법:\n"
+#~ "    diffuse [옵션 ...] [파일 ...] ...\n"
+#~ "    diffuse ( -h | -? | --help | -v | --version )\n"
+#~ "\n"
+#~ "Diffuse은 텍스트 파일을 병합하며 비교를 위한 그래픽 도구입니다.  사용자가\n"
+#~ "수동으로 행을 다시 정렬하고, 임의의 숫자를 병행하여 파일을 비교할 수 있습니"
+#~ "다.\n"
+#~ "파일을 직접 편집할 수 있습니다. 또한 Diffuse 비교 및 병합하기 위해 Bazaar, "
+#~ "CVS,\n"
+#~ "Darcs, Git, Mercurial, Monotone, RCS, Subversion 및 SVK 저장소에서 파일\n"
+#~ "수정된것을 얻을 수 있습니다.\n"
+#~ "\n"
+#~ "도움말 옵션:\n"
+#~ "  ( -h | -? | --help )             이 사용 정보를 보려면\n"
+#~ "  ( -v | --version )               버전과 저작권 정보를 표시\n"
+#~ "\n"
+#~ "구성 옵션\n"
+#~ "  --no-rcfile                      리소스 파일을 읽지 않는다\n"
+#~ "  --rcfile <file>                  지정된 리소스 파일을 읽습니다\n"
+#~ "\n"
+#~ "일반 옵션:\n"
+#~ "  ( -c | --commit )                <rev> <rev-1>과 <rev>라는 파일 재버전\n"
+#~ "  ( -D | --close-if-same )         차이가 없다 탭 닫기\n"
+#~ "  ( -e | --encoding )              <codec> <codec>에서 파일을 읽고\n"
+#~ "  ( -L | --label )                 파일 이름 대신 <label> 표시\n"
+#~ "  ( -m | --modified )              변경된 파일을 위해 새로운 탭을 만듬\n"
+#~ "  ( -r | --revision )              <rev> <rev>라는 파일 재버전\n"
+#~ "  ( -s | --separate )              각 파일에 대한 새로운 탭을 만듬\n"
+#~ "  ( -t | --tab )                   새 탭에서 시작\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    선택한 라인 <line>으로 시작\n"
+#~ "  --null-file                      빈 파일 비교 프레임을 만드는\n"
+#~ "\n"
+#~ "표시 옵션:\n"
+#~ "  ( -b | --ignore-space-change )   빈 변경 사항을 무시\n"
+#~ "  ( -B | --ignore-blank-lines )    빈 줄을 무시\n"
+#~ "  ( -E | --ignore-end-of-line )    행의 마지막을 무시\n"
+#~ "  ( -i | --ignore-case )           대소문자 차이를 무시\n"
+#~ "  ( -w | --ignore-all-space )      공백을 무시"
diff --git a/po/nl.po b/po/nl.po
index d7e09d7..5c6d2fd 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-14 16:24-0500\n"
+"POT-Creation-Date: 2023-04-16 14:09-0400\n"
 "PO-Revision-Date: 2023-04-11 21:49+0200\n"
 "Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
 "Language-Team: Dutch\n"
@@ -25,694 +25,147 @@ msgstr "Diffuse"
 #: data/io.github.mightycreak.Diffuse.desktop.in:4
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:5
 msgid "Graphical tool for merging and comparing text files"
-msgstr ""
-"Grafische toepassing voor het vergelijken en samenvoegen van tekstbestanden"
+msgstr "Grafische toepassing voor het vergelijken en samenvoegen van tekstbestanden"
 
 #: 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, and "
+"Subversion repositories."
 msgstr ""
 "Diffuse is een grafische toepassing voor het vergelijken en samenvoegen van "
-"tekstbestanden. Er kunnen bestanden uit Bazaar-, CVS-, Darcs-, Git-, "
-"Mercurial-, Monotone-, RCS-, Subversion- en SVK-repo's worden ingelezen."
+"tekstbestanden. Er kunnen bestanden uit Bazaar-, CVS-, Darcs-, Git-, Mercurial-, "
+"Monotone-, RCS-, en Subversion-repo's worden ingelezen."
 
-#: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
-msgid "Main window: diff between two files"
-msgstr "Hoofdvenster: verschil tussen twee bestanden"
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:28
+msgid "Main window"
+msgstr "Hoofdvenster"
 
-#: src/diffuse/constants.py:25
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:32
+msgid "About window"
+msgstr ""
+
+#: src/diffuse/constants.py:26
 msgid "Copyright"
 msgstr "Copyright"
 
-#: src/diffuse/dialogs.py:41
-msgid "Diffuse is a graphical tool for merging and comparing text files."
+#: src/diffuse/dialogs.py:46 src/diffuse/dialogs.py:89 src/diffuse/dialogs.py:133
+#: src/diffuse/preferences.py:254 src/diffuse/preferences.py:483
+#: src/diffuse/window.py:309 src/diffuse/window.py:1107
+msgid "_Cancel"
 msgstr ""
-"Diffuse is een grafische toepassing voor het vergelijken en samenvoegen van "
-"tekstbestanden."
 
-#: src/diffuse/dialogs.py:46
-msgid "translator-credits"
-msgstr "Heimen Stoffels <vistausss@fastmail.com>"
-
-#: src/diffuse/dialogs.py:83
+#: src/diffuse/dialogs.py:50
 msgid "Encoding: "
 msgstr "Tekenset: "
 
-#: src/diffuse/dialogs.py:95
+#: src/diffuse/dialogs.py:62
 msgid "Revision: "
 msgstr "Revisie: "
 
-#: src/diffuse/dialogs.py:163
+#: src/diffuse/dialogs.py:90 src/diffuse/dialogs.py:134
+#: src/diffuse/preferences.py:255
+msgid "_OK"
+msgstr ""
+
+#: src/diffuse/dialogs.py:130
 msgid "Find..."
 msgstr "Zoeken…"
 
-#: src/diffuse/dialogs.py:173
+#: src/diffuse/dialogs.py:140
 msgid "Search For: "
 msgstr "Zoeken naar: "
 
-#: src/diffuse/dialogs.py:198
+#: src/diffuse/dialogs.py:165
 msgid "Match Case"
 msgstr "Hoofdlettergevoelig"
 
-#: src/diffuse/dialogs.py:203
+#: src/diffuse/dialogs.py:170
 msgid "Search Backwards"
 msgstr "Achterwaarts zoeken"
 
-#: src/diffuse/main.py:84
-msgid "Close Tab"
-msgstr "Tabblad sluiten"
-
-#: src/diffuse/main.py:131
-msgid "Open File..."
-msgstr "Bestand openen…"
-
-#: src/diffuse/main.py:132
-msgid "Reload File"
-msgstr "Bestand herladen"
-
-#: src/diffuse/main.py:133
-msgid "Save File"
-msgstr "Bestand opslaan"
-
-#: src/diffuse/main.py:134
-msgid "Save File As..."
-msgstr "Bestand opslaan als…"
-
-#: src/diffuse/main.py:229
-#, python-format
-msgid "Column %d"
-msgstr "Kolom %d"
-
-#: src/diffuse/main.py:303
-msgid "Save changes before loading the new file?"
-msgstr "Wilt u de wijzigingen opslaan alvorens het nieuwe bestand te laden?"
-
-#: src/diffuse/main.py:414
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "Revisie %(rev)s van %(file)s kan niet worden ingelezen."
-
-#: src/diffuse/main.py:417 src/diffuse/main.py:2004
-#, python-format
-msgid "Error reading %s."
-msgstr "‘%s’ kan niet worden ingelezen."
-
-#: src/diffuse/main.py:439
-msgid "Open File"
-msgstr "Bestand openen"
-
-#: src/diffuse/main.py:492
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "%(title)s-paneel %(pane)d opslaan"
-
-#: src/diffuse/main.py:524
-#, python-format
-msgid "A file named %s already exists. Do you want to overwrite it?"
-msgstr "Er is al een bestand genaamd “%s”. Wilt u dit bestand overschrijven?"
-
-#: src/diffuse/main.py:531
-#, 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?"
+#: src/diffuse/main.py:53
+msgid "Display version and copyright information"
 msgstr ""
-"‘%s’ is sinds het inlezen gewijzigd door een ander proces. Als u het bestand "
-"nu opslaan, dan worden alle externe wijzigingen gewist. Wilt u het bestand "
-"opslaan?"
 
-#: src/diffuse/main.py:573
-#, python-format
-msgid "Error encoding to %s."
-msgstr "Het omzetten naar %s is mislukt."
-
-#: src/diffuse/main.py:577 src/diffuse/preferences.py:300
-#, python-format
-msgid "Error writing %s."
-msgstr "‘%s’ kan niet worden weggeschreven."
-
-#: src/diffuse/main.py:607
-msgid "Go To Line..."
-msgstr "Ga naar regel…"
-
-#: src/diffuse/main.py:608
-msgid "Line Number: "
-msgstr "Regelnummer: "
-
-#: src/diffuse/main.py:639
-msgid ""
-"Press the enter key or double click to edit. Press the space bar or use the "
-"RMB menu to manually align."
-msgstr ""
-"Druk op de entertoets of dubbelklik om te bewerken. Druk op de spatiebalk of "
-"gebruik het RMB-menu om handmatig uit te lijnen."
-
-#: src/diffuse/main.py:643
-msgid "Press the escape key to finish editing."
-msgstr "Druk op de escapetoets om af te ronden."
-
-#: src/diffuse/main.py:646
-msgid ""
-"Select target line and press the space bar to align. Press the escape key to "
-"cancel."
-msgstr ""
-"Kies de desbetreffende regel en druk op de spatiebalk om uit te lijnen. Druk "
-"op de escapetoets om te annuleren."
-
-#: src/diffuse/main.py:768
-msgid "_File"
-msgstr "_Bestand"
-
-#: src/diffuse/main.py:770
-msgid "_Open File..."
-msgstr "Bestand _openen…"
-
-#: src/diffuse/main.py:771
-msgid "Open File In New _Tab..."
-msgstr "Bestand openen op nieuw _tabblad…"
-
-#: src/diffuse/main.py:772
-msgid "Open _Modified Files..."
-msgstr "Be_werkte bestanden openen…"
-
-#: src/diffuse/main.py:773
-msgid "Open Commi_t..."
-msgstr "Commi_t openen…"
-
-#: src/diffuse/main.py:774
-msgid "_Reload File"
-msgstr "Bestand he_rladen"
-
-#: src/diffuse/main.py:776
-msgid "_Save File"
-msgstr "Bestand op_slaan"
-
-#: src/diffuse/main.py:777
-msgid "Save File _As..."
-msgstr "Bestand opslaan _als…"
-
-#: src/diffuse/main.py:778
-msgid "Save A_ll"
-msgstr "A_lles opslaan"
-
-#: src/diffuse/main.py:780
-msgid "New _2-Way File Merge"
-msgstr "Nieuwe samenvoegmethode in _2 richtingen"
-
-#: src/diffuse/main.py:781
-msgid "New _3-Way File Merge"
-msgstr "Nieuwe samenvoegmethode in _3 richtingen"
-
-#: src/diffuse/main.py:782
-msgid "New _N-Way File Merge..."
-msgstr "Nieuwe samenvoegmethode in _x-aantal richtingen…"
-
-#: src/diffuse/main.py:784
-msgid "_Close Tab"
-msgstr "Tab_blad sluiten"
-
-#: src/diffuse/main.py:785
-msgid "_Undo Close Tab"
-msgstr "Tabbla_d heropenen"
-
-#: src/diffuse/main.py:786
-msgid "_Quit"
-msgstr "_Afsluiten"
-
-#: src/diffuse/main.py:790
-msgid "_Edit"
-msgstr "B_ewerken"
-
-#: src/diffuse/main.py:792
-msgid "_Undo"
-msgstr "On_gedaan maken"
-
-#: src/diffuse/main.py:793
-msgid "_Redo"
-msgstr "Opnieuw uitvoe_ren"
-
-#: src/diffuse/main.py:795
-msgid "Cu_t"
-msgstr "Kn_ippen"
-
-#: src/diffuse/main.py:796
-msgid "_Copy"
-msgstr "_Kopiëren"
-
-#: src/diffuse/main.py:797
-msgid "_Paste"
-msgstr "_Plakken"
-
-#: src/diffuse/main.py:799
-msgid "Select _All"
-msgstr "_Alles selecteren"
-
-#: src/diffuse/main.py:800
-msgid "C_lear Edits"
-msgstr "Bewerkingen _wissen"
-
-#: src/diffuse/main.py:801
-msgid "_Dismiss All Edits"
-msgstr "Alle bewerkingen wi_ssen"
-
-#: src/diffuse/main.py:803
-msgid "_Find..."
-msgstr "_Zoeken…"
-
-#: src/diffuse/main.py:804
-msgid "Find _Next"
-msgstr "Volge_nde zoeken"
-
-#: src/diffuse/main.py:805
-msgid "Find Pre_vious"
-msgstr "_Vorige zoeken"
-
-#: src/diffuse/main.py:806
-msgid "_Go To Line..."
-msgstr "_Ga naar regel…"
-
-#: src/diffuse/main.py:808
-msgid "Pr_eferences..."
-msgstr "Voork_euren…"
-
-#: src/diffuse/main.py:812
-msgid "None"
-msgstr "Geen"
-
-#: src/diffuse/main.py:834
-msgid "_View"
-msgstr "_Beeld"
-
-#: src/diffuse/main.py:836
-msgid "_Syntax Highlighting"
-msgstr "_Syntaxismarkering"
-
-#: src/diffuse/main.py:838
-msgid "Re_align All"
-msgstr "_Alles opnieuw uitlijnen"
-
-#: src/diffuse/main.py:839
-msgid "_Isolate"
-msgstr "Afs_chermen"
-
-#: src/diffuse/main.py:841
-msgid "_First Difference"
-msgstr "Eerste _verschil"
-
-#: src/diffuse/main.py:842
-msgid "_Previous Difference"
-msgstr "_Vorige verschil"
-
-#: src/diffuse/main.py:843
-msgid "_Next Difference"
-msgstr "Volge_nde verschil"
-
-#: src/diffuse/main.py:844
-msgid "_Last Difference"
-msgstr "_Laatste verschil"
-
-#: src/diffuse/main.py:846
-msgid "Fir_st Tab"
-msgstr "Eer_ste tabblad"
-
-#: src/diffuse/main.py:847
-msgid "Pre_vious Tab"
-msgstr "_Vorig tabblad"
-
-#: src/diffuse/main.py:848
-msgid "Next _Tab"
-msgstr "Volgend _tabblad"
-
-#: src/diffuse/main.py:849
-msgid "Las_t Tab"
-msgstr "Laats_te tabblad"
-
-#: src/diffuse/main.py:851
-msgid "Shift Pane _Right"
-msgstr "Paneel naar _rechts verplaatsen"
-
-#: src/diffuse/main.py:852
-msgid "Shift Pane _Left"
-msgstr "Paneel naar _links verplaatsen"
-
-#: src/diffuse/main.py:856
-msgid "F_ormat"
-msgstr "_Opmaak"
-
-#: src/diffuse/main.py:858
-msgid "Convert To _Upper Case"
-msgstr "Omzetten naar hoo_fdletters"
-
-#: src/diffuse/main.py:859
-msgid "Convert To _Lower Case"
-msgstr "Omzetten naar k_leine letters"
-
-#: src/diffuse/main.py:861
-msgid "Sort Lines In _Ascending Order"
-msgstr "Regels o_plopend sorteren"
-
-#: src/diffuse/main.py:862
-msgid "Sort Lines In D_escending Order"
-msgstr "Regels _aflopend sorteren"
-
-#: src/diffuse/main.py:864
-msgid "Remove Trailing _White Space"
-msgstr "_Witruimten aan regeleinden wissen"
-
-#: src/diffuse/main.py:865
-msgid "Convert Tabs To _Spaces"
-msgstr "Tabs omzetten naar _spaties"
-
-#: src/diffuse/main.py:866
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "Spaties aan begin van regels omzetten naar _tabs"
-
-#: src/diffuse/main.py:868
-msgid "_Increase Indenting"
-msgstr "_Inspringing vergroten"
-
-#: src/diffuse/main.py:869
-msgid "De_crease Indenting"
-msgstr "Insprin_ging verkleinen"
-
-#: src/diffuse/main.py:871
-msgid "Convert To _DOS Format"
-msgstr "Omzetten naar _DOS-opmaak"
-
-#: src/diffuse/main.py:872
-msgid "Convert To _Mac Format"
-msgstr "Omzetten naar _Mac-opmaak"
-
-#: src/diffuse/main.py:873
-msgid "Convert To Uni_x Format"
-msgstr "Omzetten naar Uni_x-opmaak"
-
-#: src/diffuse/main.py:877
-msgid "_Merge"
-msgstr "Sa_menvoegen"
-
-#: src/diffuse/main.py:879
-msgid "Copy Selection _Right"
-msgstr "Selectie aan _rechterzijde kopiëren"
-
-#: src/diffuse/main.py:880
-msgid "Copy Selection _Left"
-msgstr "Selectie aan _linkerzijde kopiëren"
-
-#: src/diffuse/main.py:882
-msgid "Copy Left _Into Selection"
-msgstr "_Linkerzijde naar selectie kopiëren"
-
-#: src/diffuse/main.py:883
-msgid "Copy Right I_nto Selection"
-msgstr "_Rechterzijde naar selectie kopiëren"
-
-#: src/diffuse/main.py:884
-msgid "_Merge From Left Then Right"
-msgstr "Sa_menvoegen van links naar rechts"
-
-#: src/diffuse/main.py:885
-msgid "M_erge From Right Then Left"
-msgstr "Sam_envoegen van rechts naar links"
-
-#: src/diffuse/main.py:889
-msgid "_Help"
-msgstr "_Hulp"
-
-#: src/diffuse/main.py:891
-msgid "_Help Contents..."
-msgstr "_Zelfstudie…"
-
-#: src/diffuse/main.py:893
-#, python-format
-msgid "_About %s..."
-msgstr "_Over %s…"
-
-#: src/diffuse/main.py:908
-msgid "New 2-Way File Merge"
-msgstr "Nieuwe samenvoegmethode in 2 richtingen"
-
-#: src/diffuse/main.py:909
-msgid "New 3-Way File Merge"
-msgstr "Nieuwe samenvoegmethode in 3 richtingen"
-
-#: src/diffuse/main.py:911
-msgid "Realign All"
-msgstr "Alles opnieuw uitlijnen"
-
-#: src/diffuse/main.py:912
-msgid "First Difference"
-msgstr "Eerste verschil"
-
-#: src/diffuse/main.py:913
-msgid "Previous Difference"
-msgstr "Vorig verschil"
-
-#: src/diffuse/main.py:914
-msgid "Next Difference"
-msgstr "Volgend verschil"
-
-#: src/diffuse/main.py:915
-msgid "Last Difference"
-msgstr "Laatste verschil"
-
-#: src/diffuse/main.py:917
-msgid "Copy Selection Right"
-msgstr "Selectie aan rechterzijde kopiëren"
-
-#: src/diffuse/main.py:918
-msgid "Copy Selection Left"
-msgstr "Selectie aan linkerzijde kopiëren"
-
-#: src/diffuse/main.py:919
-msgid "Copy Left Into Selection"
-msgstr "Linkerzijde naar selectie kopiëren"
-
-#: src/diffuse/main.py:920
-msgid "Copy Right Into Selection"
-msgstr "Rechterzijde naar selectie kopiëren"
-
-#: src/diffuse/main.py:921
-msgid "Merge From Left Then Right"
-msgstr "Samenvoegen van links naar rechts"
-
-#: src/diffuse/main.py:922
-msgid "Merge From Right Then Left"
-msgstr "Samenvoegen van rechts naar links"
-
-#: src/diffuse/main.py:924
-msgid "Undo"
-msgstr "Ongedaan maken"
-
-#: src/diffuse/main.py:925
-msgid "Redo"
-msgstr "Opnieuw uitvoeren"
-
-#: src/diffuse/main.py:926 src/diffuse/widgets.py:1861
-msgid "Cut"
-msgstr "Knippen"
-
-#: src/diffuse/main.py:927 src/diffuse/widgets.py:1862
-msgid "Copy"
-msgstr "Kopiëren"
-
-#: src/diffuse/main.py:928 src/diffuse/widgets.py:1863
-msgid "Paste"
-msgstr "Plakken"
-
-#: src/diffuse/main.py:929 src/diffuse/widgets.py:1866
-msgid "Clear Edits"
-msgstr "Bewerkingen wissen"
-
-#: src/diffuse/main.py:996
-msgid "Changes detected"
-msgstr "Wijzigingen aangetroffen"
-
-#: src/diffuse/main.py:1000
-#, python-format
-msgid ""
-"The file \"%s\" changed on disk.\n"
-"\n"
-"Do you want to reload the file?"
-msgstr ""
-"“%s” is elders gewijzigd.\n"
-"\n"
-"Wilt u het bestand herladen?"
-
-#: src/diffuse/main.py:1005
-#, python-format
-msgid ""
-"The following files changed on disk:\n"
-"%s\n"
-"\n"
-"Do you want to reload these files?"
-msgstr ""
-"De volgende bestanden zijn elders gewijzigd:\n"
-"%s\n"
-"\n"
-"Wilt u deze bestanden herladen?"
-
-#: src/diffuse/main.py:1120
-msgid ""
-"Some files have unsaved changes. Select the files to save before closing."
-msgstr ""
-"Enkele bestanden zijn niet nog opgeslagen. Selecteer de te bewaren bestanden "
-"alvorens door te gaan."
-
-#: src/diffuse/main.py:1134
-msgid "Tab"
-msgstr "Tabblad"
-
-#: src/diffuse/main.py:1139
-msgid "Pane"
-msgstr "Paneel"
-
-#: src/diffuse/main.py:1150
-msgid "Close _Without Saving"
-msgstr "Sluiten _zonder op te slaan"
-
-#: src/diffuse/main.py:1189
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "Door dit tabblad te sluiten, wordt %s afgesloten."
-
-#: src/diffuse/main.py:1266
-#, python-format
-msgid "File Merge %d"
-msgstr "Samenvoeging %d"
-
-#: src/diffuse/main.py:1372
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "De commits van %s kunnen niet worden opgehaald."
-
-#: src/diffuse/main.py:1404
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "De wijzigingen aan %s kunnen niet worden opgehaald."
-
-#: src/diffuse/main.py:1437
-msgid "Open File In New Tab"
-msgstr "Bestand openen op nieuw tabblad"
-
-#: src/diffuse/main.py:1460
-msgid "Choose Folder With Modified Files"
-msgstr "Kies de map met bewerkte bestanden"
-
-#: src/diffuse/main.py:1478
-msgid "No modified files found."
-msgstr "Er zijn geen bewerkte bestanden aangetroffen."
-
-#: src/diffuse/main.py:1484
-msgid "Choose Folder With Commit"
-msgstr "Kies de map met de commit"
-
-#: src/diffuse/main.py:1504
-msgid "No committed files found."
-msgstr "Er zijn geen commits aangetroffen."
-
-#: src/diffuse/main.py:1540
-msgid "New N-Way File Merge..."
-msgstr "Nieuwe samenvoegmethode in x-aantal richtingen…"
-
-#: src/diffuse/main.py:1541
-msgid "Number of panes: "
-msgstr "Aantal panelen: "
-
-#: src/diffuse/main.py:1615
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr ""
-"De zoekterm is niet aangetroffen. Wilt u vanaf het einde van het bestand "
-"zoeken?"
-
-#: src/diffuse/main.py:1617
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr ""
-"De zoekterm is niet aangetroffen. Wilt u vanaf het begin van het bestand "
-"zoeken?"
-
-#: src/diffuse/main.py:1827
+#: src/diffuse/main.py:61
 msgid "Do not read any resource files"
 msgstr "Geen bronbestanden inlezen"
 
-#: src/diffuse/main.py:1835
+#: src/diffuse/main.py:69
 msgid "Specify explicit resource file"
 msgstr "Kies een bronbestand"
 
-#: src/diffuse/main.py:1843
+#: src/diffuse/main.py:77
 msgid "File revisions <rev-1> and <rev>"
 msgstr "Bestandsrevisies <rev-1> en <rev>"
 
-#: src/diffuse/main.py:1851
+#: src/diffuse/main.py:85
 msgid "Close all tabs with no differences"
 msgstr "Alle tabbladen zonder verschillen sluiten"
 
-#: src/diffuse/main.py:1858
+#: src/diffuse/main.py:92
 msgid "Use <codec> to read and write files"
 msgstr "<codec> gebruiken om bestand in te lezen en weg te schrijven"
 
-#: src/diffuse/main.py:1866
+#: src/diffuse/main.py:100
 msgid "Display <label> instead of the file name"
 msgstr "<label> tonen in plaats van bestandsnaam"
 
-#: src/diffuse/main.py:1874
+#: src/diffuse/main.py:108
 msgid "Create a new tab for each modified file"
 msgstr "Ieder bewerkt bestand openen een nieuw tabblad"
 
-#: src/diffuse/main.py:1881
+#: src/diffuse/main.py:115
 msgid "File revision <rev>"
 msgstr "Bestandsrevisie <rev>"
 
-#: src/diffuse/main.py:1889
+#: src/diffuse/main.py:123
 msgid "Create a new tab for each file"
 msgstr "Ieder bestand openen een nieuw tabblad"
 
-#: src/diffuse/main.py:1896
+#: src/diffuse/main.py:130
 msgid "Start a new tab"
 msgstr "Nieuw tabblad openen"
 
-#: src/diffuse/main.py:1903 src/diffuse/preferences.py:165
+#: src/diffuse/main.py:137 src/diffuse/preferences.py:159
 msgid "Version control system search order"
 msgstr "Versiebeheersysteem - zoekvolgorde"
 
-#: src/diffuse/main.py:1911
+#: src/diffuse/main.py:145
 msgid "Start with line <line> selected"
 msgstr "Beginnen met regel <line> als selectie"
 
-#: src/diffuse/main.py:1919
+#: src/diffuse/main.py:153
 msgid "Create a blank file comparison pane"
 msgstr "Blanco vergelijkingspaneel openen"
 
-#: src/diffuse/main.py:1926 src/diffuse/preferences.py:91
-#: src/diffuse/preferences.py:100
+#: src/diffuse/main.py:160 src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:95
 msgid "Ignore changes to white space"
 msgstr "Witruimtewijzigingen negeren"
 
-#: src/diffuse/main.py:1933
+#: src/diffuse/main.py:167
 msgid "Ignore changes in blank lines"
 msgstr "Wijzigingen aan blanco regels negeren"
 
-#: src/diffuse/main.py:1940 src/diffuse/preferences.py:93
+#: src/diffuse/main.py:174 src/diffuse/preferences.py:88
 msgid "Ignore end of line differences"
 msgstr "Regeleindeverschillen negeren"
 
-#: src/diffuse/main.py:1947 src/diffuse/preferences.py:89
+#: src/diffuse/main.py:181 src/diffuse/preferences.py:84
 msgid "Ignore case differences"
 msgstr "Hoofdletterverschillen negeren"
 
-#: src/diffuse/main.py:1954 src/diffuse/preferences.py:90
+#: src/diffuse/main.py:188 src/diffuse/preferences.py:85
 msgid "Ignore white space differences"
 msgstr "Witruimteverschillen negeren"
 
-#: src/diffuse/main.py:1957
+#: src/diffuse/main.py:191
 msgid ""
 "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"
+"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 several VCSs for comparison and merging."
 msgstr ""
 "Diffuse is een grafische toepassing voor het vergelijken en samenvoegen van "
@@ -721,153 +174,167 @@ msgstr ""
 "overeenkomen en de bestanden bewerken. Diffuse kan tevens revisies van "
 "verschillende soorten versiebeheersystemen (zoals Git) openen."
 
-#: src/diffuse/main.py:2080
+#: src/diffuse/main.py:247 src/diffuse/window.py:420
+#, python-format
+msgid "Error reading %s."
+msgstr "\"%s\" kan niet worden ingelezen."
+
+#: src/diffuse/main.py:327
 msgid "Error parsing line number."
 msgstr "Het regelnummer kan niet worden verwerkt."
 
-#: src/diffuse/main.py:2096
+#: src/diffuse/main.py:343
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
-msgstr "De optie ‘%s’ kan niet worden verwerkt omdat er geen map werd verwacht."
+msgstr "De optie \"%s\" kan niet worden verwerkt omdat er geen map werd verwacht."
 
-#: src/diffuse/preferences.py:80
+#: src/diffuse/preferences.py:75
 msgid "Display"
 msgstr "Weergave"
 
-#: src/diffuse/preferences.py:83
+#: src/diffuse/preferences.py:78
 msgid "Font"
 msgstr "Lettertype"
 
-#: src/diffuse/preferences.py:84
+#: src/diffuse/preferences.py:79
 msgid "Tab width"
 msgstr "Tabbreedte"
 
-#: src/diffuse/preferences.py:85
+#: src/diffuse/preferences.py:80
 msgid "Show right margin"
 msgstr "Rechtermarge tonen"
 
-#: src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:81
 msgid "Right margin"
 msgstr "Rechtermarge"
 
-#: src/diffuse/preferences.py:87
+#: src/diffuse/preferences.py:82
 msgid "Show line numbers"
 msgstr "Regelnummers tonen"
 
-#: src/diffuse/preferences.py:88
+#: src/diffuse/preferences.py:83
 msgid "Show white space characters"
 msgstr "Witruimtetekens tonen"
 
-#: src/diffuse/preferences.py:92
+#: src/diffuse/preferences.py:87
 msgid "Ignore blank line differences"
 msgstr "Verschillen aan blanco regels negeren"
 
-#: src/diffuse/preferences.py:95
+#: src/diffuse/preferences.py:90
 msgid "Alignment"
 msgstr "Uitlijning"
 
-#: src/diffuse/preferences.py:98
+#: src/diffuse/preferences.py:93
 msgid "Ignore case"
 msgstr "Hoofdlettergebruik negeren"
 
-#: src/diffuse/preferences.py:99
+#: src/diffuse/preferences.py:94
 msgid "Ignore white space"
 msgstr "Witruimten negeren"
 
-#: src/diffuse/preferences.py:101
+#: src/diffuse/preferences.py:96
 msgid "Ignore blank lines"
 msgstr "Blanco regels negeren"
 
-#: src/diffuse/preferences.py:102
+#: src/diffuse/preferences.py:97
 msgid "Ignore end of line characters"
 msgstr "Regeleindetekens negeren"
 
-#: src/diffuse/preferences.py:104
+#: src/diffuse/preferences.py:99
 msgid "Editor"
 msgstr "Bewerker"
 
-#: src/diffuse/preferences.py:107
+#: src/diffuse/preferences.py:102
 msgid "Auto indent"
 msgstr "Automatisch inspringen"
 
-#: src/diffuse/preferences.py:108
+#: src/diffuse/preferences.py:103
 msgid "Expand tabs to spaces"
 msgstr "Tabs omzetten naar spaties"
 
-#: src/diffuse/preferences.py:109
+#: src/diffuse/preferences.py:104
 msgid "Soft tab width"
 msgstr "Zachte tabbreedte"
 
-#: src/diffuse/preferences.py:111
+#: src/diffuse/preferences.py:106
 msgid "Tabs"
 msgstr "Tabs"
 
-#: src/diffuse/preferences.py:114
+#: src/diffuse/preferences.py:109
 msgid "Default panes"
 msgstr "Standaardpanelen"
 
-#: src/diffuse/preferences.py:115
+#: src/diffuse/preferences.py:110
 msgid "Always show the tab bar"
 msgstr "Tabbladenbalk altijd tonen"
 
-#: src/diffuse/preferences.py:116
+#: src/diffuse/preferences.py:111
 #, python-format
 msgid "Warn me when closing a tab will quit %s"
 msgstr "Waarschuwing tonen als het sluiten van een tabblad %s afsluit"
 
-#: src/diffuse/preferences.py:118
+#: src/diffuse/preferences.py:113
 msgid "Regional Settings"
 msgstr "Lokale voorkeuren"
 
-#: src/diffuse/preferences.py:121
+#: src/diffuse/preferences.py:116
 msgid "Default codec"
 msgstr "Standaardcodec"
 
-#: src/diffuse/preferences.py:122
+#: src/diffuse/preferences.py:117
 msgid "Order of codecs used to identify encoding"
-msgstr ""
-"De volgorde van codecs die worden gebruikt om de tekenset vast te stellen"
+msgstr "De volgorde van codecs die worden gebruikt om de tekenset vast te stellen"
 
-#: src/diffuse/preferences.py:143
+#: src/diffuse/preferences.py:138
 msgid "Cygwin"
 msgstr "Cygwin"
 
-#: src/diffuse/preferences.py:145
+#: src/diffuse/preferences.py:140
 msgid "Root directory"
 msgstr "Hoofdmap"
 
-#: src/diffuse/preferences.py:146
+#: src/diffuse/preferences.py:141
 msgid "Cygdrive prefix"
 msgstr "Cygdrive-voorvoegsel"
 
-#: src/diffuse/preferences.py:173
+#: src/diffuse/preferences.py:167
 msgid "\"co\" command"
 msgstr "‘co’-opdracht"
 
-#: src/diffuse/preferences.py:174
+#: src/diffuse/preferences.py:168
 msgid "\"rlog\" command"
 msgstr "‘rlog’-opdracht"
 
-#: src/diffuse/preferences.py:176
+#: src/diffuse/preferences.py:170
 msgid "Command"
 msgstr "Opdracht"
 
-#: src/diffuse/preferences.py:182
+#: src/diffuse/preferences.py:176
 msgid "Launch from a Bash login shell"
 msgstr "Opstarten vanuit Bash-inlogshell"
 
-#: src/diffuse/preferences.py:189
+#: src/diffuse/preferences.py:183
 msgid "Update paths for Cygwin"
 msgstr "Locaties bijwerken voor gebruik met Cygwin"
 
-#: src/diffuse/preferences.py:194
+#: src/diffuse/preferences.py:188
 msgid "Version Control"
 msgstr "Versiebeheer"
 
-#: src/diffuse/preferences.py:259
+#: src/diffuse/preferences.py:253
 msgid "Preferences"
 msgstr "Voorkeuren"
 
+#: src/diffuse/preferences.py:294 src/diffuse/window.py:580
+#, python-format
+msgid "Error writing %s."
+msgstr "‘%s’ kan niet worden weggeschreven."
+
+#: src/diffuse/preferences.py:483 src/diffuse/window.py:446
+#: src/diffuse/window.py:1413 src/diffuse/window.py:1436 src/diffuse/window.py:1459
+msgid "_Open"
+msgstr ""
+
 #: src/diffuse/resources.py:242 src/diffuse/resources.py:246
 #: src/diffuse/resources.py:249
 #, python-brace-format
@@ -949,20 +416,15 @@ msgstr "Reguliere-uitdrukkingsfout op regel {line} in {file}."
 msgid "Unhandled error at line {line} of {file}."
 msgstr "Onbehandelde fout op regel {line} in {file}."
 
-#: src/diffuse/utils.py:65
+#: src/diffuse/utils.py:66
 msgid "Auto Detect"
 msgstr "Automatisch vaststellen"
 
-#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97
+#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:96
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "Revisie %s kan niet worden verwerkt."
 
-#: src/diffuse/vcs/vcs_registry.py:238
-#, python-format
-msgid "Error parsing %s."
-msgstr "%s kan niet worden verwerkt."
-
 #: src/diffuse/widgets.py:1857
 msgid "Align with Selection"
 msgstr "Uitlijnen met selectie"
@@ -975,10 +437,572 @@ msgstr "Afschermen"
 msgid "Merge Selection"
 msgstr "Selectie samenvoegen"
 
+#: src/diffuse/widgets.py:1861 src/diffuse/window.py:865
+msgid "Cut"
+msgstr "Knippen"
+
+#: src/diffuse/widgets.py:1862 src/diffuse/window.py:866
+msgid "Copy"
+msgstr "Kopiëren"
+
+#: src/diffuse/widgets.py:1863 src/diffuse/window.py:867
+msgid "Paste"
+msgstr "Plakken"
+
 #: src/diffuse/widgets.py:1865
 msgid "Select All"
 msgstr "Alles selecteren"
 
+#: src/diffuse/widgets.py:1866 src/diffuse/window.py:868
+msgid "Clear Edits"
+msgstr "Bewerkingen wissen"
+
 #: src/diffuse/widgets.py:1868
 msgid "Swap with Selected Pane"
 msgstr "Uitwisselen met gekozen paneel"
+
+#: src/diffuse/window.py:83
+msgid "Close Tab"
+msgstr "Tabblad sluiten"
+
+#: src/diffuse/window.py:126
+msgid "Open File..."
+msgstr "Bestand openen…"
+
+#: src/diffuse/window.py:127
+msgid "Reload File"
+msgstr "Bestand herladen"
+
+#: src/diffuse/window.py:128
+msgid "Save File"
+msgstr "Bestand opslaan"
+
+#: src/diffuse/window.py:129
+msgid "Save File As..."
+msgstr "Bestand opslaan als…"
+
+#: src/diffuse/window.py:228
+#, python-format
+msgid "Column %d"
+msgstr "Kolom %d"
+
+#: src/diffuse/window.py:306
+msgid "Save changes before loading the new file?"
+msgstr "Wilt u de wijzigingen opslaan alvorens het nieuwe bestand te laden?"
+
+#: src/diffuse/window.py:310
+msgid "_No"
+msgstr ""
+
+#: src/diffuse/window.py:311
+msgid "_Yes"
+msgstr ""
+
+#: src/diffuse/window.py:417
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "Revisie %(rev)s van %(file)s kan niet worden ingelezen."
+
+#: src/diffuse/window.py:442
+msgid "Open File"
+msgstr "Bestand openen"
+
+#: src/diffuse/window.py:495
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "%(title)s-paneel %(pane)d opslaan"
+
+#: src/diffuse/window.py:499 src/diffuse/window.py:1111
+#, fuzzy
+msgid "_Save"
+msgstr "Bestand op_slaan"
+
+#: src/diffuse/window.py:527
+#, python-format
+msgid "A file named %s already exists. Do you want to overwrite it?"
+msgstr "Er is al een bestand genaamd “%s”. Wilt u dit bestand overschrijven?"
+
+#: src/diffuse/window.py:534
+#, 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’ is sinds het inlezen gewijzigd door een ander proces. Als u het bestand nu "
+"opslaan, dan worden alle externe wijzigingen gewist. Wilt u het bestand opslaan?"
+
+#: src/diffuse/window.py:576
+#, python-format
+msgid "Error encoding to %s."
+msgstr "Het omzetten naar %s is mislukt."
+
+#: src/diffuse/window.py:610
+msgid "Go To Line..."
+msgstr "Ga naar regel…"
+
+#: src/diffuse/window.py:611
+msgid "Line Number: "
+msgstr "Regelnummer: "
+
+#: src/diffuse/window.py:642
+msgid ""
+"Press the enter key or double click to edit. Press the space bar or use the RMB "
+"menu to manually align."
+msgstr ""
+"Druk op de entertoets of dubbelklik om te bewerken. Druk op de spatiebalk of "
+"gebruik het RMB-menu om handmatig uit te lijnen."
+
+#: src/diffuse/window.py:646
+msgid "Press the escape key to finish editing."
+msgstr "Druk op de escapetoets om af te ronden."
+
+#: src/diffuse/window.py:649
+msgid ""
+"Select target line and press the space bar to align. Press the escape key to "
+"cancel."
+msgstr ""
+"Kies de desbetreffende regel en druk op de spatiebalk om uit te lijnen. Druk op "
+"de escapetoets om te annuleren."
+
+#: src/diffuse/window.py:710
+msgid "_File"
+msgstr "_Bestand"
+
+#: src/diffuse/window.py:712
+msgid "_Open File..."
+msgstr "Bestand _openen…"
+
+#: src/diffuse/window.py:713
+msgid "Open File In New _Tab..."
+msgstr "Bestand openen op nieuw _tabblad…"
+
+#: src/diffuse/window.py:714
+msgid "Open _Modified Files..."
+msgstr "Be_werkte bestanden openen…"
+
+#: src/diffuse/window.py:715
+msgid "Open Commi_t..."
+msgstr "Commi_t openen…"
+
+#: src/diffuse/window.py:716
+msgid "_Reload File"
+msgstr "Bestand he_rladen"
+
+#: src/diffuse/window.py:718
+msgid "_Save File"
+msgstr "Bestand op_slaan"
+
+#: src/diffuse/window.py:719
+msgid "Save File _As..."
+msgstr "Bestand opslaan _als…"
+
+#: src/diffuse/window.py:720
+msgid "Save A_ll"
+msgstr "A_lles opslaan"
+
+#: src/diffuse/window.py:722
+msgid "New _2-Way File Merge"
+msgstr "Nieuwe samenvoegmethode in _2 richtingen"
+
+#: src/diffuse/window.py:723
+msgid "New _3-Way File Merge"
+msgstr "Nieuwe samenvoegmethode in _3 richtingen"
+
+#: src/diffuse/window.py:724
+msgid "New _N-Way File Merge..."
+msgstr "Nieuwe samenvoegmethode in _x-aantal richtingen…"
+
+#: src/diffuse/window.py:726
+msgid "_Close Tab"
+msgstr "Tab_blad sluiten"
+
+#: src/diffuse/window.py:727
+msgid "_Undo Close Tab"
+msgstr "Tabbla_d heropenen"
+
+#: src/diffuse/window.py:728
+msgid "_Quit"
+msgstr "_Afsluiten"
+
+#: src/diffuse/window.py:732
+msgid "_Edit"
+msgstr "B_ewerken"
+
+#: src/diffuse/window.py:734
+msgid "_Undo"
+msgstr "On_gedaan maken"
+
+#: src/diffuse/window.py:735
+msgid "_Redo"
+msgstr "Opnieuw uitvoe_ren"
+
+#: src/diffuse/window.py:737
+msgid "Cu_t"
+msgstr "Kn_ippen"
+
+#: src/diffuse/window.py:738
+msgid "_Copy"
+msgstr "_Kopiëren"
+
+#: src/diffuse/window.py:739
+msgid "_Paste"
+msgstr "_Plakken"
+
+#: src/diffuse/window.py:741
+msgid "Select _All"
+msgstr "_Alles selecteren"
+
+#: src/diffuse/window.py:742
+msgid "C_lear Edits"
+msgstr "Bewerkingen _wissen"
+
+#: src/diffuse/window.py:743
+msgid "_Dismiss All Edits"
+msgstr "Alle bewerkingen wi_ssen"
+
+#: src/diffuse/window.py:745
+msgid "_Find..."
+msgstr "_Zoeken…"
+
+#: src/diffuse/window.py:746
+msgid "Find _Next"
+msgstr "Volge_nde zoeken"
+
+#: src/diffuse/window.py:747
+msgid "Find Pre_vious"
+msgstr "_Vorige zoeken"
+
+#: src/diffuse/window.py:748
+msgid "_Go To Line..."
+msgstr "_Ga naar regel…"
+
+#: src/diffuse/window.py:750
+msgid "Pr_eferences..."
+msgstr "Voork_euren…"
+
+#: src/diffuse/window.py:754
+msgid "None"
+msgstr "Geen"
+
+#: src/diffuse/window.py:776
+msgid "_View"
+msgstr "_Beeld"
+
+#: src/diffuse/window.py:778
+msgid "_Syntax Highlighting"
+msgstr "_Syntaxismarkering"
+
+#: src/diffuse/window.py:780
+msgid "Re_align All"
+msgstr "_Alles opnieuw uitlijnen"
+
+#: src/diffuse/window.py:781
+msgid "_Isolate"
+msgstr "Afs_chermen"
+
+#: src/diffuse/window.py:783
+msgid "_First Difference"
+msgstr "Eerste _verschil"
+
+#: src/diffuse/window.py:784
+msgid "_Previous Difference"
+msgstr "_Vorige verschil"
+
+#: src/diffuse/window.py:785
+msgid "_Next Difference"
+msgstr "Volge_nde verschil"
+
+#: src/diffuse/window.py:786
+msgid "_Last Difference"
+msgstr "_Laatste verschil"
+
+#: src/diffuse/window.py:788
+msgid "Fir_st Tab"
+msgstr "Eer_ste tabblad"
+
+#: src/diffuse/window.py:789
+msgid "Pre_vious Tab"
+msgstr "_Vorig tabblad"
+
+#: src/diffuse/window.py:790
+msgid "Next _Tab"
+msgstr "Volgend _tabblad"
+
+#: src/diffuse/window.py:791
+msgid "Las_t Tab"
+msgstr "Laats_te tabblad"
+
+#: src/diffuse/window.py:793
+msgid "Shift Pane _Right"
+msgstr "Paneel naar _rechts verplaatsen"
+
+#: src/diffuse/window.py:794
+msgid "Shift Pane _Left"
+msgstr "Paneel naar _links verplaatsen"
+
+#: src/diffuse/window.py:798
+msgid "F_ormat"
+msgstr "_Opmaak"
+
+#: src/diffuse/window.py:800
+msgid "Convert To _Upper Case"
+msgstr "Omzetten naar hoo_fdletters"
+
+#: src/diffuse/window.py:801
+msgid "Convert To _Lower Case"
+msgstr "Omzetten naar k_leine letters"
+
+#: src/diffuse/window.py:803
+msgid "Sort Lines In _Ascending Order"
+msgstr "Regels o_plopend sorteren"
+
+#: src/diffuse/window.py:804
+msgid "Sort Lines In D_escending Order"
+msgstr "Regels _aflopend sorteren"
+
+#: src/diffuse/window.py:806
+msgid "Remove Trailing _White Space"
+msgstr "_Witruimten aan regeleinden wissen"
+
+#: src/diffuse/window.py:807
+msgid "Convert Tabs To _Spaces"
+msgstr "Tabs omzetten naar _spaties"
+
+#: src/diffuse/window.py:808
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "Spaties aan begin van regels omzetten naar _tabs"
+
+#: src/diffuse/window.py:810
+msgid "_Increase Indenting"
+msgstr "_Inspringing vergroten"
+
+#: src/diffuse/window.py:811
+msgid "De_crease Indenting"
+msgstr "Insprin_ging verkleinen"
+
+#: src/diffuse/window.py:813
+msgid "Convert To _DOS Format"
+msgstr "Omzetten naar _DOS-opmaak"
+
+#: src/diffuse/window.py:814
+msgid "Convert To _Mac Format"
+msgstr "Omzetten naar _Mac-opmaak"
+
+#: src/diffuse/window.py:815
+msgid "Convert To Uni_x Format"
+msgstr "Omzetten naar Uni_x-opmaak"
+
+#: src/diffuse/window.py:819
+msgid "_Merge"
+msgstr "Sa_menvoegen"
+
+#: src/diffuse/window.py:821
+msgid "Copy Selection _Right"
+msgstr "Selectie aan _rechterzijde kopiëren"
+
+#: src/diffuse/window.py:822
+msgid "Copy Selection _Left"
+msgstr "Selectie aan _linkerzijde kopiëren"
+
+#: src/diffuse/window.py:824
+msgid "Copy Left _Into Selection"
+msgstr "_Linkerzijde naar selectie kopiëren"
+
+#: src/diffuse/window.py:825
+msgid "Copy Right I_nto Selection"
+msgstr "_Rechterzijde naar selectie kopiëren"
+
+#: src/diffuse/window.py:826
+msgid "_Merge From Left Then Right"
+msgstr "Sa_menvoegen van links naar rechts"
+
+#: src/diffuse/window.py:827
+msgid "M_erge From Right Then Left"
+msgstr "Sam_envoegen van rechts naar links"
+
+#: src/diffuse/window.py:831
+msgid "_Help"
+msgstr "_Hulp"
+
+#: src/diffuse/window.py:833
+msgid "_Help Contents..."
+msgstr "_Zelfstudie…"
+
+#: src/diffuse/window.py:835
+#, python-format
+msgid "_About %s..."
+msgstr "_Over %s…"
+
+#: src/diffuse/window.py:847
+msgid "New 2-Way File Merge"
+msgstr "Nieuwe samenvoegmethode in 2 richtingen"
+
+#: src/diffuse/window.py:848
+msgid "New 3-Way File Merge"
+msgstr "Nieuwe samenvoegmethode in 3 richtingen"
+
+#: src/diffuse/window.py:850
+msgid "Realign All"
+msgstr "Alles opnieuw uitlijnen"
+
+#: src/diffuse/window.py:851
+msgid "First Difference"
+msgstr "Eerste verschil"
+
+#: src/diffuse/window.py:852
+msgid "Previous Difference"
+msgstr "Vorig verschil"
+
+#: src/diffuse/window.py:853
+msgid "Next Difference"
+msgstr "Volgend verschil"
+
+#: src/diffuse/window.py:854
+msgid "Last Difference"
+msgstr "Laatste verschil"
+
+#: src/diffuse/window.py:856
+msgid "Copy Selection Right"
+msgstr "Selectie aan rechterzijde kopiëren"
+
+#: src/diffuse/window.py:857
+msgid "Copy Selection Left"
+msgstr "Selectie aan linkerzijde kopiëren"
+
+#: src/diffuse/window.py:858
+msgid "Copy Left Into Selection"
+msgstr "Linkerzijde naar selectie kopiëren"
+
+#: src/diffuse/window.py:859
+msgid "Copy Right Into Selection"
+msgstr "Rechterzijde naar selectie kopiëren"
+
+#: src/diffuse/window.py:860
+msgid "Merge From Left Then Right"
+msgstr "Samenvoegen van links naar rechts"
+
+#: src/diffuse/window.py:861
+msgid "Merge From Right Then Left"
+msgstr "Samenvoegen van rechts naar links"
+
+#: src/diffuse/window.py:863
+msgid "Undo"
+msgstr "Ongedaan maken"
+
+#: src/diffuse/window.py:864
+msgid "Redo"
+msgstr "Opnieuw uitvoeren"
+
+#: src/diffuse/window.py:950
+msgid "Changes detected"
+msgstr "Wijzigingen aangetroffen"
+
+#: src/diffuse/window.py:954
+#, python-format
+msgid ""
+"The file \"%s\" changed on disk.\n"
+"\n"
+"Do you want to reload the file?"
+msgstr ""
+"“%s” is elders gewijzigd.\n"
+"\n"
+"Wilt u het bestand herladen?"
+
+#: src/diffuse/window.py:959
+#, python-format
+msgid ""
+"The following files changed on disk:\n"
+"%s\n"
+"\n"
+"Do you want to reload these files?"
+msgstr ""
+"De volgende bestanden zijn elders gewijzigd:\n"
+"%s\n"
+"\n"
+"Wilt u deze bestanden herladen?"
+
+#: src/diffuse/window.py:1078
+msgid "Some files have unsaved changes. Select the files to save before closing."
+msgstr ""
+"Enkele bestanden zijn niet nog opgeslagen. Selecteer de te bewaren bestanden "
+"alvorens door te gaan."
+
+#: src/diffuse/window.py:1092
+msgid "Tab"
+msgstr "Tabblad"
+
+#: src/diffuse/window.py:1097
+msgid "Pane"
+msgstr "Paneel"
+
+#: src/diffuse/window.py:1108
+msgid "Close _Without Saving"
+msgstr "Sluiten _zonder op te slaan"
+
+#: src/diffuse/window.py:1147
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "Door dit tabblad te sluiten, wordt %s afgesloten."
+
+#: src/diffuse/window.py:1224
+#, python-format
+msgid "File Merge %d"
+msgstr "Samenvoeging %d"
+
+#: src/diffuse/window.py:1344
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "De commits van %s kunnen niet worden opgehaald."
+
+#: src/diffuse/window.py:1376
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "De wijzigingen aan %s kunnen niet worden opgehaald."
+
+#: src/diffuse/window.py:1409
+msgid "Open File In New Tab"
+msgstr "Bestand openen op nieuw tabblad"
+
+#: src/diffuse/window.py:1432
+msgid "Choose Folder With Modified Files"
+msgstr "Kies de map met bewerkte bestanden"
+
+#: src/diffuse/window.py:1450
+msgid "No modified files found."
+msgstr "Er zijn geen bewerkte bestanden aangetroffen."
+
+#: src/diffuse/window.py:1456
+msgid "Choose Folder With Commit"
+msgstr "Kies de map met de commit"
+
+#: src/diffuse/window.py:1476
+msgid "No committed files found."
+msgstr "Er zijn geen commits aangetroffen."
+
+#: src/diffuse/window.py:1512
+msgid "New N-Way File Merge..."
+msgstr "Nieuwe samenvoegmethode in x-aantal richtingen…"
+
+#: src/diffuse/window.py:1513
+msgid "Number of panes: "
+msgstr "Aantal panelen: "
+
+#: src/diffuse/window.py:1587
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr ""
+"De zoekterm is niet aangetroffen. Wilt u vanaf het einde van het bestand zoeken?"
+
+#: src/diffuse/window.py:1589
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr ""
+"De zoekterm is niet aangetroffen. Wilt u vanaf het begin van het bestand zoeken?"
+
+#: src/diffuse/window.py:1762
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr ""
+"Diffuse is een grafische toepassing voor het vergelijken en samenvoegen van "
+"tekstbestanden."
+
+#: src/diffuse/window.py:1766
+msgid "translator-credits"
+msgstr "Heimen Stoffels <vistausss@fastmail.com>"
diff --git a/po/pl.po b/po/pl.po
index 1c0ab4a..e8d81b6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse-0.4.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-23 20:00-0400\n"
+"POT-Creation-Date: 2023-04-16 14:09-0400\n"
 "PO-Revision-Date: 2022-04-04 12:19-0400\n"
 "Last-Translator: Miś Uszatek <adres.email@ymail.com>, 2012\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -32,827 +32,303 @@ 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."
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, and "
+"Subversion repositories."
 msgstr ""
 
-#: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
-msgid "Main window: diff between two files"
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:28
+msgid "Main window"
 msgstr ""
 
-#: src/diffuse/constants.py:25
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:32
+msgid "About window"
+msgstr ""
+
+#: src/diffuse/constants.py:26
 msgid "Copyright"
 msgstr ""
 
-#: src/diffuse/dialogs.py:40
-msgid "Diffuse is a graphical tool for merging and comparing text files."
+#: src/diffuse/dialogs.py:46 src/diffuse/dialogs.py:89 src/diffuse/dialogs.py:133
+#: src/diffuse/preferences.py:254 src/diffuse/preferences.py:483
+#: src/diffuse/window.py:309 src/diffuse/window.py:1107
+msgid "_Cancel"
 msgstr ""
-"Diffuse jest graficznym narzędziem do łączenia i porównywania plików tekstowych."
 
-#: src/diffuse/dialogs.py:45
-msgid "translator-credits"
-msgstr "Miś Uszatek <adres.email@ymail.com>"
-
-#: src/diffuse/dialogs.py:82
+#: src/diffuse/dialogs.py:50
 msgid "Encoding: "
 msgstr "Kodowanie znaków: "
 
-#: src/diffuse/dialogs.py:94
+#: src/diffuse/dialogs.py:62
 msgid "Revision: "
 msgstr "Rewizia: "
 
-#: src/diffuse/dialogs.py:156
+#: src/diffuse/dialogs.py:90 src/diffuse/dialogs.py:134
+#: src/diffuse/preferences.py:255
+msgid "_OK"
+msgstr ""
+
+#: src/diffuse/dialogs.py:130
 msgid "Find..."
 msgstr "Szukaj..."
 
-#: src/diffuse/dialogs.py:164
+#: src/diffuse/dialogs.py:140
 msgid "Search For: "
 msgstr "Szukaj Dla: "
 
-#: src/diffuse/dialogs.py:189
+#: src/diffuse/dialogs.py:165
 msgid "Match Case"
 msgstr "Uwzględnij wielkość liter"
 
-#: src/diffuse/dialogs.py:194
+#: src/diffuse/dialogs.py:170
 msgid "Search Backwards"
 msgstr "Szukaj Wstecz"
 
+#: src/diffuse/main.py:53
+msgid "Display version and copyright information"
+msgstr "Wyświetla wersje i informacje o prawach autorskich"
+
+#: src/diffuse/main.py:61
+msgid "Do not read any resource files"
+msgstr "Nie czytaj żadnych plików konfiguracyjnych"
+
+#: src/diffuse/main.py:69
+msgid "Specify explicit resource file"
+msgstr "Określ wyraźnie plik konfiguracyjny"
+
+#: src/diffuse/main.py:77
+msgid "File revisions <rev-1> and <rev>"
+msgstr "Plik rewizji <rev-1> i <rev>"
+
 #: src/diffuse/main.py:85
-msgid "Close Tab"
-msgstr "Zamknij Kartę"
+msgid "Close all tabs with no differences"
+msgstr "Zamknij wszystkie karty bez różnic"
 
-#: src/diffuse/main.py:132
-msgid "Open File..."
-msgstr "Otwórz Plik..."
+#: src/diffuse/main.py:92
+msgid "Use <codec> to read and write files"
+msgstr "Użyj <kod> do odczytu i zapisu plików"
 
-#: src/diffuse/main.py:133
-msgid "Reload File"
-msgstr "Odśwież Plik"
+#: src/diffuse/main.py:100
+msgid "Display <label> instead of the file name"
+msgstr "Wyświetla <etykieta> zamiast nazwy pliku"
 
-#: src/diffuse/main.py:134
-msgid "Save File"
-msgstr "Zapisz Plik"
+#: src/diffuse/main.py:108
+msgid "Create a new tab for each modified file"
+msgstr "twórz nową kartę dla każdego zmodyfikowanego pliku"
 
-#: src/diffuse/main.py:135
-msgid "Save File As..."
-msgstr "Zapisz Plik Jako..."
+#: src/diffuse/main.py:115
+msgid "File revision <rev>"
+msgstr "Plik rewizji <rev>"
 
-#: src/diffuse/main.py:217
-#, python-format
-msgid "Column %d"
-msgstr "Kolumna %d"
+#: src/diffuse/main.py:123
+msgid "Create a new tab for each file"
+msgstr "Utwórzy nową kartę dla każdego pliku"
 
-#: src/diffuse/main.py:291
-msgid "Save changes before loading the new file?"
-msgstr "Zapisać zmiany przed wczytaniem nowego pliku?"
+#: src/diffuse/main.py:130
+msgid "Start a new tab"
+msgstr "Rozpocznij z nową kartą"
 
-#: src/diffuse/main.py:402
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "Błąd odczytu rewizji %(rev)s z %(file)s."
+#: src/diffuse/main.py:137 src/diffuse/preferences.py:159
+msgid "Version control system search order"
+msgstr ""
 
-#: src/diffuse/main.py:405 src/diffuse/main.py:1860
+#: src/diffuse/main.py:145
+msgid "Start with line <line> selected"
+msgstr "Rozpocznij z  <linia> wybranej linii"
+
+#: src/diffuse/main.py:153
+msgid "Create a blank file comparison pane"
+msgstr "Utwórz puste okienko porównania plików"
+
+#: src/diffuse/main.py:160 src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:95
+msgid "Ignore changes to white space"
+msgstr "Ignoruj zmiany w spacji"
+
+#: src/diffuse/main.py:167
+msgid "Ignore changes in blank lines"
+msgstr "Ignoruj zmiany w pustych liniach"
+
+#: src/diffuse/main.py:174 src/diffuse/preferences.py:88
+msgid "Ignore end of line differences"
+msgstr "Ignoruj różnice na końcu linii"
+
+#: src/diffuse/main.py:181 src/diffuse/preferences.py:84
+msgid "Ignore case differences"
+msgstr "Ignoruj różnice w wielkość liter"
+
+#: src/diffuse/main.py:188 src/diffuse/preferences.py:85
+msgid "Ignore white space differences"
+msgstr "Ignoruj różnice spacji"
+
+#: src/diffuse/main.py:191
+msgid ""
+"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 several VCSs for comparison and merging."
+msgstr ""
+
+#: src/diffuse/main.py:247 src/diffuse/window.py:420
 #, python-format
 msgid "Error reading %s."
 msgstr "Błąd odczytu %s."
 
-#: src/diffuse/main.py:427
-msgid "Open File"
-msgstr "Otwórz Plik"
-
-#: src/diffuse/main.py:484
-#, python-format
-msgid "The file %s changed on disk. Do you want to reload the file?"
-msgstr "Plik %s został zmieniony na dysku. Czy chcesz odświeżyć plik?"
-
-#: src/diffuse/main.py:510
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "Zapisz %(title)s Okno %(pane)d"
-
-#: src/diffuse/main.py:542
-#, python-format
-msgid "A file named %s already exists. Do you want to overwrite it?"
-msgstr "Plik o nazwie %s już istnieje. Czy chcesz go zastąpić?"
-
-#: src/diffuse/main.py:549
-#, 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 ""
-"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:591
-#, python-format
-msgid "Error encoding to %s."
-msgstr "Błąd kodowania dla %s."
-
-#: src/diffuse/main.py:595 src/diffuse/preferences.py:300
-#, python-format
-msgid "Error writing %s."
-msgstr "Błąd zapisu %s."
-
-#: src/diffuse/main.py:625
-msgid "Go To Line..."
-msgstr "Idź Do Linii..."
-
-#: src/diffuse/main.py:626
-msgid "Line Number: "
-msgstr "Numer Linii: "
-
-#: src/diffuse/main.py:657
-msgid ""
-"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ć."
-
-#: src/diffuse/main.py:661
-msgid "Press the escape key to finish editing."
-msgstr "Naciśnij klawisz escape, aby zakończyć edycję."
-
-#: src/diffuse/main.py:664
-msgid ""
-"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ć."
-
-#: src/diffuse/main.py:787
-msgid "_File"
-msgstr "_Plik"
-
-#: src/diffuse/main.py:788
-msgid "_Open File..."
-msgstr "_Otwórz Plik..."
-
-#: src/diffuse/main.py:789
-msgid "Open File In New _Tab..."
-msgstr "Otwórz Plik w Nowej _Karcie..."
-
-#: src/diffuse/main.py:790
-msgid "Open _Modified Files..."
-msgstr "Otwórz _Zmodyfikowany Plik..."
-
-#: src/diffuse/main.py:791
-msgid "Open Commi_t..."
-msgstr "Otwórz Commi_t..."
-
-#: src/diffuse/main.py:792
-msgid "_Reload File"
-msgstr "_Odśwież Plik"
-
-#: src/diffuse/main.py:794
-msgid "_Save File"
-msgstr "_Zapisz plik"
-
-#: src/diffuse/main.py:795
-msgid "Save File _As..."
-msgstr "Zapisz Plik _Jako..."
-
-#: src/diffuse/main.py:796
-msgid "Save A_ll"
-msgstr "Zapisz W_szystko"
-
-#: src/diffuse/main.py:798
-msgid "New _2-Way File Merge"
-msgstr "Nowy Łączenia _2 Plików"
-
-#: src/diffuse/main.py:799
-msgid "New _3-Way File Merge"
-msgstr "Nowy Łączenia _3 Plików"
-
-#: src/diffuse/main.py:800
-msgid "New _N-Way File Merge..."
-msgstr "Nowy _N-Sposób Łączenia Pliku..."
-
-#: src/diffuse/main.py:802
-msgid "_Close Tab"
-msgstr "_Zamknij Kartę"
-
-#: src/diffuse/main.py:803
-msgid "_Undo Close Tab"
-msgstr "_Przywróć Zamkniętą Kartę"
-
-#: src/diffuse/main.py:804
-msgid "_Quit"
-msgstr "_Zamknij"
-
-#: src/diffuse/main.py:807
-msgid "_Edit"
-msgstr "_Edytuj"
-
-#: src/diffuse/main.py:808
-msgid "_Undo"
-msgstr "_Cofnij"
-
-#: src/diffuse/main.py:809
-msgid "_Redo"
-msgstr "_Ponów"
-
-#: src/diffuse/main.py:811
-msgid "Cu_t"
-msgstr "Wy_tnij"
-
-#: src/diffuse/main.py:812
-msgid "_Copy"
-msgstr "_Kopiuj"
-
-#: src/diffuse/main.py:813
-msgid "_Paste"
-msgstr "_Wklej"
-
-#: src/diffuse/main.py:815
-msgid "Select _All"
-msgstr "Zaznacz _Wszystko"
-
-#: src/diffuse/main.py:816
-msgid "C_lear Edits"
-msgstr "W_yczyść Edycje"
-
-#: src/diffuse/main.py:817
-msgid "_Dismiss All Edits"
-msgstr "_Odrzuć Wszystkie Edycje"
-
-#: src/diffuse/main.py:819
-msgid "_Find..."
-msgstr "_Znajdź..."
-
-#: src/diffuse/main.py:820
-msgid "Find _Next"
-msgstr "Znajdź _Następny"
-
-#: src/diffuse/main.py:821
-msgid "Find Pre_vious"
-msgstr "Znajdź Pop_rzedni"
-
-#: src/diffuse/main.py:822
-msgid "_Go To Line..."
-msgstr "_Idź Do Linii..."
-
-#: src/diffuse/main.py:824
-msgid "Pr_eferences..."
-msgstr "Pr_eferencje..."
-
-#: src/diffuse/main.py:828
-msgid "None"
-msgstr "Brak"
-
-#: src/diffuse/main.py:846
-msgid "_View"
-msgstr "_Widok"
-
-#: src/diffuse/main.py:847
-msgid "_Syntax Highlighting"
-msgstr "_Podświetlanie Składni"
-
-#: src/diffuse/main.py:849
-msgid "Re_align All"
-msgstr "Wy_równaj Wszystko"
-
-#: src/diffuse/main.py:850
-msgid "_Isolate"
-msgstr "_Odizoluj"
-
-#: src/diffuse/main.py:852
-msgid "_First Difference"
-msgstr "_Pierwsza Różnica"
-
-#: src/diffuse/main.py:853
-msgid "_Previous Difference"
-msgstr "_Poprzednia Różnica"
-
-#: src/diffuse/main.py:854
-msgid "_Next Difference"
-msgstr "_Następna Różnica"
-
-#: src/diffuse/main.py:855
-msgid "_Last Difference"
-msgstr "_Ostatnia Różnica"
-
-#: src/diffuse/main.py:857
-msgid "Fir_st Tab"
-msgstr "Pie_rwsza Karta"
-
-#: src/diffuse/main.py:858
-msgid "Pre_vious Tab"
-msgstr "Pop_rzednia Karta"
-
-#: src/diffuse/main.py:859
-msgid "Next _Tab"
-msgstr "Następna _Karta"
-
-#: src/diffuse/main.py:860
-msgid "Las_t Tab"
-msgstr "Osta_tnia Karta"
-
-#: src/diffuse/main.py:862
-msgid "Shift Pane _Right"
-msgstr "Przesuń Okno w _Prawo"
-
-#: src/diffuse/main.py:863
-msgid "Shift Pane _Left"
-msgstr "Przesuń Okno w _Lewo"
-
-#: src/diffuse/main.py:866
-msgid "F_ormat"
-msgstr "F_ormat"
-
-#: src/diffuse/main.py:867
-msgid "Convert To _Upper Case"
-msgstr "Konwertuj Na _Duże Litery"
-
-#: src/diffuse/main.py:868
-msgid "Convert To _Lower Case"
-msgstr "Konwertuj Na _Małe Litery"
-
-#: src/diffuse/main.py:870
-msgid "Sort Lines In _Ascending Order"
-msgstr "Sortuj Wiersze w Kolejności _Rosnącej"
-
-#: src/diffuse/main.py:871
-msgid "Sort Lines In D_escending Order"
-msgstr "Sortuj Wiersze w Kolejności M_alejącej"
-
-#: src/diffuse/main.py:873
-msgid "Remove Trailing _White Space"
-msgstr "Usuń Zbędne Spacje"
-
-#: src/diffuse/main.py:874
-msgid "Convert Tabs To _Spaces"
-msgstr "Konwertuj Tabulacje Na _Spacje"
-
-#: src/diffuse/main.py:875
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "Konwertuj Spacje Na _Tabulacje"
-
-#: src/diffuse/main.py:877
-msgid "_Increase Indenting"
-msgstr "_Zwiększ Wcięcie"
-
-#: src/diffuse/main.py:878
-msgid "De_crease Indenting"
-msgstr "Zm_niejsz Wcięcie"
-
-#: src/diffuse/main.py:880
-msgid "Convert To _DOS Format"
-msgstr "Konwertuj Do Formatu _DOS"
-
-#: src/diffuse/main.py:881
-msgid "Convert To _Mac Format"
-msgstr "Konwertuj Do Formatu _Mac"
-
-#: src/diffuse/main.py:882
-msgid "Convert To Uni_x Format"
-msgstr "Konwertuj Do Formatu Uni_x"
-
-#: src/diffuse/main.py:885
-msgid "_Merge"
-msgstr "_Połącz"
-
-#: src/diffuse/main.py:886
-msgid "Copy Selection _Right"
-msgstr "Skopiuj Zaznaczenie w _Prawo"
-
-#: src/diffuse/main.py:887
-msgid "Copy Selection _Left"
-msgstr "Skopiuj Zaznaczenie w _Lewo"
-
-#: src/diffuse/main.py:889
-msgid "Copy Left _Into Selection"
-msgstr "Skopiuj z Lewej _Do Zaznaczenia"
-
-#: src/diffuse/main.py:890
-msgid "Copy Right I_nto Selection"
-msgstr "Skopiuj z Prawej _Do Zaznaczenia"
-
-#: src/diffuse/main.py:891
-msgid "_Merge From Left Then Right"
-msgstr "_Scal z Lewej Potem Prawej"
-
-#: src/diffuse/main.py:892
-msgid "M_erge From Right Then Left"
-msgstr "S_cal z Prawej Potem Lewej"
-
-#: src/diffuse/main.py:895
-msgid "_Help"
-msgstr "_Pomoc"
-
-#: src/diffuse/main.py:896
-msgid "_Help Contents..."
-msgstr "_Pomoc Ogólna..."
-
-#: src/diffuse/main.py:898
-#, python-format
-msgid "_About %s..."
-msgstr "_O %s..."
-
-#: src/diffuse/main.py:913
-msgid "New 2-Way File Merge"
-msgstr "Nowy Łączenia 2 Plików"
-
-#: src/diffuse/main.py:914
-msgid "New 3-Way File Merge"
-msgstr "Nowy Łączenia 3 Plików"
-
-#: src/diffuse/main.py:916
-msgid "Realign All"
-msgstr "Wyrównaj Wszystko"
-
-#: src/diffuse/main.py:917
-msgid "First Difference"
-msgstr "Pierwsza Różnica"
-
-#: src/diffuse/main.py:918
-msgid "Previous Difference"
-msgstr "Poprzednia Różnica"
-
-#: src/diffuse/main.py:919
-msgid "Next Difference"
-msgstr "Następna Różnica"
-
-#: src/diffuse/main.py:920
-msgid "Last Difference"
-msgstr "Ostatnia Różnica"
-
-#: src/diffuse/main.py:922
-msgid "Copy Selection Right"
-msgstr "Skopiuj Zaznaczenie w Prawo"
-
-#: src/diffuse/main.py:923
-msgid "Copy Selection Left"
-msgstr "Skopiuj Zaznaczenie w Lewo"
-
-#: src/diffuse/main.py:924
-msgid "Copy Left Into Selection"
-msgstr "Skopiuj z Lewej Do Zaznaczenia"
-
-#: src/diffuse/main.py:925
-msgid "Copy Right Into Selection"
-msgstr "Skopiuj z Prawej Do Zaznaczenia"
-
-#: src/diffuse/main.py:926
-msgid "Merge From Left Then Right"
-msgstr "Scal z Lewej Potem Prawej"
-
-#: src/diffuse/main.py:927
-msgid "Merge From Right Then Left"
-msgstr "Scal z Prawej Potem Lewej"
-
-#: src/diffuse/main.py:929
-msgid "Undo"
-msgstr "Cofnij"
-
-#: src/diffuse/main.py:930
-msgid "Redo"
-msgstr "Ponów"
-
-#: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
-msgid "Cut"
-msgstr "Wytnij"
-
-#: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
-msgid "Copy"
-msgstr "Kopiuj"
-
-#: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
-msgid "Paste"
-msgstr "Wklej"
-
-#: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
-msgid "Clear Edits"
-msgstr "Wyczyść Edycje"
-
-#: src/diffuse/main.py:1057
-msgid "Some files have unsaved changes. Select the files to save before closing."
-msgstr ""
-"Niektóre pliki mają niezapisane zmiany. Wybierz pliki, aby zapisać przed "
-"zamknięciem."
-
-#: src/diffuse/main.py:1071
-msgid "Tab"
-msgstr "Karta"
-
-#: src/diffuse/main.py:1076
-msgid "Pane"
-msgstr "Okno"
-
-#: src/diffuse/main.py:1087
-msgid "Close _Without Saving"
-msgstr "Zamknij _Bez Zapisywania"
-
-#: src/diffuse/main.py:1126
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "Zamknięcie tej karty zakończy %s."
-
-#: src/diffuse/main.py:1209
-#, python-format
-msgid "File Merge %d"
-msgstr "Scal Plik %d"
-
-#: src/diffuse/main.py:1315
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "Błąd odzyskiwania commits dla %s."
-
-#: src/diffuse/main.py:1347
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "Błąd odzyskiwania modyfikacji dla % s."
-
-#: src/diffuse/main.py:1380
-msgid "Open File In New Tab"
-msgstr "Otwórz Plik w Nowej Karcie"
-
-#: src/diffuse/main.py:1403
-msgid "Choose Folder With Modified Files"
-msgstr "Wybierz Folder z Zmodyfikowanymi Plikami"
-
-#: src/diffuse/main.py:1421
-msgid "No modified files found."
-msgstr "Nie znaleziono zmodyfikowanych plików."
-
-#: src/diffuse/main.py:1427
-msgid "Choose Folder With Commit"
-msgstr "Wybierz Folder z Commit"
-
-#: src/diffuse/main.py:1447
-msgid "No committed files found."
-msgstr "Nie znaleziono plików commit."
-
-#: src/diffuse/main.py:1483
-msgid "New N-Way File Merge..."
-msgstr "Nowy N-Sposób Łączenia Pliku..."
-
-#: src/diffuse/main.py:1484
-msgid "Number of panes: "
-msgstr "Ilość okien: "
-
-#: src/diffuse/main.py:1558
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "Frazy nie znaleziono. Kontynuowane od końca pliku?"
-
-#: src/diffuse/main.py:1560
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "Frazy nie znaleziono. Kontynuowane od początku pliku?"
-
-#: src/diffuse/main.py:1781
-#, fuzzy
-msgid ""
-"Usage:\n"
-"    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"
-"also retrieve revisions of files from several VCSs for comparison and merging.\n"
-"\n"
-"Help Options:\n"
-"  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright information\n"
-"\n"
-"Configuration Options:\n"
-"  --no-rcfile                      Do not read any resource files\n"
-"  --rcfile <file>                  Specify explicit resource file\n"
-"\n"
-"General Options:\n"
-"  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
-"  ( -D | --close-if-same )         Close all tabs with no differences\n"
-"  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
-"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
-"  ( -m | --modified )              Create a new tab for each modified file\n"
-"  ( -r | --revision ) <rev>        File revision <rev>\n"
-"  ( -s | --separate )              Create a new tab for each file\n"
-"  ( -t | --tab )                   Start a new tab\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    Start with line <line> selected\n"
-"  --null-file                      Create a blank file comparison pane\n"
-"\n"
-"Display Options:\n"
-"  ( -b | --ignore-space-change )   Ignore changes to white space\n"
-"  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
-"  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
-"  ( -i | --ignore-case )           Ignore case differences\n"
-"  ( -w | --ignore-all-space )      Ignore white space differences"
-msgstr ""
-"Użycie:\n"
-"    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"
-"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"
-"Mercurial, Monotone, RCS, Subversion, i SVK  repozytorium do porównania i "
-"łączenia.\n"
-"\n"
-"Opcje pomocy:\n"
-"  ( -h | -? | --help )             Wyświetla tą informacje o użyciu\n"
-"  ( -v | --version )               Wyświetla wersje i informacje o prawach "
-"autorskich\n"
-"\n"
-"Opcje Konfiguracyjne:\n"
-"  --no-rcfile                      Nie czytaj żadnych plików konfiguracyjnych\n"
-"  --rcfile <file>                  Określ wyraźnie plik konfiguracyjny\n"
-"\n"
-"Opcje Ogólne:\n"
-"  ( -c | --commit ) <rev>          Plik rewizji <rev-1> i <rev>\n"
-"  ( -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"
-"  ( -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"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    Rozpocznij z  <linia> wybranej linii\n"
-"  --null-file                      Utwórz puste okienko porównania plików\n"
-"\n"
-"Opcje Wyświetlania:\n"
-"  ( -b | --ignore-space-change )   Ignoruj ​​zmiany w spacji\n"
-"  ( -B | --ignore-blank-lines )    Ignoruj ​​zmiany w pustych liniach\n"
-"  ( -E | --ignore-end-of-line )    Ignoruj różnice na końcu linii\n"
-"  ( -i | --ignore-case )           Ignoruj wielkości liter\n"
-"  ( -w | --ignore-all-space )      Ignoruj różnice w spacji"
-
-#: src/diffuse/main.py:1948
+#: src/diffuse/main.py:327
 msgid "Error parsing line number."
 msgstr "Błąd analizowania numer linii."
 
-#: src/diffuse/main.py:1958
-#, python-format
-msgid "Skipping unknown argument \"%s\"."
-msgstr "Pomijanie nieznanego argumentu \"%s\"."
-
-#: src/diffuse/main.py:1966
+#: src/diffuse/main.py:343
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Błąd przetwarzania argumentu \"%s\". Nie oczekiwano katalogu."
 
-#: src/diffuse/preferences.py:80
+#: src/diffuse/preferences.py:75
 msgid "Display"
 msgstr "Wyświetl"
 
-#: src/diffuse/preferences.py:83
+#: src/diffuse/preferences.py:78
 msgid "Font"
 msgstr "Czcionka"
 
-#: src/diffuse/preferences.py:84
+#: src/diffuse/preferences.py:79
 msgid "Tab width"
 msgstr "Szerokość tabulacji"
 
-#: src/diffuse/preferences.py:85
+#: src/diffuse/preferences.py:80
 msgid "Show right margin"
 msgstr "Pokaż prawy margines"
 
-#: src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:81
 msgid "Right margin"
 msgstr "Prawy margines"
 
-#: src/diffuse/preferences.py:87
+#: src/diffuse/preferences.py:82
 msgid "Show line numbers"
 msgstr "Pokaż numerowanie linii"
 
-#: src/diffuse/preferences.py:88
+#: src/diffuse/preferences.py:83
 msgid "Show white space characters"
 msgstr "Pokaż znaki spacji"
 
-#: src/diffuse/preferences.py:89
-msgid "Ignore case differences"
-msgstr "Ignoruj różnice w wielkość liter"
-
-#: src/diffuse/preferences.py:90
-msgid "Ignore white space differences"
-msgstr "Ignoruj różnice spacji"
-
-#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100
-msgid "Ignore changes to white space"
-msgstr "Ignoruj zmiany w spacji"
-
-#: src/diffuse/preferences.py:92
+#: src/diffuse/preferences.py:87
 msgid "Ignore blank line differences"
 msgstr "Ignoruj różnice pustych linii"
 
-#: src/diffuse/preferences.py:93
-msgid "Ignore end of line differences"
-msgstr "Ignoruj różnice na końcu linii"
-
-#: src/diffuse/preferences.py:95
+#: src/diffuse/preferences.py:90
 msgid "Alignment"
 msgstr "Dostosowanie"
 
-#: src/diffuse/preferences.py:98
+#: src/diffuse/preferences.py:93
 msgid "Ignore case"
 msgstr "Ignoruj wielkość liter"
 
-#: src/diffuse/preferences.py:99
+#: src/diffuse/preferences.py:94
 msgid "Ignore white space"
 msgstr "Ignoruj spacje"
 
-#: src/diffuse/preferences.py:101
+#: src/diffuse/preferences.py:96
 msgid "Ignore blank lines"
 msgstr "Ignoruj puste wiersze"
 
-#: src/diffuse/preferences.py:102
+#: src/diffuse/preferences.py:97
 msgid "Ignore end of line characters"
 msgstr "Ignoruj końcowe znaki linii"
 
-#: src/diffuse/preferences.py:104
+#: src/diffuse/preferences.py:99
 msgid "Editor"
 msgstr "Edytor"
 
-#: src/diffuse/preferences.py:107
+#: src/diffuse/preferences.py:102
 msgid "Auto indent"
 msgstr "Automatyczne wcięcia"
 
-#: src/diffuse/preferences.py:108
+#: src/diffuse/preferences.py:103
 msgid "Expand tabs to spaces"
 msgstr "Zamiana tabulacji na spacje"
 
-#: src/diffuse/preferences.py:109
+#: src/diffuse/preferences.py:104
 msgid "Soft tab width"
 msgstr "Miękka szerokość tabulacji"
 
-#: src/diffuse/preferences.py:111
+#: src/diffuse/preferences.py:106
 msgid "Tabs"
 msgstr "Karty"
 
-#: src/diffuse/preferences.py:114
+#: src/diffuse/preferences.py:109
 msgid "Default panes"
 msgstr "Domyślne Okna"
 
-#: src/diffuse/preferences.py:115
+#: src/diffuse/preferences.py:110
 msgid "Always show the tab bar"
 msgstr "Zawsze pokazuj pasek kart"
 
-#: src/diffuse/preferences.py:116
+#: src/diffuse/preferences.py:111
 #, 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:118
+#: src/diffuse/preferences.py:113
 msgid "Regional Settings"
 msgstr "Regionalne Ustawienia"
 
-#: src/diffuse/preferences.py:121
+#: src/diffuse/preferences.py:116
 msgid "Default codec"
 msgstr "Domyślne kodowanie znaków"
 
-#: src/diffuse/preferences.py:122
+#: src/diffuse/preferences.py:117
 msgid "Order of codecs used to identify encoding"
 msgstr "Kolejny kodek używany do identyfikacji kodowania"
 
-#: src/diffuse/preferences.py:143
+#: src/diffuse/preferences.py:138
 msgid "Cygwin"
 msgstr "Cygwin"
 
-#: src/diffuse/preferences.py:145
+#: src/diffuse/preferences.py:140
 msgid "Root directory"
 msgstr "Główny katalog"
 
-#: src/diffuse/preferences.py:146
+#: src/diffuse/preferences.py:141
 msgid "Cygdrive prefix"
 msgstr "Cygdrive Prefiks"
 
-#: src/diffuse/preferences.py:165
-msgid "Version control system search order"
-msgstr ""
-
-#: src/diffuse/preferences.py:173
+#: src/diffuse/preferences.py:167
 msgid "\"co\" command"
 msgstr "\"co\" polecenie"
 
-#: src/diffuse/preferences.py:174
+#: src/diffuse/preferences.py:168
 msgid "\"rlog\" command"
 msgstr "\"rlog\" polecenie"
 
-#: src/diffuse/preferences.py:176
+#: src/diffuse/preferences.py:170
 msgid "Command"
 msgstr "Polecenie"
 
-#: src/diffuse/preferences.py:182
+#: src/diffuse/preferences.py:176
 msgid "Launch from a Bash login shell"
 msgstr "Uruchom z powłoki Bash"
 
-#: src/diffuse/preferences.py:189
+#: src/diffuse/preferences.py:183
 msgid "Update paths for Cygwin"
 msgstr "Aktualizacja ścieżki dla Cygwin"
 
-#: src/diffuse/preferences.py:194
+#: src/diffuse/preferences.py:188
 msgid "Version Control"
 msgstr "Wersja kontrolna"
 
-#: src/diffuse/preferences.py:259
+#: src/diffuse/preferences.py:253
 msgid "Preferences"
 msgstr "Preferencje"
 
+#: src/diffuse/preferences.py:294 src/diffuse/window.py:580
+#, python-format
+msgid "Error writing %s."
+msgstr "Błąd zapisu %s."
+
+#: src/diffuse/preferences.py:483 src/diffuse/window.py:446
+#: src/diffuse/window.py:1413 src/diffuse/window.py:1436 src/diffuse/window.py:1459
+msgid "_Open"
+msgstr ""
+
 #: src/diffuse/resources.py:242 src/diffuse/resources.py:246
 #: src/diffuse/resources.py:249
 #, python-brace-format
@@ -938,16 +414,11 @@ msgstr "Błąd przetwarzania linii {line} w {file}."
 msgid "Auto Detect"
 msgstr "Automatyczne Wykrywanie"
 
-#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97
+#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:96
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "Błąd analizowania rewizji %s."
 
-#: src/diffuse/vcs/vcs_registry.py:238
-#, python-format
-msgid "Error parsing %s."
-msgstr "Błędy analizowania %s."
-
 #: src/diffuse/widgets.py:1857
 msgid "Align with Selection"
 msgstr "Wyrównaj do zaznaczenia"
@@ -960,10 +431,644 @@ msgstr "Oddziel"
 msgid "Merge Selection"
 msgstr "Scal Zaznaczenie"
 
+#: src/diffuse/widgets.py:1861 src/diffuse/window.py:865
+msgid "Cut"
+msgstr "Wytnij"
+
+#: src/diffuse/widgets.py:1862 src/diffuse/window.py:866
+msgid "Copy"
+msgstr "Kopiuj"
+
+#: src/diffuse/widgets.py:1863 src/diffuse/window.py:867
+msgid "Paste"
+msgstr "Wklej"
+
 #: src/diffuse/widgets.py:1865
 msgid "Select All"
 msgstr "Zaznacz Wszystko"
 
+#: src/diffuse/widgets.py:1866 src/diffuse/window.py:868
+msgid "Clear Edits"
+msgstr "Wyczyść Edycje"
+
 #: src/diffuse/widgets.py:1868
 msgid "Swap with Selected Pane"
 msgstr "Zamień z Zaznaczonym Oknem"
+
+#: src/diffuse/window.py:83
+msgid "Close Tab"
+msgstr "Zamknij Kartę"
+
+#: src/diffuse/window.py:126
+msgid "Open File..."
+msgstr "Otwórz Plik..."
+
+#: src/diffuse/window.py:127
+msgid "Reload File"
+msgstr "Odśwież Plik"
+
+#: src/diffuse/window.py:128
+msgid "Save File"
+msgstr "Zapisz Plik"
+
+#: src/diffuse/window.py:129
+msgid "Save File As..."
+msgstr "Zapisz Plik Jako..."
+
+#: src/diffuse/window.py:228
+#, python-format
+msgid "Column %d"
+msgstr "Kolumna %d"
+
+#: src/diffuse/window.py:306
+msgid "Save changes before loading the new file?"
+msgstr "Zapisać zmiany przed wczytaniem nowego pliku?"
+
+#: src/diffuse/window.py:310
+msgid "_No"
+msgstr ""
+
+#: src/diffuse/window.py:311
+msgid "_Yes"
+msgstr ""
+
+#: src/diffuse/window.py:417
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "Błąd odczytu rewizji %(rev)s z %(file)s."
+
+#: src/diffuse/window.py:442
+msgid "Open File"
+msgstr "Otwórz Plik"
+
+#: src/diffuse/window.py:495
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "Zapisz %(title)s Okno %(pane)d"
+
+#: src/diffuse/window.py:499 src/diffuse/window.py:1111
+#, fuzzy
+msgid "_Save"
+msgstr "_Zapisz plik"
+
+#: src/diffuse/window.py:527
+#, python-format
+msgid "A file named %s already exists. Do you want to overwrite it?"
+msgstr "Plik o nazwie %s już istnieje. Czy chcesz go zastąpić?"
+
+#: src/diffuse/window.py:534
+#, 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 ""
+"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/window.py:576
+#, python-format
+msgid "Error encoding to %s."
+msgstr "Błąd kodowania dla %s."
+
+#: src/diffuse/window.py:610
+msgid "Go To Line..."
+msgstr "Idź Do Linii..."
+
+#: src/diffuse/window.py:611
+msgid "Line Number: "
+msgstr "Numer Linii: "
+
+#: src/diffuse/window.py:642
+msgid ""
+"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ć."
+
+#: src/diffuse/window.py:646
+msgid "Press the escape key to finish editing."
+msgstr "Naciśnij klawisz escape, aby zakończyć edycję."
+
+#: src/diffuse/window.py:649
+msgid ""
+"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ć."
+
+#: src/diffuse/window.py:710
+msgid "_File"
+msgstr "_Plik"
+
+#: src/diffuse/window.py:712
+msgid "_Open File..."
+msgstr "_Otwórz Plik..."
+
+#: src/diffuse/window.py:713
+msgid "Open File In New _Tab..."
+msgstr "Otwórz Plik w Nowej _Karcie..."
+
+#: src/diffuse/window.py:714
+msgid "Open _Modified Files..."
+msgstr "Otwórz _Zmodyfikowany Plik..."
+
+#: src/diffuse/window.py:715
+msgid "Open Commi_t..."
+msgstr "Otwórz Commi_t..."
+
+#: src/diffuse/window.py:716
+msgid "_Reload File"
+msgstr "_Odśwież Plik"
+
+#: src/diffuse/window.py:718
+msgid "_Save File"
+msgstr "_Zapisz plik"
+
+#: src/diffuse/window.py:719
+msgid "Save File _As..."
+msgstr "Zapisz Plik _Jako..."
+
+#: src/diffuse/window.py:720
+msgid "Save A_ll"
+msgstr "Zapisz W_szystko"
+
+#: src/diffuse/window.py:722
+msgid "New _2-Way File Merge"
+msgstr "Nowy Łączenia _2 Plików"
+
+#: src/diffuse/window.py:723
+msgid "New _3-Way File Merge"
+msgstr "Nowy Łączenia _3 Plików"
+
+#: src/diffuse/window.py:724
+msgid "New _N-Way File Merge..."
+msgstr "Nowy _N-Sposób Łączenia Pliku..."
+
+#: src/diffuse/window.py:726
+msgid "_Close Tab"
+msgstr "_Zamknij Kartę"
+
+#: src/diffuse/window.py:727
+msgid "_Undo Close Tab"
+msgstr "_Przywróć Zamkniętą Kartę"
+
+#: src/diffuse/window.py:728
+msgid "_Quit"
+msgstr "_Zamknij"
+
+#: src/diffuse/window.py:732
+msgid "_Edit"
+msgstr "_Edytuj"
+
+#: src/diffuse/window.py:734
+msgid "_Undo"
+msgstr "_Cofnij"
+
+#: src/diffuse/window.py:735
+msgid "_Redo"
+msgstr "_Ponów"
+
+#: src/diffuse/window.py:737
+msgid "Cu_t"
+msgstr "Wy_tnij"
+
+#: src/diffuse/window.py:738
+msgid "_Copy"
+msgstr "_Kopiuj"
+
+#: src/diffuse/window.py:739
+msgid "_Paste"
+msgstr "_Wklej"
+
+#: src/diffuse/window.py:741
+msgid "Select _All"
+msgstr "Zaznacz _Wszystko"
+
+#: src/diffuse/window.py:742
+msgid "C_lear Edits"
+msgstr "W_yczyść Edycje"
+
+#: src/diffuse/window.py:743
+msgid "_Dismiss All Edits"
+msgstr "_Odrzuć Wszystkie Edycje"
+
+#: src/diffuse/window.py:745
+msgid "_Find..."
+msgstr "_Znajdź..."
+
+#: src/diffuse/window.py:746
+msgid "Find _Next"
+msgstr "Znajdź _Następny"
+
+#: src/diffuse/window.py:747
+msgid "Find Pre_vious"
+msgstr "Znajdź Pop_rzedni"
+
+#: src/diffuse/window.py:748
+msgid "_Go To Line..."
+msgstr "_Idź Do Linii..."
+
+#: src/diffuse/window.py:750
+msgid "Pr_eferences..."
+msgstr "Pr_eferencje..."
+
+#: src/diffuse/window.py:754
+msgid "None"
+msgstr "Brak"
+
+#: src/diffuse/window.py:776
+msgid "_View"
+msgstr "_Widok"
+
+#: src/diffuse/window.py:778
+msgid "_Syntax Highlighting"
+msgstr "_Podświetlanie Składni"
+
+#: src/diffuse/window.py:780
+msgid "Re_align All"
+msgstr "Wy_równaj Wszystko"
+
+#: src/diffuse/window.py:781
+msgid "_Isolate"
+msgstr "_Odizoluj"
+
+#: src/diffuse/window.py:783
+msgid "_First Difference"
+msgstr "_Pierwsza Różnica"
+
+#: src/diffuse/window.py:784
+msgid "_Previous Difference"
+msgstr "_Poprzednia Różnica"
+
+#: src/diffuse/window.py:785
+msgid "_Next Difference"
+msgstr "_Następna Różnica"
+
+#: src/diffuse/window.py:786
+msgid "_Last Difference"
+msgstr "_Ostatnia Różnica"
+
+#: src/diffuse/window.py:788
+msgid "Fir_st Tab"
+msgstr "Pie_rwsza Karta"
+
+#: src/diffuse/window.py:789
+msgid "Pre_vious Tab"
+msgstr "Pop_rzednia Karta"
+
+#: src/diffuse/window.py:790
+msgid "Next _Tab"
+msgstr "Następna _Karta"
+
+#: src/diffuse/window.py:791
+msgid "Las_t Tab"
+msgstr "Osta_tnia Karta"
+
+#: src/diffuse/window.py:793
+msgid "Shift Pane _Right"
+msgstr "Przesuń Okno w _Prawo"
+
+#: src/diffuse/window.py:794
+msgid "Shift Pane _Left"
+msgstr "Przesuń Okno w _Lewo"
+
+#: src/diffuse/window.py:798
+msgid "F_ormat"
+msgstr "F_ormat"
+
+#: src/diffuse/window.py:800
+msgid "Convert To _Upper Case"
+msgstr "Konwertuj Na _Duże Litery"
+
+#: src/diffuse/window.py:801
+msgid "Convert To _Lower Case"
+msgstr "Konwertuj Na _Małe Litery"
+
+#: src/diffuse/window.py:803
+msgid "Sort Lines In _Ascending Order"
+msgstr "Sortuj Wiersze w Kolejności _Rosnącej"
+
+#: src/diffuse/window.py:804
+msgid "Sort Lines In D_escending Order"
+msgstr "Sortuj Wiersze w Kolejności M_alejącej"
+
+#: src/diffuse/window.py:806
+msgid "Remove Trailing _White Space"
+msgstr "Usuń Zbędne Spacje"
+
+#: src/diffuse/window.py:807
+msgid "Convert Tabs To _Spaces"
+msgstr "Konwertuj Tabulacje Na _Spacje"
+
+#: src/diffuse/window.py:808
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "Konwertuj Spacje Na _Tabulacje"
+
+#: src/diffuse/window.py:810
+msgid "_Increase Indenting"
+msgstr "_Zwiększ Wcięcie"
+
+#: src/diffuse/window.py:811
+msgid "De_crease Indenting"
+msgstr "Zm_niejsz Wcięcie"
+
+#: src/diffuse/window.py:813
+msgid "Convert To _DOS Format"
+msgstr "Konwertuj Do Formatu _DOS"
+
+#: src/diffuse/window.py:814
+msgid "Convert To _Mac Format"
+msgstr "Konwertuj Do Formatu _Mac"
+
+#: src/diffuse/window.py:815
+msgid "Convert To Uni_x Format"
+msgstr "Konwertuj Do Formatu Uni_x"
+
+#: src/diffuse/window.py:819
+msgid "_Merge"
+msgstr "_Połącz"
+
+#: src/diffuse/window.py:821
+msgid "Copy Selection _Right"
+msgstr "Skopiuj Zaznaczenie w _Prawo"
+
+#: src/diffuse/window.py:822
+msgid "Copy Selection _Left"
+msgstr "Skopiuj Zaznaczenie w _Lewo"
+
+#: src/diffuse/window.py:824
+msgid "Copy Left _Into Selection"
+msgstr "Skopiuj z Lewej _Do Zaznaczenia"
+
+#: src/diffuse/window.py:825
+msgid "Copy Right I_nto Selection"
+msgstr "Skopiuj z Prawej _Do Zaznaczenia"
+
+#: src/diffuse/window.py:826
+msgid "_Merge From Left Then Right"
+msgstr "_Scal z Lewej Potem Prawej"
+
+#: src/diffuse/window.py:827
+msgid "M_erge From Right Then Left"
+msgstr "S_cal z Prawej Potem Lewej"
+
+#: src/diffuse/window.py:831
+msgid "_Help"
+msgstr "_Pomoc"
+
+#: src/diffuse/window.py:833
+msgid "_Help Contents..."
+msgstr "_Pomoc Ogólna..."
+
+#: src/diffuse/window.py:835
+#, python-format
+msgid "_About %s..."
+msgstr "_O %s..."
+
+#: src/diffuse/window.py:847
+msgid "New 2-Way File Merge"
+msgstr "Nowy Łączenia 2 Plików"
+
+#: src/diffuse/window.py:848
+msgid "New 3-Way File Merge"
+msgstr "Nowy Łączenia 3 Plików"
+
+#: src/diffuse/window.py:850
+msgid "Realign All"
+msgstr "Wyrównaj Wszystko"
+
+#: src/diffuse/window.py:851
+msgid "First Difference"
+msgstr "Pierwsza Różnica"
+
+#: src/diffuse/window.py:852
+msgid "Previous Difference"
+msgstr "Poprzednia Różnica"
+
+#: src/diffuse/window.py:853
+msgid "Next Difference"
+msgstr "Następna Różnica"
+
+#: src/diffuse/window.py:854
+msgid "Last Difference"
+msgstr "Ostatnia Różnica"
+
+#: src/diffuse/window.py:856
+msgid "Copy Selection Right"
+msgstr "Skopiuj Zaznaczenie w Prawo"
+
+#: src/diffuse/window.py:857
+msgid "Copy Selection Left"
+msgstr "Skopiuj Zaznaczenie w Lewo"
+
+#: src/diffuse/window.py:858
+msgid "Copy Left Into Selection"
+msgstr "Skopiuj z Lewej Do Zaznaczenia"
+
+#: src/diffuse/window.py:859
+msgid "Copy Right Into Selection"
+msgstr "Skopiuj z Prawej Do Zaznaczenia"
+
+#: src/diffuse/window.py:860
+msgid "Merge From Left Then Right"
+msgstr "Scal z Lewej Potem Prawej"
+
+#: src/diffuse/window.py:861
+msgid "Merge From Right Then Left"
+msgstr "Scal z Prawej Potem Lewej"
+
+#: src/diffuse/window.py:863
+msgid "Undo"
+msgstr "Cofnij"
+
+#: src/diffuse/window.py:864
+msgid "Redo"
+msgstr "Ponów"
+
+#: src/diffuse/window.py:950
+msgid "Changes detected"
+msgstr ""
+
+#: src/diffuse/window.py:954
+#, fuzzy, python-format
+msgid ""
+"The file \"%s\" changed on disk.\n"
+"\n"
+"Do you want to reload the file?"
+msgstr "Plik %s został zmieniony na dysku. Czy chcesz odświeżyć plik?"
+
+#: src/diffuse/window.py:959
+#, fuzzy, python-format
+msgid ""
+"The following files changed on disk:\n"
+"%s\n"
+"\n"
+"Do you want to reload these files?"
+msgstr "Plik %s został zmieniony na dysku. Czy chcesz odświeżyć plik?"
+
+#: src/diffuse/window.py:1078
+msgid "Some files have unsaved changes. Select the files to save before closing."
+msgstr ""
+"Niektóre pliki mają niezapisane zmiany. Wybierz pliki, aby zapisać przed "
+"zamknięciem."
+
+#: src/diffuse/window.py:1092
+msgid "Tab"
+msgstr "Karta"
+
+#: src/diffuse/window.py:1097
+msgid "Pane"
+msgstr "Okno"
+
+#: src/diffuse/window.py:1108
+msgid "Close _Without Saving"
+msgstr "Zamknij _Bez Zapisywania"
+
+#: src/diffuse/window.py:1147
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "Zamknięcie tej karty zakończy %s."
+
+#: src/diffuse/window.py:1224
+#, python-format
+msgid "File Merge %d"
+msgstr "Scal Plik %d"
+
+#: src/diffuse/window.py:1344
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "Błąd odzyskiwania commits dla %s."
+
+#: src/diffuse/window.py:1376
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "Błąd odzyskiwania modyfikacji dla % s."
+
+#: src/diffuse/window.py:1409
+msgid "Open File In New Tab"
+msgstr "Otwórz Plik w Nowej Karcie"
+
+#: src/diffuse/window.py:1432
+msgid "Choose Folder With Modified Files"
+msgstr "Wybierz Folder z Zmodyfikowanymi Plikami"
+
+#: src/diffuse/window.py:1450
+msgid "No modified files found."
+msgstr "Nie znaleziono zmodyfikowanych plików."
+
+#: src/diffuse/window.py:1456
+msgid "Choose Folder With Commit"
+msgstr "Wybierz Folder z Commit"
+
+#: src/diffuse/window.py:1476
+msgid "No committed files found."
+msgstr "Nie znaleziono plików commit."
+
+#: src/diffuse/window.py:1512
+msgid "New N-Way File Merge..."
+msgstr "Nowy N-Sposób Łączenia Pliku..."
+
+#: src/diffuse/window.py:1513
+msgid "Number of panes: "
+msgstr "Ilość okien: "
+
+#: src/diffuse/window.py:1587
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "Frazy nie znaleziono. Kontynuowane od końca pliku?"
+
+#: src/diffuse/window.py:1589
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "Frazy nie znaleziono. Kontynuowane od początku pliku?"
+
+#: src/diffuse/window.py:1762
+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/window.py:1766
+msgid "translator-credits"
+msgstr "Miś Uszatek <adres.email@ymail.com>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage:\n"
+#~ "    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"
+#~ "also retrieve revisions of files from several VCSs for comparison and "
+#~ "merging.\n"
+#~ "\n"
+#~ "Help Options:\n"
+#~ "  ( -h | -? | --help )             Display this usage information\n"
+#~ "  ( -v | --version )               Display version and copyright information\n"
+#~ "\n"
+#~ "Configuration Options:\n"
+#~ "  --no-rcfile                      Do not read any resource files\n"
+#~ "  --rcfile <file>                  Specify explicit resource file\n"
+#~ "\n"
+#~ "General Options:\n"
+#~ "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
+#~ "  ( -D | --close-if-same )         Close all tabs with no differences\n"
+#~ "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+#~ "  ( -L | --label ) <label>         Display <label> instead of the file name\n"
+#~ "  ( -m | --modified )              Create a new tab for each modified file\n"
+#~ "  ( -r | --revision ) <rev>        File revision <rev>\n"
+#~ "  ( -s | --separate )              Create a new tab for each file\n"
+#~ "  ( -t | --tab )                   Start a new tab\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    Start with line <line> selected\n"
+#~ "  --null-file                      Create a blank file comparison pane\n"
+#~ "\n"
+#~ "Display Options:\n"
+#~ "  ( -b | --ignore-space-change )   Ignore changes to white space\n"
+#~ "  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
+#~ "  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
+#~ "  ( -i | --ignore-case )           Ignore case differences\n"
+#~ "  ( -w | --ignore-all-space )      Ignore white space differences"
+#~ msgstr ""
+#~ "Użycie:\n"
+#~ "    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"
+#~ "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"
+#~ "Mercurial, Monotone, RCS, Subversion, i SVK  repozytorium do porównania i "
+#~ "łączenia.\n"
+#~ "\n"
+#~ "Opcje pomocy:\n"
+#~ "  ( -h | -? | --help )             Wyświetla tą informacje o użyciu\n"
+#~ "  ( -v | --version )               Wyświetla wersje i informacje o prawach "
+#~ "autorskich\n"
+#~ "\n"
+#~ "Opcje Konfiguracyjne:\n"
+#~ "  --no-rcfile                      Nie czytaj żadnych plików konfiguracyjnych\n"
+#~ "  --rcfile <file>                  Określ wyraźnie plik konfiguracyjny\n"
+#~ "\n"
+#~ "Opcje Ogólne:\n"
+#~ "  ( -c | --commit ) <rev>          Plik rewizji <rev-1> i <rev>\n"
+#~ "  ( -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"
+#~ "  ( -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"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    Rozpocznij z  <linia> wybranej linii\n"
+#~ "  --null-file                      Utwórz puste okienko porównania plików\n"
+#~ "\n"
+#~ "Opcje Wyświetlania:\n"
+#~ "  ( -b | --ignore-space-change )   Ignoruj ​​zmiany w spacji\n"
+#~ "  ( -B | --ignore-blank-lines )    Ignoruj ​​zmiany w pustych liniach\n"
+#~ "  ( -E | --ignore-end-of-line )    Ignoruj różnice na końcu linii\n"
+#~ "  ( -i | --ignore-case )           Ignoruj wielkości liter\n"
+#~ "  ( -w | --ignore-all-space )      Ignoruj różnice w spacji"
diff --git a/po/pt.po b/po/pt.po
index 7fbac1b..19d33e9 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse-svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-23 20:00-0400\n"
+"POT-Creation-Date: 2023-04-16 14:09-0400\n"
 "PO-Revision-Date: 2022-04-04 12:19-0400\n"
 "Last-Translator: Pedro Albuquerque <pmra@gmx.com>\n"
 "Language-Team: Português <pmra@gmx.com>\n"
@@ -35,826 +35,303 @@ 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."
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, and "
+"Subversion repositories."
 msgstr ""
 
-#: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
-msgid "Main window: diff between two files"
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:28
+msgid "Main window"
 msgstr ""
 
-#: src/diffuse/constants.py:25
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:32
+msgid "About window"
+msgstr ""
+
+#: src/diffuse/constants.py:26
 msgid "Copyright"
 msgstr ""
 
-#: src/diffuse/dialogs.py:40
-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:46 src/diffuse/dialogs.py:89 src/diffuse/dialogs.py:133
+#: src/diffuse/preferences.py:254 src/diffuse/preferences.py:483
+#: src/diffuse/window.py:309 src/diffuse/window.py:1107
+msgid "_Cancel"
+msgstr ""
 
-#: src/diffuse/dialogs.py:45
-msgid "translator-credits"
-msgstr "Pedro Albuquerque <pmra@gmx.com>"
-
-#: src/diffuse/dialogs.py:82
+#: src/diffuse/dialogs.py:50
 msgid "Encoding: "
 msgstr "Codificação: "
 
-#: src/diffuse/dialogs.py:94
+#: src/diffuse/dialogs.py:62
 msgid "Revision: "
 msgstr "Revisão: "
 
-#: src/diffuse/dialogs.py:156
+#: src/diffuse/dialogs.py:90 src/diffuse/dialogs.py:134
+#: src/diffuse/preferences.py:255
+msgid "_OK"
+msgstr ""
+
+#: src/diffuse/dialogs.py:130
 msgid "Find..."
 msgstr "Localizar..."
 
-#: src/diffuse/dialogs.py:164
+#: src/diffuse/dialogs.py:140
 msgid "Search For: "
 msgstr "Procurar por: "
 
-#: src/diffuse/dialogs.py:189
+#: src/diffuse/dialogs.py:165
 msgid "Match Case"
 msgstr "Comparar maiúsculas"
 
-#: src/diffuse/dialogs.py:194
+#: src/diffuse/dialogs.py:170
 msgid "Search Backwards"
 msgstr "Procurar para trás"
 
+#: src/diffuse/main.py:53
+msgid "Display version and copyright information"
+msgstr "Mostra informação da versão e direitos de autor"
+
+#: src/diffuse/main.py:61
+msgid "Do not read any resource files"
+msgstr "Não lê qualquer ficheiro de recursos"
+
+#: src/diffuse/main.py:69
+msgid "Specify explicit resource file"
+msgstr "especifica um ficheiro de recursos especifico"
+
+#: src/diffuse/main.py:77
+msgid "File revisions <rev-1> and <rev>"
+msgstr "revisões de ficheiros <rev-1> e <rev>"
+
 #: src/diffuse/main.py:85
-msgid "Close Tab"
-msgstr "Fechar separador"
+msgid "Close all tabs with no differences"
+msgstr "fecha todos os separadores sem diferenças"
 
-#: src/diffuse/main.py:132
-msgid "Open File..."
-msgstr "Abrir ficheiro..."
+#: src/diffuse/main.py:92
+msgid "Use <codec> to read and write files"
+msgstr "Usa <codec> para ler e escreve ficheiros"
 
-#: src/diffuse/main.py:133
-msgid "Reload File"
-msgstr "Recarregar ficheiro"
+#: src/diffuse/main.py:100
+msgid "Display <label> instead of the file name"
+msgstr "Mostra <etiqueta> em vez do nome do ficheiro"
 
-#: src/diffuse/main.py:134
-msgid "Save File"
-msgstr "Gravar ficheiro"
+#: src/diffuse/main.py:108
+msgid "Create a new tab for each modified file"
+msgstr "Cria um novo separador para cada ficheiro modificado"
 
-#: src/diffuse/main.py:135
-msgid "Save File As..."
-msgstr "Gravar ficheiro como..."
+#: src/diffuse/main.py:115
+msgid "File revision <rev>"
+msgstr "Revisão de ficheiro <rev>"
 
-#: src/diffuse/main.py:217
-#, python-format
-msgid "Column %d"
-msgstr "Coluna %d"
+#: src/diffuse/main.py:123
+msgid "Create a new tab for each file"
+msgstr "Cria um novo separador para cada ficheiro"
 
-#: src/diffuse/main.py:291
-msgid "Save changes before loading the new file?"
-msgstr "Gravar alterações antes de carregar o novo ficheiro?"
+#: src/diffuse/main.py:130
+msgid "Start a new tab"
+msgstr "Começa um novo separador"
 
-#: src/diffuse/main.py:402
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "Erro ao ler a revisão %(rev)s de %(file)s."
+#: src/diffuse/main.py:137 src/diffuse/preferences.py:159
+msgid "Version control system search order"
+msgstr ""
 
-#: src/diffuse/main.py:405 src/diffuse/main.py:1860
+#: src/diffuse/main.py:145
+msgid "Start with line <line> selected"
+msgstr "Começa com a linha <linha> seleccionada"
+
+#: src/diffuse/main.py:153
+msgid "Create a blank file comparison pane"
+msgstr "Cria um novo painel de comparação"
+
+#: src/diffuse/main.py:160 src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:95
+msgid "Ignore changes to white space"
+msgstr "Ignorar alterações a espaços"
+
+#: src/diffuse/main.py:167
+msgid "Ignore changes in blank lines"
+msgstr "Ignora alterações a linhas em branco"
+
+#: src/diffuse/main.py:174 src/diffuse/preferences.py:88
+msgid "Ignore end of line differences"
+msgstr "Ignorar diferenças de fins de linha"
+
+#: src/diffuse/main.py:181 src/diffuse/preferences.py:84
+msgid "Ignore case differences"
+msgstr "Ignorar diferenças de maiúsculas"
+
+#: src/diffuse/main.py:188 src/diffuse/preferences.py:85
+msgid "Ignore white space differences"
+msgstr "Ignorar diferenças de espaços"
+
+#: src/diffuse/main.py:191
+msgid ""
+"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 several VCSs for comparison and merging."
+msgstr ""
+
+#: src/diffuse/main.py:247 src/diffuse/window.py:420
 #, python-format
 msgid "Error reading %s."
 msgstr "Erro ao ler %s."
 
-#: src/diffuse/main.py:427
-msgid "Open File"
-msgstr "Abrir ficheiro"
-
-#: src/diffuse/main.py:484
-#, python-format
-msgid "The file %s changed on disk. Do you want to reload the file?"
-msgstr "O ficheiro %s foi alterado no disco. Deseja recarregá-lo?"
-
-#: src/diffuse/main.py:510
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "Gravar %(title)s painel %(pane)d"
-
-#: src/diffuse/main.py:542
-#, python-format
-msgid "A file named %s already exists. Do you want to overwrite it?"
-msgstr "Já existe um ficheiro chamado %s. Deseja sobrescrevê-lo?"
-
-#: src/diffuse/main.py:549
-#, 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 ""
-"O ficheiro %s foi modificado por outro processo desde a leitura. Se gravar, "
-"perderá todas as alterações externas. Gravar mesmo assim?"
-
-#: src/diffuse/main.py:591
-#, python-format
-msgid "Error encoding to %s."
-msgstr "Erro ao codificar para %s."
-
-#: src/diffuse/main.py:595 src/diffuse/preferences.py:300
-#, python-format
-msgid "Error writing %s."
-msgstr "Erro ao excrever %s."
-
-#: src/diffuse/main.py:625
-msgid "Go To Line..."
-msgstr "Ir para linha..."
-
-#: src/diffuse/main.py:626
-msgid "Line Number: "
-msgstr "Número de linha: "
-
-#: src/diffuse/main.py:657
-msgid ""
-"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."
-
-#: src/diffuse/main.py:661
-msgid "Press the escape key to finish editing."
-msgstr "Prima Esc para terminar a edição."
-
-#: src/diffuse/main.py:664
-msgid ""
-"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."
-
-#: src/diffuse/main.py:787
-msgid "_File"
-msgstr "_Ficheiro"
-
-#: src/diffuse/main.py:788
-msgid "_Open File..."
-msgstr "Abrir ficheir_o..."
-
-#: src/diffuse/main.py:789
-msgid "Open File In New _Tab..."
-msgstr "Abrir ficheiro em no_vo separador..."
-
-#: src/diffuse/main.py:790
-msgid "Open _Modified Files..."
-msgstr "Abrir ficheiros _modificados..."
-
-#: src/diffuse/main.py:791
-msgid "Open Commi_t..."
-msgstr "Abrir rev_isão..."
-
-#: src/diffuse/main.py:792
-msgid "_Reload File"
-msgstr "_Recarregar ficheiro"
-
-#: src/diffuse/main.py:794
-msgid "_Save File"
-msgstr "_Gravar ficheiro"
-
-#: src/diffuse/main.py:795
-msgid "Save File _As..."
-msgstr "Gr_avar ficheiro como..."
-
-#: src/diffuse/main.py:796
-msgid "Save A_ll"
-msgstr "Gravar _tudo"
-
-#: src/diffuse/main.py:798
-msgid "New _2-Way File Merge"
-msgstr "Nova união de _2 vias"
-
-#: src/diffuse/main.py:799
-msgid "New _3-Way File Merge"
-msgstr "Nova união de _3 vias"
-
-#: src/diffuse/main.py:800
-msgid "New _N-Way File Merge..."
-msgstr "Nova união de _N vias..."
-
-#: src/diffuse/main.py:802
-msgid "_Close Tab"
-msgstr "Fe_char separador"
-
-#: src/diffuse/main.py:803
-msgid "_Undo Close Tab"
-msgstr "Desfa_zer Fechar separador"
-
-#: src/diffuse/main.py:804
-msgid "_Quit"
-msgstr "_Sair"
-
-#: src/diffuse/main.py:807
-msgid "_Edit"
-msgstr "_Editar"
-
-#: src/diffuse/main.py:808
-msgid "_Undo"
-msgstr "_Desfazer"
-
-#: src/diffuse/main.py:809
-msgid "_Redo"
-msgstr "_Refazer"
-
-#: src/diffuse/main.py:811
-msgid "Cu_t"
-msgstr "Cor_tar"
-
-#: src/diffuse/main.py:812
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: src/diffuse/main.py:813
-msgid "_Paste"
-msgstr "Co_lar"
-
-#: src/diffuse/main.py:815
-msgid "Select _All"
-msgstr "Seleccion_ar tudo"
-
-#: src/diffuse/main.py:816
-msgid "C_lear Edits"
-msgstr "_Limpar edição"
-
-#: src/diffuse/main.py:817
-msgid "_Dismiss All Edits"
-msgstr "_Descartar toda a edição"
-
-#: src/diffuse/main.py:819
-msgid "_Find..."
-msgstr "_Localizar..."
-
-#: src/diffuse/main.py:820
-msgid "Find _Next"
-msgstr "Localizar segui_nte"
-
-#: src/diffuse/main.py:821
-msgid "Find Pre_vious"
-msgstr "Localizar _anterior"
-
-#: src/diffuse/main.py:822
-msgid "_Go To Line..."
-msgstr "_Ir para linha..."
-
-#: src/diffuse/main.py:824
-msgid "Pr_eferences..."
-msgstr "Pr_eferências..."
-
-#: src/diffuse/main.py:828
-msgid "None"
-msgstr "Nada"
-
-#: src/diffuse/main.py:846
-msgid "_View"
-msgstr "_Ver"
-
-#: src/diffuse/main.py:847
-msgid "_Syntax Highlighting"
-msgstr "Realce de _sintaxe"
-
-#: src/diffuse/main.py:849
-msgid "Re_align All"
-msgstr "Re_alinhar tudo"
-
-#: src/diffuse/main.py:850
-msgid "_Isolate"
-msgstr "_Isolar"
-
-#: src/diffuse/main.py:852
-msgid "_First Difference"
-msgstr "_Primeira diferença"
-
-#: src/diffuse/main.py:853
-msgid "_Previous Difference"
-msgstr "Diferença _anterior"
-
-#: src/diffuse/main.py:854
-msgid "_Next Difference"
-msgstr "Diferença segui_nte"
-
-#: src/diffuse/main.py:855
-msgid "_Last Difference"
-msgstr "Ú_ltima diferença"
-
-#: src/diffuse/main.py:857
-msgid "Fir_st Tab"
-msgstr "P_rimeiro separador"
-
-#: src/diffuse/main.py:858
-msgid "Pre_vious Tab"
-msgstr "_Separador anterior"
-
-#: src/diffuse/main.py:859
-msgid "Next _Tab"
-msgstr "Separador seguin_te"
-
-#: src/diffuse/main.py:860
-msgid "Las_t Tab"
-msgstr "Úl_timo separador"
-
-#: src/diffuse/main.py:862
-msgid "Shift Pane _Right"
-msgstr "Mover separador à di_reita"
-
-#: src/diffuse/main.py:863
-msgid "Shift Pane _Left"
-msgstr "Mover separador à es_querda"
-
-#: src/diffuse/main.py:866
-msgid "F_ormat"
-msgstr "F_ormatar"
-
-#: src/diffuse/main.py:867
-msgid "Convert To _Upper Case"
-msgstr "Converter para maiúsc_ulas"
-
-#: src/diffuse/main.py:868
-msgid "Convert To _Lower Case"
-msgstr "Converter para minúscu_las"
-
-#: src/diffuse/main.py:870
-msgid "Sort Lines In _Ascending Order"
-msgstr "Ordenar linhas _ascendentemente"
-
-#: src/diffuse/main.py:871
-msgid "Sort Lines In D_escending Order"
-msgstr "Ordenar linhas d_escendentemente"
-
-#: src/diffuse/main.py:873
-msgid "Remove Trailing _White Space"
-msgstr "Remover espaços _finais"
-
-#: src/diffuse/main.py:874
-msgid "Convert Tabs To _Spaces"
-msgstr "Converter tabulações em e_spaços"
-
-#: src/diffuse/main.py:875
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "Converter espaços iniciais em _tabulações"
-
-#: src/diffuse/main.py:877
-msgid "_Increase Indenting"
-msgstr "Aumentar _indentação"
-
-#: src/diffuse/main.py:878
-msgid "De_crease Indenting"
-msgstr "Di_minuir indentação"
-
-#: src/diffuse/main.py:880
-msgid "Convert To _DOS Format"
-msgstr "Converter para formato _DOS"
-
-#: src/diffuse/main.py:881
-msgid "Convert To _Mac Format"
-msgstr "Converter para formato _Mac"
-
-#: src/diffuse/main.py:882
-msgid "Convert To Uni_x Format"
-msgstr "Converter para formato Uni_x"
-
-#: src/diffuse/main.py:885
-msgid "_Merge"
-msgstr "_Unir"
-
-#: src/diffuse/main.py:886
-msgid "Copy Selection _Right"
-msgstr "Copiar selecção à di_reita"
-
-#: src/diffuse/main.py:887
-msgid "Copy Selection _Left"
-msgstr "Copiar selecção à es_querda"
-
-#: src/diffuse/main.py:889
-msgid "Copy Left _Into Selection"
-msgstr "Cop_iar esquerda para a selecção"
-
-#: src/diffuse/main.py:890
-msgid "Copy Right I_nto Selection"
-msgstr "Copiar _direita para a selecção"
-
-#: src/diffuse/main.py:891
-msgid "_Merge From Left Then Right"
-msgstr "U_nir da esquerda e depois da direita"
-
-#: src/diffuse/main.py:892
-msgid "M_erge From Right Then Left"
-msgstr "Unir da dir_eita e depois da esquerda"
-
-#: src/diffuse/main.py:895
-msgid "_Help"
-msgstr "A_juda"
-
-#: src/diffuse/main.py:896
-msgid "_Help Contents..."
-msgstr "Conteúdo da a_juda..."
-
-#: src/diffuse/main.py:898
-#, python-format
-msgid "_About %s..."
-msgstr "_Acerca do %s..."
-
-#: src/diffuse/main.py:913
-msgid "New 2-Way File Merge"
-msgstr "Nova união de _2 vias"
-
-#: src/diffuse/main.py:914
-msgid "New 3-Way File Merge"
-msgstr "Nova união de _3 vias"
-
-#: src/diffuse/main.py:916
-msgid "Realign All"
-msgstr "Realinhar tudo"
-
-#: src/diffuse/main.py:917
-msgid "First Difference"
-msgstr "Primeira diferença"
-
-#: src/diffuse/main.py:918
-msgid "Previous Difference"
-msgstr "Diferença anterior"
-
-#: src/diffuse/main.py:919
-msgid "Next Difference"
-msgstr "Diferença seguinte"
-
-#: src/diffuse/main.py:920
-msgid "Last Difference"
-msgstr "Última diferença"
-
-#: src/diffuse/main.py:922
-msgid "Copy Selection Right"
-msgstr "Copiar selecção à direita"
-
-#: src/diffuse/main.py:923
-msgid "Copy Selection Left"
-msgstr "Copiar selecção à esquerda"
-
-#: src/diffuse/main.py:924
-msgid "Copy Left Into Selection"
-msgstr "Copiar esquerda para a selecção"
-
-#: src/diffuse/main.py:925
-msgid "Copy Right Into Selection"
-msgstr "Copiar direita para a selecção"
-
-#: src/diffuse/main.py:926
-msgid "Merge From Left Then Right"
-msgstr "Unir da esquerda e depois da direita"
-
-#: src/diffuse/main.py:927
-msgid "Merge From Right Then Left"
-msgstr "Unir da direita e depois da esquerda"
-
-#: src/diffuse/main.py:929
-msgid "Undo"
-msgstr "Desfazer"
-
-#: src/diffuse/main.py:930
-msgid "Redo"
-msgstr "Refazer"
-
-#: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
-msgid "Cut"
-msgstr "Cortar"
-
-#: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
-msgid "Copy"
-msgstr "Copiar"
-
-#: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
-msgid "Paste"
-msgstr "Colar"
-
-#: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
-msgid "Clear Edits"
-msgstr "Limpar edição"
-
-#: src/diffuse/main.py:1057
-msgid "Some files have unsaved changes. Select the files to save before closing."
-msgstr ""
-"Alguns ficheiros têm alterações por gravar. Seleccione os ficheiros a gravar "
-"antes de fechar."
-
-#: src/diffuse/main.py:1071
-msgid "Tab"
-msgstr "Separador"
-
-#: src/diffuse/main.py:1076
-msgid "Pane"
-msgstr "Painel"
-
-#: src/diffuse/main.py:1087
-msgid "Close _Without Saving"
-msgstr "Fechar sem gra_var"
-
-#: src/diffuse/main.py:1126
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "Fechar este painel sai do %s."
-
-#: src/diffuse/main.py:1209
-#, python-format
-msgid "File Merge %d"
-msgstr "União de ficheiros %d"
-
-#: src/diffuse/main.py:1315
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "Erro ao obter revisões de %s."
-
-#: src/diffuse/main.py:1347
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "Erro ao obter modificações de %s."
-
-#: src/diffuse/main.py:1380
-msgid "Open File In New Tab"
-msgstr "Abrir ficheiro em novo separador"
-
-#: src/diffuse/main.py:1403
-msgid "Choose Folder With Modified Files"
-msgstr "Escolher pasta com ficheiros modificados"
-
-#: src/diffuse/main.py:1421
-msgid "No modified files found."
-msgstr "Sem ficheiros modificados."
-
-#: src/diffuse/main.py:1427
-msgid "Choose Folder With Commit"
-msgstr "Escolher pasta com revisão"
-
-#: src/diffuse/main.py:1447
-msgid "No committed files found."
-msgstr "Sem ficheiros revistos."
-
-#: src/diffuse/main.py:1483
-msgid "New N-Way File Merge..."
-msgstr "Nova união de N vias..."
-
-#: src/diffuse/main.py:1484
-msgid "Number of panes: "
-msgstr "Número de painéis: "
-
-#: src/diffuse/main.py:1558
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "Frase não encontrada. Continuar do final do ficheiro?"
-
-#: src/diffuse/main.py:1560
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "Frase não encontrada. Continuar do início do ficheiro?"
-
-#: src/diffuse/main.py:1781
-#, fuzzy
-msgid ""
-"Usage:\n"
-"    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"
-"also retrieve revisions of files from several VCSs for comparison and merging.\n"
-"\n"
-"Help Options:\n"
-"  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright information\n"
-"\n"
-"Configuration Options:\n"
-"  --no-rcfile                      Do not read any resource files\n"
-"  --rcfile <file>                  Specify explicit resource file\n"
-"\n"
-"General Options:\n"
-"  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
-"  ( -D | --close-if-same )         Close all tabs with no differences\n"
-"  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
-"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
-"  ( -m | --modified )              Create a new tab for each modified file\n"
-"  ( -r | --revision ) <rev>        File revision <rev>\n"
-"  ( -s | --separate )              Create a new tab for each file\n"
-"  ( -t | --tab )                   Start a new tab\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    Start with line <line> selected\n"
-"  --null-file                      Create a blank file comparison pane\n"
-"\n"
-"Display Options:\n"
-"  ( -b | --ignore-space-change )   Ignore changes to white space\n"
-"  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
-"  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
-"  ( -i | --ignore-case )           Ignore case differences\n"
-"  ( -w | --ignore-all-space )      Ignore white space differences"
-msgstr ""
-"Uso:\n"
-"    diffuse [ [OPÇÃO...] [FICHEIRO...] ]...\n"
-"    diffuse ( -h | -? | --help | -v | --version )\n"
-"\n"
-"O Diffuse é uma ferramenta gráfica para unir e comparar ficheiros de texto.\n"
-"É 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"
-"Mercurial, Monotone, RCS, Subversion e SVK para comparação e união.\n"
-"\n"
-"Opções de ajuda:\n"
-"  ( -h | -? | --help )             mostra esta ajuda\n"
-"  ( -v | --version )               mostra informação da versão e direitos de "
-"autor\n"
-"\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"
-"\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"
-"  ( -e | --encoding ) <codec>      usa <codec> para ler e escreve ficheiros\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"
-"  ( -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"
-"  --null-file                      cria um novo painel de comparação\n"
-"\n"
-"Opções de vista:\n"
-"  ( -b | --ignore-space-change )   ignora alterações a espaços\n"
-"  ( -B | --ignore-blank-lines )    ignora alterações a linhas em branco\n"
-"  ( -E | --ignore-end-of-line )    ignora diferenças de fim de linha\n"
-"  ( -i | --ignore-case )           ignora diferenças entre maiúsculas\n"
-"  ( -w | --ignore-all-space )      ignora diferenças de espaços"
-
-#: src/diffuse/main.py:1948
+#: src/diffuse/main.py:327
 msgid "Error parsing line number."
 msgstr "Erro ao analisar o número de linha."
 
-#: src/diffuse/main.py:1958
-#, python-format
-msgid "Skipping unknown argument \"%s\"."
-msgstr "A ignorar argumento desconhecido \"%s\"."
-
-#: src/diffuse/main.py:1966
+#: src/diffuse/main.py:343
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Erro ao processar o argumento \"%s\". Pasta inesperada."
 
-#: src/diffuse/preferences.py:80
+#: src/diffuse/preferences.py:75
 msgid "Display"
 msgstr "Mostrar"
 
-#: src/diffuse/preferences.py:83
+#: src/diffuse/preferences.py:78
 msgid "Font"
 msgstr "Letra"
 
-#: src/diffuse/preferences.py:84
+#: src/diffuse/preferences.py:79
 msgid "Tab width"
 msgstr "Largura de tabulação"
 
-#: src/diffuse/preferences.py:85
+#: src/diffuse/preferences.py:80
 msgid "Show right margin"
 msgstr "Mostrar margem direita"
 
-#: src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:81
 msgid "Right margin"
 msgstr "Margem direita"
 
-#: src/diffuse/preferences.py:87
+#: src/diffuse/preferences.py:82
 msgid "Show line numbers"
 msgstr "Mostrar números de linha"
 
-#: src/diffuse/preferences.py:88
+#: src/diffuse/preferences.py:83
 msgid "Show white space characters"
 msgstr "Mostrar espaços em branco"
 
-#: src/diffuse/preferences.py:89
-msgid "Ignore case differences"
-msgstr "Ignorar diferenças de maiúsculas"
-
-#: src/diffuse/preferences.py:90
-msgid "Ignore white space differences"
-msgstr "Ignorar diferenças de espaços"
-
-#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100
-msgid "Ignore changes to white space"
-msgstr "Ignorar alterações a espaços"
-
-#: src/diffuse/preferences.py:92
+#: src/diffuse/preferences.py:87
 msgid "Ignore blank line differences"
 msgstr "Ignorar diferenças de linhas em branco"
 
-#: src/diffuse/preferences.py:93
-msgid "Ignore end of line differences"
-msgstr "Ignorar diferenças de fins de linha"
-
-#: src/diffuse/preferences.py:95
+#: src/diffuse/preferences.py:90
 msgid "Alignment"
 msgstr "Alinhamento"
 
-#: src/diffuse/preferences.py:98
+#: src/diffuse/preferences.py:93
 msgid "Ignore case"
 msgstr "Ignorar maiúsculas"
 
-#: src/diffuse/preferences.py:99
+#: src/diffuse/preferences.py:94
 msgid "Ignore white space"
 msgstr "Ignorar espaços"
 
-#: src/diffuse/preferences.py:101
+#: src/diffuse/preferences.py:96
 msgid "Ignore blank lines"
 msgstr "Ignorar linhas em branco"
 
-#: src/diffuse/preferences.py:102
+#: src/diffuse/preferences.py:97
 msgid "Ignore end of line characters"
 msgstr "Ignorar caracteres de fim de linha"
 
-#: src/diffuse/preferences.py:104
+#: src/diffuse/preferences.py:99
 msgid "Editor"
 msgstr "Editor"
 
-#: src/diffuse/preferences.py:107
+#: src/diffuse/preferences.py:102
 msgid "Auto indent"
 msgstr "Indentação automática"
 
-#: src/diffuse/preferences.py:108
+#: src/diffuse/preferences.py:103
 msgid "Expand tabs to spaces"
 msgstr "Expandir tabulações para espaços"
 
-#: src/diffuse/preferences.py:109
+#: src/diffuse/preferences.py:104
 msgid "Soft tab width"
 msgstr "Largura de tabulação suave"
 
-#: src/diffuse/preferences.py:111
+#: src/diffuse/preferences.py:106
 msgid "Tabs"
 msgstr "Separadores"
 
-#: src/diffuse/preferences.py:114
+#: src/diffuse/preferences.py:109
 msgid "Default panes"
 msgstr "Painéis predefinidos"
 
-#: src/diffuse/preferences.py:115
+#: src/diffuse/preferences.py:110
 msgid "Always show the tab bar"
 msgstr "Mostrar sempre a barra de separadores"
 
-#: src/diffuse/preferences.py:116
+#: src/diffuse/preferences.py:111
 #, 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:118
+#: src/diffuse/preferences.py:113
 msgid "Regional Settings"
 msgstr "Definições regionais"
 
-#: src/diffuse/preferences.py:121
+#: src/diffuse/preferences.py:116
 msgid "Default codec"
 msgstr "Codificação predefinida"
 
-#: src/diffuse/preferences.py:122
+#: src/diffuse/preferences.py:117
 msgid "Order of codecs used to identify encoding"
 msgstr "Ordem de codificações para identificar a codificação"
 
-#: src/diffuse/preferences.py:143
+#: src/diffuse/preferences.py:138
 msgid "Cygwin"
 msgstr "Cygwin"
 
-#: src/diffuse/preferences.py:145
+#: src/diffuse/preferences.py:140
 msgid "Root directory"
 msgstr "Pasta raiz"
 
-#: src/diffuse/preferences.py:146
+#: src/diffuse/preferences.py:141
 msgid "Cygdrive prefix"
 msgstr "Prefixo cygdrive"
 
-#: src/diffuse/preferences.py:165
-msgid "Version control system search order"
-msgstr ""
-
-#: src/diffuse/preferences.py:173
+#: src/diffuse/preferences.py:167
 msgid "\"co\" command"
 msgstr "comando \"co\""
 
-#: src/diffuse/preferences.py:174
+#: src/diffuse/preferences.py:168
 msgid "\"rlog\" command"
 msgstr "comando \"rlog\""
 
-#: src/diffuse/preferences.py:176
+#: src/diffuse/preferences.py:170
 msgid "Command"
 msgstr "Comando"
 
-#: src/diffuse/preferences.py:182
+#: src/diffuse/preferences.py:176
 msgid "Launch from a Bash login shell"
 msgstr "Iniciar numa consola de sessão bash"
 
-#: src/diffuse/preferences.py:189
+#: src/diffuse/preferences.py:183
 msgid "Update paths for Cygwin"
 msgstr "Actualizar caminhos para o Cygwin"
 
-#: src/diffuse/preferences.py:194
+#: src/diffuse/preferences.py:188
 msgid "Version Control"
 msgstr "Controlo de versões"
 
-#: src/diffuse/preferences.py:259
+#: src/diffuse/preferences.py:253
 msgid "Preferences"
 msgstr "Preferências"
 
+#: src/diffuse/preferences.py:294 src/diffuse/window.py:580
+#, python-format
+msgid "Error writing %s."
+msgstr "Erro ao excrever %s."
+
+#: src/diffuse/preferences.py:483 src/diffuse/window.py:446
+#: src/diffuse/window.py:1413 src/diffuse/window.py:1436 src/diffuse/window.py:1459
+msgid "_Open"
+msgstr ""
+
 #: src/diffuse/resources.py:242 src/diffuse/resources.py:246
 #: src/diffuse/resources.py:249
 #, python-brace-format
@@ -940,16 +417,11 @@ msgstr "Erro ao processar a linha {line} de {file}."
 msgid "Auto Detect"
 msgstr "Detecção automática"
 
-#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97
+#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:96
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "Erro ao analisar a revisão %s."
 
-#: src/diffuse/vcs/vcs_registry.py:238
-#, python-format
-msgid "Error parsing %s."
-msgstr "Erro ao analisar %s."
-
 #: src/diffuse/widgets.py:1857
 msgid "Align with Selection"
 msgstr "Alinhar com a selecção"
@@ -962,10 +434,645 @@ msgstr "Isolar"
 msgid "Merge Selection"
 msgstr "Unir selecção"
 
+#: src/diffuse/widgets.py:1861 src/diffuse/window.py:865
+msgid "Cut"
+msgstr "Cortar"
+
+#: src/diffuse/widgets.py:1862 src/diffuse/window.py:866
+msgid "Copy"
+msgstr "Copiar"
+
+#: src/diffuse/widgets.py:1863 src/diffuse/window.py:867
+msgid "Paste"
+msgstr "Colar"
+
 #: src/diffuse/widgets.py:1865
 msgid "Select All"
 msgstr "Seleccionar tudo"
 
+#: src/diffuse/widgets.py:1866 src/diffuse/window.py:868
+msgid "Clear Edits"
+msgstr "Limpar edição"
+
 #: src/diffuse/widgets.py:1868
 msgid "Swap with Selected Pane"
 msgstr "Trocar com o painel seleccionado"
+
+#: src/diffuse/window.py:83
+msgid "Close Tab"
+msgstr "Fechar separador"
+
+#: src/diffuse/window.py:126
+msgid "Open File..."
+msgstr "Abrir ficheiro..."
+
+#: src/diffuse/window.py:127
+msgid "Reload File"
+msgstr "Recarregar ficheiro"
+
+#: src/diffuse/window.py:128
+msgid "Save File"
+msgstr "Gravar ficheiro"
+
+#: src/diffuse/window.py:129
+msgid "Save File As..."
+msgstr "Gravar ficheiro como..."
+
+#: src/diffuse/window.py:228
+#, python-format
+msgid "Column %d"
+msgstr "Coluna %d"
+
+#: src/diffuse/window.py:306
+msgid "Save changes before loading the new file?"
+msgstr "Gravar alterações antes de carregar o novo ficheiro?"
+
+#: src/diffuse/window.py:310
+msgid "_No"
+msgstr ""
+
+#: src/diffuse/window.py:311
+msgid "_Yes"
+msgstr ""
+
+#: src/diffuse/window.py:417
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "Erro ao ler a revisão %(rev)s de %(file)s."
+
+#: src/diffuse/window.py:442
+msgid "Open File"
+msgstr "Abrir ficheiro"
+
+#: src/diffuse/window.py:495
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "Gravar %(title)s painel %(pane)d"
+
+#: src/diffuse/window.py:499 src/diffuse/window.py:1111
+#, fuzzy
+msgid "_Save"
+msgstr "_Gravar ficheiro"
+
+#: src/diffuse/window.py:527
+#, python-format
+msgid "A file named %s already exists. Do you want to overwrite it?"
+msgstr "Já existe um ficheiro chamado %s. Deseja sobrescrevê-lo?"
+
+#: src/diffuse/window.py:534
+#, 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 ""
+"O ficheiro %s foi modificado por outro processo desde a leitura. Se gravar, "
+"perderá todas as alterações externas. Gravar mesmo assim?"
+
+#: src/diffuse/window.py:576
+#, python-format
+msgid "Error encoding to %s."
+msgstr "Erro ao codificar para %s."
+
+#: src/diffuse/window.py:610
+msgid "Go To Line..."
+msgstr "Ir para linha..."
+
+#: src/diffuse/window.py:611
+msgid "Line Number: "
+msgstr "Número de linha: "
+
+#: src/diffuse/window.py:642
+msgid ""
+"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."
+
+#: src/diffuse/window.py:646
+msgid "Press the escape key to finish editing."
+msgstr "Prima Esc para terminar a edição."
+
+#: src/diffuse/window.py:649
+msgid ""
+"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."
+
+#: src/diffuse/window.py:710
+msgid "_File"
+msgstr "_Ficheiro"
+
+#: src/diffuse/window.py:712
+msgid "_Open File..."
+msgstr "Abrir ficheir_o..."
+
+#: src/diffuse/window.py:713
+msgid "Open File In New _Tab..."
+msgstr "Abrir ficheiro em no_vo separador..."
+
+#: src/diffuse/window.py:714
+msgid "Open _Modified Files..."
+msgstr "Abrir ficheiros _modificados..."
+
+#: src/diffuse/window.py:715
+msgid "Open Commi_t..."
+msgstr "Abrir rev_isão..."
+
+#: src/diffuse/window.py:716
+msgid "_Reload File"
+msgstr "_Recarregar ficheiro"
+
+#: src/diffuse/window.py:718
+msgid "_Save File"
+msgstr "_Gravar ficheiro"
+
+#: src/diffuse/window.py:719
+msgid "Save File _As..."
+msgstr "Gr_avar ficheiro como..."
+
+#: src/diffuse/window.py:720
+msgid "Save A_ll"
+msgstr "Gravar _tudo"
+
+#: src/diffuse/window.py:722
+msgid "New _2-Way File Merge"
+msgstr "Nova união de _2 vias"
+
+#: src/diffuse/window.py:723
+msgid "New _3-Way File Merge"
+msgstr "Nova união de _3 vias"
+
+#: src/diffuse/window.py:724
+msgid "New _N-Way File Merge..."
+msgstr "Nova união de _N vias..."
+
+#: src/diffuse/window.py:726
+msgid "_Close Tab"
+msgstr "Fe_char separador"
+
+#: src/diffuse/window.py:727
+msgid "_Undo Close Tab"
+msgstr "Desfa_zer Fechar separador"
+
+#: src/diffuse/window.py:728
+msgid "_Quit"
+msgstr "_Sair"
+
+#: src/diffuse/window.py:732
+msgid "_Edit"
+msgstr "_Editar"
+
+#: src/diffuse/window.py:734
+msgid "_Undo"
+msgstr "_Desfazer"
+
+#: src/diffuse/window.py:735
+msgid "_Redo"
+msgstr "_Refazer"
+
+#: src/diffuse/window.py:737
+msgid "Cu_t"
+msgstr "Cor_tar"
+
+#: src/diffuse/window.py:738
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: src/diffuse/window.py:739
+msgid "_Paste"
+msgstr "Co_lar"
+
+#: src/diffuse/window.py:741
+msgid "Select _All"
+msgstr "Seleccion_ar tudo"
+
+#: src/diffuse/window.py:742
+msgid "C_lear Edits"
+msgstr "_Limpar edição"
+
+#: src/diffuse/window.py:743
+msgid "_Dismiss All Edits"
+msgstr "_Descartar toda a edição"
+
+#: src/diffuse/window.py:745
+msgid "_Find..."
+msgstr "_Localizar..."
+
+#: src/diffuse/window.py:746
+msgid "Find _Next"
+msgstr "Localizar segui_nte"
+
+#: src/diffuse/window.py:747
+msgid "Find Pre_vious"
+msgstr "Localizar _anterior"
+
+#: src/diffuse/window.py:748
+msgid "_Go To Line..."
+msgstr "_Ir para linha..."
+
+#: src/diffuse/window.py:750
+msgid "Pr_eferences..."
+msgstr "Pr_eferências..."
+
+#: src/diffuse/window.py:754
+msgid "None"
+msgstr "Nada"
+
+#: src/diffuse/window.py:776
+msgid "_View"
+msgstr "_Ver"
+
+#: src/diffuse/window.py:778
+msgid "_Syntax Highlighting"
+msgstr "Realce de _sintaxe"
+
+#: src/diffuse/window.py:780
+msgid "Re_align All"
+msgstr "Re_alinhar tudo"
+
+#: src/diffuse/window.py:781
+msgid "_Isolate"
+msgstr "_Isolar"
+
+#: src/diffuse/window.py:783
+msgid "_First Difference"
+msgstr "_Primeira diferença"
+
+#: src/diffuse/window.py:784
+msgid "_Previous Difference"
+msgstr "Diferença _anterior"
+
+#: src/diffuse/window.py:785
+msgid "_Next Difference"
+msgstr "Diferença segui_nte"
+
+#: src/diffuse/window.py:786
+msgid "_Last Difference"
+msgstr "Ú_ltima diferença"
+
+#: src/diffuse/window.py:788
+msgid "Fir_st Tab"
+msgstr "P_rimeiro separador"
+
+#: src/diffuse/window.py:789
+msgid "Pre_vious Tab"
+msgstr "_Separador anterior"
+
+#: src/diffuse/window.py:790
+msgid "Next _Tab"
+msgstr "Separador seguin_te"
+
+#: src/diffuse/window.py:791
+msgid "Las_t Tab"
+msgstr "Úl_timo separador"
+
+#: src/diffuse/window.py:793
+msgid "Shift Pane _Right"
+msgstr "Mover separador à di_reita"
+
+#: src/diffuse/window.py:794
+msgid "Shift Pane _Left"
+msgstr "Mover separador à es_querda"
+
+#: src/diffuse/window.py:798
+msgid "F_ormat"
+msgstr "F_ormatar"
+
+#: src/diffuse/window.py:800
+msgid "Convert To _Upper Case"
+msgstr "Converter para maiúsc_ulas"
+
+#: src/diffuse/window.py:801
+msgid "Convert To _Lower Case"
+msgstr "Converter para minúscu_las"
+
+#: src/diffuse/window.py:803
+msgid "Sort Lines In _Ascending Order"
+msgstr "Ordenar linhas _ascendentemente"
+
+#: src/diffuse/window.py:804
+msgid "Sort Lines In D_escending Order"
+msgstr "Ordenar linhas d_escendentemente"
+
+#: src/diffuse/window.py:806
+msgid "Remove Trailing _White Space"
+msgstr "Remover espaços _finais"
+
+#: src/diffuse/window.py:807
+msgid "Convert Tabs To _Spaces"
+msgstr "Converter tabulações em e_spaços"
+
+#: src/diffuse/window.py:808
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "Converter espaços iniciais em _tabulações"
+
+#: src/diffuse/window.py:810
+msgid "_Increase Indenting"
+msgstr "Aumentar _indentação"
+
+#: src/diffuse/window.py:811
+msgid "De_crease Indenting"
+msgstr "Di_minuir indentação"
+
+#: src/diffuse/window.py:813
+msgid "Convert To _DOS Format"
+msgstr "Converter para formato _DOS"
+
+#: src/diffuse/window.py:814
+msgid "Convert To _Mac Format"
+msgstr "Converter para formato _Mac"
+
+#: src/diffuse/window.py:815
+msgid "Convert To Uni_x Format"
+msgstr "Converter para formato Uni_x"
+
+#: src/diffuse/window.py:819
+msgid "_Merge"
+msgstr "_Unir"
+
+#: src/diffuse/window.py:821
+msgid "Copy Selection _Right"
+msgstr "Copiar selecção à di_reita"
+
+#: src/diffuse/window.py:822
+msgid "Copy Selection _Left"
+msgstr "Copiar selecção à es_querda"
+
+#: src/diffuse/window.py:824
+msgid "Copy Left _Into Selection"
+msgstr "Cop_iar esquerda para a selecção"
+
+#: src/diffuse/window.py:825
+msgid "Copy Right I_nto Selection"
+msgstr "Copiar _direita para a selecção"
+
+#: src/diffuse/window.py:826
+msgid "_Merge From Left Then Right"
+msgstr "U_nir da esquerda e depois da direita"
+
+#: src/diffuse/window.py:827
+msgid "M_erge From Right Then Left"
+msgstr "Unir da dir_eita e depois da esquerda"
+
+#: src/diffuse/window.py:831
+msgid "_Help"
+msgstr "A_juda"
+
+#: src/diffuse/window.py:833
+msgid "_Help Contents..."
+msgstr "Conteúdo da a_juda..."
+
+#: src/diffuse/window.py:835
+#, python-format
+msgid "_About %s..."
+msgstr "_Acerca do %s..."
+
+#: src/diffuse/window.py:847
+msgid "New 2-Way File Merge"
+msgstr "Nova união de _2 vias"
+
+#: src/diffuse/window.py:848
+msgid "New 3-Way File Merge"
+msgstr "Nova união de _3 vias"
+
+#: src/diffuse/window.py:850
+msgid "Realign All"
+msgstr "Realinhar tudo"
+
+#: src/diffuse/window.py:851
+msgid "First Difference"
+msgstr "Primeira diferença"
+
+#: src/diffuse/window.py:852
+msgid "Previous Difference"
+msgstr "Diferença anterior"
+
+#: src/diffuse/window.py:853
+msgid "Next Difference"
+msgstr "Diferença seguinte"
+
+#: src/diffuse/window.py:854
+msgid "Last Difference"
+msgstr "Última diferença"
+
+#: src/diffuse/window.py:856
+msgid "Copy Selection Right"
+msgstr "Copiar selecção à direita"
+
+#: src/diffuse/window.py:857
+msgid "Copy Selection Left"
+msgstr "Copiar selecção à esquerda"
+
+#: src/diffuse/window.py:858
+msgid "Copy Left Into Selection"
+msgstr "Copiar esquerda para a selecção"
+
+#: src/diffuse/window.py:859
+msgid "Copy Right Into Selection"
+msgstr "Copiar direita para a selecção"
+
+#: src/diffuse/window.py:860
+msgid "Merge From Left Then Right"
+msgstr "Unir da esquerda e depois da direita"
+
+#: src/diffuse/window.py:861
+msgid "Merge From Right Then Left"
+msgstr "Unir da direita e depois da esquerda"
+
+#: src/diffuse/window.py:863
+msgid "Undo"
+msgstr "Desfazer"
+
+#: src/diffuse/window.py:864
+msgid "Redo"
+msgstr "Refazer"
+
+#: src/diffuse/window.py:950
+msgid "Changes detected"
+msgstr ""
+
+#: src/diffuse/window.py:954
+#, fuzzy, python-format
+msgid ""
+"The file \"%s\" changed on disk.\n"
+"\n"
+"Do you want to reload the file?"
+msgstr "O ficheiro %s foi alterado no disco. Deseja recarregá-lo?"
+
+#: src/diffuse/window.py:959
+#, fuzzy, python-format
+msgid ""
+"The following files changed on disk:\n"
+"%s\n"
+"\n"
+"Do you want to reload these files?"
+msgstr "O ficheiro %s foi alterado no disco. Deseja recarregá-lo?"
+
+#: src/diffuse/window.py:1078
+msgid "Some files have unsaved changes. Select the files to save before closing."
+msgstr ""
+"Alguns ficheiros têm alterações por gravar. Seleccione os ficheiros a gravar "
+"antes de fechar."
+
+#: src/diffuse/window.py:1092
+msgid "Tab"
+msgstr "Separador"
+
+#: src/diffuse/window.py:1097
+msgid "Pane"
+msgstr "Painel"
+
+#: src/diffuse/window.py:1108
+msgid "Close _Without Saving"
+msgstr "Fechar sem gra_var"
+
+#: src/diffuse/window.py:1147
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "Fechar este painel sai do %s."
+
+#: src/diffuse/window.py:1224
+#, python-format
+msgid "File Merge %d"
+msgstr "União de ficheiros %d"
+
+#: src/diffuse/window.py:1344
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "Erro ao obter revisões de %s."
+
+#: src/diffuse/window.py:1376
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "Erro ao obter modificações de %s."
+
+#: src/diffuse/window.py:1409
+msgid "Open File In New Tab"
+msgstr "Abrir ficheiro em novo separador"
+
+#: src/diffuse/window.py:1432
+msgid "Choose Folder With Modified Files"
+msgstr "Escolher pasta com ficheiros modificados"
+
+#: src/diffuse/window.py:1450
+msgid "No modified files found."
+msgstr "Sem ficheiros modificados."
+
+#: src/diffuse/window.py:1456
+msgid "Choose Folder With Commit"
+msgstr "Escolher pasta com revisão"
+
+#: src/diffuse/window.py:1476
+msgid "No committed files found."
+msgstr "Sem ficheiros revistos."
+
+#: src/diffuse/window.py:1512
+msgid "New N-Way File Merge..."
+msgstr "Nova união de N vias..."
+
+#: src/diffuse/window.py:1513
+msgid "Number of panes: "
+msgstr "Número de painéis: "
+
+#: src/diffuse/window.py:1587
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "Frase não encontrada. Continuar do final do ficheiro?"
+
+#: src/diffuse/window.py:1589
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "Frase não encontrada. Continuar do início do ficheiro?"
+
+#: src/diffuse/window.py:1762
+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/window.py:1766
+msgid "translator-credits"
+msgstr "Pedro Albuquerque <pmra@gmx.com>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage:\n"
+#~ "    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"
+#~ "also retrieve revisions of files from several VCSs for comparison and "
+#~ "merging.\n"
+#~ "\n"
+#~ "Help Options:\n"
+#~ "  ( -h | -? | --help )             Display this usage information\n"
+#~ "  ( -v | --version )               Display version and copyright information\n"
+#~ "\n"
+#~ "Configuration Options:\n"
+#~ "  --no-rcfile                      Do not read any resource files\n"
+#~ "  --rcfile <file>                  Specify explicit resource file\n"
+#~ "\n"
+#~ "General Options:\n"
+#~ "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
+#~ "  ( -D | --close-if-same )         Close all tabs with no differences\n"
+#~ "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+#~ "  ( -L | --label ) <label>         Display <label> instead of the file name\n"
+#~ "  ( -m | --modified )              Create a new tab for each modified file\n"
+#~ "  ( -r | --revision ) <rev>        File revision <rev>\n"
+#~ "  ( -s | --separate )              Create a new tab for each file\n"
+#~ "  ( -t | --tab )                   Start a new tab\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    Start with line <line> selected\n"
+#~ "  --null-file                      Create a blank file comparison pane\n"
+#~ "\n"
+#~ "Display Options:\n"
+#~ "  ( -b | --ignore-space-change )   Ignore changes to white space\n"
+#~ "  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
+#~ "  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
+#~ "  ( -i | --ignore-case )           Ignore case differences\n"
+#~ "  ( -w | --ignore-all-space )      Ignore white space differences"
+#~ msgstr ""
+#~ "Uso:\n"
+#~ "    diffuse [ [OPÇÃO...] [FICHEIRO...] ]...\n"
+#~ "    diffuse ( -h | -? | --help | -v | --version )\n"
+#~ "\n"
+#~ "O Diffuse é uma ferramenta gráfica para unir e comparar ficheiros de texto.\n"
+#~ "É 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"
+#~ "Mercurial, Monotone, RCS, Subversion e SVK para comparação e união.\n"
+#~ "\n"
+#~ "Opções de ajuda:\n"
+#~ "  ( -h | -? | --help )             mostra esta ajuda\n"
+#~ "  ( -v | --version )               mostra informação da versão e direitos de "
+#~ "autor\n"
+#~ "\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"
+#~ "\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"
+#~ "  ( -e | --encoding ) <codec>      usa <codec> para ler e escreve ficheiros\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"
+#~ "  ( -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"
+#~ "  --null-file                      cria um novo painel de comparação\n"
+#~ "\n"
+#~ "Opções de vista:\n"
+#~ "  ( -b | --ignore-space-change )   ignora alterações a espaços\n"
+#~ "  ( -B | --ignore-blank-lines )    ignora alterações a linhas em branco\n"
+#~ "  ( -E | --ignore-end-of-line )    ignora diferenças de fim de linha\n"
+#~ "  ( -i | --ignore-case )           ignora diferenças entre maiúsculas\n"
+#~ "  ( -w | --ignore-all-space )      ignora diferenças de espaços"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1f23f16..4b7c711 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse-svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-23 20:00-0400\n"
+"POT-Creation-Date: 2023-04-16 14:09-0400\n"
 "PO-Revision-Date: 2022-04-04 12:19-0400\n"
 "Last-Translator: Pedro Albuquerque <pmra@gmx.com>\n"
 "Language-Team: Português do Brasil <pmra@gmx.com>\n"
@@ -35,828 +35,306 @@ 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."
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, and "
+"Subversion repositories."
 msgstr ""
 "O Diffuse é uma ferramenta gráfica para unificar e comparar arquivos de texto. "
 "Também pode obter revisões para comparar arquivos de repositórios Bazaar, CVS, "
-"Darcs, Git, Mercurial, Monotone, RCS. "
+"Darcs, Git, Mercurial, Monotone, RCS, e Subversion. "
 
-#: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
-msgid "Main window: diff between two files"
-msgstr "Janela principal: diff entre dois arquivos"
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:28
+msgid "Main window"
+msgstr ""
 
-#: src/diffuse/constants.py:25
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:32
+msgid "About window"
+msgstr ""
+
+#: src/diffuse/constants.py:26
 msgid "Copyright"
 msgstr "Direitos autorais"
 
-#: src/diffuse/dialogs.py:40
-msgid "Diffuse is a graphical tool for merging and comparing text files."
+#: src/diffuse/dialogs.py:46 src/diffuse/dialogs.py:89 src/diffuse/dialogs.py:133
+#: src/diffuse/preferences.py:254 src/diffuse/preferences.py:483
+#: src/diffuse/window.py:309 src/diffuse/window.py:1107
+msgid "_Cancel"
 msgstr ""
-"O Diffuse é uma ferramenta gráfica para unificar e comparar arquivos de texto."
 
-#: src/diffuse/dialogs.py:45
-msgid "translator-credits"
-msgstr "Pedro Albuquerque <pmra@gmx.com>"
-
-#: src/diffuse/dialogs.py:82
+#: src/diffuse/dialogs.py:50
 msgid "Encoding: "
 msgstr "Codificação: "
 
-#: src/diffuse/dialogs.py:94
+#: src/diffuse/dialogs.py:62
 msgid "Revision: "
 msgstr "Revisão: "
 
-#: src/diffuse/dialogs.py:156
+#: src/diffuse/dialogs.py:90 src/diffuse/dialogs.py:134
+#: src/diffuse/preferences.py:255
+msgid "_OK"
+msgstr ""
+
+#: src/diffuse/dialogs.py:130
 msgid "Find..."
 msgstr "Encontrar..."
 
-#: src/diffuse/dialogs.py:164
+#: src/diffuse/dialogs.py:140
 msgid "Search For: "
 msgstr "Procurar por: "
 
-#: src/diffuse/dialogs.py:189
+#: src/diffuse/dialogs.py:165
 msgid "Match Case"
 msgstr "Combinar maiúsculas"
 
-#: src/diffuse/dialogs.py:194
+#: src/diffuse/dialogs.py:170
 msgid "Search Backwards"
 msgstr "Procurar para trás"
 
+#: src/diffuse/main.py:53
+msgid "Display version and copyright information"
+msgstr "Mostra informação da versão e direitos autorais"
+
+#: src/diffuse/main.py:61
+msgid "Do not read any resource files"
+msgstr "Não lê qualquer arquivo de recursos"
+
+#: src/diffuse/main.py:69
+msgid "Specify explicit resource file"
+msgstr "Define um arquivo de recursos especifico"
+
+#: src/diffuse/main.py:77
+msgid "File revisions <rev-1> and <rev>"
+msgstr "Revisões de arquivos <rev-1> e <rev>"
+
 #: src/diffuse/main.py:85
-msgid "Close Tab"
-msgstr "Fechar aba"
+msgid "Close all tabs with no differences"
+msgstr "Fecha todas as abas sem diferenças"
 
-#: src/diffuse/main.py:132
-msgid "Open File..."
-msgstr "Abrir arquivo..."
+#: src/diffuse/main.py:92
+msgid "Use <codec> to read and write files"
+msgstr "Usa <codec> para ler e escrever arquivos"
 
-#: src/diffuse/main.py:133
-msgid "Reload File"
-msgstr "Recarregar arquivo"
+#: src/diffuse/main.py:100
+msgid "Display <label> instead of the file name"
+msgstr "Mostra <etiqueta> em vez do nome do arquivos"
 
-#: src/diffuse/main.py:134
-msgid "Save File"
-msgstr "Salvar arquivo"
+#: src/diffuse/main.py:108
+msgid "Create a new tab for each modified file"
+msgstr "Cria uma nova aba para cada arquivo modificado"
 
-#: src/diffuse/main.py:135
-msgid "Save File As..."
-msgstr "Salvar arquivo como..."
+#: src/diffuse/main.py:115
+msgid "File revision <rev>"
+msgstr "Revisão de arquivo <rev>"
 
-#: src/diffuse/main.py:217
-#, python-format
-msgid "Column %d"
-msgstr "Coluna %d"
+#: src/diffuse/main.py:123
+msgid "Create a new tab for each file"
+msgstr "Cria uma nova aba para cada arquivo"
 
-#: src/diffuse/main.py:291
-msgid "Save changes before loading the new file?"
-msgstr "Salvar alterações antes de carregar o novo arquivo?"
+#: src/diffuse/main.py:130
+msgid "Start a new tab"
+msgstr "Executa uma nova aba"
 
-#: src/diffuse/main.py:402
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "Erro ao ler a revisão %(rev)s de %(file)s."
+#: src/diffuse/main.py:137 src/diffuse/preferences.py:159
+msgid "Version control system search order"
+msgstr "Ordem de busca do sistema de controle de versão"
 
-#: src/diffuse/main.py:405 src/diffuse/main.py:1860
+#: src/diffuse/main.py:145
+msgid "Start with line <line> selected"
+msgstr "Começa com a linha <linha> selecionada"
+
+#: src/diffuse/main.py:153
+msgid "Create a blank file comparison pane"
+msgstr "Cria um novo painel de comparação"
+
+#: src/diffuse/main.py:160 src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:95
+msgid "Ignore changes to white space"
+msgstr "Ignorar alterações para espaços"
+
+#: src/diffuse/main.py:167
+msgid "Ignore changes in blank lines"
+msgstr "Ignora alterações para linhas em branco"
+
+#: src/diffuse/main.py:174 src/diffuse/preferences.py:88
+msgid "Ignore end of line differences"
+msgstr "Ignorar diferenças de fins de linha"
+
+#: src/diffuse/main.py:181 src/diffuse/preferences.py:84
+msgid "Ignore case differences"
+msgstr "Ignorar diferenças de maiúsculas"
+
+#: src/diffuse/main.py:188 src/diffuse/preferences.py:85
+msgid "Ignore white space differences"
+msgstr "Ignorar diferenças de espaços"
+
+#: src/diffuse/main.py:191
+msgid ""
+"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 several VCSs for comparison and merging."
+msgstr ""
+
+#: src/diffuse/main.py:247 src/diffuse/window.py:420
 #, python-format
 msgid "Error reading %s."
 msgstr "Erro ao ler %s."
 
-#: src/diffuse/main.py:427
-msgid "Open File"
-msgstr "Abrir arquivo"
-
-#: src/diffuse/main.py:484
-#, python-format
-msgid "The file %s changed on disk. Do you want to reload the file?"
-msgstr "O arquivo %s foi alterado no armazenamento. Quer recarregá-lo?"
-
-#: src/diffuse/main.py:510
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "Salvar %(title)s painel %(pane)d"
-
-#: src/diffuse/main.py:542
-#, python-format
-msgid "A file named %s already exists. Do you want to overwrite it?"
-msgstr "Já existe um arquivo chamado %s. Quer substituí-lo?"
-
-#: src/diffuse/main.py:549
-#, 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 ""
-"O arquivo %s foi modificado por outro processo desde seu último carregamento. Se "
-"salvar agora, perderá todas as alterações feitas fora deste programa. Salvar de "
-"qualquer forma?"
-
-#: src/diffuse/main.py:591
-#, python-format
-msgid "Error encoding to %s."
-msgstr "Erro ao codificar para %s."
-
-#: src/diffuse/main.py:595 src/diffuse/preferences.py:300
-#, python-format
-msgid "Error writing %s."
-msgstr "Erro ao salvar %s."
-
-#: src/diffuse/main.py:625
-msgid "Go To Line..."
-msgstr "Ir para linha..."
-
-#: src/diffuse/main.py:626
-msgid "Line Number: "
-msgstr "Número de linha: "
-
-#: src/diffuse/main.py:657
-msgid ""
-"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."
-
-#: src/diffuse/main.py:661
-msgid "Press the escape key to finish editing."
-msgstr "Pressione Esc para terminar a edição."
-
-#: src/diffuse/main.py:664
-msgid ""
-"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."
-
-#: src/diffuse/main.py:787
-msgid "_File"
-msgstr "Arquivo"
-
-#: src/diffuse/main.py:788
-msgid "_Open File..."
-msgstr "Abrir arquiv_o..."
-
-#: src/diffuse/main.py:789
-msgid "Open File In New _Tab..."
-msgstr "Abrir arquivo em no_va aba..."
-
-#: src/diffuse/main.py:790
-msgid "Open _Modified Files..."
-msgstr "Abrir arquivos _modificados..."
-
-#: src/diffuse/main.py:791
-msgid "Open Commi_t..."
-msgstr "Abrir rev_isão..."
-
-#: src/diffuse/main.py:792
-msgid "_Reload File"
-msgstr "_Recarregar arquivo"
-
-#: src/diffuse/main.py:794
-msgid "_Save File"
-msgstr "_Salvar arquivo"
-
-#: src/diffuse/main.py:795
-msgid "Save File _As..."
-msgstr "Salvar _arquivo como..."
-
-#: src/diffuse/main.py:796
-msgid "Save A_ll"
-msgstr "Sa_lvar tudo"
-
-#: src/diffuse/main.py:798
-msgid "New _2-Way File Merge"
-msgstr "Nova unificação de _2 vias"
-
-#: src/diffuse/main.py:799
-msgid "New _3-Way File Merge"
-msgstr "Nova unificação de _3 vias"
-
-#: src/diffuse/main.py:800
-msgid "New _N-Way File Merge..."
-msgstr "Nova unificação de _N vias..."
-
-#: src/diffuse/main.py:802
-msgid "_Close Tab"
-msgstr "Fe_char aba"
-
-#: src/diffuse/main.py:803
-msgid "_Undo Close Tab"
-msgstr "Desfa_zer fechamento da aba"
-
-#: src/diffuse/main.py:804
-msgid "_Quit"
-msgstr "_Sair"
-
-#: src/diffuse/main.py:807
-msgid "_Edit"
-msgstr "_Editar"
-
-#: src/diffuse/main.py:808
-msgid "_Undo"
-msgstr "_Desfazer"
-
-#: src/diffuse/main.py:809
-msgid "_Redo"
-msgstr "_Refazer"
-
-#: src/diffuse/main.py:811
-msgid "Cu_t"
-msgstr "Cor_tar"
-
-#: src/diffuse/main.py:812
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: src/diffuse/main.py:813
-msgid "_Paste"
-msgstr "Co_lar"
-
-#: src/diffuse/main.py:815
-msgid "Select _All"
-msgstr "Selecion_ar tudo"
-
-#: src/diffuse/main.py:816
-msgid "C_lear Edits"
-msgstr "_Limpar edições"
-
-#: src/diffuse/main.py:817
-msgid "_Dismiss All Edits"
-msgstr "_Descartar toda a edição"
-
-#: src/diffuse/main.py:819
-msgid "_Find..."
-msgstr "_Encontrar..."
-
-#: src/diffuse/main.py:820
-msgid "Find _Next"
-msgstr "Encontrar segui_nte"
-
-#: src/diffuse/main.py:821
-msgid "Find Pre_vious"
-msgstr "Encontrar _anterior"
-
-#: src/diffuse/main.py:822
-msgid "_Go To Line..."
-msgstr "_Ir para linha..."
-
-#: src/diffuse/main.py:824
-msgid "Pr_eferences..."
-msgstr "Pr_eferências..."
-
-#: src/diffuse/main.py:828
-msgid "None"
-msgstr "Nenhuma"
-
-#: src/diffuse/main.py:846
-msgid "_View"
-msgstr "_Ver"
-
-#: src/diffuse/main.py:847
-msgid "_Syntax Highlighting"
-msgstr "Destaque de _sintaxe"
-
-#: src/diffuse/main.py:849
-msgid "Re_align All"
-msgstr "Re_alinhar tudo"
-
-#: src/diffuse/main.py:850
-msgid "_Isolate"
-msgstr "_Isolar"
-
-#: src/diffuse/main.py:852
-msgid "_First Difference"
-msgstr "_Primeira diferença"
-
-#: src/diffuse/main.py:853
-msgid "_Previous Difference"
-msgstr "Diferença _anterior"
-
-#: src/diffuse/main.py:854
-msgid "_Next Difference"
-msgstr "Diferença segui_nte"
-
-#: src/diffuse/main.py:855
-msgid "_Last Difference"
-msgstr "Ú_ltima diferença"
-
-#: src/diffuse/main.py:857
-msgid "Fir_st Tab"
-msgstr "P_rimeira aba"
-
-#: src/diffuse/main.py:858
-msgid "Pre_vious Tab"
-msgstr "_Aba anterior"
-
-#: src/diffuse/main.py:859
-msgid "Next _Tab"
-msgstr "Aba seguin_te"
-
-#: src/diffuse/main.py:860
-msgid "Las_t Tab"
-msgstr "Úl_tima aba"
-
-#: src/diffuse/main.py:862
-msgid "Shift Pane _Right"
-msgstr "Mover painel à di_reita"
-
-#: src/diffuse/main.py:863
-msgid "Shift Pane _Left"
-msgstr "Mover painel à es_querda"
-
-#: src/diffuse/main.py:866
-msgid "F_ormat"
-msgstr "F_ormatar"
-
-#: src/diffuse/main.py:867
-msgid "Convert To _Upper Case"
-msgstr "Converter para maiúsc_ulas"
-
-#: src/diffuse/main.py:868
-msgid "Convert To _Lower Case"
-msgstr "Converter para minúscu_las"
-
-#: src/diffuse/main.py:870
-msgid "Sort Lines In _Ascending Order"
-msgstr "Organizar linhas em ordem _ascendente"
-
-#: src/diffuse/main.py:871
-msgid "Sort Lines In D_escending Order"
-msgstr "Organizar linhas em ordem d_escendente"
-
-#: src/diffuse/main.py:873
-msgid "Remove Trailing _White Space"
-msgstr "Remover espaços _finais"
-
-#: src/diffuse/main.py:874
-msgid "Convert Tabs To _Spaces"
-msgstr "Converter tabulações em e_spaços"
-
-#: src/diffuse/main.py:875
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "Converter espaços iniciais em _tabulações"
-
-#: src/diffuse/main.py:877
-msgid "_Increase Indenting"
-msgstr "Aumentar _indentação"
-
-#: src/diffuse/main.py:878
-msgid "De_crease Indenting"
-msgstr "Di_minuir indentação"
-
-#: src/diffuse/main.py:880
-msgid "Convert To _DOS Format"
-msgstr "Converter para formato _DOS"
-
-#: src/diffuse/main.py:881
-msgid "Convert To _Mac Format"
-msgstr "Converter para formato _Mac"
-
-#: src/diffuse/main.py:882
-msgid "Convert To Uni_x Format"
-msgstr "Converter para formato Uni_x"
-
-#: src/diffuse/main.py:885
-msgid "_Merge"
-msgstr "_Unificar"
-
-#: src/diffuse/main.py:886
-msgid "Copy Selection _Right"
-msgstr "Copiar seleção à di_reita"
-
-#: src/diffuse/main.py:887
-msgid "Copy Selection _Left"
-msgstr "Copiar seleção à es_querda"
-
-#: src/diffuse/main.py:889
-msgid "Copy Left _Into Selection"
-msgstr "Cop_iar da esquerda para a seleção"
-
-#: src/diffuse/main.py:890
-msgid "Copy Right I_nto Selection"
-msgstr "Copiar da _direita para a seleção"
-
-#: src/diffuse/main.py:891
-msgid "_Merge From Left Then Right"
-msgstr "U_nificar da esquerda e depois da direita"
-
-#: src/diffuse/main.py:892
-msgid "M_erge From Right Then Left"
-msgstr "Unificar da dir_eita e depois da esquerda"
-
-#: src/diffuse/main.py:895
-msgid "_Help"
-msgstr "A_juda"
-
-#: src/diffuse/main.py:896
-msgid "_Help Contents..."
-msgstr "Conteúdo da a_juda..."
-
-#: src/diffuse/main.py:898
-#, python-format
-msgid "_About %s..."
-msgstr "_Sobre %s..."
-
-#: src/diffuse/main.py:913
-msgid "New 2-Way File Merge"
-msgstr "Nova unificação de _2 vias"
-
-#: src/diffuse/main.py:914
-msgid "New 3-Way File Merge"
-msgstr "Nova unificação de _3 vias"
-
-#: src/diffuse/main.py:916
-msgid "Realign All"
-msgstr "Realinhar tudo"
-
-#: src/diffuse/main.py:917
-msgid "First Difference"
-msgstr "Primeira diferença"
-
-#: src/diffuse/main.py:918
-msgid "Previous Difference"
-msgstr "Diferença anterior"
-
-#: src/diffuse/main.py:919
-msgid "Next Difference"
-msgstr "Diferença seguinte"
-
-#: src/diffuse/main.py:920
-msgid "Last Difference"
-msgstr "Última diferença"
-
-#: src/diffuse/main.py:922
-msgid "Copy Selection Right"
-msgstr "Copiar seleção à direita"
-
-#: src/diffuse/main.py:923
-msgid "Copy Selection Left"
-msgstr "Copiar seleção à esquerda"
-
-#: src/diffuse/main.py:924
-msgid "Copy Left Into Selection"
-msgstr "Copiar da esquerda para a seleção"
-
-#: src/diffuse/main.py:925
-msgid "Copy Right Into Selection"
-msgstr "Copiar da direita para a seleção"
-
-#: src/diffuse/main.py:926
-msgid "Merge From Left Then Right"
-msgstr "Unificar da esquerda e depois da direita"
-
-#: src/diffuse/main.py:927
-msgid "Merge From Right Then Left"
-msgstr "Unificar da direita e depois da esquerda"
-
-#: src/diffuse/main.py:929
-msgid "Undo"
-msgstr "Desfazer"
-
-#: src/diffuse/main.py:930
-msgid "Redo"
-msgstr "Refazer"
-
-#: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
-msgid "Cut"
-msgstr "Cortar"
-
-#: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
-msgid "Copy"
-msgstr "Copiar"
-
-#: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
-msgid "Paste"
-msgstr "Colar"
-
-#: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
-msgid "Clear Edits"
-msgstr "Limpar edições"
-
-#: src/diffuse/main.py:1057
-msgid "Some files have unsaved changes. Select the files to save before closing."
-msgstr ""
-"Alguns arquivos têm alterações não salvas. Selecione os arquivos para salvar "
-"antes de fechar."
-
-#: src/diffuse/main.py:1071
-msgid "Tab"
-msgstr "Aba"
-
-#: src/diffuse/main.py:1076
-msgid "Pane"
-msgstr "Painel"
-
-#: src/diffuse/main.py:1087
-msgid "Close _Without Saving"
-msgstr "Fechar sem sal_var"
-
-#: src/diffuse/main.py:1126
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "Fechamento da aba resultará em saída do %s."
-
-#: src/diffuse/main.py:1209
-#, python-format
-msgid "File Merge %d"
-msgstr "Unificação de arquivos %d"
-
-#: src/diffuse/main.py:1315
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "Erro ao obter revisões de %s."
-
-#: src/diffuse/main.py:1347
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "Erro ao obter modificações de %s."
-
-#: src/diffuse/main.py:1380
-msgid "Open File In New Tab"
-msgstr "Abrir arquivo em nova aba"
-
-#: src/diffuse/main.py:1403
-msgid "Choose Folder With Modified Files"
-msgstr "Escolha pasta com arquivos modificados"
-
-#: src/diffuse/main.py:1421
-msgid "No modified files found."
-msgstr "Nenhum arquivo modificado."
-
-#: src/diffuse/main.py:1427
-msgid "Choose Folder With Commit"
-msgstr "Escolha pasta com revisão"
-
-#: src/diffuse/main.py:1447
-msgid "No committed files found."
-msgstr "Nenhum arquivo revisado encontrado."
-
-#: src/diffuse/main.py:1483
-msgid "New N-Way File Merge..."
-msgstr "Nova unificação de N vias..."
-
-#: src/diffuse/main.py:1484
-msgid "Number of panes: "
-msgstr "Número de painéis: "
-
-#: src/diffuse/main.py:1558
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "Frase não encontrada. Continuar a partir do final do arquivo?"
-
-#: src/diffuse/main.py:1560
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "Frase não encontrada. Continuar desde o início do arquivo?"
-
-#: src/diffuse/main.py:1781
-#, fuzzy
-msgid ""
-"Usage:\n"
-"    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"
-"also retrieve revisions of files from several VCSs for comparison and merging.\n"
-"\n"
-"Help Options:\n"
-"  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright information\n"
-"\n"
-"Configuration Options:\n"
-"  --no-rcfile                      Do not read any resource files\n"
-"  --rcfile <file>                  Specify explicit resource file\n"
-"\n"
-"General Options:\n"
-"  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
-"  ( -D | --close-if-same )         Close all tabs with no differences\n"
-"  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
-"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
-"  ( -m | --modified )              Create a new tab for each modified file\n"
-"  ( -r | --revision ) <rev>        File revision <rev>\n"
-"  ( -s | --separate )              Create a new tab for each file\n"
-"  ( -t | --tab )                   Start a new tab\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    Start with line <line> selected\n"
-"  --null-file                      Create a blank file comparison pane\n"
-"\n"
-"Display Options:\n"
-"  ( -b | --ignore-space-change )   Ignore changes to white space\n"
-"  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
-"  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
-"  ( -i | --ignore-case )           Ignore case differences\n"
-"  ( -w | --ignore-all-space )      Ignore white space differences"
-msgstr ""
-"Uso:\n"
-"    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"
-"É capaz de comparar um número arbitrário de arquivos lado-a-lado e dá a\n"
-"possibilidade de ajustar manualmente as linhas com edição directa.\n"
-"Também pode obter revisões de arquivos de vários VCSs para comparar e unificar.\n"
-"Opções de ajuda:\n"
-"  ( -h | -? | --help )             mostra esta ajuda\n"
-"  ( -v | --version )               mostra informação da versão e direitos "
-"autorais\n"
-"\n"
-"Opções de configuração:\n"
-"  --no-rcfile                      não lê qualquer arquivo de recursos\n"
-"  --rcfile <file>                  define um arquivo de recursos especifico\n"
-"\n"
-"Opções gerais:\n"
-"  ( -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"
-"  ( -m | --modified )              cria uma nova aba para cada arquivo "
-"modificado\n"
-"  ( -r | --revision ) <rev>        revisão de arquivo <rev>\n"
-"  ( -s | --separate )              cria uma nova aba para cada arquivo\n"
-"  ( -t | --tab )                   executa uma nova aba\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <linha>                   começa com a linha <linha> selecionada\n"
-"  --null-file                      cria um novo painel de comparação\n"
-"\n"
-"Opções de vista:\n"
-"  ( -b | --ignore-space-change )   ignora alterações para espaços\n"
-"  ( -B | --ignore-blank-lines )    ignora alterações para linhas em branco\n"
-"  ( -E | --ignore-end-of-line )    ignora diferenças de fim de linha\n"
-"  ( -i | --ignore-case )           ignora diferenças entre maiúsculas\n"
-"  ( -w | --ignore-all-space )      ignora diferenças de espaços"
-
-#: src/diffuse/main.py:1948
+#: src/diffuse/main.py:327
 msgid "Error parsing line number."
 msgstr "Erro ao analisar o número de linha."
 
-#: src/diffuse/main.py:1958
-#, python-format
-msgid "Skipping unknown argument \"%s\"."
-msgstr "Omitindo argumento desconhecido \"%s\"."
-
-#: src/diffuse/main.py:1966
+#: src/diffuse/main.py:343
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Erro ao processar o argumento \"%s\". Pasta imprevista."
 
-#: src/diffuse/preferences.py:80
+#: src/diffuse/preferences.py:75
 msgid "Display"
 msgstr "Mostrar"
 
-#: src/diffuse/preferences.py:83
+#: src/diffuse/preferences.py:78
 msgid "Font"
 msgstr "Letra"
 
-#: src/diffuse/preferences.py:84
+#: src/diffuse/preferences.py:79
 msgid "Tab width"
 msgstr "Largura de tabulação"
 
-#: src/diffuse/preferences.py:85
+#: src/diffuse/preferences.py:80
 msgid "Show right margin"
 msgstr "Mostrar margem direita"
 
-#: src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:81
 msgid "Right margin"
 msgstr "Margem direita"
 
-#: src/diffuse/preferences.py:87
+#: src/diffuse/preferences.py:82
 msgid "Show line numbers"
 msgstr "Mostrar números de linha"
 
-#: src/diffuse/preferences.py:88
+#: src/diffuse/preferences.py:83
 msgid "Show white space characters"
 msgstr "Mostrar espaços em branco"
 
-#: src/diffuse/preferences.py:89
-msgid "Ignore case differences"
-msgstr "Ignorar diferenças de maiúsculas"
-
-#: src/diffuse/preferences.py:90
-msgid "Ignore white space differences"
-msgstr "Ignorar diferenças de espaços"
-
-#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100
-msgid "Ignore changes to white space"
-msgstr "Ignorar alterações para espaços"
-
-#: src/diffuse/preferences.py:92
+#: src/diffuse/preferences.py:87
 msgid "Ignore blank line differences"
 msgstr "Ignorar diferenças de linhas em branco"
 
-#: src/diffuse/preferences.py:93
-msgid "Ignore end of line differences"
-msgstr "Ignorar diferenças de fins de linha"
-
-#: src/diffuse/preferences.py:95
+#: src/diffuse/preferences.py:90
 msgid "Alignment"
 msgstr "Alinhamento"
 
-#: src/diffuse/preferences.py:98
+#: src/diffuse/preferences.py:93
 msgid "Ignore case"
 msgstr "Ignorar maiúsculas"
 
-#: src/diffuse/preferences.py:99
+#: src/diffuse/preferences.py:94
 msgid "Ignore white space"
 msgstr "Ignorar espaços"
 
-#: src/diffuse/preferences.py:101
+#: src/diffuse/preferences.py:96
 msgid "Ignore blank lines"
 msgstr "Ignorar linhas em branco"
 
-#: src/diffuse/preferences.py:102
+#: src/diffuse/preferences.py:97
 msgid "Ignore end of line characters"
 msgstr "Ignorar caracteres de fim de linha"
 
-#: src/diffuse/preferences.py:104
+#: src/diffuse/preferences.py:99
 msgid "Editor"
 msgstr "Editor"
 
-#: src/diffuse/preferences.py:107
+#: src/diffuse/preferences.py:102
 msgid "Auto indent"
 msgstr "Indentação automática"
 
-#: src/diffuse/preferences.py:108
+#: src/diffuse/preferences.py:103
 msgid "Expand tabs to spaces"
 msgstr "Expandir tabulações para espaços"
 
-#: src/diffuse/preferences.py:109
+#: src/diffuse/preferences.py:104
 msgid "Soft tab width"
 msgstr "Largura de tabulação suave"
 
-#: src/diffuse/preferences.py:111
+#: src/diffuse/preferences.py:106
 msgid "Tabs"
 msgstr "Abas"
 
-#: src/diffuse/preferences.py:114
+#: src/diffuse/preferences.py:109
 msgid "Default panes"
 msgstr "Painéis padrão"
 
-#: src/diffuse/preferences.py:115
+#: src/diffuse/preferences.py:110
 msgid "Always show the tab bar"
 msgstr "Mostrar sempre a barra de abas"
 
-#: src/diffuse/preferences.py:116
+#: src/diffuse/preferences.py:111
 #, 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:118
+#: src/diffuse/preferences.py:113
 msgid "Regional Settings"
 msgstr "Definições regionais"
 
-#: src/diffuse/preferences.py:121
+#: src/diffuse/preferences.py:116
 msgid "Default codec"
 msgstr "Codificação padrão"
 
-#: src/diffuse/preferences.py:122
+#: src/diffuse/preferences.py:117
 msgid "Order of codecs used to identify encoding"
 msgstr "Ordem de codecs usados para identificar a codificação"
 
-#: src/diffuse/preferences.py:143
+#: src/diffuse/preferences.py:138
 msgid "Cygwin"
 msgstr "Cygwin"
 
-#: src/diffuse/preferences.py:145
+#: src/diffuse/preferences.py:140
 msgid "Root directory"
 msgstr "Pasta root"
 
-#: src/diffuse/preferences.py:146
+#: src/diffuse/preferences.py:141
 msgid "Cygdrive prefix"
 msgstr "Prefixo Cygdrive"
 
-#: src/diffuse/preferences.py:165
-msgid "Version control system search order"
-msgstr "Ordem de busca do sistema de controle de versão"
-
-#: src/diffuse/preferences.py:173
+#: src/diffuse/preferences.py:167
 msgid "\"co\" command"
 msgstr "comando \"co\""
 
-#: src/diffuse/preferences.py:174
+#: src/diffuse/preferences.py:168
 msgid "\"rlog\" command"
 msgstr "comando \"rlog\""
 
-#: src/diffuse/preferences.py:176
+#: src/diffuse/preferences.py:170
 msgid "Command"
 msgstr "Comando"
 
-#: src/diffuse/preferences.py:182
+#: src/diffuse/preferences.py:176
 msgid "Launch from a Bash login shell"
 msgstr "Iniciar em uma consola de sessão Bash"
 
-#: src/diffuse/preferences.py:189
+#: src/diffuse/preferences.py:183
 msgid "Update paths for Cygwin"
 msgstr "Atualizar caminhos para o Cygwin"
 
-#: src/diffuse/preferences.py:194
+#: src/diffuse/preferences.py:188
 msgid "Version Control"
 msgstr "Controle de versões"
 
-#: src/diffuse/preferences.py:259
+#: src/diffuse/preferences.py:253
 msgid "Preferences"
 msgstr "Preferências"
 
+#: src/diffuse/preferences.py:294 src/diffuse/window.py:580
+#, python-format
+msgid "Error writing %s."
+msgstr "Erro ao salvar %s."
+
+#: src/diffuse/preferences.py:483 src/diffuse/window.py:446
+#: src/diffuse/window.py:1413 src/diffuse/window.py:1436 src/diffuse/window.py:1459
+msgid "_Open"
+msgstr ""
+
 #: src/diffuse/resources.py:242 src/diffuse/resources.py:246
 #: src/diffuse/resources.py:249
 #, python-brace-format
@@ -942,16 +420,11 @@ msgstr "Erro incomum na linha {line} de {file}."
 msgid "Auto Detect"
 msgstr "Detecção automática"
 
-#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97
+#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:96
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "Erro ao analisar a revisão %s."
 
-#: src/diffuse/vcs/vcs_registry.py:238
-#, python-format
-msgid "Error parsing %s."
-msgstr "Erro ao analisar %s."
-
 #: src/diffuse/widgets.py:1857
 msgid "Align with Selection"
 msgstr "Alinhar com a seleção"
@@ -964,10 +437,647 @@ msgstr "Isolar"
 msgid "Merge Selection"
 msgstr "Unir seleção"
 
+#: src/diffuse/widgets.py:1861 src/diffuse/window.py:865
+msgid "Cut"
+msgstr "Cortar"
+
+#: src/diffuse/widgets.py:1862 src/diffuse/window.py:866
+msgid "Copy"
+msgstr "Copiar"
+
+#: src/diffuse/widgets.py:1863 src/diffuse/window.py:867
+msgid "Paste"
+msgstr "Colar"
+
 #: src/diffuse/widgets.py:1865
 msgid "Select All"
 msgstr "Selecionar tudo"
 
+#: src/diffuse/widgets.py:1866 src/diffuse/window.py:868
+msgid "Clear Edits"
+msgstr "Limpar edições"
+
 #: src/diffuse/widgets.py:1868
 msgid "Swap with Selected Pane"
 msgstr "Trocar com o painel selecionado"
+
+#: src/diffuse/window.py:83
+msgid "Close Tab"
+msgstr "Fechar aba"
+
+#: src/diffuse/window.py:126
+msgid "Open File..."
+msgstr "Abrir arquivo..."
+
+#: src/diffuse/window.py:127
+msgid "Reload File"
+msgstr "Recarregar arquivo"
+
+#: src/diffuse/window.py:128
+msgid "Save File"
+msgstr "Salvar arquivo"
+
+#: src/diffuse/window.py:129
+msgid "Save File As..."
+msgstr "Salvar arquivo como..."
+
+#: src/diffuse/window.py:228
+#, python-format
+msgid "Column %d"
+msgstr "Coluna %d"
+
+#: src/diffuse/window.py:306
+msgid "Save changes before loading the new file?"
+msgstr "Salvar alterações antes de carregar o novo arquivo?"
+
+#: src/diffuse/window.py:310
+msgid "_No"
+msgstr ""
+
+#: src/diffuse/window.py:311
+msgid "_Yes"
+msgstr ""
+
+#: src/diffuse/window.py:417
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "Erro ao ler a revisão %(rev)s de %(file)s."
+
+#: src/diffuse/window.py:442
+msgid "Open File"
+msgstr "Abrir arquivo"
+
+#: src/diffuse/window.py:495
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "Salvar %(title)s painel %(pane)d"
+
+#: src/diffuse/window.py:499 src/diffuse/window.py:1111
+#, fuzzy
+msgid "_Save"
+msgstr "_Salvar arquivo"
+
+#: src/diffuse/window.py:527
+#, python-format
+msgid "A file named %s already exists. Do you want to overwrite it?"
+msgstr "Já existe um arquivo chamado %s. Quer substituí-lo?"
+
+#: src/diffuse/window.py:534
+#, 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 ""
+"O arquivo %s foi modificado por outro processo desde seu último carregamento. Se "
+"salvar agora, perderá todas as alterações feitas fora deste programa. Salvar de "
+"qualquer forma?"
+
+#: src/diffuse/window.py:576
+#, python-format
+msgid "Error encoding to %s."
+msgstr "Erro ao codificar para %s."
+
+#: src/diffuse/window.py:610
+msgid "Go To Line..."
+msgstr "Ir para linha..."
+
+#: src/diffuse/window.py:611
+msgid "Line Number: "
+msgstr "Número de linha: "
+
+#: src/diffuse/window.py:642
+msgid ""
+"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."
+
+#: src/diffuse/window.py:646
+msgid "Press the escape key to finish editing."
+msgstr "Pressione Esc para terminar a edição."
+
+#: src/diffuse/window.py:649
+msgid ""
+"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."
+
+#: src/diffuse/window.py:710
+msgid "_File"
+msgstr "Arquivo"
+
+#: src/diffuse/window.py:712
+msgid "_Open File..."
+msgstr "Abrir arquiv_o..."
+
+#: src/diffuse/window.py:713
+msgid "Open File In New _Tab..."
+msgstr "Abrir arquivo em no_va aba..."
+
+#: src/diffuse/window.py:714
+msgid "Open _Modified Files..."
+msgstr "Abrir arquivos _modificados..."
+
+#: src/diffuse/window.py:715
+msgid "Open Commi_t..."
+msgstr "Abrir rev_isão..."
+
+#: src/diffuse/window.py:716
+msgid "_Reload File"
+msgstr "_Recarregar arquivo"
+
+#: src/diffuse/window.py:718
+msgid "_Save File"
+msgstr "_Salvar arquivo"
+
+#: src/diffuse/window.py:719
+msgid "Save File _As..."
+msgstr "Salvar _arquivo como..."
+
+#: src/diffuse/window.py:720
+msgid "Save A_ll"
+msgstr "Sa_lvar tudo"
+
+#: src/diffuse/window.py:722
+msgid "New _2-Way File Merge"
+msgstr "Nova unificação de _2 vias"
+
+#: src/diffuse/window.py:723
+msgid "New _3-Way File Merge"
+msgstr "Nova unificação de _3 vias"
+
+#: src/diffuse/window.py:724
+msgid "New _N-Way File Merge..."
+msgstr "Nova unificação de _N vias..."
+
+#: src/diffuse/window.py:726
+msgid "_Close Tab"
+msgstr "Fe_char aba"
+
+#: src/diffuse/window.py:727
+msgid "_Undo Close Tab"
+msgstr "Desfa_zer fechamento da aba"
+
+#: src/diffuse/window.py:728
+msgid "_Quit"
+msgstr "_Sair"
+
+#: src/diffuse/window.py:732
+msgid "_Edit"
+msgstr "_Editar"
+
+#: src/diffuse/window.py:734
+msgid "_Undo"
+msgstr "_Desfazer"
+
+#: src/diffuse/window.py:735
+msgid "_Redo"
+msgstr "_Refazer"
+
+#: src/diffuse/window.py:737
+msgid "Cu_t"
+msgstr "Cor_tar"
+
+#: src/diffuse/window.py:738
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: src/diffuse/window.py:739
+msgid "_Paste"
+msgstr "Co_lar"
+
+#: src/diffuse/window.py:741
+msgid "Select _All"
+msgstr "Selecion_ar tudo"
+
+#: src/diffuse/window.py:742
+msgid "C_lear Edits"
+msgstr "_Limpar edições"
+
+#: src/diffuse/window.py:743
+msgid "_Dismiss All Edits"
+msgstr "_Descartar toda a edição"
+
+#: src/diffuse/window.py:745
+msgid "_Find..."
+msgstr "_Encontrar..."
+
+#: src/diffuse/window.py:746
+msgid "Find _Next"
+msgstr "Encontrar segui_nte"
+
+#: src/diffuse/window.py:747
+msgid "Find Pre_vious"
+msgstr "Encontrar _anterior"
+
+#: src/diffuse/window.py:748
+msgid "_Go To Line..."
+msgstr "_Ir para linha..."
+
+#: src/diffuse/window.py:750
+msgid "Pr_eferences..."
+msgstr "Pr_eferências..."
+
+#: src/diffuse/window.py:754
+msgid "None"
+msgstr "Nenhuma"
+
+#: src/diffuse/window.py:776
+msgid "_View"
+msgstr "_Ver"
+
+#: src/diffuse/window.py:778
+msgid "_Syntax Highlighting"
+msgstr "Destaque de _sintaxe"
+
+#: src/diffuse/window.py:780
+msgid "Re_align All"
+msgstr "Re_alinhar tudo"
+
+#: src/diffuse/window.py:781
+msgid "_Isolate"
+msgstr "_Isolar"
+
+#: src/diffuse/window.py:783
+msgid "_First Difference"
+msgstr "_Primeira diferença"
+
+#: src/diffuse/window.py:784
+msgid "_Previous Difference"
+msgstr "Diferença _anterior"
+
+#: src/diffuse/window.py:785
+msgid "_Next Difference"
+msgstr "Diferença segui_nte"
+
+#: src/diffuse/window.py:786
+msgid "_Last Difference"
+msgstr "Ú_ltima diferença"
+
+#: src/diffuse/window.py:788
+msgid "Fir_st Tab"
+msgstr "P_rimeira aba"
+
+#: src/diffuse/window.py:789
+msgid "Pre_vious Tab"
+msgstr "_Aba anterior"
+
+#: src/diffuse/window.py:790
+msgid "Next _Tab"
+msgstr "Aba seguin_te"
+
+#: src/diffuse/window.py:791
+msgid "Las_t Tab"
+msgstr "Úl_tima aba"
+
+#: src/diffuse/window.py:793
+msgid "Shift Pane _Right"
+msgstr "Mover painel à di_reita"
+
+#: src/diffuse/window.py:794
+msgid "Shift Pane _Left"
+msgstr "Mover painel à es_querda"
+
+#: src/diffuse/window.py:798
+msgid "F_ormat"
+msgstr "F_ormatar"
+
+#: src/diffuse/window.py:800
+msgid "Convert To _Upper Case"
+msgstr "Converter para maiúsc_ulas"
+
+#: src/diffuse/window.py:801
+msgid "Convert To _Lower Case"
+msgstr "Converter para minúscu_las"
+
+#: src/diffuse/window.py:803
+msgid "Sort Lines In _Ascending Order"
+msgstr "Organizar linhas em ordem _ascendente"
+
+#: src/diffuse/window.py:804
+msgid "Sort Lines In D_escending Order"
+msgstr "Organizar linhas em ordem d_escendente"
+
+#: src/diffuse/window.py:806
+msgid "Remove Trailing _White Space"
+msgstr "Remover espaços _finais"
+
+#: src/diffuse/window.py:807
+msgid "Convert Tabs To _Spaces"
+msgstr "Converter tabulações em e_spaços"
+
+#: src/diffuse/window.py:808
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "Converter espaços iniciais em _tabulações"
+
+#: src/diffuse/window.py:810
+msgid "_Increase Indenting"
+msgstr "Aumentar _indentação"
+
+#: src/diffuse/window.py:811
+msgid "De_crease Indenting"
+msgstr "Di_minuir indentação"
+
+#: src/diffuse/window.py:813
+msgid "Convert To _DOS Format"
+msgstr "Converter para formato _DOS"
+
+#: src/diffuse/window.py:814
+msgid "Convert To _Mac Format"
+msgstr "Converter para formato _Mac"
+
+#: src/diffuse/window.py:815
+msgid "Convert To Uni_x Format"
+msgstr "Converter para formato Uni_x"
+
+#: src/diffuse/window.py:819
+msgid "_Merge"
+msgstr "_Unificar"
+
+#: src/diffuse/window.py:821
+msgid "Copy Selection _Right"
+msgstr "Copiar seleção à di_reita"
+
+#: src/diffuse/window.py:822
+msgid "Copy Selection _Left"
+msgstr "Copiar seleção à es_querda"
+
+#: src/diffuse/window.py:824
+msgid "Copy Left _Into Selection"
+msgstr "Cop_iar da esquerda para a seleção"
+
+#: src/diffuse/window.py:825
+msgid "Copy Right I_nto Selection"
+msgstr "Copiar da _direita para a seleção"
+
+#: src/diffuse/window.py:826
+msgid "_Merge From Left Then Right"
+msgstr "U_nificar da esquerda e depois da direita"
+
+#: src/diffuse/window.py:827
+msgid "M_erge From Right Then Left"
+msgstr "Unificar da dir_eita e depois da esquerda"
+
+#: src/diffuse/window.py:831
+msgid "_Help"
+msgstr "A_juda"
+
+#: src/diffuse/window.py:833
+msgid "_Help Contents..."
+msgstr "Conteúdo da a_juda..."
+
+#: src/diffuse/window.py:835
+#, python-format
+msgid "_About %s..."
+msgstr "_Sobre %s..."
+
+#: src/diffuse/window.py:847
+msgid "New 2-Way File Merge"
+msgstr "Nova unificação de _2 vias"
+
+#: src/diffuse/window.py:848
+msgid "New 3-Way File Merge"
+msgstr "Nova unificação de _3 vias"
+
+#: src/diffuse/window.py:850
+msgid "Realign All"
+msgstr "Realinhar tudo"
+
+#: src/diffuse/window.py:851
+msgid "First Difference"
+msgstr "Primeira diferença"
+
+#: src/diffuse/window.py:852
+msgid "Previous Difference"
+msgstr "Diferença anterior"
+
+#: src/diffuse/window.py:853
+msgid "Next Difference"
+msgstr "Diferença seguinte"
+
+#: src/diffuse/window.py:854
+msgid "Last Difference"
+msgstr "Última diferença"
+
+#: src/diffuse/window.py:856
+msgid "Copy Selection Right"
+msgstr "Copiar seleção à direita"
+
+#: src/diffuse/window.py:857
+msgid "Copy Selection Left"
+msgstr "Copiar seleção à esquerda"
+
+#: src/diffuse/window.py:858
+msgid "Copy Left Into Selection"
+msgstr "Copiar da esquerda para a seleção"
+
+#: src/diffuse/window.py:859
+msgid "Copy Right Into Selection"
+msgstr "Copiar da direita para a seleção"
+
+#: src/diffuse/window.py:860
+msgid "Merge From Left Then Right"
+msgstr "Unificar da esquerda e depois da direita"
+
+#: src/diffuse/window.py:861
+msgid "Merge From Right Then Left"
+msgstr "Unificar da direita e depois da esquerda"
+
+#: src/diffuse/window.py:863
+msgid "Undo"
+msgstr "Desfazer"
+
+#: src/diffuse/window.py:864
+msgid "Redo"
+msgstr "Refazer"
+
+#: src/diffuse/window.py:950
+msgid "Changes detected"
+msgstr ""
+
+#: src/diffuse/window.py:954
+#, fuzzy, python-format
+msgid ""
+"The file \"%s\" changed on disk.\n"
+"\n"
+"Do you want to reload the file?"
+msgstr "O arquivo %s foi alterado no armazenamento. Quer recarregá-lo?"
+
+#: src/diffuse/window.py:959
+#, fuzzy, python-format
+msgid ""
+"The following files changed on disk:\n"
+"%s\n"
+"\n"
+"Do you want to reload these files?"
+msgstr "O arquivo %s foi alterado no armazenamento. Quer recarregá-lo?"
+
+#: src/diffuse/window.py:1078
+msgid "Some files have unsaved changes. Select the files to save before closing."
+msgstr ""
+"Alguns arquivos têm alterações não salvas. Selecione os arquivos para salvar "
+"antes de fechar."
+
+#: src/diffuse/window.py:1092
+msgid "Tab"
+msgstr "Aba"
+
+#: src/diffuse/window.py:1097
+msgid "Pane"
+msgstr "Painel"
+
+#: src/diffuse/window.py:1108
+msgid "Close _Without Saving"
+msgstr "Fechar sem sal_var"
+
+#: src/diffuse/window.py:1147
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "Fechamento da aba resultará em saída do %s."
+
+#: src/diffuse/window.py:1224
+#, python-format
+msgid "File Merge %d"
+msgstr "Unificação de arquivos %d"
+
+#: src/diffuse/window.py:1344
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "Erro ao obter revisões de %s."
+
+#: src/diffuse/window.py:1376
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "Erro ao obter modificações de %s."
+
+#: src/diffuse/window.py:1409
+msgid "Open File In New Tab"
+msgstr "Abrir arquivo em nova aba"
+
+#: src/diffuse/window.py:1432
+msgid "Choose Folder With Modified Files"
+msgstr "Escolha pasta com arquivos modificados"
+
+#: src/diffuse/window.py:1450
+msgid "No modified files found."
+msgstr "Nenhum arquivo modificado."
+
+#: src/diffuse/window.py:1456
+msgid "Choose Folder With Commit"
+msgstr "Escolha pasta com revisão"
+
+#: src/diffuse/window.py:1476
+msgid "No committed files found."
+msgstr "Nenhum arquivo revisado encontrado."
+
+#: src/diffuse/window.py:1512
+msgid "New N-Way File Merge..."
+msgstr "Nova unificação de N vias..."
+
+#: src/diffuse/window.py:1513
+msgid "Number of panes: "
+msgstr "Número de painéis: "
+
+#: src/diffuse/window.py:1587
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "Frase não encontrada. Continuar a partir do final do arquivo?"
+
+#: src/diffuse/window.py:1589
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "Frase não encontrada. Continuar desde o início do arquivo?"
+
+#: src/diffuse/window.py:1762
+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/window.py:1766
+msgid "translator-credits"
+msgstr "Pedro Albuquerque <pmra@gmx.com>"
+
+#~ msgid "Main window: diff between two files"
+#~ msgstr "Janela principal: diff entre dois arquivos"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage:\n"
+#~ "    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"
+#~ "also retrieve revisions of files from several VCSs for comparison and "
+#~ "merging.\n"
+#~ "\n"
+#~ "Help Options:\n"
+#~ "  ( -h | -? | --help )             Display this usage information\n"
+#~ "  ( -v | --version )               Display version and copyright information\n"
+#~ "\n"
+#~ "Configuration Options:\n"
+#~ "  --no-rcfile                      Do not read any resource files\n"
+#~ "  --rcfile <file>                  Specify explicit resource file\n"
+#~ "\n"
+#~ "General Options:\n"
+#~ "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
+#~ "  ( -D | --close-if-same )         Close all tabs with no differences\n"
+#~ "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+#~ "  ( -L | --label ) <label>         Display <label> instead of the file name\n"
+#~ "  ( -m | --modified )              Create a new tab for each modified file\n"
+#~ "  ( -r | --revision ) <rev>        File revision <rev>\n"
+#~ "  ( -s | --separate )              Create a new tab for each file\n"
+#~ "  ( -t | --tab )                   Start a new tab\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    Start with line <line> selected\n"
+#~ "  --null-file                      Create a blank file comparison pane\n"
+#~ "\n"
+#~ "Display Options:\n"
+#~ "  ( -b | --ignore-space-change )   Ignore changes to white space\n"
+#~ "  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
+#~ "  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
+#~ "  ( -i | --ignore-case )           Ignore case differences\n"
+#~ "  ( -w | --ignore-all-space )      Ignore white space differences"
+#~ msgstr ""
+#~ "Uso:\n"
+#~ "    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"
+#~ "É capaz de comparar um número arbitrário de arquivos lado-a-lado e dá a\n"
+#~ "possibilidade de ajustar manualmente as linhas com edição directa.\n"
+#~ "Também pode obter revisões de arquivos de vários VCSs para comparar e "
+#~ "unificar.\n"
+#~ "Opções de ajuda:\n"
+#~ "  ( -h | -? | --help )             mostra esta ajuda\n"
+#~ "  ( -v | --version )               mostra informação da versão e direitos "
+#~ "autorais\n"
+#~ "\n"
+#~ "Opções de configuração:\n"
+#~ "  --no-rcfile                      não lê qualquer arquivo de recursos\n"
+#~ "  --rcfile <file>                  define um arquivo de recursos especifico\n"
+#~ "\n"
+#~ "Opções gerais:\n"
+#~ "  ( -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"
+#~ "  ( -m | --modified )              cria uma nova aba para cada arquivo "
+#~ "modificado\n"
+#~ "  ( -r | --revision ) <rev>        revisão de arquivo <rev>\n"
+#~ "  ( -s | --separate )              cria uma nova aba para cada arquivo\n"
+#~ "  ( -t | --tab )                   executa uma nova aba\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <linha>                   começa com a linha <linha> selecionada\n"
+#~ "  --null-file                      cria um novo painel de comparação\n"
+#~ "\n"
+#~ "Opções de vista:\n"
+#~ "  ( -b | --ignore-space-change )   ignora alterações para espaços\n"
+#~ "  ( -B | --ignore-blank-lines )    ignora alterações para linhas em branco\n"
+#~ "  ( -E | --ignore-end-of-line )    ignora diferenças de fim de linha\n"
+#~ "  ( -i | --ignore-case )           ignora diferenças entre maiúsculas\n"
+#~ "  ( -w | --ignore-all-space )      ignora diferenças de espaços"
diff --git a/po/ru.po b/po/ru.po
index ade2566..d384847 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse-svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-23 20:00-0400\n"
+"POT-Creation-Date: 2023-04-16 14:09-0400\n"
 "PO-Revision-Date: 2022-04-04 12:19-0400\n"
 "Last-Translator: Oleg Pakhtusov <opakhtusov@gmail.com>\n"
 "Language-Team: Russian <opakhtusov@gmail.com>\n"
@@ -33,829 +33,303 @@ 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."
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, and "
+"Subversion repositories."
 msgstr ""
 
-#: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
-msgid "Main window: diff between two files"
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:28
+msgid "Main window"
 msgstr ""
 
-#: src/diffuse/constants.py:25
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:32
+msgid "About window"
+msgstr ""
+
+#: src/diffuse/constants.py:26
 msgid "Copyright"
 msgstr ""
 
-#: src/diffuse/dialogs.py:40
-msgid "Diffuse is a graphical tool for merging and comparing text files."
+#: src/diffuse/dialogs.py:46 src/diffuse/dialogs.py:89 src/diffuse/dialogs.py:133
+#: src/diffuse/preferences.py:254 src/diffuse/preferences.py:483
+#: src/diffuse/window.py:309 src/diffuse/window.py:1107
+msgid "_Cancel"
 msgstr ""
-"Diffuse является графическим инструментом для слияния и сравнения текстовых "
-"файлов."
 
-#: src/diffuse/dialogs.py:45
-msgid "translator-credits"
-msgstr "v.01 О.Ю.Пахтусов (Oleg Pakhtusov) <oupakhtusov@gmail.com> "
-
-#: src/diffuse/dialogs.py:82
+#: src/diffuse/dialogs.py:50
 msgid "Encoding: "
 msgstr "Кодировка: "
 
-#: src/diffuse/dialogs.py:94
+#: src/diffuse/dialogs.py:62
 msgid "Revision: "
 msgstr "Ревизия: "
 
-#: src/diffuse/dialogs.py:156
+#: src/diffuse/dialogs.py:90 src/diffuse/dialogs.py:134
+#: src/diffuse/preferences.py:255
+msgid "_OK"
+msgstr ""
+
+#: src/diffuse/dialogs.py:130
 msgid "Find..."
 msgstr "Найти..."
 
-#: src/diffuse/dialogs.py:164
+#: src/diffuse/dialogs.py:140
 msgid "Search For: "
 msgstr "Искать: "
 
-#: src/diffuse/dialogs.py:189
+#: src/diffuse/dialogs.py:165
 msgid "Match Case"
 msgstr "Учитывать регистр"
 
-#: src/diffuse/dialogs.py:194
+#: src/diffuse/dialogs.py:170
 msgid "Search Backwards"
 msgstr "Поиск в обратном направлении"
 
+#: src/diffuse/main.py:53
+msgid "Display version and copyright information"
+msgstr "Отобразить номер версии и авторские права"
+
+#: src/diffuse/main.py:61
+msgid "Do not read any resource files"
+msgstr "Не читать файлы инициализации"
+
+#: src/diffuse/main.py:69
+msgid "Specify explicit resource file"
+msgstr "Определить явный файл ресурса"
+
+#: src/diffuse/main.py:77
+msgid "File revisions <rev-1> and <rev>"
+msgstr "Ревизии файла <rev-1> и <rev>"
+
 #: src/diffuse/main.py:85
-msgid "Close Tab"
-msgstr "Закрыть Вкладку"
+msgid "Close all tabs with no differences"
+msgstr "Закрыть все не имеющие различий вкладки"
 
-#: src/diffuse/main.py:132
-msgid "Open File..."
-msgstr "Открыть Файл..."
+#: src/diffuse/main.py:92
+msgid "Use <codec> to read and write files"
+msgstr "Использовать <codec> для чтения и записи файлов"
 
-#: src/diffuse/main.py:133
-msgid "Reload File"
-msgstr "Перезагрузить Файл"
+#: src/diffuse/main.py:100
+msgid "Display <label> instead of the file name"
+msgstr "Отображать <label> ярлык вместо имени файла"
 
-#: src/diffuse/main.py:134
-msgid "Save File"
-msgstr "Сохранить Файл"
+#: src/diffuse/main.py:108
+msgid "Create a new tab for each modified file"
+msgstr "Создавать новую вкладку для каждого измененного файла"
 
-#: src/diffuse/main.py:135
-msgid "Save File As..."
-msgstr "Сохранить Файл Как..."
+#: src/diffuse/main.py:115
+msgid "File revision <rev>"
+msgstr "Файл ревизии <rev>"
 
-#: src/diffuse/main.py:217
-#, python-format
-msgid "Column %d"
-msgstr "Столбец %d"
+#: src/diffuse/main.py:123
+msgid "Create a new tab for each file"
+msgstr "Создавать новую вкладку для каждого файла"
 
-#: src/diffuse/main.py:291
-msgid "Save changes before loading the new file?"
-msgstr "Сохранить изменения перед загрузкой нового файла?"
+#: src/diffuse/main.py:130
+msgid "Start a new tab"
+msgstr "Запустить новую вкладку"
 
-#: src/diffuse/main.py:402
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "Ошибка считывания ревизии %(rev)s из %(file)s."
+#: src/diffuse/main.py:137 src/diffuse/preferences.py:159
+msgid "Version control system search order"
+msgstr ""
 
-#: src/diffuse/main.py:405 src/diffuse/main.py:1860
+#: src/diffuse/main.py:145
+msgid "Start with line <line> selected"
+msgstr "Начать с выбранной <line> строки"
+
+#: src/diffuse/main.py:153
+msgid "Create a blank file comparison pane"
+msgstr "Создать пустое субокно сравнения файла"
+
+#: src/diffuse/main.py:160 src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:95
+msgid "Ignore changes to white space"
+msgstr "Игнорировать изменения пробелов, символов табуляции и пустой строки"
+
+#: src/diffuse/main.py:167
+msgid "Ignore changes in blank lines"
+msgstr "Игнорировать изменения в пустых строках"
+
+#: src/diffuse/main.py:174 src/diffuse/preferences.py:88
+msgid "Ignore end of line differences"
+msgstr "Игнорировать различия окончания строк (терминаторы)"
+
+#: src/diffuse/main.py:181 src/diffuse/preferences.py:84
+msgid "Ignore case differences"
+msgstr "Игнорировать различия в регистре"
+
+#: src/diffuse/main.py:188 src/diffuse/preferences.py:85
+msgid "Ignore white space differences"
+msgstr "Игнорировать различия пробелов, символов табуляции и пустой строки"
+
+#: src/diffuse/main.py:191
+msgid ""
+"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 several VCSs for comparison and merging."
+msgstr ""
+
+#: src/diffuse/main.py:247 src/diffuse/window.py:420
 #, python-format
 msgid "Error reading %s."
 msgstr "Ошибка чтения %s."
 
-#: src/diffuse/main.py:427
-msgid "Open File"
-msgstr "Открыть Файл"
-
-#: src/diffuse/main.py:484
-#, python-format
-msgid "The file %s changed on disk. Do you want to reload the file?"
-msgstr "Файл %s изменен на диске. Вы хотите перезагрузить этот файл?"
-
-#: src/diffuse/main.py:510
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "Сохранить %(title)s Субокно %(pane)d"
-
-#: src/diffuse/main.py:542
-#, python-format
-msgid "A file named %s already exists. Do you want to overwrite it?"
-msgstr "Файл под именем %s уже существует. Вы хотите перезаписать его?"
-
-#: src/diffuse/main.py:549
-#, python-format
-msgid ""
-"The file %s has been modified by another process since reading it. If you save, "
-"all the external changes could be lost. Save anyways?"
-msgstr ""
-"Файл %s был изменен другим процессом после его прочтения. На сохранении все "
-"внешние изменения будут потеряны. Сохранить все равно?"
-
-#: src/diffuse/main.py:591
-#, python-format
-msgid "Error encoding to %s."
-msgstr "Ошибка кодирования в %s."
-
-#: src/diffuse/main.py:595 src/diffuse/preferences.py:300
-#, python-format
-msgid "Error writing %s."
-msgstr "Ошибка записи %s."
-
-#: src/diffuse/main.py:625
-msgid "Go To Line..."
-msgstr "Перейти на Строку..."
-
-#: src/diffuse/main.py:626
-msgid "Line Number: "
-msgstr "Номер строки: "
-
-#: src/diffuse/main.py:657
-msgid ""
-"Press the enter key or double click to edit. Press the space bar or use the RMB "
-"menu to manually align."
-msgstr ""
-"Нажатие Enter или двойной щелчок для редактирования. Нажатие Space или меню "
-"правого щелчка для выравнивания вручную."
-
-#: src/diffuse/main.py:661
-msgid "Press the escape key to finish editing."
-msgstr "Нажмите клавишу Escape, чтобы закончить редактирование."
-
-#: src/diffuse/main.py:664
-msgid ""
-"Select target line and press the space bar to align. Press the escape key to "
-"cancel."
-msgstr ""
-"Выберите целевую строку и нажмите клавишу Space, чтобы выровнять. Нажмите Еscape "
-"для отмены."
-
-#: src/diffuse/main.py:787
-msgid "_File"
-msgstr "Фа_йл"
-
-#: src/diffuse/main.py:788
-msgid "_Open File..."
-msgstr "О_ткрыть Файл..."
-
-#: src/diffuse/main.py:789
-msgid "Open File In New _Tab..."
-msgstr "Открыт_ь Файл в Новой Вкладке..."
-
-#: src/diffuse/main.py:790
-msgid "Open _Modified Files..."
-msgstr "Открыть И_змененные Файлы..."
-
-#: src/diffuse/main.py:791
-msgid "Open Commi_t..."
-msgstr "Открыть Зафи_ксированные..."
-
-#: src/diffuse/main.py:792
-msgid "_Reload File"
-msgstr "Пер_езагрузить Файл"
-
-#: src/diffuse/main.py:794
-msgid "_Save File"
-msgstr "С_охранить Файл"
-
-#: src/diffuse/main.py:795
-msgid "Save File _As..."
-msgstr "Сохра_нить Файл Как..."
-
-#: src/diffuse/main.py:796
-msgid "Save A_ll"
-msgstr "Сохран_ить Все"
-
-#: src/diffuse/main.py:798
-msgid "New _2-Way File Merge"
-msgstr "Новое _2-Оконное Слияние Файлов"
-
-#: src/diffuse/main.py:799
-msgid "New _3-Way File Merge"
-msgstr "Новое _3-Оконное Слияние Файлов"
-
-#: src/diffuse/main.py:800
-msgid "New _N-Way File Merge..."
-msgstr "Новое _Многооконное Слияние Файлов..."
-
-#: src/diffuse/main.py:802
-msgid "_Close Tab"
-msgstr "З_акрыть Вкладку"
-
-#: src/diffuse/main.py:803
-msgid "_Undo Close Tab"
-msgstr "От_менить Закрытие Вкладки"
-
-#: src/diffuse/main.py:804
-msgid "_Quit"
-msgstr "В_ыход"
-
-#: src/diffuse/main.py:807
-msgid "_Edit"
-msgstr "Пра_вка"
-
-#: src/diffuse/main.py:808
-msgid "_Undo"
-msgstr "От_менить"
-
-#: src/diffuse/main.py:809
-msgid "_Redo"
-msgstr "Вер_нуть"
-
-#: src/diffuse/main.py:811
-msgid "Cu_t"
-msgstr "Выре_зать"
-
-#: src/diffuse/main.py:812
-msgid "_Copy"
-msgstr "Ко_пировать"
-
-#: src/diffuse/main.py:813
-msgid "_Paste"
-msgstr "В_ставить"
-
-#: src/diffuse/main.py:815
-msgid "Select _All"
-msgstr "В_ыбрать Все"
-
-#: src/diffuse/main.py:816
-msgid "C_lear Edits"
-msgstr "Оч_истить Правки"
-
-#: src/diffuse/main.py:817
-msgid "_Dismiss All Edits"
-msgstr "Сбр_осить Все Правки"
-
-#: src/diffuse/main.py:819
-msgid "_Find..."
-msgstr "На_йти..."
-
-#: src/diffuse/main.py:820
-msgid "Find _Next"
-msgstr "Н_айти Следующее"
-
-#: src/diffuse/main.py:821
-msgid "Find Pre_vious"
-msgstr "Най_ти Предыдущее"
-
-#: src/diffuse/main.py:822
-msgid "_Go To Line..."
-msgstr "Пер_ейти на Строку..."
-
-#: src/diffuse/main.py:824
-msgid "Pr_eferences..."
-msgstr "Предпо_чтения..."
-
-#: src/diffuse/main.py:828
-msgid "None"
-msgstr "Нет"
-
-#: src/diffuse/main.py:846
-msgid "_View"
-msgstr "В_ид"
-
-#: src/diffuse/main.py:847
-msgid "_Syntax Highlighting"
-msgstr "Подсве_тка Синтаксиса"
-
-#: src/diffuse/main.py:849
-msgid "Re_align All"
-msgstr "Пере_строить Все"
-
-#: src/diffuse/main.py:850
-msgid "_Isolate"
-msgstr "И_золировать"
-
-#: src/diffuse/main.py:852
-msgid "_First Difference"
-msgstr "Пер_вое Различие"
-
-#: src/diffuse/main.py:853
-msgid "_Previous Difference"
-msgstr "Предыдуще_е Различие"
-
-#: src/diffuse/main.py:854
-msgid "_Next Difference"
-msgstr "Следу_ющее Различие"
-
-#: src/diffuse/main.py:855
-msgid "_Last Difference"
-msgstr "П_оследнее Различие"
-
-#: src/diffuse/main.py:857
-msgid "Fir_st Tab"
-msgstr "Перв_ая Вкладка"
-
-#: src/diffuse/main.py:858
-msgid "Pre_vious Tab"
-msgstr "Предыдуща_я Вкладка"
-
-#: src/diffuse/main.py:859
-msgid "Next _Tab"
-msgstr "С_ледующая Вкладка"
-
-#: src/diffuse/main.py:860
-msgid "Las_t Tab"
-msgstr "Послед_няя Вкладка"
-
-#: src/diffuse/main.py:862
-msgid "Shift Pane _Right"
-msgstr "Пере_местить Субокно Вправо"
-
-#: src/diffuse/main.py:863
-msgid "Shift Pane _Left"
-msgstr "Перемест_ить Субокно Влево"
-
-#: src/diffuse/main.py:866
-msgid "F_ormat"
-msgstr "Фор_мат"
-
-#: src/diffuse/main.py:867
-msgid "Convert To _Upper Case"
-msgstr "Пр_еобразовать в Верхний Регистр"
-
-#: src/diffuse/main.py:868
-msgid "Convert To _Lower Case"
-msgstr "Пре_образовать в Нижний Регистр"
-
-#: src/diffuse/main.py:870
-msgid "Sort Lines In _Ascending Order"
-msgstr "Сор_тировать Строки в Порядке Возрастания"
-
-#: src/diffuse/main.py:871
-msgid "Sort Lines In D_escending Order"
-msgstr "Сорт_ировать Строки в Порядке Убывания"
-
-#: src/diffuse/main.py:873
-msgid "Remove Trailing _White Space"
-msgstr "Уда_лить Замыкающие Пробелы"
-
-#: src/diffuse/main.py:874
-msgid "Convert Tabs To _Spaces"
-msgstr "Преобр_азовать Табуляторы в Пробелы"
-
-#: src/diffuse/main.py:875
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "Преобра_зовать Вводные Пробелы в Табуляторы"
-
-#: src/diffuse/main.py:877
-msgid "_Increase Indenting"
-msgstr "У_величить Отступ"
-
-#: src/diffuse/main.py:878
-msgid "De_crease Indenting"
-msgstr "У_меньшить Отступ"
-
-#: src/diffuse/main.py:880
-msgid "Convert To _DOS Format"
-msgstr "Преобразоват_ь в DOS Формат"
-
-#: src/diffuse/main.py:881
-msgid "Convert To _Mac Format"
-msgstr "Преобразовать в Ma_с Формат"
-
-#: src/diffuse/main.py:882
-msgid "Convert To Uni_x Format"
-msgstr "Преобразовать в Uni_х Формат"
-
-#: src/diffuse/main.py:885
-msgid "_Merge"
-msgstr "С_лияние"
-
-#: src/diffuse/main.py:886
-msgid "Copy Selection _Right"
-msgstr "К_опировать Выборку Вправо"
-
-#: src/diffuse/main.py:887
-msgid "Copy Selection _Left"
-msgstr "Ко_пировать Выборку Влево"
-
-#: src/diffuse/main.py:889
-msgid "Copy Left _Into Selection"
-msgstr "Копиро_вать Слева в Выборку"
-
-#: src/diffuse/main.py:890
-msgid "Copy Right I_nto Selection"
-msgstr "Копиров_ать Справа в Выборку"
-
-#: src/diffuse/main.py:891
-msgid "_Merge From Left Then Right"
-msgstr "С_лияние Слева Затем Справа"
-
-#: src/diffuse/main.py:892
-msgid "M_erge From Right Then Left"
-msgstr "Сл_ияние Справа Затем Слева"
-
-#: src/diffuse/main.py:895
-msgid "_Help"
-msgstr "Спр_авка"
-
-#: src/diffuse/main.py:896
-msgid "_Help Contents..."
-msgstr "Содер_жание Справки..."
-
-#: src/diffuse/main.py:898
-#, python-format
-msgid "_About %s..."
-msgstr "О пр_ограмме %s..."
-
-#: src/diffuse/main.py:913
-msgid "New 2-Way File Merge"
-msgstr "Новое 2-Оконное Слияние Файлов"
-
-#: src/diffuse/main.py:914
-msgid "New 3-Way File Merge"
-msgstr "Новое 3-Оконное Слияние Файлов"
-
-#: src/diffuse/main.py:916
-msgid "Realign All"
-msgstr "Перестроить Все"
-
-#: src/diffuse/main.py:917
-msgid "First Difference"
-msgstr "Первое Различие"
-
-#: src/diffuse/main.py:918
-msgid "Previous Difference"
-msgstr "Предыдущее Различие"
-
-#: src/diffuse/main.py:919
-msgid "Next Difference"
-msgstr "Следующее Различие"
-
-#: src/diffuse/main.py:920
-msgid "Last Difference"
-msgstr "Последнее Различие"
-
-#: src/diffuse/main.py:922
-msgid "Copy Selection Right"
-msgstr "Копировать Выборку Вправо"
-
-#: src/diffuse/main.py:923
-msgid "Copy Selection Left"
-msgstr "Копировать Выборку Влево"
-
-#: src/diffuse/main.py:924
-msgid "Copy Left Into Selection"
-msgstr "Копировать Слева в Выборку"
-
-#: src/diffuse/main.py:925
-msgid "Copy Right Into Selection"
-msgstr "Копировать Справа в Выборку"
-
-#: src/diffuse/main.py:926
-msgid "Merge From Left Then Right"
-msgstr "Слияние Слева Затем Справа"
-
-#: src/diffuse/main.py:927
-msgid "Merge From Right Then Left"
-msgstr "Слияние Справа Затем Слева"
-
-#: src/diffuse/main.py:929
-msgid "Undo"
-msgstr "Отменить"
-
-#: src/diffuse/main.py:930
-msgid "Redo"
-msgstr "Вернуть"
-
-#: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
-msgid "Cut"
-msgstr "Вырезать"
-
-#: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
-msgid "Copy"
-msgstr "Копировать"
-
-#: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
-msgid "Paste"
-msgstr "Вставить"
-
-#: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
-msgid "Clear Edits"
-msgstr "Очистить Правки"
-
-#: src/diffuse/main.py:1057
-#, fuzzy
-msgid "Some files have unsaved changes. Select the files to save before closing."
-msgstr ""
-"Некоторые файлы имеют несохраненные изменения.\n"
-"Выберите файлы для сохранения перед закрытием."
-
-#: src/diffuse/main.py:1071
-msgid "Tab"
-msgstr "Вкладка"
-
-#: src/diffuse/main.py:1076
-msgid "Pane"
-msgstr "Субокно"
-
-#: src/diffuse/main.py:1087
-msgid "Close _Without Saving"
-msgstr "Закр_ыть Без Сохранения"
-
-#: src/diffuse/main.py:1126
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "Закрытие этой вкладки закроет %s."
-
-#: src/diffuse/main.py:1209
-#, python-format
-msgid "File Merge %d"
-msgstr "Слияние Файлов %d"
-
-#: src/diffuse/main.py:1315
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "Ошибка извлечения фиксаций для %s."
-
-#: src/diffuse/main.py:1347
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "Ошибка извлечения модификаций для %s."
-
-#: src/diffuse/main.py:1380
-msgid "Open File In New Tab"
-msgstr "Открыть Файл в Новой Вкладке"
-
-#: src/diffuse/main.py:1403
-msgid "Choose Folder With Modified Files"
-msgstr "Выбрать Папку с Измененными Файлами"
-
-#: src/diffuse/main.py:1421
-msgid "No modified files found."
-msgstr "Модифицированные файлы не найдены."
-
-#: src/diffuse/main.py:1427
-msgid "Choose Folder With Commit"
-msgstr "Выбрать Папку с Зафиксированными Изменениями"
-
-#: src/diffuse/main.py:1447
-msgid "No committed files found."
-msgstr "Файлы с фиксациями не найдены."
-
-#: src/diffuse/main.py:1483
-msgid "New N-Way File Merge..."
-msgstr "Новое Многооконное Слияние Файлов..."
-
-#: src/diffuse/main.py:1484
-msgid "Number of panes: "
-msgstr "Количество субокна: "
-
-#: src/diffuse/main.py:1558
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "Фраза не найдена.  Продолжить с конца файла?"
-
-#: src/diffuse/main.py:1560
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "Фраза не найдена.  Продолжить с начала файла?"
-
-#: src/diffuse/main.py:1781
-#, fuzzy
-msgid ""
-"Usage:\n"
-"    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"
-"also retrieve revisions of files from several VCSs for comparison and merging.\n"
-"\n"
-"Help Options:\n"
-"  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright information\n"
-"\n"
-"Configuration Options:\n"
-"  --no-rcfile                      Do not read any resource files\n"
-"  --rcfile <file>                  Specify explicit resource file\n"
-"\n"
-"General Options:\n"
-"  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
-"  ( -D | --close-if-same )         Close all tabs with no differences\n"
-"  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
-"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
-"  ( -m | --modified )              Create a new tab for each modified file\n"
-"  ( -r | --revision ) <rev>        File revision <rev>\n"
-"  ( -s | --separate )              Create a new tab for each file\n"
-"  ( -t | --tab )                   Start a new tab\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    Start with line <line> selected\n"
-"  --null-file                      Create a blank file comparison pane\n"
-"\n"
-"Display Options:\n"
-"  ( -b | --ignore-space-change )   Ignore changes to white space\n"
-"  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
-"  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
-"  ( -i | --ignore-case )           Ignore case differences\n"
-"  ( -w | --ignore-all-space )      Ignore white space differences"
-msgstr ""
-"Использование:\n"
-"    diffuse [ [ОПЦИИ...] [ФАЙЛ...] ]...\n"
-"    diffuse ( -h | -? | --help | -v | --version )\n"
-"\n"
-"Diffuse является графическим инструментом для слияния и сравнения текстовых\n"
-"файлов. Может сравнить произвольное число файлов в представлении бок о бок,\n"
-"предоставляет пользователям возможность вручную корректировать соответствие\n"
-"строк и редактировать файлы напрямую. Diffuse может также извлекать ревизии\n"
-"файлов из Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion и SVK\n"
-"репозиториев для их сравнения и слияния.\n"
-"\n"
-"Параметры Справки:\n"
-"  ( -h | -? | --help )             Отобразить информацию по использованию\n"
-"  ( -v | --version )               Отобразить номер версии и авторские права\n"
-"\n"
-"Параметры Конфигурации:\n"
-"  --no-rcfile                      Не читать файлы инициализации\n"
-"  --rcfile <file>                  Определить явный файл ресурса\n"
-"\n"
-"Общие Параметры:\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"
-"  ( -r | --revision ) <rev>        Файл ревизии <rev>\n"
-"  ( -s | --separate )              Создавать новую вкладку для каждого файла\n"
-"  ( -t | --tab )                   Запустить новую вкладку\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    Начать с выбранной <line> строки\n"
-"  --null-file                      Создать пустое субокно сравнения файла\n"
-"\n"
-"Параметры Отображения:\n"
-"  ( -b | --ignore-space-change )   Игнорировать изменения свободного места\n"
-"  ( -B | --ignore-blank-lines )    Игнорировать изменения в пустых строках\n"
-"  ( -E | --ignore-end-of-line )    Игнорировать различия окончания строк\n"
-"  ( -i | --ignore-case )           Игнорировать различия регистра символов\n"
-"  ( -w | --ignore-all-space )      Игнорировать различия свободного места"
-
-#: src/diffuse/main.py:1948
+#: src/diffuse/main.py:327
 msgid "Error parsing line number."
 msgstr "Ошибка анализа номера строки."
 
-#: src/diffuse/main.py:1958
-#, python-format
-msgid "Skipping unknown argument \"%s\"."
-msgstr "Пропуск неизвестного параметра \"%s\"."
-
-#: src/diffuse/main.py:1966
+#: src/diffuse/main.py:343
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Ошибка обработки параметра \"%s\".  Каталог не ожидался."
 
-#: src/diffuse/preferences.py:80
+#: src/diffuse/preferences.py:75
 msgid "Display"
 msgstr "Отображение"
 
-#: src/diffuse/preferences.py:83
+#: src/diffuse/preferences.py:78
 msgid "Font"
 msgstr "Шрифт"
 
-#: src/diffuse/preferences.py:84
+#: src/diffuse/preferences.py:79
 msgid "Tab width"
 msgstr "Ширина табулятора"
 
-#: src/diffuse/preferences.py:85
+#: src/diffuse/preferences.py:80
 msgid "Show right margin"
 msgstr "Показывать правое поле"
 
-#: src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:81
 msgid "Right margin"
 msgstr "Правое поле"
 
-#: src/diffuse/preferences.py:87
+#: src/diffuse/preferences.py:82
 msgid "Show line numbers"
 msgstr "Показывать номера строк"
 
-#: src/diffuse/preferences.py:88
+#: src/diffuse/preferences.py:83
 msgid "Show white space characters"
 msgstr "Показывать символы пробелов"
 
-#: src/diffuse/preferences.py:89
-msgid "Ignore case differences"
-msgstr "Игнорировать различия в регистре"
-
-#: src/diffuse/preferences.py:90
-msgid "Ignore white space differences"
-msgstr "Игнорировать различия пробелов, символов табуляции и пустой строки"
-
-#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100
-msgid "Ignore changes to white space"
-msgstr "Игнорировать изменения пробелов, символов табуляции и пустой строки"
-
-#: src/diffuse/preferences.py:92
+#: src/diffuse/preferences.py:87
 msgid "Ignore blank line differences"
 msgstr "Игнорировать различия пустых строк"
 
-#: src/diffuse/preferences.py:93
-msgid "Ignore end of line differences"
-msgstr "Игнорировать различия окончания строк (терминаторы)"
-
-#: src/diffuse/preferences.py:95
+#: src/diffuse/preferences.py:90
 msgid "Alignment"
 msgstr "Выравнивание"
 
-#: src/diffuse/preferences.py:98
+#: src/diffuse/preferences.py:93
 msgid "Ignore case"
 msgstr "Игнорировать регистр символов"
 
-#: src/diffuse/preferences.py:99
+#: src/diffuse/preferences.py:94
 msgid "Ignore white space"
 msgstr "Игнорировать пробелы, символы табуляции и пустой строки"
 
-#: src/diffuse/preferences.py:101
+#: src/diffuse/preferences.py:96
 msgid "Ignore blank lines"
 msgstr "Игнорировать пустые строки"
 
-#: src/diffuse/preferences.py:102
+#: src/diffuse/preferences.py:97
 msgid "Ignore end of line characters"
 msgstr "Игнорировать символы окончания строк (терминаторы)"
 
-#: src/diffuse/preferences.py:104
+#: src/diffuse/preferences.py:99
 msgid "Editor"
 msgstr "Редактор"
 
-#: src/diffuse/preferences.py:107
+#: src/diffuse/preferences.py:102
 msgid "Auto indent"
 msgstr "Автоматический отступ"
 
-#: src/diffuse/preferences.py:108
+#: src/diffuse/preferences.py:103
 msgid "Expand tabs to spaces"
 msgstr "Расширить табуляторы до пробелов"
 
-#: src/diffuse/preferences.py:109
+#: src/diffuse/preferences.py:104
 msgid "Soft tab width"
 msgstr "Ширина мягкого табулятора"
 
-#: src/diffuse/preferences.py:111
+#: src/diffuse/preferences.py:106
 msgid "Tabs"
 msgstr "Вкладки"
 
-#: src/diffuse/preferences.py:114
+#: src/diffuse/preferences.py:109
 msgid "Default panes"
 msgstr "Субокон по умолчанию"
 
-#: src/diffuse/preferences.py:115
+#: src/diffuse/preferences.py:110
 msgid "Always show the tab bar"
 msgstr "Всегда показывать панель вкладок"
 
-#: src/diffuse/preferences.py:116
+#: src/diffuse/preferences.py:111
 #, python-format
 msgid "Warn me when closing a tab will quit %s"
 msgstr "Предупреждение, когда закрытие вкладки закроет %s"
 
-#: src/diffuse/preferences.py:118
+#: src/diffuse/preferences.py:113
 msgid "Regional Settings"
 msgstr "Настройки Региона"
 
-#: src/diffuse/preferences.py:121
+#: src/diffuse/preferences.py:116
 msgid "Default codec"
 msgstr "Кодек по умолчанию"
 
-#: src/diffuse/preferences.py:122
+#: src/diffuse/preferences.py:117
 msgid "Order of codecs used to identify encoding"
 msgstr "Порядок кодеков, используемых для распознания кодировки"
 
-#: src/diffuse/preferences.py:143
+#: src/diffuse/preferences.py:138
 msgid "Cygwin"
 msgstr "Cygwin"
 
-#: src/diffuse/preferences.py:145
+#: src/diffuse/preferences.py:140
 msgid "Root directory"
 msgstr "Корневой каталог"
 
-#: src/diffuse/preferences.py:146
+#: src/diffuse/preferences.py:141
 msgid "Cygdrive prefix"
 msgstr "Cygdrive префикс"
 
-#: src/diffuse/preferences.py:165
-msgid "Version control system search order"
-msgstr ""
-
-#: src/diffuse/preferences.py:173
+#: src/diffuse/preferences.py:167
 msgid "\"co\" command"
 msgstr "\"co\" команда"
 
-#: src/diffuse/preferences.py:174
+#: src/diffuse/preferences.py:168
 msgid "\"rlog\" command"
 msgstr "\"rlog\" команда"
 
-#: src/diffuse/preferences.py:176
+#: src/diffuse/preferences.py:170
 msgid "Command"
 msgstr "Команда"
 
-#: src/diffuse/preferences.py:182
+#: src/diffuse/preferences.py:176
 msgid "Launch from a Bash login shell"
 msgstr "Запуск из оболочки Bash login"
 
-#: src/diffuse/preferences.py:189
+#: src/diffuse/preferences.py:183
 msgid "Update paths for Cygwin"
 msgstr "Обновлять пути для Cygwin"
 
-#: src/diffuse/preferences.py:194
+#: src/diffuse/preferences.py:188
 msgid "Version Control"
 msgstr "Контроль Версий"
 
-#: src/diffuse/preferences.py:259
+#: src/diffuse/preferences.py:253
 msgid "Preferences"
 msgstr "Предпочтения"
 
+#: src/diffuse/preferences.py:294 src/diffuse/window.py:580
+#, python-format
+msgid "Error writing %s."
+msgstr "Ошибка записи %s."
+
+#: src/diffuse/preferences.py:483 src/diffuse/window.py:446
+#: src/diffuse/window.py:1413 src/diffuse/window.py:1436 src/diffuse/window.py:1459
+msgid "_Open"
+msgstr ""
+
 #: src/diffuse/resources.py:242 src/diffuse/resources.py:246
 #: src/diffuse/resources.py:249
 #, python-brace-format
@@ -941,16 +415,11 @@ msgstr "Ошибка обработки строки {line} из {file}."
 msgid "Auto Detect"
 msgstr "Автообнаружение"
 
-#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97
+#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:96
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "Ошибка анализа ревизии %s."
 
-#: src/diffuse/vcs/vcs_registry.py:238
-#, python-format
-msgid "Error parsing %s."
-msgstr "Ошибка анализа %s."
-
 #: src/diffuse/widgets.py:1857
 msgid "Align with Selection"
 msgstr "Выровнять с Выборкой"
@@ -963,10 +432,646 @@ msgstr "Изолировать"
 msgid "Merge Selection"
 msgstr "Объединить Выборку"
 
+#: src/diffuse/widgets.py:1861 src/diffuse/window.py:865
+msgid "Cut"
+msgstr "Вырезать"
+
+#: src/diffuse/widgets.py:1862 src/diffuse/window.py:866
+msgid "Copy"
+msgstr "Копировать"
+
+#: src/diffuse/widgets.py:1863 src/diffuse/window.py:867
+msgid "Paste"
+msgstr "Вставить"
+
 #: src/diffuse/widgets.py:1865
 msgid "Select All"
 msgstr "Выбрать Все"
 
+#: src/diffuse/widgets.py:1866 src/diffuse/window.py:868
+msgid "Clear Edits"
+msgstr "Очистить Правки"
+
 #: src/diffuse/widgets.py:1868
 msgid "Swap with Selected Pane"
 msgstr "Обменять с Выбранным Субокном"
+
+#: src/diffuse/window.py:83
+msgid "Close Tab"
+msgstr "Закрыть Вкладку"
+
+#: src/diffuse/window.py:126
+msgid "Open File..."
+msgstr "Открыть Файл..."
+
+#: src/diffuse/window.py:127
+msgid "Reload File"
+msgstr "Перезагрузить Файл"
+
+#: src/diffuse/window.py:128
+msgid "Save File"
+msgstr "Сохранить Файл"
+
+#: src/diffuse/window.py:129
+msgid "Save File As..."
+msgstr "Сохранить Файл Как..."
+
+#: src/diffuse/window.py:228
+#, python-format
+msgid "Column %d"
+msgstr "Столбец %d"
+
+#: src/diffuse/window.py:306
+msgid "Save changes before loading the new file?"
+msgstr "Сохранить изменения перед загрузкой нового файла?"
+
+#: src/diffuse/window.py:310
+msgid "_No"
+msgstr ""
+
+#: src/diffuse/window.py:311
+msgid "_Yes"
+msgstr ""
+
+#: src/diffuse/window.py:417
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "Ошибка считывания ревизии %(rev)s из %(file)s."
+
+#: src/diffuse/window.py:442
+msgid "Open File"
+msgstr "Открыть Файл"
+
+#: src/diffuse/window.py:495
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "Сохранить %(title)s Субокно %(pane)d"
+
+#: src/diffuse/window.py:499 src/diffuse/window.py:1111
+#, fuzzy
+msgid "_Save"
+msgstr "С_охранить Файл"
+
+#: src/diffuse/window.py:527
+#, python-format
+msgid "A file named %s already exists. Do you want to overwrite it?"
+msgstr "Файл под именем %s уже существует. Вы хотите перезаписать его?"
+
+#: src/diffuse/window.py:534
+#, python-format
+msgid ""
+"The file %s has been modified by another process since reading it. If you save, "
+"all the external changes could be lost. Save anyways?"
+msgstr ""
+"Файл %s был изменен другим процессом после его прочтения. На сохранении все "
+"внешние изменения будут потеряны. Сохранить все равно?"
+
+#: src/diffuse/window.py:576
+#, python-format
+msgid "Error encoding to %s."
+msgstr "Ошибка кодирования в %s."
+
+#: src/diffuse/window.py:610
+msgid "Go To Line..."
+msgstr "Перейти на Строку..."
+
+#: src/diffuse/window.py:611
+msgid "Line Number: "
+msgstr "Номер строки: "
+
+#: src/diffuse/window.py:642
+msgid ""
+"Press the enter key or double click to edit. Press the space bar or use the RMB "
+"menu to manually align."
+msgstr ""
+"Нажатие Enter или двойной щелчок для редактирования. Нажатие Space или меню "
+"правого щелчка для выравнивания вручную."
+
+#: src/diffuse/window.py:646
+msgid "Press the escape key to finish editing."
+msgstr "Нажмите клавишу Escape, чтобы закончить редактирование."
+
+#: src/diffuse/window.py:649
+msgid ""
+"Select target line and press the space bar to align. Press the escape key to "
+"cancel."
+msgstr ""
+"Выберите целевую строку и нажмите клавишу Space, чтобы выровнять. Нажмите Еscape "
+"для отмены."
+
+#: src/diffuse/window.py:710
+msgid "_File"
+msgstr "Фа_йл"
+
+#: src/diffuse/window.py:712
+msgid "_Open File..."
+msgstr "О_ткрыть Файл..."
+
+#: src/diffuse/window.py:713
+msgid "Open File In New _Tab..."
+msgstr "Открыт_ь Файл в Новой Вкладке..."
+
+#: src/diffuse/window.py:714
+msgid "Open _Modified Files..."
+msgstr "Открыть И_змененные Файлы..."
+
+#: src/diffuse/window.py:715
+msgid "Open Commi_t..."
+msgstr "Открыть Зафи_ксированные..."
+
+#: src/diffuse/window.py:716
+msgid "_Reload File"
+msgstr "Пер_езагрузить Файл"
+
+#: src/diffuse/window.py:718
+msgid "_Save File"
+msgstr "С_охранить Файл"
+
+#: src/diffuse/window.py:719
+msgid "Save File _As..."
+msgstr "Сохра_нить Файл Как..."
+
+#: src/diffuse/window.py:720
+msgid "Save A_ll"
+msgstr "Сохран_ить Все"
+
+#: src/diffuse/window.py:722
+msgid "New _2-Way File Merge"
+msgstr "Новое _2-Оконное Слияние Файлов"
+
+#: src/diffuse/window.py:723
+msgid "New _3-Way File Merge"
+msgstr "Новое _3-Оконное Слияние Файлов"
+
+#: src/diffuse/window.py:724
+msgid "New _N-Way File Merge..."
+msgstr "Новое _Многооконное Слияние Файлов..."
+
+#: src/diffuse/window.py:726
+msgid "_Close Tab"
+msgstr "З_акрыть Вкладку"
+
+#: src/diffuse/window.py:727
+msgid "_Undo Close Tab"
+msgstr "От_менить Закрытие Вкладки"
+
+#: src/diffuse/window.py:728
+msgid "_Quit"
+msgstr "В_ыход"
+
+#: src/diffuse/window.py:732
+msgid "_Edit"
+msgstr "Пра_вка"
+
+#: src/diffuse/window.py:734
+msgid "_Undo"
+msgstr "От_менить"
+
+#: src/diffuse/window.py:735
+msgid "_Redo"
+msgstr "Вер_нуть"
+
+#: src/diffuse/window.py:737
+msgid "Cu_t"
+msgstr "Выре_зать"
+
+#: src/diffuse/window.py:738
+msgid "_Copy"
+msgstr "Ко_пировать"
+
+#: src/diffuse/window.py:739
+msgid "_Paste"
+msgstr "В_ставить"
+
+#: src/diffuse/window.py:741
+msgid "Select _All"
+msgstr "В_ыбрать Все"
+
+#: src/diffuse/window.py:742
+msgid "C_lear Edits"
+msgstr "Оч_истить Правки"
+
+#: src/diffuse/window.py:743
+msgid "_Dismiss All Edits"
+msgstr "Сбр_осить Все Правки"
+
+#: src/diffuse/window.py:745
+msgid "_Find..."
+msgstr "На_йти..."
+
+#: src/diffuse/window.py:746
+msgid "Find _Next"
+msgstr "Н_айти Следующее"
+
+#: src/diffuse/window.py:747
+msgid "Find Pre_vious"
+msgstr "Най_ти Предыдущее"
+
+#: src/diffuse/window.py:748
+msgid "_Go To Line..."
+msgstr "Пер_ейти на Строку..."
+
+#: src/diffuse/window.py:750
+msgid "Pr_eferences..."
+msgstr "Предпо_чтения..."
+
+#: src/diffuse/window.py:754
+msgid "None"
+msgstr "Нет"
+
+#: src/diffuse/window.py:776
+msgid "_View"
+msgstr "В_ид"
+
+#: src/diffuse/window.py:778
+msgid "_Syntax Highlighting"
+msgstr "Подсве_тка Синтаксиса"
+
+#: src/diffuse/window.py:780
+msgid "Re_align All"
+msgstr "Пере_строить Все"
+
+#: src/diffuse/window.py:781
+msgid "_Isolate"
+msgstr "И_золировать"
+
+#: src/diffuse/window.py:783
+msgid "_First Difference"
+msgstr "Пер_вое Различие"
+
+#: src/diffuse/window.py:784
+msgid "_Previous Difference"
+msgstr "Предыдуще_е Различие"
+
+#: src/diffuse/window.py:785
+msgid "_Next Difference"
+msgstr "Следу_ющее Различие"
+
+#: src/diffuse/window.py:786
+msgid "_Last Difference"
+msgstr "П_оследнее Различие"
+
+#: src/diffuse/window.py:788
+msgid "Fir_st Tab"
+msgstr "Перв_ая Вкладка"
+
+#: src/diffuse/window.py:789
+msgid "Pre_vious Tab"
+msgstr "Предыдуща_я Вкладка"
+
+#: src/diffuse/window.py:790
+msgid "Next _Tab"
+msgstr "С_ледующая Вкладка"
+
+#: src/diffuse/window.py:791
+msgid "Las_t Tab"
+msgstr "Послед_няя Вкладка"
+
+#: src/diffuse/window.py:793
+msgid "Shift Pane _Right"
+msgstr "Пере_местить Субокно Вправо"
+
+#: src/diffuse/window.py:794
+msgid "Shift Pane _Left"
+msgstr "Перемест_ить Субокно Влево"
+
+#: src/diffuse/window.py:798
+msgid "F_ormat"
+msgstr "Фор_мат"
+
+#: src/diffuse/window.py:800
+msgid "Convert To _Upper Case"
+msgstr "Пр_еобразовать в Верхний Регистр"
+
+#: src/diffuse/window.py:801
+msgid "Convert To _Lower Case"
+msgstr "Пре_образовать в Нижний Регистр"
+
+#: src/diffuse/window.py:803
+msgid "Sort Lines In _Ascending Order"
+msgstr "Сор_тировать Строки в Порядке Возрастания"
+
+#: src/diffuse/window.py:804
+msgid "Sort Lines In D_escending Order"
+msgstr "Сорт_ировать Строки в Порядке Убывания"
+
+#: src/diffuse/window.py:806
+msgid "Remove Trailing _White Space"
+msgstr "Уда_лить Замыкающие Пробелы"
+
+#: src/diffuse/window.py:807
+msgid "Convert Tabs To _Spaces"
+msgstr "Преобр_азовать Табуляторы в Пробелы"
+
+#: src/diffuse/window.py:808
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "Преобра_зовать Вводные Пробелы в Табуляторы"
+
+#: src/diffuse/window.py:810
+msgid "_Increase Indenting"
+msgstr "У_величить Отступ"
+
+#: src/diffuse/window.py:811
+msgid "De_crease Indenting"
+msgstr "У_меньшить Отступ"
+
+#: src/diffuse/window.py:813
+msgid "Convert To _DOS Format"
+msgstr "Преобразоват_ь в DOS Формат"
+
+#: src/diffuse/window.py:814
+msgid "Convert To _Mac Format"
+msgstr "Преобразовать в Ma_с Формат"
+
+#: src/diffuse/window.py:815
+msgid "Convert To Uni_x Format"
+msgstr "Преобразовать в Uni_х Формат"
+
+#: src/diffuse/window.py:819
+msgid "_Merge"
+msgstr "С_лияние"
+
+#: src/diffuse/window.py:821
+msgid "Copy Selection _Right"
+msgstr "К_опировать Выборку Вправо"
+
+#: src/diffuse/window.py:822
+msgid "Copy Selection _Left"
+msgstr "Ко_пировать Выборку Влево"
+
+#: src/diffuse/window.py:824
+msgid "Copy Left _Into Selection"
+msgstr "Копиро_вать Слева в Выборку"
+
+#: src/diffuse/window.py:825
+msgid "Copy Right I_nto Selection"
+msgstr "Копиров_ать Справа в Выборку"
+
+#: src/diffuse/window.py:826
+msgid "_Merge From Left Then Right"
+msgstr "С_лияние Слева Затем Справа"
+
+#: src/diffuse/window.py:827
+msgid "M_erge From Right Then Left"
+msgstr "Сл_ияние Справа Затем Слева"
+
+#: src/diffuse/window.py:831
+msgid "_Help"
+msgstr "Спр_авка"
+
+#: src/diffuse/window.py:833
+msgid "_Help Contents..."
+msgstr "Содер_жание Справки..."
+
+#: src/diffuse/window.py:835
+#, python-format
+msgid "_About %s..."
+msgstr "О пр_ограмме %s..."
+
+#: src/diffuse/window.py:847
+msgid "New 2-Way File Merge"
+msgstr "Новое 2-Оконное Слияние Файлов"
+
+#: src/diffuse/window.py:848
+msgid "New 3-Way File Merge"
+msgstr "Новое 3-Оконное Слияние Файлов"
+
+#: src/diffuse/window.py:850
+msgid "Realign All"
+msgstr "Перестроить Все"
+
+#: src/diffuse/window.py:851
+msgid "First Difference"
+msgstr "Первое Различие"
+
+#: src/diffuse/window.py:852
+msgid "Previous Difference"
+msgstr "Предыдущее Различие"
+
+#: src/diffuse/window.py:853
+msgid "Next Difference"
+msgstr "Следующее Различие"
+
+#: src/diffuse/window.py:854
+msgid "Last Difference"
+msgstr "Последнее Различие"
+
+#: src/diffuse/window.py:856
+msgid "Copy Selection Right"
+msgstr "Копировать Выборку Вправо"
+
+#: src/diffuse/window.py:857
+msgid "Copy Selection Left"
+msgstr "Копировать Выборку Влево"
+
+#: src/diffuse/window.py:858
+msgid "Copy Left Into Selection"
+msgstr "Копировать Слева в Выборку"
+
+#: src/diffuse/window.py:859
+msgid "Copy Right Into Selection"
+msgstr "Копировать Справа в Выборку"
+
+#: src/diffuse/window.py:860
+msgid "Merge From Left Then Right"
+msgstr "Слияние Слева Затем Справа"
+
+#: src/diffuse/window.py:861
+msgid "Merge From Right Then Left"
+msgstr "Слияние Справа Затем Слева"
+
+#: src/diffuse/window.py:863
+msgid "Undo"
+msgstr "Отменить"
+
+#: src/diffuse/window.py:864
+msgid "Redo"
+msgstr "Вернуть"
+
+#: src/diffuse/window.py:950
+msgid "Changes detected"
+msgstr ""
+
+#: src/diffuse/window.py:954
+#, fuzzy, python-format
+msgid ""
+"The file \"%s\" changed on disk.\n"
+"\n"
+"Do you want to reload the file?"
+msgstr "Файл %s изменен на диске. Вы хотите перезагрузить этот файл?"
+
+#: src/diffuse/window.py:959
+#, fuzzy, python-format
+msgid ""
+"The following files changed on disk:\n"
+"%s\n"
+"\n"
+"Do you want to reload these files?"
+msgstr "Файл %s изменен на диске. Вы хотите перезагрузить этот файл?"
+
+#: src/diffuse/window.py:1078
+#, fuzzy
+msgid "Some files have unsaved changes. Select the files to save before closing."
+msgstr ""
+"Некоторые файлы имеют несохраненные изменения.\n"
+"Выберите файлы для сохранения перед закрытием."
+
+#: src/diffuse/window.py:1092
+msgid "Tab"
+msgstr "Вкладка"
+
+#: src/diffuse/window.py:1097
+msgid "Pane"
+msgstr "Субокно"
+
+#: src/diffuse/window.py:1108
+msgid "Close _Without Saving"
+msgstr "Закр_ыть Без Сохранения"
+
+#: src/diffuse/window.py:1147
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "Закрытие этой вкладки закроет %s."
+
+#: src/diffuse/window.py:1224
+#, python-format
+msgid "File Merge %d"
+msgstr "Слияние Файлов %d"
+
+#: src/diffuse/window.py:1344
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "Ошибка извлечения фиксаций для %s."
+
+#: src/diffuse/window.py:1376
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "Ошибка извлечения модификаций для %s."
+
+#: src/diffuse/window.py:1409
+msgid "Open File In New Tab"
+msgstr "Открыть Файл в Новой Вкладке"
+
+#: src/diffuse/window.py:1432
+msgid "Choose Folder With Modified Files"
+msgstr "Выбрать Папку с Измененными Файлами"
+
+#: src/diffuse/window.py:1450
+msgid "No modified files found."
+msgstr "Модифицированные файлы не найдены."
+
+#: src/diffuse/window.py:1456
+msgid "Choose Folder With Commit"
+msgstr "Выбрать Папку с Зафиксированными Изменениями"
+
+#: src/diffuse/window.py:1476
+msgid "No committed files found."
+msgstr "Файлы с фиксациями не найдены."
+
+#: src/diffuse/window.py:1512
+msgid "New N-Way File Merge..."
+msgstr "Новое Многооконное Слияние Файлов..."
+
+#: src/diffuse/window.py:1513
+msgid "Number of panes: "
+msgstr "Количество субокна: "
+
+#: src/diffuse/window.py:1587
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "Фраза не найдена.  Продолжить с конца файла?"
+
+#: src/diffuse/window.py:1589
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "Фраза не найдена.  Продолжить с начала файла?"
+
+#: src/diffuse/window.py:1762
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr ""
+"Diffuse является графическим инструментом для слияния и сравнения текстовых "
+"файлов."
+
+#: src/diffuse/window.py:1766
+msgid "translator-credits"
+msgstr "v.01 О.Ю.Пахтусов (Oleg Pakhtusov) <oupakhtusov@gmail.com> "
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage:\n"
+#~ "    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"
+#~ "also retrieve revisions of files from several VCSs for comparison and "
+#~ "merging.\n"
+#~ "\n"
+#~ "Help Options:\n"
+#~ "  ( -h | -? | --help )             Display this usage information\n"
+#~ "  ( -v | --version )               Display version and copyright information\n"
+#~ "\n"
+#~ "Configuration Options:\n"
+#~ "  --no-rcfile                      Do not read any resource files\n"
+#~ "  --rcfile <file>                  Specify explicit resource file\n"
+#~ "\n"
+#~ "General Options:\n"
+#~ "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
+#~ "  ( -D | --close-if-same )         Close all tabs with no differences\n"
+#~ "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+#~ "  ( -L | --label ) <label>         Display <label> instead of the file name\n"
+#~ "  ( -m | --modified )              Create a new tab for each modified file\n"
+#~ "  ( -r | --revision ) <rev>        File revision <rev>\n"
+#~ "  ( -s | --separate )              Create a new tab for each file\n"
+#~ "  ( -t | --tab )                   Start a new tab\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    Start with line <line> selected\n"
+#~ "  --null-file                      Create a blank file comparison pane\n"
+#~ "\n"
+#~ "Display Options:\n"
+#~ "  ( -b | --ignore-space-change )   Ignore changes to white space\n"
+#~ "  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
+#~ "  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
+#~ "  ( -i | --ignore-case )           Ignore case differences\n"
+#~ "  ( -w | --ignore-all-space )      Ignore white space differences"
+#~ msgstr ""
+#~ "Использование:\n"
+#~ "    diffuse [ [ОПЦИИ...] [ФАЙЛ...] ]...\n"
+#~ "    diffuse ( -h | -? | --help | -v | --version )\n"
+#~ "\n"
+#~ "Diffuse является графическим инструментом для слияния и сравнения текстовых\n"
+#~ "файлов. Может сравнить произвольное число файлов в представлении бок о бок,\n"
+#~ "предоставляет пользователям возможность вручную корректировать соответствие\n"
+#~ "строк и редактировать файлы напрямую. Diffuse может также извлекать ревизии\n"
+#~ "файлов из Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion и SVK\n"
+#~ "репозиториев для их сравнения и слияния.\n"
+#~ "\n"
+#~ "Параметры Справки:\n"
+#~ "  ( -h | -? | --help )             Отобразить информацию по использованию\n"
+#~ "  ( -v | --version )               Отобразить номер версии и авторские права\n"
+#~ "\n"
+#~ "Параметры Конфигурации:\n"
+#~ "  --no-rcfile                      Не читать файлы инициализации\n"
+#~ "  --rcfile <file>                  Определить явный файл ресурса\n"
+#~ "\n"
+#~ "Общие Параметры:\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"
+#~ "  ( -r | --revision ) <rev>        Файл ревизии <rev>\n"
+#~ "  ( -s | --separate )              Создавать новую вкладку для каждого файла\n"
+#~ "  ( -t | --tab )                   Запустить новую вкладку\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    Начать с выбранной <line> строки\n"
+#~ "  --null-file                      Создать пустое субокно сравнения файла\n"
+#~ "\n"
+#~ "Параметры Отображения:\n"
+#~ "  ( -b | --ignore-space-change )   Игнорировать изменения свободного места\n"
+#~ "  ( -B | --ignore-blank-lines )    Игнорировать изменения в пустых строках\n"
+#~ "  ( -E | --ignore-end-of-line )    Игнорировать различия окончания строк\n"
+#~ "  ( -i | --ignore-case )           Игнорировать различия регистра символов\n"
+#~ "  ( -w | --ignore-all-space )      Игнорировать различия свободного места"
diff --git a/po/sv.po b/po/sv.po
index df06225..04f3863 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-23 20:00-0400\n"
+"POT-Creation-Date: 2023-04-16 14:09-0400\n"
 "PO-Revision-Date: 2022-10-24 10:30+0200\n"
 "Last-Translator: Åke Engelbrektson <eson@svenskasprakfiler.se>\n"
 "Language-Team: Svenska Språkfiler <contactform@svenskasprakfiler.se>\n"
@@ -29,824 +29,309 @@ msgid "Graphical tool for merging and comparing text files"
 msgstr "Grafiskt verktyg för jämförelse och sammanfogning av textfiler"
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:7
+#, fuzzy
 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."
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, and "
+"Subversion repositories."
 msgstr ""
 "Diffuse är ett grafiskt verktyg för att jämföra och slå samman textfiler. Den kan "
 "hämta filer för jämförelse från Bazaar, CVS, Darcs, Git, Mercurial, Monotone, "
-"RCS, Subversion och SVK repositories."
+"RCS, och Subversion repositories."
 
-#: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
-msgid "Main window: diff between two files"
-msgstr "Huvudfönster: diff mellan två filer"
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:28
+msgid "Main window"
+msgstr ""
 
-#: src/diffuse/constants.py:25
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:32
+msgid "About window"
+msgstr ""
+
+#: src/diffuse/constants.py:26
 msgid "Copyright"
 msgstr "Copyright"
 
-#: src/diffuse/dialogs.py:40
-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:46 src/diffuse/dialogs.py:89 src/diffuse/dialogs.py:133
+#: src/diffuse/preferences.py:254 src/diffuse/preferences.py:483
+#: src/diffuse/window.py:309 src/diffuse/window.py:1107
+msgid "_Cancel"
+msgstr ""
 
-#: src/diffuse/dialogs.py:45
-msgid "translator-credits"
-msgstr "Åke Engelbrektson <eson@svenskasprakfiler.se>"
-
-#: src/diffuse/dialogs.py:82
+#: src/diffuse/dialogs.py:50
 msgid "Encoding: "
 msgstr "Teckentabell: "
 
-#: src/diffuse/dialogs.py:94
+#: src/diffuse/dialogs.py:62
 msgid "Revision: "
 msgstr "Revision: "
 
-#: src/diffuse/dialogs.py:156
+#: src/diffuse/dialogs.py:90 src/diffuse/dialogs.py:134
+#: src/diffuse/preferences.py:255
+msgid "_OK"
+msgstr ""
+
+#: src/diffuse/dialogs.py:130
 msgid "Find..."
 msgstr "Sök..."
 
-#: src/diffuse/dialogs.py:164
+#: src/diffuse/dialogs.py:140
 msgid "Search For: "
 msgstr "Sök efter: "
 
-#: src/diffuse/dialogs.py:189
+#: src/diffuse/dialogs.py:165
 msgid "Match Case"
 msgstr "Skiftlägeskänslig"
 
-#: src/diffuse/dialogs.py:194
+#: src/diffuse/dialogs.py:170
 msgid "Search Backwards"
 msgstr "Sök bakifrån"
 
+#: src/diffuse/main.py:53
+msgid "Display version and copyright information"
+msgstr "Visa version och upphovsrättsinformation"
+
+#: src/diffuse/main.py:61
+msgid "Do not read any resource files"
+msgstr "Läs inga resursfiler"
+
+#: src/diffuse/main.py:69
+msgid "Specify explicit resource file"
+msgstr "Specificera explicit resursfil"
+
+#: src/diffuse/main.py:77
+msgid "File revisions <rev-1> and <rev>"
+msgstr "Filrevisioner <rev-1> och <rev>"
+
 #: src/diffuse/main.py:85
-msgid "Close Tab"
-msgstr "Stäng fliken"
+msgid "Close all tabs with no differences"
+msgstr "Stäng alla flikar som saknar olikheter"
 
-#: src/diffuse/main.py:132
-msgid "Open File..."
-msgstr "Öppna fil..."
+#: src/diffuse/main.py:92
+msgid "Use <codec> to read and write files"
+msgstr "Använd <codec> för att läsa och skriva filer"
 
-#: src/diffuse/main.py:133
-msgid "Reload File"
-msgstr "Läs in filen igen"
+#: src/diffuse/main.py:100
+msgid "Display <label> instead of the file name"
+msgstr "Visa <label> istället för filnamn"
 
-#: src/diffuse/main.py:134
-msgid "Save File"
-msgstr "Spara filen"
+#: src/diffuse/main.py:108
+msgid "Create a new tab for each modified file"
+msgstr "Skapa ny flik för varje ändrad fil"
 
-#: src/diffuse/main.py:135
-msgid "Save File As..."
-msgstr "Spara filen som..."
+#: src/diffuse/main.py:115
+msgid "File revision <rev>"
+msgstr "Filrevision <rev>"
 
-#: src/diffuse/main.py:217
-#, python-format
-msgid "Column %d"
-msgstr "Kolumn %d"
+#: src/diffuse/main.py:123
+msgid "Create a new tab for each file"
+msgstr "Skapa ny flik för varje fil"
 
-#: src/diffuse/main.py:291
-msgid "Save changes before loading the new file?"
-msgstr "Vill du spara ändringar före inläsning av den ny filen?"
+#: src/diffuse/main.py:130
+msgid "Start a new tab"
+msgstr "Starta en ny flik"
 
-#: src/diffuse/main.py:402
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "Fel vid läsning av revision %(rev)s i %(file)s."
+#: src/diffuse/main.py:137 src/diffuse/preferences.py:159
+msgid "Version control system search order"
+msgstr "Sökordning för versionskontrollsystem"
 
-#: src/diffuse/main.py:405 src/diffuse/main.py:1860
+#: src/diffuse/main.py:145
+msgid "Start with line <line> selected"
+msgstr "Starta med rad <line> markerad"
+
+#: src/diffuse/main.py:153
+msgid "Create a blank file comparison pane"
+msgstr "Skapa en tom filjämförelsepanel"
+
+#: src/diffuse/main.py:160 src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:95
+msgid "Ignore changes to white space"
+msgstr "Ignorera ändringar i blanksteg"
+
+#: src/diffuse/main.py:167
+msgid "Ignore changes in blank lines"
+msgstr "Ignorera ändringar i tomma rader"
+
+#: src/diffuse/main.py:174 src/diffuse/preferences.py:88
+msgid "Ignore end of line differences"
+msgstr "Ignorera olikheter i radavslut"
+
+#: src/diffuse/main.py:181 src/diffuse/preferences.py:84
+msgid "Ignore case differences"
+msgstr "Ignorera olikheter i skiftläge"
+
+#: src/diffuse/main.py:188 src/diffuse/preferences.py:85
+msgid "Ignore white space differences"
+msgstr "Ignorera olikheter i blanksteg"
+
+#: src/diffuse/main.py:191
+msgid ""
+"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 several VCSs for comparison and merging."
+msgstr ""
+
+#: src/diffuse/main.py:247 src/diffuse/window.py:420
 #, python-format
 msgid "Error reading %s."
 msgstr "Fel vid läsning av  %s."
 
-#: src/diffuse/main.py:427
-msgid "Open File"
-msgstr "Öppna fil"
-
-#: src/diffuse/main.py:484
-#, python-format
-msgid "The file %s changed on disk. Do you want to reload the file?"
-msgstr "Filen %s har ändrats på disk. Vill du läsa in filen igen?"
-
-#: src/diffuse/main.py:510
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "Spara %(title)s Panel %(pane)d"
-
-#: src/diffuse/main.py:542
-#, python-format
-msgid "A file named %s already exists. Do you want to overwrite it?"
-msgstr "Det finns redan en fil som heter %s. Vill du skriva över den?"
-
-#: src/diffuse/main.py:549
-#, 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 ""
-"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:591
-#, python-format
-msgid "Error encoding to %s."
-msgstr "Fel vid kodning till %s."
-
-#: src/diffuse/main.py:595 src/diffuse/preferences.py:300
-#, python-format
-msgid "Error writing %s."
-msgstr "Fel vid skrivning av %s."
-
-#: src/diffuse/main.py:625
-msgid "Go To Line..."
-msgstr "Gå till rad..."
-
-#: src/diffuse/main.py:626
-msgid "Line Number: "
-msgstr "Radnummer: "
-
-#: src/diffuse/main.py:657
-msgid ""
-"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."
-
-#: src/diffuse/main.py:661
-msgid "Press the escape key to finish editing."
-msgstr "Tryck på Esc-tangenten för att avsluta redigering."
-
-#: src/diffuse/main.py:664
-msgid ""
-"Select target line and press the space bar to align. Press the escape key to "
-"cancel."
-msgstr "Välj målrad och tryck blanksteg för att justera. Tryck Esc för att avbryta."
-
-#: src/diffuse/main.py:787
-msgid "_File"
-msgstr "_Arkiv"
-
-#: src/diffuse/main.py:788
-msgid "_Open File..."
-msgstr "_Öppna fil..."
-
-#: src/diffuse/main.py:789
-msgid "Open File In New _Tab..."
-msgstr "Öppna fil i ny _flik..."
-
-#: src/diffuse/main.py:790
-msgid "Open _Modified Files..."
-msgstr "Öppna _ändrade filer..."
-
-#: src/diffuse/main.py:791
-msgid "Open Commi_t..."
-msgstr "_Öppna arkivering..."
-
-#: src/diffuse/main.py:792
-msgid "_Reload File"
-msgstr "_Läs in filen igen"
-
-#: src/diffuse/main.py:794
-msgid "_Save File"
-msgstr "_Spara filen"
-
-#: src/diffuse/main.py:795
-msgid "Save File _As..."
-msgstr "Spara filen _som..."
-
-#: src/diffuse/main.py:796
-msgid "Save A_ll"
-msgstr "Spara a_lla"
-
-#: src/diffuse/main.py:798
-msgid "New _2-Way File Merge"
-msgstr "Ny _2-vägs filsammanslagning"
-
-#: src/diffuse/main.py:799
-msgid "New _3-Way File Merge"
-msgstr "Ny _3-vägs filsammanslagning"
-
-#: src/diffuse/main.py:800
-msgid "New _N-Way File Merge..."
-msgstr "Ny _x-vägs filsammanslagning..."
-
-#: src/diffuse/main.py:802
-msgid "_Close Tab"
-msgstr "_Stäng fliken"
-
-#: src/diffuse/main.py:803
-msgid "_Undo Close Tab"
-msgstr "_Ångra flikstängning"
-
-#: src/diffuse/main.py:804
-msgid "_Quit"
-msgstr "_Avsluta"
-
-#: src/diffuse/main.py:807
-msgid "_Edit"
-msgstr "_Redigera"
-
-#: src/diffuse/main.py:808
-msgid "_Undo"
-msgstr "_Ångra"
-
-#: src/diffuse/main.py:809
-msgid "_Redo"
-msgstr "_Upprepa"
-
-#: src/diffuse/main.py:811
-msgid "Cu_t"
-msgstr "Klipp _ut"
-
-#: src/diffuse/main.py:812
-msgid "_Copy"
-msgstr "_Kopiera"
-
-#: src/diffuse/main.py:813
-msgid "_Paste"
-msgstr "_Klistra in"
-
-#: src/diffuse/main.py:815
-msgid "Select _All"
-msgstr "Markera _alla"
-
-#: src/diffuse/main.py:816
-msgid "C_lear Edits"
-msgstr "_Rensa bort ändringar"
-
-#: src/diffuse/main.py:817
-msgid "_Dismiss All Edits"
-msgstr "_Förkasta alla ändringar"
-
-#: src/diffuse/main.py:819
-msgid "_Find..."
-msgstr "_Sök..."
-
-#: src/diffuse/main.py:820
-msgid "Find _Next"
-msgstr "Sök _nästa"
-
-#: src/diffuse/main.py:821
-msgid "Find Pre_vious"
-msgstr "Sök _föregående"
-
-#: src/diffuse/main.py:822
-msgid "_Go To Line..."
-msgstr "_Gå till rad..."
-
-#: src/diffuse/main.py:824
-msgid "Pr_eferences..."
-msgstr "_Inställningar..."
-
-#: src/diffuse/main.py:828
-msgid "None"
-msgstr "Ingen"
-
-#: src/diffuse/main.py:846
-msgid "_View"
-msgstr "_Visa"
-
-#: src/diffuse/main.py:847
-msgid "_Syntax Highlighting"
-msgstr "_Syntaxmarkering"
-
-#: src/diffuse/main.py:849
-msgid "Re_align All"
-msgstr "_Omjustera alla"
-
-#: src/diffuse/main.py:850
-msgid "_Isolate"
-msgstr "_Isolera"
-
-#: src/diffuse/main.py:852
-msgid "_First Difference"
-msgstr "_Första olikheten"
-
-#: src/diffuse/main.py:853
-msgid "_Previous Difference"
-msgstr "_Föregående olikhet"
-
-#: src/diffuse/main.py:854
-msgid "_Next Difference"
-msgstr "_Nästa olikhet"
-
-#: src/diffuse/main.py:855
-msgid "_Last Difference"
-msgstr "_Sista olikheten"
-
-#: src/diffuse/main.py:857
-msgid "Fir_st Tab"
-msgstr "F_örsta fliken"
-
-#: src/diffuse/main.py:858
-msgid "Pre_vious Tab"
-msgstr "Före_gående flik"
-
-#: src/diffuse/main.py:859
-msgid "Next _Tab"
-msgstr "Nästa _flik"
-
-#: src/diffuse/main.py:860
-msgid "Las_t Tab"
-msgstr "S_ista fliken"
-
-#: src/diffuse/main.py:862
-msgid "Shift Pane _Right"
-msgstr "Växla panel _höger"
-
-#: src/diffuse/main.py:863
-msgid "Shift Pane _Left"
-msgstr "Växla panel _vänster"
-
-#: src/diffuse/main.py:866
-msgid "F_ormat"
-msgstr "F_ormat"
-
-#: src/diffuse/main.py:867
-msgid "Convert To _Upper Case"
-msgstr "Konvertera till _VERSALER"
-
-#: src/diffuse/main.py:868
-msgid "Convert To _Lower Case"
-msgstr "Konvertera till _gemener"
-
-#: src/diffuse/main.py:870
-msgid "Sort Lines In _Ascending Order"
-msgstr "Sortera rader i _stigande ordning"
-
-#: src/diffuse/main.py:871
-msgid "Sort Lines In D_escending Order"
-msgstr "Sortera rader i _fallande ordning"
-
-#: src/diffuse/main.py:873
-msgid "Remove Trailing _White Space"
-msgstr "Ta bort avslutande blanksteg"
-
-#: src/diffuse/main.py:874
-msgid "Convert Tabs To _Spaces"
-msgstr "Konvertera tabbar till _blanksteg"
-
-#: src/diffuse/main.py:875
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "Konvertera inledande blanksteg till _tabbar"
-
-#: src/diffuse/main.py:877
-msgid "_Increase Indenting"
-msgstr "_Utöka indrag"
-
-#: src/diffuse/main.py:878
-msgid "De_crease Indenting"
-msgstr "Mi_nska indrag"
-
-#: src/diffuse/main.py:880
-msgid "Convert To _DOS Format"
-msgstr "Konvertera till _DOS-format"
-
-#: src/diffuse/main.py:881
-msgid "Convert To _Mac Format"
-msgstr "Konvertera till _MAC-format"
-
-#: src/diffuse/main.py:882
-msgid "Convert To Uni_x Format"
-msgstr "Konvertera till _Unix-format"
-
-#: src/diffuse/main.py:885
-msgid "_Merge"
-msgstr "_Sammanfoga"
-
-#: src/diffuse/main.py:886
-msgid "Copy Selection _Right"
-msgstr "Kopiera från markerat till _höger"
-
-#: src/diffuse/main.py:887
-msgid "Copy Selection _Left"
-msgstr "Kopiera från markerat till _vänster"
-
-#: src/diffuse/main.py:889
-msgid "Copy Left _Into Selection"
-msgstr "Kopiera från vänster till _markerat"
-
-#: src/diffuse/main.py:890
-msgid "Copy Right I_nto Selection"
-msgstr "Kopiera från höger till m_arkerat"
-
-#: src/diffuse/main.py:891
-msgid "_Merge From Left Then Right"
-msgstr "_Sammanfoga från vänster, sedan höger"
-
-#: src/diffuse/main.py:892
-msgid "M_erge From Right Then Left"
-msgstr "S_ammanfoga från höger, sedan vänster"
-
-#: src/diffuse/main.py:895
-msgid "_Help"
-msgstr "_Hjälp"
-
-#: src/diffuse/main.py:896
-msgid "_Help Contents..."
-msgstr "_Hjälpinnehåll..."
-
-#: src/diffuse/main.py:898
-#, python-format
-msgid "_About %s..."
-msgstr "_Om %s..."
-
-#: src/diffuse/main.py:913
-msgid "New 2-Way File Merge"
-msgstr "Ny 2-vägs filsammanslagning"
-
-#: src/diffuse/main.py:914
-msgid "New 3-Way File Merge"
-msgstr "Ny 3-vägs filsammanslagning"
-
-#: src/diffuse/main.py:916
-msgid "Realign All"
-msgstr "Omjustera alla"
-
-#: src/diffuse/main.py:917
-msgid "First Difference"
-msgstr "Första olikheten"
-
-#: src/diffuse/main.py:918
-msgid "Previous Difference"
-msgstr "Föregående olikhet"
-
-#: src/diffuse/main.py:919
-msgid "Next Difference"
-msgstr "Nästa olikhet"
-
-#: src/diffuse/main.py:920
-msgid "Last Difference"
-msgstr "Sista olikheten"
-
-#: src/diffuse/main.py:922
-msgid "Copy Selection Right"
-msgstr "Kopiera från markerat till höger"
-
-#: src/diffuse/main.py:923
-msgid "Copy Selection Left"
-msgstr "Kopiera från markerat till vänster"
-
-#: src/diffuse/main.py:924
-msgid "Copy Left Into Selection"
-msgstr "Kopiera från vänster till markerat"
-
-#: src/diffuse/main.py:925
-msgid "Copy Right Into Selection"
-msgstr "Kopiera från höger till markerat"
-
-#: src/diffuse/main.py:926
-msgid "Merge From Left Then Right"
-msgstr "Sammanfoga från vänster, sedan höger"
-
-#: src/diffuse/main.py:927
-msgid "Merge From Right Then Left"
-msgstr "Sammanfoga från höger, sedan vänster"
-
-#: src/diffuse/main.py:929
-msgid "Undo"
-msgstr "Ångra"
-
-#: src/diffuse/main.py:930
-msgid "Redo"
-msgstr "Upprepa"
-
-#: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
-msgid "Cut"
-msgstr "Klipp ut"
-
-#: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
-msgid "Copy"
-msgstr "Kopiera"
-
-#: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
-msgid "Paste"
-msgstr "Klistra in"
-
-#: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
-msgid "Clear Edits"
-msgstr "Rensa bort ändringar"
-
-#: src/diffuse/main.py:1057
-msgid "Some files have unsaved changes. Select the files to save before closing."
-msgstr ""
-"Vissa filer har ändringar som inte sparats. Välj filer att spara före stängning."
-
-#: src/diffuse/main.py:1071
-msgid "Tab"
-msgstr "Flik"
-
-#: src/diffuse/main.py:1076
-msgid "Pane"
-msgstr "Panel"
-
-#: src/diffuse/main.py:1087
-msgid "Close _Without Saving"
-msgstr "Stäng _utan att spara"
-
-#: src/diffuse/main.py:1126
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "Stängning av denna flik, avslutar %s."
-
-#: src/diffuse/main.py:1209
-#, python-format
-msgid "File Merge %d"
-msgstr "Filsammanslagning %d"
-
-#: src/diffuse/main.py:1315
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "Fel vid hämtning av arkiveringar för %s."
-
-#: src/diffuse/main.py:1347
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "Fel vid hämtning av ändringar för %s."
-
-#: src/diffuse/main.py:1380
-msgid "Open File In New Tab"
-msgstr "Öppna fil i ny flik"
-
-#: src/diffuse/main.py:1403
-msgid "Choose Folder With Modified Files"
-msgstr "Välj mapp med ändrade filer"
-
-#: src/diffuse/main.py:1421
-msgid "No modified files found."
-msgstr "Inga ändrade filer hittades."
-
-#: src/diffuse/main.py:1427
-msgid "Choose Folder With Commit"
-msgstr "Välj mapp för arkiveringar"
-
-#: src/diffuse/main.py:1447
-msgid "No committed files found."
-msgstr "Inga arkiverade filer hittades."
-
-#: src/diffuse/main.py:1483
-msgid "New N-Way File Merge..."
-msgstr "Ny x-vägs filsammanslagning..."
-
-#: src/diffuse/main.py:1484
-msgid "Number of panes: "
-msgstr "Antal paneler: "
-
-#: src/diffuse/main.py:1558
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "Frasen kan inte hittas. Vill du fortsätta från slutet på filen?"
-
-#: src/diffuse/main.py:1560
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "Frasen kan inte hittas. Vill du fortsätta från början på filen?"
-
-#: src/diffuse/main.py:1781
-msgid ""
-"Usage:\n"
-"    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"
-"also retrieve revisions of files from several VCSs for comparison and merging.\n"
-"\n"
-"Help Options:\n"
-"  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright information\n"
-"\n"
-"Configuration Options:\n"
-"  --no-rcfile                      Do not read any resource files\n"
-"  --rcfile <file>                  Specify explicit resource file\n"
-"\n"
-"General Options:\n"
-"  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
-"  ( -D | --close-if-same )         Close all tabs with no differences\n"
-"  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
-"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
-"  ( -m | --modified )              Create a new tab for each modified file\n"
-"  ( -r | --revision ) <rev>        File revision <rev>\n"
-"  ( -s | --separate )              Create a new tab for each file\n"
-"  ( -t | --tab )                   Start a new tab\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    Start with line <line> selected\n"
-"  --null-file                      Create a blank file comparison pane\n"
-"\n"
-"Display Options:\n"
-"  ( -b | --ignore-space-change )   Ignore changes to white space\n"
-"  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
-"  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
-"  ( -i | --ignore-case )           Ignore case differences\n"
-"  ( -w | --ignore-all-space )      Ignore white space differences"
-msgstr ""
-"Användning:\n"
-"    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 kan också hämta revideringar av filer från flera VCS:er för jämförelse "
-"och sammanfogning.\n"
-"\n"
-"Hjälpalternativ:\n"
-"  ( -h | -? | --help )             Visa denna användningsinformation\n"
-"  ( -v | --version )               Visa version och upphovsrättsinformation\n"
-"\n"
-"Konfigurationsalternativ:\n"
-"  --no-rcfile                      Läs inga resursfiler\n"
-"  --rcfile <file>                  Specificera explicit resursfil\n"
-"\n"
-"Allmäna alternativ:\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 <codec> för att läsa och skriva filer\n"
-"  ( -L | --label ) <label>         Visa <label> istället för filnamn\n"
-"  ( -m | --modified )              Skapa ny flik för varje ändrad fil\n"
-"  ( -r | --revision ) <rev>        Filrevision <rev>\n"
-"  ( -s | --separate )              Skapa ny flik för varje fil\n"
-"  ( -t | --tab )                   Starta en ny flik\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    Starta med rad <line> markerad\n"
-"  --null-file                      Skapa en tom filjämförelsepanel\n"
-"\n"
-"Skärmalternativ:\n"
-"  ( -b | --ignore-space-change )   Ignorera ändringar i blanksteg\n"
-"  ( -B | --ignore-blank-lines )    Ignorera ändringar i  tomma rader\n"
-"  ( -E | --ignore-end-of-line )    Ignorera olikheter i radslut\n"
-"  ( -i | --ignore-case )           Ignorera olikheter i skiftläge\n"
-"  ( -w | --ignore-all-space )      Ignorera olikheter i blanksteg"
-
-#: src/diffuse/main.py:1948
+#: src/diffuse/main.py:327
 msgid "Error parsing line number."
 msgstr "Fel vid tolkning av radnummer."
 
-#: src/diffuse/main.py:1958
-#, python-format
-msgid "Skipping unknown argument \"%s\"."
-msgstr "Undantar okänt argument \"%s\"."
-
-#: src/diffuse/main.py:1966
+#: src/diffuse/main.py:343
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Fel vid bearbetning av argumentet \"%s\". Katalogen inte den förväntade."
 
-#: src/diffuse/preferences.py:80
+#: src/diffuse/preferences.py:75
 msgid "Display"
 msgstr "Visning"
 
-#: src/diffuse/preferences.py:83
+#: src/diffuse/preferences.py:78
 msgid "Font"
 msgstr "Teckensnitt"
 
-#: src/diffuse/preferences.py:84
+#: src/diffuse/preferences.py:79
 msgid "Tab width"
 msgstr "Tabulatorbredd"
 
-#: src/diffuse/preferences.py:85
+#: src/diffuse/preferences.py:80
 msgid "Show right margin"
 msgstr "Visa höger marginal"
 
-#: src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:81
 msgid "Right margin"
 msgstr "Höger marginal"
 
-#: src/diffuse/preferences.py:87
+#: src/diffuse/preferences.py:82
 msgid "Show line numbers"
 msgstr "Visa radnummer"
 
-#: src/diffuse/preferences.py:88
+#: src/diffuse/preferences.py:83
 msgid "Show white space characters"
 msgstr "Visa blankstegstecken"
 
-#: src/diffuse/preferences.py:89
-msgid "Ignore case differences"
-msgstr "Ignorera olikheter i skiftläge"
-
-#: src/diffuse/preferences.py:90
-msgid "Ignore white space differences"
-msgstr "Ignorera olikheter i blanksteg"
-
-#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100
-msgid "Ignore changes to white space"
-msgstr "Ignorera ändringar i blanksteg"
-
-#: src/diffuse/preferences.py:92
+#: src/diffuse/preferences.py:87
 msgid "Ignore blank line differences"
 msgstr "Ignorera olikheter i tomma rader"
 
-#: src/diffuse/preferences.py:93
-msgid "Ignore end of line differences"
-msgstr "Ignorera olikheter i radavslut"
-
-#: src/diffuse/preferences.py:95
+#: src/diffuse/preferences.py:90
 msgid "Alignment"
 msgstr "Justering"
 
-#: src/diffuse/preferences.py:98
+#: src/diffuse/preferences.py:93
 msgid "Ignore case"
 msgstr "Ignorera skiftläge"
 
-#: src/diffuse/preferences.py:99
+#: src/diffuse/preferences.py:94
 msgid "Ignore white space"
 msgstr "Ignorera blanksteg"
 
-#: src/diffuse/preferences.py:101
+#: src/diffuse/preferences.py:96
 msgid "Ignore blank lines"
 msgstr "Ignorera tomma rader"
 
-#: src/diffuse/preferences.py:102
+#: src/diffuse/preferences.py:97
 msgid "Ignore end of line characters"
 msgstr "Ignorera tecken för radavslut"
 
-#: src/diffuse/preferences.py:104
+#: src/diffuse/preferences.py:99
 msgid "Editor"
 msgstr "Redigerare"
 
-#: src/diffuse/preferences.py:107
+#: src/diffuse/preferences.py:102
 msgid "Auto indent"
 msgstr "Automatiskt indrag"
 
-#: src/diffuse/preferences.py:108
+#: src/diffuse/preferences.py:103
 msgid "Expand tabs to spaces"
 msgstr "Expandera tabbar till blanksteg"
 
-#: src/diffuse/preferences.py:109
+#: src/diffuse/preferences.py:104
 msgid "Soft tab width"
 msgstr "Mjuk tabulatorbredd"
 
-#: src/diffuse/preferences.py:111
+#: src/diffuse/preferences.py:106
 msgid "Tabs"
 msgstr "Flikar"
 
-#: src/diffuse/preferences.py:114
+#: src/diffuse/preferences.py:109
 msgid "Default panes"
 msgstr "Standardpaneler"
 
-#: src/diffuse/preferences.py:115
+#: src/diffuse/preferences.py:110
 msgid "Always show the tab bar"
 msgstr "Visa alltid flikfältet"
 
-#: src/diffuse/preferences.py:116
+#: src/diffuse/preferences.py:111
 #, 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:118
+#: src/diffuse/preferences.py:113
 msgid "Regional Settings"
 msgstr "Regionala inställningar"
 
-#: src/diffuse/preferences.py:121
+#: src/diffuse/preferences.py:116
 msgid "Default codec"
 msgstr "Standardkodning"
 
-#: src/diffuse/preferences.py:122
+#: src/diffuse/preferences.py:117
 msgid "Order of codecs used to identify encoding"
 msgstr "Tabellordning för att identifiera kodning"
 
-#: src/diffuse/preferences.py:143
+#: src/diffuse/preferences.py:138
 msgid "Cygwin"
 msgstr "Cygwin"
 
-#: src/diffuse/preferences.py:145
+#: src/diffuse/preferences.py:140
 msgid "Root directory"
 msgstr "Root-mapp"
 
-#: src/diffuse/preferences.py:146
+#: src/diffuse/preferences.py:141
 msgid "Cygdrive prefix"
 msgstr "Cygdrive-prefix"
 
-#: src/diffuse/preferences.py:165
-msgid "Version control system search order"
-msgstr "Sökordning för versionskontrollsystem"
-
-#: src/diffuse/preferences.py:173
+#: src/diffuse/preferences.py:167
 msgid "\"co\" command"
 msgstr "\"co\" kommando"
 
-#: src/diffuse/preferences.py:174
+#: src/diffuse/preferences.py:168
 msgid "\"rlog\" command"
 msgstr "\"rlog\" kommando"
 
-#: src/diffuse/preferences.py:176
+#: src/diffuse/preferences.py:170
 msgid "Command"
 msgstr "Kommando"
 
-#: src/diffuse/preferences.py:182
+#: src/diffuse/preferences.py:176
 msgid "Launch from a Bash login shell"
 msgstr "Starta från ett Bash inloggningsskal"
 
-#: src/diffuse/preferences.py:189
+#: src/diffuse/preferences.py:183
 msgid "Update paths for Cygwin"
 msgstr "Uppdatera sökvägar för Cygwin"
 
-#: src/diffuse/preferences.py:194
+#: src/diffuse/preferences.py:188
 msgid "Version Control"
 msgstr "Versionskontroll"
 
-#: src/diffuse/preferences.py:259
+#: src/diffuse/preferences.py:253
 msgid "Preferences"
 msgstr "Inställningar"
 
+#: src/diffuse/preferences.py:294 src/diffuse/window.py:580
+#, python-format
+msgid "Error writing %s."
+msgstr "Fel vid skrivning av %s."
+
+#: src/diffuse/preferences.py:483 src/diffuse/window.py:446
+#: src/diffuse/window.py:1413 src/diffuse/window.py:1436 src/diffuse/window.py:1459
+msgid "_Open"
+msgstr ""
+
 #: src/diffuse/resources.py:242 src/diffuse/resources.py:246
 #: src/diffuse/resources.py:249
 #, python-brace-format
@@ -932,16 +417,11 @@ msgstr "Ohanterat fel på rad {line} i {file}."
 msgid "Auto Detect"
 msgstr "Identifiera automatiskt"
 
-#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97
+#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:96
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "Fel vid tolkning av revision %s."
 
-#: src/diffuse/vcs/vcs_registry.py:238
-#, python-format
-msgid "Error parsing %s."
-msgstr "Fel vid tolkning av %s."
-
 #: src/diffuse/widgets.py:1857
 msgid "Align with Selection"
 msgstr "Justera till markerat"
@@ -954,10 +434,641 @@ msgstr "Isolera"
 msgid "Merge Selection"
 msgstr "Sammanfoga markerat"
 
+#: src/diffuse/widgets.py:1861 src/diffuse/window.py:865
+msgid "Cut"
+msgstr "Klipp ut"
+
+#: src/diffuse/widgets.py:1862 src/diffuse/window.py:866
+msgid "Copy"
+msgstr "Kopiera"
+
+#: src/diffuse/widgets.py:1863 src/diffuse/window.py:867
+msgid "Paste"
+msgstr "Klistra in"
+
 #: src/diffuse/widgets.py:1865
 msgid "Select All"
 msgstr "Markera alla"
 
+#: src/diffuse/widgets.py:1866 src/diffuse/window.py:868
+msgid "Clear Edits"
+msgstr "Rensa bort ändringar"
+
 #: src/diffuse/widgets.py:1868
 msgid "Swap with Selected Pane"
 msgstr "Växla med markerad panel"
+
+#: src/diffuse/window.py:83
+msgid "Close Tab"
+msgstr "Stäng fliken"
+
+#: src/diffuse/window.py:126
+msgid "Open File..."
+msgstr "Öppna fil..."
+
+#: src/diffuse/window.py:127
+msgid "Reload File"
+msgstr "Läs in filen igen"
+
+#: src/diffuse/window.py:128
+msgid "Save File"
+msgstr "Spara filen"
+
+#: src/diffuse/window.py:129
+msgid "Save File As..."
+msgstr "Spara filen som..."
+
+#: src/diffuse/window.py:228
+#, python-format
+msgid "Column %d"
+msgstr "Kolumn %d"
+
+#: src/diffuse/window.py:306
+msgid "Save changes before loading the new file?"
+msgstr "Vill du spara ändringar före inläsning av den ny filen?"
+
+#: src/diffuse/window.py:310
+msgid "_No"
+msgstr ""
+
+#: src/diffuse/window.py:311
+msgid "_Yes"
+msgstr ""
+
+#: src/diffuse/window.py:417
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "Fel vid läsning av revision %(rev)s i %(file)s."
+
+#: src/diffuse/window.py:442
+msgid "Open File"
+msgstr "Öppna fil"
+
+#: src/diffuse/window.py:495
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "Spara %(title)s Panel %(pane)d"
+
+#: src/diffuse/window.py:499 src/diffuse/window.py:1111
+#, fuzzy
+msgid "_Save"
+msgstr "_Spara filen"
+
+#: src/diffuse/window.py:527
+#, python-format
+msgid "A file named %s already exists. Do you want to overwrite it?"
+msgstr "Det finns redan en fil som heter %s. Vill du skriva över den?"
+
+#: src/diffuse/window.py:534
+#, 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 ""
+"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/window.py:576
+#, python-format
+msgid "Error encoding to %s."
+msgstr "Fel vid kodning till %s."
+
+#: src/diffuse/window.py:610
+msgid "Go To Line..."
+msgstr "Gå till rad..."
+
+#: src/diffuse/window.py:611
+msgid "Line Number: "
+msgstr "Radnummer: "
+
+#: src/diffuse/window.py:642
+msgid ""
+"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."
+
+#: src/diffuse/window.py:646
+msgid "Press the escape key to finish editing."
+msgstr "Tryck på Esc-tangenten för att avsluta redigering."
+
+#: src/diffuse/window.py:649
+msgid ""
+"Select target line and press the space bar to align. Press the escape key to "
+"cancel."
+msgstr "Välj målrad och tryck blanksteg för att justera. Tryck Esc för att avbryta."
+
+#: src/diffuse/window.py:710
+msgid "_File"
+msgstr "_Arkiv"
+
+#: src/diffuse/window.py:712
+msgid "_Open File..."
+msgstr "_Öppna fil..."
+
+#: src/diffuse/window.py:713
+msgid "Open File In New _Tab..."
+msgstr "Öppna fil i ny _flik..."
+
+#: src/diffuse/window.py:714
+msgid "Open _Modified Files..."
+msgstr "Öppna _ändrade filer..."
+
+#: src/diffuse/window.py:715
+msgid "Open Commi_t..."
+msgstr "_Öppna arkivering..."
+
+#: src/diffuse/window.py:716
+msgid "_Reload File"
+msgstr "_Läs in filen igen"
+
+#: src/diffuse/window.py:718
+msgid "_Save File"
+msgstr "_Spara filen"
+
+#: src/diffuse/window.py:719
+msgid "Save File _As..."
+msgstr "Spara filen _som..."
+
+#: src/diffuse/window.py:720
+msgid "Save A_ll"
+msgstr "Spara a_lla"
+
+#: src/diffuse/window.py:722
+msgid "New _2-Way File Merge"
+msgstr "Ny _2-vägs filsammanslagning"
+
+#: src/diffuse/window.py:723
+msgid "New _3-Way File Merge"
+msgstr "Ny _3-vägs filsammanslagning"
+
+#: src/diffuse/window.py:724
+msgid "New _N-Way File Merge..."
+msgstr "Ny _x-vägs filsammanslagning..."
+
+#: src/diffuse/window.py:726
+msgid "_Close Tab"
+msgstr "_Stäng fliken"
+
+#: src/diffuse/window.py:727
+msgid "_Undo Close Tab"
+msgstr "_Ångra flikstängning"
+
+#: src/diffuse/window.py:728
+msgid "_Quit"
+msgstr "_Avsluta"
+
+#: src/diffuse/window.py:732
+msgid "_Edit"
+msgstr "_Redigera"
+
+#: src/diffuse/window.py:734
+msgid "_Undo"
+msgstr "_Ångra"
+
+#: src/diffuse/window.py:735
+msgid "_Redo"
+msgstr "_Upprepa"
+
+#: src/diffuse/window.py:737
+msgid "Cu_t"
+msgstr "Klipp _ut"
+
+#: src/diffuse/window.py:738
+msgid "_Copy"
+msgstr "_Kopiera"
+
+#: src/diffuse/window.py:739
+msgid "_Paste"
+msgstr "_Klistra in"
+
+#: src/diffuse/window.py:741
+msgid "Select _All"
+msgstr "Markera _alla"
+
+#: src/diffuse/window.py:742
+msgid "C_lear Edits"
+msgstr "_Rensa bort ändringar"
+
+#: src/diffuse/window.py:743
+msgid "_Dismiss All Edits"
+msgstr "_Förkasta alla ändringar"
+
+#: src/diffuse/window.py:745
+msgid "_Find..."
+msgstr "_Sök..."
+
+#: src/diffuse/window.py:746
+msgid "Find _Next"
+msgstr "Sök _nästa"
+
+#: src/diffuse/window.py:747
+msgid "Find Pre_vious"
+msgstr "Sök _föregående"
+
+#: src/diffuse/window.py:748
+msgid "_Go To Line..."
+msgstr "_Gå till rad..."
+
+#: src/diffuse/window.py:750
+msgid "Pr_eferences..."
+msgstr "_Inställningar..."
+
+#: src/diffuse/window.py:754
+msgid "None"
+msgstr "Ingen"
+
+#: src/diffuse/window.py:776
+msgid "_View"
+msgstr "_Visa"
+
+#: src/diffuse/window.py:778
+msgid "_Syntax Highlighting"
+msgstr "_Syntaxmarkering"
+
+#: src/diffuse/window.py:780
+msgid "Re_align All"
+msgstr "_Omjustera alla"
+
+#: src/diffuse/window.py:781
+msgid "_Isolate"
+msgstr "_Isolera"
+
+#: src/diffuse/window.py:783
+msgid "_First Difference"
+msgstr "_Första olikheten"
+
+#: src/diffuse/window.py:784
+msgid "_Previous Difference"
+msgstr "_Föregående olikhet"
+
+#: src/diffuse/window.py:785
+msgid "_Next Difference"
+msgstr "_Nästa olikhet"
+
+#: src/diffuse/window.py:786
+msgid "_Last Difference"
+msgstr "_Sista olikheten"
+
+#: src/diffuse/window.py:788
+msgid "Fir_st Tab"
+msgstr "F_örsta fliken"
+
+#: src/diffuse/window.py:789
+msgid "Pre_vious Tab"
+msgstr "Före_gående flik"
+
+#: src/diffuse/window.py:790
+msgid "Next _Tab"
+msgstr "Nästa _flik"
+
+#: src/diffuse/window.py:791
+msgid "Las_t Tab"
+msgstr "S_ista fliken"
+
+#: src/diffuse/window.py:793
+msgid "Shift Pane _Right"
+msgstr "Växla panel _höger"
+
+#: src/diffuse/window.py:794
+msgid "Shift Pane _Left"
+msgstr "Växla panel _vänster"
+
+#: src/diffuse/window.py:798
+msgid "F_ormat"
+msgstr "F_ormat"
+
+#: src/diffuse/window.py:800
+msgid "Convert To _Upper Case"
+msgstr "Konvertera till _VERSALER"
+
+#: src/diffuse/window.py:801
+msgid "Convert To _Lower Case"
+msgstr "Konvertera till _gemener"
+
+#: src/diffuse/window.py:803
+msgid "Sort Lines In _Ascending Order"
+msgstr "Sortera rader i _stigande ordning"
+
+#: src/diffuse/window.py:804
+msgid "Sort Lines In D_escending Order"
+msgstr "Sortera rader i _fallande ordning"
+
+#: src/diffuse/window.py:806
+msgid "Remove Trailing _White Space"
+msgstr "Ta bort avslutande blanksteg"
+
+#: src/diffuse/window.py:807
+msgid "Convert Tabs To _Spaces"
+msgstr "Konvertera tabbar till _blanksteg"
+
+#: src/diffuse/window.py:808
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "Konvertera inledande blanksteg till _tabbar"
+
+#: src/diffuse/window.py:810
+msgid "_Increase Indenting"
+msgstr "_Utöka indrag"
+
+#: src/diffuse/window.py:811
+msgid "De_crease Indenting"
+msgstr "Mi_nska indrag"
+
+#: src/diffuse/window.py:813
+msgid "Convert To _DOS Format"
+msgstr "Konvertera till _DOS-format"
+
+#: src/diffuse/window.py:814
+msgid "Convert To _Mac Format"
+msgstr "Konvertera till _MAC-format"
+
+#: src/diffuse/window.py:815
+msgid "Convert To Uni_x Format"
+msgstr "Konvertera till _Unix-format"
+
+#: src/diffuse/window.py:819
+msgid "_Merge"
+msgstr "_Sammanfoga"
+
+#: src/diffuse/window.py:821
+msgid "Copy Selection _Right"
+msgstr "Kopiera från markerat till _höger"
+
+#: src/diffuse/window.py:822
+msgid "Copy Selection _Left"
+msgstr "Kopiera från markerat till _vänster"
+
+#: src/diffuse/window.py:824
+msgid "Copy Left _Into Selection"
+msgstr "Kopiera från vänster till _markerat"
+
+#: src/diffuse/window.py:825
+msgid "Copy Right I_nto Selection"
+msgstr "Kopiera från höger till m_arkerat"
+
+#: src/diffuse/window.py:826
+msgid "_Merge From Left Then Right"
+msgstr "_Sammanfoga från vänster, sedan höger"
+
+#: src/diffuse/window.py:827
+msgid "M_erge From Right Then Left"
+msgstr "S_ammanfoga från höger, sedan vänster"
+
+#: src/diffuse/window.py:831
+msgid "_Help"
+msgstr "_Hjälp"
+
+#: src/diffuse/window.py:833
+msgid "_Help Contents..."
+msgstr "_Hjälpinnehåll..."
+
+#: src/diffuse/window.py:835
+#, python-format
+msgid "_About %s..."
+msgstr "_Om %s..."
+
+#: src/diffuse/window.py:847
+msgid "New 2-Way File Merge"
+msgstr "Ny 2-vägs filsammanslagning"
+
+#: src/diffuse/window.py:848
+msgid "New 3-Way File Merge"
+msgstr "Ny 3-vägs filsammanslagning"
+
+#: src/diffuse/window.py:850
+msgid "Realign All"
+msgstr "Omjustera alla"
+
+#: src/diffuse/window.py:851
+msgid "First Difference"
+msgstr "Första olikheten"
+
+#: src/diffuse/window.py:852
+msgid "Previous Difference"
+msgstr "Föregående olikhet"
+
+#: src/diffuse/window.py:853
+msgid "Next Difference"
+msgstr "Nästa olikhet"
+
+#: src/diffuse/window.py:854
+msgid "Last Difference"
+msgstr "Sista olikheten"
+
+#: src/diffuse/window.py:856
+msgid "Copy Selection Right"
+msgstr "Kopiera från markerat till höger"
+
+#: src/diffuse/window.py:857
+msgid "Copy Selection Left"
+msgstr "Kopiera från markerat till vänster"
+
+#: src/diffuse/window.py:858
+msgid "Copy Left Into Selection"
+msgstr "Kopiera från vänster till markerat"
+
+#: src/diffuse/window.py:859
+msgid "Copy Right Into Selection"
+msgstr "Kopiera från höger till markerat"
+
+#: src/diffuse/window.py:860
+msgid "Merge From Left Then Right"
+msgstr "Sammanfoga från vänster, sedan höger"
+
+#: src/diffuse/window.py:861
+msgid "Merge From Right Then Left"
+msgstr "Sammanfoga från höger, sedan vänster"
+
+#: src/diffuse/window.py:863
+msgid "Undo"
+msgstr "Ångra"
+
+#: src/diffuse/window.py:864
+msgid "Redo"
+msgstr "Upprepa"
+
+#: src/diffuse/window.py:950
+msgid "Changes detected"
+msgstr ""
+
+#: src/diffuse/window.py:954
+#, fuzzy, python-format
+msgid ""
+"The file \"%s\" changed on disk.\n"
+"\n"
+"Do you want to reload the file?"
+msgstr "Filen %s har ändrats på disk. Vill du läsa in filen igen?"
+
+#: src/diffuse/window.py:959
+#, fuzzy, python-format
+msgid ""
+"The following files changed on disk:\n"
+"%s\n"
+"\n"
+"Do you want to reload these files?"
+msgstr "Filen %s har ändrats på disk. Vill du läsa in filen igen?"
+
+#: src/diffuse/window.py:1078
+msgid "Some files have unsaved changes. Select the files to save before closing."
+msgstr ""
+"Vissa filer har ändringar som inte sparats. Välj filer att spara före stängning."
+
+#: src/diffuse/window.py:1092
+msgid "Tab"
+msgstr "Flik"
+
+#: src/diffuse/window.py:1097
+msgid "Pane"
+msgstr "Panel"
+
+#: src/diffuse/window.py:1108
+msgid "Close _Without Saving"
+msgstr "Stäng _utan att spara"
+
+#: src/diffuse/window.py:1147
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "Stängning av denna flik, avslutar %s."
+
+#: src/diffuse/window.py:1224
+#, python-format
+msgid "File Merge %d"
+msgstr "Filsammanslagning %d"
+
+#: src/diffuse/window.py:1344
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "Fel vid hämtning av arkiveringar för %s."
+
+#: src/diffuse/window.py:1376
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "Fel vid hämtning av ändringar för %s."
+
+#: src/diffuse/window.py:1409
+msgid "Open File In New Tab"
+msgstr "Öppna fil i ny flik"
+
+#: src/diffuse/window.py:1432
+msgid "Choose Folder With Modified Files"
+msgstr "Välj mapp med ändrade filer"
+
+#: src/diffuse/window.py:1450
+msgid "No modified files found."
+msgstr "Inga ändrade filer hittades."
+
+#: src/diffuse/window.py:1456
+msgid "Choose Folder With Commit"
+msgstr "Välj mapp för arkiveringar"
+
+#: src/diffuse/window.py:1476
+msgid "No committed files found."
+msgstr "Inga arkiverade filer hittades."
+
+#: src/diffuse/window.py:1512
+msgid "New N-Way File Merge..."
+msgstr "Ny x-vägs filsammanslagning..."
+
+#: src/diffuse/window.py:1513
+msgid "Number of panes: "
+msgstr "Antal paneler: "
+
+#: src/diffuse/window.py:1587
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "Frasen kan inte hittas. Vill du fortsätta från slutet på filen?"
+
+#: src/diffuse/window.py:1589
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "Frasen kan inte hittas. Vill du fortsätta från början på filen?"
+
+#: src/diffuse/window.py:1762
+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/window.py:1766
+msgid "translator-credits"
+msgstr "Åke Engelbrektson <eson@svenskasprakfiler.se>"
+
+#~ msgid "Main window: diff between two files"
+#~ msgstr "Huvudfönster: diff mellan två filer"
+
+#~ msgid ""
+#~ "Usage:\n"
+#~ "    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"
+#~ "also retrieve revisions of files from several VCSs for comparison and "
+#~ "merging.\n"
+#~ "\n"
+#~ "Help Options:\n"
+#~ "  ( -h | -? | --help )             Display this usage information\n"
+#~ "  ( -v | --version )               Display version and copyright information\n"
+#~ "\n"
+#~ "Configuration Options:\n"
+#~ "  --no-rcfile                      Do not read any resource files\n"
+#~ "  --rcfile <file>                  Specify explicit resource file\n"
+#~ "\n"
+#~ "General Options:\n"
+#~ "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
+#~ "  ( -D | --close-if-same )         Close all tabs with no differences\n"
+#~ "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+#~ "  ( -L | --label ) <label>         Display <label> instead of the file name\n"
+#~ "  ( -m | --modified )              Create a new tab for each modified file\n"
+#~ "  ( -r | --revision ) <rev>        File revision <rev>\n"
+#~ "  ( -s | --separate )              Create a new tab for each file\n"
+#~ "  ( -t | --tab )                   Start a new tab\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    Start with line <line> selected\n"
+#~ "  --null-file                      Create a blank file comparison pane\n"
+#~ "\n"
+#~ "Display Options:\n"
+#~ "  ( -b | --ignore-space-change )   Ignore changes to white space\n"
+#~ "  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
+#~ "  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
+#~ "  ( -i | --ignore-case )           Ignore case differences\n"
+#~ "  ( -w | --ignore-all-space )      Ignore white space differences"
+#~ msgstr ""
+#~ "Användning:\n"
+#~ "    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 kan också hämta revideringar av filer från flera VCS:er för jämförelse "
+#~ "och sammanfogning.\n"
+#~ "\n"
+#~ "Hjälpalternativ:\n"
+#~ "  ( -h | -? | --help )             Visa denna användningsinformation\n"
+#~ "  ( -v | --version )               Visa version och upphovsrättsinformation\n"
+#~ "\n"
+#~ "Konfigurationsalternativ:\n"
+#~ "  --no-rcfile                      Läs inga resursfiler\n"
+#~ "  --rcfile <file>                  Specificera explicit resursfil\n"
+#~ "\n"
+#~ "Allmäna alternativ:\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 <codec> för att läsa och skriva "
+#~ "filer\n"
+#~ "  ( -L | --label ) <label>         Visa <label> istället för filnamn\n"
+#~ "  ( -m | --modified )              Skapa ny flik för varje ändrad fil\n"
+#~ "  ( -r | --revision ) <rev>        Filrevision <rev>\n"
+#~ "  ( -s | --separate )              Skapa ny flik för varje fil\n"
+#~ "  ( -t | --tab )                   Starta en ny flik\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    Starta med rad <line> markerad\n"
+#~ "  --null-file                      Skapa en tom filjämförelsepanel\n"
+#~ "\n"
+#~ "Skärmalternativ:\n"
+#~ "  ( -b | --ignore-space-change )   Ignorera ändringar i blanksteg\n"
+#~ "  ( -B | --ignore-blank-lines )    Ignorera ändringar i  tomma rader\n"
+#~ "  ( -E | --ignore-end-of-line )    Ignorera olikheter i radslut\n"
+#~ "  ( -i | --ignore-case )           Ignorera olikheter i skiftläge\n"
+#~ "  ( -w | --ignore-all-space )      Ignorera olikheter i blanksteg"
diff --git a/po/th.po b/po/th.po
index 6c5fca1..1e44a98 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse 0.4.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-23 20:00-0400\n"
+"POT-Creation-Date: 2023-04-16 14:09-0400\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"
@@ -31,817 +31,303 @@ 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."
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, and "
+"Subversion repositories."
 msgstr ""
 
-#: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
-msgid "Main window: diff between two files"
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:28
+msgid "Main window"
 msgstr ""
 
-#: src/diffuse/constants.py:25
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:32
+msgid "About window"
+msgstr ""
+
+#: src/diffuse/constants.py:26
 msgid "Copyright"
 msgstr ""
 
-#: src/diffuse/dialogs.py:40
-msgid "Diffuse is a graphical tool for merging and comparing text files."
-msgstr "Diffuse เป็นเครื่องมือแบบกราฟิกสำหรับผสานและเปรียบเทียบแฟ้มข้อความ"
+#: src/diffuse/dialogs.py:46 src/diffuse/dialogs.py:89 src/diffuse/dialogs.py:133
+#: src/diffuse/preferences.py:254 src/diffuse/preferences.py:483
+#: src/diffuse/window.py:309 src/diffuse/window.py:1107
+msgid "_Cancel"
+msgstr ""
 
-#: src/diffuse/dialogs.py:45
-msgid "translator-credits"
-msgstr "Akom Chotiphantawanon <knight2000@gmail.com> "
-
-#: src/diffuse/dialogs.py:82
+#: src/diffuse/dialogs.py:50
 msgid "Encoding: "
 msgstr "รหัสอักขระ: "
 
-#: src/diffuse/dialogs.py:94
+#: src/diffuse/dialogs.py:62
 msgid "Revision: "
 msgstr "ฉบับแก้ไข: "
 
-#: src/diffuse/dialogs.py:156
+#: src/diffuse/dialogs.py:90 src/diffuse/dialogs.py:134
+#: src/diffuse/preferences.py:255
+msgid "_OK"
+msgstr ""
+
+#: src/diffuse/dialogs.py:130
 msgid "Find..."
 msgstr "หา..."
 
-#: src/diffuse/dialogs.py:164
+#: src/diffuse/dialogs.py:140
 msgid "Search For: "
 msgstr "ค้นหา: "
 
-#: src/diffuse/dialogs.py:189
+#: src/diffuse/dialogs.py:165
 msgid "Match Case"
 msgstr "ตัวพิมพ์ใหญ่-เล็กตรงกัน"
 
-#: src/diffuse/dialogs.py:194
+#: src/diffuse/dialogs.py:170
 msgid "Search Backwards"
 msgstr "ค้นถอยหลัง"
 
+#: src/diffuse/main.py:53
+msgid "Display version and copyright information"
+msgstr "แสดงรุ่นและข้อมูลลิขสิทธิ์"
+
+#: src/diffuse/main.py:61
+msgid "Do not read any resource files"
+msgstr "ไม่ต้องอ่านแฟ้มทรัพยากรใดๆ"
+
+#: src/diffuse/main.py:69
+msgid "Specify explicit resource file"
+msgstr "เจาะจงแฟ้มทรัพยากรที่จะใช้"
+
+#: src/diffuse/main.py:77
+msgid "File revisions <rev-1> and <rev>"
+msgstr "แฟ้มฉบับแก้ไข <rev-1> และ <rev>"
+
 #: src/diffuse/main.py:85
-msgid "Close Tab"
-msgstr "ปิดแท็บ"
+msgid "Close all tabs with no differences"
+msgstr "ปิดแท็บทั้งหมดที่ไม่มีความแตกต่าง"
 
-#: src/diffuse/main.py:132
-msgid "Open File..."
-msgstr "เปิดแฟ้ม..."
+#: src/diffuse/main.py:92
+msgid "Use <codec> to read and write files"
+msgstr "ใช้ <codec> ในการอ่านและเขียนแฟ้ม"
 
-#: src/diffuse/main.py:133
-msgid "Reload File"
-msgstr "โหลดแฟ้มซ้ำ"
+#: src/diffuse/main.py:100
+msgid "Display <label> instead of the file name"
+msgstr "แสดง <label> แทนชื่อแฟ้ม"
 
-#: src/diffuse/main.py:134
-msgid "Save File"
-msgstr "บันทึกแฟ้ม"
+#: src/diffuse/main.py:108
+msgid "Create a new tab for each modified file"
+msgstr "สร้างแท็บใหม่สำหรับแฟ้มที่เปลี่ยนแปลงแต่ละแฟ้ม"
 
-#: src/diffuse/main.py:135
-msgid "Save File As..."
-msgstr "บันทึกแฟ้มเป็น..."
+#: src/diffuse/main.py:115
+msgid "File revision <rev>"
+msgstr "แฟ้มฉบับแก้ไข <rev>"
 
-#: src/diffuse/main.py:217
-#, python-format
-msgid "Column %d"
-msgstr "คอลัมน์ %d"
+#: src/diffuse/main.py:123
+msgid "Create a new tab for each file"
+msgstr "สร้างแท็บแยกสำหรับแฟ้มแต่ละแฟ้ม"
 
-#: src/diffuse/main.py:291
-msgid "Save changes before loading the new file?"
-msgstr "บันทึกการเปลี่ยนแปลงก่อนโหลดแฟ้มใหม่หรือไม่?"
+#: src/diffuse/main.py:130
+msgid "Start a new tab"
+msgstr "เปิดแท็บใหม่"
 
-#: src/diffuse/main.py:402
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "เกิดข้อผิดพลาดขณะอ่านฉบับแก้ไข %(rev)s ของ %(file)s"
+#: src/diffuse/main.py:137 src/diffuse/preferences.py:159
+msgid "Version control system search order"
+msgstr ""
 
-#: src/diffuse/main.py:405 src/diffuse/main.py:1860
+#: src/diffuse/main.py:145
+msgid "Start with line <line> selected"
+msgstr "เปิดโดยเลือกบรรทัด <line> ไว้"
+
+#: src/diffuse/main.py:153
+msgid "Create a blank file comparison pane"
+msgstr "สร้างช่องแฟ้มเปล่า"
+
+#: src/diffuse/main.py:160 src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:95
+msgid "Ignore changes to white space"
+msgstr "ไม่สนใจการเปลี่ยนแปลงของช่องว่าง"
+
+#: src/diffuse/main.py:167
+msgid "Ignore changes in blank lines"
+msgstr "ไม่สนใจการเปลี่ยนแปลงในบรรทัดเปล่า"
+
+#: src/diffuse/main.py:174 src/diffuse/preferences.py:88
+msgid "Ignore end of line differences"
+msgstr "ไม่สนใจความแตกต่างของอักขระจบบรรทัด"
+
+#: src/diffuse/main.py:181 src/diffuse/preferences.py:84
+msgid "Ignore case differences"
+msgstr "ไม่สนใจความแตกต่างของตัวพิมพ์ใหญ่-เล็ก"
+
+#: src/diffuse/main.py:188 src/diffuse/preferences.py:85
+msgid "Ignore white space differences"
+msgstr "ไม่สนใจความแตกต่างของช่องว่างทั้งหมด"
+
+#: src/diffuse/main.py:191
+msgid ""
+"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 several VCSs for comparison and merging."
+msgstr ""
+
+#: src/diffuse/main.py:247 src/diffuse/window.py:420
 #, python-format
 msgid "Error reading %s."
 msgstr "เกิดข้อผิดพลาดขณะอ่าน %s"
 
-#: src/diffuse/main.py:427
-msgid "Open File"
-msgstr "เปิดแฟ้ม"
-
-#: src/diffuse/main.py:484
-#, python-format
-msgid "The file %s changed on disk. Do you want to reload the file?"
-msgstr "แฟ้ม \"%s\" มีการเปลี่ยนแปลงในดิสก์ คุณต้องการโหลดแฟ้มซ้ำหรือไม่?"
-
-#: src/diffuse/main.py:510
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "บันทึก %(title)s ช่อง %(pane)d"
-
-#: src/diffuse/main.py:542
-#, python-format
-msgid "A file named %s already exists. Do you want to overwrite it?"
-msgstr "แฟ้มชื่อ \"%s\" มีอยู่ก่อนแล้ว คุณต้องการเขียนทับหรือไม่?"
-
-#: src/diffuse/main.py:549
-#, python-format
-msgid ""
-"The file %s has been modified by another process since reading it. If you save, "
-"all the external changes could be lost. Save anyways?"
-msgstr ""
-"แฟ้ม \"%s\" ถูกเปลี่ยนแปลงโดยโพรเซสอื่นนับตั้งแต่ที่อ่านไว้ ถ้าคุณบันทึก "
-"การเปลี่ยนแปลงภายนอกทั้งหมดอาจสูญหายได้ ยังคงบันทึกหรือไม่?"
-
-#: src/diffuse/main.py:591
-#, python-format
-msgid "Error encoding to %s."
-msgstr "เกิดข้อผิดพลาดขณะลงรหัส %s"
-
-#: src/diffuse/main.py:595 src/diffuse/preferences.py:300
-#, python-format
-msgid "Error writing %s."
-msgstr "เกิดข้อผิดพลาดขณะเขียน %s"
-
-#: src/diffuse/main.py:625
-msgid "Go To Line..."
-msgstr "ไปที่บรรทัด..."
-
-#: src/diffuse/main.py:626
-msgid "Line Number: "
-msgstr "หมายเลขบรรทัด: "
-
-#: src/diffuse/main.py:657
-msgid ""
-"Press the enter key or double click to edit. Press the space bar or use the RMB "
-"menu to manually align."
-msgstr "กดปุ่ม Enter หรือดับเบิลคลิกเพื่อแก้ไข กดแคร่เว้นวรรคหรือใช้เมนูคลิกขวาเพื่อจัดเรียงด้วยมือ"
-
-#: src/diffuse/main.py:661
-msgid "Press the escape key to finish editing."
-msgstr "กดปุ่ม Escape เพื่อจบการแก้ไข"
-
-#: src/diffuse/main.py:664
-msgid ""
-"Select target line and press the space bar to align. Press the escape key to "
-"cancel."
-msgstr "เลือกบรรทัดเป้าหมายแล้วกดแคร่เว้นวรรคเพื่อจัดเรียง กดปุ่ม Escape เพื่อยกเลิก"
-
-#: src/diffuse/main.py:787
-msgid "_File"
-msgstr "แ_ฟ้ม"
-
-#: src/diffuse/main.py:788
-msgid "_Open File..."
-msgstr "_เปิดแฟ้ม..."
-
-#: src/diffuse/main.py:789
-msgid "Open File In New _Tab..."
-msgstr "เปิดแฟ้มในแ_ท็บใหม่..."
-
-#: src/diffuse/main.py:790
-msgid "Open _Modified Files..."
-msgstr "เปิดแฟ้มที่เ_ปลี่ยนแปลง..."
-
-#: src/diffuse/main.py:791
-msgid "Open Commi_t..."
-msgstr "เปิด Commi_t..."
-
-#: src/diffuse/main.py:792
-msgid "_Reload File"
-msgstr "โ_หลดแฟ้มซ้ำ"
-
-#: src/diffuse/main.py:794
-msgid "_Save File"
-msgstr "_บันทึกแฟ้ม"
-
-#: src/diffuse/main.py:795
-msgid "Save File _As..."
-msgstr "บันทึกแฟ้มเป็_น..."
-
-#: src/diffuse/main.py:796
-msgid "Save A_ll"
-msgstr "บันทึกทั้งห_มด"
-
-#: src/diffuse/main.py:798
-msgid "New _2-Way File Merge"
-msgstr "การผสานแฟ้ม _2 ทางชุดใหม่"
-
-#: src/diffuse/main.py:799
-msgid "New _3-Way File Merge"
-msgstr "การผสานแฟ้ม _3 ทางชุดใหม่"
-
-#: src/diffuse/main.py:800
-msgid "New _N-Way File Merge..."
-msgstr "การผสานแฟ้ม _N ทางชุดใหม่..."
-
-#: src/diffuse/main.py:802
-msgid "_Close Tab"
-msgstr "ปิ_ดแท็บ"
-
-#: src/diffuse/main.py:803
-msgid "_Undo Close Tab"
-msgstr "เ_รียกคืนการปิดแท็บ"
-
-#: src/diffuse/main.py:804
-msgid "_Quit"
-msgstr "_ออก"
-
-#: src/diffuse/main.py:807
-msgid "_Edit"
-msgstr "แ_ก้ไข"
-
-#: src/diffuse/main.py:808
-msgid "_Undo"
-msgstr "เ_รียกคืน"
-
-#: src/diffuse/main.py:809
-msgid "_Redo"
-msgstr "_ทำซ้ำ"
-
-#: src/diffuse/main.py:811
-msgid "Cu_t"
-msgstr "_ตัด"
-
-#: src/diffuse/main.py:812
-msgid "_Copy"
-msgstr "_คัดลอก"
-
-#: src/diffuse/main.py:813
-msgid "_Paste"
-msgstr "_แปะ"
-
-#: src/diffuse/main.py:815
-msgid "Select _All"
-msgstr "เลือกทั้ง_หมด"
-
-#: src/diffuse/main.py:816
-msgid "C_lear Edits"
-msgstr "_ล้างการแก้ไขต่างๆ"
-
-#: src/diffuse/main.py:817
-msgid "_Dismiss All Edits"
-msgstr "ไ_ม่สนใจการแก้ไขทั้งหมด"
-
-#: src/diffuse/main.py:819
-msgid "_Find..."
-msgstr "_หา..."
-
-#: src/diffuse/main.py:820
-msgid "Find _Next"
-msgstr "หา_ถัดไป"
-
-#: src/diffuse/main.py:821
-msgid "Find Pre_vious"
-msgstr "หา_ก่อนหน้า"
-
-#: src/diffuse/main.py:822
-msgid "_Go To Line..."
-msgstr "ไปที่_บรรทัด..."
-
-#: src/diffuse/main.py:824
-msgid "Pr_eferences..."
-msgstr "_ปรับแต่ง..."
-
-#: src/diffuse/main.py:828
-msgid "None"
-msgstr "ไม่มี"
-
-#: src/diffuse/main.py:846
-msgid "_View"
-msgstr "มุ_มมอง"
-
-#: src/diffuse/main.py:847
-msgid "_Syntax Highlighting"
-msgstr "การเน้นไ_วยากรณ์"
-
-#: src/diffuse/main.py:849
-msgid "Re_align All"
-msgstr "จัดเรียงให_ม่ทั้งหมด"
-
-#: src/diffuse/main.py:850
-msgid "_Isolate"
-msgstr "แ_ยก"
-
-#: src/diffuse/main.py:852
-msgid "_First Difference"
-msgstr "ความแตกต่างแ_รก"
-
-#: src/diffuse/main.py:853
-msgid "_Previous Difference"
-msgstr "ความแตกต่าง_ก่อนหน้า"
-
-#: src/diffuse/main.py:854
-msgid "_Next Difference"
-msgstr "ความแตกต่าง_ถัดไป"
-
-#: src/diffuse/main.py:855
-msgid "_Last Difference"
-msgstr "ความแตกต่าง_ล่าสุด"
-
-#: src/diffuse/main.py:857
-msgid "Fir_st Tab"
-msgstr "แท็บ_แรก"
-
-#: src/diffuse/main.py:858
-msgid "Pre_vious Tab"
-msgstr "แท็บก่อ_นหน้า"
-
-#: src/diffuse/main.py:859
-msgid "Next _Tab"
-msgstr "แ_ท็บถัดไป"
-
-#: src/diffuse/main.py:860
-msgid "Las_t Tab"
-msgstr "แท็บสุ_ดท้าย"
-
-#: src/diffuse/main.py:862
-msgid "Shift Pane _Right"
-msgstr "เลื่อนช่องไปทาง_ขวา"
-
-#: src/diffuse/main.py:863
-msgid "Shift Pane _Left"
-msgstr "เลื่อนช่องไปทางซ้_าย"
-
-#: src/diffuse/main.py:866
-msgid "F_ormat"
-msgstr "จัดรูปแ_บบ"
-
-#: src/diffuse/main.py:867
-msgid "Convert To _Upper Case"
-msgstr "แปลงเป็นตัวพิมพ์ใ_หญ่"
-
-#: src/diffuse/main.py:868
-msgid "Convert To _Lower Case"
-msgstr "แปลงเป็นตัวพิมพ์เล็_ก"
-
-#: src/diffuse/main.py:870
-msgid "Sort Lines In _Ascending Order"
-msgstr "เรียงบรรทัดจากน้_อยไปหามาก"
-
-#: src/diffuse/main.py:871
-msgid "Sort Lines In D_escending Order"
-msgstr "เรียงบรรทัดจาก_มากไปหาน้อย"
-
-#: src/diffuse/main.py:873
-msgid "Remove Trailing _White Space"
-msgstr "ลบช่องว่างท้า_ยบรรทัด"
-
-#: src/diffuse/main.py:874
-msgid "Convert Tabs To _Spaces"
-msgstr "แปลงแท็บเป็น_ช่องว่าง"
-
-#: src/diffuse/main.py:875
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "แปลงช่องว่างที่ต้นบรรทัดเป็นแ_ท็บ"
-
-#: src/diffuse/main.py:877
-msgid "_Increase Indenting"
-msgstr "เ_พิ่มการร่นย่อหน้า"
-
-#: src/diffuse/main.py:878
-msgid "De_crease Indenting"
-msgstr "_ลดการร่นย่อหน้า"
-
-#: src/diffuse/main.py:880
-msgid "Convert To _DOS Format"
-msgstr "แปลงเป็นรูปแบบ_ดอส"
-
-#: src/diffuse/main.py:881
-msgid "Convert To _Mac Format"
-msgstr "แปลงเป็นรูปแบบแ_ม็ค"
-
-#: src/diffuse/main.py:882
-msgid "Convert To Uni_x Format"
-msgstr "แปลงเป็นรูปแบบยู_นิกซ์"
-
-#: src/diffuse/main.py:885
-msgid "_Merge"
-msgstr "_ผสาน"
-
-#: src/diffuse/main.py:886
-msgid "Copy Selection _Right"
-msgstr "คัดลอกบรรทัดที่เลือกไปช่อง_ขวา"
-
-#: src/diffuse/main.py:887
-msgid "Copy Selection _Left"
-msgstr "คัดลอกบรรทัดที่เลือกไปช่องซ้า_ย"
-
-#: src/diffuse/main.py:889
-msgid "Copy Left _Into Selection"
-msgstr "คัดลอกช่องซ้าย_เข้าในบรรทัดที่เลือก"
-
-#: src/diffuse/main.py:890
-msgid "Copy Right I_nto Selection"
-msgstr "คัดลอกช่องขวาเข้าใ_นบรรทัดที่เลือก"
-
-#: src/diffuse/main.py:891
-msgid "_Merge From Left Then Right"
-msgstr "_ผสานจากช่องซ้ายแล้วตามด้วยขวา"
-
-#: src/diffuse/main.py:892
-msgid "M_erge From Right Then Left"
-msgstr "ผ_สานจากช่องขวาแล้วตามด้วยซ้าย"
-
-#: src/diffuse/main.py:895
-msgid "_Help"
-msgstr "_วิธีใช้"
-
-#: src/diffuse/main.py:896
-msgid "_Help Contents..."
-msgstr "เ_นื้อหาวิธีใช้..."
-
-#: src/diffuse/main.py:898
-#, python-format
-msgid "_About %s..."
-msgstr "เ_กี่ยวกับ %s..."
-
-#: src/diffuse/main.py:913
-msgid "New 2-Way File Merge"
-msgstr "การผสานแฟ้ม 2 ทางชุดใหม่"
-
-#: src/diffuse/main.py:914
-msgid "New 3-Way File Merge"
-msgstr "การผสานแฟ้ม 3 ทางชุดใหม่"
-
-#: src/diffuse/main.py:916
-msgid "Realign All"
-msgstr "จัดเรียงใหม่ทั้งหมด"
-
-#: src/diffuse/main.py:917
-msgid "First Difference"
-msgstr "ความแตกต่างแรก"
-
-#: src/diffuse/main.py:918
-msgid "Previous Difference"
-msgstr "ความแตกต่างก่อนหน้า"
-
-#: src/diffuse/main.py:919
-msgid "Next Difference"
-msgstr "ความแตกต่างถัดไป"
-
-#: src/diffuse/main.py:920
-msgid "Last Difference"
-msgstr "ความแตกต่างสุดท้าย"
-
-#: src/diffuse/main.py:922
-msgid "Copy Selection Right"
-msgstr "คัดลอกบรรทัดที่เลือกไปช่องขวา"
-
-#: src/diffuse/main.py:923
-msgid "Copy Selection Left"
-msgstr "คัดลอกบรรทัดที่เลือกไปช่องซ้าย"
-
-#: src/diffuse/main.py:924
-msgid "Copy Left Into Selection"
-msgstr "คัดลอกช่องซ้ายเข้าในบรรทัดที่เลือก"
-
-#: src/diffuse/main.py:925
-msgid "Copy Right Into Selection"
-msgstr "คัดลอกช่องขวาเข้าในบรรทัดที่เลือก"
-
-#: src/diffuse/main.py:926
-msgid "Merge From Left Then Right"
-msgstr "ผสานจากช่องซ้ายแล้วตามด้วยขวา"
-
-#: src/diffuse/main.py:927
-msgid "Merge From Right Then Left"
-msgstr "ผสานจากช่องขวาแล้วตามด้วยซ้าย"
-
-#: src/diffuse/main.py:929
-msgid "Undo"
-msgstr "เรียกคืน"
-
-#: src/diffuse/main.py:930
-msgid "Redo"
-msgstr "ทำซ้ำ"
-
-#: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
-msgid "Cut"
-msgstr "ตัด"
-
-#: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
-msgid "Copy"
-msgstr "คัดลอก"
-
-#: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
-msgid "Paste"
-msgstr "แปะ"
-
-#: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
-msgid "Clear Edits"
-msgstr "ล้างการแก้ไข"
-
-#: src/diffuse/main.py:1057
-msgid "Some files have unsaved changes. Select the files to save before closing."
-msgstr "บางแฟ้มมีการเปลี่ยนแปลงที่ไม่ได้บันทึก เลือกแฟ้มเพื่อบันทึกก่อนปิด"
-
-#: src/diffuse/main.py:1071
-msgid "Tab"
-msgstr "แท็บ"
-
-#: src/diffuse/main.py:1076
-msgid "Pane"
-msgstr "ช่อง"
-
-#: src/diffuse/main.py:1087
-msgid "Close _Without Saving"
-msgstr "ปิ_ดโดยไม่บันทึก"
-
-#: src/diffuse/main.py:1126
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "การปิดแท็บนี้จะออกจาก %s"
-
-#: src/diffuse/main.py:1209
-#, python-format
-msgid "File Merge %d"
-msgstr "การผสานแฟ้ม %d"
-
-#: src/diffuse/main.py:1315
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "เกิดข้อผิดพลาดขณะดึง commit ต่างๆ สำหรับ %s"
-
-#: src/diffuse/main.py:1347
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "เกิดข้อผิดพลาดขณะดึงการเปลี่ยนแปลงสำหรับ %s"
-
-#: src/diffuse/main.py:1380
-msgid "Open File In New Tab"
-msgstr "เปิดแฟ้มในแท็บใหม่"
-
-#: src/diffuse/main.py:1403
-msgid "Choose Folder With Modified Files"
-msgstr "เลือกโฟลเดอร์ที่มีแฟ้มที่เปลี่ยนแปลง"
-
-#: src/diffuse/main.py:1421
-msgid "No modified files found."
-msgstr "ไม่พบแฟ้มที่เปลี่ยนแปลง"
-
-#: src/diffuse/main.py:1427
-msgid "Choose Folder With Commit"
-msgstr "เลือกโฟลเดอร์ที่มีการ commit"
-
-#: src/diffuse/main.py:1447
-msgid "No committed files found."
-msgstr "ไม่พบแฟ้มที่มีการ commit"
-
-#: src/diffuse/main.py:1483
-msgid "New N-Way File Merge..."
-msgstr "การผสานแฟ้ม N ทางชุดใหม่..."
-
-#: src/diffuse/main.py:1484
-msgid "Number of panes: "
-msgstr "จำนวนช่อง: "
-
-#: src/diffuse/main.py:1558
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "ไม่พบคำที่ค้น จะหาต่อจากท้ายแฟ้มหรือไม่?"
-
-#: src/diffuse/main.py:1560
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "ไม่พบคำที่ค้น จะหาต่อจากต้นแฟ้มหรือไม่?"
-
-#: src/diffuse/main.py:1781
-#, fuzzy
-msgid ""
-"Usage:\n"
-"    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"
-"also retrieve revisions of files from several VCSs for comparison and merging.\n"
-"\n"
-"Help Options:\n"
-"  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright information\n"
-"\n"
-"Configuration Options:\n"
-"  --no-rcfile                      Do not read any resource files\n"
-"  --rcfile <file>                  Specify explicit resource file\n"
-"\n"
-"General Options:\n"
-"  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
-"  ( -D | --close-if-same )         Close all tabs with no differences\n"
-"  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
-"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
-"  ( -m | --modified )              Create a new tab for each modified file\n"
-"  ( -r | --revision ) <rev>        File revision <rev>\n"
-"  ( -s | --separate )              Create a new tab for each file\n"
-"  ( -t | --tab )                   Start a new tab\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    Start with line <line> selected\n"
-"  --null-file                      Create a blank file comparison pane\n"
-"\n"
-"Display Options:\n"
-"  ( -b | --ignore-space-change )   Ignore changes to white space\n"
-"  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
-"  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
-"  ( -i | --ignore-case )           Ignore case differences\n"
-"  ( -w | --ignore-all-space )      Ignore white space differences"
-msgstr ""
-"วิธีใช้:\n"
-"    diffuse [ [ตัวเลือก...] [แฟ้ม...] ]...\n"
-"    diffuse ( -h | -? | --help | -v | --version )\n"
-"\n"
-"Diffuse เป็นเครื่องมือแบบกราฟิกสำหรับผสานและเปรียบเทียบแฟ้มข้อความ  Diffuse\n"
-"สามารถเปรียบเทียบแฟ้มจำนวนเท่าใดก็ได้โดยวางเทียบข้างกัน และให้ผู้ใช้สามารถ\n"
-"ปรับการจับคู่บรรทัดด้วยมือ และแก้ไขแฟ้มได้โดยตรง นอกจากนี้ Diffuse ยังสามารถ\n"
-"ดึงเอาฉบับแก้ไขต่างๆ ของแฟ้มจากคลัง Bazaar, CVS, Darcs, Git, Mercurial,\n"
-"Monotone, RCS, Subversion, และ SVK มาเปรียบเทียบและผสานได้\n"
-"\n"
-"ตัวเลือกวิธีใช้:\n"
-"  ( -h | -? | --help )             แสดงข้อมูลวิธีใช้นี้\n"
-"  ( -v | --version )               แสดงรุ่นและข้อมูลลิขสิทธิ์\n"
-"\n"
-"ตัวเลือกค่าตั้ง:\n"
-"  --no-rcfile                      ไม่ต้องอ่านแฟ้มทรัพยากรใดๆ\n"
-"  --rcfile <file>                  เจาะจงแฟ้มทรัพยากรที่จะใช้\n"
-"\n"
-"ตัวเลือกทั่วไป:\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"
-"  ( -r | --revision ) <rev>        แฟ้มฉบับแก้ไข <rev>\n"
-"  ( -s | --separate )              สร้างแท็บแยกสำหรับแฟ้มแต่ละแฟ้ม\n"
-"  ( -t | --tab )                   เปิดแท็บใหม่\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    เปิดโดยเลือกบรรทัด <line> ไว้\n"
-"  --null-file                      สร้างช่องแฟ้มเปล่า\n"
-"\n"
-"ตัวเลือกการแสดงผล:\n"
-"  ( -b | --ignore-space-change )   ไม่สนใจการเปลี่ยนแปลงของช่องว่าง\n"
-"  ( -B | --ignore-blank-lines )    ไม่สนใจการเปลี่ยนแปลงในบรรทัดเปล่า\n"
-"  ( -E | --ignore-end-of-line )    ไม่สนใจความแตกต่างของอักขระจบบรรทัด\n"
-"  ( -i | --ignore-case )           ไม่สนใจความแตกต่างของตัวพิมพ์ใหญ่-เล็ก\n"
-"  ( -w | --ignore-all-space )      ไม่สนใจความแตกต่างของช่องว่างทั้งหมด"
-
-#: src/diffuse/main.py:1948
+#: src/diffuse/main.py:327
 msgid "Error parsing line number."
 msgstr "เกิดข้อผิดพลาดขณะแจงหมายเลขบรรทัด"
 
-#: src/diffuse/main.py:1958
-#, python-format
-msgid "Skipping unknown argument \"%s\"."
-msgstr "ขอข้ามอาร์กิวเมนต์ \"%s\" ที่ไม่ทราบ"
-
-#: src/diffuse/main.py:1966
+#: src/diffuse/main.py:343
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "เกิดข้อผิดพลาดขณะประมวลผลอาร์กิวเมนต์ \"%s\"  ไม่คาดหมายว่าจะพบไดเรกทอรี"
 
-#: src/diffuse/preferences.py:80
+#: src/diffuse/preferences.py:75
 msgid "Display"
 msgstr "การแสดงผล"
 
-#: src/diffuse/preferences.py:83
+#: src/diffuse/preferences.py:78
 msgid "Font"
 msgstr "แบบอักษร"
 
-#: src/diffuse/preferences.py:84
+#: src/diffuse/preferences.py:79
 msgid "Tab width"
 msgstr "ความกว้างแท็บ"
 
-#: src/diffuse/preferences.py:85
+#: src/diffuse/preferences.py:80
 msgid "Show right margin"
 msgstr "แสดงขอบขวา"
 
-#: src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:81
 msgid "Right margin"
 msgstr "ขอบขวา"
 
-#: src/diffuse/preferences.py:87
+#: src/diffuse/preferences.py:82
 msgid "Show line numbers"
 msgstr "แสดงเลขบรรทัด"
 
-#: src/diffuse/preferences.py:88
+#: src/diffuse/preferences.py:83
 msgid "Show white space characters"
 msgstr "แสดงอักขระช่องว่าง"
 
-#: src/diffuse/preferences.py:89
-msgid "Ignore case differences"
-msgstr "ไม่สนใจความแตกต่างของตัวพิมพ์ใหญ่-เล็ก"
-
-#: src/diffuse/preferences.py:90
-msgid "Ignore white space differences"
-msgstr "ไม่สนใจความแตกต่างของช่องว่างทั้งหมด"
-
-#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100
-msgid "Ignore changes to white space"
-msgstr "ไม่สนใจการเปลี่ยนแปลงของช่องว่าง"
-
-#: src/diffuse/preferences.py:92
+#: src/diffuse/preferences.py:87
 msgid "Ignore blank line differences"
 msgstr "ไม่สนใจความแตกต่างของบรรทัดเปล่า"
 
-#: src/diffuse/preferences.py:93
-msgid "Ignore end of line differences"
-msgstr "ไม่สนใจความแตกต่างของอักขระจบบรรทัด"
-
-#: src/diffuse/preferences.py:95
+#: src/diffuse/preferences.py:90
 msgid "Alignment"
 msgstr "การจัดเรียง"
 
-#: src/diffuse/preferences.py:98
+#: src/diffuse/preferences.py:93
 msgid "Ignore case"
 msgstr "ไม่สนใจตัวพิมพ์ใหญ่-เล็ก"
 
-#: src/diffuse/preferences.py:99
+#: src/diffuse/preferences.py:94
 msgid "Ignore white space"
 msgstr "ไม่สนใจช่องว่าง"
 
-#: src/diffuse/preferences.py:101
+#: src/diffuse/preferences.py:96
 msgid "Ignore blank lines"
 msgstr "ไม่สนใจบรรทัดเปล่า"
 
-#: src/diffuse/preferences.py:102
+#: src/diffuse/preferences.py:97
 msgid "Ignore end of line characters"
 msgstr "ไม่สนใจอักขระจบบรรทัด"
 
-#: src/diffuse/preferences.py:104
+#: src/diffuse/preferences.py:99
 msgid "Editor"
 msgstr "เครื่องมือแก้ไข"
 
-#: src/diffuse/preferences.py:107
+#: src/diffuse/preferences.py:102
 msgid "Auto indent"
 msgstr "ร่นบรรทัดอัตโนมัติ"
 
-#: src/diffuse/preferences.py:108
+#: src/diffuse/preferences.py:103
 msgid "Expand tabs to spaces"
 msgstr "กระจายแท็บเป็นช่องว่าง"
 
-#: src/diffuse/preferences.py:109
+#: src/diffuse/preferences.py:104
 msgid "Soft tab width"
 msgstr "ความกว้างของแท็บแบบซอฟต์"
 
-#: src/diffuse/preferences.py:111
+#: src/diffuse/preferences.py:106
 msgid "Tabs"
 msgstr "แท็บ"
 
-#: src/diffuse/preferences.py:114
+#: src/diffuse/preferences.py:109
 msgid "Default panes"
 msgstr "ช่องปริยาย"
 
-#: src/diffuse/preferences.py:115
+#: src/diffuse/preferences.py:110
 msgid "Always show the tab bar"
 msgstr "แสดงแถบแท็บเสมอ"
 
-#: src/diffuse/preferences.py:116
+#: src/diffuse/preferences.py:111
 #, python-format
 msgid "Warn me when closing a tab will quit %s"
 msgstr "เตือนเมื่อการปิดแท็บจะออกจาก %s"
 
-#: src/diffuse/preferences.py:118
+#: src/diffuse/preferences.py:113
 msgid "Regional Settings"
 msgstr "ค่าตั้งภูมิภาค"
 
-#: src/diffuse/preferences.py:121
+#: src/diffuse/preferences.py:116
 msgid "Default codec"
 msgstr "ตัวอ่าน-ลงรหัสปริยาย"
 
-#: src/diffuse/preferences.py:122
+#: src/diffuse/preferences.py:117
 msgid "Order of codecs used to identify encoding"
 msgstr "ลำดับตัวอ่าน-ลงรหัสที่ใช้ในการตรวจสอบรหัสอักขระ"
 
-#: src/diffuse/preferences.py:143
+#: src/diffuse/preferences.py:138
 msgid "Cygwin"
 msgstr "Cygwin"
 
-#: src/diffuse/preferences.py:145
+#: src/diffuse/preferences.py:140
 msgid "Root directory"
 msgstr "ไดเรกทอรีราก"
 
-#: src/diffuse/preferences.py:146
+#: src/diffuse/preferences.py:141
 msgid "Cygdrive prefix"
 msgstr "พาธส่วนต้นของ Cygdrive"
 
-#: src/diffuse/preferences.py:165
-msgid "Version control system search order"
-msgstr ""
-
-#: src/diffuse/preferences.py:173
+#: src/diffuse/preferences.py:167
 msgid "\"co\" command"
 msgstr "คำสั่ง \"co\""
 
-#: src/diffuse/preferences.py:174
+#: src/diffuse/preferences.py:168
 msgid "\"rlog\" command"
 msgstr "คำสั่ง \"rlog\""
 
-#: src/diffuse/preferences.py:176
+#: src/diffuse/preferences.py:170
 msgid "Command"
 msgstr "คำสั่ง"
 
-#: src/diffuse/preferences.py:182
+#: src/diffuse/preferences.py:176
 msgid "Launch from a Bash login shell"
 msgstr "เรียกจากเชลล์ล็อกอินของ Bash"
 
-#: src/diffuse/preferences.py:189
+#: src/diffuse/preferences.py:183
 msgid "Update paths for Cygwin"
 msgstr "ปรับข้อมูลพาธสำหรับ Cygwin"
 
-#: src/diffuse/preferences.py:194
+#: src/diffuse/preferences.py:188
 msgid "Version Control"
 msgstr "การควบคุมรุ่น"
 
-#: src/diffuse/preferences.py:259
+#: src/diffuse/preferences.py:253
 msgid "Preferences"
 msgstr "ปรับแต่ง"
 
+#: src/diffuse/preferences.py:294 src/diffuse/window.py:580
+#, python-format
+msgid "Error writing %s."
+msgstr "เกิดข้อผิดพลาดขณะเขียน %s"
+
+#: src/diffuse/preferences.py:483 src/diffuse/window.py:446
+#: src/diffuse/window.py:1413 src/diffuse/window.py:1436 src/diffuse/window.py:1459
+msgid "_Open"
+msgstr ""
+
 #: src/diffuse/resources.py:242 src/diffuse/resources.py:246
 #: src/diffuse/resources.py:249
 #, python-brace-format
@@ -927,16 +413,11 @@ msgstr "เกิดข้อผิดพลาดขณะประมวลผ
 msgid "Auto Detect"
 msgstr "ตรวจสอบอัตโนมัติ"
 
-#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97
+#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:96
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "เกิดข้อผิดพลาดขณะแจงฉบับแก้ไข %s"
 
-#: src/diffuse/vcs/vcs_registry.py:238
-#, python-format
-msgid "Error parsing %s."
-msgstr "เกิดข้อผิดพลาดขณะแจง %s"
-
 #: src/diffuse/widgets.py:1857
 msgid "Align with Selection"
 msgstr "เรียงตรงกับบรรทัดที่เลือก"
@@ -949,10 +430,633 @@ msgstr "แยก"
 msgid "Merge Selection"
 msgstr "ผสานบรรทัดที่เลือก"
 
+#: src/diffuse/widgets.py:1861 src/diffuse/window.py:865
+msgid "Cut"
+msgstr "ตัด"
+
+#: src/diffuse/widgets.py:1862 src/diffuse/window.py:866
+msgid "Copy"
+msgstr "คัดลอก"
+
+#: src/diffuse/widgets.py:1863 src/diffuse/window.py:867
+msgid "Paste"
+msgstr "แปะ"
+
 #: src/diffuse/widgets.py:1865
 msgid "Select All"
 msgstr "เลือกทั้งหมด"
 
+#: src/diffuse/widgets.py:1866 src/diffuse/window.py:868
+msgid "Clear Edits"
+msgstr "ล้างการแก้ไข"
+
 #: src/diffuse/widgets.py:1868
 msgid "Swap with Selected Pane"
 msgstr "สลับกับช่องที่เลือก"
+
+#: src/diffuse/window.py:83
+msgid "Close Tab"
+msgstr "ปิดแท็บ"
+
+#: src/diffuse/window.py:126
+msgid "Open File..."
+msgstr "เปิดแฟ้ม..."
+
+#: src/diffuse/window.py:127
+msgid "Reload File"
+msgstr "โหลดแฟ้มซ้ำ"
+
+#: src/diffuse/window.py:128
+msgid "Save File"
+msgstr "บันทึกแฟ้ม"
+
+#: src/diffuse/window.py:129
+msgid "Save File As..."
+msgstr "บันทึกแฟ้มเป็น..."
+
+#: src/diffuse/window.py:228
+#, python-format
+msgid "Column %d"
+msgstr "คอลัมน์ %d"
+
+#: src/diffuse/window.py:306
+msgid "Save changes before loading the new file?"
+msgstr "บันทึกการเปลี่ยนแปลงก่อนโหลดแฟ้มใหม่หรือไม่?"
+
+#: src/diffuse/window.py:310
+msgid "_No"
+msgstr ""
+
+#: src/diffuse/window.py:311
+msgid "_Yes"
+msgstr ""
+
+#: src/diffuse/window.py:417
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "เกิดข้อผิดพลาดขณะอ่านฉบับแก้ไข %(rev)s ของ %(file)s"
+
+#: src/diffuse/window.py:442
+msgid "Open File"
+msgstr "เปิดแฟ้ม"
+
+#: src/diffuse/window.py:495
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "บันทึก %(title)s ช่อง %(pane)d"
+
+#: src/diffuse/window.py:499 src/diffuse/window.py:1111
+#, fuzzy
+msgid "_Save"
+msgstr "_บันทึกแฟ้ม"
+
+#: src/diffuse/window.py:527
+#, python-format
+msgid "A file named %s already exists. Do you want to overwrite it?"
+msgstr "แฟ้มชื่อ \"%s\" มีอยู่ก่อนแล้ว คุณต้องการเขียนทับหรือไม่?"
+
+#: src/diffuse/window.py:534
+#, python-format
+msgid ""
+"The file %s has been modified by another process since reading it. If you save, "
+"all the external changes could be lost. Save anyways?"
+msgstr ""
+"แฟ้ม \"%s\" ถูกเปลี่ยนแปลงโดยโพรเซสอื่นนับตั้งแต่ที่อ่านไว้ ถ้าคุณบันทึก "
+"การเปลี่ยนแปลงภายนอกทั้งหมดอาจสูญหายได้ ยังคงบันทึกหรือไม่?"
+
+#: src/diffuse/window.py:576
+#, python-format
+msgid "Error encoding to %s."
+msgstr "เกิดข้อผิดพลาดขณะลงรหัส %s"
+
+#: src/diffuse/window.py:610
+msgid "Go To Line..."
+msgstr "ไปที่บรรทัด..."
+
+#: src/diffuse/window.py:611
+msgid "Line Number: "
+msgstr "หมายเลขบรรทัด: "
+
+#: src/diffuse/window.py:642
+msgid ""
+"Press the enter key or double click to edit. Press the space bar or use the RMB "
+"menu to manually align."
+msgstr "กดปุ่ม Enter หรือดับเบิลคลิกเพื่อแก้ไข กดแคร่เว้นวรรคหรือใช้เมนูคลิกขวาเพื่อจัดเรียงด้วยมือ"
+
+#: src/diffuse/window.py:646
+msgid "Press the escape key to finish editing."
+msgstr "กดปุ่ม Escape เพื่อจบการแก้ไข"
+
+#: src/diffuse/window.py:649
+msgid ""
+"Select target line and press the space bar to align. Press the escape key to "
+"cancel."
+msgstr "เลือกบรรทัดเป้าหมายแล้วกดแคร่เว้นวรรคเพื่อจัดเรียง กดปุ่ม Escape เพื่อยกเลิก"
+
+#: src/diffuse/window.py:710
+msgid "_File"
+msgstr "แ_ฟ้ม"
+
+#: src/diffuse/window.py:712
+msgid "_Open File..."
+msgstr "_เปิดแฟ้ม..."
+
+#: src/diffuse/window.py:713
+msgid "Open File In New _Tab..."
+msgstr "เปิดแฟ้มในแ_ท็บใหม่..."
+
+#: src/diffuse/window.py:714
+msgid "Open _Modified Files..."
+msgstr "เปิดแฟ้มที่เ_ปลี่ยนแปลง..."
+
+#: src/diffuse/window.py:715
+msgid "Open Commi_t..."
+msgstr "เปิด Commi_t..."
+
+#: src/diffuse/window.py:716
+msgid "_Reload File"
+msgstr "โ_หลดแฟ้มซ้ำ"
+
+#: src/diffuse/window.py:718
+msgid "_Save File"
+msgstr "_บันทึกแฟ้ม"
+
+#: src/diffuse/window.py:719
+msgid "Save File _As..."
+msgstr "บันทึกแฟ้มเป็_น..."
+
+#: src/diffuse/window.py:720
+msgid "Save A_ll"
+msgstr "บันทึกทั้งห_มด"
+
+#: src/diffuse/window.py:722
+msgid "New _2-Way File Merge"
+msgstr "การผสานแฟ้ม _2 ทางชุดใหม่"
+
+#: src/diffuse/window.py:723
+msgid "New _3-Way File Merge"
+msgstr "การผสานแฟ้ม _3 ทางชุดใหม่"
+
+#: src/diffuse/window.py:724
+msgid "New _N-Way File Merge..."
+msgstr "การผสานแฟ้ม _N ทางชุดใหม่..."
+
+#: src/diffuse/window.py:726
+msgid "_Close Tab"
+msgstr "ปิ_ดแท็บ"
+
+#: src/diffuse/window.py:727
+msgid "_Undo Close Tab"
+msgstr "เ_รียกคืนการปิดแท็บ"
+
+#: src/diffuse/window.py:728
+msgid "_Quit"
+msgstr "_ออก"
+
+#: src/diffuse/window.py:732
+msgid "_Edit"
+msgstr "แ_ก้ไข"
+
+#: src/diffuse/window.py:734
+msgid "_Undo"
+msgstr "เ_รียกคืน"
+
+#: src/diffuse/window.py:735
+msgid "_Redo"
+msgstr "_ทำซ้ำ"
+
+#: src/diffuse/window.py:737
+msgid "Cu_t"
+msgstr "_ตัด"
+
+#: src/diffuse/window.py:738
+msgid "_Copy"
+msgstr "_คัดลอก"
+
+#: src/diffuse/window.py:739
+msgid "_Paste"
+msgstr "_แปะ"
+
+#: src/diffuse/window.py:741
+msgid "Select _All"
+msgstr "เลือกทั้ง_หมด"
+
+#: src/diffuse/window.py:742
+msgid "C_lear Edits"
+msgstr "_ล้างการแก้ไขต่างๆ"
+
+#: src/diffuse/window.py:743
+msgid "_Dismiss All Edits"
+msgstr "ไ_ม่สนใจการแก้ไขทั้งหมด"
+
+#: src/diffuse/window.py:745
+msgid "_Find..."
+msgstr "_หา..."
+
+#: src/diffuse/window.py:746
+msgid "Find _Next"
+msgstr "หา_ถัดไป"
+
+#: src/diffuse/window.py:747
+msgid "Find Pre_vious"
+msgstr "หา_ก่อนหน้า"
+
+#: src/diffuse/window.py:748
+msgid "_Go To Line..."
+msgstr "ไปที่_บรรทัด..."
+
+#: src/diffuse/window.py:750
+msgid "Pr_eferences..."
+msgstr "_ปรับแต่ง..."
+
+#: src/diffuse/window.py:754
+msgid "None"
+msgstr "ไม่มี"
+
+#: src/diffuse/window.py:776
+msgid "_View"
+msgstr "มุ_มมอง"
+
+#: src/diffuse/window.py:778
+msgid "_Syntax Highlighting"
+msgstr "การเน้นไ_วยากรณ์"
+
+#: src/diffuse/window.py:780
+msgid "Re_align All"
+msgstr "จัดเรียงให_ม่ทั้งหมด"
+
+#: src/diffuse/window.py:781
+msgid "_Isolate"
+msgstr "แ_ยก"
+
+#: src/diffuse/window.py:783
+msgid "_First Difference"
+msgstr "ความแตกต่างแ_รก"
+
+#: src/diffuse/window.py:784
+msgid "_Previous Difference"
+msgstr "ความแตกต่าง_ก่อนหน้า"
+
+#: src/diffuse/window.py:785
+msgid "_Next Difference"
+msgstr "ความแตกต่าง_ถัดไป"
+
+#: src/diffuse/window.py:786
+msgid "_Last Difference"
+msgstr "ความแตกต่าง_ล่าสุด"
+
+#: src/diffuse/window.py:788
+msgid "Fir_st Tab"
+msgstr "แท็บ_แรก"
+
+#: src/diffuse/window.py:789
+msgid "Pre_vious Tab"
+msgstr "แท็บก่อ_นหน้า"
+
+#: src/diffuse/window.py:790
+msgid "Next _Tab"
+msgstr "แ_ท็บถัดไป"
+
+#: src/diffuse/window.py:791
+msgid "Las_t Tab"
+msgstr "แท็บสุ_ดท้าย"
+
+#: src/diffuse/window.py:793
+msgid "Shift Pane _Right"
+msgstr "เลื่อนช่องไปทาง_ขวา"
+
+#: src/diffuse/window.py:794
+msgid "Shift Pane _Left"
+msgstr "เลื่อนช่องไปทางซ้_าย"
+
+#: src/diffuse/window.py:798
+msgid "F_ormat"
+msgstr "จัดรูปแ_บบ"
+
+#: src/diffuse/window.py:800
+msgid "Convert To _Upper Case"
+msgstr "แปลงเป็นตัวพิมพ์ใ_หญ่"
+
+#: src/diffuse/window.py:801
+msgid "Convert To _Lower Case"
+msgstr "แปลงเป็นตัวพิมพ์เล็_ก"
+
+#: src/diffuse/window.py:803
+msgid "Sort Lines In _Ascending Order"
+msgstr "เรียงบรรทัดจากน้_อยไปหามาก"
+
+#: src/diffuse/window.py:804
+msgid "Sort Lines In D_escending Order"
+msgstr "เรียงบรรทัดจาก_มากไปหาน้อย"
+
+#: src/diffuse/window.py:806
+msgid "Remove Trailing _White Space"
+msgstr "ลบช่องว่างท้า_ยบรรทัด"
+
+#: src/diffuse/window.py:807
+msgid "Convert Tabs To _Spaces"
+msgstr "แปลงแท็บเป็น_ช่องว่าง"
+
+#: src/diffuse/window.py:808
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "แปลงช่องว่างที่ต้นบรรทัดเป็นแ_ท็บ"
+
+#: src/diffuse/window.py:810
+msgid "_Increase Indenting"
+msgstr "เ_พิ่มการร่นย่อหน้า"
+
+#: src/diffuse/window.py:811
+msgid "De_crease Indenting"
+msgstr "_ลดการร่นย่อหน้า"
+
+#: src/diffuse/window.py:813
+msgid "Convert To _DOS Format"
+msgstr "แปลงเป็นรูปแบบ_ดอส"
+
+#: src/diffuse/window.py:814
+msgid "Convert To _Mac Format"
+msgstr "แปลงเป็นรูปแบบแ_ม็ค"
+
+#: src/diffuse/window.py:815
+msgid "Convert To Uni_x Format"
+msgstr "แปลงเป็นรูปแบบยู_นิกซ์"
+
+#: src/diffuse/window.py:819
+msgid "_Merge"
+msgstr "_ผสาน"
+
+#: src/diffuse/window.py:821
+msgid "Copy Selection _Right"
+msgstr "คัดลอกบรรทัดที่เลือกไปช่อง_ขวา"
+
+#: src/diffuse/window.py:822
+msgid "Copy Selection _Left"
+msgstr "คัดลอกบรรทัดที่เลือกไปช่องซ้า_ย"
+
+#: src/diffuse/window.py:824
+msgid "Copy Left _Into Selection"
+msgstr "คัดลอกช่องซ้าย_เข้าในบรรทัดที่เลือก"
+
+#: src/diffuse/window.py:825
+msgid "Copy Right I_nto Selection"
+msgstr "คัดลอกช่องขวาเข้าใ_นบรรทัดที่เลือก"
+
+#: src/diffuse/window.py:826
+msgid "_Merge From Left Then Right"
+msgstr "_ผสานจากช่องซ้ายแล้วตามด้วยขวา"
+
+#: src/diffuse/window.py:827
+msgid "M_erge From Right Then Left"
+msgstr "ผ_สานจากช่องขวาแล้วตามด้วยซ้าย"
+
+#: src/diffuse/window.py:831
+msgid "_Help"
+msgstr "_วิธีใช้"
+
+#: src/diffuse/window.py:833
+msgid "_Help Contents..."
+msgstr "เ_นื้อหาวิธีใช้..."
+
+#: src/diffuse/window.py:835
+#, python-format
+msgid "_About %s..."
+msgstr "เ_กี่ยวกับ %s..."
+
+#: src/diffuse/window.py:847
+msgid "New 2-Way File Merge"
+msgstr "การผสานแฟ้ม 2 ทางชุดใหม่"
+
+#: src/diffuse/window.py:848
+msgid "New 3-Way File Merge"
+msgstr "การผสานแฟ้ม 3 ทางชุดใหม่"
+
+#: src/diffuse/window.py:850
+msgid "Realign All"
+msgstr "จัดเรียงใหม่ทั้งหมด"
+
+#: src/diffuse/window.py:851
+msgid "First Difference"
+msgstr "ความแตกต่างแรก"
+
+#: src/diffuse/window.py:852
+msgid "Previous Difference"
+msgstr "ความแตกต่างก่อนหน้า"
+
+#: src/diffuse/window.py:853
+msgid "Next Difference"
+msgstr "ความแตกต่างถัดไป"
+
+#: src/diffuse/window.py:854
+msgid "Last Difference"
+msgstr "ความแตกต่างสุดท้าย"
+
+#: src/diffuse/window.py:856
+msgid "Copy Selection Right"
+msgstr "คัดลอกบรรทัดที่เลือกไปช่องขวา"
+
+#: src/diffuse/window.py:857
+msgid "Copy Selection Left"
+msgstr "คัดลอกบรรทัดที่เลือกไปช่องซ้าย"
+
+#: src/diffuse/window.py:858
+msgid "Copy Left Into Selection"
+msgstr "คัดลอกช่องซ้ายเข้าในบรรทัดที่เลือก"
+
+#: src/diffuse/window.py:859
+msgid "Copy Right Into Selection"
+msgstr "คัดลอกช่องขวาเข้าในบรรทัดที่เลือก"
+
+#: src/diffuse/window.py:860
+msgid "Merge From Left Then Right"
+msgstr "ผสานจากช่องซ้ายแล้วตามด้วยขวา"
+
+#: src/diffuse/window.py:861
+msgid "Merge From Right Then Left"
+msgstr "ผสานจากช่องขวาแล้วตามด้วยซ้าย"
+
+#: src/diffuse/window.py:863
+msgid "Undo"
+msgstr "เรียกคืน"
+
+#: src/diffuse/window.py:864
+msgid "Redo"
+msgstr "ทำซ้ำ"
+
+#: src/diffuse/window.py:950
+msgid "Changes detected"
+msgstr ""
+
+#: src/diffuse/window.py:954
+#, fuzzy, python-format
+msgid ""
+"The file \"%s\" changed on disk.\n"
+"\n"
+"Do you want to reload the file?"
+msgstr "แฟ้ม \"%s\" มีการเปลี่ยนแปลงในดิสก์ คุณต้องการโหลดแฟ้มซ้ำหรือไม่?"
+
+#: src/diffuse/window.py:959
+#, fuzzy, python-format
+msgid ""
+"The following files changed on disk:\n"
+"%s\n"
+"\n"
+"Do you want to reload these files?"
+msgstr "แฟ้ม \"%s\" มีการเปลี่ยนแปลงในดิสก์ คุณต้องการโหลดแฟ้มซ้ำหรือไม่?"
+
+#: src/diffuse/window.py:1078
+msgid "Some files have unsaved changes. Select the files to save before closing."
+msgstr "บางแฟ้มมีการเปลี่ยนแปลงที่ไม่ได้บันทึก เลือกแฟ้มเพื่อบันทึกก่อนปิด"
+
+#: src/diffuse/window.py:1092
+msgid "Tab"
+msgstr "แท็บ"
+
+#: src/diffuse/window.py:1097
+msgid "Pane"
+msgstr "ช่อง"
+
+#: src/diffuse/window.py:1108
+msgid "Close _Without Saving"
+msgstr "ปิ_ดโดยไม่บันทึก"
+
+#: src/diffuse/window.py:1147
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "การปิดแท็บนี้จะออกจาก %s"
+
+#: src/diffuse/window.py:1224
+#, python-format
+msgid "File Merge %d"
+msgstr "การผสานแฟ้ม %d"
+
+#: src/diffuse/window.py:1344
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "เกิดข้อผิดพลาดขณะดึง commit ต่างๆ สำหรับ %s"
+
+#: src/diffuse/window.py:1376
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "เกิดข้อผิดพลาดขณะดึงการเปลี่ยนแปลงสำหรับ %s"
+
+#: src/diffuse/window.py:1409
+msgid "Open File In New Tab"
+msgstr "เปิดแฟ้มในแท็บใหม่"
+
+#: src/diffuse/window.py:1432
+msgid "Choose Folder With Modified Files"
+msgstr "เลือกโฟลเดอร์ที่มีแฟ้มที่เปลี่ยนแปลง"
+
+#: src/diffuse/window.py:1450
+msgid "No modified files found."
+msgstr "ไม่พบแฟ้มที่เปลี่ยนแปลง"
+
+#: src/diffuse/window.py:1456
+msgid "Choose Folder With Commit"
+msgstr "เลือกโฟลเดอร์ที่มีการ commit"
+
+#: src/diffuse/window.py:1476
+msgid "No committed files found."
+msgstr "ไม่พบแฟ้มที่มีการ commit"
+
+#: src/diffuse/window.py:1512
+msgid "New N-Way File Merge..."
+msgstr "การผสานแฟ้ม N ทางชุดใหม่..."
+
+#: src/diffuse/window.py:1513
+msgid "Number of panes: "
+msgstr "จำนวนช่อง: "
+
+#: src/diffuse/window.py:1587
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "ไม่พบคำที่ค้น จะหาต่อจากท้ายแฟ้มหรือไม่?"
+
+#: src/diffuse/window.py:1589
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "ไม่พบคำที่ค้น จะหาต่อจากต้นแฟ้มหรือไม่?"
+
+#: src/diffuse/window.py:1762
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr "Diffuse เป็นเครื่องมือแบบกราฟิกสำหรับผสานและเปรียบเทียบแฟ้มข้อความ"
+
+#: src/diffuse/window.py:1766
+msgid "translator-credits"
+msgstr "Akom Chotiphantawanon <knight2000@gmail.com> "
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage:\n"
+#~ "    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"
+#~ "also retrieve revisions of files from several VCSs for comparison and "
+#~ "merging.\n"
+#~ "\n"
+#~ "Help Options:\n"
+#~ "  ( -h | -? | --help )             Display this usage information\n"
+#~ "  ( -v | --version )               Display version and copyright information\n"
+#~ "\n"
+#~ "Configuration Options:\n"
+#~ "  --no-rcfile                      Do not read any resource files\n"
+#~ "  --rcfile <file>                  Specify explicit resource file\n"
+#~ "\n"
+#~ "General Options:\n"
+#~ "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
+#~ "  ( -D | --close-if-same )         Close all tabs with no differences\n"
+#~ "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+#~ "  ( -L | --label ) <label>         Display <label> instead of the file name\n"
+#~ "  ( -m | --modified )              Create a new tab for each modified file\n"
+#~ "  ( -r | --revision ) <rev>        File revision <rev>\n"
+#~ "  ( -s | --separate )              Create a new tab for each file\n"
+#~ "  ( -t | --tab )                   Start a new tab\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    Start with line <line> selected\n"
+#~ "  --null-file                      Create a blank file comparison pane\n"
+#~ "\n"
+#~ "Display Options:\n"
+#~ "  ( -b | --ignore-space-change )   Ignore changes to white space\n"
+#~ "  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
+#~ "  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
+#~ "  ( -i | --ignore-case )           Ignore case differences\n"
+#~ "  ( -w | --ignore-all-space )      Ignore white space differences"
+#~ msgstr ""
+#~ "วิธีใช้:\n"
+#~ "    diffuse [ [ตัวเลือก...] [แฟ้ม...] ]...\n"
+#~ "    diffuse ( -h | -? | --help | -v | --version )\n"
+#~ "\n"
+#~ "Diffuse เป็นเครื่องมือแบบกราฟิกสำหรับผสานและเปรียบเทียบแฟ้มข้อความ  Diffuse\n"
+#~ "สามารถเปรียบเทียบแฟ้มจำนวนเท่าใดก็ได้โดยวางเทียบข้างกัน และให้ผู้ใช้สามารถ\n"
+#~ "ปรับการจับคู่บรรทัดด้วยมือ และแก้ไขแฟ้มได้โดยตรง นอกจากนี้ Diffuse ยังสามารถ\n"
+#~ "ดึงเอาฉบับแก้ไขต่างๆ ของแฟ้มจากคลัง Bazaar, CVS, Darcs, Git, Mercurial,\n"
+#~ "Monotone, RCS, Subversion, และ SVK มาเปรียบเทียบและผสานได้\n"
+#~ "\n"
+#~ "ตัวเลือกวิธีใช้:\n"
+#~ "  ( -h | -? | --help )             แสดงข้อมูลวิธีใช้นี้\n"
+#~ "  ( -v | --version )               แสดงรุ่นและข้อมูลลิขสิทธิ์\n"
+#~ "\n"
+#~ "ตัวเลือกค่าตั้ง:\n"
+#~ "  --no-rcfile                      ไม่ต้องอ่านแฟ้มทรัพยากรใดๆ\n"
+#~ "  --rcfile <file>                  เจาะจงแฟ้มทรัพยากรที่จะใช้\n"
+#~ "\n"
+#~ "ตัวเลือกทั่วไป:\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"
+#~ "  ( -r | --revision ) <rev>        แฟ้มฉบับแก้ไข <rev>\n"
+#~ "  ( -s | --separate )              สร้างแท็บแยกสำหรับแฟ้มแต่ละแฟ้ม\n"
+#~ "  ( -t | --tab )                   เปิดแท็บใหม่\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    เปิดโดยเลือกบรรทัด <line> ไว้\n"
+#~ "  --null-file                      สร้างช่องแฟ้มเปล่า\n"
+#~ "\n"
+#~ "ตัวเลือกการแสดงผล:\n"
+#~ "  ( -b | --ignore-space-change )   ไม่สนใจการเปลี่ยนแปลงของช่องว่าง\n"
+#~ "  ( -B | --ignore-blank-lines )    ไม่สนใจการเปลี่ยนแปลงในบรรทัดเปล่า\n"
+#~ "  ( -E | --ignore-end-of-line )    ไม่สนใจความแตกต่างของอักขระจบบรรทัด\n"
+#~ "  ( -i | --ignore-case )           ไม่สนใจความแตกต่างของตัวพิมพ์ใหญ่-เล็ก\n"
+#~ "  ( -w | --ignore-all-space )      ไม่สนใจความแตกต่างของช่องว่างทั้งหมด"
diff --git a/po/tr.po b/po/tr.po
index 4db7a1b..0bef73b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: io.github.mightycreak.Diffuse\n"
-"Report-Msgid-Bugs-To: https://github.com/MightyCreak/diffuse/issues\n"
-"POT-Creation-Date: 2022-10-23 20:00-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-04-16 14:09-0400\n"
 "PO-Revision-Date: 2022-11-19 03:14+0300\n"
 "Last-Translator: Sabri Ünal <libreajans@gmail.com>\n"
 "Language-Team: Türkçe <gnome-turk@gnome.org>\n"
@@ -30,844 +30,310 @@ msgid "Graphical tool for merging and comparing text files"
 msgstr "Metin dosyalarını birleştirmek ve karşılaştırmak için grafiksel araç"
 
 #: data/io.github.mightycreak.Diffuse.appdata.xml.in:7
+#, fuzzy
 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, and "
+"Subversion repositories."
 msgstr ""
 "Diffuse, metin dosyalarını karşılaştırmak ve birleştirmek için grafiksel bir "
-"araçtır. Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion ve "
-"SVK depolarından karşılaştırma için dosyaları alabilir."
+"araçtır. Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, ve Subversion "
+"depolarından karşılaştırma için dosyaları alabilir."
 
-#: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
-msgid "Main window: diff between two files"
-msgstr "Ana pencere: iki dosya arasında fark"
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:28
+msgid "Main window"
+msgstr ""
 
-#: src/diffuse/constants.py:25
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:32
+msgid "About window"
+msgstr ""
+
+#: src/diffuse/constants.py:26
 msgid "Copyright"
 msgstr "Telif Hakkı"
 
-#: src/diffuse/dialogs.py:40
-msgid "Diffuse is a graphical tool for merging and comparing text files."
+#: src/diffuse/dialogs.py:46 src/diffuse/dialogs.py:89 src/diffuse/dialogs.py:133
+#: src/diffuse/preferences.py:254 src/diffuse/preferences.py:483
+#: src/diffuse/window.py:309 src/diffuse/window.py:1107
+msgid "_Cancel"
 msgstr ""
-"Diffuse, metin dosyalarını birleştirmek ve karşılaştırmak için grafiksel bir "
-"araçtır."
 
-#: src/diffuse/dialogs.py:45
-msgid "translator-credits"
-msgstr "Sabri Ünal <libreajans@gmail.com>"
-
-#: src/diffuse/dialogs.py:82
+#: src/diffuse/dialogs.py:50
 msgid "Encoding: "
 msgstr "Kodlama: "
 
-#: src/diffuse/dialogs.py:94
+#: src/diffuse/dialogs.py:62
 msgid "Revision: "
 msgstr "Düzeltme: "
 
-#: src/diffuse/dialogs.py:156
+#: src/diffuse/dialogs.py:90 src/diffuse/dialogs.py:134
+#: src/diffuse/preferences.py:255
+msgid "_OK"
+msgstr ""
+
+#: src/diffuse/dialogs.py:130
 msgid "Find..."
 msgstr "Bul…"
 
-#: src/diffuse/dialogs.py:164
+#: src/diffuse/dialogs.py:140
 msgid "Search For: "
 msgstr "Şunu Ara: "
 
-#: src/diffuse/dialogs.py:189
+#: src/diffuse/dialogs.py:165
 msgid "Match Case"
 msgstr "Büyük/küçük Harf Eşleştir"
 
-#: src/diffuse/dialogs.py:194
+#: src/diffuse/dialogs.py:170
 msgid "Search Backwards"
 msgstr "Geriye Doğru Ara"
 
+#: src/diffuse/main.py:53
+msgid "Display version and copyright information"
+msgstr "Sürümü ve telif hakkı bilgilerini göster"
+
+#: src/diffuse/main.py:61
+msgid "Do not read any resource files"
+msgstr "Herhangi bir kaynak dosyasını okuma"
+
+#: src/diffuse/main.py:69
+msgid "Specify explicit resource file"
+msgstr "Açık kaynak dosyasını belirtin"
+
+#: src/diffuse/main.py:77
+msgid "File revisions <rev-1> and <rev>"
+msgstr "Dosya düzeltmesi <rev-1> ve <rev>"
+
 #: src/diffuse/main.py:85
-msgid "Close Tab"
-msgstr "Sekmeyi Kapat"
+#, fuzzy
+msgid "Close all tabs with no differences"
+msgstr "Fark yoksa sekmeleri kapat"
 
-#: src/diffuse/main.py:132
-msgid "Open File..."
-msgstr "Dosya Aç…"
+#: src/diffuse/main.py:92
+msgid "Use <codec> to read and write files"
+msgstr "Dosyaları okumak için <codec> kod çözücü kullan"
 
-#: src/diffuse/main.py:133
-msgid "Reload File"
-msgstr "Dosyayı Yeniden Yükle"
+#: src/diffuse/main.py:100
+msgid "Display <label> instead of the file name"
+msgstr "Dosya adı yerine <label> etiketini göster"
 
-#: src/diffuse/main.py:134
-msgid "Save File"
-msgstr "Dosyayı Kaydet"
+#: src/diffuse/main.py:108
+msgid "Create a new tab for each modified file"
+msgstr "Değiştirilen her dosya için yeni sekme oluştur"
 
-#: src/diffuse/main.py:135
-msgid "Save File As..."
-msgstr "Dosyayı Farklı Kaydet…"
+#: src/diffuse/main.py:115
+msgid "File revision <rev>"
+msgstr "Dosya düzeltmesi <rev>"
 
-#: src/diffuse/main.py:217
-#, python-format
-msgid "Column %d"
-msgstr "%d. sütun"
+#: src/diffuse/main.py:123
+msgid "Create a new tab for each file"
+msgstr "Her dosya için yeni sekme oluştur"
 
-#: src/diffuse/main.py:291
-msgid "Save changes before loading the new file?"
-msgstr "Yeni dosya yüklenmeden önce değişiklikler kaydedilsin mi?"
+#: src/diffuse/main.py:130
+msgid "Start a new tab"
+msgstr "Yeni sekme başlat"
 
-#: src/diffuse/main.py:402
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "%(file)s dosyasının %(rev)s düzeltmesi okunurken hata."
+#: src/diffuse/main.py:137 src/diffuse/preferences.py:159
+msgid "Version control system search order"
+msgstr "Sürüm denetim sistemi arama sırası"
 
-#: src/diffuse/main.py:405 src/diffuse/main.py:1860
+#: src/diffuse/main.py:145
+msgid "Start with line <line> selected"
+msgstr "<line> satırı seçiliyken başla"
+
+#: src/diffuse/main.py:153
+msgid "Create a blank file comparison pane"
+msgstr "Boş bir dosya karşılaştırma bölmesi oluştur"
+
+#: src/diffuse/main.py:160 src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:95
+msgid "Ignore changes to white space"
+msgstr "Boşluk değişikliklerini yoksay"
+
+#: src/diffuse/main.py:167
+msgid "Ignore changes in blank lines"
+msgstr "Boş satırlardaki değişiklikleri yoksay"
+
+#: src/diffuse/main.py:174 src/diffuse/preferences.py:88
+msgid "Ignore end of line differences"
+msgstr "Satır sonu farklarını yoksay"
+
+#: src/diffuse/main.py:181 src/diffuse/preferences.py:84
+msgid "Ignore case differences"
+msgstr "Büyük/Küçük harf farklarını yoksay"
+
+#: src/diffuse/main.py:188 src/diffuse/preferences.py:85
+msgid "Ignore white space differences"
+msgstr "Boşluk farklarını yoksay"
+
+#: src/diffuse/main.py:191
+msgid ""
+"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 several VCSs for comparison and merging."
+msgstr ""
+
+#: src/diffuse/main.py:247 src/diffuse/window.py:420
 #, python-format
 msgid "Error reading %s."
 msgstr "%s okunurken hata."
 
-#: src/diffuse/main.py:427
-msgid "Open File"
-msgstr "Dosya Aç"
-
-#: src/diffuse/main.py:484
-#, python-format
-msgid "The file %s changed on disk. Do you want to reload the file?"
-msgstr "%s dosyası diskte değişti. Dosyayı yeniden yüklemek ister misiniz?"
-
-#: src/diffuse/main.py:510
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "%(title)s Bölmesi %(pane)d Kaydet"
-
-#: src/diffuse/main.py:542
-#, python-format
-msgid "A file named %s already exists. Do you want to overwrite it?"
-msgstr "%s dosyası zaten mevcut. Üzerine yazmak istiyor musunuz?"
-
-#: src/diffuse/main.py:549
-#, 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 dosyası, okunduğundan beri başka bir süreç tarafından değiştirildi. "
-"Kaydederseniz, tüm harici değişiklikler kaybolacak. Yine de kaydedilsin mi?"
-
-#: src/diffuse/main.py:591
-#, python-format
-msgid "Error encoding to %s."
-msgstr "%s kodlama hatası."
-
-#: src/diffuse/main.py:595 src/diffuse/preferences.py:300
-#, python-format
-msgid "Error writing %s."
-msgstr "%s yazma hatası."
-
-#: src/diffuse/main.py:625
-msgid "Go To Line..."
-msgstr "Satıra Git…"
-
-#: src/diffuse/main.py:626
-msgid "Line Number: "
-msgstr "Satır Numarası: "
-
-#: src/diffuse/main.py:657
-msgid ""
-"Press the enter key or double click to edit. Press the space bar or use the "
-"RMB menu to manually align."
-msgstr ""
-"Düzenlemek için enter tuşuna basın veya çift tıklayın. Elle hizalamak için "
-"boşluk tuşana basın veya RMB menüsünü kullanın."
-
-#: src/diffuse/main.py:661
-msgid "Press the escape key to finish editing."
-msgstr "Düzenlemeyi bitirmek için Escape tuşuna basın."
-
-#: src/diffuse/main.py:664
-msgid ""
-"Select target line and press the space bar to align. Press the escape key to "
-"cancel."
-msgstr ""
-"Hedef satırı seçin ve hizalamak için boşluk çubuğuna basın. İptal etmek için "
-"Escape tuşuna basın."
-
-#: src/diffuse/main.py:787
-msgid "_File"
-msgstr "_Dosya"
-
-#: src/diffuse/main.py:788
-msgid "_Open File..."
-msgstr "Dosya _Aç..."
-
-#: src/diffuse/main.py:789
-msgid "Open File In New _Tab..."
-msgstr "Dosyayı Yeni _Sekmede Aç..."
-
-#: src/diffuse/main.py:790
-msgid "Open _Modified Files..."
-msgstr "_Değiştirilen Dosyaları Aç..."
-
-#: src/diffuse/main.py:791
-msgid "Open Commi_t..."
-msgstr "Gön_deri Aç..."
-
-#: src/diffuse/main.py:792
-msgid "_Reload File"
-msgstr "Dosyayı _Yeniden Yükle"
-
-#: src/diffuse/main.py:794
-msgid "_Save File"
-msgstr "Dosyayı _Kaydet"
-
-#: src/diffuse/main.py:795
-msgid "Save File _As..."
-msgstr "Dosyayı _Farklı Kaydet…"
-
-#: src/diffuse/main.py:796
-msgid "Save A_ll"
-msgstr "T_ümünü Kaydet"
-
-#: src/diffuse/main.py:798
-msgid "New _2-Way File Merge"
-msgstr "Yeni _2 Yönlü Dosya Birleştirme"
-
-#: src/diffuse/main.py:799
-msgid "New _3-Way File Merge"
-msgstr "Yeni _3 Yönlü Dosya Birleştirme"
-
-#: src/diffuse/main.py:800
-msgid "New _N-Way File Merge..."
-msgstr "Yeni _N Yönlü Dosya Birleştirme"
-
-#: src/diffuse/main.py:802
-msgid "_Close Tab"
-msgstr "_Sekmeyi Kapat"
-
-#: src/diffuse/main.py:803
-msgid "_Undo Close Tab"
-msgstr "Sekmeyı Kapatmayı _Geri Al"
-
-#: src/diffuse/main.py:804
-msgid "_Quit"
-msgstr "Çı_k"
-
-#: src/diffuse/main.py:807
-msgid "_Edit"
-msgstr "_Düzenle"
-
-#: src/diffuse/main.py:808
-msgid "_Undo"
-msgstr "_Geri Al"
-
-#: src/diffuse/main.py:809
-msgid "_Redo"
-msgstr "_Yinele"
-
-#: src/diffuse/main.py:811
-msgid "Cu_t"
-msgstr "Ke_s"
-
-#: src/diffuse/main.py:812
-msgid "_Copy"
-msgstr "Ko_pyala"
-
-#: src/diffuse/main.py:813
-msgid "_Paste"
-msgstr "_Yapıştır"
-
-#: src/diffuse/main.py:815
-msgid "Select _All"
-msgstr "_Tümünü Seç"
-
-#: src/diffuse/main.py:816
-msgid "C_lear Edits"
-msgstr "Düzenlemeleri _Temizle"
-
-#: src/diffuse/main.py:817
-msgid "_Dismiss All Edits"
-msgstr "Tüm Düzenlemelerden _Vazgeç"
-
-#: src/diffuse/main.py:819
-msgid "_Find..."
-msgstr "Bul..."
-
-#: src/diffuse/main.py:820
-msgid "Find _Next"
-msgstr "_Sonrakini Bul"
-
-#: src/diffuse/main.py:821
-msgid "Find Pre_vious"
-msgstr "Öncekini B_ul"
-
-#: src/diffuse/main.py:822
-msgid "_Go To Line..."
-msgstr "Satıra _Git…"
-
-#: src/diffuse/main.py:824
-msgid "Pr_eferences..."
-msgstr "_Tercihler…"
-
-#: src/diffuse/main.py:828
-msgid "None"
-msgstr "Hiçbiri"
-
-#: src/diffuse/main.py:846
-msgid "_View"
-msgstr "_Görünüm"
-
-#: src/diffuse/main.py:847
-msgid "_Syntax Highlighting"
-msgstr "_Söz Dizimi Vurgulaması"
-
-#: src/diffuse/main.py:849
-msgid "Re_align All"
-msgstr "_Tümünü Yeniden Hizala"
-
-#: src/diffuse/main.py:850
-msgid "_Isolate"
-msgstr "_Yalıt"
-
-#: src/diffuse/main.py:852
-msgid "_First Difference"
-msgstr "İlk _Fark"
-
-#: src/diffuse/main.py:853
-msgid "_Previous Difference"
-msgstr "_Önceki Fark"
-
-#: src/diffuse/main.py:854
-msgid "_Next Difference"
-msgstr "_Sonraki Fark"
-
-#: src/diffuse/main.py:855
-msgid "_Last Difference"
-msgstr "_Son Fark"
-
-#: src/diffuse/main.py:857
-msgid "Fir_st Tab"
-msgstr "_İlk Sekme"
-
-#: src/diffuse/main.py:858
-msgid "Pre_vious Tab"
-msgstr "_Önceki Sekme"
-
-#: src/diffuse/main.py:859
-msgid "Next _Tab"
-msgstr "Sonraki _Sekme"
-
-#: src/diffuse/main.py:860
-msgid "Las_t Tab"
-msgstr "So_n Sekme"
-
-#: src/diffuse/main.py:862
-msgid "Shift Pane _Right"
-msgstr "_Sağ Bölmeye Geç"
-
-#: src/diffuse/main.py:863
-msgid "Shift Pane _Left"
-msgstr "_Sol Bölmeye Geç"
-
-#: src/diffuse/main.py:866
-msgid "F_ormat"
-msgstr "_Biçemlendir"
-
-#: src/diffuse/main.py:867
-msgid "Convert To _Upper Case"
-msgstr "_Büyük Harfe Dönüştür"
-
-#: src/diffuse/main.py:868
-msgid "Convert To _Lower Case"
-msgstr "_Küçük Harfe Dönüştür"
-
-#: src/diffuse/main.py:870
-msgid "Sort Lines In _Ascending Order"
-msgstr "Satırları _Artan Düzenle Sırala"
-
-#: src/diffuse/main.py:871
-msgid "Sort Lines In D_escending Order"
-msgstr "Satırları A_zalan Düzenle Sırala"
-
-#: src/diffuse/main.py:873
-msgid "Remove Trailing _White Space"
-msgstr "Sondaki _Boşlukları Kaldır"
-
-#: src/diffuse/main.py:874
-msgid "Convert Tabs To _Spaces"
-msgstr "Sekmeleri _Boşluklara Dönüştür"
-
-#: src/diffuse/main.py:875
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "Baştaki Boşlukları _Sekmelere Dönüştür"
-
-#: src/diffuse/main.py:877
-msgid "_Increase Indenting"
-msgstr "Girintiyi _Arttır"
-
-#: src/diffuse/main.py:878
-msgid "De_crease Indenting"
-msgstr "Girintiyi A_zalt"
-
-#: src/diffuse/main.py:880
-msgid "Convert To _DOS Format"
-msgstr "_DOS Biçimine Dönüştür"
-
-#: src/diffuse/main.py:881
-msgid "Convert To _Mac Format"
-msgstr "_MAC Biçimine Dönüştür"
-
-#: src/diffuse/main.py:882
-msgid "Convert To Uni_x Format"
-msgstr "Uni_x Biçimine Dönüştür"
-
-#: src/diffuse/main.py:885
-msgid "_Merge"
-msgstr "_Birleştir"
-
-#: src/diffuse/main.py:886
-msgid "Copy Selection _Right"
-msgstr "Seçimi _Sağa Kopyala"
-
-#: src/diffuse/main.py:887
-msgid "Copy Selection _Left"
-msgstr "Seçimi _Sola Kopyala"
-
-#: src/diffuse/main.py:889
-msgid "Copy Left _Into Selection"
-msgstr "Solu _Seçime Kopyala"
-
-#: src/diffuse/main.py:890
-msgid "Copy Right I_nto Selection"
-msgstr "Sağı _Seçime Kopyala"
-
-#: src/diffuse/main.py:891
-msgid "_Merge From Left Then Right"
-msgstr "_Soldan Sonra Sağdan Birleştir"
-
-#: src/diffuse/main.py:892
-msgid "M_erge From Right Then Left"
-msgstr "_Sağdan Sonra Soldan Birleştir"
-
-#: src/diffuse/main.py:895
-msgid "_Help"
-msgstr "_Yardım"
-
-#: src/diffuse/main.py:896
-msgid "_Help Contents..."
-msgstr "Yardım İçerikleri..."
-
-#: src/diffuse/main.py:898
-#, python-format
-msgid "_About %s..."
-msgstr "%s Hakkında..."
-
-#: src/diffuse/main.py:913
-msgid "New 2-Way File Merge"
-msgstr "Yeni 2 Yönlü Dosya Birleştirme"
-
-#: src/diffuse/main.py:914
-msgid "New 3-Way File Merge"
-msgstr "Yeni 3 Yönlü Dosya Birleştirme"
-
-#: src/diffuse/main.py:916
-msgid "Realign All"
-msgstr "Tümünü Yeniden Hizala"
-
-#: src/diffuse/main.py:917
-msgid "First Difference"
-msgstr "İlk Fark"
-
-#: src/diffuse/main.py:918
-msgid "Previous Difference"
-msgstr "Önceki Fark"
-
-#: src/diffuse/main.py:919
-msgid "Next Difference"
-msgstr "Sonraki Fark"
-
-#: src/diffuse/main.py:920
-msgid "Last Difference"
-msgstr "Son Fark"
-
-#: src/diffuse/main.py:922
-msgid "Copy Selection Right"
-msgstr "Seçimi Sağa Kopyala"
-
-#: src/diffuse/main.py:923
-msgid "Copy Selection Left"
-msgstr "Seçimi Sola Kopyala"
-
-#: src/diffuse/main.py:924
-msgid "Copy Left Into Selection"
-msgstr "Solu Seçime Kopyala"
-
-#: src/diffuse/main.py:925
-msgid "Copy Right Into Selection"
-msgstr "Sağı Seçime Kopyala"
-
-#: src/diffuse/main.py:926
-msgid "Merge From Left Then Right"
-msgstr "Soldan Sonra Sağdan Birleştir"
-
-#: src/diffuse/main.py:927
-msgid "Merge From Right Then Left"
-msgstr "Sağdan Sonra Soldan Birleştir"
-
-#: src/diffuse/main.py:929
-msgid "Undo"
-msgstr "Geri Al"
-
-#: src/diffuse/main.py:930
-msgid "Redo"
-msgstr "Yinele"
-
-#: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
-msgid "Cut"
-msgstr "Kes"
-
-#: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
-msgid "Copy"
-msgstr "Kopyala"
-
-#: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
-msgid "Paste"
-msgstr "Yapıştır"
-
-#: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
-msgid "Clear Edits"
-msgstr "Düzenlemeleri Temizle"
-
-#: src/diffuse/main.py:1057
-msgid ""
-"Some files have unsaved changes. Select the files to save before closing."
-msgstr ""
-"Bazı dosyalarda kaydedilmemiş değişiklikler var. Kapatmadan önce "
-"kaydedilecek dosyaları seçin."
-
-#: src/diffuse/main.py:1071
-msgid "Tab"
-msgstr "Sekme"
-
-#: src/diffuse/main.py:1076
-msgid "Pane"
-msgstr "Bölme"
-
-#: src/diffuse/main.py:1087
-msgid "Close _Without Saving"
-msgstr "Ka_ydetmeden Kapat"
-
-#: src/diffuse/main.py:1126
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "Bu sekmeyi kapatılmak %s uygulamasından da çıkış yapar."
-
-#: src/diffuse/main.py:1209
-#, python-format
-msgid "File Merge %d"
-msgstr "Dosya Birleştirme %d"
-
-#: src/diffuse/main.py:1315
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "%s gönderileri alınırken hata."
-
-#: src/diffuse/main.py:1347
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "%s değişiklikleri alınırken hata."
-
-#: src/diffuse/main.py:1380
-msgid "Open File In New Tab"
-msgstr "Dosyayı Yeni Sekmede Aç"
-
-#: src/diffuse/main.py:1403
-msgid "Choose Folder With Modified Files"
-msgstr "Değiştirilmiş Dosyaların Bulunduğu Klasörü Seç"
-
-#: src/diffuse/main.py:1421
-msgid "No modified files found."
-msgstr "Değiştirilmiş dosya bulunamadı."
-
-#: src/diffuse/main.py:1427
-msgid "Choose Folder With Commit"
-msgstr "Gönderiyle Klasör Seç"
-
-#: src/diffuse/main.py:1447
-msgid "No committed files found."
-msgstr "Gönderilmiş dosya bulunamadı."
-
-#: src/diffuse/main.py:1483
-msgid "New N-Way File Merge..."
-msgstr "Yeni N Yönlü Dosya Birleştirme"
-
-#: src/diffuse/main.py:1484
-msgid "Number of panes: "
-msgstr "Bölme sayısı: "
-
-#: src/diffuse/main.py:1558
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "İfade bulunamadı. Dosyanın sonundan devam edilsin mi?"
-
-#: src/diffuse/main.py:1560
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "İfade bulunamadı. Dosyanın başından devam edilsin mi?"
-
-#: src/diffuse/main.py:1781
-msgid ""
-"Usage:\n"
-"    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"
-"also retrieve revisions of files from several VCSs for comparison and "
-"merging.\n"
-"\n"
-"Help Options:\n"
-"  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright "
-"information\n"
-"\n"
-"Configuration Options:\n"
-"  --no-rcfile                      Do not read any resource files\n"
-"  --rcfile <file>                  Specify explicit resource file\n"
-"\n"
-"General Options:\n"
-"  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
-"  ( -D | --close-if-same )         Close all tabs with no differences\n"
-"  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
-"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
-"  ( -m | --modified )              Create a new tab for each modified file\n"
-"  ( -r | --revision ) <rev>        File revision <rev>\n"
-"  ( -s | --separate )              Create a new tab for each file\n"
-"  ( -t | --tab )                   Start a new tab\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    Start with line <line> selected\n"
-"  --null-file                      Create a blank file comparison pane\n"
-"\n"
-"Display Options:\n"
-"  ( -b | --ignore-space-change )   Ignore changes to white space\n"
-"  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
-"  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
-"  ( -i | --ignore-case )           Ignore case differences\n"
-"  ( -w | --ignore-all-space )      Ignore white space differences"
-msgstr ""
-"Kullanım:\n"
-"    diffuse [SEÇENEK...] [DOSYA...]\n"
-"    diffuse ( -h | -? | --help | -v | --version )\n"
-"\n"
-"Diffuse, metin dosyalarını birleştirmek ve karşılaştırmak için grafiksel bir "
-"araçtır.\n"
-"Diffuse, tercih edilen sayıda dosyayı yan yana karşılaştırabilir ve "
-"kullanıcılara\n"
-"satır eşleştirmeyi elle ayarlama ve dosyaları doğrudan düzenleme yeteneği "
-"kazandırır.\n"
-"Diffuse, karşılaştırma ve birleştirme için çeşitli Sürüm Denetim Sistemi "
-"dosyaların\n"
-"düzeltmelerini de alabilir.\n"
-"\n"
-"Yardım Seçenekleri:\n"
-"  ( -h | -? | --help )             Bu kullanım bilgilerini göster\n"
-"  ( -v | --version )               Sürümü ve telif hakkı bilgilerini göster\n"
-"\n"
-"Yapılandırma Seçenekleri:\n"
-"  --no-rcfile                      Herhangi bir kaynak dosyasını okuma\n"
-"  --rcfile <file>                  Açık kaynak dosyasını belirtin\n"
-"\n"
-"Genel Seçenekler:\n"
-"  ( -c | --commit ) <rev>          Dosya düzeltmesi <rev-1> ve <rev>\n"
-"  ( -D | --close-if-same )         Fark yoksa sekmeleri kapat\n"
-"  ( -e | --encoding ) <codec>      Dosyaları okumak için <codec> kod çözücü "
-"kullan\n"
-"  ( -L | --label ) <label>         Dosya adı yerine <label> etiketini "
-"göster\n"
-"  ( -m | --modified )              Değiştirilen her dosya için yeni sekme "
-"oluştur\n"
-"  ( -r | --revision ) <rev>        Dosya düzeltmesi <rev>\n"
-"  ( -s | --separate )              Her dosya için yeni sekme oluştur\n"
-"  ( -t | --tab )                   Yeni sekme başlat\n"
-"  ( -V | --vcs ) <vcs-list>        Sürüm denetimi sistemi arama sırası\n"
-"  --line <line>                    <line> satırı seçiliyken başla\n"
-"  --null-file                      Boş bir dosya karşılaştırma bölmesi "
-"oluştur\n"
-"\n"
-"Görünüm Seçenekleri:\n"
-"  ( -b | --ignore-space-change )   Boşluk değişikliklerini yoksay\n"
-"  ( -B | --ignore-blank-lines )    Boş satırlardaki değişiklikleri yoksay\n"
-"  ( -E | --ignore-end-of-line )    Satır sonu farklarını yoksay\n"
-"  ( -i | --ignore-case )           Büyük/Küçük harf farklarını yoksay\n"
-"  ( -w | --ignore-all-space )      Boşluk farklarını yoksay"
-
-#: src/diffuse/main.py:1948
+#: src/diffuse/main.py:327
 msgid "Error parsing line number."
 msgstr "Satır numarası ayrıştırılırma hatası."
 
-#: src/diffuse/main.py:1958
-#, python-format
-msgid "Skipping unknown argument \"%s\"."
-msgstr "Bilinmeyen \"%s\" argümanı atlanıyor."
-
-#: src/diffuse/main.py:1966
+#: src/diffuse/main.py:343
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "\"%s\" argümanı işlenirken hata. Dizin beklenmiyor."
 
-#: src/diffuse/preferences.py:80
+#: src/diffuse/preferences.py:75
 msgid "Display"
 msgstr "Görünüm"
 
-#: src/diffuse/preferences.py:83
+#: src/diffuse/preferences.py:78
 msgid "Font"
 msgstr "Yazı Tipi"
 
-#: src/diffuse/preferences.py:84
+#: src/diffuse/preferences.py:79
 msgid "Tab width"
 msgstr "Sekme genişliği"
 
-#: src/diffuse/preferences.py:85
+#: src/diffuse/preferences.py:80
 msgid "Show right margin"
 msgstr "Sağ kenar boşluğunu göster"
 
-#: src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:81
 msgid "Right margin"
 msgstr "Sağ kenar boşluğu"
 
-#: src/diffuse/preferences.py:87
+#: src/diffuse/preferences.py:82
 msgid "Show line numbers"
 msgstr "Satır numaralarını göster"
 
-#: src/diffuse/preferences.py:88
+#: src/diffuse/preferences.py:83
 msgid "Show white space characters"
 msgstr "Boşluk karakterlerini yoksay"
 
-#: src/diffuse/preferences.py:89
-msgid "Ignore case differences"
-msgstr "Büyük/Küçük harf farklarını yoksay"
-
-#: src/diffuse/preferences.py:90
-msgid "Ignore white space differences"
-msgstr "Boşluk farklarını yoksay"
-
-#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100
-msgid "Ignore changes to white space"
-msgstr "Boşluk değişikliklerini yoksay"
-
-#: src/diffuse/preferences.py:92
+#: src/diffuse/preferences.py:87
 msgid "Ignore blank line differences"
 msgstr "Boş satır farklarını yoksay"
 
-#: src/diffuse/preferences.py:93
-msgid "Ignore end of line differences"
-msgstr "Satır sonu farklarını yoksay"
-
-#: src/diffuse/preferences.py:95
+#: src/diffuse/preferences.py:90
 msgid "Alignment"
 msgstr "Hizalama"
 
-#: src/diffuse/preferences.py:98
+#: src/diffuse/preferences.py:93
 msgid "Ignore case"
 msgstr "Büyük/Küçük harfi yoksay"
 
-#: src/diffuse/preferences.py:99
+#: src/diffuse/preferences.py:94
 msgid "Ignore white space"
 msgstr "Boşlukları yoksay"
 
-#: src/diffuse/preferences.py:101
+#: src/diffuse/preferences.py:96
 msgid "Ignore blank lines"
 msgstr "Boş satırları yoksay"
 
-#: src/diffuse/preferences.py:102
+#: src/diffuse/preferences.py:97
 msgid "Ignore end of line characters"
 msgstr "Satır sonu karakterlerini yoksay"
 
-#: src/diffuse/preferences.py:104
+#: src/diffuse/preferences.py:99
 msgid "Editor"
 msgstr "Düzenleyici"
 
-#: src/diffuse/preferences.py:107
+#: src/diffuse/preferences.py:102
 msgid "Auto indent"
 msgstr "Kendiliğinden girinti"
 
-#: src/diffuse/preferences.py:108
+#: src/diffuse/preferences.py:103
 msgid "Expand tabs to spaces"
 msgstr "Sekmeleri boşluklara genişlet"
 
-#: src/diffuse/preferences.py:109
+#: src/diffuse/preferences.py:104
 msgid "Soft tab width"
 msgstr "Yumuşak sekme genişliği"
 
-#: src/diffuse/preferences.py:111
+#: src/diffuse/preferences.py:106
 msgid "Tabs"
 msgstr "Sekmeler"
 
-#: src/diffuse/preferences.py:114
+#: src/diffuse/preferences.py:109
 msgid "Default panes"
 msgstr "Öntanımlı bölmeler"
 
-#: src/diffuse/preferences.py:115
+#: src/diffuse/preferences.py:110
 msgid "Always show the tab bar"
 msgstr "Sekme çubuğunu her zaman göster"
 
-#: src/diffuse/preferences.py:116
+#: src/diffuse/preferences.py:111
 #, python-format
 msgid "Warn me when closing a tab will quit %s"
-msgstr ""
-"%s uygulamasından çıkmaya neden olacak bir sekmeyi kapatırken beni uyar"
+msgstr "%s uygulamasından çıkmaya neden olacak bir sekmeyi kapatırken beni uyar"
 
-#: src/diffuse/preferences.py:118
+#: src/diffuse/preferences.py:113
 msgid "Regional Settings"
 msgstr "Bölgesel Ayarlar"
 
-#: src/diffuse/preferences.py:121
+#: src/diffuse/preferences.py:116
 msgid "Default codec"
 msgstr "Öntanımlı çöcücü"
 
-#: src/diffuse/preferences.py:122
+#: src/diffuse/preferences.py:117
 msgid "Order of codecs used to identify encoding"
 msgstr "Kodlamayı tanımlamak için kullanılan çözücülerin sırası"
 
-#: src/diffuse/preferences.py:143
+#: src/diffuse/preferences.py:138
 msgid "Cygwin"
 msgstr "Cygwin"
 
-#: src/diffuse/preferences.py:145
+#: src/diffuse/preferences.py:140
 msgid "Root directory"
 msgstr "Kök dizini"
 
-#: src/diffuse/preferences.py:146
+#: src/diffuse/preferences.py:141
 msgid "Cygdrive prefix"
 msgstr "Cygdrive öneki"
 
-#: src/diffuse/preferences.py:165
-msgid "Version control system search order"
-msgstr "Sürüm denetim sistemi arama sırası"
-
-#: src/diffuse/preferences.py:173
+#: src/diffuse/preferences.py:167
 msgid "\"co\" command"
 msgstr "\"co\" komutu"
 
-#: src/diffuse/preferences.py:174
+#: src/diffuse/preferences.py:168
 msgid "\"rlog\" command"
 msgstr "\"rlog\" komutu"
 
-#: src/diffuse/preferences.py:176
+#: src/diffuse/preferences.py:170
 msgid "Command"
 msgstr "Komut"
 
-#: src/diffuse/preferences.py:182
+#: src/diffuse/preferences.py:176
 msgid "Launch from a Bash login shell"
 msgstr "Bash giriş kabuğundan başlat"
 
-#: src/diffuse/preferences.py:189
+#: src/diffuse/preferences.py:183
 msgid "Update paths for Cygwin"
 msgstr "Cygwin yollarını güncelle"
 
-#: src/diffuse/preferences.py:194
+#: src/diffuse/preferences.py:188
 msgid "Version Control"
 msgstr "Sürüm Denetimi"
 
-#: src/diffuse/preferences.py:259
+#: src/diffuse/preferences.py:253
 msgid "Preferences"
 msgstr "Tercihler"
 
+#: src/diffuse/preferences.py:294 src/diffuse/window.py:580
+#, python-format
+msgid "Error writing %s."
+msgstr "%s yazma hatası."
+
+#: src/diffuse/preferences.py:483 src/diffuse/window.py:446
+#: src/diffuse/window.py:1413 src/diffuse/window.py:1436 src/diffuse/window.py:1459
+msgid "_Open"
+msgstr ""
+
 #: src/diffuse/resources.py:242 src/diffuse/resources.py:246
 #: src/diffuse/resources.py:249
 #, python-brace-format
@@ -953,17 +419,11 @@ msgstr "{file} dosyasının {line}. satırında işlenmeyen hata."
 msgid "Auto Detect"
 msgstr "Kendiliğinden Algıla"
 
-#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63
-#: src/diffuse/vcs/svn.py:97
+#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:96
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "%s düzeltmesi ayrıştırılırken hata."
 
-#: src/diffuse/vcs/vcs_registry.py:238
-#, python-format
-msgid "Error parsing %s."
-msgstr "%s ayrıştırma hatası."
-
 #: src/diffuse/widgets.py:1857
 msgid "Align with Selection"
 msgstr "Seçimle Hizala"
@@ -976,10 +436,650 @@ msgstr "Yalıt"
 msgid "Merge Selection"
 msgstr "Seçimi Birleştir"
 
+#: src/diffuse/widgets.py:1861 src/diffuse/window.py:865
+msgid "Cut"
+msgstr "Kes"
+
+#: src/diffuse/widgets.py:1862 src/diffuse/window.py:866
+msgid "Copy"
+msgstr "Kopyala"
+
+#: src/diffuse/widgets.py:1863 src/diffuse/window.py:867
+msgid "Paste"
+msgstr "Yapıştır"
+
 #: src/diffuse/widgets.py:1865
 msgid "Select All"
 msgstr "Tümünü Seç"
 
+#: src/diffuse/widgets.py:1866 src/diffuse/window.py:868
+msgid "Clear Edits"
+msgstr "Düzenlemeleri Temizle"
+
 #: src/diffuse/widgets.py:1868
 msgid "Swap with Selected Pane"
 msgstr "Seçilen Bölmeyle Değiştir"
+
+#: src/diffuse/window.py:83
+msgid "Close Tab"
+msgstr "Sekmeyi Kapat"
+
+#: src/diffuse/window.py:126
+msgid "Open File..."
+msgstr "Dosya Aç…"
+
+#: src/diffuse/window.py:127
+msgid "Reload File"
+msgstr "Dosyayı Yeniden Yükle"
+
+#: src/diffuse/window.py:128
+msgid "Save File"
+msgstr "Dosyayı Kaydet"
+
+#: src/diffuse/window.py:129
+msgid "Save File As..."
+msgstr "Dosyayı Farklı Kaydet…"
+
+#: src/diffuse/window.py:228
+#, python-format
+msgid "Column %d"
+msgstr "%d. sütun"
+
+#: src/diffuse/window.py:306
+msgid "Save changes before loading the new file?"
+msgstr "Yeni dosya yüklenmeden önce değişiklikler kaydedilsin mi?"
+
+#: src/diffuse/window.py:310
+msgid "_No"
+msgstr ""
+
+#: src/diffuse/window.py:311
+msgid "_Yes"
+msgstr ""
+
+#: src/diffuse/window.py:417
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "%(file)s dosyasının %(rev)s düzeltmesi okunurken hata."
+
+#: src/diffuse/window.py:442
+msgid "Open File"
+msgstr "Dosya Aç"
+
+#: src/diffuse/window.py:495
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "%(title)s Bölmesi %(pane)d Kaydet"
+
+#: src/diffuse/window.py:499 src/diffuse/window.py:1111
+#, fuzzy
+msgid "_Save"
+msgstr "Dosyayı _Kaydet"
+
+#: src/diffuse/window.py:527
+#, python-format
+msgid "A file named %s already exists. Do you want to overwrite it?"
+msgstr "%s dosyası zaten mevcut. Üzerine yazmak istiyor musunuz?"
+
+#: src/diffuse/window.py:534
+#, 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 dosyası, okunduğundan beri başka bir süreç tarafından değiştirildi. "
+"Kaydederseniz, tüm harici değişiklikler kaybolacak. Yine de kaydedilsin mi?"
+
+#: src/diffuse/window.py:576
+#, python-format
+msgid "Error encoding to %s."
+msgstr "%s kodlama hatası."
+
+#: src/diffuse/window.py:610
+msgid "Go To Line..."
+msgstr "Satıra Git…"
+
+#: src/diffuse/window.py:611
+msgid "Line Number: "
+msgstr "Satır Numarası: "
+
+#: src/diffuse/window.py:642
+msgid ""
+"Press the enter key or double click to edit. Press the space bar or use the RMB "
+"menu to manually align."
+msgstr ""
+"Düzenlemek için enter tuşuna basın veya çift tıklayın. Elle hizalamak için boşluk "
+"tuşana basın veya RMB menüsünü kullanın."
+
+#: src/diffuse/window.py:646
+msgid "Press the escape key to finish editing."
+msgstr "Düzenlemeyi bitirmek için Escape tuşuna basın."
+
+#: src/diffuse/window.py:649
+msgid ""
+"Select target line and press the space bar to align. Press the escape key to "
+"cancel."
+msgstr ""
+"Hedef satırı seçin ve hizalamak için boşluk çubuğuna basın. İptal etmek için "
+"Escape tuşuna basın."
+
+#: src/diffuse/window.py:710
+msgid "_File"
+msgstr "_Dosya"
+
+#: src/diffuse/window.py:712
+msgid "_Open File..."
+msgstr "Dosya _Aç..."
+
+#: src/diffuse/window.py:713
+msgid "Open File In New _Tab..."
+msgstr "Dosyayı Yeni _Sekmede Aç..."
+
+#: src/diffuse/window.py:714
+msgid "Open _Modified Files..."
+msgstr "_Değiştirilen Dosyaları Aç..."
+
+#: src/diffuse/window.py:715
+msgid "Open Commi_t..."
+msgstr "Gön_deri Aç..."
+
+#: src/diffuse/window.py:716
+msgid "_Reload File"
+msgstr "Dosyayı _Yeniden Yükle"
+
+#: src/diffuse/window.py:718
+msgid "_Save File"
+msgstr "Dosyayı _Kaydet"
+
+#: src/diffuse/window.py:719
+msgid "Save File _As..."
+msgstr "Dosyayı _Farklı Kaydet…"
+
+#: src/diffuse/window.py:720
+msgid "Save A_ll"
+msgstr "T_ümünü Kaydet"
+
+#: src/diffuse/window.py:722
+msgid "New _2-Way File Merge"
+msgstr "Yeni _2 Yönlü Dosya Birleştirme"
+
+#: src/diffuse/window.py:723
+msgid "New _3-Way File Merge"
+msgstr "Yeni _3 Yönlü Dosya Birleştirme"
+
+#: src/diffuse/window.py:724
+msgid "New _N-Way File Merge..."
+msgstr "Yeni _N Yönlü Dosya Birleştirme"
+
+#: src/diffuse/window.py:726
+msgid "_Close Tab"
+msgstr "_Sekmeyi Kapat"
+
+#: src/diffuse/window.py:727
+msgid "_Undo Close Tab"
+msgstr "Sekmeyı Kapatmayı _Geri Al"
+
+#: src/diffuse/window.py:728
+msgid "_Quit"
+msgstr "Çı_k"
+
+#: src/diffuse/window.py:732
+msgid "_Edit"
+msgstr "_Düzenle"
+
+#: src/diffuse/window.py:734
+msgid "_Undo"
+msgstr "_Geri Al"
+
+#: src/diffuse/window.py:735
+msgid "_Redo"
+msgstr "_Yinele"
+
+#: src/diffuse/window.py:737
+msgid "Cu_t"
+msgstr "Ke_s"
+
+#: src/diffuse/window.py:738
+msgid "_Copy"
+msgstr "Ko_pyala"
+
+#: src/diffuse/window.py:739
+msgid "_Paste"
+msgstr "_Yapıştır"
+
+#: src/diffuse/window.py:741
+msgid "Select _All"
+msgstr "_Tümünü Seç"
+
+#: src/diffuse/window.py:742
+msgid "C_lear Edits"
+msgstr "Düzenlemeleri _Temizle"
+
+#: src/diffuse/window.py:743
+msgid "_Dismiss All Edits"
+msgstr "Tüm Düzenlemelerden _Vazgeç"
+
+#: src/diffuse/window.py:745
+msgid "_Find..."
+msgstr "Bul..."
+
+#: src/diffuse/window.py:746
+msgid "Find _Next"
+msgstr "_Sonrakini Bul"
+
+#: src/diffuse/window.py:747
+msgid "Find Pre_vious"
+msgstr "Öncekini B_ul"
+
+#: src/diffuse/window.py:748
+msgid "_Go To Line..."
+msgstr "Satıra _Git…"
+
+#: src/diffuse/window.py:750
+msgid "Pr_eferences..."
+msgstr "_Tercihler…"
+
+#: src/diffuse/window.py:754
+msgid "None"
+msgstr "Hiçbiri"
+
+#: src/diffuse/window.py:776
+msgid "_View"
+msgstr "_Görünüm"
+
+#: src/diffuse/window.py:778
+msgid "_Syntax Highlighting"
+msgstr "_Söz Dizimi Vurgulaması"
+
+#: src/diffuse/window.py:780
+msgid "Re_align All"
+msgstr "_Tümünü Yeniden Hizala"
+
+#: src/diffuse/window.py:781
+msgid "_Isolate"
+msgstr "_Yalıt"
+
+#: src/diffuse/window.py:783
+msgid "_First Difference"
+msgstr "İlk _Fark"
+
+#: src/diffuse/window.py:784
+msgid "_Previous Difference"
+msgstr "_Önceki Fark"
+
+#: src/diffuse/window.py:785
+msgid "_Next Difference"
+msgstr "_Sonraki Fark"
+
+#: src/diffuse/window.py:786
+msgid "_Last Difference"
+msgstr "_Son Fark"
+
+#: src/diffuse/window.py:788
+msgid "Fir_st Tab"
+msgstr "_İlk Sekme"
+
+#: src/diffuse/window.py:789
+msgid "Pre_vious Tab"
+msgstr "_Önceki Sekme"
+
+#: src/diffuse/window.py:790
+msgid "Next _Tab"
+msgstr "Sonraki _Sekme"
+
+#: src/diffuse/window.py:791
+msgid "Las_t Tab"
+msgstr "So_n Sekme"
+
+#: src/diffuse/window.py:793
+msgid "Shift Pane _Right"
+msgstr "_Sağ Bölmeye Geç"
+
+#: src/diffuse/window.py:794
+msgid "Shift Pane _Left"
+msgstr "_Sol Bölmeye Geç"
+
+#: src/diffuse/window.py:798
+msgid "F_ormat"
+msgstr "_Biçemlendir"
+
+#: src/diffuse/window.py:800
+msgid "Convert To _Upper Case"
+msgstr "_Büyük Harfe Dönüştür"
+
+#: src/diffuse/window.py:801
+msgid "Convert To _Lower Case"
+msgstr "_Küçük Harfe Dönüştür"
+
+#: src/diffuse/window.py:803
+msgid "Sort Lines In _Ascending Order"
+msgstr "Satırları _Artan Düzenle Sırala"
+
+#: src/diffuse/window.py:804
+msgid "Sort Lines In D_escending Order"
+msgstr "Satırları A_zalan Düzenle Sırala"
+
+#: src/diffuse/window.py:806
+msgid "Remove Trailing _White Space"
+msgstr "Sondaki _Boşlukları Kaldır"
+
+#: src/diffuse/window.py:807
+msgid "Convert Tabs To _Spaces"
+msgstr "Sekmeleri _Boşluklara Dönüştür"
+
+#: src/diffuse/window.py:808
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "Baştaki Boşlukları _Sekmelere Dönüştür"
+
+#: src/diffuse/window.py:810
+msgid "_Increase Indenting"
+msgstr "Girintiyi _Arttır"
+
+#: src/diffuse/window.py:811
+msgid "De_crease Indenting"
+msgstr "Girintiyi A_zalt"
+
+#: src/diffuse/window.py:813
+msgid "Convert To _DOS Format"
+msgstr "_DOS Biçimine Dönüştür"
+
+#: src/diffuse/window.py:814
+msgid "Convert To _Mac Format"
+msgstr "_MAC Biçimine Dönüştür"
+
+#: src/diffuse/window.py:815
+msgid "Convert To Uni_x Format"
+msgstr "Uni_x Biçimine Dönüştür"
+
+#: src/diffuse/window.py:819
+msgid "_Merge"
+msgstr "_Birleştir"
+
+#: src/diffuse/window.py:821
+msgid "Copy Selection _Right"
+msgstr "Seçimi _Sağa Kopyala"
+
+#: src/diffuse/window.py:822
+msgid "Copy Selection _Left"
+msgstr "Seçimi _Sola Kopyala"
+
+#: src/diffuse/window.py:824
+msgid "Copy Left _Into Selection"
+msgstr "Solu _Seçime Kopyala"
+
+#: src/diffuse/window.py:825
+msgid "Copy Right I_nto Selection"
+msgstr "Sağı _Seçime Kopyala"
+
+#: src/diffuse/window.py:826
+msgid "_Merge From Left Then Right"
+msgstr "_Soldan Sonra Sağdan Birleştir"
+
+#: src/diffuse/window.py:827
+msgid "M_erge From Right Then Left"
+msgstr "_Sağdan Sonra Soldan Birleştir"
+
+#: src/diffuse/window.py:831
+msgid "_Help"
+msgstr "_Yardım"
+
+#: src/diffuse/window.py:833
+msgid "_Help Contents..."
+msgstr "Yardım İçerikleri..."
+
+#: src/diffuse/window.py:835
+#, python-format
+msgid "_About %s..."
+msgstr "%s Hakkında..."
+
+#: src/diffuse/window.py:847
+msgid "New 2-Way File Merge"
+msgstr "Yeni 2 Yönlü Dosya Birleştirme"
+
+#: src/diffuse/window.py:848
+msgid "New 3-Way File Merge"
+msgstr "Yeni 3 Yönlü Dosya Birleştirme"
+
+#: src/diffuse/window.py:850
+msgid "Realign All"
+msgstr "Tümünü Yeniden Hizala"
+
+#: src/diffuse/window.py:851
+msgid "First Difference"
+msgstr "İlk Fark"
+
+#: src/diffuse/window.py:852
+msgid "Previous Difference"
+msgstr "Önceki Fark"
+
+#: src/diffuse/window.py:853
+msgid "Next Difference"
+msgstr "Sonraki Fark"
+
+#: src/diffuse/window.py:854
+msgid "Last Difference"
+msgstr "Son Fark"
+
+#: src/diffuse/window.py:856
+msgid "Copy Selection Right"
+msgstr "Seçimi Sağa Kopyala"
+
+#: src/diffuse/window.py:857
+msgid "Copy Selection Left"
+msgstr "Seçimi Sola Kopyala"
+
+#: src/diffuse/window.py:858
+msgid "Copy Left Into Selection"
+msgstr "Solu Seçime Kopyala"
+
+#: src/diffuse/window.py:859
+msgid "Copy Right Into Selection"
+msgstr "Sağı Seçime Kopyala"
+
+#: src/diffuse/window.py:860
+msgid "Merge From Left Then Right"
+msgstr "Soldan Sonra Sağdan Birleştir"
+
+#: src/diffuse/window.py:861
+msgid "Merge From Right Then Left"
+msgstr "Sağdan Sonra Soldan Birleştir"
+
+#: src/diffuse/window.py:863
+msgid "Undo"
+msgstr "Geri Al"
+
+#: src/diffuse/window.py:864
+msgid "Redo"
+msgstr "Yinele"
+
+#: src/diffuse/window.py:950
+msgid "Changes detected"
+msgstr ""
+
+#: src/diffuse/window.py:954
+#, fuzzy, python-format
+msgid ""
+"The file \"%s\" changed on disk.\n"
+"\n"
+"Do you want to reload the file?"
+msgstr "%s dosyası diskte değişti. Dosyayı yeniden yüklemek ister misiniz?"
+
+#: src/diffuse/window.py:959
+#, fuzzy, python-format
+msgid ""
+"The following files changed on disk:\n"
+"%s\n"
+"\n"
+"Do you want to reload these files?"
+msgstr "%s dosyası diskte değişti. Dosyayı yeniden yüklemek ister misiniz?"
+
+#: src/diffuse/window.py:1078
+msgid "Some files have unsaved changes. Select the files to save before closing."
+msgstr ""
+"Bazı dosyalarda kaydedilmemiş değişiklikler var. Kapatmadan önce kaydedilecek "
+"dosyaları seçin."
+
+#: src/diffuse/window.py:1092
+msgid "Tab"
+msgstr "Sekme"
+
+#: src/diffuse/window.py:1097
+msgid "Pane"
+msgstr "Bölme"
+
+#: src/diffuse/window.py:1108
+msgid "Close _Without Saving"
+msgstr "Ka_ydetmeden Kapat"
+
+#: src/diffuse/window.py:1147
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "Bu sekmeyi kapatılmak %s uygulamasından da çıkış yapar."
+
+#: src/diffuse/window.py:1224
+#, python-format
+msgid "File Merge %d"
+msgstr "Dosya Birleştirme %d"
+
+#: src/diffuse/window.py:1344
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "%s gönderileri alınırken hata."
+
+#: src/diffuse/window.py:1376
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "%s değişiklikleri alınırken hata."
+
+#: src/diffuse/window.py:1409
+msgid "Open File In New Tab"
+msgstr "Dosyayı Yeni Sekmede Aç"
+
+#: src/diffuse/window.py:1432
+msgid "Choose Folder With Modified Files"
+msgstr "Değiştirilmiş Dosyaların Bulunduğu Klasörü Seç"
+
+#: src/diffuse/window.py:1450
+msgid "No modified files found."
+msgstr "Değiştirilmiş dosya bulunamadı."
+
+#: src/diffuse/window.py:1456
+msgid "Choose Folder With Commit"
+msgstr "Gönderiyle Klasör Seç"
+
+#: src/diffuse/window.py:1476
+msgid "No committed files found."
+msgstr "Gönderilmiş dosya bulunamadı."
+
+#: src/diffuse/window.py:1512
+msgid "New N-Way File Merge..."
+msgstr "Yeni N Yönlü Dosya Birleştirme"
+
+#: src/diffuse/window.py:1513
+msgid "Number of panes: "
+msgstr "Bölme sayısı: "
+
+#: src/diffuse/window.py:1587
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "İfade bulunamadı. Dosyanın sonundan devam edilsin mi?"
+
+#: src/diffuse/window.py:1589
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "İfade bulunamadı. Dosyanın başından devam edilsin mi?"
+
+#: src/diffuse/window.py:1762
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr ""
+"Diffuse, metin dosyalarını birleştirmek ve karşılaştırmak için grafiksel bir "
+"araçtır."
+
+#: src/diffuse/window.py:1766
+msgid "translator-credits"
+msgstr "Sabri Ünal <libreajans@gmail.com>"
+
+#~ msgid "Main window: diff between two files"
+#~ msgstr "Ana pencere: iki dosya arasında fark"
+
+#~ msgid ""
+#~ "Usage:\n"
+#~ "    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"
+#~ "also retrieve revisions of files from several VCSs for comparison and "
+#~ "merging.\n"
+#~ "\n"
+#~ "Help Options:\n"
+#~ "  ( -h | -? | --help )             Display this usage information\n"
+#~ "  ( -v | --version )               Display version and copyright information\n"
+#~ "\n"
+#~ "Configuration Options:\n"
+#~ "  --no-rcfile                      Do not read any resource files\n"
+#~ "  --rcfile <file>                  Specify explicit resource file\n"
+#~ "\n"
+#~ "General Options:\n"
+#~ "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
+#~ "  ( -D | --close-if-same )         Close all tabs with no differences\n"
+#~ "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+#~ "  ( -L | --label ) <label>         Display <label> instead of the file name\n"
+#~ "  ( -m | --modified )              Create a new tab for each modified file\n"
+#~ "  ( -r | --revision ) <rev>        File revision <rev>\n"
+#~ "  ( -s | --separate )              Create a new tab for each file\n"
+#~ "  ( -t | --tab )                   Start a new tab\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    Start with line <line> selected\n"
+#~ "  --null-file                      Create a blank file comparison pane\n"
+#~ "\n"
+#~ "Display Options:\n"
+#~ "  ( -b | --ignore-space-change )   Ignore changes to white space\n"
+#~ "  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
+#~ "  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
+#~ "  ( -i | --ignore-case )           Ignore case differences\n"
+#~ "  ( -w | --ignore-all-space )      Ignore white space differences"
+#~ msgstr ""
+#~ "Kullanım:\n"
+#~ "    diffuse [SEÇENEK...] [DOSYA...]\n"
+#~ "    diffuse ( -h | -? | --help | -v | --version )\n"
+#~ "\n"
+#~ "Diffuse, metin dosyalarını birleştirmek ve karşılaştırmak için grafiksel bir "
+#~ "araçtır.\n"
+#~ "Diffuse, tercih edilen sayıda dosyayı yan yana karşılaştırabilir ve "
+#~ "kullanıcılara\n"
+#~ "satır eşleştirmeyi elle ayarlama ve dosyaları doğrudan düzenleme yeteneği "
+#~ "kazandırır.\n"
+#~ "Diffuse, karşılaştırma ve birleştirme için çeşitli Sürüm Denetim Sistemi "
+#~ "dosyaların\n"
+#~ "düzeltmelerini de alabilir.\n"
+#~ "\n"
+#~ "Yardım Seçenekleri:\n"
+#~ "  ( -h | -? | --help )             Bu kullanım bilgilerini göster\n"
+#~ "  ( -v | --version )               Sürümü ve telif hakkı bilgilerini göster\n"
+#~ "\n"
+#~ "Yapılandırma Seçenekleri:\n"
+#~ "  --no-rcfile                      Herhangi bir kaynak dosyasını okuma\n"
+#~ "  --rcfile <file>                  Açık kaynak dosyasını belirtin\n"
+#~ "\n"
+#~ "Genel Seçenekler:\n"
+#~ "  ( -c | --commit ) <rev>          Dosya düzeltmesi <rev-1> ve <rev>\n"
+#~ "  ( -D | --close-if-same )         Fark yoksa sekmeleri kapat\n"
+#~ "  ( -e | --encoding ) <codec>      Dosyaları okumak için <codec> kod çözücü "
+#~ "kullan\n"
+#~ "  ( -L | --label ) <label>         Dosya adı yerine <label> etiketini göster\n"
+#~ "  ( -m | --modified )              Değiştirilen her dosya için yeni sekme "
+#~ "oluştur\n"
+#~ "  ( -r | --revision ) <rev>        Dosya düzeltmesi <rev>\n"
+#~ "  ( -s | --separate )              Her dosya için yeni sekme oluştur\n"
+#~ "  ( -t | --tab )                   Yeni sekme başlat\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Sürüm denetimi sistemi arama sırası\n"
+#~ "  --line <line>                    <line> satırı seçiliyken başla\n"
+#~ "  --null-file                      Boş bir dosya karşılaştırma bölmesi "
+#~ "oluştur\n"
+#~ "\n"
+#~ "Görünüm Seçenekleri:\n"
+#~ "  ( -b | --ignore-space-change )   Boşluk değişikliklerini yoksay\n"
+#~ "  ( -B | --ignore-blank-lines )    Boş satırlardaki değişiklikleri yoksay\n"
+#~ "  ( -E | --ignore-end-of-line )    Satır sonu farklarını yoksay\n"
+#~ "  ( -i | --ignore-case )           Büyük/Küçük harf farklarını yoksay\n"
+#~ "  ( -w | --ignore-all-space )      Boşluk farklarını yoksay"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 889b5a8..3e579b9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Diffuse svn 316\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-23 20:00-0400\n"
+"POT-Creation-Date: 2023-04-16 14:09-0400\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator:  <jarryson@gmail.com>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -30,815 +30,303 @@ 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."
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, and "
+"Subversion repositories."
 msgstr ""
 
-#: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
-msgid "Main window: diff between two files"
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:28
+msgid "Main window"
 msgstr ""
 
-#: src/diffuse/constants.py:25
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:32
+msgid "About window"
+msgstr ""
+
+#: src/diffuse/constants.py:26
 msgid "Copyright"
 msgstr "版权所有"
 
-#: src/diffuse/dialogs.py:40
-msgid "Diffuse is a graphical tool for merging and comparing text files."
-msgstr "Diffuse是一个合并和比较文本文件的图形化程序。"
+#: src/diffuse/dialogs.py:46 src/diffuse/dialogs.py:89 src/diffuse/dialogs.py:133
+#: src/diffuse/preferences.py:254 src/diffuse/preferences.py:483
+#: src/diffuse/window.py:309 src/diffuse/window.py:1107
+msgid "_Cancel"
+msgstr ""
 
-#: src/diffuse/dialogs.py:45
-msgid "translator-credits"
-msgstr "Liu Hao <jarryson@gmail.com>"
-
-#: src/diffuse/dialogs.py:82
+#: src/diffuse/dialogs.py:50
 msgid "Encoding: "
 msgstr "编码："
 
-#: src/diffuse/dialogs.py:94
+#: src/diffuse/dialogs.py:62
 msgid "Revision: "
 msgstr "修订："
 
-#: src/diffuse/dialogs.py:156
+#: src/diffuse/dialogs.py:90 src/diffuse/dialogs.py:134
+#: src/diffuse/preferences.py:255
+msgid "_OK"
+msgstr ""
+
+#: src/diffuse/dialogs.py:130
 msgid "Find..."
 msgstr "查找..."
 
-#: src/diffuse/dialogs.py:164
+#: src/diffuse/dialogs.py:140
 msgid "Search For: "
 msgstr "搜索："
 
-#: src/diffuse/dialogs.py:189
+#: src/diffuse/dialogs.py:165
 msgid "Match Case"
 msgstr "符合大小写"
 
-#: src/diffuse/dialogs.py:194
+#: src/diffuse/dialogs.py:170
 msgid "Search Backwards"
 msgstr "反向搜索"
 
+#: src/diffuse/main.py:53
+msgid "Display version and copyright information"
+msgstr "现实版本和版权信息"
+
+#: src/diffuse/main.py:61
+msgid "Do not read any resource files"
+msgstr "不要读取任何源文件"
+
+#: src/diffuse/main.py:69
+msgid "Specify explicit resource file"
+msgstr "指定明确的源文件"
+
+#: src/diffuse/main.py:77
+msgid "File revisions <rev-1> and <rev>"
+msgstr ""
+
 #: src/diffuse/main.py:85
-msgid "Close Tab"
-msgstr "关闭标签"
+msgid "Close all tabs with no differences"
+msgstr ""
 
-#: src/diffuse/main.py:132
-msgid "Open File..."
-msgstr "打开文件"
+#: src/diffuse/main.py:92
+msgid "Use <codec> to read and write files"
+msgstr ""
 
-#: src/diffuse/main.py:133
-msgid "Reload File"
-msgstr "重新加载文件"
+#: src/diffuse/main.py:100
+msgid "Display <label> instead of the file name"
+msgstr ""
 
-#: src/diffuse/main.py:134
-msgid "Save File"
-msgstr "保存文件"
+#: src/diffuse/main.py:108
+msgid "Create a new tab for each modified file"
+msgstr ""
 
-#: src/diffuse/main.py:135
-msgid "Save File As..."
-msgstr "另存为"
+#: src/diffuse/main.py:115
+msgid "File revision <rev>"
+msgstr ""
 
-#: src/diffuse/main.py:217
-#, python-format
-msgid "Column %d"
-msgstr "%d列"
+#: src/diffuse/main.py:123
+msgid "Create a new tab for each file"
+msgstr ""
 
-#: src/diffuse/main.py:291
-msgid "Save changes before loading the new file?"
-msgstr "加载新文件之前保存更改吗？"
+#: src/diffuse/main.py:130
+msgid "Start a new tab"
+msgstr ""
 
-#: src/diffuse/main.py:402
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "无法读取文件%(file)s中的修订版本%(rev)s。"
+#: src/diffuse/main.py:137 src/diffuse/preferences.py:159
+msgid "Version control system search order"
+msgstr ""
 
-#: src/diffuse/main.py:405 src/diffuse/main.py:1860
+#: src/diffuse/main.py:145
+msgid "Start with line <line> selected"
+msgstr ""
+
+#: src/diffuse/main.py:153
+msgid "Create a blank file comparison pane"
+msgstr ""
+
+#: src/diffuse/main.py:160 src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:95
+msgid "Ignore changes to white space"
+msgstr "忽略对空格的改变"
+
+#: src/diffuse/main.py:167
+msgid "Ignore changes in blank lines"
+msgstr "忽略对空行的改变"
+
+#: src/diffuse/main.py:174 src/diffuse/preferences.py:88
+msgid "Ignore end of line differences"
+msgstr "忽略行尾的不同"
+
+#: src/diffuse/main.py:181 src/diffuse/preferences.py:84
+msgid "Ignore case differences"
+msgstr "忽略大小写的不同"
+
+#: src/diffuse/main.py:188 src/diffuse/preferences.py:85
+msgid "Ignore white space differences"
+msgstr "忽略空格的不同"
+
+#: src/diffuse/main.py:191
+msgid ""
+"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 several VCSs for comparison and merging."
+msgstr ""
+
+#: src/diffuse/main.py:247 src/diffuse/window.py:420
 #, python-format
 msgid "Error reading %s."
 msgstr "无法读取%s。"
 
-#: src/diffuse/main.py:427
-msgid "Open File"
-msgstr "打开文件"
-
-#: src/diffuse/main.py:484
-#, python-format
-msgid "The file %s changed on disk. Do you want to reload the file?"
-msgstr "磁盘文件%s已被更改，是否重新载入？"
-
-#: src/diffuse/main.py:510
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "保存%(title)s窗格%(pane)d"
-
-#: src/diffuse/main.py:542
-#, python-format
-msgid "A file named %s already exists. Do you want to overwrite it?"
-msgstr "已存在名为%s的文件，您希望覆盖它吗？"
-
-#: src/diffuse/main.py:549
-#, python-format
-msgid ""
-"The file %s has been modified by another process since reading it. If you save, "
-"all the external changes could be lost. Save anyways?"
-msgstr "文件%s打开后被其他进程更改过了，如果保存，其他程序的修改将会丢失，保存吗？"
-
-#: src/diffuse/main.py:591
-#, python-format
-msgid "Error encoding to %s."
-msgstr "无法编码为%s。"
-
-#: src/diffuse/main.py:595 src/diffuse/preferences.py:300
-#, python-format
-msgid "Error writing %s."
-msgstr "无法写入%s"
-
-#: src/diffuse/main.py:625
-msgid "Go To Line..."
-msgstr "跳到行..."
-
-#: src/diffuse/main.py:626
-msgid "Line Number: "
-msgstr "行数："
-
-#: src/diffuse/main.py:657
-msgid ""
-"Press the enter key or double click to edit. Press the space bar or use the RMB "
-"menu to manually align."
-msgstr "按回车或者鼠标双击进行编译。空格键或者右键菜单手动对齐。"
-
-#: src/diffuse/main.py:661
-msgid "Press the escape key to finish editing."
-msgstr "按ESC键结束编辑"
-
-#: src/diffuse/main.py:664
-msgid ""
-"Select target line and press the space bar to align. Press the escape key to "
-"cancel."
-msgstr "选择目标行然后按空格键进行对齐，按ESC取消。"
-
-#: src/diffuse/main.py:787
-msgid "_File"
-msgstr "文件(_F)"
-
-#: src/diffuse/main.py:788
-msgid "_Open File..."
-msgstr "打开文件(_O)"
-
-#: src/diffuse/main.py:789
-msgid "Open File In New _Tab..."
-msgstr "在新标签里打开文件(_T)"
-
-#: src/diffuse/main.py:790
-msgid "Open _Modified Files..."
-msgstr "打开修改过的文件(_M)"
-
-#: src/diffuse/main.py:791
-msgid "Open Commi_t..."
-msgstr "打开提交(_T)"
-
-#: src/diffuse/main.py:792
-msgid "_Reload File"
-msgstr "重新加载文件(_R)"
-
-#: src/diffuse/main.py:794
-msgid "_Save File"
-msgstr "保存(_S)"
-
-#: src/diffuse/main.py:795
-msgid "Save File _As..."
-msgstr "另存为(_A)"
-
-#: src/diffuse/main.py:796
-msgid "Save A_ll"
-msgstr "保存所有(_L)"
-
-#: src/diffuse/main.py:798
-msgid "New _2-Way File Merge"
-msgstr "新建2方文件合并(_2)"
-
-#: src/diffuse/main.py:799
-msgid "New _3-Way File Merge"
-msgstr "新建3方文件合并(_3)"
-
-#: src/diffuse/main.py:800
-msgid "New _N-Way File Merge..."
-msgstr "新建多方文件合并(_N)"
-
-#: src/diffuse/main.py:802
-msgid "_Close Tab"
-msgstr "关闭标签(_C)"
-
-#: src/diffuse/main.py:803
-msgid "_Undo Close Tab"
-msgstr "恢复关闭的标签"
-
-#: src/diffuse/main.py:804
-msgid "_Quit"
-msgstr "退出(_Q)"
-
-#: src/diffuse/main.py:807
-msgid "_Edit"
-msgstr "编辑(_E)"
-
-#: src/diffuse/main.py:808
-msgid "_Undo"
-msgstr "恢复(_U)"
-
-#: src/diffuse/main.py:809
-msgid "_Redo"
-msgstr "重做(_R)"
-
-#: src/diffuse/main.py:811
-msgid "Cu_t"
-msgstr "剪切(_T)"
-
-#: src/diffuse/main.py:812
-msgid "_Copy"
-msgstr "复制(_C)"
-
-#: src/diffuse/main.py:813
-msgid "_Paste"
-msgstr "粘贴(_P)"
-
-#: src/diffuse/main.py:815
-msgid "Select _All"
-msgstr "选择所有(_A)"
-
-#: src/diffuse/main.py:816
-msgid "C_lear Edits"
-msgstr "取消编辑(L)"
-
-#: src/diffuse/main.py:817
-msgid "_Dismiss All Edits"
-msgstr "撤销所有更改(_D)"
-
-#: src/diffuse/main.py:819
-msgid "_Find..."
-msgstr "查找(_F)"
-
-#: src/diffuse/main.py:820
-msgid "Find _Next"
-msgstr "找下一个(_N)"
-
-#: src/diffuse/main.py:821
-msgid "Find Pre_vious"
-msgstr "找上一个(_V)"
-
-#: src/diffuse/main.py:822
-msgid "_Go To Line..."
-msgstr "跳到行(_G)"
-
-#: src/diffuse/main.py:824
-msgid "Pr_eferences..."
-msgstr "首选项(_E)"
-
-#: src/diffuse/main.py:828
-msgid "None"
-msgstr "无"
-
-#: src/diffuse/main.py:846
-msgid "_View"
-msgstr "视图(_V)"
-
-#: src/diffuse/main.py:847
-msgid "_Syntax Highlighting"
-msgstr "_Syntax高亮"
-
-#: src/diffuse/main.py:849
-msgid "Re_align All"
-msgstr "重新对齐所有(_A)"
-
-#: src/diffuse/main.py:850
-msgid "_Isolate"
-msgstr "分离(_I)"
-
-#: src/diffuse/main.py:852
-msgid "_First Difference"
-msgstr "第一个不同之处(_F)"
-
-#: src/diffuse/main.py:853
-msgid "_Previous Difference"
-msgstr "前一个不同之处(_P)"
-
-#: src/diffuse/main.py:854
-msgid "_Next Difference"
-msgstr "下一个不同之处(_N)"
-
-#: src/diffuse/main.py:855
-msgid "_Last Difference"
-msgstr "最后一个不同之处(_L)"
-
-#: src/diffuse/main.py:857
-msgid "Fir_st Tab"
-msgstr "第一个标签(_S)"
-
-#: src/diffuse/main.py:858
-msgid "Pre_vious Tab"
-msgstr "前一个标签(_V)"
-
-#: src/diffuse/main.py:859
-msgid "Next _Tab"
-msgstr "下一个标签(_T)"
-
-#: src/diffuse/main.py:860
-msgid "Las_t Tab"
-msgstr "最后一个标签(_T)"
-
-#: src/diffuse/main.py:862
-msgid "Shift Pane _Right"
-msgstr "右移窗格(_R)"
-
-#: src/diffuse/main.py:863
-msgid "Shift Pane _Left"
-msgstr "左移窗格(_L)"
-
-#: src/diffuse/main.py:866
-msgid "F_ormat"
-msgstr "格式(_O)"
-
-#: src/diffuse/main.py:867
-msgid "Convert To _Upper Case"
-msgstr "转换成大写"
-
-#: src/diffuse/main.py:868
-msgid "Convert To _Lower Case"
-msgstr "转换成小写"
-
-#: src/diffuse/main.py:870
-msgid "Sort Lines In _Ascending Order"
-msgstr "以递增的顺序排列行"
-
-#: src/diffuse/main.py:871
-msgid "Sort Lines In D_escending Order"
-msgstr "以递减的顺序排列行"
-
-#: src/diffuse/main.py:873
-msgid "Remove Trailing _White Space"
-msgstr "删除多余的空格(_W)"
-
-#: src/diffuse/main.py:874
-msgid "Convert Tabs To _Spaces"
-msgstr "转换制表符为空格(_S)"
-
-#: src/diffuse/main.py:875
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "转换开头的空格为制表符(_T)"
-
-#: src/diffuse/main.py:877
-msgid "_Increase Indenting"
-msgstr "减少缩进(_I)"
-
-#: src/diffuse/main.py:878
-msgid "De_crease Indenting"
-msgstr "减少缩进"
-
-#: src/diffuse/main.py:880
-msgid "Convert To _DOS Format"
-msgstr "转换为DOS格式(_D)"
-
-#: src/diffuse/main.py:881
-msgid "Convert To _Mac Format"
-msgstr "转换为Mac格式(_M)"
-
-#: src/diffuse/main.py:882
-msgid "Convert To Uni_x Format"
-msgstr "转换为Unix格式(_X)"
-
-#: src/diffuse/main.py:885
-msgid "_Merge"
-msgstr "合并(_M)"
-
-#: src/diffuse/main.py:886
-msgid "Copy Selection _Right"
-msgstr "复制选择之处到右边(_R)"
-
-#: src/diffuse/main.py:887
-msgid "Copy Selection _Left"
-msgstr "复制选择之处到左边(_L)"
-
-#: src/diffuse/main.py:889
-msgid "Copy Left _Into Selection"
-msgstr "复制左边内容到选择之处(_L)"
-
-#: src/diffuse/main.py:890
-msgid "Copy Right I_nto Selection"
-msgstr "复制右边内容到选择之处(_L)"
-
-#: src/diffuse/main.py:891
-msgid "_Merge From Left Then Right"
-msgstr "先左再右合并(_M)"
-
-#: src/diffuse/main.py:892
-msgid "M_erge From Right Then Left"
-msgstr "先右后左合并(_E)"
-
-#: src/diffuse/main.py:895
-msgid "_Help"
-msgstr "帮助(_H)"
-
-#: src/diffuse/main.py:896
-msgid "_Help Contents..."
-msgstr "帮助内容(_H)"
-
-#: src/diffuse/main.py:898
-#, python-format
-msgid "_About %s..."
-msgstr "关于%s(_A)"
-
-#: src/diffuse/main.py:913
-msgid "New 2-Way File Merge"
-msgstr "新建2方文件合并"
-
-#: src/diffuse/main.py:914
-msgid "New 3-Way File Merge"
-msgstr "新建3方文件合并"
-
-#: src/diffuse/main.py:916
-msgid "Realign All"
-msgstr "重新对齐所有"
-
-#: src/diffuse/main.py:917
-msgid "First Difference"
-msgstr "第一个不同之处"
-
-#: src/diffuse/main.py:918
-msgid "Previous Difference"
-msgstr "前一个不同之处"
-
-#: src/diffuse/main.py:919
-msgid "Next Difference"
-msgstr "下一个不同之处"
-
-#: src/diffuse/main.py:920
-msgid "Last Difference"
-msgstr "最后一个不同之处"
-
-#: src/diffuse/main.py:922
-msgid "Copy Selection Right"
-msgstr "复制选择之处到右边"
-
-#: src/diffuse/main.py:923
-msgid "Copy Selection Left"
-msgstr "复制选择之处到左边"
-
-#: src/diffuse/main.py:924
-msgid "Copy Left Into Selection"
-msgstr "复制左边内容到选择之处"
-
-#: src/diffuse/main.py:925
-msgid "Copy Right Into Selection"
-msgstr "复制右边内容到选择之处"
-
-#: src/diffuse/main.py:926
-msgid "Merge From Left Then Right"
-msgstr "先左后右合并"
-
-#: src/diffuse/main.py:927
-msgid "Merge From Right Then Left"
-msgstr "先右后左合并(_T)"
-
-#: src/diffuse/main.py:929
-msgid "Undo"
-msgstr "恢复"
-
-#: src/diffuse/main.py:930
-msgid "Redo"
-msgstr "重做"
-
-#: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
-msgid "Cut"
-msgstr "剪切"
-
-#: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
-msgid "Copy"
-msgstr "复制"
-
-#: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
-msgid "Paste"
-msgstr "粘贴"
-
-#: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
-msgid "Clear Edits"
-msgstr "取消编辑"
-
-#: src/diffuse/main.py:1057
-msgid "Some files have unsaved changes. Select the files to save before closing."
-msgstr "一些文件包含未保存的更改。请在关闭前保存这些文件。"
-
-#: src/diffuse/main.py:1071
-msgid "Tab"
-msgstr "标签"
-
-#: src/diffuse/main.py:1076
-msgid "Pane"
-msgstr "窗格"
-
-#: src/diffuse/main.py:1087
-msgid "Close _Without Saving"
-msgstr "不保存而关闭"
-
-#: src/diffuse/main.py:1126
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "关闭此标签将会退出%s"
-
-#: src/diffuse/main.py:1209
-#, python-format
-msgid "File Merge %d"
-msgstr "文件合并%d"
-
-#: src/diffuse/main.py:1315
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "錯誤修改提交%s。"
-
-#: src/diffuse/main.py:1347
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "无法恢复对%s的修改。"
-
-#: src/diffuse/main.py:1380
-msgid "Open File In New Tab"
-msgstr "在新标签里打开文件"
-
-#: src/diffuse/main.py:1403
-msgid "Choose Folder With Modified Files"
-msgstr "选择更改过的文件夹"
-
-#: src/diffuse/main.py:1421
-msgid "No modified files found."
-msgstr "没有找到修改过的文件。"
-
-#: src/diffuse/main.py:1427
-msgid "Choose Folder With Commit"
-msgstr "选择提交的文件夹"
-
-#: src/diffuse/main.py:1447
-msgid "No committed files found."
-msgstr "没有找到提交的文件。"
-
-#: src/diffuse/main.py:1483
-msgid "New N-Way File Merge..."
-msgstr "新建多方文件合并"
-
-#: src/diffuse/main.py:1484
-msgid "Number of panes: "
-msgstr "窗格数: "
-
-#: src/diffuse/main.py:1558
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "短语未找到，从文件结尾继续吗？"
-
-#: src/diffuse/main.py:1560
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "短语未找到，从文件开头继续吗？"
-
-#: src/diffuse/main.py:1781
-#, fuzzy
-msgid ""
-"Usage:\n"
-"    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"
-"also retrieve revisions of files from several VCSs for comparison and merging.\n"
-"\n"
-"Help Options:\n"
-"  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright information\n"
-"\n"
-"Configuration Options:\n"
-"  --no-rcfile                      Do not read any resource files\n"
-"  --rcfile <file>                  Specify explicit resource file\n"
-"\n"
-"General Options:\n"
-"  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
-"  ( -D | --close-if-same )         Close all tabs with no differences\n"
-"  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
-"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
-"  ( -m | --modified )              Create a new tab for each modified file\n"
-"  ( -r | --revision ) <rev>        File revision <rev>\n"
-"  ( -s | --separate )              Create a new tab for each file\n"
-"  ( -t | --tab )                   Start a new tab\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    Start with line <line> selected\n"
-"  --null-file                      Create a blank file comparison pane\n"
-"\n"
-"Display Options:\n"
-"  ( -b | --ignore-space-change )   Ignore changes to white space\n"
-"  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
-"  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
-"  ( -i | --ignore-case )           Ignore case differences\n"
-"  ( -w | --ignore-all-space )      Ignore white space differences"
-msgstr ""
-"用法:\n"
-"    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"
-"also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
-"Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
-"\n"
-"帮助参数:\n"
-"  ( -h | -? | --help )             显示词使用信息\n"
-"  ( -v | --version )               现实版本和版权信息\n"
-"\n"
-"配置参数:\n"
-"  --no-rcfile                      不要读取任何源文件\n"
-"  --rcfile <file>                  指定明确的源文件\n"
-"\n"
-"其它参数:\n"
-"  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
-"  ( -D | --close-if-same )         Close all tabs with no differences\n"
-"  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
-"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
-"  ( -m | --modified )              Create a new tab for each modified file\n"
-"  ( -r | --revision ) <rev>        File revision <rev>\n"
-"  ( -s | --separate )              Create a new tab for each file\n"
-"  ( -t | --tab )                   Start a new tab\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    Start with line <line> selected\n"
-"  --null-file                      Create a blank file comparison pane\n"
-"\n"
-"显示参数:\n"
-"  ( -b | --ignore-space-change )   忽略对空白的改变\n"
-"  ( -B | --ignore-blank-lines )    忽略对空行的改变\n"
-"  ( -E | --ignore-end-of-line )    忽略行尾的不同\n"
-"  ( -i | --ignore-case )           忽略小结的不同\n"
-"  ( -w | --ignore-all-space )      忽略所有空白的不同"
-
-#: src/diffuse/main.py:1948
+#: src/diffuse/main.py:327
 msgid "Error parsing line number."
 msgstr "解析行数时错误。"
 
-#: src/diffuse/main.py:1958
-#, python-format
-msgid "Skipping unknown argument \"%s\"."
-msgstr "跳过未知参数\"%s\"。"
-
-#: src/diffuse/main.py:1966
+#: src/diffuse/main.py:343
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "无法处理\"%s\"。目录不存在。"
 
-#: src/diffuse/preferences.py:80
+#: src/diffuse/preferences.py:75
 msgid "Display"
 msgstr "显示"
 
-#: src/diffuse/preferences.py:83
+#: src/diffuse/preferences.py:78
 msgid "Font"
 msgstr "字体"
 
-#: src/diffuse/preferences.py:84
+#: src/diffuse/preferences.py:79
 msgid "Tab width"
 msgstr "制表符宽度"
 
-#: src/diffuse/preferences.py:85
+#: src/diffuse/preferences.py:80
 msgid "Show right margin"
 msgstr "显示右边距"
 
-#: src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:81
 msgid "Right margin"
 msgstr "右边距"
 
-#: src/diffuse/preferences.py:87
+#: src/diffuse/preferences.py:82
 msgid "Show line numbers"
 msgstr "显示行号"
 
-#: src/diffuse/preferences.py:88
+#: src/diffuse/preferences.py:83
 msgid "Show white space characters"
 msgstr "显示空格字符"
 
-#: src/diffuse/preferences.py:89
-msgid "Ignore case differences"
-msgstr "忽略大小写的不同"
-
-#: src/diffuse/preferences.py:90
-msgid "Ignore white space differences"
-msgstr "忽略空格的不同"
-
-#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100
-msgid "Ignore changes to white space"
-msgstr "忽略对空格的改变"
-
-#: src/diffuse/preferences.py:92
+#: src/diffuse/preferences.py:87
 msgid "Ignore blank line differences"
 msgstr "忽略空行的不同"
 
-#: src/diffuse/preferences.py:93
-msgid "Ignore end of line differences"
-msgstr "忽略行尾的不同"
-
-#: src/diffuse/preferences.py:95
+#: src/diffuse/preferences.py:90
 msgid "Alignment"
 msgstr "对齐"
 
-#: src/diffuse/preferences.py:98
+#: src/diffuse/preferences.py:93
 msgid "Ignore case"
 msgstr "忽略大小写"
 
-#: src/diffuse/preferences.py:99
+#: src/diffuse/preferences.py:94
 msgid "Ignore white space"
 msgstr "忽略空格"
 
-#: src/diffuse/preferences.py:101
+#: src/diffuse/preferences.py:96
 msgid "Ignore blank lines"
 msgstr "忽略空行"
 
-#: src/diffuse/preferences.py:102
+#: src/diffuse/preferences.py:97
 msgid "Ignore end of line characters"
 msgstr "忽略行尾结束符"
 
-#: src/diffuse/preferences.py:104
+#: src/diffuse/preferences.py:99
 msgid "Editor"
 msgstr "编辑器"
 
-#: src/diffuse/preferences.py:107
+#: src/diffuse/preferences.py:102
 msgid "Auto indent"
 msgstr "自动缩进"
 
-#: src/diffuse/preferences.py:108
+#: src/diffuse/preferences.py:103
 msgid "Expand tabs to spaces"
 msgstr "展开制表符为空格"
 
-#: src/diffuse/preferences.py:109
+#: src/diffuse/preferences.py:104
 msgid "Soft tab width"
 msgstr "软制表符宽度"
 
-#: src/diffuse/preferences.py:111
+#: src/diffuse/preferences.py:106
 msgid "Tabs"
 msgstr "标签"
 
-#: src/diffuse/preferences.py:114
+#: src/diffuse/preferences.py:109
 msgid "Default panes"
 msgstr "默认窗格"
 
-#: src/diffuse/preferences.py:115
+#: src/diffuse/preferences.py:110
 msgid "Always show the tab bar"
 msgstr "总是显示标签栏"
 
-#: src/diffuse/preferences.py:116
+#: src/diffuse/preferences.py:111
 #, python-format
 msgid "Warn me when closing a tab will quit %s"
 msgstr "当关闭标签会退出%s的时候提醒我"
 
-#: src/diffuse/preferences.py:118
+#: src/diffuse/preferences.py:113
 msgid "Regional Settings"
 msgstr "区域性设置"
 
-#: src/diffuse/preferences.py:121
+#: src/diffuse/preferences.py:116
 msgid "Default codec"
 msgstr "默认编码"
 
-#: src/diffuse/preferences.py:122
+#: src/diffuse/preferences.py:117
 msgid "Order of codecs used to identify encoding"
 msgstr "用来识别编码的编码顺序"
 
-#: src/diffuse/preferences.py:143
+#: src/diffuse/preferences.py:138
 msgid "Cygwin"
 msgstr ""
 
-#: src/diffuse/preferences.py:145
+#: src/diffuse/preferences.py:140
 msgid "Root directory"
 msgstr "根目录"
 
-#: src/diffuse/preferences.py:146
+#: src/diffuse/preferences.py:141
 msgid "Cygdrive prefix"
 msgstr ""
 
-#: src/diffuse/preferences.py:165
-msgid "Version control system search order"
-msgstr ""
-
-#: src/diffuse/preferences.py:173
+#: src/diffuse/preferences.py:167
 msgid "\"co\" command"
 msgstr "\"co\"命令"
 
-#: src/diffuse/preferences.py:174
+#: src/diffuse/preferences.py:168
 msgid "\"rlog\" command"
 msgstr "\"rlog\"命令"
 
-#: src/diffuse/preferences.py:176
+#: src/diffuse/preferences.py:170
 msgid "Command"
 msgstr "命令"
 
-#: src/diffuse/preferences.py:182
+#: src/diffuse/preferences.py:176
 msgid "Launch from a Bash login shell"
 msgstr "从命令行登录界面加载"
 
-#: src/diffuse/preferences.py:189
+#: src/diffuse/preferences.py:183
 msgid "Update paths for Cygwin"
 msgstr "为Cygwin更新路径"
 
-#: src/diffuse/preferences.py:194
+#: src/diffuse/preferences.py:188
 msgid "Version Control"
 msgstr "版本控制"
 
-#: src/diffuse/preferences.py:259
+#: src/diffuse/preferences.py:253
 msgid "Preferences"
 msgstr "首选项"
 
+#: src/diffuse/preferences.py:294 src/diffuse/window.py:580
+#, python-format
+msgid "Error writing %s."
+msgstr "无法写入%s"
+
+#: src/diffuse/preferences.py:483 src/diffuse/window.py:446
+#: src/diffuse/window.py:1413 src/diffuse/window.py:1436 src/diffuse/window.py:1459
+msgid "_Open"
+msgstr ""
+
 #: src/diffuse/resources.py:242 src/diffuse/resources.py:246
 #: src/diffuse/resources.py:249
 #, python-brace-format
@@ -924,16 +412,11 @@ msgstr "处理到文件{file}的{line}行时出错。"
 msgid "Auto Detect"
 msgstr "自动探测"
 
-#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97
+#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:96
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "无法解析修订版本%s。"
 
-#: src/diffuse/vcs/vcs_registry.py:238
-#, python-format
-msgid "Error parsing %s."
-msgstr "无法解析%s。"
-
 #: src/diffuse/widgets.py:1857
 msgid "Align with Selection"
 msgstr "向选中的对齐"
@@ -946,10 +429,632 @@ msgstr "分离"
 msgid "Merge Selection"
 msgstr "合并选择之处"
 
+#: src/diffuse/widgets.py:1861 src/diffuse/window.py:865
+msgid "Cut"
+msgstr "剪切"
+
+#: src/diffuse/widgets.py:1862 src/diffuse/window.py:866
+msgid "Copy"
+msgstr "复制"
+
+#: src/diffuse/widgets.py:1863 src/diffuse/window.py:867
+msgid "Paste"
+msgstr "粘贴"
+
 #: src/diffuse/widgets.py:1865
 msgid "Select All"
 msgstr "选择所有"
 
+#: src/diffuse/widgets.py:1866 src/diffuse/window.py:868
+msgid "Clear Edits"
+msgstr "取消编辑"
+
 #: src/diffuse/widgets.py:1868
 msgid "Swap with Selected Pane"
 msgstr "交换选中的窗格"
+
+#: src/diffuse/window.py:83
+msgid "Close Tab"
+msgstr "关闭标签"
+
+#: src/diffuse/window.py:126
+msgid "Open File..."
+msgstr "打开文件"
+
+#: src/diffuse/window.py:127
+msgid "Reload File"
+msgstr "重新加载文件"
+
+#: src/diffuse/window.py:128
+msgid "Save File"
+msgstr "保存文件"
+
+#: src/diffuse/window.py:129
+msgid "Save File As..."
+msgstr "另存为"
+
+#: src/diffuse/window.py:228
+#, python-format
+msgid "Column %d"
+msgstr "%d列"
+
+#: src/diffuse/window.py:306
+msgid "Save changes before loading the new file?"
+msgstr "加载新文件之前保存更改吗？"
+
+#: src/diffuse/window.py:310
+msgid "_No"
+msgstr ""
+
+#: src/diffuse/window.py:311
+msgid "_Yes"
+msgstr ""
+
+#: src/diffuse/window.py:417
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "无法读取文件%(file)s中的修订版本%(rev)s。"
+
+#: src/diffuse/window.py:442
+msgid "Open File"
+msgstr "打开文件"
+
+#: src/diffuse/window.py:495
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "保存%(title)s窗格%(pane)d"
+
+#: src/diffuse/window.py:499 src/diffuse/window.py:1111
+#, fuzzy
+msgid "_Save"
+msgstr "保存(_S)"
+
+#: src/diffuse/window.py:527
+#, python-format
+msgid "A file named %s already exists. Do you want to overwrite it?"
+msgstr "已存在名为%s的文件，您希望覆盖它吗？"
+
+#: src/diffuse/window.py:534
+#, python-format
+msgid ""
+"The file %s has been modified by another process since reading it. If you save, "
+"all the external changes could be lost. Save anyways?"
+msgstr "文件%s打开后被其他进程更改过了，如果保存，其他程序的修改将会丢失，保存吗？"
+
+#: src/diffuse/window.py:576
+#, python-format
+msgid "Error encoding to %s."
+msgstr "无法编码为%s。"
+
+#: src/diffuse/window.py:610
+msgid "Go To Line..."
+msgstr "跳到行..."
+
+#: src/diffuse/window.py:611
+msgid "Line Number: "
+msgstr "行数："
+
+#: src/diffuse/window.py:642
+msgid ""
+"Press the enter key or double click to edit. Press the space bar or use the RMB "
+"menu to manually align."
+msgstr "按回车或者鼠标双击进行编译。空格键或者右键菜单手动对齐。"
+
+#: src/diffuse/window.py:646
+msgid "Press the escape key to finish editing."
+msgstr "按ESC键结束编辑"
+
+#: src/diffuse/window.py:649
+msgid ""
+"Select target line and press the space bar to align. Press the escape key to "
+"cancel."
+msgstr "选择目标行然后按空格键进行对齐，按ESC取消。"
+
+#: src/diffuse/window.py:710
+msgid "_File"
+msgstr "文件(_F)"
+
+#: src/diffuse/window.py:712
+msgid "_Open File..."
+msgstr "打开文件(_O)"
+
+#: src/diffuse/window.py:713
+msgid "Open File In New _Tab..."
+msgstr "在新标签里打开文件(_T)"
+
+#: src/diffuse/window.py:714
+msgid "Open _Modified Files..."
+msgstr "打开修改过的文件(_M)"
+
+#: src/diffuse/window.py:715
+msgid "Open Commi_t..."
+msgstr "打开提交(_T)"
+
+#: src/diffuse/window.py:716
+msgid "_Reload File"
+msgstr "重新加载文件(_R)"
+
+#: src/diffuse/window.py:718
+msgid "_Save File"
+msgstr "保存(_S)"
+
+#: src/diffuse/window.py:719
+msgid "Save File _As..."
+msgstr "另存为(_A)"
+
+#: src/diffuse/window.py:720
+msgid "Save A_ll"
+msgstr "保存所有(_L)"
+
+#: src/diffuse/window.py:722
+msgid "New _2-Way File Merge"
+msgstr "新建2方文件合并(_2)"
+
+#: src/diffuse/window.py:723
+msgid "New _3-Way File Merge"
+msgstr "新建3方文件合并(_3)"
+
+#: src/diffuse/window.py:724
+msgid "New _N-Way File Merge..."
+msgstr "新建多方文件合并(_N)"
+
+#: src/diffuse/window.py:726
+msgid "_Close Tab"
+msgstr "关闭标签(_C)"
+
+#: src/diffuse/window.py:727
+msgid "_Undo Close Tab"
+msgstr "恢复关闭的标签"
+
+#: src/diffuse/window.py:728
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+#: src/diffuse/window.py:732
+msgid "_Edit"
+msgstr "编辑(_E)"
+
+#: src/diffuse/window.py:734
+msgid "_Undo"
+msgstr "恢复(_U)"
+
+#: src/diffuse/window.py:735
+msgid "_Redo"
+msgstr "重做(_R)"
+
+#: src/diffuse/window.py:737
+msgid "Cu_t"
+msgstr "剪切(_T)"
+
+#: src/diffuse/window.py:738
+msgid "_Copy"
+msgstr "复制(_C)"
+
+#: src/diffuse/window.py:739
+msgid "_Paste"
+msgstr "粘贴(_P)"
+
+#: src/diffuse/window.py:741
+msgid "Select _All"
+msgstr "选择所有(_A)"
+
+#: src/diffuse/window.py:742
+msgid "C_lear Edits"
+msgstr "取消编辑(L)"
+
+#: src/diffuse/window.py:743
+msgid "_Dismiss All Edits"
+msgstr "撤销所有更改(_D)"
+
+#: src/diffuse/window.py:745
+msgid "_Find..."
+msgstr "查找(_F)"
+
+#: src/diffuse/window.py:746
+msgid "Find _Next"
+msgstr "找下一个(_N)"
+
+#: src/diffuse/window.py:747
+msgid "Find Pre_vious"
+msgstr "找上一个(_V)"
+
+#: src/diffuse/window.py:748
+msgid "_Go To Line..."
+msgstr "跳到行(_G)"
+
+#: src/diffuse/window.py:750
+msgid "Pr_eferences..."
+msgstr "首选项(_E)"
+
+#: src/diffuse/window.py:754
+msgid "None"
+msgstr "无"
+
+#: src/diffuse/window.py:776
+msgid "_View"
+msgstr "视图(_V)"
+
+#: src/diffuse/window.py:778
+msgid "_Syntax Highlighting"
+msgstr "_Syntax高亮"
+
+#: src/diffuse/window.py:780
+msgid "Re_align All"
+msgstr "重新对齐所有(_A)"
+
+#: src/diffuse/window.py:781
+msgid "_Isolate"
+msgstr "分离(_I)"
+
+#: src/diffuse/window.py:783
+msgid "_First Difference"
+msgstr "第一个不同之处(_F)"
+
+#: src/diffuse/window.py:784
+msgid "_Previous Difference"
+msgstr "前一个不同之处(_P)"
+
+#: src/diffuse/window.py:785
+msgid "_Next Difference"
+msgstr "下一个不同之处(_N)"
+
+#: src/diffuse/window.py:786
+msgid "_Last Difference"
+msgstr "最后一个不同之处(_L)"
+
+#: src/diffuse/window.py:788
+msgid "Fir_st Tab"
+msgstr "第一个标签(_S)"
+
+#: src/diffuse/window.py:789
+msgid "Pre_vious Tab"
+msgstr "前一个标签(_V)"
+
+#: src/diffuse/window.py:790
+msgid "Next _Tab"
+msgstr "下一个标签(_T)"
+
+#: src/diffuse/window.py:791
+msgid "Las_t Tab"
+msgstr "最后一个标签(_T)"
+
+#: src/diffuse/window.py:793
+msgid "Shift Pane _Right"
+msgstr "右移窗格(_R)"
+
+#: src/diffuse/window.py:794
+msgid "Shift Pane _Left"
+msgstr "左移窗格(_L)"
+
+#: src/diffuse/window.py:798
+msgid "F_ormat"
+msgstr "格式(_O)"
+
+#: src/diffuse/window.py:800
+msgid "Convert To _Upper Case"
+msgstr "转换成大写"
+
+#: src/diffuse/window.py:801
+msgid "Convert To _Lower Case"
+msgstr "转换成小写"
+
+#: src/diffuse/window.py:803
+msgid "Sort Lines In _Ascending Order"
+msgstr "以递增的顺序排列行"
+
+#: src/diffuse/window.py:804
+msgid "Sort Lines In D_escending Order"
+msgstr "以递减的顺序排列行"
+
+#: src/diffuse/window.py:806
+msgid "Remove Trailing _White Space"
+msgstr "删除多余的空格(_W)"
+
+#: src/diffuse/window.py:807
+msgid "Convert Tabs To _Spaces"
+msgstr "转换制表符为空格(_S)"
+
+#: src/diffuse/window.py:808
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "转换开头的空格为制表符(_T)"
+
+#: src/diffuse/window.py:810
+msgid "_Increase Indenting"
+msgstr "减少缩进(_I)"
+
+#: src/diffuse/window.py:811
+msgid "De_crease Indenting"
+msgstr "减少缩进"
+
+#: src/diffuse/window.py:813
+msgid "Convert To _DOS Format"
+msgstr "转换为DOS格式(_D)"
+
+#: src/diffuse/window.py:814
+msgid "Convert To _Mac Format"
+msgstr "转换为Mac格式(_M)"
+
+#: src/diffuse/window.py:815
+msgid "Convert To Uni_x Format"
+msgstr "转换为Unix格式(_X)"
+
+#: src/diffuse/window.py:819
+msgid "_Merge"
+msgstr "合并(_M)"
+
+#: src/diffuse/window.py:821
+msgid "Copy Selection _Right"
+msgstr "复制选择之处到右边(_R)"
+
+#: src/diffuse/window.py:822
+msgid "Copy Selection _Left"
+msgstr "复制选择之处到左边(_L)"
+
+#: src/diffuse/window.py:824
+msgid "Copy Left _Into Selection"
+msgstr "复制左边内容到选择之处(_L)"
+
+#: src/diffuse/window.py:825
+msgid "Copy Right I_nto Selection"
+msgstr "复制右边内容到选择之处(_L)"
+
+#: src/diffuse/window.py:826
+msgid "_Merge From Left Then Right"
+msgstr "先左再右合并(_M)"
+
+#: src/diffuse/window.py:827
+msgid "M_erge From Right Then Left"
+msgstr "先右后左合并(_E)"
+
+#: src/diffuse/window.py:831
+msgid "_Help"
+msgstr "帮助(_H)"
+
+#: src/diffuse/window.py:833
+msgid "_Help Contents..."
+msgstr "帮助内容(_H)"
+
+#: src/diffuse/window.py:835
+#, python-format
+msgid "_About %s..."
+msgstr "关于%s(_A)"
+
+#: src/diffuse/window.py:847
+msgid "New 2-Way File Merge"
+msgstr "新建2方文件合并"
+
+#: src/diffuse/window.py:848
+msgid "New 3-Way File Merge"
+msgstr "新建3方文件合并"
+
+#: src/diffuse/window.py:850
+msgid "Realign All"
+msgstr "重新对齐所有"
+
+#: src/diffuse/window.py:851
+msgid "First Difference"
+msgstr "第一个不同之处"
+
+#: src/diffuse/window.py:852
+msgid "Previous Difference"
+msgstr "前一个不同之处"
+
+#: src/diffuse/window.py:853
+msgid "Next Difference"
+msgstr "下一个不同之处"
+
+#: src/diffuse/window.py:854
+msgid "Last Difference"
+msgstr "最后一个不同之处"
+
+#: src/diffuse/window.py:856
+msgid "Copy Selection Right"
+msgstr "复制选择之处到右边"
+
+#: src/diffuse/window.py:857
+msgid "Copy Selection Left"
+msgstr "复制选择之处到左边"
+
+#: src/diffuse/window.py:858
+msgid "Copy Left Into Selection"
+msgstr "复制左边内容到选择之处"
+
+#: src/diffuse/window.py:859
+msgid "Copy Right Into Selection"
+msgstr "复制右边内容到选择之处"
+
+#: src/diffuse/window.py:860
+msgid "Merge From Left Then Right"
+msgstr "先左后右合并"
+
+#: src/diffuse/window.py:861
+msgid "Merge From Right Then Left"
+msgstr "先右后左合并(_T)"
+
+#: src/diffuse/window.py:863
+msgid "Undo"
+msgstr "恢复"
+
+#: src/diffuse/window.py:864
+msgid "Redo"
+msgstr "重做"
+
+#: src/diffuse/window.py:950
+msgid "Changes detected"
+msgstr ""
+
+#: src/diffuse/window.py:954
+#, fuzzy, python-format
+msgid ""
+"The file \"%s\" changed on disk.\n"
+"\n"
+"Do you want to reload the file?"
+msgstr "磁盘文件%s已被更改，是否重新载入？"
+
+#: src/diffuse/window.py:959
+#, fuzzy, python-format
+msgid ""
+"The following files changed on disk:\n"
+"%s\n"
+"\n"
+"Do you want to reload these files?"
+msgstr "磁盘文件%s已被更改，是否重新载入？"
+
+#: src/diffuse/window.py:1078
+msgid "Some files have unsaved changes. Select the files to save before closing."
+msgstr "一些文件包含未保存的更改。请在关闭前保存这些文件。"
+
+#: src/diffuse/window.py:1092
+msgid "Tab"
+msgstr "标签"
+
+#: src/diffuse/window.py:1097
+msgid "Pane"
+msgstr "窗格"
+
+#: src/diffuse/window.py:1108
+msgid "Close _Without Saving"
+msgstr "不保存而关闭"
+
+#: src/diffuse/window.py:1147
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "关闭此标签将会退出%s"
+
+#: src/diffuse/window.py:1224
+#, python-format
+msgid "File Merge %d"
+msgstr "文件合并%d"
+
+#: src/diffuse/window.py:1344
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "錯誤修改提交%s。"
+
+#: src/diffuse/window.py:1376
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "无法恢复对%s的修改。"
+
+#: src/diffuse/window.py:1409
+msgid "Open File In New Tab"
+msgstr "在新标签里打开文件"
+
+#: src/diffuse/window.py:1432
+msgid "Choose Folder With Modified Files"
+msgstr "选择更改过的文件夹"
+
+#: src/diffuse/window.py:1450
+msgid "No modified files found."
+msgstr "没有找到修改过的文件。"
+
+#: src/diffuse/window.py:1456
+msgid "Choose Folder With Commit"
+msgstr "选择提交的文件夹"
+
+#: src/diffuse/window.py:1476
+msgid "No committed files found."
+msgstr "没有找到提交的文件。"
+
+#: src/diffuse/window.py:1512
+msgid "New N-Way File Merge..."
+msgstr "新建多方文件合并"
+
+#: src/diffuse/window.py:1513
+msgid "Number of panes: "
+msgstr "窗格数: "
+
+#: src/diffuse/window.py:1587
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "短语未找到，从文件结尾继续吗？"
+
+#: src/diffuse/window.py:1589
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "短语未找到，从文件开头继续吗？"
+
+#: src/diffuse/window.py:1762
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr "Diffuse是一个合并和比较文本文件的图形化程序。"
+
+#: src/diffuse/window.py:1766
+msgid "translator-credits"
+msgstr "Liu Hao <jarryson@gmail.com>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage:\n"
+#~ "    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"
+#~ "also retrieve revisions of files from several VCSs for comparison and "
+#~ "merging.\n"
+#~ "\n"
+#~ "Help Options:\n"
+#~ "  ( -h | -? | --help )             Display this usage information\n"
+#~ "  ( -v | --version )               Display version and copyright information\n"
+#~ "\n"
+#~ "Configuration Options:\n"
+#~ "  --no-rcfile                      Do not read any resource files\n"
+#~ "  --rcfile <file>                  Specify explicit resource file\n"
+#~ "\n"
+#~ "General Options:\n"
+#~ "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
+#~ "  ( -D | --close-if-same )         Close all tabs with no differences\n"
+#~ "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+#~ "  ( -L | --label ) <label>         Display <label> instead of the file name\n"
+#~ "  ( -m | --modified )              Create a new tab for each modified file\n"
+#~ "  ( -r | --revision ) <rev>        File revision <rev>\n"
+#~ "  ( -s | --separate )              Create a new tab for each file\n"
+#~ "  ( -t | --tab )                   Start a new tab\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    Start with line <line> selected\n"
+#~ "  --null-file                      Create a blank file comparison pane\n"
+#~ "\n"
+#~ "Display Options:\n"
+#~ "  ( -b | --ignore-space-change )   Ignore changes to white space\n"
+#~ "  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
+#~ "  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
+#~ "  ( -i | --ignore-case )           Ignore case differences\n"
+#~ "  ( -w | --ignore-all-space )      Ignore white space differences"
+#~ msgstr ""
+#~ "用法:\n"
+#~ "    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"
+#~ "also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
+#~ "Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
+#~ "\n"
+#~ "帮助参数:\n"
+#~ "  ( -h | -? | --help )             显示词使用信息\n"
+#~ "  ( -v | --version )               现实版本和版权信息\n"
+#~ "\n"
+#~ "配置参数:\n"
+#~ "  --no-rcfile                      不要读取任何源文件\n"
+#~ "  --rcfile <file>                  指定明确的源文件\n"
+#~ "\n"
+#~ "其它参数:\n"
+#~ "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
+#~ "  ( -D | --close-if-same )         Close all tabs with no differences\n"
+#~ "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+#~ "  ( -L | --label ) <label>         Display <label> instead of the file name\n"
+#~ "  ( -m | --modified )              Create a new tab for each modified file\n"
+#~ "  ( -r | --revision ) <rev>        File revision <rev>\n"
+#~ "  ( -s | --separate )              Create a new tab for each file\n"
+#~ "  ( -t | --tab )                   Start a new tab\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    Start with line <line> selected\n"
+#~ "  --null-file                      Create a blank file comparison pane\n"
+#~ "\n"
+#~ "显示参数:\n"
+#~ "  ( -b | --ignore-space-change )   忽略对空白的改变\n"
+#~ "  ( -B | --ignore-blank-lines )    忽略对空行的改变\n"
+#~ "  ( -E | --ignore-end-of-line )    忽略行尾的不同\n"
+#~ "  ( -i | --ignore-case )           忽略小结的不同\n"
+#~ "  ( -w | --ignore-all-space )      忽略所有空白的不同"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4b49c0e..47b9d0e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse 0.4.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-23 20:00-0400\n"
+"POT-Creation-Date: 2023-04-16 14:09-0400\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"
@@ -32,818 +32,303 @@ 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."
+"files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, and "
+"Subversion repositories."
 msgstr ""
 
-#: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
-msgid "Main window: diff between two files"
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:28
+msgid "Main window"
 msgstr ""
 
-#: src/diffuse/constants.py:25
+#: data/io.github.mightycreak.Diffuse.appdata.xml.in:32
+msgid "About window"
+msgstr ""
+
+#: src/diffuse/constants.py:26
 msgid "Copyright"
 msgstr "著作權"
 
-#: src/diffuse/dialogs.py:40
-msgid "Diffuse is a graphical tool for merging and comparing text files."
-msgstr "Diffuse 是一個合併與比較文字檔案的圖形工具。"
-
-#: src/diffuse/dialogs.py:45
-msgid "translator-credits"
+#: src/diffuse/dialogs.py:46 src/diffuse/dialogs.py:89 src/diffuse/dialogs.py:133
+#: src/diffuse/preferences.py:254 src/diffuse/preferences.py:483
+#: src/diffuse/window.py:309 src/diffuse/window.py:1107
+msgid "_Cancel"
 msgstr ""
-"紀明村 <tw.chi.ming@gmail.com>\n"
-"趙惟倫 <bluebat@member.fsf.org>"
 
-#: src/diffuse/dialogs.py:82
+#: src/diffuse/dialogs.py:50
 msgid "Encoding: "
 msgstr "編碼："
 
-#: src/diffuse/dialogs.py:94
+#: src/diffuse/dialogs.py:62
 msgid "Revision: "
 msgstr "修訂："
 
-#: src/diffuse/dialogs.py:156
+#: src/diffuse/dialogs.py:90 src/diffuse/dialogs.py:134
+#: src/diffuse/preferences.py:255
+msgid "_OK"
+msgstr ""
+
+#: src/diffuse/dialogs.py:130
 msgid "Find..."
 msgstr "搜尋…"
 
-#: src/diffuse/dialogs.py:164
+#: src/diffuse/dialogs.py:140
 msgid "Search For: "
 msgstr "搜尋："
 
-#: src/diffuse/dialogs.py:189
+#: src/diffuse/dialogs.py:165
 msgid "Match Case"
 msgstr "符合大小寫"
 
-#: src/diffuse/dialogs.py:194
+#: src/diffuse/dialogs.py:170
 msgid "Search Backwards"
 msgstr "反向搜尋"
 
+#: src/diffuse/main.py:53
+msgid "Display version and copyright information"
+msgstr "顯示版本與著作權資訊"
+
+#: src/diffuse/main.py:61
+msgid "Do not read any resource files"
+msgstr "不讀取任何資源檔案"
+
+#: src/diffuse/main.py:69
+msgid "Specify explicit resource file"
+msgstr "指定明確的資源檔案"
+
+#: src/diffuse/main.py:77
+msgid "File revisions <rev-1> and <rev>"
+msgstr "檔案修訂 <rev-1> 與 <rev>"
+
 #: src/diffuse/main.py:85
-msgid "Close Tab"
-msgstr "關閉分頁"
+msgid "Close all tabs with no differences"
+msgstr "關閉所有不具任何差異的分頁"
 
-#: src/diffuse/main.py:132
-msgid "Open File..."
-msgstr "開啟檔案…"
+#: src/diffuse/main.py:92
+msgid "Use <codec> to read and write files"
+msgstr "使用 <codec> 以讀取與寫入檔案"
 
-#: src/diffuse/main.py:133
-msgid "Reload File"
-msgstr "重新載入"
+#: src/diffuse/main.py:100
+msgid "Display <label> instead of the file name"
+msgstr "顯示 <label> 以代替檔案名稱"
 
-#: src/diffuse/main.py:134
-msgid "Save File"
-msgstr "儲存檔案"
+#: src/diffuse/main.py:108
+msgid "Create a new tab for each modified file"
+msgstr "對於每個已修改檔案建立新的分頁"
 
-#: src/diffuse/main.py:135
-msgid "Save File As..."
-msgstr "另存為…"
+#: src/diffuse/main.py:115
+msgid "File revision <rev>"
+msgstr "檔案修訂 <rev>"
 
-#: src/diffuse/main.py:217
-#, python-format
-msgid "Column %d"
-msgstr "第 %d 行"
+#: src/diffuse/main.py:123
+msgid "Create a new tab for each file"
+msgstr "對於每個檔案建立新的分頁"
 
-#: src/diffuse/main.py:291
-msgid "Save changes before loading the new file?"
-msgstr "載入新檔前儲存更改嗎？"
+#: src/diffuse/main.py:130
+msgid "Start a new tab"
+msgstr "開始新的分頁"
 
-#: src/diffuse/main.py:402
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "無法讀取檔案 %(file)s 中的修訂版本 %(rev)s。"
+#: src/diffuse/main.py:137 src/diffuse/preferences.py:159
+msgid "Version control system search order"
+msgstr ""
 
-#: src/diffuse/main.py:405 src/diffuse/main.py:1860
+#: src/diffuse/main.py:145
+msgid "Start with line <line> selected"
+msgstr "開始時已選第 <line> 列"
+
+#: src/diffuse/main.py:153
+msgid "Create a blank file comparison pane"
+msgstr "建立空白檔案的比較窗格"
+
+#: src/diffuse/main.py:160 src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:95
+msgid "Ignore changes to white space"
+msgstr "忽略對空格的改變"
+
+#: src/diffuse/main.py:167
+msgid "Ignore changes in blank lines"
+msgstr "忽略空列的變更"
+
+#: src/diffuse/main.py:174 src/diffuse/preferences.py:88
+msgid "Ignore end of line differences"
+msgstr "忽略列尾的差異"
+
+#: src/diffuse/main.py:181 src/diffuse/preferences.py:84
+msgid "Ignore case differences"
+msgstr "忽略大小寫的差異"
+
+#: src/diffuse/main.py:188 src/diffuse/preferences.py:85
+msgid "Ignore white space differences"
+msgstr "忽略空格的差異"
+
+#: src/diffuse/main.py:191
+msgid ""
+"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 several VCSs for comparison and merging."
+msgstr ""
+
+#: src/diffuse/main.py:247 src/diffuse/window.py:420
 #, python-format
 msgid "Error reading %s."
 msgstr "無法讀取 %s。"
 
-#: src/diffuse/main.py:427
-msgid "Open File"
-msgstr "開啟檔案"
-
-#: src/diffuse/main.py:484
-#, python-format
-msgid "The file %s changed on disk. Do you want to reload the file?"
-msgstr "檔案 %s 已被更改，是否重新載入？"
-
-#: src/diffuse/main.py:510
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "儲存 %(title)s 窗格 %(pane)d"
-
-#: src/diffuse/main.py:542
-#, python-format
-msgid "A file named %s already exists. Do you want to overwrite it?"
-msgstr "%s 的檔案已存在，您希望覆蓋它嗎？"
-
-#: src/diffuse/main.py:549
-#, python-format
-msgid ""
-"The file %s has been modified by another process since reading it. If you save, "
-"all the external changes could be lost. Save anyways?"
-msgstr ""
-"檔案 %s 打開後被其他程式變更過了，如果儲存，其他程式的變更修改將會不見，儲存嗎？"
-
-#: src/diffuse/main.py:591
-#, python-format
-msgid "Error encoding to %s."
-msgstr "無法編碼為 %s。"
-
-#: src/diffuse/main.py:595 src/diffuse/preferences.py:300
-#, python-format
-msgid "Error writing %s."
-msgstr "無法寫入 %s"
-
-#: src/diffuse/main.py:625
-msgid "Go To Line..."
-msgstr "跳到列號…"
-
-#: src/diffuse/main.py:626
-msgid "Line Number: "
-msgstr "列數："
-
-#: src/diffuse/main.py:657
-msgid ""
-"Press the enter key or double click to edit. Press the space bar or use the RMB "
-"menu to manually align."
-msgstr "按確定鍵或雙擊滑鼠進行編輯。空格鍵或者右鍵選單手動對齊。"
-
-#: src/diffuse/main.py:661
-msgid "Press the escape key to finish editing."
-msgstr "按 ESC 鍵結束編輯"
-
-#: src/diffuse/main.py:664
-msgid ""
-"Select target line and press the space bar to align. Press the escape key to "
-"cancel."
-msgstr "選擇目標列然後按空格鍵進行對齊，按 ESC 取消。"
-
-#: src/diffuse/main.py:787
-msgid "_File"
-msgstr "檔案(_F)"
-
-#: src/diffuse/main.py:788
-msgid "_Open File..."
-msgstr "開啟檔案(_O)…"
-
-#: src/diffuse/main.py:789
-msgid "Open File In New _Tab..."
-msgstr "在新分頁裡開啟檔案(_T)…"
-
-#: src/diffuse/main.py:790
-msgid "Open _Modified Files..."
-msgstr "開啟修改過的檔案(_M)…"
-
-#: src/diffuse/main.py:791
-msgid "Open Commi_t..."
-msgstr "開啟認可(_T)…"
-
-#: src/diffuse/main.py:792
-msgid "_Reload File"
-msgstr "重新載入(_R)"
-
-#: src/diffuse/main.py:794
-msgid "_Save File"
-msgstr "儲存(_S)"
-
-#: src/diffuse/main.py:795
-msgid "Save File _As..."
-msgstr "另存為(_A)…"
-
-#: src/diffuse/main.py:796
-msgid "Save A_ll"
-msgstr "儲存所有(_L)"
-
-#: src/diffuse/main.py:798
-msgid "New _2-Way File Merge"
-msgstr "新的二重檔案合併(_2)"
-
-#: src/diffuse/main.py:799
-msgid "New _3-Way File Merge"
-msgstr "新的三重檔案合併(_3)"
-
-#: src/diffuse/main.py:800
-msgid "New _N-Way File Merge..."
-msgstr "新的多重檔案合併(_N)…"
-
-#: src/diffuse/main.py:802
-msgid "_Close Tab"
-msgstr "關閉分頁(_C)"
-
-#: src/diffuse/main.py:803
-msgid "_Undo Close Tab"
-msgstr "復原關閉的分頁"
-
-#: src/diffuse/main.py:804
-msgid "_Quit"
-msgstr "退出(_Q)"
-
-#: src/diffuse/main.py:807
-msgid "_Edit"
-msgstr "編輯(_E)"
-
-#: src/diffuse/main.py:808
-msgid "_Undo"
-msgstr "復原(_U)"
-
-#: src/diffuse/main.py:809
-msgid "_Redo"
-msgstr "重做(_R)"
-
-#: src/diffuse/main.py:811
-msgid "Cu_t"
-msgstr "剪下(_T)"
-
-#: src/diffuse/main.py:812
-msgid "_Copy"
-msgstr "複製(_C)"
-
-#: src/diffuse/main.py:813
-msgid "_Paste"
-msgstr "貼上(_P)"
-
-#: src/diffuse/main.py:815
-msgid "Select _All"
-msgstr "全選(_A)"
-
-#: src/diffuse/main.py:816
-msgid "C_lear Edits"
-msgstr "取消編輯(L)"
-
-#: src/diffuse/main.py:817
-msgid "_Dismiss All Edits"
-msgstr "放棄所有的變更(_D)"
-
-#: src/diffuse/main.py:819
-msgid "_Find..."
-msgstr "搜尋(_F)…"
-
-#: src/diffuse/main.py:820
-msgid "Find _Next"
-msgstr "找下一個(_N)"
-
-#: src/diffuse/main.py:821
-msgid "Find Pre_vious"
-msgstr "找上一個(_V)"
-
-#: src/diffuse/main.py:822
-msgid "_Go To Line..."
-msgstr "跳到列號(_G)…"
-
-#: src/diffuse/main.py:824
-msgid "Pr_eferences..."
-msgstr "選項(_E)…"
-
-#: src/diffuse/main.py:828
-msgid "None"
-msgstr "無"
-
-#: src/diffuse/main.py:846
-msgid "_View"
-msgstr "檢視(_V)"
-
-#: src/diffuse/main.py:847
-msgid "_Syntax Highlighting"
-msgstr "高亮度語法(_S)"
-
-#: src/diffuse/main.py:849
-msgid "Re_align All"
-msgstr "全部重新對齊(_A)"
-
-#: src/diffuse/main.py:850
-msgid "_Isolate"
-msgstr "分離(_I)"
-
-#: src/diffuse/main.py:852
-msgid "_First Difference"
-msgstr "第一個差異(_F)"
-
-#: src/diffuse/main.py:853
-msgid "_Previous Difference"
-msgstr "上一個差異(_P)"
-
-#: src/diffuse/main.py:854
-msgid "_Next Difference"
-msgstr "下一個差異(_N)"
-
-#: src/diffuse/main.py:855
-msgid "_Last Difference"
-msgstr "最後一個差異(_L)"
-
-#: src/diffuse/main.py:857
-msgid "Fir_st Tab"
-msgstr "第一個分頁(_S)"
-
-#: src/diffuse/main.py:858
-msgid "Pre_vious Tab"
-msgstr "上一個分頁(_V)"
-
-#: src/diffuse/main.py:859
-msgid "Next _Tab"
-msgstr "下一個分頁(_T)"
-
-#: src/diffuse/main.py:860
-msgid "Las_t Tab"
-msgstr "最後一個分頁(_T)"
-
-#: src/diffuse/main.py:862
-msgid "Shift Pane _Right"
-msgstr "右移窗格(_R)"
-
-#: src/diffuse/main.py:863
-msgid "Shift Pane _Left"
-msgstr "左移窗格(_L)"
-
-#: src/diffuse/main.py:866
-msgid "F_ormat"
-msgstr "格式(_O)"
-
-#: src/diffuse/main.py:867
-msgid "Convert To _Upper Case"
-msgstr "轉換成大寫"
-
-#: src/diffuse/main.py:868
-msgid "Convert To _Lower Case"
-msgstr "轉換成小寫"
-
-#: src/diffuse/main.py:870
-msgid "Sort Lines In _Ascending Order"
-msgstr "以遞增的順序排列"
-
-#: src/diffuse/main.py:871
-msgid "Sort Lines In D_escending Order"
-msgstr "以遞減的順序排列"
-
-#: src/diffuse/main.py:873
-msgid "Remove Trailing _White Space"
-msgstr "刪除多餘的空格(_W)"
-
-#: src/diffuse/main.py:874
-msgid "Convert Tabs To _Spaces"
-msgstr "轉換跳格字元為空格(_S)"
-
-#: src/diffuse/main.py:875
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "轉換開頭的空格為跳格字元(_T)"
-
-#: src/diffuse/main.py:877
-msgid "_Increase Indenting"
-msgstr "減少縮排(_I)"
-
-#: src/diffuse/main.py:878
-msgid "De_crease Indenting"
-msgstr "減少縮排"
-
-#: src/diffuse/main.py:880
-msgid "Convert To _DOS Format"
-msgstr "轉換為 DOS 格式(_D)"
-
-#: src/diffuse/main.py:881
-msgid "Convert To _Mac Format"
-msgstr "轉換為 Mac 格式(_M)"
-
-#: src/diffuse/main.py:882
-msgid "Convert To Uni_x Format"
-msgstr "轉換為 Unix 格式(_X)"
-
-#: src/diffuse/main.py:885
-msgid "_Merge"
-msgstr "合併(_M)"
-
-#: src/diffuse/main.py:886
-msgid "Copy Selection _Right"
-msgstr "複製選擇區域到右邊(_R)"
-
-#: src/diffuse/main.py:887
-msgid "Copy Selection _Left"
-msgstr "複製選擇區域到左邊(_L)"
-
-#: src/diffuse/main.py:889
-msgid "Copy Left _Into Selection"
-msgstr "複製左邊內容到選擇區域(_L)"
-
-#: src/diffuse/main.py:890
-msgid "Copy Right I_nto Selection"
-msgstr "複製右邊內容到選擇區域(_L)"
-
-#: src/diffuse/main.py:891
-msgid "_Merge From Left Then Right"
-msgstr "先左再右合併(_M)"
-
-#: src/diffuse/main.py:892
-msgid "M_erge From Right Then Left"
-msgstr "從右向左合併(_E)"
-
-#: src/diffuse/main.py:895
-msgid "_Help"
-msgstr "求助(_H)"
-
-#: src/diffuse/main.py:896
-msgid "_Help Contents..."
-msgstr "說明內容(_H)…"
-
-#: src/diffuse/main.py:898
-#, python-format
-msgid "_About %s..."
-msgstr "關於 %s(_A)…"
-
-#: src/diffuse/main.py:913
-msgid "New 2-Way File Merge"
-msgstr "新的二重檔案合併"
-
-#: src/diffuse/main.py:914
-msgid "New 3-Way File Merge"
-msgstr "新的三重檔案合併"
-
-#: src/diffuse/main.py:916
-msgid "Realign All"
-msgstr "全部重新對齊"
-
-#: src/diffuse/main.py:917
-msgid "First Difference"
-msgstr "第一個差異"
-
-#: src/diffuse/main.py:918
-msgid "Previous Difference"
-msgstr "上一個差異"
-
-#: src/diffuse/main.py:919
-msgid "Next Difference"
-msgstr "下一個差異"
-
-#: src/diffuse/main.py:920
-msgid "Last Difference"
-msgstr "最後一個差異"
-
-#: src/diffuse/main.py:922
-msgid "Copy Selection Right"
-msgstr "複製選擇區域到右邊"
-
-#: src/diffuse/main.py:923
-msgid "Copy Selection Left"
-msgstr "複製選擇區域到左邊"
-
-#: src/diffuse/main.py:924
-msgid "Copy Left Into Selection"
-msgstr "複製左邊內容到選擇區域"
-
-#: src/diffuse/main.py:925
-msgid "Copy Right Into Selection"
-msgstr "複製右邊內容到選擇區域"
-
-#: src/diffuse/main.py:926
-msgid "Merge From Left Then Right"
-msgstr "先左後右合併"
-
-#: src/diffuse/main.py:927
-msgid "Merge From Right Then Left"
-msgstr "先右後左合併(_T)"
-
-#: src/diffuse/main.py:929
-msgid "Undo"
-msgstr "復原"
-
-#: src/diffuse/main.py:930
-msgid "Redo"
-msgstr "重做"
-
-#: src/diffuse/main.py:931 src/diffuse/widgets.py:1861
-msgid "Cut"
-msgstr "剪下"
-
-#: src/diffuse/main.py:932 src/diffuse/widgets.py:1862
-msgid "Copy"
-msgstr "複製"
-
-#: src/diffuse/main.py:933 src/diffuse/widgets.py:1863
-msgid "Paste"
-msgstr "貼上"
-
-#: src/diffuse/main.py:934 src/diffuse/widgets.py:1866
-msgid "Clear Edits"
-msgstr "取消編輯"
-
-#: src/diffuse/main.py:1057
-msgid "Some files have unsaved changes. Select the files to save before closing."
-msgstr "一些檔案已變更但未儲存，請在關閉前儲存這些檔案。"
-
-#: src/diffuse/main.py:1071
-msgid "Tab"
-msgstr "跳格字元"
-
-#: src/diffuse/main.py:1076
-msgid "Pane"
-msgstr "窗格"
-
-#: src/diffuse/main.py:1087
-msgid "Close _Without Saving"
-msgstr "不儲存而關閉"
-
-#: src/diffuse/main.py:1126
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "關閉此分頁將會退出 %s"
-
-#: src/diffuse/main.py:1209
-#, python-format
-msgid "File Merge %d"
-msgstr "檔案合併 %d"
-
-#: src/diffuse/main.py:1315
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "無法恢復對 %s 的認可。"
-
-#: src/diffuse/main.py:1347
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "無法恢復對 %s 的修改。"
-
-#: src/diffuse/main.py:1380
-msgid "Open File In New Tab"
-msgstr "在新分頁裡開啟檔案"
-
-#: src/diffuse/main.py:1403
-msgid "Choose Folder With Modified Files"
-msgstr "選擇更改過的檔案夾"
-
-#: src/diffuse/main.py:1421
-msgid "No modified files found."
-msgstr "找不到已修改的檔案。"
-
-#: src/diffuse/main.py:1427
-msgid "Choose Folder With Commit"
-msgstr "選擇認可過的檔案夾"
-
-#: src/diffuse/main.py:1447
-msgid "No committed files found."
-msgstr "找不到已認可的檔案。"
-
-#: src/diffuse/main.py:1483
-msgid "New N-Way File Merge..."
-msgstr "新的多重檔案合併…"
-
-#: src/diffuse/main.py:1484
-msgid "Number of panes: "
-msgstr "窗格數: "
-
-#: src/diffuse/main.py:1558
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "語詞未找到，從檔案結尾繼續嗎？"
-
-#: src/diffuse/main.py:1560
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "語詞未找到，從檔案開頭繼續嗎？"
-
-#: src/diffuse/main.py:1781
-#, fuzzy
-msgid ""
-"Usage:\n"
-"    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"
-"also retrieve revisions of files from several VCSs for comparison and merging.\n"
-"\n"
-"Help Options:\n"
-"  ( -h | -? | --help )             Display this usage information\n"
-"  ( -v | --version )               Display version and copyright information\n"
-"\n"
-"Configuration Options:\n"
-"  --no-rcfile                      Do not read any resource files\n"
-"  --rcfile <file>                  Specify explicit resource file\n"
-"\n"
-"General Options:\n"
-"  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
-"  ( -D | --close-if-same )         Close all tabs with no differences\n"
-"  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
-"  ( -L | --label ) <label>         Display <label> instead of the file name\n"
-"  ( -m | --modified )              Create a new tab for each modified file\n"
-"  ( -r | --revision ) <rev>        File revision <rev>\n"
-"  ( -s | --separate )              Create a new tab for each file\n"
-"  ( -t | --tab )                   Start a new tab\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    Start with line <line> selected\n"
-"  --null-file                      Create a blank file comparison pane\n"
-"\n"
-"Display Options:\n"
-"  ( -b | --ignore-space-change )   Ignore changes to white space\n"
-"  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
-"  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
-"  ( -i | --ignore-case )           Ignore case differences\n"
-"  ( -w | --ignore-all-space )      Ignore white space differences"
-msgstr ""
-"用法：\n"
-"    diffuse [ [選項…] [檔案…] ]…\n"
-"    diffuse ( -h | -? | --help | -v | --version )\n"
-"\n"
-"Diffuse 是用於合併與比較文字檔的圖形工具。 Diffuse \n"
-"能夠一起比較任意數量的檔案，並給予使用者\n"
-"手動調整各列匹配與直接編輯檔案的能力。 Diffuse 也可以\n"
-"從 Bazaar、CVS、Darcs、Git、Mercurial、Monotone、RCS、\n"
-"Subversion 以及 SVK 儲存庫取回修訂的檔案用於比較與合併。\n"
-"\n"
-"求助選項：\n"
-"  ( -h | -? | --help )             顯示這個用法資訊\n"
-"  ( -v | --version )               顯示版本與著作權資訊\n"
-"\n"
-"組態選項：\n"
-"  --no-rcfile                      不讀取任何資源檔案\n"
-"  --rcfile <file>                  指定明確的資源檔案\n"
-"\n"
-"一般選項：\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"
-"  ( -r | --revision ) <rev>        檔案修訂 <rev>\n"
-"  ( -s | --separate )              對於每個檔案建立新的分頁\n"
-"  ( -t | --tab )                   開始新的分頁\n"
-"  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
-"  --line <line>                    開始時已選第 <line> 列\n"
-"  --null-file                      建立空白檔案的比較窗格\n"
-"\n"
-"顯示選項：\n"
-"  ( -b | --ignore-space-change )   忽略空白的變更\n"
-"  ( -B | --ignore-blank-lines )    忽略空列的變更\n"
-"  ( -E | --ignore-end-of-line )    忽略列尾差異\n"
-"  ( -i | --ignore-case )           忽略大小寫差異\n"
-"  ( -w | --ignore-all-space )      忽略空白差異"
-
-#: src/diffuse/main.py:1948
+#: src/diffuse/main.py:327
 msgid "Error parsing line number."
 msgstr "解析列數時錯誤。"
 
-#: src/diffuse/main.py:1958
-#, python-format
-msgid "Skipping unknown argument \"%s\"."
-msgstr "跳過未知引數「%s」。"
-
-#: src/diffuse/main.py:1966
+#: src/diffuse/main.py:343
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "無法處理「%s」。目錄不存在。"
 
-#: src/diffuse/preferences.py:80
+#: src/diffuse/preferences.py:75
 msgid "Display"
 msgstr "顯示"
 
-#: src/diffuse/preferences.py:83
+#: src/diffuse/preferences.py:78
 msgid "Font"
 msgstr "字型"
 
-#: src/diffuse/preferences.py:84
+#: src/diffuse/preferences.py:79
 msgid "Tab width"
 msgstr "跳格寬度"
 
-#: src/diffuse/preferences.py:85
+#: src/diffuse/preferences.py:80
 msgid "Show right margin"
 msgstr "顯示右邊距"
 
-#: src/diffuse/preferences.py:86
+#: src/diffuse/preferences.py:81
 msgid "Right margin"
 msgstr "右邊距"
 
-#: src/diffuse/preferences.py:87
+#: src/diffuse/preferences.py:82
 msgid "Show line numbers"
 msgstr "顯示列號"
 
-#: src/diffuse/preferences.py:88
+#: src/diffuse/preferences.py:83
 msgid "Show white space characters"
 msgstr "顯示空格"
 
-#: src/diffuse/preferences.py:89
-msgid "Ignore case differences"
-msgstr "忽略大小寫的差異"
-
-#: src/diffuse/preferences.py:90
-msgid "Ignore white space differences"
-msgstr "忽略空格的差異"
-
-#: src/diffuse/preferences.py:91 src/diffuse/preferences.py:100
-msgid "Ignore changes to white space"
-msgstr "忽略對空格的改變"
-
-#: src/diffuse/preferences.py:92
+#: src/diffuse/preferences.py:87
 msgid "Ignore blank line differences"
 msgstr "忽略空列的差異"
 
-#: src/diffuse/preferences.py:93
-msgid "Ignore end of line differences"
-msgstr "忽略列尾的差異"
-
-#: src/diffuse/preferences.py:95
+#: src/diffuse/preferences.py:90
 msgid "Alignment"
 msgstr "對齊"
 
-#: src/diffuse/preferences.py:98
+#: src/diffuse/preferences.py:93
 msgid "Ignore case"
 msgstr "忽略大小寫"
 
-#: src/diffuse/preferences.py:99
+#: src/diffuse/preferences.py:94
 msgid "Ignore white space"
 msgstr "忽略空格"
 
-#: src/diffuse/preferences.py:101
+#: src/diffuse/preferences.py:96
 msgid "Ignore blank lines"
 msgstr "忽略空列"
 
-#: src/diffuse/preferences.py:102
+#: src/diffuse/preferences.py:97
 msgid "Ignore end of line characters"
 msgstr "忽略列尾字元"
 
-#: src/diffuse/preferences.py:104
+#: src/diffuse/preferences.py:99
 msgid "Editor"
 msgstr "編輯器"
 
-#: src/diffuse/preferences.py:107
+#: src/diffuse/preferences.py:102
 msgid "Auto indent"
 msgstr "自動縮排"
 
-#: src/diffuse/preferences.py:108
+#: src/diffuse/preferences.py:103
 msgid "Expand tabs to spaces"
 msgstr "展開跳格字元為空格"
 
-#: src/diffuse/preferences.py:109
+#: src/diffuse/preferences.py:104
 msgid "Soft tab width"
 msgstr "跳格寬度"
 
-#: src/diffuse/preferences.py:111
+#: src/diffuse/preferences.py:106
 msgid "Tabs"
 msgstr "分頁"
 
-#: src/diffuse/preferences.py:114
+#: src/diffuse/preferences.py:109
 msgid "Default panes"
 msgstr "預設窗格"
 
-#: src/diffuse/preferences.py:115
+#: src/diffuse/preferences.py:110
 msgid "Always show the tab bar"
 msgstr "總是顯示分頁欄"
 
-#: src/diffuse/preferences.py:116
+#: src/diffuse/preferences.py:111
 #, python-format
 msgid "Warn me when closing a tab will quit %s"
 msgstr "當關閉分頁會退出 %s 的時候提醒我"
 
-#: src/diffuse/preferences.py:118
+#: src/diffuse/preferences.py:113
 msgid "Regional Settings"
 msgstr "設定"
 
-#: src/diffuse/preferences.py:121
+#: src/diffuse/preferences.py:116
 msgid "Default codec"
 msgstr "預設解碼器"
 
-#: src/diffuse/preferences.py:122
+#: src/diffuse/preferences.py:117
 msgid "Order of codecs used to identify encoding"
 msgstr "用來識別編碼的解碼器順序"
 
-#: src/diffuse/preferences.py:143
+#: src/diffuse/preferences.py:138
 msgid "Cygwin"
 msgstr "Cygwin"
 
-#: src/diffuse/preferences.py:145
+#: src/diffuse/preferences.py:140
 msgid "Root directory"
 msgstr "根目錄"
 
-#: src/diffuse/preferences.py:146
+#: src/diffuse/preferences.py:141
 msgid "Cygdrive prefix"
 msgstr "Cygdrive 前綴"
 
-#: src/diffuse/preferences.py:165
-msgid "Version control system search order"
-msgstr ""
-
-#: src/diffuse/preferences.py:173
+#: src/diffuse/preferences.py:167
 msgid "\"co\" command"
 msgstr "「co」命令"
 
-#: src/diffuse/preferences.py:174
+#: src/diffuse/preferences.py:168
 msgid "\"rlog\" command"
 msgstr "「rlog」命令"
 
-#: src/diffuse/preferences.py:176
+#: src/diffuse/preferences.py:170
 msgid "Command"
 msgstr "命令"
 
-#: src/diffuse/preferences.py:182
+#: src/diffuse/preferences.py:176
 msgid "Launch from a Bash login shell"
 msgstr "從登入命令列介面啟動"
 
-#: src/diffuse/preferences.py:189
+#: src/diffuse/preferences.py:183
 msgid "Update paths for Cygwin"
 msgstr "為 Cygwin 更新路徑"
 
-#: src/diffuse/preferences.py:194
+#: src/diffuse/preferences.py:188
 msgid "Version Control"
 msgstr "版本控制"
 
-#: src/diffuse/preferences.py:259
+#: src/diffuse/preferences.py:253
 msgid "Preferences"
 msgstr "選項"
 
+#: src/diffuse/preferences.py:294 src/diffuse/window.py:580
+#, python-format
+msgid "Error writing %s."
+msgstr "無法寫入 %s"
+
+#: src/diffuse/preferences.py:483 src/diffuse/window.py:446
+#: src/diffuse/window.py:1413 src/diffuse/window.py:1436 src/diffuse/window.py:1459
+msgid "_Open"
+msgstr ""
+
 #: src/diffuse/resources.py:242 src/diffuse/resources.py:246
 #: src/diffuse/resources.py:249
 #, python-brace-format
@@ -929,16 +414,11 @@ msgstr "處理到檔案 {file} 的第 {line} 列時出錯。"
 msgid "Auto Detect"
 msgstr "自動偵測"
 
-#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:97
+#: src/diffuse/vcs/cvs.py:54 src/diffuse/vcs/rcs.py:63 src/diffuse/vcs/svn.py:96
 #, python-format
 msgid "Error parsing revision %s."
 msgstr "無法解析修訂版本 %s。"
 
-#: src/diffuse/vcs/vcs_registry.py:238
-#, python-format
-msgid "Error parsing %s."
-msgstr "無法解析 %s。"
-
 #: src/diffuse/widgets.py:1857
 msgid "Align with Selection"
 msgstr "對齊選擇區域"
@@ -951,10 +431,634 @@ msgstr "分離"
 msgid "Merge Selection"
 msgstr "合併選擇區域"
 
+#: src/diffuse/widgets.py:1861 src/diffuse/window.py:865
+msgid "Cut"
+msgstr "剪下"
+
+#: src/diffuse/widgets.py:1862 src/diffuse/window.py:866
+msgid "Copy"
+msgstr "複製"
+
+#: src/diffuse/widgets.py:1863 src/diffuse/window.py:867
+msgid "Paste"
+msgstr "貼上"
+
 #: src/diffuse/widgets.py:1865
 msgid "Select All"
 msgstr "全選"
 
+#: src/diffuse/widgets.py:1866 src/diffuse/window.py:868
+msgid "Clear Edits"
+msgstr "取消編輯"
+
 #: src/diffuse/widgets.py:1868
 msgid "Swap with Selected Pane"
 msgstr "交換選中的窗格"
+
+#: src/diffuse/window.py:83
+msgid "Close Tab"
+msgstr "關閉分頁"
+
+#: src/diffuse/window.py:126
+msgid "Open File..."
+msgstr "開啟檔案…"
+
+#: src/diffuse/window.py:127
+msgid "Reload File"
+msgstr "重新載入"
+
+#: src/diffuse/window.py:128
+msgid "Save File"
+msgstr "儲存檔案"
+
+#: src/diffuse/window.py:129
+msgid "Save File As..."
+msgstr "另存為…"
+
+#: src/diffuse/window.py:228
+#, python-format
+msgid "Column %d"
+msgstr "第 %d 行"
+
+#: src/diffuse/window.py:306
+msgid "Save changes before loading the new file?"
+msgstr "載入新檔前儲存更改嗎？"
+
+#: src/diffuse/window.py:310
+msgid "_No"
+msgstr ""
+
+#: src/diffuse/window.py:311
+msgid "_Yes"
+msgstr ""
+
+#: src/diffuse/window.py:417
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "無法讀取檔案 %(file)s 中的修訂版本 %(rev)s。"
+
+#: src/diffuse/window.py:442
+msgid "Open File"
+msgstr "開啟檔案"
+
+#: src/diffuse/window.py:495
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "儲存 %(title)s 窗格 %(pane)d"
+
+#: src/diffuse/window.py:499 src/diffuse/window.py:1111
+#, fuzzy
+msgid "_Save"
+msgstr "儲存(_S)"
+
+#: src/diffuse/window.py:527
+#, python-format
+msgid "A file named %s already exists. Do you want to overwrite it?"
+msgstr "%s 的檔案已存在，您希望覆蓋它嗎？"
+
+#: src/diffuse/window.py:534
+#, python-format
+msgid ""
+"The file %s has been modified by another process since reading it. If you save, "
+"all the external changes could be lost. Save anyways?"
+msgstr ""
+"檔案 %s 打開後被其他程式變更過了，如果儲存，其他程式的變更修改將會不見，儲存嗎？"
+
+#: src/diffuse/window.py:576
+#, python-format
+msgid "Error encoding to %s."
+msgstr "無法編碼為 %s。"
+
+#: src/diffuse/window.py:610
+msgid "Go To Line..."
+msgstr "跳到列號…"
+
+#: src/diffuse/window.py:611
+msgid "Line Number: "
+msgstr "列數："
+
+#: src/diffuse/window.py:642
+msgid ""
+"Press the enter key or double click to edit. Press the space bar or use the RMB "
+"menu to manually align."
+msgstr "按確定鍵或雙擊滑鼠進行編輯。空格鍵或者右鍵選單手動對齊。"
+
+#: src/diffuse/window.py:646
+msgid "Press the escape key to finish editing."
+msgstr "按 ESC 鍵結束編輯"
+
+#: src/diffuse/window.py:649
+msgid ""
+"Select target line and press the space bar to align. Press the escape key to "
+"cancel."
+msgstr "選擇目標列然後按空格鍵進行對齊，按 ESC 取消。"
+
+#: src/diffuse/window.py:710
+msgid "_File"
+msgstr "檔案(_F)"
+
+#: src/diffuse/window.py:712
+msgid "_Open File..."
+msgstr "開啟檔案(_O)…"
+
+#: src/diffuse/window.py:713
+msgid "Open File In New _Tab..."
+msgstr "在新分頁裡開啟檔案(_T)…"
+
+#: src/diffuse/window.py:714
+msgid "Open _Modified Files..."
+msgstr "開啟修改過的檔案(_M)…"
+
+#: src/diffuse/window.py:715
+msgid "Open Commi_t..."
+msgstr "開啟認可(_T)…"
+
+#: src/diffuse/window.py:716
+msgid "_Reload File"
+msgstr "重新載入(_R)"
+
+#: src/diffuse/window.py:718
+msgid "_Save File"
+msgstr "儲存(_S)"
+
+#: src/diffuse/window.py:719
+msgid "Save File _As..."
+msgstr "另存為(_A)…"
+
+#: src/diffuse/window.py:720
+msgid "Save A_ll"
+msgstr "儲存所有(_L)"
+
+#: src/diffuse/window.py:722
+msgid "New _2-Way File Merge"
+msgstr "新的二重檔案合併(_2)"
+
+#: src/diffuse/window.py:723
+msgid "New _3-Way File Merge"
+msgstr "新的三重檔案合併(_3)"
+
+#: src/diffuse/window.py:724
+msgid "New _N-Way File Merge..."
+msgstr "新的多重檔案合併(_N)…"
+
+#: src/diffuse/window.py:726
+msgid "_Close Tab"
+msgstr "關閉分頁(_C)"
+
+#: src/diffuse/window.py:727
+msgid "_Undo Close Tab"
+msgstr "復原關閉的分頁"
+
+#: src/diffuse/window.py:728
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+#: src/diffuse/window.py:732
+msgid "_Edit"
+msgstr "編輯(_E)"
+
+#: src/diffuse/window.py:734
+msgid "_Undo"
+msgstr "復原(_U)"
+
+#: src/diffuse/window.py:735
+msgid "_Redo"
+msgstr "重做(_R)"
+
+#: src/diffuse/window.py:737
+msgid "Cu_t"
+msgstr "剪下(_T)"
+
+#: src/diffuse/window.py:738
+msgid "_Copy"
+msgstr "複製(_C)"
+
+#: src/diffuse/window.py:739
+msgid "_Paste"
+msgstr "貼上(_P)"
+
+#: src/diffuse/window.py:741
+msgid "Select _All"
+msgstr "全選(_A)"
+
+#: src/diffuse/window.py:742
+msgid "C_lear Edits"
+msgstr "取消編輯(L)"
+
+#: src/diffuse/window.py:743
+msgid "_Dismiss All Edits"
+msgstr "放棄所有的變更(_D)"
+
+#: src/diffuse/window.py:745
+msgid "_Find..."
+msgstr "搜尋(_F)…"
+
+#: src/diffuse/window.py:746
+msgid "Find _Next"
+msgstr "找下一個(_N)"
+
+#: src/diffuse/window.py:747
+msgid "Find Pre_vious"
+msgstr "找上一個(_V)"
+
+#: src/diffuse/window.py:748
+msgid "_Go To Line..."
+msgstr "跳到列號(_G)…"
+
+#: src/diffuse/window.py:750
+msgid "Pr_eferences..."
+msgstr "選項(_E)…"
+
+#: src/diffuse/window.py:754
+msgid "None"
+msgstr "無"
+
+#: src/diffuse/window.py:776
+msgid "_View"
+msgstr "檢視(_V)"
+
+#: src/diffuse/window.py:778
+msgid "_Syntax Highlighting"
+msgstr "高亮度語法(_S)"
+
+#: src/diffuse/window.py:780
+msgid "Re_align All"
+msgstr "全部重新對齊(_A)"
+
+#: src/diffuse/window.py:781
+msgid "_Isolate"
+msgstr "分離(_I)"
+
+#: src/diffuse/window.py:783
+msgid "_First Difference"
+msgstr "第一個差異(_F)"
+
+#: src/diffuse/window.py:784
+msgid "_Previous Difference"
+msgstr "上一個差異(_P)"
+
+#: src/diffuse/window.py:785
+msgid "_Next Difference"
+msgstr "下一個差異(_N)"
+
+#: src/diffuse/window.py:786
+msgid "_Last Difference"
+msgstr "最後一個差異(_L)"
+
+#: src/diffuse/window.py:788
+msgid "Fir_st Tab"
+msgstr "第一個分頁(_S)"
+
+#: src/diffuse/window.py:789
+msgid "Pre_vious Tab"
+msgstr "上一個分頁(_V)"
+
+#: src/diffuse/window.py:790
+msgid "Next _Tab"
+msgstr "下一個分頁(_T)"
+
+#: src/diffuse/window.py:791
+msgid "Las_t Tab"
+msgstr "最後一個分頁(_T)"
+
+#: src/diffuse/window.py:793
+msgid "Shift Pane _Right"
+msgstr "右移窗格(_R)"
+
+#: src/diffuse/window.py:794
+msgid "Shift Pane _Left"
+msgstr "左移窗格(_L)"
+
+#: src/diffuse/window.py:798
+msgid "F_ormat"
+msgstr "格式(_O)"
+
+#: src/diffuse/window.py:800
+msgid "Convert To _Upper Case"
+msgstr "轉換成大寫"
+
+#: src/diffuse/window.py:801
+msgid "Convert To _Lower Case"
+msgstr "轉換成小寫"
+
+#: src/diffuse/window.py:803
+msgid "Sort Lines In _Ascending Order"
+msgstr "以遞增的順序排列"
+
+#: src/diffuse/window.py:804
+msgid "Sort Lines In D_escending Order"
+msgstr "以遞減的順序排列"
+
+#: src/diffuse/window.py:806
+msgid "Remove Trailing _White Space"
+msgstr "刪除多餘的空格(_W)"
+
+#: src/diffuse/window.py:807
+msgid "Convert Tabs To _Spaces"
+msgstr "轉換跳格字元為空格(_S)"
+
+#: src/diffuse/window.py:808
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "轉換開頭的空格為跳格字元(_T)"
+
+#: src/diffuse/window.py:810
+msgid "_Increase Indenting"
+msgstr "減少縮排(_I)"
+
+#: src/diffuse/window.py:811
+msgid "De_crease Indenting"
+msgstr "減少縮排"
+
+#: src/diffuse/window.py:813
+msgid "Convert To _DOS Format"
+msgstr "轉換為 DOS 格式(_D)"
+
+#: src/diffuse/window.py:814
+msgid "Convert To _Mac Format"
+msgstr "轉換為 Mac 格式(_M)"
+
+#: src/diffuse/window.py:815
+msgid "Convert To Uni_x Format"
+msgstr "轉換為 Unix 格式(_X)"
+
+#: src/diffuse/window.py:819
+msgid "_Merge"
+msgstr "合併(_M)"
+
+#: src/diffuse/window.py:821
+msgid "Copy Selection _Right"
+msgstr "複製選擇區域到右邊(_R)"
+
+#: src/diffuse/window.py:822
+msgid "Copy Selection _Left"
+msgstr "複製選擇區域到左邊(_L)"
+
+#: src/diffuse/window.py:824
+msgid "Copy Left _Into Selection"
+msgstr "複製左邊內容到選擇區域(_L)"
+
+#: src/diffuse/window.py:825
+msgid "Copy Right I_nto Selection"
+msgstr "複製右邊內容到選擇區域(_L)"
+
+#: src/diffuse/window.py:826
+msgid "_Merge From Left Then Right"
+msgstr "先左再右合併(_M)"
+
+#: src/diffuse/window.py:827
+msgid "M_erge From Right Then Left"
+msgstr "從右向左合併(_E)"
+
+#: src/diffuse/window.py:831
+msgid "_Help"
+msgstr "求助(_H)"
+
+#: src/diffuse/window.py:833
+msgid "_Help Contents..."
+msgstr "說明內容(_H)…"
+
+#: src/diffuse/window.py:835
+#, python-format
+msgid "_About %s..."
+msgstr "關於 %s(_A)…"
+
+#: src/diffuse/window.py:847
+msgid "New 2-Way File Merge"
+msgstr "新的二重檔案合併"
+
+#: src/diffuse/window.py:848
+msgid "New 3-Way File Merge"
+msgstr "新的三重檔案合併"
+
+#: src/diffuse/window.py:850
+msgid "Realign All"
+msgstr "全部重新對齊"
+
+#: src/diffuse/window.py:851
+msgid "First Difference"
+msgstr "第一個差異"
+
+#: src/diffuse/window.py:852
+msgid "Previous Difference"
+msgstr "上一個差異"
+
+#: src/diffuse/window.py:853
+msgid "Next Difference"
+msgstr "下一個差異"
+
+#: src/diffuse/window.py:854
+msgid "Last Difference"
+msgstr "最後一個差異"
+
+#: src/diffuse/window.py:856
+msgid "Copy Selection Right"
+msgstr "複製選擇區域到右邊"
+
+#: src/diffuse/window.py:857
+msgid "Copy Selection Left"
+msgstr "複製選擇區域到左邊"
+
+#: src/diffuse/window.py:858
+msgid "Copy Left Into Selection"
+msgstr "複製左邊內容到選擇區域"
+
+#: src/diffuse/window.py:859
+msgid "Copy Right Into Selection"
+msgstr "複製右邊內容到選擇區域"
+
+#: src/diffuse/window.py:860
+msgid "Merge From Left Then Right"
+msgstr "先左後右合併"
+
+#: src/diffuse/window.py:861
+msgid "Merge From Right Then Left"
+msgstr "先右後左合併(_T)"
+
+#: src/diffuse/window.py:863
+msgid "Undo"
+msgstr "復原"
+
+#: src/diffuse/window.py:864
+msgid "Redo"
+msgstr "重做"
+
+#: src/diffuse/window.py:950
+msgid "Changes detected"
+msgstr ""
+
+#: src/diffuse/window.py:954
+#, fuzzy, python-format
+msgid ""
+"The file \"%s\" changed on disk.\n"
+"\n"
+"Do you want to reload the file?"
+msgstr "檔案 %s 已被更改，是否重新載入？"
+
+#: src/diffuse/window.py:959
+#, fuzzy, python-format
+msgid ""
+"The following files changed on disk:\n"
+"%s\n"
+"\n"
+"Do you want to reload these files?"
+msgstr "檔案 %s 已被更改，是否重新載入？"
+
+#: src/diffuse/window.py:1078
+msgid "Some files have unsaved changes. Select the files to save before closing."
+msgstr "一些檔案已變更但未儲存，請在關閉前儲存這些檔案。"
+
+#: src/diffuse/window.py:1092
+msgid "Tab"
+msgstr "跳格字元"
+
+#: src/diffuse/window.py:1097
+msgid "Pane"
+msgstr "窗格"
+
+#: src/diffuse/window.py:1108
+msgid "Close _Without Saving"
+msgstr "不儲存而關閉"
+
+#: src/diffuse/window.py:1147
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "關閉此分頁將會退出 %s"
+
+#: src/diffuse/window.py:1224
+#, python-format
+msgid "File Merge %d"
+msgstr "檔案合併 %d"
+
+#: src/diffuse/window.py:1344
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "無法恢復對 %s 的認可。"
+
+#: src/diffuse/window.py:1376
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "無法恢復對 %s 的修改。"
+
+#: src/diffuse/window.py:1409
+msgid "Open File In New Tab"
+msgstr "在新分頁裡開啟檔案"
+
+#: src/diffuse/window.py:1432
+msgid "Choose Folder With Modified Files"
+msgstr "選擇更改過的檔案夾"
+
+#: src/diffuse/window.py:1450
+msgid "No modified files found."
+msgstr "找不到已修改的檔案。"
+
+#: src/diffuse/window.py:1456
+msgid "Choose Folder With Commit"
+msgstr "選擇認可過的檔案夾"
+
+#: src/diffuse/window.py:1476
+msgid "No committed files found."
+msgstr "找不到已認可的檔案。"
+
+#: src/diffuse/window.py:1512
+msgid "New N-Way File Merge..."
+msgstr "新的多重檔案合併…"
+
+#: src/diffuse/window.py:1513
+msgid "Number of panes: "
+msgstr "窗格數: "
+
+#: src/diffuse/window.py:1587
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "語詞未找到，從檔案結尾繼續嗎？"
+
+#: src/diffuse/window.py:1589
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "語詞未找到，從檔案開頭繼續嗎？"
+
+#: src/diffuse/window.py:1762
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr "Diffuse 是一個合併與比較文字檔案的圖形工具。"
+
+#: src/diffuse/window.py:1766
+msgid "translator-credits"
+msgstr ""
+"紀明村 <tw.chi.ming@gmail.com>\n"
+"趙惟倫 <bluebat@member.fsf.org>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage:\n"
+#~ "    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"
+#~ "also retrieve revisions of files from several VCSs for comparison and "
+#~ "merging.\n"
+#~ "\n"
+#~ "Help Options:\n"
+#~ "  ( -h | -? | --help )             Display this usage information\n"
+#~ "  ( -v | --version )               Display version and copyright information\n"
+#~ "\n"
+#~ "Configuration Options:\n"
+#~ "  --no-rcfile                      Do not read any resource files\n"
+#~ "  --rcfile <file>                  Specify explicit resource file\n"
+#~ "\n"
+#~ "General Options:\n"
+#~ "  ( -c | --commit ) <rev>          File revisions <rev-1> and <rev>\n"
+#~ "  ( -D | --close-if-same )         Close all tabs with no differences\n"
+#~ "  ( -e | --encoding ) <codec>      Use <codec> to read and write files\n"
+#~ "  ( -L | --label ) <label>         Display <label> instead of the file name\n"
+#~ "  ( -m | --modified )              Create a new tab for each modified file\n"
+#~ "  ( -r | --revision ) <rev>        File revision <rev>\n"
+#~ "  ( -s | --separate )              Create a new tab for each file\n"
+#~ "  ( -t | --tab )                   Start a new tab\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    Start with line <line> selected\n"
+#~ "  --null-file                      Create a blank file comparison pane\n"
+#~ "\n"
+#~ "Display Options:\n"
+#~ "  ( -b | --ignore-space-change )   Ignore changes to white space\n"
+#~ "  ( -B | --ignore-blank-lines )    Ignore changes in blank lines\n"
+#~ "  ( -E | --ignore-end-of-line )    Ignore end of line differences\n"
+#~ "  ( -i | --ignore-case )           Ignore case differences\n"
+#~ "  ( -w | --ignore-all-space )      Ignore white space differences"
+#~ msgstr ""
+#~ "用法：\n"
+#~ "    diffuse [ [選項…] [檔案…] ]…\n"
+#~ "    diffuse ( -h | -? | --help | -v | --version )\n"
+#~ "\n"
+#~ "Diffuse 是用於合併與比較文字檔的圖形工具。 Diffuse \n"
+#~ "能夠一起比較任意數量的檔案，並給予使用者\n"
+#~ "手動調整各列匹配與直接編輯檔案的能力。 Diffuse 也可以\n"
+#~ "從 Bazaar、CVS、Darcs、Git、Mercurial、Monotone、RCS、\n"
+#~ "Subversion 以及 SVK 儲存庫取回修訂的檔案用於比較與合併。\n"
+#~ "\n"
+#~ "求助選項：\n"
+#~ "  ( -h | -? | --help )             顯示這個用法資訊\n"
+#~ "  ( -v | --version )               顯示版本與著作權資訊\n"
+#~ "\n"
+#~ "組態選項：\n"
+#~ "  --no-rcfile                      不讀取任何資源檔案\n"
+#~ "  --rcfile <file>                  指定明確的資源檔案\n"
+#~ "\n"
+#~ "一般選項：\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"
+#~ "  ( -r | --revision ) <rev>        檔案修訂 <rev>\n"
+#~ "  ( -s | --separate )              對於每個檔案建立新的分頁\n"
+#~ "  ( -t | --tab )                   開始新的分頁\n"
+#~ "  ( -V | --vcs ) <vcs-list>        Version control system search order\n"
+#~ "  --line <line>                    開始時已選第 <line> 列\n"
+#~ "  --null-file                      建立空白檔案的比較窗格\n"
+#~ "\n"
+#~ "顯示選項：\n"
+#~ "  ( -b | --ignore-space-change )   忽略空白的變更\n"
+#~ "  ( -B | --ignore-blank-lines )    忽略空列的變更\n"
+#~ "  ( -E | --ignore-end-of-line )    忽略列尾差異\n"
+#~ "  ( -i | --ignore-case )           忽略大小寫差異\n"
+#~ "  ( -w | --ignore-all-space )      忽略空白差異"