openSUSE Translation Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
August 2015
- 17 participants
- 272 discussions
30 Aug '15
Author: minton
Date: 2015-08-30 20:10:10 +0200 (Sun, 30 Aug 2015)
New Revision: 92432
Modified:
trunk/yast/ru/po/s390.ru.po
Log:
Merged s390.pot for ru
Modified: trunk/yast/ru/po/s390.ru.po
===================================================================
--- trunk/yast/ru/po/s390.ru.po 2015-08-30 18:10:09 UTC (rev 92431)
+++ trunk/yast/ru/po/s390.ru.po 2015-08-30 18:10:10 UTC (rev 92432)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: s390.ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-29 16:21+0100\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2014-05-26 23:34+0400\n"
"Last-Translator: Alexander Melentev <minton(a)opensuse.org>\n"
"Language-Team: Russian <opensuse-translation-ru(a)opensuse.org>\n"
@@ -42,21 +42,21 @@
msgstr "&DASD"
#. Command line help text for the Xcontroller module
-#: src/clients/dump.rb:48
+#: src/clients/dump.rb:50
msgid "Creation of S/390 dump devices"
msgstr "Создание устройств резервного копирования S/390"
#. Command line help text for the Xcontroller module
-#: src/clients/iucvterminal-server.rb:44
+#: src/clients/iucvterminal-server.rb:45
msgid "Configuration of IUCV terminal server"
msgstr "Настройка сервера терминалов IUCV"
#. Command line help text for the Xcontroller module
-#: src/clients/iucvterminal.rb:44
+#: src/clients/iucvterminal.rb:45
msgid "Configuration of IUCV terminal settings"
msgstr "Настройка параметров терминалов IUCV"
-#. Command line help text for the Xirda module
+#. Command line help text for the OnPanic module
#: src/clients/onpanic.rb:52
msgid "Configuration of OnPanic"
msgstr "Настройка OnPanic"
@@ -83,8 +83,8 @@
#. Initialization dialog contents
#. Initialization dialog contents
-#: src/clients/s390-disk-controller.rb:103
-#: src/include/s390/dasd/wizards.rb:102 src/include/s390/zfcp/wizards.rb:98
+#: src/clients/s390-disk-controller.rb:103 src/include/s390/dasd/wizards.rb:102
+#: src/include/s390/zfcp/wizards.rb:93
msgid "Initializing..."
msgstr "Инициализация..."
@@ -152,19 +152,17 @@
#. error popup message
#. error popup message
-#. error popup message
#: src/include/s390/dasd/dialogs.rb:225 src/include/s390/dasd/dialogs.rb:687
-#: src/include/s390/zfcp/dialogs.rb:471
msgid "No disk selected."
msgstr "Не выбран диск."
#. 8 means disk is not formatted
-#. unformtted disk, manual (not AutoYaS)
-#: src/include/s390/dasd/dialogs.rb:254 src/modules/DASDController.rb:161
+#. unformtted disk, manual (not AutoYaST)
+#: src/include/s390/dasd/dialogs.rb:254 src/modules/DASDController.rb:160
msgid "Device %1 is not formatted. Format device now?"
msgstr "Устройство %1 не отформатировано. Форматировать устройство?"
-#: src/include/s390/dasd/dialogs.rb:256 src/modules/DASDController.rb:163
+#: src/include/s390/dasd/dialogs.rb:256 src/modules/DASDController.rb:162
msgid "There are %1 unformatted devices. Format them now?"
msgstr "Неотформатированных устройств: %1. Форматировать?"
@@ -281,7 +279,7 @@
#. error popup
#. error popup
-#: src/include/s390/dasd/dialogs.rb:553 src/include/s390/zfcp/dialogs.rb:221
+#: src/include/s390/dasd/dialogs.rb:553 src/include/s390/zfcp/dialogs.rb:220
msgid "Invalid filter channel IDs."
msgstr "Неверный фильтр ID каналов."
@@ -292,7 +290,7 @@
#. text entry
#. combo box
-#: src/include/s390/dasd/dialogs.rb:608 src/include/s390/zfcp/dialogs.rb:301
+#: src/include/s390/dasd/dialogs.rb:608 src/include/s390/zfcp/dialogs.rb:270
msgid "&Channel ID"
msgstr "&ID канала"
@@ -317,16 +315,13 @@
#. error popup
#. error popup
-#. error popup
-#. error popup
-#: src/include/s390/dasd/dialogs.rb:648 src/include/s390/zfcp/dialogs.rb:347
-#: src/include/s390/zfcp/dialogs.rb:364 src/include/s390/zfcp/dialogs.rb:400
+#: src/include/s390/dasd/dialogs.rb:648 src/include/s390/zfcp/dialogs.rb:306
msgid "Not a valid channel ID."
msgstr "Неверный ID канала."
#. error popup
#. error popup
-#: src/include/s390/dasd/dialogs.rb:658 src/include/s390/zfcp/dialogs.rb:428
+#: src/include/s390/dasd/dialogs.rb:658 src/include/s390/zfcp/dialogs.rb:315
msgid "Device already exists."
msgstr "Устройство уже существует."
@@ -449,7 +444,7 @@
#. Initialization dialog caption
#. Initialization dialog caption
-#: src/include/s390/dasd/wizards.rb:100 src/include/s390/zfcp/wizards.rb:96
+#: src/include/s390/dasd/wizards.rb:100 src/include/s390/zfcp/wizards.rb:91
msgid "Controller Configuration"
msgstr "Настройка контроллера"
@@ -1199,9 +1194,13 @@
msgid "LUN"
msgstr "LUN"
+#. dialog caption
+#: src/include/s390/zfcp/dialogs.rb:248
+msgid "Add New ZFCP Device"
+msgstr "Добавить новое устройство ZFCP"
+
#. yes-no popup
-#. yes-no popup
-#: src/include/s390/zfcp/dialogs.rb:238 src/include/s390/zfcp/dialogs.rb:387
+#: src/include/s390/zfcp/dialogs.rb:295
msgid ""
"Really leave the ZFCP device configuration without saving?\n"
"All changes will be lost."
@@ -1209,42 +1208,6 @@
"Действительно выйти из настройки устройства ZFCP без сохранения?\n"
"Все изменения будут утеряны."
-#. dialog caption
-#: src/include/s390/zfcp/dialogs.rb:259
-msgid "Add New ZFCP Device"
-msgstr "Добавить новое устройство ZFCP"
-
-#. combo box
-#: src/include/s390/zfcp/dialogs.rb:307
-msgid "&WWPN"
-msgstr "&WWPN"
-
-#. push button
-#: src/include/s390/zfcp/dialogs.rb:311
-msgid "Get WWPNs"
-msgstr "Получить WWPNы"
-
-#. combobox
-#: src/include/s390/zfcp/dialogs.rb:316
-msgid "&LUN"
-msgstr "&LUN"
-
-#. push button
-#: src/include/s390/zfcp/dialogs.rb:320
-msgid "Get LUNs"
-msgstr "Получить LUNы"
-
-#. error popup
-#. error popup
-#: src/include/s390/zfcp/dialogs.rb:372 src/include/s390/zfcp/dialogs.rb:408
-msgid "The entered WWPN is invalid."
-msgstr "Введенный WWPN недействителен."
-
-#. error popup
-#: src/include/s390/zfcp/dialogs.rb:416
-msgid "The entered LUN is invalid."
-msgstr "Введенный LUN неверен."
-
#. Read dialog help 1/2
#: src/include/s390/zfcp/helps.rb:36
msgid ""
@@ -1288,11 +1251,11 @@
#. Disk selection dialog Warning
#. Disk selection dialog Warning
-#: src/include/s390/zfcp/helps.rb:64 src/include/s390/zfcp/helps.rb:87
+#: src/include/s390/zfcp/helps.rb:64 src/include/s390/zfcp/helps.rb:81
msgid "<h1>Warning</h1>"
msgstr "<h1>Предупреждение</h1>"
-#: src/include/s390/zfcp/helps.rb:65 src/include/s390/zfcp/helps.rb:88
+#: src/include/s390/zfcp/helps.rb:65 src/include/s390/zfcp/helps.rb:82
msgid ""
"<p>When accessing a ZFCP device\n"
"<b>READ</b>/<b>WRITE</b>, make sure that this access is exclusive.\n"
@@ -1304,125 +1267,110 @@
#. Disk add help 1/2
#: src/include/s390/zfcp/helps.rb:71
+#, fuzzy
+#| msgid ""
+#| "<p><b><big>Add New DASD Disk</big></b><br>\n"
+#| "To add a disk, enter the <b>Channel ID</b> of the DASD disk as\n"
+#| "identifier.</p>"
msgid ""
"<p><b><big>Add New ZFCP Device</big></b><br>\n"
-"Enter the identifier of the device to add, the\n"
-"<b>Channel ID</b> of the ZFCP controller, the worldwide port number\n"
-"(<b>WWPN</b>) and the <b>LUN</b> number.</p>\n"
+"Enter the <b>Channel ID</b> of the ZFCP controller.\n"
msgstr ""
-"<p><b><big>Добавить новое устройство ZFCP</big></b><br>\n"
-"Введите идентификатор добавляемого устройства. Введите\n"
-"<b>ID канала</b> контроллера ZFCP, номер порта\n"
-"(<b>WWPN</b>) и номер <b>LUN</b>.</p>\n"
+"<p><b><big>Добавить новый диск DASD</big></b><br>\n"
+"Для добавления диска введите в качестве идентификатора <b>ID канала</b>\n"
+"диска DASD.</p>"
#. Disk add help 2/2, This is HTML, so finally "<devno>" is displayed as "<devno>"
-#: src/include/s390/zfcp/helps.rb:78
+#: src/include/s390/zfcp/helps.rb:76
msgid ""
"<p>The <b>Channel ID</b> must be entered with lowercase letters in a sysfs conforming\n"
"format 0.0.<devno>, such as <tt>0.0.5c51</tt>.</p>\n"
-"<p>The WWPN must be entered with lowercase letters as a 16-digit hex value, such as\n"
-"<tt>0x5005076300c40e5a</tt>.</p>\n"
-"<p>The LUN must be entered with lowercase letters as a 16-digit hex value with\n"
-"all trailing zeros, such as <tt>0x52ca000000000000</tt>.</p>"
msgstr ""
-"<p><b>ID канала</b> должен быть введён маленькими буквами в соответствии с форматом\n"
-"sysfs 0.0.<номер_устройства>, например <tt>0.0.5c51</tt>.</p>\n"
-"<p>WWPN должен быть введён маленькими буквами как шестнадцатеричное число из 16 цифр,\n"
-"например <tt>0x5005076300c40e5a</tt>.</p>\n"
-"<p>LUN должен быть введён маленькими буквами как шестнадцатеричное число из 16 цифр\n"
-"со всеми замыкающими нулями, например <tt>0x52ca000000000000</tt>.</p>"
#. popup label
#. popup label
-#: src/modules/DASDController.rb:188 src/modules/ZFCPController.rb:161
+#: src/modules/DASDController.rb:187 src/modules/ZFCPController.rb:161
msgid "Running mkinitrd."
msgstr "Запуск mkinitrd."
#. Create a textual summary and a list of configured devices
#. @return summary of the current configuration
-#: src/modules/DASDController.rb:334
+#: src/modules/DASDController.rb:333
msgid "Channel ID: %1, Format: %2, DIAG: %3"
msgstr "Идентификатор канала: %1, Форматировать: %2, DIAG: %3"
-#: src/modules/DASDController.rb:347
+#: src/modules/DASDController.rb:346
msgid "Channel ID: %1, Device: %2, DIAG: %3"
msgstr "Идентификатор канала: %1, Устройство: %2, DIAG: %3"
#. popup label
-#: src/modules/DASDController.rb:382
+#: src/modules/DASDController.rb:381
msgid "Reading Configured DASD Disks"
msgstr "Чтение настроенных дисков DASD"
#. error report, %1 is device identification
#. error report, %1 is device identification
-#. error report, %1 is device identification
-#: src/modules/DASDController.rb:473 src/modules/ZFCPController.rb:422
-#: src/modules/ZFCPController.rb:516
+#: src/modules/DASDController.rb:472 src/modules/ZFCPController.rb:432
msgid "%1: sysfs not mounted."
msgstr "%1: sysfs не смонтирован."
#. error report, %1 is device identification
#. error report, %1 is device identification
-#. error report, %1 is device identification
-#: src/modules/DASDController.rb:481 src/modules/ZFCPController.rb:430
-#: src/modules/ZFCPController.rb:524
+#: src/modules/DASDController.rb:480 src/modules/ZFCPController.rb:440
msgid "%1: Invalid status for <online>."
msgstr "%1: Неверное состояние для <online>."
#. error report, %1 is device identification
-#. error report, %1 is device identification
-#: src/modules/DASDController.rb:489 src/modules/ZFCPController.rb:438
+#: src/modules/DASDController.rb:488
msgid "%1: No device found for <ccwid>."
msgstr "%1: Не обнаружено устройств для <ccwid>."
#. error report, %1 is device identification
-#: src/modules/DASDController.rb:497
+#: src/modules/DASDController.rb:496
msgid "%1: Could not change state of the device."
msgstr "%1: Не удалось изменить состояние устройства."
#. error report, %1 is device identification
-#: src/modules/DASDController.rb:506
+#: src/modules/DASDController.rb:505
msgid "%1: Device is not a DASD."
msgstr "%1: это не DASD-устройство."
#. error report, %1 is device identification
-#: src/modules/DASDController.rb:515
+#: src/modules/DASDController.rb:514
msgid "%1: Could not load module."
msgstr "%1: Невозможно загрузить модуль."
#. error report, %1 is device identification
-#: src/modules/DASDController.rb:524
+#: src/modules/DASDController.rb:523
msgid "%1: Failed to activate DASD."
msgstr "%1: Сбой включения DASD."
#. error report, %1 is device identification
-#: src/modules/DASDController.rb:533
+#: src/modules/DASDController.rb:532
msgid "%1: DASD is not formatted."
msgstr "%1: DASD не отформатирован."
#. error report, %1 is device identification, %2 is integer code
#. error report, %1 is device identification, %2 is integer code
-#. error report, %1 is device identification, %2 is integer code
-#: src/modules/DASDController.rb:541 src/modules/ZFCPController.rb:494
-#: src/modules/ZFCPController.rb:564
+#: src/modules/DASDController.rb:540 src/modules/ZFCPController.rb:480
msgid "%1: Unknown error %2."
msgstr "%1: Неизвестная ошибка %2."
#. progress bar
-#: src/modules/DASDController.rb:654
+#: src/modules/DASDController.rb:653
msgid "Formatting %1:"
msgstr "Форматирование %1:"
#. error report, %1 is exit code of the command (integer)
#. error report, %1 is exit code of the command (integer)
-#: src/modules/DASDController.rb:683 src/modules/DASDController.rb:780
+#: src/modules/DASDController.rb:682 src/modules/DASDController.rb:779
msgid "Disks formatting failed. Exit code: %1."
msgstr "Не удалось отформатировать диски. Код выхода: %1."
#. progress bar, %1 is device name, %2 and %3
#. integers,
#. eg. Formatting /dev/dasda: cylinder 123 of 12334 done
-#: src/modules/DASDController.rb:751
+#: src/modules/DASDController.rb:750
msgid "Formatting %1: cylinder %2 of %3 done"
msgstr "Форматирование %1: сделано цилиндров %2 из %3"
@@ -1707,69 +1655,108 @@
#. Create a textual summary and a list of configured devices
#. @return summary of the current configuration
-#: src/modules/ZFCPController.rb:302
+#: src/modules/ZFCPController.rb:292
msgid "Channel ID: %1, WWPN: %2, LUN: %3"
msgstr "Идентификатор канала: %1, WWPN: %2, LUN: %3"
-#: src/modules/ZFCPController.rb:311
+#: src/modules/ZFCPController.rb:301
msgid "Channel ID: %1, WWPN: %2, LUN: %3, Device: %4"
msgstr "Идентификатор канала: %1, WWPN: %2, LUN: %3, устройство: %4"
+#. TRANSLATORS: warning message
+#: src/modules/ZFCPController.rb:360
+msgid ""
+"Cannot evaluate ZFCP controllers (e.g. in LPAR).\n"
+"You will have to set it manually."
+msgstr ""
+
#. popup label
-#: src/modules/ZFCPController.rb:367
+#: src/modules/ZFCPController.rb:378
msgid "Reading Configured ZFCP Devices"
msgstr "Чтение настроенных устройств ZFCP"
#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:446
-msgid "%1: WWPN invalid."
-msgstr "%1: недопустимый WWPN."
-
-#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:454
-msgid "%1: Could not activate WWPN for adapter %1."
-msgstr "%1: Не удалось активировать WWPN для адаптера %1."
-
-#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:462
-msgid "%1: Could not activate ZFCP device."
-msgstr "%1: Не удалось активировать устройство ZFCP."
-
-#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:470
-msgid "%1: SCSI disk could not be deactivated."
-msgstr "%1: Не удалось деактивировать диск SCSI."
-
-#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:478
-msgid "%1: LUN could not be unregistered."
-msgstr "%1: Не удалось снять регистрацию LUN."
-
-#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:486
-msgid "%1: WWPN could not be unregistered."
-msgstr "%1: Не удалось снять регистрацию WWPN."
-
-#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:532
+#: src/modules/ZFCPController.rb:448
msgid "%1: Device <ccwid> does not exist."
msgstr "%1: Устройство <ccwid> не существует."
#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:540
+#: src/modules/ZFCPController.rb:456
msgid "%1: Module zfcp could not be loaded."
msgstr "%1: Не удалось загрузить модуль zfcp."
#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:548
+#: src/modules/ZFCPController.rb:464
msgid "%1: Adapter status could not be changed."
msgstr "%1: Не удалось изменить состояние адаптера."
#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:556
+#: src/modules/ZFCPController.rb:472
msgid "%1: WWPN ports still active."
msgstr "%1: Порты WWPN по-прежнему активны."
+#~ msgid "&WWPN"
+#~ msgstr "&WWPN"
+
+#~ msgid "Get WWPNs"
+#~ msgstr "Получить WWPNы"
+
+#~ msgid "&LUN"
+#~ msgstr "&LUN"
+
+#~ msgid "Get LUNs"
+#~ msgstr "Получить LUNы"
+
+#~ msgid "The entered WWPN is invalid."
+#~ msgstr "Введенный WWPN недействителен."
+
+#~ msgid "The entered LUN is invalid."
+#~ msgstr "Введенный LUN неверен."
+
+#~ msgid ""
+#~ "<p><b><big>Add New ZFCP Device</big></b><br>\n"
+#~ "Enter the identifier of the device to add, the\n"
+#~ "<b>Channel ID</b> of the ZFCP controller, the worldwide port number\n"
+#~ "(<b>WWPN</b>) and the <b>LUN</b> number.</p>\n"
+#~ msgstr ""
+#~ "<p><b><big>Добавить новое устройство ZFCP</big></b><br>\n"
+#~ "Введите идентификатор добавляемого устройства. Введите\n"
+#~ "<b>ID канала</b> контроллера ZFCP, номер порта\n"
+#~ "(<b>WWPN</b>) и номер <b>LUN</b>.</p>\n"
+
+#~ msgid ""
+#~ "<p>The <b>Channel ID</b> must be entered with lowercase letters in a sysfs conforming\n"
+#~ "format 0.0.<devno>, such as <tt>0.0.5c51</tt>.</p>\n"
+#~ "<p>The WWPN must be entered with lowercase letters as a 16-digit hex value, such as\n"
+#~ "<tt>0x5005076300c40e5a</tt>.</p>\n"
+#~ "<p>The LUN must be entered with lowercase letters as a 16-digit hex value with\n"
+#~ "all trailing zeros, such as <tt>0x52ca000000000000</tt>.</p>"
+#~ msgstr ""
+#~ "<p><b>ID канала</b> должен быть введён маленькими буквами в соответствии с форматом\n"
+#~ "sysfs 0.0.<номер_устройства>, например <tt>0.0.5c51</tt>.</p>\n"
+#~ "<p>WWPN должен быть введён маленькими буквами как шестнадцатеричное число из 16 цифр,\n"
+#~ "например <tt>0x5005076300c40e5a</tt>.</p>\n"
+#~ "<p>LUN должен быть введён маленькими буквами как шестнадцатеричное число из 16 цифр\n"
+#~ "со всеми замыкающими нулями, например <tt>0x52ca000000000000</tt>.</p>"
+
+#~ msgid "%1: WWPN invalid."
+#~ msgstr "%1: недопустимый WWPN."
+
+#~ msgid "%1: Could not activate WWPN for adapter %1."
+#~ msgstr "%1: Не удалось активировать WWPN для адаптера %1."
+
+#~ msgid "%1: Could not activate ZFCP device."
+#~ msgstr "%1: Не удалось активировать устройство ZFCP."
+
+#~ msgid "%1: SCSI disk could not be deactivated."
+#~ msgstr "%1: Не удалось деактивировать диск SCSI."
+
+#~ msgid "%1: LUN could not be unregistered."
+#~ msgstr "%1: Не удалось снять регистрацию LUN."
+
+#~ msgid "%1: WWPN could not be unregistered."
+#~ msgstr "%1: Не удалось снять регистрацию WWPN."
+
#~ msgid "Select I&nstance"
#~ msgstr "Выберите эк&земпляр"
1
0
30 Aug '15
Author: minton
Date: 2015-08-30 20:10:09 +0200 (Sun, 30 Aug 2015)
New Revision: 92431
Modified:
trunk/yast/ru/po/relocation-server.ru.po
Log:
Merged relocation-server.pot for ru
Modified: trunk/yast/ru/po/relocation-server.ru.po
===================================================================
--- trunk/yast/ru/po/relocation-server.ru.po 2015-08-30 18:10:07 UTC (rev 92430)
+++ trunk/yast/ru/po/relocation-server.ru.po 2015-08-30 18:10:09 UTC (rev 92431)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:53+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2014-03-27 21:53+0400\n"
"Last-Translator: Alexander Melentev <minton(a)opensuse.org>\n"
"Language-Team: Russian <opensuse-translation-ru(a)opensuse.org>\n"
@@ -273,120 +273,120 @@
# Samba-server read dialog caption
#. RelocationServer read dialog caption
-#: src/modules/RelocationServer.rb:303
+#: src/modules/RelocationServer.rb:307
msgid "Initializing relocation-server Configuration"
msgstr "Инициализация настроек relocation-сервера"
#. Progress stage 1/3
-#: src/modules/RelocationServer.rb:313
+#: src/modules/RelocationServer.rb:317
msgid "Read the current xend configuration"
msgstr "Читать текущие настройки xend"
#. Progress stage 2/3
-#: src/modules/RelocationServer.rb:315
+#: src/modules/RelocationServer.rb:319
msgid "Read the current xend state"
msgstr "Читать текущее состояние xend"
#. Progress stage 3/3
#. Progress stage 1/2
-#: src/modules/RelocationServer.rb:317 src/modules/RelocationServer.rb:333
+#: src/modules/RelocationServer.rb:321 src/modules/RelocationServer.rb:337
msgid "Read firewall settings"
msgstr "Читать настройки брандмауэра"
#. Progress step 1/3
-#: src/modules/RelocationServer.rb:322
+#: src/modules/RelocationServer.rb:326
msgid "Reading the current xend configuration..."
msgstr "Чтение текущих настроек xend..."
#. Progress step 2/3
-#: src/modules/RelocationServer.rb:324
+#: src/modules/RelocationServer.rb:328
msgid "Reading the current xend state..."
msgstr "Чтение текущего состояния xend..."
#. Progress step 3/3
#. Progress step 1/2
-#: src/modules/RelocationServer.rb:326 src/modules/RelocationServer.rb:340
+#: src/modules/RelocationServer.rb:330 src/modules/RelocationServer.rb:344
msgid "Reading firewall settings..."
msgstr "Чтение настроек брандмауэра..."
#. Progress stage 2/2
-#: src/modules/RelocationServer.rb:335
+#: src/modules/RelocationServer.rb:339
msgid "Read the current libvirtd/sshd state"
msgstr "Читать текущее состояние libvirtd/sshd"
#. Progress stage 2/2
-#: src/modules/RelocationServer.rb:342
+#: src/modules/RelocationServer.rb:346
msgid "Reading the current libvirtd/sshd state..."
msgstr "Чтение текущего состояния libvirtd/sshd..."
#. Error message
-#: src/modules/RelocationServer.rb:364
+#: src/modules/RelocationServer.rb:368
msgid "Cannot read the current Xend state."
msgstr "Невозможно прочитать текущее состояние Xend."
#. Error message
-#: src/modules/RelocationServer.rb:373
+#: src/modules/RelocationServer.rb:377
msgid "Cannot read firewall settings."
msgstr "Невозможно прочитать настройки брандмауэра."
#. Error message
-#: src/modules/RelocationServer.rb:382
+#: src/modules/RelocationServer.rb:386
msgid "Cannot read the current libvirtd/sshd state."
msgstr "Невозможно прочитать текущее состояние libvirtd/sshd."
#. RelocationServer read dialog caption
-#: src/modules/RelocationServer.rb:401
+#: src/modules/RelocationServer.rb:407
msgid "Saving relocation-server Configuration"
msgstr "Сохранение настроек relocation-сервера"
#. Progress stage 1
-#: src/modules/RelocationServer.rb:411
+#: src/modules/RelocationServer.rb:417
msgid "Write the Xend settings"
msgstr "Записать настройки Xend"
#. Progress stage 2
-#: src/modules/RelocationServer.rb:413
+#: src/modules/RelocationServer.rb:419
msgid "Adjust the Xend service"
msgstr "Настроить службу Xend"
#. Progress stage 3
#. Progress stage 2
-#: src/modules/RelocationServer.rb:415 src/modules/RelocationServer.rb:432
+#: src/modules/RelocationServer.rb:421 src/modules/RelocationServer.rb:438
msgid "Write firewall settings"
msgstr "Записать настройки брандмауэра"
#. Progress step 1
-#: src/modules/RelocationServer.rb:420
+#: src/modules/RelocationServer.rb:426
msgid "Writing the Xend settings..."
msgstr "Запись настроек Xend..."
#. Progress step 2
-#: src/modules/RelocationServer.rb:422
+#: src/modules/RelocationServer.rb:428
msgid "Adjusting the Xend service..."
msgstr "Настройка службы Xend..."
#. Progress step 3
#. Progress stage 2
-#: src/modules/RelocationServer.rb:424 src/modules/RelocationServer.rb:439
+#: src/modules/RelocationServer.rb:430 src/modules/RelocationServer.rb:445
msgid "Writing firewall settings..."
msgstr "Запись настроек брандмауэра..."
#. Progress stage 1
-#: src/modules/RelocationServer.rb:430
+#: src/modules/RelocationServer.rb:436
msgid "Adjust the libvirtd/sshd service"
msgstr "Настроить службу libvirtd/sshd"
#. Progress step 1
-#: src/modules/RelocationServer.rb:437
+#: src/modules/RelocationServer.rb:443
msgid "Adjusting the libvirtd/sshd service"
msgstr "Настройка службы libvirtd/sshd"
#. Error message
-#: src/modules/RelocationServer.rb:454
+#: src/modules/RelocationServer.rb:460
msgid "Cannot write the xend settings."
msgstr "Невозможно записать настройки xend."
#. Error message
-#: src/modules/RelocationServer.rb:475
+#: src/modules/RelocationServer.rb:481
msgid "Cannot write firewall settings."
msgstr "Невозможно записать настройки брандмауэра."
1
0
30 Aug '15
Author: minton
Date: 2015-08-30 20:10:07 +0200 (Sun, 30 Aug 2015)
New Revision: 92430
Modified:
trunk/yast/ru/po/registration.ru.po
Log:
Merged registration.pot for ru
Modified: trunk/yast/ru/po/registration.ru.po
===================================================================
--- trunk/yast/ru/po/registration.ru.po 2015-08-30 18:10:05 UTC (rev 92429)
+++ trunk/yast/ru/po/registration.ru.po 2015-08-30 18:10:07 UTC (rev 92430)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: registration.ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-29 16:21+0100\n"
+"POT-Creation-Date: 2015-08-27 10:52+0200\n"
"PO-Revision-Date: 2014-11-04 00:42+0400\n"
"Last-Translator: Alexander Melentev <minton(a)opensuse.org>\n"
"Language-Team: Russian <opensuse-translation-ru(a)opensuse.org>\n"
@@ -22,11 +22,11 @@
"X-Generator: Lokalize 1.5\n"
#. popup heading (in bold)
-#: src/clients/discover_registration_services.rb:40
+#: src/clients/discover_registration_services.rb:42
msgid "Local Registration Servers"
msgstr "Локальные серверы регистрации"
-#: src/clients/discover_registration_services.rb:42
+#: src/clients/discover_registration_services.rb:44
msgid ""
"Select a detected registration server from the list\n"
"or the default SUSE registration server."
@@ -35,239 +35,78 @@
"либо сервер регистрации SUSE по умолчанию."
#. error popup
-#: src/clients/discover_registration_services.rb:66
+#: src/clients/discover_registration_services.rb:68
msgid "No registration server selected."
msgstr "Не выбран сервер регистрации"
#. %s is the default SCC URL
-#: src/clients/discover_registration_services.rb:112
+#: src/clients/discover_registration_services.rb:114
msgid "SUSE Customer Center (%s)"
msgstr "SUSE Customer Center (%s)"
#. popup message
#. popup message
#. popup message
-#: src/clients/inst_scc.rb:53 src/clients/scc_auto.rb:49
-#: src/lib/registration/registration_ui.rb:39
+#: src/clients/inst_scc.rb:54 src/clients/scc_auto.rb:49
+#: src/lib/registration/registration_ui.rb:40
msgid "Contacting the Registration Server"
msgstr "Связь с сервером регистрации"
-#. display the registration update dialog
+#. check the base product at start to avoid problems later
+#. Translators: Text for UI Label - capitalized
#. dialog title
+#. just set an empty Wizard dialog to replace the current one after
+#. pressing "Next"
#. dialog title
-#. Translators: Text for UI Label - capitalized
-#: src/clients/inst_scc.rb:215 src/clients/inst_scc.rb:310
-#: src/clients/inst_scc.rb:467 src/clients/inst_scc.rb:515
-#: src/lib/registration/ui/autoyast_config_dialog.rb:92
+#. display and run a dialog for updating the current registration
+#. @return [Symbol] user input
+#: src/clients/inst_scc.rb:186
+#: src/lib/registration/ui/autoyast_config_dialog.rb:104
+#: src/lib/registration/ui/base_system_registration_dialog.rb:48
+#: src/lib/registration/ui/migration_repos_workflow.rb:270
+#: src/lib/registration/ui/registered_system_dialog.rb:37
+#: src/lib/registration/ui/registration_update_dialog.rb:41
msgid "Registration"
msgstr "Регистрация"
-#: src/clients/inst_scc.rb:216
-msgid "Registration is being updated..."
-msgstr "Обновление регистрации…"
-
-#: src/clients/inst_scc.rb:217
-msgid "The previous registration is being updated."
-msgstr "Предыдущая регистрация обновляется."
-
-#. automatic registration refresh during system upgrade failed, register from scratch
-#: src/clients/inst_scc.rb:233
-msgid ""
-"Automatic registration upgrade failed.\n"
-"You can manually register the system from scratch."
-msgstr ""
-"Не удалось автоматически обновить регистрацию.\n"
-"Вы можете вручную зарегистрировать систему заново."
-
-#. label text describing the registration (1/2)
-#. use \n to split to more lines if needed (use max. 76 chars/line)
-#: src/clients/inst_scc.rb:247
-msgid ""
-"Please enter a registration or evaluation code for this product and your\n"
-"User Name/E-mail address from the SUSE Customer Center in the fields below.\n"
-"Access to security and general software updates is only possible on\n"
-"a registered system."
-msgstr ""
-"Укажите в полях ниже код регистрации или оценки для этого продукта и ваши\n"
-"имя пользователя или адрес электронной почты, используемые в Центре по работе с клиентами SUSE.\n"
-"Доступ к обновлениям ПО (для системы безопасности и общим) возможен только\n"
-"с зарегистрированной системы."
-
-#. label text describing the registration (2/2),
-#. not displayed in installed system
-#. use \n to split to more lines if needed (use max. 76 chars/line)
-#: src/clients/inst_scc.rb:259
-msgid ""
-"If you skip product registration now, remember to register after\n"
-"installation has completed."
-msgstr ""
-"Если вы пропустите регистрацию сейчас, не забудьте\n"
-"выполнить ее после установки."
-
-#: src/clients/inst_scc.rb:267
-msgid "Network Configuration..."
-msgstr "Настройка сети..."
-
-#: src/clients/inst_scc.rb:276 src/clients/inst_scc.rb:452
-msgid "The system is already registered."
-msgstr "Система уже зарегистрирована."
-
-#: src/clients/inst_scc.rb:283
-#: src/lib/registration/ui/autoyast_config_dialog.rb:94
-msgid "&E-mail Address"
-msgstr "&E-mail адрес"
-
-#. handle nil specifically, it cannot be stored in XML profile
-#: src/clients/inst_scc.rb:285
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:167
-#: src/lib/registration/ui/autoyast_config_dialog.rb:96
-msgid "Registration &Code"
-msgstr "Регистрационный &ключ"
-
-#. button label
-#: src/clients/inst_scc.rb:290
-msgid "&Local Registration Server..."
-msgstr "&Локальный сервер регистрации…"
-
-#. button label
-#: src/clients/inst_scc.rb:293
-msgid "&Skip Registration"
-msgstr "&Пропустить регистрацию"
-
-#. help text
-#: src/clients/inst_scc.rb:301
-msgid "Enter SUSE Customer Center credentials here to register the system to get updates and extensions."
-msgstr "Введите данные учётной записи SUSE Customer Center, чтобы зарегистрировать систему и получать обновления и расширения."
-
-#. not set yet?
-#: src/clients/inst_scc.rb:334
-msgid ""
-"Registration added some update repositories.\n"
-"\n"
-"Do you want to install the latest available\n"
-"on-line updates during installation?"
-msgstr ""
-"При регистрации добавлены некоторые репозитории обновлений.\n"
-"\n"
-"Вы хотите установить последние доступные\n"
-"в Интернете обновления?"
-
-#. %s is name of given product
-#. %s is name of given product
-#. then register the product(s)
-#: src/clients/inst_scc.rb:385 src/clients/scc_auto.rb:284
-#: src/lib/registration/registration_ui.rb:71
-msgid "Registering %s ..."
-msgstr "Регистрация %s…"
-
-#. dialog title
-#: src/clients/inst_scc.rb:419
-msgid "Register Extensions and Modules"
-msgstr "Регистрировать расширения и модули"
-
-#. help text
-#: src/clients/inst_scc.rb:423
-msgid "<p>Extensions and Modules are being registered.</p>"
-msgstr "<p>Регистрация расширений и модулей</p>"
-
-#. Popup question: confirm skipping the registration
-#: src/clients/inst_scc.rb:441
-msgid ""
-"If you do not register your system we will not be able\n"
-"to grant you access to the update repositories.\n"
-"\n"
-"You can register after the installation or visit our\n"
-"Customer Center for online registration.\n"
-"\n"
-"Really skip the registration now?"
-msgstr ""
-"Если вы не зарегистрируете вашу систему, мы не сможем\n"
-"предоставить вам доступ к репозиторию обновлений.\n"
-"\n"
-"Вы можете зарегистрироваться после установки или посетить\n"
-"Customer Center для регистрации онлайн.\n"
-"\n"
-"Пропустить регистрацию?"
-
-#. button label
-#: src/clients/inst_scc.rb:455
-msgid "Register Again"
-msgstr "Повторная регистрация"
-
-#. button label
-#: src/clients/inst_scc.rb:458
-msgid "Select Extensions"
-msgstr "Выбрать расширения"
-
-#. help text
-#: src/clients/inst_scc.rb:470
-msgid "<p>The system is already registered.</p>"
-msgstr "<p>Система уже зарегистрирована.</p>"
-
-#: src/clients/inst_scc.rb:471
-msgid "<p>You can re-register it again or you can register additional extension or modules to enhance the functionality of the system.</p>"
-msgstr "<p>Вы можете зарегистрировать ее повторно или зарегистрировать дополнительные расширения или модули, тем самым расширив ее возможности.</p>"
-
-#: src/clients/inst_scc.rb:473
-msgid "<p>If you want to deregister your system you need to log into the SUSE Customer Center and remove the system manually there.</p>"
-msgstr "<p>Чтобы отменить регистрацию системы, необходимо войти в центр по работе с клиентами SUSE и удалить систему вручную.</p>"
-
-#. error message
-#: src/clients/inst_scc.rb:497
-msgid ""
-"The base product was not found,\n"
-"check your system."
-msgstr ""
-"Базовый продукт не найден,\n"
-"проверьте свою систему."
-
-#. TRANSLATORS: %s = bugzilla URL
-#: src/clients/inst_scc.rb:501
-msgid ""
-"The installation medium or the installer itself is seriously broken.\n"
-"Report a bug at %s."
-msgstr ""
-"Носитель файлов установки или сам установщик серьезно поврежден. \n"
-"Сообщите об ошибке %s."
-
-#: src/clients/inst_scc.rb:504
-msgid ""
-"Make sure a product is installed and /etc/products.d/baseproduct\n"
-"is a symlink pointing to the base product .prod file."
-msgstr ""
-"Убедитесь, что продукт установлен, а путь /etc/products.d/baseproduct\n"
-"является символической ссылкой, указывающей на основной PROD-файл продукта."
-
#. Command line help text for the repository module, %1 is "SUSEconnect"
-#: src/clients/scc.rb:44
+#. Command line help text for the repository module, %1 is "SUSEconnect"
+#: src/clients/registration.rb:43 src/clients/scc.rb:43
msgid "Use '%s' instead of this YaST module."
msgstr "Используйте '%s' вместо этого модуля YaST."
#. popup message: registration finished properly
-#: src/clients/scc_auto.rb:184
+#: src/clients/scc_auto.rb:201
msgid "Registration was successfull."
msgstr "Регистрация прошла успешно."
#. remove possible duplicates
-#: src/clients/scc_auto.rb:212
+#: src/clients/scc_auto.rb:229
msgid "SLP discovery failed, no server found"
msgstr "Сбой поиска SLP, сервер не найден"
-#. more than one server found: let the user select, we cannot automatically
-#. decide which one to use, asking user in AutoYast mode is not nice
-#. but better than aborting the installation...
-#: src/clients/scc_auto.rb:228
+#. download and install the specified SSL certificate to the system
+#. @param url [String] URL of the certificate
+#: src/clients/scc_auto.rb:247
msgid "Downloading SSL Certificate"
msgstr "Загрузка сертификата SSL"
-#: src/clients/scc_auto.rb:232
+#: src/clients/scc_auto.rb:251
msgid "Importing SSL Certificate"
msgstr "Импорт сертификата SSL"
+#. %s is name of given product
+#. then register the product(s)
+#. %s is name of given product
+#: src/clients/scc_auto.rb:326 src/lib/registration/registration_ui.rb:247
+#: src/lib/registration/registration_ui.rb:277
+msgid "Registering %s ..."
+msgstr "Регистрация %s…"
+
#. display the extension selection dialog and wait for a button click
#. @return [Symbol] user input (:import, :cancel)
#: src/data/registration/autoyast_summary.erb:5
-#: src/lib/registration/ui/autoyast_config_dialog.rb:49
+#: src/lib/registration/ui/autoyast_config_dialog.rb:55
msgid "Product Registration"
msgstr "Регистрация продукта"
@@ -333,33 +172,33 @@
msgstr "Сведения о сбойном сертификате"
#: src/data/registration/certificate_summary.erb:4
-#: src/lib/registration/ssl_certificate_details.rb:35
+#: src/lib/registration/ssl_certificate_details.rb:34
msgid "Issued To"
msgstr "Кому выдан"
#. label followed by the SSL certificate identification
#: src/data/registration/certificate_summary.erb:7
#: src/data/registration/certificate_summary.erb:16
-#: src/lib/registration/ssl_certificate_details.rb:61
+#: src/lib/registration/ssl_certificate_details.rb:60
msgid "Common Name (CN): "
msgstr "Общее имя (CN):"
#. label followed by the SSL certificate identification
#: src/data/registration/certificate_summary.erb:8
#: src/data/registration/certificate_summary.erb:17
-#: src/lib/registration/ssl_certificate_details.rb:63
+#: src/lib/registration/ssl_certificate_details.rb:62
msgid "Organization (O): "
msgstr "Организация (O):"
#. label followed by the SSL certificate identification
#: src/data/registration/certificate_summary.erb:9
#: src/data/registration/certificate_summary.erb:18
-#: src/lib/registration/ssl_certificate_details.rb:65
+#: src/lib/registration/ssl_certificate_details.rb:64
msgid "Organization Unit (OU): "
msgstr "Отдел (OU):"
#: src/data/registration/certificate_summary.erb:13
-#: src/lib/registration/ssl_certificate_details.rb:36
+#: src/lib/registration/ssl_certificate_details.rb:35
msgid "Issued By"
msgstr "Кем выдан"
@@ -388,17 +227,17 @@
msgstr "Серийный номер:"
#: src/data/registration/certificate_summary.erb:44
-#: src/lib/registration/ssl_certificate_details.rb:36
+#: src/lib/registration/ssl_certificate_details.rb:35
msgid "SHA1 Fingerprint: "
msgstr "Отпечаток SHA1: "
#: src/data/registration/certificate_summary.erb:46
-#: src/lib/registration/ssl_certificate_details.rb:38
+#: src/lib/registration/ssl_certificate_details.rb:37
msgid "SHA256 Fingerprint: "
msgstr "Отпечаток SHA256: "
#. Error popup
-#: src/lib/registration/connect_helpers.rb:72
+#: src/lib/registration/connect_helpers.rb:74
msgid ""
"Network is not configured, the registration server cannot be reached.\n"
"Do you want to configure the network now?"
@@ -406,22 +245,22 @@
"Сеть не настроена, невозможно связаться с сервером регистрации.\n"
"Хотите настроить сеть сейчас?"
-#: src/lib/registration/connect_helpers.rb:78
+#: src/lib/registration/connect_helpers.rb:80
msgid "Network error, check the network configuration."
msgstr "Ошибка сети, проверьте настройки сети."
#. Error popup
-#: src/lib/registration/connect_helpers.rb:83
+#: src/lib/registration/connect_helpers.rb:85
msgid "Connection time out."
msgstr "Превышено время ожидания соединения."
#. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:91
+#: src/lib/registration/connect_helpers.rb:93
msgid "Check that this system is known to the registration server."
msgstr "Проверьте, что эта система известна серверу регистрации."
#. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:97
+#: src/lib/registration/connect_helpers.rb:99
msgid ""
"If you are upgrading from SLE11 make sure the SCC server\n"
"knows the old NCC registration. Synchronization from NCC to SCC\n"
@@ -445,20 +284,20 @@
#. update the message when an old SMT server is found
#. Error popup
#. update the message when an old SMT server is found
-#: src/lib/registration/connect_helpers.rb:111
-#: src/lib/registration/connect_helpers.rb:116
-#: src/lib/registration/connect_helpers.rb:119
-#: src/lib/registration/connect_helpers.rb:125
-#: src/lib/registration/connect_helpers.rb:175
-#: src/lib/registration/connect_helpers.rb:178
+#: src/lib/registration/connect_helpers.rb:113
+#: src/lib/registration/connect_helpers.rb:118
+#: src/lib/registration/connect_helpers.rb:121
+#: src/lib/registration/connect_helpers.rb:128
+#: src/lib/registration/connect_helpers.rb:179
+#: src/lib/registration/connect_helpers.rb:182
msgid "Registration failed."
msgstr "Сбой регистрации."
-#: src/lib/registration/connect_helpers.rb:121
+#: src/lib/registration/connect_helpers.rb:123
msgid "Registration client error."
msgstr "Ошибка клиента регистрации."
-#: src/lib/registration/connect_helpers.rb:123
+#: src/lib/registration/connect_helpers.rb:125
msgid ""
"Registration server error.\n"
"Retry registration later."
@@ -467,33 +306,33 @@
"Попробуйте зарегистрироваться позже."
#. error message
-#: src/lib/registration/connect_helpers.rb:164
+#: src/lib/registration/connect_helpers.rb:167
msgid "Received SSL Certificate does not match the expected certificate."
msgstr "Полученный сертификат SSL не соответствует ожидаемому сертификату."
#. %s are error details
-#: src/lib/registration/connect_helpers.rb:195
+#: src/lib/registration/connect_helpers.rb:197
msgid "Details: %s"
msgstr "Подробности: %s"
#. progress label
-#: src/lib/registration/connect_helpers.rb:220
+#: src/lib/registration/connect_helpers.rb:222
msgid "Importing the SSL certificate"
msgstr "Импорт сертификата SSL"
-#: src/lib/registration/connect_helpers.rb:221
+#: src/lib/registration/connect_helpers.rb:223
msgid "Importing '%s' certificate..."
msgstr "Импорт сертификата '%s'…"
#. try to use a translatable message first, if not found then use
#. the original error message from openSSL
-#: src/lib/registration/connect_helpers.rb:241
+#: src/lib/registration/connect_helpers.rb:244
msgid "Secure connection error: %s"
msgstr "Ошибка безопасного соединения: %s"
#. TRANSLATORS: error message, %s is a server URL,
#. e.g. https://smt.example.com
-#: src/lib/registration/connect_helpers.rb:260
+#: src/lib/registration/connect_helpers.rb:263
msgid ""
"An old registration server was detected at\n"
"%s.\n"
@@ -510,21 +349,43 @@
msgid "Storing Registration Configuration..."
msgstr "Сохранение настроек регистрации…"
-#. register the system and the base product
-#. @return [Array<Boolean, SUSE::Connect::Remote::Service>] array with two
-#. items: boolean (true on success), remote service (or nil)
-#. TODO FIXME: split to two separate parts
-#. TODO FIXME: reused an existing message due to text freeze
+#. error message
+#: src/lib/registration/helpers.rb:231
+msgid ""
+"The base product was not found,\n"
+"check your system."
+msgstr ""
+"Базовый продукт не найден,\n"
+"проверьте свою систему."
+
+#. TRANSLATORS: %s = bugzilla URL
+#: src/lib/registration/helpers.rb:235
+msgid ""
+"The installation medium or the installer itself is seriously broken.\n"
+"Report a bug at %s."
+msgstr ""
+"Носитель файлов установки или сам установщик серьезно поврежден. \n"
+"Сообщите об ошибке %s."
+
+#: src/lib/registration/helpers.rb:238
+msgid ""
+"Make sure a product is installed and /etc/products.d/baseproduct\n"
+"is a symlink pointing to the base product .prod file."
+msgstr ""
+"Убедитесь, что продукт установлен, а путь /etc/products.d/baseproduct\n"
+"является символической ссылкой, указывающей на основной PROD-файл продукта."
+
+#. FIXME: reused an existing message due to text freeze
#. (later use a better text, it's system update actually...)
-#: src/lib/registration/registration_ui.rb:62
-#: src/lib/registration/registration_ui.rb:95
+#: src/lib/registration/registration_ui.rb:80
+#: src/lib/registration/registration_ui.rb:233
msgid "Registering the System..."
msgstr "Регистрация системы..."
#. updating base product registration, %s is a new base product name
#. updating registered addon/extension, %s is an extension name
-#: src/lib/registration/registration_ui.rb:121
-#: src/lib/registration/registration_ui.rb:146
+#: src/lib/registration/registration_ui.rb:106
+#: src/lib/registration/registration_ui.rb:312
msgid "Updating to %s ..."
msgstr "Обновление до %s…"
@@ -532,68 +393,122 @@
#. the result is cached to avoid reloading when going back and forth in the
#. installation workflow
#. @return [Array<Registration::Addon>] available addons
-#. create a new dialog for accepting and importing a SSL certificate and run it
-#: src/lib/registration/registration_ui.rb:174
-#: src/lib/registration/ui/autoyast_config_workflow.rb:101
+#. download the addons from SCC, let the user select addons to install
+#. @return [Symbol] the user input
+#: src/lib/registration/registration_ui.rb:143
+#: src/lib/registration/ui/autoyast_config_workflow.rb:109
msgid "Loading Available Extensions and Modules..."
msgstr "Загрузка доступных расширений и модулей…"
+#: src/lib/registration/registration_ui.rb:157
+#, fuzzy
+#| msgid "Registering Product..."
+#| msgid_plural "Registering Products..."
+msgid "Loading Migration Products..."
+msgstr "Регистрация продукта..."
+
+#. dialog title
+#: src/lib/registration/registration_ui.rb:174
+msgid "Register Extensions and Modules"
+msgstr "Регистрировать расширения и модули"
+
+#. help text
+#: src/lib/registration/registration_ui.rb:178
+msgid "<p>Extensions and Modules are being registered.</p>"
+msgstr "<p>Регистрация расширений и модулей</p>"
+
+#. TRANSLATORS: updates popup question (1/2), multiline, max. ~60 chars/line
+#: src/lib/registration/registration_ui.rb:203
+#, fuzzy
+#| msgid "No registration server selected."
+msgid ""
+"The registration server offers update repositories.\n"
+"\n"
+msgstr "Не выбран сервер регистрации"
+
+#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
+#: src/lib/registration/registration_ui.rb:207
+msgid "Would you like to enable these repositories during installation\n"
+msgstr ""
+
+#. Yast::Mode.update
+#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
+#: src/lib/registration/registration_ui.rb:211
+msgid "Would you like to enable these repositories during upgrade\n"
+msgstr ""
+
#. indent size used in summary text
-#: src/lib/registration/ssl_certificate_details.rb:35
+#: src/lib/registration/ssl_certificate_details.rb:34
msgid "Certificate:"
msgstr "Сертификат:"
#. create UI label for a base product
-#. @param [Hash] Product (hash from pkg-bindings)
+#. @param base_product [Hash] Product (hash from pkg-bindings)
#. @return [String] UI Label
-#: src/lib/registration/sw_mgmt.rb:120
+#: src/lib/registration/sw_mgmt.rb:147
msgid "Unknown product"
msgstr "Неизвестный продукт"
#. error message
-#: src/lib/registration/sw_mgmt.rb:153
+#. error message
+#: src/lib/registration/sw_mgmt.rb:174 src/lib/registration/sw_mgmt.rb:248
msgid "Saving repository configuration failed."
msgstr "Сбой сохранения настроек репозитория."
#. # error message
#. error message
-#: src/lib/registration/sw_mgmt.rb:191 src/lib/registration/sw_mgmt.rb:202
+#: src/lib/registration/sw_mgmt.rb:212 src/lib/registration/sw_mgmt.rb:223
msgid "Updating service '%s' failed."
msgstr "Сбой обновления службы \"%s\"."
#. error message
-#: src/lib/registration/sw_mgmt.rb:197
+#: src/lib/registration/sw_mgmt.rb:218
msgid "Adding service '%s' failed."
msgstr "Сбой добавления службы \"%s\"."
#. error message
-#: src/lib/registration/sw_mgmt.rb:209
+#: src/lib/registration/sw_mgmt.rb:230
msgid "Saving service '%s' failed."
msgstr "Сбой сохранения службы \"%s\"."
#. error message
-#: src/lib/registration/sw_mgmt.rb:214
+#: src/lib/registration/sw_mgmt.rb:235
msgid "Refreshing service '%s' failed."
msgstr "Сбой обновления службы \"%s\"."
+#. TRANSLATORS: %s is a product name
+#: src/lib/registration/sw_mgmt.rb:438
+#, fuzzy
+#| msgid "No products found to be registered."
+msgid ""
+"Cannot find remote product %s.\n"
+"The product cannot be registered."
+msgstr "Не найдены продукты для регистрации."
+
+#. Use .AnyQuestion instead of .YesNo or .ReallyAbort to have full control
+#. on :focus_no and be consistent with the .ConfirmAbort behavior
+#: src/lib/registration/ui/abort_confirmation.rb:35
+msgid "Really abort?"
+msgstr ""
+
#. dialog title
-#: src/lib/registration/ui/addon_eula_dialog.rb:40
+#: src/lib/registration/ui/addon_eula_dialog.rb:43
msgid "License Agreement"
msgstr "Лицензионное соглашение"
-#: src/lib/registration/ui/addon_eula_dialog.rb:41
+#: src/lib/registration/ui/addon_eula_dialog.rb:44
msgid "Downloading Licenses..."
msgstr "Загрузка лицензий..."
#. download the addon EULAs to a temp dir
-#. @param [SUSE::Connect::Product] addon the addon
+#. @param [Addon] addon the addon
#. @param [String] tmpdir target where to download the files
-#: src/lib/registration/ui/addon_eula_dialog.rb:72
+#: src/lib/registration/ui/addon_eula_dialog.rb:75
msgid "Downloading License Agreement..."
msgstr "Загрузка лицензионного соглашения..."
#. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit"
-#: src/lib/registration/ui/addon_eula_dialog.rb:85
+#: src/lib/registration/ui/addon_eula_dialog.rb:88
msgid ""
"Downloading the license for\n"
"%s\n"
@@ -604,17 +519,17 @@
"не удалась"
#. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit"
-#: src/lib/registration/ui/addon_eula_dialog.rb:100
+#: src/lib/registration/ui/addon_eula_dialog.rb:102
msgid "%s License Agreement"
msgstr "Лицензионное соглашение %s"
#. dialog title
-#: src/lib/registration/ui/addon_reg_codes_dialog.rb:37
+#: src/lib/registration/ui/addon_reg_codes_dialog.rb:46
msgid "Extension and Module Registration Codes"
msgstr "Коды регистрации расширений и модулей"
#. help text
-#: src/lib/registration/ui/addon_reg_codes_dialog.rb:41
+#: src/lib/registration/ui/addon_reg_codes_dialog.rb:50
msgid ""
"<p>Enter registration codes for the requested extensions or modules.</p>\n"
"<p>Registration codes are required for successfull registration.If you cannot provide a registration code then go back and deselect the respective extension or module.</p>"
@@ -622,122 +537,158 @@
"<p>Введите коды регистрации для запрошенных расширений и модулей.</p>\n"
"<p>Для успешной регистрации следует ввести коды регистрации. Если вам это не удается, вернитесь и отмените выбор соответствующего расширения или модуля.</p>"
-#. round the half up (more items in the first column for odd number of items)
-#: src/lib/registration/ui/addon_reg_codes_dialog.rb:87
+#. part of the UI - labels in the dialog
+#. @return [Array<Yast::Term>] UI definition
+#: src/lib/registration/ui/addon_reg_codes_dialog.rb:102
msgid "The extension you selected needs a separate registration code."
msgid_plural "The extensions you selected need separate registration codes."
msgstr[0] "Для выбранного расширения требуется отдельный регистрационный код."
msgstr[1] "Для выбранных расширений требуются отдельные регистрационные коды."
msgstr[2] "Для выбранных расширений требуются отдельные регистрационные коды."
-#: src/lib/registration/ui/addon_reg_codes_dialog.rb:92
+#: src/lib/registration/ui/addon_reg_codes_dialog.rb:111
msgid "Enter the registration code into the field below."
msgid_plural "Enter the registration codes into the fields below."
msgstr[0] "Введите регистрационный код в поле ниже."
msgstr[1] "Введите регистрационные коды в поле ниже."
msgstr[2] "Введите регистрационные коды в поле ниже."
-#. dialog title
-#: src/lib/registration/ui/addon_selection_dialog.rb:44
-msgid "Extension and Module Selection"
-msgstr "Выбор расширений и модулей"
+#. create the main dialog definition
+#. @return [Yast::Term] the main UI dialog term
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:77
+msgid "Details"
+msgstr "Подробности"
-#. help text (1/3)
-#: src/lib/registration/ui/addon_selection_dialog.rb:47
-msgid "<p>Here you can select available extensions and modules for yoursystem.</p>"
-msgstr "<p>Здесь можно выбрать доступные расширения и модули для вашей системы.</p>"
+#. addon description widget
+#. @return [Yast::Term] the addon details widget
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:88
+msgid "Select an extension or a module to show details here"
+msgstr "Выберите расширение или модуль для просмотра сведений о нём"
+#. checkbox label for an unavailable extension
+#. (%s is an extension name)
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:164
+msgid "%s (not available)"
+msgstr "%s (недоступно)"
+
+#. check if the count of addons requiring a reg. code fits two columns
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:246
+msgid "YaST allows to select at most %s extensions or modules."
+msgstr "YaST позволяет выбрать не более %s расширений или модулей."
+
#. help text (2/3)
-#: src/lib/registration/ui/addon_selection_dialog.rb:50
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:257
msgid "<p>Please note, that some extensions or modules might need specific registration code.</p>"
msgstr "<p>Обратите внимание, что для некоторых расширений и модулей может потребоваться отдельный код регистрации.</p>"
#. help text (3/3)
-#: src/lib/registration/ui/addon_selection_dialog.rb:53
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:260
msgid "<p>If you want to remove any extension or module you need to loginto the SUSE Customer Center and remove them manually there.</p>"
msgstr "<p>Чтобы удалить расширение или модуль, войдите в центр по работе с клиентами SUSE и удалите его вручную.</p>"
-#. always enable Back/Next, the dialog cannot be the first in workflow
-#: src/lib/registration/ui/addon_selection_dialog.rb:72
+#. dialog title
+#: src/lib/registration/ui/addon_selection_registration_dialog.rb:31
+msgid "Extension and Module Selection"
+msgstr "Выбор расширений и модулей"
+
+#. help text (1/3)
+#: src/lib/registration/ui/addon_selection_registration_dialog.rb:34
+msgid "<p>Here you can select available extensions and modules for yoursystem.</p>"
+msgstr "<p>Здесь можно выбрать доступные расширения и модули для вашей системы.</p>"
+
+#. @return [String] the main dialog label
+#: src/lib/registration/ui/addon_selection_registration_dialog.rb:52
msgid "Available Extensions and Modules"
msgstr "Доступные расширения и модули"
-#: src/lib/registration/ui/addon_selection_dialog.rb:74
-msgid "Details"
-msgstr "Подробности"
+#. dialog title
+#: src/lib/registration/ui/addon_selection_reregistration_dialog.rb:37
+#, fuzzy
+#| msgid "Extension and Module Registration Codes"
+msgid "Extension and Module Re-registration"
+msgstr "Коды регистрации расширений и модулей"
-#: src/lib/registration/ui/addon_selection_dialog.rb:77
-msgid "Select an extension or a module to show details here"
-msgstr "Выберите расширение или модуль для просмотра сведений о нём"
+#. help text (1/3)
+#: src/lib/registration/ui/addon_selection_reregistration_dialog.rb:40
+#, fuzzy
+#| msgid "<p>Here you can select which extensions or moduleswill be registered together with the base product.</p>"
+msgid "<p>Here you can select extensions and modules which will be registered again.</p>"
+msgstr "<p>Здесь можно выбрать, какие расширения или модули будут зарегистрированы с базовым продуктом.</p>"
-#. checkbox label for an unavailable extension
-#. (%s is an extension name)
-#: src/lib/registration/ui/addon_selection_dialog.rb:136
-msgid "%s (not available)"
-msgstr "%s (недоступно)"
+#. @return [String] the main dialog label
+#: src/lib/registration/ui/addon_selection_reregistration_dialog.rb:54
+#, fuzzy
+#| msgid "Register Extensions and Modules"
+msgid "Registered Extensions and Modules"
+msgstr "Регистрировать расширения и модули"
-#. check the addons requiring a reg. code
-#: src/lib/registration/ui/addon_selection_dialog.rb:217
-msgid "YaST allows to select at most %s extensions or modules."
-msgstr "YaST позволяет выбрать не более %s расширений или модулей."
-
#. help text
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:33
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:38
msgid "<p>Here you can select which extensions or moduleswill be registered together with the base product.</p>"
msgstr "<p>Здесь можно выбрать, какие расширения или модули будут зарегистрированы с базовым продуктом.</p>"
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:36
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:41
msgid "Register Optional Extensions or Modules"
msgstr "Регистрировать необязательные расширения или модули"
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:50
+#. create the main dialog content
+#. @return [Yast::Term] UI definition
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:57
msgid "Identifier"
msgstr "Идентификатор"
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:51
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:58
msgid "Version"
msgstr "Версия"
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:52
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:59
msgid "Architecture"
msgstr "Архитектура"
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:53
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:60
msgid "Release Type"
msgstr "Тип выпуска"
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:54
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:61
msgid "Registration Code"
msgstr "Регистрационный ключ"
#. button label
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:65
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:72
msgid "Download Available Extensions..."
msgstr "Загрузить доступные расширения…"
-#. disable download on a non-registered system
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:119
+#. remove the selected addon after user confirms the removal
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:137
msgid "Really delete '%s'?"
msgstr "Действительно удалить '%s'?"
-#. replace the content
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:161
+#. dialog definition for adding/editing an addon
+#. @return [Yast::Term] popup definition
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:185
msgid "Extension or Module &Identifier"
msgstr "&Идентификатор расширения или модуля"
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:162
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:186
msgid "&Version"
msgstr "&Версия"
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:163
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:187
msgid "&Architecture"
msgstr "&Архитектура"
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:164
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:188
msgid "&Release Type"
msgstr "&Тип выпуска"
-#: src/lib/registration/ui/autoyast_config_dialog.rb:51
+#. handle nil specifically, it cannot be stored in XML profile
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:191
+#: src/lib/registration/ui/autoyast_config_dialog.rb:108
+#: src/lib/registration/ui/base_system_registration_dialog.rb:133
+msgid "Registration &Code"
+msgstr "Регистрационный &ключ"
+
+#: src/lib/registration/ui/autoyast_config_dialog.rb:57
msgid ""
"<p>Product registration includes your product in SUSE Customer Center database,\n"
"enabling you to get online updates and technical support.\n"
@@ -747,7 +698,7 @@
"позволяя вам получать обновления и техническую поддержку.\n"
"Для регистрации в процессе установки выберите <b>Запустить регистрацию продукта</b>.</p>"
-#: src/lib/registration/ui/autoyast_config_dialog.rb:56
+#: src/lib/registration/ui/autoyast_config_dialog.rb:63
msgid ""
"<p>If your network deploys a custom registration server, set the correct URL of the server\n"
"and the location of the SMT certificate in <b>SMT Server Settings</b>. Refer\n"
@@ -757,116 +708,434 @@
"и путь к сертификату SMT в <b>Настройках сервера SMT</b>. Смотри\n"
"документацию по SMT для подробностей.</p>"
-#. FIXME the dialog should be created by external code before calling this
-#: src/lib/registration/ui/autoyast_config_dialog.rb:83
+#. the UI defition for the global registration status
+#. @return [Yast::Term] UI term
+#: src/lib/registration/ui/autoyast_config_dialog.rb:93
msgid "Register the Product"
msgstr "Регистрация продукта"
-#: src/lib/registration/ui/autoyast_config_dialog.rb:100
+#. part of the main dialog definition - the input fields
+#. @return [Yast::Term] UI term
+#: src/lib/registration/ui/autoyast_config_dialog.rb:106
+#: src/lib/registration/ui/base_system_registration_dialog.rb:131
+msgid "&E-mail Address"
+msgstr "&E-mail адрес"
+
+#: src/lib/registration/ui/autoyast_config_dialog.rb:112
msgid "Install Available Updates from Update Repositories"
msgstr "Установить доступные обновления из репозиториев обновлений"
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:114
+#: src/lib/registration/ui/autoyast_config_dialog.rb:128
msgid "Server Settings"
msgstr "Настройки сервера"
-#: src/lib/registration/ui/autoyast_config_dialog.rb:118
+#: src/lib/registration/ui/autoyast_config_dialog.rb:132
msgid "Find Registration Server Using SLP Discovery"
msgstr "Найти сервер регистрации с помощью SLP"
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:123
+#: src/lib/registration/ui/autoyast_config_dialog.rb:137
msgid "Use Specific Server URL Instead of the Default"
msgstr "Использовать указанный URL вместо значения по умолчанию"
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:130
+#: src/lib/registration/ui/autoyast_config_dialog.rb:144
msgid "Optional SSL Server Certificate URL"
msgstr "URL SSL-сертификата сервера (необязательно)"
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:139
+#: src/lib/registration/ui/autoyast_config_dialog.rb:153
msgid "Optional SSL Server Certificate Fingerprint"
msgstr "Отпечаток SSL-сертификата сервера (необязательно)"
-#: src/lib/registration/ui/autoyast_config_dialog.rb:141
+#: src/lib/registration/ui/autoyast_config_dialog.rb:155
msgid "none"
msgstr "нет"
#. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:152
+#: src/lib/registration/ui/autoyast_config_dialog.rb:166
msgid "SSL Certificate Fingerprint"
msgstr "Отпечаток сертификата SSL"
-#: src/lib/registration/ui/autoyast_config_dialog.rb:173
+#. the UI defition for the main dialog
+#. @return [Yast::Term] UI term
+#: src/lib/registration/ui/autoyast_config_dialog.rb:189
msgid "Register Extensions or Modules..."
msgstr "Регистрировать расширения или модули…"
+#. button label
+#: src/lib/registration/ui/base_system_registration_dialog.rb:84
+msgid "&Local Registration Server..."
+msgstr "&Локальный сервер регистрации…"
+
+#. button label
+#: src/lib/registration/ui/base_system_registration_dialog.rb:97
+msgid "&Skip Registration"
+msgstr "&Пропустить регистрацию"
+
+#. display the addon re-registration button only in registered installed system
+#: src/lib/registration/ui/base_system_registration_dialog.rb:106
+#, fuzzy
+#| msgid "Register Extensions or Modules..."
+msgid "&Register Extensions or Modules Again"
+msgstr "Регистрировать расширения или модули…"
+
+#. part of the main dialog definition - the base product details
+#. @return [Yast::Term] UI term
+#. the main dialog content
+#. @return [Yast::Term] UI term
+#: src/lib/registration/ui/base_system_registration_dialog.rb:118
+#: src/lib/registration/ui/registered_system_dialog.rb:67
+msgid "The system is already registered."
+msgstr "Система уже зарегистрирована."
+
+#. help text
+#: src/lib/registration/ui/base_system_registration_dialog.rb:142
+msgid "Enter SUSE Customer Center credentials here to register the system to get updates and extensions."
+msgstr "Введите данные учётной записи SUSE Customer Center, чтобы зарегистрировать систему и получать обновления и расширения."
+
+#. Popup question: confirm skipping the registration
+#: src/lib/registration/ui/base_system_registration_dialog.rb:177
+msgid ""
+"If you do not register your system we will not be able\n"
+"to grant you access to the update repositories.\n"
+"\n"
+"You can register after the installation or visit our\n"
+"Customer Center for online registration.\n"
+"\n"
+"Really skip the registration now?"
+msgstr ""
+"Если вы не зарегистрируете вашу систему, мы не сможем\n"
+"предоставить вам доступ к репозиторию обновлений.\n"
+"\n"
+"Вы можете зарегистрироваться после установки или посетить\n"
+"Customer Center для регистрации онлайн.\n"
+"\n"
+"Пропустить регистрацию?"
+
+#. label text describing the registration (1/2)
+#. use \n to split to more lines if needed (use max. 76 chars/line)
+#: src/lib/registration/ui/base_system_registration_dialog.rb:194
+msgid ""
+"Please enter a registration or evaluation code for this product and your\n"
+"User Name/E-mail address from the SUSE Customer Center in the fields below.\n"
+"Access to security and general software updates is only possible on\n"
+"a registered system."
+msgstr ""
+"Укажите в полях ниже код регистрации или оценки для этого продукта и ваши\n"
+"имя пользователя или адрес электронной почты, используемые в Центре по работе с клиентами SUSE.\n"
+"Доступ к обновлениям ПО (для системы безопасности и общим) возможен только\n"
+"с зарегистрированной системы."
+
+#. label text describing the registration (2/2),
+#. not displayed in installed system
+#. use \n to split to more lines if needed (use max. 76 chars/line)
+#: src/lib/registration/ui/base_system_registration_dialog.rb:206
+msgid ""
+"If you skip product registration now, remember to register after\n"
+"installation has completed."
+msgstr ""
+"Если вы пропустите регистрацию сейчас, не забудьте\n"
+"выполнить ее после установки."
+
+#. UI term for the network configuration button (or empty if not needed)
+#. @return [Yast::Term] UI term
+#: src/lib/registration/ui/base_system_registration_dialog.rb:218
+msgid "Network Configuration..."
+msgstr "Настройка сети..."
+
#. SSL error message
-#: src/lib/registration/ui/import_certificate_dialog.rb:25
+#: src/lib/registration/ui/import_certificate_dialog.rb:23
msgid "Certificate has expired"
msgstr "Сертификат просрочен"
#. SSL error message
-#: src/lib/registration/ui/import_certificate_dialog.rb:27
+#: src/lib/registration/ui/import_certificate_dialog.rb:25
msgid "Self signed certificate"
msgstr "Самоподписанный сертификат"
#. SSL error message
-#: src/lib/registration/ui/import_certificate_dialog.rb:29
+#: src/lib/registration/ui/import_certificate_dialog.rb:27
msgid "Self signed certificate in certificate chain"
msgstr "Самоподписанный сертификат в цепочке сертификатов"
#. push button
-#: src/lib/registration/ui/import_certificate_dialog.rb:73
+#: src/lib/registration/ui/import_certificate_dialog.rb:74
msgid "&Trust and Import"
msgstr "Д&оверие и импорт"
#. help text (RichText) for importing a SSL certificate (1/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:119
+#: src/lib/registration/ui/import_certificate_dialog.rb:122
msgid "<p>Secure connection (HTTPS) uses SSL certificates for verifying the authenticity of the server and for encrypting the transferred data.</p>"
msgstr "<p>Безопасное соединение (HTTPS) использует SSL-сертификаты для подтверждения подлинности сервера и для шифрования передаваемых данных.</p>"
#. help text (RichText) for importing a SSL certificate (2/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:123
+#: src/lib/registration/ui/import_certificate_dialog.rb:126
msgid "<p>You can choose to import the certificate it into the list of known certificate autohorities (CA), meaning that you trust the subject and the issuer of the unknown certificate.</p>"
msgstr "<p>Вы можете импортировать сертификат в список известных центров сертификации (CA) и таким образом подтвердить, что доверяете субъекту и издателю неизвестного сертификата.</p>"
#. help text (RichText) for importing a SSL certificate (3/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:128
+#: src/lib/registration/ui/import_certificate_dialog.rb:131
msgid "<p>Importing a certificate will allow to use for example a self-signed certificate.</p>"
msgstr "<p>Импорт сертификата позволит использовать, например, самозаверяющий сертификат.</p>"
#. help text (RichText) for importing a SSL certificate (4/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:132
+#: src/lib/registration/ui/import_certificate_dialog.rb:135
msgid "<p><b>Important:</b> You should verify the fingerprint of the certificate to be sure you import the genuine certificate from the requested server.</p>"
msgstr "<p><b>Важно!</b> Проверьте отпечаток сертификата, чтобы убедиться в импорте подлинного сертификата с запрашиваемого сервера.</p>"
#. help text (RichText) for importing a SSL certificate (5/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:137
+#: src/lib/registration/ui/import_certificate_dialog.rb:140
msgid "<p><b>Importing an unknown certificate without verification is a big security risk.</b></p>"
msgstr "<p><b>Импорт неизвестного сертификата без проверки представляет значительную угрозу.</b></p>"
#. error message, the entered URL is not valid
-#: src/lib/registration/ui/local_server_dialog.rb:60
+#: src/lib/registration/ui/local_server_dialog.rb:67
msgid "Invalid URL."
msgstr "Некорректный URL."
#. input field label
-#: src/lib/registration/ui/local_server_dialog.rb:97
+#: src/lib/registration/ui/local_server_dialog.rb:106
msgid "&Local Registration Server URL"
msgstr "UR&L локального сервера регистрации"
+#. register the base system if not already registered
+#: src/lib/registration/ui/media_addon_workflow.rb:130
+msgid ""
+"The base system has to be registered in order to register the '%s' add-on.\n"
+"Skip the base system and the add-on registration?"
+msgstr ""
+
+#. TRANSLATORS: dialog title
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:47
+#, fuzzy
+#| msgid "Edit Software Repositories"
+msgid "Migration Repositories"
+msgstr "Редактировать репозитории программ"
+
+#. TRANSLATORS: help text
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:50
+msgid "<p>In this dialog you can manually select which repositories willbe used for online migration. The packages will be upgraded to thehighest version found in the selected repositories.</p>"
+msgstr ""
+
+#. TRANSLATORS: Multiselection widget label
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:85
+msgid "Select the Migration Repositories"
+msgstr ""
+
+#. TRANSLATORS: Push button label, starts the repository management module
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:89
+#, fuzzy
+#| msgid "Updating software repositories..."
+msgid "Manage Repositories..."
+msgstr "Обновление репозиториев программного обеспечения..."
+
+#. TRANSLATORS: summary text, %s is a repository URL
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:114
+#, fuzzy
+#| msgid "Server URL: %s"
+msgid "URL: %s"
+msgstr "URL сервера: %s"
+
+#. TRANSLATORS: summary text, %s is a repository priority (1-99)
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:116
+msgid "Priority: %s"
+msgstr ""
+
+#. a dummy message which will be used later, just make sure we have it
+#. before the translation deadline...
+#. TRANSLATORS: popup question, confirm installing the available
+#. updates now
+#: src/lib/registration/ui/migration_repos_workflow.rb:50
+msgid ""
+"Online updates are available for installation.\n"
+"It is recommended to install all updates before proceeding.\n"
+"\n"
+"Would you like to install the updates now?"
+msgstr ""
+
+#. TRANSLATORS: error message, %s are details
+#: src/lib/registration/ui/migration_repos_workflow.rb:86
+msgid "Internal error: %s"
+msgstr ""
+
+#. TRANSLATORS: Error message
+#: src/lib/registration/ui/migration_repos_workflow.rb:170
+msgid "No installed product found."
+msgstr ""
+
+#. TRANSLATORS: Error message
+#: src/lib/registration/ui/migration_repos_workflow.rb:199
+msgid "No migration product found."
+msgstr ""
+
+#. TRANSLATORS: Progress label
+#: src/lib/registration/ui/migration_repos_workflow.rb:246
+#, fuzzy
+#| msgid "Registering Product..."
+#| msgid_plural "Registering Products..."
+msgid "Registering Migration Products..."
+msgstr "Регистрация продукта..."
+
+#. TRANSLATORS: progress message
+#: src/lib/registration/ui/migration_repos_workflow.rb:272
+#, fuzzy
+#| msgid "Updating software repositories..."
+msgid "Preparing Migration Repositories..."
+msgstr "Обновление репозиториев программного обеспечения..."
+
+#. TRANSLATORS: dialog title
+#: src/lib/registration/ui/migration_selection_dialog.rb:61
+msgid "Select the Migration Target"
+msgstr ""
+
+#. TRANSLATORS: help text (1/3)
+#: src/lib/registration/ui/migration_selection_dialog.rb:64
+#, fuzzy
+#| msgid "<p>Here you can select which extensions or moduleswill be registered together with the base product.</p>"
+msgid "<p>Here you can select the migration target products. The registrationserver may offer several possible migration to new products.</p>"
+msgstr "<p>Здесь можно выбрать, какие расширения или модули будут зарегистрированы с базовым продуктом.</p>"
+
+#. TRANSLATORS: help text (2/3)
+#: src/lib/registration/ui/migration_selection_dialog.rb:67
+msgid "<p>Only one migration target from the list can be selected.</p>"
+msgstr ""
+
+#. TRANSLATORS: help text (3/3), %s is replaced by the (translated) check box label
+#: src/lib/registration/ui/migration_selection_dialog.rb:69
+msgid "<p>Use the <b>%s</b> check box to manually select the migration repositories later.</p>"
+msgstr ""
+
+#. TRANSLATORS: check button label
+#: src/lib/registration/ui/migration_selection_dialog.rb:70
+#: src/lib/registration/ui/migration_selection_dialog.rb:139
+#, fuzzy
+#| msgid "Manual Interaction Required"
+msgid "Manually Select Migration Repositories"
+msgstr "Требуется ручное воздействие"
+
+#. TRANSLATORS: error popup, no target migration is selected
+#: src/lib/registration/ui/migration_selection_dialog.rb:96
+msgid "Select the target migration."
+msgstr ""
+
+#. TRANSLATORS: selection box label
+#: src/lib/registration/ui/migration_selection_dialog.rb:151
+msgid "Possible Migration Targets"
+msgstr ""
+
+#. TRANSLATORS: RichText header (details for the selected item)
+#: src/lib/registration/ui/migration_selection_dialog.rb:189
+msgid "Migration Summary"
+msgstr ""
+
+#. TRANSLATORS: An error message displayed in the migration details.
+#. The product has not been mirrored to the SMT server and cannot be used
+#. for migration. The SMT admin has to mirror the product to allow
+#. using the selected migration.
+#. %{url} is the URL of the registration server (SMT)
+#. %{product} is a full product name, e.g. "SUSE Linux Enterprise Server 12"
+#: src/lib/registration/ui/migration_selection_dialog.rb:212
+msgid "ERROR: Product <b>%{product}</b> is not available at the registration server (%{url}). Make the product available to allow using this migration."
+msgstr ""
+
+#. this is rather a theoretical case, but anyway....
+#. TRANSLATORS: Summary message, rich text format
+#. %s is a product name, e.g. "SUSE Linux Enterprise Server 12 SP1 x86_64"
+#: src/lib/registration/ui/migration_selection_dialog.rb:223
+msgid "%s <b>will be installed.</b>"
+msgstr ""
+
+#. TRANSLATORS: Summary message, rich text format
+#. %s is a product name, e.g. "SUSE Linux Enterprise Server 12"
+#: src/lib/registration/ui/migration_selection_dialog.rb:240
+msgid "%s <b>stays unchanged.</b>"
+msgstr ""
+
+#. TRANSLATORS: Summary message, rich text format
+#. %{old_product} is a product name, e.g. "SUSE Linux Enterprise Server 12"
+#. %{new_product} is a product name, e.g. "SUSE Linux Enterprise Server 12 SP1 x86_64"
+#: src/lib/registration/ui/migration_selection_dialog.rb:250
+msgid "%{old_product} <b>will be upgraded to</b> %{new_product}."
+msgstr ""
+
+#. TRANSLATORS: Summary message, rich text format
+#. %{old_product} and %{new_product} are product names
+#: src/lib/registration/ui/migration_selection_dialog.rb:255
+msgid "%{old_product} <b>will be downgraded to</b> %{new_product}."
+msgstr ""
+
+#. TRANSLATORS: an error popup message
+#: src/lib/registration/ui/migration_selection_dialog.rb:285
+msgid ""
+"The selected migration contains a product\n"
+"which is not available at the registration server.\n"
+"\n"
+"Select a different migration target or make the missing products\n"
+"available at the registration server."
+msgstr ""
+
+#. help text
+#: src/lib/registration/ui/registered_system_dialog.rb:40
+msgid "<p>The system is already registered.</p>"
+msgstr "<p>Система уже зарегистрирована.</p>"
+
+#: src/lib/registration/ui/registered_system_dialog.rb:41
+msgid "<p>You can re-register it again or you can register additional extension or modules to enhance the functionality of the system.</p>"
+msgstr "<p>Вы можете зарегистрировать ее повторно или зарегистрировать дополнительные расширения или модули, тем самым расширив ее возможности.</p>"
+
+#: src/lib/registration/ui/registered_system_dialog.rb:43
+msgid "<p>If you want to deregister your system you need to log into the SUSE Customer Center and remove the system manually there.</p>"
+msgstr "<p>Чтобы отменить регистрацию системы, необходимо войти в центр по работе с клиентами SUSE и удалить систему вручную.</p>"
+
+#. button label
+#: src/lib/registration/ui/registered_system_dialog.rb:70
+msgid "Select Extensions"
+msgstr "Выбрать расширения"
+
+#. button label
+#: src/lib/registration/ui/registered_system_dialog.rb:73
+msgid "Register Again"
+msgstr "Повторная регистрация"
+
+#: src/lib/registration/ui/registration_update_dialog.rb:42
+msgid "Registration is being updated..."
+msgstr "Обновление регистрации…"
+
+#: src/lib/registration/ui/registration_update_dialog.rb:43
+msgid "The previous registration is being updated."
+msgstr "Предыдущая регистрация обновляется."
+
+#. automatic registration refresh during system upgrade failed, register from scratch
+#: src/lib/registration/ui/registration_update_dialog.rb:65
+msgid ""
+"Automatic registration upgrade failed.\n"
+"You can manually register the system from scratch."
+msgstr ""
+"Не удалось автоматически обновить регистрацию.\n"
+"Вы можете вручную зарегистрировать систему заново."
+
#. ignore SUSE manager registration servers (bnc#894470)
-#: src/lib/registration/url_helpers.rb:213
+#: src/lib/registration/url_helpers.rb:203
msgid "Searching..."
msgstr "Поиск..."
-#: src/lib/registration/url_helpers.rb:213
+#: src/lib/registration/url_helpers.rb:203
msgid "Looking up local registration servers..."
msgstr "Поиск локальных серверов регистрации..."
+#~ msgid ""
+#~ "Registration added some update repositories.\n"
+#~ "\n"
+#~ "Do you want to install the latest available\n"
+#~ "on-line updates during installation?"
+#~ msgstr ""
+#~ "При регистрации добавлены некоторые репозитории обновлений.\n"
+#~ "\n"
+#~ "Вы хотите установить последние доступные\n"
+#~ "в Интернете обновления?"
+
#~ msgid "SSL Certificate"
#~ msgstr "Сертификат SSL"
@@ -876,12 +1145,6 @@
#~ msgid "Contacting the SUSE Customer Center server"
#~ msgstr "Соединение с сервером SUSE Customer Center"
-#~ msgid "Registering Product..."
-#~ msgid_plural "Registering Products..."
-#~ msgstr[0] "Регистрация продукта..."
-#~ msgstr[1] "Регистрация продуктов..."
-#~ msgstr[2] "Регистрация продуктов..."
-
#, fuzzy
#~| msgid ""
#~| "The email address or the registration\n"
@@ -1054,9 +1317,6 @@
#~ msgid "Updated software repositories"
#~ msgstr "Обновлённые репозитории программ"
-#~ msgid "Manual Interaction Required"
-#~ msgstr "Требуется ручное воздействие"
-
#~ msgid "Needed Information"
#~ msgstr "Необходима информация"
@@ -1399,15 +1659,9 @@
#~ msgid "Setting up online update source..."
#~ msgstr "Установка источника сетевого обновления..."
-#~ msgid "Updating software repositories..."
-#~ msgstr "Обновление репозиториев программного обеспечения..."
-
#~ msgid "Registration failed partially."
#~ msgstr "Частичный сбой регистрации."
-#~ msgid "No products found to be registered."
-#~ msgstr "Не найдены продукты для регистрации."
-
#~ msgid "unknown status"
#~ msgstr "неизвестный статус"
@@ -1699,9 +1953,6 @@
#~ msgid "<p>In <b>%1</b> set up the automatic online update. Choose the interval to use and if interactive patches should be ignored, otherwise the updater will use the default answers.</p>"
#~ msgstr "<p>Задайте автоматическое сетевое обновление в <b>%1</b>. Выберите используемый интервал и должны ли игнорироваться интерактивные исправления, иначе программа обновления будет использовать ответы по умолчанию.</p>"
-#~ msgid "Edit Software Repositories"
-#~ msgstr "Редактировать репозитории программ"
-
#~ msgid "Register for support and get update repository"
#~ msgstr "Зарегистрируйтесь для поддержки и получения репозитория обновлений"
1
0
30 Aug '15
Author: minton
Date: 2015-08-30 20:10:05 +0200 (Sun, 30 Aug 2015)
New Revision: 92429
Modified:
trunk/yast/ru/po/rear.ru.po
Log:
Merged rear.pot for ru
Modified: trunk/yast/ru/po/rear.ru.po
===================================================================
--- trunk/yast/ru/po/rear.ru.po 2015-08-30 18:10:03 UTC (rev 92428)
+++ trunk/yast/ru/po/rear.ru.po 2015-08-30 18:10:05 UTC (rev 92429)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: YaST (rear)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:53+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2013-09-18 23:29+0400\n"
"Last-Translator: Alexander Melentev <minton(a)opensuse.org>\n"
"Language-Team: Russian <opensuse-translation-ru(a)opensuse.org>\n"
@@ -230,13 +230,13 @@
msgstr "Чтение настроек rear"
#: src/include/rear/ui.rb:698
+msgid "Analyzing system"
+msgstr "Анализ системы"
+
+#: src/include/rear/ui.rb:698
msgid "Reading rear settings"
msgstr "Чтение настроек rear"
-#: src/include/rear/ui.rb:698
-msgid "Analyzing system"
-msgstr "Анализ системы"
-
#: src/include/rear/ui.rb:699
msgid "Analyzing system..."
msgstr "Анализ системы…"
1
0
30 Aug '15
Author: minton
Date: 2015-08-30 20:10:03 +0200 (Sun, 30 Aug 2015)
New Revision: 92428
Modified:
trunk/yast/ru/po/qt.ru.po
Log:
Merged qt.pot for ru
Modified: trunk/yast/ru/po/qt.ru.po
===================================================================
--- trunk/yast/ru/po/qt.ru.po 2015-08-30 18:10:02 UTC (rev 92427)
+++ trunk/yast/ru/po/qt.ru.po 2015-08-30 18:10:03 UTC (rev 92428)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: qt.ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2014-05-26 23:34+0400\n"
"Last-Translator: Alexander Melentev <minton(a)opensuse.org>\n"
"Language-Team: Russian <opensuse-translation-ru(a)opensuse.org>\n"
@@ -51,18 +51,21 @@
msgstr "Использовано %1"
#. Window title for help wizard window
-#. Help button - intentionally without keyboard shortcut
-#. "Help" button - intentionally without keyboard shortcut
-#: src/QY2HelpDialog.cc:63 src/QY2HelpDialog.cc:112 src/YQWizard.cc:853
-#: src/YQWizard.cc:1320
+#: src/QY2HelpDialog.cc:63 src/QY2HelpDialog.cc:112
msgid "Help"
msgstr "Справка"
#. Close button for wizard help window
-#: src/QY2HelpDialog.cc:66 src/QY2HelpDialog.cc:113
+#: src/QY2HelpDialog.cc:66 src/QY2HelpDialog.cc:113 src/QY2RelNotesDialog.cc:86
+#: src/QY2RelNotesDialog.cc:132
msgid "&Close"
msgstr "&Закрыть"
+#. Window title for help wizard window
+#: src/QY2RelNotesDialog.cc:83 src/QY2RelNotesDialog.cc:131
+msgid "Release Notes"
+msgstr "Примечания к выпуску"
+
#: src/QY2StyleEditor.cc:46
msgid "Stylesheet Editor"
msgstr "Редактор стилей"
@@ -81,12 +84,12 @@
msgstr "Неожиданное нажатие"
#. parent
-#: src/YQDialog.cc:623
+#: src/YQDialog.cc:629
msgid "Color switching"
msgstr "Переключение цвета"
#. caption
-#: src/YQDialog.cc:624
+#: src/YQDialog.cc:630
msgid ""
"Switching to color palette for vision impaired users -\n"
"press Shift-F4 again to switch back to normal colors."
@@ -119,20 +122,41 @@
msgid "Configure YaST Logging:"
msgstr "Настроить журналирование YaST:"
+#. Help button
+#. QT handles duplicate shortcuts, it can be kept (bnc#880983)
+#. "Help" button
+#. QT handles duplicate shortcuts, it can be kept (bnc#880983)
+#: src/YQWizard.cc:857 src/YQWizard.cc:1340
+#, fuzzy
+#| msgid "Help"
+msgid "&Help"
+msgstr "Справка"
+
#.
#. "Release Notes" button
#.
-#. Help button - intentionally without keyboard shortcut
-#: src/YQWizard.cc:869
-msgid "Release Notes"
+#. Release Notes button
+#. QT handles duplicate shortcuts, it can be kept (bnc#880983)
+#. "Release Notes" button
+#. QT handles duplicate shortcuts, it can be kept (bnc#880983)
+#: src/YQWizard.cc:874 src/YQWizard.cc:1355
+#, fuzzy
+#| msgid "Release Notes"
+msgid "&Release Notes"
msgstr "Примечания к выпуску"
-#. "Steps" button - intentionally without keyboard shortcut
-#: src/YQWizard.cc:1324
-msgid "Steps"
+#. "Steps" button
+#. QT handles duplicate shortcuts, it can be kept (bnc#880983)
+#: src/YQWizard.cc:1345
+#, fuzzy
+#| msgid "Steps"
+msgid "&Steps"
msgstr "Шаги"
-#. "Tree" button - intentionally without keyboard shortcut
-#: src/YQWizard.cc:1328
-msgid "Tree"
+#. "Tree" button
+#. QT handles duplicate shortcuts, it can be kept (bnc#880983)
+#: src/YQWizard.cc:1350
+#, fuzzy
+#| msgid "Tree"
+msgid "&Tree"
msgstr "Дерево"
1
0
30 Aug '15
Author: minton
Date: 2015-08-30 20:10:02 +0200 (Sun, 30 Aug 2015)
New Revision: 92427
Modified:
trunk/yast/ru/po/qt-pkg.ru.po
Log:
Merged qt-pkg.pot for ru
Modified: trunk/yast/ru/po/qt-pkg.ru.po
===================================================================
--- trunk/yast/ru/po/qt-pkg.ru.po 2015-08-30 18:10:00 UTC (rev 92426)
+++ trunk/yast/ru/po/qt-pkg.ru.po 2015-08-30 18:10:02 UTC (rev 92427)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: qt-pkg.ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2014-07-13 23:17+0400\n"
"Last-Translator: Alexander Melentev <minton(a)opensuse.org>\n"
"Language-Team: Russian <opensuse-translation-ru(a)opensuse.org>\n"
@@ -22,251 +22,259 @@
"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: Lokalize 1.5\n"
-#: src/YQPackageSelector.cc:315
+#: src/YQPackageSelector.cc:318
msgid "&Update Problems"
msgstr "Проблемы &обновления"
-#: src/YQPackageSelector.cc:342
+#: src/YQPackageSelector.cc:345
msgid "Patter&ns"
msgstr "Шабло&ны"
-#: src/YQPackageSelector.cc:364
+#: src/YQPackageSelector.cc:367
msgid "Package &Groups"
msgstr "&Группы пакетов"
-#: src/YQPackageSelector.cc:376
+#: src/YQPackageSelector.cc:379
msgid "&RPM Groups"
msgstr "Группы &RPM"
-#: src/YQPackageSelector.cc:389
+#: src/YQPackageSelector.cc:392
msgid "&Languages"
msgstr "&Языки"
-#: src/YQPackageSelector.cc:405
+#: src/YQPackageSelector.cc:408
msgid "&Repositories"
msgstr "&Репозитории"
-#: src/YQPackageSelector.cc:419
+#: src/YQPackageSelector.cc:422
msgid "S&earch"
msgstr "По&иск"
#. DEBUG
-#: src/YQPackageSelector.cc:426 src/YQPkgSearchFilterView.cc:113
+#: src/YQPackageSelector.cc:429 src/YQPkgSearchFilterView.cc:113
msgid "&Keywords"
msgstr "&Ключевые слова"
-#: src/YQPackageSelector.cc:435
+#: src/YQPackageSelector.cc:438
msgid "&Installation Summary"
msgstr "&Обзор установки"
-#: src/YQPackageSelector.cc:520
+#: src/YQPackageSelector.cc:526
msgid "D&escription"
msgstr "Описани&е"
-#: src/YQPackageSelector.cc:533
+#: src/YQPackageSelector.cc:539
msgid "&Technical Data"
msgstr "&Технические данные"
-#: src/YQPackageSelector.cc:546 src/YQPkgProductDialog.cc:115
+#: src/YQPackageSelector.cc:552 src/YQPkgProductDialog.cc:115
msgid "Dependencies"
msgstr "Зависимости"
-#: src/YQPackageSelector.cc:562
+#: src/YQPackageSelector.cc:567
msgid "&Versions"
msgstr "&Версии"
-#: src/YQPackageSelector.cc:580
+#: src/YQPackageSelector.cc:585
msgid "File List"
msgstr "Список файлов"
-#: src/YQPackageSelector.cc:597
+#: src/YQPackageSelector.cc:602
msgid "Change Log"
msgstr "Журнал изменений"
#. "Cancel" button
#. button #0
#. text
-#: src/YQPackageSelector.cc:624 src/YQPackageSelectorBase.cc:194
+#. button #0
+#: src/YQPackageSelector.cc:629 src/YQPackageSelectorBase.cc:194
#: src/YQPackageSelectorBase.cc:249 src/YQPackageSelectorBase.cc:305
#: src/YQPackageSelectorBase.cc:326 src/YQPatternSelector.cc:259
#: src/YQPkgConflictDialog.cc:163 src/YQPkgConflictDialog.cc:398
#: src/YQPkgSearchFilterView.cc:245 src/YQPkgTextDialog.cc:258
-#: src/YQSimplePatchSelector.cc:219
+#: src/YQPkgVersionsView.cc:429 src/YQSimplePatchSelector.cc:219
msgid "&Cancel"
msgstr "&Отмена"
#. Translators: "Accept" here refers to licenses or similar
-#: src/YQPackageSelector.cc:634 src/YQPatternSelector.cc:268
+#: src/YQPackageSelector.cc:639 src/YQPatternSelector.cc:268
#: src/YQPkgTextDialog.cc:258 src/YQSimplePatchSelector.cc:228
msgid "&Accept"
msgstr "Прин&ять"
-#: src/YQPackageSelector.cc:677
+#: src/YQPackageSelector.cc:682
msgid "&File"
msgstr "&Файл"
-#: src/YQPackageSelector.cc:679
+#: src/YQPackageSelector.cc:684
msgid "&Import..."
msgstr "&Импорт..."
-#: src/YQPackageSelector.cc:680
+#: src/YQPackageSelector.cc:685
msgid "&Export..."
msgstr "&Экспорт..."
-#: src/YQPackageSelector.cc:684
+#: src/YQPackageSelector.cc:689
msgid "E&xit -- Discard Changes"
msgstr "Вы&ход — Отменить изменения"
-#: src/YQPackageSelector.cc:685
+#: src/YQPackageSelector.cc:690
msgid "&Quit -- Save Changes"
msgstr "Выход — Сохранить изменени&я"
-#: src/YQPackageSelector.cc:697
+#: src/YQPackageSelector.cc:702
msgid "&Package"
msgstr "&Пакет"
-#: src/YQPackageSelector.cc:737 src/YQPkgPackageKitGroupsFilterView.cc:92
+#: src/YQPackageSelector.cc:742 src/YQPkgPackageKitGroupsFilterView.cc:92
#: src/YQPkgRepoFilterView.cc:149
msgid "All Packages"
msgstr "Все пакеты"
-#: src/YQPackageSelector.cc:739 src/YQPkgObjList.cc:430
+#: src/YQPackageSelector.cc:744 src/YQPkgObjList.cc:430
msgid "Update if newer version available"
msgstr "Обновить, если есть версия новее"
-#: src/YQPackageSelector.cc:742 src/YQPkgObjList.cc:415
-#: src/YQPkgObjList.cc:436
+#: src/YQPackageSelector.cc:747 src/YQPkgObjList.cc:415 src/YQPkgObjList.cc:436
msgid "Update unconditionally"
msgstr "Обновить безоговорочно"
-#: src/YQPackageSelector.cc:756
+#: src/YQPackageSelector.cc:761
msgid "&Patch"
msgstr "Ис&правление"
-#: src/YQPackageSelector.cc:783
+#: src/YQPackageSelector.cc:788
msgid "Confi&guration"
msgstr "&Настройка"
-#: src/YQPackageSelector.cc:784
+#: src/YQPackageSelector.cc:789
msgid "&Repositories..."
msgstr "&Репозитории..."
-#: src/YQPackageSelector.cc:785
+#: src/YQPackageSelector.cc:790
msgid "&Online Update..."
msgstr "Сетев&ое обновление..."
-#: src/YQPackageSelector.cc:795
+#: src/YQPackageSelector.cc:800
msgid "&Dependencies"
msgstr "&Зависимости"
-#: src/YQPackageSelector.cc:797
+#: src/YQPackageSelector.cc:802
msgid "&Check Now"
msgstr "Проверить &сейчас"
-#: src/YQPackageSelector.cc:798
+#: src/YQPackageSelector.cc:804
msgid "&Autocheck"
msgstr "&Автопроверка"
+#: src/YQPackageSelector.cc:809
+#, fuzzy
+#| msgid "Recommended Packages"
+msgid "Install &Recommended Packages"
+msgstr "Рекомендованные пакеты"
+
#. Translators: Menu for view options (Use a noun, not a verb!)
-#: src/YQPackageSelector.cc:811
+#: src/YQPackageSelector.cc:822
msgid "&Options"
msgstr "Пара&метры"
#. Translators: This is about packages ending in "-devel", so don't translate that "-devel"!
-#: src/YQPackageSelector.cc:814
+#: src/YQPackageSelector.cc:825
msgid "Show -de&vel Packages"
msgstr "Показать -de&vel пакеты"
#. Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"!
-#: src/YQPackageSelector.cc:823
+#: src/YQPackageSelector.cc:834
msgid "Show -&debuginfo/-debugsource Packages"
msgstr "Показать -&debuginfo/-debugsource пакеты"
# Translators: button
# TODO ...
-#: src/YQPackageSelector.cc:831
+#: src/YQPackageSelector.cc:842
msgid "&System Verification Mode"
msgstr "Режим проверки &системы"
-#: src/YQPackageSelector.cc:836
-msgid "&Ignore Recommended Packages for Already Installed Packages"
-msgstr "&Игнорировать рекомендованные пакеты для уже установленных пакетов"
-
-#: src/YQPackageSelector.cc:842
+#: src/YQPackageSelector.cc:847
msgid "&Cleanup when deleting packages"
msgstr "&Удалять ставшие ненужными зависимости"
-#: src/YQPackageSelector.cc:846
+#: src/YQPackageSelector.cc:851
msgid "&Allow vendor change"
msgstr "Р&азрешить смену поставщика"
-#: src/YQPackageSelector.cc:859
+#: src/YQPackageSelector.cc:864
msgid "E&xtras"
msgstr "&Дополнительно"
-#: src/YQPackageSelector.cc:861
+#: src/YQPackageSelector.cc:866
msgid "Show &Products"
msgstr "Показать &продукты"
-#: src/YQPackageSelector.cc:862
+#: src/YQPackageSelector.cc:867
msgid "Show P&ackage Changes"
msgstr "Показать изменения п&акетов"
-#: src/YQPackageSelector.cc:863
+#: src/YQPackageSelector.cc:868
msgid "Show &History"
msgstr "Показать &историю"
#. Translators: This is about packages ending in "-devel", so don't translate that "-devel"!
-#: src/YQPackageSelector.cc:871
+#: src/YQPackageSelector.cc:876
msgid "Install All Matching -&devel Packages"
msgstr "Установить все соответствующие пакеты -&devel"
#. Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"!
-#: src/YQPackageSelector.cc:875
+#: src/YQPackageSelector.cc:880
msgid "Install All Matching -de&buginfo Packages"
msgstr "Установить все соответствующие пакеты -de&buginfo"
#. Translators: This is about packages ending in "-debugsource", so don't translate that "-debugsource"!
-#: src/YQPackageSelector.cc:878
+#: src/YQPackageSelector.cc:883
msgid "Install All Matching -debug&source Packages"
msgstr "Установить все соответствующие пакеты -de&bugsource"
-#: src/YQPackageSelector.cc:883
+#: src/YQPackageSelector.cc:885
+#, fuzzy
+#| msgid "Install All Matching -&devel Packages"
+msgid "Install All Matching &Recommended Packages"
+msgstr "Установить все соответствующие пакеты -&devel"
+
+#: src/YQPackageSelector.cc:891
msgid "Generate Dependency Resolver &Test Case"
msgstr "Генерировать кон&трольный пример разрешения зависимостей"
-#: src/YQPackageSelector.cc:903
+#: src/YQPackageSelector.cc:911
msgid "&Help"
msgstr "Справ&ка"
#. Note: The help functions and their texts are moved out
#. to a separate source file YQPackageSelectorHelp.cc
#. Menu entry for help overview
-#: src/YQPackageSelector.cc:909
+#: src/YQPackageSelector.cc:917
msgid "&Overview"
msgstr "&Обзор"
#. Menu entry for help about used symbols ( icons )
-#: src/YQPackageSelector.cc:912
+#: src/YQPackageSelector.cc:920
msgid "&Symbols"
msgstr "&Символы"
#. Menu entry for keyboard help
-#: src/YQPackageSelector.cc:915
+#: src/YQPackageSelector.cc:923
msgid "&Keys"
msgstr "&Клавиши"
-#: src/YQPackageSelector.cc:1101
+#: src/YQPackageSelector.cc:1109
msgid "All package dependencies are OK."
msgstr "Все зависимости пакетов удовлетворены."
-#: src/YQPackageSelector.cc:1117
+#: src/YQPackageSelector.cc:1125
msgid "P&atches"
msgstr "Испр&авления"
#. startsWith
#. filter
-#: src/YQPackageSelector.cc:1179
+#: src/YQPackageSelector.cc:1187
msgid "Save Package List"
msgstr "Сохранить список пакетов"
@@ -274,59 +282,59 @@
#. parent
#. Post error popup.
#. parent
-#: src/YQPackageSelector.cc:1218 src/YQPackageSelector.cc:1312
+#: src/YQPackageSelector.cc:1226 src/YQPackageSelector.cc:1320
#: src/YQPkgConflictDialog.cc:425 src/YQPkgConflictList.cc:201
#: src/YQPkgList.cc:605
msgid "Error"
msgstr "Ошибка"
#. caption
-#: src/YQPackageSelector.cc:1219
+#: src/YQPackageSelector.cc:1227
msgid "Error exporting package list to %1"
msgstr "Ошибка при экспорте списка пакетов в %1"
-#: src/YQPackageSelector.cc:1231
+#: src/YQPackageSelector.cc:1239
msgid "Load Package List"
msgstr "Загрузить список пакетов"
#. caption
-#: src/YQPackageSelector.cc:1313
+#: src/YQPackageSelector.cc:1321
msgid "Error loading package list from %1"
msgstr "Ошибка загрузки списка пакетов из %1"
#. caption
#. Translators: %1 is the number of affected packages
-#: src/YQPackageSelector.cc:1415
+#: src/YQPackageSelector.cc:1423
msgid "%1 packages will be updated"
msgstr "Будет обновлено пакетов: %1"
-#: src/YQPackageSelector.cc:1416
+#: src/YQPackageSelector.cc:1424
msgid "&Continue"
msgstr "Продолж&ить"
-#: src/YQPackageSelector.cc:1416
+#: src/YQPackageSelector.cc:1424
msgid "C&ancel"
msgstr "Отмен&а"
-#: src/YQPackageSelector.cc:1455
+#: src/YQPackageSelector.cc:1463
msgid "<p><small><a href=\"repoupgraderemove:///%1\">Cancel switching</a> system packages to versions in repository %2</small></p>"
msgstr "<p><small><a href=\"repoupgraderemove:///%1\">Отменить переход</a> системных пакетов на версии из репозитория %2</small></p>"
-#: src/YQPackageSelector.cc:1474
+#: src/YQPackageSelector.cc:1482
msgid "<p><a href=\"repoupgradeadd:///%1\">Switch system packages</a> to the versions in this repository (%2)</p>"
msgstr "<p><a href=\"repoupgradeadd:///%1\">Перевести системные пакеты</a> на версии из этого репозитория (%2)</p>"
-#: src/YQPackageSelector.cc:1697
+#: src/YQPackageSelector.cc:1571 src/YQPackageSelector.cc:1726
msgid "Added Subpackages:"
msgstr "Добавленные под-пакеты:"
#. "OK" button
#. addHStretch( hbox );
#. "OK" button
-#: src/YQPackageSelector.cc:1699 src/YQPackageSelectorBase.cc:214
-#: src/YQPkgDescriptionDialog.cc:120 src/YQPkgDiskUsageList.cc:156
-#: src/YQPkgDiskUsageList.cc:165 src/YQPkgProductDialog.cc:135
-#: src/YQPkgTextDialog.cc:71
+#: src/YQPackageSelector.cc:1572 src/YQPackageSelector.cc:1728
+#: src/YQPackageSelectorBase.cc:214 src/YQPkgDescriptionDialog.cc:120
+#: src/YQPkgDiskUsageList.cc:156 src/YQPkgDiskUsageList.cc:165
+#: src/YQPkgProductDialog.cc:135 src/YQPkgTextDialog.cc:71
msgid "&OK"
msgstr "&OK"
@@ -373,7 +381,7 @@
msgstr "В дополнение к выбранным вами пакетам для удовлетворения зависимостей был изменен статус следующих пакетов:"
#: src/YQPackageSelectorBase.cc:305 src/YQPackageSelectorBase.cc:326
-#: src/YQPkgConflictDialog.cc:397
+#: src/YQPkgConflictDialog.cc:397 src/YQPkgVersionsView.cc:428
msgid "C&ontinue"
msgstr "Пр&одолжить"
@@ -1522,10 +1530,43 @@
"Наиболее безопасный путь — удалить их.\n"
"</p>"
-#: src/YQPkgVersionsView.cc:211
+#: src/YQPkgVersionsView.cc:207
msgid "%1-%2 from vendor %3 (installed)"
msgstr "%1-%2 от %3 (установлено)"
+#. Translators: Popup dialog text. Try to keep the lines about the same length.
+#: src/YQPkgVersionsView.cc:398
+msgid ""
+"You are trying to install multiversion-capable\n"
+"and non-multiversion-capable versions of this\n"
+"package at the same time."
+msgstr ""
+
+#: src/YQPkgVersionsView.cc:406
+msgid ""
+"This version is multiversion-capable.\n"
+"\n"
+"Press \"Continue\" to install this version\n"
+"and unselect the non-multiversion-capable version,\n"
+"\"Cancel\" to unselect this version and keep the other one."
+msgstr ""
+
+#: src/YQPkgVersionsView.cc:415
+msgid ""
+"This version is not multiversion-capable.\n"
+"\n"
+"Press \"Continue\" to install only this version\n"
+"and unselect all other versions,\n"
+"\"Cancel\" to unselect this version and keep the other ones."
+msgstr ""
+
+#. Dialog heading
+#: src/YQPkgVersionsView.cc:423
+#, fuzzy
+#| msgid "Unmaintained Packages"
+msgid "Incompatible Package Versions"
+msgstr "Неразрабатываемые пакеты"
+
#. Translators: %1 is a package version, %2 the package architecture,
#. %3 describes the repository where it comes from,
#. %4 is the repository's priority
@@ -1533,13 +1574,13 @@
#. Examples:
#. 2.5.23-i568 from Packman with priority 100 and vendor openSUSE
#. 3.17.4-i386 from openSUSE-11.1 update repository with priority 20 and vendor openSUSE
-#. ^^^^^^ ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^ ^^^^^^^^
-#. %1 %2 %3 %4 %5
-#: src/YQPkgVersionsView.cc:365 src/YQPkgVersionsView.cc:402
+#. ^^^^^^ ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^ ^^^^^^^^
+#. %1 %2 %3 %4 %5
+#: src/YQPkgVersionsView.cc:549 src/YQPkgVersionsView.cc:586
msgid "%1-%2 from %3 with priority %4 and vendor %5"
msgstr "%1-%2 из %3 с приоритетом %4 от %5"
-#: src/YQPkgVersionsView.cc:386
+#: src/YQPkgVersionsView.cc:570
msgid "This version is installed in your system."
msgstr "Эта версия уже установлена в вашей системе."
@@ -1551,6 +1592,9 @@
msgid "Package libqdialogsolver is required for this feature."
msgstr "Для этой возможности необходим пакет libqdialogsolver."
+#~ msgid "&Ignore Recommended Packages for Already Installed Packages"
+#~ msgstr "&Игнорировать рекомендованные пакеты для уже установленных пакетов"
+
#~ msgid "Close the current page"
#~ msgstr "Закрыть текущую страницу"
1
0
30 Aug '15
Author: minton
Date: 2015-08-30 20:10:00 +0200 (Sun, 30 Aug 2015)
New Revision: 92426
Modified:
trunk/yast/ru/po/proxy.ru.po
Log:
Merged proxy.pot for ru
Modified: trunk/yast/ru/po/proxy.ru.po
===================================================================
--- trunk/yast/ru/po/proxy.ru.po 2015-08-30 18:09:57 UTC (rev 92425)
+++ trunk/yast/ru/po/proxy.ru.po 2015-08-30 18:10:00 UTC (rev 92426)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-29 16:21+0100\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2012-11-18 04:40+0400\n"
"Last-Translator: Alexander Melentyev <minton(a)opensuse.org>\n"
"Language-Team: Russian <opensuse-translation-ru(a)opensuse.org>\n"
@@ -16,102 +16,6 @@
"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: Lokalize 1.5\n"
-#. Commandline help title
-#. Proxy dialog caption
-#: src/clients/proxy.rb:32 src/include/proxy/dialogs.rb:399
-msgid "Proxy Configuration"
-msgstr "Настройка прокси"
-
-# dialog caption
-#. command-line help
-#: src/clients/proxy.rb:40
-msgid "Enable proxy settings"
-msgstr "Использовать параметры работы через прокси-сервер"
-
-# dialog caption
-#. command-line help
-#: src/clients/proxy.rb:48
-msgid "Disable proxy settings"
-msgstr "Не использовать параметры работы через прокси-сервер"
-
-#. command-line help
-#: src/clients/proxy.rb:56
-msgid "Change the current proxy settings"
-msgstr "Изменить параметры работы через прокси-сервер"
-
-#. command-line help
-#: src/clients/proxy.rb:66
-msgid "Set the authentication for proxy"
-msgstr "Установить аутентификацию для прокси-сервера"
-
-#. command-line help
-#: src/clients/proxy.rb:76
-msgid "Show the summary of the current settings"
-msgstr "Показать отчёт о текущих настройках"
-
-#. command-line option help
-#: src/clients/proxy.rb:88
-msgid "Set HTTP proxy"
-msgstr "Задать HTTP прокси-сервер"
-
-#. command-line option help
-#: src/clients/proxy.rb:93
-msgid "Set HTTPS proxy"
-msgstr "Задать HTTPS прокси-сервер"
-
-#. command-line option help
-#: src/clients/proxy.rb:98
-msgid "Set FTP proxy"
-msgstr "Задать FTP прокси-сервер"
-
-#. command-line option help
-#: src/clients/proxy.rb:103
-msgid "Clear all options listed"
-msgstr "Очистить все перечисленные опции"
-
-#. command-line option help
-#: src/clients/proxy.rb:107
-msgid "Set domains for not using the proxy settings"
-msgstr "Укажите домены, для которых не используются настройки прокси-сервера"
-
-#. command-line option help
-#: src/clients/proxy.rb:114
-msgid "The username to be used for proxy authentication"
-msgstr "Имя пользователя, используемое для аутентификации на прокси-сервере"
-
-#. command-line option help
-#: src/clients/proxy.rb:121
-msgid "The password to be used for proxy authentication"
-msgstr "Пароль, используемый для аутентификации на прокси-сервере"
-
-#. ask the user
-#. translators: command line prompt for entering a password
-#: src/clients/proxy.rb:238
-msgid "Password:"
-msgstr "Пароль:"
-
-#. Return a modification status
-#. @return true if data was modified
-#: src/clients/proxy_auto.rb:109
-msgid "Status of Proxy Configuration"
-msgstr "Состояние параметров работы через прокси-сервер"
-
-#: src/clients/proxy_auto.rb:110
-msgid "Enabled"
-msgstr "Включено"
-
-#: src/clients/proxy_auto.rb:112
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/clients/proxy_auto.rb:116
-msgid "HTTPS"
-msgstr "HTTPS"
-
-#: src/clients/proxy_auto.rb:120
-msgid "FTP"
-msgstr "FTP"
-
#. Informative label
#: src/include/proxy/dialogs.rb:101
msgid "No details available."
@@ -180,6 +84,12 @@
msgid "Proxy settings work correctly."
msgstr "Настройки прокси-сервера работают правильно."
+#. Proxy dialog caption
+#. Commandline help title
+#: src/include/proxy/dialogs.rb:399 src/lib/proxy/client.rb:27
+msgid "Proxy Configuration"
+msgstr "Настройка прокси"
+
#. Proxy dialog help 1/8
#: src/include/proxy/dialogs.rb:405
msgid ""
@@ -322,7 +232,7 @@
msgstr "Пр&оверить параметры работы через прокси-сервер"
#. Popup error text - http, https and ftp proxy URLs are blank
-#: src/include/proxy/dialogs.rb:619
+#: src/include/proxy/dialogs.rb:615
msgid ""
"Proxy is enabled, but no proxy URL has been specified.\n"
"Really use these settings?"
@@ -330,7 +240,7 @@
"Работа через прокси-сервер включена, однако его URL-адрес не указан.\n"
"Использовать эти параметры?"
-#: src/include/proxy/dialogs.rb:632
+#: src/include/proxy/dialogs.rb:628
msgid ""
"Security warning:\n"
"Username and password will be stored unencrypted\n"
@@ -343,42 +253,42 @@
"Действительно использовать эти настройки?"
#. Popup::Error text
-#: src/include/proxy/dialogs.rb:647
+#: src/include/proxy/dialogs.rb:643
msgid "You cannot enter a password and leave the user name empty."
msgstr "Вы не можете ввести пароль и оставить имя пользователя пустым."
#. Popup::Error text
-#: src/include/proxy/dialogs.rb:655
+#: src/include/proxy/dialogs.rb:651
msgid "HTTP proxy URL is invalid."
msgstr "URL прокси-сервера HTTP неверен."
#. Popup::Error text
-#: src/include/proxy/dialogs.rb:663
+#: src/include/proxy/dialogs.rb:659
msgid "HTTP proxy URL must contain a scheme specification (http)."
msgstr "URL прокси-сервера HTTP должен содержать спецификацию схемы (http)."
#. Popup::Error text
-#: src/include/proxy/dialogs.rb:672
+#: src/include/proxy/dialogs.rb:668
msgid "The HTTPS proxy URL is invalid."
msgstr "URL прокси-сервера HTTPS неверен."
#. Popup::Error text
-#: src/include/proxy/dialogs.rb:680
+#: src/include/proxy/dialogs.rb:676
msgid "The HTTPS proxy URL must contain a scheme specification (http)."
msgstr "URL прокси-сервера HTTPS должен содержать спецификацию схемы (http)."
#. Popup::Error text
-#: src/include/proxy/dialogs.rb:691
+#: src/include/proxy/dialogs.rb:687
msgid "FTP proxy URL is invalid."
msgstr "URL прокси-сервера FTP неверен."
#. Popup::Error text
-#: src/include/proxy/dialogs.rb:699
+#: src/include/proxy/dialogs.rb:695
msgid "FTP proxy URL must contain a scheme specification (http)."
msgstr "URL прокси-сервера FTP должен содержать спецификацию схемы (http)."
#. Translators: no proxy domain is a domain that can be accessed without proxy
-#: src/include/proxy/dialogs.rb:709
+#: src/include/proxy/dialogs.rb:705
msgid ""
"One or more no proxy domains are invalid. \n"
"Check if all domains match one of the following:\n"
@@ -394,54 +304,144 @@
"* Полное имя узла\n"
"* Имя домена, начинающееся с '.'"
+#. Return a modification status
+#. @return true if data was modified
+#: src/lib/proxy/auto_client.rb:104
+msgid "Status of Proxy Configuration"
+msgstr "Состояние параметров работы через прокси-сервер"
+
+#: src/lib/proxy/auto_client.rb:105
+msgid "Enabled"
+msgstr "Включено"
+
+#: src/lib/proxy/auto_client.rb:107
+msgid "HTTP"
+msgstr "HTTP"
+
+#: src/lib/proxy/auto_client.rb:111
+msgid "HTTPS"
+msgstr "HTTPS"
+
+#: src/lib/proxy/auto_client.rb:115
+msgid "FTP"
+msgstr "FTP"
+
+# dialog caption
+#. command-line help
+#: src/lib/proxy/client.rb:35
+msgid "Enable proxy settings"
+msgstr "Использовать параметры работы через прокси-сервер"
+
+# dialog caption
+#. command-line help
+#: src/lib/proxy/client.rb:43
+msgid "Disable proxy settings"
+msgstr "Не использовать параметры работы через прокси-сервер"
+
+#. command-line help
+#: src/lib/proxy/client.rb:51
+msgid "Change the current proxy settings"
+msgstr "Изменить параметры работы через прокси-сервер"
+
+#. command-line help
+#: src/lib/proxy/client.rb:61
+msgid "Set the authentication for proxy"
+msgstr "Установить аутентификацию для прокси-сервера"
+
+#. command-line help
+#: src/lib/proxy/client.rb:71
+msgid "Show the summary of the current settings"
+msgstr "Показать отчёт о текущих настройках"
+
+#. command-line option help
+#: src/lib/proxy/client.rb:83
+msgid "Set HTTP proxy"
+msgstr "Задать HTTP прокси-сервер"
+
+#. command-line option help
+#: src/lib/proxy/client.rb:88
+msgid "Set HTTPS proxy"
+msgstr "Задать HTTPS прокси-сервер"
+
+#. command-line option help
+#: src/lib/proxy/client.rb:93
+msgid "Set FTP proxy"
+msgstr "Задать FTP прокси-сервер"
+
+#. command-line option help
+#: src/lib/proxy/client.rb:98
+msgid "Clear all options listed"
+msgstr "Очистить все перечисленные опции"
+
+#. command-line option help
+#: src/lib/proxy/client.rb:102
+msgid "Set domains for not using the proxy settings"
+msgstr "Укажите домены, для которых не используются настройки прокси-сервера"
+
+#. command-line option help
+#: src/lib/proxy/client.rb:109
+msgid "The username to be used for proxy authentication"
+msgstr "Имя пользователя, используемое для аутентификации на прокси-сервере"
+
+#. command-line option help
+#: src/lib/proxy/client.rb:116
+msgid "The password to be used for proxy authentication"
+msgstr "Пароль, используемый для аутентификации на прокси-сервере"
+
+#. ask the user
+#. translators: command line prompt for entering a password
+#: src/lib/proxy/client.rb:233
+msgid "Password:"
+msgstr "Пароль:"
+
#. Popup headline
-#: src/modules/Proxy.rb:45
+#: src/modules/Proxy.rb:38
msgid "Proxy Configuration Successfully Saved"
msgstr "Настройки прокси-сервера успешно сохранены"
-#: src/modules/Proxy.rb:46
+#: src/modules/Proxy.rb:39
msgid "It is recommended to relogin to make new proxy settings effective."
msgstr "Рекомендуется войти заново, чтобы новые настройки прокси вступили в силу."
-#. Write routing settings and apply changes
+#. Write proxy settings and apply changes
#. @return true if success
-#: src/modules/Proxy.rb:131
+#: src/modules/Proxy.rb:174
msgid "Update proxy configuration"
msgstr "Обновить настройки прокси-сервера"
# PowerManagement read dialog caption
-#: src/modules/Proxy.rb:133
+#: src/modules/Proxy.rb:176
msgid "Saving Proxy Configuration"
msgstr "Сохранение настроек прокси-сервера"
#. sleep for longer time, so that progress does not disappear right afterwards
#. but only when Progress is visible
-#: src/modules/Proxy.rb:141
+#: src/modules/Proxy.rb:184
msgid "Updating proxy configuration..."
msgstr "Обновление настроек прокси-сервера..."
#. Summary text
-#: src/modules/Proxy.rb:437
+#: src/modules/Proxy.rb:418
msgid "Proxy is disabled."
msgstr "Прокси-сервер отключён."
#. Summary text
-#: src/modules/Proxy.rb:442
+#: src/modules/Proxy.rb:423
msgid "Proxy is enabled."
msgstr "Прокси-сервер включён."
#. Summary text
-#: src/modules/Proxy.rb:451
+#: src/modules/Proxy.rb:432
msgid "HTTP Proxy: %1"
msgstr "HTTP прокси-сервер: %1"
#. Summary text
-#: src/modules/Proxy.rb:459
+#: src/modules/Proxy.rb:440
msgid "HTTPS Proxy: %1"
msgstr "HTTPS прокси-сервер: %1"
#. Summary text
-#: src/modules/Proxy.rb:466
+#: src/modules/Proxy.rb:447
msgid "FTP Proxy: %1"
msgstr "FTP прокси-сервер: %1"
1
0
30 Aug '15
Author: minton
Date: 2015-08-30 20:09:57 +0200 (Sun, 30 Aug 2015)
New Revision: 92425
Modified:
trunk/yast/ru/po/printer.ru.po
Log:
Merged printer.pot for ru
Modified: trunk/yast/ru/po/printer.ru.po
===================================================================
--- trunk/yast/ru/po/printer.ru.po 2015-08-30 18:09:54 UTC (rev 92424)
+++ trunk/yast/ru/po/printer.ru.po 2015-08-30 18:09:57 UTC (rev 92425)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: printer.ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:53+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2012-04-05 16:06+0400\n"
"Last-Translator: Alexander Melentyev <minton(a)opensuse.org>\n"
"Language-Team: Russian <opensuse-translation-ru(a)opensuse.org>\n"
@@ -195,7 +195,7 @@
#. where %1 will be replaced by the server name:
#. where %1 will be replaced by the server name:
#. where %1 will be replaced by the server name:
-#: src/include/printer/autoconfig.rb:97 src/include/printer/overview.rb:1101
+#: src/include/printer/autoconfig.rb:97 src/include/printer/overview.rb:1098
#: src/include/printer/policies.rb:135
#: src/include/printer/printingvianetwork.rb:463
#: src/include/printer/sharing.rb:639
@@ -211,8 +211,8 @@
#. Only a simple message because this error does not happen on a normal system
#. (i.e. a system which is not totally broken or totally messed up).
#. Remove the 'ServerName' entry in /etc/cups/client.conf:
-#: src/include/printer/autoconfig.rb:115 src/include/printer/overview.rb:220
-#: src/include/printer/overview.rb:1118 src/include/printer/policies.rb:153
+#: src/include/printer/autoconfig.rb:115 src/include/printer/overview.rb:217
+#: src/include/printer/overview.rb:1115 src/include/printer/policies.rb:153
#: src/include/printer/printingvianetwork.rb:478
#: src/include/printer/sharing.rb:657
msgid "Failed to remove the 'ServerName' entry in /etc/cups/client.conf"
@@ -397,7 +397,7 @@
#. the currently used driver is then the very first entry in the SelectionBox.
#: src/include/printer/basicadd.rb:187 src/include/printer/basicadd.rb:356
#: src/include/printer/basicadd.rb:588 src/include/printer/basicmodify.rb:1082
-#: src/modules/Printer.rb:1960 src/modules/Printer.rb:1986
+#: src/modules/Printer.rb:1954 src/modules/Printer.rb:1980
msgid "Select a driver."
msgstr "Выберите драйвер."
@@ -443,8 +443,8 @@
#. does not set a valid Printer::selected_connections_index so that the BasicAddDialog
#. does not preselect a connection so that the first connection in the list is preselected
#. (via Table widget fallback) which is still better than an arbitrary preselected entry:
-#: src/include/printer/basicadd.rb:337 src/include/printer/overview.rb:593
-#: src/include/printer/overview.rb:679 src/include/printer/overview.rb:1153
+#: src/include/printer/basicadd.rb:337 src/include/printer/overview.rb:590
+#: src/include/printer/overview.rb:676 src/include/printer/overview.rb:1150
msgid "Nothing Selected"
msgstr "Ничего не выбрано"
@@ -622,8 +622,8 @@
#. Exit this dialog in any case:
#. Return at least a list with only a fallback string so that the user is informed:
#. Have the PageSize option topmost:
-#: src/include/printer/basicmodify.rb:853 src/modules/Printer.rb:2211
-#: src/modules/Printer.rb:2341
+#: src/include/printer/basicmodify.rb:853 src/modules/Printer.rb:2205
+#: src/modules/Printer.rb:2335
msgid "No driver options available"
msgstr "Опции драйвера недоступны"
@@ -953,7 +953,11 @@
#. The user can also decide during the actual installation not to install it
#. or the installation may have failed for whatever reason
#. so that we test again whether or not it is now actually installed:
+#. The user can also decide during the actual installation not to install it
+#. or the installation may have failed for whatever reason
+#. so that we test again whether or not it is now actually installed:
#: src/include/printer/connectionwizard.rb:2002
+#: src/include/printer/connectionwizard.rb:2061
msgid "The RPM package cups-backends is not installed."
msgstr "RPM-пакет cups-backends не установлен."
@@ -962,130 +966,127 @@
msgid "Program (/path/to/command?option=value) [percent-encoded]"
msgstr "Программа (/путь/к/команде?option=value) [процентное кодирование]"
+#: src/include/printer/connectionwizard.rb:2044
+#, fuzzy
+#| msgid "To print via 'pipe', the RPM package cups-backends must be installed."
+msgid "To use 'beh', the RPM package cups-backends must be installed."
+msgstr "Для печати через 'канал' должен быть установлен RPM-пакет cups-backends."
+
#. TRANSLATORS: Text entry for device URI (Uniform Resource Identifier)
-#: src/include/printer/connectionwizard.rb:2139
+#: src/include/printer/connectionwizard.rb:2163
msgid "Device URI (for which 'beh' should be applied) [percent-encoded]"
msgstr "URI устройства (к которому должно быть применено \"beh\") [процентное кодирование]"
#. TRANSLATORS: Check box
-#: src/include/printer/connectionwizard.rb:2149
+#: src/include/printer/connectionwizard.rb:2173
msgid "Never Disable the Queue"
msgstr "Никогда не отключать очередь"
#. TRANSLATORS: Text entry
-#: src/include/printer/connectionwizard.rb:2157
+#: src/include/printer/connectionwizard.rb:2181
msgid "Number of Retries ('0' means infinite retries)"
msgstr "Количество повторных попыток (\"0\" означает бесконечное повторение)"
#. TRANSLATORS: Text entry
-#: src/include/printer/connectionwizard.rb:2165
+#: src/include/printer/connectionwizard.rb:2189
msgid "Delay in Seconds Between Two Retries"
msgstr "Задержка в секундах между двумя повторными попытками"
-#: src/include/printer/connectionwizard.rb:2172
-#: src/include/printer/connectionwizard.rb:2265
+#: src/include/printer/connectionwizard.rb:2197
+#: src/include/printer/connectionwizard.rb:2293
msgid "Select a specific connection type."
msgstr "Выберите тип подключения."
#. TRANSLATORS: Label for tree widget description
-#: src/include/printer/connectionwizard.rb:2190
+#: src/include/printer/connectionwizard.rb:2215
msgid "&Connection Type"
msgstr "Тип под&ключения"
#. TRANSLATORS: Tree widget item
-#: src/include/printer/connectionwizard.rb:2195
+#: src/include/printer/connectionwizard.rb:2220
msgid "Directly Connected Device"
msgstr "Напрямую подключённое устройство"
-#: src/include/printer/connectionwizard.rb:2198
-msgid "Parallel Port"
-msgstr "Параллельный порт"
-
+#. Disabled legacy "Parallel Port" so that it is no longer accessible in the dialog:
+#. Item(Id(:parallel), _("Parallel Port")),
#. TRANSLATORS: Tree widget item
-#: src/include/printer/connectionwizard.rb:2200
+#: src/include/printer/connectionwizard.rb:2226
msgid "USB Port"
msgstr "Порт USB"
#. TRANSLATORS: Tree widget item
-#: src/include/printer/connectionwizard.rb:2202
+#: src/include/printer/connectionwizard.rb:2228
msgid "HP Devices (HPLIP)"
msgstr "Устройства HP (HPLIP)"
#. TRANSLATORS: Tree widget item
-#: src/include/printer/connectionwizard.rb:2204
-msgid "Serial Port"
-msgstr "Последовательный порт"
-
+#. Disabled legacy "Serial Port" so that it is no longer accessible in the dialog:
+#. Item(Id(:serial), _("Serial Port")),
#. TRANSLATORS: Tree widget item
-#: src/include/printer/connectionwizard.rb:2206
+#: src/include/printer/connectionwizard.rb:2233
msgid "Bluetooth"
msgstr "Bluetooth"
#. TRANSLATORS: Tree widget item
-#: src/include/printer/connectionwizard.rb:2212
+#: src/include/printer/connectionwizard.rb:2239
msgid "Access Network Printer or Printserver Box via"
msgstr "Доступ к сетевому принтеру или принтсерверу через"
-#: src/include/printer/connectionwizard.rb:2215
+#: src/include/printer/connectionwizard.rb:2242
msgid "TCP Port (AppSocket/JetDirect)"
msgstr "Порт TCP (AppSocket/JetDirect)"
#. TRANSLATORS: Tree widget item
-#: src/include/printer/connectionwizard.rb:2217
+#: src/include/printer/connectionwizard.rb:2244
msgid "Line Printer Daemon (LPD) Protocol"
msgstr "Протокол Line Printer Daemon (LPD)"
#. TRANSLATORS: Tree widget item
-#: src/include/printer/connectionwizard.rb:2219
+#: src/include/printer/connectionwizard.rb:2246
msgid "Internet Printing Protocol (IPP)"
msgstr "Протокол интернет-печати (IPP)"
#. TRANSLATORS: Tree widget item
-#: src/include/printer/connectionwizard.rb:2225
+#: src/include/printer/connectionwizard.rb:2252
msgid "Print via Print Server Machine"
msgstr "Печать через принтсервер"
-#: src/include/printer/connectionwizard.rb:2228
+#: src/include/printer/connectionwizard.rb:2255
msgid "Windows (R) or Samba (SMB/CIFS)"
msgstr "Windows (R) или Samba (SMB/CIFS)"
#. TRANSLATORS: Tree widget item
-#: src/include/printer/connectionwizard.rb:2230
+#: src/include/printer/connectionwizard.rb:2257
msgid "Traditional UNIX Server (LPR/LPD)"
msgstr "Традиционный сервер UNIX (LPR/LPD)"
#. `item( `id(`iprint), _("iPrint (Novell OES)") ),
#. TRANSLATORS: Tree widget item
-#: src/include/printer/connectionwizard.rb:2233
+#: src/include/printer/connectionwizard.rb:2260
msgid "CUPS Server (IPP)"
msgstr "Сервер CUPS (IPP)"
#. TRANSLATORS: Tree widget item
-#: src/include/printer/connectionwizard.rb:2235
-msgid "Novell Netware Print Server (IPX)"
-msgstr "Принтсервер Novell Netware (IPX)"
-
-#. TRANSLATORS: Tree widget item
-#: src/include/printer/connectionwizard.rb:2241
+#: src/include/printer/connectionwizard.rb:2269
msgid "Special"
msgstr "Особый"
-#: src/include/printer/connectionwizard.rb:2244
+#: src/include/printer/connectionwizard.rb:2272
msgid "Specify Arbitrary Device URI"
msgstr "Укажите произвольный URI устройства"
#. TRANSLATORS: Tree widget item
-#: src/include/printer/connectionwizard.rb:2248
+#: src/include/printer/connectionwizard.rb:2276
msgid "Send Print Data to Other Program (pipe)"
msgstr "Отправить данные печати другой программе (pipe)"
#. TRANSLATORS: Tree widget item
-#: src/include/printer/connectionwizard.rb:2251
+#: src/include/printer/connectionwizard.rb:2279
msgid "Daisy-chain Backend Error Handler (beh)"
msgstr "Обработчик ошибок фонового механизма последовательного опроса (beh)"
#. TRANSLATORS: Tree widget item
-#: src/include/printer/connectionwizard.rb:2262
+#: src/include/printer/connectionwizard.rb:2290
msgid "Connection Settings"
msgstr "Настройки подключения"
@@ -1100,7 +1101,7 @@
#. and the button with the "back" functionality is named "Cancel".
#. According to the YaST Style Guide (dated Thu, 06 Nov 2008)
#. the "finish" button in a single (step) configuration dialog must now be named "OK".
-#: src/include/printer/connectionwizard.rb:2285
+#: src/include/printer/connectionwizard.rb:2313
msgid "Connection Wizard"
msgstr "Мастер подключения"
@@ -1109,12 +1110,12 @@
#. i.e. the scsi backend will be dropped.
#. Therefore in yast2-printer SCSI printer support is also dropped.
#. Because of the dropped scsi backend there must be a user notification:
-#: src/include/printer/connectionwizard.rb:2338
+#: src/include/printer/connectionwizard.rb:2366
msgid "In CUPS version 1.5 SCSI printer support is dropped."
msgstr "Из CUPS 1.5 исключена поддержка SCSI-принтеров."
#. Popup::ErrorDetails details (for experts only):
-#: src/include/printer/connectionwizard.rb:2340
+#: src/include/printer/connectionwizard.rb:2368
msgid ""
"An untested and insecure workaround might be\n"
"to set 'FileDevice Yes' in cupsd.conf\n"
@@ -1127,13 +1128,13 @@
#. while a Device URI to access a network printer via IPP
#. does probably not contain "/printers/" so that this is used here
#. as a best effort attempt to distinguish both cases:
-#: src/include/printer/connectionwizard.rb:2415
+#: src/include/printer/connectionwizard.rb:2443
msgid "Select a connection"
msgstr "Выберите подключение"
#. Body of a Popup::AnyMessage when no connection was selected
#. because there is no connection available to be selected:
-#: src/include/printer/connectionwizard.rb:2418
+#: src/include/printer/connectionwizard.rb:2446
msgid ""
"If no connection is shown here, it is not possible\n"
"to access the device via this type of connection.\n"
@@ -1143,13 +1144,13 @@
"невозможно получить доступ к устройству через подключение\n"
"этого типа. Был ли принтер подсоединён м включён всё время?"
-#: src/include/printer/connectionwizard.rb:2426
+#: src/include/printer/connectionwizard.rb:2454
msgid "Select a valid connection"
msgstr "Выберите верное подключение"
#. Body of a Popup::AnyMessage when an invalid connection was selected
#. because the current connection is no longer valid:
-#: src/include/printer/connectionwizard.rb:2429
+#: src/include/printer/connectionwizard.rb:2457
msgid ""
"When the current connection is no longer valid,\n"
"it does no longer work to access the device via this connection.\n"
@@ -1159,41 +1160,45 @@
"то и получить доступ к устройству по этому подключению нельзя.\n"
"Принтер всё ещё подсоединён и включён?"
-#: src/include/printer/connectionwizard.rb:2469
+#: src/include/printer/connectionwizard.rb:2497
msgid "Serial device and baud rate could not be empty."
msgstr "Последовательное устройство и скорость не могут быть пустыми."
-#: src/include/printer/connectionwizard.rb:2473
+#: src/include/printer/connectionwizard.rb:2501
msgid "The 'space' parity checking is only supported with 7 data bits."
msgstr "Проверка чётности 'space' поддерживается только для 7 битов данных."
-#: src/include/printer/connectionwizard.rb:2481
+#: src/include/printer/connectionwizard.rb:2509
msgid "The 'mark' parity checking is only supported with 7 data bits and 1 stop bit."
msgstr "Проверка чётности 'mark' поддерживается только для 7 битов данных и 1 стоп-бита."
-#: src/include/printer/connectionwizard.rb:2523
+#: src/include/printer/connectionwizard.rb:2551
msgid "Bluetooth device ID could not be empty."
msgstr "ID bluetooth-устройства не может быть пустым."
#. because special URI characters like ':' or '/' in connection_uri
#. must stay as is and not be percent encoded because only the values
#. of the URI parts must be percent encoded but not the whole URI.
-#: src/include/printer/connectionwizard.rb:2536
+#: src/include/printer/connectionwizard.rb:2564
msgid "URI could not be empty."
msgstr "URI не может быть пустым."
-#: src/include/printer/connectionwizard.rb:2546
+#: src/include/printer/connectionwizard.rb:2574
msgid "Servername and printer could not be empty."
msgstr "Имя сервера и принтер не могут быть пустыми."
-#: src/include/printer/connectionwizard.rb:2552
+#: src/include/printer/connectionwizard.rb:2580
msgid "Both user and password must be specified."
msgstr "Должны быть указаны и имя пользователя, и пароль."
#. because special URI characters like '=' or '&' in tcp_uri_options
#. must stay as is and not be percent encoded because tcp_uri_options
#. contains all options like 'option1=value1&option2=value2'.
-#: src/include/printer/connectionwizard.rb:2616
+#. Test whether or not a "client-only" server is accessible.
+#. @param [String] server_name string of the "client-only" server name
+#.
+#. @return false if the "client-only" server is not accessible.
+#: src/include/printer/connectionwizard.rb:2644 src/modules/Printer.rb:2348
msgid "Servername could not be empty."
msgstr "Имя сервера не может быть пустым."
@@ -1203,31 +1208,31 @@
#. because special URI characters like '=' or '&' in cups_uri_options
#. must stay as is and not be percent encoded because cups_uri_options
#. contains all options like 'option1=value1&option2=value2'.
-#: src/include/printer/connectionwizard.rb:2654
-#: src/include/printer/connectionwizard.rb:2693
-#: src/include/printer/connectionwizard.rb:2720
+#: src/include/printer/connectionwizard.rb:2682
+#: src/include/printer/connectionwizard.rb:2721
+#: src/include/printer/connectionwizard.rb:2748
msgid "Servername and queue name could not be empty."
msgstr "Имена сервера и очереди не могут быть пустыми."
-#: src/include/printer/connectionwizard.rb:2747
+#: src/include/printer/connectionwizard.rb:2775
msgid "Device URI, number of retries, and delay could not be empty."
msgstr "URI устройства, количество повторных попыток и задержка не могут быть пустыми."
#. because special URI characters like '/ ? = &' in pipe
#. must stay as is and not be percent encoded because pipe
#. contains all like 'path/to/command?option1=value1&option2=value2'
-#: src/include/printer/connectionwizard.rb:2761
+#: src/include/printer/connectionwizard.rb:2789
msgid "Could not be empty."
msgstr "Не может быть пустым."
# selection boc title
#. Do not change or translate "raw", it is a technical term
#. when no driver is used for a print queue.
-#: src/include/printer/connectionwizard.rb:2784
+#: src/include/printer/connectionwizard.rb:2812
msgid "Select a manufacturer or 'raw queue'."
msgstr "Выберите производителя или «сырую очередь»."
-#: src/include/printer/connectionwizard.rb:2802
+#: src/include/printer/connectionwizard.rb:2830
msgid "Look up all hosts in the local network"
msgstr "Искать все узлы в локальной сети"
@@ -1236,11 +1241,11 @@
#. Body of a Popup::ShowFeedback:
#. Body of a Popup::ShowFeedback:
#. Body of a Popup::ShowFeedback:
-#: src/include/printer/connectionwizard.rb:2804
-#: src/include/printer/connectionwizard.rb:2831
-#: src/include/printer/connectionwizard.rb:2846
-#: src/include/printer/connectionwizard.rb:2861
-#: src/include/printer/connectionwizard.rb:2876
+#: src/include/printer/connectionwizard.rb:2832
+#: src/include/printer/connectionwizard.rb:2859
+#: src/include/printer/connectionwizard.rb:2874
+#: src/include/printer/connectionwizard.rb:2889
+#: src/include/printer/connectionwizard.rb:2904
msgid ""
"Please wait...\n"
"This could take more than a minute."
@@ -1249,25 +1254,25 @@
"Это может занять больше минуты."
#. where %1 will be replaced by the port number:
-#: src/include/printer/connectionwizard.rb:2827
+#: src/include/printer/connectionwizard.rb:2855
msgid "Scan for hosts which are accessible via TCP port %1"
msgstr "Сканировать узлы, доступные по TCP через порт %1"
#. Sleep half a second to let the user notice the Popup::ShowFeedback in any case
#. before it is removed even when the above SCR::Read finished immediately:
-#: src/include/printer/connectionwizard.rb:2844
+#: src/include/printer/connectionwizard.rb:2872
msgid "Scan for hosts which are accessible via Samba (SMB)"
msgstr "Сканировать узлы, доступные через Samba (SMB)"
#. Sleep half a second to let the user notice the Popup::ShowFeedback in any case
#. before it is removed even when the above SCR::Read finished immediately:
-#: src/include/printer/connectionwizard.rb:2859
+#: src/include/printer/connectionwizard.rb:2887
msgid "Scan for hosts which are accessible via port 515 (LPD/LPR)"
msgstr "Сканировать узлы, доступные через порт 515 (LPD/LPR)"
#. Sleep half a second to let the user notice the Popup::ShowFeedback in any case
#. before it is removed even when the above SCR::Read finished immediately:
-#: src/include/printer/connectionwizard.rb:2874
+#: src/include/printer/connectionwizard.rb:2902
msgid "Scan for hosts which are accessible via port 631 (CUPS/IPP)"
msgstr "Сканировать узлы, доступные через порт 631 (CUPS/IPP)"
@@ -1277,7 +1282,7 @@
#. });
#. Sleep half a second to let the user notice the Popup::ShowFeedback in any case
#. before it is removed even when the above SCR::Read finished immediately:
-#: src/include/printer/connectionwizard.rb:2901
+#: src/include/printer/connectionwizard.rb:2929
msgid ""
"Scanning in the network did not find any host.\n"
"(Network issue or firewall active?)"
@@ -1287,7 +1292,7 @@
#. where %1 will be replaced by the port number
#. and %2 will be replaced by the host name:
-#: src/include/printer/connectionwizard.rb:2941
+#: src/include/printer/connectionwizard.rb:2969
msgid "Access test failed for port '%1' on host '%2'."
msgstr "Сбой проверки доступа к порту '%1' узла '%2'."
@@ -1297,14 +1302,14 @@
#. and %2 will be replaced by the host name:
#. where %1 will be replaced by the queue name
#. and %2 will be replaced by the host name:
-#: src/include/printer/connectionwizard.rb:2968
-#: src/include/printer/connectionwizard.rb:2994
-#: src/include/printer/connectionwizard.rb:3093
+#: src/include/printer/connectionwizard.rb:2996
+#: src/include/printer/connectionwizard.rb:3022
+#: src/include/printer/connectionwizard.rb:3121
msgid "Access test failed for queue '%1' on host '%2'."
msgstr "Сбой проверки доступа к очереди '%1' узла '%2'."
#. because there is authentication via Active Directory (R) required:
-#: src/include/printer/connectionwizard.rb:3012
+#: src/include/printer/connectionwizard.rb:3040
msgid ""
"This is only a generic test which may untruly report failures\n"
"if authentication via Active Directory (R) is required.\n"
@@ -1318,29 +1323,29 @@
#. where %1 will be replaced by the SMB share name
#. and %2 will be replaced by the host name:
-#: src/include/printer/connectionwizard.rb:3043
+#: src/include/printer/connectionwizard.rb:3071
msgid "The generic test reports failures for share '%1' on host '%2'."
msgstr "Общий тест сообщает о сбое для общего ресурса '%1' узла '%2'."
#. where %1 will be replaced by the SMB share name
#. and %2 will be replaced by the host name:
-#: src/include/printer/connectionwizard.rb:3063
+#: src/include/printer/connectionwizard.rb:3091
msgid "Access test failed for share '%1' on host '%2'."
msgstr "Сбой проверки доступа к общему ресурсу '%1' узла '%2'."
#. Message of a Popup::ErrorDetails
-#: src/include/printer/connectionwizard.rb:3105
+#: src/include/printer/connectionwizard.rb:3133
msgid "Test OK"
msgstr "Тест ОК"
#. Without a link name /usr/lib[64]/cups/backend/smb (which is provided by samba-client)
#. the rest makes no sense (in particular the ln commands would create nonsense links in $PWD):
-#: src/include/printer/connectionwizard.rb:3245
+#: src/include/printer/connectionwizard.rb:3273
msgid "To support Active Directory (R), the RPM package samba-krb-printing must be installed."
msgstr "Для поддержки Active Directory (R) должен быть установлен RPM-пакет samba-krb-printing."
#. Show a user notification before it gets disabled:
-#: src/include/printer/connectionwizard.rb:3285
+#: src/include/printer/connectionwizard.rb:3313
msgid "Active Directory (R) support will be disabled for all SMB print queues."
msgstr "Поддержка Active Directory (R) будет отключена для всех очередей печати SMB."
@@ -1482,29 +1487,22 @@
msgid "SpliX Driver for SPL Printers without JBIG"
msgstr "Драйвер SpliX для принтеров SPL без JBIG"
-#. CheckBox to select or un-select the printer driver package m2300w.
-#. There is no need to have the package name "m2300w" in this text
-#. because it is shown in a separated column to the left of this text.
-#: src/include/printer/driveradd.rb:190
-msgid "Driver for Konica Minolta 2300W and 2400W (unmaintained)"
-msgstr "Драйвер для Konica Minolta 2300W и 2400W (не поддерживается)"
-
#. CheckBox to select or un-select the printer driver package epson-inkjet-printer-escpr.
#. There is no need to have the package name "epson-inkjet-printer-escpr" in this text
#. because it is shown in a separated column to the left of this text.
-#: src/include/printer/driveradd.rb:201
+#: src/include/printer/driveradd.rb:202
msgid "Epson ESC/P-R Inkjet Printer Driver"
msgstr "Драйвер принтера Epson ESC/P-R Inkjet"
#. Header for a dialog section where the user can
#. make a printer description file (PPD file) available
#. so that it can be used to set up a print queue with it:
-#: src/include/printer/driveradd.rb:214
+#: src/include/printer/driveradd.rb:215
msgid "Make a Printer Description File Available"
msgstr "Сделать файл описания принтера доступным"
#. TextEntry to specify the full path of a PPD file:
-#: src/include/printer/driveradd.rb:224
+#: src/include/printer/driveradd.rb:225
msgid "Printer description &file name with full path where it is located"
msgstr "Имя &файла описания принтера с полным путём, где он расположен"
@@ -1512,40 +1510,40 @@
# appears in help text too
#. Label of a PushButton to open a file selection box
#. to browse the file system to select a PPD file:
-#: src/include/printer/driveradd.rb:234
+#: src/include/printer/driveradd.rb:235
msgid "&Browse"
msgstr "О&бзор"
# popup
#. Header for a AskForExistingFile popup dialog
#. to browse the file system to select a PPD file:
-#: src/include/printer/driveradd.rb:273
+#: src/include/printer/driveradd.rb:274
msgid "Select a printer description file"
msgstr "Выберите файл описания принтера."
#. where %1 will be replaced by the file name:
-#: src/include/printer/driveradd.rb:660
+#: src/include/printer/driveradd.rb:666
msgid "Cannot access '%1'"
msgstr "Невозможно получить доступ к '%1'"
#. Simply exit this dialog because it does not make sense to proceed here
#. and there is nothing else to be done after this:
-#: src/include/printer/driveradd.rb:679
+#: src/include/printer/driveradd.rb:685
msgid "The printer description file is not in compliance with the specification."
msgstr "Файл описания принтера не соответствует спецификации."
#. when a PPD file is not in compliance:
-#: src/include/printer/driveradd.rb:694
+#: src/include/printer/driveradd.rb:700
msgid "Use the printer description file regardless of its errors?"
msgstr "Использовать файл описания принтера, несмотря на его ошибки?"
#. Body of a Popup::ContinueCancelHeadline
#. when PPD file is not in compliance:
-#: src/include/printer/driveradd.rb:699
+#: src/include/printer/driveradd.rb:705
msgid "A non-compliant printer description file can lead to arbitrary failures."
msgstr "Несовместимый файл описания принтера может привести к различным сбоям."
-#: src/include/printer/driveradd.rb:716
+#: src/include/printer/driveradd.rb:722
msgid "Failed to make the printer description file available"
msgstr "Не удалось сделать файл описания принтера доступным"
@@ -2345,12 +2343,42 @@
#. ConnectionWizardDialog help 2/7:
#: src/include/printer/helps.rb:450
+#, fuzzy
+#| msgid ""
+#| "<p>\n"
+#| "<b><big>Printer Device URI</big></b><br>\n"
+#| "A connection is specified as so called <b>device URI</b>.<br>\n"
+#| "Its first word (the so called URI scheme) specifies the kind of data-transfer,\n"
+#| "for example 'parallel', 'usb', 'socket', 'lpd', or 'ipp'.<br>\n"
+#| "After the scheme there are more or less additional components\n"
+#| "which specify the details for this kind of data-transfer.<br>\n"
+#| "Space characters are not allowed in an URI.\n"
+#| "Therefore a space character in a value of an URI component\n"
+#| "is encoded as '%20' (20 is the hexadecimal value of the space character).<br>\n"
+#| "The components of an URI are separated by special reserved characters like\n"
+#| "colon ':', slash '/', question mark '?', ampersand '&', or equals sign '='.<br>\n"
+#| "Finally there could be optional parameters (separated by a question mark '?')\n"
+#| "of the form 'option1=value1&option2=value2&option3=value3' so that\n"
+#| "a full device URI could be for example:<br>\n"
+#| "ipp://server.domain:631/printers/queuename?waitjob=false&waitprinter=false<br>\n"
+#| "Some examples:<br>\n"
+#| "A USB printer model 'Fun Printer 1000+' made by 'ACME'\n"
+#| "with serial number 'A1B2C3' may have a device URI like:<br>\n"
+#| "usb://ACME/Fun%20Printer%201000%2B?serial=A1B2C3<br>\n"
+#| "A network printer with IP 192.168.100.1 which is accessible\n"
+#| "via port 9100 may have a device URI like:<br>\n"
+#| "socket://192.168.100.1:9100<br>\n"
+#| "A network printer with IP 192.168.100.2 which is accessible\n"
+#| "via LPD protocol with a remote LPD queue name 'LPT1'\n"
+#| "may have a device URI like:<br>\n"
+#| "lpd://192.168.100.2/LPT1\n"
+#| "</p>"
msgid ""
"<p>\n"
"<b><big>Printer Device URI</big></b><br>\n"
"A connection is specified as so called <b>device URI</b>.<br>\n"
"Its first word (the so called URI scheme) specifies the kind of data-transfer,\n"
-"for example 'parallel', 'usb', 'socket', 'lpd', or 'ipp'.<br>\n"
+"for example 'usb', 'socket', 'lpd', or 'ipp'.<br>\n"
"After the scheme there are more or less additional components\n"
"which specify the details for this kind of data-transfer.<br>\n"
"Space characters are not allowed in an URI.\n"
@@ -2557,60 +2585,13 @@
msgid ""
"<p>\n"
"<b><big>Device URIs for Directly Connected Devices</big></b><br>\n"
-"Devices which are connected via the parallel port or via USB\n"
+"Devices which are connected via USB\n"
"are autodetected and the appropriate device URI is autogenerated.\n"
"For example:<br>\n"
-"parallel:/dev/lp0<br>\n"
-"usb://ACME/Fun%20Printer?serial=A1B2C3<br>\n"
-"hp:/usb/HP_LaserJet?serial=1234<br>\n"
-"Usually only the autogenerated device URIs work.\n"
-"When the device is not autodetected, there is usually no communication\n"
-"with the device possible and no data can be sent to the device.<br>\n"
-"To access a HP printer or all-in-one device via the backend 'hp',\n"
-"the RPM package hplip must be installed.\n"
-"The package provides HP's printing and scanning software HPLIP.<br>\n"
-"In contrast devices which are connected via serial port or bluetooth\n"
-"are not autodetected so that the device URI must be manually specified.\n"
-"The serial device URI parameters must comply with\n"
-"what the serial port in the printer requires,\n"
-"see the manual of your serial printer.\n"
-"Example device URIs:<br>\n"
-"serial:/dev/ttyS9?baud=9600+bits=8+parity=none+flow=soft+stop=1<br>\n"
-"bluetooth://1A2B3C4D5E6F<br>\n"
-"To access a device via bluetooth, the RPM package bluez-cups must be installed.\n"
-"The package provides the CUPS backend 'bluetooth' which actually sends the data\n"
-"to a bluetooth printer.\n"
-"</p>"
msgstr ""
-"<p>\n"
-"<b><big>URI напрямую подключённых устройств</big></b><br>\n"
-"Устройства, подключённые через параллельный порт или USB,\n"
-"обнаруживаются автоматически и для них создаётся подходящий URI устройства.\n"
-"Например:<br>\n"
-"parallel:/dev/lp0<br>\n"
-"usb://ACME/Fun%20Printer?serial=A1B2C3<br>\n"
-"hp:/usb/HP_LaserJet?serial=1234<br>\n"
-"Обычно работают только автоматически созданные URI.\n"
-"Когда устройство не обнаруживается автоматически, связь с устройством\n"
-"обычно невозможна и устройству нельзя отправить данные.<br>\n"
-"Для доступа к принтеру или МФУ от HP через механизм 'hp'\n"
-"должен быть установлен RPM-пакет hplip.\n"
-"Пакет предоставляет ПО печати и сканирования HPLIP от HP.<br>\n"
-"Наоборот, устройства, подключаемые по последовательному порту или bluetooth\n"
-"обычно не обнаруживаются автоматически и URI устройств нужно указывать вручную.\n"
-"Параметры URI последовательного устройства должны соответствовать\n"
-"требованиям последовательного порта на принтере,\n"
-"см. руководство вашего последовательного принтера.\n"
-"Примеры URI устройств:<br>\n"
-"serial:/dev/ttyS9?baud=9600+bits=8+parity=none+flow=soft+stop=1<br>\n"
-"bluetooth://1A2B3C4D5E6F<br>\n"
-"Для доступа к устройству по bluetooth должен быть установлен RPM-пакет bluez-cups.\n"
-"Пакет предоставляет механизм CUPS 'bluetooth', который, собственно, и посылает данные\n"
-"bluetooth-принтеру.\n"
-"</p>"
#. ConnectionWizardDialog help 5/7:
-#: src/include/printer/helps.rb:586
+#: src/include/printer/helps.rb:588
msgid ""
"<p>\n"
"<b><big>Device URIs to Access a Network Printer or a Printserver Box</big></b><br>\n"
@@ -2687,7 +2668,92 @@
"</p>\n"
#. ConnectionWizardDialog help 6/7:
-#: src/include/printer/helps.rb:625
+#: src/include/printer/helps.rb:627
+#, fuzzy
+#| msgid ""
+#| "<p>\n"
+#| "<b><big>Device URIs to Print Via a Print Server Machine</big></b><br>\n"
+#| "In contrast to a printserver box a print server machine\n"
+#| "means a real computer which offers a print service.<br>\n"
+#| "Access happens via various different network protocols.\n"
+#| "Ask your network administrator what which print server machine\n"
+#| "provides in your particular network:<br>\n"
+#| "<b>Windows (R) or Samba (SMB/CIFS)</b><br>\n"
+#| "To access a SMB printer share, the RPM package samba-client must be installed.\n"
+#| "The package provides the CUPS backend 'smb' which is a link to\n"
+#| "the <tt>/usr/bin/smbspool</tt> program which actually sends the data\n"
+#| "to a SMB printer share.<br>\n"
+#| "A server name and a printer share name and optionally a workgroup name\n"
+#| "is needed to access it.\n"
+#| "Furthermore a user name and a password may be required to get access.\n"
+#| "Have in mind that spaces and special characters in those values\n"
+#| "must be percent-encoded (see above).<br>\n"
+#| "By default CUPS runs backends (here smbspool) as user 'lp'.\n"
+#| "When printing in an Active Directory (R) environment (AD)\n"
+#| "the user 'lp' is not allowed to print in this environment\n"
+#| "so that the traditional way to print via smbspool as user 'lp'\n"
+#| "would not work.<br>\n"
+#| "For printing in an AD environment additionally\n"
+#| "the RPM package samba-krb-printing must be installed.\n"
+#| "In this case the CUPS backend 'smb' link\n"
+#| "is changed to <tt>/usr/bin/get_printing_ticket</tt>\n"
+#| "which is a wrapper to run smbspool as the original user\n"
+#| "who submitted a particular print job.\n"
+#| "When the Kerberos protocol is used for authentication\n"
+#| "in an AD environment, a user gets a ticket granting ticket (TGT)\n"
+#| "via the display manager during login at the Gnome or KDE desktop.\n"
+#| "When smbspool is run as the original user who submitted\n"
+#| "a particular print job, it can access the TGT of this user\n"
+#| "and use it to pass the printing data to the SMB printer share\n"
+#| "even in an AD environment with Kerberos authentication.\n"
+#| "In this case neither a fixed user name nor a fixed password\n"
+#| "has to be specified for authentication.\n"
+#| "A precondition is that get_printing_ticket runs on the same host\n"
+#| "where the user who submitted a particular print job is logged in.\n"
+#| "This means that it must be set up on the workstation\n"
+#| "for the particular user who will submit such print jobs\n"
+#| "and the user's workstation must send its printing data\n"
+#| "directly to the SMB printer share in the AD environment.\n"
+#| "In particular it does not work on a separated CUPS server machine\n"
+#| "where users who submit print jobs are not logged in.<br>\n"
+#| "For the traditional way a matching full device URI is:<br>\n"
+#| "smb://username:password@workgroup/server/printer<br>\n"
+#| "For example 'John Doe' with password '@home!' may use something like\n"
+#| "the following device URI to access a 'Fun Printer 1000+' share:<br>\n"
+#| "smb://John%20Doe:%40home%21@MYGROUP/homeserver/Fun%20Printer%201000%2B<br>\n"
+#| "For <b>more information</b> have a look at <tt>man smbspool</tt> and<br>\n"
+#| "http://en.opensuse.org/SDB:Printing_via_SMB_(Samba)_Share_or_Windows_Share<br>\n"
+#| "'Windows' and 'Active Directory' are registered trademarks\n"
+#| "of Microsoft Corporation in the United States and/or other countries.<br>\n"
+#| "<b>Traditional UNIX Server (LPR)</b><br>\n"
+#| "A Line Printer Daemon (LPD) runs on a traditional UNIX server\n"
+#| "and provides one or more LPD queues.\n"
+#| "The IP address and a LPD queue name is needed to access it.\n"
+#| "The matching device URI is:<br>\n"
+#| "lpd://ip-address/queue<br>\n"
+#| "<b>CUPS Server</b><br>\n"
+#| "Usually you should not set up a local print queue to access\n"
+#| "a remote queue on a CUPS server. Instead do the setup\n"
+#| "in the <b>Print Via Network</b> dialog.\n"
+#| "Only if you really know that you must set up a local print queue\n"
+#| "to access a remote queue on a CUPS server proceed here.<br>\n"
+#| "IPP is the native protocol for CUPS which runs on a server.\n"
+#| "The official IANA port for IPP is 631.\n"
+#| "The matching device URI is:<br>\n"
+#| "ipp://ip-address:631/printers/queue<br>\n"
+#| "<b>Novell Netware Print Server (IPX)</b><br>\n"
+#| "To access print queues on a Novell Netware print server,\n"
+#| "the RPM package ncpfs must be installed.\n"
+#| "The package provides the CUPS backend 'novell' which runs\n"
+#| "the <tt>nprint</tt> program which actually sends the data\n"
+#| "to a Novell Netware print queue.\n"
+#| "A server name and a printer queue name is needed to access it.\n"
+#| "Furthermore a user name and a password may be required to get access.\n"
+#| "The matching device URI is:<br>\n"
+#| "novell://username:password@server/queue<br>\n"
+#| "For <b>more information</b> have a look at <tt>man nprint</tt> and\n"
+#| "the other documentation in the RPM package ncpfs.\n"
+#| "</p>"
msgid ""
"<p>\n"
"<b><big>Device URIs to Print Via a Print Server Machine</big></b><br>\n"
@@ -2759,19 +2825,6 @@
"The official IANA port for IPP is 631.\n"
"The matching device URI is:<br>\n"
"ipp://ip-address:631/printers/queue<br>\n"
-"<b>Novell Netware Print Server (IPX)</b><br>\n"
-"To access print queues on a Novell Netware print server,\n"
-"the RPM package ncpfs must be installed.\n"
-"The package provides the CUPS backend 'novell' which runs\n"
-"the <tt>nprint</tt> program which actually sends the data\n"
-"to a Novell Netware print queue.\n"
-"A server name and a printer queue name is needed to access it.\n"
-"Furthermore a user name and a password may be required to get access.\n"
-"The matching device URI is:<br>\n"
-"novell://username:password@server/queue<br>\n"
-"For <b>more information</b> have a look at <tt>man nprint</tt> and\n"
-"the other documentation in the RPM package ncpfs.\n"
-"</p>"
msgstr ""
"<p>\n"
"<b><big>URI устройств для печати через принтсервер на машине</big></b><br>\n"
@@ -2853,7 +2906,46 @@
"</p>"
#. ConnectionWizardDialog help 7/7:
-#: src/include/printer/helps.rb:711
+#: src/include/printer/helps.rb:714
+#, fuzzy
+#| msgid ""
+#| "<p>\n"
+#| "<b><big>Special Device URIs</big></b><br>\n"
+#| "<b>Specify an Arbitrary Device URI</b>\n"
+#| "if you know the exact right device URI for your particular case\n"
+#| "or to modify an existing device URI in a special way.<br>\n"
+#| "<b>Send Print Data to Other Program (pipe)</b><br>\n"
+#| "To do this, the RPM package cups-backends must be installed.\n"
+#| "The package provides the CUPS backend 'pipe' which runs\n"
+#| "the program that you specified here.\n"
+#| "The matching device URI is:<br>\n"
+#| "pipe:/path/to/targetcommand<br>\n"
+#| "<b>Daisy-chain Backend Error Handler (beh)</b><br>\n"
+#| "To do this, the RPM package foomatic-filters must be installed.\n"
+#| "The package provides the CUPS backend 'beh'.<br>\n"
+#| "The backend 'beh' is a wrapper for the usual backend,\n"
+#| "which is then called by beh.\n"
+#| "This way beh can, depending on its configuration,\n"
+#| "repeat the call of the backend or simply hide the error status\n"
+#| "of the backend from being seen by the CUPS daemon.\n"
+#| "The matching device URI is:<br>\n"
+#| "beh:/nodisable/attempts/delay/originalDeviceURI<br>\n"
+#| "If nodisable is '1' beh always exits successfully\n"
+#| "so that the queue gets never disabled but on the other hand\n"
+#| "print jobs are lost if there is an error.<br>\n"
+#| "Attempts is the number of attempts to recall the backend\n"
+#| "in case of an error. '0' means infinite retries.<br>\n"
+#| "Delay is the number of seconds between two attempts\n"
+#| "to call the backend.<br>\n"
+#| "The last parameter is the original URI, which the queue had before.<br>\n"
+#| "Example:<br>\n"
+#| "beh:/1/3/5/socket://ip-address:port-number<br>\n"
+#| "The beh backend tries to access a network printer 3 times with 5 second delay\n"
+#| "between the attempts. If access still fails, the queue is not disabled\n"
+#| "and the print job is lost.<br>\n"
+#| "For <b>more information</b> have a look at <tt>/usr/lib[64]/cups/backend/beh</tt> and<br>\n"
+#| "http://www.linuxfoundation.org/en/OpenPrinting/Database/BackendErrorHandler…"
+#| "</p>"
msgid ""
"<p>\n"
"<b><big>Special Device URIs</big></b><br>\n"
@@ -2867,7 +2959,7 @@
"The matching device URI is:<br>\n"
"pipe:/path/to/targetcommand<br>\n"
"<b>Daisy-chain Backend Error Handler (beh)</b><br>\n"
-"To do this, the RPM package foomatic-filters must be installed.\n"
+"To do this, the RPM package cups-backends must be installed.\n"
"The package provides the CUPS backend 'beh'.<br>\n"
"The backend 'beh' is a wrapper for the usual backend,\n"
"which is then called by beh.\n"
@@ -2932,7 +3024,7 @@
"</p>"
#. PrintingViaNetworkDialog help 1/4:
-#: src/include/printer/helps.rb:752
+#: src/include/printer/helps.rb:755
msgid ""
"<p>\n"
"<b><big>Printing Via Network</big></b><br>\n"
@@ -3005,7 +3097,7 @@
"</p>"
#. PrintingViaNetworkDialog help 2/4:
-#: src/include/printer/helps.rb:789
+#: src/include/printer/helps.rb:792
msgid ""
"<p>\n"
"If you can access remote CUPS servers for printing\n"
@@ -3034,7 +3126,7 @@
"</p>"
#. PrintingViaNetworkDialog help 3/4:
-#: src/include/printer/helps.rb:804
+#: src/include/printer/helps.rb:807
msgid ""
"<p>\n"
"If you print only via network and if you use only one single CUPS server,\n"
@@ -3061,7 +3153,7 @@
"</p>"
#. PrintingViaNetworkDialog help 4/4:
-#: src/include/printer/helps.rb:818
+#: src/include/printer/helps.rb:821
msgid ""
"<p>\n"
"You have to set up an appropriate print queue on your host\n"
@@ -3085,7 +3177,7 @@
"</p>"
#. SharingDialog help 1/4:
-#: src/include/printer/helps.rb:832
+#: src/include/printer/helps.rb:835
msgid ""
"<p>\n"
"<b><big>Sharing Print Queues and Publish Them Via Network</big></b><br>\n"
@@ -3108,7 +3200,7 @@
"</p>"
#. SharingDialog help 2/4:
-#: src/include/printer/helps.rb:844
+#: src/include/printer/helps.rb:847
msgid ""
"<p>\n"
"First of all CUPS client systems must be allowed to access the CUPS server.\n"
@@ -3135,7 +3227,7 @@
"</p>"
#. SharingDialog help 3/4:
-#: src/include/printer/helps.rb:858
+#: src/include/printer/helps.rb:861
msgid ""
"<p>\n"
"There are various ways which can coexist how to specify\n"
@@ -3168,7 +3260,7 @@
"</p>"
#. SharingDialog help 4/4:
-#: src/include/printer/helps.rb:876
+#: src/include/printer/helps.rb:879
msgid ""
"<p>\n"
"Regarding firewall:<br>\n"
@@ -3235,7 +3327,7 @@
"</p>"
#. Policies help 1/2:
-#: src/include/printer/helps.rb:911
+#: src/include/printer/helps.rb:914
msgid ""
"<p>\n"
"<b><big>CUPS Operation Policy</big></b><br>\n"
@@ -3254,14 +3346,37 @@
"</p>"
#. Policies help 2/2:
-#: src/include/printer/helps.rb:921
+#: src/include/printer/helps.rb:924
+#, fuzzy
+#| msgid ""
+#| "<p>\n"
+#| "<b><big>CUPS Error Policy</big></b><br>\n"
+#| "The error policy defines the default policy that is used when\n"
+#| "CUPS fails to send a print job to the printer device.<br>\n"
+#| "Depending on the particular way how the printer is connected\n"
+#| "(for example 'parallel', 'usb', 'socket', 'lpd', or 'ipp'),\n"
+#| "and depending on the actual kind of failure,\n"
+#| "the CUPS backend which actually sends the data to the printer\n"
+#| "can overwrite the default error policy\n"
+#| "and enforce another error policy (see <tt>man backend</tt>).\n"
+#| "For example it can stop any further printing attempt\n"
+#| "even when the default error policy is to retry the job.\n"
+#| "This could happen when any attempt to establish\n"
+#| "the communication with the printer is useless\n"
+#| "so that it does no make sense to retry the job.\n"
+#| "<br>\n"
+#| "The following error policies exist:<br>\n"
+#| "Stop the printer and keep the job for future printing.<br>\n"
+#| "Re-send the job from the beginning after waiting some time (30 seconds by default).<br>\n"
+#| "Abort and delete the job and proceed with the next job.\n"
+#| "</p>"
msgid ""
"<p>\n"
"<b><big>CUPS Error Policy</big></b><br>\n"
"The error policy defines the default policy that is used when\n"
"CUPS fails to send a print job to the printer device.<br>\n"
"Depending on the particular way how the printer is connected\n"
-"(for example 'parallel', 'usb', 'socket', 'lpd', or 'ipp'),\n"
+"(for example 'usb', 'socket', 'lpd', or 'ipp'),\n"
"and depending on the actual kind of failure,\n"
"the CUPS backend which actually sends the data to the printer\n"
"can overwrite the default error policy\n"
@@ -3301,7 +3416,7 @@
"</p>"
#. Autoconfig help 1/2:
-#: src/include/printer/helps.rb:946
+#: src/include/printer/helps.rb:949
msgid ""
"<p>\n"
"<b><big>Automatic Configuration for Local Connected Printers</big></b><br>\n"
@@ -3333,7 +3448,7 @@
"</p>"
#. Autoconfig help 2/2:
-#: src/include/printer/helps.rb:963
+#: src/include/printer/helps.rb:966
msgid ""
"<p>\n"
"<b><big>Automatic Configuration for USB Printers</big></b><br>\n"
@@ -3504,67 +3619,67 @@
"(это может занять некоторое время)"
#. where %1 will be replaced by the server name:
-#: src/include/printer/overview.rb:204
+#: src/include/printer/overview.rb:201
msgid "Do no longer use the inaccessible CUPS server '%1'?"
msgstr "Больше не использовать недоступный сервер CUPS '%1'?"
#. Popup::YesNoHeadline body recommendation how to answer the headline question
#. where %1 will be replaced by the server name:
-#: src/include/printer/overview.rb:210
+#: src/include/printer/overview.rb:207
msgid "To proceed, you should agree that '%1' will be no longer used."
msgstr "Для продолжения вы должны согласиться с тем, что '%1' больше не будет использоваться."
#. The 'ServerName' entry in /etc/cups/client.conf was removed
#. so that it is now no longer a real client-only config and
#. therefore the Printerlib::client_* values must be determined anew:
-#: src/include/printer/overview.rb:226 src/include/printer/overview.rb:237
+#: src/include/printer/overview.rb:223 src/include/printer/overview.rb:234
msgid "A non-accessible server leads to an endless sequence of delays and failures."
msgstr "Недоступный сервер приведёт к бесконечной последовательности задержек и сбоев."
#. where %1 will be replaced by the CUPS server name.
-#: src/include/printer/overview.rb:256
+#: src/include/printer/overview.rb:253
msgid "CUPS Server %1"
msgstr "Сервер CUPS %1"
#. Busy message:
#. Body of a Popup::ShowFeedback:
-#: src/include/printer/overview.rb:280
+#: src/include/printer/overview.rb:277
msgid "Testing if CUPS server is accessible..."
msgstr "Проверка доступности сервера CUPS..."
#. Body of a Popup::AnyMessage when no queue was selected from the list:
#. Body of a Popup::AnyMessage when no queue was selected from the list:
#. Body of a Popup::AnyMessage when no queue was selected from the list:
-#: src/include/printer/overview.rb:595 src/include/printer/overview.rb:681
-#: src/include/printer/overview.rb:1155
+#: src/include/printer/overview.rb:592 src/include/printer/overview.rb:678
+#: src/include/printer/overview.rb:1152
msgid "Select an entry."
msgstr "Выберите пункт."
-#: src/include/printer/overview.rb:608
+#: src/include/printer/overview.rb:605
msgid "Cannot Delete"
msgstr "Невозможно удалить"
#. Body of a Popup::AnyMessage when a remote queue was selected to be deleted:
-#: src/include/printer/overview.rb:610
+#: src/include/printer/overview.rb:607
msgid "This is a remote configuration. Only local configurations can be deleted."
msgstr "Это удалённая конфигурация. Только локальные конфигурации могут быть удалены."
-#: src/include/printer/overview.rb:617
+#: src/include/printer/overview.rb:614
msgid "Confirm Deletion"
msgstr "Подтвердите удаление"
#. Body of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:619
+#: src/include/printer/overview.rb:616
msgid "The selected configuration would be deleted immediately and cannot be restored."
msgstr "Выделенная конфигурация будет удалена немедленно и не сможет быть восстановлена."
#. 'Yes' button label of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:623
+#: src/include/printer/overview.rb:620
msgid "Delete configuration %1"
msgstr "Удалить конфигурацию %1"
#. 'No' button label of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:625
+#: src/include/printer/overview.rb:622
msgid "Do not delete it"
msgstr "Не удалять"
@@ -3575,33 +3690,33 @@
#. Nevertheless it is possible to delete a class with the YaST printer module
#. so that the user can get rid of a class which may have been created by accident
#. with whatever other setup tool:
-#: src/include/printer/overview.rb:640
+#: src/include/printer/overview.rb:637
msgid "Confirm Deletion of a Class"
msgstr "Подтвердите удаление класса"
#. Body of a confirmation popup before a class will be deleted:
-#: src/include/printer/overview.rb:642
+#: src/include/printer/overview.rb:639
msgid "A deleted class cannot be re-created with this tool."
msgstr "Удалённый класс не может быть воссоздан этой утилитой."
-#: src/include/printer/overview.rb:688
+#: src/include/printer/overview.rb:685
msgid "Rejecting Print Jobs"
msgstr "Отклонение заданий на печать"
#. Body of a Popup::AnyMessage when the queue rejects print jobs:
-#: src/include/printer/overview.rb:690
+#: src/include/printer/overview.rb:687
msgid "The testpage cannot be printed because print jobs are rejected."
msgstr "Тестовая страница не может быть напечатана, потому что задания на печать отклоняются."
#. Do a refresh of the overview content to be on the safe side.
#. Perhaps the actual current queue state is no longer "rejecting".
#. Re-run the OverviewDialog (with re-created queue status) via the sequencer:
-#: src/include/printer/overview.rb:700
+#: src/include/printer/overview.rb:697
msgid "Printout Disabled"
msgstr "Печать отключена"
#. Body of a Popup::AnyMessage when printing is disabled for the queue:
-#: src/include/printer/overview.rb:702
+#: src/include/printer/overview.rb:699
msgid "The testpage cannot be printed because printout is disabled."
msgstr "Тестовая страница не может быть напечатана, потому что печать отключена."
@@ -3610,25 +3725,25 @@
#. the test above makes sure that the queue has printing enabled.
#. When this command fails for whatever reason, it is a safe fallback
#. to assume that there are no pending jobs in the queue:
-#: src/include/printer/overview.rb:731
+#: src/include/printer/overview.rb:728
msgid "There are pending print jobs which might be deleted before the testpage is printed."
msgstr "Есть оставшиеся задания печати, которые должны быть удалены перед печатью тестовой страницы."
#. where %1 will be replaced by the queue name.
#. where %1 will be replaced by the queue name.
-#: src/include/printer/overview.rb:751 src/include/printer/overview.rb:920
+#: src/include/printer/overview.rb:748 src/include/printer/overview.rb:917
msgid "Delete Pending Print Jobs For %1"
msgstr "Удалить оставшиеся задания печати из %1"
#. 'Yes' button label of a confirmation popup
#. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:759
+#: src/include/printer/overview.rb:756
msgid "Delete them before printing testpage"
msgstr "Удалить их перед печатью тестовой страницы"
#. 'No' button label of a confirmation popup
#. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:762
+#: src/include/printer/overview.rb:759
msgid "Print testpage after the other jobs"
msgstr "Напечатать тестовую страницу после других заданий"
@@ -3636,7 +3751,7 @@
#. Only a simple message because this error does not happen on a normal system.
#. where %1 will be replaced by the queue name.
#. Only a simple message because this error does not happen on a normal system.
-#: src/include/printer/overview.rb:775 src/include/printer/overview.rb:944
+#: src/include/printer/overview.rb:772 src/include/printer/overview.rb:941
msgid "Failed to delete all pending jobs for %1."
msgstr "Не удалось удалить все оставшиеся задания для %1."
@@ -3656,29 +3771,29 @@
#. + (Printed with CUPS) show
#. make it obvious that it is not a YaST testpage but a CUPS testpage
#. and it is now independent of the CUPS version.
-#: src/include/printer/overview.rb:802
+#: src/include/printer/overview.rb:799
msgid "Test printout"
msgstr "Пробная печать"
#. Popup::AnyQuestion message:
-#: src/include/printer/overview.rb:804
+#: src/include/printer/overview.rb:801
msgid "Print one or two pages e.g. to test duplex printing"
msgstr "Напечатать одну или две страницы, например, для проверки двухсторонней печати"
# command line help text for the test action
#. Popup::AnyQuestion so called 'yes' (default) button label:
-#: src/include/printer/overview.rb:806
+#: src/include/printer/overview.rb:803
msgid "Single test page"
msgstr "Одна тестовая страница"
#. Popup::AnyQuestion so called 'no' button label:
-#: src/include/printer/overview.rb:808
+#: src/include/printer/overview.rb:805
msgid "Two test pages"
msgstr "Две тестовых страницы"
#. where %1 will be replaced by the queue name.
#. Only a simple message because this error does not happen on a normal system.
-#: src/include/printer/overview.rb:838
+#: src/include/printer/overview.rb:835
msgid "Failed to print testpage for %1."
msgstr "Не удалась тестовая печать для %1."
@@ -3686,26 +3801,26 @@
#. there might be whatever reason (e.g. a remote queue might have been deleted in the meantime)
#. so that a refresh of the overview content is needed to be on the safe side.
#. Re-run the OverviewDialog (with re-created queue status) via the sequencer:
-#: src/include/printer/overview.rb:855
+#: src/include/printer/overview.rb:852
msgid "Wait Until Testpage Printing Finished"
msgstr "Ожидать окончания печати тестовой страницы"
#. Popup::AnyQuestion message regarding testpage printout result
#. where %1 will be replaced by the queue name.
-#: src/include/printer/overview.rb:859
+#: src/include/printer/overview.rb:856
msgid "Sent testpage to %1. Printing should start soon."
msgstr "Тестовая страница отправлена в %1. Печать должна скоро начаться."
#. Popup::AnyQuestion 'Yes' button label
#. regarding a positive testpage printout result:
-#: src/include/printer/overview.rb:864
+#: src/include/printer/overview.rb:861
msgid "Testpage printout was successful"
msgstr "Печать тестовой страницы удалась"
# pushbutton
#. Popup::AnyQuestion 'No' button label
#. regarding a negative testpage printout result:
-#: src/include/printer/overview.rb:867
+#: src/include/printer/overview.rb:864
msgid "Testpage printing failed"
msgstr "Печать тестовой страницы не удалась"
@@ -3725,53 +3840,53 @@
#. spit out zillions of sheets with nonsense characters.
#. When this command fails for whatever reason, it is a safe fallback
#. to assume that there are no pending jobs in the queue:
-#: src/include/printer/overview.rb:900
+#: src/include/printer/overview.rb:897
msgid "There are pending print jobs which might be deleted now."
msgstr "Есть оставшиеся задания печати, которые должны быть удалены сейчас."
#. 'Yes' button label of a confirmation popup
#. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:928
+#: src/include/printer/overview.rb:925
msgid "Delete all pending jobs"
msgstr "Удалить все оставшиеся задания"
#. 'No' button label of a confirmation popup
#. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:931
+#: src/include/printer/overview.rb:928
msgid "Do not delete them"
msgstr "Не удалять"
#. Ignore an effectively empty test_print_cups_error_log:
-#: src/include/printer/overview.rb:1046
+#: src/include/printer/overview.rb:1043
msgid "For the full log, see the /var/log/cups/error_log file."
msgstr "Полный журнал см. в файле /var/log/cups/error_log."
-#: src/include/printer/overview.rb:1051
+#: src/include/printer/overview.rb:1048
msgid "CUPS log information while processing the testpage for %1 (English only)"
msgstr "Информация из журнала CUPS по обработке тестовой страницы для %1 (только на английском)"
#. but the test_print_cups_error_log was effectively empty,
#. show a very generic info to the user to show at least something:
-#: src/include/printer/overview.rb:1068
+#: src/include/printer/overview.rb:1065
msgid "For CUPS log information, see the /var/log/cups/error_log file."
msgstr "Сведения из журнала CUPS см. в файле /var/log/cups/error_log."
#. show a very generic info to the user to show at least something:
-#: src/include/printer/overview.rb:1078
+#: src/include/printer/overview.rb:1075
msgid "When printing via a remote system fails, you may ask an admin of the remote system."
msgstr "При сбое печати на удалённой системе обратитесь к её администратору."
#. PopupYesNoHeadline body:
-#: src/include/printer/overview.rb:1105
+#: src/include/printer/overview.rb:1102
msgid "A remote CUPS server setting conflicts with adding a configuration."
msgstr "Настройки удалённого сервера CUPS конфликтуют с добавлением конфигурации."
-#: src/include/printer/overview.rb:1162
+#: src/include/printer/overview.rb:1159
msgid "Cannot Modify"
msgstr "Невозможно изменить"
#. Body of a Popup::AnyMessage when a remote queue was selected to be modified:
-#: src/include/printer/overview.rb:1164
+#: src/include/printer/overview.rb:1161
msgid "This is a remote configuration. Only local configurations can be modified."
msgstr "Это удалённая конфигурация. Только локальные конфигурации могут быть изменены."
@@ -4473,125 +4588,54 @@
msgstr "Определение подходящих драйверов принтеров..."
#. show a meaningful text as fallback entry ('Find More' is a button label).
-#: src/modules/Printer.rb:1594
+#: src/modules/Printer.rb:1588
msgid "No matching driver found. Change the search string or try 'Find More'."
msgstr "Подходящий драйвер не найден. Измените строку поиска или попробуйте «Найти ещё»."
#. Busy message:
#. Body of a Popup::ShowFeedback:
-#: src/modules/Printer.rb:1619
+#: src/modules/Printer.rb:1613
msgid "Processing many printer drivers. Please wait..."
msgstr "Обработка множества драйверов принтеров. Пожалуйста, подождите..."
#. Only a simple message because this error does not happen on a normal system
#. (i.e. a system which is not totally broken or totally messed up).
-#: src/modules/Printer.rb:2065
+#: src/modules/Printer.rb:2059
msgid "Failed to add queue %1."
msgstr "Не удалось добавить очередь %1."
#. Only a simple message because this error does not happen on a normal system
#. (i.e. a system which is not totally broken or totally messed up).
-#: src/modules/Printer.rb:2185
+#: src/modules/Printer.rb:2179
msgid "Failed to delete configuration %1."
msgstr "Не удалось удалить конфигурацию %1."
#. Only a simple message because this is only a fallback case
#. which should not happen at all:
-#: src/modules/Printer.rb:2208
+#: src/modules/Printer.rb:2202
msgid "Failed to determine the driver options."
msgstr "Не удалось определить опции драйвера."
#. Info for a currently selected item which is to be set as new value in the system:
-#: src/modules/Printer.rb:2215
+#: src/modules/Printer.rb:2209
msgid "new value"
msgstr "новое значение"
#. Info for a current setting which is the currently still saved value in the system:
-#: src/modules/Printer.rb:2217
+#: src/modules/Printer.rb:2211
msgid "saved value"
msgstr "сохранённое значение"
-#. where %1 will be replaced by the server name.
-#: src/modules/Printer.rb:2366
-msgid "The server '%1' is not accessible via port 631 (IPP/CUPS)."
-msgstr "Сервер '%1' недоступен через порт 631 (IPP/CUPS)."
+#: src/modules/Printer.rb:2358
+#, fuzzy
+#| msgid "&Test Server"
+msgid "The server '"
+msgstr "Провери&ть сервер"
-#. where %1 will be replaced by the server name.
-#: src/modules/Printer.rb:2371
-msgid "The server '%1' responds to a 'ping' in the network."
-msgstr "Сервер '%1' отвечает на 'ping' в сети."
-
-#. where %1 will be replaced by the server name.
-#: src/modules/Printer.rb:2376
-msgid "The server '%1' does not respond to a 'ping' in the network."
-msgstr "Сервер '%1' не отвечает на 'ping' в сети."
-
-#. where %1 will be replaced by the server name.
-#: src/modules/Printer.rb:2381
-msgid "The server name '%1' is known in the network."
-msgstr "Имя сервера '%1' известно в сети."
-
-#. where %1 will be replaced by the server name.
-#: src/modules/Printer.rb:2386
-msgid "The server name '%1' is not known in the network."
-msgstr "Имя сервера '%1' неизвестно в сети."
-
-#. but in most cases TestClientOnlyServer is called
-#. indirectly without a button click by the user
-#. so that even the netcat test is silently skipped
-#. and no negative feedback is shown when netcat is not executable:
-#: src/modules/Printer.rb:2404
-msgid "Cannot execute the program 'netcat'."
-msgstr "Невозможно выполнить программу 'netcat'."
-
-#. Popup::ErrorDetails details:
-#: src/modules/Printer.rb:2409
-msgid "The RPM package 'netcat' is required for a meaningful test."
-msgstr "Для значимого теста необходим RPM-пакет 'netcat'."
-
-#. but it the less meaningful test is not really important
-#. so that the less meaningful test is silently skipped
-#. and no negative feedback is shown when ping is not executable:
-#: src/modules/Printer.rb:2445
-msgid "Cannot execute the program 'ping'."
-msgstr "Невозможно выполнить программу 'ping'."
-
-#. Popup::ErrorDetails details:
-#: src/modules/Printer.rb:2454
-msgid "The RPM package 'iputils' is required for a meaningful test."
-msgstr "Для значимого теста необходим RPM-пакет 'iputils'."
-
-#. where %1 will be replaced by the server name.
-#: src/modules/Printer.rb:2483
-msgid "The server '%1' is not accessible."
-msgstr "Сервер '%1' недоступен."
-
-#. but it the last test is not really important
-#. so that the last test is silently skipped
-#. and no negative feedback is shown when host is not executable:
-#: src/modules/Printer.rb:2546
-msgid "Cannot execute the program 'host'."
-msgstr "Невозможно выполнить программу 'host'."
-
-#. Popup::ErrorDetails details:
-#: src/modules/Printer.rb:2555
-msgid "The RPM package 'bind-utils' is required for a meaningful test."
-msgstr "Для значимого теста необходим RPM-пакет 'bind-utils'."
-
-#. where %1 will be replaced by the server name.
-#: src/modules/Printer.rb:2582
-msgid "The server '%1' does not respond in the network."
-msgstr "Сервер '%1' не отвечает в сети."
-
-#. where %1 will be replaced by the server name.
-#: src/modules/Printer.rb:2644
-msgid "The server '%1' is unknown."
-msgstr "Сервер '%1' неизвестен."
-
#. Message of a Popup::Error when hp-setup should be run.
#. Do not change or translate "hp-setup", it is a program name.
#. Do not change or translate "DISPLAY", it is an environment variable name.
-#: src/modules/Printer.rb:2673
+#: src/modules/Printer.rb:2371
msgid ""
"Cannot run hp-setup because no graphical display can be opened.\n"
"This happens in particular when YaST runs in text-only mode,\n"
@@ -4607,7 +4651,7 @@
#. Message of a Popup::Error when hp-setup should be run.
#. Do not change or translate "hp-setup", it is a program name:
-#: src/modules/Printer.rb:2683
+#: src/modules/Printer.rb:2381
msgid ""
"Cannot run hp-setup because\n"
"/usr/bin/hp-setup is not executable\n"
@@ -4619,7 +4663,7 @@
#. Body of a Popup::ShowFeedback.
#. Do not change or translate "hp-setup", it is a program name:
-#: src/modules/Printer.rb:2691
+#: src/modules/Printer.rb:2389
msgid ""
"Launched hp-setup.\n"
"You must finish hp-setup before you can proceed with the printer configuration.\n"
@@ -4631,7 +4675,7 @@
#. Do not change or translate "hp-setup", it is a program name.
#. Do not change or translate "hplip", it is a package name.
#. Translate 'Driver Packages' the same as the PushButton name to go to the "Add Driver" dialog:
-#: src/modules/Printer.rb:2725
+#: src/modules/Printer.rb:2423
msgid ""
"To run hp-setup, the RPM package hplip must be installed.\n"
"Use 'Driver Packages' to install it."
@@ -4781,6 +4825,115 @@
msgid "&Skip waiting"
msgstr "Пропу&стить ожидание"
+#~ msgid "Parallel Port"
+#~ msgstr "Параллельный порт"
+
+#~ msgid "Serial Port"
+#~ msgstr "Последовательный порт"
+
+#~ msgid "Novell Netware Print Server (IPX)"
+#~ msgstr "Принтсервер Novell Netware (IPX)"
+
+#~ msgid "Driver for Konica Minolta 2300W and 2400W (unmaintained)"
+#~ msgstr "Драйвер для Konica Minolta 2300W и 2400W (не поддерживается)"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "<b><big>Device URIs for Directly Connected Devices</big></b><br>\n"
+#~ "Devices which are connected via the parallel port or via USB\n"
+#~ "are autodetected and the appropriate device URI is autogenerated.\n"
+#~ "For example:<br>\n"
+#~ "parallel:/dev/lp0<br>\n"
+#~ "usb://ACME/Fun%20Printer?serial=A1B2C3<br>\n"
+#~ "hp:/usb/HP_LaserJet?serial=1234<br>\n"
+#~ "Usually only the autogenerated device URIs work.\n"
+#~ "When the device is not autodetected, there is usually no communication\n"
+#~ "with the device possible and no data can be sent to the device.<br>\n"
+#~ "To access a HP printer or all-in-one device via the backend 'hp',\n"
+#~ "the RPM package hplip must be installed.\n"
+#~ "The package provides HP's printing and scanning software HPLIP.<br>\n"
+#~ "In contrast devices which are connected via serial port or bluetooth\n"
+#~ "are not autodetected so that the device URI must be manually specified.\n"
+#~ "The serial device URI parameters must comply with\n"
+#~ "what the serial port in the printer requires,\n"
+#~ "see the manual of your serial printer.\n"
+#~ "Example device URIs:<br>\n"
+#~ "serial:/dev/ttyS9?baud=9600+bits=8+parity=none+flow=soft+stop=1<br>\n"
+#~ "bluetooth://1A2B3C4D5E6F<br>\n"
+#~ "To access a device via bluetooth, the RPM package bluez-cups must be installed.\n"
+#~ "The package provides the CUPS backend 'bluetooth' which actually sends the data\n"
+#~ "to a bluetooth printer.\n"
+#~ "</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "<b><big>URI напрямую подключённых устройств</big></b><br>\n"
+#~ "Устройства, подключённые через параллельный порт или USB,\n"
+#~ "обнаруживаются автоматически и для них создаётся подходящий URI устройства.\n"
+#~ "Например:<br>\n"
+#~ "parallel:/dev/lp0<br>\n"
+#~ "usb://ACME/Fun%20Printer?serial=A1B2C3<br>\n"
+#~ "hp:/usb/HP_LaserJet?serial=1234<br>\n"
+#~ "Обычно работают только автоматически созданные URI.\n"
+#~ "Когда устройство не обнаруживается автоматически, связь с устройством\n"
+#~ "обычно невозможна и устройству нельзя отправить данные.<br>\n"
+#~ "Для доступа к принтеру или МФУ от HP через механизм 'hp'\n"
+#~ "должен быть установлен RPM-пакет hplip.\n"
+#~ "Пакет предоставляет ПО печати и сканирования HPLIP от HP.<br>\n"
+#~ "Наоборот, устройства, подключаемые по последовательному порту или bluetooth\n"
+#~ "обычно не обнаруживаются автоматически и URI устройств нужно указывать вручную.\n"
+#~ "Параметры URI последовательного устройства должны соответствовать\n"
+#~ "требованиям последовательного порта на принтере,\n"
+#~ "см. руководство вашего последовательного принтера.\n"
+#~ "Примеры URI устройств:<br>\n"
+#~ "serial:/dev/ttyS9?baud=9600+bits=8+parity=none+flow=soft+stop=1<br>\n"
+#~ "bluetooth://1A2B3C4D5E6F<br>\n"
+#~ "Для доступа к устройству по bluetooth должен быть установлен RPM-пакет bluez-cups.\n"
+#~ "Пакет предоставляет механизм CUPS 'bluetooth', который, собственно, и посылает данные\n"
+#~ "bluetooth-принтеру.\n"
+#~ "</p>"
+
+#~ msgid "The server '%1' is not accessible via port 631 (IPP/CUPS)."
+#~ msgstr "Сервер '%1' недоступен через порт 631 (IPP/CUPS)."
+
+#~ msgid "The server '%1' responds to a 'ping' in the network."
+#~ msgstr "Сервер '%1' отвечает на 'ping' в сети."
+
+#~ msgid "The server '%1' does not respond to a 'ping' in the network."
+#~ msgstr "Сервер '%1' не отвечает на 'ping' в сети."
+
+#~ msgid "The server name '%1' is known in the network."
+#~ msgstr "Имя сервера '%1' известно в сети."
+
+#~ msgid "The server name '%1' is not known in the network."
+#~ msgstr "Имя сервера '%1' неизвестно в сети."
+
+#~ msgid "Cannot execute the program 'netcat'."
+#~ msgstr "Невозможно выполнить программу 'netcat'."
+
+#~ msgid "The RPM package 'netcat' is required for a meaningful test."
+#~ msgstr "Для значимого теста необходим RPM-пакет 'netcat'."
+
+#~ msgid "Cannot execute the program 'ping'."
+#~ msgstr "Невозможно выполнить программу 'ping'."
+
+#~ msgid "The RPM package 'iputils' is required for a meaningful test."
+#~ msgstr "Для значимого теста необходим RPM-пакет 'iputils'."
+
+#~ msgid "The server '%1' is not accessible."
+#~ msgstr "Сервер '%1' недоступен."
+
+#~ msgid "Cannot execute the program 'host'."
+#~ msgstr "Невозможно выполнить программу 'host'."
+
+#~ msgid "The RPM package 'bind-utils' is required for a meaningful test."
+#~ msgstr "Для значимого теста необходим RPM-пакет 'bind-utils'."
+
+#~ msgid "The server '%1' does not respond in the network."
+#~ msgstr "Сервер '%1' не отвечает в сети."
+
+#~ msgid "The server '%1' is unknown."
+#~ msgstr "Сервер '%1' неизвестен."
+
#~ msgid "Look Up"
#~ msgstr "Поиск"
1
0
30 Aug '15
Author: minton
Date: 2015-08-30 20:09:54 +0200 (Sun, 30 Aug 2015)
New Revision: 92424
Modified:
trunk/yast/ru/po/pkg-bindings.ru.po
Log:
Merged pkg-bindings.pot for ru
Modified: trunk/yast/ru/po/pkg-bindings.ru.po
===================================================================
--- trunk/yast/ru/po/pkg-bindings.ru.po 2015-08-30 18:09:52 UTC (rev 92423)
+++ trunk/yast/ru/po/pkg-bindings.ru.po 2015-08-30 18:09:54 UTC (rev 92424)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: pkg-bindings.ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:53+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2010-04-11 01:17+0300\n"
"Last-Translator: Alexander Melentiev <alex239(a)gmail.com>\n"
"Language-Team: Russian <opensuse-translation-ru(a)opensuse.org>\n"
@@ -51,18 +51,18 @@
msgstr "<P><BIG><B>Обновление репозитория</B></BIG></P><P>Менеджер пакетов обновляет содержимое репозитория...</P>"
#. error message
-#: src/Package.cc:651
+#: src/Package.cc:655
msgid "The package cannot be selected to install."
msgstr "Пакет не может быть выбран для установки."
#. error message
-#: src/Package.cc:657
+#: src/Package.cc:661
msgid "The package is not available."
msgstr "Пакет недоступен."
#. still not initialized, throw an exception
#. translators: this is an error message
-#: src/PkgFunctions.cc:128
+#: src/PkgFunctions.cc:129
msgid "Cannot connect to the package manager"
msgstr "Невозможно соединиться с менеджером пакетов"
@@ -90,7 +90,7 @@
msgid "Download Descriptions"
msgstr "Загрузить описания"
-#: src/Source_Create.cc:590 src/Source_Download.cc:402 src/Source_Load.cc:155
+#: src/Source_Create.cc:590 src/Source_Download.cc:407 src/Source_Load.cc:155
#: src/Source_Load.cc:479
msgid "Rebuild Cache"
msgstr "Перестроить кэш"
@@ -104,17 +104,17 @@
msgid "Adding the Repository..."
msgstr "Добавление репозитория..."
-#: src/Source_Download.cc:56 src/Source_Download.cc:320
+#: src/Source_Download.cc:56 src/Source_Download.cc:325
msgid "Downloading "
msgstr "Загрузка"
#. stages: "download", "build cache"
-#: src/Source_Download.cc:401
+#: src/Source_Download.cc:406
msgid "Refresh Metadata"
msgstr "Обновить метаданные"
#. 3 steps per repository (download, cache rebuild, load resolvables)
-#: src/Source_Download.cc:409
+#: src/Source_Download.cc:414
msgid "Refreshing Repository..."
msgstr "Обновление репозитория..."
1
0
30 Aug '15
Author: minton
Date: 2015-08-30 20:09:52 +0200 (Sun, 30 Aug 2015)
New Revision: 92423
Modified:
trunk/yast/ru/po/packager.ru.po
Log:
Merged packager.pot for ru
Modified: trunk/yast/ru/po/packager.ru.po
===================================================================
--- trunk/yast/ru/po/packager.ru.po 2015-08-30 18:09:50 UTC (rev 92422)
+++ trunk/yast/ru/po/packager.ru.po 2015-08-30 18:09:52 UTC (rev 92423)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: packager.ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-29 16:21+0100\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2014-10-06 19:21+0400\n"
"Last-Translator: Alexander Melentev <minton(a)opensuse.org>\n"
"Language-Team: Russian <opensuse-translation-ru(a)opensuse.org>\n"
@@ -224,14 +224,14 @@
#. TRANSLATORS: popup header
#. TRANSLATORS: popup header
#: src/clients/inst_productsources.rb:268
-#: src/clients/inst_productsources.rb:1343
+#: src/clients/inst_productsources.rb:1346
msgid "Aborting Configuration of Online Repository"
msgstr "Прерывание настройки сетевого репозитория"
#. TRANSLATORS: popup question
#. TRANSLATORS: popup question
#: src/clients/inst_productsources.rb:270
-#: src/clients/inst_productsources.rb:1345
+#: src/clients/inst_productsources.rb:1348
msgid "Are you sure you want to abort the configuration?"
msgstr "Действительно прервать настройку?"
@@ -252,42 +252,42 @@
"Настроить его сейчас?"
#. TRANSLATORS: progress step
-#: src/clients/inst_productsources.rb:643
+#: src/clients/inst_productsources.rb:646
msgid "Check network configuration"
msgstr "Проверить настройки сети"
#. TRANSLATORS: progress step
-#: src/clients/inst_productsources.rb:645
+#: src/clients/inst_productsources.rb:648
msgid "Download list of online repositories"
msgstr "Загрузить список сетевых репозиториев"
#. TRANSLATORS: progress step
-#: src/clients/inst_productsources.rb:650
+#: src/clients/inst_productsources.rb:653
msgid "Checking network configuration..."
msgstr "Проверка настроек сети..."
#. TRANSLATORS: progress step
-#: src/clients/inst_productsources.rb:652
+#: src/clients/inst_productsources.rb:655
msgid "Downloading list of online repositories..."
msgstr "Загрузка списка сетевых репозиториев..."
#. TRANSLATORS: progress step
-#: src/clients/inst_productsources.rb:661
+#: src/clients/inst_productsources.rb:664
msgid "Initialize the repository manager"
msgstr "Инициализировать программу управления репозиториями"
#. TRANSLATORS: progress step
-#: src/clients/inst_productsources.rb:666
+#: src/clients/inst_productsources.rb:669
msgid "Initializing the repository manager..."
msgstr "Инициализация программы управления репозиториями..."
#. TRANSLATORS: dialog caption
-#: src/clients/inst_productsources.rb:676
+#: src/clients/inst_productsources.rb:679
msgid "Reading List of Online Repositories"
msgstr "Чтение списка сетевых репозиториев"
#. TRANSLATORS: dialog help
-#: src/clients/inst_productsources.rb:682
+#: src/clients/inst_productsources.rb:685
msgid ""
"<p>The packager is being initialized and \n"
"the list of servers downloaded from the Web.</p>\n"
@@ -296,7 +296,7 @@
"загрузка списка серверов из интернета.</p>\n"
#. TRANSLATORS: error report
-#: src/clients/inst_productsources.rb:714
+#: src/clients/inst_productsources.rb:717
msgid ""
"Cannot download list of repositories,\n"
"no network configured."
@@ -305,7 +305,7 @@
"сеть не настроена."
#. TRANSLATORS: light-warning message
-#: src/clients/inst_productsources.rb:792
+#: src/clients/inst_productsources.rb:795
msgid ""
"No product URL defined from which to download\n"
"list of repositories.\n"
@@ -314,7 +314,7 @@
"производить загрузку списка репозиториев.\n"
#. TRANSLATORS: warning message
-#: src/clients/inst_productsources.rb:806
+#: src/clients/inst_productsources.rb:809
msgid ""
"Unable to download list of repositories\n"
"or no repositories defined."
@@ -325,12 +325,12 @@
#. TRANSLATORS: HTML-formatted summary text
#. %1 is replaced with "Yes" (currently only "Yes")
#. see *4
-#: src/clients/inst_productsources.rb:912
+#: src/clients/inst_productsources.rb:915
msgid "<b>Recommended:</b> %1<br>"
msgstr "<b>Рекомендовано:</b> %1<br>"
#. TRANSLATORS: used for "Recommended: Yes" (see *4)
-#: src/clients/inst_productsources.rb:914
+#: src/clients/inst_productsources.rb:917
msgid "Yes"
msgstr "Да"
@@ -341,7 +341,7 @@
#. %3 is replaced with a summary text for the selected repository
#. %4 is replaced with a description text for the selected repository
#. %5 is replaced with an emty string or "Recommended: Yes" (*4)
-#: src/clients/inst_productsources.rb:926
+#: src/clients/inst_productsources.rb:929
msgid ""
"<p>\n"
"<b>URL:</b> %1<br>\n"
@@ -360,28 +360,28 @@
"</p>"
#. TRANSLATORS: dialog caption
-#: src/clients/inst_productsources.rb:1234
+#: src/clients/inst_productsources.rb:1237
msgid "List of Online Repositories"
msgstr "Список сетевых репозиториев"
#. TRANSLATORS: push button
#. push button
-#: src/clients/inst_productsources.rb:1241 src/modules/SourceManagerSLP.rb:111
+#: src/clients/inst_productsources.rb:1244 src/modules/SourceManagerSLP.rb:111
msgid "&Filter"
msgstr "&Фильтр"
#. TRANSLATORS: multi-selection box
-#: src/clients/inst_productsources.rb:1251
+#: src/clients/inst_productsources.rb:1254
msgid "&List of Repositories"
msgstr "&Список репозиториев"
#. TRANSLATORS: Rich-text widget (HTML)
-#: src/clients/inst_productsources.rb:1257
+#: src/clients/inst_productsources.rb:1260
msgid "Repository Description"
msgstr "Описание репозитория"
#. TRANSLATORS: dialog help 1/3
-#: src/clients/inst_productsources.rb:1261
+#: src/clients/inst_productsources.rb:1264
msgid ""
"<p>List of default online repositories.\n"
"Click on a repository for details.</p>\n"
@@ -391,28 +391,28 @@
# help text part2 of the Network scan station dialog
#. TRANSLATORS: dialog help 2/3 (version for installation)
-#: src/clients/inst_productsources.rb:1266
+#: src/clients/inst_productsources.rb:1269
msgid "<p>Select the online repositories you want to use then click <b>Next</b>.</p>\n"
msgstr "<p>Выберите желаемые сетевые репозитории и нажмите <b>Далее</b>.</p>\n"
#. TRANSLATORS: dialog help 2/3 (version for running system)
-#: src/clients/inst_productsources.rb:1270
+#: src/clients/inst_productsources.rb:1273
msgid "<p>Select the online repositories you want to use then click <b>Finish</b>.</p>\n"
msgstr "<p>Выберите желаемые сетевые репозитории и нажмите <b>Готово</b>.</p>\n"
#. TRANSLATORS: dialog help 3/3
-#: src/clients/inst_productsources.rb:1275
+#: src/clients/inst_productsources.rb:1278
msgid "<p>To remove a used repository, simply deselect it.</p>"
msgstr "<p>Чтобы удалить используемый репозиторий, просто снимите с него метку.</p>"
#. TRANSLATORS: dialog caption
-#: src/clients/inst_productsources.rb:1371
+#: src/clients/inst_productsources.rb:1374
msgid "Writing List of Online Repositories"
msgstr "Запись списка сетевых репозиториев"
#. TRANSLATORS: dialog help
#. TRANSLATORS: dialog help
-#: src/clients/inst_productsources.rb:1377
+#: src/clients/inst_productsources.rb:1380
#: src/include/packager/repositories_include.rb:91
msgid "<p>The repository manager is downloading repository details...</p>"
msgstr "<p>Менеджер репозиториев загружает данные о репозитории...</p>"
@@ -423,46 +423,46 @@
#. %1 is replaced with a repository name or URL
#. TRANSLATORS: pop-up error message
#. %1 is replaced with a repository name or URL
-#: src/clients/inst_productsources.rb:1469
-#: src/clients/inst_productsources.rb:1493
-#: src/clients/inst_productsources.rb:1511
+#: src/clients/inst_productsources.rb:1472
+#: src/clients/inst_productsources.rb:1496
+#: src/clients/inst_productsources.rb:1514
msgid "Adding repository %1 failed."
msgstr "Не удалось добавить репозиторий %1."
#. TRANSLATORS: progress step
-#: src/clients/inst_productsources.rb:1588
+#: src/clients/inst_productsources.rb:1591
msgid "Delete deselected online repositories"
msgstr "Удалить невыбранные сетевые репозитории"
#. TRANSLATORS: progress step
-#: src/clients/inst_productsources.rb:1590
+#: src/clients/inst_productsources.rb:1593
msgid "Deleting deselected online repositories..."
msgstr "Удаление невыбранных сетевых репозиториев..."
#. TRANSLATORS: progress step
-#: src/clients/inst_productsources.rb:1598
+#: src/clients/inst_productsources.rb:1601
msgid "Add all selected online repositories"
msgstr "Добавить все выбранные сетевые репозитории"
#. TRANSLATORS: progress step
-#: src/clients/inst_productsources.rb:1603
+#: src/clients/inst_productsources.rb:1606
msgid "Adding all selected online repositories..."
msgstr "Добавление всех выбранных сетевых репозиториев..."
#. TRANSLATORS: progress step
#. %1 is replaced with repository name or URL
-#: src/clients/inst_productsources.rb:1612
+#: src/clients/inst_productsources.rb:1615
msgid "Add repository: %1"
msgstr "Добавить репозиторий: %1"
#. TRANSLATORS: progress step,
#. %1 is replaced with repository name or URL
-#: src/clients/inst_productsources.rb:1621
+#: src/clients/inst_productsources.rb:1624
msgid "Adding repository: %1 ..."
msgstr "Добавление репозитория: %1 ..."
#. less than LOW_MEMORY_MIB RAM
-#: src/clients/inst_productsources.rb:1733
+#: src/clients/inst_productsources.rb:1736
msgid ""
"Low memory detected.\n"
"\n"
@@ -493,7 +493,7 @@
#. re-initialize package information
#. force reinitialization
-#: src/clients/inst_rpmcopy.rb:129 src/clients/sw_single.rb:744
+#: src/clients/inst_rpmcopy.rb:129 src/clients/sw_single.rb:739
msgid "Installing Packages..."
msgstr "Установка пакетов..."
@@ -533,8 +533,8 @@
#. dialog caption
#. dialog caption
#. dialog caption
-#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1809
-#: src/modules/AddOnProduct.rb:683
+#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1810
+#: src/modules/AddOnProduct.rb:682
msgid "Initializing..."
msgstr "Инициализация..."
@@ -597,7 +597,7 @@
#. label to be used instead of URL if not found
#: src/clients/repositories.rb:328 src/clients/repositories.rb:361
-#: src/modules/AddOnProduct.rb:1325
+#: src/modules/AddOnProduct.rb:1334
msgid "URL: %1"
msgstr "URL: %1"
@@ -847,7 +847,7 @@
#. popup message part 2 followed by other info
#. popup message, after message header, header of details
-#: src/clients/repositories.rb:1011 src/modules/Packages.rb:1323
+#: src/clients/repositories.rb:1011 src/modules/Packages.rb:1329
#: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310
msgid "Details:"
msgstr "Подробности:"
@@ -855,7 +855,7 @@
#. popup message part 3
#. end of popup message, question
#. end of popup message, question
-#: src/clients/repositories.rb:1013 src/modules/Packages.rb:1331
+#: src/clients/repositories.rb:1013 src/modules/Packages.rb:1337
#: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312
msgid "Try again?"
msgstr "Попробовать ещё раз?"
@@ -876,7 +876,7 @@
# error message
#. refresh also the combobox widget
-#: src/clients/repositories.rb:1328
+#: src/clients/repositories.rb:1329
msgid ""
"There is no service at URL:\n"
"%1"
@@ -885,40 +885,40 @@
"%1."
#. TODO: add help text
-#: src/clients/repositories.rb:1439
+#: src/clients/repositories.rb:1440
msgid "Refreshing Repositories"
msgstr "Обновление репозиториев..."
-#: src/clients/repositories.rb:1440
+#: src/clients/repositories.rb:1441
msgid "Refreshing Services"
msgstr "Обновление служб"
-#: src/clients/repositories.rb:1445
+#: src/clients/repositories.rb:1446
msgid "Refresh Repositories"
msgstr "Обновить репозитории"
-#: src/clients/repositories.rb:1446
+#: src/clients/repositories.rb:1447
msgid "Refresh Services"
msgstr "Обновить службы"
#. progress bar label
-#: src/clients/repositories.rb:1478
+#: src/clients/repositories.rb:1479
msgid "Refreshing Repository %1..."
msgstr "Обновление репозитория %1..."
#. refreshing services
#. progress bar label
-#: src/clients/repositories.rb:1504
+#: src/clients/repositories.rb:1505
msgid "Refreshing Service %1..."
msgstr "Обновление службы %1..."
#. yes-no popup
-#: src/clients/repositories.rb:1523
+#: src/clients/repositories.rb:1524
msgid "Delete the selected repository from the list?"
msgstr "Удалить выбранный репозиторий из списка?"
#. yes-no popup
-#: src/clients/repositories.rb:1537
+#: src/clients/repositories.rb:1538
msgid ""
"Delete service %1\n"
"and its repositories?"
@@ -927,7 +927,7 @@
"и её репозитории?"
#. popup message
-#: src/clients/repositories.rb:1605
+#: src/clients/repositories.rb:1606
msgid ""
"For the selected repository, refresh\n"
"cannot be set."
@@ -936,7 +936,7 @@
"не может быть установлено."
#. popup question, %1 is repository URL
-#: src/clients/repositories.rb:1767
+#: src/clients/repositories.rb:1768
msgid ""
"Repository %1\n"
"has been already added. Each repository should be added only once.\n"
@@ -949,7 +949,7 @@
"Действительно добавить репозиторий ещё раз?"
#. Error popup
-#: src/clients/repositories.rb:1835
+#: src/clients/repositories.rb:1836
msgid "<p>Errors occurred while restoring the repository configuration.</p>\n"
msgstr "<p>При восстановлении настроек репозиториев произошли ошибки.</p>\n"
@@ -1063,7 +1063,7 @@
"Установить их сейчас?\n"
#. start the repository manager
-#: src/clients/sw_single.rb:619
+#: src/clients/sw_single.rb:614
msgid ""
"Cannot configure online update repository \n"
"without having package %1 installed"
@@ -1071,7 +1071,7 @@
"Невозможно настроить репозиторий обновлений\n"
"без установленного пакета %1"
-#: src/clients/sw_single.rb:645
+#: src/clients/sw_single.rb:640
msgid ""
"Cannot search packages in online repositories\n"
"without having package %1 installed"
@@ -1080,7 +1080,7 @@
"без установленного пакета %1"
#. error report, %1 is a list of packages
-#: src/clients/sw_single.rb:673
+#: src/clients/sw_single.rb:668
msgid ""
"The following packages have not been found on the medium:\n"
"%1\n"
@@ -1227,7 +1227,7 @@
msgid "&Start Check"
msgstr "На&чать проверку"
-#: src/include/checkmedia/ui.rb:361 src/modules/SourceManager.rb:684
+#: src/include/checkmedia/ui.rb:361 src/modules/SourceManager.rb:685
msgid "&Eject"
msgstr "Извл&ечь"
@@ -1474,7 +1474,7 @@
#. popup message part 1
#. Import GPG keys found in the inst-sys
#: src/include/packager/repositories_include.rb:319
-#: src/modules/Packages.rb:1318 src/modules/SourceManager.rb:306
+#: src/modules/Packages.rb:1324 src/modules/SourceManager.rb:306
msgid ""
"Unable to create repository\n"
"from URL '%1'."
@@ -1512,38 +1512,46 @@
#. error report
#. popup error
#. popup error
-#: src/modules/AddOnProduct.rb:517 src/modules/AddOnProduct.rb:619
-#: src/modules/ProductLicense.rb:534 src/modules/ProductLicense.rb:725
+#: src/modules/AddOnProduct.rb:516 src/modules/AddOnProduct.rb:618
+#: src/modules/ProductLicense.rb:539 src/modules/ProductLicense.rb:730
msgid "An error occurred while preparing the installation system."
msgstr "Произошла ошибка при подготовке установки системы."
#. error report
-#: src/modules/AddOnProduct.rb:654
+#: src/modules/AddOnProduct.rb:653
msgid "Control file %1 not found on media."
msgstr "Управляющий файл %1 не найден на носителе."
+#. FATE #305578: Add-On Product Requiring Registration
+#. or check the content file
+#: src/modules/AddOnProduct.rb:894
+msgid ""
+"Package '%s' is not installed.\n"
+"The add-on product cannot be registered."
+msgstr ""
+
#. TRANSLATORS: error report
#. TRANSLATORS: error report
-#: src/modules/AddOnProduct.rb:1252 src/modules/AddOnProduct.rb:1416
+#: src/modules/AddOnProduct.rb:1261 src/modules/AddOnProduct.rb:1425
msgid "Unable to use additional products."
msgstr "Невозможно использовать дополнительные продукты"
#. fill up internal map (used later when item selected)
-#: src/modules/AddOnProduct.rb:1303 src/modules/AddOnProduct.rb:1309
+#: src/modules/AddOnProduct.rb:1312 src/modules/AddOnProduct.rb:1318
msgid "%1, URL: %2"
msgstr "%1, URL: %2"
-#: src/modules/AddOnProduct.rb:1319
+#: src/modules/AddOnProduct.rb:1328
msgid "URL: %1, Path: %2"
msgstr "URL: %1, Путь: %2"
#. TRANSLATORS: popup heading
-#: src/modules/AddOnProduct.rb:1350
+#: src/modules/AddOnProduct.rb:1359
msgid "Additional Products"
msgstr "Дополнительные продукты"
#. TRANSLATORS: additional dialog information
-#: src/modules/AddOnProduct.rb:1356
+#: src/modules/AddOnProduct.rb:1365
msgid ""
"The installation repository also contains the listed additional repositories.\n"
"Select the ones you want to use.\n"
@@ -1551,34 +1559,34 @@
"Репозиторий установки также содержит следующие дополнительные репозитории.\n"
"Выберите те, которые хотите использовать.\n"
-#: src/modules/AddOnProduct.rb:1367
+#: src/modules/AddOnProduct.rb:1376
msgid "Additional Products to Select"
msgstr "Дополнительные продукты для выбора"
#. push button label
-#: src/modules/AddOnProduct.rb:1374
+#: src/modules/AddOnProduct.rb:1383
msgid "Add Selected &Products"
msgstr "Добавить выбранные &продукты"
#. %1 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1505
+#: src/modules/AddOnProduct.rb:1515
msgid "Insert the addon %1 medium"
msgstr "Вставьте носитель с дополнением %1"
#. %1 is the product name, %2 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1510
+#: src/modules/AddOnProduct.rb:1520
msgid "Insert the %1 %2 medium"
msgstr "Вставьте %2 с %1"
#. TRANSLATORS: error message, %1 is replaced with product URL
-#: src/modules/AddOnProduct.rb:1562
+#: src/modules/AddOnProduct.rb:1572
msgid "Unable to add product %1."
msgstr "Невозможно добавить продукт %1."
#. adding the product to the list of products (BNC #269625)
#. no such products
-#: src/modules/AddOnProduct.rb:1754 src/modules/AddOnProduct.rb:1760
-#: src/modules/Packages.rb:469
+#: src/modules/AddOnProduct.rb:1764 src/modules/AddOnProduct.rb:1770
+#: src/modules/Packages.rb:471
msgid "Unknown Product"
msgstr "Неизвестный продукт"
@@ -1664,7 +1672,7 @@
#. Add "Total" item - at the top so it is visible by default even if there are many items
#.
#. List column header for total remaining MB and time to install
-#: src/modules/PackageSlideShow.rb:924
+#: src/modules/PackageSlideShow.rb:918
msgid "Total"
msgstr "Всего"
@@ -1673,62 +1681,62 @@
#.
#. message in the installatino log, %1 is package name,
#. %2 is package size
-#: src/modules/PackageSlideShow.rb:1051 src/modules/PackageSlideShow.rb:1303
-#: src/modules/PackageSlideShow.rb:1355
+#: src/modules/PackageSlideShow.rb:1045 src/modules/PackageSlideShow.rb:1297
+#: src/modules/PackageSlideShow.rb:1349
msgid "Downloading %1 (download size %2)"
msgstr "Загрузка %1 (размер загрузки %2)"
-#: src/modules/PackageSlideShow.rb:1081
+#: src/modules/PackageSlideShow.rb:1075
msgid " (Remaining: %1%2 packages)"
msgstr " (Осталось: %1%2 пакетов)"
#. display download progress in DownloadInAdvance mode
#. translations: progress message (part1)
-#: src/modules/PackageSlideShow.rb:1114
+#: src/modules/PackageSlideShow.rb:1108
msgid "Downloading Packages..."
msgstr "Загрузка пакетов..."
#. progress message (part2)
-#: src/modules/PackageSlideShow.rb:1117
+#: src/modules/PackageSlideShow.rb:1111
msgid " (Downloaded %1 of %2 packages)"
msgstr " (Загружено %1 из %2 пакетов)"
#. Heading for the progress bar for the current package
#. while it is deleted. "%1" is the package name.
-#: src/modules/PackageSlideShow.rb:1253
+#: src/modules/PackageSlideShow.rb:1247
msgid "Deleting %1"
msgstr "Удаление %1"
#. package installation - summary text
#. %1 is RPM name, %2 is installed (unpacked) size (e.g. 6.20MB)
-#: src/modules/PackageSlideShow.rb:1260
+#: src/modules/PackageSlideShow.rb:1254
msgid "Installing %1 (installed size %2)"
msgstr "Установка %1 (размер после установки %2)"
#. message in the installatino log, %1 is package name,
#. %2 is package size
-#: src/modules/PackageSlideShow.rb:1338
+#: src/modules/PackageSlideShow.rb:1332
msgid "Applying delta RPM: %1"
msgstr "Применение разностного RPM: %1"
#. warning text
-#: src/modules/Packages.rb:309
+#: src/modules/Packages.rb:311
msgid "Your computer is a 64-bit x86-64 system, but you are trying to install a 32-bit distribution."
msgstr "Ваш компьютер — 64-битная система x86-64, а вы пытаетесь установить 32-битный дистрибутив."
#. help text for software proposal
-#: src/modules/Packages.rb:325
+#: src/modules/Packages.rb:327
msgid "<P>The pattern list states which functionality will be available after installing the system.</P>"
msgstr "<P>Список шаблонов описывает, какой функционал будет доступен после установки системы.</P>"
#. (see bnc#178357 why these numbers)
#. translators: help text for software proposal
-#: src/modules/Packages.rb:337
+#: src/modules/Packages.rb:339
msgid "<P>The proposal reports the total size of files which will be installed to the system. However, the system will contain some other files (temporary and working files) so the used space will be slightly larger than the proposed value. Therefore it is a good idea to have at least 25% (or about 300MB) free space before starting the installation.</P>"
msgstr "<P>Предложение содержит общий размер файлов, которые будут установлены в систему. Тем не менее, в системе будут и некоторые другие файлы (временные и рабочие файлы), поэтому используемое место будет слегка больше предполагаемого значения. Так что было бы хорошей идеей иметь хотя бы 25% (или около 300 МБ) свободного места перед началом установки.</P>"
#. help text for software proposal
-#: src/modules/Packages.rb:342
+#: src/modules/Packages.rb:344
msgid ""
"<P>The total 'size to download' is the size of the packages which will be\n"
"downloaded from remote (network) repositories. This value is important if the connection is slow or if there is a data limit for downloading.</P>\n"
@@ -1737,107 +1745,107 @@
"загружены из удалённых (сетевых) репозиториев. Это значение важно при медленном соединении или при наличии ограничения на загрузку данных.</P>\n"
#. help text for software proposal - header
-#: src/modules/Packages.rb:351
+#: src/modules/Packages.rb:353
msgid "<P><B>Software Proposal</B></P>"
msgstr "<P><B>Предложение по установке ПО</B></P>"
#. installation proposal - SW summary, %1 is name of the installed product
#. (e.g. openSUSE 10.3, SUSE Linux Enterprise ...)
-#: src/modules/Packages.rb:368
+#: src/modules/Packages.rb:370
msgid "Product: %1"
msgstr "Продукт: %1"
#. installation proposal - SW summary, %1 is name of the selected desktop or system type (e.g. KDE)
-#: src/modules/Packages.rb:382
+#: src/modules/Packages.rb:384
msgid "System Type: %1"
msgstr "Тип системы: %1"
-#: src/modules/Packages.rb:393
+#: src/modules/Packages.rb:395
msgid "Patterns:<br>"
msgstr "Шаблоны:<br>"
#. installation proposal - SW summary, %1 is size of the selected packages (in MB or GB)
-#: src/modules/Packages.rb:403
+#: src/modules/Packages.rb:405
msgid "Size of Packages to Install: %1"
msgstr "Размер устанавливаемых пакетов: %1"
#. installation proposal - SW summary, %1 is download size of the selected packages
#. which will be installed from an ftp or http repository (in MB or GB)
-#: src/modules/Packages.rb:416
+#: src/modules/Packages.rb:418
msgid "Downloading from Remote Repositories: %1"
msgstr "Загрузка из удалённых репозиториев: %1"
-#: src/modules/Packages.rb:478
+#: src/modules/Packages.rb:480
msgid "These add-on products have been marked for auto-removal: %1"
msgstr "Эти дополнительные продукты были отмечены для автоматического удаления: %1"
#. Warning message when some add-ons are marked to be removed automatically
-#: src/modules/Packages.rb:502
+#: src/modules/Packages.rb:504
msgid "Contact the vendors of these add-ons to provide you with new installation media."
msgstr "Свяжитесь с производителями этих дополнений для получения нового установочного носителя."
#. Warning message when some add-ons are marked to be removed automatically
-#: src/modules/Packages.rb:506
+#: src/modules/Packages.rb:508
msgid "Contact the vendor of the add-on to provide you with a new installation media."
msgstr "Свяжитесь с производителем этого дополнения для получения нового установочного носителя."
#. error message: %1: e.g. "/usr", %2: "/dev/sda2"
-#: src/modules/Packages.rb:547
+#: src/modules/Packages.rb:549
msgid "Error: Cannot check free space in basic directory %1 (device %2), cannot start installation."
msgstr "Ошибка: Невозможно проверить свободное место в основном каталоге %1 (устройство %2), невозможно начать установку."
#. error message: %1: e.g. "/local", %2: "/dev/sda2"
-#: src/modules/Packages.rb:567
+#: src/modules/Packages.rb:569
msgid "Warning: Cannot check free space in directory %1 (device %2)."
msgstr "Предупреждение: Невозможно проверить свободное место в каталоге %1 (устройство %2)."
#. summary warning
-#: src/modules/Packages.rb:610
+#: src/modules/Packages.rb:612
msgid "Not enough disk space."
msgstr "Недостаточно места на диске."
#. summary warning
-#: src/modules/Packages.rb:612
+#: src/modules/Packages.rb:614
msgid "Not enough disk space. Remove some packages in the single selection."
msgstr "Недостаточно места на диске. Удалите несколько пакетов из своего выбора."
#. add a backslash if it's missing
-#: src/modules/Packages.rb:633
+#: src/modules/Packages.rb:635
msgid "Only %1 (%2%%) free space available on partition %3.<BR>"
msgstr "На разделе %3 доступно только %1 (%2%%) свободного места.<BR>"
#. newly installed products
-#: src/modules/Packages.rb:702
+#: src/modules/Packages.rb:704
msgid "New product <b>%s</b> will be installed"
msgstr "Новый продукт <b>%s</b> будет установлен."
#. product update: %s is a product name
-#: src/modules/Packages.rb:712
+#: src/modules/Packages.rb:714
msgid "Product <b>%s</b> will be updated"
msgstr "Продукт <b>%s</b> будет обновлён"
#. product update: %{old_product} is an old product, %{new_product} is the new one
-#: src/modules/Packages.rb:714
+#: src/modules/Packages.rb:716
msgid "Product <b>%{old_product}</b> will be updated to <b>%{new_product}</b>"
msgstr "Продукт <b>%{old_product}</b> будет обновлён до <b>%{new_product}</b>"
-#: src/modules/Packages.rb:721
+#: src/modules/Packages.rb:723
msgid "Product <b>%s</b> will stay installed"
msgstr "Продукт <b>%s</b> останется установленным"
#. Removing another product might be an issue
#. (just warn if removed by user or by YaST)
-#: src/modules/Packages.rb:731
+#: src/modules/Packages.rb:733
msgid "<b>Warning:</b> Product <b>%s</b> will be removed."
msgstr "<b>Внимание:</b> Продукт <b>%s</b> будет удалён."
-#: src/modules/Packages.rb:732
+#: src/modules/Packages.rb:734
msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed.</font>"
msgstr "<b>Ошибка:</b> Продукт <b>%s</b> будет автоматически удалён."
#. TRANSLATORS: update proposal warning, do NOT translate "-release",
#. it is part of a package name (like "sles-release")
-#: src/modules/Packages.rb:758
+#: src/modules/Packages.rb:760
msgid ""
"<ul><li><b>Some products are marked for automatic removal.</b></li>\n"
"<ul><li>Contact the vendor of the removed add-on to provide you with a new\n"
@@ -1854,12 +1862,12 @@
"</li></ul></li></ul>"
#. error in proposal, %1 is URL
-#: src/modules/Packages.rb:1339
+#: src/modules/Packages.rb:1345
msgid "No repository found at '%1'."
msgstr "Репозиторий не найден на '%1'."
#. TRANSLATORS: beginning of the rich text with the release notes
-#: src/modules/Packages.rb:1612
+#: src/modules/Packages.rb:1618
msgid ""
"<p><b>The release notes for the initial release are part of the installation\n"
"media. If an Internet connection is available during configuration, you can\n"
@@ -1870,31 +1878,31 @@
"можете загрузить обновленные примечания к выпуску с веб-сервера SUSE Linux.</b></p>\n"
#. popup - information label
-#: src/modules/Packages.rb:1639
+#: src/modules/Packages.rb:1645
msgid "Integrating booted media..."
msgstr "Интеграция загруженных носителей…"
#. close the popup in order to be able to ask about the license
-#: src/modules/Packages.rb:1661
+#: src/modules/Packages.rb:1667
msgid "Failed to integrate the service pack repository."
msgstr "Не удалось интегрировать репозиторий сервис-паков."
#. popup - information label
-#: src/modules/Packages.rb:1694
+#: src/modules/Packages.rb:1700
msgid "Initializing repositories..."
msgstr "Инициализация репозиториев..."
#. message popup, %1 is product name
-#: src/modules/Packages.rb:1926
+#: src/modules/Packages.rb:1932
msgid "Insert %1 CD 1"
msgstr "Вставьте %1 CD 1"
-#: src/modules/Packages.rb:1928
+#: src/modules/Packages.rb:1934
msgid "%1 CD 1 not found"
msgstr "%1 CD 1 не найден"
#. an error message
-#: src/modules/Packages.rb:2038
+#: src/modules/Packages.rb:2044
msgid ""
"Error while initializing package descriptions.\n"
"Check the log file %1 for more details."
@@ -1903,7 +1911,7 @@
"Подробности в журнале %1."
#. bnc #436925
-#: src/modules/Packages.rb:2299
+#: src/modules/Packages.rb:2305
msgid ""
"The software selection has been changed externally.\n"
"Software proposal will be called again."
@@ -1912,12 +1920,12 @@
"Предложение ПО будет вызвано ещё раз."
#. popup label
-#: src/modules/Packages.rb:2317
+#: src/modules/Packages.rb:2323
msgid "Evaluating package selection..."
msgstr "Проверка выбора пакетов..."
#. Error message, %{pattern_name} is replaced with the missing pattern name in runtime
-#: src/modules/Packages.rb:2615
+#: src/modules/Packages.rb:2621
msgid ""
"Failed to select default product pattern %{pattern_name}.\n"
"Pattern has not been found."
@@ -1927,7 +1935,7 @@
#. Sets that the license (file) has been already accepted
#.
-#. @param string filename
+#. @param [String] license_ident file name
#: src/modules/ProductLicense.rb:150 src/modules/ProductLicense.rb:157
msgid "Cannot read license file %1"
msgstr "Невозможно прочесть файл лицензии %1"
@@ -1968,18 +1976,21 @@
"настройка будет прервана.</p>\n"
#. dialog title
+#. #459391
+#. If a progress is running open another dialog
#. dialog caption
-#: src/modules/ProductLicense.rb:410 src/modules/ProductLicense.rb:1211
+#: src/modules/ProductLicense.rb:410 src/modules/ProductLicense.rb:1149
+#: src/modules/ProductLicense.rb:1227
msgid "License Agreement"
msgstr "Лицензионное соглашение"
#. popup question
-#: src/modules/ProductLicense.rb:1016
+#: src/modules/ProductLicense.rb:1021
msgid "Really abort the add-on product installation?"
msgstr "Действительно прервать установку дополнительного продукта?"
#. text asking whether to refuse a license (Yes-No popup)
-#: src/modules/ProductLicense.rb:1040
+#: src/modules/ProductLicense.rb:1045
msgid ""
"Refusing the license agreement cancels the installation.\n"
"Really refuse the agreement?"
@@ -1988,7 +1999,7 @@
"Вы действительно не согласны с соглашением?"
#. text asking whether to refuse a license (Yes-No popup)
-#: src/modules/ProductLicense.rb:1043
+#: src/modules/ProductLicense.rb:1048
msgid ""
"Refusing the license agreement cancels the add-on\n"
"product installation. Really refuse the agreement?"
@@ -1997,12 +2008,19 @@
"дополнительного продукта. Вы действительно не согласны с соглашением?"
#. timed ok/cancel popup
-#: src/modules/ProductLicense.rb:1053
+#: src/modules/ProductLicense.rb:1058
msgid "The system is shutting down..."
msgstr "Система завершает работу..."
+#. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit"
+#: src/modules/ProductLicense.rb:1153
+#, fuzzy
+#| msgid "License Agreement"
+msgid "%s License Agreement"
+msgstr "Лицензионное соглашение"
+
#. TRANSLATORS: %{license_url} is an URL where the displayed license can be found
-#: src/modules/ProductLicense.rb:1577
+#: src/modules/ProductLicense.rb:1593
msgid ""
"If you want to print this EULA, you can download it from\n"
"%{license_url}"
@@ -2061,109 +2079,103 @@
msgid "Downloading delta RPM %1 (download size %2)"
msgstr "Загружается разностный RPM %1 (размер загрузки %2)"
-#. remote
-#: src/modules/SlideShowCallbacks.rb:461
-msgid "Downloading patch RPM %1 (download size %2)"
-msgstr "Загружается RPM исправления %1 (размер загрузки %2)"
-
#. error in installation log, %1 is detail error description
-#: src/modules/SlideShowCallbacks.rb:483
+#: src/modules/SlideShowCallbacks.rb:472
msgid "Failed to download delta RPM: %1"
msgstr "Не удалось загрузить разностный RPM: %1"
#. error in installation log, %1 is detail error description
-#: src/modules/SlideShowCallbacks.rb:492
+#: src/modules/SlideShowCallbacks.rb:481
msgid "Failed to apply delta RPM: %1"
msgstr "Не удалось применить разностный RPM: %1"
-#. error in installation log, %1 is detail error description
-#: src/modules/SlideShowCallbacks.rb:501
-msgid "Failed to download patch RPM: %1"
-msgstr "Не удалось загрузить RPM исправления %1"
-
#. radio button
-#: src/modules/SourceDialogs.rb:31
+#: src/modules/SourceDialogs.rb:33
msgid "&Scan Using SLP..."
msgstr "&Сканировать, используя SLP..."
#. radio button
-#: src/modules/SourceDialogs.rb:33
+#: src/modules/SourceDialogs.rb:35
msgid "Commun&ity Repositories"
msgstr "Репозитор&ии сообщества"
#. radio button
-#: src/modules/SourceDialogs.rb:35
+#: src/modules/SourceDialogs.rb:37
msgid "&Extensions and Modules from Registration Server..."
msgstr "&Расширения и модули сервера регистрации..."
#. radio button
-#: src/modules/SourceDialogs.rb:37
+#: src/modules/SourceDialogs.rb:39
msgid "Specify &URL..."
msgstr "&Указать URL..."
#. radio button
-#: src/modules/SourceDialogs.rb:39
+#: src/modules/SourceDialogs.rb:41
msgid "&FTP..."
msgstr "&FTP..."
#. radio button
-#: src/modules/SourceDialogs.rb:41
+#: src/modules/SourceDialogs.rb:43
msgid "&HTTP..."
msgstr "&HTTP..."
#. radio button
-#: src/modules/SourceDialogs.rb:43
+#: src/modules/SourceDialogs.rb:45
msgid "HTT&PS..."
msgstr "HTT&PS…"
#. radio button
#. radio button
-#: src/modules/SourceDialogs.rb:45 src/modules/SourceDialogs.rb:1720
-msgid "&SMB/CIFS"
+#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1757
+#, fuzzy
+#| msgid "&SMB/CIFS"
+msgid "S&MB/CIFS"
msgstr "&SMB/CIFS"
#. radio button
-#: src/modules/SourceDialogs.rb:47
-msgid "&NFS..."
+#: src/modules/SourceDialogs.rb:49
+#, fuzzy
+#| msgid "&NFS..."
+msgid "NF&S..."
msgstr "&NFS..."
#. radio button
-#: src/modules/SourceDialogs.rb:49
+#: src/modules/SourceDialogs.rb:51
msgid "&CD..."
msgstr "&CD..."
#. radio button
-#: src/modules/SourceDialogs.rb:51
+#: src/modules/SourceDialogs.rb:53
msgid "&DVD..."
msgstr "&DVD..."
#. radio button
-#: src/modules/SourceDialogs.rb:53
+#: src/modules/SourceDialogs.rb:55
msgid "&Hard Disk..."
msgstr "&Жёсткий диск..."
#. radio button
-#: src/modules/SourceDialogs.rb:55
+#: src/modules/SourceDialogs.rb:57
msgid "&USB Mass Storage (USB Stick, Disk)..."
msgstr "USB-&устройство хранения данных (USB-брелок, диск)..."
#. radio button
-#: src/modules/SourceDialogs.rb:57
+#: src/modules/SourceDialogs.rb:59
msgid "&Local Directory..."
msgstr "&Локальный каталог..."
#. radio button
-#: src/modules/SourceDialogs.rb:59
+#: src/modules/SourceDialogs.rb:61
msgid "&Local ISO Image..."
msgstr "&Локальный образ ISO..."
#. check box
-#: src/modules/SourceDialogs.rb:61
+#: src/modules/SourceDialogs.rb:63
msgid "&Download repository description files"
msgstr "Загрузи&ть файлы описания репозитория"
#. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:110
+#: src/modules/SourceDialogs.rb:116
msgid ""
"<p>If the location is a file holding an ISO image\n"
"of the media, set <b>ISO Image</b>.</p>"
@@ -2172,7 +2184,7 @@
"носителя, выберите <b>ISO образ</b>.</p>"
#. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:115
+#: src/modules/SourceDialogs.rb:121
msgid ""
"<p>If the repository is on multiple media,\n"
"set the location of the first media of the set.</p>\n"
@@ -2181,86 +2193,86 @@
"задайте расположение первого носителя.</p>\n"
#. text entry
-#: src/modules/SourceDialogs.rb:129
+#: src/modules/SourceDialogs.rb:135
msgid "&Server Name"
msgstr "Имя &сервера"
#. text entry
#. text entry
-#: src/modules/SourceDialogs.rb:137 src/modules/SourceDialogs.rb:1584
+#: src/modules/SourceDialogs.rb:143 src/modules/SourceDialogs.rb:1621
msgid "&Path to Directory or ISO Image"
msgstr "&Путь к каталогу или ISO-образу"
#. checkbox label
-#: src/modules/SourceDialogs.rb:145
+#: src/modules/SourceDialogs.rb:151
msgid "&ISO Image"
msgstr "Образ &ISO"
#. checkbox label
-#: src/modules/SourceDialogs.rb:147
+#: src/modules/SourceDialogs.rb:153
msgid "N&FS v4 Protocol"
msgstr "Протокол N&FS v4"
-#: src/modules/SourceDialogs.rb:153
+#: src/modules/SourceDialogs.rb:159
msgid "Mount Options"
msgstr "Опции монтирования"
#. TRANSLATORS: "(default)" - is a combobox value and means default libzypp
#. NFS mount option (users can change it to anything else, the field is editable)
-#: src/modules/SourceDialogs.rb:157
+#: src/modules/SourceDialogs.rb:163
msgid "(default)"
msgstr "(по умолчанию)"
-#: src/modules/SourceDialogs.rb:168
+#: src/modules/SourceDialogs.rb:174
msgid "URL of the Repository"
msgstr "URL репозитория"
#. frame
-#: src/modules/SourceDialogs.rb:177
+#: src/modules/SourceDialogs.rb:183
msgid "P&rotocol"
msgstr "П&ротокол"
#. input field label
-#: src/modules/SourceDialogs.rb:187
+#: src/modules/SourceDialogs.rb:193
msgid "&URL of the Repository"
msgstr "&URL репозитория"
#. label / dialog caption
#. bugzilla #219759
#. service label can be empty (not defined)
-#: src/modules/SourceDialogs.rb:202 src/modules/SourceManagerSLP.rb:323
+#: src/modules/SourceDialogs.rb:208 src/modules/SourceManagerSLP.rb:323
msgid "Repository URL"
msgstr "URL репозитория"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:204
+#: src/modules/SourceDialogs.rb:210
msgid "NFS Server"
msgstr "Сервер NFS"
#. label / dialog caption
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:206 src/modules/SourceDialogs.rb:208
+#: src/modules/SourceDialogs.rb:212 src/modules/SourceDialogs.rb:214
msgid "CD or DVD Media"
msgstr "CD или DVD"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:210
+#: src/modules/SourceDialogs.rb:216
msgid "Hard Disk"
msgstr "Жёсткий диск"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:212
+#: src/modules/SourceDialogs.rb:218
msgid "USB Stick or Disk"
msgstr "USB-брелок или диск"
#. label / dialog caption
#. dialog caption
-#: src/modules/SourceDialogs.rb:214 src/modules/SourceDialogs.rb:889
+#: src/modules/SourceDialogs.rb:220 src/modules/SourceDialogs.rb:926
msgid "Local Directory"
msgstr "Локальный каталог"
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:216
+#: src/modules/SourceDialogs.rb:222
msgid "Local ISO Image"
msgstr "Локальный образ ISO"
@@ -2269,24 +2281,24 @@
#. label / dialog caption
#. label / dialog caption
#. label / dialog caption
-#: src/modules/SourceDialogs.rb:218 src/modules/SourceDialogs.rb:220
-#: src/modules/SourceDialogs.rb:222 src/modules/SourceDialogs.rb:224
-#: src/modules/SourceDialogs.rb:226
+#: src/modules/SourceDialogs.rb:224 src/modules/SourceDialogs.rb:226
+#: src/modules/SourceDialogs.rb:228 src/modules/SourceDialogs.rb:230
+#: src/modules/SourceDialogs.rb:232
msgid "Server and Directory"
msgstr "Сервер и каталог"
#. popup message
-#: src/modules/SourceDialogs.rb:441
+#: src/modules/SourceDialogs.rb:468
msgid "The name of the repository cannot be empty."
msgstr "Имя репозитория не может быть пустым."
#. text entry
-#: src/modules/SourceDialogs.rb:453
+#: src/modules/SourceDialogs.rb:480
msgid "&Repository Name"
msgstr "Имя &репозитория"
#. help text
-#: src/modules/SourceDialogs.rb:468
+#: src/modules/SourceDialogs.rb:495
msgid ""
"<p><big><b>Repository Name</b></big><br>\n"
"Use <b>Repository Name</b> to specify the name of the repository. If it is empty, YaST will use the product name (if available) or the URL as the name.</p>\n"
@@ -2295,12 +2307,12 @@
"Используйте кнопку <b>Имя репозитория</b>, чтобы указать имя репозитория. Если оно не указано, YaST будет использовать имя продукта (если оно доступно) или URL как имя репозитория.</p>\n"
#. text entry
-#: src/modules/SourceDialogs.rb:482
+#: src/modules/SourceDialogs.rb:509
msgid "&Service Name"
msgstr "Имя &службы"
#. help text
-#: src/modules/SourceDialogs.rb:490
+#: src/modules/SourceDialogs.rb:517
msgid ""
"<p><big><b>Service Name</b></big><br>\n"
"Use <b>Service Name</b> to specify the name of the service. If it is empty, YaST will use part of the service URL as the name.</p>\n"
@@ -2309,17 +2321,17 @@
"Используйте <b>Имя службы</b>, чтобы указать имя службы. Если оно не указано, YaST будет использовать часть URL службы в качестве имени.</p>\n"
#. popup message
-#: src/modules/SourceDialogs.rb:525
+#: src/modules/SourceDialogs.rb:552
msgid "URL cannot be empty."
msgstr "URL не может быть пустым."
#. text entry
-#: src/modules/SourceDialogs.rb:538
+#: src/modules/SourceDialogs.rb:566
msgid "&URL"
msgstr "&URL"
#. help text
-#: src/modules/SourceDialogs.rb:552
+#: src/modules/SourceDialogs.rb:580
msgid ""
"<p><big><b>Repository URL</b></big><br>\n"
"Use <b>URL</b> to specify the URL of the repository.</p>"
@@ -2331,16 +2343,16 @@
#. @return widget description map
#. Get widget description map
#. @return widget description map
-#: src/modules/SourceDialogs.rb:725 src/modules/SourceDialogs.rb:1852
+#: src/modules/SourceDialogs.rb:753 src/modules/SourceDialogs.rb:1893
msgid "Edit Parts of the URL"
msgstr "Редактировать части URL"
-#: src/modules/SourceDialogs.rb:732 src/modules/SourceDialogs.rb:1859
+#: src/modules/SourceDialogs.rb:760 src/modules/SourceDialogs.rb:1900
msgid "Edit Complete URL"
msgstr "Редактировать весь URL"
#. help text
-#: src/modules/SourceDialogs.rb:744
+#: src/modules/SourceDialogs.rb:772
msgid ""
"<p><big><b>NFS Server</b></big><br>\n"
"Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n"
@@ -2350,7 +2362,7 @@
"Используйте <b>Имя сервера</b> и <b>Путь к каталогу или образ ISO</b>\n"
"для указания имени узла сервера NFS и пути к серверу.<p>"
-#: src/modules/SourceDialogs.rb:751
+#: src/modules/SourceDialogs.rb:779
msgid ""
"<p><big><b>Mount Options</b></big><br>\n"
"You can specify extra options used for mounting the NFS volume.\n"
@@ -2363,16 +2375,16 @@
"Более подробные сведения и список поддерживаемых опций приведены в <b>man 5 nfs</b>."
#. radio button
-#: src/modules/SourceDialogs.rb:806
+#: src/modules/SourceDialogs.rb:834
msgid "&CD-ROM"
msgstr "&CD-ROM"
#. radio button
-#: src/modules/SourceDialogs.rb:808
+#: src/modules/SourceDialogs.rb:836
msgid "&DVD-ROM"
msgstr "&DVD-ROM"
-#: src/modules/SourceDialogs.rb:813
+#: src/modules/SourceDialogs.rb:841
msgid ""
"<p><big><b>CD or DVD Media</b></big><br>\n"
"Set <b>CD-ROM</b> or <b>DVD-ROM</b> to specify the type of media.</p>"
@@ -2381,12 +2393,12 @@
" Выберите <b>CD-ROM</b> или <b>DVD-ROM</b>, чтобы указать тип носителя.</p>"
#. dialog caption
-#: src/modules/SourceDialogs.rb:904
+#: src/modules/SourceDialogs.rb:941
msgid "ISO Image File"
msgstr "Файл образа ISO"
#. error popup - the entered path is not a directory
-#: src/modules/SourceDialogs.rb:927
+#: src/modules/SourceDialogs.rb:964
msgid ""
"The entered path is not a directory\n"
"or the directory does not exist.\n"
@@ -2395,7 +2407,7 @@
"или каталог не существует.\n"
#. error popup - the entered path is not a regular file
-#: src/modules/SourceDialogs.rb:957
+#: src/modules/SourceDialogs.rb:994
msgid ""
"The entered path is not a file\n"
"or the file does not exist.\n"
@@ -2404,7 +2416,7 @@
"или файл не существует.\n"
#. continue/cancel popup, %1 is a file name
-#: src/modules/SourceDialogs.rb:981
+#: src/modules/SourceDialogs.rb:1018
msgid ""
"File '%1'\n"
"does not seem to be an ISO image.\n"
@@ -2415,17 +2427,17 @@
"Продолжить?\n"
#. text entry
-#: src/modules/SourceDialogs.rb:1002
+#: src/modules/SourceDialogs.rb:1039
msgid "&Path to Directory"
msgstr "&Путь к каталогу"
#. checkbox label
-#: src/modules/SourceDialogs.rb:1010 src/modules/SourceDialogs.rb:1268
-#: src/modules/SourceDialogs.rb:1335
+#: src/modules/SourceDialogs.rb:1047 src/modules/SourceDialogs.rb:1305
+#: src/modules/SourceDialogs.rb:1372
msgid "&Plain RPM Directory"
msgstr "&Просто каталог RPM"
-#: src/modules/SourceDialogs.rb:1025
+#: src/modules/SourceDialogs.rb:1062
msgid ""
"<p><big><b>Local Directory</b></big><br>\n"
"Use <b>Path to Directory</b> to specify the path to the\n"
@@ -2440,20 +2452,20 @@
"<b>Просто каталог RPM</b>.</p>\n"
#. `opt(`hstretch),
-#: src/modules/SourceDialogs.rb:1261
+#: src/modules/SourceDialogs.rb:1298
msgid "&USB Mass Storage Device"
msgstr "&USB-устройство хранения информации"
#. the spacing is added to make the widget wider
-#: src/modules/SourceDialogs.rb:1266 src/modules/SourceDialogs.rb:1333
+#: src/modules/SourceDialogs.rb:1303 src/modules/SourceDialogs.rb:1370
msgid "&File System"
msgstr "&Файловая система"
-#: src/modules/SourceDialogs.rb:1267 src/modules/SourceDialogs.rb:1334
+#: src/modules/SourceDialogs.rb:1304 src/modules/SourceDialogs.rb:1371
msgid "Dire&ctory"
msgstr "&Каталог"
-#: src/modules/SourceDialogs.rb:1272
+#: src/modules/SourceDialogs.rb:1309
msgid ""
"<p><big><b>USB Stick or Disk</b></big><br>\n"
"Select the USB device on which the repository is located.\n"
@@ -2473,7 +2485,7 @@
#. 'auto' is a value in the combo box widget, do not translate it!
#. 'auto' is a value in the combo box widget, do not translate it!
-#: src/modules/SourceDialogs.rb:1282 src/modules/SourceDialogs.rb:1349
+#: src/modules/SourceDialogs.rb:1319 src/modules/SourceDialogs.rb:1386
msgid ""
"<p>The file system used on the device will be detected automatically\n"
"if you select file system 'auto'. If the detection fails or you\n"
@@ -2484,11 +2496,11 @@
"вы хотите использовать определённую файловую систему, выберите её из списка.</p>\n"
#. combobox title
-#: src/modules/SourceDialogs.rb:1332
+#: src/modules/SourceDialogs.rb:1369
msgid "&Disk Device"
msgstr "&Дисковое устройство"
-#: src/modules/SourceDialogs.rb:1339
+#: src/modules/SourceDialogs.rb:1376
msgid ""
"<p><big><b>Disk</b></big><br>\n"
"Select the disk on which the repository is located.\n"
@@ -2507,12 +2519,12 @@
"<b>Просто каталог RPM</b>.</p>\n"
#. text entry
-#: src/modules/SourceDialogs.rb:1365
+#: src/modules/SourceDialogs.rb:1402
msgid "&Path to ISO Image"
msgstr "&Путь к образу ISO"
#. push button
-#: src/modules/SourceDialogs.rb:1385
+#: src/modules/SourceDialogs.rb:1422
msgid ""
"<p><big><b>Local ISO Image</b></big><br>\n"
"Use <b>Path to ISO Image</b> to specify the path to the\n"
@@ -2523,71 +2535,71 @@
"файлу ISO-образа.</p>"
#. text entry
-#: src/modules/SourceDialogs.rb:1566
+#: src/modules/SourceDialogs.rb:1603
msgid "Server &Name"
msgstr "&Имя сервера"
-#: src/modules/SourceDialogs.rb:1570
+#: src/modules/SourceDialogs.rb:1607
msgid "&Port"
msgstr "&Порт"
#. text entry
-#: src/modules/SourceDialogs.rb:1575
+#: src/modules/SourceDialogs.rb:1612
msgid "&Share"
msgstr "Общий ре&сурс"
#. checkbox label
-#: src/modules/SourceDialogs.rb:1588
+#: src/modules/SourceDialogs.rb:1625
msgid "ISO &Image"
msgstr "Образ &ISO"
#. text entry
-#: src/modules/SourceDialogs.rb:1591
+#: src/modules/SourceDialogs.rb:1628
msgid "&Directory on Server"
msgstr "Ка&талог на сервере"
#. frame
-#: src/modules/SourceDialogs.rb:1596
+#: src/modules/SourceDialogs.rb:1633
msgid "Au&thentication"
msgstr "Ау&тентификация"
#. check box
-#: src/modules/SourceDialogs.rb:1603
+#: src/modules/SourceDialogs.rb:1640
msgid "&Anonymous"
msgstr "&Анонимно"
#. text entry
-#: src/modules/SourceDialogs.rb:1612
+#: src/modules/SourceDialogs.rb:1649
msgid "&Workgroup or Domain"
msgstr "&Рабочая группа или Домен"
#. text entry
-#: src/modules/SourceDialogs.rb:1621
+#: src/modules/SourceDialogs.rb:1658
msgid "&User Name"
msgstr "Имя п&ользователя"
#. password entry
-#: src/modules/SourceDialogs.rb:1628
+#: src/modules/SourceDialogs.rb:1665
msgid "&Password"
msgstr "&Пароль"
#. radio button
-#: src/modules/SourceDialogs.rb:1703
+#: src/modules/SourceDialogs.rb:1740
msgid "&FTP"
msgstr "&FTP"
#. radio button
-#: src/modules/SourceDialogs.rb:1706
+#: src/modules/SourceDialogs.rb:1743
msgid "H&TTP"
msgstr "H&TTP"
#. radio button
-#: src/modules/SourceDialogs.rb:1713
+#: src/modules/SourceDialogs.rb:1750
msgid "HTT&PS"
msgstr "HTT&PS"
#. help text - server dialog
-#: src/modules/SourceDialogs.rb:1883
+#: src/modules/SourceDialogs.rb:1924
msgid ""
"<p><big><b>Server and Directory</b></big><br>\n"
"Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n"
@@ -2612,7 +2624,7 @@
"носителя, укажите <b>Образ ISO</b>.</p>\n"
#. help text - server dialog, there is a "Port" widget
-#: src/modules/SourceDialogs.rb:1896
+#: src/modules/SourceDialogs.rb:1937
msgid ""
"<p>It is possible to set the <b>Port</b> number for a HTTP/HTTPS repository.\n"
"Leave it empty to use the default port.</p>\n"
@@ -2623,12 +2635,12 @@
#. Returns whether Community Repositories are defined in the control file.
#.
#. @return [Boolean] whether defined
-#: src/modules/SourceDialogs.rb:1958
+#: src/modules/SourceDialogs.rb:1999
msgid "I would like to install an additional Add On Product"
msgstr "Я хочу установить Дополнительный продукт"
#. help text
-#: src/modules/SourceDialogs.rb:2085
+#: src/modules/SourceDialogs.rb:2126
msgid ""
"<p><big><b>Media Type</b></big><br>\n"
"The software repository can be located on CD, on a network server,\n"
@@ -2639,7 +2651,7 @@
"или жёстком диске.</p>"
#. help, continued
-#: src/modules/SourceDialogs.rb:2094
+#: src/modules/SourceDialogs.rb:2135
msgid ""
"<p>\n"
"To add <b>CD</b> or <b>DVD</b>,\n"
@@ -2649,7 +2661,7 @@
"Прежде чем добавить <b>CD</b> или <b>DVD</b>, обеспечьте доступность набора CD- или DVD-дисков продукта."
#. help, continued
-#: src/modules/SourceDialogs.rb:2104
+#: src/modules/SourceDialogs.rb:2145
msgid ""
"<p>\n"
"The product CDs can be copied to the hard disk.\n"
@@ -2664,7 +2676,7 @@
"в один каталог.</p>\n"
#. help, continued
-#: src/modules/SourceDialogs.rb:2116
+#: src/modules/SourceDialogs.rb:2157
msgid ""
"<p>\n"
"Network installation requires a working network connection.\n"
@@ -2677,25 +2689,25 @@
"с первого диска. Например /data1/CD1.</p>\n"
#. error popup
-#: src/modules/SourceDialogs.rb:2131
+#: src/modules/SourceDialogs.rb:2172
msgid "Select the media type"
msgstr "Выберите тип носителя"
-#: src/modules/SourceDialogs.rb:2137
+#: src/modules/SourceDialogs.rb:2178
msgid "Insert the add-on product CD"
msgstr "Вставьте CD с дополнительным продуктом"
-#: src/modules/SourceDialogs.rb:2138
+#: src/modules/SourceDialogs.rb:2179
msgid "Insert the add-on product DVD"
msgstr "Вставьте DVD с дополнительным продуктом"
#. ask for a medium
-#: src/modules/SourceDialogs.rb:2156
+#: src/modules/SourceDialogs.rb:2197
msgid "No USB disk was detected."
msgstr "Диск USB не обнаружен."
-#. TODO: disable "download" option when CD or DVD source is selected
-#: src/modules/SourceDialogs.rb:2359
+#. use three slashes as third slash means path
+#: src/modules/SourceDialogs.rb:2403
msgid ""
"<p><b>Download Files</b><br>\n"
"Each repository has description files which describe the content of the\n"
@@ -2710,15 +2722,22 @@
"автоматически загружать файлы по мере необходимости.</p>\n"
#. dialog caption
-#: src/modules/SourceDialogs.rb:2578
+#: src/modules/SourceDialogs.rb:2623
msgid "Media Type"
msgstr "Тип носителя"
#. dialog caption
-#: src/modules/SourceDialogs.rb:2602
+#: src/modules/SourceDialogs.rb:2647
msgid "Add On Product"
msgstr "Дополнительный продукт"
+#. Returns boolean whether user confirmed to abort the configuration
+#.
+#. @return [Boolean] whether to abort
+#: src/modules/SourceDialogs.rb:2678
+msgid "URL scheme '%s' is not valid."
+msgstr ""
+
#. SourceManager read dialog caption
#: src/modules/SourceManager.rb:100
msgid "Initializing Available Repositories"
@@ -2812,7 +2831,7 @@
#. To adjust the width of the dialog, look for the more lengthy device label
#. (and add some extra space for the frame)
-#: src/modules/SourceManager.rb:670
+#: src/modules/SourceManager.rb:671
msgid "&Drive to eject"
msgstr "Извлекаемый приво&д"
@@ -2925,6 +2944,12 @@
msgid "Deselect some packages."
msgstr "Отмените выбор некоторых пакетов."
+#~ msgid "Downloading patch RPM %1 (download size %2)"
+#~ msgstr "Загружается RPM исправления %1 (размер загрузки %2)"
+
+#~ msgid "Failed to download patch RPM: %1"
+#~ msgstr "Не удалось загрузить RPM исправления %1"
+
#~ msgid "N&o, I Do not Agree"
#~ msgstr "&Нет, я не согласен(на)"
1
0