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/
(cherry picked from commit 938564a538)
r14.0.x
TDE Weblate 6 years ago committed by Slávek Banko
parent ae9fc8a562
commit 4ac10974a3
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -4,15 +4,28 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: kdiff3_plugin\n" "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" "PO-Revision-Date: 2007-01-17 11:52+0200\n"
"Last-Translator: Zlatko Popov <zlatkopopov@fsa-bg.org>\n" "Last-Translator: Zlatko Popov <zlatkopopov@fsa-bg.org>\n"
"Language-Team: Bulgarian <dict@linux.zonebg.com>\n" "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
"Language: bg\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\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 #: kdiff3plugin.cpp:97
msgid "KDiff3" msgid "KDiff3"
msgstr "KDiff3" msgstr "KDiff3"
@ -39,19 +52,23 @@ msgstr "Тройно сливане с основата"
msgid "Compare with ..." msgid "Compare with ..."
msgstr "Сравняване с ..." msgstr "Сравняване с ..."
#: kdiff3plugin.cpp:137 #: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare" msgid "Compare"
msgstr "Сравняване" msgstr "Сравняване"
#: kdiff3plugin.cpp:142 #: kdiff3plugin.cpp:146
msgid "3 way comparison" msgid "3 way comparison"
msgstr "Тройно сравняване" msgstr "Тройно сравняване"
#: kdiff3plugin.cpp:145 #: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..." msgid "About KDiff3 menu plugin ..."
msgstr "Относно приставката за KDiff3 ..." msgstr "Относно приставката за KDiff3 ..."
#: kdiff3plugin.cpp:240 #: kdiff3plugin.cpp:250
msgid "" msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n" "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n" "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -61,13 +78,13 @@ msgstr ""
"Страница в Интернет: http://kdiff3.sourceforge.net\n" "Страница в Интернет: http://kdiff3.sourceforge.net\n"
"\n" "\n"
#: kdiff3plugin.cpp:242 #: kdiff3plugin.cpp:252
msgid "" msgid ""
"Using the contextmenu extension:\n" "Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\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 " "If the other file is somewhere else \"Save\" the first file for later. It "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second " "will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"file.\n" "on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and " "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 " "choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n" "destination.\n"
@ -75,9 +92,9 @@ msgid ""
msgstr "" msgstr ""
"Използване на разширението на контекстното меню:\n" "Използване на разширението на контекстното меню:\n"
"За нормално сравняване на два файла, натиснете \"Сравняване\".\n" "За нормално сравняване на два файла, натиснете \"Сравняване\".\n"
"Ако другият файл е някъде другаде, запазете първият за по-късно. Ще се появи в " "Ако другият файл е някъде другаде, запазете първият за по-късно. Ще се появи "
"подменюто \"Сравняване с...\". Тогава използвайте \"Сравняване с\" за втория " "в подменюто \"Сравняване с...\". Тогава използвайте \"Сравняване с\" за "
"файл.\n" "втория файл.\n"
"За тройно сливане първо запишете основния файл, после това, което трябва да се " "За тройно сливане първо запишете основния файл, после това, което трябва да "
"слее и натиснете \"Тройно сливане с основата\" на третия файл.\n" "се слее и натиснете \"Тройно сливане с основата\" на третия файл.\n"
"Същото важи и за сливането и сравняването на директории." "Същото важи и за сливането и сравняването на директории."

@ -1,14 +1,27 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: all2.po\n" "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" "PO-Revision-Date: 2004-09-20 15:44+0200\n"
"Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n" "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
"Language-Team: br <LL@li.org>\n" "Language-Team: br <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\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 #: kdiff3plugin.cpp:97
msgid "KDiff3" msgid "KDiff3"
msgstr "KDiff3" msgstr "KDiff3"
@ -35,32 +48,36 @@ msgstr ""
msgid "Compare with ..." msgid "Compare with ..."
msgstr "" msgstr ""
#: kdiff3plugin.cpp:137 #: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare" msgid "Compare"
msgstr "" msgstr ""
#: kdiff3plugin.cpp:142 #: kdiff3plugin.cpp:146
msgid "3 way comparison" msgid "3 way comparison"
msgstr "" msgstr ""
#: kdiff3plugin.cpp:145 #: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..." msgid "About KDiff3 menu plugin ..."
msgstr "" msgstr ""
#: kdiff3plugin.cpp:240 #: kdiff3plugin.cpp:250
msgid "" msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n" "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n" "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
"\n" "\n"
msgstr "" msgstr ""
#: kdiff3plugin.cpp:242 #: kdiff3plugin.cpp:252
msgid "" msgid ""
"Using the contextmenu extension:\n" "Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\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 " "If the other file is somewhere else \"Save\" the first file for later. It "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second " "will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"file.\n" "on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and " "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 " "choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n" "destination.\n"

