From d586a2e9e5b8a49e2936d51738c157bdbbb03b1d Mon Sep 17 00:00:00 2001
From: Jean Delvare <jdelvare@suse.de>
Date: Fri, 30 Jan 2015 15:21:12 +0100
Subject: Resync translation files

---
 po/ru.po | 166 +++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 109 insertions(+), 57 deletions(-)

(limited to 'po/ru.po')

diff --git a/po/ru.po b/po/ru.po
index fdec6f3..485e60c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -181,7 +181,7 @@ msgstr ""
 msgid "No next patch\\n"
 msgstr "Отсутствует следующий патч\\n"
 
-#: quilt/delete.in:102 quilt/scripts/patchfns.in:604
+#: quilt/delete.in:102 quilt/scripts/patchfns.in:603
 msgid "Patch %s is currently applied\\n"
 msgstr "Патч %s применён\\n"
 
@@ -325,7 +325,7 @@ msgstr "Невозможно сравнить патчи с -p%s, использ
 msgid "No snapshot to diff against\\n"
 msgstr ""
 
-#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:422
+#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:427
 msgid "Patch %s not applied before patch %s\\n"
 msgstr "Патч %s не был применён перед патчем %s\\n"
 
@@ -758,36 +758,36 @@ msgid ""
 "\tAdd the appropriate headers to reply to the specified message.\n"
 msgstr ""
 
-#: quilt/mail.in:192 quilt/mail.in:200
+#: quilt/mail.in:204 quilt/mail.in:212
 msgid "Introduction message already specified"
 msgstr ""
 
-#: quilt/mail.in:305
+#: quilt/mail.in:310
 msgid "Could not determine the envelope sender address. Please use --sender."
 msgstr ""
 
-#: quilt/mail.in:450
+#: quilt/mail.in:455
 msgid "Unable to extract a subject header from %s\\n"
 msgstr ""
 
-#: quilt/mail.in:474
+#: quilt/mail.in:479
 msgid "Patches %s have duplicate subject headers.\\n"
 msgstr ""
 
-#: quilt/mail.in:483
+#: quilt/mail.in:488
 #, fuzzy
 msgid "File %s does not exist\\n"
 msgstr "Файл %s существует\\n"
 
-#: quilt/mail.in:543
+#: quilt/mail.in:548
 msgid "Introduction has no subject header (saved as %s)\\n"
 msgstr ""
 
-#: quilt/mail.in:546
+#: quilt/mail.in:551
 msgid "Introduction has no subject header\\n"
 msgstr ""
 
-#: quilt/mail.in:660
+#: quilt/mail.in:665
 msgid "Introduction saved as %s\\n"
 msgstr ""
 
@@ -879,10 +879,12 @@ msgstr ""
 "-v\tПодробный, более дружественный вывод.\n"
 
 #: quilt/pop.in:22
-msgid "Usage: quilt pop [-afRqv] [num|patch]\\n"
+#, fuzzy
+msgid "Usage: quilt pop [-afRqv] [--refresh] [num|patch]\\n"
 msgstr "Синтаксис: quilt pop [-afRqv] [число|патч]\\n"
 
 #: quilt/pop.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Remove patch(es) from the stack of applied patches.  Without options,\n"
@@ -903,6 +905,9 @@ msgid ""
 "-q\tQuiet operation.\n"
 "\n"
 "-v\tVerbose operation.\n"
+"\n"
+"--refresh\n"
+"\tAutomatically refresh every patch before it gets unapplied.\n"
 msgstr ""
 "\n"
 "Убрать патчи из стека наложенных патчей. Если не указаны опции,\n"
@@ -923,37 +928,41 @@ msgstr ""
 "\n"
 "-v\tПодробный вывод.\n"
 
-#: quilt/pop.in:100 quilt/scripts/patchfns.in:880
+#: quilt/pop.in:103 quilt/scripts/patchfns.in:884
 msgid "Failed to copy files to temporary directory\\n"
 msgstr "Не удалось скопировать файлы во временный каталог\\n"
 
