Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: tdesdk/kompare
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/tdesdk/kompare/
(cherry picked from commit 364e0ab2be9e2a9808bf801fec4ac41896d851cd)

1 files changed, 519 insertions, 489 deletions

diff --git a/tde-i18n-en_GB/messages/tdesdk/kompare.po b/tde-i18n-en_GB/messages/tdesdk/kompare.po
index ca75936eb70..0ef1a687862 100644
--- a/tde-i18n-en_GB/messages/tdesdk/kompare.po
+++ b/tde-i18n-en_GB/messages/tdesdk/kompare.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kompare\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2005-11-07 01:06+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -17,333 +17,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: libdiff2/komparemodellist.cpp:61
-msgid "&Apply Difference"
-msgstr "&Apply Difference"
-
-#: libdiff2/komparemodellist.cpp:64
-msgid "Un&apply Difference"
-msgstr "Un&apply Difference"
-
-#: libdiff2/komparemodellist.cpp:67
-msgid "App&ly All"
-msgstr "App&ly All"
-
-#: libdiff2/komparemodellist.cpp:70
-msgid "&Unapply All"
-msgstr "&Unapply All"
-
-#: libdiff2/komparemodellist.cpp:73
-msgid "P&revious File"
-msgstr "P&revious File"
-
-#: libdiff2/komparemodellist.cpp:76
-msgid "N&ext File"
-msgstr "N&ext File"
-
-#: libdiff2/komparemodellist.cpp:79
-msgid "&Previous Difference"
-msgstr "&Previous Difference"
-
-#: libdiff2/komparemodellist.cpp:82
-msgid "&Next Difference"
-msgstr "&Next Difference"
-
-#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
-msgid ""
-"<qt>No models or no differences, this file: <b>%1</b>"
-", is not a valid diff file.</qt>"
-msgstr ""
-"<qt>No models or no differences, this file: <b>%1</b>"
-", is not a valid diff file.</qt>"
-
-#: libdiff2/komparemodellist.cpp:246
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>"
-msgstr ""
-"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>"
-
-#: libdiff2/komparemodellist.cpp:271
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>"
-".</qt>"
-msgstr ""
-"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>"
-".</qt>"
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-msgid "Could not open a temporary file."
-msgstr "Could not open a temporary file."
-
-#: libdiff2/komparemodellist.cpp:350
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-
-#: libdiff2/komparemodellist.cpp:368
-msgid ""
-"<qt>Could not create destination directory <b>%1</b>.\n"
-"The file has not been saved.</qt>"
-msgstr ""
-"<qt>Could not create destination directory <b>%1</b>.\n"
-"The file has not been saved.</qt>"
-
-#: libdiff2/komparemodellist.cpp:383
-msgid ""
-"<qt>Could not upload the temporary file to the destination location <b>%1</b>"
-". The temporary file is still available under: <b>%2</b>"
-". You can manually copy it to the right place.</qt>"
-msgstr ""
-"<qt>Could not upload the temporary file to the destination location <b>%1</b>"
-". The temporary file is still available under: <b>%2</b>"
-". You can manually copy it to the right place.</qt>"
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-msgid "Could not parse diff output."
-msgstr "Could not parse diff output."
-
-#: libdiff2/komparemodellist.cpp:451
-msgid "The files are identical."
-msgstr "The files are identical."
-
-#: libdiff2/komparemodellist.cpp:613
-msgid "Could not write to the temporary file."
-msgstr "Could not write to the temporary file."
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, no-c-format
-msgid "&Difference"
-msgstr "&Difference"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, no-c-format
-msgid "Run Diff In"
-msgstr "Run Diff In"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, no-c-format
-msgid "Command Line"
-msgstr "Command Line"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 108
-#: rc.cpp:27
-#, no-c-format
-msgid "cd dir && diff -udHprNa -- source destination"
-msgstr "cd dir && diff -udHprNa -- source destination"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, no-c-format
-msgid "Look for smaller changes"
-msgstr "Look for smaller changes"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, no-c-format
-msgid "Optimize for large files"
-msgstr "Optimise for large files"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, no-c-format
-msgid "Ignore changes in case"
-msgstr "Ignore changes in case"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, no-c-format
-msgid "Expand tabs to spaces"
-msgstr "Expand tabs to spaces"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
-#: rc.cpp:45
-#, no-c-format
-msgid "Ignore added or removed empty lines"
-msgstr "Ignore added or removed empty lines"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr "Ignore changes in whitespace"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, no-c-format
-msgid "Show function names"
-msgstr "Show function names"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, no-c-format
-msgid "Compare folders recursively"
-msgstr "Compare folders recursively"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
-#: rc.cpp:57
-#, no-c-format
-msgid "Treat new files as empty"
-msgstr "Treat new files as empty"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
-#: rc.cpp:60
-#, no-c-format
-msgid "Format"
-msgstr "Format"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 244
-#: komparepart/kompare_part.cpp:638 libdialogpages/diffpage.cpp:238 rc.cpp:63
-#, no-c-format
-msgid "Context"
-msgstr "Context"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 252
-#: komparepart/kompare_part.cpp:644 libdialogpages/diffpage.cpp:239 rc.cpp:66
-#, no-c-format
-msgid "Ed"
-msgstr "`Ed"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 260
-#: komparepart/kompare_part.cpp:647 libdialogpages/diffpage.cpp:241 rc.cpp:69
-#, no-c-format
-msgid "Normal"
-msgstr "Normal"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 268
-#: komparepart/kompare_part.cpp:641 libdialogpages/diffpage.cpp:242 rc.cpp:72
-#, no-c-format
-msgid "RCS"
-msgstr "RCS"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 276
-#: komparepart/kompare_part.cpp:635 libdialogpages/diffpage.cpp:244 rc.cpp:75
-#, no-c-format
-msgid "Unified"
-msgstr "Unified"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
-#: rc.cpp:78
-#, no-c-format
-msgid "Side-by-side"
-msgstr "Side-by-side"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
-#: libdialogpages/diffpage.cpp:251 rc.cpp:81
-#, no-c-format
-msgid "Number of context lines:"
-msgstr "Number of context lines:"
-
-#: main.cpp:33
-msgid ""
-"A program to view the differences between files and optionally generate a diff"
-msgstr ""
-"A program to view the differences between files and optionally generate a diff"
-
-#: main.cpp:39
-msgid "This will compare URL1 with URL2"
-msgstr "This will compare URL1 with URL2"
-
-#: main.cpp:40
-msgid ""
-"This will open URL1 and expect it to be diff output. URL1 can also be a '-' and "
-"then it will read from standard input. Can be used for instance for cvs diff | "
-"kompare -o -. Kompare will do a check to see if it can find the original "
-"file(s) and then blend the original file(s) into the diffoutput and show that "
-"in the viewer. -n disables the check."
-msgstr ""
-"This will open URL1 and expect it to be diff output. URL1 can also be a '-' and "
-"then it will read from standard input. Can be used for instance for cvs diff | "
-"kompare -o -. Kompare will do a check to see if it can find the original "
-"file(s) and then blend the original file(s) into the diffoutput and show that "
-"in the viewer. -n disables the check."
-
-#: main.cpp:41
-msgid ""
-"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the "
-"file or folder that the diffoutput needs to be blended into. "
-msgstr ""
-"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the "
-"file or folder that the diffoutput needs to be blended into. "
-
-#: main.cpp:42
-msgid ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
-msgstr ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
-
-#: main.cpp:43
-msgid ""
-"Use this to specify the encoding when calling it from the command line. It will "
-"default to the local encoding if not specified."
-msgstr ""
-"Use this to specify the encoding when calling it from the command line. It will "
-"default to the local encoding if not specified."
-
-#: main.cpp:52
-msgid "Kompare"
-msgstr "Kompare"
-
-#: main.cpp:54
-msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
-msgstr "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
-
-#: main.cpp:55 main.cpp:56
-msgid "Author"
-msgstr "Author"
-
-#: main.cpp:57
-msgid "Kompare icon artist"
-msgstr "Kompare icon artist"
-
-#: main.cpp:58
-msgid "A lot of good advice"
-msgstr "A lot of good advice"
-
-#: main.cpp:59
-msgid "Cervisia diff viewer"
-msgstr "Cervisia diff viewer"
-
-#: kompare_shell.cpp:398 main.cpp:185
-msgid "Compare Files or Folders"
-msgstr "Compare Files or Folders"
-
-#: kompare_shell.cpp:399 main.cpp:186
-msgid "Source"
-msgstr "Source"
-
-#: kompare_shell.cpp:400 main.cpp:187
-msgid "Destination"
-msgstr "Destination"
-
-#: kompare_shell.cpp:402 main.cpp:189
-msgid "Compare"
-msgstr "Compare"
-
-#: main.cpp:189
-msgid "Compare these files or folder"
-msgstr "Compare these files or folder"
-
-#: kompare_shell.cpp:402 main.cpp:189
-msgid ""
-"If you have entered 2 filenames or 2 folders in the fields in this dialog then "
-"this button will be enabled and pressing it will start a comparison of the "
-"entered files or folders. "
-msgstr ""
-"If you have entered 2 filenames or 2 folders in the fields in this dialogue "
-"then this button will be enabled and pressing it will start a comparison of the "
-"entered files or folders. "
-
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "John Knight"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -449,22 +129,48 @@ msgstr "Blend this file or folder with the diff output"
 
 #: kompare_shell.cpp:373
 msgid ""