@ -4,16 +4,29 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: kdiff3_plugin\n" "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" "PO-Revision-Date: 2007-01-25 19:57+0100\n"
"Last-Translator: Klára Cihlářová <koty@seznam.cz>\n" "Last-Translator: Klára Cihlářová <koty@seznam.cz>\n"
"Language-Team: Czech <cs@li.org>\n" "Language-Team: Czech <cs@li.org>\n"
"Language: cs\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n" "X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\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 #: kdiff3plugin.cpp:97
msgid "KDiff3" msgid "KDiff3"
msgstr "KDiff3" msgstr "KDiff3"
@ -40,32 +53,36 @@ msgstr ""
msgid "Compare with ..." msgid "Compare with ..."
msgstr "Porovnat s..." msgstr "Porovnat s..."
#: kdiff3plugin.cpp:137 #: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare" msgid "Compare"
msgstr "Porovnat" msgstr "Porovnat"
#: kdiff3plugin.cpp:142 #: kdiff3plugin.cpp:146
msgid "3 way comparison" msgid "3 way comparison"
msgstr "" msgstr ""
#: kdiff3plugin.cpp:145 #: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..." msgid "About KDiff3 menu plugin ..."
msgstr "" msgstr ""
#: kdiff3plugin.cpp:240 #: kdiff3plugin.cpp:250
msgid "" msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n" "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n" "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
"\n" "\n"
msgstr "" msgstr ""
#: kdiff3plugin.cpp:242 #: kdiff3plugin.cpp:252
msgid "" msgid ""
"Using the contextmenu extension:\n" "Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\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 " "If the other file is somewhere else \"Save\" the first file for later. It "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second " "will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"file.\n" "on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and " "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 " "choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n" "destination.\n"

@ -4,15 +4,28 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: kdiff3_plugin\n" "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" "PO-Revision-Date: 2006-11-19 16:31-0500\n"
"Last-Translator: Erik Kjær Pedersen <erik@binghamton.edu>\n" "Last-Translator: Erik Kjær Pedersen <erik@binghamton.edu>\n"
"Language-Team: Danish <dansk@klid.dk>\n" "Language-Team: Danish <dansk@klid.dk>\n"
"Language: da\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\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 #: kdiff3plugin.cpp:97
msgid "KDiff3" msgid "KDiff3"
msgstr "KDiff3" msgstr "KDiff3"
@ -39,19 +52,23 @@ msgstr "Trevejs sammenfletning med basis"
msgid "Compare with ..." msgid "Compare with ..."
msgstr "Sammenlign med..." msgstr "Sammenlign med..."
#: kdiff3plugin.cpp:137 #: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare" msgid "Compare"
msgstr "Sammenlign" msgstr "Sammenlign"
#: kdiff3plugin.cpp:142 #: kdiff3plugin.cpp:146
msgid "3 way comparison" msgid "3 way comparison"
msgstr "Trevejs sammenligning" msgstr "Trevejs sammenligning"
#: kdiff3plugin.cpp:145 #: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..." msgid "About KDiff3 menu plugin ..."
msgstr "Om Kdiff3-menuplugin..." msgstr "Om Kdiff3-menuplugin..."
#: kdiff3plugin.cpp:240 #: kdiff3plugin.cpp:250
msgid "" msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n" "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n" "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -61,13 +78,13 @@ msgstr ""
"Kdiff3 hjemmeside: http://kdiff3.sourceforge.net\n" "Kdiff3 hjemmeside: http://kdiff3.sourceforge.net\n"
"\n" "\n"
#: kdiff3plugin.cpp:242 #: kdiff3plugin.cpp:252
msgid "" msgid ""
"Using the contextmenu extension:\n" "Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\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 " "If the other file is somewhere else \"Save\" the first file for later. It "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second " "will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"file.\n" "on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and " "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 " "choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n" "destination.\n"
@ -75,10 +92,10 @@ msgid ""
msgstr "" msgstr ""
"Brug af udvidelsen med sammenhængsafhængig menu:\n" "Brug af udvidelsen med sammenhængsafhængig menu:\n"
"For nem sammenligning af to markerede filer, vælg \"Sammenlign\".\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 " "Hvis den andre fil findes et andet sted, \"Gem\" den første fil til senere. "
"ses i undermenuen \"Sammenlign med...\". Brug derefter \"Sammenlign med\" for " "Den ses i undermenuen \"Sammenlign med...\". Brug derefter \"Sammenlign med"
"den anden fil.\n" "\" for den anden fil.\n"
"For en trevejs sammenfletning, \"Gem\" først basisfilen, derefter grenen at " "For en trevejs sammenfletning, \"Gem\" først basisfilen, derefter grenen at "
"sammenflette, og vælg \"Trevejs sammenfletning med basis\" for den anden gren " "sammenflette, og vælg \"Trevejs sammenfletning med basis\" for den anden "
"som bruges som mål.\n" "gren som bruges som mål.\n"
"Det samme gælder også for mappesammenligning og sammenfletning." "Det samme gælder også for mappesammenligning og sammenfletning."