-#: quilt/pop.in:125
+#: quilt/pop.in:128
 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
 msgstr ""
 "Не удалось чисто удалить патч %s (обновите его или удалите принудительно с -"
 "f)\\n"
 
-#: quilt/pop.in:150
+#: quilt/pop.in:153
 msgid "Patch %s appears to be empty, removing\\n"
 msgstr "Похоже, патч %s пуст, удаление\\n"
 
-#: quilt/pop.in:155
+#: quilt/pop.in:158
 msgid "Removing patch %s\\n"
 msgstr "Удаление патча %s\\n"
 
-#: quilt/pop.in:226
+#: quilt/pop.in:216 quilt/push.in:373
+msgid "Options %s and %s are mutually exclusive\\n"
+msgstr ""
+
+#: quilt/pop.in:238
 msgid "Patch %s needs to be refreshed first.\\n"
 msgstr "Сначала нужно обновить патч %s.\\n"
 
-#: quilt/pop.in:236
+#: quilt/pop.in:248
 msgid "No patch removed\\n"
 msgstr "Не удалено ни одного патча\\n"
 
-#: quilt/pop.in:252 quilt/scripts/patchfns.in:513
+#: quilt/pop.in:272 quilt/scripts/patchfns.in:512
 msgid "No patches applied\\n"
 msgstr "Нет применённых патчей\\n"
 
-#: quilt/pop.in:259 quilt/push.in:422
+#: quilt/pop.in:279 quilt/push.in:437
 msgid "Now at patch %s\\n"
 msgstr "Текущий патч: %s\\n"
 
@@ -975,7 +984,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Usage: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--"
-"color[=always|auto|never]] [num|patch]\\n"
+"color[=always|auto|never]] [--refresh] [num|patch]\\n"
 msgstr "Синтаксис: quilt push [-afqv] [--leave-rejects] [число|патч]\\n"
 
 #: quilt/push.in:27
@@ -993,8 +1002,7 @@ msgid ""
 "\n"
 "-q\tQuiet operation.\n"
 "\n"
-"-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n"
-"\tapply the patch interactively: the patch utility may ask questions.\n"
+"-f\tForce apply, even if the patch has rejects.\n"
 "\n"
 "-v\tVerbose operation.\n"
 "\n"
@@ -1010,6 +1018,9 @@ msgid ""
 "\n"
 "--color[=always|auto|never]\n"
 "\tUse syntax coloring (auto activates it only if the output is a tty).\n"
+"\n"
+"--refresh\n"
+"\tAutomatically refresh every patch after it was successfully applied.\n"
 msgstr ""
 "\n"
 "Применить патчи из файла series.  Без опций накладывается следующий\n"
@@ -1033,44 +1044,49 @@ msgstr ""
 "--color[=always|auto|never]\n"
 "\tИспользовать подсветку синтаксиса.\n"
 
-#: quilt/push.in:68
+#: quilt/push.in:70
 msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr "Прервано пользователем; патч %s не был наложен.\\n"
 
-#: quilt/push.in:181
+#: quilt/push.in:183
 msgid "Applying patch %s\\n"
 msgstr "Наложение патча %s\\n"
 
-#: quilt/push.in:215
+#: quilt/push.in:217
 msgid "Patch %s does not exist; applied empty patch\\n"
 msgstr "Патч %s не существует; наложен пустой патч\\n"
 
-#: quilt/push.in:219
+#: quilt/push.in:221
 msgid "Patch %s appears to be empty; applied\\n"
 msgstr "Похоже, патч %s пуст; наложен\\n"
 
-#: quilt/push.in:223
+#: quilt/push.in:225
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr "Применён патч %s (принудительно; следует сделать refresh)\\n"
 
-#: quilt/push.in:233
+#: quilt/push.in:235
 #, fuzzy
 msgid "Patch %s can be reverse-applied\\n"
 msgstr "Патч %s применён\\n"
 