-"If you have entered a file or folder name and a file that contains diff output "
-"in the fields in this dialog then this button will be enabled and pressing it "
-"will open kompare's main view where the output of the entered file or files "
-"from the folder are mixed with the diff output so you can then apply the "
-"difference(s) to a file or to the files. "
+"If you have entered a file or folder name and a file that contains diff "
+"output in the fields in this dialog then this button will be enabled and "
+"pressing it will open kompare's main view where the output of the entered "
+"file or files from the folder are mixed with the diff output so you can then "
+"apply the difference(s) to a file or to the files. "
 msgstr ""
-"If you have entered a file or folder name and a file that contains diff output "
-"in the fields in this dialogue then this button will be enabled and pressing it "
-"will open kompare's main view where the output of the entered file or files "
-"from the folder are mixed with the diff output so you can then apply the "
-"difference(s) to a file or to the files. "
+"If you have entered a file or folder name and a file that contains diff "
+"output in the fields in this dialogue then this button will be enabled and "
+"pressing it will open kompare's main view where the output of the entered "
+"file or files from the folder are mixed with the diff output so you can then "
+"apply the difference(s) to a file or to the files. "
+
+#: kompare_shell.cpp:398 main.cpp:185
+msgid "Compare Files or Folders"
+msgstr "Compare Files or Folders"
+
+#: kompare_shell.cpp:399 main.cpp:186
+msgid "Source"
+msgstr "Source"
+
+#: kompare_shell.cpp:400 main.cpp:187
+msgid "Destination"
+msgstr "Destination"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
+msgstr "Compare"
 
 #: kompare_shell.cpp:402
 msgid "Compare these files or folders"
 msgstr "Compare these files or folders"
 