@ -6,16 +6,29 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: kdiff3_plugin\n" "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" "PO-Revision-Date: 2007-01-29 22:54+0100\n"
"Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n" "Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n"
"Language-Team: German <kde-i18n-de@kde.org>\n" "Language-Team: German <kde-i18n-de@kde.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n" "X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\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 #: kdiff3plugin.cpp:97
msgid "KDiff3" msgid "KDiff3"
msgstr "KDiff3" msgstr "KDiff3"
@ -42,19 +55,23 @@ msgstr "3-Wege-Vergleich mit Base"
msgid "Compare with ..." msgid "Compare with ..."
msgstr "Vergleichen mit ..." msgstr "Vergleichen mit ..."
#: kdiff3plugin.cpp:137 #: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare" msgid "Compare"
msgstr "Vergleich" msgstr "Vergleich"
#: kdiff3plugin.cpp:142 #: kdiff3plugin.cpp:146
msgid "3 way comparison" msgid "3 way comparison"
msgstr "3-Wege-Vergleich" msgstr "3-Wege-Vergleich"
#: kdiff3plugin.cpp:145 #: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..." msgid "About KDiff3 menu plugin ..."
msgstr "Über das KDiff3 Menü-Modul ..." msgstr "Über das KDiff3 Menü-Modul ..."
#: kdiff3plugin.cpp:240 #: kdiff3plugin.cpp:250
msgid "" msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n" "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n" "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -64,13 +81,13 @@ msgstr ""
"KDiff3 Internetseite: http://kdiff3.sourceforge.net\n" "KDiff3 Internetseite: http://kdiff3.sourceforge.net\n"
"\n" "\n"
#: kdiff3plugin.cpp:242 #: kdiff3plugin.cpp:252
msgid "" msgid ""
"Using the contextmenu extension:\n" "Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\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 " "If the other file is somewhere else \"Save\" the first file for later. It "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second " "will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"file.\n" "on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and " "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 " "choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n" "destination.\n"
@ -79,13 +96,13 @@ msgstr ""
"Verwendung der Kontextmenü-Erweiterung:\n" "Verwendung der Kontextmenü-Erweiterung:\n"
"Für einen einfachen Vergleich zweier ausgewählter Dateien wählen Sie " "Für einen einfachen Vergleich zweier ausgewählter Dateien wählen Sie "
"\"Vergleichen\".\n" "\"Vergleichen\".\n"
"Wenn sich die andere Datei woanders befindet, \"Speichern\" Sie die erste Datei " "Wenn sich die andere Datei woanders befindet, \"Speichern\" Sie die erste "
"zur späteren Verwendung. Sie wird im Untermenü \"Vergleichen mit ...\" " "Datei zur späteren Verwendung. Sie wird im Untermenü \"Vergleichen mit ...\" "
"erscheinen. Anschließend verwenden Sie mit der zweiten Datei die Funktion " "erscheinen. Anschließend verwenden Sie mit der zweiten Datei die Funktion "
"\"Vergleichen mit\".\n" "\"Vergleichen mit\".\n"
"Um eine 3-Wege-Zusammenführung durchzuführen, \"Speichern\" Sie die " "Um eine 3-Wege-Zusammenführung durchzuführen, \"Speichern\" Sie die Basis-"
"Basis-Datei, dann die zusammenzuführende Verzweigung und dann wählen Sie mit " "Datei, dann die zusammenzuführende Verzweigung und dann wählen Sie mit der "
"der zweiten Verzweigung die Funktion \"3-Wege-Zusammenführung mit Basis\". Das " "zweiten Verzweigung die Funktion \"3-Wege-Zusammenführung mit Basis\". Das "
"Ziel der Zusammenführung ist die zuletzt gewählte Verzweigung.\n" "Ziel der Zusammenführung ist die zuletzt gewählte Verzweigung.\n"
"Auf die gleiche Weise funktioniert auch das Vergleichen und Zusammenführen von " "Auf die gleiche Weise funktioniert auch das Vergleichen und Zusammenführen "
"Ordnern." "von Ordnern."

