From 4671c08117a4faaf2cd856014f31378af3c778e3 Mon Sep 17 00:00:00 2001
From: Romain Failliot <romain.failliot@foolstep.com>
Date: Thu, 18 Nov 2021 15:35:31 -0500
Subject: [PATCH 1/4] Update POTFILES.in with the new file paths

---
 po/POTFILES.in | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index a35e8c6..80d4324 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,12 @@
 # List of source files which contain translatable strings.
 # Copyright (C) 2020 Romain Failliot <romain.failliot@foolstep.com>
 
-data/diffuse.desktop.in
-src/usr/bin/diffuse.py.in
+data/io.github.mightycreak.Diffuse.desktop.in
+data/io.github.mightycreak.Diffuse.metainfo.xml.in
+src/constants.py.in
+src/diffuse.in
+src/main.py
+src/vcs/cvs.py
+src/vcs/rcs.py
+src/vcs/svn.py
+src/vcs/vcs_registry.py

From d025ecfd6e885555872a854052cd8f3ba9042c09 Mon Sep 17 00:00:00 2001
From: Romain Failliot <romain.failliot@foolstep.com>
Date: Thu, 18 Nov 2021 15:34:08 -0500
Subject: [PATCH 2/4] Un-ignore diffuse.pot

---
 .gitignore     |    1 -
 po/diffuse.pot | 1094 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1094 insertions(+), 1 deletion(-)
 create mode 100644 po/diffuse.pot

diff --git a/.gitignore b/.gitignore
index 04a5dc8..e78553e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,7 +60,6 @@ cover/
 
 # Translations
 *.mo
-*.pot
 
 # Django stuff:
 *.log
diff --git a/po/diffuse.pot b/po/diffuse.pot
new file mode 100644
index 0000000..07f5464
--- /dev/null
+++ b/po/diffuse.pot
@@ -0,0 +1,1094 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-18 15:30-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: data/io.github.mightycreak.Diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:4
+msgid "Diffuse Merge Tool"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:5
+msgid "Graphical tool for merging and comparing text files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.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."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:19
+msgid "Main window: diff between two files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:26
+msgid "Patch release to fix a bug when using the Flatpak package."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:29
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:71
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:146
+msgid "Fixed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:31
+msgid ""
+"Fixed a Flatpak bug where the app couldn't call binaries on the host, such "
+"as `git`, `svn`, etc."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:40
+msgid ""
+"With this release, the main end-user change is the new icon. The rest is "
+"mainly maintenance improvements with a much more standard folder structure "
+"and starting to modularize the code. This is an ongoing effort as there is "
+"still a lot to do, but hopefully this would motivate some to contribute ;)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:47
+msgid ""
+"An important note though: the application ID has changed and is now io."
+"github.mightycreak.Diffuse."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:51
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:89
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:123
+msgid "Added:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:53
+msgid "New icon and in SVG now"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:54
+msgid "Started to modularize the code"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:56
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:93
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:136
+msgid "Changed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:58
+msgid ""
+"Changed AppID to io.github.mightycreak.Diffuse (as advised in the Flatpak "
+"documentation)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:62
+msgid "Renamed directory `translations/` to `po/`"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:63
+msgid "Now uses POTFILES.in to list the files to translate"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:64
+msgid ""
+"Translation strings are no longer sorted alphabetically, this will help when "
+"there will be several files in POTFILES.in"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:68
+msgid "Updated the documentation and script in the `po/` directory"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:69
+msgid "Add .desktop translations in .po files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:73
+msgid "Fixed some GTK deprecation warnings"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:79
+msgid ""
+"Mainly under the hood changes in this release, so nothing really visible to "
+"the users in this version. That said, I figured it was a long time since the "
+"last release (4 months ago) and, as promised, I want Diffuse development to "
+"be a bit more active and iterative."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:85
+msgid ""
+"Apart from the maintenance changes 🧰, I think the main improvement is that "
+"Diffuse will soon be available through Flathub!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:91
+msgid ""
+"New Flatpak package, published on Flathub: com.github.mightycreak.Diffuse"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:95
+msgid "Replace old install.py with the more standard Meson"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:96
+msgid "Remove u string prefixes since Python 3 is in UTF-8 by default"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:97
+msgid "Replaced some interpolation operators (%) for the f string prefix"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:98
+msgid "Use the window scale factor for the icons generation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:104
+msgid ""
+"Here is the v0.5.0. Unintentionally, this release happens exactly 6 years "
+"after the previous v0.4.8 release!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:108
+msgid ""
+"There is a lot to do on this application, and some features didn't make the "
+"release. The main one being the Windows installers. I think 6 years is too "
+"long to continue to wait until this bug is fixed. The Python scripts should "
+"work on Windows, but no executable is produced (yet) with the release."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:115
+msgid ""
+"Other than that, Diffuse v0.5.0 is now officially compatible with Python 3 "
+"and GTK 3! And it is synced to the latest commits from upstream (which were "
+"never released)."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:120
+msgid "The next version will not take 6 years, I promise you! 😄"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:125
+msgid "Added Pedro Albuquerque's Portuguese translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:126
+msgid "Added Åke Engelbrektson's Swedish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:127
+msgid "Added Guillaume Hoffmann's Darcs support improvements"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:128
+msgid "Added Akom Chotiphantawanon's Thai translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:129
+msgid "Added support for Git submodules"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:130
+msgid ""
+"Added a preference and command line option to specify the version control "
+"system search order"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:131
+msgid "Added .editorconfig file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:132
+msgid "Added .gitignore file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:133
+msgid "Added message when removing files during uninstallation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:134
+msgid "Added Python script to update all the translation files at once"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:138
+msgid "Convert to Python 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:139
+msgid "Convert to GTK 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:140
+msgid "Updated Python highlighting for Python 3 grammar"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:141
+msgid "Updated copyrights years and authors"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:142
+msgid "Improve Spanish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:143
+msgid "Convert translation README to MarkDown"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:144
+msgid "Updated all the translation files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:148
+msgid "Fixed wrong icons directory for gtk-update-icon-cache"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:149
+msgid "Fixed missing directories when uninstalling"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:150
+msgid "Fixed bug introduced by r420 with RCS VCS"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:151
+msgid "Fixed broken drag'n'drop since migration to Python3/GTK3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:152
+msgid "Fixed error when using '-m' in an SVN repo"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:157
+msgid "Romain Failliot"
+msgstr ""
+
+#: src/constants.py.in:23
+msgid "Copyright"
+msgstr ""
+
+#: src/main.py:591
+#, python-format
+msgid "Error processing line %(line)d of %(file)s."
+msgstr ""
+
+#: src/main.py:610
+msgid "Auto Detect"
+msgstr ""
+
+#: src/main.py:706
+msgid "Display"
+msgstr ""
+
+#: src/main.py:708
+msgid "Font"
+msgstr ""
+
+#: src/main.py:709
+msgid "Tab width"
+msgstr ""
+
+#: src/main.py:710
+msgid "Show right margin"
+msgstr ""
+
+#: src/main.py:711
+msgid "Right margin"
+msgstr ""
+
+#: src/main.py:712
+msgid "Show line numbers"
+msgstr ""
+
+#: src/main.py:713
+msgid "Show white space characters"
+msgstr ""
+
+#: src/main.py:714
+msgid "Ignore case differences"
+msgstr ""
+
+#: src/main.py:715
+msgid "Ignore white space differences"
+msgstr ""
+
+#: src/main.py:716 src/main.py:724
+msgid "Ignore changes to white space"
+msgstr ""
+
+#: src/main.py:717
+msgid "Ignore blank line differences"
+msgstr ""
+
+#: src/main.py:718
+msgid "Ignore end of line differences"
+msgstr ""
+
+#: src/main.py:720
+msgid "Alignment"
+msgstr ""
+
+#: src/main.py:722
+msgid "Ignore case"
+msgstr ""
+
+#: src/main.py:723
+msgid "Ignore white space"
+msgstr ""
+
+#: src/main.py:725
+msgid "Ignore blank lines"
+msgstr ""
+
+#: src/main.py:726
+msgid "Ignore end of line characters"
+msgstr ""
+
+#: src/main.py:728
+msgid "Editor"
+msgstr ""
+
+#: src/main.py:730
+msgid "Auto indent"
+msgstr ""
+
+#: src/main.py:731
+msgid "Expand tabs to spaces"
+msgstr ""
+
+#: src/main.py:732
+msgid "Soft tab width"
+msgstr ""
+
+#: src/main.py:734
+msgid "Tabs"
+msgstr ""
+
+#: src/main.py:736
+msgid "Default panes"
+msgstr ""
+
+#: src/main.py:737
+msgid "Always show the tab bar"
+msgstr ""
+
+#: src/main.py:738
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr ""
+
+#: src/main.py:740
+msgid "Regional Settings"
+msgstr ""
+
+#: src/main.py:742
+msgid "Default codec"
+msgstr ""
+
+#: src/main.py:743
+msgid "Order of codecs used to identify encoding"
+msgstr ""
+
+#: src/main.py:763
+msgid "Cygwin"
+msgstr ""
+
+#: src/main.py:765
+msgid "Root directory"
+msgstr ""
+
+#: src/main.py:766
+msgid "Cygdrive prefix"
+msgstr ""
+
+#: src/main.py:782
+msgid "Version control system search order"
+msgstr ""
+
+#: src/main.py:788
+msgid "\"co\" command"
+msgstr ""
+
+#: src/main.py:789
+msgid "\"rlog\" command"
+msgstr ""
+
+#: src/main.py:791
+msgid "Command"
+msgstr ""
+
+#: src/main.py:793
+msgid "Launch from a Bash login shell"
+msgstr ""
+
+#: src/main.py:795
+msgid "Update paths for Cygwin"
+msgstr ""
+
+#: src/main.py:799
+msgid "Version Control"
+msgstr ""
+
+#: src/main.py:863
+msgid "Preferences"
+msgstr ""
+
+#: src/main.py:904 src/main.py:5802
+#, python-format
+msgid "Error writing %s."
+msgstr ""
+
+#: src/main.py:3282
+msgid "Align with Selection"
+msgstr ""
+
+#: src/main.py:3283
+msgid "Isolate"
+msgstr ""
+
+#: src/main.py:3284
+msgid "Merge Selection"
+msgstr ""
+
+#: src/main.py:3286 src/main.py:6098
+msgid "Cut"
+msgstr ""
+
+#: src/main.py:3287 src/main.py:6099
+msgid "Copy"
+msgstr ""
+
+#: src/main.py:3288 src/main.py:6100
+msgid "Paste"
+msgstr ""
+
+#: src/main.py:3290
+msgid "Select All"
+msgstr ""
+
+#: src/main.py:3291 src/main.py:6101
+msgid "Clear Edits"
+msgstr ""
+
+#: src/main.py:3293
+msgid "Swap with Selected Pane"
+msgstr ""
+
+#: src/main.py:5124
+msgid "Find..."
+msgstr ""
+
+#: src/main.py:5132
+msgid "Search For: "
+msgstr ""
+
+#: src/main.py:5157
+msgid "Match Case"
+msgstr ""
+
+#: src/main.py:5162
+msgid "Search Backwards"
+msgstr ""
+
+#: src/main.py:5176
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr ""
+
+#: src/main.py:5198
+msgid "Encoding: "
+msgstr ""
+
+#: src/main.py:5208
+msgid "Revision: "
+msgstr ""
+
+#: src/main.py:5272
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr ""
+
+#: src/main.py:5277
+msgid "translator-credits"
+msgstr ""
+
+#: src/main.py:5281
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+
+#: src/main.py:5322
+msgid "Close Tab"
+msgstr ""
+
+#: src/main.py:5377
+msgid "Open File..."
+msgstr ""
+
+#: src/main.py:5378
+msgid "Reload File"
+msgstr ""
+
+#: src/main.py:5379
+msgid "Save File"
+msgstr ""
+
+#: src/main.py:5380
+msgid "Save File As..."
+msgstr ""
+
+#: src/main.py:5525
+msgid "Save changes before loading the new file?"
+msgstr ""
+
+#: src/main.py:5635
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr ""
+
+#: src/main.py:5637 src/main.py:6900
+#, python-format
+msgid "Error reading %s."
+msgstr ""
+
+#: src/main.py:5658
+msgid "Open File"
+msgstr ""
+
+#: src/main.py:5708
+#, python-format
+msgid "The file %s changed on disk.  Do you want to reload the file?"
+msgstr ""
+
+#: src/main.py:5728
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr ""
+
+#: src/main.py:5754
+#, python-format
+msgid "A file named %s already exists.  Do you want to overwrite it?"
+msgstr ""
+
+#: src/main.py:5759
+#, 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/main.py:5800
+#, python-format
+msgid "Error encoding to %s."
+msgstr ""
+
+#: src/main.py:5830
+msgid "Go To Line..."
+msgstr ""
+
+#: src/main.py:5830
+msgid "Line Number: "
+msgstr ""
+
+#: src/main.py:5856
+msgid ""
+"Press the enter key or double click to edit.  Press the space bar or use the "
+"RMB menu to manually align."
+msgstr ""
+
+#: src/main.py:5858
+msgid "Press the escape key to finish editing."
+msgstr ""
+
+#: src/main.py:5860
+msgid ""
+"Select target line and press the space bar to align.  Press the escape key "
+"to cancel."
+msgstr ""
+
+#: src/main.py:5971
+msgid "_File"
+msgstr ""
+
+#: src/main.py:5972
+msgid "_Open File..."
+msgstr ""
+
+#: src/main.py:5973
+msgid "Open File In New _Tab..."
+msgstr ""
+
+#: src/main.py:5974
+msgid "Open _Modified Files..."
+msgstr ""
+
+#: src/main.py:5975
+msgid "Open Commi_t..."
+msgstr ""
+
+#: src/main.py:5976
+msgid "_Reload File"
+msgstr ""
+
+#: src/main.py:5978
+msgid "_Save File"
+msgstr ""
+
+#: src/main.py:5979
+msgid "Save File _As..."
+msgstr ""
+
+#: src/main.py:5980
+msgid "Save A_ll"
+msgstr ""
+
+#: src/main.py:5982
+msgid "New _2-Way File Merge"
+msgstr ""
+
+#: src/main.py:5983
+msgid "New _3-Way File Merge"
+msgstr ""
+
+#: src/main.py:5984
+msgid "New _N-Way File Merge..."
+msgstr ""
+
+#: src/main.py:5986
+msgid "_Close Tab"
+msgstr ""
+
+#: src/main.py:5987
+msgid "_Undo Close Tab"
+msgstr ""
+
+#: src/main.py:5988
+msgid "_Quit"
+msgstr ""
+
+#: src/main.py:5990
+msgid "_Edit"
+msgstr ""
+
+#: src/main.py:5991
+msgid "_Undo"
+msgstr ""
+
+#: src/main.py:5992
+msgid "_Redo"
+msgstr ""
+
+#: src/main.py:5994
+msgid "Cu_t"
+msgstr ""
+
+#: src/main.py:5995
+msgid "_Copy"
+msgstr ""
+
+#: src/main.py:5996
+msgid "_Paste"
+msgstr ""
+
+#: src/main.py:5998
+msgid "Select _All"
+msgstr ""
+
+#: src/main.py:5999
+msgid "C_lear Edits"
+msgstr ""
+
+#: src/main.py:6000
+msgid "_Dismiss All Edits"
+msgstr ""
+
+#: src/main.py:6002
+msgid "_Find..."
+msgstr ""
+
+#: src/main.py:6003
+msgid "Find _Next"
+msgstr ""
+
+#: src/main.py:6004
+msgid "Find Pre_vious"
+msgstr ""
+
+#: src/main.py:6005
+msgid "_Go To Line..."
+msgstr ""
+
+#: src/main.py:6007
+msgid "Pr_eferences..."
+msgstr ""
+
+#: src/main.py:6009
+msgid "None"
+msgstr ""
+
+#: src/main.py:6017
+msgid "_View"
+msgstr ""
+
+#: src/main.py:6018
+msgid "_Syntax Highlighting"
+msgstr ""
+
+#: src/main.py:6020
+msgid "Re_align All"
+msgstr ""
+
+#: src/main.py:6021
+msgid "_Isolate"
+msgstr ""
+
+#: src/main.py:6023
+msgid "_First Difference"
+msgstr ""
+
+#: src/main.py:6024
+msgid "_Previous Difference"
+msgstr ""
+
+#: src/main.py:6025
+msgid "_Next Difference"
+msgstr ""
+
+#: src/main.py:6026
+msgid "_Last Difference"
+msgstr ""
+
+#: src/main.py:6028
+msgid "Fir_st Tab"
+msgstr ""
+
+#: src/main.py:6029
+msgid "Pre_vious Tab"
+msgstr ""
+
+#: src/main.py:6030
+msgid "Next _Tab"
+msgstr ""
+
+#: src/main.py:6031
+msgid "Las_t Tab"
+msgstr ""
+
+#: src/main.py:6033
+msgid "Shift Pane _Right"
+msgstr ""
+
+#: src/main.py:6034
+msgid "Shift Pane _Left"
+msgstr ""
+
+#: src/main.py:6036
+msgid "F_ormat"
+msgstr ""
+
+#: src/main.py:6037
+msgid "Convert To _Upper Case"
+msgstr ""
+
+#: src/main.py:6038
+msgid "Convert To _Lower Case"
+msgstr ""
+
+#: src/main.py:6040
+msgid "Sort Lines In _Ascending Order"
+msgstr ""
+
+#: src/main.py:6041
+msgid "Sort Lines In D_escending Order"
+msgstr ""
+
+#: src/main.py:6043
+msgid "Remove Trailing _White Space"
+msgstr ""
+
+#: src/main.py:6044
+msgid "Convert Tabs To _Spaces"
+msgstr ""
+
+#: src/main.py:6045
+msgid "Convert Leading Spaces To _Tabs"
+msgstr ""
+
+#: src/main.py:6047
+msgid "_Increase Indenting"
+msgstr ""
+
+#: src/main.py:6048
+msgid "De_crease Indenting"
+msgstr ""
+
+#: src/main.py:6050
+msgid "Convert To _DOS Format"
+msgstr ""
+
+#: src/main.py:6051
+msgid "Convert To _Mac Format"
+msgstr ""
+
+#: src/main.py:6052
+msgid "Convert To Uni_x Format"
+msgstr ""
+
+#: src/main.py:6054
+msgid "_Merge"
+msgstr ""
+
+#: src/main.py:6055
+msgid "Copy Selection _Right"
+msgstr ""
+
+#: src/main.py:6056
+msgid "Copy Selection _Left"
+msgstr ""
+
+#: src/main.py:6058
+msgid "Copy Left _Into Selection"
+msgstr ""
+
+#: src/main.py:6059
+msgid "Copy Right I_nto Selection"
+msgstr ""
+
+#: src/main.py:6060
+msgid "_Merge From Left Then Right"
+msgstr ""
+
+#: src/main.py:6061
+msgid "M_erge From Right Then Left"
+msgstr ""
+
+#: src/main.py:6063
+msgid "_Help"
+msgstr ""
+
+#: src/main.py:6064
+msgid "_Help Contents..."
+msgstr ""
+
+#: src/main.py:6066
+#, python-format
+msgid "_About %s..."
+msgstr ""
+
+#: src/main.py:6080
+msgid "New 2-Way File Merge"
+msgstr ""
+
+#: src/main.py:6081
+msgid "New 3-Way File Merge"
+msgstr ""
+
+#: src/main.py:6083
+msgid "Realign All"
+msgstr ""
+
+#: src/main.py:6084
+msgid "First Difference"
+msgstr ""
+
+#: src/main.py:6085
+msgid "Previous Difference"
+msgstr ""
+
+#: src/main.py:6086
+msgid "Next Difference"
+msgstr ""
+
+#: src/main.py:6087
+msgid "Last Difference"
+msgstr ""
+
+#: src/main.py:6089
+msgid "Copy Selection Right"
+msgstr ""
+
+#: src/main.py:6090
+msgid "Copy Selection Left"
+msgstr ""
+
+#: src/main.py:6091
+msgid "Copy Left Into Selection"
+msgstr ""
+
+#: src/main.py:6092
+msgid "Copy Right Into Selection"
+msgstr ""
+
+#: src/main.py:6093
+msgid "Merge From Left Then Right"
+msgstr ""
+
+#: src/main.py:6094
+msgid "Merge From Right Then Left"
+msgstr ""
+
+#: src/main.py:6096
+msgid "Undo"
+msgstr ""
+
+#: src/main.py:6097
+msgid "Redo"
+msgstr ""
+
+#: src/main.py:6221
+msgid ""
+"Some files have unsaved changes.  Select the files to save before closing."
+msgstr ""
+
+#: src/main.py:6234
+msgid "Tab"
+msgstr ""
+
+#: src/main.py:6239
+msgid "Pane"
+msgstr ""
+
+#: src/main.py:6250
+msgid "Close _Without Saving"
+msgstr ""
+
+#: src/main.py:6361
+#, python-format
+msgid "File Merge %d"
+msgstr ""
+
+#: src/main.py:6464
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr ""
+
+#: src/main.py:6493
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr ""
+
+#: src/main.py:6523
+msgid "Open File In New Tab"
+msgstr ""
+
+#: src/main.py:6539
+msgid "Choose Folder With Modified Files"
+msgstr ""
+
+#: src/main.py:6552
+msgid "No modified files found."
+msgstr ""
+
+#: src/main.py:6557
+msgid "Choose Folder With Commit"
+msgstr ""
+
+#: src/main.py:6570
+msgid "No committed files found."
+msgstr ""
+
+#: src/main.py:6604
+msgid "New N-Way File Merge..."
+msgstr ""
+
+#: src/main.py:6604
+msgid "Number of panes: "
+msgstr ""
+
+#: src/main.py:6669
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr ""
+
+#: src/main.py:6671
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr ""
+
+#: src/main.py:6819
+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 Bazaar, CVS, Darcs, Git, Mercurial,\n"
+"Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
+"\n"
+"Help Options:\n"
+"  ( -h | -? | --help )             Display this usage information\n"
+"  ( -v | --version )               Display version and copyright "
+"information\n"
+"\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 ""
+
+#: src/main.py:6990
+msgid "Error parsing line number."
+msgstr ""
+
+#: src/main.py:7000
+#, python-format
+msgid "Skipping unknown argument \"%s\"."
+msgstr ""
+
+#: src/main.py:7007
+#, python-format
+msgid "Error processing argument \"%s\".  Directory not expected."
+msgstr ""
+
+#: src/vcs/cvs.py:50 src/vcs/rcs.py:54 src/vcs/svn.py:89
+#, python-format
+msgid "Error parsing revision %s."
+msgstr ""
+
+#: src/vcs/vcs_registry.py:216
+#, python-format
+msgid "Error parsing %s."
+msgstr ""

From 92fb4cb8ade8cd1d569848539c80170378154ed2 Mon Sep 17 00:00:00 2001
From: Romain Failliot <romain.failliot@foolstep.com>
Date: Thu, 18 Nov 2021 15:36:44 -0500
Subject: [PATCH 3/4] Add pt_BR to LINGUAS

---
 po/LINGUAS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/po/LINGUAS b/po/LINGUAS
index bdb3627..21d0769 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -7,6 +7,7 @@ ja
 ko
 pl
 pt
+pt_BR
 ru
 sv
 th

From 9f6852582498ca1d74c24bdf04add1698a529487 Mon Sep 17 00:00:00 2001
From: Romain Failliot <romain.failliot@foolstep.com>
Date: Thu, 18 Nov 2021 15:37:02 -0500
Subject: [PATCH 4/4] Update all the translation files

---
 po/cs.po    | 1736 ++++++++++++++++++++++++++++----------------------
 po/de.po    | 1736 ++++++++++++++++++++++++++++----------------------
 po/es.po    | 1740 +++++++++++++++++++++++++++++----------------------
 po/it.po    | 1736 ++++++++++++++++++++++++++++----------------------
 po/ja.po    | 1736 ++++++++++++++++++++++++++++----------------------
 po/ko.po    | 1736 ++++++++++++++++++++++++++++----------------------
 po/pl.po    | 1725 ++++++++++++++++++++++++++++----------------------
 po/pt.po    | 1736 ++++++++++++++++++++++++++++----------------------
 po/pt_BR.po | 1736 ++++++++++++++++++++++++++++----------------------
 po/ru.po    | 1740 +++++++++++++++++++++++++++++----------------------
 po/sv.po    | 1736 ++++++++++++++++++++++++++++----------------------
 po/th.po    | 1736 ++++++++++++++++++++++++++++----------------------
 po/zh_CN.po | 1725 ++++++++++++++++++++++++++++----------------------
 po/zh_TW.po | 1740 +++++++++++++++++++++++++++++----------------------
 14 files changed, 13714 insertions(+), 10580 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index f5dbf73..ae5d6ca 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: 2020-12-08 13:51-0500\n"
+"POT-Creation-Date: 2021-11-18 15:21-0500\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator: Jindřich Šesták <khagaroth@gmail.com>\n"
 "Language-Team: NONE <NONE>\n"
@@ -22,19 +22,981 @@ msgstr ""
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: data/diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:4
 msgid "Diffuse Merge Tool"
 msgstr "Diffuse"
 
-#: data/diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:5
 msgid "Graphical tool for merging and comparing text files"
 msgstr "Grafický nástroj pro slučování a porovnávání textových souborů"
 
-#: src/usr/bin/diffuse.py.in:70
+#: data/io.github.mightycreak.Diffuse.metainfo.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."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:19
+msgid "Main window: diff between two files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:26
+msgid "Patch release to fix a bug when using the Flatpak package."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:29
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:71
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:146
+msgid "Fixed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:31
+msgid "Fixed a Flatpak bug where the app couldn't call binaries on the host, such as `git`, `svn`, etc."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:40
+msgid "With this release, the main end-user change is the new icon. The rest is mainly maintenance improvements with a much more standard folder structure and starting to modularize the code. This is an ongoing effort as there is still a lot to do, but hopefully this would motivate some to contribute ;)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:47
+msgid "An important note though: the application ID has changed and is now io.github.mightycreak.Diffuse."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:51
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:89
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:123
+msgid "Added:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:53
+msgid "New icon and in SVG now"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:54
+msgid "Started to modularize the code"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:56
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:93
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:136
+msgid "Changed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:58
+msgid "Changed AppID to io.github.mightycreak.Diffuse (as advised in the Flatpak documentation)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:62
+msgid "Renamed directory `translations/` to `po/`"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:63
+msgid "Now uses POTFILES.in to list the files to translate"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:64
+msgid "Translation strings are no longer sorted alphabetically, this will help when there will be several files in POTFILES.in"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:68
+msgid "Updated the documentation and script in the `po/` directory"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:69
+msgid "Add .desktop translations in .po files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:73
+msgid "Fixed some GTK deprecation warnings"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:79
+msgid "Mainly under the hood changes in this release, so nothing really visible to the users in this version. That said, I figured it was a long time since the last release (4 months ago) and, as promised, I want Diffuse development to be a bit more active and iterative."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:85
+msgid "Apart from the maintenance changes 🧰, I think the main improvement is that Diffuse will soon be available through Flathub!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:91
+msgid "New Flatpak package, published on Flathub: com.github.mightycreak.Diffuse"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:95
+msgid "Replace old install.py with the more standard Meson"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:96
+msgid "Remove u string prefixes since Python 3 is in UTF-8 by default"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:97
+msgid "Replaced some interpolation operators (%) for the f string prefix"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:98
+msgid "Use the window scale factor for the icons generation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:104
+msgid "Here is the v0.5.0. Unintentionally, this release happens exactly 6 years after the previous v0.4.8 release!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:108
+msgid "There is a lot to do on this application, and some features didn't make the release. The main one being the Windows installers. I think 6 years is too long to continue to wait until this bug is fixed. The Python scripts should work on Windows, but no executable is produced (yet) with the release."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:115
+msgid "Other than that, Diffuse v0.5.0 is now officially compatible with Python 3 and GTK 3! And it is synced to the latest commits from upstream (which were never released)."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:120
+msgid "The next version will not take 6 years, I promise you! 😄"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:125
+msgid "Added Pedro Albuquerque's Portuguese translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:126
+msgid "Added Åke Engelbrektson's Swedish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:127
+msgid "Added Guillaume Hoffmann's Darcs support improvements"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:128
+msgid "Added Akom Chotiphantawanon's Thai translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:129
+msgid "Added support for Git submodules"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:130
+msgid "Added a preference and command line option to specify the version control system search order"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:131
+msgid "Added .editorconfig file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:132
+msgid "Added .gitignore file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:133
+msgid "Added message when removing files during uninstallation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:134
+msgid "Added Python script to update all the translation files at once"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:138
+msgid "Convert to Python 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:139
+msgid "Convert to GTK 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:140
+msgid "Updated Python highlighting for Python 3 grammar"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:141
+msgid "Updated copyrights years and authors"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:142
+msgid "Improve Spanish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:143
+msgid "Convert translation README to MarkDown"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:144
+msgid "Updated all the translation files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:148
+msgid "Fixed wrong icons directory for gtk-update-icon-cache"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:149
+msgid "Fixed missing directories when uninstalling"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:150
+msgid "Fixed bug introduced by r420 with RCS VCS"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:151
+msgid "Fixed broken drag'n'drop since migration to Python3/GTK3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:152
+msgid "Fixed error when using '-m' in an SVN repo"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:157
+msgid "Romain Failliot"
+msgstr ""
+
+#: src/constants.py.in:23
 msgid "Copyright"
 msgstr ""
 
-#: src/usr/bin/diffuse.py.in:81
+#: src/main.py:591
+#, python-format
+msgid "Error processing line %(line)d of %(file)s."
+msgstr "Při zpracování řádku %(line)d souboru %(file)s došlo k chybě."
+
+#: src/main.py:610
+msgid "Auto Detect"
+msgstr "Automaticky rozpoznat"
+
+#: src/main.py:706
+msgid "Display"
+msgstr "Zobrazení"
+
+#: src/main.py:708
+msgid "Font"
+msgstr "Písmo"
+
+#: src/main.py:709
+msgid "Tab width"
+msgstr "Šířka tabulátoru"
+
+#: src/main.py:710
+msgid "Show right margin"
+msgstr "Zobrazit pravý okraj"
+
+#: src/main.py:711
+msgid "Right margin"
+msgstr "Pravý okraj"
+
+#: src/main.py:712
+msgid "Show line numbers"
+msgstr "Zobrazit čísla řádků"
+
+#: src/main.py:713
+msgid "Show white space characters"
+msgstr "Zobrazit netisknutelné znaky"
+
+#: src/main.py:714
+msgid "Ignore case differences"
+msgstr "Ignorovat velikost písmen"
+
+#: src/main.py:715
+msgid "Ignore white space differences"
+msgstr "Ignorovat netisknutelné znaky"
+
+#: src/main.py:716 src/main.py:724
+msgid "Ignore changes to white space"
+msgstr "Ignorovat znaky mezer"
+
+#: src/main.py:717
+msgid "Ignore blank line differences"
+msgstr "Ignorovat prázdné řádky"
+
+#: src/main.py:718
+msgid "Ignore end of line differences"
+msgstr "Ignorovat znaky konce řádku"
+
+#: src/main.py:720
+msgid "Alignment"
+msgstr "Zarovnání"
+
+#: src/main.py:722
+msgid "Ignore case"
+msgstr "Ignorovat velikost písmen"
+
+#: src/main.py:723
+msgid "Ignore white space"
+msgstr "Ignorovat netisknutelné znaky"
+
+#: src/main.py:725
+msgid "Ignore blank lines"
+msgstr "Ignorovat prázdné řádky"
+
+#: src/main.py:726
+msgid "Ignore end of line characters"
+msgstr "Ignorovat znaky konce řádku"
+
+#: src/main.py:728
+msgid "Editor"
+msgstr "Editor"
+
+#: src/main.py:730
+msgid "Auto indent"
+msgstr "Automaticky odsazovat"
+
+#: src/main.py:731
+msgid "Expand tabs to spaces"
+msgstr "Nahradit tabulátory mezerami"
+
+#: src/main.py:732
+msgid "Soft tab width"
+msgstr "Šířka tabulátoru"
+
+#: src/main.py:734
+msgid "Tabs"
+msgstr "Panely"
+
+#: src/main.py:736
+msgid "Default panes"
+msgstr "Výchozí počet podoken"
+
+#: src/main.py:737
+msgid "Always show the tab bar"
+msgstr "Vždy zobrazovat lištu s panely"
+
+#: src/main.py:738
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "Zobrazit upozornění, pokud zavření panelu ukončí %s"
+
+#: src/main.py:740
+msgid "Regional Settings"
+msgstr "Místní nastavení"
+
+#: src/main.py:742
+msgid "Default codec"
+msgstr "Výchozí kódování"
+
+#: src/main.py:743
+msgid "Order of codecs used to identify encoding"
+msgstr "Pořadí kodeků pro rozpoznání kódování"
+
+#: src/main.py:763
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/main.py:765
+msgid "Root directory"
+msgstr "Kořenový adresář"
+
+#: src/main.py:766
+msgid "Cygdrive prefix"
+msgstr "Předpona cygdrive"
+
+#: src/main.py:782
+msgid "Version control system search order"
+msgstr ""
+
+#: src/main.py:788
+msgid "\"co\" command"
+msgstr "příkaz \"co\""
+
+#: src/main.py:789
+msgid "\"rlog\" command"
+msgstr "příkaz \"rlog\""
+
+#: src/main.py:791
+msgid "Command"
+msgstr "Příkaz"
+
+#: src/main.py:793
+msgid "Launch from a Bash login shell"
+msgstr "Spustit z příkazové řádky terminálu Bash"
+
+#: src/main.py:795
+msgid "Update paths for Cygwin"
+msgstr "Upravit cesty pro Cygwin"
+
+#: src/main.py:799
+msgid "Version Control"
+msgstr "Správa verzí"
+
+#: src/main.py:863
+msgid "Preferences"
+msgstr "Předvolby"
+
+#: src/main.py:904 src/main.py:5802
+#, python-format
+msgid "Error writing %s."
+msgstr "Při ukládání %s došlo k chybě."
+
+#: src/main.py:3282
+msgid "Align with Selection"
+msgstr "Zarovnat s výběrem"
+
+#: src/main.py:3283
+msgid "Isolate"
+msgstr "Izolovat"
+
+#: src/main.py:3284
+msgid "Merge Selection"
+msgstr "Sloučit výběr"
+
+#: src/main.py:3286 src/main.py:6098
+msgid "Cut"
+msgstr "Vyjmout"
+
+#: src/main.py:3287 src/main.py:6099
+msgid "Copy"
+msgstr "Kopírovat"
+
+#: src/main.py:3288 src/main.py:6100
+msgid "Paste"
+msgstr "Vložit"
+
+#: src/main.py:3290
+msgid "Select All"
+msgstr "Vybrat vše"
+
+#: src/main.py:3291 src/main.py:6101
+msgid "Clear Edits"
+msgstr "Smazat úpravy"
+
+#: src/main.py:3293
+msgid "Swap with Selected Pane"
+msgstr "Prohodit s vybraným podoknem"
+
+#: src/main.py:5124
+msgid "Find..."
+msgstr "Najít..."
+
+#: src/main.py:5132
+msgid "Search For: "
+msgstr "Vyhledat: "
+
+#: src/main.py:5157
+msgid "Match Case"
+msgstr "Rozlišovat velikost písmen"
+
+#: src/main.py:5162
+msgid "Search Backwards"
+msgstr "Hledat od konce"
+
+#: src/main.py:5176
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "Zavřením tohoto panelu ukončíte %s."
+
+#: src/main.py:5198
+msgid "Encoding: "
+msgstr "Kódování: "
+
+#: src/main.py:5208
+msgid "Revision: "
+msgstr "Revize: "
+
+#: src/main.py:5272
+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/main.py:5277
+msgid "translator-credits"
+msgstr "Jindřich Šesták <khagaroth@gmail.com>"
+
+#: src/main.py:5281
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"Tento program je svobodný software. Můžete ho upravovat a distribuovat za podmínky dodržení pravidel licence GNU General Public License verze 2 (dále jen GPL), nebo (pokud chcete) některé z jejích novějších verzí.\n"
+"\n"
+"Tento program je distribuován v naději, že bude užitečný, ale BEZ JAKÉKOLIV ZÁRUKY, tedy ani implicitní záruky OBCHODOVATELNOSTI nebo VHODNOSTI PRO URČITÝ ÚČEL. Další podrobnosti získáte přečtením GPL.\n"
+"\n"
+"Spolu s tímto programem by jste měli obdržet i kopii GPL. GPL můžete také získat na domovských stránkách Free Software Foundation (http://www.fsf.org/), nebo můžete zaslat dopis na adresu Free Software Foundation, Inc., 51 Franclin St, Fifth Floor, Boston, MA 02110-1301 USA\n"
+
+#: src/main.py:5322
+msgid "Close Tab"
+msgstr "Zavřít panel"
+
+#: src/main.py:5377
+msgid "Open File..."
+msgstr "Otevřít soubor..."
+
+#: src/main.py:5378
+msgid "Reload File"
+msgstr "Znovu načíst soubor"
+
+#: src/main.py:5379
+msgid "Save File"
+msgstr "Uložit soubor"
+
+#: src/main.py:5380
+msgid "Save File As..."
+msgstr "Uložit soubor jako..."
+
+#: src/main.py:5525
+msgid "Save changes before loading the new file?"
+msgstr "Uložit změny před načtením nového souboru?"
+
+#: src/main.py:5635
+#, 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/main.py:5637 src/main.py:6900
+#, python-format
+msgid "Error reading %s."
+msgstr "Při čtení souboru %s došlo k chybě."
+
+#: src/main.py:5658
+msgid "Open File"
+msgstr "Otevřít soubor"
+
+#: src/main.py:5708
+#, 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/main.py:5728
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "Uložit podokno %(pane)d %(title)s"
+
+#: src/main.py:5754
+#, 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/main.py:5759
+#, 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/main.py:5800
+#, python-format
+msgid "Error encoding to %s."
+msgstr "Při změně kódování do %s došlo k chybě."
+
+#: src/main.py:5830
+msgid "Go To Line..."
+msgstr "Přejít na řádek..."
+
+#: src/main.py:5830
+msgid "Line Number: "
+msgstr "Řádek číslo: "
+
+#: src/main.py:5856
+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/main.py:5858
+msgid "Press the escape key to finish editing."
+msgstr "Editaci ukončíte pomocí klávesy escape."
+
+#: src/main.py:5860
+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/main.py:5971
+msgid "_File"
+msgstr "_Soubor"
+
+#: src/main.py:5972
+msgid "_Open File..."
+msgstr "_Otevřít soubor..."
+
+#: src/main.py:5973
+msgid "Open File In New _Tab..."
+msgstr "Otevřít soubor v novém _panelu..."
+
+#: src/main.py:5974
+msgid "Open _Modified Files..."
+msgstr "Otevřít změněné soubory..."
+
+#: src/main.py:5975
+msgid "Open Commi_t..."
+msgstr "Otevřít _revizi..."
+
+#: src/main.py:5976
+msgid "_Reload File"
+msgstr "_Znovu načíst soubor"
+
+#: src/main.py:5978
+msgid "_Save File"
+msgstr "_Uložit soubor"
+
+#: src/main.py:5979
+msgid "Save File _As..."
+msgstr "Uložit soubor ­_jako..."
+
+#: src/main.py:5980
+msgid "Save A_ll"
+msgstr "Uložit _vše"
+
+#: src/main.py:5982
+msgid "New _2-Way File Merge"
+msgstr "Nové _2směrné slučování"
+
+#: src/main.py:5983
+msgid "New _3-Way File Merge"
+msgstr "Nové _3směrné slučování"
+
+#: src/main.py:5984
+msgid "New _N-Way File Merge..."
+msgstr "Nové _Nsměrné slučování"
+
+#: src/main.py:5986
+msgid "_Close Tab"
+msgstr "_Zavřít panel"
+
+#: src/main.py:5987
+msgid "_Undo Close Tab"
+msgstr "_Obnovit zavřený panel"
+
+#: src/main.py:5988
+msgid "_Quit"
+msgstr "Kone_c"
+
+#: src/main.py:5990
+msgid "_Edit"
+msgstr "Úpr_avy"
+
+#: src/main.py:5991
+msgid "_Undo"
+msgstr "_Zpět"
+
+#: src/main.py:5992
+msgid "_Redo"
+msgstr "Z_novu"
+
+#: src/main.py:5994
+msgid "Cu_t"
+msgstr "_Vyjmout"
+
+#: src/main.py:5995
+msgid "_Copy"
+msgstr "_Kopírovat"
+
+#: src/main.py:5996
+msgid "_Paste"
+msgstr "V_ložit"
+
+#: src/main.py:5998
+msgid "Select _All"
+msgstr "V_ybrat vše"
+
+#: src/main.py:5999
+msgid "C_lear Edits"
+msgstr "_Smazat úpravy"
+
+#: src/main.py:6000
+msgid "_Dismiss All Edits"
+msgstr "Z_rušit všechny úpravy"
+
+#: src/main.py:6002
+msgid "_Find..."
+msgstr "_Najít"
+
+#: src/main.py:6003
+msgid "Find _Next"
+msgstr "Najít _další"
+
+#: src/main.py:6004
+msgid "Find Pre_vious"
+msgstr "Najít _předchozí"
+
+#: src/main.py:6005
+msgid "_Go To Line..."
+msgstr "Pře_jít na řádek..."
+
+#: src/main.py:6007
+msgid "Pr_eferences..."
+msgstr "Př_edvolby..."
+
+#: src/main.py:6009
+msgid "None"
+msgstr "Nic"
+
+#: src/main.py:6017
+msgid "_View"
+msgstr "_Zobrazit"
+
+#: src/main.py:6018
+msgid "_Syntax Highlighting"
+msgstr "Zvýraznění _syntaxe"
+
+#: src/main.py:6020
+msgid "Re_align All"
+msgstr "Znovu _zarovnat"
+
+#: src/main.py:6021
+msgid "_Isolate"
+msgstr "_Izolovat"
+
+#: src/main.py:6023
+msgid "_First Difference"
+msgstr "Pr_vní rozdíl"
+
+#: src/main.py:6024
+msgid "_Previous Difference"
+msgstr "_Předchozí rozdíl"
+
+#: src/main.py:6025
+msgid "_Next Difference"
+msgstr "_Další rozdíl"
+
+#: src/main.py:6026
+msgid "_Last Difference"
+msgstr "P_oslední rozdíl"
+
+#: src/main.py:6028
+msgid "Fir_st Tab"
+msgstr "Prv_ní panel"
+
+#: src/main.py:6029
+msgid "Pre_vious Tab"
+msgstr "Předch_ozí panel"
+
+#: src/main.py:6030
+msgid "Next _Tab"
+msgstr "D_alší panel"
+
+#: src/main.py:6031
+msgid "Las_t Tab"
+msgstr "Posl_ední panel"
+
+#: src/main.py:6033
+msgid "Shift Pane _Right"
+msgstr "Přesunout podokno dop_rava"
+
+#: src/main.py:6034
+msgid "Shift Pane _Left"
+msgstr "Přesunout podokno do_leva"
+
+#: src/main.py:6036
+msgid "F_ormat"
+msgstr "F_ormát"
+
+#: src/main.py:6037
+msgid "Convert To _Upper Case"
+msgstr "Převést na _velká písmena"
+
+#: src/main.py:6038
+msgid "Convert To _Lower Case"
+msgstr "Převést na _malá písmena"
+
+#: src/main.py:6040
+msgid "Sort Lines In _Ascending Order"
+msgstr "Seřadit řádky v_zestupně"
+
+#: src/main.py:6041
+msgid "Sort Lines In D_escending Order"
+msgstr "Seřadit řádky _sestupně"
+
+#: src/main.py:6043
+msgid "Remove Trailing _White Space"
+msgstr "_Odstranit mezery na koncích řádků"
+
+#: src/main.py:6044
+msgid "Convert Tabs To _Spaces"
+msgstr "_Nahradit tabulátory mezerami"
+
+#: src/main.py:6045
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "Nah_radit úvodní mezery tabulátory"
+
+#: src/main.py:6047
+msgid "_Increase Indenting"
+msgstr "Zvětš_it odsazení"
+
+#: src/main.py:6048
+msgid "De_crease Indenting"
+msgstr "Zmenši_t odsazení"
+
+#: src/main.py:6050
+msgid "Convert To _DOS Format"
+msgstr "Převést na _DOS formát"
+
+#: src/main.py:6051
+msgid "Convert To _Mac Format"
+msgstr "Převést na Ma_c formát"
+
+#: src/main.py:6052
+msgid "Convert To Uni_x Format"
+msgstr "Převést na Uni_x formát"
+
+#: src/main.py:6054
+msgid "_Merge"
+msgstr "S_loučit"
+
+#: src/main.py:6055
+msgid "Copy Selection _Right"
+msgstr "_Kopírovat výběr doprava"
+
+#: src/main.py:6056
+msgid "Copy Selection _Left"
+msgstr "K_opírovat výběr doleva"
+
+#: src/main.py:6058
+msgid "Copy Left _Into Selection"
+msgstr "Ko_pírovat zleva do výběru"
+
+#: src/main.py:6059
+msgid "Copy Right I_nto Selection"
+msgstr "Kopí_rovat zprava do výběru"
+
+#: src/main.py:6060
+msgid "_Merge From Left Then Right"
+msgstr "_Sloučit zleva a poté zprava"
+
+#: src/main.py:6061
+msgid "M_erge From Right Then Left"
+msgstr "S_loučit zprava a poté zleva"
+
+#: src/main.py:6063
+msgid "_Help"
+msgstr "Nápo_věda"
+
+#: src/main.py:6064
+msgid "_Help Contents..."
+msgstr "_Zobrazit nápovědu"
+
+#: src/main.py:6066
+#, python-format
+msgid "_About %s..."
+msgstr "_O programu %s..."
+
+#: src/main.py:6080
+msgid "New 2-Way File Merge"
+msgstr "Nové 2směrné slučování"
+
+#: src/main.py:6081
+msgid "New 3-Way File Merge"
+msgstr "Nové 3směrné slučování"
+
+#: src/main.py:6083
+msgid "Realign All"
+msgstr "Znovu zarovnat"
+
+#: src/main.py:6084
+msgid "First Difference"
+msgstr "První rozdíl"
+
+#: src/main.py:6085
+msgid "Previous Difference"
+msgstr "Předchozí rozdíl"
+
+#: src/main.py:6086
+msgid "Next Difference"
+msgstr "Další rozdíl"
+
+#: src/main.py:6087
+msgid "Last Difference"
+msgstr "Poslední rozdíl"
+
+#: src/main.py:6089
+msgid "Copy Selection Right"
+msgstr "Kopírovat výběr doprava"
+
+#: src/main.py:6090
+msgid "Copy Selection Left"
+msgstr "Kopírovat výběr doleva"
+
+#: src/main.py:6091
+msgid "Copy Left Into Selection"
+msgstr "Kopírovat zleva do výběru"
+
+#: src/main.py:6092
+msgid "Copy Right Into Selection"
+msgstr "Kopírovat zprava do výběru"
+
+#: src/main.py:6093
+msgid "Merge From Left Then Right"
+msgstr "Sloučit zleva a poté zprava"
+
+#: src/main.py:6094
+msgid "Merge From Right Then Left"
+msgstr "Sloučit zprava a poté zleva"
+
+#: src/main.py:6096
+msgid "Undo"
+msgstr "Zpět"
+
+#: src/main.py:6097
+msgid "Redo"
+msgstr "Znovu"
+
+#: src/main.py:6221
+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/main.py:6234
+msgid "Tab"
+msgstr "Panel"
+
+#: src/main.py:6239
+msgid "Pane"
+msgstr "Podokno"
+
+#: src/main.py:6250
+msgid "Close _Without Saving"
+msgstr "Zavřít _bez uložení"
+
+#: src/main.py:6361
+#, python-format
+msgid "File Merge %d"
+msgstr "Slučování %d"
+
+#: src/main.py:6464
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "Revize pro %s se nepodařilo načíst."
+
+#: src/main.py:6493
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "Při načítání změn %s došlo k chybě."
+
+#: src/main.py:6523
+msgid "Open File In New Tab"
+msgstr "Otevřít soubor v novém panelu"
+
+#: src/main.py:6539
+msgid "Choose Folder With Modified Files"
+msgstr "Vyberte adresář se změněnými soubory"
+
+#: src/main.py:6552
+msgid "No modified files found."
+msgstr "Nebyly nalezeny žádné změněné soubory."
+
+#: src/main.py:6557
+msgid "Choose Folder With Commit"
+msgstr "Vyberte adresář se zapsanou revizí"
+
+#: src/main.py:6570
+msgid "No committed files found."
+msgstr "Nebyly nalezeny žádné zapsané soubory."
+
+#: src/main.py:6604
+msgid "New N-Way File Merge..."
+msgstr "Nové Nsměrné slučování"
+
+#: src/main.py:6604
+msgid "Number of panes: "
+msgstr "Počet podoken: "
+
+#: src/main.py:6669
+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/main.py:6671
+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/main.py:6819
 msgid ""
 "Usage:\n"
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
@@ -112,768 +1074,30 @@ msgstr ""
 "  ( -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/usr/bin/diffuse.py.in:716
-#, python-format
-msgid "Error processing line %(line)d of %(file)s."
-msgstr "Při zpracování řádku %(line)d souboru %(file)s došlo k chybě."
-
-#: src/usr/bin/diffuse.py.in:735
-msgid "Auto Detect"
-msgstr "Automaticky rozpoznat"
-
-#: src/usr/bin/diffuse.py.in:831
-msgid "Display"
-msgstr "Zobrazení"
-
-#: src/usr/bin/diffuse.py.in:833
-msgid "Font"
-msgstr "Písmo"
-
-#: src/usr/bin/diffuse.py.in:834
-msgid "Tab width"
-msgstr "Šířka tabulátoru"
-
-#: src/usr/bin/diffuse.py.in:835
-msgid "Show right margin"
-msgstr "Zobrazit pravý okraj"
-
-#: src/usr/bin/diffuse.py.in:836
-msgid "Right margin"
-msgstr "Pravý okraj"
-
-#: src/usr/bin/diffuse.py.in:837
-msgid "Show line numbers"
-msgstr "Zobrazit čísla řádků"
-
-#: src/usr/bin/diffuse.py.in:838
-msgid "Show white space characters"
-msgstr "Zobrazit netisknutelné znaky"
-
-#: src/usr/bin/diffuse.py.in:839
-msgid "Ignore case differences"
-msgstr "Ignorovat velikost písmen"
-
-#: src/usr/bin/diffuse.py.in:840
-msgid "Ignore white space differences"
-msgstr "Ignorovat netisknutelné znaky"
-
-#: src/usr/bin/diffuse.py.in:841 src/usr/bin/diffuse.py.in:849
-msgid "Ignore changes to white space"
-msgstr "Ignorovat znaky mezer"
-
-#: src/usr/bin/diffuse.py.in:842
-msgid "Ignore blank line differences"
-msgstr "Ignorovat prázdné řádky"
-
-#: src/usr/bin/diffuse.py.in:843
-msgid "Ignore end of line differences"
-msgstr "Ignorovat znaky konce řádku"
-
-#: src/usr/bin/diffuse.py.in:845
-msgid "Alignment"
-msgstr "Zarovnání"
-
-#: src/usr/bin/diffuse.py.in:847
-msgid "Ignore case"
-msgstr "Ignorovat velikost písmen"
-
-#: src/usr/bin/diffuse.py.in:848
-msgid "Ignore white space"
-msgstr "Ignorovat netisknutelné znaky"
-
-#: src/usr/bin/diffuse.py.in:850
-msgid "Ignore blank lines"
-msgstr "Ignorovat prázdné řádky"
-
-#: src/usr/bin/diffuse.py.in:851
-msgid "Ignore end of line characters"
-msgstr "Ignorovat znaky konce řádku"
-
-#: src/usr/bin/diffuse.py.in:853
-msgid "Editor"
-msgstr "Editor"
-
-#: src/usr/bin/diffuse.py.in:855
-msgid "Auto indent"
-msgstr "Automaticky odsazovat"
-
-#: src/usr/bin/diffuse.py.in:856
-msgid "Expand tabs to spaces"
-msgstr "Nahradit tabulátory mezerami"
-
-#: src/usr/bin/diffuse.py.in:857
-msgid "Soft tab width"
-msgstr "Šířka tabulátoru"
-
-#: src/usr/bin/diffuse.py.in:859
-msgid "Tabs"
-msgstr "Panely"
-
-#: src/usr/bin/diffuse.py.in:861
-msgid "Default panes"
-msgstr "Výchozí počet podoken"
-
-#: src/usr/bin/diffuse.py.in:862
-msgid "Always show the tab bar"
-msgstr "Vždy zobrazovat lištu s panely"
-
-#: src/usr/bin/diffuse.py.in:863
-#, python-format
-msgid "Warn me when closing a tab will quit %s"
-msgstr "Zobrazit upozornění, pokud zavření panelu ukončí %s"
-
-#: src/usr/bin/diffuse.py.in:865
-msgid "Regional Settings"
-msgstr "Místní nastavení"
-
-#: src/usr/bin/diffuse.py.in:867
-msgid "Default codec"
-msgstr "Výchozí kódování"
-
-#: src/usr/bin/diffuse.py.in:868
-msgid "Order of codecs used to identify encoding"
-msgstr "Pořadí kodeků pro rozpoznání kódování"
-
-#: src/usr/bin/diffuse.py.in:888
-msgid "Cygwin"
-msgstr "Cygwin"
-
-#: src/usr/bin/diffuse.py.in:890
-msgid "Root directory"
-msgstr "Kořenový adresář"
-
-#: src/usr/bin/diffuse.py.in:891
-msgid "Cygdrive prefix"
-msgstr "Předpona cygdrive"
-
-#: src/usr/bin/diffuse.py.in:907
-msgid "Version control system search order"
-msgstr ""
-
-#: src/usr/bin/diffuse.py.in:913
-msgid "\"co\" command"
-msgstr "příkaz \"co\""
-
-#: src/usr/bin/diffuse.py.in:914
-msgid "\"rlog\" command"
-msgstr "příkaz \"rlog\""
-
-#: src/usr/bin/diffuse.py.in:916
-msgid "Command"
-msgstr "Příkaz"
-
-#: src/usr/bin/diffuse.py.in:918
-msgid "Launch from a Bash login shell"
-msgstr "Spustit z příkazové řádky terminálu Bash"
-
-#: src/usr/bin/diffuse.py.in:920
-msgid "Update paths for Cygwin"
-msgstr "Upravit cesty pro Cygwin"
-
-#: src/usr/bin/diffuse.py.in:924
-msgid "Version Control"
-msgstr "Správa verzí"
-
-#: src/usr/bin/diffuse.py.in:988
-msgid "Preferences"
-msgstr "Předvolby"
-
-#: src/usr/bin/diffuse.py.in:1029 src/usr/bin/diffuse.py.in:7295
-#, python-format
-msgid "Error writing %s."
-msgstr "Při ukládání %s došlo k chybě."
-
-#: src/usr/bin/diffuse.py.in:1656 src/usr/bin/diffuse.py.in:2273
-#: src/usr/bin/diffuse.py.in:2417
-#, python-format
-msgid "Error parsing revision %s."
-msgstr "Při analýze revize %s došlo k chybě."
-
-#: src/usr/bin/diffuse.py.in:2658
-#, python-format
-msgid "Error parsing %s."
-msgstr "Při analýze %s došlo k chybě."
-
-#: src/usr/bin/diffuse.py.in:4778
-msgid "Align with Selection"
-msgstr "Zarovnat s výběrem"
-
-#: src/usr/bin/diffuse.py.in:4779
-msgid "Isolate"
-msgstr "Izolovat"
-
-#: src/usr/bin/diffuse.py.in:4780
-msgid "Merge Selection"
-msgstr "Sloučit výběr"
-
-#: src/usr/bin/diffuse.py.in:4782 src/usr/bin/diffuse.py.in:7593
-msgid "Cut"
-msgstr "Vyjmout"
-
-#: src/usr/bin/diffuse.py.in:4783 src/usr/bin/diffuse.py.in:7594
-msgid "Copy"
-msgstr "Kopírovat"
-
-#: src/usr/bin/diffuse.py.in:4784 src/usr/bin/diffuse.py.in:7595
-msgid "Paste"
-msgstr "Vložit"
-
-#: src/usr/bin/diffuse.py.in:4786
-msgid "Select All"
-msgstr "Vybrat vše"
-
-#: src/usr/bin/diffuse.py.in:4787 src/usr/bin/diffuse.py.in:7596
-msgid "Clear Edits"
-msgstr "Smazat úpravy"
-
-#: src/usr/bin/diffuse.py.in:4789
-msgid "Swap with Selected Pane"
-msgstr "Prohodit s vybraným podoknem"
-
-#: src/usr/bin/diffuse.py.in:6620
-msgid "Find..."
-msgstr "Najít..."
-
-#: src/usr/bin/diffuse.py.in:6628
-msgid "Search For: "
-msgstr "Vyhledat: "
-
-#: src/usr/bin/diffuse.py.in:6653
-msgid "Match Case"
-msgstr "Rozlišovat velikost písmen"
-
-#: src/usr/bin/diffuse.py.in:6658
-msgid "Search Backwards"
-msgstr "Hledat od konce"
-
-#: src/usr/bin/diffuse.py.in:6672
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "Zavřením tohoto panelu ukončíte %s."
-
-#: src/usr/bin/diffuse.py.in:6694
-msgid "Encoding: "
-msgstr "Kódování: "
-
-#: src/usr/bin/diffuse.py.in:6704
-msgid "Revision: "
-msgstr "Revize: "
-
-#: src/usr/bin/diffuse.py.in:6768
-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/usr/bin/diffuse.py.in:6773
-msgid "translator-credits"
-msgstr "Jindřich Šesták <khagaroth@gmail.com>"
-
-#: src/usr/bin/diffuse.py.in:6776
-msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program.  You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
-"Tento program je svobodný software. Můžete ho upravovat a distribuovat za podmínky dodržení pravidel licence GNU General Public License verze 2 (dále jen GPL), nebo (pokud chcete) některé z jejích novějších verzí.\n"
-"\n"
-"Tento program je distribuován v naději, že bude užitečný, ale BEZ JAKÉKOLIV ZÁRUKY, tedy ani implicitní záruky OBCHODOVATELNOSTI nebo VHODNOSTI PRO URČITÝ ÚČEL. Další podrobnosti získáte přečtením GPL.\n"
-"\n"
-"Spolu s tímto programem by jste měli obdržet i kopii GPL. GPL můžete také získat na domovských stránkách Free Software Foundation (http://www.fsf.org/), nebo můžete zaslat dopis na adresu Free Software Foundation, Inc., 51 Franclin St, Fifth Floor, Boston, MA 02110-1301 USA\n"
-
-#: src/usr/bin/diffuse.py.in:6811
-msgid "Close Tab"
-msgstr "Zavřít panel"
-
-#: src/usr/bin/diffuse.py.in:6866
-msgid "Open File..."
-msgstr "Otevřít soubor..."
-
-#: src/usr/bin/diffuse.py.in:6867
-msgid "Reload File"
-msgstr "Znovu načíst soubor"
-
-#: src/usr/bin/diffuse.py.in:6868
-msgid "Save File"
-msgstr "Uložit soubor"
-
-#: src/usr/bin/diffuse.py.in:6869
-msgid "Save File As..."
-msgstr "Uložit soubor jako..."
-
-#: src/usr/bin/diffuse.py.in:7014
-msgid "Save changes before loading the new file?"
-msgstr "Uložit změny před načtením nového souboru?"
-
-#: src/usr/bin/diffuse.py.in:7124
-#, 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/usr/bin/diffuse.py.in:7126 src/usr/bin/diffuse.py.in:8359
-#, python-format
-msgid "Error reading %s."
-msgstr "Při čtení souboru %s došlo k chybě."
-
-#: src/usr/bin/diffuse.py.in:7149
-msgid "Open File"
-msgstr "Otevřít soubor"
-
-#: src/usr/bin/diffuse.py.in:7199
-#, 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/usr/bin/diffuse.py.in:7219
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "Uložit podokno %(pane)d %(title)s"
-
-#: src/usr/bin/diffuse.py.in:7245
-#, 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/usr/bin/diffuse.py.in:7250
-#, 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/usr/bin/diffuse.py.in:7291
-#, python-format
-msgid "Error encoding to %s."
-msgstr "Při změně kódování do %s došlo k chybě."
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Go To Line..."
-msgstr "Přejít na řádek..."
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Line Number: "
-msgstr "Řádek číslo: "
-
-#: src/usr/bin/diffuse.py.in:7351
-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/usr/bin/diffuse.py.in:7353
-msgid "Press the escape key to finish editing."
-msgstr "Editaci ukončíte pomocí klávesy escape."
-
-#: src/usr/bin/diffuse.py.in:7355
-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/usr/bin/diffuse.py.in:7466
-msgid "_File"
-msgstr "_Soubor"
-
-#: src/usr/bin/diffuse.py.in:7467
-msgid "_Open File..."
-msgstr "_Otevřít soubor..."
-
-#: src/usr/bin/diffuse.py.in:7468
-msgid "Open File In New _Tab..."
-msgstr "Otevřít soubor v novém _panelu..."
-
-#: src/usr/bin/diffuse.py.in:7469
-msgid "Open _Modified Files..."
-msgstr "Otevřít změněné soubory..."
-
-#: src/usr/bin/diffuse.py.in:7470
-msgid "Open Commi_t..."
-msgstr "Otevřít _revizi..."
-
-#: src/usr/bin/diffuse.py.in:7471
-msgid "_Reload File"
-msgstr "_Znovu načíst soubor"
-
-#: src/usr/bin/diffuse.py.in:7473
-msgid "_Save File"
-msgstr "_Uložit soubor"
-
-#: src/usr/bin/diffuse.py.in:7474
-msgid "Save File _As..."
-msgstr "Uložit soubor ­_jako..."
-
-#: src/usr/bin/diffuse.py.in:7475
-msgid "Save A_ll"
-msgstr "Uložit _vše"
-
-#: src/usr/bin/diffuse.py.in:7477
-msgid "New _2-Way File Merge"
-msgstr "Nové _2směrné slučování"
-
-#: src/usr/bin/diffuse.py.in:7478
-msgid "New _3-Way File Merge"
-msgstr "Nové _3směrné slučování"
-
-#: src/usr/bin/diffuse.py.in:7479
-msgid "New _N-Way File Merge..."
-msgstr "Nové _Nsměrné slučování"
-
-#: src/usr/bin/diffuse.py.in:7481
-msgid "_Close Tab"
-msgstr "_Zavřít panel"
-
-#: src/usr/bin/diffuse.py.in:7482
-msgid "_Undo Close Tab"
-msgstr "_Obnovit zavřený panel"
-
-#: src/usr/bin/diffuse.py.in:7483
-msgid "_Quit"
-msgstr "Kone_c"
-
-#: src/usr/bin/diffuse.py.in:7485
-msgid "_Edit"
-msgstr "Úpr_avy"
-
-#: src/usr/bin/diffuse.py.in:7486
-msgid "_Undo"
-msgstr "_Zpět"
-
-#: src/usr/bin/diffuse.py.in:7487
-msgid "_Redo"
-msgstr "Z_novu"
-
-#: src/usr/bin/diffuse.py.in:7489
-msgid "Cu_t"
-msgstr "_Vyjmout"
-
-#: src/usr/bin/diffuse.py.in:7490
-msgid "_Copy"
-msgstr "_Kopírovat"
-
-#: src/usr/bin/diffuse.py.in:7491
-msgid "_Paste"
-msgstr "V_ložit"
-
-#: src/usr/bin/diffuse.py.in:7493
-msgid "Select _All"
-msgstr "V_ybrat vše"
-
-#: src/usr/bin/diffuse.py.in:7494
-msgid "C_lear Edits"
-msgstr "_Smazat úpravy"
-
-#: src/usr/bin/diffuse.py.in:7495
-msgid "_Dismiss All Edits"
-msgstr "Z_rušit všechny úpravy"
-
-#: src/usr/bin/diffuse.py.in:7497
-msgid "_Find..."
-msgstr "_Najít"
-
-#: src/usr/bin/diffuse.py.in:7498
-msgid "Find _Next"
-msgstr "Najít _další"
-
-#: src/usr/bin/diffuse.py.in:7499
-msgid "Find Pre_vious"
-msgstr "Najít _předchozí"
-
-#: src/usr/bin/diffuse.py.in:7500
-msgid "_Go To Line..."
-msgstr "Pře_jít na řádek..."
-
-#: src/usr/bin/diffuse.py.in:7502
-msgid "Pr_eferences..."
-msgstr "Př_edvolby..."
-
-#: src/usr/bin/diffuse.py.in:7504
-msgid "None"
-msgstr "Nic"
-
-#: src/usr/bin/diffuse.py.in:7512
-msgid "_View"
-msgstr "_Zobrazit"
-
-#: src/usr/bin/diffuse.py.in:7513
-msgid "_Syntax Highlighting"
-msgstr "Zvýraznění _syntaxe"
-
-#: src/usr/bin/diffuse.py.in:7515
-msgid "Re_align All"
-msgstr "Znovu _zarovnat"
-
-#: src/usr/bin/diffuse.py.in:7516
-msgid "_Isolate"
-msgstr "_Izolovat"
-
-#: src/usr/bin/diffuse.py.in:7518
-msgid "_First Difference"
-msgstr "Pr_vní rozdíl"
-
-#: src/usr/bin/diffuse.py.in:7519
-msgid "_Previous Difference"
-msgstr "_Předchozí rozdíl"
-
-#: src/usr/bin/diffuse.py.in:7520
-msgid "_Next Difference"
-msgstr "_Další rozdíl"
-
-#: src/usr/bin/diffuse.py.in:7521
-msgid "_Last Difference"
-msgstr "P_oslední rozdíl"
-
-#: src/usr/bin/diffuse.py.in:7523
-msgid "Fir_st Tab"
-msgstr "Prv_ní panel"
-
-#: src/usr/bin/diffuse.py.in:7524
-msgid "Pre_vious Tab"
-msgstr "Předch_ozí panel"
-
-#: src/usr/bin/diffuse.py.in:7525
-msgid "Next _Tab"
-msgstr "D_alší panel"
-
-#: src/usr/bin/diffuse.py.in:7526
-msgid "Las_t Tab"
-msgstr "Posl_ední panel"
-
-#: src/usr/bin/diffuse.py.in:7528
-msgid "Shift Pane _Right"
-msgstr "Přesunout podokno dop_rava"
-
-#: src/usr/bin/diffuse.py.in:7529
-msgid "Shift Pane _Left"
-msgstr "Přesunout podokno do_leva"
-
-#: src/usr/bin/diffuse.py.in:7531
-msgid "F_ormat"
-msgstr "F_ormát"
-
-#: src/usr/bin/diffuse.py.in:7532
-msgid "Convert To _Upper Case"
-msgstr "Převést na _velká písmena"
-
-#: src/usr/bin/diffuse.py.in:7533
-msgid "Convert To _Lower Case"
-msgstr "Převést na _malá písmena"
-
-#: src/usr/bin/diffuse.py.in:7535
-msgid "Sort Lines In _Ascending Order"
-msgstr "Seřadit řádky v_zestupně"
-
-#: src/usr/bin/diffuse.py.in:7536
-msgid "Sort Lines In D_escending Order"
-msgstr "Seřadit řádky _sestupně"
-
-#: src/usr/bin/diffuse.py.in:7538
-msgid "Remove Trailing _White Space"
-msgstr "_Odstranit mezery na koncích řádků"
-
-#: src/usr/bin/diffuse.py.in:7539
-msgid "Convert Tabs To _Spaces"
-msgstr "_Nahradit tabulátory mezerami"
-
-#: src/usr/bin/diffuse.py.in:7540
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "Nah_radit úvodní mezery tabulátory"
-
-#: src/usr/bin/diffuse.py.in:7542
-msgid "_Increase Indenting"
-msgstr "Zvětš_it odsazení"
-
-#: src/usr/bin/diffuse.py.in:7543
-msgid "De_crease Indenting"
-msgstr "Zmenši_t odsazení"
-
-#: src/usr/bin/diffuse.py.in:7545
-msgid "Convert To _DOS Format"
-msgstr "Převést na _DOS formát"
-
-#: src/usr/bin/diffuse.py.in:7546
-msgid "Convert To _Mac Format"
-msgstr "Převést na Ma_c formát"
-
-#: src/usr/bin/diffuse.py.in:7547
-msgid "Convert To Uni_x Format"
-msgstr "Převést na Uni_x formát"
-
-#: src/usr/bin/diffuse.py.in:7549
-msgid "_Merge"
-msgstr "S_loučit"
-
-#: src/usr/bin/diffuse.py.in:7550
-msgid "Copy Selection _Right"
-msgstr "_Kopírovat výběr doprava"
-
-#: src/usr/bin/diffuse.py.in:7551
-msgid "Copy Selection _Left"
-msgstr "K_opírovat výběr doleva"
-
-#: src/usr/bin/diffuse.py.in:7553
-msgid "Copy Left _Into Selection"
-msgstr "Ko_pírovat zleva do výběru"
-
-#: src/usr/bin/diffuse.py.in:7554
-msgid "Copy Right I_nto Selection"
-msgstr "Kopí_rovat zprava do výběru"
-
-#: src/usr/bin/diffuse.py.in:7555
-msgid "_Merge From Left Then Right"
-msgstr "_Sloučit zleva a poté zprava"
-
-#: src/usr/bin/diffuse.py.in:7556
-msgid "M_erge From Right Then Left"
-msgstr "S_loučit zprava a poté zleva"
-
-#: src/usr/bin/diffuse.py.in:7558
-msgid "_Help"
-msgstr "Nápo_věda"
-
-#: src/usr/bin/diffuse.py.in:7559
-msgid "_Help Contents..."
-msgstr "_Zobrazit nápovědu"
-
-#: src/usr/bin/diffuse.py.in:7561
-#, python-format
-msgid "_About %s..."
-msgstr "_O programu %s..."
-
-#: src/usr/bin/diffuse.py.in:7575
-msgid "New 2-Way File Merge"
-msgstr "Nové 2směrné slučování"
-
-#: src/usr/bin/diffuse.py.in:7576
-msgid "New 3-Way File Merge"
-msgstr "Nové 3směrné slučování"
-
-#: src/usr/bin/diffuse.py.in:7578
-msgid "Realign All"
-msgstr "Znovu zarovnat"
-
-#: src/usr/bin/diffuse.py.in:7579
-msgid "First Difference"
-msgstr "První rozdíl"
-
-#: src/usr/bin/diffuse.py.in:7580
-msgid "Previous Difference"
-msgstr "Předchozí rozdíl"
-
-#: src/usr/bin/diffuse.py.in:7581
-msgid "Next Difference"
-msgstr "Další rozdíl"
-
-#: src/usr/bin/diffuse.py.in:7582
-msgid "Last Difference"
-msgstr "Poslední rozdíl"
-
-#: src/usr/bin/diffuse.py.in:7584
-msgid "Copy Selection Right"
-msgstr "Kopírovat výběr doprava"
-
-#: src/usr/bin/diffuse.py.in:7585
-msgid "Copy Selection Left"
-msgstr "Kopírovat výběr doleva"
-
-#: src/usr/bin/diffuse.py.in:7586
-msgid "Copy Left Into Selection"
-msgstr "Kopírovat zleva do výběru"
-
-#: src/usr/bin/diffuse.py.in:7587
-msgid "Copy Right Into Selection"
-msgstr "Kopírovat zprava do výběru"
-
-#: src/usr/bin/diffuse.py.in:7588
-msgid "Merge From Left Then Right"
-msgstr "Sloučit zleva a poté zprava"
-
-#: src/usr/bin/diffuse.py.in:7589
-msgid "Merge From Right Then Left"
-msgstr "Sloučit zprava a poté zleva"
-
-#: src/usr/bin/diffuse.py.in:7591
-msgid "Undo"
-msgstr "Zpět"
-
-#: src/usr/bin/diffuse.py.in:7592
-msgid "Redo"
-msgstr "Znovu"
-
-#: src/usr/bin/diffuse.py.in:7716
-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/usr/bin/diffuse.py.in:7729
-msgid "Tab"
-msgstr "Panel"
-
-#: src/usr/bin/diffuse.py.in:7734
-msgid "Pane"
-msgstr "Podokno"
-
-#: src/usr/bin/diffuse.py.in:7745
-msgid "Close _Without Saving"
-msgstr "Zavřít _bez uložení"
-
-#: src/usr/bin/diffuse.py.in:7856
-#, python-format
-msgid "File Merge %d"
-msgstr "Slučování %d"
-
-#: src/usr/bin/diffuse.py.in:7959
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "Revize pro %s se nepodařilo načíst."
-
-#: src/usr/bin/diffuse.py.in:7990
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "Při načítání změn %s došlo k chybě."
-
-#: src/usr/bin/diffuse.py.in:8022
-msgid "Open File In New Tab"
-msgstr "Otevřít soubor v novém panelu"
-
-#: src/usr/bin/diffuse.py.in:8038
-msgid "Choose Folder With Modified Files"
-msgstr "Vyberte adresář se změněnými soubory"
-
-#: src/usr/bin/diffuse.py.in:8051
-msgid "No modified files found."
-msgstr "Nebyly nalezeny žádné změněné soubory."
-
-#: src/usr/bin/diffuse.py.in:8058
-msgid "Choose Folder With Commit"
-msgstr "Vyberte adresář se zapsanou revizí"
-
-#: src/usr/bin/diffuse.py.in:8071
-msgid "No committed files found."
-msgstr "Nebyly nalezeny žádné zapsané soubory."
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "New N-Way File Merge..."
-msgstr "Nové Nsměrné slučování"
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "Number of panes: "
-msgstr "Počet podoken: "
-
-#: src/usr/bin/diffuse.py.in:8172
-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/usr/bin/diffuse.py.in:8174
-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/usr/bin/diffuse.py.in:8440
+#: src/main.py:6990
 msgid "Error parsing line number."
 msgstr "Při analýze čísla řádku došlo k chybě."
 
-#: src/usr/bin/diffuse.py.in:8450
+#: src/main.py:7000
 #, python-format
 msgid "Skipping unknown argument \"%s\"."
 msgstr "Ignorován neznámý parametr \"%s\"."
 
-#: src/usr/bin/diffuse.py.in:8457
+#: src/main.py:7007
 #, 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/vcs/cvs.py:50 src/vcs/rcs.py:54 src/vcs/svn.py:89
+#, python-format
+msgid "Error parsing revision %s."
+msgstr "Při analýze revize %s došlo k chybě."
+
+#: src/vcs/vcs_registry.py:216
+#, python-format
+msgid "Error parsing %s."
+msgstr "Při analýze %s došlo k chybě."
+
 #, python-format
 #~ msgid "Column %d"
 #~ msgstr "Sloupec %d"
diff --git a/po/de.po b/po/de.po
index eb4e62c..81829cc 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: 2020-12-08 13:51-0500\n"
+"POT-Creation-Date: 2021-11-18 15:21-0500\n"
 "PO-Revision-Date: 2021-01-26 04:29+0100\n"
 "Last-Translator: Henri Menke <henrimenke4@aim.com>\n"
 "Language-Team: German <henrimenke4@aim.com>\n"
@@ -20,19 +20,981 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: Poedit 2.4.2\n"
 
-#: data/diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:4
 msgid "Diffuse Merge Tool"
 msgstr "Diffuse Mischwerkzeug"
 
-#: data/diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:5
 msgid "Graphical tool for merging and comparing text files"
 msgstr "Werkzeug zum Mischen und Vergleichen von Textdateien"
 
-#: src/usr/bin/diffuse.py.in:70
+#: data/io.github.mightycreak.Diffuse.metainfo.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."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:19
+msgid "Main window: diff between two files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:26
+msgid "Patch release to fix a bug when using the Flatpak package."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:29
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:71
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:146
+msgid "Fixed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:31
+msgid "Fixed a Flatpak bug where the app couldn't call binaries on the host, such as `git`, `svn`, etc."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:40
+msgid "With this release, the main end-user change is the new icon. The rest is mainly maintenance improvements with a much more standard folder structure and starting to modularize the code. This is an ongoing effort as there is still a lot to do, but hopefully this would motivate some to contribute ;)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:47
+msgid "An important note though: the application ID has changed and is now io.github.mightycreak.Diffuse."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:51
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:89
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:123
+msgid "Added:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:53
+msgid "New icon and in SVG now"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:54
+msgid "Started to modularize the code"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:56
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:93
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:136
+msgid "Changed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:58
+msgid "Changed AppID to io.github.mightycreak.Diffuse (as advised in the Flatpak documentation)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:62
+msgid "Renamed directory `translations/` to `po/`"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:63
+msgid "Now uses POTFILES.in to list the files to translate"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:64
+msgid "Translation strings are no longer sorted alphabetically, this will help when there will be several files in POTFILES.in"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:68
+msgid "Updated the documentation and script in the `po/` directory"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:69
+msgid "Add .desktop translations in .po files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:73
+msgid "Fixed some GTK deprecation warnings"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:79
+msgid "Mainly under the hood changes in this release, so nothing really visible to the users in this version. That said, I figured it was a long time since the last release (4 months ago) and, as promised, I want Diffuse development to be a bit more active and iterative."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:85
+msgid "Apart from the maintenance changes 🧰, I think the main improvement is that Diffuse will soon be available through Flathub!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:91
+msgid "New Flatpak package, published on Flathub: com.github.mightycreak.Diffuse"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:95
+msgid "Replace old install.py with the more standard Meson"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:96
+msgid "Remove u string prefixes since Python 3 is in UTF-8 by default"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:97
+msgid "Replaced some interpolation operators (%) for the f string prefix"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:98
+msgid "Use the window scale factor for the icons generation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:104
+msgid "Here is the v0.5.0. Unintentionally, this release happens exactly 6 years after the previous v0.4.8 release!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:108
+msgid "There is a lot to do on this application, and some features didn't make the release. The main one being the Windows installers. I think 6 years is too long to continue to wait until this bug is fixed. The Python scripts should work on Windows, but no executable is produced (yet) with the release."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:115
+msgid "Other than that, Diffuse v0.5.0 is now officially compatible with Python 3 and GTK 3! And it is synced to the latest commits from upstream (which were never released)."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:120
+msgid "The next version will not take 6 years, I promise you! 😄"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:125
+msgid "Added Pedro Albuquerque's Portuguese translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:126
+msgid "Added Åke Engelbrektson's Swedish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:127
+msgid "Added Guillaume Hoffmann's Darcs support improvements"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:128
+msgid "Added Akom Chotiphantawanon's Thai translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:129
+msgid "Added support for Git submodules"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:130
+msgid "Added a preference and command line option to specify the version control system search order"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:131
+msgid "Added .editorconfig file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:132
+msgid "Added .gitignore file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:133
+msgid "Added message when removing files during uninstallation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:134
+msgid "Added Python script to update all the translation files at once"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:138
+msgid "Convert to Python 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:139
+msgid "Convert to GTK 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:140
+msgid "Updated Python highlighting for Python 3 grammar"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:141
+msgid "Updated copyrights years and authors"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:142
+msgid "Improve Spanish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:143
+msgid "Convert translation README to MarkDown"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:144
+msgid "Updated all the translation files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:148
+msgid "Fixed wrong icons directory for gtk-update-icon-cache"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:149
+msgid "Fixed missing directories when uninstalling"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:150
+msgid "Fixed bug introduced by r420 with RCS VCS"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:151
+msgid "Fixed broken drag'n'drop since migration to Python3/GTK3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:152
+msgid "Fixed error when using '-m' in an SVN repo"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:157
+msgid "Romain Failliot"
+msgstr ""
+
+#: src/constants.py.in:23
 msgid "Copyright"
 msgstr "Urheberrecht"
 
-#: src/usr/bin/diffuse.py.in:81
+#: src/main.py:591
+#, python-format
+msgid "Error processing line %(line)d of %(file)s."
+msgstr "Fehler bei der Analyse der Zeilen %(line)d von %(file)s."
+
+#: src/main.py:610
+msgid "Auto Detect"
+msgstr "Automatische Erkennung"
+
+#: src/main.py:706
+msgid "Display"
+msgstr "Anzeige"
+
+#: src/main.py:708
+msgid "Font"
+msgstr "Schriftart"
+
+#: src/main.py:709
+msgid "Tab width"
+msgstr "Tabulatorweite"
+
+#: src/main.py:710
+msgid "Show right margin"
+msgstr "Zeige rechten Rand"
+
+#: src/main.py:711
+msgid "Right margin"
+msgstr "Rechter Rand"
+
+#: src/main.py:712
+msgid "Show line numbers"
+msgstr "Zeige Zeilennummern"
+
+#: src/main.py:713
+msgid "Show white space characters"
+msgstr "Leerzeichen anzeigen"
+
+#: src/main.py:714
+msgid "Ignore case differences"
+msgstr "Unterschiede bei Groß- und Kleinschreibung ignorieren"
+
+#: src/main.py:715
+msgid "Ignore white space differences"
+msgstr "Unterschiede bei Leerzeichen ignorieren"
+
+#: src/main.py:716 src/main.py:724
+msgid "Ignore changes to white space"
+msgstr "Änderungen an Leerzeichen ignorieren"
+
+#: src/main.py:717
+msgid "Ignore blank line differences"
+msgstr "Unterschiede bei leeren Zeilen ignorieren"
+
+#: src/main.py:718
+msgid "Ignore end of line differences"
+msgstr "Unterschiede bei Zeilenumbrüchen ignorieren"
+
+#: src/main.py:720
+msgid "Alignment"
+msgstr "Ausrichtung"
+
+#: src/main.py:722
+msgid "Ignore case"
+msgstr "Groß- und Kleinschreibung ignorieren"
+
+#: src/main.py:723
+msgid "Ignore white space"
+msgstr "Leerzeichen ignorieren"
+
+#: src/main.py:725
+msgid "Ignore blank lines"
+msgstr "Leere Zeilen ignorieren"
+
+#: src/main.py:726
+msgid "Ignore end of line characters"
+msgstr "Zeilenumbrüche ignorieren"
+
+#: src/main.py:728
+msgid "Editor"
+msgstr "Editor"
+
+#: src/main.py:730
+msgid "Auto indent"
+msgstr "Automatischer Einzug"
+
+#: src/main.py:731
+msgid "Expand tabs to spaces"
+msgstr "Tabulatoren zu Leerzeichen erweitern"
+
+#: src/main.py:732
+msgid "Soft tab width"
+msgstr "Weiche Tabulatorweite"
+
+#: src/main.py:734
+msgid "Tabs"
+msgstr "Reiter"
+
+#: src/main.py:736
+msgid "Default panes"
+msgstr "Standard Fenster"
+
+#: src/main.py:737
+msgid "Always show the tab bar"
+msgstr "Reiter-Leiste immer anzeigen"
+
+#: src/main.py:738
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "Warnen, wenn schließen des Tabs %s beendet"
+
+#: src/main.py:740
+msgid "Regional Settings"
+msgstr "Lokalisierung"
+
+#: src/main.py:742
+msgid "Default codec"
+msgstr "Standardkodierung"
+
+#: src/main.py:743
+msgid "Order of codecs used to identify encoding"
+msgstr "Reihenfolge der Chiffren um die Kodierung zu erkennen"
+
+#: src/main.py:763
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/main.py:765
+msgid "Root directory"
+msgstr "Hauptverzeichnis"
+
+#: src/main.py:766
+msgid "Cygdrive prefix"
+msgstr "Cygdrive Präfix"
+
+#: src/main.py:782
+msgid "Version control system search order"
+msgstr "Suchreihenfolge des Versionskontrollsystems"
+
+#: src/main.py:788
+msgid "\"co\" command"
+msgstr "\"co\" Befehl"
+
+#: src/main.py:789
+msgid "\"rlog\" command"
+msgstr "\"rlog\" Befehl"
+
+#: src/main.py:791
+msgid "Command"
+msgstr "Befehl"
+
+#: src/main.py:793
+msgid "Launch from a Bash login shell"
+msgstr "Aus einer Bash login shell starten"
+
+#: src/main.py:795
+msgid "Update paths for Cygwin"
+msgstr "Pfade für Cygwin aktualisieren"
+
+#: src/main.py:799
+msgid "Version Control"
+msgstr "Versionsverwaltung"
+
+#: src/main.py:863
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: src/main.py:904 src/main.py:5802
+#, python-format
+msgid "Error writing %s."
+msgstr "Fehler beim Schreiben von %s."
+
+#: src/main.py:3282
+msgid "Align with Selection"
+msgstr "Ausrichten an der Auswahl"
+
+#: src/main.py:3283
+msgid "Isolate"
+msgstr "Isolieren"
+
+#: src/main.py:3284
+msgid "Merge Selection"
+msgstr "Auswahl zusammenführen"
+
+#: src/main.py:3286 src/main.py:6098
+msgid "Cut"
+msgstr "Ausschneiden"
+
+#: src/main.py:3287 src/main.py:6099
+msgid "Copy"
+msgstr "Kopieren"
+
+#: src/main.py:3288 src/main.py:6100
+msgid "Paste"
+msgstr "Einfügen"
+
+#: src/main.py:3290
+msgid "Select All"
+msgstr "Alles auswählen"
+
+#: src/main.py:3291 src/main.py:6101
+msgid "Clear Edits"
+msgstr "Alle Änderungen rückgängig"
+
+#: src/main.py:3293
+msgid "Swap with Selected Pane"
+msgstr "Mit ausgewähltem Fenster tauschen"
+
+#: src/main.py:5124
+msgid "Find..."
+msgstr "Suchen..."
+
+#: src/main.py:5132
+msgid "Search For: "
+msgstr "Suchen nach: "
+
+#: src/main.py:5157
+msgid "Match Case"
+msgstr "Übereinstimmen von Groß- und Kleinschreibung"
+
+#: src/main.py:5162
+msgid "Search Backwards"
+msgstr "Rückwärts suchen"
+
+#: src/main.py:5176
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "Schließen des letzten Tabs beendet %s."
+
+#: src/main.py:5198
+msgid "Encoding: "
+msgstr "Kodierung: "
+
+#: src/main.py:5208
+msgid "Revision: "
+msgstr "Revision: "
+
+#: src/main.py:5272
+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/main.py:5277
+msgid "translator-credits"
+msgstr "Henri Menke <henrimenke4@aim.com>"
+
+#: src/main.py:5281
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 3 der Lizenz oder (nach Ihrer Option) jeder späteren Version.\n"
+"\n"
+"Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, daß es Ihnen von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.\n"
+"\n"
+"Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, siehe <http://www.gnu.org/licenses/>.\n"
+
+#: src/main.py:5322
+msgid "Close Tab"
+msgstr "Reiter schließen"
+
+#: src/main.py:5377
+msgid "Open File..."
+msgstr "Datei öffnen..."
+
+#: src/main.py:5378
+msgid "Reload File"
+msgstr "Datei neu laden"
+
+#: src/main.py:5379
+msgid "Save File"
+msgstr "Datei speichern"
+
+#: src/main.py:5380
+msgid "Save File As..."
+msgstr "Datei speichern unter..."
+
+#: src/main.py:5525
+msgid "Save changes before loading the new file?"
+msgstr "Änderungen speichern vor dem Laden der neuen Datei?"
+
+#: src/main.py:5635
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "Fehler beim lesen der Revision %(rev)s von %(file)s."
+
+#: src/main.py:5637 src/main.py:6900
+#, python-format
+msgid "Error reading %s."
+msgstr "Fehler beim Lesen von %s."
+
+#: src/main.py:5658
+msgid "Open File"
+msgstr "Datei öffnen"
+
+#: src/main.py:5708
+#, 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/main.py:5728
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "Speichern %(title)s Fenster %(pane)d"
+
+#: src/main.py:5754
+#, 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/main.py:5759
+#, 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/main.py:5800
+#, python-format
+msgid "Error encoding to %s."
+msgstr "Fehler bei der Kodierung nach %s."
+
+#: src/main.py:5830
+msgid "Go To Line..."
+msgstr "Gehe zu Zeile..."
+
+#: src/main.py:5830
+msgid "Line Number: "
+msgstr "Zeilennummer: "
+
+#: src/main.py:5856
+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/main.py:5858
+msgid "Press the escape key to finish editing."
+msgstr "Drücken Sie die Escape Taste um die Bearbeitung zu beenden."
+
+#: src/main.py:5860
+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/main.py:5971
+msgid "_File"
+msgstr "_Datei"
+
+#: src/main.py:5972
+msgid "_Open File..."
+msgstr "_Öffne Datei..."
+
+#: src/main.py:5973
+msgid "Open File In New _Tab..."
+msgstr "Datei _in neuem Reiter öffnen..."
+
+#: src/main.py:5974
+msgid "Open _Modified Files..."
+msgstr "_Bearbeitete Dateien öffnen..."
+
+#: src/main.py:5975
+msgid "Open Commi_t..."
+msgstr "Revi_sion öffnen..."
+
+#: src/main.py:5976
+msgid "_Reload File"
+msgstr "Datei _neu laden"
+
+#: src/main.py:5978
+msgid "_Save File"
+msgstr "Datei _speichern"
+
+#: src/main.py:5979
+msgid "Save File _As..."
+msgstr "Datei speichern _unter..."
+
+#: src/main.py:5980
+msgid "Save A_ll"
+msgstr "_Alle speichern"
+
+#: src/main.py:5982
+msgid "New _2-Way File Merge"
+msgstr "Neues _2-Wege-Datei-Zusammenführen"
+
+#: src/main.py:5983
+msgid "New _3-Way File Merge"
+msgstr "Neues _3-Wege-Datei-Zusammenführen"
+
+#: src/main.py:5984
+msgid "New _N-Way File Merge..."
+msgstr "Neues _N-Wege-Datei-Zusammenführen..."
+
+#: src/main.py:5986
+msgid "_Close Tab"
+msgstr "_Reiter schließen"
+
+#: src/main.py:5987
+msgid "_Undo Close Tab"
+msgstr "_Reiter schließen rückgängig"
+
+#: src/main.py:5988
+msgid "_Quit"
+msgstr "_Beenden"
+
+#: src/main.py:5990
+msgid "_Edit"
+msgstr "_Bearbeiten"
+
+#: src/main.py:5991
+msgid "_Undo"
+msgstr "_Rückgängig"
+
+#: src/main.py:5992
+msgid "_Redo"
+msgstr "_Wiederholen"
+
+#: src/main.py:5994
+msgid "Cu_t"
+msgstr "_Ausschneiden"
+
+#: src/main.py:5995
+msgid "_Copy"
+msgstr "_Kopieren"
+
+#: src/main.py:5996
+msgid "_Paste"
+msgstr "_Einfügen"
+
+#: src/main.py:5998
+msgid "Select _All"
+msgstr "_Alles auswählen"
+
+#: src/main.py:5999
+msgid "C_lear Edits"
+msgstr "Alle _Änderungen rückgängig"
+
+#: src/main.py:6000
+msgid "_Dismiss All Edits"
+msgstr "Alle Än_derungen verwerfen"
+
+#: src/main.py:6002
+msgid "_Find..."
+msgstr "_Suchen..."
+
+#: src/main.py:6003
+msgid "Find _Next"
+msgstr "_Nächstes suchen"
+
+#: src/main.py:6004
+msgid "Find Pre_vious"
+msgstr "_Rückwärts suchen"
+
+#: src/main.py:6005
+msgid "_Go To Line..."
+msgstr "_Gehe zu Zeile..."
+
+#: src/main.py:6007
+msgid "Pr_eferences..."
+msgstr "_Einstellungen..."
+
+#: src/main.py:6009
+msgid "None"
+msgstr "Keine"
+
+#: src/main.py:6017
+msgid "_View"
+msgstr "_Ansicht"
+
+#: src/main.py:6018
+msgid "_Syntax Highlighting"
+msgstr "_Syntax Hervorhebung"
+
+#: src/main.py:6020
+msgid "Re_align All"
+msgstr "Alle neu _ausrichten"
+
+#: src/main.py:6021
+msgid "_Isolate"
+msgstr "_Isolieren"
+
+#: src/main.py:6023
+msgid "_First Difference"
+msgstr "_Erster Unterschied"
+
+#: src/main.py:6024
+msgid "_Previous Difference"
+msgstr "_Voriger Unterschied"
+
+#: src/main.py:6025
+msgid "_Next Difference"
+msgstr "_Nächster Unterschied"
+
+#: src/main.py:6026
+msgid "_Last Difference"
+msgstr "_Letzter Unterschied"
+
+#: src/main.py:6028
+msgid "Fir_st Tab"
+msgstr "Er_ster Reiter"
+
+#: src/main.py:6029
+msgid "Pre_vious Tab"
+msgstr "V_origer Reiter"
+
+#: src/main.py:6030
+msgid "Next _Tab"
+msgstr "N_ächster Reiter"
+
+#: src/main.py:6031
+msgid "Las_t Tab"
+msgstr "Letz_ter Reiter"
+
+#: src/main.py:6033
+msgid "Shift Pane _Right"
+msgstr "Fenster nach _rechts verschieben"
+
+#: src/main.py:6034
+msgid "Shift Pane _Left"
+msgstr "Fenster nach _links verschieben"
+
+#: src/main.py:6036
+msgid "F_ormat"
+msgstr "F_ormat"
+
+#: src/main.py:6037
+msgid "Convert To _Upper Case"
+msgstr "In Großb_uchstaben konvertieren"
+
+#: src/main.py:6038
+msgid "Convert To _Lower Case"
+msgstr "In K_leinbuchstaben konvertieren"
+
+#: src/main.py:6040
+msgid "Sort Lines In _Ascending Order"
+msgstr "Zeile in _aufsteigender Reihenfolge sortieren"
+
+#: src/main.py:6041
+msgid "Sort Lines In D_escending Order"
+msgstr "Zeile in abst_eigender Reihenfolge sortieren"
+
+#: src/main.py:6043
+msgid "Remove Trailing _White Space"
+msgstr "Entferne angehängte _Leerzeichen"
+
+#: src/main.py:6044
+msgid "Convert Tabs To _Spaces"
+msgstr "Tabulatoren in Leer_zeichen konvertieren"
+
+#: src/main.py:6045
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "Vorangestellte Leerzeichen in _Tabulatoren konvertieren"
+
+#: src/main.py:6047
+msgid "_Increase Indenting"
+msgstr "Einzug er_höhen"
+
+#: src/main.py:6048
+msgid "De_crease Indenting"
+msgstr "Einzug _vermindern"
+
+#: src/main.py:6050
+msgid "Convert To _DOS Format"
+msgstr "Ins _DOS Format konvertieren"
+
+#: src/main.py:6051
+msgid "Convert To _Mac Format"
+msgstr "Ins _Mac Format konvertieren"
+
+#: src/main.py:6052
+msgid "Convert To Uni_x Format"
+msgstr "Ins Uni_x Format konvertieren"
+
+#: src/main.py:6054
+msgid "_Merge"
+msgstr "_Zusammenführen"
+
+#: src/main.py:6055
+msgid "Copy Selection _Right"
+msgstr "Auswahl nach _rechts kopieren"
+
+#: src/main.py:6056
+msgid "Copy Selection _Left"
+msgstr "Auswahl nach _links kopieren"
+
+#: src/main.py:6058
+msgid "Copy Left _Into Selection"
+msgstr "Von links _in die Auswahl kopieren"
+
+#: src/main.py:6059
+msgid "Copy Right I_nto Selection"
+msgstr "Von rechts i_n die Auswahl kopieren"
+
+#: src/main.py:6060
+msgid "_Merge From Left Then Right"
+msgstr "Zusammenführen von links, dann von rechts"
+
+#: src/main.py:6061
+msgid "M_erge From Right Then Left"
+msgstr "Zusammenführen von rechts, dann von links"
+
+#: src/main.py:6063
+msgid "_Help"
+msgstr "_Hilfe"
+
+#: src/main.py:6064
+msgid "_Help Contents..."
+msgstr "_Inhalt..."
+
+#: src/main.py:6066
+#, python-format
+msgid "_About %s..."
+msgstr "_Über %s..."
+
+#: src/main.py:6080
+msgid "New 2-Way File Merge"
+msgstr "Neues 2-Wege-Datei-Zusammenführen"
+
+#: src/main.py:6081
+msgid "New 3-Way File Merge"
+msgstr "Neues 3-Wege-Datei-Zusammenführen"
+
+#: src/main.py:6083
+msgid "Realign All"
+msgstr "Alle neu ausrichten"
+
+#: src/main.py:6084
+msgid "First Difference"
+msgstr "Erster Unterschied"
+
+#: src/main.py:6085
+msgid "Previous Difference"
+msgstr "Voriger Unterschied"
+
+#: src/main.py:6086
+msgid "Next Difference"
+msgstr "Nächster Unterschied"
+
+#: src/main.py:6087
+msgid "Last Difference"
+msgstr "Letzter Unterschied"
+
+#: src/main.py:6089
+msgid "Copy Selection Right"
+msgstr "Auswahl nach rechts kopieren"
+
+#: src/main.py:6090
+msgid "Copy Selection Left"
+msgstr "Auswahl nach links kopieren"
+
+#: src/main.py:6091
+msgid "Copy Left Into Selection"
+msgstr "Von links in die Auswahl kopieren"
+
+#: src/main.py:6092
+msgid "Copy Right Into Selection"
+msgstr "Von rechts in die Auswahl kopieren"
+
+#: src/main.py:6093
+msgid "Merge From Left Then Right"
+msgstr "Zusammenführen von links, dann von rechts"
+
+#: src/main.py:6094
+msgid "Merge From Right Then Left"
+msgstr "Zusammenführen von rechts, dann von links"
+
+#: src/main.py:6096
+msgid "Undo"
+msgstr "Rückgängig"
+
+#: src/main.py:6097
+msgid "Redo"
+msgstr "Wiederholen"
+
+#: src/main.py:6221
+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/main.py:6234
+msgid "Tab"
+msgstr "Reiter"
+
+#: src/main.py:6239
+msgid "Pane"
+msgstr "Fenster"
+
+#: src/main.py:6250
+msgid "Close _Without Saving"
+msgstr "Ohne speichern schließen"
+
+#: src/main.py:6361
+#, python-format
+msgid "File Merge %d"
+msgstr "Dateien zusammenführen %d"
+
+#: src/main.py:6464
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "Fehler beim Empfangen der Revisionen von %s."
+
+#: src/main.py:6493
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "Fehler beim Empfangen der Bearbeitungen von %s."
+
+#: src/main.py:6523
+msgid "Open File In New Tab"
+msgstr "Datei in neuem Reiter öffnen"
+
+#: src/main.py:6539
+msgid "Choose Folder With Modified Files"
+msgstr "Ordner mit bearbeiteten Dateien auswählen"
+
+#: src/main.py:6552
+msgid "No modified files found."
+msgstr "Keine bearbeiteten Dateien gefunden."
+
+#: src/main.py:6557
+msgid "Choose Folder With Commit"
+msgstr "Ordner mit Revisionen auswählen"
+
+#: src/main.py:6570
+msgid "No committed files found."
+msgstr "Keine revidierten Dateien gefunden."
+
+#: src/main.py:6604
+msgid "New N-Way File Merge..."
+msgstr "Neues N-Wege-Datei-Zusammenführen..."
+
+#: src/main.py:6604
+msgid "Number of panes: "
+msgstr "Anzahl der Fenster: "
+
+#: src/main.py:6669
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "Ausdruck nicht gefunden.  Am Ende der Datei fortsetzen?"
+
+#: src/main.py:6671
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "Ausdruck nicht gefunden.  Am Anfang der Datei fortsetzen?"
+
+#: src/main.py:6819
 msgid ""
 "Usage:\n"
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
@@ -112,768 +1074,30 @@ msgstr ""
 "  ( -i | --ignore-case )           Unterschiede an Groß- und Kleinschreibung ignorieren\n"
 "  ( -w | --ignore-all-space )      Unterschiede an Leerzeichen ignorieren"
 
-#: src/usr/bin/diffuse.py.in:716
-#, python-format
-msgid "Error processing line %(line)d of %(file)s."
-msgstr "Fehler bei der Analyse der Zeilen %(line)d von %(file)s."
-
-#: src/usr/bin/diffuse.py.in:735
-msgid "Auto Detect"
-msgstr "Automatische Erkennung"
-
-#: src/usr/bin/diffuse.py.in:831
-msgid "Display"
-msgstr "Anzeige"
-
-#: src/usr/bin/diffuse.py.in:833
-msgid "Font"
-msgstr "Schriftart"
-
-#: src/usr/bin/diffuse.py.in:834
-msgid "Tab width"
-msgstr "Tabulatorweite"
-
-#: src/usr/bin/diffuse.py.in:835
-msgid "Show right margin"
-msgstr "Zeige rechten Rand"
-
-#: src/usr/bin/diffuse.py.in:836
-msgid "Right margin"
-msgstr "Rechter Rand"
-
-#: src/usr/bin/diffuse.py.in:837
-msgid "Show line numbers"
-msgstr "Zeige Zeilennummern"
-
-#: src/usr/bin/diffuse.py.in:838
-msgid "Show white space characters"
-msgstr "Leerzeichen anzeigen"
-
-#: src/usr/bin/diffuse.py.in:839
-msgid "Ignore case differences"
-msgstr "Unterschiede bei Groß- und Kleinschreibung ignorieren"
-
-#: src/usr/bin/diffuse.py.in:840
-msgid "Ignore white space differences"
-msgstr "Unterschiede bei Leerzeichen ignorieren"
-
-#: src/usr/bin/diffuse.py.in:841 src/usr/bin/diffuse.py.in:849
-msgid "Ignore changes to white space"
-msgstr "Änderungen an Leerzeichen ignorieren"
-
-#: src/usr/bin/diffuse.py.in:842
-msgid "Ignore blank line differences"
-msgstr "Unterschiede bei leeren Zeilen ignorieren"
-
-#: src/usr/bin/diffuse.py.in:843
-msgid "Ignore end of line differences"
-msgstr "Unterschiede bei Zeilenumbrüchen ignorieren"
-
-#: src/usr/bin/diffuse.py.in:845
-msgid "Alignment"
-msgstr "Ausrichtung"
-
-#: src/usr/bin/diffuse.py.in:847
-msgid "Ignore case"
-msgstr "Groß- und Kleinschreibung ignorieren"
-
-#: src/usr/bin/diffuse.py.in:848
-msgid "Ignore white space"
-msgstr "Leerzeichen ignorieren"
-
-#: src/usr/bin/diffuse.py.in:850
-msgid "Ignore blank lines"
-msgstr "Leere Zeilen ignorieren"
-
-#: src/usr/bin/diffuse.py.in:851
-msgid "Ignore end of line characters"
-msgstr "Zeilenumbrüche ignorieren"
-
-#: src/usr/bin/diffuse.py.in:853
-msgid "Editor"
-msgstr "Editor"
-
-#: src/usr/bin/diffuse.py.in:855
-msgid "Auto indent"
-msgstr "Automatischer Einzug"
-
-#: src/usr/bin/diffuse.py.in:856
-msgid "Expand tabs to spaces"
-msgstr "Tabulatoren zu Leerzeichen erweitern"
-
-#: src/usr/bin/diffuse.py.in:857
-msgid "Soft tab width"
-msgstr "Weiche Tabulatorweite"
-
-#: src/usr/bin/diffuse.py.in:859
-msgid "Tabs"
-msgstr "Reiter"
-
-#: src/usr/bin/diffuse.py.in:861
-msgid "Default panes"
-msgstr "Standard Fenster"
-
-#: src/usr/bin/diffuse.py.in:862
-msgid "Always show the tab bar"
-msgstr "Reiter-Leiste immer anzeigen"
-
-#: src/usr/bin/diffuse.py.in:863
-#, python-format
-msgid "Warn me when closing a tab will quit %s"
-msgstr "Warnen, wenn schließen des Tabs %s beendet"
-
-#: src/usr/bin/diffuse.py.in:865
-msgid "Regional Settings"
-msgstr "Lokalisierung"
-
-#: src/usr/bin/diffuse.py.in:867
-msgid "Default codec"
-msgstr "Standardkodierung"
-
-#: src/usr/bin/diffuse.py.in:868
-msgid "Order of codecs used to identify encoding"
-msgstr "Reihenfolge der Chiffren um die Kodierung zu erkennen"
-
-#: src/usr/bin/diffuse.py.in:888
-msgid "Cygwin"
-msgstr "Cygwin"
-
-#: src/usr/bin/diffuse.py.in:890
-msgid "Root directory"
-msgstr "Hauptverzeichnis"
-
-#: src/usr/bin/diffuse.py.in:891
-msgid "Cygdrive prefix"
-msgstr "Cygdrive Präfix"
-
-#: src/usr/bin/diffuse.py.in:907
-msgid "Version control system search order"
-msgstr "Suchreihenfolge des Versionskontrollsystems"
-
-#: src/usr/bin/diffuse.py.in:913
-msgid "\"co\" command"
-msgstr "\"co\" Befehl"
-
-#: src/usr/bin/diffuse.py.in:914
-msgid "\"rlog\" command"
-msgstr "\"rlog\" Befehl"
-
-#: src/usr/bin/diffuse.py.in:916
-msgid "Command"
-msgstr "Befehl"
-
-#: src/usr/bin/diffuse.py.in:918
-msgid "Launch from a Bash login shell"
-msgstr "Aus einer Bash login shell starten"
-
-#: src/usr/bin/diffuse.py.in:920
-msgid "Update paths for Cygwin"
-msgstr "Pfade für Cygwin aktualisieren"
-
-#: src/usr/bin/diffuse.py.in:924
-msgid "Version Control"
-msgstr "Versionsverwaltung"
-
-#: src/usr/bin/diffuse.py.in:988
-msgid "Preferences"
-msgstr "Einstellungen"
-
-#: src/usr/bin/diffuse.py.in:1029 src/usr/bin/diffuse.py.in:7295
-#, python-format
-msgid "Error writing %s."
-msgstr "Fehler beim Schreiben von %s."
-
-#: src/usr/bin/diffuse.py.in:1656 src/usr/bin/diffuse.py.in:2273
-#: src/usr/bin/diffuse.py.in:2417
-#, python-format
-msgid "Error parsing revision %s."
-msgstr "Fehler bei der Analyse der Revision %s."
-
-#: src/usr/bin/diffuse.py.in:2658
-#, python-format
-msgid "Error parsing %s."
-msgstr "Fehler bei der Analyse %s."
-
-#: src/usr/bin/diffuse.py.in:4778
-msgid "Align with Selection"
-msgstr "Ausrichten an der Auswahl"
-
-#: src/usr/bin/diffuse.py.in:4779
-msgid "Isolate"
-msgstr "Isolieren"
-
-#: src/usr/bin/diffuse.py.in:4780
-msgid "Merge Selection"
-msgstr "Auswahl zusammenführen"
-
-#: src/usr/bin/diffuse.py.in:4782 src/usr/bin/diffuse.py.in:7593
-msgid "Cut"
-msgstr "Ausschneiden"
-
-#: src/usr/bin/diffuse.py.in:4783 src/usr/bin/diffuse.py.in:7594
-msgid "Copy"
-msgstr "Kopieren"
-
-#: src/usr/bin/diffuse.py.in:4784 src/usr/bin/diffuse.py.in:7595
-msgid "Paste"
-msgstr "Einfügen"
-
-#: src/usr/bin/diffuse.py.in:4786
-msgid "Select All"
-msgstr "Alles auswählen"
-
-#: src/usr/bin/diffuse.py.in:4787 src/usr/bin/diffuse.py.in:7596
-msgid "Clear Edits"
-msgstr "Alle Änderungen rückgängig"
-
-#: src/usr/bin/diffuse.py.in:4789
-msgid "Swap with Selected Pane"
-msgstr "Mit ausgewähltem Fenster tauschen"
-
-#: src/usr/bin/diffuse.py.in:6620
-msgid "Find..."
-msgstr "Suchen..."
-
-#: src/usr/bin/diffuse.py.in:6628
-msgid "Search For: "
-msgstr "Suchen nach: "
-
-#: src/usr/bin/diffuse.py.in:6653
-msgid "Match Case"
-msgstr "Übereinstimmen von Groß- und Kleinschreibung"
-
-#: src/usr/bin/diffuse.py.in:6658
-msgid "Search Backwards"
-msgstr "Rückwärts suchen"
-
-#: src/usr/bin/diffuse.py.in:6672
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "Schließen des letzten Tabs beendet %s."
-
-#: src/usr/bin/diffuse.py.in:6694
-msgid "Encoding: "
-msgstr "Kodierung: "
-
-#: src/usr/bin/diffuse.py.in:6704
-msgid "Revision: "
-msgstr "Revision: "
-
-#: src/usr/bin/diffuse.py.in:6768
-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/usr/bin/diffuse.py.in:6773
-msgid "translator-credits"
-msgstr "Henri Menke <henrimenke4@aim.com>"
-
-#: src/usr/bin/diffuse.py.in:6776
-msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program.  You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
-"Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 3 der Lizenz oder (nach Ihrer Option) jeder späteren Version.\n"
-"\n"
-"Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, daß es Ihnen von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.\n"
-"\n"
-"Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, siehe <http://www.gnu.org/licenses/>.\n"
-
-#: src/usr/bin/diffuse.py.in:6811
-msgid "Close Tab"
-msgstr "Reiter schließen"
-
-#: src/usr/bin/diffuse.py.in:6866
-msgid "Open File..."
-msgstr "Datei öffnen..."
-
-#: src/usr/bin/diffuse.py.in:6867
-msgid "Reload File"
-msgstr "Datei neu laden"
-
-#: src/usr/bin/diffuse.py.in:6868
-msgid "Save File"
-msgstr "Datei speichern"
-
-#: src/usr/bin/diffuse.py.in:6869
-msgid "Save File As..."
-msgstr "Datei speichern unter..."
-
-#: src/usr/bin/diffuse.py.in:7014
-msgid "Save changes before loading the new file?"
-msgstr "Änderungen speichern vor dem Laden der neuen Datei?"
-
-#: src/usr/bin/diffuse.py.in:7124
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "Fehler beim lesen der Revision %(rev)s von %(file)s."
-
-#: src/usr/bin/diffuse.py.in:7126 src/usr/bin/diffuse.py.in:8359
-#, python-format
-msgid "Error reading %s."
-msgstr "Fehler beim Lesen von %s."
-
-#: src/usr/bin/diffuse.py.in:7149
-msgid "Open File"
-msgstr "Datei öffnen"
-
-#: src/usr/bin/diffuse.py.in:7199
-#, 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/usr/bin/diffuse.py.in:7219
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "Speichern %(title)s Fenster %(pane)d"
-
-#: src/usr/bin/diffuse.py.in:7245
-#, 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/usr/bin/diffuse.py.in:7250
-#, 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/usr/bin/diffuse.py.in:7291
-#, python-format
-msgid "Error encoding to %s."
-msgstr "Fehler bei der Kodierung nach %s."
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Go To Line..."
-msgstr "Gehe zu Zeile..."
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Line Number: "
-msgstr "Zeilennummer: "
-
-#: src/usr/bin/diffuse.py.in:7351
-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/usr/bin/diffuse.py.in:7353
-msgid "Press the escape key to finish editing."
-msgstr "Drücken Sie die Escape Taste um die Bearbeitung zu beenden."
-
-#: src/usr/bin/diffuse.py.in:7355
-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/usr/bin/diffuse.py.in:7466
-msgid "_File"
-msgstr "_Datei"
-
-#: src/usr/bin/diffuse.py.in:7467
-msgid "_Open File..."
-msgstr "_Öffne Datei..."
-
-#: src/usr/bin/diffuse.py.in:7468
-msgid "Open File In New _Tab..."
-msgstr "Datei _in neuem Reiter öffnen..."
-
-#: src/usr/bin/diffuse.py.in:7469
-msgid "Open _Modified Files..."
-msgstr "_Bearbeitete Dateien öffnen..."
-
-#: src/usr/bin/diffuse.py.in:7470
-msgid "Open Commi_t..."
-msgstr "Revi_sion öffnen..."
-
-#: src/usr/bin/diffuse.py.in:7471
-msgid "_Reload File"
-msgstr "Datei _neu laden"
-
-#: src/usr/bin/diffuse.py.in:7473
-msgid "_Save File"
-msgstr "Datei _speichern"
-
-#: src/usr/bin/diffuse.py.in:7474
-msgid "Save File _As..."
-msgstr "Datei speichern _unter..."
-
-#: src/usr/bin/diffuse.py.in:7475
-msgid "Save A_ll"
-msgstr "_Alle speichern"
-
-#: src/usr/bin/diffuse.py.in:7477
-msgid "New _2-Way File Merge"
-msgstr "Neues _2-Wege-Datei-Zusammenführen"
-
-#: src/usr/bin/diffuse.py.in:7478
-msgid "New _3-Way File Merge"
-msgstr "Neues _3-Wege-Datei-Zusammenführen"
-
-#: src/usr/bin/diffuse.py.in:7479
-msgid "New _N-Way File Merge..."
-msgstr "Neues _N-Wege-Datei-Zusammenführen..."
-
-#: src/usr/bin/diffuse.py.in:7481
-msgid "_Close Tab"
-msgstr "_Reiter schließen"
-
-#: src/usr/bin/diffuse.py.in:7482
-msgid "_Undo Close Tab"
-msgstr "_Reiter schließen rückgängig"
-
-#: src/usr/bin/diffuse.py.in:7483
-msgid "_Quit"
-msgstr "_Beenden"
-
-#: src/usr/bin/diffuse.py.in:7485
-msgid "_Edit"
-msgstr "_Bearbeiten"
-
-#: src/usr/bin/diffuse.py.in:7486
-msgid "_Undo"
-msgstr "_Rückgängig"
-
-#: src/usr/bin/diffuse.py.in:7487
-msgid "_Redo"
-msgstr "_Wiederholen"
-
-#: src/usr/bin/diffuse.py.in:7489
-msgid "Cu_t"
-msgstr "_Ausschneiden"
-
-#: src/usr/bin/diffuse.py.in:7490
-msgid "_Copy"
-msgstr "_Kopieren"
-
-#: src/usr/bin/diffuse.py.in:7491
-msgid "_Paste"
-msgstr "_Einfügen"
-
-#: src/usr/bin/diffuse.py.in:7493
-msgid "Select _All"
-msgstr "_Alles auswählen"
-
-#: src/usr/bin/diffuse.py.in:7494
-msgid "C_lear Edits"
-msgstr "Alle _Änderungen rückgängig"
-
-#: src/usr/bin/diffuse.py.in:7495
-msgid "_Dismiss All Edits"
-msgstr "Alle Än_derungen verwerfen"
-
-#: src/usr/bin/diffuse.py.in:7497
-msgid "_Find..."
-msgstr "_Suchen..."
-
-#: src/usr/bin/diffuse.py.in:7498
-msgid "Find _Next"
-msgstr "_Nächstes suchen"
-
-#: src/usr/bin/diffuse.py.in:7499
-msgid "Find Pre_vious"
-msgstr "_Rückwärts suchen"
-
-#: src/usr/bin/diffuse.py.in:7500
-msgid "_Go To Line..."
-msgstr "_Gehe zu Zeile..."
-
-#: src/usr/bin/diffuse.py.in:7502
-msgid "Pr_eferences..."
-msgstr "_Einstellungen..."
-
-#: src/usr/bin/diffuse.py.in:7504
-msgid "None"
-msgstr "Keine"
-
-#: src/usr/bin/diffuse.py.in:7512
-msgid "_View"
-msgstr "_Ansicht"
-
-#: src/usr/bin/diffuse.py.in:7513
-msgid "_Syntax Highlighting"
-msgstr "_Syntax Hervorhebung"
-
-#: src/usr/bin/diffuse.py.in:7515
-msgid "Re_align All"
-msgstr "Alle neu _ausrichten"
-
-#: src/usr/bin/diffuse.py.in:7516
-msgid "_Isolate"
-msgstr "_Isolieren"
-
-#: src/usr/bin/diffuse.py.in:7518
-msgid "_First Difference"
-msgstr "_Erster Unterschied"
-
-#: src/usr/bin/diffuse.py.in:7519
-msgid "_Previous Difference"
-msgstr "_Voriger Unterschied"
-
-#: src/usr/bin/diffuse.py.in:7520
-msgid "_Next Difference"
-msgstr "_Nächster Unterschied"
-
-#: src/usr/bin/diffuse.py.in:7521
-msgid "_Last Difference"
-msgstr "_Letzter Unterschied"
-
-#: src/usr/bin/diffuse.py.in:7523
-msgid "Fir_st Tab"
-msgstr "Er_ster Reiter"
-
-#: src/usr/bin/diffuse.py.in:7524
-msgid "Pre_vious Tab"
-msgstr "V_origer Reiter"
-
-#: src/usr/bin/diffuse.py.in:7525
-msgid "Next _Tab"
-msgstr "N_ächster Reiter"
-
-#: src/usr/bin/diffuse.py.in:7526
-msgid "Las_t Tab"
-msgstr "Letz_ter Reiter"
-
-#: src/usr/bin/diffuse.py.in:7528
-msgid "Shift Pane _Right"
-msgstr "Fenster nach _rechts verschieben"
-
-#: src/usr/bin/diffuse.py.in:7529
-msgid "Shift Pane _Left"
-msgstr "Fenster nach _links verschieben"
-
-#: src/usr/bin/diffuse.py.in:7531
-msgid "F_ormat"
-msgstr "F_ormat"
-
-#: src/usr/bin/diffuse.py.in:7532
-msgid "Convert To _Upper Case"
-msgstr "In Großb_uchstaben konvertieren"
-
-#: src/usr/bin/diffuse.py.in:7533
-msgid "Convert To _Lower Case"
-msgstr "In K_leinbuchstaben konvertieren"
-
-#: src/usr/bin/diffuse.py.in:7535
-msgid "Sort Lines In _Ascending Order"
-msgstr "Zeile in _aufsteigender Reihenfolge sortieren"
-
-#: src/usr/bin/diffuse.py.in:7536
-msgid "Sort Lines In D_escending Order"
-msgstr "Zeile in abst_eigender Reihenfolge sortieren"
-
-#: src/usr/bin/diffuse.py.in:7538
-msgid "Remove Trailing _White Space"
-msgstr "Entferne angehängte _Leerzeichen"
-
-#: src/usr/bin/diffuse.py.in:7539
-msgid "Convert Tabs To _Spaces"
-msgstr "Tabulatoren in Leer_zeichen konvertieren"
-
-#: src/usr/bin/diffuse.py.in:7540
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "Vorangestellte Leerzeichen in _Tabulatoren konvertieren"
-
-#: src/usr/bin/diffuse.py.in:7542
-msgid "_Increase Indenting"
-msgstr "Einzug er_höhen"
-
-#: src/usr/bin/diffuse.py.in:7543
-msgid "De_crease Indenting"
-msgstr "Einzug _vermindern"
-
-#: src/usr/bin/diffuse.py.in:7545
-msgid "Convert To _DOS Format"
-msgstr "Ins _DOS Format konvertieren"
-
-#: src/usr/bin/diffuse.py.in:7546
-msgid "Convert To _Mac Format"
-msgstr "Ins _Mac Format konvertieren"
-
-#: src/usr/bin/diffuse.py.in:7547
-msgid "Convert To Uni_x Format"
-msgstr "Ins Uni_x Format konvertieren"
-
-#: src/usr/bin/diffuse.py.in:7549
-msgid "_Merge"
-msgstr "_Zusammenführen"
-
-#: src/usr/bin/diffuse.py.in:7550
-msgid "Copy Selection _Right"
-msgstr "Auswahl nach _rechts kopieren"
-
-#: src/usr/bin/diffuse.py.in:7551
-msgid "Copy Selection _Left"
-msgstr "Auswahl nach _links kopieren"
-
-#: src/usr/bin/diffuse.py.in:7553
-msgid "Copy Left _Into Selection"
-msgstr "Von links _in die Auswahl kopieren"
-
-#: src/usr/bin/diffuse.py.in:7554
-msgid "Copy Right I_nto Selection"
-msgstr "Von rechts i_n die Auswahl kopieren"
-
-#: src/usr/bin/diffuse.py.in:7555
-msgid "_Merge From Left Then Right"
-msgstr "Zusammenführen von links, dann von rechts"
-
-#: src/usr/bin/diffuse.py.in:7556
-msgid "M_erge From Right Then Left"
-msgstr "Zusammenführen von rechts, dann von links"
-
-#: src/usr/bin/diffuse.py.in:7558
-msgid "_Help"
-msgstr "_Hilfe"
-
-#: src/usr/bin/diffuse.py.in:7559
-msgid "_Help Contents..."
-msgstr "_Inhalt..."
-
-#: src/usr/bin/diffuse.py.in:7561
-#, python-format
-msgid "_About %s..."
-msgstr "_Über %s..."
-
-#: src/usr/bin/diffuse.py.in:7575
-msgid "New 2-Way File Merge"
-msgstr "Neues 2-Wege-Datei-Zusammenführen"
-
-#: src/usr/bin/diffuse.py.in:7576
-msgid "New 3-Way File Merge"
-msgstr "Neues 3-Wege-Datei-Zusammenführen"
-
-#: src/usr/bin/diffuse.py.in:7578
-msgid "Realign All"
-msgstr "Alle neu ausrichten"
-
-#: src/usr/bin/diffuse.py.in:7579
-msgid "First Difference"
-msgstr "Erster Unterschied"
-
-#: src/usr/bin/diffuse.py.in:7580
-msgid "Previous Difference"
-msgstr "Voriger Unterschied"
-
-#: src/usr/bin/diffuse.py.in:7581
-msgid "Next Difference"
-msgstr "Nächster Unterschied"
-
-#: src/usr/bin/diffuse.py.in:7582
-msgid "Last Difference"
-msgstr "Letzter Unterschied"
-
-#: src/usr/bin/diffuse.py.in:7584
-msgid "Copy Selection Right"
-msgstr "Auswahl nach rechts kopieren"
-
-#: src/usr/bin/diffuse.py.in:7585
-msgid "Copy Selection Left"
-msgstr "Auswahl nach links kopieren"
-
-#: src/usr/bin/diffuse.py.in:7586
-msgid "Copy Left Into Selection"
-msgstr "Von links in die Auswahl kopieren"
-
-#: src/usr/bin/diffuse.py.in:7587
-msgid "Copy Right Into Selection"
-msgstr "Von rechts in die Auswahl kopieren"
-
-#: src/usr/bin/diffuse.py.in:7588
-msgid "Merge From Left Then Right"
-msgstr "Zusammenführen von links, dann von rechts"
-
-#: src/usr/bin/diffuse.py.in:7589
-msgid "Merge From Right Then Left"
-msgstr "Zusammenführen von rechts, dann von links"
-
-#: src/usr/bin/diffuse.py.in:7591
-msgid "Undo"
-msgstr "Rückgängig"
-
-#: src/usr/bin/diffuse.py.in:7592
-msgid "Redo"
-msgstr "Wiederholen"
-
-#: src/usr/bin/diffuse.py.in:7716
-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/usr/bin/diffuse.py.in:7729
-msgid "Tab"
-msgstr "Reiter"
-
-#: src/usr/bin/diffuse.py.in:7734
-msgid "Pane"
-msgstr "Fenster"
-
-#: src/usr/bin/diffuse.py.in:7745
-msgid "Close _Without Saving"
-msgstr "Ohne speichern schließen"
-
-#: src/usr/bin/diffuse.py.in:7856
-#, python-format
-msgid "File Merge %d"
-msgstr "Dateien zusammenführen %d"
-
-#: src/usr/bin/diffuse.py.in:7959
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "Fehler beim Empfangen der Revisionen von %s."
-
-#: src/usr/bin/diffuse.py.in:7990
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "Fehler beim Empfangen der Bearbeitungen von %s."
-
-#: src/usr/bin/diffuse.py.in:8022
-msgid "Open File In New Tab"
-msgstr "Datei in neuem Reiter öffnen"
-
-#: src/usr/bin/diffuse.py.in:8038
-msgid "Choose Folder With Modified Files"
-msgstr "Ordner mit bearbeiteten Dateien auswählen"
-
-#: src/usr/bin/diffuse.py.in:8051
-msgid "No modified files found."
-msgstr "Keine bearbeiteten Dateien gefunden."
-
-#: src/usr/bin/diffuse.py.in:8058
-msgid "Choose Folder With Commit"
-msgstr "Ordner mit Revisionen auswählen"
-
-#: src/usr/bin/diffuse.py.in:8071
-msgid "No committed files found."
-msgstr "Keine revidierten Dateien gefunden."
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "New N-Way File Merge..."
-msgstr "Neues N-Wege-Datei-Zusammenführen..."
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "Number of panes: "
-msgstr "Anzahl der Fenster: "
-
-#: src/usr/bin/diffuse.py.in:8172
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "Ausdruck nicht gefunden.  Am Ende der Datei fortsetzen?"
-
-#: src/usr/bin/diffuse.py.in:8174
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "Ausdruck nicht gefunden.  Am Anfang der Datei fortsetzen?"
-
-#: src/usr/bin/diffuse.py.in:8440
+#: src/main.py:6990
 msgid "Error parsing line number."
 msgstr "Fehler bei der Analyse der Zeilennummer."
 
-#: src/usr/bin/diffuse.py.in:8450
+#: src/main.py:7000
 #, python-format
 msgid "Skipping unknown argument \"%s\"."
 msgstr "Übergehe unbekannten Parameter \"%s\"."
 
-#: src/usr/bin/diffuse.py.in:8457
+#: src/main.py:7007
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Fehler beim Verarbeiten des Arguments \"%s\".  Unerwartetes Verzeichnis."
 
+#: src/vcs/cvs.py:50 src/vcs/rcs.py:54 src/vcs/svn.py:89
+#, python-format
+msgid "Error parsing revision %s."
+msgstr "Fehler bei der Analyse der Revision %s."
+
+#: src/vcs/vcs_registry.py:216
+#, python-format
+msgid "Error parsing %s."
+msgstr "Fehler bei der Analyse %s."
+
 #, python-format
 #~ msgid "Column %d"
 #~ msgstr "Spalte %d"
diff --git a/po/es.po b/po/es.po
index 07858df..4bc635e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: diffuse-svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-08 13:51-0500\n"
+"POT-Creation-Date: 2021-11-18 15:21-0500\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator: David Marín Carreño <davefx@gmail.com>\n"
 "Language-Team: Spanish <henrimenke4@aim.com>\n"
@@ -18,19 +18,983 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: data/diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:4
 msgid "Diffuse Merge Tool"
 msgstr "Diffuse utillaje de textos"
 
-#: data/diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:5
 msgid "Graphical tool for merging and comparing text files"
 msgstr "Un utillaje para juntar y comparar archivos de texto"
 
-#: src/usr/bin/diffuse.py.in:70
+#: data/io.github.mightycreak.Diffuse.metainfo.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."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:19
+msgid "Main window: diff between two files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:26
+msgid "Patch release to fix a bug when using the Flatpak package."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:29
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:71
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:146
+msgid "Fixed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:31
+msgid "Fixed a Flatpak bug where the app couldn't call binaries on the host, such as `git`, `svn`, etc."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:40
+msgid "With this release, the main end-user change is the new icon. The rest is mainly maintenance improvements with a much more standard folder structure and starting to modularize the code. This is an ongoing effort as there is still a lot to do, but hopefully this would motivate some to contribute ;)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:47
+msgid "An important note though: the application ID has changed and is now io.github.mightycreak.Diffuse."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:51
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:89
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:123
+msgid "Added:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:53
+msgid "New icon and in SVG now"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:54
+msgid "Started to modularize the code"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:56
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:93
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:136
+msgid "Changed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:58
+msgid "Changed AppID to io.github.mightycreak.Diffuse (as advised in the Flatpak documentation)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:62
+msgid "Renamed directory `translations/` to `po/`"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:63
+msgid "Now uses POTFILES.in to list the files to translate"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:64
+msgid "Translation strings are no longer sorted alphabetically, this will help when there will be several files in POTFILES.in"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:68
+msgid "Updated the documentation and script in the `po/` directory"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:69
+msgid "Add .desktop translations in .po files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:73
+msgid "Fixed some GTK deprecation warnings"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:79
+msgid "Mainly under the hood changes in this release, so nothing really visible to the users in this version. That said, I figured it was a long time since the last release (4 months ago) and, as promised, I want Diffuse development to be a bit more active and iterative."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:85
+msgid "Apart from the maintenance changes 🧰, I think the main improvement is that Diffuse will soon be available through Flathub!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:91
+msgid "New Flatpak package, published on Flathub: com.github.mightycreak.Diffuse"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:95
+msgid "Replace old install.py with the more standard Meson"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:96
+msgid "Remove u string prefixes since Python 3 is in UTF-8 by default"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:97
+msgid "Replaced some interpolation operators (%) for the f string prefix"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:98
+msgid "Use the window scale factor for the icons generation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:104
+msgid "Here is the v0.5.0. Unintentionally, this release happens exactly 6 years after the previous v0.4.8 release!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:108
+msgid "There is a lot to do on this application, and some features didn't make the release. The main one being the Windows installers. I think 6 years is too long to continue to wait until this bug is fixed. The Python scripts should work on Windows, but no executable is produced (yet) with the release."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:115
+msgid "Other than that, Diffuse v0.5.0 is now officially compatible with Python 3 and GTK 3! And it is synced to the latest commits from upstream (which were never released)."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:120
+msgid "The next version will not take 6 years, I promise you! 😄"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:125
+msgid "Added Pedro Albuquerque's Portuguese translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:126
+msgid "Added Åke Engelbrektson's Swedish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:127
+msgid "Added Guillaume Hoffmann's Darcs support improvements"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:128
+msgid "Added Akom Chotiphantawanon's Thai translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:129
+msgid "Added support for Git submodules"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:130
+msgid "Added a preference and command line option to specify the version control system search order"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:131
+msgid "Added .editorconfig file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:132
+msgid "Added .gitignore file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:133
+msgid "Added message when removing files during uninstallation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:134
+msgid "Added Python script to update all the translation files at once"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:138
+msgid "Convert to Python 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:139
+msgid "Convert to GTK 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:140
+msgid "Updated Python highlighting for Python 3 grammar"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:141
+msgid "Updated copyrights years and authors"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:142
+msgid "Improve Spanish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:143
+msgid "Convert translation README to MarkDown"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:144
+msgid "Updated all the translation files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:148
+msgid "Fixed wrong icons directory for gtk-update-icon-cache"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:149
+msgid "Fixed missing directories when uninstalling"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:150
+msgid "Fixed bug introduced by r420 with RCS VCS"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:151
+msgid "Fixed broken drag'n'drop since migration to Python3/GTK3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:152
+msgid "Fixed error when using '-m' in an SVN repo"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:157
+msgid "Romain Failliot"
+msgstr ""
+
+#: src/constants.py.in:23
 msgid "Copyright"
 msgstr ""
 
-#: src/usr/bin/diffuse.py.in:81
+#: src/main.py:591
+#, python-format
+msgid "Error processing line %(line)d of %(file)s."
+msgstr "Error procesando línea %(line)d de %(file)s."
+
+#: src/main.py:610
+msgid "Auto Detect"
+msgstr "Reconocimiento automático"
+
+#: src/main.py:706
+msgid "Display"
+msgstr "Visualización"
+
+#: src/main.py:708
+msgid "Font"
+msgstr "Tipo"
+
+#: src/main.py:709
+msgid "Tab width"
+msgstr "Tamaño de tabulador"
+
+#: src/main.py:710
+msgid "Show right margin"
+msgstr "Mostrar margen derecho"
+
+#: src/main.py:711
+msgid "Right margin"
+msgstr "Margen derecho"
+
+#: src/main.py:712
+msgid "Show line numbers"
+msgstr "Mostrar números de línea"
+
+#: src/main.py:713
+msgid "Show white space characters"
+msgstr "Mostrar espacios"
+
+#: src/main.py:714
+msgid "Ignore case differences"
+msgstr "Ignorar diferencías de capitalización"
+
+#: src/main.py:715
+msgid "Ignore white space differences"
+msgstr "Ignorar diferencías de espacios"
+
+#: src/main.py:716 src/main.py:724
+msgid "Ignore changes to white space"
+msgstr "Ignorar cambios de espacios"
+
+#: src/main.py:717
+msgid "Ignore blank line differences"
+msgstr "Ignorar diferencías de líneas vacías"
+
+#: src/main.py:718
+msgid "Ignore end of line differences"
+msgstr "Ignorar diferencias en caracteres de fin de línea"
+
+#: src/main.py:720
+msgid "Alignment"
+msgstr "Alineación"
+
+#: src/main.py:722
+msgid "Ignore case"
+msgstr "Ignorar capitalización"
+
+#: src/main.py:723
+msgid "Ignore white space"
+msgstr "Ignorar espacios"
+
+#: src/main.py:725
+msgid "Ignore blank lines"
+msgstr "Ignorar líneas vacías"
+
+#: src/main.py:726
+msgid "Ignore end of line characters"
+msgstr "Ignorar caracteres de fin de línea"
+
+#: src/main.py:728
+msgid "Editor"
+msgstr "Editor"
+
+#: src/main.py:730
+msgid "Auto indent"
+msgstr "Sangría automática"
+
+#: src/main.py:731
+msgid "Expand tabs to spaces"
+msgstr "Ampliar tabuladores a espacios"
+
+#: src/main.py:732
+msgid "Soft tab width"
+msgstr "Tabuladores blandos"
+
+#: src/main.py:734
+msgid "Tabs"
+msgstr "Pestañas"
+
+#: src/main.py:736
+msgid "Default panes"
+msgstr "Paneles predeterminados"
+
+#: src/main.py:737
+msgid "Always show the tab bar"
+msgstr "Mostrar siempre barra de pestañas"
+
+#: src/main.py:738
+#, 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/main.py:740
+msgid "Regional Settings"
+msgstr "Ajustes regionales"
+
+#: src/main.py:742
+msgid "Default codec"
+msgstr "Codificación estándar"
+
+#: src/main.py:743
+msgid "Order of codecs used to identify encoding"
+msgstr "Orden de codificaciones en identificación"
+
+#: src/main.py:763
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/main.py:765
+msgid "Root directory"
+msgstr "Directorio raíz"
+
+#: src/main.py:766
+msgid "Cygdrive prefix"
+msgstr "Prefijo de Cygdrive"
+
+#: src/main.py:782
+msgid "Version control system search order"
+msgstr ""
+
+#: src/main.py:788
+msgid "\"co\" command"
+msgstr "Comando \"co\""
+
+#: src/main.py:789
+msgid "\"rlog\" command"
+msgstr "Comando \"rlog\""
+
+#: src/main.py:791
+msgid "Command"
+msgstr "Comando"
+
+#: src/main.py:793
+msgid "Launch from a Bash login shell"
+msgstr "Lanzar desde línea de comandos Bash"
+
+#: src/main.py:795
+msgid "Update paths for Cygwin"
+msgstr "Actualizar rutas de Cygwin"
+
+#: src/main.py:799
+msgid "Version Control"
+msgstr "Control de versión"
+
+#: src/main.py:863
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: src/main.py:904 src/main.py:5802
+#, python-format
+msgid "Error writing %s."
+msgstr "Error guardando %s."
+
+#: src/main.py:3282
+msgid "Align with Selection"
+msgstr "Alinear con la selección."
+
+#: src/main.py:3283
+msgid "Isolate"
+msgstr "Aislar"
+
+#: src/main.py:3284
+msgid "Merge Selection"
+msgstr "Mezclar selección"
+
+#: src/main.py:3286 src/main.py:6098
+msgid "Cut"
+msgstr "Cortar"
+
+#: src/main.py:3287 src/main.py:6099
+msgid "Copy"
+msgstr "Copiar"
+
+#: src/main.py:3288 src/main.py:6100
+msgid "Paste"
+msgstr "Pegar"
+
+#: src/main.py:3290
+msgid "Select All"
+msgstr "Seleccionar todo"
+
+#: src/main.py:3291 src/main.py:6101
+msgid "Clear Edits"
+msgstr "Deshacer todo"
+
+#: src/main.py:3293
+msgid "Swap with Selected Pane"
+msgstr "Reemplazar con panel seleccionado"
+
+#: src/main.py:5124
+msgid "Find..."
+msgstr "Buscar..."
+
+#: src/main.py:5132
+msgid "Search For: "
+msgstr "Buscar: "
+
+#: src/main.py:5157
+msgid "Match Case"
+msgstr "Coincidencia de capitalización"
+
+#: src/main.py:5162
+msgid "Search Backwards"
+msgstr "Buscar hacia atrás"
+
+#: src/main.py:5176
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "Cerrar esta pestaña terminará %s."
+
+#: src/main.py:5198
+msgid "Encoding: "
+msgstr "Codificación:"
+
+#: src/main.py:5208
+msgid "Revision: "
+msgstr "Revision: "
+
+#: src/main.py:5272
+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/main.py:5277
+msgid "translator-credits"
+msgstr ""
+"Henri Menke <henrimenke4@aim.com>\n"
+"David Marín Carreño <davefx@gmail.com>"
+
+#: src/main.py:5281
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with this program.  You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+
+#: src/main.py:5322
+msgid "Close Tab"
+msgstr "Cerrar pestaña"
+
+#: src/main.py:5377
+msgid "Open File..."
+msgstr "Abrir fichero..."
+
+#: src/main.py:5378
+msgid "Reload File"
+msgstr "Recargar fichero"
+
+#: src/main.py:5379
+msgid "Save File"
+msgstr "Guardar fichero"
+
+#: src/main.py:5380
+msgid "Save File As..."
+msgstr "Guardar fichero como..."
+
+#: src/main.py:5525
+msgid "Save changes before loading the new file?"
+msgstr "¿Guardar cambios antes de abrir nuevo fichero?"
+
+#: src/main.py:5635
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "Error leyendo revisión %(rev)s de %(file)s."
+
+#: src/main.py:5637 src/main.py:6900
+#, python-format
+msgid "Error reading %s."
+msgstr "Error leyendo %s."
+
+#: src/main.py:5658
+msgid "Open File"
+msgstr "Abrir fichero"
+
+#: src/main.py:5708
+#, python-format
+msgid "The file %s changed on disk.  Do you want to reload the file?"
+msgstr "El fichero %s ha cambiado en disco.  ¿Quieres recargarlo?"
+
+#: src/main.py:5728
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "Guardar Panel %(title)s %(pane)d"
+
+#: src/main.py:5754
+#, 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/main.py:5759
+#, 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 fichero %s ha sido modificado por otro proceso desde que se cargó. Sí se guarda, todos los cambios realizados por procesos externos se perderán.  ¿Deseas guardar de todos modos?"
+
+#: src/main.py:5800
+#, python-format
+msgid "Error encoding to %s."
+msgstr "Error codificando a %s."
+
+#: src/main.py:5830
+msgid "Go To Line..."
+msgstr "Ir a línea..."
+
+#: src/main.py:5830
+msgid "Line Number: "
+msgstr "Número de línea: "
+
+#: src/main.py:5856
+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/main.py:5858
+msgid "Press the escape key to finish editing."
+msgstr "Pulse Escape para finalizar la edición."
+
+#: src/main.py:5860
+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/main.py:5971
+msgid "_File"
+msgstr "_Fichero"
+
+#: src/main.py:5972
+msgid "_Open File..."
+msgstr "_Abrir fichero"
+
+#: src/main.py:5973
+msgid "Open File In New _Tab..."
+msgstr "Abrir fichero en nueva _pestaña..."
+
+#: src/main.py:5974
+msgid "Open _Modified Files..."
+msgstr "Abrir ficheros _modificados..."
+
+#: src/main.py:5975
+msgid "Open Commi_t..."
+msgstr "Abrir revi_sión..."
+
+#: src/main.py:5976
+msgid "_Reload File"
+msgstr "_Recargar fichero"
+
+#: src/main.py:5978
+msgid "_Save File"
+msgstr "_Guardar fichero"
+
+#: src/main.py:5979
+msgid "Save File _As..."
+msgstr "Guardar _fichero como..."
+
+#: src/main.py:5980
+msgid "Save A_ll"
+msgstr "Gu_ardar todo"
+
+#: src/main.py:5982
+msgid "New _2-Way File Merge"
+msgstr "Nueva mezcla de ficheros de _2 vías"
+
+#: src/main.py:5983
+msgid "New _3-Way File Merge"
+msgstr "Nueva mezcla de ficheros de _3 vías"
+
+#: src/main.py:5984
+msgid "New _N-Way File Merge..."
+msgstr "Nueva mezcla de ficheros de _N vías..."
+
+#: src/main.py:5986
+msgid "_Close Tab"
+msgstr "_Cerrar pestaña"
+
+#: src/main.py:5987
+msgid "_Undo Close Tab"
+msgstr "_Deshacer cerrar pestaña"
+
+#: src/main.py:5988
+msgid "_Quit"
+msgstr "_Salir"
+
+#: src/main.py:5990
+msgid "_Edit"
+msgstr "_Editar"
+
+#: src/main.py:5991
+msgid "_Undo"
+msgstr "_Deshacer"
+
+#: src/main.py:5992
+msgid "_Redo"
+msgstr "_Rehacer"
+
+#: src/main.py:5994
+msgid "Cu_t"
+msgstr "Cor_tar"
+
+#: src/main.py:5995
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: src/main.py:5996
+msgid "_Paste"
+msgstr "_Pegar"
+
+#: src/main.py:5998
+msgid "Select _All"
+msgstr "Seleccion_ar todo"
+
+#: src/main.py:5999
+msgid "C_lear Edits"
+msgstr "_Deshacer todo"
+
+#: src/main.py:6000
+msgid "_Dismiss All Edits"
+msgstr "_Ignorar todas las ediciones"
+
+#: src/main.py:6002
+msgid "_Find..."
+msgstr "_Buscar..."
+
+#: src/main.py:6003
+msgid "Find _Next"
+msgstr "Buscar siguie_nte"
+
+#: src/main.py:6004
+msgid "Find Pre_vious"
+msgstr "Buscar an_terior"
+
+#: src/main.py:6005
+msgid "_Go To Line..."
+msgstr "_Ir a la línea..."
+
+#: src/main.py:6007
+msgid "Pr_eferences..."
+msgstr "Pr_eferencias..."
+
+#: src/main.py:6009
+msgid "None"
+msgstr "Ninguno"
+
+#: src/main.py:6017
+msgid "_View"
+msgstr "_Ver"
+
+#: src/main.py:6018
+msgid "_Syntax Highlighting"
+msgstr "Coloreado _sintáctico"
+
+#: src/main.py:6020
+msgid "Re_align All"
+msgstr "Re_alinear todo"
+
+#: src/main.py:6021
+msgid "_Isolate"
+msgstr "A_islar"
+
+#: src/main.py:6023
+msgid "_First Difference"
+msgstr "Primera di_ferencia"
+
+#: src/main.py:6024
+msgid "_Previous Difference"
+msgstr "Diferencia an_terior"
+
+#: src/main.py:6025
+msgid "_Next Difference"
+msgstr "Diferencia siguie_nte"
+
+#: src/main.py:6026
+msgid "_Last Difference"
+msgstr "Ú_ltima diferencia"
+
+#: src/main.py:6028
+msgid "Fir_st Tab"
+msgstr "Prime_ra pestaña"
+
+#: src/main.py:6029
+msgid "Pre_vious Tab"
+msgstr "Pestaña ante_rior"
+
+#: src/main.py:6030
+msgid "Next _Tab"
+msgstr "Siguiente _pestaña"
+
+#: src/main.py:6031
+msgid "Las_t Tab"
+msgstr "Ul_tima pestaña"
+
+#: src/main.py:6033
+msgid "Shift Pane _Right"
+msgstr "Cambiar panel _derecho"
+
+#: src/main.py:6034
+msgid "Shift Pane _Left"
+msgstr "Cambiar panel _izquierdo"
+
+#: src/main.py:6036
+msgid "F_ormat"
+msgstr "F_ormato"
+
+#: src/main.py:6037
+msgid "Convert To _Upper Case"
+msgstr "Transformar en letras mayúsculas"
+
+#: src/main.py:6038
+msgid "Convert To _Lower Case"
+msgstr "Transformar en letras minúsculas"
+
+#: src/main.py:6040
+msgid "Sort Lines In _Ascending Order"
+msgstr "Ordenar lineas en orden _ascendente"
+
+#: src/main.py:6041
+msgid "Sort Lines In D_escending Order"
+msgstr "Ordenar lineas en orden _descendente"
+
+#: src/main.py:6043
+msgid "Remove Trailing _White Space"
+msgstr "Quitar _espacios finales"
+
+#: src/main.py:6044
+msgid "Convert Tabs To _Spaces"
+msgstr "Transformar tabuladores en e_spacios"
+
+#: src/main.py:6045
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "Transformar espacios iniciales en _tabuladores"
+
+#: src/main.py:6047
+msgid "_Increase Indenting"
+msgstr "Aumentar sangr_ía"
+
+#: src/main.py:6048
+msgid "De_crease Indenting"
+msgstr "Dis_minuir sangría"
+
+#: src/main.py:6050
+msgid "Convert To _DOS Format"
+msgstr "Transformar a formato _DOS"
+
+#: src/main.py:6051
+msgid "Convert To _Mac Format"
+msgstr "Transformar a formato _Mac"
+
+#: src/main.py:6052
+msgid "Convert To Uni_x Format"
+msgstr "Transformar a formato Uni_x"
+
+#: src/main.py:6054
+msgid "_Merge"
+msgstr "_Mezcla"
+
+#: src/main.py:6055
+msgid "Copy Selection _Right"
+msgstr "Copiar selección a la de_recha"
+
+#: src/main.py:6056
+msgid "Copy Selection _Left"
+msgstr "Copiar selección a la i_zquierda"
+
+#: src/main.py:6058
+msgid "Copy Left _Into Selection"
+msgstr "Copiar de _izquierda a la selección"
+
+#: src/main.py:6059
+msgid "Copy Right I_nto Selection"
+msgstr "Copiar de de_recha a la selección"
+
+#: src/main.py:6060
+msgid "_Merge From Left Then Right"
+msgstr "_Mezclar desde izquierda, después desde derecha"
+
+#: src/main.py:6061
+msgid "M_erge From Right Then Left"
+msgstr "M_ezclar desde derecha, después desde izquierda"
+
+#: src/main.py:6063
+msgid "_Help"
+msgstr "_Ayuda"
+
+#: src/main.py:6064
+msgid "_Help Contents..."
+msgstr "Índ_ice de ayuda..."
+
+#: src/main.py:6066
+#, python-format
+msgid "_About %s..."
+msgstr "_Acerca de %s..."
+
+#: src/main.py:6080
+msgid "New 2-Way File Merge"
+msgstr "Nueva mezcla de ficheros de 2 vías"
+
+#: src/main.py:6081
+msgid "New 3-Way File Merge"
+msgstr "Nueva mezcla de ficheros de 3 vías"
+
+#: src/main.py:6083
+msgid "Realign All"
+msgstr "Realinear todo"
+
+#: src/main.py:6084
+msgid "First Difference"
+msgstr "Primera diferencía"
+
+#: src/main.py:6085
+msgid "Previous Difference"
+msgstr "Diferencía anterior"
+
+#: src/main.py:6086
+msgid "Next Difference"
+msgstr "Siguiente diferencia"
+
+#: src/main.py:6087
+msgid "Last Difference"
+msgstr "Última diferencía"
+
+#: src/main.py:6089
+msgid "Copy Selection Right"
+msgstr "Copiar selección a la derecha"
+
+#: src/main.py:6090
+msgid "Copy Selection Left"
+msgstr "Copiar selección a la izquierda"
+
+#: src/main.py:6091
+msgid "Copy Left Into Selection"
+msgstr "Copiar de izquierda a la selección"
+
+#: src/main.py:6092
+msgid "Copy Right Into Selection"
+msgstr "Copiar de derecha a la selección"
+
+#: src/main.py:6093
+msgid "Merge From Left Then Right"
+msgstr "Mezclar desde izquierda, después desde derecha"
+
+#: src/main.py:6094
+msgid "Merge From Right Then Left"
+msgstr "Mezclar desde derecha, después desde izquierda"
+
+#: src/main.py:6096
+msgid "Undo"
+msgstr "Deshacer"
+
+#: src/main.py:6097
+msgid "Redo"
+msgstr "Rehacer"
+
+#: src/main.py:6221
+msgid "Some files have unsaved changes.  Select the files to save before closing."
+msgstr "Unos ficheros tienen cambios. Elige los ficheros a guardar antes de cerrar."
+
+#: src/main.py:6234
+msgid "Tab"
+msgstr "Pestaña"
+
+#: src/main.py:6239
+msgid "Pane"
+msgstr "Panel"
+
+#: src/main.py:6250
+msgid "Close _Without Saving"
+msgstr "Cerrar _sin guardar"
+
+#: src/main.py:6361
+#, python-format
+msgid "File Merge %d"
+msgstr "Mezcla de archivo %d"
+
+#: src/main.py:6464
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "Error recibiendo commits de %s."
+
+#: src/main.py:6493
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "Error recibiendo modificaciones de %s."
+
+#: src/main.py:6523
+msgid "Open File In New Tab"
+msgstr "Abrir fichero en nueva pestaña"
+
+#: src/main.py:6539
+msgid "Choose Folder With Modified Files"
+msgstr "Seleccionar carpeta con archivos modificados"
+
+#: src/main.py:6552
+msgid "No modified files found."
+msgstr "No se encontraron ficheros modificados."
+
+#: src/main.py:6557
+msgid "Choose Folder With Commit"
+msgstr "Seleccionar carpeta con revisiónes"
+
+#: src/main.py:6570
+msgid "No committed files found."
+msgstr "No se encontraron ficheros confirmados."
+
+#: src/main.py:6604
+msgid "New N-Way File Merge..."
+msgstr "Nueva mezcla de ficheros de N vías..."
+
+#: src/main.py:6604
+msgid "Number of panes: "
+msgstr "Número de paneles: "
+
+#: src/main.py:6669
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "Frase no encontrada. ¿Continuar desde final del fichero?"
+
+#: src/main.py:6671
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "Frase no encontrada. ¿Continuar desde principio del fichero?"
+
+#: src/main.py:6819
 msgid ""
 "Usage:\n"
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
@@ -108,770 +1072,30 @@ msgstr ""
 "  ( -i | --ignore-case )         Ignorar cambios de capitalización\n"
 "  ( -w | --ignore-all-space )    Ignorar todos los cambios en espaciado"
 
-#: src/usr/bin/diffuse.py.in:716
-#, python-format
-msgid "Error processing line %(line)d of %(file)s."
-msgstr "Error procesando línea %(line)d de %(file)s."
-
-#: src/usr/bin/diffuse.py.in:735
-msgid "Auto Detect"
-msgstr "Reconocimiento automático"
-
-#: src/usr/bin/diffuse.py.in:831
-msgid "Display"
-msgstr "Visualización"
-
-#: src/usr/bin/diffuse.py.in:833
-msgid "Font"
-msgstr "Tipo"
-
-#: src/usr/bin/diffuse.py.in:834
-msgid "Tab width"
-msgstr "Tamaño de tabulador"
-
-#: src/usr/bin/diffuse.py.in:835
-msgid "Show right margin"
-msgstr "Mostrar margen derecho"
-
-#: src/usr/bin/diffuse.py.in:836
-msgid "Right margin"
-msgstr "Margen derecho"
-
-#: src/usr/bin/diffuse.py.in:837
-msgid "Show line numbers"
-msgstr "Mostrar números de línea"
-
-#: src/usr/bin/diffuse.py.in:838
-msgid "Show white space characters"
-msgstr "Mostrar espacios"
-
-#: src/usr/bin/diffuse.py.in:839
-msgid "Ignore case differences"
-msgstr "Ignorar diferencías de capitalización"
-
-#: src/usr/bin/diffuse.py.in:840
-msgid "Ignore white space differences"
-msgstr "Ignorar diferencías de espacios"
-
-#: src/usr/bin/diffuse.py.in:841 src/usr/bin/diffuse.py.in:849
-msgid "Ignore changes to white space"
-msgstr "Ignorar cambios de espacios"
-
-#: src/usr/bin/diffuse.py.in:842
-msgid "Ignore blank line differences"
-msgstr "Ignorar diferencías de líneas vacías"
-
-#: src/usr/bin/diffuse.py.in:843
-msgid "Ignore end of line differences"
-msgstr "Ignorar diferencias en caracteres de fin de línea"
-
-#: src/usr/bin/diffuse.py.in:845
-msgid "Alignment"
-msgstr "Alineación"
-
-#: src/usr/bin/diffuse.py.in:847
-msgid "Ignore case"
-msgstr "Ignorar capitalización"
-
-#: src/usr/bin/diffuse.py.in:848
-msgid "Ignore white space"
-msgstr "Ignorar espacios"
-
-#: src/usr/bin/diffuse.py.in:850
-msgid "Ignore blank lines"
-msgstr "Ignorar líneas vacías"
-
-#: src/usr/bin/diffuse.py.in:851
-msgid "Ignore end of line characters"
-msgstr "Ignorar caracteres de fin de línea"
-
-#: src/usr/bin/diffuse.py.in:853
-msgid "Editor"
-msgstr "Editor"
-
-#: src/usr/bin/diffuse.py.in:855
-msgid "Auto indent"
-msgstr "Sangría automática"
-
-#: src/usr/bin/diffuse.py.in:856
-msgid "Expand tabs to spaces"
-msgstr "Ampliar tabuladores a espacios"
-
-#: src/usr/bin/diffuse.py.in:857
-msgid "Soft tab width"
-msgstr "Tabuladores blandos"
-
-#: src/usr/bin/diffuse.py.in:859
-msgid "Tabs"
-msgstr "Pestañas"
-
-#: src/usr/bin/diffuse.py.in:861
-msgid "Default panes"
-msgstr "Paneles predeterminados"
-
-#: src/usr/bin/diffuse.py.in:862
-msgid "Always show the tab bar"
-msgstr "Mostrar siempre barra de pestañas"
-
-#: src/usr/bin/diffuse.py.in:863
-#, 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/usr/bin/diffuse.py.in:865
-msgid "Regional Settings"
-msgstr "Ajustes regionales"
-
-#: src/usr/bin/diffuse.py.in:867
-msgid "Default codec"
-msgstr "Codificación estándar"
-
-#: src/usr/bin/diffuse.py.in:868
-msgid "Order of codecs used to identify encoding"
-msgstr "Orden de codificaciones en identificación"
-
-#: src/usr/bin/diffuse.py.in:888
-msgid "Cygwin"
-msgstr "Cygwin"
-
-#: src/usr/bin/diffuse.py.in:890
-msgid "Root directory"
-msgstr "Directorio raíz"
-
-#: src/usr/bin/diffuse.py.in:891
-msgid "Cygdrive prefix"
-msgstr "Prefijo de Cygdrive"
-
-#: src/usr/bin/diffuse.py.in:907
-msgid "Version control system search order"
-msgstr ""
-
-#: src/usr/bin/diffuse.py.in:913
-msgid "\"co\" command"
-msgstr "Comando \"co\""
-
-#: src/usr/bin/diffuse.py.in:914
-msgid "\"rlog\" command"
-msgstr "Comando \"rlog\""
-
-#: src/usr/bin/diffuse.py.in:916
-msgid "Command"
-msgstr "Comando"
-
-#: src/usr/bin/diffuse.py.in:918
-msgid "Launch from a Bash login shell"
-msgstr "Lanzar desde línea de comandos Bash"
-
-#: src/usr/bin/diffuse.py.in:920
-msgid "Update paths for Cygwin"
-msgstr "Actualizar rutas de Cygwin"
-
-#: src/usr/bin/diffuse.py.in:924
-msgid "Version Control"
-msgstr "Control de versión"
-
-#: src/usr/bin/diffuse.py.in:988
-msgid "Preferences"
-msgstr "Preferencias"
-
-#: src/usr/bin/diffuse.py.in:1029 src/usr/bin/diffuse.py.in:7295
-#, python-format
-msgid "Error writing %s."
-msgstr "Error guardando %s."
-
-#: src/usr/bin/diffuse.py.in:1656 src/usr/bin/diffuse.py.in:2273
-#: src/usr/bin/diffuse.py.in:2417
-#, python-format
-msgid "Error parsing revision %s."
-msgstr "Error analizando revisión %s."
-
-#: src/usr/bin/diffuse.py.in:2658
-#, python-format
-msgid "Error parsing %s."
-msgstr "Error analizando %s."
-
-#: src/usr/bin/diffuse.py.in:4778
-msgid "Align with Selection"
-msgstr "Alinear con la selección."
-
-#: src/usr/bin/diffuse.py.in:4779
-msgid "Isolate"
-msgstr "Aislar"
-
-#: src/usr/bin/diffuse.py.in:4780
-msgid "Merge Selection"
-msgstr "Mezclar selección"
-
-#: src/usr/bin/diffuse.py.in:4782 src/usr/bin/diffuse.py.in:7593
-msgid "Cut"
-msgstr "Cortar"
-
-#: src/usr/bin/diffuse.py.in:4783 src/usr/bin/diffuse.py.in:7594
-msgid "Copy"
-msgstr "Copiar"
-
-#: src/usr/bin/diffuse.py.in:4784 src/usr/bin/diffuse.py.in:7595
-msgid "Paste"
-msgstr "Pegar"
-
-#: src/usr/bin/diffuse.py.in:4786
-msgid "Select All"
-msgstr "Seleccionar todo"
-
-#: src/usr/bin/diffuse.py.in:4787 src/usr/bin/diffuse.py.in:7596
-msgid "Clear Edits"
-msgstr "Deshacer todo"
-
-#: src/usr/bin/diffuse.py.in:4789
-msgid "Swap with Selected Pane"
-msgstr "Reemplazar con panel seleccionado"
-
-#: src/usr/bin/diffuse.py.in:6620
-msgid "Find..."
-msgstr "Buscar..."
-
-#: src/usr/bin/diffuse.py.in:6628
-msgid "Search For: "
-msgstr "Buscar: "
-
-#: src/usr/bin/diffuse.py.in:6653
-msgid "Match Case"
-msgstr "Coincidencia de capitalización"
-
-#: src/usr/bin/diffuse.py.in:6658
-msgid "Search Backwards"
-msgstr "Buscar hacia atrás"
-
-#: src/usr/bin/diffuse.py.in:6672
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "Cerrar esta pestaña terminará %s."
-
-#: src/usr/bin/diffuse.py.in:6694
-msgid "Encoding: "
-msgstr "Codificación:"
-
-#: src/usr/bin/diffuse.py.in:6704
-msgid "Revision: "
-msgstr "Revision: "
-
-#: src/usr/bin/diffuse.py.in:6768
-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/usr/bin/diffuse.py.in:6773
-msgid "translator-credits"
-msgstr ""
-"Henri Menke <henrimenke4@aim.com>\n"
-"David Marín Carreño <davefx@gmail.com>"
-
-#: src/usr/bin/diffuse.py.in:6776
-msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program.  You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program.  You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-
-#: src/usr/bin/diffuse.py.in:6811
-msgid "Close Tab"
-msgstr "Cerrar pestaña"
-
-#: src/usr/bin/diffuse.py.in:6866
-msgid "Open File..."
-msgstr "Abrir fichero..."
-
-#: src/usr/bin/diffuse.py.in:6867
-msgid "Reload File"
-msgstr "Recargar fichero"
-
-#: src/usr/bin/diffuse.py.in:6868
-msgid "Save File"
-msgstr "Guardar fichero"
-
-#: src/usr/bin/diffuse.py.in:6869
-msgid "Save File As..."
-msgstr "Guardar fichero como..."
-
-#: src/usr/bin/diffuse.py.in:7014
-msgid "Save changes before loading the new file?"
-msgstr "¿Guardar cambios antes de abrir nuevo fichero?"
-
-#: src/usr/bin/diffuse.py.in:7124
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "Error leyendo revisión %(rev)s de %(file)s."
-
-#: src/usr/bin/diffuse.py.in:7126 src/usr/bin/diffuse.py.in:8359
-#, python-format
-msgid "Error reading %s."
-msgstr "Error leyendo %s."
-
-#: src/usr/bin/diffuse.py.in:7149
-msgid "Open File"
-msgstr "Abrir fichero"
-
-#: src/usr/bin/diffuse.py.in:7199
-#, python-format
-msgid "The file %s changed on disk.  Do you want to reload the file?"
-msgstr "El fichero %s ha cambiado en disco.  ¿Quieres recargarlo?"
-
-#: src/usr/bin/diffuse.py.in:7219
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "Guardar Panel %(title)s %(pane)d"
-
-#: src/usr/bin/diffuse.py.in:7245
-#, 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/usr/bin/diffuse.py.in:7250
-#, 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 fichero %s ha sido modificado por otro proceso desde que se cargó. Sí se guarda, todos los cambios realizados por procesos externos se perderán.  ¿Deseas guardar de todos modos?"
-
-#: src/usr/bin/diffuse.py.in:7291
-#, python-format
-msgid "Error encoding to %s."
-msgstr "Error codificando a %s."
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Go To Line..."
-msgstr "Ir a línea..."
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Line Number: "
-msgstr "Número de línea: "
-
-#: src/usr/bin/diffuse.py.in:7351
-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/usr/bin/diffuse.py.in:7353
-msgid "Press the escape key to finish editing."
-msgstr "Pulse Escape para finalizar la edición."
-
-#: src/usr/bin/diffuse.py.in:7355
-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/usr/bin/diffuse.py.in:7466
-msgid "_File"
-msgstr "_Fichero"
-
-#: src/usr/bin/diffuse.py.in:7467
-msgid "_Open File..."
-msgstr "_Abrir fichero"
-
-#: src/usr/bin/diffuse.py.in:7468
-msgid "Open File In New _Tab..."
-msgstr "Abrir fichero en nueva _pestaña..."
-
-#: src/usr/bin/diffuse.py.in:7469
-msgid "Open _Modified Files..."
-msgstr "Abrir ficheros _modificados..."
-
-#: src/usr/bin/diffuse.py.in:7470
-msgid "Open Commi_t..."
-msgstr "Abrir revi_sión..."
-
-#: src/usr/bin/diffuse.py.in:7471
-msgid "_Reload File"
-msgstr "_Recargar fichero"
-
-#: src/usr/bin/diffuse.py.in:7473
-msgid "_Save File"
-msgstr "_Guardar fichero"
-
-#: src/usr/bin/diffuse.py.in:7474
-msgid "Save File _As..."
-msgstr "Guardar _fichero como..."
-
-#: src/usr/bin/diffuse.py.in:7475
-msgid "Save A_ll"
-msgstr "Gu_ardar todo"
-
-#: src/usr/bin/diffuse.py.in:7477
-msgid "New _2-Way File Merge"
-msgstr "Nueva mezcla de ficheros de _2 vías"
-
-#: src/usr/bin/diffuse.py.in:7478
-msgid "New _3-Way File Merge"
-msgstr "Nueva mezcla de ficheros de _3 vías"
-
-#: src/usr/bin/diffuse.py.in:7479
-msgid "New _N-Way File Merge..."
-msgstr "Nueva mezcla de ficheros de _N vías..."
-
-#: src/usr/bin/diffuse.py.in:7481
-msgid "_Close Tab"
-msgstr "_Cerrar pestaña"
-
-#: src/usr/bin/diffuse.py.in:7482
-msgid "_Undo Close Tab"
-msgstr "_Deshacer cerrar pestaña"
-
-#: src/usr/bin/diffuse.py.in:7483
-msgid "_Quit"
-msgstr "_Salir"
-
-#: src/usr/bin/diffuse.py.in:7485
-msgid "_Edit"
-msgstr "_Editar"
-
-#: src/usr/bin/diffuse.py.in:7486
-msgid "_Undo"
-msgstr "_Deshacer"
-
-#: src/usr/bin/diffuse.py.in:7487
-msgid "_Redo"
-msgstr "_Rehacer"
-
-#: src/usr/bin/diffuse.py.in:7489
-msgid "Cu_t"
-msgstr "Cor_tar"
-
-#: src/usr/bin/diffuse.py.in:7490
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: src/usr/bin/diffuse.py.in:7491
-msgid "_Paste"
-msgstr "_Pegar"
-
-#: src/usr/bin/diffuse.py.in:7493
-msgid "Select _All"
-msgstr "Seleccion_ar todo"
-
-#: src/usr/bin/diffuse.py.in:7494
-msgid "C_lear Edits"
-msgstr "_Deshacer todo"
-
-#: src/usr/bin/diffuse.py.in:7495
-msgid "_Dismiss All Edits"
-msgstr "_Ignorar todas las ediciones"
-
-#: src/usr/bin/diffuse.py.in:7497
-msgid "_Find..."
-msgstr "_Buscar..."
-
-#: src/usr/bin/diffuse.py.in:7498
-msgid "Find _Next"
-msgstr "Buscar siguie_nte"
-
-#: src/usr/bin/diffuse.py.in:7499
-msgid "Find Pre_vious"
-msgstr "Buscar an_terior"
-
-#: src/usr/bin/diffuse.py.in:7500
-msgid "_Go To Line..."
-msgstr "_Ir a la línea..."
-
-#: src/usr/bin/diffuse.py.in:7502
-msgid "Pr_eferences..."
-msgstr "Pr_eferencias..."
-
-#: src/usr/bin/diffuse.py.in:7504
-msgid "None"
-msgstr "Ninguno"
-
-#: src/usr/bin/diffuse.py.in:7512
-msgid "_View"
-msgstr "_Ver"
-
-#: src/usr/bin/diffuse.py.in:7513
-msgid "_Syntax Highlighting"
-msgstr "Coloreado _sintáctico"
-
-#: src/usr/bin/diffuse.py.in:7515
-msgid "Re_align All"
-msgstr "Re_alinear todo"
-
-#: src/usr/bin/diffuse.py.in:7516
-msgid "_Isolate"
-msgstr "A_islar"
-
-#: src/usr/bin/diffuse.py.in:7518
-msgid "_First Difference"
-msgstr "Primera di_ferencia"
-
-#: src/usr/bin/diffuse.py.in:7519
-msgid "_Previous Difference"
-msgstr "Diferencia an_terior"
-
-#: src/usr/bin/diffuse.py.in:7520
-msgid "_Next Difference"
-msgstr "Diferencia siguie_nte"
-
-#: src/usr/bin/diffuse.py.in:7521
-msgid "_Last Difference"
-msgstr "Ú_ltima diferencia"
-
-#: src/usr/bin/diffuse.py.in:7523
-msgid "Fir_st Tab"
-msgstr "Prime_ra pestaña"
-
-#: src/usr/bin/diffuse.py.in:7524
-msgid "Pre_vious Tab"
-msgstr "Pestaña ante_rior"
-
-#: src/usr/bin/diffuse.py.in:7525
-msgid "Next _Tab"
-msgstr "Siguiente _pestaña"
-
-#: src/usr/bin/diffuse.py.in:7526
-msgid "Las_t Tab"
-msgstr "Ul_tima pestaña"
-
-#: src/usr/bin/diffuse.py.in:7528
-msgid "Shift Pane _Right"
-msgstr "Cambiar panel _derecho"
-
-#: src/usr/bin/diffuse.py.in:7529
-msgid "Shift Pane _Left"
-msgstr "Cambiar panel _izquierdo"
-
-#: src/usr/bin/diffuse.py.in:7531
-msgid "F_ormat"
-msgstr "F_ormato"
-
-#: src/usr/bin/diffuse.py.in:7532
-msgid "Convert To _Upper Case"
-msgstr "Transformar en letras mayúsculas"
-
-#: src/usr/bin/diffuse.py.in:7533
-msgid "Convert To _Lower Case"
-msgstr "Transformar en letras minúsculas"
-
-#: src/usr/bin/diffuse.py.in:7535
-msgid "Sort Lines In _Ascending Order"
-msgstr "Ordenar lineas en orden _ascendente"
-
-#: src/usr/bin/diffuse.py.in:7536
-msgid "Sort Lines In D_escending Order"
-msgstr "Ordenar lineas en orden _descendente"
-
-#: src/usr/bin/diffuse.py.in:7538
-msgid "Remove Trailing _White Space"
-msgstr "Quitar _espacios finales"
-
-#: src/usr/bin/diffuse.py.in:7539
-msgid "Convert Tabs To _Spaces"
-msgstr "Transformar tabuladores en e_spacios"
-
-#: src/usr/bin/diffuse.py.in:7540
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "Transformar espacios iniciales en _tabuladores"
-
-#: src/usr/bin/diffuse.py.in:7542
-msgid "_Increase Indenting"
-msgstr "Aumentar sangr_ía"
-
-#: src/usr/bin/diffuse.py.in:7543
-msgid "De_crease Indenting"
-msgstr "Dis_minuir sangría"
-
-#: src/usr/bin/diffuse.py.in:7545
-msgid "Convert To _DOS Format"
-msgstr "Transformar a formato _DOS"
-
-#: src/usr/bin/diffuse.py.in:7546
-msgid "Convert To _Mac Format"
-msgstr "Transformar a formato _Mac"
-
-#: src/usr/bin/diffuse.py.in:7547
-msgid "Convert To Uni_x Format"
-msgstr "Transformar a formato Uni_x"
-
-#: src/usr/bin/diffuse.py.in:7549
-msgid "_Merge"
-msgstr "_Mezcla"
-
-#: src/usr/bin/diffuse.py.in:7550
-msgid "Copy Selection _Right"
-msgstr "Copiar selección a la de_recha"
-
-#: src/usr/bin/diffuse.py.in:7551
-msgid "Copy Selection _Left"
-msgstr "Copiar selección a la i_zquierda"
-
-#: src/usr/bin/diffuse.py.in:7553
-msgid "Copy Left _Into Selection"
-msgstr "Copiar de _izquierda a la selección"
-
-#: src/usr/bin/diffuse.py.in:7554
-msgid "Copy Right I_nto Selection"
-msgstr "Copiar de de_recha a la selección"
-
-#: src/usr/bin/diffuse.py.in:7555
-msgid "_Merge From Left Then Right"
-msgstr "_Mezclar desde izquierda, después desde derecha"
-
-#: src/usr/bin/diffuse.py.in:7556
-msgid "M_erge From Right Then Left"
-msgstr "M_ezclar desde derecha, después desde izquierda"
-
-#: src/usr/bin/diffuse.py.in:7558
-msgid "_Help"
-msgstr "_Ayuda"
-
-#: src/usr/bin/diffuse.py.in:7559
-msgid "_Help Contents..."
-msgstr "Índ_ice de ayuda..."
-
-#: src/usr/bin/diffuse.py.in:7561
-#, python-format
-msgid "_About %s..."
-msgstr "_Acerca de %s..."
-
-#: src/usr/bin/diffuse.py.in:7575
-msgid "New 2-Way File Merge"
-msgstr "Nueva mezcla de ficheros de 2 vías"
-
-#: src/usr/bin/diffuse.py.in:7576
-msgid "New 3-Way File Merge"
-msgstr "Nueva mezcla de ficheros de 3 vías"
-
-#: src/usr/bin/diffuse.py.in:7578
-msgid "Realign All"
-msgstr "Realinear todo"
-
-#: src/usr/bin/diffuse.py.in:7579
-msgid "First Difference"
-msgstr "Primera diferencía"
-
-#: src/usr/bin/diffuse.py.in:7580
-msgid "Previous Difference"
-msgstr "Diferencía anterior"
-
-#: src/usr/bin/diffuse.py.in:7581
-msgid "Next Difference"
-msgstr "Siguiente diferencia"
-
-#: src/usr/bin/diffuse.py.in:7582
-msgid "Last Difference"
-msgstr "Última diferencía"
-
-#: src/usr/bin/diffuse.py.in:7584
-msgid "Copy Selection Right"
-msgstr "Copiar selección a la derecha"
-
-#: src/usr/bin/diffuse.py.in:7585
-msgid "Copy Selection Left"
-msgstr "Copiar selección a la izquierda"
-
-#: src/usr/bin/diffuse.py.in:7586
-msgid "Copy Left Into Selection"
-msgstr "Copiar de izquierda a la selección"
-
-#: src/usr/bin/diffuse.py.in:7587
-msgid "Copy Right Into Selection"
-msgstr "Copiar de derecha a la selección"
-
-#: src/usr/bin/diffuse.py.in:7588
-msgid "Merge From Left Then Right"
-msgstr "Mezclar desde izquierda, después desde derecha"
-
-#: src/usr/bin/diffuse.py.in:7589
-msgid "Merge From Right Then Left"
-msgstr "Mezclar desde derecha, después desde izquierda"
-
-#: src/usr/bin/diffuse.py.in:7591
-msgid "Undo"
-msgstr "Deshacer"
-
-#: src/usr/bin/diffuse.py.in:7592
-msgid "Redo"
-msgstr "Rehacer"
-
-#: src/usr/bin/diffuse.py.in:7716
-msgid "Some files have unsaved changes.  Select the files to save before closing."
-msgstr "Unos ficheros tienen cambios. Elige los ficheros a guardar antes de cerrar."
-
-#: src/usr/bin/diffuse.py.in:7729
-msgid "Tab"
-msgstr "Pestaña"
-
-#: src/usr/bin/diffuse.py.in:7734
-msgid "Pane"
-msgstr "Panel"
-
-#: src/usr/bin/diffuse.py.in:7745
-msgid "Close _Without Saving"
-msgstr "Cerrar _sin guardar"
-
-#: src/usr/bin/diffuse.py.in:7856
-#, python-format
-msgid "File Merge %d"
-msgstr "Mezcla de archivo %d"
-
-#: src/usr/bin/diffuse.py.in:7959
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "Error recibiendo commits de %s."
-
-#: src/usr/bin/diffuse.py.in:7990
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "Error recibiendo modificaciones de %s."
-
-#: src/usr/bin/diffuse.py.in:8022
-msgid "Open File In New Tab"
-msgstr "Abrir fichero en nueva pestaña"
-
-#: src/usr/bin/diffuse.py.in:8038
-msgid "Choose Folder With Modified Files"
-msgstr "Seleccionar carpeta con archivos modificados"
-
-#: src/usr/bin/diffuse.py.in:8051
-msgid "No modified files found."
-msgstr "No se encontraron ficheros modificados."
-
-#: src/usr/bin/diffuse.py.in:8058
-msgid "Choose Folder With Commit"
-msgstr "Seleccionar carpeta con revisiónes"
-
-#: src/usr/bin/diffuse.py.in:8071
-msgid "No committed files found."
-msgstr "No se encontraron ficheros confirmados."
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "New N-Way File Merge..."
-msgstr "Nueva mezcla de ficheros de N vías..."
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "Number of panes: "
-msgstr "Número de paneles: "
-
-#: src/usr/bin/diffuse.py.in:8172
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "Frase no encontrada. ¿Continuar desde final del fichero?"
-
-#: src/usr/bin/diffuse.py.in:8174
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "Frase no encontrada. ¿Continuar desde principio del fichero?"
-
-#: src/usr/bin/diffuse.py.in:8440
+#: src/main.py:6990
 msgid "Error parsing line number."
 msgstr "Error analizando número de líneas."
 
-#: src/usr/bin/diffuse.py.in:8450
+#: src/main.py:7000
 #, python-format
 msgid "Skipping unknown argument \"%s\"."
 msgstr "Omitiendo argumento desconocido \"%s\"."
 
-#: src/usr/bin/diffuse.py.in:8457
+#: src/main.py:7007
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Error processando parámetro \"%s\".  No se esperaba un directorio."
 
+#: src/vcs/cvs.py:50 src/vcs/rcs.py:54 src/vcs/svn.py:89
+#, python-format
+msgid "Error parsing revision %s."
+msgstr "Error analizando revisión %s."
+
+#: src/vcs/vcs_registry.py:216
+#, python-format
+msgid "Error parsing %s."
+msgstr "Error analizando %s."
+
 #, python-format
 #~ msgid "Column %d"
 #~ msgstr "Columna %d"
diff --git a/po/it.po b/po/it.po
index 317cefb..a3c6717 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: 2020-12-08 13:51-0500\n"
+"POT-Creation-Date: 2021-11-18 15:21-0500\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator: Cristian Marchi <cri.penta@gmail.com>\n"
 "Language-Team: Italian\n"
@@ -17,19 +17,981 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: data/diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:4
 msgid "Diffuse Merge Tool"
 msgstr "Diffuse - strumento di unione"
 
-#: data/diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:5
 msgid "Graphical tool for merging and comparing text files"
 msgstr "Strumento grafico per l'unione e il confronto di file"
 
-#: src/usr/bin/diffuse.py.in:70
+#: data/io.github.mightycreak.Diffuse.metainfo.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."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:19
+msgid "Main window: diff between two files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:26
+msgid "Patch release to fix a bug when using the Flatpak package."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:29
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:71
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:146
+msgid "Fixed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:31
+msgid "Fixed a Flatpak bug where the app couldn't call binaries on the host, such as `git`, `svn`, etc."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:40
+msgid "With this release, the main end-user change is the new icon. The rest is mainly maintenance improvements with a much more standard folder structure and starting to modularize the code. This is an ongoing effort as there is still a lot to do, but hopefully this would motivate some to contribute ;)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:47
+msgid "An important note though: the application ID has changed and is now io.github.mightycreak.Diffuse."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:51
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:89
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:123
+msgid "Added:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:53
+msgid "New icon and in SVG now"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:54
+msgid "Started to modularize the code"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:56
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:93
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:136
+msgid "Changed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:58
+msgid "Changed AppID to io.github.mightycreak.Diffuse (as advised in the Flatpak documentation)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:62
+msgid "Renamed directory `translations/` to `po/`"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:63
+msgid "Now uses POTFILES.in to list the files to translate"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:64
+msgid "Translation strings are no longer sorted alphabetically, this will help when there will be several files in POTFILES.in"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:68
+msgid "Updated the documentation and script in the `po/` directory"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:69
+msgid "Add .desktop translations in .po files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:73
+msgid "Fixed some GTK deprecation warnings"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:79
+msgid "Mainly under the hood changes in this release, so nothing really visible to the users in this version. That said, I figured it was a long time since the last release (4 months ago) and, as promised, I want Diffuse development to be a bit more active and iterative."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:85
+msgid "Apart from the maintenance changes 🧰, I think the main improvement is that Diffuse will soon be available through Flathub!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:91
+msgid "New Flatpak package, published on Flathub: com.github.mightycreak.Diffuse"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:95
+msgid "Replace old install.py with the more standard Meson"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:96
+msgid "Remove u string prefixes since Python 3 is in UTF-8 by default"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:97
+msgid "Replaced some interpolation operators (%) for the f string prefix"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:98
+msgid "Use the window scale factor for the icons generation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:104
+msgid "Here is the v0.5.0. Unintentionally, this release happens exactly 6 years after the previous v0.4.8 release!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:108
+msgid "There is a lot to do on this application, and some features didn't make the release. The main one being the Windows installers. I think 6 years is too long to continue to wait until this bug is fixed. The Python scripts should work on Windows, but no executable is produced (yet) with the release."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:115
+msgid "Other than that, Diffuse v0.5.0 is now officially compatible with Python 3 and GTK 3! And it is synced to the latest commits from upstream (which were never released)."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:120
+msgid "The next version will not take 6 years, I promise you! 😄"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:125
+msgid "Added Pedro Albuquerque's Portuguese translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:126
+msgid "Added Åke Engelbrektson's Swedish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:127
+msgid "Added Guillaume Hoffmann's Darcs support improvements"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:128
+msgid "Added Akom Chotiphantawanon's Thai translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:129
+msgid "Added support for Git submodules"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:130
+msgid "Added a preference and command line option to specify the version control system search order"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:131
+msgid "Added .editorconfig file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:132
+msgid "Added .gitignore file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:133
+msgid "Added message when removing files during uninstallation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:134
+msgid "Added Python script to update all the translation files at once"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:138
+msgid "Convert to Python 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:139
+msgid "Convert to GTK 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:140
+msgid "Updated Python highlighting for Python 3 grammar"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:141
+msgid "Updated copyrights years and authors"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:142
+msgid "Improve Spanish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:143
+msgid "Convert translation README to MarkDown"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:144
+msgid "Updated all the translation files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:148
+msgid "Fixed wrong icons directory for gtk-update-icon-cache"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:149
+msgid "Fixed missing directories when uninstalling"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:150
+msgid "Fixed bug introduced by r420 with RCS VCS"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:151
+msgid "Fixed broken drag'n'drop since migration to Python3/GTK3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:152
+msgid "Fixed error when using '-m' in an SVN repo"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:157
+msgid "Romain Failliot"
+msgstr ""
+
+#: src/constants.py.in:23
 msgid "Copyright"
 msgstr ""
 
-#: src/usr/bin/diffuse.py.in:81
+#: src/main.py:591
+#, python-format
+msgid "Error processing line %(line)d of %(file)s."
+msgstr "Errore nell'elaborare la riga  %(line)d di «%(file)s»."
+
+#: src/main.py:610
+msgid "Auto Detect"
+msgstr "Automatico"
+
+#: src/main.py:706
+msgid "Display"
+msgstr "Visualizzazione"
+
+#: src/main.py:708
+msgid "Font"
+msgstr "Carattere"
+
+#: src/main.py:709
+msgid "Tab width"
+msgstr "Larghezza scheda"
+
+#: src/main.py:710
+msgid "Show right margin"
+msgstr "Mostra margine destro"
+
+#: src/main.py:711
+msgid "Right margin"
+msgstr "Margine destro"
+
+#: src/main.py:712
+msgid "Show line numbers"
+msgstr "Mostra i numeri di riga"
+
+#: src/main.py:713
+msgid "Show white space characters"
+msgstr "Mostra i caratteri di spaziatura"
+
+#: src/main.py:714
+msgid "Ignore case differences"
+msgstr "Ignora la differenza tra lettere maiuscole e minuscole"
+
+#: src/main.py:715
+msgid "Ignore white space differences"
+msgstr "Ignora le differenze tra spazi vuoti"
+
+#: src/main.py:716 src/main.py:724
+msgid "Ignore changes to white space"
+msgstr "Ignora le modifiche agli spazi vuoti"
+
+#: src/main.py:717
+msgid "Ignore blank line differences"
+msgstr "Ignora le differenze tra le righe vuote"
+
+#: src/main.py:718
+msgid "Ignore end of line differences"
+msgstr "Ignora le differenze alla fine della riga"
+
+#: src/main.py:720
+msgid "Alignment"
+msgstr "Allineamento"
+
+#: src/main.py:722
+msgid "Ignore case"
+msgstr "Ignora MAIUSCOLE/minuscole"
+
+#: src/main.py:723
+msgid "Ignore white space"
+msgstr "Ignora gli spazi vuoti"
+
+#: src/main.py:725
+msgid "Ignore blank lines"
+msgstr "Ignora le righe vuote"
+
+#: src/main.py:726
+msgid "Ignore end of line characters"
+msgstr "Ignora i caratteri di fine linea"
+
+#: src/main.py:728
+msgid "Editor"
+msgstr "Editor"
+
+#: src/main.py:730
+msgid "Auto indent"
+msgstr "Indentazione automatica"
+
+#: src/main.py:731
+msgid "Expand tabs to spaces"
+msgstr "Espandi le tabulazioni in spazi"
+
+#: src/main.py:732
+msgid "Soft tab width"
+msgstr "Larghezza scheda"
+
+#: src/main.py:734
+msgid "Tabs"
+msgstr "Schede"
+
+#: src/main.py:736
+msgid "Default panes"
+msgstr "Riquadri predefiniti"
+
+#: src/main.py:737
+msgid "Always show the tab bar"
+msgstr "Mostra sempre la barra delle schede"
+
+#: src/main.py:738
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "Avvisami se chiudendo una scheda anche %s verrà chiuso"
+
+#: src/main.py:740
+msgid "Regional Settings"
+msgstr "Impostazioni regionali"
+
+#: src/main.py:742
+msgid "Default codec"
+msgstr "Codec predefinito"
+
+#: src/main.py:743
+msgid "Order of codecs used to identify encoding"
+msgstr "Ordine dei codici utilizzati per identificare la codifica"
+
+#: src/main.py:763
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/main.py:765
+msgid "Root directory"
+msgstr "Cartella radice"
+
+#: src/main.py:766
+msgid "Cygdrive prefix"
+msgstr "Prefisso Cygdrive"
+
+#: src/main.py:782
+msgid "Version control system search order"
+msgstr ""
+
+#: src/main.py:788
+msgid "\"co\" command"
+msgstr "Comando \"co\""
+
+#: src/main.py:789
+msgid "\"rlog\" command"
+msgstr "Comando \"rlog\""
+
+#: src/main.py:791
+msgid "Command"
+msgstr "Comando"
+
+#: src/main.py:793
+msgid "Launch from a Bash login shell"
+msgstr "Avvia dalla Bash di una shell di login"
+
+#: src/main.py:795
+msgid "Update paths for Cygwin"
+msgstr "Aggiorna i percorsi per Cygwin"
+
+#: src/main.py:799
+msgid "Version Control"
+msgstr "Controllo di versione"
+
+#: src/main.py:863
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: src/main.py:904 src/main.py:5802
+#, python-format
+msgid "Error writing %s."
+msgstr "Errore scrivendo il %s."
+
+#: src/main.py:3282
+msgid "Align with Selection"
+msgstr "Allinea con la selezione"
+
+#: src/main.py:3283
+msgid "Isolate"
+msgstr "Isola"
+
+#: src/main.py:3284
+msgid "Merge Selection"
+msgstr "Unisci selezione"
+
+#: src/main.py:3286 src/main.py:6098
+msgid "Cut"
+msgstr "Taglia"
+
+#: src/main.py:3287 src/main.py:6099
+msgid "Copy"
+msgstr "Copia"
+
+#: src/main.py:3288 src/main.py:6100
+msgid "Paste"
+msgstr "Incolla"
+
+#: src/main.py:3290
+msgid "Select All"
+msgstr "Seleziona tutto"
+
+#: src/main.py:3291 src/main.py:6101
+msgid "Clear Edits"
+msgstr "Annulla le modifiche"
+
+#: src/main.py:3293
+msgid "Swap with Selected Pane"
+msgstr "Scambia con il riquadro selezionato"
+
+#: src/main.py:5124
+msgid "Find..."
+msgstr "Trova..."
+
+#: src/main.py:5132
+msgid "Search For: "
+msgstr "Cerca: "
+
+#: src/main.py:5157
+msgid "Match Case"
+msgstr "Distingui MAIUSCOLE/minuscole"
+
+#: src/main.py:5162
+msgid "Search Backwards"
+msgstr "Cerca all'indietro"
+
+#: src/main.py:5176
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "Chiudendo questa scheda %s verrà chiuso."
+
+#: src/main.py:5198
+msgid "Encoding: "
+msgstr "Codifica: "
+
+#: src/main.py:5208
+msgid "Revision: "
+msgstr "Revisione: "
+
+#: src/main.py:5272
+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/main.py:5277
+msgid "translator-credits"
+msgstr "Cristian Marchi <cri.penta@gmail.com>,  2011."
+
+#: src/main.py:5281
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with this program.  You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+
+#: src/main.py:5322
+msgid "Close Tab"
+msgstr "Chiudi scheda"
+
+#: src/main.py:5377
+msgid "Open File..."
+msgstr "Apri file..."
+
+#: src/main.py:5378
+msgid "Reload File"
+msgstr "Ricarica file"
+
+#: src/main.py:5379
+msgid "Save File"
+msgstr "Salva file"
+
+#: src/main.py:5380
+msgid "Save File As..."
+msgstr "Salva con nome..."
+
+#: src/main.py:5525
+msgid "Save changes before loading the new file?"
+msgstr "Salvare i cambiamenti prima di caricare il nuovo file?"
+
+#: src/main.py:5635
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "Errore durante la lettura della revisione \"%(rev)s\" di «%(file)s»."
+
+#: src/main.py:5637 src/main.py:6900
+#, python-format
+msgid "Error reading %s."
+msgstr "Errore leggendo il %s."
+
+#: src/main.py:5658
+msgid "Open File"
+msgstr "Apertura file"
+
+#: src/main.py:5708
+#, 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/main.py:5728
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "Salva %(title)s riquadro %(pane)d"
+
+#: src/main.py:5754
+#, python-format
+msgid "A file named %s already exists.  Do you want to overwrite it?"
+msgstr "Il file «%s» esiste già. Sovrascrivere?"
+
+#: src/main.py:5759
+#, 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/main.py:5800
+#, python-format
+msgid "Error encoding to %s."
+msgstr "Errore codificando %s"
+
+#: src/main.py:5830
+msgid "Go To Line..."
+msgstr "Vai alla linea..."
+
+#: src/main.py:5830
+msgid "Line Number: "
+msgstr "Numero di riga: "
+
+#: src/main.py:5856
+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/main.py:5858
+msgid "Press the escape key to finish editing."
+msgstr "Premere il tasto \"Esc\" per terminare le modifiche"
+
+#: src/main.py:5860
+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/main.py:5971
+msgid "_File"
+msgstr "_File"
+
+#: src/main.py:5972
+msgid "_Open File..."
+msgstr "_Apri file"
+
+#: src/main.py:5973
+msgid "Open File In New _Tab..."
+msgstr "Apri file in una nuova sc_heda..."
+
+#: src/main.py:5974
+msgid "Open _Modified Files..."
+msgstr "Apri file _modificati..."
+
+#: src/main.py:5975
+msgid "Open Commi_t..."
+msgstr "Apri c_ommit..."
+
+#: src/main.py:5976
+msgid "_Reload File"
+msgstr "_Ricarica file"
+
+#: src/main.py:5978
+msgid "_Save File"
+msgstr "_Salva file"
+
+#: src/main.py:5979
+msgid "Save File _As..."
+msgstr "S_alva con nome..."
+
+#: src/main.py:5980
+msgid "Save A_ll"
+msgstr "Salva _tutti"
+
+#: src/main.py:5982
+msgid "New _2-Way File Merge"
+msgstr "Nuova unione a _2 file"
+
+#: src/main.py:5983
+msgid "New _3-Way File Merge"
+msgstr "Nuova unione a _3 file"
+
+#: src/main.py:5984
+msgid "New _N-Way File Merge..."
+msgstr "Nuova unione a _N file"
+
+#: src/main.py:5986
+msgid "_Close Tab"
+msgstr "_Chiudi scheda"
+
+#: src/main.py:5987
+msgid "_Undo Close Tab"
+msgstr "Annulla chi_usura scheda"
+
+#: src/main.py:5988
+msgid "_Quit"
+msgstr "_Esci"
+
+#: src/main.py:5990
+msgid "_Edit"
+msgstr "_Modifica"
+
+#: src/main.py:5991
+msgid "_Undo"
+msgstr "Ann_ulla"
+
+#: src/main.py:5992
+msgid "_Redo"
+msgstr "_Ripeti"
+
+#: src/main.py:5994
+msgid "Cu_t"
+msgstr "_Taglia"
+
+#: src/main.py:5995
+msgid "_Copy"
+msgstr "_Copia"
+
+#: src/main.py:5996
+msgid "_Paste"
+msgstr "_Incolla"
+
+#: src/main.py:5998
+msgid "Select _All"
+msgstr "Selezion_a tutto"
+
+#: src/main.py:5999
+msgid "C_lear Edits"
+msgstr "Annulla _modifiche"
+
+#: src/main.py:6000
+msgid "_Dismiss All Edits"
+msgstr "Scarta tutte le mo_difiche"
+
+#: src/main.py:6002
+msgid "_Find..."
+msgstr "Tr_ova..."
+
+#: src/main.py:6003
+msgid "Find _Next"
+msgstr "Trova _successivo"
+
+#: src/main.py:6004
+msgid "Find Pre_vious"
+msgstr "Trova _precedente"
+
+#: src/main.py:6005
+msgid "_Go To Line..."
+msgstr "_Vai alla riga..."
+
+#: src/main.py:6007
+msgid "Pr_eferences..."
+msgstr "Pr_eferenze..."
+
+#: src/main.py:6009
+msgid "None"
+msgstr "Nessuna"
+
+#: src/main.py:6017
+msgid "_View"
+msgstr "_Visualizza"
+
+#: src/main.py:6018
+msgid "_Syntax Highlighting"
+msgstr "Si_ntassi"
+
+#: src/main.py:6020
+msgid "Re_align All"
+msgstr "Ria_llinea tutti"
+
+#: src/main.py:6021
+msgid "_Isolate"
+msgstr "_Isola"
+
+#: src/main.py:6023
+msgid "_First Difference"
+msgstr "_Prima differenza"
+
+#: src/main.py:6024
+msgid "_Previous Difference"
+msgstr "Differenza p_recedente"
+
+#: src/main.py:6025
+msgid "_Next Difference"
+msgstr "Differenza s_uccessiva"
+
+#: src/main.py:6026
+msgid "_Last Difference"
+msgstr "Ulti_ma differenza"
+
+#: src/main.py:6028
+msgid "Fir_st Tab"
+msgstr "Prim_a scheda"
+
+#: src/main.py:6029
+msgid "Pre_vious Tab"
+msgstr "Scheda pr_ecedente"
+
+#: src/main.py:6030
+msgid "Next _Tab"
+msgstr "Scheda su_ccessiva"
+
+#: src/main.py:6031
+msgid "Las_t Tab"
+msgstr "Ul_tima scheda"
+
+#: src/main.py:6033
+msgid "Shift Pane _Right"
+msgstr "Sposta riquadro a _destra"
+
+#: src/main.py:6034
+msgid "Shift Pane _Left"
+msgstr "Sposta riquadro a _sinistra"
+
+#: src/main.py:6036
+msgid "F_ormat"
+msgstr "F_ormato"
+
+#: src/main.py:6037
+msgid "Convert To _Upper Case"
+msgstr "Converti in M_AIUSCOLO"
+
+#: src/main.py:6038
+msgid "Convert To _Lower Case"
+msgstr "Converti in m_inuscolo"
+
+#: src/main.py:6040
+msgid "Sort Lines In _Ascending Order"
+msgstr "Disponi le righe in ordine a_scendente"
+
+#: src/main.py:6041
+msgid "Sort Lines In D_escending Order"
+msgstr "Disponi le righe in ordine _discendente"
+
+#: src/main.py:6043
+msgid "Remove Trailing _White Space"
+msgstr "Rimuovi gli spazi _vuoti alla fine della riga"
+
+#: src/main.py:6044
+msgid "Convert Tabs To _Spaces"
+msgstr "Converti le _tabulazioni in spazi"
+
+#: src/main.py:6045
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "Converti gli spa_zi iniziali in tabulazioni"
+
+#: src/main.py:6047
+msgid "_Increase Indenting"
+msgstr "Au_menta indentazione"
+
+#: src/main.py:6048
+msgid "De_crease Indenting"
+msgstr "Dimi_nuisci indentazione"
+
+#: src/main.py:6050
+msgid "Convert To _DOS Format"
+msgstr "Converti nel formato D_OS"
+
+#: src/main.py:6051
+msgid "Convert To _Mac Format"
+msgstr "Converti nel formato MA_C"
+
+#: src/main.py:6052
+msgid "Convert To Uni_x Format"
+msgstr "Converti nel formato Uni_x"
+
+#: src/main.py:6054
+msgid "_Merge"
+msgstr "_Unione"
+
+#: src/main.py:6055
+msgid "Copy Selection _Right"
+msgstr "Copia selezione a _destra"
+
+#: src/main.py:6056
+msgid "Copy Selection _Left"
+msgstr "Copia selezione a _sinistra"
+
+#: src/main.py:6058
+msgid "Copy Left _Into Selection"
+msgstr "Copia s_inistra nella selezione"
+
+#: src/main.py:6059
+msgid "Copy Right I_nto Selection"
+msgstr "Copia d_estra nella selezione"
+
+#: src/main.py:6060
+msgid "_Merge From Left Then Right"
+msgstr "_Unisci sinistra poi destra"
+
+#: src/main.py:6061
+msgid "M_erge From Right Then Left"
+msgstr "U_nisci destra poi sinistra"
+
+#: src/main.py:6063
+msgid "_Help"
+msgstr "A_iuto"
+
+#: src/main.py:6064
+msgid "_Help Contents..."
+msgstr "_Sommario"
+
+#: src/main.py:6066
+#, python-format
+msgid "_About %s..."
+msgstr "I_nformazioni su %s"
+
+#: src/main.py:6080
+msgid "New 2-Way File Merge"
+msgstr "Nuova unione a 2 file"
+
+#: src/main.py:6081
+msgid "New 3-Way File Merge"
+msgstr "Nuova unione a 3 file"
+
+#: src/main.py:6083
+msgid "Realign All"
+msgstr "Riallinea tutti"
+
+#: src/main.py:6084
+msgid "First Difference"
+msgstr "Prima differenza"
+
+#: src/main.py:6085
+msgid "Previous Difference"
+msgstr "Differenza precedente"
+
+#: src/main.py:6086
+msgid "Next Difference"
+msgstr "Differenza successiva"
+
+#: src/main.py:6087
+msgid "Last Difference"
+msgstr "Ultima differenza"
+
+#: src/main.py:6089
+msgid "Copy Selection Right"
+msgstr "Copia la selezione a destra"
+
+#: src/main.py:6090
+msgid "Copy Selection Left"
+msgstr "Copia la selezione a sinistra"
+
+#: src/main.py:6091
+msgid "Copy Left Into Selection"
+msgstr "Copia sinistra nella selezione"
+
+#: src/main.py:6092
+msgid "Copy Right Into Selection"
+msgstr "Copia destra nella selezione"
+
+#: src/main.py:6093
+msgid "Merge From Left Then Right"
+msgstr "Unisce prima da sinistra poi da destra"
+
+#: src/main.py:6094
+msgid "Merge From Right Then Left"
+msgstr "Unisce prima da destra poi da sinistra"
+
+#: src/main.py:6096
+msgid "Undo"
+msgstr "Annulla"
+
+#: src/main.py:6097
+msgid "Redo"
+msgstr "Ripeti"
+
+#: src/main.py:6221
+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/main.py:6234
+msgid "Tab"
+msgstr "Scheda"
+
+#: src/main.py:6239
+msgid "Pane"
+msgstr "Riquadro"
+
+#: src/main.py:6250
+msgid "Close _Without Saving"
+msgstr "_Chiudi senza salvare"
+
+#: src/main.py:6361
+#, python-format
+msgid "File Merge %d"
+msgstr "Unione file # %d"
+
+#: src/main.py:6464
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "Errore nel recupero dei commit per «%s»"
+
+#: src/main.py:6493
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "Errore nel recupero delle modifiche per «%s»"
+
+#: src/main.py:6523
+msgid "Open File In New Tab"
+msgstr "Apre ilo file in una nuova scheda"
+
+#: src/main.py:6539
+msgid "Choose Folder With Modified Files"
+msgstr "Selezionare la cartella con i file modificati"
+
+#: src/main.py:6552
+msgid "No modified files found."
+msgstr "Non sono stati trovati file modificati."
+
+#: src/main.py:6557
+msgid "Choose Folder With Commit"
+msgstr "Selezionare la cartella con i commit"
+
+#: src/main.py:6570
+msgid "No committed files found."
+msgstr "Non sono stati trovati file di cui è stato eseguito il commit."
+
+#: src/main.py:6604
+msgid "New N-Way File Merge..."
+msgstr "Nuova unione a N file..."
+
+#: src/main.py:6604
+msgid "Number of panes: "
+msgstr "Numero di riquadri"
+
+#: src/main.py:6669
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "Frase non trovata. Continuare dalla fine del file?"
+
+#: src/main.py:6671
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "Frase non trovata. Continuare dall'inizio del file?"
+
+#: src/main.py:6819
 msgid ""
 "Usage:\n"
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
@@ -108,768 +1070,30 @@ msgstr ""
 "  ( -i | --ignore-case )           Ignora differenze tra MAIUSCOLE/minuscole\n"
 "  ( -w | --ignore-all-space )      Ignora le differenze tra spazi vuoti"
 
-#: src/usr/bin/diffuse.py.in:716
-#, python-format
-msgid "Error processing line %(line)d of %(file)s."
-msgstr "Errore nell'elaborare la riga  %(line)d di «%(file)s»."
-
-#: src/usr/bin/diffuse.py.in:735
-msgid "Auto Detect"
-msgstr "Automatico"
-
-#: src/usr/bin/diffuse.py.in:831
-msgid "Display"
-msgstr "Visualizzazione"
-
-#: src/usr/bin/diffuse.py.in:833
-msgid "Font"
-msgstr "Carattere"
-
-#: src/usr/bin/diffuse.py.in:834
-msgid "Tab width"
-msgstr "Larghezza scheda"
-
-#: src/usr/bin/diffuse.py.in:835
-msgid "Show right margin"
-msgstr "Mostra margine destro"
-
-#: src/usr/bin/diffuse.py.in:836
-msgid "Right margin"
-msgstr "Margine destro"
-
-#: src/usr/bin/diffuse.py.in:837
-msgid "Show line numbers"
-msgstr "Mostra i numeri di riga"
-
-#: src/usr/bin/diffuse.py.in:838
-msgid "Show white space characters"
-msgstr "Mostra i caratteri di spaziatura"
-
-#: src/usr/bin/diffuse.py.in:839
-msgid "Ignore case differences"
-msgstr "Ignora la differenza tra lettere maiuscole e minuscole"
-
-#: src/usr/bin/diffuse.py.in:840
-msgid "Ignore white space differences"
-msgstr "Ignora le differenze tra spazi vuoti"
-
-#: src/usr/bin/diffuse.py.in:841 src/usr/bin/diffuse.py.in:849
-msgid "Ignore changes to white space"
-msgstr "Ignora le modifiche agli spazi vuoti"
-
-#: src/usr/bin/diffuse.py.in:842
-msgid "Ignore blank line differences"
-msgstr "Ignora le differenze tra le righe vuote"
-
-#: src/usr/bin/diffuse.py.in:843
-msgid "Ignore end of line differences"
-msgstr "Ignora le differenze alla fine della riga"
-
-#: src/usr/bin/diffuse.py.in:845
-msgid "Alignment"
-msgstr "Allineamento"
-
-#: src/usr/bin/diffuse.py.in:847
-msgid "Ignore case"
-msgstr "Ignora MAIUSCOLE/minuscole"
-
-#: src/usr/bin/diffuse.py.in:848
-msgid "Ignore white space"
-msgstr "Ignora gli spazi vuoti"
-
-#: src/usr/bin/diffuse.py.in:850
-msgid "Ignore blank lines"
-msgstr "Ignora le righe vuote"
-
-#: src/usr/bin/diffuse.py.in:851
-msgid "Ignore end of line characters"
-msgstr "Ignora i caratteri di fine linea"
-
-#: src/usr/bin/diffuse.py.in:853
-msgid "Editor"
-msgstr "Editor"
-
-#: src/usr/bin/diffuse.py.in:855
-msgid "Auto indent"
-msgstr "Indentazione automatica"
-
-#: src/usr/bin/diffuse.py.in:856
-msgid "Expand tabs to spaces"
-msgstr "Espandi le tabulazioni in spazi"
-
-#: src/usr/bin/diffuse.py.in:857
-msgid "Soft tab width"
-msgstr "Larghezza scheda"
-
-#: src/usr/bin/diffuse.py.in:859
-msgid "Tabs"
-msgstr "Schede"
-
-#: src/usr/bin/diffuse.py.in:861
-msgid "Default panes"
-msgstr "Riquadri predefiniti"
-
-#: src/usr/bin/diffuse.py.in:862
-msgid "Always show the tab bar"
-msgstr "Mostra sempre la barra delle schede"
-
-#: src/usr/bin/diffuse.py.in:863
-#, python-format
-msgid "Warn me when closing a tab will quit %s"
-msgstr "Avvisami se chiudendo una scheda anche %s verrà chiuso"
-
-#: src/usr/bin/diffuse.py.in:865
-msgid "Regional Settings"
-msgstr "Impostazioni regionali"
-
-#: src/usr/bin/diffuse.py.in:867
-msgid "Default codec"
-msgstr "Codec predefinito"
-
-#: src/usr/bin/diffuse.py.in:868
-msgid "Order of codecs used to identify encoding"
-msgstr "Ordine dei codici utilizzati per identificare la codifica"
-
-#: src/usr/bin/diffuse.py.in:888
-msgid "Cygwin"
-msgstr "Cygwin"
-
-#: src/usr/bin/diffuse.py.in:890
-msgid "Root directory"
-msgstr "Cartella radice"
-
-#: src/usr/bin/diffuse.py.in:891
-msgid "Cygdrive prefix"
-msgstr "Prefisso Cygdrive"
-
-#: src/usr/bin/diffuse.py.in:907
-msgid "Version control system search order"
-msgstr ""
-
-#: src/usr/bin/diffuse.py.in:913
-msgid "\"co\" command"
-msgstr "Comando \"co\""
-
-#: src/usr/bin/diffuse.py.in:914
-msgid "\"rlog\" command"
-msgstr "Comando \"rlog\""
-
-#: src/usr/bin/diffuse.py.in:916
-msgid "Command"
-msgstr "Comando"
-
-#: src/usr/bin/diffuse.py.in:918
-msgid "Launch from a Bash login shell"
-msgstr "Avvia dalla Bash di una shell di login"
-
-#: src/usr/bin/diffuse.py.in:920
-msgid "Update paths for Cygwin"
-msgstr "Aggiorna i percorsi per Cygwin"
-
-#: src/usr/bin/diffuse.py.in:924
-msgid "Version Control"
-msgstr "Controllo di versione"
-
-#: src/usr/bin/diffuse.py.in:988
-msgid "Preferences"
-msgstr "Preferenze"
-
-#: src/usr/bin/diffuse.py.in:1029 src/usr/bin/diffuse.py.in:7295
-#, python-format
-msgid "Error writing %s."
-msgstr "Errore scrivendo il %s."
-
-#: src/usr/bin/diffuse.py.in:1656 src/usr/bin/diffuse.py.in:2273
-#: src/usr/bin/diffuse.py.in:2417
-#, python-format
-msgid "Error parsing revision %s."
-msgstr "Eroore analizzando la revisione %s."
-
-#: src/usr/bin/diffuse.py.in:2658
-#, python-format
-msgid "Error parsing %s."
-msgstr "Errore analizzando %s."
-
-#: src/usr/bin/diffuse.py.in:4778
-msgid "Align with Selection"
-msgstr "Allinea con la selezione"
-
-#: src/usr/bin/diffuse.py.in:4779
-msgid "Isolate"
-msgstr "Isola"
-
-#: src/usr/bin/diffuse.py.in:4780
-msgid "Merge Selection"
-msgstr "Unisci selezione"
-
-#: src/usr/bin/diffuse.py.in:4782 src/usr/bin/diffuse.py.in:7593
-msgid "Cut"
-msgstr "Taglia"
-
-#: src/usr/bin/diffuse.py.in:4783 src/usr/bin/diffuse.py.in:7594
-msgid "Copy"
-msgstr "Copia"
-
-#: src/usr/bin/diffuse.py.in:4784 src/usr/bin/diffuse.py.in:7595
-msgid "Paste"
-msgstr "Incolla"
-
-#: src/usr/bin/diffuse.py.in:4786
-msgid "Select All"
-msgstr "Seleziona tutto"
-
-#: src/usr/bin/diffuse.py.in:4787 src/usr/bin/diffuse.py.in:7596
-msgid "Clear Edits"
-msgstr "Annulla le modifiche"
-
-#: src/usr/bin/diffuse.py.in:4789
-msgid "Swap with Selected Pane"
-msgstr "Scambia con il riquadro selezionato"
-
-#: src/usr/bin/diffuse.py.in:6620
-msgid "Find..."
-msgstr "Trova..."
-
-#: src/usr/bin/diffuse.py.in:6628
-msgid "Search For: "
-msgstr "Cerca: "
-
-#: src/usr/bin/diffuse.py.in:6653
-msgid "Match Case"
-msgstr "Distingui MAIUSCOLE/minuscole"
-
-#: src/usr/bin/diffuse.py.in:6658
-msgid "Search Backwards"
-msgstr "Cerca all'indietro"
-
-#: src/usr/bin/diffuse.py.in:6672
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "Chiudendo questa scheda %s verrà chiuso."
-
-#: src/usr/bin/diffuse.py.in:6694
-msgid "Encoding: "
-msgstr "Codifica: "
-
-#: src/usr/bin/diffuse.py.in:6704
-msgid "Revision: "
-msgstr "Revisione: "
-
-#: src/usr/bin/diffuse.py.in:6768
-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/usr/bin/diffuse.py.in:6773
-msgid "translator-credits"
-msgstr "Cristian Marchi <cri.penta@gmail.com>,  2011."
-
-#: src/usr/bin/diffuse.py.in:6776
-msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program.  You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program.  You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-
-#: src/usr/bin/diffuse.py.in:6811
-msgid "Close Tab"
-msgstr "Chiudi scheda"
-
-#: src/usr/bin/diffuse.py.in:6866
-msgid "Open File..."
-msgstr "Apri file..."
-
-#: src/usr/bin/diffuse.py.in:6867
-msgid "Reload File"
-msgstr "Ricarica file"
-
-#: src/usr/bin/diffuse.py.in:6868
-msgid "Save File"
-msgstr "Salva file"
-
-#: src/usr/bin/diffuse.py.in:6869
-msgid "Save File As..."
-msgstr "Salva con nome..."
-
-#: src/usr/bin/diffuse.py.in:7014
-msgid "Save changes before loading the new file?"
-msgstr "Salvare i cambiamenti prima di caricare il nuovo file?"
-
-#: src/usr/bin/diffuse.py.in:7124
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "Errore durante la lettura della revisione \"%(rev)s\" di «%(file)s»."
-
-#: src/usr/bin/diffuse.py.in:7126 src/usr/bin/diffuse.py.in:8359
-#, python-format
-msgid "Error reading %s."
-msgstr "Errore leggendo il %s."
-
-#: src/usr/bin/diffuse.py.in:7149
-msgid "Open File"
-msgstr "Apertura file"
-
-#: src/usr/bin/diffuse.py.in:7199
-#, 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/usr/bin/diffuse.py.in:7219
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "Salva %(title)s riquadro %(pane)d"
-
-#: src/usr/bin/diffuse.py.in:7245
-#, python-format
-msgid "A file named %s already exists.  Do you want to overwrite it?"
-msgstr "Il file «%s» esiste già. Sovrascrivere?"
-
-#: src/usr/bin/diffuse.py.in:7250
-#, 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/usr/bin/diffuse.py.in:7291
-#, python-format
-msgid "Error encoding to %s."
-msgstr "Errore codificando %s"
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Go To Line..."
-msgstr "Vai alla linea..."
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Line Number: "
-msgstr "Numero di riga: "
-
-#: src/usr/bin/diffuse.py.in:7351
-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/usr/bin/diffuse.py.in:7353
-msgid "Press the escape key to finish editing."
-msgstr "Premere il tasto \"Esc\" per terminare le modifiche"
-
-#: src/usr/bin/diffuse.py.in:7355
-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/usr/bin/diffuse.py.in:7466
-msgid "_File"
-msgstr "_File"
-
-#: src/usr/bin/diffuse.py.in:7467
-msgid "_Open File..."
-msgstr "_Apri file"
-
-#: src/usr/bin/diffuse.py.in:7468
-msgid "Open File In New _Tab..."
-msgstr "Apri file in una nuova sc_heda..."
-
-#: src/usr/bin/diffuse.py.in:7469
-msgid "Open _Modified Files..."
-msgstr "Apri file _modificati..."
-
-#: src/usr/bin/diffuse.py.in:7470
-msgid "Open Commi_t..."
-msgstr "Apri c_ommit..."
-
-#: src/usr/bin/diffuse.py.in:7471
-msgid "_Reload File"
-msgstr "_Ricarica file"
-
-#: src/usr/bin/diffuse.py.in:7473
-msgid "_Save File"
-msgstr "_Salva file"
-
-#: src/usr/bin/diffuse.py.in:7474
-msgid "Save File _As..."
-msgstr "S_alva con nome..."
-
-#: src/usr/bin/diffuse.py.in:7475
-msgid "Save A_ll"
-msgstr "Salva _tutti"
-
-#: src/usr/bin/diffuse.py.in:7477
-msgid "New _2-Way File Merge"
-msgstr "Nuova unione a _2 file"
-
-#: src/usr/bin/diffuse.py.in:7478
-msgid "New _3-Way File Merge"
-msgstr "Nuova unione a _3 file"
-
-#: src/usr/bin/diffuse.py.in:7479
-msgid "New _N-Way File Merge..."
-msgstr "Nuova unione a _N file"
-
-#: src/usr/bin/diffuse.py.in:7481
-msgid "_Close Tab"
-msgstr "_Chiudi scheda"
-
-#: src/usr/bin/diffuse.py.in:7482
-msgid "_Undo Close Tab"
-msgstr "Annulla chi_usura scheda"
-
-#: src/usr/bin/diffuse.py.in:7483
-msgid "_Quit"
-msgstr "_Esci"
-
-#: src/usr/bin/diffuse.py.in:7485
-msgid "_Edit"
-msgstr "_Modifica"
-
-#: src/usr/bin/diffuse.py.in:7486
-msgid "_Undo"
-msgstr "Ann_ulla"
-
-#: src/usr/bin/diffuse.py.in:7487
-msgid "_Redo"
-msgstr "_Ripeti"
-
-#: src/usr/bin/diffuse.py.in:7489
-msgid "Cu_t"
-msgstr "_Taglia"
-
-#: src/usr/bin/diffuse.py.in:7490
-msgid "_Copy"
-msgstr "_Copia"
-
-#: src/usr/bin/diffuse.py.in:7491
-msgid "_Paste"
-msgstr "_Incolla"
-
-#: src/usr/bin/diffuse.py.in:7493
-msgid "Select _All"
-msgstr "Selezion_a tutto"
-
-#: src/usr/bin/diffuse.py.in:7494
-msgid "C_lear Edits"
-msgstr "Annulla _modifiche"
-
-#: src/usr/bin/diffuse.py.in:7495
-msgid "_Dismiss All Edits"
-msgstr "Scarta tutte le mo_difiche"
-
-#: src/usr/bin/diffuse.py.in:7497
-msgid "_Find..."
-msgstr "Tr_ova..."
-
-#: src/usr/bin/diffuse.py.in:7498
-msgid "Find _Next"
-msgstr "Trova _successivo"
-
-#: src/usr/bin/diffuse.py.in:7499
-msgid "Find Pre_vious"
-msgstr "Trova _precedente"
-
-#: src/usr/bin/diffuse.py.in:7500
-msgid "_Go To Line..."
-msgstr "_Vai alla riga..."
-
-#: src/usr/bin/diffuse.py.in:7502
-msgid "Pr_eferences..."
-msgstr "Pr_eferenze..."
-
-#: src/usr/bin/diffuse.py.in:7504
-msgid "None"
-msgstr "Nessuna"
-
-#: src/usr/bin/diffuse.py.in:7512
-msgid "_View"
-msgstr "_Visualizza"
-
-#: src/usr/bin/diffuse.py.in:7513
-msgid "_Syntax Highlighting"
-msgstr "Si_ntassi"
-
-#: src/usr/bin/diffuse.py.in:7515
-msgid "Re_align All"
-msgstr "Ria_llinea tutti"
-
-#: src/usr/bin/diffuse.py.in:7516
-msgid "_Isolate"
-msgstr "_Isola"
-
-#: src/usr/bin/diffuse.py.in:7518
-msgid "_First Difference"
-msgstr "_Prima differenza"
-
-#: src/usr/bin/diffuse.py.in:7519
-msgid "_Previous Difference"
-msgstr "Differenza p_recedente"
-
-#: src/usr/bin/diffuse.py.in:7520
-msgid "_Next Difference"
-msgstr "Differenza s_uccessiva"
-
-#: src/usr/bin/diffuse.py.in:7521
-msgid "_Last Difference"
-msgstr "Ulti_ma differenza"
-
-#: src/usr/bin/diffuse.py.in:7523
-msgid "Fir_st Tab"
-msgstr "Prim_a scheda"
-
-#: src/usr/bin/diffuse.py.in:7524
-msgid "Pre_vious Tab"
-msgstr "Scheda pr_ecedente"
-
-#: src/usr/bin/diffuse.py.in:7525
-msgid "Next _Tab"
-msgstr "Scheda su_ccessiva"
-
-#: src/usr/bin/diffuse.py.in:7526
-msgid "Las_t Tab"
-msgstr "Ul_tima scheda"
-
-#: src/usr/bin/diffuse.py.in:7528
-msgid "Shift Pane _Right"
-msgstr "Sposta riquadro a _destra"
-
-#: src/usr/bin/diffuse.py.in:7529
-msgid "Shift Pane _Left"
-msgstr "Sposta riquadro a _sinistra"
-
-#: src/usr/bin/diffuse.py.in:7531
-msgid "F_ormat"
-msgstr "F_ormato"
-
-#: src/usr/bin/diffuse.py.in:7532
-msgid "Convert To _Upper Case"
-msgstr "Converti in M_AIUSCOLO"
-
-#: src/usr/bin/diffuse.py.in:7533
-msgid "Convert To _Lower Case"
-msgstr "Converti in m_inuscolo"
-
-#: src/usr/bin/diffuse.py.in:7535
-msgid "Sort Lines In _Ascending Order"
-msgstr "Disponi le righe in ordine a_scendente"
-
-#: src/usr/bin/diffuse.py.in:7536
-msgid "Sort Lines In D_escending Order"
-msgstr "Disponi le righe in ordine _discendente"
-
-#: src/usr/bin/diffuse.py.in:7538
-msgid "Remove Trailing _White Space"
-msgstr "Rimuovi gli spazi _vuoti alla fine della riga"
-
-#: src/usr/bin/diffuse.py.in:7539
-msgid "Convert Tabs To _Spaces"
-msgstr "Converti le _tabulazioni in spazi"
-
-#: src/usr/bin/diffuse.py.in:7540
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "Converti gli spa_zi iniziali in tabulazioni"
-
-#: src/usr/bin/diffuse.py.in:7542
-msgid "_Increase Indenting"
-msgstr "Au_menta indentazione"
-
-#: src/usr/bin/diffuse.py.in:7543
-msgid "De_crease Indenting"
-msgstr "Dimi_nuisci indentazione"
-
-#: src/usr/bin/diffuse.py.in:7545
-msgid "Convert To _DOS Format"
-msgstr "Converti nel formato D_OS"
-
-#: src/usr/bin/diffuse.py.in:7546
-msgid "Convert To _Mac Format"
-msgstr "Converti nel formato MA_C"
-
-#: src/usr/bin/diffuse.py.in:7547
-msgid "Convert To Uni_x Format"
-msgstr "Converti nel formato Uni_x"
-
-#: src/usr/bin/diffuse.py.in:7549
-msgid "_Merge"
-msgstr "_Unione"
-
-#: src/usr/bin/diffuse.py.in:7550
-msgid "Copy Selection _Right"
-msgstr "Copia selezione a _destra"
-
-#: src/usr/bin/diffuse.py.in:7551
-msgid "Copy Selection _Left"
-msgstr "Copia selezione a _sinistra"
-
-#: src/usr/bin/diffuse.py.in:7553
-msgid "Copy Left _Into Selection"
-msgstr "Copia s_inistra nella selezione"
-
-#: src/usr/bin/diffuse.py.in:7554
-msgid "Copy Right I_nto Selection"
-msgstr "Copia d_estra nella selezione"
-
-#: src/usr/bin/diffuse.py.in:7555
-msgid "_Merge From Left Then Right"
-msgstr "_Unisci sinistra poi destra"
-
-#: src/usr/bin/diffuse.py.in:7556
-msgid "M_erge From Right Then Left"
-msgstr "U_nisci destra poi sinistra"
-
-#: src/usr/bin/diffuse.py.in:7558
-msgid "_Help"
-msgstr "A_iuto"
-
-#: src/usr/bin/diffuse.py.in:7559
-msgid "_Help Contents..."
-msgstr "_Sommario"
-
-#: src/usr/bin/diffuse.py.in:7561
-#, python-format
-msgid "_About %s..."
-msgstr "I_nformazioni su %s"
-
-#: src/usr/bin/diffuse.py.in:7575
-msgid "New 2-Way File Merge"
-msgstr "Nuova unione a 2 file"
-
-#: src/usr/bin/diffuse.py.in:7576
-msgid "New 3-Way File Merge"
-msgstr "Nuova unione a 3 file"
-
-#: src/usr/bin/diffuse.py.in:7578
-msgid "Realign All"
-msgstr "Riallinea tutti"
-
-#: src/usr/bin/diffuse.py.in:7579
-msgid "First Difference"
-msgstr "Prima differenza"
-
-#: src/usr/bin/diffuse.py.in:7580
-msgid "Previous Difference"
-msgstr "Differenza precedente"
-
-#: src/usr/bin/diffuse.py.in:7581
-msgid "Next Difference"
-msgstr "Differenza successiva"
-
-#: src/usr/bin/diffuse.py.in:7582
-msgid "Last Difference"
-msgstr "Ultima differenza"
-
-#: src/usr/bin/diffuse.py.in:7584
-msgid "Copy Selection Right"
-msgstr "Copia la selezione a destra"
-
-#: src/usr/bin/diffuse.py.in:7585
-msgid "Copy Selection Left"
-msgstr "Copia la selezione a sinistra"
-
-#: src/usr/bin/diffuse.py.in:7586
-msgid "Copy Left Into Selection"
-msgstr "Copia sinistra nella selezione"
-
-#: src/usr/bin/diffuse.py.in:7587
-msgid "Copy Right Into Selection"
-msgstr "Copia destra nella selezione"
-
-#: src/usr/bin/diffuse.py.in:7588
-msgid "Merge From Left Then Right"
-msgstr "Unisce prima da sinistra poi da destra"
-
-#: src/usr/bin/diffuse.py.in:7589
-msgid "Merge From Right Then Left"
-msgstr "Unisce prima da destra poi da sinistra"
-
-#: src/usr/bin/diffuse.py.in:7591
-msgid "Undo"
-msgstr "Annulla"
-
-#: src/usr/bin/diffuse.py.in:7592
-msgid "Redo"
-msgstr "Ripeti"
-
-#: src/usr/bin/diffuse.py.in:7716
-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/usr/bin/diffuse.py.in:7729
-msgid "Tab"
-msgstr "Scheda"
-
-#: src/usr/bin/diffuse.py.in:7734
-msgid "Pane"
-msgstr "Riquadro"
-
-#: src/usr/bin/diffuse.py.in:7745
-msgid "Close _Without Saving"
-msgstr "_Chiudi senza salvare"
-
-#: src/usr/bin/diffuse.py.in:7856
-#, python-format
-msgid "File Merge %d"
-msgstr "Unione file # %d"
-
-#: src/usr/bin/diffuse.py.in:7959
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "Errore nel recupero dei commit per «%s»"
-
-#: src/usr/bin/diffuse.py.in:7990
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "Errore nel recupero delle modifiche per «%s»"
-
-#: src/usr/bin/diffuse.py.in:8022
-msgid "Open File In New Tab"
-msgstr "Apre ilo file in una nuova scheda"
-
-#: src/usr/bin/diffuse.py.in:8038
-msgid "Choose Folder With Modified Files"
-msgstr "Selezionare la cartella con i file modificati"
-
-#: src/usr/bin/diffuse.py.in:8051
-msgid "No modified files found."
-msgstr "Non sono stati trovati file modificati."
-
-#: src/usr/bin/diffuse.py.in:8058
-msgid "Choose Folder With Commit"
-msgstr "Selezionare la cartella con i commit"
-
-#: src/usr/bin/diffuse.py.in:8071
-msgid "No committed files found."
-msgstr "Non sono stati trovati file di cui è stato eseguito il commit."
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "New N-Way File Merge..."
-msgstr "Nuova unione a N file..."
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "Number of panes: "
-msgstr "Numero di riquadri"
-
-#: src/usr/bin/diffuse.py.in:8172
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "Frase non trovata. Continuare dalla fine del file?"
-
-#: src/usr/bin/diffuse.py.in:8174
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "Frase non trovata. Continuare dall'inizio del file?"
-
-#: src/usr/bin/diffuse.py.in:8440
+#: src/main.py:6990
 msgid "Error parsing line number."
 msgstr "Errore nell'analizzare il numero di riga."
 
-#: src/usr/bin/diffuse.py.in:8450
+#: src/main.py:7000
 #, python-format
 msgid "Skipping unknown argument \"%s\"."
 msgstr "L'argomento sconosciuto \"%s\" verrà tralasciato"
 
-#: src/usr/bin/diffuse.py.in:8457
+#: src/main.py:7007
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Errore nell'elaborazione dell'argomento \"%s\". Cartella non attesa."
 
+#: src/vcs/cvs.py:50 src/vcs/rcs.py:54 src/vcs/svn.py:89
+#, python-format
+msgid "Error parsing revision %s."
+msgstr "Eroore analizzando la revisione %s."
+
+#: src/vcs/vcs_registry.py:216
+#, python-format
+msgid "Error parsing %s."
+msgstr "Errore analizzando %s."
+
 #, python-format
 #~ msgid "Column %d"
 #~ msgstr "Colonna %d"
diff --git a/po/ja.po b/po/ja.po
index 137b13b..e440d19 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: 2020-12-08 13:51-0500\n"
+"POT-Creation-Date: 2021-11-18 15:21-0500\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator: Derrick Moser <derrick_moser@yahoo.com>\n"
 "Language-Team: Japanese\n"
@@ -17,19 +17,981 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: data/diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:4
 msgid "Diffuse Merge Tool"
 msgstr "Diffuse マージツール"
 
-#: data/diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:5
 msgid "Graphical tool for merging and comparing text files"
 msgstr "テキストファイルをマージして比較するためのグラフィックツール"
 
-#: src/usr/bin/diffuse.py.in:70
+#: data/io.github.mightycreak.Diffuse.metainfo.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."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:19
+msgid "Main window: diff between two files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:26
+msgid "Patch release to fix a bug when using the Flatpak package."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:29
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:71
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:146
+msgid "Fixed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:31
+msgid "Fixed a Flatpak bug where the app couldn't call binaries on the host, such as `git`, `svn`, etc."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:40
+msgid "With this release, the main end-user change is the new icon. The rest is mainly maintenance improvements with a much more standard folder structure and starting to modularize the code. This is an ongoing effort as there is still a lot to do, but hopefully this would motivate some to contribute ;)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:47
+msgid "An important note though: the application ID has changed and is now io.github.mightycreak.Diffuse."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:51
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:89
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:123
+msgid "Added:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:53
+msgid "New icon and in SVG now"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:54
+msgid "Started to modularize the code"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:56
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:93
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:136
+msgid "Changed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:58
+msgid "Changed AppID to io.github.mightycreak.Diffuse (as advised in the Flatpak documentation)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:62
+msgid "Renamed directory `translations/` to `po/`"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:63
+msgid "Now uses POTFILES.in to list the files to translate"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:64
+msgid "Translation strings are no longer sorted alphabetically, this will help when there will be several files in POTFILES.in"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:68
+msgid "Updated the documentation and script in the `po/` directory"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:69
+msgid "Add .desktop translations in .po files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:73
+msgid "Fixed some GTK deprecation warnings"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:79
+msgid "Mainly under the hood changes in this release, so nothing really visible to the users in this version. That said, I figured it was a long time since the last release (4 months ago) and, as promised, I want Diffuse development to be a bit more active and iterative."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:85
+msgid "Apart from the maintenance changes 🧰, I think the main improvement is that Diffuse will soon be available through Flathub!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:91
+msgid "New Flatpak package, published on Flathub: com.github.mightycreak.Diffuse"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:95
+msgid "Replace old install.py with the more standard Meson"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:96
+msgid "Remove u string prefixes since Python 3 is in UTF-8 by default"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:97
+msgid "Replaced some interpolation operators (%) for the f string prefix"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:98
+msgid "Use the window scale factor for the icons generation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:104
+msgid "Here is the v0.5.0. Unintentionally, this release happens exactly 6 years after the previous v0.4.8 release!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:108
+msgid "There is a lot to do on this application, and some features didn't make the release. The main one being the Windows installers. I think 6 years is too long to continue to wait until this bug is fixed. The Python scripts should work on Windows, but no executable is produced (yet) with the release."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:115
+msgid "Other than that, Diffuse v0.5.0 is now officially compatible with Python 3 and GTK 3! And it is synced to the latest commits from upstream (which were never released)."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:120
+msgid "The next version will not take 6 years, I promise you! 😄"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:125
+msgid "Added Pedro Albuquerque's Portuguese translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:126
+msgid "Added Åke Engelbrektson's Swedish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:127
+msgid "Added Guillaume Hoffmann's Darcs support improvements"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:128
+msgid "Added Akom Chotiphantawanon's Thai translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:129
+msgid "Added support for Git submodules"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:130
+msgid "Added a preference and command line option to specify the version control system search order"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:131
+msgid "Added .editorconfig file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:132
+msgid "Added .gitignore file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:133
+msgid "Added message when removing files during uninstallation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:134
+msgid "Added Python script to update all the translation files at once"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:138
+msgid "Convert to Python 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:139
+msgid "Convert to GTK 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:140
+msgid "Updated Python highlighting for Python 3 grammar"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:141
+msgid "Updated copyrights years and authors"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:142
+msgid "Improve Spanish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:143
+msgid "Convert translation README to MarkDown"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:144
+msgid "Updated all the translation files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:148
+msgid "Fixed wrong icons directory for gtk-update-icon-cache"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:149
+msgid "Fixed missing directories when uninstalling"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:150
+msgid "Fixed bug introduced by r420 with RCS VCS"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:151
+msgid "Fixed broken drag'n'drop since migration to Python3/GTK3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:152
+msgid "Fixed error when using '-m' in an SVN repo"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:157
+msgid "Romain Failliot"
+msgstr ""
+
+#: src/constants.py.in:23
 msgid "Copyright"
 msgstr ""
 
-#: src/usr/bin/diffuse.py.in:81
+#: src/main.py:591
+#, python-format
+msgid "Error processing line %(line)d of %(file)s."
+msgstr "%(file)s の %(line)d行 を処理しているときにエラーが生じました。"
+
+#: src/main.py:610
+msgid "Auto Detect"
+msgstr "自動検出"
+
+#: src/main.py:706
+msgid "Display"
+msgstr "表示"
+
+#: src/main.py:708
+msgid "Font"
+msgstr "フォント"
+
+#: src/main.py:709
+msgid "Tab width"
+msgstr "タブの幅"
+
+#: src/main.py:710
+msgid "Show right margin"
+msgstr "右マージンを表示"
+
+#: src/main.py:711
+msgid "Right margin"
+msgstr "右マージン"
+
+#: src/main.py:712
+msgid "Show line numbers"
+msgstr "行番号を表示"
+
+#: src/main.py:713
+msgid "Show white space characters"
+msgstr "空白文字を表示"
+
+#: src/main.py:714
+msgid "Ignore case differences"
+msgstr "大文字小文字の違いを無視"
+
+#: src/main.py:715
+msgid "Ignore white space differences"
+msgstr "空白の違いを無視"
+
+#: src/main.py:716 src/main.py:724
+msgid "Ignore changes to white space"
+msgstr "空白の変更を無視"
+
+#: src/main.py:717
+msgid "Ignore blank line differences"
+msgstr "空白行の違いを無視"
+
+#: src/main.py:718
+msgid "Ignore end of line differences"
+msgstr "行の最後の違いを無視"
+
+#: src/main.py:720
+msgid "Alignment"
+msgstr "整列"
+
+#: src/main.py:722
+msgid "Ignore case"
+msgstr "大文字小文字を無視"
+
+#: src/main.py:723
+msgid "Ignore white space"
+msgstr "空白を無視"
+
+#: src/main.py:725
+msgid "Ignore blank lines"
+msgstr "空白行を無視"
+
+#: src/main.py:726
+msgid "Ignore end of line characters"
+msgstr "行の最後の文字を無視"
+
+#: src/main.py:728
+msgid "Editor"
+msgstr "エディタ"
+
+#: src/main.py:730
+msgid "Auto indent"
+msgstr "自動インデント"
+
+#: src/main.py:731
+msgid "Expand tabs to spaces"
+msgstr "タブの代わりに空白を挿入"
+
+#: src/main.py:732
+msgid "Soft tab width"
+msgstr "ソフトタブの幅"
+
+#: src/main.py:734
+msgid "Tabs"
+msgstr "タブ"
+
+#: src/main.py:736
+msgid "Default panes"
+msgstr "枠のデフォルトの数"
+
+#: src/main.py:737
+msgid "Always show the tab bar"
+msgstr "常にタブバーを表示"
+
+#: src/main.py:738
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "タブを閉じるとき、%s を終了すると警告"
+
+#: src/main.py:740
+msgid "Regional Settings"
+msgstr "地域設定"
+
+#: src/main.py:742
+msgid "Default codec"
+msgstr "デフォルトのコーデック"
+
+#: src/main.py:743
+msgid "Order of codecs used to identify encoding"
+msgstr "エンコーディングを特定するためのコーデックの優先順位"
+
+#: src/main.py:763
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/main.py:765
+msgid "Root directory"
+msgstr "ルートディレクトリ"
+
+#: src/main.py:766
+msgid "Cygdrive prefix"
+msgstr "Cygdrive 接頭辞"
+
+#: src/main.py:782
+msgid "Version control system search order"
+msgstr ""
+
+#: src/main.py:788
+msgid "\"co\" command"
+msgstr "co というコマンド"
+
+#: src/main.py:789
+msgid "\"rlog\" command"
+msgstr "rlog というコマンド"
+
+#: src/main.py:791
+msgid "Command"
+msgstr "コマンド"
+
+#: src/main.py:793
+msgid "Launch from a Bash login shell"
+msgstr "Bashログインシェルから始める"
+
+#: src/main.py:795
+msgid "Update paths for Cygwin"
+msgstr "Cygwin のためにパスを更新"
+
+#: src/main.py:799
+msgid "Version Control"
+msgstr "バージョンコントロール"
+
+#: src/main.py:863
+msgid "Preferences"
+msgstr "設定"
+
+#: src/main.py:904 src/main.py:5802
+#, python-format
+msgid "Error writing %s."
+msgstr "%s へ書き込む際にエラーが生じました。"
+
+#: src/main.py:3282
+msgid "Align with Selection"
+msgstr "選択と整列"
+
+#: src/main.py:3283
+msgid "Isolate"
+msgstr "分離"
+
+#: src/main.py:3284
+msgid "Merge Selection"
+msgstr "選択をマージ"
+
+#: src/main.py:3286 src/main.py:6098
+msgid "Cut"
+msgstr "切り取り"
+
+#: src/main.py:3287 src/main.py:6099
+msgid "Copy"
+msgstr "コピー"
+
+#: src/main.py:3288 src/main.py:6100
+msgid "Paste"
+msgstr "貼り付け"
+
+#: src/main.py:3290
+msgid "Select All"
+msgstr "全て選択"
+
+#: src/main.py:3291 src/main.py:6101
+msgid "Clear Edits"
+msgstr "編集をクリア"
+
+#: src/main.py:3293
+msgid "Swap with Selected Pane"
+msgstr "選択された枠と交換"
+
+#: src/main.py:5124
+msgid "Find..."
+msgstr "検索..."
+
+#: src/main.py:5132
+msgid "Search For: "
+msgstr "検索する文字列: "
+
+#: src/main.py:5157
+msgid "Match Case"
+msgstr "大文字/小文字を区別"
+
+#: src/main.py:5162
+msgid "Search Backwards"
+msgstr "先頭に向かって検索"
+
+#: src/main.py:5176
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "このタブを閉じると、%sは終了します。"
+
+#: src/main.py:5198
+msgid "Encoding: "
+msgstr "エンコーディング: "
+
+#: src/main.py:5208
+msgid "Revision: "
+msgstr "リビジョン: "
+
+#: src/main.py:5272
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr "Diffuse は、テキストファイルをマージして比較するためのグラフィックツールです。"
+
+#: src/main.py:5277
+msgid "translator-credits"
+msgstr "Derrick Moser <derrick_moser@yahoo.com>"
+
+#: src/main.py:5281
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"このプログラムはフリーソフトウェアです。あなたはこれを、フリーソフトウェア財団によって発行された GNU 一般公衆利用許諾契約書(バージョン2か、希望によってはそれ以降のバージョンのうちどれか)の定める条件の下で再頒布または改変することができます。\n"
+"\n"
+"このプログラムは有用であることを願って頒布されますが、*全くの無保証*です。商業可能性の保証や特定の目的への適合性は、言外に示されたものも含め全く存在しません。詳しくはGNU 一般公衆利用許諾契約書をご覧ください。\n"
+"\n"
+"あなたはこのプログラムと共に、GNU 一般公衆利用許諾契約書の複製物を一部受け取ったはずです。もし受け取っていなければ、フリーソフトウェア財団まで請求してください(宛先は the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA)。\n"
+
+#: src/main.py:5322
+msgid "Close Tab"
+msgstr "タブを閉じる"
+
+#: src/main.py:5377
+msgid "Open File..."
+msgstr "ファイルを開く..."
+
+#: src/main.py:5378
+msgid "Reload File"
+msgstr "ファイルを再読込み"
+
+#: src/main.py:5379
+msgid "Save File"
+msgstr "ファイルを保存"
+
+#: src/main.py:5380
+msgid "Save File As..."
+msgstr "ファイルとして保存..."
+
+#: src/main.py:5525
+msgid "Save changes before loading the new file?"
+msgstr "新しいファイルをロードする前に、変更したデータを保存しますか？"
+
+#: src/main.py:5635
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "%(file)s の %(rev)s というリビジョンを読み込む際にエラーが生じました。"
+
+#: src/main.py:5637 src/main.py:6900
+#, python-format
+msgid "Error reading %s."
+msgstr "%s を読み込む際にエラーが生じました。"
+
+#: src/main.py:5658
+msgid "Open File"
+msgstr "ファイルを開く"
+
+#: src/main.py:5708
+#, python-format
+msgid "The file %s changed on disk.  Do you want to reload the file?"
+msgstr "ファイル %s が変更されたようです。 そのファイルを再読み込みしますか？"
+
+#: src/main.py:5728
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "%(title)s の%(pane)d番目の枠を保存"
+
+#: src/main.py:5754
+#, python-format
+msgid "A file named %s already exists.  Do you want to overwrite it?"
+msgstr "%s というファイルは既に存在しています。それを上書きしますか？"
+
+#: src/main.py:5759
+#, 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/main.py:5800
+#, python-format
+msgid "Error encoding to %s."
+msgstr "%s に変える際にエラーが生じました。"
+
+#: src/main.py:5830
+msgid "Go To Line..."
+msgstr "指定行へジャンプ..."
+
+#: src/main.py:5830
+msgid "Line Number: "
+msgstr "行番号: "
+
+#: src/main.py:5856
+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/main.py:5858
+msgid "Press the escape key to finish editing."
+msgstr "ESCキーを押して、編集を終了します。"
+
+#: src/main.py:5860
+msgid "Select target line and press the space bar to align.  Press the escape key to cancel."
+msgstr "目標行を選択してスペースバーを押すと整列します。取り消す場合は、ESCキーを押します。"
+
+#: src/main.py:5971
+msgid "_File"
+msgstr "ファイル(_F)"
+
+#: src/main.py:5972
+msgid "_Open File..."
+msgstr "ファイルを開く...(_O)"
+
+#: src/main.py:5973
+msgid "Open File In New _Tab..."
+msgstr "新しいタブにファイルを開く...(_T)"
+
+#: src/main.py:5974
+msgid "Open _Modified Files..."
+msgstr "変更のあるファイルを開く...(_M)"
+
+#: src/main.py:5975
+msgid "Open Commi_t..."
+msgstr "コミットを開く...(_T)"
+
+#: src/main.py:5976
+msgid "_Reload File"
+msgstr "ファイルの再読込み(_R)"
+
+#: src/main.py:5978
+msgid "_Save File"
+msgstr "ファイルを保存(_S)"
+
+#: src/main.py:5979
+msgid "Save File _As..."
+msgstr "ファイルとして保存...(_A)"
+
+#: src/main.py:5980
+msgid "Save A_ll"
+msgstr "全て保存(_L)"
+
+#: src/main.py:5982
+msgid "New _2-Way File Merge"
+msgstr "新しい２つのファイルの比較(_2)"
+
+#: src/main.py:5983
+msgid "New _3-Way File Merge"
+msgstr "新しい３つのファイルの比較(_3)"
+
+#: src/main.py:5984
+msgid "New _N-Way File Merge..."
+msgstr "新しい複数のファイルの比較...(_N)"
+
+#: src/main.py:5986
+msgid "_Close Tab"
+msgstr "タブを閉じる(_C)"
+
+#: src/main.py:5987
+msgid "_Undo Close Tab"
+msgstr "閉じたタブを元に戻す(_U)"
+
+#: src/main.py:5988
+msgid "_Quit"
+msgstr "終了(_Q)"
+
+#: src/main.py:5990
+msgid "_Edit"
+msgstr "編集(_E)"
+
+#: src/main.py:5991
+msgid "_Undo"
+msgstr "元に戻す(_U)"
+
+#: src/main.py:5992
+msgid "_Redo"
+msgstr "やり直す(_R)"
+
+#: src/main.py:5994
+msgid "Cu_t"
+msgstr "切り取り(_T)"
+
+#: src/main.py:5995
+msgid "_Copy"
+msgstr "コピー(_C)"
+
+#: src/main.py:5996
+msgid "_Paste"
+msgstr "貼り付け(_P)"
+
+#: src/main.py:5998
+msgid "Select _All"
+msgstr "全て選択(_A)"
+
+#: src/main.py:5999
+msgid "C_lear Edits"
+msgstr "編集をクリア(_L)"
+
+#: src/main.py:6000
+msgid "_Dismiss All Edits"
+msgstr "全ての編集を破棄(_D)"
+
+#: src/main.py:6002
+msgid "_Find..."
+msgstr "検索...(_F)"
+
+#: src/main.py:6003
+msgid "Find _Next"
+msgstr "次の検索(_N)"
+
+#: src/main.py:6004
+msgid "Find Pre_vious"
+msgstr "前の検索(_V)"
+
+#: src/main.py:6005
+msgid "_Go To Line..."
+msgstr "指定行へジャンプ...(_G)"
+
+#: src/main.py:6007
+msgid "Pr_eferences..."
+msgstr "設定...(_E)"
+
+#: src/main.py:6009
+msgid "None"
+msgstr "なし"
+
+#: src/main.py:6017
+msgid "_View"
+msgstr "表示(_V)"
+
+#: src/main.py:6018
+msgid "_Syntax Highlighting"
+msgstr "構文の強調表示(_S)"
+
+#: src/main.py:6020
+msgid "Re_align All"
+msgstr "全て再整列(_A)"
+
+#: src/main.py:6021
+msgid "_Isolate"
+msgstr "分離(_I)"
+
+#: src/main.py:6023
+msgid "_First Difference"
+msgstr "最初の差分(_F)"
+
+#: src/main.py:6024
+msgid "_Previous Difference"
+msgstr "前の差分(_P)"
+
+#: src/main.py:6025
+msgid "_Next Difference"
+msgstr "次の差分(_N)"
+
+#: src/main.py:6026
+msgid "_Last Difference"
+msgstr "最後の差分(_L)"
+
+#: src/main.py:6028
+msgid "Fir_st Tab"
+msgstr "最初のタブ(_S)"
+
+#: src/main.py:6029
+msgid "Pre_vious Tab"
+msgstr "前のタブ(_V)"
+
+#: src/main.py:6030
+msgid "Next _Tab"
+msgstr "次のタブ(_T)"
+
+#: src/main.py:6031
+msgid "Las_t Tab"
+msgstr "最後のタブ(_T)"
+
+#: src/main.py:6033
+msgid "Shift Pane _Right"
+msgstr "枠を右に動かす(_R)"
+
+#: src/main.py:6034
+msgid "Shift Pane _Left"
+msgstr "枠を左に動かす(_L)"
+
+#: src/main.py:6036
+msgid "F_ormat"
+msgstr "フォーマット(_O)"
+
+#: src/main.py:6037
+msgid "Convert To _Upper Case"
+msgstr "大文字に変換(_U)"
+
+#: src/main.py:6038
+msgid "Convert To _Lower Case"
+msgstr "小文字に変換(_L)"
+
+#: src/main.py:6040
+msgid "Sort Lines In _Ascending Order"
+msgstr "行を昇順に並べる(_A)"
+
+#: src/main.py:6041
+msgid "Sort Lines In D_escending Order"
+msgstr "行を降順に並べる(_E)"
+
+#: src/main.py:6043
+msgid "Remove Trailing _White Space"
+msgstr "末尾の空白を削除(_W)"
+
+#: src/main.py:6044
+msgid "Convert Tabs To _Spaces"
+msgstr "タブをスペースに変換(_S)"
+
+#: src/main.py:6045
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "先頭のスペースをタブに変換(_T)"
+
+#: src/main.py:6047
+msgid "_Increase Indenting"
+msgstr "インデントを増やす(_I)"
+
+#: src/main.py:6048
+msgid "De_crease Indenting"
+msgstr "インデントを減らす(_C)"
+
+#: src/main.py:6050
+msgid "Convert To _DOS Format"
+msgstr "DOS 形式に変換(_D)"
+
+#: src/main.py:6051
+msgid "Convert To _Mac Format"
+msgstr "Mac 形式に変換(_M)"
+
+#: src/main.py:6052
+msgid "Convert To Uni_x Format"
+msgstr "Unix 形式に変換(_X)"
+
+#: src/main.py:6054
+msgid "_Merge"
+msgstr "マージ(_M)"
+
+#: src/main.py:6055
+msgid "Copy Selection _Right"
+msgstr "選択を右にコピー(_R)"
+
+#: src/main.py:6056
+msgid "Copy Selection _Left"
+msgstr "選択を左にコピー(_L)"
+
+#: src/main.py:6058
+msgid "Copy Left _Into Selection"
+msgstr "左から選択枠にコピー(_I)"
+
+#: src/main.py:6059
+msgid "Copy Right I_nto Selection"
+msgstr "右から選択枠にコピー(_N)"
+
+#: src/main.py:6060
+msgid "_Merge From Left Then Right"
+msgstr "左からマージした後、右からマージ(_M)"
+
+#: src/main.py:6061
+msgid "M_erge From Right Then Left"
+msgstr "右からマージした後、左からマージ(_E)"
+
+#: src/main.py:6063
+msgid "_Help"
+msgstr "ヘルプ(_H)"
+
+#: src/main.py:6064
+msgid "_Help Contents..."
+msgstr "ヘルプの目次...(_H)"
+
+#: src/main.py:6066
+#, python-format
+msgid "_About %s..."
+msgstr "%s について...(_A)"
+
+#: src/main.py:6080
+msgid "New 2-Way File Merge"
+msgstr "新しい２つのファイルの比較"
+
+#: src/main.py:6081
+msgid "New 3-Way File Merge"
+msgstr "新しい３つのファイルの比較"
+
+#: src/main.py:6083
+msgid "Realign All"
+msgstr "全て再整列"
+
+#: src/main.py:6084
+msgid "First Difference"
+msgstr "最初の差分"
+
+#: src/main.py:6085
+msgid "Previous Difference"
+msgstr "前の差分"
+
+#: src/main.py:6086
+msgid "Next Difference"
+msgstr "次の差分"
+
+#: src/main.py:6087
+msgid "Last Difference"
+msgstr "最後の差分"
+
+#: src/main.py:6089
+msgid "Copy Selection Right"
+msgstr "選択を右にコピー"
+
+#: src/main.py:6090
+msgid "Copy Selection Left"
+msgstr "選択を左にコピー"
+
+#: src/main.py:6091
+msgid "Copy Left Into Selection"
+msgstr "左から選択枠にコピー"
+
+#: src/main.py:6092
+msgid "Copy Right Into Selection"
+msgstr "右から選択枠にコピー"
+
+#: src/main.py:6093
+msgid "Merge From Left Then Right"
+msgstr "左からマージした後、右からマージ"
+
+#: src/main.py:6094
+msgid "Merge From Right Then Left"
+msgstr "右からマージした後、左からマージ"
+
+#: src/main.py:6096
+msgid "Undo"
+msgstr "元に戻す"
+
+#: src/main.py:6097
+msgid "Redo"
+msgstr "やり直す"
+
+#: src/main.py:6221
+msgid "Some files have unsaved changes.  Select the files to save before closing."
+msgstr "変更が保存されていないファイルがあります。終了前に保存するファイルを選択します。"
+
+#: src/main.py:6234
+msgid "Tab"
+msgstr "タブ"
+
+#: src/main.py:6239
+msgid "Pane"
+msgstr "枠"
+
+#: src/main.py:6250
+msgid "Close _Without Saving"
+msgstr "保存せずに閉じる(_W)"
+
+#: src/main.py:6361
+#, python-format
+msgid "File Merge %d"
+msgstr "ファイルマージ%d"
+
+#: src/main.py:6464
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "%s のコミットの取得中にエラーが生じました。"
+
+#: src/main.py:6493
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "%s の変更の取得中にエラーが生じました。"
+
+#: src/main.py:6523
+msgid "Open File In New Tab"
+msgstr "新しいタブにファイルを開く"
+
+#: src/main.py:6539
+msgid "Choose Folder With Modified Files"
+msgstr "変更なったファイルがあるフォルダを選択"
+
+#: src/main.py:6552
+msgid "No modified files found."
+msgstr "変更なったファイルが見つかりませんでした。"
+
+#: src/main.py:6557
+msgid "Choose Folder With Commit"
+msgstr "コミットがあるフォルダを選択"
+
+#: src/main.py:6570
+msgid "No committed files found."
+msgstr "コミットされたファイルが見つかりませんでした。"
+
+#: src/main.py:6604
+msgid "New N-Way File Merge..."
+msgstr "新しい複数のファイルの比較..."
+
+#: src/main.py:6604
+msgid "Number of panes: "
+msgstr "枠の数: "
+
+#: src/main.py:6669
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "文字列が見つかりませんでした。ファイルの終わりから続けますか。"
+
+#: src/main.py:6671
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "文字列が見つかりませんでした。ファイルの始めから続けますか。"
+
+#: src/main.py:6819
 msgid ""
 "Usage:\n"
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
@@ -107,768 +1069,30 @@ msgstr ""
 "  ( -i | --ignore-case )           大文字小文字の違いを無視\n"
 "  ( -w | --ignore-all-space )      空白の違いを無視"
 
-#: src/usr/bin/diffuse.py.in:716
-#, python-format
-msgid "Error processing line %(line)d of %(file)s."
-msgstr "%(file)s の %(line)d行 を処理しているときにエラーが生じました。"
-
-#: src/usr/bin/diffuse.py.in:735
-msgid "Auto Detect"
-msgstr "自動検出"
-
-#: src/usr/bin/diffuse.py.in:831
-msgid "Display"
-msgstr "表示"
-
-#: src/usr/bin/diffuse.py.in:833
-msgid "Font"
-msgstr "フォント"
-
-#: src/usr/bin/diffuse.py.in:834
-msgid "Tab width"
-msgstr "タブの幅"
-
-#: src/usr/bin/diffuse.py.in:835
-msgid "Show right margin"
-msgstr "右マージンを表示"
-
-#: src/usr/bin/diffuse.py.in:836
-msgid "Right margin"
-msgstr "右マージン"
-
-#: src/usr/bin/diffuse.py.in:837
-msgid "Show line numbers"
-msgstr "行番号を表示"
-
-#: src/usr/bin/diffuse.py.in:838
-msgid "Show white space characters"
-msgstr "空白文字を表示"
-
-#: src/usr/bin/diffuse.py.in:839
-msgid "Ignore case differences"
-msgstr "大文字小文字の違いを無視"
-
-#: src/usr/bin/diffuse.py.in:840
-msgid "Ignore white space differences"
-msgstr "空白の違いを無視"
-
-#: src/usr/bin/diffuse.py.in:841 src/usr/bin/diffuse.py.in:849
-msgid "Ignore changes to white space"
-msgstr "空白の変更を無視"
-
-#: src/usr/bin/diffuse.py.in:842
-msgid "Ignore blank line differences"
-msgstr "空白行の違いを無視"
-
-#: src/usr/bin/diffuse.py.in:843
-msgid "Ignore end of line differences"
-msgstr "行の最後の違いを無視"
-
-#: src/usr/bin/diffuse.py.in:845
-msgid "Alignment"
-msgstr "整列"
-
-#: src/usr/bin/diffuse.py.in:847
-msgid "Ignore case"
-msgstr "大文字小文字を無視"
-
-#: src/usr/bin/diffuse.py.in:848
-msgid "Ignore white space"
-msgstr "空白を無視"
-
-#: src/usr/bin/diffuse.py.in:850
-msgid "Ignore blank lines"
-msgstr "空白行を無視"
-
-#: src/usr/bin/diffuse.py.in:851
-msgid "Ignore end of line characters"
-msgstr "行の最後の文字を無視"
-
-#: src/usr/bin/diffuse.py.in:853
-msgid "Editor"
-msgstr "エディタ"
-
-#: src/usr/bin/diffuse.py.in:855
-msgid "Auto indent"
-msgstr "自動インデント"
-
-#: src/usr/bin/diffuse.py.in:856
-msgid "Expand tabs to spaces"
-msgstr "タブの代わりに空白を挿入"
-
-#: src/usr/bin/diffuse.py.in:857
-msgid "Soft tab width"
-msgstr "ソフトタブの幅"
-
-#: src/usr/bin/diffuse.py.in:859
-msgid "Tabs"
-msgstr "タブ"
-
-#: src/usr/bin/diffuse.py.in:861
-msgid "Default panes"
-msgstr "枠のデフォルトの数"
-
-#: src/usr/bin/diffuse.py.in:862
-msgid "Always show the tab bar"
-msgstr "常にタブバーを表示"
-
-#: src/usr/bin/diffuse.py.in:863
-#, python-format
-msgid "Warn me when closing a tab will quit %s"
-msgstr "タブを閉じるとき、%s を終了すると警告"
-
-#: src/usr/bin/diffuse.py.in:865
-msgid "Regional Settings"
-msgstr "地域設定"
-
-#: src/usr/bin/diffuse.py.in:867
-msgid "Default codec"
-msgstr "デフォルトのコーデック"
-
-#: src/usr/bin/diffuse.py.in:868
-msgid "Order of codecs used to identify encoding"
-msgstr "エンコーディングを特定するためのコーデックの優先順位"
-
-#: src/usr/bin/diffuse.py.in:888
-msgid "Cygwin"
-msgstr "Cygwin"
-
-#: src/usr/bin/diffuse.py.in:890
-msgid "Root directory"
-msgstr "ルートディレクトリ"
-
-#: src/usr/bin/diffuse.py.in:891
-msgid "Cygdrive prefix"
-msgstr "Cygdrive 接頭辞"
-
-#: src/usr/bin/diffuse.py.in:907
-msgid "Version control system search order"
-msgstr ""
-
-#: src/usr/bin/diffuse.py.in:913
-msgid "\"co\" command"
-msgstr "co というコマンド"
-
-#: src/usr/bin/diffuse.py.in:914
-msgid "\"rlog\" command"
-msgstr "rlog というコマンド"
-
-#: src/usr/bin/diffuse.py.in:916
-msgid "Command"
-msgstr "コマンド"
-
-#: src/usr/bin/diffuse.py.in:918
-msgid "Launch from a Bash login shell"
-msgstr "Bashログインシェルから始める"
-
-#: src/usr/bin/diffuse.py.in:920
-msgid "Update paths for Cygwin"
-msgstr "Cygwin のためにパスを更新"
-
-#: src/usr/bin/diffuse.py.in:924
-msgid "Version Control"
-msgstr "バージョンコントロール"
-
-#: src/usr/bin/diffuse.py.in:988
-msgid "Preferences"
-msgstr "設定"
-
-#: src/usr/bin/diffuse.py.in:1029 src/usr/bin/diffuse.py.in:7295
-#, python-format
-msgid "Error writing %s."
-msgstr "%s へ書き込む際にエラーが生じました。"
-
-#: src/usr/bin/diffuse.py.in:1656 src/usr/bin/diffuse.py.in:2273
-#: src/usr/bin/diffuse.py.in:2417
-#, python-format
-msgid "Error parsing revision %s."
-msgstr "%s というリビジョンをパースする際にエラーが生じました。"
-
-#: src/usr/bin/diffuse.py.in:2658
-#, python-format
-msgid "Error parsing %s."
-msgstr "%s をパースする際にエラーが生じました。"
-
-#: src/usr/bin/diffuse.py.in:4778
-msgid "Align with Selection"
-msgstr "選択と整列"
-
-#: src/usr/bin/diffuse.py.in:4779
-msgid "Isolate"
-msgstr "分離"
-
-#: src/usr/bin/diffuse.py.in:4780
-msgid "Merge Selection"
-msgstr "選択をマージ"
-
-#: src/usr/bin/diffuse.py.in:4782 src/usr/bin/diffuse.py.in:7593
-msgid "Cut"
-msgstr "切り取り"
-
-#: src/usr/bin/diffuse.py.in:4783 src/usr/bin/diffuse.py.in:7594
-msgid "Copy"
-msgstr "コピー"
-
-#: src/usr/bin/diffuse.py.in:4784 src/usr/bin/diffuse.py.in:7595
-msgid "Paste"
-msgstr "貼り付け"
-
-#: src/usr/bin/diffuse.py.in:4786
-msgid "Select All"
-msgstr "全て選択"
-
-#: src/usr/bin/diffuse.py.in:4787 src/usr/bin/diffuse.py.in:7596
-msgid "Clear Edits"
-msgstr "編集をクリア"
-
-#: src/usr/bin/diffuse.py.in:4789
-msgid "Swap with Selected Pane"
-msgstr "選択された枠と交換"
-
-#: src/usr/bin/diffuse.py.in:6620
-msgid "Find..."
-msgstr "検索..."
-
-#: src/usr/bin/diffuse.py.in:6628
-msgid "Search For: "
-msgstr "検索する文字列: "
-
-#: src/usr/bin/diffuse.py.in:6653
-msgid "Match Case"
-msgstr "大文字/小文字を区別"
-
-#: src/usr/bin/diffuse.py.in:6658
-msgid "Search Backwards"
-msgstr "先頭に向かって検索"
-
-#: src/usr/bin/diffuse.py.in:6672
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "このタブを閉じると、%sは終了します。"
-
-#: src/usr/bin/diffuse.py.in:6694
-msgid "Encoding: "
-msgstr "エンコーディング: "
-
-#: src/usr/bin/diffuse.py.in:6704
-msgid "Revision: "
-msgstr "リビジョン: "
-
-#: src/usr/bin/diffuse.py.in:6768
-msgid "Diffuse is a graphical tool for merging and comparing text files."
-msgstr "Diffuse は、テキストファイルをマージして比較するためのグラフィックツールです。"
-
-#: src/usr/bin/diffuse.py.in:6773
-msgid "translator-credits"
-msgstr "Derrick Moser <derrick_moser@yahoo.com>"
-
-#: src/usr/bin/diffuse.py.in:6776
-msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program.  You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
-"このプログラムはフリーソフトウェアです。あなたはこれを、フリーソフトウェア財団によって発行された GNU 一般公衆利用許諾契約書(バージョン2か、希望によってはそれ以降のバージョンのうちどれか)の定める条件の下で再頒布または改変することができます。\n"
-"\n"
-"このプログラムは有用であることを願って頒布されますが、*全くの無保証*です。商業可能性の保証や特定の目的への適合性は、言外に示されたものも含め全く存在しません。詳しくはGNU 一般公衆利用許諾契約書をご覧ください。\n"
-"\n"
-"あなたはこのプログラムと共に、GNU 一般公衆利用許諾契約書の複製物を一部受け取ったはずです。もし受け取っていなければ、フリーソフトウェア財団まで請求してください(宛先は the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA)。\n"
-
-#: src/usr/bin/diffuse.py.in:6811
-msgid "Close Tab"
-msgstr "タブを閉じる"
-
-#: src/usr/bin/diffuse.py.in:6866
-msgid "Open File..."
-msgstr "ファイルを開く..."
-
-#: src/usr/bin/diffuse.py.in:6867
-msgid "Reload File"
-msgstr "ファイルを再読込み"
-
-#: src/usr/bin/diffuse.py.in:6868
-msgid "Save File"
-msgstr "ファイルを保存"
-
-#: src/usr/bin/diffuse.py.in:6869
-msgid "Save File As..."
-msgstr "ファイルとして保存..."
-
-#: src/usr/bin/diffuse.py.in:7014
-msgid "Save changes before loading the new file?"
-msgstr "新しいファイルをロードする前に、変更したデータを保存しますか？"
-
-#: src/usr/bin/diffuse.py.in:7124
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "%(file)s の %(rev)s というリビジョンを読み込む際にエラーが生じました。"
-
-#: src/usr/bin/diffuse.py.in:7126 src/usr/bin/diffuse.py.in:8359
-#, python-format
-msgid "Error reading %s."
-msgstr "%s を読み込む際にエラーが生じました。"
-
-#: src/usr/bin/diffuse.py.in:7149
-msgid "Open File"
-msgstr "ファイルを開く"
-
-#: src/usr/bin/diffuse.py.in:7199
-#, python-format
-msgid "The file %s changed on disk.  Do you want to reload the file?"
-msgstr "ファイル %s が変更されたようです。 そのファイルを再読み込みしますか？"
-
-#: src/usr/bin/diffuse.py.in:7219
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "%(title)s の%(pane)d番目の枠を保存"
-
-#: src/usr/bin/diffuse.py.in:7245
-#, python-format
-msgid "A file named %s already exists.  Do you want to overwrite it?"
-msgstr "%s というファイルは既に存在しています。それを上書きしますか？"
-
-#: src/usr/bin/diffuse.py.in:7250
-#, 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/usr/bin/diffuse.py.in:7291
-#, python-format
-msgid "Error encoding to %s."
-msgstr "%s に変える際にエラーが生じました。"
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Go To Line..."
-msgstr "指定行へジャンプ..."
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Line Number: "
-msgstr "行番号: "
-
-#: src/usr/bin/diffuse.py.in:7351
-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/usr/bin/diffuse.py.in:7353
-msgid "Press the escape key to finish editing."
-msgstr "ESCキーを押して、編集を終了します。"
-
-#: src/usr/bin/diffuse.py.in:7355
-msgid "Select target line and press the space bar to align.  Press the escape key to cancel."
-msgstr "目標行を選択してスペースバーを押すと整列します。取り消す場合は、ESCキーを押します。"
-
-#: src/usr/bin/diffuse.py.in:7466
-msgid "_File"
-msgstr "ファイル(_F)"
-
-#: src/usr/bin/diffuse.py.in:7467
-msgid "_Open File..."
-msgstr "ファイルを開く...(_O)"
-
-#: src/usr/bin/diffuse.py.in:7468
-msgid "Open File In New _Tab..."
-msgstr "新しいタブにファイルを開く...(_T)"
-
-#: src/usr/bin/diffuse.py.in:7469
-msgid "Open _Modified Files..."
-msgstr "変更のあるファイルを開く...(_M)"
-
-#: src/usr/bin/diffuse.py.in:7470
-msgid "Open Commi_t..."
-msgstr "コミットを開く...(_T)"
-
-#: src/usr/bin/diffuse.py.in:7471
-msgid "_Reload File"
-msgstr "ファイルの再読込み(_R)"
-
-#: src/usr/bin/diffuse.py.in:7473
-msgid "_Save File"
-msgstr "ファイルを保存(_S)"
-
-#: src/usr/bin/diffuse.py.in:7474
-msgid "Save File _As..."
-msgstr "ファイルとして保存...(_A)"
-
-#: src/usr/bin/diffuse.py.in:7475
-msgid "Save A_ll"
-msgstr "全て保存(_L)"
-
-#: src/usr/bin/diffuse.py.in:7477
-msgid "New _2-Way File Merge"
-msgstr "新しい２つのファイルの比較(_2)"
-
-#: src/usr/bin/diffuse.py.in:7478
-msgid "New _3-Way File Merge"
-msgstr "新しい３つのファイルの比較(_3)"
-
-#: src/usr/bin/diffuse.py.in:7479
-msgid "New _N-Way File Merge..."
-msgstr "新しい複数のファイルの比較...(_N)"
-
-#: src/usr/bin/diffuse.py.in:7481
-msgid "_Close Tab"
-msgstr "タブを閉じる(_C)"
-
-#: src/usr/bin/diffuse.py.in:7482
-msgid "_Undo Close Tab"
-msgstr "閉じたタブを元に戻す(_U)"
-
-#: src/usr/bin/diffuse.py.in:7483
-msgid "_Quit"
-msgstr "終了(_Q)"
-
-#: src/usr/bin/diffuse.py.in:7485
-msgid "_Edit"
-msgstr "編集(_E)"
-
-#: src/usr/bin/diffuse.py.in:7486
-msgid "_Undo"
-msgstr "元に戻す(_U)"
-
-#: src/usr/bin/diffuse.py.in:7487
-msgid "_Redo"
-msgstr "やり直す(_R)"
-
-#: src/usr/bin/diffuse.py.in:7489
-msgid "Cu_t"
-msgstr "切り取り(_T)"
-
-#: src/usr/bin/diffuse.py.in:7490
-msgid "_Copy"
-msgstr "コピー(_C)"
-
-#: src/usr/bin/diffuse.py.in:7491
-msgid "_Paste"
-msgstr "貼り付け(_P)"
-
-#: src/usr/bin/diffuse.py.in:7493
-msgid "Select _All"
-msgstr "全て選択(_A)"
-
-#: src/usr/bin/diffuse.py.in:7494
-msgid "C_lear Edits"
-msgstr "編集をクリア(_L)"
-
-#: src/usr/bin/diffuse.py.in:7495
-msgid "_Dismiss All Edits"
-msgstr "全ての編集を破棄(_D)"
-
-#: src/usr/bin/diffuse.py.in:7497
-msgid "_Find..."
-msgstr "検索...(_F)"
-
-#: src/usr/bin/diffuse.py.in:7498
-msgid "Find _Next"
-msgstr "次の検索(_N)"
-
-#: src/usr/bin/diffuse.py.in:7499
-msgid "Find Pre_vious"
-msgstr "前の検索(_V)"
-
-#: src/usr/bin/diffuse.py.in:7500
-msgid "_Go To Line..."
-msgstr "指定行へジャンプ...(_G)"
-
-#: src/usr/bin/diffuse.py.in:7502
-msgid "Pr_eferences..."
-msgstr "設定...(_E)"
-
-#: src/usr/bin/diffuse.py.in:7504
-msgid "None"
-msgstr "なし"
-
-#: src/usr/bin/diffuse.py.in:7512
-msgid "_View"
-msgstr "表示(_V)"
-
-#: src/usr/bin/diffuse.py.in:7513
-msgid "_Syntax Highlighting"
-msgstr "構文の強調表示(_S)"
-
-#: src/usr/bin/diffuse.py.in:7515
-msgid "Re_align All"
-msgstr "全て再整列(_A)"
-
-#: src/usr/bin/diffuse.py.in:7516
-msgid "_Isolate"
-msgstr "分離(_I)"
-
-#: src/usr/bin/diffuse.py.in:7518
-msgid "_First Difference"
-msgstr "最初の差分(_F)"
-
-#: src/usr/bin/diffuse.py.in:7519
-msgid "_Previous Difference"
-msgstr "前の差分(_P)"
-
-#: src/usr/bin/diffuse.py.in:7520
-msgid "_Next Difference"
-msgstr "次の差分(_N)"
-
-#: src/usr/bin/diffuse.py.in:7521
-msgid "_Last Difference"
-msgstr "最後の差分(_L)"
-
-#: src/usr/bin/diffuse.py.in:7523
-msgid "Fir_st Tab"
-msgstr "最初のタブ(_S)"
-
-#: src/usr/bin/diffuse.py.in:7524
-msgid "Pre_vious Tab"
-msgstr "前のタブ(_V)"
-
-#: src/usr/bin/diffuse.py.in:7525
-msgid "Next _Tab"
-msgstr "次のタブ(_T)"
-
-#: src/usr/bin/diffuse.py.in:7526
-msgid "Las_t Tab"
-msgstr "最後のタブ(_T)"
-
-#: src/usr/bin/diffuse.py.in:7528
-msgid "Shift Pane _Right"
-msgstr "枠を右に動かす(_R)"
-
-#: src/usr/bin/diffuse.py.in:7529
-msgid "Shift Pane _Left"
-msgstr "枠を左に動かす(_L)"
-
-#: src/usr/bin/diffuse.py.in:7531
-msgid "F_ormat"
-msgstr "フォーマット(_O)"
-
-#: src/usr/bin/diffuse.py.in:7532
-msgid "Convert To _Upper Case"
-msgstr "大文字に変換(_U)"
-
-#: src/usr/bin/diffuse.py.in:7533
-msgid "Convert To _Lower Case"
-msgstr "小文字に変換(_L)"
-
-#: src/usr/bin/diffuse.py.in:7535
-msgid "Sort Lines In _Ascending Order"
-msgstr "行を昇順に並べる(_A)"
-
-#: src/usr/bin/diffuse.py.in:7536
-msgid "Sort Lines In D_escending Order"
-msgstr "行を降順に並べる(_E)"
-
-#: src/usr/bin/diffuse.py.in:7538
-msgid "Remove Trailing _White Space"
-msgstr "末尾の空白を削除(_W)"
-
-#: src/usr/bin/diffuse.py.in:7539
-msgid "Convert Tabs To _Spaces"
-msgstr "タブをスペースに変換(_S)"
-
-#: src/usr/bin/diffuse.py.in:7540
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "先頭のスペースをタブに変換(_T)"
-
-#: src/usr/bin/diffuse.py.in:7542
-msgid "_Increase Indenting"
-msgstr "インデントを増やす(_I)"
-
-#: src/usr/bin/diffuse.py.in:7543
-msgid "De_crease Indenting"
-msgstr "インデントを減らす(_C)"
-
-#: src/usr/bin/diffuse.py.in:7545
-msgid "Convert To _DOS Format"
-msgstr "DOS 形式に変換(_D)"
-
-#: src/usr/bin/diffuse.py.in:7546
-msgid "Convert To _Mac Format"
-msgstr "Mac 形式に変換(_M)"
-
-#: src/usr/bin/diffuse.py.in:7547
-msgid "Convert To Uni_x Format"
-msgstr "Unix 形式に変換(_X)"
-
-#: src/usr/bin/diffuse.py.in:7549
-msgid "_Merge"
-msgstr "マージ(_M)"
-
-#: src/usr/bin/diffuse.py.in:7550
-msgid "Copy Selection _Right"
-msgstr "選択を右にコピー(_R)"
-
-#: src/usr/bin/diffuse.py.in:7551
-msgid "Copy Selection _Left"
-msgstr "選択を左にコピー(_L)"
-
-#: src/usr/bin/diffuse.py.in:7553
-msgid "Copy Left _Into Selection"
-msgstr "左から選択枠にコピー(_I)"
-
-#: src/usr/bin/diffuse.py.in:7554
-msgid "Copy Right I_nto Selection"
-msgstr "右から選択枠にコピー(_N)"
-
-#: src/usr/bin/diffuse.py.in:7555
-msgid "_Merge From Left Then Right"
-msgstr "左からマージした後、右からマージ(_M)"
-
-#: src/usr/bin/diffuse.py.in:7556
-msgid "M_erge From Right Then Left"
-msgstr "右からマージした後、左からマージ(_E)"
-
-#: src/usr/bin/diffuse.py.in:7558
-msgid "_Help"
-msgstr "ヘルプ(_H)"
-
-#: src/usr/bin/diffuse.py.in:7559
-msgid "_Help Contents..."
-msgstr "ヘルプの目次...(_H)"
-
-#: src/usr/bin/diffuse.py.in:7561
-#, python-format
-msgid "_About %s..."
-msgstr "%s について...(_A)"
-
-#: src/usr/bin/diffuse.py.in:7575
-msgid "New 2-Way File Merge"
-msgstr "新しい２つのファイルの比較"
-
-#: src/usr/bin/diffuse.py.in:7576
-msgid "New 3-Way File Merge"
-msgstr "新しい３つのファイルの比較"
-
-#: src/usr/bin/diffuse.py.in:7578
-msgid "Realign All"
-msgstr "全て再整列"
-
-#: src/usr/bin/diffuse.py.in:7579
-msgid "First Difference"
-msgstr "最初の差分"
-
-#: src/usr/bin/diffuse.py.in:7580
-msgid "Previous Difference"
-msgstr "前の差分"
-
-#: src/usr/bin/diffuse.py.in:7581
-msgid "Next Difference"
-msgstr "次の差分"
-
-#: src/usr/bin/diffuse.py.in:7582
-msgid "Last Difference"
-msgstr "最後の差分"
-
-#: src/usr/bin/diffuse.py.in:7584
-msgid "Copy Selection Right"
-msgstr "選択を右にコピー"
-
-#: src/usr/bin/diffuse.py.in:7585
-msgid "Copy Selection Left"
-msgstr "選択を左にコピー"
-
-#: src/usr/bin/diffuse.py.in:7586
-msgid "Copy Left Into Selection"
-msgstr "左から選択枠にコピー"
-
-#: src/usr/bin/diffuse.py.in:7587
-msgid "Copy Right Into Selection"
-msgstr "右から選択枠にコピー"
-
-#: src/usr/bin/diffuse.py.in:7588
-msgid "Merge From Left Then Right"
-msgstr "左からマージした後、右からマージ"
-
-#: src/usr/bin/diffuse.py.in:7589
-msgid "Merge From Right Then Left"
-msgstr "右からマージした後、左からマージ"
-
-#: src/usr/bin/diffuse.py.in:7591
-msgid "Undo"
-msgstr "元に戻す"
-
-#: src/usr/bin/diffuse.py.in:7592
-msgid "Redo"
-msgstr "やり直す"
-
-#: src/usr/bin/diffuse.py.in:7716
-msgid "Some files have unsaved changes.  Select the files to save before closing."
-msgstr "変更が保存されていないファイルがあります。終了前に保存するファイルを選択します。"
-
-#: src/usr/bin/diffuse.py.in:7729
-msgid "Tab"
-msgstr "タブ"
-
-#: src/usr/bin/diffuse.py.in:7734
-msgid "Pane"
-msgstr "枠"
-
-#: src/usr/bin/diffuse.py.in:7745
-msgid "Close _Without Saving"
-msgstr "保存せずに閉じる(_W)"
-
-#: src/usr/bin/diffuse.py.in:7856
-#, python-format
-msgid "File Merge %d"
-msgstr "ファイルマージ%d"
-
-#: src/usr/bin/diffuse.py.in:7959
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "%s のコミットの取得中にエラーが生じました。"
-
-#: src/usr/bin/diffuse.py.in:7990
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "%s の変更の取得中にエラーが生じました。"
-
-#: src/usr/bin/diffuse.py.in:8022
-msgid "Open File In New Tab"
-msgstr "新しいタブにファイルを開く"
-
-#: src/usr/bin/diffuse.py.in:8038
-msgid "Choose Folder With Modified Files"
-msgstr "変更なったファイルがあるフォルダを選択"
-
-#: src/usr/bin/diffuse.py.in:8051
-msgid "No modified files found."
-msgstr "変更なったファイルが見つかりませんでした。"
-
-#: src/usr/bin/diffuse.py.in:8058
-msgid "Choose Folder With Commit"
-msgstr "コミットがあるフォルダを選択"
-
-#: src/usr/bin/diffuse.py.in:8071
-msgid "No committed files found."
-msgstr "コミットされたファイルが見つかりませんでした。"
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "New N-Way File Merge..."
-msgstr "新しい複数のファイルの比較..."
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "Number of panes: "
-msgstr "枠の数: "
-
-#: src/usr/bin/diffuse.py.in:8172
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "文字列が見つかりませんでした。ファイルの終わりから続けますか。"
-
-#: src/usr/bin/diffuse.py.in:8174
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "文字列が見つかりませんでした。ファイルの始めから続けますか。"
-
-#: src/usr/bin/diffuse.py.in:8440
+#: src/main.py:6990
 msgid "Error parsing line number."
 msgstr "行番号をパースする際にエラーが生じました。"
 
-#: src/usr/bin/diffuse.py.in:8450
+#: src/main.py:7000
 #, python-format
 msgid "Skipping unknown argument \"%s\"."
 msgstr "未知の引数「%s」を飛ばします。"
 
-#: src/usr/bin/diffuse.py.in:8457
+#: src/main.py:7007
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "%s の引数を処理しているときにエラーが生じました。ディレクトリは予測できませんでした。"
 
+#: src/vcs/cvs.py:50 src/vcs/rcs.py:54 src/vcs/svn.py:89
+#, python-format
+msgid "Error parsing revision %s."
+msgstr "%s というリビジョンをパースする際にエラーが生じました。"
+
+#: src/vcs/vcs_registry.py:216
+#, python-format
+msgid "Error parsing %s."
+msgstr "%s をパースする際にエラーが生じました。"
+
 #, python-format
 #~ msgid "Column %d"
 #~ msgstr "%d列"
diff --git a/po/ko.po b/po/ko.po
index 2b816ad..48b4905 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: 2020-12-08 13:51-0500\n"
+"POT-Creation-Date: 2021-11-18 15:21-0500\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator: Kang Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean\n"
@@ -17,19 +17,981 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: data/diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:4
 msgid "Diffuse Merge Tool"
 msgstr "Diffuse 병합도구"
 
-#: data/diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:5
 msgid "Graphical tool for merging and comparing text files"
 msgstr "텍스트 파일을 병합하고 비교하기위한 도구"
 
-#: src/usr/bin/diffuse.py.in:70
+#: data/io.github.mightycreak.Diffuse.metainfo.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."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:19
+msgid "Main window: diff between two files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:26
+msgid "Patch release to fix a bug when using the Flatpak package."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:29
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:71
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:146
+msgid "Fixed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:31
+msgid "Fixed a Flatpak bug where the app couldn't call binaries on the host, such as `git`, `svn`, etc."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:40
+msgid "With this release, the main end-user change is the new icon. The rest is mainly maintenance improvements with a much more standard folder structure and starting to modularize the code. This is an ongoing effort as there is still a lot to do, but hopefully this would motivate some to contribute ;)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:47
+msgid "An important note though: the application ID has changed and is now io.github.mightycreak.Diffuse."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:51
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:89
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:123
+msgid "Added:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:53
+msgid "New icon and in SVG now"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:54
+msgid "Started to modularize the code"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:56
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:93
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:136
+msgid "Changed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:58
+msgid "Changed AppID to io.github.mightycreak.Diffuse (as advised in the Flatpak documentation)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:62
+msgid "Renamed directory `translations/` to `po/`"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:63
+msgid "Now uses POTFILES.in to list the files to translate"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:64
+msgid "Translation strings are no longer sorted alphabetically, this will help when there will be several files in POTFILES.in"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:68
+msgid "Updated the documentation and script in the `po/` directory"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:69
+msgid "Add .desktop translations in .po files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:73
+msgid "Fixed some GTK deprecation warnings"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:79
+msgid "Mainly under the hood changes in this release, so nothing really visible to the users in this version. That said, I figured it was a long time since the last release (4 months ago) and, as promised, I want Diffuse development to be a bit more active and iterative."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:85
+msgid "Apart from the maintenance changes 🧰, I think the main improvement is that Diffuse will soon be available through Flathub!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:91
+msgid "New Flatpak package, published on Flathub: com.github.mightycreak.Diffuse"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:95
+msgid "Replace old install.py with the more standard Meson"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:96
+msgid "Remove u string prefixes since Python 3 is in UTF-8 by default"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:97
+msgid "Replaced some interpolation operators (%) for the f string prefix"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:98
+msgid "Use the window scale factor for the icons generation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:104
+msgid "Here is the v0.5.0. Unintentionally, this release happens exactly 6 years after the previous v0.4.8 release!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:108
+msgid "There is a lot to do on this application, and some features didn't make the release. The main one being the Windows installers. I think 6 years is too long to continue to wait until this bug is fixed. The Python scripts should work on Windows, but no executable is produced (yet) with the release."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:115
+msgid "Other than that, Diffuse v0.5.0 is now officially compatible with Python 3 and GTK 3! And it is synced to the latest commits from upstream (which were never released)."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:120
+msgid "The next version will not take 6 years, I promise you! 😄"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:125
+msgid "Added Pedro Albuquerque's Portuguese translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:126
+msgid "Added Åke Engelbrektson's Swedish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:127
+msgid "Added Guillaume Hoffmann's Darcs support improvements"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:128
+msgid "Added Akom Chotiphantawanon's Thai translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:129
+msgid "Added support for Git submodules"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:130
+msgid "Added a preference and command line option to specify the version control system search order"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:131
+msgid "Added .editorconfig file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:132
+msgid "Added .gitignore file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:133
+msgid "Added message when removing files during uninstallation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:134
+msgid "Added Python script to update all the translation files at once"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:138
+msgid "Convert to Python 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:139
+msgid "Convert to GTK 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:140
+msgid "Updated Python highlighting for Python 3 grammar"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:141
+msgid "Updated copyrights years and authors"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:142
+msgid "Improve Spanish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:143
+msgid "Convert translation README to MarkDown"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:144
+msgid "Updated all the translation files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:148
+msgid "Fixed wrong icons directory for gtk-update-icon-cache"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:149
+msgid "Fixed missing directories when uninstalling"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:150
+msgid "Fixed bug introduced by r420 with RCS VCS"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:151
+msgid "Fixed broken drag'n'drop since migration to Python3/GTK3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:152
+msgid "Fixed error when using '-m' in an SVN repo"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:157
+msgid "Romain Failliot"
+msgstr ""
+
+#: src/constants.py.in:23
 msgid "Copyright"
 msgstr ""
 
-#: src/usr/bin/diffuse.py.in:81
+#: src/main.py:591
+#, python-format
+msgid "Error processing line %(line)d of %(file)s."
+msgstr "%(file)s %(line)d 행을 처리하는 도중 오류가 발생했습니다."
+
+#: src/main.py:610
+msgid "Auto Detect"
+msgstr "자동추출"
+
+#: src/main.py:706
+msgid "Display"
+msgstr "표시"
+
+#: src/main.py:708
+msgid "Font"
+msgstr "글꼴"
+
+#: src/main.py:709
+msgid "Tab width"
+msgstr "탭 너비"
+
+#: src/main.py:710
+msgid "Show right margin"
+msgstr "오른쪽 여백 표시"
+
+#: src/main.py:711
+msgid "Right margin"
+msgstr "오른쪽 여백"
+
+#: src/main.py:712
+msgid "Show line numbers"
+msgstr "줄번호 표시"
+
+#: src/main.py:713
+msgid "Show white space characters"
+msgstr "여백 표시"
+
+#: src/main.py:714
+msgid "Ignore case differences"
+msgstr "대소문자 차이를 무시"
+
+#: src/main.py:715
+msgid "Ignore white space differences"
+msgstr "공백을 차이를 무시"
+
+#: src/main.py:716 src/main.py:724
+msgid "Ignore changes to white space"
+msgstr "빈 변화를 무시"
+
+#: src/main.py:717
+msgid "Ignore blank line differences"
+msgstr "공백 행은 무시"
+
+#: src/main.py:718
+msgid "Ignore end of line differences"
+msgstr "행의 마지막 차이를 무시"
+
+#: src/main.py:720
+msgid "Alignment"
+msgstr "정렬"
+
+#: src/main.py:722
+msgid "Ignore case"
+msgstr "대소문자 무시"
+
+#: src/main.py:723
+msgid "Ignore white space"
+msgstr "공백을 무시"
+
+#: src/main.py:725
+msgid "Ignore blank lines"
+msgstr "빈 줄을 무시"
+
+#: src/main.py:726
+msgid "Ignore end of line characters"
+msgstr "행의 마지막 문자를 무시"
+
+#: src/main.py:728
+msgid "Editor"
+msgstr "편집기"
+
+#: src/main.py:730
+msgid "Auto indent"
+msgstr "자동 들여쓰기"
+
+#: src/main.py:731
+msgid "Expand tabs to spaces"
+msgstr "탭 대신에 공백을 삽입"
+
+#: src/main.py:732
+msgid "Soft tab width"
+msgstr "소프트 탭 너비"
+
+#: src/main.py:734
+msgid "Tabs"
+msgstr "탭"
+
+#: src/main.py:736
+msgid "Default panes"
+msgstr "프레임의 기본 수"
+
+#: src/main.py:737
+msgid "Always show the tab bar"
+msgstr "항상 탭 모음 표시"
+
+#: src/main.py:738
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "탭을 닫을때 %s 종료 및 경고"
+
+#: src/main.py:740
+msgid "Regional Settings"
+msgstr "국가별 설정"
+
+#: src/main.py:742
+msgid "Default codec"
+msgstr "기본 코덱"
+
+#: src/main.py:743
+msgid "Order of codecs used to identify encoding"
+msgstr "인코딩을 확인하기 위한 코덱을 주문"
+
+#: src/main.py:763
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/main.py:765
+msgid "Root directory"
+msgstr "루트 디렉터리"
+
+#: src/main.py:766
+msgid "Cygdrive prefix"
+msgstr "Cygdrive 접두어"
+
+#: src/main.py:782
+msgid "Version control system search order"
+msgstr ""
+
+#: src/main.py:788
+msgid "\"co\" command"
+msgstr "co 명령어"
+
+#: src/main.py:789
+msgid "\"rlog\" command"
+msgstr "rlog 명령어"
+
+#: src/main.py:791
+msgid "Command"
+msgstr "명령어"
+
+#: src/main.py:793
+msgid "Launch from a Bash login shell"
+msgstr "Bash 로그인 쉘에서 시작"
+
+#: src/main.py:795
+msgid "Update paths for Cygwin"
+msgstr "Cygwin을 위해 경로를 업데이트"
+
+#: src/main.py:799
+msgid "Version Control"
+msgstr "버전 컨트롤"
+
+#: src/main.py:863
+msgid "Preferences"
+msgstr "기본 설정"
+
+#: src/main.py:904 src/main.py:5802
+#, python-format
+msgid "Error writing %s."
+msgstr "%s에 쓸 때 오류가 발생했습니다."
+
+#: src/main.py:3282
+msgid "Align with Selection"
+msgstr "선택 정렬"
+
+#: src/main.py:3283
+msgid "Isolate"
+msgstr "분리"
+
+#: src/main.py:3284
+msgid "Merge Selection"
+msgstr "선택 병합"
+
+#: src/main.py:3286 src/main.py:6098
+msgid "Cut"
+msgstr "잘라내기"
+
+#: src/main.py:3287 src/main.py:6099
+msgid "Copy"
+msgstr "복사"
+
+#: src/main.py:3288 src/main.py:6100
+msgid "Paste"
+msgstr "붙여넣기"
+
+#: src/main.py:3290
+msgid "Select All"
+msgstr "모두 선택"
+
+#: src/main.py:3291 src/main.py:6101
+msgid "Clear Edits"
+msgstr "편집 삭제"
+
+#: src/main.py:3293
+msgid "Swap with Selected Pane"
+msgstr "선택된 프레임 대신"
+
+#: src/main.py:5124
+msgid "Find..."
+msgstr "찾기..."
+
+#: src/main.py:5132
+msgid "Search For: "
+msgstr "검색 문자열:"
+
+#: src/main.py:5157
+msgid "Match Case"
+msgstr "대소문자 구분"
+
+#: src/main.py:5162
+msgid "Search Backwards"
+msgstr "위 방향으로 검색"
+
+#: src/main.py:5176
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "이 탭을 닫으면, %s 종료합니다."
+
+#: src/main.py:5198
+msgid "Encoding: "
+msgstr "인코딩: "
+
+#: src/main.py:5208
+msgid "Revision: "
+msgstr "수정: "
+
+#: src/main.py:5272
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr "Diffuse는 텍스트 파일을 병합하고 비교하기 위한 그래픽 도구입니다."
+
+#: src/main.py:5277
+msgid "translator-credits"
+msgstr "강분도 <bundo@bundo.biz>"
+
+#: src/main.py:5281
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"이 프로그램은 자유 소프트웨어입니다. 당신은 이것을 자유 소프트웨어 재단에 의해 발행된 GNU 일반 공중 사용 허가서 (버전 2, 희망은 이후 버전 중 하나)을 결정하는 조건 하에서 재배포 또는 수정 할 수 있습니다.\n"
+"\n"
+"본 프로그램은 도움이 될 것이라는 희망 배포되지만, * 완전한 무보증 *입니다. 상업적인 가능성의 보증이나 특정 목적에의 적합성은 안다 보이는 것도 포함 전혀 존재하지 않습니다. 자세한 사항은 GNU 일반 공중 사용 허가서를 참조하십시오.\n"
+"\n"
+"당신은이 프로그램과 함께 GNU 일반 공중 사용 허가서의 복제물을 일부받은 것입니다. 만약받지면 자유 소프트웨어 재단으로 문의하시기 바랍니다 (주소는 the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA).\n"
+
+#: src/main.py:5322
+msgid "Close Tab"
+msgstr "탭 닫기"
+
+#: src/main.py:5377
+msgid "Open File..."
+msgstr "열기..."
+
+#: src/main.py:5378
+msgid "Reload File"
+msgstr "파일을 다시 읽기"
+
+#: src/main.py:5379
+msgid "Save File"
+msgstr "파일로 저장"
+
+#: src/main.py:5380
+msgid "Save File As..."
+msgstr "파일로 저장..."
+
+#: src/main.py:5525
+msgid "Save changes before loading the new file?"
+msgstr "새 파일을 불러오기 전에 변경된 데이터를 저장할까요?"
+
+#: src/main.py:5635
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "%(file)s %(rev)s는 수정된점을 가져올 때 오류가 발생했습니다."
+
+#: src/main.py:5637 src/main.py:6900
+#, python-format
+msgid "Error reading %s."
+msgstr "%s를 읽어올 때 오류가 발생했습니다."
+
+#: src/main.py:5658
+msgid "Open File"
+msgstr "열기"
+
+#: src/main.py:5708
+#, python-format
+msgid "The file %s changed on disk.  Do you want to reload the file?"
+msgstr "%s 파일이 변경된 것 같습니다. 해당 파일을 다시 불러 오시겠습니까?"
+
+#: src/main.py:5728
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "%(title)s %(pane)d번째 프레임을 저장"
+
+#: src/main.py:5754
+#, python-format
+msgid "A file named %s already exists.  Do you want to overwrite it?"
+msgstr "%s라는 파일이 이미 있습니다. 그것을 덮어 쓰시겠습니까?"
+
+#: src/main.py:5759
+#, 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/main.py:5800
+#, python-format
+msgid "Error encoding to %s."
+msgstr "%s 바꾸는 데 오류가 발생했습니다."
+
+#: src/main.py:5830
+msgid "Go To Line..."
+msgstr "줄로 이동..."
+
+#: src/main.py:5830
+msgid "Line Number: "
+msgstr "줄번호: "
+
+#: src/main.py:5856
+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/main.py:5858
+msgid "Press the escape key to finish editing."
+msgstr "ESC 키를 눌러 편집을 끝냅니다."
+
+#: src/main.py:5860
+msgid "Select target line and press the space bar to align.  Press the escape key to cancel."
+msgstr "목표 행을 선택하고 스페이스 바를 누르면 정렬합니다. 취소하려면 ESC 키를 누르십시오."
+
+#: src/main.py:5971
+msgid "_File"
+msgstr "파일(_F)"
+
+#: src/main.py:5972
+msgid "_Open File..."
+msgstr "파일 열기...(_O)"
+
+#: src/main.py:5973
+msgid "Open File In New _Tab..."
+msgstr "새 탭에서 열기...(_T)"
+
+#: src/main.py:5974
+msgid "Open _Modified Files..."
+msgstr "변경 파일 열기...(_M)"
+
+#: src/main.py:5975
+msgid "Open Commi_t..."
+msgstr "커밋 열기..."
+
+#: src/main.py:5976
+msgid "_Reload File"
+msgstr "파일 다시 읽기(_R)"
+
+#: src/main.py:5978
+msgid "_Save File"
+msgstr "파일 저장(_S)"
+
+#: src/main.py:5979
+msgid "Save File _As..."
+msgstr "파일로 저장...(_A)"
+
+#: src/main.py:5980
+msgid "Save A_ll"
+msgstr "전체 저장(_L)"
+
+#: src/main.py:5982
+msgid "New _2-Way File Merge"
+msgstr "새로운 2개의 파일 비교(_2)"
+
+#: src/main.py:5983
+msgid "New _3-Way File Merge"
+msgstr "새로운 3개의 파일 비교(_3)"
+
+#: src/main.py:5984
+msgid "New _N-Way File Merge..."
+msgstr "새로운 여러개의 파일 비교...(_N)"
+
+#: src/main.py:5986
+msgid "_Close Tab"
+msgstr "탭 닫기(_C)"
+
+#: src/main.py:5987
+msgid "_Undo Close Tab"
+msgstr "탭 닫기 취소(_U)"
+
+#: src/main.py:5988
+msgid "_Quit"
+msgstr "종료(_Q)"
+
+#: src/main.py:5990
+msgid "_Edit"
+msgstr "편집(_E)"
+
+#: src/main.py:5991
+msgid "_Undo"
+msgstr "실행 취소(_U)"
+
+#: src/main.py:5992
+msgid "_Redo"
+msgstr "다시(_R)"
+
+#: src/main.py:5994
+msgid "Cu_t"
+msgstr "잘라내기(_T)"
+
+#: src/main.py:5995
+msgid "_Copy"
+msgstr "복사(_C)"
+
+#: src/main.py:5996
+msgid "_Paste"
+msgstr "붙여넣기(_P)"
+
+#: src/main.py:5998
+msgid "Select _All"
+msgstr "모두 선택(_A)"
+
+#: src/main.py:5999
+msgid "C_lear Edits"
+msgstr "편집 삭제(_L)"
+
+#: src/main.py:6000
+msgid "_Dismiss All Edits"
+msgstr "모든 편집을 취소(_D)"
+
+#: src/main.py:6002
+msgid "_Find..."
+msgstr "찾기...(_F)"
+
+#: src/main.py:6003
+msgid "Find _Next"
+msgstr "다음 찾기(_N)"
+
+#: src/main.py:6004
+msgid "Find Pre_vious"
+msgstr "이전 찾기(_V)"
+
+#: src/main.py:6005
+msgid "_Go To Line..."
+msgstr "줄로 이동...(_G)"
+
+#: src/main.py:6007
+msgid "Pr_eferences..."
+msgstr "기본 설정...(_E)"
+
+#: src/main.py:6009
+msgid "None"
+msgstr "없음"
+
+#: src/main.py:6017
+msgid "_View"
+msgstr "보기(_V)"
+
+#: src/main.py:6018
+msgid "_Syntax Highlighting"
+msgstr "구문 강조(_S)"
+
+#: src/main.py:6020
+msgid "Re_align All"
+msgstr "전체 다시 정렬(_A)"
+
+#: src/main.py:6021
+msgid "_Isolate"
+msgstr "분리(_I)"
+
+#: src/main.py:6023
+msgid "_First Difference"
+msgstr "첫번째 차이(_F)"
+
+#: src/main.py:6024
+msgid "_Previous Difference"
+msgstr "이전 차이(_P)"
+
+#: src/main.py:6025
+msgid "_Next Difference"
+msgstr "다음 차이(_N)"
+
+#: src/main.py:6026
+msgid "_Last Difference"
+msgstr "마지막 차이(_L)"
+
+#: src/main.py:6028
+msgid "Fir_st Tab"
+msgstr "첫번째 탭(_S)"
+
+#: src/main.py:6029
+msgid "Pre_vious Tab"
+msgstr "이전 탭으로(_V)"
+
+#: src/main.py:6030
+msgid "Next _Tab"
+msgstr "다음 탭으로(_T)"
+
+#: src/main.py:6031
+msgid "Las_t Tab"
+msgstr "마지막 탭(_T)"
+
+#: src/main.py:6033
+msgid "Shift Pane _Right"
+msgstr "페널을 오른쪽으로 이동(_R)"
+
+#: src/main.py:6034
+msgid "Shift Pane _Left"
+msgstr "페널을 왼쪽으로 이동(_L)"
+
+#: src/main.py:6036
+msgid "F_ormat"
+msgstr "형식(_O)"
+
+#: src/main.py:6037
+msgid "Convert To _Upper Case"
+msgstr "대문자로 변환(_U)"
+
+#: src/main.py:6038
+msgid "Convert To _Lower Case"
+msgstr "소문자로 변환(_L)"
+
+#: src/main.py:6040
+msgid "Sort Lines In _Ascending Order"
+msgstr "행을 오름차순으로 정렬(_A)"
+
+#: src/main.py:6041
+msgid "Sort Lines In D_escending Order"
+msgstr "행을 내림차순으로 정렬(_E)"
+
+#: src/main.py:6043
+msgid "Remove Trailing _White Space"
+msgstr "후행 공백을 제거(_W)"
+
+#: src/main.py:6044
+msgid "Convert Tabs To _Spaces"
+msgstr "탭을 공백으로 변환(_S)"
+
+#: src/main.py:6045
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "선행 공백을 탭으로 변환(_T)"
+
+#: src/main.py:6047
+msgid "_Increase Indenting"
+msgstr "들여쓰기(_I)"
+
+#: src/main.py:6048
+msgid "De_crease Indenting"
+msgstr "내어 쓰기(_C)"
+
+#: src/main.py:6050
+msgid "Convert To _DOS Format"
+msgstr "DOS 형식으로 변환(_D)"
+
+#: src/main.py:6051
+msgid "Convert To _Mac Format"
+msgstr "Mac 형식으로 변환(_M)"
+
+#: src/main.py:6052
+msgid "Convert To Uni_x Format"
+msgstr "Unix 형식으로 변환(_X)"
+
+#: src/main.py:6054
+msgid "_Merge"
+msgstr "병합(_M)"
+
+#: src/main.py:6055
+msgid "Copy Selection _Right"
+msgstr "선택을 오른쪽으로 복사(_R)"
+
+#: src/main.py:6056
+msgid "Copy Selection _Left"
+msgstr "선택을 왼쪽으로 복사(_L)"
+
+#: src/main.py:6058
+msgid "Copy Left _Into Selection"
+msgstr "왼쪽에서 선택한 프레임에 복사(_I)"
+
+#: src/main.py:6059
+msgid "Copy Right I_nto Selection"
+msgstr "오른쪽에서 선택한 프레임에 복사(_N)"
+
+#: src/main.py:6060
+msgid "_Merge From Left Then Right"
+msgstr "왼쪽에서 합병 후 오른쪽에서 병합(_M)"
+
+#: src/main.py:6061
+msgid "M_erge From Right Then Left"
+msgstr "오른쪽에서 병합 후 왼쪽에서 합병(_E)"
+
+#: src/main.py:6063
+msgid "_Help"
+msgstr "도움말(_H)"
+
+#: src/main.py:6064
+msgid "_Help Contents..."
+msgstr "도움말 목차...(_H)"
+
+#: src/main.py:6066
+#, python-format
+msgid "_About %s..."
+msgstr "%s 정보...(_A)"
+
+#: src/main.py:6080
+msgid "New 2-Way File Merge"
+msgstr "새로운 2개의 파일 비교"
+
+#: src/main.py:6081
+msgid "New 3-Way File Merge"
+msgstr "새로운 3개의 파일 비교"
+
+#: src/main.py:6083
+msgid "Realign All"
+msgstr "전체 다시 정렬"
+
+#: src/main.py:6084
+msgid "First Difference"
+msgstr "첫번째 차이"
+
+#: src/main.py:6085
+msgid "Previous Difference"
+msgstr "이전 차이"
+
+#: src/main.py:6086
+msgid "Next Difference"
+msgstr "다음 차이"
+
+#: src/main.py:6087
+msgid "Last Difference"
+msgstr "마지막 차이"
+
+#: src/main.py:6089
+msgid "Copy Selection Right"
+msgstr "선택을 오른쪽으로 복사"
+
+#: src/main.py:6090
+msgid "Copy Selection Left"
+msgstr "선택을 왼쪽으로 복사"
+
+#: src/main.py:6091
+msgid "Copy Left Into Selection"
+msgstr "왼쪽에서 선택한 프레임에 복사"
+
+#: src/main.py:6092
+msgid "Copy Right Into Selection"
+msgstr "오른쪽에서 선택한 프레임에 복사"
+
+#: src/main.py:6093
+msgid "Merge From Left Then Right"
+msgstr "왼쪽에서 합병 후 오른쪽에서 병합"
+
+#: src/main.py:6094
+msgid "Merge From Right Then Left"
+msgstr "오른쪽에서 병합 후 왼쪽에서 합병"
+
+#: src/main.py:6096
+msgid "Undo"
+msgstr "실행 취소"
+
+#: src/main.py:6097
+msgid "Redo"
+msgstr "작업 재 실행"
+
+#: src/main.py:6221
+msgid "Some files have unsaved changes.  Select the files to save before closing."
+msgstr "변경 내용이 저장되지 않은 파일이 있습니다. 종료하기 전에 저장할 파일을 선택합니다."
+
+#: src/main.py:6234
+msgid "Tab"
+msgstr "탭"
+
+#: src/main.py:6239
+msgid "Pane"
+msgstr " 패널"
+
+#: src/main.py:6250
+msgid "Close _Without Saving"
+msgstr "저장하지 않고 닫기(_W)"
+
+#: src/main.py:6361
+#, python-format
+msgid "File Merge %d"
+msgstr "파일 병합 %d"
+
+#: src/main.py:6464
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "%s의 커밋을 가져오는 동안 오류가 발생했습니다."
+
+#: src/main.py:6493
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "%s의 변경을 가져오는 중 오류가 발생했습니다."
+
+#: src/main.py:6523
+msgid "Open File In New Tab"
+msgstr "새 탭에서 열기"
+
+#: src/main.py:6539
+msgid "Choose Folder With Modified Files"
+msgstr "변경 된 파일이 있는 폴더를 선택"
+
+#: src/main.py:6552
+msgid "No modified files found."
+msgstr "변경 된 파일을 찾을 수 없습니다."
+
+#: src/main.py:6557
+msgid "Choose Folder With Commit"
+msgstr "커밋이있는 폴더를 선택"
+
+#: src/main.py:6570
+msgid "No committed files found."
+msgstr "커밋된 파일을 찾을 수 없습니다."
+
+#: src/main.py:6604
+msgid "New N-Way File Merge..."
+msgstr "새로운 여러개의 파일 비교..."
+
+#: src/main.py:6604
+msgid "Number of panes: "
+msgstr " 패널수: "
+
+#: src/main.py:6669
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "문자열을 찾을 수 없습니다. 파일의 끝에서 계속하시겠습니까?"
+
+#: src/main.py:6671
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "문자열을 찾을 수 없습니다. 파일의 시작에서 다시하시겠습니까?"
+
+#: src/main.py:6819
 msgid ""
 "Usage:\n"
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
@@ -107,768 +1069,30 @@ msgstr ""
 "  ( -i | --ignore-case )           대소문자 차이를 무시\n"
 "  ( -w | --ignore-all-space )      공백을 무시"
 
-#: src/usr/bin/diffuse.py.in:716
-#, python-format
-msgid "Error processing line %(line)d of %(file)s."
-msgstr "%(file)s %(line)d 행을 처리하는 도중 오류가 발생했습니다."
-
-#: src/usr/bin/diffuse.py.in:735
-msgid "Auto Detect"
-msgstr "자동추출"
-
-#: src/usr/bin/diffuse.py.in:831
-msgid "Display"
-msgstr "표시"
-
-#: src/usr/bin/diffuse.py.in:833
-msgid "Font"
-msgstr "글꼴"
-
-#: src/usr/bin/diffuse.py.in:834
-msgid "Tab width"
-msgstr "탭 너비"
-
-#: src/usr/bin/diffuse.py.in:835
-msgid "Show right margin"
-msgstr "오른쪽 여백 표시"
-
-#: src/usr/bin/diffuse.py.in:836
-msgid "Right margin"
-msgstr "오른쪽 여백"
-
-#: src/usr/bin/diffuse.py.in:837
-msgid "Show line numbers"
-msgstr "줄번호 표시"
-
-#: src/usr/bin/diffuse.py.in:838
-msgid "Show white space characters"
-msgstr "여백 표시"
-
-#: src/usr/bin/diffuse.py.in:839
-msgid "Ignore case differences"
-msgstr "대소문자 차이를 무시"
-
-#: src/usr/bin/diffuse.py.in:840
-msgid "Ignore white space differences"
-msgstr "공백을 차이를 무시"
-
-#: src/usr/bin/diffuse.py.in:841 src/usr/bin/diffuse.py.in:849
-msgid "Ignore changes to white space"
-msgstr "빈 변화를 무시"
-
-#: src/usr/bin/diffuse.py.in:842
-msgid "Ignore blank line differences"
-msgstr "공백 행은 무시"
-
-#: src/usr/bin/diffuse.py.in:843
-msgid "Ignore end of line differences"
-msgstr "행의 마지막 차이를 무시"
-
-#: src/usr/bin/diffuse.py.in:845
-msgid "Alignment"
-msgstr "정렬"
-
-#: src/usr/bin/diffuse.py.in:847
-msgid "Ignore case"
-msgstr "대소문자 무시"
-
-#: src/usr/bin/diffuse.py.in:848
-msgid "Ignore white space"
-msgstr "공백을 무시"
-
-#: src/usr/bin/diffuse.py.in:850
-msgid "Ignore blank lines"
-msgstr "빈 줄을 무시"
-
-#: src/usr/bin/diffuse.py.in:851
-msgid "Ignore end of line characters"
-msgstr "행의 마지막 문자를 무시"
-
-#: src/usr/bin/diffuse.py.in:853
-msgid "Editor"
-msgstr "편집기"
-
-#: src/usr/bin/diffuse.py.in:855
-msgid "Auto indent"
-msgstr "자동 들여쓰기"
-
-#: src/usr/bin/diffuse.py.in:856
-msgid "Expand tabs to spaces"
-msgstr "탭 대신에 공백을 삽입"
-
-#: src/usr/bin/diffuse.py.in:857
-msgid "Soft tab width"
-msgstr "소프트 탭 너비"
-
-#: src/usr/bin/diffuse.py.in:859
-msgid "Tabs"
-msgstr "탭"
-
-#: src/usr/bin/diffuse.py.in:861
-msgid "Default panes"
-msgstr "프레임의 기본 수"
-
-#: src/usr/bin/diffuse.py.in:862
-msgid "Always show the tab bar"
-msgstr "항상 탭 모음 표시"
-
-#: src/usr/bin/diffuse.py.in:863
-#, python-format
-msgid "Warn me when closing a tab will quit %s"
-msgstr "탭을 닫을때 %s 종료 및 경고"
-
-#: src/usr/bin/diffuse.py.in:865
-msgid "Regional Settings"
-msgstr "국가별 설정"
-
-#: src/usr/bin/diffuse.py.in:867
-msgid "Default codec"
-msgstr "기본 코덱"
-
-#: src/usr/bin/diffuse.py.in:868
-msgid "Order of codecs used to identify encoding"
-msgstr "인코딩을 확인하기 위한 코덱을 주문"
-
-#: src/usr/bin/diffuse.py.in:888
-msgid "Cygwin"
-msgstr "Cygwin"
-
-#: src/usr/bin/diffuse.py.in:890
-msgid "Root directory"
-msgstr "루트 디렉터리"
-
-#: src/usr/bin/diffuse.py.in:891
-msgid "Cygdrive prefix"
-msgstr "Cygdrive 접두어"
-
-#: src/usr/bin/diffuse.py.in:907
-msgid "Version control system search order"
-msgstr ""
-
-#: src/usr/bin/diffuse.py.in:913
-msgid "\"co\" command"
-msgstr "co 명령어"
-
-#: src/usr/bin/diffuse.py.in:914
-msgid "\"rlog\" command"
-msgstr "rlog 명령어"
-
-#: src/usr/bin/diffuse.py.in:916
-msgid "Command"
-msgstr "명령어"
-
-#: src/usr/bin/diffuse.py.in:918
-msgid "Launch from a Bash login shell"
-msgstr "Bash 로그인 쉘에서 시작"
-
-#: src/usr/bin/diffuse.py.in:920
-msgid "Update paths for Cygwin"
-msgstr "Cygwin을 위해 경로를 업데이트"
-
-#: src/usr/bin/diffuse.py.in:924
-msgid "Version Control"
-msgstr "버전 컨트롤"
-
-#: src/usr/bin/diffuse.py.in:988
-msgid "Preferences"
-msgstr "기본 설정"
-
-#: src/usr/bin/diffuse.py.in:1029 src/usr/bin/diffuse.py.in:7295
-#, python-format
-msgid "Error writing %s."
-msgstr "%s에 쓸 때 오류가 발생했습니다."
-
-#: src/usr/bin/diffuse.py.in:1656 src/usr/bin/diffuse.py.in:2273
-#: src/usr/bin/diffuse.py.in:2417
-#, python-format
-msgid "Error parsing revision %s."
-msgstr "%s 버전을 구문 분석하는 동안 오류가 발생했습니다."
-
-#: src/usr/bin/diffuse.py.in:2658
-#, python-format
-msgid "Error parsing %s."
-msgstr "%s를 구문 분석하는 동안 오류가 발생했습니다."
-
-#: src/usr/bin/diffuse.py.in:4778
-msgid "Align with Selection"
-msgstr "선택 정렬"
-
-#: src/usr/bin/diffuse.py.in:4779
-msgid "Isolate"
-msgstr "분리"
-
-#: src/usr/bin/diffuse.py.in:4780
-msgid "Merge Selection"
-msgstr "선택 병합"
-
-#: src/usr/bin/diffuse.py.in:4782 src/usr/bin/diffuse.py.in:7593
-msgid "Cut"
-msgstr "잘라내기"
-
-#: src/usr/bin/diffuse.py.in:4783 src/usr/bin/diffuse.py.in:7594
-msgid "Copy"
-msgstr "복사"
-
-#: src/usr/bin/diffuse.py.in:4784 src/usr/bin/diffuse.py.in:7595
-msgid "Paste"
-msgstr "붙여넣기"
-
-#: src/usr/bin/diffuse.py.in:4786
-msgid "Select All"
-msgstr "모두 선택"
-
-#: src/usr/bin/diffuse.py.in:4787 src/usr/bin/diffuse.py.in:7596
-msgid "Clear Edits"
-msgstr "편집 삭제"
-
-#: src/usr/bin/diffuse.py.in:4789
-msgid "Swap with Selected Pane"
-msgstr "선택된 프레임 대신"
-
-#: src/usr/bin/diffuse.py.in:6620
-msgid "Find..."
-msgstr "찾기..."
-
-#: src/usr/bin/diffuse.py.in:6628
-msgid "Search For: "
-msgstr "검색 문자열:"
-
-#: src/usr/bin/diffuse.py.in:6653
-msgid "Match Case"
-msgstr "대소문자 구분"
-
-#: src/usr/bin/diffuse.py.in:6658
-msgid "Search Backwards"
-msgstr "위 방향으로 검색"
-
-#: src/usr/bin/diffuse.py.in:6672
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "이 탭을 닫으면, %s 종료합니다."
-
-#: src/usr/bin/diffuse.py.in:6694
-msgid "Encoding: "
-msgstr "인코딩: "
-
-#: src/usr/bin/diffuse.py.in:6704
-msgid "Revision: "
-msgstr "수정: "
-
-#: src/usr/bin/diffuse.py.in:6768
-msgid "Diffuse is a graphical tool for merging and comparing text files."
-msgstr "Diffuse는 텍스트 파일을 병합하고 비교하기 위한 그래픽 도구입니다."
-
-#: src/usr/bin/diffuse.py.in:6773
-msgid "translator-credits"
-msgstr "강분도 <bundo@bundo.biz>"
-
-#: src/usr/bin/diffuse.py.in:6776
-msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program.  You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
-"이 프로그램은 자유 소프트웨어입니다. 당신은 이것을 자유 소프트웨어 재단에 의해 발행된 GNU 일반 공중 사용 허가서 (버전 2, 희망은 이후 버전 중 하나)을 결정하는 조건 하에서 재배포 또는 수정 할 수 있습니다.\n"
-"\n"
-"본 프로그램은 도움이 될 것이라는 희망 배포되지만, * 완전한 무보증 *입니다. 상업적인 가능성의 보증이나 특정 목적에의 적합성은 안다 보이는 것도 포함 전혀 존재하지 않습니다. 자세한 사항은 GNU 일반 공중 사용 허가서를 참조하십시오.\n"
-"\n"
-"당신은이 프로그램과 함께 GNU 일반 공중 사용 허가서의 복제물을 일부받은 것입니다. 만약받지면 자유 소프트웨어 재단으로 문의하시기 바랍니다 (주소는 the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA).\n"
-
-#: src/usr/bin/diffuse.py.in:6811
-msgid "Close Tab"
-msgstr "탭 닫기"
-
-#: src/usr/bin/diffuse.py.in:6866
-msgid "Open File..."
-msgstr "열기..."
-
-#: src/usr/bin/diffuse.py.in:6867
-msgid "Reload File"
-msgstr "파일을 다시 읽기"
-
-#: src/usr/bin/diffuse.py.in:6868
-msgid "Save File"
-msgstr "파일로 저장"
-
-#: src/usr/bin/diffuse.py.in:6869
-msgid "Save File As..."
-msgstr "파일로 저장..."
-
-#: src/usr/bin/diffuse.py.in:7014
-msgid "Save changes before loading the new file?"
-msgstr "새 파일을 불러오기 전에 변경된 데이터를 저장할까요?"
-
-#: src/usr/bin/diffuse.py.in:7124
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "%(file)s %(rev)s는 수정된점을 가져올 때 오류가 발생했습니다."
-
-#: src/usr/bin/diffuse.py.in:7126 src/usr/bin/diffuse.py.in:8359
-#, python-format
-msgid "Error reading %s."
-msgstr "%s를 읽어올 때 오류가 발생했습니다."
-
-#: src/usr/bin/diffuse.py.in:7149
-msgid "Open File"
-msgstr "열기"
-
-#: src/usr/bin/diffuse.py.in:7199
-#, python-format
-msgid "The file %s changed on disk.  Do you want to reload the file?"
-msgstr "%s 파일이 변경된 것 같습니다. 해당 파일을 다시 불러 오시겠습니까?"
-
-#: src/usr/bin/diffuse.py.in:7219
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "%(title)s %(pane)d번째 프레임을 저장"
-
-#: src/usr/bin/diffuse.py.in:7245
-#, python-format
-msgid "A file named %s already exists.  Do you want to overwrite it?"
-msgstr "%s라는 파일이 이미 있습니다. 그것을 덮어 쓰시겠습니까?"
-
-#: src/usr/bin/diffuse.py.in:7250
-#, 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/usr/bin/diffuse.py.in:7291
-#, python-format
-msgid "Error encoding to %s."
-msgstr "%s 바꾸는 데 오류가 발생했습니다."
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Go To Line..."
-msgstr "줄로 이동..."
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Line Number: "
-msgstr "줄번호: "
-
-#: src/usr/bin/diffuse.py.in:7351
-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/usr/bin/diffuse.py.in:7353
-msgid "Press the escape key to finish editing."
-msgstr "ESC 키를 눌러 편집을 끝냅니다."
-
-#: src/usr/bin/diffuse.py.in:7355
-msgid "Select target line and press the space bar to align.  Press the escape key to cancel."
-msgstr "목표 행을 선택하고 스페이스 바를 누르면 정렬합니다. 취소하려면 ESC 키를 누르십시오."
-
-#: src/usr/bin/diffuse.py.in:7466
-msgid "_File"
-msgstr "파일(_F)"
-
-#: src/usr/bin/diffuse.py.in:7467
-msgid "_Open File..."
-msgstr "파일 열기...(_O)"
-
-#: src/usr/bin/diffuse.py.in:7468
-msgid "Open File In New _Tab..."
-msgstr "새 탭에서 열기...(_T)"
-
-#: src/usr/bin/diffuse.py.in:7469
-msgid "Open _Modified Files..."
-msgstr "변경 파일 열기...(_M)"
-
-#: src/usr/bin/diffuse.py.in:7470
-msgid "Open Commi_t..."
-msgstr "커밋 열기..."
-
-#: src/usr/bin/diffuse.py.in:7471
-msgid "_Reload File"
-msgstr "파일 다시 읽기(_R)"
-
-#: src/usr/bin/diffuse.py.in:7473
-msgid "_Save File"
-msgstr "파일 저장(_S)"
-
-#: src/usr/bin/diffuse.py.in:7474
-msgid "Save File _As..."
-msgstr "파일로 저장...(_A)"
-
-#: src/usr/bin/diffuse.py.in:7475
-msgid "Save A_ll"
-msgstr "전체 저장(_L)"
-
-#: src/usr/bin/diffuse.py.in:7477
-msgid "New _2-Way File Merge"
-msgstr "새로운 2개의 파일 비교(_2)"
-
-#: src/usr/bin/diffuse.py.in:7478
-msgid "New _3-Way File Merge"
-msgstr "새로운 3개의 파일 비교(_3)"
-
-#: src/usr/bin/diffuse.py.in:7479
-msgid "New _N-Way File Merge..."
-msgstr "새로운 여러개의 파일 비교...(_N)"
-
-#: src/usr/bin/diffuse.py.in:7481
-msgid "_Close Tab"
-msgstr "탭 닫기(_C)"
-
-#: src/usr/bin/diffuse.py.in:7482
-msgid "_Undo Close Tab"
-msgstr "탭 닫기 취소(_U)"
-
-#: src/usr/bin/diffuse.py.in:7483
-msgid "_Quit"
-msgstr "종료(_Q)"
-
-#: src/usr/bin/diffuse.py.in:7485
-msgid "_Edit"
-msgstr "편집(_E)"
-
-#: src/usr/bin/diffuse.py.in:7486
-msgid "_Undo"
-msgstr "실행 취소(_U)"
-
-#: src/usr/bin/diffuse.py.in:7487
-msgid "_Redo"
-msgstr "다시(_R)"
-
-#: src/usr/bin/diffuse.py.in:7489
-msgid "Cu_t"
-msgstr "잘라내기(_T)"
-
-#: src/usr/bin/diffuse.py.in:7490
-msgid "_Copy"
-msgstr "복사(_C)"
-
-#: src/usr/bin/diffuse.py.in:7491
-msgid "_Paste"
-msgstr "붙여넣기(_P)"
-
-#: src/usr/bin/diffuse.py.in:7493
-msgid "Select _All"
-msgstr "모두 선택(_A)"
-
-#: src/usr/bin/diffuse.py.in:7494
-msgid "C_lear Edits"
-msgstr "편집 삭제(_L)"
-
-#: src/usr/bin/diffuse.py.in:7495
-msgid "_Dismiss All Edits"
-msgstr "모든 편집을 취소(_D)"
-
-#: src/usr/bin/diffuse.py.in:7497
-msgid "_Find..."
-msgstr "찾기...(_F)"
-
-#: src/usr/bin/diffuse.py.in:7498
-msgid "Find _Next"
-msgstr "다음 찾기(_N)"
-
-#: src/usr/bin/diffuse.py.in:7499
-msgid "Find Pre_vious"
-msgstr "이전 찾기(_V)"
-
-#: src/usr/bin/diffuse.py.in:7500
-msgid "_Go To Line..."
-msgstr "줄로 이동...(_G)"
-
-#: src/usr/bin/diffuse.py.in:7502
-msgid "Pr_eferences..."
-msgstr "기본 설정...(_E)"
-
-#: src/usr/bin/diffuse.py.in:7504
-msgid "None"
-msgstr "없음"
-
-#: src/usr/bin/diffuse.py.in:7512
-msgid "_View"
-msgstr "보기(_V)"
-
-#: src/usr/bin/diffuse.py.in:7513
-msgid "_Syntax Highlighting"
-msgstr "구문 강조(_S)"
-
-#: src/usr/bin/diffuse.py.in:7515
-msgid "Re_align All"
-msgstr "전체 다시 정렬(_A)"
-
-#: src/usr/bin/diffuse.py.in:7516
-msgid "_Isolate"
-msgstr "분리(_I)"
-
-#: src/usr/bin/diffuse.py.in:7518
-msgid "_First Difference"
-msgstr "첫번째 차이(_F)"
-
-#: src/usr/bin/diffuse.py.in:7519
-msgid "_Previous Difference"
-msgstr "이전 차이(_P)"
-
-#: src/usr/bin/diffuse.py.in:7520
-msgid "_Next Difference"
-msgstr "다음 차이(_N)"
-
-#: src/usr/bin/diffuse.py.in:7521
-msgid "_Last Difference"
-msgstr "마지막 차이(_L)"
-
-#: src/usr/bin/diffuse.py.in:7523
-msgid "Fir_st Tab"
-msgstr "첫번째 탭(_S)"
-
-#: src/usr/bin/diffuse.py.in:7524
-msgid "Pre_vious Tab"
-msgstr "이전 탭으로(_V)"
-
-#: src/usr/bin/diffuse.py.in:7525
-msgid "Next _Tab"
-msgstr "다음 탭으로(_T)"
-
-#: src/usr/bin/diffuse.py.in:7526
-msgid "Las_t Tab"
-msgstr "마지막 탭(_T)"
-
-#: src/usr/bin/diffuse.py.in:7528
-msgid "Shift Pane _Right"
-msgstr "페널을 오른쪽으로 이동(_R)"
-
-#: src/usr/bin/diffuse.py.in:7529
-msgid "Shift Pane _Left"
-msgstr "페널을 왼쪽으로 이동(_L)"
-
-#: src/usr/bin/diffuse.py.in:7531
-msgid "F_ormat"
-msgstr "형식(_O)"
-
-#: src/usr/bin/diffuse.py.in:7532
-msgid "Convert To _Upper Case"
-msgstr "대문자로 변환(_U)"
-
-#: src/usr/bin/diffuse.py.in:7533
-msgid "Convert To _Lower Case"
-msgstr "소문자로 변환(_L)"
-
-#: src/usr/bin/diffuse.py.in:7535
-msgid "Sort Lines In _Ascending Order"
-msgstr "행을 오름차순으로 정렬(_A)"
-
-#: src/usr/bin/diffuse.py.in:7536
-msgid "Sort Lines In D_escending Order"
-msgstr "행을 내림차순으로 정렬(_E)"
-
-#: src/usr/bin/diffuse.py.in:7538
-msgid "Remove Trailing _White Space"
-msgstr "후행 공백을 제거(_W)"
-
-#: src/usr/bin/diffuse.py.in:7539
-msgid "Convert Tabs To _Spaces"
-msgstr "탭을 공백으로 변환(_S)"
-
-#: src/usr/bin/diffuse.py.in:7540
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "선행 공백을 탭으로 변환(_T)"
-
-#: src/usr/bin/diffuse.py.in:7542
-msgid "_Increase Indenting"
-msgstr "들여쓰기(_I)"
-
-#: src/usr/bin/diffuse.py.in:7543
-msgid "De_crease Indenting"
-msgstr "내어 쓰기(_C)"
-
-#: src/usr/bin/diffuse.py.in:7545
-msgid "Convert To _DOS Format"
-msgstr "DOS 형식으로 변환(_D)"
-
-#: src/usr/bin/diffuse.py.in:7546
-msgid "Convert To _Mac Format"
-msgstr "Mac 형식으로 변환(_M)"
-
-#: src/usr/bin/diffuse.py.in:7547
-msgid "Convert To Uni_x Format"
-msgstr "Unix 형식으로 변환(_X)"
-
-#: src/usr/bin/diffuse.py.in:7549
-msgid "_Merge"
-msgstr "병합(_M)"
-
-#: src/usr/bin/diffuse.py.in:7550
-msgid "Copy Selection _Right"
-msgstr "선택을 오른쪽으로 복사(_R)"
-
-#: src/usr/bin/diffuse.py.in:7551
-msgid "Copy Selection _Left"
-msgstr "선택을 왼쪽으로 복사(_L)"
-
-#: src/usr/bin/diffuse.py.in:7553
-msgid "Copy Left _Into Selection"
-msgstr "왼쪽에서 선택한 프레임에 복사(_I)"
-
-#: src/usr/bin/diffuse.py.in:7554
-msgid "Copy Right I_nto Selection"
-msgstr "오른쪽에서 선택한 프레임에 복사(_N)"
-
-#: src/usr/bin/diffuse.py.in:7555
-msgid "_Merge From Left Then Right"
-msgstr "왼쪽에서 합병 후 오른쪽에서 병합(_M)"
-
-#: src/usr/bin/diffuse.py.in:7556
-msgid "M_erge From Right Then Left"
-msgstr "오른쪽에서 병합 후 왼쪽에서 합병(_E)"
-
-#: src/usr/bin/diffuse.py.in:7558
-msgid "_Help"
-msgstr "도움말(_H)"
-
-#: src/usr/bin/diffuse.py.in:7559
-msgid "_Help Contents..."
-msgstr "도움말 목차...(_H)"
-
-#: src/usr/bin/diffuse.py.in:7561
-#, python-format
-msgid "_About %s..."
-msgstr "%s 정보...(_A)"
-
-#: src/usr/bin/diffuse.py.in:7575
-msgid "New 2-Way File Merge"
-msgstr "새로운 2개의 파일 비교"
-
-#: src/usr/bin/diffuse.py.in:7576
-msgid "New 3-Way File Merge"
-msgstr "새로운 3개의 파일 비교"
-
-#: src/usr/bin/diffuse.py.in:7578
-msgid "Realign All"
-msgstr "전체 다시 정렬"
-
-#: src/usr/bin/diffuse.py.in:7579
-msgid "First Difference"
-msgstr "첫번째 차이"
-
-#: src/usr/bin/diffuse.py.in:7580
-msgid "Previous Difference"
-msgstr "이전 차이"
-
-#: src/usr/bin/diffuse.py.in:7581
-msgid "Next Difference"
-msgstr "다음 차이"
-
-#: src/usr/bin/diffuse.py.in:7582
-msgid "Last Difference"
-msgstr "마지막 차이"
-
-#: src/usr/bin/diffuse.py.in:7584
-msgid "Copy Selection Right"
-msgstr "선택을 오른쪽으로 복사"
-
-#: src/usr/bin/diffuse.py.in:7585
-msgid "Copy Selection Left"
-msgstr "선택을 왼쪽으로 복사"
-
-#: src/usr/bin/diffuse.py.in:7586
-msgid "Copy Left Into Selection"
-msgstr "왼쪽에서 선택한 프레임에 복사"
-
-#: src/usr/bin/diffuse.py.in:7587
-msgid "Copy Right Into Selection"
-msgstr "오른쪽에서 선택한 프레임에 복사"
-
-#: src/usr/bin/diffuse.py.in:7588
-msgid "Merge From Left Then Right"
-msgstr "왼쪽에서 합병 후 오른쪽에서 병합"
-
-#: src/usr/bin/diffuse.py.in:7589
-msgid "Merge From Right Then Left"
-msgstr "오른쪽에서 병합 후 왼쪽에서 합병"
-
-#: src/usr/bin/diffuse.py.in:7591
-msgid "Undo"
-msgstr "실행 취소"
-
-#: src/usr/bin/diffuse.py.in:7592
-msgid "Redo"
-msgstr "작업 재 실행"
-
-#: src/usr/bin/diffuse.py.in:7716
-msgid "Some files have unsaved changes.  Select the files to save before closing."
-msgstr "변경 내용이 저장되지 않은 파일이 있습니다. 종료하기 전에 저장할 파일을 선택합니다."
-
-#: src/usr/bin/diffuse.py.in:7729
-msgid "Tab"
-msgstr "탭"
-
-#: src/usr/bin/diffuse.py.in:7734
-msgid "Pane"
-msgstr " 패널"
-
-#: src/usr/bin/diffuse.py.in:7745
-msgid "Close _Without Saving"
-msgstr "저장하지 않고 닫기(_W)"
-
-#: src/usr/bin/diffuse.py.in:7856
-#, python-format
-msgid "File Merge %d"
-msgstr "파일 병합 %d"
-
-#: src/usr/bin/diffuse.py.in:7959
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "%s의 커밋을 가져오는 동안 오류가 발생했습니다."
-
-#: src/usr/bin/diffuse.py.in:7990
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "%s의 변경을 가져오는 중 오류가 발생했습니다."
-
-#: src/usr/bin/diffuse.py.in:8022
-msgid "Open File In New Tab"
-msgstr "새 탭에서 열기"
-
-#: src/usr/bin/diffuse.py.in:8038
-msgid "Choose Folder With Modified Files"
-msgstr "변경 된 파일이 있는 폴더를 선택"
-
-#: src/usr/bin/diffuse.py.in:8051
-msgid "No modified files found."
-msgstr "변경 된 파일을 찾을 수 없습니다."
-
-#: src/usr/bin/diffuse.py.in:8058
-msgid "Choose Folder With Commit"
-msgstr "커밋이있는 폴더를 선택"
-
-#: src/usr/bin/diffuse.py.in:8071
-msgid "No committed files found."
-msgstr "커밋된 파일을 찾을 수 없습니다."
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "New N-Way File Merge..."
-msgstr "새로운 여러개의 파일 비교..."
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "Number of panes: "
-msgstr " 패널수: "
-
-#: src/usr/bin/diffuse.py.in:8172
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "문자열을 찾을 수 없습니다. 파일의 끝에서 계속하시겠습니까?"
-
-#: src/usr/bin/diffuse.py.in:8174
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "문자열을 찾을 수 없습니다. 파일의 시작에서 다시하시겠습니까?"
-
-#: src/usr/bin/diffuse.py.in:8440
+#: src/main.py:6990
 msgid "Error parsing line number."
 msgstr "줄 번호를 구문 분석하는 동안 오류가 발생했습니다."
 
-#: src/usr/bin/diffuse.py.in:8450
+#: src/main.py:7000
 #, python-format
 msgid "Skipping unknown argument \"%s\"."
 msgstr "알수 없는 인수「%s」 유지 합니다."
 
-#: src/usr/bin/diffuse.py.in:8457
+#: src/main.py:7007
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "%s 인수를 처리하는 동안 오류가 발생했습니다. 디렉토리를 예측할 수 없습니다."
 
+#: src/vcs/cvs.py:50 src/vcs/rcs.py:54 src/vcs/svn.py:89
+#, python-format
+msgid "Error parsing revision %s."
+msgstr "%s 버전을 구문 분석하는 동안 오류가 발생했습니다."
+
+#: src/vcs/vcs_registry.py:216
+#, python-format
+msgid "Error parsing %s."
+msgstr "%s를 구문 분석하는 동안 오류가 발생했습니다."
+
 #, python-format
 #~ msgid "Column %d"
 #~ msgstr "%d열"
diff --git a/po/pl.po b/po/pl.po
index 8d3f838..7c06f0a 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: 2020-12-08 13:51-0500\n"
+"POT-Creation-Date: 2021-11-18 15:21-0500\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator: Miś Uszatek <adres.email@ymail.com>, 2012\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -17,19 +17,975 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: data/diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:4
 msgid "Diffuse Merge Tool"
 msgstr "Diffuse Narzędzie Scalania"
 
-#: data/diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:5
 msgid "Graphical tool for merging and comparing text files"
 msgstr "Graficzne narzędzie do łączenia i porównywania plików tekstowych"
 
-#: src/usr/bin/diffuse.py.in:70
+#: data/io.github.mightycreak.Diffuse.metainfo.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."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:19
+msgid "Main window: diff between two files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:26
+msgid "Patch release to fix a bug when using the Flatpak package."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:29
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:71
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:146
+msgid "Fixed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:31
+msgid "Fixed a Flatpak bug where the app couldn't call binaries on the host, such as `git`, `svn`, etc."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:40
+msgid "With this release, the main end-user change is the new icon. The rest is mainly maintenance improvements with a much more standard folder structure and starting to modularize the code. This is an ongoing effort as there is still a lot to do, but hopefully this would motivate some to contribute ;)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:47
+msgid "An important note though: the application ID has changed and is now io.github.mightycreak.Diffuse."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:51
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:89
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:123
+msgid "Added:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:53
+msgid "New icon and in SVG now"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:54
+msgid "Started to modularize the code"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:56
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:93
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:136
+msgid "Changed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:58
+msgid "Changed AppID to io.github.mightycreak.Diffuse (as advised in the Flatpak documentation)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:62
+msgid "Renamed directory `translations/` to `po/`"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:63
+msgid "Now uses POTFILES.in to list the files to translate"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:64
+msgid "Translation strings are no longer sorted alphabetically, this will help when there will be several files in POTFILES.in"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:68
+msgid "Updated the documentation and script in the `po/` directory"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:69
+msgid "Add .desktop translations in .po files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:73
+msgid "Fixed some GTK deprecation warnings"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:79
+msgid "Mainly under the hood changes in this release, so nothing really visible to the users in this version. That said, I figured it was a long time since the last release (4 months ago) and, as promised, I want Diffuse development to be a bit more active and iterative."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:85
+msgid "Apart from the maintenance changes 🧰, I think the main improvement is that Diffuse will soon be available through Flathub!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:91
+msgid "New Flatpak package, published on Flathub: com.github.mightycreak.Diffuse"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:95
+msgid "Replace old install.py with the more standard Meson"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:96
+msgid "Remove u string prefixes since Python 3 is in UTF-8 by default"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:97
+msgid "Replaced some interpolation operators (%) for the f string prefix"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:98
+msgid "Use the window scale factor for the icons generation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:104
+msgid "Here is the v0.5.0. Unintentionally, this release happens exactly 6 years after the previous v0.4.8 release!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:108
+msgid "There is a lot to do on this application, and some features didn't make the release. The main one being the Windows installers. I think 6 years is too long to continue to wait until this bug is fixed. The Python scripts should work on Windows, but no executable is produced (yet) with the release."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:115
+msgid "Other than that, Diffuse v0.5.0 is now officially compatible with Python 3 and GTK 3! And it is synced to the latest commits from upstream (which were never released)."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:120
+msgid "The next version will not take 6 years, I promise you! 😄"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:125
+msgid "Added Pedro Albuquerque's Portuguese translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:126
+msgid "Added Åke Engelbrektson's Swedish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:127
+msgid "Added Guillaume Hoffmann's Darcs support improvements"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:128
+msgid "Added Akom Chotiphantawanon's Thai translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:129
+msgid "Added support for Git submodules"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:130
+msgid "Added a preference and command line option to specify the version control system search order"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:131
+msgid "Added .editorconfig file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:132
+msgid "Added .gitignore file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:133
+msgid "Added message when removing files during uninstallation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:134
+msgid "Added Python script to update all the translation files at once"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:138
+msgid "Convert to Python 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:139
+msgid "Convert to GTK 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:140
+msgid "Updated Python highlighting for Python 3 grammar"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:141
+msgid "Updated copyrights years and authors"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:142
+msgid "Improve Spanish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:143
+msgid "Convert translation README to MarkDown"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:144
+msgid "Updated all the translation files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:148
+msgid "Fixed wrong icons directory for gtk-update-icon-cache"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:149
+msgid "Fixed missing directories when uninstalling"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:150
+msgid "Fixed bug introduced by r420 with RCS VCS"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:151
+msgid "Fixed broken drag'n'drop since migration to Python3/GTK3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:152
+msgid "Fixed error when using '-m' in an SVN repo"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:157
+msgid "Romain Failliot"
+msgstr ""
+
+#: src/constants.py.in:23
 msgid "Copyright"
 msgstr ""
 
-#: src/usr/bin/diffuse.py.in:81
+#: src/main.py:591
+#, python-format
+msgid "Error processing line %(line)d of %(file)s."
+msgstr "Błąd przetwarzania linii %(line)d w %(file)s."
+
+#: src/main.py:610
+msgid "Auto Detect"
+msgstr "Automatyczne Wykrywanie"
+
+#: src/main.py:706
+msgid "Display"
+msgstr "Wyświetl"
+
+#: src/main.py:708
+msgid "Font"
+msgstr "Czcionka"
+
+#: src/main.py:709
+msgid "Tab width"
+msgstr "Szerokość tabulacji"
+
+#: src/main.py:710
+msgid "Show right margin"
+msgstr "Pokaż prawy margines"
+
+#: src/main.py:711
+msgid "Right margin"
+msgstr "Prawy margines"
+
+#: src/main.py:712
+msgid "Show line numbers"
+msgstr "Pokaż numerowanie linii"
+
+#: src/main.py:713
+msgid "Show white space characters"
+msgstr "Pokaż znaki spacji"
+
+#: src/main.py:714
+msgid "Ignore case differences"
+msgstr "Ignoruj różnice w wielkość liter"
+
+#: src/main.py:715
+msgid "Ignore white space differences"
+msgstr "Ignoruj różnice spacji"
+
+#: src/main.py:716 src/main.py:724
+msgid "Ignore changes to white space"
+msgstr "Ignoruj zmiany w spacji"
+
+#: src/main.py:717
+msgid "Ignore blank line differences"
+msgstr "Ignoruj różnice pustych linii"
+
+#: src/main.py:718
+msgid "Ignore end of line differences"
+msgstr "Ignoruj różnice na końcu linii"
+
+#: src/main.py:720
+msgid "Alignment"
+msgstr "Dostosowanie"
+
+#: src/main.py:722
+msgid "Ignore case"
+msgstr "Ignoruj wielkość liter"
+
+#: src/main.py:723
+msgid "Ignore white space"
+msgstr "Ignoruj spacje"
+
+#: src/main.py:725
+msgid "Ignore blank lines"
+msgstr "Ignoruj puste wiersze"
+
+#: src/main.py:726
+msgid "Ignore end of line characters"
+msgstr "Ignoruj końcowe znaki linii"
+
+#: src/main.py:728
+msgid "Editor"
+msgstr "Edytor"
+
+#: src/main.py:730
+msgid "Auto indent"
+msgstr "Automatyczne wcięcia"
+
+#: src/main.py:731
+msgid "Expand tabs to spaces"
+msgstr "Zamiana tabulacji na spacje"
+
+#: src/main.py:732
+msgid "Soft tab width"
+msgstr "Miękka szerokość tabulacji"
+
+#: src/main.py:734
+msgid "Tabs"
+msgstr "Karty"
+
+#: src/main.py:736
+msgid "Default panes"
+msgstr "Domyślne Okna"
+
+#: src/main.py:737
+msgid "Always show the tab bar"
+msgstr "Zawsze pokazuj pasek kart"
+
+#: src/main.py:738
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "Ostrzegaj mnie gdy zamknięcie karty zakończy %s."
+
+#: src/main.py:740
+msgid "Regional Settings"
+msgstr "Regionalne Ustawienia"
+
+#: src/main.py:742
+msgid "Default codec"
+msgstr "Domyślne kodowanie znaków"
+
+#: src/main.py:743
+msgid "Order of codecs used to identify encoding"
+msgstr "Kolejny kodek używany do identyfikacji kodowania"
+
+#: src/main.py:763
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/main.py:765
+msgid "Root directory"
+msgstr "Główny katalog"
+
+#: src/main.py:766
+msgid "Cygdrive prefix"
+msgstr "Cygdrive Prefiks "
+
+#: src/main.py:782
+msgid "Version control system search order"
+msgstr ""
+
+#: src/main.py:788
+msgid "\"co\" command"
+msgstr "\"co\" polecenie"
+
+#: src/main.py:789
+msgid "\"rlog\" command"
+msgstr "\"rlog\" polecenie"
+
+#: src/main.py:791
+msgid "Command"
+msgstr "Polecenie"
+
+#: src/main.py:793
+msgid "Launch from a Bash login shell"
+msgstr "Uruchom z powłoki Bash"
+
+#: src/main.py:795
+msgid "Update paths for Cygwin"
+msgstr "Aktualizacja ścieżki dla Cygwin"
+
+#: src/main.py:799
+msgid "Version Control"
+msgstr "Wersja kontrolna"
+
+#: src/main.py:863
+msgid "Preferences"
+msgstr "Preferencje"
+
+#: src/main.py:904 src/main.py:5802
+#, python-format
+msgid "Error writing %s."
+msgstr "Błąd zapisu %s."
+
+#: src/main.py:3282
+msgid "Align with Selection"
+msgstr "Wyrównaj do zaznaczenia"
+
+#: src/main.py:3283
+msgid "Isolate"
+msgstr "Oddziel"
+
+#: src/main.py:3284
+msgid "Merge Selection"
+msgstr "Scal Zaznaczenie"
+
+#: src/main.py:3286 src/main.py:6098
+msgid "Cut"
+msgstr "Wytnij"
+
+#: src/main.py:3287 src/main.py:6099
+msgid "Copy"
+msgstr "Kopiuj"
+
+#: src/main.py:3288 src/main.py:6100
+msgid "Paste"
+msgstr "Wklej"
+
+#: src/main.py:3290
+msgid "Select All"
+msgstr "Zaznacz Wszystko"
+
+#: src/main.py:3291 src/main.py:6101
+msgid "Clear Edits"
+msgstr "Wyczyść Edycje"
+
+#: src/main.py:3293
+msgid "Swap with Selected Pane"
+msgstr "Zamień z Zaznaczonym Oknem"
+
+#: src/main.py:5124
+msgid "Find..."
+msgstr "Szukaj..."
+
+#: src/main.py:5132
+msgid "Search For: "
+msgstr "Szukaj Dla: "
+
+#: src/main.py:5157
+msgid "Match Case"
+msgstr "Uwzględnij wielkość liter"
+
+#: src/main.py:5162
+msgid "Search Backwards"
+msgstr "Szukaj Wstecz"
+
+#: src/main.py:5176
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "Zamknięcie tej karty zakończy %s."
+
+#: src/main.py:5198
+msgid "Encoding: "
+msgstr "Kodowanie znaków: "
+
+#: src/main.py:5208
+msgid "Revision: "
+msgstr "Rewizia: "
+
+#: src/main.py:5272
+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/main.py:5277
+msgid "translator-credits"
+msgstr "Miś Uszatek <adres.email@ymail.com>"
+
+#: src/main.py:5281
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+
+#: src/main.py:5322
+msgid "Close Tab"
+msgstr "Zamknij Kartę"
+
+#: src/main.py:5377
+msgid "Open File..."
+msgstr "Otwórz Plik..."
+
+#: src/main.py:5378
+msgid "Reload File"
+msgstr "Odśwież Plik"
+
+#: src/main.py:5379
+msgid "Save File"
+msgstr "Zapisz Plik"
+
+#: src/main.py:5380
+msgid "Save File As..."
+msgstr "Zapisz Plik Jako..."
+
+#: src/main.py:5525
+msgid "Save changes before loading the new file?"
+msgstr "Zapisać zmiany przed wczytaniem nowego pliku?"
+
+#: src/main.py:5635
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "Błąd odczytu rewizji %(rev)s z %(file)s."
+
+#: src/main.py:5637 src/main.py:6900
+#, python-format
+msgid "Error reading %s."
+msgstr "Błąd odczytu %s."
+
+#: src/main.py:5658
+msgid "Open File"
+msgstr "Otwórz Plik"
+
+#: src/main.py:5708
+#, 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/main.py:5728
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "Zapisz %(title)s Okno %(pane)d"
+
+#: src/main.py:5754
+#, 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/main.py:5759
+#, 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/main.py:5800
+#, python-format
+msgid "Error encoding to %s."
+msgstr "Błąd kodowania dla %s."
+
+#: src/main.py:5830
+msgid "Go To Line..."
+msgstr "Idź Do Linii..."
+
+#: src/main.py:5830
+msgid "Line Number: "
+msgstr "Numer Linii: "
+
+#: src/main.py:5856
+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/main.py:5858
+msgid "Press the escape key to finish editing."
+msgstr "Naciśnij klawisz escape, aby zakończyć edycję."
+
+#: src/main.py:5860
+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/main.py:5971
+msgid "_File"
+msgstr "_Plik"
+
+#: src/main.py:5972
+msgid "_Open File..."
+msgstr "_Otwórz Plik..."
+
+#: src/main.py:5973
+msgid "Open File In New _Tab..."
+msgstr "Otwórz Plik w Nowej _Karcie..."
+
+#: src/main.py:5974
+msgid "Open _Modified Files..."
+msgstr "Otwórz _Zmodyfikowany Plik..."
+
+#: src/main.py:5975
+msgid "Open Commi_t..."
+msgstr "Otwórz Commi_t..."
+
+#: src/main.py:5976
+msgid "_Reload File"
+msgstr "_Odśwież Plik"
+
+#: src/main.py:5978
+msgid "_Save File"
+msgstr "_Zapisz plik"
+
+#: src/main.py:5979
+msgid "Save File _As..."
+msgstr "Zapisz Plik _Jako..."
+
+#: src/main.py:5980
+msgid "Save A_ll"
+msgstr "Zapisz W_szystko"
+
+#: src/main.py:5982
+msgid "New _2-Way File Merge"
+msgstr "Nowy Łączenia _2 Plików"
+
+#: src/main.py:5983
+msgid "New _3-Way File Merge"
+msgstr "Nowy Łączenia _3 Plików"
+
+#: src/main.py:5984
+msgid "New _N-Way File Merge..."
+msgstr "Nowy _N-Sposób Łączenia Pliku..."
+
+#: src/main.py:5986
+msgid "_Close Tab"
+msgstr "_Zamknij Kartę"
+
+#: src/main.py:5987
+msgid "_Undo Close Tab"
+msgstr "_Przywróć Zamkniętą Kartę"
+
+#: src/main.py:5988
+msgid "_Quit"
+msgstr "_Zamknij"
+
+#: src/main.py:5990
+msgid "_Edit"
+msgstr "_Edytuj"
+
+#: src/main.py:5991
+msgid "_Undo"
+msgstr "_Cofnij"
+
+#: src/main.py:5992
+msgid "_Redo"
+msgstr "_Ponów"
+
+#: src/main.py:5994
+msgid "Cu_t"
+msgstr "Wy_tnij"
+
+#: src/main.py:5995
+msgid "_Copy"
+msgstr "_Kopiuj"
+
+#: src/main.py:5996
+msgid "_Paste"
+msgstr "_Wklej"
+
+#: src/main.py:5998
+msgid "Select _All"
+msgstr "Zaznacz _Wszystko"
+
+#: src/main.py:5999
+msgid "C_lear Edits"
+msgstr "W_yczyść Edycje"
+
+#: src/main.py:6000
+msgid "_Dismiss All Edits"
+msgstr "_Odrzuć Wszystkie Edycje"
+
+#: src/main.py:6002
+msgid "_Find..."
+msgstr "_Znajdź..."
+
+#: src/main.py:6003
+msgid "Find _Next"
+msgstr "Znajdź _Następny"
+
+#: src/main.py:6004
+msgid "Find Pre_vious"
+msgstr "Znajdź Pop_rzedni"
+
+#: src/main.py:6005
+msgid "_Go To Line..."
+msgstr "_Idź Do Linii..."
+
+#: src/main.py:6007
+msgid "Pr_eferences..."
+msgstr "Pr_eferencje..."
+
+#: src/main.py:6009
+msgid "None"
+msgstr "Brak"
+
+#: src/main.py:6017
+msgid "_View"
+msgstr "_Widok"
+
+#: src/main.py:6018
+msgid "_Syntax Highlighting"
+msgstr "_Podświetlanie Składni"
+
+#: src/main.py:6020
+msgid "Re_align All"
+msgstr "Wy_równaj Wszystko"
+
+#: src/main.py:6021
+msgid "_Isolate"
+msgstr "_Odizoluj"
+
+#: src/main.py:6023
+msgid "_First Difference"
+msgstr "_Pierwsza Różnica"
+
+#: src/main.py:6024
+msgid "_Previous Difference"
+msgstr "_Poprzednia Różnica"
+
+#: src/main.py:6025
+msgid "_Next Difference"
+msgstr "_Następna Różnica"
+
+#: src/main.py:6026
+msgid "_Last Difference"
+msgstr "_Ostatnia Różnica"
+
+#: src/main.py:6028
+msgid "Fir_st Tab"
+msgstr "Pie_rwsza Karta"
+
+#: src/main.py:6029
+msgid "Pre_vious Tab"
+msgstr "Pop_rzednia Karta"
+
+#: src/main.py:6030
+msgid "Next _Tab"
+msgstr "Następna _Karta"
+
+#: src/main.py:6031
+msgid "Las_t Tab"
+msgstr "Osta_tnia Karta"
+
+#: src/main.py:6033
+msgid "Shift Pane _Right"
+msgstr "Przesuń Okno w _Prawo"
+
+#: src/main.py:6034
+msgid "Shift Pane _Left"
+msgstr "Przesuń Okno w _Lewo"
+
+#: src/main.py:6036
+msgid "F_ormat"
+msgstr "F_ormat"
+
+#: src/main.py:6037
+msgid "Convert To _Upper Case"
+msgstr "Konwertuj Na _Duże Litery"
+
+#: src/main.py:6038
+msgid "Convert To _Lower Case"
+msgstr "Konwertuj Na _Małe Litery"
+
+#: src/main.py:6040
+msgid "Sort Lines In _Ascending Order"
+msgstr "Sortuj Wiersze w Kolejności _Rosnącej"
+
+#: src/main.py:6041
+msgid "Sort Lines In D_escending Order"
+msgstr "Sortuj Wiersze w Kolejności M_alejącej"
+
+#: src/main.py:6043
+msgid "Remove Trailing _White Space"
+msgstr "Usuń Zbędne Spacje"
+
+#: src/main.py:6044
+msgid "Convert Tabs To _Spaces"
+msgstr "Konwertuj Tabulacje Na _Spacje"
+
+#: src/main.py:6045
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "Konwertuj Spacje Na _Tabulacje"
+
+#: src/main.py:6047
+msgid "_Increase Indenting"
+msgstr "_Zwiększ Wcięcie"
+
+#: src/main.py:6048
+msgid "De_crease Indenting"
+msgstr "Zm_niejsz Wcięcie"
+
+#: src/main.py:6050
+msgid "Convert To _DOS Format"
+msgstr "Konwertuj Do Formatu _DOS"
+
+#: src/main.py:6051
+msgid "Convert To _Mac Format"
+msgstr "Konwertuj Do Formatu _Mac"
+
+#: src/main.py:6052
+msgid "Convert To Uni_x Format"
+msgstr "Konwertuj Do Formatu Uni_x"
+
+#: src/main.py:6054
+msgid "_Merge"
+msgstr "_Połącz"
+
+#: src/main.py:6055
+msgid "Copy Selection _Right"
+msgstr "Skopiuj Zaznaczenie w _Prawo"
+
+#: src/main.py:6056
+msgid "Copy Selection _Left"
+msgstr "Skopiuj Zaznaczenie w _Lewo"
+
+#: src/main.py:6058
+msgid "Copy Left _Into Selection"
+msgstr "Skopiuj z Lewej _Do Zaznaczenia"
+
+#: src/main.py:6059
+msgid "Copy Right I_nto Selection"
+msgstr "Skopiuj z Prawej _Do Zaznaczenia"
+
+#: src/main.py:6060
+msgid "_Merge From Left Then Right"
+msgstr "_Scal z Lewej Potem Prawej"
+
+#: src/main.py:6061
+msgid "M_erge From Right Then Left"
+msgstr "S_cal z Prawej Potem Lewej"
+
+#: src/main.py:6063
+msgid "_Help"
+msgstr "_Pomoc"
+
+#: src/main.py:6064
+msgid "_Help Contents..."
+msgstr "_Pomoc Ogólna..."
+
+#: src/main.py:6066
+#, python-format
+msgid "_About %s..."
+msgstr "_O %s..."
+
+#: src/main.py:6080
+msgid "New 2-Way File Merge"
+msgstr "Nowy Łączenia 2 Plików"
+
+#: src/main.py:6081
+msgid "New 3-Way File Merge"
+msgstr "Nowy Łączenia 3 Plików"
+
+#: src/main.py:6083
+msgid "Realign All"
+msgstr "Wyrównaj Wszystko"
+
+#: src/main.py:6084
+msgid "First Difference"
+msgstr "Pierwsza Różnica"
+
+#: src/main.py:6085
+msgid "Previous Difference"
+msgstr "Poprzednia Różnica"
+
+#: src/main.py:6086
+msgid "Next Difference"
+msgstr "Następna Różnica"
+
+#: src/main.py:6087
+msgid "Last Difference"
+msgstr "Ostatnia Różnica"
+
+#: src/main.py:6089
+msgid "Copy Selection Right"
+msgstr "Skopiuj Zaznaczenie w Prawo"
+
+#: src/main.py:6090
+msgid "Copy Selection Left"
+msgstr "Skopiuj Zaznaczenie w Lewo"
+
+#: src/main.py:6091
+msgid "Copy Left Into Selection"
+msgstr "Skopiuj z Lewej Do Zaznaczenia"
+
+#: src/main.py:6092
+msgid "Copy Right Into Selection"
+msgstr "Skopiuj z Prawej Do Zaznaczenia"
+
+#: src/main.py:6093
+msgid "Merge From Left Then Right"
+msgstr "Scal z Lewej Potem Prawej"
+
+#: src/main.py:6094
+msgid "Merge From Right Then Left"
+msgstr "Scal z Prawej Potem Lewej"
+
+#: src/main.py:6096
+msgid "Undo"
+msgstr "Cofnij"
+
+#: src/main.py:6097
+msgid "Redo"
+msgstr "Ponów"
+
+#: src/main.py:6221
+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/main.py:6234
+msgid "Tab"
+msgstr "Karta"
+
+#: src/main.py:6239
+msgid "Pane"
+msgstr "Okno"
+
+#: src/main.py:6250
+msgid "Close _Without Saving"
+msgstr "Zamknij _Bez Zapisywania"
+
+#: src/main.py:6361
+#, python-format
+msgid "File Merge %d"
+msgstr "Scal Plik %d"
+
+#: src/main.py:6464
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "Błąd odzyskiwania commits dla %s."
+
+#: src/main.py:6493
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "Błąd odzyskiwania modyfikacji dla % s."
+
+#: src/main.py:6523
+msgid "Open File In New Tab"
+msgstr "Otwórz Plik w Nowej Karcie"
+
+#: src/main.py:6539
+msgid "Choose Folder With Modified Files"
+msgstr "Wybierz Folder z Zmodyfikowanymi Plikami"
+
+#: src/main.py:6552
+msgid "No modified files found."
+msgstr "Nie znaleziono zmodyfikowanych plików."
+
+#: src/main.py:6557
+msgid "Choose Folder With Commit"
+msgstr "Wybierz Folder z Commit"
+
+#: src/main.py:6570
+msgid "No committed files found."
+msgstr "Nie znaleziono plików commit"
+
+#: src/main.py:6604
+msgid "New N-Way File Merge..."
+msgstr "Nowy N-Sposób Łączenia Pliku..."
+
+#: src/main.py:6604
+msgid "Number of panes: "
+msgstr "Ilość okien: "
+
+#: src/main.py:6669
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "Frazy nie znaleziono. Kontynuowane od końca pliku?"
+
+#: src/main.py:6671
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "Frazy nie znaleziono. Kontynuowane od początku pliku?"
+
+#: src/main.py:6819
 msgid ""
 "Usage:\n"
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
@@ -107,763 +1063,30 @@ msgstr ""
 "  ( -i | --ignore-case )           Ignoruj wielkości liter\n"
 "  ( -w | --ignore-all-space )      Ignoruj różnice w spacji"
 
-#: src/usr/bin/diffuse.py.in:716
-#, python-format
-msgid "Error processing line %(line)d of %(file)s."
-msgstr "Błąd przetwarzania linii %(line)d w %(file)s."
-
-#: src/usr/bin/diffuse.py.in:735
-msgid "Auto Detect"
-msgstr "Automatyczne Wykrywanie"
-
-#: src/usr/bin/diffuse.py.in:831
-msgid "Display"
-msgstr "Wyświetl"
-
-#: src/usr/bin/diffuse.py.in:833
-msgid "Font"
-msgstr "Czcionka"
-
-#: src/usr/bin/diffuse.py.in:834
-msgid "Tab width"
-msgstr "Szerokość tabulacji"
-
-#: src/usr/bin/diffuse.py.in:835
-msgid "Show right margin"
-msgstr "Pokaż prawy margines"
-
-#: src/usr/bin/diffuse.py.in:836
-msgid "Right margin"
-msgstr "Prawy margines"
-
-#: src/usr/bin/diffuse.py.in:837
-msgid "Show line numbers"
-msgstr "Pokaż numerowanie linii"
-
-#: src/usr/bin/diffuse.py.in:838
-msgid "Show white space characters"
-msgstr "Pokaż znaki spacji"
-
-#: src/usr/bin/diffuse.py.in:839
-msgid "Ignore case differences"
-msgstr "Ignoruj różnice w wielkość liter"
-
-#: src/usr/bin/diffuse.py.in:840
-msgid "Ignore white space differences"
-msgstr "Ignoruj różnice spacji"
-
-#: src/usr/bin/diffuse.py.in:841 src/usr/bin/diffuse.py.in:849
-msgid "Ignore changes to white space"
-msgstr "Ignoruj zmiany w spacji"
-
-#: src/usr/bin/diffuse.py.in:842
-msgid "Ignore blank line differences"
-msgstr "Ignoruj różnice pustych linii"
-
-#: src/usr/bin/diffuse.py.in:843
-msgid "Ignore end of line differences"
-msgstr "Ignoruj różnice na końcu linii"
-
-#: src/usr/bin/diffuse.py.in:845
-msgid "Alignment"
-msgstr "Dostosowanie"
-
-#: src/usr/bin/diffuse.py.in:847
-msgid "Ignore case"
-msgstr "Ignoruj wielkość liter"
-
-#: src/usr/bin/diffuse.py.in:848
-msgid "Ignore white space"
-msgstr "Ignoruj spacje"
-
-#: src/usr/bin/diffuse.py.in:850
-msgid "Ignore blank lines"
-msgstr "Ignoruj puste wiersze"
-
-#: src/usr/bin/diffuse.py.in:851
-msgid "Ignore end of line characters"
-msgstr "Ignoruj końcowe znaki linii"
-
-#: src/usr/bin/diffuse.py.in:853
-msgid "Editor"
-msgstr "Edytor"
-
-#: src/usr/bin/diffuse.py.in:855
-msgid "Auto indent"
-msgstr "Automatyczne wcięcia"
-
-#: src/usr/bin/diffuse.py.in:856
-msgid "Expand tabs to spaces"
-msgstr "Zamiana tabulacji na spacje"
-
-#: src/usr/bin/diffuse.py.in:857
-msgid "Soft tab width"
-msgstr "Miękka szerokość tabulacji"
-
-#: src/usr/bin/diffuse.py.in:859
-msgid "Tabs"
-msgstr "Karty"
-
-#: src/usr/bin/diffuse.py.in:861
-msgid "Default panes"
-msgstr "Domyślne Okna"
-
-#: src/usr/bin/diffuse.py.in:862
-msgid "Always show the tab bar"
-msgstr "Zawsze pokazuj pasek kart"
-
-#: src/usr/bin/diffuse.py.in:863
-#, python-format
-msgid "Warn me when closing a tab will quit %s"
-msgstr "Ostrzegaj mnie gdy zamknięcie karty zakończy %s."
-
-#: src/usr/bin/diffuse.py.in:865
-msgid "Regional Settings"
-msgstr "Regionalne Ustawienia"
-
-#: src/usr/bin/diffuse.py.in:867
-msgid "Default codec"
-msgstr "Domyślne kodowanie znaków"
-
-#: src/usr/bin/diffuse.py.in:868
-msgid "Order of codecs used to identify encoding"
-msgstr "Kolejny kodek używany do identyfikacji kodowania"
-
-#: src/usr/bin/diffuse.py.in:888
-msgid "Cygwin"
-msgstr "Cygwin"
-
-#: src/usr/bin/diffuse.py.in:890
-msgid "Root directory"
-msgstr "Główny katalog"
-
-#: src/usr/bin/diffuse.py.in:891
-msgid "Cygdrive prefix"
-msgstr "Cygdrive Prefiks "
-
-#: src/usr/bin/diffuse.py.in:907
-msgid "Version control system search order"
-msgstr ""
-
-#: src/usr/bin/diffuse.py.in:913
-msgid "\"co\" command"
-msgstr "\"co\" polecenie"
-
-#: src/usr/bin/diffuse.py.in:914
-msgid "\"rlog\" command"
-msgstr "\"rlog\" polecenie"
-
-#: src/usr/bin/diffuse.py.in:916
-msgid "Command"
-msgstr "Polecenie"
-
-#: src/usr/bin/diffuse.py.in:918
-msgid "Launch from a Bash login shell"
-msgstr "Uruchom z powłoki Bash"
-
-#: src/usr/bin/diffuse.py.in:920
-msgid "Update paths for Cygwin"
-msgstr "Aktualizacja ścieżki dla Cygwin"
-
-#: src/usr/bin/diffuse.py.in:924
-msgid "Version Control"
-msgstr "Wersja kontrolna"
-
-#: src/usr/bin/diffuse.py.in:988
-msgid "Preferences"
-msgstr "Preferencje"
-
-#: src/usr/bin/diffuse.py.in:1029 src/usr/bin/diffuse.py.in:7295
-#, python-format
-msgid "Error writing %s."
-msgstr "Błąd zapisu %s."
-
-#: src/usr/bin/diffuse.py.in:1656 src/usr/bin/diffuse.py.in:2273
-#: src/usr/bin/diffuse.py.in:2417
-#, python-format
-msgid "Error parsing revision %s."
-msgstr "Błąd analizowania rewizji %s."
-
-#: src/usr/bin/diffuse.py.in:2658
-#, python-format
-msgid "Error parsing %s."
-msgstr "Błędy analizowania %s."
-
-#: src/usr/bin/diffuse.py.in:4778
-msgid "Align with Selection"
-msgstr "Wyrównaj do zaznaczenia"
-
-#: src/usr/bin/diffuse.py.in:4779
-msgid "Isolate"
-msgstr "Oddziel"
-
-#: src/usr/bin/diffuse.py.in:4780
-msgid "Merge Selection"
-msgstr "Scal Zaznaczenie"
-
-#: src/usr/bin/diffuse.py.in:4782 src/usr/bin/diffuse.py.in:7593
-msgid "Cut"
-msgstr "Wytnij"
-
-#: src/usr/bin/diffuse.py.in:4783 src/usr/bin/diffuse.py.in:7594
-msgid "Copy"
-msgstr "Kopiuj"
-
-#: src/usr/bin/diffuse.py.in:4784 src/usr/bin/diffuse.py.in:7595
-msgid "Paste"
-msgstr "Wklej"
-
-#: src/usr/bin/diffuse.py.in:4786
-msgid "Select All"
-msgstr "Zaznacz Wszystko"
-
-#: src/usr/bin/diffuse.py.in:4787 src/usr/bin/diffuse.py.in:7596
-msgid "Clear Edits"
-msgstr "Wyczyść Edycje"
-
-#: src/usr/bin/diffuse.py.in:4789
-msgid "Swap with Selected Pane"
-msgstr "Zamień z Zaznaczonym Oknem"
-
-#: src/usr/bin/diffuse.py.in:6620
-msgid "Find..."
-msgstr "Szukaj..."
-
-#: src/usr/bin/diffuse.py.in:6628
-msgid "Search For: "
-msgstr "Szukaj Dla: "
-
-#: src/usr/bin/diffuse.py.in:6653
-msgid "Match Case"
-msgstr "Uwzględnij wielkość liter"
-
-#: src/usr/bin/diffuse.py.in:6658
-msgid "Search Backwards"
-msgstr "Szukaj Wstecz"
-
-#: src/usr/bin/diffuse.py.in:6672
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "Zamknięcie tej karty zakończy %s."
-
-#: src/usr/bin/diffuse.py.in:6694
-msgid "Encoding: "
-msgstr "Kodowanie znaków: "
-
-#: src/usr/bin/diffuse.py.in:6704
-msgid "Revision: "
-msgstr "Rewizia: "
-
-#: src/usr/bin/diffuse.py.in:6768
-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/usr/bin/diffuse.py.in:6773
-msgid "translator-credits"
-msgstr "Miś Uszatek <adres.email@ymail.com>"
-
-#: src/usr/bin/diffuse.py.in:6776
-msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program.  You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
-
-#: src/usr/bin/diffuse.py.in:6811
-msgid "Close Tab"
-msgstr "Zamknij Kartę"
-
-#: src/usr/bin/diffuse.py.in:6866
-msgid "Open File..."
-msgstr "Otwórz Plik..."
-
-#: src/usr/bin/diffuse.py.in:6867
-msgid "Reload File"
-msgstr "Odśwież Plik"
-
-#: src/usr/bin/diffuse.py.in:6868
-msgid "Save File"
-msgstr "Zapisz Plik"
-
-#: src/usr/bin/diffuse.py.in:6869
-msgid "Save File As..."
-msgstr "Zapisz Plik Jako..."
-
-#: src/usr/bin/diffuse.py.in:7014
-msgid "Save changes before loading the new file?"
-msgstr "Zapisać zmiany przed wczytaniem nowego pliku?"
-
-#: src/usr/bin/diffuse.py.in:7124
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "Błąd odczytu rewizji %(rev)s z %(file)s."
-
-#: src/usr/bin/diffuse.py.in:7126 src/usr/bin/diffuse.py.in:8359
-#, python-format
-msgid "Error reading %s."
-msgstr "Błąd odczytu %s."
-
-#: src/usr/bin/diffuse.py.in:7149
-msgid "Open File"
-msgstr "Otwórz Plik"
-
-#: src/usr/bin/diffuse.py.in:7199
-#, 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/usr/bin/diffuse.py.in:7219
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "Zapisz %(title)s Okno %(pane)d"
-
-#: src/usr/bin/diffuse.py.in:7245
-#, 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/usr/bin/diffuse.py.in:7250
-#, 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/usr/bin/diffuse.py.in:7291
-#, python-format
-msgid "Error encoding to %s."
-msgstr "Błąd kodowania dla %s."
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Go To Line..."
-msgstr "Idź Do Linii..."
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Line Number: "
-msgstr "Numer Linii: "
-
-#: src/usr/bin/diffuse.py.in:7351
-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/usr/bin/diffuse.py.in:7353
-msgid "Press the escape key to finish editing."
-msgstr "Naciśnij klawisz escape, aby zakończyć edycję."
-
-#: src/usr/bin/diffuse.py.in:7355
-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/usr/bin/diffuse.py.in:7466
-msgid "_File"
-msgstr "_Plik"
-
-#: src/usr/bin/diffuse.py.in:7467
-msgid "_Open File..."
-msgstr "_Otwórz Plik..."
-
-#: src/usr/bin/diffuse.py.in:7468
-msgid "Open File In New _Tab..."
-msgstr "Otwórz Plik w Nowej _Karcie..."
-
-#: src/usr/bin/diffuse.py.in:7469
-msgid "Open _Modified Files..."
-msgstr "Otwórz _Zmodyfikowany Plik..."
-
-#: src/usr/bin/diffuse.py.in:7470
-msgid "Open Commi_t..."
-msgstr "Otwórz Commi_t..."
-
-#: src/usr/bin/diffuse.py.in:7471
-msgid "_Reload File"
-msgstr "_Odśwież Plik"
-
-#: src/usr/bin/diffuse.py.in:7473
-msgid "_Save File"
-msgstr "_Zapisz plik"
-
-#: src/usr/bin/diffuse.py.in:7474
-msgid "Save File _As..."
-msgstr "Zapisz Plik _Jako..."
-
-#: src/usr/bin/diffuse.py.in:7475
-msgid "Save A_ll"
-msgstr "Zapisz W_szystko"
-
-#: src/usr/bin/diffuse.py.in:7477
-msgid "New _2-Way File Merge"
-msgstr "Nowy Łączenia _2 Plików"
-
-#: src/usr/bin/diffuse.py.in:7478
-msgid "New _3-Way File Merge"
-msgstr "Nowy Łączenia _3 Plików"
-
-#: src/usr/bin/diffuse.py.in:7479
-msgid "New _N-Way File Merge..."
-msgstr "Nowy _N-Sposób Łączenia Pliku..."
-
-#: src/usr/bin/diffuse.py.in:7481
-msgid "_Close Tab"
-msgstr "_Zamknij Kartę"
-
-#: src/usr/bin/diffuse.py.in:7482
-msgid "_Undo Close Tab"
-msgstr "_Przywróć Zamkniętą Kartę"
-
-#: src/usr/bin/diffuse.py.in:7483
-msgid "_Quit"
-msgstr "_Zamknij"
-
-#: src/usr/bin/diffuse.py.in:7485
-msgid "_Edit"
-msgstr "_Edytuj"
-
-#: src/usr/bin/diffuse.py.in:7486
-msgid "_Undo"
-msgstr "_Cofnij"
-
-#: src/usr/bin/diffuse.py.in:7487
-msgid "_Redo"
-msgstr "_Ponów"
-
-#: src/usr/bin/diffuse.py.in:7489
-msgid "Cu_t"
-msgstr "Wy_tnij"
-
-#: src/usr/bin/diffuse.py.in:7490
-msgid "_Copy"
-msgstr "_Kopiuj"
-
-#: src/usr/bin/diffuse.py.in:7491
-msgid "_Paste"
-msgstr "_Wklej"
-
-#: src/usr/bin/diffuse.py.in:7493
-msgid "Select _All"
-msgstr "Zaznacz _Wszystko"
-
-#: src/usr/bin/diffuse.py.in:7494
-msgid "C_lear Edits"
-msgstr "W_yczyść Edycje"
-
-#: src/usr/bin/diffuse.py.in:7495
-msgid "_Dismiss All Edits"
-msgstr "_Odrzuć Wszystkie Edycje"
-
-#: src/usr/bin/diffuse.py.in:7497
-msgid "_Find..."
-msgstr "_Znajdź..."
-
-#: src/usr/bin/diffuse.py.in:7498
-msgid "Find _Next"
-msgstr "Znajdź _Następny"
-
-#: src/usr/bin/diffuse.py.in:7499
-msgid "Find Pre_vious"
-msgstr "Znajdź Pop_rzedni"
-
-#: src/usr/bin/diffuse.py.in:7500
-msgid "_Go To Line..."
-msgstr "_Idź Do Linii..."
-
-#: src/usr/bin/diffuse.py.in:7502
-msgid "Pr_eferences..."
-msgstr "Pr_eferencje..."
-
-#: src/usr/bin/diffuse.py.in:7504
-msgid "None"
-msgstr "Brak"
-
-#: src/usr/bin/diffuse.py.in:7512
-msgid "_View"
-msgstr "_Widok"
-
-#: src/usr/bin/diffuse.py.in:7513
-msgid "_Syntax Highlighting"
-msgstr "_Podświetlanie Składni"
-
-#: src/usr/bin/diffuse.py.in:7515
-msgid "Re_align All"
-msgstr "Wy_równaj Wszystko"
-
-#: src/usr/bin/diffuse.py.in:7516
-msgid "_Isolate"
-msgstr "_Odizoluj"
-
-#: src/usr/bin/diffuse.py.in:7518
-msgid "_First Difference"
-msgstr "_Pierwsza Różnica"
-
-#: src/usr/bin/diffuse.py.in:7519
-msgid "_Previous Difference"
-msgstr "_Poprzednia Różnica"
-
-#: src/usr/bin/diffuse.py.in:7520
-msgid "_Next Difference"
-msgstr "_Następna Różnica"
-
-#: src/usr/bin/diffuse.py.in:7521
-msgid "_Last Difference"
-msgstr "_Ostatnia Różnica"
-
-#: src/usr/bin/diffuse.py.in:7523
-msgid "Fir_st Tab"
-msgstr "Pie_rwsza Karta"
-
-#: src/usr/bin/diffuse.py.in:7524
-msgid "Pre_vious Tab"
-msgstr "Pop_rzednia Karta"
-
-#: src/usr/bin/diffuse.py.in:7525
-msgid "Next _Tab"
-msgstr "Następna _Karta"
-
-#: src/usr/bin/diffuse.py.in:7526
-msgid "Las_t Tab"
-msgstr "Osta_tnia Karta"
-
-#: src/usr/bin/diffuse.py.in:7528
-msgid "Shift Pane _Right"
-msgstr "Przesuń Okno w _Prawo"
-
-#: src/usr/bin/diffuse.py.in:7529
-msgid "Shift Pane _Left"
-msgstr "Przesuń Okno w _Lewo"
-
-#: src/usr/bin/diffuse.py.in:7531
-msgid "F_ormat"
-msgstr "F_ormat"
-
-#: src/usr/bin/diffuse.py.in:7532
-msgid "Convert To _Upper Case"
-msgstr "Konwertuj Na _Duże Litery"
-
-#: src/usr/bin/diffuse.py.in:7533
-msgid "Convert To _Lower Case"
-msgstr "Konwertuj Na _Małe Litery"
-
-#: src/usr/bin/diffuse.py.in:7535
-msgid "Sort Lines In _Ascending Order"
-msgstr "Sortuj Wiersze w Kolejności _Rosnącej"
-
-#: src/usr/bin/diffuse.py.in:7536
-msgid "Sort Lines In D_escending Order"
-msgstr "Sortuj Wiersze w Kolejności M_alejącej"
-
-#: src/usr/bin/diffuse.py.in:7538
-msgid "Remove Trailing _White Space"
-msgstr "Usuń Zbędne Spacje"
-
-#: src/usr/bin/diffuse.py.in:7539
-msgid "Convert Tabs To _Spaces"
-msgstr "Konwertuj Tabulacje Na _Spacje"
-
-#: src/usr/bin/diffuse.py.in:7540
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "Konwertuj Spacje Na _Tabulacje"
-
-#: src/usr/bin/diffuse.py.in:7542
-msgid "_Increase Indenting"
-msgstr "_Zwiększ Wcięcie"
-
-#: src/usr/bin/diffuse.py.in:7543
-msgid "De_crease Indenting"
-msgstr "Zm_niejsz Wcięcie"
-
-#: src/usr/bin/diffuse.py.in:7545
-msgid "Convert To _DOS Format"
-msgstr "Konwertuj Do Formatu _DOS"
-
-#: src/usr/bin/diffuse.py.in:7546
-msgid "Convert To _Mac Format"
-msgstr "Konwertuj Do Formatu _Mac"
-
-#: src/usr/bin/diffuse.py.in:7547
-msgid "Convert To Uni_x Format"
-msgstr "Konwertuj Do Formatu Uni_x"
-
-#: src/usr/bin/diffuse.py.in:7549
-msgid "_Merge"
-msgstr "_Połącz"
-
-#: src/usr/bin/diffuse.py.in:7550
-msgid "Copy Selection _Right"
-msgstr "Skopiuj Zaznaczenie w _Prawo"
-
-#: src/usr/bin/diffuse.py.in:7551
-msgid "Copy Selection _Left"
-msgstr "Skopiuj Zaznaczenie w _Lewo"
-
-#: src/usr/bin/diffuse.py.in:7553
-msgid "Copy Left _Into Selection"
-msgstr "Skopiuj z Lewej _Do Zaznaczenia"
-
-#: src/usr/bin/diffuse.py.in:7554
-msgid "Copy Right I_nto Selection"
-msgstr "Skopiuj z Prawej _Do Zaznaczenia"
-
-#: src/usr/bin/diffuse.py.in:7555
-msgid "_Merge From Left Then Right"
-msgstr "_Scal z Lewej Potem Prawej"
-
-#: src/usr/bin/diffuse.py.in:7556
-msgid "M_erge From Right Then Left"
-msgstr "S_cal z Prawej Potem Lewej"
-
-#: src/usr/bin/diffuse.py.in:7558
-msgid "_Help"
-msgstr "_Pomoc"
-
-#: src/usr/bin/diffuse.py.in:7559
-msgid "_Help Contents..."
-msgstr "_Pomoc Ogólna..."
-
-#: src/usr/bin/diffuse.py.in:7561
-#, python-format
-msgid "_About %s..."
-msgstr "_O %s..."
-
-#: src/usr/bin/diffuse.py.in:7575
-msgid "New 2-Way File Merge"
-msgstr "Nowy Łączenia 2 Plików"
-
-#: src/usr/bin/diffuse.py.in:7576
-msgid "New 3-Way File Merge"
-msgstr "Nowy Łączenia 3 Plików"
-
-#: src/usr/bin/diffuse.py.in:7578
-msgid "Realign All"
-msgstr "Wyrównaj Wszystko"
-
-#: src/usr/bin/diffuse.py.in:7579
-msgid "First Difference"
-msgstr "Pierwsza Różnica"
-
-#: src/usr/bin/diffuse.py.in:7580
-msgid "Previous Difference"
-msgstr "Poprzednia Różnica"
-
-#: src/usr/bin/diffuse.py.in:7581
-msgid "Next Difference"
-msgstr "Następna Różnica"
-
-#: src/usr/bin/diffuse.py.in:7582
-msgid "Last Difference"
-msgstr "Ostatnia Różnica"
-
-#: src/usr/bin/diffuse.py.in:7584
-msgid "Copy Selection Right"
-msgstr "Skopiuj Zaznaczenie w Prawo"
-
-#: src/usr/bin/diffuse.py.in:7585
-msgid "Copy Selection Left"
-msgstr "Skopiuj Zaznaczenie w Lewo"
-
-#: src/usr/bin/diffuse.py.in:7586
-msgid "Copy Left Into Selection"
-msgstr "Skopiuj z Lewej Do Zaznaczenia"
-
-#: src/usr/bin/diffuse.py.in:7587
-msgid "Copy Right Into Selection"
-msgstr "Skopiuj z Prawej Do Zaznaczenia"
-
-#: src/usr/bin/diffuse.py.in:7588
-msgid "Merge From Left Then Right"
-msgstr "Scal z Lewej Potem Prawej"
-
-#: src/usr/bin/diffuse.py.in:7589
-msgid "Merge From Right Then Left"
-msgstr "Scal z Prawej Potem Lewej"
-
-#: src/usr/bin/diffuse.py.in:7591
-msgid "Undo"
-msgstr "Cofnij"
-
-#: src/usr/bin/diffuse.py.in:7592
-msgid "Redo"
-msgstr "Ponów"
-
-#: src/usr/bin/diffuse.py.in:7716
-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/usr/bin/diffuse.py.in:7729
-msgid "Tab"
-msgstr "Karta"
-
-#: src/usr/bin/diffuse.py.in:7734
-msgid "Pane"
-msgstr "Okno"
-
-#: src/usr/bin/diffuse.py.in:7745
-msgid "Close _Without Saving"
-msgstr "Zamknij _Bez Zapisywania"
-
-#: src/usr/bin/diffuse.py.in:7856
-#, python-format
-msgid "File Merge %d"
-msgstr "Scal Plik %d"
-
-#: src/usr/bin/diffuse.py.in:7959
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "Błąd odzyskiwania commits dla %s."
-
-#: src/usr/bin/diffuse.py.in:7990
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "Błąd odzyskiwania modyfikacji dla % s."
-
-#: src/usr/bin/diffuse.py.in:8022
-msgid "Open File In New Tab"
-msgstr "Otwórz Plik w Nowej Karcie"
-
-#: src/usr/bin/diffuse.py.in:8038
-msgid "Choose Folder With Modified Files"
-msgstr "Wybierz Folder z Zmodyfikowanymi Plikami"
-
-#: src/usr/bin/diffuse.py.in:8051
-msgid "No modified files found."
-msgstr "Nie znaleziono zmodyfikowanych plików."
-
-#: src/usr/bin/diffuse.py.in:8058
-msgid "Choose Folder With Commit"
-msgstr "Wybierz Folder z Commit"
-
-#: src/usr/bin/diffuse.py.in:8071
-msgid "No committed files found."
-msgstr "Nie znaleziono plików commit"
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "New N-Way File Merge..."
-msgstr "Nowy N-Sposób Łączenia Pliku..."
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "Number of panes: "
-msgstr "Ilość okien: "
-
-#: src/usr/bin/diffuse.py.in:8172
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "Frazy nie znaleziono. Kontynuowane od końca pliku?"
-
-#: src/usr/bin/diffuse.py.in:8174
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "Frazy nie znaleziono. Kontynuowane od początku pliku?"
-
-#: src/usr/bin/diffuse.py.in:8440
+#: src/main.py:6990
 msgid "Error parsing line number."
 msgstr "Błąd analizowania numer linii."
 
-#: src/usr/bin/diffuse.py.in:8450
+#: src/main.py:7000
 #, python-format
 msgid "Skipping unknown argument \"%s\"."
 msgstr "Pomijanie nieznanego argumentu \"%s\"."
 
-#: src/usr/bin/diffuse.py.in:8457
+#: src/main.py:7007
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Błąd przetwarzania argumentu \"%s\". Nie oczekiwano katalogu."
 
+#: src/vcs/cvs.py:50 src/vcs/rcs.py:54 src/vcs/svn.py:89
+#, python-format
+msgid "Error parsing revision %s."
+msgstr "Błąd analizowania rewizji %s."
+
+#: src/vcs/vcs_registry.py:216
+#, python-format
+msgid "Error parsing %s."
+msgstr "Błędy analizowania %s."
+
 #, python-format
 #~ msgid "Column %d"
 #~ msgstr "Kolumna%d"
diff --git a/po/pt.po b/po/pt.po
index 0dd7e7d..f961940 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: 2020-12-08 13:51-0500\n"
+"POT-Creation-Date: 2021-11-18 15:21-0500\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator: Pedro Albuquerque <pmra@gmx.com>\n"
 "Language-Team: Português <pmra@gmx.com>\n"
@@ -22,19 +22,981 @@ msgstr ""
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: data/diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:4
 msgid "Diffuse Merge Tool"
 msgstr "Diffuse Ferramenta de união"
 
-#: data/diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:5
 msgid "Graphical tool for merging and comparing text files"
 msgstr "Ferramenta gráfica para unir e comparar ficheiros de texto"
 
-#: src/usr/bin/diffuse.py.in:70
+#: data/io.github.mightycreak.Diffuse.metainfo.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."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:19
+msgid "Main window: diff between two files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:26
+msgid "Patch release to fix a bug when using the Flatpak package."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:29
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:71
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:146
+msgid "Fixed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:31
+msgid "Fixed a Flatpak bug where the app couldn't call binaries on the host, such as `git`, `svn`, etc."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:40
+msgid "With this release, the main end-user change is the new icon. The rest is mainly maintenance improvements with a much more standard folder structure and starting to modularize the code. This is an ongoing effort as there is still a lot to do, but hopefully this would motivate some to contribute ;)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:47
+msgid "An important note though: the application ID has changed and is now io.github.mightycreak.Diffuse."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:51
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:89
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:123
+msgid "Added:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:53
+msgid "New icon and in SVG now"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:54
+msgid "Started to modularize the code"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:56
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:93
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:136
+msgid "Changed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:58
+msgid "Changed AppID to io.github.mightycreak.Diffuse (as advised in the Flatpak documentation)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:62
+msgid "Renamed directory `translations/` to `po/`"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:63
+msgid "Now uses POTFILES.in to list the files to translate"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:64
+msgid "Translation strings are no longer sorted alphabetically, this will help when there will be several files in POTFILES.in"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:68
+msgid "Updated the documentation and script in the `po/` directory"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:69
+msgid "Add .desktop translations in .po files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:73
+msgid "Fixed some GTK deprecation warnings"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:79
+msgid "Mainly under the hood changes in this release, so nothing really visible to the users in this version. That said, I figured it was a long time since the last release (4 months ago) and, as promised, I want Diffuse development to be a bit more active and iterative."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:85
+msgid "Apart from the maintenance changes 🧰, I think the main improvement is that Diffuse will soon be available through Flathub!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:91
+msgid "New Flatpak package, published on Flathub: com.github.mightycreak.Diffuse"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:95
+msgid "Replace old install.py with the more standard Meson"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:96
+msgid "Remove u string prefixes since Python 3 is in UTF-8 by default"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:97
+msgid "Replaced some interpolation operators (%) for the f string prefix"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:98
+msgid "Use the window scale factor for the icons generation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:104
+msgid "Here is the v0.5.0. Unintentionally, this release happens exactly 6 years after the previous v0.4.8 release!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:108
+msgid "There is a lot to do on this application, and some features didn't make the release. The main one being the Windows installers. I think 6 years is too long to continue to wait until this bug is fixed. The Python scripts should work on Windows, but no executable is produced (yet) with the release."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:115
+msgid "Other than that, Diffuse v0.5.0 is now officially compatible with Python 3 and GTK 3! And it is synced to the latest commits from upstream (which were never released)."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:120
+msgid "The next version will not take 6 years, I promise you! 😄"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:125
+msgid "Added Pedro Albuquerque's Portuguese translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:126
+msgid "Added Åke Engelbrektson's Swedish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:127
+msgid "Added Guillaume Hoffmann's Darcs support improvements"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:128
+msgid "Added Akom Chotiphantawanon's Thai translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:129
+msgid "Added support for Git submodules"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:130
+msgid "Added a preference and command line option to specify the version control system search order"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:131
+msgid "Added .editorconfig file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:132
+msgid "Added .gitignore file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:133
+msgid "Added message when removing files during uninstallation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:134
+msgid "Added Python script to update all the translation files at once"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:138
+msgid "Convert to Python 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:139
+msgid "Convert to GTK 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:140
+msgid "Updated Python highlighting for Python 3 grammar"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:141
+msgid "Updated copyrights years and authors"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:142
+msgid "Improve Spanish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:143
+msgid "Convert translation README to MarkDown"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:144
+msgid "Updated all the translation files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:148
+msgid "Fixed wrong icons directory for gtk-update-icon-cache"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:149
+msgid "Fixed missing directories when uninstalling"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:150
+msgid "Fixed bug introduced by r420 with RCS VCS"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:151
+msgid "Fixed broken drag'n'drop since migration to Python3/GTK3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:152
+msgid "Fixed error when using '-m' in an SVN repo"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:157
+msgid "Romain Failliot"
+msgstr ""
+
+#: src/constants.py.in:23
 msgid "Copyright"
 msgstr ""
 
-#: src/usr/bin/diffuse.py.in:81
+#: src/main.py:591
+#, python-format
+msgid "Error processing line %(line)d of %(file)s."
+msgstr "Erro ao processar a linha %(line)d de %(file)s."
+
+#: src/main.py:610
+msgid "Auto Detect"
+msgstr "Detecção automática"
+
+#: src/main.py:706
+msgid "Display"
+msgstr "Mostrar"
+
+#: src/main.py:708
+msgid "Font"
+msgstr "Letra"
+
+#: src/main.py:709
+msgid "Tab width"
+msgstr "Largura de tabulação"
+
+#: src/main.py:710
+msgid "Show right margin"
+msgstr "Mostrar margem direita"
+
+#: src/main.py:711
+msgid "Right margin"
+msgstr "Margem direita"
+
+#: src/main.py:712
+msgid "Show line numbers"
+msgstr "Mostrar números de linha"
+
+#: src/main.py:713
+msgid "Show white space characters"
+msgstr "Mostrar espaços em branco"
+
+#: src/main.py:714
+msgid "Ignore case differences"
+msgstr "Ignorar diferenças de maiúsculas"
+
+#: src/main.py:715
+msgid "Ignore white space differences"
+msgstr "Ignorar diferenças de espaços"
+
+#: src/main.py:716 src/main.py:724
+msgid "Ignore changes to white space"
+msgstr "Ignorar alterações a espaços"
+
+#: src/main.py:717
+msgid "Ignore blank line differences"
+msgstr "Ignorar diferenças de linhas em branco"
+
+#: src/main.py:718
+msgid "Ignore end of line differences"
+msgstr "Ignorar diferenças de fins de linha"
+
+#: src/main.py:720
+msgid "Alignment"
+msgstr "Alinhamento"
+
+#: src/main.py:722
+msgid "Ignore case"
+msgstr "Ignorar maiúsculas"
+
+#: src/main.py:723
+msgid "Ignore white space"
+msgstr "Ignorar espaços"
+
+#: src/main.py:725
+msgid "Ignore blank lines"
+msgstr "Ignorar linhas em branco"
+
+#: src/main.py:726
+msgid "Ignore end of line characters"
+msgstr "Ignorar caracteres de fim de linha"
+
+#: src/main.py:728
+msgid "Editor"
+msgstr "Editor"
+
+#: src/main.py:730
+msgid "Auto indent"
+msgstr "Indentação automática"
+
+#: src/main.py:731
+msgid "Expand tabs to spaces"
+msgstr "Expandir tabulações para espaços"
+
+#: src/main.py:732
+msgid "Soft tab width"
+msgstr "Largura de tabulação suave"
+
+#: src/main.py:734
+msgid "Tabs"
+msgstr "Separadores"
+
+#: src/main.py:736
+msgid "Default panes"
+msgstr "Painéis predefinidos"
+
+#: src/main.py:737
+msgid "Always show the tab bar"
+msgstr "Mostrar sempre a barra de separadores"
+
+#: src/main.py:738
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "Avisar se fechar um separador fecha o %s"
+
+#: src/main.py:740
+msgid "Regional Settings"
+msgstr "Definições regionais"
+
+#: src/main.py:742
+msgid "Default codec"
+msgstr "Codificação predefinida"
+
+#: src/main.py:743
+msgid "Order of codecs used to identify encoding"
+msgstr "Ordem de codificações para identificar a codificação"
+
+#: src/main.py:763
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/main.py:765
+msgid "Root directory"
+msgstr "Pasta raiz"
+
+#: src/main.py:766
+msgid "Cygdrive prefix"
+msgstr "Prefixo cygdrive"
+
+#: src/main.py:782
+msgid "Version control system search order"
+msgstr ""
+
+#: src/main.py:788
+msgid "\"co\" command"
+msgstr "comando \"co\""
+
+#: src/main.py:789
+msgid "\"rlog\" command"
+msgstr "comando \"rlog\""
+
+#: src/main.py:791
+msgid "Command"
+msgstr "Comando"
+
+#: src/main.py:793
+msgid "Launch from a Bash login shell"
+msgstr "Iniciar numa consola de sessão bash"
+
+#: src/main.py:795
+msgid "Update paths for Cygwin"
+msgstr "Actualizar caminhos para o Cygwin"
+
+#: src/main.py:799
+msgid "Version Control"
+msgstr "Controlo de versões"
+
+#: src/main.py:863
+msgid "Preferences"
+msgstr "Preferências"
+
+#: src/main.py:904 src/main.py:5802
+#, python-format
+msgid "Error writing %s."
+msgstr "Erro ao excrever %s."
+
+#: src/main.py:3282
+msgid "Align with Selection"
+msgstr "Alinhar com a selecção"
+
+#: src/main.py:3283
+msgid "Isolate"
+msgstr "Isolar"
+
+#: src/main.py:3284
+msgid "Merge Selection"
+msgstr "Unir selecção"
+
+#: src/main.py:3286 src/main.py:6098
+msgid "Cut"
+msgstr "Cortar"
+
+#: src/main.py:3287 src/main.py:6099
+msgid "Copy"
+msgstr "Copiar"
+
+#: src/main.py:3288 src/main.py:6100
+msgid "Paste"
+msgstr "Colar"
+
+#: src/main.py:3290
+msgid "Select All"
+msgstr "Seleccionar tudo"
+
+#: src/main.py:3291 src/main.py:6101
+msgid "Clear Edits"
+msgstr "Limpar edição"
+
+#: src/main.py:3293
+msgid "Swap with Selected Pane"
+msgstr "Trocar com o painel seleccionado"
+
+#: src/main.py:5124
+msgid "Find..."
+msgstr "Localizar..."
+
+#: src/main.py:5132
+msgid "Search For: "
+msgstr "Procurar por: "
+
+#: src/main.py:5157
+msgid "Match Case"
+msgstr "Comparar maiúsculas"
+
+#: src/main.py:5162
+msgid "Search Backwards"
+msgstr "Procurar para trás"
+
+#: src/main.py:5176
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "Fechar este painel sai do %s."
+
+#: src/main.py:5198
+msgid "Encoding: "
+msgstr "Codificação: "
+
+#: src/main.py:5208
+msgid "Revision: "
+msgstr "Revisão: "
+
+#: src/main.py:5272
+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/main.py:5277
+msgid "translator-credits"
+msgstr "Pedro Albuquerque <pmra@gmx.com>"
+
+#: src/main.py:5281
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"Este programa é gratuito; pode redistribuí-lo e/ou modificá-lo sob os termos da GNU General Public License como publicada pela Free Software Foundation; seja a versão 2 da licença, ou (por opção sua) qualquer versão posterior.\n"
+"\n"
+"Este programa é distribuído na esperança de ser útil, mas SEM QUALQUER GARANTIA; nem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO A UM PROPÓSITO EM PARTICULAR. Veja a GNU General Public License para mais detalhes.\n"
+"\n"
+"Deverá ter recebido uma cópia da GNU General Public License juntamente com o programa. Também pode obter uma cópia da GNU General Public License da Free Software Foundation visitando a sua página web (http://www.fsf.org/) ou escrevendo para Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+
+#: src/main.py:5322
+msgid "Close Tab"
+msgstr "Fechar separador"
+
+#: src/main.py:5377
+msgid "Open File..."
+msgstr "Abrir ficheiro..."
+
+#: src/main.py:5378
+msgid "Reload File"
+msgstr "Recarregar ficheiro"
+
+#: src/main.py:5379
+msgid "Save File"
+msgstr "Gravar ficheiro"
+
+#: src/main.py:5380
+msgid "Save File As..."
+msgstr "Gravar ficheiro como..."
+
+#: src/main.py:5525
+msgid "Save changes before loading the new file?"
+msgstr "Gravar alterações antes de carregar o novo ficheiro?"
+
+#: src/main.py:5635
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "Erro ao ler a revisão %(rev)s de %(file)s."
+
+#: src/main.py:5637 src/main.py:6900
+#, python-format
+msgid "Error reading %s."
+msgstr "Erro ao ler %s."
+
+#: src/main.py:5658
+msgid "Open File"
+msgstr "Abrir ficheiro"
+
+#: src/main.py:5708
+#, 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/main.py:5728
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "Gravar %(title)s painel %(pane)d"
+
+#: src/main.py:5754
+#, 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/main.py:5759
+#, 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/main.py:5800
+#, python-format
+msgid "Error encoding to %s."
+msgstr "Erro ao codificar para %s."
+
+#: src/main.py:5830
+msgid "Go To Line..."
+msgstr "Ir para linha..."
+
+#: src/main.py:5830
+msgid "Line Number: "
+msgstr "Número de linha: "
+
+#: src/main.py:5856
+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/main.py:5858
+msgid "Press the escape key to finish editing."
+msgstr "Prima Esc para terminar a edição."
+
+#: src/main.py:5860
+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/main.py:5971
+msgid "_File"
+msgstr "_Ficheiro"
+
+#: src/main.py:5972
+msgid "_Open File..."
+msgstr "Abrir ficheir_o..."
+
+#: src/main.py:5973
+msgid "Open File In New _Tab..."
+msgstr "Abrir ficheiro em no_vo separador..."
+
+#: src/main.py:5974
+msgid "Open _Modified Files..."
+msgstr "Abrir ficheiros _modificados..."
+
+#: src/main.py:5975
+msgid "Open Commi_t..."
+msgstr "Abrir rev_isão..."
+
+#: src/main.py:5976
+msgid "_Reload File"
+msgstr "_Recarregar ficheiro"
+
+#: src/main.py:5978
+msgid "_Save File"
+msgstr "_Gravar ficheiro"
+
+#: src/main.py:5979
+msgid "Save File _As..."
+msgstr "Gr_avar ficheiro como..."
+
+#: src/main.py:5980
+msgid "Save A_ll"
+msgstr "Gravar _tudo"
+
+#: src/main.py:5982
+msgid "New _2-Way File Merge"
+msgstr "Nova união de _2 vias"
+
+#: src/main.py:5983
+msgid "New _3-Way File Merge"
+msgstr "Nova união de _3 vias"
+
+#: src/main.py:5984
+msgid "New _N-Way File Merge..."
+msgstr "Nova união de _N vias"
+
+#: src/main.py:5986
+msgid "_Close Tab"
+msgstr "Fe_char separador"
+
+#: src/main.py:5987
+msgid "_Undo Close Tab"
+msgstr "Desfa_zer Fechar separador"
+
+#: src/main.py:5988
+msgid "_Quit"
+msgstr "_Sair"
+
+#: src/main.py:5990
+msgid "_Edit"
+msgstr "_Editar"
+
+#: src/main.py:5991
+msgid "_Undo"
+msgstr "_Desfazer"
+
+#: src/main.py:5992
+msgid "_Redo"
+msgstr "_Refazer"
+
+#: src/main.py:5994
+msgid "Cu_t"
+msgstr "Cor_tar"
+
+#: src/main.py:5995
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: src/main.py:5996
+msgid "_Paste"
+msgstr "Co_lar"
+
+#: src/main.py:5998
+msgid "Select _All"
+msgstr "Seleccion_ar tudo"
+
+#: src/main.py:5999
+msgid "C_lear Edits"
+msgstr "_Limpar edição"
+
+#: src/main.py:6000
+msgid "_Dismiss All Edits"
+msgstr "_Descartar toda a edição"
+
+#: src/main.py:6002
+msgid "_Find..."
+msgstr "_Localizar..."
+
+#: src/main.py:6003
+msgid "Find _Next"
+msgstr "Localizar segui_nte"
+
+#: src/main.py:6004
+msgid "Find Pre_vious"
+msgstr "Localizar _anterior"
+
+#: src/main.py:6005
+msgid "_Go To Line..."
+msgstr "_Ir para linha..."
+
+#: src/main.py:6007
+msgid "Pr_eferences..."
+msgstr "Pr_eferências..."
+
+#: src/main.py:6009
+msgid "None"
+msgstr "Nada"
+
+#: src/main.py:6017
+msgid "_View"
+msgstr "_Ver"
+
+#: src/main.py:6018
+msgid "_Syntax Highlighting"
+msgstr "Realce de _sintaxe"
+
+#: src/main.py:6020
+msgid "Re_align All"
+msgstr "Re_alinhar tudo"
+
+#: src/main.py:6021
+msgid "_Isolate"
+msgstr "_Isolar"
+
+#: src/main.py:6023
+msgid "_First Difference"
+msgstr "_Primeira diferença"
+
+#: src/main.py:6024
+msgid "_Previous Difference"
+msgstr "Diferença _anterior"
+
+#: src/main.py:6025
+msgid "_Next Difference"
+msgstr "Diferença segui_nte"
+
+#: src/main.py:6026
+msgid "_Last Difference"
+msgstr "Ú_ltima diferença"
+
+#: src/main.py:6028
+msgid "Fir_st Tab"
+msgstr "P_rimeiro separador"
+
+#: src/main.py:6029
+msgid "Pre_vious Tab"
+msgstr "_Separador anterior"
+
+#: src/main.py:6030
+msgid "Next _Tab"
+msgstr "Separador seguin_te"
+
+#: src/main.py:6031
+msgid "Las_t Tab"
+msgstr "Úl_timo separador"
+
+#: src/main.py:6033
+msgid "Shift Pane _Right"
+msgstr "Mover separador à di_reita"
+
+#: src/main.py:6034
+msgid "Shift Pane _Left"
+msgstr "Mover separador à es_querda"
+
+#: src/main.py:6036
+msgid "F_ormat"
+msgstr "F_ormatar"
+
+#: src/main.py:6037
+msgid "Convert To _Upper Case"
+msgstr "Converter para maiúsc_ulas"
+
+#: src/main.py:6038
+msgid "Convert To _Lower Case"
+msgstr "Converter para minúscu_las"
+
+#: src/main.py:6040
+msgid "Sort Lines In _Ascending Order"
+msgstr "Ordenar linhas _ascendentemente"
+
+#: src/main.py:6041
+msgid "Sort Lines In D_escending Order"
+msgstr "Ordenar linhas d_escendentemente"
+
+#: src/main.py:6043
+msgid "Remove Trailing _White Space"
+msgstr "Remover espaços _finais"
+
+#: src/main.py:6044
+msgid "Convert Tabs To _Spaces"
+msgstr "Converter tabulações em e_spaços"
+
+#: src/main.py:6045
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "Converter espaços iniciais em _tabulações"
+
+#: src/main.py:6047
+msgid "_Increase Indenting"
+msgstr "Aumentar _indentação"
+
+#: src/main.py:6048
+msgid "De_crease Indenting"
+msgstr "Di_minuir indentação"
+
+#: src/main.py:6050
+msgid "Convert To _DOS Format"
+msgstr "Converter para formato _DOS"
+
+#: src/main.py:6051
+msgid "Convert To _Mac Format"
+msgstr "Converter para formato _Mac"
+
+#: src/main.py:6052
+msgid "Convert To Uni_x Format"
+msgstr "Converter para formato Uni_x"
+
+#: src/main.py:6054
+msgid "_Merge"
+msgstr "_Unir"
+
+#: src/main.py:6055
+msgid "Copy Selection _Right"
+msgstr "Copiar selecção à di_reita"
+
+#: src/main.py:6056
+msgid "Copy Selection _Left"
+msgstr "Copiar selecção à es_querda"
+
+#: src/main.py:6058
+msgid "Copy Left _Into Selection"
+msgstr "Cop_iar esquerda para a selecção"
+
+#: src/main.py:6059
+msgid "Copy Right I_nto Selection"
+msgstr "Copiar _direita para a selecção"
+
+#: src/main.py:6060
+msgid "_Merge From Left Then Right"
+msgstr "U_nir da esquerda e depois da direita"
+
+#: src/main.py:6061
+msgid "M_erge From Right Then Left"
+msgstr "Unir da dir_eita e depois da esquerda"
+
+#: src/main.py:6063
+msgid "_Help"
+msgstr "A_juda"
+
+#: src/main.py:6064
+msgid "_Help Contents..."
+msgstr "Conteúdo da a_juda..."
+
+#: src/main.py:6066
+#, python-format
+msgid "_About %s..."
+msgstr "_Acerca do %s..."
+
+#: src/main.py:6080
+msgid "New 2-Way File Merge"
+msgstr "Nova união de _2 vias"
+
+#: src/main.py:6081
+msgid "New 3-Way File Merge"
+msgstr "Nova união de _3 vias"
+
+#: src/main.py:6083
+msgid "Realign All"
+msgstr "Realinhar tudo"
+
+#: src/main.py:6084
+msgid "First Difference"
+msgstr "Primeira diferença"
+
+#: src/main.py:6085
+msgid "Previous Difference"
+msgstr "Diferença anterior"
+
+#: src/main.py:6086
+msgid "Next Difference"
+msgstr "Diferença seguinte"
+
+#: src/main.py:6087
+msgid "Last Difference"
+msgstr "Última diferença"
+
+#: src/main.py:6089
+msgid "Copy Selection Right"
+msgstr "Copiar selecção à direita"
+
+#: src/main.py:6090
+msgid "Copy Selection Left"
+msgstr "Copiar selecção à esquerda"
+
+#: src/main.py:6091
+msgid "Copy Left Into Selection"
+msgstr "Copiar esquerda para a selecção"
+
+#: src/main.py:6092
+msgid "Copy Right Into Selection"
+msgstr "Copiar direita para a selecção"
+
+#: src/main.py:6093
+msgid "Merge From Left Then Right"
+msgstr "Unir da esquerda e depois da direita"
+
+#: src/main.py:6094
+msgid "Merge From Right Then Left"
+msgstr "Unir da direita e depois da esquerda"
+
+#: src/main.py:6096
+msgid "Undo"
+msgstr "Desfazer"
+
+#: src/main.py:6097
+msgid "Redo"
+msgstr "Refazer"
+
+#: src/main.py:6221
+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/main.py:6234
+msgid "Tab"
+msgstr "Separador"
+
+#: src/main.py:6239
+msgid "Pane"
+msgstr "Painel"
+
+#: src/main.py:6250
+msgid "Close _Without Saving"
+msgstr "Fechar sem gra_var"
+
+#: src/main.py:6361
+#, python-format
+msgid "File Merge %d"
+msgstr "União de ficheiros %d"
+
+#: src/main.py:6464
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "Erro ao obter revisões de %s."
+
+#: src/main.py:6493
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "Erro ao obter modificações de %s."
+
+#: src/main.py:6523
+msgid "Open File In New Tab"
+msgstr "Abrir ficheiro em novo separador"
+
+#: src/main.py:6539
+msgid "Choose Folder With Modified Files"
+msgstr "Escolher pasta com ficheiros modificados"
+
+#: src/main.py:6552
+msgid "No modified files found."
+msgstr "Sem ficheiros modificados."
+
+#: src/main.py:6557
+msgid "Choose Folder With Commit"
+msgstr "Escolher pasta com revisão"
+
+#: src/main.py:6570
+msgid "No committed files found."
+msgstr "Sem ficheiros revistos."
+
+#: src/main.py:6604
+msgid "New N-Way File Merge..."
+msgstr "Nova união de N vias..."
+
+#: src/main.py:6604
+msgid "Number of panes: "
+msgstr "Número de painéis: "
+
+#: src/main.py:6669
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "Frase não encontrada. Continuar do final do ficheiro?"
+
+#: src/main.py:6671
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "Frase não encontrada. Continuar do início do ficheiro?"
+
+#: src/main.py:6819
 msgid ""
 "Usage:\n"
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
@@ -112,768 +1074,30 @@ msgstr ""
 "  ( -i | --ignore-case )           ignora diferenças entre maiúsculas\n"
 "  ( -w | --ignore-all-space )      ignora diferenças de espaços"
 
-#: src/usr/bin/diffuse.py.in:716
-#, python-format
-msgid "Error processing line %(line)d of %(file)s."
-msgstr "Erro ao processar a linha %(line)d de %(file)s."
-
-#: src/usr/bin/diffuse.py.in:735
-msgid "Auto Detect"
-msgstr "Detecção automática"
-
-#: src/usr/bin/diffuse.py.in:831
-msgid "Display"
-msgstr "Mostrar"
-
-#: src/usr/bin/diffuse.py.in:833
-msgid "Font"
-msgstr "Letra"
-
-#: src/usr/bin/diffuse.py.in:834
-msgid "Tab width"
-msgstr "Largura de tabulação"
-
-#: src/usr/bin/diffuse.py.in:835
-msgid "Show right margin"
-msgstr "Mostrar margem direita"
-
-#: src/usr/bin/diffuse.py.in:836
-msgid "Right margin"
-msgstr "Margem direita"
-
-#: src/usr/bin/diffuse.py.in:837
-msgid "Show line numbers"
-msgstr "Mostrar números de linha"
-
-#: src/usr/bin/diffuse.py.in:838
-msgid "Show white space characters"
-msgstr "Mostrar espaços em branco"
-
-#: src/usr/bin/diffuse.py.in:839
-msgid "Ignore case differences"
-msgstr "Ignorar diferenças de maiúsculas"
-
-#: src/usr/bin/diffuse.py.in:840
-msgid "Ignore white space differences"
-msgstr "Ignorar diferenças de espaços"
-
-#: src/usr/bin/diffuse.py.in:841 src/usr/bin/diffuse.py.in:849
-msgid "Ignore changes to white space"
-msgstr "Ignorar alterações a espaços"
-
-#: src/usr/bin/diffuse.py.in:842
-msgid "Ignore blank line differences"
-msgstr "Ignorar diferenças de linhas em branco"
-
-#: src/usr/bin/diffuse.py.in:843
-msgid "Ignore end of line differences"
-msgstr "Ignorar diferenças de fins de linha"
-
-#: src/usr/bin/diffuse.py.in:845
-msgid "Alignment"
-msgstr "Alinhamento"
-
-#: src/usr/bin/diffuse.py.in:847
-msgid "Ignore case"
-msgstr "Ignorar maiúsculas"
-
-#: src/usr/bin/diffuse.py.in:848
-msgid "Ignore white space"
-msgstr "Ignorar espaços"
-
-#: src/usr/bin/diffuse.py.in:850
-msgid "Ignore blank lines"
-msgstr "Ignorar linhas em branco"
-
-#: src/usr/bin/diffuse.py.in:851
-msgid "Ignore end of line characters"
-msgstr "Ignorar caracteres de fim de linha"
-
-#: src/usr/bin/diffuse.py.in:853
-msgid "Editor"
-msgstr "Editor"
-
-#: src/usr/bin/diffuse.py.in:855
-msgid "Auto indent"
-msgstr "Indentação automática"
-
-#: src/usr/bin/diffuse.py.in:856
-msgid "Expand tabs to spaces"
-msgstr "Expandir tabulações para espaços"
-
-#: src/usr/bin/diffuse.py.in:857
-msgid "Soft tab width"
-msgstr "Largura de tabulação suave"
-
-#: src/usr/bin/diffuse.py.in:859
-msgid "Tabs"
-msgstr "Separadores"
-
-#: src/usr/bin/diffuse.py.in:861
-msgid "Default panes"
-msgstr "Painéis predefinidos"
-
-#: src/usr/bin/diffuse.py.in:862
-msgid "Always show the tab bar"
-msgstr "Mostrar sempre a barra de separadores"
-
-#: src/usr/bin/diffuse.py.in:863
-#, python-format
-msgid "Warn me when closing a tab will quit %s"
-msgstr "Avisar se fechar um separador fecha o %s"
-
-#: src/usr/bin/diffuse.py.in:865
-msgid "Regional Settings"
-msgstr "Definições regionais"
-
-#: src/usr/bin/diffuse.py.in:867
-msgid "Default codec"
-msgstr "Codificação predefinida"
-
-#: src/usr/bin/diffuse.py.in:868
-msgid "Order of codecs used to identify encoding"
-msgstr "Ordem de codificações para identificar a codificação"
-
-#: src/usr/bin/diffuse.py.in:888
-msgid "Cygwin"
-msgstr "Cygwin"
-
-#: src/usr/bin/diffuse.py.in:890
-msgid "Root directory"
-msgstr "Pasta raiz"
-
-#: src/usr/bin/diffuse.py.in:891
-msgid "Cygdrive prefix"
-msgstr "Prefixo cygdrive"
-
-#: src/usr/bin/diffuse.py.in:907
-msgid "Version control system search order"
-msgstr ""
-
-#: src/usr/bin/diffuse.py.in:913
-msgid "\"co\" command"
-msgstr "comando \"co\""
-
-#: src/usr/bin/diffuse.py.in:914
-msgid "\"rlog\" command"
-msgstr "comando \"rlog\""
-
-#: src/usr/bin/diffuse.py.in:916
-msgid "Command"
-msgstr "Comando"
-
-#: src/usr/bin/diffuse.py.in:918
-msgid "Launch from a Bash login shell"
-msgstr "Iniciar numa consola de sessão bash"
-
-#: src/usr/bin/diffuse.py.in:920
-msgid "Update paths for Cygwin"
-msgstr "Actualizar caminhos para o Cygwin"
-
-#: src/usr/bin/diffuse.py.in:924
-msgid "Version Control"
-msgstr "Controlo de versões"
-
-#: src/usr/bin/diffuse.py.in:988
-msgid "Preferences"
-msgstr "Preferências"
-
-#: src/usr/bin/diffuse.py.in:1029 src/usr/bin/diffuse.py.in:7295
-#, python-format
-msgid "Error writing %s."
-msgstr "Erro ao excrever %s."
-
-#: src/usr/bin/diffuse.py.in:1656 src/usr/bin/diffuse.py.in:2273
-#: src/usr/bin/diffuse.py.in:2417
-#, python-format
-msgid "Error parsing revision %s."
-msgstr "Erro ao analisar a revisão %s."
-
-#: src/usr/bin/diffuse.py.in:2658
-#, python-format
-msgid "Error parsing %s."
-msgstr "Erro ao analisar %s."
-
-#: src/usr/bin/diffuse.py.in:4778
-msgid "Align with Selection"
-msgstr "Alinhar com a selecção"
-
-#: src/usr/bin/diffuse.py.in:4779
-msgid "Isolate"
-msgstr "Isolar"
-
-#: src/usr/bin/diffuse.py.in:4780
-msgid "Merge Selection"
-msgstr "Unir selecção"
-
-#: src/usr/bin/diffuse.py.in:4782 src/usr/bin/diffuse.py.in:7593
-msgid "Cut"
-msgstr "Cortar"
-
-#: src/usr/bin/diffuse.py.in:4783 src/usr/bin/diffuse.py.in:7594
-msgid "Copy"
-msgstr "Copiar"
-
-#: src/usr/bin/diffuse.py.in:4784 src/usr/bin/diffuse.py.in:7595
-msgid "Paste"
-msgstr "Colar"
-
-#: src/usr/bin/diffuse.py.in:4786
-msgid "Select All"
-msgstr "Seleccionar tudo"
-
-#: src/usr/bin/diffuse.py.in:4787 src/usr/bin/diffuse.py.in:7596
-msgid "Clear Edits"
-msgstr "Limpar edição"
-
-#: src/usr/bin/diffuse.py.in:4789
-msgid "Swap with Selected Pane"
-msgstr "Trocar com o painel seleccionado"
-
-#: src/usr/bin/diffuse.py.in:6620
-msgid "Find..."
-msgstr "Localizar..."
-
-#: src/usr/bin/diffuse.py.in:6628
-msgid "Search For: "
-msgstr "Procurar por: "
-
-#: src/usr/bin/diffuse.py.in:6653
-msgid "Match Case"
-msgstr "Comparar maiúsculas"
-
-#: src/usr/bin/diffuse.py.in:6658
-msgid "Search Backwards"
-msgstr "Procurar para trás"
-
-#: src/usr/bin/diffuse.py.in:6672
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "Fechar este painel sai do %s."
-
-#: src/usr/bin/diffuse.py.in:6694
-msgid "Encoding: "
-msgstr "Codificação: "
-
-#: src/usr/bin/diffuse.py.in:6704
-msgid "Revision: "
-msgstr "Revisão: "
-
-#: src/usr/bin/diffuse.py.in:6768
-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/usr/bin/diffuse.py.in:6773
-msgid "translator-credits"
-msgstr "Pedro Albuquerque <pmra@gmx.com>"
-
-#: src/usr/bin/diffuse.py.in:6776
-msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program.  You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
-"Este programa é gratuito; pode redistribuí-lo e/ou modificá-lo sob os termos da GNU General Public License como publicada pela Free Software Foundation; seja a versão 2 da licença, ou (por opção sua) qualquer versão posterior.\n"
-"\n"
-"Este programa é distribuído na esperança de ser útil, mas SEM QUALQUER GARANTIA; nem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO A UM PROPÓSITO EM PARTICULAR. Veja a GNU General Public License para mais detalhes.\n"
-"\n"
-"Deverá ter recebido uma cópia da GNU General Public License juntamente com o programa. Também pode obter uma cópia da GNU General Public License da Free Software Foundation visitando a sua página web (http://www.fsf.org/) ou escrevendo para Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-
-#: src/usr/bin/diffuse.py.in:6811
-msgid "Close Tab"
-msgstr "Fechar separador"
-
-#: src/usr/bin/diffuse.py.in:6866
-msgid "Open File..."
-msgstr "Abrir ficheiro..."
-
-#: src/usr/bin/diffuse.py.in:6867
-msgid "Reload File"
-msgstr "Recarregar ficheiro"
-
-#: src/usr/bin/diffuse.py.in:6868
-msgid "Save File"
-msgstr "Gravar ficheiro"
-
-#: src/usr/bin/diffuse.py.in:6869
-msgid "Save File As..."
-msgstr "Gravar ficheiro como..."
-
-#: src/usr/bin/diffuse.py.in:7014
-msgid "Save changes before loading the new file?"
-msgstr "Gravar alterações antes de carregar o novo ficheiro?"
-
-#: src/usr/bin/diffuse.py.in:7124
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "Erro ao ler a revisão %(rev)s de %(file)s."
-
-#: src/usr/bin/diffuse.py.in:7126 src/usr/bin/diffuse.py.in:8359
-#, python-format
-msgid "Error reading %s."
-msgstr "Erro ao ler %s."
-
-#: src/usr/bin/diffuse.py.in:7149
-msgid "Open File"
-msgstr "Abrir ficheiro"
-
-#: src/usr/bin/diffuse.py.in:7199
-#, 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/usr/bin/diffuse.py.in:7219
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "Gravar %(title)s painel %(pane)d"
-
-#: src/usr/bin/diffuse.py.in:7245
-#, 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/usr/bin/diffuse.py.in:7250
-#, 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/usr/bin/diffuse.py.in:7291
-#, python-format
-msgid "Error encoding to %s."
-msgstr "Erro ao codificar para %s."
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Go To Line..."
-msgstr "Ir para linha..."
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Line Number: "
-msgstr "Número de linha: "
-
-#: src/usr/bin/diffuse.py.in:7351
-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/usr/bin/diffuse.py.in:7353
-msgid "Press the escape key to finish editing."
-msgstr "Prima Esc para terminar a edição."
-
-#: src/usr/bin/diffuse.py.in:7355
-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/usr/bin/diffuse.py.in:7466
-msgid "_File"
-msgstr "_Ficheiro"
-
-#: src/usr/bin/diffuse.py.in:7467
-msgid "_Open File..."
-msgstr "Abrir ficheir_o..."
-
-#: src/usr/bin/diffuse.py.in:7468
-msgid "Open File In New _Tab..."
-msgstr "Abrir ficheiro em no_vo separador..."
-
-#: src/usr/bin/diffuse.py.in:7469
-msgid "Open _Modified Files..."
-msgstr "Abrir ficheiros _modificados..."
-
-#: src/usr/bin/diffuse.py.in:7470
-msgid "Open Commi_t..."
-msgstr "Abrir rev_isão..."
-
-#: src/usr/bin/diffuse.py.in:7471
-msgid "_Reload File"
-msgstr "_Recarregar ficheiro"
-
-#: src/usr/bin/diffuse.py.in:7473
-msgid "_Save File"
-msgstr "_Gravar ficheiro"
-
-#: src/usr/bin/diffuse.py.in:7474
-msgid "Save File _As..."
-msgstr "Gr_avar ficheiro como..."
-
-#: src/usr/bin/diffuse.py.in:7475
-msgid "Save A_ll"
-msgstr "Gravar _tudo"
-
-#: src/usr/bin/diffuse.py.in:7477
-msgid "New _2-Way File Merge"
-msgstr "Nova união de _2 vias"
-
-#: src/usr/bin/diffuse.py.in:7478
-msgid "New _3-Way File Merge"
-msgstr "Nova união de _3 vias"
-
-#: src/usr/bin/diffuse.py.in:7479
-msgid "New _N-Way File Merge..."
-msgstr "Nova união de _N vias"
-
-#: src/usr/bin/diffuse.py.in:7481
-msgid "_Close Tab"
-msgstr "Fe_char separador"
-
-#: src/usr/bin/diffuse.py.in:7482
-msgid "_Undo Close Tab"
-msgstr "Desfa_zer Fechar separador"
-
-#: src/usr/bin/diffuse.py.in:7483
-msgid "_Quit"
-msgstr "_Sair"
-
-#: src/usr/bin/diffuse.py.in:7485
-msgid "_Edit"
-msgstr "_Editar"
-
-#: src/usr/bin/diffuse.py.in:7486
-msgid "_Undo"
-msgstr "_Desfazer"
-
-#: src/usr/bin/diffuse.py.in:7487
-msgid "_Redo"
-msgstr "_Refazer"
-
-#: src/usr/bin/diffuse.py.in:7489
-msgid "Cu_t"
-msgstr "Cor_tar"
-
-#: src/usr/bin/diffuse.py.in:7490
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: src/usr/bin/diffuse.py.in:7491
-msgid "_Paste"
-msgstr "Co_lar"
-
-#: src/usr/bin/diffuse.py.in:7493
-msgid "Select _All"
-msgstr "Seleccion_ar tudo"
-
-#: src/usr/bin/diffuse.py.in:7494
-msgid "C_lear Edits"
-msgstr "_Limpar edição"
-
-#: src/usr/bin/diffuse.py.in:7495
-msgid "_Dismiss All Edits"
-msgstr "_Descartar toda a edição"
-
-#: src/usr/bin/diffuse.py.in:7497
-msgid "_Find..."
-msgstr "_Localizar..."
-
-#: src/usr/bin/diffuse.py.in:7498
-msgid "Find _Next"
-msgstr "Localizar segui_nte"
-
-#: src/usr/bin/diffuse.py.in:7499
-msgid "Find Pre_vious"
-msgstr "Localizar _anterior"
-
-#: src/usr/bin/diffuse.py.in:7500
-msgid "_Go To Line..."
-msgstr "_Ir para linha..."
-
-#: src/usr/bin/diffuse.py.in:7502
-msgid "Pr_eferences..."
-msgstr "Pr_eferências..."
-
-#: src/usr/bin/diffuse.py.in:7504
-msgid "None"
-msgstr "Nada"
-
-#: src/usr/bin/diffuse.py.in:7512
-msgid "_View"
-msgstr "_Ver"
-
-#: src/usr/bin/diffuse.py.in:7513
-msgid "_Syntax Highlighting"
-msgstr "Realce de _sintaxe"
-
-#: src/usr/bin/diffuse.py.in:7515
-msgid "Re_align All"
-msgstr "Re_alinhar tudo"
-
-#: src/usr/bin/diffuse.py.in:7516
-msgid "_Isolate"
-msgstr "_Isolar"
-
-#: src/usr/bin/diffuse.py.in:7518
-msgid "_First Difference"
-msgstr "_Primeira diferença"
-
-#: src/usr/bin/diffuse.py.in:7519
-msgid "_Previous Difference"
-msgstr "Diferença _anterior"
-
-#: src/usr/bin/diffuse.py.in:7520
-msgid "_Next Difference"
-msgstr "Diferença segui_nte"
-
-#: src/usr/bin/diffuse.py.in:7521
-msgid "_Last Difference"
-msgstr "Ú_ltima diferença"
-
-#: src/usr/bin/diffuse.py.in:7523
-msgid "Fir_st Tab"
-msgstr "P_rimeiro separador"
-
-#: src/usr/bin/diffuse.py.in:7524
-msgid "Pre_vious Tab"
-msgstr "_Separador anterior"
-
-#: src/usr/bin/diffuse.py.in:7525
-msgid "Next _Tab"
-msgstr "Separador seguin_te"
-
-#: src/usr/bin/diffuse.py.in:7526
-msgid "Las_t Tab"
-msgstr "Úl_timo separador"
-
-#: src/usr/bin/diffuse.py.in:7528
-msgid "Shift Pane _Right"
-msgstr "Mover separador à di_reita"
-
-#: src/usr/bin/diffuse.py.in:7529
-msgid "Shift Pane _Left"
-msgstr "Mover separador à es_querda"
-
-#: src/usr/bin/diffuse.py.in:7531
-msgid "F_ormat"
-msgstr "F_ormatar"
-
-#: src/usr/bin/diffuse.py.in:7532
-msgid "Convert To _Upper Case"
-msgstr "Converter para maiúsc_ulas"
-
-#: src/usr/bin/diffuse.py.in:7533
-msgid "Convert To _Lower Case"
-msgstr "Converter para minúscu_las"
-
-#: src/usr/bin/diffuse.py.in:7535
-msgid "Sort Lines In _Ascending Order"
-msgstr "Ordenar linhas _ascendentemente"
-
-#: src/usr/bin/diffuse.py.in:7536
-msgid "Sort Lines In D_escending Order"
-msgstr "Ordenar linhas d_escendentemente"
-
-#: src/usr/bin/diffuse.py.in:7538
-msgid "Remove Trailing _White Space"
-msgstr "Remover espaços _finais"
-
-#: src/usr/bin/diffuse.py.in:7539
-msgid "Convert Tabs To _Spaces"
-msgstr "Converter tabulações em e_spaços"
-
-#: src/usr/bin/diffuse.py.in:7540
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "Converter espaços iniciais em _tabulações"
-
-#: src/usr/bin/diffuse.py.in:7542
-msgid "_Increase Indenting"
-msgstr "Aumentar _indentação"
-
-#: src/usr/bin/diffuse.py.in:7543
-msgid "De_crease Indenting"
-msgstr "Di_minuir indentação"
-
-#: src/usr/bin/diffuse.py.in:7545
-msgid "Convert To _DOS Format"
-msgstr "Converter para formato _DOS"
-
-#: src/usr/bin/diffuse.py.in:7546
-msgid "Convert To _Mac Format"
-msgstr "Converter para formato _Mac"
-
-#: src/usr/bin/diffuse.py.in:7547
-msgid "Convert To Uni_x Format"
-msgstr "Converter para formato Uni_x"
-
-#: src/usr/bin/diffuse.py.in:7549
-msgid "_Merge"
-msgstr "_Unir"
-
-#: src/usr/bin/diffuse.py.in:7550
-msgid "Copy Selection _Right"
-msgstr "Copiar selecção à di_reita"
-
-#: src/usr/bin/diffuse.py.in:7551
-msgid "Copy Selection _Left"
-msgstr "Copiar selecção à es_querda"
-
-#: src/usr/bin/diffuse.py.in:7553
-msgid "Copy Left _Into Selection"
-msgstr "Cop_iar esquerda para a selecção"
-
-#: src/usr/bin/diffuse.py.in:7554
-msgid "Copy Right I_nto Selection"
-msgstr "Copiar _direita para a selecção"
-
-#: src/usr/bin/diffuse.py.in:7555
-msgid "_Merge From Left Then Right"
-msgstr "U_nir da esquerda e depois da direita"
-
-#: src/usr/bin/diffuse.py.in:7556
-msgid "M_erge From Right Then Left"
-msgstr "Unir da dir_eita e depois da esquerda"
-
-#: src/usr/bin/diffuse.py.in:7558
-msgid "_Help"
-msgstr "A_juda"
-
-#: src/usr/bin/diffuse.py.in:7559
-msgid "_Help Contents..."
-msgstr "Conteúdo da a_juda..."
-
-#: src/usr/bin/diffuse.py.in:7561
-#, python-format
-msgid "_About %s..."
-msgstr "_Acerca do %s..."
-
-#: src/usr/bin/diffuse.py.in:7575
-msgid "New 2-Way File Merge"
-msgstr "Nova união de _2 vias"
-
-#: src/usr/bin/diffuse.py.in:7576
-msgid "New 3-Way File Merge"
-msgstr "Nova união de _3 vias"
-
-#: src/usr/bin/diffuse.py.in:7578
-msgid "Realign All"
-msgstr "Realinhar tudo"
-
-#: src/usr/bin/diffuse.py.in:7579
-msgid "First Difference"
-msgstr "Primeira diferença"
-
-#: src/usr/bin/diffuse.py.in:7580
-msgid "Previous Difference"
-msgstr "Diferença anterior"
-
-#: src/usr/bin/diffuse.py.in:7581
-msgid "Next Difference"
-msgstr "Diferença seguinte"
-
-#: src/usr/bin/diffuse.py.in:7582
-msgid "Last Difference"
-msgstr "Última diferença"
-
-#: src/usr/bin/diffuse.py.in:7584
-msgid "Copy Selection Right"
-msgstr "Copiar selecção à direita"
-
-#: src/usr/bin/diffuse.py.in:7585
-msgid "Copy Selection Left"
-msgstr "Copiar selecção à esquerda"
-
-#: src/usr/bin/diffuse.py.in:7586
-msgid "Copy Left Into Selection"
-msgstr "Copiar esquerda para a selecção"
-
-#: src/usr/bin/diffuse.py.in:7587
-msgid "Copy Right Into Selection"
-msgstr "Copiar direita para a selecção"
-
-#: src/usr/bin/diffuse.py.in:7588
-msgid "Merge From Left Then Right"
-msgstr "Unir da esquerda e depois da direita"
-
-#: src/usr/bin/diffuse.py.in:7589
-msgid "Merge From Right Then Left"
-msgstr "Unir da direita e depois da esquerda"
-
-#: src/usr/bin/diffuse.py.in:7591
-msgid "Undo"
-msgstr "Desfazer"
-
-#: src/usr/bin/diffuse.py.in:7592
-msgid "Redo"
-msgstr "Refazer"
-
-#: src/usr/bin/diffuse.py.in:7716
-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/usr/bin/diffuse.py.in:7729
-msgid "Tab"
-msgstr "Separador"
-
-#: src/usr/bin/diffuse.py.in:7734
-msgid "Pane"
-msgstr "Painel"
-
-#: src/usr/bin/diffuse.py.in:7745
-msgid "Close _Without Saving"
-msgstr "Fechar sem gra_var"
-
-#: src/usr/bin/diffuse.py.in:7856
-#, python-format
-msgid "File Merge %d"
-msgstr "União de ficheiros %d"
-
-#: src/usr/bin/diffuse.py.in:7959
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "Erro ao obter revisões de %s."
-
-#: src/usr/bin/diffuse.py.in:7990
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "Erro ao obter modificações de %s."
-
-#: src/usr/bin/diffuse.py.in:8022
-msgid "Open File In New Tab"
-msgstr "Abrir ficheiro em novo separador"
-
-#: src/usr/bin/diffuse.py.in:8038
-msgid "Choose Folder With Modified Files"
-msgstr "Escolher pasta com ficheiros modificados"
-
-#: src/usr/bin/diffuse.py.in:8051
-msgid "No modified files found."
-msgstr "Sem ficheiros modificados."
-
-#: src/usr/bin/diffuse.py.in:8058
-msgid "Choose Folder With Commit"
-msgstr "Escolher pasta com revisão"
-
-#: src/usr/bin/diffuse.py.in:8071
-msgid "No committed files found."
-msgstr "Sem ficheiros revistos."
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "New N-Way File Merge..."
-msgstr "Nova união de N vias..."
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "Number of panes: "
-msgstr "Número de painéis: "
-
-#: src/usr/bin/diffuse.py.in:8172
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "Frase não encontrada. Continuar do final do ficheiro?"
-
-#: src/usr/bin/diffuse.py.in:8174
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "Frase não encontrada. Continuar do início do ficheiro?"
-
-#: src/usr/bin/diffuse.py.in:8440
+#: src/main.py:6990
 msgid "Error parsing line number."
 msgstr "Erro ao analisar o número de linha."
 
-#: src/usr/bin/diffuse.py.in:8450
+#: src/main.py:7000
 #, python-format
 msgid "Skipping unknown argument \"%s\"."
 msgstr "A ignorar argumento desconhecido \"%s\"."
 
-#: src/usr/bin/diffuse.py.in:8457
+#: src/main.py:7007
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Erro ao processar o argumento \"%s\". Pasta inesperada."
 
+#: src/vcs/cvs.py:50 src/vcs/rcs.py:54 src/vcs/svn.py:89
+#, python-format
+msgid "Error parsing revision %s."
+msgstr "Erro ao analisar a revisão %s."
+
+#: src/vcs/vcs_registry.py:216
+#, python-format
+msgid "Error parsing %s."
+msgstr "Erro ao analisar %s."
+
 #, python-format
 #~ msgid "Column %d"
 #~ msgstr "Coluna %d"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1e30f57..e80bc6b 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: 2020-12-08 13:51-0500\n"
+"POT-Creation-Date: 2021-11-18 15:21-0500\n"
 "PO-Revision-Date: 2021-11-05 14:49-0400\n"
 "Last-Translator: Pedro Albuquerque <pmra@gmx.com>\n"
 "Language-Team: Português <pmra@gmx.com>\n"
@@ -22,19 +22,981 @@ msgstr ""
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: data/diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:4
 msgid "Diffuse Merge Tool"
 msgstr "Diffuse Ferramenta de unificação"
 
-#: data/diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:5
 msgid "Graphical tool for merging and comparing text files"
 msgstr "Ferramenta gráfica para unificar e comparar arquivos de texto"
 
-#: src/usr/bin/diffuse.py.in:70
+#: data/io.github.mightycreak.Diffuse.metainfo.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."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:19
+msgid "Main window: diff between two files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:26
+msgid "Patch release to fix a bug when using the Flatpak package."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:29
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:71
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:146
+msgid "Fixed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:31
+msgid "Fixed a Flatpak bug where the app couldn't call binaries on the host, such as `git`, `svn`, etc."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:40
+msgid "With this release, the main end-user change is the new icon. The rest is mainly maintenance improvements with a much more standard folder structure and starting to modularize the code. This is an ongoing effort as there is still a lot to do, but hopefully this would motivate some to contribute ;)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:47
+msgid "An important note though: the application ID has changed and is now io.github.mightycreak.Diffuse."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:51
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:89
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:123
+msgid "Added:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:53
+msgid "New icon and in SVG now"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:54
+msgid "Started to modularize the code"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:56
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:93
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:136
+msgid "Changed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:58
+msgid "Changed AppID to io.github.mightycreak.Diffuse (as advised in the Flatpak documentation)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:62
+msgid "Renamed directory `translations/` to `po/`"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:63
+msgid "Now uses POTFILES.in to list the files to translate"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:64
+msgid "Translation strings are no longer sorted alphabetically, this will help when there will be several files in POTFILES.in"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:68
+msgid "Updated the documentation and script in the `po/` directory"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:69
+msgid "Add .desktop translations in .po files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:73
+msgid "Fixed some GTK deprecation warnings"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:79
+msgid "Mainly under the hood changes in this release, so nothing really visible to the users in this version. That said, I figured it was a long time since the last release (4 months ago) and, as promised, I want Diffuse development to be a bit more active and iterative."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:85
+msgid "Apart from the maintenance changes 🧰, I think the main improvement is that Diffuse will soon be available through Flathub!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:91
+msgid "New Flatpak package, published on Flathub: com.github.mightycreak.Diffuse"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:95
+msgid "Replace old install.py with the more standard Meson"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:96
+msgid "Remove u string prefixes since Python 3 is in UTF-8 by default"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:97
+msgid "Replaced some interpolation operators (%) for the f string prefix"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:98
+msgid "Use the window scale factor for the icons generation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:104
+msgid "Here is the v0.5.0. Unintentionally, this release happens exactly 6 years after the previous v0.4.8 release!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:108
+msgid "There is a lot to do on this application, and some features didn't make the release. The main one being the Windows installers. I think 6 years is too long to continue to wait until this bug is fixed. The Python scripts should work on Windows, but no executable is produced (yet) with the release."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:115
+msgid "Other than that, Diffuse v0.5.0 is now officially compatible with Python 3 and GTK 3! And it is synced to the latest commits from upstream (which were never released)."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:120
+msgid "The next version will not take 6 years, I promise you! 😄"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:125
+msgid "Added Pedro Albuquerque's Portuguese translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:126
+msgid "Added Åke Engelbrektson's Swedish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:127
+msgid "Added Guillaume Hoffmann's Darcs support improvements"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:128
+msgid "Added Akom Chotiphantawanon's Thai translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:129
+msgid "Added support for Git submodules"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:130
+msgid "Added a preference and command line option to specify the version control system search order"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:131
+msgid "Added .editorconfig file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:132
+msgid "Added .gitignore file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:133
+msgid "Added message when removing files during uninstallation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:134
+msgid "Added Python script to update all the translation files at once"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:138
+msgid "Convert to Python 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:139
+msgid "Convert to GTK 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:140
+msgid "Updated Python highlighting for Python 3 grammar"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:141
+msgid "Updated copyrights years and authors"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:142
+msgid "Improve Spanish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:143
+msgid "Convert translation README to MarkDown"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:144
+msgid "Updated all the translation files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:148
+msgid "Fixed wrong icons directory for gtk-update-icon-cache"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:149
+msgid "Fixed missing directories when uninstalling"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:150
+msgid "Fixed bug introduced by r420 with RCS VCS"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:151
+msgid "Fixed broken drag'n'drop since migration to Python3/GTK3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:152
+msgid "Fixed error when using '-m' in an SVN repo"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:157
+msgid "Romain Failliot"
+msgstr ""
+
+#: src/constants.py.in:23
 msgid "Copyright"
 msgstr "Direitos autorais"
 
-#: src/usr/bin/diffuse.py.in:81
+#: src/main.py:591
+#, python-format
+msgid "Error processing line %(line)d of %(file)s."
+msgstr "Erro ao processar a linha %(line)d de %(file)s."
+
+#: src/main.py:610
+msgid "Auto Detect"
+msgstr "Detecção automática"
+
+#: src/main.py:706
+msgid "Display"
+msgstr "Mostrar"
+
+#: src/main.py:708
+msgid "Font"
+msgstr "Letra"
+
+#: src/main.py:709
+msgid "Tab width"
+msgstr "Largura de tabulação"
+
+#: src/main.py:710
+msgid "Show right margin"
+msgstr "Mostrar margem direita"
+
+#: src/main.py:711
+msgid "Right margin"
+msgstr "Margem direita"
+
+#: src/main.py:712
+msgid "Show line numbers"
+msgstr "Mostrar números de linha"
+
+#: src/main.py:713
+msgid "Show white space characters"
+msgstr "Mostrar espaços em branco"
+
+#: src/main.py:714
+msgid "Ignore case differences"
+msgstr "Ignorar diferenças de maiúsculas"
+
+#: src/main.py:715
+msgid "Ignore white space differences"
+msgstr "Ignorar diferenças de espaços"
+
+#: src/main.py:716 src/main.py:724
+msgid "Ignore changes to white space"
+msgstr "Ignorar alterações para espaços"
+
+#: src/main.py:717
+msgid "Ignore blank line differences"
+msgstr "Ignorar diferenças de linhas em branco"
+
+#: src/main.py:718
+msgid "Ignore end of line differences"
+msgstr "Ignorar diferenças de fins de linha"
+
+#: src/main.py:720
+msgid "Alignment"
+msgstr "Alinhamento"
+
+#: src/main.py:722
+msgid "Ignore case"
+msgstr "Ignorar maiúsculas"
+
+#: src/main.py:723
+msgid "Ignore white space"
+msgstr "Ignorar espaços"
+
+#: src/main.py:725
+msgid "Ignore blank lines"
+msgstr "Ignorar linhas em branco"
+
+#: src/main.py:726
+msgid "Ignore end of line characters"
+msgstr "Ignorar caracteres de fim de linha"
+
+#: src/main.py:728
+msgid "Editor"
+msgstr "Editor"
+
+#: src/main.py:730
+msgid "Auto indent"
+msgstr "Indentação automática"
+
+#: src/main.py:731
+msgid "Expand tabs to spaces"
+msgstr "Expandir tabulações para espaços"
+
+#: src/main.py:732
+msgid "Soft tab width"
+msgstr "Largura de tabulação suave"
+
+#: src/main.py:734
+msgid "Tabs"
+msgstr "Abas"
+
+#: src/main.py:736
+msgid "Default panes"
+msgstr "Painéis padrão"
+
+#: src/main.py:737
+msgid "Always show the tab bar"
+msgstr "Mostrar sempre a barra de abas"
+
+#: src/main.py:738
+#, 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/main.py:740
+msgid "Regional Settings"
+msgstr "Definições regionais"
+
+#: src/main.py:742
+msgid "Default codec"
+msgstr "Codificação padrão"
+
+#: src/main.py:743
+msgid "Order of codecs used to identify encoding"
+msgstr "Ordem de codificações para identificar a codificação"
+
+#: src/main.py:763
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/main.py:765
+msgid "Root directory"
+msgstr "Pasta Root"
+
+#: src/main.py:766
+msgid "Cygdrive prefix"
+msgstr "Prefixo Cygdrive"
+
+#: src/main.py:782
+msgid "Version control system search order"
+msgstr ""
+
+#: src/main.py:788
+msgid "\"co\" command"
+msgstr "comando \"co\""
+
+#: src/main.py:789
+msgid "\"rlog\" command"
+msgstr "comando \"rlog\""
+
+#: src/main.py:791
+msgid "Command"
+msgstr "Comando"
+
+#: src/main.py:793
+msgid "Launch from a Bash login shell"
+msgstr "Iniciar numa consola de sessão Bash"
+
+#: src/main.py:795
+msgid "Update paths for Cygwin"
+msgstr "Actualizar caminhos para o Cygwin"
+
+#: src/main.py:799
+msgid "Version Control"
+msgstr "Controlo de versões"
+
+#: src/main.py:863
+msgid "Preferences"
+msgstr "Preferências"
+
+#: src/main.py:904 src/main.py:5802
+#, python-format
+msgid "Error writing %s."
+msgstr "Erro ao salvar %s."
+
+#: src/main.py:3282
+msgid "Align with Selection"
+msgstr "Alinhar com a seleção"
+
+#: src/main.py:3283
+msgid "Isolate"
+msgstr "Isolar"
+
+#: src/main.py:3284
+msgid "Merge Selection"
+msgstr "Unir seleção"
+
+#: src/main.py:3286 src/main.py:6098
+msgid "Cut"
+msgstr "Cortar"
+
+#: src/main.py:3287 src/main.py:6099
+msgid "Copy"
+msgstr "Copiar"
+
+#: src/main.py:3288 src/main.py:6100
+msgid "Paste"
+msgstr "Colar"
+
+#: src/main.py:3290
+msgid "Select All"
+msgstr "Selecionar tudo"
+
+#: src/main.py:3291 src/main.py:6101
+msgid "Clear Edits"
+msgstr "Limpar edições"
+
+#: src/main.py:3293
+msgid "Swap with Selected Pane"
+msgstr "Trocar com o painel selecionado"
+
+#: src/main.py:5124
+msgid "Find..."
+msgstr "Encontrar..."
+
+#: src/main.py:5132
+msgid "Search For: "
+msgstr "Procurar por: "
+
+#: src/main.py:5157
+msgid "Match Case"
+msgstr "Combinar maiúsculas"
+
+#: src/main.py:5162
+msgid "Search Backwards"
+msgstr "Procurar para trás"
+
+#: src/main.py:5176
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "Fechamento da aba resultará em saída do %s."
+
+#: src/main.py:5198
+msgid "Encoding: "
+msgstr "Codificação: "
+
+#: src/main.py:5208
+msgid "Revision: "
+msgstr "Revisão: "
+
+#: src/main.py:5272
+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/main.py:5277
+msgid "translator-credits"
+msgstr "Pedro Albuquerque <pmra@gmx.com>"
+
+#: src/main.py:5281
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"Este programa é de software livre; pode redistribuí-lo e/ou modificá-lo sob os termos da GNU General Public License como publicada pela Free Software Foundation; seja a versão 2 da licença, ou (por opção sua) qualquer versão mais recente.\n"
+"\n"
+"Este programa é distribuído na esperança de ser útil, mas SEM QUALQUER GARANTIA; nem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO A UM PROPÓSITO EM PARTICULAR. Veja a GNU General Public License para mais detalhes.\n"
+"\n"
+"Deverá ter recebido uma cópia da GNU General Public License juntamente com o programa. Também pode obter uma cópia da GNU General Public License da Free Software Foundation visitando a sua página web (http://www.fsf.org/) ou escrevendo para Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+
+#: src/main.py:5322
+msgid "Close Tab"
+msgstr "Fechar aba"
+
+#: src/main.py:5377
+msgid "Open File..."
+msgstr "Abrir arquivo..."
+
+#: src/main.py:5378
+msgid "Reload File"
+msgstr "Recarregar arquivo"
+
+#: src/main.py:5379
+msgid "Save File"
+msgstr "Salvar arquivo"
+
+#: src/main.py:5380
+msgid "Save File As..."
+msgstr "Salvar arquivo como..."
+
+#: src/main.py:5525
+msgid "Save changes before loading the new file?"
+msgstr "Salvar alterações antes de carregar o novo arquivo?"
+
+#: src/main.py:5635
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "Erro ao ler a revisão %(rev)s de %(file)s."
+
+#: src/main.py:5637 src/main.py:6900
+#, python-format
+msgid "Error reading %s."
+msgstr "Erro ao ler %s."
+
+#: src/main.py:5658
+msgid "Open File"
+msgstr "Abrir arquivo"
+
+#: src/main.py:5708
+#, 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/main.py:5728
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "Salvar %(title)s painel %(pane)d"
+
+#: src/main.py:5754
+#, 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/main.py:5759
+#, 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 o último carregamento. Se salvar agora, perderá todas as alterações feitas fora deste programa. Salvar de qualquer forma?"
+
+#: src/main.py:5800
+#, python-format
+msgid "Error encoding to %s."
+msgstr "Erro ao codificar para %s."
+
+#: src/main.py:5830
+msgid "Go To Line..."
+msgstr "Ir para linha..."
+
+#: src/main.py:5830
+msgid "Line Number: "
+msgstr "Número de linha: "
+
+#: src/main.py:5856
+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/main.py:5858
+msgid "Press the escape key to finish editing."
+msgstr "Pressione Esc para terminar a edição."
+
+#: src/main.py:5860
+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/main.py:5971
+msgid "_File"
+msgstr "Arquivo"
+
+#: src/main.py:5972
+msgid "_Open File..."
+msgstr "Abrir arquiv_o..."
+
+#: src/main.py:5973
+msgid "Open File In New _Tab..."
+msgstr "Abrir arquivo em no_va aba..."
+
+#: src/main.py:5974
+msgid "Open _Modified Files..."
+msgstr "Abrir arquivos _modificados..."
+
+#: src/main.py:5975
+msgid "Open Commi_t..."
+msgstr "Abrir rev_isão..."
+
+#: src/main.py:5976
+msgid "_Reload File"
+msgstr "_Recarregar arquivo"
+
+#: src/main.py:5978
+msgid "_Save File"
+msgstr "_Salvar arquivo"
+
+#: src/main.py:5979
+msgid "Save File _As..."
+msgstr "Salvar _arquivo como..."
+
+#: src/main.py:5980
+msgid "Save A_ll"
+msgstr "Sa_lvar tudo"
+
+#: src/main.py:5982
+msgid "New _2-Way File Merge"
+msgstr "Nova unificação de _2 vias"
+
+#: src/main.py:5983
+msgid "New _3-Way File Merge"
+msgstr "Nova unificação de _3 vias"
+
+#: src/main.py:5984
+msgid "New _N-Way File Merge..."
+msgstr "Nova unificação de _N vias"
+
+#: src/main.py:5986
+msgid "_Close Tab"
+msgstr "Fe_char aba"
+
+#: src/main.py:5987
+msgid "_Undo Close Tab"
+msgstr "Desfa_zer fechamento da aba"
+
+#: src/main.py:5988
+msgid "_Quit"
+msgstr "_Sair"
+
+#: src/main.py:5990
+msgid "_Edit"
+msgstr "_Editar"
+
+#: src/main.py:5991
+msgid "_Undo"
+msgstr "_Desfazer"
+
+#: src/main.py:5992
+msgid "_Redo"
+msgstr "_Refazer"
+
+#: src/main.py:5994
+msgid "Cu_t"
+msgstr "Cor_tar"
+
+#: src/main.py:5995
+msgid "_Copy"
+msgstr "_Copiar"
+
+#: src/main.py:5996
+msgid "_Paste"
+msgstr "Co_lar"
+
+#: src/main.py:5998
+msgid "Select _All"
+msgstr "Selecion_ar tudo"
+
+#: src/main.py:5999
+msgid "C_lear Edits"
+msgstr "_Limpar edições"
+
+#: src/main.py:6000
+msgid "_Dismiss All Edits"
+msgstr "_Descartar toda a edição"
+
+#: src/main.py:6002
+msgid "_Find..."
+msgstr "_Encontrar..."
+
+#: src/main.py:6003
+msgid "Find _Next"
+msgstr "Encontrar segui_nte"
+
+#: src/main.py:6004
+msgid "Find Pre_vious"
+msgstr "Encontrar _anterior"
+
+#: src/main.py:6005
+msgid "_Go To Line..."
+msgstr "_Ir para linha..."
+
+#: src/main.py:6007
+msgid "Pr_eferences..."
+msgstr "Pr_eferências..."
+
+#: src/main.py:6009
+msgid "None"
+msgstr "Nenhuma"
+
+#: src/main.py:6017
+msgid "_View"
+msgstr "_Ver"
+
+#: src/main.py:6018
+msgid "_Syntax Highlighting"
+msgstr "Destaque de _sintaxe"
+
+#: src/main.py:6020
+msgid "Re_align All"
+msgstr "Re_alinhar tudo"
+
+#: src/main.py:6021
+msgid "_Isolate"
+msgstr "_Isolar"
+
+#: src/main.py:6023
+msgid "_First Difference"
+msgstr "_Primeira diferença"
+
+#: src/main.py:6024
+msgid "_Previous Difference"
+msgstr "Diferença _anterior"
+
+#: src/main.py:6025
+msgid "_Next Difference"
+msgstr "Diferença segui_nte"
+
+#: src/main.py:6026
+msgid "_Last Difference"
+msgstr "Ú_ltima diferença"
+
+#: src/main.py:6028
+msgid "Fir_st Tab"
+msgstr "P_rimeira aba"
+
+#: src/main.py:6029
+msgid "Pre_vious Tab"
+msgstr "_Aba anterior"
+
+#: src/main.py:6030
+msgid "Next _Tab"
+msgstr "Aba seguin_te"
+
+#: src/main.py:6031
+msgid "Las_t Tab"
+msgstr "Úl_tima aba"
+
+#: src/main.py:6033
+msgid "Shift Pane _Right"
+msgstr "Mover painel à di_reita"
+
+#: src/main.py:6034
+msgid "Shift Pane _Left"
+msgstr "Mover painel à es_querda"
+
+#: src/main.py:6036
+msgid "F_ormat"
+msgstr "F_ormatar"
+
+#: src/main.py:6037
+msgid "Convert To _Upper Case"
+msgstr "Converter para maiúsc_ulas"
+
+#: src/main.py:6038
+msgid "Convert To _Lower Case"
+msgstr "Converter para minúscu_las"
+
+#: src/main.py:6040
+msgid "Sort Lines In _Ascending Order"
+msgstr "Ordenar linhas _ascendentemente"
+
+#: src/main.py:6041
+msgid "Sort Lines In D_escending Order"
+msgstr "Ordenar linhas d_escendentemente"
+
+#: src/main.py:6043
+msgid "Remove Trailing _White Space"
+msgstr "Remover espaços _finais"
+
+#: src/main.py:6044
+msgid "Convert Tabs To _Spaces"
+msgstr "Converter tabulações em e_spaços"
+
+#: src/main.py:6045
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "Converter espaços iniciais em _tabulações"
+
+#: src/main.py:6047
+msgid "_Increase Indenting"
+msgstr "Aumentar _indentação"
+
+#: src/main.py:6048
+msgid "De_crease Indenting"
+msgstr "Di_minuir indentação"
+
+#: src/main.py:6050
+msgid "Convert To _DOS Format"
+msgstr "Converter para formato _DOS"
+
+#: src/main.py:6051
+msgid "Convert To _Mac Format"
+msgstr "Converter para formato _Mac"
+
+#: src/main.py:6052
+msgid "Convert To Uni_x Format"
+msgstr "Converter para formato Uni_x"
+
+#: src/main.py:6054
+msgid "_Merge"
+msgstr "_Unificar"
+
+#: src/main.py:6055
+msgid "Copy Selection _Right"
+msgstr "Copiar seleção à di_reita"
+
+#: src/main.py:6056
+msgid "Copy Selection _Left"
+msgstr "Copiar seleção à es_querda"
+
+#: src/main.py:6058
+msgid "Copy Left _Into Selection"
+msgstr "Cop_iar da esquerda para a seleção"
+
+#: src/main.py:6059
+msgid "Copy Right I_nto Selection"
+msgstr "Copiar da _direita para a seleção"
+
+#: src/main.py:6060
+msgid "_Merge From Left Then Right"
+msgstr "U_nificar da esquerda e depois da direita"
+
+#: src/main.py:6061
+msgid "M_erge From Right Then Left"
+msgstr "Unificar da dir_eita e depois da esquerda"
+
+#: src/main.py:6063
+msgid "_Help"
+msgstr "A_juda"
+
+#: src/main.py:6064
+msgid "_Help Contents..."
+msgstr "Conteúdo da a_juda..."
+
+#: src/main.py:6066
+#, python-format
+msgid "_About %s..."
+msgstr "_Sobre %s..."
+
+#: src/main.py:6080
+msgid "New 2-Way File Merge"
+msgstr "Nova unificação de _2 vias"
+
+#: src/main.py:6081
+msgid "New 3-Way File Merge"
+msgstr "Nova unificação de _3 vias"
+
+#: src/main.py:6083
+msgid "Realign All"
+msgstr "Realinhar tudo"
+
+#: src/main.py:6084
+msgid "First Difference"
+msgstr "Primeira diferença"
+
+#: src/main.py:6085
+msgid "Previous Difference"
+msgstr "Diferença anterior"
+
+#: src/main.py:6086
+msgid "Next Difference"
+msgstr "Diferença seguinte"
+
+#: src/main.py:6087
+msgid "Last Difference"
+msgstr "Última diferença"
+
+#: src/main.py:6089
+msgid "Copy Selection Right"
+msgstr "Copiar seleção à direita"
+
+#: src/main.py:6090
+msgid "Copy Selection Left"
+msgstr "Copiar seleção à esquerda"
+
+#: src/main.py:6091
+msgid "Copy Left Into Selection"
+msgstr "Copiar da esquerda para a seleção"
+
+#: src/main.py:6092
+msgid "Copy Right Into Selection"
+msgstr "Copiar da direita para a seleção"
+
+#: src/main.py:6093
+msgid "Merge From Left Then Right"
+msgstr "Unificar da esquerda e depois da direita"
+
+#: src/main.py:6094
+msgid "Merge From Right Then Left"
+msgstr "Unificar da direita e depois da esquerda"
+
+#: src/main.py:6096
+msgid "Undo"
+msgstr "Desfazer"
+
+#: src/main.py:6097
+msgid "Redo"
+msgstr "Refazer"
+
+#: src/main.py:6221
+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/main.py:6234
+msgid "Tab"
+msgstr "Aba"
+
+#: src/main.py:6239
+msgid "Pane"
+msgstr "Painel"
+
+#: src/main.py:6250
+msgid "Close _Without Saving"
+msgstr "Fechar sem sal_var"
+
+#: src/main.py:6361
+#, python-format
+msgid "File Merge %d"
+msgstr "Unificação de arquivos %d"
+
+#: src/main.py:6464
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "Erro ao obter revisões de %s."
+
+#: src/main.py:6493
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "Erro ao obter modificações de %s."
+
+#: src/main.py:6523
+msgid "Open File In New Tab"
+msgstr "Abrir arquivo em nova aba"
+
+#: src/main.py:6539
+msgid "Choose Folder With Modified Files"
+msgstr "Escolher pasta com arquivos modificados"
+
+#: src/main.py:6552
+msgid "No modified files found."
+msgstr "Nenhum arquivo modificado."
+
+#: src/main.py:6557
+msgid "Choose Folder With Commit"
+msgstr "Escolher pasta com revisão"
+
+#: src/main.py:6570
+msgid "No committed files found."
+msgstr "Sem arquivos confirmados."
+
+#: src/main.py:6604
+msgid "New N-Way File Merge..."
+msgstr "Nova unificação de N vias..."
+
+#: src/main.py:6604
+msgid "Number of panes: "
+msgstr "Número de painéis: "
+
+#: src/main.py:6669
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "Frase não encontrada. Continuar a partir do final do arquivo?"
+
+#: src/main.py:6671
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "Frase não encontrada. Continuar desde o início do arquivo?"
+
+#: src/main.py:6819
 msgid ""
 "Usage:\n"
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
@@ -112,768 +1074,30 @@ msgstr ""
 "  ( -i | --ignore-case )           ignora diferenças entre maiúsculas\n"
 "  ( -w | --ignore-all-space )      ignora diferenças de espaços"
 
-#: src/usr/bin/diffuse.py.in:716
-#, python-format
-msgid "Error processing line %(line)d of %(file)s."
-msgstr "Erro ao processar a linha %(line)d de %(file)s."
-
-#: src/usr/bin/diffuse.py.in:735
-msgid "Auto Detect"
-msgstr "Detecção automática"
-
-#: src/usr/bin/diffuse.py.in:831
-msgid "Display"
-msgstr "Mostrar"
-
-#: src/usr/bin/diffuse.py.in:833
-msgid "Font"
-msgstr "Letra"
-
-#: src/usr/bin/diffuse.py.in:834
-msgid "Tab width"
-msgstr "Largura de tabulação"
-
-#: src/usr/bin/diffuse.py.in:835
-msgid "Show right margin"
-msgstr "Mostrar margem direita"
-
-#: src/usr/bin/diffuse.py.in:836
-msgid "Right margin"
-msgstr "Margem direita"
-
-#: src/usr/bin/diffuse.py.in:837
-msgid "Show line numbers"
-msgstr "Mostrar números de linha"
-
-#: src/usr/bin/diffuse.py.in:838
-msgid "Show white space characters"
-msgstr "Mostrar espaços em branco"
-
-#: src/usr/bin/diffuse.py.in:839
-msgid "Ignore case differences"
-msgstr "Ignorar diferenças de maiúsculas"
-
-#: src/usr/bin/diffuse.py.in:840
-msgid "Ignore white space differences"
-msgstr "Ignorar diferenças de espaços"
-
-#: src/usr/bin/diffuse.py.in:841 src/usr/bin/diffuse.py.in:849
-msgid "Ignore changes to white space"
-msgstr "Ignorar alterações para espaços"
-
-#: src/usr/bin/diffuse.py.in:842
-msgid "Ignore blank line differences"
-msgstr "Ignorar diferenças de linhas em branco"
-
-#: src/usr/bin/diffuse.py.in:843
-msgid "Ignore end of line differences"
-msgstr "Ignorar diferenças de fins de linha"
-
-#: src/usr/bin/diffuse.py.in:845
-msgid "Alignment"
-msgstr "Alinhamento"
-
-#: src/usr/bin/diffuse.py.in:847
-msgid "Ignore case"
-msgstr "Ignorar maiúsculas"
-
-#: src/usr/bin/diffuse.py.in:848
-msgid "Ignore white space"
-msgstr "Ignorar espaços"
-
-#: src/usr/bin/diffuse.py.in:850
-msgid "Ignore blank lines"
-msgstr "Ignorar linhas em branco"
-
-#: src/usr/bin/diffuse.py.in:851
-msgid "Ignore end of line characters"
-msgstr "Ignorar caracteres de fim de linha"
-
-#: src/usr/bin/diffuse.py.in:853
-msgid "Editor"
-msgstr "Editor"
-
-#: src/usr/bin/diffuse.py.in:855
-msgid "Auto indent"
-msgstr "Indentação automática"
-
-#: src/usr/bin/diffuse.py.in:856
-msgid "Expand tabs to spaces"
-msgstr "Expandir tabulações para espaços"
-
-#: src/usr/bin/diffuse.py.in:857
-msgid "Soft tab width"
-msgstr "Largura de tabulação suave"
-
-#: src/usr/bin/diffuse.py.in:859
-msgid "Tabs"
-msgstr "Abas"
-
-#: src/usr/bin/diffuse.py.in:861
-msgid "Default panes"
-msgstr "Painéis padrão"
-
-#: src/usr/bin/diffuse.py.in:862
-msgid "Always show the tab bar"
-msgstr "Mostrar sempre a barra de abas"
-
-#: src/usr/bin/diffuse.py.in:863
-#, 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/usr/bin/diffuse.py.in:865
-msgid "Regional Settings"
-msgstr "Definições regionais"
-
-#: src/usr/bin/diffuse.py.in:867
-msgid "Default codec"
-msgstr "Codificação padrão"
-
-#: src/usr/bin/diffuse.py.in:868
-msgid "Order of codecs used to identify encoding"
-msgstr "Ordem de codificações para identificar a codificação"
-
-#: src/usr/bin/diffuse.py.in:888
-msgid "Cygwin"
-msgstr "Cygwin"
-
-#: src/usr/bin/diffuse.py.in:890
-msgid "Root directory"
-msgstr "Pasta Root"
-
-#: src/usr/bin/diffuse.py.in:891
-msgid "Cygdrive prefix"
-msgstr "Prefixo Cygdrive"
-
-#: src/usr/bin/diffuse.py.in:907
-msgid "Version control system search order"
-msgstr ""
-
-#: src/usr/bin/diffuse.py.in:913
-msgid "\"co\" command"
-msgstr "comando \"co\""
-
-#: src/usr/bin/diffuse.py.in:914
-msgid "\"rlog\" command"
-msgstr "comando \"rlog\""
-
-#: src/usr/bin/diffuse.py.in:916
-msgid "Command"
-msgstr "Comando"
-
-#: src/usr/bin/diffuse.py.in:918
-msgid "Launch from a Bash login shell"
-msgstr "Iniciar numa consola de sessão Bash"
-
-#: src/usr/bin/diffuse.py.in:920
-msgid "Update paths for Cygwin"
-msgstr "Actualizar caminhos para o Cygwin"
-
-#: src/usr/bin/diffuse.py.in:924
-msgid "Version Control"
-msgstr "Controlo de versões"
-
-#: src/usr/bin/diffuse.py.in:988
-msgid "Preferences"
-msgstr "Preferências"
-
-#: src/usr/bin/diffuse.py.in:1029 src/usr/bin/diffuse.py.in:7295
-#, python-format
-msgid "Error writing %s."
-msgstr "Erro ao salvar %s."
-
-#: src/usr/bin/diffuse.py.in:1656 src/usr/bin/diffuse.py.in:2273
-#: src/usr/bin/diffuse.py.in:2417
-#, python-format
-msgid "Error parsing revision %s."
-msgstr "Erro ao analisar a revisão %s."
-
-#: src/usr/bin/diffuse.py.in:2658
-#, python-format
-msgid "Error parsing %s."
-msgstr "Erro ao analisar %s."
-
-#: src/usr/bin/diffuse.py.in:4778
-msgid "Align with Selection"
-msgstr "Alinhar com a seleção"
-
-#: src/usr/bin/diffuse.py.in:4779
-msgid "Isolate"
-msgstr "Isolar"
-
-#: src/usr/bin/diffuse.py.in:4780
-msgid "Merge Selection"
-msgstr "Unir seleção"
-
-#: src/usr/bin/diffuse.py.in:4782 src/usr/bin/diffuse.py.in:7593
-msgid "Cut"
-msgstr "Cortar"
-
-#: src/usr/bin/diffuse.py.in:4783 src/usr/bin/diffuse.py.in:7594
-msgid "Copy"
-msgstr "Copiar"
-
-#: src/usr/bin/diffuse.py.in:4784 src/usr/bin/diffuse.py.in:7595
-msgid "Paste"
-msgstr "Colar"
-
-#: src/usr/bin/diffuse.py.in:4786
-msgid "Select All"
-msgstr "Selecionar tudo"
-
-#: src/usr/bin/diffuse.py.in:4787 src/usr/bin/diffuse.py.in:7596
-msgid "Clear Edits"
-msgstr "Limpar edições"
-
-#: src/usr/bin/diffuse.py.in:4789
-msgid "Swap with Selected Pane"
-msgstr "Trocar com o painel selecionado"
-
-#: src/usr/bin/diffuse.py.in:6620
-msgid "Find..."
-msgstr "Encontrar..."
-
-#: src/usr/bin/diffuse.py.in:6628
-msgid "Search For: "
-msgstr "Procurar por: "
-
-#: src/usr/bin/diffuse.py.in:6653
-msgid "Match Case"
-msgstr "Combinar maiúsculas"
-
-#: src/usr/bin/diffuse.py.in:6658
-msgid "Search Backwards"
-msgstr "Procurar para trás"
-
-#: src/usr/bin/diffuse.py.in:6672
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "Fechamento da aba resultará em saída do %s."
-
-#: src/usr/bin/diffuse.py.in:6694
-msgid "Encoding: "
-msgstr "Codificação: "
-
-#: src/usr/bin/diffuse.py.in:6704
-msgid "Revision: "
-msgstr "Revisão: "
-
-#: src/usr/bin/diffuse.py.in:6768
-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/usr/bin/diffuse.py.in:6773
-msgid "translator-credits"
-msgstr "Pedro Albuquerque <pmra@gmx.com>"
-
-#: src/usr/bin/diffuse.py.in:6776
-msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program.  You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
-"Este programa é de software livre; pode redistribuí-lo e/ou modificá-lo sob os termos da GNU General Public License como publicada pela Free Software Foundation; seja a versão 2 da licença, ou (por opção sua) qualquer versão mais recente.\n"
-"\n"
-"Este programa é distribuído na esperança de ser útil, mas SEM QUALQUER GARANTIA; nem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO A UM PROPÓSITO EM PARTICULAR. Veja a GNU General Public License para mais detalhes.\n"
-"\n"
-"Deverá ter recebido uma cópia da GNU General Public License juntamente com o programa. Também pode obter uma cópia da GNU General Public License da Free Software Foundation visitando a sua página web (http://www.fsf.org/) ou escrevendo para Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-
-#: src/usr/bin/diffuse.py.in:6811
-msgid "Close Tab"
-msgstr "Fechar aba"
-
-#: src/usr/bin/diffuse.py.in:6866
-msgid "Open File..."
-msgstr "Abrir arquivo..."
-
-#: src/usr/bin/diffuse.py.in:6867
-msgid "Reload File"
-msgstr "Recarregar arquivo"
-
-#: src/usr/bin/diffuse.py.in:6868
-msgid "Save File"
-msgstr "Salvar arquivo"
-
-#: src/usr/bin/diffuse.py.in:6869
-msgid "Save File As..."
-msgstr "Salvar arquivo como..."
-
-#: src/usr/bin/diffuse.py.in:7014
-msgid "Save changes before loading the new file?"
-msgstr "Salvar alterações antes de carregar o novo arquivo?"
-
-#: src/usr/bin/diffuse.py.in:7124
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "Erro ao ler a revisão %(rev)s de %(file)s."
-
-#: src/usr/bin/diffuse.py.in:7126 src/usr/bin/diffuse.py.in:8359
-#, python-format
-msgid "Error reading %s."
-msgstr "Erro ao ler %s."
-
-#: src/usr/bin/diffuse.py.in:7149
-msgid "Open File"
-msgstr "Abrir arquivo"
-
-#: src/usr/bin/diffuse.py.in:7199
-#, 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/usr/bin/diffuse.py.in:7219
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "Salvar %(title)s painel %(pane)d"
-
-#: src/usr/bin/diffuse.py.in:7245
-#, 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/usr/bin/diffuse.py.in:7250
-#, 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 o último carregamento. Se salvar agora, perderá todas as alterações feitas fora deste programa. Salvar de qualquer forma?"
-
-#: src/usr/bin/diffuse.py.in:7291
-#, python-format
-msgid "Error encoding to %s."
-msgstr "Erro ao codificar para %s."
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Go To Line..."
-msgstr "Ir para linha..."
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Line Number: "
-msgstr "Número de linha: "
-
-#: src/usr/bin/diffuse.py.in:7351
-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/usr/bin/diffuse.py.in:7353
-msgid "Press the escape key to finish editing."
-msgstr "Pressione Esc para terminar a edição."
-
-#: src/usr/bin/diffuse.py.in:7355
-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/usr/bin/diffuse.py.in:7466
-msgid "_File"
-msgstr "Arquivo"
-
-#: src/usr/bin/diffuse.py.in:7467
-msgid "_Open File..."
-msgstr "Abrir arquiv_o..."
-
-#: src/usr/bin/diffuse.py.in:7468
-msgid "Open File In New _Tab..."
-msgstr "Abrir arquivo em no_va aba..."
-
-#: src/usr/bin/diffuse.py.in:7469
-msgid "Open _Modified Files..."
-msgstr "Abrir arquivos _modificados..."
-
-#: src/usr/bin/diffuse.py.in:7470
-msgid "Open Commi_t..."
-msgstr "Abrir rev_isão..."
-
-#: src/usr/bin/diffuse.py.in:7471
-msgid "_Reload File"
-msgstr "_Recarregar arquivo"
-
-#: src/usr/bin/diffuse.py.in:7473
-msgid "_Save File"
-msgstr "_Salvar arquivo"
-
-#: src/usr/bin/diffuse.py.in:7474
-msgid "Save File _As..."
-msgstr "Salvar _arquivo como..."
-
-#: src/usr/bin/diffuse.py.in:7475
-msgid "Save A_ll"
-msgstr "Sa_lvar tudo"
-
-#: src/usr/bin/diffuse.py.in:7477
-msgid "New _2-Way File Merge"
-msgstr "Nova unificação de _2 vias"
-
-#: src/usr/bin/diffuse.py.in:7478
-msgid "New _3-Way File Merge"
-msgstr "Nova unificação de _3 vias"
-
-#: src/usr/bin/diffuse.py.in:7479
-msgid "New _N-Way File Merge..."
-msgstr "Nova unificação de _N vias"
-
-#: src/usr/bin/diffuse.py.in:7481
-msgid "_Close Tab"
-msgstr "Fe_char aba"
-
-#: src/usr/bin/diffuse.py.in:7482
-msgid "_Undo Close Tab"
-msgstr "Desfa_zer fechamento da aba"
-
-#: src/usr/bin/diffuse.py.in:7483
-msgid "_Quit"
-msgstr "_Sair"
-
-#: src/usr/bin/diffuse.py.in:7485
-msgid "_Edit"
-msgstr "_Editar"
-
-#: src/usr/bin/diffuse.py.in:7486
-msgid "_Undo"
-msgstr "_Desfazer"
-
-#: src/usr/bin/diffuse.py.in:7487
-msgid "_Redo"
-msgstr "_Refazer"
-
-#: src/usr/bin/diffuse.py.in:7489
-msgid "Cu_t"
-msgstr "Cor_tar"
-
-#: src/usr/bin/diffuse.py.in:7490
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: src/usr/bin/diffuse.py.in:7491
-msgid "_Paste"
-msgstr "Co_lar"
-
-#: src/usr/bin/diffuse.py.in:7493
-msgid "Select _All"
-msgstr "Selecion_ar tudo"
-
-#: src/usr/bin/diffuse.py.in:7494
-msgid "C_lear Edits"
-msgstr "_Limpar edições"
-
-#: src/usr/bin/diffuse.py.in:7495
-msgid "_Dismiss All Edits"
-msgstr "_Descartar toda a edição"
-
-#: src/usr/bin/diffuse.py.in:7497
-msgid "_Find..."
-msgstr "_Encontrar..."
-
-#: src/usr/bin/diffuse.py.in:7498
-msgid "Find _Next"
-msgstr "Encontrar segui_nte"
-
-#: src/usr/bin/diffuse.py.in:7499
-msgid "Find Pre_vious"
-msgstr "Encontrar _anterior"
-
-#: src/usr/bin/diffuse.py.in:7500
-msgid "_Go To Line..."
-msgstr "_Ir para linha..."
-
-#: src/usr/bin/diffuse.py.in:7502
-msgid "Pr_eferences..."
-msgstr "Pr_eferências..."
-
-#: src/usr/bin/diffuse.py.in:7504
-msgid "None"
-msgstr "Nenhuma"
-
-#: src/usr/bin/diffuse.py.in:7512
-msgid "_View"
-msgstr "_Ver"
-
-#: src/usr/bin/diffuse.py.in:7513
-msgid "_Syntax Highlighting"
-msgstr "Destaque de _sintaxe"
-
-#: src/usr/bin/diffuse.py.in:7515
-msgid "Re_align All"
-msgstr "Re_alinhar tudo"
-
-#: src/usr/bin/diffuse.py.in:7516
-msgid "_Isolate"
-msgstr "_Isolar"
-
-#: src/usr/bin/diffuse.py.in:7518
-msgid "_First Difference"
-msgstr "_Primeira diferença"
-
-#: src/usr/bin/diffuse.py.in:7519
-msgid "_Previous Difference"
-msgstr "Diferença _anterior"
-
-#: src/usr/bin/diffuse.py.in:7520
-msgid "_Next Difference"
-msgstr "Diferença segui_nte"
-
-#: src/usr/bin/diffuse.py.in:7521
-msgid "_Last Difference"
-msgstr "Ú_ltima diferença"
-
-#: src/usr/bin/diffuse.py.in:7523
-msgid "Fir_st Tab"
-msgstr "P_rimeira aba"
-
-#: src/usr/bin/diffuse.py.in:7524
-msgid "Pre_vious Tab"
-msgstr "_Aba anterior"
-
-#: src/usr/bin/diffuse.py.in:7525
-msgid "Next _Tab"
-msgstr "Aba seguin_te"
-
-#: src/usr/bin/diffuse.py.in:7526
-msgid "Las_t Tab"
-msgstr "Úl_tima aba"
-
-#: src/usr/bin/diffuse.py.in:7528
-msgid "Shift Pane _Right"
-msgstr "Mover painel à di_reita"
-
-#: src/usr/bin/diffuse.py.in:7529
-msgid "Shift Pane _Left"
-msgstr "Mover painel à es_querda"
-
-#: src/usr/bin/diffuse.py.in:7531
-msgid "F_ormat"
-msgstr "F_ormatar"
-
-#: src/usr/bin/diffuse.py.in:7532
-msgid "Convert To _Upper Case"
-msgstr "Converter para maiúsc_ulas"
-
-#: src/usr/bin/diffuse.py.in:7533
-msgid "Convert To _Lower Case"
-msgstr "Converter para minúscu_las"
-
-#: src/usr/bin/diffuse.py.in:7535
-msgid "Sort Lines In _Ascending Order"
-msgstr "Ordenar linhas _ascendentemente"
-
-#: src/usr/bin/diffuse.py.in:7536
-msgid "Sort Lines In D_escending Order"
-msgstr "Ordenar linhas d_escendentemente"
-
-#: src/usr/bin/diffuse.py.in:7538
-msgid "Remove Trailing _White Space"
-msgstr "Remover espaços _finais"
-
-#: src/usr/bin/diffuse.py.in:7539
-msgid "Convert Tabs To _Spaces"
-msgstr "Converter tabulações em e_spaços"
-
-#: src/usr/bin/diffuse.py.in:7540
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "Converter espaços iniciais em _tabulações"
-
-#: src/usr/bin/diffuse.py.in:7542
-msgid "_Increase Indenting"
-msgstr "Aumentar _indentação"
-
-#: src/usr/bin/diffuse.py.in:7543
-msgid "De_crease Indenting"
-msgstr "Di_minuir indentação"
-
-#: src/usr/bin/diffuse.py.in:7545
-msgid "Convert To _DOS Format"
-msgstr "Converter para formato _DOS"
-
-#: src/usr/bin/diffuse.py.in:7546
-msgid "Convert To _Mac Format"
-msgstr "Converter para formato _Mac"
-
-#: src/usr/bin/diffuse.py.in:7547
-msgid "Convert To Uni_x Format"
-msgstr "Converter para formato Uni_x"
-
-#: src/usr/bin/diffuse.py.in:7549
-msgid "_Merge"
-msgstr "_Unificar"
-
-#: src/usr/bin/diffuse.py.in:7550
-msgid "Copy Selection _Right"
-msgstr "Copiar seleção à di_reita"
-
-#: src/usr/bin/diffuse.py.in:7551
-msgid "Copy Selection _Left"
-msgstr "Copiar seleção à es_querda"
-
-#: src/usr/bin/diffuse.py.in:7553
-msgid "Copy Left _Into Selection"
-msgstr "Cop_iar da esquerda para a seleção"
-
-#: src/usr/bin/diffuse.py.in:7554
-msgid "Copy Right I_nto Selection"
-msgstr "Copiar da _direita para a seleção"
-
-#: src/usr/bin/diffuse.py.in:7555
-msgid "_Merge From Left Then Right"
-msgstr "U_nificar da esquerda e depois da direita"
-
-#: src/usr/bin/diffuse.py.in:7556
-msgid "M_erge From Right Then Left"
-msgstr "Unificar da dir_eita e depois da esquerda"
-
-#: src/usr/bin/diffuse.py.in:7558
-msgid "_Help"
-msgstr "A_juda"
-
-#: src/usr/bin/diffuse.py.in:7559
-msgid "_Help Contents..."
-msgstr "Conteúdo da a_juda..."
-
-#: src/usr/bin/diffuse.py.in:7561
-#, python-format
-msgid "_About %s..."
-msgstr "_Sobre %s..."
-
-#: src/usr/bin/diffuse.py.in:7575
-msgid "New 2-Way File Merge"
-msgstr "Nova unificação de _2 vias"
-
-#: src/usr/bin/diffuse.py.in:7576
-msgid "New 3-Way File Merge"
-msgstr "Nova unificação de _3 vias"
-
-#: src/usr/bin/diffuse.py.in:7578
-msgid "Realign All"
-msgstr "Realinhar tudo"
-
-#: src/usr/bin/diffuse.py.in:7579
-msgid "First Difference"
-msgstr "Primeira diferença"
-
-#: src/usr/bin/diffuse.py.in:7580
-msgid "Previous Difference"
-msgstr "Diferença anterior"
-
-#: src/usr/bin/diffuse.py.in:7581
-msgid "Next Difference"
-msgstr "Diferença seguinte"
-
-#: src/usr/bin/diffuse.py.in:7582
-msgid "Last Difference"
-msgstr "Última diferença"
-
-#: src/usr/bin/diffuse.py.in:7584
-msgid "Copy Selection Right"
-msgstr "Copiar seleção à direita"
-
-#: src/usr/bin/diffuse.py.in:7585
-msgid "Copy Selection Left"
-msgstr "Copiar seleção à esquerda"
-
-#: src/usr/bin/diffuse.py.in:7586
-msgid "Copy Left Into Selection"
-msgstr "Copiar da esquerda para a seleção"
-
-#: src/usr/bin/diffuse.py.in:7587
-msgid "Copy Right Into Selection"
-msgstr "Copiar da direita para a seleção"
-
-#: src/usr/bin/diffuse.py.in:7588
-msgid "Merge From Left Then Right"
-msgstr "Unificar da esquerda e depois da direita"
-
-#: src/usr/bin/diffuse.py.in:7589
-msgid "Merge From Right Then Left"
-msgstr "Unificar da direita e depois da esquerda"
-
-#: src/usr/bin/diffuse.py.in:7591
-msgid "Undo"
-msgstr "Desfazer"
-
-#: src/usr/bin/diffuse.py.in:7592
-msgid "Redo"
-msgstr "Refazer"
-
-#: src/usr/bin/diffuse.py.in:7716
-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/usr/bin/diffuse.py.in:7729
-msgid "Tab"
-msgstr "Aba"
-
-#: src/usr/bin/diffuse.py.in:7734
-msgid "Pane"
-msgstr "Painel"
-
-#: src/usr/bin/diffuse.py.in:7745
-msgid "Close _Without Saving"
-msgstr "Fechar sem sal_var"
-
-#: src/usr/bin/diffuse.py.in:7856
-#, python-format
-msgid "File Merge %d"
-msgstr "Unificação de arquivos %d"
-
-#: src/usr/bin/diffuse.py.in:7959
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "Erro ao obter revisões de %s."
-
-#: src/usr/bin/diffuse.py.in:7990
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "Erro ao obter modificações de %s."
-
-#: src/usr/bin/diffuse.py.in:8022
-msgid "Open File In New Tab"
-msgstr "Abrir arquivo em nova aba"
-
-#: src/usr/bin/diffuse.py.in:8038
-msgid "Choose Folder With Modified Files"
-msgstr "Escolher pasta com arquivos modificados"
-
-#: src/usr/bin/diffuse.py.in:8051
-msgid "No modified files found."
-msgstr "Nenhum arquivo modificado."
-
-#: src/usr/bin/diffuse.py.in:8058
-msgid "Choose Folder With Commit"
-msgstr "Escolher pasta com revisão"
-
-#: src/usr/bin/diffuse.py.in:8071
-msgid "No committed files found."
-msgstr "Sem arquivos confirmados."
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "New N-Way File Merge..."
-msgstr "Nova unificação de N vias..."
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "Number of panes: "
-msgstr "Número de painéis: "
-
-#: src/usr/bin/diffuse.py.in:8172
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "Frase não encontrada. Continuar a partir do final do arquivo?"
-
-#: src/usr/bin/diffuse.py.in:8174
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "Frase não encontrada. Continuar desde o início do arquivo?"
-
-#: src/usr/bin/diffuse.py.in:8440
+#: src/main.py:6990
 msgid "Error parsing line number."
 msgstr "Erro ao analisar o número de linha."
 
-#: src/usr/bin/diffuse.py.in:8450
+#: src/main.py:7000
 #, python-format
 msgid "Skipping unknown argument \"%s\"."
 msgstr "Omitindo argumento desconhecido \"%s\"."
 
-#: src/usr/bin/diffuse.py.in:8457
+#: src/main.py:7007
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Erro ao processar o argumento \"%s\". Pasta inesperada."
 
+#: src/vcs/cvs.py:50 src/vcs/rcs.py:54 src/vcs/svn.py:89
+#, python-format
+msgid "Error parsing revision %s."
+msgstr "Erro ao analisar a revisão %s."
+
+#: src/vcs/vcs_registry.py:216
+#, python-format
+msgid "Error parsing %s."
+msgstr "Erro ao analisar %s."
+
 #, python-format
 #~ msgid "Column %d"
 #~ msgstr "Coluna %d"
diff --git a/po/ru.po b/po/ru.po
index c8da07f..cbf8211 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: 2020-12-08 13:51-0500\n"
+"POT-Creation-Date: 2021-11-18 15:21-0500\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator: Oleg Pakhtusov <opakhtusov@gmail.com>\n"
 "Language-Team: Russian <opakhtusov@gmail.com>\n"
@@ -21,19 +21,983 @@ msgstr ""
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: data/diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:4
 msgid "Diffuse Merge Tool"
 msgstr "Diffuse Инструмент Слияния"
 
-#: data/diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:5
 msgid "Graphical tool for merging and comparing text files"
 msgstr "Графический инструмент для слияния и сравнения текстовых файлов"
 
-#: src/usr/bin/diffuse.py.in:70
+#: data/io.github.mightycreak.Diffuse.metainfo.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."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:19
+msgid "Main window: diff between two files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:26
+msgid "Patch release to fix a bug when using the Flatpak package."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:29
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:71
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:146
+msgid "Fixed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:31
+msgid "Fixed a Flatpak bug where the app couldn't call binaries on the host, such as `git`, `svn`, etc."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:40
+msgid "With this release, the main end-user change is the new icon. The rest is mainly maintenance improvements with a much more standard folder structure and starting to modularize the code. This is an ongoing effort as there is still a lot to do, but hopefully this would motivate some to contribute ;)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:47
+msgid "An important note though: the application ID has changed and is now io.github.mightycreak.Diffuse."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:51
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:89
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:123
+msgid "Added:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:53
+msgid "New icon and in SVG now"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:54
+msgid "Started to modularize the code"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:56
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:93
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:136
+msgid "Changed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:58
+msgid "Changed AppID to io.github.mightycreak.Diffuse (as advised in the Flatpak documentation)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:62
+msgid "Renamed directory `translations/` to `po/`"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:63
+msgid "Now uses POTFILES.in to list the files to translate"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:64
+msgid "Translation strings are no longer sorted alphabetically, this will help when there will be several files in POTFILES.in"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:68
+msgid "Updated the documentation and script in the `po/` directory"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:69
+msgid "Add .desktop translations in .po files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:73
+msgid "Fixed some GTK deprecation warnings"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:79
+msgid "Mainly under the hood changes in this release, so nothing really visible to the users in this version. That said, I figured it was a long time since the last release (4 months ago) and, as promised, I want Diffuse development to be a bit more active and iterative."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:85
+msgid "Apart from the maintenance changes 🧰, I think the main improvement is that Diffuse will soon be available through Flathub!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:91
+msgid "New Flatpak package, published on Flathub: com.github.mightycreak.Diffuse"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:95
+msgid "Replace old install.py with the more standard Meson"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:96
+msgid "Remove u string prefixes since Python 3 is in UTF-8 by default"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:97
+msgid "Replaced some interpolation operators (%) for the f string prefix"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:98
+msgid "Use the window scale factor for the icons generation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:104
+msgid "Here is the v0.5.0. Unintentionally, this release happens exactly 6 years after the previous v0.4.8 release!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:108
+msgid "There is a lot to do on this application, and some features didn't make the release. The main one being the Windows installers. I think 6 years is too long to continue to wait until this bug is fixed. The Python scripts should work on Windows, but no executable is produced (yet) with the release."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:115
+msgid "Other than that, Diffuse v0.5.0 is now officially compatible with Python 3 and GTK 3! And it is synced to the latest commits from upstream (which were never released)."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:120
+msgid "The next version will not take 6 years, I promise you! 😄"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:125
+msgid "Added Pedro Albuquerque's Portuguese translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:126
+msgid "Added Åke Engelbrektson's Swedish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:127
+msgid "Added Guillaume Hoffmann's Darcs support improvements"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:128
+msgid "Added Akom Chotiphantawanon's Thai translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:129
+msgid "Added support for Git submodules"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:130
+msgid "Added a preference and command line option to specify the version control system search order"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:131
+msgid "Added .editorconfig file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:132
+msgid "Added .gitignore file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:133
+msgid "Added message when removing files during uninstallation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:134
+msgid "Added Python script to update all the translation files at once"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:138
+msgid "Convert to Python 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:139
+msgid "Convert to GTK 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:140
+msgid "Updated Python highlighting for Python 3 grammar"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:141
+msgid "Updated copyrights years and authors"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:142
+msgid "Improve Spanish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:143
+msgid "Convert translation README to MarkDown"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:144
+msgid "Updated all the translation files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:148
+msgid "Fixed wrong icons directory for gtk-update-icon-cache"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:149
+msgid "Fixed missing directories when uninstalling"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:150
+msgid "Fixed bug introduced by r420 with RCS VCS"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:151
+msgid "Fixed broken drag'n'drop since migration to Python3/GTK3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:152
+msgid "Fixed error when using '-m' in an SVN repo"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:157
+msgid "Romain Failliot"
+msgstr ""
+
+#: src/constants.py.in:23
 msgid "Copyright"
 msgstr ""
 
-#: src/usr/bin/diffuse.py.in:81
+#: src/main.py:591
+#, python-format
+msgid "Error processing line %(line)d of %(file)s."
+msgstr "Ошибка обработки строки %(line)d из %(file)s."
+
+#: src/main.py:610
+msgid "Auto Detect"
+msgstr "Автообнаружение "
+
+#: src/main.py:706
+msgid "Display"
+msgstr "Отображение"
+
+#: src/main.py:708
+msgid "Font"
+msgstr "Шрифт"
+
+#: src/main.py:709
+msgid "Tab width"
+msgstr "Ширина табулятора"
+
+#: src/main.py:710
+msgid "Show right margin"
+msgstr "Показывать правое поле"
+
+#: src/main.py:711
+msgid "Right margin"
+msgstr "Правое поле"
+
+#: src/main.py:712
+msgid "Show line numbers"
+msgstr "Показывать номера строк"
+
+#: src/main.py:713
+msgid "Show white space characters"
+msgstr "Показывать символы пробелов"
+
+#: src/main.py:714
+msgid "Ignore case differences"
+msgstr "Игнорировать различия в регистре"
+
+#: src/main.py:715
+msgid "Ignore white space differences"
+msgstr "Игнорировать различия пробелов, символов табуляции и пустой строки"
+
+#: src/main.py:716 src/main.py:724
+msgid "Ignore changes to white space"
+msgstr "Игнорировать изменения пробелов, символов табуляции и пустой строки"
+
+#: src/main.py:717
+msgid "Ignore blank line differences"
+msgstr "Игнорировать различия пустых строк"
+
+#: src/main.py:718
+msgid "Ignore end of line differences"
+msgstr "Игнорировать различия окончания строк (терминаторы)"
+
+#: src/main.py:720
+msgid "Alignment"
+msgstr "Выравнивание"
+
+#: src/main.py:722
+msgid "Ignore case"
+msgstr "Игнорировать регистр символов"
+
+#: src/main.py:723
+msgid "Ignore white space"
+msgstr "Игнорировать пробелы, символы табуляции и пустой строки"
+
+#: src/main.py:725
+msgid "Ignore blank lines"
+msgstr "Игнорировать пустые строки"
+
+#: src/main.py:726
+msgid "Ignore end of line characters"
+msgstr "Игнорировать символы окончания строк (терминаторы)"
+
+#: src/main.py:728
+msgid "Editor"
+msgstr "Редактор"
+
+#: src/main.py:730
+msgid "Auto indent"
+msgstr "Автоматический отступ"
+
+#: src/main.py:731
+msgid "Expand tabs to spaces"
+msgstr "Расширить табуляторы до пробелов"
+
+#: src/main.py:732
+msgid "Soft tab width"
+msgstr "Ширина мягкого табулятора"
+
+#: src/main.py:734
+msgid "Tabs"
+msgstr "Вкладки"
+
+#: src/main.py:736
+msgid "Default panes"
+msgstr "Субокон по умолчанию"
+
+#: src/main.py:737
+msgid "Always show the tab bar"
+msgstr "Всегда показывать панель вкладок"
+
+#: src/main.py:738
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "Предупреждение, когда закрытие вкладки закроет %s"
+
+#: src/main.py:740
+msgid "Regional Settings"
+msgstr "Настройки Региона"
+
+#: src/main.py:742
+msgid "Default codec"
+msgstr "Кодек по умолчанию"
+
+#: src/main.py:743
+msgid "Order of codecs used to identify encoding"
+msgstr "Порядок кодеков, используемых для распознания кодировки"
+
+#: src/main.py:763
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/main.py:765
+msgid "Root directory"
+msgstr "Корневой каталог"
+
+#: src/main.py:766
+msgid "Cygdrive prefix"
+msgstr "Cygdrive префикс"
+
+#: src/main.py:782
+msgid "Version control system search order"
+msgstr ""
+
+#: src/main.py:788
+msgid "\"co\" command"
+msgstr "\"co\" команда"
+
+#: src/main.py:789
+msgid "\"rlog\" command"
+msgstr "\"rlog\" команда"
+
+#: src/main.py:791
+msgid "Command"
+msgstr "Команда"
+
+#: src/main.py:793
+msgid "Launch from a Bash login shell"
+msgstr "Запуск из оболочки Bash login"
+
+#: src/main.py:795
+msgid "Update paths for Cygwin"
+msgstr "Обновлять пути для Cygwin"
+
+#: src/main.py:799
+msgid "Version Control"
+msgstr "Контроль Версий"
+
+#: src/main.py:863
+msgid "Preferences"
+msgstr "Предпочтения"
+
+#: src/main.py:904 src/main.py:5802
+#, python-format
+msgid "Error writing %s."
+msgstr "Ошибка записи %s."
+
+#: src/main.py:3282
+msgid "Align with Selection"
+msgstr "Выровнять с Выборкой"
+
+#: src/main.py:3283
+msgid "Isolate"
+msgstr "Изолировать"
+
+#: src/main.py:3284
+msgid "Merge Selection"
+msgstr "Объединить Выборку"
+
+#: src/main.py:3286 src/main.py:6098
+msgid "Cut"
+msgstr "Вырезать"
+
+#: src/main.py:3287 src/main.py:6099
+msgid "Copy"
+msgstr "Копировать"
+
+#: src/main.py:3288 src/main.py:6100
+msgid "Paste"
+msgstr "Вставить"
+
+#: src/main.py:3290
+msgid "Select All"
+msgstr "Выбрать Все"
+
+#: src/main.py:3291 src/main.py:6101
+msgid "Clear Edits"
+msgstr "Очистить Правки"
+
+#: src/main.py:3293
+msgid "Swap with Selected Pane"
+msgstr "Обменять с Выбранным Субокном"
+
+#: src/main.py:5124
+msgid "Find..."
+msgstr "Найти..."
+
+#: src/main.py:5132
+msgid "Search For: "
+msgstr "Искать: "
+
+#: src/main.py:5157
+msgid "Match Case"
+msgstr "Учитывать регистр"
+
+#: src/main.py:5162
+msgid "Search Backwards"
+msgstr "Поиск в обратном направлении"
+
+#: src/main.py:5176
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "Закрытие этой вкладки закроет %s."
+
+#: src/main.py:5198
+msgid "Encoding: "
+msgstr "Кодировка: "
+
+#: src/main.py:5208
+msgid "Revision: "
+msgstr "Ревизия: "
+
+#: src/main.py:5272
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr "Diffuse является графическим инструментом для слияния и сравнения текстовых файлов."
+
+#: src/main.py:5277
+msgid "translator-credits"
+msgstr "v.01 О.Ю.Пахтусов (Oleg Pakhtusov) <oupakhtusov@gmail.com> "
+
+#: src/main.py:5281
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"Эта программа является бесплатным ПО; Вы можете распространять программу и/или изменять ее в соответствии с GNU General Public License, как опубликовано Free Software Foundation; либо версия 2 лицензии, либо (по вашему выбору) любая более поздняя версия.\n"
+"\n"
+"Эта программа распространяется в надежде, что она будет полезна, но БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ; без даже подразумеваемой гарантии ТОВАРНОГО СОСТОЯНИЯ или ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. Смотрите GNU General Public License для дополнительных подробностей.\n"
+"\n"
+"Вам Следует получить копию GNU General Public License вместе с этой программой.  Вы можете также получить копию GNU General Public License от Free Software Foundation, посетив их web-сайт (http://www.fsf.org/) или написав по адресу: Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+
+#: src/main.py:5322
+msgid "Close Tab"
+msgstr "Закрыть Вкладку"
+
+#: src/main.py:5377
+msgid "Open File..."
+msgstr "Открыть Файл..."
+
+#: src/main.py:5378
+msgid "Reload File"
+msgstr "Перезагрузить Файл"
+
+#: src/main.py:5379
+msgid "Save File"
+msgstr "Сохранить Файл"
+
+#: src/main.py:5380
+msgid "Save File As..."
+msgstr "Сохранить Файл Как..."
+
+#: src/main.py:5525
+msgid "Save changes before loading the new file?"
+msgstr "Сохранить изменения перед загрузкой нового файла?"
+
+#: src/main.py:5635
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "Ошибка считывания ревизии %(rev)s из %(file)s."
+
+#: src/main.py:5637 src/main.py:6900
+#, python-format
+msgid "Error reading %s."
+msgstr "Ошибка чтения %s."
+
+#: src/main.py:5658
+msgid "Open File"
+msgstr "Открыть Файл"
+
+#: src/main.py:5708
+#, python-format
+msgid "The file %s changed on disk.  Do you want to reload the file?"
+msgstr "Файл %s изменен на диске.  Вы хотите перезагрузить этот файл?"
+
+#: src/main.py:5728
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "Сохранить %(title)s Субокно %(pane)d"
+
+#: src/main.py:5754
+#, python-format
+msgid "A file named %s already exists.  Do you want to overwrite it?"
+msgstr "Файл под именем %s уже существует.  Вы хотите перезаписать его?"
+
+#: src/main.py:5759
+#, 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/main.py:5800
+#, python-format
+msgid "Error encoding to %s."
+msgstr "Ошибка кодирования в %s."
+
+#: src/main.py:5830
+msgid "Go To Line..."
+msgstr "Перейти на Строку..."
+
+#: src/main.py:5830
+msgid "Line Number: "
+msgstr "Номер строки: "
+
+#: src/main.py:5856
+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/main.py:5858
+msgid "Press the escape key to finish editing."
+msgstr "Нажмите клавишу Escape, чтобы закончить редактирование."
+
+#: src/main.py:5860
+msgid "Select target line and press the space bar to align.  Press the escape key to cancel."
+msgstr "Выберите целевую строку и нажмите клавишу Space, чтобы выровнять.  Нажмите Еscape для отмены."
+
+#: src/main.py:5971
+msgid "_File"
+msgstr "Фа_йл"
+
+#: src/main.py:5972
+msgid "_Open File..."
+msgstr "О_ткрыть Файл..."
+
+#: src/main.py:5973
+msgid "Open File In New _Tab..."
+msgstr "Открыт_ь Файл в Новой Вкладке..."
+
+#: src/main.py:5974
+msgid "Open _Modified Files..."
+msgstr "Открыть И_змененные Файлы..."
+
+#: src/main.py:5975
+msgid "Open Commi_t..."
+msgstr "Открыть Зафи_ксированные..."
+
+#: src/main.py:5976
+msgid "_Reload File"
+msgstr "Пер_езагрузить Файл"
+
+#: src/main.py:5978
+msgid "_Save File"
+msgstr "С_охранить Файл"
+
+#: src/main.py:5979
+msgid "Save File _As..."
+msgstr "Сохра_нить Файл Как..."
+
+#: src/main.py:5980
+msgid "Save A_ll"
+msgstr "Сохран_ить Все"
+
+#: src/main.py:5982
+msgid "New _2-Way File Merge"
+msgstr "Новое _2-Оконное Слияние Файлов"
+
+#: src/main.py:5983
+msgid "New _3-Way File Merge"
+msgstr "Новое _3-Оконное Слияние Файлов"
+
+#: src/main.py:5984
+msgid "New _N-Way File Merge..."
+msgstr "Новое _Многооконное Слияние Файлов..."
+
+#: src/main.py:5986
+msgid "_Close Tab"
+msgstr "З_акрыть Вкладку"
+
+#: src/main.py:5987
+msgid "_Undo Close Tab"
+msgstr "От_менить Закрытие Вкладки"
+
+#: src/main.py:5988
+msgid "_Quit"
+msgstr "В_ыход"
+
+#: src/main.py:5990
+msgid "_Edit"
+msgstr "Пра_вка"
+
+#: src/main.py:5991
+msgid "_Undo"
+msgstr "От_менить"
+
+#: src/main.py:5992
+msgid "_Redo"
+msgstr "Вер_нуть"
+
+#: src/main.py:5994
+msgid "Cu_t"
+msgstr "Выре_зать"
+
+#: src/main.py:5995
+msgid "_Copy"
+msgstr "Ко_пировать"
+
+#: src/main.py:5996
+msgid "_Paste"
+msgstr "В_ставить"
+
+#: src/main.py:5998
+msgid "Select _All"
+msgstr "В_ыбрать Все"
+
+#: src/main.py:5999
+msgid "C_lear Edits"
+msgstr "Оч_истить Правки"
+
+#: src/main.py:6000
+msgid "_Dismiss All Edits"
+msgstr "Сбр_осить Все Правки"
+
+#: src/main.py:6002
+msgid "_Find..."
+msgstr "На_йти..."
+
+#: src/main.py:6003
+msgid "Find _Next"
+msgstr "Н_айти Следующее"
+
+#: src/main.py:6004
+msgid "Find Pre_vious"
+msgstr "Най_ти Предыдущее"
+
+#: src/main.py:6005
+msgid "_Go To Line..."
+msgstr "Пер_ейти на Строку..."
+
+#: src/main.py:6007
+msgid "Pr_eferences..."
+msgstr "Предпо_чтения..."
+
+#: src/main.py:6009
+msgid "None"
+msgstr "Нет"
+
+#: src/main.py:6017
+msgid "_View"
+msgstr "В_ид"
+
+#: src/main.py:6018
+msgid "_Syntax Highlighting"
+msgstr "Подсве_тка Синтаксиса"
+
+#: src/main.py:6020
+msgid "Re_align All"
+msgstr "Пере_строить Все"
+
+#: src/main.py:6021
+msgid "_Isolate"
+msgstr "И_золировать"
+
+#: src/main.py:6023
+msgid "_First Difference"
+msgstr "Пер_вое Различие"
+
+#: src/main.py:6024
+msgid "_Previous Difference"
+msgstr "Предыдуще_е Различие"
+
+#: src/main.py:6025
+msgid "_Next Difference"
+msgstr "Следу_ющее Различие"
+
+#: src/main.py:6026
+msgid "_Last Difference"
+msgstr "П_оследнее Различие"
+
+#: src/main.py:6028
+msgid "Fir_st Tab"
+msgstr "Перв_ая Вкладка"
+
+#: src/main.py:6029
+msgid "Pre_vious Tab"
+msgstr "Предыдуща_я Вкладка"
+
+#: src/main.py:6030
+msgid "Next _Tab"
+msgstr "С_ледующая Вкладка"
+
+#: src/main.py:6031
+msgid "Las_t Tab"
+msgstr "Послед_няя Вкладка"
+
+#: src/main.py:6033
+msgid "Shift Pane _Right"
+msgstr "Пере_местить Субокно Вправо"
+
+#: src/main.py:6034
+msgid "Shift Pane _Left"
+msgstr "Перемест_ить Субокно Влево"
+
+#: src/main.py:6036
+msgid "F_ormat"
+msgstr "Фор_мат"
+
+#: src/main.py:6037
+msgid "Convert To _Upper Case"
+msgstr "Пр_еобразовать в Верхний Регистр"
+
+#: src/main.py:6038
+msgid "Convert To _Lower Case"
+msgstr "Пре_образовать в Нижний Регистр"
+
+#: src/main.py:6040
+msgid "Sort Lines In _Ascending Order"
+msgstr "Сор_тировать Строки в Порядке Возрастания"
+
+#: src/main.py:6041
+msgid "Sort Lines In D_escending Order"
+msgstr "Сорт_ировать Строки в Порядке Убывания"
+
+#: src/main.py:6043
+msgid "Remove Trailing _White Space"
+msgstr "Уда_лить Замыкающие Пробелы"
+
+#: src/main.py:6044
+msgid "Convert Tabs To _Spaces"
+msgstr "Преобр_азовать Табуляторы в Пробелы"
+
+#: src/main.py:6045
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "Преобра_зовать Вводные Пробелы в Табуляторы"
+
+#: src/main.py:6047
+msgid "_Increase Indenting"
+msgstr "У_величить Отступ"
+
+#: src/main.py:6048
+msgid "De_crease Indenting"
+msgstr "У_меньшить Отступ"
+
+#: src/main.py:6050
+msgid "Convert To _DOS Format"
+msgstr "Преобразоват_ь в DOS Формат"
+
+#: src/main.py:6051
+msgid "Convert To _Mac Format"
+msgstr "Преобразовать в Ma_с Формат"
+
+#: src/main.py:6052
+msgid "Convert To Uni_x Format"
+msgstr "Преобразовать в Uni_х Формат"
+
+#: src/main.py:6054
+msgid "_Merge"
+msgstr "С_лияние"
+
+#: src/main.py:6055
+msgid "Copy Selection _Right"
+msgstr "К_опировать Выборку Вправо"
+
+#: src/main.py:6056
+msgid "Copy Selection _Left"
+msgstr "Ко_пировать Выборку Влево"
+
+#: src/main.py:6058
+msgid "Copy Left _Into Selection"
+msgstr "Копиро_вать Слева в Выборку"
+
+#: src/main.py:6059
+msgid "Copy Right I_nto Selection"
+msgstr "Копиров_ать Справа в Выборку"
+
+#: src/main.py:6060
+msgid "_Merge From Left Then Right"
+msgstr "С_лияние Слева Затем Справа"
+
+#: src/main.py:6061
+msgid "M_erge From Right Then Left"
+msgstr "Сл_ияние Справа Затем Слева"
+
+#: src/main.py:6063
+msgid "_Help"
+msgstr "Спр_авка"
+
+#: src/main.py:6064
+msgid "_Help Contents..."
+msgstr "Содер_жание Справки..."
+
+#: src/main.py:6066
+#, python-format
+msgid "_About %s..."
+msgstr "О пр_ограмме %s..."
+
+#: src/main.py:6080
+msgid "New 2-Way File Merge"
+msgstr "Новое 2-Оконное Слияние Файлов"
+
+#: src/main.py:6081
+msgid "New 3-Way File Merge"
+msgstr "Новое 3-Оконное Слияние Файлов"
+
+#: src/main.py:6083
+msgid "Realign All"
+msgstr "Перестроить Все"
+
+#: src/main.py:6084
+msgid "First Difference"
+msgstr "Первое Различие"
+
+#: src/main.py:6085
+msgid "Previous Difference"
+msgstr "Предыдущее Различие"
+
+#: src/main.py:6086
+msgid "Next Difference"
+msgstr "Следующее Различие"
+
+#: src/main.py:6087
+msgid "Last Difference"
+msgstr "Последнее Различие"
+
+#: src/main.py:6089
+msgid "Copy Selection Right"
+msgstr "Копировать Выборку Вправо"
+
+#: src/main.py:6090
+msgid "Copy Selection Left"
+msgstr "Копировать Выборку Влево"
+
+#: src/main.py:6091
+msgid "Copy Left Into Selection"
+msgstr "Копировать Слева в Выборку"
+
+#: src/main.py:6092
+msgid "Copy Right Into Selection"
+msgstr "Копировать Справа в Выборку"
+
+#: src/main.py:6093
+msgid "Merge From Left Then Right"
+msgstr "Слияние Слева Затем Справа"
+
+#: src/main.py:6094
+msgid "Merge From Right Then Left"
+msgstr "Слияние Справа Затем Слева"
+
+#: src/main.py:6096
+msgid "Undo"
+msgstr "Отменить"
+
+#: src/main.py:6097
+msgid "Redo"
+msgstr "Вернуть"
+
+#: src/main.py:6221
+msgid "Some files have unsaved changes.  Select the files to save before closing."
+msgstr ""
+"Некоторые файлы имеют несохраненные изменения.\n"
+"Выберите файлы для сохранения перед закрытием."
+
+#: src/main.py:6234
+msgid "Tab"
+msgstr "Вкладка"
+
+#: src/main.py:6239
+msgid "Pane"
+msgstr "Субокно"
+
+#: src/main.py:6250
+msgid "Close _Without Saving"
+msgstr "Закр_ыть Без Сохранения"
+
+#: src/main.py:6361
+#, python-format
+msgid "File Merge %d"
+msgstr "Слияние Файлов %d"
+
+#: src/main.py:6464
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "Ошибка извлечения фиксаций для %s."
+
+#: src/main.py:6493
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "Ошибка извлечения модификаций для %s."
+
+#: src/main.py:6523
+msgid "Open File In New Tab"
+msgstr "Открыть Файл в Новой Вкладке"
+
+#: src/main.py:6539
+msgid "Choose Folder With Modified Files"
+msgstr "Выбрать Папку с Измененными Файлами"
+
+#: src/main.py:6552
+msgid "No modified files found."
+msgstr "Модифицированные файлы не найдены."
+
+#: src/main.py:6557
+msgid "Choose Folder With Commit"
+msgstr "Выбрать Папку с Зафиксированными Изменениями"
+
+#: src/main.py:6570
+msgid "No committed files found."
+msgstr "Файлы с фиксациями не найдены."
+
+#: src/main.py:6604
+msgid "New N-Way File Merge..."
+msgstr "Новое Многооконное Слияние Файлов..."
+
+#: src/main.py:6604
+msgid "Number of panes: "
+msgstr "Количество субокна: "
+
+#: src/main.py:6669
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "Фраза не найдена.  Продолжить с конца файла?"
+
+#: src/main.py:6671
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "Фраза не найдена.  Продолжить с начала файла?"
+
+#: src/main.py:6819
 msgid ""
 "Usage:\n"
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
@@ -112,770 +1076,30 @@ msgstr ""
 "  ( -i | --ignore-case )           Игнорировать различия регистра символов\n"
 "  ( -w | --ignore-all-space )      Игнорировать различия свободного места"
 
-#: src/usr/bin/diffuse.py.in:716
-#, python-format
-msgid "Error processing line %(line)d of %(file)s."
-msgstr "Ошибка обработки строки %(line)d из %(file)s."
-
-#: src/usr/bin/diffuse.py.in:735
-msgid "Auto Detect"
-msgstr "Автообнаружение "
-
-#: src/usr/bin/diffuse.py.in:831
-msgid "Display"
-msgstr "Отображение"
-
-#: src/usr/bin/diffuse.py.in:833
-msgid "Font"
-msgstr "Шрифт"
-
-#: src/usr/bin/diffuse.py.in:834
-msgid "Tab width"
-msgstr "Ширина табулятора"
-
-#: src/usr/bin/diffuse.py.in:835
-msgid "Show right margin"
-msgstr "Показывать правое поле"
-
-#: src/usr/bin/diffuse.py.in:836
-msgid "Right margin"
-msgstr "Правое поле"
-
-#: src/usr/bin/diffuse.py.in:837
-msgid "Show line numbers"
-msgstr "Показывать номера строк"
-
-#: src/usr/bin/diffuse.py.in:838
-msgid "Show white space characters"
-msgstr "Показывать символы пробелов"
-
-#: src/usr/bin/diffuse.py.in:839
-msgid "Ignore case differences"
-msgstr "Игнорировать различия в регистре"
-
-#: src/usr/bin/diffuse.py.in:840
-msgid "Ignore white space differences"
-msgstr "Игнорировать различия пробелов, символов табуляции и пустой строки"
-
-#: src/usr/bin/diffuse.py.in:841 src/usr/bin/diffuse.py.in:849
-msgid "Ignore changes to white space"
-msgstr "Игнорировать изменения пробелов, символов табуляции и пустой строки"
-
-#: src/usr/bin/diffuse.py.in:842
-msgid "Ignore blank line differences"
-msgstr "Игнорировать различия пустых строк"
-
-#: src/usr/bin/diffuse.py.in:843
-msgid "Ignore end of line differences"
-msgstr "Игнорировать различия окончания строк (терминаторы)"
-
-#: src/usr/bin/diffuse.py.in:845
-msgid "Alignment"
-msgstr "Выравнивание"
-
-#: src/usr/bin/diffuse.py.in:847
-msgid "Ignore case"
-msgstr "Игнорировать регистр символов"
-
-#: src/usr/bin/diffuse.py.in:848
-msgid "Ignore white space"
-msgstr "Игнорировать пробелы, символы табуляции и пустой строки"
-
-#: src/usr/bin/diffuse.py.in:850
-msgid "Ignore blank lines"
-msgstr "Игнорировать пустые строки"
-
-#: src/usr/bin/diffuse.py.in:851
-msgid "Ignore end of line characters"
-msgstr "Игнорировать символы окончания строк (терминаторы)"
-
-#: src/usr/bin/diffuse.py.in:853
-msgid "Editor"
-msgstr "Редактор"
-
-#: src/usr/bin/diffuse.py.in:855
-msgid "Auto indent"
-msgstr "Автоматический отступ"
-
-#: src/usr/bin/diffuse.py.in:856
-msgid "Expand tabs to spaces"
-msgstr "Расширить табуляторы до пробелов"
-
-#: src/usr/bin/diffuse.py.in:857
-msgid "Soft tab width"
-msgstr "Ширина мягкого табулятора"
-
-#: src/usr/bin/diffuse.py.in:859
-msgid "Tabs"
-msgstr "Вкладки"
-
-#: src/usr/bin/diffuse.py.in:861
-msgid "Default panes"
-msgstr "Субокон по умолчанию"
-
-#: src/usr/bin/diffuse.py.in:862
-msgid "Always show the tab bar"
-msgstr "Всегда показывать панель вкладок"
-
-#: src/usr/bin/diffuse.py.in:863
-#, python-format
-msgid "Warn me when closing a tab will quit %s"
-msgstr "Предупреждение, когда закрытие вкладки закроет %s"
-
-#: src/usr/bin/diffuse.py.in:865
-msgid "Regional Settings"
-msgstr "Настройки Региона"
-
-#: src/usr/bin/diffuse.py.in:867
-msgid "Default codec"
-msgstr "Кодек по умолчанию"
-
-#: src/usr/bin/diffuse.py.in:868
-msgid "Order of codecs used to identify encoding"
-msgstr "Порядок кодеков, используемых для распознания кодировки"
-
-#: src/usr/bin/diffuse.py.in:888
-msgid "Cygwin"
-msgstr "Cygwin"
-
-#: src/usr/bin/diffuse.py.in:890
-msgid "Root directory"
-msgstr "Корневой каталог"
-
-#: src/usr/bin/diffuse.py.in:891
-msgid "Cygdrive prefix"
-msgstr "Cygdrive префикс"
-
-#: src/usr/bin/diffuse.py.in:907
-msgid "Version control system search order"
-msgstr ""
-
-#: src/usr/bin/diffuse.py.in:913
-msgid "\"co\" command"
-msgstr "\"co\" команда"
-
-#: src/usr/bin/diffuse.py.in:914
-msgid "\"rlog\" command"
-msgstr "\"rlog\" команда"
-
-#: src/usr/bin/diffuse.py.in:916
-msgid "Command"
-msgstr "Команда"
-
-#: src/usr/bin/diffuse.py.in:918
-msgid "Launch from a Bash login shell"
-msgstr "Запуск из оболочки Bash login"
-
-#: src/usr/bin/diffuse.py.in:920
-msgid "Update paths for Cygwin"
-msgstr "Обновлять пути для Cygwin"
-
-#: src/usr/bin/diffuse.py.in:924
-msgid "Version Control"
-msgstr "Контроль Версий"
-
-#: src/usr/bin/diffuse.py.in:988
-msgid "Preferences"
-msgstr "Предпочтения"
-
-#: src/usr/bin/diffuse.py.in:1029 src/usr/bin/diffuse.py.in:7295
-#, python-format
-msgid "Error writing %s."
-msgstr "Ошибка записи %s."
-
-#: src/usr/bin/diffuse.py.in:1656 src/usr/bin/diffuse.py.in:2273
-#: src/usr/bin/diffuse.py.in:2417
-#, python-format
-msgid "Error parsing revision %s."
-msgstr "Ошибка анализа ревизии %s."
-
-#: src/usr/bin/diffuse.py.in:2658
-#, python-format
-msgid "Error parsing %s."
-msgstr "Ошибка анализа %s."
-
-#: src/usr/bin/diffuse.py.in:4778
-msgid "Align with Selection"
-msgstr "Выровнять с Выборкой"
-
-#: src/usr/bin/diffuse.py.in:4779
-msgid "Isolate"
-msgstr "Изолировать"
-
-#: src/usr/bin/diffuse.py.in:4780
-msgid "Merge Selection"
-msgstr "Объединить Выборку"
-
-#: src/usr/bin/diffuse.py.in:4782 src/usr/bin/diffuse.py.in:7593
-msgid "Cut"
-msgstr "Вырезать"
-
-#: src/usr/bin/diffuse.py.in:4783 src/usr/bin/diffuse.py.in:7594
-msgid "Copy"
-msgstr "Копировать"
-
-#: src/usr/bin/diffuse.py.in:4784 src/usr/bin/diffuse.py.in:7595
-msgid "Paste"
-msgstr "Вставить"
-
-#: src/usr/bin/diffuse.py.in:4786
-msgid "Select All"
-msgstr "Выбрать Все"
-
-#: src/usr/bin/diffuse.py.in:4787 src/usr/bin/diffuse.py.in:7596
-msgid "Clear Edits"
-msgstr "Очистить Правки"
-
-#: src/usr/bin/diffuse.py.in:4789
-msgid "Swap with Selected Pane"
-msgstr "Обменять с Выбранным Субокном"
-
-#: src/usr/bin/diffuse.py.in:6620
-msgid "Find..."
-msgstr "Найти..."
-
-#: src/usr/bin/diffuse.py.in:6628
-msgid "Search For: "
-msgstr "Искать: "
-
-#: src/usr/bin/diffuse.py.in:6653
-msgid "Match Case"
-msgstr "Учитывать регистр"
-
-#: src/usr/bin/diffuse.py.in:6658
-msgid "Search Backwards"
-msgstr "Поиск в обратном направлении"
-
-#: src/usr/bin/diffuse.py.in:6672
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "Закрытие этой вкладки закроет %s."
-
-#: src/usr/bin/diffuse.py.in:6694
-msgid "Encoding: "
-msgstr "Кодировка: "
-
-#: src/usr/bin/diffuse.py.in:6704
-msgid "Revision: "
-msgstr "Ревизия: "
-
-#: src/usr/bin/diffuse.py.in:6768
-msgid "Diffuse is a graphical tool for merging and comparing text files."
-msgstr "Diffuse является графическим инструментом для слияния и сравнения текстовых файлов."
-
-#: src/usr/bin/diffuse.py.in:6773
-msgid "translator-credits"
-msgstr "v.01 О.Ю.Пахтусов (Oleg Pakhtusov) <oupakhtusov@gmail.com> "
-
-#: src/usr/bin/diffuse.py.in:6776
-msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program.  You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
-"Эта программа является бесплатным ПО; Вы можете распространять программу и/или изменять ее в соответствии с GNU General Public License, как опубликовано Free Software Foundation; либо версия 2 лицензии, либо (по вашему выбору) любая более поздняя версия.\n"
-"\n"
-"Эта программа распространяется в надежде, что она будет полезна, но БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ; без даже подразумеваемой гарантии ТОВАРНОГО СОСТОЯНИЯ или ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. Смотрите GNU General Public License для дополнительных подробностей.\n"
-"\n"
-"Вам Следует получить копию GNU General Public License вместе с этой программой.  Вы можете также получить копию GNU General Public License от Free Software Foundation, посетив их web-сайт (http://www.fsf.org/) или написав по адресу: Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-
-#: src/usr/bin/diffuse.py.in:6811
-msgid "Close Tab"
-msgstr "Закрыть Вкладку"
-
-#: src/usr/bin/diffuse.py.in:6866
-msgid "Open File..."
-msgstr "Открыть Файл..."
-
-#: src/usr/bin/diffuse.py.in:6867
-msgid "Reload File"
-msgstr "Перезагрузить Файл"
-
-#: src/usr/bin/diffuse.py.in:6868
-msgid "Save File"
-msgstr "Сохранить Файл"
-
-#: src/usr/bin/diffuse.py.in:6869
-msgid "Save File As..."
-msgstr "Сохранить Файл Как..."
-
-#: src/usr/bin/diffuse.py.in:7014
-msgid "Save changes before loading the new file?"
-msgstr "Сохранить изменения перед загрузкой нового файла?"
-
-#: src/usr/bin/diffuse.py.in:7124
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "Ошибка считывания ревизии %(rev)s из %(file)s."
-
-#: src/usr/bin/diffuse.py.in:7126 src/usr/bin/diffuse.py.in:8359
-#, python-format
-msgid "Error reading %s."
-msgstr "Ошибка чтения %s."
-
-#: src/usr/bin/diffuse.py.in:7149
-msgid "Open File"
-msgstr "Открыть Файл"
-
-#: src/usr/bin/diffuse.py.in:7199
-#, python-format
-msgid "The file %s changed on disk.  Do you want to reload the file?"
-msgstr "Файл %s изменен на диске.  Вы хотите перезагрузить этот файл?"
-
-#: src/usr/bin/diffuse.py.in:7219
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "Сохранить %(title)s Субокно %(pane)d"
-
-#: src/usr/bin/diffuse.py.in:7245
-#, python-format
-msgid "A file named %s already exists.  Do you want to overwrite it?"
-msgstr "Файл под именем %s уже существует.  Вы хотите перезаписать его?"
-
-#: src/usr/bin/diffuse.py.in:7250
-#, 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/usr/bin/diffuse.py.in:7291
-#, python-format
-msgid "Error encoding to %s."
-msgstr "Ошибка кодирования в %s."
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Go To Line..."
-msgstr "Перейти на Строку..."
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Line Number: "
-msgstr "Номер строки: "
-
-#: src/usr/bin/diffuse.py.in:7351
-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/usr/bin/diffuse.py.in:7353
-msgid "Press the escape key to finish editing."
-msgstr "Нажмите клавишу Escape, чтобы закончить редактирование."
-
-#: src/usr/bin/diffuse.py.in:7355
-msgid "Select target line and press the space bar to align.  Press the escape key to cancel."
-msgstr "Выберите целевую строку и нажмите клавишу Space, чтобы выровнять.  Нажмите Еscape для отмены."
-
-#: src/usr/bin/diffuse.py.in:7466
-msgid "_File"
-msgstr "Фа_йл"
-
-#: src/usr/bin/diffuse.py.in:7467
-msgid "_Open File..."
-msgstr "О_ткрыть Файл..."
-
-#: src/usr/bin/diffuse.py.in:7468
-msgid "Open File In New _Tab..."
-msgstr "Открыт_ь Файл в Новой Вкладке..."
-
-#: src/usr/bin/diffuse.py.in:7469
-msgid "Open _Modified Files..."
-msgstr "Открыть И_змененные Файлы..."
-
-#: src/usr/bin/diffuse.py.in:7470
-msgid "Open Commi_t..."
-msgstr "Открыть Зафи_ксированные..."
-
-#: src/usr/bin/diffuse.py.in:7471
-msgid "_Reload File"
-msgstr "Пер_езагрузить Файл"
-
-#: src/usr/bin/diffuse.py.in:7473
-msgid "_Save File"
-msgstr "С_охранить Файл"
-
-#: src/usr/bin/diffuse.py.in:7474
-msgid "Save File _As..."
-msgstr "Сохра_нить Файл Как..."
-
-#: src/usr/bin/diffuse.py.in:7475
-msgid "Save A_ll"
-msgstr "Сохран_ить Все"
-
-#: src/usr/bin/diffuse.py.in:7477
-msgid "New _2-Way File Merge"
-msgstr "Новое _2-Оконное Слияние Файлов"
-
-#: src/usr/bin/diffuse.py.in:7478
-msgid "New _3-Way File Merge"
-msgstr "Новое _3-Оконное Слияние Файлов"
-
-#: src/usr/bin/diffuse.py.in:7479
-msgid "New _N-Way File Merge..."
-msgstr "Новое _Многооконное Слияние Файлов..."
-
-#: src/usr/bin/diffuse.py.in:7481
-msgid "_Close Tab"
-msgstr "З_акрыть Вкладку"
-
-#: src/usr/bin/diffuse.py.in:7482
-msgid "_Undo Close Tab"
-msgstr "От_менить Закрытие Вкладки"
-
-#: src/usr/bin/diffuse.py.in:7483
-msgid "_Quit"
-msgstr "В_ыход"
-
-#: src/usr/bin/diffuse.py.in:7485
-msgid "_Edit"
-msgstr "Пра_вка"
-
-#: src/usr/bin/diffuse.py.in:7486
-msgid "_Undo"
-msgstr "От_менить"
-
-#: src/usr/bin/diffuse.py.in:7487
-msgid "_Redo"
-msgstr "Вер_нуть"
-
-#: src/usr/bin/diffuse.py.in:7489
-msgid "Cu_t"
-msgstr "Выре_зать"
-
-#: src/usr/bin/diffuse.py.in:7490
-msgid "_Copy"
-msgstr "Ко_пировать"
-
-#: src/usr/bin/diffuse.py.in:7491
-msgid "_Paste"
-msgstr "В_ставить"
-
-#: src/usr/bin/diffuse.py.in:7493
-msgid "Select _All"
-msgstr "В_ыбрать Все"
-
-#: src/usr/bin/diffuse.py.in:7494
-msgid "C_lear Edits"
-msgstr "Оч_истить Правки"
-
-#: src/usr/bin/diffuse.py.in:7495
-msgid "_Dismiss All Edits"
-msgstr "Сбр_осить Все Правки"
-
-#: src/usr/bin/diffuse.py.in:7497
-msgid "_Find..."
-msgstr "На_йти..."
-
-#: src/usr/bin/diffuse.py.in:7498
-msgid "Find _Next"
-msgstr "Н_айти Следующее"
-
-#: src/usr/bin/diffuse.py.in:7499
-msgid "Find Pre_vious"
-msgstr "Най_ти Предыдущее"
-
-#: src/usr/bin/diffuse.py.in:7500
-msgid "_Go To Line..."
-msgstr "Пер_ейти на Строку..."
-
-#: src/usr/bin/diffuse.py.in:7502
-msgid "Pr_eferences..."
-msgstr "Предпо_чтения..."
-
-#: src/usr/bin/diffuse.py.in:7504
-msgid "None"
-msgstr "Нет"
-
-#: src/usr/bin/diffuse.py.in:7512
-msgid "_View"
-msgstr "В_ид"
-
-#: src/usr/bin/diffuse.py.in:7513
-msgid "_Syntax Highlighting"
-msgstr "Подсве_тка Синтаксиса"
-
-#: src/usr/bin/diffuse.py.in:7515
-msgid "Re_align All"
-msgstr "Пере_строить Все"
-
-#: src/usr/bin/diffuse.py.in:7516
-msgid "_Isolate"
-msgstr "И_золировать"
-
-#: src/usr/bin/diffuse.py.in:7518
-msgid "_First Difference"
-msgstr "Пер_вое Различие"
-
-#: src/usr/bin/diffuse.py.in:7519
-msgid "_Previous Difference"
-msgstr "Предыдуще_е Различие"
-
-#: src/usr/bin/diffuse.py.in:7520
-msgid "_Next Difference"
-msgstr "Следу_ющее Различие"
-
-#: src/usr/bin/diffuse.py.in:7521
-msgid "_Last Difference"
-msgstr "П_оследнее Различие"
-
-#: src/usr/bin/diffuse.py.in:7523
-msgid "Fir_st Tab"
-msgstr "Перв_ая Вкладка"
-
-#: src/usr/bin/diffuse.py.in:7524
-msgid "Pre_vious Tab"
-msgstr "Предыдуща_я Вкладка"
-
-#: src/usr/bin/diffuse.py.in:7525
-msgid "Next _Tab"
-msgstr "С_ледующая Вкладка"
-
-#: src/usr/bin/diffuse.py.in:7526
-msgid "Las_t Tab"
-msgstr "Послед_няя Вкладка"
-
-#: src/usr/bin/diffuse.py.in:7528
-msgid "Shift Pane _Right"
-msgstr "Пере_местить Субокно Вправо"
-
-#: src/usr/bin/diffuse.py.in:7529
-msgid "Shift Pane _Left"
-msgstr "Перемест_ить Субокно Влево"
-
-#: src/usr/bin/diffuse.py.in:7531
-msgid "F_ormat"
-msgstr "Фор_мат"
-
-#: src/usr/bin/diffuse.py.in:7532
-msgid "Convert To _Upper Case"
-msgstr "Пр_еобразовать в Верхний Регистр"
-
-#: src/usr/bin/diffuse.py.in:7533
-msgid "Convert To _Lower Case"
-msgstr "Пре_образовать в Нижний Регистр"
-
-#: src/usr/bin/diffuse.py.in:7535
-msgid "Sort Lines In _Ascending Order"
-msgstr "Сор_тировать Строки в Порядке Возрастания"
-
-#: src/usr/bin/diffuse.py.in:7536
-msgid "Sort Lines In D_escending Order"
-msgstr "Сорт_ировать Строки в Порядке Убывания"
-
-#: src/usr/bin/diffuse.py.in:7538
-msgid "Remove Trailing _White Space"
-msgstr "Уда_лить Замыкающие Пробелы"
-
-#: src/usr/bin/diffuse.py.in:7539
-msgid "Convert Tabs To _Spaces"
-msgstr "Преобр_азовать Табуляторы в Пробелы"
-
-#: src/usr/bin/diffuse.py.in:7540
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "Преобра_зовать Вводные Пробелы в Табуляторы"
-
-#: src/usr/bin/diffuse.py.in:7542
-msgid "_Increase Indenting"
-msgstr "У_величить Отступ"
-
-#: src/usr/bin/diffuse.py.in:7543
-msgid "De_crease Indenting"
-msgstr "У_меньшить Отступ"
-
-#: src/usr/bin/diffuse.py.in:7545
-msgid "Convert To _DOS Format"
-msgstr "Преобразоват_ь в DOS Формат"
-
-#: src/usr/bin/diffuse.py.in:7546
-msgid "Convert To _Mac Format"
-msgstr "Преобразовать в Ma_с Формат"
-
-#: src/usr/bin/diffuse.py.in:7547
-msgid "Convert To Uni_x Format"
-msgstr "Преобразовать в Uni_х Формат"
-
-#: src/usr/bin/diffuse.py.in:7549
-msgid "_Merge"
-msgstr "С_лияние"
-
-#: src/usr/bin/diffuse.py.in:7550
-msgid "Copy Selection _Right"
-msgstr "К_опировать Выборку Вправо"
-
-#: src/usr/bin/diffuse.py.in:7551
-msgid "Copy Selection _Left"
-msgstr "Ко_пировать Выборку Влево"
-
-#: src/usr/bin/diffuse.py.in:7553
-msgid "Copy Left _Into Selection"
-msgstr "Копиро_вать Слева в Выборку"
-
-#: src/usr/bin/diffuse.py.in:7554
-msgid "Copy Right I_nto Selection"
-msgstr "Копиров_ать Справа в Выборку"
-
-#: src/usr/bin/diffuse.py.in:7555
-msgid "_Merge From Left Then Right"
-msgstr "С_лияние Слева Затем Справа"
-
-#: src/usr/bin/diffuse.py.in:7556
-msgid "M_erge From Right Then Left"
-msgstr "Сл_ияние Справа Затем Слева"
-
-#: src/usr/bin/diffuse.py.in:7558
-msgid "_Help"
-msgstr "Спр_авка"
-
-#: src/usr/bin/diffuse.py.in:7559
-msgid "_Help Contents..."
-msgstr "Содер_жание Справки..."
-
-#: src/usr/bin/diffuse.py.in:7561
-#, python-format
-msgid "_About %s..."
-msgstr "О пр_ограмме %s..."
-
-#: src/usr/bin/diffuse.py.in:7575
-msgid "New 2-Way File Merge"
-msgstr "Новое 2-Оконное Слияние Файлов"
-
-#: src/usr/bin/diffuse.py.in:7576
-msgid "New 3-Way File Merge"
-msgstr "Новое 3-Оконное Слияние Файлов"
-
-#: src/usr/bin/diffuse.py.in:7578
-msgid "Realign All"
-msgstr "Перестроить Все"
-
-#: src/usr/bin/diffuse.py.in:7579
-msgid "First Difference"
-msgstr "Первое Различие"
-
-#: src/usr/bin/diffuse.py.in:7580
-msgid "Previous Difference"
-msgstr "Предыдущее Различие"
-
-#: src/usr/bin/diffuse.py.in:7581
-msgid "Next Difference"
-msgstr "Следующее Различие"
-
-#: src/usr/bin/diffuse.py.in:7582
-msgid "Last Difference"
-msgstr "Последнее Различие"
-
-#: src/usr/bin/diffuse.py.in:7584
-msgid "Copy Selection Right"
-msgstr "Копировать Выборку Вправо"
-
-#: src/usr/bin/diffuse.py.in:7585
-msgid "Copy Selection Left"
-msgstr "Копировать Выборку Влево"
-
-#: src/usr/bin/diffuse.py.in:7586
-msgid "Copy Left Into Selection"
-msgstr "Копировать Слева в Выборку"
-
-#: src/usr/bin/diffuse.py.in:7587
-msgid "Copy Right Into Selection"
-msgstr "Копировать Справа в Выборку"
-
-#: src/usr/bin/diffuse.py.in:7588
-msgid "Merge From Left Then Right"
-msgstr "Слияние Слева Затем Справа"
-
-#: src/usr/bin/diffuse.py.in:7589
-msgid "Merge From Right Then Left"
-msgstr "Слияние Справа Затем Слева"
-
-#: src/usr/bin/diffuse.py.in:7591
-msgid "Undo"
-msgstr "Отменить"
-
-#: src/usr/bin/diffuse.py.in:7592
-msgid "Redo"
-msgstr "Вернуть"
-
-#: src/usr/bin/diffuse.py.in:7716
-msgid "Some files have unsaved changes.  Select the files to save before closing."
-msgstr ""
-"Некоторые файлы имеют несохраненные изменения.\n"
-"Выберите файлы для сохранения перед закрытием."
-
-#: src/usr/bin/diffuse.py.in:7729
-msgid "Tab"
-msgstr "Вкладка"
-
-#: src/usr/bin/diffuse.py.in:7734
-msgid "Pane"
-msgstr "Субокно"
-
-#: src/usr/bin/diffuse.py.in:7745
-msgid "Close _Without Saving"
-msgstr "Закр_ыть Без Сохранения"
-
-#: src/usr/bin/diffuse.py.in:7856
-#, python-format
-msgid "File Merge %d"
-msgstr "Слияние Файлов %d"
-
-#: src/usr/bin/diffuse.py.in:7959
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "Ошибка извлечения фиксаций для %s."
-
-#: src/usr/bin/diffuse.py.in:7990
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "Ошибка извлечения модификаций для %s."
-
-#: src/usr/bin/diffuse.py.in:8022
-msgid "Open File In New Tab"
-msgstr "Открыть Файл в Новой Вкладке"
-
-#: src/usr/bin/diffuse.py.in:8038
-msgid "Choose Folder With Modified Files"
-msgstr "Выбрать Папку с Измененными Файлами"
-
-#: src/usr/bin/diffuse.py.in:8051
-msgid "No modified files found."
-msgstr "Модифицированные файлы не найдены."
-
-#: src/usr/bin/diffuse.py.in:8058
-msgid "Choose Folder With Commit"
-msgstr "Выбрать Папку с Зафиксированными Изменениями"
-
-#: src/usr/bin/diffuse.py.in:8071
-msgid "No committed files found."
-msgstr "Файлы с фиксациями не найдены."
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "New N-Way File Merge..."
-msgstr "Новое Многооконное Слияние Файлов..."
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "Number of panes: "
-msgstr "Количество субокна: "
-
-#: src/usr/bin/diffuse.py.in:8172
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "Фраза не найдена.  Продолжить с конца файла?"
-
-#: src/usr/bin/diffuse.py.in:8174
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "Фраза не найдена.  Продолжить с начала файла?"
-
-#: src/usr/bin/diffuse.py.in:8440
+#: src/main.py:6990
 msgid "Error parsing line number."
 msgstr "Ошибка анализа номера строки."
 
-#: src/usr/bin/diffuse.py.in:8450
+#: src/main.py:7000
 #, python-format
 msgid "Skipping unknown argument \"%s\"."
 msgstr "Пропуск неизвестного параметра \"%s\"."
 
-#: src/usr/bin/diffuse.py.in:8457
+#: src/main.py:7007
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Ошибка обработки параметра \"%s\".  Каталог не ожидался."
 
+#: src/vcs/cvs.py:50 src/vcs/rcs.py:54 src/vcs/svn.py:89
+#, python-format
+msgid "Error parsing revision %s."
+msgstr "Ошибка анализа ревизии %s."
+
+#: src/vcs/vcs_registry.py:216
+#, python-format
+msgid "Error parsing %s."
+msgstr "Ошибка анализа %s."
+
 #, python-format
 #~ msgid "Column %d"
 #~ msgstr "Столбец %d"
diff --git a/po/sv.po b/po/sv.po
index 7202eaf..07e8034 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: 2020-12-08 13:51-0500\n"
+"POT-Creation-Date: 2021-11-18 15:21-0500\n"
 "PO-Revision-Date: 2021-01-17 22:14+0100\n"
 "Last-Translator: Åke Engelbrektson <eson@svenskasprakfiler.se>\n"
 "Language-Team: Svenska Språkfiler <contactform@svenskasprakfiler.se>\n"
@@ -18,19 +18,981 @@ msgstr ""
 "X-Generator: Poedit 2.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: data/diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:4
 msgid "Diffuse Merge Tool"
 msgstr "Diffuse sammanfogningsverktyg"
 
-#: data/diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:5
 msgid "Graphical tool for merging and comparing text files"
 msgstr "Grafiskt verktyg för jämförelse och sammanfogning av textfiler"
 
-#: src/usr/bin/diffuse.py.in:70
+#: data/io.github.mightycreak.Diffuse.metainfo.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."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:19
+msgid "Main window: diff between two files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:26
+msgid "Patch release to fix a bug when using the Flatpak package."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:29
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:71
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:146
+msgid "Fixed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:31
+msgid "Fixed a Flatpak bug where the app couldn't call binaries on the host, such as `git`, `svn`, etc."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:40
+msgid "With this release, the main end-user change is the new icon. The rest is mainly maintenance improvements with a much more standard folder structure and starting to modularize the code. This is an ongoing effort as there is still a lot to do, but hopefully this would motivate some to contribute ;)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:47
+msgid "An important note though: the application ID has changed and is now io.github.mightycreak.Diffuse."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:51
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:89
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:123
+msgid "Added:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:53
+msgid "New icon and in SVG now"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:54
+msgid "Started to modularize the code"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:56
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:93
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:136
+msgid "Changed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:58
+msgid "Changed AppID to io.github.mightycreak.Diffuse (as advised in the Flatpak documentation)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:62
+msgid "Renamed directory `translations/` to `po/`"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:63
+msgid "Now uses POTFILES.in to list the files to translate"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:64
+msgid "Translation strings are no longer sorted alphabetically, this will help when there will be several files in POTFILES.in"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:68
+msgid "Updated the documentation and script in the `po/` directory"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:69
+msgid "Add .desktop translations in .po files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:73
+msgid "Fixed some GTK deprecation warnings"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:79
+msgid "Mainly under the hood changes in this release, so nothing really visible to the users in this version. That said, I figured it was a long time since the last release (4 months ago) and, as promised, I want Diffuse development to be a bit more active and iterative."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:85
+msgid "Apart from the maintenance changes 🧰, I think the main improvement is that Diffuse will soon be available through Flathub!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:91
+msgid "New Flatpak package, published on Flathub: com.github.mightycreak.Diffuse"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:95
+msgid "Replace old install.py with the more standard Meson"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:96
+msgid "Remove u string prefixes since Python 3 is in UTF-8 by default"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:97
+msgid "Replaced some interpolation operators (%) for the f string prefix"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:98
+msgid "Use the window scale factor for the icons generation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:104
+msgid "Here is the v0.5.0. Unintentionally, this release happens exactly 6 years after the previous v0.4.8 release!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:108
+msgid "There is a lot to do on this application, and some features didn't make the release. The main one being the Windows installers. I think 6 years is too long to continue to wait until this bug is fixed. The Python scripts should work on Windows, but no executable is produced (yet) with the release."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:115
+msgid "Other than that, Diffuse v0.5.0 is now officially compatible with Python 3 and GTK 3! And it is synced to the latest commits from upstream (which were never released)."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:120
+msgid "The next version will not take 6 years, I promise you! 😄"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:125
+msgid "Added Pedro Albuquerque's Portuguese translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:126
+msgid "Added Åke Engelbrektson's Swedish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:127
+msgid "Added Guillaume Hoffmann's Darcs support improvements"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:128
+msgid "Added Akom Chotiphantawanon's Thai translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:129
+msgid "Added support for Git submodules"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:130
+msgid "Added a preference and command line option to specify the version control system search order"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:131
+msgid "Added .editorconfig file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:132
+msgid "Added .gitignore file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:133
+msgid "Added message when removing files during uninstallation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:134
+msgid "Added Python script to update all the translation files at once"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:138
+msgid "Convert to Python 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:139
+msgid "Convert to GTK 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:140
+msgid "Updated Python highlighting for Python 3 grammar"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:141
+msgid "Updated copyrights years and authors"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:142
+msgid "Improve Spanish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:143
+msgid "Convert translation README to MarkDown"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:144
+msgid "Updated all the translation files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:148
+msgid "Fixed wrong icons directory for gtk-update-icon-cache"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:149
+msgid "Fixed missing directories when uninstalling"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:150
+msgid "Fixed bug introduced by r420 with RCS VCS"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:151
+msgid "Fixed broken drag'n'drop since migration to Python3/GTK3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:152
+msgid "Fixed error when using '-m' in an SVN repo"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:157
+msgid "Romain Failliot"
+msgstr ""
+
+#: src/constants.py.in:23
 msgid "Copyright"
 msgstr "Copyright"
 
-#: src/usr/bin/diffuse.py.in:81
+#: src/main.py:591
+#, python-format
+msgid "Error processing line %(line)d of %(file)s."
+msgstr "Fel vid bearbetning av rad %(line)d i %(file)s."
+
+#: src/main.py:610
+msgid "Auto Detect"
+msgstr "Identifiera automatiskt"
+
+#: src/main.py:706
+msgid "Display"
+msgstr "Visning"
+
+#: src/main.py:708
+msgid "Font"
+msgstr "Teckensnitt"
+
+#: src/main.py:709
+msgid "Tab width"
+msgstr "Tabulatorbredd"
+
+#: src/main.py:710
+msgid "Show right margin"
+msgstr "Visa höger marginal"
+
+#: src/main.py:711
+msgid "Right margin"
+msgstr "Höger marginal"
+
+#: src/main.py:712
+msgid "Show line numbers"
+msgstr "Visa radnummer"
+
+#: src/main.py:713
+msgid "Show white space characters"
+msgstr "Visa blankstegstecken"
+
+#: src/main.py:714
+msgid "Ignore case differences"
+msgstr "Ignorera olikheter i skiftläge"
+
+#: src/main.py:715
+msgid "Ignore white space differences"
+msgstr "Ignorera olikheter i blanksteg"
+
+#: src/main.py:716 src/main.py:724
+msgid "Ignore changes to white space"
+msgstr "Ignorera ändringar i blanksteg"
+
+#: src/main.py:717
+msgid "Ignore blank line differences"
+msgstr "Ignorera olikheter i tomma rader"
+
+#: src/main.py:718
+msgid "Ignore end of line differences"
+msgstr "Ignorera olikheter i radavslut"
+
+#: src/main.py:720
+msgid "Alignment"
+msgstr "Justering"
+
+#: src/main.py:722
+msgid "Ignore case"
+msgstr "Ignorera skiftläge"
+
+#: src/main.py:723
+msgid "Ignore white space"
+msgstr "Ignorera blanksteg"
+
+#: src/main.py:725
+msgid "Ignore blank lines"
+msgstr "Ignorera tomma rader"
+
+#: src/main.py:726
+msgid "Ignore end of line characters"
+msgstr "Ignorera tecken för radavslut"
+
+#: src/main.py:728
+msgid "Editor"
+msgstr "Redigerare"
+
+#: src/main.py:730
+msgid "Auto indent"
+msgstr "Automatiskt indrag"
+
+#: src/main.py:731
+msgid "Expand tabs to spaces"
+msgstr "Expandera tabbar till blanksteg"
+
+#: src/main.py:732
+msgid "Soft tab width"
+msgstr "Mjuk tabulatorbredd"
+
+#: src/main.py:734
+msgid "Tabs"
+msgstr "Flikar"
+
+#: src/main.py:736
+msgid "Default panes"
+msgstr "Standardpaneler"
+
+#: src/main.py:737
+msgid "Always show the tab bar"
+msgstr "Visa alltid flikfältet"
+
+#: src/main.py:738
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "Varna mig när flikstängning kommer att avsluta %s"
+
+#: src/main.py:740
+msgid "Regional Settings"
+msgstr "Regionala inställningar"
+
+#: src/main.py:742
+msgid "Default codec"
+msgstr "Standardkodning"
+
+#: src/main.py:743
+msgid "Order of codecs used to identify encoding"
+msgstr "Tabellordning för att identifiera kodning"
+
+#: src/main.py:763
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/main.py:765
+msgid "Root directory"
+msgstr "Root-mapp"
+
+#: src/main.py:766
+msgid "Cygdrive prefix"
+msgstr "Cygdrive-prefix"
+
+#: src/main.py:782
+msgid "Version control system search order"
+msgstr "Sökordning för versionskontrollsystem"
+
+#: src/main.py:788
+msgid "\"co\" command"
+msgstr "\"co\" kommando"
+
+#: src/main.py:789
+msgid "\"rlog\" command"
+msgstr "\"rlog\" kommando"
+
+#: src/main.py:791
+msgid "Command"
+msgstr "Kommando"
+
+#: src/main.py:793
+msgid "Launch from a Bash login shell"
+msgstr "Starta från ett Bash inloggningsskal"
+
+#: src/main.py:795
+msgid "Update paths for Cygwin"
+msgstr "Uppdatera sökvägar för Cygwin"
+
+#: src/main.py:799
+msgid "Version Control"
+msgstr "Versionskontroll"
+
+#: src/main.py:863
+msgid "Preferences"
+msgstr "Inställningar"
+
+#: src/main.py:904 src/main.py:5802
+#, python-format
+msgid "Error writing %s."
+msgstr "Fel vid skrivning av %s."
+
+#: src/main.py:3282
+msgid "Align with Selection"
+msgstr "Justera till markerat"
+
+#: src/main.py:3283
+msgid "Isolate"
+msgstr "Isolera"
+
+#: src/main.py:3284
+msgid "Merge Selection"
+msgstr "Sammanfoga markerat"
+
+#: src/main.py:3286 src/main.py:6098
+msgid "Cut"
+msgstr "Klipp ut"
+
+#: src/main.py:3287 src/main.py:6099
+msgid "Copy"
+msgstr "Kopiera"
+
+#: src/main.py:3288 src/main.py:6100
+msgid "Paste"
+msgstr "Klistra in"
+
+#: src/main.py:3290
+msgid "Select All"
+msgstr "Markera alla"
+
+#: src/main.py:3291 src/main.py:6101
+msgid "Clear Edits"
+msgstr "Rensa bort ändringar"
+
+#: src/main.py:3293
+msgid "Swap with Selected Pane"
+msgstr "Växla med markerad panel"
+
+#: src/main.py:5124
+msgid "Find..."
+msgstr "Sök..."
+
+#: src/main.py:5132
+msgid "Search For: "
+msgstr "Sök efter: "
+
+#: src/main.py:5157
+msgid "Match Case"
+msgstr "Skiftlägeskänslig"
+
+#: src/main.py:5162
+msgid "Search Backwards"
+msgstr "Sök bakifrån"
+
+#: src/main.py:5176
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "Stängning av denna flik, avslutar %s."
+
+#: src/main.py:5198
+msgid "Encoding: "
+msgstr "Teckentabell: "
+
+#: src/main.py:5208
+msgid "Revision: "
+msgstr "Revision: "
+
+#: src/main.py:5272
+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/main.py:5277
+msgid "translator-credits"
+msgstr "Åke Engelbrektson"
+
+#: src/main.py:5281
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"Detta program är fri mjukvara! Du kan återdistribuera det och/eller modifiera det, under villkoren för GNU General Public License som den publiceras av Free Software Foundation. Antingen version 2 av licensen, eller valfri senare version.\n"
+"\n"
+"Programmet distribueras i hopp om att det skall vara användbart, men UTAN NÅGRA GARANTIER. Utan ens underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR ETT VISST ÄNDAMÅL. Se GNU General Public License för mer detaljerad info.\n"
+"\n"
+"Du bör ha fått en kopia av GNU General Public License tillsammans med det här programmet. Du kan också hämta en kopia av GNU General Public License från Free Software Foundation genom att besöka deras webbsida (http://www.fsf.org/) eller skriva till Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.\n"
+
+#: src/main.py:5322
+msgid "Close Tab"
+msgstr "Stäng fliken"
+
+#: src/main.py:5377
+msgid "Open File..."
+msgstr "Öppna fil..."
+
+#: src/main.py:5378
+msgid "Reload File"
+msgstr "Läs in filen igen"
+
+#: src/main.py:5379
+msgid "Save File"
+msgstr "Spara filen"
+
+#: src/main.py:5380
+msgid "Save File As..."
+msgstr "Spara filen som..."
+
+#: src/main.py:5525
+msgid "Save changes before loading the new file?"
+msgstr "Vill du spara ändringar före inläsning av den ny filen?"
+
+#: src/main.py:5635
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "Fel vid läsning av revision %(rev)s i %(file)s."
+
+#: src/main.py:5637 src/main.py:6900
+#, python-format
+msgid "Error reading %s."
+msgstr "Fel vid läsning av  %s."
+
+#: src/main.py:5658
+msgid "Open File"
+msgstr "Öppna fil"
+
+#: src/main.py:5708
+#, 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/main.py:5728
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "Spara %(title)s Panel %(pane)d"
+
+#: src/main.py:5754
+#, 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/main.py:5759
+#, 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/main.py:5800
+#, python-format
+msgid "Error encoding to %s."
+msgstr "Fel vid kodning till %s."
+
+#: src/main.py:5830
+msgid "Go To Line..."
+msgstr "Gå till rad..."
+
+#: src/main.py:5830
+msgid "Line Number: "
+msgstr "Radnummer: "
+
+#: src/main.py:5856
+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/main.py:5858
+msgid "Press the escape key to finish editing."
+msgstr "Tryck på Esc-tangenten för att avsluta redigering."
+
+#: src/main.py:5860
+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/main.py:5971
+msgid "_File"
+msgstr "_Arkiv"
+
+#: src/main.py:5972
+msgid "_Open File..."
+msgstr "_Öppna fil..."
+
+#: src/main.py:5973
+msgid "Open File In New _Tab..."
+msgstr "Öppna fil i ny _flik..."
+
+#: src/main.py:5974
+msgid "Open _Modified Files..."
+msgstr "Öppna _ändrade filer..."
+
+#: src/main.py:5975
+msgid "Open Commi_t..."
+msgstr "_Öppna arkivering..."
+
+#: src/main.py:5976
+msgid "_Reload File"
+msgstr "_Läs in filen igen"
+
+#: src/main.py:5978
+msgid "_Save File"
+msgstr "_Spara filen"
+
+#: src/main.py:5979
+msgid "Save File _As..."
+msgstr "Spara filen _som..."
+
+#: src/main.py:5980
+msgid "Save A_ll"
+msgstr "Spara a_lla"
+
+#: src/main.py:5982
+msgid "New _2-Way File Merge"
+msgstr "Ny _2-vägs filsammanslagning"
+
+#: src/main.py:5983
+msgid "New _3-Way File Merge"
+msgstr "Ny _3-vägs filsammanslagning"
+
+#: src/main.py:5984
+msgid "New _N-Way File Merge..."
+msgstr "Ny _x-vägs filsammanslagning..."
+
+#: src/main.py:5986
+msgid "_Close Tab"
+msgstr "_Stäng fliken"
+
+#: src/main.py:5987
+msgid "_Undo Close Tab"
+msgstr "_Ångra flikstängning"
+
+#: src/main.py:5988
+msgid "_Quit"
+msgstr "_Avsluta"
+
+#: src/main.py:5990
+msgid "_Edit"
+msgstr "_Redigera"
+
+#: src/main.py:5991
+msgid "_Undo"
+msgstr "_Ångra"
+
+#: src/main.py:5992
+msgid "_Redo"
+msgstr "_Upprepa"
+
+#: src/main.py:5994
+msgid "Cu_t"
+msgstr "Klipp _ut"
+
+#: src/main.py:5995
+msgid "_Copy"
+msgstr "_Kopiera"
+
+#: src/main.py:5996
+msgid "_Paste"
+msgstr "_Klistra in"
+
+#: src/main.py:5998
+msgid "Select _All"
+msgstr "Markera _alla"
+
+#: src/main.py:5999
+msgid "C_lear Edits"
+msgstr "_Rensa bort ändringar"
+
+#: src/main.py:6000
+msgid "_Dismiss All Edits"
+msgstr "_Förkasta alla ändringar"
+
+#: src/main.py:6002
+msgid "_Find..."
+msgstr "_Sök..."
+
+#: src/main.py:6003
+msgid "Find _Next"
+msgstr "Sök _nästa"
+
+#: src/main.py:6004
+msgid "Find Pre_vious"
+msgstr "Sök _föregående"
+
+#: src/main.py:6005
+msgid "_Go To Line..."
+msgstr "_Gå till rad..."
+
+#: src/main.py:6007
+msgid "Pr_eferences..."
+msgstr "_Inställningar..."
+
+#: src/main.py:6009
+msgid "None"
+msgstr "Ingen"
+
+#: src/main.py:6017
+msgid "_View"
+msgstr "_Visa"
+
+#: src/main.py:6018
+msgid "_Syntax Highlighting"
+msgstr "_Syntaxmarkering"
+
+#: src/main.py:6020
+msgid "Re_align All"
+msgstr "_Omjustera alla"
+
+#: src/main.py:6021
+msgid "_Isolate"
+msgstr "_Isolera"
+
+#: src/main.py:6023
+msgid "_First Difference"
+msgstr "_Första olikheten"
+
+#: src/main.py:6024
+msgid "_Previous Difference"
+msgstr "_Föregående olikhet"
+
+#: src/main.py:6025
+msgid "_Next Difference"
+msgstr "_Nästa olikhet"
+
+#: src/main.py:6026
+msgid "_Last Difference"
+msgstr "_Sista olikheten"
+
+#: src/main.py:6028
+msgid "Fir_st Tab"
+msgstr "F_örsta fliken"
+
+#: src/main.py:6029
+msgid "Pre_vious Tab"
+msgstr "Före_gående flik"
+
+#: src/main.py:6030
+msgid "Next _Tab"
+msgstr "Nästa _flik"
+
+#: src/main.py:6031
+msgid "Las_t Tab"
+msgstr "S_ista fliken"
+
+#: src/main.py:6033
+msgid "Shift Pane _Right"
+msgstr "Växla panel _höger"
+
+#: src/main.py:6034
+msgid "Shift Pane _Left"
+msgstr "Växla panel _vänster"
+
+#: src/main.py:6036
+msgid "F_ormat"
+msgstr "F_ormat"
+
+#: src/main.py:6037
+msgid "Convert To _Upper Case"
+msgstr "Konvertera till _VERSALER"
+
+#: src/main.py:6038
+msgid "Convert To _Lower Case"
+msgstr "Konvertera till _gemener"
+
+#: src/main.py:6040
+msgid "Sort Lines In _Ascending Order"
+msgstr "Sortera rader i _stigande ordning"
+
+#: src/main.py:6041
+msgid "Sort Lines In D_escending Order"
+msgstr "Sortera rader i _fallande ordning"
+
+#: src/main.py:6043
+msgid "Remove Trailing _White Space"
+msgstr "Ta bort avslutande blanksteg"
+
+#: src/main.py:6044
+msgid "Convert Tabs To _Spaces"
+msgstr "Konvertera tabbar till _blanksteg"
+
+#: src/main.py:6045
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "Konvertera inledande blanksteg till _tabbar"
+
+#: src/main.py:6047
+msgid "_Increase Indenting"
+msgstr "_Utöka indrag"
+
+#: src/main.py:6048
+msgid "De_crease Indenting"
+msgstr "Mi_nska indrag"
+
+#: src/main.py:6050
+msgid "Convert To _DOS Format"
+msgstr "Konvertera till _DOS-format"
+
+#: src/main.py:6051
+msgid "Convert To _Mac Format"
+msgstr "Konvertera till _MAC-format"
+
+#: src/main.py:6052
+msgid "Convert To Uni_x Format"
+msgstr "Konvertera till _Unix-format"
+
+#: src/main.py:6054
+msgid "_Merge"
+msgstr "_Sammanfoga"
+
+#: src/main.py:6055
+msgid "Copy Selection _Right"
+msgstr "Kopiera från markerat till _höger"
+
+#: src/main.py:6056
+msgid "Copy Selection _Left"
+msgstr "Kopiera från markerat till _vänster"
+
+#: src/main.py:6058
+msgid "Copy Left _Into Selection"
+msgstr "Kopiera från vänster till _markerat"
+
+#: src/main.py:6059
+msgid "Copy Right I_nto Selection"
+msgstr "Kopiera från höger till m_arkerat"
+
+#: src/main.py:6060
+msgid "_Merge From Left Then Right"
+msgstr "_Sammanfoga från vänster, sedan höger"
+
+#: src/main.py:6061
+msgid "M_erge From Right Then Left"
+msgstr "S_ammanfoga från höger, sedan vänster"
+
+#: src/main.py:6063
+msgid "_Help"
+msgstr "_Hjälp"
+
+#: src/main.py:6064
+msgid "_Help Contents..."
+msgstr "_Hjälpinnehåll..."
+
+#: src/main.py:6066
+#, python-format
+msgid "_About %s..."
+msgstr "_Om %s..."
+
+#: src/main.py:6080
+msgid "New 2-Way File Merge"
+msgstr "Ny 2-vägs filsammanslagning"
+
+#: src/main.py:6081
+msgid "New 3-Way File Merge"
+msgstr "Ny 3-vägs filsammanslagning"
+
+#: src/main.py:6083
+msgid "Realign All"
+msgstr "Omjustera alla"
+
+#: src/main.py:6084
+msgid "First Difference"
+msgstr "Första olikheten"
+
+#: src/main.py:6085
+msgid "Previous Difference"
+msgstr "Föregående olikhet"
+
+#: src/main.py:6086
+msgid "Next Difference"
+msgstr "Nästa olikhet"
+
+#: src/main.py:6087
+msgid "Last Difference"
+msgstr "Sista olikheten"
+
+#: src/main.py:6089
+msgid "Copy Selection Right"
+msgstr "Kopiera från markerat till höger"
+
+#: src/main.py:6090
+msgid "Copy Selection Left"
+msgstr "Kopiera från markerat till vänster"
+
+#: src/main.py:6091
+msgid "Copy Left Into Selection"
+msgstr "Kopiera från vänster till markerat"
+
+#: src/main.py:6092
+msgid "Copy Right Into Selection"
+msgstr "Kopiera från höger till markerat"
+
+#: src/main.py:6093
+msgid "Merge From Left Then Right"
+msgstr "Sammanfoga från vänster, sedan höger"
+
+#: src/main.py:6094
+msgid "Merge From Right Then Left"
+msgstr "Sammanfoga från höger, sedan vänster"
+
+#: src/main.py:6096
+msgid "Undo"
+msgstr "Ångra"
+
+#: src/main.py:6097
+msgid "Redo"
+msgstr "Upprepa"
+
+#: src/main.py:6221
+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/main.py:6234
+msgid "Tab"
+msgstr "Flik"
+
+#: src/main.py:6239
+msgid "Pane"
+msgstr "Panel"
+
+#: src/main.py:6250
+msgid "Close _Without Saving"
+msgstr "Stäng _utan att spara"
+
+#: src/main.py:6361
+#, python-format
+msgid "File Merge %d"
+msgstr "Filsammanslagning %d"
+
+#: src/main.py:6464
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "Fel vid hämtning av arkiveringar för %s."
+
+#: src/main.py:6493
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "Fel vid hämtning av ändringar för %s."
+
+#: src/main.py:6523
+msgid "Open File In New Tab"
+msgstr "Öppna fil i ny flik"
+
+#: src/main.py:6539
+msgid "Choose Folder With Modified Files"
+msgstr "Välj mapp med ändrade filer"
+
+#: src/main.py:6552
+msgid "No modified files found."
+msgstr "Inga ändrade filer hittades."
+
+#: src/main.py:6557
+msgid "Choose Folder With Commit"
+msgstr "Välj mapp för arkiveringar"
+
+#: src/main.py:6570
+msgid "No committed files found."
+msgstr "Inga arkiverade filer hittades."
+
+#: src/main.py:6604
+msgid "New N-Way File Merge..."
+msgstr "Ny x-vägs filsammanslagning..."
+
+#: src/main.py:6604
+msgid "Number of panes: "
+msgstr "Antal paneler: "
+
+#: src/main.py:6669
+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/main.py:6671
+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/main.py:6819
 msgid ""
 "Usage:\n"
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
@@ -108,767 +1070,29 @@ msgstr ""
 "  ( -i | --ignore-case )           Ignorera olikheter i skiftläge\n"
 "  ( -w | --ignore-all-space )      Ignorera olikheter i blanksteg"
 
-#: src/usr/bin/diffuse.py.in:716
-#, python-format
-msgid "Error processing line %(line)d of %(file)s."
-msgstr "Fel vid bearbetning av rad %(line)d i %(file)s."
-
-#: src/usr/bin/diffuse.py.in:735
-msgid "Auto Detect"
-msgstr "Identifiera automatiskt"
-
-#: src/usr/bin/diffuse.py.in:831
-msgid "Display"
-msgstr "Visning"
-
-#: src/usr/bin/diffuse.py.in:833
-msgid "Font"
-msgstr "Teckensnitt"
-
-#: src/usr/bin/diffuse.py.in:834
-msgid "Tab width"
-msgstr "Tabulatorbredd"
-
-#: src/usr/bin/diffuse.py.in:835
-msgid "Show right margin"
-msgstr "Visa höger marginal"
-
-#: src/usr/bin/diffuse.py.in:836
-msgid "Right margin"
-msgstr "Höger marginal"
-
-#: src/usr/bin/diffuse.py.in:837
-msgid "Show line numbers"
-msgstr "Visa radnummer"
-
-#: src/usr/bin/diffuse.py.in:838
-msgid "Show white space characters"
-msgstr "Visa blankstegstecken"
-
-#: src/usr/bin/diffuse.py.in:839
-msgid "Ignore case differences"
-msgstr "Ignorera olikheter i skiftläge"
-
-#: src/usr/bin/diffuse.py.in:840
-msgid "Ignore white space differences"
-msgstr "Ignorera olikheter i blanksteg"
-
-#: src/usr/bin/diffuse.py.in:841 src/usr/bin/diffuse.py.in:849
-msgid "Ignore changes to white space"
-msgstr "Ignorera ändringar i blanksteg"
-
-#: src/usr/bin/diffuse.py.in:842
-msgid "Ignore blank line differences"
-msgstr "Ignorera olikheter i tomma rader"
-
-#: src/usr/bin/diffuse.py.in:843
-msgid "Ignore end of line differences"
-msgstr "Ignorera olikheter i radavslut"
-
-#: src/usr/bin/diffuse.py.in:845
-msgid "Alignment"
-msgstr "Justering"
-
-#: src/usr/bin/diffuse.py.in:847
-msgid "Ignore case"
-msgstr "Ignorera skiftläge"
-
-#: src/usr/bin/diffuse.py.in:848
-msgid "Ignore white space"
-msgstr "Ignorera blanksteg"
-
-#: src/usr/bin/diffuse.py.in:850
-msgid "Ignore blank lines"
-msgstr "Ignorera tomma rader"
-
-#: src/usr/bin/diffuse.py.in:851
-msgid "Ignore end of line characters"
-msgstr "Ignorera tecken för radavslut"
-
-#: src/usr/bin/diffuse.py.in:853
-msgid "Editor"
-msgstr "Redigerare"
-
-#: src/usr/bin/diffuse.py.in:855
-msgid "Auto indent"
-msgstr "Automatiskt indrag"
-
-#: src/usr/bin/diffuse.py.in:856
-msgid "Expand tabs to spaces"
-msgstr "Expandera tabbar till blanksteg"
-
-#: src/usr/bin/diffuse.py.in:857
-msgid "Soft tab width"
-msgstr "Mjuk tabulatorbredd"
-
-#: src/usr/bin/diffuse.py.in:859
-msgid "Tabs"
-msgstr "Flikar"
-
-#: src/usr/bin/diffuse.py.in:861
-msgid "Default panes"
-msgstr "Standardpaneler"
-
-#: src/usr/bin/diffuse.py.in:862
-msgid "Always show the tab bar"
-msgstr "Visa alltid flikfältet"
-
-#: src/usr/bin/diffuse.py.in:863
-#, python-format
-msgid "Warn me when closing a tab will quit %s"
-msgstr "Varna mig när flikstängning kommer att avsluta %s"
-
-#: src/usr/bin/diffuse.py.in:865
-msgid "Regional Settings"
-msgstr "Regionala inställningar"
-
-#: src/usr/bin/diffuse.py.in:867
-msgid "Default codec"
-msgstr "Standardkodning"
-
-#: src/usr/bin/diffuse.py.in:868
-msgid "Order of codecs used to identify encoding"
-msgstr "Tabellordning för att identifiera kodning"
-
-#: src/usr/bin/diffuse.py.in:888
-msgid "Cygwin"
-msgstr "Cygwin"
-
-#: src/usr/bin/diffuse.py.in:890
-msgid "Root directory"
-msgstr "Root-mapp"
-
-#: src/usr/bin/diffuse.py.in:891
-msgid "Cygdrive prefix"
-msgstr "Cygdrive-prefix"
-
-#: src/usr/bin/diffuse.py.in:907
-msgid "Version control system search order"
-msgstr "Sökordning för versionskontrollsystem"
-
-#: src/usr/bin/diffuse.py.in:913
-msgid "\"co\" command"
-msgstr "\"co\" kommando"
-
-#: src/usr/bin/diffuse.py.in:914
-msgid "\"rlog\" command"
-msgstr "\"rlog\" kommando"
-
-#: src/usr/bin/diffuse.py.in:916
-msgid "Command"
-msgstr "Kommando"
-
-#: src/usr/bin/diffuse.py.in:918
-msgid "Launch from a Bash login shell"
-msgstr "Starta från ett Bash inloggningsskal"
-
-#: src/usr/bin/diffuse.py.in:920
-msgid "Update paths for Cygwin"
-msgstr "Uppdatera sökvägar för Cygwin"
-
-#: src/usr/bin/diffuse.py.in:924
-msgid "Version Control"
-msgstr "Versionskontroll"
-
-#: src/usr/bin/diffuse.py.in:988
-msgid "Preferences"
-msgstr "Inställningar"
-
-#: src/usr/bin/diffuse.py.in:1029 src/usr/bin/diffuse.py.in:7295
-#, python-format
-msgid "Error writing %s."
-msgstr "Fel vid skrivning av %s."
-
-#: src/usr/bin/diffuse.py.in:1656 src/usr/bin/diffuse.py.in:2273
-#: src/usr/bin/diffuse.py.in:2417
-#, python-format
-msgid "Error parsing revision %s."
-msgstr "Fel vid tolkning av revision %s."
-
-#: src/usr/bin/diffuse.py.in:2658
-#, python-format
-msgid "Error parsing %s."
-msgstr "Fel vid tolkning av %s."
-
-#: src/usr/bin/diffuse.py.in:4778
-msgid "Align with Selection"
-msgstr "Justera till markerat"
-
-#: src/usr/bin/diffuse.py.in:4779
-msgid "Isolate"
-msgstr "Isolera"
-
-#: src/usr/bin/diffuse.py.in:4780
-msgid "Merge Selection"
-msgstr "Sammanfoga markerat"
-
-#: src/usr/bin/diffuse.py.in:4782 src/usr/bin/diffuse.py.in:7593
-msgid "Cut"
-msgstr "Klipp ut"
-
-#: src/usr/bin/diffuse.py.in:4783 src/usr/bin/diffuse.py.in:7594
-msgid "Copy"
-msgstr "Kopiera"
-
-#: src/usr/bin/diffuse.py.in:4784 src/usr/bin/diffuse.py.in:7595
-msgid "Paste"
-msgstr "Klistra in"
-
-#: src/usr/bin/diffuse.py.in:4786
-msgid "Select All"
-msgstr "Markera alla"
-
-#: src/usr/bin/diffuse.py.in:4787 src/usr/bin/diffuse.py.in:7596
-msgid "Clear Edits"
-msgstr "Rensa bort ändringar"
-
-#: src/usr/bin/diffuse.py.in:4789
-msgid "Swap with Selected Pane"
-msgstr "Växla med markerad panel"
-
-#: src/usr/bin/diffuse.py.in:6620
-msgid "Find..."
-msgstr "Sök..."
-
-#: src/usr/bin/diffuse.py.in:6628
-msgid "Search For: "
-msgstr "Sök efter: "
-
-#: src/usr/bin/diffuse.py.in:6653
-msgid "Match Case"
-msgstr "Skiftlägeskänslig"
-
-#: src/usr/bin/diffuse.py.in:6658
-msgid "Search Backwards"
-msgstr "Sök bakifrån"
-
-#: src/usr/bin/diffuse.py.in:6672
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "Stängning av denna flik, avslutar %s."
-
-#: src/usr/bin/diffuse.py.in:6694
-msgid "Encoding: "
-msgstr "Teckentabell: "
-
-#: src/usr/bin/diffuse.py.in:6704
-msgid "Revision: "
-msgstr "Revision: "
-
-#: src/usr/bin/diffuse.py.in:6768
-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/usr/bin/diffuse.py.in:6773
-msgid "translator-credits"
-msgstr "Åke Engelbrektson"
-
-#: src/usr/bin/diffuse.py.in:6776
-msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program.  You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
-"Detta program är fri mjukvara! Du kan återdistribuera det och/eller modifiera det, under villkoren för GNU General Public License som den publiceras av Free Software Foundation. Antingen version 2 av licensen, eller valfri senare version.\n"
-"\n"
-"Programmet distribueras i hopp om att det skall vara användbart, men UTAN NÅGRA GARANTIER. Utan ens underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR ETT VISST ÄNDAMÅL. Se GNU General Public License för mer detaljerad info.\n"
-"\n"
-"Du bör ha fått en kopia av GNU General Public License tillsammans med det här programmet. Du kan också hämta en kopia av GNU General Public License från Free Software Foundation genom att besöka deras webbsida (http://www.fsf.org/) eller skriva till Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.\n"
-
-#: src/usr/bin/diffuse.py.in:6811
-msgid "Close Tab"
-msgstr "Stäng fliken"
-
-#: src/usr/bin/diffuse.py.in:6866
-msgid "Open File..."
-msgstr "Öppna fil..."
-
-#: src/usr/bin/diffuse.py.in:6867
-msgid "Reload File"
-msgstr "Läs in filen igen"
-
-#: src/usr/bin/diffuse.py.in:6868
-msgid "Save File"
-msgstr "Spara filen"
-
-#: src/usr/bin/diffuse.py.in:6869
-msgid "Save File As..."
-msgstr "Spara filen som..."
-
-#: src/usr/bin/diffuse.py.in:7014
-msgid "Save changes before loading the new file?"
-msgstr "Vill du spara ändringar före inläsning av den ny filen?"
-
-#: src/usr/bin/diffuse.py.in:7124
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "Fel vid läsning av revision %(rev)s i %(file)s."
-
-#: src/usr/bin/diffuse.py.in:7126 src/usr/bin/diffuse.py.in:8359
-#, python-format
-msgid "Error reading %s."
-msgstr "Fel vid läsning av  %s."
-
-#: src/usr/bin/diffuse.py.in:7149
-msgid "Open File"
-msgstr "Öppna fil"
-
-#: src/usr/bin/diffuse.py.in:7199
-#, 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/usr/bin/diffuse.py.in:7219
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "Spara %(title)s Panel %(pane)d"
-
-#: src/usr/bin/diffuse.py.in:7245
-#, 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/usr/bin/diffuse.py.in:7250
-#, 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/usr/bin/diffuse.py.in:7291
-#, python-format
-msgid "Error encoding to %s."
-msgstr "Fel vid kodning till %s."
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Go To Line..."
-msgstr "Gå till rad..."
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Line Number: "
-msgstr "Radnummer: "
-
-#: src/usr/bin/diffuse.py.in:7351
-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/usr/bin/diffuse.py.in:7353
-msgid "Press the escape key to finish editing."
-msgstr "Tryck på Esc-tangenten för att avsluta redigering."
-
-#: src/usr/bin/diffuse.py.in:7355
-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/usr/bin/diffuse.py.in:7466
-msgid "_File"
-msgstr "_Arkiv"
-
-#: src/usr/bin/diffuse.py.in:7467
-msgid "_Open File..."
-msgstr "_Öppna fil..."
-
-#: src/usr/bin/diffuse.py.in:7468
-msgid "Open File In New _Tab..."
-msgstr "Öppna fil i ny _flik..."
-
-#: src/usr/bin/diffuse.py.in:7469
-msgid "Open _Modified Files..."
-msgstr "Öppna _ändrade filer..."
-
-#: src/usr/bin/diffuse.py.in:7470
-msgid "Open Commi_t..."
-msgstr "_Öppna arkivering..."
-
-#: src/usr/bin/diffuse.py.in:7471
-msgid "_Reload File"
-msgstr "_Läs in filen igen"
-
-#: src/usr/bin/diffuse.py.in:7473
-msgid "_Save File"
-msgstr "_Spara filen"
-
-#: src/usr/bin/diffuse.py.in:7474
-msgid "Save File _As..."
-msgstr "Spara filen _som..."
-
-#: src/usr/bin/diffuse.py.in:7475
-msgid "Save A_ll"
-msgstr "Spara a_lla"
-
-#: src/usr/bin/diffuse.py.in:7477
-msgid "New _2-Way File Merge"
-msgstr "Ny _2-vägs filsammanslagning"
-
-#: src/usr/bin/diffuse.py.in:7478
-msgid "New _3-Way File Merge"
-msgstr "Ny _3-vägs filsammanslagning"
-
-#: src/usr/bin/diffuse.py.in:7479
-msgid "New _N-Way File Merge..."
-msgstr "Ny _x-vägs filsammanslagning..."
-
-#: src/usr/bin/diffuse.py.in:7481
-msgid "_Close Tab"
-msgstr "_Stäng fliken"
-
-#: src/usr/bin/diffuse.py.in:7482
-msgid "_Undo Close Tab"
-msgstr "_Ångra flikstängning"
-
-#: src/usr/bin/diffuse.py.in:7483
-msgid "_Quit"
-msgstr "_Avsluta"
-
-#: src/usr/bin/diffuse.py.in:7485
-msgid "_Edit"
-msgstr "_Redigera"
-
-#: src/usr/bin/diffuse.py.in:7486
-msgid "_Undo"
-msgstr "_Ångra"
-
-#: src/usr/bin/diffuse.py.in:7487
-msgid "_Redo"
-msgstr "_Upprepa"
-
-#: src/usr/bin/diffuse.py.in:7489
-msgid "Cu_t"
-msgstr "Klipp _ut"
-
-#: src/usr/bin/diffuse.py.in:7490
-msgid "_Copy"
-msgstr "_Kopiera"
-
-#: src/usr/bin/diffuse.py.in:7491
-msgid "_Paste"
-msgstr "_Klistra in"
-
-#: src/usr/bin/diffuse.py.in:7493
-msgid "Select _All"
-msgstr "Markera _alla"
-
-#: src/usr/bin/diffuse.py.in:7494
-msgid "C_lear Edits"
-msgstr "_Rensa bort ändringar"
-
-#: src/usr/bin/diffuse.py.in:7495
-msgid "_Dismiss All Edits"
-msgstr "_Förkasta alla ändringar"
-
-#: src/usr/bin/diffuse.py.in:7497
-msgid "_Find..."
-msgstr "_Sök..."
-
-#: src/usr/bin/diffuse.py.in:7498
-msgid "Find _Next"
-msgstr "Sök _nästa"
-
-#: src/usr/bin/diffuse.py.in:7499
-msgid "Find Pre_vious"
-msgstr "Sök _föregående"
-
-#: src/usr/bin/diffuse.py.in:7500
-msgid "_Go To Line..."
-msgstr "_Gå till rad..."
-
-#: src/usr/bin/diffuse.py.in:7502
-msgid "Pr_eferences..."
-msgstr "_Inställningar..."
-
-#: src/usr/bin/diffuse.py.in:7504
-msgid "None"
-msgstr "Ingen"
-
-#: src/usr/bin/diffuse.py.in:7512
-msgid "_View"
-msgstr "_Visa"
-
-#: src/usr/bin/diffuse.py.in:7513
-msgid "_Syntax Highlighting"
-msgstr "_Syntaxmarkering"
-
-#: src/usr/bin/diffuse.py.in:7515
-msgid "Re_align All"
-msgstr "_Omjustera alla"
-
-#: src/usr/bin/diffuse.py.in:7516
-msgid "_Isolate"
-msgstr "_Isolera"
-
-#: src/usr/bin/diffuse.py.in:7518
-msgid "_First Difference"
-msgstr "_Första olikheten"
-
-#: src/usr/bin/diffuse.py.in:7519
-msgid "_Previous Difference"
-msgstr "_Föregående olikhet"
-
-#: src/usr/bin/diffuse.py.in:7520
-msgid "_Next Difference"
-msgstr "_Nästa olikhet"
-
-#: src/usr/bin/diffuse.py.in:7521
-msgid "_Last Difference"
-msgstr "_Sista olikheten"
-
-#: src/usr/bin/diffuse.py.in:7523
-msgid "Fir_st Tab"
-msgstr "F_örsta fliken"
-
-#: src/usr/bin/diffuse.py.in:7524
-msgid "Pre_vious Tab"
-msgstr "Före_gående flik"
-
-#: src/usr/bin/diffuse.py.in:7525
-msgid "Next _Tab"
-msgstr "Nästa _flik"
-
-#: src/usr/bin/diffuse.py.in:7526
-msgid "Las_t Tab"
-msgstr "S_ista fliken"
-
-#: src/usr/bin/diffuse.py.in:7528
-msgid "Shift Pane _Right"
-msgstr "Växla panel _höger"
-
-#: src/usr/bin/diffuse.py.in:7529
-msgid "Shift Pane _Left"
-msgstr "Växla panel _vänster"
-
-#: src/usr/bin/diffuse.py.in:7531
-msgid "F_ormat"
-msgstr "F_ormat"
-
-#: src/usr/bin/diffuse.py.in:7532
-msgid "Convert To _Upper Case"
-msgstr "Konvertera till _VERSALER"
-
-#: src/usr/bin/diffuse.py.in:7533
-msgid "Convert To _Lower Case"
-msgstr "Konvertera till _gemener"
-
-#: src/usr/bin/diffuse.py.in:7535
-msgid "Sort Lines In _Ascending Order"
-msgstr "Sortera rader i _stigande ordning"
-
-#: src/usr/bin/diffuse.py.in:7536
-msgid "Sort Lines In D_escending Order"
-msgstr "Sortera rader i _fallande ordning"
-
-#: src/usr/bin/diffuse.py.in:7538
-msgid "Remove Trailing _White Space"
-msgstr "Ta bort avslutande blanksteg"
-
-#: src/usr/bin/diffuse.py.in:7539
-msgid "Convert Tabs To _Spaces"
-msgstr "Konvertera tabbar till _blanksteg"
-
-#: src/usr/bin/diffuse.py.in:7540
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "Konvertera inledande blanksteg till _tabbar"
-
-#: src/usr/bin/diffuse.py.in:7542
-msgid "_Increase Indenting"
-msgstr "_Utöka indrag"
-
-#: src/usr/bin/diffuse.py.in:7543
-msgid "De_crease Indenting"
-msgstr "Mi_nska indrag"
-
-#: src/usr/bin/diffuse.py.in:7545
-msgid "Convert To _DOS Format"
-msgstr "Konvertera till _DOS-format"
-
-#: src/usr/bin/diffuse.py.in:7546
-msgid "Convert To _Mac Format"
-msgstr "Konvertera till _MAC-format"
-
-#: src/usr/bin/diffuse.py.in:7547
-msgid "Convert To Uni_x Format"
-msgstr "Konvertera till _Unix-format"
-
-#: src/usr/bin/diffuse.py.in:7549
-msgid "_Merge"
-msgstr "_Sammanfoga"
-
-#: src/usr/bin/diffuse.py.in:7550
-msgid "Copy Selection _Right"
-msgstr "Kopiera från markerat till _höger"
-
-#: src/usr/bin/diffuse.py.in:7551
-msgid "Copy Selection _Left"
-msgstr "Kopiera från markerat till _vänster"
-
-#: src/usr/bin/diffuse.py.in:7553
-msgid "Copy Left _Into Selection"
-msgstr "Kopiera från vänster till _markerat"
-
-#: src/usr/bin/diffuse.py.in:7554
-msgid "Copy Right I_nto Selection"
-msgstr "Kopiera från höger till m_arkerat"
-
-#: src/usr/bin/diffuse.py.in:7555
-msgid "_Merge From Left Then Right"
-msgstr "_Sammanfoga från vänster, sedan höger"
-
-#: src/usr/bin/diffuse.py.in:7556
-msgid "M_erge From Right Then Left"
-msgstr "S_ammanfoga från höger, sedan vänster"
-
-#: src/usr/bin/diffuse.py.in:7558
-msgid "_Help"
-msgstr "_Hjälp"
-
-#: src/usr/bin/diffuse.py.in:7559
-msgid "_Help Contents..."
-msgstr "_Hjälpinnehåll..."
-
-#: src/usr/bin/diffuse.py.in:7561
-#, python-format
-msgid "_About %s..."
-msgstr "_Om %s..."
-
-#: src/usr/bin/diffuse.py.in:7575
-msgid "New 2-Way File Merge"
-msgstr "Ny 2-vägs filsammanslagning"
-
-#: src/usr/bin/diffuse.py.in:7576
-msgid "New 3-Way File Merge"
-msgstr "Ny 3-vägs filsammanslagning"
-
-#: src/usr/bin/diffuse.py.in:7578
-msgid "Realign All"
-msgstr "Omjustera alla"
-
-#: src/usr/bin/diffuse.py.in:7579
-msgid "First Difference"
-msgstr "Första olikheten"
-
-#: src/usr/bin/diffuse.py.in:7580
-msgid "Previous Difference"
-msgstr "Föregående olikhet"
-
-#: src/usr/bin/diffuse.py.in:7581
-msgid "Next Difference"
-msgstr "Nästa olikhet"
-
-#: src/usr/bin/diffuse.py.in:7582
-msgid "Last Difference"
-msgstr "Sista olikheten"
-
-#: src/usr/bin/diffuse.py.in:7584
-msgid "Copy Selection Right"
-msgstr "Kopiera från markerat till höger"
-
-#: src/usr/bin/diffuse.py.in:7585
-msgid "Copy Selection Left"
-msgstr "Kopiera från markerat till vänster"
-
-#: src/usr/bin/diffuse.py.in:7586
-msgid "Copy Left Into Selection"
-msgstr "Kopiera från vänster till markerat"
-
-#: src/usr/bin/diffuse.py.in:7587
-msgid "Copy Right Into Selection"
-msgstr "Kopiera från höger till markerat"
-
-#: src/usr/bin/diffuse.py.in:7588
-msgid "Merge From Left Then Right"
-msgstr "Sammanfoga från vänster, sedan höger"
-
-#: src/usr/bin/diffuse.py.in:7589
-msgid "Merge From Right Then Left"
-msgstr "Sammanfoga från höger, sedan vänster"
-
-#: src/usr/bin/diffuse.py.in:7591
-msgid "Undo"
-msgstr "Ångra"
-
-#: src/usr/bin/diffuse.py.in:7592
-msgid "Redo"
-msgstr "Upprepa"
-
-#: src/usr/bin/diffuse.py.in:7716
-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/usr/bin/diffuse.py.in:7729
-msgid "Tab"
-msgstr "Flik"
-
-#: src/usr/bin/diffuse.py.in:7734
-msgid "Pane"
-msgstr "Panel"
-
-#: src/usr/bin/diffuse.py.in:7745
-msgid "Close _Without Saving"
-msgstr "Stäng _utan att spara"
-
-#: src/usr/bin/diffuse.py.in:7856
-#, python-format
-msgid "File Merge %d"
-msgstr "Filsammanslagning %d"
-
-#: src/usr/bin/diffuse.py.in:7959
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "Fel vid hämtning av arkiveringar för %s."
-
-#: src/usr/bin/diffuse.py.in:7990
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "Fel vid hämtning av ändringar för %s."
-
-#: src/usr/bin/diffuse.py.in:8022
-msgid "Open File In New Tab"
-msgstr "Öppna fil i ny flik"
-
-#: src/usr/bin/diffuse.py.in:8038
-msgid "Choose Folder With Modified Files"
-msgstr "Välj mapp med ändrade filer"
-
-#: src/usr/bin/diffuse.py.in:8051
-msgid "No modified files found."
-msgstr "Inga ändrade filer hittades."
-
-#: src/usr/bin/diffuse.py.in:8058
-msgid "Choose Folder With Commit"
-msgstr "Välj mapp för arkiveringar"
-
-#: src/usr/bin/diffuse.py.in:8071
-msgid "No committed files found."
-msgstr "Inga arkiverade filer hittades."
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "New N-Way File Merge..."
-msgstr "Ny x-vägs filsammanslagning..."
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "Number of panes: "
-msgstr "Antal paneler: "
-
-#: src/usr/bin/diffuse.py.in:8172
-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/usr/bin/diffuse.py.in:8174
-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/usr/bin/diffuse.py.in:8440
+#: src/main.py:6990
 msgid "Error parsing line number."
 msgstr "Fel vid tolkning av radnummer."
 
-#: src/usr/bin/diffuse.py.in:8450
+#: src/main.py:7000
 #, python-format
 msgid "Skipping unknown argument \"%s\"."
 msgstr "Undantar okänt argument \"%s\"."
 
-#: src/usr/bin/diffuse.py.in:8457
+#: src/main.py:7007
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "Fel vid bearbetning av argumentet \"%s\". Katalogen inte den förväntade."
 
+#: src/vcs/cvs.py:50 src/vcs/rcs.py:54 src/vcs/svn.py:89
+#, python-format
+msgid "Error parsing revision %s."
+msgstr "Fel vid tolkning av revision %s."
+
+#: src/vcs/vcs_registry.py:216
+#, python-format
+msgid "Error parsing %s."
+msgstr "Fel vid tolkning av %s."
+
 #~ msgid "Column %d"
 #~ msgstr "Kolumn %d"
diff --git a/po/th.po b/po/th.po
index d7176e8..70c302a 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: 2020-12-08 13:51-0500\n"
+"POT-Creation-Date: 2021-11-18 15:21-0500\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator: Akom Chotiphantawanon <knight2000@gmail.com>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -18,19 +18,981 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
-#: data/diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:4
 msgid "Diffuse Merge Tool"
 msgstr "Diffuse - เครื่องมือผสานแฟ้ม"
 
-#: data/diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:5
 msgid "Graphical tool for merging and comparing text files"
 msgstr "เครื่องมือแบบกราฟิกสำหรับเปรียบเทียบและผสานแฟ้มข้อความ"
 
-#: src/usr/bin/diffuse.py.in:70
+#: data/io.github.mightycreak.Diffuse.metainfo.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."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:19
+msgid "Main window: diff between two files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:26
+msgid "Patch release to fix a bug when using the Flatpak package."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:29
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:71
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:146
+msgid "Fixed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:31
+msgid "Fixed a Flatpak bug where the app couldn't call binaries on the host, such as `git`, `svn`, etc."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:40
+msgid "With this release, the main end-user change is the new icon. The rest is mainly maintenance improvements with a much more standard folder structure and starting to modularize the code. This is an ongoing effort as there is still a lot to do, but hopefully this would motivate some to contribute ;)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:47
+msgid "An important note though: the application ID has changed and is now io.github.mightycreak.Diffuse."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:51
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:89
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:123
+msgid "Added:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:53
+msgid "New icon and in SVG now"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:54
+msgid "Started to modularize the code"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:56
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:93
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:136
+msgid "Changed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:58
+msgid "Changed AppID to io.github.mightycreak.Diffuse (as advised in the Flatpak documentation)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:62
+msgid "Renamed directory `translations/` to `po/`"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:63
+msgid "Now uses POTFILES.in to list the files to translate"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:64
+msgid "Translation strings are no longer sorted alphabetically, this will help when there will be several files in POTFILES.in"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:68
+msgid "Updated the documentation and script in the `po/` directory"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:69
+msgid "Add .desktop translations in .po files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:73
+msgid "Fixed some GTK deprecation warnings"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:79
+msgid "Mainly under the hood changes in this release, so nothing really visible to the users in this version. That said, I figured it was a long time since the last release (4 months ago) and, as promised, I want Diffuse development to be a bit more active and iterative."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:85
+msgid "Apart from the maintenance changes 🧰, I think the main improvement is that Diffuse will soon be available through Flathub!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:91
+msgid "New Flatpak package, published on Flathub: com.github.mightycreak.Diffuse"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:95
+msgid "Replace old install.py with the more standard Meson"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:96
+msgid "Remove u string prefixes since Python 3 is in UTF-8 by default"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:97
+msgid "Replaced some interpolation operators (%) for the f string prefix"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:98
+msgid "Use the window scale factor for the icons generation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:104
+msgid "Here is the v0.5.0. Unintentionally, this release happens exactly 6 years after the previous v0.4.8 release!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:108
+msgid "There is a lot to do on this application, and some features didn't make the release. The main one being the Windows installers. I think 6 years is too long to continue to wait until this bug is fixed. The Python scripts should work on Windows, but no executable is produced (yet) with the release."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:115
+msgid "Other than that, Diffuse v0.5.0 is now officially compatible with Python 3 and GTK 3! And it is synced to the latest commits from upstream (which were never released)."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:120
+msgid "The next version will not take 6 years, I promise you! 😄"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:125
+msgid "Added Pedro Albuquerque's Portuguese translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:126
+msgid "Added Åke Engelbrektson's Swedish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:127
+msgid "Added Guillaume Hoffmann's Darcs support improvements"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:128
+msgid "Added Akom Chotiphantawanon's Thai translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:129
+msgid "Added support for Git submodules"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:130
+msgid "Added a preference and command line option to specify the version control system search order"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:131
+msgid "Added .editorconfig file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:132
+msgid "Added .gitignore file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:133
+msgid "Added message when removing files during uninstallation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:134
+msgid "Added Python script to update all the translation files at once"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:138
+msgid "Convert to Python 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:139
+msgid "Convert to GTK 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:140
+msgid "Updated Python highlighting for Python 3 grammar"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:141
+msgid "Updated copyrights years and authors"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:142
+msgid "Improve Spanish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:143
+msgid "Convert translation README to MarkDown"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:144
+msgid "Updated all the translation files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:148
+msgid "Fixed wrong icons directory for gtk-update-icon-cache"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:149
+msgid "Fixed missing directories when uninstalling"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:150
+msgid "Fixed bug introduced by r420 with RCS VCS"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:151
+msgid "Fixed broken drag'n'drop since migration to Python3/GTK3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:152
+msgid "Fixed error when using '-m' in an SVN repo"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:157
+msgid "Romain Failliot"
+msgstr ""
+
+#: src/constants.py.in:23
 msgid "Copyright"
 msgstr ""
 
-#: src/usr/bin/diffuse.py.in:81
+#: src/main.py:591
+#, python-format
+msgid "Error processing line %(line)d of %(file)s."
+msgstr "เกิดข้อผิดพลาดขณะประมวลผลบรรทัดที่ %(line)d ของ %(file)s"
+
+#: src/main.py:610
+msgid "Auto Detect"
+msgstr "ตรวจสอบอัตโนมัติ"
+
+#: src/main.py:706
+msgid "Display"
+msgstr "การแสดงผล"
+
+#: src/main.py:708
+msgid "Font"
+msgstr "แบบอักษร"
+
+#: src/main.py:709
+msgid "Tab width"
+msgstr "ความกว้างแท็บ"
+
+#: src/main.py:710
+msgid "Show right margin"
+msgstr "แสดงขอบขวา"
+
+#: src/main.py:711
+msgid "Right margin"
+msgstr "ขอบขวา"
+
+#: src/main.py:712
+msgid "Show line numbers"
+msgstr "แสดงเลขบรรทัด"
+
+#: src/main.py:713
+msgid "Show white space characters"
+msgstr "แสดงอักขระช่องว่าง"
+
+#: src/main.py:714
+msgid "Ignore case differences"
+msgstr "ไม่สนใจความแตกต่างของตัวพิมพ์ใหญ่-เล็ก"
+
+#: src/main.py:715
+msgid "Ignore white space differences"
+msgstr "ไม่สนใจความแตกต่างของช่องว่างทั้งหมด"
+
+#: src/main.py:716 src/main.py:724
+msgid "Ignore changes to white space"
+msgstr "ไม่สนใจการเปลี่ยนแปลงของช่องว่าง"
+
+#: src/main.py:717
+msgid "Ignore blank line differences"
+msgstr "ไม่สนใจความแตกต่างของบรรทัดเปล่า"
+
+#: src/main.py:718
+msgid "Ignore end of line differences"
+msgstr "ไม่สนใจความแตกต่างของอักขระจบบรรทัด"
+
+#: src/main.py:720
+msgid "Alignment"
+msgstr "การจัดเรียง"
+
+#: src/main.py:722
+msgid "Ignore case"
+msgstr "ไม่สนใจตัวพิมพ์ใหญ่-เล็ก"
+
+#: src/main.py:723
+msgid "Ignore white space"
+msgstr "ไม่สนใจช่องว่าง"
+
+#: src/main.py:725
+msgid "Ignore blank lines"
+msgstr "ไม่สนใจบรรทัดเปล่า"
+
+#: src/main.py:726
+msgid "Ignore end of line characters"
+msgstr "ไม่สนใจอักขระจบบรรทัด"
+
+#: src/main.py:728
+msgid "Editor"
+msgstr "เครื่องมือแก้ไข"
+
+#: src/main.py:730
+msgid "Auto indent"
+msgstr "ร่นบรรทัดอัตโนมัติ"
+
+#: src/main.py:731
+msgid "Expand tabs to spaces"
+msgstr "กระจายแท็บเป็นช่องว่าง"
+
+#: src/main.py:732
+msgid "Soft tab width"
+msgstr "ความกว้างของแท็บแบบซอฟต์"
+
+#: src/main.py:734
+msgid "Tabs"
+msgstr "แท็บ"
+
+#: src/main.py:736
+msgid "Default panes"
+msgstr "ช่องปริยาย"
+
+#: src/main.py:737
+msgid "Always show the tab bar"
+msgstr "แสดงแถบแท็บเสมอ"
+
+#: src/main.py:738
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "เตือนเมื่อการปิดแท็บจะออกจาก %s"
+
+#: src/main.py:740
+msgid "Regional Settings"
+msgstr "ค่าตั้งภูมิภาค"
+
+#: src/main.py:742
+msgid "Default codec"
+msgstr "ตัวอ่าน-ลงรหัสปริยาย"
+
+#: src/main.py:743
+msgid "Order of codecs used to identify encoding"
+msgstr "ลำดับตัวอ่าน-ลงรหัสที่ใช้ในการตรวจสอบรหัสอักขระ"
+
+#: src/main.py:763
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/main.py:765
+msgid "Root directory"
+msgstr "ไดเรกทอรีราก"
+
+#: src/main.py:766
+msgid "Cygdrive prefix"
+msgstr "พาธส่วนต้นของ Cygdrive"
+
+#: src/main.py:782
+msgid "Version control system search order"
+msgstr ""
+
+#: src/main.py:788
+msgid "\"co\" command"
+msgstr "คำสั่ง \"co\""
+
+#: src/main.py:789
+msgid "\"rlog\" command"
+msgstr "คำสั่ง \"rlog\""
+
+#: src/main.py:791
+msgid "Command"
+msgstr "คำสั่ง"
+
+#: src/main.py:793
+msgid "Launch from a Bash login shell"
+msgstr "เรียกจากเชลล์ล็อกอินของ Bash"
+
+#: src/main.py:795
+msgid "Update paths for Cygwin"
+msgstr "ปรับข้อมูลพาธสำหรับ Cygwin"
+
+#: src/main.py:799
+msgid "Version Control"
+msgstr "การควบคุมรุ่น"
+
+#: src/main.py:863
+msgid "Preferences"
+msgstr "ปรับแต่ง"
+
+#: src/main.py:904 src/main.py:5802
+#, python-format
+msgid "Error writing %s."
+msgstr "เกิดข้อผิดพลาดขณะเขียน %s"
+
+#: src/main.py:3282
+msgid "Align with Selection"
+msgstr "เรียงตรงกับบรรทัดที่เลือก"
+
+#: src/main.py:3283
+msgid "Isolate"
+msgstr "แยก"
+
+#: src/main.py:3284
+msgid "Merge Selection"
+msgstr "ผสานบรรทัดที่เลือก"
+
+#: src/main.py:3286 src/main.py:6098
+msgid "Cut"
+msgstr "ตัด"
+
+#: src/main.py:3287 src/main.py:6099
+msgid "Copy"
+msgstr "คัดลอก"
+
+#: src/main.py:3288 src/main.py:6100
+msgid "Paste"
+msgstr "แปะ"
+
+#: src/main.py:3290
+msgid "Select All"
+msgstr "เลือกทั้งหมด"
+
+#: src/main.py:3291 src/main.py:6101
+msgid "Clear Edits"
+msgstr "ล้างการแก้ไข"
+
+#: src/main.py:3293
+msgid "Swap with Selected Pane"
+msgstr "สลับกับช่องที่เลือก"
+
+#: src/main.py:5124
+msgid "Find..."
+msgstr "หา..."
+
+#: src/main.py:5132
+msgid "Search For: "
+msgstr "ค้นหา: "
+
+#: src/main.py:5157
+msgid "Match Case"
+msgstr "ตัวพิมพ์ใหญ่-เล็กตรงกัน"
+
+#: src/main.py:5162
+msgid "Search Backwards"
+msgstr "ค้นถอยหลัง"
+
+#: src/main.py:5176
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "การปิดแท็บนี้จะออกจาก %s"
+
+#: src/main.py:5198
+msgid "Encoding: "
+msgstr "รหัสอักขระ: "
+
+#: src/main.py:5208
+msgid "Revision: "
+msgstr "ฉบับแก้ไข: "
+
+#: src/main.py:5272
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr "Diffuse เป็นเครื่องมือแบบกราฟิกสำหรับผสานและเปรียบเทียบแฟ้มข้อความ"
+
+#: src/main.py:5277
+msgid "translator-credits"
+msgstr "Akom Chotiphantawanon <knight2000@gmail.com> "
+
+#: src/main.py:5281
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"โปรแกรมนี้เป็นซอฟต์แวร์เสรี คุณสามารถแจกจ่ายต่อ และ/หรือ แก้ไขโปรแกรมได้ ภายใต้เงื่อนไขของ GNU General Public License ที่เผยแพร่โดยมูลนิธิซอฟต์แวร์เสรี ไม่ว่าจะเป็นสัญญาอนุญาตรุ่นที่ 2 หรือรุ่นถัดมา (ตามแต่คุณจะเลือก)\n"
+"\n"
+"โปรแกรมนี้ เผยแพร่ด้วยความหวังว่าโปรแกรมจะมีประโยชน์ แต่ *ไม่มีการรับประกันใดๆ* ไม่มีแม้การรับประกัน *อรรถประโยชน์เชิงพาณิชย์* หรือ *ความเหมาะสมสำหรับวัตถุประสงค์เฉพาะกิจใดๆ* กรุณาอ่าน GNU General Public License เพื่อดูรายละเอียดเพิ่มเติม\n"
+"\n"
+"คุณควรจะได้รับสำเนาของ GNU General Public License มาพร้อมกับโปรแกรมนี้  และคุณยังอาจรับสำเนาของ GNU General Public License จาก Free Software Foundation โดยเข้าเยี่ยมชมเว็บไซต์ของมูลนิธิ (http://www.fsf.org/) หรือโดยการเขียนไปที่ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+
+#: src/main.py:5322
+msgid "Close Tab"
+msgstr "ปิดแท็บ"
+
+#: src/main.py:5377
+msgid "Open File..."
+msgstr "เปิดแฟ้ม..."
+
+#: src/main.py:5378
+msgid "Reload File"
+msgstr "โหลดแฟ้มซ้ำ"
+
+#: src/main.py:5379
+msgid "Save File"
+msgstr "บันทึกแฟ้ม"
+
+#: src/main.py:5380
+msgid "Save File As..."
+msgstr "บันทึกแฟ้มเป็น..."
+
+#: src/main.py:5525
+msgid "Save changes before loading the new file?"
+msgstr "บันทึกการเปลี่ยนแปลงก่อนโหลดแฟ้มใหม่หรือไม่?"
+
+#: src/main.py:5635
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "เกิดข้อผิดพลาดขณะอ่านฉบับแก้ไข %(rev)s ของ %(file)s"
+
+#: src/main.py:5637 src/main.py:6900
+#, python-format
+msgid "Error reading %s."
+msgstr "เกิดข้อผิดพลาดขณะอ่าน %s"
+
+#: src/main.py:5658
+msgid "Open File"
+msgstr "เปิดแฟ้ม"
+
+#: src/main.py:5708
+#, python-format
+msgid "The file %s changed on disk.  Do you want to reload the file?"
+msgstr "แฟ้ม \"%s\" มีการเปลี่ยนแปลงในดิสก์ คุณต้องการโหลดแฟ้มซ้ำหรือไม่?"
+
+#: src/main.py:5728
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "บันทึก %(title)s ช่อง %(pane)d"
+
+#: src/main.py:5754
+#, python-format
+msgid "A file named %s already exists.  Do you want to overwrite it?"
+msgstr "แฟ้มชื่อ \"%s\" มีอยู่ก่อนแล้ว  คุณต้องการเขียนทับหรือไม่?"
+
+#: src/main.py:5759
+#, 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/main.py:5800
+#, python-format
+msgid "Error encoding to %s."
+msgstr "เกิดข้อผิดพลาดขณะลงรหัส %s"
+
+#: src/main.py:5830
+msgid "Go To Line..."
+msgstr "ไปที่บรรทัด..."
+
+#: src/main.py:5830
+msgid "Line Number: "
+msgstr "หมายเลขบรรทัด: "
+
+#: src/main.py:5856
+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/main.py:5858
+msgid "Press the escape key to finish editing."
+msgstr "กดปุ่ม Escape เพื่อจบการแก้ไข"
+
+#: src/main.py:5860
+msgid "Select target line and press the space bar to align.  Press the escape key to cancel."
+msgstr "เลือกบรรทัดเป้าหมายแล้วกดแคร่เว้นวรรคเพื่อจัดเรียง  กดปุ่ม Escape เพื่อยกเลิก"
+
+#: src/main.py:5971
+msgid "_File"
+msgstr "แ_ฟ้ม"
+
+#: src/main.py:5972
+msgid "_Open File..."
+msgstr "_เปิดแฟ้ม..."
+
+#: src/main.py:5973
+msgid "Open File In New _Tab..."
+msgstr "เปิดแฟ้มในแ_ท็บใหม่..."
+
+#: src/main.py:5974
+msgid "Open _Modified Files..."
+msgstr "เปิดแฟ้มที่เ_ปลี่ยนแปลง..."
+
+#: src/main.py:5975
+msgid "Open Commi_t..."
+msgstr "เปิด Commi_t..."
+
+#: src/main.py:5976
+msgid "_Reload File"
+msgstr "โ_หลดแฟ้มซ้ำ"
+
+#: src/main.py:5978
+msgid "_Save File"
+msgstr "_บันทึกแฟ้ม"
+
+#: src/main.py:5979
+msgid "Save File _As..."
+msgstr "บันทึกแฟ้มเป็_น..."
+
+#: src/main.py:5980
+msgid "Save A_ll"
+msgstr "บันทึกทั้งห_มด"
+
+#: src/main.py:5982
+msgid "New _2-Way File Merge"
+msgstr "การผสานแฟ้ม _2 ทางชุดใหม่"
+
+#: src/main.py:5983
+msgid "New _3-Way File Merge"
+msgstr "การผสานแฟ้ม _3 ทางชุดใหม่"
+
+#: src/main.py:5984
+msgid "New _N-Way File Merge..."
+msgstr "การผสานแฟ้ม _N ทางชุดใหม่..."
+
+#: src/main.py:5986
+msgid "_Close Tab"
+msgstr "ปิ_ดแท็บ"
+
+#: src/main.py:5987
+msgid "_Undo Close Tab"
+msgstr "เ_รียกคืนการปิดแท็บ"
+
+#: src/main.py:5988
+msgid "_Quit"
+msgstr "_ออก"
+
+#: src/main.py:5990
+msgid "_Edit"
+msgstr "แ_ก้ไข"
+
+#: src/main.py:5991
+msgid "_Undo"
+msgstr "เ_รียกคืน"
+
+#: src/main.py:5992
+msgid "_Redo"
+msgstr "_ทำซ้ำ"
+
+#: src/main.py:5994
+msgid "Cu_t"
+msgstr "_ตัด"
+
+#: src/main.py:5995
+msgid "_Copy"
+msgstr "_คัดลอก"
+
+#: src/main.py:5996
+msgid "_Paste"
+msgstr "_แปะ"
+
+#: src/main.py:5998
+msgid "Select _All"
+msgstr "เลือกทั้ง_หมด"
+
+#: src/main.py:5999
+msgid "C_lear Edits"
+msgstr "_ล้างการแก้ไขต่างๆ"
+
+#: src/main.py:6000
+msgid "_Dismiss All Edits"
+msgstr "ไ_ม่สนใจการแก้ไขทั้งหมด"
+
+#: src/main.py:6002
+msgid "_Find..."
+msgstr "_หา..."
+
+#: src/main.py:6003
+msgid "Find _Next"
+msgstr "หา_ถัดไป"
+
+#: src/main.py:6004
+msgid "Find Pre_vious"
+msgstr "หา_ก่อนหน้า"
+
+#: src/main.py:6005
+msgid "_Go To Line..."
+msgstr "ไปที่_บรรทัด..."
+
+#: src/main.py:6007
+msgid "Pr_eferences..."
+msgstr "_ปรับแต่ง..."
+
+#: src/main.py:6009
+msgid "None"
+msgstr "ไม่มี"
+
+#: src/main.py:6017
+msgid "_View"
+msgstr "มุ_มมอง"
+
+#: src/main.py:6018
+msgid "_Syntax Highlighting"
+msgstr "การเน้นไ_วยากรณ์"
+
+#: src/main.py:6020
+msgid "Re_align All"
+msgstr "จัดเรียงให_ม่ทั้งหมด"
+
+#: src/main.py:6021
+msgid "_Isolate"
+msgstr "แ_ยก"
+
+#: src/main.py:6023
+msgid "_First Difference"
+msgstr "ความแตกต่างแ_รก"
+
+#: src/main.py:6024
+msgid "_Previous Difference"
+msgstr "ความแตกต่าง_ก่อนหน้า"
+
+#: src/main.py:6025
+msgid "_Next Difference"
+msgstr "ความแตกต่าง_ถัดไป"
+
+#: src/main.py:6026
+msgid "_Last Difference"
+msgstr "ความแตกต่าง_ล่าสุด"
+
+#: src/main.py:6028
+msgid "Fir_st Tab"
+msgstr "แท็บ_แรก"
+
+#: src/main.py:6029
+msgid "Pre_vious Tab"
+msgstr "แท็บก่อ_นหน้า"
+
+#: src/main.py:6030
+msgid "Next _Tab"
+msgstr "แ_ท็บถัดไป"
+
+#: src/main.py:6031
+msgid "Las_t Tab"
+msgstr "แท็บสุ_ดท้าย"
+
+#: src/main.py:6033
+msgid "Shift Pane _Right"
+msgstr "เลื่อนช่องไปทาง_ขวา"
+
+#: src/main.py:6034
+msgid "Shift Pane _Left"
+msgstr "เลื่อนช่องไปทางซ้_าย"
+
+#: src/main.py:6036
+msgid "F_ormat"
+msgstr "จัดรูปแ_บบ"
+
+#: src/main.py:6037
+msgid "Convert To _Upper Case"
+msgstr "แปลงเป็นตัวพิมพ์ใ_หญ่"
+
+#: src/main.py:6038
+msgid "Convert To _Lower Case"
+msgstr "แปลงเป็นตัวพิมพ์เล็_ก"
+
+#: src/main.py:6040
+msgid "Sort Lines In _Ascending Order"
+msgstr "เรียงบรรทัดจากน้_อยไปหามาก"
+
+#: src/main.py:6041
+msgid "Sort Lines In D_escending Order"
+msgstr "เรียงบรรทัดจาก_มากไปหาน้อย"
+
+#: src/main.py:6043
+msgid "Remove Trailing _White Space"
+msgstr "ลบช่องว่างท้า_ยบรรทัด"
+
+#: src/main.py:6044
+msgid "Convert Tabs To _Spaces"
+msgstr "แปลงแท็บเป็น_ช่องว่าง"
+
+#: src/main.py:6045
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "แปลงช่องว่างที่ต้นบรรทัดเป็นแ_ท็บ"
+
+#: src/main.py:6047
+msgid "_Increase Indenting"
+msgstr "เ_พิ่มการร่นย่อหน้า"
+
+#: src/main.py:6048
+msgid "De_crease Indenting"
+msgstr "_ลดการร่นย่อหน้า"
+
+#: src/main.py:6050
+msgid "Convert To _DOS Format"
+msgstr "แปลงเป็นรูปแบบ_ดอส"
+
+#: src/main.py:6051
+msgid "Convert To _Mac Format"
+msgstr "แปลงเป็นรูปแบบแ_ม็ค"
+
+#: src/main.py:6052
+msgid "Convert To Uni_x Format"
+msgstr "แปลงเป็นรูปแบบยู_นิกซ์"
+
+#: src/main.py:6054
+msgid "_Merge"
+msgstr "_ผสาน"
+
+#: src/main.py:6055
+msgid "Copy Selection _Right"
+msgstr "คัดลอกบรรทัดที่เลือกไปช่อง_ขวา"
+
+#: src/main.py:6056
+msgid "Copy Selection _Left"
+msgstr "คัดลอกบรรทัดที่เลือกไปช่องซ้า_ย"
+
+#: src/main.py:6058
+msgid "Copy Left _Into Selection"
+msgstr "คัดลอกช่องซ้าย_เข้าในบรรทัดที่เลือก"
+
+#: src/main.py:6059
+msgid "Copy Right I_nto Selection"
+msgstr "คัดลอกช่องขวาเข้าใ_นบรรทัดที่เลือก"
+
+#: src/main.py:6060
+msgid "_Merge From Left Then Right"
+msgstr "_ผสานจากช่องซ้ายแล้วตามด้วยขวา"
+
+#: src/main.py:6061
+msgid "M_erge From Right Then Left"
+msgstr "ผ_สานจากช่องขวาแล้วตามด้วยซ้าย"
+
+#: src/main.py:6063
+msgid "_Help"
+msgstr "_วิธีใช้"
+
+#: src/main.py:6064
+msgid "_Help Contents..."
+msgstr "เ_นื้อหาวิธีใช้..."
+
+#: src/main.py:6066
+#, python-format
+msgid "_About %s..."
+msgstr "เ_กี่ยวกับ %s..."
+
+#: src/main.py:6080
+msgid "New 2-Way File Merge"
+msgstr "การผสานแฟ้ม 2 ทางชุดใหม่"
+
+#: src/main.py:6081
+msgid "New 3-Way File Merge"
+msgstr "การผสานแฟ้ม 3 ทางชุดใหม่"
+
+#: src/main.py:6083
+msgid "Realign All"
+msgstr "จัดเรียงใหม่ทั้งหมด"
+
+#: src/main.py:6084
+msgid "First Difference"
+msgstr "ความแตกต่างแรก"
+
+#: src/main.py:6085
+msgid "Previous Difference"
+msgstr "ความแตกต่างก่อนหน้า"
+
+#: src/main.py:6086
+msgid "Next Difference"
+msgstr "ความแตกต่างถัดไป"
+
+#: src/main.py:6087
+msgid "Last Difference"
+msgstr "ความแตกต่างสุดท้าย"
+
+#: src/main.py:6089
+msgid "Copy Selection Right"
+msgstr "คัดลอกบรรทัดที่เลือกไปช่องขวา"
+
+#: src/main.py:6090
+msgid "Copy Selection Left"
+msgstr "คัดลอกบรรทัดที่เลือกไปช่องซ้าย"
+
+#: src/main.py:6091
+msgid "Copy Left Into Selection"
+msgstr "คัดลอกช่องซ้ายเข้าในบรรทัดที่เลือก"
+
+#: src/main.py:6092
+msgid "Copy Right Into Selection"
+msgstr "คัดลอกช่องขวาเข้าในบรรทัดที่เลือก"
+
+#: src/main.py:6093
+msgid "Merge From Left Then Right"
+msgstr "ผสานจากช่องซ้ายแล้วตามด้วยขวา"
+
+#: src/main.py:6094
+msgid "Merge From Right Then Left"
+msgstr "ผสานจากช่องขวาแล้วตามด้วยซ้าย"
+
+#: src/main.py:6096
+msgid "Undo"
+msgstr "เรียกคืน"
+
+#: src/main.py:6097
+msgid "Redo"
+msgstr "ทำซ้ำ"
+
+#: src/main.py:6221
+msgid "Some files have unsaved changes.  Select the files to save before closing."
+msgstr "บางแฟ้มมีการเปลี่ยนแปลงที่ไม่ได้บันทึก เลือกแฟ้มเพื่อบันทึกก่อนปิด"
+
+#: src/main.py:6234
+msgid "Tab"
+msgstr "แท็บ"
+
+#: src/main.py:6239
+msgid "Pane"
+msgstr "ช่อง"
+
+#: src/main.py:6250
+msgid "Close _Without Saving"
+msgstr "ปิ_ดโดยไม่บันทึก"
+
+#: src/main.py:6361
+#, python-format
+msgid "File Merge %d"
+msgstr "การผสานแฟ้ม %d"
+
+#: src/main.py:6464
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "เกิดข้อผิดพลาดขณะดึง commit ต่างๆ สำหรับ %s"
+
+#: src/main.py:6493
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "เกิดข้อผิดพลาดขณะดึงการเปลี่ยนแปลงสำหรับ %s"
+
+#: src/main.py:6523
+msgid "Open File In New Tab"
+msgstr "เปิดแฟ้มในแท็บใหม่"
+
+#: src/main.py:6539
+msgid "Choose Folder With Modified Files"
+msgstr "เลือกโฟลเดอร์ที่มีแฟ้มที่เปลี่ยนแปลง"
+
+#: src/main.py:6552
+msgid "No modified files found."
+msgstr "ไม่พบแฟ้มที่เปลี่ยนแปลง"
+
+#: src/main.py:6557
+msgid "Choose Folder With Commit"
+msgstr "เลือกโฟลเดอร์ที่มีการ commit"
+
+#: src/main.py:6570
+msgid "No committed files found."
+msgstr "ไม่พบแฟ้มที่มีการ commit"
+
+#: src/main.py:6604
+msgid "New N-Way File Merge..."
+msgstr "การผสานแฟ้ม N ทางชุดใหม่..."
+
+#: src/main.py:6604
+msgid "Number of panes: "
+msgstr "จำนวนช่อง: "
+
+#: src/main.py:6669
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "ไม่พบคำที่ค้น จะหาต่อจากท้ายแฟ้มหรือไม่?"
+
+#: src/main.py:6671
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "ไม่พบคำที่ค้น จะหาต่อจากต้นแฟ้มหรือไม่?"
+
+#: src/main.py:6819
 msgid ""
 "Usage:\n"
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
@@ -108,768 +1070,30 @@ msgstr ""
 "  ( -i | --ignore-case )           ไม่สนใจความแตกต่างของตัวพิมพ์ใหญ่-เล็ก\n"
 "  ( -w | --ignore-all-space )      ไม่สนใจความแตกต่างของช่องว่างทั้งหมด"
 
-#: src/usr/bin/diffuse.py.in:716
-#, python-format
-msgid "Error processing line %(line)d of %(file)s."
-msgstr "เกิดข้อผิดพลาดขณะประมวลผลบรรทัดที่ %(line)d ของ %(file)s"
-
-#: src/usr/bin/diffuse.py.in:735
-msgid "Auto Detect"
-msgstr "ตรวจสอบอัตโนมัติ"
-
-#: src/usr/bin/diffuse.py.in:831
-msgid "Display"
-msgstr "การแสดงผล"
-
-#: src/usr/bin/diffuse.py.in:833
-msgid "Font"
-msgstr "แบบอักษร"
-
-#: src/usr/bin/diffuse.py.in:834
-msgid "Tab width"
-msgstr "ความกว้างแท็บ"
-
-#: src/usr/bin/diffuse.py.in:835
-msgid "Show right margin"
-msgstr "แสดงขอบขวา"
-
-#: src/usr/bin/diffuse.py.in:836
-msgid "Right margin"
-msgstr "ขอบขวา"
-
-#: src/usr/bin/diffuse.py.in:837
-msgid "Show line numbers"
-msgstr "แสดงเลขบรรทัด"
-
-#: src/usr/bin/diffuse.py.in:838
-msgid "Show white space characters"
-msgstr "แสดงอักขระช่องว่าง"
-
-#: src/usr/bin/diffuse.py.in:839
-msgid "Ignore case differences"
-msgstr "ไม่สนใจความแตกต่างของตัวพิมพ์ใหญ่-เล็ก"
-
-#: src/usr/bin/diffuse.py.in:840
-msgid "Ignore white space differences"
-msgstr "ไม่สนใจความแตกต่างของช่องว่างทั้งหมด"
-
-#: src/usr/bin/diffuse.py.in:841 src/usr/bin/diffuse.py.in:849
-msgid "Ignore changes to white space"
-msgstr "ไม่สนใจการเปลี่ยนแปลงของช่องว่าง"
-
-#: src/usr/bin/diffuse.py.in:842
-msgid "Ignore blank line differences"
-msgstr "ไม่สนใจความแตกต่างของบรรทัดเปล่า"
-
-#: src/usr/bin/diffuse.py.in:843
-msgid "Ignore end of line differences"
-msgstr "ไม่สนใจความแตกต่างของอักขระจบบรรทัด"
-
-#: src/usr/bin/diffuse.py.in:845
-msgid "Alignment"
-msgstr "การจัดเรียง"
-
-#: src/usr/bin/diffuse.py.in:847
-msgid "Ignore case"
-msgstr "ไม่สนใจตัวพิมพ์ใหญ่-เล็ก"
-
-#: src/usr/bin/diffuse.py.in:848
-msgid "Ignore white space"
-msgstr "ไม่สนใจช่องว่าง"
-
-#: src/usr/bin/diffuse.py.in:850
-msgid "Ignore blank lines"
-msgstr "ไม่สนใจบรรทัดเปล่า"
-
-#: src/usr/bin/diffuse.py.in:851
-msgid "Ignore end of line characters"
-msgstr "ไม่สนใจอักขระจบบรรทัด"
-
-#: src/usr/bin/diffuse.py.in:853
-msgid "Editor"
-msgstr "เครื่องมือแก้ไข"
-
-#: src/usr/bin/diffuse.py.in:855
-msgid "Auto indent"
-msgstr "ร่นบรรทัดอัตโนมัติ"
-
-#: src/usr/bin/diffuse.py.in:856
-msgid "Expand tabs to spaces"
-msgstr "กระจายแท็บเป็นช่องว่าง"
-
-#: src/usr/bin/diffuse.py.in:857
-msgid "Soft tab width"
-msgstr "ความกว้างของแท็บแบบซอฟต์"
-
-#: src/usr/bin/diffuse.py.in:859
-msgid "Tabs"
-msgstr "แท็บ"
-
-#: src/usr/bin/diffuse.py.in:861
-msgid "Default panes"
-msgstr "ช่องปริยาย"
-
-#: src/usr/bin/diffuse.py.in:862
-msgid "Always show the tab bar"
-msgstr "แสดงแถบแท็บเสมอ"
-
-#: src/usr/bin/diffuse.py.in:863
-#, python-format
-msgid "Warn me when closing a tab will quit %s"
-msgstr "เตือนเมื่อการปิดแท็บจะออกจาก %s"
-
-#: src/usr/bin/diffuse.py.in:865
-msgid "Regional Settings"
-msgstr "ค่าตั้งภูมิภาค"
-
-#: src/usr/bin/diffuse.py.in:867
-msgid "Default codec"
-msgstr "ตัวอ่าน-ลงรหัสปริยาย"
-
-#: src/usr/bin/diffuse.py.in:868
-msgid "Order of codecs used to identify encoding"
-msgstr "ลำดับตัวอ่าน-ลงรหัสที่ใช้ในการตรวจสอบรหัสอักขระ"
-
-#: src/usr/bin/diffuse.py.in:888
-msgid "Cygwin"
-msgstr "Cygwin"
-
-#: src/usr/bin/diffuse.py.in:890
-msgid "Root directory"
-msgstr "ไดเรกทอรีราก"
-
-#: src/usr/bin/diffuse.py.in:891
-msgid "Cygdrive prefix"
-msgstr "พาธส่วนต้นของ Cygdrive"
-
-#: src/usr/bin/diffuse.py.in:907
-msgid "Version control system search order"
-msgstr ""
-
-#: src/usr/bin/diffuse.py.in:913
-msgid "\"co\" command"
-msgstr "คำสั่ง \"co\""
-
-#: src/usr/bin/diffuse.py.in:914
-msgid "\"rlog\" command"
-msgstr "คำสั่ง \"rlog\""
-
-#: src/usr/bin/diffuse.py.in:916
-msgid "Command"
-msgstr "คำสั่ง"
-
-#: src/usr/bin/diffuse.py.in:918
-msgid "Launch from a Bash login shell"
-msgstr "เรียกจากเชลล์ล็อกอินของ Bash"
-
-#: src/usr/bin/diffuse.py.in:920
-msgid "Update paths for Cygwin"
-msgstr "ปรับข้อมูลพาธสำหรับ Cygwin"
-
-#: src/usr/bin/diffuse.py.in:924
-msgid "Version Control"
-msgstr "การควบคุมรุ่น"
-
-#: src/usr/bin/diffuse.py.in:988
-msgid "Preferences"
-msgstr "ปรับแต่ง"
-
-#: src/usr/bin/diffuse.py.in:1029 src/usr/bin/diffuse.py.in:7295
-#, python-format
-msgid "Error writing %s."
-msgstr "เกิดข้อผิดพลาดขณะเขียน %s"
-
-#: src/usr/bin/diffuse.py.in:1656 src/usr/bin/diffuse.py.in:2273
-#: src/usr/bin/diffuse.py.in:2417
-#, python-format
-msgid "Error parsing revision %s."
-msgstr "เกิดข้อผิดพลาดขณะแจงฉบับแก้ไข %s"
-
-#: src/usr/bin/diffuse.py.in:2658
-#, python-format
-msgid "Error parsing %s."
-msgstr "เกิดข้อผิดพลาดขณะแจง %s"
-
-#: src/usr/bin/diffuse.py.in:4778
-msgid "Align with Selection"
-msgstr "เรียงตรงกับบรรทัดที่เลือก"
-
-#: src/usr/bin/diffuse.py.in:4779
-msgid "Isolate"
-msgstr "แยก"
-
-#: src/usr/bin/diffuse.py.in:4780
-msgid "Merge Selection"
-msgstr "ผสานบรรทัดที่เลือก"
-
-#: src/usr/bin/diffuse.py.in:4782 src/usr/bin/diffuse.py.in:7593
-msgid "Cut"
-msgstr "ตัด"
-
-#: src/usr/bin/diffuse.py.in:4783 src/usr/bin/diffuse.py.in:7594
-msgid "Copy"
-msgstr "คัดลอก"
-
-#: src/usr/bin/diffuse.py.in:4784 src/usr/bin/diffuse.py.in:7595
-msgid "Paste"
-msgstr "แปะ"
-
-#: src/usr/bin/diffuse.py.in:4786
-msgid "Select All"
-msgstr "เลือกทั้งหมด"
-
-#: src/usr/bin/diffuse.py.in:4787 src/usr/bin/diffuse.py.in:7596
-msgid "Clear Edits"
-msgstr "ล้างการแก้ไข"
-
-#: src/usr/bin/diffuse.py.in:4789
-msgid "Swap with Selected Pane"
-msgstr "สลับกับช่องที่เลือก"
-
-#: src/usr/bin/diffuse.py.in:6620
-msgid "Find..."
-msgstr "หา..."
-
-#: src/usr/bin/diffuse.py.in:6628
-msgid "Search For: "
-msgstr "ค้นหา: "
-
-#: src/usr/bin/diffuse.py.in:6653
-msgid "Match Case"
-msgstr "ตัวพิมพ์ใหญ่-เล็กตรงกัน"
-
-#: src/usr/bin/diffuse.py.in:6658
-msgid "Search Backwards"
-msgstr "ค้นถอยหลัง"
-
-#: src/usr/bin/diffuse.py.in:6672
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "การปิดแท็บนี้จะออกจาก %s"
-
-#: src/usr/bin/diffuse.py.in:6694
-msgid "Encoding: "
-msgstr "รหัสอักขระ: "
-
-#: src/usr/bin/diffuse.py.in:6704
-msgid "Revision: "
-msgstr "ฉบับแก้ไข: "
-
-#: src/usr/bin/diffuse.py.in:6768
-msgid "Diffuse is a graphical tool for merging and comparing text files."
-msgstr "Diffuse เป็นเครื่องมือแบบกราฟิกสำหรับผสานและเปรียบเทียบแฟ้มข้อความ"
-
-#: src/usr/bin/diffuse.py.in:6773
-msgid "translator-credits"
-msgstr "Akom Chotiphantawanon <knight2000@gmail.com> "
-
-#: src/usr/bin/diffuse.py.in:6776
-msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program.  You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
-"โปรแกรมนี้เป็นซอฟต์แวร์เสรี คุณสามารถแจกจ่ายต่อ และ/หรือ แก้ไขโปรแกรมได้ ภายใต้เงื่อนไขของ GNU General Public License ที่เผยแพร่โดยมูลนิธิซอฟต์แวร์เสรี ไม่ว่าจะเป็นสัญญาอนุญาตรุ่นที่ 2 หรือรุ่นถัดมา (ตามแต่คุณจะเลือก)\n"
-"\n"
-"โปรแกรมนี้ เผยแพร่ด้วยความหวังว่าโปรแกรมจะมีประโยชน์ แต่ *ไม่มีการรับประกันใดๆ* ไม่มีแม้การรับประกัน *อรรถประโยชน์เชิงพาณิชย์* หรือ *ความเหมาะสมสำหรับวัตถุประสงค์เฉพาะกิจใดๆ* กรุณาอ่าน GNU General Public License เพื่อดูรายละเอียดเพิ่มเติม\n"
-"\n"
-"คุณควรจะได้รับสำเนาของ GNU General Public License มาพร้อมกับโปรแกรมนี้  และคุณยังอาจรับสำเนาของ GNU General Public License จาก Free Software Foundation โดยเข้าเยี่ยมชมเว็บไซต์ของมูลนิธิ (http://www.fsf.org/) หรือโดยการเขียนไปที่ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-
-#: src/usr/bin/diffuse.py.in:6811
-msgid "Close Tab"
-msgstr "ปิดแท็บ"
-
-#: src/usr/bin/diffuse.py.in:6866
-msgid "Open File..."
-msgstr "เปิดแฟ้ม..."
-
-#: src/usr/bin/diffuse.py.in:6867
-msgid "Reload File"
-msgstr "โหลดแฟ้มซ้ำ"
-
-#: src/usr/bin/diffuse.py.in:6868
-msgid "Save File"
-msgstr "บันทึกแฟ้ม"
-
-#: src/usr/bin/diffuse.py.in:6869
-msgid "Save File As..."
-msgstr "บันทึกแฟ้มเป็น..."
-
-#: src/usr/bin/diffuse.py.in:7014
-msgid "Save changes before loading the new file?"
-msgstr "บันทึกการเปลี่ยนแปลงก่อนโหลดแฟ้มใหม่หรือไม่?"
-
-#: src/usr/bin/diffuse.py.in:7124
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "เกิดข้อผิดพลาดขณะอ่านฉบับแก้ไข %(rev)s ของ %(file)s"
-
-#: src/usr/bin/diffuse.py.in:7126 src/usr/bin/diffuse.py.in:8359
-#, python-format
-msgid "Error reading %s."
-msgstr "เกิดข้อผิดพลาดขณะอ่าน %s"
-
-#: src/usr/bin/diffuse.py.in:7149
-msgid "Open File"
-msgstr "เปิดแฟ้ม"
-
-#: src/usr/bin/diffuse.py.in:7199
-#, python-format
-msgid "The file %s changed on disk.  Do you want to reload the file?"
-msgstr "แฟ้ม \"%s\" มีการเปลี่ยนแปลงในดิสก์ คุณต้องการโหลดแฟ้มซ้ำหรือไม่?"
-
-#: src/usr/bin/diffuse.py.in:7219
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "บันทึก %(title)s ช่อง %(pane)d"
-
-#: src/usr/bin/diffuse.py.in:7245
-#, python-format
-msgid "A file named %s already exists.  Do you want to overwrite it?"
-msgstr "แฟ้มชื่อ \"%s\" มีอยู่ก่อนแล้ว  คุณต้องการเขียนทับหรือไม่?"
-
-#: src/usr/bin/diffuse.py.in:7250
-#, 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/usr/bin/diffuse.py.in:7291
-#, python-format
-msgid "Error encoding to %s."
-msgstr "เกิดข้อผิดพลาดขณะลงรหัส %s"
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Go To Line..."
-msgstr "ไปที่บรรทัด..."
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Line Number: "
-msgstr "หมายเลขบรรทัด: "
-
-#: src/usr/bin/diffuse.py.in:7351
-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/usr/bin/diffuse.py.in:7353
-msgid "Press the escape key to finish editing."
-msgstr "กดปุ่ม Escape เพื่อจบการแก้ไข"
-
-#: src/usr/bin/diffuse.py.in:7355
-msgid "Select target line and press the space bar to align.  Press the escape key to cancel."
-msgstr "เลือกบรรทัดเป้าหมายแล้วกดแคร่เว้นวรรคเพื่อจัดเรียง  กดปุ่ม Escape เพื่อยกเลิก"
-
-#: src/usr/bin/diffuse.py.in:7466
-msgid "_File"
-msgstr "แ_ฟ้ม"
-
-#: src/usr/bin/diffuse.py.in:7467
-msgid "_Open File..."
-msgstr "_เปิดแฟ้ม..."
-
-#: src/usr/bin/diffuse.py.in:7468
-msgid "Open File In New _Tab..."
-msgstr "เปิดแฟ้มในแ_ท็บใหม่..."
-
-#: src/usr/bin/diffuse.py.in:7469
-msgid "Open _Modified Files..."
-msgstr "เปิดแฟ้มที่เ_ปลี่ยนแปลง..."
-
-#: src/usr/bin/diffuse.py.in:7470
-msgid "Open Commi_t..."
-msgstr "เปิด Commi_t..."
-
-#: src/usr/bin/diffuse.py.in:7471
-msgid "_Reload File"
-msgstr "โ_หลดแฟ้มซ้ำ"
-
-#: src/usr/bin/diffuse.py.in:7473
-msgid "_Save File"
-msgstr "_บันทึกแฟ้ม"
-
-#: src/usr/bin/diffuse.py.in:7474
-msgid "Save File _As..."
-msgstr "บันทึกแฟ้มเป็_น..."
-
-#: src/usr/bin/diffuse.py.in:7475
-msgid "Save A_ll"
-msgstr "บันทึกทั้งห_มด"
-
-#: src/usr/bin/diffuse.py.in:7477
-msgid "New _2-Way File Merge"
-msgstr "การผสานแฟ้ม _2 ทางชุดใหม่"
-
-#: src/usr/bin/diffuse.py.in:7478
-msgid "New _3-Way File Merge"
-msgstr "การผสานแฟ้ม _3 ทางชุดใหม่"
-
-#: src/usr/bin/diffuse.py.in:7479
-msgid "New _N-Way File Merge..."
-msgstr "การผสานแฟ้ม _N ทางชุดใหม่..."
-
-#: src/usr/bin/diffuse.py.in:7481
-msgid "_Close Tab"
-msgstr "ปิ_ดแท็บ"
-
-#: src/usr/bin/diffuse.py.in:7482
-msgid "_Undo Close Tab"
-msgstr "เ_รียกคืนการปิดแท็บ"
-
-#: src/usr/bin/diffuse.py.in:7483
-msgid "_Quit"
-msgstr "_ออก"
-
-#: src/usr/bin/diffuse.py.in:7485
-msgid "_Edit"
-msgstr "แ_ก้ไข"
-
-#: src/usr/bin/diffuse.py.in:7486
-msgid "_Undo"
-msgstr "เ_รียกคืน"
-
-#: src/usr/bin/diffuse.py.in:7487
-msgid "_Redo"
-msgstr "_ทำซ้ำ"
-
-#: src/usr/bin/diffuse.py.in:7489
-msgid "Cu_t"
-msgstr "_ตัด"
-
-#: src/usr/bin/diffuse.py.in:7490
-msgid "_Copy"
-msgstr "_คัดลอก"
-
-#: src/usr/bin/diffuse.py.in:7491
-msgid "_Paste"
-msgstr "_แปะ"
-
-#: src/usr/bin/diffuse.py.in:7493
-msgid "Select _All"
-msgstr "เลือกทั้ง_หมด"
-
-#: src/usr/bin/diffuse.py.in:7494
-msgid "C_lear Edits"
-msgstr "_ล้างการแก้ไขต่างๆ"
-
-#: src/usr/bin/diffuse.py.in:7495
-msgid "_Dismiss All Edits"
-msgstr "ไ_ม่สนใจการแก้ไขทั้งหมด"
-
-#: src/usr/bin/diffuse.py.in:7497
-msgid "_Find..."
-msgstr "_หา..."
-
-#: src/usr/bin/diffuse.py.in:7498
-msgid "Find _Next"
-msgstr "หา_ถัดไป"
-
-#: src/usr/bin/diffuse.py.in:7499
-msgid "Find Pre_vious"
-msgstr "หา_ก่อนหน้า"
-
-#: src/usr/bin/diffuse.py.in:7500
-msgid "_Go To Line..."
-msgstr "ไปที่_บรรทัด..."
-
-#: src/usr/bin/diffuse.py.in:7502
-msgid "Pr_eferences..."
-msgstr "_ปรับแต่ง..."
-
-#: src/usr/bin/diffuse.py.in:7504
-msgid "None"
-msgstr "ไม่มี"
-
-#: src/usr/bin/diffuse.py.in:7512
-msgid "_View"
-msgstr "มุ_มมอง"
-
-#: src/usr/bin/diffuse.py.in:7513
-msgid "_Syntax Highlighting"
-msgstr "การเน้นไ_วยากรณ์"
-
-#: src/usr/bin/diffuse.py.in:7515
-msgid "Re_align All"
-msgstr "จัดเรียงให_ม่ทั้งหมด"
-
-#: src/usr/bin/diffuse.py.in:7516
-msgid "_Isolate"
-msgstr "แ_ยก"
-
-#: src/usr/bin/diffuse.py.in:7518
-msgid "_First Difference"
-msgstr "ความแตกต่างแ_รก"
-
-#: src/usr/bin/diffuse.py.in:7519
-msgid "_Previous Difference"
-msgstr "ความแตกต่าง_ก่อนหน้า"
-
-#: src/usr/bin/diffuse.py.in:7520
-msgid "_Next Difference"
-msgstr "ความแตกต่าง_ถัดไป"
-
-#: src/usr/bin/diffuse.py.in:7521
-msgid "_Last Difference"
-msgstr "ความแตกต่าง_ล่าสุด"
-
-#: src/usr/bin/diffuse.py.in:7523
-msgid "Fir_st Tab"
-msgstr "แท็บ_แรก"
-
-#: src/usr/bin/diffuse.py.in:7524
-msgid "Pre_vious Tab"
-msgstr "แท็บก่อ_นหน้า"
-
-#: src/usr/bin/diffuse.py.in:7525
-msgid "Next _Tab"
-msgstr "แ_ท็บถัดไป"
-
-#: src/usr/bin/diffuse.py.in:7526
-msgid "Las_t Tab"
-msgstr "แท็บสุ_ดท้าย"
-
-#: src/usr/bin/diffuse.py.in:7528
-msgid "Shift Pane _Right"
-msgstr "เลื่อนช่องไปทาง_ขวา"
-
-#: src/usr/bin/diffuse.py.in:7529
-msgid "Shift Pane _Left"
-msgstr "เลื่อนช่องไปทางซ้_าย"
-
-#: src/usr/bin/diffuse.py.in:7531
-msgid "F_ormat"
-msgstr "จัดรูปแ_บบ"
-
-#: src/usr/bin/diffuse.py.in:7532
-msgid "Convert To _Upper Case"
-msgstr "แปลงเป็นตัวพิมพ์ใ_หญ่"
-
-#: src/usr/bin/diffuse.py.in:7533
-msgid "Convert To _Lower Case"
-msgstr "แปลงเป็นตัวพิมพ์เล็_ก"
-
-#: src/usr/bin/diffuse.py.in:7535
-msgid "Sort Lines In _Ascending Order"
-msgstr "เรียงบรรทัดจากน้_อยไปหามาก"
-
-#: src/usr/bin/diffuse.py.in:7536
-msgid "Sort Lines In D_escending Order"
-msgstr "เรียงบรรทัดจาก_มากไปหาน้อย"
-
-#: src/usr/bin/diffuse.py.in:7538
-msgid "Remove Trailing _White Space"
-msgstr "ลบช่องว่างท้า_ยบรรทัด"
-
-#: src/usr/bin/diffuse.py.in:7539
-msgid "Convert Tabs To _Spaces"
-msgstr "แปลงแท็บเป็น_ช่องว่าง"
-
-#: src/usr/bin/diffuse.py.in:7540
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "แปลงช่องว่างที่ต้นบรรทัดเป็นแ_ท็บ"
-
-#: src/usr/bin/diffuse.py.in:7542
-msgid "_Increase Indenting"
-msgstr "เ_พิ่มการร่นย่อหน้า"
-
-#: src/usr/bin/diffuse.py.in:7543
-msgid "De_crease Indenting"
-msgstr "_ลดการร่นย่อหน้า"
-
-#: src/usr/bin/diffuse.py.in:7545
-msgid "Convert To _DOS Format"
-msgstr "แปลงเป็นรูปแบบ_ดอส"
-
-#: src/usr/bin/diffuse.py.in:7546
-msgid "Convert To _Mac Format"
-msgstr "แปลงเป็นรูปแบบแ_ม็ค"
-
-#: src/usr/bin/diffuse.py.in:7547
-msgid "Convert To Uni_x Format"
-msgstr "แปลงเป็นรูปแบบยู_นิกซ์"
-
-#: src/usr/bin/diffuse.py.in:7549
-msgid "_Merge"
-msgstr "_ผสาน"
-
-#: src/usr/bin/diffuse.py.in:7550
-msgid "Copy Selection _Right"
-msgstr "คัดลอกบรรทัดที่เลือกไปช่อง_ขวา"
-
-#: src/usr/bin/diffuse.py.in:7551
-msgid "Copy Selection _Left"
-msgstr "คัดลอกบรรทัดที่เลือกไปช่องซ้า_ย"
-
-#: src/usr/bin/diffuse.py.in:7553
-msgid "Copy Left _Into Selection"
-msgstr "คัดลอกช่องซ้าย_เข้าในบรรทัดที่เลือก"
-
-#: src/usr/bin/diffuse.py.in:7554
-msgid "Copy Right I_nto Selection"
-msgstr "คัดลอกช่องขวาเข้าใ_นบรรทัดที่เลือก"
-
-#: src/usr/bin/diffuse.py.in:7555
-msgid "_Merge From Left Then Right"
-msgstr "_ผสานจากช่องซ้ายแล้วตามด้วยขวา"
-
-#: src/usr/bin/diffuse.py.in:7556
-msgid "M_erge From Right Then Left"
-msgstr "ผ_สานจากช่องขวาแล้วตามด้วยซ้าย"
-
-#: src/usr/bin/diffuse.py.in:7558
-msgid "_Help"
-msgstr "_วิธีใช้"
-
-#: src/usr/bin/diffuse.py.in:7559
-msgid "_Help Contents..."
-msgstr "เ_นื้อหาวิธีใช้..."
-
-#: src/usr/bin/diffuse.py.in:7561
-#, python-format
-msgid "_About %s..."
-msgstr "เ_กี่ยวกับ %s..."
-
-#: src/usr/bin/diffuse.py.in:7575
-msgid "New 2-Way File Merge"
-msgstr "การผสานแฟ้ม 2 ทางชุดใหม่"
-
-#: src/usr/bin/diffuse.py.in:7576
-msgid "New 3-Way File Merge"
-msgstr "การผสานแฟ้ม 3 ทางชุดใหม่"
-
-#: src/usr/bin/diffuse.py.in:7578
-msgid "Realign All"
-msgstr "จัดเรียงใหม่ทั้งหมด"
-
-#: src/usr/bin/diffuse.py.in:7579
-msgid "First Difference"
-msgstr "ความแตกต่างแรก"
-
-#: src/usr/bin/diffuse.py.in:7580
-msgid "Previous Difference"
-msgstr "ความแตกต่างก่อนหน้า"
-
-#: src/usr/bin/diffuse.py.in:7581
-msgid "Next Difference"
-msgstr "ความแตกต่างถัดไป"
-
-#: src/usr/bin/diffuse.py.in:7582
-msgid "Last Difference"
-msgstr "ความแตกต่างสุดท้าย"
-
-#: src/usr/bin/diffuse.py.in:7584
-msgid "Copy Selection Right"
-msgstr "คัดลอกบรรทัดที่เลือกไปช่องขวา"
-
-#: src/usr/bin/diffuse.py.in:7585
-msgid "Copy Selection Left"
-msgstr "คัดลอกบรรทัดที่เลือกไปช่องซ้าย"
-
-#: src/usr/bin/diffuse.py.in:7586
-msgid "Copy Left Into Selection"
-msgstr "คัดลอกช่องซ้ายเข้าในบรรทัดที่เลือก"
-
-#: src/usr/bin/diffuse.py.in:7587
-msgid "Copy Right Into Selection"
-msgstr "คัดลอกช่องขวาเข้าในบรรทัดที่เลือก"
-
-#: src/usr/bin/diffuse.py.in:7588
-msgid "Merge From Left Then Right"
-msgstr "ผสานจากช่องซ้ายแล้วตามด้วยขวา"
-
-#: src/usr/bin/diffuse.py.in:7589
-msgid "Merge From Right Then Left"
-msgstr "ผสานจากช่องขวาแล้วตามด้วยซ้าย"
-
-#: src/usr/bin/diffuse.py.in:7591
-msgid "Undo"
-msgstr "เรียกคืน"
-
-#: src/usr/bin/diffuse.py.in:7592
-msgid "Redo"
-msgstr "ทำซ้ำ"
-
-#: src/usr/bin/diffuse.py.in:7716
-msgid "Some files have unsaved changes.  Select the files to save before closing."
-msgstr "บางแฟ้มมีการเปลี่ยนแปลงที่ไม่ได้บันทึก เลือกแฟ้มเพื่อบันทึกก่อนปิด"
-
-#: src/usr/bin/diffuse.py.in:7729
-msgid "Tab"
-msgstr "แท็บ"
-
-#: src/usr/bin/diffuse.py.in:7734
-msgid "Pane"
-msgstr "ช่อง"
-
-#: src/usr/bin/diffuse.py.in:7745
-msgid "Close _Without Saving"
-msgstr "ปิ_ดโดยไม่บันทึก"
-
-#: src/usr/bin/diffuse.py.in:7856
-#, python-format
-msgid "File Merge %d"
-msgstr "การผสานแฟ้ม %d"
-
-#: src/usr/bin/diffuse.py.in:7959
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "เกิดข้อผิดพลาดขณะดึง commit ต่างๆ สำหรับ %s"
-
-#: src/usr/bin/diffuse.py.in:7990
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "เกิดข้อผิดพลาดขณะดึงการเปลี่ยนแปลงสำหรับ %s"
-
-#: src/usr/bin/diffuse.py.in:8022
-msgid "Open File In New Tab"
-msgstr "เปิดแฟ้มในแท็บใหม่"
-
-#: src/usr/bin/diffuse.py.in:8038
-msgid "Choose Folder With Modified Files"
-msgstr "เลือกโฟลเดอร์ที่มีแฟ้มที่เปลี่ยนแปลง"
-
-#: src/usr/bin/diffuse.py.in:8051
-msgid "No modified files found."
-msgstr "ไม่พบแฟ้มที่เปลี่ยนแปลง"
-
-#: src/usr/bin/diffuse.py.in:8058
-msgid "Choose Folder With Commit"
-msgstr "เลือกโฟลเดอร์ที่มีการ commit"
-
-#: src/usr/bin/diffuse.py.in:8071
-msgid "No committed files found."
-msgstr "ไม่พบแฟ้มที่มีการ commit"
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "New N-Way File Merge..."
-msgstr "การผสานแฟ้ม N ทางชุดใหม่..."
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "Number of panes: "
-msgstr "จำนวนช่อง: "
-
-#: src/usr/bin/diffuse.py.in:8172
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "ไม่พบคำที่ค้น จะหาต่อจากท้ายแฟ้มหรือไม่?"
-
-#: src/usr/bin/diffuse.py.in:8174
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "ไม่พบคำที่ค้น จะหาต่อจากต้นแฟ้มหรือไม่?"
-
-#: src/usr/bin/diffuse.py.in:8440
+#: src/main.py:6990
 msgid "Error parsing line number."
 msgstr "เกิดข้อผิดพลาดขณะแจงหมายเลขบรรทัด"
 
-#: src/usr/bin/diffuse.py.in:8450
+#: src/main.py:7000
 #, python-format
 msgid "Skipping unknown argument \"%s\"."
 msgstr "ขอข้ามอาร์กิวเมนต์ \"%s\" ที่ไม่ทราบ"
 
-#: src/usr/bin/diffuse.py.in:8457
+#: src/main.py:7007
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "เกิดข้อผิดพลาดขณะประมวลผลอาร์กิวเมนต์ \"%s\"  ไม่คาดหมายว่าจะพบไดเรกทอรี"
 
+#: src/vcs/cvs.py:50 src/vcs/rcs.py:54 src/vcs/svn.py:89
+#, python-format
+msgid "Error parsing revision %s."
+msgstr "เกิดข้อผิดพลาดขณะแจงฉบับแก้ไข %s"
+
+#: src/vcs/vcs_registry.py:216
+#, python-format
+msgid "Error parsing %s."
+msgstr "เกิดข้อผิดพลาดขณะแจง %s"
+
 #, python-format
 #~ msgid "Column %d"
 #~ msgstr "คอลัมน์ %d"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e52ae75..d3482e1 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: 2020-12-08 13:51-0500\n"
+"POT-Creation-Date: 2021-11-18 15:21-0500\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator:  <jarryson@gmail.com>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -17,19 +17,975 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: data/diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:4
 msgid "Diffuse Merge Tool"
 msgstr "Diffuse 比较合并工具"
 
-#: data/diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:5
 msgid "Graphical tool for merging and comparing text files"
 msgstr "图形化的比较和合并文本文件的工具"
 
-#: src/usr/bin/diffuse.py.in:70
+#: data/io.github.mightycreak.Diffuse.metainfo.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."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:19
+msgid "Main window: diff between two files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:26
+msgid "Patch release to fix a bug when using the Flatpak package."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:29
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:71
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:146
+msgid "Fixed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:31
+msgid "Fixed a Flatpak bug where the app couldn't call binaries on the host, such as `git`, `svn`, etc."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:40
+msgid "With this release, the main end-user change is the new icon. The rest is mainly maintenance improvements with a much more standard folder structure and starting to modularize the code. This is an ongoing effort as there is still a lot to do, but hopefully this would motivate some to contribute ;)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:47
+msgid "An important note though: the application ID has changed and is now io.github.mightycreak.Diffuse."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:51
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:89
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:123
+msgid "Added:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:53
+msgid "New icon and in SVG now"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:54
+msgid "Started to modularize the code"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:56
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:93
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:136
+msgid "Changed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:58
+msgid "Changed AppID to io.github.mightycreak.Diffuse (as advised in the Flatpak documentation)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:62
+msgid "Renamed directory `translations/` to `po/`"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:63
+msgid "Now uses POTFILES.in to list the files to translate"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:64
+msgid "Translation strings are no longer sorted alphabetically, this will help when there will be several files in POTFILES.in"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:68
+msgid "Updated the documentation and script in the `po/` directory"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:69
+msgid "Add .desktop translations in .po files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:73
+msgid "Fixed some GTK deprecation warnings"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:79
+msgid "Mainly under the hood changes in this release, so nothing really visible to the users in this version. That said, I figured it was a long time since the last release (4 months ago) and, as promised, I want Diffuse development to be a bit more active and iterative."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:85
+msgid "Apart from the maintenance changes 🧰, I think the main improvement is that Diffuse will soon be available through Flathub!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:91
+msgid "New Flatpak package, published on Flathub: com.github.mightycreak.Diffuse"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:95
+msgid "Replace old install.py with the more standard Meson"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:96
+msgid "Remove u string prefixes since Python 3 is in UTF-8 by default"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:97
+msgid "Replaced some interpolation operators (%) for the f string prefix"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:98
+msgid "Use the window scale factor for the icons generation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:104
+msgid "Here is the v0.5.0. Unintentionally, this release happens exactly 6 years after the previous v0.4.8 release!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:108
+msgid "There is a lot to do on this application, and some features didn't make the release. The main one being the Windows installers. I think 6 years is too long to continue to wait until this bug is fixed. The Python scripts should work on Windows, but no executable is produced (yet) with the release."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:115
+msgid "Other than that, Diffuse v0.5.0 is now officially compatible with Python 3 and GTK 3! And it is synced to the latest commits from upstream (which were never released)."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:120
+msgid "The next version will not take 6 years, I promise you! 😄"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:125
+msgid "Added Pedro Albuquerque's Portuguese translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:126
+msgid "Added Åke Engelbrektson's Swedish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:127
+msgid "Added Guillaume Hoffmann's Darcs support improvements"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:128
+msgid "Added Akom Chotiphantawanon's Thai translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:129
+msgid "Added support for Git submodules"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:130
+msgid "Added a preference and command line option to specify the version control system search order"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:131
+msgid "Added .editorconfig file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:132
+msgid "Added .gitignore file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:133
+msgid "Added message when removing files during uninstallation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:134
+msgid "Added Python script to update all the translation files at once"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:138
+msgid "Convert to Python 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:139
+msgid "Convert to GTK 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:140
+msgid "Updated Python highlighting for Python 3 grammar"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:141
+msgid "Updated copyrights years and authors"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:142
+msgid "Improve Spanish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:143
+msgid "Convert translation README to MarkDown"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:144
+msgid "Updated all the translation files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:148
+msgid "Fixed wrong icons directory for gtk-update-icon-cache"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:149
+msgid "Fixed missing directories when uninstalling"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:150
+msgid "Fixed bug introduced by r420 with RCS VCS"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:151
+msgid "Fixed broken drag'n'drop since migration to Python3/GTK3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:152
+msgid "Fixed error when using '-m' in an SVN repo"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:157
+msgid "Romain Failliot"
+msgstr ""
+
+#: src/constants.py.in:23
 msgid "Copyright"
 msgstr "版权所有"
 
-#: src/usr/bin/diffuse.py.in:81
+#: src/main.py:591
+#, python-format
+msgid "Error processing line %(line)d of %(file)s."
+msgstr "处理到文件%(file)s的%(line)d行时出错。"
+
+#: src/main.py:610
+msgid "Auto Detect"
+msgstr "自动探测"
+
+#: src/main.py:706
+msgid "Display"
+msgstr "显示"
+
+#: src/main.py:708
+msgid "Font"
+msgstr "字体"
+
+#: src/main.py:709
+msgid "Tab width"
+msgstr "制表符宽度"
+
+#: src/main.py:710
+msgid "Show right margin"
+msgstr "显示右边距"
+
+#: src/main.py:711
+msgid "Right margin"
+msgstr "右边距"
+
+#: src/main.py:712
+msgid "Show line numbers"
+msgstr "显示行号"
+
+#: src/main.py:713
+msgid "Show white space characters"
+msgstr "显示空格字符"
+
+#: src/main.py:714
+msgid "Ignore case differences"
+msgstr "忽略大小写的不同"
+
+#: src/main.py:715
+msgid "Ignore white space differences"
+msgstr "忽略空格的不同"
+
+#: src/main.py:716 src/main.py:724
+msgid "Ignore changes to white space"
+msgstr "忽略对空格的改变"
+
+#: src/main.py:717
+msgid "Ignore blank line differences"
+msgstr "忽略空行的不同"
+
+#: src/main.py:718
+msgid "Ignore end of line differences"
+msgstr "忽略行尾的不同"
+
+#: src/main.py:720
+msgid "Alignment"
+msgstr "对齐"
+
+#: src/main.py:722
+msgid "Ignore case"
+msgstr "忽略大小写"
+
+#: src/main.py:723
+msgid "Ignore white space"
+msgstr "忽略空格"
+
+#: src/main.py:725
+msgid "Ignore blank lines"
+msgstr "忽略空行"
+
+#: src/main.py:726
+msgid "Ignore end of line characters"
+msgstr "忽略行尾结束符"
+
+#: src/main.py:728
+msgid "Editor"
+msgstr "编辑器"
+
+#: src/main.py:730
+msgid "Auto indent"
+msgstr "自动缩进"
+
+#: src/main.py:731
+msgid "Expand tabs to spaces"
+msgstr "展开制表符为空格"
+
+#: src/main.py:732
+msgid "Soft tab width"
+msgstr "软制表符宽度"
+
+#: src/main.py:734
+msgid "Tabs"
+msgstr "标签"
+
+#: src/main.py:736
+msgid "Default panes"
+msgstr "默认窗格"
+
+#: src/main.py:737
+msgid "Always show the tab bar"
+msgstr "总是显示标签栏"
+
+#: src/main.py:738
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "当关闭标签会退出%s的时候提醒我"
+
+#: src/main.py:740
+msgid "Regional Settings"
+msgstr "区域性设置"
+
+#: src/main.py:742
+msgid "Default codec"
+msgstr "默认编码"
+
+#: src/main.py:743
+msgid "Order of codecs used to identify encoding"
+msgstr "用来识别编码的编码顺序"
+
+#: src/main.py:763
+msgid "Cygwin"
+msgstr ""
+
+#: src/main.py:765
+msgid "Root directory"
+msgstr "根目录"
+
+#: src/main.py:766
+msgid "Cygdrive prefix"
+msgstr ""
+
+#: src/main.py:782
+msgid "Version control system search order"
+msgstr ""
+
+#: src/main.py:788
+msgid "\"co\" command"
+msgstr "\"co\"命令"
+
+#: src/main.py:789
+msgid "\"rlog\" command"
+msgstr "\"rlog\"命令"
+
+#: src/main.py:791
+msgid "Command"
+msgstr "命令"
+
+#: src/main.py:793
+msgid "Launch from a Bash login shell"
+msgstr "从命令行登录界面加载"
+
+#: src/main.py:795
+msgid "Update paths for Cygwin"
+msgstr "为Cygwin更新路径"
+
+#: src/main.py:799
+msgid "Version Control"
+msgstr "版本控制"
+
+#: src/main.py:863
+msgid "Preferences"
+msgstr "首选项"
+
+#: src/main.py:904 src/main.py:5802
+#, python-format
+msgid "Error writing %s."
+msgstr "无法写入%s"
+
+#: src/main.py:3282
+msgid "Align with Selection"
+msgstr "向选中的对齐"
+
+#: src/main.py:3283
+msgid "Isolate"
+msgstr "分离"
+
+#: src/main.py:3284
+msgid "Merge Selection"
+msgstr "合并选择之处"
+
+#: src/main.py:3286 src/main.py:6098
+msgid "Cut"
+msgstr "剪切"
+
+#: src/main.py:3287 src/main.py:6099
+msgid "Copy"
+msgstr "复制"
+
+#: src/main.py:3288 src/main.py:6100
+msgid "Paste"
+msgstr "粘贴"
+
+#: src/main.py:3290
+msgid "Select All"
+msgstr "选择所有"
+
+#: src/main.py:3291 src/main.py:6101
+msgid "Clear Edits"
+msgstr "取消编辑"
+
+#: src/main.py:3293
+msgid "Swap with Selected Pane"
+msgstr "交换选中的窗格"
+
+#: src/main.py:5124
+msgid "Find..."
+msgstr "查找..."
+
+#: src/main.py:5132
+msgid "Search For: "
+msgstr "搜索："
+
+#: src/main.py:5157
+msgid "Match Case"
+msgstr "符合大小写"
+
+#: src/main.py:5162
+msgid "Search Backwards"
+msgstr "反向搜索"
+
+#: src/main.py:5176
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "关闭此标签将会退出%s"
+
+#: src/main.py:5198
+msgid "Encoding: "
+msgstr "编码："
+
+#: src/main.py:5208
+msgid "Revision: "
+msgstr "修订："
+
+#: src/main.py:5272
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr "Diffuse是一个合并和比较文本文件的图形化程序。"
+
+#: src/main.py:5277
+msgid "translator-credits"
+msgstr "Liu Hao <jarryson@gmail.com>"
+
+#: src/main.py:5281
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+
+#: src/main.py:5322
+msgid "Close Tab"
+msgstr "关闭标签"
+
+#: src/main.py:5377
+msgid "Open File..."
+msgstr "打开文件"
+
+#: src/main.py:5378
+msgid "Reload File"
+msgstr "重新加载文件"
+
+#: src/main.py:5379
+msgid "Save File"
+msgstr "保存文件"
+
+#: src/main.py:5380
+msgid "Save File As..."
+msgstr "另存为"
+
+#: src/main.py:5525
+msgid "Save changes before loading the new file?"
+msgstr "加载新文件之前保存更改吗？"
+
+#: src/main.py:5635
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "无法读取文件%(file)s中的修订版本%(rev)s。"
+
+#: src/main.py:5637 src/main.py:6900
+#, python-format
+msgid "Error reading %s."
+msgstr "无法读取%s。"
+
+#: src/main.py:5658
+msgid "Open File"
+msgstr "打开文件"
+
+#: src/main.py:5708
+#, python-format
+msgid "The file %s changed on disk.  Do you want to reload the file?"
+msgstr "磁盘文件%s已被更改，是否重新载入？"
+
+#: src/main.py:5728
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "保存%(title)s窗格%(pane)d"
+
+#: src/main.py:5754
+#, python-format
+msgid "A file named %s already exists.  Do you want to overwrite it?"
+msgstr "已存在名为%s的文件，您希望覆盖它吗？"
+
+#: src/main.py:5759
+#, 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/main.py:5800
+#, python-format
+msgid "Error encoding to %s."
+msgstr "无法编码为%s。"
+
+#: src/main.py:5830
+msgid "Go To Line..."
+msgstr "跳到行..."
+
+#: src/main.py:5830
+msgid "Line Number: "
+msgstr "行数："
+
+#: src/main.py:5856
+msgid "Press the enter key or double click to edit.  Press the space bar or use the RMB menu to manually align."
+msgstr "按回车或者鼠标双击进行编译。空格键或者右键菜单手动对齐。"
+
+#: src/main.py:5858
+msgid "Press the escape key to finish editing."
+msgstr "按ESC键结束编辑"
+
+#: src/main.py:5860
+msgid "Select target line and press the space bar to align.  Press the escape key to cancel."
+msgstr "选择目标行然后按空格键进行对齐，按ESC取消。"
+
+#: src/main.py:5971
+msgid "_File"
+msgstr "文件(_F)"
+
+#: src/main.py:5972
+msgid "_Open File..."
+msgstr "打开文件(_O)"
+
+#: src/main.py:5973
+msgid "Open File In New _Tab..."
+msgstr "在新标签里打开文件(_T)"
+
+#: src/main.py:5974
+msgid "Open _Modified Files..."
+msgstr "打开修改过的文件(_M)"
+
+#: src/main.py:5975
+msgid "Open Commi_t..."
+msgstr "打开提交(_T)"
+
+#: src/main.py:5976
+msgid "_Reload File"
+msgstr "重新加载文件(_R)"
+
+#: src/main.py:5978
+msgid "_Save File"
+msgstr "保存(_S)"
+
+#: src/main.py:5979
+msgid "Save File _As..."
+msgstr "另存为(_A)"
+
+#: src/main.py:5980
+msgid "Save A_ll"
+msgstr "保存所有(_L)"
+
+#: src/main.py:5982
+msgid "New _2-Way File Merge"
+msgstr "新建2方文件合并(_2)"
+
+#: src/main.py:5983
+msgid "New _3-Way File Merge"
+msgstr "新建3方文件合并(_3)"
+
+#: src/main.py:5984
+msgid "New _N-Way File Merge..."
+msgstr "新建多方文件合并(_N)"
+
+#: src/main.py:5986
+msgid "_Close Tab"
+msgstr "关闭标签(_C)"
+
+#: src/main.py:5987
+msgid "_Undo Close Tab"
+msgstr "恢复关闭的标签"
+
+#: src/main.py:5988
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+#: src/main.py:5990
+msgid "_Edit"
+msgstr "编辑(_E)"
+
+#: src/main.py:5991
+msgid "_Undo"
+msgstr "恢复(_U)"
+
+#: src/main.py:5992
+msgid "_Redo"
+msgstr "重做(_R)"
+
+#: src/main.py:5994
+msgid "Cu_t"
+msgstr "剪切(_T)"
+
+#: src/main.py:5995
+msgid "_Copy"
+msgstr "复制(_C)"
+
+#: src/main.py:5996
+msgid "_Paste"
+msgstr "粘贴(_P)"
+
+#: src/main.py:5998
+msgid "Select _All"
+msgstr "选择所有(_A)"
+
+#: src/main.py:5999
+msgid "C_lear Edits"
+msgstr "取消编辑(L)"
+
+#: src/main.py:6000
+msgid "_Dismiss All Edits"
+msgstr "撤销所有更改(_D)"
+
+#: src/main.py:6002
+msgid "_Find..."
+msgstr "查找(_F)"
+
+#: src/main.py:6003
+msgid "Find _Next"
+msgstr "找下一个(_N)"
+
+#: src/main.py:6004
+msgid "Find Pre_vious"
+msgstr "找上一个(_V)"
+
+#: src/main.py:6005
+msgid "_Go To Line..."
+msgstr "跳到行(_G)"
+
+#: src/main.py:6007
+msgid "Pr_eferences..."
+msgstr "首选项(_E)"
+
+#: src/main.py:6009
+msgid "None"
+msgstr "无"
+
+#: src/main.py:6017
+msgid "_View"
+msgstr "视图(_V)"
+
+#: src/main.py:6018
+msgid "_Syntax Highlighting"
+msgstr "_Syntax高亮"
+
+#: src/main.py:6020
+msgid "Re_align All"
+msgstr "重新对齐所有(_A)"
+
+#: src/main.py:6021
+msgid "_Isolate"
+msgstr "分离(_I)"
+
+#: src/main.py:6023
+msgid "_First Difference"
+msgstr "第一个不同之处(_F)"
+
+#: src/main.py:6024
+msgid "_Previous Difference"
+msgstr "前一个不同之处(_P)"
+
+#: src/main.py:6025
+msgid "_Next Difference"
+msgstr "下一个不同之处(_N)"
+
+#: src/main.py:6026
+msgid "_Last Difference"
+msgstr "最后一个不同之处(_L)"
+
+#: src/main.py:6028
+msgid "Fir_st Tab"
+msgstr "第一个标签(_S)"
+
+#: src/main.py:6029
+msgid "Pre_vious Tab"
+msgstr "前一个标签(_V)"
+
+#: src/main.py:6030
+msgid "Next _Tab"
+msgstr "下一个标签(_T)"
+
+#: src/main.py:6031
+msgid "Las_t Tab"
+msgstr "最后一个标签(_T)"
+
+#: src/main.py:6033
+msgid "Shift Pane _Right"
+msgstr "右移窗格(_R)"
+
+#: src/main.py:6034
+msgid "Shift Pane _Left"
+msgstr "左移窗格(_L)"
+
+#: src/main.py:6036
+msgid "F_ormat"
+msgstr "格式(_O)"
+
+#: src/main.py:6037
+msgid "Convert To _Upper Case"
+msgstr "转换成大写"
+
+#: src/main.py:6038
+msgid "Convert To _Lower Case"
+msgstr "转换成小写"
+
+#: src/main.py:6040
+msgid "Sort Lines In _Ascending Order"
+msgstr "以递增的顺序排列行"
+
+#: src/main.py:6041
+msgid "Sort Lines In D_escending Order"
+msgstr "以递减的顺序排列行"
+
+#: src/main.py:6043
+msgid "Remove Trailing _White Space"
+msgstr "删除多余的空格(_W)"
+
+#: src/main.py:6044
+msgid "Convert Tabs To _Spaces"
+msgstr "转换制表符为空格(_S)"
+
+#: src/main.py:6045
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "转换开头的空格为制表符(_T)"
+
+#: src/main.py:6047
+msgid "_Increase Indenting"
+msgstr "减少缩进(_I)"
+
+#: src/main.py:6048
+msgid "De_crease Indenting"
+msgstr "减少缩进"
+
+#: src/main.py:6050
+msgid "Convert To _DOS Format"
+msgstr "转换为DOS格式(_D)"
+
+#: src/main.py:6051
+msgid "Convert To _Mac Format"
+msgstr "转换为Mac格式(_M)"
+
+#: src/main.py:6052
+msgid "Convert To Uni_x Format"
+msgstr "转换为Unix格式(_X)"
+
+#: src/main.py:6054
+msgid "_Merge"
+msgstr "合并(_M)"
+
+#: src/main.py:6055
+msgid "Copy Selection _Right"
+msgstr "复制选择之处到右边(_R)"
+
+#: src/main.py:6056
+msgid "Copy Selection _Left"
+msgstr "复制选择之处到左边(_L)"
+
+#: src/main.py:6058
+msgid "Copy Left _Into Selection"
+msgstr "复制左边内容到选择之处(_L)"
+
+#: src/main.py:6059
+msgid "Copy Right I_nto Selection"
+msgstr "复制右边内容到选择之处(_L)"
+
+#: src/main.py:6060
+msgid "_Merge From Left Then Right"
+msgstr "先左再右合并(_M)"
+
+#: src/main.py:6061
+msgid "M_erge From Right Then Left"
+msgstr "先右后左合并(_E)"
+
+#: src/main.py:6063
+msgid "_Help"
+msgstr "帮助(_H)"
+
+#: src/main.py:6064
+msgid "_Help Contents..."
+msgstr "帮助内容(_H)"
+
+#: src/main.py:6066
+#, python-format
+msgid "_About %s..."
+msgstr "关于%s(_A)"
+
+#: src/main.py:6080
+msgid "New 2-Way File Merge"
+msgstr "新建2方文件合并"
+
+#: src/main.py:6081
+msgid "New 3-Way File Merge"
+msgstr "新建3方文件合并"
+
+#: src/main.py:6083
+msgid "Realign All"
+msgstr "重新对齐所有"
+
+#: src/main.py:6084
+msgid "First Difference"
+msgstr "第一个不同之处"
+
+#: src/main.py:6085
+msgid "Previous Difference"
+msgstr "前一个不同之处"
+
+#: src/main.py:6086
+msgid "Next Difference"
+msgstr "下一个不同之处"
+
+#: src/main.py:6087
+msgid "Last Difference"
+msgstr "最后一个不同之处"
+
+#: src/main.py:6089
+msgid "Copy Selection Right"
+msgstr "复制选择之处到右边"
+
+#: src/main.py:6090
+msgid "Copy Selection Left"
+msgstr "复制选择之处到左边"
+
+#: src/main.py:6091
+msgid "Copy Left Into Selection"
+msgstr "复制左边内容到选择之处"
+
+#: src/main.py:6092
+msgid "Copy Right Into Selection"
+msgstr "复制右边内容到选择之处"
+
+#: src/main.py:6093
+msgid "Merge From Left Then Right"
+msgstr "先左后右合并"
+
+#: src/main.py:6094
+msgid "Merge From Right Then Left"
+msgstr "先右后左合并(_T)"
+
+#: src/main.py:6096
+msgid "Undo"
+msgstr "恢复"
+
+#: src/main.py:6097
+msgid "Redo"
+msgstr "重做"
+
+#: src/main.py:6221
+msgid "Some files have unsaved changes.  Select the files to save before closing."
+msgstr "一些文件包含未保存的更改。请在关闭前保存这些文件。"
+
+#: src/main.py:6234
+msgid "Tab"
+msgstr "标签"
+
+#: src/main.py:6239
+msgid "Pane"
+msgstr "窗格"
+
+#: src/main.py:6250
+msgid "Close _Without Saving"
+msgstr "不保存而关闭"
+
+#: src/main.py:6361
+#, python-format
+msgid "File Merge %d"
+msgstr "文件合并%d"
+
+#: src/main.py:6464
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "錯誤修改提交%s。"
+
+#: src/main.py:6493
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "无法恢复对%s的修改。"
+
+#: src/main.py:6523
+msgid "Open File In New Tab"
+msgstr "在新标签里打开文件"
+
+#: src/main.py:6539
+msgid "Choose Folder With Modified Files"
+msgstr "选择更改过的文件夹"
+
+#: src/main.py:6552
+msgid "No modified files found."
+msgstr "没有找到修改过的文件。"
+
+#: src/main.py:6557
+msgid "Choose Folder With Commit"
+msgstr "选择提交的文件夹"
+
+#: src/main.py:6570
+msgid "No committed files found."
+msgstr "没有找到提交的文件。"
+
+#: src/main.py:6604
+msgid "New N-Way File Merge..."
+msgstr "新建多方文件合并"
+
+#: src/main.py:6604
+msgid "Number of panes: "
+msgstr "窗格数: "
+
+#: src/main.py:6669
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "短语未找到，从文件结尾继续吗？"
+
+#: src/main.py:6671
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "短语未找到，从文件开头继续吗？"
+
+#: src/main.py:6819
 msgid ""
 "Usage:\n"
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
@@ -107,763 +1063,30 @@ msgstr ""
 "  ( -i | --ignore-case )           忽略小结的不同\n"
 "  ( -w | --ignore-all-space )      忽略所有空白的不同"
 
-#: src/usr/bin/diffuse.py.in:716
-#, python-format
-msgid "Error processing line %(line)d of %(file)s."
-msgstr "处理到文件%(file)s的%(line)d行时出错。"
-
-#: src/usr/bin/diffuse.py.in:735
-msgid "Auto Detect"
-msgstr "自动探测"
-
-#: src/usr/bin/diffuse.py.in:831
-msgid "Display"
-msgstr "显示"
-
-#: src/usr/bin/diffuse.py.in:833
-msgid "Font"
-msgstr "字体"
-
-#: src/usr/bin/diffuse.py.in:834
-msgid "Tab width"
-msgstr "制表符宽度"
-
-#: src/usr/bin/diffuse.py.in:835
-msgid "Show right margin"
-msgstr "显示右边距"
-
-#: src/usr/bin/diffuse.py.in:836
-msgid "Right margin"
-msgstr "右边距"
-
-#: src/usr/bin/diffuse.py.in:837
-msgid "Show line numbers"
-msgstr "显示行号"
-
-#: src/usr/bin/diffuse.py.in:838
-msgid "Show white space characters"
-msgstr "显示空格字符"
-
-#: src/usr/bin/diffuse.py.in:839
-msgid "Ignore case differences"
-msgstr "忽略大小写的不同"
-
-#: src/usr/bin/diffuse.py.in:840
-msgid "Ignore white space differences"
-msgstr "忽略空格的不同"
-
-#: src/usr/bin/diffuse.py.in:841 src/usr/bin/diffuse.py.in:849
-msgid "Ignore changes to white space"
-msgstr "忽略对空格的改变"
-
-#: src/usr/bin/diffuse.py.in:842
-msgid "Ignore blank line differences"
-msgstr "忽略空行的不同"
-
-#: src/usr/bin/diffuse.py.in:843
-msgid "Ignore end of line differences"
-msgstr "忽略行尾的不同"
-
-#: src/usr/bin/diffuse.py.in:845
-msgid "Alignment"
-msgstr "对齐"
-
-#: src/usr/bin/diffuse.py.in:847
-msgid "Ignore case"
-msgstr "忽略大小写"
-
-#: src/usr/bin/diffuse.py.in:848
-msgid "Ignore white space"
-msgstr "忽略空格"
-
-#: src/usr/bin/diffuse.py.in:850
-msgid "Ignore blank lines"
-msgstr "忽略空行"
-
-#: src/usr/bin/diffuse.py.in:851
-msgid "Ignore end of line characters"
-msgstr "忽略行尾结束符"
-
-#: src/usr/bin/diffuse.py.in:853
-msgid "Editor"
-msgstr "编辑器"
-
-#: src/usr/bin/diffuse.py.in:855
-msgid "Auto indent"
-msgstr "自动缩进"
-
-#: src/usr/bin/diffuse.py.in:856
-msgid "Expand tabs to spaces"
-msgstr "展开制表符为空格"
-
-#: src/usr/bin/diffuse.py.in:857
-msgid "Soft tab width"
-msgstr "软制表符宽度"
-
-#: src/usr/bin/diffuse.py.in:859
-msgid "Tabs"
-msgstr "标签"
-
-#: src/usr/bin/diffuse.py.in:861
-msgid "Default panes"
-msgstr "默认窗格"
-
-#: src/usr/bin/diffuse.py.in:862
-msgid "Always show the tab bar"
-msgstr "总是显示标签栏"
-
-#: src/usr/bin/diffuse.py.in:863
-#, python-format
-msgid "Warn me when closing a tab will quit %s"
-msgstr "当关闭标签会退出%s的时候提醒我"
-
-#: src/usr/bin/diffuse.py.in:865
-msgid "Regional Settings"
-msgstr "区域性设置"
-
-#: src/usr/bin/diffuse.py.in:867
-msgid "Default codec"
-msgstr "默认编码"
-
-#: src/usr/bin/diffuse.py.in:868
-msgid "Order of codecs used to identify encoding"
-msgstr "用来识别编码的编码顺序"
-
-#: src/usr/bin/diffuse.py.in:888
-msgid "Cygwin"
-msgstr ""
-
-#: src/usr/bin/diffuse.py.in:890
-msgid "Root directory"
-msgstr "根目录"
-
-#: src/usr/bin/diffuse.py.in:891
-msgid "Cygdrive prefix"
-msgstr ""
-
-#: src/usr/bin/diffuse.py.in:907
-msgid "Version control system search order"
-msgstr ""
-
-#: src/usr/bin/diffuse.py.in:913
-msgid "\"co\" command"
-msgstr "\"co\"命令"
-
-#: src/usr/bin/diffuse.py.in:914
-msgid "\"rlog\" command"
-msgstr "\"rlog\"命令"
-
-#: src/usr/bin/diffuse.py.in:916
-msgid "Command"
-msgstr "命令"
-
-#: src/usr/bin/diffuse.py.in:918
-msgid "Launch from a Bash login shell"
-msgstr "从命令行登录界面加载"
-
-#: src/usr/bin/diffuse.py.in:920
-msgid "Update paths for Cygwin"
-msgstr "为Cygwin更新路径"
-
-#: src/usr/bin/diffuse.py.in:924
-msgid "Version Control"
-msgstr "版本控制"
-
-#: src/usr/bin/diffuse.py.in:988
-msgid "Preferences"
-msgstr "首选项"
-
-#: src/usr/bin/diffuse.py.in:1029 src/usr/bin/diffuse.py.in:7295
-#, python-format
-msgid "Error writing %s."
-msgstr "无法写入%s"
-
-#: src/usr/bin/diffuse.py.in:1656 src/usr/bin/diffuse.py.in:2273
-#: src/usr/bin/diffuse.py.in:2417
-#, python-format
-msgid "Error parsing revision %s."
-msgstr "无法解析修订版本%s。"
-
-#: src/usr/bin/diffuse.py.in:2658
-#, python-format
-msgid "Error parsing %s."
-msgstr "无法解析%s。"
-
-#: src/usr/bin/diffuse.py.in:4778
-msgid "Align with Selection"
-msgstr "向选中的对齐"
-
-#: src/usr/bin/diffuse.py.in:4779
-msgid "Isolate"
-msgstr "分离"
-
-#: src/usr/bin/diffuse.py.in:4780
-msgid "Merge Selection"
-msgstr "合并选择之处"
-
-#: src/usr/bin/diffuse.py.in:4782 src/usr/bin/diffuse.py.in:7593
-msgid "Cut"
-msgstr "剪切"
-
-#: src/usr/bin/diffuse.py.in:4783 src/usr/bin/diffuse.py.in:7594
-msgid "Copy"
-msgstr "复制"
-
-#: src/usr/bin/diffuse.py.in:4784 src/usr/bin/diffuse.py.in:7595
-msgid "Paste"
-msgstr "粘贴"
-
-#: src/usr/bin/diffuse.py.in:4786
-msgid "Select All"
-msgstr "选择所有"
-
-#: src/usr/bin/diffuse.py.in:4787 src/usr/bin/diffuse.py.in:7596
-msgid "Clear Edits"
-msgstr "取消编辑"
-
-#: src/usr/bin/diffuse.py.in:4789
-msgid "Swap with Selected Pane"
-msgstr "交换选中的窗格"
-
-#: src/usr/bin/diffuse.py.in:6620
-msgid "Find..."
-msgstr "查找..."
-
-#: src/usr/bin/diffuse.py.in:6628
-msgid "Search For: "
-msgstr "搜索："
-
-#: src/usr/bin/diffuse.py.in:6653
-msgid "Match Case"
-msgstr "符合大小写"
-
-#: src/usr/bin/diffuse.py.in:6658
-msgid "Search Backwards"
-msgstr "反向搜索"
-
-#: src/usr/bin/diffuse.py.in:6672
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "关闭此标签将会退出%s"
-
-#: src/usr/bin/diffuse.py.in:6694
-msgid "Encoding: "
-msgstr "编码："
-
-#: src/usr/bin/diffuse.py.in:6704
-msgid "Revision: "
-msgstr "修订："
-
-#: src/usr/bin/diffuse.py.in:6768
-msgid "Diffuse is a graphical tool for merging and comparing text files."
-msgstr "Diffuse是一个合并和比较文本文件的图形化程序。"
-
-#: src/usr/bin/diffuse.py.in:6773
-msgid "translator-credits"
-msgstr "Liu Hao <jarryson@gmail.com>"
-
-#: src/usr/bin/diffuse.py.in:6776
-msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program.  You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
-
-#: src/usr/bin/diffuse.py.in:6811
-msgid "Close Tab"
-msgstr "关闭标签"
-
-#: src/usr/bin/diffuse.py.in:6866
-msgid "Open File..."
-msgstr "打开文件"
-
-#: src/usr/bin/diffuse.py.in:6867
-msgid "Reload File"
-msgstr "重新加载文件"
-
-#: src/usr/bin/diffuse.py.in:6868
-msgid "Save File"
-msgstr "保存文件"
-
-#: src/usr/bin/diffuse.py.in:6869
-msgid "Save File As..."
-msgstr "另存为"
-
-#: src/usr/bin/diffuse.py.in:7014
-msgid "Save changes before loading the new file?"
-msgstr "加载新文件之前保存更改吗？"
-
-#: src/usr/bin/diffuse.py.in:7124
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "无法读取文件%(file)s中的修订版本%(rev)s。"
-
-#: src/usr/bin/diffuse.py.in:7126 src/usr/bin/diffuse.py.in:8359
-#, python-format
-msgid "Error reading %s."
-msgstr "无法读取%s。"
-
-#: src/usr/bin/diffuse.py.in:7149
-msgid "Open File"
-msgstr "打开文件"
-
-#: src/usr/bin/diffuse.py.in:7199
-#, python-format
-msgid "The file %s changed on disk.  Do you want to reload the file?"
-msgstr "磁盘文件%s已被更改，是否重新载入？"
-
-#: src/usr/bin/diffuse.py.in:7219
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "保存%(title)s窗格%(pane)d"
-
-#: src/usr/bin/diffuse.py.in:7245
-#, python-format
-msgid "A file named %s already exists.  Do you want to overwrite it?"
-msgstr "已存在名为%s的文件，您希望覆盖它吗？"
-
-#: src/usr/bin/diffuse.py.in:7250
-#, 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/usr/bin/diffuse.py.in:7291
-#, python-format
-msgid "Error encoding to %s."
-msgstr "无法编码为%s。"
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Go To Line..."
-msgstr "跳到行..."
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Line Number: "
-msgstr "行数："
-
-#: src/usr/bin/diffuse.py.in:7351
-msgid "Press the enter key or double click to edit.  Press the space bar or use the RMB menu to manually align."
-msgstr "按回车或者鼠标双击进行编译。空格键或者右键菜单手动对齐。"
-
-#: src/usr/bin/diffuse.py.in:7353
-msgid "Press the escape key to finish editing."
-msgstr "按ESC键结束编辑"
-
-#: src/usr/bin/diffuse.py.in:7355
-msgid "Select target line and press the space bar to align.  Press the escape key to cancel."
-msgstr "选择目标行然后按空格键进行对齐，按ESC取消。"
-
-#: src/usr/bin/diffuse.py.in:7466
-msgid "_File"
-msgstr "文件(_F)"
-
-#: src/usr/bin/diffuse.py.in:7467
-msgid "_Open File..."
-msgstr "打开文件(_O)"
-
-#: src/usr/bin/diffuse.py.in:7468
-msgid "Open File In New _Tab..."
-msgstr "在新标签里打开文件(_T)"
-
-#: src/usr/bin/diffuse.py.in:7469
-msgid "Open _Modified Files..."
-msgstr "打开修改过的文件(_M)"
-
-#: src/usr/bin/diffuse.py.in:7470
-msgid "Open Commi_t..."
-msgstr "打开提交(_T)"
-
-#: src/usr/bin/diffuse.py.in:7471
-msgid "_Reload File"
-msgstr "重新加载文件(_R)"
-
-#: src/usr/bin/diffuse.py.in:7473
-msgid "_Save File"
-msgstr "保存(_S)"
-
-#: src/usr/bin/diffuse.py.in:7474
-msgid "Save File _As..."
-msgstr "另存为(_A)"
-
-#: src/usr/bin/diffuse.py.in:7475
-msgid "Save A_ll"
-msgstr "保存所有(_L)"
-
-#: src/usr/bin/diffuse.py.in:7477
-msgid "New _2-Way File Merge"
-msgstr "新建2方文件合并(_2)"
-
-#: src/usr/bin/diffuse.py.in:7478
-msgid "New _3-Way File Merge"
-msgstr "新建3方文件合并(_3)"
-
-#: src/usr/bin/diffuse.py.in:7479
-msgid "New _N-Way File Merge..."
-msgstr "新建多方文件合并(_N)"
-
-#: src/usr/bin/diffuse.py.in:7481
-msgid "_Close Tab"
-msgstr "关闭标签(_C)"
-
-#: src/usr/bin/diffuse.py.in:7482
-msgid "_Undo Close Tab"
-msgstr "恢复关闭的标签"
-
-#: src/usr/bin/diffuse.py.in:7483
-msgid "_Quit"
-msgstr "退出(_Q)"
-
-#: src/usr/bin/diffuse.py.in:7485
-msgid "_Edit"
-msgstr "编辑(_E)"
-
-#: src/usr/bin/diffuse.py.in:7486
-msgid "_Undo"
-msgstr "恢复(_U)"
-
-#: src/usr/bin/diffuse.py.in:7487
-msgid "_Redo"
-msgstr "重做(_R)"
-
-#: src/usr/bin/diffuse.py.in:7489
-msgid "Cu_t"
-msgstr "剪切(_T)"
-
-#: src/usr/bin/diffuse.py.in:7490
-msgid "_Copy"
-msgstr "复制(_C)"
-
-#: src/usr/bin/diffuse.py.in:7491
-msgid "_Paste"
-msgstr "粘贴(_P)"
-
-#: src/usr/bin/diffuse.py.in:7493
-msgid "Select _All"
-msgstr "选择所有(_A)"
-
-#: src/usr/bin/diffuse.py.in:7494
-msgid "C_lear Edits"
-msgstr "取消编辑(L)"
-
-#: src/usr/bin/diffuse.py.in:7495
-msgid "_Dismiss All Edits"
-msgstr "撤销所有更改(_D)"
-
-#: src/usr/bin/diffuse.py.in:7497
-msgid "_Find..."
-msgstr "查找(_F)"
-
-#: src/usr/bin/diffuse.py.in:7498
-msgid "Find _Next"
-msgstr "找下一个(_N)"
-
-#: src/usr/bin/diffuse.py.in:7499
-msgid "Find Pre_vious"
-msgstr "找上一个(_V)"
-
-#: src/usr/bin/diffuse.py.in:7500
-msgid "_Go To Line..."
-msgstr "跳到行(_G)"
-
-#: src/usr/bin/diffuse.py.in:7502
-msgid "Pr_eferences..."
-msgstr "首选项(_E)"
-
-#: src/usr/bin/diffuse.py.in:7504
-msgid "None"
-msgstr "无"
-
-#: src/usr/bin/diffuse.py.in:7512
-msgid "_View"
-msgstr "视图(_V)"
-
-#: src/usr/bin/diffuse.py.in:7513
-msgid "_Syntax Highlighting"
-msgstr "_Syntax高亮"
-
-#: src/usr/bin/diffuse.py.in:7515
-msgid "Re_align All"
-msgstr "重新对齐所有(_A)"
-
-#: src/usr/bin/diffuse.py.in:7516
-msgid "_Isolate"
-msgstr "分离(_I)"
-
-#: src/usr/bin/diffuse.py.in:7518
-msgid "_First Difference"
-msgstr "第一个不同之处(_F)"
-
-#: src/usr/bin/diffuse.py.in:7519
-msgid "_Previous Difference"
-msgstr "前一个不同之处(_P)"
-
-#: src/usr/bin/diffuse.py.in:7520
-msgid "_Next Difference"
-msgstr "下一个不同之处(_N)"
-
-#: src/usr/bin/diffuse.py.in:7521
-msgid "_Last Difference"
-msgstr "最后一个不同之处(_L)"
-
-#: src/usr/bin/diffuse.py.in:7523
-msgid "Fir_st Tab"
-msgstr "第一个标签(_S)"
-
-#: src/usr/bin/diffuse.py.in:7524
-msgid "Pre_vious Tab"
-msgstr "前一个标签(_V)"
-
-#: src/usr/bin/diffuse.py.in:7525
-msgid "Next _Tab"
-msgstr "下一个标签(_T)"
-
-#: src/usr/bin/diffuse.py.in:7526
-msgid "Las_t Tab"
-msgstr "最后一个标签(_T)"
-
-#: src/usr/bin/diffuse.py.in:7528
-msgid "Shift Pane _Right"
-msgstr "右移窗格(_R)"
-
-#: src/usr/bin/diffuse.py.in:7529
-msgid "Shift Pane _Left"
-msgstr "左移窗格(_L)"
-
-#: src/usr/bin/diffuse.py.in:7531
-msgid "F_ormat"
-msgstr "格式(_O)"
-
-#: src/usr/bin/diffuse.py.in:7532
-msgid "Convert To _Upper Case"
-msgstr "转换成大写"
-
-#: src/usr/bin/diffuse.py.in:7533
-msgid "Convert To _Lower Case"
-msgstr "转换成小写"
-
-#: src/usr/bin/diffuse.py.in:7535
-msgid "Sort Lines In _Ascending Order"
-msgstr "以递增的顺序排列行"
-
-#: src/usr/bin/diffuse.py.in:7536
-msgid "Sort Lines In D_escending Order"
-msgstr "以递减的顺序排列行"
-
-#: src/usr/bin/diffuse.py.in:7538
-msgid "Remove Trailing _White Space"
-msgstr "删除多余的空格(_W)"
-
-#: src/usr/bin/diffuse.py.in:7539
-msgid "Convert Tabs To _Spaces"
-msgstr "转换制表符为空格(_S)"
-
-#: src/usr/bin/diffuse.py.in:7540
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "转换开头的空格为制表符(_T)"
-
-#: src/usr/bin/diffuse.py.in:7542
-msgid "_Increase Indenting"
-msgstr "减少缩进(_I)"
-
-#: src/usr/bin/diffuse.py.in:7543
-msgid "De_crease Indenting"
-msgstr "减少缩进"
-
-#: src/usr/bin/diffuse.py.in:7545
-msgid "Convert To _DOS Format"
-msgstr "转换为DOS格式(_D)"
-
-#: src/usr/bin/diffuse.py.in:7546
-msgid "Convert To _Mac Format"
-msgstr "转换为Mac格式(_M)"
-
-#: src/usr/bin/diffuse.py.in:7547
-msgid "Convert To Uni_x Format"
-msgstr "转换为Unix格式(_X)"
-
-#: src/usr/bin/diffuse.py.in:7549
-msgid "_Merge"
-msgstr "合并(_M)"
-
-#: src/usr/bin/diffuse.py.in:7550
-msgid "Copy Selection _Right"
-msgstr "复制选择之处到右边(_R)"
-
-#: src/usr/bin/diffuse.py.in:7551
-msgid "Copy Selection _Left"
-msgstr "复制选择之处到左边(_L)"
-
-#: src/usr/bin/diffuse.py.in:7553
-msgid "Copy Left _Into Selection"
-msgstr "复制左边内容到选择之处(_L)"
-
-#: src/usr/bin/diffuse.py.in:7554
-msgid "Copy Right I_nto Selection"
-msgstr "复制右边内容到选择之处(_L)"
-
-#: src/usr/bin/diffuse.py.in:7555
-msgid "_Merge From Left Then Right"
-msgstr "先左再右合并(_M)"
-
-#: src/usr/bin/diffuse.py.in:7556
-msgid "M_erge From Right Then Left"
-msgstr "先右后左合并(_E)"
-
-#: src/usr/bin/diffuse.py.in:7558
-msgid "_Help"
-msgstr "帮助(_H)"
-
-#: src/usr/bin/diffuse.py.in:7559
-msgid "_Help Contents..."
-msgstr "帮助内容(_H)"
-
-#: src/usr/bin/diffuse.py.in:7561
-#, python-format
-msgid "_About %s..."
-msgstr "关于%s(_A)"
-
-#: src/usr/bin/diffuse.py.in:7575
-msgid "New 2-Way File Merge"
-msgstr "新建2方文件合并"
-
-#: src/usr/bin/diffuse.py.in:7576
-msgid "New 3-Way File Merge"
-msgstr "新建3方文件合并"
-
-#: src/usr/bin/diffuse.py.in:7578
-msgid "Realign All"
-msgstr "重新对齐所有"
-
-#: src/usr/bin/diffuse.py.in:7579
-msgid "First Difference"
-msgstr "第一个不同之处"
-
-#: src/usr/bin/diffuse.py.in:7580
-msgid "Previous Difference"
-msgstr "前一个不同之处"
-
-#: src/usr/bin/diffuse.py.in:7581
-msgid "Next Difference"
-msgstr "下一个不同之处"
-
-#: src/usr/bin/diffuse.py.in:7582
-msgid "Last Difference"
-msgstr "最后一个不同之处"
-
-#: src/usr/bin/diffuse.py.in:7584
-msgid "Copy Selection Right"
-msgstr "复制选择之处到右边"
-
-#: src/usr/bin/diffuse.py.in:7585
-msgid "Copy Selection Left"
-msgstr "复制选择之处到左边"
-
-#: src/usr/bin/diffuse.py.in:7586
-msgid "Copy Left Into Selection"
-msgstr "复制左边内容到选择之处"
-
-#: src/usr/bin/diffuse.py.in:7587
-msgid "Copy Right Into Selection"
-msgstr "复制右边内容到选择之处"
-
-#: src/usr/bin/diffuse.py.in:7588
-msgid "Merge From Left Then Right"
-msgstr "先左后右合并"
-
-#: src/usr/bin/diffuse.py.in:7589
-msgid "Merge From Right Then Left"
-msgstr "先右后左合并(_T)"
-
-#: src/usr/bin/diffuse.py.in:7591
-msgid "Undo"
-msgstr "恢复"
-
-#: src/usr/bin/diffuse.py.in:7592
-msgid "Redo"
-msgstr "重做"
-
-#: src/usr/bin/diffuse.py.in:7716
-msgid "Some files have unsaved changes.  Select the files to save before closing."
-msgstr "一些文件包含未保存的更改。请在关闭前保存这些文件。"
-
-#: src/usr/bin/diffuse.py.in:7729
-msgid "Tab"
-msgstr "标签"
-
-#: src/usr/bin/diffuse.py.in:7734
-msgid "Pane"
-msgstr "窗格"
-
-#: src/usr/bin/diffuse.py.in:7745
-msgid "Close _Without Saving"
-msgstr "不保存而关闭"
-
-#: src/usr/bin/diffuse.py.in:7856
-#, python-format
-msgid "File Merge %d"
-msgstr "文件合并%d"
-
-#: src/usr/bin/diffuse.py.in:7959
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "錯誤修改提交%s。"
-
-#: src/usr/bin/diffuse.py.in:7990
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "无法恢复对%s的修改。"
-
-#: src/usr/bin/diffuse.py.in:8022
-msgid "Open File In New Tab"
-msgstr "在新标签里打开文件"
-
-#: src/usr/bin/diffuse.py.in:8038
-msgid "Choose Folder With Modified Files"
-msgstr "选择更改过的文件夹"
-
-#: src/usr/bin/diffuse.py.in:8051
-msgid "No modified files found."
-msgstr "没有找到修改过的文件。"
-
-#: src/usr/bin/diffuse.py.in:8058
-msgid "Choose Folder With Commit"
-msgstr "选择提交的文件夹"
-
-#: src/usr/bin/diffuse.py.in:8071
-msgid "No committed files found."
-msgstr "没有找到提交的文件。"
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "New N-Way File Merge..."
-msgstr "新建多方文件合并"
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "Number of panes: "
-msgstr "窗格数: "
-
-#: src/usr/bin/diffuse.py.in:8172
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "短语未找到，从文件结尾继续吗？"
-
-#: src/usr/bin/diffuse.py.in:8174
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "短语未找到，从文件开头继续吗？"
-
-#: src/usr/bin/diffuse.py.in:8440
+#: src/main.py:6990
 msgid "Error parsing line number."
 msgstr "解析行数时错误。"
 
-#: src/usr/bin/diffuse.py.in:8450
+#: src/main.py:7000
 #, python-format
 msgid "Skipping unknown argument \"%s\"."
 msgstr "跳过未知参数\"%s\"。"
 
-#: src/usr/bin/diffuse.py.in:8457
+#: src/main.py:7007
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "无法处理\"%s\"。目录不存在。"
 
+#: src/vcs/cvs.py:50 src/vcs/rcs.py:54 src/vcs/svn.py:89
+#, python-format
+msgid "Error parsing revision %s."
+msgstr "无法解析修订版本%s。"
+
+#: src/vcs/vcs_registry.py:216
+#, python-format
+msgid "Error parsing %s."
+msgstr "无法解析%s。"
+
 #, python-format
 #~ msgid "Column %d"
 #~ msgstr "%d列"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c389c4a..49534e2 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: 2020-12-08 13:51-0500\n"
+"POT-Creation-Date: 2021-11-18 15:21-0500\n"
 "PO-Revision-Date: 2020-06-29 14:49-0400\n"
 "Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -19,19 +19,983 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: data/diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.desktop.in:3
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:4
 msgid "Diffuse Merge Tool"
 msgstr "Diffuse 比較合併工具"
 
-#: data/diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.desktop.in:4
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:5
 msgid "Graphical tool for merging and comparing text files"
 msgstr "比較與合併文字檔案的圖形化工具"
 
-#: src/usr/bin/diffuse.py.in:70
+#: data/io.github.mightycreak.Diffuse.metainfo.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."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:19
+msgid "Main window: diff between two files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:26
+msgid "Patch release to fix a bug when using the Flatpak package."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:29
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:71
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:146
+msgid "Fixed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:31
+msgid "Fixed a Flatpak bug where the app couldn't call binaries on the host, such as `git`, `svn`, etc."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:40
+msgid "With this release, the main end-user change is the new icon. The rest is mainly maintenance improvements with a much more standard folder structure and starting to modularize the code. This is an ongoing effort as there is still a lot to do, but hopefully this would motivate some to contribute ;)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:47
+msgid "An important note though: the application ID has changed and is now io.github.mightycreak.Diffuse."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:51
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:89
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:123
+msgid "Added:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:53
+msgid "New icon and in SVG now"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:54
+msgid "Started to modularize the code"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:56
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:93
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:136
+msgid "Changed:"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:58
+msgid "Changed AppID to io.github.mightycreak.Diffuse (as advised in the Flatpak documentation)"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:62
+msgid "Renamed directory `translations/` to `po/`"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:63
+msgid "Now uses POTFILES.in to list the files to translate"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:64
+msgid "Translation strings are no longer sorted alphabetically, this will help when there will be several files in POTFILES.in"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:68
+msgid "Updated the documentation and script in the `po/` directory"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:69
+msgid "Add .desktop translations in .po files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:73
+msgid "Fixed some GTK deprecation warnings"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:79
+msgid "Mainly under the hood changes in this release, so nothing really visible to the users in this version. That said, I figured it was a long time since the last release (4 months ago) and, as promised, I want Diffuse development to be a bit more active and iterative."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:85
+msgid "Apart from the maintenance changes 🧰, I think the main improvement is that Diffuse will soon be available through Flathub!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:91
+msgid "New Flatpak package, published on Flathub: com.github.mightycreak.Diffuse"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:95
+msgid "Replace old install.py with the more standard Meson"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:96
+msgid "Remove u string prefixes since Python 3 is in UTF-8 by default"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:97
+msgid "Replaced some interpolation operators (%) for the f string prefix"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:98
+msgid "Use the window scale factor for the icons generation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:104
+msgid "Here is the v0.5.0. Unintentionally, this release happens exactly 6 years after the previous v0.4.8 release!"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:108
+msgid "There is a lot to do on this application, and some features didn't make the release. The main one being the Windows installers. I think 6 years is too long to continue to wait until this bug is fixed. The Python scripts should work on Windows, but no executable is produced (yet) with the release."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:115
+msgid "Other than that, Diffuse v0.5.0 is now officially compatible with Python 3 and GTK 3! And it is synced to the latest commits from upstream (which were never released)."
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:120
+msgid "The next version will not take 6 years, I promise you! 😄"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:125
+msgid "Added Pedro Albuquerque's Portuguese translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:126
+msgid "Added Åke Engelbrektson's Swedish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:127
+msgid "Added Guillaume Hoffmann's Darcs support improvements"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:128
+msgid "Added Akom Chotiphantawanon's Thai translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:129
+msgid "Added support for Git submodules"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:130
+msgid "Added a preference and command line option to specify the version control system search order"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:131
+msgid "Added .editorconfig file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:132
+msgid "Added .gitignore file"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:133
+msgid "Added message when removing files during uninstallation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:134
+msgid "Added Python script to update all the translation files at once"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:138
+msgid "Convert to Python 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:139
+msgid "Convert to GTK 3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:140
+msgid "Updated Python highlighting for Python 3 grammar"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:141
+msgid "Updated copyrights years and authors"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:142
+msgid "Improve Spanish translation"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:143
+msgid "Convert translation README to MarkDown"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:144
+msgid "Updated all the translation files"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:148
+msgid "Fixed wrong icons directory for gtk-update-icon-cache"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:149
+msgid "Fixed missing directories when uninstalling"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:150
+msgid "Fixed bug introduced by r420 with RCS VCS"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:151
+msgid "Fixed broken drag'n'drop since migration to Python3/GTK3"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:152
+msgid "Fixed error when using '-m' in an SVN repo"
+msgstr ""
+
+#: data/io.github.mightycreak.Diffuse.metainfo.xml.in:157
+msgid "Romain Failliot"
+msgstr ""
+
+#: src/constants.py.in:23
 msgid "Copyright"
 msgstr "著作權"
 
-#: src/usr/bin/diffuse.py.in:81
+#: src/main.py:591
+#, python-format
+msgid "Error processing line %(line)d of %(file)s."
+msgstr "處理到檔案 %(file)s 的第 %(line)d 列時出錯。"
+
+#: src/main.py:610
+msgid "Auto Detect"
+msgstr "自動偵測"
+
+#: src/main.py:706
+msgid "Display"
+msgstr "顯示"
+
+#: src/main.py:708
+msgid "Font"
+msgstr "字型"
+
+#: src/main.py:709
+msgid "Tab width"
+msgstr "跳格寬度"
+
+#: src/main.py:710
+msgid "Show right margin"
+msgstr "顯示右邊距"
+
+#: src/main.py:711
+msgid "Right margin"
+msgstr "右邊距"
+
+#: src/main.py:712
+msgid "Show line numbers"
+msgstr "顯示列號"
+
+#: src/main.py:713
+msgid "Show white space characters"
+msgstr "顯示空格"
+
+#: src/main.py:714
+msgid "Ignore case differences"
+msgstr "忽略大小寫的差異"
+
+#: src/main.py:715
+msgid "Ignore white space differences"
+msgstr "忽略空格的差異"
+
+#: src/main.py:716 src/main.py:724
+msgid "Ignore changes to white space"
+msgstr "忽略對空格的改變"
+
+#: src/main.py:717
+msgid "Ignore blank line differences"
+msgstr "忽略空列的差異"
+
+#: src/main.py:718
+msgid "Ignore end of line differences"
+msgstr "忽略列尾的差異"
+
+#: src/main.py:720
+msgid "Alignment"
+msgstr "對齊"
+
+#: src/main.py:722
+msgid "Ignore case"
+msgstr "忽略大小寫"
+
+#: src/main.py:723
+msgid "Ignore white space"
+msgstr "忽略空格"
+
+#: src/main.py:725
+msgid "Ignore blank lines"
+msgstr "忽略空列"
+
+#: src/main.py:726
+msgid "Ignore end of line characters"
+msgstr "忽略列尾字元"
+
+#: src/main.py:728
+msgid "Editor"
+msgstr "編輯器"
+
+#: src/main.py:730
+msgid "Auto indent"
+msgstr "自動縮排"
+
+#: src/main.py:731
+msgid "Expand tabs to spaces"
+msgstr "展開跳格字元為空格"
+
+#: src/main.py:732
+msgid "Soft tab width"
+msgstr "跳格寬度"
+
+#: src/main.py:734
+msgid "Tabs"
+msgstr "分頁"
+
+#: src/main.py:736
+msgid "Default panes"
+msgstr "預設窗格"
+
+#: src/main.py:737
+msgid "Always show the tab bar"
+msgstr "總是顯示分頁欄"
+
+#: src/main.py:738
+#, python-format
+msgid "Warn me when closing a tab will quit %s"
+msgstr "當關閉分頁會退出 %s 的時候提醒我"
+
+#: src/main.py:740
+msgid "Regional Settings"
+msgstr "設定"
+
+#: src/main.py:742
+msgid "Default codec"
+msgstr "預設解碼器"
+
+#: src/main.py:743
+msgid "Order of codecs used to identify encoding"
+msgstr "用來識別編碼的解碼器順序"
+
+#: src/main.py:763
+msgid "Cygwin"
+msgstr "Cygwin"
+
+#: src/main.py:765
+msgid "Root directory"
+msgstr "根目錄"
+
+#: src/main.py:766
+msgid "Cygdrive prefix"
+msgstr "Cygdrive 前綴"
+
+#: src/main.py:782
+msgid "Version control system search order"
+msgstr ""
+
+#: src/main.py:788
+msgid "\"co\" command"
+msgstr "「co」命令"
+
+#: src/main.py:789
+msgid "\"rlog\" command"
+msgstr "「rlog」命令"
+
+#: src/main.py:791
+msgid "Command"
+msgstr "命令"
+
+#: src/main.py:793
+msgid "Launch from a Bash login shell"
+msgstr "從登入命令列介面啟動"
+
+#: src/main.py:795
+msgid "Update paths for Cygwin"
+msgstr "為 Cygwin 更新路徑"
+
+#: src/main.py:799
+msgid "Version Control"
+msgstr "版本控制"
+
+#: src/main.py:863
+msgid "Preferences"
+msgstr "選項"
+
+#: src/main.py:904 src/main.py:5802
+#, python-format
+msgid "Error writing %s."
+msgstr "無法寫入 %s"
+
+#: src/main.py:3282
+msgid "Align with Selection"
+msgstr "對齊選擇區域"
+
+#: src/main.py:3283
+msgid "Isolate"
+msgstr "分離"
+
+#: src/main.py:3284
+msgid "Merge Selection"
+msgstr "合併選擇區域"
+
+#: src/main.py:3286 src/main.py:6098
+msgid "Cut"
+msgstr "剪下"
+
+#: src/main.py:3287 src/main.py:6099
+msgid "Copy"
+msgstr "複製"
+
+#: src/main.py:3288 src/main.py:6100
+msgid "Paste"
+msgstr "貼上"
+
+#: src/main.py:3290
+msgid "Select All"
+msgstr "全選"
+
+#: src/main.py:3291 src/main.py:6101
+msgid "Clear Edits"
+msgstr "取消編輯"
+
+#: src/main.py:3293
+msgid "Swap with Selected Pane"
+msgstr "交換選中的窗格"
+
+#: src/main.py:5124
+msgid "Find..."
+msgstr "搜尋…"
+
+#: src/main.py:5132
+msgid "Search For: "
+msgstr "搜尋："
+
+#: src/main.py:5157
+msgid "Match Case"
+msgstr "符合大小寫"
+
+#: src/main.py:5162
+msgid "Search Backwards"
+msgstr "反向搜尋"
+
+#: src/main.py:5176
+#, python-format
+msgid "Closing this tab will quit %s."
+msgstr "關閉此分頁將會退出 %s"
+
+#: src/main.py:5198
+msgid "Encoding: "
+msgstr "編碼："
+
+#: src/main.py:5208
+msgid "Revision: "
+msgstr "修訂："
+
+#: src/main.py:5272
+msgid "Diffuse is a graphical tool for merging and comparing text files."
+msgstr "Diffuse 是一個合併與比較文字檔案的圖形工具。"
+
+#: src/main.py:5277
+msgid "translator-credits"
+msgstr ""
+"紀明村 <tw.chi.ming@gmail.com>\n"
+"趙惟倫 <bluebat@member.fsf.org>"
+
+#: src/main.py:5281
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along\n"
+"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"這個程式是自由軟體；您可以遵循由自由軟體基金會所發布的 GNU 通用公共授權條款來再次散布它與/或修改它；無論您依據的是本授權的第二版、或 (您自行選擇的) 任何後續版本。\n"
+"\n"
+"發行本程式是希望它能夠有用，但是沒有任何擔保；亦無對於某一特定目的之適售性與適用性的暗示性擔保。 請參看 GNU 通用公共授權以獲得更多細節。\n"
+"\n"
+"您應該已經收到隨附於這個程式的 GNU 通用公共授權複本。 您也可以藉由造訪它們的網站 (http://www.fsf.org/)，從自由軟體基金會得到 GNU 通用公共授權的複本，或是寫信給 Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+
+#: src/main.py:5322
+msgid "Close Tab"
+msgstr "關閉分頁"
+
+#: src/main.py:5377
+msgid "Open File..."
+msgstr "開啟檔案…"
+
+#: src/main.py:5378
+msgid "Reload File"
+msgstr "重新載入"
+
+#: src/main.py:5379
+msgid "Save File"
+msgstr "儲存檔案"
+
+#: src/main.py:5380
+msgid "Save File As..."
+msgstr "另存為…"
+
+#: src/main.py:5525
+msgid "Save changes before loading the new file?"
+msgstr "載入新檔前儲存更改嗎？"
+
+#: src/main.py:5635
+#, python-format
+msgid "Error reading revision %(rev)s of %(file)s."
+msgstr "無法讀取檔案 %(file)s 中的修訂版本 %(rev)s。"
+
+#: src/main.py:5637 src/main.py:6900
+#, python-format
+msgid "Error reading %s."
+msgstr "無法讀取 %s。"
+
+#: src/main.py:5658
+msgid "Open File"
+msgstr "開啟檔案"
+
+#: src/main.py:5708
+#, python-format
+msgid "The file %s changed on disk.  Do you want to reload the file?"
+msgstr "檔案 %s 已被更改，是否重新載入？"
+
+#: src/main.py:5728
+#, python-format
+msgid "Save %(title)s Pane %(pane)d"
+msgstr "儲存 %(title)s 窗格 %(pane)d"
+
+#: src/main.py:5754
+#, python-format
+msgid "A file named %s already exists.  Do you want to overwrite it?"
+msgstr "%s 的檔案已存在，您希望覆蓋它嗎？"
+
+#: src/main.py:5759
+#, 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/main.py:5800
+#, python-format
+msgid "Error encoding to %s."
+msgstr "無法編碼為 %s。"
+
+#: src/main.py:5830
+msgid "Go To Line..."
+msgstr "跳到列號…"
+
+#: src/main.py:5830
+msgid "Line Number: "
+msgstr "列數："
+
+#: src/main.py:5856
+msgid "Press the enter key or double click to edit.  Press the space bar or use the RMB menu to manually align."
+msgstr "按確定鍵或雙擊滑鼠進行編輯。空格鍵或者右鍵選單手動對齊。"
+
+#: src/main.py:5858
+msgid "Press the escape key to finish editing."
+msgstr "按 ESC 鍵結束編輯"
+
+#: src/main.py:5860
+msgid "Select target line and press the space bar to align.  Press the escape key to cancel."
+msgstr "選擇目標列然後按空格鍵進行對齊，按 ESC 取消。"
+
+#: src/main.py:5971
+msgid "_File"
+msgstr "檔案(_F)"
+
+#: src/main.py:5972
+msgid "_Open File..."
+msgstr "開啟檔案(_O)…"
+
+#: src/main.py:5973
+msgid "Open File In New _Tab..."
+msgstr "在新分頁裡開啟檔案(_T)…"
+
+#: src/main.py:5974
+msgid "Open _Modified Files..."
+msgstr "開啟修改過的檔案(_M)…"
+
+#: src/main.py:5975
+msgid "Open Commi_t..."
+msgstr "開啟認可(_T)…"
+
+#: src/main.py:5976
+msgid "_Reload File"
+msgstr "重新載入(_R)"
+
+#: src/main.py:5978
+msgid "_Save File"
+msgstr "儲存(_S)"
+
+#: src/main.py:5979
+msgid "Save File _As..."
+msgstr "另存為(_A)…"
+
+#: src/main.py:5980
+msgid "Save A_ll"
+msgstr "儲存所有(_L)"
+
+#: src/main.py:5982
+msgid "New _2-Way File Merge"
+msgstr "新的二重檔案合併(_2)"
+
+#: src/main.py:5983
+msgid "New _3-Way File Merge"
+msgstr "新的三重檔案合併(_3)"
+
+#: src/main.py:5984
+msgid "New _N-Way File Merge..."
+msgstr "新的多重檔案合併(_N)…"
+
+#: src/main.py:5986
+msgid "_Close Tab"
+msgstr "關閉分頁(_C)"
+
+#: src/main.py:5987
+msgid "_Undo Close Tab"
+msgstr "復原關閉的分頁"
+
+#: src/main.py:5988
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+#: src/main.py:5990
+msgid "_Edit"
+msgstr "編輯(_E)"
+
+#: src/main.py:5991
+msgid "_Undo"
+msgstr "復原(_U)"
+
+#: src/main.py:5992
+msgid "_Redo"
+msgstr "重做(_R)"
+
+#: src/main.py:5994
+msgid "Cu_t"
+msgstr "剪下(_T)"
+
+#: src/main.py:5995
+msgid "_Copy"
+msgstr "複製(_C)"
+
+#: src/main.py:5996
+msgid "_Paste"
+msgstr "貼上(_P)"
+
+#: src/main.py:5998
+msgid "Select _All"
+msgstr "全選(_A)"
+
+#: src/main.py:5999
+msgid "C_lear Edits"
+msgstr "取消編輯(L)"
+
+#: src/main.py:6000
+msgid "_Dismiss All Edits"
+msgstr "放棄所有的變更(_D)"
+
+#: src/main.py:6002
+msgid "_Find..."
+msgstr "搜尋(_F)…"
+
+#: src/main.py:6003
+msgid "Find _Next"
+msgstr "找下一個(_N)"
+
+#: src/main.py:6004
+msgid "Find Pre_vious"
+msgstr "找上一個(_V)"
+
+#: src/main.py:6005
+msgid "_Go To Line..."
+msgstr "跳到列號(_G)…"
+
+#: src/main.py:6007
+msgid "Pr_eferences..."
+msgstr "選項(_E)…"
+
+#: src/main.py:6009
+msgid "None"
+msgstr "無"
+
+#: src/main.py:6017
+msgid "_View"
+msgstr "檢視(_V)"
+
+#: src/main.py:6018
+msgid "_Syntax Highlighting"
+msgstr "高亮度語法(_S)"
+
+#: src/main.py:6020
+msgid "Re_align All"
+msgstr "全部重新對齊(_A)"
+
+#: src/main.py:6021
+msgid "_Isolate"
+msgstr "分離(_I)"
+
+#: src/main.py:6023
+msgid "_First Difference"
+msgstr "第一個差異(_F)"
+
+#: src/main.py:6024
+msgid "_Previous Difference"
+msgstr "上一個差異(_P)"
+
+#: src/main.py:6025
+msgid "_Next Difference"
+msgstr "下一個差異(_N)"
+
+#: src/main.py:6026
+msgid "_Last Difference"
+msgstr "最後一個差異(_L)"
+
+#: src/main.py:6028
+msgid "Fir_st Tab"
+msgstr "第一個分頁(_S)"
+
+#: src/main.py:6029
+msgid "Pre_vious Tab"
+msgstr "上一個分頁(_V)"
+
+#: src/main.py:6030
+msgid "Next _Tab"
+msgstr "下一個分頁(_T)"
+
+#: src/main.py:6031
+msgid "Las_t Tab"
+msgstr "最後一個分頁(_T)"
+
+#: src/main.py:6033
+msgid "Shift Pane _Right"
+msgstr "右移窗格(_R)"
+
+#: src/main.py:6034
+msgid "Shift Pane _Left"
+msgstr "左移窗格(_L)"
+
+#: src/main.py:6036
+msgid "F_ormat"
+msgstr "格式(_O)"
+
+#: src/main.py:6037
+msgid "Convert To _Upper Case"
+msgstr "轉換成大寫"
+
+#: src/main.py:6038
+msgid "Convert To _Lower Case"
+msgstr "轉換成小寫"
+
+#: src/main.py:6040
+msgid "Sort Lines In _Ascending Order"
+msgstr "以遞增的順序排列"
+
+#: src/main.py:6041
+msgid "Sort Lines In D_escending Order"
+msgstr "以遞減的順序排列"
+
+#: src/main.py:6043
+msgid "Remove Trailing _White Space"
+msgstr "刪除多餘的空格(_W)"
+
+#: src/main.py:6044
+msgid "Convert Tabs To _Spaces"
+msgstr "轉換跳格字元為空格(_S)"
+
+#: src/main.py:6045
+msgid "Convert Leading Spaces To _Tabs"
+msgstr "轉換開頭的空格為跳格字元(_T)"
+
+#: src/main.py:6047
+msgid "_Increase Indenting"
+msgstr "減少縮排(_I)"
+
+#: src/main.py:6048
+msgid "De_crease Indenting"
+msgstr "減少縮排"
+
+#: src/main.py:6050
+msgid "Convert To _DOS Format"
+msgstr "轉換為 DOS 格式(_D)"
+
+#: src/main.py:6051
+msgid "Convert To _Mac Format"
+msgstr "轉換為 Mac 格式(_M)"
+
+#: src/main.py:6052
+msgid "Convert To Uni_x Format"
+msgstr "轉換為 Unix 格式(_X)"
+
+#: src/main.py:6054
+msgid "_Merge"
+msgstr "合併(_M)"
+
+#: src/main.py:6055
+msgid "Copy Selection _Right"
+msgstr "複製選擇區域到右邊(_R)"
+
+#: src/main.py:6056
+msgid "Copy Selection _Left"
+msgstr "複製選擇區域到左邊(_L)"
+
+#: src/main.py:6058
+msgid "Copy Left _Into Selection"
+msgstr "複製左邊內容到選擇區域(_L)"
+
+#: src/main.py:6059
+msgid "Copy Right I_nto Selection"
+msgstr "複製右邊內容到選擇區域(_L)"
+
+#: src/main.py:6060
+msgid "_Merge From Left Then Right"
+msgstr "先左再右合併(_M)"
+
+#: src/main.py:6061
+msgid "M_erge From Right Then Left"
+msgstr "從右向左合併(_E)"
+
+#: src/main.py:6063
+msgid "_Help"
+msgstr "求助(_H)"
+
+#: src/main.py:6064
+msgid "_Help Contents..."
+msgstr "說明內容(_H)…"
+
+#: src/main.py:6066
+#, python-format
+msgid "_About %s..."
+msgstr "關於 %s(_A)…"
+
+#: src/main.py:6080
+msgid "New 2-Way File Merge"
+msgstr "新的二重檔案合併"
+
+#: src/main.py:6081
+msgid "New 3-Way File Merge"
+msgstr "新的三重檔案合併"
+
+#: src/main.py:6083
+msgid "Realign All"
+msgstr "全部重新對齊"
+
+#: src/main.py:6084
+msgid "First Difference"
+msgstr "第一個差異"
+
+#: src/main.py:6085
+msgid "Previous Difference"
+msgstr "上一個差異"
+
+#: src/main.py:6086
+msgid "Next Difference"
+msgstr "下一個差異"
+
+#: src/main.py:6087
+msgid "Last Difference"
+msgstr "最後一個差異"
+
+#: src/main.py:6089
+msgid "Copy Selection Right"
+msgstr "複製選擇區域到右邊"
+
+#: src/main.py:6090
+msgid "Copy Selection Left"
+msgstr "複製選擇區域到左邊"
+
+#: src/main.py:6091
+msgid "Copy Left Into Selection"
+msgstr "複製左邊內容到選擇區域"
+
+#: src/main.py:6092
+msgid "Copy Right Into Selection"
+msgstr "複製右邊內容到選擇區域"
+
+#: src/main.py:6093
+msgid "Merge From Left Then Right"
+msgstr "先左後右合併"
+
+#: src/main.py:6094
+msgid "Merge From Right Then Left"
+msgstr "先右後左合併(_T)"
+
+#: src/main.py:6096
+msgid "Undo"
+msgstr "復原"
+
+#: src/main.py:6097
+msgid "Redo"
+msgstr "重做"
+
+#: src/main.py:6221
+msgid "Some files have unsaved changes.  Select the files to save before closing."
+msgstr "一些檔案已變更但未儲存，請在關閉前儲存這些檔案。"
+
+#: src/main.py:6234
+msgid "Tab"
+msgstr "跳格字元"
+
+#: src/main.py:6239
+msgid "Pane"
+msgstr "窗格"
+
+#: src/main.py:6250
+msgid "Close _Without Saving"
+msgstr "不儲存而關閉"
+
+#: src/main.py:6361
+#, python-format
+msgid "File Merge %d"
+msgstr "檔案合併 %d"
+
+#: src/main.py:6464
+#, python-format
+msgid "Error retrieving commits for %s."
+msgstr "無法恢復對 %s 的認可。"
+
+#: src/main.py:6493
+#, python-format
+msgid "Error retrieving modifications for %s."
+msgstr "無法恢復對 %s 的修改。"
+
+#: src/main.py:6523
+msgid "Open File In New Tab"
+msgstr "在新分頁裡開啟檔案"
+
+#: src/main.py:6539
+msgid "Choose Folder With Modified Files"
+msgstr "選擇更改過的檔案夾"
+
+#: src/main.py:6552
+msgid "No modified files found."
+msgstr "找不到已修改的檔案。"
+
+#: src/main.py:6557
+msgid "Choose Folder With Commit"
+msgstr "選擇認可過的檔案夾"
+
+#: src/main.py:6570
+msgid "No committed files found."
+msgstr "找不到已認可的檔案。"
+
+#: src/main.py:6604
+msgid "New N-Way File Merge..."
+msgstr "新的多重檔案合併…"
+
+#: src/main.py:6604
+msgid "Number of panes: "
+msgstr "窗格數: "
+
+#: src/main.py:6669
+msgid "Phrase not found.  Continue from the end of the file?"
+msgstr "語詞未找到，從檔案結尾繼續嗎？"
+
+#: src/main.py:6671
+msgid "Phrase not found.  Continue from the start of the file?"
+msgstr "語詞未找到，從檔案開頭繼續嗎？"
+
+#: src/main.py:6819
 msgid ""
 "Usage:\n"
 "    diffuse [ [OPTION...] [FILE...] ]...\n"
@@ -109,770 +1073,30 @@ msgstr ""
 "  ( -i | --ignore-case )           忽略大小寫差異\n"
 "  ( -w | --ignore-all-space )      忽略空白差異"
 
-#: src/usr/bin/diffuse.py.in:716
-#, python-format
-msgid "Error processing line %(line)d of %(file)s."
-msgstr "處理到檔案 %(file)s 的第 %(line)d 列時出錯。"
-
-#: src/usr/bin/diffuse.py.in:735
-msgid "Auto Detect"
-msgstr "自動偵測"
-
-#: src/usr/bin/diffuse.py.in:831
-msgid "Display"
-msgstr "顯示"
-
-#: src/usr/bin/diffuse.py.in:833
-msgid "Font"
-msgstr "字型"
-
-#: src/usr/bin/diffuse.py.in:834
-msgid "Tab width"
-msgstr "跳格寬度"
-
-#: src/usr/bin/diffuse.py.in:835
-msgid "Show right margin"
-msgstr "顯示右邊距"
-
-#: src/usr/bin/diffuse.py.in:836
-msgid "Right margin"
-msgstr "右邊距"
-
-#: src/usr/bin/diffuse.py.in:837
-msgid "Show line numbers"
-msgstr "顯示列號"
-
-#: src/usr/bin/diffuse.py.in:838
-msgid "Show white space characters"
-msgstr "顯示空格"
-
-#: src/usr/bin/diffuse.py.in:839
-msgid "Ignore case differences"
-msgstr "忽略大小寫的差異"
-
-#: src/usr/bin/diffuse.py.in:840
-msgid "Ignore white space differences"
-msgstr "忽略空格的差異"
-
-#: src/usr/bin/diffuse.py.in:841 src/usr/bin/diffuse.py.in:849
-msgid "Ignore changes to white space"
-msgstr "忽略對空格的改變"
-
-#: src/usr/bin/diffuse.py.in:842
-msgid "Ignore blank line differences"
-msgstr "忽略空列的差異"
-
-#: src/usr/bin/diffuse.py.in:843
-msgid "Ignore end of line differences"
-msgstr "忽略列尾的差異"
-
-#: src/usr/bin/diffuse.py.in:845
-msgid "Alignment"
-msgstr "對齊"
-
-#: src/usr/bin/diffuse.py.in:847
-msgid "Ignore case"
-msgstr "忽略大小寫"
-
-#: src/usr/bin/diffuse.py.in:848
-msgid "Ignore white space"
-msgstr "忽略空格"
-
-#: src/usr/bin/diffuse.py.in:850
-msgid "Ignore blank lines"
-msgstr "忽略空列"
-
-#: src/usr/bin/diffuse.py.in:851
-msgid "Ignore end of line characters"
-msgstr "忽略列尾字元"
-
-#: src/usr/bin/diffuse.py.in:853
-msgid "Editor"
-msgstr "編輯器"
-
-#: src/usr/bin/diffuse.py.in:855
-msgid "Auto indent"
-msgstr "自動縮排"
-
-#: src/usr/bin/diffuse.py.in:856
-msgid "Expand tabs to spaces"
-msgstr "展開跳格字元為空格"
-
-#: src/usr/bin/diffuse.py.in:857
-msgid "Soft tab width"
-msgstr "跳格寬度"
-
-#: src/usr/bin/diffuse.py.in:859
-msgid "Tabs"
-msgstr "分頁"
-
-#: src/usr/bin/diffuse.py.in:861
-msgid "Default panes"
-msgstr "預設窗格"
-
-#: src/usr/bin/diffuse.py.in:862
-msgid "Always show the tab bar"
-msgstr "總是顯示分頁欄"
-
-#: src/usr/bin/diffuse.py.in:863
-#, python-format
-msgid "Warn me when closing a tab will quit %s"
-msgstr "當關閉分頁會退出 %s 的時候提醒我"
-
-#: src/usr/bin/diffuse.py.in:865
-msgid "Regional Settings"
-msgstr "設定"
-
-#: src/usr/bin/diffuse.py.in:867
-msgid "Default codec"
-msgstr "預設解碼器"
-
-#: src/usr/bin/diffuse.py.in:868
-msgid "Order of codecs used to identify encoding"
-msgstr "用來識別編碼的解碼器順序"
-
-#: src/usr/bin/diffuse.py.in:888
-msgid "Cygwin"
-msgstr "Cygwin"
-
-#: src/usr/bin/diffuse.py.in:890
-msgid "Root directory"
-msgstr "根目錄"
-
-#: src/usr/bin/diffuse.py.in:891
-msgid "Cygdrive prefix"
-msgstr "Cygdrive 前綴"
-
-#: src/usr/bin/diffuse.py.in:907
-msgid "Version control system search order"
-msgstr ""
-
-#: src/usr/bin/diffuse.py.in:913
-msgid "\"co\" command"
-msgstr "「co」命令"
-
-#: src/usr/bin/diffuse.py.in:914
-msgid "\"rlog\" command"
-msgstr "「rlog」命令"
-
-#: src/usr/bin/diffuse.py.in:916
-msgid "Command"
-msgstr "命令"
-
-#: src/usr/bin/diffuse.py.in:918
-msgid "Launch from a Bash login shell"
-msgstr "從登入命令列介面啟動"
-
-#: src/usr/bin/diffuse.py.in:920
-msgid "Update paths for Cygwin"
-msgstr "為 Cygwin 更新路徑"
-
-#: src/usr/bin/diffuse.py.in:924
-msgid "Version Control"
-msgstr "版本控制"
-
-#: src/usr/bin/diffuse.py.in:988
-msgid "Preferences"
-msgstr "選項"
-
-#: src/usr/bin/diffuse.py.in:1029 src/usr/bin/diffuse.py.in:7295
-#, python-format
-msgid "Error writing %s."
-msgstr "無法寫入 %s"
-
-#: src/usr/bin/diffuse.py.in:1656 src/usr/bin/diffuse.py.in:2273
-#: src/usr/bin/diffuse.py.in:2417
-#, python-format
-msgid "Error parsing revision %s."
-msgstr "無法解析修訂版本 %s。"
-
-#: src/usr/bin/diffuse.py.in:2658
-#, python-format
-msgid "Error parsing %s."
-msgstr "無法解析 %s。"
-
-#: src/usr/bin/diffuse.py.in:4778
-msgid "Align with Selection"
-msgstr "對齊選擇區域"
-
-#: src/usr/bin/diffuse.py.in:4779
-msgid "Isolate"
-msgstr "分離"
-
-#: src/usr/bin/diffuse.py.in:4780
-msgid "Merge Selection"
-msgstr "合併選擇區域"
-
-#: src/usr/bin/diffuse.py.in:4782 src/usr/bin/diffuse.py.in:7593
-msgid "Cut"
-msgstr "剪下"
-
-#: src/usr/bin/diffuse.py.in:4783 src/usr/bin/diffuse.py.in:7594
-msgid "Copy"
-msgstr "複製"
-
-#: src/usr/bin/diffuse.py.in:4784 src/usr/bin/diffuse.py.in:7595
-msgid "Paste"
-msgstr "貼上"
-
-#: src/usr/bin/diffuse.py.in:4786
-msgid "Select All"
-msgstr "全選"
-
-#: src/usr/bin/diffuse.py.in:4787 src/usr/bin/diffuse.py.in:7596
-msgid "Clear Edits"
-msgstr "取消編輯"
-
-#: src/usr/bin/diffuse.py.in:4789
-msgid "Swap with Selected Pane"
-msgstr "交換選中的窗格"
-
-#: src/usr/bin/diffuse.py.in:6620
-msgid "Find..."
-msgstr "搜尋…"
-
-#: src/usr/bin/diffuse.py.in:6628
-msgid "Search For: "
-msgstr "搜尋："
-
-#: src/usr/bin/diffuse.py.in:6653
-msgid "Match Case"
-msgstr "符合大小寫"
-
-#: src/usr/bin/diffuse.py.in:6658
-msgid "Search Backwards"
-msgstr "反向搜尋"
-
-#: src/usr/bin/diffuse.py.in:6672
-#, python-format
-msgid "Closing this tab will quit %s."
-msgstr "關閉此分頁將會退出 %s"
-
-#: src/usr/bin/diffuse.py.in:6694
-msgid "Encoding: "
-msgstr "編碼："
-
-#: src/usr/bin/diffuse.py.in:6704
-msgid "Revision: "
-msgstr "修訂："
-
-#: src/usr/bin/diffuse.py.in:6768
-msgid "Diffuse is a graphical tool for merging and comparing text files."
-msgstr "Diffuse 是一個合併與比較文字檔案的圖形工具。"
-
-#: src/usr/bin/diffuse.py.in:6773
-msgid "translator-credits"
-msgstr ""
-"紀明村 <tw.chi.ming@gmail.com>\n"
-"趙惟倫 <bluebat@member.fsf.org>"
-
-#: src/usr/bin/diffuse.py.in:6776
-msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program.  You may also obtain a copy of the GNU General Public License from the Free Software Foundation by visiting their web site (http://www.fsf.org/) or by writing to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
-"這個程式是自由軟體；您可以遵循由自由軟體基金會所發布的 GNU 通用公共授權條款來再次散布它與/或修改它；無論您依據的是本授權的第二版、或 (您自行選擇的) 任何後續版本。\n"
-"\n"
-"發行本程式是希望它能夠有用，但是沒有任何擔保；亦無對於某一特定目的之適售性與適用性的暗示性擔保。 請參看 GNU 通用公共授權以獲得更多細節。\n"
-"\n"
-"您應該已經收到隨附於這個程式的 GNU 通用公共授權複本。 您也可以藉由造訪它們的網站 (http://www.fsf.org/)，從自由軟體基金會得到 GNU 通用公共授權的複本，或是寫信給 Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-
-#: src/usr/bin/diffuse.py.in:6811
-msgid "Close Tab"
-msgstr "關閉分頁"
-
-#: src/usr/bin/diffuse.py.in:6866
-msgid "Open File..."
-msgstr "開啟檔案…"
-
-#: src/usr/bin/diffuse.py.in:6867
-msgid "Reload File"
-msgstr "重新載入"
-
-#: src/usr/bin/diffuse.py.in:6868
-msgid "Save File"
-msgstr "儲存檔案"
-
-#: src/usr/bin/diffuse.py.in:6869
-msgid "Save File As..."
-msgstr "另存為…"
-
-#: src/usr/bin/diffuse.py.in:7014
-msgid "Save changes before loading the new file?"
-msgstr "載入新檔前儲存更改嗎？"
-
-#: src/usr/bin/diffuse.py.in:7124
-#, python-format
-msgid "Error reading revision %(rev)s of %(file)s."
-msgstr "無法讀取檔案 %(file)s 中的修訂版本 %(rev)s。"
-
-#: src/usr/bin/diffuse.py.in:7126 src/usr/bin/diffuse.py.in:8359
-#, python-format
-msgid "Error reading %s."
-msgstr "無法讀取 %s。"
-
-#: src/usr/bin/diffuse.py.in:7149
-msgid "Open File"
-msgstr "開啟檔案"
-
-#: src/usr/bin/diffuse.py.in:7199
-#, python-format
-msgid "The file %s changed on disk.  Do you want to reload the file?"
-msgstr "檔案 %s 已被更改，是否重新載入？"
-
-#: src/usr/bin/diffuse.py.in:7219
-#, python-format
-msgid "Save %(title)s Pane %(pane)d"
-msgstr "儲存 %(title)s 窗格 %(pane)d"
-
-#: src/usr/bin/diffuse.py.in:7245
-#, python-format
-msgid "A file named %s already exists.  Do you want to overwrite it?"
-msgstr "%s 的檔案已存在，您希望覆蓋它嗎？"
-
-#: src/usr/bin/diffuse.py.in:7250
-#, 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/usr/bin/diffuse.py.in:7291
-#, python-format
-msgid "Error encoding to %s."
-msgstr "無法編碼為 %s。"
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Go To Line..."
-msgstr "跳到列號…"
-
-#: src/usr/bin/diffuse.py.in:7325
-msgid "Line Number: "
-msgstr "列數："
-
-#: src/usr/bin/diffuse.py.in:7351
-msgid "Press the enter key or double click to edit.  Press the space bar or use the RMB menu to manually align."
-msgstr "按確定鍵或雙擊滑鼠進行編輯。空格鍵或者右鍵選單手動對齊。"
-
-#: src/usr/bin/diffuse.py.in:7353
-msgid "Press the escape key to finish editing."
-msgstr "按 ESC 鍵結束編輯"
-
-#: src/usr/bin/diffuse.py.in:7355
-msgid "Select target line and press the space bar to align.  Press the escape key to cancel."
-msgstr "選擇目標列然後按空格鍵進行對齊，按 ESC 取消。"
-
-#: src/usr/bin/diffuse.py.in:7466
-msgid "_File"
-msgstr "檔案(_F)"
-
-#: src/usr/bin/diffuse.py.in:7467
-msgid "_Open File..."
-msgstr "開啟檔案(_O)…"
-
-#: src/usr/bin/diffuse.py.in:7468
-msgid "Open File In New _Tab..."
-msgstr "在新分頁裡開啟檔案(_T)…"
-
-#: src/usr/bin/diffuse.py.in:7469
-msgid "Open _Modified Files..."
-msgstr "開啟修改過的檔案(_M)…"
-
-#: src/usr/bin/diffuse.py.in:7470
-msgid "Open Commi_t..."
-msgstr "開啟認可(_T)…"
-
-#: src/usr/bin/diffuse.py.in:7471
-msgid "_Reload File"
-msgstr "重新載入(_R)"
-
-#: src/usr/bin/diffuse.py.in:7473
-msgid "_Save File"
-msgstr "儲存(_S)"
-
-#: src/usr/bin/diffuse.py.in:7474
-msgid "Save File _As..."
-msgstr "另存為(_A)…"
-
-#: src/usr/bin/diffuse.py.in:7475
-msgid "Save A_ll"
-msgstr "儲存所有(_L)"
-
-#: src/usr/bin/diffuse.py.in:7477
-msgid "New _2-Way File Merge"
-msgstr "新的二重檔案合併(_2)"
-
-#: src/usr/bin/diffuse.py.in:7478
-msgid "New _3-Way File Merge"
-msgstr "新的三重檔案合併(_3)"
-
-#: src/usr/bin/diffuse.py.in:7479
-msgid "New _N-Way File Merge..."
-msgstr "新的多重檔案合併(_N)…"
-
-#: src/usr/bin/diffuse.py.in:7481
-msgid "_Close Tab"
-msgstr "關閉分頁(_C)"
-
-#: src/usr/bin/diffuse.py.in:7482
-msgid "_Undo Close Tab"
-msgstr "復原關閉的分頁"
-
-#: src/usr/bin/diffuse.py.in:7483
-msgid "_Quit"
-msgstr "退出(_Q)"
-
-#: src/usr/bin/diffuse.py.in:7485
-msgid "_Edit"
-msgstr "編輯(_E)"
-
-#: src/usr/bin/diffuse.py.in:7486
-msgid "_Undo"
-msgstr "復原(_U)"
-
-#: src/usr/bin/diffuse.py.in:7487
-msgid "_Redo"
-msgstr "重做(_R)"
-
-#: src/usr/bin/diffuse.py.in:7489
-msgid "Cu_t"
-msgstr "剪下(_T)"
-
-#: src/usr/bin/diffuse.py.in:7490
-msgid "_Copy"
-msgstr "複製(_C)"
-
-#: src/usr/bin/diffuse.py.in:7491
-msgid "_Paste"
-msgstr "貼上(_P)"
-
-#: src/usr/bin/diffuse.py.in:7493
-msgid "Select _All"
-msgstr "全選(_A)"
-
-#: src/usr/bin/diffuse.py.in:7494
-msgid "C_lear Edits"
-msgstr "取消編輯(L)"
-
-#: src/usr/bin/diffuse.py.in:7495
-msgid "_Dismiss All Edits"
-msgstr "放棄所有的變更(_D)"
-
-#: src/usr/bin/diffuse.py.in:7497
-msgid "_Find..."
-msgstr "搜尋(_F)…"
-
-#: src/usr/bin/diffuse.py.in:7498
-msgid "Find _Next"
-msgstr "找下一個(_N)"
-
-#: src/usr/bin/diffuse.py.in:7499
-msgid "Find Pre_vious"
-msgstr "找上一個(_V)"
-
-#: src/usr/bin/diffuse.py.in:7500
-msgid "_Go To Line..."
-msgstr "跳到列號(_G)…"
-
-#: src/usr/bin/diffuse.py.in:7502
-msgid "Pr_eferences..."
-msgstr "選項(_E)…"
-
-#: src/usr/bin/diffuse.py.in:7504
-msgid "None"
-msgstr "無"
-
-#: src/usr/bin/diffuse.py.in:7512
-msgid "_View"
-msgstr "檢視(_V)"
-
-#: src/usr/bin/diffuse.py.in:7513
-msgid "_Syntax Highlighting"
-msgstr "高亮度語法(_S)"
-
-#: src/usr/bin/diffuse.py.in:7515
-msgid "Re_align All"
-msgstr "全部重新對齊(_A)"
-
-#: src/usr/bin/diffuse.py.in:7516
-msgid "_Isolate"
-msgstr "分離(_I)"
-
-#: src/usr/bin/diffuse.py.in:7518
-msgid "_First Difference"
-msgstr "第一個差異(_F)"
-
-#: src/usr/bin/diffuse.py.in:7519
-msgid "_Previous Difference"
-msgstr "上一個差異(_P)"
-
-#: src/usr/bin/diffuse.py.in:7520
-msgid "_Next Difference"
-msgstr "下一個差異(_N)"
-
-#: src/usr/bin/diffuse.py.in:7521
-msgid "_Last Difference"
-msgstr "最後一個差異(_L)"
-
-#: src/usr/bin/diffuse.py.in:7523
-msgid "Fir_st Tab"
-msgstr "第一個分頁(_S)"
-
-#: src/usr/bin/diffuse.py.in:7524
-msgid "Pre_vious Tab"
-msgstr "上一個分頁(_V)"
-
-#: src/usr/bin/diffuse.py.in:7525
-msgid "Next _Tab"
-msgstr "下一個分頁(_T)"
-
-#: src/usr/bin/diffuse.py.in:7526
-msgid "Las_t Tab"
-msgstr "最後一個分頁(_T)"
-
-#: src/usr/bin/diffuse.py.in:7528
-msgid "Shift Pane _Right"
-msgstr "右移窗格(_R)"
-
-#: src/usr/bin/diffuse.py.in:7529
-msgid "Shift Pane _Left"
-msgstr "左移窗格(_L)"
-
-#: src/usr/bin/diffuse.py.in:7531
-msgid "F_ormat"
-msgstr "格式(_O)"
-
-#: src/usr/bin/diffuse.py.in:7532
-msgid "Convert To _Upper Case"
-msgstr "轉換成大寫"
-
-#: src/usr/bin/diffuse.py.in:7533
-msgid "Convert To _Lower Case"
-msgstr "轉換成小寫"
-
-#: src/usr/bin/diffuse.py.in:7535
-msgid "Sort Lines In _Ascending Order"
-msgstr "以遞增的順序排列"
-
-#: src/usr/bin/diffuse.py.in:7536
-msgid "Sort Lines In D_escending Order"
-msgstr "以遞減的順序排列"
-
-#: src/usr/bin/diffuse.py.in:7538
-msgid "Remove Trailing _White Space"
-msgstr "刪除多餘的空格(_W)"
-
-#: src/usr/bin/diffuse.py.in:7539
-msgid "Convert Tabs To _Spaces"
-msgstr "轉換跳格字元為空格(_S)"
-
-#: src/usr/bin/diffuse.py.in:7540
-msgid "Convert Leading Spaces To _Tabs"
-msgstr "轉換開頭的空格為跳格字元(_T)"
-
-#: src/usr/bin/diffuse.py.in:7542
-msgid "_Increase Indenting"
-msgstr "減少縮排(_I)"
-
-#: src/usr/bin/diffuse.py.in:7543
-msgid "De_crease Indenting"
-msgstr "減少縮排"
-
-#: src/usr/bin/diffuse.py.in:7545
-msgid "Convert To _DOS Format"
-msgstr "轉換為 DOS 格式(_D)"
-
-#: src/usr/bin/diffuse.py.in:7546
-msgid "Convert To _Mac Format"
-msgstr "轉換為 Mac 格式(_M)"
-
-#: src/usr/bin/diffuse.py.in:7547
-msgid "Convert To Uni_x Format"
-msgstr "轉換為 Unix 格式(_X)"
-
-#: src/usr/bin/diffuse.py.in:7549
-msgid "_Merge"
-msgstr "合併(_M)"
-
-#: src/usr/bin/diffuse.py.in:7550
-msgid "Copy Selection _Right"
-msgstr "複製選擇區域到右邊(_R)"
-
-#: src/usr/bin/diffuse.py.in:7551
-msgid "Copy Selection _Left"
-msgstr "複製選擇區域到左邊(_L)"
-
-#: src/usr/bin/diffuse.py.in:7553
-msgid "Copy Left _Into Selection"
-msgstr "複製左邊內容到選擇區域(_L)"
-
-#: src/usr/bin/diffuse.py.in:7554
-msgid "Copy Right I_nto Selection"
-msgstr "複製右邊內容到選擇區域(_L)"
-
-#: src/usr/bin/diffuse.py.in:7555
-msgid "_Merge From Left Then Right"
-msgstr "先左再右合併(_M)"
-
-#: src/usr/bin/diffuse.py.in:7556
-msgid "M_erge From Right Then Left"
-msgstr "從右向左合併(_E)"
-
-#: src/usr/bin/diffuse.py.in:7558
-msgid "_Help"
-msgstr "求助(_H)"
-
-#: src/usr/bin/diffuse.py.in:7559
-msgid "_Help Contents..."
-msgstr "說明內容(_H)…"
-
-#: src/usr/bin/diffuse.py.in:7561
-#, python-format
-msgid "_About %s..."
-msgstr "關於 %s(_A)…"
-
-#: src/usr/bin/diffuse.py.in:7575
-msgid "New 2-Way File Merge"
-msgstr "新的二重檔案合併"
-
-#: src/usr/bin/diffuse.py.in:7576
-msgid "New 3-Way File Merge"
-msgstr "新的三重檔案合併"
-
-#: src/usr/bin/diffuse.py.in:7578
-msgid "Realign All"
-msgstr "全部重新對齊"
-
-#: src/usr/bin/diffuse.py.in:7579
-msgid "First Difference"
-msgstr "第一個差異"
-
-#: src/usr/bin/diffuse.py.in:7580
-msgid "Previous Difference"
-msgstr "上一個差異"
-
-#: src/usr/bin/diffuse.py.in:7581
-msgid "Next Difference"
-msgstr "下一個差異"
-
-#: src/usr/bin/diffuse.py.in:7582
-msgid "Last Difference"
-msgstr "最後一個差異"
-
-#: src/usr/bin/diffuse.py.in:7584
-msgid "Copy Selection Right"
-msgstr "複製選擇區域到右邊"
-
-#: src/usr/bin/diffuse.py.in:7585
-msgid "Copy Selection Left"
-msgstr "複製選擇區域到左邊"
-
-#: src/usr/bin/diffuse.py.in:7586
-msgid "Copy Left Into Selection"
-msgstr "複製左邊內容到選擇區域"
-
-#: src/usr/bin/diffuse.py.in:7587
-msgid "Copy Right Into Selection"
-msgstr "複製右邊內容到選擇區域"
-
-#: src/usr/bin/diffuse.py.in:7588
-msgid "Merge From Left Then Right"
-msgstr "先左後右合併"
-
-#: src/usr/bin/diffuse.py.in:7589
-msgid "Merge From Right Then Left"
-msgstr "先右後左合併(_T)"
-
-#: src/usr/bin/diffuse.py.in:7591
-msgid "Undo"
-msgstr "復原"
-
-#: src/usr/bin/diffuse.py.in:7592
-msgid "Redo"
-msgstr "重做"
-
-#: src/usr/bin/diffuse.py.in:7716
-msgid "Some files have unsaved changes.  Select the files to save before closing."
-msgstr "一些檔案已變更但未儲存，請在關閉前儲存這些檔案。"
-
-#: src/usr/bin/diffuse.py.in:7729
-msgid "Tab"
-msgstr "跳格字元"
-
-#: src/usr/bin/diffuse.py.in:7734
-msgid "Pane"
-msgstr "窗格"
-
-#: src/usr/bin/diffuse.py.in:7745
-msgid "Close _Without Saving"
-msgstr "不儲存而關閉"
-
-#: src/usr/bin/diffuse.py.in:7856
-#, python-format
-msgid "File Merge %d"
-msgstr "檔案合併 %d"
-
-#: src/usr/bin/diffuse.py.in:7959
-#, python-format
-msgid "Error retrieving commits for %s."
-msgstr "無法恢復對 %s 的認可。"
-
-#: src/usr/bin/diffuse.py.in:7990
-#, python-format
-msgid "Error retrieving modifications for %s."
-msgstr "無法恢復對 %s 的修改。"
-
-#: src/usr/bin/diffuse.py.in:8022
-msgid "Open File In New Tab"
-msgstr "在新分頁裡開啟檔案"
-
-#: src/usr/bin/diffuse.py.in:8038
-msgid "Choose Folder With Modified Files"
-msgstr "選擇更改過的檔案夾"
-
-#: src/usr/bin/diffuse.py.in:8051
-msgid "No modified files found."
-msgstr "找不到已修改的檔案。"
-
-#: src/usr/bin/diffuse.py.in:8058
-msgid "Choose Folder With Commit"
-msgstr "選擇認可過的檔案夾"
-
-#: src/usr/bin/diffuse.py.in:8071
-msgid "No committed files found."
-msgstr "找不到已認可的檔案。"
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "New N-Way File Merge..."
-msgstr "新的多重檔案合併…"
-
-#: src/usr/bin/diffuse.py.in:8107
-msgid "Number of panes: "
-msgstr "窗格數: "
-
-#: src/usr/bin/diffuse.py.in:8172
-msgid "Phrase not found.  Continue from the end of the file?"
-msgstr "語詞未找到，從檔案結尾繼續嗎？"
-
-#: src/usr/bin/diffuse.py.in:8174
-msgid "Phrase not found.  Continue from the start of the file?"
-msgstr "語詞未找到，從檔案開頭繼續嗎？"
-
-#: src/usr/bin/diffuse.py.in:8440
+#: src/main.py:6990
 msgid "Error parsing line number."
 msgstr "解析列數時錯誤。"
 
-#: src/usr/bin/diffuse.py.in:8450
+#: src/main.py:7000
 #, python-format
 msgid "Skipping unknown argument \"%s\"."
 msgstr "跳過未知引數「%s」。"
 
-#: src/usr/bin/diffuse.py.in:8457
+#: src/main.py:7007
 #, python-format
 msgid "Error processing argument \"%s\".  Directory not expected."
 msgstr "無法處理「%s」。目錄不存在。"
 
+#: src/vcs/cvs.py:50 src/vcs/rcs.py:54 src/vcs/svn.py:89
+#, python-format
+msgid "Error parsing revision %s."
+msgstr "無法解析修訂版本 %s。"
+
+#: src/vcs/vcs_registry.py:216
+#, python-format
+msgid "Error parsing %s."
+msgstr "無法解析 %s。"
+
 #, python-format
 #~ msgid "Column %d"
 #~ msgstr "第 %d 行"