+#: kompare_shell.cpp:402 main.cpp:189
+msgid ""
+"If you have entered 2 filenames or 2 folders in the fields in this dialog "
+"then this button will be enabled and pressing it will start a comparison of "
+"the entered files or folders. "
+msgstr ""
+"If you have entered 2 filenames or 2 folders in the fields in this dialogue "
+"then this button will be enabled and pressing it will start a comparison of "
+"the entered files or folders. "
+
 #: kompare_shell.cpp:439
 msgid "Text View"
 msgstr "Text View"
@@ -560,19 +266,230 @@ msgstr "Unknown"
 msgid "KompareNavTreePart"
 msgstr "KompareNavTreePart"
 
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
-msgstr "Here you can enter the files you want to compare."
+#: komparepart/kompare_part.cpp:165
+msgid "Save &All"
+msgstr "Save &All"
+
+#: komparepart/kompare_part.cpp:168
+msgid "Save .&diff..."
+msgstr "Save .&diff..."
+
+#: komparepart/kompare_part.cpp:171
+msgid "Swap Source with Destination"
+msgstr "Swap Source with Destination"
+
+#: komparepart/kompare_part.cpp:174
+msgid "Show Statistics"
+msgstr "Show Statistics"
+
+#: komparepart/kompare_part.cpp:269
+msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+msgstr "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+
+#: komparepart/kompare_part.cpp:281
+msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+msgstr "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+
+#: komparepart/kompare_part.cpp:425
+msgid "Diff Options"
+msgstr "Diff Options"
+
+#: komparepart/kompare_part.cpp:443
+msgid "*.diff *.dif *.patch|Patch Files"
+msgstr "*.diff *.dif *.patch|Patch Files"
+
+#: komparepart/kompare_part.cpp:443
+msgid "Save .diff"
+msgstr "Save .diff"
+
+#: komparepart/kompare_part.cpp:446
+msgid "The file exists or is write-protected; do you want to overwrite it?"
+msgstr "The file exists or is write-protected; do you want to overwrite it?"
+
+#: komparepart/kompare_part.cpp:446
+msgid "File Exists"
+msgstr "File Exists"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Overwrite"
+msgstr "Overwrite"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Do Not Overwrite"
+msgstr "Do Not Overwrite"
+
+#: komparepart/kompare_part.cpp:481
+msgid "KomparePart"
+msgstr "KomparePart"
+
+#: komparepart/kompare_part.cpp:493
+msgid "Running diff..."
+msgstr "Running diff..."
+
+#: komparepart/kompare_part.cpp:496
+msgid "Parsing diff output..."
+msgstr "Parsing diff output..."
+
+#: komparepart/kompare_part.cpp:545
+msgid "Comparing file %1 with file %2"
+msgstr "Comparing file %1 with file %2"
+
+#: komparepart/kompare_part.cpp:550
+msgid "Comparing files in %1 with files in %2"
+msgstr "Comparing files in %1 with files in %2"
+
+#: komparepart/kompare_part.cpp:555
+#, c-format
+msgid "Viewing diff output from %1"
+msgstr "Viewing diff output from %1"
+
+#: komparepart/kompare_part.cpp:558
+msgid "Blending diff output from %1 into file %2"
+msgstr "Blending diff output from %1 into file %2"
+
+#: komparepart/kompare_part.cpp:563
+msgid "Blending diff output from %1 into folder %2"
+msgstr "Blending diff output from %1 into folder %2"
+
+#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709
+msgid ""
+"You have made changes to the destination file(s).\n"
+"Would you like to save them?"
+msgstr ""
+"You have made changes to the destination file(s).\n"
+"Would you like to save them?"
+
+#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+msgid "Save Changes?"
+msgstr "Save Changes?"
+
+#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276
+#: libdialogpages/diffpage.cpp:244
+#, no-c-format
+msgid "Unified"
+msgstr "Unified"
+
+#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244
+#: libdialogpages/diffpage.cpp:238
+#, no-c-format
+msgid "Context"
+msgstr "Context"
+
+#: komparepart/kompare_part.cpp:641 komparepart/komparesaveoptionsbase.ui:268
+#: libdialogpages/diffpage.cpp:242
+#, no-c-format
+msgid "RCS"
+msgstr "RCS"
+
+#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252
+#: libdialogpages/diffpage.cpp:239
+#, no-c-format
+msgid "Ed"
+msgstr "`Ed"
+
+#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260
+#: libdialogpages/diffpage.cpp:241
+#, no-c-format
+msgid "Normal"
+msgstr "Normal"
+
+#: komparepart/kompare_part.cpp:667
+msgid ""
+"No diff file, or no 2 files have been diffed. Therefore no stats are "
+"available."
+msgstr ""
+"No diff file, or no 2 files have been diffed. Therefore no stats are "
+"available."
+
+#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
+#: komparepart/kompare_part.cpp:698
+msgid "Diff Statistics"
+msgstr "Diff Statistics"
+
+#: komparepart/kompare_part.cpp:673
+msgid ""
+"Statistics:\n"
+"\n"
+"Old file: %1\n"
+"New file: %2\n"
+"\n"
+"Format: %3\n"
+"Number of hunks: %4\n"
+"Number of differences: %5"
+msgstr ""
+"Statistics:\n"
+"\n"
+"Old file: %1\n"
+"New file: %2\n"
+"\n"
+"Format: %3\n"
+"Number of hunks: %4\n"
+"Number of differences: %5"
+
+#: komparepart/kompare_part.cpp:686
+msgid ""
+"Statistics:\n"
+"\n"
+"Number of files in diff file: %1\n"
+"Format: %2\n"
+"\n"
+"Current old file: %3\n"
+"Current new file: %4\n"
+"\n"
+"Number of hunks: %5\n"
+"Number of differences: %6"
+msgstr ""
+"Statistics:\n"
+"\n"
+"Number of files in diff file: %1\n"
+"Format: %2\n"
+"\n"
+"Current old file: %3\n"
+"Current new file: %4\n"
+"\n"
+"Number of hunks: %5\n"
+"Number of differences: %6"
+
+#: komparepart/kompareprefdlg.cpp:33
+msgid "Preferences"
+msgstr "Preferences"
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View"
+msgstr "Text View"
+
+#: komparepart/kompareprefdlg.cpp:39
+msgid "View Settings"
+msgstr "View Settings"
 
 #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
 msgid "Diff"
 msgstr "Diff"
 