@ -4,15 +4,28 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: kdiff3_plugin\n" "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" "PO-Revision-Date: 2006-11-19 17:37+0200\n"
"Last-Translator: Spiros Georgaras <sngeorgaras@otenet.gr>\n" "Last-Translator: Spiros Georgaras <sngeorgaras@otenet.gr>\n"
"Language-Team: Greek <i18ngr@lists.hellug.gr>\n" "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
"Language: el\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\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 #: kdiff3plugin.cpp:97
msgid "KDiff3" msgid "KDiff3"
msgstr "KDiff3" msgstr "KDiff3"
@ -39,19 +52,23 @@ msgstr "Τριπλή συγχώνευση με βάση"
msgid "Compare with ..." msgid "Compare with ..."
msgstr "Σύγκριση με..." msgstr "Σύγκριση με..."
#: kdiff3plugin.cpp:137 #: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare" msgid "Compare"
msgstr "Σύγκριση" msgstr "Σύγκριση"
#: kdiff3plugin.cpp:142 #: kdiff3plugin.cpp:146
msgid "3 way comparison" msgid "3 way comparison"
msgstr "τριπλή σύγκριση" msgstr "τριπλή σύγκριση"
#: kdiff3plugin.cpp:145 #: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..." msgid "About KDiff3 menu plugin ..."
msgstr "Σχετικά με το πρόσθετο μενού του KDiff3..." msgstr "Σχετικά με το πρόσθετο μενού του KDiff3..."
#: kdiff3plugin.cpp:240 #: kdiff3plugin.cpp:250
msgid "" msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n" "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n" "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -61,13 +78,13 @@ msgstr ""
"Ιστοσελίδα του KDiff3: http://kdiff3.sourceforge.net\n" "Ιστοσελίδα του KDiff3: http://kdiff3.sourceforge.net\n"
"\n" "\n"
#: kdiff3plugin.cpp:242 #: kdiff3plugin.cpp:252
msgid "" msgid ""
"Using the contextmenu extension:\n" "Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\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 " "If the other file is somewhere else \"Save\" the first file for later. It "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second " "will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"file.\n" "on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and " "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 " "choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n" "destination.\n"
@ -75,10 +92,10 @@ msgid ""
msgstr "" msgstr ""
"Χρήση της επέκτασης μενού:\n" "Χρήση της επέκτασης μενού:\n"
"Για απλή σύγκριση 3 επιλεγμένων αρχείων επιλέξτε το \"Σύγκριση\".\n" "Για απλή σύγκριση 3 επιλεγμένων αρχείων επιλέξτε το \"Σύγκριση\".\n"
"Αν το δεύτερο αρχείο βρίσκεται κάπου αλλού, \"Αποθηκεύστε\" το πρώτο αρχείο για " "Αν το δεύτερο αρχείο βρίσκεται κάπου αλλού, \"Αποθηκεύστε\" το πρώτο αρχείο "
"αργότερα. Θα εμφανιστεί στο υπομενού \"Σύγκριση με...\". Στη συνέχεια " "για αργότερα. Θα εμφανιστεί στο υπομενού \"Σύγκριση με...\". Στη συνέχεια "
"χρησιμοποιήστε το \"Σύγκριση με\" στο δεύτερο αρχείο.\n" "χρησιμοποιήστε το \"Σύγκριση με\" στο δεύτερο αρχείο.\n"
"Για να κάνετε τριπλή συγχώνευση \"Αποθηκεύστε\" το αρχείο βάσης, και τον προς " "Για να κάνετε τριπλή συγχώνευση \"Αποθηκεύστε\" το αρχείο βάσης, και τον "
"συγχώνευση κλάδο και επιλέξτε \"Τριπλή συγχώνευση με βάση\" στον άλλο κλάδο, ο " "προς συγχώνευση κλάδο και επιλέξτε \"Τριπλή συγχώνευση με βάση\" στον άλλο "
"οποίος θα χρησιμοποιηθεί ως προορισμός.\n" "κλάδο, ο οποίος θα χρησιμοποιηθεί ως προορισμός.\n"
"Τα παραπάνω ισχύουν για για τη σύγκριση και συγχώνευση καταλόγων." "Τα παραπάνω ισχύουν για για τη σύγκριση και συγχώνευση καταλόγων."

@ -4,15 +4,28 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: kdiff3_plugin\n" "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" "PO-Revision-Date: 2006-12-07 02:19+0200\n"
"Last-Translator: Marek Laane <bald@starman.ee>\n" "Last-Translator: Marek Laane <bald@starman.ee>\n"
"Language-Team: Estonian <kde-et@linux.ee>\n" "Language-Team: Estonian <kde-et@linux.ee>\n"
"Language: et\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\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 #: kdiff3plugin.cpp:97
msgid "KDiff3" msgid "KDiff3"
msgstr "KDiff3" msgstr "KDiff3"
@ -39,19 +52,23 @@ msgstr "Kolme faili ühendamine baasiga"
msgid "Compare with ..." msgid "Compare with ..."
msgstr "Võrdle failiga..." msgstr "Võrdle failiga..."
#: kdiff3plugin.cpp:137 #: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare" msgid "Compare"
msgstr "Võrdle" msgstr "Võrdle"
#: kdiff3plugin.cpp:142 #: kdiff3plugin.cpp:146
msgid "3 way comparison" msgid "3 way comparison"
msgstr "Kolme faili võrdlemine" msgstr "Kolme faili võrdlemine"
#: kdiff3plugin.cpp:145 #: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..." msgid "About KDiff3 menu plugin ..."
msgstr "KDiff3 menüüplugina info..." msgstr "KDiff3 menüüplugina info..."
#: kdiff3plugin.cpp:240 #: kdiff3plugin.cpp:250
msgid "" msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n" "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n" "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -60,13 +77,13 @@ msgstr ""
"KDiff3 menüüplugin: autoriõigus (C) 2006 Joachim Eibl\n" "KDiff3 menüüplugin: autoriõigus (C) 2006 Joachim Eibl\n"
"KDiff3 kodulehekülg: http://kdiff3.sourceforge.net\n" "KDiff3 kodulehekülg: http://kdiff3.sourceforge.net\n"
#: kdiff3plugin.cpp:242 #: kdiff3plugin.cpp:252
msgid "" msgid ""
"Using the contextmenu extension:\n" "Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\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 " "If the other file is somewhere else \"Save\" the first file for later. It "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second " "will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"file.\n" "on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and " "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 " "choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n" "destination.\n"
@ -77,7 +94,7 @@ msgstr ""
"Kui teine fail asub kuskil mujal, \"salvesta\" esimene fail hilisemaks " "Kui teine fail asub kuskil mujal, \"salvesta\" esimene fail hilisemaks "
"kasutamiseks. See ilmub alammenüüsse \"Võrdle failiga...\" Seejärel kasuta " "kasutamiseks. See ilmub alammenüüsse \"Võrdle failiga...\" Seejärel kasuta "
"teise faili jaoks käsku \"Võrdle failiga\".\n" "teise faili jaoks käsku \"Võrdle failiga\".\n"
"Kolme faili ühendamiseks \"salvesta\" kõigepealt baasfail, seejärel ühendatav " "Kolme faili ühendamiseks \"salvesta\" kõigepealt baasfail, seejärel "
"variant ja vali \"Kolme faili ühendamine baasiga\" variandiga, mida kasutatakse " "ühendatav variant ja vali \"Kolme faili ühendamine baasiga\" variandiga, "
"sihtfailina.\n" "mida kasutatakse sihtfailina.\n"
"Sama käib kataloogide võrdlemise ja ühendamise kohta." "Sama käib kataloogide võrdlemise ja ühendamise kohta."

