summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTDE Weblate <weblate@mirror.git.trinitydesktop.org>2018-12-31 19:04:42 +0000
committerTDE Weblate <weblate@mirror.git.trinitydesktop.org>2018-12-31 19:04:42 +0000
commit364e0ab2be9e2a9808bf801fec4ac41896d851cd (patch)
tree2e969ec1c11b0bbd483a1fdc118ee0b3ec2446ce
parentb7f2145dc1d95a20a8b90fea337f55d61a85e811 (diff)
downloadtde-i18n-364e0ab2be9e2a9808bf801fec4ac41896d851cd.tar.gz
tde-i18n-364e0ab2be9e2a9808bf801fec4ac41896d851cd.zip
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/
-rw-r--r--tde-i18n-af/messages/tdesdk/kompare.po955
-rw-r--r--tde-i18n-ar/messages/tdesdk/kompare.po961
-rw-r--r--tde-i18n-az/messages/tdesdk/kompare.po835
-rw-r--r--tde-i18n-be/messages/tdesdk/kompare.po1061
-rw-r--r--tde-i18n-bg/messages/tdesdk/kompare.po981
-rw-r--r--tde-i18n-br/messages/tdesdk/kompare.po859
-rw-r--r--tde-i18n-ca/messages/tdesdk/kompare.po1022
-rw-r--r--tde-i18n-cs/messages/tdesdk/kompare.po957
-rw-r--r--tde-i18n-cy/messages/tdesdk/kompare.po841
-rw-r--r--tde-i18n-da/messages/tdesdk/kompare.po1005
-rw-r--r--tde-i18n-de/messages/tdesdk/kompare.po1024
-rw-r--r--tde-i18n-el/messages/tdesdk/kompare.po1015
-rw-r--r--tde-i18n-en_GB/messages/tdesdk/kompare.po1008
-rw-r--r--tde-i18n-es/messages/tdesdk/kompare.po1014
-rw-r--r--tde-i18n-et/messages/tdesdk/kompare.po1015
-rw-r--r--tde-i18n-eu/messages/tdesdk/kompare.po1001
-rw-r--r--tde-i18n-fa/messages/tdesdk/kompare.po981
-rw-r--r--tde-i18n-fi/messages/tdesdk/kompare.po992
-rw-r--r--tde-i18n-fr/messages/tdesdk/kompare.po1031
-rw-r--r--tde-i18n-ga/messages/tdesdk/kompare.po911
-rw-r--r--tde-i18n-gl/messages/tdesdk/kompare.po998
-rw-r--r--tde-i18n-hi/messages/tdesdk/kompare.po937
-rw-r--r--tde-i18n-hr/messages/tdesdk/kompare.po998
-rw-r--r--tde-i18n-hu/messages/tdesdk/kompare.po1000
-rw-r--r--tde-i18n-is/messages/tdesdk/kompare.po970
-rw-r--r--tde-i18n-it/messages/tdesdk/kompare.po1002
-rw-r--r--tde-i18n-ja/messages/tdesdk/kompare.po990
-rw-r--r--tde-i18n-ko/messages/tdesdk/kompare.po1013
-rw-r--r--tde-i18n-lt/messages/tdesdk/kompare.po957
-rw-r--r--tde-i18n-lv/messages/tdesdk/kompare.po830
-rw-r--r--tde-i18n-mk/messages/tdesdk/kompare.po945
-rw-r--r--tde-i18n-ms/messages/tdesdk/kompare.po959
-rw-r--r--tde-i18n-nb/messages/tdesdk/kompare.po992
-rw-r--r--tde-i18n-nds/messages/tdesdk/kompare.po1003
-rw-r--r--tde-i18n-nl/messages/tdesdk/kompare.po1017
-rw-r--r--tde-i18n-pa/messages/tdesdk/kompare.po913
-rw-r--r--tde-i18n-pl/messages/tdesdk/kompare.po1000
-rw-r--r--tde-i18n-pt/messages/tdesdk/kompare.po1017
-rw-r--r--tde-i18n-pt_BR/messages/tdesdk/kompare.po1015
-rw-r--r--tde-i18n-ro/messages/tdesdk/kompare.po821
-rw-r--r--tde-i18n-ru/messages/tdesdk/kompare.po987
-rw-r--r--tde-i18n-rw/messages/tdesdk/kompare.po1042
-rw-r--r--tde-i18n-sk/messages/tdesdk/kompare.po1014
-rw-r--r--tde-i18n-sl/messages/tdesdk/kompare.po995
-rw-r--r--tde-i18n-sr/messages/tdesdk/kompare.po1007
-rw-r--r--tde-i18n-sr@Latn/messages/tdesdk/kompare.po1007
-rw-r--r--tde-i18n-sv/messages/tdesdk/kompare.po1017
-rw-r--r--tde-i18n-ta/messages/tdesdk/kompare.po1035
-rw-r--r--tde-i18n-tg/messages/tdesdk/kompare.po1005
-rw-r--r--tde-i18n-tr/messages/tdesdk/kompare.po951
-rw-r--r--tde-i18n-uk/messages/tdesdk/kompare.po1000
-rw-r--r--tde-i18n-zh_CN/messages/tdesdk/kompare.po956
-rw-r--r--tde-i18n-zh_TW/messages/tdesdk/kompare.po953
53 files changed, 26679 insertions, 25136 deletions
diff --git a/tde-i18n-af/messages/tdesdk/kompare.po b/tde-i18n-af/messages/tdesdk/kompare.po
index 49e48c2855..03667e3736 100644
--- a/tde-i18n-af/messages/tdesdk/kompare.po
+++ b/tde-i18n-af/messages/tdesdk/kompare.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: kompare VERSION\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
"PO-Revision-Date: 2002-11-07 11:40+0200\n"
"Last-Translator: WEB-Translator <http://kde.af.org.za>\n"
"Language-Team: AFRIKAANS <AF@lia.org.za>\n"
@@ -14,323 +14,13 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: libdiff2/komparemodellist.cpp:61
-msgid "&Apply Difference"
-msgstr "Wend aan Verskil"
-
-#: libdiff2/komparemodellist.cpp:64
-msgid "Un&apply Difference"
-msgstr "Herstel Verskil"
-
-#: libdiff2/komparemodellist.cpp:67
-msgid "App&ly All"
-msgstr "Wend aan Alle"
-
-#: libdiff2/komparemodellist.cpp:70
-#, fuzzy
-msgid "&Unapply All"
-msgstr "Herstel Alle"
-
-#: libdiff2/komparemodellist.cpp:73
-msgid "P&revious File"
-msgstr "Vorige Lêer"
-
-#: libdiff2/komparemodellist.cpp:76
-msgid "N&ext File"
-msgstr "Volgende Lêer"
-
-#: libdiff2/komparemodellist.cpp:79
-msgid "&Previous Difference"
-msgstr "Vorige Verskil"
-
-#: libdiff2/komparemodellist.cpp:82
-msgid "&Next Difference"
-msgstr "Volgende Verskil"
-
-#: 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 ""
-
-#: libdiff2/komparemodellist.cpp:246
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:271
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>"
-".</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-#, fuzzy
-msgid "Could not open a temporary file."
-msgstr "Kon nie open lêer."
-
-#: libdiff2/komparemodellist.cpp:350
-#, fuzzy
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr "Kon nie skryf na lêer."
-
-#: libdiff2/komparemodellist.cpp:368
-#, fuzzy
-msgid ""
-"<qt>Could not create destination directory <b>%1</b>.\n"
-"The file has not been saved.</qt>"
-msgstr "Kon nie skryf na lêer."
-
-#: 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 ""
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-msgid "Could not parse diff output."
-msgstr "Kon nie lees diff uitset."
-
-#: libdiff2/komparemodellist.cpp:451
-msgid "The files are identical."
-msgstr "Die lêers word identies."
-
-#: libdiff2/komparemodellist.cpp:613
-#, fuzzy
-msgid "Could not write to the temporary file."
-msgstr "Kon nie skryf na lêer."
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, no-c-format
-msgid "&Difference"
-msgstr "Verskil"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, no-c-format
-msgid "Run Diff In"
-msgstr "Hardloop Diff In"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, no-c-format
-msgid "Command Line"
-msgstr "Opdrag Lyn"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 108
-#: rc.cpp:27
-#, no-c-format
-msgid "cd dir && diff -udHprNa -- source destination"
-msgstr "cd gids && diff -udHprNa -- bron bestemming"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, no-c-format
-msgid "Look for smaller changes"
-msgstr "Kyk vir kleiner verander"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, no-c-format
-msgid "Optimize for large files"
-msgstr "Optimiseer vir groot lêers"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, no-c-format
-msgid "Ignore changes in case"
-msgstr "Ignoreer verander in kas"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, no-c-format
-msgid "Expand tabs to spaces"
-msgstr "Vergroot oortjies na spasies"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
-#: rc.cpp:45
-#, no-c-format
-msgid "Ignore added or removed empty lines"
-msgstr "Ignoreer bygevoeg of verwyder leeg lyne"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr "Ignoreer verander in spasie"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, no-c-format
-msgid "Show function names"
-msgstr "Vertoon funksie name"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, fuzzy, no-c-format
-msgid "Compare folders recursively"
-msgstr "Vergelyk gidse rekursief"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
-#: rc.cpp:57
-#, no-c-format
-msgid "Treat new files as empty"
-msgstr "Behandel nuwe lêers as leeg"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
-#: rc.cpp:60
-#, no-c-format
-msgid "Format"
-msgstr "Formaat"
-
-#. 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 "Konteks"
-
-#. 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 "Normale"
-
-#. 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 "Vereenselwig"
-
-#. 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 "Nommer van konteks lyne:"
-
-#: main.cpp:33
-#, fuzzy
-msgid ""
-"A program to view the differences between files and optionally generate a diff"
-msgstr ""
-"'n program na besigtig die verskille tussen lêers en optioneel genereer 'n "
-"diff."
-
-#: main.cpp:39
-msgid "This will compare URL1 with URL2"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: main.cpp:42
-msgid ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
-msgstr ""
-
-#: 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 ""
-
-#: main.cpp:52
-msgid "Kompare"
-msgstr "K-vergelyk"
-
-#: main.cpp:54
-msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
-msgstr ""
-
-#: main.cpp:55 main.cpp:56
-msgid "Author"
-msgstr ""
-
-#: main.cpp:57
-#, fuzzy
-msgid "Kompare icon artist"
-msgstr "K-vergelyk-deel"
-
-#: main.cpp:58
-msgid "A lot of good advice"
-msgstr ""
-
-#: main.cpp:59
-msgid "Cervisia diff viewer"
-msgstr ""
-
-#: kompare_shell.cpp:398 main.cpp:185
-#, fuzzy
-msgid "Compare Files or Folders"
-msgstr "Vergelyk Lêers of Gidse"
-
-#: kompare_shell.cpp:399 main.cpp:186
-msgid "Source"
-msgstr "Bron"
-
-#: kompare_shell.cpp:400 main.cpp:187
-msgid "Destination"
-msgstr "Bestemming"
-
-#: kompare_shell.cpp:402 main.cpp:189
-msgid "Compare"
-msgstr "Vergelyk"
-
-#: main.cpp:189
-#, fuzzy
-msgid "Compare these files or folder"
-msgstr "Vergelyk hierdie lêers of gidse"
-
-#: kompare_shell.cpp:402 main.cpp:189
-#, fuzzy
-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 ""
-"As jy het ingevoerde 2 lêername van 2 gidse in die velde in hierdie dialoog dan "
-"word hierdie knoppie sal wees geaktiveer en gedruk dit sal begin 'n vergelyking "
-"van die ingevoerde lêers van gidse. "
-
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "WEB-Vertaler (http://kde.af.org.za)"
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -444,21 +134,49 @@ msgstr ""
#: kompare_shell.cpp:373
#, fuzzy
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 ""
-"As jy het ingevoerde 2 lêername van 2 gidse in die velde in hierdie dialoog dan "
-"word hierdie knoppie sal wees geaktiveer en gedruk dit sal begin 'n vergelyking "
-"van die ingevoerde lêers van gidse. "
+"As jy het ingevoerde 2 lêername van 2 gidse in die velde in hierdie dialoog "
+"dan word hierdie knoppie sal wees geaktiveer en gedruk dit sal begin 'n "
+"vergelyking van die ingevoerde lêers van gidse. "
+
+#: kompare_shell.cpp:398 main.cpp:185
+#, fuzzy
+msgid "Compare Files or Folders"
+msgstr "Vergelyk Lêers of Gidse"
+
+#: kompare_shell.cpp:399 main.cpp:186
+msgid "Source"
+msgstr "Bron"
+
+#: kompare_shell.cpp:400 main.cpp:187
+msgid "Destination"
+msgstr "Bestemming"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
+msgstr "Vergelyk"
#: kompare_shell.cpp:402
#, fuzzy
msgid "Compare these files or folders"
msgstr "Vergelyk hierdie lêers of gidse"
+#: kompare_shell.cpp:402 main.cpp:189
+#, fuzzy
+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 ""
+"As jy het ingevoerde 2 lêername van 2 gidse in die velde in hierdie dialoog "
+"dan word hierdie knoppie sal wees geaktiveer en gedruk dit sal begin 'n "
+"vergelyking van die ingevoerde lêers van gidse. "
+
#: kompare_shell.cpp:439
msgid "Text View"
msgstr "Teks Besigtig"
@@ -552,19 +270,236 @@ msgstr "Onbekende"
msgid "KompareNavTreePart"
msgstr ""
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
+#: komparepart/kompare_part.cpp:165
+msgid "Save &All"
+msgstr "Stoor Alle"
+
+#: komparepart/kompare_part.cpp:168
+#, fuzzy
+msgid "Save .&diff..."
+msgstr "Stoor .diff"
+
+#: komparepart/kompare_part.cpp:171
+msgid "Swap Source with Destination"
+msgstr "Uitruil Bron met Bestemming"
+
+#: komparepart/kompare_part.cpp:174
+msgid "Show Statistics"
+msgstr "Vertoon Statistieke"
+
+#: komparepart/kompare_part.cpp:269
+msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:281
+msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
msgstr ""
+#: komparepart/kompare_part.cpp:425
+msgid "Diff Options"
+msgstr "Diff Opsies"
+
+#: komparepart/kompare_part.cpp:443
+msgid "*.diff *.dif *.patch|Patch Files"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:443
+msgid "Save .diff"
+msgstr "Stoor .diff"
+
+#: komparepart/kompare_part.cpp:446
+msgid "The file exists or is write-protected; do you want to overwrite it?"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:446
+msgid "File Exists"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:446
+msgid "Overwrite"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:446
+msgid "Do Not Overwrite"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:481
+msgid "KomparePart"
+msgstr "K-vergelyk-deel"
+
+#: komparepart/kompare_part.cpp:493
+msgid "Running diff..."
+msgstr "Wat loop diff..."
+
+#: komparepart/kompare_part.cpp:496
+#, fuzzy
+msgid "Parsing diff output..."
+msgstr "Verwerking diff..."
+
+#: komparepart/kompare_part.cpp:545
+#, fuzzy
+msgid "Comparing file %1 with file %2"
+msgstr "Vergelyk lêers in %1 met lêers in %2"
+
+#: komparepart/kompare_part.cpp:550
+msgid "Comparing files in %1 with files in %2"
+msgstr "Vergelyk lêers in %1 met lêers in %2"
+
+#: komparepart/kompare_part.cpp:555
+#, fuzzy, c-format
+msgid "Viewing diff output from %1"
+msgstr "Verwerking diff..."
+
+#: komparepart/kompare_part.cpp:558
+msgid "Blending diff output from %1 into file %2"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:563
+#, fuzzy
+msgid "Blending diff output from %1 into folder %2"
+msgstr "Verwerking diff..."
+
+#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709
+#, fuzzy
+msgid ""
+"You have made changes to the destination file(s).\n"
+"Would you like to save them?"
+msgstr ""
+"Jy het gemaak verander na die bestemming.\n"
+"Sal Jy hou van na stoor hulle?"
+
+#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+msgid "Save Changes?"
+msgstr "Stoor Verander?"
+
+#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276
+#: libdialogpages/diffpage.cpp:244
+#, no-c-format
+msgid "Unified"
+msgstr "Vereenselwig"
+
+#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244
+#: libdialogpages/diffpage.cpp:238
+#, no-c-format
+msgid "Context"
+msgstr "Konteks"
+
+#: 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 "Normale"
+
+#: komparepart/kompare_part.cpp:667
+msgid ""
+"No diff file, or no 2 files have been diffed. Therefore no stats are "
+"available."
+msgstr ""
+"Nee diff lêer, of Nee 2 lêers het al gediff. Daarom Nee statistiek word "
+"beskikbaar."
+
+#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
+#: komparepart/kompare_part.cpp:698
+msgid "Diff Statistics"
+msgstr "Diff Statistieke"
+
+#: 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 ""
+"Statistieke:\n"
+"\n"
+"Ou lêer: %1\n"
+"Nuwe lêer: %2\n"
+"\n"
+"Formaat: %3\n"
+"Nommer van hunks: %4\n"
+"Nommer van verskille: %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 ""
+"Statistieke:\n"
+"\n"
+"Nommer van lêers in diff lêer: %1\n"
+"Formaat: %2\n"
+"\n"
+"Huidige ou lêer: %3\n"
+"Huidige nuwe lêer: %4\n"
+"\n"
+"Nommer van hunks: %5\n"
+"Nommer van verskille: %6"
+
+#: komparepart/kompareprefdlg.cpp:33
+msgid "Preferences"
+msgstr "Voorkeure"
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View"
+msgstr "Teks Besigtig"
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View Settings"
+msgstr "Diff Instellings"
+
#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
msgid "Diff"
msgstr "Diff"
+#: komparepart/kompareprefdlg.cpp:43
+msgid "Diff Settings"
+msgstr "Diff Instellings"
+
+#: kompareurldialog.cpp:41
+#, fuzzy
+msgid "Files"
+msgstr "Volgende Lêer"
+
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr ""
+
#: kompareurldialog.cpp:47
msgid "Here you can change the options for comparing the files."
msgstr ""
#: kompareurldialog.cpp:53
+#, fuzzy
+msgid "Appearance"
+msgstr "Voorkoms"
+
+#: kompareurldialog.cpp:53
msgid "Here you can change the options for the view."
msgstr ""
@@ -590,15 +525,20 @@ msgstr "Uitset Formaat"
#: 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 ""
#: libdialogpages/diffpage.cpp:247
msgid "Lines of Context"
msgstr "Lyne van Konteks"
+#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251
+#, no-c-format
+msgid "Number of context lines:"
+msgstr "Nommer van konteks lyne:"
+
#: libdialogpages/diffpage.cpp:253
msgid ""
"The number of context lines is normally 2 or 3. This makes the diff readable "
@@ -719,14 +659,14 @@ msgstr ""
#: 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 ""
#: 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 ""
#: libdialogpages/diffpage.cpp:338
@@ -740,14 +680,14 @@ 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 ""
#: 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 ""
#: libdialogpages/diffpage.cpp:352
@@ -816,176 +756,262 @@ msgstr ""
msgid "Size:"
msgstr ""
-#: komparepart/kompareprefdlg.cpp:33
-msgid "Preferences"
-msgstr "Voorkeure"
+#: libdialogpages/viewpage.cpp:119
+msgid "&Fonts"
+msgstr ""
-#: komparepart/kompareprefdlg.cpp:39
+#: libdiff2/komparemodellist.cpp:61
+msgid "&Apply Difference"
+msgstr "Wend aan Verskil"
+
+#: libdiff2/komparemodellist.cpp:64
+msgid "Un&apply Difference"
+msgstr "Herstel Verskil"
+
+#: libdiff2/komparemodellist.cpp:67
+msgid "App&ly All"
+msgstr "Wend aan Alle"
+
+#: libdiff2/komparemodellist.cpp:70
#, fuzzy
-msgid "View Settings"
-msgstr "Diff Instellings"
+msgid "&Unapply All"
+msgstr "Herstel Alle"
-#: komparepart/kompareprefdlg.cpp:43
-msgid "Diff Settings"
-msgstr "Diff Instellings"
+#: libdiff2/komparemodellist.cpp:73
+msgid "P&revious File"
+msgstr "Vorige Lêer"
-#: komparepart/kompare_part.cpp:165
-msgid "Save &All"
-msgstr "Stoor Alle"
+#: libdiff2/komparemodellist.cpp:76
+msgid "N&ext File"
+msgstr "Volgende Lêer"
-#: komparepart/kompare_part.cpp:168
+#: libdiff2/komparemodellist.cpp:79
+msgid "&Previous Difference"
+msgstr "Vorige Verskil"
+
+#: libdiff2/komparemodellist.cpp:82
+msgid "&Next Difference"
+msgstr "Volgende Verskil"
+
+#: 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 ""
+
+#: libdiff2/komparemodellist.cpp:246
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
+"qt>"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:271
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>."
+"</qt>"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
#, fuzzy
-msgid "Save .&diff..."
-msgstr "Stoor .diff"
+msgid "Could not open a temporary file."
+msgstr "Kon nie open lêer."
-#: komparepart/kompare_part.cpp:171
-msgid "Swap Source with Destination"
-msgstr "Uitruil Bron met Bestemming"
+#: libdiff2/komparemodellist.cpp:350
+#, fuzzy
+msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+msgstr "Kon nie skryf na lêer."
-#: komparepart/kompare_part.cpp:174
-msgid "Show Statistics"
-msgstr "Vertoon Statistieke"
+#: libdiff2/komparemodellist.cpp:368
+#, fuzzy
+msgid ""
+"<qt>Could not create destination directory <b>%1</b>.\n"
+"The file has not been saved.</qt>"
+msgstr "Kon nie skryf na lêer."
-#: komparepart/kompare_part.cpp:269
-msgid "<qt>The URL <b>%1</b> cannot be downloaded.</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 ""
-#: komparepart/kompare_part.cpp:281
-msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
+msgid "Could not parse diff output."
+msgstr "Kon nie lees diff uitset."
+
+#: libdiff2/komparemodellist.cpp:451
+msgid "The files are identical."
+msgstr "Die lêers word identies."
+
+#: libdiff2/komparemodellist.cpp:613
+#, fuzzy
+msgid "Could not write to the temporary file."
+msgstr "Kon nie skryf na lêer."
+
+#: main.cpp:33
+#, fuzzy
+msgid ""
+"A program to view the differences between files and optionally generate a "
+"diff"
msgstr ""
+"'n program na besigtig die verskille tussen lêers en optioneel genereer 'n "
+"diff."
-#: komparepart/kompare_part.cpp:425
-msgid "Diff Options"
-msgstr "Diff Opsies"
+#: main.cpp:39
+msgid "This will compare URL1 with URL2"
+msgstr ""
-#: komparepart/kompare_part.cpp:443
-msgid "*.diff *.dif *.patch|Patch Files"
+#: 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 ""
-#: komparepart/kompare_part.cpp:443
-msgid "Save .diff"
-msgstr "Stoor .diff"
+#: 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 ""
-#: komparepart/kompare_part.cpp:446
-msgid "The file exists or is write-protected; do you want to overwrite it?"
+#: main.cpp:42
+msgid ""
+"Disables the check for automatically finding the original file(s) when using "
+"'-' as URL with the -o option."
msgstr ""
-#: komparepart/kompare_part.cpp:446
-msgid "File Exists"
+#: 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 ""
-#: komparepart/kompare_part.cpp:446
-msgid "Overwrite"
+#: main.cpp:52
+msgid "Kompare"
+msgstr "K-vergelyk"
+
+#: main.cpp:54
+msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
msgstr ""
-#: komparepart/kompare_part.cpp:446
-msgid "Do Not Overwrite"
+#: main.cpp:55 main.cpp:56
+msgid "Author"
msgstr ""
-#: komparepart/kompare_part.cpp:481
-msgid "KomparePart"
+#: main.cpp:57
+#, fuzzy
+msgid "Kompare icon artist"
msgstr "K-vergelyk-deel"
-#: komparepart/kompare_part.cpp:493
-msgid "Running diff..."
-msgstr "Wat loop diff..."
+#: main.cpp:58
+msgid "A lot of good advice"
+msgstr ""
-#: komparepart/kompare_part.cpp:496
-#, fuzzy
-msgid "Parsing diff output..."
-msgstr "Verwerking diff..."
+#: main.cpp:59
+msgid "Cervisia diff viewer"
+msgstr ""
-#: komparepart/kompare_part.cpp:545
+#: main.cpp:189
#, fuzzy
-msgid "Comparing file %1 with file %2"
-msgstr "Vergelyk lêers in %1 met lêers in %2"
+msgid "Compare these files or folder"
+msgstr "Vergelyk hierdie lêers of gidse"
-#: komparepart/kompare_part.cpp:550
-msgid "Comparing files in %1 with files in %2"
-msgstr "Vergelyk lêers in %1 met lêers in %2"
+#: komparepart/komparepartui.rc:4 kompareui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Volgende Lêer"
-#: komparepart/kompare_part.cpp:555
-#, fuzzy, c-format
-msgid "Viewing diff output from %1"
-msgstr "Verwerking diff..."
+#: komparepart/komparepartui.rc:13
+#, no-c-format
+msgid "&Difference"
+msgstr "Verskil"
-#: komparepart/kompare_part.cpp:558
-msgid "Blending diff output from %1 into file %2"
-msgstr ""
+#: komparepart/komparepartui.rc:25 kompareui.rc:14
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Diff Instellings"
-#: komparepart/kompare_part.cpp:563
-#, fuzzy
-msgid "Blending diff output from %1 into folder %2"
-msgstr "Verwerking diff..."
+#: komparepart/komparesaveoptionsbase.ui:41
+#, no-c-format
+msgid "Run Diff In"
+msgstr "Hardloop Diff In"
-#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709
-#, fuzzy
-msgid ""
-"You have made changes to the destination file(s).\n"
-"Would you like to save them?"
-msgstr ""
-"Jy het gemaak verander na die bestemming.\n"
-"Sal Jy hou van na stoor hulle?"
+#: komparepart/komparesaveoptionsbase.ui:84
+#, no-c-format
+msgid "Command Line"
+msgstr "Opdrag Lyn"
-#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
-msgid "Save Changes?"
-msgstr "Stoor Verander?"
+#: komparepart/komparesaveoptionsbase.ui:108
+#, no-c-format
+msgid "cd dir && diff -udHprNa -- source destination"
+msgstr "cd gids && diff -udHprNa -- bron bestemming"
-#: komparepart/kompare_part.cpp:667
-msgid ""
-"No diff file, or no 2 files have been diffed. Therefore no stats are available."
-msgstr ""
-"Nee diff lêer, of Nee 2 lêers het al gediff. Daarom Nee statistiek word "
-"beskikbaar."
+#: komparepart/komparesaveoptionsbase.ui:118
+#, fuzzy, no-c-format
+msgid "Options"
+msgstr "Opsies"
-#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
-#: komparepart/kompare_part.cpp:698
-msgid "Diff Statistics"
-msgstr "Diff Statistieke"
+#: komparepart/komparesaveoptionsbase.ui:135
+#, no-c-format
+msgid "Look for smaller changes"
+msgstr "Kyk vir kleiner verander"
-#: 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 ""
-"Statistieke:\n"
-"\n"
-"Ou lêer: %1\n"
-"Nuwe lêer: %2\n"
-"\n"
-"Formaat: %3\n"
-"Nommer van hunks: %4\n"
-"Nommer van verskille: %5"
+#: komparepart/komparesaveoptionsbase.ui:146
+#, no-c-format
+msgid "Optimize for large files"
+msgstr "Optimiseer vir groot lêers"
-#: 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"
+#: komparepart/komparesaveoptionsbase.ui:157
+#, no-c-format
+msgid "Ignore changes in case"
+msgstr "Ignoreer verander in kas"
+
+#: komparepart/komparesaveoptionsbase.ui:165
+#, no-c-format
+msgid "Expand tabs to spaces"
+msgstr "Vergroot oortjies na spasies"
+
+#: komparepart/komparesaveoptionsbase.ui:173
+#, no-c-format
+msgid "Ignore added or removed empty lines"
+msgstr "Ignoreer bygevoeg of verwyder leeg lyne"
+
+#: komparepart/komparesaveoptionsbase.ui:181
+#, no-c-format
+msgid "Ignore changes in whitespace"
+msgstr "Ignoreer verander in spasie"
+
+#: komparepart/komparesaveoptionsbase.ui:189
+#, no-c-format
+msgid "Show function names"
+msgstr "Vertoon funksie name"
+
+#: komparepart/komparesaveoptionsbase.ui:200
+#, fuzzy, no-c-format
+msgid "Compare folders recursively"
+msgstr "Vergelyk gidse rekursief"
+
+#: komparepart/komparesaveoptionsbase.ui:211
+#, no-c-format
+msgid "Treat new files as empty"
+msgstr "Behandel nuwe lêers as leeg"
+
+#: komparepart/komparesaveoptionsbase.ui:227
+#, no-c-format
+msgid "Format"
+msgstr "Formaat"
+
+#: 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 ""
-"Statistieke:\n"
-"\n"
-"Nommer van lêers in diff lêer: %1\n"
-"Formaat: %2\n"
-"\n"
-"Huidige ou lêer: %3\n"
-"Huidige nuwe lêer: %4\n"
-"\n"
-"Nommer van hunks: %5\n"
-"Nommer van verskille: %6"
#~ msgid "%1"
#~ msgstr "%1"
@@ -1041,7 +1067,8 @@ msgstr ""
#~ "K-vergelyk sal vergelyk hulle."
#~ msgid "Too many arguments given. Kompare accepts a maximum of 2 arguments."
-#~ msgstr "Te veel argumente gegewe. K-vergelyk aanvaar 'n maksimum van 2 argumente."
+#~ msgstr ""
+#~ "Te veel argumente gegewe. K-vergelyk aanvaar 'n maksimum van 2 argumente."
#~ msgid "You can not compare a directory with a file"
#~ msgstr "Jy kan nie vergelyk 'n gids met 'n lêer"
diff --git a/tde-i18n-ar/messages/tdesdk/kompare.po b/tde-i18n-ar/messages/tdesdk/kompare.po
index f6d25467b3..b40c220fe1 100644
--- a/tde-i18n-ar/messages/tdesdk/kompare.po
+++ b/tde-i18n-ar/messages/tdesdk/kompare.po
@@ -6,7 +6,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: 2004-04-22 20:01+0400\n"
"Last-Translator: Ahmad M. Zawawi <azawawi@emirates.net.ae>\n"
"Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -16,322 +16,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.0.2\n"
-#: libdiff2/komparemodellist.cpp:61
-msgid "&Apply Difference"
-msgstr "تطبيق الاختلاف"
-
-#: libdiff2/komparemodellist.cpp:64
-msgid "Un&apply Difference"
-msgstr "إلغاء تطبيق الاختلاف"
-
-#: libdiff2/komparemodellist.cpp:67
-msgid "App&ly All"
-msgstr "تطبيق الكل"
-
-#: libdiff2/komparemodellist.cpp:70
-msgid "&Unapply All"
-msgstr "إ&لغ كل التطبيقات"
-
-#: libdiff2/komparemodellist.cpp:73
-msgid "P&revious File"
-msgstr "الملف السابق"
-
-#: libdiff2/komparemodellist.cpp:76
-msgid "N&ext File"
-msgstr "الملف التالي"
-
-#: libdiff2/komparemodellist.cpp:79
-msgid "&Previous Difference"
-msgstr "التغيّر السابق"
-
-#: libdiff2/komparemodellist.cpp:82
-msgid "&Next Difference"
-msgstr "التغيّّر التالي"
-
-#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
-#, fuzzy
-msgid ""
-"<qt>No models or no differences, this file: <b>%1</b>"
-", is not a valid diff file.</qt>"
-msgstr "لا أو لا ليس أ"
-
-#: libdiff2/komparemodellist.cpp:246
-#, fuzzy
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>"
-msgstr "هناك إلى."
-
-#: libdiff2/komparemodellist.cpp:271
-#, fuzzy
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>"
-".</qt>"
-msgstr "هناك إلى."
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-msgid "Could not open a temporary file."
-msgstr "فشل فتح ملف مؤقَت."
-
-#: libdiff2/komparemodellist.cpp:350
-#, fuzzy
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr "فشل الكتابة إلى الملف المؤقَت."
-
-#: libdiff2/komparemodellist.cpp:368
-#, fuzzy
-msgid ""
-"<qt>Could not create destination directory <b>%1</b>.\n"
-"The file has not been saved.</qt>"
-msgstr "فشل الكتابة إلى الملف المؤقَت."
-
-#: libdiff2/komparemodellist.cpp:383
-#, fuzzy
-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 "يمكن أن ليس إلى الـ أنت نسخ إلى يمين."
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-msgid "Could not parse diff output."
-msgstr "فشل إعراب مخرجات الإختلافات."
-
-#: libdiff2/komparemodellist.cpp:451
-msgid "The files are identical."
-msgstr "هذه الملفات متطابقة."
-
-#: libdiff2/komparemodellist.cpp:613
-msgid "Could not write to the temporary file."
-msgstr "فشل الكتابة إلى الملف المؤقَت."
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, no-c-format
-msgid "&Difference"
-msgstr "اختلاف"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, no-c-format
-msgid "Run Diff In"
-msgstr "تشغيل الاختلافات داخل"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, no-c-format
-msgid "Command Line"
-msgstr "سطر الأوامر"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 108
-#: rc.cpp:27
-#, fuzzy, no-c-format
-msgid "cd dir && diff -udHprNa -- source destination"
-msgstr "فتح مصدر"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, no-c-format
-msgid "Look for smaller changes"
-msgstr "ابحث على تغيرات أصغر"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, no-c-format
-msgid "Optimize for large files"
-msgstr "إجر التحسينات المثلى للملفات الكبيرة"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, no-c-format
-msgid "Ignore changes in case"
-msgstr "تجاهل الاختلاف في حالة"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, no-c-format
-msgid "Expand tabs to spaces"
-msgstr "توسيع علامات الجدولة إلى فراغات"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
-#: rc.cpp:45
-#, no-c-format
-msgid "Ignore added or removed empty lines"
-msgstr "تجاهل الأسطر الفارغة المضافة أو المزالة"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr "تجاهل التغييرات في المسافة البيضاء"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, no-c-format
-msgid "Show function names"
-msgstr "اظهر أسماء الدوال"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, no-c-format
-msgid "Compare folders recursively"
-msgstr "مقارنة المجلدات بشكل متكرر"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
-#: rc.cpp:57
-#, no-c-format
-msgid "Treat new files as empty"
-msgstr "معاملة الملفات الجديدة كفارغة"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
-#: rc.cpp:60
-#, no-c-format
-msgid "Format"
-msgstr "هيئة"
-
-#. 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 "سياق"
-
-#. 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 "عادي"
-
-#. 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 "موحّد"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
-#: rc.cpp:78
-#, no-c-format
-msgid "Side-by-side"
-msgstr "جنبًا إلى جنبًا"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
-#: libdialogpages/diffpage.cpp:251 rc.cpp:81
-#, no-c-format
-msgid "Number of context lines:"
-msgstr "عدد سطور السَياق:"
-
-#: main.cpp:33
-#, fuzzy
-msgid ""
-"A program to view the differences between files and optionally generate a diff"
-msgstr "برنامج لعرض الإختلافات بين ملفات و دلائل و تكوين ملف إخلاف diff."
-
-#: main.cpp:39
-#, fuzzy
-msgid "This will compare URL1 with URL2"
-msgstr "هذا سيقارن الموقع 1 مع الموقع 2."
-
-#: main.cpp:40
-#, fuzzy
-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 "هذا فتح و إلى أ و من يمكن أن لـ لـ o Kompare أ إلى بحث ث و ث و بوصة ل."
-
-#: main.cpp:41
-#, fuzzy
-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 "هذا إلى و أو إلى "
-
-#: main.cpp:42
-#, fuzzy
-msgid ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
-msgstr "يعطّل لـ ث URL مع o."
-
-#: 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 ""
-
-#: main.cpp:52
-msgid "Kompare"
-msgstr "Kompare"
-
-#: main.cpp:54
-#, fuzzy
-msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
-msgstr "الحقوق محفوظة 2001_2003، جون فايربو وأوتو بروجمان"
-
-#: main.cpp:55 main.cpp:56
-msgid "Author"
-msgstr "المؤلف"
-
-#: main.cpp:57
-#, fuzzy
-msgid "Kompare icon artist"
-msgstr "برنامج KomparePart"
-
-#: main.cpp:58
-msgid "A lot of good advice"
-msgstr "كثيراَ من النصيحة الجيَدة"
-
-#: main.cpp:59
-msgid "Cervisia diff viewer"
-msgstr "عارض الإختلافات Cervisia"
-
-#: kompare_shell.cpp:398 main.cpp:185
-msgid "Compare Files or Folders"
-msgstr "مقارنة ملفات أو مجلدات"
-
-#: kompare_shell.cpp:399 main.cpp:186
-msgid "Source"
-msgstr "المصدر"
-
-#: kompare_shell.cpp:400 main.cpp:187
-msgid "Destination"
-msgstr "الهدف"
-
-#: kompare_shell.cpp:402 main.cpp:189
-msgid "Compare"
-msgstr "قارن"
-
-#: main.cpp:189
-msgid "Compare these files or folder"
-msgstr "مقارنة هذه الملفَات أو المجلَد"
-
-#: kompare_shell.cpp:402 main.cpp:189
-#, fuzzy
-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 "إذا أو بوصة بوصة حوار مفعل و بدء أ من أو "
-
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Isam Bayazidi, Nuriddin Aminagha,أحمد محمد زواوي"
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -437,19 +128,43 @@ msgstr "إخلط هذا الملف أو المجلَد مع مخرجات الإ
#: kompare_shell.cpp:373
#, fuzzy
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 ""
-"إذا أ أو اسم و أ يحوي بوصة بوصة حوار مفعل و فتح ث من أو من مع تطبيق ث إلى أ أو "
-"إلى "
+"إذا أ أو اسم و أ يحوي بوصة بوصة حوار مفعل و فتح ث من أو من مع تطبيق ث إلى أ "
+"أو إلى "
+
+#: kompare_shell.cpp:398 main.cpp:185
+msgid "Compare Files or Folders"
+msgstr "مقارنة ملفات أو مجلدات"
+
+#: kompare_shell.cpp:399 main.cpp:186
+msgid "Source"
+msgstr "المصدر"
+
+#: kompare_shell.cpp:400 main.cpp:187
+msgid "Destination"
+msgstr "الهدف"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
+msgstr "قارن"
#: kompare_shell.cpp:402
msgid "Compare these files or folders"
msgstr "قارن هذه الملفَات أو المجلَدات"
+#: kompare_shell.cpp:402 main.cpp:189
+#, fuzzy
+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 "إذا أو بوصة بوصة حوار مفعل و بدء أ من أو "
+
#: kompare_shell.cpp:439
msgid "Text View"
msgstr "مشهد النص"
@@ -533,19 +248,234 @@ msgstr "مجهزل"
msgid "KompareNavTreePart"
msgstr ""
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
+#: komparepart/kompare_part.cpp:165
+msgid "Save &All"
+msgstr "حفظ ال&كل"
+
+#: komparepart/kompare_part.cpp:168
+#, fuzzy
+msgid "Save .&diff..."
+msgstr "حفظ الإ&ختلافات"
+
+#: komparepart/kompare_part.cpp:171
+msgid "Swap Source with Destination"
+msgstr "تبديل المصدر مع الهدف"
+
+#: komparepart/kompare_part.cpp:174
+msgid "Show Statistics"
+msgstr "عرض الإحصائيات"
+
+#: komparepart/kompare_part.cpp:269
+#, fuzzy
+msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+msgstr "عنوان الموقع %1 لا يمكن تحميله."
+
+#: komparepart/kompare_part.cpp:281
+#, fuzzy
+msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+msgstr "عنوان الموقع %1 غير موجود على نظامك."
+
+#: komparepart/kompare_part.cpp:425
+msgid "Diff Options"
+msgstr "خيارات الاختلافات"
+
+#: komparepart/kompare_part.cpp:443
+#, fuzzy
+msgid "*.diff *.dif *.patch|Patch Files"
+msgstr "*.diff *.dif *.patch | ملفات الرقعة"
+
+#: komparepart/kompare_part.cpp:443
+msgid "Save .diff"
+msgstr "حفظ الإختلافات"
+
+#: komparepart/kompare_part.cpp:446
+msgid "The file exists or is write-protected; do you want to overwrite it?"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:446
+msgid "File Exists"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:446
+msgid "Overwrite"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:446
+msgid "Do Not Overwrite"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:481
+msgid "KomparePart"
+msgstr "برنامج KomparePart"
+
+#: komparepart/kompare_part.cpp:493
+msgid "Running diff..."
+msgstr "جاري البحث عن الإختلافات..."
+
+#: komparepart/kompare_part.cpp:496
+msgid "Parsing diff output..."
+msgstr "جاري إعراب مخرجات الإختلافات..."
+
+#: komparepart/kompare_part.cpp:545
+msgid "Comparing file %1 with file %2"
+msgstr "جاري مقارنة الملف %1 مع الملف %2"
+
+#: komparepart/kompare_part.cpp:550
+msgid "Comparing files in %1 with files in %2"
+msgstr "جاري مقارنة الملفات في %1 مع الملفات في %2"
+
+#: komparepart/kompare_part.cpp:555
+#, c-format
+msgid "Viewing diff output from %1"
+msgstr "جاري عرض مخرجات الإختلافات من %1"
+
+#: komparepart/kompare_part.cpp:558
+msgid "Blending diff output from %1 into file %2"
+msgstr "جاري مزج مخرجات الإختلافات من %1 إلى الملف %2"
+
+#: komparepart/kompare_part.cpp:563
+msgid "Blending diff output from %1 into folder %2"
+msgstr "جاري مزج مخرجات الإختلافات من %1 إلى المجلَد %2"
+
+#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709
+#, fuzzy
+msgid ""
+"You have made changes to the destination file(s).\n"
+"Would you like to save them?"
msgstr ""
+"لقد أحدثت تغييرات على الهدف\n"
+"هل تريد حفظهم؟"
+
+#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+msgid "Save Changes?"
+msgstr "حفظ التغييرات؟"
+
+#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276
+#: libdialogpages/diffpage.cpp:244
+#, no-c-format
+msgid "Unified"
+msgstr "موحّد"
+
+#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244
+#: libdialogpages/diffpage.cpp:238
+#, no-c-format
+msgid "Context"
+msgstr "سياق"
+
+#: 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 "عادي"
+
+#: komparepart/kompare_part.cpp:667
+msgid ""
+"No diff file, or no 2 files have been diffed. Therefore no stats are "
+"available."
+msgstr ""
+"لا تتوفر أي إحصاءات إما لعدم وجود ملف الإختلافات، أو لعدم مقارنة أي ملفين."
+
+#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
+#: komparepart/kompare_part.cpp:698
+msgid "Diff Statistics"
+msgstr "إحصائيات الاختلافات"
+
+#: 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 ""
+"إحصائيات:\n"
+"\n"
+"ملف قديم: %1\n"
+"ملف جديد: %2\n"
+"\n"
+"هيئة: %3\n"
+"عدد الكتل: %4\n"
+"عدد الإختلافات: %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 ""
+"إحصائيات:\n"
+"\n"
+"عدد الملفات في ملف الإختلافات: %1\n"
+"هيئة: %2\n"
+"\n"
+"الملف القديم الحالي: %3\n"
+"الملف الجديد الحالي: %4\n"
+"\n"
+"عدد الكتل: %5\n"
+"عدد الإختلافات: %6"
+
+#: komparepart/kompareprefdlg.cpp:33
+msgid "Preferences"
+msgstr "خصائص"
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View"
+msgstr "مشهد النص"
+
+#: komparepart/kompareprefdlg.cpp:39
+msgid "View Settings"
+msgstr "عرض الإعدادات"
#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
msgid "Diff"
msgstr "الاختلافات"
+#: komparepart/kompareprefdlg.cpp:43
+msgid "Diff Settings"
+msgstr "إعدادات الاختلافات"
+
+#: kompareurldialog.cpp:41
+#, fuzzy
+msgid "Files"
+msgstr "الملف التالي"
+
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr ""
+
#: kompareurldialog.cpp:47
msgid "Here you can change the options for comparing the files."
msgstr ""
#: kompareurldialog.cpp:53
+#, fuzzy
+msgid "Appearance"
+msgstr "المظهر"
+
+#: kompareurldialog.cpp:53
msgid "Here you can change the options for the view."
msgstr ""
@@ -570,15 +500,20 @@ msgstr "هيئة المخرجات"
#: 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 ""
#: libdialogpages/diffpage.cpp:247
msgid "Lines of Context"
msgstr "خطوط السَياق"
+#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251
+#, no-c-format
+msgid "Number of context lines:"
+msgstr "عدد سطور السَياق:"
+
#: libdialogpages/diffpage.cpp:253
msgid ""
"The number of context lines is normally 2 or 3. This makes the diff readable "
@@ -699,14 +634,14 @@ msgstr ""
#: 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 ""
#: 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 ""
#: libdialogpages/diffpage.cpp:338
@@ -720,14 +655,14 @@ 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 ""
#: 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 ""
#: libdialogpages/diffpage.cpp:352
@@ -795,174 +730,265 @@ msgstr ""
msgid "Size:"
msgstr ""
-#: komparepart/kompareprefdlg.cpp:33
-msgid "Preferences"
-msgstr "خصائص"
+#: libdialogpages/viewpage.cpp:119
+msgid "&Fonts"
+msgstr ""
-#: komparepart/kompareprefdlg.cpp:39
-msgid "View Settings"
-msgstr "عرض الإعدادات"
+#: libdiff2/komparemodellist.cpp:61
+msgid "&Apply Difference"
+msgstr "تطبيق الاختلاف"
-#: komparepart/kompareprefdlg.cpp:43
-msgid "Diff Settings"
-msgstr "إعدادات الاختلافات"
+#: libdiff2/komparemodellist.cpp:64
+msgid "Un&apply Difference"
+msgstr "إلغاء تطبيق الاختلاف"
-#: komparepart/kompare_part.cpp:165
-msgid "Save &All"
-msgstr "حفظ ال&كل"
+#: libdiff2/komparemodellist.cpp:67
+msgid "App&ly All"
+msgstr "تطبيق الكل"
-#: komparepart/kompare_part.cpp:168
+#: libdiff2/komparemodellist.cpp:70
+msgid "&Unapply All"
+msgstr "إ&لغ كل التطبيقات"
+
+#: libdiff2/komparemodellist.cpp:73
+msgid "P&revious File"
+msgstr "الملف السابق"
+
+#: libdiff2/komparemodellist.cpp:76
+msgid "N&ext File"
+msgstr "الملف التالي"
+
+#: libdiff2/komparemodellist.cpp:79
+msgid "&Previous Difference"
+msgstr "التغيّر السابق"
+
+#: libdiff2/komparemodellist.cpp:82
+msgid "&Next Difference"
+msgstr "التغيّّر التالي"
+
+#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
#, fuzzy
-msgid "Save .&diff..."
-msgstr "حفظ الإ&ختلافات"
+msgid ""
+"<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff "
+"file.</qt>"
+msgstr "لا أو لا ليس أ"
-#: komparepart/kompare_part.cpp:171
-msgid "Swap Source with Destination"
-msgstr "تبديل المصدر مع الهدف"
+#: libdiff2/komparemodellist.cpp:246
+#, fuzzy
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
+"qt>"
+msgstr "هناك إلى."
-#: komparepart/kompare_part.cpp:174
-msgid "Show Statistics"
-msgstr "عرض الإحصائيات"
+#: libdiff2/komparemodellist.cpp:271
+#, fuzzy
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>."
+"</qt>"
+msgstr "هناك إلى."
-#: komparepart/kompare_part.cpp:269
+#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
+msgid "Could not open a temporary file."
+msgstr "فشل فتح ملف مؤقَت."
+
+#: libdiff2/komparemodellist.cpp:350
#, fuzzy
-msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
-msgstr "عنوان الموقع %1 لا يمكن تحميله."
+msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+msgstr "فشل الكتابة إلى الملف المؤقَت."
-#: komparepart/kompare_part.cpp:281
+#: libdiff2/komparemodellist.cpp:368
#, fuzzy
-msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
-msgstr "عنوان الموقع %1 غير موجود على نظامك."
+msgid ""
+"<qt>Could not create destination directory <b>%1</b>.\n"
+"The file has not been saved.</qt>"
+msgstr "فشل الكتابة إلى الملف المؤقَت."
-#: komparepart/kompare_part.cpp:425
-msgid "Diff Options"
-msgstr "خيارات الاختلافات"
+#: libdiff2/komparemodellist.cpp:383
+#, fuzzy
+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 "يمكن أن ليس إلى الـ أنت نسخ إلى يمين."
-#: komparepart/kompare_part.cpp:443
+#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
+msgid "Could not parse diff output."
+msgstr "فشل إعراب مخرجات الإختلافات."
+
+#: libdiff2/komparemodellist.cpp:451
+msgid "The files are identical."
+msgstr "هذه الملفات متطابقة."
+
+#: libdiff2/komparemodellist.cpp:613
+msgid "Could not write to the temporary file."
+msgstr "فشل الكتابة إلى الملف المؤقَت."
+
+#: main.cpp:33
#, fuzzy
-msgid "*.diff *.dif *.patch|Patch Files"
-msgstr "*.diff *.dif *.patch | ملفات الرقعة"
+msgid ""
+"A program to view the differences between files and optionally generate a "
+"diff"
+msgstr "برنامج لعرض الإختلافات بين ملفات و دلائل و تكوين ملف إخلاف diff."
-#: komparepart/kompare_part.cpp:443
-msgid "Save .diff"
-msgstr "حفظ الإختلافات"
+#: main.cpp:39
+#, fuzzy
+msgid "This will compare URL1 with URL2"
+msgstr "هذا سيقارن الموقع 1 مع الموقع 2."
-#: komparepart/kompare_part.cpp:446
-msgid "The file exists or is write-protected; do you want to overwrite it?"
-msgstr ""
+#: main.cpp:40
+#, fuzzy
+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 "هذا فتح و إلى أ و من يمكن أن لـ لـ o Kompare أ إلى بحث ث و ث و بوصة ل."
-#: komparepart/kompare_part.cpp:446
-msgid "File Exists"
-msgstr ""
+#: main.cpp:41
+#, fuzzy
+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 "هذا إلى و أو إلى "
-#: komparepart/kompare_part.cpp:446
-msgid "Overwrite"
-msgstr ""
+#: main.cpp:42
+#, fuzzy
+msgid ""
+"Disables the check for automatically finding the original file(s) when using "
+"'-' as URL with the -o option."
+msgstr "يعطّل لـ ث URL مع o."
-#: komparepart/kompare_part.cpp:446
-msgid "Do Not Overwrite"
+#: 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 ""
-#: komparepart/kompare_part.cpp:481
-msgid "KomparePart"
+#: main.cpp:52
+msgid "Kompare"
+msgstr "Kompare"
+
+#: main.cpp:54
+#, fuzzy
+msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
+msgstr "الحقوق محفوظة 2001_2003، جون فايربو وأوتو بروجمان"
+
+#: main.cpp:55 main.cpp:56
+msgid "Author"
+msgstr "المؤلف"
+
+#: main.cpp:57
+#, fuzzy
+msgid "Kompare icon artist"
msgstr "برنامج KomparePart"
-#: komparepart/kompare_part.cpp:493
-msgid "Running diff..."
-msgstr "جاري البحث عن الإختلافات..."
+#: main.cpp:58
+msgid "A lot of good advice"
+msgstr "كثيراَ من النصيحة الجيَدة"
-#: komparepart/kompare_part.cpp:496
-msgid "Parsing diff output..."
-msgstr "جاري إعراب مخرجات الإختلافات..."
+#: main.cpp:59
+msgid "Cervisia diff viewer"
+msgstr "عارض الإختلافات Cervisia"
-#: komparepart/kompare_part.cpp:545
-msgid "Comparing file %1 with file %2"
-msgstr "جاري مقارنة الملف %1 مع الملف %2"
+#: main.cpp:189
+msgid "Compare these files or folder"
+msgstr "مقارنة هذه الملفَات أو المجلَد"
-#: komparepart/kompare_part.cpp:550
-msgid "Comparing files in %1 with files in %2"
-msgstr "جاري مقارنة الملفات في %1 مع الملفات في %2"
+#: komparepart/komparepartui.rc:4 kompareui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "الملف التالي"
-#: komparepart/kompare_part.cpp:555
-#, c-format
-msgid "Viewing diff output from %1"
-msgstr "جاري عرض مخرجات الإختلافات من %1"
+#: komparepart/komparepartui.rc:13
+#, no-c-format
+msgid "&Difference"
+msgstr "اختلاف"
-#: komparepart/kompare_part.cpp:558
-msgid "Blending diff output from %1 into file %2"
-msgstr "جاري مزج مخرجات الإختلافات من %1 إلى الملف %2"
+#: komparepart/komparepartui.rc:25 kompareui.rc:14
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "عرض الإعدادات"
-#: komparepart/kompare_part.cpp:563
-msgid "Blending diff output from %1 into folder %2"
-msgstr "جاري مزج مخرجات الإختلافات من %1 إلى المجلَد %2"
+#: komparepart/komparesaveoptionsbase.ui:41
+#, no-c-format
+msgid "Run Diff In"
+msgstr "تشغيل الاختلافات داخل"
-#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709
-#, fuzzy
-msgid ""
-"You have made changes to the destination file(s).\n"
-"Would you like to save them?"
-msgstr ""
-"لقد أحدثت تغييرات على الهدف\n"
-"هل تريد حفظهم؟"
+#: komparepart/komparesaveoptionsbase.ui:84
+#, no-c-format
+msgid "Command Line"
+msgstr "سطر الأوامر"
-#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
-msgid "Save Changes?"
-msgstr "حفظ التغييرات؟"
+#: komparepart/komparesaveoptionsbase.ui:108
+#, fuzzy, no-c-format
+msgid "cd dir && diff -udHprNa -- source destination"
+msgstr "فتح مصدر"
-#: komparepart/kompare_part.cpp:667
-msgid ""
-"No diff file, or no 2 files have been diffed. Therefore no stats are available."
-msgstr ""
-"لا تتوفر أي إحصاءات إما لعدم وجود ملف الإختلافات، أو لعدم مقارنة أي ملفين."
+#: komparepart/komparesaveoptionsbase.ui:118
+#, fuzzy, no-c-format
+msgid "Options"
+msgstr "خيارات"
-#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
-#: komparepart/kompare_part.cpp:698
-msgid "Diff Statistics"
-msgstr "إحصائيات الاختلافات"
+#: komparepart/komparesaveoptionsbase.ui:135
+#, no-c-format
+msgid "Look for smaller changes"
+msgstr "ابحث على تغيرات أصغر"
-#: 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 ""
-"إحصائيات:\n"
-"\n"
-"ملف قديم: %1\n"
-"ملف جديد: %2\n"
-"\n"
-"هيئة: %3\n"
-"عدد الكتل: %4\n"
-"عدد الإختلافات: %5"
+#: komparepart/komparesaveoptionsbase.ui:146
+#, no-c-format
+msgid "Optimize for large files"
+msgstr "إجر التحسينات المثلى للملفات الكبيرة"
-#: 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"
+#: komparepart/komparesaveoptionsbase.ui:157
+#, no-c-format
+msgid "Ignore changes in case"
+msgstr "تجاهل الاختلاف في حالة"
+
+#: komparepart/komparesaveoptionsbase.ui:165
+#, no-c-format
+msgid "Expand tabs to spaces"
+msgstr "توسيع علامات الجدولة إلى فراغات"
+
+#: komparepart/komparesaveoptionsbase.ui:173
+#, no-c-format
+msgid "Ignore added or removed empty lines"
+msgstr "تجاهل الأسطر الفارغة المضافة أو المزالة"
+
+#: komparepart/komparesaveoptionsbase.ui:181
+#, no-c-format
+msgid "Ignore changes in whitespace"
+msgstr "تجاهل التغييرات في المسافة البيضاء"
+
+#: komparepart/komparesaveoptionsbase.ui:189
+#, no-c-format
+msgid "Show function names"
+msgstr "اظهر أسماء الدوال"
+
+#: komparepart/komparesaveoptionsbase.ui:200
+#, no-c-format
+msgid "Compare folders recursively"
+msgstr "مقارنة المجلدات بشكل متكرر"
+
+#: komparepart/komparesaveoptionsbase.ui:211
+#, no-c-format
+msgid "Treat new files as empty"
+msgstr "معاملة الملفات الجديدة كفارغة"
+
+#: komparepart/komparesaveoptionsbase.ui:227
+#, no-c-format
+msgid "Format"
+msgstr "هيئة"
+
+#: komparepart/komparesaveoptionsbase.ui:287
+#, no-c-format
+msgid "Side-by-side"
+msgstr "جنبًا إلى جنبًا"
+
+#: kompareui.rc:27
+#, no-c-format
+msgid "Main Toolbar"
msgstr ""
-"إحصائيات:\n"
-"\n"
-"عدد الملفات في ملف الإختلافات: %1\n"
-"هيئة: %2\n"
-"\n"
-"الملف القديم الحالي: %3\n"
-"الملف الجديد الحالي: %4\n"
-"\n"
-"عدد الكتل: %5\n"
-"عدد الإختلافات: %6"
#~ msgid "%1"
#~ msgstr "%1"
@@ -1002,7 +1028,9 @@ msgstr ""
#~ "then Kompare will read from stdin, this can be used\n"
#~ "for cvs diff | kompare -. If 2 files are given,\n"
#~ "Kompare will compare them."
-#~ msgstr "ملف الوثيقة الذي سيفتح.إذا تم توفير عنوان URL واحد فقط سيتم أعتبارة ملف إختلاف diff. إذا تم توفير ملفين، سيقوم Komapre بالمقارنة ما بينهم."
+#~ msgstr ""
+#~ "ملف الوثيقة الذي سيفتح.إذا تم توفير عنوان URL واحد فقط سيتم أعتبارة ملف "
+#~ "إختلاف diff. إذا تم توفير ملفين، سيقوم Komapre بالمقارنة ما بينهم."
#~ msgid "Big help"
#~ msgstr "مساعدة كبيرة"
@@ -1030,5 +1058,6 @@ msgstr ""
#~ msgid "Destination:"
#~ msgstr "الهدف:"
-#~ msgid "Sorry, you gave too many arguments, I don't know what to do with them..."
+#~ msgid ""
+#~ "Sorry, you gave too many arguments, I don't know what to do with them..."
#~ msgstr "عذرا، يوجد لديك معاملات عديدة، لا أعرف ماذا افعل بها ..."
diff --git a/tde-i18n-az/messages/tdesdk/kompare.po b/tde-i18n-az/messages/tdesdk/kompare.po
index 272f558f8d..6d966c32fc 100644
--- a/tde-i18n-az/messages/tdesdk/kompare.po
+++ b/tde-i18n-az/messages/tdesdk/kompare.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
"PO-Revision-Date: 2001-11-22 00:46GMT+0200\n"
"Last-Translator: Vasif İsmayıloğlu MD <azerb_linux@hotmail.com>\n"
"Language-Team: Azərbaycan Türkcəsi <linuxaz@azerimail.net>\n"
@@ -15,314 +15,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.5\n"
-#: libdiff2/komparemodellist.cpp:61
-msgid "&Apply Difference"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:64
-msgid "Un&apply Difference"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:67
-msgid "App&ly All"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:70
-msgid "&Unapply All"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:73
-msgid "P&revious File"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:76
-#, fuzzy
-msgid "N&ext File"
-msgstr "Mətn Görünüşü"
-
-#: libdiff2/komparemodellist.cpp:79
-msgid "&Previous Difference"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:82
-msgid "&Next Difference"
-msgstr ""
-
-#: 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 ""
-
-#: libdiff2/komparemodellist.cpp:246
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:271
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>"
-".</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-msgid "Could not open a temporary file."
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:350
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:368
-msgid ""
-"<qt>Could not create destination directory <b>%1</b>.\n"
-"The file has not been saved.</qt>"
-msgstr ""
-
-#: 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 ""
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-msgid "Could not parse diff output."
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:451
-msgid "The files are identical."
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:613
-msgid "Could not write to the temporary file."
-msgstr ""
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, no-c-format
-msgid "&Difference"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, no-c-format
-msgid "Run Diff In"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, no-c-format
-msgid "Command Line"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 108
-#: rc.cpp:27
-#, no-c-format
-msgid "cd dir && diff -udHprNa -- source destination"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, no-c-format
-msgid "Look for smaller changes"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, no-c-format
-msgid "Optimize for large files"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, no-c-format
-msgid "Ignore changes in case"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, no-c-format
-msgid "Expand tabs to spaces"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
-#: rc.cpp:45
-#, no-c-format
-msgid "Ignore added or removed empty lines"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, no-c-format
-msgid "Show function names"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, fuzzy, no-c-format
-msgid "Compare folders recursively"
-msgstr "Fayl və ya Cərgələri Müqayisə Et"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
-#: rc.cpp:57
-#, no-c-format
-msgid "Treat new files as empty"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
-#: rc.cpp:60
-#, no-c-format
-msgid "Format"
-msgstr ""
-
-#. 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 ""
-
-#. 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 ""
-
-#. 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 ""
-
-#. 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 ""
-
-#. 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 ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
-#: rc.cpp:78
-#, no-c-format
-msgid "Side-by-side"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
-#: libdialogpages/diffpage.cpp:251 rc.cpp:81
-#, no-c-format
-msgid "Number of context lines:"
-msgstr ""
-
-#: main.cpp:33
-msgid ""
-"A program to view the differences between files and optionally generate a diff"
-msgstr ""
-
-#: main.cpp:39
-msgid "This will compare URL1 with URL2"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: main.cpp:42
-msgid ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
-msgstr ""
-
-#: 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 ""
-
-#: main.cpp:52
-msgid "Kompare"
-msgstr "Kompare"
-
-#: main.cpp:54
-msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
-msgstr ""
-
-#: main.cpp:55 main.cpp:56
-msgid "Author"
-msgstr ""
-
-#: main.cpp:57
-#, fuzzy
-msgid "Kompare icon artist"
-msgstr "Kompare"
-
-#: main.cpp:58
-msgid "A lot of good advice"
-msgstr ""
-
-#: main.cpp:59
-msgid "Cervisia diff viewer"
-msgstr ""
-
-#: kompare_shell.cpp:398 main.cpp:185
-#, fuzzy
-msgid "Compare Files or Folders"
-msgstr "Fayl və ya Cərgələri Müqayisə Et"
-
-#: kompare_shell.cpp:399 main.cpp:186
-#, fuzzy
-msgid "Source"
-msgstr "Mənbə:"
-
-#: kompare_shell.cpp:400 main.cpp:187
-#, fuzzy
-msgid "Destination"
-msgstr "Hədəf:"
-
-#: kompare_shell.cpp:402 main.cpp:189
-msgid "Compare"
-msgstr "Müqayisə Et"
-
-#: main.cpp:189
-#, fuzzy
-msgid "Compare these files or folder"
-msgstr "Bu fayl və ya cərgələri müqayisə et"
-
-#: 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 ""
-
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Vasif İsmayıloğlu MD"
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -424,18 +123,44 @@ msgstr ""
#: 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 ""
+#: kompare_shell.cpp:398 main.cpp:185
+#, fuzzy
+msgid "Compare Files or Folders"
+msgstr "Fayl və ya Cərgələri Müqayisə Et"
+
+#: kompare_shell.cpp:399 main.cpp:186
+#, fuzzy
+msgid "Source"
+msgstr "Mənbə:"
+
+#: kompare_shell.cpp:400 main.cpp:187
+#, fuzzy
+msgid "Destination"
+msgstr "Hədəf:"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
+msgstr "Müqayisə Et"
+
#: kompare_shell.cpp:402
#, fuzzy
msgid "Compare these files or folders"
msgstr "Bu fayl və ya cərgələri müqayisə et"
+#: 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 ""
+
#: kompare_shell.cpp:439
msgid "Text View"
msgstr "Mətn Görünüşü"
@@ -526,19 +251,208 @@ msgstr ""
msgid "KompareNavTreePart"
msgstr "Kompare"
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
+#: komparepart/kompare_part.cpp:165
+msgid "Save &All"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:168
+msgid "Save .&diff..."
+msgstr ""
+
+#: komparepart/kompare_part.cpp:171
+msgid "Swap Source with Destination"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:174
+msgid "Show Statistics"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:269
+msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:281
+msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:425
+msgid "Diff Options"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:443
+msgid "*.diff *.dif *.patch|Patch Files"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:443
+msgid "Save .diff"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:446
+msgid "The file exists or is write-protected; do you want to overwrite it?"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:446
+msgid "File Exists"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:446
+msgid "Overwrite"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:446
+msgid "Do Not Overwrite"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:481
+#, fuzzy
+msgid "KomparePart"
+msgstr "Kompare"
+
+#: komparepart/kompare_part.cpp:493
+msgid "Running diff..."
+msgstr ""
+
+#: komparepart/kompare_part.cpp:496
+msgid "Parsing diff output..."
+msgstr ""
+
+#: komparepart/kompare_part.cpp:545
+msgid "Comparing file %1 with file %2"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:550
+msgid "Comparing files in %1 with files in %2"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:555
+#, c-format
+msgid "Viewing diff output from %1"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:558
+msgid "Blending diff output from %1 into file %2"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:563
+msgid "Blending diff output from %1 into folder %2"
+msgstr ""
+
+#: 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 ""
+
+#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+msgid "Save Changes?"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276
+#: libdialogpages/diffpage.cpp:244
+#, no-c-format
+msgid "Unified"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244
+#: libdialogpages/diffpage.cpp:238
+#, no-c-format
+msgid "Context"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:641 komparepart/komparesaveoptionsbase.ui:268
+#: libdialogpages/diffpage.cpp:242
+#, no-c-format
+msgid "RCS"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252
+#: libdialogpages/diffpage.cpp:239
+#, no-c-format
+msgid "Ed"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260
+#: libdialogpages/diffpage.cpp:241
+#, no-c-format
+msgid "Normal"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:667
+msgid ""
+"No diff file, or no 2 files have been diffed. Therefore no stats are "
+"available."
+msgstr ""
+
+#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
+#: komparepart/kompare_part.cpp:698
+msgid "Diff Statistics"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: komparepart/kompareprefdlg.cpp:33
+msgid "Preferences"
+msgstr ""
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View"
+msgstr "Mətn Görünüşü"
+
+#: komparepart/kompareprefdlg.cpp:39
+msgid "View Settings"
msgstr ""
#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
msgid "Diff"
msgstr ""
+#: komparepart/kompareprefdlg.cpp:43
+msgid "Diff Settings"
+msgstr ""
+
+#: kompareurldialog.cpp:41
+#, fuzzy
+msgid "Files"
+msgstr "Mətn Görünüşü"
+
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr ""
+
#: kompareurldialog.cpp:47
msgid "Here you can change the options for comparing the files."
msgstr ""
#: kompareurldialog.cpp:53
+msgid "Appearance"
+msgstr ""
+
+#: kompareurldialog.cpp:53
msgid "Here you can change the options for the view."
msgstr ""
@@ -563,15 +477,20 @@ msgstr ""
#: 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 ""
#: libdialogpages/diffpage.cpp:247
msgid "Lines of Context"
msgstr ""
+#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251
+#, no-c-format
+msgid "Number of context lines:"
+msgstr ""
+
#: libdialogpages/diffpage.cpp:253
msgid ""
"The number of context lines is normally 2 or 3. This makes the diff readable "
@@ -689,14 +608,14 @@ msgstr ""
#: 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 ""
#: 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 ""
#: libdialogpages/diffpage.cpp:338
@@ -710,14 +629,14 @@ 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 ""
#: 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 ""
#: libdialogpages/diffpage.cpp:352
@@ -785,148 +704,254 @@ msgstr ""
msgid "Size:"
msgstr ""
-#: komparepart/kompareprefdlg.cpp:33
-msgid "Preferences"
+#: libdialogpages/viewpage.cpp:119
+msgid "&Fonts"
msgstr ""
-#: komparepart/kompareprefdlg.cpp:39
-msgid "View Settings"
+#: libdiff2/komparemodellist.cpp:61
+msgid "&Apply Difference"
msgstr ""
-#: komparepart/kompareprefdlg.cpp:43
-msgid "Diff Settings"
+#: libdiff2/komparemodellist.cpp:64
+msgid "Un&apply Difference"
msgstr ""
-#: komparepart/kompare_part.cpp:165
-msgid "Save &All"
+#: libdiff2/komparemodellist.cpp:67
+msgid "App&ly All"
msgstr ""
-#: komparepart/kompare_part.cpp:168
-msgid "Save .&diff..."
+#: libdiff2/komparemodellist.cpp:70
+msgid "&Unapply All"
msgstr ""
-#: komparepart/kompare_part.cpp:171
-msgid "Swap Source with Destination"
+#: libdiff2/komparemodellist.cpp:73
+msgid "P&revious File"
msgstr ""
-#: komparepart/kompare_part.cpp:174
-msgid "Show Statistics"
+#: libdiff2/komparemodellist.cpp:76
+#, fuzzy
+msgid "N&ext File"
+msgstr "Mətn Görünüşü"
+
+#: libdiff2/komparemodellist.cpp:79
+msgid "&Previous Difference"
msgstr ""
-#: komparepart/kompare_part.cpp:269
-msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+#: libdiff2/komparemodellist.cpp:82
+msgid "&Next Difference"
msgstr ""
-#: komparepart/kompare_part.cpp:281
-msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+#: 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 ""
-#: komparepart/kompare_part.cpp:425
-msgid "Diff Options"
+#: libdiff2/komparemodellist.cpp:246
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
+"qt>"
msgstr ""
-#: komparepart/kompare_part.cpp:443
-msgid "*.diff *.dif *.patch|Patch Files"
+#: libdiff2/komparemodellist.cpp:271
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>."
+"</qt>"
msgstr ""
-#: komparepart/kompare_part.cpp:443
-msgid "Save .diff"
+#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
+msgid "Could not open a temporary file."
msgstr ""
-#: komparepart/kompare_part.cpp:446
-msgid "The file exists or is write-protected; do you want to overwrite it?"
+#: libdiff2/komparemodellist.cpp:350
+msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
msgstr ""
-#: komparepart/kompare_part.cpp:446
-msgid "File Exists"
+#: libdiff2/komparemodellist.cpp:368
+msgid ""
+"<qt>Could not create destination directory <b>%1</b>.\n"
+"The file has not been saved.</qt>"
msgstr ""
-#: komparepart/kompare_part.cpp:446
-msgid "Overwrite"
+#: 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 ""
-#: komparepart/kompare_part.cpp:446
-msgid "Do Not Overwrite"
+#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
+msgid "Could not parse diff output."
msgstr ""
-#: komparepart/kompare_part.cpp:481
+#: libdiff2/komparemodellist.cpp:451
+msgid "The files are identical."
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:613
+msgid "Could not write to the temporary file."
+msgstr ""
+
+#: main.cpp:33
+msgid ""
+"A program to view the differences between files and optionally generate a "
+"diff"
+msgstr ""
+
+#: main.cpp:39
+msgid "This will compare URL1 with URL2"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: main.cpp:42
+msgid ""
+"Disables the check for automatically finding the original file(s) when using "
+"'-' as URL with the -o option."
+msgstr ""
+
+#: 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 ""
+
+#: main.cpp:52
+msgid "Kompare"
+msgstr "Kompare"
+
+#: main.cpp:54
+msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
+msgstr ""
+
+#: main.cpp:55 main.cpp:56
+msgid "Author"
+msgstr ""
+
+#: main.cpp:57
#, fuzzy
-msgid "KomparePart"
+msgid "Kompare icon artist"
msgstr "Kompare"
-#: komparepart/kompare_part.cpp:493
-msgid "Running diff..."
+#: main.cpp:58
+msgid "A lot of good advice"
msgstr ""
-#: komparepart/kompare_part.cpp:496
-msgid "Parsing diff output..."
+#: main.cpp:59
+msgid "Cervisia diff viewer"
msgstr ""
-#: komparepart/kompare_part.cpp:545
-msgid "Comparing file %1 with file %2"
+#: main.cpp:189
+#, fuzzy
+msgid "Compare these files or folder"
+msgstr "Bu fayl və ya cərgələri müqayisə et"
+
+#: komparepart/komparepartui.rc:4 kompareui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Mətn Görünüşü"
+
+#: komparepart/komparepartui.rc:13
+#, no-c-format
+msgid "&Difference"
msgstr ""
-#: komparepart/kompare_part.cpp:550
-msgid "Comparing files in %1 with files in %2"
+#: komparepart/komparepartui.rc:25 kompareui.rc:14
+#, no-c-format
+msgid "&Settings"
msgstr ""
-#: komparepart/kompare_part.cpp:555
-#, c-format
-msgid "Viewing diff output from %1"
+#: komparepart/komparesaveoptionsbase.ui:41
+#, no-c-format
+msgid "Run Diff In"
msgstr ""
-#: komparepart/kompare_part.cpp:558
-msgid "Blending diff output from %1 into file %2"
+#: komparepart/komparesaveoptionsbase.ui:84
+#, no-c-format
+msgid "Command Line"
msgstr ""
-#: komparepart/kompare_part.cpp:563
-msgid "Blending diff output from %1 into folder %2"
+#: komparepart/komparesaveoptionsbase.ui:108
+#, no-c-format
+msgid "cd dir && diff -udHprNa -- source destination"
msgstr ""
-#: 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?"
+#: komparepart/komparesaveoptionsbase.ui:118
+#, no-c-format
+msgid "Options"
msgstr ""
-#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
-msgid "Save Changes?"
+#: komparepart/komparesaveoptionsbase.ui:135
+#, no-c-format
+msgid "Look for smaller changes"
msgstr ""
-#: komparepart/kompare_part.cpp:667
-msgid ""
-"No diff file, or no 2 files have been diffed. Therefore no stats are available."
+#: komparepart/komparesaveoptionsbase.ui:146
+#, no-c-format
+msgid "Optimize for large files"
msgstr ""
-#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
-#: komparepart/kompare_part.cpp:698
-msgid "Diff Statistics"
+#: komparepart/komparesaveoptionsbase.ui:157
+#, no-c-format
+msgid "Ignore changes in case"
msgstr ""
-#: 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"
+#: komparepart/komparesaveoptionsbase.ui:165
+#, no-c-format
+msgid "Expand tabs to spaces"
msgstr ""
-#: 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"
+#: komparepart/komparesaveoptionsbase.ui:173
+#, no-c-format
+msgid "Ignore added or removed empty lines"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:181
+#, no-c-format
+msgid "Ignore changes in whitespace"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:189
+#, no-c-format
+msgid "Show function names"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:200
+#, fuzzy, no-c-format
+msgid "Compare folders recursively"
+msgstr "Fayl və ya Cərgələri Müqayisə Et"
+
+#: komparepart/komparesaveoptionsbase.ui:211
+#, no-c-format
+msgid "Treat new files as empty"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:227
+#, no-c-format
+msgid "Format"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:287
+#, no-c-format
+msgid "Side-by-side"
+msgstr ""
+
+#: kompareui.rc:27
+#, no-c-format
+msgid "Main Toolbar"
msgstr ""
#, fuzzy
diff --git a/tde-i18n-be/messages/tdesdk/kompare.po b/tde-i18n-be/messages/tdesdk/kompare.po
index 1588d2ce2e..f8d119e52c 100644
--- a/tde-i18n-be/messages/tdesdk/kompare.po
+++ b/tde-i18n-be/messages/tdesdk/kompare.po
@@ -4,7 +4,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: 2007-01-25 01:17+0100\n"
"Last-Translator: Siarhei Liantsevich <serzh.by@gmail.com>\n"
"Language-Team: Belarusian\n"
@@ -14,368 +14,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: libdiff2/komparemodellist.cpp:61
-#, fuzzy
-msgid "&Apply Difference"
-msgstr "Ужыць адрозненні"
-
-#: libdiff2/komparemodellist.cpp:64
-#, fuzzy
-msgid "Un&apply Difference"
-msgstr "Адмяніць адрозненні"
-
-#: libdiff2/komparemodellist.cpp:67
-#, fuzzy
-msgid "App&ly All"
-msgstr "Ужыць усё"
-
-#: libdiff2/komparemodellist.cpp:70
-#, fuzzy
-msgid "&Unapply All"
-msgstr "Адмяніць усё"
-
-#: libdiff2/komparemodellist.cpp:73
-#, fuzzy
-msgid "P&revious File"
-msgstr "Папярэдні файл"
-
-#: libdiff2/komparemodellist.cpp:76
-#, fuzzy
-msgid "N&ext File"
-msgstr "Наступны файл"
-
-#: libdiff2/komparemodellist.cpp:79
-#, fuzzy
-msgid "&Previous Difference"
-msgstr "Папярэдняе адрозненне"
-
-#: libdiff2/komparemodellist.cpp:82
-#, fuzzy
-msgid "&Next Difference"
-msgstr "Наступнае адрозненне"
-
-#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
-#, fuzzy
-msgid ""
-"<qt>No models or no differences, this file: <b>%1</b>"
-", is not a valid diff file.</qt>"
-msgstr ""
-"<qt>Няма макетаў або адрозненняў. Файл <b>%1</b> не з'яўляецца файлам фармату "
-"diff.</qt>"
-
-#: libdiff2/komparemodellist.cpp:246
-#, fuzzy
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>"
-msgstr ""
-"<qt>Паўсталі праблемы падчас ужывання diff <b>%1</b> да файла <b>%2</b>.</qt>"
-
-#: libdiff2/komparemodellist.cpp:271
-#, fuzzy
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>"
-".</qt>"
-msgstr ""
-"<qt>Паўсталі праблемы падчас ужывання diff <b>%1</b> да тэчкі <b>%2</b>.</qt>"
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-#, fuzzy
-msgid "Could not open a temporary file."
-msgstr "Не атрымоўваецца адкрыць часовы файл."
-
-#: libdiff2/komparemodellist.cpp:350
-#, fuzzy
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr ""
-"<qt>Не атрымоўваецца запісаць у часовы файл <b>%1</b>, выдаляемы яго.</qt>"
-
-#: libdiff2/komparemodellist.cpp:368
-#, fuzzy
-msgid ""
-"<qt>Could not create destination directory <b>%1</b>.\n"
-"The file has not been saved.</qt>"
-msgstr ""
-"<qt>Не атрымалася стварыць канчатковую тэчку <b>%1</b>.\n"
-"Файл не захаваны.</qt>"
-
-#: libdiff2/komparemodellist.cpp:383
-#, fuzzy
-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>Не атрымоўваецца загрузіць часовы файл у кропку прызначэння <b>%1</b>"
-". Часовы файл усё яшчэ даступны пад імем <b>%2</b>. Вы можаце ўручную "
-"скапіяваць яго ў патрэбнае месца.</qt>"
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-#, fuzzy
-msgid "Could not parse diff output."
-msgstr "Не атрымоўваецца апрацаваць выснову diff."
-
-#: libdiff2/komparemodellist.cpp:451
-#, fuzzy
-msgid "The files are identical."
-msgstr "Усе файлы ідэнтычныя."
-
-#: libdiff2/komparemodellist.cpp:613
-#, fuzzy
-msgid "Could not write to the temporary file."
-msgstr "Не атрымоўваецца запісаць у часовы файл."
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, fuzzy, no-c-format
-msgid "&Difference"
-msgstr "Адрозненне"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, fuzzy, no-c-format
-msgid "Run Diff In"
-msgstr "Запусціць Diff у"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, fuzzy, no-c-format
-msgid "Command Line"
-msgstr "Камандны радок"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 108
-#: rc.cpp:27
-#, fuzzy, no-c-format
-msgid "cd dir && diff -udHprNa -- source destination"
-msgstr "cd dir diff -udHprNa -- <крыніца> <прызначэнне>"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, fuzzy, no-c-format
-msgid "Look for smaller changes"
-msgstr "Пошук найменшых змен"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, fuzzy, no-c-format
-msgid "Optimize for large files"
-msgstr "Аптымізацыя для вялікіх файлаў"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, fuzzy, no-c-format
-msgid "Ignore changes in case"
-msgstr "Ігнараваць змены ў рэгістры літар"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, fuzzy, no-c-format
-msgid "Expand tabs to spaces"
-msgstr "Замяніць табуляцыю прабеламі"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
-#: rc.cpp:45
-#, fuzzy, no-c-format
-msgid "Ignore added or removed empty lines"
-msgstr "Ігнараваць дададзеныя і выдаленыя пустыя радкі"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, fuzzy, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr "Ігнараваць змены прабелаў"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, fuzzy, no-c-format
-msgid "Show function names"
-msgstr "Паказваць імёны функцый"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, fuzzy, no-c-format
-msgid "Compare folders recursively"
-msgstr "Параўнаць тэчкі рэкурсіўна"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
-#: rc.cpp:57
-#, fuzzy, no-c-format
-msgid "Treat new files as empty"
-msgstr "Лічыць новыя файлы як пустыя"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
-#: rc.cpp:60
-#, fuzzy, no-c-format
-msgid "Format"
-msgstr "Фармат"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 244
-#: komparepart/kompare_part.cpp:638 libdialogpages/diffpage.cpp:238 rc.cpp:63
-#, fuzzy, no-c-format
-msgid "Context"
-msgstr "Кантэкст"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 252
-#: komparepart/kompare_part.cpp:644 libdialogpages/diffpage.cpp:239 rc.cpp:66
-#, fuzzy, 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
-#, fuzzy, no-c-format
-msgid "Normal"
-msgstr "Звычайны"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 268
-#: komparepart/kompare_part.cpp:641 libdialogpages/diffpage.cpp:242 rc.cpp:72
-#, fuzzy, 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
-#, fuzzy, no-c-format
-msgid "Unified"
-msgstr "Аб'яднаны"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
-#: rc.cpp:78
-#, fuzzy, no-c-format
-msgid "Side-by-side"
-msgstr "Побач сябар з сябрам"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
-#: libdialogpages/diffpage.cpp:251 rc.cpp:81
-#, fuzzy, no-c-format
-msgid "Number of context lines:"
-msgstr "Колькасць радкоў кантэксту:"
-
-#: main.cpp:33
-#, fuzzy
-msgid ""
-"A program to view the differences between files and optionally generate a diff"
-msgstr ""
-"Праграма для прагляду адрозненняў паміж файламі і стварэнні файла diff."
-
-#: main.cpp:39
-#, fuzzy
-msgid "This will compare URL1 with URL2"
-msgstr "Параўнанне \"Спасылкі1\" з \"Спасылкай2\""
-
-#: main.cpp:40
-#, fuzzy
-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 ""
-"Адкрыць URL1, лічачы,што гэта выснова diff. URL1 таксама можа быць '-'. Гэта "
-"можна выкарыстаць, напрыклад, так: cvs diff | kompare -o -. Kompare праверыць, "
-"ці існуе арыгінальны файл, а затым змяшае з высновай diff і пакажа вынік. Ключ "
-"-n адмяняе праверку."
-
-#: main.cpp:41
-#, fuzzy
-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 ""
-"Змяшаць URL2 і URL1, URL2 павінен быць высновай diff, а URL1 - (арыгінальны) "
-"файл або тэчка."
-
-#: main.cpp:42
-#, fuzzy
-msgid ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
-msgstr ""
-"Адключае праверку аўтаматычнага пошуку арыгінальнага файла(ов) пры выкарыстанні "
-"'-' у якасці крыніцы з опцыяй -o."
-
-#: main.cpp:43
-#, fuzzy
-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 ""
-"Паказаць кадыроўку. Па змаўчанні будзе выкарыстоўвацца кадыроўка лакалі."
-
-#: main.cpp:52
-#, fuzzy
-msgid "Kompare"
-msgstr "Kompare"
-
-#: main.cpp:54
-#, fuzzy
-msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
-msgstr ""
-"(c) 2001-2004, Джон Файербаух (John Firebaugh) і Отто Брюггеман (Otto "
-"Bruggeman)"
-
-#: main.cpp:55 main.cpp:56
-#, fuzzy
-msgid "Author"
-msgstr "Аўтар"
-
-#: main.cpp:57
-#, fuzzy
-msgid "Kompare icon artist"
-msgstr "Значкі"
-
-#: main.cpp:58
-#, fuzzy
-msgid "A lot of good advice"
-msgstr "Шмат добрых рад"
-
-#: main.cpp:59
-#, fuzzy
-msgid "Cervisia diff viewer"
-msgstr "Прагляд адрозненняў у Cervisia"
-
-#: kompare_shell.cpp:398 main.cpp:185
-#, fuzzy
-msgid "Compare Files or Folders"
-msgstr "Параўнанне файлаў або тэчак"
-
-#: kompare_shell.cpp:399 main.cpp:186
-#, fuzzy
-msgid "Source"
-msgstr "Крыніца"
-
-#: kompare_shell.cpp:400 main.cpp:187
-#, fuzzy
-msgid "Destination"
-msgstr "Прызначэнне"
-
-#: kompare_shell.cpp:402 main.cpp:189
-#, fuzzy
-msgid "Compare"
-msgstr "Параўнаць"
-
-#: main.cpp:189
-#, fuzzy
-msgid "Compare these files or folder"
-msgstr "Параўнаць файлы або тэчку"
-
-#: kompare_shell.cpp:402 main.cpp:189
-#, fuzzy
-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 ""
-"Калі вы паказалі файлы або тэчкі ў палях гэтага дыялогу, гэтая кнопка стане "
-"даступная і націск на яе пачне параўнанне паказаных файлаў або тэчак."
-
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Сяржук Лянцэвіч"
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -504,22 +149,52 @@ msgstr "Зліць гэты файл або тэчку з высновай diff"
#: kompare_shell.cpp:373
#, fuzzy
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 ""
-"Калі вы паказалі імя файла або тэчкі і файл, у якім утрымоўваецца выснова diff, "
-"у гэтым дыялогу, гэтая кнопка стане даступная і націск на яе адкрые галоўнае "
-"акно Kompare, дзе выснова паказанага файла або файлаў з тэчкі змяшаецца з "
-"высновай diff так, што вы зможаце \"ужыць\" адрозненні да файлаў."
+"Калі вы паказалі імя файла або тэчкі і файл, у якім утрымоўваецца выснова "
+"diff, у гэтым дыялогу, гэтая кнопка стане даступная і націск на яе адкрые "
+"галоўнае акно Kompare, дзе выснова паказанага файла або файлаў з тэчкі "
+"змяшаецца з высновай diff так, што вы зможаце \"ужыць\" адрозненні да файлаў."
+
+#: kompare_shell.cpp:398 main.cpp:185
+#, fuzzy
+msgid "Compare Files or Folders"
+msgstr "Параўнанне файлаў або тэчак"
+
+#: kompare_shell.cpp:399 main.cpp:186
+#, fuzzy
+msgid "Source"
+msgstr "Крыніца"
+
+#: kompare_shell.cpp:400 main.cpp:187
+#, fuzzy
+msgid "Destination"
+msgstr "Прызначэнне"
+
+#: kompare_shell.cpp:402 main.cpp:189
+#, fuzzy
+msgid "Compare"
+msgstr "Параўнаць"
#: kompare_shell.cpp:402
#, fuzzy
msgid "Compare these files or folders"
msgstr "Параўнаць файлы або тэчкі"
+#: kompare_shell.cpp:402 main.cpp:189
+#, fuzzy
+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 ""
+"Калі вы паказалі файлы або тэчкі ў палях гэтага дыялогу, гэтая кнопка стане "
+"даступная і націск на яе пачне параўнанне паказаных файлаў або тэчак."
+
#: kompare_shell.cpp:439
#, fuzzy
msgid "Text View"
@@ -631,16 +306,251 @@ msgstr "Невядомы"
msgid "KompareNavTreePart"
msgstr "KompareNavTreePart"
-#: kompareurldialog.cpp:41
+#: komparepart/kompare_part.cpp:165
#, fuzzy
-msgid "Here you can enter the files you want to compare."
-msgstr "Тут можна ўвесці файла для параўнання"
+msgid "Save &All"
+msgstr "Захаваць усё"
+
+#: komparepart/kompare_part.cpp:168
+#, fuzzy
+msgid "Save .&diff..."
+msgstr "Захаваць адрозненні ў файл .diff..."
+
+#: komparepart/kompare_part.cpp:171
+#, fuzzy
+msgid "Swap Source with Destination"
+msgstr "Памяняць месцамі крыніца і прызначэнне"
+
+#: komparepart/kompare_part.cpp:174
+#, fuzzy
+msgid "Show Statistics"
+msgstr "Паказаць статыстыку"
+
+#: komparepart/kompare_part.cpp:269
+#, fuzzy
+msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+msgstr "<qt>Немагчыма загрузіць спасылку <b>%1</b>.</qt>"
+
+#: komparepart/kompare_part.cpp:281
+#, fuzzy
+msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+msgstr "<qt>Немагчыма адкрыць <b>%1</b>.</qt>"
+
+#: komparepart/kompare_part.cpp:425
+#, fuzzy
+msgid "Diff Options"
+msgstr "Параметры Diff"
+
+#: komparepart/kompare_part.cpp:443
+#, fuzzy
+msgid "*.diff *.dif *.patch|Patch Files"
+msgstr "*.diff *.dif *.patch|Файлы адрозненняў (*.diff *.dif *.patch)"
+
+#: komparepart/kompare_part.cpp:443
+#, fuzzy
+msgid "Save .diff"
+msgstr "Захаваць .diff"
+
+#: komparepart/kompare_part.cpp:446
+#, fuzzy
+msgid "The file exists or is write-protected; do you want to overwrite it?"
+msgstr "Файл ужо існуе. Замяніць яго?"
+
+#: komparepart/kompare_part.cpp:446
+#, fuzzy
+msgid "File Exists"
+msgstr "Файл ужо існуе"
+
+#: komparepart/kompare_part.cpp:446
+#, fuzzy
+msgid "Overwrite"
+msgstr "Замяніць"
+
+#: komparepart/kompare_part.cpp:446
+#, fuzzy
+msgid "Do Not Overwrite"
+msgstr "Не замяняць"
+
+#: komparepart/kompare_part.cpp:481
+#, fuzzy
+msgid "KomparePart"
+msgstr "KomparePart"
+
+#: komparepart/kompare_part.cpp:493
+#, fuzzy
+msgid "Running diff..."
+msgstr "Запушчаны diff..."
+
+#: komparepart/kompare_part.cpp:496
+#, fuzzy
+msgid "Parsing diff output..."
+msgstr "Апрацоўваецца выснова diff..."
+
+#: komparepart/kompare_part.cpp:545
+#, fuzzy
+msgid "Comparing file %1 with file %2"
+msgstr "Параўноўваюцца файл %1 з файлам %2"
+
+#: komparepart/kompare_part.cpp:550
+#, fuzzy
+msgid "Comparing files in %1 with files in %2"
+msgstr "Параўноўваюцца файлы ў %1 з файламі ў %2"
+
+#: komparepart/kompare_part.cpp:555
+#, fuzzy, c-format
+msgid "Viewing diff output from %1"
+msgstr "Прагляд высновы diff з %1"
+
+#: komparepart/kompare_part.cpp:558
+#, fuzzy
+msgid "Blending diff output from %1 into file %2"
+msgstr "Змешванне высновы diff з файла %1 у файл %2"
+
+#: komparepart/kompare_part.cpp:563
+#, fuzzy
+msgid "Blending diff output from %1 into folder %2"
+msgstr "Змешванне высновы diff з файла %1 у тэчку %2"
+
+#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709
+#, fuzzy
+msgid ""
+"You have made changes to the destination file(s).\n"
+"Would you like to save them?"
+msgstr ""
+"Файл прызначэння быў зменены.\n"
+"Вы жадаеце яго захаваць?"
+
+#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+#, fuzzy
+msgid "Save Changes?"
+msgstr "Захаваць змены?"
+
+#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276
+#: libdialogpages/diffpage.cpp:244
+#, fuzzy, no-c-format
+msgid "Unified"
+msgstr "Аб'яднаны"
+
+#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244
+#: libdialogpages/diffpage.cpp:238
+#, fuzzy, no-c-format
+msgid "Context"
+msgstr "Кантэкст"
+
+#: komparepart/kompare_part.cpp:641 komparepart/komparesaveoptionsbase.ui:268
+#: libdialogpages/diffpage.cpp:242
+#, fuzzy, no-c-format
+msgid "RCS"
+msgstr "RCS"
+
+#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252
+#: libdialogpages/diffpage.cpp:239
+#, fuzzy, no-c-format
+msgid "Ed"
+msgstr "Ed"
+
+#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260
+#: libdialogpages/diffpage.cpp:241
+#, fuzzy, no-c-format
+msgid "Normal"
+msgstr "Звычайны"
+
+#: komparepart/kompare_part.cpp:667
+#, fuzzy
+msgid ""
+"No diff file, or no 2 files have been diffed. Therefore no stats are "
+"available."
+msgstr ""
+"Няма файла diff або параўнанне выраблена не па двух файлам. Статыстыка "
+"недаступная."
+
+#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
+#: komparepart/kompare_part.cpp:698
+#, fuzzy
+msgid "Diff Statistics"
+msgstr "Статыстыка адрозненняў"
+
+#: komparepart/kompare_part.cpp:673
+#, fuzzy
+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 ""
+"Статыстыка:\n"
+"\n"
+"Стары файл: %1\n"
+"Новы файл: %2\n"
+"\n"
+"Фармат: %3\n"
+"Колькасць не змененых: %4\n"
+"Колькасць адрозненняў: %5"
+
+#: komparepart/kompare_part.cpp:686
+#, fuzzy
+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 ""
+"Статыстыка:\n"
+"\n"
+"Колькасць файлаў у файле адрозненняў: %1\n"
+"Фармат: %2\n"
+"\n"
+"Бягучы стары файл: %3\n"
+"Бягучы новы файл: %4\n"
+"\n"
+"Колькасць не змененых: %5\n"
+"Колькасць адрозненняў: %6"
+
+#: komparepart/kompareprefdlg.cpp:33
+#, fuzzy
+msgid "Preferences"
+msgstr "Параметры"
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View"
+msgstr "Прагляд тэксту"
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View Settings"
+msgstr "Налады выгляду"
#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
#, fuzzy
msgid "Diff"
msgstr "Адрозненні"
+#: komparepart/kompareprefdlg.cpp:43
+#, fuzzy
+msgid "Diff Settings"
+msgstr "Налады адрозненняў"
+
+#: kompareurldialog.cpp:41
+#, fuzzy
+msgid "Files"
+msgstr "Файлы"
+
+#: kompareurldialog.cpp:41
+#, fuzzy
+msgid "Here you can enter the files you want to compare."
+msgstr "Тут можна ўвесці файла для параўнання"
+
#: kompareurldialog.cpp:47
#, fuzzy
msgid "Here you can change the options for comparing the files."
@@ -648,6 +558,11 @@ msgstr "Тут можна наладзіць параметры параўнан
#: kompareurldialog.cpp:53
#, fuzzy
+msgid "Appearance"
+msgstr "Паданне:"
+
+#: kompareurldialog.cpp:53
+#, fuzzy
msgid "Here you can change the options for the view."
msgstr "Тут можна наладзіць візуальныя параметры"
@@ -663,9 +578,9 @@ msgid ""
"program does not support all the options that the GNU version does. This way "
"you can select that version."
msgstr ""
-"Вы можаце вылучыць подграмму diff тут. На сістэмах Solaris стандартная праграма "
-"diff не падтрымлівае ўсе ключы версіі GNU. Так вы можаце вылучыць патрэбную "
-"версію праграмы."
+"Вы можаце вылучыць подграмму diff тут. На сістэмах Solaris стандартная "
+"праграма diff не падтрымлівае ўсе ключы версіі GNU. Так вы можаце вылучыць "
+"патрэбную версію праграмы."
#: libdialogpages/diffpage.cpp:221
#, fuzzy
@@ -680,9 +595,9 @@ msgstr "Фармат высновы"
#: libdialogpages/diffpage.cpp:233
#, fuzzy
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 ""
"Вылучыце фармат высновы, генеруемы diff. Найболей часта выкарыстоўваным "
"з'яўляецца Unified, т.к. ён лёгкі для чытання. Калі ласка, выкарыстайце "
@@ -693,6 +608,11 @@ msgstr ""
msgid "Lines of Context"
msgstr "Радкі кантэксту"
+#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251
+#, fuzzy, no-c-format
+msgid "Number of context lines:"
+msgstr "Колькасць радкоў кантэксту:"
+
#: libdialogpages/diffpage.cpp:253
#, fuzzy
msgid ""
@@ -839,17 +759,17 @@ msgstr "Шаблон імя для выключэння"
#: libdialogpages/diffpage.cpp:330
#, fuzzy
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 ""
-"Калі гэта ўключана, вы зможаце ўвесці маску файла ў тэкставым полі справа або "
-"вылучыць адно з значэнняў з спісу."
+"Калі гэта ўключана, вы зможаце ўвесці маску файла ў тэкставым полі справа "
+"або вылучыць адно з значэнняў з спісу."
#: libdialogpages/diffpage.cpp:332
#, fuzzy
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 "Тут вы можаце ўвесці маску файла, або вылучыць наканаваныя значэнні."
#: libdialogpages/diffpage.cpp:338
@@ -867,8 +787,8 @@ msgstr ""
#: libdialogpages/diffpage.cpp:342
#, fuzzy
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 ""
"Тут вы можаце ўвесці шлях да файла, які змяшчае маскі файлаў, якія трэба "
"ігнараваць пры параўнанні тэчак."
@@ -876,8 +796,8 @@ msgstr ""
#: libdialogpages/diffpage.cpp:344
#, fuzzy
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 ""
"Файлы, якія вы вылучыце ў які з'явіўся дыялогу, будуць бачныя ў спісе злева."
@@ -961,196 +881,303 @@ msgstr "Шрыфт:"
msgid "Size:"
msgstr "Памер:"
-#: komparepart/kompareprefdlg.cpp:33
+#: libdialogpages/viewpage.cpp:119
#, fuzzy
-msgid "Preferences"
-msgstr "Параметры"
+msgid "&Fonts"
+msgstr "Шрыфт:"
-#: komparepart/kompareprefdlg.cpp:39
+#: libdiff2/komparemodellist.cpp:61
#, fuzzy
-msgid "View Settings"
-msgstr "Налады выгляду"
+msgid "&Apply Difference"
+msgstr "Ужыць адрозненні"
-#: komparepart/kompareprefdlg.cpp:43
+#: libdiff2/komparemodellist.cpp:64
#, fuzzy
-msgid "Diff Settings"
-msgstr "Налады адрозненняў"
+msgid "Un&apply Difference"
+msgstr "Адмяніць адрозненні"
-#: komparepart/kompare_part.cpp:165
+#: libdiff2/komparemodellist.cpp:67
#, fuzzy
-msgid "Save &All"
-msgstr "Захаваць усё"
+msgid "App&ly All"
+msgstr "Ужыць усё"
-#: komparepart/kompare_part.cpp:168
+#: libdiff2/komparemodellist.cpp:70
#, fuzzy
-msgid "Save .&diff..."
-msgstr "Захаваць адрозненні ў файл .diff..."
+msgid "&Unapply All"
+msgstr "Адмяніць усё"
-#: komparepart/kompare_part.cpp:171
+#: libdiff2/komparemodellist.cpp:73
#, fuzzy
-msgid "Swap Source with Destination"
-msgstr "Памяняць месцамі крыніца і прызначэнне"
+msgid "P&revious File"
+msgstr "Папярэдні файл"
-#: komparepart/kompare_part.cpp:174
+#: libdiff2/komparemodellist.cpp:76
#, fuzzy
-msgid "Show Statistics"
-msgstr "Паказаць статыстыку"
+msgid "N&ext File"
+msgstr "Наступны файл"
-#: komparepart/kompare_part.cpp:269
+#: libdiff2/komparemodellist.cpp:79
#, fuzzy
-msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
-msgstr "<qt>Немагчыма загрузіць спасылку <b>%1</b>.</qt>"
+msgid "&Previous Difference"
+msgstr "Папярэдняе адрозненне"
-#: komparepart/kompare_part.cpp:281
+#: libdiff2/komparemodellist.cpp:82
#, fuzzy
-msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
-msgstr "<qt>Немагчыма адкрыць <b>%1</b>.</qt>"
+msgid "&Next Difference"
+msgstr "Наступнае адрозненне"
-#: komparepart/kompare_part.cpp:425
+#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
#, fuzzy
-msgid "Diff Options"
-msgstr "Параметры Diff"
+msgid ""
+"<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff "
+"file.</qt>"
+msgstr ""
+"<qt>Няма макетаў або адрозненняў. Файл <b>%1</b> не з'яўляецца файлам "
+"фармату diff.</qt>"
-#: komparepart/kompare_part.cpp:443
+#: libdiff2/komparemodellist.cpp:246
#, fuzzy
-msgid "*.diff *.dif *.patch|Patch Files"
-msgstr "*.diff *.dif *.patch|Файлы адрозненняў (*.diff *.dif *.patch)"
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
+"qt>"
+msgstr ""
+"<qt>Паўсталі праблемы падчас ужывання diff <b>%1</b> да файла <b>%2</b>.</qt>"
-#: komparepart/kompare_part.cpp:443
+#: libdiff2/komparemodellist.cpp:271
#, fuzzy
-msgid "Save .diff"
-msgstr "Захаваць .diff"
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>."
+"</qt>"
+msgstr ""
+"<qt>Паўсталі праблемы падчас ужывання diff <b>%1</b> да тэчкі <b>%2</b>.</qt>"
-#: komparepart/kompare_part.cpp:446
+#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
#, fuzzy
-msgid "The file exists or is write-protected; do you want to overwrite it?"
-msgstr "Файл ужо існуе. Замяніць яго?"
+msgid "Could not open a temporary file."
+msgstr "Не атрымоўваецца адкрыць часовы файл."
-#: komparepart/kompare_part.cpp:446
+#: libdiff2/komparemodellist.cpp:350
#, fuzzy
-msgid "File Exists"
-msgstr "Файл ужо існуе"
+msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+msgstr ""
+"<qt>Не атрымоўваецца запісаць у часовы файл <b>%1</b>, выдаляемы яго.</qt>"
-#: komparepart/kompare_part.cpp:446
+#: libdiff2/komparemodellist.cpp:368
#, fuzzy
-msgid "Overwrite"
-msgstr "Замяніць"
+msgid ""
+"<qt>Could not create destination directory <b>%1</b>.\n"
+"The file has not been saved.</qt>"
+msgstr ""
+"<qt>Не атрымалася стварыць канчатковую тэчку <b>%1</b>.\n"
+"Файл не захаваны.</qt>"
-#: komparepart/kompare_part.cpp:446
+#: libdiff2/komparemodellist.cpp:383
#, fuzzy
-msgid "Do Not Overwrite"
-msgstr "Не замяняць"
+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>Не атрымоўваецца загрузіць часовы файл у кропку прызначэння <b>%1</b>. "
+"Часовы файл усё яшчэ даступны пад імем <b>%2</b>. Вы можаце ўручную "
+"скапіяваць яго ў патрэбнае месца.</qt>"
-#: komparepart/kompare_part.cpp:481
+#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
#, fuzzy
-msgid "KomparePart"
-msgstr "KomparePart"
+msgid "Could not parse diff output."
+msgstr "Не атрымоўваецца апрацаваць выснову diff."
-#: komparepart/kompare_part.cpp:493
+#: libdiff2/komparemodellist.cpp:451
#, fuzzy
-msgid "Running diff..."
-msgstr "Запушчаны diff..."
+msgid "The files are identical."
+msgstr "Усе файлы ідэнтычныя."
-#: komparepart/kompare_part.cpp:496
+#: libdiff2/komparemodellist.cpp:613
#, fuzzy
-msgid "Parsing diff output..."
-msgstr "Апрацоўваецца выснова diff..."
+msgid "Could not write to the temporary file."
+msgstr "Не атрымоўваецца запісаць у часовы файл."
-#: komparepart/kompare_part.cpp:545
+#: main.cpp:33
#, fuzzy
-msgid "Comparing file %1 with file %2"
-msgstr "Параўноўваюцца файл %1 з файлам %2"
+msgid ""
+"A program to view the differences between files and optionally generate a "
+"diff"
+msgstr ""
+"Праграма для прагляду адрозненняў паміж файламі і стварэнні файла diff."
-#: komparepart/kompare_part.cpp:550
+#: main.cpp:39
#, fuzzy
-msgid "Comparing files in %1 with files in %2"
-msgstr "Параўноўваюцца файлы ў %1 з файламі ў %2"
+msgid "This will compare URL1 with URL2"
+msgstr "Параўнанне \"Спасылкі1\" з \"Спасылкай2\""
-#: komparepart/kompare_part.cpp:555
-#, fuzzy, c-format
-msgid "Viewing diff output from %1"
-msgstr "Прагляд высновы diff з %1"
+#: main.cpp:40
+#, fuzzy
+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 ""
+"Адкрыць URL1, лічачы,што гэта выснова diff. URL1 таксама можа быць '-'. Гэта "
+"можна выкарыстаць, напрыклад, так: cvs diff | kompare -o -. Kompare "
+"праверыць, ці існуе арыгінальны файл, а затым змяшае з высновай diff і "
+"пакажа вынік. Ключ -n адмяняе праверку."
-#: komparepart/kompare_part.cpp:558
+#: main.cpp:41
#, fuzzy
-msgid "Blending diff output from %1 into file %2"
-msgstr "Змешванне высновы diff з файла %1 у файл %2"
+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 ""
+"Змяшаць URL2 і URL1, URL2 павінен быць высновай diff, а URL1 - (арыгінальны) "
+"файл або тэчка."
-#: komparepart/kompare_part.cpp:563
+#: main.cpp:42
#, fuzzy
-msgid "Blending diff output from %1 into folder %2"
-msgstr "Змешванне высновы diff з файла %1 у тэчку %2"
+msgid ""
+"Disables the check for automatically finding the original file(s) when using "
+"'-' as URL with the -o option."
+msgstr ""
+"Адключае праверку аўтаматычнага пошуку арыгінальнага файла(ов) пры "
+"выкарыстанні '-' у якасці крыніцы з опцыяй -o."
-#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709
+#: main.cpp:43
#, fuzzy
msgid ""
-"You have made changes to the destination file(s).\n"
-"Would you like to save them?"
+"Use this to specify the encoding when calling it from the command line. It "
+"will default to the local encoding if not specified."
msgstr ""
-"Файл прызначэння быў зменены.\n"
-"Вы жадаеце яго захаваць?"
+"Паказаць кадыроўку. Па змаўчанні будзе выкарыстоўвацца кадыроўка лакалі."
-#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+#: main.cpp:52
#, fuzzy
-msgid "Save Changes?"
-msgstr "Захаваць змены?"
+msgid "Kompare"
+msgstr "Kompare"
-#: komparepart/kompare_part.cpp:667
+#: main.cpp:54
#, fuzzy
-msgid ""
-"No diff file, or no 2 files have been diffed. Therefore no stats are available."
+msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
msgstr ""
-"Няма файла diff або параўнанне выраблена не па двух файлам. Статыстыка "
-"недаступная."
+"(c) 2001-2004, Джон Файербаух (John Firebaugh) і Отто Брюггеман (Otto "
+"Bruggeman)"
-#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
-#: komparepart/kompare_part.cpp:698
+#: main.cpp:55 main.cpp:56
#, fuzzy
-msgid "Diff Statistics"
-msgstr "Статыстыка адрозненняў"
+msgid "Author"
+msgstr "Аўтар"
-#: komparepart/kompare_part.cpp:673
+#: main.cpp:57
#, fuzzy
-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 ""
-"Статыстыка:\n"
-"\n"
-"Стары файл: %1\n"
-"Новы файл: %2\n"
-"\n"
-"Фармат: %3\n"
-"Колькасць не змененых: %4\n"
-"Колькасць адрозненняў: %5"
+msgid "Kompare icon artist"
+msgstr "Значкі"
-#: komparepart/kompare_part.cpp:686
+#: main.cpp:58
#, fuzzy
-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"
+msgid "A lot of good advice"
+msgstr "Шмат добрых рад"
+
+#: main.cpp:59
+#, fuzzy
+msgid "Cervisia diff viewer"
+msgstr "Прагляд адрозненняў у Cervisia"
+
+#: main.cpp:189
+#, fuzzy
+msgid "Compare these files or folder"
+msgstr "Параўнаць файлы або тэчку"
+
+#: komparepart/komparepartui.rc:4 kompareui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Файлы"
+
+#: komparepart/komparepartui.rc:13
+#, fuzzy, no-c-format
+msgid "&Difference"
+msgstr "Адрозненне"
+
+#: komparepart/komparepartui.rc:25 kompareui.rc:14
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Налады выгляду"
+
+#: komparepart/komparesaveoptionsbase.ui:41
+#, fuzzy, no-c-format
+msgid "Run Diff In"
+msgstr "Запусціць Diff у"
+
+#: komparepart/komparesaveoptionsbase.ui:84
+#, fuzzy, no-c-format
+msgid "Command Line"
+msgstr "Камандны радок"
+
+#: komparepart/komparesaveoptionsbase.ui:108
+#, fuzzy, no-c-format
+msgid "cd dir && diff -udHprNa -- source destination"
+msgstr "cd dir diff -udHprNa -- <крыніца> <прызначэнне>"
+
+#: komparepart/komparesaveoptionsbase.ui:118
+#, fuzzy, no-c-format
+msgid "Options"
+msgstr "Параметры"
+
+#: komparepart/komparesaveoptionsbase.ui:135
+#, fuzzy, no-c-format
+msgid "Look for smaller changes"
+msgstr "Пошук найменшых змен"
+
+#: komparepart/komparesaveoptionsbase.ui:146
+#, fuzzy, no-c-format
+msgid "Optimize for large files"
+msgstr "Аптымізацыя для вялікіх файлаў"
+
+#: komparepart/komparesaveoptionsbase.ui:157
+#, fuzzy, no-c-format
+msgid "Ignore changes in case"
+msgstr "Ігнараваць змены ў рэгістры літар"
+
+#: komparepart/komparesaveoptionsbase.ui:165
+#, fuzzy, no-c-format
+msgid "Expand tabs to spaces"
+msgstr "Замяніць табуляцыю прабеламі"
+
+#: komparepart/komparesaveoptionsbase.ui:173
+#, fuzzy, no-c-format
+msgid "Ignore added or removed empty lines"
+msgstr "Ігнараваць дададзеныя і выдаленыя пустыя радкі"
+
+#: komparepart/komparesaveoptionsbase.ui:181
+#, fuzzy, no-c-format
+msgid "Ignore changes in whitespace"
+msgstr "Ігнараваць змены прабелаў"
+
+#: komparepart/komparesaveoptionsbase.ui:189
+#, fuzzy, no-c-format
+msgid "Show function names"
+msgstr "Паказваць імёны функцый"
+
+#: komparepart/komparesaveoptionsbase.ui:200
+#, fuzzy, no-c-format
+msgid "Compare folders recursively"
+msgstr "Параўнаць тэчкі рэкурсіўна"
+
+#: komparepart/komparesaveoptionsbase.ui:211
+#, fuzzy, no-c-format
+msgid "Treat new files as empty"
+msgstr "Лічыць новыя файлы як пустыя"
+
+#: komparepart/komparesaveoptionsbase.ui:227
+#, fuzzy, no-c-format
+msgid "Format"
+msgstr "Фармат"
+
+#: komparepart/komparesaveoptionsbase.ui:287
+#, fuzzy, no-c-format
+msgid "Side-by-side"
+msgstr "Побач сябар з сябрам"
+
+#: kompareui.rc:27
+#, no-c-format
+msgid "Main Toolbar"
msgstr ""
-"Статыстыка:\n"
-"\n"
-"Колькасць файлаў у файле адрозненняў: %1\n"
-"Фармат: %2\n"
-"\n"
-"Бягучы стары файл: %3\n"
-"Бягучы новы файл: %4\n"
-"\n"
-"Колькасць не змененых: %5\n"
-"Колькасць адрозненняў: %6"
diff --git a/tde-i18n-bg/messages/tdesdk/kompare.po b/tde-i18n-bg/messages/tdesdk/kompare.po
index 5db61e38f3..464dd5f1ac 100644
--- a/tde-i18n-bg/messages/tdesdk/kompare.po
+++ b/tde-i18n-bg/messages/tdesdk/kompare.po
@@ -4,7 +4,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: 2007-08-31 17:51+0000\n"
"Last-Translator: Zlatko Popov <zlatkopopov@fsa-bg.org>\n"
"Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -14,331 +14,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: libdiff2/komparemodellist.cpp:61
-msgid "&Apply Difference"
-msgstr "&Прилагане на разликите"
-
-#: libdiff2/komparemodellist.cpp:64
-msgid "Un&apply Difference"
-msgstr "&Отмяна прилагането на разликите"
-
-#: libdiff2/komparemodellist.cpp:67
-msgid "App&ly All"
-msgstr "&Прилагане на всички"
-
-#: libdiff2/komparemodellist.cpp:70
-msgid "&Unapply All"
-msgstr "&Отмяна на прилагане на всички"
-
-#: libdiff2/komparemodellist.cpp:73
-msgid "P&revious File"
-msgstr "П&редишен файл"
-
-#: libdiff2/komparemodellist.cpp:76
-msgid "N&ext File"
-msgstr "&Следващ файл"
-
-#: libdiff2/komparemodellist.cpp:79
-msgid "&Previous Difference"
-msgstr "&Предишна разлика"
-
-#: libdiff2/komparemodellist.cpp:82
-msgid "&Next Difference"
-msgstr "&Следваща разлика"
-
-#: 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>Няма модели или разлики. Файлът: <b>%1</b> не е валиден diff файл.</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>Има проблеми при прилагането на разлика <b>%1</b> към файл <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>Има проблеми при прилагането на разлика <b>%1</b> към папка <b>%2</b>.</qt>"
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-msgid "Could not open a temporary file."
-msgstr "Временният файл не може да бъде творен."
-
-#: libdiff2/komparemodellist.cpp:350
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr ""
-"<qt>Записът във временният файл <b>%1</b> е невъзможен. Ще бъде изтрит.</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>Целева директория <b>%1</b> не може да бъде създадена.\n"
-"Файлът не е записан.</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>Временният файл в целевата директория <b>%1</b> не може да бъде зареден. "
-"Той е достъпен като: <b>%2</b>. Можете ръчно да го копирате в подходящото "
-"място..</qt>"
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-msgid "Could not parse diff output."
-msgstr "Данните за разликите не могат да бъдат обработени."
-
-#: libdiff2/komparemodellist.cpp:451
-msgid "The files are identical."
-msgstr "Файловете са същите."
-
-#: libdiff2/komparemodellist.cpp:613
-msgid "Could not write to the temporary file."
-msgstr "Записът във временния файл е невъзможен."
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, no-c-format
-msgid "&Difference"
-msgstr "&Разлика"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, no-c-format
-msgid "Run Diff In"
-msgstr "Изпълнение на Diff In"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, no-c-format
-msgid "Command Line"
-msgstr "Команден ред"
-
-#. 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 -- целеви източник"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, no-c-format
-msgid "Look for smaller changes"
-msgstr "Търсене на малки промени"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, no-c-format
-msgid "Optimize for large files"
-msgstr "Оптимизиране за големи файлове"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, no-c-format
-msgid "Ignore changes in case"
-msgstr "Игнориране на промените в регистъра"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, no-c-format
-msgid "Expand tabs to spaces"
-msgstr "Разширение на подпрозорците до интервалите"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
-#: rc.cpp:45
-#, no-c-format
-msgid "Ignore added or removed empty lines"
-msgstr "Игнориране на добавени или премахнатите празни редове"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr "Игнориране на промените в интервала"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, no-c-format
-msgid "Show function names"
-msgstr "Показване имената на функциите"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, no-c-format
-msgid "Compare folders recursively"
-msgstr "Сравняване на директориите рекурсивно"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
-#: rc.cpp:57
-#, no-c-format
-msgid "Treat new files as empty"
-msgstr "Третиране на файловете като празни"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
-#: rc.cpp:60
-#, no-c-format
-msgid "Format"
-msgstr "Формат"
-
-#. 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 "Контекст"
-
-#. 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 "Нормален"
-
-#. 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 "Обединен"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
-#: rc.cpp:78
-#, no-c-format
-msgid "Side-by-side"
-msgstr "Страна по страна"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
-#: libdialogpages/diffpage.cpp:251 rc.cpp:81
-#, no-c-format
-msgid "Number of context lines:"
-msgstr "Брой редове контекст:"
-
-#: main.cpp:33
-msgid ""
-"A program to view the differences between files and optionally generate a diff"
-msgstr "Програма за намиране (и генериране) на разлики между файлове"
-
-#: main.cpp:39
-msgid "This will compare URL1 with URL2"
-msgstr "Това ще сравни URL1 и 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 ""
-"Това ще отвори URL1 и ще очаква да са данни за разликите. URL1 може също така "
-"да бъде \"-\" и тогава ще бъде прочетен от позицията на стандартните входни "
-"данни. Например може да бъде използвано за cvs diff | kompare -o -. Ще бъдат "
-"проверени, за да види дали може да намери оригиналния файл(ове), да ги смеси и "
-"да покаже резултата. -n изключва проверката."
-
-#: 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 ""
-"Това ще смеси URL2 с URL1. URL2 се очаква да бъде данните за разлики, а URL1 - "
-"файлът или директорията, където да бъде смесването. "
-
-#: main.cpp:42
-msgid ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
-msgstr ""
-"Изключете отметката, ако искате автоматично да откривате оригиналния файл(ове) "
-"като използвате \"-\" като URL с опция -o."
-
-#: 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 ""
-"Използвайте това за да зададете кодовата таблица при извикване с команден ред. "
-"Ако не е посочите, ще бъде използвана тази по подразбиране."
-
-#: 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 и Otto Bruggeman"
-
-#: main.cpp:55 main.cpp:56
-msgid "Author"
-msgstr "Автор"
-
-#: 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"
-
-#: kompare_shell.cpp:398 main.cpp:185
-msgid "Compare Files or Folders"
-msgstr "Сравняване на файлове и папки"
-
-#: kompare_shell.cpp:399 main.cpp:186
-msgid "Source"
-msgstr "Източник"
-
-#: kompare_shell.cpp:400 main.cpp:187
-msgid "Destination"
-msgstr "Цел"
-
-#: kompare_shell.cpp:402 main.cpp:189
-msgid "Compare"
-msgstr "Сравняване"
-
-#: main.cpp:189
-msgid "Compare these files or folder"
-msgstr "Сравняване на тези файлове и папки"
-
-#: 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 ""
-"Ако в полетата сте въвели 2 имена на файлове или 2 папки, тогава този бутон ще "
-"бъде включен, а при натискането му ще започне сравняване на въведените файлове "
-"или папки. "
-
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Златко Попов"
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -444,21 +126,47 @@ msgstr "Смесване на тази директория или папка с
#: 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 ""
"Ако сте въвели име на файл или папка, а също така и файла с изходните данни, "
"тогава бутонът ще бъде активен. Когато го натиснете, ще се покаже прозорец, "
"където се смесват изходните данни, така че после можете да приложите "
"разликата(е) към файл(ове). "
+#: kompare_shell.cpp:398 main.cpp:185
+msgid "Compare Files or Folders"
+msgstr "Сравняване на файлове и папки"
+
+#: kompare_shell.cpp:399 main.cpp:186
+msgid "Source"
+msgstr "Източник"
+
+#: kompare_shell.cpp:400 main.cpp:187
+msgid "Destination"
+msgstr "Цел"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
+msgstr "Сравняване"
+
#: kompare_shell.cpp:402
msgid "Compare these files or folders"
msgstr "Сравняване на тези файлове или папки"
+#: 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 ""
+"Ако в полетата сте въвели 2 имена на файлове или 2 папки, тогава този бутон "
+"ще бъде включен, а при натискането му ще започне сравняване на въведените "
+"файлове или папки. "
+
#: kompare_shell.cpp:439
msgid "Text View"
msgstr "Изглед \"текст\""
@@ -554,19 +262,231 @@ msgstr "Неизвестен"
msgid "KompareNavTreePart"
msgstr "KompareNavTreePart"
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
-msgstr "Тук въведете файловете, които искате да сравните."
+#: komparepart/kompare_part.cpp:165
+msgid "Save &All"
+msgstr "Запис на &всичко"
+
+#: komparepart/kompare_part.cpp:168
+msgid "Save .&diff..."
+msgstr "Запис на &разликите..."
+
+#: komparepart/kompare_part.cpp:171
+msgid "Swap Source with Destination"
+msgstr "Запомняне на източника и направлението"
+
+#: komparepart/kompare_part.cpp:174
+msgid "Show Statistics"
+msgstr "Показване на статистика"
+
+#: komparepart/kompare_part.cpp:269
+msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+msgstr "<qt>Адресът (URL) <b>%1</b> не може да бъде зареден.</qt>"
+
+#: komparepart/kompare_part.cpp:281
+msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+msgstr "<qt>Адресът (URL) <b>%1</b> не съществува на компютъра.</qt>"
+
+#: komparepart/kompare_part.cpp:425
+msgid "Diff Options"
+msgstr "Опции за разлики"
+
+#: komparepart/kompare_part.cpp:443
+msgid "*.diff *.dif *.patch|Patch Files"
+msgstr "*.diff *.dif *.patch|Кръпки"
+
+#: komparepart/kompare_part.cpp:443
+msgid "Save .diff"
+msgstr "Запис на .diff"
+
+#: komparepart/kompare_part.cpp:446
+msgid "The file exists or is write-protected; do you want to overwrite it?"
+msgstr ""
+"Вече има такъв файл или е защитен от запис. Искате ли да бъде презаписан?"
+
+#: komparepart/kompare_part.cpp:446
+msgid "File Exists"
+msgstr "Вече има такъв файл"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Overwrite"
+msgstr "Презапис"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Do Not Overwrite"
+msgstr "Без презапис"
+
+#: komparepart/kompare_part.cpp:481
+msgid "KomparePart"
+msgstr "KomparePart"
+
+#: komparepart/kompare_part.cpp:493
+msgid "Running diff..."
+msgstr "Проверка за разлики..."
+
+#: komparepart/kompare_part.cpp:496
+msgid "Parsing diff output..."
+msgstr "Обработка на данните за разликите..."
+
+#: komparepart/kompare_part.cpp:545
+msgid "Comparing file %1 with file %2"
+msgstr "Сравняване на файл %1 с файл %2"
+
+#: komparepart/kompare_part.cpp:550
+msgid "Comparing files in %1 with files in %2"
+msgstr "Сравняване на файлове в %1 с файлове в %2"
+
+#: komparepart/kompare_part.cpp:555
+#, c-format
+msgid "Viewing diff output from %1"
+msgstr "Преглед на разликите от %1"
+
+#: komparepart/kompare_part.cpp:558
+msgid "Blending diff output from %1 into file %2"
+msgstr "Смесване на разликите за%1 във файл %2"
+
+#: komparepart/kompare_part.cpp:563
+msgid "Blending diff output from %1 into folder %2"
+msgstr "Смесване на разликите за%1 във папка %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 ""
+"Направихте промени в целевия файл(ове).\n"
+"Искате ли да ги запишете?"
+
+#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+msgid "Save Changes?"
+msgstr "Запис на промените?"
+
+#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276
+#: libdialogpages/diffpage.cpp:244
+#, no-c-format
+msgid "Unified"
+msgstr "Обединен"
+
+#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244
+#: libdialogpages/diffpage.cpp:238
+#, no-c-format
+msgid "Context"
+msgstr "Контекст"
+
+#: 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 "Нормален"
+
+#: komparepart/kompare_part.cpp:667
+msgid ""
+"No diff file, or no 2 files have been diffed. Therefore no stats are "
+"available."
+msgstr ""
+"Или няма файл с разлики, или не са сравнени два файла. Следователно няма "
+"статистика."
+
+#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
+#: komparepart/kompare_part.cpp:698
+msgid "Diff Statistics"
+msgstr "Статистика за разлики"
+
+#: 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 ""
+"Статистика:\n"
+"\n"
+"Стар файл: %1\n"
+"Нов файл: %2\n"
+"\n"
+"Формат: %3\n"
+"Брой парчета: %4\n"
+"Брой разлики: %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 ""
+"Статистика:\n"
+"\n"
+"Брой файлове във файла за разлики: %1\n"
+"Format: %2\n"
+"\n"
+"Текущ стар файл: %3\n"
+"Текущ нов файл: %4\n"
+"\n"
+"Брой парчета: %5\n"
+"Брой разлики: %6"
+
+#: komparepart/kompareprefdlg.cpp:33
+msgid "Preferences"
+msgstr "Настройки"
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View"
+msgstr "Изглед \"текст\""
+
+#: komparepart/kompareprefdlg.cpp:39
+msgid "View Settings"
+msgstr "Настройки на изглед"
#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
msgid "Diff"
msgstr "Разлики"
+#: komparepart/kompareprefdlg.cpp:43
+msgid "Diff Settings"
+msgstr "Настройки на разлики"
+
+#: kompareurldialog.cpp:41
+#, fuzzy
+msgid "Files"
+msgstr "&Файлове"
+
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr "Тук въведете файловете, които искате да сравните."
+
#: kompareurldialog.cpp:47
msgid "Here you can change the options for comparing the files."
msgstr "Тук можете да промените опциите за сравняване на файлове."
#: kompareurldialog.cpp:53
+#, fuzzy
+msgid "Appearance"
+msgstr "&Изглед"
+
+#: kompareurldialog.cpp:53
msgid "Here you can change the options for the view."
msgstr "Тук можете да промените опциите за изгледа."
@@ -594,9 +514,9 @@ msgstr "Формат на изходните данни"
#: 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 ""
"Изберете формата на изходните данни за разликите. Unified е сред най-често "
"използваните, защото е четим. Разработчиците на TDE най-много го харесват за "
@@ -606,6 +526,11 @@ msgstr ""
msgid "Lines of Context"
msgstr "Редове контекст"
+#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251
+#, no-c-format
+msgid "Number of context lines:"
+msgstr "Брой редове контекст:"
+
#: libdialogpages/diffpage.cpp:253
msgid ""
"The number of context lines is normally 2 or 3. This makes the diff readable "
@@ -730,19 +655,19 @@ msgstr "Изключение - шаблон на файл"
#: 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 ""
"Ако е включена тази отметка, можете да въведете шаблон на шел вдясно или да "
"изберете елементи от списъка."
#: 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 ""
-"Тук можете да въведете или премахнете шаблон на шел или да изберете елементи от "
-"списъка."
+"Тук можете да въведете или премахнете шаблон на шел или да изберете елементи "
+"от списъка."
#: libdialogpages/diffpage.cpp:338
msgid "File with Filenames to Exclude"
@@ -756,19 +681,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 ""
"Тук можете да въведете адрес на файл със шаблони на шелове, които да бъдат "
"игнорирани по време на сравняването на папките."
#: 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 ""
-"Всеки файл, който маркирате в изскачащия прозорец, ще бъде поставен отдясно на "
-"бутона."
+"Всеки файл, който маркирате в изскачащия прозорец, ще бъде поставен отдясно "
+"на бутона."
#: libdialogpages/diffpage.cpp:352
msgid "&Exclude"
@@ -834,168 +759,272 @@ msgstr "Шрифт:"
msgid "Size:"
msgstr "Размер:"
-#: komparepart/kompareprefdlg.cpp:33
-msgid "Preferences"
-msgstr "Настройки"
-
-#: komparepart/kompareprefdlg.cpp:39
-msgid "View Settings"
-msgstr "Настройки на изглед"
-
-#: komparepart/kompareprefdlg.cpp:43
-msgid "Diff Settings"
-msgstr "Настройки на разлики"
-
-#: komparepart/kompare_part.cpp:165
-msgid "Save &All"
-msgstr "Запис на &всичко"
+#: libdialogpages/viewpage.cpp:119
+#, fuzzy
+msgid "&Fonts"
+msgstr "Шрифт:"
-#: komparepart/kompare_part.cpp:168
-msgid "Save .&diff..."
-msgstr "Запис на &разликите..."
+#: libdiff2/komparemodellist.cpp:61
+msgid "&Apply Difference"
+msgstr "&Прилагане на разликите"
-#: komparepart/kompare_part.cpp:171
-msgid "Swap Source with Destination"
-msgstr "Запомняне на източника и направлението"
+#: libdiff2/komparemodellist.cpp:64
+msgid "Un&apply Difference"
+msgstr "&Отмяна прилагането на разликите"
-#: komparepart/kompare_part.cpp:174
-msgid "Show Statistics"
-msgstr "Показване на статистика"
+#: libdiff2/komparemodellist.cpp:67
+msgid "App&ly All"
+msgstr "&Прилагане на всички"
-#: komparepart/kompare_part.cpp:269
-msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
-msgstr "<qt>Адресът (URL) <b>%1</b> не може да бъде зареден.</qt>"
+#: libdiff2/komparemodellist.cpp:70
+msgid "&Unapply All"
+msgstr "&Отмяна на прилагане на всички"
-#: komparepart/kompare_part.cpp:281
-msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
-msgstr "<qt>Адресът (URL) <b>%1</b> не съществува на компютъра.</qt>"
+#: libdiff2/komparemodellist.cpp:73
+msgid "P&revious File"
+msgstr "П&редишен файл"
-#: komparepart/kompare_part.cpp:425
-msgid "Diff Options"
-msgstr "Опции за разлики"
+#: libdiff2/komparemodellist.cpp:76
+msgid "N&ext File"
+msgstr "&Следващ файл"
-#: komparepart/kompare_part.cpp:443
-msgid "*.diff *.dif *.patch|Patch Files"
-msgstr "*.diff *.dif *.patch|Кръпки"
+#: libdiff2/komparemodellist.cpp:79
+msgid "&Previous Difference"
+msgstr "&Предишна разлика"
-#: komparepart/kompare_part.cpp:443
-msgid "Save .diff"
-msgstr "Запис на .diff"
+#: libdiff2/komparemodellist.cpp:82
+msgid "&Next Difference"
+msgstr "&Следваща разлика"
-#: komparepart/kompare_part.cpp:446
-msgid "The file exists or is write-protected; do you want to overwrite it?"
+#: 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>Няма модели или разлики. Файлът: <b>%1</b> не е валиден diff файл.</qt>"
-#: komparepart/kompare_part.cpp:446
-msgid "File Exists"
-msgstr "Вече има такъв файл"
+#: libdiff2/komparemodellist.cpp:246
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
+"qt>"
+msgstr ""
+"<qt>Има проблеми при прилагането на разлика <b>%1</b> към файл <b>%2</b>.</"
+"qt>"
-#: komparepart/kompare_part.cpp:446
-msgid "Overwrite"
-msgstr "Презапис"
+#: libdiff2/komparemodellist.cpp:271
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>."
+"</qt>"
+msgstr ""
+"<qt>Има проблеми при прилагането на разлика <b>%1</b> към папка <b>%2</b>.</"
+"qt>"
-#: komparepart/kompare_part.cpp:446
-msgid "Do Not Overwrite"
-msgstr "Без презапис"
+#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
+msgid "Could not open a temporary file."
+msgstr "Временният файл не може да бъде творен."
-#: komparepart/kompare_part.cpp:481
-msgid "KomparePart"
-msgstr "KomparePart"
+#: libdiff2/komparemodellist.cpp:350
+msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+msgstr ""
+"<qt>Записът във временният файл <b>%1</b> е невъзможен. Ще бъде изтрит.</qt>"
-#: komparepart/kompare_part.cpp:493
-msgid "Running diff..."
-msgstr "Проверка за разлики..."
+#: libdiff2/komparemodellist.cpp:368
+msgid ""
+"<qt>Could not create destination directory <b>%1</b>.\n"
+"The file has not been saved.</qt>"
+msgstr ""
+"<qt>Целева директория <b>%1</b> не може да бъде създадена.\n"
+"Файлът не е записан.</qt>"
-#: komparepart/kompare_part.cpp:496
-msgid "Parsing diff output..."
-msgstr "Обработка на данните за разликите..."
+#: 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>Временният файл в целевата директория <b>%1</b> не може да бъде зареден. "
+"Той е достъпен като: <b>%2</b>. Можете ръчно да го копирате в подходящото "
+"място..</qt>"
-#: komparepart/kompare_part.cpp:545
-msgid "Comparing file %1 with file %2"
-msgstr "Сравняване на файл %1 с файл %2"
+#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
+msgid "Could not parse diff output."
+msgstr "Данните за разликите не могат да бъдат обработени."
-#: komparepart/kompare_part.cpp:550
-msgid "Comparing files in %1 with files in %2"
-msgstr "Сравняване на файлове в %1 с файлове в %2"
+#: libdiff2/komparemodellist.cpp:451
+msgid "The files are identical."
+msgstr "Файловете са същите."
-#: komparepart/kompare_part.cpp:555
-#, c-format
-msgid "Viewing diff output from %1"
-msgstr "Преглед на разликите от %1"
+#: libdiff2/komparemodellist.cpp:613
+msgid "Could not write to the temporary file."
+msgstr "Записът във временния файл е невъзможен."
-#: komparepart/kompare_part.cpp:558
-msgid "Blending diff output from %1 into file %2"
-msgstr "Смесване на разликите за%1 във файл %2"
+#: main.cpp:33
+msgid ""
+"A program to view the differences between files and optionally generate a "
+"diff"
+msgstr "Програма за намиране (и генериране) на разлики между файлове"
-#: komparepart/kompare_part.cpp:563
-msgid "Blending diff output from %1 into folder %2"
-msgstr "Смесване на разликите за%1 във папка %2"
+#: main.cpp:39
+msgid "This will compare URL1 with URL2"
+msgstr "Това ще сравни URL1 и URL2"
-#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709
+#: main.cpp:40
msgid ""
-"You have made changes to the destination file(s).\n"
-"Would you like to save them?"
+"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 ""
-"Направихте промени в целевия файл(ове).\n"
-"Искате ли да ги запишете?"
-
-#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
-msgid "Save Changes?"
-msgstr "Запис на промените?"
+"Това ще отвори URL1 и ще очаква да са данни за разликите. URL1 може също "
+"така да бъде \"-\" и тогава ще бъде прочетен от позицията на стандартните "
+"входни данни. Например може да бъде използвано за cvs diff | kompare -o -. "
+"Ще бъдат проверени, за да види дали може да намери оригиналния файл(ове), да "
+"ги смеси и да покаже резултата. -n изключва проверката."
-#: komparepart/kompare_part.cpp:667
+#: main.cpp:41
msgid ""
-"No diff file, or no 2 files have been diffed. Therefore no stats are available."
+"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 ""
-"Или няма файл с разлики, или не са сравнени два файла. Следователно няма "
-"статистика."
-
-#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
-#: komparepart/kompare_part.cpp:698
-msgid "Diff Statistics"
-msgstr "Статистика за разлики"
+"Това ще смеси URL2 с URL1. URL2 се очаква да бъде данните за разлики, а URL1 "
+"- файлът или директорията, където да бъде смесването. "
-#: 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 ""
-"Статистика:\n"
-"\n"
-"Стар файл: %1\n"
-"Нов файл: %2\n"
-"\n"
-"Формат: %3\n"
-"Брой парчета: %4\n"
-"Брой разлики: %5"
+"Изключете отметката, ако искате автоматично да откривате оригиналния "
+"файл(ове) като използвате \"-\" като URL с опция -o."
-#: 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 ""
+"Използвайте това за да зададете кодовата таблица при извикване с команден "
+"ред. Ако не е посочите, ще бъде използвана тази по подразбиране."
+
+#: 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 и Otto Bruggeman"
+
+#: main.cpp:55 main.cpp:56
+msgid "Author"
+msgstr "Автор"
+
+#: 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"
+
+#: main.cpp:189
+msgid "Compare these files or folder"
+msgstr "Сравняване на тези файлове и папки"
+
+#: komparepart/komparepartui.rc:4 kompareui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Файлове"
+
+#: komparepart/komparepartui.rc:13
+#, no-c-format
+msgid "&Difference"
+msgstr "&Разлика"
+
+#: komparepart/komparepartui.rc:25 kompareui.rc:14
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Настройки на изглед"
+
+#: komparepart/komparesaveoptionsbase.ui:41
+#, no-c-format
+msgid "Run Diff In"
+msgstr "Изпълнение на Diff In"
+
+#: komparepart/komparesaveoptionsbase.ui:84
+#, no-c-format
+msgid "Command Line"
+msgstr "Команден ред"
+
+#: komparepart/komparesaveoptionsbase.ui:108
+#, no-c-format
+msgid "cd dir && diff -udHprNa -- source destination"
+msgstr "cd dir && diff -udHprNa -- целеви източник"
+
+#: komparepart/komparesaveoptionsbase.ui:118
+#, fuzzy, no-c-format
+msgid "Options"
+msgstr "&Опции"
+
+#: komparepart/komparesaveoptionsbase.ui:135
+#, no-c-format
+msgid "Look for smaller changes"
+msgstr "Търсене на малки промени"
+
+#: komparepart/komparesaveoptionsbase.ui:146
+#, no-c-format
+msgid "Optimize for large files"
+msgstr "Оптимизиране за големи файлове"
+
+#: komparepart/komparesaveoptionsbase.ui:157
+#, no-c-format
+msgid "Ignore changes in case"
+msgstr "Игнориране на промените в регистъра"
+
+#: komparepart/komparesaveoptionsbase.ui:165
+#, no-c-format
+msgid "Expand tabs to spaces"
+msgstr "Разширение на подпрозорците до интервалите"
+
+#: komparepart/komparesaveoptionsbase.ui:173
+#, no-c-format
+msgid "Ignore added or removed empty lines"
+msgstr "Игнориране на добавени или премахнатите празни редове"
+
+#: komparepart/komparesaveoptionsbase.ui:181
+#, no-c-format
+msgid "Ignore changes in whitespace"
+msgstr "Игнориране на промените в интервала"
+
+#: komparepart/komparesaveoptionsbase.ui:189
+#, no-c-format
+msgid "Show function names"
+msgstr "Показване имената на функциите"
+
+#: komparepart/komparesaveoptionsbase.ui:200
+#, no-c-format
+msgid "Compare folders recursively"
+msgstr "Сравняване на директориите рекурсивно"
+
+#: komparepart/komparesaveoptionsbase.ui:211
+#, no-c-format
+msgid "Treat new files as empty"
+msgstr "Третиране на файловете като празни"
+
+#: komparepart/komparesaveoptionsbase.ui:227
+#, no-c-format
+msgid "Format"
+msgstr "Формат"
+
+#: komparepart/komparesaveoptionsbase.ui:287
+#, no-c-format
+msgid "Side-by-side"
+msgstr "Страна по страна"
+
+#: kompareui.rc:27
+#, no-c-format
+msgid "Main Toolbar"
msgstr ""
-"Статистика:\n"
-"\n"
-"Брой файлове във файла за разлики: %1\n"
-"Format: %2\n"
-"\n"
-"Текущ стар файл: %3\n"
-"Текущ нов файл: %4\n"
-"\n"
-"Брой парчета: %5\n"
-"Брой разлики: %6"
diff --git a/tde-i18n-br/messages/tdesdk/kompare.po b/tde-i18n-br/messages/tdesdk/kompare.po
index cea39b88a1..645e517c61 100644
--- a/tde-i18n-br/messages/tdesdk/kompare.po
+++ b/tde-i18n-br/messages/tdesdk/kompare.po
@@ -5,7 +5,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: 2002-07-02 08:32+200\n"
"Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
"Language-Team: Brezhoneg <Suav.Icb@wanadoo.fr>\n"
@@ -14,310 +14,13 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: libdiff2/komparemodellist.cpp:61
-msgid "&Apply Difference"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:64
-msgid "Un&apply Difference"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:67
-msgid "App&ly All"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:70
-msgid "&Unapply All"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:73
-msgid "P&revious File"
-msgstr "Restr dia&raok"
-
-#: libdiff2/komparemodellist.cpp:76
-msgid "N&ext File"
-msgstr "Restr a h&eul"
-
-#: libdiff2/komparemodellist.cpp:79
-msgid "&Previous Difference"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:82
-msgid "&Next Difference"
-msgstr ""
-
-#: 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 ""
-
-#: libdiff2/komparemodellist.cpp:246
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:271
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>"
-".</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-msgid "Could not open a temporary file."
-msgstr "N'hellan ket digeriñ ur restr padennek."
-
-#: libdiff2/komparemodellist.cpp:350
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr ""
-"<qt>Ne m'eus ket gallet skrivañ d'ar restr padennek <b>%1</b>"
-", emaon o lemel anezhañ.</qt>"
-
-#: libdiff2/komparemodellist.cpp:368
-msgid ""
-"<qt>Could not create destination directory <b>%1</b>.\n"
-"The file has not been saved.</qt>"
-msgstr ""
-
-#: 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 ""
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-msgid "Could not parse diff output."
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:451
-msgid "The files are identical."
-msgstr "Heñvel eo ar restroù."
-
-#: libdiff2/komparemodellist.cpp:613
-msgid "Could not write to the temporary file."
-msgstr "Ne m'eus ket skrivañ d'ar restr padennek."
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, no-c-format
-msgid "&Difference"
-msgstr "&Difereñs"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, no-c-format
-msgid "Run Diff In"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, no-c-format
-msgid "Command Line"
-msgstr "Linenn urzhiañ"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 108
-#: rc.cpp:27
-#, no-c-format
-msgid "cd dir && diff -udHprNa -- source destination"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, no-c-format
-msgid "Look for smaller changes"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, no-c-format
-msgid "Optimize for large files"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, no-c-format
-msgid "Ignore changes in case"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, no-c-format
-msgid "Expand tabs to spaces"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
-#: rc.cpp:45
-#, no-c-format
-msgid "Ignore added or removed empty lines"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, no-c-format
-msgid "Show function names"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, no-c-format
-msgid "Compare folders recursively"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
-#: rc.cpp:57
-#, no-c-format
-msgid "Treat new files as empty"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
-#: rc.cpp:60
-#, no-c-format
-msgid "Format"
-msgstr "Furmadiñ"
-
-#. 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 ""
-
-#. 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 ""
-
-#. 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 "Boas"
-
-#. 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 ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
-#: rc.cpp:78
-#, no-c-format
-msgid "Side-by-side"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
-#: libdialogpages/diffpage.cpp:251 rc.cpp:81
-#, no-c-format
-msgid "Number of context lines:"
-msgstr ""
-
-#: main.cpp:33
-msgid ""
-"A program to view the differences between files and optionally generate a diff"
-msgstr ""
-
-#: main.cpp:39
-msgid "This will compare URL1 with URL2"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: main.cpp:42
-msgid ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
-msgstr ""
-
-#: 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 ""
-
-#: 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 hag Otto Bruggeman"
-
-#: main.cpp:55 main.cpp:56
-msgid "Author"
-msgstr "Oberour"
-
-#: main.cpp:57
-msgid "Kompare icon artist"
-msgstr ""
-
-#: main.cpp:58
-msgid "A lot of good advice"
-msgstr ""
-
-#: main.cpp:59
-msgid "Cervisia diff viewer"
-msgstr ""
-
-#: kompare_shell.cpp:398 main.cpp:185
-msgid "Compare Files or Folders"
-msgstr ""
-
-#: kompare_shell.cpp:399 main.cpp:186
-msgid "Source"
-msgstr "Tarzh"
-
-#: kompare_shell.cpp:400 main.cpp:187
-msgid "Destination"
-msgstr "Dehaezadur"
-
-#: kompare_shell.cpp:402 main.cpp:189
-msgid "Compare"
-msgstr ""
-
-#: main.cpp:189
-msgid "Compare these files or folder"
-msgstr ""
-
-#: 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 ""
-
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Thierry Vignaud, Jañ-Mai Drapier"
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -415,17 +118,40 @@ msgstr ""
#: 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 ""
+
+#: kompare_shell.cpp:398 main.cpp:185
+msgid "Compare Files or Folders"
+msgstr ""
+
+#: kompare_shell.cpp:399 main.cpp:186
+msgid "Source"
+msgstr "Tarzh"
+
+#: kompare_shell.cpp:400 main.cpp:187
+msgid "Destination"
+msgstr "Dehaezadur"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
msgstr ""
#: kompare_shell.cpp:402
msgid "Compare these files or folders"
msgstr ""
+#: 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 ""
+
#: kompare_shell.cpp:439
msgid "Text View"
msgstr "Gwel ar skrid"
@@ -509,19 +235,208 @@ msgstr "Dianav"
msgid "KompareNavTreePart"
msgstr "KompareNavTreePart"
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
+#: komparepart/kompare_part.cpp:165
+msgid "Save &All"
+msgstr "Enrol&lañ an holl re"
+
+#: komparepart/kompare_part.cpp:168
+msgid "Save .&diff..."
+msgstr ""
+
+#: komparepart/kompare_part.cpp:171
+msgid "Swap Source with Destination"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:174
+msgid "Show Statistics"
+msgstr "Diskouez ar stadegoù"
+
+#: komparepart/kompare_part.cpp:269
+msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+msgstr "<qt>N'em eus ket enkargañ an URL <b>%1</b>.</qt>"
+
+#: komparepart/kompare_part.cpp:281
+msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+msgstr "<qt>N'eo ket endeo an URL <b>%1</b> e-barzh ho reizhiad.</qt>"
+
+#: komparepart/kompare_part.cpp:425
+msgid "Diff Options"
+msgstr "Dibaboù diff"
+
+#: komparepart/kompare_part.cpp:443
+msgid "*.diff *.dif *.patch|Patch Files"
+msgstr "*.diff *.dif *.patch|Restroù Patch"
+
+#: komparepart/kompare_part.cpp:443
+msgid "Save .diff"
+msgstr "Enrollañ .diff"
+
+#: komparepart/kompare_part.cpp:446
+msgid "The file exists or is write-protected; do you want to overwrite it?"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:446
+msgid "File Exists"
+msgstr "Ar restr a zo endeo"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Overwrite"
+msgstr "Rasklañ"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Do Not Overwrite"
+msgstr "Ne rasklit ket"
+
+#: komparepart/kompare_part.cpp:481
+msgid "KomparePart"
+msgstr "KomparePart"
+
+#: komparepart/kompare_part.cpp:493
+msgid "Running diff..."
+msgstr "Emaon o seveniñ diff ..."
+
+#: komparepart/kompare_part.cpp:496
+msgid "Parsing diff output..."
+msgstr ""
+
+#: komparepart/kompare_part.cpp:545
+msgid "Comparing file %1 with file %2"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:550
+msgid "Comparing files in %1 with files in %2"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:555
+#, c-format
+msgid "Viewing diff output from %1"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:558
+msgid "Blending diff output from %1 into file %2"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:563
+msgid "Blending diff output from %1 into folder %2"
+msgstr ""
+
+#: 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 ""
+
+#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+msgid "Save Changes?"
+msgstr "Enrollañ ar c'hemmoù ?"
+
+#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276
+#: libdialogpages/diffpage.cpp:244
+#, no-c-format
+msgid "Unified"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244
+#: libdialogpages/diffpage.cpp:238
+#, no-c-format
+msgid "Context"
+msgstr ""
+
+#: 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 ""
+
+#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260
+#: libdialogpages/diffpage.cpp:241
+#, no-c-format
+msgid "Normal"
+msgstr "Boas"
+
+#: komparepart/kompare_part.cpp:667
+msgid ""
+"No diff file, or no 2 files have been diffed. Therefore no stats are "
+"available."
+msgstr ""
+
+#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
+#: komparepart/kompare_part.cpp:698
+msgid "Diff Statistics"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+#: komparepart/kompareprefdlg.cpp:33
+msgid "Preferences"
+msgstr "Dibaboù"
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View"
+msgstr "Gwel ar skrid"
+
+#: komparepart/kompareprefdlg.cpp:39
+msgid "View Settings"
+msgstr "Sell ouzh an dibarzhoù"
+
#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
msgid "Diff"
msgstr "Diff"
+#: komparepart/kompareprefdlg.cpp:43
+msgid "Diff Settings"
+msgstr ""
+
+#: kompareurldialog.cpp:41
+#, fuzzy
+msgid "Files"
+msgstr "&Restroù"
+
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr ""
+
#: kompareurldialog.cpp:47
msgid "Here you can change the options for comparing the files."
msgstr ""
#: kompareurldialog.cpp:53
+#, fuzzy
+msgid "Appearance"
+msgstr "&Neuziadur"
+
+#: kompareurldialog.cpp:53
msgid "Here you can change the options for the view."
msgstr "Amañ e c'hellit kemmañ dibarzhoù ar gwell."
@@ -546,15 +461,20 @@ msgstr "Furmad ezkas"
#: 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 ""
#: libdialogpages/diffpage.cpp:247
msgid "Lines of Context"
msgstr ""
+#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251
+#, no-c-format
+msgid "Number of context lines:"
+msgstr ""
+
#: libdialogpages/diffpage.cpp:253
msgid ""
"The number of context lines is normally 2 or 3. This makes the diff readable "
@@ -672,14 +592,14 @@ msgstr ""
#: 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 ""
#: 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 ""
#: libdialogpages/diffpage.cpp:338
@@ -693,14 +613,14 @@ 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 ""
#: 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 ""
#: libdialogpages/diffpage.cpp:352
@@ -767,145 +687,252 @@ msgstr "Nodrezh :"
msgid "Size:"
msgstr "Ment :"
-#: komparepart/kompareprefdlg.cpp:33
-msgid "Preferences"
-msgstr "Dibaboù"
+#: libdialogpages/viewpage.cpp:119
+#, fuzzy
+msgid "&Fonts"
+msgstr "Nodrezh :"
-#: komparepart/kompareprefdlg.cpp:39
-msgid "View Settings"
-msgstr "Sell ouzh an dibarzhoù"
+#: libdiff2/komparemodellist.cpp:61
+msgid "&Apply Difference"
+msgstr ""
-#: komparepart/kompareprefdlg.cpp:43
-msgid "Diff Settings"
+#: libdiff2/komparemodellist.cpp:64
+msgid "Un&apply Difference"
msgstr ""
-#: komparepart/kompare_part.cpp:165
-msgid "Save &All"
-msgstr "Enrol&lañ an holl re"
+#: libdiff2/komparemodellist.cpp:67
+msgid "App&ly All"
+msgstr ""
-#: komparepart/kompare_part.cpp:168
-msgid "Save .&diff..."
+#: libdiff2/komparemodellist.cpp:70
+msgid "&Unapply All"
msgstr ""
-#: komparepart/kompare_part.cpp:171
-msgid "Swap Source with Destination"
+#: libdiff2/komparemodellist.cpp:73
+msgid "P&revious File"
+msgstr "Restr dia&raok"
+
+#: libdiff2/komparemodellist.cpp:76
+msgid "N&ext File"
+msgstr "Restr a h&eul"
+
+#: libdiff2/komparemodellist.cpp:79
+msgid "&Previous Difference"
msgstr ""
-#: komparepart/kompare_part.cpp:174
-msgid "Show Statistics"
-msgstr "Diskouez ar stadegoù"
+#: libdiff2/komparemodellist.cpp:82
+msgid "&Next Difference"
+msgstr ""
-#: komparepart/kompare_part.cpp:269
-msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
-msgstr "<qt>N'em eus ket enkargañ an URL <b>%1</b>.</qt>"
+#: 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 ""
-#: komparepart/kompare_part.cpp:281
-msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
-msgstr "<qt>N'eo ket endeo an URL <b>%1</b> e-barzh ho reizhiad.</qt>"
+#: libdiff2/komparemodellist.cpp:246
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
+"qt>"
+msgstr ""
-#: komparepart/kompare_part.cpp:425
-msgid "Diff Options"
-msgstr "Dibaboù diff"
+#: libdiff2/komparemodellist.cpp:271
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>."
+"</qt>"
+msgstr ""
-#: komparepart/kompare_part.cpp:443
-msgid "*.diff *.dif *.patch|Patch Files"
-msgstr "*.diff *.dif *.patch|Restroù Patch"
+#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
+msgid "Could not open a temporary file."
+msgstr "N'hellan ket digeriñ ur restr padennek."
-#: komparepart/kompare_part.cpp:443
-msgid "Save .diff"
-msgstr "Enrollañ .diff"
+#: libdiff2/komparemodellist.cpp:350
+msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+msgstr ""
+"<qt>Ne m'eus ket gallet skrivañ d'ar restr padennek <b>%1</b>, emaon o lemel "
+"anezhañ.</qt>"
-#: komparepart/kompare_part.cpp:446
-msgid "The file exists or is write-protected; do you want to overwrite it?"
+#: libdiff2/komparemodellist.cpp:368
+msgid ""
+"<qt>Could not create destination directory <b>%1</b>.\n"
+"The file has not been saved.</qt>"
msgstr ""
-#: komparepart/kompare_part.cpp:446
-msgid "File Exists"
-msgstr "Ar restr a zo endeo"
+#: 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 ""
-#: komparepart/kompare_part.cpp:446
-msgid "Overwrite"
-msgstr "Rasklañ"
+#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
+msgid "Could not parse diff output."
+msgstr ""
-#: komparepart/kompare_part.cpp:446
-msgid "Do Not Overwrite"
-msgstr "Ne rasklit ket"
+#: libdiff2/komparemodellist.cpp:451
+msgid "The files are identical."
+msgstr "Heñvel eo ar restroù."
-#: komparepart/kompare_part.cpp:481
-msgid "KomparePart"
-msgstr "KomparePart"
+#: libdiff2/komparemodellist.cpp:613
+msgid "Could not write to the temporary file."
+msgstr "Ne m'eus ket skrivañ d'ar restr padennek."
-#: komparepart/kompare_part.cpp:493
-msgid "Running diff..."
-msgstr "Emaon o seveniñ diff ..."
+#: main.cpp:33
+msgid ""
+"A program to view the differences between files and optionally generate a "
+"diff"
+msgstr ""
-#: komparepart/kompare_part.cpp:496
-msgid "Parsing diff output..."
+#: main.cpp:39
+msgid "This will compare URL1 with URL2"
msgstr ""
-#: komparepart/kompare_part.cpp:545
-msgid "Comparing file %1 with file %2"
+#: 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 ""
-#: komparepart/kompare_part.cpp:550
-msgid "Comparing files in %1 with files in %2"
+#: 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 ""
-#: komparepart/kompare_part.cpp:555
-#, c-format
-msgid "Viewing diff output from %1"
+#: main.cpp:42
+msgid ""
+"Disables the check for automatically finding the original file(s) when using "
+"'-' as URL with the -o option."
msgstr ""
-#: komparepart/kompare_part.cpp:558
-msgid "Blending diff output from %1 into file %2"
+#: 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 ""
-#: komparepart/kompare_part.cpp:563
-msgid "Blending diff output from %1 into folder %2"
+#: 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 hag Otto Bruggeman"
+
+#: main.cpp:55 main.cpp:56
+msgid "Author"
+msgstr "Oberour"
+
+#: main.cpp:57
+msgid "Kompare icon artist"
msgstr ""
-#: 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?"
+#: main.cpp:58
+msgid "A lot of good advice"
msgstr ""
-#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
-msgid "Save Changes?"
-msgstr "Enrollañ ar c'hemmoù ?"
+#: main.cpp:59
+msgid "Cervisia diff viewer"
+msgstr ""
-#: komparepart/kompare_part.cpp:667
-msgid ""
-"No diff file, or no 2 files have been diffed. Therefore no stats are available."
+#: main.cpp:189
+msgid "Compare these files or folder"
msgstr ""
-#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
-#: komparepart/kompare_part.cpp:698
-msgid "Diff Statistics"
+#: komparepart/komparepartui.rc:4 kompareui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Restroù"
+
+#: komparepart/komparepartui.rc:13
+#, no-c-format
+msgid "&Difference"
+msgstr "&Difereñs"
+
+#: komparepart/komparepartui.rc:25 kompareui.rc:14
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Sell ouzh an dibarzhoù"
+
+#: komparepart/komparesaveoptionsbase.ui:41
+#, no-c-format
+msgid "Run Diff In"
msgstr ""
-#: 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"
+#: komparepart/komparesaveoptionsbase.ui:84
+#, no-c-format
+msgid "Command Line"
+msgstr "Linenn urzhiañ"
+
+#: komparepart/komparesaveoptionsbase.ui:108
+#, no-c-format
+msgid "cd dir && diff -udHprNa -- source destination"
msgstr ""
-#: 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"
+#: komparepart/komparesaveoptionsbase.ui:118
+#, fuzzy, no-c-format
+msgid "Options"
+msgstr "&Dibaboù"
+
+#: komparepart/komparesaveoptionsbase.ui:135
+#, no-c-format
+msgid "Look for smaller changes"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:146
+#, no-c-format
+msgid "Optimize for large files"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:157
+#, no-c-format
+msgid "Ignore changes in case"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:165
+#, no-c-format
+msgid "Expand tabs to spaces"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:173
+#, no-c-format
+msgid "Ignore added or removed empty lines"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:181
+#, no-c-format
+msgid "Ignore changes in whitespace"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:189
+#, no-c-format
+msgid "Show function names"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:200
+#, no-c-format
+msgid "Compare folders recursively"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:211
+#, no-c-format
+msgid "Treat new files as empty"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:227
+#, no-c-format
+msgid "Format"
+msgstr "Furmadiñ"
+
+#: komparepart/komparesaveoptionsbase.ui:287
+#, no-c-format
+msgid "Side-by-side"
+msgstr ""
+
+#: kompareui.rc:27
+#, no-c-format
+msgid "Main Toolbar"
msgstr ""
diff --git a/tde-i18n-ca/messages/tdesdk/kompare.po b/tde-i18n-ca/messages/tdesdk/kompare.po
index 060f90c78e..292542a9b7 100644
--- a/tde-i18n-ca/messages/tdesdk/kompare.po
+++ b/tde-i18n-ca/messages/tdesdk/kompare.po
@@ -6,7 +6,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: 2007-05-06 20:10+0200\n"
"Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -16,337 +16,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: libdiff2/komparemodellist.cpp:61
-msgid "&Apply Difference"
-msgstr "&Aplica la diferència"
-
-#: libdiff2/komparemodellist.cpp:64
-msgid "Un&apply Difference"
-msgstr "De&sfés diferència"
-
-#: libdiff2/komparemodellist.cpp:67
-msgid "App&ly All"
-msgstr "Ap&lica-ho tot"
-
-#: libdiff2/komparemodellist.cpp:70
-msgid "&Unapply All"
-msgstr "D&esaplica-ho tot"
-
-#: libdiff2/komparemodellist.cpp:73
-msgid "P&revious File"
-msgstr "Fitxer p&revi"
-
-#: libdiff2/komparemodellist.cpp:76
-msgid "N&ext File"
-msgstr "Fitxer s&egüent"
-
-#: libdiff2/komparemodellist.cpp:79
-msgid "&Previous Difference"
-msgstr "Di&ferència anterior"
-
-#: libdiff2/komparemodellist.cpp:82
-msgid "&Next Difference"
-msgstr "Diferència següe&nt"
-
-#: 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>Sense models o diferencies, el fitxer <b>%1</b> no és un fitxer diff "
-"vàlid.</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>S'han produït problemes durant l'aplicació del diff <b>%1</b> al fitxer <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>S'han produït problemes durant l'aplicació del diff <b>%1</b> "
-"a la carpeta <b>%2</b>.</qt>"
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-msgid "Could not open a temporary file."
-msgstr "No s'ha pogut obrir un fitxer temporal."
-
-#: libdiff2/komparemodellist.cpp:350
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr ""
-"<qt>No s'ha pogut escriure al fitxer temporal <b>%1</b>, s'esborra.</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>No s'ha pogut crear el directori destí <b>%1</b>.\n"
-"El fitxer no ha estat desat.</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>No s'ha pogut pujar el fitxer temporal a la localització de destí <b>%1</b>"
-". El fitxer temporal encara és disponible sota: <b>%2</b>"
-". Podeu copiar-lo manualment a l'ubicació correcta.</qt>"
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-msgid "Could not parse diff output."
-msgstr "No s'ha pogut analitzar la sortida de diff."
-
-#: libdiff2/komparemodellist.cpp:451
-msgid "The files are identical."
-msgstr "Els fitxers són idèntics. "
-
-#: libdiff2/komparemodellist.cpp:613
-msgid "Could not write to the temporary file."
-msgstr "No s'ha pogut escriure al fitxer temporal."
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, no-c-format
-msgid "&Difference"
-msgstr "&Diferència"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, no-c-format
-msgid "Run Diff In"
-msgstr "Executa diff en"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, no-c-format
-msgid "Command Line"
-msgstr "Línia de comandaments"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 108
-#: rc.cpp:27
-#, no-c-format
-msgid "cd dir && diff -udHprNa -- source destination"
-msgstr "cd dir i diff -udHprNa -- font de destí"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, no-c-format
-msgid "Look for smaller changes"
-msgstr "Cerca canvis menors"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, no-c-format
-msgid "Optimize for large files"
-msgstr "Optimitza per a fitxers grans"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, no-c-format
-msgid "Ignore changes in case"
-msgstr "Ignora canvis entre minúscula/majúscula"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, no-c-format
-msgid "Expand tabs to spaces"
-msgstr "Expàndre tabulacions a espais"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
-#: rc.cpp:45
-#, no-c-format
-msgid "Ignore added or removed empty lines"
-msgstr "Ignora línies buides afegides o eliminades"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr "Ignora canvis en espais en blanc"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, no-c-format
-msgid "Show function names"
-msgstr "Mostra noms de les funcions"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, no-c-format
-msgid "Compare folders recursively"
-msgstr "Compara carpetes recursivament"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
-#: rc.cpp:57
-#, no-c-format
-msgid "Treat new files as empty"
-msgstr "Tracta als fitxers nous com a buits"
-
-#. 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 "Unificat"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
-#: rc.cpp:78
-#, no-c-format
-msgid "Side-by-side"
-msgstr "Cara-a-cara"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
-#: libdialogpages/diffpage.cpp:251 rc.cpp:81
-#, no-c-format
-msgid "Number of context lines:"
-msgstr "Nombre de línies de context:"
-
-#: main.cpp:33
-msgid ""
-"A program to view the differences between files and optionally generate a diff"
-msgstr ""
-"Un programa per a veure diferències entre fitxers i opcionalment generar un "
-"fitxer diff"
-
-#: main.cpp:39
-msgid "This will compare URL1 with URL2"
-msgstr "Això compararà URL1 amb 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 ""
-"Això obrirà URL 1 i esperarà a la sortida de diff. URL 1 també pot ser '-' i "
-"llavores es llegirà a l'entrada estàndard. Per exemple es pot emprar per a "
-"\"diff cvs | kompare -o -\". Kompare farà una comprovació per a veure si pot "
-"trobar el(s) fitxer(s) original(s) i llavores fusionarà l'original a la sortida "
-"de diff i la mostrarà en el visor. \"- n\" deshabilita la comprovació."
-
-#: 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 ""
-"Això fusionarà URL 2 dintre de URL 1, s'esperarà que URL 2 sigui una sortida de "
-"diff i que el fitxer o carpeta de URL 1 sigui el corresponent per a dita "
-"sortida de diff. "
-
-#: main.cpp:42
-msgid ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
-msgstr ""
-"Deshablita la comprovació per a la recerca automàtica dels fitxers originals "
-"quan s'usi '-' com a URL amb l'opció \"-o\"."
-
-#: 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 ""
-"Useu per especificar la codificació al cridar des de la línia d'ordres. Per "
-"defecte s'usarà la codificació local."
-
-#: 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 i Otto Bruggeman"
-
-#: main.cpp:55 main.cpp:56
-msgid "Author"
-msgstr "Autor"
-
-#: main.cpp:57
-msgid "Kompare icon artist"
-msgstr "Creador de la icona de Kompare"
-
-#: main.cpp:58
-msgid "A lot of good advice"
-msgstr "Un munt de bons consells"
-
-#: main.cpp:59
-msgid "Cervisia diff viewer"
-msgstr "Visor diff de Cervisia"
-
-#: kompare_shell.cpp:398 main.cpp:185
-msgid "Compare Files or Folders"
-msgstr "Compara fitxers o carpetes"
-
-#: kompare_shell.cpp:399 main.cpp:186
-msgid "Source"
-msgstr "Font"
-
-#: kompare_shell.cpp:400 main.cpp:187
-msgid "Destination"
-msgstr "Destí"
-
-#: kompare_shell.cpp:402 main.cpp:189
-msgid "Compare"
-msgstr "Compara"
-
-#: main.cpp:189
-msgid "Compare these files or folder"
-msgstr "Compara aquests fitxers o carpetes"
-
-#: 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 ""
-"Si en els camps d'aquest diàleg heu introduït 2 noms de fitxer o 2 carpetes, "
-"llavores s'habilitarà aquest botó i prement-lo es començarà a fer una "
-"comparació dels fitxers o carpetes introduïdes. "
-
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Albert Astals Cid,Antoni Bella Pérez"
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -452,22 +128,49 @@ msgstr "Fusiona aquest fitxer o carpeta amb la sortida de diff"
#: 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 ""
-"Si heu entrat en els camps d'aquest diàleg un nom de fitxer o de carpeta i un "
-"de fitxer que contindrà la sortida de diff, llavores aquest botó serà habilitat "
-"i prement-lo s'obrirà la finestra de vista principal de kompare, a on el fitxer "
-"o fitxers de la carpeta seran mesclats amb la sortida de diff, de manera que "
-"pugueu aplicar la(es) diferència(es) a un fitxer o als fitxers. "
+"Si heu entrat en els camps d'aquest diàleg un nom de fitxer o de carpeta i "
+"un de fitxer que contindrà la sortida de diff, llavores aquest botó serà "
+"habilitat i prement-lo s'obrirà la finestra de vista principal de kompare, a "
+"on el fitxer o fitxers de la carpeta seran mesclats amb la sortida de diff, "
+"de manera que pugueu aplicar la(es) diferència(es) a un fitxer o als "
+"fitxers. "
+
+#: kompare_shell.cpp:398 main.cpp:185
+msgid "Compare Files or Folders"
+msgstr "Compara fitxers o carpetes"
+
+#: kompare_shell.cpp:399 main.cpp:186
+msgid "Source"
+msgstr "Font"
+
+#: kompare_shell.cpp:400 main.cpp:187
+msgid "Destination"
+msgstr "Destí"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
+msgstr "Compara"
#: kompare_shell.cpp:402
msgid "Compare these files or folders"
msgstr "Compara aquests fitxers o carpetes"
+#: 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 ""
+"Si en els camps d'aquest diàleg heu introduït 2 noms de fitxer o 2 carpetes, "
+"llavores s'habilitarà aquest botó i prement-lo es començarà a fer una "
+"comparació dels fitxers o carpetes introduïdes. "
+
#: kompare_shell.cpp:439
msgid "Text View"
msgstr "Vista de text"
@@ -563,19 +266,231 @@ msgstr "Desconegut"
msgid "KompareNavTreePart"
msgstr "KompareNavTreePart"
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
-msgstr "Aquí podeu introduir els fitxers que voleu comparar."
+#: komparepart/kompare_part.cpp:165
+msgid "Save &All"
+msgstr "Desa-ho &tot"
+
+#: komparepart/kompare_part.cpp:168
+msgid "Save .&diff..."
+msgstr "Desa .&diff..."
+
+#: komparepart/kompare_part.cpp:171
+msgid "Swap Source with Destination"
+msgstr "Intercanvia font amb destí"
+
+#: komparepart/kompare_part.cpp:174
+msgid "Show Statistics"
+msgstr "Mostra estadístiques"
+
+#: komparepart/kompare_part.cpp:269
+msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+msgstr "<qt>La URL<b> %1</b> no s'ha pogut descarregar.</qt>"
+
+#: komparepart/kompare_part.cpp:281
+msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+msgstr "<qt>La URL <b>%1</b> no existeix en el vostre sistema.</qt>"
+
+#: komparepart/kompare_part.cpp:425
+msgid "Diff Options"
+msgstr "Opcions de diff"
+
+#: komparepart/kompare_part.cpp:443
+msgid "*.diff *.dif *.patch|Patch Files"
+msgstr "*.diff *.dif *.patch|Fitxers pedaç"
+
+#: komparepart/kompare_part.cpp:443
+msgid "Save .diff"
+msgstr "Desa .diff"
+
+#: komparepart/kompare_part.cpp:446
+msgid "The file exists or is write-protected; do you want to overwrite it?"
+msgstr ""
+"El fitxer existeix o està protegit contra escriptura, voleu sobrescriure'l?"
+
+#: komparepart/kompare_part.cpp:446
+msgid "File Exists"
+msgstr "El fitxer ja existeix"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Overwrite"
+msgstr "Sobreescriure"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Do Not Overwrite"
+msgstr "No sobreescriure"
+
+#: komparepart/kompare_part.cpp:481
+msgid "KomparePart"
+msgstr "KomparePart"
+
+#: komparepart/kompare_part.cpp:493
+msgid "Running diff..."
+msgstr "S'està executant diff..."
+
+#: komparepart/kompare_part.cpp:496
+msgid "Parsing diff output..."
+msgstr "S'està analitzant la sortida de diff...."
+
+#: komparepart/kompare_part.cpp:545
+msgid "Comparing file %1 with file %2"
+msgstr "Es compara el fitxer %1 amb el fitxer %2"
+
+#: komparepart/kompare_part.cpp:550
+msgid "Comparing files in %1 with files in %2"
+msgstr "Es comparen els fitxers de %1 amb els de %2"
+
+#: komparepart/kompare_part.cpp:555
+#, c-format
+msgid "Viewing diff output from %1"
+msgstr "S'està analitzant la sortida de diff des de %1"
+
+#: komparepart/kompare_part.cpp:558
+msgid "Blending diff output from %1 into file %2"
+msgstr "S'està fusionant la sortida de diff de %1 en el fitxer %2"
+
+#: komparepart/kompare_part.cpp:563
+msgid "Blending diff output from %1 into folder %2"
+msgstr "S'està fusionant la sortida de diff de %1 en el fitxer %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 ""
+"Heu realitzat canvis en el(s) fitxer(s) destí.\n"
+"Desitgeu desar-los?"
+
+#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+msgid "Save Changes?"
+msgstr "Desar els canvis?"
+
+#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276
+#: libdialogpages/diffpage.cpp:244
+#, no-c-format
+msgid "Unified"
+msgstr "Unificat"
+
+#: 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 hi ha fitxer diff o no s'han comparat 2 fitxers. Pel que no hi ha "
+"estadístiques disponibles."
+
+#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
+#: komparepart/kompare_part.cpp:698
+msgid "Diff Statistics"
+msgstr "Estadístiques del diff"
+
+#: 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 ""
+"Estadístiques:\n"
+"\n"
+"Fitxer antic: %1\n"
+"Fitxer nou: %2\n"
+"\n"
+"Format : %3\n"
+"Nombre de blocs : %4\n"
+"Nombre de diferències : %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 ""
+"Estadístiques:\n"
+"\n"
+"Nombre de fitxers en el fitxer diff: %1\n"
+"Format: %2\n"
+"\n"
+"Fitxer antic actual: %3\n"
+"Fitxer nou actual: %4\n"
+"\n"
+"Nombre de blocs: %5\n"
+"Nombre de diferències: %6"
+
+#: komparepart/kompareprefdlg.cpp:33
+msgid "Preferences"
+msgstr "Preferències"
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View"
+msgstr "Vista de text"
+
+#: komparepart/kompareprefdlg.cpp:39
+msgid "View Settings"
+msgstr "Arranjament de la vista"
#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
msgid "Diff"
msgstr "Diff"
+#: komparepart/kompareprefdlg.cpp:43
+msgid "Diff Settings"
+msgstr "Arranjament de diff"
+
+#: kompareurldialog.cpp:41
+#, fuzzy
+msgid "Files"
+msgstr "&Fitxers"
+
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr "Aquí podeu introduir els fitxers que voleu comparar."
+
#: kompareurldialog.cpp:47
msgid "Here you can change the options for comparing the files."
msgstr "Aquí podeu canviar les opcions per a comparar els fitxers."
#: kompareurldialog.cpp:53
+#, fuzzy
+msgid "Appearance"
+msgstr "A&parença"
+
+#: kompareurldialog.cpp:53
msgid "Here you can change the options for the view."
msgstr "Aquí podeu canviar les opcions per a la vista."
@@ -589,9 +504,9 @@ msgid ""
"program does not support all the options that the GNU version does. This way "
"you can select that version."
msgstr ""
-"Aquí podeu seleccionar un programa de diff diferent. Sobre Solaris el programa "
-"estàndard per a diff no accepta totes les opcions que poseëix la versió de GNU. "
-"D'aquesta manera podeu seleccionar aquesta versió."
+"Aquí podeu seleccionar un programa de diff diferent. Sobre Solaris el "
+"programa estàndard per a diff no accepta totes les opcions que poseëix la "
+"versió de GNU. D'aquesta manera podeu seleccionar aquesta versió."
#: libdialogpages/diffpage.cpp:221
msgid "&Diff"
@@ -603,27 +518,33 @@ msgstr "Format de la sortida"
#: 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 ""
-"Seleccioneu el format de la sortida generada per diff. Unificada és l'emprada "
-"més sovint degut a que és de més fàcil lectura. És la que més agrada als "
-"desenvolupadors de TDE pel que és recomana usar-la per enviar pedaços."
+"Seleccioneu el format de la sortida generada per diff. Unificada és "
+"l'emprada més sovint degut a que és de més fàcil lectura. És la que més "
+"agrada als desenvolupadors de TDE pel que és recomana usar-la per enviar "
+"pedaços."
#: libdialogpages/diffpage.cpp:247
msgid "Lines of Context"
msgstr "Línies de context"
+#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251
+#, no-c-format
+msgid "Number of context lines:"
+msgstr "Nombre de línies de context:"
+
#: libdialogpages/diffpage.cpp:253
msgid ""
"The number of context lines is normally 2 or 3. This makes the diff readable "
"and applicable in most cases. More than 3 lines will only bloat the diff "
"unnecessarily."
msgstr ""
-"El nombre de línies de context normalment és de 2 o 3. Això torna llegible al "
-"diff i aplicable en la majoria dels casos. Més de 3 línies complicarà el diff "
-"innecessàriament."
+"El nombre de línies de context normalment és de 2 o 3. Això torna llegible "
+"al diff i aplicable en la majoria dels casos. Més de 3 línies complicarà el "
+"diff innecessàriament."
#: libdialogpages/diffpage.cpp:259
msgid "&Format"
@@ -739,16 +660,16 @@ msgstr "Patró de fitxer a excloure"
#: 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 ""
-"Si està marcada podeu introduir un patró d'intèrpret de comandaments a la caixa "
-"de text de la dreta o triar-ne una entrada de la llista."
+"Si està marcada podeu introduir un patró d'intèrpret de comandaments a la "
+"caixa de text de la dreta o triar-ne una entrada de la llista."
#: 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 ""
"Aquí podeu introduir o eliminar un patró per a l'intèrpret de comandaments o "
"triar-ne un o més des de les entrades que apareixen a la llista."
@@ -766,19 +687,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 ""
"Aquí podeu introduir la URL d'un fitxer amb patrons per a l'intèrpret de "
"comandaments que seran ignorats durant la comparació de les carpetes."
#: 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 ""
-"Qualsevol fitxer que seleccioneu en el diàleg que aparegui quan feu clic serà "
-"inclòs en el diàleg que apareix a l'esquerra d'aquest botó."
+"Qualsevol fitxer que seleccioneu en el diàleg que aparegui quan feu clic "
+"serà inclòs en el diàleg que apareix a l'esquerra d'aquest botó."
#: libdialogpages/diffpage.cpp:352
msgid "&Exclude"
@@ -844,168 +765,277 @@ msgstr "Font:"
msgid "Size:"
msgstr "Mida:"
-#: komparepart/kompareprefdlg.cpp:33
-msgid "Preferences"
-msgstr "Preferències"
-
-#: komparepart/kompareprefdlg.cpp:39
-msgid "View Settings"
-msgstr "Arranjament de la vista"
-
-#: komparepart/kompareprefdlg.cpp:43
-msgid "Diff Settings"
-msgstr "Arranjament de diff"
-
-#: komparepart/kompare_part.cpp:165
-msgid "Save &All"
-msgstr "Desa-ho &tot"
+#: libdialogpages/viewpage.cpp:119
+#, fuzzy
+msgid "&Fonts"
+msgstr "Font:"
-#: komparepart/kompare_part.cpp:168
-msgid "Save .&diff..."
-msgstr "Desa .&diff..."
+#: libdiff2/komparemodellist.cpp:61
+msgid "&Apply Difference"
+msgstr "&Aplica la diferència"
-#: komparepart/kompare_part.cpp:171
-msgid "Swap Source with Destination"
-msgstr "Intercanvia font amb destí"
+#: libdiff2/komparemodellist.cpp:64
+msgid "Un&apply Difference"
+msgstr "De&sfés diferència"
-#: komparepart/kompare_part.cpp:174
-msgid "Show Statistics"
-msgstr "Mostra estadístiques"
+#: libdiff2/komparemodellist.cpp:67
+msgid "App&ly All"
+msgstr "Ap&lica-ho tot"
-#: komparepart/kompare_part.cpp:269
-msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
-msgstr "<qt>La URL<b> %1</b> no s'ha pogut descarregar.</qt>"
+#: libdiff2/komparemodellist.cpp:70
+msgid "&Unapply All"
+msgstr "D&esaplica-ho tot"
-#: komparepart/kompare_part.cpp:281
-msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
-msgstr "<qt>La URL <b>%1</b> no existeix en el vostre sistema.</qt>"
+#: libdiff2/komparemodellist.cpp:73
+msgid "P&revious File"
+msgstr "Fitxer p&revi"
-#: komparepart/kompare_part.cpp:425
-msgid "Diff Options"
-msgstr "Opcions de diff"
+#: libdiff2/komparemodellist.cpp:76
+msgid "N&ext File"
+msgstr "Fitxer s&egüent"
-#: komparepart/kompare_part.cpp:443
-msgid "*.diff *.dif *.patch|Patch Files"
-msgstr "*.diff *.dif *.patch|Fitxers pedaç"
+#: libdiff2/komparemodellist.cpp:79
+msgid "&Previous Difference"
+msgstr "Di&ferència anterior"
-#: komparepart/kompare_part.cpp:443
-msgid "Save .diff"
-msgstr "Desa .diff"
+#: libdiff2/komparemodellist.cpp:82
+msgid "&Next Difference"
+msgstr "Diferència següe&nt"
-#: komparepart/kompare_part.cpp:446
-msgid "The file exists or is write-protected; do you want to overwrite it?"
+#: 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 ""
-"El fitxer existeix o està protegit contra escriptura, voleu sobrescriure'l?"
-
-#: komparepart/kompare_part.cpp:446
-msgid "File Exists"
-msgstr "El fitxer ja existeix"
-
-#: komparepart/kompare_part.cpp:446
-msgid "Overwrite"
-msgstr "Sobreescriure"
+"<qt>Sense models o diferencies, el fitxer <b>%1</b> no és un fitxer diff "
+"vàlid.</qt>"
-#: komparepart/kompare_part.cpp:446
-msgid "Do Not Overwrite"
-msgstr "No sobreescriure"
+#: libdiff2/komparemodellist.cpp:246
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
+"qt>"
+msgstr ""
+"<qt>S'han produït problemes durant l'aplicació del diff <b>%1</b> al fitxer "
+"<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>S'han produït problemes durant l'aplicació del diff <b>%1</b> a la "
+"carpeta <b>%2</b>.</qt>"
-#: komparepart/kompare_part.cpp:493
-msgid "Running diff..."
-msgstr "S'està executant diff..."
+#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
+msgid "Could not open a temporary file."
+msgstr "No s'ha pogut obrir un fitxer temporal."
-#: komparepart/kompare_part.cpp:496
-msgid "Parsing diff output..."
-msgstr "S'està analitzant la sortida de diff...."
+#: libdiff2/komparemodellist.cpp:350
+msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+msgstr ""
+"<qt>No s'ha pogut escriure al fitxer temporal <b>%1</b>, s'esborra.</qt>"
-#: komparepart/kompare_part.cpp:545
-msgid "Comparing file %1 with file %2"
-msgstr "Es compara el fitxer %1 amb el fitxer %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>No s'ha pogut crear el directori destí <b>%1</b>.\n"
+"El fitxer no ha estat desat.</qt>"
-#: komparepart/kompare_part.cpp:550
-msgid "Comparing files in %1 with files in %2"
-msgstr "Es comparen els fitxers de %1 amb els de %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>No s'ha pogut pujar el fitxer temporal a la localització de destí <b>%1</"
+"b>. El fitxer temporal encara és disponible sota: <b>%2</b>. Podeu copiar-lo "
+"manualment a l'ubicació correcta.</qt>"
-#: komparepart/kompare_part.cpp:555
-#, c-format
-msgid "Viewing diff output from %1"
-msgstr "S'està analitzant la sortida de diff des de %1"
+#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
+msgid "Could not parse diff output."
+msgstr "No s'ha pogut analitzar la sortida de diff."
-#: komparepart/kompare_part.cpp:558
-msgid "Blending diff output from %1 into file %2"
-msgstr "S'està fusionant la sortida de diff de %1 en el fitxer %2"
+#: libdiff2/komparemodellist.cpp:451
+msgid "The files are identical."
+msgstr "Els fitxers són idèntics. "
-#: komparepart/kompare_part.cpp:563
-msgid "Blending diff output from %1 into folder %2"
-msgstr "S'està fusionant la sortida de diff de %1 en el fitxer %2"
+#: libdiff2/komparemodellist.cpp:613
+msgid "Could not write to the temporary file."
+msgstr "No s'ha pogut escriure al fitxer temporal."
-#: 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 ""
-"Heu realitzat canvis en el(s) fitxer(s) destí.\n"
-"Desitgeu desar-los?"
+"Un programa per a veure diferències entre fitxers i opcionalment generar un "
+"fitxer diff"
-#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
-msgid "Save Changes?"
-msgstr "Desar els canvis?"
+#: main.cpp:39
+msgid "This will compare URL1 with URL2"
+msgstr "Això compararà URL1 amb 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 hi ha fitxer diff o no s'han comparat 2 fitxers. Pel que no hi ha "
-"estadístiques disponibles."
+"Això obrirà URL 1 i esperarà a la sortida de diff. URL 1 també pot ser '-' i "
+"llavores es llegirà a l'entrada estàndard. Per exemple es pot emprar per a "
+"\"diff cvs | kompare -o -\". Kompare farà una comprovació per a veure si pot "
+"trobar el(s) fitxer(s) original(s) i llavores fusionarà l'original a la "
+"sortida de diff i la mostrarà en el visor. \"- n\" deshabilita la "
+"comprovació."
-#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
-#: komparepart/kompare_part.cpp:698
-msgid "Diff Statistics"
-msgstr "Estadístiques del diff"
+#: 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 ""
+"Això fusionarà URL 2 dintre de URL 1, s'esperarà que URL 2 sigui una sortida "
+"de diff i que el fitxer o carpeta de URL 1 sigui el corresponent per a dita "
+"sortida de diff. "
-#: 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 ""
-"Estadístiques:\n"
-"\n"
-"Fitxer antic: %1\n"
-"Fitxer nou: %2\n"
-"\n"
-"Format : %3\n"
-"Nombre de blocs : %4\n"
-"Nombre de diferències : %5"
+"Deshablita la comprovació per a la recerca automàtica dels fitxers originals "
+"quan s'usi '-' com a URL amb l'opció \"-o\"."
-#: 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 ""
+"Useu per especificar la codificació al cridar des de la línia d'ordres. Per "
+"defecte s'usarà la codificació local."
+
+#: 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 i Otto Bruggeman"
+
+#: main.cpp:55 main.cpp:56
+msgid "Author"
+msgstr "Autor"
+
+#: main.cpp:57
+msgid "Kompare icon artist"
+msgstr "Creador de la icona de Kompare"
+
+#: main.cpp:58
+msgid "A lot of good advice"
+msgstr "Un munt de bons consells"
+
+#: main.cpp:59
+msgid "Cervisia diff viewer"
+msgstr "Visor diff de Cervisia"
+
+#: main.cpp:189
+msgid "Compare these files or folder"
+msgstr "Compara aquests fitxers o carpetes"
+
+#: komparepart/komparepartui.rc:4 kompareui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Fitxers"
+
+#: komparepart/komparepartui.rc:13
+#, no-c-format
+msgid "&Difference"
+msgstr "&Diferència"
+
+#: komparepart/komparepartui.rc:25 kompareui.rc:14
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Arranjament de la vista"
+
+#: komparepart/komparesaveoptionsbase.ui:41
+#, no-c-format
+msgid "Run Diff In"
+msgstr "Executa diff en"
+
+#: komparepart/komparesaveoptionsbase.ui:84
+#, no-c-format
+msgid "Command Line"
+msgstr "Línia de comandaments"
+
+#: komparepart/komparesaveoptionsbase.ui:108
+#, no-c-format
+msgid "cd dir && diff -udHprNa -- source destination"
+msgstr "cd dir i diff -udHprNa -- font de destí"
+
+#: komparepart/komparesaveoptionsbase.ui:118
+#, fuzzy, no-c-format
+msgid "Options"
+msgstr "O&pcions"
+
+#: komparepart/komparesaveoptionsbase.ui:135
+#, no-c-format
+msgid "Look for smaller changes"
+msgstr "Cerca canvis menors"
+
+#: komparepart/komparesaveoptionsbase.ui:146
+#, no-c-format
+msgid "Optimize for large files"
+msgstr "Optimitza per a fitxers grans"
+
+#: komparepart/komparesaveoptionsbase.ui:157
+#, no-c-format
+msgid "Ignore changes in case"
+msgstr "Ignora canvis entre minúscula/majúscula"
+
+#: komparepart/komparesaveoptionsbase.ui:165
+#, no-c-format
+msgid "Expand tabs to spaces"
+msgstr "Expàndre tabulacions a espais"
+
+#: komparepart/komparesaveoptionsbase.ui:173
+#, no-c-format
+msgid "Ignore added or removed empty lines"
+msgstr "Ignora línies buides afegides o eliminades"
+
+#: komparepart/komparesaveoptionsbase.ui:181
+#, no-c-format
+msgid "Ignore changes in whitespace"
+msgstr "Ignora canvis en espais en blanc"
+
+#: komparepart/komparesaveoptionsbase.ui:189
+#, no-c-format
+msgid "Show function names"
+msgstr "Mostra noms de les funcions"
+
+#: komparepart/komparesaveoptionsbase.ui:200
+#, no-c-format
+msgid "Compare folders recursively"
+msgstr "Compara carpetes recursivament"
+
+#: komparepart/komparesaveoptionsbase.ui:211
+#, no-c-format
+msgid "Treat new files as empty"
+msgstr "Tracta als fitxers nous com a buits"
+
+#: komparepart/komparesaveoptionsbase.ui:227
+#, no-c-format
+msgid "Format"
+msgstr "Format"
+
+#: komparepart/komparesaveoptionsbase.ui:287
+#, no-c-format
+msgid "Side-by-side"
+msgstr "Cara-a-cara"
+
+#: kompareui.rc:27
+#, no-c-format
+msgid "Main Toolbar"
msgstr ""
-"Estadístiques:\n"
-"\n"
-"Nombre de fitxers en el fitxer diff: %1\n"
-"Format: %2\n"
-"\n"
-"Fitxer antic actual: %3\n"
-"Fitxer nou actual: %4\n"
-"\n"
-"Nombre de blocs: %5\n"
-"Nombre de diferències: %6"
diff --git a/tde-i18n-cs/messages/tdesdk/kompare.po b/tde-i18n-cs/messages/tdesdk/kompare.po
index a7a8fe7531..a6034da76e 100644
--- a/tde-i18n-cs/messages/tdesdk/kompare.po
+++ b/tde-i18n-cs/messages/tdesdk/kompare.po
@@ -10,7 +10,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: 2006-07-05 10:12+0200\n"
"Last-Translator: Klara Cihlarova <koty@seznam.cz>\n"
"Language-Team: Czech <suse@suse.cz>\n"
@@ -19,324 +19,24 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.2\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#: libdiff2/komparemodellist.cpp:61
-msgid "&Apply Difference"
-msgstr "&Aplikovat rozdíl"
-
-#: libdiff2/komparemodellist.cpp:64
-msgid "Un&apply Difference"
-msgstr "&Vrátit rozdíl"
-
-#: libdiff2/komparemodellist.cpp:67
-msgid "App&ly All"
-msgstr "Ap&likovat všechny"
-
-#: libdiff2/komparemodellist.cpp:70
-msgid "&Unapply All"
-msgstr "Vrátit vš&e"
-
-#: libdiff2/komparemodellist.cpp:73
-msgid "P&revious File"
-msgstr "Předchozí soubo&r"
-
-#: libdiff2/komparemodellist.cpp:76
-msgid "N&ext File"
-msgstr "Násl&edující soubor"
-
-#: libdiff2/komparemodellist.cpp:79
-msgid "&Previous Difference"
-msgstr "&Předchozí rozdíl"
-
-#: libdiff2/komparemodellist.cpp:82
-msgid "&Next Difference"
-msgstr "&Následující rozdíl"
-
-#: 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 ""
-
-#: libdiff2/komparemodellist.cpp:246
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>"
-msgstr ""
-"<qt>Nastaly problémy při aplikování rozdílů <b>%1</b> do souboru <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>Nastaly problémy při aplikování rozdílů <b>%1</b> do složky <b>%2</b>.</qt>"
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-msgid "Could not open a temporary file."
-msgstr "Nepodařilo se otevřít dočasný soubor."
-
-#: libdiff2/komparemodellist.cpp:350
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr ""
-"<qt>Nepodařil se zápis do dočasného souboru <b>%1</b>, probíhá mazání.</qt>"
-
-#: libdiff2/komparemodellist.cpp:368
-msgid ""
-"<qt>Could not create destination directory <b>%1</b>.\n"
-"The file has not been saved.</qt>"
-msgstr ""
-
-#: 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 ""
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-msgid "Could not parse diff output."
-msgstr "Nepodařilo se zpracovat výstup z diff."
-
-#: libdiff2/komparemodellist.cpp:451
-msgid "The files are identical."
-msgstr "Soubory jsou stejné."
-
-#: libdiff2/komparemodellist.cpp:613
-msgid "Could not write to the temporary file."
-msgstr "Nepodařil se zápis do dočasného souboru."
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, no-c-format
-msgid "&Difference"
-msgstr "&Rozdíl"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, no-c-format
-msgid "Run Diff In"
-msgstr "Spustit diff v"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, no-c-format
-msgid "Command Line"
-msgstr "Příkazový řádek"
-
-#. 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 -- cíl zdroje"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, no-c-format
-msgid "Look for smaller changes"
-msgstr "Hledat menší změny"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, no-c-format
-msgid "Optimize for large files"
-msgstr "Optimalizovat pro velké soubory"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, no-c-format
-msgid "Ignore changes in case"
-msgstr "Ignorovat změnu velikosti písmen"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, no-c-format
-msgid "Expand tabs to spaces"
-msgstr "Nahradit tabulátory mezerami"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
-#: rc.cpp:45
-#, no-c-format
-msgid "Ignore added or removed empty lines"
-msgstr "Ignorovat přidané nebo odstraněné prázdné řádky"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr "Ignorovat změny v prázdném místě"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, no-c-format
-msgid "Show function names"
-msgstr "Zobrazit názvy funkcí"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, no-c-format
-msgid "Compare folders recursively"
-msgstr "Porovnat složky rekurzivně"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
-#: rc.cpp:57
-#, no-c-format
-msgid "Treat new files as empty"
-msgstr "Nové soubory považovat za prázdné"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
-#: rc.cpp:60
-#, no-c-format
-msgid "Format"
-msgstr "Formát"
-
-#. 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 "Kontextový"
-
-#. 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 "Normální"
-
-#. 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 "Unifikovaný"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
-#: rc.cpp:78
-#, no-c-format
-msgid "Side-by-side"
-msgstr "Vedle sebe"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
-#: libdialogpages/diffpage.cpp:251 rc.cpp:81
-#, no-c-format
-msgid "Number of context lines:"
-msgstr "Počet řádků kontextu:"
-
-#: main.cpp:33
-msgid ""
-"A program to view the differences between files and optionally generate a diff"
-msgstr "Program pro zobrazení rozdílů mezi soubory s možností generovat diff"
-
-#: main.cpp:39
-msgid "This will compare URL1 with URL2"
-msgstr "Tímto porovnáte URL1 s 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 ""
-
-#: 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 ""
-
-#: main.cpp:42
-msgid ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
-msgstr ""
-
-#: 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 ""
-
-#: 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 a Otto Bruggeman"
-
-#: main.cpp:55 main.cpp:56
-msgid "Author"
-msgstr "Autor"
-
-#: main.cpp:57
-msgid "Kompare icon artist"
-msgstr "Autor ikon"
-
-#: main.cpp:58
-msgid "A lot of good advice"
-msgstr "Spousta dobrých rad"
-
-#: main.cpp:59
-msgid "Cervisia diff viewer"
-msgstr "Cervisia diff prohlížeč"
-
-#: kompare_shell.cpp:398 main.cpp:185
-msgid "Compare Files or Folders"
-msgstr "Porovnat soubory nebo složky"
-
-#: kompare_shell.cpp:399 main.cpp:186
-msgid "Source"
-msgstr "Zdroj"
-
-#: kompare_shell.cpp:400 main.cpp:187
-msgid "Destination"
-msgstr "Cíl"
-
-#: kompare_shell.cpp:402 main.cpp:189
-msgid "Compare"
-msgstr "Porovnat"
-
-#: main.cpp:189
-msgid "Compare these files or folder"
-msgstr "Porovnat tyto soubory nebo složky"
-
-#: 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 ""
-"Pokud jste zadali 2 jména souborů nebo 2 složky, toto tlačítko bude povolené a "
-"jeho stisknutím se spustí porovnání zadaných souborů nebo adresářů."
-
-#: _translatorinfo.cpp:1
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: _translatorinfo:1
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Lukáš Tinkl,Klára Cihlářová"
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -446,17 +146,42 @@ msgstr ""
#: 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 ""
+#: kompare_shell.cpp:398 main.cpp:185
+msgid "Compare Files or Folders"
+msgstr "Porovnat soubory nebo složky"
+
+#: kompare_shell.cpp:399 main.cpp:186
+msgid "Source"
+msgstr "Zdroj"
+
+#: kompare_shell.cpp:400 main.cpp:187
+msgid "Destination"
+msgstr "Cíl"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
+msgstr "Porovnat"
+
#: kompare_shell.cpp:402
msgid "Compare these files or folders"
msgstr "Porovnat tyto soubory nebo složky"
+#: 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 ""
+"Pokud jste zadali 2 jména souborů nebo 2 složky, toto tlačítko bude povolené "
+"a jeho stisknutím se spustí porovnání zadaných souborů nebo adresářů."
+
#: kompare_shell.cpp:439
msgid "Text View"
msgstr "Textový pohled"
@@ -552,19 +277,230 @@ msgstr "Neznámý"
msgid "KompareNavTreePart"
msgstr "KompareNavTreePart"
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
-msgstr "Zde můžete zadat soubory k porovnání."
+#: komparepart/kompare_part.cpp:165
+msgid "Save &All"
+msgstr "Uložit &vše"
+
+#: komparepart/kompare_part.cpp:168
+msgid "Save .&diff..."
+msgstr "Uložit .&diff..."
+
+#: komparepart/kompare_part.cpp:171
+msgid "Swap Source with Destination"
+msgstr "Prohodit zdroj a cíl"
+
+#: komparepart/kompare_part.cpp:174
+msgid "Show Statistics"
+msgstr "Zobrazit statistiku"
+
+#: komparepart/kompare_part.cpp:269
+msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+msgstr "<qt>URL <b>%1</b> nelze stáhnout.</qt>"
+
+#: komparepart/kompare_part.cpp:281
+msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+msgstr "<qt>URL <b>%1</b> neexistuje ve vašem systému.</qt>"
+
+#: komparepart/kompare_part.cpp:425
+msgid "Diff Options"
+msgstr "Možnosti Diff"
+
+#: komparepart/kompare_part.cpp:443
+msgid "*.diff *.dif *.patch|Patch Files"
+msgstr "*.diff *.dif *.patch|Soubory se záplatami"
+
+#: komparepart/kompare_part.cpp:443
+msgid "Save .diff"
+msgstr "Uložit .diff"
+
+#: komparepart/kompare_part.cpp:446
+msgid "The file exists or is write-protected; do you want to overwrite it?"
+msgstr "Soubor existuje, ale je chráněn proti zápisu; přejete si jej přepsat?"
+
+#: komparepart/kompare_part.cpp:446
+msgid "File Exists"
+msgstr "Soubor existuje"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Overwrite"
+msgstr "Přepsat"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Do Not Overwrite"
+msgstr "Nepřepisovat"
+
+#: komparepart/kompare_part.cpp:481
+msgid "KomparePart"
+msgstr "KomparePart"
+
+#: komparepart/kompare_part.cpp:493
+msgid "Running diff..."
+msgstr "Spouštím diff..."
+
+#: komparepart/kompare_part.cpp:496
+msgid "Parsing diff output..."
+msgstr "Zpracovávám výstup z diffu..."
+
+#: komparepart/kompare_part.cpp:545
+msgid "Comparing file %1 with file %2"
+msgstr "Porovnávám soubor %1 se souborem %2"
+
+#: komparepart/kompare_part.cpp:550
+msgid "Comparing files in %1 with files in %2"
+msgstr "Porovnávám soubory v %1 se soubory v %2"
+
+#: komparepart/kompare_part.cpp:555
+#, c-format
+msgid "Viewing diff output from %1"
+msgstr "Zobrazuji výstup rozdílu z %1"
+
+#: komparepart/kompare_part.cpp:558
+msgid "Blending diff output from %1 into file %2"
+msgstr "Mísím výstup diff %1 s adresářem %2"
+
+#: komparepart/kompare_part.cpp:563
+msgid "Blending diff output from %1 into folder %2"
+msgstr ""
+
+#: 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 ""
+"Změnili jste cílové soubory.\n"
+"Chcete tyto změny uložit?"
+
+#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+msgid "Save Changes?"
+msgstr "Uložit změny?"
+
+#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276
+#: libdialogpages/diffpage.cpp:244
+#, no-c-format
+msgid "Unified"
+msgstr "Unifikovaný"
+
+#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244
+#: libdialogpages/diffpage.cpp:238
+#, no-c-format
+msgid "Context"
+msgstr "Kontextový"
+
+#: 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 "Normální"
+
+#: komparepart/kompare_part.cpp:667
+msgid ""
+"No diff file, or no 2 files have been diffed. Therefore no stats are "
+"available."
+msgstr ""
+"Nebylo vykonáno porovnání 2 souborů ani zadaný soubor diff,\n"
+"takže statistika není k dispozici."
+
+#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
+#: komparepart/kompare_part.cpp:698
+msgid "Diff Statistics"
+msgstr "Statistika Diff"
+
+#: 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 ""
+"Statistika:\n"
+"\n"
+"Aktuální starý soubor: %1\n"
+"Aktuální nový soubor: %2\n"
+"\n"
+"Formát: %3\n"
+"Počet kusů: %4\n"
+"Počet rozdílů: %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 ""
+"Statistika:\n"
+"\n"
+"Počet souborů v souboru diff: %1\n"
+"Formát : %2\n"
+"\n"
+"Aktuální starý soubor: %3\n"
+"Aktuální nový soubor: %4\n"
+"\n"
+"Počet kusů: %5\n"
+"Počet rozdílů: %6"
+
+#: komparepart/kompareprefdlg.cpp:33
+msgid "Preferences"
+msgstr "Nastavení"
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View"
+msgstr "Textový pohled"
+
+#: komparepart/kompareprefdlg.cpp:39
+msgid "View Settings"
+msgstr "Nastavení pohledu"
#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
msgid "Diff"
msgstr "Diff"
+#: komparepart/kompareprefdlg.cpp:43
+msgid "Diff Settings"
+msgstr "Nastavení Diff"
+
+#: kompareurldialog.cpp:41
+#, fuzzy
+msgid "Files"
+msgstr "Sou&bory"
+
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr "Zde můžete zadat soubory k porovnání."
+
#: kompareurldialog.cpp:47
msgid "Here you can change the options for comparing the files."
msgstr "Zde můžete změnit nastavení porovnávání souborů."
#: kompareurldialog.cpp:53
+#, fuzzy
+msgid "Appearance"
+msgstr "&Vzhled"
+
+#: kompareurldialog.cpp:53
msgid "Here you can change the options for the view."
msgstr "Zde můžete změnit nastavení pohledu."
@@ -592,15 +528,20 @@ msgstr "Formát výstupu"
#: 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 ""
#: libdialogpages/diffpage.cpp:247
msgid "Lines of Context"
msgstr "Počet řádků kontextu"
+#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251
+#, no-c-format
+msgid "Number of context lines:"
+msgstr "Počet řádků kontextu:"
+
#: libdialogpages/diffpage.cpp:253
msgid ""
"The number of context lines is normally 2 or 3. This makes the diff readable "
@@ -718,14 +659,14 @@ msgstr "Vyjmout vzorek souborů"
#: 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 ""
#: 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 ""
#: libdialogpages/diffpage.cpp:338
@@ -739,14 +680,14 @@ msgstr "Pokud je zaškrtnuto, můžete napravo zadat cestu k souboru."
#: 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 ""
#: 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 ""
#: libdialogpages/diffpage.cpp:352
@@ -813,167 +754,255 @@ msgstr "Písmo:"
msgid "Size:"
msgstr "Velikost:"
-#: komparepart/kompareprefdlg.cpp:33
-msgid "Preferences"
-msgstr "Nastavení"
-
-#: komparepart/kompareprefdlg.cpp:39
-msgid "View Settings"
-msgstr "Nastavení pohledu"
-
-#: komparepart/kompareprefdlg.cpp:43
-msgid "Diff Settings"
-msgstr "Nastavení Diff"
+#: libdialogpages/viewpage.cpp:119
+#, fuzzy
+msgid "&Fonts"
+msgstr "Písmo:"
-#: komparepart/kompare_part.cpp:165
-msgid "Save &All"
-msgstr "Uložit &vše"
+#: libdiff2/komparemodellist.cpp:61
+msgid "&Apply Difference"
+msgstr "&Aplikovat rozdíl"
-#: komparepart/kompare_part.cpp:168
-msgid "Save .&diff..."
-msgstr "Uložit .&diff..."
+#: libdiff2/komparemodellist.cpp:64
+msgid "Un&apply Difference"
+msgstr "&Vrátit rozdíl"
-#: komparepart/kompare_part.cpp:171
-msgid "Swap Source with Destination"
-msgstr "Prohodit zdroj a cíl"
+#: libdiff2/komparemodellist.cpp:67
+msgid "App&ly All"
+msgstr "Ap&likovat všechny"
-#: komparepart/kompare_part.cpp:174
-msgid "Show Statistics"
-msgstr "Zobrazit statistiku"
+#: libdiff2/komparemodellist.cpp:70
+msgid "&Unapply All"
+msgstr "Vrátit vš&e"
-#: komparepart/kompare_part.cpp:269
-msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
-msgstr "<qt>URL <b>%1</b> nelze stáhnout.</qt>"
+#: libdiff2/komparemodellist.cpp:73
+msgid "P&revious File"
+msgstr "Předchozí soubo&r"
-#: komparepart/kompare_part.cpp:281
-msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
-msgstr "<qt>URL <b>%1</b> neexistuje ve vašem systému.</qt>"
+#: libdiff2/komparemodellist.cpp:76
+msgid "N&ext File"
+msgstr "Násl&edující soubor"
-#: komparepart/kompare_part.cpp:425
-msgid "Diff Options"
-msgstr "Možnosti Diff"
+#: libdiff2/komparemodellist.cpp:79
+msgid "&Previous Difference"
+msgstr "&Předchozí rozdíl"
-#: komparepart/kompare_part.cpp:443
-msgid "*.diff *.dif *.patch|Patch Files"
-msgstr "*.diff *.dif *.patch|Soubory se záplatami"
+#: libdiff2/komparemodellist.cpp:82
+msgid "&Next Difference"
+msgstr "&Následující rozdíl"
-#: komparepart/kompare_part.cpp:443
-msgid "Save .diff"
-msgstr "Uložit .diff"
+#: 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 ""
-#: komparepart/kompare_part.cpp:446
-msgid "The file exists or is write-protected; do you want to overwrite it?"
-msgstr "Soubor existuje, ale je chráněn proti zápisu; přejete si jej přepsat?"
+#: libdiff2/komparemodellist.cpp:246
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
+"qt>"
+msgstr ""
+"<qt>Nastaly problémy při aplikování rozdílů <b>%1</b> do souboru <b>%2</b>.</"
+"qt>"
-#: komparepart/kompare_part.cpp:446
-msgid "File Exists"
-msgstr "Soubor existuje"
+#: libdiff2/komparemodellist.cpp:271
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>."
+"</qt>"
+msgstr ""
+"<qt>Nastaly problémy při aplikování rozdílů <b>%1</b> do složky <b>%2</b>.</"
+"qt>"
-#: komparepart/kompare_part.cpp:446
-msgid "Overwrite"
-msgstr "Přepsat"
+#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
+msgid "Could not open a temporary file."
+msgstr "Nepodařilo se otevřít dočasný soubor."
-#: komparepart/kompare_part.cpp:446
-msgid "Do Not Overwrite"
-msgstr "Nepřepisovat"
+#: libdiff2/komparemodellist.cpp:350
+msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+msgstr ""
+"<qt>Nepodařil se zápis do dočasného souboru <b>%1</b>, probíhá mazání.</qt>"
-#: komparepart/kompare_part.cpp:481
-msgid "KomparePart"
-msgstr "KomparePart"
+#: libdiff2/komparemodellist.cpp:368
+msgid ""
+"<qt>Could not create destination directory <b>%1</b>.\n"
+"The file has not been saved.</qt>"
+msgstr ""
-#: komparepart/kompare_part.cpp:493
-msgid "Running diff..."
-msgstr "Spouštím diff..."
+#: 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 ""
-#: komparepart/kompare_part.cpp:496
-msgid "Parsing diff output..."
-msgstr "Zpracovávám výstup z diffu..."
+#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
+msgid "Could not parse diff output."
+msgstr "Nepodařilo se zpracovat výstup z diff."
-#: komparepart/kompare_part.cpp:545
-msgid "Comparing file %1 with file %2"
-msgstr "Porovnávám soubor %1 se souborem %2"
+#: libdiff2/komparemodellist.cpp:451
+msgid "The files are identical."
+msgstr "Soubory jsou stejné."
-#: komparepart/kompare_part.cpp:550
-msgid "Comparing files in %1 with files in %2"
-msgstr "Porovnávám soubory v %1 se soubory v %2"
+#: libdiff2/komparemodellist.cpp:613
+msgid "Could not write to the temporary file."
+msgstr "Nepodařil se zápis do dočasného souboru."
-#: komparepart/kompare_part.cpp:555
-#, c-format
-msgid "Viewing diff output from %1"
-msgstr "Zobrazuji výstup rozdílu z %1"
+#: main.cpp:33
+msgid ""
+"A program to view the differences between files and optionally generate a "
+"diff"
+msgstr "Program pro zobrazení rozdílů mezi soubory s možností generovat diff"
-#: komparepart/kompare_part.cpp:558
-msgid "Blending diff output from %1 into file %2"
-msgstr "Mísím výstup diff %1 s adresářem %2"
+#: main.cpp:39
+msgid "This will compare URL1 with URL2"
+msgstr "Tímto porovnáte URL1 s URL2"
-#: komparepart/kompare_part.cpp:563
-msgid "Blending diff output from %1 into folder %2"
+#: 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 ""
-#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709
+#: main.cpp:41
msgid ""
-"You have made changes to the destination file(s).\n"
-"Would you like to save them?"
+"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 ""
-"Změnili jste cílové soubory.\n"
-"Chcete tyto změny uložit?"
-
-#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
-msgid "Save Changes?"
-msgstr "Uložit změny?"
-#: komparepart/kompare_part.cpp:667
+#: main.cpp:42
msgid ""
-"No diff file, or no 2 files have been diffed. Therefore no stats are available."
+"Disables the check for automatically finding the original file(s) when using "
+"'-' as URL with the -o option."
msgstr ""
-"Nebylo vykonáno porovnání 2 souborů ani zadaný soubor diff,\n"
-"takže statistika není k dispozici."
-
-#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
-#: komparepart/kompare_part.cpp:698
-msgid "Diff Statistics"
-msgstr "Statistika Diff"
-#: komparepart/kompare_part.cpp:673
+#: main.cpp:43
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"
+"Use this to specify the encoding when calling it from the command line. It "
+"will default to the local encoding if not specified."
msgstr ""
-"Statistika:\n"
-"\n"
-"Aktuální starý soubor: %1\n"
-"Aktuální nový soubor: %2\n"
-"\n"
-"Formát: %3\n"
-"Počet kusů: %4\n"
-"Počet rozdílů: %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"
+#: 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 a Otto Bruggeman"
+
+#: main.cpp:55 main.cpp:56
+msgid "Author"
+msgstr "Autor"
+
+#: main.cpp:57
+msgid "Kompare icon artist"
+msgstr "Autor ikon"
+
+#: main.cpp:58
+msgid "A lot of good advice"
+msgstr "Spousta dobrých rad"
+
+#: main.cpp:59
+msgid "Cervisia diff viewer"
+msgstr "Cervisia diff prohlížeč"
+
+#: main.cpp:189
+msgid "Compare these files or folder"
+msgstr "Porovnat tyto soubory nebo složky"
+
+#: komparepart/komparepartui.rc:4 kompareui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Sou&bory"
+
+#: komparepart/komparepartui.rc:13
+#, no-c-format
+msgid "&Difference"
+msgstr "&Rozdíl"
+
+#: komparepart/komparepartui.rc:25 kompareui.rc:14
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Nastavení pohledu"
+
+#: komparepart/komparesaveoptionsbase.ui:41
+#, no-c-format
+msgid "Run Diff In"
+msgstr "Spustit diff v"
+
+#: komparepart/komparesaveoptionsbase.ui:84
+#, no-c-format
+msgid "Command Line"
+msgstr "Příkazový řádek"
+
+#: komparepart/komparesaveoptionsbase.ui:108
+#, no-c-format
+msgid "cd dir && diff -udHprNa -- source destination"
+msgstr "cd dir && diff -udHprNa -- cíl zdroje"
+
+#: komparepart/komparesaveoptionsbase.ui:118
+#, fuzzy, no-c-format
+msgid "Options"
+msgstr "Možnos&ti"
+
+#: komparepart/komparesaveoptionsbase.ui:135
+#, no-c-format
+msgid "Look for smaller changes"
+msgstr "Hledat menší změny"
+
+#: komparepart/komparesaveoptionsbase.ui:146
+#, no-c-format
+msgid "Optimize for large files"
+msgstr "Optimalizovat pro velké soubory"
+
+#: komparepart/komparesaveoptionsbase.ui:157
+#, no-c-format
+msgid "Ignore changes in case"
+msgstr "Ignorovat změnu velikosti písmen"
+
+#: komparepart/komparesaveoptionsbase.ui:165
+#, no-c-format
+msgid "Expand tabs to spaces"
+msgstr "Nahradit tabulátory mezerami"
+
+#: komparepart/komparesaveoptionsbase.ui:173
+#, no-c-format
+msgid "Ignore added or removed empty lines"
+msgstr "Ignorovat přidané nebo odstraněné prázdné řádky"
+
+#: komparepart/komparesaveoptionsbase.ui:181
+#, no-c-format
+msgid "Ignore changes in whitespace"
+msgstr "Ignorovat změny v prázdném místě"
+
+#: komparepart/komparesaveoptionsbase.ui:189
+#, no-c-format
+msgid "Show function names"
+msgstr "Zobrazit názvy funkcí"
+
+#: komparepart/komparesaveoptionsbase.ui:200
+#, no-c-format
+msgid "Compare folders recursively"
+msgstr "Porovnat složky rekurzivně"
+
+#: komparepart/komparesaveoptionsbase.ui:211
+#, no-c-format
+msgid "Treat new files as empty"
+msgstr "Nové soubory považovat za prázdné"
+
+#: komparepart/komparesaveoptionsbase.ui:227
+#, no-c-format
+msgid "Format"
+msgstr "Formát"
+
+#: komparepart/komparesaveoptionsbase.ui:287
+#, no-c-format
+msgid "Side-by-side"
+msgstr "Vedle sebe"
+
+#: kompareui.rc:27
+#, no-c-format
+msgid "Main Toolbar"
msgstr ""
-"Statistika:\n"
-"\n"
-"Počet souborů v souboru diff: %1\n"
-"Formát : %2\n"
-"\n"
-"Aktuální starý soubor: %3\n"
-"Aktuální nový soubor: %4\n"
-"\n"
-"Počet kusů: %5\n"
-"Počet rozdílů: %6"
diff --git a/tde-i18n-cy/messages/tdesdk/kompare.po b/tde-i18n-cy/messages/tdesdk/kompare.po
index ea1c0865cd..b3b7263c0b 100644
--- a/tde-i18n-cy/messages/tdesdk/kompare.po
+++ b/tde-i18n-cy/messages/tdesdk/kompare.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ../cy/messages//tdesdk/kompare.po\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
"PO-Revision-Date: 2004-09-20 15:44+0200\n"
"Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
"Language-Team: cy <LL@li.org>\n"
@@ -10,308 +10,13 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: libdiff2/komparemodellist.cpp:61
-msgid "&Apply Difference"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:64
-msgid "Un&apply Difference"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:67
-msgid "App&ly All"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:70
-msgid "&Unapply All"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:73
-msgid "P&revious File"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:76
-msgid "N&ext File"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:79
-msgid "&Previous Difference"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:82
-msgid "&Next Difference"
-msgstr ""
-
-#: 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 ""
-
-#: libdiff2/komparemodellist.cpp:246
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:271
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>"
-".</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-msgid "Could not open a temporary file."
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:350
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:368
-msgid ""
-"<qt>Could not create destination directory <b>%1</b>.\n"
-"The file has not been saved.</qt>"
-msgstr ""
-
-#: 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 ""
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-msgid "Could not parse diff output."
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:451
-msgid "The files are identical."
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:613
-msgid "Could not write to the temporary file."
-msgstr ""
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, no-c-format
-msgid "&Difference"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, no-c-format
-msgid "Run Diff In"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, no-c-format
-msgid "Command Line"
-msgstr "Llinell orchymyn"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 108
-#: rc.cpp:27
-#, no-c-format
-msgid "cd dir && diff -udHprNa -- source destination"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, no-c-format
-msgid "Look for smaller changes"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, no-c-format
-msgid "Optimize for large files"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, no-c-format
-msgid "Ignore changes in case"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, no-c-format
-msgid "Expand tabs to spaces"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
-#: rc.cpp:45
-#, no-c-format
-msgid "Ignore added or removed empty lines"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, no-c-format
-msgid "Show function names"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, no-c-format
-msgid "Compare folders recursively"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
-#: rc.cpp:57
-#, no-c-format
-msgid "Treat new files as empty"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
-#: rc.cpp:60
-#, no-c-format
-msgid "Format"
-msgstr "Fformat"
-
-#. 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 ""
-
-#. 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 ""
-
-#. 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 "Arferol"
-
-#. 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 ""
-
-#. 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 ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
-#: rc.cpp:78
-#, no-c-format
-msgid "Side-by-side"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
-#: libdialogpages/diffpage.cpp:251 rc.cpp:81
-#, no-c-format
-msgid "Number of context lines:"
-msgstr ""
-
-#: main.cpp:33
-msgid ""
-"A program to view the differences between files and optionally generate a diff"
-msgstr ""
-
-#: main.cpp:39
-msgid "This will compare URL1 with URL2"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: main.cpp:42
-msgid ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
-msgstr ""
-
-#: 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 ""
-
-#: main.cpp:52
-msgid "Kompare"
-msgstr "Kompare"
-
-#: main.cpp:54
-msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
-msgstr ""
-
-#: main.cpp:55 main.cpp:56
-msgid "Author"
-msgstr "Awdur"
-
-#: main.cpp:57
-msgid "Kompare icon artist"
-msgstr ""
-
-#: main.cpp:58
-msgid "A lot of good advice"
-msgstr ""
-
-#: main.cpp:59
-msgid "Cervisia diff viewer"
-msgstr ""
-
-#: kompare_shell.cpp:398 main.cpp:185
-msgid "Compare Files or Folders"
-msgstr ""
-
-#: kompare_shell.cpp:399 main.cpp:186
-msgid "Source"
-msgstr "Tarddiad"
-
-#: kompare_shell.cpp:400 main.cpp:187
-msgid "Destination"
-msgstr "Cyrchfan"
-
-#: kompare_shell.cpp:402 main.cpp:189
-msgid "Compare"
-msgstr ""
-
-#: main.cpp:189
-msgid "Compare these files or folder"
-msgstr ""
-
-#: 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 ""
-
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "KD wrth KGyfieithu"
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -409,17 +114,40 @@ msgstr ""
#: 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 ""
+
+#: kompare_shell.cpp:398 main.cpp:185
+msgid "Compare Files or Folders"
+msgstr ""
+
+#: kompare_shell.cpp:399 main.cpp:186
+msgid "Source"
+msgstr "Tarddiad"
+
+#: kompare_shell.cpp:400 main.cpp:187
+msgid "Destination"
+msgstr "Cyrchfan"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
msgstr ""
#: kompare_shell.cpp:402
msgid "Compare these files or folders"
msgstr ""
+#: 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 ""
+
#: kompare_shell.cpp:439
msgid "Text View"
msgstr "Golwg Testun"
@@ -503,19 +231,208 @@ msgstr "Anhysbys"
msgid "KompareNavTreePart"
msgstr "KompareNavTreePart"
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
+#: komparepart/kompare_part.cpp:165
+msgid "Save &All"
+msgstr "Cadw &Popeth"
+
+#: komparepart/kompare_part.cpp:168
+msgid "Save .&diff..."
+msgstr ""
+
+#: komparepart/kompare_part.cpp:171
+msgid "Swap Source with Destination"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:174
+msgid "Show Statistics"
+msgstr "Dangos Ystadegau"
+
+#: komparepart/kompare_part.cpp:269
+msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:281
+msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:425
+msgid "Diff Options"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:443
+msgid "*.diff *.dif *.patch|Patch Files"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:443
+msgid "Save .diff"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:446
+msgid "The file exists or is write-protected; do you want to overwrite it?"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:446
+msgid "File Exists"
+msgstr "Ffeil yn Bodoli"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Overwrite"
+msgstr "Trosysgrifo"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Do Not Overwrite"
+msgstr "Peidio â Throsysgrifo"
+
+#: komparepart/kompare_part.cpp:481
+msgid "KomparePart"
+msgstr "KomparePart"
+
+#: komparepart/kompare_part.cpp:493
+msgid "Running diff..."
+msgstr ""
+
+#: komparepart/kompare_part.cpp:496
+msgid "Parsing diff output..."
+msgstr ""
+
+#: komparepart/kompare_part.cpp:545
+msgid "Comparing file %1 with file %2"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:550
+msgid "Comparing files in %1 with files in %2"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:555
+#, c-format
+msgid "Viewing diff output from %1"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:558
+msgid "Blending diff output from %1 into file %2"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:563
+msgid "Blending diff output from %1 into folder %2"
+msgstr ""
+
+#: 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 ""
+
+#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+msgid "Save Changes?"
+msgstr "Cadw Newidiadau?"
+
+#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276
+#: libdialogpages/diffpage.cpp:244
+#, no-c-format
+msgid "Unified"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244
+#: libdialogpages/diffpage.cpp:238
+#, no-c-format
+msgid "Context"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:641 komparepart/komparesaveoptionsbase.ui:268
+#: libdialogpages/diffpage.cpp:242
+#, no-c-format
+msgid "RCS"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252
+#: libdialogpages/diffpage.cpp:239
+#, no-c-format
+msgid "Ed"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260
+#: libdialogpages/diffpage.cpp:241
+#, no-c-format
+msgid "Normal"
+msgstr "Arferol"
+
+#: komparepart/kompare_part.cpp:667
+msgid ""
+"No diff file, or no 2 files have been diffed. Therefore no stats are "
+"available."
+msgstr ""
+
+#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
+#: komparepart/kompare_part.cpp:698
+msgid "Diff Statistics"
msgstr ""
+#: 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 ""
+
+#: 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 ""
+
+#: komparepart/kompareprefdlg.cpp:33
+msgid "Preferences"
+msgstr "Hoffterau"
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View"
+msgstr "Golwg Testun"
+
+#: komparepart/kompareprefdlg.cpp:39
+msgid "View Settings"
+msgstr "Gweld Gosodiadau"
+
#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
msgid "Diff"
msgstr "Diff"
+#: komparepart/kompareprefdlg.cpp:43
+msgid "Diff Settings"
+msgstr ""
+
+#: kompareurldialog.cpp:41
+#, fuzzy
+msgid "Files"
+msgstr "&Ffeiliau"
+
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr ""
+
#: kompareurldialog.cpp:47
msgid "Here you can change the options for comparing the files."
msgstr ""
#: kompareurldialog.cpp:53
+#, fuzzy
+msgid "Appearance"
+msgstr "&Golwg"
+
+#: kompareurldialog.cpp:53
msgid "Here you can change the options for the view."
msgstr ""
@@ -540,15 +457,20 @@ msgstr ""
#: 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 ""
#: libdialogpages/diffpage.cpp:247
msgid "Lines of Context"
msgstr ""
+#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251
+#, no-c-format
+msgid "Number of context lines:"
+msgstr ""
+
#: libdialogpages/diffpage.cpp:253
msgid ""
"The number of context lines is normally 2 or 3. This makes the diff readable "
@@ -666,14 +588,14 @@ msgstr ""
#: 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 ""
#: 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 ""
#: libdialogpages/diffpage.cpp:338
@@ -687,14 +609,14 @@ 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 ""
#: 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 ""
#: libdialogpages/diffpage.cpp:352
@@ -761,145 +683,250 @@ msgstr "Wynebfath:"
msgid "Size:"
msgstr "Maint:"
-#: komparepart/kompareprefdlg.cpp:33
-msgid "Preferences"
-msgstr "Hoffterau"
+#: libdialogpages/viewpage.cpp:119
+#, fuzzy
+msgid "&Fonts"
+msgstr "Wynebfath:"
-#: komparepart/kompareprefdlg.cpp:39
-msgid "View Settings"
-msgstr "Gweld Gosodiadau"
+#: libdiff2/komparemodellist.cpp:61
+msgid "&Apply Difference"
+msgstr ""
-#: komparepart/kompareprefdlg.cpp:43
-msgid "Diff Settings"
+#: libdiff2/komparemodellist.cpp:64
+msgid "Un&apply Difference"
msgstr ""
-#: komparepart/kompare_part.cpp:165
-msgid "Save &All"
-msgstr "Cadw &Popeth"
+#: libdiff2/komparemodellist.cpp:67
+msgid "App&ly All"
+msgstr ""
-#: komparepart/kompare_part.cpp:168
-msgid "Save .&diff..."
+#: libdiff2/komparemodellist.cpp:70
+msgid "&Unapply All"
msgstr ""
-#: komparepart/kompare_part.cpp:171
-msgid "Swap Source with Destination"
+#: libdiff2/komparemodellist.cpp:73
+msgid "P&revious File"
msgstr ""
-#: komparepart/kompare_part.cpp:174
-msgid "Show Statistics"
-msgstr "Dangos Ystadegau"
+#: libdiff2/komparemodellist.cpp:76
+msgid "N&ext File"
+msgstr ""
-#: komparepart/kompare_part.cpp:269
-msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+#: libdiff2/komparemodellist.cpp:79
+msgid "&Previous Difference"
msgstr ""
-#: komparepart/kompare_part.cpp:281
-msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+#: libdiff2/komparemodellist.cpp:82
+msgid "&Next Difference"
msgstr ""
-#: komparepart/kompare_part.cpp:425
-msgid "Diff Options"
+#: 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 ""
-#: komparepart/kompare_part.cpp:443
-msgid "*.diff *.dif *.patch|Patch Files"
+#: libdiff2/komparemodellist.cpp:246
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
+"qt>"
msgstr ""
-#: komparepart/kompare_part.cpp:443
-msgid "Save .diff"
+#: libdiff2/komparemodellist.cpp:271
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>."
+"</qt>"
msgstr ""
-#: komparepart/kompare_part.cpp:446
-msgid "The file exists or is write-protected; do you want to overwrite it?"
+#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
+msgid "Could not open a temporary file."
msgstr ""
-#: komparepart/kompare_part.cpp:446
-msgid "File Exists"
-msgstr "Ffeil yn Bodoli"
+#: libdiff2/komparemodellist.cpp:350
+msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+msgstr ""
-#: komparepart/kompare_part.cpp:446
-msgid "Overwrite"
-msgstr "Trosysgrifo"
+#: libdiff2/komparemodellist.cpp:368
+msgid ""
+"<qt>Could not create destination directory <b>%1</b>.\n"
+"The file has not been saved.</qt>"
+msgstr ""
-#: komparepart/kompare_part.cpp:446
-msgid "Do Not Overwrite"
-msgstr "Peidio â Throsysgrifo"
+#: 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 ""
-#: komparepart/kompare_part.cpp:481
-msgid "KomparePart"
-msgstr "KomparePart"
+#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
+msgid "Could not parse diff output."
+msgstr ""
-#: komparepart/kompare_part.cpp:493
-msgid "Running diff..."
+#: libdiff2/komparemodellist.cpp:451
+msgid "The files are identical."
msgstr ""
-#: komparepart/kompare_part.cpp:496
-msgid "Parsing diff output..."
+#: libdiff2/komparemodellist.cpp:613
+msgid "Could not write to the temporary file."
msgstr ""
-#: komparepart/kompare_part.cpp:545
-msgid "Comparing file %1 with file %2"
+#: main.cpp:33
+msgid ""
+"A program to view the differences between files and optionally generate a "
+"diff"
msgstr ""
-#: komparepart/kompare_part.cpp:550
-msgid "Comparing files in %1 with files in %2"
+#: main.cpp:39
+msgid "This will compare URL1 with URL2"
msgstr ""
-#: komparepart/kompare_part.cpp:555
-#, c-format
-msgid "Viewing diff output from %1"
+#: 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 ""
-#: komparepart/kompare_part.cpp:558
-msgid "Blending diff output from %1 into file %2"
+#: 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 ""
-#: komparepart/kompare_part.cpp:563
-msgid "Blending diff output from %1 into folder %2"
+#: main.cpp:42
+msgid ""
+"Disables the check for automatically finding the original file(s) when using "
+"'-' as URL with the -o option."
msgstr ""
-#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709
+#: main.cpp:43
msgid ""
-"You have made changes to the destination file(s).\n"
-"Would you like to save them?"
+"Use this to specify the encoding when calling it from the command line. It "
+"will default to the local encoding if not specified."
msgstr ""
-#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
-msgid "Save Changes?"
-msgstr "Cadw Newidiadau?"
+#: main.cpp:52
+msgid "Kompare"
+msgstr "Kompare"
-#: komparepart/kompare_part.cpp:667
-msgid ""
-"No diff file, or no 2 files have been diffed. Therefore no stats are available."
+#: main.cpp:54
+msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
msgstr ""
-#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
-#: komparepart/kompare_part.cpp:698
-msgid "Diff Statistics"
+#: main.cpp:55 main.cpp:56
+msgid "Author"
+msgstr "Awdur"
+
+#: main.cpp:57
+msgid "Kompare icon artist"
msgstr ""
-#: 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"
+#: main.cpp:58
+msgid "A lot of good advice"
msgstr ""
-#: 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"
+#: main.cpp:59
+msgid "Cervisia diff viewer"
+msgstr ""
+
+#: main.cpp:189
+msgid "Compare these files or folder"
+msgstr ""
+
+#: komparepart/komparepartui.rc:4 kompareui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Ffeiliau"
+
+#: komparepart/komparepartui.rc:13
+#, no-c-format
+msgid "&Difference"
+msgstr ""
+
+#: komparepart/komparepartui.rc:25 kompareui.rc:14
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Gweld Gosodiadau"
+
+#: komparepart/komparesaveoptionsbase.ui:41
+#, no-c-format
+msgid "Run Diff In"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:84
+#, no-c-format
+msgid "Command Line"
+msgstr "Llinell orchymyn"
+
+#: komparepart/komparesaveoptionsbase.ui:108
+#, no-c-format
+msgid "cd dir && diff -udHprNa -- source destination"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:118
+#, fuzzy, no-c-format
+msgid "Options"
+msgstr "De&wisiadau"
+
+#: komparepart/komparesaveoptionsbase.ui:135
+#, no-c-format
+msgid "Look for smaller changes"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:146
+#, no-c-format
+msgid "Optimize for large files"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:157
+#, no-c-format
+msgid "Ignore changes in case"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:165
+#, no-c-format
+msgid "Expand tabs to spaces"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:173
+#, no-c-format
+msgid "Ignore added or removed empty lines"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:181
+#, no-c-format
+msgid "Ignore changes in whitespace"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:189
+#, no-c-format
+msgid "Show function names"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:200
+#, no-c-format
+msgid "Compare folders recursively"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:211
+#, no-c-format
+msgid "Treat new files as empty"
+msgstr ""
+
+#: komparepart/komparesaveoptionsbase.ui:227
+#, no-c-format
+msgid "Format"
+msgstr "Fformat"
+
+#: komparepart/komparesaveoptionsbase.ui:287
+#, no-c-format
+msgid "Side-by-side"
+msgstr ""
+
+#: kompareui.rc:27
+#, no-c-format
+msgid "Main Toolbar"
msgstr ""
diff --git a/tde-i18n-da/messages/tdesdk/kompare.po b/tde-i18n-da/messages/tdesdk/kompare.po
index 7a923a33f0..6733f0cd7d 100644
--- a/tde-i18n-da/messages/tdesdk/kompare.po
+++ b/tde-i18n-da/messages/tdesdk/kompare.po
@@ -6,7 +6,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-09-26 19:44-0400\n"
"Last-Translator: Erik Kjær Pedersen <erik@binghamton.edu>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -16,334 +16,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.10.2\n"
-#: libdiff2/komparemodellist.cpp:61
-msgid "&Apply Difference"
-msgstr "&Anvend forskel"
-
-#: libdiff2/komparemodellist.cpp:64
-msgid "Un&apply Difference"
-msgstr "&Fjern anvendelse af forskel"
-
-#: libdiff2/komparemodellist.cpp:67
-msgid "App&ly All"
-msgstr "An&vend alt"
-
-#: libdiff2/komparemodellist.cpp:70
-msgid "&Unapply All"
-msgstr "&Fjern anvendelse af alt"
-
-#: libdiff2/komparemodellist.cpp:73
-msgid "P&revious File"
-msgstr "&Forrige fil"
-
-#: libdiff2/komparemodellist.cpp:76
-msgid "N&ext File"
-msgstr "Næ&ste fil"
-
-#: libdiff2/komparemodellist.cpp:79
-msgid "&Previous Difference"
-msgstr "&Forrige forskel"
-
-#: libdiff2/komparemodellist.cpp:82
-msgid "&Next Difference"
-msgstr "&Næste forskel"
-
-#: 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>Ingen modeller eller ingen forskelle, denne fil: <b>%1</b>"
-", er ikke en gyldig diff-fil</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>Der var problemer med at anvende diff <b>%1</b> på filen <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>Der var problemer med at anvende diff <b>%1</b> på mappen <b>%2</b>.</qt>"
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-msgid "Could not open a temporary file."
-msgstr "Kunne ikke åbne en midlertidig fil."
-
-#: libdiff2/komparemodellist.cpp:350
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr ""
-"<qt>Kunne ikke skrive til en midlertidig fil.<b>%1</b>, sletter den.</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>Kunne ikke skrive til en midlertidig mappe.<b>%1</b>.\n"
-"Filen er ikke blevet gemt.</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>Kunne ikke overføre den midlertidige fil til målstedet <b>%1</b>"
-"Den midlertidige fil er stadig til stede i: <b>%2</b>"
-". Du kan kopiere den manuelt til det rigtige sted.</qt>"
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-msgid "Could not parse diff output."
-msgstr "Kunne ikke fortolke diff-uddata."
-
-#: libdiff2/komparemodellist.cpp:451
-msgid "The files are identical."
-msgstr "Filerne er identiske."
-
-#: libdiff2/komparemodellist.cpp:613
-msgid "Could not write to the temporary file."
-msgstr "Kunne ikke skrive til en midlertidig fil."
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, no-c-format
-msgid "&Difference"
-msgstr "&Forskel"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, no-c-format
-msgid "Run Diff In"
-msgstr "Kør diff i"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, no-c-format
-msgid "Command Line"
-msgstr "Kommandolinje"
-
-#. 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 -- kilde mål"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, no-c-format
-msgid "Look for smaller changes"
-msgstr "Kig efter små ændringer"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, no-c-format
-msgid "Optimize for large files"
-msgstr "Optimér for store filer"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, no-c-format
-msgid "Ignore changes in case"
-msgstr "Ignorér versalændringer"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, no-c-format
-msgid "Expand tabs to spaces"
-msgstr "Udvid tab til mellemrum"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
-#: rc.cpp:45
-#, no-c-format
-msgid "Ignore added or removed empty lines"
-msgstr "Ignorér tilføjede eller fjernede tomme linjer"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr "Ignorér ændringer i mellemrum"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, no-c-format
-msgid "Show function names"
-msgstr "Vis funktionsnavne"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, no-c-format
-msgid "Compare folders recursively"
-msgstr "Sammenlign mapper rekursivt"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
-#: rc.cpp:57
-#, no-c-format
-msgid "Treat new files as empty"
-msgstr "Behandl nye filer som tomme"
-
-#. 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 "Sammenhæng"
-
-#. 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 "Forenet"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
-#: rc.cpp:78
-#, no-c-format
-msgid "Side-by-side"
-msgstr "Ved siden af hinanden"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
-#: libdialogpages/diffpage.cpp:251 rc.cpp:81
-#, no-c-format
-msgid "Number of context lines:"
-msgstr "Antal sammenhængslinjer:"
-
-#: main.cpp:33
-msgid ""
-"A program to view the differences between files and optionally generate a diff"
-msgstr ""
-"Et program til at se forskelle mellem filer og hvis man vil generere en "
-"diff-fil."
-
-#: main.cpp:39
-msgid "This will compare URL1 with URL2"
-msgstr "Dette vil sammenligne URL1 med 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 ""
-"Dette vil åbne URL1 og forvente at det er diff-uddata. URL1 kan også være en "
-"'-' og så vil den læse fra standard-inddata. Kan bruges for eksempel til cvs "
-"diff | kompare -o -. Kompare vil tjekke for at se om den kan finde de "
-"oprindelige filer og så blande de oprindelige filer med diff-uddata og vise det "
-"i fremviseren. -n deaktiverer tjekket."
-
-#: 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 ""
-"Dette vil blande URL2 med URL1, URL2 forventes at være diff-uddata og URL1 "
-"filen eller mappen som diff-uddata skal blandes med. "
-
-#: main.cpp:42
-msgid ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
-msgstr ""
-"Deaktiverer tjekket for automatisk at finde de oprindelige file når det bruges "
-"med '-' som URL med -o flaget."
-
-#: 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 ""
-"Brug dette til at angive tegnsættet når der kaldes fra kommandolinjen. Det vil "
-"som standard være det lokale tegnsæt hvis intet andet er angivet."
-
-#: 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 og Otto Bruggeman"
-
-#: main.cpp:55 main.cpp:56
-msgid "Author"
-msgstr "Forfatter"
-
-#: main.cpp:57
-msgid "Kompare icon artist"
-msgstr "Kompare ikonkunstner"
-
-#: main.cpp:58
-msgid "A lot of good advice"
-msgstr "En masse gode råd"
-
-#: main.cpp:59
-msgid "Cervisia diff viewer"
-msgstr "Cervisia diff-fremviser"
-
-#: kompare_shell.cpp:398 main.cpp:185
-msgid "Compare Files or Folders"
-msgstr "Sammenlign filer og mapper"
-
-#: kompare_shell.cpp:399 main.cpp:186
-msgid "Source"
-msgstr "Kilde"
-
-#: kompare_shell.cpp:400 main.cpp:187
-msgid "Destination"
-msgstr "Mål"
-
-#: kompare_shell.cpp:402 main.cpp:189
-msgid "Compare"
-msgstr "Sammenlign"
-
-#: main.cpp:189
-msgid "Compare these files or folder"
-msgstr "Sammenlign disse filer og mapper"
-
-#: 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 ""
-"Hvis du har indgivet 2 filnavne eller 2 mapper i felterne i denne dialog så vil "
-"denne knap blive aktiveret og tryk på den vil starte en sammenligning af de "
-"indtastede filer eller mapper. "
-
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Erik Kjær Pedersen"
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -449,22 +128,48 @@ msgstr "Bland denne file eller dette katalog med diff-uddata"
#: 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 ""
-"Hvis du har indgivet et fil- eller mappenavn og en fil der indeholder "
-"diff-uddata i felterne i denne dialog så vil denne knap blive aktiveret og tryk "
+"Hvis du har indgivet et fil- eller mappenavn og en fil der indeholder diff-"
+"uddata i felterne i denne dialog så vil denne knap blive aktiveret og tryk "
"på den vil åbne kompare's hovedvisning hvor uddata fra de indgivne filer fra "
-"mappen blandes med diff-uddata så du kan anvende forskellene på en eller flere "
-"filer."
+"mappen blandes med diff-uddata så du kan anvende forskellene på en eller "
+"flere filer."
+
+#: kompare_shell.cpp:398 main.cpp:185
+msgid "Compare Files or Folders"
+msgstr "Sammenlign filer og mapper"
+
+#: kompare_shell.cpp:399 main.cpp:186
+msgid "Source"
+msgstr "Kilde"
+
+#: kompare_shell.cpp:400 main.cpp:187
+msgid "Destination"
+msgstr "Mål"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
+msgstr "Sammenlign"
#: kompare_shell.cpp:402
msgid "Compare these files or folders"
msgstr "Sammenlign disse filer og mapper"
+#: 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 ""
+"Hvis du har indgivet 2 filnavne eller 2 mapper i felterne i denne dialog så "
+"vil denne knap blive aktiveret og tryk på den vil starte en sammenligning af "
+"de indtastede filer eller mapper. "
+
#: kompare_shell.cpp:439
msgid "Text View"
msgstr "Tekstvisning"
@@ -560,19 +265,231 @@ msgstr "Ukendt"
msgid "KompareNavTreePart"
msgstr "KompareNavTreePart"
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
-msgstr "Her kan du indtaste de filer du ønsker at sammenligne."
+#: komparepart/kompare_part.cpp:165
+msgid "Save &All"
+msgstr "Gem &alt"
+
+#: komparepart/kompare_part.cpp:168
+msgid "Save .&diff..."
+msgstr "Gem .&diff..."
+
+#: komparepart/kompare_part.cpp:171
+msgid "Swap Source with Destination"
+msgstr "Ombyt kilde med mål"
+
+#: komparepart/kompare_part.cpp:174
+msgid "Show Statistics"
+msgstr "Vis statistik"
+
+#: komparepart/kompare_part.cpp:269
+msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+msgstr "<qt>URL'en <b>%1</b> kan ikke hentes.</qt>"
+
+#: komparepart/kompare_part.cpp:281
+msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+msgstr "<qt>URL'en <b>%1</b> eksisterer ikke på dit system.</qt>"
+
+#: komparepart/kompare_part.cpp:425
+msgid "Diff Options"
+msgstr "Diff-indstillinger"
+
+#: komparepart/kompare_part.cpp:443
+msgid "*.diff *.dif *.patch|Patch Files"
+msgstr "*.diff *.dif *.patch|Rettelsesfiler"
+
+#: komparepart/kompare_part.cpp:443
+msgid "Save .diff"
+msgstr "Gem .diff"
+
+#: komparepart/kompare_part.cpp:446
+msgid "The file exists or is write-protected; do you want to overwrite it?"
+msgstr ""
+"Filen eksisterer eller er skrivebeskyttet. Ønsker du at overskrive den?"
+
+#: komparepart/kompare_part.cpp:446
+msgid "File Exists"
+msgstr "Fil eksisterer"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Overwrite"
+msgstr "Overskriv"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Do Not Overwrite"
+msgstr "Overskriv ikke"
+
+#: komparepart/kompare_part.cpp:481
+msgid "KomparePart"
+msgstr "KomparePart"
+
+#: komparepart/kompare_part.cpp:493
+msgid "Running diff..."
+msgstr "Kører diff..."
+
+#: komparepart/kompare_part.cpp:496
+msgid "Parsing diff output..."
+msgstr "Fortolker diff-uddata..."
+
+#: komparepart/kompare_part.cpp:545
+msgid "Comparing file %1 with file %2"
+msgstr "Sammenligner filen %1 med filen %2"
+
+#: komparepart/kompare_part.cpp:550
+msgid "Comparing files in %1 with files in %2"
+msgstr "Sammenligner filer i %1 med filer i %2"
+
+#: komparepart/kompare_part.cpp:555
+#, c-format
+msgid "Viewing diff output from %1"
+msgstr "Kigger på diff-uddata fra %1"
+
+#: komparepart/kompare_part.cpp:558
+msgid "Blending diff output from %1 into file %2"
+msgstr "Indfletter diff-uddata fra %1 i filen %2"
+
+#: komparepart/kompare_part.cpp:563
+msgid "Blending diff output from %1 into folder %2"
+msgstr "Indfletter diff-uddata fra %1 i mappen %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 ""
+"Du har lavet ændringer i målfilerne.\n"
+"Vil du gerne gemme dem?"
+
+#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+msgid "Save Changes?"
+msgstr "Gem ændringer?"
+
+#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276
+#: libdialogpages/diffpage.cpp:244
+#, no-c-format
+msgid "Unified"
+msgstr "Forenet"
+
+#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244
+#: libdialogpages/diffpage.cpp:238
+#, no-c-format
+msgid "Context"
+msgstr "Sammenhæng"
+
+#: 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 ""
+"Der er ingen diff-fil eller ingen 2 filer der er blevet 'diffet'.Derfor er "
+"ingen statistik tilstede."
+
+#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
+#: komparepart/kompare_part.cpp:698
+msgid "Diff Statistics"
+msgstr "Diff-statistik"
+
+#: 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 ""
+"Statistik:\n"
+"\n"
+"Gammel fil: %1\n"
+"Ny fil: %2\n"
+"\n"
+"Format: %3\n"
+"Antal stumper: %4\n"
+"Antal forskelle: %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 ""
+"Statistik:\n"
+"\n"
+"Antal filer i diff-fil: %1\n"
+"Format: %2\n"
+"\n"
+"Nuværende gammel fil: %3\n"
+"Nuværende ny fil: %4\n"
+"\n"
+"Antal stumper: %5\n"
+"Antal forskelle: %6"
+
+#: komparepart/kompareprefdlg.cpp:33
+msgid "Preferences"
+msgstr "Indstillinger"
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View"
+msgstr "Tekstvisning"
+
+#: komparepart/kompareprefdlg.cpp:39
+msgid "View Settings"
+msgstr "Vis indstillinger"
#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
msgid "Diff"
msgstr "Diff"
+#: komparepart/kompareprefdlg.cpp:43
+msgid "Diff Settings"
+msgstr "Diff-indstillinger"
+
+#: kompareurldialog.cpp:41
+#, fuzzy
+msgid "Files"
+msgstr "&Filer"
+
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr "Her kan du indtaste de filer du ønsker at sammenligne."
+
#: kompareurldialog.cpp:47
msgid "Here you can change the options for comparing the files."
msgstr "Her kan du ændre valgene sammenlign af filer."
#: kompareurldialog.cpp:53
+#, fuzzy
+msgid "Appearance"
+msgstr "&Udseende"
+
+#: kompareurldialog.cpp:53
msgid "Here you can change the options for the view."
msgstr "Her kan du ændre valgene for visningen."
@@ -587,8 +504,8 @@ msgid ""
"you can select that version."
msgstr ""
"Du kan vælge et andet diff-program her. På Solaris understøtter standard "
-"diff-programmet ikke alle de flag som GNU-versionen gør. På denne måde kan du "
-"vælge denne udgave."
+"diff-programmet ikke alle de flag som GNU-versionen gør. På denne måde kan "
+"du vælge denne udgave."
#: libdialogpages/diffpage.cpp:221
msgid "&Diff"
@@ -600,27 +517,32 @@ msgstr "Uddataformat"
#: 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 ""
-"Vælg det uddataformat diff skal generere. Forenet er det der oftest bruges da "
-"det er meget læsbart. TDE-udviklerne kan bedst lide dette format så de bruger "
-"det til at sende programrettelser."
+"Vælg det uddataformat diff skal generere. Forenet er det der oftest bruges "
+"da det er meget læsbart. TDE-udviklerne kan bedst lide dette format så de "
+"bruger det til at sende programrettelser."
#: libdialogpages/diffpage.cpp:247
msgid "Lines of Context"
msgstr "Linjer sammenhæng"
+#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251
+#, no-c-format
+msgid "Number of context lines:"
+msgstr "Antal sammenhængslinjer:"
+
#: libdialogpages/diffpage.cpp:253
msgid ""
"The number of context lines is normally 2 or 3. This makes the diff readable "
"and applicable in most cases. More than 3 lines will only bloat the diff "
"unnecessarily."
msgstr ""
-"Antallet af sammenhængslinjer er normalt 2 eller 3. Dette gør diff'en læsbar og "
-"anvendelig i de fleste tilfælde. Mere end 3 linjer vil blot blæse den unødigt "
-"op."
+"Antallet af sammenhængslinjer er normalt 2 eller 3. Dette gør diff'en læsbar "
+"og anvendelig i de fleste tilfælde. Mere end 3 linjer vil blot blæse den "
+"unødigt op."
#: libdialogpages/diffpage.cpp:259
msgid "&Format"
@@ -736,16 +658,16 @@ msgstr "Filmønstre der skal ekskluderes"
#: 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 ""
-"Hvis dette er afkrydset kan du indtaste et skalmønster i tekstfeltet til højre "
-"og vælge indgange fra listen."
+"Hvis dette er afkrydset kan du indtaste et skalmønster i tekstfeltet til "
+"højre og vælge indgange fra listen."
#: 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 ""
"Her kan du indtaste eller fjerne et skalmønster eller vælge en eller flere "
"indgange fra listen."
@@ -763,16 +685,16 @@ 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 ""
"Her kan du indtaste URL'en for en fil med skalmønstre der skal ignoreres ved "
"sammenligningen af mapperne."
#: 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 ""
"Enhver fil du vælger i denne dialog der popper op når du klikker på den vil "
"blive puttet ind i dialogen til venstre for denne knap."
@@ -841,168 +763,273 @@ msgstr "Skrifttype:"
msgid "Size:"
msgstr "Størrelse:"
-#: komparepart/kompareprefdlg.cpp:33
-msgid "Preferences"
-msgstr "Indstillinger"
-
-#: komparepart/kompareprefdlg.cpp:39
-msgid "View Settings"
-msgstr "Vis indstillinger"
-
-#: komparepart/kompareprefdlg.cpp:43
-msgid "Diff Settings"
-msgstr "Diff-indstillinger"
-
-#: komparepart/kompare_part.cpp:165
-msgid "Save &All"
-msgstr "Gem &alt"
+#: libdialogpages/viewpage.cpp:119
+#, fuzzy
+msgid "&Fonts"
+msgstr "Skrifttype:"
-#: komparepart/kompare_part.cpp:168
-msgid "Save .&diff..."
-msgstr "Gem .&diff..."
+#: libdiff2/komparemodellist.cpp:61
+msgid "&Apply Difference"
+msgstr "&Anvend forskel"
-#: komparepart/kompare_part.cpp:171
-msgid "Swap Source with Destination"
-msgstr "Ombyt kilde med mål"
+#: libdiff2/komparemodellist.cpp:64
+msgid "Un&apply Difference"
+msgstr "&Fjern anvendelse af forskel"
-#: komparepart/kompare_part.cpp:174
-msgid "Show Statistics"
-msgstr "Vis statistik"
+#: libdiff2/komparemodellist.cpp:67
+msgid "App&ly All"
+msgstr "An&vend alt"
-#: komparepart/kompare_part.cpp:269
-msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
-msgstr "<qt>URL'en <b>%1</b> kan ikke hentes.</qt>"
+#: libdiff2/komparemodellist.cpp:70
+msgid "&Unapply All"
+msgstr "&Fjern anvendelse af alt"
-#: komparepart/kompare_part.cpp:281
-msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
-msgstr "<qt>URL'en <b>%1</b> eksisterer ikke på dit system.</qt>"
+#: libdiff2/komparemodellist.cpp:73
+msgid "P&revious File"
+msgstr "&Forrige fil"
-#: komparepart/kompare_part.cpp:425
-msgid "Diff Options"
-msgstr "Diff-indstillinger"
+#: libdiff2/komparemodellist.cpp:76
+msgid "N&ext File"
+msgstr "Næ&ste fil"
-#: komparepart/kompare_part.cpp:443
-msgid "*.diff *.dif *.patch|Patch Files"
-msgstr "*.diff *.dif *.patch|Rettelsesfiler"
+#: libdiff2/komparemodellist.cpp:79
+msgid "&Previous Difference"
+msgstr "&Forrige forskel"
-#: komparepart/kompare_part.cpp:443
-msgid "Save .diff"
-msgstr "Gem .diff"
+#: libdiff2/komparemodellist.cpp:82
+msgid "&Next Difference"
+msgstr "&Næste forskel"
-#: komparepart/kompare_part.cpp:446
-msgid "The file exists or is write-protected; do you want to overwrite it?"
+#: 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 ""
-"Filen eksisterer eller er skrivebeskyttet. Ønsker du at overskrive den?"
-
-#: komparepart/kompare_part.cpp:446
-msgid "File Exists"
-msgstr "Fil eksisterer"
-
-#: komparepart/kompare_part.cpp:446
-msgid "Overwrite"
-msgstr "Overskriv"
+"<qt>Ingen modeller eller ingen forskelle, denne fil: <b>%1</b>, er ikke en "
+"gyldig diff-fil</qt>"
-#: komparepart/kompare_part.cpp:446
-msgid "Do Not Overwrite"
-msgstr "Overskriv ikke"
+#: libdiff2/komparemodellist.cpp:246
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
+"qt>"
+msgstr ""
+"<qt>Der var problemer med at anvende diff <b>%1</b> på filen <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>Der var problemer med at anvende diff <b>%1</b> på mappen <b>%2</b>.</qt>"
-#: komparepart/kompare_part.cpp:493
-msgid "Running diff..."
-msgstr "Kører diff..."
+#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
+msgid "Could not open a temporary file."
+msgstr "Kunne ikke åbne en midlertidig fil."
-#: komparepart/kompare_part.cpp:496
-msgid "Parsing diff output..."
-msgstr "Fortolker diff-uddata..."
+#: libdiff2/komparemodellist.cpp:350
+msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+msgstr ""
+"<qt>Kunne ikke skrive til en midlertidig fil.<b>%1</b>, sletter den.</qt>"
-#: komparepart/kompare_part.cpp:545
-msgid "Comparing file %1 with file %2"
-msgstr "Sammenligner filen %1 med filen %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>Kunne ikke skrive til en midlertidig mappe.<b>%1</b>.\n"
+"Filen er ikke blevet gemt.</qt>"
-#: komparepart/kompare_part.cpp:550
-msgid "Comparing files in %1 with files in %2"
-msgstr "Sammenligner filer i %1 med filer i %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>Kunne ikke overføre den midlertidige fil til målstedet <b>%1</b>Den "
+"midlertidige fil er stadig til stede i: <b>%2</b>. Du kan kopiere den "
+"manuelt til det rigtige sted.</qt>"
-#: komparepart/kompare_part.cpp:555
-#, c-format
-msgid "Viewing diff output from %1"
-msgstr "Kigger på diff-uddata fra %1"
+#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
+msgid "Could not parse diff output."
+msgstr "Kunne ikke fortolke diff-uddata."
-#: komparepart/kompare_part.cpp:558
-msgid "Blending diff output from %1 into file %2"
-msgstr "Indfletter diff-uddata fra %1 i filen %2"
+#: libdiff2/komparemodellist.cpp:451
+msgid "The files are identical."
+msgstr "Filerne er identiske."
-#: komparepart/kompare_part.cpp:563
-msgid "Blending diff output from %1 into folder %2"
-msgstr "Indfletter diff-uddata fra %1 i mappen %2"
+#: libdiff2/komparemodellist.cpp:613
+msgid "Could not write to the temporary file."
+msgstr "Kunne ikke skrive til en midlertidig fil."
-#: 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 ""
-"Du har lavet ændringer i målfilerne.\n"
-"Vil du gerne gemme dem?"
+"Et program til at se forskelle mellem filer og hvis man vil generere en diff-"
+"fil."
-#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
-msgid "Save Changes?"
-msgstr "Gem ændringer?"
+#: main.cpp:39
+msgid "This will compare URL1 with URL2"
+msgstr "Dette vil sammenligne URL1 med 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 ""
-"Der er ingen diff-fil eller ingen 2 filer der er blevet 'diffet'.Derfor er "
-"ingen statistik tilstede."
+"Dette vil åbne URL1 og forvente at det er diff-uddata. URL1 kan også være en "
+"'-' og så vil den læse fra standard-inddata. Kan bruges for eksempel til cvs "
+"diff | kompare -o -. Kompare vil tjekke for at se om den kan finde de "
+"oprindelige filer og så blande de oprindelige filer med diff-uddata og vise "
+"det i fremviseren. -n deaktiverer tjekket."
-#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
-#: komparepart/kompare_part.cpp:698
-msgid "Diff Statistics"
-msgstr "Diff-statistik"
+#: 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 ""
+"Dette vil blande URL2 med URL1, URL2 forventes at være diff-uddata og URL1 "
+"filen eller mappen som diff-uddata skal blandes med. "
-#: 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 ""
-"Statistik:\n"
-"\n"
-"Gammel fil: %1\n"
-"Ny fil: %2\n"
-"\n"
-"Format: %3\n"
-"Antal stumper: %4\n"
-"Antal forskelle: %5"
+"Deaktiverer tjekket for automatisk at finde de oprindelige file når det "
+"bruges med '-' som URL med -o flaget."
-#: 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 ""
+"Brug dette til at angive tegnsættet når der kaldes fra kommandolinjen. Det "
+"vil som standard være det lokale tegnsæt hvis intet andet er angivet."
+
+#: 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 og Otto Bruggeman"
+
+#: main.cpp:55 main.cpp:56
+msgid "Author"
+msgstr "Forfatter"
+
+#: main.cpp:57
+msgid "Kompare icon artist"
+msgstr "Kompare ikonkunstner"
+
+#: main.cpp:58
+msgid "A lot of good advice"
+msgstr "En masse gode råd"
+
+#: main.cpp:59
+msgid "Cervisia diff viewer"
+msgstr "Cervisia diff-fremviser"
+
+#: main.cpp:189
+msgid "Compare these files or folder"
+msgstr "Sammenlign disse filer og mapper"
+
+#: komparepart/komparepartui.rc:4 kompareui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Filer"
+
+#: komparepart/komparepartui.rc:13
+#, no-c-format
+msgid "&Difference"
+msgstr "&Forskel"
+
+#: komparepart/komparepartui.rc:25 kompareui.rc:14
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Vis indstillinger"
+
+#: komparepart/komparesaveoptionsbase.ui:41
+#, no-c-format
+msgid "Run Diff In"
+msgstr "Kør diff i"
+
+#: komparepart/komparesaveoptionsbase.ui:84
+#, no-c-format
+msgid "Command Line"
+msgstr "Kommandolinje"
+
+#: komparepart/komparesaveoptionsbase.ui:108
+#, no-c-format
+msgid "cd dir && diff -udHprNa -- source destination"
+msgstr "cd dir && diff -udHprNa -- kilde mål"
+
+#: komparepart/komparesaveoptionsbase.ui:118
+#, fuzzy, no-c-format
+msgid "Options"
+msgstr "&Indstillinger"
+
+#: komparepart/komparesaveoptionsbase.ui:135
+#, no-c-format
+msgid "Look for smaller changes"
+msgstr "Kig efter små ændringer"
+
+#: komparepart/komparesaveoptionsbase.ui:146
+#, no-c-format
+msgid "Optimize for large files"
+msgstr "Optimér for store filer"
+
+#: komparepart/komparesaveoptionsbase.ui:157
+#, no-c-format
+msgid "Ignore changes in case"
+msgstr "Ignorér versalændringer"
+
+#: komparepart/komparesaveoptionsbase.ui:165
+#, no-c-format
+msgid "Expand tabs to spaces"
+msgstr "Udvid tab til mellemrum"
+
+#: komparepart/komparesaveoptionsbase.ui:173
+#, no-c-format
+msgid "Ignore added or removed empty lines"
+msgstr "Ignorér tilføjede eller fjernede tomme linjer"
+
+#: komparepart/komparesaveoptionsbase.ui:181
+#, no-c-format
+msgid "Ignore changes in whitespace"
+msgstr "Ignorér ændringer i mellemrum"
+
+#: komparepart/komparesaveoptionsbase.ui:189
+#, no-c-format
+msgid "Show function names"
+msgstr "Vis funktionsnavne"
+
+#: komparepart/komparesaveoptionsbase.ui:200
+#, no-c-format
+msgid "Compare folders recursively"
+msgstr "Sammenlign mapper rekursivt"
+
+#: komparepart/komparesaveoptionsbase.ui:211
+#, no-c-format
+msgid "Treat new files as empty"
+msgstr "Behandl nye filer som tomme"
+
+#: komparepart/komparesaveoptionsbase.ui:227
+#, no-c-format
+msgid "Format"
+msgstr "Format"
+
+#: komparepart/komparesaveoptionsbase.ui:287
+#, no-c-format
+msgid "Side-by-side"
+msgstr "Ved siden af hinanden"
+
+#: kompareui.rc:27
+#, no-c-format
+msgid "Main Toolbar"
msgstr ""
-"Statistik:\n"
-"\n"
-"Antal filer i diff-fil: %1\n"
-"Format: %2\n"
-"\n"
-"Nuværende gammel fil: %3\n"
-"Nuværende ny fil: %4\n"
-"\n"
-"Antal stumper: %5\n"
-"Antal forskelle: %6"
diff --git a/tde-i18n-de/messages/tdesdk/kompare.po b/tde-i18n-de/messages/tdesdk/kompare.po
index 0136701e89..e72cfd134d 100644
--- a/tde-i18n-de/messages/tdesdk/kompare.po
+++ b/tde-i18n-de/messages/tdesdk/kompare.po
@@ -9,7 +9,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: 2006-07-02 15:57+0200\n"
"Last-Translator: Burkhard Lück <lueck@hube-lueck.de>\n"
"Language-Team: Deutsch <kde-i18n-de@kde.org>\n"
@@ -20,339 +20,13 @@ msgstr ""
"X-Generator: KBabel 1.11.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: libdiff2/komparemodellist.cpp:61
-msgid "&Apply Difference"
-msgstr "Abweichung &annehmen"
-
-#: libdiff2/komparemodellist.cpp:64
-msgid "Un&apply Difference"
-msgstr "&Annahme rückgängig"
-
-#: libdiff2/komparemodellist.cpp:67
-msgid "App&ly All"
-msgstr "A&lle annehmen"
-
-#: libdiff2/komparemodellist.cpp:70
-msgid "&Unapply All"
-msgstr "Alle Änderungen &zurücknehmen"
-
-#: libdiff2/komparemodellist.cpp:73
-msgid "P&revious File"
-msgstr "Vo&rige Datei"
-
-#: libdiff2/komparemodellist.cpp:76
-msgid "N&ext File"
-msgstr "Nächst&e Datei"
-
-#: libdiff2/komparemodellist.cpp:79
-msgid "&Previous Difference"
-msgstr "&Vorige Abweichung"
-
-#: libdiff2/komparemodellist.cpp:82
-msgid "&Next Difference"
-msgstr "Nächste Ab&weichung"
-
-#: 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>Keine Modelle oder keine Unterschiede vorhanden. Die Datei <b>%1</b> "
-"ist keine gültige diff-Datei.</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>Es sind Probleme beim Einfügen des diff <b>%1</b> in die Datei <b>%2</b> "
-"aufgetreten.</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>Es sind Probleme beim Einfügen des diff <b>%1</b> in den Ordner <b>%2</b> "
-"aufgetreten.</qt>"
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-msgid "Could not open a temporary file."
-msgstr "Eine temporäre Datei kann nicht geöffnet werden."
-
-#: libdiff2/komparemodellist.cpp:350
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr ""
-"<qt>In die temporäre Datei <b>%1</b> kann nicht geschrieben werden. Sie wird "
-"gelöscht.</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>Der Zielordner <b>%1</b> kann nicht angelegt werden.\n"
-"Die Datei wurde nicht gespeichert.</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>Die temporäre Datei kann nicht nach <b>%1</b> hochgeladen werden. Die "
-"temporäre Datei ist noch verfügbar unter <b>%2</b>. Sie können diese Datei "
-"manuell an die richtige Stelle kopieren.</qt>"
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-msgid "Could not parse diff output."
-msgstr "Diff-Ausgabe lässt sich nicht einlesen."
-
-#: libdiff2/komparemodellist.cpp:451
-msgid "The files are identical."
-msgstr "Die Dateien sind identisch."
-
-#: libdiff2/komparemodellist.cpp:613
-msgid "Could not write to the temporary file."
-msgstr "Eine temporäre Datei kann nicht gespeichert werden."
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, no-c-format
-msgid "&Difference"
-msgstr "&Abweichung"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, no-c-format
-msgid "Run Diff In"
-msgstr "Diff starten in"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, no-c-format
-msgid "Command Line"
-msgstr "Befehl"
-
-#. 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 -- quelle ziel"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, no-c-format
-msgid "Look for smaller changes"
-msgstr "Nach kleineren Änderungen suchen"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, no-c-format
-msgid "Optimize for large files"
-msgstr "Für große Dateien optimieren"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, no-c-format
-msgid "Ignore changes in case"
-msgstr "Änderungen der Groß/Kleinschreibung ignorieren"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, no-c-format
-msgid "Expand tabs to spaces"
-msgstr "Tabulatoren in Leerzeichen umwandeln"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
-#: rc.cpp:45
-#, no-c-format
-msgid "Ignore added or removed empty lines"
-msgstr "Neue oder entfernte Leerzeilen ignorieren"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr "Leerzeichen-Änderungen ignorieren"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, no-c-format
-msgid "Show function names"
-msgstr "Funktionsnamen anzeigen"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, no-c-format
-msgid "Compare folders recursively"
-msgstr "Unterordner einbeziehen"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
-#: rc.cpp:57
-#, no-c-format
-msgid "Treat new files as empty"
-msgstr "Neue Dateien als leer betrachten"
-
-#. 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 "Mit Kontextzeilen"
-
-#. 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-Skript"
-
-#. 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 "Vereinheitlichtes Kontext-Format (unified)"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
-#: rc.cpp:78
-#, no-c-format
-msgid "Side-by-side"
-msgstr "Nebeneinander"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
-#: libdialogpages/diffpage.cpp:251 rc.cpp:81
-#, no-c-format
-msgid "Number of context lines:"
-msgstr "Anzahl:"
-
-#: main.cpp:33
-msgid ""
-"A program to view the differences between files and optionally generate a diff"
-msgstr ""
-"Ein Programm zur Darstellung der Unterschiede zwischen Dateien und zur "
-"wahlweisen Erstellung von \"Diff\"-Dateien."
-
-#: main.cpp:39
-msgid "This will compare URL1 with URL2"
-msgstr "Die URL1 wird mit URL2 verglichen"
-
-#: 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 ""
-"Hiermit wird die URL1 geöffnet und als Ausgabe von diff betrachtet. URL1 kann "
-"auch den Wert '-' haben, wenn aus der Standardeingabe gelesen werden soll. Dies "
-"kann zum Beispiel für cvs diff | kompare -o genutzt werden. Kompare prüft dann, "
-"ob die ursprüngliche(n) Datei(en) auffindbar sind und blendet diese bei der "
-"Anzeige in die Ausgabe von diff ein. Der Schalter -n schaltet diese Prüfung "
-"aus."
-
-#: 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 ""
-"Die URL2 wird in URL1 eingefügt. Dabei wird URL2 als Ausgabe von diff "
-"betrachtet und URL1 als Datei oder Ordner, in den die Ausgabe von diff "
-"eingefügt werden soll. "
-
-#: main.cpp:42
-msgid ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
-msgstr ""
-"Schaltet bei Verwendung von '-' als URL in Verbindung mit dem Schalter -o die "
-"Prüfung für das automatische Suchen nach der ursprünglichen Datei aus."
-
-#: 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 ""
-"Setzen Sie hier die Kodierung beim Aufruf von der Befehlszeile. Fehlt diese "
-"Angabe wird die lokale Kodierung verwendet."
-
-#: 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 und Otto Bruggeman"
-
-#: main.cpp:55 main.cpp:56
-msgid "Author"
-msgstr "Autor"
-
-#: main.cpp:57
-msgid "Kompare icon artist"
-msgstr "Schöpfer des Kompare-Symbols"
-
-#: main.cpp:58
-msgid "A lot of good advice"
-msgstr "Eine Menge guter Ratschläge"
-
-#: main.cpp:59
-msgid "Cervisia diff viewer"
-msgstr "Cervisia Diff-Anzeige"
-
-#: kompare_shell.cpp:398 main.cpp:185
-msgid "Compare Files or Folders"
-msgstr "Dateien oder Ordner vergleichen"
-
-#: kompare_shell.cpp:399 main.cpp:186
-msgid "Source"
-msgstr "Quelle"
-
-#: kompare_shell.cpp:400 main.cpp:187
-msgid "Destination"
-msgstr "Ziel"
-
-#: kompare_shell.cpp:402 main.cpp:189
-msgid "Compare"
-msgstr "Vergleichen"
-
-#: main.cpp:189
-msgid "Compare these files or folder"
-msgstr "Diese Dateien oder Ordner vergleichen"
-
-#: 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 ""
-"Wenn Sie zwei Dateinamen oder zwei Ordner in die Eingabefelder dieser Dialogbox "
-"eingegeben haben, wird dieser Knopf aktiviert. Über den Knopf können Sie den "
-"Vergleich der Dateien oder Ordner starten. "
-
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Thomas Diehl, Martin Derungs"
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -458,23 +132,49 @@ msgstr "Mische diese Datei oder den Ordner mit der Ausgabe von diff"
#: 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 ""
-"Wenn Sie den Namen einer Datei oder eines Ordners, sowie den Namen der Datei, "
-"die die Ausgabe von diff enthält, in die Eingabefelder eingetragen haben, wird "
-"dieser Knopf aktiviert. Durch Betätigen dieses Knopfes rufen Sie die "
-"Hauptansicht von Kompare auf, in der die Datei oder der Ordner mit der Ausgabe "
-"von diff vermischt wird, so dass Sie die Unterschiede in die Datei oder die "
-"Dateien einfügen können. "
+"Wenn Sie den Namen einer Datei oder eines Ordners, sowie den Namen der "
+"Datei, die die Ausgabe von diff enthält, in die Eingabefelder eingetragen "
+"haben, wird dieser Knopf aktiviert. Durch Betätigen dieses Knopfes rufen Sie "
+"die Hauptansicht von Kompare auf, in der die Datei oder der Ordner mit der "
+"Ausgabe von diff vermischt wird, so dass Sie die Unterschiede in die Datei "
+"oder die Dateien einfügen können. "
+
+#: kompare_shell.cpp:398 main.cpp:185
+msgid "Compare Files or Folders"
+msgstr "Dateien oder Ordner vergleichen"
+
+#: kompare_shell.cpp:399 main.cpp:186
+msgid "Source"
+msgstr "Quelle"
+
+#: kompare_shell.cpp:400 main.cpp:187
+msgid "Destination"
+msgstr "Ziel"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
+msgstr "Vergleichen"
#: kompare_shell.cpp:402
msgid "Compare these files or folders"
msgstr "Diese Dateien oder Ordner vergleichen"
+#: 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 ""
+"Wenn Sie zwei Dateinamen oder zwei Ordner in die Eingabefelder dieser "
+"Dialogbox eingegeben haben, wird dieser Knopf aktiviert. Über den Knopf "
+"können Sie den Vergleich der Dateien oder Ordner starten. "
+
#: kompare_shell.cpp:439
msgid "Text View"
msgstr "Text-Ansicht"
@@ -570,19 +270,232 @@ msgstr "Unbekannt"
msgid "KompareNavTreePart"
msgstr "KompareNavTreePart"
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
-msgstr "Hier können Sie die Dateien angeben, die verglichen werden sollen."
+#: komparepart/kompare_part.cpp:165
+msgid "Save &All"
+msgstr "&Alles speichern"
+
+#: komparepart/kompare_part.cpp:168
+msgid "Save .&diff..."
+msgstr "D&iff speichern ..."
+
+#: komparepart/kompare_part.cpp:171
+msgid "Swap Source with Destination"
+msgstr "Quelle mit Ziel austauschen"
+
+#: komparepart/kompare_part.cpp:174
+msgid "Show Statistics"
+msgstr "Statistik anzeigen"
+
+#: komparepart/kompare_part.cpp:269
+msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+msgstr "<qt>Die URL <b>%1</b> kann nicht heruntergeladen werden.</qt>"
+
+#: komparepart/kompare_part.cpp:281
+msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+msgstr "<qt>Die URL <b>%1</b> existiert nicht auf Ihrem System.</qt>"
+
+#: komparepart/kompare_part.cpp:425
+msgid "Diff Options"
+msgstr "Diff-Optionen"
+
+#: komparepart/kompare_part.cpp:443
+msgid "*.diff *.dif *.patch|Patch Files"
+msgstr "*.diff *.dif *.patch|Patch-Dateien"
+
+#: komparepart/kompare_part.cpp:443
+msgid "Save .diff"
+msgstr "Diff speichern"
+
+#: komparepart/kompare_part.cpp:446
+msgid "The file exists or is write-protected; do you want to overwrite it?"
+msgstr ""
+"Die Datei existiert bereits oder ist schreibgeschützt. Möchten Sie die Datei "
+"überschreiben?"
+
+#: komparepart/kompare_part.cpp:446
+msgid "File Exists"
+msgstr "Datei existiert"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Overwrite"
+msgstr "Überschreiben"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Do Not Overwrite"
+msgstr "Nicht überschreiben"
+
+#: komparepart/kompare_part.cpp:481
+msgid "KomparePart"
+msgstr "KomparePart"
+
+#: komparepart/kompare_part.cpp:493
+msgid "Running diff..."
+msgstr "Diff läuft ..."
+
+#: komparepart/kompare_part.cpp:496
+msgid "Parsing diff output..."
+msgstr "Ausgabe von Diff wird analysiert ..."
+
+#: komparepart/kompare_part.cpp:545
+msgid "Comparing file %1 with file %2"
+msgstr "Vergleiche Datei %1 mit Datei %2"
+
+#: komparepart/kompare_part.cpp:550
+msgid "Comparing files in %1 with files in %2"
+msgstr "Dateien in %1 mit Dateien in %2 vergleichen"
+
+#: komparepart/kompare_part.cpp:555
+#, c-format
+msgid "Viewing diff output from %1"
+msgstr "Ausgabe von Diff für %1"
+
+#: komparepart/kompare_part.cpp:558
+msgid "Blending diff output from %1 into file %2"
+msgstr "Ausgabe von Diff für %1 wird in Datei %2 eingefügt"
+
+#: komparepart/kompare_part.cpp:563
+msgid "Blending diff output from %1 into folder %2"
+msgstr "Ausgabe von Diff für %1 wird in Ordner %2 eingefügt"
+
+#: 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 ""
+"Sie haben die Zieldatei geändert.\n"
+"Möchten Sie die Änderungen speichern?"
+
+#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+msgid "Save Changes?"
+msgstr "Änderungen speichern?"
+
+#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276
+#: libdialogpages/diffpage.cpp:244
+#, no-c-format
+msgid "Unified"
+msgstr "Vereinheitlichtes Kontext-Format (unified)"
+
+#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244
+#: libdialogpages/diffpage.cpp:238
+#, no-c-format
+msgid "Context"
+msgstr "Mit Kontextzeilen"
+
+#: 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-Skript"
+
+#: 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 ""
+"Leider ist keine Statistik verfügbar, da es keine Diff-Datei gibt oder keine "
+"Diff-Datei aus zwei Dateien erzeugt worden ist."
+
+#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
+#: komparepart/kompare_part.cpp:698
+msgid "Diff Statistics"
+msgstr "Diff-Statistik"
+
+#: 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 ""
+"Statistik:\n"
+"\n"
+"Alte Datei: %1\n"
+"Neue Datei: %2\n"
+"\n"
+"Format: %3\n"
+"Anzahl Gruppen (hunks): %4\n"
+"Anzahl Abweichungen: %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 ""
+"Statistik:\n"
+"\n"
+"Anzahl Dateien in Diff-Datei: %1\n"
+"Format: %2\n"
+"\n"
+"Aktuelle alte Datei: %3\n"
+"Aktuelle neue Datei: %4\n"
+"\n"
+"Anzahl Gruppen (hunks): %5\n"
+"Anzahl Abweichungen: %6"
+
+#: komparepart/kompareprefdlg.cpp:33
+msgid "Preferences"
+msgstr "Persönliche Einstellungen"
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View"
+msgstr "Text-Ansicht"
+
+#: komparepart/kompareprefdlg.cpp:39
+msgid "View Settings"
+msgstr "Anzeige-Einstellungen"
#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
msgid "Diff"
msgstr "Diff"
+#: komparepart/kompareprefdlg.cpp:43
+msgid "Diff Settings"
+msgstr "Diff-Optionen"
+
+#: kompareurldialog.cpp:41
+#, fuzzy
+msgid "Files"
+msgstr "&Dateien"
+
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr "Hier können Sie die Dateien angeben, die verglichen werden sollen."
+
#: kompareurldialog.cpp:47
msgid "Here you can change the options for comparing the files."
msgstr "Hier können Sie die Einstellungen für den Dateivergleich ändern."
#: kompareurldialog.cpp:53
+#, fuzzy
+msgid "Appearance"
+msgstr "&Erscheinungsbild"
+
+#: kompareurldialog.cpp:53
msgid "Here you can change the options for the view."
msgstr "hier können Sie die Einstellungen für die Ansicht einstellen."
@@ -596,9 +509,9 @@ msgid ""
"program does not support all the options that the GNU version does. This way "
"you can select that version."
msgstr ""
-"Sie können hier ein anderes diff-Programm auswählen. Unter Solaris unterstützt "
-"das vorinstallierte diff nicht alle Optionen der GNU-Version von diff. Hierüber "
-"können Sie diese Version auswählen."
+"Sie können hier ein anderes diff-Programm auswählen. Unter Solaris "
+"unterstützt das vorinstallierte diff nicht alle Optionen der GNU-Version von "
+"diff. Hierüber können Sie diese Version auswählen."
#: libdialogpages/diffpage.cpp:221
msgid "&Diff"
@@ -610,18 +523,24 @@ msgstr "Ausgabeformat"
#: 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 ""
"Wählen Sie das Ausgabeformat von diff. Das am häufigsten verwendete ist das "
-"Format \"unified\" da es sehr übersichtlich ist. Die TDE-Entwickler bevorzugen "
-"dieses Format. Verwenden Sie also am besten für Patches dieses Format."
+"Format \"unified\" da es sehr übersichtlich ist. Die TDE-Entwickler "
+"bevorzugen dieses Format. Verwenden Sie also am besten für Patches dieses "
+"Format."
#: libdialogpages/diffpage.cpp:247
msgid "Lines of Context"
msgstr "Kontextzeilen"
+#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251
+#, no-c-format
+msgid "Number of context lines:"
+msgstr "Anzahl:"
+
#: libdialogpages/diffpage.cpp:253
msgid ""
"The number of context lines is normally 2 or 3. This makes the diff readable "
@@ -629,8 +548,8 @@ msgid ""
"unnecessarily."
msgstr ""
"Die Anzahl der Kontextzeilen ist normalerweise 2 oder 3. Hierdurch wird die "
-"Ausgabe lesbarer und kann in vielen Fälle leichter eingespielt werden. Mehr als "
-"drei Zeilen blähen die diff-Ausgabe unnötig auf."
+"Ausgabe lesbarer und kann in vielen Fälle leichter eingespielt werden. Mehr "
+"als drei Zeilen blähen die diff-Ausgabe unnötig auf."
#: libdialogpages/diffpage.cpp:259
msgid "&Format"
@@ -746,19 +665,19 @@ msgstr "Dateimuster für Ausschluss"
#: 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 ""
-"Ist die Einstellung markiert, können Sie ein Dateimuster im Eingabefeld rechts "
-"eingeben oder Einträge aus der Liste auswählen."
+"Ist die Einstellung markiert, können Sie ein Dateimuster im Eingabefeld "
+"rechts eingeben oder Einträge aus der Liste auswählen."
#: 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 ""
-"Hier können Sie ein Dateimuster eingeben oder löschen oder einen oder mehrere "
-"Einträge aus der Liste auswählen."
+"Hier können Sie ein Dateimuster eingeben oder löschen oder einen oder "
+"mehrere Einträge aus der Liste auswählen."
#: libdialogpages/diffpage.cpp:338
msgid "File with Filenames to Exclude"
@@ -773,16 +692,16 @@ 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 ""
"Hier können Sie die URL einer Datei mit Dateimustern eingeben, die beim "
"Vergleich der Ordner ignoriert werden sollen."
#: 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 ""
"Jeder Datei, die Sie im Dialog auswählen, der erscheint, wenn Sie darauf "
"klicken, wird im Dialog links vom Knopf eingefügt."
@@ -851,169 +770,278 @@ msgstr "Schriftart:"
msgid "Size:"
msgstr "Größe:"
-#: komparepart/kompareprefdlg.cpp:33
-msgid "Preferences"
-msgstr "Persönliche Einstellungen"
-
-#: komparepart/kompareprefdlg.cpp:39
-msgid "View Settings"
-msgstr "Anzeige-Einstellungen"
-
-#: komparepart/kompareprefdlg.cpp:43
-msgid "Diff Settings"
-msgstr "Diff-Optionen"
-
-#: komparepart/kompare_part.cpp:165
-msgid "Save &All"
-msgstr "&Alles speichern"
+#: libdialogpages/viewpage.cpp:119
+#, fuzzy
+msgid "&Fonts"
+msgstr "Schriftart:"
-#: komparepart/kompare_part.cpp:168
-msgid "Save .&diff..."
-msgstr "D&iff speichern ..."
+#: libdiff2/komparemodellist.cpp:61
+msgid "&Apply Difference"
+msgstr "Abweichung &annehmen"
-#: komparepart/kompare_part.cpp:171
-msgid "Swap Source with Destination"
-msgstr "Quelle mit Ziel austauschen"
+#: libdiff2/komparemodellist.cpp:64
+msgid "Un&apply Difference"
+msgstr "&Annahme rückgängig"
-#: komparepart/kompare_part.cpp:174
-msgid "Show Statistics"
-msgstr "Statistik anzeigen"
+#: libdiff2/komparemodellist.cpp:67
+msgid "App&ly All"
+msgstr "A&lle annehmen"
-#: komparepart/kompare_part.cpp:269
-msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
-msgstr "<qt>Die URL <b>%1</b> kann nicht heruntergeladen werden.</qt>"
+#: libdiff2/komparemodellist.cpp:70
+msgid "&Unapply All"
+msgstr "Alle Änderungen &zurücknehmen"
-#: komparepart/kompare_part.cpp:281
-msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
-msgstr "<qt>Die URL <b>%1</b> existiert nicht auf Ihrem System.</qt>"
+#: libdiff2/komparemodellist.cpp:73
+msgid "P&revious File"
+msgstr "Vo&rige Datei"
-#: komparepart/kompare_part.cpp:425
-msgid "Diff Options"
-msgstr "Diff-Optionen"
+#: libdiff2/komparemodellist.cpp:76
+msgid "N&ext File"
+msgstr "Nächst&e Datei"
-#: komparepart/kompare_part.cpp:443
-msgid "*.diff *.dif *.patch|Patch Files"
-msgstr "*.diff *.dif *.patch|Patch-Dateien"
+#: libdiff2/komparemodellist.cpp:79
+msgid "&Previous Difference"
+msgstr "&Vorige Abweichung"
-#: komparepart/kompare_part.cpp:443
-msgid "Save .diff"
-msgstr "Diff speichern"
+#: libdiff2/komparemodellist.cpp:82
+msgid "&Next Difference"
+msgstr "Nächste Ab&weichung"
-#: komparepart/kompare_part.cpp:446
-msgid "The file exists or is write-protected; do you want to overwrite it?"
+#: 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 ""
-"Die Datei existiert bereits oder ist schreibgeschützt. Möchten Sie die Datei "
-"überschreiben?"
+"<qt>Keine Modelle oder keine Unterschiede vorhanden. Die Datei <b>%1</b> ist "
+"keine gültige diff-Datei.</qt>"
-#: komparepart/kompare_part.cpp:446
-msgid "File Exists"
-msgstr "Datei existiert"
-
-#: komparepart/kompare_part.cpp:446
-msgid "Overwrite"
-msgstr "Überschreiben"
-
-#: komparepart/kompare_part.cpp:446
-msgid "Do Not Overwrite"
-msgstr "Nicht überschreiben"
+#: libdiff2/komparemodellist.cpp:246
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
+"qt>"
+msgstr ""
+"<qt>Es sind Probleme beim Einfügen des diff <b>%1</b> in die Datei <b>%2</b> "
+"aufgetreten.</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>Es sind Probleme beim Einfügen des diff <b>%1</b> in den Ordner <b>%2</"
+"b> aufgetreten.</qt>"
-#: komparepart/kompare_part.cpp:493
-msgid "Running diff..."
-msgstr "Diff läuft ..."
+#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
+msgid "Could not open a temporary file."
+msgstr "Eine temporäre Datei kann nicht geöffnet werden."
-#: komparepart/kompare_part.cpp:496
-msgid "Parsing diff output..."
-msgstr "Ausgabe von Diff wird analysiert ..."
+#: libdiff2/komparemodellist.cpp:350
+msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+msgstr ""
+"<qt>In die temporäre Datei <b>%1</b> kann nicht geschrieben werden. Sie wird "
+"gelöscht.</qt>"
-#: komparepart/kompare_part.cpp:545
-msgid "Comparing file %1 with file %2"
-msgstr "Vergleiche Datei %1 mit Datei %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>Der Zielordner <b>%1</b> kann nicht angelegt werden.\n"
+"Die Datei wurde nicht gespeichert.</qt>"
-#: komparepart/kompare_part.cpp:550
-msgid "Comparing files in %1 with files in %2"
-msgstr "Dateien in %1 mit Dateien in %2 vergleichen"
+#: 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>Die temporäre Datei kann nicht nach <b>%1</b> hochgeladen werden. Die "
+"temporäre Datei ist noch verfügbar unter <b>%2</b>. Sie können diese Datei "
+"manuell an die richtige Stelle kopieren.</qt>"
-#: komparepart/kompare_part.cpp:555
-#, c-format
-msgid "Viewing diff output from %1"
-msgstr "Ausgabe von Diff für %1"
+#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
+msgid "Could not parse diff output."
+msgstr "Diff-Ausgabe lässt sich nicht einlesen."
-#: komparepart/kompare_part.cpp:558
-msgid "Blending diff output from %1 into file %2"
-msgstr "Ausgabe von Diff für %1 wird in Datei %2 eingefügt"
+#: libdiff2/komparemodellist.cpp:451
+msgid "The files are identical."
+msgstr "Die Dateien sind identisch."
-#: komparepart/kompare_part.cpp:563
-msgid "Blending diff output from %1 into folder %2"
-msgstr "Ausgabe von Diff für %1 wird in Ordner %2 eingefügt"
+#: libdiff2/komparemodellist.cpp:613
+msgid "Could not write to the temporary file."
+msgstr "Eine temporäre Datei kann nicht gespeichert werden."
-#: 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 ""
-"Sie haben die Zieldatei geändert.\n"
-"Möchten Sie die Änderungen speichern?"
+"Ein Programm zur Darstellung der Unterschiede zwischen Dateien und zur "
+"wahlweisen Erstellung von \"Diff\"-Dateien."
-#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
-msgid "Save Changes?"
-msgstr "Änderungen speichern?"
+#: main.cpp:39
+msgid "This will compare URL1 with URL2"
+msgstr "Die URL1 wird mit URL2 verglichen"
-#: 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 ""
-"Leider ist keine Statistik verfügbar, da es keine Diff-Datei gibt oder keine "
-"Diff-Datei aus zwei Dateien erzeugt worden ist."
+"Hiermit wird die URL1 geöffnet und als Ausgabe von diff betrachtet. URL1 "
+"kann auch den Wert '-' haben, wenn aus der Standardeingabe gelesen werden "
+"soll. Dies kann zum Beispiel für cvs diff | kompare -o genutzt werden. "
+"Kompare prüft dann, ob die ursprüngliche(n) Datei(en) auffindbar sind und "
+"blendet diese bei der Anzeige in die Ausgabe von diff ein. Der Schalter -n "
+"schaltet diese Prüfung aus."
-#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
-#: komparepart/kompare_part.cpp:698
-msgid "Diff Statistics"
-msgstr "Diff-Statistik"
+#: 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 ""
+"Die URL2 wird in URL1 eingefügt. Dabei wird URL2 als Ausgabe von diff "
+"betrachtet und URL1 als Datei oder Ordner, in den die Ausgabe von diff "
+"eingefügt werden soll. "
-#: 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 ""
-"Statistik:\n"
-"\n"
-"Alte Datei: %1\n"
-"Neue Datei: %2\n"
-"\n"
-"Format: %3\n"
-"Anzahl Gruppen (hunks): %4\n"
-"Anzahl Abweichungen: %5"
+"Schaltet bei Verwendung von '-' als URL in Verbindung mit dem Schalter -o "
+"die Prüfung für das automatische Suchen nach der ursprünglichen Datei aus."
-#: 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 ""
+"Setzen Sie hier die Kodierung beim Aufruf von der Befehlszeile. Fehlt diese "
+"Angabe wird die lokale Kodierung verwendet."
+
+#: 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 und Otto Bruggeman"
+
+#: main.cpp:55 main.cpp:56
+msgid "Author"
+msgstr "Autor"
+
+#: main.cpp:57
+msgid "Kompare icon artist"
+msgstr "Schöpfer des Kompare-Symbols"
+
+#: main.cpp:58
+msgid "A lot of good advice"
+msgstr "Eine Menge guter Ratschläge"
+
+#: main.cpp:59
+msgid "Cervisia diff viewer"
+msgstr "Cervisia Diff-Anzeige"
+
+#: main.cpp:189
+msgid "Compare these files or folder"
+msgstr "Diese Dateien oder Ordner vergleichen"
+
+#: komparepart/komparepartui.rc:4 kompareui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Dateien"
+
+#: komparepart/komparepartui.rc:13
+#, no-c-format
+msgid "&Difference"
+msgstr "&Abweichung"
+
+#: komparepart/komparepartui.rc:25 kompareui.rc:14
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Anzeige-Einstellungen"
+
+#: komparepart/komparesaveoptionsbase.ui:41
+#, no-c-format
+msgid "Run Diff In"
+msgstr "Diff starten in"
+
+#: komparepart/komparesaveoptionsbase.ui:84
+#, no-c-format
+msgid "Command Line"
+msgstr "Befehl"
+
+#: komparepart/komparesaveoptionsbase.ui:108
+#, no-c-format
+msgid "cd dir && diff -udHprNa -- source destination"
+msgstr "cd dir && diff -udHprNa -- quelle ziel"
+
+#: komparepart/komparesaveoptionsbase.ui:118
+#, fuzzy, no-c-format
+msgid "Options"
+msgstr "Diff-O&ptionen"
+
+#: komparepart/komparesaveoptionsbase.ui:135
+#, no-c-format
+msgid "Look for smaller changes"
+msgstr "Nach kleineren Änderungen suchen"
+
+#: komparepart/komparesaveoptionsbase.ui:146
+#, no-c-format
+msgid "Optimize for large files"
+msgstr "Für große Dateien optimieren"
+
+#: komparepart/komparesaveoptionsbase.ui:157
+#, no-c-format
+msgid "Ignore changes in case"
+msgstr "Änderungen der Groß/Kleinschreibung ignorieren"
+
+#: komparepart/komparesaveoptionsbase.ui:165
+#, no-c-format
+msgid "Expand tabs to spaces"
+msgstr "Tabulatoren in Leerzeichen umwandeln"
+
+#: komparepart/komparesaveoptionsbase.ui:173
+#, no-c-format
+msgid "Ignore added or removed empty lines"
+msgstr "Neue oder entfernte Leerzeilen ignorieren"
+
+#: komparepart/komparesaveoptionsbase.ui:181
+#, no-c-format
+msgid "Ignore changes in whitespace"
+msgstr "Leerzeichen-Änderungen ignorieren"
+
+#: komparepart/komparesaveoptionsbase.ui:189
+#, no-c-format
+msgid "Show function names"
+msgstr "Funktionsnamen anzeigen"
+
+#: komparepart/komparesaveoptionsbase.ui:200
+#, no-c-format
+msgid "Compare folders recursively"
+msgstr "Unterordner einbeziehen"
+
+#: komparepart/komparesaveoptionsbase.ui:211
+#, no-c-format
+msgid "Treat new files as empty"
+msgstr "Neue Dateien als leer betrachten"
+
+#: komparepart/komparesaveoptionsbase.ui:227
+#, no-c-format
+msgid "Format"
+msgstr "Format"
+
+#: komparepart/komparesaveoptionsbase.ui:287
+#, no-c-format
+msgid "Side-by-side"
+msgstr "Nebeneinander"
+
+#: kompareui.rc:27
+#, no-c-format
+msgid "Main Toolbar"
msgstr ""
-"Statistik:\n"
-"\n"
-"Anzahl Dateien in Diff-Datei: %1\n"
-"Format: %2\n"
-"\n"
-"Aktuelle alte Datei: %3\n"
-"Aktuelle neue Datei: %4\n"
-"\n"
-"Anzahl Gruppen (hunks): %5\n"
-"Anzahl Abweichungen: %6"
diff --git a/tde-i18n-el/messages/tdesdk/kompare.po b/tde-i18n-el/messages/tdesdk/kompare.po
index 89fc885b1d..eb98cd7728 100644
--- a/tde-i18n-el/messages/tdesdk/kompare.po
+++ b/tde-i18n-el/messages/tdesdk/kompare.po
@@ -8,7 +8,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: 2007-03-14 13:08+0200\n"
"Last-Translator: Spiros Georgaras <sng@hellug.gr>\n"
"Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
@@ -19,336 +19,13 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: libdiff2/komparemodellist.cpp:61
-msgid "&Apply Difference"
-msgstr "&Εφαρμογή διαφοράς"
-
-#: libdiff2/komparemodellist.cpp:64
-msgid "Un&apply Difference"
-msgstr "Αν&αίρεση εφαρμογής διαφοράς"
-
-#: libdiff2/komparemodellist.cpp:67
-msgid "App&ly All"
-msgstr "Ε&φαρμογή όλων"
-
-#: libdiff2/komparemodellist.cpp:70
-msgid "&Unapply All"
-msgstr "Α&ναίρεση εφαρμογής όλων"
-
-#: libdiff2/komparemodellist.cpp:73
-msgid "P&revious File"
-msgstr "Π&ροηγούμενο αρχείο"
-
-#: libdiff2/komparemodellist.cpp:76
-msgid "N&ext File"
-msgstr "Ε&πόμενο αρχείο"
-
-#: libdiff2/komparemodellist.cpp:79
-msgid "&Previous Difference"
-msgstr "Πρ&οηγούμενη διαφορά"
-
-#: libdiff2/komparemodellist.cpp:82
-msgid "&Next Difference"
-msgstr "Επό&μενη διαφορά"
-
-#: 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>Χωρίς μοντέλα ή χωρίς διαφορές, το αρχείο: <b>%1</b>"
-", δεν είναι ένα έγκυρο αρχείο διαφορών.</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>Υπήρξαν προβλήματα εφαρμογής του diff <b>%1</b> στο αρχείο <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>Υπήρξαν προβλήματα εφαρμογής του diff <b>%1</b> στο φάκελο <b>%2</b>.</qt>"
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-msgid "Could not open a temporary file."
-msgstr "Αδύνατο το άνοιγμα ενός προσωρινού αρχείου."
-
-#: libdiff2/komparemodellist.cpp:350
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr ""
-"<qt>Αδύνατη η εγγραφή στο προσωρινό αρχείο <b>%1</b>, το διαγράφω.</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>Αδύνατη η δημιουργία του καταλόγου προορισμού <b>%1</b>.\n"
-"Το αρχείο δεν αποθηκεύτηκε.</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>Αδυναμία αποστολής του προσωρινού αρχείου στην τοποθεσία προορισμού <b>"
-"%1</b>. Το προσωρινό αρχείο είναι ακόμη διαθέσιμο κάτω από το: <b>%2</b>"
-". Μπορείτε να το αντιγράψετε χειροκίνητα στη σωστή θέση.</qt>"
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-msgid "Could not parse diff output."
-msgstr "Δεν ήταν δυνατή η επεξεργασία της εξόδου του diff."
-
-#: libdiff2/komparemodellist.cpp:451
-msgid "The files are identical."
-msgstr "Τα αρχεία είναι όμοια."
-
-#: libdiff2/komparemodellist.cpp:613
-msgid "Could not write to the temporary file."
-msgstr "Αδύνατο η εγγραφή στο προσωρινό αρχείο."
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, no-c-format
-msgid "&Difference"
-msgstr "&Διαφορά"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, no-c-format
-msgid "Run Diff In"
-msgstr "Εκτέλεση diff στο"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, no-c-format
-msgid "Command Line"
-msgstr "Γραμμή εντολών"
-
-#. 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 -- πηγή προορισμός"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, no-c-format
-msgid "Look for smaller changes"
-msgstr "Έλεγχος για μικρότερες διαφορές"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, no-c-format
-msgid "Optimize for large files"
-msgstr "Βελτιστοποίηση για μεγάλα αρχεία"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, no-c-format
-msgid "Ignore changes in case"
-msgstr "Παράβλεψη αλλαγών μεταξύ πεζών και κεφαλαίων"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, no-c-format
-msgid "Expand tabs to spaces"
-msgstr "Μετατροπή των στηλοθετών σε κενά"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
-#: rc.cpp:45
-#, no-c-format
-msgid "Ignore added or removed empty lines"
-msgstr "Παράβλεψη πρόσθετων ή αφαιρούμενων κενών γραμμών"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr "Παράβλεψη αλλαγών στα κενά"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, no-c-format
-msgid "Show function names"
-msgstr "Εμφάνιση των ονομάτων των συναρτήσεων"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, no-c-format
-msgid "Compare folders recursively"
-msgstr "Σύγκριση φακέλων αναδρομικά"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
-#: rc.cpp:57
-#, no-c-format
-msgid "Treat new files as empty"
-msgstr "Θεώρηση των καινούριων αρχείων ως κενά"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
-#: rc.cpp:60
-#, no-c-format
-msgid "Format"
-msgstr "Μορφή"
-
-#. 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 "Σχετικό"
-
-#. 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 "Κανονικό"
-
-#. 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 "Ενοποιημένο"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
-#: rc.cpp:78
-#, no-c-format
-msgid "Side-by-side"
-msgstr "Δίπλα-δίπλα"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
-#: libdialogpages/diffpage.cpp:251 rc.cpp:81
-#, no-c-format
-msgid "Number of context lines:"
-msgstr "Αριθμός σχετιζόμενων γραμμών:"
-
-#: main.cpp:33
-msgid ""
-"A program to view the differences between files and optionally generate a diff"
-msgstr ""
-"Ένα πρόγραμμα για την προβολή των διαφορών μεταξύ αρχείων και προαιρετικά τη "
-"δημιουργία diff (αρχείου διαφορών)"
-
-#: main.cpp:39
-msgid "This will compare URL1 with URL2"
-msgstr "Αυτό θα συγκρίνει το URL1 με το 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 ""
-"Αυτό θα ανοίξει το URL1 και θα αναμένει την έξοδο διαφορών. Το URL1 μπορεί "
-"επίσης να είναι ένα '-' που σημαίνει ότι θα διαβάσει από την κανονική είσοδο. "
-"Μπορεί να χρησιμοποιηθεί για παράδειγμα ως diff cvs | kompare -o -. Το Kompare "
-"θα κάνει έναν έλεγχο αν μπορεί να εντοπίσει τα αρχικά αρχεία και έπειτα θα "
-"αναμείξει τα αρχικά αρχεία με την έξοδο διαφορών και θα την εμφανίσει στην "
-"προβολή. Το -n απενεργοποιεί αυτόν τον έλεγχο."
-
-#: 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 ""
-"Αυτό θα αναμείξει το URL2 μέσα στο URL1, Το URL2 αναμένεται ως έξοδο διαφορών "
-"και το URL1 ως αρχείο ή φάκελο στον οποίο θα αναμειχθεί η έξοδος διαφορών. "
-
-#: main.cpp:42
-msgid ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
-msgstr ""
-"Απενεργοποιεί τον έλεγχο αυτόματης εύρεσης του αρχικού αρχείου(ων) κατά τη "
-"χρήση του '-' ως URL με την επιλογή -o."
-
-#: 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 ""
-"Χρησιμοποιήστε αυτό για να ορίσετε την κωδικοποίηση κατά την κλήση του από τη "
-"γραμμή εντολών. Προκαθορισμένα ορίζεται όπως την τοπική κωδικοποίηση αν δεν "
-"οριστεί."
-
-#: 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 και Otto Bruggeman "
-
-#: main.cpp:55 main.cpp:56
-msgid "Author"
-msgstr "Συγγραφέας"
-
-#: main.cpp:57
-msgid "Kompare icon artist"
-msgstr "Καλλιτέχνης εικονιδίων Kompare"
-
-#: main.cpp:58
-msgid "A lot of good advice"
-msgstr "Πολλές καλές συμβουλές"
-
-#: main.cpp:59
-msgid "Cervisia diff viewer"
-msgstr "Προβολέας diff του Cervisia"
-
-#: kompare_shell.cpp:398 main.cpp:185
-msgid "Compare Files or Folders"
-msgstr "Σύγκριση αρχείων ή φακέλων"
-
-#: kompare_shell.cpp:399 main.cpp:186
-msgid "Source"
-msgstr "Πηγή"
-
-#: kompare_shell.cpp:400 main.cpp:187
-msgid "Destination"
-msgstr "Προορισμός"
-
-#: kompare_shell.cpp:402 main.cpp:189
-msgid "Compare"
-msgstr "Σύγκριση"
-
-#: main.cpp:189
-msgid "Compare these files or folder"
-msgstr "Σύγκριση αυτών των αρχείων ή φακέλων"
-
-#: 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 ""
-"Αν έχετε δώσει 2 ονόματα αρχείων ή 2 φακέλους στα πεδία αυτού του διαλόγου, "
-"τότε αυτό το κουμπί θα ενεργοποιηθεί και πατώντας το θα ξεκινήσει η σύγκριση "
-"αυτών των αρχείων ή φακέλων. "
-
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Στέργιος Δράμης,Ανδρέας Βλάχος,Τούσης Μανώλης"
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -455,22 +132,49 @@ msgstr "Ανάμειξη αυτού του αρχείου ή φακέλου με
#: 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 ""
"Αν εισάγατε ένα αρχείο ή όνομα φακέλου και ένα αρχείο που περιέχει έξοδο "
-"διαφορών στα πεδία σε αυτόν το διάλογο τότε αυτό το κουμπί θα ενεργοποιηθεί και "
-"πατώντας το θα ανοίξει η κύρια προβολή του kompare όπου η έξοδος των αρχείων "
-"που έγινε εισαγωγή από τον φάκελο έχει αναμειχθεί με την έξοδο διαφορών έτσι "
-"ώστε να μπορείτε έπειτα να εφαρμόσετε τις διαφορές σε κάποιο αρχείο ή αρχεία. "
+"διαφορών στα πεδία σε αυτόν το διάλογο τότε αυτό το κουμπί θα ενεργοποιηθεί "
+"και πατώντας το θα ανοίξει η κύρια προβολή του kompare όπου η έξοδος των "
+"αρχείων που έγινε εισαγωγή από τον φάκελο έχει αναμειχθεί με την έξοδο "
+"διαφορών έτσι ώστε να μπορείτε έπειτα να εφαρμόσετε τις διαφορές σε κάποιο "
+"αρχείο ή αρχεία. "
+
+#: kompare_shell.cpp:398 main.cpp:185
+msgid "Compare Files or Folders"
+msgstr "Σύγκριση αρχείων ή φακέλων"
+
+#: kompare_shell.cpp:399 main.cpp:186
+msgid "Source"
+msgstr "Πηγή"
+
+#: kompare_shell.cpp:400 main.cpp:187
+msgid "Destination"
+msgstr "Προορισμός"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
+msgstr "Σύγκριση"
#: kompare_shell.cpp:402
msgid "Compare these files or folders"
msgstr "Σύγκριση αυτών των αρχείων ή φακέλων"
+#: 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 ""
+"Αν έχετε δώσει 2 ονόματα αρχείων ή 2 φακέλους στα πεδία αυτού του διαλόγου, "
+"τότε αυτό το κουμπί θα ενεργοποιηθεί και πατώντας το θα ξεκινήσει η σύγκριση "
+"αυτών των αρχείων ή φακέλων. "
+
#: kompare_shell.cpp:439
msgid "Text View"
msgstr "Προβολή κειμένου"
@@ -566,19 +270,231 @@ msgstr "Άγνωστο"
msgid "KompareNavTreePart"
msgstr "KompareNavTreePart"
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
-msgstr "Εδώ μπορείτε να εισάγετε τα αρχεία του θέλετε να συγκρίνετε."
+#: komparepart/kompare_part.cpp:165
+msgid "Save &All"
+msgstr "Αποθήκευση ό&λων"
+
+#: komparepart/kompare_part.cpp:168
+msgid "Save .&diff..."
+msgstr "Αποθήκευση .&diff..."
+
+#: komparepart/kompare_part.cpp:171
+msgid "Swap Source with Destination"
+msgstr "Εναλλαγή πηγής με προορισμό"
+
+#: komparepart/kompare_part.cpp:174
+msgid "Show Statistics"
+msgstr "Εμφάνιση στατιστικών"
+
+#: komparepart/kompare_part.cpp:269
+msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+msgstr "<qt>Το URL %1 είναι αδύνατο να ανακτηθεί.</qt>"
+
+#: komparepart/kompare_part.cpp:281
+msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+msgstr "<qt>Το URL %1 δεν υπάρχει στο σύστημά σας.</qt>"
+
+#: komparepart/kompare_part.cpp:425
+msgid "Diff Options"
+msgstr "Επιλογές diff"
+
+#: komparepart/kompare_part.cpp:443
+msgid "*.diff *.dif *.patch|Patch Files"
+msgstr "*.diff *.dif *.patch|Αρχεία patch"
+
+#: komparepart/kompare_part.cpp:443
+msgid "Save .diff"
+msgstr "Αποθήκευση .diff"
+
+#: komparepart/kompare_part.cpp:446
+msgid "The file exists or is write-protected; do you want to overwrite it?"
+msgstr ""
+"Το αρχείο υπάρχει ή έχει προστασία εγγραφής. Θέλετε να το αντικαταστήσετε;"
+
+#: komparepart/kompare_part.cpp:446
+msgid "File Exists"
+msgstr "Το αρχείο υπάρχει"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Overwrite"
+msgstr "Αντικατάσταση"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Do Not Overwrite"
+msgstr "Να μη γίνει αντικατάσταση"
+
+#: komparepart/kompare_part.cpp:481
+msgid "KomparePart"
+msgstr "KomparePart"
+
+#: komparepart/kompare_part.cpp:493
+msgid "Running diff..."
+msgstr "Εκτέλεση diff..."
+
+#: komparepart/kompare_part.cpp:496
+msgid "Parsing diff output..."
+msgstr "Ανάλυση εξόδου diff..."
+
+#: komparepart/kompare_part.cpp:545
+msgid "Comparing file %1 with file %2"
+msgstr "Σύγκριση αρχείου %1 με αρχείο %2"
+
+#: komparepart/kompare_part.cpp:550
+msgid "Comparing files in %1 with files in %2"
+msgstr "Σύγκριση αρχείων στο %1 με τα αρχεία στο %2"
+
+#: komparepart/kompare_part.cpp:555
+#, c-format
+msgid "Viewing diff output from %1"
+msgstr "Εμφάνιση εξόδου diff από %1"
+
+#: komparepart/kompare_part.cpp:558
+msgid "Blending diff output from %1 into file %2"
+msgstr "Ανάμειξη εξόδου diff από %1 στο αρχείο %2"
+
+#: komparepart/kompare_part.cpp:563
+msgid "Blending diff output from %1 into folder %2"
+msgstr "Ανάμειξη εξόδου diff από %1 στο φάκελο %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 ""
+"Κάνατε αλλαγές στο αρχείο(α) προορισμού.\n"
+"Θέλετε να τις αποθηκεύσετε;"
+
+#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+msgid "Save Changes?"
+msgstr "Αποθήκευση αλλαγών;"
+
+#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276
+#: libdialogpages/diffpage.cpp:244
+#, no-c-format
+msgid "Unified"
+msgstr "Ενοποιημένο"
+
+#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244
+#: libdialogpages/diffpage.cpp:238
+#, no-c-format
+msgid "Context"
+msgstr "Σχετικό"
+
+#: 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 "Κανονικό"
+
+#: komparepart/kompare_part.cpp:667
+msgid ""
+"No diff file, or no 2 files have been diffed. Therefore no stats are "
+"available."
+msgstr ""
+"Δεν υπάρχει αρχείο diff ή δεν έχει γίνει diff 2 αρχείων. Έτσι δεν υπάρχουν "
+"διαθέσιμα στατιστικά."
+
+#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
+#: komparepart/kompare_part.cpp:698
+msgid "Diff Statistics"
+msgstr "Στατιστικά diff"
+
+#: 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 ""
+"Στατιστικά:\n"
+"\n"
+"Παλιό αρχείο: %1\n"
+"Νέο αρχείο: %2\n"
+"\n"
+"Μορφή: %3\n"
+"Αριθμός hunks: %4\n"
+"Αριθμός διαφορών: %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 ""
+"Στατιστικά:\n"
+"\n"
+"Αριθμός αρχείων στο αρχείο diff: %1\n"
+"Μορφή: %2\n"
+"\n"
+"Τρέχον παλιό αρχείο: %3\n"
+"Τρέχον νέο αρχείο: %4\n"
+"\n"
+"Αριθμός hunks: %5\n"
+"Αριθμός διαφορών: %6"
+
+#: komparepart/kompareprefdlg.cpp:33
+msgid "Preferences"
+msgstr "Προτιμήσεις"
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View"
+msgstr "Προβολή κειμένου"
+
+#: komparepart/kompareprefdlg.cpp:39
+msgid "View Settings"
+msgstr "Ρυθμίσεις προβολής"
#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
msgid "Diff"
msgstr "Diff"
+#: komparepart/kompareprefdlg.cpp:43
+msgid "Diff Settings"
+msgstr "Ρυθμίσεις diff"
+
+#: kompareurldialog.cpp:41
+#, fuzzy
+msgid "Files"
+msgstr "&Αρχεία"
+
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr "Εδώ μπορείτε να εισάγετε τα αρχεία του θέλετε να συγκρίνετε."
+
#: kompareurldialog.cpp:47
msgid "Here you can change the options for comparing the files."
msgstr "Εδώ μπορείτε να αλλάξετε τις επιλογές για τη σύγκριση των αρχείων."
#: kompareurldialog.cpp:53
+#, fuzzy
+msgid "Appearance"
+msgstr "Εμ&φάνιση"
+
+#: kompareurldialog.cpp:53
msgid "Here you can change the options for the view."
msgstr "Εδώ μπορείτε να αλλάξετε τις επιλογές της προβολής."
@@ -592,9 +508,9 @@ msgid ""
"program does not support all the options that the GNU version does. This way "
"you can select that version."
msgstr ""
-"Μπορείτε να επιλέξετε εδώ ένα διαφορετικό πρόγραμμα diff. Στο Solaris ή τυπική "
-"έκδοση diff δεν υποστηρίζει όλες τις επιλογές που υποστηρίζει η έκδοση GNU. Με "
-"αυτήν τη λειτουργία μπορείτε να επιλέξετε αυτή την έκδοση."
+"Μπορείτε να επιλέξετε εδώ ένα διαφορετικό πρόγραμμα diff. Στο Solaris ή "
+"τυπική έκδοση diff δεν υποστηρίζει όλες τις επιλογές που υποστηρίζει η "
+"έκδοση GNU. Με αυτήν τη λειτουργία μπορείτε να επιλέξετε αυτή την έκδοση."
#: libdialogpages/diffpage.cpp:221
msgid "&Diff"
@@ -606,19 +522,24 @@ msgstr "Μορφή εξόδου"
#: 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 ""
"Επιλέξτε τη μορφή της εξόδου του diff. Η ενοποιημένη είναι αυτή που "
-"χρησιμοποιείται πιο συχνά επειδή είναι πολύ ευανάγνωστη. Οι προγραμματιστές TDE "
-"προτιμούν αυτήν τη μορφή, οπότε χρησιμοποιήστε την για την αποστολή "
+"χρησιμοποιείται πιο συχνά επειδή είναι πολύ ευανάγνωστη. Οι προγραμματιστές "
+"TDE προτιμούν αυτήν τη μορφή, οπότε χρησιμοποιήστε την για την αποστολή "
"επιδιορθώσεων."
#: libdialogpages/diffpage.cpp:247
msgid "Lines of Context"
msgstr "Σχετιζόμενες γραμμές"
+#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251
+#, no-c-format
+msgid "Number of context lines:"
+msgstr "Αριθμός σχετιζόμενων γραμμών:"
+
#: libdialogpages/diffpage.cpp:253
msgid ""
"The number of context lines is normally 2 or 3. This makes the diff readable "
@@ -743,19 +664,19 @@ msgstr "Μοτίβο αρχείου για εξαίρεση"
#: 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 ""
"Αν αυτό ενεργοποιηθεί μπορείτε να εισάγετε ένα μοτίβο κελύφους στο πλαίσιο "
"κειμένου στα δεξιά ή να επιλέξετε καταχωρήσεις από τη λίστα."
#: 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 ""
-"Εδώ μπορείτε να εισάγετε ή να αφαιρέσετε ένα μοτίβο κελύφους ή να επιλέξετε ένα "
-"ή περισσότερες καταχωρήσεις από τη λίστα."
+"Εδώ μπορείτε να εισάγετε ή να αφαιρέσετε ένα μοτίβο κελύφους ή να επιλέξετε "
+"ένα ή περισσότερες καταχωρήσεις από τη λίστα."
#: libdialogpages/diffpage.cpp:338
msgid "File with Filenames to Exclude"
@@ -770,19 +691,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 ""
-"Εδώ μπορείτε να εισάγετε μια URL ενός αρχείου με μοτίβα κελύφους για παράβλεψη "
-"κατά τη σύγκριση των φακέλων."
+"Εδώ μπορείτε να εισάγετε μια URL ενός αρχείου με μοτίβα κελύφους για "
+"παράβλεψη κατά τη σύγκριση των φακέλων."
#: 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 ""
-"Κάθε αρχείο που επιλέγετε στο διάλογο που εμφανίζεται όταν κάνετε κλικ σε αυτό "
-"θα τοποθετηθεί στο διάλογο στα αριστερά αυτού του κουμπιού."
+"Κάθε αρχείο που επιλέγετε στο διάλογο που εμφανίζεται όταν κάνετε κλικ σε "
+"αυτό θα τοποθετηθεί στο διάλογο στα αριστερά αυτού του κουμπιού."
#: libdialogpages/diffpage.cpp:352
msgid "&Exclude"
@@ -848,168 +769,278 @@ msgstr "Γραμματοσειρά:"
msgid "Size:"
msgstr "Μέγεθος:"
-#: komparepart/kompareprefdlg.cpp:33
-msgid "Preferences"
-msgstr "Προτιμήσεις"
-
-#: komparepart/kompareprefdlg.cpp:39
-msgid "View Settings"
-msgstr "Ρυθμίσεις προβολής"
-
-#: komparepart/kompareprefdlg.cpp:43
-msgid "Diff Settings"
-msgstr "Ρυθμίσεις diff"
-
-#: komparepart/kompare_part.cpp:165
-msgid "Save &All"
-msgstr "Αποθήκευση ό&λων"
+#: libdialogpages/viewpage.cpp:119
+#, fuzzy
+msgid "&Fonts"
+msgstr "Γραμματοσειρά:"
-#: komparepart/kompare_part.cpp:168
-msgid "Save .&diff..."
-msgstr "Αποθήκευση .&diff..."
+#: libdiff2/komparemodellist.cpp:61
+msgid "&Apply Difference"
+msgstr "&Εφαρμογή διαφοράς"
-#: komparepart/kompare_part.cpp:171
-msgid "Swap Source with Destination"
-msgstr "Εναλλαγή πηγής με προορισμό"
+#: libdiff2/komparemodellist.cpp:64
+msgid "Un&apply Difference"
+msgstr "Αν&αίρεση εφαρμογής διαφοράς"
-#: komparepart/kompare_part.cpp:174
-msgid "Show Statistics"
-msgstr "Εμφάνιση στατιστικών"
+#: libdiff2/komparemodellist.cpp:67
+msgid "App&ly All"
+msgstr "Ε&φαρμογή όλων"
-#: komparepart/kompare_part.cpp:269
-msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
-msgstr "<qt>Το URL %1 είναι αδύνατο να ανακτηθεί.</qt>"
+#: libdiff2/komparemodellist.cpp:70
+msgid "&Unapply All"
+msgstr "Α&ναίρεση εφαρμογής όλων"
-#: komparepart/kompare_part.cpp:281
-msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
-msgstr "<qt>Το URL %1 δεν υπάρχει στο σύστημά σας.</qt>"
+#: libdiff2/komparemodellist.cpp:73
+msgid "P&revious File"
+msgstr "Π&ροηγούμενο αρχείο"
-#: komparepart/kompare_part.cpp:425
-msgid "Diff Options"
-msgstr "Επιλογές diff"
+#: libdiff2/komparemodellist.cpp:76
+msgid "N&ext File"
+msgstr "Ε&πόμενο αρχείο"
-#: komparepart/kompare_part.cpp:443
-msgid "*.diff *.dif *.patch|Patch Files"
-msgstr "*.diff *.dif *.patch|Αρχεία patch"
+#: libdiff2/komparemodellist.cpp:79
+msgid "&Previous Difference"
+msgstr "Πρ&οηγούμενη διαφορά"
-#: komparepart/kompare_part.cpp:443
-msgid "Save .diff"
-msgstr "Αποθήκευση .diff"
+#: libdiff2/komparemodellist.cpp:82
+msgid "&Next Difference"
+msgstr "Επό&μενη διαφορά"
-#: komparepart/kompare_part.cpp:446
-msgid "The file exists or is write-protected; do you want to overwrite it?"
+#: 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 ""
-"Το αρχείο υπάρχει ή έχει προστασία εγγραφής. Θέλετε να το αντικαταστήσετε;"
-
-#: komparepart/kompare_part.cpp:446
-msgid "File Exists"
-msgstr "Το αρχείο υπάρχει"
-
-#: komparepart/kompare_part.cpp:446
-msgid "Overwrite"
-msgstr "Αντικατάσταση"
+"<qt>Χωρίς μοντέλα ή χωρίς διαφορές, το αρχείο: <b>%1</b>, δεν είναι ένα "
+"έγκυρο αρχείο διαφορών.</qt>"
-#: komparepart/kompare_part.cpp:446
-msgid "Do Not Overwrite"
-msgstr "Να μη γίνει αντικατάσταση"
+#: libdiff2/komparemodellist.cpp:246
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
+"qt>"
+msgstr ""
+"<qt>Υπήρξαν προβλήματα εφαρμογής του diff <b>%1</b> στο αρχείο <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>Υπήρξαν προβλήματα εφαρμογής του diff <b>%1</b> στο φάκελο <b>%2</b>.</"
+"qt>"
-#: komparepart/kompare_part.cpp:493
-msgid "Running diff..."
-msgstr "Εκτέλεση diff..."
+#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
+msgid "Could not open a temporary file."
+msgstr "Αδύνατο το άνοιγμα ενός προσωρινού αρχείου."
-#: komparepart/kompare_part.cpp:496
-msgid "Parsing diff output..."
-msgstr "Ανάλυση εξόδου diff..."
+#: libdiff2/komparemodellist.cpp:350
+msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+msgstr ""
+"<qt>Αδύνατη η εγγραφή στο προσωρινό αρχείο <b>%1</b>, το διαγράφω.</qt>"
-#: komparepart/kompare_part.cpp:545
-msgid "Comparing file %1 with file %2"
-msgstr "Σύγκριση αρχείου %1 με αρχείο %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>Αδύνατη η δημιουργία του καταλόγου προορισμού <b>%1</b>.\n"
+"Το αρχείο δεν αποθηκεύτηκε.</qt>"
-#: komparepart/kompare_part.cpp:550
-msgid "Comparing files in %1 with files in %2"
-msgstr "Σύγκριση αρχείων στο %1 με τα αρχεία στο %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>Αδυναμία αποστολής του προσωρινού αρχείου στην τοποθεσία προορισμού <b>"
+"%1</b>. Το προσωρινό αρχείο είναι ακόμη διαθέσιμο κάτω από το: <b>%2</b>. "
+"Μπορείτε να το αντιγράψετε χειροκίνητα στη σωστή θέση.</qt>"
-#: komparepart/kompare_part.cpp:555
-#, c-format
-msgid "Viewing diff output from %1"
-msgstr "Εμφάνιση εξόδου diff από %1"
+#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
+msgid "Could not parse diff output."
+msgstr "Δεν ήταν δυνατή η επεξεργασία της εξόδου του diff."
-#: komparepart/kompare_part.cpp:558
-msgid "Blending diff output from %1 into file %2"
-msgstr "Ανάμειξη εξόδου diff από %1 στο αρχείο %2"
+#: libdiff2/komparemodellist.cpp:451
+msgid "The files are identical."
+msgstr "Τα αρχεία είναι όμοια."
-#: komparepart/kompare_part.cpp:563
-msgid "Blending diff output from %1 into folder %2"
-msgstr "Ανάμειξη εξόδου diff από %1 στο φάκελο %2"
+#: libdiff2/komparemodellist.cpp:613
+msgid "Could not write to the temporary file."
+msgstr "Αδύνατο η εγγραφή στο προσωρινό αρχείο."
-#: 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 ""
-"Κάνατε αλλαγές στο αρχείο(α) προορισμού.\n"
-"Θέλετε να τις αποθηκεύσετε;"
+"Ένα πρόγραμμα για την προβολή των διαφορών μεταξύ αρχείων και προαιρετικά τη "
+"δημιουργία diff (αρχείου διαφορών)"
-#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
-msgid "Save Changes?"
-msgstr "Αποθήκευση αλλαγών;"
+#: main.cpp:39
+msgid "This will compare URL1 with URL2"
+msgstr "Αυτό θα συγκρίνει το URL1 με το 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 ""
-"Δεν υπάρχει αρχείο diff ή δεν έχει γίνει diff 2 αρχείων. Έτσι δεν υπάρχουν "
-"διαθέσιμα στατιστικά."
+"Αυτό θα ανοίξει το URL1 και θα αναμένει την έξοδο διαφορών. Το URL1 μπορεί "
+"επίσης να είναι ένα '-' που σημαίνει ότι θα διαβάσει από την κανονική "
+"είσοδο. Μπορεί να χρησιμοποιηθεί για παράδειγμα ως diff cvs | kompare -o -. "
+"Το Kompare θα κάνει έναν έλεγχο αν μπορεί να εντοπίσει τα αρχικά αρχεία και "
+"έπειτα θα αναμείξει τα αρχικά αρχεία με την έξοδο διαφορών και θα την "
+"εμφανίσει στην προβολή. Το -n απενεργοποιεί αυτόν τον έλεγχο."
-#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
-#: komparepart/kompare_part.cpp:698
-msgid "Diff Statistics"
-msgstr "Στατιστικά diff"
+#: 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 ""
+"Αυτό θα αναμείξει το URL2 μέσα στο URL1, Το URL2 αναμένεται ως έξοδο "
+"διαφορών και το URL1 ως αρχείο ή φάκελο στον οποίο θα αναμειχθεί η έξοδος "
+"διαφορών. "
-#: 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 ""
-"Στατιστικά:\n"
-"\n"
-"Παλιό αρχείο: %1\n"
-"Νέο αρχείο: %2\n"
-"\n"
-"Μορφή: %3\n"
-"Αριθμός hunks: %4\n"
-"Αριθμός διαφορών: %5"
+"Απενεργοποιεί τον έλεγχο αυτόματης εύρεσης του αρχικού αρχείου(ων) κατά τη "
+"χρήση του '-' ως URL με την επιλογή -o."
-#: 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 ""
+"Χρησιμοποιήστε αυτό για να ορίσετε την κωδικοποίηση κατά την κλήση του από "
+"τη γραμμή εντολών. Προκαθορισμένα ορίζεται όπως την τοπική κωδικοποίηση αν "
+"δεν οριστεί."
+
+#: 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 και Otto Bruggeman "
+
+#: main.cpp:55 main.cpp:56
+msgid "Author"
+msgstr "Συγγραφέας"
+
+#: main.cpp:57
+msgid "Kompare icon artist"
+msgstr "Καλλιτέχνης εικονιδίων Kompare"
+
+#: main.cpp:58
+msgid "A lot of good advice"
+msgstr "Πολλές καλές συμβουλές"
+
+#: main.cpp:59
+msgid "Cervisia diff viewer"
+msgstr "Προβολέας diff του Cervisia"
+
+#: main.cpp:189
+msgid "Compare these files or folder"
+msgstr "Σύγκριση αυτών των αρχείων ή φακέλων"
+
+#: komparepart/komparepartui.rc:4 kompareui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Αρχεία"
+
+#: komparepart/komparepartui.rc:13
+#, no-c-format
+msgid "&Difference"
+msgstr "&Διαφορά"
+
+#: komparepart/komparepartui.rc:25 kompareui.rc:14
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Ρυθμίσεις προβολής"
+
+#: komparepart/komparesaveoptionsbase.ui:41
+#, no-c-format
+msgid "Run Diff In"
+msgstr "Εκτέλεση diff στο"
+
+#: komparepart/komparesaveoptionsbase.ui:84
+#, no-c-format
+msgid "Command Line"
+msgstr "Γραμμή εντολών"
+
+#: komparepart/komparesaveoptionsbase.ui:108
+#, no-c-format
+msgid "cd dir && diff -udHprNa -- source destination"
+msgstr "cd dir && diff -udHprNa -- πηγή προορισμός"
+
+#: komparepart/komparesaveoptionsbase.ui:118
+#, fuzzy, no-c-format
+msgid "Options"
+msgstr "&Επιλογές"
+
+#: komparepart/komparesaveoptionsbase.ui:135
+#, no-c-format
+msgid "Look for smaller changes"
+msgstr "Έλεγχος για μικρότερες διαφορές"
+
+#: komparepart/komparesaveoptionsbase.ui:146
+#, no-c-format
+msgid "Optimize for large files"
+msgstr "Βελτιστοποίηση για μεγάλα αρχεία"
+
+#: komparepart/komparesaveoptionsbase.ui:157
+#, no-c-format
+msgid "Ignore changes in case"
+msgstr "Παράβλεψη αλλαγών μεταξύ πεζών και κεφαλαίων"
+
+#: komparepart/komparesaveoptionsbase.ui:165
+#, no-c-format
+msgid "Expand tabs to spaces"
+msgstr "Μετατροπή των στηλοθετών σε κενά"
+
+#: komparepart/komparesaveoptionsbase.ui:173
+#, no-c-format
+msgid "Ignore added or removed empty lines"
+msgstr "Παράβλεψη πρόσθετων ή αφαιρούμενων κενών γραμμών"
+
+#: komparepart/komparesaveoptionsbase.ui:181
+#, no-c-format
+msgid "Ignore changes in whitespace"
+msgstr "Παράβλεψη αλλαγών στα κενά"
+
+#: komparepart/komparesaveoptionsbase.ui:189
+#, no-c-format
+msgid "Show function names"
+msgstr "Εμφάνιση των ονομάτων των συναρτήσεων"
+
+#: komparepart/komparesaveoptionsbase.ui:200
+#, no-c-format
+msgid "Compare folders recursively"
+msgstr "Σύγκριση φακέλων αναδρομικά"
+
+#: komparepart/komparesaveoptionsbase.ui:211
+#, no-c-format
+msgid "Treat new files as empty"
+msgstr "Θεώρηση των καινούριων αρχείων ως κενά"
+
+#: komparepart/komparesaveoptionsbase.ui:227
+#, no-c-format
+msgid "Format"
+msgstr "Μορφή"
+
+#: komparepart/komparesaveoptionsbase.ui:287
+#, no-c-format
+msgid "Side-by-side"
+msgstr "Δίπλα-δίπλα"
+
+#: kompareui.rc:27
+#, no-c-format
+msgid "Main Toolbar"
msgstr ""
-"Στατιστικά:\n"
-"\n"
-"Αριθμός αρχείων στο αρχείο diff: %1\n"
-"Μορφή: %2\n"
-"\n"
-"Τρέχον παλιό αρχείο: %3\n"
-"Τρέχον νέο αρχείο: %4\n"
-"\n"
-"Αριθμός hunks: %5\n"
-"Αριθμός διαφορών: %6"
diff --git a/tde-i18n-en_GB/messages/tdesdk/kompare.po b/tde-i18n-en_GB/messages/tdesdk/kompare.po
index ca75936eb7..0ef1a68786 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"
diff --git a/tde-i18n-es/messages/tdesdk/kompare.po b/tde-i18n-es/messages/tdesdk/kompare.po
index 2e2691b1f0..644f64fae3 100644
--- a/tde-i18n-es/messages/tdesdk/kompare.po
+++ b/tde-i18n-es/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: 2007-08-16 16:26+0200\n"
"Last-Translator: Eloy Cuadra <ecuadra@eloihr.net>\n"
"Language-Team: Spanish <kde-es@kybs.de>\n"
@@ -17,336 +17,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: libdiff2/komparemodellist.cpp:61
-msgid "&Apply Difference"
-msgstr "&Aplicar la diferencia"
-
-#: libdiff2/komparemodellist.cpp:64
-msgid "Un&apply Difference"
-msgstr "Desh&acer diferencia"
-
-#: libdiff2/komparemodellist.cpp:67
-msgid "App&ly All"
-msgstr "Ap&licar todo"
-
-#: libdiff2/komparemodellist.cpp:70
-msgid "&Unapply All"
-msgstr "&Ignorar todo"
-
-#: libdiff2/komparemodellist.cpp:73
-msgid "P&revious File"
-msgstr "A&rchivo anterior"
-
-#: libdiff2/komparemodellist.cpp:76
-msgid "N&ext File"
-msgstr "Sigui&ente archivo"
-
-#: libdiff2/komparemodellist.cpp:79
-msgid "&Previous Difference"
-msgstr "Anterior di&ferencia"
-
-#: libdiff2/komparemodellist.cpp:82
-msgid "&Next Difference"
-msgstr "Siguie&nte diferencia"
-
-#: 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 hay modelos o diferencias, este archivo: <b>%1</b>"
-", no es un archivo diff válido.</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>Se produjeron problemas aplicando el diff <b>%1</b> al archivo <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>Se produjeron problemas aplicando el diff <b>%1</b> a la carpeta<b>%2</b>"
-".</qt>"
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-msgid "Could not open a temporary file."
-msgstr "No se pudo abrir un archivo temporal."
-
-#: libdiff2/komparemodellist.cpp:350
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr ""
-"<qt>Imposible escribir en el archivo temporal <b>%1</b>, borrandolo.</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>Imposible crear carpeta de destino<b>%1</b>.\n"
-"El archivo no ha sido guardado.</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>Imposible cargar el archivo temporal a la ubicación de destino. <b>%1</b>"
-". El archivo temporal está todavía disponible en: <b>%2</b>"
-". Puede copiarlo manualmente al lugar correcto.</qt>"
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-msgid "Could not parse diff output."
-msgstr "No pude analizar la salida de diff"
-
-#: libdiff2/komparemodellist.cpp:451
-msgid "The files are identical."
-msgstr "Los archivos son idénticos"
-
-#: libdiff2/komparemodellist.cpp:613
-msgid "Could not write to the temporary file."
-msgstr "No se pudo escribir al archivo temporal."
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, no-c-format
-msgid "&Difference"
-msgstr "&Diferencia"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, no-c-format
-msgid "Run Diff In"
-msgstr "Ejecutar «diff» en"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, no-c-format
-msgid "Command Line"
-msgstr "Línea de órdenes"
-
-#. 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 -- origen destino"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, no-c-format
-msgid "Look for smaller changes"
-msgstr "Buscar cambios menores"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, no-c-format
-msgid "Optimize for large files"
-msgstr "Optimizar para archivos grandes"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, no-c-format
-msgid "Ignore changes in case"
-msgstr "Ignorar cambios de mayúsculas"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, no-c-format
-msgid "Expand tabs to spaces"
-msgstr "Expandir tabuladores a espacios"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
-#: rc.cpp:45
-#, no-c-format
-msgid "Ignore added or removed empty lines"
-msgstr "Ignorar lineas vacías añadidas o eliminadas"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr "Ignorar cambios en espacios en blanco"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, no-c-format
-msgid "Show function names"
-msgstr "Mostrar nombres de las funciones"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, no-c-format
-msgid "Compare folders recursively"
-msgstr "Comparar carpetas recursivamente"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
-#: rc.cpp:57
-#, no-c-format
-msgid "Treat new files as empty"
-msgstr "Tratar archivos nuevos como vacíos"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
-#: rc.cpp:60
-#, no-c-format
-msgid "Format"
-msgstr "Formato"
-
-#. 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 "Contexto"
-
-#. 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 "Unificado"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
-#: rc.cpp:78
-#, no-c-format
-msgid "Side-by-side"
-msgstr "Cara-por-cara"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
-#: libdialogpages/diffpage.cpp:251 rc.cpp:81
-#, no-c-format
-msgid "Number of context lines:"
-msgstr "Número de líneas de contexto"
-
-#: main.cpp:33
-msgid ""
-"A program to view the differences between files and optionally generate a diff"
-msgstr ""
-"Un programa para ver las diferencias entre archivos y opcionalmente generar un "
-"diff"
-
-#: main.cpp:39
-msgid "This will compare URL1 with URL2"
-msgstr "Esto realizará una comparación entre la URL1 y la 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 ""
-"Esto abrirá la URL1 y esperará ser la salida de diff. URL1 también puede ser un "
-"«-» y entonces leerá de la entrada estandar. Puede ser usado para órdenes cvs "
-"diff | kompare -o-. Kompare comprobará si puede encontrar el archivo(s) "
-"original(es) y entonces fusionar el/los archivo(s) original(es) en la salida de "
-"diff y mostrarlos en el visor. -n desactiva la comprobación."
-
-#: 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 ""
-"Esto fusionará URL2 con URL1, URL2 deberá ser una salida diff y URL1 el archivo "
-"o carpeta en la cual será fusionada la salida diff"
-
-#: main.cpp:42
-msgid ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
-msgstr ""
-"Desactiva la comprobación para buscar automáticamente el/los archivo(s) "
-"original(es) cuando se use «-» como URL con la opción -o"
-
-#: 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 esto para especificar la codificación cuando lo llame desde la línea de "
-"órdenes. Por omisión utilizará la codificación local."
-
-#: main.cpp:52
-msgid "Kompare"
-msgstr "Kompare"
-
-#: main.cpp:54
-msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
-msgstr "(c) 2001-2003, John Firebaugh y Otto Bruggeman"
-
-#: main.cpp:55 main.cpp:56
-msgid "Author"
-msgstr "Autor"
-
-#: main.cpp:57
-msgid "Kompare icon artist"
-msgstr "Arte de íconos Kompare"
-
-#: main.cpp:58
-msgid "A lot of good advice"
-msgstr "Un montón de buenos consejos"
-
-#: main.cpp:59
-msgid "Cervisia diff viewer"
-msgstr "Visor diff de Cervisia"
-
-#: kompare_shell.cpp:398 main.cpp:185
-msgid "Compare Files or Folders"
-msgstr "Comparar archivos o carpetas"
-
-#: kompare_shell.cpp:399 main.cpp:186
-msgid "Source"
-msgstr "Origen"
-
-#: kompare_shell.cpp:400 main.cpp:187
-msgid "Destination"
-msgstr "Destino"
-
-#: kompare_shell.cpp:402 main.cpp:189
-msgid "Compare"
-msgstr "Comparar"
-
-#: main.cpp:189
-msgid "Compare these files or folder"
-msgstr "Comparar estos archivos o carpetas"
-
-#: 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 ""
-"Si ha introducido 2 nombres de archivos o 2 carpetas en los campos de este "
-"diálogo, se habilitará este botón. Si lo pulsa, comenzará a realizarse una "
-"comparación entre los archivos o carpetas introducidos."
-
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Pablo de Vicente"
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -452,22 +129,49 @@ msgstr "Fusionar este archivo o carpeta con la salida diff"
#: 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 ""
-"Si ha introducido un nombre de archivo o carpeta y un archivo que contenga una "
-"salida diff en los campos de este diálogo, entonces se activará este botón y "
-"presionándolo se abrirá la vista principal de kompare en donde la salida del "
-"archivo o archivos introducidos desde la carpeta serán mezclados con la salida "
-"diff, así podrá aplica la(s) diferencia(s) a un archivo o a los archivos."
+"Si ha introducido un nombre de archivo o carpeta y un archivo que contenga "
+"una salida diff en los campos de este diálogo, entonces se activará este "
+"botón y presionándolo se abrirá la vista principal de kompare en donde la "
+"salida del archivo o archivos introducidos desde la carpeta serán mezclados "
+"con la salida diff, así podrá aplica la(s) diferencia(s) a un archivo o a "
+"los archivos."
+
+#: kompare_shell.cpp:398 main.cpp:185
+msgid "Compare Files or Folders"
+msgstr "Comparar archivos o carpetas"
+
+#: kompare_shell.cpp:399 main.cpp:186
+msgid "Source"
+msgstr "Origen"
+
+#: kompare_shell.cpp:400 main.cpp:187
+msgid "Destination"
+msgstr "Destino"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
+msgstr "Comparar"
#: kompare_shell.cpp:402
msgid "Compare these files or folders"
msgstr "Comparar estos archivos o carpetas"
+#: 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 ""
+"Si ha introducido 2 nombres de archivos o 2 carpetas en los campos de este "
+"diálogo, se habilitará este botón. Si lo pulsa, comenzará a realizarse una "
+"comparación entre los archivos o carpetas introducidos."
+
#: kompare_shell.cpp:439
msgid "Text View"
msgstr "Vista de texto"
@@ -563,19 +267,232 @@ msgstr "Desconocido"
msgid "KompareNavTreePart"
msgstr "KompareNavTreePart"
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
-msgstr "Aquí usted puede ingresar los archivos que desea comparar"
+#: komparepart/kompare_part.cpp:165
+msgid "Save &All"
+msgstr "Guardar &Todo"
+
+#: komparepart/kompare_part.cpp:168
+msgid "Save .&diff..."
+msgstr "Guardar .&diff"
+
+#: komparepart/kompare_part.cpp:171
+msgid "Swap Source with Destination"
+msgstr "Intercambiar origen y destino"
+
+#: komparepart/kompare_part.cpp:174
+msgid "Show Statistics"
+msgstr "Mostrar estadísticas"
+
+#: komparepart/kompare_part.cpp:269
+msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+msgstr "<qt>La URL <b>%1</b> no se pudo descargar.</qt>"
+
+#: komparepart/kompare_part.cpp:281
+msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+msgstr "<qt>La URL <b>%1</b> no existe en su sistema.</qt>"
+
+#: komparepart/kompare_part.cpp:425
+msgid "Diff Options"
+msgstr "Opciones de diff"
+
+#: komparepart/kompare_part.cpp:443
+msgid "*.diff *.dif *.patch|Patch Files"
+msgstr "*.diff *.dif *.patch|Archivos de parche"
+
+#: komparepart/kompare_part.cpp:443
+msgid "Save .diff"
+msgstr "Guardar diff"
+
+#: komparepart/kompare_part.cpp:446
+msgid "The file exists or is write-protected; do you want to overwrite it?"
+msgstr ""
+"El archivo existe o se encuentra protegido contra escritura; desea "
+"sobrescribirlo?"
+
+#: komparepart/kompare_part.cpp:446
+msgid "File Exists"
+msgstr "El archivo ya existe"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Overwrite"
+msgstr "Sobrescribir"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Do Not Overwrite"
+msgstr "No sobrescribir"
+
+#: komparepart/kompare_part.cpp:481
+msgid "KomparePart"
+msgstr "KomparePart"
+
+#: komparepart/kompare_part.cpp:493
+msgid "Running diff..."
+msgstr "Corriendo diff..."
+
+#: komparepart/kompare_part.cpp:496
+msgid "Parsing diff output..."
+msgstr "Analizando salida diff...."
+
+#: komparepart/kompare_part.cpp:545
+msgid "Comparing file %1 with file %2"
+msgstr "Comparando archivo %1 con archivo %2"
+
+#: komparepart/kompare_part.cpp:550
+msgid "Comparing files in %1 with files in %2"
+msgstr "Comparando archivos en %1 con archivos en %2"
+
+#: komparepart/kompare_part.cpp:555
+#, c-format
+msgid "Viewing diff output from %1"
+msgstr "Viendo salida de diff de %1"
+
+#: komparepart/kompare_part.cpp:558
+msgid "Blending diff output from %1 into file %2"
+msgstr "Fusionando salida diff de %1 en el archivo %2"
+
+#: komparepart/kompare_part.cpp:563
+msgid "Blending diff output from %1 into folder %2"
+msgstr "Fusionando salida diff de %1 en la carpeta %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 ""
+"Has hecho cambios a el/los archivo(s) de destino.\n"
+"¿Quiere guardarlo(s)?"
+
+#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+msgid "Save Changes?"
+msgstr "¿Guardar cambios?"
+
+#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276
+#: libdialogpages/diffpage.cpp:244
+#, no-c-format
+msgid "Unified"
+msgstr "Unificado"
+
+#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244
+#: libdialogpages/diffpage.cpp:238
+#, no-c-format
+msgid "Context"
+msgstr "Contexto"
+
+#: 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 ""
+"Lo siento, no hay archivo diff o no se han comparado 2 archivos, así que no "
+"hay estadísticas disponibles"
+
+#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
+#: komparepart/kompare_part.cpp:698
+msgid "Diff Statistics"
+msgstr "Estadísticas de diff"
+
+#: 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 ""
+"Estadísticas:\n"
+"\n"
+"Archivo antiguo : %1\n"
+"Nuevo archivo : %2\n"
+"\n"
+"Formato : %3\n"
+"Número de bloques : %4\n"
+"Número de diferencias : %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 ""
+"Estadísticas:\n"
+"\n"
+"Número de archivos en el archivo diff: %1\n"
+"Formato : %2\n"
+"\n"
+"Archivo antiguo actual: %3\n"
+"Archivo nuevo actual : %4\n"
+"\n"
+"Número de bloques : %5\n"
+"Número de diferencias : %6"
+
+#: komparepart/kompareprefdlg.cpp:33
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View"
+msgstr "Vista de texto"
+
+#: komparepart/kompareprefdlg.cpp:39
+msgid "View Settings"
+msgstr "Preferencias de la vista"
#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
msgid "Diff"
msgstr "Diff"
+#: komparepart/kompareprefdlg.cpp:43
+msgid "Diff Settings"
+msgstr "Preferencias de «diff»"
+
+#: kompareurldialog.cpp:41
+#, fuzzy
+msgid "Files"
+msgstr "&Archivos"
+
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr "Aquí usted puede ingresar los archivos que desea comparar"
+
#: kompareurldialog.cpp:47
msgid "Here you can change the options for comparing the files."
msgstr "Aquí usted puede cambiar las opciones para la comparación de archivos"
#: kompareurldialog.cpp:53
+#, fuzzy
+msgid "Appearance"
+msgstr "&Aparencia"
+
+#: kompareurldialog.cpp:53
msgid "Here you can change the options for the view."
msgstr "Aquí usted puede cambiar las opciones de visualización"
@@ -590,8 +507,8 @@ msgid ""
"you can select that version."
msgstr ""
"Puede aquí seleccionar un programa diff diferente. En Solares el programa "
-"estandar para diff no soporta todas las opciones que la versión GNU posee. De "
-"esta forma puede seleccionar esa versión."
+"estandar para diff no soporta todas las opciones que la versión GNU posee. "
+"De esta forma puede seleccionar esa versión."
#: libdialogpages/diffpage.cpp:221
msgid "&Diff"
@@ -603,19 +520,24 @@ msgstr "Formato de salida"
#: 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 ""
"Seleccione el formato de la salida generada por «diff». Unificada es la "
-"utilizada más frecuentemente debido a que es la de más fácil lectura. Es la de "
-"mayor agrado para los desarrolladores de TDE, por lo que es recomendable "
+"utilizada más frecuentemente debido a que es la de más fácil lectura. Es la "
+"de mayor agrado para los desarrolladores de TDE, por lo que es recomendable "
"utilizarla para enviar parches."
#: libdialogpages/diffpage.cpp:247
msgid "Lines of Context"
msgstr "Líneas de contexto"
+#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251
+#, no-c-format
+msgid "Number of context lines:"
+msgstr "Número de líneas de contexto"
+
#: libdialogpages/diffpage.cpp:253
msgid ""
"The number of context lines is normally 2 or 3. This makes the diff readable "
@@ -623,8 +545,8 @@ msgid ""
"unnecessarily."
msgstr ""
"El número de líneas de contexto es normalmente de 2 o 3. Esto hace al diff "
-"legible y aplicable en la mayoría de los casos. Más de 3 líneas complicará el "
-"diff innecesariamente"
+"legible y aplicable en la mayoría de los casos. Más de 3 líneas complicará "
+"el diff innecesariamente"
#: libdialogpages/diffpage.cpp:259
msgid "&Format"
@@ -740,16 +662,16 @@ msgstr "Patron de archivo a excluir"
#: 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 ""
-"Si está marcada, podrá introducir un patrón de línea de órdenes en el campo de "
-"texto de la derecha, o seleccionar entradas de la lista."
+"Si está marcada, podrá introducir un patrón de línea de órdenes en el campo "
+"de texto de la derecha, o seleccionar entradas de la lista."
#: 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 ""
"Aquí usted puede ingresar o eliminar un patrón para la línea de órdenes o "
"seleccionar uno o más de las entradas que aparecen en la lista"
@@ -762,21 +684,21 @@ msgstr "Archivo con nombres de archivo a excluir"
msgid ""
"If this is checked you can enter a filename in the combo box on the right."
msgstr ""
-"Si ésta se encuentra conmutada usted puede ingresar un nombre de archivo en el "
-"casillero de la derecha"
+"Si ésta se encuentra conmutada usted puede ingresar un nombre de archivo en "
+"el casillero de la derecha"
#: 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 ""
"Aquí usted puede introducir el URL de un archivo con patrones de la línea de "
"órdenes que serán ignorados durante la comparación de carpetas."
#: 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 ""
"Cualquier archivo que seleccione en el diálogo que aparece al pulsar este "
"botón, será colocado a la izquierda del mismo."
@@ -845,169 +767,275 @@ msgstr "Tipo de letra:"
msgid "Size:"
msgstr "Tamaño:"
-#: komparepart/kompareprefdlg.cpp:33
-msgid "Preferences"
-msgstr "Preferencias"
-
-#: komparepart/kompareprefdlg.cpp:39
-msgid "View Settings"
-msgstr "Preferencias de la vista"
-
-#: komparepart/kompareprefdlg.cpp:43
-msgid "Diff Settings"
-msgstr "Preferencias de «diff»"
-
-#: komparepart/kompare_part.cpp:165
-msgid "Save &All"
-msgstr "Guardar &Todo"
+#: libdialogpages/viewpage.cpp:119
+#, fuzzy
+msgid "&Fonts"
+msgstr "Tipo de letra:"
-#: komparepart/kompare_part.cpp:168
-msgid "Save .&diff..."
-msgstr "Guardar .&diff"
+#: libdiff2/komparemodellist.cpp:61
+msgid "&Apply Difference"
+msgstr "&Aplicar la diferencia"
-#: komparepart/kompare_part.cpp:171
-msgid "Swap Source with Destination"
-msgstr "Intercambiar origen y destino"
+#: libdiff2/komparemodellist.cpp:64
+msgid "Un&apply Difference"
+msgstr "Desh&acer diferencia"
-#: komparepart/kompare_part.cpp:174
-msgid "Show Statistics"
-msgstr "Mostrar estadísticas"
+#: libdiff2/komparemodellist.cpp:67
+msgid "App&ly All"
+msgstr "Ap&licar todo"
-#: komparepart/kompare_part.cpp:269
-msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
-msgstr "<qt>La URL <b>%1</b> no se pudo descargar.</qt>"
+#: libdiff2/komparemodellist.cpp:70
+msgid "&Unapply All"
+msgstr "&Ignorar todo"
-#: komparepart/kompare_part.cpp:281
-msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
-msgstr "<qt>La URL <b>%1</b> no existe en su sistema.</qt>"
+#: libdiff2/komparemodellist.cpp:73
+msgid "P&revious File"
+msgstr "A&rchivo anterior"
-#: komparepart/kompare_part.cpp:425
-msgid "Diff Options"
-msgstr "Opciones de diff"
+#: libdiff2/komparemodellist.cpp:76
+msgid "N&ext File"
+msgstr "Sigui&ente archivo"
-#: komparepart/kompare_part.cpp:443
-msgid "*.diff *.dif *.patch|Patch Files"
-msgstr "*.diff *.dif *.patch|Archivos de parche"
+#: libdiff2/komparemodellist.cpp:79
+msgid "&Previous Difference"
+msgstr "Anterior di&ferencia"
-#: komparepart/kompare_part.cpp:443
-msgid "Save .diff"
-msgstr "Guardar diff"
+#: libdiff2/komparemodellist.cpp:82
+msgid "&Next Difference"
+msgstr "Siguie&nte diferencia"
-#: komparepart/kompare_part.cpp:446
-msgid "The file exists or is write-protected; do you want to overwrite it?"
+#: 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 ""
-"El archivo existe o se encuentra protegido contra escritura; desea "
-"sobrescribirlo?"
-
-#: komparepart/kompare_part.cpp:446
-msgid "File Exists"
-msgstr "El archivo ya existe"
+"<qt>No hay modelos o diferencias, este archivo: <b>%1</b>, no es un archivo "
+"diff válido.</qt>"
-#: komparepart/kompare_part.cpp:446
-msgid "Overwrite"
-msgstr "Sobrescribir"
-
-#: komparepart/kompare_part.cpp:446
-msgid "Do Not Overwrite"
-msgstr "No sobrescribir"
+#: libdiff2/komparemodellist.cpp:246
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
+"qt>"
+msgstr ""
+"<qt>Se produjeron problemas aplicando el diff <b>%1</b> al archivo <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>Se produjeron problemas aplicando el diff <b>%1</b> a la carpeta<b>%2</"
+"b>.</qt>"
-#: komparepart/kompare_part.cpp:493
-msgid "Running diff..."
-msgstr "Corriendo diff..."
+#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
+msgid "Could not open a temporary file."
+msgstr "No se pudo abrir un archivo temporal."
-#: komparepart/kompare_part.cpp:496
-msgid "Parsing diff output..."
-msgstr "Analizando salida diff...."
+#: libdiff2/komparemodellist.cpp:350
+msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+msgstr ""
+"<qt>Imposible escribir en el archivo temporal <b>%1</b>, borrandolo.</qt>"
-#: komparepart/kompare_part.cpp:545
-msgid "Comparing file %1 with file %2"
-msgstr "Comparando archivo %1 con archivo %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>Imposible crear carpeta de destino<b>%1</b>.\n"
+"El archivo no ha sido guardado.</qt>"
-#: komparepart/kompare_part.cpp:550
-msgid "Comparing files in %1 with files in %2"
-msgstr "Comparando archivos en %1 con archivos en %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>Imposible cargar el archivo temporal a la ubicación de destino. <b>%1</"
+"b>. El archivo temporal está todavía disponible en: <b>%2</b>. Puede "
+"copiarlo manualmente al lugar correcto.</qt>"
-#: komparepart/kompare_part.cpp:555
-#, c-format
-msgid "Viewing diff output from %1"
-msgstr "Viendo salida de diff de %1"
+#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
+msgid "Could not parse diff output."
+msgstr "No pude analizar la salida de diff"
-#: komparepart/kompare_part.cpp:558
-msgid "Blending diff output from %1 into file %2"
-msgstr "Fusionando salida diff de %1 en el archivo %2"
+#: libdiff2/komparemodellist.cpp:451
+msgid "The files are identical."
+msgstr "Los archivos son idénticos"
-#: komparepart/kompare_part.cpp:563
-msgid "Blending diff output from %1 into folder %2"
-msgstr "Fusionando salida diff de %1 en la carpeta %2"
+#: libdiff2/komparemodellist.cpp:613
+msgid "Could not write to the temporary file."
+msgstr "No se pudo escribir al archivo temporal."
-#: 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 ""
-"Has hecho cambios a el/los archivo(s) de destino.\n"
-"¿Quiere guardarlo(s)?"
+"Un programa para ver las diferencias entre archivos y opcionalmente generar "
+"un diff"
-#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
-msgid "Save Changes?"
-msgstr "¿Guardar cambios?"
+#: main.cpp:39
+msgid "This will compare URL1 with URL2"
+msgstr "Esto realizará una comparación entre la URL1 y la 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 ""
-"Lo siento, no hay archivo diff o no se han comparado 2 archivos, así que no hay "
-"estadísticas disponibles"
+"Esto abrirá la URL1 y esperará ser la salida de diff. URL1 también puede ser "
+"un «-» y entonces leerá de la entrada estandar. Puede ser usado para órdenes "
+"cvs diff | kompare -o-. Kompare comprobará si puede encontrar el archivo(s) "
+"original(es) y entonces fusionar el/los archivo(s) original(es) en la salida "
+"de diff y mostrarlos en el visor. -n desactiva la comprobación."
-#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
-#: komparepart/kompare_part.cpp:698
-msgid "Diff Statistics"
-msgstr "Estadísticas de diff"
+#: 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 ""
+"Esto fusionará URL2 con URL1, URL2 deberá ser una salida diff y URL1 el "
+"archivo o carpeta en la cual será fusionada la salida diff"
-#: 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 ""
-"Estadísticas:\n"
-"\n"
-"Archivo antiguo : %1\n"
-"Nuevo archivo : %2\n"
-"\n"
-"Formato : %3\n"
-"Número de bloques : %4\n"
-"Número de diferencias : %5"
+"Desactiva la comprobación para buscar automáticamente el/los archivo(s) "
+"original(es) cuando se use «-» como URL con la opción -o"
-#: 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 esto para especificar la codificación cuando lo llame desde la línea de "
+"órdenes. Por omisión utilizará la codificación local."
+
+#: main.cpp:52
+msgid "Kompare"
+msgstr "Kompare"
+
+#: main.cpp:54
+msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
+msgstr "(c) 2001-2003, John Firebaugh y Otto Bruggeman"
+
+#: main.cpp:55 main.cpp:56
+msgid "Author"
+msgstr "Autor"
+
+#: main.cpp:57
+msgid "Kompare icon artist"
+msgstr "Arte de íconos Kompare"
+
+#: main.cpp:58
+msgid "A lot of good advice"
+msgstr "Un montón de buenos consejos"
+
+#: main.cpp:59
+msgid "Cervisia diff viewer"
+msgstr "Visor diff de Cervisia"
+
+#: main.cpp:189
+msgid "Compare these files or folder"
+msgstr "Comparar estos archivos o carpetas"
+
+#: komparepart/komparepartui.rc:4 kompareui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Archivos"
+
+#: komparepart/komparepartui.rc:13
+#, no-c-format
+msgid "&Difference"
+msgstr "&Diferencia"
+
+#: komparepart/komparepartui.rc:25 kompareui.rc:14
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Preferencias de la vista"
+
+#: komparepart/komparesaveoptionsbase.ui:41
+#, no-c-format
+msgid "Run Diff In"
+msgstr "Ejecutar «diff» en"
+
+#: komparepart/komparesaveoptionsbase.ui:84
+#, no-c-format
+msgid "Command Line"
+msgstr "Línea de órdenes"
+
+#: komparepart/komparesaveoptionsbase.ui:108
+#, no-c-format
+msgid "cd dir && diff -udHprNa -- source destination"
+msgstr "cd dir && diff -udHprNa -- origen destino"
+
+#: komparepart/komparesaveoptionsbase.ui:118
+#, fuzzy, no-c-format
+msgid "Options"
+msgstr "O&pciones"
+
+#: komparepart/komparesaveoptionsbase.ui:135
+#, no-c-format
+msgid "Look for smaller changes"
+msgstr "Buscar cambios menores"
+
+#: komparepart/komparesaveoptionsbase.ui:146
+#, no-c-format
+msgid "Optimize for large files"
+msgstr "Optimizar para archivos grandes"
+
+#: komparepart/komparesaveoptionsbase.ui:157
+#, no-c-format
+msgid "Ignore changes in case"
+msgstr "Ignorar cambios de mayúsculas"
+
+#: komparepart/komparesaveoptionsbase.ui:165
+#, no-c-format
+msgid "Expand tabs to spaces"
+msgstr "Expandir tabuladores a espacios"
+
+#: komparepart/komparesaveoptionsbase.ui:173
+#, no-c-format
+msgid "Ignore added or removed empty lines"
+msgstr "Ignorar lineas vacías añadidas o eliminadas"
+
+#: komparepart/komparesaveoptionsbase.ui:181
+#, no-c-format
+msgid "Ignore changes in whitespace"
+msgstr "Ignorar cambios en espacios en blanco"
+
+#: komparepart/komparesaveoptionsbase.ui:189
+#, no-c-format
+msgid "Show function names"
+msgstr "Mostrar nombres de las funciones"
+
+#: komparepart/komparesaveoptionsbase.ui:200
+#, no-c-format
+msgid "Compare folders recursively"
+msgstr "Comparar carpetas recursivamente"
+
+#: komparepart/komparesaveoptionsbase.ui:211
+#, no-c-format
+msgid "Treat new files as empty"
+msgstr "Tratar archivos nuevos como vacíos"
+
+#: komparepart/komparesaveoptionsbase.ui:227
+#, no-c-format
+msgid "Format"
+msgstr "Formato"
+
+#: komparepart/komparesaveoptionsbase.ui:287
+#, no-c-format
+msgid "Side-by-side"
+msgstr "Cara-por-cara"
+
+#: kompareui.rc:27
+#, no-c-format
+msgid "Main Toolbar"
msgstr ""
-"Estadísticas:\n"
-"\n"
-"Número de archivos en el archivo diff: %1\n"
-"Formato : %2\n"
-"\n"
-"Archivo antiguo actual: %3\n"
-"Archivo nuevo actual : %4\n"
-"\n"
-"Número de bloques : %5\n"
-"Número de diferencias : %6"
diff --git a/tde-i18n-et/messages/tdesdk/kompare.po b/tde-i18n-et/messages/tdesdk/kompare.po
index c58acfa5c6..72a1415066 100644
--- a/tde-i18n-et/messages/tdesdk/kompare.po
+++ b/tde-i18n-et/messages/tdesdk/kompare.po
@@ -6,7 +6,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: 2007-04-29 14:29+0200\n"
"Last-Translator: Marek Laane <bald@starman.ee>\n"
"Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -16,334 +16,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.3\n"
-#: libdiff2/komparemodellist.cpp:61
-msgid "&Apply Difference"
-msgstr "&Rakenda erinevus"
-
-#: libdiff2/komparemodellist.cpp:64
-msgid "Un&apply Difference"
-msgstr "&Eemalda erinevus"
-
-#: libdiff2/komparemodellist.cpp:67
-msgid "App&ly All"
-msgstr "&Rakenda kõik"
-
-#: libdiff2/komparemodellist.cpp:70
-msgid "&Unapply All"
-msgstr "&Eemalda rakendus kõigilt"
-
-#: libdiff2/komparemodellist.cpp:73
-msgid "P&revious File"
-msgstr "&Eelmine fail"
-
-#: libdiff2/komparemodellist.cpp:76
-msgid "N&ext File"
-msgstr "&Järgmine fail"
-
-#: libdiff2/komparemodellist.cpp:79
-msgid "&Previous Difference"
-msgstr "Ee&lmine erinevus"
-
-#: libdiff2/komparemodellist.cpp:82
-msgid "&Next Difference"
-msgstr "Jär&gmine erinevus"
-
-#: 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>Ei ole mudelit ega erinevusi, sest fail <b>%1</b> "
-"ei ole mitte korralik diff-fail.</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>Diff-faili <b>%1</b> rakendamisel failile <b>%2</b> tekkis probleeme.</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>Diff-faili <b>%1</b> rakendamisel kataloogile <b>%2</b> "
-"tekkis probleeme.</qt>"
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-msgid "Could not open a temporary file."
-msgstr "Ajutise faili avamine ei õnnestunud."
-
-#: libdiff2/komparemodellist.cpp:350
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr ""
-"<qt>Ajutisse faili <b>%1</b> kirjutamine ei õnnestunud, see kustutatakse.</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>Sihtkataloogi <b>%1</b> loomine ebaõnnestus.\n"
-"Faili ei salvestatud.</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>Ajutise faili laadimine sihtkohta <b>%1</b> ebaõnnestus. Ajutine fail on "
-"endiselt kättesaadav (<b>%2</b>). Kui soovid, võid selle käsitsi õigesse kohta "
-"kopeerida.</qt>"
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-msgid "Could not parse diff output."
-msgstr "Võrdlemise väljundi parsimine ei õnnestunud."
-
-#: libdiff2/komparemodellist.cpp:451
-msgid "The files are identical."
-msgstr "Failid on identsed."
-
-#: libdiff2/komparemodellist.cpp:613
-msgid "Could not write to the temporary file."
-msgstr "Ajutisse faili kirjutamine ei õnnestunud."
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, no-c-format
-msgid "&Difference"
-msgstr "&Erinevus"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, no-c-format
-msgid "Run Diff In"
-msgstr "diff käivitatakse kataloogis"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, no-c-format
-msgid "Command Line"
-msgstr "Käsurida"
-
-#. 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 -- lähteasukoht"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, no-c-format
-msgid "Look for smaller changes"
-msgstr "Otsitakse väiksemaid muudatusi"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, no-c-format
-msgid "Optimize for large files"
-msgstr "Optimeeritakse suurte failide jaoks"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, no-c-format
-msgid "Ignore changes in case"
-msgstr "Tõstutundetu"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, no-c-format
-msgid "Expand tabs to spaces"
-msgstr "Tabeldusmärgid muudetakse tühikuteks"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
-#: rc.cpp:45
-#, no-c-format
-msgid "Ignore added or removed empty lines"
-msgstr "Ignoreeritakse lisatud või eemaldatud tühje ridu"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr "Ignoreeritakse muudatusi tühimärkides"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, no-c-format
-msgid "Show function names"
-msgstr "Näidatakse funktsioonide nimesid"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, no-c-format
-msgid "Compare folders recursively"
-msgstr "Katalooge võrreldakse rekursiivselt"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
-#: rc.cpp:57
-#, no-c-format
-msgid "Treat new files as empty"
-msgstr "Uusi faile koheldakse tühjana"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
-#: rc.cpp:60
-#, no-c-format
-msgid "Format"
-msgstr "Vorming"
-
-#. 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 "Kontekst"
-
-#. 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 "Tavaline"
-
-#. 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 "Unifitseeritud"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
-#: rc.cpp:78
-#, no-c-format
-msgid "Side-by-side"
-msgstr "Kõrvuti"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
-#: libdialogpages/diffpage.cpp:251 rc.cpp:81
-#, no-c-format
-msgid "Number of context lines:"
-msgstr "Kontekstiridade arv:"
-
-#: main.cpp:33
-msgid ""
-"A program to view the differences between files and optionally generate a diff"
-msgstr ""
-"Failidevaheliste erinevuste vaatlemise ja .diff-failide genereerimise rakendus"
-
-#: main.cpp:39
-msgid "This will compare URL1 with URL2"
-msgstr "Võrdleb URL1 ja 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 ""
-"See avab URL1 ja eeldab, et tegemist on võrdlemise väljundiga. URL1 võib olla "
-"ka '-', millisel juhul loetakse see standardsisendist. Seda võib kasutada "
-"näiteks cvs diff | kompare -o- jaoks. Kompare uurib, kas suudab leida "
-"originaalfaili(d) ning seejärel liidab originaalfaili(d) võrdlemise väljundiga "
-"ja näidab tulemust. Võti -n keelab uurimise."
-
-#: 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 ""
-"See liidab URL2 URL1 sisse, kus eeldatakse, et URL2 on võrdlemise väljund ja "
-"URL1 fail või kataloog, millesse võrdlemise väljund tuleb liita. "
-
-#: main.cpp:42
-msgid ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
-msgstr ""
-"Keelab uurimise originaalfaili(de) automaatseks leidmiseks, kui URL on antud "
-"kujul '-' koos võtmega -o."
-
-#: 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 ""
-"Sellega saab määrata kodeeringu väljakutsumisel käsurealt. Vaikimisi kohalik "
-"kodeering, kui ei ole teisiti määratud."
-
-#: 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 ja Otto Bruggeman"
-
-#: main.cpp:55 main.cpp:56
-msgid "Author"
-msgstr "Autor"
-
-#: main.cpp:57
-msgid "Kompare icon artist"
-msgstr "Kompare ikooni looja"
-
-#: main.cpp:58
-msgid "A lot of good advice"
-msgstr "Palju häid nõuandeid"
-
-#: main.cpp:59
-msgid "Cervisia diff viewer"
-msgstr "Cervisia diff-failide vaatleja"
-
-#: kompare_shell.cpp:398 main.cpp:185
-msgid "Compare Files or Folders"
-msgstr "Failide või kataloogide võrdlemine"
-
-#: kompare_shell.cpp:399 main.cpp:186
-msgid "Source"
-msgstr "Lähtefail"
-
-#: kompare_shell.cpp:400 main.cpp:187
-msgid "Destination"
-msgstr "Sihtfail"
-
-#: kompare_shell.cpp:402 main.cpp:189
-msgid "Compare"
-msgstr "Võrdle"
-
-#: main.cpp:189
-msgid "Compare these files or folder"
-msgstr "Võrdle neid faile või katalooge"
-
-#: 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 ""
-"Kui sisestasid selle dialoogi väljadesse kahe faili või kataloogi nime, siis "
-"see nupp aktiveerub ning sellele klõpsates käivitub failide või kataloogide "
-"võrdlemine. "
-
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Peeter Russak"
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -449,21 +128,48 @@ msgstr "Liidab selle faili või kataloogi võrdlemise väljundiga"
#: 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 ""
-"Kui oled määranud faili või kataloogi ja võrdlemise väljundit sisaldava faili, "
-"siis muutub see nupp kasutatavaks ning sellele vajutades ilmub Kompare peaaken, "
-"kus sisestatud faili või kataloogi failide väljund on liidetud võrdlemise "
-"väljundiga, misjärel on võimalik erinevus(ed) failile/failidele rakendada. "
+"Kui oled määranud faili või kataloogi ja võrdlemise väljundit sisaldava "
+"faili, siis muutub see nupp kasutatavaks ning sellele vajutades ilmub "
+"Kompare peaaken, kus sisestatud faili või kataloogi failide väljund on "
+"liidetud võrdlemise väljundiga, misjärel on võimalik erinevus(ed) failile/"
+"failidele rakendada. "
+
+#: kompare_shell.cpp:398 main.cpp:185
+msgid "Compare Files or Folders"
+msgstr "Failide või kataloogide võrdlemine"
+
+#: kompare_shell.cpp:399 main.cpp:186
+msgid "Source"
+msgstr "Lähtefail"
+
+#: kompare_shell.cpp:400 main.cpp:187
+msgid "Destination"
+msgstr "Sihtfail"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
+msgstr "Võrdle"
#: kompare_shell.cpp:402
msgid "Compare these files or folders"
msgstr "Võrdle neid faile või katalooge"
+#: 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 ""
+"Kui sisestasid selle dialoogi väljadesse kahe faili või kataloogi nime, siis "
+"see nupp aktiveerub ning sellele klõpsates käivitub failide või kataloogide "
+"võrdlemine. "
+
#: kompare_shell.cpp:439
msgid "Text View"
msgstr "Tekstivaade"
@@ -559,19 +265,228 @@ msgstr "Tundmatu"
msgid "KompareNavTreePart"
msgstr "KompareNavTreePart"
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
-msgstr "Siin saab anda failid, mida soovid võrrelda."
+#: komparepart/kompare_part.cpp:165
+msgid "Save &All"
+msgstr "S&alvesta kõik"
+
+#: komparepart/kompare_part.cpp:168
+msgid "Save .&diff..."
+msgstr "Salvesta .&diff..."
+
+#: komparepart/kompare_part.cpp:171
+msgid "Swap Source with Destination"
+msgstr "Vaheta lähtefail sihtfailiga"
+
+#: komparepart/kompare_part.cpp:174
+msgid "Show Statistics"
+msgstr "Näita statistikat"
+
+#: komparepart/kompare_part.cpp:269
+msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+msgstr "<qt>URLi <b>%1</b> allalaadimine ebaõnnestus.</qt>"
+
+#: komparepart/kompare_part.cpp:281
+msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+msgstr "<qt>URLi <b>%1</b> ei ole sinu süsteemis olemas.</qt>"
+
+#: komparepart/kompare_part.cpp:425
+msgid "Diff Options"
+msgstr "Diffi valikud"
+
+#: komparepart/kompare_part.cpp:443
+msgid "*.diff *.dif *.patch|Patch Files"
+msgstr "*.diff *.dif *.patch|Paigafailid"
+
+#: komparepart/kompare_part.cpp:443
+msgid "Save .diff"
+msgstr "Salvesta .diff"
+
+#: komparepart/kompare_part.cpp:446
+msgid "The file exists or is write-protected; do you want to overwrite it?"
+msgstr "Fail on olemas või kirjutuskaitsega. Kas soovid selle üle kirjutada?"
+
+#: komparepart/kompare_part.cpp:446
+msgid "File Exists"
+msgstr "Fail on olemas"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Overwrite"
+msgstr "Kirjuta üle"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Do Not Overwrite"
+msgstr "Ära kirjuta üle"
+
+#: komparepart/kompare_part.cpp:481
+msgid "KomparePart"
+msgstr "KomparePart"
+
+#: komparepart/kompare_part.cpp:493
+msgid "Running diff..."
+msgstr "Diffi täitmine..."
+
+#: komparepart/kompare_part.cpp:496
+msgid "Parsing diff output..."
+msgstr "Diffi väljundi parsimine..."
+
+#: komparepart/kompare_part.cpp:545
+msgid "Comparing file %1 with file %2"
+msgstr "Faili %1 võrdlemine failiga %2"
+
+#: komparepart/kompare_part.cpp:550
+msgid "Comparing files in %1 with files in %2"
+msgstr "%1 ja %2 sisu võrdlemine"
+
+#: komparepart/kompare_part.cpp:555
+#, c-format
+msgid "Viewing diff output from %1"
+msgstr "%1 võrdlemise väljundi vaatamine"
+
+#: komparepart/kompare_part.cpp:558
+msgid "Blending diff output from %1 into file %2"
+msgstr "%1 võrdlemise väljundi liitmine faili %2"
+
+#: komparepart/kompare_part.cpp:563
+msgid "Blending diff output from %1 into folder %2"
+msgstr "%1 võrdlemise väljundi liitmine kataloogi %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 ""
+"Sa oled teinud sihtfaili(desse) muudatusi.\n"
+"Kas soovid need salvestada?"
+
+#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+msgid "Save Changes?"
+msgstr "Kas salvestada muudatused?"
+
+#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276
+#: libdialogpages/diffpage.cpp:244
+#, no-c-format
+msgid "Unified"
+msgstr "Unifitseeritud"
+
+#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244
+#: libdialogpages/diffpage.cpp:238
+#, no-c-format
+msgid "Context"
+msgstr "Kontekst"
+
+#: 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 "Tavaline"
+
+#: komparepart/kompare_part.cpp:667
+msgid ""
+"No diff file, or no 2 files have been diffed. Therefore no stats are "
+"available."
+msgstr "DIFF-fail puudub või ei võrreldud kahte faili, seega statistikat pole."
+
+#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
+#: komparepart/kompare_part.cpp:698
+msgid "Diff Statistics"
+msgstr "Võrdlemise statistika"
+
+#: 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 ""
+"Statistika:\n"
+"\n"
+"Vana fail: %1\n"
+"Uus fail: %2\n"
+"\n"
+"Vorming: %3\n"
+"Tükke: %4\n"
+"Erinevusi: %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 ""
+"Statistika:\n"
+"\n"
+"Failide arv diff-failis: %1\n"
+"Vorming: %2\n"
+"\n"
+"Aktiivne vana fail: %3\n"
+"Aktiivne uus fail: %4\n"
+"\n"
+"Tükke: %5\n"
+"Erinevusi: %6"
+
+#: komparepart/kompareprefdlg.cpp:33
+msgid "Preferences"
+msgstr "Seadistused"
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View"
+msgstr "Tekstivaade"
+
+#: komparepart/kompareprefdlg.cpp:39
+msgid "View Settings"
+msgstr "Vaatamise seadistused"
#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
msgid "Diff"
msgstr "Diff"
+#: komparepart/kompareprefdlg.cpp:43
+msgid "Diff Settings"
+msgstr "Võrdlemise seadistused"
+
+#: kompareurldialog.cpp:41
+#, fuzzy
+msgid "Files"
+msgstr "&Failid"
+
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr "Siin saab anda failid, mida soovid võrrelda."
+
#: kompareurldialog.cpp:47
msgid "Here you can change the options for comparing the files."
msgstr "Siin saab muuta failide võrdlemise valikuid."
#: kompareurldialog.cpp:53
+#, fuzzy
+msgid "Appearance"
+msgstr "&Välimus"
+
+#: kompareurldialog.cpp:53
msgid "Here you can change the options for the view."
msgstr "Siin saab muuta vaatamise valikuid."
@@ -585,9 +500,9 @@ msgid ""
"program does not support all the options that the GNU version does. This way "
"you can select that version."
msgstr ""
-"Siin saab valida mõne muu võrdlemisrakenduse. Solarisel ei tunnista standardsed "
-"võrdlemisrakendused kõiki võtmeid, küll teeb seda GNU versioon, nii et igati "
-"mõttekas oleks just see valida."
+"Siin saab valida mõne muu võrdlemisrakenduse. Solarisel ei tunnista "
+"standardsed võrdlemisrakendused kõiki võtmeid, küll teeb seda GNU versioon, "
+"nii et igati mõttekas oleks just see valida."
#: libdialogpages/diffpage.cpp:221
msgid "&Diff"
@@ -599,18 +514,23 @@ msgstr "Väljundvorming"
#: 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 ""
-"Vali võrdlemise väljundi vorming. Unifitseeritud on kõige levinum, sest seda on "
-"väga hea jälgida. TDE arendajatele meeldib see ka, nii et just seda oleks "
+"Vali võrdlemise väljundi vorming. Unifitseeritud on kõige levinum, sest seda "
+"on väga hea jälgida. TDE arendajatele meeldib see ka, nii et just seda oleks "
"mõttekas kasutada paikade saatmisel."
#: libdialogpages/diffpage.cpp:247
msgid "Lines of Context"
msgstr "Kontekstiread"
+#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251
+#, no-c-format
+msgid "Number of context lines:"
+msgstr "Kontekstiridade arv:"
+
#: libdialogpages/diffpage.cpp:253
msgid ""
"The number of context lines is normally 2 or 3. This makes the diff readable "
@@ -618,8 +538,8 @@ msgid ""
"unnecessarily."
msgstr ""
"Kontekstiridade arv on tavaliselt 2 või 3, mis muudab väljundi enamasti "
-"loetavaks ja kasutatavaks. Rohkem kui kolme rea korral läheb asi ainult asjata "
-"kirjuks."
+"loetavaks ja kasutatavaks. Rohkem kui kolme rea korral läheb asi ainult "
+"asjata kirjuks."
#: libdialogpages/diffpage.cpp:259
msgid "&Format"
@@ -735,19 +655,19 @@ msgstr "Väljajäetavad failimustrid"
#: 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 ""
-"Selle sisselülitamisel saab sisestada shellimustri paremal asuvasse tekstikasti "
-"või valida mõne kirje nimekirjast."
+"Selle sisselülitamisel saab sisestada shellimustri paremal asuvasse "
+"tekstikasti või valida mõne kirje nimekirjast."
#: 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 ""
-"Siin saab sisestada või eemaldada shellimustri või valida nimekirjast ühe või "
-"rohkem kirje."
+"Siin saab sisestada või eemaldada shellimustri või valida nimekirjast ühe "
+"või rohkem kirje."
#: libdialogpages/diffpage.cpp:338
msgid "File with Filenames to Exclude"
@@ -760,19 +680,19 @@ msgstr "Sisselülitamisel saab failinime sisestada paremal asuvasse liitkasti."
#: 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 ""
-"Siia saab sisestada faili URL-i shellimustriga, mida ignoreeritakse kataloogide "
-"võrdlemisel."
+"Siia saab sisestada faili URL-i shellimustriga, mida ignoreeritakse "
+"kataloogide võrdlemisel."
#: 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 ""
-"Kõik klõpsu järel ilmuvas dialoogis valitud failid asetatakse dialoogi sellest "
-"nupust vasakul pool."
+"Kõik klõpsu järel ilmuvas dialoogis valitud failid asetatakse dialoogi "
+"sellest nupust vasakul pool."
#: libdialogpages/diffpage.cpp:352
msgid "&Exclude"
@@ -838,165 +758,276 @@ msgstr "Font:"
msgid "Size:"
msgstr "Suurus:"
-#: komparepart/kompareprefdlg.cpp:33
-msgid "Preferences"
-msgstr "Seadistused"
+#: libdialogpages/viewpage.cpp:119
+#, fuzzy
+msgid "&Fonts"
+msgstr "Font:"
-#: komparepart/kompareprefdlg.cpp:39
-msgid "View Settings"
-msgstr "Vaatamise seadistused"
+#: libdiff2/komparemodellist.cpp:61
+msgid "&Apply Difference"
+msgstr "&Rakenda erinevus"
-#: komparepart/kompareprefdlg.cpp:43
-msgid "Diff Settings"
-msgstr "Võrdlemise seadistused"
+#: libdiff2/komparemodellist.cpp:64
+msgid "Un&apply Difference"
+msgstr "&Eemalda erinevus"
-#: komparepart/kompare_part.cpp:165
-msgid "Save &All"
-msgstr "S&alvesta kõik"
+#: libdiff2/komparemodellist.cpp:67
+msgid "App&ly All"
+msgstr "&Rakenda kõik"
-#: komparepart/kompare_part.cpp:168
-msgid "Save .&diff..."
-msgstr "Salvesta .&diff..."
+#: libdiff2/komparemodellist.cpp:70
+msgid "&Unapply All"
+msgstr "&Eemalda rakendus kõigilt"
-#: komparepart/kompare_part.cpp:171
-msgid "Swap Source with Destination"
-msgstr "Vaheta lähtefail sihtfailiga"
+#: libdiff2/komparemodellist.cpp:73
+msgid "P&revious File"
+msgstr "&Eelmine fail"
-#: komparepart/kompare_part.cpp:174
-msgid "Show Statistics"
-msgstr "Näita statistikat"
+#: libdiff2/komparemodellist.cpp:76
+msgid "N&ext File"
+msgstr "&Järgmine fail"
-#: komparepart/kompare_part.cpp:269
-msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
-msgstr "<qt>URLi <b>%1</b> allalaadimine ebaõnnestus.</qt>"
+#: libdiff2/komparemodellist.cpp:79
+msgid "&Previous Difference"
+msgstr "Ee&lmine erinevus"
-#: komparepart/kompare_part.cpp:281
-msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
-msgstr "<qt>URLi <b>%1</b> ei ole sinu süsteemis olemas.</qt>"
+#: libdiff2/komparemodellist.cpp:82
+msgid "&Next Difference"
+msgstr "Jär&gmine erinevus"
-#: komparepart/kompare_part.cpp:425
-msgid "Diff Options"
-msgstr "Diffi valikud"
+#: 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>Ei ole mudelit ega erinevusi, sest fail <b>%1</b> ei ole mitte korralik "
+"diff-fail.</qt>"
-#: komparepart/kompare_part.cpp:443
-msgid "*.diff *.dif *.patch|Patch Files"
-msgstr "*.diff *.dif *.patch|Paigafailid"
+#: libdiff2/komparemodellist.cpp:246
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
+"qt>"
+msgstr ""
+"<qt>Diff-faili <b>%1</b> rakendamisel failile <b>%2</b> tekkis probleeme.</"
+"qt>"
-#: komparepart/kompare_part.cpp:443
-msgid "Save .diff"
-msgstr "Salvesta .diff"
+#: libdiff2/komparemodellist.cpp:271
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>."
+"</qt>"
+msgstr ""
+"<qt>Diff-faili <b>%1</b> rakendamisel kataloogile <b>%2</b> tekkis probleeme."
+"</qt>"
-#: komparepart/kompare_part.cpp:446
-msgid "The file exists or is write-protected; do you want to overwrite it?"
-msgstr "Fail on olemas või kirjutuskaitsega. Kas soovid selle üle kirjutada?"
+#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
+msgid "Could not open a temporary file."
+msgstr "Ajutise faili avamine ei õnnestunud."
-#: komparepart/kompare_part.cpp:446
-msgid "File Exists"
-msgstr "Fail on olemas"
+#: libdiff2/komparemodellist.cpp:350
+msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+msgstr ""
+"<qt>Ajutisse faili <b>%1</b> kirjutamine ei õnnestunud, see kustutatakse.</"
+"qt>"
-#: komparepart/kompare_part.cpp:446
-msgid "Overwrite"
-msgstr "Kirjuta üle"
+#: libdiff2/komparemodellist.cpp:368
+msgid ""
+"<qt>Could not create destination directory <b>%1</b>.\n"
+"The file has not been saved.</qt>"
+msgstr ""
+"<qt>Sihtkataloogi <b>%1</b> loomine ebaõnnestus.\n"
+"Faili ei salvestatud.</qt>"
-#: komparepart/kompare_part.cpp:446
-msgid "Do Not Overwrite"
-msgstr "Ära kirjuta üle"
+#: 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>Ajutise faili laadimine sihtkohta <b>%1</b> ebaõnnestus. Ajutine fail on "
+"endiselt kättesaadav (<b>%2</b>). Kui soovid, võid selle käsitsi õigesse "
+"kohta kopeerida.</qt>"
-#: komparepart/kompare_part.cpp:481
-msgid "KomparePart"
-msgstr "KomparePart"
+#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
+msgid "Could not parse diff output."
+msgstr "Võrdlemise väljundi parsimine ei õnnestunud."
-#: komparepart/kompare_part.cpp:493
-msgid "Running diff..."
-msgstr "Diffi täitmine..."
+#: libdiff2/komparemodellist.cpp:451
+msgid "The files are identical."
+msgstr "Failid on identsed."
-#: komparepart/kompare_part.cpp:496
-msgid "Parsing diff output..."
-msgstr "Diffi väljundi parsimine..."
+#: libdiff2/komparemodellist.cpp:613
+msgid "Could not write to the temporary file."
+msgstr "Ajutisse faili kirjutamine ei õnnestunud."
-#: komparepart/kompare_part.cpp:545
-msgid "Comparing file %1 with file %2"
-msgstr "Faili %1 võrdlemine failiga %2"
+#: main.cpp:33
+msgid ""
+"A program to view the differences between files and optionally generate a "
+"diff"
+msgstr ""
+"Failidevaheliste erinevuste vaatlemise ja .diff-failide genereerimise "
+"rakendus"
-#: komparepart/kompare_part.cpp:550
-msgid "Comparing files in %1 with files in %2"
-msgstr "%1 ja %2 sisu võrdlemine"
+#: main.cpp:39
+msgid "This will compare URL1 with URL2"
+msgstr "Võrdleb URL1 ja URL2"
-#: komparepart/kompare_part.cpp:555
-#, c-format
-msgid "Viewing diff output from %1"
-msgstr "%1 võrdlemise väljundi vaatamine"
+#: 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 ""
+"See avab URL1 ja eeldab, et tegemist on võrdlemise väljundiga. URL1 võib "
+"olla ka '-', millisel juhul loetakse see standardsisendist. Seda võib "
+"kasutada näiteks cvs diff | kompare -o- jaoks. Kompare uurib, kas suudab "
+"leida originaalfaili(d) ning seejärel liidab originaalfaili(d) võrdlemise "
+"väljundiga ja näidab tulemust. Võti -n keelab uurimise."
-#: komparepart/kompare_part.cpp:558
-msgid "Blending diff output from %1 into file %2"
-msgstr "%1 võrdlemise väljundi liitmine faili %2"
+#: 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 ""
+"See liidab URL2 URL1 sisse, kus eeldatakse, et URL2 on võrdlemise väljund ja "
+"URL1 fail või kataloog, millesse võrdlemise väljund tuleb liita. "
-#: komparepart/kompare_part.cpp:563
-msgid "Blending diff output from %1 into folder %2"
-msgstr "%1 võrdlemise väljundi liitmine kataloogi %2"
+#: main.cpp:42
+msgid ""
+"Disables the check for automatically finding the original file(s) when using "
+"'-' as URL with the -o option."
+msgstr ""
+"Keelab uurimise originaalfaili(de) automaatseks leidmiseks, kui URL on antud "
+"kujul '-' koos võtmega -o."
-#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709
+#: main.cpp:43
msgid ""
-"You have made changes to the destination file(s).\n"
-"Would you like to save them?"
+"Use this to specify the encoding when calling it from the command line. It "
+"will default to the local encoding if not specified."
msgstr ""
-"Sa oled teinud sihtfaili(desse) muudatusi.\n"
-"Kas soovid need salvestada?"
+"Sellega saab määrata kodeeringu väljakutsumisel käsurealt. Vaikimisi kohalik "
+"kodeering, kui ei ole teisiti määratud."
-#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
-msgid "Save Changes?"
-msgstr "Kas salvestada muudatused?"
+#: main.cpp:52
+msgid "Kompare"
+msgstr "Kompare"
-#: komparepart/kompare_part.cpp:667
-msgid ""
-"No diff file, or no 2 files have been diffed. Therefore no stats are available."
-msgstr "DIFF-fail puudub või ei võrreldud kahte faili, seega statistikat pole."
+#: main.cpp:54
+msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
+msgstr "(c) 2001-2004: John Firebaugh ja Otto Bruggeman"
-#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
-#: komparepart/kompare_part.cpp:698
-msgid "Diff Statistics"
-msgstr "Võrdlemise statistika"
+#: main.cpp:55 main.cpp:56
+msgid "Author"
+msgstr "Autor"
-#: 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 ""
-"Statistika:\n"
-"\n"
-"Vana fail: %1\n"
-"Uus fail: %2\n"
-"\n"
-"Vorming: %3\n"
-"Tükke: %4\n"
-"Erinevusi: %5"
+#: main.cpp:57
+msgid "Kompare icon artist"
+msgstr "Kompare ikooni looja"
-#: 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"
+#: main.cpp:58
+msgid "A lot of good advice"
+msgstr "Palju häid nõuandeid"
+
+#: main.cpp:59
+msgid "Cervisia diff viewer"
+msgstr "Cervisia diff-failide vaatleja"
+
+#: main.cpp:189
+msgid "Compare these files or folder"
+msgstr "Võrdle neid faile või katalooge"
+
+#: komparepart/komparepartui.rc:4 kompareui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Failid"
+
+#: komparepart/komparepartui.rc:13
+#, no-c-format
+msgid "&Difference"
+msgstr "&Erinevus"
+
+#: komparepart/komparepartui.rc:25 kompareui.rc:14
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Vaatamise seadistused"
+
+#: komparepart/komparesaveoptionsbase.ui:41
+#, no-c-format
+msgid "Run Diff In"
+msgstr "diff käivitatakse kataloogis"
+
+#: komparepart/komparesaveoptionsbase.ui:84
+#, no-c-format
+msgid "Command Line"
+msgstr "Käsurida"
+
+#: komparepart/komparesaveoptionsbase.ui:108
+#, no-c-format
+msgid "cd dir && diff -udHprNa -- source destination"
+msgstr "cd dir && diff -udHprNa -- lähteasukoht"
+
+#: komparepart/komparesaveoptionsbase.ui:118
+#, fuzzy, no-c-format
+msgid "Options"
+msgstr "&Valikud"
+
+#: komparepart/komparesaveoptionsbase.ui:135
+#, no-c-format
+msgid "Look for smaller changes"
+msgstr "Otsitakse väiksemaid muudatusi"
+
+#: komparepart/komparesaveoptionsbase.ui:146
+#, no-c-format
+msgid "Optimize for large files"
+msgstr "Optimeeritakse suurte failide jaoks"
+
+#: komparepart/komparesaveoptionsbase.ui:157
+#, no-c-format
+msgid "Ignore changes in case"
+msgstr "Tõstutundetu"
+
+#: komparepart/komparesaveoptionsbase.ui:165
+#, no-c-format
+msgid "Expand tabs to spaces"
+msgstr "Tabeldusmärgid muudetakse tühikuteks"
+
+#: komparepart/komparesaveoptionsbase.ui:173
+#, no-c-format
+msgid "Ignore added or removed empty lines"
+msgstr "Ignoreeritakse lisatud või eemaldatud tühje ridu"
+
+#: komparepart/komparesaveoptionsbase.ui:181
+#, no-c-format
+msgid "Ignore changes in whitespace"
+msgstr "Ignoreeritakse muudatusi tühimärkides"
+
+#: komparepart/komparesaveoptionsbase.ui:189
+#, no-c-format
+msgid "Show function names"
+msgstr "Näidatakse funktsioonide nimesid"
+
+#: komparepart/komparesaveoptionsbase.ui:200
+#, no-c-format
+msgid "Compare folders recursively"
+msgstr "Katalooge võrreldakse rekursiivselt"
+
+#: komparepart/komparesaveoptionsbase.ui:211
+#, no-c-format
+msgid "Treat new files as empty"
+msgstr "Uusi faile koheldakse tühjana"
+
+#: komparepart/komparesaveoptionsbase.ui:227
+#, no-c-format
+msgid "Format"
+msgstr "Vorming"
+
+#: komparepart/komparesaveoptionsbase.ui:287
+#, no-c-format
+msgid "Side-by-side"
+msgstr "Kõrvuti"
+
+#: kompareui.rc:27
+#, no-c-format
+msgid "Main Toolbar"
msgstr ""
-"Statistika:\n"
-"\n"
-"Failide arv diff-failis: %1\n"
-"Vorming: %2\n"
-"\n"
-"Aktiivne vana fail: %3\n"
-"Aktiivne uus fail: %4\n"
-"\n"
-"Tükke: %5\n"
-"Erinevusi: %6"
diff --git a/tde-i18n-eu/messages/tdesdk/kompare.po b/tde-i18n-eu/messages/tdesdk/kompare.po
index 09127fd9a2..03211cd02f 100644
--- a/tde-i18n-eu/messages/tdesdk/kompare.po
+++ b/tde-i18n-eu/messages/tdesdk/kompare.po
@@ -9,7 +9,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-08-23 20:32+0200\n"
"Last-Translator: Ion Gaztañaga <igaztanaga@gmail.com>\n"
"Language-Team: Basque <kdeuskaraz@euskalgnu.org>\n"
@@ -19,334 +19,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.10.2\n"
-#: libdiff2/komparemodellist.cpp:61
-msgid "&Apply Difference"
-msgstr "&Aplikatu desberdintasunak"
-
-#: libdiff2/komparemodellist.cpp:64
-msgid "Un&apply Difference"
-msgstr "Desberdintasunaren &aplikazioa desegin"
-
-#: libdiff2/komparemodellist.cpp:67
-msgid "App&ly All"
-msgstr "Ap&likatu dena"
-
-#: libdiff2/komparemodellist.cpp:70
-msgid "&Unapply All"
-msgstr "&Desegin dena"
-
-#: libdiff2/komparemodellist.cpp:73
-msgid "P&revious File"
-msgstr "Au&rreko fitxategia"
-
-#: libdiff2/komparemodellist.cpp:76
-msgid "N&ext File"
-msgstr "Hurr&engo fitxategia"
-
-#: libdiff2/komparemodellist.cpp:79
-msgid "&Previous Difference"
-msgstr "A&urreko desberdintasuna"
-
-#: libdiff2/komparemodellist.cpp:82
-msgid "&Next Difference"
-msgstr "Hurre&ngo desberdintasuna"
-
-#: 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>Ez dago eredu edo desberdintasunik, fitxategi hau: <b>%1</b>"
-", ez da baliozko diff fitxategia.</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>Arazoak <b>%1</b> diff fitxategia <b>%2</b> fitxategiari aplikatzean.</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>Arazoak <b>%1</b> diff-a <b>%2</b> direktorioari aplikatzean.</qt>"
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-msgid "Could not open a temporary file."
-msgstr "Ezin izan da behin-behineko fitxategirik ireki."
-
-#: libdiff2/komparemodellist.cpp:350
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr ""
-"<qt>Ezin izan da <b>%1</b> behin behineko fitxategian idatzi, ezabatzen.</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>Ezin izan da <b>%1</b> helburu direktorioa sortu.\n"
-"Fitxategia ez da gorde.</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>Ezin izan da behin behineko fitxategia helburu <b>%1</b> "
-"kokalekura kargatu. Behin behineko fitxategia oraindik eskuragarri dago hemen: "
-"<b>%2</b>. Eskuz kopia dezakezu kokaleku zuzenera.</qt>"
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-msgid "Could not parse diff output."
-msgstr "Ezin izan da diff irteera analizatu."
-
-#: libdiff2/komparemodellist.cpp:451
-msgid "The files are identical."
-msgstr "Fitxategiak berdinak dira."
-
-#: libdiff2/komparemodellist.cpp:613
-msgid "Could not write to the temporary file."
-msgstr "Ezin izan da behin behineko fitxategian idatzi."
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, no-c-format
-msgid "&Difference"
-msgstr "&Desberdintasuna"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, no-c-format
-msgid "Run Diff In"
-msgstr "Abiatu diff hemen:"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, no-c-format
-msgid "Command Line"
-msgstr "Komando lerroa"
-
-#. 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 -- iturburuaren helburua"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, no-c-format
-msgid "Look for smaller changes"
-msgstr "Bilatu aldaketa txikiak"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, no-c-format
-msgid "Optimize for large files"
-msgstr "Optimizat fitxategi handientzat"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, no-c-format
-msgid "Ignore changes in case"
-msgstr "Ez ikusi maiuskula/minuskula aldaketak"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, no-c-format
-msgid "Expand tabs to spaces"
-msgstr "Zabaldu tabulatzaileak espaziotara"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
-#: rc.cpp:45
-#, no-c-format
-msgid "Ignore added or removed empty lines"
-msgstr "Ez ikusi gehitutako edo kendutako lerro hutsak"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr "Ez ikusi zurigune aldaketak"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, no-c-format
-msgid "Show function names"
-msgstr "Erakutsi funtzioen izenak"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, no-c-format
-msgid "Compare folders recursively"
-msgstr "Konparatu direktorioak errekurtsiboki"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
-#: rc.cpp:57
-#, no-c-format
-msgid "Treat new files as empty"
-msgstr "Tratatu fitxategi berriak hutsak bezala"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
-#: rc.cpp:60
-#, no-c-format
-msgid "Format"
-msgstr "Formatua"
-
-#. 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 "Testuingurua"
-
-#. 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 "Normala"
-
-#. 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 "Bateratua"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
-#: rc.cpp:78
-#, no-c-format
-msgid "Side-by-side"
-msgstr "Aalboz albo"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
-#: libdialogpages/diffpage.cpp:251 rc.cpp:81
-#, no-c-format
-msgid "Number of context lines:"
-msgstr "Testuinguru lerro kopurua:"
-
-#: main.cpp:33
-msgid ""
-"A program to view the differences between files and optionally generate a diff"
-msgstr ""
-"Fitxategien arteko desberdintasunak ikusteko eta diff fitxategiak sortzeko "
-"gaitasuna duen programa bat."
-
-#: main.cpp:39
-msgid "This will compare URL1 with URL2"
-msgstr "URL1 eta URL2 konparatuko ditu"
-
-#: 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 ""
-"Honek URL1 irekiko du eta konparaketaren irteera izatea espero du. URL1 '-' ere "
-"izan daiteke eta orduan irteera estandarretik irakurriko da. Adibidez, \"cvs "
-"diff | konpare -o - \" aginduan erabil daiteke. Konpare-k jartorrizko "
-"fitxategiak aurki ditzakeen egiaztatuko du eta orduan jatorrizko fitxategiak "
-"konparaketa irteerara fusionatu xeta ikustailean bistaratuko dituss. \"-n\"-k "
-"egiaztapena ezgaituko du.s"
-
-#: 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 ""
-"Honek URL2 URL1-ean fusionatuko du URL2 konparaketa irteera izatea eta URL1 "
-"konparaketa irteera fusionatuko den fitxategi edo direktorioa izatea espero da. "
-
-#: main.cpp:42
-msgid ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
-msgstr ""
-"'-' URL-a -o akerarekin erabiltzen denean automatikoki jatorrizko fitxategia(k) "
-"aurkitzeko egiaztapena ezgaitzen du."
-
-#: 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 ""
-"Erabili hau komando-lerrotik deitzean erabiliko den kodeketa zehazteko. Ezer "
-"zehazten ez bada, lehenetsia kodeketa lokala erabiltzea da."
-
-#: main.cpp:52
-msgid "Kompare"
-msgstr "Konpare"
-
-#: main.cpp:54
-msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
-msgstr "(c) 2001-2004, John Firebaugh eta Otto Bruggeman"
-
-#: main.cpp:55 main.cpp:56
-msgid "Author"
-msgstr "Egilea"
-
-#: main.cpp:57
-msgid "Kompare icon artist"
-msgstr "Konpare ikono artista"
-
-#: main.cpp:58
-msgid "A lot of good advice"
-msgstr "Aholku on asko"
-
-#: main.cpp:59
-msgid "Cervisia diff viewer"
-msgstr "Cervisia diff ikustailea"
-
-#: kompare_shell.cpp:398 main.cpp:185
-msgid "Compare Files or Folders"
-msgstr "Konparatu fitxategiak edo direktorioak"
-
-#: kompare_shell.cpp:399 main.cpp:186
-msgid "Source"
-msgstr "Iturburua"
-
-#: kompare_shell.cpp:400 main.cpp:187
-msgid "Destination"
-msgstr "Helburua"
-
-#: kompare_shell.cpp:402 main.cpp:189
-msgid "Compare"
-msgstr "Konparatu"
-
-#: main.cpp:189
-msgid "Compare these files or folder"
-msgstr "Konparatu fitxategi edo direktorio hauek"
-
-#: 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 ""
-"2 fitxategi-izen edo 2 direktorio sartu badituzu elkarrizkea-koadro honetan, "
-"botoi hau gaituko egingo da eta sakatzean sartutako fitxategi edo direktorioen "
-"arteko konparaketa hasiko da."
-
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "Ion Gaztañaga"
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -452,22 +131,48 @@ msgstr "Fusionatu fitxategi edo direktorio hau konparaketaren irteerarekin"
#: 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 ""
"Fitxategi edo direktorio izen bat eta konparaketa irteera duen fitxategi bat "
-"sartu baduzu, botoi hau gaitu egingo da eta hau sakatzean Konpare abiatuko da "
-"ikuspegi nagusian. Bertan sartutako fitxategi edo direktorioko fitxategiak "
-"konparaketa irteerarekin nahastuko dira. Horrela, desberdintasunak fitxategi "
-"edo fitxategiei aplika diezazkiekezu."
+"sartu baduzu, botoi hau gaitu egingo da eta hau sakatzean Konpare abiatuko "
+"da ikuspegi nagusian. Bertan sartutako fitxategi edo direktorioko "
+"fitxategiak konparaketa irteerarekin nahastuko dira. Horrela, "
+"desberdintasunak fitxategi edo fitxategiei aplika diezazkiekezu."
+
+#: kompare_shell.cpp:398 main.cpp:185
+msgid "Compare Files or Folders"
+msgstr "Konparatu fitxategiak edo direktorioak"
+
+#: kompare_shell.cpp:399 main.cpp:186
+msgid "Source"
+msgstr "Iturburua"
+
+#: kompare_shell.cpp:400 main.cpp:187
+msgid "Destination"
+msgstr "Helburua"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
+msgstr "Konparatu"
#: kompare_shell.cpp:402
msgid "Compare these files or folders"
msgstr "Konparatu fitxategi edo direktorio hauek"
+#: 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 ""
+"2 fitxategi-izen edo 2 direktorio sartu badituzu elkarrizkea-koadro honetan, "
+"botoi hau gaituko egingo da eta sakatzean sartutako fitxategi edo "
+"direktorioen arteko konparaketa hasiko da."
+
#: kompare_shell.cpp:439
msgid "Text View"
msgstr "Testu ikuspegia"
@@ -563,19 +268,232 @@ msgstr "Ezezaguna"
msgid "KompareNavTreePart"
msgstr "KompareNavTreePart"
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
-msgstr "Hemen konparatu nahi dituzun fitxategiak sar ditzakezu."
+#: komparepart/kompare_part.cpp:165
+msgid "Save &All"
+msgstr "Gorde &dena"
+
+#: komparepart/kompare_part.cpp:168
+msgid "Save .&diff..."
+msgstr "Gorde .&diff-a..."
+
+#: komparepart/kompare_part.cpp:171
+msgid "Swap Source with Destination"
+msgstr "Trukatu iturburua helburuarekin"
+
+#: komparepart/kompare_part.cpp:174
+msgid "Show Statistics"
+msgstr "Erakutsi estatistikak"
+
+#: komparepart/kompare_part.cpp:269
+msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+msgstr "<qt><b>%1</b> URL-a ezin da deskargatu.</qt>"
+
+#: komparepart/kompare_part.cpp:281
+msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+msgstr "<qt><b>%1</b> URL-a ez da zure sisteman existitzen.</qt>"
+
+#: komparepart/kompare_part.cpp:425
+msgid "Diff Options"
+msgstr "Diff aukerak"
+
+#: komparepart/kompare_part.cpp:443
+msgid "*.diff *.dif *.patch|Patch Files"
+msgstr "*.diff *.dif *.patch|Adabaki fitxategiak"
+
+#: komparepart/kompare_part.cpp:443
+msgid "Save .diff"
+msgstr "Gorde .diff-a"
+
+#: komparepart/kompare_part.cpp:446
+msgid "The file exists or is write-protected; do you want to overwrite it?"
+msgstr ""
+"Fitxategia dagoeneko existitzen da eta idazketa aurka babesturik dago; "
+"gainidatzi nahi al duzu?"
+
+#: komparepart/kompare_part.cpp:446
+msgid "File Exists"
+msgstr "Fitxategia existitzen da"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Overwrite"
+msgstr "Gainidatzi"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Do Not Overwrite"
+msgstr "Ez gainidatzi"
+
+#: komparepart/kompare_part.cpp:481
+msgid "KomparePart"
+msgstr "KonparePart"
+
+#: komparepart/kompare_part.cpp:493
+msgid "Running diff..."
+msgstr "Diff martxan..."
+
+#: komparepart/kompare_part.cpp:496
+msgid "Parsing diff output..."
+msgstr "Diff irteera analizatzen..."
+
+#: komparepart/kompare_part.cpp:545
+msgid "Comparing file %1 with file %2"
+msgstr "%1 fitxategia %2 fitxategiarekin konparatzen"
+
+#: komparepart/kompare_part.cpp:550
+msgid "Comparing files in %1 with files in %2"
+msgstr "%1-(e)ko fitxategia %2-(e)ko fitxategiarekin konparatzen"
+
+#: komparepart/kompare_part.cpp:555
+#, c-format
+msgid "Viewing diff output from %1"
+msgstr "%1-(r)en diff irteera ikusten"
+
+#: komparepart/kompare_part.cpp:558
+msgid "Blending diff output from %1 into file %2"
+msgstr "%1-(r)en diff irteera %2 fitxategian fusionatzen"
+
+#: komparepart/kompare_part.cpp:563
+msgid "Blending diff output from %1 into folder %2"
+msgstr "%1-(r)en diff irteera %2 direktorioan fusionatzen"
+
+#: 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 ""
+"Helburu fitxategietan aldaketak egin dituzu.\n"
+"Gorde nahi al dituzu?"
+
+#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+msgid "Save Changes?"
+msgstr "Gorde aldaketak?"
+
+#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276
+#: libdialogpages/diffpage.cpp:244
+#, no-c-format
+msgid "Unified"
+msgstr "Bateratua"
+
+#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244
+#: libdialogpages/diffpage.cpp:238
+#, no-c-format
+msgid "Context"
+msgstr "Testuingurua"
+
+#: 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 "Normala"
+
+#: komparepart/kompare_part.cpp:667
+msgid ""
+"No diff file, or no 2 files have been diffed. Therefore no stats are "
+"available."
+msgstr ""
+"Ez dago diff fitxategirik, edo ez da 2 fitxategirik konparatu. Beraz, ez "
+"estatistikarik egongo eskuragarri."
+
+#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
+#: komparepart/kompare_part.cpp:698
+msgid "Diff Statistics"
+msgstr "Diff estatistikak"
+
+#: 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 ""
+"Estatistikak:\n"
+"\n"
+"Fitxategi zaharra:%1\n"
+"Fitxategi berria:%2\n"
+"\n"
+"Formatua:%3\n"
+"Zati kopurua:%4\n"
+"Desberdintasun kopurua:%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 ""
+"Estatistikak:\n"
+"\n"
+"Diff fitxategiko fitxategi kopurua: %1\n"
+"Formatua:%2\n"
+"\n"
+"Uneko fitxategi zaharra:%3\n"
+"Uneko fitxategi berria:%4\n"
+"\n"
+"Zati kopurua:%5\n"
+"Desberdintasun kopurua:%6"
+
+#: komparepart/kompareprefdlg.cpp:33
+msgid "Preferences"
+msgstr "Hobespenak"
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View"
+msgstr "Testu ikuspegia"
+
+#: komparepart/kompareprefdlg.cpp:39
+msgid "View Settings"
+msgstr "Ikusi ezarpenak"
#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
msgid "Diff"
msgstr "Diff"
+#: komparepart/kompareprefdlg.cpp:43
+msgid "Diff Settings"
+msgstr "Diff ezarpenak"
+
+#: kompareurldialog.cpp:41
+#, fuzzy
+msgid "Files"
+msgstr "&Fitxategiak"
+
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr "Hemen konparatu nahi dituzun fitxategiak sar ditzakezu."
+
#: kompareurldialog.cpp:47
msgid "Here you can change the options for comparing the files."
msgstr "Hemen fitxategi konparaketaren aukerak alda ditzakezu."
#: kompareurldialog.cpp:53
+#, fuzzy
+msgid "Appearance"
+msgstr "I&txura"
+
+#: kompareurldialog.cpp:53
msgid "Here you can change the options for the view."
msgstr "Hemen ikuspegiaren aukerak alda ditzakezu."
@@ -590,8 +508,8 @@ msgid ""
"you can select that version."
msgstr ""
"Hemen diff programa ezberdin bat hauta dezakezu. Solaris-en konparaketa "
-"programa estandarrak ez ditu GNU bertsioaren aukera guztiak onartzen. Honela, "
-"bertsio hura hauta dezakezu."
+"programa estandarrak ez ditu GNU bertsioaren aukera guztiak onartzen. "
+"Honela, bertsio hura hauta dezakezu."
#: libdialogpages/diffpage.cpp:221
msgid "&Diff"
@@ -603,18 +521,23 @@ msgstr "Irteeraren formatua"
#: 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 ""
"Hautatu diff programak sortuko duen irteeraren formatua. Bateratua, gehien "
-"erabiltzen den formatua da, oso irakurterreza delako. TDE garatzaileek formatu "
-"hau dute gustoko adabakiak bidaltzeko garaian."
+"erabiltzen den formatua da, oso irakurterreza delako. TDE garatzaileek "
+"formatu hau dute gustoko adabakiak bidaltzeko garaian."
#: libdialogpages/diffpage.cpp:247
msgid "Lines of Context"
msgstr "Testuinguru lerroak"
+#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251
+#, no-c-format
+msgid "Number of context lines:"
+msgstr "Testuinguru lerro kopurua:"
+
#: libdialogpages/diffpage.cpp:253
msgid ""
"The number of context lines is normally 2 or 3. This makes the diff readable "
@@ -739,16 +662,16 @@ msgstr "Baztertzeko fitxategi eredua"
#: 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 ""
"Hau hautatzen bada, shell eredu bat sar dezakezu testu-koadroan edo zerrenda "
"sarrerak hauta ditzakezu."
#: 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 ""
"Hemen shell eredu bat sar edo kendu dezakezu edo zerrendako sarrera bat edo "
"gehiago hauta dezakezu."
@@ -761,21 +684,21 @@ msgstr "Baztertzeko fitxategi-izenak dituen fitxategia"
msgid ""
"If this is checked you can enter a filename in the combo box on the right."
msgstr ""
-"Hau hautatzen bada, fitxategi-izen bat sar dezakezu eskuineko "
-"konbinazio-koadroan"
+"Hau hautatzen bada, fitxategi-izen bat sar dezakezu eskuineko konbinazio-"
+"koadroan"
#: 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 ""
"Hemen direktorioen konparaketetan baztertuko diren shell eredudun fitxategi "
"baten URL-a sar dezakezu."
#: 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 ""
"Hemen hautatzen duzun eta klik egitean agertzen den edozein fitxategi, botoi "
"honen ezkerrean dagoen elkarrizketa-koadroan jarriko da."
@@ -844,169 +767,275 @@ msgstr "Letra-tipoa:"
msgid "Size:"
msgstr "Tamaina:"
-#: komparepart/kompareprefdlg.cpp:33
-msgid "Preferences"
-msgstr "Hobespenak"
-
-#: komparepart/kompareprefdlg.cpp:39
-msgid "View Settings"
-msgstr "Ikusi ezarpenak"
-
-#: komparepart/kompareprefdlg.cpp:43
-msgid "Diff Settings"
-msgstr "Diff ezarpenak"
-
-#: komparepart/kompare_part.cpp:165
-msgid "Save &All"
-msgstr "Gorde &dena"
+#: libdialogpages/viewpage.cpp:119
+#, fuzzy
+msgid "&Fonts"
+msgstr "Letra-tipoa:"
-#: komparepart/kompare_part.cpp:168
-msgid "Save .&diff..."
-msgstr "Gorde .&diff-a..."
+#: libdiff2/komparemodellist.cpp:61
+msgid "&Apply Difference"
+msgstr "&Aplikatu desberdintasunak"
-#: komparepart/kompare_part.cpp:171
-msgid "Swap Source with Destination"
-msgstr "Trukatu iturburua helburuarekin"
+#: libdiff2/komparemodellist.cpp:64
+msgid "Un&apply Difference"
+msgstr "Desberdintasunaren &aplikazioa desegin"
-#: komparepart/kompare_part.cpp:174
-msgid "Show Statistics"
-msgstr "Erakutsi estatistikak"
+#: libdiff2/komparemodellist.cpp:67
+msgid "App&ly All"
+msgstr "Ap&likatu dena"
-#: komparepart/kompare_part.cpp:269
-msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
-msgstr "<qt><b>%1</b> URL-a ezin da deskargatu.</qt>"
+#: libdiff2/komparemodellist.cpp:70
+msgid "&Unapply All"
+msgstr "&Desegin dena"
-#: komparepart/kompare_part.cpp:281
-msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
-msgstr "<qt><b>%1</b> URL-a ez da zure sisteman existitzen.</qt>"
+#: libdiff2/komparemodellist.cpp:73
+msgid "P&revious File"
+msgstr "Au&rreko fitxategia"
-#: komparepart/kompare_part.cpp:425
-msgid "Diff Options"
-msgstr "Diff aukerak"
+#: libdiff2/komparemodellist.cpp:76
+msgid "N&ext File"
+msgstr "Hurr&engo fitxategia"
-#: komparepart/kompare_part.cpp:443
-msgid "*.diff *.dif *.patch|Patch Files"
-msgstr "*.diff *.dif *.patch|Adabaki fitxategiak"
+#: libdiff2/komparemodellist.cpp:79
+msgid "&Previous Difference"
+msgstr "A&urreko desberdintasuna"
-#: komparepart/kompare_part.cpp:443
-msgid "Save .diff"
-msgstr "Gorde .diff-a"
+#: libdiff2/komparemodellist.cpp:82
+msgid "&Next Difference"
+msgstr "Hurre&ngo desberdintasuna"
-#: komparepart/kompare_part.cpp:446
-msgid "The file exists or is write-protected; do you want to overwrite it?"
+#: 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 ""
-"Fitxategia dagoeneko existitzen da eta idazketa aurka babesturik dago; "
-"gainidatzi nahi al duzu?"
-
-#: komparepart/kompare_part.cpp:446
-msgid "File Exists"
-msgstr "Fitxategia existitzen da"
-
-#: komparepart/kompare_part.cpp:446
-msgid "Overwrite"
-msgstr "Gainidatzi"
+"<qt>Ez dago eredu edo desberdintasunik, fitxategi hau: <b>%1</b>, ez da "
+"baliozko diff fitxategia.</qt>"
-#: komparepart/kompare_part.cpp:446
-msgid "Do Not Overwrite"
-msgstr "Ez gainidatzi"
+#: libdiff2/komparemodellist.cpp:246
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
+"qt>"
+msgstr ""
+"<qt>Arazoak <b>%1</b> diff fitxategia <b>%2</b> fitxategiari aplikatzean.</"
+"qt>"
-#: komparepart/kompare_part.cpp:481
-msgid "KomparePart"
-msgstr "KonparePart"
+#: libdiff2/komparemodellist.cpp:271
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>."
+"</qt>"
+msgstr "<qt>Arazoak <b>%1</b> diff-a <b>%2</b> direktorioari aplikatzean.</qt>"
-#: komparepart/kompare_part.cpp:493
-msgid "Running diff..."
-msgstr "Diff martxan..."
+#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
+msgid "Could not open a temporary file."
+msgstr "Ezin izan da behin-behineko fitxategirik ireki."
-#: komparepart/kompare_part.cpp:496
-msgid "Parsing diff output..."
-msgstr "Diff irteera analizatzen..."
+#: libdiff2/komparemodellist.cpp:350
+msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+msgstr ""
+"<qt>Ezin izan da <b>%1</b> behin behineko fitxategian idatzi, ezabatzen.</qt>"
-#: komparepart/kompare_part.cpp:545
-msgid "Comparing file %1 with file %2"
-msgstr "%1 fitxategia %2 fitxategiarekin konparatzen"
+#: libdiff2/komparemodellist.cpp:368
+msgid ""
+"<qt>Could not create destination directory <b>%1</b>.\n"
+"The file has not been saved.</qt>"
+msgstr ""
+"<qt>Ezin izan da <b>%1</b> helburu direktorioa sortu.\n"
+"Fitxategia ez da gorde.</qt>"
-#: komparepart/kompare_part.cpp:550
-msgid "Comparing files in %1 with files in %2"
-msgstr "%1-(e)ko fitxategia %2-(e)ko fitxategiarekin konparatzen"
+#: 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>Ezin izan da behin behineko fitxategia helburu <b>%1</b> kokalekura "
+"kargatu. Behin behineko fitxategia oraindik eskuragarri dago hemen: <b>%2</"
+"b>. Eskuz kopia dezakezu kokaleku zuzenera.</qt>"
-#: komparepart/kompare_part.cpp:555
-#, c-format
-msgid "Viewing diff output from %1"
-msgstr "%1-(r)en diff irteera ikusten"
+#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
+msgid "Could not parse diff output."
+msgstr "Ezin izan da diff irteera analizatu."
-#: komparepart/kompare_part.cpp:558
-msgid "Blending diff output from %1 into file %2"
-msgstr "%1-(r)en diff irteera %2 fitxategian fusionatzen"
+#: libdiff2/komparemodellist.cpp:451
+msgid "The files are identical."
+msgstr "Fitxategiak berdinak dira."
-#: komparepart/kompare_part.cpp:563
-msgid "Blending diff output from %1 into folder %2"
-msgstr "%1-(r)en diff irteera %2 direktorioan fusionatzen"
+#: libdiff2/komparemodellist.cpp:613
+msgid "Could not write to the temporary file."
+msgstr "Ezin izan da behin behineko fitxategian idatzi."
-#: 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 ""
-"Helburu fitxategietan aldaketak egin dituzu.\n"
-"Gorde nahi al dituzu?"
+"Fitxategien arteko desberdintasunak ikusteko eta diff fitxategiak sortzeko "
+"gaitasuna duen programa bat."
-#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
-msgid "Save Changes?"
-msgstr "Gorde aldaketak?"
+#: main.cpp:39
+msgid "This will compare URL1 with URL2"
+msgstr "URL1 eta URL2 konparatuko ditu"
-#: 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 ""
-"Ez dago diff fitxategirik, edo ez da 2 fitxategirik konparatu. Beraz, ez "
-"estatistikarik egongo eskuragarri."
+"Honek URL1 irekiko du eta konparaketaren irteera izatea espero du. URL1 '-' "
+"ere izan daiteke eta orduan irteera estandarretik irakurriko da. Adibidez, "
+"\"cvs diff | konpare -o - \" aginduan erabil daiteke. Konpare-k jartorrizko "
+"fitxategiak aurki ditzakeen egiaztatuko du eta orduan jatorrizko fitxategiak "
+"konparaketa irteerara fusionatu xeta ikustailean bistaratuko dituss. \"-n\"-"
+"k egiaztapena ezgaituko du.s"
-#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
-#: komparepart/kompare_part.cpp:698
-msgid "Diff Statistics"
-msgstr "Diff estatistikak"
+#: 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 ""
+"Honek URL2 URL1-ean fusionatuko du URL2 konparaketa irteera izatea eta URL1 "
+"konparaketa irteera fusionatuko den fitxategi edo direktorioa izatea espero "
+"da. "
-#: 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 ""
-"Estatistikak:\n"
-"\n"
-"Fitxategi zaharra:%1\n"
-"Fitxategi berria:%2\n"
-"\n"
-"Formatua:%3\n"
-"Zati kopurua:%4\n"
-"Desberdintasun kopurua:%5"
+"'-' URL-a -o akerarekin erabiltzen denean automatikoki jatorrizko "
+"fitxategia(k) aurkitzeko egiaztapena ezgaitzen du."
-#: 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 ""
+"Erabili hau komando-lerrotik deitzean erabiliko den kodeketa zehazteko. Ezer "
+"zehazten ez bada, lehenetsia kodeketa lokala erabiltzea da."
+
+#: main.cpp:52
+msgid "Kompare"
+msgstr "Konpare"
+
+#: main.cpp:54
+msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
+msgstr "(c) 2001-2004, John Firebaugh eta Otto Bruggeman"
+
+#: main.cpp:55 main.cpp:56
+msgid "Author"
+msgstr "Egilea"
+
+#: main.cpp:57
+msgid "Kompare icon artist"
+msgstr "Konpare ikono artista"
+
+#: main.cpp:58
+msgid "A lot of good advice"
+msgstr "Aholku on asko"
+
+#: main.cpp:59
+msgid "Cervisia diff viewer"
+msgstr "Cervisia diff ikustailea"
+
+#: main.cpp:189
+msgid "Compare these files or folder"
+msgstr "Konparatu fitxategi edo direktorio hauek"
+
+#: komparepart/komparepartui.rc:4 kompareui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Fitxategiak"
+
+#: komparepart/komparepartui.rc:13
+#, no-c-format
+msgid "&Difference"
+msgstr "&Desberdintasuna"
+
+#: komparepart/komparepartui.rc:25 kompareui.rc:14
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Ikusi ezarpenak"
+
+#: komparepart/komparesaveoptionsbase.ui:41
+#, no-c-format
+msgid "Run Diff In"
+msgstr "Abiatu diff hemen:"
+
+#: komparepart/komparesaveoptionsbase.ui:84
+#, no-c-format
+msgid "Command Line"
+msgstr "Komando lerroa"
+
+#: komparepart/komparesaveoptionsbase.ui:108
+#, no-c-format
+msgid "cd dir && diff -udHprNa -- source destination"
+msgstr "cd dir && diff -udHprNa -- iturburuaren helburua"
+
+#: komparepart/komparesaveoptionsbase.ui:118
+#, fuzzy, no-c-format
+msgid "Options"
+msgstr "A&ukerak"
+
+#: komparepart/komparesaveoptionsbase.ui:135
+#, no-c-format
+msgid "Look for smaller changes"
+msgstr "Bilatu aldaketa txikiak"
+
+#: komparepart/komparesaveoptionsbase.ui:146
+#, no-c-format
+msgid "Optimize for large files"
+msgstr "Optimizat fitxategi handientzat"
+
+#: komparepart/komparesaveoptionsbase.ui:157
+#, no-c-format
+msgid "Ignore changes in case"
+msgstr "Ez ikusi maiuskula/minuskula aldaketak"
+
+#: komparepart/komparesaveoptionsbase.ui:165
+#, no-c-format
+msgid "Expand tabs to spaces"
+msgstr "Zabaldu tabulatzaileak espaziotara"
+
+#: komparepart/komparesaveoptionsbase.ui:173
+#, no-c-format
+msgid "Ignore added or removed empty lines"
+msgstr "Ez ikusi gehitutako edo kendutako lerro hutsak"
+
+#: komparepart/komparesaveoptionsbase.ui:181
+#, no-c-format
+msgid "Ignore changes in whitespace"
+msgstr "Ez ikusi zurigune aldaketak"
+
+#: komparepart/komparesaveoptionsbase.ui:189
+#, no-c-format
+msgid "Show function names"
+msgstr "Erakutsi funtzioen izenak"
+
+#: komparepart/komparesaveoptionsbase.ui:200
+#, no-c-format
+msgid "Compare folders recursively"
+msgstr "Konparatu direktorioak errekurtsiboki"
+
+#: komparepart/komparesaveoptionsbase.ui:211
+#, no-c-format
+msgid "Treat new files as empty"
+msgstr "Tratatu fitxategi berriak hutsak bezala"
+
+#: komparepart/komparesaveoptionsbase.ui:227
+#, no-c-format
+msgid "Format"
+msgstr "Formatua"
+
+#: komparepart/komparesaveoptionsbase.ui:287
+#, no-c-format
+msgid "Side-by-side"
+msgstr "Aalboz albo"
+
+#: kompareui.rc:27
+#, no-c-format
+msgid "Main Toolbar"
msgstr ""
-"Estatistikak:\n"
-"\n"
-"Diff fitxategiko fitxategi kopurua: %1\n"
-"Formatua:%2\n"
-"\n"
-"Uneko fitxategi zaharra:%3\n"
-"Uneko fitxategi berria:%4\n"
-"\n"
-"Zati kopurua:%5\n"
-"Desberdintasun kopurua:%6"
diff --git a/tde-i18n-fa/messages/tdesdk/kompare.po b/tde-i18n-fa/messages/tdesdk/kompare.po
index bd6677d33b..c30f7adc13 100644
--- a/tde-i18n-fa/messages/tdesdk/kompare.po
+++ b/tde-i18n-fa/messages/tdesdk/kompare.po
@@ -5,7 +5,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: 2006-12-30 11:02+0330\n"
"Last-Translator: \n"
"Language-Team: <fa@li.org>\n"
@@ -16,329 +16,13 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: libdiff2/komparemodellist.cpp:61
-msgid "&Apply Difference"
-msgstr "&اعمال تفاوت‌"
-
-#: libdiff2/komparemodellist.cpp:64
-msgid "Un&apply Difference"
-msgstr "تفاوت &اعمال نشود‌"
-
-#: libdiff2/komparemodellist.cpp:67
-msgid "App&ly All"
-msgstr "&اعمال همه‌"
-
-#: libdiff2/komparemodellist.cpp:70
-msgid "&Unapply All"
-msgstr "همه &اعمال نشود‌"
-
-#: libdiff2/komparemodellist.cpp:73
-msgid "P&revious File"
-msgstr "پروندۀ &قبلی‌"
-
-#: libdiff2/komparemodellist.cpp:76
-msgid "N&ext File"
-msgstr "پروندۀ &بعدی‌"
-
-#: libdiff2/komparemodellist.cpp:79
-msgid "&Previous Difference"
-msgstr "تفاوت &قبلی‌"
-
-#: libdiff2/komparemodellist.cpp:82
-msgid "&Next Difference"
-msgstr "تفاوت &بعدی‌"
-
-#: 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>هیچ مدل یا تفاوتی وجود ندارد، این پرونده <b>%1</b>"
-"،یک پروندۀ تفاوت معتبر نیست.</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>مسائلی در اعمال تفاوت وجود دارد<b>%1</b>به پروندۀ<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>مسائلی در اعمال تفاوت وجود دارد <b>%1</b>به پوشۀ<b>%2</b>.</qt>"
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-msgid "Could not open a temporary file."
-msgstr "نتوانست پروندۀ موقت را باز کند."
-
-#: libdiff2/komparemodellist.cpp:350
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr "<qt>نتوانست در پروندۀ موقت بنویسد <b>%1</b>، حذف آن.</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>نتوانست فهرست راهنمای مقصد را ایجاد کند<b>%1</b>.\n"
-"این پرونده ذخیره نشده است.</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>نتوانست پروندۀ موقت را در محل مقصد بارگذاری کند<b>%1</b>"
-". پروندۀ موقت هنوز در دسترس است تحت :<b>%2</b>. می‌توانید به طور دستی آن را در "
-"مکان درست رونوشت کنید. </qt>"
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-msgid "Could not parse diff output."
-msgstr "نتوانست خروجی تفاوت را تجزیه کند."
-
-#: libdiff2/komparemodellist.cpp:451
-msgid "The files are identical."
-msgstr "پرونده‌ها یکسانند."
-
-#: libdiff2/komparemodellist.cpp:613
-msgid "Could not write to the temporary file."
-msgstr "نتوانست در پروندۀ موقت بنویسد."
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, no-c-format
-msgid "&Difference"
-msgstr "&تفاوت‌"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, no-c-format
-msgid "Run Diff In"
-msgstr "اجرای تفاوت در"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, no-c-format
-msgid "Command Line"
-msgstr "سطر فرمان"
-
-#. 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 --مبدأ مقصد"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, no-c-format
-msgid "Look for smaller changes"
-msgstr "جستجو برای تغییرات کوچک‌تر"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, no-c-format
-msgid "Optimize for large files"
-msgstr "بهینه‌سازی برای پرونده‌های بزرگ"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, no-c-format
-msgid "Ignore changes in case"
-msgstr "چشم‌پوشی از تغییرات در حالت"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, no-c-format
-msgid "Expand tabs to spaces"
-msgstr "بسط تبها نسبت به فاصله‌ها"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
-#: rc.cpp:45
-#, no-c-format
-msgid "Ignore added or removed empty lines"
-msgstr "چشم‌پوشی از خطوط خالی اضافه‌شده یا حذف‌شده"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr "چشم‌پوشی از تغییرات در فاصلۀ سفید"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, no-c-format
-msgid "Show function names"
-msgstr "نمایش نام توابع"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, no-c-format
-msgid "Compare folders recursively"
-msgstr "مقایسۀ پوشه‌ها به طور بازگشتی"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
-#: rc.cpp:57
-#, no-c-format
-msgid "Treat new files as empty"
-msgstr "رفتار پرونده‌های جدید به عنوان خالی"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
-#: rc.cpp:60
-#, no-c-format
-msgid "Format"
-msgstr "قالب"
-
-#. 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 "متن"
-
-#. 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 ""
-
-#. 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 "عادی"
-
-#. 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 ""
-
-#. 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 "یکی‌شده"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
-#: rc.cpp:78
-#, no-c-format
-msgid "Side-by-side"
-msgstr "پهلو به پهلو"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
-#: libdialogpages/diffpage.cpp:251 rc.cpp:81
-#, no-c-format
-msgid "Number of context lines:"
-msgstr "تعداد خطوط متن:"
-
-#: main.cpp:33
-msgid ""
-"A program to view the differences between files and optionally generate a diff"
-msgstr "برنامه‌ای برای نمایش تفاوتهای بین پرونده‌ها و تولید یک تفاوت اختیاری"
-
-#: main.cpp:39
-msgid "This will compare URL1 with URL2"
-msgstr "نشانی وب ۱ را با نشانی وب ۲ مقایسه می‌کند"
-
-#: 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 ""
-"نشانی وب۱ را باز می‌کند و انتظار دارد که خروجی تفاوت باشد. همچنین، نشانی وب ۱ "
-"می‌تواند یک »ـ« باشد، و از یک ورودی استاندارد خوانده شود. می‌تواند به عنوان "
-"مثال برای cvs diff | kompare -o - استفاده شود. Kompare یک بررسی را برای این که "
-"ببیند آیا می‌تواند پرونده)های( اصلی را پیدا کند انجام می‌دهد، و پرونده)های( "
-"اصلی را در خروجی تفاوت ترکیب می‌کند و در مشاهده‌گر نمایش می‌دهد. -n بررسی را "
-"غیرفعال می‌کند."
-
-#: 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 ""
-"نشانی وب ۱ را در ۲ ترکیب می‌کند، انتظار می‌رود نشانی وب ۲ خروجی تفاوت و نشانی "
-"وب ۱ پرونده یا پوشه‌ای که احتیاج است در آن ترکیب شود، باشد."
-
-#: main.cpp:42
-msgid ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
-msgstr ""
-"زمانی که با گزینۀ -o، از »-« عنوان نشانی وب استفاده می‌شود، بررسی برای یافتن "
-"خودکار پرونده)های( اصلی غیرفعال می‌شو‌د."
-
-#: 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 ""
-"از این برای مشخص کردن کدبندی در زمان فراخوانی آن از سطر فرمان استفاده می‌شود. "
-"اگر مشخص نشود به طور پیش‌فرض کدبندی محلی خواهد بود."
-
-#: main.cpp:52
-msgid "Kompare"
-msgstr ""
-
-#: main.cpp:54
-msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
-msgstr ""
-
-#: main.cpp:55 main.cpp:56
-msgid "Author"
-msgstr "نویسنده"
-
-#: main.cpp:57
-msgid "Kompare icon artist"
-msgstr "هنرمند شمایل Kompare"
-
-#: main.cpp:58
-msgid "A lot of good advice"
-msgstr " نظرهای خوب بسیار"
-
-#: main.cpp:59
-msgid "Cervisia diff viewer"
-msgstr "مشاهده‌گر تفاوت Cervisia"
-
-#: kompare_shell.cpp:398 main.cpp:185
-msgid "Compare Files or Folders"
-msgstr "مقایسۀ پرونده‌ها یا پوشه‌ها"
-
-#: kompare_shell.cpp:399 main.cpp:186
-msgid "Source"
-msgstr "مبدأ"
-
-#: kompare_shell.cpp:400 main.cpp:187
-msgid "Destination"
-msgstr "مقصد"
-
-#: kompare_shell.cpp:402 main.cpp:189
-msgid "Compare"
-msgstr "مقایسه‌ کردن"
-
-#: main.cpp:189
-msgid "Compare these files or folder"
-msgstr "مقایسۀ این پرونده‌ها یا پوشه"
-
-#: 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 ""
-"اگر نام ۲ پرونده یا پوشه را در حوزه‌های محاوره وارد کنید، این دکمه فعال خواهد "
-"شد، و فشار دادن آن موجب شروع مقایسۀ پرونده‌ها و پوشه‌های وارد شده می‌شود."
-
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
msgid ""
"_: NAME OF TRANSLATORS\n"
"Your names"
msgstr "نوشین آسیایی"
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
msgid ""
"_: EMAIL OF TRANSLATORS\n"
"Your emails"
@@ -436,22 +120,47 @@ msgstr "ترکیب این پرونده یا پوشه با خروجی تفاوت"
#: 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 ""
"اگر نام یک پرونده یا پوشه و یک پرونده‌ای که حاوی خروجی تفاوت است را در حوزۀ "
"محاوره وارد کرده باشید، این دکمه فعال خواهد شد، و فشار دادن آن باعث باز شدن "
-"نمای اصلی kompare خواهد شد، که در آن خروجی پرونده یا پرونده‌ها از پوشه با خروجی "
-"تفاوت آمیخته می‌شود؛ بنابراین، بعداً می‌توانید تفاوت)ها( را در پرونده یا "
+"نمای اصلی kompare خواهد شد، که در آن خروجی پرونده یا پرونده‌ها از پوشه با "
+"خروجی تفاوت آمیخته می‌شود؛ بنابراین، بعداً می‌توانید تفاوت)ها( را در پرونده یا "
"پرونده‌ها به کار ببرید."
+#: kompare_shell.cpp:398 main.cpp:185
+msgid "Compare Files or Folders"
+msgstr "مقایسۀ پرونده‌ها یا پوشه‌ها"
+
+#: kompare_shell.cpp:399 main.cpp:186
+msgid "Source"
+msgstr "مبدأ"
+
+#: kompare_shell.cpp:400 main.cpp:187
+msgid "Destination"
+msgstr "مقصد"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
+msgstr "مقایسه‌ کردن"
+
#: kompare_shell.cpp:402
msgid "Compare these files or folders"
msgstr "مقایسۀ این پرونده‌ها یا پوشه‌ها"
+#: 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 ""
+"اگر نام ۲ پرونده یا پوشه را در حوزه‌های محاوره وارد کنید، این دکمه فعال "
+"خواهد شد، و فشار دادن آن موجب شروع مقایسۀ پرونده‌ها و پوشه‌های وارد شده می‌شود."
+
#: kompare_shell.cpp:439
msgid "Text View"
msgstr "نمای متن"
@@ -535,20 +244,230 @@ msgstr "ناشناخته"
msgid "KompareNavTreePart"
msgstr "بخش درخت ناوشگر Kompare"
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
+#: komparepart/kompare_part.cpp:165
+msgid "Save &All"
+msgstr "ذخیرۀ &همه‌"
+
+#: komparepart/kompare_part.cpp:168
+msgid "Save .&diff..."
+msgstr "ذخیرۀ &تفاوت...‌"
+
+#: komparepart/kompare_part.cpp:171
+msgid "Swap Source with Destination"
+msgstr "مبادلۀ مبدأ با مقصد"
+
+#: komparepart/kompare_part.cpp:174
+msgid "Show Statistics"
+msgstr "نمایش آمار"
+
+#: komparepart/kompare_part.cpp:269
+msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+msgstr "<qt>نشانی وب<b>%1</b> نمی‌تواند بارگذاری رو به پایین شود.</qt>"
+
+#: komparepart/kompare_part.cpp:281
+msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+msgstr "<qt>نشانی وب <b>%1</b> روی سیستم شما وجود ندارد.</qt>"
+
+#: komparepart/kompare_part.cpp:425
+msgid "Diff Options"
+msgstr "گزینه‌های تفاوت"
+
+#: komparepart/kompare_part.cpp:443
+msgid "*.diff *.dif *.patch|Patch Files"
+msgstr "*.diff *.dif *.patch|پرونده‌های کژنه"
+
+#: komparepart/kompare_part.cpp:443
+msgid "Save .diff"
+msgstr "ذخیرۀ تفاوت"
+
+#: komparepart/kompare_part.cpp:446
+msgid "The file exists or is write-protected; do you want to overwrite it?"
+msgstr "پرونده وجود دارد یا غیرقابل نوشتن است؛ می‌خواهید آن را جای‌نوشت کنید؟"
+
+#: komparepart/kompare_part.cpp:446
+msgid "File Exists"
+msgstr "پرونده وجود دارد"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Overwrite"
+msgstr "جای‌نوشت"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Do Not Overwrite"
+msgstr "جای‌نوشت نشود"
+
+#: komparepart/kompare_part.cpp:481
+msgid "KomparePart"
+msgstr "جزء Kompare"
+
+#: komparepart/kompare_part.cpp:493
+msgid "Running diff..."
+msgstr "اجرای تفاوت..."
+
+#: komparepart/kompare_part.cpp:496
+msgid "Parsing diff output..."
+msgstr "تجزیۀ خروجی تفاوت..."
+
+#: komparepart/kompare_part.cpp:545
+msgid "Comparing file %1 with file %2"
+msgstr "مقایسۀ پروندۀ %1 با پروندۀ %2"
+
+#: komparepart/kompare_part.cpp:550
+msgid "Comparing files in %1 with files in %2"
+msgstr "مقایسۀ پرونده‌ها در %1 با پرونده‌ها در %2"
+
+#: komparepart/kompare_part.cpp:555
+#, c-format
+msgid "Viewing diff output from %1"
+msgstr "مشاهدۀ خروجی تفاوت از %1"
+
+#: komparepart/kompare_part.cpp:558
+msgid "Blending diff output from %1 into file %2"
+msgstr "ترکیب خروجی تفاوت از %1 در پروندۀ %2"
+
+#: komparepart/kompare_part.cpp:563
+msgid "Blending diff output from %1 into folder %2"
+msgstr "ترکیب خروجی تفاوت از %1 در پوشۀ %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 ""
+" تغییراتی را در پرونده)های( مقصد ایجاد کرده‌اید.‌\n"
+"مایل به ذخیرۀ آنها هستید؟"
+
+#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+msgid "Save Changes?"
+msgstr " تغییرات ذخیره شود؟"
+
+#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276
+#: libdialogpages/diffpage.cpp:244
+#, no-c-format
+msgid "Unified"
+msgstr "یکی‌شده"
+
+#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244
+#: libdialogpages/diffpage.cpp:238
+#, no-c-format
+msgid "Context"
+msgstr "متن"
+
+#: komparepart/kompare_part.cpp:641 komparepart/komparesaveoptionsbase.ui:268
+#: libdialogpages/diffpage.cpp:242
+#, no-c-format
+msgid "RCS"
+msgstr ""
+
+#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252
+#: libdialogpages/diffpage.cpp:239
+#, no-c-format
+msgid "Ed"
msgstr ""
-"در اینجا می‌توانید پرونده‌هایی را که می‌خواهید مقایسه شوند را وارد کنید."
+
+#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260
+#: libdialogpages/diffpage.cpp:241
+#, no-c-format
+msgid "Normal"
+msgstr "عادی"
+
+#: komparepart/kompare_part.cpp:667
+msgid ""
+"No diff file, or no 2 files have been diffed. Therefore no stats are "
+"available."
+msgstr ""
+"هیچ پروندۀ تفاوتی نیست، یا هیچ ۲ پرونده‌ای متفاوت نیستند. بنابراین، هیچ آماری "
+"موجود نیست."
+
+#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
+#: komparepart/kompare_part.cpp:698
+msgid "Diff Statistics"
+msgstr "آمار تفاوت"
+
+#: 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 ""
+"آمار:\n"
+"‌ \n"
+"پروندۀ قدیمی: %1\n"
+"‌ پروندۀ جدید: %2\n"
+"\n"
+"قالب: %3\n"
+"تعداد کمینگاهها: %4\n"
+"تعداد تفاوتها: %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 ""
+"آمار:\n"
+"‌ \n"
+"تعداد پرونده‌ها در پروندۀ تفاوت: %1\n"
+"قالب: %2\n"
+"\n"
+"پروندۀ قدیمی جاری: %3\n"
+"پروندۀ جدید جاری: %4\n"
+"\n"
+"تعداد کمینگاهها: %5\n"
+"تعداد تفاوتها: %6"
+
+#: komparepart/kompareprefdlg.cpp:33
+msgid "Preferences"
+msgstr "تنظیمات"
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View"
+msgstr "نمای متن"
+
+#: komparepart/kompareprefdlg.cpp:39
+msgid "View Settings"
+msgstr "تنظیمات نما"
#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
msgid "Diff"
msgstr "تفاوت"
+#: komparepart/kompareprefdlg.cpp:43
+msgid "Diff Settings"
+msgstr "تنظیمات تفاوت"
+
+#: kompareurldialog.cpp:41
+#, fuzzy
+msgid "Files"
+msgstr "&پرونده‌ها‌"
+
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr "در اینجا می‌توانید پرونده‌هایی را که می‌خواهید مقایسه شوند را وارد کنید."
+
#: kompareurldialog.cpp:47
msgid "Here you can change the options for comparing the files."
msgstr "در اینجا می‌توانید گزینه‌ها را برای مقایسۀ پرونده‌ها تغییر دهید."
#: kompareurldialog.cpp:53
+#, fuzzy
+msgid "Appearance"
+msgstr "&ظاهر‌"
+
+#: kompareurldialog.cpp:53
msgid "Here you can change the options for the view."
msgstr "در اینجا می‌توانید گزینه‌های نما را تغییر دهید."
@@ -576,9 +495,9 @@ msgstr "قالب خروجی"
#: 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 ""
"قالب خروجی تولیدشده توسط تفاوت را برگزینید. یکی‌شده یکی از قالبهایی است که به "
"دلیل قابل خواندن بودن بیشتر استفاده می‌شود. توسعه‌دهندگانTDE این قالب را به "
@@ -589,14 +508,20 @@ msgstr ""
msgid "Lines of Context"
msgstr "خطوط متن"
+#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251
+#, no-c-format
+msgid "Number of context lines:"
+msgstr "تعداد خطوط متن:"
+
#: libdialogpages/diffpage.cpp:253
msgid ""
"The number of context lines is normally 2 or 3. This makes the diff readable "
"and applicable in most cases. More than 3 lines will only bloat the diff "
"unnecessarily."
msgstr ""
-"تعداد خطوط متن به طور عادی ۲ یا ۳ است. این موجب قابل خواندن و کاربردی شدن تفاوت "
-"در بسیاری از حالات خواهد شد. فقط بیش از ۳ خطط باعث بیهوده شدن تفاوت خواهد شد."
+"تعداد خطوط متن به طور عادی ۲ یا ۳ است. این موجب قابل خواندن و کاربردی شدن "
+"تفاوت در بسیاری از حالات خواهد شد. فقط بیش از ۳ خطط باعث بیهوده شدن تفاوت "
+"خواهد شد."
#: libdialogpages/diffpage.cpp:259
msgid "&Format"
@@ -643,8 +568,8 @@ msgid ""
"Add the regular expression here that you want to use\n"
"to ignore lines that match it."
msgstr ""
-"عبارت منظمی که برای چشم‌پوشی از خطوطی که با آن تطابق دارند و استفاده خواهید کرد "
-"را اینجا اضافه کنید."
+"عبارت منظمی که برای چشم‌پوشی از خطوطی که با آن تطابق دارند و استفاده خواهید "
+"کرد را اینجا اضافه کنید."
#: libdialogpages/diffpage.cpp:294
msgid "&Edit..."
@@ -712,16 +637,16 @@ msgstr "الگوی پرونده برای مستثنی کردن"
#: 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 ""
-"اگر این علامت زده شود، می‌توانید الگوی پوسته را در جعبۀ متن سمت راست وارد کنید، "
-"یا مدخلها را از فهرست برگزینید."
+"اگر این علامت زده شود، می‌توانید الگوی پوسته را در جعبۀ متن سمت راست وارد "
+"کنید، یا مدخلها را از فهرست برگزینید."
#: 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 ""
"اینجا می‌توانید یک الگوی پوسته را وارد یا حذف کنید، یا یک مدخل یا بیشتر را از "
"فهرست برگزینید."
@@ -739,16 +664,16 @@ 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 ""
"اینجا می‌توانید نشانی وب‌ یک پرونده با الگوی پوسته‌ها را برای چشم‌پوشی، هنگام "
"مقایسۀ پوشه‌ها وارد کنید."
#: 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 ""
"هر پرونده‌ای که در محاوره انتخاب می‌کنید، و زمانی که آن را فشار می‌دهید، بالا "
"پرانده می‌شود و در محاورۀ سمت چپ این دکمه قرار خواهد گرفت."
@@ -817,167 +742,269 @@ msgstr "قلم:"
msgid "Size:"
msgstr "اندازه‌:"
-#: komparepart/kompareprefdlg.cpp:33
-msgid "Preferences"
-msgstr "تنظیمات"
-
-#: komparepart/kompareprefdlg.cpp:39
-msgid "View Settings"
-msgstr "تنظیمات نما"
-
-#: komparepart/kompareprefdlg.cpp:43
-msgid "Diff Settings"
-msgstr "تنظیمات تفاوت"
+#: libdialogpages/viewpage.cpp:119
+#, fuzzy
+msgid "&Fonts"
+msgstr "قلم:"
-#: komparepart/kompare_part.cpp:165
-msgid "Save &All"
-msgstr "ذخیرۀ &همه‌"
+#: libdiff2/komparemodellist.cpp:61
+msgid "&Apply Difference"
+msgstr "&اعمال تفاوت‌"
-#: komparepart/kompare_part.cpp:168
-msgid "Save .&diff..."
-msgstr "ذخیرۀ &تفاوت...‌"
+#: libdiff2/komparemodellist.cpp:64
+msgid "Un&apply Difference"
+msgstr "تفاوت &اعمال نشود‌"
-#: komparepart/kompare_part.cpp:171
-msgid "Swap Source with Destination"
-msgstr "مبادلۀ مبدأ با مقصد"
+#: libdiff2/komparemodellist.cpp:67
+msgid "App&ly All"
+msgstr "&اعمال همه‌"
-#: komparepart/kompare_part.cpp:174
-msgid "Show Statistics"
-msgstr "نمایش آمار"
+#: libdiff2/komparemodellist.cpp:70
+msgid "&Unapply All"
+msgstr "همه &اعمال نشود‌"
-#: komparepart/kompare_part.cpp:269
-msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
-msgstr "<qt>نشانی وب<b>%1</b> نمی‌تواند بارگذاری رو به پایین شود.</qt>"
+#: libdiff2/komparemodellist.cpp:73
+msgid "P&revious File"
+msgstr "پروندۀ &قبلی‌"
-#: komparepart/kompare_part.cpp:281
-msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
-msgstr "<qt>نشانی وب <b>%1</b> روی سیستم شما وجود ندارد.</qt>"
+#: libdiff2/komparemodellist.cpp:76
+msgid "N&ext File"
+msgstr "پروندۀ &بعدی‌"
-#: komparepart/kompare_part.cpp:425
-msgid "Diff Options"
-msgstr "گزینه‌های تفاوت"
+#: libdiff2/komparemodellist.cpp:79
+msgid "&Previous Difference"
+msgstr "تفاوت &قبلی‌"
-#: komparepart/kompare_part.cpp:443
-msgid "*.diff *.dif *.patch|Patch Files"
-msgstr "*.diff *.dif *.patch|پرونده‌های کژنه"
+#: libdiff2/komparemodellist.cpp:82
+msgid "&Next Difference"
+msgstr "تفاوت &بعدی‌"
-#: komparepart/kompare_part.cpp:443
-msgid "Save .diff"
-msgstr "ذخیرۀ تفاوت"
+#: 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>هیچ مدل یا تفاوتی وجود ندارد، این پرونده <b>%1</b>،یک پروندۀ تفاوت معتبر "
+"نیست.</qt>"
-#: komparepart/kompare_part.cpp:446
-msgid "The file exists or is write-protected; do you want to overwrite it?"
-msgstr "پرونده وجود دارد یا غیرقابل نوشتن است؛ می‌خواهید آن را جای‌نوشت کنید؟"
+#: libdiff2/komparemodellist.cpp:246
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
+"qt>"
+msgstr "<qt>مسائلی در اعمال تفاوت وجود دارد<b>%1</b>به پروندۀ<b>%2</b>.</qt>"
-#: komparepart/kompare_part.cpp:446
-msgid "File Exists"
-msgstr "پرونده وجود دارد"
+#: libdiff2/komparemodellist.cpp:271
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>."
+"</qt>"
+msgstr "<qt>مسائلی در اعمال تفاوت وجود دارد <b>%1</b>به پوشۀ<b>%2</b>.</qt>"
-#: komparepart/kompare_part.cpp:446
-msgid "Overwrite"
-msgstr "جای‌نوشت"
+#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
+msgid "Could not open a temporary file."
+msgstr "نتوانست پروندۀ موقت را باز کند."
-#: komparepart/kompare_part.cpp:446
-msgid "Do Not Overwrite"
-msgstr "جای‌نوشت نشود"
+#: libdiff2/komparemodellist.cpp:350
+msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+msgstr "<qt>نتوانست در پروندۀ موقت بنویسد <b>%1</b>، حذف آن.</qt>"