Author: keichwa
Date: 2017-05-23 07:09:56 +0000 (Tue, 23 May 2017)
New Revision: 97362
Modified:
branches/SLE12-SP3/yast/ru/po/add-on.ru.po
branches/SLE12-SP3/yast/ru/po/autoinst.ru.po
branches/SLE12-SP3/yast/ru/po/bootloader.ru.po
branches/SLE12-SP3/yast/ru/po/cio.ru.po
branches/SLE12-SP3/yast/ru/po/cluster.ru.po
branches/SLE12-SP3/yast/ru/po/control.ru.po
branches/SLE12-SP3/yast/ru/po/country.ru.po
branches/SLE12-SP3/yast/ru/po/firewall.ru.po
branches/SLE12-SP3/yast/ru/po/firstboot.ru.po
branches/SLE12-SP3/yast/ru/po/installation.ru.po
branches/SLE12-SP3/yast/ru/po/iscsi-lio-server.ru.po
branches/SLE12-SP3/yast/ru/po/kdump.ru.po
branches/SLE12-SP3/yast/ru/po/network.ru.po
branches/SLE12-SP3/yast/ru/po/packager.ru.po
branches/SLE12-SP3/yast/ru/po/registration.ru.po
branches/SLE12-SP3/yast/ru/po/reipl.ru.po
branches/SLE12-SP3/yast/ru/po/rpm-groups.ru.po
branches/SLE12-SP3/yast/ru/po/s390.ru.po
branches/SLE12-SP3/yast/ru/po/samba-server.ru.po
branches/SLE12-SP3/yast/ru/po/scanner.ru.po
branches/SLE12-SP3/yast/ru/po/smt.ru.po
branches/SLE12-SP3/yast/ru/po/storage.ru.po
branches/SLE12-SP3/yast/ru/po/update.ru.po
branches/SLE12-SP3/yast/ru/po/vm.ru.po
branches/SLE12-SP3/yast/ru/po/xpram.ru.po
branches/SLE12-SP3/yast/ru/po/yast2-apparmor.ru.po
Log:
merged
Modified: branches/SLE12-SP3/yast/ru/po/add-on.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/add-on.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/add-on.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: add-on\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-20 17:12+0200\n"
+"POT-Creation-Date: 2017-05-17 17:45+0200\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -81,13 +81,14 @@
msgid "<li>Media: %1, Path: %2, Product: %3</li>\n"
msgstr "<li>Носитель %1, путь %2, продукт %3</li>\n"
-#. set addon specific sig-handling
-#: src/clients/add-on_auto.rb:186
+#. revert back to the unexpanded URL to have the original URL
+#. in the saved /etc/zypp/repos.d file
+#: src/clients/add-on_auto.rb:191
msgid "Make the add-on \"%1\" available via \"%2\"."
msgstr "Удостоверьтесь, что дополнительный продукт \"%1\" доступен через \"%2\""
#. just report error
-#: src/clients/add-on_auto.rb:193
+#: src/clients/add-on_auto.rb:198
msgid "Failed to add add-on product."
msgstr "Сбой при добавлении дополнительного продукта"
@@ -475,6 +476,5 @@
"\n"
"Пропустить установку дополнительных продуктов?"
-#: control/installation.glade.translations.glade:4
-msgid "Language Installation"
-msgstr "Установка языков"
+#~ msgid "Language Installation"
+#~ msgstr "Установка языков"
Modified: branches/SLE12-SP3/yast/ru/po/autoinst.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/autoinst.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/autoinst.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: autoinst\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-09 02:27+0000\n"
+"POT-Creation-Date: 2017-04-19 02:27+0000\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -53,7 +53,7 @@
#. Backup
#. Now check if there any classes defined in theis pre final control file
#: src/clients/autoyast.rb:114 src/clients/ayast_setup.rb:148
-#: src/clients/inst_autoinit.rb:184 src/clients/inst_autosetup.rb:463
+#: src/clients/inst_autoinit.rb:184 src/clients/inst_autosetup.rb:476
#: src/clients/inst_autosetup_upgrade.rb:485
#: src/modules/AutoInstallRules.rb:997
msgid ""
@@ -596,7 +596,7 @@
#. Adding selections (defined in PackageAI) to libzypp and solving
#. package dependencies.
-#: src/clients/inst_autosetup.rb:361
+#: src/clients/inst_autosetup.rb:374
msgid ""
"Error while configuring software selections.\n"
"Try again.\n"
Modified: branches/SLE12-SP3/yast/ru/po/bootloader.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/bootloader.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/bootloader.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: bootloader\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-25 02:27+0000\n"
+"POT-Creation-Date: 2017-04-19 02:27+0000\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -159,74 +159,76 @@
#. @return a list of summary lines
#. Display bootloader summary
#. @return a list of summary lines
-#: src/lib/bootloader/grub2.rb:106 src/lib/bootloader/grub2efi.rb:76
+#: src/lib/bootloader/grub2.rb:99 src/lib/bootloader/grub2efi.rb:76
msgid "Boot Loader Type: %1"
msgstr "Тип загрузчика: %1"
-#: src/lib/bootloader/grub2.rb:110
+#: src/lib/bootloader/grub2.rb:103 src/lib/bootloader/grub2efi.rb:84
msgid "Enable Trusted Boot: %1"
msgstr "Включить безопасную загрузку Trusted Boot: %1"
-#: src/lib/bootloader/grub2.rb:111 src/lib/bootloader/grub2efi.rb:81
+#: src/lib/bootloader/grub2.rb:104 src/lib/bootloader/grub2efi.rb:81
+#: src/lib/bootloader/grub2efi.rb:85
msgid "yes"
msgstr "да"
-#: src/lib/bootloader/grub2.rb:111 src/lib/bootloader/grub2efi.rb:81
+#: src/lib/bootloader/grub2.rb:104 src/lib/bootloader/grub2efi.rb:81
+#: src/lib/bootloader/grub2efi.rb:85
msgid "no"
msgstr "нет"
-#: src/lib/bootloader/grub2.rb:117
+#: src/lib/bootloader/grub2.rb:110
msgid "Status Location: %1"
msgstr "Расположение: %1"
#. part of summary, %1 is a list of hard disks device names
-#: src/lib/bootloader/grub2.rb:181
+#: src/lib/bootloader/grub2.rb:174
msgid "Order of Hard Disks: %1"
msgstr "Порядок жесткоих дисков: %1"
#. TRANSLATORS: extended is here for extended partition. Keep translation short.
-#: src/lib/bootloader/grub2.rb:193
+#: src/lib/bootloader/grub2.rb:186
msgid " (extended)"
msgstr " (расширенный)"
#. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific
#. is used in your language, then keep it as it is.
-#: src/lib/bootloader/grub2.rb:198
+#: src/lib/bootloader/grub2.rb:191
msgid " (MBR)"
msgstr " (MBR)"
-#: src/lib/bootloader/grub2.rb:219
+#: src/lib/bootloader/grub2.rb:212
msgid "Install bootcode into MBR (do not install</a>)"
msgstr "Установить загрузочный код в основной загрузочной записи (не устанавливать</a>)"
-#: src/lib/bootloader/grub2.rb:223
+#: src/lib/bootloader/grub2.rb:216
msgid "Do not install bootcode into MBR (install</a>)"
msgstr "Не устанавливать загрузочный код в основной загрузочной записи (установить</a>)"
#. check for separated boot partition, use root otherwise
-#: src/lib/bootloader/grub2.rb:233
+#: src/lib/bootloader/grub2.rb:226
msgid "Install bootcode into /boot partition (do not install</a>)"
msgstr "Установить загрузочный код в разделе /boot (не устанавливать</a>)"
-#: src/lib/bootloader/grub2.rb:238
+#: src/lib/bootloader/grub2.rb:231
msgid "Do not install bootcode into /boot partition (install</a>)"
msgstr "Не устанавливать загрузочный код в разделе /boot (установить</a>)"
-#: src/lib/bootloader/grub2.rb:244
+#: src/lib/bootloader/grub2.rb:237
msgid "Install bootcode into \"/\" partition (do not install</a>)"
msgstr "Установить загрузочный код в разделе \"/\" (не устанавливать</a>)"
-#: src/lib/bootloader/grub2.rb:249
+#: src/lib/bootloader/grub2.rb:242
msgid "Do not install bootcode into \"/\" partition (install</a>)"
msgstr "Не устанавливать загрузочный код в раздел \"/\" (установить</a>)"
#. no location chosen, so warn user that it is problem unless he is sure
-#: src/lib/bootloader/grub2.rb:274
+#: src/lib/bootloader/grub2.rb:267
msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
msgstr "Внимание! Не выбрано расположение для загрузчика stage1. Выберите расположение выше (за исключением случаев, когда вы знаете, что делаете)."
#. TRANSLATORS: title for list of location proposals
-#: src/lib/bootloader/grub2.rb:282
+#: src/lib/bootloader/grub2.rb:275
msgid "Change Location: %s"
msgstr "Изменить расположение: %s"
@@ -344,14 +346,21 @@
#. TRANSLATORS: TrustedGRUB2 is a name, don't translate it
#: src/lib/bootloader/grub2_widgets.rb:301
+#, fuzzy
+#| msgid ""
+#| "<p><b>Trusted Boot</b> will install TrustedGRUB2\n"
+#| "instead of regular GRUB2.</p>\n"
+#| "<p>It means measuring the integrity of the boot process,\n"
+#| "with the help from the hardware (a TPM, Trusted Platform Module,\n"
+#| "chip).</p>\n"
+#| "<p>First you need to make sure Trusted Boot is enabled in the BIOS\n"
+#| "setup (the setting may be named Security Chip, for example).</p>\n"
msgid ""
"<p><b>Trusted Boot</b> will install TrustedGRUB2\n"
"instead of regular GRUB2.</p>\n"
"<p>It means measuring the integrity of the boot process,\n"
"with the help from the hardware (a TPM, Trusted Platform Module,\n"
"chip).</p>\n"
-"<p>First you need to make sure Trusted Boot is enabled in the BIOS\n"
-"setup (the setting may be named Security Chip, for example).</p>\n"
msgstr ""
"<p><b>Trusted Boot</b> установит TrustedGRUB2\n"
"вместо обычного GRUB2.</p>\n"
@@ -361,10 +370,16 @@
"<p>Сначала необходимо включить функцию Trusted Boot в настройках BIOS\n"
"(соответствующий параметр может называться, например, Security Chip).</p>\n"
+#: src/lib/bootloader/grub2_widgets.rb:307
+msgid ""
+"<p>First you need to make sure Trusted Boot is enabled in the BIOS\n"
+"setup (the setting may be named Security Chip, for example).</p>\n"
+msgstr ""
+
#. check for file size does not work, since FS reports it 4096
#. even if the file is in fact empty and a single byte cannot
#. be read, therefore testing real reading (details: bsc#994556)
-#: src/lib/bootloader/grub2_widgets.rb:327
+#: src/lib/bootloader/grub2_widgets.rb:331
msgid ""
"Trusted Platform Module not found.\n"
"Make sure it is enabled in BIOS.\n"
@@ -375,30 +390,30 @@
"В противном случае система не загрузится."
#. Represents grub password protection widget
-#: src/lib/bootloader/grub2_widgets.rb:347
+#: src/lib/bootloader/grub2_widgets.rb:351
msgid "Prot&ect Boot Loader with Password"
msgstr "&Защитить загрузчик паролем"
#. TRANSLATORS: checkbox entry
-#: src/lib/bootloader/grub2_widgets.rb:353
+#: src/lib/bootloader/grub2_widgets.rb:357
msgid "P&rotect Entry Modification Only"
msgstr "З&ащищать только от изменения записей"
#. TRANSLATORS: text entry, please keep it short
-#: src/lib/bootloader/grub2_widgets.rb:359
+#: src/lib/bootloader/grub2_widgets.rb:363
msgid "&Password for GRUB2 User 'root'"
msgstr "&Пароль для пользователя GRUB2 root"
#. text entry
-#: src/lib/bootloader/grub2_widgets.rb:362
+#: src/lib/bootloader/grub2_widgets.rb:366
msgid "Re&type Password"
msgstr "По&вторить пароль"
-#: src/lib/bootloader/grub2_widgets.rb:373
+#: src/lib/bootloader/grub2_widgets.rb:377
msgid "The password must not be empty."
msgstr "Пароль не должен быть пустым."
-#: src/lib/bootloader/grub2_widgets.rb:380
+#: src/lib/bootloader/grub2_widgets.rb:384
msgid ""
"'Password' and 'Retype password'\n"
"do not match. Retype the password."
@@ -407,7 +422,7 @@
"не совпадают. Повторите ввод пароля."
#. special value as we do not know password, so it mean user do not change it
-#: src/lib/bootloader/grub2_widgets.rb:433
+#: src/lib/bootloader/grub2_widgets.rb:437
msgid ""
"<p><b>Protect Boot Loader with Password</b><br>\n"
"At boot time, modifying or even booting any entry will require the password. If <b>Protect Entry Modification Only</b> is checked then booting any entry is not restricted but modifying entries requires the password (which is the way GRUB 1 behaved). As side-effect of this option, rd.shell=0 is added to kernel parameters, to prevent an unauthorized access to the initrd shell.<br>YaST will only accept the password if you repeat it in <b>Retype Password</b>. The password applies to the GRUB2 user 'root' which is distinct from the Linux 'root'. YaST currently does not supportother GRUB2 users. If you need them, use a separate GRUB2 script.</p>"
@@ -416,7 +431,7 @@
"Во время загрузки для изменения или даже запуска любого пункта будет требоваться пароль. Если отмечен пункт <b>Защитить только от изменения пунктов</b>, то запуск любого пункта не ограничен, но для изменения пунктов требуется пароль (аналогично поведению GRUB 1). В качестве побочного эффекта этого параметра, rd.shell=0 добавлено в параметры ядра, чтобы предотвратить неправомерный доступ к оболочке initrd.<br>YaST примет пароль, только если вы повторите его в поле <b>Повторите пароль</b>. Пароль относится к пользователю 'root' в GRUB2, который не является пользова
телем 'root' в Linux. В настоящее время YaST не поддерживает других пользователей GRUB2. Если они вам нужны, используйте отдельный скрипт GRUB2.</p>"
#. Translators: do not translate the quoted parts like "unit"
-#: src/lib/bootloader/grub2_widgets.rb:466
+#: src/lib/bootloader/grub2_widgets.rb:470
msgid ""
"<p>When a graphical console is used it allows to use various display resolutions. The <tt>auto</tt> option tries to find the best one when booting starts.</p>\n"
"<p>When a serial console is used the boot output will be printed to a serial device like <tt>ttyS0</tt>. At least the <tt>--unit</tt> option has to be specified, and the complete syntax is <tt>%s</tt>. Other parts are optional and if not set, a default is used. <tt>NUM</tt> in commands stands for a positive number like 8. Example parameters are <tt>serial --speed=38400 --unit=0</tt>.</p>"
@@ -425,12 +440,12 @@
"<p>При использовании последовательной консоли загрузочные данные печатаются на таком последовательном устройстве, как <tt>ttyS0</tt>. Необходимо указать, по крайней мере, параметр <tt>--unit</tt>. Полный синтаксис: <tt>%s</tt>. Другие части являются необязательными. Если они не установлены, используются значения по умолчанию. Операнд <tt>NUM</tt> в командах означает положительное число, например, 8. Пример параметров: <tt>serial --speed=38400 --unit=0</tt>.</p>"
#. there's mode specified, use it
-#: src/lib/bootloader/grub2_widgets.rb:503
+#: src/lib/bootloader/grub2_widgets.rb:507
msgid "To enable serial console you must provide the corresponding arguments."
msgstr "Чтобы включить последовательную консоль, предоставьте соответствующие аргументы."
#. Translators: do not translate "unit"
-#: src/lib/bootloader/grub2_widgets.rb:510
+#: src/lib/bootloader/grub2_widgets.rb:514
msgid ""
"To enable the serial console you must provide the corresponding arguments.\n"
"The \"unit\" argument is required, the complete syntax is:\n"
@@ -440,7 +455,7 @@
"Требуется аргумент \"unit\", полный синтаксис:\n"
"%s"
-#: src/lib/bootloader/grub2_widgets.rb:551
+#: src/lib/bootloader/grub2_widgets.rb:555
msgid "Choose new graphical theme file"
msgstr "Выберите новый файл графической темы"
@@ -448,40 +463,40 @@
#. to be substituted in a command like
#. "serial --unit=NUM --speed=NUM --parity={odd|even|no} --word=NUM --stop=NUM"
#. so do not use punctuation
-#: src/lib/bootloader/grub2_widgets.rb:567
+#: src/lib/bootloader/grub2_widgets.rb:571
msgid "NUM"
msgstr "NUM"
-#: src/lib/bootloader/grub2_widgets.rb:574
+#: src/lib/bootloader/grub2_widgets.rb:578
msgid "Use &graphical console"
msgstr "Использовать &графическую консоль"
-#: src/lib/bootloader/grub2_widgets.rb:579
+#: src/lib/bootloader/grub2_widgets.rb:583
msgid "&Console resolution"
msgstr "Разрешение &консоли"
-#: src/lib/bootloader/grub2_widgets.rb:584
+#: src/lib/bootloader/grub2_widgets.rb:588
msgid "&Console theme"
msgstr "Тема кон&соли"
-#: src/lib/bootloader/grub2_widgets.rb:615
+#: src/lib/bootloader/grub2_widgets.rb:619
msgid "Autodetect by grub2"
msgstr "Автообнаружение grub2"
-#: src/lib/bootloader/grub2_widgets.rb:623
+#: src/lib/bootloader/grub2_widgets.rb:627
msgid "Use &serial console"
msgstr "Использовать кон&соль с последовательным интерфейсом"
-#: src/lib/bootloader/grub2_widgets.rb:630
+#: src/lib/bootloader/grub2_widgets.rb:634
msgid "&Console arguments"
msgstr "Аргументы кон&соли"
#. represent choosing default section to boot
-#: src/lib/bootloader/grub2_widgets.rb:647
+#: src/lib/bootloader/grub2_widgets.rb:651
msgid "&Default Boot Section"
msgstr "Загрузочный раздел по умол&чанию"
-#: src/lib/bootloader/grub2_widgets.rb:651
+#: src/lib/bootloader/grub2_widgets.rb:655
msgid ""
"<p> By pressing <b>Set as Default</b> you mark the selected section as\n"
"the default. When booting, the boot loader will provide a boot menu and\n"
@@ -498,40 +513,40 @@
"можно изменить при помощи кнопок <b>Вверх</b> и <b>Вниз</b>.</p>\n"
#. Represents stage1 location for bootloader
-#: src/lib/bootloader/grub2_widgets.rb:686
+#: src/lib/bootloader/grub2_widgets.rb:690
msgid "Boot Loader Location"
msgstr "Местонахождение загрузчика"
-#: src/lib/bootloader/grub2_widgets.rb:740
+#: src/lib/bootloader/grub2_widgets.rb:744
msgid "Custom boot device have to be specied if checked"
msgstr "Если установлен этот флажок, должно быть указано пользовательское загрузочное устройство"
-#: src/lib/bootloader/grub2_widgets.rb:768
+#: src/lib/bootloader/grub2_widgets.rb:772
msgid "Boo&t from Boot Partition"
msgstr "Загрузи&ть из загрузочного раздела"
-#: src/lib/bootloader/grub2_widgets.rb:769
+#: src/lib/bootloader/grub2_widgets.rb:773
msgid "Boo&t from Root Partition"
msgstr "Загрузи&ть с корневого раздела"
-#: src/lib/bootloader/grub2_widgets.rb:770
+#: src/lib/bootloader/grub2_widgets.rb:774
msgid "Boot from &Master Boot Record"
msgstr "Загрузить из основной загрузочной записи (&MBR)"
-#: src/lib/bootloader/grub2_widgets.rb:771
+#: src/lib/bootloader/grub2_widgets.rb:775
msgid "Boot from &Extended Partition"
msgstr "Загрузить из дополнит&ельного раздела"
-#: src/lib/bootloader/grub2_widgets.rb:782
+#: src/lib/bootloader/grub2_widgets.rb:786
msgid "C&ustom Boot Partition"
msgstr "Др&угой загрузочный раздел"
#. Represents button that open Device Map edit dialog
-#: src/lib/bootloader/grub2_widgets.rb:795
+#: src/lib/bootloader/grub2_widgets.rb:799
msgid "&Edit Disk Boot Order"
msgstr "&Изменить порядок загрузки дисков"
-#: src/lib/bootloader/grub2_widgets.rb:801
+#: src/lib/bootloader/grub2_widgets.rb:805
msgid ""
"<p><big><b>Disks Order</b></big><br>\n"
"To specify the order of the disks according to the order in BIOS, use\n"
@@ -546,17 +561,17 @@
"Для удаления диска нажмите <b>Удалить</b>.</p>"
#. represents Tab with kernel related configuration
-#: src/lib/bootloader/grub2_widgets.rb:822
+#: src/lib/bootloader/grub2_widgets.rb:826
msgid "&Kernel Parameters"
msgstr "Параметры &ядра"
#. Represent tab with options related to stage1 location and bootloader type
-#: src/lib/bootloader/grub2_widgets.rb:847
+#: src/lib/bootloader/grub2_widgets.rb:851
msgid "Boot Co&de Options"
msgstr "Параметры загрузочного к&ода"
#. Represents bootloader specific options like its timeout, default section or password protection
-#: src/lib/bootloader/grub2_widgets.rb:913
+#: src/lib/bootloader/grub2_widgets.rb:921
msgid "Boot&loader Options"
msgstr "Параметры &загрузчика"
Modified: branches/SLE12-SP3/yast/ru/po/cio.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/cio.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/cio.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: cio\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-21 00:29+0000\n"
+"POT-Creation-Date: 2017-05-17 17:45+0200\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -40,13 +40,13 @@
msgstr "Использовано"
#: src/lib/iochannel/channels_dialog.rb:142
+msgid "yes"
+msgstr "Да"
+
+#: src/lib/iochannel/channels_dialog.rb:142
msgid "no"
msgstr "Нет"
-#: src/lib/iochannel/channels_dialog.rb:142
-msgid "yes"
-msgstr "Да"
-
#. filter can be empty if dialog is not yet created
#: src/lib/iochannel/channels_dialog.rb:160
msgid "Filter channels"
Modified: branches/SLE12-SP3/yast/ru/po/cluster.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/cluster.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/cluster.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: cluster\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:26+0200\n"
+"POT-Creation-Date: 2017-04-06 02:28+0000\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -92,7 +92,7 @@
msgid "Redundant IP Address"
msgstr "Повторяющийся IP-адрес"
-#: src/include/cluster/dialogs.rb:117 src/include/cluster/dialogs.rb:501
+#: src/include/cluster/dialogs.rb:117 src/include/cluster/dialogs.rb:504
msgid "Node ID"
msgstr "ИД узла"
@@ -124,7 +124,7 @@
msgstr "При настройке транспорта группового вещания необходимо указать значение поля \"Ожидаемые голоса\""
#: src/include/cluster/dialogs.rb:228 src/include/cluster/dialogs.rb:256
-#: src/include/cluster/dialogs.rb:1429
+#: src/include/cluster/dialogs.rb:1432
msgid "The Multicast Address has to be fulfilled"
msgstr "Укажите адрес группового вещания"
@@ -137,61 +137,61 @@
msgstr "Если используется несколько интерфейсов, можно выбрать только активный или пассивный режим. Выбран пассивный режим."
#. BNC#871970, change member address struct to memberaddr
-#: src/include/cluster/dialogs.rb:441
+#: src/include/cluster/dialogs.rb:444
msgid "Transport:"
msgstr "Транспорт:"
-#: src/include/cluster/dialogs.rb:449
+#: src/include/cluster/dialogs.rb:452
msgid "Channel"
msgstr "Канал"
-#: src/include/cluster/dialogs.rb:454 src/include/cluster/dialogs.rb:475
+#: src/include/cluster/dialogs.rb:457 src/include/cluster/dialogs.rb:478
msgid "Bind Network Address:"
msgstr "Присвоить сетевой адрес:"
-#: src/include/cluster/dialogs.rb:460 src/include/cluster/dialogs.rb:478
-#: src/include/cluster/dialogs.rb:1365
+#: src/include/cluster/dialogs.rb:463 src/include/cluster/dialogs.rb:481
+#: src/include/cluster/dialogs.rb:1368
msgid "Multicast Address:"
msgstr "Адрес группового вещания:"
-#: src/include/cluster/dialogs.rb:462 src/include/cluster/dialogs.rb:479
-msgid "Multicast Port:"
-msgstr "Порт группового вещания:"
+#: src/include/cluster/dialogs.rb:465 src/include/cluster/dialogs.rb:482
+msgid "Port:"
+msgstr "Порт:"
-#: src/include/cluster/dialogs.rb:469
+#: src/include/cluster/dialogs.rb:472
msgid "Redundant Channel"
msgstr "Избыточный канал"
-#: src/include/cluster/dialogs.rb:485
+#: src/include/cluster/dialogs.rb:488
msgid "Cluster Name:"
msgstr "Имя кластера:"
-#: src/include/cluster/dialogs.rb:486
+#: src/include/cluster/dialogs.rb:489
msgid "Expected Votes:"
msgstr "Ожидаемые голоса:"
-#: src/include/cluster/dialogs.rb:490
+#: src/include/cluster/dialogs.rb:493
msgid "rrp mode:"
msgstr "Режим RRP:"
-#: src/include/cluster/dialogs.rb:495
+#: src/include/cluster/dialogs.rb:498
msgid "Auto Generate Node ID"
msgstr "Автоматически создавать ИД узла"
-#: src/include/cluster/dialogs.rb:500
+#: src/include/cluster/dialogs.rb:503
msgid "Member Address:"
msgstr "Адрес члена:"
-#: src/include/cluster/dialogs.rb:501
+#: src/include/cluster/dialogs.rb:504
msgid "IP"
msgstr "IP-адрес"
-#: src/include/cluster/dialogs.rb:501
+#: src/include/cluster/dialogs.rb:504
msgid "Redundant IP"
msgstr "Повторяющийся IP-адрес"
#. BNC#879596, check the corosync.conf format
-#: src/include/cluster/dialogs.rb:541
+#: src/include/cluster/dialogs.rb:544
msgid ""
" NOTICE: Detected old corosync configuration.\n"
" Please reconfigure the member list and confirm all other settings."
@@ -200,123 +200,123 @@
" Измените конфигурацию списка членов и подтвердите все остальные параметры."
#. Notice, current could be "nil" if the list is empty.
-#: src/include/cluster/dialogs.rb:717
+#: src/include/cluster/dialogs.rb:720
msgid "Enable Security Auth"
msgstr "Включить аутентификацию безопасности"
-#: src/include/cluster/dialogs.rb:721
+#: src/include/cluster/dialogs.rb:724
msgid "For a newly created cluster, push the button below to generate /etc/corosync/authkey."
msgstr "Нажмите кнопку ниже для созданного кластера, чтобы сформировать /etc/corosync/authkey."
-#: src/include/cluster/dialogs.rb:726
+#: src/include/cluster/dialogs.rb:729
msgid "To join an existing cluster, please copy /etc/corosync/authkey from other nodes manually."
msgstr "Для подключения к существующему кластеру скопируйте /etc/corosync/authkey с других узлов вручную."
-#: src/include/cluster/dialogs.rb:752
+#: src/include/cluster/dialogs.rb:755
msgid "Failed to create /etc/corosync/authkey"
msgstr "Не удалось создать /etc/corosync/authkey"
-#: src/include/cluster/dialogs.rb:754
+#: src/include/cluster/dialogs.rb:757
msgid "Create /etc/corosync/authkey succeeded"
msgstr "Создание /etc/corosync/authkey выполнено"
-#: src/include/cluster/dialogs.rb:815 src/include/cluster/dialogs.rb:885
+#: src/include/cluster/dialogs.rb:818 src/include/cluster/dialogs.rb:888
msgid "Running"
msgstr "Выполняется"
-#: src/include/cluster/dialogs.rb:817
+#: src/include/cluster/dialogs.rb:820
msgid "Not running"
msgstr "Не выполняется"
#. servie:cluster is the name of /etc/sysconfig/SuSEfirewall2.d/services/cluster
-#: src/include/cluster/dialogs.rb:853
+#: src/include/cluster/dialogs.rb:856
msgid "Booting"
msgstr "Загрузка"
-#: src/include/cluster/dialogs.rb:863
+#: src/include/cluster/dialogs.rb:866
msgid "On -- Start pacemaker during boot"
msgstr "Вкл.: запускать Pacemaker во время загрузки"
-#: src/include/cluster/dialogs.rb:870
+#: src/include/cluster/dialogs.rb:873
msgid "Off -- Start pacemaker manually"
msgstr "Выкл.: запускать Pacemaker вручную"
-#: src/include/cluster/dialogs.rb:879
+#: src/include/cluster/dialogs.rb:882
msgid "Switch On and Off"
msgstr "Включить или выключить"
-#: src/include/cluster/dialogs.rb:884
+#: src/include/cluster/dialogs.rb:887
msgid "Current Status: "
msgstr "Текущее состояние: "
-#: src/include/cluster/dialogs.rb:893
+#: src/include/cluster/dialogs.rb:896
msgid "Start pacemaker Now"
msgstr "Запустить Pacemaker"
-#: src/include/cluster/dialogs.rb:894
+#: src/include/cluster/dialogs.rb:897
msgid "Stop pacemaker Now"
msgstr "Остановить Pacemaker"
#. BNC#874563,stop pacemaker could stop corosync since BNC#872651 is fixed
-#: src/include/cluster/dialogs.rb:992
+#: src/include/cluster/dialogs.rb:995
msgid "Sync Host"
msgstr "Узел синхронизации"
-#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
+#: src/include/cluster/dialogs.rb:999 src/include/cluster/dialogs.rb:1011
msgid "Add"
msgstr "Добавить"
-#: src/include/cluster/dialogs.rb:997 src/include/cluster/dialogs.rb:1009
+#: src/include/cluster/dialogs.rb:1000 src/include/cluster/dialogs.rb:1012
msgid "Del"
msgstr "Удалить"
-#: src/include/cluster/dialogs.rb:998 src/include/cluster/dialogs.rb:1010
+#: src/include/cluster/dialogs.rb:1001 src/include/cluster/dialogs.rb:1013
msgid "Edit"
msgstr "Редактировать"
-#: src/include/cluster/dialogs.rb:1004
+#: src/include/cluster/dialogs.rb:1007
msgid "Sync File"
msgstr "Файл синхронизации"
-#: src/include/cluster/dialogs.rb:1011
+#: src/include/cluster/dialogs.rb:1014
msgid "Add Suggested Files"
msgstr "Добавить предложенные файлы"
-#: src/include/cluster/dialogs.rb:1020
+#: src/include/cluster/dialogs.rb:1023
msgid "Generate Pre-Shared-Keys"
msgstr "Создать общие ключи"
#. remove duplicated elements
-#: src/include/cluster/dialogs.rb:1145
+#: src/include/cluster/dialogs.rb:1148
msgid "Csync2 Status Unknown"
msgstr "Состояние Csync2 неизвестно"
-#: src/include/cluster/dialogs.rb:1148
+#: src/include/cluster/dialogs.rb:1151
msgid "Turn csync2 ON"
msgstr "Включить csync2"
-#: src/include/cluster/dialogs.rb:1151
+#: src/include/cluster/dialogs.rb:1154
msgid "Turn csync2 OFF"
msgstr "Выключить csync2"
-#: src/include/cluster/dialogs.rb:1181
+#: src/include/cluster/dialogs.rb:1184
msgid "Enter a hostname"
msgstr "Введите имя хоста"
-#: src/include/cluster/dialogs.rb:1195
+#: src/include/cluster/dialogs.rb:1198
msgid "Edit the hostname"
msgstr "Изменить имя хоста"
-#: src/include/cluster/dialogs.rb:1209
+#: src/include/cluster/dialogs.rb:1212
msgid "Enter a filename to synchronize"
msgstr "Введите имя файла для синхронизации"
-#: src/include/cluster/dialogs.rb:1224
+#: src/include/cluster/dialogs.rb:1227
msgid "Edit the filename"
msgstr "Изменить имя файла"
#. key file exist
-#: src/include/cluster/dialogs.rb:1256
+#: src/include/cluster/dialogs.rb:1259
msgid ""
"Key file %1 already exist.\n"
"Do you want to overwrite it?"
@@ -325,12 +325,12 @@
"Вы желаете записать поверх него?"
#. remove exist key file
-#: src/include/cluster/dialogs.rb:1266
+#: src/include/cluster/dialogs.rb:1269
msgid "Delete key file %1 failed."
msgstr "Не удалось удалить файл ключа %1."
#. generate key file
-#: src/include/cluster/dialogs.rb:1280
+#: src/include/cluster/dialogs.rb:1283
msgid ""
"Key file %1 is generated.\n"
"Clicking \"Add Suggested Files\" button adds it to sync list."
@@ -338,12 +338,12 @@
"Файл ключа %1 создан.\n"
"Нажатие кнопки «Добавить предложенные файлы» добавит его в список синхронизации."
-#: src/include/cluster/dialogs.rb:1287
+#: src/include/cluster/dialogs.rb:1290
msgid "Key generation failed."
msgstr "Не удалось создать ключ."
#. SaveCsync2();
-#: src/include/cluster/dialogs.rb:1349
+#: src/include/cluster/dialogs.rb:1352
msgid ""
"Conntrackd is a daemon which helps to duplicate firewall status between cluster nodes.\n"
"YaST can help to configure some basic aspects of conntrackd.\n"
@@ -353,23 +353,23 @@
"YaST помогает настроить основные аспекты conntrackd.\n"
"Для запуска используйте ocf:heartbeat:conntrackd."
-#: src/include/cluster/dialogs.rb:1360
+#: src/include/cluster/dialogs.rb:1363
msgid "Dedicated Interface:"
msgstr "Специализированный интерфейс:"
-#: src/include/cluster/dialogs.rb:1363
+#: src/include/cluster/dialogs.rb:1366
msgid "IP:"
msgstr "IP-адрес:"
-#: src/include/cluster/dialogs.rb:1366
+#: src/include/cluster/dialogs.rb:1369
msgid "Group Number:"
msgstr "Номер группы:"
-#: src/include/cluster/dialogs.rb:1370
+#: src/include/cluster/dialogs.rb:1373
msgid "Generate /etc/conntrackd/conntrackd.conf"
msgstr "Создать /etc/conntrackd/conntrackd.conf"
-#: src/include/cluster/dialogs.rb:1437
+#: src/include/cluster/dialogs.rb:1440
msgid "The Group Number must be a positive integer"
msgstr "Номер группы должен быть положительным целым числом"
@@ -587,3 +587,6 @@
#: src/modules/Cluster.rb:536
msgid "Cannot write settings."
msgstr "Не удается записать параметры."
+
+#~ msgid "Multicast Port:"
+#~ msgstr "Порт группового вещания:"
Modified: branches/SLE12-SP3/yast/ru/po/control.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/control.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/control.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: control\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-20 17:12+0200\n"
+"POT-Creation-Date: 2017-05-16 19:52+0200\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -58,10 +58,16 @@
#. TRANSLATORS: dialog help
#: control/control.SLES.glade.translations.glade:21
+#, fuzzy
+#| msgid ""
+#| "<p>The system roles adjustments are in the range from package selection up \n"
+#| "to disk partitioning. By choosing a system role, the system is \n"
+#| "configured accordingly to match the use case of the role. The settings \n"
+#| "defined by a role can be overridden in the next steps if necessary.</p>"
msgid ""
-"<p>The system roles adjustments are in the range from package selection up \n"
-"to disk partitioning. By choosing a system role, the system is \n"
-"configured accordingly to match the use case of the role. The settings \n"
+"<p>The system roles adjustments are in the range from package selection up\n"
+"to disk partitioning. By choosing a system role, the system is\n"
+"configured accordingly to match the use case of the role. The settings\n"
"defined by a role can be overridden in the next steps if necessary.</p>"
msgstr ""
"<p>Параметры системных ролей могут включать как выбор пакета, так и \n"
@@ -111,10 +117,8 @@
#: control/control.SLES.glade.translations.glade:37
#: control/control.SLES.glade.translations.glade:38
#: control/control.SLES.glade.translations.glade:39
+#: control/control.SLES.glade.translations.glade:43
#: control/control.SLES.glade.translations.glade:44
-#: control/control.SLES.glade.translations.glade:45
-#: control/control.SLES.glade.translations.glade:82
-#: control/control.SLES.glade.translations.glade:83
msgid "Installation Settings"
msgstr "Настройки установки"
@@ -127,183 +131,167 @@
msgstr "Эксперт"
#: control/control.SLES.glade.translations.glade:42
-msgid "Live Installation Settings"
-msgstr "Параметры установки с LiveCD"
-
-#: control/control.SLES.glade.translations.glade:43
msgid "Update Settings"
msgstr "Обновить настройки"
+#: control/control.SLES.glade.translations.glade:45
#: control/control.SLES.glade.translations.glade:46
-#: control/control.SLES.glade.translations.glade:47
msgid "Network Configuration"
msgstr "Настройка сети"
-#: control/control.SLES.glade.translations.glade:48
+#: control/control.SLES.glade.translations.glade:47
msgid "Network Services Configuration"
msgstr "Настройка сетевых сервисов"
+#: control/control.SLES.glade.translations.glade:48
#: control/control.SLES.glade.translations.glade:49
#: control/control.SLES.glade.translations.glade:50
-#: control/control.SLES.glade.translations.glade:51
msgid "Hardware Configuration"
msgstr "Настройка Оборудования"
-#: control/control.SLES.glade.translations.glade:52
-#: control/control.SLES.glade.translations.glade:89
-#: control/control.SLES.glade.translations.glade:119
+#: control/control.SLES.glade.translations.glade:51
+#: control/control.SLES.glade.translations.glade:74
+#: control/control.SLES.glade.translations.glade:104
msgid "Preparation"
msgstr "Подготовка"
-#: control/control.SLES.glade.translations.glade:53
-#: control/control.SLES.glade.translations.glade:76
-#: control/control.SLES.glade.translations.glade:90
+#: control/control.SLES.glade.translations.glade:52
+#: control/control.SLES.glade.translations.glade:75
msgid "Load Linuxrc Network Configuration"
msgstr "Загрузить сетевую конфигурацию Linuxrc"
-#: control/control.SLES.glade.translations.glade:54
-#: control/control.SLES.glade.translations.glade:77
-#: control/control.SLES.glade.translations.glade:91
+#: control/control.SLES.glade.translations.glade:53
+#: control/control.SLES.glade.translations.glade:76
msgid "Network Autosetup"
msgstr "Автоматическая настройка сети"
-#: control/control.SLES.glade.translations.glade:55
-#: control/control.SLES.glade.translations.glade:92
-#: control/control.SLES.glade.translations.glade:108
-#: control/control.SLES.glade.translations.glade:120
+#: control/control.SLES.glade.translations.glade:54
+#: control/control.SLES.glade.translations.glade:77
+#: control/control.SLES.glade.translations.glade:93
+#: control/control.SLES.glade.translations.glade:105
msgid "Installer Update"
msgstr "Обновление установщика"
-#: control/control.SLES.glade.translations.glade:56
+#: control/control.SLES.glade.translations.glade:55
#: control/control.SLES.glade.translations.glade:78
-#: control/control.SLES.glade.translations.glade:93
msgid "Welcome"
msgstr "Добро пожаловать"
-#: control/control.SLES.glade.translations.glade:57
+#: control/control.SLES.glade.translations.glade:56
#: control/control.SLES.glade.translations.glade:79
-#: control/control.SLES.glade.translations.glade:94
msgid "Network Activation"
msgstr "Активация сети"
-#: control/control.SLES.glade.translations.glade:58
-#: control/control.SLES.glade.translations.glade:95
+#: control/control.SLES.glade.translations.glade:57
+#: control/control.SLES.glade.translations.glade:80
msgid "Disk Activation"
msgstr "Активация диска"
+#: control/control.SLES.glade.translations.glade:58
#: control/control.SLES.glade.translations.glade:59
-#: control/control.SLES.glade.translations.glade:60
-#: control/control.SLES.glade.translations.glade:96
-#: control/control.SLES.glade.translations.glade:121
+#: control/control.SLES.glade.translations.glade:81
+#: control/control.SLES.glade.translations.glade:106
msgid "System Analysis"
msgstr "Анализ системы"
-#: control/control.SLES.glade.translations.glade:61
-#: control/control.SLES.glade.translations.glade:98
+#: control/control.SLES.glade.translations.glade:60
+#: control/control.SLES.glade.translations.glade:83
msgid "Add-On Products"
msgstr "Дополнительные продукты"
-#: control/control.SLES.glade.translations.glade:62
-#: control/control.SLES.glade.translations.glade:80
+#: control/control.SLES.glade.translations.glade:61
msgid "Disk"
msgstr "Диск"
-#: control/control.SLES.glade.translations.glade:63
-#: control/control.SLES.glade.translations.glade:81
+#: control/control.SLES.glade.translations.glade:62
msgid "Time Zone"
msgstr "Часовой пояс"
-#: control/control.SLES.glade.translations.glade:64
-#: control/control.SLES.glade.translations.glade:75
+#: control/control.SLES.glade.translations.glade:63
msgid "Installation"
msgstr "Установка"
-#: control/control.SLES.glade.translations.glade:65
+#: control/control.SLES.glade.translations.glade:64
msgid "Installation Summary"
msgstr "Сводка по установке"
+#: control/control.SLES.glade.translations.glade:65
#: control/control.SLES.glade.translations.glade:66
-#: control/control.SLES.glade.translations.glade:67
+#: control/control.SLES.glade.translations.glade:68
#: control/control.SLES.glade.translations.glade:69
#: control/control.SLES.glade.translations.glade:70
#: control/control.SLES.glade.translations.glade:71
#: control/control.SLES.glade.translations.glade:72
#: control/control.SLES.glade.translations.glade:73
-#: control/control.SLES.glade.translations.glade:74
-#: control/control.SLES.glade.translations.glade:84
-#: control/control.SLES.glade.translations.glade:85
-#: control/control.SLES.glade.translations.glade:86
-#: control/control.SLES.glade.translations.glade:87
-#: control/control.SLES.glade.translations.glade:88
-#: control/control.SLES.glade.translations.glade:112
-#: control/control.SLES.glade.translations.glade:113
-#: control/control.SLES.glade.translations.glade:115
-#: control/control.SLES.glade.translations.glade:116
-#: control/control.SLES.glade.translations.glade:117
-#: control/control.SLES.glade.translations.glade:118
-#: control/control.SLES.glade.translations.glade:135
-#: control/control.SLES.glade.translations.glade:136
+#: control/control.SLES.glade.translations.glade:97
+#: control/control.SLES.glade.translations.glade:98
+#: control/control.SLES.glade.translations.glade:100
+#: control/control.SLES.glade.translations.glade:101
+#: control/control.SLES.glade.translations.glade:102
+#: control/control.SLES.glade.translations.glade:103
+#: control/control.SLES.glade.translations.glade:120
+#: control/control.SLES.glade.translations.glade:121
msgid "Perform Installation"
msgstr "Выполнить установку"
-#: control/control.SLES.glade.translations.glade:68
-#: control/control.SLES.glade.translations.glade:103
-#: control/control.SLES.glade.translations.glade:114
-#: control/control.SLES.glade.translations.glade:130
+#: control/control.SLES.glade.translations.glade:67
+#: control/control.SLES.glade.translations.glade:88
+#: control/control.SLES.glade.translations.glade:99
+#: control/control.SLES.glade.translations.glade:115
msgid "Installer Cleanup"
msgstr "Очистка установщика"
-#: control/control.SLES.glade.translations.glade:97
-#: control/control.SLES.glade.translations.glade:122
+#: control/control.SLES.glade.translations.glade:82
+#: control/control.SLES.glade.translations.glade:107
msgid "System for Update"
msgstr "Система для обновления"
-#: control/control.SLES.glade.translations.glade:99
-#: control/control.SLES.glade.translations.glade:125
+#: control/control.SLES.glade.translations.glade:84
+#: control/control.SLES.glade.translations.glade:110
msgid "Update"
msgstr "Обновить"
-#: control/control.SLES.glade.translations.glade:100
+#: control/control.SLES.glade.translations.glade:85
msgid "Update Summary"
msgstr "Резюме обновления"
-#: control/control.SLES.glade.translations.glade:101
-#: control/control.SLES.glade.translations.glade:102
-#: control/control.SLES.glade.translations.glade:104
-#: control/control.SLES.glade.translations.glade:105
-#: control/control.SLES.glade.translations.glade:106
-#: control/control.SLES.glade.translations.glade:127
-#: control/control.SLES.glade.translations.glade:128
-#: control/control.SLES.glade.translations.glade:129
-#: control/control.SLES.glade.translations.glade:131
-#: control/control.SLES.glade.translations.glade:132
-#: control/control.SLES.glade.translations.glade:133
-#: control/control.SLES.glade.translations.glade:134
-#: control/control.SLES.glade.translations.glade:139
-#: control/control.SLES.glade.translations.glade:140
+#: control/control.SLES.glade.translations.glade:86
+#: control/control.SLES.glade.translations.glade:87
+#: control/control.SLES.glade.translations.glade:89
+#: control/control.SLES.glade.translations.glade:90
+#: control/control.SLES.glade.translations.glade:91
+#: control/control.SLES.glade.translations.glade:112
+#: control/control.SLES.glade.translations.glade:113
+#: control/control.SLES.glade.translations.glade:114
+#: control/control.SLES.glade.translations.glade:116
+#: control/control.SLES.glade.translations.glade:117
+#: control/control.SLES.glade.translations.glade:118
+#: control/control.SLES.glade.translations.glade:119
+#: control/control.SLES.glade.translations.glade:124
+#: control/control.SLES.glade.translations.glade:125
msgid "Perform Update"
msgstr "Выполнить обновление"
-#: control/control.SLES.glade.translations.glade:107
+#: control/control.SLES.glade.translations.glade:92
msgid "Base Installation"
msgstr "Базовая установка"
+#: control/control.SLES.glade.translations.glade:94
+#: control/control.SLES.glade.translations.glade:95
+#: control/control.SLES.glade.translations.glade:96
+#: control/control.SLES.glade.translations.glade:108
#: control/control.SLES.glade.translations.glade:109
-#: control/control.SLES.glade.translations.glade:110
#: control/control.SLES.glade.translations.glade:111
-#: control/control.SLES.glade.translations.glade:123
-#: control/control.SLES.glade.translations.glade:124
-#: control/control.SLES.glade.translations.glade:126
msgid "AutoYaST Settings"
msgstr "Настройки AutoYaST"
-#: control/control.SLES.glade.translations.glade:137
-#: control/control.SLES.glade.translations.glade:141
+#: control/control.SLES.glade.translations.glade:122
+#: control/control.SLES.glade.translations.glade:126
msgid "Configuration"
msgstr "Настройка"
-#: control/control.SLES.glade.translations.glade:138
-#: control/control.SLES.glade.translations.glade:142
+#: control/control.SLES.glade.translations.glade:123
+#: control/control.SLES.glade.translations.glade:127
msgid "System Configuration"
msgstr "Настройка системы"
@@ -331,18 +319,17 @@
"</p>\n"
" "
-#: control/control.SLED.glade.translations.glade:26
-#: control/control.SLED.glade.translations.glade:52
-#: control/control.SLED.glade.translations.glade:66
+#: control/control.SLED.glade.translations.glade:25
+#: control/control.SLED.glade.translations.glade:51
msgid "Load linuxrc Network Configuration"
msgstr "Загрузить конфигурацию сети linuxrc"
+#: control/control.SLED.glade.translations.glade:36
#: control/control.SLED.glade.translations.glade:37
-#: control/control.SLED.glade.translations.glade:38
msgid "User Settings"
msgstr "Параметры пользователя"
-#: control/control.SLED.glade.translations.glade:39
+#: control/control.SLED.glade.translations.glade:38
msgid "Installation Overview"
msgstr "Обзор установки"
@@ -406,7 +393,9 @@
msgid "KDE Plasma Desktop"
msgstr "Рабочий стол KDE Plasma"
+#. TRANSLATORS: a label for a system role
#: control/control.openSUSE.glade.translations.glade:23
+#: control/control.openSUSE.glade.translations.glade:49
msgid "Server (Text Mode)"
msgstr "Сервер (текстовый режим)"
@@ -426,11 +415,113 @@
msgid "Enlightenment Desktop"
msgstr "Рабочий стол Enlightenment"
+#. TRANSLATORS: dialog caption
+#: control/control.openSUSE.glade.translations.glade:29
+#: control/control.openSUSE.glade.translations.glade:72
+#, fuzzy
+#| msgid "Computer Names"
+msgid "Computer Role"
+msgstr "Имена компьютеров"
+
+#. TRANSLATORS: label in a dialog
+#: control/control.openSUSE.glade.translations.glade:31
+#, fuzzy
+#| msgid ""
+#| "System Roles are predefined use cases which tailor the system\n"
+#| "for the selected scenario."
+msgid ""
+"Computer Role is a predefined use case which tailor the system\n"
+"for the selected scenario."
+msgstr ""
+"Системные роли соответствуют стандартным схемам использования системы\n"
+"для выбранных сценариев."
+
+#. TRANSLATORS: dialog help
+#: control/control.openSUSE.glade.translations.glade:34
+#, fuzzy
+#| msgid ""
+#| "<p>The system roles adjustments are in the range from package selection up \n"
+#| "to disk partitioning. By choosing a system role, the system is \n"
+#| "configured accordingly to match the use case of the role. The settings \n"
+#| "defined by a role can be overridden in the next steps if necessary.</p>"
+msgid ""
+"<p>The computer role adjustments are in the range from package selection up\n"
+"to running additional services. By choosing a computer role, the system is\n"
+"configured accordingly to match the use case of the role. For the <em>Custom</em> role\n"
+"an additional dialog is displayed which allows manual software pattern selection. </p>"
+msgstr ""
+"<p>Параметры системных ролей могут включать как выбор пакета, так и \n"
+"разбиение диска. При выборе системной роли система \n"
+"настраивается в соответствии со схемой ее использования. Параметры, \n"
+"определенные ролью, можно при необходимости переопределить на следующих этапах.</p>"
+
+#. TRANSLATORS: a label for a system role
+#: control/control.openSUSE.glade.translations.glade:39
+msgid "Workstation with KDE Plasma"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:40
+#, fuzzy
+#| msgid ""
+#| "KDE is a powerful and intuitive desktop\n"
+#| "environment that uses Kontact as mailer,\n"
+#| "Dolphin as file manager, and offers\n"
+#| "both Firefox and Konqueror as Web browsers.\n"
+msgid ""
+"KDE is a powerful and intuitive desktop environment that uses Kontact as mailer,\n"
+"Dolphin as file manager, and offers both Firefox and Konqueror as Web browsers.\n"
+" "
+msgstr ""
+"KDE — это мощная и интуитивно понятная среда\n"
+"рабочего стола, которая использует почтовый\n"
+"клиент Kontact, файловый менеджер Dolphin,\n"
+"а также предлагает веб-браузеры Firefox и Konqueror.\n"
+
+#. TRANSLATORS: a label for a system role
+#: control/control.openSUSE.glade.translations.glade:44
+msgid "Workstation with GNOME"
+msgstr ""
+
#: control/control.openSUSE.glade.translations.glade:45
-#: control/control.openSUSE.glade.translations.glade:71
+#, fuzzy
+#| msgid ""
+#| "GNOME is a powerful and intuitive desktop\n"
+#| "environment that uses Evolution as mailer,\n"
+#| "Firefox as browser, and Nautilus as file manager.\n"
+msgid ""
+"GNOME is a powerful and intuitive desktop environment that uses Evolution as mailer,\n"
+"Firefox as browser, and Nautilus as file manager.\n"
+" "
+msgstr ""
+"GNOME — это мощная и интуитивно понятная среда\n"
+"рабочего стола, в которой используется почтовый клиент Evolution,\n"
+"браузер Firefox и файловый менеджер Nautilus.\n"
+
+#: control/control.openSUSE.glade.translations.glade:50
+msgid "Server is usefull when computer should not have interaction with user and have only command line."
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/control.openSUSE.glade.translations.glade:52
+msgid "Custom"
+msgstr "Пользовательский"
+
+#: control/control.openSUSE.glade.translations.glade:53
+msgid "Custom role runs additional dialog where user can select software that fits his requirements."
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:74
+#, fuzzy
+#| msgid "Server Pattern Selection"
+msgid "Custom Pattern Selection"
+msgstr "Выбор шаблона cканер"
+
+#: control/control.openSUSE.glade.translations.glade:98
msgid "Online Repositories"
msgstr "Сетевые хранилища"
-#: control/control.openSUSE.glade.translations.glade:47
-msgid "Desktop Selection"
-msgstr "Выбор рабочего стола"
+#~ msgid "Live Installation Settings"
+#~ msgstr "Параметры установки с LiveCD"
+
+#~ msgid "Desktop Selection"
+#~ msgstr "Выбор рабочего стола"
Modified: branches/SLE12-SP3/yast/ru/po/country.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/country.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/country.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: country\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-25 02:28+0000\n"
+"POT-Creation-Date: 2017-05-17 19:06+0200\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -41,7 +41,7 @@
#. summary label
#. summary label
-#: keyboard/src/clients/keyboard.rb:160 keyboard/src/modules/Keyboard.rb:1388
+#: keyboard/src/clients/keyboard.rb:160 keyboard/src/modules/Keyboard.rb:1402
msgid "Current Keyboard Layout: %1"
msgstr "Текущая раскладка клавиатуры: %1"
@@ -57,11 +57,9 @@
#. menue label text
#. title for selection box 'keyboard layout'
-#. widget label
#. menu button label
#: keyboard/src/clients/keyboard_proposal.rb:93
#: keyboard/src/include/keyboard/dialogs.rb:187
-#: keyboard/src/lib/y2country/widgets.rb:40
#: language/src/clients/country_simple_proposal.rb:78
msgid "&Keyboard Layout"
msgstr "&Раскладка клавиатуры"
@@ -204,25 +202,12 @@
msgid "System Keyboard Configuration"
msgstr "Настройка клавиатуры"
-#. help text for keyboard selection widget
-#: keyboard/src/lib/y2country/widgets.rb:80
-msgid ""
-"<p>\n"
-"Choose the <b>Keyboard layout</b> to be used during\n"
-"installation and on the installed system.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Выберите <b>раскладку клавиатуры</b>, используемую\n"
-"во время установки и позже в установленной системе.\n"
-"</p>\n"
-
#. label text: user can choose the keyboard from the updated system
#. or continue with the one defined by his language.
#. 2 radio-buttons follow this label.
#. Such keyboard layout is used only for the time of the update,
#. it is not saved to the system.
-#: keyboard/src/modules/Keyboard.rb:1299
+#: keyboard/src/modules/Keyboard.rb:1313
msgid ""
"You are currently using a keyboard layout\n"
"different from the one in the system to update.\n"
@@ -234,7 +219,7 @@
#. Executes the command to set the keyboard in X11, reporting
#. any error to the user
-#: keyboard/src/modules/Keyboard.rb:1498
+#: keyboard/src/modules/Keyboard.rb:1513
msgid "Failed to set X11 keyboard to '%s'"
msgstr "Не удалось выбрать для клавиатуры X11 режим \"%s\""
@@ -342,8 +327,8 @@
#. summary label
#. summary label
-#: language/src/clients/language.rb:266 language/src/modules/Language.rb:851
-#: language/src/modules/Language.rb:885
+#: language/src/clients/language.rb:266 language/src/modules/Language.rb:850
+#: language/src/modules/Language.rb:884
msgid "Additional Languages: %1"
msgstr "Дополнительные языки: %1"
@@ -603,7 +588,7 @@
#. TRANSLATORS: Error message. Strings marked %{...} will be replaced
#. with variable content - do not translate them, please.
-#: language/src/modules/Language.rb:407
+#: language/src/modules/Language.rb:406
msgid ""
"Language '%{language}' was not found within the list of supported languages\n"
"available at %{directory}.\n"
@@ -617,19 +602,19 @@
#. summary label
#. summary label
-#: language/src/modules/Language.rb:795 language/src/modules/Language.rb:867
+#: language/src/modules/Language.rb:794 language/src/modules/Language.rb:866
msgid "Primary Language: %1"
msgstr "Основной язык: %1"
#. work-around for following in order not to depend on yast2-packager
#. PackageSlideShow::InitPkgData (false);
#. "value" : PackageSlideShow::total_size_to_install / 1024 , // kilobytes
-#: language/src/modules/Language.rb:1040
+#: language/src/modules/Language.rb:1039
msgid "Installing Packages..."
msgstr "Установка пакетов..."
#. continue/cancel message
-#: language/src/modules/Language.rb:1131
+#: language/src/modules/Language.rb:1130
msgid ""
"Translation of the primary language is not complete.\n"
"Some texts may be displayed in English.\n"
@@ -638,18 +623,18 @@
"Некоторый текст будет показан на Английском.\n"
#. popup message
-#: language/src/modules/Language.rb:1345
+#: language/src/modules/Language.rb:1344
msgid ""
"Only minimal support for the selected language is included on this media.\n"
-"Enable online repositories later in order to get the appropriate support\n"
+"Add the Language add-on CD as an additional repository in order to get the appropriate support\n"
"for this language.\n"
msgstr ""
-"Данный носитель содержит только минимальную поддержку выбранного языка.\n"
-"Для обеспечения лучшей поддержки этого языка включите потом сетевые\n"
-"репозитории.\n"
+"Данный носитель содержит минимальную поддержку выбранного языка.\n"
+"Для обеспечения лучшей языковой поддержки добавьте в качестве дополнительного репозитария\n"
+"компакт-диск с дополнительными языковыми продуктами.\n"
#. popup message (user selected CJK language in text mode)
-#: language/src/modules/Language.rb:1374
+#: language/src/modules/Language.rb:1373
msgid ""
"The selected language cannot be used in text mode. English is used for\n"
"installation, but the selected language will be used for the new system."
@@ -701,8 +686,8 @@
#. label text (Clock setting)
#. AutoYaST interface function: Return the summary of Timezone configuration as a map.
#. @return summary string (html)
-#: timezone/src/clients/timezone.rb:184 timezone/src/modules/Timezone.rb:749
-#: timezone/src/modules/Timezone.rb:985
+#: timezone/src/clients/timezone.rb:184 timezone/src/modules/Timezone.rb:733
+#: timezone/src/modules/Timezone.rb:969
msgid "UTC"
msgstr "UTC"
@@ -959,315 +944,287 @@
#. label text, Clock setting: local time (not UTC)
#. label text, Clock setting: local time (not UTC)
-#: timezone/src/modules/Timezone.rb:753 timezone/src/modules/Timezone.rb:989
+#: timezone/src/modules/Timezone.rb:737 timezone/src/modules/Timezone.rb:973
msgid "Local Time"
msgstr "Локальное время"
#. label text
#. label text
-#: timezone/src/modules/Timezone.rb:757 timezone/src/modules/Timezone.rb:993
+#: timezone/src/modules/Timezone.rb:741 timezone/src/modules/Timezone.rb:977
msgid "Hardware Clock Set To"
msgstr "Установить системные часы"
#. summary label
-#: timezone/src/modules/Timezone.rb:771
+#: timezone/src/modules/Timezone.rb:755
msgid "NTP configured"
msgstr "NTP настроен"
#. summary label
-#: timezone/src/modules/Timezone.rb:997
+#: timezone/src/modules/Timezone.rb:981
msgid "Current Time Zone: %1"
msgstr "Текущий часовой пояс: %1"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:46
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:46
+#: keyboard/src/data/keyboard_raw.ycp:35
msgid "English (US)"
msgstr "Английский (США)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:58
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:58
+#: keyboard/src/data/keyboard_raw.ycp:47
msgid "English (UK)"
msgstr "Английский (Великобритания)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:70
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:70
+#: keyboard/src/data/keyboard_raw.ycp:59
msgid "German"
msgstr "Немецкий"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:82
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:82
+#: keyboard/src/data/keyboard_raw.ycp:71
msgid "German (with deadkeys)"
msgstr "Немецкий (с \"мертвыми\" кнопками)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:94
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:94
+#: keyboard/src/data/keyboard_raw.ycp:83
msgid "German (Switzerland)"
msgstr "Немецкий (Швейцария)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:106
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:106
+#: keyboard/src/data/keyboard_raw.ycp:95
msgid "French"
msgstr "Французский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:118
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:118
+#: keyboard/src/data/keyboard_raw.ycp:107
msgid "French (Switzerland)"
msgstr "Французский (Швейцария)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:130
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:130
+#: keyboard/src/data/keyboard_raw.ycp:119
msgid "French (Canada)"
msgstr "Французский (Канада)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:143
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:143
+#: keyboard/src/data/keyboard_raw.ycp:132
msgid "Canadian (Multilingual)"
msgstr "Канадский (Многоязычный)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:157
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:156
+#: keyboard/src/data/keyboard_raw.ycp:145
msgid "Spanish"
msgstr "Испанский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:169
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:168
+#: keyboard/src/data/keyboard_raw.ycp:157
msgid "Spanish (Latin America)"
msgstr "Испанский (Латинская Америка)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:181
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:180
+#: keyboard/src/data/keyboard_raw.ycp:169
msgid "Spanish (CP 850)"
msgstr "Испанский (CP 850)"
#. keyboard layout
+#: keyboard/src/data/keyboard_raw.ycp:181
+msgid "Spanish (Asturian variant)"
+msgstr "Испанский (астурийский диалект)"
+
+#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:193
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:204
msgid "Italian"
msgstr "Итальянский"
#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:205
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:216
msgid "Portuguese"
msgstr "Португальский"
#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:217
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:228
msgid "Portuguese (Brazil)"
msgstr "Португальский (Бразилия)"
#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:229
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:240
msgid "Portuguese (Brazil -- US accents)"
msgstr "Португальский (Бразилия- США акцент)"
#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:241
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:252
msgid "Greek"
msgstr "Греческий"
#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:253
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:264
msgid "Dutch"
msgstr "Голландский"
#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:265
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:276
msgid "Danish"
msgstr "Датский"
#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:277
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:288
msgid "Norwegian"
msgstr "Норвежский"
#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:289
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:300
msgid "Swedish"
msgstr "Шведский"
#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:301
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:312
msgid "Finnish"
msgstr "Финский"
#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:313
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:324
msgid "Czech"
msgstr "Чешский"
#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:328
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:336
msgid "Czech (qwerty)"
msgstr "Чешский (qwerty)"
#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:343
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:348
msgid "Slovak"
msgstr "Словацкий"
#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:358
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:360
msgid "Slovak (qwerty)"
msgstr "Словакский (qwerty)"
#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:373
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:372
msgid "Slovene"
msgstr "Словакский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:388
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:384
+#: keyboard/src/data/keyboard_raw.ycp:387
msgid "Hungarian"
msgstr "Венгерский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:403
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:396
+#: keyboard/src/data/keyboard_raw.ycp:401
msgid "Polish"
msgstr "Польский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:418
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:408
+#: keyboard/src/data/keyboard_raw.ycp:415
msgid "Russian"
msgstr "Русский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:432
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:420
+#: keyboard/src/data/keyboard_raw.ycp:429
msgid "Serbian"
msgstr "Сербский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:444
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:432
+#: keyboard/src/data/keyboard_raw.ycp:441
msgid "Estonian"
msgstr "Эстонский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:456
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:444
+#: keyboard/src/data/keyboard_raw.ycp:453
msgid "Lithuanian"
msgstr "Литовский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:468
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:456
+#: keyboard/src/data/keyboard_raw.ycp:465
msgid "Turkish"
msgstr "Турецкий"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:479
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:467
+#: keyboard/src/data/keyboard_raw.ycp:476
msgid "Croatian"
msgstr "Хорватский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:502
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:479
+#: keyboard/src/data/keyboard_raw.ycp:498
msgid "Japanese"
msgstr "Японский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:514
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:491
+#: keyboard/src/data/keyboard_raw.ycp:510
msgid "Belgian"
msgstr "Бельгия"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:526
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:503
+#: keyboard/src/data/keyboard_raw.ycp:522
msgid "Dvorak"
msgstr "Dvorak"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:538
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:515
+#: keyboard/src/data/keyboard_raw.ycp:534
msgid "Icelandic"
msgstr "Исландский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:550
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:527
+#: keyboard/src/data/keyboard_raw.ycp:546
msgid "Ukrainian"
msgstr "Украинский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:572
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:539
+#: keyboard/src/data/keyboard_raw.ycp:568
msgid "Khmer"
msgstr "Хмерский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:594
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:551
+#: keyboard/src/data/keyboard_raw.ycp:590
msgid "Korean"
msgstr "Корейский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:616
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:563
+#: keyboard/src/data/keyboard_raw.ycp:612
msgid "Arabic"
msgstr "Арабский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:637
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:574
+#: keyboard/src/data/keyboard_raw.ycp:633
msgid "Tajik"
msgstr "Таджикский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:651
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:586
+#: keyboard/src/data/keyboard_raw.ycp:647
msgid "Traditional Chinese"
msgstr "Китайский (традиционный)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:673
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:598
+#: keyboard/src/data/keyboard_raw.ycp:669
msgid "Simplified Chinese"
msgstr "Китайский (упрощенный)"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:695
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:610
+#: keyboard/src/data/keyboard_raw.ycp:691
msgid "Romanian"
msgstr "Румынский"
#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:716
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:621
+#: keyboard/src/data/keyboard_raw.ycp:712
msgid "US International"
msgstr "US международная"
-#. keyboard layout
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:192
-msgid "Spanish (Asturian variant)"
-msgstr "Испанский (астурийский диалект)"
+#~ msgid ""
+#~ "<p>\n"
+#~ "Choose the <b>Keyboard layout</b> to be used during\n"
+#~ "installation and on the installed system.\n"
+#~ "</p>\n"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "Выберите <b>раскладку клавиатуры</b>, используемую\n"
+#~ "во время установки и позже в установленной системе.\n"
+#~ "</p>\n"
+
+#~ msgid ""
+#~ "Only minimal support for the selected language is included on this media.\n"
+#~ "Enable online repositories later in order to get the appropriate support\n"
+#~ "for this language.\n"
+#~ msgstr ""
+#~ "Данный носитель содержит только минимальную поддержку выбранного языка.\n"
+#~ "Для обеспечения лучшей поддержки этого языка включите потом сетевые\n"
+#~ "репозитории.\n"
Modified: branches/SLE12-SP3/yast/ru/po/firewall.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/firewall.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/firewall.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: firewall\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:27+0200\n"
+"POT-Creation-Date: 2017-04-11 02:28+0000\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -669,7 +669,7 @@
#. TRANSLATORS: combo box
#. TRANSLATORS: select box
#: src/include/firewall/subdialogs.rb:280
-#: src/include/firewall/uifunctions.rb:865
+#: src/include/firewall/uifunctions.rb:886
msgid "&Service to Allow"
msgstr "Ра&зрешенные сервисы"
@@ -818,7 +818,7 @@
#. TRANSLATORS: select box
#: src/include/firewall/subdialogs.rb:573
#: src/include/firewall/subdialogs.rb:1092
-#: src/include/firewall/uifunctions.rb:1980
+#: src/include/firewall/uifunctions.rb:2001
msgid "&Protocol"
msgstr "&Протокол"
@@ -1197,55 +1197,78 @@
#. Function stops Firewall services and sets firewall
#. to be stopped after exiting YaST
-#: src/include/firewall/uifunctions.rb:147
+#: src/include/firewall/uifunctions.rb:148
msgid "Stopping firewall..."
msgstr "Остановка брандмауэра..."
+#. TRANSLATORS: action which failed, used later
+#: src/include/firewall/uifunctions.rb:161
+#, fuzzy
+#| msgid "Device could not be opened."
+msgid "The firewall could not be stopped."
+msgstr "Невозможно открыть устройство."
+
+#. TRANSLATORS: action which failed, used later
+#: src/include/firewall/uifunctions.rb:164
+#, fuzzy
+#| msgid "fstab could not be read."
+msgid "The firewall could not be started."
+msgstr "fstab не может быть прочтан."
+
+#. TRANSLATORS: %s is action that failed
+#: src/include/firewall/uifunctions.rb:169
+#, fuzzy
+#| msgid "Please install yast2-registration and try again."
+msgid ""
+"%s\n"
+"Please verify your system and try again."
+msgstr "Установите пакет yast2-registration и попробуйте еще раз."
+
#. TRANSLATORS: table item, connected with firewall zone of interface
-#: src/include/firewall/uifunctions.rb:184
+#: src/include/firewall/uifunctions.rb:205
msgid "No zone assigned"
msgstr "Зона не выбрана."
#. TRANSLATORS: table item, "User defined string" instead of Device_name
-#: src/include/firewall/uifunctions.rb:224
+#: src/include/firewall/uifunctions.rb:245
msgid "Custom string"
msgstr "Пользовательские настройки"
#. interface could be unassigned
#. TRANSLATORAS: selection box item, connected with firewall zone of interface
-#: src/include/firewall/uifunctions.rb:288
+#: src/include/firewall/uifunctions.rb:309
msgid "No Zone Assigned"
msgstr "Зона не выбрана."
#. TRANSLATORS: error message, %1 stands for the port number
-#: src/include/firewall/uifunctions.rb:487
+#: src/include/firewall/uifunctions.rb:508
msgid "Port number %1 is invalid."
msgstr "Неверный номер порта %1."
#. TRANSLATORS: error message, %1 stands for the port number,
#. %2 stands for, e.g., port range, where the wrong port definition %1 was found
-#: src/include/firewall/uifunctions.rb:492
+#: src/include/firewall/uifunctions.rb:513
msgid "Port number %1 in definition %2 is invalid."
msgstr "Неверный номер порта %1 в определении %2."
#. TRANSLATORS: popup headline
-#: src/include/firewall/uifunctions.rb:500
+#: src/include/firewall/uifunctions.rb:521
msgid "Invalid Port Definition"
msgstr "Неверное определение порта"
#. TRANSLATORS: popup message, %1 stands for the maximal port number
#. that is possible to use in port-range
-#: src/include/firewall/uifunctions.rb:506
+#: src/include/firewall/uifunctions.rb:527
msgid "The port number must be in the interval from 1 to %1 (inclusive)."
msgstr "Номер порта должен быть в интервале от 1 до %1 (включительно)."
#. TRANSLATORS: popup headline
-#: src/include/firewall/uifunctions.rb:584
+#: src/include/firewall/uifunctions.rb:605
msgid "Invalid Port Range Definition"
msgstr "Неверный диапазон портов"
#. TRANSLATORS: popup message, %1 is a port-range defined by user
-#: src/include/firewall/uifunctions.rb:587
+#: src/include/firewall/uifunctions.rb:608
msgid ""
"Port range %1 is invalid.\n"
"It must be defined as the min_port_number:max_port_number and\n"
@@ -1256,12 +1279,12 @@
"max_port_number·недолжен быть больше·min_port_number."
#. TRANSLATORS: popup headline
-#: src/include/firewall/uifunctions.rb:604
+#: src/include/firewall/uifunctions.rb:625
msgid "Unknown Port Name"
msgstr "Неизвестное имя порта"
#. TRANSLATORS: popup message, %1 is a port-name
-#: src/include/firewall/uifunctions.rb:607
+#: src/include/firewall/uifunctions.rb:628
msgid ""
"Port name %1 is unknown in your current system.\n"
"It probably would not work.\n"
@@ -1272,12 +1295,12 @@
"Действительно использовать этот порт?\n"
#. TRANSLATORS: popup headline
-#: src/include/firewall/uifunctions.rb:636
+#: src/include/firewall/uifunctions.rb:657
msgid "Invalid Additional Service Definition"
msgstr "Недопустимое определение дополнительного сервиса"
#. TRANSLATORS: popup message, %1 stands for the wrong settings (might be quite long)
-#: src/include/firewall/uifunctions.rb:639
+#: src/include/firewall/uifunctions.rb:660
msgid ""
"It appears that the additional service settings\n"
"%1\n"
@@ -1296,22 +1319,22 @@
#. )
#. (!IsThisExpertConfiguration() ?
#. TRANSLATORS: informative label
-#: src/include/firewall/uifunctions.rb:1035
+#: src/include/firewall/uifunctions.rb:1056
msgid "Masquerading needs at least one external interface and one other interface."
msgstr "Трасляция требует как минимум один внешний интерфейс и один любой другой"
#. TRANSLATORS: popup message
-#: src/include/firewall/uifunctions.rb:1056
+#: src/include/firewall/uifunctions.rb:1077
msgid "This entry must be completed."
msgstr "Поле должно быть заполнено. "
#. TRANSLATORS: popup message, right port definition is two lines below this message
-#: src/include/firewall/uifunctions.rb:1080
+#: src/include/firewall/uifunctions.rb:1101
msgid "Wrong port definition."
msgstr "Неверное определение порта"
#. TRANSLATORS: popup error message
-#: src/include/firewall/uifunctions.rb:1107
+#: src/include/firewall/uifunctions.rb:1128
msgid ""
"Wrong port definition.\n"
"No port number found for this port name.\n"
@@ -1322,17 +1345,17 @@
"используйте номер вместо имени порта.\n"
#. TRANSLATORS: popup message, right definition is two lines below this message
-#: src/include/firewall/uifunctions.rb:1136
+#: src/include/firewall/uifunctions.rb:1157
msgid "Invalid IP definition."
msgstr "Неверный IP адрес."
#. TRANSLATORS: check box
-#: src/include/firewall/uifunctions.rb:1463
+#: src/include/firewall/uifunctions.rb:1484
msgid "&Log Not Accepted Broadcast Packets"
msgstr "&Протоколировать не принятые широковещ. пакеты"
#. TRANSLATORS: popup question
-#: src/include/firewall/uifunctions.rb:1524
+#: src/include/firewall/uifunctions.rb:1545
msgid ""
"Firewall automatic starting has been disabled\n"
"but firewall is currently running.\n"
@@ -1345,71 +1368,71 @@
"Остановить брандмауэр после записи новой конфигурации?\n"
#. network is mandatory
-#: src/include/firewall/uifunctions.rb:1703
-#: src/include/firewall/uifunctions.rb:1910
+#: src/include/firewall/uifunctions.rb:1724
+#: src/include/firewall/uifunctions.rb:1931
msgid "Invalid network definition '%1'"
msgstr "Неверное определение сети '%1'"
#. destination port is optional
#. source port is optional
-#: src/include/firewall/uifunctions.rb:1721
-#: src/include/firewall/uifunctions.rb:1752
+#: src/include/firewall/uifunctions.rb:1742
+#: src/include/firewall/uifunctions.rb:1773
msgid "Invalid port range '%1'"
msgstr "Неверный диапазон портов: '%1'"
-#: src/include/firewall/uifunctions.rb:1733
-#: src/include/firewall/uifunctions.rb:1764
-#: src/include/firewall/uifunctions.rb:1924
+#: src/include/firewall/uifunctions.rb:1754
+#: src/include/firewall/uifunctions.rb:1785
+#: src/include/firewall/uifunctions.rb:1945
msgid "Invalid port name or number '%1'"
msgstr "Неверное имя или номер порта '%1'"
-#: src/include/firewall/uifunctions.rb:1827
+#: src/include/firewall/uifunctions.rb:1848
msgid "All services using UDP"
msgstr "Все сервисы, использующие UDP"
-#: src/include/firewall/uifunctions.rb:1829
+#: src/include/firewall/uifunctions.rb:1850
msgid "All services using TCP"
msgstr "Все сервисы, использующие TCP"
-#: src/include/firewall/uifunctions.rb:1831
+#: src/include/firewall/uifunctions.rb:1852
msgid "Samba browsing"
msgstr "Обзор Samba"
-#: src/include/firewall/uifunctions.rb:1833
+#: src/include/firewall/uifunctions.rb:1854
msgid "SLP browsing"
msgstr "Обзор SLP"
-#: src/include/firewall/uifunctions.rb:1845
+#: src/include/firewall/uifunctions.rb:1866
msgid "All networks"
msgstr "Все сети"
-#: src/include/firewall/uifunctions.rb:1847
+#: src/include/firewall/uifunctions.rb:1868
msgid "Subnet: %1"
msgstr "Подсеть: %1"
#. hard-coded default
-#: src/include/firewall/uifunctions.rb:1952
+#: src/include/firewall/uifunctions.rb:1973
msgid "&Zone"
msgstr "&Зона"
-#: src/include/firewall/uifunctions.rb:1956
+#: src/include/firewall/uifunctions.rb:1977
msgid "&Network"
msgstr "&Сеть"
-#: src/include/firewall/uifunctions.rb:1963
+#: src/include/firewall/uifunctions.rb:1984
msgid "&Service"
msgstr "&Сервис"
-#: src/include/firewall/uifunctions.rb:1969
+#: src/include/firewall/uifunctions.rb:1990
msgid "User-defined service"
msgstr "Сервис, определенный пользователем"
-#: src/include/firewall/uifunctions.rb:1994
+#: src/include/firewall/uifunctions.rb:2015
msgid "Po&rt"
msgstr "По&рт"
#. redraw table
-#: src/include/firewall/uifunctions.rb:2089
+#: src/include/firewall/uifunctions.rb:2110
msgid "Select an item to delete."
msgstr "Выберите пункт для удаления."
Modified: branches/SLE12-SP3/yast/ru/po/firstboot.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/firstboot.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/firstboot.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: firstboot\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-21 00:29+0000\n"
+"POT-Creation-Date: 2017-05-17 17:46+0200\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -113,13 +113,13 @@
msgstr "Метка"
#: src/clients/firstboot_config.rb:68
+msgid "Module Name"
+msgstr "Имя модуля"
+
+#: src/clients/firstboot_config.rb:68
msgid "Status"
msgstr "Состояние"
-#: src/clients/firstboot_config.rb:68
-msgid "Module Name"
-msgstr "Имя модуля"
-
#. translators: dialog text
#: src/clients/firstboot_desktop.rb:90
msgid ""
Modified: branches/SLE12-SP3/yast/ru/po/installation.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/installation.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/installation.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-26 01:30+0000\n"
+"POT-Creation-Date: 2017-05-17 17:46+0200\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -14,6 +14,22 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: src/lib/services-manager/clients/services-manager_finish.rb:11
+#, fuzzy
+#| msgid "Adapting system services ..."
+msgid "Setting default target and system services ..."
+msgstr "Адаптация системных сервисов..."
+
+#. Proposal client for Network configuration
+#: src/lib/network/clients/network_proposal.rb:19
+#: src/lib/network/clients/network_proposal.rb:20
+msgid "Network Configuration"
+msgstr "Настройка сети"
+
+#: src/lib/network/clients/network_proposal.rb:25
+msgid "preformatted_proposal"
+msgstr ""
+
#. help for the dialog - busy message
#: src/include/installation/inst_inc_all.rb:52
msgid "<p>Initializing the installation...</p>"
@@ -510,7 +526,7 @@
#. download release notes now
#. push button
#: src/lib/installation/clients/inst_complex_welcome.rb:178
-#: src/lib/installation/clients/inst_download_release_notes.rb:137
+#: src/lib/installation/clients/inst_download_release_notes.rb:206
#: src/lib/installation/clients/inst_system_analysis.rb:294
msgid "Re&lease Notes..."
msgstr "При&мечания к выпуску..."
@@ -847,14 +863,14 @@
#. FIXME: use a better title (reused existing texts because of text freeze)
#. TRANSLATORS: dialog caption
#. bug #302384
-#: src/lib/installation/clients/inst_download_release_notes.rb:145
+#: src/lib/installation/clients/inst_download_release_notes.rb:214
#: src/lib/installation/clients/inst_initialization.rb:56
#: src/lib/installation/clients/inst_installation_options.rb:149
msgid "Initializing"
msgstr "Инициализация"
#. TRANSLATORS: dialog progress message
-#: src/lib/installation/clients/inst_download_release_notes.rb:145
+#: src/lib/installation/clients/inst_download_release_notes.rb:214
#: src/lib/installation/clients/inst_initialization.rb:44
msgid "Initializing the installation..."
msgstr "Инициализация установки..."
@@ -908,37 +924,37 @@
msgstr "Готово"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:457
+#: src/lib/installation/clients/inst_finish.rb:460
msgid "Copy files to installed system"
msgstr "Копирование файлов на установленную систему"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:464
+#: src/lib/installation/clients/inst_finish.rb:467
msgid "Save configuration"
msgstr "Сохранить конфигурацию"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:471
+#: src/lib/installation/clients/inst_finish.rb:474
msgid "Save installation settings"
msgstr "Сохранить параметры установки."
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:480
+#: src/lib/installation/clients/inst_finish.rb:483
msgid "Install boot manager"
msgstr "Установить загрузчик"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:487
+#: src/lib/installation/clients/inst_finish.rb:490
msgid "Prepare system for initial boot"
msgstr "Подготовить систему для начальной загрузки"
#. some steps are called in live installer only
-#: src/lib/installation/clients/inst_finish.rb:550
+#: src/lib/installation/clients/inst_finish.rb:553
msgid "Client %1 returned invalid data."
msgstr "Клиент %1 возвратил недопустимые дынные."
#. FIXME: looks like product specific finish steps are not used at all
-#: src/lib/installation/clients/inst_finish.rb:582
+#: src/lib/installation/clients/inst_finish.rb:585
msgid "Checking stage: %1..."
msgstr "Проверка этапа: %1..."
@@ -962,6 +978,19 @@
msgid "Preparing the initial system configuration..."
msgstr "Подготовка начальной конфигурации системы..."
+#. Shows a dialog allowing the user to modify the invalid URL, modifying the
+#. /etc/install.inf file with the new value. In case of cancelled or empty,
+#. the URL will be completely removed.
+#.
+#. @param regurl [String]
+#: src/lib/installation/clients/inst_install_inf.rb:52
+msgid ""
+"If you decide to cancel, the custom URL\n"
+"will be completelly ignored.\n"
+"\n"
+"Really cancel URL modification?"
+msgstr ""
+
#. dialog caption
#: src/lib/installation/clients/inst_installation_options.rb:80
msgid "Installation Options"
@@ -1082,48 +1111,6 @@
"При настройке сети произошла ошибка.\n"
"Подробности в журнале %1."
-#. TRANSLATORS: help text, part 1
-#: src/lib/installation/clients/inst_new_desktop.rb:57
-msgid ""
-"<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i> offers a number \n"
-"of different desktop environments. Below you see a list of the 2 major ones \n"
-"<b>GNOME</b> and <b>KDE</b>.</p>"
-msgstr ""
-"<p><b>Выбор</b> — это главный приоритет в Linux. <i>openSUSE</i> предлагает несколько\n"
-"рабочих окружений. Ниже вы видите список из двух основных: <b>GNOME</b> и <b>KDE</b>.</p>"
-
-#. TRANSLATORS: help text, part 3
-#: src/lib/installation/clients/inst_new_desktop.rb:63
-msgid ""
-"<p>You may select alternative desktop environments (or one of minimal installation patterns)\n"
-"that could fit your needs better using the <b>Other</b> option . Later in the software \n"
-"selection or after installation, you can change your selection or add additional desktop \n"
-"environments. This screen allows you to set the default.</p>"
-msgstr ""
-"<p>Вы можете выбрать другие окружения рабочего стола (или один из шаблонов минимальной установки),\n"
-"более подходящие вашим нуждам, используя опцию <b>Другое</b> . Позже при выборе программного\n"
-"обеспечения или после установки вы сможете изменить свой выбор или добавить дополнительные окружения\n"
-"рабочего стола. Этот экран позволяет вам задать вариант по умолчанию.</p>"
-
-#. TRANSLATORS: dialog caption
-#: src/lib/installation/clients/inst_new_desktop.rb:121
-msgid "Desktop Selection"
-msgstr "Выбор рабочего стола"
-
-#. UI wait loop
-#: src/lib/installation/clients/inst_new_desktop.rb:190
-msgid ""
-"No desktop type was selected.\n"
-"Select the desired desktop environment."
-msgstr ""
-"Не выбран рабочий стол.\n"
-"Выберите желаемое окружение рабочего стола."
-
-#. BNC #449818
-#: src/lib/installation/clients/inst_new_desktop.rb:383
-msgid "Other"
-msgstr "Другое"
-
#. hide the RN button and set the release notes for SlideShow (bnc#871158)
#: src/lib/installation/clients/inst_prepareprogress.rb:56
msgid "Cannot find base product. Release notes will not be shown."
@@ -1326,36 +1313,22 @@
"Не удалось инициализировать хранилища программ.\n"
"Установка прервана."
-#. TRANSLATORS: error message
-#: src/lib/installation/clients/inst_update_installer.rb:232
-msgid ""
-"<p>Cannot obtain the installer update repository URL\n"
-"from the registration server.</p>"
-msgstr ""
-"<p>Не удается получить URL-адрес репозитория с обновлениями установщика\n"
-"с сервера регистрации.</p>"
-
-#. TRANSLATORS: part of an error message, %s is the default repository
-#. URL from control.xml
-#: src/lib/installation/clients/inst_update_installer.rb:238
-msgid "<p>The default URL %s will be used.<p>"
-msgstr "<p>Будет использован URL-адрес по умолчанию: %s.<p>"
-
-#. Ask the user to chose a registration server
+#. Return the self-update URLs
#.
-#. @param services [ArraySlpServiceClass::Service] Array of registration servers
-#. @return [SlpServiceClass::Service,Symbol] Registration service to use; :scc if SCC is selected;
-#. :cancel if the dialog was dismissed.
-#: src/lib/installation/clients/inst_update_installer.rb:315
+#. @return [Array<URI>] self-update URLs
+#.
+#. @see #default_self_update_url
+#. @see #custom_self_update_url
+#: src/lib/installation/clients/inst_update_installer.rb:181
+#, fuzzy
+#| msgid "The registration module is not available."
msgid ""
-"Select a detected registration server from the list\n"
-"to search for installer updates."
-msgstr ""
-"Выберите обнаруженный сервер регистрации из списка\n"
-"для поиска обновлений установщика."
+"The registration URL provided is not valid.\n"
+"Skipping installer update.\n"
+msgstr "Модуль регистрации недоступен."
#. TRANSLATORS: %s is an URL
-#: src/lib/installation/clients/inst_update_installer.rb:396
+#: src/lib/installation/clients/inst_update_installer.rb:233
msgid ""
"A valid update could not be found at\n"
"%s.\n"
@@ -1366,7 +1339,7 @@
"\n"
#. TRANSLATORS: %s is an URL
-#: src/lib/installation/clients/inst_update_installer.rb:402
+#: src/lib/installation/clients/inst_update_installer.rb:240
msgid ""
"Could not fetch update from\n"
"%s.\n"
@@ -1384,7 +1357,7 @@
#. @param reason [String] reason why user want to check his network configuration
#. @return [Boolean] true if the network configuration client was launched;
#. false if the network is not configured.
-#: src/lib/installation/clients/inst_update_installer.rb:432
+#: src/lib/installation/clients/inst_update_installer.rb:264
msgid ""
"\n"
"Would you like to check your network configuration\n"
@@ -1397,7 +1370,7 @@
#. Note: the proxy cannot be configured in the YaST installer yet,
#. it needs to be set via the "proxy" boot option.
#. TRANSLATORS: %s is an URL
-#: src/lib/installation/clients/inst_update_installer.rb:477
+#: src/lib/installation/clients/inst_update_installer.rb:302
msgid ""
"Downloading the optional installer updates from \n"
"%s\n"
@@ -1420,26 +1393,26 @@
"укажите параметр загрузки proxy.\n"
#. TRANSLATORS: progress label
-#: src/lib/installation/clients/inst_update_installer.rb:586
+#: src/lib/installation/clients/inst_update_installer.rb:388
msgid "Add Update Repository"
msgstr "Добавить репозиторий обновлений"
-#: src/lib/installation/clients/inst_update_installer.rb:587
+#: src/lib/installation/clients/inst_update_installer.rb:389
msgid "Download the Packages"
msgstr "Загрузка пакетов"
-#: src/lib/installation/clients/inst_update_installer.rb:588
+#: src/lib/installation/clients/inst_update_installer.rb:390
msgid "Apply the Packages"
msgstr "Применение пакетов"
-#: src/lib/installation/clients/inst_update_installer.rb:589
+#: src/lib/installation/clients/inst_update_installer.rb:391
msgid "Restart"
msgstr "Перезагрузка"
#. TRANSLATORS: dialog title
#. TRANSLATORS: progress title
-#: src/lib/installation/clients/inst_update_installer.rb:600
-#: src/lib/installation/clients/inst_update_installer.rb:602
+#: src/lib/installation/clients/inst_update_installer.rb:402
+#: src/lib/installation/clients/inst_update_installer.rb:404
msgid "Updating the Installer..."
msgstr "Обновление установщика..."
@@ -1448,7 +1421,7 @@
#. @return [Hash, nil] current profile if fetched or exists; nil otherwise
#.
#. @see Yast::Profile.current
-#: src/lib/installation/clients/inst_update_installer.rb:673
+#: src/lib/installation/clients/inst_update_installer.rb:475
msgid ""
"Error while parsing the control file.\n"
"\n"
@@ -1759,6 +1732,17 @@
msgid "Saving proxy configuration..."
msgstr "Сохранение настроек прокси cканер..."
+#. This is a step of base installation finish and is responsible of write the
+#. specific configuration for the current system role.
+#.
+#. It has been added for CaaSP Roles (FATE#321754) and currently only
+#. the 'worker_role' has an special behavior.
+#: src/lib/installation/clients/roles_finish.rb:35
+#, fuzzy
+#| msgid "Writing device configuration..."
+msgid "Writing specific role configuration ..."
+msgstr "Записывается конфигурация устройства..."
+
#. progress step title
#: src/lib/installation/clients/save_config_finish.rb:134
msgid "Saving time zone..."
@@ -1889,6 +1873,14 @@
msgid "Copying log files to installed system..."
msgstr "Копирование лог-файлов в установленную систему"
+#. We do not need to create a wizard dialog in installation, but it's
+#. helpful when testing all manually on a running system
+#: src/lib/installation/dialogs/desktop_roles.rb:25
+#, fuzzy
+#| msgid "Computer Names"
+msgid "Computer Role"
+msgstr "Имена компьютеров"
+
#. Event callback for the 'ok' button
#: src/lib/installation/dialogs/ssh_import.rb:65
msgid "I would like to import SSH keys from a previous installation"
@@ -1913,20 +1905,6 @@
msgid "Import SSH Configuration"
msgstr "Импорт конфигурации SSH"
-#. TODO: Add the registration process
-#: src/lib/installation/dialogs/worker_role.rb:45
-msgid "Dashboard U&RL"
-msgstr "U&RL панели"
-
-#: src/lib/installation/dialogs/worker_role.rb:52
-msgid "Worker Registration"
-msgstr "Регистрация сотрудника"
-
-#. FIXME: This client is a POC and still under definition
-#: src/lib/installation/dialogs/worker_role.rb:58
-msgid "Enter the url of the admin dashboard to register as a worker"
-msgstr "Введите URL панели администрирования, чтобы зарегистрироваться как сотрудник"
-
#. progress step title
#: src/lib/installation/prep_shrink.rb:34
msgid "Shrinking PREP partition..."
@@ -2170,7 +2148,7 @@
msgstr "Включение возможности удаленного администрирования..."
#. A Continue-Cancel popup
-#: src/lib/installation/select_system_role.rb:97
+#: src/lib/installation/select_system_role.rb:92
msgid "Changing the system role may undo adjustments you may have done."
msgstr "Изменение системной роли может привести к отмене сделанных корректировок."
@@ -2224,6 +2202,26 @@
msgid "SSH host keys will be copied from %s"
msgstr "Ключи хоста SSH будут скопированы с %s"
+#. Ask the user to chose a registration server
+#.
+#. @param services [ArraySlpServiceClass::Service] Array of registration servers
+#. @return [SlpServiceClass::Service,Symbol] Registration service to use; :scc if SCC is selected;
+#. :cancel if the dialog was dismissed.
+#: src/lib/installation/update_repositories_finder.rb:250
+msgid ""
+"Select a detected registration server from the list\n"
+"to search for installer updates."
+msgstr ""
+"Выберите обнаруженный сервер регистрации из списка\n"
+"для поиска обновлений установщика."
+
+#. sets flag if online repositories dialog should be shown
+#: src/lib/installation/widgets/online_repos.rb:13
+#, fuzzy
+#| msgid "Configured Repositories"
+msgid "Configure On-line Repositories"
+msgstr "Настроенные репозитарии"
+
#. autoyast tried to read a file but had no success.
#: src/lib/transfer/file_from_url.rb:156
msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
@@ -2320,3 +2318,54 @@
msgstr ""
"Программе установки не удалось автоматически разрешить зависимости между пакетами.\n"
"Будет открыт диспетчер программного обеспечения, в котором вы сможете разрешить зависимости вручную."
+
+#~ msgid ""
+#~ "<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i> offers a number \n"
+#~ "of different desktop environments. Below you see a list of the 2 major ones \n"
+#~ "<b>GNOME</b> and <b>KDE</b>.</p>"
+#~ msgstr ""
+#~ "<p><b>Выбор</b> — это главный приоритет в Linux. <i>openSUSE</i> предлагает несколько\n"
+#~ "рабочих окружений. Ниже вы видите список из двух основных: <b>GNOME</b> и <b>KDE</b>.</p>"
+
+#~ msgid ""
+#~ "<p>You may select alternative desktop environments (or one of minimal installation patterns)\n"
+#~ "that could fit your needs better using the <b>Other</b> option . Later in the software \n"
+#~ "selection or after installation, you can change your selection or add additional desktop \n"
+#~ "environments. This screen allows you to set the default.</p>"
+#~ msgstr ""
+#~ "<p>Вы можете выбрать другие окружения рабочего стола (или один из шаблонов минимальной установки),\n"
+#~ "более подходящие вашим нуждам, используя опцию <b>Другое</b> . Позже при выборе программного\n"
+#~ "обеспечения или после установки вы сможете изменить свой выбор или добавить дополнительные окружения\n"
+#~ "рабочего стола. Этот экран позволяет вам задать вариант по умолчанию.</p>"
+
+#~ msgid "Desktop Selection"
+#~ msgstr "Выбор рабочего стола"
+
+#~ msgid ""
+#~ "No desktop type was selected.\n"
+#~ "Select the desired desktop environment."
+#~ msgstr ""
+#~ "Не выбран рабочий стол.\n"
+#~ "Выберите желаемое окружение рабочего стола."
+
+#~ msgid "Other"
+#~ msgstr "Другое"
+
+#~ msgid ""
+#~ "<p>Cannot obtain the installer update repository URL\n"
+#~ "from the registration server.</p>"
+#~ msgstr ""
+#~ "<p>Не удается получить URL-адрес репозитория с обновлениями установщика\n"
+#~ "с сервера регистрации.</p>"
+
+#~ msgid "<p>The default URL %s will be used.<p>"
+#~ msgstr "<p>Будет использован URL-адрес по умолчанию: %s.<p>"
+
+#~ msgid "Dashboard U&RL"
+#~ msgstr "U&RL панели"
+
+#~ msgid "Worker Registration"
+#~ msgstr "Регистрация сотрудника"
+
+#~ msgid "Enter the url of the admin dashboard to register as a worker"
+#~ msgstr "Введите URL панели администрирования, чтобы зарегистрироваться как сотрудник"
Modified: branches/SLE12-SP3/yast/ru/po/iscsi-lio-server.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/iscsi-lio-server.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/iscsi-lio-server.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: iscsi-lio-server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-01 02:28+0000\n"
+"POT-Creation-Date: 2017-05-16 19:52+0200\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -90,6 +90,7 @@
msgstr "Имя"
#: src/include/iscsi-lio-server/dialogs.rb:149
+#: src/include/iscsi-lio-server/widgets.rb:336
msgid "Path"
msgstr "Путь"
@@ -545,14 +546,14 @@
msgid "Selected Path is already in use!"
msgstr "Выбранный путь уже используется!"
-#: src/include/iscsi-lio-server/widgets.rb:336
-msgid "Path:"
-msgstr "Путь:"
-
#: src/include/iscsi-lio-server/widgets.rb:339
msgid "Browse"
msgstr "Обзор"
+#: src/include/iscsi-lio-server/widgets.rb:344
+msgid "Name (autogenerated when empty)"
+msgstr ""
+
#: src/include/iscsi-lio-server/widgets.rb:359
msgid "Select file or device"
msgstr "Выберите файл или устройство"
@@ -566,8 +567,8 @@
msgstr "LUN целевого объекта"
#: src/include/iscsi-lio-server/widgets.rb:470
-msgid "Change:"
-msgstr "Изменение:"
+msgid "Change"
+msgstr "Изменить"
#: src/include/iscsi-lio-server/widgets.rb:563
msgid "Target LUN %1 used more than once!"
@@ -578,7 +579,9 @@
msgstr "Необходимо включить хотя бы один тип аутентификации!"
#: src/include/iscsi-lio-server/widgets.rb:645
-msgid "Initiator name:"
+#, fuzzy
+#| msgid "Initiator name:"
+msgid "Initiator name"
msgstr "Имя инициатора:"
#: src/include/iscsi-lio-server/widgets.rb:648
@@ -601,7 +604,9 @@
#. Copy exisiting LUN, i.e. give additional initiator access to the LUN
#. (which is allowed, makes sense e.g. with multipath)
#: src/include/iscsi-lio-server/widgets.rb:704
-msgid "New initiator name:"
+#, fuzzy
+#| msgid "New initiator name:"
+msgid "New initiator name"
msgstr "Новое имя инициатора:"
#: src/include/iscsi-lio-server/widgets.rb:750
@@ -827,3 +832,9 @@
#: src/modules/IscsiLioServer.rb:425
msgid "Configuration summary..."
msgstr "Сводка по конфигурации..."
+
+#~ msgid "Path:"
+#~ msgstr "Путь:"
+
+#~ msgid "Change:"
+#~ msgstr "Изменение:"
Modified: branches/SLE12-SP3/yast/ru/po/kdump.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/kdump.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/kdump.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: kdump\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-16 02:29+0000\n"
+"POT-Creation-Date: 2017-03-31 02:28+0000\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -362,7 +362,7 @@
#. Force value to false, so it's actually rewritten
#. TRANSLATORS: CommandLine printed text
#. delete crashkernel parameter from bootloader
-#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:513
+#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:535
msgid "To apply changes a reboot is necessary."
msgstr "Необходимо перезагрузить компьютер, чтобы изменения вступили в силу."
@@ -1229,7 +1229,7 @@
#. @param update_command [String] a command for .target.bash
#. @return [Boolean] whether successful
-#: src/modules/Kdump.rb:414
+#: src/modules/Kdump.rb:427
msgid ""
"Error updating initrd while calling '%{cmd}'.\n"
"See %{log} for details."
@@ -1238,129 +1238,129 @@
"Сведения см. в %{log}."
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:523
+#: src/modules/Kdump.rb:545
msgid "Initializing kdump Configuration"
msgstr "Инициализация конфигурации kdump"
#. Progress stage 1/4
#. Progress step 1/4
-#: src/modules/Kdump.rb:532 src/modules/Kdump.rb:540
+#: src/modules/Kdump.rb:554 src/modules/Kdump.rb:562
msgid "Reading the config file..."
msgstr "Читается файл конфигурации..."
#. Progress stage 3/4
-#: src/modules/Kdump.rb:534
+#: src/modules/Kdump.rb:556
msgid "Reading kernel boot options..."
msgstr "Чтение параметров загрузки ядра..."
#. Progress stage 4/4
-#: src/modules/Kdump.rb:536
+#: src/modules/Kdump.rb:558
msgid "Calculating memory limits..."
msgstr "Расчет ограничений памяти..."
#. Progress step 2/4
-#: src/modules/Kdump.rb:542
+#: src/modules/Kdump.rb:564
msgid "Reading partitions of disks..."
msgstr "Чтение разделов дисков..."
#. Progress finished 3/4
-#: src/modules/Kdump.rb:544
+#: src/modules/Kdump.rb:566
msgid "Reading available memory and calibrating usage..."
msgstr "Считывание сведений о доступной памяти и уточнение параметров использования..."
#. Error message
-#: src/modules/Kdump.rb:556
+#: src/modules/Kdump.rb:578
msgid "Cannot read config file /etc/sysconfig/kdump"
msgstr "Невозможно прочитать файл конфигурации /etc/sysconfig/kdump"
#. Error message
-#: src/modules/Kdump.rb:564
+#: src/modules/Kdump.rb:586
msgid "Cannot read kernel boot options."
msgstr "Невозможно прочитать параметры загрузки ядра."
#. Error message
-#: src/modules/Kdump.rb:572
+#: src/modules/Kdump.rb:594
msgid "Cannot read available memory."
msgstr "Невозможно прочитать доступную память."
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:598
+#: src/modules/Kdump.rb:620
msgid "Saving kdump Configuration"
msgstr "Сохранение конфигурации kdump"
#. Progress stage 1/2
-#: src/modules/Kdump.rb:627
+#: src/modules/Kdump.rb:649
msgid "Write the settings"
msgstr "Записать параметры"
#. Progress stage 2/2
-#: src/modules/Kdump.rb:629
+#: src/modules/Kdump.rb:651
msgid "Update boot options"
msgstr "Обновление параметров загрузки"
#. Progress step 1/2
-#: src/modules/Kdump.rb:633
+#: src/modules/Kdump.rb:655
msgid "Writing the settings..."
msgstr "Записываются параметры..."
#. Progress step 2/2
-#: src/modules/Kdump.rb:635
+#: src/modules/Kdump.rb:657
msgid "Updating boot options..."
msgstr "Обновляются параметры загрузки..."
#. Progress finished
-#: src/modules/Kdump.rb:637
+#: src/modules/Kdump.rb:659
msgid "Finished"
msgstr "Готово"
#. Error message
-#: src/modules/Kdump.rb:647
+#: src/modules/Kdump.rb:669
msgid "Cannot write settings."
msgstr "Не удается записать параметры."
#. Error message
-#: src/modules/Kdump.rb:656
+#: src/modules/Kdump.rb:678
msgid "Adding crashkernel parameter to bootloader fault."
msgstr "Добавление параметра crashkernel к сбойному загрузчику."
#. Create a textual summary
#. @return summary of the current configuration
-#: src/modules/Kdump.rb:774
+#: src/modules/Kdump.rb:796
msgid "Kdump status: %1"
msgstr "Состояние Kdump: %1"
-#: src/modules/Kdump.rb:775
+#: src/modules/Kdump.rb:797
msgid "enabled"
msgstr "включено"
-#: src/modules/Kdump.rb:775
+#: src/modules/Kdump.rb:797
msgid "disabled"
msgstr "выключено"
-#: src/modules/Kdump.rb:782
+#: src/modules/Kdump.rb:804
msgid "Value(s) of crashkernel option: %1"
msgstr "Значения параметра crashkernel: %1"
-#: src/modules/Kdump.rb:789
+#: src/modules/Kdump.rb:811
msgid "Dump format: %1"
msgstr "Формат дампа: %1"
-#: src/modules/Kdump.rb:796
+#: src/modules/Kdump.rb:818
msgid "Target of dumps: %1"
msgstr "Цель дампов: %1"
-#: src/modules/Kdump.rb:803
+#: src/modules/Kdump.rb:825
msgid "Number of dumps: %1"
msgstr "Число дампов: %1"
#. TRANSLATORS: warning message in installation proposal,
#. do not translate %{requested} and %{available} - they are replaced with actual sizes later
-#: src/modules/Kdump.rb:895
+#: src/modules/Kdump.rb:917
msgid "Warning! There might not be enough free space. %{required} required, but only %{available} are available."
msgstr "Внимание! Возможно, недостаточно свободного места. Требуется: %{required}, доступно: %{available}."
#. Trying to use fadump on unsupported hardware
-#: src/modules/Kdump.rb:992
+#: src/modules/Kdump.rb:1025
msgid ""
"Cannot use Firmware-assisted dump.\n"
"It is not supported on this hardware."
Modified: branches/SLE12-SP3/yast/ru/po/network.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/network.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/network.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: network\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-01 02:29+0000\n"
+"POT-Creation-Date: 2017-04-08 02:28+0000\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -574,7 +574,7 @@
#. Commandline help title
#. Main routing dialog
#. @return dialog result
-#: src/clients/routing.rb:57 src/include/network/services/routing.rb:473
+#: src/clients/routing.rb:57 src/include/network/services/routing.rb:510
msgid "Routing Configuration"
msgstr "Конфигурация маршрутизации"
@@ -660,7 +660,9 @@
msgstr "Шлюз"
#. Table header label
+#. Table header 3/4
#: src/clients/routing.rb:208 src/include/network/lan/address.rb:101
+#: src/include/network/services/routing.rb:89
msgid "Netmask"
msgstr "Сетевая маска"
@@ -741,13 +743,13 @@
#. interface summary: WiFi without encryption
#. interface summary: WiFi without encryption
-#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1458
+#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1456
msgid "Warning: no encryption is used."
msgstr "Внимание: шифрование не используется."
#. Hyperlink: Change the configuration of an interface
#. Hyperlink: Change the configuration of an interface
-#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1460
+#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1458
msgid "Change."
msgstr "Изменить."
@@ -2254,17 +2256,26 @@
"дать возможность вам сказать \"и все остальное должно идти сюда\".</p>\n"
#: src/include/network/lan/help.rb:99
+#, fuzzy
+#| msgid ""
+#| "<p>For each route, enter destination network IP address, gateway address,\n"
+#| "and netmask. To omit any of these values, use a dash sign \"-\". Select\n"
+#| "the device through which the traffic to the defined network will be routed.\"-\" is an alias for any interface.</p>\n"
msgid ""
"<p>For each route, enter destination network IP address, gateway address,\n"
-"and netmask. To omit any of these values, use a dash sign \"-\". Select\n"
-"the device through which the traffic to the defined network will be routed.\"-\" is an alias for any interface.</p>\n"
+"and netmask. You can use either IPv4 netmask or prefix length when defining\n"
+"network part of route. Prefix length has to be prefixed using '/'.\n"
+"To omit any of these values, use a dash sign \"-\". Select\n"
+"the device through which the traffic to the defined network will be routed.\"-\" is an alias for any interface.\n"
+"Please note that in case of IPv6 networks only prefix length is accepted\n"
+"for netmask definition.</p>\n"
msgstr ""
"Для каждого маршрута укажите IP-адрес сети назначения, адрес шлюза\n"
"и маску сети. Для пропуска любого из этих значений используйте \"-\".\n"
"Выберите устройство, через которое будет перенаправляться весь трафик к указанной сети. \"-\" это псевдоним для любого интерфейса.\n"
#. Routing dialog help 2/2
-#: src/include/network/lan/help.rb:105
+#: src/include/network/lan/help.rb:109
msgid ""
"<p>Enable <b>IPv4 Forwarding</b> (forwarding packets from external networks\n"
"to the internal one) if this system is a router.\n"
@@ -2272,7 +2283,7 @@
"<p>Включите <b>IPv4 Forwarding</b> (Перенаправление IPv4) (перенаправление пакетов из внешних сетей\n"
"на внутреннюю), если эта система является маршрутизатором.\n"
-#: src/include/network/lan/help.rb:109
+#: src/include/network/lan/help.rb:113
msgid ""
"<p>Enable <b>IPv6 Forwarding</b> (forwarding packets from external networks\n"
"to the internal one) if this system is a router.\n"
@@ -2284,7 +2295,7 @@
"<b>Внимание!</b> Перенаправление IPv6 отключает автоматическую настройку адреса IPv6\n"
"без отслеживания состояния (SLAAC)."
-#: src/include/network/lan/help.rb:115
+#: src/include/network/lan/help.rb:119
msgid ""
"<p><b>Important:</b> if the firewall is enabled, allowing forwarding alone is not enough. \n"
"You should enable masquerading and/or set at least one redirect rule in the\n"
@@ -2294,7 +2305,7 @@
"Необходимо включить маскировку и/или установить по крайней мере одно правило перенаправления в конфигурации\n"
"брандмауэра. Используйте модуль брандмауэра YaST.</p>\n"
-#: src/include/network/lan/help.rb:121
+#: src/include/network/lan/help.rb:125
msgid ""
"<p>If you are using DHCP to get an IP address, check whether you get\n"
"also a hostname via DHCP. The hostname will be set automatically by the DHCP client.\n"
@@ -2313,7 +2324,7 @@
"\"любое\". Однако этот параметр может привести к непредсказуемому поведению системы\n"
"в случае подключения к нескольким сетям с DHCP.</p>\n"
-#: src/include/network/lan/help.rb:131
+#: src/include/network/lan/help.rb:135
msgid ""
"<p><b>Assign Hostname to Loopback IP</b> associates your hostname with \n"
"the IP address <tt>127.0.0.2</tt> (loopback) in <tt>/etc/hosts</tt>. This is a \n"
@@ -2327,7 +2338,7 @@
"всегда, даже без подключения к сети. Во всех прочих случаях используйте с\n"
"осторожностью, особенно если этот компьютер предоставляет сетевые сервисы.</p>\n"
-#: src/include/network/lan/help.rb:139
+#: src/include/network/lan/help.rb:143
msgid ""
"<p>Enter the name servers and domain search list for resolving \n"
"hostnames. Usually they can be obtained by DHCP.</p>\n"
@@ -2336,7 +2347,7 @@
"определения хостов. Обычно они могут быть определны при помощи DHCP.</p>\n"
#. resolver dialog help
-#: src/include/network/lan/help.rb:143
+#: src/include/network/lan/help.rb:147
msgid ""
"<p>A name server is a computer that translates hostnames into\n"
"IP addresses. This value must be entered as an <b>IP address</b>\n"
@@ -2347,7 +2358,7 @@
"(например, 10.10.0.1), а не как имя хоста.</p>\n"
#. resolver dialog help
-#: src/include/network/lan/help.rb:149
+#: src/include/network/lan/help.rb:153
msgid ""
"<p>Search domain is the domain name where hostname searching starts.\n"
"The primary search domain is usually the same as the domain name of\n"
@@ -2359,7 +2370,7 @@
"вашего компьютера (например, suse.de). Может быть и дополнительный домен поиска\n"
"(например, suse.com). Разделите домены запятыми или пробелами.</p>\n"
-#: src/include/network/lan/help.rb:156
+#: src/include/network/lan/help.rb:160
msgid ""
"<p>Enter the short name for this computer (e.g. <i>mymachine</i>) and the DNS domain\n"
"(e.g. <i>example.com</i>) that it belongs to. The domain is especially important if this \n"
@@ -2371,7 +2382,7 @@
"домен особенно важен. Имя хоста компьютера можно\n"
"посмотреть с помощью команды <i>hostname</i>.</p>"
-#: src/include/network/lan/help.rb:163
+#: src/include/network/lan/help.rb:167
msgid ""
"<p>Select the way how the DNS configuration will be modified (name servers,\n"
"search list, the content of <i>/etc/resolv.conf</i>). Normally, it is handled\n"
@@ -2387,7 +2398,7 @@
"и т.д.). Это опция по умолчанию. <b>Использовать политику по умолчанию</b>\n"
"подходит для большинства конфигураций.</p>\n"
-#: src/include/network/lan/help.rb:171
+#: src/include/network/lan/help.rb:175
msgid ""
"<p>By choosing <b>Only Manually</b>, <i>netconfig</i> will no longer be\n"
"allowed to modify <i>/etc/resolv.conf</i>. You can however edit the file\n"
@@ -2409,7 +2420,7 @@
#. Address dialog help 1-6/8: dynamic address preferred
#. Address dialog help 1/8
-#: src/include/network/lan/help.rb:183
+#: src/include/network/lan/help.rb:187
msgid ""
"<p><b><big>Address Setup</big></b></p>\n"
"<p>Select <b>No Address Setup</b> if you do not want to assign an IP address to this device.\n"
@@ -2419,12 +2430,12 @@
"<p>Выберите <b>Настройка без адреса</b>, если вы не хотите присваивать IP-адрес этому устройству.\n"
"Это полезно, когда вы объединяете ethernet-устройства.</p>\n"
-#: src/include/network/lan/help.rb:188
+#: src/include/network/lan/help.rb:192
msgid "<p>Check <b>iBFT</b> if you want to keep the network configured in your BIOS.</p>\n"
msgstr "<p>Отметьте <b>iBFT</b>, если хотите сохранить настройки сети в BIOS.</p>\n"
#. Address dialog help 2/8
-#: src/include/network/lan/help.rb:192
+#: src/include/network/lan/help.rb:196
msgid ""
"<p>Select <b>Dynamic Address</b> if you do not have a static IP address \n"
"assigned by the system administrator or your Internet provider.</p>\n"
@@ -2433,7 +2444,7 @@
"системным администратором или поставщиком Интернет-услуг.</p>\n"
#. Address dialog help 3/8
-#: src/include/network/lan/help.rb:196
+#: src/include/network/lan/help.rb:200
msgid ""
"<p>Choose one of the dynamic address assignment methods. Select <b>DHCP</b>\n"
"if you have a DHCP server running on your local network. Network addresses \n"
@@ -2444,7 +2455,7 @@
"Сетевые адреса будут автоматически получены от сервера.</p>\n"
#. Address dialog help 4/8
-#: src/include/network/lan/help.rb:202
+#: src/include/network/lan/help.rb:206
msgid ""
"<p>To search for an IP address and assign it statically, select \n"
"<b>Zeroconf</b>. To use DHCP and fall back to zeroconf, select <b>DHCP + Zeroconf\n"
@@ -2455,7 +2466,7 @@
"В противном случае сетевые адреса должны назначаться <b>статически</b>.</p>\n"
#. Address dialog help 5/8
-#: src/include/network/lan/help.rb:209
+#: src/include/network/lan/help.rb:213
msgid ""
"<p>Enter the <b>IP Address</b> (for example: <tt>192.168.100.99</tt>) for your computer, and the \n"
" <b>Remote IP Address</b> (for example: <tt>192.168.100.254</tt>)\n"
@@ -2466,7 +2477,7 @@
" для однорангового узла.</p>\n"
#. Address dialog help 6/8
-#: src/include/network/lan/help.rb:216
+#: src/include/network/lan/help.rb:220
msgid ""
"<p>For <b>Static Address Setup</b> enter the static IP address for your computer (for example: <tt>192.168.100.99</tt>) and\n"
"the network mask (usually <tt>255.255.255.0</tt> or just length of prefix <tt>/24</tt>).Optionally, you can enter\n"
@@ -2477,7 +2488,7 @@
"Дополнительно, вы можете указать полное имя узла для его IP адреса. Это будет записано в <tt>/etc/hosts</tt>.</p>\n"
#. Address dialog help 8/8
-#: src/include/network/lan/help.rb:222
+#: src/include/network/lan/help.rb:226
msgid ""
"<p>Contact your <b>network administrator</b> for more information about\n"
"the network configuration.</p>"
@@ -2485,7 +2496,7 @@
"<p>Свяжитесь с вашим <b>сетевым администратором</b> для получения подробной\n"
"информации о сетевой конфигурации. </p> "
-#: src/include/network/lan/help.rb:226
+#: src/include/network/lan/help.rb:230
msgid ""
"<p>DHCP configuration is not recommended for this product.\n"
"Components of this product might not work with DHCP.</p>"
@@ -2493,7 +2504,7 @@
"<p>Настройка DHCP не рекомендовано этим продуктом.\n"
"Компоненты этого продукта могуть не работать вместе с DHCP.</p>"
-#: src/include/network/lan/help.rb:230
+#: src/include/network/lan/help.rb:234
msgid ""
"<p><b><big>Firewall Zone</big></b></p>\n"
"<p>Select the firewall zone to put the interface into. If you\n"
@@ -2511,11 +2522,11 @@
"будет блокирован. Если Вы не выберете зону, но других интерфейсов нет,\n"
"то брандмауэр будет отключён.</p>"
-#: src/include/network/lan/help.rb:240
+#: src/include/network/lan/help.rb:244
msgid "<p><b>Mandatory Interface</b> specifies whether the network service reports failure if the interface fails to start at boot time.</p>"
msgstr "<p><b>Постоянный интерфейс</b> определяет будет ли сетевой сервис сообщать о том что интерфейс не запустился при загрузке системы.</p>"
-#: src/include/network/lan/help.rb:244
+#: src/include/network/lan/help.rb:248
msgid ""
"<p><b><big>Maximum Transfer Unit</big></b></p>\n"
"<p>Maximum transfer unit (<b>MTU</b>) is the maximum size of the packet,\n"
@@ -2531,7 +2542,7 @@
"скорость работы сети, особенно на медленных dial-up соединениях.\n"
"Выберите одно из рекомендуемых значений или определите его сами.</p>\n"
-#: src/include/network/lan/help.rb:253
+#: src/include/network/lan/help.rb:257
msgid ""
"<p>Select the slave devices for the bond device.\n"
"Only devices with the device activation set to <b>Never</b> and with <b>No Address Setup</b> are available.</p>"
@@ -2540,12 +2551,12 @@
"Доступны только устройства, у которых параметр активации устройства имеет значение <b>Никогда</b> и с режимом <b>Без настройки адреса</b>.</p>"
#. DHCP dialog help 1/7
-#: src/include/network/lan/help.rb:257
+#: src/include/network/lan/help.rb:261
msgid "<p><b><big>DHCP Client Options</big></b></p>"
msgstr "<p><b><big>Параметры клиента DHCP</big></b></p>"
#. DHCP dialog help 2/7
-#: src/include/network/lan/help.rb:259
+#: src/include/network/lan/help.rb:263
msgid ""
"<p>The <b>DHCP Client Identifier</b>, if left empty, defaults to\n"
"the hardware address of the network interface. It must be different for each\n"
@@ -2560,7 +2571,7 @@
"сетевой интерфейс, а также один аппаратный адрес. </p> "
#. DHCP dialog help 3/7
-#: src/include/network/lan/help.rb:267
+#: src/include/network/lan/help.rb:271
msgid ""
"<p>The <b>Hostname to Send</b> specifies a string used for the\n"
"hostname option field when the DHCP client sends messages to the DHCP server. Some \n"
@@ -2581,7 +2592,7 @@
"Если вы не хотите отправлять имя узла, оставьте поле пустым.</p>\n"
#. Aliases dialog help 1/4
-#: src/include/network/lan/help.rb:278
+#: src/include/network/lan/help.rb:282
msgid ""
"<p><b><big>Additional Addresses</big></b></p>\n"
"<p>Configure additional addresses of an interface in this table.</p>\n"
@@ -2590,7 +2601,7 @@
"<p>Настройте дополнительные адреса интерфейса в этой таблице.</p>\n"
#. Aliases dialog help 2/4
-#: src/include/network/lan/help.rb:282
+#: src/include/network/lan/help.rb:286
msgid ""
"<p>Enter an <b>IPv4 Address Label</b>, an <b>IP Address</b>, and\n"
"the <b>Netmask</b>.</p>"
@@ -2599,7 +2610,7 @@
"<b>Маска сети</b>.</p>"
#. Aliases dialog help 3/4
-#: src/include/network/lan/help.rb:286
+#: src/include/network/lan/help.rb:290
msgid ""
"<p><b>IPv4 Address Label</b>, formerly known as Alias Name, is optional and legacy. The total\n"
"length of interface name (inclusive of the colon and label) is\n"
@@ -2610,14 +2621,14 @@
"должна превышать 15 знаков. Устаревшая утилита ifconfig обрезает ее после 9 знаков.</p>"
#. Aliases dialog help 3/4, #83766
-#: src/include/network/lan/help.rb:292
+#: src/include/network/lan/help.rb:296
msgid "<p>Do not include the interface name in the label. For example, enter <b>foo</b> instead of <b>eth0:foo</b>.</p>"
msgstr "<p>Не включайте в эту метку имя интерфейса. Например, вводите <b>foo</b>, а не <b>eth0:foo</b>.</p>"
#. shared between WirelessDialog and WirelessKeyPopup
#. this is suited to the button-switched key typing
#. Translators: dialog help
-#: src/include/network/lan/help.rb:299
+#: src/include/network/lan/help.rb:303
msgid ""
"<p>Choose between three <b>Key Input Types</b> for your key.\n"
"<br><b>Passphrase</b>: The key is generated from the phrase entered.\n"
@@ -2645,7 +2656,7 @@
"</p>\n"
#. Wireless dialog help
-#: src/include/network/lan/help.rb:314
+#: src/include/network/lan/help.rb:318
msgid ""
"<p>Here, set the most important settings\n"
"for wireless networking.</p>"
@@ -2653,7 +2664,7 @@
"<p>Установите самые важные настройки\n"
"для работы с беспроводными сетями.</p>"
-#: src/include/network/lan/help.rb:317
+#: src/include/network/lan/help.rb:321
msgid ""
"<p>The <b>Operating Mode</b> depends on the network topology. The mode\n"
"can be <b>Ad-Hoc</b> (peer-to-peer network without an access point),\n"
@@ -2667,7 +2678,7 @@
"<i>Режим инфраструктуры</i>), или <b>Мастер</b> (сетевая плата\n"
"выступающая как точка доступа).</p>\n"
-#: src/include/network/lan/help.rb:324
+#: src/include/network/lan/help.rb:328
msgid ""
"<p>Set the <b>Network Name (ESSID)</b> used to identify\n"
"cells that are part of the same virtual network. All stations in a\n"
@@ -2685,7 +2696,7 @@
"ваша WLAN плата будет ассоциирована с точкой доступа\n"
"с наибольшей силой сигнала.</p>\n"
-#: src/include/network/lan/help.rb:333
+#: src/include/network/lan/help.rb:337
msgid ""
"<p>In some networks, you need to set an <b>Authentication Mode</b>.\n"
"It depends on the protection technology used, WEP or WPA. <b>WEP</b>\n"
@@ -2720,7 +2731,7 @@
"Если Вы хотите использовать WPA, выберите режим аутентификации <b>WPA-PSK</b> или <b>WPA-EAP</b>.\n"
"Это можно сделать только в режиме работы <b>Управляемый</b>.</p>\n"
-#: src/include/network/lan/help.rb:351
+#: src/include/network/lan/help.rb:355
msgid ""
"<p>To use WEP, enter the\n"
"WEP encryption key to use. It can have a key\n"
@@ -2735,7 +2746,7 @@
"динамически сгенерированный, так вам только необходимо ввести 40 для 232 бит.</p>\n"
#. Wireless dialog help
-#: src/include/network/lan/help.rb:359
+#: src/include/network/lan/help.rb:363
msgid ""
"<p>To use WPA-PSK (sometimes referred to as WPA Home),\n"
"enter the preshared key. This\n"
@@ -2751,7 +2762,7 @@
"атаки по словарю по прежнему возможны. Не используйте слово, которое\n"
"легко можно угадать как контрольное.</p>\n"
-#: src/include/network/lan/help.rb:367
+#: src/include/network/lan/help.rb:371
msgid ""
"<p>To use WPA-EAP (sometimes referred to as WPA Enterprise),\n"
"enter some additional parameters in the next dialog.</p>\n"
@@ -2759,7 +2770,7 @@
"<p>Чтобы использовать WPA-EAP (иногда назваемое как WPA Enterprise),\n"
"введите некоторые дополнительные параметры в следующем диалоге.</p>\n"
-#: src/include/network/lan/help.rb:370
+#: src/include/network/lan/help.rb:374
msgid ""
"<p>These values will be written to the interface configuration file\n"
"'ifcfg-*' in '/etc/sysconfig/network'. If you need additional settings,\n"
@@ -3673,11 +3684,6 @@
msgid "Default IPv6 &Gateway"
msgstr "&Шлюз IPv6 по умолчанию"
-#. Table header 3/4
-#: src/include/network/services/routing.rb:89
-msgid "Genmask"
-msgstr "Маска"
-
#. CheckBox label
#: src/include/network/services/routing.rb:110
msgid "Enable &IPv4 Forwarding"
@@ -3696,40 +3702,40 @@
#. @param [Yast::Term] entry edited entry
#. @param [Array] devs available devices
#. @return route or nil, if canceled
-#: src/include/network/services/routing.rb:163
+#: src/include/network/services/routing.rb:181
msgid "&Destination"
msgstr "&Назначение"
-#: src/include/network/services/routing.rb:171
-msgid "Ge&nmask"
-msgstr "&Маска"
+#: src/include/network/services/routing.rb:189
+msgid "&Netmask"
+msgstr "&Сетевая маска"
-#: src/include/network/services/routing.rb:180
+#: src/include/network/services/routing.rb:198
msgid "&Gateway"
msgstr "&Шлюз"
-#: src/include/network/services/routing.rb:188
+#: src/include/network/services/routing.rb:206
msgid "De&vice"
msgstr "Устройство(&v)"
#. Popup::Error text
-#: src/include/network/services/routing.rb:247
+#: src/include/network/services/routing.rb:261
msgid "Destination is invalid."
msgstr "Неверно назначение."
#. Popup::Error text
-#: src/include/network/services/routing.rb:255
+#: src/include/network/services/routing.rb:269
msgid "Gateway IP address is invalid."
msgstr "Неверный IP адрес шлюза."
#. Popup::Error text
-#: src/include/network/services/routing.rb:263
+#: src/include/network/services/routing.rb:277
msgid "Subnetmask is invalid."
msgstr "Неверная маска подсети."
#. #178538 - disable routing dialog when NetworkManager is used
#. but instead of default route (#299448) - NM reads it
-#: src/include/network/services/routing.rb:422
+#: src/include/network/services/routing.rb:436
msgid "The default gateway is invalid."
msgstr "Неверен шлюз по умолчанию."
@@ -4398,27 +4404,27 @@
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=hotplug
-#: src/modules/LanItems.rb:1339 src/modules/LanItems.rb:1343
-#: src/modules/LanItems.rb:1347
+#: src/modules/LanItems.rb:1337 src/modules/LanItems.rb:1341
+#: src/modules/LanItems.rb:1345
msgid "Started automatically at boot"
msgstr "Запускается автоматически при загрузке"
#. summary description of STARTMODE=ifplugd
-#: src/modules/LanItems.rb:1351
+#: src/modules/LanItems.rb:1349
msgid "Started automatically on cable connection"
msgstr "Запускается автоматически при присоединении кабеля"
#. summary description of STARTMODE=managed
-#: src/modules/LanItems.rb:1355
+#: src/modules/LanItems.rb:1353
msgid "Managed by NetworkManager"
msgstr "Управляется NetworkManager"
#. summary description of STARTMODE=off
-#: src/modules/LanItems.rb:1359
+#: src/modules/LanItems.rb:1357
msgid "Will not be started at all"
msgstr "Не будет запускаться вообще"
-#: src/modules/LanItems.rb:1365
+#: src/modules/LanItems.rb:1363
msgid "Started manually"
msgstr "Запускается вручную"
@@ -4430,50 +4436,50 @@
#.
#. @param [Hash] dev_map a device's sysconfig map (in form "option" => "value")
#. @return [Array] list of strings, one string is intended for one "bullet"
-#: src/modules/LanItems.rb:1395
+#: src/modules/LanItems.rb:1393
msgid "IP address assigned using"
msgstr "IP-адрес назначен с помощью"
-#: src/modules/LanItems.rb:1399
+#: src/modules/LanItems.rb:1397
msgid "IP address: %s/%s"
msgstr "IP-адрес: %s/%s"
-#: src/modules/LanItems.rb:1402
+#: src/modules/LanItems.rb:1400
msgid "IP address: %s, subnet mask %s"
msgstr "IP-адрес: %s, маска подсети %s"
#. FIXME: side effect: sets @type. No reason for that. It should only build item
#. overview. Check and remove.
#. display it only if we need it, don't duplicate "ifcfg_name" above
-#: src/modules/LanItems.rb:1446 src/modules/LanItems.rb:1502
+#: src/modules/LanItems.rb:1444 src/modules/LanItems.rb:1500
msgid "Device Name: %s"
msgstr "Имя устройства: %s"
-#: src/modules/LanItems.rb:1471
+#: src/modules/LanItems.rb:1469
msgid "Bonding master"
msgstr "Ведущее объединяемое устройство"
-#: src/modules/LanItems.rb:1474
+#: src/modules/LanItems.rb:1472
msgid "Bridge"
msgstr "Мост"
-#: src/modules/LanItems.rb:1476
+#: src/modules/LanItems.rb:1474
msgid "enslaved in %s"
msgstr "ведомый в %s"
-#: src/modules/LanItems.rb:1490
+#: src/modules/LanItems.rb:1488
msgid "Not connected"
msgstr "Не подключен"
-#: src/modules/LanItems.rb:1491
+#: src/modules/LanItems.rb:1489
msgid "No hwinfo"
msgstr "Нет hwinfo"
-#: src/modules/LanItems.rb:1508
+#: src/modules/LanItems.rb:1506
msgid "Unable to configure the network card because the kernel device (eth0, wlan0) is not present. This is mostly caused by missing firmware (for wlan devices). See dmesg output for details."
msgstr "Невозможно настроить сетевой адаптер из-за отсутствия устройства ядра (eth0, wlan0). Как правило, это бывает связано с отсутствием микропрограммы (для устройств WLAN). Сведения см. в данных вывода dmesg."
-#: src/modules/LanItems.rb:1514
+#: src/modules/LanItems.rb:1512
msgid ""
"The device is not configured. Press <b>Edit</b>\n"
"to configure.\n"
@@ -4481,11 +4487,11 @@
"Устройство не настроено. Выберите команду <b>Edit</b> (Редактировать)\n"
"для настройки.\n"
-#: src/modules/LanItems.rb:1521
+#: src/modules/LanItems.rb:1519
msgid "Needed firmware"
msgstr "Необходима микропрограмма"
-#: src/modules/LanItems.rb:1521
+#: src/modules/LanItems.rb:1519
msgid "unknown"
msgstr "неизвестно"
@@ -4495,11 +4501,11 @@
#. @param [String] ifcfg_type
#. @param [String] ifcfg_name
#. @return [String] formated string with the interface type and the interfaces enslaved
-#: src/modules/LanItems.rb:2547
+#: src/modules/LanItems.rb:2545
msgid "Bonding slaves"
msgstr "Объединяемые подчиненные устройства"
-#: src/modules/LanItems.rb:2550
+#: src/modules/LanItems.rb:2548
msgid "Bridge Ports"
msgstr "Порты моста"
@@ -4565,21 +4571,21 @@
msgstr "Удаленное администрирование заблокировано."
#. Progress stage 1
-#: src/modules/Routing.rb:264
+#: src/modules/Routing.rb:312
msgid "Write IP forwarding settings"
msgstr "Записать параметры IP-переадресации"
#. Progress stage 2
-#: src/modules/Routing.rb:266
+#: src/modules/Routing.rb:314
msgid "Write routing settings"
msgstr "Записать параметры маршрутизации"
-#: src/modules/Routing.rb:269
+#: src/modules/Routing.rb:317
msgid "Saving Routing Configuration"
msgstr "Сохранение настроек маршрутизации"
#. Progress stage 1/2
-#: src/modules/Routing.rb:274
+#: src/modules/Routing.rb:322
msgid "Writing IP forwarding settings..."
msgstr "Выполняется запись параметров IP-переадресации..."
@@ -4588,22 +4594,22 @@
#. sysconfig does not support restarting routes only,
#. so we let our caller do it together with other things
#. Progress stage 2/2
-#: src/modules/Routing.rb:284
+#: src/modules/Routing.rb:332
msgid "Writing routing settings..."
msgstr "Выполняется запись параметров маршрутизации..."
#. Summary text
-#: src/modules/Routing.rb:454
+#: src/modules/Routing.rb:502
msgid "Gateway: %s"
msgstr "Шлюз: %s"
#. Summary text
-#: src/modules/Routing.rb:458
+#: src/modules/Routing.rb:506
msgid "IP Forwarding for IPv4: %s"
msgstr "Перенаправление IP для IPv4: %s"
#. Summary text
-#: src/modules/Routing.rb:462
+#: src/modules/Routing.rb:510
msgid "IP Forwarding for IPv6: %s"
msgstr "Перенаправление IP для IPv6: %s"
@@ -4621,3 +4627,9 @@
#: src/modules/SuSEFirewall4Network.rb:139
msgid "(Unprotected)"
msgstr "(Не защищен)"
+
+#~ msgid "Genmask"
+#~ msgstr "Маска"
+
+#~ msgid "Ge&nmask"
+#~ msgstr "&Маска"
Modified: branches/SLE12-SP3/yast/ru/po/packager.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/packager.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/packager.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: packager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-29 02:28+0000\n"
+"POT-Creation-Date: 2017-04-29 02:28+0000\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -959,7 +959,7 @@
#. popup message part 1
#. Import GPG keys found in the inst-sys
#: src/include/packager/repositories_include.rb:287
-#: src/modules/Packages.rb:1206 src/modules/SourceManager.rb:306
+#: src/modules/Packages.rb:1209 src/modules/SourceManager.rb:306
msgid ""
"Unable to create repository\n"
"from URL '%1'."
@@ -1301,7 +1301,7 @@
#. popup message part 2 followed by other info
#. popup message, after message header, header of details
-#: src/lib/packager/clients/repositories.rb:1056 src/modules/Packages.rb:1211
+#: src/lib/packager/clients/repositories.rb:1056 src/modules/Packages.rb:1214
#: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310
msgid "Details:"
msgstr "Подробности:"
@@ -1309,7 +1309,7 @@
#. popup message part 3
#. end of popup message, question
#. end of popup message, question
-#: src/lib/packager/clients/repositories.rb:1058 src/modules/Packages.rb:1219
+#: src/lib/packager/clients/repositories.rb:1058 src/modules/Packages.rb:1222
#: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312
msgid "Try again?"
msgstr "Попытаться еще раз?"
@@ -1469,7 +1469,7 @@
#. adding the product to the list of products (BNC #269625)
#. no such products
#: src/modules/AddOnProduct.rb:1154 src/modules/AddOnProduct.rb:1748
-#: src/modules/AddOnProduct.rb:1754 src/modules/Packages.rb:461
+#: src/modules/AddOnProduct.rb:1754 src/modules/Packages.rb:464
msgid "Unknown Product"
msgstr "Неизвестный продукт"
@@ -1661,23 +1661,23 @@
msgstr "Применение обновления RPM: %1"
#. warning text
-#: src/modules/Packages.rb:301
+#: src/modules/Packages.rb:304
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:317
+#: src/modules/Packages.rb:320
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:329
+#: src/modules/Packages.rb:332
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:334
+#: src/modules/Packages.rb:337
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"
@@ -1686,112 +1686,112 @@
"загружены из удалённых (сетевых) репозиториев. Это значение важно при медленном соединении или при наличии ограничения на загрузку данных.</P>\n"
#. help text for software proposal - header
-#: src/modules/Packages.rb:343
+#: src/modules/Packages.rb:346
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:360
+#: src/modules/Packages.rb:363
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:374
+#: src/modules/Packages.rb:377
msgid "System Type: %1"
msgstr "Тип системы: %1"
-#: src/modules/Packages.rb:385
+#: src/modules/Packages.rb:388
msgid "Patterns:<br>"
msgstr "Шаблоны:<br>"
#. installation proposal - SW summary, %1 is size of the selected packages (in MB or GB)
-#: src/modules/Packages.rb:395
+#: src/modules/Packages.rb:398
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:408
+#: src/modules/Packages.rb:411
msgid "Downloading from Remote Repositories: %1"
msgstr "Загрузка из удалённых хранилищ: %1"
-#: src/modules/Packages.rb:470
+#: src/modules/Packages.rb:473
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:494
+#: src/modules/Packages.rb:497
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:498
+#: src/modules/Packages.rb:501
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:539
+#: src/modules/Packages.rb:542
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:559
+#: src/modules/Packages.rb:562
msgid "Warning: Cannot check free space in directory %1 (device %2)."
msgstr "Предупреждение: Невозможно проверить свободное место в каталоге %1 (устройство %2)."
#. summary warning
-#: src/modules/Packages.rb:602
+#: src/modules/Packages.rb:605
msgid "Not enough disk space."
msgstr "Недостаточно свободного места на диске."
#. summary warning
-#: src/modules/Packages.rb:604
+#: src/modules/Packages.rb:607
msgid "Not enough disk space. Remove some packages in the single selection."
msgstr "Недостаточно свободного места на диске. Удалите несколько пакетов в одном выборе."
#. add a backslash if it's missing
-#: src/modules/Packages.rb:625
+#: src/modules/Packages.rb:628
msgid "Only %1 (%2%%) free space available on partition %3.<BR>"
msgstr "На разделе %3 доступно только %1 (%2%%) свободного места.<BR>"
#. Check the YaST required packages.
-#: src/modules/Packages.rb:645
+#: src/modules/Packages.rb:648
msgid "Please manually select the needed items to install."
msgstr "Выберите вручную элементы, которые необходимо установить."
#. newly installed products
-#: src/modules/Packages.rb:707
+#: src/modules/Packages.rb:710
msgid "New product <b>%s</b> will be installed"
msgstr "Будет установлен новый продукт <b>%s</b>"
#. product update: %s is a product name
-#: src/modules/Packages.rb:717
+#: src/modules/Packages.rb:720
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:719
+#: src/modules/Packages.rb:722
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:726
+#: src/modules/Packages.rb:729
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:736
+#: src/modules/Packages.rb:739
msgid "<b>Warning:</b> Product <b>%s</b> will be removed."
msgstr "<b>Внимание!</b> Продукт <b>%s</b> будет удален."
-#: src/modules/Packages.rb:737
+#: src/modules/Packages.rb:740
msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed."
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:763
+#: src/modules/Packages.rb:766
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"
@@ -1808,12 +1808,12 @@
"</li></ul></li></ul>"
#. error in proposal, %1 is URL
-#: src/modules/Packages.rb:1227
+#: src/modules/Packages.rb:1230
msgid "No repository found at '%1'."
msgstr "Хранилище не найдено на '%1'."
#. TRANSLATORS: beginning of the rich text with the release notes
-#: src/modules/Packages.rb:1500
+#: src/modules/Packages.rb:1503
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"
@@ -1824,31 +1824,31 @@
"можете загрузить обновленные примечания к выпуску с веб-сервера SUSE Linux.</b></p>\n"
#. popup - information label
-#: src/modules/Packages.rb:1527
+#: src/modules/Packages.rb:1530
msgid "Integrating booted media..."
msgstr "Интеграция загруженных носителей…"
#. close the popup in order to be able to ask about the license
-#: src/modules/Packages.rb:1549
+#: src/modules/Packages.rb:1552
msgid "Failed to integrate the service pack repository."
msgstr "Не удалось интегрировать хранилище пакетов исправлений."
#. popup - information label
-#: src/modules/Packages.rb:1582
+#: src/modules/Packages.rb:1585
msgid "Initializing repositories..."
msgstr "Инициализация хранилищ..."
#. message popup, %1 is product name
-#: src/modules/Packages.rb:1814
+#: src/modules/Packages.rb:1825
msgid "Insert %1 CD 1"
msgstr "Вставьте %1 CD 1"
-#: src/modules/Packages.rb:1816
+#: src/modules/Packages.rb:1827
msgid "%1 CD 1 not found"
msgstr "Не удалось найти CD 1 %1"
#. an error message
-#: src/modules/Packages.rb:1926
+#: src/modules/Packages.rb:1937
msgid ""
"Error while initializing package descriptions.\n"
"Check the log file %1 for more details."
@@ -1857,7 +1857,7 @@
"См.журнал %1 для подробностей."
#. bnc #436925
-#: src/modules/Packages.rb:2198
+#: src/modules/Packages.rb:2209
msgid ""
"The software selection has been changed externally.\n"
"Software proposal will be called again."
@@ -1866,12 +1866,12 @@
"Предложение ПО будет вызвано ещё раз."
#. popup label
-#: src/modules/Packages.rb:2216
+#: src/modules/Packages.rb:2227
msgid "Evaluating package selection..."
msgstr "Проверка выбора пакетов..."
#. Error message, %{pattern_name} is replaced with the missing pattern name in runtime
-#: src/modules/Packages.rb:2559
+#: src/modules/Packages.rb:2570
msgid ""
"Failed to select default product pattern %{pattern_name}.\n"
"Pattern has not been found."
@@ -1880,18 +1880,18 @@
"Шаблон не найден."
#. TRANSLATORS: %s is a package list
-#: src/modules/Packages.rb:2732
+#: src/modules/Packages.rb:2743
msgid "These packages need to be selected to install: %s"
msgstr "Эти пакеты необходимо выбрать для установки: %s"
#. TRANSLATORS: %s is a pattern list
-#: src/modules/Packages.rb:2735
+#: src/modules/Packages.rb:2746
msgid "These patterns need to be selected to install: %s"
msgstr "Эти шаблоны необходимо выбрать для установки: %s"
#. TRANSLATORS: %{type} is a resolvable type, %{list} is a list of names
#. This is a fallback message for unknown types, normally it should not be displayed
-#: src/modules/Packages.rb:2739
+#: src/modules/Packages.rb:2750
msgid "These items (%{type}) need to be selected to install: %{list}"
msgstr "Эти элементы (%{type}) необходимо выбрать для установки: %{list}"
Modified: branches/SLE12-SP3/yast/ru/po/registration.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/registration.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/registration.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: registration\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-20 17:12+0200\n"
+"POT-Creation-Date: 2017-05-17 17:46+0200\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -18,7 +18,7 @@
#. popup message
#. popup message
#. popup message
-#: src/clients/inst_scc.rb:54 src/clients/scc_auto.rb:49
+#: src/clients/inst_scc.rb:53 src/clients/scc_auto.rb:49
#: src/lib/registration/registration_ui.rb:40
msgid "Contacting the Registration Server"
msgstr "Связь с сервером регистрации"
@@ -31,10 +31,10 @@
#. dialog title
#. display and run a dialog for updating the current registration
#. @return [Symbol] user input
-#: src/clients/inst_scc.rb:189
+#: src/clients/inst_scc.rb:183
#: src/lib/registration/ui/autoyast_config_dialog.rb:104
#: src/lib/registration/ui/base_system_registration_dialog.rb:61
-#: src/lib/registration/ui/migration_repos_workflow.rb:287
+#: src/lib/registration/ui/migration_repos_workflow.rb:317
#: src/lib/registration/ui/registered_system_dialog.rb:37
#: src/lib/registration/ui/registration_update_dialog.rb:41
msgid "Registration"
@@ -75,8 +75,8 @@
#. %s is name of given product
#. then register the product(s)
#. %s is name of given product
-#: src/clients/scc_auto.rb:329 src/lib/registration/registration_ui.rb:286
-#: src/lib/registration/registration_ui.rb:319
+#: src/clients/scc_auto.rb:329 src/lib/registration/registration_ui.rb:317
+#: src/lib/registration/registration_ui.rb:350
msgid "Registering %s ..."
msgstr "Регистрация %s ..."
@@ -336,7 +336,7 @@
#. FIXME: use a better message, this one has been reused after the text freeze
#. error message, the entered URL is not valid.
#: src/lib/registration/connect_helpers.rb:295
-#: src/lib/registration/ui/base_system_registration_dialog.rb:544
+#: src/lib/registration/ui/base_system_registration_dialog.rb:537
msgid "Invalid URL."
msgstr "Недопустимый URL-адрес."
@@ -387,7 +387,7 @@
#. 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:80
-#: src/lib/registration/registration_ui.rb:272
+#: src/lib/registration/registration_ui.rb:303
msgid "Registering the System..."
msgstr "Регистрация системы..."
@@ -397,8 +397,8 @@
#. TRANSLATORS: Progress label
#: src/lib/registration/registration_ui.rb:106
#: src/lib/registration/registration_ui.rb:149
-#: src/lib/registration/registration_ui.rb:357
-#: src/lib/registration/ui/migration_repos_workflow.rb:304
+#: src/lib/registration/registration_ui.rb:388
+#: src/lib/registration/ui/migration_repos_workflow.rb:334
msgid "Updating to %s ..."
msgstr "Обновление до %s..."
@@ -460,6 +460,20 @@
"Вы хотите включить эти репозитории во время перехода на новую версию,\n"
"чтобы получить последние обновления?"
+#. TRANSLATORS: Popup question, add registered but not installed addons to
+#. the list of products that will be downgraded.
+#. %s are all the product names splited by '\n' e.g
+#. "SUSE Linux Enterprise Server 12\nSUSE Enterprise Storage 1 x86_64"
+#: src/lib/registration/registration_ui.rb:284
+msgid ""
+"The addons listed below are registered but not installed: \n"
+"\n"
+"%s\n"
+"\n"
+"Would you like to downgrade also them in the registration server? \n"
+"If not they will be deactivated. "
+msgstr ""
+
#. indent size used in summary text
#: src/lib/registration/ssl_certificate_details.rb:34
msgid "Certificate:"
@@ -593,38 +607,40 @@
#. create the main dialog definition
#. @return [Yast::Term] the main UI dialog term
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:97
-msgid "&Filter Out Beta Versions"
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:105
+#, fuzzy
+#| msgid "&Filter Out Beta Versions"
+msgid "&Hide Beta Versions"
msgstr "&Исключать бета-версии"
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:99
-msgid "Details"
-msgstr "Подробности"
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:108
+msgid "Details (English only)"
+msgstr ""
#. addon description widget
#. @return [Yast::Term] the addon details widget
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:109
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:117
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:122
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:130
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:261
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:269
msgid "YaST allows to select at most %s extensions or modules."
msgstr "YaST позволяет выбрать максимум столько расширений и модулей: %s."
#. help text (2/3)
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:272
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:280
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_base_dialog.rb:275
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:283
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>"
@@ -643,21 +659,6 @@
msgid "Available Extensions and Modules"
msgstr "Доступные расширения и модули"
-#. dialog title
-#: src/lib/registration/ui/addon_selection_reregistration_dialog.rb:37
-msgid "Extension and Module Re-registration"
-msgstr "Повторная регистрация расширений и модулей"
-
-#. help text (1/3)
-#: src/lib/registration/ui/addon_selection_reregistration_dialog.rb:40
-msgid "<p>Here you can select extensions and modules which will be registered again.</p>"
-msgstr "<p>Здесь можно выбрать расширения и модули, которые будут зарегистрированы повторно.</p>"
-
-#. @return [String] the main dialog label
-#: src/lib/registration/ui/addon_selection_reregistration_dialog.rb:54
-msgid "Registered Extensions and Modules"
-msgstr "Зарегистрированные расширения и модули"
-
#. help text
#: 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>"
@@ -720,7 +721,7 @@
#. handle nil specifically, it cannot be stored in XML profile
#: src/lib/registration/ui/autoyast_addon_dialog.rb:190
#: src/lib/registration/ui/autoyast_config_dialog.rb:108
-#: src/lib/registration/ui/base_system_registration_dialog.rb:266
+#: src/lib/registration/ui/base_system_registration_dialog.rb:269
msgid "Registration &Code"
msgstr "Регистрационный &код"
@@ -751,7 +752,7 @@
msgstr "Зарегистрировать продукт"
#: src/lib/registration/ui/autoyast_config_dialog.rb:106
-#: src/lib/registration/ui/base_system_registration_dialog.rb:263
+#: src/lib/registration/ui/base_system_registration_dialog.rb:266
msgid "&E-mail Address"
msgstr "&Адрес электронной почты"
@@ -798,49 +799,54 @@
msgid "Register Extensions or Modules..."
msgstr "Регистрация расширений или модулей..."
+#. TRANSLATORS: Wrong url for registration provided, %s is an URL.
+#: src/lib/registration/ui/base_system_registration_dialog.rb:232
+msgid ""
+"The registration URL provided by the command line is not valid.\n"
+"\n"
+"URL: %s\n"
+"\n"
+"The default one will be used instead."
+msgstr ""
+
#. TRANSLATORS: radio button; %s is a host name.
-#: src/lib/registration/ui/base_system_registration_dialog.rb:254
+#: src/lib/registration/ui/base_system_registration_dialog.rb:257
msgid "Register System via %s"
msgstr "Зарегистрировать систему через %s"
#. TRANSLATORS: radio button
-#: src/lib/registration/ui/base_system_registration_dialog.rb:297
+#: src/lib/registration/ui/base_system_registration_dialog.rb:300
msgid "Register System via local SMT Server"
msgstr "Зарегистрировать систему через локальный сервер SMT"
-#: src/lib/registration/ui/base_system_registration_dialog.rb:308
+#: src/lib/registration/ui/base_system_registration_dialog.rb:311
msgid "&Local Registration Server URL"
msgstr "&URL-адрес локального сервера регистрации"
-#: src/lib/registration/ui/base_system_registration_dialog.rb:322
+#: src/lib/registration/ui/base_system_registration_dialog.rb:325
msgid "&Skip Registration"
msgstr "&Пропустить регистрацию"
-#. display the addon re-registration button only in registered installed system
-#: src/lib/registration/ui/base_system_registration_dialog.rb:334
-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:342
+#: src/lib/registration/ui/base_system_registration_dialog.rb:335
#: src/lib/registration/ui/registered_system_dialog.rb:67
msgid "The system is already registered."
msgstr "Система уже зарегистрирована."
-#: src/lib/registration/ui/base_system_registration_dialog.rb:344
+#: src/lib/registration/ui/base_system_registration_dialog.rb:337
msgid "Please select your preferred method of registration."
msgstr "Выберите способ регистрации."
#. help text
-#: src/lib/registration/ui/base_system_registration_dialog.rb:360
+#: src/lib/registration/ui/base_system_registration_dialog.rb:353
msgid "Enter SUSE Customer Center credentials here to register the system to get updates and extensions."
msgstr "Введите здесь учетные данные центра по работе с клиентами SUSE, чтобы зарегистрировать систему и получать обновления и расширения."
#. Popup question: confirm skipping the registration
-#: src/lib/registration/ui/base_system_registration_dialog.rb:369
+#: src/lib/registration/ui/base_system_registration_dialog.rb:362
msgid ""
"If you do not register your system we will not be able\n"
"to grant you access to the update repositories.\n"
@@ -856,7 +862,7 @@
#. 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:381
+#: src/lib/registration/ui/base_system_registration_dialog.rb:374
msgid "Net&work Configuration..."
msgstr "Конфигурация &сети..."
@@ -954,7 +960,7 @@
#. TRANSLATORS: a popup message with [Continue] [Cancel] buttons,
#. pressing [Continue] starts the registration module, [Cancel] aborts
#. the online migration
-#: src/lib/registration/ui/migration_repos_workflow.rb:145
+#: src/lib/registration/ui/migration_repos_workflow.rb:154
msgid ""
"The system is not registered,\n"
"to run the online migration you need\n"
@@ -965,17 +971,28 @@
"сначала зарегистрируйте систему."
#. TRANSLATORS: Error message
-#: src/lib/registration/ui/migration_repos_workflow.rb:183
+#: src/lib/registration/ui/migration_repos_workflow.rb:198
msgid "No installed product found."
msgstr "Не обнаружено установленных продуктов."
+#. TRANSLATORS: Popup question, merge this addon that are registered but not
+#. installed to the current migration products list.
+#. %s is an addon friendly name, e.g 'SUSE Enterprise Storage 2 x86_64'
+#: src/lib/registration/ui/migration_repos_workflow.rb:219
+msgid ""
+"The '%s' extension is registered but not installed.\n"
+"If you accept it will be added for be installed, in other case it will be unregistered at the end of the migration.\n"
+"\n"
+"Do you want to add it?"
+msgstr ""
+
#. TRANSLATORS: Error message
-#: src/lib/registration/ui/migration_repos_workflow.rb:212
+#: src/lib/registration/ui/migration_repos_workflow.rb:242
msgid "No migration product found."
msgstr "Не обнаружено продуктов для миграции."
#. TRANSLATORS: progress message
-#: src/lib/registration/ui/migration_repos_workflow.rb:289
+#: src/lib/registration/ui/migration_repos_workflow.rb:319
msgid "Preparing Migration Repositories..."
msgstr "Подготовка репозиториев для миграции..."
@@ -1019,48 +1036,54 @@
msgstr "Возможные цели для миграции"
#. TRANSLATORS: RichText header (details for the selected item)
-#: src/lib/registration/ui/migration_selection_dialog.rb:189
+#: src/lib/registration/ui/migration_selection_dialog.rb:199
msgid "Migration Summary"
msgstr "Сводка миграции"
+#. TRANSLATORS: Summary message in 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:211
+msgid "The registration server does not offer migrations for Product <b>%s</b> so it will <b>stay unchanged</b>. We recommend you to check if it's correct and to configure the repositories manually in case of needed."
+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
+#: src/lib/registration/ui/migration_selection_dialog.rb:234
msgid "ERROR: Product <b>%{product}</b> is not available at the registration server (%{url}). Make the product available to allow using this migration."
msgstr "Ошибка. Продукт <b>%{product}</b> недоступен на сервере регистрации (%{url}). Убедитесь, что он доступен, чтобы разрешить эту миграцию."
#. 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:224
+#: src/lib/registration/ui/migration_selection_dialog.rb:246
msgid "%s <b>will be installed.</b>"
msgstr "%s <b>будет установлен.</b>"
#. 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:241
+#: src/lib/registration/ui/migration_selection_dialog.rb:263
msgid "%s <b>stays unchanged.</b>"
msgstr "%s <b>останется без изменений.</b>"
#. 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:251
+#: src/lib/registration/ui/migration_selection_dialog.rb:273
msgid "%{old_product} <b>will be upgraded to</b> %{new_product}."
msgstr "%{old_product} <b>будет обновлен до продукта</b> %{new_product}."
#. TRANSLATORS: Summary message, rich text format
#. %{old_product} and %{new_product} are product names
-#: src/lib/registration/ui/migration_selection_dialog.rb:256
+#: src/lib/registration/ui/migration_selection_dialog.rb:278
msgid "%{old_product} <b>will be downgraded to</b> %{new_product}."
msgstr "%{old_product} <b>будет заменен на старую версию</b> %{new_product}."
#. TRANSLATORS: an error popup message
-#: src/lib/registration/ui/migration_selection_dialog.rb:289
+#: src/lib/registration/ui/migration_selection_dialog.rb:311
msgid ""
"The selected migration contains a product\n"
"which is not available at the registration server.\n"
@@ -1074,6 +1097,57 @@
"Выберите другое целевое расположение миграции или убедитесь, что отсутствующие продукты\n"
"доступны на сервере регистрации."
+#. this class displays and runs the dialog which check all the installed
+#. but not registered products warning the user about it and allowing him
+#. to take some actions over them.
+#: src/lib/registration/ui/not_installed_products_dialog.rb:45
+#, fuzzy
+#| msgid "Checking status..."
+msgid "Checking registration status"
+msgstr "Проверка состояния..."
+
+#. FIXME: Maybe we could remove this option and just warn the user
+#: src/lib/registration/ui/not_installed_products_dialog.rb:85
+#, fuzzy
+#| msgid "Installed Add-on Products"
+msgid "Ins&tall products"
+msgstr "Установленные дополнительные продукты"
+
+#: src/lib/registration/ui/not_installed_products_dialog.rb:86
+msgid "&Deactivate"
+msgstr "&Деактивировать"
+
+#: src/lib/registration/ui/not_installed_products_dialog.rb:87
+msgid "Continue"
+msgstr "Продолжить"
+
+#. TRANSLATORS: Popup error showing all the addons that weren't
+#. installed, %s is the addons identifiers.
+#: src/lib/registration/ui/not_installed_products_dialog.rb:102
+#, fuzzy
+#| msgid ""
+#| "These sources were not found:\n"
+#| "%1"
+msgid ""
+"These addons were not installed:\n"
+"\n"
+"%s"
+msgstr ""
+"Эти источники не были найдены:\n"
+"%1"
+
+#. TRANSLATORS: A RichText warning about all the products registered but
+#. not installed. (1/2)
+#: src/lib/registration/ui/not_installed_products_dialog.rb:153
+msgid "<p>The addons listed below are registered but not installed: </p>"
+msgstr ""
+
+#. TRANSLATORS: A RichText warning about all the products registered but
+#. not installed. (2/2)
+#: src/lib/registration/ui/not_installed_products_dialog.rb:159
+msgid "<p>It's preferable to <b>deactivate</b> your products at your registration server if you don't plan to use them anymore.</p>"
+msgstr ""
+
#. help text
#: src/lib/registration/ui/registered_system_dialog.rb:40
msgid "<p>The system is already registered.</p>"
@@ -1153,25 +1227,66 @@
msgid "Looking up local registration servers..."
msgstr "Поиск локальных регистрационных серверов..."
-#. Constructor
+#. encoding: utf-8
+#. ------------------------------------------------------------------------------
+#. Copyright (c) 2017 SUSE LLC
#.
-#. @param services [ArraySlpServiceClass::Service] list of services to show
-#. @param heading [String] Dialog's heading. If nil (or not specified), a default
-#. heading will be used).
-#. @param description [String] Dialog's description (to be shown on top of the list).
-#. If nil (or not specified) a default description will be used.
-#. @param no_selected_msg [String] Message to be shown when no service was selected
-#. If nil (or not specified) a default description will be used.
-#. @param initial [SlpServiceClass::Service] initially selected service. If nil
-#. (or not specified) the first service will be used.
-#: src/lib/slp/dialogs/service_selection.rb:78
-msgid "Service selection"
-msgstr "Выбор сервиса"
+#.
+#. This program is free software; you can redistribute it and/or modify it under
+#. the terms of version 2 of the GNU General Public License as published by the
+#. Free Software Foundation.
+#.
+#. This program is distributed in the hope that it will be useful, but WITHOUT
+#. ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#. FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#.
+#. You should have received a copy of the GNU General Public License along with
+#. this program; if not, contact SUSE.
+#.
+#. To contact SUSE about this file by physical or electronic mail, you may find
+#. current contact information at www.suse.com.
+#. ------------------------------------------------------------------------------
+#: src/lib/registration/widgets/registration_code.rb:38
+#, fuzzy
+#| msgid "&Local Registration Server URL"
+msgid "Registration Code or SMT Server URL"
+msgstr "&URL-адрес локального сервера регистрации"
-#: src/lib/slp/dialogs/service_selection.rb:79
-msgid "Select a detected service from the list."
-msgstr "Выберать обнаруженный сервис из списка."
+#. Error reports and logs about the registration are mostly handled
+#. by ConnectHelpers.catch_registration_errors and used by instances
+#. of RegistrationUI.
+#: src/lib/registration/widgets/registration_code.rb:92
+#, fuzzy
+#| msgid "Not a valid umask."
+msgid "Not valid url."
+msgstr "Неверная сетевая маска."
-#: src/lib/slp/dialogs/service_selection.rb:80
-msgid "No service was selected."
-msgstr "Сервис не выбран."
+#: src/lib/registration/widgets/registration_code.rb:96
+msgid ""
+"<p>\n"
+"The SMT Server URL must use http or https protocol, other schemes are not supported.</p>\n"
+msgstr ""
+
+#~ msgid "Details"
+#~ msgstr "Подробности"
+
+#~ msgid "Extension and Module Re-registration"
+#~ msgstr "Повторная регистрация расширений и модулей"
+
+#~ msgid "<p>Here you can select extensions and modules which will be registered again.</p>"
+#~ msgstr "<p>Здесь можно выбрать расширения и модули, которые будут зарегистрированы повторно.</p>"
+
+#~ msgid "Registered Extensions and Modules"
+#~ msgstr "Зарегистрированные расширения и модули"
+
+#~ msgid "&Register Extensions or Modules Again"
+#~ msgstr "Повторно &зарегистрировать расширения и модули"
+
+#~ msgid "Service selection"
+#~ msgstr "Выбор сервиса"
+
+#~ msgid "Select a detected service from the list."
+#~ msgstr "Выберать обнаруженный сервис из списка."
+
+#~ msgid "No service was selected."
+#~ msgstr "Сервис не выбран."
Modified: branches/SLE12-SP3/yast/ru/po/reipl.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/reipl.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/reipl.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: reipl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-07 01:29+0000\n"
+"POT-Creation-Date: 2017-04-11 02:29+0000\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -15,63 +15,10 @@
"Content-Transfer-Encoding: 8bit\n"
#. Command line help text for the Xreipl module
-#: src/clients/reipl.rb:53
+#: src/clients/reipl.rb:52
msgid "Configuration of reipl"
msgstr "Конфигурация Reipl"
-#. TRANSLATORS: part of a shutdown message
-#. %1 is replaced with a device name
-#. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:69
-msgid ""
-"\n"
-"After shutdown, reload the system\n"
-"with an IPL from device '%1'.\n"
-msgstr ""
-"\n"
-"После выключения питания перезагрузите систему\n"
-"с IPL с устройства \"%1\".\n"
-
-#. TRANSLATORS: part of a shutdown message
-#. %1 is replaced with a FCP name
-#. %2 is replaced with a WWPN name
-#. %3 is replaced with a LUN name
-#. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:88
-msgid ""
-"\n"
-"After shutdown, reload the system\n"
-"with an IPL from FCP '%1'\n"
-"with WWPN '%2'\n"
-"and LUN '%3'.\n"
-msgstr ""
-"\n"
-"После выключения питания перезагрузите систему\n"
-"с IPL из FCP \"%1\" с WWPN \"%2\"\n"
-"и LUN \"%3\".\n"
-
-#: src/clients/reipl_bootloader_finish.rb:102
-msgid ""
-"\n"
-"After shutdown, reload the system \n"
-"with an IPL from the device \n"
-"that contains /boot"
-msgstr ""
-"\n"
-"После выключения перезагрузите систему\n"
-"с IPL устройства,\n"
-"содержащего /boot"
-
-#. Rich text title for Reipl in proposals
-#: src/clients/reipl_proposal.rb:81
-msgid "Reipl"
-msgstr "Reipl"
-
-#. Menu title for Reipl in proposals
-#: src/clients/reipl_proposal.rb:85
-msgid "&Reipl"
-msgstr "&Reipl"
-
#. Reipl configure dialog caption
#. Initialization dialog caption
#: src/include/reipl/dialogs.rb:59 src/include/reipl/wizards.rb:100
@@ -278,32 +225,61 @@
msgid "Initializing..."
msgstr "Инициализация..."
-#. Create a textual summary and a list of unconfigured cards
-#. @return summary of the current configuration
-#: src/modules/Reipl.rb:323
-msgid "Configured reipl methods"
-msgstr "Настроенные методы Reipl"
+#~ msgid ""
+#~ "\n"
+#~ "After shutdown, reload the system\n"
+#~ "with an IPL from device '%1'.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "После выключения питания перезагрузите систему\n"
+#~ "с IPL с устройства \"%1\".\n"
-#: src/modules/Reipl.rb:330
-msgid "The method ccw is configured and being used."
-msgstr "Метод CCW настроен и используется."
+#~ msgid ""
+#~ "\n"
+#~ "After shutdown, reload the system\n"
+#~ "with an IPL from FCP '%1'\n"
+#~ "with WWPN '%2'\n"
+#~ "and LUN '%3'.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "После выключения питания перезагрузите систему\n"
+#~ "с IPL из FCP \"%1\" с WWPN \"%2\"\n"
+#~ "и LUN \"%3\".\n"
-#: src/modules/Reipl.rb:332
-msgid "The method ccw is configured."
-msgstr "Метод CCW настроен."
+#~ msgid ""
+#~ "\n"
+#~ "After shutdown, reload the system \n"
+#~ "with an IPL from the device \n"
+#~ "that contains /boot"
+#~ msgstr ""
+#~ "\n"
+#~ "После выключения перезагрузите систему\n"
+#~ "с IPL устройства,\n"
+#~ "содержащего /boot"
-#: src/modules/Reipl.rb:335
-msgid "The method ccw is not supported."
-msgstr "Метод CCW не поддерживается."
+#~ msgid "Reipl"
+#~ msgstr "Reipl"
-#: src/modules/Reipl.rb:343
-msgid "The method fcp is configured and being used."
-msgstr "Метод FCP настроен и используется."
+#~ msgid "&Reipl"
+#~ msgstr "&Reipl"
-#: src/modules/Reipl.rb:345
-msgid "The method fcp is configured."
-msgstr "Метод FCP настроен."
+#~ msgid "Configured reipl methods"
+#~ msgstr "Настроенные методы Reipl"
-#: src/modules/Reipl.rb:348
-msgid "The method fcp is not supported."
-msgstr "Метод FCP не поддерживается."
+#~ msgid "The method ccw is configured and being used."
+#~ msgstr "Метод CCW настроен и используется."
+
+#~ msgid "The method ccw is configured."
+#~ msgstr "Метод CCW настроен."
+
+#~ msgid "The method ccw is not supported."
+#~ msgstr "Метод CCW не поддерживается."
+
+#~ msgid "The method fcp is configured and being used."
+#~ msgstr "Метод FCP настроен и используется."
+
+#~ msgid "The method fcp is configured."
+#~ msgstr "Метод FCP настроен."
+
+#~ msgid "The method fcp is not supported."
+#~ msgstr "Метод FCP не поддерживается."
Modified: branches/SLE12-SP3/yast/ru/po/rpm-groups.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/rpm-groups.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/rpm-groups.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: rpm-groups\n"
"Report-Msgid-Bugs-To: bugzilla.opensuse.org\n"
-"POT-Creation-Date: 2016-10-09 12:27+0300\n"
+"POT-Creation-Date: 2017-05-15 17:26+0200\n"
"PO-Revision-Date: 2017-04-18 14:14\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -71,6 +71,9 @@
msgid "Building"
msgstr "Идет сборка"
+msgid "C++"
+msgstr ""
+
msgid "CAD"
msgstr "САПР"
@@ -116,9 +119,6 @@
msgid "Convertors"
msgstr "Конвертеры"
-msgid "Daemon"
-msgstr "Демон"
-
msgid "Daemons"
msgstr "Демоны"
@@ -320,9 +320,6 @@
msgid "LXDE"
msgstr "LXDE"
-msgid "LXDE-Qt"
-msgstr "LXDE-Qt"
-
msgid "LXQt"
msgstr "LXQt"
@@ -356,6 +353,11 @@
msgid "Modem"
msgstr "Модем"
+#, fuzzy
+#| msgid "Monitoring"
+msgid "monitoring"
+msgstr "Контроль"
+
msgid "Monitoring"
msgstr "Контроль"
@@ -569,9 +571,6 @@
msgid "Terminals"
msgstr "Терминалы"
-msgid "Tests"
-msgstr "Тесты"
-
msgid "TeX"
msgstr "TeX"
@@ -655,3 +654,12 @@
msgid "YaST"
msgstr "YaST"
+
+#~ msgid "Daemon"
+#~ msgstr "Демон"
+
+#~ msgid "LXDE-Qt"
+#~ msgstr "LXDE-Qt"
+
+#~ msgid "Tests"
+#~ msgstr "Тесты"
Modified: branches/SLE12-SP3/yast/ru/po/s390.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/s390.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/s390.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: s390\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-31 17:53+0200\n"
+"POT-Creation-Date: 2017-05-16 19:52+0200\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -30,7 +30,7 @@
msgstr "DASD"
#. section name in proposal - menu item
-#: src/clients/dasd_proposal.rb:73 src/include/s390/dump/ui.rb:110
+#: src/clients/dasd_proposal.rb:73 src/include/s390/dump/ui.rb:111
msgid "&DASD"
msgstr "&DASD"
@@ -60,24 +60,24 @@
msgstr "Определение доступных контроллеров"
#. Initialization dialog caption
-#: src/clients/s390-disk-controller.rb:72
+#: src/clients/s390-disk-controller.rb:71
msgid "S/390 Disk Controller Configuration"
msgstr "Настройка контроллера диска S/390"
#. push button
-#: src/clients/s390-disk-controller.rb:84
+#: src/clients/s390-disk-controller.rb:83
msgid "Configure &DASD Disks"
msgstr "Настроить &DASD диски"
#. push button
-#: src/clients/s390-disk-controller.rb:94
+#: src/clients/s390-disk-controller.rb:93
msgid "Configure &ZFCP Disks"
msgstr "Настроить &ZFCP диски"
#. 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:101 src/include/s390/dasd/wizards.rb:97
+#: src/include/s390/zfcp/wizards.rb:96
msgid "Initializing..."
msgstr "Инициализация..."
@@ -102,82 +102,82 @@
msgstr "&zFCP"
#. menu button id
-#: src/include/s390/dasd/dialogs.rb:170
+#: src/include/s390/dasd/dialogs.rb:165
msgid "&Activate"
msgstr "&Активировать"
#. menu button id
-#: src/include/s390/dasd/dialogs.rb:172
+#: src/include/s390/dasd/dialogs.rb:167
msgid "&Deactivate"
msgstr "&Деактивировать"
#. menu button id
#. menu button id
-#: src/include/s390/dasd/dialogs.rb:174 src/include/s390/dasd/dialogs.rb:183
+#: src/include/s390/dasd/dialogs.rb:169 src/include/s390/dasd/dialogs.rb:178
msgid "Set DIAG O&n"
msgstr "В&кл. DIAG"
#. menu button id
#. menu button id
-#: src/include/s390/dasd/dialogs.rb:176 src/include/s390/dasd/dialogs.rb:185
+#: src/include/s390/dasd/dialogs.rb:171 src/include/s390/dasd/dialogs.rb:180
msgid "Set DIAG O&ff"
msgstr "В&ыкл. DIAG"
#. menu button id
-#: src/include/s390/dasd/dialogs.rb:178
+#: src/include/s390/dasd/dialogs.rb:173
msgid "&Format"
msgstr "&Форматировать"
#. menu button id
-#: src/include/s390/dasd/dialogs.rb:187
+#: src/include/s390/dasd/dialogs.rb:182
msgid "Set Format On"
msgstr "Форматировать"
#. menu button id
-#: src/include/s390/dasd/dialogs.rb:189
+#: src/include/s390/dasd/dialogs.rb:184
msgid "Set Format Off"
msgstr "Не форматировать"
#. integer field (count of disks formatted parallel)
-#: src/include/s390/dasd/dialogs.rb:201
+#: src/include/s390/dasd/dialogs.rb:194
msgid "&Parallel Formatted Disks"
msgstr "&Диски форматируемые параллельно"
#. 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:477
+#: src/include/s390/dasd/dialogs.rb:216 src/include/s390/dasd/dialogs.rb:673
+#: src/include/s390/zfcp/dialogs.rb:465
msgid "No disk selected."
msgstr "Не выбран диск."
#. 8 means disk is not formatted
#. unformtted disk, manual (not AutoYaST)
-#: src/include/s390/dasd/dialogs.rb:254 src/modules/DASDController.rb:160
+#: src/include/s390/dasd/dialogs.rb:243 src/modules/DASDController.rb:149
msgid "Device %1 is not formatted. Format device now?"
msgstr "Устройство %1 не отформатировано. Отформатировать его?"
-#: src/include/s390/dasd/dialogs.rb:256 src/modules/DASDController.rb:162
+#: src/include/s390/dasd/dialogs.rb:246 src/modules/DASDController.rb:152
msgid "There are %1 unformatted devices. Format them now?"
msgstr "Неотформатированных устройств: %1 . Отформатировать их?"
#. for autoinst, format unformatted disks later
-#: src/include/s390/dasd/dialogs.rb:267
+#: src/include/s390/dasd/dialogs.rb:258
msgid "Couldn't find device for channel %1."
msgstr "Не удалось найти устройство для канала %1."
#. error report, %1 is device identification
-#: src/include/s390/dasd/dialogs.rb:321
+#: src/include/s390/dasd/dialogs.rb:312
msgid "Disk %1 is not active."
msgstr "Диск %1 не активен."
#. error report, %1 is device identification
-#: src/include/s390/dasd/dialogs.rb:327
+#: src/include/s390/dasd/dialogs.rb:318
msgid "Disk %1 is not accessible for writing."
msgstr "Диск %1 недоступен для записи."
#. popup question
-#: src/include/s390/dasd/dialogs.rb:353
+#: src/include/s390/dasd/dialogs.rb:342
msgid ""
"Formatting these disks destroys all data on them.<br>\n"
"Really format the following disks?<br>\n"
@@ -188,7 +188,7 @@
"%1"
#. Dialog caption
-#: src/include/s390/dasd/dialogs.rb:416
+#: src/include/s390/dasd/dialogs.rb:404
msgid "DASD Disk Management"
msgstr "Управление дисками DASD"
@@ -196,111 +196,111 @@
#. table header
#. table header
#. table header
-#: src/include/s390/dasd/dialogs.rb:423 src/include/s390/dasd/dialogs.rb:432
-#: src/include/s390/zfcp/dialogs.rb:120 src/include/s390/zfcp/dialogs.rb:129
+#: src/include/s390/dasd/dialogs.rb:411 src/include/s390/dasd/dialogs.rb:420
+#: src/include/s390/zfcp/dialogs.rb:116 src/include/s390/zfcp/dialogs.rb:125
msgid "Channel ID"
msgstr "ИД канала"
#. table header
-#: src/include/s390/dasd/dialogs.rb:425
+#: src/include/s390/dasd/dialogs.rb:413
msgid "Format"
msgstr "Форматировать"
#. table header
#. table header
-#: src/include/s390/dasd/dialogs.rb:427 src/include/s390/dasd/dialogs.rb:440
+#: src/include/s390/dasd/dialogs.rb:415 src/include/s390/dasd/dialogs.rb:428
msgid "Use DIAG"
msgstr "Использовать DIAG"
#. table header
#. table header
-#: src/include/s390/dasd/dialogs.rb:434 src/include/s390/zfcp/dialogs.rb:135
+#: src/include/s390/dasd/dialogs.rb:422 src/include/s390/zfcp/dialogs.rb:131
msgid "Device"
msgstr "Устройство"
#. table header
#. table header
-#: src/include/s390/dasd/dialogs.rb:436
+#: src/include/s390/dasd/dialogs.rb:424
#: src/include/s390/iucvterminal-server/ui.rb:242
msgid "Type"
msgstr "Тип"
#. table header
-#: src/include/s390/dasd/dialogs.rb:438
+#: src/include/s390/dasd/dialogs.rb:426
msgid "Access Type"
msgstr "Тип доступа"
#. table header
-#: src/include/s390/dasd/dialogs.rb:442
+#: src/include/s390/dasd/dialogs.rb:430
msgid "Formatted"
msgstr "Отформатированный"
#. table header
-#: src/include/s390/dasd/dialogs.rb:444
+#: src/include/s390/dasd/dialogs.rb:432
msgid "Partition Information"
msgstr "Сведения о использовании разделов"
#. text entry
#. text entry
-#: src/include/s390/dasd/dialogs.rb:455 src/include/s390/zfcp/dialogs.rb:146
+#: src/include/s390/dasd/dialogs.rb:443 src/include/s390/zfcp/dialogs.rb:142
msgid "Mi&nimum Channel ID"
msgstr "Ми&нимальный ID канала"
#. text entry
#. text entry
-#: src/include/s390/dasd/dialogs.rb:462 src/include/s390/zfcp/dialogs.rb:153
+#: src/include/s390/dasd/dialogs.rb:450 src/include/s390/zfcp/dialogs.rb:149
msgid "Ma&ximum Channel ID"
msgstr "М&аксимальный ID канала"
#. push button
#. push button
-#: src/include/s390/dasd/dialogs.rb:468 src/include/s390/zfcp/dialogs.rb:159
+#: src/include/s390/dasd/dialogs.rb:456 src/include/s390/zfcp/dialogs.rb:155
msgid "&Filter"
msgstr "&Фильтр"
#. menu button
#. menu button
-#: src/include/s390/dasd/dialogs.rb:478 src/include/s390/dasd/dialogs.rb:485
+#: src/include/s390/dasd/dialogs.rb:466 src/include/s390/dasd/dialogs.rb:474
msgid "Perform &Action"
msgstr "Выполнить действие"
-#: src/include/s390/dasd/dialogs.rb:481
+#: src/include/s390/dasd/dialogs.rb:470
msgid "&Select All"
msgstr "Выбрать &все"
-#: src/include/s390/dasd/dialogs.rb:482
+#: src/include/s390/dasd/dialogs.rb:471
msgid "&Deselect All"
msgstr "&Отменить выбор всего"
#. error popup
#. error popup
-#: src/include/s390/dasd/dialogs.rb:553 src/include/s390/zfcp/dialogs.rb:221
+#: src/include/s390/dasd/dialogs.rb:541 src/include/s390/zfcp/dialogs.rb:215
msgid "Invalid filter channel IDs."
msgstr "Неверный фильтр ID каналов."
#. Dialog caption
-#: src/include/s390/dasd/dialogs.rb:597
+#: src/include/s390/dasd/dialogs.rb:584
msgid "Add New DASD Disk"
msgstr "Добавить новый диск DASD"
#. text entry
#. combo box
-#: src/include/s390/dasd/dialogs.rb:608 src/include/s390/zfcp/dialogs.rb:301
+#: src/include/s390/dasd/dialogs.rb:595 src/include/s390/zfcp/dialogs.rb:294
msgid "&Channel ID"
msgstr "&ИД канала"
#. check box
-#: src/include/s390/dasd/dialogs.rb:612
+#: src/include/s390/dasd/dialogs.rb:599
msgid "Format the Disk"
msgstr "Форматировать диск"
#. check box
-#: src/include/s390/dasd/dialogs.rb:615
+#: src/include/s390/dasd/dialogs.rb:602
msgid "Use &DIAG"
msgstr "Использовать &DIAG"
#. yes-no popup
-#: src/include/s390/dasd/dialogs.rb:637
+#: src/include/s390/dasd/dialogs.rb:624
msgid ""
"Really leave the DASD disk configuration without saving?\n"
"All changes will be lost."
@@ -312,14 +312,14 @@
#. error popup
#. error popup
#. error popup
-#: src/include/s390/dasd/dialogs.rb:648 src/include/s390/zfcp/dialogs.rb:351
-#: src/include/s390/zfcp/dialogs.rb:368 src/include/s390/zfcp/dialogs.rb:404
+#: src/include/s390/dasd/dialogs.rb:635 src/include/s390/zfcp/dialogs.rb:340
+#: src/include/s390/zfcp/dialogs.rb:357 src/include/s390/zfcp/dialogs.rb:393
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:434
+#: src/include/s390/dasd/dialogs.rb:645 src/include/s390/zfcp/dialogs.rb:423
msgid "Device already exists."
msgstr "Устройство уже существует."
@@ -343,7 +343,7 @@
"Вы можете безопасно прервать утилиту конфигурации нажатием кнопки <b>Прервать</b>.</p>"
#. Write dialog help 1/2
-#: src/include/s390/dasd/helps.rb:44
+#: src/include/s390/dasd/helps.rb:45
msgid ""
"<p><b><big>Saving Controller Configuration</big></b><br>\n"
"</p>\n"
@@ -353,7 +353,7 @@
#. Write dialog help 2/2
#. Write dialog help 2/2
-#: src/include/s390/dasd/helps.rb:48 src/include/s390/zfcp/helps.rb:48
+#: src/include/s390/dasd/helps.rb:49 src/include/s390/zfcp/helps.rb:49
msgid ""
"<p><b><big>Aborting Saving:</big></b><br>\n"
"Abort the save procedure by pressing <b>Abort</b>.\n"
@@ -365,7 +365,7 @@
#. Disk selection dialog help 1/4
#. Disk selection dialog help 1/4
-#: src/include/s390/dasd/helps.rb:54 src/include/s390/dasd/helps.rb:68
+#: src/include/s390/dasd/helps.rb:55 src/include/s390/dasd/helps.rb:71
msgid ""
"<p><b><big>Configured DASD Disks</big></b><br>\n"
"In this dialog, manage DASD disks on your system.</p>"
@@ -375,7 +375,7 @@
#. Disk selection dialog help 2/4
#. Disk selection dialog help 2/4
-#: src/include/s390/dasd/helps.rb:58 src/include/s390/dasd/helps.rb:72
+#: src/include/s390/dasd/helps.rb:60 src/include/s390/dasd/helps.rb:76
msgid ""
"<p>To filter the displayed disks, set the <b>Minimum Channel ID</b> and \n"
"the <b>Maximum Channel ID</b> and click <b>Filter</b>.</p>\n"
@@ -384,12 +384,12 @@
"и <b>Максимальный ID канала</b> и нажмите <b>Фильтр</b>.</p>\n"
#. Disk selection dialog help 4/4
-#: src/include/s390/dasd/helps.rb:62
+#: src/include/s390/dasd/helps.rb:65
msgid "<p>To configure a new DASD disk, click <b>Add</b>.</p>"
msgstr "<p>Для настройки нового диска DASD нажмите кнопку <b>Добавить</b>.</p>"
#. Disk selection dialog help 4/4
-#: src/include/s390/dasd/helps.rb:64
+#: src/include/s390/dasd/helps.rb:67
msgid ""
"<p>To remove a configured DASD disk, select it and click\n"
"<b>Delete</b>.</p>"
@@ -398,7 +398,7 @@
"кнопку <b>Удалить</b>.</p>"
#. Disk selection dialog help 3/4
-#: src/include/s390/dasd/helps.rb:76
+#: src/include/s390/dasd/helps.rb:81
msgid ""
"<p>To perform actions on multiple disks at once, mark these disks. To select all displayed disk (possibly after applying a filter), click\n"
"<b>Select All</b> or <b>Deselect All</b>.</p>\n"
@@ -407,7 +407,7 @@
"<b>Select All</b> (Выбрать все) или <b>Deselect All</b> (Отменить выбор всех).</p>\n"
#. Disk selection dialog help 4/4
-#: src/include/s390/dasd/helps.rb:80
+#: src/include/s390/dasd/helps.rb:87
msgid ""
"<p>To perform an action on the selected disks, use <b>Perform Action</b>.\n"
"The action will be performed immediately!</p>"
@@ -416,7 +416,7 @@
"Действие сразу же будет выполнено!</p>"
#. Disk add help 1/3
-#: src/include/s390/dasd/helps.rb:84
+#: src/include/s390/dasd/helps.rb:92
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"
@@ -427,7 +427,7 @@
"диска DASD.</p>"
#. Disk add help 1/3
-#: src/include/s390/dasd/helps.rb:90
+#: src/include/s390/dasd/helps.rb:98
msgid ""
"<p>If the disk should be formatted,\n"
"use <b>Format the Disk</b>.</p>\n"
@@ -436,13 +436,13 @@
"используйте <b>Форматировать диск</b>.</p>\n"
#. Disk add help 3/3
-#: src/include/s390/dasd/helps.rb:94
+#: src/include/s390/dasd/helps.rb:102
msgid "<p>To use DIAG mode, select <b>Use DIAG</b>.</p>\n"
msgstr "<p>Для использования режима DIAG выберите <b>Использовать DIAG</b>.</p>\n"
#. 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:95 src/include/s390/zfcp/wizards.rb:94
msgid "Controller Configuration"
msgstr "Настройка контроллера"
@@ -473,17 +473,17 @@
"отформатирован/размечен, поставьте флажок <b>Принудительная перезапись диска</b>.</p>"
#. Dump dialog help 4/8
-#: src/include/s390/dump/ui.rb:62
+#: src/include/s390/dump/ui.rb:63
msgid "<p>To use DASD and ZFCP devices activate them in the respective YaST DASD or ZFCP dialog.<br>"
msgstr "<p>Для использования устройств DASD и ZFCP включите (активируйте) их в соответствующем диалоге YaST.<br>"
#. Dump dialog help 5/8
-#: src/include/s390/dump/ui.rb:66
+#: src/include/s390/dump/ui.rb:67
msgid "Devices which are in use or have mounted partitions will not be shown.</p>"
msgstr "Используемые или имеющие смонтированные разделы устройства не отображаются.</p>"
#. Dump dialog help 6/8
-#: src/include/s390/dump/ui.rb:70
+#: src/include/s390/dump/ui.rb:71
msgid ""
"<p><b>dumpdevice</b> after a disk indicates that it is a usable dump\n"
"device. Multi-volume dump devices are indicated by a list of DASD IDs.</p>"
@@ -493,31 +493,31 @@
"легко определить по списку идентификаторов DASD.</p>"
#. Dump dialog help 7/8
-#: src/include/s390/dump/ui.rb:74
+#: src/include/s390/dump/ui.rb:76
msgid "<p>ZFCP columns: Device, Size, ID, WWPN, LUN, Dump<br>"
msgstr "<p>Столбцы ZFCP: \"Устройство\", \"Размер\", \"ИД\", \"WWPN\", \"LUN\", \"Дамп\"<br>"
#. Dump dialog help 8/8
-#: src/include/s390/dump/ui.rb:76
+#: src/include/s390/dump/ui.rb:78
msgid "DASD columns: Device, Size, ID, Dump</p>"
msgstr "Столбцы DASD: \"Устройство\", \"Размер\", \"ИД\", \"Дамп\"</p>"
#. Dialog content
-#: src/include/s390/dump/ui.rb:95
+#: src/include/s390/dump/ui.rb:96
msgid "&ZFCP"
msgstr "&ZFCP"
-#: src/include/s390/dump/ui.rb:121
+#: src/include/s390/dump/ui.rb:122
msgid "&Force overwrite of disk"
msgstr "&Принудительно перезаписать диск"
#. prevent leading space
-#: src/include/s390/dump/ui.rb:185
+#: src/include/s390/dump/ui.rb:186
msgid "You haven't selected any device."
msgstr "Устройство не выбрано."
#. warn only in case of force
-#: src/include/s390/dump/ui.rb:193
+#: src/include/s390/dump/ui.rb:191
msgid "The disk %1 will be formatted as a dump device. All data on this device will be lost! Continue?"
msgstr "Диск %1 будет отформатирован как устройство дампа. Все данные на этом устройстве будут потеряны. Продолжить?"
@@ -540,21 +540,21 @@
"<br>В качестве разделителя используйте перевод строки.</p>\n"
#. TS-Shell dialog help 1/5
-#: src/include/s390/iucvterminal-server/helps.rb:43
+#: src/include/s390/iucvterminal-server/helps.rb:44
msgid "<p><b><big>TS-Shell</big></b></p>"
msgstr "<p><b><big>TS-оболочка</big></b></p>"
-#: src/include/s390/iucvterminal-server/helps.rb:46
+#: src/include/s390/iucvterminal-server/helps.rb:47
msgid "<p>TS-Shell allows to specify <b>Authorization</b> for every TS-Shell user and group. The rights of a group are inherited by its members.</p>"
msgstr "<p>TS-Shell позволяет указать <b>Авторизацию</b> для каждого пользователя и группы TS-Shell. Права группы наследуются их членами.</p>"
#. TS-Shell dialog help 2/5
-#: src/include/s390/iucvterminal-server/helps.rb:50
+#: src/include/s390/iucvterminal-server/helps.rb:52
msgid "<p>Each allowed z/VM ID can be selected manually under <b>Selection</b>, defined by a <b>Regex</b> or loaded from a <b>File</b> which contains all allowed z/VM IDs separated by line breaks.</p>"
msgstr "<p>Каждый разрешённый идентификатор z/VM либо выбирается вручную в разделе <b>Выбор</b>, либо определяется регулярным выражением (<b>Regex</b>), либо загружается из <b>Файла</b>, в котором все разрешённые идентификаторы z/VM разделены переводом строки.</p>"
#. TS-Shell dialog help 3/5
-#: src/include/s390/iucvterminal-server/helps.rb:54
+#: src/include/s390/iucvterminal-server/helps.rb:58
msgid ""
"<p>Click on <b>New User</b> to create new TS-Shell users or <b>Delete\n"
"User</b> to remove users.</p>"
@@ -563,7 +563,7 @@
"TS-Shell либо кнопку <b>Удалить пользователя</b> для удаления пользователей.</p>"
#. TS-Shell dialog help 4/5
-#: src/include/s390/iucvterminal-server/helps.rb:58
+#: src/include/s390/iucvterminal-server/helps.rb:63
msgid ""
"<p>To add or remove groups from the TS-Shell authorization table or to change\n"
"the membership of users, go to <b>Manage Groups</b>.</p>"
@@ -572,16 +572,16 @@
"членства в них зайдите в <b>Управление группами</b>.</p>"
#. TS-Shell dialog help 5/5
-#: src/include/s390/iucvterminal-server/helps.rb:62
+#: src/include/s390/iucvterminal-server/helps.rb:68
msgid "<p>With <b>Audited IDs</b> specify the z/VM IDs from which transcripts should be gathered.</p>"
msgstr "<p>В <b>ID для учёта</b> укажите идентификаторы z/VM, для которых нужно собирать транскрипты.</p>"
#. TS-Shell User creation dialog help 1/3
-#: src/include/s390/iucvterminal-server/helps.rb:66
+#: src/include/s390/iucvterminal-server/helps.rb:72
msgid "<p><b><big>New TS-Shell User</big></b></p>"
msgstr "<p><b><big>Новый пользователь TS-оболочки</big></b></p>"
-#: src/include/s390/iucvterminal-server/helps.rb:69
+#: src/include/s390/iucvterminal-server/helps.rb:75
msgid ""
"<p>To create new TS-Shell user the <b>Username</b>, <b>Home Directory</b> and <b>Password</b> has to be provided.\n"
"\t<br>It is also possible to specify <b>Additional Groups</b> by selecting them on the right.</p>"
@@ -590,12 +590,12 @@
"\t<br>Также можно указать <b>дополнительные группы</b>, выбрав их справа.</p>"
#. TS-Shell User creation dialog help 2/3
-#: src/include/s390/iucvterminal-server/helps.rb:73
+#: src/include/s390/iucvterminal-server/helps.rb:81
msgid "<p>To ensure that the user changes his password after the first login, activate <b>Force Password Change</b>.</p>"
msgstr "<p>Чтобы пользователь точно сменил свой пароль после первого входа, отметьте пункт <b>Принудительная смена пароля</b>.</p>"
#. TS-Shell User creation dialog help 3/3
-#: src/include/s390/iucvterminal-server/helps.rb:77
+#: src/include/s390/iucvterminal-server/helps.rb:86
msgid ""
"<p>You can specify the same home directory for every TS-Shell user since no\n"
"data will be stored there.</p>"
@@ -604,11 +604,11 @@
"поскольку он не используется для хранения данных.</p>"
#. TS-Shell Managing Groups dialog help 1/5
-#: src/include/s390/iucvterminal-server/helps.rb:81
+#: src/include/s390/iucvterminal-server/helps.rb:91
msgid "<p><b><big>Manage Groups for TS-Authorization</big></b></p>"
msgstr "<p><b><big>Управление группами для TS-авторизации</big></b></p>"
-#: src/include/s390/iucvterminal-server/helps.rb:84
+#: src/include/s390/iucvterminal-server/helps.rb:94
msgid ""
"<p>Define TS-Shell authorizations per group if you want every TS-Shell \n"
"member of this groups to inherit the same rights.</p>"
@@ -617,7 +617,7 @@
"чтобы каждый член этой группы TS-Shell наследовал одинаковые права.</p>"
#. TS-Shell Managing Groups dialog help 2/5
-#: src/include/s390/iucvterminal-server/helps.rb:88
+#: src/include/s390/iucvterminal-server/helps.rb:99
msgid ""
"<p>Existing groups can be added to or removed from the TS-Shell\n"
"authorization. Select the groups in the table and click on <b>Select or Deselect</b>. The current status is shown in the column <b>TS-Auth</b>.</p>"
@@ -626,14 +626,14 @@
"Выберите группы в таблице и нажатия на кнопку <b>Выделить или снять выделение</b>. Текущее состояние показывается в столбце <b>TS-Auth</b>.</p>"
#. TS-Shell Managing Groups dialog help 3/5
-#: src/include/s390/iucvterminal-server/helps.rb:92
+#: src/include/s390/iucvterminal-server/helps.rb:105
msgid ""
"<p>Change TS-Shell members of a selected group in the <b>TS-Members</b>\n"
"selection.</p>"
msgstr "<p>Изменяйте состав выделенной группы TS-Shell в поле <b>TS-Members</b>.</p>"
#. TS-Shell Managing Groups dialog help 4/5
-#: src/include/s390/iucvterminal-server/helps.rb:96
+#: src/include/s390/iucvterminal-server/helps.rb:109
msgid ""
"<p>New groups could be created by entering the name in the <b>New Group</b> input field and confirming with <b>Create</b>.\n"
"\t<br>To delete previously created groups the <b>YaST users</b> dialog has to be used.</p>"
@@ -642,21 +642,21 @@
"\t<br>Для удаления ранее созданных групп используется диалоговое окно <b>Пользователи YaST</b>.</p>"
#. TS-Shell Managing Groups dialog help 5/5
-#: src/include/s390/iucvterminal-server/helps.rb:100
+#: src/include/s390/iucvterminal-server/helps.rb:115
msgid "<p>Undo changes in this dialog by clicking the <b>Back</b> button.</p>"
msgstr "<p>Откатывайте изменения в этом диалоге нажатием кнопки <b>Назад</b>.</p>"
#. IUCVConn on Login dialog help 1/2
-#: src/include/s390/iucvterminal-server/helps.rb:104
+#: src/include/s390/iucvterminal-server/helps.rb:119
msgid "<p><b><big>IUCVConn on Login</big></b></p>"
msgstr "<p><b><big>Включить IUCVConn при входе в систему</big></b></p>"
-#: src/include/s390/iucvterminal-server/helps.rb:107
+#: src/include/s390/iucvterminal-server/helps.rb:122
msgid "<p>IUCVConn on Login needs one user for every z/VM ID. To create these users a <b>password</b> and <b>home directory</b> has to be provided."
msgstr "<p>Чтобы включить IUCVConn при входе в систему, каждому идентификатору z/VM должен соответствовать один пользователь. Чтобы создать этих пользователей, необходимо указать <b>пароль</b> и <b>личный каталог</b>."
#. IUCVConn on Login dialog help 2/2
-#: src/include/s390/iucvterminal-server/helps.rb:111
+#: src/include/s390/iucvterminal-server/helps.rb:127
msgid "<p>It is possible to sync the users manually by clicking on <b>Sync</b> or just confirming the changes with <b>Ok</b> while <b>IUCVConn on Login</b> is enabled. </p>"
msgstr "<p>Чтобы синхронизировать пользователей вручную, щелкните <b>Синхронизировать</b> или просто подтвердите изменения, нажав <b>OК</b> при установленном флажке <b>Включить IUCVConn при входе в систему</b>. </p>"
@@ -845,87 +845,87 @@
msgstr "&Члены TS"
#. draw active tab
-#: src/include/s390/iucvterminal-server/ui.rb:595
+#: src/include/s390/iucvterminal-server/ui.rb:594
msgid "&z/VM IDs"
msgstr "&Идентификаторы z/VM"
-#: src/include/s390/iucvterminal-server/ui.rb:596
+#: src/include/s390/iucvterminal-server/ui.rb:595
msgid "&TS-Shell"
msgstr "TS-&оболочка"
-#: src/include/s390/iucvterminal-server/ui.rb:597
+#: src/include/s390/iucvterminal-server/ui.rb:596
msgid "&IUCVConn"
msgstr "&IUCVConn"
#. check and commit password
-#: src/include/s390/iucvterminal-server/ui.rb:711
+#: src/include/s390/iucvterminal-server/ui.rb:708
msgid "The passwords do not match or are invalid."
msgstr "Пароли не совпадают или неверны."
#. check if the user specifcation is valid and if the name does already exist
-#: src/include/s390/iucvterminal-server/ui.rb:717
+#: src/include/s390/iucvterminal-server/ui.rb:714
msgid "The username is not valid!"
msgstr "Недопустимое имя пользователя."
-#: src/include/s390/iucvterminal-server/ui.rb:721
+#: src/include/s390/iucvterminal-server/ui.rb:718
msgid "A home directory has to be specified!"
msgstr "Необходимо указать домашний каталог."
-#: src/include/s390/iucvterminal-server/ui.rb:757
+#: src/include/s390/iucvterminal-server/ui.rb:751
msgid "Adding the user has failed."
msgstr "Не удалось добавить пользователя."
#. delete group entry if disabled
-#: src/include/s390/iucvterminal-server/ui.rb:861
+#: src/include/s390/iucvterminal-server/ui.rb:843
msgid "Configure IUCV Terminal Server Settings"
msgstr "Настроить параметры сервера терминала IUCV"
#. update screen
-#: src/include/s390/iucvterminal-server/ui.rb:881
+#: src/include/s390/iucvterminal-server/ui.rb:863
msgid "New TS-Shell User"
msgstr "Новый пользователь TS-оболочки"
-#: src/include/s390/iucvterminal-server/ui.rb:894
+#: src/include/s390/iucvterminal-server/ui.rb:876
msgid "Manage Groups for TS-Authorization"
msgstr "Управление группами для TS-авторизации"
#. since alnum allows umlauts too the id is checked against the user name specification
-#: src/include/s390/iucvterminal-server/ui.rb:1020
+#: src/include/s390/iucvterminal-server/ui.rb:1000
msgid "Wrong z/VM ID \"%1\" in line %2, only letters and numbers are allowed."
msgstr "Неправильный идентификатор z/VM \"%1\" в строке %2. Разрешены только буквы и цифры."
-#: src/include/s390/iucvterminal-server/ui.rb:1032
+#: src/include/s390/iucvterminal-server/ui.rb:1012
msgid "Wrong z/VM ID \"%1\" in line %2, numbers at the beginning are not allowed."
msgstr "Неправильный идентификатор z/VM \"%1\" в строке %2. Он не может начинаться с цифры."
-#: src/include/s390/iucvterminal-server/ui.rb:1044
+#: src/include/s390/iucvterminal-server/ui.rb:1024
msgid "Wrong z/VM ID \"%1\" in line %2, more than eight characters are not allowed."
msgstr "Неправильный идентификатор z/VM \"%1\" в строке %2. Максимальная длина - восемь символов."
#. only the last entry is allowed to be empty
-#: src/include/s390/iucvterminal-server/ui.rb:1057
+#: src/include/s390/iucvterminal-server/ui.rb:1037
msgid "Wrong z/VM ID \"%1\" in line %2, at least one letter is required."
msgstr "Неправильный идентификатор z/VM \"%1\" в строке %2. Требуется хотя бы одна буква."
#. check password
-#: src/include/s390/iucvterminal-server/ui.rb:1081
+#: src/include/s390/iucvterminal-server/ui.rb:1061
msgid "A correctly entered password to sync IUCVConn users is required."
msgstr "Чтобы синхронизировать пользователей IUCVConn, требуется правильно ввести пароль."
#. check home directory
-#: src/include/s390/iucvterminal-server/ui.rb:1087
+#: src/include/s390/iucvterminal-server/ui.rb:1067
msgid "The specified IUCVConn home directory is invalid."
msgstr "Указан недопустимый домашний каталог IUCVConn."
#. update ts member selection
-#: src/include/s390/iucvterminal-server/ui.rb:1437
+#: src/include/s390/iucvterminal-server/ui.rb:1415
msgid "The group name is not valid!"
msgstr "Недопустимое имя группы."
#. change tab selection back
#. check for z/VM ID entries
-#: src/include/s390/iucvterminal-server/ui.rb:1497
-#: src/include/s390/iucvterminal-server/ui.rb:1598
+#: src/include/s390/iucvterminal-server/ui.rb:1474
+#: src/include/s390/iucvterminal-server/ui.rb:1575
msgid "Cannot configure the terminal server without valid z/VM IDs."
msgstr "Невозможно настроить сервер терминалов без верных идентификаторов z/VM."
@@ -968,117 +968,117 @@
msgstr "<p>Несколько <b>экземпляров IUCVtty</b> могут быть запущены для предоставления нескольких устройств терминала. Экземпляры различаются по идентификатору, состоящему из <b>префикса идентификатора терминала</b> и номера экземпляра.<br>"
#. IUCVTerminal dialog help 4/11
-#: src/include/s390/iucvterminal/ui.rb:129
+#: src/include/s390/iucvterminal/ui.rb:131
msgid "For example, if you define ten instances with the prefix "<i>lxterm</i>", the terminal IDs from <i>lxterm0</i> to <i>lxterm9</i> are available.</p>"
msgstr "Например, если определить десять экземпляров с префиксом <i>lxterm</i>, идентификаторы терминала от <i>lxterm0</i> до <i>lxterm9</i> станут доступны.</p>"
#. IUCVTerminal dialog help 5/11
-#: src/include/s390/iucvterminal/ui.rb:133
+#: src/include/s390/iucvterminal/ui.rb:136
msgid "<p><b>HVC</b></p>"
msgstr "<p><b>HVC</b></p>"
#. IUCVTerminal dialog help 6/11
-#: src/include/s390/iucvterminal/ui.rb:135
+#: src/include/s390/iucvterminal/ui.rb:138
msgid "<p>The z/VM IUCV HVC device driver is a kernel module and uses device nodes to enable up to eight HVC terminal devices to communicate with getty and login programs.</p>"
msgstr "<p>Драйвер устройства HVC z/VM IUCV — это модуль ядра, использующий узлы устройств для включения до восьми терминалов HVC для связи с getty и программами для входа.</p>"
#. IUCVTerminal dialog help 7/11
-#: src/include/s390/iucvterminal/ui.rb:139
+#: src/include/s390/iucvterminal/ui.rb:143
msgid "<p>With <b>restrict access</b>, allow only connections from certain <b>terminal servers</b>.</p>"
msgstr "<p>С помощью <b>ограничения доступа</b> разрешите соединения только для конкретных <b>серверов терминалов</b>.</p>"
#. IUCVTerminal dialog help 8/11
-#: src/include/s390/iucvterminal/ui.rb:143
+#: src/include/s390/iucvterminal/ui.rb:147
msgid "<p>Define the emulation for all instances at once or for each one separately.</p>"
msgstr "<p>Укажите эмуляцию сразу для всех экземпляров или для каждого в отдельности.</p>"
#. IUCVTerminal dialog help 9/11
-#: src/include/s390/iucvterminal/ui.rb:147
+#: src/include/s390/iucvterminal/ui.rb:151
msgid ""
"<p>Activate <b>route kernel messages to hvc0</b> to route kernel messages to\n"
"the hvc0 device instead of ttyS0.<br>"
msgstr "<p>Включите <b>получать сообщения ядра на hvc0</b> для перенаправления сообщений ядра с ttyS0 на устройство hvc0.<br>"
#. IUCVTerminal dialog help 10/11
-#: src/include/s390/iucvterminal/ui.rb:151
+#: src/include/s390/iucvterminal/ui.rb:156
msgid "Should kernel messages still be shown on ttyS0, manually add <b>console=ttyS0</b> to the current boot selection kernel parameter in the <b>YaST bootloader module</b>.</p>"
msgstr "Чтобы сообщения ядра всё равно показывались на ttyS0, вручную допишите параметр <b>console=ttyS0</b> к параметрам загрузки ядра в <b>модуле загрузчика YaST</b>.</p>"
#. IUCVTerminal dialog help 11/11
-#: src/include/s390/iucvterminal/ui.rb:155
+#: src/include/s390/iucvterminal/ui.rb:161
msgid "<h3>Warning: HVC Terminals stay logged on without a manual logout through the shortcut: ctrl _ d</h3>"
msgstr "<h3>Предупреждение. Для терминалов HVC требуется вручную выходить из системы с помощью клавиш Ctrl+D</h3>"
#. Dialog content
-#: src/include/s390/iucvterminal/ui.rb:168
+#: src/include/s390/iucvterminal/ui.rb:174
msgid "&IUCVtty"
msgstr "&IUCVtty"
-#: src/include/s390/iucvterminal/ui.rb:176
+#: src/include/s390/iucvterminal/ui.rb:182
msgid "Terminal ID &Prefix"
msgstr "&Префикс идентификатора терминала"
-#: src/include/s390/iucvterminal/ui.rb:182
+#: src/include/s390/iucvterminal/ui.rb:188
msgid "I&UCVtty instances"
msgstr "&Экземпляры IUCVtty"
-#: src/include/s390/iucvterminal/ui.rb:196
+#: src/include/s390/iucvterminal/ui.rb:202
msgid "HVC"
msgstr "HVC"
-#: src/include/s390/iucvterminal/ui.rb:206
+#: src/include/s390/iucvterminal/ui.rb:212
msgid "H&VC instances"
msgstr "Э&кземпляры HVC"
-#: src/include/s390/iucvterminal/ui.rb:217
+#: src/include/s390/iucvterminal/ui.rb:223
msgid "Restrict &access to"
msgstr "&Ограничить доступ для"
-#: src/include/s390/iucvterminal/ui.rb:223
+#: src/include/s390/iucvterminal/ui.rb:229
msgid "Allowed Terminal &Servers"
msgstr "Разрешенные &серверы терминала"
-#: src/include/s390/iucvterminal/ui.rb:231
+#: src/include/s390/iucvterminal/ui.rb:237
msgid "route &kernel messages to hvc0"
msgstr "маршрутизировать сообщения &ядра на hvc0"
#. if settings were changed don't exit without asking
-#: src/include/s390/iucvterminal/ui.rb:324
+#: src/include/s390/iucvterminal/ui.rb:330
msgid "Really leave without saving?"
msgstr "Действительно выйти без сохранения?"
#. check iucv id
-#: src/include/s390/iucvterminal/ui.rb:333
+#: src/include/s390/iucvterminal/ui.rb:339
msgid "The IUCV ID is not valid."
msgstr "Недопустимый идентификатор IUCV."
#. check restrict_hvc_to_srvs and make sure they doesn't end with a comma
-#: src/include/s390/iucvterminal/ui.rb:343
+#: src/include/s390/iucvterminal/ui.rb:349
msgid "The Terminal Servers are not valid."
msgstr "Недопустимые серверы терминала."
#. check if the bootloader settings need to be adjusted
-#: src/include/s390/iucvterminal/ui.rb:366
+#: src/include/s390/iucvterminal/ui.rb:380
msgid "The system has to be rebooted for some changes to take effect."
msgstr "Чтобы изменения вступили в силу, необходимо перезагрузить систему."
#. only five lines are allowed, remove every additional line
-#: src/include/s390/onpanic/ui.rb:63
+#: src/include/s390/onpanic/ui.rb:62
msgid "Only %1 lines are allowed for VMCMD."
msgstr "Только %1 строк разрешено для VMCMD."
#. For translators: Caption of the dialog
-#: src/include/s390/onpanic/ui.rb:109
+#: src/include/s390/onpanic/ui.rb:108
msgid "On Panic Configuration"
msgstr "Настройка OnPanic"
#. OnPanic dialog help 1/11
-#: src/include/s390/onpanic/ui.rb:112
+#: src/include/s390/onpanic/ui.rb:111
msgid "<p><b>Configure the actions to be taken if a kernel panic occurs</b></p>"
msgstr "<p><b>Настройка действий в случае паники ядра</b></p>"
#. OnPanic dialog help 2/11
-#: src/include/s390/onpanic/ui.rb:116
+#: src/include/s390/onpanic/ui.rb:115
msgid "<p>The <b>Dumpconf</b> daemon needs to be enabled to influence the behavior during kernel panics.</p>"
msgstr "<p>Необходимо включить демон <b>Dumpconf</b>, чтобы он управлял поведением системы в случае паники ядра.</p>"
@@ -1112,83 +1112,83 @@
"только на LPAR с машинами z9(r) и более поздней версии, а также на z/VM 5.3 и более поздней версии.<br>"
#. OnPanic dialog help 8/11
-#: src/include/s390/onpanic/ui.rb:132
+#: src/include/s390/onpanic/ui.rb:133
msgid "<b>vmcmd</b> Execute specified CP commands and stop system.</p>"
msgstr "<b>vmcmd</b> - выполнить указанные команды CP и остановить систему.</p>"
#. OnPanic dialog help 9/11
-#: src/include/s390/onpanic/ui.rb:134
+#: src/include/s390/onpanic/ui.rb:135
msgid "<p>The time defined in <b>Delay Minutes</b> defers activating the specified panic action for a newly started system to prevent loops. If the system crashes before the time has elapsed the default action (stop) is performed.</p>"
msgstr "<p>Время, указанное в параметре <b>Задержка в минутах</b>, позволяет отложить указанное действие в случае паники для только что запущенной системы, чтобы избежать циклов. Если аварийный отказ системы происходит до истечения этого времени, выполняется действие по умолчанию (остановка).</p>"
#. OnPanic dialog help 10/11
-#: src/include/s390/onpanic/ui.rb:138
+#: src/include/s390/onpanic/ui.rb:141
msgid "<p>The device for dumping the memory can be set with <b>Dump Device</b>. If no device is shown you have to create one with the <b>YaST Dump Devices</b> dialog.</p>"
msgstr "<p>Устройство для дампа памяти можно указать с помощью параметра <b>Устройство дампа</b>. Если устройства не отображаются, требуется создать устройство в диалоговом окне <b>Устройства дампа YaST</b>.</p>"
#. OnPanic dialog help 11/11
-#: src/include/s390/onpanic/ui.rb:143
+#: src/include/s390/onpanic/ui.rb:147
msgid "<p>With <b>VMCMD</b> specify CP commands to be executed before the Linux system is stopped. Only %1 lines and a total of %2 chars are allowed.</p>"
msgstr "<p>С помощью <b>VMCMD</b> укажите команды CP, выполняемые перед остановом системы. Разрешено только %1 строк и всего %2 символов.</p>"
#. radio button label
-#: src/include/s390/onpanic/ui.rb:166
+#: src/include/s390/onpanic/ui.rb:171
msgid "Do No&t Start Dumpconf"
msgstr "&Не запускать Dumpconf"
#. radio button label
-#: src/include/s390/onpanic/ui.rb:175
+#: src/include/s390/onpanic/ui.rb:180
msgid "&Start Dumpconf"
msgstr "&Запускать Dumpconf"
#. combobox label
-#: src/include/s390/onpanic/ui.rb:189
+#: src/include/s390/onpanic/ui.rb:194
msgid "&Panic Action"
msgstr "Д&ействие в случае паники"
-#: src/include/s390/onpanic/ui.rb:192
+#: src/include/s390/onpanic/ui.rb:197
msgid "Delay &Minutes"
msgstr "Задержка в &минутах"
#. combobox label
-#: src/include/s390/onpanic/ui.rb:202
+#: src/include/s390/onpanic/ui.rb:207
msgid "&Dump Device"
msgstr "&Устройство дампа"
-#: src/include/s390/onpanic/ui.rb:206
+#: src/include/s390/onpanic/ui.rb:211
msgid "&VMCMD"
msgstr "&VMCMD"
#. don't allow dumps if no device is available
-#: src/include/s390/onpanic/ui.rb:267
+#: src/include/s390/onpanic/ui.rb:271
msgid "It is not possible to enable the dump process without a dump device."
msgstr "Невозможно включить процесс дампа без устройства дампа."
#. don't allow vmcmd without at least one command
-#: src/include/s390/onpanic/ui.rb:281
+#: src/include/s390/onpanic/ui.rb:285
msgid "It is not possible to use vmcmd without defining at least one command."
msgstr "Невозможно использовать vmcmd, не определив хотя бы одну команду."
#. Dialog caption
-#: src/include/s390/zfcp/dialogs.rb:113
+#: src/include/s390/zfcp/dialogs.rb:109
msgid "Configured ZFCP Devices"
msgstr "Настроенные устройства ZFCP"
#. table header
#. table header
-#: src/include/s390/zfcp/dialogs.rb:122 src/include/s390/zfcp/dialogs.rb:131
+#: src/include/s390/zfcp/dialogs.rb:118 src/include/s390/zfcp/dialogs.rb:127
msgid "WWPN"
msgstr "WWPN"
#. table header
#. table header
-#: src/include/s390/zfcp/dialogs.rb:124 src/include/s390/zfcp/dialogs.rb:133
+#: src/include/s390/zfcp/dialogs.rb:120 src/include/s390/zfcp/dialogs.rb:129
msgid "LUN"
msgstr "LUN"
#. yes-no popup
#. yes-no popup
-#: src/include/s390/zfcp/dialogs.rb:238 src/include/s390/zfcp/dialogs.rb:391
+#: src/include/s390/zfcp/dialogs.rb:232 src/include/s390/zfcp/dialogs.rb:380
msgid ""
"Really leave the ZFCP device configuration without saving?\n"
"All changes will be lost."
@@ -1197,42 +1197,42 @@
"Все изменения будут утеряны."
#. dialog caption
-#: src/include/s390/zfcp/dialogs.rb:259
+#: src/include/s390/zfcp/dialogs.rb:252
msgid "Add New ZFCP Device"
msgstr "Добавить новое устройство ZFCP"
#. push button
-#: src/include/s390/zfcp/dialogs.rb:309
+#: src/include/s390/zfcp/dialogs.rb:300
msgid "Get WWPNs"
msgstr "Получить WWPNs"
#. combo box
-#: src/include/s390/zfcp/dialogs.rb:312
+#: src/include/s390/zfcp/dialogs.rb:303
msgid "&WWPN"
msgstr "&WWPN"
#. push button
-#: src/include/s390/zfcp/dialogs.rb:319
+#: src/include/s390/zfcp/dialogs.rb:308
msgid "Get LUNs"
msgstr "Получить LUNs"
#. combobox
-#: src/include/s390/zfcp/dialogs.rb:322
+#: src/include/s390/zfcp/dialogs.rb:311
msgid "&LUN"
msgstr "&LUN"
-#: src/include/s390/zfcp/dialogs.rb:325
+#: src/include/s390/zfcp/dialogs.rb:314
msgid "If no WWPN and no LUN have been defined the system is trying to use allow_lun_scan."
msgstr "Если не определены WWPN и LUN, система пытается использовать allow_lun_scan."
#. error popup
#. error popup
-#: src/include/s390/zfcp/dialogs.rb:376 src/include/s390/zfcp/dialogs.rb:413
+#: src/include/s390/zfcp/dialogs.rb:365 src/include/s390/zfcp/dialogs.rb:402
msgid "The entered WWPN is invalid."
msgstr "Введенный WWPN не дествителен."
#. error popup
-#: src/include/s390/zfcp/dialogs.rb:421
+#: src/include/s390/zfcp/dialogs.rb:410
msgid "The entered LUN is invalid."
msgstr "Введенный LUN неверен."
@@ -1246,7 +1246,7 @@
"</p>\n"
#. Write dialog help 1/2
-#: src/include/s390/zfcp/helps.rb:44
+#: src/include/s390/zfcp/helps.rb:45
msgid ""
"<p><b><big>Saving ZFCP Device Configuration</big></b><br>\n"
"</p>\n"
@@ -1255,7 +1255,7 @@
"</p>\n"
#. Disk selection dialog help 1/3
-#: src/include/s390/zfcp/helps.rb:54
+#: src/include/s390/zfcp/helps.rb:55
msgid ""
"<p><b><big>Configured ZFCP Devices</big></b><br>\n"
"Manage ZFCP devices on your system.</p>\n"
@@ -1264,12 +1264,12 @@
"Управляйте устройствами ZFCP в вашей системе.</p>\n"
#. Disk selection dialog help 2/3
-#: src/include/s390/zfcp/helps.rb:58
+#: src/include/s390/zfcp/helps.rb:59
msgid "<p>To configure a new ZFCP device, click <b>Add</b>.</p>"
msgstr "<p>Чтобы настроить новое устройство ZFCP, нажмите кнопку <b>Добавить</b>.</p>"
#. Disk selection dialog help 3/3
-#: src/include/s390/zfcp/helps.rb:60
+#: src/include/s390/zfcp/helps.rb:61
msgid ""
"<p>To remove a configured ZFCP device, select it and click\n"
"<b>Delete</b>.</p>"
@@ -1279,11 +1279,11 @@
#. Disk selection dialog Warning
#. Disk selection dialog Warning
-#: src/include/s390/zfcp/helps.rb:64 src/include/s390/zfcp/helps.rb:88
+#: src/include/s390/zfcp/helps.rb:65 src/include/s390/zfcp/helps.rb:90
msgid "<h1>Warning</h1>"
msgstr "<h1>Предупреждение</h1>"
-#: src/include/s390/zfcp/helps.rb:65 src/include/s390/zfcp/helps.rb:89
+#: src/include/s390/zfcp/helps.rb:66 src/include/s390/zfcp/helps.rb:91
msgid ""
"<p>When accessing a ZFCP device\n"
"<b>READ</b>/<b>WRITE</b>, make sure that this access is exclusive.\n"
@@ -1294,7 +1294,7 @@
"Иначе у вас есть риск повредить данные.</p>"
#. Disk add help 1/2
-#: src/include/s390/zfcp/helps.rb:71
+#: src/include/s390/zfcp/helps.rb:72
msgid ""
"<p><b><big>Add New ZFCP Device</big></b><br>\n"
"Enter the identifier of the device to add, the\n"
@@ -1307,7 +1307,7 @@
"(<b>WWPN</b>) и номер <b>LUN</b>.</p>\n"
#. 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:79
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"
@@ -1325,95 +1325,95 @@
#. popup label
#. popup label
-#: src/modules/DASDController.rb:187 src/modules/ZFCPController.rb:163
+#: src/modules/DASDController.rb:178 src/modules/ZFCPController.rb:153
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:333
+#: src/modules/DASDController.rb:311
msgid "Channel ID: %1, Format: %2, DIAG: %3"
msgstr "ИД канала: %1; формат: %2; DIAG: %3"
-#: src/modules/DASDController.rb:346
+#: src/modules/DASDController.rb:324
msgid "Channel ID: %1, Device: %2, DIAG: %3"
msgstr "ИД канала: %1; устройство: %2; DIAG: %3"
#. popup label
-#: src/modules/DASDController.rb:381
+#: src/modules/DASDController.rb:356
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:472 src/modules/ZFCPController.rb:446
-#: src/modules/ZFCPController.rb:540
+#: src/modules/DASDController.rb:446 src/modules/ZFCPController.rb:422
+#: src/modules/ZFCPController.rb:515
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:480 src/modules/ZFCPController.rb:454
-#: src/modules/ZFCPController.rb:548
+#: src/modules/DASDController.rb:454 src/modules/ZFCPController.rb:430
+#: src/modules/ZFCPController.rb:523
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:488 src/modules/ZFCPController.rb:462
+#: src/modules/DASDController.rb:462 src/modules/ZFCPController.rb:438
msgid "%1: No device found for <ccwid>."
msgstr "%1: Не обнаружено устройств для <ccwid>."
#. error report, %1 is device identification
-#: src/modules/DASDController.rb:496
+#: src/modules/DASDController.rb:470
msgid "%1: Could not change state of the device."
msgstr "%1: не удалось изменить состояние устройства."
#. error report, %1 is device identification
-#: src/modules/DASDController.rb:505
+#: src/modules/DASDController.rb:479
msgid "%1: Device is not a DASD."
msgstr "%1: это не DASD-устройство."
#. error report, %1 is device identification
-#: src/modules/DASDController.rb:514
+#: src/modules/DASDController.rb:488
msgid "%1: Could not load module."
msgstr "%1: невозможно загрузить модуль."
#. error report, %1 is device identification
-#: src/modules/DASDController.rb:523
+#: src/modules/DASDController.rb:497
msgid "%1: Failed to activate DASD."
msgstr "%1: сбой включения DASD."
#. error report, %1 is device identification
-#: src/modules/DASDController.rb:532
+#: src/modules/DASDController.rb:506
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:540 src/modules/ZFCPController.rb:518
-#: src/modules/ZFCPController.rb:596
+#: src/modules/DASDController.rb:514 src/modules/ZFCPController.rb:494
+#: src/modules/ZFCPController.rb:571
msgid "%1: Unknown error %2."
msgstr "%1: Неизвестная ошибка %2."
#. progress bar
-#: src/modules/DASDController.rb:653
+#: src/modules/DASDController.rb:622
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:682 src/modules/DASDController.rb:779
+#: src/modules/DASDController.rb:651 src/modules/DASDController.rb:747
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:750
+#: src/modules/DASDController.rb:718
msgid "Formatting %1: cylinder %2 of %3 done"
msgstr "Форматирование %1: сделано цилиндров %2 из %3"
@@ -1452,9 +1452,9 @@
#. Progress finished
#. Progress finished
#: src/modules/Dump.rb:86 src/modules/Dump.rb:121
-#: src/modules/IUCVTerminal.rb:165 src/modules/IUCVTerminal.rb:246
-#: src/modules/IUCVTerminalServer.rb:334 src/modules/IUCVTerminalServer.rb:478
-#: src/modules/OnPanic.rb:234 src/modules/OnPanic.rb:276
+#: src/modules/IUCVTerminal.rb:165 src/modules/IUCVTerminal.rb:244
+#: src/modules/IUCVTerminalServer.rb:335 src/modules/IUCVTerminalServer.rb:478
+#: src/modules/OnPanic.rb:233 src/modules/OnPanic.rb:275
msgid "Finished"
msgstr "Готово"
@@ -1477,37 +1477,37 @@
msgstr "Создание устройства дампа. Это может занять несколько минут."
#. error description
-#: src/modules/Dump.rb:148
+#: src/modules/Dump.rb:147
msgid "Invalid or unusable disk (fatal)."
msgstr "Недопустимый или непригодный для использования диск (неустранимая ошибка)."
#. error description
-#: src/modules/Dump.rb:151
+#: src/modules/Dump.rb:150
msgid "Incompatible formatting or partitioning, correct with Force."
msgstr "Несовместимое форматирование или разбиение, исправьте принудительно."
#. error description
-#: src/modules/Dump.rb:156
+#: src/modules/Dump.rb:155
msgid "Missing support programs."
msgstr "Отсутствуют программы поддержки."
#. error description
-#: src/modules/Dump.rb:159
+#: src/modules/Dump.rb:158
msgid "Missing or wrong parameters."
msgstr "Отсутствуют параметры, или они указаны неправильно."
#. error description
-#: src/modules/Dump.rb:162
+#: src/modules/Dump.rb:161
msgid "Access problem."
msgstr "Проблема доступа."
#. error description, %1 is error code (integer)
-#: src/modules/Dump.rb:165
+#: src/modules/Dump.rb:164
msgid "Error code from support program: %1."
msgstr "Код ошибки от программы поддержки: %1."
#. error report, %1 is device name, %2 error description
-#: src/modules/Dump.rb:169
+#: src/modules/Dump.rb:168
msgid ""
"Cannot create dump device %1:\n"
"%2"
@@ -1552,37 +1552,37 @@
msgstr "Чтение параметров ядра..."
#. Inittab write dialog caption
-#: src/modules/IUCVTerminal.rb:223
+#: src/modules/IUCVTerminal.rb:221
msgid "Saving IUCV Terminal Configuration"
msgstr "Сохранение конфигурации терминала IUCV"
#. Progress stage 1/4
-#: src/modules/IUCVTerminal.rb:232
+#: src/modules/IUCVTerminal.rb:230
msgid "Write IUCVtty settings"
msgstr "Запись параметров IUCVtty"
#. Progress stage 2/4
-#: src/modules/IUCVTerminal.rb:234
+#: src/modules/IUCVTerminal.rb:232
msgid "Write HVC settings"
msgstr "Запись параметров HVC"
#. Progress stage 3/4
-#: src/modules/IUCVTerminal.rb:236
+#: src/modules/IUCVTerminal.rb:234
msgid "Write kernel parameters"
msgstr "Записать параметры ядра"
#. Progress step 1/4
-#: src/modules/IUCVTerminal.rb:240
+#: src/modules/IUCVTerminal.rb:238
msgid "Writing IUCVtty settings..."
msgstr "Запись параметров IUCVtty..."
#. Progress step 2/4
-#: src/modules/IUCVTerminal.rb:242
+#: src/modules/IUCVTerminal.rb:240
msgid "Writing HVC settings..."
msgstr "Запись параметров HVC..."
#. Progress step 3/4
-#: src/modules/IUCVTerminal.rb:244
+#: src/modules/IUCVTerminal.rb:242
msgid "Writing kernel parameters..."
msgstr "Запись параметров ядра..."
@@ -1593,27 +1593,27 @@
#. Read all settings
#. @return true on success
-#: src/modules/IUCVTerminalServer.rb:315
+#: src/modules/IUCVTerminalServer.rb:316
msgid "Loading IUCV Terminal Server Configuration"
msgstr "Загрузка параметров сервера терминала IUCV"
#. Progress stage 1/2
-#: src/modules/IUCVTerminalServer.rb:324
+#: src/modules/IUCVTerminalServer.rb:325
msgid "Read configuration files"
msgstr "Чтение файлов конфигурации"
#. Progress stage 2/2
-#: src/modules/IUCVTerminalServer.rb:326
+#: src/modules/IUCVTerminalServer.rb:327
msgid "Load user/group settings"
msgstr "Загрузка параметров пользователя и группы"
#. Progress step 1/2
-#: src/modules/IUCVTerminalServer.rb:330
+#: src/modules/IUCVTerminalServer.rb:331
msgid "Reading configuration files..."
msgstr "Чтение файлов конфигурации..."
#. Progress step 2/2
-#: src/modules/IUCVTerminalServer.rb:332
+#: src/modules/IUCVTerminalServer.rb:333
msgid "Loading user/group settings..."
msgstr "Загрузка параметров пользователя и группы..."
@@ -1643,67 +1643,67 @@
msgstr "Обновление параметров пользователя..."
#. Dumpconf read dialog caption
-#: src/modules/OnPanic.rb:215
+#: src/modules/OnPanic.rb:214
msgid "Reading Dumpconf Configuration"
msgstr "Чтение конфигурации Dumpconf"
#. Progress stage 1/2
-#: src/modules/OnPanic.rb:224
+#: src/modules/OnPanic.rb:223
msgid "Checking dump devices"
msgstr "Проверка устройств дампа"
#. Progress stage 2/2
-#: src/modules/OnPanic.rb:226
+#: src/modules/OnPanic.rb:225
msgid "Reading settings"
msgstr "Чтение параметров"
#. Progress step 1/2
-#: src/modules/OnPanic.rb:230
+#: src/modules/OnPanic.rb:229
msgid "Checking dump devices..."
msgstr "Проверка устройств дампа..."
#. Progress step 2/2
-#: src/modules/OnPanic.rb:232
+#: src/modules/OnPanic.rb:231
msgid "Reading the settings..."
msgstr "Чтение параметров..."
#. Dumpconf write dialog caption
-#: src/modules/OnPanic.rb:257
+#: src/modules/OnPanic.rb:256
msgid "Saving Dumpconf Configuration"
msgstr "Сохранение конфигурации Dumpconf"
#. Progress stage 1/2
-#: src/modules/OnPanic.rb:266
+#: src/modules/OnPanic.rb:265
msgid "Write the settings"
msgstr "Записать параметры"
#. Progress stage 2/2
-#: src/modules/OnPanic.rb:268
+#: src/modules/OnPanic.rb:267
msgid "Restart the service"
msgstr "Перезапустить сервис"
#. Progress step 1/2
-#: src/modules/OnPanic.rb:272
+#: src/modules/OnPanic.rb:271
msgid "Writing the settings..."
msgstr "Записываются параметры..."
#. Progress step 2/2
-#: src/modules/OnPanic.rb:274
+#: src/modules/OnPanic.rb:273
msgid "Restarting service..."
msgstr "Перезапуск сервиса..."
#. Create a textual summary and a list of configured devices
#. @return summary of the current configuration
-#: src/modules/ZFCPController.rb:304
+#: src/modules/ZFCPController.rb:279
msgid "Channel ID: %1, WWPN: %2, LUN: %3"
msgstr "ИД канала: %1; WWPN: %2; LUN: %3"
-#: src/modules/ZFCPController.rb:313
+#: src/modules/ZFCPController.rb:288
msgid "Channel ID: %1, WWPN: %2, LUN: %3, Device: %4"
msgstr "ИД канала: %1; WWPN: %2; LUN: %3; устройство: %4"
#. TRANSLATORS: warning message
-#: src/modules/ZFCPController.rb:372
+#: src/modules/ZFCPController.rb:348
msgid ""
"Cannot evaluate ZFCP controllers (e.g. in LPAR).\n"
"You will have to set it manually."
@@ -1712,61 +1712,61 @@
"Вам потребуется задать их вручную."
#. popup label
-#: src/modules/ZFCPController.rb:391
+#: src/modules/ZFCPController.rb:366
msgid "Reading Configured ZFCP Devices"
msgstr "Чтение настроенных устройств ZFCP"
#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:470
+#: src/modules/ZFCPController.rb:446
msgid "%1: WWPN invalid."
msgstr "%1: недопустимый WWPN."
#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:478
+#: 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:486
+#: 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:494
+#: 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:502
+#: 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:510
+#: 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:556
+#: src/modules/ZFCPController.rb:531
msgid "%1: Device <ccwid> does not exist."
msgstr "%1: Устройство <ccwid> не существует."
#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:564
+#: src/modules/ZFCPController.rb:539
msgid "%1: Module zfcp could not be loaded."
msgstr "%1: Не удалось загрузить модуль zfcp."
#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:572
+#: src/modules/ZFCPController.rb:547
msgid "%1: Adapter status could not be changed."
msgstr "%1: Не удалось изменить состояние адаптера."
#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:580
+#: src/modules/ZFCPController.rb:555
msgid "%1: WWPN ports still active."
msgstr "%1: Порты WWPN по-прежнему активны."
#. message, %1 is device identification
-#: src/modules/ZFCPController.rb:588
+#: src/modules/ZFCPController.rb:563
msgid "%1: This host adapter supports allow_lun_scan."
msgstr "%1: этот хост-адаптер поддерживает allow_lun_scan."
Modified: branches/SLE12-SP3/yast/ru/po/samba-server.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/samba-server.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/samba-server.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: samba-server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:29+0200\n"
+"POT-Creation-Date: 2017-04-05 02:29+0000\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -1710,107 +1710,115 @@
#. translators: progress finished
#. translators: write progress step
-#: src/modules/SambaServer.pm:172 src/modules/SambaServer.pm:285
+#: src/modules/SambaServer.pm:172 src/modules/SambaServer.pm:293
msgid "Finished"
msgstr "Готово"
+#: src/modules/SambaServer.pm:186
+msgid ""
+"Cups is required by samba for printing to \n"
+"work correctly. Do you wish to disable printing?\n"
+"Note: To reenable printing you will need to \n"
+"manually enable the \"printers\" share and install cups."
+msgstr ""
+
#. Samba-server read dialog caption
-#: src/modules/SambaServer.pm:255
+#: src/modules/SambaServer.pm:263
msgid "Saving Samba Server Configuration"
msgstr "Сохранение конфигурации сервер Samba"
#. translators: write progress stage
-#: src/modules/SambaServer.pm:260
+#: src/modules/SambaServer.pm:268
msgid "Write global settings"
msgstr "Записать глобальные параметры"
#. translators: write progress stage
-#: src/modules/SambaServer.pm:262
+#: src/modules/SambaServer.pm:270
msgid "Disable Samba services"
msgstr "Отключить сервис Samba"
#. translators: write progress stage
-#: src/modules/SambaServer.pm:264
+#: src/modules/SambaServer.pm:272
msgid "Enable Samba services"
msgstr "Включить сервис Samba"
#. translators: write progress stage
-#: src/modules/SambaServer.pm:266
+#: src/modules/SambaServer.pm:274
msgid "Write back-end settings"
msgstr "Запись параметров настройки базы данных"
#. translators: write progress stage
-#: src/modules/SambaServer.pm:268
+#: src/modules/SambaServer.pm:276
msgid "Write Samba accounts"
msgstr "Запись учетных записей Samba"
#. translators: write progress stage
-#: src/modules/SambaServer.pm:270
+#: src/modules/SambaServer.pm:278
msgid "Save firewall settings"
msgstr "Сохранить параметры брандмауэра"
#. translators: write progress step
-#: src/modules/SambaServer.pm:273
+#: src/modules/SambaServer.pm:281
msgid "Writing global settings..."
msgstr "Запись глобальных параметров..."
#. translators: write progress step
-#: src/modules/SambaServer.pm:275
+#: src/modules/SambaServer.pm:283
msgid "Disabling Samba services..."
msgstr "Отключается служба Samba..."
#. translators: write progress step
-#: src/modules/SambaServer.pm:277
+#: src/modules/SambaServer.pm:285
msgid "Enabling Samba services..."
msgstr "Включается служба Samba..."
#. translators: write progress step
-#: src/modules/SambaServer.pm:279
+#: src/modules/SambaServer.pm:287
msgid "Writing back-end settings..."
msgstr "Записываются параметры настройки базы данных..."
#. translators: write progress step
-#: src/modules/SambaServer.pm:281
+#: src/modules/SambaServer.pm:289
msgid "Writing Samba accounts..."
msgstr "Записываются учетные записи Samba..."
#. translators: write progress step
-#: src/modules/SambaServer.pm:283
+#: src/modules/SambaServer.pm:291
msgid "Saving firewall settings..."
msgstr "Сохранение параметров брандмауэра..."
#. /etc/samba/smb.conf is filename
-#: src/modules/SambaServer.pm:309
+#: src/modules/SambaServer.pm:317
msgid "Cannot write settings to /etc/samba/smb.conf."
msgstr "Невозможно записать параметры настройки в /etc/ntp.conf."
#. summary item: configured workgroup/domain
-#: src/modules/SambaServer.pm:406
+#: src/modules/SambaServer.pm:414
msgid "Global Configuration:"
msgstr "Общая Конфигурация:"
-#: src/modules/SambaServer.pm:408
+#: src/modules/SambaServer.pm:416
#, perl-format
msgid "Workgroup or Domain: %s"
msgstr "Рабочая группа или Домен %s"
#. summary item: selected role for the samba server
-#: src/modules/SambaServer.pm:412
+#: src/modules/SambaServer.pm:420
#, perl-format
msgid "Role: %s"
msgstr "Роль: %s"
#. summary item: status of the samba service
-#: src/modules/SambaServer.pm:415
+#: src/modules/SambaServer.pm:423
msgid "Samba server is disabled"
msgstr "сервер Samba отключен"
#. summary heading: configured shares
-#: src/modules/SambaServer.pm:419
+#: src/modules/SambaServer.pm:427
msgid "Share Configuration:"
msgstr "Настройка общих ресурсов:"
#. summary item: no configured shares
-#: src/modules/SambaServer.pm:425
+#: src/modules/SambaServer.pm:433
msgid "None"
msgstr "Никакой"
Modified: branches/SLE12-SP3/yast/ru/po/scanner.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/scanner.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/scanner.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: scanner\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:29+0200\n"
+"POT-Creation-Date: 2017-04-04 02:29+0000\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -157,7 +157,7 @@
#. 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/include/scanner/dialogs.rb:438 src/include/scanner/dialogs.rb:971
-#: src/modules/Scanner.rb:2261
+#: src/modules/Scanner.rb:2235
msgid "Failed to deactivate %1."
msgstr "Сбой выключения %1."
@@ -961,7 +961,7 @@
#. to add a preceding "The error message is:" comment
#. to display an error message where
#. %1 will be replaced by the actual error message:
-#: src/modules/Scanner.rb:355
+#: src/modules/Scanner.rb:353
msgid ""
"The error message is:\n"
"\n"
@@ -973,7 +973,7 @@
#. 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/Scanner.rb:377
+#: src/modules/Scanner.rb:375
msgid "Failed to determine the version of package %1."
msgstr "Сбой определения версии пакета %1."
@@ -983,7 +983,7 @@
#. Do not change or translate "Image Scan", it is a driver software name.
#. Do not change or translate "Avasys", it is a manufacturer name.
#. Do not change or translate "Epson", it is a manufacturer name.
-#: src/modules/Scanner.rb:399
+#: src/modules/Scanner.rb:397
msgid ""
"The third-party Image Scan driver software from Epson/Avasys is required.\n"
"The Image Scan driver software is made and provided by Epson (formerly Avasys)\n"
@@ -1017,12 +1017,12 @@
#. Is the package available to be installed?
#. Package::Available returns nil if no package source is available.
-#: src/modules/Scanner.rb:442
+#: src/modules/Scanner.rb:440
msgid "Required package %1 is not installed and there is no package repository available."
msgstr "Требуемый пакет %1 не установлен и недоступно хранилище пакетов."
#. Message of a Popup::Error where %1 will be replaced by the package name:
-#: src/modules/Scanner.rb:457
+#: src/modules/Scanner.rb:455
msgid "Required package %1 is not installed and not available in the repository."
msgstr "Требуемый пакет %1 не установлен и недоступен в хранилище пакетов."
@@ -1030,7 +1030,7 @@
#. Either the user has explicitly rejected to install the package,
#. or this error does not happen on a normal system
#. (i.e. a system which is not totally broken or totally messed up).
-#: src/modules/Scanner.rb:476
+#: src/modules/Scanner.rb:474
msgid "Failed to install required package %1."
msgstr "Не удалось установить необходимые пакеты %1."
@@ -1038,7 +1038,7 @@
#. Do not change or translate "net", it is a metadriver name.
#. Do not simply use "driver" because net is no normal driver but a metadriver.
#. Do not change or translate "scanimage -L", it is a fixed command.
-#: src/modules/Scanner.rb:497
+#: src/modules/Scanner.rb:495
msgid ""
"Failed to determine the active scanners.\n"
"If the net metadriver is activated while there is a problem\n"
@@ -1058,7 +1058,7 @@
#. (i.e. a system which is not totally broken or totally messed up).
#. Do not confuse this error with the case when no active scanner was determined.
#. The latter results no error.
-#: src/modules/Scanner.rb:519
+#: src/modules/Scanner.rb:517
msgid "Failed to determine the active scanners."
msgstr "Сбой обнаружения активных сканеров."
@@ -1070,8 +1070,8 @@
#. (i.e. a system which is not totally broken or totally messed up).
#. 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/Scanner.rb:533 src/modules/Scanner.rb:591
-#: src/modules/Scanner.rb:650 src/modules/Scanner.rb:2500
+#: src/modules/Scanner.rb:531 src/modules/Scanner.rb:589
+#: src/modules/Scanner.rb:648 src/modules/Scanner.rb:2474
msgid "File %1 does not exist."
msgstr "Файл %1 не существует."
@@ -1083,8 +1083,8 @@
#. (i.e. a system which is not totally broken or totally messed up).
#. 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/Scanner.rb:553 src/modules/Scanner.rb:611
-#: src/modules/Scanner.rb:670 src/modules/Scanner.rb:2520
+#: src/modules/Scanner.rb:551 src/modules/Scanner.rb:609
+#: src/modules/Scanner.rb:668 src/modules/Scanner.rb:2494
msgid "Failed to read %1."
msgstr "Сбой чтения %1."
@@ -1092,7 +1092,7 @@
#. (i.e. a system which is not totally broken or totally messed up).
#. Do not confuse this error with the case when no active driver was determined.
#. The latter results no error.
-#: src/modules/Scanner.rb:577
+#: src/modules/Scanner.rb:575
msgid "Failed to determine the active drivers."
msgstr "Сбой определения активных драйверов."
@@ -1100,7 +1100,7 @@
#. (i.e. a system which is not totally broken or totally messed up).
#. Do not confuse this error with the case when no scanner was autodetected.
#. The latter results no error.
-#: src/modules/Scanner.rb:636
+#: src/modules/Scanner.rb:634
msgid "Failed to detect scanners automatically."
msgstr "Сбой автоматического обнаружения сканеров."
@@ -1112,53 +1112,53 @@
#. - Determine active backends
#. - Try to autodetect USB and SCSI scanners and HP all-in-one USB and NETWORK scanners
#. @return true on success
-#: src/modules/Scanner.rb:766
+#: src/modules/Scanner.rb:764
msgid "Initializing Scanner Configuration"
msgstr "Сканеризация конфигурации сканер"
-#: src/modules/Scanner.rb:770
+#: src/modules/Scanner.rb:768
msgid "Check installed packages"
msgstr "Проверить установленные пакеты"
#. 2. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:772
+#: src/modules/Scanner.rb:770
msgid "Read or create the scanner database"
msgstr "Сканерили создать базу данных сканер"
#. 3. progress stage name of a Progress::New:
#. 5. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:774 src/modules/Scanner.rb:1988
+#: src/modules/Scanner.rb:772 src/modules/Scanner.rb:1986
msgid "Determine active scanners"
msgstr "Сканерить активные сканнеры"
#. 4. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:776
+#: src/modules/Scanner.rb:774
msgid "Determine active drivers"
msgstr "Определить активные драйвера"
#. 5. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:778
+#: src/modules/Scanner.rb:776
msgid "Detect scanners"
msgstr "Обнаружить сканеры"
#. 1. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:781
+#: src/modules/Scanner.rb:779
msgid "Checking installed packages..."
msgstr "Проверяются установленные пакеты..."
#. 2. progress step progress bar title of a Progress::New:
-#: src/modules/Scanner.rb:783
+#: src/modules/Scanner.rb:781
msgid "Reading or creating the scanner database..."
msgstr "Сканерили создание базы данных сканер..."
#. 3. progress step progress bar title of a Progress::New:
#. 5. progress step progress bar title of a Progress::New:
-#: src/modules/Scanner.rb:785 src/modules/Scanner.rb:2001
+#: src/modules/Scanner.rb:783 src/modules/Scanner.rb:1999
msgid "Determining active scanners..."
msgstr "Сканерение активных сканер..."
#. 4. progress step progress bar title of a Progress::New:
-#: src/modules/Scanner.rb:787
+#: src/modules/Scanner.rb:785
msgid "Determining active drivers..."
msgstr "Обнаружение активных драйверов..."
@@ -1167,49 +1167,49 @@
#. Body of a Popup::ShowFeedback:
#. Busy message:
#. Body of a Popup::ShowFeedback:
-#: src/modules/Scanner.rb:789 src/modules/Scanner.rb:1001
-#: src/modules/Scanner.rb:1070
+#: src/modules/Scanner.rb:787 src/modules/Scanner.rb:999
+#: src/modules/Scanner.rb:1068
msgid "Detecting scanners..."
msgstr "Обнаружение сканер..."
#. Last progress step progress bar title of a Progress::New:
#. Last progress step progress bar title of a Progress::New:
#. Last progress step progress bar title of a Progress::New:
-#: src/modules/Scanner.rb:791 src/modules/Scanner.rb:1030
-#: src/modules/Scanner.rb:2003
+#: src/modules/Scanner.rb:789 src/modules/Scanner.rb:1028
+#: src/modules/Scanner.rb:2001
msgid "Finished"
msgstr "Готово"
#. Progress 2. stage (Read or create the scanner database):
-#: src/modules/Scanner.rb:859
+#: src/modules/Scanner.rb:857
msgid "Creating scanner database..."
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/Scanner.rb:893
+#: src/modules/Scanner.rb:891
msgid "Aborting: Failed to create the scanner database."
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/Scanner.rb:933
+#: src/modules/Scanner.rb:931
msgid "Aborting: Failed to read %1."
msgstr "Прерываю: не могу прочитать %1."
#. Write scanner settings:
#. - Save the actual environment
#. @return true on success
-#: src/modules/Scanner.rb:1023
+#: src/modules/Scanner.rb:1021
msgid "Writing Scanner Configuration"
msgstr "Сканернастроек сканер"
-#: src/modules/Scanner.rb:1026
+#: src/modules/Scanner.rb:1024
msgid "Save the actual environment"
msgstr "Сохранить действующее окружение"
#. 1. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:1028
+#: src/modules/Scanner.rb:1026
msgid "Saving the actual environment..."
msgstr "Сохранение действующего окружения"
@@ -1217,7 +1217,7 @@
#. Do not change or translate "ptal", it is a service name.
#. Do not change or translate "hp-setup", it is a program name.
#. Do not change or translate "HPLIP", it is a subsystem name.
-#: src/modules/Scanner.rb:1088
+#: src/modules/Scanner.rb:1086
msgid ""
"There is at least one printer configuration that uses the ptal service.\n"
"It is possible to proceed but then the running ptal service could prevent\n"
@@ -1235,7 +1235,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/Scanner.rb:1099
+#: src/modules/Scanner.rb:1097
msgid ""
"Cannot run hp-setup because no graphical display can be opened. \n"
"This happens if YaST runs in text-only mode, or the user who runs YaST \n"
@@ -1254,7 +1254,7 @@
#. Message of a Popup::YesNo when hplip should be installed.
#. Do not change or translate "hp-setup", it is a program name.
#. Do not change or translate "hplip", it is a package name:
-#: src/modules/Scanner.rb:1111
+#: src/modules/Scanner.rb:1109
msgid ""
"It seems hplip is not installed, which is required to run hp-setup.\n"
"Should the hplip package be installed?\n"
@@ -1264,7 +1264,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/Scanner.rb:1117
+#: src/modules/Scanner.rb:1115
msgid ""
"Cannot run hp-setup because\n"
"/usr/bin/hp-setup is not executable\n"
@@ -1276,7 +1276,7 @@
#. Body of a Popup::ShowFeedback.
#. Do not change or translate "hp-setup", it is a program name:
-#: src/modules/Scanner.rb:1125
+#: src/modules/Scanner.rb:1123
msgid ""
"Launched hp-setup.\n"
"You must finish hp-setup before you can proceed with the scanner configuration.\n"
@@ -1286,25 +1286,25 @@
#. where autodetected scanners are listed in the second column
#. to denote those scanners which are not configured yet:
-#: src/modules/Scanner.rb:1296
+#: src/modules/Scanner.rb:1294
msgid "Not Configured:"
msgstr "Не настроен:"
#. Fallback device name if the real device name is missing:
#. Fallback device name if the real device name is missing:
-#: src/modules/Scanner.rb:1326 src/modules/Scanner.rb:2242
+#: src/modules/Scanner.rb:1324 src/modules/Scanner.rb:2216
msgid "Unknown device"
msgstr "Неизвестное устройство"
#. Fallback manufacturer name if the real manufacturer name is missing:
#. Fallback manufacturer name if the real manufacturer name is missing:
-#: src/modules/Scanner.rb:1332 src/modules/Scanner.rb:2230
+#: src/modules/Scanner.rb:1330 src/modules/Scanner.rb:2204
msgid "Unknown manufacturer"
msgstr "Неизвестный производитель"
#. Fallback model name if the real model name is missing:
#. Fallback model name if the real model name is missing:
-#: src/modules/Scanner.rb:1335 src/modules/Scanner.rb:2236
+#: src/modules/Scanner.rb:1333 src/modules/Scanner.rb:2210
msgid "Unknown model"
msgstr "Неизвестная модель"
@@ -1315,14 +1315,14 @@
#. %1 will be replaced by the manufacturer name
#. %2 will be replaced by the model name
#. %3 will be replaced by the device name where the scanner is connected to:
-#: src/modules/Scanner.rb:1360 src/modules/Scanner.rb:2225
+#: src/modules/Scanner.rb:1358 src/modules/Scanner.rb:2199
msgid "%1 %2 at %3"
msgstr "%1 %2 на %3"
#. A suffix for the second column of a table
#. where active scanner drivers are listed in the first column
#. to denote those drivers for which there is no matching active scanner:
-#: src/modules/Scanner.rb:1402
+#: src/modules/Scanner.rb:1400
msgid "No scanner recognized by this driver"
msgstr "Сканер не распознал ни одного сканер"
@@ -1330,12 +1330,12 @@
#. when neither a scanner was autodetected
#. nor an active scanner was found
#. nor an active driver was found:
-#: src/modules/Scanner.rb:1426
+#: src/modules/Scanner.rb:1424
msgid "No scanner was detected and no active scanner or driver exists."
msgstr "Сканер не обнаружен, и не существует активных сканер или драйверов."
#. Scanner model list firmware entry for models which require a firmware upload:
-#: src/modules/Scanner.rb:1455
+#: src/modules/Scanner.rb:1453
msgid "Firmware upload required."
msgstr "Требуется выгрузка прошивки."
@@ -1344,79 +1344,79 @@
#. Do not change or translate "Image Scan", it is a driver software name.
#. Do not change or translate "Avasys", it is a manufacturer name.
#. Do not change or translate "Epson", it is a manufacturer name.
-#: src/modules/Scanner.rb:1461
+#: src/modules/Scanner.rb:1459
msgid "Third-party Image Scan driver software from Epson/Avasys required."
msgstr "Необходим сторонний драйвер Image Scan от Epson/Avasys."
#. %1 will be replaced by the RPM package name
#. which provides the driver for the particular model:
-#: src/modules/Scanner.rb:1527
+#: src/modules/Scanner.rb:1525
msgid "Package %1"
msgstr "Пакет %1"
#. but where the backend (scanner driver) is unmaintained:
#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1548
+#: src/modules/Scanner.rb:1546
msgid "Unmaintained driver %1 may provide good functionality."
msgstr "Неподдерживаемый драйвер %1 может обеспечить хорошую функциональность."
#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1554
+#: src/modules/Scanner.rb:1552
msgid "Driver %1 should provide good functionality."
msgstr "Драйвер %1 обеспечивает хорошую функциональность."
#. Scanner model list status entry for "good" supported models:
-#: src/modules/Scanner.rb:1561
+#: src/modules/Scanner.rb:1559
msgid "This scanner is not supported."
msgstr "Сканераннер не поддерживается."
#. which are listed as "unsupported" for a particular driver:
#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1566
+#: src/modules/Scanner.rb:1564
msgid "This scanner is not supported by the driver %1."
msgstr "Этот сканер не поддерживается драйвером %1."
#. but where the backend (scanner driver) is unmaintained:
#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1576
+#: src/modules/Scanner.rb:1574
msgid "Unmaintained driver %1 may provide complete functionality."
msgstr "Неподдерживаемый драйвер %1 может обеспечить полную функциональность."
#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1584
+#: src/modules/Scanner.rb:1582
msgid "Driver %1 should provide complete functionality."
msgstr "Драйвер %1 обеспечивает полную функциональность."
#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1592
+#: src/modules/Scanner.rb:1590
msgid "Driver %1 may work, but was not tested."
msgstr "Драйвер %1 может работать, но не был протестирован."
#. but where the backend (scanner driver) is unmaintained:
#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1601
+#: src/modules/Scanner.rb:1599
msgid "Unmaintained driver %1 may provide basic functionality."
msgstr "Неподдерживаемый драйвер %1 может обеспечить базовую функциональность."
#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1609
+#: src/modules/Scanner.rb:1607
msgid "Driver %1 should provide basic functionality."
msgstr "Драйвер %1 обеспечивает базовую функциональность."
#. but where the backend (scanner driver) is unmaintained:
#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1619
+#: src/modules/Scanner.rb:1617
msgid "Unmaintained driver %1 may provide minimal functionality."
msgstr "Неподдерживаемый драйвер %1 может обеспечить минимальную функциональность."
#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1627
+#: src/modules/Scanner.rb:1625
msgid "Driver %1 should provide minimal functionality."
msgstr "Драйвер %1 обеспечивает минимальную функциональность."
#. which are listed but without a known support status:
#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1635
+#: src/modules/Scanner.rb:1633
msgid "Driver %1 may work, but the functionality is unknown."
msgstr "Драйвер %1 может работать, но функциональность неизвестна."
@@ -1426,7 +1426,7 @@
#. stored on the manufacturer's CD but often it is buried in a weird Windows-only
#. driver archive format. The text must indicate this.
#. Do not change or translate "SANE", it is a project name.
-#: src/modules/Scanner.rb:1886
+#: src/modules/Scanner.rb:1884
msgid ""
"A firmware file contains software that must be uploaded to the scanner's memory.\n"
"Without firmware, the scanner cannot work.\n"
@@ -1459,7 +1459,7 @@
#. Message of a Popup::ContinueCancel for scanners which should be set up with the hpaio driver.
#. Do not change or translate "ptal", it is a service name.
#. Do not change or translate "HPLIP", it is a subsystem name.
-#: src/modules/Scanner.rb:1905
+#: src/modules/Scanner.rb:1903
msgid ""
"There is at least one printer configuration that uses the ptal service.\n"
"It is possible to proceed but then the ptal service would be stopped\n"
@@ -1476,7 +1476,7 @@
#. Do not change or translate "PTAL", it is a subsystem name.
#. Do not change or translate "ptal", it is a service name.
#. Do not change or translate "hplip", it is a service name.
-#: src/modules/Scanner.rb:1917
+#: src/modules/Scanner.rb:1915
msgid ""
"The hpoj driver requires the PTAL system to be set up and running.\n"
"In particular, the ptal service must be up and running.\n"
@@ -1516,7 +1516,7 @@
#. Do not change or translate "hplip", it is a service name.
#. Do not change or translate "hpaio", it is a driver name.
#. Do not change or translate "ptal", it is a service name.
-#: src/modules/Scanner.rb:1940
+#: src/modules/Scanner.rb:1938
msgid ""
"There is at least one printer configuration that uses the hplip service.\n"
"It is possible to proceed but then the hplip service would be stopped\n"
@@ -1533,51 +1533,51 @@
"Как вариант, продолжайте и смените настройку принтера на использование службы ptal.\n"
#. %1 will be replaced by the backend name
-#: src/modules/Scanner.rb:1976
+#: src/modules/Scanner.rb:1974
msgid "Setting Up Driver %1"
msgstr "Устанавливаю драйвер %1"
-#: src/modules/Scanner.rb:1980
+#: src/modules/Scanner.rb:1978
msgid "Check whether additional packages must be installed"
msgstr "Проверить устанавливать ли дополнительные пакеты"
#. 2. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:1982
+#: src/modules/Scanner.rb:1980
msgid "Check whether firmware upload is required"
msgstr "Проверить требуется ли выгрузка прошивки"
#. 3. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:1984
+#: src/modules/Scanner.rb:1982
msgid "Test and set up special requirements for particular drivers"
msgstr "Проверить и установить особые требования для драйверов"
#. 4. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:1986
+#: src/modules/Scanner.rb:1984
msgid "Activate the driver"
msgstr "Активировать драйвер"
#. 1. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:1991
+#: src/modules/Scanner.rb:1989
msgid "Checking whether additional packages must be installed..."
msgstr "Проверяю устанавливать ли дополнительные пакеты..."
#. 2. progress step progress bar title of a Progress::New:
-#: src/modules/Scanner.rb:1993
+#: src/modules/Scanner.rb:1991
msgid "Checking whether firmware upload is required..."
msgstr "Проверяю, требуется ли выгрузка прошивки..."
#. 3. progress step progress bar title of a Progress::New:
-#: src/modules/Scanner.rb:1995
+#: src/modules/Scanner.rb:1993
msgid "Testing and setting up special requirements for particular drivers..."
msgstr "Проверка и установка особых требований для драйверов..."
#. 4. progress step progress bar title of a Progress::New:
-#: src/modules/Scanner.rb:1999
+#: src/modules/Scanner.rb:1997
msgid "Activating the driver..."
msgstr "Активация драйвера..."
#. the third-party Image Scan driver software from Epson/Avasys:
-#: src/modules/Scanner.rb:2020
+#: src/modules/Scanner.rb:2018
msgid "Required Package Not Installed"
msgstr "Требуемый пакет не установлен"
@@ -1587,7 +1587,7 @@
#. Only a simple message because before there was a dialog
#. which let the user install the package so that this message is shown
#. if the user has explicitly rejected to install it.
-#: src/modules/Scanner.rb:2028
+#: src/modules/Scanner.rb:2026
msgid "The driver %1 requires the package %2."
msgstr "Драйвер %1 требует пакет %2."
@@ -1595,9 +1595,8 @@
#. It may happen that the conflicting service hplip is in use by the printing system.
#. The hplip service is associated with the hpaoi backend.
#. Activate the backend via bash script:
-#: src/modules/Scanner.rb:2034 src/modules/Scanner.rb:2075
-#: src/modules/Scanner.rb:2119 src/modules/Scanner.rb:2133
-#: src/modules/Scanner.rb:2143
+#: src/modules/Scanner.rb:2032 src/modules/Scanner.rb:2073
+#: src/modules/Scanner.rb:2106 src/modules/Scanner.rb:2117
msgid "Aborted"
msgstr "Прервано"
@@ -1609,7 +1608,7 @@
#. because which scanner requires firmware upload is stored in the database
#. and additionally user confirmation must be requested.
#. Otherwise skip this section.
-#: src/modules/Scanner.rb:2054
+#: src/modules/Scanner.rb:2052
msgid "Firmware Upload Required"
msgstr "Требуется выгрузка прошивки"
@@ -1618,19 +1617,12 @@
#. which asked the user whether he wants to let YaST activate the ptal service
#. so that this message is shown if the user has explicitly rejected to do it.
#. Do not change or translate "ptal", it is a service name.
-#: src/modules/Scanner.rb:2109
+#: src/modules/Scanner.rb:2096
msgid "If the ptal service is not running, the scanner cannot work."
msgstr "Сканер не работает если не запущена служба ptal."
-#. 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).
-#. Do not change or translate "PTAL", it is a subsystem name.
-#: src/modules/Scanner.rb:2130
-msgid "Failed to set up the PTAL system."
-msgstr "Не удалось установить систему PTAL."
-
#. Header message for a list of scanners which will be deactivated:
-#: src/modules/Scanner.rb:2217
+#: src/modules/Scanner.rb:2191
msgid ""
"The following scanners use the same driver.\n"
"Therefore all those scanners will be deactivated:"
@@ -1645,49 +1637,49 @@
#. Do not change or translate "hpoj", it is a driver name.
#. Do not change or translate "ptal", it is a service name.
#. Do not change or translate "CUPS", it is a subsystem name.
-#: src/modules/Scanner.rb:2285
+#: src/modules/Scanner.rb:2259
msgid "The driver hpoj is deactivated but the associated service ptal is not deactivated because it is needed by the CUPS printing system."
msgstr "Драйвер hpoj отключен, но зависящая служба ptal не отключена, т.к. она нужна системе печати CUPS."
#. (i.e. a system which is not totally broken or totally messed up).
#. Do not change or translate "ptal", it is a service name.
-#: src/modules/Scanner.rb:2300
+#: src/modules/Scanner.rb:2274
msgid "Failed to stop the ptal service."
msgstr "Сбой остановки службы ptal."
#. (i.e. a system which is not totally broken or totally messed up).
#. Do not change or translate "ptal", it is a service name.
-#: src/modules/Scanner.rb:2311
+#: src/modules/Scanner.rb:2285
msgid "Failed to disable the ptal service."
msgstr "Сбой выключения службы ptal."
#. If there is no active scanner for the backend
#. then show a message but exit successfully because
#. it is no error when there is no active scanner for the backend:
-#: src/modules/Scanner.rb:2370
+#: src/modules/Scanner.rb:2344
msgid "No Scanner for %1"
msgstr "Нет сканер для %1"
#. Header of a Popup::AnyMessage where %1 will be replaced by the driver name:
#. Body of a Popup::AnyMessage:
-#: src/modules/Scanner.rb:2372
+#: src/modules/Scanner.rb:2346
msgid "It is not possible to test without a matching active scanner."
msgstr "Невозможно протестровать без соответствующего активного сканер."
#. Header of a SelectionBox with a list of scanners:
-#: src/modules/Scanner.rb:2387
+#: src/modules/Scanner.rb:2361
msgid "&Scanner to Test"
msgstr "&Сканер для проверки"
#. Test the device:
-#: src/modules/Scanner.rb:2409
+#: src/modules/Scanner.rb:2383
msgid "Testing %1"
msgstr "Проверяю %1"
#. Header of a Popup::ShowFeedback where %1 will be replaced by the driver name:
#. Body of a Popup::ShowFeedback where %1 will be replaced by the SANE device identifier.
#. Do not change or translate "scanimage -d %1 -v", it is a fixed command.
-#: src/modules/Scanner.rb:2412
+#: src/modules/Scanner.rb:2386
msgid "Testing with 'scanimage -d %1 -v'..."
msgstr "Проверка 'scanimage -d %1 -v'..."
@@ -1695,7 +1687,7 @@
#. %2 will be replaced by the actual test results
#. which are usually only available in English.
#. Do not change or translate "scanimage -d %1 -v", it is a fixed command.
-#: src/modules/Scanner.rb:2424
+#: src/modules/Scanner.rb:2398
msgid ""
"Test with 'scanimage -d %1 -v' failed.\n"
"The results are:\n"
@@ -1709,7 +1701,7 @@
#. Fallback message if the real results are missing:
#. Fallback message if the real results are missing:
-#: src/modules/Scanner.rb:2435 src/modules/Scanner.rb:2467
+#: src/modules/Scanner.rb:2409 src/modules/Scanner.rb:2441
msgid "(no results available)"
msgstr "(нет результатов)"
@@ -1719,7 +1711,7 @@
#. the scanner had fallen into coma or the USB or SCSI system had crashed
#. and then the scanner would be no longer an active scanner nor could it be autodetected.
#. To simulate such an event, simply unplug an USB scanner while it is being tested.
-#: src/modules/Scanner.rb:2450
+#: src/modules/Scanner.rb:2424
msgid "Successfully Tested %1"
msgstr "%1 успешно протестирован"
@@ -1727,7 +1719,7 @@
#. %2 will be replaced by the actual test results
#. which are usually only available in English.
#. Do not change or translate "scanimage -d %1 -v", it is a fixed command.
-#: src/modules/Scanner.rb:2456
+#: src/modules/Scanner.rb:2430
msgid ""
"Test with 'scanimage -d %1 -v' succeeded.\n"
"The results are:\n"
@@ -1743,7 +1735,7 @@
#. (i.e. a system which is not totally broken or totally messed up).
#. Do not confuse this error with the case when no scanning via network was configured.
#. The latter results no error.
-#: src/modules/Scanner.rb:2486
+#: src/modules/Scanner.rb:2460
msgid "Failed to determine the configuration for scanning via network."
msgstr "Сбой определения настройки сканирования через сеть."
@@ -1751,7 +1743,7 @@
#. (i.e. a system which is not totally broken or totally messed up).
#. Do not confuse this error with the case when no scanning via network is to be set up.
#. The latter results no error.
-#: src/modules/Scanner.rb:2562
+#: src/modules/Scanner.rb:2536
msgid "Failed to set up scanning via network."
msgstr "Сбой установки сканирования через сеть."
@@ -1766,11 +1758,14 @@
#. If any kind of firewall seems to be active, show a popup message
#. regarding scanning via network and firewall.
#. @return true if any kind of firewall seems to be active
-#: src/modules/Scanner.rb:2590
+#: src/modules/Scanner.rb:2564
msgid "Check that your firewall allows scanning via network."
msgstr "Проверьте, разрешает ли ваш брандмауэр сканирование по сети."
#. Popup::MessageDetails information regarding details:
-#: src/modules/Scanner.rb:2592
+#: src/modules/Scanner.rb:2566
msgid "For details regarding firewall see the help text of this dialog."
msgstr "Подробнее о брандмауэре см. в справке этого диалогового окна."
+
+#~ msgid "Failed to set up the PTAL system."
+#~ msgstr "Не удалось установить систему PTAL."
Modified: branches/SLE12-SP3/yast/ru/po/smt.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/smt.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/smt.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: smt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-04 17:26+0000\n"
+"POT-Creation-Date: 2017-05-22 12:57+0200\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -646,6 +646,19 @@
msgid "Writing patches..."
msgstr "Запись исправлений..."
+#. bnc #390085
+#: src/include/smt/dialogs.rb:1129
+#, fuzzy
+#| msgid "Database &Password"
+msgid "Database Password for %1 User"
+msgstr "&Пароль базы данных"
+
+#: src/include/smt/dialogs.rb:1137
+#, fuzzy
+#| msgid "P&assword for user (again)"
+msgid "Database Password for %1 User Once Again"
+msgstr "Подт&верждение пароля"
+
#. TRANSLATORS: error report
#: src/include/smt/dialogs.rb:1167 src/modules/SMTData.rb:1130
msgid "The first and the second password do not match."
Modified: branches/SLE12-SP3/yast/ru/po/storage.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/storage.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/storage.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: storage\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-03 01:29+0000\n"
+"POT-Creation-Date: 2017-05-17 17:46+0200\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -71,7 +71,7 @@
msgid "List partitions"
msgstr "Список разделов"
-#. Title for dialogue
+#. Title for dialog
#: src/clients/inst_disk_proposal.rb:76
msgid "Suggested Partitioning"
msgstr "Предложенная разметка"
@@ -88,7 +88,7 @@
#. popup text
#: src/clients/inst_disk_proposal.rb:123
-#: src/clients/partitions_proposal.rb:105
+#: src/clients/partitions_proposal.rb:115
msgid ""
"No automatic proposal possible.\n"
"Specify mount points manually in the 'Partitioner' dialog."
@@ -97,16 +97,14 @@
"Определите вручную точки монтирования в диалоге разбиения."
#. TRANSLATORS: button text
-#. this is the resize case
-#.
-#. this is the normal case
-#: src/clients/inst_disk_proposal.rb:135 src/clients/inst_target_part.rb:164
-#: src/clients/inst_target_part.rb:178 src/clients/inst_target_part.rb:185
+#. Return a term for a PushButton("Edit Proposal Settings")
+#. or Empty() if that button is disabled in control.xml.
+#: src/clients/inst_disk_proposal.rb:136 src/clients/inst_target_part.rb:500
msgid "Edit Proposal Settings"
msgstr "Редактировать параметры предложения"
#. help on suggested partitioning
-#: src/clients/inst_disk_proposal.rb:165
+#: src/clients/inst_disk_proposal.rb:166
msgid ""
"<p>\n"
"Your hard disks have been checked. The partition setup\n"
@@ -118,7 +116,7 @@
#. help text continued
#. %1 is replaced by button text
-#: src/clients/inst_disk_proposal.rb:175
+#: src/clients/inst_disk_proposal.rb:176
msgid ""
"<p>\n"
"To make only small adjustments to the proposed\n"
@@ -133,7 +131,7 @@
"модуля экспертной разметки.</p>\n"
#. help text continued
-#: src/clients/inst_disk_proposal.rb:188
+#: src/clients/inst_disk_proposal.rb:189
msgid ""
"<p>\n"
"If the suggestion does not fit your needs, create\n"
@@ -153,25 +151,25 @@
#. Attention! besides the testsuite, AutoYaST is using this to turn off
#. the proposal screen too. See inst_autosetup.ycp
-#: src/clients/inst_disk_proposal.rb:232
+#: src/clients/inst_disk_proposal.rb:233
msgid "Impossible to create the requested proposal."
msgstr "Невозможно создать запрошенное предложение."
#. TRANSLATORS: popup error message
-#: src/clients/inst_disk_proposal.rb:238
+#: src/clients/inst_disk_proposal.rb:239
msgid "Not enough space available to propose snapshots for root volume."
msgstr "Недостаточно свободного места, чтобы предложить снимки для корневого тома."
#. TRANSLATORS: popup error message
-#: src/clients/inst_disk_proposal.rb:244 src/clients/inst_target_part.rb:449
+#: src/clients/inst_disk_proposal.rb:245 src/clients/inst_target_part.rb:449
msgid "Not enough space available to propose separate /home."
msgstr "Недостаточно места, чтобы предложить отдельный /home."
-#: src/clients/inst_disk_proposal.rb:283
+#: src/clients/inst_disk_proposal.rb:284
msgid "Nothing assigned as root filesystem. Cannot continue."
msgstr "Не назначена корневая файловая система. Невозможно продолжить работу."
-#: src/clients/inst_disk_proposal.rb:304
+#: src/clients/inst_disk_proposal.rb:305
msgid ""
"Computing this proposal will overwrite manual changes \n"
"done so far. Continue with computing proposal?"
@@ -636,12 +634,12 @@
#. loop over targetMap and build radio buttons for selection
#. dont use foreach here since we need a counter (as a shortcut)
#. anyway
-#: src/clients/inst_target_selection.rb:115
+#: src/clients/inst_target_selection.rb:116
msgid "Available &Disks"
msgstr "Доступные диски"
#. label text
-#: src/clients/inst_target_selection.rb:149
+#: src/clients/inst_target_selection.rb:150
msgid "&Custom Partitioning (for experts)"
msgstr "Пользовательское разбиение (для экспертов)"
@@ -649,13 +647,13 @@
#. Below this label, all targets are listed that can be used as
#. installation target
#. heading text
-#: src/clients/inst_target_selection.rb:161
+#: src/clients/inst_target_selection.rb:162
msgid "Hard Disk"
msgstr "Жесткий диск"
#. normally the target is located on hard disks. Here no hard disks
#. can be found. YaST2 cannot install. Update CD might have newer drivers.
-#: src/clients/inst_target_selection.rb:172
+#: src/clients/inst_target_selection.rb:173
msgid "No disks found. Try using the update CD, if available, for installation."
msgstr "Диски не найдены. Попробуйте использовать для установки компакт-диск обновления, если он доступен."
@@ -664,7 +662,7 @@
#. "Preparing Hard Disk" is the description of the dialog what to
#. do while the following locale is the help description
#. help part 1 of 3
-#: src/clients/inst_target_selection.rb:184
+#: src/clients/inst_target_selection.rb:185
msgid ""
"<p>\n"
"All hard disks automatically detected on your system\n"
@@ -677,7 +675,7 @@
"</p>\n"
#. help part 2 of 3
-#: src/clients/inst_target_selection.rb:193
+#: src/clients/inst_target_selection.rb:194
msgid ""
"<p>\n"
"You may select later which part of the disk is used for &product;.\n"
@@ -688,7 +686,7 @@
"</p>\n"
#. help part 3 of 3
-#: src/clients/inst_target_selection.rb:202
+#: src/clients/inst_target_selection.rb:203
msgid ""
"\n"
"<p>\n"
@@ -707,7 +705,7 @@
#. first step of hd prepare, select a single disk or "expert" partitioning
#. Information what to do, background information
#. Information what to do, background information
-#: src/clients/inst_target_selection.rb:215
+#: src/clients/inst_target_selection.rb:216
#: src/include/partitioning/auto_part_ui.rb:244
#: src/include/partitioning/auto_part_ui.rb:302
msgid "Preparing Hard Disk"
@@ -715,14 +713,24 @@
#. there is a selection from which one option must be
#. chosen - at the moment no option is chosen
-#: src/clients/inst_target_selection.rb:271
+#: src/clients/inst_target_selection.rb:269
msgid "Select one of the options to continue."
msgstr "Выберите один из вариантов для продолжения."
-#: src/clients/inst_target_selection.rb:297
+#: src/clients/inst_target_selection.rb:295
msgid "Disk %1 is in use by %2"
msgstr "Диск %1 используется %2"
+#. Warning popup about using the expert partitioner
+#: src/clients/inst_target_selection.rb:352
+msgid ""
+"This is for experts only.\n"
+"You might lose support if you use this!\n"
+"\n"
+"Please refer to the manual to make sure your custom\n"
+"partitioning meets the requirements of this product."
+msgstr ""
+
#. encoding: utf-8
#. Copyright (c) 2012 Novell, Inc.
#.
@@ -780,19 +788,35 @@
#. See also file proposal-API.txt for details.
#: src/clients/partitions_proposal.rb:93
msgid ""
+"No snapshots possible.\n"
+"Please use larger root partition."
+msgstr ""
+
+#: src/clients/partitions_proposal.rb:105
+msgid ""
"The /home partition will not be formatted. After installation,\n"
"ensure that ownerships of home directories are set properly."
msgstr ""
"Раздел \"/home\" не будет отформатирован. После установки убедитесь,\n"
"что домашним каталогам назначены правильные владельцы."
+#. A custom configuration
+#: src/clients/partitions_proposal.rb:123
+msgid "Custom"
+msgstr "Пользовательский"
+
+#. A standard configuration
+#: src/clients/partitions_proposal.rb:126
+msgid "Standard"
+msgstr "Стандартные"
+
#. label text
-#: src/clients/partitions_proposal.rb:218
+#: src/clients/partitions_proposal.rb:239
msgid "Partitioning"
msgstr "Разметка"
#. label text
-#: src/clients/partitions_proposal.rb:220
+#: src/clients/partitions_proposal.rb:241
msgid "&Partitioning"
msgstr "Разбиение"
@@ -959,7 +983,7 @@
#. Label text
#. TRANSLATORS: checkbox text
#: src/include/partitioning/auto_part_ui.rb:341
-#: src/modules/StorageProposal.rb:6272
+#: src/modules/StorageProposal.rb:6295
msgid "Propose Separate &Home Partition"
msgstr "Предложить &отдельный домашний раздел"
@@ -977,7 +1001,7 @@
msgstr "Тип предложения"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:244
+#: src/include/partitioning/custom_part_check_generated.rb:248
msgid ""
"You have not assigned a root partition for\n"
"installation. This does not work. Assign the root mount point \"/\" to a\n"
@@ -992,7 +1016,7 @@
"Использовать эту настройку?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:257
+#: src/include/partitioning/custom_part_check_generated.rb:261
msgid ""
"You tried to mount a FAT partition to one of the following mount\n"
"points: /, /usr, /home, /opt or /var. This will very likely cause problems.\n"
@@ -1007,7 +1031,7 @@
"Действительно использовать эти настройки?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:270
+#: src/include/partitioning/custom_part_check_generated.rb:274
msgid ""
"You tried to mount a FAT partition to the\n"
"mount point /boot. This will very likely cause problems. Use a Linux file\n"
@@ -1022,7 +1046,7 @@
"Действительно использовать эти настройки?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:284
+#: src/include/partitioning/custom_part_check_generated.rb:288
msgid ""
"You have mounted a partition with Btrfs to the\n"
"mount point /boot. This will very likely cause problems. Use a Linux file\n"
@@ -1038,7 +1062,7 @@
#. A PReP/CHRP partition is not supposed to be mounted. So if we find any
#. other /boot partition, we should warn the user.
-#: src/include/partitioning/custom_part_check_generated.rb:298
+#: src/include/partitioning/custom_part_check_generated.rb:302
msgid ""
"Warning:\n"
"Your system needs a boot partition, either with type 0x41 PReP/CHRP\n"
@@ -1055,7 +1079,7 @@
"Продолжить установку с текущими параметрами?\n"
#. popup text, %1 is a number
-#: src/include/partitioning/custom_part_check_generated.rb:314
+#: src/include/partitioning/custom_part_check_generated.rb:318
msgid ""
"Warning:\n"
"Your boot partition ends above cylinder %1.\n"
@@ -1076,13 +1100,20 @@
"Использовать эту настройку?\n"
#. popup text, %1 is a size
-#: src/include/partitioning/custom_part_check_generated.rb:334
+#: src/include/partitioning/custom_part_check_generated.rb:338
+#, fuzzy
+#| msgid ""
+#| "Warning:\n"
+#| "Your boot partition is smaller than %1.\n"
+#| "We recommend to increase the size of /boot.\n"
+#| "\n"
+#| "Really keep this size of boot partition?\n"
msgid ""
"Warning:\n"
"Your boot partition is smaller than %1.\n"
"We recommend to increase the size of /boot.\n"
"\n"
-"Really keep this size of boot partition?\n"
+"Really keep this size of the boot partition?\n"
msgstr ""
"Предупреждение.\n"
"Раздел загрузки меньше %1.\n"
@@ -1091,7 +1122,7 @@
"Использовать указанный размер раздела загрузки?\n"
#. /////////////////////////// NO BOOT ///////////////////////////
-#: src/include/partitioning/custom_part_check_generated.rb:351
+#: src/include/partitioning/custom_part_check_generated.rb:355
msgid ""
"Warning: There is no partition of type bios_grub present.\n"
"Such a partition is recommended (required with Btrfs) when Grub2 is\n"
@@ -1108,7 +1139,7 @@
#. popup text
#. If the user chooses 'no' here, the system will not be able to
#. boot from the hard drive!
-#: src/include/partitioning/custom_part_check_generated.rb:371
+#: src/include/partitioning/custom_part_check_generated.rb:375
msgid ""
"Warning: There is no partition mounted as /boot.\n"
"To boot from your hard disk, a small /boot partition\n"
@@ -1127,7 +1158,7 @@
"Продолжить установку с текущими параметрами без раздела /boot?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:391
+#: src/include/partitioning/custom_part_check_generated.rb:395
msgid ""
"Warning: According to your setup, you intend to\n"
"boot your machine from the root partition (/), which, unfortunately,\n"
@@ -1148,7 +1179,7 @@
"\n"
"Использовать эту настройку?\n"
-#: src/include/partitioning/custom_part_check_generated.rb:417
+#: src/include/partitioning/custom_part_check_generated.rb:421
msgid ""
"Warning: Some subvolumes of the root filesystem are shadowed by\n"
"mount points of other filesystem. This could lead to problems.\n"
@@ -1162,7 +1193,7 @@
"\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:435
+#: src/include/partitioning/custom_part_check_generated.rb:441
msgid ""
"Warning: With your current setup, your %1\n"
"installation might not be directly bootable, because\n"
@@ -1179,7 +1210,7 @@
"Использовать эту настройку?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:453
+#: src/include/partitioning/custom_part_check_generated.rb:459
msgid ""
"Warning: With your current setup, your %2 installation\n"
"will encounter problems when booting, because you have no\n"
@@ -1204,7 +1235,7 @@
"Действительно использовать эти настройки?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:475
+#: src/include/partitioning/custom_part_check_generated.rb:481
msgid ""
"Warning: With your current setup, your %2 installation will\n"
"encounter problems when booting, because you have no \n"
@@ -1229,12 +1260,12 @@
"Действительно использовать эти настройки?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:498
+#: src/include/partitioning/custom_part_check_generated.rb:504
msgid "Really use this setup?"
msgstr "Использовать эту настройку?"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:506
+#: src/include/partitioning/custom_part_check_generated.rb:512
msgid ""
"\n"
"You have not assigned a swap partition. In most cases, we highly recommend \n"
@@ -1255,7 +1286,7 @@
"Действительно использовать эти настройки без раздела подкачки?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:522
+#: src/include/partitioning/custom_part_check_generated.rb:528
msgid ""
"\n"
"You chose to install onto an existing partition that will not be\n"
@@ -1268,7 +1299,7 @@
"в любом из следующих случаев:\n"
#. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:529
+#: src/include/partitioning/custom_part_check_generated.rb:535
msgid ""
"- if this is an existing ReiserFS partition\n"
"- if this partition already contains a Linux distribution that will be\n"
@@ -1281,7 +1312,7 @@
"- если этот раздел еще не содержит файловую систему.\n"
#. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:536
+#: src/include/partitioning/custom_part_check_generated.rb:542
msgid ""
"If in doubt, better go back and mark this partition for\n"
"formatting, especially if it is assigned to one of the standard mount points\n"
@@ -1292,7 +1323,7 @@
"такие как /boot, /opt или /var.\n"
#. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:542
+#: src/include/partitioning/custom_part_check_generated.rb:548
msgid ""
"If you decide to format the partition, all data on it will be lost.\n"
"\n"
@@ -1303,7 +1334,7 @@
"Оставить раздел неформатированным?\n"
#. popup text %1 is replaced by a raid name e.g. md0
-#: src/include/partitioning/custom_part_check_generated.rb:603
+#: src/include/partitioning/custom_part_check_generated.rb:609
msgid ""
"The selected device belongs to the RAID (%1).\n"
"Remove it from the RAID before editing it.\n"
@@ -1312,7 +1343,7 @@
"Перед редактированием его следует удалить из RAID.\n"
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:614
+#: src/include/partitioning/custom_part_check_generated.rb:620
msgid ""
"The selected device belongs to a volume group (%1).\n"
"Remove it from the volume group before editing it.\n"
@@ -1321,7 +1352,7 @@
"Перед редактированием его следует удалить из группы томов.\n"
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:624
+#: src/include/partitioning/custom_part_check_generated.rb:630
msgid ""
"The selected device is used by volume (%1).\n"
"Remove the volume before editing it.\n"
@@ -1330,7 +1361,7 @@
"Удалите том перед правкой.\n"
#. popup text %2 is a device name, %1 is the raid name
-#: src/include/partitioning/custom_part_check_generated.rb:657
+#: src/include/partitioning/custom_part_check_generated.rb:663
msgid ""
"The device (%2) belongs to the RAID (%1).\n"
"Remove it from the RAID before deleting it.\n"
@@ -1339,7 +1370,7 @@
"Исключите его из RAID перед удалением.\n"
#. popup text, %1 and %2 are device names
-#: src/include/partitioning/custom_part_check_generated.rb:668
+#: src/include/partitioning/custom_part_check_generated.rb:674
msgid ""
"The device (%2) is used by %1.\n"
"Remove %1 before deleting it.\n"
@@ -1347,12 +1378,12 @@
"Устройство (%2) используется %1.\n"
"Удалите %1 до удаления устройства.\n"
-#: src/include/partitioning/custom_part_check_generated.rb:680
+#: src/include/partitioning/custom_part_check_generated.rb:686
msgid "It cannot be deleted while mounted."
msgstr "Невозможно удалить, пока примонтировано."
#. popup text, %1 is a device name
-#: src/include/partitioning/custom_part_check_generated.rb:716
+#: src/include/partitioning/custom_part_check_generated.rb:722
msgid ""
"The device (%1) cannot be removed since it is a logical partition and \n"
"another logical partition with a higher number is in use.\n"
@@ -1361,7 +1392,7 @@
"его номер меньше номера другого логического раздела, который в данный момент используется.\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:792
+#: src/include/partitioning/custom_part_check_generated.rb:798
msgid ""
"The selected extended partition contains partitions which are currently mounted:\n"
"%1\n"
@@ -1374,7 +1405,7 @@
"Выберите \"Отмена\", если вы не знаете точно, что делаете.\n"
#. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_check_generated.rb:810
+#: src/include/partitioning/custom_part_check_generated.rb:816
msgid ""
"\n"
"The selected extended partition contains at least one LVM partition\n"
@@ -1388,7 +1419,7 @@
"групп томов перед удалением дополнительного раздела.\n"
#. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_check_generated.rb:821
+#: src/include/partitioning/custom_part_check_generated.rb:827
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1402,7 +1433,7 @@
"RAID перед удалением дополнительного раздела.\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:832
+#: src/include/partitioning/custom_part_check_generated.rb:838
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1414,6 +1445,30 @@
" используемый раздел. Перед удалением дополнительного раздела\n"
" необходимо удалить используемый том.\n"
+#. popup text, %1 is a size
+#: src/include/partitioning/custom_part_check_generated.rb:905
+#, fuzzy
+#| msgid ""
+#| "Warning:\n"
+#| "Your boot partition is smaller than %1.\n"
+#| "We recommend to increase the size of /boot.\n"
+#| "\n"
+#| "Really keep this size of boot partition?\n"
+msgid ""
+"Warning:\n"
+"\n"
+"Your root partition is very small for snapshots.\n"
+"We recommend to increase the size of the root partition\n"
+"to %1 or more or to disable snapshots.\n"
+"\n"
+"Really keep the current setup?\n"
+msgstr ""
+"Предупреждение.\n"
+"Раздел загрузки меньше %1.\n"
+"Мы рекомендуем увеличить размер /boot.\n"
+"\n"
+"Использовать указанный размер раздела загрузки?\n"
+
#. heading text
#: src/include/partitioning/custom_part_dialogs.rb:70
msgid "Enter your Password for the Encrypted File System."
@@ -1421,13 +1476,13 @@
#. label text
#: src/include/partitioning/custom_part_dialogs.rb:74
-#: src/include/partitioning/ep-dialogs.rb:806
-#: src/modules/StorageProposal.rb:6400
+#: src/include/partitioning/ep-dialogs.rb:805
+#: src/modules/StorageProposal.rb:6423
msgid "Do not forget what you enter here!"
msgstr "Не забудьте то, что вы здесь ввели!"
#: src/include/partitioning/custom_part_dialogs.rb:78
-#: src/include/partitioning/ep-dialogs.rb:809
+#: src/include/partitioning/ep-dialogs.rb:808
msgid "Empty password allowed."
msgstr "Пустой пароль разрешён."
@@ -1456,7 +1511,7 @@
#. Label: get password for user root
#. Please use newline if label is longer than 40 characters
#: src/include/partitioning/custom_part_dialogs.rb:136
-#: src/include/partitioning/ep-dialogs.rb:834
+#: src/include/partitioning/ep-dialogs.rb:833
msgid "&Enter a Password for your File System:"
msgstr "Вв&едите пароль файловой системы:"
@@ -1467,7 +1522,7 @@
#. Label: get same password again for verification
#. Please use newline if label is longer than 40 characters
#: src/include/partitioning/custom_part_dialogs.rb:147
-#: src/include/partitioning/ep-dialogs.rb:818 src/modules/Storage.rb:4007
+#: src/include/partitioning/ep-dialogs.rb:817 src/modules/Storage.rb:4002
msgid "Reenter the Password for &Verification:"
msgstr "&Введите пароль еще раз для проверки:"
@@ -1490,7 +1545,7 @@
#. popup text
#. popup text
#: src/include/partitioning/custom_part_dialogs.rb:196
-#: src/modules/Storage.rb:3963
+#: src/modules/Storage.rb:3958
msgid ""
"You did not enter a password.\n"
"Try again.\n"
@@ -1501,7 +1556,7 @@
#. popup text
#. popup text
#: src/include/partitioning/custom_part_dialogs.rb:203
-#: src/modules/Storage.rb:3971
+#: src/modules/Storage.rb:3966
msgid ""
"The password must have at least %1 characters.\n"
"Try again.\n"
@@ -1621,47 +1676,54 @@
msgstr "Файловая &система"
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1053
+#: src/include/partitioning/custom_part_dialogs.rb:1059
msgid "O&ptions..."
msgstr "Параметры(&p)... "
+#. Translators: checkbox text
+#. TRANSLATORS: checkbox text
+#: src/include/partitioning/custom_part_dialogs.rb:1069
+#: src/modules/StorageProposal.rb:6276
+msgid "Enable Snapshots"
+msgstr "Включить мгновенные состояния"
+
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1069
+#: src/include/partitioning/custom_part_dialogs.rb:1084
msgid "&Encrypt Device"
msgstr "&Зашифровать устройство"
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1144
+#: src/include/partitioning/custom_part_dialogs.rb:1159
msgid "File system &ID:"
msgstr "ID файловой системы:"
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1176
+#: src/include/partitioning/custom_part_dialogs.rb:1191
msgid "Format"
msgstr "Форматировать"
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1186
+#: src/include/partitioning/custom_part_dialogs.rb:1201
msgid "Do ¬ format"
msgstr "Не форматировать"
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1196
+#: src/include/partitioning/custom_part_dialogs.rb:1211
msgid "&Format"
msgstr "&Форматировать"
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1249
+#: src/include/partitioning/custom_part_dialogs.rb:1264
msgid "Fs&tab Options"
msgstr "Опции Fstab"
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1256
+#: src/include/partitioning/custom_part_dialogs.rb:1271
msgid "&Mount Point"
msgstr "Точка монтирования"
#. popup text %1 is a partition name, %2 a dirctory
-#: src/include/partitioning/custom_part_dialogs.rb:1268
+#: src/include/partitioning/custom_part_dialogs.rb:1283
msgid ""
"\n"
"The selected partition (%1) is currently mounted on %2.\n"
@@ -1686,7 +1748,7 @@
"Продолжить?\n"
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1297
+#: src/include/partitioning/custom_part_dialogs.rb:1312
msgid ""
"\n"
"The file system on the partition cannot be shrunk by YaST2.\n"
@@ -1697,7 +1759,7 @@
"Уменьшение возможно только для файловых систем fat, ext2, ext3, ext4 и reiser."
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1304
+#: src/include/partitioning/custom_part_dialogs.rb:1319
msgid ""
"\n"
"The file system on the logical volume cannot be shrunk by YaST2.\n"
@@ -1708,21 +1770,21 @@
"Уменьшение возможно только для файловых систем fat, ext2, ext3, ext4 и reiser."
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1316
+#: src/include/partitioning/custom_part_dialogs.rb:1331
msgid "You risk losing data if you shrink this partition."
msgstr "Вы рискуете потерять данные, если уменьшите этот раздел."
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1322
+#: src/include/partitioning/custom_part_dialogs.rb:1337
msgid "You risk losing data if you shrink this logical volume."
msgstr "Вы рискуете потерять данные, если уменьшите этот логический том."
-#: src/include/partitioning/custom_part_dialogs.rb:1326
+#: src/include/partitioning/custom_part_dialogs.rb:1341
msgid "Continue?"
msgstr "Продолжить?"
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1342
+#: src/include/partitioning/custom_part_dialogs.rb:1357
msgid ""
"\n"
"The file system on the selected partition cannot be extended by YaST2.\n"
@@ -1733,7 +1795,7 @@
"Можно расширять только файловые системы fat, ext2, ext3, ext4, xfs и reiser."
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1349
+#: src/include/partitioning/custom_part_dialogs.rb:1364
msgid ""
"\n"
"The file system on the selected logical volume cannot be extended by YaST2.\n"
@@ -1743,20 +1805,20 @@
"Файловая система на выбранном логическом томе не может быть расширена YaST2.\n"
"Можно расширять только файловые системы fat, ext2, ext3, ext4, xfs и reiser."
-#: src/include/partitioning/custom_part_dialogs.rb:1357
+#: src/include/partitioning/custom_part_dialogs.rb:1372
msgid "Continue resizing?"
msgstr "Продолжить изменение размера?"
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1374
+#: src/include/partitioning/custom_part_dialogs.rb:1389
msgid "You decreased a partition with a reiser file system on it."
msgstr "Вы уменьшили раздел с файловой системой reiser."
-#: src/include/partitioning/custom_part_dialogs.rb:1376
+#: src/include/partitioning/custom_part_dialogs.rb:1391
msgid "You decreased a logical volume with a reiser file system on it."
msgstr "Вы уменьшили логический том с файловой системой reiser."
-#: src/include/partitioning/custom_part_dialogs.rb:1383
+#: src/include/partitioning/custom_part_dialogs.rb:1398
msgid ""
"\n"
"It is possible to shrink a reiser file system, but this feature is not\n"
@@ -1771,7 +1833,7 @@
"Уменьшить файловую систему?"
#. popup text, %1 is replaced by device name
-#: src/include/partitioning/custom_part_dialogs.rb:1437
+#: src/include/partitioning/custom_part_dialogs.rb:1452
msgid ""
"The selected device contains partitions that are currently mounted:\n"
"%1\n"
@@ -1784,7 +1846,7 @@
"Выберите \"Отмена\", если вы не знаете точно, что делаете.\n"
#. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_dialogs.rb:1460
+#: src/include/partitioning/custom_part_dialogs.rb:1475
msgid ""
"\n"
"The selected device contains at least one LVM partition\n"
@@ -1799,7 +1861,7 @@
"перед удалением устройства.\n"
#. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_dialogs.rb:1471
+#: src/include/partitioning/custom_part_dialogs.rb:1486
msgid ""
"\n"
"The selected device contains at least one partition\n"
@@ -1814,7 +1876,7 @@
"устройства.\n"
#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1482
+#: src/include/partitioning/custom_part_dialogs.rb:1497
msgid ""
"\n"
"The selected device contains at least one partition\n"
@@ -1827,47 +1889,40 @@
"перед удалением устройства.\n"
#. help text, richtext format
-#: src/include/partitioning/custom_part_dialogs.rb:1543
+#: src/include/partitioning/custom_part_dialogs.rb:1558
msgid "<p>Create and remove subvolumes from a Btrfs filesystem.</p>\n"
msgstr "<p>Создать и удалить служебные тома из файловой системы Btrfs.</p>\n"
-#: src/include/partitioning/custom_part_dialogs.rb:1548
+#: src/include/partitioning/custom_part_dialogs.rb:1563
msgid "<p>Enable automatic snapshots for a Btrfs filesystem with snapper.</p>"
msgstr "<p>Включить автоматические мгновенные состояния для файловой системы Btrfs со средством Snapper.</p>"
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1562
+#: src/include/partitioning/custom_part_dialogs.rb:1577
msgid "Existing Subvolumes:"
msgstr "Существующие подтома:"
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1568
+#: src/include/partitioning/custom_part_dialogs.rb:1583
msgid "New Subvolume"
msgstr "Новый подтом"
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1574
+#: src/include/partitioning/custom_part_dialogs.rb:1589
msgid "Add new"
msgstr "Добавить новый"
#. button text
#. push button text
-#: src/include/partitioning/custom_part_dialogs.rb:1580
+#: src/include/partitioning/custom_part_dialogs.rb:1595
#: src/modules/DualMultiSelectionBox.rb:147
msgid "Remove"
msgstr "Удалить"
-#. TRANSLATOR: checkbox text
-#. TRANSLATORS: checkbox text
-#: src/include/partitioning/custom_part_dialogs.rb:1592
-#: src/modules/StorageProposal.rb:6253
-msgid "Enable Snapshots"
-msgstr "Включить мгновенные состояния"
-
#. heading text
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1603
-#: src/include/partitioning/custom_part_lib.rb:409
+#: src/include/partitioning/custom_part_dialogs.rb:1605
+#: src/include/partitioning/custom_part_lib.rb:386
msgid "Subvolume Handling"
msgstr "Обработка подтома"
@@ -1887,7 +1942,7 @@
msgid "Subvolume name %1 already exists."
msgstr "Имя подтома %1 уже существует."
-#: src/include/partitioning/custom_part_dialogs.rb:1711
+#: src/include/partitioning/custom_part_dialogs.rb:1702
msgid "Modifications done so far in this dialog will be lost."
msgstr "Изменения, произведенные в этом диалоговом окне, будут утеряны."
@@ -1930,7 +1985,7 @@
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:87
-#: src/include/partitioning/ep-dialogs.rb:746
+#: src/include/partitioning/ep-dialogs.rb:745
msgid ""
"<p>\n"
"This mount point corresponds to a temporary filesystem like /tmp or /var/tmp.\n"
@@ -1949,7 +2004,7 @@
#. help text, continued
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:100
-#: src/include/partitioning/ep-dialogs.rb:761
+#: src/include/partitioning/ep-dialogs.rb:760
msgid ""
"<p>\n"
"If you forget your password, you will lose access to the data on your file system.\n"
@@ -1968,7 +2023,7 @@
#. help text, continued
#. helptext, %1 is replaced by integer
#: src/include/partitioning/custom_part_helptexts.rb:114
-#: src/include/partitioning/ep-dialogs.rb:775
+#: src/include/partitioning/ep-dialogs.rb:774
msgid ""
"<p>\n"
"You must distinguish between uppercase and lowercase. A password should have at\n"
@@ -1999,7 +2054,7 @@
#. help text, continued
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:142
-#: src/include/partitioning/ep-dialogs.rb:787
+#: src/include/partitioning/ep-dialogs.rb:786
msgid ""
"<p>\n"
"Do not forget this password!\n"
@@ -2070,17 +2125,17 @@
"Отметьте все разделы на этом диске, которые нужно удалить.\n"
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:51
+#: src/include/partitioning/custom_part_lib.rb:50
msgid "You cannot use the mount point \"%1\" for LVM.\n"
msgstr "Вы не можете использовать точку монтирования \"%1\" для LVM.\n"
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:78
+#: src/include/partitioning/custom_part_lib.rb:77
msgid "You cannot use the mount point %1 for RAID."
msgstr "Вы не можете использовать точку монтирования %1 для RAID."
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:97
+#: src/include/partitioning/custom_part_lib.rb:96
msgid ""
"You have selected to not automatically mount at start-up a file system\n"
"that may contain files that the system needs to work properly.\n"
@@ -2097,21 +2152,8 @@
"Продолжить?\n"
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:120
+#: src/include/partitioning/custom_part_lib.rb:138
msgid ""
-"You have assigned an encrypted file system to a partition\n"
-"with one of the following mount points: \"/\", \"/usr\", \"/boot\",\n"
-"/var\". This is not possible. Change the mount point or use a\n"
-"nonloopbacked file system.\n"
-msgstr ""
-"Зашифрованная файловая система назначена разделу\n"
-"с одной из следующих точек монтирования: \"/\", \"/usr\", \"/boot\",\n"
-" /var\". Это невозможно. Измените точку монтирования или используйте\n"
-" файловую систему без обратной петли.\n"
-
-#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:158
-msgid ""
"You have set a file system as mountable by users. The file system\n"
"may contain files that need to be executable.\n"
"\n"
@@ -2130,28 +2172,28 @@
#. @param [Hash{String => map}] targetMap the TargetMap
#. @param mount mount point
#. @return [Boolean]
-#: src/include/partitioning/custom_part_lib.rb:205
+#: src/include/partitioning/custom_part_lib.rb:185
msgid "Mount point must not be empty."
msgstr "Точка монтирования не должна быть пустой."
#. error popup
-#: src/include/partitioning/custom_part_lib.rb:210
+#: src/include/partitioning/custom_part_lib.rb:190
msgid "Swap devices must have swap as mount point."
msgstr "Устройства подкачки должны иметь точку монтирования swap."
#. error popup
-#: src/include/partitioning/custom_part_lib.rb:214
+#: src/include/partitioning/custom_part_lib.rb:194
msgid "Only swap devices may have swap as mount point."
msgstr "Только устройства подкачки могут иметь точку монтирования swap."
#. && mount!="swap" )
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:229
+#: src/include/partitioning/custom_part_lib.rb:209
msgid "This mount point is already in use. Select a different one."
msgstr "Эта точка монтирования уже используется, выберите другую."
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:239
+#: src/include/partitioning/custom_part_lib.rb:219
msgid ""
"FAT filesystem used for system mount point (/, /usr, /opt, /var, /home).\n"
"This is not possible."
@@ -2160,12 +2202,12 @@
"Это невозможно."
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:248
+#: src/include/partitioning/custom_part_lib.rb:228
msgid "Invalid character in mount point. Do not use \"`'!\"%#\" in a mount point."
msgstr "Неверный символ в точке монтирования. Не используйте \"`'!\"%#\" в точке монтирования."
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:257
+#: src/include/partitioning/custom_part_lib.rb:237
msgid ""
"You cannot use any of the following mount points:\n"
"/bin, /dev, /etc, /lib, /lib64, /lost+found, /mnt, /proc, /sbin, /sys,\n"
@@ -2176,12 +2218,12 @@
"/var/adm/mnt\n"
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:266
+#: src/include/partitioning/custom_part_lib.rb:246
msgid "Your mount point must start with a \"/\" "
msgstr "Точка монтирования должна начинаться с \"/\" "
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:272
+#: src/include/partitioning/custom_part_lib.rb:252
msgid ""
"It is not allowed to assign the mount point swap\n"
"to a device without a swap file system."
@@ -2190,17 +2232,23 @@
"к устройствам без файла подкачки."
#. warning message, %1 is replaced by fs name (e.g. Ext3)
-#. %2 is prelaced by a size (e.g. 10 MB)
-#: src/include/partitioning/custom_part_lib.rb:299
+#. %2 is replaced by the user entered size (e.g. 20GB)
+#. %3 is replaced by a size (e.g. 10 MB)
+#: src/include/partitioning/custom_part_lib.rb:280
+#, fuzzy
+#| msgid ""
+#| "Your partition is too small to use %1.\n"
+#| "The minimum size for this file system is %2.\n"
msgid ""
"Your partition is too small to use %1.\n"
-"The minimum size for this file system is %2.\n"
+"The size you entered (after rounding up) is %2.\n"
+"The minimum size for this file system is %3.\n"
msgstr ""
"Раздел сшиком мал для использования %1.\n"
"Минимальный размер для этой файловой системы %2.\n"
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:369
+#: src/include/partitioning/custom_part_lib.rb:346
msgid ""
"It is not allowed to assign a mount point\n"
"to a device with nonexistent or unknown file system."
@@ -2209,7 +2257,7 @@
"с несуществующей или неизвестной файловой системой."
#. warning message, %1 is replaced by fs name (e.g. Ext3)
-#: src/include/partitioning/custom_part_lib.rb:482
+#: src/include/partitioning/custom_part_lib.rb:545
msgid ""
"\n"
"WARNING:\n"
@@ -2233,12 +2281,12 @@
#. //////////////////////////////////////////////
#. modify map new
-#: src/include/partitioning/custom_part_lib.rb:924
-#: src/include/partitioning/custom_part_lib.rb:951
+#: src/include/partitioning/custom_part_lib.rb:980
+#: src/include/partitioning/custom_part_lib.rb:1007
msgid "The file system is currently mounted on %1."
msgstr "Файловая система смонтирована в %1."
-#: src/include/partitioning/custom_part_lib.rb:929
+#: src/include/partitioning/custom_part_lib.rb:985
msgid ""
"You can try to unmount it now, continue without unmounting or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
@@ -2248,12 +2296,12 @@
#. button text
#. button text
-#: src/include/partitioning/custom_part_lib.rb:940
-#: src/include/partitioning/custom_part_lib.rb:965
+#: src/include/partitioning/custom_part_lib.rb:996
+#: src/include/partitioning/custom_part_lib.rb:1021
msgid "Unmount"
msgstr "Отключить"
-#: src/include/partitioning/custom_part_lib.rb:956
+#: src/include/partitioning/custom_part_lib.rb:1012
msgid ""
"You can try to unmount it now or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
@@ -2261,15 +2309,15 @@
"Можете попробовать отмонтировать её сейчас или отменить операцию.\n"
"Нажмите «Отмена», если вы не уверены в своих действиях."
-#: src/include/partitioning/custom_part_lib.rb:1002
+#: src/include/partitioning/custom_part_lib.rb:1058
msgid "It is not possible to shrink the file system while it is mounted."
msgstr "Невозможно уменьшить файловую систему, пока она смонтирована."
-#: src/include/partitioning/custom_part_lib.rb:1015
+#: src/include/partitioning/custom_part_lib.rb:1071
msgid "It is not possible to extend the file system while it is mounted."
msgstr "Невозможно увеличить файловую систему, пока она смонтирована."
-#: src/include/partitioning/custom_part_lib.rb:1026
+#: src/include/partitioning/custom_part_lib.rb:1082
msgid "It is not possible to resize the file system while it is mounted."
msgstr "Невозможно изменить размер файловой системы, пока она смонтирована."
@@ -2751,47 +2799,47 @@
"примонтирован, и введите точку монтирования ( /, /boot, /home, /var и т.д.)</p>"
#. set globals
-#: src/include/partitioning/ep-dialogs.rb:337
+#: src/include/partitioning/ep-dialogs.rb:336
msgid "Formatting Options"
msgstr "Опции форматирования"
-#: src/include/partitioning/ep-dialogs.rb:345
+#: src/include/partitioning/ep-dialogs.rb:344
msgid "Format partition"
msgstr "Форматировать раздел"
-#: src/include/partitioning/ep-dialogs.rb:356
+#: src/include/partitioning/ep-dialogs.rb:355
msgid "Do not format partition"
msgstr "Не форматировать раздел"
-#: src/include/partitioning/ep-dialogs.rb:372
+#: src/include/partitioning/ep-dialogs.rb:371
msgid "Do not mount partition"
msgstr "Не монтировать раздел"
-#: src/include/partitioning/ep-dialogs.rb:391
+#: src/include/partitioning/ep-dialogs.rb:390
msgid "Mounting Options"
msgstr "Опции монтирования"
-#: src/include/partitioning/ep-dialogs.rb:399
+#: src/include/partitioning/ep-dialogs.rb:398
msgid "Mount partition"
msgstr "Монтировать раздел"
#. Column header
-#: src/include/partitioning/ep-dialogs.rb:405 src/modules/StorageFields.rb:144
+#: src/include/partitioning/ep-dialogs.rb:404 src/modules/StorageFields.rb:144
msgid "Mount Point"
msgstr "Точка монтирования"
#. button text
-#: src/include/partitioning/ep-dialogs.rb:412
+#: src/include/partitioning/ep-dialogs.rb:411
msgid "Fs&tab Options..."
msgstr "Опции Fs&tab..."
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:596
+#: src/include/partitioning/ep-dialogs.rb:595
msgid "Crypt files must be encrypted."
msgstr "Файлы шифра должны быть зашифрованы."
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:607
+#: src/include/partitioning/ep-dialogs.rb:606
msgid ""
"You chose to create the crypt file, but did not specify\n"
"that it should be formatted. This does not make sense.\n"
@@ -2804,17 +2852,17 @@
"Проверьте также опцию формата.\n"
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:623
+#: src/include/partitioning/ep-dialogs.rb:622
msgid "Crypt files require a mount point."
msgstr "Файлам шифра нужна точка монтирования."
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:637
+#: src/include/partitioning/ep-dialogs.rb:636
msgid "Tmpfs requires a mount point."
msgstr "Для Tmpfs требуется точка монтирования."
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:721
+#: src/include/partitioning/ep-dialogs.rb:720
msgid ""
"<p>\n"
"Keep in mind that this file system is only protected when it is not\n"
@@ -2829,7 +2877,7 @@
"</p>"
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:734
+#: src/include/partitioning/ep-dialogs.rb:733
msgid ""
"<p>\n"
"The file system used for this volume is swap. You can leave the encryption \n"
@@ -2843,21 +2891,21 @@
"гибернации (приостановки работы с записью состояния на диск).\n"
"</p>\n"
-#: src/include/partitioning/ep-dialogs.rb:804
+#: src/include/partitioning/ep-dialogs.rb:803
msgid "All data stored on the volume will be lost!"
msgstr "Все данные, хранящиеся на этом томе, будут потеряны."
-#: src/include/partitioning/ep-dialogs.rb:827
+#: src/include/partitioning/ep-dialogs.rb:826
msgid "Password"
msgstr "ПАРОЛЬ"
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:924
+#: src/include/partitioning/ep-dialogs.rb:923
msgid "Resize not supported by underlying device."
msgstr "Изменение размера не поддерживается устройством нижнего уровня."
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:929
+#: src/include/partitioning/ep-dialogs.rb:928
msgid ""
"\n"
"You cannot resize the selected partition because the file system\n"
@@ -2867,7 +2915,7 @@
"Размер выбранного раздела изменить нельзя, поскольку файловая система\n"
" этого раздела не поддерживает изменение размера.\n"
-#: src/include/partitioning/ep-dialogs.rb:953
+#: src/include/partitioning/ep-dialogs.rb:952
msgid ""
"It is not possible to check whether a NTFS\n"
"can be resized while it is mounted."
@@ -2876,7 +2924,7 @@
"пока она примонтирована."
#. FIXME: Really?
-#: src/include/partitioning/ep-dialogs.rb:972
+#: src/include/partitioning/ep-dialogs.rb:971
msgid ""
"Partition %1 cannot be resized\n"
"because the filesystem seems to be inconsistent.\n"
@@ -2885,21 +2933,21 @@
"так как нарушена целостность файловой системы.\n"
#. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:999
+#: src/include/partitioning/ep-dialogs.rb:998
msgid "Resize Partition %1"
msgstr "Изменить размер раздела %1"
#. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:1020
+#: src/include/partitioning/ep-dialogs.rb:1019
msgid "Resize Logical Volume %1"
msgstr "Изменить размер логического тома %1"
#. size_k + min_size_k could be > max_size_k
-#: src/include/partitioning/ep-dialogs.rb:1052
+#: src/include/partitioning/ep-dialogs.rb:1051
msgid "Current size: %1"
msgstr "Текущий размер: %1"
-#: src/include/partitioning/ep-dialogs.rb:1064
+#: src/include/partitioning/ep-dialogs.rb:1063
msgid "Currently used: %1"
msgstr "Сейчас используется: %1"
@@ -2907,8 +2955,8 @@
#. input field label
#. combo box label
#. Column header
-#: src/include/partitioning/ep-dialogs.rb:1077
-#: src/include/partitioning/ep-dialogs.rb:1114
+#: src/include/partitioning/ep-dialogs.rb:1076
+#: src/include/partitioning/ep-dialogs.rb:1113
#: src/include/partitioning/ep-hd-dialogs.rb:256
#: src/include/partitioning/ep-loop-dialogs.rb:118
#: src/include/partitioning/ep-lvm-dialogs.rb:559
@@ -2920,33 +2968,33 @@
#. radio button text, %1 is replaced by size
#. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1087
+#: src/include/partitioning/ep-dialogs.rb:1086
#: src/include/partitioning/ep-hd-dialogs.rb:242
#: src/include/partitioning/ep-lvm-dialogs.rb:535
msgid "Maximum Size (%1)"
msgstr "Максимальный размер (%1)"
#. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1097
+#: src/include/partitioning/ep-dialogs.rb:1096
msgid "Minimum Size (%1)"
msgstr "Минимальный размер (%1)"
#. radio button text
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:1106
+#: src/include/partitioning/ep-dialogs.rb:1105
#: src/include/partitioning/ep-hd-dialogs.rb:251
#: src/include/partitioning/ep-lvm-dialogs.rb:568
msgid "Custom Size"
msgstr "Другой размер"
#. help text
-#: src/include/partitioning/ep-dialogs.rb:1140
+#: src/include/partitioning/ep-dialogs.rb:1139
msgid "<p>Choose new size.</p>"
msgstr "<p>Выберите новый размер.</p>"
#. error popup, %1 and %2 are replaced by sizes
#. error popup, %1 and %2 are replaced by sizes
-#: src/include/partitioning/ep-dialogs.rb:1191
+#: src/include/partitioning/ep-dialogs.rb:1190
#: src/include/partitioning/ep-hd-dialogs.rb:359
#: src/include/partitioning/ep-lvm-dialogs.rb:692
msgid "The size entered is invalid. Enter a size between %1 and %2."
@@ -2956,7 +3004,7 @@
#. after user tries to do that is stupid - in some cases
#. we can tell beforehand, thus user should never get to this
#. point (e.g. when the partition is mounted)
-#: src/include/partitioning/ep-dialogs.rb:1234
+#: src/include/partitioning/ep-dialogs.rb:1233
msgid ""
"You are extending a mounted filesystem by %1 Gigabyte. \n"
"This may be quite slow and can take hours. You might possibly want \n"
@@ -2969,12 +3017,12 @@
"скорость изменения размера."
#. label for log view
-#: src/include/partitioning/ep-dialogs.rb:1310
+#: src/include/partitioning/ep-dialogs.rb:1309
msgid "Output of %1"
msgstr "Вывод %1"
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:1337
+#: src/include/partitioning/ep-dialogs.rb:1336
msgid "Rescanning disks..."
msgstr "Пересканирование дисков..."
@@ -3235,7 +3283,7 @@
#. error popup
#. TRANSLATORS: error popup
-#: src/include/partitioning/ep-hd-lib.rb:57 src/modules/Storage.rb:5226
+#: src/include/partitioning/ep-hd-lib.rb:57 src/modules/Storage.rb:5221
msgid "The disk is in use and cannot be modified."
msgstr "Этот диск используется и не может быть отредактирован."
@@ -5273,12 +5321,12 @@
msgstr "Файл шаблона"
#. label text
-#: src/modules/FileSystems.rb:278
+#: src/modules/FileSystems.rb:289
msgid "Tmpfs &Size"
msgstr "&Размер tmpfs"
#. popup text
-#: src/modules/FileSystems.rb:287
+#: src/modules/FileSystems.rb:298
msgid ""
"Invalid Size specified. Use number followed by K, M, G or %.\n"
"Value must be above 100k or between 1% and 200%. Try again."
@@ -5286,12 +5334,12 @@
"Указан недопустимый размер. Введите число и размерность: K, M, G или %.\n"
"Значение должно быть больше 100 КБ или между 1 % и 200 %. Попробуйте еще раз."
-#: src/modules/FileSystems.rb:290
+#: src/modules/FileSystems.rb:301
msgid "Value must be between 1% and 200%. Try again."
msgstr "Значение должно быть между 1 % и 200 %. Попробуйте еще раз."
#. help text, richtext format
-#: src/modules/FileSystems.rb:297
+#: src/modules/FileSystems.rb:308
msgid ""
"<p><b>Tmpfs Size:</b>\n"
"Size may be either entered as a number followed by K,M,G for Kilo-, Mega- or Gigabyte or\n"
@@ -5301,17 +5349,17 @@
"Размер указывается числом, после которого ставится одна из букв K, M, G (кило-, мега- или гигабайты соответственно) либо знак процента для указания размера в процентах от общего объема памяти.</p>"
#. label text
-#: src/modules/FileSystems.rb:311
+#: src/modules/FileSystems.rb:322
msgid "Swap &Priority"
msgstr "Приоритет подкачки"
#. popup text
-#: src/modules/FileSystems.rb:319
+#: src/modules/FileSystems.rb:330
msgid "Value must be between 0 and 32767. Try again."
msgstr "Значение должно быть между 0 и 32767. Попробуйте заново."
#. help text, richtext format
-#: src/modules/FileSystems.rb:326
+#: src/modules/FileSystems.rb:337
msgid ""
"<p><b>Swap Priority:</b>\n"
"Enter the swap priority. Higher numbers mean higher priority.</p>\n"
@@ -5320,12 +5368,12 @@
"Введите приоритет подкачки. Чем больше значение тем больше приоритет.</p>\n"
#. button text
-#: src/modules/FileSystems.rb:481
+#: src/modules/FileSystems.rb:494
msgid "Mount &Read-Only"
msgstr "Монтировать только для &чтения"
#. help text, richtext format
-#: src/modules/FileSystems.rb:485
+#: src/modules/FileSystems.rb:498
msgid ""
"<p><b>Mount Read-Only:</b>\n"
"Writing to the file system is not possible. Default is false. During installation\n"
@@ -5336,12 +5384,12 @@
"файловая система всегда монтируется на чтение и запись</p>"
#. button text
-#: src/modules/FileSystems.rb:497
+#: src/modules/FileSystems.rb:510
msgid "No &Access Time"
msgstr "Без времени последнего доступ&а"
#. help text, richtext format
-#: src/modules/FileSystems.rb:501
+#: src/modules/FileSystems.rb:514
msgid ""
"<p><b>No Access Time:</b>\n"
"Access times are not updated when a file is read. Default is false.</p>\n"
@@ -5350,12 +5398,12 @@
"Время доступа при чтении файла не обновляется. По умолчанию отключено.</p>\n"
#. button text
-#: src/modules/FileSystems.rb:511
+#: src/modules/FileSystems.rb:524
msgid "Mountable by User"
msgstr "Подключается пользователем"
#. help text, richtext format
-#: src/modules/FileSystems.rb:515
+#: src/modules/FileSystems.rb:528
msgid ""
"<p><b>Mountable by User:</b>\n"
"The file system may be mounted by an ordinary user. Default is false.</p>\n"
@@ -5364,12 +5412,12 @@
"Файловая система может быть смонтирована обычным пользователем. По умолчанию отключено.</p>\n"
#. button text
-#: src/modules/FileSystems.rb:528
+#: src/modules/FileSystems.rb:541
msgid "Do Not Mount at System &Start-up"
msgstr "Не монтировать при загрузке системы"
#. help text, richtext format
-#: src/modules/FileSystems.rb:534
+#: src/modules/FileSystems.rb:547
msgid ""
"<p><b>Do Not Mount at System Start-up:</b>\n"
"The file system is not automatically mounted when the system starts.\n"
@@ -5384,12 +5432,12 @@
"(<точка монтирования> — это каталог, куда монтируется файловая система). По умолчанию отключено.</p>\n"
#. button text
-#: src/modules/FileSystems.rb:551
+#: src/modules/FileSystems.rb:564
msgid "Enable &Quota Support"
msgstr "Включить поддержку квот(&Q)"
#. help text, richtext format
-#: src/modules/FileSystems.rb:557
+#: src/modules/FileSystems.rb:570
msgid ""
"<p><b>Enable Quota Support:</b>\n"
"The file system is mounted with user quotas enabled.\n"
@@ -5400,12 +5448,12 @@
"По умолчанию отключено.</p>\n"
#. label text
-#: src/modules/FileSystems.rb:576
+#: src/modules/FileSystems.rb:589
msgid "Data &Journaling Mode"
msgstr "Режим протоколирования данных"
#. help text, richtext format
-#: src/modules/FileSystems.rb:585
+#: src/modules/FileSystems.rb:598
msgid ""
"<p><b>Data Journaling Mode:</b>\n"
"Specifies the journaling mode for file data.\n"
@@ -5424,12 +5472,12 @@
"<tt>Отложенная запись</tt> — порядок данных не сохраняется. Не влияет на производительность.</p>\n"
#. button text
-#: src/modules/FileSystems.rb:606
+#: src/modules/FileSystems.rb:619
msgid "&Access Control Lists (ACL)"
msgstr "Списки контроля доступа (ACL)"
#. help text, richtext format
-#: src/modules/FileSystems.rb:610
+#: src/modules/FileSystems.rb:623
msgid ""
"<p><b>Access Control Lists (ACL):</b>\n"
"Enable access control lists on the file system.</p>\n"
@@ -5438,12 +5486,12 @@
"Включает список контроля доступа к файловой системе.</p>\n"
#. button text
-#: src/modules/FileSystems.rb:621
+#: src/modules/FileSystems.rb:634
msgid "&Extended User Attributes"
msgstr "Дополнительные аттрибуты пользователя"
#. help text, richtext format
-#: src/modules/FileSystems.rb:625
+#: src/modules/FileSystems.rb:638
msgid ""
"<p><b>Extended User Attributes:</b>\n"
"Allow extended user attributes on the file system.</p>\n"
@@ -5452,16 +5500,16 @@
"Разрешаются дополнительные аттрибуты пользователя на файловой системе.</p>\n"
#. label text
-#: src/modules/FileSystems.rb:642
+#: src/modules/FileSystems.rb:655
msgid "Arbitrary Option &Value"
msgstr "Произ&вольное значение параметра"
-#: src/modules/FileSystems.rb:647
+#: src/modules/FileSystems.rb:660
msgid "Invalid characters in arbitrary option value. Do not use spaces or tabs. Try again."
msgstr "Неверные символы в значении параметра. Не используйте пробелы и табуляцию. Попробуйте еще раз."
#. help text, richtext format
-#: src/modules/FileSystems.rb:651
+#: src/modules/FileSystems.rb:664
msgid ""
"<p><b>Arbitrary Option Value:</b>\n"
"In this field, type any legal mount option allowed in the fourth field of /etc/fstab.\n"
@@ -5472,12 +5520,12 @@
" Если параметров несколько, разделите их запятыми.</p>\n"
#. label text
-#: src/modules/FileSystems.rb:668
+#: src/modules/FileSystems.rb:681
msgid "Char&set for file names"
msgstr "Кодировка имен файлов"
#. help text, richtext format
-#: src/modules/FileSystems.rb:689
+#: src/modules/FileSystems.rb:702
msgid ""
"<p><b>Charset for File Names:</b>\n"
"Set the charset used for display of file names in Windows partitions.</p>\n"
@@ -5486,12 +5534,12 @@
"Установите кодировку используемую для отображения имен файлов в разделе Windows.</p>\n"
#. label text
-#: src/modules/FileSystems.rb:700
+#: src/modules/FileSystems.rb:713
msgid "Code&page for short FAT names"
msgstr "Кодовая страница для коротких имен FAT"
#. help text, richtext format
-#: src/modules/FileSystems.rb:706
+#: src/modules/FileSystems.rb:719
msgid ""
"<p><b>Codepage for Short FAT Names:</b>\n"
"This codepage is used for converting to shortname characters on FAT file systems.</p>\n"
@@ -5500,12 +5548,12 @@
"Эта кодовая страница используется для преобразования в символы коротких имен файловой системы FAT.</p>\n"
#. label text
-#: src/modules/FileSystems.rb:720
+#: src/modules/FileSystems.rb:733
msgid "Number of &FATs"
msgstr "Кол-во FAT"
#. help text, richtext format
-#: src/modules/FileSystems.rb:726
+#: src/modules/FileSystems.rb:739
msgid ""
"<p><b>Number of FATs:</b>\n"
"Specify the number of file allocation tables in the file system. The default is 2.</p>"
@@ -5514,12 +5562,12 @@
"Укажите количество таблиц размещения файлов в файловой системе. По-умолчанию 2.</p>"
#. label text
-#: src/modules/FileSystems.rb:735
+#: src/modules/FileSystems.rb:748
msgid "FAT &Size"
msgstr "Ра&змер FAT"
#. help text, richtext format
-#: src/modules/FileSystems.rb:746
+#: src/modules/FileSystems.rb:759
msgid ""
"<p><b>FAT Size:</b>\n"
"Specifies the type of file allocation tables used (12, 16, or 32-bit). If auto is specified, YaST will automatically select the value most suitable for the file system size.</p>\n"
@@ -5528,17 +5576,17 @@
"Указывает тип используемых таблиц размещения файлов (12-, 16- или 32-битные). Если указано значение \"автоматически\", средство установки YaST автоматически выберет значение, наиболее подходящее для размера файловой системы.</p>\n"
#. label text
-#: src/modules/FileSystems.rb:755
+#: src/modules/FileSystems.rb:768
msgid "Root &Dir Entries"
msgstr "Записи корневого ка&талога"
#. popup text
-#: src/modules/FileSystems.rb:763
+#: src/modules/FileSystems.rb:776
msgid "The minimum size for \"Root Dir Entries\" is 112. Try again."
msgstr "Минимальный размер записей корневого каталога составляет 112. Попробуйте еще раз."
#. help text, richtext format
-#: src/modules/FileSystems.rb:767
+#: src/modules/FileSystems.rb:780
msgid ""
"<p><b>Root Dir Entries:</b>\n"
"Select the number of entries available in the root directory.</p>\n"
@@ -5547,12 +5595,12 @@
"Укажите количество записей, доступных в корневом каталоге.</p>\n"
#. label text
-#: src/modules/FileSystems.rb:780
+#: src/modules/FileSystems.rb:793
msgid "Hash &Function"
msgstr "&Хэш-функция"
#. help text, richtext format
-#: src/modules/FileSystems.rb:787
+#: src/modules/FileSystems.rb:800
msgid ""
"<p><b>Hash Function:</b>\n"
"This specifies the name of the hash function to use to sort the file names in directories.</p>\n"
@@ -5561,12 +5609,12 @@
"Укажите имя хэш-функции, которая будет сортировать имена файлов в каталогах.</p>\n"
#. label text
-#: src/modules/FileSystems.rb:796
+#: src/modules/FileSystems.rb:809
msgid "FS &Revision"
msgstr "&Версия ФС"
#. help text, richtext format
-#: src/modules/FileSystems.rb:803
+#: src/modules/FileSystems.rb:816
msgid ""
"<p><b>FS Revision:</b>\n"
"This option defines the reiserfs format revision to use. '3.5' is for backwards compatibility with kernels of the 2.2.x series. '3.6' is more recent, but can only be used with kernel versions greater than or equal to 2.4.</p>\n"
@@ -5576,12 +5624,12 @@
#. label text
#. label text
-#: src/modules/FileSystems.rb:816 src/modules/FileSystems.rb:980
+#: src/modules/FileSystems.rb:829 src/modules/FileSystems.rb:993
msgid "Block &Size in Bytes"
msgstr "Ра&змер блока в байтах"
#. help text, richtext format
-#: src/modules/FileSystems.rb:823
+#: src/modules/FileSystems.rb:836
msgid ""
"<p><b>Block Size:</b>\n"
"Specify the size of blocks in bytes. Valid block size values are 512, 1024, 2048 and 4096 bytes per block. If auto is selected, the standard block size of 4096 is used.</p>\n"
@@ -5591,13 +5639,13 @@
#. label text
#. label text
-#: src/modules/FileSystems.rb:832 src/modules/FileSystems.rb:1062
+#: src/modules/FileSystems.rb:845 src/modules/FileSystems.rb:1075
msgid "&Inode Size"
msgstr "Размер инода"
#. help text, richtext format
#. help text, richtext format
-#: src/modules/FileSystems.rb:838 src/modules/FileSystems.rb:1068
+#: src/modules/FileSystems.rb:851 src/modules/FileSystems.rb:1081
msgid ""
"<p><b>Inode Size:</b>\n"
"This option specifies the inode size of the file system.</p>\n"
@@ -5606,12 +5654,12 @@
"Эта опция определяет размер инода файловой системы.</p>\n"
#. label text
-#: src/modules/FileSystems.rb:847
+#: src/modules/FileSystems.rb:860
msgid "&Percentage of Inode Space"
msgstr "&Процент места под inode"
#. help text, richtext format
-#: src/modules/FileSystems.rb:875
+#: src/modules/FileSystems.rb:888
msgid ""
"<p><b>Percentage of Inode Space:</b>\n"
"The option \"Percentage of Inode Space\" specifies the maximum percentage of space in the file system that can be allocated to inodes.</p>\n"
@@ -5620,12 +5668,12 @@
"Параметр \"Процент места под inode\" определяет максимальный процент места в файловой системе, которое может быть выделено структурам данных inode.</p>\n"
#. label text
-#: src/modules/FileSystems.rb:884
+#: src/modules/FileSystems.rb:897
msgid "Inode &Aligned"
msgstr "Выр&авнивание inode"
#. help text, richtext format
-#: src/modules/FileSystems.rb:890
+#: src/modules/FileSystems.rb:903
msgid ""
"<p><b>Inode Aligned:</b>\n"
"The option \"Inode Aligned\" is used to specify whether inode allocation is or\n"
@@ -5638,12 +5686,12 @@
"выравненным inode обычно более эффективен, чем к невыравненным.</p>\n"
#. label text
-#: src/modules/FileSystems.rb:920
+#: src/modules/FileSystems.rb:933
msgid "&Log Size in Megabytes"
msgstr "Размер журна&ла в мегабайтах"
#. popup text
-#: src/modules/FileSystems.rb:929
+#: src/modules/FileSystems.rb:942
msgid ""
"The \"Log Size\" value is incorrect.\n"
"Enter a value greater than zero.\n"
@@ -5653,7 +5701,7 @@
#. xgettext: no-c-format
#. help text, richtext format
-#: src/modules/FileSystems.rb:934
+#: src/modules/FileSystems.rb:947
msgid ""
"<p><b>Log Size</b>\n"
"Set the log size (in megabytes). If auto, the default is 40% of the aggregate size.</p>\n"
@@ -5662,17 +5710,17 @@
"Укажите размер журнала (в мегабайтах). Если выбрано значение \"автоматически\", по умолчанию он равняется 40 % от совокупного размера.</p>\n"
#. label text
-#: src/modules/FileSystems.rb:942
+#: src/modules/FileSystems.rb:955
msgid "Invoke Bad Blocks List &Utility"
msgstr "Запустить утилиту просмотра плохих секторов"
#. label text
-#: src/modules/FileSystems.rb:956
+#: src/modules/FileSystems.rb:969
msgid "Stride &Length in Blocks"
msgstr "Д&лина шага в блоках"
#. popup text
-#: src/modules/FileSystems.rb:964
+#: src/modules/FileSystems.rb:977
msgid ""
"The \"Stride Length in Blocks\" value is invalid.\n"
"Select a value greater than 1.\n"
@@ -5681,7 +5729,7 @@
"Введите значение больше 1.\n"
#. help text, richtext format
-#: src/modules/FileSystems.rb:968
+#: src/modules/FileSystems.rb:981
msgid ""
"<p><b>Stride Length in Blocks:</b>\n"
"Set RAID-related options for the file system. Currently, the only supported\n"
@@ -5694,7 +5742,7 @@
"связке RAID как аргументt.</p>\n"
#. help text, richtext format
-#: src/modules/FileSystems.rb:987
+#: src/modules/FileSystems.rb:1000
msgid ""
"<p><b>Block Size:</b>\n"
"Specify the size of blocks in bytes. Valid block size values are 1024, 2048, and 4096 bytes per block. If auto is selected, the block size is determined by the file system size and the expected use of the file system.</p>\n"
@@ -5703,12 +5751,12 @@
"Укажите размер блока в байтах. Правильные значения — 1024, 2048 и 4096 байт. Если выбрано значение \"автоматически\", то размер блока определяется размером файловой системы и ожидаемым способом ее использования.</p>\n"
#. label text
-#: src/modules/FileSystems.rb:996
+#: src/modules/FileSystems.rb:1009
msgid "Bytes per &Inode"
msgstr "&Байт на inode"
#. help text, richtext format
-#: src/modules/FileSystems.rb:1002
+#: src/modules/FileSystems.rb:1015
msgid ""
"<p><b>Bytes per Inode:</b> \n"
"Specify the bytes to inode ratio. YaST creates an inode for every\n"
@@ -5729,12 +5777,12 @@
"значение этого параметра.</p>\n"
#. label text
-#: src/modules/FileSystems.rb:1018
+#: src/modules/FileSystems.rb:1031
msgid "Percentage of Blocks &Reserved for root"
msgstr "&Процент блоков, зарезервированных для суперпользователя"
#. popup text
-#: src/modules/FileSystems.rb:1028
+#: src/modules/FileSystems.rb:1041
msgid ""
"The \"Percentage of Blocks Reserved for root\" value is incorrect.\n"
"Allowed are float numbers no larger than 99 (e.g. 0.5).\n"
@@ -5744,17 +5792,17 @@
#. xgettext: no-c-format
#. help text, richtext format
-#: src/modules/FileSystems.rb:1033
+#: src/modules/FileSystems.rb:1046
msgid "<p><b>Percentage of Blocks Reserved for root:</b> Specify the percentage of blocks reserved for the super user. The default is computed so that normally 1 Gig is reserved. Upper limit for reserved default is 5.0, lowest reserved default is 0.1.</p>"
msgstr "<p><b>Процент блоков, зарезервированных для суперпользователя</b> Укажите процент блоков, зарезервированных для привилегированного пользователя. Значение по умолчанию вычисляется таким образом, что резервируется 1 ГБ. Верхний предел вычисляемого значения по умолчанию — 5,0, нижний — 0,1.</p>"
#. checkbox text
-#: src/modules/FileSystems.rb:1042
+#: src/modules/FileSystems.rb:1055
msgid "Disable Regular Checks"
msgstr "Отключить регулярные проверки"
#. help text, richtext format
-#: src/modules/FileSystems.rb:1050
+#: src/modules/FileSystems.rb:1063
msgid ""
"<p><b>Disable Regular Checks:</b>\n"
"Disable regular file system check at booting.</p>\n"
@@ -5763,12 +5811,12 @@
"Отключить регулярные проверки файловой системы при загрузке системы.</p>\n"
#. label text
-#: src/modules/FileSystems.rb:1077
+#: src/modules/FileSystems.rb:1090
msgid "&Directory Index Feature"
msgstr "Возможность индекса каталога(&D)"
#. help text, richtext format
-#: src/modules/FileSystems.rb:1084
+#: src/modules/FileSystems.rb:1097
msgid ""
"<p><b>Directory Index:</b>\n"
"Enables use of hashed b-trees to speed up lookups in large directories.</p>\n"
@@ -5777,12 +5825,12 @@
"Включает использование кешированных b-деревьев для увеличение скорости поиска в больших каталогах.</p>\n"
#. label text
-#: src/modules/FileSystems.rb:1096
+#: src/modules/FileSystems.rb:1109
msgid "&No Journal"
msgstr "&Без журнала"
#. help text, richtext format
-#: src/modules/FileSystems.rb:1103
+#: src/modules/FileSystems.rb:1116
msgid ""
"<p><b>No Journal:</b>\n"
"Suppressed use of journaling on filesystem. Only activate this when you really\n"
@@ -5894,7 +5942,7 @@
#. @param integer testsize
#. @param [Symbol] used_fs
#. @param [Boolean] verbose
-#: src/modules/Storage.rb:994
+#: src/modules/Storage.rb:989
msgid "Resize Not Possible:"
msgstr "Изменение размера невозможно:"
@@ -5907,7 +5955,7 @@
#. mark swap-partitions with pseudo Mountpoint swap in targetMap
#. @param [Hash{String => map}] target Disk map
#. @return [Hash{String => map}] modified target
-#: src/modules/Storage.rb:2697 src/modules/Storage.rb:3920
+#: src/modules/Storage.rb:2692 src/modules/Storage.rb:3915
msgid ""
"Could not set encryption.\n"
"System error code is %1.\n"
@@ -5920,7 +5968,7 @@
"Возможно, указан неправильный пароль шифрования.\n"
#. popup text
-#: src/modules/Storage.rb:3951
+#: src/modules/Storage.rb:3946
msgid ""
"The first and the second version\n"
"of the password do not match.\n"
@@ -5931,7 +5979,7 @@
"Повторите попытку."
#. popup text
-#: src/modules/Storage.rb:3982
+#: src/modules/Storage.rb:3977
msgid ""
"The password may only contain the following characters:\n"
"0..9, a..z, A..Z, and any of \"@#* ,.;:._-+=!$%&/|?{[()]}^\\<>\".\n"
@@ -5943,24 +5991,24 @@
#. Label: get password for encrypted volume
#. Please use newline if label is longer than 40 characters
-#: src/modules/Storage.rb:4036
+#: src/modules/Storage.rb:4031
msgid "&Enter Encryption Password:"
msgstr "&Введите пароль шифрования:"
#. Clear password fields on every round.
-#: src/modules/Storage.rb:4095
+#: src/modules/Storage.rb:4090
msgid "Provide Password"
msgstr "Введите пароль"
-#: src/modules/Storage.rb:4114
+#: src/modules/Storage.rb:4109
msgid "The following encrypted volumes are already available."
msgstr "Доступны следующие шифрованные тома."
-#: src/modules/Storage.rb:4129
+#: src/modules/Storage.rb:4124
msgid "Encrypted Volume Activation"
msgstr "Включение шифрованного тома"
-#: src/modules/Storage.rb:4133
+#: src/modules/Storage.rb:4128
msgid ""
"The following volumes contain an encryption signature but the \n"
"passwords are not yet known.\n"
@@ -5971,12 +6019,12 @@
"Эти пароли необходимо знать, если тома нужны при обновлении\n"
"либо содержат шифрованный физический том LVM."
-#: src/modules/Storage.rb:4145
+#: src/modules/Storage.rb:4140
msgid "Do you want to provide encryption passwords?"
msgstr "Ввести пароли шифрования?"
#. text in help field
-#: src/modules/Storage.rb:4202
+#: src/modules/Storage.rb:4197
msgid ""
"Enter encryption password for any of the\n"
"devices in the locked devices list.\n"
@@ -5987,69 +6035,69 @@
"Пароль будет опробован на всех устройствах."
#. header text
-#: src/modules/Storage.rb:4208
+#: src/modules/Storage.rb:4203
msgid "Enter Encryption Password"
msgstr "Ввести пароль шифрования"
-#: src/modules/Storage.rb:4211
+#: src/modules/Storage.rb:4206
msgid "There are no encrypted volume to unlock."
msgstr "Нет шифрованных томов для разблокирования."
#. label text, multiple device names follow
-#: src/modules/Storage.rb:4224
+#: src/modules/Storage.rb:4219
msgid "Provide password for any of the following devices:"
msgstr "Введите пароль для любого из этих устройств:"
#. label text, one device name follows
-#: src/modules/Storage.rb:4227
+#: src/modules/Storage.rb:4222
msgid "Provide password for the following device:"
msgstr "Введите пароль для этого устройства:"
-#: src/modules/Storage.rb:4240
+#: src/modules/Storage.rb:4235
msgid "Trying to unlock encrypted volumes..."
msgstr "Разблокирование шифрованных томов..."
-#: src/modules/Storage.rb:4264
+#: src/modules/Storage.rb:4259
msgid "Password did not unlock any volume."
msgstr "Пароль не разблокировал ни один том."
-#: src/modules/Storage.rb:4350
+#: src/modules/Storage.rb:4345
msgid "IDE Disk"
msgstr "Диск IDE"
-#: src/modules/Storage.rb:4356
+#: src/modules/Storage.rb:4351
msgid "SCSI Disk"
msgstr "Диск SCSI"
-#: src/modules/Storage.rb:4362
+#: src/modules/Storage.rb:4357
msgid "Disk"
msgstr "Диск"
-#: src/modules/Storage.rb:4390
+#: src/modules/Storage.rb:4385
msgid "DM RAID"
msgstr "DM RAID"
-#: src/modules/Storage.rb:4403
+#: src/modules/Storage.rb:4398
msgid "MD RAID"
msgstr "MD RAID"
#. TODO: more informative error message, but the Package module does
#. not provide anything
#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:4898
+#: src/modules/Storage.rb:4893
msgid "Installing required packages failed."
msgstr "Не удалось установить требуемые пакеты."
-#: src/modules/Storage.rb:4899 src/modules/StorageClients.rb:159
+#: src/modules/Storage.rb:4894 src/modules/StorageClients.rb:159
msgid "Continue despite the error?"
msgstr "Продолжить несмотря на ошибку?"
#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:5238
+#: src/modules/Storage.rb:5233
msgid "Partitions cannot be created since other partitions on the disk are used."
msgstr "Невозможно создавать разделы, пока используются другие разделы на диске."
-#: src/modules/Storage.rb:5264
+#: src/modules/Storage.rb:5259
msgid ""
"\n"
"Device %1 cannot be modified because it contains activated swap\n"
@@ -6059,7 +6107,7 @@
"Устройство %1 не может быть изменено, так как содержит активный раздел подкачки,\n"
"который необходим для запуска установки.\n"
-#: src/modules/Storage.rb:5278
+#: src/modules/Storage.rb:5273
msgid ""
"\n"
"Device %1 cannot be modified because it contains the installation\n"
@@ -6069,7 +6117,7 @@
"Устройство %1 не может быть изменено, так как содержит данные установки,\n"
"необходимые для осуществления установки.\n"
-#: src/modules/Storage.rb:5307
+#: src/modules/Storage.rb:5302
msgid ""
"\n"
"Device %1 cannot be removed because it contains activated swap\n"
@@ -6079,7 +6127,7 @@
"Устройство %1 не может быть удалено, так как содержит активный раздел подкачки,\n"
"который необходим для запуска установки.\n"
-#: src/modules/Storage.rb:5316
+#: src/modules/Storage.rb:5311
msgid ""
"\n"
"Device %1 cannot be removed because it contains the installation\n"
@@ -6089,7 +6137,7 @@
"Устройство %1 не может быть удалено, так как содержит данные установки,\n"
"необходимые для осуществления установки.\n"
-#: src/modules/Storage.rb:5345
+#: src/modules/Storage.rb:5340
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -6101,7 +6149,7 @@
"устройство %2, которое содержит активный раздел подкачки, необходимый \n"
"для запуска установки.\n"
-#: src/modules/Storage.rb:5356
+#: src/modules/Storage.rb:5351
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -6112,7 +6160,7 @@
"устройство %2, которое содержит данные, необходимые для установки.\n"
#. the check for verbose is needed for calls from StorageProposal (see bnc#871779)
-#: src/modules/Storage.rb:5378
+#: src/modules/Storage.rb:5373
msgid ""
"\n"
"Partition %1 cannot be removed since other partitions on the\n"
@@ -6123,18 +6171,18 @@
"диска %2.\n"
#. FIXME: please, add description of the list that is returned by this function.
-#: src/modules/Storage.rb:5467
+#: src/modules/Storage.rb:5462
msgid "Nothing assigned as root filesystem!"
msgstr "Не назначена корневая файловая система."
-#: src/modules/Storage.rb:5468
+#: src/modules/Storage.rb:5463
msgid "Installation will most certainly fail fatally!"
msgstr "Скорее всего, во время установки возникнет неустранимая ошибка!"
#. Set rather than Add, there might be some packs left over
#. from previous 'MakeProposal' we don't need now
#. This also covers the case when AddPackagesList returns [] or nil
-#: src/modules/Storage.rb:6018
+#: src/modules/Storage.rb:6013
msgid "Adding the following resolvables failed: %1"
msgstr "Сбой добавления пакетов разрешения зависимостей: %1"
@@ -6788,31 +6836,31 @@
#. bsc#983003
#. penalty for not having separate /home
-#: src/modules/StorageProposal.rb:4601 src/modules/StorageProposal.rb:5724
+#: src/modules/StorageProposal.rb:4624 src/modules/StorageProposal.rb:5747
msgid "Resize impossible due to inconsistent file system. Try checking file system under Windows."
msgstr "Изменение размера невозможно, потому что нарушена целостность файловой системы. Попробуйте проверить файловую систему в Windows."
#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6239
+#: src/modules/StorageProposal.rb:6262
msgid "File System for Root Partition"
msgstr "Файловая система для корневого раздела"
#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6286
+#: src/modules/StorageProposal.rb:6309
msgid "File System for Home Partition"
msgstr "Файловая система для домашнего раздела"
#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6304
+#: src/modules/StorageProposal.rb:6327
msgid "Enlarge &Swap for Suspend"
msgstr "Увеличить &swap для спящего режима"
-#: src/modules/StorageProposal.rb:6314
+#: src/modules/StorageProposal.rb:6337
msgid "Proposal Settings"
msgstr "Параметры предложения"
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6329
+#: src/modules/StorageProposal.rb:6352
msgid ""
"<p>Choose <b>Partition-based Proposal</b> if you don't want to use LVM.\n"
"Choose <b>LVM-based Proposal</b> for plain LVM and <b>Encrypted LVM-based\n"
@@ -6823,7 +6871,7 @@
"на основе LVM</b>, если хотите зашифровать систему.</p>"
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6337
+#: src/modules/StorageProposal.rb:6360
msgid ""
"<p>The filesystem for the root partition can be selected with the\n"
"corresponding combo box. With the filesystem BtrFS the proposal can\n"
@@ -6836,7 +6884,7 @@
"размер корневого раздела.</p>"
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6346
+#: src/modules/StorageProposal.rb:6369
msgid ""
"<p>The proposal can create a separate home partition. The filesystem for\n"
"the home partition can be selected with the corresponding combo box.</p>"
@@ -6845,7 +6893,7 @@
"домашнего раздела можно выбрать с помощью соответствующего поля со списком.</p>"
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6353
+#: src/modules/StorageProposal.rb:6376
msgid ""
"<p>The swap partition can be made large enough to be used to suspend\n"
"the system to disk in most cases.</p>"
@@ -6853,32 +6901,32 @@
"<p>Раздел подкачки можно сделать достаточно большим, чтобы использовать его для приостановки\n"
"системы на диске в большинстве случаев.</p>"
-#: src/modules/StorageProposal.rb:6378
+#: src/modules/StorageProposal.rb:6401
msgid "Enter your password for the proposal encryption."
msgstr "Введите пароль для предлагаемого шифрования."
#. Label: get password for user root
#. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6385
+#: src/modules/StorageProposal.rb:6408
msgid "Password:"
msgstr "Пароль:"
#. Label: get same password again for verification
#. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6396
+#: src/modules/StorageProposal.rb:6419
msgid "Reenter the password for verification:"
msgstr "Введите пароль еще раз для проверки:"
#. Clear password fields on every round.
-#: src/modules/StorageProposal.rb:6594
+#: src/modules/StorageProposal.rb:6617
msgid "&Partition-based Proposal"
msgstr "Предложение на основе ра&зделов"
-#: src/modules/StorageProposal.rb:6596
+#: src/modules/StorageProposal.rb:6619
msgid "&LVM-based Proposal"
msgstr "Предложение на &основе LVM"
-#: src/modules/StorageProposal.rb:6598
+#: src/modules/StorageProposal.rb:6621
msgid "&Encrypted LVM-based Proposal"
msgstr "&Зашифрованное предложение на основе LVM"
@@ -6924,3 +6972,14 @@
#: src/modules/StorageSettings.rb:183
msgid "Visible Information on Storage Devices:"
msgstr "Видимая информация об устройствах хранения:"
+
+#~ msgid ""
+#~ "You have assigned an encrypted file system to a partition\n"
+#~ "with one of the following mount points: \"/\", \"/usr\", \"/boot\",\n"
+#~ "/var\". This is not possible. Change the mount point or use a\n"
+#~ "nonloopbacked file system.\n"
+#~ msgstr ""
+#~ "Зашифрованная файловая система назначена разделу\n"
+#~ "с одной из следующих точек монтирования: \"/\", \"/usr\", \"/boot\",\n"
+#~ " /var\". Это невозможно. Измените точку монтирования или используйте\n"
+#~ " файловую систему без обратной петли.\n"
Modified: branches/SLE12-SP3/yast/ru/po/update.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/update.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/update.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: update\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 02:31+0000\n"
+"POT-Creation-Date: 2017-04-20 02:29+0000\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -167,8 +167,8 @@
#: src/clients/inst_update.rb:69 src/clients/inst_update.rb:74
#: src/include/update/rootpart.rb:100 src/include/update/rootpart.rb:106
#: src/include/update/rootpart.rb:126 src/modules/RootPart.rb:157
-#: src/modules/RootPart.rb:1442 src/modules/RootPart.rb:1448
-#: src/modules/RootPart.rb:2006
+#: src/modules/RootPart.rb:1445 src/modules/RootPart.rb:1451
+#: src/modules/RootPart.rb:2009
msgid "Unknown"
msgstr "Неизвестный"
@@ -658,19 +658,19 @@
msgstr "Пропустить монтирование(&S)"
#. yes-no popup
-#: src/modules/RootPart.rb:1066
+#: src/modules/RootPart.rb:1069
msgid "Incorrect password. Try again?"
msgstr "Не верный пароль. Попробуете снова?"
#. TRANSLATORS: a popup headline
-#: src/modules/RootPart.rb:1169
+#: src/modules/RootPart.rb:1172
msgid "Warning"
msgstr "Предупреждение"
#. TRANSLATORS: error message,
#. %1 is replaced with the current /boot partition size
#. %2 with the recommended size
-#: src/modules/RootPart.rb:1174
+#: src/modules/RootPart.rb:1177
msgid ""
"Your /boot partition is too small (%1 MB).\n"
"We recommend a size of no less than %2 MB or else the new Kernel may not fit.\n"
@@ -687,7 +687,7 @@
"Вы хотите продолжить обновление текущей системы?\n"
#. label in a popup, %1 is device (eg. /dev/hda1), %2 is output of the 'mount' command
-#: src/modules/RootPart.rb:1266
+#: src/modules/RootPart.rb:1269
msgid ""
"The partition %1 could not be mounted.\n"
"\n"
@@ -708,27 +708,27 @@
"Чтобы прервать обновление, нажмите Отмена.\n"
#. push button
-#: src/modules/RootPart.rb:1284
+#: src/modules/RootPart.rb:1287
msgid "&Specify Mount Options"
msgstr "&Определить параметры монтирования"
#. popup heading
-#: src/modules/RootPart.rb:1300
+#: src/modules/RootPart.rb:1303
msgid "Mount Options"
msgstr "Параметры монтирования"
#. text entry label
-#: src/modules/RootPart.rb:1303
+#: src/modules/RootPart.rb:1306
msgid "&Mount Point"
msgstr "Точка &монтирования"
#. tex entry label
-#: src/modules/RootPart.rb:1306
+#: src/modules/RootPart.rb:1309
msgid "&Device"
msgstr "&Устройство"
#. text entry label
-#: src/modules/RootPart.rb:1311
+#: src/modules/RootPart.rb:1314
msgid ""
"&File System\n"
"(empty for autodetection)"
@@ -737,12 +737,12 @@
"(пусто для автоопределения)"
#. error message
-#: src/modules/RootPart.rb:1388
+#: src/modules/RootPart.rb:1391
msgid "The /var partition %1 could not be mounted.\n"
msgstr "Раздел /var %1 не может быть смонтирован.\n"
#. Informational text about selected partition, %x are replaced with values later
-#: src/modules/RootPart.rb:1429
+#: src/modules/RootPart.rb:1432
msgid ""
"<b>File system:</b> %1, <b>Type:</b> %2,<br>\n"
"<b>Label:</b> %3, <b>Size:</b> %4,<br>\n"
@@ -754,17 +754,17 @@
"<b>udev ID:</b> %5,<br>\n"
"<b>Путь udev:</b> %6"
-#: src/modules/RootPart.rb:1443
+#: src/modules/RootPart.rb:1446
msgid "None"
msgstr "Никакой"
#. a popup caption
-#: src/modules/RootPart.rb:1466
+#: src/modules/RootPart.rb:1469
msgid "Unable to find the /var partition automatically"
msgstr "Не удалось автоматически найти раздел /var"
#. a popup message
-#: src/modules/RootPart.rb:1471
+#: src/modules/RootPart.rb:1474
msgid ""
"Your system uses a separate /var partition which is required for the upgrade\n"
"process to detect the disk-naming changes. Select the /var partition manually\n"
@@ -775,22 +775,22 @@
"модернизации выберите раздел /var вручную."
#. a combo-box label
-#: src/modules/RootPart.rb:1484
+#: src/modules/RootPart.rb:1487
msgid "&Select /var Partition Device"
msgstr "&Выбрать устройство для раздела /var"
#. an informational rich-text widget label
-#: src/modules/RootPart.rb:1490
+#: src/modules/RootPart.rb:1493
msgid "Device Info"
msgstr "Сведения об устройстве"
#. error message
-#: src/modules/RootPart.rb:1631
+#: src/modules/RootPart.rb:1634
msgid "Unable to mount /var partition with this disk configuration.\n"
msgstr "Невозможно смонтировать /var раздел с этой конфигурацией диска.\n"
#. popup message, %1 will be replace with the name of the logfile
-#: src/modules/RootPart.rb:1662
+#: src/modules/RootPart.rb:1665
msgid ""
"Partitions could not be mounted.\n"
"\n"
@@ -803,7 +803,7 @@
#. read the keyboard settings now, so that it used when
#. typing passwords for encrypted partitions
#. Calling a script because otherwise this module would depend on yast2-country
-#: src/modules/RootPart.rb:1706
+#: src/modules/RootPart.rb:1709
msgid ""
"Some partitions in the system on %1 are mounted by kernel-device name. This is\n"
"not reliable for the update since kernel-device names are unfortunately not\n"
@@ -816,37 +816,37 @@
"на любой другой метод для всех разделов."
#. error message
-#: src/modules/RootPart.rb:1724
+#: src/modules/RootPart.rb:1727
msgid "No fstab found."
msgstr "fstab не найден."
#. message part 1
-#: src/modules/RootPart.rb:1749
+#: src/modules/RootPart.rb:1752
msgid "The root partition in /etc/fstab has an invalid root device.\n"
msgstr "Загрузочный раздел в /etc/fstab имеет не верное загрузочное устройство.\n"
#. message part 2
-#: src/modules/RootPart.rb:1754
+#: src/modules/RootPart.rb:1757
msgid "It is currently mounted as %1 but listed as %2.\n"
msgstr "Это в настойщее время примонтировано как %1 но показано как %2.\n"
#. TRANSLATORS: label for filesystem snapshot taken before system update
-#: src/modules/RootPart.rb:1810
+#: src/modules/RootPart.rb:1813
msgid "before update"
msgstr "перед обновлением"
#. prepare progress-bar
-#: src/modules/RootPart.rb:2131
+#: src/modules/RootPart.rb:2134
msgid "Evaluating root partition. One moment please..."
msgstr "Изучение корневого раздела. Подождите, пожалуйста..."
#. intermediate popup while mounting partitions
-#: src/modules/RootPart.rb:2214
+#: src/modules/RootPart.rb:2217
msgid "Mounting partitions. One moment please..."
msgstr "Монтирование разделов. Пожалуйста подождите..."
#. TRANSLATORS: dialog caption
-#: src/modules/RootPart.rb:2229
+#: src/modules/RootPart.rb:2232
msgid "Searching for Available Systems"
msgstr "Поиск доступных систем"
Modified: branches/SLE12-SP3/yast/ru/po/vm.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/vm.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/vm.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: vm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-01 02:29+0000\n"
+"POT-Creation-Date: 2017-03-31 02:29+0000\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -21,7 +21,7 @@
msgstr "Установка гипервизора и инструментов"
#. progress step title
-#: src/clients/vm_finish.rb:69
+#: src/clients/vm_finish.rb:70
msgid "Configuring the virtual machine..."
msgstr "Конфигурация виртуальной машины..."
Modified: branches/SLE12-SP3/yast/ru/po/xpram.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/xpram.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/xpram.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: xpram\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-31 17:53+0200\n"
+"POT-Creation-Date: 2017-05-16 19:52+0200\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -55,46 +55,46 @@
msgstr "<p>Этот инструмент в настоящее время поддерживает присвоение всего XPRAM только одному разделу. Чтобы иметь несколько разделов, см. \"Драйверы устройств, особенности и команды, ноябрь 30, 2004\" для ядра Linux 2.6 - издание апрель 2004.</p><p>В этом случае отключите XPRAM в данном модуле.</p>"
#. help text for XPRAM 3/4
-#: src/include/s390/xpram/ui.rb:57
+#: src/include/s390/xpram/ui.rb:60
msgid "<p>Choose the correct mount point for <b>Mount Point</b>.</p>"
msgstr "<p>Выберите правильную точку монтирования в меню <b>Точка монтирования</b>.</p>"
#. help text for XPRAM 4/4
-#: src/include/s390/xpram/ui.rb:59
+#: src/include/s390/xpram/ui.rb:62
msgid "<p>Next, choose the file system to use on the device.</p>"
msgstr "<p>Далее выберите используемую устройством файловую систему.</p>"
#. radio button label for to not start xpram
-#: src/include/s390/xpram/ui.rb:83
+#: src/include/s390/xpram/ui.rb:86
msgid "Do No&t Start XPRAM"
msgstr "Не запускать XPRAM(&t)"
#. radio button label for to start xpram
-#: src/include/s390/xpram/ui.rb:92
+#: src/include/s390/xpram/ui.rb:95
msgid "&Start XPRAM"
msgstr "Запустить XPRAM(&S)"
-#: src/include/s390/xpram/ui.rb:104
+#: src/include/s390/xpram/ui.rb:107
msgid "Install File System or Swap Although &XPRAM Contains Valid Data"
msgstr "Установите файловую систему или раздел подкачки, независимо от правильности данных в &XPRAM"
#. frame label
-#: src/include/s390/xpram/ui.rb:113
+#: src/include/s390/xpram/ui.rb:116
msgid "Mount Point"
msgstr "Точка монтирования"
#. combobox label
-#: src/include/s390/xpram/ui.rb:122
+#: src/include/s390/xpram/ui.rb:125
msgid "&Mount Point"
msgstr "Точка &монтирования"
#. frame label
-#: src/include/s390/xpram/ui.rb:137
+#: src/include/s390/xpram/ui.rb:140
msgid "File System Type"
msgstr "Тип файловой системы"
#. combobox label
-#: src/include/s390/xpram/ui.rb:146
+#: src/include/s390/xpram/ui.rb:149
msgid "F&ile System to Use:"
msgstr "Используемая файловая система(&i):"
@@ -104,36 +104,34 @@
msgstr "Сохранение конфигурации XPRAM"
#. Progress stage 1/2
-#: src/modules/Xpram.rb:109
+#: src/modules/Xpram.rb:108
msgid "Write the settings"
msgstr "Записать параметры"
#. Progress stage 2/2
-#: src/modules/Xpram.rb:111
+#: src/modules/Xpram.rb:110
msgid "Restart the service"
msgstr "Перезапустить сервис"
#. Progress step 1/2
-#: src/modules/Xpram.rb:115
+#: src/modules/Xpram.rb:114
msgid "Writing the settings..."
msgstr "Записываются параметры..."
#. Progress step 2/2
-#: src/modules/Xpram.rb:117
+#: src/modules/Xpram.rb:116
msgid "Restarting service..."
msgstr "Перезапуск сервиса..."
#. Progress finished
-#: src/modules/Xpram.rb:119
+#: src/modules/Xpram.rb:118
msgid "Finished"
msgstr "Готово"
-#: src/modules/Xpram.rb:136
+#: src/modules/Xpram.rb:135
msgid "Error stopping xpram. Try \"rcxpram stop\" manually."
msgstr "Ошибка остановки xpram. Попробуйте выполнить rcxpram stop вручную."
-#. map out = (map) SCR::Execute(.target.bash_output,"bash -x /etc/init.d/xpram start", $["TERM":"raw"]);
-#. y2milestone("got %1", out);
-#: src/modules/Xpram.rb:154
+#: src/modules/Xpram.rb:151
msgid "Error starting xpram. Try \"rcxpram start\" manually."
msgstr "Ошибка запуска xpram. Попробуйте выполить rcxpram start вручную."
Modified: branches/SLE12-SP3/yast/ru/po/yast2-apparmor.ru.po
===================================================================
--- branches/SLE12-SP3/yast/ru/po/yast2-apparmor.ru.po 2017-05-23 07:08:50 UTC (rev 97361)
+++ branches/SLE12-SP3/yast/ru/po/yast2-apparmor.ru.po 2017-05-23 07:09:56 UTC (rev 97362)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: yast2-apparmor\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:26+0200\n"
+"POT-Creation-Date: 2017-04-05 02:27+0000\n"
"PO-Revision-Date: 2017-04-25 08:13\n"
"Last-Translator: Novell language \n"
"Language-Team: Novell language \n"
@@ -78,7 +78,7 @@
#. AppArmor dialog caption
#. Network dialog caption
-#: src/clients/apparmor.rb:51 src/include/apparmor/aa-config.rb:440
+#: src/clients/apparmor.rb:51 src/include/apparmor/aa-config.rb:60
msgid "AppArmor Configuration"
msgstr "Конфигурация AppArmor"
@@ -136,119 +136,11 @@
#. you may find current contact information at www.novell.com
#.
#. ***************************************************************************
-#: src/include/apparmor/aa-config.rb:52
-msgid "This operation generated the following error. Check your installation and AppArmor profile settings."
-msgstr "При выполнении данной операции возникла следующая ошибка. Проверьте вашу установку и настройки профиля AppArmor."
+#: src/include/apparmor/aa-config.rb:48
+msgid "Failed to change apparmor service. Please use journal (journalctl -n -u apparmor) to diagnose"
+msgstr ""
-#: src/include/apparmor/aa-config.rb:91 src/include/apparmor/aa-config.rb:103
-#: src/include/apparmor/aa-config.rb:115
-msgid "Disabled"
-msgstr "выключено"
-
-#: src/include/apparmor/aa-config.rb:92 src/include/apparmor/aa-config.rb:104
-#: src/include/apparmor/aa-config.rb:116
-msgid "1 minute"
-msgstr "1 минута"
-
-#: src/include/apparmor/aa-config.rb:93 src/include/apparmor/aa-config.rb:105
-#: src/include/apparmor/aa-config.rb:117
-msgid "5 minutes"
-msgstr "5 минут"
-
-#: src/include/apparmor/aa-config.rb:94 src/include/apparmor/aa-config.rb:106
-#: src/include/apparmor/aa-config.rb:118
-msgid "10 minutes"
-msgstr "10 минут"
-
-#: src/include/apparmor/aa-config.rb:95 src/include/apparmor/aa-config.rb:107
-#: src/include/apparmor/aa-config.rb:119
-msgid "15 minutes"
-msgstr "15 минут"
-
-#: src/include/apparmor/aa-config.rb:96 src/include/apparmor/aa-config.rb:108
-#: src/include/apparmor/aa-config.rb:120
-msgid "30 minutes"
-msgstr "30 минут"
-
-#: src/include/apparmor/aa-config.rb:97 src/include/apparmor/aa-config.rb:109
-#: src/include/apparmor/aa-config.rb:121
-msgid "1 hour"
-msgstr "1 час"
-
-#: src/include/apparmor/aa-config.rb:98 src/include/apparmor/aa-config.rb:110
-#: src/include/apparmor/aa-config.rb:122
-msgid "1 day"
-msgstr "1 день"
-
-#: src/include/apparmor/aa-config.rb:99 src/include/apparmor/aa-config.rb:111
-#: src/include/apparmor/aa-config.rb:123
-msgid "1 week"
-msgstr "1 неделя"
-
-#: src/include/apparmor/aa-config.rb:131 src/include/apparmor/aa-config.rb:233
-msgid "Security Event Notification"
-msgstr "Уведомление о безопасности"
-
-#: src/include/apparmor/aa-config.rb:138
-msgid "Terse Notification"
-msgstr "Краткое уведомление"
-
-#: src/include/apparmor/aa-config.rb:142 src/include/apparmor/aa-config.rb:171
-#: src/include/apparmor/aa-config.rb:200
-msgid "Frequency"
-msgstr "Периодичность"
-
-#: src/include/apparmor/aa-config.rb:145 src/include/apparmor/aa-config.rb:174
-#: src/include/apparmor/aa-config.rb:203
-msgid "Email Address"
-msgstr "Адрес E-mail"
-
-#: src/include/apparmor/aa-config.rb:150 src/include/apparmor/aa-config.rb:179
-#: src/include/apparmor/aa-config.rb:208
-msgid "Severity"
-msgstr "Строгость"
-
-#: src/include/apparmor/aa-config.rb:159 src/include/apparmor/aa-config.rb:188
-#: src/include/apparmor/aa-config.rb:217
-msgid "Include Unknown Severity Events"
-msgstr "Включить события неизвестной строгости"
-
-#: src/include/apparmor/aa-config.rb:167
-msgid "Summary Notification"
-msgstr "Сводное уведомление"
-
-#: src/include/apparmor/aa-config.rb:196
-msgid "Verbose Notification"
-msgstr "Подробное уведомление"
-
-#: src/include/apparmor/aa-config.rb:270 src/include/apparmor/aa-config.rb:310
-#: src/include/apparmor/aa-config.rb:350
-msgid "An email address is required for each selected notification method."
-msgstr "Для каждого выбранного метода уведомления требуется адрес электронной почты."
-
-#: src/include/apparmor/aa-config.rb:394
-msgid "Configuration failed for the following operations: "
-msgstr "Не удалось настроить следующие операции:"
-
-#: src/include/apparmor/aa-config.rb:401 src/include/apparmor/aa-config.rb:434
-msgid "Notification is enabled"
-msgstr "Уведомление включено"
-
-#. Notification Status
-#: src/include/apparmor/aa-config.rb:403 src/include/apparmor/aa-config.rb:431
-msgid "Notification is disabled"
-msgstr "Уведомление отключено"
-
-#. AppArmor Status
-#: src/include/apparmor/aa-config.rb:422
-msgid "AppArmor is disabled"
-msgstr "AppArmor отключен"
-
-#: src/include/apparmor/aa-config.rb:426
-msgid "AppArmor is enabled"
-msgstr "AppArmor включен"
-
-#: src/include/apparmor/aa-config.rb:441
+#: src/include/apparmor/aa-config.rb:61
msgid ""
"<p><b>AppArmor Status</b><br>This reports whether the AppArmor policy enforcement \n"
"module is loaded and functioning.</p>"
@@ -256,7 +148,7 @@
"<p><b>Состояние AppArmor</b><br>Сообщает что модуль внедрения политики AppArmor\n"
"загружен и функционирует.</p> "
-#: src/include/apparmor/aa-config.rb:444
+#: src/include/apparmor/aa-config.rb:64
msgid ""
"<p><b>Security Event Notification</b><br>Configure this tool if you want \n"
"to be notified by email when access violations have occurred.</p>"
@@ -264,7 +156,7 @@
"<p><b>Уведомление о безопасности</b><br>Настройте эту утилиту,\n"
"если вы хотите получать почту с извещением о нарушении прав доступа.</p>"
-#: src/include/apparmor/aa-config.rb:447
+#: src/include/apparmor/aa-config.rb:67
msgid ""
"<p><b>Profile Modes</b><br>Use this tool to change the way that AppArmor \n"
"uses individual profiles.</p>"
@@ -272,38 +164,28 @@
"<p><b>Режимы профиля</b><br>Используйте эту утилиту для изменения способа,\n"
"которым AppArmor использует отдельные профили.</p>"
-#: src/include/apparmor/aa-config.rb:462
+#: src/include/apparmor/aa-config.rb:82
msgid "&Enable AppArmor"
msgstr "&Включение AppArmor"
-#: src/include/apparmor/aa-config.rb:469
+#: src/include/apparmor/aa-config.rb:89
msgid "Configure AppArmor"
msgstr "Настройка AppArmor"
-#. event notification disabled due to changes in AppArmor
-#. `Frame ( _("Security Event Notification"),
-#. `HBox(
-#. `VSpacing(1), `HSpacing(1),
-#. `HVCenter( `Label( `id(`notifyLabel), evEnStr )),
-#. `PushButton( `id(`ntconf), _("C&onfigure")),
-#. `VSpacing(1), `HSpacing(1)
-#. )
-#. ),
-#. `VSpacing(1), `HSpacing(20),
-#: src/include/apparmor/aa-config.rb:485
+#: src/include/apparmor/aa-config.rb:95
msgid "Configure Profile Modes"
msgstr "Режимы конфигурации профиля"
-#: src/include/apparmor/aa-config.rb:491
+#: src/include/apparmor/aa-config.rb:101
msgid "Set profile modes"
msgstr "Установить режим профиля"
-#: src/include/apparmor/aa-config.rb:494
+#: src/include/apparmor/aa-config.rb:104
msgid "Co&nfigure"
msgstr "Конфигурация"
#. May want to replace Wizard() with UI()
-#: src/include/apparmor/aa-config.rb:518
+#: src/include/apparmor/aa-config.rb:128
#: src/include/apparmor/config_complain.rb:187
#: src/include/apparmor/config_complain.rb:235
#: src/include/apparmor/config_complain.rb:245
@@ -1992,7 +1874,77 @@
msgid "You must select a profile to edit."
msgstr "Вы должны выбрать профиль для редактирования."
-#: perl-lib/Notify.pm:51
-#, perl-format
-msgid "Failed copying %s."
-msgstr "Ошибка при копировании %s."
+#~ msgid "This operation generated the following error. Check your installation and AppArmor profile settings."
+#~ msgstr "При выполнении данной операции возникла следующая ошибка. Проверьте вашу установку и настройки профиля AppArmor."
+
+#~ msgid "Disabled"
+#~ msgstr "выключено"
+
+#~ msgid "1 minute"
+#~ msgstr "1 минута"
+
+#~ msgid "5 minutes"
+#~ msgstr "5 минут"
+
+#~ msgid "10 minutes"
+#~ msgstr "10 минут"
+
+#~ msgid "15 minutes"
+#~ msgstr "15 минут"
+
+#~ msgid "30 minutes"
+#~ msgstr "30 минут"
+
+#~ msgid "1 hour"
+#~ msgstr "1 час"
+
+#~ msgid "1 day"
+#~ msgstr "1 день"
+
+#~ msgid "1 week"
+#~ msgstr "1 неделя"
+
+#~ msgid "Security Event Notification"
+#~ msgstr "Уведомление о безопасности"
+
+#~ msgid "Terse Notification"
+#~ msgstr "Краткое уведомление"
+
+#~ msgid "Frequency"
+#~ msgstr "Периодичность"
+
+#~ msgid "Email Address"
+#~ msgstr "Адрес E-mail"
+
+#~ msgid "Severity"
+#~ msgstr "Строгость"
+
+#~ msgid "Include Unknown Severity Events"
+#~ msgstr "Включить события неизвестной строгости"
+
+#~ msgid "Summary Notification"
+#~ msgstr "Сводное уведомление"
+
+#~ msgid "Verbose Notification"
+#~ msgstr "Подробное уведомление"
+
+#~ msgid "An email address is required for each selected notification method."
+#~ msgstr "Для каждого выбранного метода уведомления требуется адрес электронной почты."
+
+#~ msgid "Configuration failed for the following operations: "
+#~ msgstr "Не удалось настроить следующие операции:"
+
+#~ msgid "Notification is enabled"
+#~ msgstr "Уведомление включено"
+
+#~ msgid "Notification is disabled"
+#~ msgstr "Уведомление отключено"
+
+#~ msgid "AppArmor is disabled"
+#~ msgstr "AppArmor отключен"
+
+#~ msgid "AppArmor is enabled"
+#~ msgstr "AppArmor включен"
+
+#~ msgid "Failed copying %s."
+#~ msgstr "Ошибка при копировании %s."