@ -1,14 +1,27 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: extragear-utils/kdiff3_plugin.po\n" "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" "PO-Revision-Date: 2006-11-19 07:45-0500\n"
"Last-Translator: Kevin Patrick Scannell <kscanne@gmail.com>\n" "Last-Translator: Kevin Patrick Scannell <kscanne@gmail.com>\n"
"Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n" "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
"Language: ga\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\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 #: kdiff3plugin.cpp:97
msgid "KDiff3" msgid "KDiff3"
msgstr "KDiff3" msgstr "KDiff3"
@ -35,19 +48,23 @@ msgstr ""
msgid "Compare with ..." msgid "Compare with ..."
msgstr "Cuir i gcomparáid le ..." msgstr "Cuir i gcomparáid le ..."
#: kdiff3plugin.cpp:137 #: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare" msgid "Compare"
msgstr "Cuir i gComparáid" msgstr "Cuir i gComparáid"
#: kdiff3plugin.cpp:142 #: kdiff3plugin.cpp:146
msgid "3 way comparison" msgid "3 way comparison"
msgstr "Comparáid trí bhealach" msgstr "Comparáid trí bhealach"
#: kdiff3plugin.cpp:145 #: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..." msgid "About KDiff3 menu plugin ..."
msgstr "" msgstr ""
#: kdiff3plugin.cpp:240 #: kdiff3plugin.cpp:250
msgid "" msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n" "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n" "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -57,13 +74,13 @@ msgstr ""
"Leathanach Baile KDiff3: http://kdiff3.sourceforge.net/\n" "Leathanach Baile KDiff3: http://kdiff3.sourceforge.net/\n"
"\n" "\n"
#: kdiff3plugin.cpp:242 #: kdiff3plugin.cpp:252
msgid "" msgid ""
"Using the contextmenu extension:\n" "Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\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 " "If the other file is somewhere else \"Save\" the first file for later. It "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second " "will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"file.\n" "on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and " "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 " "choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n" "destination.\n"

@ -4,16 +4,29 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: kdiff3_plugin\n" "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" "PO-Revision-Date: 2006-11-22 07:28+0100\n"
"Last-Translator: Federico Zenith <zenith@chemeng.ntnu.no>\n" "Last-Translator: Federico Zenith <zenith@chemeng.ntnu.no>\n"
"Language-Team: Italian <kde-i18n-it@kde.org>\n" "Language-Team: Italian <kde-i18n-it@kde.org>\n"
"Language: it\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n" "X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\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 #: kdiff3plugin.cpp:97
msgid "KDiff3" msgid "KDiff3"
msgstr "KDiff3" msgstr "KDiff3"
@ -40,36 +53,40 @@ msgstr "Fusione a tre con base"
msgid "Compare with ..." msgid "Compare with ..."
msgstr "Confronta con..." msgstr "Confronta con..."
#: kdiff3plugin.cpp:137 #: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare" msgid "Compare"
msgstr "Confronta" msgstr "Confronta"
#: kdiff3plugin.cpp:142 #: kdiff3plugin.cpp:146
msgid "3 way comparison" msgid "3 way comparison"
msgstr "Confronto a tre" msgstr "Confronto a tre"
#: kdiff3plugin.cpp:145 #: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..." msgid "About KDiff3 menu plugin ..."
msgstr "Informazioni sul plugin KDiff3 per menu..." msgstr "Informazioni sul plugin KDiff3 per menu..."
#: kdiff3plugin.cpp:240 #: kdiff3plugin.cpp:250
msgid "" msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n" "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n" "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
"\n" "\n"
msgstr "" msgstr ""
"Plugin KDiff3 per menu: Copyright 2006 Joachim Eibl\n" "Plugin KDiff3 per menu: Copyright 2006 Joachim Eibl\n"
"Pagina Web di KDiff3: <a href=\"http://kdiff3.sourceforge.net\">" "Pagina Web di KDiff3: <a href=\"http://kdiff3.sourceforge.net\">kdiff3."
"kdiff3.sourceforge.net</a>\n" "sourceforge.net</a>\n"
"\n" "\n"
#: kdiff3plugin.cpp:242 #: kdiff3plugin.cpp:252
msgid "" msgid ""
"Using the contextmenu extension:\n" "Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\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 " "If the other file is somewhere else \"Save\" the first file for later. It "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second " "will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"file.\n" "on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and " "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 " "choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n" "destination.\n"
@ -77,8 +94,9 @@ msgid ""
msgstr "" msgstr ""
"Usare l'estensione del menu contestuale:\n" "Usare l'estensione del menu contestuale:\n"
"Per un semplice confronto di due file selezionati scegli \"Confronta\".\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 " "Se l'altro file è da qualche altra parte, \"Memorizza\" il primo. Apparirà "
"sottomenu \"Confronta con...\". Poi usa \"Confronta con\" sul secondo file.\n" "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 " "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" "fondere, e scegli \"Fusione a tre con base\" sul ramo di destinazione.\n"
"Lo stesso vale per il confronto e la fusione tra cartelle." "Lo stesso vale per il confronto e la fusione tra cartelle."

