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 /po | |
parent | 55db6faefeb34b6d43459d0e1ff4943537b223ca (diff) | |
download | kdiff3-3f275edec4e16b53788c1e5379a4edaff7cfb975.tar.gz kdiff3-3f275edec4e16b53788c1e5379a4edaff7cfb975.zip |
Merge translation files from master branch.
Diffstat (limited to 'po')
-rw-r--r-- | po/ru.po | 21 |
1 files changed, 12 insertions, 9 deletions
@@ -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" |