summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTDE Weblate <weblate@mirror.git.trinitydesktop.org>2018-12-27 19:21:49 +0000
committerTDE Weblate <weblate@mirror.git.trinitydesktop.org>2018-12-27 19:21:49 +0000
commit938564a5385ed796e4e68504cb9d8cb58b9c3864 (patch)
tree173b40e50dae49ccc97e36e50b3fb5a1c1f98fdb
parent7aaa41bf65b76eab6ed4cf08cf11ce54abda3f02 (diff)
downloadkdiff3-938564a5385ed796e4e68504cb9d8cb58b9c3864.tar.gz
kdiff3-938564a5385ed796e4e68504cb9d8cb58b9c3864.zip
Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: applications/kdiff3 - plugin Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-plugin/
-rw-r--r--kdiff3plugin/po/bg.po45
-rw-r--r--kdiff3plugin/po/br.po35
-rw-r--r--kdiff3plugin/po/cs.po35
-rw-r--r--kdiff3plugin/po/da.po45
-rw-r--r--kdiff3plugin/po/de.po49
-rw-r--r--kdiff3plugin/po/el.po45
-rw-r--r--kdiff3plugin/po/et.po41
-rw-r--r--kdiff3plugin/po/ga.po35
-rw-r--r--kdiff3plugin/po/it.po44
-rw-r--r--kdiff3plugin/po/nl.po43
-rw-r--r--kdiff3plugin/po/pt.po39
-rw-r--r--kdiff3plugin/po/pt_BR.po41
-rw-r--r--kdiff3plugin/po/sk.po35
-rw-r--r--kdiff3plugin/po/sv.po43
-rw-r--r--kdiff3plugin/po/tr.po35
15 files changed, 433 insertions, 177 deletions
diff --git a/kdiff3plugin/po/bg.po b/kdiff3plugin/po/bg.po
index cefa5e3..2fcf213 100644
--- a/kdiff3plugin/po/bg.po
+++ b/kdiff3plugin/po/bg.po
@@ -4,15 +4,28 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
"PO-Revision-Date: 2007-01-17 11:52+0200\n"
"Last-Translator: Zlatko Popov <zlatkopopov@fsa-bg.org>\n"
"Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
+"Language: bg\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
@@ -39,19 +52,23 @@ msgstr "Тройно сливане с основата"
msgid "Compare with ..."
msgstr "Сравняване с ..."
-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Сравняване"
-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "Тройно сравняване"
-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "Относно приставката за KDiff3 ..."
-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@@ -61,13 +78,13 @@ msgstr ""
"Страница в Интернет: http://kdiff3.sourceforge.net\n"
"\n"
-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
@@ -75,9 +92,9 @@ msgid ""
msgstr ""
"Използване на разширението на контекстното меню:\n"
"За нормално сравняване на два файла, натиснете \"Сравняване\".\n"
-"Ако другият файл е някъде другаде, запазете първият за по-късно. Ще се появи в "
-"подменюто \"Сравняване с...\". Тогава използвайте \"Сравняване с\" за втория "
-"файл.\n"
-"За тройно сливане първо запишете основния файл, после това, което трябва да се "
-"слее и натиснете \"Тройно сливане с основата\" на третия файл.\n"
+"Ако другият файл е някъде другаде, запазете първият за по-късно. Ще се появи "
+"в подменюто \"Сравняване с...\". Тогава използвайте \"Сравняване с\" за "
+"втория файл.\n"
+"За тройно сливане първо запишете основния файл, после това, което трябва да "
+"се слее и натиснете \"Тройно сливане с основата\" на третия файл.\n"
"Същото важи и за сливането и сравняването на директории."
diff --git a/kdiff3plugin/po/br.po b/kdiff3plugin/po/br.po
index 4d488e5..5da8be4 100644
--- a/kdiff3plugin/po/br.po
+++ b/kdiff3plugin/po/br.po
@@ -1,14 +1,27 @@
msgid ""
msgstr ""
"Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
"PO-Revision-Date: 2004-09-20 15:44+0200\n"
"Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
"Language-Team: br <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
@@ -35,32 +48,36 @@ msgstr ""
msgid "Compare with ..."
msgstr ""
-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr ""
-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr ""
-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr ""
-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
"\n"
msgstr ""
-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
diff --git a/kdiff3plugin/po/cs.po b/kdiff3plugin/po/cs.po
index 8d0d74b..e053352 100644
--- a/kdiff3plugin/po/cs.po
+++ b/kdiff3plugin/po/cs.po
@@ -4,16 +4,29 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
"PO-Revision-Date: 2007-01-25 19:57+0100\n"
"Last-Translator: Klára Cihlářová <koty@seznam.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
+"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
@@ -40,32 +53,36 @@ msgstr ""
msgid "Compare with ..."
msgstr "Porovnat s..."
-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Porovnat"
-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr ""
-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr ""
-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
"\n"
msgstr ""
-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
diff --git a/kdiff3plugin/po/da.po b/kdiff3plugin/po/da.po
index 1cba3cb..3ca4a65 100644
--- a/kdiff3plugin/po/da.po
+++ b/kdiff3plugin/po/da.po
@@ -4,15 +4,28 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
"PO-Revision-Date: 2006-11-19 16:31-0500\n"
"Last-Translator: Erik Kjær Pedersen <erik@binghamton.edu>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
+"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
@@ -39,19 +52,23 @@ msgstr "Trevejs sammenfletning med basis"
msgid "Compare with ..."
msgstr "Sammenlign med..."
-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Sammenlign"
-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "Trevejs sammenligning"
-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "Om Kdiff3-menuplugin..."
-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@@ -61,13 +78,13 @@ msgstr ""
"Kdiff3 hjemmeside: http://kdiff3.sourceforge.net\n"
"\n"
-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
@@ -75,10 +92,10 @@ msgid ""
msgstr ""
"Brug af udvidelsen med sammenhængsafhængig menu:\n"
"For nem sammenligning af to markerede filer, vælg \"Sammenlign\".\n"
-"Hvis den andre fil findes et andet sted, \"Gem\" den første fil til senere. Den "
-"ses i undermenuen \"Sammenlign med...\". Brug derefter \"Sammenlign med\" for "
-"den anden fil.\n"
+"Hvis den andre fil findes et andet sted, \"Gem\" den første fil til senere. "
+"Den ses i undermenuen \"Sammenlign med...\". Brug derefter \"Sammenlign med"
+"\" for den anden fil.\n"
"For en trevejs sammenfletning, \"Gem\" først basisfilen, derefter grenen at "
-"sammenflette, og vælg \"Trevejs sammenfletning med basis\" for den anden gren "
-"som bruges som mål.\n"
+"sammenflette, og vælg \"Trevejs sammenfletning med basis\" for den anden "
+"gren som bruges som mål.\n"
"Det samme gælder også for mappesammenligning og sammenfletning."
diff --git a/kdiff3plugin/po/de.po b/kdiff3plugin/po/de.po
index 6c398ed..e82e53b 100644
--- a/kdiff3plugin/po/de.po
+++ b/kdiff3plugin/po/de.po
@@ -6,16 +6,29 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
"PO-Revision-Date: 2007-01-29 22:54+0100\n"
"Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n"
"Language-Team: German <kde-i18n-de@kde.org>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
@@ -42,19 +55,23 @@ msgstr "3-Wege-Vergleich mit Base"
msgid "Compare with ..."
msgstr "Vergleichen mit ..."
-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Vergleich"
-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "3-Wege-Vergleich"
-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "Über das KDiff3 Menü-Modul ..."
-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@@ -64,13 +81,13 @@ msgstr ""
"KDiff3 Internetseite: http://kdiff3.sourceforge.net\n"
"\n"
-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
@@ -79,13 +96,13 @@ msgstr ""
"Verwendung der Kontextmenü-Erweiterung:\n"
"Für einen einfachen Vergleich zweier ausgewählter Dateien wählen Sie "
"\"Vergleichen\".\n"
-"Wenn sich die andere Datei woanders befindet, \"Speichern\" Sie die erste Datei "
-"zur späteren Verwendung. Sie wird im Untermenü \"Vergleichen mit ...\" "
+"Wenn sich die andere Datei woanders befindet, \"Speichern\" Sie die erste "
+"Datei zur späteren Verwendung. Sie wird im Untermenü \"Vergleichen mit ...\" "
"erscheinen. Anschließend verwenden Sie mit der zweiten Datei die Funktion "
"\"Vergleichen mit\".\n"
-"Um eine 3-Wege-Zusammenführung durchzuführen, \"Speichern\" Sie die "
-"Basis-Datei, dann die zusammenzuführende Verzweigung und dann wählen Sie mit "
-"der zweiten Verzweigung die Funktion \"3-Wege-Zusammenführung mit Basis\". Das "
+"Um eine 3-Wege-Zusammenführung durchzuführen, \"Speichern\" Sie die Basis-"
+"Datei, dann die zusammenzuführende Verzweigung und dann wählen Sie mit der "
+"zweiten Verzweigung die Funktion \"3-Wege-Zusammenführung mit Basis\". Das "
"Ziel der Zusammenführung ist die zuletzt gewählte Verzweigung.\n"
-"Auf die gleiche Weise funktioniert auch das Vergleichen und Zusammenführen von "
-"Ordnern."
+"Auf die gleiche Weise funktioniert auch das Vergleichen und Zusammenführen "
+"von Ordnern."
diff --git a/kdiff3plugin/po/el.po b/kdiff3plugin/po/el.po
index 651160e..af6e0fe 100644
--- a/kdiff3plugin/po/el.po
+++ b/kdiff3plugin/po/el.po
@@ -4,15 +4,28 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
"PO-Revision-Date: 2006-11-19 17:37+0200\n"
"Last-Translator: Spiros Georgaras <sngeorgaras@otenet.gr>\n"
"Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
+"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
@@ -39,19 +52,23 @@ msgstr "Τριπλή συγχώνευση με βάση"
msgid "Compare with ..."
msgstr "Σύγκριση με..."
-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Σύγκριση"
-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "τριπλή σύγκριση"
-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "Σχετικά με το πρόσθετο μενού του KDiff3..."
-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@@ -61,13 +78,13 @@ msgstr ""
"Ιστοσελίδα του KDiff3: http://kdiff3.sourceforge.net\n"
"\n"
-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
@@ -75,10 +92,10 @@ msgid ""
msgstr ""
"Χρήση της επέκτασης μενού:\n"
"Για απλή σύγκριση 3 επιλεγμένων αρχείων επιλέξτε το \"Σύγκριση\".\n"
-"Αν το δεύτερο αρχείο βρίσκεται κάπου αλλού, \"Αποθηκεύστε\" το πρώτο αρχείο για "
-"αργότερα. Θα εμφανιστεί στο υπομενού \"Σύγκριση με...\". Στη συνέχεια "
+"Αν το δεύτερο αρχείο βρίσκεται κάπου αλλού, \"Αποθηκεύστε\" το πρώτο αρχείο "
+"για αργότερα. Θα εμφανιστεί στο υπομενού \"Σύγκριση με...\". Στη συνέχεια "
"χρησιμοποιήστε το \"Σύγκριση με\" στο δεύτερο αρχείο.\n"
-"Για να κάνετε τριπλή συγχώνευση \"Αποθηκεύστε\" το αρχείο βάσης, και τον προς "
-"συγχώνευση κλάδο και επιλέξτε \"Τριπλή συγχώνευση με βάση\" στον άλλο κλάδο, ο "
-"οποίος θα χρησιμοποιηθεί ως προορισμός.\n"
+"Για να κάνετε τριπλή συγχώνευση \"Αποθηκεύστε\" το αρχείο βάσης, και τον "
+"προς συγχώνευση κλάδο και επιλέξτε \"Τριπλή συγχώνευση με βάση\" στον άλλο "
+"κλάδο, ο οποίος θα χρησιμοποιηθεί ως προορισμός.\n"
"Τα παραπάνω ισχύουν για για τη σύγκριση και συγχώνευση καταλόγων."
diff --git a/kdiff3plugin/po/et.po b/kdiff3plugin/po/et.po
index fd799a8..919bb01 100644
--- a/kdiff3plugin/po/et.po
+++ b/kdiff3plugin/po/et.po
@@ -4,15 +4,28 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
"PO-Revision-Date: 2006-12-07 02:19+0200\n"
"Last-Translator: Marek Laane <bald@starman.ee>\n"
"Language-Team: Estonian <kde-et@linux.ee>\n"
+"Language: et\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
@@ -39,19 +52,23 @@ msgstr "Kolme faili ühendamine baasiga"
msgid "Compare with ..."
msgstr "Võrdle failiga..."
-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Võrdle"
-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "Kolme faili võrdlemine"
-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "KDiff3 menüüplugina info..."
-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@@ -60,13 +77,13 @@ msgstr ""
"KDiff3 menüüplugin: autoriõigus (C) 2006 Joachim Eibl\n"
"KDiff3 kodulehekülg: http://kdiff3.sourceforge.net\n"
-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
@@ -77,7 +94,7 @@ msgstr ""
"Kui teine fail asub kuskil mujal, \"salvesta\" esimene fail hilisemaks "
"kasutamiseks. See ilmub alammenüüsse \"Võrdle failiga...\" Seejärel kasuta "
"teise faili jaoks käsku \"Võrdle failiga\".\n"
-"Kolme faili ühendamiseks \"salvesta\" kõigepealt baasfail, seejärel ühendatav "
-"variant ja vali \"Kolme faili ühendamine baasiga\" variandiga, mida kasutatakse "
-"sihtfailina.\n"
+"Kolme faili ühendamiseks \"salvesta\" kõigepealt baasfail, seejärel "
+"ühendatav variant ja vali \"Kolme faili ühendamine baasiga\" variandiga, "
+"mida kasutatakse sihtfailina.\n"
"Sama käib kataloogide võrdlemise ja ühendamise kohta."
diff --git a/kdiff3plugin/po/ga.po b/kdiff3plugin/po/ga.po
index e7860a9..76a4bd7 100644
--- a/kdiff3plugin/po/ga.po
+++ b/kdiff3plugin/po/ga.po
@@ -1,14 +1,27 @@
msgid ""
msgstr ""
"Project-Id-Version: extragear-utils/kdiff3_plugin.po\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
"PO-Revision-Date: 2006-11-19 07:45-0500\n"
"Last-Translator: Kevin Patrick Scannell <kscanne@gmail.com>\n"
"Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
+"Language: ga\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
@@ -35,19 +48,23 @@ msgstr ""
msgid "Compare with ..."
msgstr "Cuir i gcomparáid le ..."
-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Cuir i gComparáid"
-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "Comparáid trí bhealach"
-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr ""
-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@@ -57,13 +74,13 @@ msgstr ""
"Leathanach Baile KDiff3: http://kdiff3.sourceforge.net/\n"
"\n"
-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
diff --git a/kdiff3plugin/po/it.po b/kdiff3plugin/po/it.po
index dd98c15..5571e50 100644
--- a/kdiff3plugin/po/it.po
+++ b/kdiff3plugin/po/it.po
@@ -4,16 +4,29 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
"PO-Revision-Date: 2006-11-22 07:28+0100\n"
"Last-Translator: Federico Zenith <zenith@chemeng.ntnu.no>\n"
"Language-Team: Italian <kde-i18n-it@kde.org>\n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
@@ -40,36 +53,40 @@ msgstr "Fusione a tre con base"
msgid "Compare with ..."
msgstr "Confronta con..."
-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Confronta"
-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "Confronto a tre"
-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "Informazioni sul plugin KDiff3 per menu..."
-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
"\n"
msgstr ""
"Plugin KDiff3 per menu: Copyright 2006 Joachim Eibl\n"
-"Pagina Web di KDiff3: <a href=\"http://kdiff3.sourceforge.net\">"
-"kdiff3.sourceforge.net</a>\n"
+"Pagina Web di KDiff3: <a href=\"http://kdiff3.sourceforge.net\">kdiff3."
+"sourceforge.net</a>\n"
"\n"
-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
@@ -77,8 +94,9 @@ msgid ""
msgstr ""
"Usare l'estensione del menu contestuale:\n"
"Per un semplice confronto di due file selezionati scegli \"Confronta\".\n"
-"Se l'altro file è da qualche altra parte, \"Memorizza\" il primo. Apparirà nel "
-"sottomenu \"Confronta con...\". Poi usa \"Confronta con\" sul secondo file.\n"
+"Se l'altro file è da qualche altra parte, \"Memorizza\" il primo. Apparirà "
+"nel sottomenu \"Confronta con...\". Poi usa \"Confronta con\" sul secondo "
+"file.\n"
"Per una fusione a tre, prima \"Memorizza\" il file di base, poi il ramo da "
"fondere, e scegli \"Fusione a tre con base\" sul ramo di destinazione.\n"
"Lo stesso vale per il confronto e la fusione tra cartelle."
diff --git a/kdiff3plugin/po/nl.po b/kdiff3plugin/po/nl.po
index 1c8291c..ddf560a 100644
--- a/kdiff3plugin/po/nl.po
+++ b/kdiff3plugin/po/nl.po
@@ -4,16 +4,29 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
"PO-Revision-Date: 2006-11-27 00:11+0100\n"
"Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
"Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
+"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
@@ -40,19 +53,23 @@ msgstr "3-weg samenvoeging met basis"
msgid "Compare with ..."
msgstr "Vergelijken met..."
-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Vergelijken"
-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "3-weg vergelijking"
-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "Info over KDiff3-menuplugin..."
-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@@ -62,13 +79,13 @@ msgstr ""
"KDiff3-website: http://kdiff3.sourceforge.net\n"
"\n"
-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
@@ -78,10 +95,10 @@ msgstr ""
"Voor eenvoudige vergelijking van 2 geselecteerde bestanden, kies "
"\"Vergelijken\".\n"
"Als het bestand ergens anders staat, sla dan het eerste bestand voor later "
-"gebruik op. Het zal verschijnen in het submenu \"Vergelijken met...\". Gebruik "
-"daarna \"Vergelijken met\" voor het tweede bestand.\n"
+"gebruik op. Het zal verschijnen in het submenu \"Vergelijken met...\". "
+"Gebruik daarna \"Vergelijken met\" voor het tweede bestand.\n"
"Voor een 3-weg samenvoeging, sla eerst het basisbestand op, daarna de tak om "
-"mee samen te voegen en kies daarna \"3-weg samenvoeging met basis\" op de tak "
-"die gebruikt zal worden als bestemming.\n"
+"mee samen te voegen en kies daarna \"3-weg samenvoeging met basis\" op de "
+"tak die gebruikt zal worden als bestemming.\n"
"Bovenstaande is ook van toepassing op het vergelijken en samenvoegen van "
"directories."
diff --git a/kdiff3plugin/po/pt.po b/kdiff3plugin/po/pt.po
index ec8364d..52ce559 100644
--- a/kdiff3plugin/po/pt.po
+++ b/kdiff3plugin/po/pt.po
@@ -1,15 +1,28 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
"PO-Revision-Date: 2006-11-19 14:49+0000\n"
"Last-Translator: José Nuno Coelho Pires <jncp@netcabo.pt>\n"
"Language-Team: pt <kde-i18n-pt@kde.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-POFile-SpellExtra: Eibl Joachim KDiff\n"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
@@ -36,19 +49,23 @@ msgstr "Junção de 3-vias com a base"
msgid "Compare with ..."
msgstr "Comparar com ..."
-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Comparar"
-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "Comparação de 3 vias"
-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "Acerca do 'plugin' do menu do KDiff3 ..."
-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@@ -58,13 +75,13 @@ msgstr ""
"Página Web do KDiff3: http://kdiff3.sourceforge.net\n"
"\n"
-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
@@ -77,6 +94,6 @@ msgstr ""
"ficheiro para mais tarde. Este irá aparecer no submenu \"Comparar Com ...\". "
"Depois, use o \"Comparar Com\" no segundo ficheiro.\n"
"Para uma junção de 3 vias, primeiro escolha \"Gravar\" o ficheiro de base, "
-"depois a ramificação a juntar e finalmente \"junção de 3 vias com a base\" na "
-"outra ramificação que será usada como destino.\n"
+"depois a ramificação a juntar e finalmente \"junção de 3 vias com a base\" "
+"na outra ramificação que será usada como destino.\n"
"O mesmo se aplica também à comparação e junção de pastas."
diff --git a/kdiff3plugin/po/pt_BR.po b/kdiff3plugin/po/pt_BR.po
index 808af36..6e4175f 100644
--- a/kdiff3plugin/po/pt_BR.po
+++ b/kdiff3plugin/po/pt_BR.po
@@ -4,16 +4,29 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
"PO-Revision-Date: 2006-11-26 22:39-0200\n"
"Last-Translator: Diniz Bortolotto <diniz.bb@gmail.com>\n"
"Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
+"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
@@ -40,19 +53,23 @@ msgstr "Mesclagem de 3-vias com a base"
msgid "Compare with ..."
msgstr "Comparar com ..."
-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Comparar"
-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "Comparação de 3 vias"
-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "Sobre KDiff3 menu plugin ..."
-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@@ -62,13 +79,13 @@ msgstr ""
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
"\n"
-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
@@ -76,9 +93,9 @@ msgid ""
msgstr ""
"Usando a extensão menu de contexto:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
diff --git a/kdiff3plugin/po/sk.po b/kdiff3plugin/po/sk.po
index ce2e51e..2c8f56f 100644
--- a/kdiff3plugin/po/sk.po
+++ b/kdiff3plugin/po/sk.po
@@ -4,16 +4,29 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
"PO-Revision-Date: 2006-11-19 16:30+0100\n"
"Last-Translator: Richard Fric <Richard.Fric@kdemail.net>\n"
"Language-Team: Slovak <sk@li.org>\n"
+"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
@@ -40,32 +53,36 @@ msgstr ""
msgid "Compare with ..."
msgstr ""
-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr ""
-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr ""
-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr ""
-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
"\n"
msgstr ""
-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
diff --git a/kdiff3plugin/po/sv.po b/kdiff3plugin/po/sv.po
index d62d6ae..cb1c66f 100644
--- a/kdiff3plugin/po/sv.po
+++ b/kdiff3plugin/po/sv.po
@@ -4,15 +4,28 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
"PO-Revision-Date: 2006-11-19 20:10+0100\n"
"Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
+"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "Kdiff3"
@@ -39,19 +52,23 @@ msgstr "Trevägs sammanfogning med bas"
msgid "Compare with ..."
msgstr "Jämför med..."
-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Jämför"
-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "Trevägs jämförelse"
-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "Om Kdiff3-menyinsticksprogram..."
-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@@ -61,13 +78,13 @@ msgstr ""
"Kdiff3 hemsida: http://kdiff3.sourceforge.net\n"
"\n"
-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
@@ -76,9 +93,9 @@ msgstr ""
"Användning av utökningen med sammanhangsberoende meny:\n"
"För enkel jämförelse av två markerade filer, välj \"Jämför\".\n"
"Om den andra filen finns någon annanstans, \"Spara\" den först filen till "
-"senare. Den syns i undermenyn \"Jämför med...\". Använd därefter \"Jämför med\" "
-"för den andra filen.\n"
+"senare. Den syns i undermenyn \"Jämför med...\". Använd därefter \"Jämför med"
+"\" för den andra filen.\n"
"För en trevägs sammanfogning, \"Spara\" först basfilen, därefter grenen att "
-"sammanfoga, och välj \"Trevägs sammanfogning med bas\" för den andra grenen som "
-"används som mål.\n"
+"sammanfoga, och välj \"Trevägs sammanfogning med bas\" för den andra grenen "
+"som används som mål.\n"
"Detsamma gäller också för katalogjämförelse och sammanfogning."
diff --git a/kdiff3plugin/po/tr.po b/kdiff3plugin/po/tr.po
index a02241a..b1bf8e3 100644
--- a/kdiff3plugin/po/tr.po
+++ b/kdiff3plugin/po/tr.po
@@ -4,15 +4,28 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
"PO-Revision-Date: 2007-01-21 21:58+0200\n"
"Last-Translator: Engin Çağatay <engincagatay@yahoo.com>\n"
"Language-Team: Türkçe <yerellestirme@kde.org.tr>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
@@ -39,19 +52,23 @@ msgstr "Temel ile 3-yollu birleştirme"
msgid "Compare with ..."
msgstr "Karşılaştır..."
-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Karşılaştır"
-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "3 yollu karşılaştırma"
-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "KDiff3 menü eklentisi hakkında ..."
-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@@ -61,13 +78,13 @@ msgstr ""
"KDiff3 ana sayfası: http://kdiff3.sourceforge.net\n"
"\n"
-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"