-#: quilt/push.in:236
+#: quilt/push.in:238
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr "Патч %s не применяется (принудить с -f)\\n"
 
-#: quilt/push.in:291
+#: quilt/push.in:293
 #, fuzzy
 msgid "Patch %s is already applied; check your series file\\n"
 msgstr "Патч %s уже применён\\n"
 
-#: quilt/push.in:396
+#: quilt/push.in:405
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr "Сначала необходимо обновить самый верхний патч %s.\\n"
 
+#: quilt/push.in:413
+#, fuzzy
+msgid "No patch applied\\n"
+msgstr "Нет применённых патчей\\n"
+
 #: quilt/refresh.in:22
 #, fuzzy
 msgid ""
@@ -1333,37 +1349,37 @@ msgstr "Отображаемое имя '%s' содержит непарные 
 msgid "Delivery address `%s' is invalid\n"
 msgstr "Некорректный адрес назначения '%s'\n"
 
-#: quilt/scripts/patchfns.in:232 quilt/scripts/patchfns.in:526
+#: quilt/scripts/patchfns.in:231 quilt/scripts/patchfns.in:525
 #, fuzzy
 msgid "%s is not a regular file\\n"
 msgstr "Патч %s не входит в файл series\\n"
 
-#: quilt/scripts/patchfns.in:480 quilt/scripts/patchfns.in:497
+#: quilt/scripts/patchfns.in:479 quilt/scripts/patchfns.in:496
 #, fuzzy
 msgid "No patches in series\\n"
 msgstr "Нет применённых патчей\\n"
 
-#: quilt/scripts/patchfns.in:482 quilt/scripts/patchfns.in:499
+#: quilt/scripts/patchfns.in:481 quilt/scripts/patchfns.in:498
 msgid "No series file found\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:555
+#: quilt/scripts/patchfns.in:554
 msgid "Patch %s is not in series\\n"
 msgstr "Патч %s не в серии\\n"
 
-#: quilt/scripts/patchfns.in:583
+#: quilt/scripts/patchfns.in:582
 msgid "Patch %s is not applied\\n"
 msgstr "Патч %s не применён\\n"
 
-#: quilt/scripts/patchfns.in:620
+#: quilt/scripts/patchfns.in:619
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr "Серия файлов полностью применена, заканчивается на патче %s\\n"
 
-#: quilt/scripts/patchfns.in:898
+#: quilt/scripts/patchfns.in:902
 msgid "Failed to patch temporary files\\n"
 msgstr "Не удалось применить патч к временным файлам\\n"
 
-#: quilt/scripts/patchfns.in:941
+#: quilt/scripts/patchfns.in:945
 msgid ""
 "The quilt meta-data in this tree has version %s, but this version of quilt "
 "can only handle meta-data formats up to and including version %s. Please pop "
@@ -1375,7 +1391,11 @@ msgstr ""
 "отмените все патчи, используя версию quilt, которая использовалась для их "
 "наложения, прежде чем использовать эту версию.\\n"
 
-#: quilt/scripts/patchfns.in:1094
+#: quilt/scripts/patchfns.in:1018
+msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n"
+msgstr ""
+
+#: quilt/scripts/patchfns.in:1138
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1383,6 +1403,12 @@ msgstr ""
 "Рабочее дерево было создано более старой версией quilt. Пожалуйста, "
 "выполните 'quilt upgrade'.\\n"
 
+#: quilt/scripts/patchfns.in:1146
+msgid ""
+"The series file no longer matches the applied patches. Please run 'quilt pop "
+"-a'.\\n"
+msgstr ""
+
 #: quilt/scripts/remove-trailing-ws.in:43
 #, perl-format
 msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
@@ -1439,24 +1465,23 @@ msgstr ""
 "\n"
 "-v\tПодробный, более дружественный вывод.\n"
 