+#: komparepart/kompareprefdlg.cpp:43
+msgid "Diff Settings"
+msgstr "Diff Settings"
+
+#: kompareurldialog.cpp:41
+#, fuzzy
+msgid "Files"
+msgstr "&Files"
+
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr "Here you can enter the files you want to compare."
+
 #: kompareurldialog.cpp:47
 msgid "Here you can change the options for comparing the files."
 msgstr "Here you can change the options for comparing the files."
 
 #: kompareurldialog.cpp:53
+#, fuzzy
+msgid "Appearance"
+msgstr "A&ppearance"
+
+#: kompareurldialog.cpp:53
 msgid "Here you can change the options for the view."
 msgstr "Here you can change the options for the view."
 
@@ -600,18 +517,23 @@ msgstr "Output Format"
 
 #: libdialogpages/diffpage.cpp:233
 msgid ""
-"Select the format of the output generated by diff. Unified is the one that is "
-"used most frequently because it is very readable. The TDE developers like this "
-"format the best so use it for sending patches."
+"Select the format of the output generated by diff. Unified is the one that "
+"is used most frequently because it is very readable. The TDE developers like "
+"this format the best so use it for sending patches."
 msgstr ""
-"Select the format of the output generated by diff. Unified is the one that is "
-"used most frequently because it is very readable. The TDE developers like this "
-"format the best so use it for sending patches."
+"Select the format of the output generated by diff. Unified is the one that "
+"is used most frequently because it is very readable. The TDE developers like "
+"this format the best so use it for sending patches."
 
 #: libdialogpages/diffpage.cpp:247
 msgid "Lines of Context"
 msgstr "Lines of Context"
 
