summaryrefslogtreecommitdiffstats
path: root/po/ru.po
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2019-03-14 16:46:50 +0100
committerJean Delvare <jdelvare@suse.de>2019-03-14 16:46:50 +0100
commitbe54a7108e5be5a946bf25d70c2d79ad3b44746d (patch)
tree6375d704afd9f59869d88d0832a4b1605263e7bf /po/ru.po
parent2c99e786897486863df15ee39dc52c745dd32dbf (diff)
downloadquilt-be54a7108e5be5a946bf25d70c2d79ad3b44746d.tar.gz
Resync translation files
Also update one string for the setup command (one sentence removed).
Diffstat (limited to 'po/ru.po')
-rw-r--r--po/ru.po91
1 files changed, 44 insertions, 47 deletions
diff --git a/po/ru.po b/po/ru.po
index cab1da5..fee19e5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -186,7 +186,7 @@ msgstr ""
msgid "No next patch\\n"
msgstr "Отсутствует следующий патч\\n"
-#: quilt/delete.in:102 quilt/scripts/patchfns.in:603
+#: quilt/delete.in:102 quilt/scripts/patchfns.in:618
msgid "Patch %s is currently applied\\n"
msgstr "Патч %s применён\\n"
@@ -615,11 +615,11 @@ msgstr ""
"--backup\n"
"\tСоздать резервную копию старой версии патча в файле имя_патча~.\n"
-#: quilt/header.in:167
+#: quilt/header.in:170
msgid "Replaced header of patch %s\\n"
msgstr "Заменён заголовок патча %s\\n"
-#: quilt/header.in:170
+#: quilt/header.in:173
msgid "Appended text to header of patch %s\\n"
msgstr "Добавлен текст к заголовку патча %s\\n"
@@ -677,7 +677,7 @@ msgstr ""
"\tдолжна быть указана. Эта опция имеет эффект только, когда используется -"
"f.\n"
-#: quilt/import.in:73
+#: quilt/import.in:73 quilt/mail.in:463
msgid "Patch %s does not exist\\n"
msgstr "Патч %s не существует\\n"
@@ -849,27 +849,27 @@ msgstr "Вводное сообщение уже указано"
msgid "Could not determine the envelope sender address. Please use --sender."
msgstr "Не удалось определить адрес отправителя. Используйте опцию --sender."
-#: quilt/mail.in:460
+#: quilt/mail.in:466
msgid "Unable to extract a subject header from %s\\n"
msgstr "Не удалось извлечь тему письма из %s\\n"
-#: quilt/mail.in:484
+#: quilt/mail.in:492
msgid "Patches %s have duplicate subject headers.\\n"
msgstr "У патчей %s дублируются заголовки темы.\\n"
-#: quilt/mail.in:493
+#: quilt/mail.in:501
msgid "File %s does not exist\\n"
msgstr "Файл %s не существует\\n"
-#: quilt/mail.in:553
+#: quilt/mail.in:561
msgid "Introduction has no subject header (saved as %s)\\n"
msgstr "Во введении нет заголовка Subject (сохранено как %s)\\n"
-#: quilt/mail.in:556
+#: quilt/mail.in:564
msgid "Introduction has no subject header\\n"
msgstr "Во введении нет заголовка Subject\\n"
-#: quilt/mail.in:670
+#: quilt/mail.in:677
msgid "Introduction saved as %s\\n"
msgstr "Введение сохранено как %s\\n"
@@ -1030,7 +1030,7 @@ msgstr ""
"--refresh\n"
"\tАвтоматически обновить каждый патч перед его откатом.\n"
-#: quilt/pop.in:103 quilt/scripts/patchfns.in:911
+#: quilt/pop.in:103 quilt/scripts/patchfns.in:930
msgid "Failed to copy files to temporary directory\\n"
msgstr "Не удалось скопировать файлы во временную директорию\\n"
@@ -1048,7 +1048,7 @@ msgstr "Похоже, патч %s пуст, удаление\\n"
msgid "Removing patch %s\\n"
msgstr "Удаление патча %s\\n"
-#: quilt/pop.in:216 quilt/push.in:373
+#: quilt/pop.in:216 quilt/push.in:376
msgid "Options %s and %s are mutually exclusive\\n"
msgstr "Опции %s и %s — взаимоисключающие\\n"
@@ -1060,11 +1060,11 @@ msgstr "Сначала нужно обновить патч %s.\\n"
msgid "No patch removed\\n"
msgstr "Не удалено ни одного патча\\n"
-#: quilt/pop.in:272 quilt/scripts/patchfns.in:512
+#: quilt/pop.in:272 quilt/scripts/patchfns.in:527
msgid "No patches applied\\n"
msgstr "Нет применённых патчей\\n"
-#: quilt/pop.in:279 quilt/push.in:437
+#: quilt/pop.in:279 quilt/push.in:440
msgid "Now at patch %s\\n"
msgstr "Текущий патч: %s\\n"
@@ -1160,39 +1160,39 @@ msgstr ""
msgid "Interrupted by user; patch %s was not applied.\\n"
msgstr "Прервано пользователем; патч %s не был наложен.\\n"
-#: quilt/push.in:183
+#: quilt/push.in:186
msgid "Applying patch %s\\n"
msgstr "Наложение патча %s\\n"
-#: quilt/push.in:217
+#: quilt/push.in:220
msgid "Patch %s does not exist; applied empty patch\\n"
msgstr "Патч %s не существует; наложен пустой патч\\n"
-#: quilt/push.in:221
+#: quilt/push.in:224
msgid "Patch %s appears to be empty; applied\\n"
msgstr "Похоже, патч %s пуст; наложен\\n"
-#: quilt/push.in:225
+#: quilt/push.in:228
msgid "Applied patch %s (forced; needs refresh)\\n"
msgstr "Наложен патч %s (принудительно; следует сделать refresh)\\n"
-#: quilt/push.in:235
+#: quilt/push.in:238
msgid "Patch %s can be reverse-applied\\n"
msgstr "Патч %s может быть наложен в обратную сторону\\n"
-#: quilt/push.in:238
+#: quilt/push.in:241
msgid "Patch %s does not apply (enforce with -f)\\n"
msgstr "Патч %s не удаётся наложить (принудить с -f)\\n"
-#: quilt/push.in:293
+#: quilt/push.in:296
msgid "Patch %s is already applied; check your series file\\n"
msgstr "Патч %s уже наложен; проверьте свой файл series\\n"
-#: quilt/push.in:405
+#: quilt/push.in:408
msgid "The topmost patch %s needs to be refreshed first.\\n"
msgstr "Сначала необходимо обновить самый верхний патч %s.\\n"
-#: quilt/push.in:413
+#: quilt/push.in:416
msgid "No patch applied\\n"
msgstr "Нет наложенных патчей\\n"
@@ -1451,39 +1451,39 @@ msgstr "Отображаемое имя «%s» содержит непарные
msgid "Delivery address `%s' is invalid\n"
msgstr "Некорректный адрес назначения «%s»\n"
-#: quilt/scripts/patchfns.in:231 quilt/scripts/patchfns.in:525
+#: quilt/scripts/patchfns.in:243 quilt/scripts/patchfns.in:540
msgid "%s is not a regular file\\n"
msgstr "%s не является обычным файлом\\n"
-#: quilt/scripts/patchfns.in:479 quilt/scripts/patchfns.in:496
+#: quilt/scripts/patchfns.in:494 quilt/scripts/patchfns.in:511
msgid "No patches in series\\n"
msgstr "Нет патчей в файле series\\n"
-#: quilt/scripts/patchfns.in:481 quilt/scripts/patchfns.in:498
+#: quilt/scripts/patchfns.in:496 quilt/scripts/patchfns.in:513
msgid "No series file found\\n"
msgstr "Файл series не найден\\n"
-#: quilt/scripts/patchfns.in:554
+#: quilt/scripts/patchfns.in:569
msgid "Patch %s is not in series\\n"
msgstr "Патча %s нет в файле series\\n"
-#: quilt/scripts/patchfns.in:582
+#: quilt/scripts/patchfns.in:597
msgid "Patch %s is not applied\\n"
msgstr "Патч %s не наложен\\n"
-#: quilt/scripts/patchfns.in:619
+#: quilt/scripts/patchfns.in:634
msgid "File series fully applied, ends at patch %s\\n"
msgstr "Серия файлов полностью применена, заканчивается на патче %s\\n"
-#: quilt/scripts/patchfns.in:764
+#: quilt/scripts/patchfns.in:779
msgid "Diff failed on file '%s', aborting\\n"
msgstr "Не удалось выполнить diff на файле «%s», завершение\\n"
-#: quilt/scripts/patchfns.in:929
+#: quilt/scripts/patchfns.in:948
msgid "Failed to patch temporary files\\n"
msgstr "Не удалось применить патч к временным файлам\\n"
-#: quilt/scripts/patchfns.in:972
+#: quilt/scripts/patchfns.in:991
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 "
@@ -1495,15 +1495,15 @@ msgstr ""
"отмените все патчи, используя версию quilt, которая использовалась для их "
"наложения, прежде чем использовать эту версию.\\n"
-#: quilt/scripts/patchfns.in:1045
+#: quilt/scripts/patchfns.in:1064
msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n"
msgstr "Нужно установить «%s» (из пакета %s), чтобы использовать «quilt %s»\\n"
-#: quilt/scripts/patchfns.in:1124
+#: quilt/scripts/patchfns.in:1143
msgid "Cannot change into parent directory %s/\\n"
msgstr "Невозможно перейти в родительскую директорию %s/\\n"
-#: quilt/scripts/patchfns.in:1165
+#: quilt/scripts/patchfns.in:1184
msgid ""
"The working tree was created by an older version of quilt. Please run 'quilt "
"upgrade'.\\n"
@@ -1511,7 +1511,7 @@ msgstr ""
"Рабочее дерево было создано более старой версией quilt. Пожалуйста, "
"выполните «quilt upgrade».\\n"
-#: quilt/scripts/patchfns.in:1173
+#: quilt/scripts/patchfns.in:1192
msgid ""
"The series file no longer matches the applied patches. Please run 'quilt pop "
"-a'.\\n"
@@ -1585,7 +1585,7 @@ msgstr "Директория %s существует\\n"
msgid "File %s exists\\n"
msgstr "Файл %s существует\\n"
-#: quilt/setup.in:266
+#: quilt/setup.in:274
msgid ""
"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--"
"slow|--fast] {specfile|seriesfile}\\n"
@@ -1593,7 +1593,7 @@ msgstr ""
"Синтаксис: quilt setup [-d префикс-пути] [-v] [--sourcedir путь] [--fuzz=N] "
"[--slow|--fast] {файл-spec|файл-series}\\n"
-#: quilt/setup.in:269
+#: quilt/setup.in:277
msgid ""
"\n"
"Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1616,8 +1616,7 @@ msgid ""
"\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"
+"\ttarget directory.\n"
msgstr ""
"\n"
"Инициализирует дерево исходных кодов из спецификации rpm или файла series.\n"
@@ -1643,27 +1642,25 @@ msgstr ""
"--fast\tИспользовать альтернативный, более быстрый метод обработки файла "
"spec. В этом\n"
"\tрежиме rpmbuild генерирует рабочее дерево прямо в целевой директории.\n"
-"\tЕсли на ввод дан файл series, предполагается, что все архивы были\n"
-"\tуже распакованы вручную.\n"
-#: quilt/setup.in:373
+#: quilt/setup.in:380
msgid "The %%prep section of %s failed; results may be incomplete\\n"
msgstr ""
"Секция %%prep файла %s содержит ошибки; результаты могут быть незавершены\\n"
-#: quilt/setup.in:376
+#: quilt/setup.in:383
msgid "The -v option will show rpm's output\\n"
msgstr "Опция -v покажет вывод rpm\\n"
-#: quilt/setup.in:432 quilt/setup.in:444
+#: quilt/setup.in:444 quilt/setup.in:456 quilt/setup.in:467
msgid "File %s not found\\n"
msgstr "Файл %s не найден\\n"
-#: quilt/setup.in:435 quilt/setup.in:447
+#: quilt/setup.in:447 quilt/setup.in:459 quilt/setup.in:470
msgid "Unpacking archive %s\\n"
msgstr "Распаковка архива %s\\n"
-#: quilt/setup.in:457
+#: quilt/setup.in:480
msgid "Trying alternative patches and series names..."
msgstr "Попытка использовать альтернативные имена для series и patches…"