From f0fd2868b9a0d87c3adc50825fdef57dc4c03e35 Mon Sep 17 00:00:00 2001
From: Manoj Srivastava <srivasta@debian.org>
Date: Fri, 16 Feb 2018 16:36:57 -0800
Subject: [mster]: A new bug fixing release.

Closes: #835171
Closes: #862607
Closes: #879558
Closes: #845625
Closes: #879641
Closes: #878891
Closes: #870474

Signed-off-by: Manoj Srivastava <srivasta@debian.org>
---
 debian/po/ru.po | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

(limited to 'debian/po/ru.po')

diff --git a/debian/po/ru.po b/debian/po/ru.po
index 45bb625..b958216 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ucf 3.0028\n"
 "Report-Msgid-Bugs-To: ucf@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-07 01:28-0700\n"
+"POT-Creation-Date: 2018-02-16 15:56-0800\n"
 "PO-Revision-Date: 2014-05-07 19:10+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -73,8 +73,10 @@ msgstr "показать 3-x стороннее различие между до
 #. Choices
 #. Translators, please keep translations *short* (less than 65 columns)
 #: ../templates:3001
-msgid "do a 3-way merge between available versions (experimental)"
-msgstr "3-x стороннее слияние доступных версий (эксперимен. режим)"
+#, fuzzy
+#| msgid "show a 3-way difference between available versions"
+msgid "do a 3-way merge between available versions"
+msgstr "показать 3-x стороннее различие между доступными версиями"
 
 #. Type: select
 #. Choices
@@ -95,9 +97,7 @@ msgstr "Что нужно сделать с изменённым файлом н
 
 #. Type: select
 #. Description
-#. Type: select
-#. Description
-#: ../templates:3002 ../templates:4002
+#: ../templates:3002
 msgid ""
 "A new version (${NEW}) of configuration file ${FILE} is available, but the "
 "version installed currently has been locally modified."
@@ -105,6 +105,20 @@ msgstr ""
 "Доступна новая версия (${NEW}) файла настройки ${FILE}, но версия файла, "
 "находящаяся в системе, была изменёна локально."
 
+#. Type: select
+#. Description
+#: ../templates:4002
+#, fuzzy
+#| msgid ""
+#| "A new version (${NEW}) of configuration file ${FILE} is available, but "
+#| "the version installed currently has been locally modified."
+msgid ""
+"${BASENAME}: A new version (${NEW}) of configuration file ${FILE} is "
+"available, but the version installed currently has been locally modified."
+msgstr ""
+"Доступна новая версия (${NEW}) файла настройки ${FILE}, но версия файла, "
+"находящаяся в системе, была изменёна локально."
+
 #. Type: note
 #. Description
 #: ../templates:5001
@@ -137,6 +151,9 @@ msgstr ""
 "Файл `${dest_file}.${ERR_SUFFIX}' содержит элементы, которые не дают "
 "объединить файлы настройки."
 
+#~ msgid "do a 3-way merge between available versions (experimental)"
+#~ msgstr "3-x стороннее слияние доступных версий (эксперимен. режим)"
+
 #~ msgid ""
 #~ "A new version of configuration file ${FILE} is available, but the version "
 #~ "installed currently has been locally modified."
-- 
cgit v1.2.3