+#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251
+#, no-c-format
+msgid "Number of context lines:"
+msgstr "Number of context lines:"
+
 #: libdialogpages/diffpage.cpp:253
 msgid ""
 "The number of context lines is normally 2 or 3. This makes the diff readable "
@@ -736,19 +658,19 @@ msgstr "File Pattern to Exclude"
 
 #: libdialogpages/diffpage.cpp:330
 msgid ""
-"If this is checked you can enter a shell pattern in the text box on the right "
-"or select entries from the list."
+"If this is checked you can enter a shell pattern in the text box on the "
+"right or select entries from the list."
 msgstr ""
-"If this is ticked you can enter a shell pattern in the text box on the right or "
-"select entries from the list."
+"If this is ticked you can enter a shell pattern in the text box on the right "
+"or select entries from the list."
 
 #: libdialogpages/diffpage.cpp:332
 msgid ""
-"Here you can enter or remove a shell pattern or select one or more entries from "
-"the list."
+"Here you can enter or remove a shell pattern or select one or more entries "
+"from the list."
 msgstr ""
-"Here you can enter or remove a shell pattern or select one or more entries from "
-"the list."
+"Here you can enter or remove a shell pattern or select one or more entries "
+"from the list."
 
 #: libdialogpages/diffpage.cpp:338
 msgid "File with Filenames to Exclude"
@@ -762,19 +684,19 @@ msgstr ""
 
 #: libdialogpages/diffpage.cpp:342
 msgid ""
-"Here you can enter the URL of a file with shell patterns to ignore during the "
-"comparison of the folders."
+"Here you can enter the URL of a file with shell patterns to ignore during "
+"the comparison of the folders."
 msgstr ""
-"Here you can enter the URL of a file with shell patterns to ignore during the "
-"comparison of the folders."
+"Here you can enter the URL of a file with shell patterns to ignore during "
+"the comparison of the folders."
 
 #: libdialogpages/diffpage.cpp:344
 msgid ""
-"Any file you select in the dialog that pops up when you click it will be put in "
-"the dialog to the left of this button."
+"Any file you select in the dialog that pops up when you click it will be put "
+"in the dialog to the left of this button."
 msgstr ""
-"Any file you select in the dialogue that pops up when you click it will be put "
-"in the dialogue to the left of this button."
+"Any file you select in the dialogue that pops up when you click it will be "
+"put in the dialogue to the left of this button."
 
 #: libdialogpages/diffpage.cpp:352
 msgid "&Exclude"
@@ -840,166 +762,274 @@ msgstr "Font:"
 msgid "Size:"
 msgstr "Size:"
 