@ -4,16 +4,29 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: kdiff3_plugin\n" "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" "PO-Revision-Date: 2006-11-27 00:11+0100\n"
"Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n" "Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
"Language-Team: Dutch <kde-i18n-nl@kde.org>\n" "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
"Language: nl\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n" "X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\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 #: kdiff3plugin.cpp:97
msgid "KDiff3" msgid "KDiff3"
msgstr "KDiff3" msgstr "KDiff3"
@ -40,19 +53,23 @@ msgstr "3-weg samenvoeging met basis"
msgid "Compare with ..." msgid "Compare with ..."
msgstr "Vergelijken met..." msgstr "Vergelijken met..."
#: kdiff3plugin.cpp:137 #: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare" msgid "Compare"
msgstr "Vergelijken" msgstr "Vergelijken"
#: kdiff3plugin.cpp:142 #: kdiff3plugin.cpp:146
msgid "3 way comparison" msgid "3 way comparison"
msgstr "3-weg vergelijking" msgstr "3-weg vergelijking"
#: kdiff3plugin.cpp:145 #: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..." msgid "About KDiff3 menu plugin ..."
msgstr "Info over KDiff3-menuplugin..." msgstr "Info over KDiff3-menuplugin..."
#: kdiff3plugin.cpp:240 #: kdiff3plugin.cpp:250
msgid "" msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n" "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n" "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -62,13 +79,13 @@ msgstr ""
"KDiff3-website: http://kdiff3.sourceforge.net\n" "KDiff3-website: http://kdiff3.sourceforge.net\n"
"\n" "\n"
#: kdiff3plugin.cpp:242 #: kdiff3plugin.cpp:252
msgid "" msgid ""
"Using the contextmenu extension:\n" "Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\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 " "If the other file is somewhere else \"Save\" the first file for later. It "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second " "will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"file.\n" "on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and " "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 " "choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n" "destination.\n"
@ -78,10 +95,10 @@ msgstr ""
"Voor eenvoudige vergelijking van 2 geselecteerde bestanden, kies " "Voor eenvoudige vergelijking van 2 geselecteerde bestanden, kies "
"\"Vergelijken\".\n" "\"Vergelijken\".\n"
"Als het bestand ergens anders staat, sla dan het eerste bestand voor later " "Als het bestand ergens anders staat, sla dan het eerste bestand voor later "
"gebruik op. Het zal verschijnen in het submenu \"Vergelijken met...\". Gebruik " "gebruik op. Het zal verschijnen in het submenu \"Vergelijken met...\". "
"daarna \"Vergelijken met\" voor het tweede bestand.\n" "Gebruik daarna \"Vergelijken met\" voor het tweede bestand.\n"
"Voor een 3-weg samenvoeging, sla eerst het basisbestand op, daarna de tak om " "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 " "mee samen te voegen en kies daarna \"3-weg samenvoeging met basis\" op de "
"die gebruikt zal worden als bestemming.\n" "tak die gebruikt zal worden als bestemming.\n"
"Bovenstaande is ook van toepassing op het vergelijken en samenvoegen van " "Bovenstaande is ook van toepassing op het vergelijken en samenvoegen van "
"directories." "directories."