-#: quilt/setup.in:35 quilt/setup.in:55
+#: quilt/setup.in:38 quilt/setup.in:58
 msgid "Directory %s exists\\n"
 msgstr "Директория %s существует\\n"
 
-#: quilt/setup.in:61
+#: quilt/setup.in:64
 msgid "File %s exists\\n"
 msgstr "Файл %s существует\\n"
 
-#: quilt/setup.in:102
+#: quilt/setup.in:264
 #, fuzzy
 msgid ""
-"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] "
-"{specfile|seriesfile}\\n"
+"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--"
+"slow|--fast] {specfile|seriesfile}\\n"
 msgstr ""
 "Синтаксис: quilt setup [-d префикс-пути] [-v] {файл-spec|файл-series}\\n"
 
-#: quilt/setup.in:105
-#, fuzzy
+#: quilt/setup.in:267
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1470,33 +1495,38 @@ msgid ""
 "\n"
 "--fuzz=N\n"
 "\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n"
-msgstr ""
 "\n"
-"Инициализирует исходное дерево из файла rpm spec или файла quilt series.\n"
+"--slow\tUse the original, slow method to process the spec file. This is the\n"
+"\tdefault for now, but that might change in the future. In this mode,\n"
+"\trpmbuild generates a working tree in a temporary directory while all\n"
+"\tits actions are recorded, and then everything is replayed from scratch\n"
+"\tin the target directory.\n"
 "\n"
-"-d\tопциональный префикс пути (поддиректория).\n"
-"\n"
-"-v\tвывод отладочной информации.\n"
+"--fast\tUse an alternative, faster method to process the spec file. In this\n"
+"\tmode, rpmbuild is told to generate a working tree directly in the\n"
+"\ttarget directory. If the input is a series file, it is assumed that\n"
+"\tall archives have been extracted manually beforehand.\n"
+msgstr ""
 
-#: quilt/setup.in:176
+#: quilt/setup.in:371
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 "Секция %%prep файла %s содержит ошибки; результаты могут быть незавершены\\n"
 
-#: quilt/setup.in:179
+#: quilt/setup.in:374
 msgid "The -v option will show rpm's output\\n"
 msgstr "Опция -v покажет вывод rpm\\n"
 
-#: quilt/setup.in:231 quilt/setup.in:243
+#: quilt/setup.in:428 quilt/setup.in:440
 #, fuzzy
 msgid "File %s not found\\n"
 msgstr "Файл %s не изменяется\\n"
 
-#: quilt/setup.in:234 quilt/setup.in:246
+#: quilt/setup.in:431 quilt/setup.in:443
 msgid "Unpacking archive %s\\n"
 msgstr "Распаковка архива %s\\n"
 
-#: quilt/setup.in:255
+#: quilt/setup.in:453
 msgid "Trying alternative patches and series names..."
 msgstr ""
 
@@ -1595,6 +1625,28 @@ msgstr ""
 "использованной при создании этого рабочего дерева, или удалите директорию %s "
 "и примените все патчи с нуля.\\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Initializes a source tree from an rpm spec file or a quilt series file.\n"
+#~ "\n"
+#~ "-d\tOptional path prefix for the resulting source tree.\n"
+#~ "\n"
+#~ "--sourcedir\n"
+#~ "\tDirectory that contains the package sources. Defaults to \\`.'.\n"
+#~ "\n"
+#~ "-v\tVerbose debug output.\n"
+#~ "\n"
+#~ "--fuzz=N\n"
+#~ "\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Инициализирует исходное дерево из файла rpm spec или файла quilt series.\n"
+#~ "\n"
+#~ "-d\tопциональный префикс пути (поддиректория).\n"
+#~ "\n"
+#~ "-v\tвывод отладочной информации.\n"
+
 #~ msgid ""
 #~ "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
 #~ msgstr "Не удалось обновить патчи с -p%s, используйте -p0 или -p1\\n"
-- 
cgit