-#: komparepart/kompareprefdlg.cpp:33
-msgid "Preferences"
-msgstr "Preferences"
-
-#: komparepart/kompareprefdlg.cpp:39
-msgid "View Settings"
-msgstr "View Settings"
-
-#: komparepart/kompareprefdlg.cpp:43
-msgid "Diff Settings"
-msgstr "Diff Settings"
-
-#: komparepart/kompare_part.cpp:165
-msgid "Save &All"
-msgstr "Save &All"
-
-#: komparepart/kompare_part.cpp:168
-msgid "Save .&diff..."
-msgstr "Save .&diff..."
-
-#: komparepart/kompare_part.cpp:171
-msgid "Swap Source with Destination"
-msgstr "Swap Source with Destination"
+#: libdialogpages/viewpage.cpp:119
+#, fuzzy
+msgid "&Fonts"
+msgstr "Font:"
 
-#: komparepart/kompare_part.cpp:174
-msgid "Show Statistics"
-msgstr "Show Statistics"
+#: libdiff2/komparemodellist.cpp:61
+msgid "&Apply Difference"
+msgstr "&Apply Difference"
 
-#: komparepart/kompare_part.cpp:269
-msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
-msgstr "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+#: libdiff2/komparemodellist.cpp:64
+msgid "Un&apply Difference"
+msgstr "Un&apply Difference"
 
-#: komparepart/kompare_part.cpp:281
-msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
-msgstr "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+#: libdiff2/komparemodellist.cpp:67
+msgid "App&ly All"
+msgstr "App&ly All"
 
-#: komparepart/kompare_part.cpp:425
-msgid "Diff Options"
-msgstr "Diff Options"
+#: libdiff2/komparemodellist.cpp:70
+msgid "&Unapply All"
+msgstr "&Unapply All"
 
-#: komparepart/kompare_part.cpp:443
-msgid "*.diff *.dif *.patch|Patch Files"
-msgstr "*.diff *.dif *.patch|Patch Files"
+#: libdiff2/komparemodellist.cpp:73
+msgid "P&revious File"
+msgstr "P&revious File"
 
-#: komparepart/kompare_part.cpp:443
-msgid "Save .diff"
-msgstr "Save .diff"
+#: libdiff2/komparemodellist.cpp:76
+msgid "N&ext File"
+msgstr "N&ext File"
 
-#: komparepart/kompare_part.cpp:446
-msgid "The file exists or is write-protected; do you want to overwrite it?"
-msgstr "The file exists or is write-protected; do you want to overwrite it?"
+#: libdiff2/komparemodellist.cpp:79
+msgid "&Previous Difference"
+msgstr "&Previous Difference"
 
-#: komparepart/kompare_part.cpp:446
-msgid "File Exists"
-msgstr "File Exists"
+#: libdiff2/komparemodellist.cpp:82
+msgid "&Next Difference"
+msgstr "&Next Difference"
 
-#: komparepart/kompare_part.cpp:446
-msgid "Overwrite"
-msgstr "Overwrite"
+#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
+msgid ""
+"<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff "
+"file.</qt>"
+msgstr ""
+"<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff "
+"file.</qt>"
 
-#: komparepart/kompare_part.cpp:446
-msgid "Do Not Overwrite"
-msgstr "Do Not Overwrite"
+#: libdiff2/komparemodellist.cpp:246
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
+"qt>"
+msgstr ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
+"qt>"
 
-#: komparepart/kompare_part.cpp:481
-msgid "KomparePart"
-msgstr "KomparePart"
+#: libdiff2/komparemodellist.cpp:271
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>."
+"</qt>"
+msgstr ""
+"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>."
+"</qt>"
 
-#: komparepart/kompare_part.cpp:493
-msgid "Running diff..."
-msgstr "Running diff..."
+#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
+msgid "Could not open a temporary file."
+msgstr "Could not open a temporary file."
 
-#: komparepart/kompare_part.cpp:496
-msgid "Parsing diff output..."
-msgstr "Parsing diff output..."
+#: libdiff2/komparemodellist.cpp:350
+msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+msgstr "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
 
-#: komparepart/kompare_part.cpp:545
-msgid "Comparing file %1 with file %2"
-msgstr "Comparing file %1 with file %2"
+#: libdiff2/komparemodellist.cpp:368
+msgid ""
+"<qt>Could not create destination directory <b>%1</b>.\n"
+"The file has not been saved.</qt>"
+msgstr ""
+"<qt>Could not create destination directory <b>%1</b>.\n"
+"The file has not been saved.</qt>"
 