@ -1,15 +1,28 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: kdiff3_plugin\n" "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" "PO-Revision-Date: 2006-11-19 14:49+0000\n"
"Last-Translator: José Nuno Coelho Pires <jncp@netcabo.pt>\n" "Last-Translator: José Nuno Coelho Pires <jncp@netcabo.pt>\n"
"Language-Team: pt <kde-i18n-pt@kde.org>\n" "Language-Team: pt <kde-i18n-pt@kde.org>\n"
"Language: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-POFile-SpellExtra: Eibl Joachim KDiff\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 #: kdiff3plugin.cpp:97
msgid "KDiff3" msgid "KDiff3"
msgstr "KDiff3" msgstr "KDiff3"
@ -36,19 +49,23 @@ msgstr "Junção de 3-vias com a base"
msgid "Compare with ..." msgid "Compare with ..."
msgstr "Comparar com ..." msgstr "Comparar com ..."
#: kdiff3plugin.cpp:137 #: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare" msgid "Compare"
msgstr "Comparar" msgstr "Comparar"
#: kdiff3plugin.cpp:142 #: kdiff3plugin.cpp:146
msgid "3 way comparison" msgid "3 way comparison"
msgstr "Comparação de 3 vias" msgstr "Comparação de 3 vias"
#: kdiff3plugin.cpp:145 #: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..." msgid "About KDiff3 menu plugin ..."
msgstr "Acerca do 'plugin' do menu do KDiff3 ..." msgstr "Acerca do 'plugin' do menu do KDiff3 ..."
#: kdiff3plugin.cpp:240 #: kdiff3plugin.cpp:250
msgid "" msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n" "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n" "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -58,13 +75,13 @@ msgstr ""
"Página Web do KDiff3: http://kdiff3.sourceforge.net\n" "Página Web do KDiff3: http://kdiff3.sourceforge.net\n"
"\n" "\n"
#: kdiff3plugin.cpp:242 #: kdiff3plugin.cpp:252
msgid "" msgid ""
"Using the contextmenu extension:\n" "Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\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 " "If the other file is somewhere else \"Save\" the first file for later. It "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second " "will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"file.\n" "on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and " "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 " "choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n" "destination.\n"
@ -77,6 +94,6 @@ msgstr ""
"ficheiro para mais tarde. Este irá aparecer no submenu \"Comparar Com ...\". " "ficheiro para mais tarde. Este irá aparecer no submenu \"Comparar Com ...\". "
"Depois, use o \"Comparar Com\" no segundo ficheiro.\n" "Depois, use o \"Comparar Com\" no segundo ficheiro.\n"
"Para uma junção de 3 vias, primeiro escolha \"Gravar\" o ficheiro de base, " "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 " "depois a ramificação a juntar e finalmente \"junção de 3 vias com a base\" "
"outra ramificação que será usada como destino.\n" "na outra ramificação que será usada como destino.\n"
"O mesmo se aplica também à comparação e junção de pastas." "O mesmo se aplica também à comparação e junção de pastas."

@ -4,16 +4,29 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: kdiff3_plugin\n" "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" "PO-Revision-Date: 2006-11-26 22:39-0200\n"
"Last-Translator: Diniz Bortolotto <diniz.bb@gmail.com>\n" "Last-Translator: Diniz Bortolotto <diniz.bb@gmail.com>\n"
"Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n" "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n" "X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\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 #: kdiff3plugin.cpp:97
msgid "KDiff3" msgid "KDiff3"
msgstr "KDiff3" msgstr "KDiff3"
@ -40,19 +53,23 @@ msgstr "Mesclagem de 3-vias com a base"
msgid "Compare with ..." msgid "Compare with ..."
msgstr "Comparar com ..." msgstr "Comparar com ..."
#: kdiff3plugin.cpp:137 #: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare" msgid "Compare"
msgstr "Comparar" msgstr "Comparar"
#: kdiff3plugin.cpp:142 #: kdiff3plugin.cpp:146
msgid "3 way comparison" msgid "3 way comparison"
msgstr "Comparação de 3 vias" msgstr "Comparação de 3 vias"
#: kdiff3plugin.cpp:145 #: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..." msgid "About KDiff3 menu plugin ..."
msgstr "Sobre KDiff3 menu plugin ..." msgstr "Sobre KDiff3 menu plugin ..."
#: kdiff3plugin.cpp:240 #: kdiff3plugin.cpp:250
msgid "" msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n" "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n" "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -62,13 +79,13 @@ msgstr ""
"KDiff3 homepage: http://kdiff3.sourceforge.net\n" "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
"\n" "\n"
#: kdiff3plugin.cpp:242 #: kdiff3plugin.cpp:252
msgid "" msgid ""
"Using the contextmenu extension:\n" "Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\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 " "If the other file is somewhere else \"Save\" the first file for later. It "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second " "will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"file.\n" "on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and " "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 " "choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n" "destination.\n"
@ -76,9 +93,9 @@ msgid ""
msgstr "" msgstr ""
"Usando a extensão menu de contexto:\n" "Usando a extensão menu de contexto:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\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 " "If the other file is somewhere else \"Save\" the first file for later. It "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second " "will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"file.\n" "on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and " "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 " "choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n" "destination.\n"

@ -4,16 +4,29 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: kdiff3_plugin\n" "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" "PO-Revision-Date: 2006-11-19 16:30+0100\n"
"Last-Translator: Richard Fric <Richard.Fric@kdemail.net>\n" "Last-Translator: Richard Fric <Richard.Fric@kdemail.net>\n"
"Language-Team: Slovak <sk@li.org>\n" "Language-Team: Slovak <sk@li.org>\n"
"Language: sk\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n" "X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\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 #: kdiff3plugin.cpp:97
msgid "KDiff3" msgid "KDiff3"
msgstr "KDiff3" msgstr "KDiff3"
@ -40,32 +53,36 @@ msgstr ""
msgid "Compare with ..." msgid "Compare with ..."
msgstr "" msgstr ""
#: kdiff3plugin.cpp:137 #: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare" msgid "Compare"
msgstr "" msgstr ""
#: kdiff3plugin.cpp:142 #: kdiff3plugin.cpp:146
msgid "3 way comparison" msgid "3 way comparison"
msgstr "" msgstr ""
#: kdiff3plugin.cpp:145 #: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..." msgid "About KDiff3 menu plugin ..."
msgstr "" msgstr ""
#: kdiff3plugin.cpp:240 #: kdiff3plugin.cpp:250
msgid "" msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n" "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n" "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
"\n" "\n"
msgstr "" msgstr ""
#: kdiff3plugin.cpp:242 #: kdiff3plugin.cpp:252
msgid "" msgid ""
"Using the contextmenu extension:\n" "Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\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 " "If the other file is somewhere else \"Save\" the first file for later. It "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second " "will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"file.\n" "on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and " "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 " "choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n" "destination.\n"

