diff options
| author | Automated System <slavek.banko@axis.cz> | 2020-01-06 01:54:22 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2020-01-06 01:54:22 +0100 |
| commit | 3f275edec4e16b53788c1e5379a4edaff7cfb975 (patch) | |
| tree | 64d244f2f6bbf3ad1a211f0a3156c29aff60d47c | |
| parent | 55db6faefeb34b6d43459d0e1ff4943537b223ca (diff) | |
| download | kdiff3-3f275edec4e16b53788c1e5379a4edaff7cfb975.tar.gz kdiff3-3f275edec4e16b53788c1e5379a4edaff7cfb975.zip | |
Merge translation files from master branch.
| -rw-r--r-- | kdiff3plugin/po/pt.po | 17 | ||||
| -rw-r--r-- | po/ru.po | 21 |
2 files changed, 22 insertions, 16 deletions
diff --git a/kdiff3plugin/po/pt.po b/kdiff3plugin/po/pt.po index 52ce559..e248bb9 100644 --- a/kdiff3plugin/po/pt.po +++ b/kdiff3plugin/po/pt.po @@ -2,26 +2,29 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3_plugin\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" +"PO-Revision-Date: 2020-01-05 23:45+0000\n" +"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n" +"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/kdiff3-plugin/pt/>\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 3.10\n" "X-POFile-SpellExtra: Eibl Joachim KDiff\n" #: _translatorinfo:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" -msgstr "" +msgstr "Hugo Carvalho" #: _translatorinfo:2 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" -msgstr "" +msgstr "hugokarvalho@hotmail.com" #: kdiff3plugin.cpp:97 msgid "KDiff3" @@ -51,7 +54,7 @@ msgstr "Comparar com ..." #: kdiff3plugin.cpp:134 msgid "Clear list" -msgstr "" +msgstr "Limpar lista" #: kdiff3plugin.cpp:141 msgid "Compare" @@ -6,14 +6,17 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" "POT-Creation-Date: 2019-01-13 19:08+0100\n" -"PO-Revision-Date: 2005-02-01 10:56+0200\n" -"Last-Translator: Nick Shaforostoff <shafff@ukr.net>\n" -"Language-Team: <kde-russian@lists.kde.ru>\n" -"Language: \n" +"PO-Revision-Date: 2020-01-05 16:07+0000\n" +"Last-Translator: Serg Bormant <bormant@mail.ru>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/applications/kdiff3/ru/>\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.9.1\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 3.10\n" #: _translatorinfo:1 msgid "" @@ -29,7 +32,7 @@ msgstr "linux@l10n.org.ua" #: diff.cpp:247 msgid "Writing clipboard data to temp file failed." -msgstr "" +msgstr "Сбой записи буфера обмена во временный файл." #: diff.cpp:251 msgid "From Clipboard" @@ -138,12 +141,12 @@ msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -"Сейчас программа работает в режиме объединения каталогов. Вы действительно " -"хотите отменить все изменения и обновить содержание каталогов?" +"Сейчас программа работает в режиме объединения каталогов. Действительно " +"отменить объединение и пересканировать каталог?" #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930 msgid "Rescan" -msgstr "Обновить" +msgstr "Пересканировать" #: directorymergewindow.cpp:335 kdiff3.cpp:622 pdiff.cpp:981 msgid "Continue Merging" |