-#: komparepart/kompare_part.cpp:550
-msgid "Comparing files in %1 with files in %2"
-msgstr "Comparing files in %1 with files in %2"
+#: libdiff2/komparemodellist.cpp:383
+msgid ""
+"<qt>Could not upload the temporary file to the destination location <b>%1</"
+"b>. The temporary file is still available under: <b>%2</b>. You can manually "
+"copy it to the right place.</qt>"
+msgstr ""
+"<qt>Could not upload the temporary file to the destination location <b>%1</"
+"b>. The temporary file is still available under: <b>%2</b>. You can manually "
+"copy it to the right place.</qt>"
 
-#: komparepart/kompare_part.cpp:555
-#, c-format
-msgid "Viewing diff output from %1"
-msgstr "Viewing diff output from %1"
+#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
+msgid "Could not parse diff output."
+msgstr "Could not parse diff output."
 
-#: komparepart/kompare_part.cpp:558
-msgid "Blending diff output from %1 into file %2"
-msgstr "Blending diff output from %1 into file %2"
+#: libdiff2/komparemodellist.cpp:451
+msgid "The files are identical."
+msgstr "The files are identical."
 
-#: komparepart/kompare_part.cpp:563
-msgid "Blending diff output from %1 into folder %2"
-msgstr "Blending diff output from %1 into folder %2"
+#: libdiff2/komparemodellist.cpp:613
+msgid "Could not write to the temporary file."
+msgstr "Could not write to the temporary file."
 
-#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709
+#: main.cpp:33
 msgid ""
-"You have made changes to the destination file(s).\n"
-"Would you like to save them?"
+"A program to view the differences between files and optionally generate a "
+"diff"
 msgstr ""
-"You have made changes to the destination file(s).\n"
-"Would you like to save them?"
+"A program to view the differences between files and optionally generate a "
+"diff"
 
-#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
-msgid "Save Changes?"
-msgstr "Save Changes?"
+#: main.cpp:39
+msgid "This will compare URL1 with URL2"
+msgstr "This will compare URL1 with URL2"
 
-#: komparepart/kompare_part.cpp:667
+#: main.cpp:40
 msgid ""
-"No diff file, or no 2 files have been diffed. Therefore no stats are available."
+"This will open URL1 and expect it to be diff output. URL1 can also be a '-' "
+"and then it will read from standard input. Can be used for instance for cvs "
+"diff | kompare -o -. Kompare will do a check to see if it can find the "
+"original file(s) and then blend the original file(s) into the diffoutput and "
+"show that in the viewer. -n disables the check."
 msgstr ""
-"No diff file, or no 2 files have been diffed. Therefore no stats are available."
+"This will open URL1 and expect it to be diff output. URL1 can also be a '-' "
+"and then it will read from standard input. Can be used for instance for cvs "
+"diff | kompare -o -. Kompare will do a check to see if it can find the "
+"original file(s) and then blend the original file(s) into the diffoutput and "
+"show that in the viewer. -n disables the check."
 
-#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
-#: komparepart/kompare_part.cpp:698
-msgid "Diff Statistics"
-msgstr "Diff Statistics"
+#: main.cpp:41
+msgid ""
+"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 "
+"the file or folder that the diffoutput needs to be blended into. "
+msgstr ""
+"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 "
+"the file or folder that the diffoutput needs to be blended into. "
 
-#: komparepart/kompare_part.cpp:673
+#: main.cpp:42
 msgid ""
-"Statistics:\n"
-"\n"
-"Old file: %1\n"
-"New file: %2\n"
-"\n"
-"Format: %3\n"
-"Number of hunks: %4\n"
-"Number of differences: %5"
+"Disables the check for automatically finding the original file(s) when using "
+"'-' as URL with the -o option."
 msgstr ""
-"Statistics:\n"
-"\n"
-"Old file: %1\n"
-"New file: %2\n"
-"\n"
-"Format: %3\n"
-"Number of hunks: %4\n"
-"Number of differences: %5"
+"Disables the check for automatically finding the original file(s) when using "
+"'-' as URL with the -o option."
 
-#: komparepart/kompare_part.cpp:686
+#: main.cpp:43
 msgid ""