@ -4,15 +4,28 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: kdiff3_plugin\n" "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" "PO-Revision-Date: 2006-11-19 20:10+0100\n"
"Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n" "Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n"
"Language-Team: Swedish <sv@li.org>\n" "Language-Team: Swedish <sv@li.org>\n"
"Language: sv\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\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 #: kdiff3plugin.cpp:97
msgid "KDiff3" msgid "KDiff3"
msgstr "Kdiff3" msgstr "Kdiff3"
@ -39,19 +52,23 @@ msgstr "Trevägs sammanfogning med bas"
msgid "Compare with ..." msgid "Compare with ..."
msgstr "Jämför med..." msgstr "Jämför med..."
#: kdiff3plugin.cpp:137 #: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare" msgid "Compare"
msgstr "Jämför" msgstr "Jämför"
#: kdiff3plugin.cpp:142 #: kdiff3plugin.cpp:146
msgid "3 way comparison" msgid "3 way comparison"
msgstr "Trevägs jämförelse" msgstr "Trevägs jämförelse"
#: kdiff3plugin.cpp:145 #: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..." msgid "About KDiff3 menu plugin ..."
msgstr "Om Kdiff3-menyinsticksprogram..." msgstr "Om Kdiff3-menyinsticksprogram..."
#: kdiff3plugin.cpp:240 #: kdiff3plugin.cpp:250
msgid "" msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n" "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n" "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -61,13 +78,13 @@ msgstr ""
"Kdiff3 hemsida: http://kdiff3.sourceforge.net\n" "Kdiff3 hemsida: http://kdiff3.sourceforge.net\n"
"\n" "\n"
#: kdiff3plugin.cpp:242 #: kdiff3plugin.cpp:252
msgid "" msgid ""
"Using the contextmenu extension:\n" "Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\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 " "If the other file is somewhere else \"Save\" the first file for later. It "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second " "will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"file.\n" "on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and " "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 " "choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n" "destination.\n"
@ -76,9 +93,9 @@ msgstr ""
"Användning av utökningen med sammanhangsberoende meny:\n" "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" "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 " "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\" " "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 den andra filen.\n"
"För en trevägs sammanfogning, \"Spara\" först basfilen, därefter grenen att " "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 " "sammanfoga, och välj \"Trevägs sammanfogning med bas\" för den andra grenen "
"används som mål.\n" "som används som mål.\n"
"Detsamma gäller också för katalogjämförelse och sammanfogning." "Detsamma gäller också för katalogjämförelse och sammanfogning."

@ -4,15 +4,28 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: kdiff3_plugin\n" "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" "PO-Revision-Date: 2007-01-21 21:58+0200\n"
"Last-Translator: Engin Çağatay <engincagatay@yahoo.com>\n" "Last-Translator: Engin Çağatay <engincagatay@yahoo.com>\n"
"Language-Team: Türkçe <yerellestirme@kde.org.tr>\n" "Language-Team: Türkçe <yerellestirme@kde.org.tr>\n"
"Language: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\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 #: kdiff3plugin.cpp:97
msgid "KDiff3" msgid "KDiff3"
msgstr "KDiff3" msgstr "KDiff3"
@ -39,19 +52,23 @@ msgstr "Temel ile 3-yollu birleştirme"
msgid "Compare with ..." msgid "Compare with ..."
msgstr "Karşılaştır..." msgstr "Karşılaştır..."
#: kdiff3plugin.cpp:137 #: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare" msgid "Compare"
msgstr "Karşılaştır" msgstr "Karşılaştır"
#: kdiff3plugin.cpp:142 #: kdiff3plugin.cpp:146
msgid "3 way comparison" msgid "3 way comparison"
msgstr "3 yollu karşılaştırma" msgstr "3 yollu karşılaştırma"
#: kdiff3plugin.cpp:145 #: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..." msgid "About KDiff3 menu plugin ..."
msgstr "KDiff3 menü eklentisi hakkında ..." msgstr "KDiff3 menü eklentisi hakkında ..."
#: kdiff3plugin.cpp:240 #: kdiff3plugin.cpp:250
msgid "" msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n" "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n" "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -61,13 +78,13 @@ msgstr ""
"KDiff3 ana sayfası: http://kdiff3.sourceforge.net\n" "KDiff3 ana sayfası: http://kdiff3.sourceforge.net\n"
"\n" "\n"
#: kdiff3plugin.cpp:242 #: kdiff3plugin.cpp:252
msgid "" msgid ""
"Using the contextmenu extension:\n" "Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\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 " "If the other file is somewhere else \"Save\" the first file for later. It "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second " "will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"file.\n" "on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and " "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 " "choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n" "destination.\n"

Loading…
Cancel
Save