-"Statistics:\n"
-"\n"
-"Number of files in diff file: %1\n"
-"Format: %2\n"
-"\n"
-"Current old file: %3\n"
-"Current new file: %4\n"
-"\n"
-"Number of hunks: %5\n"
-"Number of differences: %6"
+"Use this to specify the encoding when calling it from the command line. It "
+"will default to the local encoding if not specified."
+msgstr ""
+"Use this to specify the encoding when calling it from the command line. It "
+"will default to the local encoding if not specified."
+
+#: main.cpp:52
+msgid "Kompare"
+msgstr "Kompare"
+
+#: main.cpp:54
+msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
+msgstr "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
+
+#: main.cpp:55 main.cpp:56
+msgid "Author"
+msgstr "Author"
+
+#: main.cpp:57
+msgid "Kompare icon artist"
+msgstr "Kompare icon artist"
+
+#: main.cpp:58
+msgid "A lot of good advice"
+msgstr "A lot of good advice"
+
+#: main.cpp:59
+msgid "Cervisia diff viewer"
+msgstr "Cervisia diff viewer"
+
+#: main.cpp:189
+msgid "Compare these files or folder"
+msgstr "Compare these files or folder"
+
+#: komparepart/komparepartui.rc:4 kompareui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Files"
+
+#: komparepart/komparepartui.rc:13
+#, no-c-format
+msgid "&Difference"
+msgstr "&Difference"
+
+#: komparepart/komparepartui.rc:25 kompareui.rc:14
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "View Settings"
+
+#: komparepart/komparesaveoptionsbase.ui:41
+#, no-c-format
+msgid "Run Diff In"
+msgstr "Run Diff In"
+
+#: komparepart/komparesaveoptionsbase.ui:84
+#, no-c-format
+msgid "Command Line"
+msgstr "Command Line"
+
+#: komparepart/komparesaveoptionsbase.ui:108
+#, no-c-format
+msgid "cd dir && diff -udHprNa -- source destination"
+msgstr "cd dir && diff -udHprNa -- source destination"
+
+#: komparepart/komparesaveoptionsbase.ui:118
+#, fuzzy, no-c-format
+msgid "Options"
+msgstr "O&ptions"
+
+#: komparepart/komparesaveoptionsbase.ui:135
+#, no-c-format
+msgid "Look for smaller changes"
+msgstr "Look for smaller changes"
+
+#: komparepart/komparesaveoptionsbase.ui:146
+#, no-c-format
+msgid "Optimize for large files"
+msgstr "Optimise for large files"
+
+#: komparepart/komparesaveoptionsbase.ui:157
+#, no-c-format
+msgid "Ignore changes in case"
+msgstr "Ignore changes in case"
+
+#: komparepart/komparesaveoptionsbase.ui:165
+#, no-c-format
+msgid "Expand tabs to spaces"
+msgstr "Expand tabs to spaces"
+
+#: komparepart/komparesaveoptionsbase.ui:173
+#, no-c-format
+msgid "Ignore added or removed empty lines"
+msgstr "Ignore added or removed empty lines"
+
+#: komparepart/komparesaveoptionsbase.ui:181
+#, no-c-format
+msgid "Ignore changes in whitespace"
+msgstr "Ignore changes in whitespace"
+
+#: komparepart/komparesaveoptionsbase.ui:189
+#, no-c-format
+msgid "Show function names"
+msgstr "Show function names"
+
+#: komparepart/komparesaveoptionsbase.ui:200
+#, no-c-format
+msgid "Compare folders recursively"
+msgstr "Compare folders recursively"
+
+#: komparepart/komparesaveoptionsbase.ui:211
+#, no-c-format
+msgid "Treat new files as empty"
+msgstr "Treat new files as empty"
+
+#: komparepart/komparesaveoptionsbase.ui:227
+#, no-c-format
+msgid "Format"
+msgstr "Format"
+
+#: komparepart/komparesaveoptionsbase.ui:287
+#, no-c-format
+msgid "Side-by-side"
+msgstr "Side-by-side"
+
+#: kompareui.rc:27
+#, no-c-format
+msgid "Main Toolbar"
 msgstr ""
-"Statistics:\n"
-"\n"
-"Number of files in diff file: %1\n"
-"Format: %2\n"
-"\n"
-"Current old file: %3\n"
-"Current new file: %4\n"
-"\n"
-"Number of hunks: %5\n"
-"Number of differences: %6"