openSUSE Translation Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
September 2019
- 1 participants
- 1 discussions
[opensuse-translation-commit] r97440 - branches/SLE12-SP5/yast/50-pot
by mvidner@svn2.opensuse.org 20 Sep '19
by mvidner@svn2.opensuse.org 20 Sep '19
20 Sep '19
Author: mvidner
Date: 2019-09-20 15:19:27 +0000 (Fri, 20 Sep 2019)
New Revision: 97440
Modified:
branches/SLE12-SP5/yast/50-pot/add-on-creator.pot
branches/SLE12-SP5/yast/50-pot/add-on.pot
branches/SLE12-SP5/yast/50-pot/audit-laf.pot
branches/SLE12-SP5/yast/50-pot/auth-client.pot
branches/SLE12-SP5/yast/50-pot/auth-server.pot
branches/SLE12-SP5/yast/50-pot/autoinst.pot
branches/SLE12-SP5/yast/50-pot/bootloader.pot
branches/SLE12-SP5/yast/50-pot/ca-management.pot
branches/SLE12-SP5/yast/50-pot/caasp.pot
branches/SLE12-SP5/yast/50-pot/cio.pot
branches/SLE12-SP5/yast/50-pot/cluster.pot
branches/SLE12-SP5/yast/50-pot/control-center.pot
branches/SLE12-SP5/yast/50-pot/control.pot
branches/SLE12-SP5/yast/50-pot/country.pot
branches/SLE12-SP5/yast/50-pot/dhcp-server.pot
branches/SLE12-SP5/yast/50-pot/dns-server.pot
branches/SLE12-SP5/yast/50-pot/docker.pot
branches/SLE12-SP5/yast/50-pot/drbd.pot
branches/SLE12-SP5/yast/50-pot/fcoe-client.pot
branches/SLE12-SP5/yast/50-pot/firewall-services.pot
branches/SLE12-SP5/yast/50-pot/firewall.pot
branches/SLE12-SP5/yast/50-pot/firstboot.pot
branches/SLE12-SP5/yast/50-pot/ftp-server.pot
branches/SLE12-SP5/yast/50-pot/geo-cluster.pot
branches/SLE12-SP5/yast/50-pot/http-server.pot
branches/SLE12-SP5/yast/50-pot/inetd.pot
branches/SLE12-SP5/yast/50-pot/installation.pot
branches/SLE12-SP5/yast/50-pot/instserver.pot
branches/SLE12-SP5/yast/50-pot/iplb.pot
branches/SLE12-SP5/yast/50-pot/iscsi-client.pot
branches/SLE12-SP5/yast/50-pot/iscsi-lio-server.pot
branches/SLE12-SP5/yast/50-pot/isns.pot
branches/SLE12-SP5/yast/50-pot/journal.pot
branches/SLE12-SP5/yast/50-pot/journalctl.pot
branches/SLE12-SP5/yast/50-pot/kdump.pot
branches/SLE12-SP5/yast/50-pot/languages_db.pot
branches/SLE12-SP5/yast/50-pot/ldap-client.pot
branches/SLE12-SP5/yast/50-pot/ldap.pot
branches/SLE12-SP5/yast/50-pot/mail.pot
branches/SLE12-SP5/yast/50-pot/migration.pot
branches/SLE12-SP5/yast/50-pot/multipath.pot
branches/SLE12-SP5/yast/50-pot/network.pot
branches/SLE12-SP5/yast/50-pot/nfs.pot
branches/SLE12-SP5/yast/50-pot/nfs_server.pot
branches/SLE12-SP5/yast/50-pot/nis.pot
branches/SLE12-SP5/yast/50-pot/nis_server.pot
branches/SLE12-SP5/yast/50-pot/ntp-client.pot
branches/SLE12-SP5/yast/50-pot/online-update-configuration.pot
branches/SLE12-SP5/yast/50-pot/online-update.pot
branches/SLE12-SP5/yast/50-pot/packager.pot
branches/SLE12-SP5/yast/50-pot/pam.pot
branches/SLE12-SP5/yast/50-pot/pkg-bindings.pot
branches/SLE12-SP5/yast/50-pot/printer.pot
branches/SLE12-SP5/yast/50-pot/product-creator.pot
branches/SLE12-SP5/yast/50-pot/proxy.pot
branches/SLE12-SP5/yast/50-pot/qt.pot
branches/SLE12-SP5/yast/50-pot/rdp.pot
branches/SLE12-SP5/yast/50-pot/rear.pot
branches/SLE12-SP5/yast/50-pot/registration.pot
branches/SLE12-SP5/yast/50-pot/reipl.pot
branches/SLE12-SP5/yast/50-pot/relocation-server.pot
branches/SLE12-SP5/yast/50-pot/s390.pot
branches/SLE12-SP5/yast/50-pot/samba-client.pot
branches/SLE12-SP5/yast/50-pot/samba-server.pot
branches/SLE12-SP5/yast/50-pot/samba-users.pot
branches/SLE12-SP5/yast/50-pot/scanner.pot
branches/SLE12-SP5/yast/50-pot/security.pot
branches/SLE12-SP5/yast/50-pot/services-manager.pot
branches/SLE12-SP5/yast/50-pot/slp-server.pot
branches/SLE12-SP5/yast/50-pot/slp.pot
branches/SLE12-SP5/yast/50-pot/smt.pot
branches/SLE12-SP5/yast/50-pot/snapper.pot
branches/SLE12-SP5/yast/50-pot/sound.pot
branches/SLE12-SP5/yast/50-pot/squid.pot
branches/SLE12-SP5/yast/50-pot/storage.pot
branches/SLE12-SP5/yast/50-pot/sudo.pot
branches/SLE12-SP5/yast/50-pot/support.pot
branches/SLE12-SP5/yast/50-pot/sysconfig.pot
branches/SLE12-SP5/yast/50-pot/tftp-server.pot
branches/SLE12-SP5/yast/50-pot/timezone_db.pot
branches/SLE12-SP5/yast/50-pot/tune.pot
branches/SLE12-SP5/yast/50-pot/update.pot
branches/SLE12-SP5/yast/50-pot/users.pot
branches/SLE12-SP5/yast/50-pot/vm.pot
branches/SLE12-SP5/yast/50-pot/vpn.pot
branches/SLE12-SP5/yast/50-pot/wol.pot
branches/SLE12-SP5/yast/50-pot/xpram.pot
branches/SLE12-SP5/yast/50-pot/yast2-apparmor.pot
Log:
Updated POT files from the SLE-12-SP5 branches
(had to add missing textdomains in network and installation)
Modified: branches/SLE12-SP5/yast/50-pot/add-on-creator.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/add-on-creator.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/add-on-creator.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:26+0200\n"
-"PO-Revision-Date: 2016-08-30 18:26+0200\n"
+"POT-Creation-Date: 2019-09-20 15:55+0200\n"
+"PO-Revision-Date: 2019-09-20 15:55+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -259,8 +259,8 @@
#. command line message, do not translate 'create', 'clone'
#: src/clients/add-on-creator.rb:864
msgid ""
-"There is no add-on product configuration present. Create a new one using the '"
-"create' or 'clone' commands."
+"There is no add-on product configuration present. Create a new one using the "
+"'create' or 'clone' commands."
msgstr ""
#. error message
@@ -300,12 +300,14 @@
#. help text
#: src/include/add-on-creator/complex.rb:156
-msgid "<p>Start creating a new add-on product configuration with <b>Add</b>.</p>"
+msgid ""
+"<p>Start creating a new add-on product configuration with <b>Add</b>.</p>"
msgstr ""
#. help text
#: src/include/add-on-creator/complex.rb:160
-msgid "<p>Use <b>Edit</b> to modify the selected add-on product configuration.</p>"
+msgid ""
+"<p>Use <b>Edit</b> to modify the selected add-on product configuration.</p>"
msgstr ""
#. help text
@@ -316,8 +318,8 @@
#. help text
#: src/include/add-on-creator/complex.rb:166
msgid ""
-"<p>Build the new add-on product based on the selected configuration with <b>Bu"
-"ild</b>.</p>"
+"<p>Build the new add-on product based on the selected configuration with "
+"<b>Build</b>.</p>"
msgstr ""
#. table header item
@@ -1039,22 +1041,23 @@
#. help text for start menu
#: src/include/add-on-creator/helps.rb:44
-msgid "<p>This module offers guidance for the creation of an add-on product.</p>"
+msgid ""
+"<p>This module offers guidance for the creation of an add-on product.</p>"
msgstr ""
#. help text for start menu, cont.
#: src/include/add-on-creator/helps.rb:48
msgid ""
-"<p>Select how to create the new add-on product. You can create it from the beg"
-"inning or base it on an existing product.</p>"
+"<p>Select how to create the new add-on product. You can create it from the "
+"beginning or base it on an existing product.</p>"
msgstr ""
#. help text for start menu, cont.
#: src/include/add-on-creator/helps.rb:52
msgid ""
-"<p>When basing the new product on an existing product, check <b>Generate Packa"
-"ge Descriptions</b> to generate new descriptions of packages in the existing p"
-"roduct.</p>"
+"<p>When basing the new product on an existing product, check <b>Generate "
+"Package Descriptions</b> to generate new descriptions of packages in the "
+"existing product.</p>"
msgstr ""
#. help text for initial data (paragraph title)
@@ -1075,8 +1078,8 @@
#. help text for initial data, cont.
#: src/include/add-on-creator/helps.rb:64
msgid ""
-"<p>Select the product to which the new add-on product can be applied. This sel"
-"ection forms the <b>REQUIRES</b> value of the <tt>content</tt> file.</p>"
+"<p>Select the product to which the new add-on product can be applied. This "
+"selection forms the <b>REQUIRES</b> value of the <tt>content</tt> file.</p>"
msgstr ""
#. help text for initial data (paragraph title), cont.
@@ -1087,8 +1090,8 @@
#. help text for initial data, cont.
#: src/include/add-on-creator/helps.rb:70
msgid ""
-"<p>Choose the path to the directory containing the RPM packages that should fo"
-"rm your add-on product.</p>"
+"<p>Choose the path to the directory containing the RPM packages that should "
+"form your add-on product.</p>"
msgstr ""
#. help text for initial data (paragraph title), cont.
@@ -1099,10 +1102,10 @@
#. help text for initial data, cont.
#: src/include/add-on-creator/helps.rb:76
msgid ""
-"<p>Optionally, choose the path to the directory containing the RPM packages fr"
-"om the product the add-on product should be based on. These packages will not "
-"be contained in the add-on product, but could be used for creating the pattern"
-"s later in the workflow.</p>"
+"<p>Optionally, choose the path to the directory containing the RPM packages "
+"from the product the add-on product should be based on. These packages will "
+"not be contained in the add-on product, but could be used for creating the "
+"patterns later in the workflow.</p>"
msgstr ""
#. help text for content file editor (<tt>content</tt> is a name of file)
@@ -1113,9 +1116,9 @@
#. help text for content file editor, cont.
#: src/include/add-on-creator/helps.rb:84
msgid ""
-"<p>Enter the information required to identify the add-on product. Deselect <b>"
-"Show Only Required Keywords</b> to see all attributes of the <tt>content</tt> "
-"file.</p>"
+"<p>Enter the information required to identify the add-on product. Deselect "
+"<b>Show Only Required Keywords</b> to see all attributes of the <tt>content</"
+"tt> file.</p>"
msgstr ""
#. help text for content file editor, cont.
@@ -1126,31 +1129,31 @@
#. help text for package description files
#: src/include/add-on-creator/helps.rb:92
msgid ""
-"<p>Edit the language-specific descriptions of packages (<tt>packages.lang</tt>"
-" files) here.</p>"
+"<p>Edit the language-specific descriptions of packages (<tt>packages.lang</"
+"tt> files) here.</p>"
msgstr ""
#. help text for package description files, cont.
#: src/include/add-on-creator/helps.rb:96
msgid ""
-"<p>Use <b>Add Language</b> to add a description file for a new language. The l"
-"ist of available languages is read from the <b>LINGUAS</b> value of the <tt>co"
-"ntent</tt> file. Import an existing file with package descriptions with <b>Imp"
-"ort</b>. Delete the description file with <b>Delete</b>.</p>"
+"<p>Use <b>Add Language</b> to add a description file for a new language. The "
+"list of available languages is read from the <b>LINGUAS</b> value of the "
+"<tt>content</tt> file. Import an existing file with package descriptions "
+"with <b>Import</b>. Delete the description file with <b>Delete</b>.</p>"
msgstr ""
#. help text for package description files, cont.
#: src/include/add-on-creator/helps.rb:100
msgid ""
-"<p>Use <b>Add</b> and <b>Edit</b> in the second table to modify description en"
-"tries for the selected package.</p>"
+"<p>Use <b>Add</b> and <b>Edit</b> in the second table to modify description "
+"entries for the selected package.</p>"
msgstr ""
#. help text for package description files, cont.
#: src/include/add-on-creator/helps.rb:104
msgid ""
-"<p>Optionally, choose the path for the file providing <b>Additional Package De"
-"pendencies</b> (EXTRA_PROV).</p>"
+"<p>Optionally, choose the path for the file providing <b>Additional Package "
+"Dependencies</b> (EXTRA_PROV).</p>"
msgstr ""
#. help text for patterns
@@ -1161,100 +1164,102 @@
#. help text for patterns, cont.
#: src/include/add-on-creator/helps.rb:112
msgid ""
-"<p>Use <b>New</b> to create a new pattern or <b>Import</b> to import an existi"
-"ng one.</p>"
+"<p>Use <b>New</b> to create a new pattern or <b>Import</b> to import an "
+"existing one.</p>"
msgstr ""
#. help text for patterns, cont.
#: src/include/add-on-creator/helps.rb:116
msgid ""
-"<p>Use <b>Add</b> and <b>Edit</b> in the second table to modify pattern attrib"
-"utes.</p>"
+"<p>Use <b>Add</b> and <b>Edit</b> in the second table to modify pattern "
+"attributes.</p>"
msgstr ""
#. help text for patterns, cont.
#: src/include/add-on-creator/helps.rb:120
msgid ""
-"<p>Check <b>Required pattern</b> to mark the selected pattern as required for\n"
-"the add-on product. Such a pattern will be automatically preselected when the "
-"installation of the add-on product is started.</p>"
+"<p>Check <b>Required pattern</b> to mark the selected pattern as required "
+"for\n"
+"the add-on product. Such a pattern will be automatically preselected when "
+"the installation of the add-on product is started.</p>"
msgstr ""
#. help text for the 'various settings' dialog
#: src/include/add-on-creator/helps.rb:124
msgid ""
-"<p>Specify the path to the directory in which the add-on product should be cre"
-"ated. Select <b>Create ISO Image</b> to create the ISO image of the product in"
-" the output directory.</p>"
+"<p>Specify the path to the directory in which the add-on product should be "
+"created. Select <b>Create ISO Image</b> to create the ISO image of the "
+"product in the output directory.</p>"
msgstr ""
#. help text for the 'various settings' dialog
#: src/include/add-on-creator/helps.rb:128
msgid ""
-"<p>Use <b>Generate Changelog</b> to generate a changelog file containing all c"
-"hanges of packages on the add-on product made in the last two years.</p>"
+"<p>Use <b>Generate Changelog</b> to generate a changelog file containing all "
+"changes of packages on the add-on product made in the last two years.</p>"
msgstr ""
#. help text for the 'various settings' dialog
#: src/include/add-on-creator/helps.rb:132
msgid ""
-"<p>Adapt the workflow of the add-on product with <b>Configure Workflow</b>. Us"
-"e <b>Optional Files</b> to configure texts of <tt>README</tt> files, licenses,"
-" and other optional values.</p>"
+"<p>Adapt the workflow of the add-on product with <b>Configure Workflow</b>. "
+"Use <b>Optional Files</b> to configure texts of <tt>README</tt> files, "
+"licenses, and other optional values.</p>"
msgstr ""
#. workflow help text
#: src/include/add-on-creator/helps.rb:136
msgid ""
-"<p>Here, you can enter the files necessary for customizing your add-on product"
-" workflow.</p>"
+"<p>Here, you can enter the files necessary for customizing your add-on "
+"product workflow.</p>"
msgstr ""
#. workflow help text
#: src/include/add-on-creator/helps.rb:140
msgid ""
-"<p>Enter the location of the file with the workflow description. This file is "
-"an alternative to <tt>control.xml</tt> and is saved as <tt>installation.xml</t"
-"t> in the add-on product's base directory.</p>"
+"<p>Enter the location of the file with the workflow description. This file "
+"is an alternative to <tt>control.xml</tt> and is saved as <tt>installation."
+"xml</tt> in the add-on product's base directory.</p>"
msgstr ""
#. workflow help text
#: src/include/add-on-creator/helps.rb:144
msgid ""
-"<p>To use custom YaST modules during the installation of the add-on product, e"
-"nter the path to the <tt>y2update.tgz</tt> archive where these modules are sto"
-"red or configure the contents of <tt>y2update.tgz</tt> by specifying the YaST "
-"RPM packages in <b>Import the Packages</b>.</p>"
+"<p>To use custom YaST modules during the installation of the add-on product, "
+"enter the path to the <tt>y2update.tgz</tt> archive where these modules are "
+"stored or configure the contents of <tt>y2update.tgz</tt> by specifying the "
+"YaST RPM packages in <b>Import the Packages</b>.</p>"
msgstr ""
#. help text for expert dialog 1
#: src/include/add-on-creator/helps.rb:148
msgid ""
-"<p>The optional <tt>info.txt</tt> file gives information about the add-on that"
-" should be displayed as a pop-up window with an <b>OK</b> button.</p>"
+"<p>The optional <tt>info.txt</tt> file gives information about the add-on "
+"that should be displayed as a pop-up window with an <b>OK</b> button.</p>"
msgstr ""
#. help text for expert dialog 1, cont
#: src/include/add-on-creator/helps.rb:152
msgid ""
-"<p>The text of the license is displayed in a window with <b>Agree</b> and <b>D"
-"isagree</b> buttons before the installation starts. The files with the license"
-" texts in different languages are compressed to the <tt>license.zip</tt> archi"
-"ve and stored in the <tt>media.1</tt> directory.</p>"
+"<p>The text of the license is displayed in a window with <b>Agree</b> and "
+"<b>Disagree</b> buttons before the installation starts. The files with the "
+"license texts in different languages are compressed to the <tt>license.zip</"
+"tt> archive and stored in the <tt>media.1</tt> directory.</p>"
msgstr ""
#. help text for expert dialog 2
#: src/include/add-on-creator/helps.rb:156
msgid ""
-"<p>The <tt>COPYRIGHT</tt> and <tt>COPYING</tt> files can have various language"
-" modifications and are stored in the root directory of the add-on product.</p>"
+"<p>The <tt>COPYRIGHT</tt> and <tt>COPYING</tt> files can have various "
+"language modifications and are stored in the root directory of the add-on "
+"product.</p>"
msgstr ""
#. help text for signing dialog
#: src/include/add-on-creator/helps.rb:160
msgid ""
-"<p>Here, configure the signing of the add-on product. Choose a secret key from"
-" the list of keys available or create a new one with <b>Create</b>.</p>"
+"<p>Here, configure the signing of the add-on product. Choose a secret key "
+"from the list of keys available or create a new one with <b>Create</b>.</p>"
msgstr ""
#. help text for signing dialog, cont.
@@ -1265,48 +1270,50 @@
#. help text for signing dialog, cont.
#: src/include/add-on-creator/helps.rb:166
msgid ""
-"<p>Decide if you want to <b>Sign All Packages</b> of the add-on product with t"
-"he selected key. All previous package signatures will be removed.</p>"
+"<p>Decide if you want to <b>Sign All Packages</b> of the add-on product with "
+"the selected key. All previous package signatures will be removed.</p>"
msgstr ""
#. help text for generating new key dialog
#: src/include/add-on-creator/helps.rb:170
-msgid "<p>Enter the values necessary for generating the new primary key pair.</p>"
+msgid ""
+"<p>Enter the values necessary for generating the new primary key pair.</p>"
msgstr ""
#. help text for generating new key dialog, cont.
#: src/include/add-on-creator/helps.rb:174
msgid ""
-"<p>The default size of a DSA key is 1024 bits. RSA keys may be between 1024 an"
-"d 4096 bits long.</p>"
+"<p>The default size of a DSA key is 1024 bits. RSA keys may be between 1024 "
+"and 4096 bits long.</p>"
msgstr ""
#. help text for generating new key dialog, cont.
#: src/include/add-on-creator/helps.rb:178
msgid ""
-"<p>As <b>Expiration Date</b>, enter the number of days after which the key exp"
-"ires. If the number is followed by <tt>w</tt>,<tt>m</tt>, or <tt>y</tt>, it in"
-"dicates the number of weeks, months, or years. Leave the entry empty for a key"
-" that never expires.</p>"
+"<p>As <b>Expiration Date</b>, enter the number of days after which the key "
+"expires. If the number is followed by <tt>w</tt>,<tt>m</tt>, or <tt>y</tt>, "
+"it indicates the number of weeks, months, or years. Leave the entry empty "
+"for a key that never expires.</p>"
msgstr ""
#. help text for generating new key dialog, cont.
#: src/include/add-on-creator/helps.rb:182
msgid ""
-"<p>Use <b>Name</b>, <b>Comment</b>, and <b>E-Mail Address</b> to provide the u"
-"ser identification with which the new key should be associated.</p>"
+"<p>Use <b>Name</b>, <b>Comment</b>, and <b>E-Mail Address</b> to provide the "
+"user identification with which the new key should be associated.</p>"
msgstr ""
#. help text for overview dialog
#: src/include/add-on-creator/helps.rb:186
-msgid "<p>Here, see the overview of data for generating the add-on product.</p>"
+msgid ""
+"<p>Here, see the overview of data for generating the add-on product.</p>"
msgstr ""
#. help text for overview dialog, cont.
#: src/include/add-on-creator/helps.rb:190
msgid ""
-"<p>Press <b>Finish</b> to create the add-on product in the output directory.</"
-"p>"
+"<p>Press <b>Finish</b> to create the add-on product in the output directory."
+"</p>"
msgstr ""
#. text entry label
@@ -1420,8 +1427,8 @@
#. help text for content file 'BASEARCHS' key
#: src/modules/AddOnCreator.rb:164
msgid ""
-"Space-separated list of product architectures. Matches the available product-r"
-"elease packages architectures. "
+"Space-separated list of product architectures. Matches the available product-"
+"release packages architectures. "
msgstr ""
#. label of content file 'VERSION' key
@@ -1448,9 +1455,9 @@
#. help text for content file 'DISTRIBUTION' key
#: src/modules/AddOnCreator.rb:194
msgid ""
-"Some string denoting the distribution. The same string is most probably used i"
-"n the .rpms to denote the distribution. Usually a composition of the name, ver"
-"sion and architecture."
+"Some string denoting the distribution. The same string is most probably used "
+"in the .rpms to denote the distribution. Usually a composition of the name, "
+"version and architecture."
msgstr ""
#. label of content file key
@@ -1481,8 +1488,8 @@
#. help text for content file '' key
#: src/modules/AddOnCreator.rb:227
msgid ""
-"UTF-8 encoded label. Default label if <b>LINGUAS</b> is omitted or no default "
-"language can be determined."
+"UTF-8 encoded label. Default label if <b>LINGUAS</b> is omitted or no "
+"default language can be determined."
msgstr ""
#. label of content file 'LINGUAS' key
@@ -1553,9 +1560,9 @@
#. help text for content file 'LABEL.lang' key
#: src/modules/AddOnCreator.rb:304
msgid ""
-"UTF-8-encoded <b>LABEL</b>. <tt>lang</tt> has the same syntax as the <b>LINGUA"
-"S</b> values. For each language in <b>LINGUAS</b>, a matching <b>LABEL.lang</b"
-"> is expected."
+"UTF-8-encoded <b>LABEL</b>. <tt>lang</tt> has the same syntax as the "
+"<b>LINGUAS</b> values. For each language in <b>LINGUAS</b>, a matching "
+"<b>LABEL.lang</b> is expected."
msgstr ""
#: src/modules/AddOnCreator.rb:328
@@ -1595,8 +1602,8 @@
#. help text for 'Cat' pattern key
#: src/modules/AddOnCreator.rb:366
msgid ""
-"One line category in the default language used to group patterns. Categories a"
-"re intended for the user and can be specified freely."
+"One line category in the default language used to group patterns. Categories "
+"are intended for the user and can be specified freely."
msgstr ""
#. help text for 'Cat.lang' pattern key
@@ -1631,7 +1638,8 @@
#. help text for 'Prc' pattern key
#: src/modules/AddOnCreator.rb:400
-msgid "These packages are installed by default but can be removed without complaint."
+msgid ""
+"These packages are installed by default but can be removed without complaint."
msgstr ""
#. label for 'Prs' pattern key
@@ -1645,8 +1653,8 @@
#: src/modules/AddOnCreator.rb:410 src/modules/AddOnCreator.rb:503
#: src/modules/AddOnCreator.rb:712
msgid ""
-"These are just hints for an application and not handled during dependency reso"
-"lution."
+"These are just hints for an application and not handled during dependency "
+"resolution."
msgstr ""
#. label for 'Ico' pattern key
@@ -1658,12 +1666,12 @@
#: src/modules/AddOnCreator.rb:420
msgid ""
"If unspecified, the pattern name is used \n"
-" instead (with blanks in the name replaced by underscores). If the filename do"
-"es not include a .png or .jpg extension, .png is appended. If no path is speci"
-"fied, icons are searched for in the theme icon path (first /usr/share/YaST2/th"
-"eme/current/icons/32x32/apps/ then /usr/share/YaST2/theme/current/icons/48x48/"
-"apps/). Absolute and relative paths (to the theme path /usr/share/YaST2/theme/"
-"current/) are allowed."
+" instead (with blanks in the name replaced by underscores). If the filename "
+"does not include a .png or .jpg extension, .png is appended. If no path is "
+"specified, icons are searched for in the theme icon path (first /usr/share/"
+"YaST2/theme/current/icons/32x32/apps/ then /usr/share/YaST2/theme/current/"
+"icons/48x48/apps/). Absolute and relative paths (to the theme path /usr/"
+"share/YaST2/theme/current/) are allowed."
msgstr ""
#. label for 'Ord' pattern key
@@ -1674,8 +1682,8 @@
#. help text for 'Ord' pattern key
#: src/modules/AddOnCreator.rb:431
msgid ""
-"This three-digit integer value defines the order of the pattern when listing m"
-"ultiple patterns in the user interface."
+"This three-digit integer value defines the order of the pattern when listing "
+"multiple patterns in the user interface."
msgstr ""
#. label for 'Req' pattern key
@@ -1696,10 +1704,10 @@
#. help text for 'Prv' pattern key
#: src/modules/AddOnCreator.rb:453
msgid ""
-"Capabilities this pattern provides. They can be used to match <b>REQUIRES</b> "
-"from others. Every resolvable has a provide by default--its own name and editi"
-"on. For example, package <i>bar-1.42-1</i> provides the capability <tt>bar = 1"
-".42-1</tt>."
+"Capabilities this pattern provides. They can be used to match <b>REQUIRES</"
+"b> from others. Every resolvable has a provide by default--its own name and "
+"edition. For example, package <i>bar-1.42-1</i> provides the capability "
+"<tt>bar = 1.42-1</tt>."
msgstr ""
#. label for 'Con' pattern key
@@ -1710,8 +1718,8 @@
#. help text for 'Con' pattern key
#: src/modules/AddOnCreator.rb:463
msgid ""
-"This pattern cannot be installed if the specified resolvable or one that provi"
-"des the capability is installed."
+"This pattern cannot be installed if the specified resolvable or one that "
+"provides the capability is installed."
msgstr ""
#. label for 'Obs' pattern key
@@ -1734,8 +1742,8 @@
#. help text for 'Rec' pattern key
#: src/modules/AddOnCreator.rb:483
msgid ""
-"A weak version of REQUIRES. If recommended patterns cannot be installed, no er"
-"ror is shown."
+"A weak version of REQUIRES. If recommended patterns cannot be installed, no "
+"error is shown."
msgstr ""
#. label for 'Sup' pattern key
@@ -1746,9 +1754,9 @@
#. help text for 'Sup' pattern key
#: src/modules/AddOnCreator.rb:493
msgid ""
-"A reverse <b>Rec</b>. This pattern is installed if the specified capability is"
-" provided by an installed resolvable. The dependency resolver installs it. Uni"
-"nstalling it is silently accepted."
+"A reverse <b>Rec</b>. This pattern is installed if the specified capability "
+"is provided by an installed resolvable. The dependency resolver installs it. "
+"Uninstalling it is silently accepted."
msgstr ""
#. label for 'Sug' pattern key
@@ -1764,8 +1772,8 @@
#. help text for 'Fre' pattern key
#: src/modules/AddOnCreator.rb:513
msgid ""
-"The current pattern is only considered for installation if the pattern specifi"
-"ed here is installed."
+"The current pattern is only considered for installation if the pattern "
+"specified here is installed."
msgstr ""
#. label for 'Ext' pattern key
@@ -1826,8 +1834,8 @@
#. help text for 'Ins' key
#: src/modules/AddOnCreator.rb:601
msgid ""
-"An informal message shown to the user if the package is selected, such as a te"
-"st version warning or a commercial license."
+"An informal message shown to the user if the package is selected, such as a "
+"test version warning or a commercial license."
msgstr ""
#. label for 'Del' key
@@ -1838,8 +1846,8 @@
#. help text for 'Del' key
#: src/modules/AddOnCreator.rb:610
msgid ""
-"An informal message shown to the user if the package is selected for deletion,"
-" such as a warning that the system is unusable without the package."
+"An informal message shown to the user if the package is selected for "
+"deletion, such as a warning that the system is unusable without the package."
msgstr ""
#. label for 'Eul' key
@@ -1850,8 +1858,8 @@
#. help text for 'Eul' key
#: src/modules/AddOnCreator.rb:619
msgid ""
-"Text of the EULA. This text is displayed before the package installation. If t"
-"he user does not accept the EULA, the package is not installed."
+"Text of the EULA. This text is displayed before the package installation. If "
+"the user does not accept the EULA, the package is not installed."
msgstr ""
#. label of key
@@ -1862,8 +1870,8 @@
#. help text for 'REQUIRES' key
#: src/modules/AddOnCreator.rb:662
msgid ""
-"<p>Resolvables that must be installed on the system to meet product requiremen"
-"ts.</p>"
+"<p>Resolvables that must be installed on the system to meet product "
+"requirements.</p>"
msgstr ""
#. label of PROVIDES key
@@ -1874,8 +1882,8 @@
#. help text for 'PROVIDES' key
#: src/modules/AddOnCreator.rb:672
msgid ""
-"Capabilities this product provides. They can be used to match <b>requires</b> "
-"from others."
+"Capabilities this product provides. They can be used to match <b>requires</"
+"b> from others."
msgstr ""
#. label of 'CONFLICTS' key
@@ -1886,8 +1894,8 @@
#. help text for 'CONFLICTS' key
#: src/modules/AddOnCreator.rb:682
msgid ""
-"This resolvable cannot be installed if the specified resolvable or one that pr"
-"ovides the capability is installed."
+"This resolvable cannot be installed if the specified resolvable or one that "
+"provides the capability is installed."
msgstr ""
#. label of 'OBSOLETES' key
@@ -1898,8 +1906,8 @@
#. help text for 'OBSOLETES' key
#: src/modules/AddOnCreator.rb:692
msgid ""
-"When this resolvable is installed, it uninstalls any other resolvable with a n"
-"ame matching this keyword."
+"When this resolvable is installed, it uninstalls any other resolvable with a "
+"name matching this keyword."
msgstr ""
#. label of 'RECOMMENDS' key
@@ -1910,8 +1918,8 @@
#. help text for 'RECOMMENDS' key
#: src/modules/AddOnCreator.rb:702
msgid ""
-"A weak version of <b>requires</b>. An attempt is made to fulfill <b>RECOMMENDS"
-"</b>, but they are silently ignored if no match is possible."
+"A weak version of <b>requires</b>. An attempt is made to fulfill "
+"<b>RECOMMENDS</b>, but they are silently ignored if no match is possible."
msgstr ""
#. label of 'SUGGESTS' key
@@ -1942,8 +1950,8 @@
#. help text for 'productline' key
#: src/modules/AddOnCreator.rb:747
msgid ""
-"A short name for the product, which does not change between service packs and "
-"versions."
+"A short name for the product, which does not change between service packs "
+"and versions."
msgstr ""
#. table item label
@@ -1959,8 +1967,8 @@
#. help text for media type
#: src/modules/AddOnCreator.rb:761
msgid ""
-"Type of media that will be used for target product. Possible values are: cd, f"
-"tp, dvd5, dvd9."
+"Type of media that will be used for target product. Possible values are: cd, "
+"ftp, dvd5, dvd9."
msgstr ""
#. table item label
@@ -2016,8 +2024,7 @@
#. help text
#: src/modules/AddOnCreator.rb:1746
-msgid ""
-"<b>Wait while generating data for add-on...</b><br/>\n"
+msgid "<b>Wait while generating data for add-on...</b><br/>\n"
msgstr ""
#. error report
Modified: branches/SLE12-SP5/yast/50-pot/add-on.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/add-on.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/add-on.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-19 02:27+0000\n"
-"PO-Revision-Date: 2017-05-19 02:27+0000\n"
+"POT-Creation-Date: 2019-09-20 15:55+0200\n"
+"PO-Revision-Date: 2019-09-20 15:55+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -47,21 +47,21 @@
#. this is a heading
#. Cleanup UI - Prepare it for progress callbacks
#: src/clients/add-on.rb:105 src/clients/add-on_proposal.rb:76
-#: src/include/add-on/add-on-workflow.rb:1873
+#: src/include/add-on/add-on-workflow.rb:1879
msgid "Add-On Products"
msgstr ""
#. busy message (dialog)
#. TRANSLATORS: dialog content - a very simple label
#: src/clients/add-on.rb:107 src/clients/inst_language_add-on.rb:155
-#: src/include/add-on/add-on-workflow.rb:1874
+#: src/include/add-on/add-on-workflow.rb:1880
msgid "Initializing..."
msgstr ""
#. help
#. TRANSLATORS: help text
#: src/clients/add-on.rb:109 src/clients/inst_language_add-on.rb:157
-#: src/include/add-on/add-on-workflow.rb:1875
+#: src/include/add-on/add-on-workflow.rb:1881
msgid "<p>Initializing add-on products...</p>"
msgstr ""
@@ -223,8 +223,8 @@
#. ]
#: src/include/add-on/add-on-workflow.rb:161
#: src/include/add-on/add-on-workflow.rb:580
-#: src/include/add-on/add-on-workflow.rb:1588
-#: src/include/add-on/add-on-workflow.rb:1600
+#: src/include/add-on/add-on-workflow.rb:1589
+#: src/include/add-on/add-on-workflow.rb:1601
msgid "No product found in the repository."
msgstr ""
@@ -330,89 +330,89 @@
msgstr ""
#. message report
-#: src/include/add-on/add-on-workflow.rb:1120
+#: src/include/add-on/add-on-workflow.rb:1122
msgid "Select a product to delete."
msgstr ""
#. TRANSLATORS: busy message
-#: src/include/add-on/add-on-workflow.rb:1128
+#: src/include/add-on/add-on-workflow.rb:1130
msgid "Removing selected add-on..."
msgstr ""
#. TRANSLATORS: dialog caption
-#: src/include/add-on/add-on-workflow.rb:1255
+#: src/include/add-on/add-on-workflow.rb:1256
msgid "Installed Add-on Products"
msgstr ""
#. TRANSLATORS: table header item
-#: src/include/add-on/add-on-workflow.rb:1262
+#: src/include/add-on/add-on-workflow.rb:1263
msgid "Add-on Product"
msgstr ""
#. TRANSLATORS: table header item
-#: src/include/add-on/add-on-workflow.rb:1264
+#: src/include/add-on/add-on-workflow.rb:1265
msgid "URL"
msgstr ""
#. TRANSLATORS: push button
-#: src/include/add-on/add-on-workflow.rb:1278
+#: src/include/add-on/add-on-workflow.rb:1279
msgid "Run &Software Manager..."
msgstr ""
#. TRANSLATORS: dialog help adp/1
-#: src/include/add-on/add-on-workflow.rb:1282
+#: src/include/add-on/add-on-workflow.rb:1283
msgid "<p>All add-on products installed on your system are displayed.</p>"
msgstr ""
#. TRANSLATORS: dialog help adp/2
-#: src/include/add-on/add-on-workflow.rb:1284
+#: src/include/add-on/add-on-workflow.rb:1285
msgid ""
"<p>Click <b>Add</b> to add a new add-on product, or <b>Delete</b> to remove "
"an add-on which is in use.</p>"
msgstr ""
#. no items
-#: src/include/add-on/add-on-workflow.rb:1337
+#: src/include/add-on/add-on-workflow.rb:1338
msgid "<b>Vendor:</b> %1<br>"
msgstr ""
-#: src/include/add-on/add-on-workflow.rb:1338
+#: src/include/add-on/add-on-workflow.rb:1339
msgid "Unknown vendor"
msgstr ""
-#: src/include/add-on/add-on-workflow.rb:1341
+#: src/include/add-on/add-on-workflow.rb:1342
msgid "<b>Version:</b> %1<br>"
msgstr ""
-#: src/include/add-on/add-on-workflow.rb:1342
+#: src/include/add-on/add-on-workflow.rb:1343
msgid "Unknown version"
msgstr ""
-#: src/include/add-on/add-on-workflow.rb:1345
+#: src/include/add-on/add-on-workflow.rb:1346
msgid "<b>Repository URL:</b> %1<br>"
msgstr ""
-#: src/include/add-on/add-on-workflow.rb:1351
+#: src/include/add-on/add-on-workflow.rb:1352
msgid "Unknown repository URL"
msgstr ""
-#: src/include/add-on/add-on-workflow.rb:1358
+#: src/include/add-on/add-on-workflow.rb:1359
msgid "<b>Repository Alias:</b> %1<br>"
msgstr ""
#. Removes the currently selected Add-On
#.
#. @return [Boolean] whether something has changed its state
-#: src/include/add-on/add-on-workflow.rb:1638
-#: src/include/add-on/add-on-workflow.rb:1691
+#: src/include/add-on/add-on-workflow.rb:1639
+#: src/include/add-on/add-on-workflow.rb:1692
msgid "Unknown product"
msgstr ""
-#: src/include/add-on/add-on-workflow.rb:1641
+#: src/include/add-on/add-on-workflow.rb:1642
msgid "Unknown URL"
msgstr ""
-#: src/include/add-on/add-on-workflow.rb:1697
+#: src/include/add-on/add-on-workflow.rb:1698
msgid ""
"Deleting the add-on product %1 may result in removing all the packages\n"
"installed from this add-on.\n"
@@ -421,7 +421,7 @@
msgstr ""
#. TRANSLATORS: busy popup message
-#: src/include/add-on/add-on-workflow.rb:1714
+#: src/include/add-on/add-on-workflow.rb:1715
msgid "Removing product dependencies..."
msgstr ""
@@ -439,7 +439,3 @@
"\n"
"Do you want to skip using add-on products?"
msgstr ""
-
-#: control/installation.glade.translations.glade:4
-msgid "Language Installation"
-msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/audit-laf.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/audit-laf.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/audit-laf.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:26+0200\n"
-"PO-Revision-Date: 2016-08-30 18:26+0200\n"
+"POT-Creation-Date: 2019-09-20 15:55+0200\n"
+"PO-Revision-Date: 2019-09-20 15:55+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -194,24 +194,20 @@
msgstr ""
#: src/include/audit-laf/complex.rb:342
-msgid ""
-"%1 doesn't exist.\n"
+msgid "%1 doesn't exist.\n"
msgstr ""
#: src/include/audit-laf/complex.rb:348
-msgid ""
-"%1 is not a regular file.\n"
+msgid "%1 is not a regular file.\n"
msgstr ""
#: src/include/audit-laf/complex.rb:355
-msgid ""
-"%1 not owned by root.\n"
+msgid "%1 not owned by root.\n"
msgstr ""
#. check permissions
#: src/include/audit-laf/complex.rb:371
-msgid ""
-"File permissions of %1 NOT set to -rwxr-x---.\n"
+msgid "File permissions of %1 NOT set to -rwxr-x---.\n"
msgstr ""
#. Warning - the audit configuration is locked, reset impossible
@@ -465,7 +461,8 @@
#. Read dialog help 1/2
#: src/include/audit-laf/helps.rb:35
msgid ""
-"<p><b><big>Initializing Configuration of Linux Audit Framework</big></b><br>\n"
+"<p><b><big>Initializing Configuration of Linux Audit Framework</big></"
+"b><br>\n"
"</p>\n"
msgstr ""
@@ -496,21 +493,21 @@
#: src/include/audit-laf/helps.rb:54
msgid ""
"<p><b><big>Auditd Log File Configuration</big></b><br>\n"
-"The audit daemon is the component of the Linux Auditing System which is respon"
-"sible for writing all relevant audit events to the log file <i>/var/log/audit/"
-"audit.log</i> (default).\n"
-"Events may come from the <i>apparmor</i> kernel module, from applications whic"
-"h use <i>libaudit</i> (e.g. PAM) or incidents caused by rules (e.g. file watch"
-"es).</p>"
+"The audit daemon is the component of the Linux Auditing System which is "
+"responsible for writing all relevant audit events to the log file <i>/var/"
+"log/audit/audit.log</i> (default).\n"
+"Events may come from the <i>apparmor</i> kernel module, from applications "
+"which use <i>libaudit</i> (e.g. PAM) or incidents caused by rules (e.g. file "
+"watches).</p>"
msgstr ""
#. logfile_settings dialog help 2/8
#: src/include/audit-laf/helps.rb:60
msgid ""
-"<p>The <b>Rules for auditctl</b> dialog offers more information about rules an"
-"d the possibility to add rules.\n"
-"Detailed information about the log file settings can be obtained from the manu"
-"al page ('man auditd.conf').</p>"
+"<p>The <b>Rules for auditctl</b> dialog offers more information about rules "
+"and the possibility to add rules.\n"
+"Detailed information about the log file settings can be obtained from the "
+"manual page ('man auditd.conf').</p>"
msgstr ""
#. logfile_settings dialog help 3/8
@@ -523,40 +520,42 @@
#. logfile_settings dialog help 4/8
#: src/include/audit-laf/helps.rb:68
msgid ""
-"<p><b>Format</b>: set <i>RAW</i> to log all data (store in a format exactly as"
-" the kernel\n"
-"sends it) or <i>NOLOG</i> to discard all audit information instead of writing "
-"it on disk (does not affect\n"
+"<p><b>Format</b>: set <i>RAW</i> to log all data (store in a format exactly "
+"as the kernel\n"
+"sends it) or <i>NOLOG</i> to discard all audit information instead of "
+"writing it on disk (does not affect\n"
"data sent to the dispatcher).</p> "
msgstr ""
#. logfile_settings dialog help 5/8
#: src/include/audit-laf/helps.rb:74
msgid ""
-"<p><b>Flush</b>: describes how to write the data to disk. If set to <i>INCREME"
-"NTAL</i> the\n"
-"<b>Frequency</b> parameter tells how many records to write before issuing an e"
-"xplicit flush to disk.\n"
-"<i>NONE</i> means: no special effort is made to flush data, <i>DATA</i>: keep "
-"data portion synced,\n"
+"<p><b>Flush</b>: describes how to write the data to disk. If set to "
+"<i>INCREMENTAL</i> the\n"
+"<b>Frequency</b> parameter tells how many records to write before issuing an "
+"explicit flush to disk.\n"
+"<i>NONE</i> means: no special effort is made to flush data, <i>DATA</i>: "
+"keep data portion synced,\n"
"<i>SYNC</i>: keep data and meta-data fully synced.</p>"
msgstr ""
#. logfile_settings dialog help 6/8
#: src/include/audit-laf/helps.rb:81
msgid ""
-"<p>Configure the maximum log file size (in megabytes) and the action to take w"
-"hen this\n"
+"<p>Configure the maximum log file size (in megabytes) and the action to take "
+"when this\n"
"value is reached via <b>Size and Action</b>.</p>\n"
msgstr ""
#. logfile_settings dialog help 7/8
#: src/include/audit-laf/helps.rb:85
msgid ""
-"<p>If the action is set to <i>ROTATE</i> the <b>Number of Log Files</b> specif"
-"ies the number\n"
-"of files to keep. Set to <i>SYSLOG</i>, the audit daemon will write a warning\n"
-"to /var/log/messages. With <i>SUSPEND</i> the daemon stops writing records to\n"
+"<p>If the action is set to <i>ROTATE</i> the <b>Number of Log Files</b> "
+"specifies the number\n"
+"of files to keep. Set to <i>SYSLOG</i>, the audit daemon will write a "
+"warning\n"
+"to /var/log/messages. With <i>SUSPEND</i> the daemon stops writing records "
+"to\n"
"disk. <i>IGNORE</i> means do nothing, <i>KEEP_LOGS</i> is similar\n"
"to ROTATE, but log files are not overwritten.</p>\n"
msgstr ""
@@ -564,13 +563,13 @@
#. logfile_settings dialog help 8/8
#: src/include/audit-laf/helps.rb:93
msgid ""
-"<p><b>Computer Name Format</b> describes how to write the computer name to the"
-"\n"
+"<p><b>Computer Name Format</b> describes how to write the computer name to "
+"the\n"
"log file. If <i>USER</i> is set, the <b>User Defined Name</b> is\n"
-"used. <i>NONE</i> means no computer name is inserted. <i>HOSTNAME</i> uses the"
-"\n"
-"name returned by the 'gethostname' syscall. <i>FQD</i> uses the fully qualifi"
-"ed\n"
+"used. <i>NONE</i> means no computer name is inserted. <i>HOSTNAME</i> uses "
+"the\n"
+"name returned by the 'gethostname' syscall. <i>FQD</i> uses the fully "
+"qualified\n"
"domain name.</p>\n"
msgstr ""
@@ -578,28 +577,28 @@
#: src/include/audit-laf/helps.rb:101
msgid ""
"<p><b><big>Auditd Dispatcher Configuration</big></b><br>\n"
-"Detailed information about the dispatcher settings can be obtained from the ma"
-"nual page\n"
+"Detailed information about the dispatcher settings can be obtained from the "
+"manual page\n"
"('man auditd.conf').</p>"
msgstr ""
#. dispatcher dialog help 2/5
#: src/include/audit-laf/helps.rb:107
msgid ""
-"<p><b>Dispatcher</b>: The dispatcher program is started by the audit daemon an"
-"d\n"
+"<p><b>Dispatcher</b>: The dispatcher program is started by the audit daemon "
+"and\n"
"gets all audit events on stdin.</p>"
msgstr ""
#. dispatcher dialog help 3/5
#: src/include/audit-laf/helps.rb:111
msgid ""
-"<p><b>Communication</b>: Controls the communication between the daemon and the"
-" dispatcher\n"
-"program. A <i>lossy</i> communication means that events going to the dispatche"
-"r are discarded\n"
-"when the queue (a 128kB buffer) is full. Choose <i>lossless</i> if you want a "
-"blocking/lossless\n"
+"<p><b>Communication</b>: Controls the communication between the daemon and "
+"the dispatcher\n"
+"program. A <i>lossy</i> communication means that events going to the "
+"dispatcher are discarded\n"
+"when the queue (a 128kB buffer) is full. Choose <i>lossless</i> if you want "
+"a blocking/lossless\n"
"communication.</p>"
msgstr ""
@@ -607,8 +606,8 @@
#: src/include/audit-laf/helps.rb:118
msgid ""
"<p>The dispatcher 'audispd' is an audit event multiplexor.\n"
-"For more information see the manual pages ('man audispd' and 'man audispd.conf"
-"').</p>"
+"For more information see the manual pages ('man audispd' and 'man audispd."
+"conf').</p>"
msgstr ""
#. dispatcher dialog help 5/5
@@ -629,26 +628,28 @@
#. disk space dialog help 2/6
#: src/include/audit-laf/helps.rb:132
msgid ""
-"<p><b>Space Left</b> (in megabytes) tells the audit daemon when to perform an "
-"<b>Action</b> because\n"
+"<p><b>Space Left</b> (in megabytes) tells the audit daemon when to perform "
+"an <b>Action</b> because\n"
"the system is starting to run low on space.</p>"
msgstr ""
#. disk space dialog help 3/6
#: src/include/audit-laf/helps.rb:136
msgid ""
-"<p>The value for <b>Admin Space Left</b> should be lower than above. The syste"
-"m <b>is running\n"
-"low</b> on disk space if the value is reached and the specified <b>Action</b> "
-"will be performed.</p>"
+"<p>The value for <b>Admin Space Left</b> should be lower than above. The "
+"system <b>is running\n"
+"low</b> on disk space if the value is reached and the specified <b>Action</"
+"b> will be performed.</p>"
msgstr ""
#. disk space dialog hep 4/6
#: src/include/audit-laf/helps.rb:140
msgid ""
"<p>If an action is set to <i>EMAIL</i>, a warning mail will be sent to the\n"
-"account specified in <b>Action Mail Account</b>.<br> <i>SYSLOG</i> means the\n"
-"disk space warning will be written to /var/log/messages. <i>IGNORE</i> means\n"
+"account specified in <b>Action Mail Account</b>.<br> <i>SYSLOG</i> means "
+"the\n"
+"disk space warning will be written to /var/log/messages. <i>IGNORE</i> "
+"means\n"
"do nothing. <i>EXEC</i> runs the script specified in <b>Path to\n"
"Script</b>. <i>SUSPEND</i> stops writing records to disk. <i>SINGLE</i>\n"
"switches the system to single user mode. <i>HALT</i> shuts down the\n"
@@ -658,10 +659,10 @@
#. disk space dialog help 5/6
#: src/include/audit-laf/helps.rb:150
msgid ""
-"<p>You can also specify a <b>Disk Full Action</b> (disk has become full alread"
-"y) and\n"
-"a <b>Disk Error Action</b> (performed whenever an error is detected while writ"
-"ing to disk).\n"
+"<p>You can also specify a <b>Disk Full Action</b> (disk has become full "
+"already) and\n"
+"a <b>Disk Error Action</b> (performed whenever an error is detected while "
+"writing to disk).\n"
"Available actions are the same as above (except for <i>EMAIL</i>).</p>"
msgstr ""
@@ -669,8 +670,8 @@
#: src/include/audit-laf/helps.rb:156
msgid ""
"<p><b>Note:</b> All scripts specified for <i>EXEC</i> must be owned\n"
-"by 'root', have '0750' file permissions, and the full path name has to be ente"
-"red.</p>\n"
+"by 'root', have '0750' file permissions, and the full path name has to be "
+"entered.</p>\n"
msgstr ""
#. rules dialog help 1/6
@@ -679,38 +680,39 @@
"<p><b><big>Rules for auditctl</big></b><br>\n"
"This dialog offers the possibility to enable or to disable the syscall\n"
"auditing as well as to lock the audit configuration.\n"
-"The selected flag from <b>Set Enabled Flag</b> will be added to the rules.</p>"
+"The selected flag from <b>Set Enabled Flag</b> will be added to the rules.</"
+"p>"
msgstr ""
#. rules dialog help 2/6
#: src/include/audit-laf/helps.rb:167
msgid ""
-"<p><b>Note:</b><br>Locking the rules means they cannot be changed until next r"
-"eboot.</p>"
+"<p><b>Note:</b><br>Locking the rules means they cannot be changed until next "
+"reboot.</p>"
msgstr ""
#. rules dialog help 3/6
#: src/include/audit-laf/helps.rb:171
msgid ""
"<p>Enabling auditing without additional rules will cause the\n"
-" applications which use <i>libaudit</i>, e.g. PAM to log to /var/log/audit/aud"
-"it.log (default).</p> "
+" applications which use <i>libaudit</i>, e.g. PAM to log to /var/log/audit/"
+"audit.log (default).</p> "
msgstr ""
#. rules dialog help 4/6
#: src/include/audit-laf/helps.rb:175
msgid ""
-"<p>You can also edit the rules manually, which we only recommended for advance"
-"d users.<br>\n"
+"<p>You can also edit the rules manually, which we only recommended for "
+"advanced users.<br>\n"
"For more information about all options, see 'man auditctl'.</p>\n"
msgstr ""
#. rules dialog help 5/6
#: src/include/audit-laf/helps.rb:179
msgid ""
-"<p><b>Check Syntax</b> sends the rules via <i>auditctl</i> to the audit subsys"
-"tem and checks the syntax.<br><b>Restore</b> restores the settings from /etc/a"
-"udit/audit.rules.</p>\n"
+"<p><b>Check Syntax</b> sends the rules via <i>auditctl</i> to the audit "
+"subsystem and checks the syntax.<br><b>Restore</b> restores the settings "
+"from /etc/audit/audit.rules.</p>\n"
msgstr ""
#. rules dialog help 6/6
@@ -751,8 +753,8 @@
#. skip it during initial and second stage or when create AY profile
#: src/modules/AuditLaf.rb:318
msgid ""
-"<p>To continue the configuration of Linux Auditing, the package <b>%1</b> must"
-" be installed.</p>"
+"<p>To continue the configuration of Linux Auditing, the package <b>%1</b> "
+"must be installed.</p>"
msgstr ""
#: src/modules/AuditLaf.rb:321
@@ -831,8 +833,7 @@
msgstr ""
#: src/modules/AuditLaf.rb:466
-msgid ""
-"The daemon 'auditd' doesn't run.\n"
+msgid "The daemon 'auditd' doesn't run.\n"
msgstr ""
#. message about loaded kernel module
Modified: branches/SLE12-SP5/yast/50-pot/auth-client.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/auth-client.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/auth-client.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-20 02:27+0000\n"
-"PO-Revision-Date: 2017-05-20 02:27+0000\n"
+"POT-Creation-Date: 2019-09-20 15:55+0200\n"
+"PO-Revision-Date: 2019-09-20 15:55+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -18,46 +18,46 @@
"Content-Transfer-Encoding: 8bit\n"
#. Enable and start the service.
-#: src/lib/auth/authconf.rb:142
+#: src/lib/auth/authconf.rb:155
msgid ""
"Failed to start service %s. Please use system journal (journalctl -n -u %s) "
"to diagnose."
msgstr ""
#. Disable and stop the service.
-#: src/lib/auth/authconf.rb:150
+#: src/lib/auth/authconf.rb:163
msgid ""
"Failed to stop service %s. Please use system journal (journalctl -n -u %s) "
"to diagnose."
msgstr ""
#. Only install the required provider packages. By convention, they are named 'sssd-*'.
-#: src/lib/auth/authconf.rb:395
+#: src/lib/auth/authconf.rb:408
msgid "Failed to install software packages required for running SSSD."
msgstr ""
#. provides /etc/openldap/ldap.conf
-#: src/lib/auth/authconf.rb:509
+#: src/lib/auth/authconf.rb:522
msgid "Failed to install software packages required for LDAP."
msgstr ""
#. Run ldapsearch with password bind
-#: src/lib/auth/authconf.rb:574
+#: src/lib/auth/authconf.rb:587
msgid "ERROR: "
msgstr ""
#. Calculate package requirements
-#: src/lib/auth/authconf.rb:758
+#: src/lib/auth/authconf.rb:771
msgid "Failed to install software packages required for Kerberos."
msgstr ""
#. Install required packages
-#: src/lib/auth/authconf.rb:832
+#: src/lib/auth/authconf.rb:845
msgid "Failed to install software packages required by autofs/nscd daemons."
msgstr ""
#. Call package installer to install Samba and Kerberos if it has not yet been installed.
-#: src/lib/auth/authconf.rb:883
+#: src/lib/auth/authconf.rb:896
msgid ""
"Failed to install Samba & Kerberos required by Active Directory operations."
msgstr ""
@@ -65,16 +65,16 @@
#. Run "net ads join". Return tuple of boolean success status and command output.
#. Kerberos configuration must have been read before calling this function.
#. Kerberos configuration will be written.
-#: src/lib/auth/authconf.rb:942
+#: src/lib/auth/authconf.rb:955
msgid "Nothing is done because AD is not configured"
msgstr ""
-#: src/lib/auth/authconf.rb:945
+#: src/lib/auth/authconf.rb:958
msgid "Failed to install Samba"
msgstr ""
#. Configure Kerberos
-#: src/lib/auth/authconf.rb:950
+#: src/lib/auth/authconf.rb:963
msgid ""
"Cannot locate Active Directory's Kerberos via DNS lookup.\n"
"Please configure your network environment to use AD server as the name "
@@ -82,34 +82,34 @@
msgstr ""
#. Local only
-#: src/lib/auth/authconf.rb:1063
+#: src/lib/auth/authconf.rb:1076
msgid "Only use local authentication"
msgstr ""
#. SSSD is configured
-#: src/lib/auth/authconf.rb:1068
+#: src/lib/auth/authconf.rb:1081
msgid "(daemon is inactive)"
msgstr ""
#. LDAP and/or Kerberos is configured
-#: src/lib/auth/authconf.rb:1074
+#: src/lib/auth/authconf.rb:1087
msgid "LDAP is enabled but the setup is incomplete"
msgstr ""
-#: src/lib/auth/authconf.rb:1076
+#: src/lib/auth/authconf.rb:1089
msgid "via LDAP on %s"
msgstr ""
#. 'and' as in "authenticate via LDAP and Kerberos"
-#: src/lib/auth/authconf.rb:1082
+#: src/lib/auth/authconf.rb:1095
msgid " and "
msgstr ""
-#: src/lib/auth/authconf.rb:1086
+#: src/lib/auth/authconf.rb:1099
msgid "via Kerberos"
msgstr ""
-#: src/lib/auth/authconf.rb:1088
+#: src/lib/auth/authconf.rb:1101
msgid "via Kerberos on %s"
msgstr ""
@@ -131,12 +131,12 @@
msgstr ""
#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:60
-msgid "Host Name of Master Key Distribution Server (Optional)"
+msgid "Host Name of Master Key Distribution Center (Optional)"
msgstr ""
#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:62
msgid ""
-"Key Distribution Centres (Optional If Auto-Discovery via DNS is Enabled)"
+"Key Distribution Centers (Optional If Auto-Discovery via DNS is Enabled)"
msgstr ""
#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:68
@@ -162,7 +162,8 @@
#. Add an auth_to_local
#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:102
-msgid "Please type in the auth_to_local rule:"
+msgid ""
+"Please type the new rule string (e.g. \"RULE:[2:$1](johndoe)s/^.*$/guest/\")"
msgstr ""
#. Add an auth_to_local_names
@@ -451,7 +452,7 @@
msgstr ""
#: src/lib/authui/ldapkrb/main_dialog.rb:416
-msgid "Use DNS SVC record to Discover KDC servers"
+msgid "Use DNS SRV record to Discover KDC servers"
msgstr ""
#: src/lib/authui/ldapkrb/main_dialog.rb:419
@@ -624,7 +625,7 @@
msgstr ""
#: src/lib/authui/sssd/main_dialog.rb:91
-msgid "Join Domain"
+msgid "Add Domain"
msgstr ""
#: src/lib/authui/sssd/main_dialog.rb:92
Modified: branches/SLE12-SP5/yast/50-pot/auth-server.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/auth-server.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/auth-server.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:26+0200\n"
-"PO-Revision-Date: 2016-08-30 18:26+0200\n"
+"POT-Creation-Date: 2019-09-20 15:55+0200\n"
+"PO-Revision-Date: 2019-09-20 15:55+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
Modified: branches/SLE12-SP5/yast/50-pot/autoinst.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/autoinst.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/autoinst.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-19 02:28+0000\n"
-"PO-Revision-Date: 2017-05-19 02:28+0000\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
+"PO-Revision-Date: 2019-09-20 15:56+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -30,7 +30,7 @@
msgstr ""
#: src/clients/autoinst_test_clone.rb:16 src/clients/autoyast.rb:123
-#: src/include/autoinstall/conftree.rb:622
+#: src/include/autoinstall/conftree.rb:627
#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:363
msgid "This may take a while"
msgstr ""
@@ -54,17 +54,17 @@
#. unique id
#. 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:476
+#: src/clients/autoyast.rb:114 src/clients/ayast_setup.rb:155
+#: src/clients/inst_autoinit.rb:184 src/clients/inst_autosetup.rb:478
#: src/clients/inst_autosetup_upgrade.rb:485
-#: src/modules/AutoInstallRules.rb:997
+#: src/modules/AutoInstallRules.rb:989
msgid ""
"Error while parsing the control file.\n"
"Check the log files for more details or fix the\n"
"control file and try again.\n"
msgstr ""
-#: src/clients/autoyast.rb:122 src/include/autoinstall/conftree.rb:621
+#: src/clients/autoyast.rb:122 src/include/autoinstall/conftree.rb:626
#: src/include/autoinstall/dialogs.rb:332
msgid "Reading configuration data"
msgstr ""
@@ -90,29 +90,29 @@
#. configure your system like in the profile.
#. Only stage2 configuration can be done.
#. yast2 ./ayast_setup.rb setup filename=/tmp/my.xml
-#: src/clients/ayast_setup.rb:48
+#: src/clients/ayast_setup.rb:50
msgid "Client for AutoYaST configuration on the running system"
msgstr ""
-#: src/clients/ayast_setup.rb:58
+#: src/clients/ayast_setup.rb:60
msgid "Configure the system using given AutoYaST profile"
msgstr ""
-#: src/clients/ayast_setup.rb:65
+#: src/clients/ayast_setup.rb:67
msgid "Path to AutoYaST profile"
msgstr ""
-#: src/clients/ayast_setup.rb:70
+#: src/clients/ayast_setup.rb:72
msgid "enable/disable all package handling"
msgstr ""
-#: src/clients/ayast_setup.rb:87 src/clients/clone_system.rb:101
+#: src/clients/ayast_setup.rb:89 src/clients/clone_system.rb:101
msgid "Empty parameter list"
msgstr ""
-#. the following is needed since 10.3
-#. otherwise the already configured network gets removed
-#: src/clients/ayast_setup.rb:135
+#. Restarting autoyast-initscripts.service in order to run
+#. init-scripts in the installed system.
+#: src/clients/ayast_setup.rb:142
msgid "Path to AutoYaST profile must be set."
msgstr ""
@@ -203,8 +203,8 @@
msgstr ""
#. OPEN
-#: src/clients/files_auto.rb:273 src/include/autoinstall/conftree.rb:605
-#: src/include/autoinstall/script_dialogs.rb:397
+#: src/clients/files_auto.rb:273 src/include/autoinstall/conftree.rb:610
+#: src/include/autoinstall/script_dialogs.rb:372
msgid "Select a file to load."
msgstr ""
@@ -284,28 +284,32 @@
msgstr ""
#. online update
-#: src/clients/inst_autoconfigure.rb:280
+#: src/clients/inst_autoconfigure.rb:283
msgid "Executing Post-Scripts"
msgstr ""
+#: src/clients/inst_autoconfigure.rb:286
+msgid "Writing Init-Scripts"
+msgstr ""
+
#. Do not restart NetworkManager* services
#. bnc#955260
-#: src/clients/inst_autoconfigure.rb:305
+#: src/clients/inst_autoconfigure.rb:310
msgid "Restarting all running services"
msgstr ""
#. Filtering out all services which must not to be restarted
-#: src/clients/inst_autoconfigure.rb:327
+#: src/clients/inst_autoconfigure.rb:332
msgid "Activating systemd default target"
msgstr ""
#. Just in case, remove this file to avoid reconfiguring...
-#: src/clients/inst_autoconfigure.rb:342
+#: src/clients/inst_autoconfigure.rb:347
msgid "Finishing Configuration"
msgstr ""
#. NetworkInterfaces::Write( ".*" );
-#: src/clients/inst_autoconfigure.rb:448
+#: src/clients/inst_autoconfigure.rb:453
msgid "Processing resource %1"
msgstr ""
@@ -573,8 +577,9 @@
msgid "Configuring language..."
msgstr ""
-#. Yes, do not set Storage testsuite here as we want really GUI with proposal
-#: src/clients/inst_autosetup.rb:298
+#. Do not call AutoinstStorage.Write because the settings
+#. have already been written by the proposal.
+#: src/clients/inst_autosetup.rb:297
msgid ""
"Error while configuring partitions.\n"
"Try again.\n"
@@ -582,7 +587,7 @@
#. Adding selections (defined in PackageAI) to libzypp and solving
#. package dependencies.
-#: src/clients/inst_autosetup.rb:374
+#: src/clients/inst_autosetup.rb:376
msgid ""
"Error while configuring software selections.\n"
"Try again.\n"
@@ -784,7 +789,7 @@
msgstr ""
#: src/include/autoinstall/DriveDialog.rb:190
-#: src/include/autoinstall/script_dialogs.rb:188
+#: src/include/autoinstall/script_dialogs.rb:175
msgid "&Type"
msgstr ""
@@ -1168,19 +1173,19 @@
#. SAVE
#: src/include/autoinstall/conftree.rb:35
-#: src/include/autoinstall/conftree.rb:697
+#: src/include/autoinstall/conftree.rb:702
msgid "Save as..."
msgstr ""
#: src/include/autoinstall/conftree.rb:42
-#: src/include/autoinstall/conftree.rb:709
+#: src/include/autoinstall/conftree.rb:714
msgid "File %1 was saved successfully."
msgstr ""
#. Profile::checkProfile();
#. Profile::checkProfile();
#: src/include/autoinstall/conftree.rb:55
-#: src/include/autoinstall/conftree.rb:716
+#: src/include/autoinstall/conftree.rb:721
msgid "An error occurred while saving the file."
msgstr ""
@@ -1328,28 +1333,28 @@
msgstr ""
#. opening/parsing the xml file failed
-#: src/include/autoinstall/conftree.rb:644
+#: src/include/autoinstall/conftree.rb:649
msgid "An error occurred while opening/parsing the XML file."
msgstr ""
#. NEW
-#: src/include/autoinstall/conftree.rb:734
+#: src/include/autoinstall/conftree.rb:739
msgid "Available Modules"
msgstr ""
#. FIXME: sucks sucks sucks sucks sucks
-#: src/include/autoinstall/conftree.rb:749
+#: src/include/autoinstall/conftree.rb:754
msgid ""
"Do you really want to apply the settings of the profile to your current "
"system?"
msgstr ""
#. EXIT
-#: src/include/autoinstall/conftree.rb:790
+#: src/include/autoinstall/conftree.rb:801
msgid "Control file changed."
msgstr ""
-#: src/include/autoinstall/conftree.rb:791
+#: src/include/autoinstall/conftree.rb:802
msgid "Save the changes to %1?"
msgstr ""
@@ -1389,8 +1394,7 @@
msgid "Settings"
msgstr ""
-#: src/include/autoinstall/dialogs.rb:94
-#: src/include/autoinstall/dialogs.rb:101
+#: src/include/autoinstall/dialogs.rb:94 src/include/autoinstall/dialogs.rb:101
msgid "Select Directory"
msgstr ""
@@ -1485,12 +1489,12 @@
msgstr ""
#: src/include/autoinstall/dialogs.rb:395
-#: src/include/autoinstall/script_dialogs.rb:264
+#: src/include/autoinstall/script_dialogs.rb:245
msgid "Error"
msgstr ""
#: src/include/autoinstall/dialogs.rb:396
-#: src/include/autoinstall/script_dialogs.rb:259
+#: src/include/autoinstall/script_dialogs.rb:240
msgid "Warning"
msgstr ""
@@ -1947,21 +1951,6 @@
#: src/include/autoinstall/script_dialogs.rb:133
msgid ""
"\n"
-"<H3>Network Access:</H3>\n"
-"<P>While executing postinstallation scripts, the network is disabled and\n"
-"requires initialization in the scripts to make the network accessible. An\n"
-"alternative for postinstallation scripts with network is using init scripts, "
-"which\n"
-"guarantee a fully configured system when running the scripts. If you did an "
-"installation\n"
-"over a network, you can use the <b>Network</b> option for the postscript, "
-"too.\n"
-"</P>\n"
-msgstr ""
-
-#: src/include/autoinstall/script_dialogs.rb:146
-msgid ""
-"\n"
"<H3>Feedback and Debug:</H3>\n"
"<P>All scripts except the init scripts can show STDOUT+STDERR in a pop-up "
"box as feedback.\n"
@@ -1970,79 +1959,74 @@
"you to debug your script.</P>\n"
msgstr ""
-#: src/include/autoinstall/script_dialogs.rb:155
+#: src/include/autoinstall/script_dialogs.rb:142
msgid "Script Editor"
msgstr ""
-#: src/include/autoinstall/script_dialogs.rb:161
+#: src/include/autoinstall/script_dialogs.rb:148
msgid "&File Name"
msgstr ""
-#: src/include/autoinstall/script_dialogs.rb:166
+#: src/include/autoinstall/script_dialogs.rb:153
msgid "&Interpreter"
msgstr ""
-#: src/include/autoinstall/script_dialogs.rb:170
+#: src/include/autoinstall/script_dialogs.rb:157
msgid "Perl"
msgstr ""
-#: src/include/autoinstall/script_dialogs.rb:175
+#: src/include/autoinstall/script_dialogs.rb:162
msgid "Shell"
msgstr ""
-#: src/include/autoinstall/script_dialogs.rb:180
+#: src/include/autoinstall/script_dialogs.rb:167
msgid "Python"
msgstr ""
#. a checkbox where you can choose if you want to see script-feedback output or not
-#: src/include/autoinstall/script_dialogs.rb:220
+#: src/include/autoinstall/script_dialogs.rb:207
msgid "&Feedback"
msgstr ""
#. a checkbox where you can choose if you want to see script-debug output or not
-#: src/include/autoinstall/script_dialogs.rb:226
+#: src/include/autoinstall/script_dialogs.rb:213
msgid "&Debug"
msgstr ""
-#: src/include/autoinstall/script_dialogs.rb:231
+#: src/include/autoinstall/script_dialogs.rb:218
msgid "&Chrooted"
msgstr ""
-#. a checkbox where you can choose if you need to have network when the script is running
-#: src/include/autoinstall/script_dialogs.rb:237
-msgid "&Network"
-msgstr ""
-
#. a checkbox where you can choose if you want to see script-feedback output or not
-#: src/include/autoinstall/script_dialogs.rb:245
+#: src/include/autoinstall/script_dialogs.rb:226
msgid "&Feedback Type"
msgstr ""
-#: src/include/autoinstall/script_dialogs.rb:249
+#: src/include/autoinstall/script_dialogs.rb:230
msgid "none"
msgstr ""
-#: src/include/autoinstall/script_dialogs.rb:254
+#: src/include/autoinstall/script_dialogs.rb:235
msgid "Message"
msgstr ""
-#: src/include/autoinstall/script_dialogs.rb:275
+#: src/include/autoinstall/script_dialogs.rb:256
msgid "Text of the notification popup"
msgstr ""
-#: src/include/autoinstall/script_dialogs.rb:283
+#: src/include/autoinstall/script_dialogs.rb:264
msgid "Script Location"
msgstr ""
-#: src/include/autoinstall/script_dialogs.rb:291
+#: src/include/autoinstall/script_dialogs.rb:272
msgid "S&cript Source"
msgstr ""
-#: src/include/autoinstall/script_dialogs.rb:298
+#: src/include/autoinstall/script_dialogs.rb:279
msgid "&Load new source"
msgstr ""
-#: src/include/autoinstall/script_dialogs.rb:372
+#: src/include/autoinstall/script_dialogs.rb:348
msgid ""
"Provide at least the script\n"
"name and the location or content of the script.\n"
@@ -2050,7 +2034,7 @@
#. Main dialog
#. @return [Symbol]
-#: src/include/autoinstall/script_dialogs.rb:474
+#: src/include/autoinstall/script_dialogs.rb:442
msgid ""
"<p>\n"
"By adding scripts to the autoinstallation process, customize the "
@@ -2058,12 +2042,12 @@
"your needs and take control in different stages of the installation.</p>\n"
msgstr ""
-#: src/include/autoinstall/script_dialogs.rb:480
+#: src/include/autoinstall/script_dialogs.rb:448
msgid "User Script Management"
msgstr ""
-#: src/include/autoinstall/script_dialogs.rb:500
-#: src/include/autoinstall/script_dialogs.rb:508
+#: src/include/autoinstall/script_dialogs.rb:468
+#: src/include/autoinstall/script_dialogs.rb:476
msgid "Select a script first."
msgstr ""
@@ -2082,14 +2066,14 @@
#. @param [String] result_profile the resulting control file path
#. @return [Boolean] true on success
#. autoyast has read the autoyast configuration file but something went wrong
-#: src/modules/AutoInstallRules.rb:905 src/modules/Profile.rb:746
+#: src/modules/AutoInstallRules.rb:897 src/modules/Profile.rb:746
msgid ""
"The XML parser reported an error while parsing the autoyast profile. The "
"error message is:\n"
msgstr ""
#. backdoor for merging problems.
-#: src/modules/AutoInstallRules.rb:1050
+#: src/modules/AutoInstallRules.rb:1042
msgid ""
"\n"
"User-defined classes could not be retrieved. Make sure all classes \n"
@@ -2100,17 +2084,17 @@
#. The line above needs to be fixed when we have more attributes
#. comment will look like this: "(description=BLA BLA)"
-#: src/modules/AutoinstConfig.rb:289
+#: src/modules/AutoinstConfig.rb:292
msgid "Choose Profile"
msgstr ""
#. Nothing returned by SLP query
-#: src/modules/AutoinstConfig.rb:312
+#: src/modules/AutoinstConfig.rb:315
msgid "No 'autoyast' provider has been found via SLP."
msgstr ""
#. There is no profile defined/found anywhere
-#: src/modules/AutoinstConfig.rb:357
+#: src/modules/AutoinstConfig.rb:360
msgid ""
"Invalid AutoYaST profile URL\n"
"%{url}"
@@ -2118,39 +2102,39 @@
#. SetProtocolMessage ()
#. @return [void]
-#: src/modules/AutoinstConfig.rb:384
+#: src/modules/AutoinstConfig.rb:387
msgid "Retrieving control file from floppy."
msgstr ""
-#: src/modules/AutoinstConfig.rb:387
+#: src/modules/AutoinstConfig.rb:390
msgid "Retrieving control file (%1) from TFTP server: %2."
msgstr ""
-#: src/modules/AutoinstConfig.rb:393
+#: src/modules/AutoinstConfig.rb:396
msgid "Retrieving control file (%1) from NFS server: %2."
msgstr ""
-#: src/modules/AutoinstConfig.rb:399
+#: src/modules/AutoinstConfig.rb:402
msgid "Retrieving control file (%1) from HTTP server: %2."
msgstr ""
-#: src/modules/AutoinstConfig.rb:405
+#: src/modules/AutoinstConfig.rb:408
msgid "Retrieving control file (%1) from FTP server: %2."
msgstr ""
-#: src/modules/AutoinstConfig.rb:411
+#: src/modules/AutoinstConfig.rb:414
msgid "Copying control file from file: %1."
msgstr ""
-#: src/modules/AutoinstConfig.rb:416
+#: src/modules/AutoinstConfig.rb:419
msgid "Copying control file from device: /dev/%1."
msgstr ""
-#: src/modules/AutoinstConfig.rb:420
+#: src/modules/AutoinstConfig.rb:423
msgid "Copying control file from default location."
msgstr ""
-#: src/modules/AutoinstConfig.rb:422
+#: src/modules/AutoinstConfig.rb:425
msgid "Source unknown."
msgstr ""
@@ -2160,14 +2144,14 @@
#. {
#. local_rules_file = (string)WFM::Args(1);
#. }
-#: src/modules/AutoinstConfig.rb:502
+#: src/modules/AutoinstConfig.rb:505
msgid ""
"<h3>AutoYaST Configuration Management System</h3>\n"
"<p>Almost all resources of the control file can be\n"
"configured using the configuration management system.</p>\n"
msgstr ""
-#: src/modules/AutoinstConfig.rb:507
+#: src/modules/AutoinstConfig.rb:510
msgid ""
"<p>Most of the modules used to create the configuration are identical to "
"those available\n"
@@ -2178,7 +2162,7 @@
"</p>\n"
msgstr ""
-#: src/modules/AutoinstConfig.rb:514
+#: src/modules/AutoinstConfig.rb:517
msgid ""
"<p>In addition to the existing and familiar modules,\n"
"new interfaces were created for special and complex configurations, "
@@ -2300,10 +2284,17 @@
msgstr ""
#. look for VGs to reuse
-#: src/modules/AutoinstLVM.rb:113
+#: src/modules/AutoinstLVM.rb:116
msgid "Cannot reuse volume group %1. The volume group does not exist."
msgstr ""
+#. With RAID systems freeSpace is 0. So a resize is not needed/possible here.
+#: src/modules/AutoinstLVM.rb:628 src/modules/AutoinstStorage.rb:511
+msgid ""
+"Requested partition size of %s on \"%s\" will be reduced to %s in order to "
+"fit on disk."
+msgstr ""
+
#. if no feeder (PV) was found for current volume group
#. the next instructions taints result
#: src/modules/AutoinstPartPlan.rb:290
@@ -2316,7 +2307,7 @@
#. @return [String] configuration summary dialog
#. return Summary of configuration
#. @return [String] configuration summary dialog
-#: src/modules/AutoinstPartPlan.rb:688 src/modules/AutoinstStorage.rb:913
+#: src/modules/AutoinstPartPlan.rb:688 src/modules/AutoinstStorage.rb:921
msgid "Drives"
msgstr ""
@@ -2333,137 +2324,130 @@
#. Return Summary
#. @return [String] summary
-#: src/modules/AutoinstScripts.rb:343
+#: src/modules/AutoinstScripts.rb:342
msgid "Preinstallation Scripts"
msgstr ""
-#: src/modules/AutoinstScripts.rb:356
+#: src/modules/AutoinstScripts.rb:355
msgid "Postinstallation Scripts"
msgstr ""
-#: src/modules/AutoinstScripts.rb:369
+#: src/modules/AutoinstScripts.rb:368
msgid "Chroot Scripts"
msgstr ""
-#: src/modules/AutoinstScripts.rb:382
+#: src/modules/AutoinstScripts.rb:381
msgid "Init Scripts"
msgstr ""
-#: src/modules/AutoinstScripts.rb:395
+#: src/modules/AutoinstScripts.rb:394
msgid "Postpartitioning Scripts"
msgstr ""
#. return type of script as formatted string
#. @param script type
#. @return [String] type as translated string
-#: src/modules/AutoinstScripts.rb:490
+#: src/modules/AutoinstScripts.rb:487
msgid "Pre"
msgstr ""
-#: src/modules/AutoinstScripts.rb:492
+#: src/modules/AutoinstScripts.rb:489
msgid "Post"
msgstr ""
-#: src/modules/AutoinstScripts.rb:494
+#: src/modules/AutoinstScripts.rb:491
msgid "Init"
msgstr ""
-#: src/modules/AutoinstScripts.rb:496
+#: src/modules/AutoinstScripts.rb:493
msgid "Chroot"
msgstr ""
-#: src/modules/AutoinstScripts.rb:498
+#: src/modules/AutoinstScripts.rb:495
msgid "Postpartitioning"
msgstr ""
-#: src/modules/AutoinstScripts.rb:500
+#: src/modules/AutoinstScripts.rb:497
msgid "Unknown"
msgstr ""
-#. warning text during the installation. %1 is a list of package names
-#: src/modules/AutoinstSoftware.rb:175
-msgid ""
-"These packages could not be found in the software repositories:\n"
-"%1"
-msgstr ""
-
#. 4 means "already exists"
#. Add add-ons
-#: src/modules/AutoinstSoftware.rb:330 src/modules/AutoinstSoftware.rb:350
+#: src/modules/AutoinstSoftware.rb:314 src/modules/AutoinstSoftware.rb:334
msgid "Adding repo %1 failed"
msgstr ""
#. Install
-#: src/modules/AutoinstSoftware.rb:378
+#: src/modules/AutoinstSoftware.rb:362
msgid ""
"Image creation failed while pattern installation. Please check /tmp/ay_image."
"log"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:386
+#: src/modules/AutoinstSoftware.rb:370
msgid "Creating Image - installing packages"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:396
+#: src/modules/AutoinstSoftware.rb:380
msgid ""
"Image creation failed while package installation. Please check /tmp/ay_image."
"log"
msgstr ""
#. Popup::Message( _("in the next file dialog you have to choose the target directory to save the image") );
-#: src/modules/AutoinstSoftware.rb:407
+#: src/modules/AutoinstSoftware.rb:391
msgid "Store image to ..."
msgstr ""
#. Compress image:
#. tar cfz /srv/www/htdocs/image.tar.gz --exclude="proc*" .
-#: src/modules/AutoinstSoftware.rb:436
+#: src/modules/AutoinstSoftware.rb:420
msgid ""
"You can do changes to the image now in %1/\n"
"If you press the ok-button, the image will be compressed and can't be "
"changed anymore."
msgstr ""
-#: src/modules/AutoinstSoftware.rb:450
+#: src/modules/AutoinstSoftware.rb:434
msgid "Image compressing failed in '%1'. Please check /tmp/ay_image.log"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:457
+#: src/modules/AutoinstSoftware.rb:441
msgid "Image created successfully"
msgstr ""
#. copy a directory (ends with / in directory.yast)
-#: src/modules/AutoinstSoftware.rb:493
+#: src/modules/AutoinstSoftware.rb:477
msgid ""
"can not get the directory.yast file at `%1`.\n"
"You can create that file with 'ls -F > directory.yast' if it's missing."
msgstr ""
#. don't copy subdirs. They have to be mentioned explicit. Copy only files from that dir.
-#: src/modules/AutoinstSoftware.rb:527
+#: src/modules/AutoinstSoftware.rb:511
msgid "can not read '%1'. Try again?"
msgstr ""
#. copy a file
-#: src/modules/AutoinstSoftware.rb:545
+#: src/modules/AutoinstSoftware.rb:529
msgid "can not read '%1'. ISO creation failed"
msgstr ""
#. we will have the image.tar.gz and autoinst.xml on the root of the DVD/CD
-#: src/modules/AutoinstSoftware.rb:575
+#: src/modules/AutoinstSoftware.rb:559
msgid "Preparing ISO Filestructure ..."
msgstr ""
#. prepare and save isolinux.cfg boot menu of the media
-#: src/modules/AutoinstSoftware.rb:624
+#: src/modules/AutoinstSoftware.rb:608
msgid "boot config for the DVD"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:628
+#: src/modules/AutoinstSoftware.rb:612
msgid "Ok"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:631
+#: src/modules/AutoinstSoftware.rb:615
msgid ""
"You can do changes to the ISO now in %1, like adding a complete different "
"AutoYaST XML file.\n"
@@ -2472,84 +2456,101 @@
#. create the actual ISO file
#. Popup::Message( _("Please choose a place where you want to save the ISO file in the next dialog") );
-#: src/modules/AutoinstSoftware.rb:650
+#: src/modules/AutoinstSoftware.rb:634
msgid "Store ISO image to ..."
msgstr ""
-#: src/modules/AutoinstSoftware.rb:651
+#: src/modules/AutoinstSoftware.rb:635
msgid "Creating ISO File ..."
msgstr ""
-#: src/modules/AutoinstSoftware.rb:672
+#: src/modules/AutoinstSoftware.rb:656
msgid "ISO successfully created at %1"
msgstr ""
#. Summary
#. @return Html formatted configuration summary
-#: src/modules/AutoinstSoftware.rb:757
+#: src/modules/AutoinstSoftware.rb:741
msgid "Selected Patterns"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:767
+#: src/modules/AutoinstSoftware.rb:751
msgid "Individually Selected Packages"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:773
+#: src/modules/AutoinstSoftware.rb:757
msgid "Packages to Remove"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:780
+#: src/modules/AutoinstSoftware.rb:764
msgid "Force Kernel Package"
msgstr ""
#. set SoftLock to avoid the installation of recommended patterns (#159466)
-#: src/modules/AutoinstSoftware.rb:875
+#: src/modules/AutoinstSoftware.rb:864
msgid "Could not set patterns: %1."
msgstr ""
#. Solve dependencies
-#: src/modules/AutoinstSoftware.rb:936
+#: src/modules/AutoinstSoftware.rb:900
msgid ""
"The package resolver run failed. Please check your software section in the "
"autoyast profile."
msgstr ""
+#. TRANSLATORS: Warning text during the installation. %s is a list of package
+#: src/modules/AutoinstSoftware.rb:1125
+msgid ""
+"These packages cannot be found in the software repositories:\n"
+"%s"
+msgstr ""
+
+#. TRANSLATORS: Error message, %d is replaced by the amount of failed packages.
+#: src/modules/AutoinstSoftware.rb:1128
+msgid "and %d additional packages"
+msgstr ""
+
+#. TRANSLATORS: Error message, %s is replaced by "/var/log/YaST2/y2log"
+#: src/modules/AutoinstSoftware.rb:1130
+msgid "Details can be found in the %s file."
+msgstr ""
+
#. 1 cyl buffer per partition
-#: src/modules/AutoinstStorage.rb:494
+#: src/modules/AutoinstStorage.rb:497
msgid ""
"The partition plan configured in your XML profile does not fit on the hard "
"disk. %1MB missing"
msgstr ""
-#: src/modules/AutoinstStorage.rb:917
+#: src/modules/AutoinstStorage.rb:925
msgid "Total of %1 drive"
msgstr ""
-#: src/modules/AutoinstStorage.rb:923
+#: src/modules/AutoinstStorage.rb:931
msgid "No specific device configured"
msgstr ""
#. Handle /etc/fstab usage
#. @return [Boolean]
-#: src/modules/AutoinstStorage.rb:1018
+#: src/modules/AutoinstStorage.rb:1026
msgid "Evaluating root partition. One moment please..."
msgstr ""
#. a popup
-#: src/modules/AutoinstStorage.rb:1026
+#: src/modules/AutoinstStorage.rb:1034
msgid "No Linux root partition found."
msgstr ""
#. We must only change RootPart::selectedRootPartition if booting
#. is inevitable.
-#: src/modules/AutoinstStorage.rb:1039
+#: src/modules/AutoinstStorage.rb:1047
msgid ""
"Multiple root partitions found, but you did not configure\n"
"which root partition should be used. Automatic installation not possible.\n"
msgstr ""
#. return list of available devices
-#: src/modules/AutoinstStorage.rb:1122
+#: src/modules/AutoinstStorage.rb:1130
msgid "device '%1' not found by storage backend"
msgstr ""
@@ -2577,20 +2578,20 @@
#. Read XML into YCP data
#. @param path to file
#. @return [Boolean]
-#: src/modules/Profile.rb:703 src/modules/ProfileLocation.rb:190
+#: src/modules/Profile.rb:703 src/modules/ProfileLocation.rb:194
msgid "Encrypted AutoYaST profile. Enter the correct password."
msgstr ""
#. need to call this to force Storage stuff to initialize just now
-#: src/modules/ProfileLocation.rb:156
+#: src/modules/ProfileLocation.rb:160
msgid "label not found while looking for autoyast profile"
msgstr ""
#. autoyast hit an error while fetching it's config file
-#: src/modules/ProfileLocation.rb:179
+#: src/modules/ProfileLocation.rb:183
msgid "An error occurred while fetching the profile:\n"
msgstr ""
-#: src/modules/ProfileLocation.rb:193
+#: src/modules/ProfileLocation.rb:197
msgid "&OK"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/bootloader.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/bootloader.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/bootloader.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-19 02:27+0000\n"
-"PO-Revision-Date: 2017-04-19 02:27+0000\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
+"PO-Revision-Date: 2019-09-20 15:56+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -22,41 +22,59 @@
msgid "Boot loader configuration module"
msgstr ""
-#. Dialog for whole bootloader configuration
+#. param initial_tab [:boot_code|:kernel|:bootloader] initial tab when dialog open
#. focus proposing new one
-#: src/lib/bootloader/config_dialog.rb:23 src/modules/Bootloader.rb:169
+#: src/lib/bootloader/config_dialog.rb:28 src/modules/Bootloader.rb:172
msgid "Broken Configuration"
msgstr ""
#. TRANSLATORS: %s stands for readon why yast cannot process it
#. TRANSLATORS: %s stands for readon why yast cannot process it
-#: src/lib/bootloader/config_dialog.rb:25 src/modules/Bootloader.rb:171
+#: src/lib/bootloader/config_dialog.rb:30 src/modules/Bootloader.rb:174
msgid ""
"YaST cannot process current bootloader configuration (%s). Propose new "
"configuration from scratch?"
msgstr ""
-#: src/lib/bootloader/config_dialog.rb:27 src/modules/Bootloader.rb:173
+#: src/lib/bootloader/config_dialog.rb:32 src/modules/Bootloader.rb:176
msgid "Propose"
msgstr ""
-#: src/lib/bootloader/config_dialog.rb:28 src/modules/Bootloader.rb:162
-#: src/modules/Bootloader.rb:174
+#: src/lib/bootloader/config_dialog.rb:33 src/modules/Bootloader.rb:165
+#: src/modules/Bootloader.rb:177
msgid "Quit"
msgstr ""
#. F#300779 - Install diskless client (NFS-root)
#. additional warning that root partition is nfs type -> bootloader will not be installed
#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
-#: src/lib/bootloader/config_dialog.rb:51 src/modules/Bootloader.rb:222
+#: src/lib/bootloader/config_dialog.rb:56 src/modules/Bootloader.rb:225
msgid "The boot partition is of type NFS. Bootloader cannot be installed."
msgstr ""
#. F#300779: end
-#: src/lib/bootloader/config_dialog.rb:69
+#: src/lib/bootloader/config_dialog.rb:67
msgid "Boot Loader Settings"
msgstr ""
+#. Specialized class to handle CPU mitigation settings.
+#. @see https://www.suse.com/support/kb/doc/?id=7023836
+#: src/lib/bootloader/cpu_mitigations.rb:21
+msgid "Auto + No SMT"
+msgstr ""
+
+#: src/lib/bootloader/cpu_mitigations.rb:22
+msgid "Auto"
+msgstr ""
+
+#: src/lib/bootloader/cpu_mitigations.rb:23
+msgid "Off"
+msgstr ""
+
+#: src/lib/bootloader/cpu_mitigations.rb:24
+msgid "Manually"
+msgstr ""
+
#. Represents dialog for modification of device map
#: src/lib/bootloader/device_map_dialog.rb:56
msgid "Device map must contain at least one device"
@@ -89,13 +107,13 @@
msgstr ""
#. Finish client for bootloader configuration
-#: src/lib/bootloader/finish_client.rb:25
+#: src/lib/bootloader/finish_client.rb:27
msgid "Saving bootloader configuration..."
msgstr ""
#. TRANSLATORS: reboot message
#. %1 is replaced with additional message from reIPL
-#: src/lib/bootloader/finish_client.rb:102
+#: src/lib/bootloader/finish_client.rb:110
msgid ""
"\n"
"Your system will now shut down.%1\n"
@@ -107,7 +125,7 @@
#. and we're ready to start (boot into) the installed system
#. Message that will be displayed along with information
#. how the boot loader was installed
-#: src/lib/bootloader/finish_client.rb:115
+#: src/lib/bootloader/finish_client.rb:123
msgid "The system will reboot now..."
msgstr ""
@@ -154,97 +172,97 @@
#. @return a list of summary lines
#. Display bootloader summary
#. @return a list of summary lines
-#: src/lib/bootloader/grub2.rb:99 src/lib/bootloader/grub2efi.rb:76
+#: src/lib/bootloader/grub2.rb:101 src/lib/bootloader/grub2efi.rb:76
msgid "Boot Loader Type: %1"
msgstr ""
-#: src/lib/bootloader/grub2.rb:103 src/lib/bootloader/grub2efi.rb:84
+#: src/lib/bootloader/grub2.rb:105 src/lib/bootloader/grub2efi.rb:84
msgid "Enable Trusted Boot: %1"
msgstr ""
-#: src/lib/bootloader/grub2.rb:104 src/lib/bootloader/grub2efi.rb:81
+#: src/lib/bootloader/grub2.rb:106 src/lib/bootloader/grub2efi.rb:81
#: src/lib/bootloader/grub2efi.rb:85
msgid "yes"
msgstr ""
-#: src/lib/bootloader/grub2.rb:104 src/lib/bootloader/grub2efi.rb:81
+#: src/lib/bootloader/grub2.rb:106 src/lib/bootloader/grub2efi.rb:81
#: src/lib/bootloader/grub2efi.rb:85
msgid "no"
msgstr ""
-#: src/lib/bootloader/grub2.rb:110
+#: src/lib/bootloader/grub2.rb:112
msgid "Status Location: %1"
msgstr ""
#. part of summary, %1 is a list of hard disks device names
-#: src/lib/bootloader/grub2.rb:174
+#: src/lib/bootloader/grub2.rb:176
msgid "Order of Hard Disks: %1"
msgstr ""
#. TRANSLATORS: extended is here for extended partition. Keep translation short.
-#: src/lib/bootloader/grub2.rb:186
+#: src/lib/bootloader/grub2.rb:188
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:191
+#: src/lib/bootloader/grub2.rb:193
msgid " (MBR)"
msgstr ""
-#: src/lib/bootloader/grub2.rb:212
+#: src/lib/bootloader/grub2.rb:214
msgid ""
"Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not install</a>)"
msgstr ""
-#: src/lib/bootloader/grub2.rb:216
+#: src/lib/bootloader/grub2.rb:218
msgid ""
"Do not install bootcode into MBR (<a href=\"enable_boot_mbr\">install</a>)"
msgstr ""
#. check for separated boot partition, use root otherwise
-#: src/lib/bootloader/grub2.rb:226
+#: src/lib/bootloader/grub2.rb:228
msgid ""
"Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do not "
"install</a>)"
msgstr ""
-#: src/lib/bootloader/grub2.rb:231
+#: src/lib/bootloader/grub2.rb:233
msgid ""
"Do not install bootcode into /boot partition (<a href=\"enable_boot_boot"
"\">install</a>)"
msgstr ""
-#: src/lib/bootloader/grub2.rb:237
+#: src/lib/bootloader/grub2.rb:239
msgid ""
"Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do not "
"install</a>)"
msgstr ""
-#: src/lib/bootloader/grub2.rb:242
+#: src/lib/bootloader/grub2.rb:244
msgid ""
"Do not install bootcode into \"/\" partition (<a href=\"enable_boot_root"
"\">install</a>)"
msgstr ""
#. no location chosen, so warn user that it is problem unless he is sure
-#: src/lib/bootloader/grub2.rb:267
+#: src/lib/bootloader/grub2.rb:269
msgid ""
"Warning: No location for bootloader stage1 selected.Unless you know what you "
"are doing please select above location."
msgstr ""
#. TRANSLATORS: title for list of location proposals
-#: src/lib/bootloader/grub2.rb:275
+#: src/lib/bootloader/grub2.rb:277
msgid "Change Location: %s"
msgstr ""
#. Represents bootloader timeout value
-#: src/lib/bootloader/grub2_widgets.rb:56
+#: src/lib/bootloader/grub2_widgets.rb:57
msgid "&Timeout in Seconds"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:60
+#: src/lib/bootloader/grub2_widgets.rb:61
msgid ""
"<p><b>Timeout in Seconds</b><br>\n"
"Specifies the time the bootloader will wait until the default kernel is "
@@ -252,11 +270,11 @@
msgstr ""
#. Represents decision if bootloader need activated partition
-#: src/lib/bootloader/grub2_widgets.rb:92
+#: src/lib/bootloader/grub2_widgets.rb:93
msgid "Set &active Flag in Partition Table for Boot Partition"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:96
+#: src/lib/bootloader/grub2_widgets.rb:97
msgid ""
"<p><b>Set active Flag in Partition Table for Boot Partition</b><br>\n"
"To activate the partition which contains the boot loader. The generic MBR "
@@ -266,12 +284,50 @@
"if the boot loader is installed in the MBR.</p>"
msgstr ""
+#. Represents decision if cpu mitigations is enabled
+#: src/lib/bootloader/grub2_widgets.rb:124
+msgid "CPU Mitigations"
+msgstr ""
+
+#: src/lib/bootloader/grub2_widgets.rb:134
+msgid ""
+"<p><b>CPU Mitigations</b><br>\n"
+"The option selects which default settings should be used for CPU \n"
+"side channels mitigations. A highlevel description is on our Technical "
+"Information \n"
+"Document TID 7023836. Following options are available:<ul>\n"
+"<li><b>Auto</b>: This option enables all the mitigations needed for your CPU "
+"model. \n"
+"This setting can impact performance to some degree, depending on CPU model "
+"and \n"
+"workload. It provides all security mitigations, but it does not protect "
+"against \n"
+"cross-CPU thread attacks.</li>\n"
+"<li><b>Auto + No SMT</b>: This option enables all the above mitigations in \n"
+"\"Auto\", and also disables Simultaneous Multithreading to avoid \n"
+"side channel attacks across multiple CPU threads. This setting can \n"
+"further impact performance, depending on your \n"
+"workload. This setting provides the full set of available security "
+"mitigations.</li>\n"
+"<li><b>Off</b>: All CPU Mitigations are disabled. This setting has no "
+"performance \n"
+"impact, but side channel attacks against your CPU are possible, depending on "
+"CPU \n"
+"model.</li>\n"
+"<li><b>Manual</b>: This setting does not specify a mitigation level and "
+"leaves \n"
+"this to be the kernel default. The administrator can add other mitigations "
+"options \n"
+"in the <i>kernel command line</i> widget.\n"
+"All CPU mitigation specific options can be set manually.</li></ul></p>"
+msgstr ""
+
#. Represents decision if generic MBR have to be installed on disk
-#: src/lib/bootloader/grub2_widgets.rb:123
+#: src/lib/bootloader/grub2_widgets.rb:176
msgid "Write &generic Boot Code to MBR"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:127
+#: src/lib/bootloader/grub2_widgets.rb:180
msgid ""
"<p><b>Write generic Boot Code to MBR</b> replace the master boot record of "
"your disk with generic code (OS independent code which\n"
@@ -279,42 +335,42 @@
msgstr ""
#. Represents decision if menu should be hidden or visible
-#: src/lib/bootloader/grub2_widgets.rb:152
+#: src/lib/bootloader/grub2_widgets.rb:205
msgid "&Hide Menu on Boot"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:156
+#: src/lib/bootloader/grub2_widgets.rb:209
msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>"
msgstr ""
#. Represents if os prober should be run
-#: src/lib/bootloader/grub2_widgets.rb:175
+#: src/lib/bootloader/grub2_widgets.rb:228
msgid "Pro&be Foreign OS"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:179
+#: src/lib/bootloader/grub2_widgets.rb:232
msgid ""
"<p><b>Probe Foreign OS</b> by means of os-prober for multiboot with other "
"foreign distribution </p>"
msgstr ""
#. represents kernel command line
-#: src/lib/bootloader/grub2_widgets.rb:203
+#: src/lib/bootloader/grub2_widgets.rb:256
msgid "O&ptional Kernel Command Line Parameter"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:207
+#: src/lib/bootloader/grub2_widgets.rb:260
msgid ""
"<p><b>Optional Kernel Command Line Parameter</b> lets you define additional "
"parameters to pass to the kernel.</p>"
msgstr ""
#. Represents Protective MBR action
-#: src/lib/bootloader/grub2_widgets.rb:231
+#: src/lib/bootloader/grub2_widgets.rb:284
msgid "&Protective MBR flag"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:235
+#: src/lib/bootloader/grub2_widgets.rb:288
msgid ""
"<p><b>Protective MBR flag</b> is expert only settings, that is needed only "
"on exotic hardware. For details see Protective MBR in GPT disks. Do not "
@@ -322,12 +378,12 @@
msgstr ""
#. TRANSLATORS: set flag on disk
-#: src/lib/bootloader/grub2_widgets.rb:249
+#: src/lib/bootloader/grub2_widgets.rb:302
msgid "set"
msgstr ""
#. TRANSLATORS: remove flag from disk
-#: src/lib/bootloader/grub2_widgets.rb:251
+#: src/lib/bootloader/grub2_widgets.rb:304
msgid "remove"
msgstr ""
@@ -335,27 +391,27 @@
#. force re-calculation of bootloader proposal
#. this deletes any internally cached values, a new proposal will
#. not be partially based on old data now any more
-#: src/lib/bootloader/grub2_widgets.rb:253
-#: src/lib/bootloader/proposal_client.rb:50
+#: src/lib/bootloader/grub2_widgets.rb:306
+#: src/lib/bootloader/proposal_client.rb:55
msgid "do not change"
msgstr ""
#. Represents switcher for secure boot on EFI
-#: src/lib/bootloader/grub2_widgets.rb:271
+#: src/lib/bootloader/grub2_widgets.rb:324
msgid "Enable &Secure Boot Support"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:275
+#: src/lib/bootloader/grub2_widgets.rb:328
msgid "Tick to enable UEFI Secure Boot\n"
msgstr ""
#. Represents switcher for Trusted Boot
-#: src/lib/bootloader/grub2_widgets.rb:296
+#: src/lib/bootloader/grub2_widgets.rb:349
msgid "Enable &Trusted Boot Support"
msgstr ""
#. TRANSLATORS: TrustedGRUB2 is a name, don't translate it
-#: src/lib/bootloader/grub2_widgets.rb:301
+#: src/lib/bootloader/grub2_widgets.rb:354
msgid ""
"<p><b>Trusted Boot</b> will install TrustedGRUB2\n"
"instead of regular GRUB2.</p>\n"
@@ -364,7 +420,7 @@
"chip).</p>\n"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:307
+#: src/lib/bootloader/grub2_widgets.rb:360
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"
@@ -373,7 +429,7 @@
#. 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:331
+#: src/lib/bootloader/grub2_widgets.rb:384
msgid ""
"Trusted Platform Module not found.\n"
"Make sure it is enabled in BIOS.\n"
@@ -381,37 +437,37 @@
msgstr ""
#. Represents grub password protection widget
-#: src/lib/bootloader/grub2_widgets.rb:351
+#: src/lib/bootloader/grub2_widgets.rb:404
msgid "Prot&ect Boot Loader with Password"
msgstr ""
#. TRANSLATORS: checkbox entry
-#: src/lib/bootloader/grub2_widgets.rb:357
+#: src/lib/bootloader/grub2_widgets.rb:410
msgid "P&rotect Entry Modification Only"
msgstr ""
#. TRANSLATORS: text entry, please keep it short
-#: src/lib/bootloader/grub2_widgets.rb:363
+#: src/lib/bootloader/grub2_widgets.rb:416
msgid "&Password for GRUB2 User 'root'"
msgstr ""
#. text entry
-#: src/lib/bootloader/grub2_widgets.rb:366
+#: src/lib/bootloader/grub2_widgets.rb:419
msgid "Re&type Password"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:377
+#: src/lib/bootloader/grub2_widgets.rb:430
msgid "The password must not be empty."
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:384
+#: src/lib/bootloader/grub2_widgets.rb:437
msgid ""
"'Password' and 'Retype password'\n"
"do not match. Retype the password."
msgstr ""
#. special value as we do not know password, so it mean user do not change it
-#: src/lib/bootloader/grub2_widgets.rb:437
+#: src/lib/bootloader/grub2_widgets.rb:490
msgid ""
"<p><b>Protect Boot Loader with Password</b><br>\n"
"At boot time, modifying or even booting any entry will require the password. "
@@ -426,7 +482,7 @@
msgstr ""
#. Translators: do not translate the quoted parts like "unit"
-#: src/lib/bootloader/grub2_widgets.rb:470
+#: src/lib/bootloader/grub2_widgets.rb:523
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 "
@@ -440,19 +496,19 @@
msgstr ""
#. there's mode specified, use it
-#: src/lib/bootloader/grub2_widgets.rb:507
+#: src/lib/bootloader/grub2_widgets.rb:560
msgid "To enable serial console you must provide the corresponding arguments."
msgstr ""
#. Translators: do not translate "unit"
-#: src/lib/bootloader/grub2_widgets.rb:514
+#: src/lib/bootloader/grub2_widgets.rb:567
msgid ""
"To enable the serial console you must provide the corresponding arguments.\n"
"The \"unit\" argument is required, the complete syntax is:\n"
"%s"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:555
+#: src/lib/bootloader/grub2_widgets.rb:608
msgid "Choose new graphical theme file"
msgstr ""
@@ -460,40 +516,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:571
+#: src/lib/bootloader/grub2_widgets.rb:624
msgid "NUM"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:578
+#: src/lib/bootloader/grub2_widgets.rb:631
msgid "Use &graphical console"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:583
+#: src/lib/bootloader/grub2_widgets.rb:636
msgid "&Console resolution"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:588
+#: src/lib/bootloader/grub2_widgets.rb:641
msgid "&Console theme"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:619
+#: src/lib/bootloader/grub2_widgets.rb:672
msgid "Autodetect by grub2"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:627
+#: src/lib/bootloader/grub2_widgets.rb:680
msgid "Use &serial console"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:634
+#: src/lib/bootloader/grub2_widgets.rb:687
msgid "&Console arguments"
msgstr ""
#. represent choosing default section to boot
-#: src/lib/bootloader/grub2_widgets.rb:651
+#: src/lib/bootloader/grub2_widgets.rb:704
msgid "&Default Boot Section"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:655
+#: src/lib/bootloader/grub2_widgets.rb:708
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"
@@ -504,40 +560,40 @@
msgstr ""
#. Represents stage1 location for bootloader
-#: src/lib/bootloader/grub2_widgets.rb:690
+#: src/lib/bootloader/grub2_widgets.rb:743
msgid "Boot Loader Location"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:744
+#: src/lib/bootloader/grub2_widgets.rb:797
msgid "Custom boot device have to be specied if checked"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:772
+#: src/lib/bootloader/grub2_widgets.rb:825
msgid "Boo&t from Boot Partition"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:773
+#: src/lib/bootloader/grub2_widgets.rb:826
msgid "Boo&t from Root Partition"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:774
+#: src/lib/bootloader/grub2_widgets.rb:827
msgid "Boot from &Master Boot Record"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:775
+#: src/lib/bootloader/grub2_widgets.rb:828
msgid "Boot from &Extended Partition"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:786
+#: src/lib/bootloader/grub2_widgets.rb:839
msgid "C&ustom Boot Partition"
msgstr ""
#. Represents button that open Device Map edit dialog
-#: src/lib/bootloader/grub2_widgets.rb:799
+#: src/lib/bootloader/grub2_widgets.rb:852
msgid "&Edit Disk Boot Order"
msgstr ""
-#: src/lib/bootloader/grub2_widgets.rb:805
+#: src/lib/bootloader/grub2_widgets.rb:858
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"
@@ -547,17 +603,17 @@
msgstr ""
#. represents Tab with kernel related configuration
-#: src/lib/bootloader/grub2_widgets.rb:826
+#: src/lib/bootloader/grub2_widgets.rb:879
msgid "&Kernel Parameters"
msgstr ""
#. Represent tab with options related to stage1 location and bootloader type
-#: src/lib/bootloader/grub2_widgets.rb:851
+#: src/lib/bootloader/grub2_widgets.rb:901
msgid "Boot Co&de Options"
msgstr ""
#. Represents bootloader specific options like its timeout, default section or password protection
-#: src/lib/bootloader/grub2_widgets.rb:921
+#: src/lib/bootloader/grub2_widgets.rb:971
msgid "Boot&loader Options"
msgstr ""
@@ -578,31 +634,39 @@
msgid "Do not install any boot loader"
msgstr ""
-#. in installation always propose missing stuff
-#. current below use proposed value if not already set
-#. If set, then use same bootloader, but propose it again
-#: src/lib/bootloader/proposal_client.rb:70
-msgid "Cannot detect device mounted as root. Please check partitioning."
-msgstr ""
-
#. proposal part - bootloader label
-#: src/lib/bootloader/proposal_client.rb:101
+#: src/lib/bootloader/proposal_client.rb:102
msgid "Booting"
msgstr ""
#. menubutton entry
-#: src/lib/bootloader/proposal_client.rb:103
+#: src/lib/bootloader/proposal_client.rb:104
msgid "&Booting"
msgstr ""
+#. Result of {#make_proposal} if a {Bootloader::NoRoot} exception is raised
+#. while calculating the proposal
+#.
+#. @return [Hash]
+#: src/lib/bootloader/proposal_client.rb:206
+msgid "Cannot detect device mounted as root. Please check partitioning."
+msgstr ""
+
+#. TRANSLATORS: %s is a string containing the technical details of the error
+#: src/lib/bootloader/proposal_client.rb:220
+msgid ""
+"Error reading the bootloader configuration files. Please open the booting "
+"options to fix it. Details: %s"
+msgstr ""
+
#. warning text in the summary richtext
-#: src/lib/bootloader/proposal_client.rb:188
+#: src/lib/bootloader/proposal_client.rb:251
msgid ""
"No boot loader is selected for installation. Your system might not be "
"bootable."
msgstr ""
-#: src/lib/bootloader/proposal_client.rb:196
+#: src/lib/bootloader/proposal_client.rb:259
msgid ""
"Because of the partitioning, the bootloader cannot be installed properly"
msgstr ""
@@ -635,113 +699,118 @@
#. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation.
#: src/modules/BootSupportCheck.rb:117
msgid ""
-"Boot from MBR does not work together with btrfs filesystem and GPT disk "
-"label without bios_grub partition.To fix this issue, create bios_grub "
-"partition or use any ext filesystem for boot partition or do not install "
-"stage 1 to MBR."
+"Boot from MBR does not work together with Btrfs filesystem and GPT disk "
+"label\n"
+"without bios_grub partition.\n"
+"\n"
+"To fix this issue,\n"
+"\n"
+" - create a bios_grub partition, or\n"
+" - use any Ext filesystem for boot partition, or\n"
+" - do not install stage 1 to MBR."
msgstr ""
#. FIXME: big part of this method should be in BootStorage
#. check if boot device is on raid0
-#: src/modules/BootSupportCheck.rb:144
+#: src/modules/BootSupportCheck.rb:148
msgid "The boot device is on raid type: %1. System will not boot."
msgstr ""
#. bnc#501043 added check for valid configuration
-#: src/modules/BootSupportCheck.rb:156
+#: src/modules/BootSupportCheck.rb:160
msgid ""
"The boot device is on software RAID1. Select other bootloader location, e.g. "
"Master Boot Record"
msgstr ""
#. if partitioning worked before upgrade, it will keep working (bnc#886604)
-#: src/modules/BootSupportCheck.rb:189
+#: src/modules/BootSupportCheck.rb:193
msgid "Missing ext partition for booting. Cannot install boot code."
msgstr ""
#. activate set or there is already activate flag
-#: src/modules/BootSupportCheck.rb:200
+#: src/modules/BootSupportCheck.rb:204
msgid ""
"Activate flag is not set by installer. If it is not set at all, some BIOSes "
"could refuse to boot."
msgstr ""
-#: src/modules/BootSupportCheck.rb:207
+#: src/modules/BootSupportCheck.rb:211
msgid ""
"The installer will not modify the MBR of the disk. Unless it already "
"contains boot code, the BIOS won't be able to boot from this disk."
msgstr ""
#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:120
+#: src/modules/Bootloader.rb:123
msgid "Check boot loader"
msgstr ""
#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:122
+#: src/modules/Bootloader.rb:125
msgid "Read partitioning"
msgstr ""
#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:124
+#: src/modules/Bootloader.rb:127
msgid "Load boot loader settings"
msgstr ""
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:128
+#: src/modules/Bootloader.rb:131
msgid "Checking boot loader..."
msgstr ""
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:130
+#: src/modules/Bootloader.rb:133
msgid "Reading partitioning..."
msgstr ""
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:132
+#: src/modules/Bootloader.rb:135
msgid "Loading boot loader settings..."
msgstr ""
#. dialog header
-#: src/modules/Bootloader.rb:136
+#: src/modules/Bootloader.rb:139
msgid "Initializing Boot Loader Configuration"
msgstr ""
-#: src/modules/Bootloader.rb:158
+#: src/modules/Bootloader.rb:161
msgid "Unsupported Bootloader"
msgstr ""
-#: src/modules/Bootloader.rb:159
+#: src/modules/Bootloader.rb:162
msgid ""
"Unsupported bootloader '%s' detected. Use proposal of supported "
"configuration instead?"
msgstr ""
-#: src/modules/Bootloader.rb:161
+#: src/modules/Bootloader.rb:164
msgid "Use"
msgstr ""
#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:246
+#: src/modules/Bootloader.rb:249
msgid "Create initrd"
msgstr ""
#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:248
+#: src/modules/Bootloader.rb:251
msgid "Save boot loader configuration"
msgstr ""
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:252
+#: src/modules/Bootloader.rb:255
msgid "Creating initrd..."
msgstr ""
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:254
+#: src/modules/Bootloader.rb:257
msgid "Saving boot loader configuration..."
msgstr ""
#. progress line
-#: src/modules/Bootloader.rb:260
+#: src/modules/Bootloader.rb:263
msgid "Saving Boot Loader Configuration"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/ca-management.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/ca-management.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/ca-management.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:26+0200\n"
-"PO-Revision-Date: 2016-08-30 18:26+0200\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
+"PO-Revision-Date: 2019-09-20 15:56+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -2426,7 +2426,7 @@
#. check if hostname is in Subject Alt Name
#: src/include/ca-management/util.rb:1361
msgid ""
-"The common name of the certificate (%1) is not the name of·\n"
+"The common name of the certificate (%1) is not the name of\\u00B7\n"
"the server (%2).\n"
"This certificate might be not practical as a common server certificate.\n"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/caasp.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/caasp.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/caasp.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-07 14:17+0200\n"
-"PO-Revision-Date: 2017-09-07 14:17+0200\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
+"PO-Revision-Date: 2019-09-20 15:56+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -17,34 +17,93 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Title for installation overview dialog
-#: src/lib/y2caasp/clients/inst_casp_overview.rb:76
-msgid "Installation Overview"
+#. TRANSLATORS: dialog title
+#: src/lib/y2caasp/clients/admin_role_dialog.rb:49
+msgid "Admin Node Configuration"
msgstr ""
-#. Button label: start the installation
-#: src/lib/y2caasp/clients/inst_casp_overview.rb:78
-msgid "Install"
+#. TRANSLATORS: dialog title
+#: src/lib/y2caasp/clients/kubeadm_role_dialog.rb:24
+msgid "kubeadm Node Configuration"
msgstr ""
-#. %s is a problem description
-#: src/lib/y2caasp/clients/inst_casp_overview.rb:102
+#. TRANSLATORS: dialog title
+#: src/lib/y2caasp/clients/kubic_minion_role_dialog.rb:45
+msgid "Kubic Node Configuration"
+msgstr ""
+
+#. TRANSLATORS: dialog title
+#: src/lib/y2caasp/clients/microos_role_dialog.rb:24
+msgid "NTP Configuration"
+msgstr ""
+
+#. This library provides a simple dialog for setting
+#. the worker node specific settings:
+#. - the admin node name
+#. - the NTP server names
+#: src/lib/y2caasp/clients/worker_role_dialog.rb:41
+msgid "Cluster Node Configuration"
+msgstr ""
+
+#. This widget is responsible of validate and store the introduced location
+#. which must be a valid IP or FQDN.
+#. bsc#1032057: old name: Controller Node, new name: Administration Node.
+#: src/lib/y2caasp/widgets/controller_node.rb:40
+msgid "Administration Node"
+msgstr ""
+
+#. TRANSLATORS: a help text for the controller node input field
+#: src/lib/y2caasp/widgets/controller_node.rb:45
+msgid "<h3>The Controller Node</h3>"
+msgstr ""
+
+#. TRANSLATORS: a help text for the controller node input field
+#: src/lib/y2caasp/widgets/controller_node.rb:47
msgid ""
-"Software proposal failed. Cannot proceed with installation.\n"
-"%s"
+"<p>Enter the host name or the IP address of the controller node to which "
+"this machine will be connected to.</p>"
msgstr ""
-#. @return [String] Widget's label
-#. Check if the user wants to intentionally skip the NTP server configuration
-#.
-#. @return [Boolean] true if user wants to skip it; false otherwise.
-#: src/lib/y2caasp/widgets/ntp_server.rb:51
-#: src/lib/y2caasp/widgets/ntp_server.rb:98
-msgid "NTP Servers"
+#. TRANSLATORS: error message for invalid administration node location
+#: src/lib/y2caasp/widgets/controller_node.rb:74
+msgid ""
+"Not valid location for the administration node, please enter a valid IP or "
+"Hostname"
msgstr ""
+#. This widget is responsible of validate and store the introduced location
+#. which must be a valid IP or FQDN.
+#. bsc#1032057: old name: Controller Node, new name: Administration Node.
+#: src/lib/y2caasp/widgets/kubic_admin_node.rb:40
+msgid "Kubic Admin Node"
+msgstr ""
+
+#. TRANSLATORS: a help text for the kubic admin node input field
+#: src/lib/y2caasp/widgets/kubic_admin_node.rb:45
+msgid "<h3>The Kubic Admin Node</h3>"
+msgstr ""
+
+#. TRANSLATORS: a help text for the kubic admin node input field
+#: src/lib/y2caasp/widgets/kubic_admin_node.rb:47
+msgid ""
+"<p>Enter the host name or the IP address of the kubic admin node to which "
+"this machine will be connected to.</p>"
+msgstr ""
+
+#. TRANSLATORS: error message for invalid administration node location
+#: src/lib/y2caasp/widgets/kubic_admin_node.rb:74
+msgid ""
+"Not valid location for the kubic admin node, please enter a valid IP or "
+"Hostname"
+msgstr ""
+
+#. TRANSLATORS: input field label
+#: src/lib/y2caasp/widgets/ntp_server.rb:53
+msgid "N&TP Servers (comma or space separated)"
+msgstr ""
+
#. Initializes the widget's value
-#: src/lib/y2caasp/widgets/ntp_server.rb:65
+#: src/lib/y2caasp/widgets/ntp_server.rb:80
msgid ""
"Not valid location for the NTP servers:\n"
"%{servers}\n"
@@ -52,38 +111,36 @@
"Please, enter a valid IP or Hostname"
msgstr ""
-#. TRANSLATORS: error message for invalid ntp server name/address
-#: src/lib/y2caasp/widgets/ntp_server.rb:100
-msgid ""
-"You have not configured an NTP server. This may lead to\n"
-"your cluster not functioning properly or at all.\n"
-"Proceed with caution and at your own risk.\n"
-"\n"
-"Would you like to continue with the installation?"
+#. TRANSLATORS: a help text for the NTP server input field
+#: src/lib/y2caasp/widgets/ntp_server.rb:101
+msgid "<h3>NTP Servers</h3>"
msgstr ""
-#. by default widget_id is the class name; must differentiate instances
-#: src/lib/y2caasp/widgets/overview.rb:72
+#. TRANSLATORS: a help text for the NTP server input field
+#: src/lib/y2caasp/widgets/ntp_server.rb:103
msgid ""
-"Problem found when proposing %{client}:<br>Severity: %{severity}<br>Message: %"
-"{message}"
+"<p>Enter the host name or the IP address of the NTP server which will be "
+"used for synchronizing the time on this machine</p>"
msgstr ""
-#. %s is a heading of a problematic section, like "Partitioning" or "Network"
-#: src/lib/y2caasp/widgets/overview.rb:110
-msgid "%s blocks the installation. Please solve the problem there before proceeding."
+#. TRANSLATORS: a help text for the NTP server input field
+#: src/lib/y2caasp/widgets/ntp_server.rb:106
+msgid "<p>Use comma (,) or space to separate multiple values.</p>"
msgstr ""
-#. This widget is responsible of validate and store the introduced location
-#. which must be a valid IP or FQDN.
-#. bsc#1032057: old name: Controller Node, new name: Administration Node.
-#: src/lib/y2caasp/widgets/system_role.rb:43
-msgid "Administration Node"
+#. Check if the user wants to intentionally skip the NTP server configuration
+#.
+#. @return [Boolean] true if user wants to skip it; false otherwise.
+#: src/lib/y2caasp/widgets/ntp_server.rb:123
+msgid "NTP Servers"
msgstr ""
-#. TRANSLATORS: error message for invalid administration node location
-#: src/lib/y2caasp/widgets/system_role.rb:67
+#. TRANSLATORS: error message for invalid ntp server name/address
+#: src/lib/y2caasp/widgets/ntp_server.rb:125
msgid ""
-"Not valid location for the administration node, please enter a valid IP or Hos"
-"tname"
+"You have not configured an NTP server. This may lead to\n"
+"your cluster not functioning properly or at all.\n"
+"Proceed with caution and at your own risk.\n"
+"\n"
+"Would you like to continue with the installation?"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/cio.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/cio.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/cio.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-19 02:28+0000\n"
-"PO-Revision-Date: 2017-05-19 02:28+0000\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
+"PO-Revision-Date: 2019-09-20 15:56+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -43,11 +43,11 @@
msgstr ""
#: src/lib/iochannel/channels_dialog.rb:142
-msgid "no"
+msgid "yes"
msgstr ""
#: src/lib/iochannel/channels_dialog.rb:142
-msgid "yes"
+msgid "no"
msgstr ""
#. filter can be empty if dialog is not yet created
Modified: branches/SLE12-SP5/yast/50-pot/cluster.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/cluster.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/cluster.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-06 02:28+0000\n"
-"PO-Revision-Date: 2017-04-06 02:28+0000\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
+"PO-Revision-Date: 2019-09-20 15:56+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -95,7 +95,7 @@
msgid "Redundant IP Address"
msgstr ""
-#: src/include/cluster/dialogs.rb:117 src/include/cluster/dialogs.rb:504
+#: src/include/cluster/dialogs.rb:117 src/include/cluster/dialogs.rb:505
msgid "Node ID"
msgstr ""
@@ -109,245 +109,245 @@
msgstr ""
#. BNC#871970, change member address struct
-#: src/include/cluster/dialogs.rb:193 src/include/cluster/dialogs.rb:247
-msgid "The Bind Network Address has to be fulfilled"
-msgstr ""
-
-#: src/include/cluster/dialogs.rb:199
+#: src/include/cluster/dialogs.rb:194
msgid "The cluster name has to be fulfilled"
msgstr ""
-#: src/include/cluster/dialogs.rb:216
+#: src/include/cluster/dialogs.rb:211
msgid "The Member Address has to be fulfilled"
msgstr ""
#. BNC#880242, expected_votes must have value when "udp"
-#: src/include/cluster/dialogs.rb:222
+#: src/include/cluster/dialogs.rb:217
msgid ""
"The Expected Votes has to be fulfilled when multicast transport is configured"
msgstr ""
-#: src/include/cluster/dialogs.rb:228 src/include/cluster/dialogs.rb:256
-#: src/include/cluster/dialogs.rb:1432
+#: src/include/cluster/dialogs.rb:223 src/include/cluster/dialogs.rb:249
+msgid "The Bind Network Address has to be fulfilled"
+msgstr ""
+
+#: src/include/cluster/dialogs.rb:229 src/include/cluster/dialogs.rb:257
+#: src/include/cluster/dialogs.rb:1430
msgid "The Multicast Address has to be fulfilled"
msgstr ""
-#: src/include/cluster/dialogs.rb:238 src/include/cluster/dialogs.rb:266
+#: src/include/cluster/dialogs.rb:239 src/include/cluster/dialogs.rb:267
msgid "The Multicast port must be a positive integer"
msgstr ""
-#: src/include/cluster/dialogs.rb:272
+#: src/include/cluster/dialogs.rb:273
msgid ""
"Only passive or active can be chosen if multiple interface used. Set to "
"passive."
msgstr ""
#. BNC#871970, change member address struct to memberaddr
-#: src/include/cluster/dialogs.rb:444
+#: src/include/cluster/dialogs.rb:445
msgid "Transport:"
msgstr ""
-#: src/include/cluster/dialogs.rb:452
+#: src/include/cluster/dialogs.rb:453
msgid "Channel"
msgstr ""
-#: src/include/cluster/dialogs.rb:457 src/include/cluster/dialogs.rb:478
+#: src/include/cluster/dialogs.rb:458 src/include/cluster/dialogs.rb:479
msgid "Bind Network Address:"
msgstr ""
-#: src/include/cluster/dialogs.rb:463 src/include/cluster/dialogs.rb:481
-#: src/include/cluster/dialogs.rb:1368
+#: src/include/cluster/dialogs.rb:464 src/include/cluster/dialogs.rb:482
+#: src/include/cluster/dialogs.rb:1366
msgid "Multicast Address:"
msgstr ""
-#: src/include/cluster/dialogs.rb:465 src/include/cluster/dialogs.rb:482
+#: src/include/cluster/dialogs.rb:466 src/include/cluster/dialogs.rb:483
msgid "Port:"
msgstr ""
-#: src/include/cluster/dialogs.rb:472
+#: src/include/cluster/dialogs.rb:473
msgid "Redundant Channel"
msgstr ""
-#: src/include/cluster/dialogs.rb:488
+#: src/include/cluster/dialogs.rb:489
msgid "Cluster Name:"
msgstr ""
-#: src/include/cluster/dialogs.rb:489
+#: src/include/cluster/dialogs.rb:490
msgid "Expected Votes:"
msgstr ""
-#: src/include/cluster/dialogs.rb:493
+#: src/include/cluster/dialogs.rb:494
msgid "rrp mode:"
msgstr ""
-#: src/include/cluster/dialogs.rb:498
+#: src/include/cluster/dialogs.rb:499
msgid "Auto Generate Node ID"
msgstr ""
-#: src/include/cluster/dialogs.rb:503
+#: src/include/cluster/dialogs.rb:504
msgid "Member Address:"
msgstr ""
-#: src/include/cluster/dialogs.rb:504
+#: src/include/cluster/dialogs.rb:505
msgid "IP"
msgstr ""
-#: src/include/cluster/dialogs.rb:504
+#: src/include/cluster/dialogs.rb:505
msgid "Redundant IP"
msgstr ""
#. BNC#879596, check the corosync.conf format
-#: src/include/cluster/dialogs.rb:544
+#: src/include/cluster/dialogs.rb:545
msgid ""
" NOTICE: Detected old corosync configuration.\n"
" Please reconfigure the member list and confirm all other settings."
msgstr ""
#. Notice, current could be "nil" if the list is empty.
-#: src/include/cluster/dialogs.rb:720
+#: src/include/cluster/dialogs.rb:719
msgid "Enable Security Auth"
msgstr ""
-#: src/include/cluster/dialogs.rb:724
+#: src/include/cluster/dialogs.rb:723
msgid ""
"For a newly created cluster, push the button below to generate /etc/corosync/"
"authkey."
msgstr ""
-#: src/include/cluster/dialogs.rb:729
+#: src/include/cluster/dialogs.rb:728
msgid ""
"To join an existing cluster, please copy /etc/corosync/authkey from other "
"nodes manually."
msgstr ""
-#: src/include/cluster/dialogs.rb:755
+#: src/include/cluster/dialogs.rb:754
msgid "Failed to create /etc/corosync/authkey"
msgstr ""
-#: src/include/cluster/dialogs.rb:757
+#: src/include/cluster/dialogs.rb:756
msgid "Create /etc/corosync/authkey succeeded"
msgstr ""
-#: src/include/cluster/dialogs.rb:818 src/include/cluster/dialogs.rb:888
+#: src/include/cluster/dialogs.rb:817 src/include/cluster/dialogs.rb:887
msgid "Running"
msgstr ""
-#: src/include/cluster/dialogs.rb:820
+#: src/include/cluster/dialogs.rb:819
msgid "Not running"
msgstr ""
#. servie:cluster is the name of /etc/sysconfig/SuSEfirewall2.d/services/cluster
-#: src/include/cluster/dialogs.rb:856
+#: src/include/cluster/dialogs.rb:855
msgid "Booting"
msgstr ""
-#: src/include/cluster/dialogs.rb:866
+#: src/include/cluster/dialogs.rb:865
msgid "On -- Start pacemaker during boot"
msgstr ""
-#: src/include/cluster/dialogs.rb:873
+#: src/include/cluster/dialogs.rb:872
msgid "Off -- Start pacemaker manually"
msgstr ""
-#: src/include/cluster/dialogs.rb:882
+#: src/include/cluster/dialogs.rb:881
msgid "Switch On and Off"
msgstr ""
-#: src/include/cluster/dialogs.rb:887
+#: src/include/cluster/dialogs.rb:886
msgid "Current Status: "
msgstr ""
-#: src/include/cluster/dialogs.rb:896
+#: src/include/cluster/dialogs.rb:895
msgid "Start pacemaker Now"
msgstr ""
-#: src/include/cluster/dialogs.rb:897
+#: src/include/cluster/dialogs.rb:896
msgid "Stop pacemaker Now"
msgstr ""
#. BNC#874563,stop pacemaker could stop corosync since BNC#872651 is fixed
-#: src/include/cluster/dialogs.rb:995
+#: src/include/cluster/dialogs.rb:994
msgid "Sync Host"
msgstr ""
-#: src/include/cluster/dialogs.rb:999 src/include/cluster/dialogs.rb:1011
+#: src/include/cluster/dialogs.rb:998 src/include/cluster/dialogs.rb:1010
msgid "Add"
msgstr ""
-#: src/include/cluster/dialogs.rb:1000 src/include/cluster/dialogs.rb:1012
+#: src/include/cluster/dialogs.rb:999 src/include/cluster/dialogs.rb:1011
msgid "Del"
msgstr ""
-#: src/include/cluster/dialogs.rb:1001 src/include/cluster/dialogs.rb:1013
+#: src/include/cluster/dialogs.rb:1000 src/include/cluster/dialogs.rb:1012
msgid "Edit"
msgstr ""
-#: src/include/cluster/dialogs.rb:1007
+#: src/include/cluster/dialogs.rb:1006
msgid "Sync File"
msgstr ""
-#: src/include/cluster/dialogs.rb:1014
+#: src/include/cluster/dialogs.rb:1013
msgid "Add Suggested Files"
msgstr ""
-#: src/include/cluster/dialogs.rb:1023
+#: src/include/cluster/dialogs.rb:1022
msgid "Generate Pre-Shared-Keys"
msgstr ""
#. remove duplicated elements
-#: src/include/cluster/dialogs.rb:1148
+#: src/include/cluster/dialogs.rb:1147
msgid "Csync2 Status Unknown"
msgstr ""
-#: src/include/cluster/dialogs.rb:1151
+#: src/include/cluster/dialogs.rb:1150
msgid "Turn csync2 ON"
msgstr ""
-#: src/include/cluster/dialogs.rb:1154
+#: src/include/cluster/dialogs.rb:1153
msgid "Turn csync2 OFF"
msgstr ""
-#: src/include/cluster/dialogs.rb:1184
+#: src/include/cluster/dialogs.rb:1183
msgid "Enter a hostname"
msgstr ""
-#: src/include/cluster/dialogs.rb:1198
+#: src/include/cluster/dialogs.rb:1196
msgid "Edit the hostname"
msgstr ""
-#: src/include/cluster/dialogs.rb:1212
+#: src/include/cluster/dialogs.rb:1210
msgid "Enter a filename to synchronize"
msgstr ""
-#: src/include/cluster/dialogs.rb:1227
+#: src/include/cluster/dialogs.rb:1225
msgid "Edit the filename"
msgstr ""
#. key file exist
-#: src/include/cluster/dialogs.rb:1259
+#: src/include/cluster/dialogs.rb:1257
msgid ""
"Key file %1 already exist.\n"
"Do you want to overwrite it?"
msgstr ""
#. remove exist key file
-#: src/include/cluster/dialogs.rb:1269
+#: src/include/cluster/dialogs.rb:1267
msgid "Delete key file %1 failed."
msgstr ""
#. generate key file
-#: src/include/cluster/dialogs.rb:1283
+#: src/include/cluster/dialogs.rb:1281
msgid ""
"Key file %1 is generated.\n"
"Clicking \"Add Suggested Files\" button adds it to sync list."
msgstr ""
-#: src/include/cluster/dialogs.rb:1290
+#: src/include/cluster/dialogs.rb:1288
msgid "Key generation failed."
msgstr ""
#. SaveCsync2();
-#: src/include/cluster/dialogs.rb:1352
+#: src/include/cluster/dialogs.rb:1350
msgid ""
"Conntrackd is a daemon which helps to duplicate firewall status between "
"cluster nodes.\n"
@@ -355,23 +355,23 @@
"You need to start it with the ocf:heartbeat:conntrackd."
msgstr ""
-#: src/include/cluster/dialogs.rb:1363
+#: src/include/cluster/dialogs.rb:1361
msgid "Dedicated Interface:"
msgstr ""
-#: src/include/cluster/dialogs.rb:1366
+#: src/include/cluster/dialogs.rb:1364
msgid "IP:"
msgstr ""
-#: src/include/cluster/dialogs.rb:1369
+#: src/include/cluster/dialogs.rb:1367
msgid "Group Number:"
msgstr ""
-#: src/include/cluster/dialogs.rb:1373
+#: src/include/cluster/dialogs.rb:1371
msgid "Generate /etc/conntrackd/conntrackd.conf"
msgstr ""
-#: src/include/cluster/dialogs.rb:1440
+#: src/include/cluster/dialogs.rb:1438
msgid "The Group Number must be a positive integer"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/control-center.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/control-center.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/control-center.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:27+0200\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -17,25 +17,24 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/main_window.cpp:150 src/main_window.cpp:150
+#: src/main_window.cpp:150
msgid "&Search"
msgstr ""
-#: src/main_window.cpp:191 src/main_window.cpp:191
+#: src/main_window.cpp:191
msgid "Ready"
msgstr ""
#. Translators: module name comes here (%1) e.g. HTTP server, Scanner,...
-#: src/main_window.cpp:321 src/main_window.cpp:321
+#: src/main_window.cpp:321
msgid "Starting configuration module \"%1\"..."
msgstr ""
-#: src/main_window.cpp:341 src/main_window.cpp:406 src/main_window.cpp:341
-#: src/main_window.cpp:406
+#: src/main_window.cpp:341 src/main_window.cpp:406
msgid "YaST Control Center"
msgstr ""
-#: src/main_window.cpp:342 src/main_window.cpp:342
+#: src/main_window.cpp:342
msgid ""
"YaST Control Center is not running as root.\n"
"You will only see modules which do not require root privileges."
Modified: branches/SLE12-SP5/yast/50-pot/control.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/control.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/control.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-21 02:29+0000\n"
+"POT-Creation-Date: 2019-09-20 15:55+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -17,13 +17,17 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: control/control.SLED.glade.translations.glade:3
+#: control/control.CAASP.glade.translations.glade:3
+#: control/control.Kubic.glade.translations.glade:3
+#: control/control.leanos.glade.translations.glade:3
+#: control/control.MicroOS.glade.translations.glade:3
+#: control/control.SLES.glade.translations.glade:3
msgid ""
"\n"
"<p>\n"
"The installation has completed successfully.\n"
"Your system is ready for use.\n"
-"Click <b>Finish</b> to log in to the system.\n"
+"Click Finish to log in to the system.\n"
"</p>\n"
"<p>\n"
"Please visit us at http://www.suse.com/.\n"
@@ -31,103 +35,236 @@
" "
msgstr ""
+#: control/control.CAASP.glade.translations.glade:14
+#: control/control.Kubic.glade.translations.glade:14
+#: control/control.leanos.glade.translations.glade:14
+#: control/control.MicroOS.glade.translations.glade:14
#: control/control.SLED.glade.translations.glade:15
+#: control/control.SLES.glade.translations.glade:14
msgid "CIM Server"
msgstr ""
-#: control/control.SLED.glade.translations.glade:16
-#: control/control.SLED.glade.translations.glade:17
-#: control/control.SLED.glade.translations.glade:21
-msgid "Installation Settings"
+#. TRANSLATORS: dialog caption
+#: control/control.CAASP.glade.translations.glade:16
+#: control/control.Kubic.glade.translations.glade:16
+#: control/control.MicroOS.glade.translations.glade:16
+#: control/control.openSUSE.glade.translations.glade:12
+#: installation.SLE_HPC.glade.translations.glade:4
+#: control/control.SLES.glade.translations.glade:16
+msgid "System Role"
msgstr ""
-#: control/control.SLED.glade.translations.glade:18
-msgid "Overview"
+#. TRANSLATORS: label in a dialog
+#: control/control.CAASP.glade.translations.glade:18
+#: control/control.Kubic.glade.translations.glade:18
+#: control/control.MicroOS.glade.translations.glade:18
+#: control/control.openSUSE.glade.translations.glade:14
+#: installation.SLE_HPC.glade.translations.glade:6
+#: control/control.SLES.glade.translations.glade:18
+msgid ""
+"System Roles are predefined use cases which tailor the system\n"
+"for the selected scenario."
msgstr ""
-#: control/control.SLED.glade.translations.glade:19
-msgid "Expert"
+#. TRANSLATORS: dialog help
+#: control/control.CAASP.glade.translations.glade:21
+#: control/control.Kubic.glade.translations.glade:21
+#: control/control.MicroOS.glade.translations.glade:21
+#: control/control.openSUSE.glade.translations.glade:17
+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. </p>"
msgstr ""
-#: control/control.SLED.glade.translations.glade:20
-msgid "Update Settings"
+#. TRANSLATORS: a label for a system role
+#: control/control.CAASP.glade.translations.glade:25
+msgid "Administration Node (Dashboard)"
msgstr ""
-#: control/control.SLED.glade.translations.glade:22
-msgid "Network Configuration"
+#: control/control.CAASP.glade.translations.glade:26
+msgid "• A set of tools and a dashboard for managing cluster nodes."
msgstr ""
-#: control/control.SLED.glade.translations.glade:23
-msgid "Hardware Configuration"
+#. TRANSLATORS: a label for a system role
+#: control/control.CAASP.glade.translations.glade:28
+msgid "Cluster Node"
msgstr ""
+#: control/control.CAASP.glade.translations.glade:29
+msgid "• The system is registered in a given administration dashboard."
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/control.CAASP.glade.translations.glade:31
+msgid "Plain System"
+msgstr ""
+
+#: control/control.CAASP.glade.translations.glade:32
+msgid "• No services started by default."
+msgstr ""
+
+#: control/control.CAASP.glade.translations.glade:33
+#: control/control.Kubic.glade.translations.glade:58
+#: control/control.leanos.glade.translations.glade:22
+#: control/control.leanos.glade.translations.glade:32
+#: control/control.leanos.glade.translations.glade:58
+#: control/control.MicroOS.glade.translations.glade:41
+#: control/control.openSUSE.glade.translations.glade:50
+#: control/control.openSUSE.glade.translations.glade:78
+#: control/control.openSUSE.glade.translations.glade:111
#: control/control.SLED.glade.translations.glade:24
#: control/control.SLED.glade.translations.glade:50
#: control/control.SLED.glade.translations.glade:81
+#: 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.SLED.glade.translations.glade:25
-#: control/control.SLED.glade.translations.glade:51
-msgid "Load linuxrc Network Configuration"
+#: control/control.CAASP.glade.translations.glade:34
+#: control/control.Kubic.glade.translations.glade:59
+#: control/control.leanos.glade.translations.glade:23
+#: control/control.leanos.glade.translations.glade:33
+#: control/control.MicroOS.glade.translations.glade:42
+#: control/control.SLES.glade.translations.glade:52
+#: control/control.SLES.glade.translations.glade:75
+msgid "Load Linuxrc Network Configuration"
msgstr ""
+#: control/control.CAASP.glade.translations.glade:35
+#: control/control.Kubic.glade.translations.glade:60
+#: control/control.leanos.glade.translations.glade:24
+#: control/control.leanos.glade.translations.glade:34
+#: control/control.MicroOS.glade.translations.glade:43
+#: control/control.openSUSE.glade.translations.glade:51
+#: control/control.openSUSE.glade.translations.glade:52
+#: control/control.openSUSE.glade.translations.glade:79
+#: control/control.openSUSE.glade.translations.glade:80
#: control/control.SLED.glade.translations.glade:26
#: control/control.SLED.glade.translations.glade:52
+#: control/control.SLES.glade.translations.glade:53
+#: control/control.SLES.glade.translations.glade:76
msgid "Network Autosetup"
msgstr ""
-#: control/control.SLED.glade.translations.glade:27
-#: control/control.SLED.glade.translations.glade:53
-#: control/control.SLED.glade.translations.glade:69
-#: control/control.SLED.glade.translations.glade:82
-msgid "Installer Update"
-msgstr ""
-
-#: control/control.SLED.glade.translations.glade:28
-#: control/control.SLED.glade.translations.glade:54
-msgid "Welcome"
-msgstr ""
-
+#: control/control.CAASP.glade.translations.glade:36
+#: control/control.Kubic.glade.translations.glade:63
+#: control/control.leanos.glade.translations.glade:29
+#: control/control.leanos.glade.translations.glade:38
+#: control/control.MicroOS.glade.translations.glade:46
+#: control/control.openSUSE.glade.translations.glade:56
#: control/control.SLED.glade.translations.glade:29
#: control/control.SLED.glade.translations.glade:55
+#: control/control.SLES.glade.translations.glade:56
+#: control/control.SLES.glade.translations.glade:79
msgid "Network Activation"
msgstr ""
+#: control/control.CAASP.glade.translations.glade:37
+#: control/control.Kubic.glade.translations.glade:64
+#: control/control.leanos.glade.translations.glade:30
+#: control/control.leanos.glade.translations.glade:39
+#: control/control.MicroOS.glade.translations.glade:47
+#: control/control.openSUSE.glade.translations.glade:57
+#: control/control.openSUSE.glade.translations.glade:84
#: control/control.SLED.glade.translations.glade:30
#: control/control.SLED.glade.translations.glade:56
+#: control/control.SLES.glade.translations.glade:57
+#: control/control.SLES.glade.translations.glade:80
msgid "Disk Activation"
msgstr ""
+#: control/control.CAASP.glade.translations.glade:38
+#: control/control.Kubic.glade.translations.glade:65
+#: control/control.leanos.glade.translations.glade:31
+#: control/control.leanos.glade.translations.glade:40
+#: control/control.leanos.glade.translations.glade:62
+#: control/control.MicroOS.glade.translations.glade:48
+#: control/control.openSUSE.glade.translations.glade:58
+#: control/control.openSUSE.glade.translations.glade:85
+#: control/control.openSUSE.glade.translations.glade:114
#: control/control.SLED.glade.translations.glade:31
#: control/control.SLED.glade.translations.glade:32
#: control/control.SLED.glade.translations.glade:57
#: control/control.SLED.glade.translations.glade:83
+#: installation.SLE_HPC.glade.translations.glade:18
+#: control/control.SLES.glade.translations.glade:58
+#: control/control.SLES.glade.translations.glade:59
+#: control/control.SLES.glade.translations.glade:81
+#: control/control.SLES.glade.translations.glade:106
msgid "System Analysis"
msgstr ""
-#: control/control.SLED.glade.translations.glade:33
-#: control/control.SLED.glade.translations.glade:59
-msgid "Add-On Products"
+#: control/control.CAASP.glade.translations.glade:39
+#: control/control.Kubic.glade.translations.glade:68
+#: control/control.MicroOS.glade.translations.glade:51
+#: control/control.openSUSE.glade.translations.glade:65
+#: installation.SLE_HPC.glade.translations.glade:23
+#: control/control.SLES.glade.translations.glade:63
+msgid "Installation"
msgstr ""
-#: control/control.SLED.glade.translations.glade:34
-msgid "Disk"
-msgstr ""
-
-#: control/control.SLED.glade.translations.glade:35
-msgid "Time Zone"
-msgstr ""
-
-#: control/control.SLED.glade.translations.glade:36
-#: control/control.SLED.glade.translations.glade:37
-msgid "User Settings"
-msgstr ""
-
-#: control/control.SLED.glade.translations.glade:38
-msgid "Installation Overview"
-msgstr ""
-
+#: control/control.CAASP.glade.translations.glade:40
+#: control/control.CAASP.glade.translations.glade:41
+#: control/control.CAASP.glade.translations.glade:43
+#: control/control.CAASP.glade.translations.glade:44
+#: control/control.CAASP.glade.translations.glade:45
+#: control/control.CAASP.glade.translations.glade:46
+#: control/control.CAASP.glade.translations.glade:47
+#: control/control.CAASP.glade.translations.glade:52
+#: control/control.CAASP.glade.translations.glade:53
+#: control/control.CAASP.glade.translations.glade:55
+#: control/control.CAASP.glade.translations.glade:56
+#: control/control.CAASP.glade.translations.glade:57
+#: control/control.CAASP.glade.translations.glade:58
+#: control/control.Kubic.glade.translations.glade:70
+#: control/control.Kubic.glade.translations.glade:71
+#: control/control.Kubic.glade.translations.glade:73
+#: control/control.Kubic.glade.translations.glade:74
+#: control/control.Kubic.glade.translations.glade:75
+#: control/control.Kubic.glade.translations.glade:76
+#: control/control.Kubic.glade.translations.glade:77
+#: control/control.Kubic.glade.translations.glade:82
+#: control/control.Kubic.glade.translations.glade:83
+#: control/control.Kubic.glade.translations.glade:85
+#: control/control.Kubic.glade.translations.glade:86
+#: control/control.Kubic.glade.translations.glade:87
+#: control/control.Kubic.glade.translations.glade:88
+#: control/control.MicroOS.glade.translations.glade:53
+#: control/control.MicroOS.glade.translations.glade:54
+#: control/control.MicroOS.glade.translations.glade:56
+#: control/control.MicroOS.glade.translations.glade:57
+#: control/control.MicroOS.glade.translations.glade:58
+#: control/control.MicroOS.glade.translations.glade:59
+#: control/control.MicroOS.glade.translations.glade:60
+#: control/control.MicroOS.glade.translations.glade:65
+#: control/control.MicroOS.glade.translations.glade:66
+#: control/control.MicroOS.glade.translations.glade:68
+#: control/control.MicroOS.glade.translations.glade:69
+#: control/control.MicroOS.glade.translations.glade:70
+#: control/control.MicroOS.glade.translations.glade:71
+#: control/control.openSUSE.glade.translations.glade:67
+#: control/control.openSUSE.glade.translations.glade:68
+#: control/control.openSUSE.glade.translations.glade:69
+#: control/control.openSUSE.glade.translations.glade:70
+#: control/control.openSUSE.glade.translations.glade:71
+#: control/control.openSUSE.glade.translations.glade:72
+#: control/control.openSUSE.glade.translations.glade:73
+#: control/control.openSUSE.glade.translations.glade:74
+#: control/control.openSUSE.glade.translations.glade:75
+#: control/control.openSUSE.glade.translations.glade:76
+#: control/control.openSUSE.glade.translations.glade:77
+#: control/control.openSUSE.glade.translations.glade:103
+#: control/control.openSUSE.glade.translations.glade:104
+#: control/control.openSUSE.glade.translations.glade:105
+#: control/control.openSUSE.glade.translations.glade:106
+#: control/control.openSUSE.glade.translations.glade:107
+#: control/control.openSUSE.glade.translations.glade:108
+#: control/control.openSUSE.glade.translations.glade:109
+#: control/control.openSUSE.glade.translations.glade:110
+#: control/control.openSUSE.glade.translations.glade:128
+#: control/control.openSUSE.glade.translations.glade:129
#: control/control.SLED.glade.translations.glade:39
#: control/control.SLED.glade.translations.glade:40
#: control/control.SLED.glade.translations.glade:41
@@ -147,30 +284,380 @@
#: control/control.SLED.glade.translations.glade:80
#: control/control.SLED.glade.translations.glade:97
#: control/control.SLED.glade.translations.glade:98
+#: installation.SLE_HPC.glade.translations.glade:25
+#: installation.SLE_HPC.glade.translations.glade:26
+#: installation.SLE_HPC.glade.translations.glade:28
+#: installation.SLE_HPC.glade.translations.glade:29
+#: installation.SLE_HPC.glade.translations.glade:30
+#: installation.SLE_HPC.glade.translations.glade:31
+#: installation.SLE_HPC.glade.translations.glade:32
+#: installation.SLE_HPC.glade.translations.glade:33
+#: installation.SLE_HPC.glade.translations.glade:36
+#: installation.SLE_HPC.glade.translations.glade:37
+#: installation.SLE_HPC.glade.translations.glade:39
+#: installation.SLE_HPC.glade.translations.glade:40
+#: installation.SLE_HPC.glade.translations.glade:41
+#: installation.SLE_HPC.glade.translations.glade:42
+#: installation.SLE_HPC.glade.translations.glade:43
+#: installation.SLE_HPC.glade.translations.glade:44
+#: control/control.SLES.glade.translations.glade:65
+#: control/control.SLES.glade.translations.glade:66
+#: 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: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.CAASP.glade.translations.glade:42
+#: control/control.CAASP.glade.translations.glade:54
+#: control/control.Kubic.glade.translations.glade:72
+#: control/control.Kubic.glade.translations.glade:84
+#: control/control.leanos.glade.translations.glade:48
+#: control/control.leanos.glade.translations.glade:71
+#: control/control.MicroOS.glade.translations.glade:55
+#: control/control.MicroOS.glade.translations.glade:67
#: control/control.SLED.glade.translations.glade:42
#: control/control.SLED.glade.translations.glade:64
#: control/control.SLED.glade.translations.glade:75
#: control/control.SLED.glade.translations.glade:92
+#: installation.SLE_HPC.glade.translations.glade:27
+#: installation.SLE_HPC.glade.translations.glade:38
+#: 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.CAASP.glade.translations.glade:48
+#: control/control.Kubic.glade.translations.glade:78
+#: control/control.leanos.glade.translations.glade:52
+#: control/control.MicroOS.glade.translations.glade:61
+#: control/control.openSUSE.glade.translations.glade:97
+#: control/control.SLED.glade.translations.glade:68
+#: installation.SLE_HPC.glade.translations.glade:34
+#: control/control.SLES.glade.translations.glade:92
+msgid "Base Installation"
+msgstr ""
+
+#: control/control.CAASP.glade.translations.glade:49
+#: control/control.CAASP.glade.translations.glade:50
+#: control/control.CAASP.glade.translations.glade:51
+#: control/control.Kubic.glade.translations.glade:79
+#: control/control.Kubic.glade.translations.glade:80
+#: control/control.Kubic.glade.translations.glade:81
+#: control/control.leanos.glade.translations.glade:56
+#: control/control.leanos.glade.translations.glade:57
+#: control/control.leanos.glade.translations.glade:64
+#: control/control.leanos.glade.translations.glade:65
+#: control/control.leanos.glade.translations.glade:67
+#: control/control.MicroOS.glade.translations.glade:62
+#: control/control.MicroOS.glade.translations.glade:63
+#: control/control.MicroOS.glade.translations.glade:64
+#: control/control.openSUSE.glade.translations.glade:100
+#: control/control.openSUSE.glade.translations.glade:101
+#: control/control.openSUSE.glade.translations.glade:102
+#: control/control.openSUSE.glade.translations.glade:116
+#: control/control.openSUSE.glade.translations.glade:117
+#: control/control.openSUSE.glade.translations.glade:119
+#: control/control.SLED.glade.translations.glade:70
+#: control/control.SLED.glade.translations.glade:71
+#: control/control.SLED.glade.translations.glade:72
+#: control/control.SLED.glade.translations.glade:85
+#: control/control.SLED.glade.translations.glade:86
+#: control/control.SLED.glade.translations.glade:88
+#: installation.SLE_HPC.glade.translations.glade:35
+#: 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:111
+msgid "AutoYaST Settings"
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/control.Kubic.glade.translations.glade:25
+msgid "kubeadm Node"
+msgstr ""
+
+#: control/control.Kubic.glade.translations.glade:26
+msgid ""
+"• MicroOS plus kubeadm kubernetes deployment tool\n"
+"• Uses CRI-O Container Runtime by default\n"
+"• Create a cluster with `kubeadm init`\n"
+"• Join a cluster with `kubeadm join`"
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/control.Kubic.glade.translations.glade:31
+#: control/control.MicroOS.glade.translations.glade:30
+msgid "MicroOS Container Host"
+msgstr ""
+
+#: control/control.Kubic.glade.translations.glade:32
+#: control/control.MicroOS.glade.translations.glade:31
+msgid ""
+"• MicroOS optimised for hosting container workloads\n"
+"• Includes Podman Container Runtime by default"
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/control.Kubic.glade.translations.glade:35
+msgid "Kubic Admin Node"
+msgstr ""
+
+#: control/control.Kubic.glade.translations.glade:36
+msgid ""
+"• First MicroOS-based kubernetes Master Node\n"
+"• Uses CRI-O Container Runtime by default\n"
+"• Each kubic cluster requires at least one Admin Node\n"
+"• Create cluster with `kubicctl init`\n"
+"• Add nodes with `kubicctl node add $node1,$node2,etc`"
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/control.Kubic.glade.translations.glade:42
+msgid "Additional Kubic Node"
+msgstr ""
+
+#: control/control.Kubic.glade.translations.glade:43
+msgid ""
+"• MicroOS-based kubernetes Node for additional Worker or Master\n"
+"• Uses CRI-O Container Runtime by default\n"
+"• On the Admin Node run `salt-key -A` to accept the new Node"
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/control.Kubic.glade.translations.glade:47
+msgid "Kubic Loadbalancer Node"
+msgstr ""
+
+#: control/control.Kubic.glade.translations.glade:48
+msgid ""
+"• MicroOS-based Loadbalancer for Kubernets API server using HAProxy\n"
+"• On the Admin Node run `salt-key -A` to accept the new Loadbalancer Node"
+msgstr ""
+
+#: control/control.Kubic.glade.translations.glade:50
+#: control/control.Kubic.glade.translations.glade:51
+#: control/control.Kubic.glade.translations.glade:52
+#: control/control.Kubic.glade.translations.glade:54
+#: control/control.Kubic.glade.translations.glade:55
+#: control/control.leanos.glade.translations.glade:15
+#: control/control.leanos.glade.translations.glade:16
+#: control/control.leanos.glade.translations.glade:17
+#: control/control.leanos.glade.translations.glade:20
+#: control/control.leanos.glade.translations.glade:21
+#: control/control.MicroOS.glade.translations.glade:33
+#: control/control.MicroOS.glade.translations.glade:34
+#: control/control.MicroOS.glade.translations.glade:35
+#: control/control.MicroOS.glade.translations.glade:37
+#: control/control.MicroOS.glade.translations.glade:38
+#: control/control.openSUSE.glade.translations.glade:42
+#: control/control.openSUSE.glade.translations.glade:43
+#: control/control.openSUSE.glade.translations.glade:44
+#: control/control.openSUSE.glade.translations.glade:46
+#: control/control.openSUSE.glade.translations.glade:47
+#: control/control.SLED.glade.translations.glade:16
+#: control/control.SLED.glade.translations.glade:17
+#: control/control.SLED.glade.translations.glade:21
+#: 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
+msgid "Installation Settings"
+msgstr ""
+
+#: control/control.Kubic.glade.translations.glade:53
+#: control/control.MicroOS.glade.translations.glade:36
+#: control/control.openSUSE.glade.translations.glade:45
+#: control/control.openSUSE.glade.translations.glade:90
+#: control/control.SLED.glade.translations.glade:20
+#: control/control.SLES.glade.translations.glade:42
+msgid "Update Settings"
+msgstr ""
+
+#: control/control.Kubic.glade.translations.glade:56
+#: control/control.MicroOS.glade.translations.glade:39
+#: control/control.openSUSE.glade.translations.glade:48
+#: control/control.SLED.glade.translations.glade:22
+#: control/control.SLES.glade.translations.glade:45
+#: control/control.SLES.glade.translations.glade:46
+msgid "Network Configuration"
+msgstr ""
+
+#: control/control.Kubic.glade.translations.glade:57
+#: control/control.MicroOS.glade.translations.glade:40
+#: control/control.openSUSE.glade.translations.glade:49
+#: control/control.SLED.glade.translations.glade:23
+#: control/control.SLES.glade.translations.glade:48
+#: control/control.SLES.glade.translations.glade:49
+#: control/control.SLES.glade.translations.glade:50
+msgid "Hardware Configuration"
+msgstr ""
+
+#: control/control.Kubic.glade.translations.glade:61
+#: control/control.leanos.glade.translations.glade:26
+#: control/control.leanos.glade.translations.glade:36
+#: control/control.leanos.glade.translations.glade:54
+#: control/control.leanos.glade.translations.glade:60
+#: control/control.MicroOS.glade.translations.glade:44
+#: control/control.openSUSE.glade.translations.glade:54
+#: control/control.openSUSE.glade.translations.glade:82
+msgid "Repositories Initialization"
+msgstr ""
+
+#: control/control.Kubic.glade.translations.glade:62
+#: control/control.leanos.glade.translations.glade:27
+#: control/control.leanos.glade.translations.glade:37
+#: control/control.leanos.glade.translations.glade:55
+#: control/control.leanos.glade.translations.glade:61
+#: control/control.MicroOS.glade.translations.glade:45
+#: control/control.openSUSE.glade.translations.glade:55
+#: control/control.openSUSE.glade.translations.glade:83
+#: control/control.openSUSE.glade.translations.glade:99
+#: control/control.openSUSE.glade.translations.glade:113
+#: control/control.SLED.glade.translations.glade:28
+#: control/control.SLED.glade.translations.glade:54
+#: control/control.SLES.glade.translations.glade:55
+#: control/control.SLES.glade.translations.glade:78
+msgid "Welcome"
+msgstr ""
+
+#: control/control.Kubic.glade.translations.glade:66
+#: control/control.leanos.glade.translations.glade:43
+#: control/control.MicroOS.glade.translations.glade:49
+#: control/control.openSUSE.glade.translations.glade:60
+#: control/control.openSUSE.glade.translations.glade:88
+#: control/control.SLED.glade.translations.glade:33
+#: control/control.SLED.glade.translations.glade:59
+#: installation.SLE_HPC.glade.translations.glade:19
+#: control/control.SLES.glade.translations.glade:60
+#: control/control.SLES.glade.translations.glade:83
+msgid "Add-On Products"
+msgstr ""
+
+#: control/control.Kubic.glade.translations.glade:67
+#: control/control.MicroOS.glade.translations.glade:50
+#: control/control.openSUSE.glade.translations.glade:63
+#: control/control.openSUSE.glade.translations.glade:64
+#: control/control.SLED.glade.translations.glade:36
+#: control/control.SLED.glade.translations.glade:37
+msgid "User Settings"
+msgstr ""
+
+#: control/control.Kubic.glade.translations.glade:69
+#: control/control.MicroOS.glade.translations.glade:52
+#: control/control.openSUSE.glade.translations.glade:66
+#: control/control.SLED.glade.translations.glade:38
+msgid "Installation Overview"
+msgstr ""
+
+#: control/control.leanos.glade.translations.glade:18
+#: control/control.SLED.glade.translations.glade:18
+#: control/control.SLES.glade.translations.glade:40
+msgid "Overview"
+msgstr ""
+
+#: control/control.leanos.glade.translations.glade:19
+#: control/control.SLED.glade.translations.glade:19
+#: control/control.SLES.glade.translations.glade:41
+msgid "Expert"
+msgstr ""
+
+#: control/control.leanos.glade.translations.glade:25
+#: control/control.leanos.glade.translations.glade:35
+#: control/control.leanos.glade.translations.glade:53
+#: control/control.leanos.glade.translations.glade:59
+#: control/control.openSUSE.glade.translations.glade:53
+#: control/control.openSUSE.glade.translations.glade:81
+#: control/control.openSUSE.glade.translations.glade:98
+#: control/control.openSUSE.glade.translations.glade:112
+#: control/control.SLED.glade.translations.glade:27
+#: control/control.SLED.glade.translations.glade:53
+#: control/control.SLED.glade.translations.glade:69
+#: control/control.SLED.glade.translations.glade:82
+#: 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.leanos.glade.translations.glade:28
+#: control/control.leanos.glade.translations.glade:42
+msgid "Product License"
+msgstr ""
+
+#: control/control.leanos.glade.translations.glade:41
+#: control/control.leanos.glade.translations.glade:63
+#: control/control.openSUSE.glade.translations.glade:86
+#: control/control.openSUSE.glade.translations.glade:115
#: control/control.SLED.glade.translations.glade:58
#: control/control.SLED.glade.translations.glade:84
+#: control/control.SLES.glade.translations.glade:82
+#: control/control.SLES.glade.translations.glade:107
msgid "System for Update"
msgstr ""
+#: control/control.leanos.glade.translations.glade:44
+#: control/control.leanos.glade.translations.glade:66
+#: control/control.openSUSE.glade.translations.glade:89
+#: control/control.openSUSE.glade.translations.glade:118
#: control/control.SLED.glade.translations.glade:60
#: control/control.SLED.glade.translations.glade:87
+#: control/control.SLES.glade.translations.glade:84
+#: control/control.SLES.glade.translations.glade:110
msgid "Update"
msgstr ""
+#: control/control.leanos.glade.translations.glade:45
#: control/control.SLED.glade.translations.glade:61
+#: control/control.SLES.glade.translations.glade:85
msgid "Update Summary"
msgstr ""
+#: control/control.leanos.glade.translations.glade:46
+#: control/control.leanos.glade.translations.glade:47
+#: control/control.leanos.glade.translations.glade:49
+#: control/control.leanos.glade.translations.glade:50
+#: control/control.leanos.glade.translations.glade:51
+#: control/control.leanos.glade.translations.glade:68
+#: control/control.leanos.glade.translations.glade:69
+#: control/control.leanos.glade.translations.glade:70
+#: control/control.leanos.glade.translations.glade:72
+#: control/control.leanos.glade.translations.glade:73
+#: control/control.leanos.glade.translations.glade:74
+#: control/control.leanos.glade.translations.glade:75
+#: control/control.openSUSE.glade.translations.glade:91
+#: control/control.openSUSE.glade.translations.glade:92
+#: control/control.openSUSE.glade.translations.glade:93
+#: control/control.openSUSE.glade.translations.glade:94
+#: control/control.openSUSE.glade.translations.glade:95
+#: control/control.openSUSE.glade.translations.glade:96
+#: control/control.openSUSE.glade.translations.glade:120
+#: control/control.openSUSE.glade.translations.glade:121
+#: control/control.openSUSE.glade.translations.glade:122
+#: control/control.openSUSE.glade.translations.glade:123
+#: control/control.openSUSE.glade.translations.glade:124
+#: control/control.openSUSE.glade.translations.glade:125
+#: control/control.openSUSE.glade.translations.glade:126
+#: control/control.openSUSE.glade.translations.glade:127
+#: control/control.openSUSE.glade.translations.glade:132
+#: control/control.openSUSE.glade.translations.glade:133
#: control/control.SLED.glade.translations.glade:62
#: control/control.SLED.glade.translations.glade:63
#: control/control.SLED.glade.translations.glade:65
@@ -185,39 +672,166 @@
#: control/control.SLED.glade.translations.glade:96
#: control/control.SLED.glade.translations.glade:101
#: control/control.SLED.glade.translations.glade:102
+#: installation.SLE_HPC.glade.translations.glade:47
+#: installation.SLE_HPC.glade.translations.glade:48
+#: 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.SLED.glade.translations.glade:68
-msgid "Base Installation"
+#. TRANSLATORS: a label for a system role
+#: control/control.MicroOS.glade.translations.glade:25
+msgid "MicroOS"
msgstr ""
-#: control/control.SLED.glade.translations.glade:70
-#: control/control.SLED.glade.translations.glade:71
-#: control/control.SLED.glade.translations.glade:72
-#: control/control.SLED.glade.translations.glade:85
-#: control/control.SLED.glade.translations.glade:86
-#: control/control.SLED.glade.translations.glade:88
-msgid "AutoYaST Settings"
+#: control/control.MicroOS.glade.translations.glade:26
+msgid ""
+"• OS designed for single-purpose systems and optimised for large "
+"deployments\n"
+"• Minimal installation, provides no services by default\n"
+"• Install software with `transactional-update pkg in`"
msgstr ""
+#: control/control.openSUSE.glade.translations.glade:3
+msgid ""
+"\n"
+"<p><b>Congratulations!</b></p>\n"
+"<p>The installation of openSUSE on your machine is complete.\n"
+"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
+"<p>Visit us at %1.</p>\n"
+"<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
+" "
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/control.openSUSE.glade.translations.glade:21
+msgid "Desktop with KDE Plasma"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:22
+msgid ""
+"Graphical system with KDE Plasma as desktop environment. Suitable for "
+"Workstations, Desktops and Laptops.\n"
+" "
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/control.openSUSE.glade.translations.glade:25
+msgid "Desktop with GNOME"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:26
+msgid ""
+"Graphical system with GNOME as desktop environment. Suitable for "
+"Workstations, Desktops and Laptops.\n"
+"\t "
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/control.openSUSE.glade.translations.glade:29
+msgid "Desktop with Xfce"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:30
+msgid ""
+"Graphical system with Xfce as desktop environment. Suitable for "
+"Workstations, Desktops and Laptops.\n"
+" "
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/control.openSUSE.glade.translations.glade:33
+msgid "Generic Desktop"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:34
+msgid ""
+"Graphical system with reduced package set. Intended as base for a customized "
+"software selection."
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/control.openSUSE.glade.translations.glade:36
+msgid "Server"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:37
+msgid "Small set of packages suitable for servers with a text mode interface."
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/control.openSUSE.glade.translations.glade:39
+#: control/installation.glade.translations.glade:4
+msgid "Transactional Server"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:40
+msgid ""
+"Like the Server role but uses a read-only root filesystem to provide atomic, "
+"automatic updates of a system without interfering with the running system.\n"
+" "
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:59
+#: control/control.openSUSE.glade.translations.glade:87
+msgid "Online Repositories"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:61
+#: control/control.SLED.glade.translations.glade:34
+#: installation.SLE_HPC.glade.translations.glade:21
+#: control/control.SLES.glade.translations.glade:61
+msgid "Disk"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:62
+#: control/control.SLED.glade.translations.glade:35
+#: installation.SLE_HPC.glade.translations.glade:22
+#: control/control.SLES.glade.translations.glade:62
+msgid "Time Zone"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:130
+#: control/control.openSUSE.glade.translations.glade:134
#: control/control.SLED.glade.translations.glade:99
#: control/control.SLED.glade.translations.glade:103
+#: installation.SLE_HPC.glade.translations.glade:45
+#: installation.SLE_HPC.glade.translations.glade:49
+#: control/control.SLES.glade.translations.glade:122
+#: control/control.SLES.glade.translations.glade:126
msgid "Configuration"
msgstr ""
+#: control/control.openSUSE.glade.translations.glade:131
+#: control/control.openSUSE.glade.translations.glade:135
#: control/control.SLED.glade.translations.glade:100
#: control/control.SLED.glade.translations.glade:104
+#: installation.SLE_HPC.glade.translations.glade:46
+#: installation.SLE_HPC.glade.translations.glade:50
+#: control/control.SLES.glade.translations.glade:123
+#: control/control.SLES.glade.translations.glade:127
msgid "System Configuration"
msgstr ""
-#: control/control.SLES.glade.translations.glade:3
+#: control/control.SLED.glade.translations.glade:3
msgid ""
"\n"
"<p>\n"
"The installation has completed successfully.\n"
"Your system is ready for use.\n"
-"Click Finish to log in to the system.\n"
+"Click <b>Finish</b> to log in to the system.\n"
"</p>\n"
"<p>\n"
"Please visit us at http://www.suse.com/.\n"
@@ -225,19 +839,13 @@
" "
msgstr ""
-#. TRANSLATORS: dialog caption
-#: control/control.SLES.glade.translations.glade:16
-msgid "System Role"
+#: control/control.SLED.glade.translations.glade:25
+#: control/control.SLED.glade.translations.glade:51
+msgid "Load linuxrc Network Configuration"
msgstr ""
-#. TRANSLATORS: label in a dialog
-#: control/control.SLES.glade.translations.glade:18
-msgid ""
-"System Roles are predefined use cases which tailor the system\n"
-"for the selected scenario."
-msgstr ""
-
#. TRANSLATORS: dialog help
+#: installation.SLE_HPC.glade.translations.glade:9
#: control/control.SLES.glade.translations.glade:21
msgid ""
"<p>The system roles adjustments are in the range from package selection up\n"
@@ -247,6 +855,26 @@
msgstr ""
#. TRANSLATORS: a label for a system role
+#: installation.SLE_HPC.glade.translations.glade:14
+msgid "HPC Login and Development Node"
+msgstr ""
+
+#: installation.SLE_HPC.glade.translations.glade:15
+msgid ""
+"• Includes HPC-enabled libraries\n"
+"• Adds compilers and development toolchain\n"
+msgstr ""
+
+#: installation.SLE_HPC.glade.translations.glade:20
+msgid "Apply Modules Extensions"
+msgstr ""
+
+#: installation.SLE_HPC.glade.translations.glade:24
+#: control/control.SLES.glade.translations.glade:64
+msgid "Installation Summary"
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
#: control/control.SLES.glade.translations.glade:26
msgid "Default System"
msgstr ""
@@ -259,6 +887,7 @@
#. TRANSLATORS: a label for a system role
#: control/control.SLES.glade.translations.glade:30
+#: control/installation.glade.translations.glade:4
msgid "KVM Virtualization Host"
msgstr ""
@@ -283,155 +912,212 @@
msgid "Network Services Configuration"
msgstr ""
-#: control/control.SLES.glade.translations.glade:52
-#: control/control.SLES.glade.translations.glade:75
-msgid "Load Linuxrc Network Configuration"
+#. TRANSLATORS: a label for a system role
+#: installation.SLES4SAP.glade.translations.glade:2
+msgid "SLES for SAP Applications"
msgstr ""
-#: control/control.SLES.glade.translations.glade:63
-msgid "Installation"
+#: installation.SLES4SAP.glade.translations.glade:2
+msgid ""
+"• Ideal if you want to run an SAP Application\n"
+"• RDP and SAP Installation Wizard option available"
msgstr ""
-#: control/control.SLES.glade.translations.glade:64
-msgid "Installation Summary"
+#. TRANSLATORS: a label for a system role
+#: installation.suse-manager-proxy.glade.translations.glade:2
+msgid "SUSE Manager Proxy"
msgstr ""
-#: control/installation.glade.translations.glade:3
-msgid "Add-On Product Installation"
+#: installation.suse-manager-proxy.glade.translations.glade:2
+msgid ""
+"• Manager Proxy pattern\n"
+"• Configure from Manager Server"
msgstr ""
-#: control/installation.glade.translations.glade:4
-msgid "Language Installation"
+#. TRANSLATORS: a label for a system role
+#: installation.suse-manager-server.glade.translations.glade:2
+msgid "SUSE Manager Server"
msgstr ""
-#: control/control.openSUSE.glade.translations.glade:3
+#: installation.suse-manager-server.glade.translations.glade:2
msgid ""
-"\n"
-"<p><b>Congratulations!</b></p>\n"
-"<p>The installation of openSUSE on your machine is complete.\n"
-"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
-"<p>Visit us at %1.</p>\n"
-"<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
-" "
+"• Manager Server pattern\n"
+"• LVM-based partition layout"
msgstr ""
-#: control/control.openSUSE.glade.translations.glade:10
+#. TRANSLATORS: a label for a system role
+#: installation.suse-manager-server.glade.translations.glade:3
+msgid "SUSE Manager for Retail Server"
+msgstr ""
+
+#: installation.suse-manager-server.glade.translations.glade:3
msgid ""
-"The desktop environment on your computer provides the graphical user\n"
-"interface for your computer, as well as a suite of applications for\n"
-"email, Web browsing, office productivity, games, and utilities to\n"
-"manage your computer.\n"
-"\n"
-"openSUSE offers a choice of desktop environments. The most widely\n"
-"used desktop environments are GNOME and KDE Plasma, and they are equally\n"
-"supported under openSUSE. Both desktop environments are easy to use,\n"
-"highly integrated, and have an attractive look and feel. Each desktop\n"
-"environment has a distinct style, so personal taste determines which\n"
-"is the most appropriate desktop for you."
+"• Retail Server Pattern\n"
+"• Larger volume for terminal images"
msgstr ""
-#: control/control.openSUSE.glade.translations.glade:21
-msgid "GNOME Desktop"
+#. TRANSLATORS: a label for a system role
+#: control/installation.glade.translations.glade:4
+msgid "GNOME Desktop (Basic)"
msgstr ""
-#: control/control.openSUSE.glade.translations.glade:22
-msgid "KDE Plasma Desktop"
+#: control/installation.glade.translations.glade:5
+msgid ""
+"• Basic GNOME Desktop environment.\n"
+"• Preinstalled with only essential graphical applications (File Manager, Web "
+"Browser).\n"
+"• Uses X11 technology."
msgstr ""
#. 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)"
+#: control/installation.glade.translations.glade:4
+msgid "GNOME Desktop (Wayland)"
msgstr ""
-#: control/control.openSUSE.glade.translations.glade:24
-msgid "Xfce Desktop"
+#: control/installation.glade.translations.glade:5
+msgid ""
+"• Full featured GNOME desktop environment, including Office suite, E-Mail "
+"client, File Manager.\n"
+"• Optimized for installation on physical systems, using Wayland technology.\n"
+"• Remote graphical access to GNOME desktop environment is not available when "
+"using Wayland."
msgstr ""
-#: control/control.openSUSE.glade.translations.glade:25
-msgid "LXDE Desktop"
+#. TRANSLATORS: a label for a system role
+#: control/installation.glade.translations.glade:4
+msgid "GNOME Desktop (X11)"
msgstr ""
-#: control/control.openSUSE.glade.translations.glade:26
-msgid "Minimal X Window"
+#: control/installation.glade.translations.glade:5
+msgid ""
+"• Full featured GNOME desktop environment, including Office suite, E-Mail "
+"client, File Manager.\n"
+"• Support remote access to GNOME desktop environment."
msgstr ""
-#: control/control.openSUSE.glade.translations.glade:27
-msgid "Enlightenment Desktop"
+#. TRANSLATORS: a label for a system role
+#: control/installation.glade.translations.glade:4
+msgid "HA node"
msgstr ""
-#. TRANSLATORS: dialog caption
-#: control/control.openSUSE.glade.translations.glade:29
-#: control/control.openSUSE.glade.translations.glade:72
-msgid "Computer Role"
+#: control/installation.glade.translations.glade:5
+msgid ""
+"• HA pattern installed\n"
+"• sshd / NTP enable"
msgstr ""
-#. TRANSLATORS: label in a dialog
-#: control/control.openSUSE.glade.translations.glade:31
-msgid ""
-"Computer Role is a predefined use case which tailor the system\n"
-"for the selected scenario."
+#. TRANSLATORS: a label for a system role
+#: control/installation.glade.translations.glade:8
+msgid "HA GEO node"
msgstr ""
-#. TRANSLATORS: dialog help
-#: control/control.openSUSE.glade.translations.glade:34
+#: control/installation.glade.translations.glade:9
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>"
+"• HA GEO pattern installed\n"
+"• sshd / NTP enable"
msgstr ""
#. TRANSLATORS: a label for a system role
-#: control/control.openSUSE.glade.translations.glade:39
-msgid "Workstation with KDE Plasma"
+#: control/installation.glade.translations.glade:4
+msgid "HPC Compute Node"
msgstr ""
-#: control/control.openSUSE.glade.translations.glade:40
+#: control/installation.glade.translations.glade:5
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"
-" "
+"• Uses xfs as the default root filesystem\n"
+"• Includes HPC-enabled libraries\n"
+"• Disables firewall and kdump services\n"
+"• Based from minimal setup configuration\n"
+"• Installs client for the Slurm Workload Manager \n"
+"• Does not create a seperate home partition\n"
+"• Does not create a local user\n"
+"• Mounts a large scratch partition to /var/tmp\n"
msgstr ""
#. TRANSLATORS: a label for a system role
-#: control/control.openSUSE.glade.translations.glade:44
-msgid "Workstation with GNOME"
+#: control/installation.glade.translations.glade:4
+msgid "HPC Managment Server (Head Node)"
msgstr ""
-#: control/control.openSUSE.glade.translations.glade:45
+#: control/installation.glade.translations.glade:5
msgid ""
-"GNOME is a powerful and intuitive desktop environment that uses Evolution as "
-"mailer,\n"
-"Firefox as browser, and Nautilus as file manager.\n"
-" "
+"• Uses xfs as the default root filesystem\n"
+"• Includes HPC-enabled libraries\n"
+"• Disables firewall and kdump services\n"
+"• Installs controller for the Slurm Workload Manager \n"
+"• Mounts a large scratch partition to /var/tmp\n"
msgstr ""
-#: control/control.openSUSE.glade.translations.glade:50
+#: control/installation.glade.translations.glade:5
msgid ""
-"Server is usefull when computer should not have interaction with user and "
-"have only command line."
+"• Kernel-based hypervisor and tools\n"
+"• Dedicated /var/lib/libvirt partition\n"
+"• Disable firewall, kdump services"
msgstr ""
#. TRANSLATORS: a label for a system role
-#: control/control.openSUSE.glade.translations.glade:52
-msgid "Custom"
+#: control/installation.glade.translations.glade:4
+msgid "IceWM Desktop (Minimal)"
msgstr ""
-#: control/control.openSUSE.glade.translations.glade:53
+#: control/installation.glade.translations.glade:5
+msgid "Lightweight Desktop environment"
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/installation.glade.translations.glade:4
+msgid "Minimal text installation"
+msgstr ""
+
+#: control/installation.glade.translations.glade:5
msgid ""
-"Custom role runs additional dialog where user can select software that fits "
-"his requirements."
+"• X desktop without GNOME, with Btrfs root (/) partition\n"
+"• Separate /home partition (XFS) for disks larger than 20GB"
msgstr ""
-#: control/control.openSUSE.glade.translations.glade:74
-msgid "Custom Pattern Selection"
+#. TRANSLATORS: a label for a system role
+#: control/installation.glade.translations.glade:4
+msgid "Real Time (Text Mode)"
msgstr ""
-#: control/control.openSUSE.glade.translations.glade:98
-msgid "Online Repositories"
+#: control/installation.glade.translations.glade:5
+msgid "• Same Real Time environment as for GUI Mode but without GNOME"
msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/installation.glade.translations.glade:4
+msgid "SLES with GNOME"
+msgstr ""
+
+#: control/installation.glade.translations.glade:5
+msgid "• GNOME environment"
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/installation.glade.translations.glade:4
+msgid "Text Mode"
+msgstr ""
+
+#: control/installation.glade.translations.glade:5
+msgid "• X server without GNOME"
+msgstr ""
+
+#: control/installation.glade.translations.glade:5
+msgid ""
+"• Transactional Server uses a read-only root filesystem to provide atomic, "
+"automatic updates of a system without interfering with the running system\n"
+"• Update using `transactional-update up`, then reboot for the update to take "
+"effect"
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/installation.glade.translations.glade:4
+msgid "XEN Virtualization Host"
+msgstr ""
+
+#: control/installation.glade.translations.glade:5
+msgid ""
+"• Bare metal hypervisor and tools\n"
+"• Dedicated /var/lib/libvirt partition\n"
+"• Disable firewall, kdump services"
+msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/country.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/country.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/country.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-07 13:33+0200\n"
-"PO-Revision-Date: 2017-09-07 13:33+0200\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
+"PO-Revision-Date: 2019-09-20 15:56+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -328,8 +328,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:855
+#: language/src/modules/Language.rb:889
msgid "Additional Languages: %1"
msgstr ""
@@ -573,26 +573,26 @@
#. summary label
#. summary label
-#: language/src/modules/Language.rb:795 language/src/modules/Language.rb:867
+#: language/src/modules/Language.rb:799 language/src/modules/Language.rb:871
msgid "Primary Language: %1"
msgstr ""
#. 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:1044
msgid "Installing Packages..."
msgstr ""
#. continue/cancel message
-#: language/src/modules/Language.rb:1131
+#: language/src/modules/Language.rb:1135
msgid ""
"Translation of the primary language is not complete.\n"
"Some texts may be displayed in English.\n"
msgstr ""
#. popup message
-#: language/src/modules/Language.rb:1345
+#: language/src/modules/Language.rb:1349
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"
@@ -600,7 +600,7 @@
msgstr ""
#. popup message (user selected CJK language in text mode)
-#: language/src/modules/Language.rb:1374
+#: language/src/modules/Language.rb:1378
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."
@@ -650,8 +650,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:760
+#: timezone/src/modules/Timezone.rb:996
msgid "UTC"
msgstr ""
@@ -684,7 +684,7 @@
#. help for time calculation basis:
#. hardware clock references local time or UTC?
-#: timezone/src/include/timezone/dialogs.rb:105
+#: timezone/src/include/timezone/dialogs.rb:106
msgid ""
"<p>\n"
"Specify whether your machine is set to local time or UTC in <b>Hardware "
@@ -701,7 +701,7 @@
msgstr ""
#. help text: extra note about localtime
-#: timezone/src/include/timezone/dialogs.rb:118
+#: timezone/src/include/timezone/dialogs.rb:119
msgid ""
"<p>\n"
"Note: The internal system clock as used by the Linux kernel must\n"
@@ -712,7 +712,7 @@
msgstr ""
#. warning popup, in case local time is selected (bnc#732769)
-#: timezone/src/include/timezone/dialogs.rb:131
+#: timezone/src/include/timezone/dialogs.rb:132
msgid ""
"\n"
"You selected local time, but only Linux seems to be installed on your "
@@ -731,121 +731,121 @@
msgstr ""
#. help text for set time dialog
-#: timezone/src/include/timezone/dialogs.rb:187
+#: timezone/src/include/timezone/dialogs.rb:188
msgid ""
"<p>The current system time and date are displayed. If required, change them "
"to the correct values manually or use Network Time Protocol (NTP).</p>"
msgstr ""
#. help text, cont.
-#: timezone/src/include/timezone/dialogs.rb:191
+#: timezone/src/include/timezone/dialogs.rb:192
msgid "<p>Press <b>Accept</b> to save your changes.</p>"
msgstr ""
#. label text, do not change "DD-MM-YYYY"
-#: timezone/src/include/timezone/dialogs.rb:262
+#: timezone/src/include/timezone/dialogs.rb:263
msgid "Current Date in DD-MM-YYYY Format"
msgstr ""
#. label text, do not change "HH:MM:SS"
-#: timezone/src/include/timezone/dialogs.rb:278
+#: timezone/src/include/timezone/dialogs.rb:279
msgid "Current Time in HH:MM:SS Format"
msgstr ""
#. label text
-#: timezone/src/include/timezone/dialogs.rb:293
+#: timezone/src/include/timezone/dialogs.rb:294
msgid "Current Date"
msgstr ""
#. label text
-#: timezone/src/include/timezone/dialogs.rb:297
+#: timezone/src/include/timezone/dialogs.rb:298
msgid "Current Time"
msgstr ""
#. radio button label (= how to setup time)
-#: timezone/src/include/timezone/dialogs.rb:312
+#: timezone/src/include/timezone/dialogs.rb:313
msgid "Manually"
msgstr ""
#. check box label
-#: timezone/src/include/timezone/dialogs.rb:328
+#: timezone/src/include/timezone/dialogs.rb:329
msgid "Change the Time Now"
msgstr ""
#. radio button label
-#: timezone/src/include/timezone/dialogs.rb:341
+#: timezone/src/include/timezone/dialogs.rb:342
msgid "Synchronize with NTP Server"
msgstr ""
#. TODO replace help text after ntp_installed, is.
-#: timezone/src/include/timezone/dialogs.rb:356
+#: timezone/src/include/timezone/dialogs.rb:357
msgid "Change Date and Time"
msgstr ""
#. popup text, %1 is entered value
-#: timezone/src/include/timezone/dialogs.rb:466
+#: timezone/src/include/timezone/dialogs.rb:467
msgid ""
"Invalid time (HH:MM:SS) %1.\n"
"Enter the correct time.\n"
msgstr ""
#. popup text, %1 is entered value
-#: timezone/src/include/timezone/dialogs.rb:475
+#: timezone/src/include/timezone/dialogs.rb:476
msgid ""
"Invalid date (DD-MM-YYYY) %1.\n"
"Enter the correct date.\n"
msgstr ""
#. TRANSLATORS: Button label
-#: timezone/src/include/timezone/dialogs.rb:535
+#: timezone/src/include/timezone/dialogs.rb:536
msgid "Other &Settings..."
msgstr ""
#. frame label
#. frame label
-#: timezone/src/include/timezone/dialogs.rb:612
-#: timezone/src/include/timezone/dialogs.rb:916
+#: timezone/src/include/timezone/dialogs.rb:611
+#: timezone/src/include/timezone/dialogs.rb:915
msgid "Date and Time (NTP is configured)"
msgstr ""
#. frame label
#. frame label
-#: timezone/src/include/timezone/dialogs.rb:614
-#: timezone/src/include/timezone/dialogs.rb:699
-#: timezone/src/include/timezone/dialogs.rb:918
+#: timezone/src/include/timezone/dialogs.rb:613
+#: timezone/src/include/timezone/dialogs.rb:698
+#: timezone/src/include/timezone/dialogs.rb:917
msgid "Date and Time"
msgstr ""
#. check box label
-#: timezone/src/include/timezone/dialogs.rb:630
+#: timezone/src/include/timezone/dialogs.rb:629
msgid "&Hardware Clock Set to UTC"
msgstr ""
#. label text
#. label text
-#: timezone/src/include/timezone/dialogs.rb:656
-#: timezone/src/include/timezone/dialogs.rb:690
+#: timezone/src/include/timezone/dialogs.rb:655
+#: timezone/src/include/timezone/dialogs.rb:689
msgid "&Region"
msgstr ""
-#: timezone/src/include/timezone/dialogs.rb:663
-#: timezone/src/include/timezone/dialogs.rb:694
+#: timezone/src/include/timezone/dialogs.rb:662
+#: timezone/src/include/timezone/dialogs.rb:693
msgid "Time &Zone"
msgstr ""
-#: timezone/src/include/timezone/dialogs.rb:675
+#: timezone/src/include/timezone/dialogs.rb:674
msgid "Date and Time:"
msgstr ""
#. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:797
+#: timezone/src/include/timezone/dialogs.rb:796
msgid ""
"\n"
"<p><b><big>Time Zone and Clock Settings</big></b></p>"
msgstr ""
#. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:799
+#: timezone/src/include/timezone/dialogs.rb:798
msgid ""
"<p>\n"
"To select the time zone to use in your system, first select the <b>Region</"
@@ -856,7 +856,7 @@
msgstr ""
#. general help trailer
-#: timezone/src/include/timezone/dialogs.rb:816
+#: timezone/src/include/timezone/dialogs.rb:815
msgid ""
"<p>\n"
"If the current time is not correct, use <b>Change</b> to adjust it.\n"
@@ -864,34 +864,34 @@
msgstr ""
#. Screen title for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:826
+#: timezone/src/include/timezone/dialogs.rb:825
msgid "Clock and Time Zone"
msgstr ""
#. popup text
-#: timezone/src/include/timezone/dialogs.rb:951
+#: timezone/src/include/timezone/dialogs.rb:950
msgid "Select a valid time zone."
msgstr ""
#. 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:764 timezone/src/modules/Timezone.rb:1000
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:768 timezone/src/modules/Timezone.rb:1004
msgid "Hardware Clock Set To"
msgstr ""
#. summary label
-#: timezone/src/modules/Timezone.rb:771
+#: timezone/src/modules/Timezone.rb:782
msgid "NTP configured"
msgstr ""
#. summary label
-#: timezone/src/modules/Timezone.rb:997
+#: timezone/src/modules/Timezone.rb:1008
msgid "Current Time Zone: %1"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/dhcp-server.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/dhcp-server.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/dhcp-server.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-19 01:30+0000\n"
-"PO-Revision-Date: 2017-01-19 01:30+0000\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
+"PO-Revision-Date: 2019-09-20 15:56+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
Modified: branches/SLE12-SP5/yast/50-pot/dns-server.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/dns-server.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/dns-server.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-26 01:27+0000\n"
-"PO-Revision-Date: 2016-11-26 01:27+0000\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
+"PO-Revision-Date: 2019-09-20 15:56+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -302,8 +302,7 @@
#. TRANSLATORS: commandline error message
#. Both Add and Remove defined => Error!
#: src/include/dns-server/cmdline.rb:580 src/include/dns-server/cmdline.rb:867
-#: src/include/dns-server/cmdline.rb:999
-#: src/include/dns-server/cmdline.rb:1049
+#: src/include/dns-server/cmdline.rb:999 src/include/dns-server/cmdline.rb:1049
#: src/include/dns-server/cmdline.rb:1108
#: src/include/dns-server/cmdline.rb:1244
#: src/include/dns-server/cmdline.rb:1303
@@ -374,8 +373,7 @@
#. Table header item - ACL-options
#. Table menu item - Records listing
#: src/include/dns-server/cmdline.rb:731 src/include/dns-server/cmdline.rb:743
-#: src/include/dns-server/cmdline.rb:944
-#: src/include/dns-server/cmdline.rb:1157
+#: src/include/dns-server/cmdline.rb:944 src/include/dns-server/cmdline.rb:1157
#: src/include/dns-server/dialog-main.rb:766
#: src/include/dns-server/dialog-main.rb:1359
#: src/include/dns-server/dialog-masterzone.rb:1409
@@ -452,8 +450,7 @@
#. TRANSLATORS: commandline table header item
#. TRANSLATORS: commandline table header item
#. Table header item - DNS listing zones
-#: src/include/dns-server/cmdline.rb:980
-#: src/include/dns-server/cmdline.rb:1032
+#: src/include/dns-server/cmdline.rb:980 src/include/dns-server/cmdline.rb:1032
#: src/include/dns-server/cmdline.rb:1089
#: src/include/dns-server/cmdline.rb:1220
#: src/include/dns-server/cmdline.rb:1284
Modified: branches/SLE12-SP5/yast/50-pot/docker.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/docker.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/docker.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:27+0200\n"
-"PO-Revision-Date: 2016-08-30 18:27+0200\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
+"PO-Revision-Date: 2019-09-20 15:56+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -34,16 +34,16 @@
msgid "Changes in Container"
msgstr ""
-#: src/lib/ydocker/changes_dialog.rb:79
+#: src/lib/ydocker/changes_dialog.rb:78
msgid "Path"
msgstr ""
-#: src/lib/ydocker/changes_dialog.rb:80 src/lib/ydocker/main_dialog.rb:235
+#: src/lib/ydocker/changes_dialog.rb:79 src/lib/ydocker/main_dialog.rb:240
msgid "Status"
msgstr ""
-#. TODO translation
-#: src/lib/ydocker/changes_dialog.rb:110 src/lib/ydocker/main_dialog.rb:304
+#. TODO: translation
+#: src/lib/ydocker/changes_dialog.rb:108 src/lib/ydocker/main_dialog.rb:313
msgid "&Exit"
msgstr ""
@@ -64,35 +64,35 @@
msgid "Commit Container"
msgstr ""
-#: src/lib/ydocker/commit_dialog.rb:90 src/lib/ydocker/main_dialog.rb:217
+#: src/lib/ydocker/commit_dialog.rb:89 src/lib/ydocker/main_dialog.rb:222
msgid "Repository"
msgstr ""
-#: src/lib/ydocker/commit_dialog.rb:96
+#: src/lib/ydocker/commit_dialog.rb:95
msgid "Name"
msgstr ""
-#: src/lib/ydocker/commit_dialog.rb:102 src/lib/ydocker/main_dialog.rb:218
+#: src/lib/ydocker/commit_dialog.rb:101 src/lib/ydocker/main_dialog.rb:223
msgid "Tag"
msgstr ""
-#: src/lib/ydocker/commit_dialog.rb:105
+#: src/lib/ydocker/commit_dialog.rb:104
msgid "Author"
msgstr ""
-#: src/lib/ydocker/commit_dialog.rb:106
+#: src/lib/ydocker/commit_dialog.rb:105
msgid "Message"
msgstr ""
-#: src/lib/ydocker/commit_dialog.rb:112
+#: src/lib/ydocker/commit_dialog.rb:111
#: src/lib/ydocker/inject_shell_dialog.rb:92
-#: src/lib/ydocker/run_image_dialog.rb:162
+#: src/lib/ydocker/run_image_dialog.rb:160
msgid "&Ok"
msgstr ""
-#: src/lib/ydocker/commit_dialog.rb:113
+#: src/lib/ydocker/commit_dialog.rb:112
#: src/lib/ydocker/inject_shell_dialog.rb:93
-#: src/lib/ydocker/run_image_dialog.rb:163
+#: src/lib/ydocker/run_image_dialog.rb:161
msgid "&Cancel"
msgstr ""
@@ -109,7 +109,7 @@
#. along with this program; if not, contact SUSE LLC.
#. To contact Novell about this file by physical or electronic mail,
#. you may find current contact information at www.suse.com
-#: src/lib/ydocker/inject_shell_dialog.rb:75
+#: src/lib/ydocker/inject_shell_dialog.rb:76
msgid "Inject Shell"
msgstr ""
@@ -117,114 +117,117 @@
msgid "Target Shell"
msgstr ""
-#: src/lib/ydocker/inject_shell_dialog.rb:110
+#. Note that the selected shell is not escaped here. The whole command will
+#. be escaped by Yast::Execute
+#: src/lib/ydocker/inject_shell_dialog.rb:121
msgid "Failed to run terminal. Error: %{error}"
msgstr ""
#. Only root can start process
-#: src/lib/ydocker/main_dialog.rb:74
-msgid "Docker service does not run. Should YaST start docker? Otherwise YaST quits."
+#: src/lib/ydocker/main_dialog.rb:75
+msgid ""
+"Docker service does not run. Should YaST start docker? Otherwise YaST quits."
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:78
+#: src/lib/ydocker/main_dialog.rb:80
msgid ""
-"Docker service does not run. Run this module as root or start docker service m"
-"anually."
+"Docker service does not run. \\\n"
+"Run this module as root or start docker service manually."
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:141
+#: src/lib/ydocker/main_dialog.rb:145
msgid "Communication with docker failed with error: %s. Please try again."
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:152
+#: src/lib/ydocker/main_dialog.rb:157
msgid "Do you really want to stop the running container?"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:154 src/lib/ydocker/main_dialog.rb:163
+#: src/lib/ydocker/main_dialog.rb:159 src/lib/ydocker/main_dialog.rb:168
msgid "Do you want to remove the container?"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:161
+#: src/lib/ydocker/main_dialog.rb:166
msgid "Do you really want to kill the running container?"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:173
+#: src/lib/ydocker/main_dialog.rb:178
msgid "&Images"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:174
+#: src/lib/ydocker/main_dialog.rb:179
msgid "&Containers"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:184
+#: src/lib/ydocker/main_dialog.rb:189
msgid "Docker Images"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:194
+#: src/lib/ydocker/main_dialog.rb:199
msgid "Running Docker Containers"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:219
+#: src/lib/ydocker/main_dialog.rb:224
msgid "Image ID"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:220 src/lib/ydocker/main_dialog.rb:234
+#: src/lib/ydocker/main_dialog.rb:225 src/lib/ydocker/main_dialog.rb:239
msgid "Created"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:221
+#: src/lib/ydocker/main_dialog.rb:226
msgid "Virtual Size"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:231
+#: src/lib/ydocker/main_dialog.rb:236
msgid "Container ID"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:232
+#: src/lib/ydocker/main_dialog.rb:237
msgid "Image"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:233 src/lib/ydocker/run_image_dialog.rb:127
+#: src/lib/ydocker/main_dialog.rb:238 src/lib/ydocker/run_image_dialog.rb:125
msgid "Command"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:236 src/lib/ydocker/run_image_dialog.rb:123
+#: src/lib/ydocker/main_dialog.rb:241 src/lib/ydocker/run_image_dialog.rb:121
msgid "Ports"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:283 src/lib/ydocker/main_dialog.rb:293
+#: src/lib/ydocker/main_dialog.rb:292 src/lib/ydocker/main_dialog.rb:302
msgid "Re&fresh"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:284
+#: src/lib/ydocker/main_dialog.rb:293
msgid "R&un"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:285
+#: src/lib/ydocker/main_dialog.rb:294
msgid "&Delete"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:294
+#: src/lib/ydocker/main_dialog.rb:303
msgid "S&how Changes"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:295
+#: src/lib/ydocker/main_dialog.rb:304
msgid "Inject &Terminal"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:296
+#: src/lib/ydocker/main_dialog.rb:305
msgid "&Stop Container"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:297
+#: src/lib/ydocker/main_dialog.rb:306
msgid "&Kill Container"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:298
+#: src/lib/ydocker/main_dialog.rb:307
msgid "&Commit"
msgstr ""
-#: src/lib/ydocker/main_dialog.rb:315
+#: src/lib/ydocker/main_dialog.rb:324
msgid "Do you really want to delete image \"%s\"?"
msgstr ""
@@ -241,42 +244,42 @@
#. along with this program; if not, contact SUSE LLC.
#. To contact Novell about this file by physical or electronic mail,
#. you may find current contact information at www.suse.com
-#: src/lib/ydocker/run_image_dialog.rb:90
+#: src/lib/ydocker/run_image_dialog.rb:89
msgid "Run Container"
msgstr ""
-#: src/lib/ydocker/run_image_dialog.rb:100
+#: src/lib/ydocker/run_image_dialog.rb:99
msgid "Host"
msgstr ""
-#: src/lib/ydocker/run_image_dialog.rb:101
+#: src/lib/ydocker/run_image_dialog.rb:100
msgid "Container"
msgstr ""
-#: src/lib/ydocker/run_image_dialog.rb:108
+#: src/lib/ydocker/run_image_dialog.rb:107
msgid "Add"
msgstr ""
-#: src/lib/ydocker/run_image_dialog.rb:112
+#: src/lib/ydocker/run_image_dialog.rb:111
msgid "Remove"
msgstr ""
-#: src/lib/ydocker/run_image_dialog.rb:122
+#: src/lib/ydocker/run_image_dialog.rb:120
msgid "Volumes"
msgstr ""
-#: src/lib/ydocker/run_image_dialog.rb:168
+#: src/lib/ydocker/run_image_dialog.rb:166
msgid "Choose directory to share"
msgstr ""
-#: src/lib/ydocker/run_image_dialog.rb:173
+#: src/lib/ydocker/run_image_dialog.rb:171
msgid "Choose target directory"
msgstr ""
-#: src/lib/ydocker/run_image_dialog.rb:200
+#: src/lib/ydocker/run_image_dialog.rb:198
msgid "Choose external port"
msgstr ""
-#: src/lib/ydocker/run_image_dialog.rb:201
+#: src/lib/ydocker/run_image_dialog.rb:199
msgid "Choose internal port"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/drbd.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/drbd.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/drbd.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-13 20:09+0200\n"
-"PO-Revision-Date: 2016-09-13 20:09+0200\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
+"PO-Revision-Date: 2019-09-20 15:56+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -142,19 +142,23 @@
msgstr ""
#. encoding: utf-8
-#: src/include/drbd/global_conf.rb:36
+#: src/include/drbd/global_conf.rb:42
msgid "Global Configuration of DRBD"
msgstr ""
-#: src/include/drbd/global_conf.rb:42
+#: src/include/drbd/global_conf.rb:48
msgid "Minor Count"
msgstr ""
-#: src/include/drbd/global_conf.rb:51
+#: src/include/drbd/global_conf.rb:57
msgid "Dialog Refresh"
msgstr ""
-#: src/include/drbd/global_conf.rb:61
+#: src/include/drbd/global_conf.rb:67
+msgid "Udev Always Use VNR"
+msgstr ""
+
+#: src/include/drbd/global_conf.rb:75
msgid "Disable IP Verification"
msgstr ""
@@ -337,40 +341,45 @@
#: src/include/drbd/helps.rb:136
msgid ""
+"<p>Check <b>\"Udev Always Use VNR\"</b> treat implicit define volume number "
+"the same as explicit volumes. When udev asks drbdadm for a list of device "
+"related symlinks, drbdadm would suggest symlinks with differing naming "
+"conventions, depending on whether the resource has explicit volume VNR { } "
+"definitions or only one single volume with the implicit volume number 0.This "
+"is enable by default, should be off for legacy backward compatibility.</p>"
+msgstr ""
+
+#: src/include/drbd/helps.rb:144
+msgid ""
"<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's "
"sanity check</p>"
msgstr ""
-#: src/include/drbd/helps.rb:139
+#: src/include/drbd/helps.rb:147
msgid ""
"<p><b>Dialog Refresh:</b> The user dialog counts and displays the seconds it "
-"waited so\n"
-" far. You might want to disable this if you have the console\n"
-" of your server connected to a serial terminal server with\n"
-" limited logging capacity.\n"
-" The Dialog will print the count each 'dialog-refresh' "
-"seconds,\n"
-" set it to 0 to disable redrawing completely. </p>"
+"waited so far. You might want to disable this if you have the console of "
+"your server connected to a serial terminal server with limited logging "
+"capacity. The Dialog will print the count each 'dialog-refresh' seconds, set "
+"it to 0 to disable redrawing completely. </p>"
msgstr ""
-#: src/include/drbd/helps.rb:147
+#: src/include/drbd/helps.rb:154
msgid ""
-"<p><b>Minor Count:</b>\n"
-" use this if you want to define more resources later\n"
-" without reloading the module.\n"
-" by default we load the module with exactly as many devices\n"
-" as configured mentioned in this file. </p>"
+"<p><b>Minor Count:</b> use this if you want to define more resources later "
+"without reloading the module. by default we load the module with exactly as "
+"many devices as configured mentioned in this file. </p>"
msgstr ""
#. Summary dialog help 1/3
-#: src/include/drbd/helps.rb:155
+#: src/include/drbd/helps.rb:160
msgid ""
"<p><b><big>DRBD Configuration</big></b><br>\n"
"Configure drbd here.<br></p>\n"
msgstr ""
#. Summary dialog help 2/3
-#: src/include/drbd/helps.rb:159
+#: src/include/drbd/helps.rb:164
msgid ""
"<p><b><big>Adding a drbd:</big></b><br>\n"
"Choose an drbd from the list of detected drbds.\n"
@@ -379,7 +388,7 @@
msgstr ""
#. Summary dialog help 3/3
-#: src/include/drbd/helps.rb:166
+#: src/include/drbd/helps.rb:171
msgid ""
"<p><b><big>Editing or Deleting:</big></b><br>\n"
"If you press <b>Edit</b>, an additional dialog in which to change\n"
@@ -387,7 +396,7 @@
msgstr ""
#. Ovreview dialog help 1/3
-#: src/include/drbd/helps.rb:172
+#: src/include/drbd/helps.rb:177
msgid ""
"<p><b><big>DRBD Configuration Overview</big></b><br>\n"
"Obtain an overview of installed drbds. Additionally\n"
@@ -395,14 +404,14 @@
msgstr ""
#. Ovreview dialog help 2/3
-#: src/include/drbd/helps.rb:178
+#: src/include/drbd/helps.rb:183
msgid ""
"<p><b><big>Adding a drbd:</big></b><br>\n"
"Press <b>Add</b> to configure a drbd.</p>"
msgstr ""
#. Ovreview dialog help 3/3
-#: src/include/drbd/helps.rb:182
+#: src/include/drbd/helps.rb:187
msgid ""
"<p><b><big>Editing or Deleting:</big></b><br>\n"
"Choose a drbd to change or remove.\n"
@@ -410,7 +419,7 @@
msgstr ""
#. Configure1 dialog help 1/2
-#: src/include/drbd/helps.rb:188
+#: src/include/drbd/helps.rb:193
msgid ""
"<p><b><big>Configuration Part One</big></b><br>\n"
"Press <b>Next</b> to continue.\n"
@@ -419,7 +428,7 @@
#. Configure1 dialog help 2/2
#. Configure2 dialog help 2/2
-#: src/include/drbd/helps.rb:194 src/include/drbd/helps.rb:206
+#: src/include/drbd/helps.rb:199 src/include/drbd/helps.rb:211
msgid ""
"<p><b><big>Selecting Something</big></b><br>\n"
"It is not possible. You must code it first. :-)\n"
@@ -427,7 +436,7 @@
msgstr ""
#. Configure2 dialog help 1/2
-#: src/include/drbd/helps.rb:200
+#: src/include/drbd/helps.rb:205
msgid ""
"<p><b><big>Configuration Part Two</big></b><br>\n"
"Press <b>Next</b> to continue.\n"
Modified: branches/SLE12-SP5/yast/50-pot/fcoe-client.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/fcoe-client.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/fcoe-client.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:27+0200\n"
-"PO-Revision-Date: 2016-08-30 18:27+0200\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
+"PO-Revision-Date: 2019-09-20 15:56+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -55,37 +55,37 @@
msgstr ""
#. FCoE is not available on the interface
-#: src/include/fcoe-client/complex.rb:195
+#: src/include/fcoe-client/complex.rb:194
msgid "not available"
msgstr ""
#. the interface is not configured for FCoE
-#: src/include/fcoe-client/complex.rb:197
+#: src/include/fcoe-client/complex.rb:196
msgid "not configured"
msgstr ""
#. the flag is 'true'
-#: src/include/fcoe-client/complex.rb:203
+#: src/include/fcoe-client/complex.rb:202
msgid "true"
msgstr ""
#. the flag is 'false'
-#: src/include/fcoe-client/complex.rb:205
+#: src/include/fcoe-client/complex.rb:204
msgid "false"
msgstr ""
#. the flag is not set at all
-#: src/include/fcoe-client/complex.rb:207
+#: src/include/fcoe-client/complex.rb:206
msgid "not set"
msgstr ""
#. headline of the edit dialog - configuration of values for a certain network interface
-#: src/include/fcoe-client/complex.rb:306
+#: src/include/fcoe-client/complex.rb:305
msgid "Configuration of VLAN interface %1 on %2"
msgstr ""
#. text of an error popup
-#: src/include/fcoe-client/complex.rb:368
+#: src/include/fcoe-client/complex.rb:366
msgid ""
"Cannot start FCoE on VLAN interface %1\n"
"because FCoE is already configured on\n"
@@ -93,7 +93,7 @@
msgstr ""
#. text of an error popup
-#: src/include/fcoe-client/complex.rb:383
+#: src/include/fcoe-client/complex.rb:378
msgid ""
"Cannot start FCoE on network interface %1 itself\n"
"because FCoE is already configured on\n"
@@ -101,12 +101,12 @@
msgstr ""
#. headline of a popup: creating and starting Fibre Channel over Ethernet
-#: src/include/fcoe-client/complex.rb:417
+#: src/include/fcoe-client/complex.rb:409
msgid "Creating and Starting FCoE on Detected VLAN Device"
msgstr ""
#. question to the user: really create and start FCoE
-#: src/include/fcoe-client/complex.rb:420
+#: src/include/fcoe-client/complex.rb:412
msgid ""
"Do you really want to create a FCoE network\n"
"interface for discovered VLAN interface %1\n"
@@ -114,28 +114,28 @@
msgstr ""
#. text of an error popup
-#: src/include/fcoe-client/complex.rb:443
+#: src/include/fcoe-client/complex.rb:432
msgid "Cannot create and start FCoE on %1."
msgstr ""
#. text of an error popup: command failed on the network interface
-#: src/include/fcoe-client/complex.rb:480
+#: src/include/fcoe-client/complex.rb:465
msgid "Command \"%1\" on %2 failed."
msgstr ""
-#: src/include/fcoe-client/complex.rb:488
+#: src/include/fcoe-client/complex.rb:473
msgid ""
"Creating FCoE interface failed.\n"
"Continue because running in test mode"
msgstr ""
#. popup text: really remove FCoE VLAN interface
-#: src/include/fcoe-client/complex.rb:583
+#: src/include/fcoe-client/complex.rb:568
msgid "Do you really want to remove the FCoE interface %1?"
msgstr ""
#. popup text continues
-#: src/include/fcoe-client/complex.rb:591
+#: src/include/fcoe-client/complex.rb:576
msgid ""
"Attention:\n"
"Make sure the interface is not essential for a used device.\n"
@@ -143,30 +143,30 @@
msgstr ""
#. popup text continues
-#: src/include/fcoe-client/complex.rb:601
+#: src/include/fcoe-client/complex.rb:586
msgid ""
"Don't remove the interface if it's related\n"
"to an already activated multipath device."
msgstr ""
#. replace values in table
-#: src/include/fcoe-client/complex.rb:750
+#: src/include/fcoe-client/complex.rb:735
msgid "Removing of interface %1 failed."
msgstr ""
-#: src/include/fcoe-client/complex.rb:762
+#: src/include/fcoe-client/complex.rb:747
msgid "Destroying interface %1 failed."
msgstr ""
#. text of a warning popup
-#: src/include/fcoe-client/complex.rb:794
+#: src/include/fcoe-client/complex.rb:777
msgid ""
"DCB Required is set to \"yes\" but the\n"
"interface isn't DCB capable."
msgstr ""
#. text of an information (notify) popup
-#: src/include/fcoe-client/complex.rb:831
+#: src/include/fcoe-client/complex.rb:814
msgid ""
"Service 'fcoe' requires enabled service 'lldpad'.\n"
"Enabling start on boot of service 'lldpad'."
@@ -367,24 +367,24 @@
#. Services dialog help 1/3
#: src/include/fcoe-client/helps.rb:71
msgid ""
-"<p><b><big>Starting of services</big><br></b><br>Enable or disable the start o"
-"f the services <b>fcoe</b> and <b>lldpad</b> at boot time.</p>"
+"<p><b><big>Starting of services</big><br></b><br>Enable or disable the start "
+"of the services <b>fcoe</b> and <b>lldpad</b> at boot time.</p>"
msgstr ""
#. Services dialog help 2/3
#: src/include/fcoe-client/helps.rb:76
msgid ""
-"<p>Starting the service <b>fcoe</b> means starting the <i>Fibre Channel over E"
-"thernet</i> service daemon <i>fcoemon</i> which controls the FCoE interfaces a"
-"nd establishes a connection with the daemon <i>lldpad</i>.</p>"
+"<p>Starting the service <b>fcoe</b> means starting the <i>Fibre Channel over "
+"Ethernet</i> service daemon <i>fcoemon</i> which controls the FCoE "
+"interfaces and establishes a connection with the daemon <i>lldpad</i>.</p>"
msgstr ""
#. Services dialog help 3/3
#: src/include/fcoe-client/helps.rb:82
msgid ""
-"<p>The <b>lldpad</b> service provides the <i>Link Layer Discovery Protocol</i>"
-" agent daemon <i>lldpad</i>, which informs <i>fcoemon</i> about DCB (Data Cent"
-"er Bridging) features and configuration of the interfaces.</p>"
+"<p>The <b>lldpad</b> service provides the <i>Link Layer Discovery Protocol</"
+"i> agent daemon <i>lldpad</i>, which informs <i>fcoemon</i> about DCB (Data "
+"Center Bridging) features and configuration of the interfaces.</p>"
msgstr ""
#. Interfaces dialog help 1/5
@@ -395,35 +395,36 @@
#. Interfaces dialog help 2/5
#: src/include/fcoe-client/helps.rb:92
msgid ""
-"<p>The interfaces dialog shows all detected netcards including the status of V"
-"LAN and FCoE configuration.<br>FCoE is possible if a VLAN interface is configu"
-"red for FCoE on the switch.<br>For every netcard (network interface), this is "
-"shown in column <i>FCoE VLAN Interface</i>.</p>"
+"<p>The interfaces dialog shows all detected netcards including the status of "
+"VLAN and FCoE configuration.<br>FCoE is possible if a VLAN interface is "
+"configured for FCoE on the switch.<br>For every netcard (network interface), "
+"this is shown in column <i>FCoE VLAN Interface</i>.</p>"
msgstr ""
#. Interfaces dialog help 3/5
#: src/include/fcoe-client/helps.rb:99
msgid ""
-"<p>It's possible to retry the check for FCoE services by using <b>Retry Detect"
-"ion</b>(might be required for interfaces needing some time to get up).</p>"
+"<p>It's possible to retry the check for FCoE services by using <b>Retry "
+"Detection</b>(might be required for interfaces needing some time to get up)."
+"</p>"
msgstr ""
#. Interfaces dialog help 4/5
#: src/include/fcoe-client/helps.rb:103
msgid ""
-"<p>The values for <i>FCoE VLAN Interface</i> in detail:<br><b>not available</b"
-">: Fibre Channel over Ethernet is not possible (must be enabled on the switch "
-"first).<br><b>not configured</b>: FCoE is possible but not yet activated.<br>P"
-"ress <b>Create FCoE VLAN Interface</b> to activate.<br>If the FCoE VLAN interf"
-"ace has already been created, the name is shown in the column, e.g. eth3.200.<"
-"/p>"
+"<p>The values for <i>FCoE VLAN Interface</i> in detail:<br><b>not available</"
+"b>: Fibre Channel over Ethernet is not possible (must be enabled on the "
+"switch first).<br><b>not configured</b>: FCoE is possible but not yet "
+"activated.<br>Press <b>Create FCoE VLAN Interface</b> to activate.<br>If the "
+"FCoE VLAN interface has already been created, the name is shown in the "
+"column, e.g. eth3.200.</p>"
msgstr ""
#. Interfaces dialog help 4/5
#: src/include/fcoe-client/helps.rb:113
msgid ""
-"<p>To change the configuration of a FCoE VLAN interface, click on <b>Change Se"
-"ttings</b>.</p>"
+"<p>To change the configuration of a FCoE VLAN interface, click on <b>Change "
+"Settings</b>.</p>"
msgstr ""
#. Configuration dialog help 1/3
@@ -434,18 +435,18 @@
#. Configuration dialog help 2/3
#: src/include/fcoe-client/helps.rb:121
msgid ""
-"<p>Configure the general settings for the FCoE system service. The settings ar"
-"e written to '/etc/fcoe/config'.</p>"
+"<p>Configure the general settings for the FCoE system service. The settings "
+"are written to '/etc/fcoe/config'.</p>"
msgstr ""
#. Configuration dialog help 3/3
#: src/include/fcoe-client/helps.rb:125
msgid ""
"<p>The values are:<br>\n"
-"<b>Debug</b>: <i>yes</i> or <i>no</i><br>This is used to enable or disable deb"
-"ugging messages from the fcoe service script and <i>fcoemon</i>.<br><b>Use sys"
-"log</b>: <i>yes</i> or <i>no</i><br>Messages are sent to the system log if set"
-" to <i>yes</i> (data are logged to /var/log/messages).</p>"
+"<b>Debug</b>: <i>yes</i> or <i>no</i><br>This is used to enable or disable "
+"debugging messages from the fcoe service script and <i>fcoemon</i>."
+"<br><b>Use syslog</b>: <i>yes</i> or <i>no</i><br>Messages are sent to the "
+"system log if set to <i>yes</i> (data are logged to /var/log/messages).</p>"
msgstr ""
#. edit dialog help 1/3
@@ -456,19 +457,19 @@
#. Edit dialog help 2/3
#: src/include/fcoe-client/helps.rb:137
msgid ""
-"<p>The daemon <i>fcoemon</i> reads these configuration files on initialization"
-".<br>There is a file for every interface and the values indicate whether FCoE "
-"instances should be created and if DCB is required.</p>"
+"<p>The daemon <i>fcoemon</i> reads these configuration files on "
+"initialization.<br>There is a file for every interface and the values "
+"indicate whether FCoE instances should be created and if DCB is required.</p>"
msgstr ""
#. Edit dialog help 3/3
#: src/include/fcoe-client/helps.rb:143
msgid ""
-"<p>The values are:<br><b>FCoE Enable</b>: <i>yes</i> or <i>no</i><br>Enable or"
-" disable the creation of FCoE instances.<br><b>DCB Required</b>: <i>yes</i> or"
-" <i>no</i><br>The default is <i>yes</i>, DCB is usually required.<br><b>AUTO V"
-"LAN</b>: <i>yes</i> or <i>no</i><br>If set to <i>yes</i> 'fcoemon' will create"
-" the VLAN interfaces automatically.</p>"
+"<p>The values are:<br><b>FCoE Enable</b>: <i>yes</i> or <i>no</i><br>Enable "
+"or disable the creation of FCoE instances.<br><b>DCB Required</b>: <i>yes</"
+"i> or <i>no</i><br>The default is <i>yes</i>, DCB is usually required."
+"<br><b>AUTO VLAN</b>: <i>yes</i> or <i>no</i><br>If set to <i>yes</i> "
+"'fcoemon' will create the VLAN interfaces automatically.</p>"
msgstr ""
#. Header of tab in tab widget
@@ -512,44 +513,44 @@
#. don't check interactively for packages (bnc#367300) -> comment from iscsi-client
#. skip it during initial and second stage or when create AY profile
-#: src/modules/FcoeClient.rb:413
+#: src/modules/FcoeClient.rb:435
msgid ""
-"<p>To continue the FCoE configuration, the <b>%1</b> package must be installed"
-".</p>"
+"<p>To continue the FCoE configuration, the <b>%1</b> package must be "
+"installed.</p>"
msgstr ""
-#: src/modules/FcoeClient.rb:416
+#: src/modules/FcoeClient.rb:438
msgid "<p>Install it now?</p>"
msgstr ""
#. start service lldpad first
-#: src/modules/FcoeClient.rb:859
+#: src/modules/FcoeClient.rb:880
msgid "Cannot start service 'lldpad'"
msgstr ""
-#: src/modules/FcoeClient.rb:868
+#: src/modules/FcoeClient.rb:889
msgid "Cannot start service 'fcoe'"
msgstr ""
#. first start lldpad
-#: src/modules/FcoeClient.rb:888
+#: src/modules/FcoeClient.rb:909
msgid "Cannot start lldpad systemd socket"
msgstr ""
-#: src/modules/FcoeClient.rb:901
+#: src/modules/FcoeClient.rb:922
msgid "Cannot start lldpad service."
msgstr ""
-#: src/modules/FcoeClient.rb:913
+#: src/modules/FcoeClient.rb:934
msgid "Cannot start fcoemon systemd socket."
msgstr ""
-#: src/modules/FcoeClient.rb:926
+#: src/modules/FcoeClient.rb:947
msgid "Cannot start fcoe service."
msgstr ""
#. warning if no valid configuration found
-#: src/modules/FcoeClient.rb:1092
+#: src/modules/FcoeClient.rb:1115
msgid ""
"Cannot read config file for %1.\n"
"You may edit the settings and recreate the FCoE\n"
@@ -557,154 +558,154 @@
msgstr ""
#. FcoeClient read dialog caption
-#: src/modules/FcoeClient.rb:1457
+#: src/modules/FcoeClient.rb:1406
msgid "Initializing fcoe-client Configuration"
msgstr ""
#. Progress stage 1/3
-#: src/modules/FcoeClient.rb:1472
+#: src/modules/FcoeClient.rb:1421
msgid "Check installed packages"
msgstr ""
#. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1474
+#: src/modules/FcoeClient.rb:1423
msgid "Check services"
msgstr ""
#. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1476
+#: src/modules/FcoeClient.rb:1425
msgid "Detect network cards"
msgstr ""
#. Progress stage 4/4
-#: src/modules/FcoeClient.rb:1478
+#: src/modules/FcoeClient.rb:1427
msgid "Read /etc/fcoe/config"
msgstr ""
#. Progress step 1/3
-#: src/modules/FcoeClient.rb:1482
+#: src/modules/FcoeClient.rb:1431
msgid "Checking for installed packages..."
msgstr ""
#. Progress step 2/3
-#: src/modules/FcoeClient.rb:1484
+#: src/modules/FcoeClient.rb:1433
msgid "Checking for services..."
msgstr ""
#. Progress step 3/3
-#: src/modules/FcoeClient.rb:1486
+#: src/modules/FcoeClient.rb:1435
msgid "Detecting network cards..."
msgstr ""
#. Progress step 4/4
-#: src/modules/FcoeClient.rb:1488
+#: src/modules/FcoeClient.rb:1437
msgid "Reading /etc/fcoe/config"
msgstr ""
#. Progress finished
#. Progress finished
-#: src/modules/FcoeClient.rb:1490 src/modules/FcoeClient.rb:1584
+#: src/modules/FcoeClient.rb:1439 src/modules/FcoeClient.rb:1533
msgid "Finished"
msgstr ""
#. Error message
-#: src/modules/FcoeClient.rb:1516
+#: src/modules/FcoeClient.rb:1465
msgid "Starting of services failed."
msgstr ""
#. Error message
-#: src/modules/FcoeClient.rb:1529
+#: src/modules/FcoeClient.rb:1478
msgid "Cannot detect devices."
msgstr ""
#. Error message
-#: src/modules/FcoeClient.rb:1539
+#: src/modules/FcoeClient.rb:1488
msgid "Cannot read /etc/fcoe/config."
msgstr ""
#. FcoeClient read dialog caption
-#: src/modules/FcoeClient.rb:1555
+#: src/modules/FcoeClient.rb:1504
msgid "Saving fcoe-client Configuration"
msgstr ""
#. Progress stage 1/2
-#: src/modules/FcoeClient.rb:1570
+#: src/modules/FcoeClient.rb:1519
msgid "Write the settings"
msgstr ""
#. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1572
+#: src/modules/FcoeClient.rb:1521
msgid "Restart FCoE service"
msgstr ""
#. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1574
+#: src/modules/FcoeClient.rb:1523
msgid "Adjust start of services"
msgstr ""
#. Progress step 1/2
-#: src/modules/FcoeClient.rb:1578
+#: src/modules/FcoeClient.rb:1527
msgid "Writing the settings..."
msgstr ""
#. Progress step 2/3
-#: src/modules/FcoeClient.rb:1580
+#: src/modules/FcoeClient.rb:1529
msgid "Restarting FCoE service..."
msgstr ""
#. Progress sstep 3/3
-#: src/modules/FcoeClient.rb:1582
+#: src/modules/FcoeClient.rb:1531
msgid "Adjusting start of services..."
msgstr ""
#. Error message
-#: src/modules/FcoeClient.rb:1602
+#: src/modules/FcoeClient.rb:1551
msgid "Cannot write settings to /etc/fcoe/config."
msgstr ""
-#: src/modules/FcoeClient.rb:1608
+#: src/modules/FcoeClient.rb:1557
msgid ""
"Cannot write settings for FCoE interfaces.\n"
"For details, see /var/log/YaST2/y2log."
msgstr ""
#. Error message
-#: src/modules/FcoeClient.rb:1620
+#: src/modules/FcoeClient.rb:1569
msgid "Restarting of service fcoe failed."
msgstr ""
#. Error message
-#: src/modules/FcoeClient.rb:1627
+#: src/modules/FcoeClient.rb:1576
msgid "Cannot write /etc/sysconfig/network/ifcfg-files."
msgstr ""
#. Configuration summary text for autoyast
-#: src/modules/FcoeClient.rb:1684
+#: src/modules/FcoeClient.rb:1633
msgid "<b>General FCoE configuration</b>"
msgstr ""
#. options from config file, not meant for translation
-#: src/modules/FcoeClient.rb:1698
+#: src/modules/FcoeClient.rb:1647
msgid "<b>Interfaces</b>"
msgstr ""
#. network card, e.g. eth0
-#: src/modules/FcoeClient.rb:1706
+#: src/modules/FcoeClient.rb:1655
msgid "<i>Netcard</i>:"
msgstr ""
#. nothing to translate here (abbreviation for
#. Fibre Channel over Ethernet Virtual LAN interface)
-#: src/modules/FcoeClient.rb:1716
+#: src/modules/FcoeClient.rb:1665
msgid "<b>Starting of services</b>"
msgstr ""
#. starting of service "fcoe" at boot time is enabled or disabled
#. starting of service "lldpad" at boot time is enabled or disabled
-#: src/modules/FcoeClient.rb:1724 src/modules/FcoeClient.rb:1734
+#: src/modules/FcoeClient.rb:1673 src/modules/FcoeClient.rb:1683
msgid "enabled"
msgstr ""
-#: src/modules/FcoeClient.rb:1725 src/modules/FcoeClient.rb:1735
+#: src/modules/FcoeClient.rb:1674 src/modules/FcoeClient.rb:1684
msgid "disabled"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/firewall-services.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/firewall-services.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/firewall-services.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -24,7 +24,8 @@
#. TRANSLATORS: Description of a Service (File name: avahi, RPM: avahi), used as a common label or an item in table
#: library/network/src/yast2-services-translations.rb:40
-msgid "Zeroconf/Bonjour Multicast DNS (mDNS) ports for Service Discovery (DNS-SD)"
+msgid ""
+"Zeroconf/Bonjour Multicast DNS (mDNS) ports for Service Discovery (DNS-SD)"
msgstr ""
#. TRANSLATORS: Name of Service (File name: cyrus-imapd, RPM: cyrus-imapd), can be used as check box, item in multiple selection box...
@@ -119,8 +120,8 @@
#. TRANSLATORS: Description of a Service (File name: nfs-client, RPM: nfs-client), used as a common label or an item in table
#: library/network/src/yast2-services-translations.rb:106
msgid ""
-"Firewall configuration for NFS client. Open ports for NFS client to allow conn"
-"ection to an NFS server."
+"Firewall configuration for NFS client. Open ports for NFS client to allow "
+"connection to an NFS server."
msgstr ""
#. TRANSLATORS: Name of Service (File name: nfs-kernel-server, RPM: nfs-kernel-server), can be used as check box, item in multiple selection box...
@@ -131,8 +132,8 @@
#. TRANSLATORS: Description of a Service (File name: nfs-kernel-server, RPM: nfs-kernel-server), used as a common label or an item in table
#: library/network/src/yast2-services-translations.rb:114
msgid ""
-"Firewall configuration for NFS kernel server. Open ports for NFS to allow othe"
-"r hosts to connect."
+"Firewall configuration for NFS kernel server. Open ports for NFS to allow "
+"other hosts to connect."
msgstr ""
#. TRANSLATORS: Name of Service (File name: ntp, RPM: ntp), can be used as check box, item in multiple selection box...
Modified: branches/SLE12-SP5/yast/50-pot/firewall.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/firewall.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/firewall.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-11 02:28+0000\n"
-"PO-Revision-Date: 2017-04-11 02:28+0000\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
+"PO-Revision-Date: 2019-09-20 15:56+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -19,11 +19,11 @@
#. We can't do ncurces. Lets see if the firewalld-config
#. is installed
-#: src/clients/firewall.rb:70
+#: src/clients/firewall.rb:71
msgid "Your display can't support the 'firewall-config' UI.\n"
msgstr ""
-#: src/clients/firewall.rb:71
+#: src/clients/firewall.rb:72
msgid "Either use the Yast2 command line or the 'firewall-cmd' utility."
msgstr ""
@@ -568,7 +568,7 @@
#. TRANSLATORS: combo box
#. TRANSLATORS: select box
#: src/include/firewall/subdialogs.rb:280
-#: src/include/firewall/uifunctions.rb:886
+#: src/include/firewall/uifunctions.rb:885
msgid "&Service to Allow"
msgstr ""
@@ -717,7 +717,7 @@
#. TRANSLATORS: select box
#: src/include/firewall/subdialogs.rb:573
#: src/include/firewall/subdialogs.rb:1092
-#: src/include/firewall/uifunctions.rb:2001
+#: src/include/firewall/uifunctions.rb:2003
msgid "&Protocol"
msgstr ""
@@ -1185,12 +1185,12 @@
msgstr ""
#. TRANSLATORS: popup headline
-#: src/include/firewall/uifunctions.rb:657
+#: src/include/firewall/uifunctions.rb:656
msgid "Invalid Additional Service Definition"
msgstr ""
#. TRANSLATORS: popup message, %1 stands for the wrong settings (might be quite long)
-#: src/include/firewall/uifunctions.rb:660
+#: src/include/firewall/uifunctions.rb:659
msgid ""
"It appears that the additional service settings\n"
"%1\n"
@@ -1204,23 +1204,23 @@
#. )
#. (!IsThisExpertConfiguration() ?
#. TRANSLATORS: informative label
-#: src/include/firewall/uifunctions.rb:1056
+#: src/include/firewall/uifunctions.rb:1058
msgid ""
"Masquerading needs at least one external interface and one other interface."
msgstr ""
#. TRANSLATORS: popup message
-#: src/include/firewall/uifunctions.rb:1077
+#: src/include/firewall/uifunctions.rb:1079
msgid "This entry must be completed."
msgstr ""
#. TRANSLATORS: popup message, right port definition is two lines below this message
-#: src/include/firewall/uifunctions.rb:1101
+#: src/include/firewall/uifunctions.rb:1103
msgid "Wrong port definition."
msgstr ""
#. TRANSLATORS: popup error message
-#: src/include/firewall/uifunctions.rb:1128
+#: src/include/firewall/uifunctions.rb:1130
msgid ""
"Wrong port definition.\n"
"No port number found for this port name.\n"
@@ -1228,17 +1228,17 @@
msgstr ""
#. TRANSLATORS: popup message, right definition is two lines below this message
-#: src/include/firewall/uifunctions.rb:1157
+#: src/include/firewall/uifunctions.rb:1159
msgid "Invalid IP definition."
msgstr ""
#. TRANSLATORS: check box
-#: src/include/firewall/uifunctions.rb:1484
+#: src/include/firewall/uifunctions.rb:1486
msgid "&Log Not Accepted Broadcast Packets"
msgstr ""
#. TRANSLATORS: popup question
-#: src/include/firewall/uifunctions.rb:1545
+#: src/include/firewall/uifunctions.rb:1547
msgid ""
"Firewall automatic starting has been disabled\n"
"but firewall is currently running.\n"
@@ -1247,71 +1247,71 @@
msgstr ""
#. network is mandatory
-#: src/include/firewall/uifunctions.rb:1724
-#: src/include/firewall/uifunctions.rb:1931
+#: src/include/firewall/uifunctions.rb:1726
+#: src/include/firewall/uifunctions.rb:1933
msgid "Invalid network definition '%1'"
msgstr ""
#. destination port is optional
#. source port is optional
-#: src/include/firewall/uifunctions.rb:1742
-#: src/include/firewall/uifunctions.rb:1773
+#: src/include/firewall/uifunctions.rb:1744
+#: src/include/firewall/uifunctions.rb:1775
msgid "Invalid port range '%1'"
msgstr ""
-#: src/include/firewall/uifunctions.rb:1754
-#: src/include/firewall/uifunctions.rb:1785
-#: src/include/firewall/uifunctions.rb:1945
+#: src/include/firewall/uifunctions.rb:1756
+#: src/include/firewall/uifunctions.rb:1787
+#: src/include/firewall/uifunctions.rb:1947
msgid "Invalid port name or number '%1'"
msgstr ""
-#: src/include/firewall/uifunctions.rb:1848
+#: src/include/firewall/uifunctions.rb:1850
msgid "All services using UDP"
msgstr ""
-#: src/include/firewall/uifunctions.rb:1850
+#: src/include/firewall/uifunctions.rb:1852
msgid "All services using TCP"
msgstr ""
-#: src/include/firewall/uifunctions.rb:1852
+#: src/include/firewall/uifunctions.rb:1854
msgid "Samba browsing"
msgstr ""
-#: src/include/firewall/uifunctions.rb:1854
+#: src/include/firewall/uifunctions.rb:1856
msgid "SLP browsing"
msgstr ""
-#: src/include/firewall/uifunctions.rb:1866
+#: src/include/firewall/uifunctions.rb:1868
msgid "All networks"
msgstr ""
-#: src/include/firewall/uifunctions.rb:1868
+#: src/include/firewall/uifunctions.rb:1870
msgid "Subnet: %1"
msgstr ""
#. hard-coded default
-#: src/include/firewall/uifunctions.rb:1973
+#: src/include/firewall/uifunctions.rb:1975
msgid "&Zone"
msgstr ""
-#: src/include/firewall/uifunctions.rb:1977
+#: src/include/firewall/uifunctions.rb:1979
msgid "&Network"
msgstr ""
-#: src/include/firewall/uifunctions.rb:1984
+#: src/include/firewall/uifunctions.rb:1986
msgid "&Service"
msgstr ""
-#: src/include/firewall/uifunctions.rb:1990
+#: src/include/firewall/uifunctions.rb:1992
msgid "User-defined service"
msgstr ""
-#: src/include/firewall/uifunctions.rb:2015
+#: src/include/firewall/uifunctions.rb:2017
msgid "Po&rt"
msgstr ""
#. redraw table
-#: src/include/firewall/uifunctions.rb:2110
+#: src/include/firewall/uifunctions.rb:2112
msgid "Select an item to delete."
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/firstboot.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/firstboot.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/firstboot.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-19 02:28+0000\n"
-"PO-Revision-Date: 2017-05-19 02:28+0000\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
+"PO-Revision-Date: 2019-09-20 15:56+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -114,11 +114,11 @@
msgstr ""
#: src/clients/firstboot_config.rb:68
-msgid "Status"
+msgid "Module Name"
msgstr ""
#: src/clients/firstboot_config.rb:68
-msgid "Module Name"
+msgid "Status"
msgstr ""
#. translators: dialog text
@@ -268,27 +268,27 @@
msgstr ""
#. progress stages
-#: src/clients/firstboot_write.rb:45
+#: src/clients/firstboot_write.rb:47
msgid "Update configuration"
msgstr ""
#. progress stages
-#: src/clients/firstboot_write.rb:47
+#: src/clients/firstboot_write.rb:49
msgid "Prepare system for first login"
msgstr ""
#. progress stages
-#: src/clients/firstboot_write.rb:52
+#: src/clients/firstboot_write.rb:54
msgid "Updating configuration..."
msgstr ""
#. progress stages
-#: src/clients/firstboot_write.rb:54
+#: src/clients/firstboot_write.rb:56
msgid "Preparing system for first login..."
msgstr ""
#. Help text for last dialog of base installation
-#: src/clients/firstboot_write.rb:59
+#: src/clients/firstboot_write.rb:61
msgid ""
"<p>\n"
"Please wait while the system is being configured.\n"
@@ -296,7 +296,7 @@
msgstr ""
#. Headline for last dialog of first boot workflow
-#: src/clients/firstboot_write.rb:70
+#: src/clients/firstboot_write.rb:72
msgid "Completing the System Configuration"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/ftp-server.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/ftp-server.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/ftp-server.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-27 00:32+0000\n"
-"PO-Revision-Date: 2016-10-27 00:32+0000\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
+"PO-Revision-Date: 2019-09-20 15:56+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -74,7 +74,7 @@
#. TRANSLATORS: CommandLine help
#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:134 src/clients/ftp-server.rb:317
+#: src/clients/ftp-server.rb:134 src/clients/ftp-server.rb:299
msgid "The maximum connected clients"
msgstr ""
@@ -113,145 +113,131 @@
#. TRANSLATORS: CommandLine help
#: src/clients/ftp-server.rb:199
-msgid ""
-"If enabled, this option will permit SSL v2 protocol connections (vsftpd "
-"only)."
+msgid "vsftpd supports connections via TLS (vsftpd only)."
msgstr ""
#. TRANSLATORS: CommandLine help
#: src/clients/ftp-server.rb:208
msgid ""
-"If enabled, this option will permit SSL v3 protocol connections (vsftpd "
-"only)."
-msgstr ""
-
-#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:217
-msgid "vsftpd supports connections via TLS (vsftpd only)."
-msgstr ""
-
-#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:226
-msgid ""
"Disallow downloading of files that were uploaded but not validated by a "
"local admin (pure-ftpd only)."
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:235
+#: src/clients/ftp-server.rb:217
msgid "Security settings for SSL and TLS protocol (pure-ftpd only)"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:244
+#: src/clients/ftp-server.rb:226
msgid "Start FTP daemon in the boot process."
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:250
+#: src/clients/ftp-server.rb:232
msgid "Start FTP daemon manually."
msgstr ""
#. TRANSLATORS: CommandLine help
#. TRANSLATORS: CommandLine progress information
-#: src/clients/ftp-server.rb:256 src/clients/ftp-server.rb:698
+#: src/clients/ftp-server.rb:238 src/clients/ftp-server.rb:664
msgid "Start FTP daemon via xinetd"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:262
+#: src/clients/ftp-server.rb:244
msgid "Start xinetd if it is not running."
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:268
+#: src/clients/ftp-server.rb:250
msgid "Enable option"
msgstr ""
#. TRANSLATORS: CommandLine help
#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:272 src/clients/ftp-server.rb:277
+#: src/clients/ftp-server.rb:254 src/clients/ftp-server.rb:259
msgid "Disable option"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:282
+#: src/clients/ftp-server.rb:264
msgid "Directory for anonymous users"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:289
+#: src/clients/ftp-server.rb:271
msgid "Directory for authenticated users"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:296
+#: src/clients/ftp-server.rb:278
msgid "The minimum value for port range for passive connection replies"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:303
+#: src/clients/ftp-server.rb:285
msgid "The maximum value for port range for passive connection replies"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:310
+#: src/clients/ftp-server.rb:292
msgid "Maximum Idle Time (in minutes)"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:324
+#: src/clients/ftp-server.rb:306
msgid "The maximum data transfer rate for ftp users (KB/s)"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:330
+#: src/clients/ftp-server.rb:312
msgid "Access only for anonymous"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:336
+#: src/clients/ftp-server.rb:318
msgid "Access only for authenticated users"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:342
+#: src/clients/ftp-server.rb:324
msgid "Access for anonymous and authenticated users"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:348
+#: src/clients/ftp-server.rb:330
msgid "Anonymous users can upload."
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:354
+#: src/clients/ftp-server.rb:336
msgid "Anonymous users can create directories."
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:362
+#: src/clients/ftp-server.rb:344
msgid ""
"Welcome message is the text to display when someone connects to the server."
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:369
+#: src/clients/ftp-server.rb:351
msgid "SSL version 2"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:374
+#: src/clients/ftp-server.rb:356
msgid "SSL version 3"
msgstr ""
#. TRANSLATORS: CommandLine help
-#: src/clients/ftp-server.rb:379
+#: src/clients/ftp-server.rb:361
msgid "Refuse connections that do not use SSL/TLS security mechanisms."
msgstr ""
#. EOF
-#: src/clients/ftp-server.rb:454
+#: src/clients/ftp-server.rb:432
msgid "Display Settings:"
msgstr ""
@@ -259,290 +245,274 @@
#. TRANSLATORS: CommandLine header
#. TRANSLATORS: CommandLine header
#. TRANSLATORS: CommandLine header
-#: src/clients/ftp-server.rb:457 src/clients/ftp-server.rb:677
-#: src/clients/ftp-server.rb:686 src/clients/ftp-server.rb:695
+#: src/clients/ftp-server.rb:435 src/clients/ftp-server.rb:643
+#: src/clients/ftp-server.rb:652 src/clients/ftp-server.rb:661
msgid "Start-Up:"
msgstr ""
-#: src/clients/ftp-server.rb:459
+#: src/clients/ftp-server.rb:437
msgid "FTP daemon is started via xinetd."
msgstr ""
#. TRANSLATORS: CommandLine informative text
-#: src/clients/ftp-server.rb:463
+#: src/clients/ftp-server.rb:441
msgid "FTP daemon is enabled in the boot process."
msgstr ""
#. TRANSLATORS: CommandLine informative text
-#: src/clients/ftp-server.rb:466
+#: src/clients/ftp-server.rb:444
msgid "FTP daemon needs manual starting."
msgstr ""
#. logging settings
-#: src/clients/ftp-server.rb:470
+#: src/clients/ftp-server.rb:448
msgid "Verbose Logging:"
msgstr ""
-#: src/clients/ftp-server.rb:472 src/clients/ftp-server.rb:481
+#: src/clients/ftp-server.rb:450 src/clients/ftp-server.rb:459
msgid "Enable"
msgstr ""
#. CommandLine::Print("");
#. CommandLine::Print("");
-#: src/clients/ftp-server.rb:475 src/clients/ftp-server.rb:484
+#: src/clients/ftp-server.rb:453 src/clients/ftp-server.rb:462
msgid "Disable"
msgstr ""
#. chroot settings
-#: src/clients/ftp-server.rb:479
+#: src/clients/ftp-server.rb:457
msgid "Chroot Everyone:"
msgstr ""
#. UMASK settings
-#: src/clients/ftp-server.rb:491 src/clients/ftp-server.rb:753
+#: src/clients/ftp-server.rb:469 src/clients/ftp-server.rb:719
msgid "Umask for Anonymous: "
msgstr ""
-#: src/clients/ftp-server.rb:494
+#: src/clients/ftp-server.rb:472
msgid "Umask for Anonymous:"
msgstr ""
-#: src/clients/ftp-server.rb:495 src/clients/ftp-server.rb:503
-#: src/clients/ftp-server.rb:513 src/clients/ftp-server.rb:524
-#: src/clients/ftp-server.rb:532 src/clients/ftp-server.rb:541
-#: src/clients/ftp-server.rb:549 src/clients/ftp-server.rb:557
-#: src/clients/ftp-server.rb:565 src/clients/ftp-server.rb:573
-#: src/clients/ftp-server.rb:581 src/clients/ftp-server.rb:615
+#: src/clients/ftp-server.rb:473 src/clients/ftp-server.rb:481
+#: src/clients/ftp-server.rb:491 src/clients/ftp-server.rb:502
+#: src/clients/ftp-server.rb:510 src/clients/ftp-server.rb:519
+#: src/clients/ftp-server.rb:527 src/clients/ftp-server.rb:535
+#: src/clients/ftp-server.rb:543 src/clients/ftp-server.rb:551
+#: src/clients/ftp-server.rb:559 src/clients/ftp-server.rb:593
msgid "Option is not set now."
msgstr ""
#. CommandLine::Print("");
-#: src/clients/ftp-server.rb:498 src/clients/ftp-server.rb:502
-#: src/clients/ftp-server.rb:755
+#: src/clients/ftp-server.rb:476 src/clients/ftp-server.rb:480
+#: src/clients/ftp-server.rb:721
msgid "Umask for Authenticated Users: "
msgstr ""
#. CommandLine::Print("");
#. CommandLine::Print("");
#. part for pure-fptd
-#: src/clients/ftp-server.rb:508 src/clients/ftp-server.rb:512
-#: src/clients/ftp-server.rb:783
+#: src/clients/ftp-server.rb:486 src/clients/ftp-server.rb:490
+#: src/clients/ftp-server.rb:749
msgid "Umask: "
msgstr ""
#. end of if (FtpServer::vsftpd_edit)
#. authenticated and anonymous dirs
-#: src/clients/ftp-server.rb:520
+#: src/clients/ftp-server.rb:498
msgid "Authenticated dir: "
msgstr ""
-#: src/clients/ftp-server.rb:528
+#: src/clients/ftp-server.rb:506
msgid "Anonymous dir: "
msgstr ""
#. port range
-#: src/clients/ftp-server.rb:535
+#: src/clients/ftp-server.rb:513
msgid "Port Range: "
msgstr ""
-#: src/clients/ftp-server.rb:538 src/clients/ftp-server.rb:889
+#: src/clients/ftp-server.rb:516 src/clients/ftp-server.rb:855
msgid " - "
msgstr ""
#. idle time
-#: src/clients/ftp-server.rb:545
+#: src/clients/ftp-server.rb:523
msgid "Maximum Idle Time [minutes]: "
msgstr ""
#. maximum clients per IP
-#: src/clients/ftp-server.rb:553
+#: src/clients/ftp-server.rb:531
msgid "Maximum Clients per IP: "
msgstr ""
#. maximum clients
-#: src/clients/ftp-server.rb:561
+#: src/clients/ftp-server.rb:539
msgid "Maximum Number of Clients: "
msgstr ""
#. max rate for authenticated users
-#: src/clients/ftp-server.rb:569
+#: src/clients/ftp-server.rb:547
msgid "Maximum Rate for Authenticated Users [KB/s]: "
msgstr ""
#. max rate for anonymous users
-#: src/clients/ftp-server.rb:577
+#: src/clients/ftp-server.rb:555
msgid "Maximum Rate for Anonymous Users [KB/s]: "
msgstr ""
#. general settings for access
-#: src/clients/ftp-server.rb:585
+#: src/clients/ftp-server.rb:563
msgid "Access Allowed for: "
msgstr ""
-#: src/clients/ftp-server.rb:587
+#: src/clients/ftp-server.rb:565
msgid "Anonymous Users"
msgstr ""
-#: src/clients/ftp-server.rb:589
+#: src/clients/ftp-server.rb:567
msgid "Authenticated Users"
msgstr ""
-#: src/clients/ftp-server.rb:591
+#: src/clients/ftp-server.rb:569
msgid "Anonymous and Authenticated Users"
msgstr ""
-#: src/clients/ftp-server.rb:593
+#: src/clients/ftp-server.rb:571
msgid "Option has wrong value."
msgstr ""
#. access permissions for anonymous users
-#: src/clients/ftp-server.rb:597
+#: src/clients/ftp-server.rb:575
msgid "Access Permissions for Anonymous: "
msgstr ""
-#: src/clients/ftp-server.rb:599
+#: src/clients/ftp-server.rb:577
msgid "Upload enabled; "
msgstr ""
-#: src/clients/ftp-server.rb:601
+#: src/clients/ftp-server.rb:579
msgid "Upload disabled; "
msgstr ""
-#: src/clients/ftp-server.rb:604
+#: src/clients/ftp-server.rb:582
msgid "Create directories enabled"
msgstr ""
-#: src/clients/ftp-server.rb:606
+#: src/clients/ftp-server.rb:584
msgid "Create directories disabled"
msgstr ""
#. welcome message vsftpd only
-#: src/clients/ftp-server.rb:611
+#: src/clients/ftp-server.rb:589
msgid "Welcome message: "
msgstr ""
#. CommandLine::PrintNoCR(_("Security settings: "));
#. SSL options (SSL version and TLS)
-#: src/clients/ftp-server.rb:622
+#: src/clients/ftp-server.rb:600
msgid "SSL is disabled"
msgstr ""
-#: src/clients/ftp-server.rb:624
+#: src/clients/ftp-server.rb:602
msgid "SSL is enabled"
msgstr ""
-#: src/clients/ftp-server.rb:628
-msgid "SSL version 2 is disabled"
-msgstr ""
-
-#: src/clients/ftp-server.rb:630
-msgid "SSL version 2 is enabled"
-msgstr ""
-
-#: src/clients/ftp-server.rb:634
-msgid "SSL version 3 is disabled"
-msgstr ""
-
-#: src/clients/ftp-server.rb:636
-msgid "SSL version 3 is enabled"
-msgstr ""
-
-#: src/clients/ftp-server.rb:640
+#: src/clients/ftp-server.rb:606
msgid "TLS is disabled"
msgstr ""
-#: src/clients/ftp-server.rb:642
+#: src/clients/ftp-server.rb:608
msgid "TLS is enabled"
msgstr ""
#. AntiWarez option
-#: src/clients/ftp-server.rb:646
+#: src/clients/ftp-server.rb:612
msgid "Antiwarez: "
msgstr ""
-#: src/clients/ftp-server.rb:648
+#: src/clients/ftp-server.rb:614
msgid "Antiwarez enabled"
msgstr ""
-#: src/clients/ftp-server.rb:650
+#: src/clients/ftp-server.rb:616
msgid "Antiwarez disabled"
msgstr ""
#. SSL/TLS settings
-#: src/clients/ftp-server.rb:653
+#: src/clients/ftp-server.rb:619
msgid "SSL/TLS settings: "
msgstr ""
-#: src/clients/ftp-server.rb:655
+#: src/clients/ftp-server.rb:621
msgid "SSL/TLS disabled"
msgstr ""
-#: src/clients/ftp-server.rb:657
+#: src/clients/ftp-server.rb:623
msgid "SSL/TLS enabled"
msgstr ""
-#: src/clients/ftp-server.rb:659
+#: src/clients/ftp-server.rb:625
msgid "Refuse connections without SSL/TLS"
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/ftp-server.rb:673
+#: src/clients/ftp-server.rb:639
msgid "Only one parameter (atboot/manual) is allowed."
msgstr ""
#. TRANSLATORS: CommandLine progress information
-#: src/clients/ftp-server.rb:680
+#: src/clients/ftp-server.rb:646
msgid "Enabling FTP daemon in the boot process..."
msgstr ""
#. TRANSLATORS: CommandLine progress information
-#: src/clients/ftp-server.rb:689
+#: src/clients/ftp-server.rb:655
msgid "Removing FTP daemon from the boot process..."
msgstr ""
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/ftp-server.rb:712 src/clients/ftp-server.rb:726
+#: src/clients/ftp-server.rb:678 src/clients/ftp-server.rb:692
msgid "Only one parameter (enable/disable) is allowed."
msgstr ""
#. end of else if (options["show"]:nil!=nil
-#: src/clients/ftp-server.rb:741
+#: src/clients/ftp-server.rb:707
msgid "Umask:"
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/ftp-server.rb:745
+#: src/clients/ftp-server.rb:711
msgid "Only one parameter (show/set_umask) is allowed."
msgstr ""
-#: src/clients/ftp-server.rb:761 src/clients/ftp-server.rb:770
-#: src/clients/ftp-server.rb:788
+#: src/clients/ftp-server.rb:727 src/clients/ftp-server.rb:736
+#: src/clients/ftp-server.rb:754
msgid "Entered umask is not valid."
msgstr ""
-#: src/clients/ftp-server.rb:763 src/clients/ftp-server.rb:772
+#: src/clients/ftp-server.rb:729 src/clients/ftp-server.rb:738
msgid "Example of correct umask <local users>:<anonymous> (177:077)"
msgstr ""
-#: src/clients/ftp-server.rb:790
+#: src/clients/ftp-server.rb:756
msgid "Example of correct umask <files>:<dirs> (set_umask=177:077)"
msgstr ""
#. end of if (vsftpd_edit)
-#: src/clients/ftp-server.rb:803
+#: src/clients/ftp-server.rb:769
msgid "Anonymous users:"
msgstr ""
-#: src/clients/ftp-server.rb:809
+#: src/clients/ftp-server.rb:775
msgid "Anonymous directory:"
msgstr ""
-#: src/clients/ftp-server.rb:814 src/clients/ftp-server.rb:844
+#: src/clients/ftp-server.rb:780 src/clients/ftp-server.rb:810
msgid "Option is empty."
msgstr ""
-#: src/clients/ftp-server.rb:816
+#: src/clients/ftp-server.rb:782
msgid "Example of correct input set_anon_dir=/srv/ftp"
msgstr ""
@@ -553,164 +523,164 @@
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/ftp-server.rb:823 src/clients/ftp-server.rb:853
-#: src/clients/ftp-server.rb:935 src/clients/ftp-server.rb:1027
-#: src/clients/ftp-server.rb:1100 src/clients/ftp-server.rb:1151
-#: src/clients/ftp-server.rb:1241
+#: src/clients/ftp-server.rb:789 src/clients/ftp-server.rb:819
+#: src/clients/ftp-server.rb:901 src/clients/ftp-server.rb:993
+#: src/clients/ftp-server.rb:1066 src/clients/ftp-server.rb:1117
+#: src/clients/ftp-server.rb:1185
msgid "Only one parameter is allowed."
msgstr ""
-#: src/clients/ftp-server.rb:832
+#: src/clients/ftp-server.rb:798
msgid "Authenticated users:"
msgstr ""
-#: src/clients/ftp-server.rb:839
+#: src/clients/ftp-server.rb:805
msgid "Authenticated directory:"
msgstr ""
-#: src/clients/ftp-server.rb:846
+#: src/clients/ftp-server.rb:812
msgid "Example of correct input set_authen_dir=/srv/ftp"
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/ftp-server.rb:858
+#: src/clients/ftp-server.rb:824
msgid "Option is not supported in pure-ftpd server."
msgstr ""
-#: src/clients/ftp-server.rb:867
+#: src/clients/ftp-server.rb:833
msgid "Port range:"
msgstr ""
-#: src/clients/ftp-server.rb:885
+#: src/clients/ftp-server.rb:851
msgid "Port range for passive mode: "
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/ftp-server.rb:894
+#: src/clients/ftp-server.rb:860
msgid "Enter minimal port < maximal port."
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/ftp-server.rb:899
+#: src/clients/ftp-server.rb:865
msgid "Enter correct numbers."
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/ftp-server.rb:904
+#: src/clients/ftp-server.rb:870
msgid "Only two parameters are allowed."
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/ftp-server.rb:929
+#: src/clients/ftp-server.rb:895
msgid "Wrong value of option."
msgstr ""
-#: src/clients/ftp-server.rb:1004
+#: src/clients/ftp-server.rb:970
msgid "Access (Anonymous/Authenticated):"
msgstr ""
-#: src/clients/ftp-server.rb:1008
+#: src/clients/ftp-server.rb:974
msgid "Access allowed for: "
msgstr ""
-#: src/clients/ftp-server.rb:1011
+#: src/clients/ftp-server.rb:977
msgid "Anonymous users"
msgstr ""
-#: src/clients/ftp-server.rb:1014
+#: src/clients/ftp-server.rb:980
msgid "Authenticated users"
msgstr ""
-#: src/clients/ftp-server.rb:1017
+#: src/clients/ftp-server.rb:983
msgid "Anonymous and authenticated users"
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/ftp-server.rb:1020
+#: src/clients/ftp-server.rb:986
msgid "Unknown option."
msgstr ""
-#: src/clients/ftp-server.rb:1040
+#: src/clients/ftp-server.rb:1006
msgid "Access permission for anonymous users:"
msgstr ""
-#: src/clients/ftp-server.rb:1047
+#: src/clients/ftp-server.rb:1013
msgid "Upload enabled"
msgstr ""
-#: src/clients/ftp-server.rb:1050
+#: src/clients/ftp-server.rb:1016
msgid "Upload disabled"
msgstr ""
-#: src/clients/ftp-server.rb:1052
+#: src/clients/ftp-server.rb:1018
msgid "; "
msgstr ""
-#: src/clients/ftp-server.rb:1055
+#: src/clients/ftp-server.rb:1021
msgid "Create dirs enabled"
msgstr ""
-#: src/clients/ftp-server.rb:1058
+#: src/clients/ftp-server.rb:1024
msgid "Create dirs disabled"
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/ftp-server.rb:1062
+#: src/clients/ftp-server.rb:1028
msgid "Only one or two parameters are allowed."
msgstr ""
-#: src/clients/ftp-server.rb:1075
+#: src/clients/ftp-server.rb:1041
msgid "Welcome Message:"
msgstr ""
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/ftp-server.rb:1079 src/clients/ftp-server.rb:1120
+#: src/clients/ftp-server.rb:1045 src/clients/ftp-server.rb:1086
msgid "This option is allowed only in vsftpd."
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/ftp-server.rb:1094
+#: src/clients/ftp-server.rb:1060
msgid "Missing value of option"
msgstr ""
-#: src/clients/ftp-server.rb:1103
+#: src/clients/ftp-server.rb:1069
msgid "Example of correct input: welcome_message=\"Hello everybody\""
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/ftp-server.rb:1127
+#: src/clients/ftp-server.rb:1093
msgid "This option is allowed only in pure-ftpd."
msgstr ""
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/ftp-server.rb:1145 src/clients/ftp-server.rb:1235
+#: src/clients/ftp-server.rb:1111 src/clients/ftp-server.rb:1179
msgid "Wrong option."
msgstr ""
-#: src/clients/ftp-server.rb:1211
+#: src/clients/ftp-server.rb:1155
msgid "Security Settings:"
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/ftp-server.rb:1215
+#: src/clients/ftp-server.rb:1159
msgid "This option is allowed only in pure-ftp-server."
msgstr ""
-#: src/clients/ftp-server.rb:1222
+#: src/clients/ftp-server.rb:1166
msgid "SSL and TLS are enabled"
msgstr ""
-#: src/clients/ftp-server.rb:1227
+#: src/clients/ftp-server.rb:1171
msgid "SSL and TLS are disabled"
msgstr ""
-#: src/clients/ftp-server.rb:1231
+#: src/clients/ftp-server.rb:1175
msgid "Refuse connection without SSL/TLS"
msgstr ""
-#: src/clients/ftp-server.rb:1244
+#: src/clients/ftp-server.rb:1188
msgid "Example of correct input: SSL_TLS enable/disable/only"
msgstr ""
@@ -733,7 +703,7 @@
msgstr ""
#: src/include/ftp-server/complex.rb:85 src/include/ftp-server/complex.rb:196
-#: src/include/ftp-server/dialogs.rb:315
+#: src/include/ftp-server/dialogs.rb:313
msgid "&vsftpd"
msgstr ""
@@ -760,37 +730,37 @@
msgstr ""
#. TRANSLATORS: popup headline
-#: src/include/ftp-server/dialogs.rb:150
+#: src/include/ftp-server/dialogs.rb:148
msgid "Aborting FTP Configuration"
msgstr ""
#. TRANSLATORS: popup message
-#: src/include/ftp-server/dialogs.rb:152
+#: src/include/ftp-server/dialogs.rb:150
msgid "All changes will be lost. Really abort configuration?"
msgstr ""
#. TRANSLATORS: Radio selection
-#: src/include/ftp-server/dialogs.rb:188
+#: src/include/ftp-server/dialogs.rb:186
msgid "&When booting"
msgstr ""
-#: src/include/ftp-server/dialogs.rb:189
+#: src/include/ftp-server/dialogs.rb:187
msgid "&Manually"
msgstr ""
-#: src/include/ftp-server/dialogs.rb:190
+#: src/include/ftp-server/dialogs.rb:188
msgid "Via &xinetd"
msgstr ""
-#: src/include/ftp-server/dialogs.rb:196
+#: src/include/ftp-server/dialogs.rb:194
msgid "When Booting"
msgstr ""
-#: src/include/ftp-server/dialogs.rb:197
+#: src/include/ftp-server/dialogs.rb:195
msgid "Manually"
msgstr ""
-#: src/include/ftp-server/dialogs.rb:198
+#: src/include/ftp-server/dialogs.rb:196
msgid "Via xinetd"
msgstr ""
@@ -809,7 +779,7 @@
#. Init function for start-up
#.
#. init starting via xinetd and update status
-#: src/include/ftp-server/dialogs.rb:212 src/include/ftp-server/dialogs.rb:261
+#: src/include/ftp-server/dialogs.rb:210 src/include/ftp-server/dialogs.rb:259
#: src/include/ftp-server/wid_functions.rb:173
#: src/include/ftp-server/wid_functions.rb:263
#: src/include/ftp-server/wid_functions.rb:317
@@ -821,39 +791,39 @@
#. UpdateInfoAboutStartingFTP ();
#. Popup::Message(_("This is not supported via xinetd now."));
-#: src/include/ftp-server/dialogs.rb:213 src/include/ftp-server/dialogs.rb:262
+#: src/include/ftp-server/dialogs.rb:211 src/include/ftp-server/dialogs.rb:260
#: src/include/ftp-server/wid_functions.rb:214
#: src/include/ftp-server/wid_functions.rb:359
msgid "FTP is not running"
msgstr ""
-#: src/include/ftp-server/dialogs.rb:214 src/include/ftp-server/dialogs.rb:263
+#: src/include/ftp-server/dialogs.rb:212 src/include/ftp-server/dialogs.rb:261
msgid "&Start FTP Now"
msgstr ""
-#: src/include/ftp-server/dialogs.rb:215 src/include/ftp-server/dialogs.rb:264
+#: src/include/ftp-server/dialogs.rb:213 src/include/ftp-server/dialogs.rb:262
msgid "S&top FTP Now"
msgstr ""
-#: src/include/ftp-server/dialogs.rb:224 src/include/ftp-server/dialogs.rb:273
+#: src/include/ftp-server/dialogs.rb:222 src/include/ftp-server/dialogs.rb:271
msgid "Sa&ve Settings and Restart FTP Now"
msgstr ""
#. part of help text - push button label, NO SHORTCUT!!!
#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/ftp-server/dialogs.rb:242 src/include/ftp-server/dialogs.rb:291
+#: src/include/ftp-server/dialogs.rb:240 src/include/ftp-server/dialogs.rb:289
msgid "Start FTP Daemon Now"
msgstr ""
#. part of help text - push button label, NO SHORTCUT!!!
#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/ftp-server/dialogs.rb:244 src/include/ftp-server/dialogs.rb:293
+#: src/include/ftp-server/dialogs.rb:242 src/include/ftp-server/dialogs.rb:291
msgid "Stop FTP Daemon Now"
msgstr ""
#. part of help text - push button label, NO SHORTCUT!!!
#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/ftp-server/dialogs.rb:246 src/include/ftp-server/dialogs.rb:295
+#: src/include/ftp-server/dialogs.rb:244 src/include/ftp-server/dialogs.rb:293
msgid "Save Settings and Restart FTP Daemon Now"
msgstr ""
@@ -861,11 +831,11 @@
#. Start widget radiobuttons for switching daemons
#.
#. @return [Hash{String => Object}] map for start-stop widget
-#: src/include/ftp-server/dialogs.rb:310
+#: src/include/ftp-server/dialogs.rb:308
msgid "Selected Service"
msgstr ""
-#: src/include/ftp-server/dialogs.rb:315
+#: src/include/ftp-server/dialogs.rb:313
msgid "p&ure-ftpd"
msgstr ""
@@ -875,7 +845,7 @@
#. General Settings widget
#.
#. @return [Hash{String => Object}] map for General screen
-#: src/include/ftp-server/dialogs.rb:364
+#: src/include/ftp-server/dialogs.rb:362
msgid "&Welcome message"
msgstr ""
@@ -883,7 +853,7 @@
#. General Settings widget
#.
#. @return [Hash{String => Object}] map for General screen
-#: src/include/ftp-server/dialogs.rb:391
+#: src/include/ftp-server/dialogs.rb:389
msgid "&Chroot Everyone"
msgstr ""
@@ -891,7 +861,7 @@
#. General Settings widget
#.
#. @return [Hash{String => Object}] map for General screen
-#: src/include/ftp-server/dialogs.rb:422
+#: src/include/ftp-server/dialogs.rb:420
msgid "&Verbose Logging"
msgstr ""
@@ -899,7 +869,7 @@
#. General Settings widget
#.
#. @return [Hash{String => Object}] map for General screen
-#: src/include/ftp-server/dialogs.rb:454
+#: src/include/ftp-server/dialogs.rb:452
msgid "&Umask (umask files:umask dirs)"
msgstr ""
@@ -907,7 +877,7 @@
#. General Settings widget
#.
#. @return [Hash{String => Object}] map for General screen
-#: src/include/ftp-server/dialogs.rb:488
+#: src/include/ftp-server/dialogs.rb:486
msgid "&Umask for Anonymous"
msgstr ""
@@ -915,7 +885,7 @@
#. General Settings widget
#.
#. @return [Hash{String => Object}] map for General screen
-#: src/include/ftp-server/dialogs.rb:519
+#: src/include/ftp-server/dialogs.rb:517
msgid "Uma&sk for Authenticated Users"
msgstr ""
@@ -923,7 +893,7 @@
#. General Settings widget
#.
#. @return [Hash{String => Object}] map for General screen
-#: src/include/ftp-server/dialogs.rb:547
+#: src/include/ftp-server/dialogs.rb:545
msgid "FTP Directory for Anon&ymous Users"
msgstr ""
@@ -931,12 +901,12 @@
#. General Settings widget
#.
#. @return [Hash{String => Object}] map for General screen
-#: src/include/ftp-server/dialogs.rb:582
+#: src/include/ftp-server/dialogs.rb:580
msgid "Brows&e"
msgstr ""
-#: src/include/ftp-server/dialogs.rb:589 src/include/ftp-server/dialogs.rb:644
-#: src/include/ftp-server/dialogs.rb:1220
+#: src/include/ftp-server/dialogs.rb:587 src/include/ftp-server/dialogs.rb:642
+#: src/include/ftp-server/dialogs.rb:1161
msgid " "
msgstr ""
@@ -944,7 +914,7 @@
#. General Settings widget
#.
#. @return [Hash{String => Object}] map for General screen
-#: src/include/ftp-server/dialogs.rb:604
+#: src/include/ftp-server/dialogs.rb:602
msgid "&FTP Directory for Authenticated Users"
msgstr ""
@@ -956,8 +926,7 @@
#. Expert Settings widget
#.
#. @return [Hash{String => Object}] map for Expert screen
-#: src/include/ftp-server/dialogs.rb:637
-#: src/include/ftp-server/dialogs.rb:1213
+#: src/include/ftp-server/dialogs.rb:635 src/include/ftp-server/dialogs.rb:1154
msgid "Br&owse"
msgstr ""
@@ -967,7 +936,7 @@
#. Performance Settings widget
#.
#. @return [Hash{String => Object}] map for Performance screen
-#: src/include/ftp-server/dialogs.rb:663
+#: src/include/ftp-server/dialogs.rb:661
msgid "&Max Idle Time [minutes]"
msgstr ""
@@ -975,7 +944,7 @@
#. Performance Settings widget
#.
#. @return [Hash{String => Object}] map for Performance screen
-#: src/include/ftp-server/dialogs.rb:699
+#: src/include/ftp-server/dialogs.rb:697
msgid "Max Cli&ents for One IP"
msgstr ""
@@ -983,7 +952,7 @@
#. Performance Settings widget
#.
#. @return [Hash{String => Object}] map for Performance screen
-#: src/include/ftp-server/dialogs.rb:732
+#: src/include/ftp-server/dialogs.rb:730
msgid "Ma&x Clients"
msgstr ""
@@ -991,7 +960,7 @@
#. Performance Settings widget
#.
#. @return [Hash{String => Object}] map for Performance screen
-#: src/include/ftp-server/dialogs.rb:765
+#: src/include/ftp-server/dialogs.rb:763
msgid "&Local Max Rate [KB/s]"
msgstr ""
@@ -999,7 +968,7 @@
#. Performance Settings widget
#.
#. @return [Hash{String => Object}] map for Performance screen
-#: src/include/ftp-server/dialogs.rb:798
+#: src/include/ftp-server/dialogs.rb:796
msgid "Anonymous Max &Rate [KB/s]"
msgstr ""
@@ -1009,19 +978,19 @@
#. Authentication Settings widget
#.
#. @return [Hash{String => Object}] map for Performance screen
-#: src/include/ftp-server/dialogs.rb:836
+#: src/include/ftp-server/dialogs.rb:834
msgid "Enable/Disable Anonymous and Local Users"
msgstr ""
-#: src/include/ftp-server/dialogs.rb:842
+#: src/include/ftp-server/dialogs.rb:840
msgid "Anonymo&us Only"
msgstr ""
-#: src/include/ftp-server/dialogs.rb:843
+#: src/include/ftp-server/dialogs.rb:841
msgid "Aut&henticated Users Only"
msgstr ""
-#: src/include/ftp-server/dialogs.rb:844
+#: src/include/ftp-server/dialogs.rb:842
msgid "&Both"
msgstr ""
@@ -1029,7 +998,7 @@
#. Authentication Settings widget
#.
#. @return [Hash{String => Object}] map for Performance screen
-#: src/include/ftp-server/dialogs.rb:872
+#: src/include/ftp-server/dialogs.rb:870
msgid "&Enable Upload"
msgstr ""
@@ -1037,7 +1006,7 @@
#. Authentication Settings widget
#.
#. @return [Hash{String => Object}] map for Performance screen
-#: src/include/ftp-server/dialogs.rb:903
+#: src/include/ftp-server/dialogs.rb:901
msgid "Anon&ymous Can Upload"
msgstr ""
@@ -1045,7 +1014,7 @@
#. Authentication Settings widget
#.
#. @return [Hash{String => Object}] map for Performance screen
-#: src/include/ftp-server/dialogs.rb:935
+#: src/include/ftp-server/dialogs.rb:933
msgid "Anonymou&s Can Create Directories"
msgstr ""
@@ -1055,7 +1024,7 @@
#. Expert Settings widget
#.
#. @return [Hash{String => Object}] map for Expert screen
-#: src/include/ftp-server/dialogs.rb:970
+#: src/include/ftp-server/dialogs.rb:968
msgid "Enable Pass&ive Mode"
msgstr ""
@@ -1063,7 +1032,7 @@
#. Expert Settings widget
#.
#. @return [Hash{String => Object}] map for Expert screen
-#: src/include/ftp-server/dialogs.rb:1001
+#: src/include/ftp-server/dialogs.rb:999
msgid "&Min Port for Pas. Mode"
msgstr ""
@@ -1071,7 +1040,7 @@
#. Expert Settings widget
#.
#. @return [Hash{String => Object}] map for Expert screen
-#: src/include/ftp-server/dialogs.rb:1033
+#: src/include/ftp-server/dialogs.rb:1031
msgid "Max P&ort for Pas. Mode"
msgstr ""
@@ -1080,32 +1049,16 @@
#.
#. @return [Hash{String => Object}] map for Expert screen
#. end of `Frame ( "Passiv Mode Settings"
-#: src/include/ftp-server/dialogs.rb:1071
-#: src/include/ftp-server/dialogs.rb:1652
+#: src/include/ftp-server/dialogs.rb:1069
+#: src/include/ftp-server/dialogs.rb:1593
msgid "Enab&le SSL"
msgstr ""
-#. Enable SSL v2
-#. Expert Settings widget
-#.
-#. @return [Hash{String => Object}] map for Expert screen
-#: src/include/ftp-server/dialogs.rb:1097
-msgid "&Enable SSL v2"
-msgstr ""
-
-#. Enable SSL v3
-#. Expert Settings widget
-#.
-#. @return [Hash{String => Object}] map for Expert screen
-#: src/include/ftp-server/dialogs.rb:1126
-msgid "Enable SSL &v3"
-msgstr ""
-
#. Enable TLS
#. Expert Settings widget
#.
#. @return [Hash{String => Object}] map for Expert screen
-#: src/include/ftp-server/dialogs.rb:1155
+#: src/include/ftp-server/dialogs.rb:1096
msgid "Enable &TLS"
msgstr ""
@@ -1113,7 +1066,7 @@
#. Expert Settings widget
#.
#. @return [Hash{String => Object}] map for Expert screen
-#: src/include/ftp-server/dialogs.rb:1183
+#: src/include/ftp-server/dialogs.rb:1124
msgid "D&SA Certificate to Use for SSL-encrypted Connections"
msgstr ""
@@ -1121,7 +1074,7 @@
#. Expert Settings widget
#.
#. @return [Hash{String => Object}] map for Expert screen
-#: src/include/ftp-server/dialogs.rb:1237
+#: src/include/ftp-server/dialogs.rb:1178
msgid "Disable Downloading &Unvalidated Data"
msgstr ""
@@ -1129,29 +1082,29 @@
#. Expert Settings widget
#.
#. @return [Hash{String => Object}] map for Expert screen
-#: src/include/ftp-server/dialogs.rb:1264
+#: src/include/ftp-server/dialogs.rb:1205
msgid "Security Settings"
msgstr ""
-#: src/include/ftp-server/dialogs.rb:1270
+#: src/include/ftp-server/dialogs.rb:1211
msgid "Disable SSL/&TLS"
msgstr ""
-#: src/include/ftp-server/dialogs.rb:1271
+#: src/include/ftp-server/dialogs.rb:1212
msgid "Accept &SSL and TLS"
msgstr ""
-#: src/include/ftp-server/dialogs.rb:1272
+#: src/include/ftp-server/dialogs.rb:1213
msgid "&Refuse Connections Without SSL/TLS"
msgstr ""
#. TRANSLATORS: part of dialog caption
-#: src/include/ftp-server/dialogs.rb:1320
+#: src/include/ftp-server/dialogs.rb:1261
msgid "FTP Start-up"
msgstr ""
#. TRANSLATORS: tree menu item
-#: src/include/ftp-server/dialogs.rb:1322
+#: src/include/ftp-server/dialogs.rb:1263
msgid "Start-Up"
msgstr ""
@@ -1170,39 +1123,39 @@
#. define for tabs_vsftpd/tabs_pureftpd necessary later in screens (CWNTree)
#.
#. @return [Hash{String => Object}] map for Performance Settings widget
-#: src/include/ftp-server/dialogs.rb:1346
-#: src/include/ftp-server/dialogs.rb:1420
-#: src/include/ftp-server/dialogs.rb:1473
+#: src/include/ftp-server/dialogs.rb:1287
+#: src/include/ftp-server/dialogs.rb:1361
+#: src/include/ftp-server/dialogs.rb:1414
msgid "General Settings"
msgstr ""
-#: src/include/ftp-server/dialogs.rb:1359
-#: src/include/ftp-server/dialogs.rb:1428
-#: src/include/ftp-server/dialogs.rb:1485
+#: src/include/ftp-server/dialogs.rb:1300
+#: src/include/ftp-server/dialogs.rb:1369
+#: src/include/ftp-server/dialogs.rb:1426
msgid "FTP Directories"
msgstr ""
#. TRANSLATORS: part of dialog caption
#. TRANSLATORS: part of dialog caption
-#: src/include/ftp-server/dialogs.rb:1384
-#: src/include/ftp-server/dialogs.rb:1446
+#: src/include/ftp-server/dialogs.rb:1325
+#: src/include/ftp-server/dialogs.rb:1387
msgid "FTP General Settings"
msgstr ""
#. TRANSLATORS: tree menu item
#. TRANSLATORS: tree menu item
-#: src/include/ftp-server/dialogs.rb:1386
-#: src/include/ftp-server/dialogs.rb:1448
+#: src/include/ftp-server/dialogs.rb:1327
+#: src/include/ftp-server/dialogs.rb:1389
msgid "General"
msgstr ""
#. TRANSLATORS: part of dialog caption
-#: src/include/ftp-server/dialogs.rb:1498
+#: src/include/ftp-server/dialogs.rb:1439
msgid "FTP Performance Settings"
msgstr ""
#. TRANSLATORS: tree menu item
-#: src/include/ftp-server/dialogs.rb:1500
+#: src/include/ftp-server/dialogs.rb:1441
msgid "Performance"
msgstr ""
@@ -1216,22 +1169,22 @@
#. define for tabs_vsftpd/tabs_pureftpd necessary later in screens (CWNTree)
#.
#. @return [Hash{String => Object}] map for Anonymous Settings widget
-#: src/include/ftp-server/dialogs.rb:1562
-#: src/include/ftp-server/dialogs.rb:1597
+#: src/include/ftp-server/dialogs.rb:1503
+#: src/include/ftp-server/dialogs.rb:1538
msgid "Uploading"
msgstr ""
#. TRANSLATORS: part of dialog caption
#. TRANSLATORS: part of dialog caption
-#: src/include/ftp-server/dialogs.rb:1569
-#: src/include/ftp-server/dialogs.rb:1613
+#: src/include/ftp-server/dialogs.rb:1510
+#: src/include/ftp-server/dialogs.rb:1554
msgid "FTP Anonymous Settings"
msgstr ""
#. TRANSLATORS: tree menu item
#. TRANSLATORS: tree menu item
-#: src/include/ftp-server/dialogs.rb:1571
-#: src/include/ftp-server/dialogs.rb:1615
+#: src/include/ftp-server/dialogs.rb:1512
+#: src/include/ftp-server/dialogs.rb:1556
msgid "Authentication"
msgstr ""
@@ -1245,33 +1198,33 @@
#. define for tabs_pureftpd necessary later in screens (CWNTree)
#.
#. @return [Hash{String => Object}] map for Expert Settings widget
-#: src/include/ftp-server/dialogs.rb:1638
-#: src/include/ftp-server/dialogs.rb:1712
+#: src/include/ftp-server/dialogs.rb:1579
+#: src/include/ftp-server/dialogs.rb:1649
msgid "Passive Mode"
msgstr ""
#. end of `CheckBoxFrame(`id("SSLEnable"), "Sec&urity Settings", true
#. end of `Frame ( _("Additional Settings")
-#: src/include/ftp-server/dialogs.rb:1671
-#: src/include/ftp-server/dialogs.rb:1726
+#: src/include/ftp-server/dialogs.rb:1610
+#: src/include/ftp-server/dialogs.rb:1663
msgid "SUSEfirewall Settings"
msgstr ""
#. TRANSLATORS: part of dialog caption
#. TRANSLATORS: part of dialog caption
-#: src/include/ftp-server/dialogs.rb:1676
-#: src/include/ftp-server/dialogs.rb:1731
+#: src/include/ftp-server/dialogs.rb:1615
+#: src/include/ftp-server/dialogs.rb:1668
msgid "FTP Expert Settings"
msgstr ""
#. TRANSLATORS: tree menu item
#. TRANSLATORS: tree menu item
-#: src/include/ftp-server/dialogs.rb:1678
-#: src/include/ftp-server/dialogs.rb:1733
+#: src/include/ftp-server/dialogs.rb:1617
+#: src/include/ftp-server/dialogs.rb:1670
msgid "Expert Settings"
msgstr ""
-#: src/include/ftp-server/dialogs.rb:1720
+#: src/include/ftp-server/dialogs.rb:1657
msgid "Additional Settings"
msgstr ""
@@ -1521,32 +1474,16 @@
"</p>\n"
msgstr ""
-#. expert settings Enable SSL v2 help 1/1
+#. expert settings Enable TLS help 1/1
#: src/include/ftp-server/helps.rb:207
msgid ""
-"<p><b>Enable SSL v2</b><br>\n"
-"If enabled, SSL version 2 connections are allowed.\n"
-"</p>\n"
-msgstr ""
-
-#. expert settings Enable SSL v3 help 1/1
-#: src/include/ftp-server/helps.rb:213
-msgid ""
-"<p><b>Enable SSL v3</b><br>\n"
-"If enabled, SSL version 3 connections are allowed.\n"
-"</p>\n"
-msgstr ""
-
-#. expert settings Enable TLS help 1/1
-#: src/include/ftp-server/helps.rb:219
-msgid ""
"<p><b>Enable TLS</b><br>\n"
"If enabled, TLS connections are allowed.\n"
"</p>\n"
msgstr ""
#. expert settings RSA Certificate to Use for SSL Encrypted Connections help 1/1
-#: src/include/ftp-server/helps.rb:225
+#: src/include/ftp-server/helps.rb:213
msgid ""
"<p><b>RSA Certificate to Use for SSL-encrypted Connections</b><br>\n"
"This option specifies the location of the RSA certificate to \n"
@@ -1555,7 +1492,7 @@
msgstr ""
#. expert settings Disable Downloading Unvalidated Data help 1/1
-#: src/include/ftp-server/helps.rb:232
+#: src/include/ftp-server/helps.rb:220
msgid ""
"<p><b>Disable Downloading Unvalidated Data</b><br>\n"
"Disallow downloading of files that were uploaded \n"
@@ -1564,7 +1501,7 @@
msgstr ""
#. expert settings Security Settings help 1/1
-#: src/include/ftp-server/helps.rb:239
+#: src/include/ftp-server/helps.rb:227
msgid ""
"<p><b>Security Settings</b><br>\n"
"<i>Disable SSL/TLS</i> Disable SSL/TLS encryption layer.\n"
@@ -1577,14 +1514,14 @@
#. -----------================= SUMMARY =============----------
#.
#. Summary dialog help 1/3
-#: src/include/ftp-server/helps.rb:251
+#: src/include/ftp-server/helps.rb:239
msgid ""
"<p><b><big>FTP Server Configuration</big></b><br>\n"
"Configure the FTP server.<br></p>\n"
msgstr ""
#. Summary dialog help 2/3
-#: src/include/ftp-server/helps.rb:255
+#: src/include/ftp-server/helps.rb:243
msgid ""
"<p><b><big>Adding an FTP Server:</big></b><br>\n"
"Choose an FTP server from the list of detected FTP servers.\n"
@@ -1593,7 +1530,7 @@
msgstr ""
#. Summary dialog help 3/3
-#: src/include/ftp-server/helps.rb:262
+#: src/include/ftp-server/helps.rb:250
msgid ""
"<p><b><big>Editing or Deleting</big></b><br>\n"
"If you press <b>Edit</b>, an additional dialog in which to change\n"
@@ -1601,7 +1538,7 @@
msgstr ""
#. Ovreview dialog help 1/3
-#: src/include/ftp-server/helps.rb:268
+#: src/include/ftp-server/helps.rb:256
msgid ""
"<p><b><big>FTP Server Configuration Overview</big></b><br>\n"
"Obtain an overview of the installed FTP servers. Additionally,\n"
@@ -1609,14 +1546,14 @@
msgstr ""
#. Ovreview dialog help 2/3
-#: src/include/ftp-server/helps.rb:274
+#: src/include/ftp-server/helps.rb:262
msgid ""
"<p><b><big>Adding a FTP Server</big></b><br>\n"
"Press <b>Add</b> to configure a FTP server.</p>\n"
msgstr ""
#. Ovreview dialog help 3/3
-#: src/include/ftp-server/helps.rb:278
+#: src/include/ftp-server/helps.rb:266
msgid ""
"<p><b><big>Editing or Deleting</big></b><br>\n"
"Choose a FTP server to change or remove.\n"
@@ -1754,105 +1691,105 @@
#. Valid function of "RSA Certificate to Use for SSL Encrypted Connections"
#. check value if user enable SSL Certificate (textentry) doesn't be empty
-#: src/include/ftp-server/wid_functions.rb:1637
+#: src/include/ftp-server/wid_functions.rb:1569
msgid "RSA certificate is missing."
msgstr ""
#. Handle function of "Browse"
#. handling value in textentry of "RSA Certificate to Use for SSL Encrypted Connections"
-#: src/include/ftp-server/wid_functions.rb:1664
+#: src/include/ftp-server/wid_functions.rb:1596
msgid "Select File"
msgstr ""
#. Valid function of "Security Settings"
#. check of existing certificate
-#: src/include/ftp-server/wid_functions.rb:1722
+#: src/include/ftp-server/wid_functions.rb:1654
msgid ""
"The <tt>/etc/ssl/private/pure-ftpd.pem</tt> certificate for the SSL "
"connection is missing."
msgstr ""
#. 0 => anonymous only, 1 => authenticated only, 2=> both
-#: src/modules/FtpServer.rb:214
+#: src/modules/FtpServer.rb:212
msgid "Welcome message"
msgstr ""
#. FtpServer read dialog caption
-#: src/modules/FtpServer.rb:816
+#: src/modules/FtpServer.rb:812
msgid "Initializing FTP Configuration"
msgstr ""
#. Part for commandline - it is necessary choose daemon if both are installed
-#: src/modules/FtpServer.rb:827
+#: src/modules/FtpServer.rb:823
msgid "You have installed both daemons:"
msgstr ""
-#: src/modules/FtpServer.rb:829
+#: src/modules/FtpServer.rb:825
msgid "Choose one of them for configuration."
msgstr ""
-#: src/modules/FtpServer.rb:831
+#: src/modules/FtpServer.rb:827
msgid "Do you want to configure vsftpd? Alternatively choose pure-ftpd."
msgstr ""
-#: src/modules/FtpServer.rb:839
+#: src/modules/FtpServer.rb:835
msgid ""
"You have installed both daemons. Therefore you have to run the configuration "
"in interactive mode."
msgstr ""
#. Progress stage 1/2
-#: src/modules/FtpServer.rb:858
+#: src/modules/FtpServer.rb:854
msgid "Read settings from the config file"
msgstr ""
#. Progress stage 2/2
-#: src/modules/FtpServer.rb:860
+#: src/modules/FtpServer.rb:856
msgid "Read the previous settings"
msgstr ""
#. Progress stage 1/2
-#: src/modules/FtpServer.rb:864
+#: src/modules/FtpServer.rb:860
msgid "Reading the settings..."
msgstr ""
#. calling read function for reading settings form config file
-#: src/modules/FtpServer.rb:874
+#: src/modules/FtpServer.rb:870
msgid "Cannot Read Current Settings."
msgstr ""
#. FtpServer read dialog caption
-#: src/modules/FtpServer.rb:891
+#: src/modules/FtpServer.rb:887
msgid "Saving FTP Configuration"
msgstr ""
#. Progress stage 1/2
-#: src/modules/FtpServer.rb:901
+#: src/modules/FtpServer.rb:897
msgid "Write the settings to the config file"
msgstr ""
#. Progress stage 2/2
-#: src/modules/FtpServer.rb:903
+#: src/modules/FtpServer.rb:899
msgid "Write the settings for starting daemon"
msgstr ""
#. Progress step 1/1
-#: src/modules/FtpServer.rb:907
+#: src/modules/FtpServer.rb:903
msgid "Writing the settings..."
msgstr ""
#. write options to the config file
-#: src/modules/FtpServer.rb:917
+#: src/modules/FtpServer.rb:913
msgid "Cannot write settings!"
msgstr ""
#. write settings for starting daemon
-#: src/modules/FtpServer.rb:923
+#: src/modules/FtpServer.rb:919
msgid "Cannot write settings for xinetd!"
msgstr ""
#. write settings for starting daemon
-#: src/modules/FtpServer.rb:931
+#: src/modules/FtpServer.rb:927
msgid "Cannot create upload directory for anonymous connections."
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/geo-cluster.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/geo-cluster.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/geo-cluster.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:27+0200\n"
-"PO-Revision-Date: 2016-08-30 18:27+0200\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
+"PO-Revision-Date: 2019-09-20 15:56+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
Modified: branches/SLE12-SP5/yast/50-pot/http-server.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/http-server.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/http-server.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-17 02:28+0000\n"
-"PO-Revision-Date: 2017-03-17 02:28+0000\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
+"PO-Revision-Date: 2019-09-20 15:56+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -241,8 +241,7 @@
msgstr ""
#. translators: human-readable "default host"
-#: src/include/http-server/dialogs.rb:66
-#: src/include/http-server/dialogs.rb:172
+#: src/include/http-server/dialogs.rb:66 src/include/http-server/dialogs.rb:172
msgid "Main Host"
msgstr ""
@@ -287,8 +286,7 @@
#. translators: human-readable "default host"
#. translators: human-readable "default host"
#: src/include/http-server/dialogs.rb:302
-#: src/include/http-server/dialogs.rb:357
-#: src/modules/HttpServerWidgets.rb:1273
+#: src/include/http-server/dialogs.rb:357 src/modules/HttpServerWidgets.rb:1273
msgid "Default Host"
msgstr ""
@@ -643,10 +641,10 @@
#. translators: Listen type for all addresses;
#. translators: all network addresses Listen type
#. translators: all network addresses Listen type
-#: src/include/http-server/routines.rb:59
-#: src/modules/HttpServerWidgets.rb:2396 src/modules/HttpServerWidgets.rb:2398
-#: src/modules/HttpServerWidgets.rb:2412 src/modules/HttpServerWidgets.rb:2416
-#: src/modules/HttpServerWidgets.rb:3296 src/modules/HttpServerWidgets.rb:3301
+#: src/include/http-server/routines.rb:59 src/modules/HttpServerWidgets.rb:2396
+#: src/modules/HttpServerWidgets.rb:2398 src/modules/HttpServerWidgets.rb:2412
+#: src/modules/HttpServerWidgets.rb:2416 src/modules/HttpServerWidgets.rb:3296
+#: src/modules/HttpServerWidgets.rb:3301
msgid "All Addresses"
msgstr ""
@@ -1649,6 +1647,18 @@
msgid "Provides support for subversion"
msgstr ""
+#: src/modules/YaPI/HTTPDModules.pm:748
+msgid "Session support"
+msgstr ""
+
+#: src/modules/YaPI/HTTPDModules.pm:754
+msgid "Cookie based session support"
+msgstr ""
+
+#: src/modules/YaPI/HTTPDModules.pm:761
+msgid "DBD/SQL based session support"
+msgstr ""
+
#: src/modules/YaST/httpdUtils.pm:22
msgid "Host not found"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/inetd.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/inetd.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/inetd.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:27+0200\n"
-"PO-Revision-Date: 2016-08-30 18:27+0200\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
+"PO-Revision-Date: 2019-09-20 15:56+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -434,15 +434,15 @@
"<p><b><big>Services Status:</big></b><br>\n"
"All services marked with <b>---</b> are inactive (locked).\n"
"All services marked with <b>On</b> are active (unlocked).\n"
-"All services marked with <b>NI</b> are not installed and cannot be configured."
-"</p>"
+"All services marked with <b>NI</b> are not installed and cannot be "
+"configured.</p>"
msgstr ""
#: src/include/inetd/helps.rb:81
msgid ""
"<p><b><big>Changing Service Status:</big></b><br>\n"
-"Select the service to enable or disable and press <b>Toggle Status (On or Off)"
-"</b>.</p>\n"
+"Select the service to enable or disable and press <b>Toggle Status (On or "
+"Off)</b>.</p>\n"
msgstr ""
#: src/include/inetd/helps.rb:84
@@ -467,8 +467,8 @@
msgid ""
"<p><b><big>Canceling Configuration:</big></b>\n"
"Leave the configuration untouched by pressing the <b>Cancel</b> button.\n"
-"If you do so, all your changes will be lost and the original configuration wil"
-"l remain.</p>\n"
+"If you do so, all your changes will be lost and the original configuration "
+"will remain.</p>\n"
msgstr ""
#. Help for the EditOrCreateServiceDlg () dialog.
@@ -497,7 +497,8 @@
#: src/include/inetd/helps.rb:122
msgid ""
-"<p>This is a short description. For details, see <b>info xinetd.conf</b>.</p>\n"
+"<p>This is a short description. For details, see <b>info xinetd.conf</b>.</"
+"p>\n"
msgstr ""
#: src/include/inetd/helps.rb:125
@@ -516,8 +517,8 @@
#: src/include/inetd/helps.rb:134
msgid ""
-"<p>The <b>protocol</b> must be a valid protocol as specified in /etc/protocols"
-".\n"
+"<p>The <b>protocol</b> must be a valid protocol as specified in /etc/"
+"protocols.\n"
"Examples include <i>tcp</i>,<i>udp</i>,<i>rpc/tcp</i>, and <i>rpc/udp</i>.\n"
"</p>\n"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/installation.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/installation.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/installation.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-23 02:28+0000\n"
-"PO-Revision-Date: 2017-05-23 02:28+0000\n"
+"POT-Creation-Date: 2019-09-20 16:59+0200\n"
+"PO-Revision-Date: 2019-09-20 16:59+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -58,7 +58,7 @@
#. TRANSLATORS: busy message
#. Dialog busy message
#: src/include/installation/inst_inc_all.rb:126
-#: src/lib/installation/clients/inst_congratulate.rb:267
+#: src/lib/installation/clients/inst_congratulate.rb:271
msgid "Finishing the installation..."
msgstr ""
@@ -138,76 +138,10 @@
#. TRANSLATORS: starting the installation process
#. dialog cotent (progress information)
#: src/include/installation/inst_inc_second.rb:376
-#: src/lib/installation/clients/inst_doit.rb:60
+#: src/lib/installation/clients/inst_doit.rb:64
msgid "Starting Installation..."
msgstr ""
-#. Heading for confirmation popup before the installation really starts
-#: src/include/installation/misc.rb:167
-msgid "Confirm Installation"
-msgstr ""
-
-#. Text for confirmation popup before the installation really starts 1/3
-#: src/include/installation/misc.rb:170
-msgid "<p>Information required for the base installation is now complete.</p>"
-msgstr ""
-
-#. Text for confirmation popup before the installation really starts 2/3
-#: src/include/installation/misc.rb:182
-msgid ""
-"<p>If you continue now, <b>existing\n"
-"partitions</b> on your hard disk will be <b>deleted</b> or <b>formatted</b>\n"
-"(<b>erasing any existing data</b> in those partitions) according to the\n"
-"installation settings in the previous dialogs.</p>"
-msgstr ""
-
-#. Text for confirmation popup before the installation really starts 2/3
-#: src/include/installation/misc.rb:193
-msgid ""
-"<p>If you continue now, partitions on your\n"
-"hard disk will be modified according to the installation settings in the\n"
-"previous dialogs.</p>"
-msgstr ""
-
-#. Text for confirmation popup before the installation really starts 3/3
-#. Text for confirmation popup before the update really starts 3/3
-#. Text for confirmation popup before the update really starts 3/3
-#: src/include/installation/misc.rb:204 src/include/installation/misc.rb:222
-#: src/lib/installation/proposal_runner.rb:141
-msgid "<p>Go back and check the settings if you are unsure.</p>"
-msgstr ""
-
-#. Heading for confirmation popup before the update really starts
-#. Heading for confirmation popup before the update really starts
-#: src/include/installation/misc.rb:210
-#: src/lib/installation/proposal_runner.rb:129
-msgid "Confirm Update"
-msgstr ""
-
-#. Text for confirmation popup before the update really starts 1/3
-#. Text for confirmation popup before the update really starts 1/3
-#: src/include/installation/misc.rb:214
-#: src/lib/installation/proposal_runner.rb:133
-msgid "<p>Information required to perform an update is now complete.</p>"
-msgstr ""
-
-#. Text for confirmation popup before the update really starts 2/3
-#. Text for confirmation popup before the update really starts 2/3
-#: src/include/installation/misc.rb:216
-#: src/lib/installation/proposal_runner.rb:135
-msgid ""
-"\n"
-"<p>If you continue now, data on your hard disk will be overwritten\n"
-"according to the settings in the previous dialogs.</p>"
-msgstr ""
-
-#. Label for the button that confirms startint the installation
-#. Label for the button that confirms startint the installation
-#: src/include/installation/misc.rb:225
-#: src/lib/installation/proposal_runner.rb:144
-msgid "Start &Update"
-msgstr ""
-
#. this is a heading
#: src/lib/installation/cio_ignore.rb:66
msgid "Blacklist Devices"
@@ -243,7 +177,7 @@
msgstr ""
#. progress step title
-#: src/lib/installation/clients/copy_files_finish.rb:83
+#: src/lib/installation/clients/copy_files_finish.rb:84
msgid "Copying files to installed system..."
msgstr ""
@@ -403,7 +337,7 @@
msgstr ""
#. progress step title
-#: src/lib/installation/clients/desktop_finish.rb:70
+#: src/lib/installation/clients/desktop_finish.rb:71
msgid "Initializing default window manager..."
msgstr ""
@@ -434,7 +368,7 @@
msgstr ""
#: src/lib/installation/clients/inst_addon_update_sources.rb:172
-#: src/lib/installation/clients/inst_system_analysis.rb:296
+#: src/lib/installation/clients/inst_system_analysis.rb:309
msgid "Unknown Product"
msgstr ""
@@ -473,7 +407,7 @@
#. push button
#: src/lib/installation/clients/inst_complex_welcome.rb:178
#: src/lib/installation/clients/inst_download_release_notes.rb:206
-#: src/lib/installation/clients/inst_system_analysis.rb:294
+#: src/lib/installation/clients/inst_system_analysis.rb:307
msgid "Re&lease Notes..."
msgstr ""
@@ -524,8 +458,15 @@
msgstr ""
#. TRANSLATORS: dialog caption
+#. Layout with license section
+#.
+#. @param heading [String]
+#. @param body [String]
+#. @param confirm_button_label [String] button layout install/update
+#. @return [Yast::Term] layout
#: src/lib/installation/clients/inst_complex_welcome.rb:236
#: src/lib/installation/clients/inst_complex_welcome.rb:434
+#: src/lib/installation/inst_confirm.rb:191
msgid "License Agreement"
msgstr ""
@@ -544,12 +485,16 @@
msgstr ""
#. TRANSLATORS: check-box
+#. TRANSLATORS: check-box
#: src/lib/installation/clients/inst_complex_welcome.rb:284
+#: src/lib/installation/inst_confirm.rb:244
msgid "I &Agree to the License Terms."
msgstr ""
#. Report error about missing license acceptance
+#. Report error about missing license acceptance
#: src/lib/installation/clients/inst_complex_welcome.rb:311
+#: src/lib/installation/inst_confirm.rb:232
msgid "You must accept the license to install this product"
msgstr ""
@@ -649,16 +594,16 @@
#. #187558
#. Load Add-On products configured in the fist stage
-#: src/lib/installation/clients/inst_congratulate.rb:310
+#: src/lib/installation/clients/inst_congratulate.rb:314
msgid ""
"<p>To clone the current system, the <b>%1</b> package must be installed.</p>"
msgstr ""
-#: src/lib/installation/clients/inst_congratulate.rb:313
+#: src/lib/installation/clients/inst_congratulate.rb:317
msgid "<p>Install it now?</p>"
msgstr ""
-#: src/lib/installation/clients/inst_congratulate.rb:315
+#: src/lib/installation/clients/inst_congratulate.rb:319
msgid "autoyast2 package not installed. Cloning disabled."
msgstr ""
@@ -768,12 +713,12 @@
msgstr ""
#. TRANSLATORS: dialog caption
-#: src/lib/installation/clients/inst_doit.rb:56
+#: src/lib/installation/clients/inst_doit.rb:60
msgid "Installation - Warming Up"
msgstr ""
#. TRANSLATORS: dialog help
-#: src/lib/installation/clients/inst_doit.rb:63
+#: src/lib/installation/clients/inst_doit.rb:67
msgid "<p>Installation is just about to start!</p>"
msgstr ""
@@ -1176,14 +1121,14 @@
#. pop-up error report
#: src/lib/installation/clients/inst_system_analysis.rb:246
msgid ""
-"No hard disks were found for the installation.\n"
+"No local hard disks were found for the installation.\n"
"Please check your hardware!\n"
"%1\n"
msgstr ""
#: src/lib/installation/clients/inst_system_analysis.rb:256
msgid ""
-"No hard disks were found for the installation.\n"
+"No local hard disks were found for the installation.\n"
"During an automatic installation, they might be detected later.\n"
"(especially on S/390 or iSCSI systems)\n"
msgstr ""
@@ -1191,14 +1136,23 @@
#. pop-up error report
#: src/lib/installation/clients/inst_system_analysis.rb:267
msgid ""
-"No hard disks and no hard disk controllers were\n"
+"No local hard disks and no hard disk controllers were\n"
"found for the installation.\n"
"Check your hardware.\n"
"%1\n"
msgstr ""
+#. pop-up warning report
+#: src/lib/installation/clients/inst_system_analysis.rb:280
+msgid ""
+"No local hard disks and no hard disk controllers were\n"
+"found for the installation.\n"
+"During an automatic installation, they might be detected later.\n"
+"%1\n"
+msgstr ""
+
#. popup message
-#: src/lib/installation/clients/inst_system_analysis.rb:312
+#: src/lib/installation/clients/inst_system_analysis.rb:325
msgid ""
"Failed to initialize the software repositories.\n"
"Aborting the installation."
@@ -1699,9 +1653,23 @@
#. 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
-msgid "Computer Role"
+msgid "User Interface"
msgstr ""
+#. TRANSLATORS: Help text alerting the user about a invalid url
+#: src/lib/installation/dialogs/registration_url_dialog.rb:34
+msgid ""
+"<p>\n"
+"The registration URL provided in the command line is not valid.\n"
+"Check that you entered it correctly and try again.\n"
+"</p>"
+msgstr ""
+
+#: src/lib/installation/dialogs/registration_url_dialog.rb:41
+#: src/lib/installation/dialogs/registration_url_dialog.rb:45
+msgid "Registration URL"
+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"
@@ -1732,6 +1700,73 @@
msgid "Import SSH Configuration"
msgstr ""
+#. Heading for confirmation popup before the installation really starts
+#: src/lib/installation/inst_confirm.rb:34
+msgid "Confirm Installation"
+msgstr ""
+
+#. Text for confirmation popup before the installation really starts 1/3
+#: src/lib/installation/inst_confirm.rb:37
+msgid "<p>Information required for the base installation is now complete.</p>"
+msgstr ""
+
+#. Text for confirmation popup before the installation really starts 2/3
+#: src/lib/installation/inst_confirm.rb:47
+msgid ""
+"<p>If you continue now, <b>existing\n"
+"partitions</b> on your hard disk will be <b>deleted</b> or <b>formatted</b>\n"
+"(<b>erasing any existing data</b> in those partitions) according to the\n"
+"installation settings in the previous dialogs.</p>"
+msgstr ""
+
+#. Text for confirmation popup before the installation really starts 2/3
+#: src/lib/installation/inst_confirm.rb:55
+msgid ""
+"<p>If you continue now, partitions on your\n"
+"hard disk will be modified according to the installation settings in the\n"
+"previous dialogs.</p>"
+msgstr ""
+
+#. Text for confirmation popup before the installation really starts 3/3
+#. Text for confirmation popup before the update really starts 3/3
+#. Text for confirmation popup before the update really starts 3/3
+#: src/lib/installation/inst_confirm.rb:63
+#: src/lib/installation/inst_confirm.rb:80
+#: src/lib/installation/proposal_runner.rb:141
+msgid "<p>Go back and check the settings if you are unsure.</p>"
+msgstr ""
+
+#. Heading for confirmation popup before the update really starts
+#. Heading for confirmation popup before the update really starts
+#: src/lib/installation/inst_confirm.rb:68
+#: src/lib/installation/proposal_runner.rb:129
+msgid "Confirm Update"
+msgstr ""
+
+#. Text for confirmation popup before the update really starts 1/3
+#. Text for confirmation popup before the update really starts 1/3
+#: src/lib/installation/inst_confirm.rb:72
+#: src/lib/installation/proposal_runner.rb:133
+msgid "<p>Information required to perform an update is now complete.</p>"
+msgstr ""
+
+#. Text for confirmation popup before the update really starts 2/3
+#. Text for confirmation popup before the update really starts 2/3
+#: src/lib/installation/inst_confirm.rb:74
+#: src/lib/installation/proposal_runner.rb:135
+msgid ""
+"\n"
+"<p>If you continue now, data on your hard disk will be overwritten\n"
+"according to the settings in the previous dialogs.</p>"
+msgstr ""
+
+#. Label for the button that confirms startint the installation
+#. Label for the button that confirms startint the installation
+#: src/lib/installation/inst_confirm.rb:83
+#: src/lib/installation/proposal_runner.rb:144
+msgid "Start &Update"
+msgstr ""
+
#. progress step title
#: src/lib/installation/prep_shrink.rb:34
msgid "Shrinking PREP partition..."
@@ -2010,6 +2045,11 @@
msgid "Configure Online Repositories"
msgstr ""
+#. TRANSLATORS: Popup error requesting to choose some option.
+#: src/lib/installation/widgets/system_roles_radio_buttons.rb:85
+msgid "You must choose some option before you continue."
+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."
@@ -2104,17 +2144,3 @@
"Installation was unable to solve package dependencies automatically.\n"
"Software manager will be opened for you to solve them manually."
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 ""
-
-#: src/lib/services-manager/clients/services-manager_finish.rb:11
-msgid "Setting default target and system services ..."
-msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/instserver.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/instserver.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/instserver.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:27+0200\n"
-"PO-Revision-Date: 2016-08-30 18:27+0200\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
+"PO-Revision-Date: 2019-09-20 15:56+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -93,7 +93,7 @@
msgstr ""
#. add-on medium (e.g. service pack) doesn't match configured repository
-#: src/include/instserver/dialogs.rb:551
+#: src/include/instserver/dialogs.rb:550
msgid ""
"The medium requires product %1, which is not provided\n"
"by the current repository.\n"
@@ -102,95 +102,95 @@
msgstr ""
#. else, we create CD1, CD2, etc. (for code10 always)
-#: src/include/instserver/dialogs.rb:669
+#: src/include/instserver/dialogs.rb:668
msgid "Copying CD contents to local directory"
msgstr ""
-#: src/include/instserver/dialogs.rb:670
+#: src/include/instserver/dialogs.rb:669
msgid "This may take a while..."
msgstr ""
#. TODO: report more details (stderr)
#. rename the directory
-#: src/include/instserver/dialogs.rb:727 src/modules/Instserver.rb:1341
+#: src/include/instserver/dialogs.rb:726 src/modules/Instserver.rb:1341
msgid "Error while moving repository content."
msgstr ""
#. Instserver configuration dialog caption
#. Instserver configuration dialog caption
-#: src/include/instserver/dialogs.rb:949 src/include/instserver/dialogs.rb:1162
+#: src/include/instserver/dialogs.rb:948 src/include/instserver/dialogs.rb:1161
msgid "Repository Configuration"
msgstr ""
#. Instserver configure1 dialog contents
-#: src/include/instserver/dialogs.rb:965
+#: src/include/instserver/dialogs.rb:964
msgid "Read &CD or DVD Medium"
msgstr ""
-#: src/include/instserver/dialogs.rb:971
+#: src/include/instserver/dialogs.rb:970
msgid "Data &Source"
msgstr ""
-#: src/include/instserver/dialogs.rb:979
+#: src/include/instserver/dialogs.rb:978
msgid "Use &ISO Images"
msgstr ""
-#: src/include/instserver/dialogs.rb:988
+#: src/include/instserver/dialogs.rb:987
msgid "Di&rectory with CD Images:"
msgstr ""
-#: src/include/instserver/dialogs.rb:991 src/include/instserver/dialogs.rb:1371
+#: src/include/instserver/dialogs.rb:990 src/include/instserver/dialogs.rb:1370
msgid "Select &Directory"
msgstr ""
#. abort?
#. abort?
-#: src/include/instserver/dialogs.rb:1034
-#: src/include/instserver/dialogs.rb:1440
+#: src/include/instserver/dialogs.rb:1033
+#: src/include/instserver/dialogs.rb:1439
msgid "Select Directory"
msgstr ""
#. abort?
-#: src/include/instserver/dialogs.rb:1051
-#: src/include/instserver/dialogs.rb:1215
+#: src/include/instserver/dialogs.rb:1050
+#: src/include/instserver/dialogs.rb:1214
msgid "Installation server name missing."
msgstr ""
-#: src/include/instserver/dialogs.rb:1066
+#: src/include/instserver/dialogs.rb:1065
msgid ""
"Contents already exist in this directory.\n"
"Not copying CDs."
msgstr ""
#. for translators: popup question (prefer more shorter lines than few long lines)
-#: src/include/instserver/dialogs.rb:1094
+#: src/include/instserver/dialogs.rb:1093
msgid ""
"Add an additional product (Service Pack, Additional\n"
"Package CD, etc.) to the repository?"
msgstr ""
#. Instserver configure1 dialog contents
-#: src/include/instserver/dialogs.rb:1170
+#: src/include/instserver/dialogs.rb:1169
msgid "Repository &Name:"
msgstr ""
-#: src/include/instserver/dialogs.rb:1175
+#: src/include/instserver/dialogs.rb:1174
msgid "A&nnounce as Installation Service with SLP"
msgstr ""
-#: src/include/instserver/dialogs.rb:1223
+#: src/include/instserver/dialogs.rb:1222
msgid "Invalid repository name."
msgstr ""
#. an error message - entered repository name already exists
-#: src/include/instserver/dialogs.rb:1231
+#: src/include/instserver/dialogs.rb:1230
msgid ""
"Repository '%1' already exists,\n"
"enter another name."
msgstr ""
#. create directory only for a new repository
-#: src/include/instserver/dialogs.rb:1244
+#: src/include/instserver/dialogs.rb:1243
msgid ""
"Error while creating <tt>repository</tt> directory.\n"
"Verify that the directory \n"
@@ -199,7 +199,7 @@
msgstr ""
#. confirm removal of a repository, the action is done immediately and cannot be reverted
-#: src/include/instserver/dialogs.rb:1263
+#: src/include/instserver/dialogs.rb:1262
msgid ""
"Repository '%1' has been marked to delete.\n"
"When adding a new repository with the same name\n"
@@ -209,87 +209,87 @@
msgstr ""
#. Instserver server dialog caption
-#: src/include/instserver/dialogs.rb:1347
+#: src/include/instserver/dialogs.rb:1346
msgid "Initial Setup -- Initial Setup"
msgstr ""
-#: src/include/instserver/dialogs.rb:1363
+#: src/include/instserver/dialogs.rb:1362
msgid "Do Not Configure Any Net&work Services"
msgstr ""
-#: src/include/instserver/dialogs.rb:1368
+#: src/include/instserver/dialogs.rb:1367
msgid "Di&rectory to Contain Repositories:"
msgstr ""
#. radio button label
-#: src/include/instserver/dialogs.rb:1383
+#: src/include/instserver/dialogs.rb:1382
msgid "&Configure as HTTP Repository"
msgstr ""
#. radio button label
-#: src/include/instserver/dialogs.rb:1391
+#: src/include/instserver/dialogs.rb:1390
msgid "&Configure as FTP Repository"
msgstr ""
#. radio button label
-#: src/include/instserver/dialogs.rb:1399
+#: src/include/instserver/dialogs.rb:1398
msgid "&Configure as NFS Repository"
msgstr ""
-#: src/include/instserver/dialogs.rb:1451
+#: src/include/instserver/dialogs.rb:1450
msgid "Directory path for the installation server missing."
msgstr ""
#. Instserver configure2 dialog caption
-#: src/include/instserver/dialogs.rb:1478
+#: src/include/instserver/dialogs.rb:1477
msgid "Installation Server -- NFS"
msgstr ""
#. Instserver nfs dialog contents
-#: src/include/instserver/dialogs.rb:1496
+#: src/include/instserver/dialogs.rb:1495
msgid "&Host Wild Card"
msgstr ""
-#: src/include/instserver/dialogs.rb:1498
+#: src/include/instserver/dialogs.rb:1497
msgid "&Options"
msgstr ""
#. store the firewall setting, (activation is in SetupNFS())
-#: src/include/instserver/dialogs.rb:1556
+#: src/include/instserver/dialogs.rb:1555
msgid "Error occurred while configuring NFS."
msgstr ""
#. Instserver configure2 dialog caption
-#: src/include/instserver/dialogs.rb:1588
+#: src/include/instserver/dialogs.rb:1587
msgid "Installation Server -- FTP"
msgstr ""
#. Instserver nfs dialog contents
-#: src/include/instserver/dialogs.rb:1596
+#: src/include/instserver/dialogs.rb:1595
msgid "&FTP Server Root Directory:"
msgstr ""
-#: src/include/instserver/dialogs.rb:1598
+#: src/include/instserver/dialogs.rb:1597
msgid "&Directory Alias:"
msgstr ""
#. store the firewall setting, (activation is in SetupFTP())
-#: src/include/instserver/dialogs.rb:1655
+#: src/include/instserver/dialogs.rb:1654
msgid "Error occurred while configuring FTP."
msgstr ""
#. Instserver configure2 dialog caption
-#: src/include/instserver/dialogs.rb:1675
+#: src/include/instserver/dialogs.rb:1674
msgid "Installation Server -- HTTP"
msgstr ""
#. Instserver nfs dialog contents
-#: src/include/instserver/dialogs.rb:1691
+#: src/include/instserver/dialogs.rb:1690
msgid "&Directory Alias"
msgstr ""
#. store the firewall setting, (activation is in SetupHTTP())
-#: src/include/instserver/dialogs.rb:1748
+#: src/include/instserver/dialogs.rb:1747
msgid "Error creating HTTPD configuration."
msgstr ""
@@ -332,15 +332,16 @@
#: src/include/instserver/helps.rb:39
msgid ""
"<p>If you need to restrict access to the exported directories to certain \n"
-"hosts, add a more restrictive wild card mask. For example, use <em>192.168.1.0"
-"/24</em>\n"
+"hosts, add a more restrictive wild card mask. For example, use "
+"<em>192.168.1.0/24</em>\n"
"to restrict access to the <em>192.168.1.0</em> subnet.\n"
"</p>\n"
msgstr ""
#: src/include/instserver/helps.rb:45
msgid ""
-"<p>Additionally, set the export options. For more details about the available\n"
+"<p>Additionally, set the export options. For more details about the "
+"available\n"
"options, see the manual page for <em>exports</em> (man exports(5))\n"
"</p>\n"
msgstr ""
@@ -374,8 +375,8 @@
#: src/include/instserver/helps.rb:66
msgid ""
-"<p>The installation server will be available to clients using the following UR"
-"L:\n"
+"<p>The installation server will be available to clients using the following "
+"URL:\n"
"</p>\n"
msgstr ""
@@ -401,8 +402,8 @@
#: src/include/instserver/helps.rb:78
msgid ""
"<p>Select a short and easy to remember alias. For example, if you select\n"
-"<em>SUSE</em> as the alias, the repositories will be available as shown below:"
-"</p>\n"
+"<em>SUSE</em> as the alias, the repositories will be available as shown "
+"below:</p>\n"
msgstr ""
#: src/include/instserver/helps.rb:81
@@ -419,7 +420,8 @@
#: src/include/instserver/helps.rb:85
msgid ""
-"<p>The repository name is used to create a directory under which all product\n"
+"<p>The repository name is used to create a directory under which all "
+"product\n"
"CDs are copied and managed. The repository is accessed using the\n"
"configured protocol (NFS, FTP, or HTTP).</p> \n"
msgstr ""
@@ -430,23 +432,24 @@
#: src/include/instserver/helps.rb:91
msgid ""
-"<p>SLP (Service Location Protocol) facilitates finding an installation server."
-" \n"
+"<p>SLP (Service Location Protocol) facilitates finding an installation "
+"server. \n"
"If checked, the repository will be announced on the network using SLP.</p>\n"
msgstr ""
#: src/include/instserver/helps.rb:95
msgid ""
-"<p>Select a source drive from the list, insert the first medium of a base prod"
-"uct, and press\n"
+"<p>Select a source drive from the list, insert the first medium of a base "
+"product, and press\n"
"<b>Next</b> to copy the content into the local repository.</p>\n"
msgstr ""
#: src/include/instserver/helps.rb:98
msgid ""
-"<p>When the base media are copied to the local repository, you can add additio"
-"nal\n"
-"CDs to the repository (for example, Service Pack CDs or any add-on CDs).</p>\n"
+"<p>When the base media are copied to the local repository, you can add "
+"additional\n"
+"CDs to the repository (for example, Service Pack CDs or any add-on CDs).</"
+"p>\n"
msgstr ""
#: src/include/instserver/helps.rb:101
@@ -455,8 +458,8 @@
#: src/include/instserver/helps.rb:102
msgid ""
-"<p>ISO images can be used instead of CD or DVD media. If you press <b>Next</b>"
-", you can\n"
+"<p>ISO images can be used instead of CD or DVD media. If you press <b>Next</"
+"b>, you can\n"
"select ISO image files.</p>\n"
msgstr ""
@@ -501,11 +504,11 @@
#: src/include/instserver/helps.rb:129
msgid ""
"<p><b>Adding a Repository:</b><br>\n"
-"Unconfigured directories are detected in the repository directory and then mad"
-"e \n"
+"Unconfigured directories are detected in the repository directory and then "
+"made \n"
"available for configuration.\n"
-"To add a repository, select it from the list of unconfigured repositories and "
-"press <b>Configure</b>.</p>\n"
+"To add a repository, select it from the list of unconfigured repositories "
+"and press <b>Configure</b>.</p>\n"
msgstr ""
#. Summary dialog help 3/3
@@ -542,8 +545,8 @@
#. Read service data using _auto
#: src/modules/Instserver.rb:306
msgid ""
-"The FTP installation server requires an FTP server package. The vsftpd package"
-"\n"
+"The FTP installation server requires an FTP server package. The vsftpd "
+"package\n"
"will now be installed.\n"
msgstr ""
@@ -556,8 +559,8 @@
#: src/modules/Instserver.rb:458
msgid ""
-"The HTTP installation server requires an HTTP server package. The apache2 pack"
-"age\n"
+"The HTTP installation server requires an HTTP server package. The apache2 "
+"package\n"
"will now be installed."
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/iplb.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/iplb.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/iplb.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:27+0200\n"
-"PO-Revision-Date: 2016-08-30 18:27+0200\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
+"PO-Revision-Date: 2019-09-20 15:56+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -177,148 +177,151 @@
"</p><p>Default: 10 seconds\n"
"\n"
"</p><p><b><big>check timeout</big> =</b> <i>n</i>\n"
-"</p><p>Timeout in seconds for connect, external and ping checks. If the timeou"
-"t is exceeded then the real server is declared dead.\n"
-"</p><p>If defined in a virtual server section then the global value is overrid"
-"den.\n"
-"</p><p>If undefined then the value of negotiatetimeout is used. negotiatetimeo"
-"ut is also a global value that may be overriden by a per-virtual setting.\n"
-"</p><p>If both checktimeout and negotiatetimeout are unset, the default is use"
-"d.\n"
+"</p><p>Timeout in seconds for connect, external and ping checks. If the "
+"timeout is exceeded then the real server is declared dead.\n"
+"</p><p>If defined in a virtual server section then the global value is "
+"overridden.\n"
+"</p><p>If undefined then the value of negotiatetimeout is used. "
+"negotiatetimeout is also a global value that may be overriden by a per-"
+"virtual setting.\n"
+"</p><p>If both checktimeout and negotiatetimeout are unset, the default is "
+"used.\n"
"</p><p>Default: 5 seconds\n"
"\n"
"</p><p><b><big>failure count</big> =</b> <i>n</i>\n"
-"</p><p>The number of consecutive times a failure will have to be reported by a"
-" check before the realserver is considered to have failed. A value of 1 will "
-"have the realserver considered failed on the first failure. A successful chec"
-"k will reset the failure counter to 0.\n"
-"</p><p>If defined in a virtual server section then the global value is overrid"
-"den.\n"
+"</p><p>The number of consecutive times a failure will have to be reported by "
+"a check before the realserver is considered to have failed. A value of 1 "
+"will have the realserver considered failed on the first failure. A "
+"successful check will reset the failure counter to 0.\n"
+"</p><p>If defined in a virtual server section then the global value is "
+"overridden.\n"
"</p><p>Default: 1\n"
"\n"
"</p><p><b><big>negotiate timeout</big> =</b> <i>n</i>\n"
"</p><p>Timeout in seconds for negotiate checks.\n"
-"</p><p>If defined in a virtual server section then the global value is overrid"
-"den.\n"
-"</p><p>If undefined then the value of connecttimeout is used. connecttimeout i"
-"s also a global value that may be overriden by a per-virtual setting.\n"
-"</p><p>If both negotiatetimeout and connecttimeout are unset, the default is u"
-"sed.\n"
+"</p><p>If defined in a virtual server section then the global value is "
+"overridden.\n"
+"</p><p>If undefined then the value of connecttimeout is used. connecttimeout "
+"is also a global value that may be overriden by a per-virtual setting.\n"
+"</p><p>If both negotiatetimeout and connecttimeout are unset, the default is "
+"used.\n"
"</p><p>Default: 30 seconds\n"
"\n"
-"</p><p><b><big>fallback</big> =</b> <i>ip_address|hostname[:portnumber|sercvic"
-"ename]</i> [<b>gate</b>|<b>masq</b>|<b>ipip</b>]\n"
-"</p><p>the server onto which a webservice is redirected if all real servers ar"
-"e down. Typically this would be 127.0.0.1 with an emergency page.\n"
-"</p><p>If defined in a virtual server section then the global value is overrid"
-"den.\n"
+"</p><p><b><big>fallback</big> =</b> <i>ip_address|hostname[:portnumber|"
+"sercvicename]</i> [<b>gate</b>|<b>masq</b>|<b>ipip</b>]\n"
+"</p><p>the server onto which a webservice is redirected if all real servers "
+"are down. Typically this would be 127.0.0.1 with an emergency page.\n"
+"</p><p>If defined in a virtual server section then the global value is "
+"overridden.\n"
"\n"
-"</p><p><b><big>log file</big> = \"</b><i>/path/to/logfile</i><b>\"</b>|syslog_fa"
-"cility\n"
-"</p><p>An alternative logfile might be specified with this directive. If the l"
-"ogfile does not have a leading '/', it is assumed to be a <b><a href=\"/man/3/s"
-"yslog\">syslog</a></b>(3) facility name.\n"
+"</p><p><b><big>log file</big> = \"</b><i>/path/to/logfile</i><b>\"</b>|"
+"syslog_facility\n"
+"</p><p>An alternative logfile might be specified with this directive. If the "
+"logfile does not have a leading '/', it is assumed to be a <b><a href=\"/"
+"man/3/syslog\">syslog</a></b>(3) facility name.\n"
"</p><p>Default: log directly to the file <i>/var/log/ldirectord.log</i>.\n"
"\n"
"</p><p><b><big>email alert</big> = \"</b><i>emailaddress</i><b>\"</b>\n"
-"</p><p>A valid email address for sending alerts about the changed connection s"
-"tatus to any real server defined in the virtual service. This option requires "
-"perl\n"
-"module MailTools to be installed. Automatically tries to send email using any "
-"of the built-in methods. See perldoc Mail::Mailer for more info on methods.\n"
-"</p><p>If defined in a virtual server section then the global value is overrid"
-"den.\n"
+"</p><p>A valid email address for sending alerts about the changed connection "
+"status to any real server defined in the virtual service. This option "
+"requires perl\n"
+"module MailTools to be installed. Automatically tries to send email using "
+"any of the built-in methods. See perldoc Mail::Mailer for more info on "
+"methods.\n"
+"</p><p>If defined in a virtual server section then the global value is "
+"overridden.\n"
"\n"
"</p><p><b><big>email alert freq</big> =</b> <i>n</i>\n"
-"</p><p>Delay in seconds between repeating email alerts while any given real se"
-"rver in the virtual service remains inaccessible. A setting of zero seconds wi"
-"ll\n"
-"inhibit the repeating alerts. The email timing accuracy of this setting is dep"
-"endent on the number of seconds defined in the checkinterval configuration\n"
+"</p><p>Delay in seconds between repeating email alerts while any given real "
+"server in the virtual service remains inaccessible. A setting of zero "
+"seconds will\n"
+"inhibit the repeating alerts. The email timing accuracy of this setting is "
+"dependent on the number of seconds defined in the checkinterval "
+"configuration\n"
"option.\n"
-"</p><p>If defined in a virtual server section then the global value is overrid"
-"den.\n"
+"</p><p>If defined in a virtual server section then the global value is "
+"overridden.\n"
"</p><p>Default: 0\n"
"\n"
-"</p><p><b><big>email alert status</big> = all</b>|<b>none</b>|<b>starting</b>|"
-"<b>running</b>|<b>stopping</b>|<b>reloading</b>,...\n"
-"</p><p>Comma delimited list of server states in which email alerts should be s"
-"ent. <b>all</b> is a short-hand for\n"
-"\"<b>starting</b>,<b>running</b>,<b>stopping</b>,<b>reloading</b>\". If <b>none<"
-"/b> is specified, no other option may be specified, otherwise options are ORed"
-"\n"
+"</p><p><b><big>email alert status</big> = all</b>|<b>none</b>|<b>starting</"
+"b>|<b>running</b>|<b>stopping</b>|<b>reloading</b>,...\n"
+"</p><p>Comma delimited list of server states in which email alerts should be "
+"sent. <b>all</b> is a short-hand for\n"
+"\"<b>starting</b>,<b>running</b>,<b>stopping</b>,<b>reloading</b>\". If "
+"<b>none</b> is specified, no other option may be specified, otherwise "
+"options are ORed\n"
"with each other.\n"
-"</p><p>If defined in a virtual server section then the global value is overrid"
-"den.\n"
+"</p><p>If defined in a virtual server section then the global value is "
+"overridden.\n"
"</p><p>Default: all\n"
"\n"
"</p><p><b><big>callback</big> = \"</b><i>/path/to/callback</i><b>\"</b>\n"
-"</p><p>If this directive is defined, <b>ldirectord</b> automatically calls the"
-" executable <i>/path/to/callback</i> after the configuration file has changed "
-"on\n"
-"disk. This is useful to update the configuration file through <b>scp</b> on th"
-"e other heartbeated host. The first argument to the callback is the name of th"
-"e\n"
+"</p><p>If this directive is defined, <b>ldirectord</b> automatically calls "
+"the executable <i>/path/to/callback</i> after the configuration file has "
+"changed on\n"
+"disk. This is useful to update the configuration file through <b>scp</b> on "
+"the other heartbeated host. The first argument to the callback is the name "
+"of the\n"
"configuration.\n"
-"</p><p>This directive might also be used to restart <b>ldirectord</b> automati"
-"cally after the configuration file changed on disk. However, if <b>autoreload<"
-"/b> is\n"
+"</p><p>This directive might also be used to restart <b>ldirectord</b> "
+"automatically after the configuration file changed on disk. However, if "
+"<b>autoreload</b> is\n"
"set to yes, the configuration is reloaded anyway.\n"
"\n"
"</p><p><b><big>execute</big> = \"</b><i>configuration</i><b>\"</b>\n"
-"</p><p>Use this directive to start an instance of ldirectord for the named <i>"
-"configuration</i>.\n"
+"</p><p>Use this directive to start an instance of ldirectord for the named "
+"<i>configuration</i>.\n"
"\n"
"</p><p><b><big>auto reload</big> = yes</b>|<b>no</b>\n"
-"</p><p>Defines if <ldirectord> should continuously check the configurati"
-"on file for modification. If this is set to 'yes' and the configuration file c"
-"hanged\n"
-"on disk and its modification time (mtime) is newer than the previous version, "
-"the configuration is automatically reloaded.\n"
+"</p><p>Defines if <ldirectord> should continuously check the "
+"configuration file for modification. If this is set to 'yes' and the "
+"configuration file changed\n"
+"on disk and its modification time (mtime) is newer than the previous "
+"version, the configuration is automatically reloaded.\n"
"</p><p>Default: no\n"
"\n"
"</p><p><b><big>quiescent</big> = yes</b>|<b>no</b>\n"
-"</p><p>If <i>yes</i>, then when real or failback servers are determined to be "
-"down, they are not actually removed from the kernel's <small>LVS</small> table"
-".\n"
-"Rather, their weight is set to zero which means that no new connections will b"
-"e accepted.\n"
-"</p><p>This has the side effect, that if the real server has persistent connec"
-"tions, new connections from any existing clients will continue to be routed to"
-" the\n"
-"real server, until the persistant timeout can expire. See ipvsadm for more inf"
-"ormation on persistant connections.\n"
+"</p><p>If <i>yes</i>, then when real or failback servers are determined to "
+"be down, they are not actually removed from the kernel's <small>LVS</small> "
+"table.\n"
+"Rather, their weight is set to zero which means that no new connections will "
+"be accepted.\n"
+"</p><p>This has the side effect, that if the real server has persistent "
+"connections, new connections from any existing clients will continue to be "
+"routed to the\n"
+"real server, until the persistant timeout can expire. See ipvsadm for more "
+"information on persistant connections.\n"
"</p><p>This side-effect can be avoided by running the following:\n"
"</p><p>echo 1 > /proc/sys/net/ipv4/vs/expire_quiescent_template\n"
-"</p><p>If the proc file isn't present this probably means that the kernel does"
-"n't have lvs support, <small>LVS</small> support isn't loaded, or the kernel i"
-"s too\n"
-"old to have the proc file. Running ipvsadm as root should load <small>LVS</sma"
-"ll> into the kernel if it is possible.\n"
-"</p><p>If <i>no</i>, then the real or failback servers will be removed from th"
-"e kernel's <small>LVS</small> table. The default is <i>yes</i>.\n"
-"</p><p>If defined in a virtual server section then the global value is overrid"
-"den.\n"
+"</p><p>If the proc file isn't present this probably means that the kernel "
+"doesn't have lvs support, <small>LVS</small> support isn't loaded, or the "
+"kernel is too\n"
+"old to have the proc file. Running ipvsadm as root should load <small>LVS</"
+"small> into the kernel if it is possible.\n"
+"</p><p>If <i>no</i>, then the real or failback servers will be removed from "
+"the kernel's <small>LVS</small> table. The default is <i>yes</i>.\n"
+"</p><p>If defined in a virtual server section then the global value is "
+"overridden.\n"
"</p><p>Default: <i>yes</i>\n"
"\n"
"</p><p><b><big>fork</big> = yes</b>|<b>no</b>\n"
-"</p><p>If <i>yes</i>, then ldirectord will spawn a child proccess for every vi"
-"rtual server, and run checks against the real servers from them. This will inc"
-"rease\n"
-"response times to changes in real server status in configurations with many vi"
-"rtual servers. This may also use less memory then running many seperate instan"
-"ces\n"
+"</p><p>If <i>yes</i>, then ldirectord will spawn a child proccess for every "
+"virtual server, and run checks against the real servers from them. This will "
+"increase\n"
+"response times to changes in real server status in configurations with many "
+"virtual servers. This may also use less memory then running many seperate "
+"instances\n"
"of ldirectord. Child processes will be automaticly restarted if they die.\n"
"</p><p>Default: <i>no</i>\n"
"\n"
"</p><p><b><big>supervised</big> = yes</b>|<b>no</b>\n"
-"</p><p>If <i>yes</i>, then ldirectord does not go into background mode. All lo"
-"g-messages are redirected to stdout instead of a logfile. This is useful to ru"
-"n\n"
-"<b>ldirectord</b> supervised from daemontools. See <a href=\"http://untroubled."
-"org/rpms/daemontools/\">http://untroubled.org/rpms/daemontools/</a> or <a href="
-"\"http://cr.yp.to/daemontools.html\">http://cr.yp.to/daemontools.html</a> for de"
-"tails.\n"
+"</p><p>If <i>yes</i>, then ldirectord does not go into background mode. All "
+"log-messages are redirected to stdout instead of a logfile. This is useful "
+"to run\n"
+"<b>ldirectord</b> supervised from daemontools. See <a href=\"http://"
+"untroubled.org/rpms/daemontools/\">http://untroubled.org/rpms/daemontools/</"
+"a> or <a href=\"http://cr.yp.to/daemontools.html\">http://cr.yp.to/"
+"daemontools.html</a> for details.\n"
"</p><p>Default: <i>no</i>\n"
"</p>\n"
msgstr ""
@@ -326,82 +329,87 @@
#: src/include/iplb/helps.rb:127
msgid ""
"\n"
-"<p><b><big>virtual server</big> =</b> <i>(ip_address|hostname:portnumber|servi"
-"cename)|firewall-mark</i>\n"
-"</p><p>Defines a virtual service by IP-address (or hostname) and port (or serv"
-"icename) or firewall-mark. A firewall-mark is an integer greater than zero. Th"
-"e\n"
-"configuration of marking packets is controled using the <tt>\"-m\"</tt> option t"
-"o <b>ipchains</b>(8). All real services and flags for a virtual service\n"
+"<p><b><big>virtual server</big> =</b> <i>(ip_address|hostname:portnumber|"
+"servicename)|firewall-mark</i>\n"
+"</p><p>Defines a virtual service by IP-address (or hostname) and port (or "
+"servicename) or firewall-mark. A firewall-mark is an integer greater than "
+"zero. The\n"
+"configuration of marking packets is controled using the <tt>\"-m\"</tt> "
+"option to <b>ipchains</b>(8). All real services and flags for a virtual "
+"service\n"
"must follow this line immediately and be indented.\n"
"\n"
"\n"
-"</p><p><b><big>real servers</big> =</b> <i>ip_address|hostname[->ip_address"
-"|hostname][:portnumber|servicename</i>]\n"
-"<b>gate</b>|<b>masq</b>|<b>ipip</b> [<i>weight</i>] [<b>\"</b><i>request</i><b>"
-"\", \"</b><i>receive</i><b>\"</b>]\n"
-"</p><p>Defines a real service by IP-address (or hostname) and port (or service"
-"name). If the port is omitted then a 0 will be used, this is intended primaril"
-"y for\n"
-"fwmark services where the port for real servers is ignored. Optionally a range"
-" of <small>IP</small> addresses (or two hostnames) may be given, in which case"
-"\n"
-"each <small>IP</small> address in the range will be treated as a real server u"
-"sing the given port. The second argument defines the forwarding method, must b"
-"e\n"
-"<b>gate</b>, <b>ipip</b> or <b>masq</b>. The thrid argument is optional and de"
-"fines the weight for that real server. If omitted then a weight of 1 will be\n"
-"used. The last two arguments are also optional. They define a request-receive "
-"pair to be used to check if a server is alive. They override the request-recei"
-"ve\n"
-"pair in the virtual server section. These two strings must be quoted. If the r"
-"equest string starts with http://... the IP-address and port of the real\n"
-"server is overridden, otherwise the IP-address and port of the real server is "
-"used.\n"
-"</p><p>For <small>TCP</small> and <small>UDP</small> (non fwmark) virtual serv"
-"ices, unless the forwarding method is masq and the <small>IP</small> address o"
-"f a\n"
-"real server is non-local (not present on a interface on the host running ldire"
-"ctord) then the port of the real server will be set to that of its virtual\n"
-"service. That is, port-mapping is only available to if the real server is anot"
-"her machine and the forwarding method is masq. This is due to the way that the"
-"\n"
+"</p><p><b><big>real servers</big> =</b> <i>ip_address|hostname[->"
+"ip_address|hostname][:portnumber|servicename</i>]\n"
+"<b>gate</b>|<b>masq</b>|<b>ipip</b> [<i>weight</i>] [<b>\"</b><i>request</"
+"i><b>\", \"</b><i>receive</i><b>\"</b>]\n"
+"</p><p>Defines a real service by IP-address (or hostname) and port (or "
+"servicename). If the port is omitted then a 0 will be used, this is intended "
+"primarily for\n"
+"fwmark services where the port for real servers is ignored. Optionally a "
+"range of <small>IP</small> addresses (or two hostnames) may be given, in "
+"which case\n"
+"each <small>IP</small> address in the range will be treated as a real server "
+"using the given port. The second argument defines the forwarding method, "
+"must be\n"
+"<b>gate</b>, <b>ipip</b> or <b>masq</b>. The thrid argument is optional and "
+"defines the weight for that real server. If omitted then a weight of 1 will "
+"be\n"
+"used. The last two arguments are also optional. They define a request-"
+"receive pair to be used to check if a server is alive. They override the "
+"request-receive\n"
+"pair in the virtual server section. These two strings must be quoted. If the "
+"request string starts with http://... the IP-address and port of the real\n"
+"server is overridden, otherwise the IP-address and port of the real server "
+"is used.\n"
+"</p><p>For <small>TCP</small> and <small>UDP</small> (non fwmark) virtual "
+"services, unless the forwarding method is masq and the <small>IP</small> "
+"address of a\n"
+"real server is non-local (not present on a interface on the host running "
+"ldirectord) then the port of the real server will be set to that of its "
+"virtual\n"
+"service. That is, port-mapping is only available to if the real server is "
+"another machine and the forwarding method is masq. This is due to the way "
+"that the\n"
"underlying <small>LVS</small> code in the kernel functions.\n"
-"</p><p>More than one of these entries may be inside a virtual section. The che"
-"cktimeout, negotiatetimeout, failurecount, fallback, emailalert, emailalertfre"
-"q and\n"
-"quiescent options listed above may also appear inside a virtual section, in wh"
-"ich case the global setting is overridden.\n"
+"</p><p>More than one of these entries may be inside a virtual section. The "
+"checktimeout, negotiatetimeout, failurecount, fallback, emailalert, "
+"emailalertfreq and\n"
+"quiescent options listed above may also appear inside a virtual section, in "
+"which case the global setting is overridden.\n"
"\n"
"\n"
-"</p><p><b><big>check type</big> = connect</b>|<b>external</b>|<b>negotiate</b>"
-"|<b>off</b>|<b>on</b>|<b>ping</b>|<b>checktimeout</b><i>N</i>\n"
-"</p><p>Type of check to perform. Negotiate sends a request and matches a recei"
-"ve string. Connect only attemts to make a <small>TCP/IP</small> connection, th"
-"us the\n"
-"request and receive strings may be omitted. If checktype is a number then nego"
-"tiate and connect is combined so that after each N connect attempts one negoti"
-"ate\n"
-"attempt is performed. This is useful to check often if a service answers and i"
-"n much longer intervalls a negotiating check is done. Ping means that\n"
-"<small>ICMP</small> ping will be used to test the availability of real servers"
-". Ping is also used as the connect check for <small>UDP</small> services. Off\n"
-"means no checking will take place and no real or fallback servers will be acti"
-"vated. On means no checking will take place and real servers will always be\n"
+"</p><p><b><big>check type</big> = connect</b>|<b>external</b>|<b>negotiate</"
+"b>|<b>off</b>|<b>on</b>|<b>ping</b>|<b>checktimeout</b><i>N</i>\n"
+"</p><p>Type of check to perform. Negotiate sends a request and matches a "
+"receive string. Connect only attemts to make a <small>TCP/IP</small> "
+"connection, thus the\n"
+"request and receive strings may be omitted. If checktype is a number then "
+"negotiate and connect is combined so that after each N connect attempts one "
+"negotiate\n"
+"attempt is performed. This is useful to check often if a service answers and "
+"in much longer intervalls a negotiating check is done. Ping means that\n"
+"<small>ICMP</small> ping will be used to test the availability of real "
+"servers. Ping is also used as the connect check for <small>UDP</small> "
+"services. Off\n"
+"means no checking will take place and no real or fallback servers will be "
+"activated. On means no checking will take place and real servers will always "
+"be\n"
"activated. Default is <i>negotiate</i>.\n"
"\n"
"\n"
-"</p><p><b><big>service</big> = dns</b>|<b>ftp</b>|<b>http</b>|<b>https</b>|<b>"
-"imap</b>|<b>imaps</b>|<b>ldap</b>|<b>mysql</b>|<b>nntp</b>|<b>none</b>|<b>orac"
-"le</b>|<b>pgsql</b>|<b>pop</b>|<b>pops</b>|<b>radius</b>|<b>simpletcp</b>|<b>s"
-"ip</b>|<b>smtp</b>\n"
-"</p><p>The type of service to monitor when using checktype=negotiate. None den"
-"otes a service that will not be monitored.\n"
-"</p><p>simpletcp sends the <b>request</b> string to the server and tests it ag"
-"ainst the <b>receive</b> regexp. The other types of checks connect to the serv"
-"er\n"
-"using the specified protocol. Please see the <b>request</b> and <b>receive</b>"
-" sections for protocol specific information.\n"
+"</p><p><b><big>service</big> = dns</b>|<b>ftp</b>|<b>http</b>|<b>https</b>|"
+"<b>imap</b>|<b>imaps</b>|<b>ldap</b>|<b>mysql</b>|<b>nntp</b>|<b>none</b>|"
+"<b>oracle</b>|<b>pgsql</b>|<b>pop</b>|<b>pops</b>|<b>radius</b>|"
+"<b>simpletcp</b>|<b>sip</b>|<b>smtp</b>\n"
+"</p><p>The type of service to monitor when using checktype=negotiate. None "
+"denotes a service that will not be monitored.\n"
+"</p><p>simpletcp sends the <b>request</b> string to the server and tests it "
+"against the <b>receive</b> regexp. The other types of checks connect to the "
+"server\n"
+"using the specified protocol. Please see the <b>request</b> and <b>receive</"
+"b> sections for protocol specific information.\n"
"</p><p>Default:\n"
"</p><dl compact=\"compact\">\n"
"<dt>* Virtual server port is 21: ftp\n"
@@ -424,9 +432,9 @@
"\n"
"\n"
"</dt><dt><b><big>check command</big> = \"</b><i>path to script</i><b>\"</b>\n"
-"<p>This setting is used if checktype is external and is the command to be run "
-"to check the status of a real server. It should exit with status 0 if everythi"
-"ng\n"
+"<p>This setting is used if checktype is external and is the command to be "
+"run to check the status of a real server. It should exit with status 0 if "
+"everything\n"
"is ok, or non-zero otherwise.\n"
"</p><p>Four parameters are passed to the script:\n"
"</p></dt><dt>* virtual server ip/firewall mark\n"
@@ -437,100 +445,105 @@
"\n"
"\n"
"<p><b><big>check port</big> =</b> <i>n</i>\n"
-"</p><p>Number of port to monitor. Sometimes check port differs from service po"
-"rt.\n"
+"</p><p>Number of port to monitor. Sometimes check port differs from service "
+"port.\n"
"</p><p>Default: port specified for each real server\n"
"\n"
"\n"
-"</p><p><b><big>request</big> = \"</b><i>uri to requested object</i><b>\"</b>\n"
-"</p><p>This object will be requested each checkinterval seconds on each real s"
-"erver. The string must be inside quotes. Note that this string may be overridd"
-"en by\n"
+"</p><p><b><big>request</big> = \"</b><i>uri to requested object</i><b>\"</"
+"b>\n"
+"</p><p>This object will be requested each checkinterval seconds on each real "
+"server. The string must be inside quotes. Note that this string may be "
+"overridden by\n"
"an optional per real-server based request-string.\n"
-"</p><p>For a <small>DNS</small> check this should the name of an A record, or "
-"the address of a <small>PTR</small> record to look up.\n"
-"</p><p>For a MySQL, Oracle or PostgeSQL check, this should be an <small>SQL</s"
-"mall> query. The data returned is not checked, only that the answer is one or "
-"more\n"
+"</p><p>For a <small>DNS</small> check this should the name of an A record, "
+"or the address of a <small>PTR</small> record to look up.\n"
+"</p><p>For a MySQL, Oracle or PostgeSQL check, this should be an <small>SQL</"
+"small> query. The data returned is not checked, only that the answer is one "
+"or more\n"
"rows. This is a required setting.\n"
-"</p><p>For a simpletcp check, this string is sent verbatim except any occuranc"
-"es of \n"
+"</p><p>For a simpletcp check, this string is sent verbatim except any "
+"occurances of \n"
" are replaced with a new line character.\n"
"\n"
"\n"
"</p><p><b><big>receive</big> = \"</b><i>regexp to compare</i><b>\"</b>\n"
-"</p><p>If the requested result contains this <i>regexp to compare</i>, the rea"
-"l server is declared alive. The regexp must be inside quotes. Keep in mind tha"
-"t\n"
-"regexps are not plain strings and that you need to escape the special characte"
-"rs if they should as literals. Note that this regexp may be overridden by an\n"
+"</p><p>If the requested result contains this <i>regexp to compare</i>, the "
+"real server is declared alive. The regexp must be inside quotes. Keep in "
+"mind that\n"
+"regexps are not plain strings and that you need to escape the special "
+"characters if they should as literals. Note that this regexp may be "
+"overridden by an\n"
"optional per real-server based receive regexp.\n"
-"</p><p>For a <small>DNS</small> check this should be any one the A record's ad"
-"dresses or any one of the <small>PTR</small> record's names.\n"
+"</p><p>For a <small>DNS</small> check this should be any one the A record's "
+"addresses or any one of the <small>PTR</small> record's names.\n"
"</p><p>For a MySQL check, the receive setting is not used.\n"
"\n"
"\n"
-"</p><p><b><big>http method</big> = <small>GET</small></b> | <b><small>HEAD</sm"
-"all></b>\n"
-"</p><p>Sets the <small>HTTP</small> method which should be used to fetch the <"
-"small>URI</small> specified in the request-string. <small>GET</small> is the\n"
-"method used by default if the parameter is not set. If <small>HEAD</small> is "
-"used, the receive-string should be unset.\n"
+"</p><p><b><big>http method</big> = <small>GET</small></b> | <b><small>HEAD</"
+"small></b>\n"
+"</p><p>Sets the <small>HTTP</small> method which should be used to fetch the "
+"<small>URI</small> specified in the request-string. <small>GET</small> is "
+"the\n"
+"method used by default if the parameter is not set. If <small>HEAD</small> "
+"is used, the receive-string should be unset.\n"
"</p><p>Default: <small>GET</small>\n"
"\n"
"\n"
"</p><p><b><big>virtual host</big> = \"</b><i>hostname</i><b>\"</b>\n"
-"</p><p>Used when using a negotiate check with <small>HTTP</small> or <small>HT"
-"TPS</small> . Sets the host header used in the <small>HTTP</small> request. In"
-" the\n"
-"case of <small>HTTPS</small> this generally needs to match the common name of "
-"the <small>SSL</small> certificate. If not set then the host header will be\n"
-"derived from the request url for the real server if present. As a last resort "
-"the <small>IP</small> address of the real server will be used.\n"
+"</p><p>Used when using a negotiate check with <small>HTTP</small> or "
+"<small>HTTPS</small> . Sets the host header used in the <small>HTTP</small> "
+"request. In the\n"
+"case of <small>HTTPS</small> this generally needs to match the common name "
+"of the <small>SSL</small> certificate. If not set then the host header will "
+"be\n"
+"derived from the request url for the real server if present. As a last "
+"resort the <small>IP</small> address of the real server will be used.\n"
"\n"
"\n"
"</p><p><b><big>login</big> = \"</b><i>username</i><b>\"</b>\n"
-"</p><p>For <small>FTP</small> , <small>IMAP</small> , <small>LDAP</small> , My"
-"SQL, Oracle, <small>POP</small> and PostgreSQL, the username used to log in.\n"
+"</p><p>For <small>FTP</small> , <small>IMAP</small> , <small>LDAP</small> , "
+"MySQL, Oracle, <small>POP</small> and PostgreSQL, the username used to log "
+"in.\n"
"</p><p>For Radius the passwd is used for the attribute User-Name.\n"
-"</p><p>For <small>SIP</small> , the username is used as both the to and from a"
-"ddress for an <small>OPTIONS</small> query.\n"
+"</p><p>For <small>SIP</small> , the username is used as both the to and from "
+"address for an <small>OPTIONS</small> query.\n"
"</p><p>Default:\n"
"</p></dt><dt>* <small>FTP:</small> Anonymous\n"
-"</dt><dt>* MySQL Oracle, and PostgreSQL: Must be specified in the configuratio"
-"n\n"
-"</dt><dt>* <small>SIP:</small> ldirectord@<hostname>, hostname is derive"
-"d as per the passwd option below.\n"
-"</dt><dt>* Otherwise: empty string, which denotes that case authentication wil"
-"l not be attempted.\n"
+"</dt><dt>* MySQL Oracle, and PostgreSQL: Must be specified in the "
+"configuration\n"
+"</dt><dt>* <small>SIP:</small> ldirectord@<hostname>, hostname is "
+"derived as per the passwd option below.\n"
+"</dt><dt>* Otherwise: empty string, which denotes that case authentication "
+"will not be attempted.\n"
"\n"
"\n"
"</dt><dt><b><big>password</big> = \"</b><i>password</i><b>\"</b>\n"
-"<p>Password to use to login to <small>FTP</small> , <small>IMAP</small> , <sma"
-"ll>LDAP</small> , MySQL, Oracle, <small>POP</small> , PostgreSQL and\n"
+"<p>Password to use to login to <small>FTP</small> , <small>IMAP</small> , "
+"<small>LDAP</small> , MySQL, Oracle, <small>POP</small> , PostgreSQL and\n"
"<small>SIP</small> servers.\n"
"</p><p>For Radius the passwd is used for the attribute User-Password.\n"
"</p><p>Default:\n"
-"</p></dt><dt>* <small>FTP:</small> ldirectord@<hostname>, where hostname"
-" is the environment variable <small>HOSTNAME</small> evaluated at run time, or"
-" sourced\n"
+"</p></dt><dt>* <small>FTP:</small> ldirectord@<hostname>, where "
+"hostname is the environment variable <small>HOSTNAME</small> evaluated at "
+"run time, or sourced\n"
"from uname if unset.\n"
-"</dt><dt>* Otherwise: empty string. In the case of <small>LDAP</small> , MySQL"
-", Oracle, and PostgreSQL this means that authentication will not be performed."
+"</dt><dt>* Otherwise: empty string. In the case of <small>LDAP</small> , "
+"MySQL, Oracle, and PostgreSQL this means that authentication will not be "
+"performed.\n"
"\n"
"\n"
-"\n"
"</dt><dt><b><big>database name</big> = \"</b><i>databasename</i><b>\"</b>\n"
-"<p>Database to use for MySQL, Oracle and PostgreSQL servers, this is the datab"
-"ase that the query (set by <b>receive</b> above) will be performed against. Th"
-"is\n"
+"<p>Database to use for MySQL, Oracle and PostgreSQL servers, this is the "
+"database that the query (set by <b>receive</b> above) will be performed "
+"against. This\n"
"is a required setting.\n"
"\n"
"\n"
"</p><p><b><big>radius secret</big> = \"</b><i>radiussecret</i><b>\"</b>\n"
-"</p><p>Secret to use for Radius servers, this is the secret used to perform an"
-" Access-Request with the username (set by <b>login</b> above) and passwd (set "
-"by\n"
+"</p><p>Secret to use for Radius servers, this is the secret used to perform "
+"an Access-Request with the username (set by <b>login</b> above) and passwd "
+"(set by\n"
"<b>passwd</b> above).\n"
"</p><p>Default: empty string\n"
"\n"
@@ -544,117 +557,120 @@
"\n"
"\n"
"</p><p><b><big>scheduler</big> =</b> <i>scheduler_name</i>\n"
-"</p><p>Scheduler to be used by <small>LVS</small> for loadbalancing. For an in"
-"formation on the available sehedulers please see the <b><a href=\"ipvsadm\">ipvs"
-"adm</a></b>(8) man page.\n"
+"</p><p>Scheduler to be used by <small>LVS</small> for loadbalancing. For an "
+"information on the available sehedulers please see the <b><a href=\"ipvsadm"
+"\">ipvsadm</a></b>(8) man page.\n"
"</p><p>Default: \"wrr\"\n"
"\n"
"\n"
"</p><p><b><big>protocol</big> = tcp</b>|<b>udp</b>|<b>fwm</b>\n"
-"</p><p>Protocol to be used. If the virtual is specified as an <small>IP</small"
-"> address and port then it must be one of tcp or udp. If a firewall mark then "
-"the\n"
+"</p><p>Protocol to be used. If the virtual is specified as an <small>IP</"
+"small> address and port then it must be one of tcp or udp. If a firewall "
+"mark then the\n"
"protocol must be fwm.\n"
"</p><p>Default:\n"
-"</p></dt><dt>* Virtual is an <small>IP</small> address and port, and the port "
-"is not 53: tcp\n"
-"</dt><dt>* Virtual is an <small>IP</small> address and port, and the port is 5"
-"3: udp\n"
+"</p></dt><dt>* Virtual is an <small>IP</small> address and port, and the "
+"port is not 53: tcp\n"
+"</dt><dt>* Virtual is an <small>IP</small> address and port, and the port is "
+"53: udp\n"
"</dt><dt>* Virtual is a firewall mark: fwm\n"
"</dt></dl>\n"
"\n"
"\n"
"</p><p><b><big>check timeout</big> =</b> <i>n</i>\n"
-"</p><p>Timeout in seconds for connect, external and ping checks. If the timeou"
-"t is exceeded then the real server is declared dead.\n"
-"</p><p>If defined in a virtual server section then the global value is overrid"
-"den.\n"
-"</p><p>If undefined then the value of negotiatetimeout is used. negotiatetimeo"
-"ut is also a global value that may be overriden by a per-virtual setting.\n"
-"</p><p>If both checktimeout and negotiatetimeout are unset, the default is use"
-"d.\n"
+"</p><p>Timeout in seconds for connect, external and ping checks. If the "
+"timeout is exceeded then the real server is declared dead.\n"
+"</p><p>If defined in a virtual server section then the global value is "
+"overridden.\n"
+"</p><p>If undefined then the value of negotiatetimeout is used. "
+"negotiatetimeout is also a global value that may be overriden by a per-"
+"virtual setting.\n"
+"</p><p>If both checktimeout and negotiatetimeout are unset, the default is "
+"used.\n"
"</p><p>Default: 5 seconds\n"
"\n"
"</p><p><b><big>negotiate timeout</big> =</b> <i>n</i>\n"
"</p><p>Timeout in seconds for negotiate checks.\n"
-"</p><p>If defined in a virtual server section then the global value is overrid"
-"den.\n"
-"</p><p>If undefined then the value of connecttimeout is used. connecttimeout i"
-"s also a global value that may be overriden by a per-virtual setting.\n"
-"</p><p>If both negotiatetimeout and connecttimeout are unset, the default is u"
-"sed.\n"
+"</p><p>If defined in a virtual server section then the global value is "
+"overridden.\n"
+"</p><p>If undefined then the value of connecttimeout is used. connecttimeout "
+"is also a global value that may be overriden by a per-virtual setting.\n"
+"</p><p>If both negotiatetimeout and connecttimeout are unset, the default is "
+"used.\n"
"</p><p>Default: 30 seconds\n"
"\n"
"</p><p><b><big>failure count</big> =</b> <i>n</i>\n"
-"</p><p>The number of consecutive times a failure will have to be reported by a"
-" check before the realserver is considered to have failed. A value of 1 will "
-"have the realserver considered failed on the first failure. A successful chec"
-"k will reset the failure counter to 0.\n"
-"</p><p>If defined in a virtual server section then the global value is overrid"
-"den.\n"
+"</p><p>The number of consecutive times a failure will have to be reported by "
+"a check before the realserver is considered to have failed. A value of 1 "
+"will have the realserver considered failed on the first failure. A "
+"successful check will reset the failure counter to 0.\n"
+"</p><p>If defined in a virtual server section then the global value is "
+"overridden.\n"
"</p><p>Default: 1\n"
"\n"
"</p><p><b><big>email alert</big> = \"</b><i>emailaddress</i><b>\"</b>\n"
-"</p><p>A valid email address for sending alerts about the changed connection s"
-"tatus to any real server defined in the virtual service. This option requires "
-"perl\n"
-"module MailTools to be installed. Automatically tries to send email using any "
-"of the built-in methods. See perldoc Mail::Mailer for more info on methods.\n"
-"</p><p>If defined in a virtual server section then the global value is overrid"
-"den.\n"
+"</p><p>A valid email address for sending alerts about the changed connection "
+"status to any real server defined in the virtual service. This option "
+"requires perl\n"
+"module MailTools to be installed. Automatically tries to send email using "
+"any of the built-in methods. See perldoc Mail::Mailer for more info on "
+"methods.\n"
+"</p><p>If defined in a virtual server section then the global value is "
+"overridden.\n"
"\n"
"</p><p><b><big>email alert freq</big> =</b> <i>n</i>\n"
-"</p><p>Delay in seconds between repeating email alerts while any given real se"
-"rver in the virtual service remains inaccessible. A setting of zero seconds wi"
-"ll\n"
-"inhibit the repeating alerts. The email timing accuracy of this setting is dep"
-"endent on the number of seconds defined in the checkinterval configuration\n"
+"</p><p>Delay in seconds between repeating email alerts while any given real "
+"server in the virtual service remains inaccessible. A setting of zero "
+"seconds will\n"
+"inhibit the repeating alerts. The email timing accuracy of this setting is "
+"dependent on the number of seconds defined in the checkinterval "
+"configuration\n"
"option.\n"
-"</p><p>If defined in a virtual server section then the global value is overrid"
-"den.\n"
+"</p><p>If defined in a virtual server section then the global value is "
+"overridden.\n"
"</p><p>Default: 0\n"
"\n"
-"</p><p><b><big>email alert status</big> = all</b>|<b>none</b>|<b>starting</b>|"
-"<b>running</b>|<b>stopping</b>|<b>reloading</b>,...\n"
-"</p><p>Comma delimited list of server states in which email alerts should be s"
-"ent. <b>all</b> is a short-hand for\n"
-"\"<b>starting</b>,<b>running</b>,<b>stopping</b>,<b>reloading</b>\". If <b>none<"
-"/b> is specified, no other option may be specified, otherwise options are ORed"
-"\n"
+"</p><p><b><big>email alert status</big> = all</b>|<b>none</b>|<b>starting</"
+"b>|<b>running</b>|<b>stopping</b>|<b>reloading</b>,...\n"
+"</p><p>Comma delimited list of server states in which email alerts should be "
+"sent. <b>all</b> is a short-hand for\n"
+"\"<b>starting</b>,<b>running</b>,<b>stopping</b>,<b>reloading</b>\". If "
+"<b>none</b> is specified, no other option may be specified, otherwise "
+"options are ORed\n"
"with each other.\n"
-"</p><p>If defined in a virtual server section then the global value is overrid"
-"den.\n"
+"</p><p>If defined in a virtual server section then the global value is "
+"overridden.\n"
"</p><p>Default: all\n"
"\n"
-"</p><p><b><big>fallback</big> =</b> <i>ip_address|hostname[:portnumber|sercvic"
-"ename]</i> [<b>gate</b>|<b>masq</b>|<b>ipip</b>]\n"
-"</p><p>the server onto which a webservice is redirected if all real servers ar"
-"e down. Typically this would be 127.0.0.1 with an emergency page.\n"
-"</p><p>If defined in a virtual server section then the global value is overrid"
-"den.\n"
+"</p><p><b><big>fallback</big> =</b> <i>ip_address|hostname[:portnumber|"
+"sercvicename]</i> [<b>gate</b>|<b>masq</b>|<b>ipip</b>]\n"
+"</p><p>the server onto which a webservice is redirected if all real servers "
+"are down. Typically this would be 127.0.0.1 with an emergency page.\n"
+"</p><p>If defined in a virtual server section then the global value is "
+"overridden.\n"
"\n"
"</p><p><b><big>quiescent</big> = yes</b>|<b>no</b>\n"
-"</p><p>If <i>yes</i>, then when real or failback servers are determined to be "
-"down, they are not actually removed from the kernel's <small>LVS</small> table"
-".\n"
-"Rather, their weight is set to zero which means that no new connections will b"
-"e accepted.\n"
-"</p><p>This has the side effect, that if the real server has persistent connec"
-"tions, new connections from any existing clients will continue to be routed to"
-" the\n"
-"real server, until the persistant timeout can expire. See ipvsadm for more inf"
-"ormation on persistant connections.\n"
+"</p><p>If <i>yes</i>, then when real or failback servers are determined to "
+"be down, they are not actually removed from the kernel's <small>LVS</small> "
+"table.\n"
+"Rather, their weight is set to zero which means that no new connections will "
+"be accepted.\n"
+"</p><p>This has the side effect, that if the real server has persistent "
+"connections, new connections from any existing clients will continue to be "
+"routed to the\n"
+"real server, until the persistant timeout can expire. See ipvsadm for more "
+"information on persistant connections.\n"
"</p><p>This side-effect can be avoided by running the following:\n"
"</p><p>echo 1 > /proc/sys/net/ipv4/vs/expire_quiescent_template\n"
-"</p><p>If the proc file isn't present this probably means that the kernel does"
-"n't have lvs support, <small>LVS</small> support isn't loaded, or the kernel i"
-"s too\n"
-"old to have the proc file. Running ipvsadm as root should load <small>LVS</sma"
-"ll> into the kernel if it is possible.\n"
-"</p><p>If <i>no</i>, then the real or failback servers will be removed from th"
-"e kernel's <small>LVS</small> table. The default is <i>yes</i>.\n"
-"</p><p>If defined in a virtual server section then the global value is overrid"
-"den.\n"
+"</p><p>If the proc file isn't present this probably means that the kernel "
+"doesn't have lvs support, <small>LVS</small> support isn't loaded, or the "
+"kernel is too\n"
+"old to have the proc file. Running ipvsadm as root should load <small>LVS</"
+"small> into the kernel if it is possible.\n"
+"</p><p>If <i>no</i>, then the real or failback servers will be removed from "
+"the kernel's <small>LVS</small> table. The default is <i>yes</i>.\n"
+"</p><p>If defined in a virtual server section then the global value is "
+"overridden.\n"
"</p><p>Default: <i>yes</i>\n"
"\n"
"\n"
Modified: branches/SLE12-SP5/yast/50-pot/iscsi-client.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/iscsi-client.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/iscsi-client.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-01 02:28+0000\n"
-"PO-Revision-Date: 2017-03-01 02:28+0000\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -167,73 +167,58 @@
msgid "Startup"
msgstr ""
-#. iSCSI target has to be connected manually
-#: src/include/iscsi-client/dialogs.rb:304
-msgid "manual"
-msgstr ""
-
-#. iSCSI target available at boot (respected by 'dracut')
-#: src/include/iscsi-client/dialogs.rb:306
-msgid "onboot"
-msgstr ""
-
-#. iSCSI target enabled automatically (by 'systemd')
+#. widget for portal address
#: src/include/iscsi-client/dialogs.rb:308
-msgid "automatic"
-msgstr ""
-
-#. widget for portal address
-#: src/include/iscsi-client/dialogs.rb:315
msgid "IP Address"
msgstr ""
-#: src/include/iscsi-client/dialogs.rb:316
+#: src/include/iscsi-client/dialogs.rb:309
msgid "Port"
msgstr ""
-#: src/include/iscsi-client/dialogs.rb:331
+#: src/include/iscsi-client/dialogs.rb:324
msgid "Key"
msgstr ""
-#: src/include/iscsi-client/dialogs.rb:331
+#: src/include/iscsi-client/dialogs.rb:324
msgid "Value"
msgstr ""
#. service status dialog
-#: src/include/iscsi-client/dialogs.rb:342
+#: src/include/iscsi-client/dialogs.rb:335
msgid "Service"
msgstr ""
#. list og connected targets
-#: src/include/iscsi-client/dialogs.rb:365
+#: src/include/iscsi-client/dialogs.rb:358
msgid "Connected Targets"
msgstr ""
#. list of discovered targets
-#: src/include/iscsi-client/dialogs.rb:373
+#: src/include/iscsi-client/dialogs.rb:366
msgid "Discovered Targets"
msgstr ""
#. main tabbed dialog
-#: src/include/iscsi-client/dialogs.rb:392
+#: src/include/iscsi-client/dialogs.rb:385
msgid "iSCSI Initiator Overview"
msgstr ""
#. discovery new target
#. dialog for all targets from portal (connected/disconnected)
#. authentification dialog for add/discovery target
-#: src/include/iscsi-client/dialogs.rb:407
-#: src/include/iscsi-client/helps.rb:112 src/include/iscsi-client/helps.rb:123
-#: src/include/iscsi-client/helps.rb:130
+#: src/include/iscsi-client/dialogs.rb:400
+#: src/include/iscsi-client/helps.rb:125 src/include/iscsi-client/helps.rb:136
+#: src/include/iscsi-client/helps.rb:143
msgid "<h1>iSCSI Initiator</h1>"
msgstr ""
#. authentication dialog for add new target
#. list of connected targets
#. authentication for connect to portal
-#: src/include/iscsi-client/dialogs.rb:442
-#: src/include/iscsi-client/dialogs.rb:481
-#: src/include/iscsi-client/dialogs.rb:507
+#: src/include/iscsi-client/dialogs.rb:435
+#: src/include/iscsi-client/dialogs.rb:474
+#: src/include/iscsi-client/dialogs.rb:500
msgid "iSCSI Initiator Discovery"
msgstr ""
@@ -263,38 +248,57 @@
#. Package: Configuration of iscsi-client
#. Summary: Help texts of all the dialogs
#. Authors: Michal Zugec <mzugec(a)suse.cz>
-#.
-#. $Id$
-#: src/include/iscsi-client/helps.rb:35
+#: src/include/iscsi-client/helps.rb:36
msgid ""
"If authentication is needed for secure access, please use <b>Authentication "
"by Initiator</b> and <b>Authentication by Targets</b> together. Please do "
"not only use one of them for security reasons.\n"
msgstr ""
+#. the help text for the startup modes, architecture dependent
+#: src/include/iscsi-client/helps.rb:41
+msgid ""
+"<p><b>manual</b> is for iSCSI targets which are not to be connected by\n"
+"default, the user needs to connect them manually</p>\n"
+msgstr ""
+
+#: src/include/iscsi-client/helps.rb:43
+msgid ""
+"<p><b>onboot</b> is for iSCSI targets to be connected during boot, i.e. "
+"when\n"
+"root is on iSCSI. As such it will be evaluated by the initrd.</p>\n"
+msgstr ""
+
+#: src/include/iscsi-client/helps.rb:45
+msgid ""
+"<p><b>automatic</b> is for iSCSI targets to be connected when the iSCSI "
+"service\n"
+"starts up.</p>\n"
+msgstr ""
+
#. Read dialog help 1/2
-#: src/include/iscsi-client/helps.rb:40
+#: src/include/iscsi-client/helps.rb:53
msgid ""
"<p><b><big>Initializing iSCSI Initiator Configuration</big></b><br>\n"
"Please wait...<br></p>\n"
msgstr ""
#. Read dialog help 2/2
-#: src/include/iscsi-client/helps.rb:44
+#: src/include/iscsi-client/helps.rb:57
msgid ""
"<p><b><big>Aborting Initialization</big></b><br>\n"
"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>\n"
msgstr ""
#. Write dialog help 1/2
-#: src/include/iscsi-client/helps.rb:48
+#: src/include/iscsi-client/helps.rb:61
msgid ""
"<p><b><big>Saving iSCSI Initiator Configuration</big></b><br>\n"
"Please wait...<br></p>\n"
msgstr ""
#. Write dialog help 2/2
-#: src/include/iscsi-client/helps.rb:52
+#: src/include/iscsi-client/helps.rb:65
msgid ""
"<p><b><big>Aborting Saving</big></b><br>\n"
"Abort the save procedure by pressing <b>Abort</b>.\n"
@@ -303,14 +307,14 @@
msgstr ""
#. Summary dialog help 1/3
-#: src/include/iscsi-client/helps.rb:59
+#: src/include/iscsi-client/helps.rb:72
msgid ""
"<p><b><big>iSCSI Initiator Configuration</big></b><br>\n"
"Configure an iSCSI initiator here.<br></p>\n"
msgstr ""
#. Summary dialog help 2/3
-#: src/include/iscsi-client/helps.rb:63
+#: src/include/iscsi-client/helps.rb:76
msgid ""
"<p><b><big>Adding an iSCSI Initiator</big></b><br>\n"
"Select an iSCSI initiator from the list of detected initiators.\n"
@@ -319,7 +323,7 @@
msgstr ""
#. Summary dialog help 3/3
-#: src/include/iscsi-client/helps.rb:70
+#: src/include/iscsi-client/helps.rb:83
msgid ""
"<p><b><big>Editing or Deleting</big></b><br>\n"
"If you press <b>Edit</b>, an additional dialog in which to change\n"
@@ -327,7 +331,7 @@
msgstr ""
#. Ovreview dialog help 1/3
-#: src/include/iscsi-client/helps.rb:76
+#: src/include/iscsi-client/helps.rb:89
msgid ""
"<p><b><big>iSCSI Initiator Configuration Overview</big></b><br>\n"
"Obtain an overview of installed iSCSI initiators. Additionally\n"
@@ -335,14 +339,14 @@
msgstr ""
#. Ovreview dialog help 2/3
-#: src/include/iscsi-client/helps.rb:82
+#: src/include/iscsi-client/helps.rb:95
msgid ""
"<p><b><big>Adding an iSCSI Initiator</big></b><br>\n"
"Press <b>Add</b> to configure an iSCSI initiator.</p>\n"
msgstr ""
#. Ovreview dialog help 3/3
-#: src/include/iscsi-client/helps.rb:86
+#: src/include/iscsi-client/helps.rb:99
msgid ""
"<p><b><big>Editing or Deleting</big></b><br>\n"
"Choose an iSCSI Initiator to change or remove.\n"
@@ -350,7 +354,7 @@
msgstr ""
#. table of connected targets
-#: src/include/iscsi-client/helps.rb:92
+#: src/include/iscsi-client/helps.rb:105
msgid ""
"<p>List of current sessions.</p><p>Use the <b>Add</b> button to get "
"additional targets. A discovery is started to detect new targets and the "
@@ -361,18 +365,18 @@
#. Warning
#. Warning
-#: src/include/iscsi-client/helps.rb:101 src/include/iscsi-client/helps.rb:118
+#: src/include/iscsi-client/helps.rb:114 src/include/iscsi-client/helps.rb:131
msgid "<h1>Warning</h1>"
msgstr ""
-#: src/include/iscsi-client/helps.rb:102 src/include/iscsi-client/helps.rb:119
+#: src/include/iscsi-client/helps.rb:115 src/include/iscsi-client/helps.rb:132
msgid ""
"<p>When accessing an iSCSI device <b>READ</b>/<b>WRITE</b>, make sure that "
"this access is exclusive. Otherwise there is a potential risk of data "
"corruption.</p>\n"
msgstr ""
-#: src/include/iscsi-client/helps.rb:105
+#: src/include/iscsi-client/helps.rb:118
msgid ""
"<p><b>Initiator Name</b> is a value from <tt>/etc/iscsi/initiatorname.iscsi</"
"tt>. \n"
@@ -380,7 +384,7 @@
"able to change it in the BIOS setup.</p>"
msgstr ""
-#: src/include/iscsi-client/helps.rb:108
+#: src/include/iscsi-client/helps.rb:121
msgid ""
"If you want to use <b>iSNS</b> (Internet Storage Name Service) for "
"discovering targets instead of the default SendTargets method,\n"
@@ -388,47 +392,35 @@
"be 3205.\n"
msgstr ""
-#: src/include/iscsi-client/helps.rb:113
+#: src/include/iscsi-client/helps.rb:126
msgid ""
"Enter the <b>IP Address</b> of the iSCSI target server.\n"
"Only change <b>Port</b>. If you do not need authentication,\n"
"select <b>No Discovery Authentication</b>. "
msgstr ""
-#: src/include/iscsi-client/helps.rb:126
+#: src/include/iscsi-client/helps.rb:139
msgid ""
"List of nodes offered by the iSCSI target. Select one item and click "
"<b>Connect</b>. "
msgstr ""
-#: src/include/iscsi-client/helps.rb:133
+#: src/include/iscsi-client/helps.rb:146
msgid "<h1>Startup</h1>"
msgstr ""
-#: src/include/iscsi-client/helps.rb:134
-msgid ""
-"<p><b>manual</b> is for iSCSI targets which are not to be connected by\n"
-"default, the user needs to connect them manually</p>\n"
-"<p><b>onboot</b> is for iSCSI targets to be connected during boot, i.e. "
-"when\n"
-"root is on iSCSI. As such it will be evaluated by the initrd.</p>\n"
-"<p><b>automatic</b> is for iSCSI targets to be connected when the iSCSI "
-"service\n"
-"starts up.</p>\n"
-msgstr ""
-
-#: src/include/iscsi-client/helps.rb:142
+#: src/include/iscsi-client/helps.rb:148
msgid "<h1>Authentication</h1>"
msgstr ""
-#: src/include/iscsi-client/helps.rb:143
+#: src/include/iscsi-client/helps.rb:149
msgid ""
"<p>The default setting here is <i>No Authentication</i>. Uncheck the "
"checkbox if authentication is needed for security reasons."
msgstr ""
#. list of discovered targets
-#: src/include/iscsi-client/helps.rb:148
+#: src/include/iscsi-client/helps.rb:154
msgid ""
"<p>This screen shows the list of discovered targets.</p><p>Use the "
"<b>Discovery</b> button to get available iSCSI targets from a server "
@@ -445,60 +437,60 @@
"up mode.</p>"
msgstr ""
-#: src/include/iscsi-client/helps.rb:164
+#: src/include/iscsi-client/helps.rb:170
msgid "<h1>iBTF</h1>"
msgstr ""
#. string initiatorname="";
#. function for run command in background
-#: src/include/iscsi-client/widgets.rb:65
+#: src/include/iscsi-client/widgets.rb:64
msgid "Command timed out"
msgstr ""
#. validation for authentication dialog entry
-#: src/include/iscsi-client/widgets.rb:123
-#: src/include/iscsi-client/widgets.rb:135
+#: src/include/iscsi-client/widgets.rb:122
+#: src/include/iscsi-client/widgets.rb:134
msgid "Insert the username."
msgstr ""
-#: src/include/iscsi-client/widgets.rb:128
-#: src/include/iscsi-client/widgets.rb:140
+#: src/include/iscsi-client/widgets.rb:127
+#: src/include/iscsi-client/widgets.rb:139
msgid "Insert the password."
msgstr ""
#. init table of connected sessions
-#: src/include/iscsi-client/widgets.rb:152
+#: src/include/iscsi-client/widgets.rb:151
msgid "Error While Connecting iscsid"
msgstr ""
#. delete (logout from) connected target
-#: src/include/iscsi-client/widgets.rb:214
+#: src/include/iscsi-client/widgets.rb:213
msgid "Really log out from the selected target?"
msgstr ""
-#: src/include/iscsi-client/widgets.rb:218
+#: src/include/iscsi-client/widgets.rb:217
msgid "Error occurred while logging out from the selected target."
msgstr ""
-#: src/include/iscsi-client/widgets.rb:228
+#: src/include/iscsi-client/widgets.rb:227
msgid "No record found."
msgstr ""
#. if nothing selected - disable some buttons, otherwise enable them
-#: src/include/iscsi-client/widgets.rb:270
+#: src/include/iscsi-client/widgets.rb:269
msgid "No valid IP address"
msgstr ""
-#: src/include/iscsi-client/widgets.rb:275
+#: src/include/iscsi-client/widgets.rb:274
msgid "Port field cannot be empty"
msgstr ""
#. regexp for "cz.suse" or just "suse", "cz.su-se"
-#: src/include/iscsi-client/widgets.rb:393
+#: src/include/iscsi-client/widgets.rb:392
msgid "Incorrect Initiator Name"
msgstr ""
-#: src/include/iscsi-client/widgets.rb:394
+#: src/include/iscsi-client/widgets.rb:393
msgid ""
"\n"
"The correct syntax is\n"
@@ -512,17 +504,17 @@
msgstr ""
#. validate ip
-#: src/include/iscsi-client/widgets.rb:572
+#: src/include/iscsi-client/widgets.rb:571
msgid "Insert the IP address."
msgstr ""
#. check for valid host name
-#: src/include/iscsi-client/widgets.rb:584
+#: src/include/iscsi-client/widgets.rb:583
msgid "Please check IP address resp. host name.\n"
msgstr ""
#. validate port number
-#: src/include/iscsi-client/widgets.rb:596
+#: src/include/iscsi-client/widgets.rb:595
msgid "Insert the port."
msgstr ""
@@ -530,41 +522,56 @@
#. ******************* target table *************************
#. initialize dialog for all targets from portal (connected/disconnected)
#. enable/disable connect button according target is or not already connected
-#: src/include/iscsi-client/widgets.rb:717
-#: src/include/iscsi-client/widgets.rb:822
-#: src/include/iscsi-client/widgets.rb:850
+#: src/include/iscsi-client/widgets.rb:716
+#: src/include/iscsi-client/widgets.rb:821
+#: src/include/iscsi-client/widgets.rb:849
msgid "True"
msgstr ""
-#: src/include/iscsi-client/widgets.rb:717
-#: src/include/iscsi-client/widgets.rb:822
+#: src/include/iscsi-client/widgets.rb:716
+#: src/include/iscsi-client/widgets.rb:821
msgid "False"
msgstr ""
#. check if not already connected
#. check if not already connected
-#: src/include/iscsi-client/widgets.rb:755
-#: src/include/iscsi-client/widgets.rb:875
+#: src/include/iscsi-client/widgets.rb:754
+#: src/include/iscsi-client/widgets.rb:874
msgid ""
"The target with this TargetName is already connected. Make sure that "
"multipathing is enabled to prevent data corruption."
msgstr ""
-#: src/include/iscsi-client/widgets.rb:758
-#: src/include/iscsi-client/widgets.rb:878
+#: src/include/iscsi-client/widgets.rb:757
+#: src/include/iscsi-client/widgets.rb:877
msgid "Continue"
msgstr ""
-#: src/include/iscsi-client/widgets.rb:759
-#: src/include/iscsi-client/widgets.rb:879
+#: src/include/iscsi-client/widgets.rb:758
+#: src/include/iscsi-client/widgets.rb:878
msgid "Cancel"
msgstr ""
#. check if is not already connected
-#: src/include/iscsi-client/widgets.rb:869
+#: src/include/iscsi-client/widgets.rb:868
msgid "The target is already connected."
msgstr ""
+#. iSCSI target has to be connected manually
+#: src/include/iscsi-client/widgets.rb:930
+msgid "manual"
+msgstr ""
+
+#. iSCSI target available at boot (respected by 'dracut')
+#: src/include/iscsi-client/widgets.rb:932
+msgid "onboot"
+msgstr ""
+
+#. iSCSI target enabled automatically (by 'systemd')
+#: src/include/iscsi-client/widgets.rb:934
+msgid "automatic"
+msgstr ""
+
#. Initialization dialog caption
#: src/include/iscsi-client/wizards.rb:121
msgid "iSCSI Initiator Configuration"
@@ -643,16 +650,16 @@
msgstr ""
#. interface type for hardware offloading
-#: src/modules/IscsiClientLib.rb:72
+#: src/modules/IscsiClientLib.rb:74
msgid "default (Software)"
msgstr ""
-#: src/modules/IscsiClientLib.rb:73
+#: src/modules/IscsiClientLib.rb:75
msgid "all"
msgstr ""
#. }
-#: src/modules/IscsiClientLib.rb:730
+#: src/modules/IscsiClientLib.rb:732
msgid ""
"InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt>\n"
"differ. The old initiator name will be replaced by the value of iBFT and a \n"
@@ -662,11 +669,11 @@
#. Report a warning (not an error) if login failed for other reasons
#. (also related to bsc#981693, warning popups usually are skipped)
-#: src/modules/IscsiClientLib.rb:1070
+#: src/modules/IscsiClientLib.rb:1078
msgid "Target connection failed.\n"
msgstr ""
#. do discovery first
-#: src/modules/IscsiClientLib.rb:1208
+#: src/modules/IscsiClientLib.rb:1216
msgid "Configuration summary..."
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/iscsi-lio-server.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/iscsi-lio-server.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/iscsi-lio-server.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-16 19:52+0200\n"
-"PO-Revision-Date: 2017-05-16 19:52+0200\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -83,7 +83,7 @@
msgstr ""
#: src/include/iscsi-lio-server/dialogs.rb:149
-#: src/include/iscsi-lio-server/widgets.rb:327
+#: src/include/iscsi-lio-server/widgets.rb:330
msgid "LUN"
msgstr ""
@@ -92,7 +92,7 @@
msgstr ""
#: src/include/iscsi-lio-server/dialogs.rb:149
-#: src/include/iscsi-lio-server/widgets.rb:336
+#: src/include/iscsi-lio-server/widgets.rb:339
msgid "Path"
msgstr ""
@@ -101,7 +101,7 @@
#: src/include/iscsi-lio-server/dialogs.rb:238
#: src/include/iscsi-lio-server/dialogs.rb:326
#: src/include/iscsi-lio-server/dialogs.rb:373
-#: src/include/iscsi-lio-server/widgets.rb:468
+#: src/include/iscsi-lio-server/widgets.rb:471
msgid "Add"
msgstr ""
@@ -117,7 +117,7 @@
#: src/include/iscsi-lio-server/dialogs.rb:240
#: src/include/iscsi-lio-server/dialogs.rb:328
#: src/include/iscsi-lio-server/dialogs.rb:375
-#: src/include/iscsi-lio-server/widgets.rb:469
+#: src/include/iscsi-lio-server/widgets.rb:472
msgid "Delete"
msgstr ""
@@ -159,15 +159,15 @@
#. dialog to add/modify user and password
#: src/include/iscsi-lio-server/dialogs.rb:233
#: src/include/iscsi-lio-server/dialogs.rb:254
-#: src/include/iscsi-lio-server/widgets.rb:747
+#: src/include/iscsi-lio-server/widgets.rb:750
msgid "Username"
msgstr ""
#: src/include/iscsi-lio-server/dialogs.rb:233
#: src/include/iscsi-lio-server/dialogs.rb:255
-#: src/include/iscsi-lio-server/widgets.rb:250
-#: src/include/iscsi-lio-server/widgets.rb:263
-#: src/include/iscsi-lio-server/widgets.rb:748
+#: src/include/iscsi-lio-server/widgets.rb:253
+#: src/include/iscsi-lio-server/widgets.rb:266
+#: src/include/iscsi-lio-server/widgets.rb:751
msgid "Password"
msgstr ""
@@ -251,11 +251,12 @@
#: src/include/iscsi-lio-server/helps.rb:36
msgid ""
"If you enable <b>Use Login Authentication</b>, you need to fill in "
-"<b>UserID</b> and <b>Password</b> for both <b>Authentication "
-"for Targets</b> and <b>Authentication for Initiators</b> in "
-"next pages. Even you disabled <b>Use Login Authentication</b>, it's still "
-"needed to add the initiators name of which you want to grant "
-"access to the targets in next page"
+"<b>UserID</b> and <b>Password</b> for both \\\n"
+" <b>Authentication for Targets</b> and <b>Authentication for "
+"Initiators</b> \\\n"
+" in next pages. Even you disabled <b>Use Login Authentication</"
+"b>, it's still needed to add the initiators name \\\n"
+" of which you want to grant access to the targets in next page"
msgstr ""
#. Read dialog help 1/2
@@ -489,173 +490,173 @@
#. we must also call handleDiscAuthStatus() here because once users enable / disable discovery authentication,
#. we need to set the configFS attributes accordingly.
-#: src/include/iscsi-lio-server/widgets.rb:233
+#: src/include/iscsi-lio-server/widgets.rb:236
msgid "No Discovery Authentication"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:244
+#: src/include/iscsi-lio-server/widgets.rb:247
msgid "Authentication by Targets"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:249
-#: src/include/iscsi-lio-server/widgets.rb:262
+#: src/include/iscsi-lio-server/widgets.rb:252
+#: src/include/iscsi-lio-server/widgets.rb:265
msgid "UserID"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:257
+#: src/include/iscsi-lio-server/widgets.rb:260
msgid "Authentication by Initiators"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:277
+#: src/include/iscsi-lio-server/widgets.rb:280
msgid "Selected LUN is already in use!"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:286
+#: src/include/iscsi-lio-server/widgets.rb:289
msgid "Selected Name is already in use!"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:295
+#: src/include/iscsi-lio-server/widgets.rb:298
msgid "Selected Path must be either block device or normal file!"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:301
+#: src/include/iscsi-lio-server/widgets.rb:304
msgid "Selected Path is already in use!"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:339
+#: src/include/iscsi-lio-server/widgets.rb:342
msgid "Browse"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:344
+#: src/include/iscsi-lio-server/widgets.rb:347
msgid "Name (autogenerated when empty)"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:359
+#: src/include/iscsi-lio-server/widgets.rb:362
msgid "Select file or device"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:462
+#: src/include/iscsi-lio-server/widgets.rb:465
msgid "Initiator LUN"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:462
+#: src/include/iscsi-lio-server/widgets.rb:465
msgid "Target LUN"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:470
+#: src/include/iscsi-lio-server/widgets.rb:473
msgid "Change"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:563
+#: src/include/iscsi-lio-server/widgets.rb:566
msgid "Target LUN %1 used more than once!"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:625
+#: src/include/iscsi-lio-server/widgets.rb:628
msgid "Need to enable at least one Authentification!"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:645
+#: src/include/iscsi-lio-server/widgets.rb:648
msgid "Initiator name"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:648
+#: src/include/iscsi-lio-server/widgets.rb:651
msgid "Import LUNs from TPG"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:664
-#: src/include/iscsi-lio-server/widgets.rb:721
+#: src/include/iscsi-lio-server/widgets.rb:667
+#: src/include/iscsi-lio-server/widgets.rb:724
msgid "Initiator name must not be empty!"
msgstr ""
#. Don't check IscsiLioData.GetClntList(@curr_target, @curr_tpg) for existing
#. initiator name. It's allowed to have several LUNs accessable for same initiator.
#. TODO: verify whether it's necessary to check @changed_lun here?
-#: src/include/iscsi-lio-server/widgets.rb:670
-#: src/include/iscsi-lio-server/widgets.rb:727
+#: src/include/iscsi-lio-server/widgets.rb:673
+#: src/include/iscsi-lio-server/widgets.rb:730
msgid "Initiator name already exists!"
msgstr ""
#. 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
+#: src/include/iscsi-lio-server/widgets.rb:707
msgid "New initiator name"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:750
+#: src/include/iscsi-lio-server/widgets.rb:753
msgid "OK"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:751
+#: src/include/iscsi-lio-server/widgets.rb:754
msgid "Cancel"
msgstr ""
#. create items from targets
-#: src/include/iscsi-lio-server/widgets.rb:811
+#: src/include/iscsi-lio-server/widgets.rb:814
msgid "Enabled"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:811
-#: src/include/iscsi-lio-server/widgets.rb:1289
-#: src/include/iscsi-lio-server/widgets.rb:1392
-#: src/include/iscsi-lio-server/widgets.rb:1429
+#: src/include/iscsi-lio-server/widgets.rb:814
+#: src/include/iscsi-lio-server/widgets.rb:1292
+#: src/include/iscsi-lio-server/widgets.rb:1395
+#: src/include/iscsi-lio-server/widgets.rb:1432
msgid "Disabled"
msgstr ""
#. remove a item
#. **************** Edit Dialog *****************************
#. init values for modifying target (read it from stored map)
-#: src/include/iscsi-lio-server/widgets.rb:848
-#: src/include/iscsi-lio-server/widgets.rb:962
-#: src/include/iscsi-lio-server/widgets.rb:1316
+#: src/include/iscsi-lio-server/widgets.rb:851
+#: src/include/iscsi-lio-server/widgets.rb:965
+#: src/include/iscsi-lio-server/widgets.rb:1319
msgid "Really delete the selected item?"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1030
+#: src/include/iscsi-lio-server/widgets.rb:1033
msgid "Problem creating target %1 with tpg %2"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1052
+#: src/include/iscsi-lio-server/widgets.rb:1055
msgid "Problem setting network portal to %1"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1073
+#: src/include/iscsi-lio-server/widgets.rb:1076
msgid "Problem removing lun %1"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1098
+#: src/include/iscsi-lio-server/widgets.rb:1101
msgid "Problem setting lun %1 (name:%2) to path %3"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1112
+#: src/include/iscsi-lio-server/widgets.rb:1115
msgid "Problem setting auth on %1:%2 to %3"
msgstr ""
#. validate function checks if target/tpg are unique and not empty
-#: src/include/iscsi-lio-server/widgets.rb:1226
+#: src/include/iscsi-lio-server/widgets.rb:1229
msgid "The target cannot be empty."
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1230
+#: src/include/iscsi-lio-server/widgets.rb:1233
msgid "The target portal group cannot be empty."
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1241
+#: src/include/iscsi-lio-server/widgets.rb:1244
msgid "The target already exists."
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1261
+#: src/include/iscsi-lio-server/widgets.rb:1264
msgid "Incoming"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1264
+#: src/include/iscsi-lio-server/widgets.rb:1267
msgid "Outgoing"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1266
+#: src/include/iscsi-lio-server/widgets.rb:1269
msgid "None"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1478
+#: src/include/iscsi-lio-server/widgets.rb:1481
msgid ""
"There isn't any initiator specified.\n"
"To allow an initiator login to the target, please\n"
@@ -664,23 +665,23 @@
"Really want to continue without initiator access?"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1492
+#: src/include/iscsi-lio-server/widgets.rb:1495
msgid "Problem removing LUN %4 for initiator %3 in %1:%2"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1507
+#: src/include/iscsi-lio-server/widgets.rb:1510
msgid "Problem adding LUN %4:%5 for initiator %3 in %1:%2"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1528
+#: src/include/iscsi-lio-server/widgets.rb:1531
msgid "Problem removing initiator %3 from %1:%2"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1552
+#: src/include/iscsi-lio-server/widgets.rb:1555
msgid "Problem creating initiator %3 for %1:%2"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1587
+#: src/include/iscsi-lio-server/widgets.rb:1590
msgid "Problem changing auth for initiator %3 in %1:%2"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/isns.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/isns.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/isns.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:28+0200\n"
-"PO-Revision-Date: 2016-08-30 18:28+0200\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -157,47 +157,48 @@
#: src/include/isns/helps.rb:39
msgid ""
-"<p>The list of all available iSCSI nodes registered with the iSNS service are "
-"displayed.</p> <p>Nodes are registered by iSCSI initiators and iSCSI targets.<"
-"/p> <p> It is only possible to <b>delete</b> them. Deleting a node removes it"
-" from the iSNS database.</p>"
+"<p>The list of all available iSCSI nodes registered with the iSNS service "
+"are displayed.</p> <p>Nodes are registered by iSCSI initiators and iSCSI "
+"targets.</p> <p> It is only possible to <b>delete</b> them. Deleting a node "
+"removes it from the iSNS database.</p>"
msgstr ""
#. discovery domains
#: src/include/isns/helps.rb:43
msgid ""
-"A list of all discovery domains is displayed. It is possible to <b>Create</b> "
-"a discovery domain or <b>Delete</b> one. <p>Deleting a domain removes the memb"
-"ers from the domain but does not delete the iSCSI node members.</p>"
+"A list of all discovery domains is displayed. It is possible to <b>Create</"
+"b> a discovery domain or <b>Delete</b> one. <p>Deleting a domain removes the "
+"members from the domain but does not delete the iSCSI node members.</p>"
msgstr ""
#: src/include/isns/helps.rb:46
msgid ""
-"A list of all iSCSI nodes are displayed by discovery domain. Selecting anothe"
-"r discovery domain refreshes the list with members from that discovery domain."
-" It is possible to <b>Add</b> an iSCSI node to a discovery domain or <b>Delet"
-"e</b> the node. <p>Deleting a node removes it from the domain but does not de"
-"lete the iSCSI node</p> <p>Creating an iSCSI node allows a not yet registered "
-"node to be added as a member of the discovery domain. When the initiator or t"
-"arget registers this node then it becomes part of this domain</p> <p>When an "
-"iSCSI initiator does a discovery request, the iSNS service returns all iSCSI n"
-"ode targets that are members of the same Discovery Domains.</p> "
+"A list of all iSCSI nodes are displayed by discovery domain. Selecting "
+"another discovery domain refreshes the list with members from that discovery "
+"domain. It is possible to <b>Add</b> an iSCSI node to a discovery domain or "
+"<b>Delete</b> the node. <p>Deleting a node removes it from the domain but "
+"does not delete the iSCSI node</p> <p>Creating an iSCSI node allows a not "
+"yet registered node to be added as a member of the discovery domain. When "
+"the initiator or target registers this node then it becomes part of this "
+"domain</p> <p>When an iSCSI initiator does a discovery request, the iSNS "
+"service returns all iSCSI node targets that are members of the same "
+"Discovery Domains.</p> "
msgstr ""
#. dds table dialog
#: src/include/isns/helps.rb:50
msgid ""
-"At the top a list of all Discovery Domain Sets are displayed. Discovery Domai"
-"ns belong to Discovery Domain Sets. <p>A Discovery Domain must be a member of "
-"a Discovery Domain Set in order to be active. </p><p>In an iSNS database, a Di"
-"scovery Domain Set contains Discovery Domains and Discovery Domains contain iS"
-"CSI Node members.</p>"
+"At the top a list of all Discovery Domain Sets are displayed. Discovery "
+"Domains belong to Discovery Domain Sets. <p>A Discovery Domain must be a "
+"member of a Discovery Domain Set in order to be active. </p><p>In an iSNS "
+"database, a Discovery Domain Set contains Discovery Domains and Discovery "
+"Domains contain iSCSI Node members.</p>"
msgstr ""
#: src/include/isns/helps.rb:53
msgid ""
-"<p>The discovery domain set members list is refreshed whenever a different dis"
-"covery domain set is selected.</p>"
+"<p>The discovery domain set members list is refreshed whenever a different "
+"discovery domain set is selected.</p>"
msgstr ""
#. **************** global funcions and variables *****
@@ -255,7 +256,9 @@
#. test if required package ("open-isns") is installed
#: src/modules/IsnsServer.rb:149
-msgid "<p>To configure the isns service, the <b>%1</b> package must be installed.</p>"
+msgid ""
+"<p>To configure the isns service, the <b>%1</b> package must be installed.</"
+"p>"
msgstr ""
#: src/modules/IsnsServer.rb:152
Modified: branches/SLE12-SP5/yast/50-pot/journal.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/journal.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/journal.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:28+0200\n"
-"PO-Revision-Date: 2016-08-30 18:28+0200\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -18,24 +18,29 @@
"Content-Transfer-Encoding: 8bit\n"
#. Header
-#: src/lib/systemd_journal/entries_dialog.rb:43
+#: src/lib/systemd_journal/entries_dialog.rb:44
msgid "Journal entries"
msgstr ""
#. Filters
-#: src/lib/systemd_journal/entries_dialog.rb:47
+#: src/lib/systemd_journal/entries_dialog.rb:48
msgid "Displaying entries with the following text"
msgstr ""
#. Return the result as an array of Items
-#: src/lib/systemd_journal/entries_dialog.rb:117
+#: src/lib/systemd_journal/entries_dialog.rb:118
msgid "Change filter..."
msgstr ""
-#: src/lib/systemd_journal/entries_dialog.rb:119
+#: src/lib/systemd_journal/entries_dialog.rb:120
msgid "Refresh"
msgstr ""
+#. TRANSLATORS: an error message, running the "journalctl" command has failed
+#: src/lib/systemd_journal/entries_dialog.rb:177
+msgid "Reading the journal entries failed."
+msgstr ""
+
#. Header
#: src/lib/systemd_journal/query_dialog.rb:50
msgid "Entries to display"
Modified: branches/SLE12-SP5/yast/50-pot/journalctl.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/journalctl.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/journalctl.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:28+0200\n"
-"PO-Revision-Date: 2016-08-30 18:28+0200\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
Modified: branches/SLE12-SP5/yast/50-pot/kdump.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/kdump.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/kdump.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-31 02:28+0000\n"
-"PO-Revision-Date: 2017-03-31 02:28+0000\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -127,7 +127,7 @@
#. TRANSLATORS: CommandLine help
#: src/clients/kdump.rb:234
-msgid "Size of allocated memory MB"
+msgid "Allocate Low and High Memory (in MB) of Kdump separated by comma"
msgstr ""
#. TRANSLATORS: CommandLine help
@@ -324,11 +324,11 @@
msgid "Kdump immediate reboots: %1"
msgstr ""
-#: src/clients/kdump.rb:652 src/clients/kdump.rb:1262
+#: src/clients/kdump.rb:652 src/clients/kdump.rb:1270
msgid "Enabled"
msgstr ""
-#: src/clients/kdump.rb:653 src/clients/kdump.rb:1263
+#: src/clients/kdump.rb:653 src/clients/kdump.rb:1271
msgid "Disabled"
msgstr ""
@@ -367,8 +367,13 @@
msgid "Kdump Sending Copy of Notification To: %1"
msgstr ""
+#. Only numbers are allowed as allow_mem_high and allow_mem_low values
+#: src/clients/kdump.rb:747
+msgid "alloc_mem parameter used with invalid values"
+msgstr ""
+
#. TRANSLATORS: CommandLine printed text
-#: src/clients/kdump.rb:747
+#: src/clients/kdump.rb:755
msgid ""
"Kernel option \"crashkernel\" includes ranges and/or redundant values.\n"
"It will be rewritten."
@@ -377,7 +382,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:535
+#: src/clients/kdump.rb:763 src/clients/kdump.rb:768 src/modules/Kdump.rb:535
msgid "To apply changes a reboot is necessary."
msgstr ""
@@ -396,40 +401,40 @@
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:764 src/clients/kdump.rb:790 src/clients/kdump.rb:819
-#: src/clients/kdump.rb:1051 src/clients/kdump.rb:1068
-#: src/clients/kdump.rb:1085 src/clients/kdump.rb:1102
-#: src/clients/kdump.rb:1117 src/clients/kdump.rb:1133
-#: src/clients/kdump.rb:1156 src/clients/kdump.rb:1176
-#: src/clients/kdump.rb:1196 src/clients/kdump.rb:1210
-#: src/clients/kdump.rb:1233 src/clients/kdump.rb:1253
+#: src/clients/kdump.rb:772 src/clients/kdump.rb:798 src/clients/kdump.rb:827
+#: src/clients/kdump.rb:1059 src/clients/kdump.rb:1076
+#: src/clients/kdump.rb:1093 src/clients/kdump.rb:1110
+#: src/clients/kdump.rb:1125 src/clients/kdump.rb:1141
+#: src/clients/kdump.rb:1164 src/clients/kdump.rb:1184
+#: src/clients/kdump.rb:1204 src/clients/kdump.rb:1218
+#: src/clients/kdump.rb:1241 src/clients/kdump.rb:1261
msgid "Wrong options were used."
msgstr ""
#. TRANSLATORS: CommandLine printed text
-#: src/clients/kdump.rb:781
+#: src/clients/kdump.rb:789
msgid "Dump level was set."
msgstr ""
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:785 src/clients/kdump.rb:810
+#: src/clients/kdump.rb:793 src/clients/kdump.rb:818
msgid "Wrong value of option."
msgstr ""
#. TRANSLATORS: CommandLine printed text
-#: src/clients/kdump.rb:806
+#: src/clients/kdump.rb:814
msgid "Dump format was set."
msgstr ""
#. TRANSLATORS: CommandLine printed text help
-#: src/clients/kdump.rb:813
+#: src/clients/kdump.rb:821
msgid ""
"Option can include only \"none\", \"ELF\", \"compressed\" or \"lzo\" value."
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:833
+#: src/clients/kdump.rb:841
msgid "File %1 does not exist."
msgstr ""
@@ -437,8 +442,8 @@
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:855 src/clients/kdump.rb:889 src/clients/kdump.rb:938
-#: src/clients/kdump.rb:972 src/clients/kdump.rb:1019
+#: src/clients/kdump.rb:863 src/clients/kdump.rb:897 src/clients/kdump.rb:946
+#: src/clients/kdump.rb:980 src/clients/kdump.rb:1027
msgid "Value for \"dir\" missing."
msgstr ""
@@ -446,48 +451,48 @@
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:869 src/clients/kdump.rb:919 src/clients/kdump.rb:960
-#: src/clients/kdump.rb:986
+#: src/clients/kdump.rb:877 src/clients/kdump.rb:927 src/clients/kdump.rb:968
+#: src/clients/kdump.rb:994
msgid "Value for \"server\" missing."
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:998
+#: src/clients/kdump.rb:1006
msgid "Value for \"share\" missing."
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1040
+#: src/clients/kdump.rb:1048
msgid "Wrong value for target."
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1151
+#: src/clients/kdump.rb:1159
msgid "Wrong value of options \"no\"."
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1171
+#: src/clients/kdump.rb:1179
msgid "Wrong value for option \"server\"."
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1191
+#: src/clients/kdump.rb:1199
msgid "Wrong value for option \"user\"."
msgstr ""
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1228 src/clients/kdump.rb:1248
+#: src/clients/kdump.rb:1236 src/clients/kdump.rb:1256
msgid "Wrong value for option \"email\"."
msgstr ""
-#: src/clients/kdump.rb:1260
+#: src/clients/kdump.rb:1268
msgid "Firmware-assisted dump: %{status}"
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1278
+#: src/clients/kdump.rb:1286
msgid "No option has been defined."
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/languages_db.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/languages_db.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/languages_db.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:27+0200\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
Modified: branches/SLE12-SP5/yast/50-pot/ldap-client.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/ldap-client.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/ldap-client.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:28+0200\n"
-"PO-Revision-Date: 2016-08-30 18:28+0200\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -129,8 +129,8 @@
#: src/ui.rb:449
msgid ""
"<p>Edit the values of attributes in the table with <b>Edit</b>.\n"
-"Some values have special meanings, for example, changing the <b>cn</b> value r"
-"enames the\n"
+"Some values have special meanings, for example, changing the <b>cn</b> value "
+"renames the\n"
"current module.</p>\n"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/ldap.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/ldap.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/ldap.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:28+0200\n"
-"PO-Revision-Date: 2016-08-30 18:28+0200\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -26,8 +26,8 @@
#: src/Ldap.rb:256
msgid ""
"Failed to establish TLS encryption.\n"
-"Verify that the correct CA Certificate is installed and the Server Certificate"
-" is valid."
+"Verify that the correct CA Certificate is installed and the Server "
+"Certificate is valid."
msgstr ""
#. hint to error message
@@ -281,8 +281,8 @@
#: src/LdapPopup.rb:555
msgid ""
"<p>Here, set the values of attributes belonging\n"
-"to an object using the current template. Such values are used as defaults when"
-"\n"
+"to an object using the current template. Such values are used as defaults "
+"when\n"
"the new object is created.</p>\n"
msgstr ""
@@ -295,7 +295,8 @@
#: src/LdapPopup.rb:567
msgid ""
"<p>You can use special syntax to create attribute\n"
-"values from existing ones. The expression <i>%attr_name</i> will be replaced\n"
+"values from existing ones. The expression <i>%attr_name</i> will be "
+"replaced\n"
"with the value of attribute \"attr_name\" (for example, use \"/home/%uid\"\n"
"as a value of \"homeDirectory\").</p>\n"
msgstr ""
@@ -318,9 +319,9 @@
#. help text for LDAP browser
#: src/ldap_browser.rb:64
msgid ""
-"<p>Once the LDAP object is selected in the tree, the table shows the object da"
-"ta. Use <b>Edit</b> to change the value of the selected attribute. Use <b>Save"
-"</b> to save your changes to LDAP.</p>"
+"<p>Once the LDAP object is selected in the tree, the table shows the object "
+"data. Use <b>Edit</b> to change the value of the selected attribute. Use "
+"<b>Save</b> to save your changes to LDAP.</p>"
msgstr ""
#. popup question (Continue/Cancel follows)
Modified: branches/SLE12-SP5/yast/50-pot/mail.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/mail.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/mail.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:28+0200\n"
-"PO-Revision-Date: 2016-08-30 18:28+0200\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -83,8 +83,8 @@
#: src/include/mail/helps.rb:79
msgid ""
"<p>If choosing <b>No Connection</b>, the mail server will be started.\n"
-"However, only local mail transport is possible. The MTA listens to the localho"
-"st.</p>\n"
+"However, only local mail transport is possible. The MTA listens to the "
+"localhost.</p>\n"
msgstr ""
#. Translators: masquerading dialog help, part 1 of 1
@@ -99,7 +99,8 @@
msgid ""
"\n"
"<p>Some servers require authentication for sending mails. Here you can\n"
-"enter information for this option. If you do not want to use authentication,\n"
+"enter information for this option. If you do not want to use "
+"authentication,\n"
"simply leave these fields empty.</p>\n"
msgstr ""
@@ -108,16 +109,16 @@
msgid ""
"\n"
"<p>The outgoing mail server is generally intended for dial-up connections.\n"
-"Enter the Internet service provider's SMTP server, such as <b>smtp.provider.co"
-"m</b>.</p>\n"
+"Enter the Internet service provider's SMTP server, such as <b>smtp.provider."
+"com</b>.</p>\n"
msgstr ""
#. Translators: authentication dialog help 3/4
#: src/include/mail/helps.rb:109
msgid ""
"\n"
-"<p>In the <b>User Name</b> field, enter the user name assigned by from your pr"
-"ovider.</p>\n"
+"<p>In the <b>User Name</b> field, enter the user name assigned by from your "
+"provider.</p>\n"
msgstr ""
#. Translators: authentication dialog help 4/4
@@ -150,8 +151,8 @@
"\n"
"<p>This table redirects mail delivered locally.\n"
"Redirect it to another local user (useful for system accounts,\n"
-"especially for <b>root</b>), to a remote address, or to a list of addresses.</"
-"p>\n"
+"especially for <b>root</b>), to a remote address, or to a list of addresses."
+"</p>\n"
msgstr ""
#. Translators: aliases dialog help, part 2 of 2
@@ -206,8 +207,7 @@
#. but ProbePackages still has to be called.
#. continue-cancel popup
#: src/include/mail/ui.rb:157
-msgid ""
-"The configuration will be written now.\n"
+msgid "The configuration will be written now.\n"
msgstr ""
#. Translators: dialog caption
@@ -609,7 +609,8 @@
#: src/include/mail/widgets.rb:162
msgid ""
"\n"
-"<p><b>Enabling virus scanning (AMaViS)</b> checks incoming and outgoing mail\n"
+"<p><b>Enabling virus scanning (AMaViS)</b> checks incoming and outgoing "
+"mail\n"
"with AMaViS.</p>\n"
msgstr ""
@@ -647,10 +648,13 @@
msgid ""
"\n"
"<p>Enabling DKIM for outgoing emails requires additional actions. A SSL key\n"
-"will be generated for the 'mydomain' value defined in Postfix. A new service\n"
-"'submission' will be configured in Postfix. After this is set up you can send\n"
+"will be generated for the 'mydomain' value defined in Postfix. A new "
+"service\n"
+"'submission' will be configured in Postfix. After this is set up you can "
+"send\n"
"email with this service 'submission' from 'mynetworks' with enabled SASL\n"
-"authentication. Only the emails sent by this new service will be signed with\n"
+"authentication. Only the emails sent by this new service will be signed "
+"with\n"
"the domain key.</p>\n"
msgstr ""
@@ -662,15 +666,16 @@
"Service. The public key will be saved as a DNS TXT record\n"
"in <b>/var/db/dkim/[mydomain].public.txt</b> and needs to be deployed to an\n"
"according Domain Name Service. If there is a name service\n"
-"running on this server, which is the authoritative server for that domain, the"
-"\n"
+"running on this server, which is the authoritative server for that domain, "
+"the\n"
"public key will be added as a TXT record to that domain zone\n"
"automatically.</p>\n"
msgstr ""
#. help text
#: src/include/mail/widgets.rb:215
-msgid "If you enable DKIM support, the virus scanning (AMaViS) will be enabled too."
+msgid ""
+"If you enable DKIM support, the virus scanning (AMaViS) will be enabled too."
msgstr ""
#. Translators: text entry label
@@ -714,8 +719,8 @@
#. help text
#: src/include/mail/widgets.rb:306
msgid ""
-"<p>The <b>delivery mode</b> is usually <b>Directly</b>, unless you do not forw"
-"ard root's mail or want to access the mail via IMAP.</p>"
+"<p>The <b>delivery mode</b> is usually <b>Directly</b>, unless you do not "
+"forward root's mail or want to access the mail via IMAP.</p>"
msgstr ""
#. LogView label. take a string from users?
@@ -778,8 +783,7 @@
#. Translators: popup message part, ends with a newline
#: src/modules/Mail.rb:216
-msgid ""
-"AMaViS, a virus scanner, will be installed.\n"
+msgid "AMaViS, a virus scanner, will be installed.\n"
msgstr ""
#. error popup.
@@ -792,14 +796,12 @@
#. Translators: popup message part, ends with a newline
#: src/modules/Mail.rb:249
-msgid ""
-"Fetchmail, a mail downloading utility, will be installed.\n"
+msgid "Fetchmail, a mail downloading utility, will be installed.\n"
msgstr ""
#. Translators: popup message part, ends with a newline
#: src/modules/Mail.rb:258
-msgid ""
-"Dovecot IMAP server, will be installed.\n"
+msgid "Dovecot IMAP server, will be installed.\n"
msgstr ""
#. Translators: dialog caption
Modified: branches/SLE12-SP5/yast/50-pot/migration.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/migration.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/migration.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-31 17:52+0200\n"
-"PO-Revision-Date: 2017-03-31 17:52+0200\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -36,8 +36,8 @@
#. TRANSLATORS: a short help text (the details are directly in the dialog)
#: src/lib/migration/finish_dialog.rb:84
msgid ""
-"<p><b>Finish</b> will close the migration and you should restart the system as"
-" soon as possible.</b>"
+"<p><b>Finish</b> will close the migration and you should restart the system "
+"as soon as possible.</b>"
msgstr ""
#. TRANSLATORS: The final congratulation displayed at the end of migration,
@@ -101,15 +101,14 @@
#. %{name} is a repository name, %{link} is a hidden internal identifier
#: src/lib/migration/proposal_client.rb:152
msgid ""
-"Warning: Repository <b>%{name}</b> is obsolete and should be excluded from mig"
-"ration.<br>It is highly recommended to disable this repository. (<a href=\"%{li"
-"nk}\">Disable</a>)"
+"Warning: Repository <b>%{name}</b> is obsolete and should be excluded from "
+"migration.<br>It is highly recommended to disable this repository. (<a href="
+"\"%{link}\">Disable</a>)"
msgstr ""
#. TRANSLATORS: help text
#: src/lib/migration/proposal_client.rb:190
-msgid ""
-"<p>This is an overview of the product migration.</p>\n"
+msgid "<p>This is an overview of the product migration.</p>\n"
msgstr ""
#. @return [String] translated headline
Modified: branches/SLE12-SP5/yast/50-pot/multipath.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/multipath.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/multipath.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-25 02:28+0000\n"
-"PO-Revision-Date: 2017-03-25 02:28+0000\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
Modified: branches/SLE12-SP5/yast/50-pot/network.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/network.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/network.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-08 02:28+0000\n"
-"PO-Revision-Date: 2017-04-08 02:28+0000\n"
+"POT-Creation-Date: 2019-09-20 16:56+0200\n"
+"PO-Revision-Date: 2019-09-20 16:56+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -28,7 +28,7 @@
#. Commandline command help
#. Commandline command help
#: src/clients/dns.rb:71 src/clients/host.rb:67 src/clients/lan.rb:65
-#: src/clients/lan.rb:76 src/clients/remote.rb:64
+#: src/clients/lan.rb:76 src/clients/remote.rb:63
msgid "Display configuration summary"
msgstr ""
@@ -85,40 +85,31 @@
msgstr ""
#. progress step title
-#: src/clients/firewall_stage1_finish.rb:63
+#: src/clients/firewall_stage1_finish.rb:67
msgid "Writing Firewall Configuration..."
msgstr ""
-#. Proposal title
-#: src/clients/firewall_stage1_proposal.rb:141
-msgid "Firewall and SSH"
-msgstr ""
-
#. Menu entry label
-#: src/clients/firewall_stage1_proposal.rb:143
-msgid "&Firewall and SSH"
-msgstr ""
-
-#: src/clients/firewall_stage1_proposal.rb:156
+#: src/clients/firewall_stage1_proposal.rb:161
msgid "Basic Firewall and SSH Configuration"
msgstr ""
#. frame label
-#: src/clients/firewall_stage1_proposal.rb:161
+#: src/clients/firewall_stage1_proposal.rb:166
msgid "Firewall and SSH service"
msgstr ""
#. TRANSLATORS: check-box label
-#: src/clients/firewall_stage1_proposal.rb:172
+#: src/clients/firewall_stage1_proposal.rb:177
msgid "Enable Firewall"
msgstr ""
#. TRANSLATORS: check-box label
-#: src/clients/firewall_stage1_proposal.rb:181
+#: src/clients/firewall_stage1_proposal.rb:186
msgid "Enable SSH Service"
msgstr ""
-#: src/clients/firewall_stage1_proposal.rb:195
+#: src/clients/firewall_stage1_proposal.rb:200
msgid ""
"<p><b><big>Firewall and SSH</big></b><br>\n"
"Firewall is a defensive mechanism that protects your computer from network "
@@ -128,14 +119,14 @@
"SSH client</p>"
msgstr ""
-#: src/clients/firewall_stage1_proposal.rb:201
+#: src/clients/firewall_stage1_proposal.rb:206
msgid ""
"<p>Here you can choose whether the firewall will be enabled or disabled "
"after\n"
"the installation. It is recommended to keep it enabled.</p>"
msgstr ""
-#: src/clients/firewall_stage1_proposal.rb:204
+#: src/clients/firewall_stage1_proposal.rb:209
msgid ""
"<p>With enabled firewall, you can decide whether to open firewall port for "
"SSH\n"
@@ -145,58 +136,64 @@
msgstr ""
#. TRANSLATORS: help text
-#: src/clients/firewall_stage1_proposal.rb:211
+#: src/clients/firewall_stage1_proposal.rb:216
msgid ""
"<p>You can also open VNC ports in firewall. It will not enable\n"
"the remote administration service on a running system but it is\n"
"started by the installer automatically if needed.</p>"
msgstr ""
-#. anything but enabling the firewall closes this dialog
-#. (VNC and SSH checkboxes do nothing)
-#: src/clients/firewall_stage1_proposal.rb:284
+#. Returns the cpu mitigation part of the bootloader proposal description
+#. Returns nil if this part should be skipped
+#. @return [String] proposal html text
+#: src/clients/firewall_stage1_proposal.rb:297
+msgid "CPU Mitigations: "
+msgstr ""
+
+#. do it in own dialog window
+#: src/clients/firewall_stage1_proposal.rb:325
msgid "Firewall will be enabled (<a href=\"%s\">disable</a>)"
msgstr ""
-#: src/clients/firewall_stage1_proposal.rb:288
+#: src/clients/firewall_stage1_proposal.rb:329
msgid "Firewall will be disabled (<a href=\"%s\">enable</a>)"
msgstr ""
-#: src/clients/firewall_stage1_proposal.rb:294
+#: src/clients/firewall_stage1_proposal.rb:335
msgid "SSH service will be enabled (<a href=\"%s\">disable</a>)"
msgstr ""
-#: src/clients/firewall_stage1_proposal.rb:298
+#: src/clients/firewall_stage1_proposal.rb:339
msgid "SSH service will be disabled (<a href=\"%s\">enable</a>)"
msgstr ""
#. TRANSLATORS: check-box label
-#: src/clients/firewall_stage1_proposal.rb:315
+#: src/clients/firewall_stage1_proposal.rb:356
msgid "Open SSH Port"
msgstr ""
#. TRANSLATORS: check-box label
-#: src/clients/firewall_stage1_proposal.rb:329
+#: src/clients/firewall_stage1_proposal.rb:370
msgid "Open &VNC Ports"
msgstr ""
#. Show VNC port only if installing over VNC
-#: src/clients/firewall_stage1_proposal.rb:347
+#: src/clients/firewall_stage1_proposal.rb:388
msgid "VNC ports will be open (<a href=\"%s\">close</a>)"
msgstr ""
-#: src/clients/firewall_stage1_proposal.rb:349
+#: src/clients/firewall_stage1_proposal.rb:390
msgid "VNC ports will be blocked (<a href=\"%s\">open</a>)"
msgstr ""
#. Returns the SSH-port part of the firewall proposal description
#. Returns nil if this part should be skipped
#. @return [String] proposal html text
-#: src/clients/firewall_stage1_proposal.rb:361
+#: src/clients/firewall_stage1_proposal.rb:402
msgid "SSH port will be open (<a href=\"%s\">block</a>)"
msgstr ""
-#: src/clients/firewall_stage1_proposal.rb:363
+#: src/clients/firewall_stage1_proposal.rb:404
msgid "SSH port will be blocked (<a href=\"%s\">open</a>)"
msgstr ""
@@ -510,22 +507,22 @@
msgstr ""
#. Commandline command help
-#: src/clients/remote.rb:74
+#: src/clients/remote.rb:73
msgid "Allow remote access"
msgstr ""
#. Commandline command help
-#: src/clients/remote.rb:85
+#: src/clients/remote.rb:84
msgid "Set 'yes' to allow or 'no' to disallow the remote administration"
msgstr ""
#. Command line output Headline
-#: src/clients/remote.rb:126
+#: src/clients/remote.rb:125
msgid "Remote Access Configuration Summary:"
msgstr ""
#. Command line error message
-#: src/clients/remote.rb:146
+#: src/clients/remote.rb:145
msgid ""
"Please set 'yes' to allow the remote administration\n"
"or 'no' to disallow it."
@@ -544,7 +541,7 @@
#. Commandline help title
#. Main routing dialog
#. @return dialog result
-#: src/clients/routing.rb:57 src/include/network/services/routing.rb:510
+#: src/clients/routing.rb:57 src/include/network/services/routing.rb:520
msgid "Routing Configuration"
msgstr ""
@@ -631,7 +628,7 @@
#. Table header label
#. Table header 3/4
-#: src/clients/routing.rb:208 src/include/network/lan/address.rb:101
+#: src/clients/routing.rb:208 src/include/network/lan/address.rb:97
#: src/include/network/services/routing.rb:89
msgid "Netmask"
msgstr ""
@@ -715,13 +712,13 @@
#. interface summary: WiFi without encryption
#. interface summary: WiFi without encryption
-#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1456
+#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1503
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:1458
+#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1505
msgid "Change."
msgstr ""
@@ -1020,18 +1017,18 @@
msgstr ""
#. Frame label
-#: src/include/network/lan/address.rb:85
+#: src/include/network/lan/address.rb:81
msgid "Additional Addresses"
msgstr ""
#. Table header label
-#: src/include/network/lan/address.rb:97
+#: src/include/network/lan/address.rb:93
msgid "IPv4 Address Label"
msgstr ""
#. Table header label
#. Table header label
-#: src/include/network/lan/address.rb:99 src/include/network/lan/complex.rb:75
+#: src/include/network/lan/address.rb:95 src/include/network/lan/complex.rb:75
#: src/include/network/services/host.rb:129
msgid "IP Address"
msgstr ""
@@ -1039,7 +1036,7 @@
#. PushButton label
#. PushButton label
#. PushButton label
-#: src/include/network/lan/address.rb:108
+#: src/include/network/lan/address.rb:104
#: src/include/network/services/host.rb:140
#: src/include/network/services/routing.rb:100
msgid "Ad&d"
@@ -1048,7 +1045,7 @@
#. PushButton label
#. PushButton label
#. PushButton label
-#: src/include/network/lan/address.rb:110
+#: src/include/network/lan/address.rb:106
#: src/include/network/services/host.rb:142
#: src/include/network/services/routing.rb:102
msgid "&Edit"
@@ -1057,155 +1054,156 @@
#. PushButton label
#. PushButton label
#. PushButton label
-#: src/include/network/lan/address.rb:112
+#: src/include/network/lan/address.rb:108
#: src/include/network/services/host.rb:144
#: src/include/network/services/routing.rb:104
msgid "De&lete"
msgstr ""
-#: src/include/network/lan/address.rb:133
+#: src/include/network/lan/address.rb:129
msgid "&Name of Interface"
msgstr ""
-#: src/include/network/lan/address.rb:135
+#: src/include/network/lan/address.rb:131
msgid "<p>TODO kind of vague!</p>"
msgstr ""
#. Combo Box label
-#: src/include/network/lan/address.rb:140
+#: src/include/network/lan/address.rb:136
msgid "Assign Interface to Firewall &Zone"
msgstr ""
#. check box label
-#: src/include/network/lan/address.rb:148
+#: src/include/network/lan/address.rb:144
msgid "&Mandatory Interface"
msgstr ""
#. ComboBox label
#. ComboBox label
-#: src/include/network/lan/address.rb:156
+#: src/include/network/lan/address.rb:152
#: src/include/network/lan/hardware.rb:360
msgid "&Device Type"
msgstr ""
#. ComboBox label
#. TextEntry label
-#: src/include/network/lan/address.rb:174
+#: src/include/network/lan/address.rb:170
#: src/include/network/lan/hardware.rb:346
msgid "&Configuration Name"
msgstr ""
-#: src/include/network/lan/address.rb:183
+#: src/include/network/lan/address.rb:179
msgid "Tunnel owner"
msgstr ""
-#: src/include/network/lan/address.rb:184
+#: src/include/network/lan/address.rb:180
msgid "Tunnel group"
msgstr ""
-#: src/include/network/lan/address.rb:193
-#: src/include/network/lan/address.rb:1306
+#: src/include/network/lan/address.rb:189
+#: src/include/network/lan/address.rb:1285
msgid "Bridged Devices"
msgstr ""
-#: src/include/network/lan/address.rb:213
+#: src/include/network/lan/address.rb:209
msgid "Real Interface for &VLAN"
msgstr ""
-#: src/include/network/lan/address.rb:216
+#: src/include/network/lan/address.rb:212
msgid "VLAN ID"
msgstr ""
-#: src/include/network/lan/address.rb:233
+#: src/include/network/lan/address.rb:229
msgid "Bond Slaves and Order"
msgstr ""
-#: src/include/network/lan/address.rb:237
+#: src/include/network/lan/address.rb:233
msgid "Up"
msgstr ""
-#: src/include/network/lan/address.rb:238
+#: src/include/network/lan/address.rb:234
msgid "Down"
msgstr ""
-#: src/include/network/lan/address.rb:242
+#: src/include/network/lan/address.rb:238
msgid "Bond &Slaves"
msgstr ""
#. ComboBox label
-#: src/include/network/lan/address.rb:263
+#: src/include/network/lan/address.rb:259
msgid "&Bond Driver Options"
msgstr ""
-#: src/include/network/lan/address.rb:265
+#: src/include/network/lan/address.rb:261
msgid "<p>Select the bond driver options and edit them if necessary. </p>"
msgstr ""
-#. if (LanItems::type=="br") UI::ReplaceWidget(`rp, `Empty());
-#. else
-#: src/include/network/lan/address.rb:290
-#: src/include/network/lan/address.rb:806
+#. Initialize a RadioButtonGroup
+#. Group called FOO has buttons FOO_bar FOO_qux and values bar qux
+#. @param [String] key id of the widget
+#: src/include/network/lan/address.rb:286
+#: src/include/network/lan/address.rb:794
msgid "No Link and IP Setup (Bonding Slaves)"
msgstr ""
-#: src/include/network/lan/address.rb:293
+#: src/include/network/lan/address.rb:289
msgid "Use iBFT Values"
msgstr ""
-#: src/include/network/lan/address.rb:299
+#: src/include/network/lan/address.rb:295
msgid "Dynamic Address"
msgstr ""
-#: src/include/network/lan/address.rb:315
+#: src/include/network/lan/address.rb:311
msgid "DHCP both version 4 and 6"
msgstr ""
-#: src/include/network/lan/address.rb:316
+#: src/include/network/lan/address.rb:312
msgid "DHCP version 4 only"
msgstr ""
-#: src/include/network/lan/address.rb:317
+#: src/include/network/lan/address.rb:313
msgid "DHCP version 6 only"
msgstr ""
#. TODO : Stat ... Assigned
-#: src/include/network/lan/address.rb:328
+#: src/include/network/lan/address.rb:324
msgid "Statically Assigned IP Address"
msgstr ""
#. TextEntry label
#. TextEntry label
-#: src/include/network/lan/address.rb:332
+#: src/include/network/lan/address.rb:328
#: src/include/network/lan/virtual.rb:207
#: src/include/network/services/host.rb:326
msgid "&IP Address"
msgstr ""
-#: src/include/network/lan/address.rb:334
+#: src/include/network/lan/address.rb:330
msgid "&Subnet Mask"
msgstr ""
-#: src/include/network/lan/address.rb:336
+#: src/include/network/lan/address.rb:332
msgid "&Hostname"
msgstr ""
#. Text entry label
-#: src/include/network/lan/address.rb:367
+#: src/include/network/lan/address.rb:363
msgid "R&emote IP Address"
msgstr ""
#. validation error popup
-#: src/include/network/lan/address.rb:376
+#: src/include/network/lan/address.rb:372
msgid "The remote IP address is invalid."
msgstr ""
#. push button label
-#: src/include/network/lan/address.rb:384
+#: src/include/network/lan/address.rb:380
msgid "&S/390"
msgstr ""
#. validate device type, misdetection
-#: src/include/network/lan/address.rb:1023
+#: src/include/network/lan/address.rb:997
msgid ""
"You have changed the interface type from the one\n"
"that has been detected. This only makes sense\n"
@@ -1213,13 +1211,13 @@
msgstr ""
#. Popup text
-#: src/include/network/lan/address.rb:1043
+#: src/include/network/lan/address.rb:1017
msgid "Configuration %1 already present."
msgstr ""
#. If firewall is active and interface in no zone, nothing
#. gets through (#62309) so warn and redirect to details
-#: src/include/network/lan/address.rb:1067
+#: src/include/network/lan/address.rb:1041
msgid ""
"The firewall is active, but this interface is not\n"
"in any zone. All its traffic would be blocked.\n"
@@ -1230,20 +1228,20 @@
#. @param [String] key the widget being validated
#. @param [Hash] event the event being handled
#. @return whether valid
-#: src/include/network/lan/address.rb:1087
+#: src/include/network/lan/address.rb:1061
msgid "No valid IP address."
msgstr ""
-#: src/include/network/lan/address.rb:1094
+#: src/include/network/lan/address.rb:1068
msgid "No valid netmask or prefix length."
msgstr ""
-#: src/include/network/lan/address.rb:1102
+#: src/include/network/lan/address.rb:1076
msgid "Invalid hostname."
msgstr ""
#. There'll be no 127.0.0.2 -> remind user to define some hostname
-#: src/include/network/lan/address.rb:1109
+#: src/include/network/lan/address.rb:1083
msgid ""
"No hostname has been specified. We recommend to associate \n"
"a hostname with a static IP, otherwise the machine name will \n"
@@ -1253,67 +1251,67 @@
msgstr ""
#. Popup text
-#: src/include/network/lan/address.rb:1127
+#: src/include/network/lan/address.rb:1101
msgid ""
"Duplicate IP address detected.\n"
"Really continue?\n"
msgstr ""
#. Stores content of IFPLUGD_PRIORITY widget into internal variables
-#: src/include/network/lan/address.rb:1186
+#: src/include/network/lan/address.rb:1160
msgid "&General"
msgstr ""
#. TODO: "MANDATORY",
-#: src/include/network/lan/address.rb:1197
+#: src/include/network/lan/address.rb:1171
msgid "Device Activation"
msgstr ""
-#: src/include/network/lan/address.rb:1201
+#: src/include/network/lan/address.rb:1175
msgid "Firewall Zone"
msgstr ""
-#: src/include/network/lan/address.rb:1206
+#: src/include/network/lan/address.rb:1180
msgid "Maximum Transfer Unit (MTU)"
msgstr ""
#. FIXME: we have helps per widget and for the whole
#. tab set but not for one tab
-#: src/include/network/lan/address.rb:1216
+#: src/include/network/lan/address.rb:1190
msgid "<p>Configure the detailed network card settings here.</p>"
msgstr ""
#. FIXME: here it does not complain about missing
#. shortcuts
-#: src/include/network/lan/address.rb:1283
+#: src/include/network/lan/address.rb:1262
msgid "&Address"
msgstr ""
#. Address tab help
-#: src/include/network/lan/address.rb:1286
+#: src/include/network/lan/address.rb:1265
msgid "<p>Configure your IP address.</p>"
msgstr ""
-#: src/include/network/lan/address.rb:1292
+#: src/include/network/lan/address.rb:1271
msgid "&Hardware"
msgstr ""
-#: src/include/network/lan/address.rb:1299
+#: src/include/network/lan/address.rb:1278
msgid "&Bond Slaves"
msgstr ""
-#: src/include/network/lan/address.rb:1313
+#: src/include/network/lan/address.rb:1292
msgid "&Wireless"
msgstr ""
#. Combo box label - when to activate device (e.g. on boot, manually, never,..)
-#: src/include/network/lan/address.rb:1361
+#: src/include/network/lan/address.rb:1332
msgid "Ifplugd Priority"
msgstr ""
#. Device activation main help. The individual parts will be
#. substituted as %1
-#: src/include/network/lan/address.rb:1367
+#: src/include/network/lan/address.rb:1338
msgid ""
"<p><b><big>IFPLUGD PRIORITY</big></b></p> \n"
"<p> All interfaces configured with <b>On Cable Connection</b> and with "
@@ -1326,12 +1324,24 @@
msgstr ""
#. Address dialog caption
-#: src/include/network/lan/address.rb:1450
+#: src/include/network/lan/address.rb:1421
msgid "Network Card Setup"
msgstr ""
+#. fixed bug #73739 - if dhcp is used, dont set default gw statically
+#. but also: reset default gw only if DHCP* is used, this branch covers
+#. "No IP address" case, then default gw must stay (#460262)
+#. and also: don't delete default GW for usb/pcmcia devices (#307102)
+#: src/include/network/lan/address.rb:1480
+msgid ""
+"A static default route is defined.\n"
+"It is suggested to remove the static default route definition \n"
+"if one can be obtained also via DHCP.\n"
+"Do you want to remove the static default route?"
+msgstr ""
+
#. Translators: Warn the user about not desired effect
-#: src/include/network/lan/address.rb:1608
+#: src/include/network/lan/address.rb:1576
msgid ""
"The interfaces selected share the same physical port and bonding them \n"
"may not have the desired effect of redundancy.\n"
@@ -1652,7 +1662,7 @@
msgstr ""
#. Continue-Cancel popup
-#: src/include/network/lan/complex.rb:398
+#: src/include/network/lan/complex.rb:399
msgid ""
"The interface is currently set to be managed\n"
"by the NetworkManager applet.\n"
@@ -1662,12 +1672,12 @@
msgstr ""
#. warn user when device to delete has STARTMODE=nfsroot (bnc#433867)
-#: src/include/network/lan/complex.rb:450
+#: src/include/network/lan/complex.rb:451
msgid "Device you select has STARTMODE=nfsroot. Really delete?"
msgstr ""
#. Network setup method dialog caption
-#: src/include/network/lan/complex.rb:481 src/include/network/widgets.rb:364
+#: src/include/network/lan/complex.rb:482 src/include/network/widgets.rb:373
msgid "Network Setup Method"
msgstr ""
@@ -1676,7 +1686,7 @@
#. it is basically useful if user aborts dialog and he has done some
#. changes already. Calling this function may results in confirmation
#. popup.
-#: src/include/network/lan/complex.rb:512
+#: src/include/network/lan/complex.rb:513
msgid "Network Settings"
msgstr ""
@@ -2307,23 +2317,24 @@
"the network mask (usually <tt>255.255.255.0</tt> or just length of prefix "
"<tt>/24</tt>).Optionally, you can enter\n"
"a fully qualified hostname for this IP address. The hostname will be written "
-"to <tt>/etc/hosts</tt>.</p>\n"
+"to <tt>/etc/hosts</tt> as canonical name.</p>\n"
+"YaST2 will also create aliases from the canonical name automatically.\n"
msgstr ""
#. Address dialog help 8/8
-#: src/include/network/lan/help.rb:226
+#: src/include/network/lan/help.rb:227
msgid ""
"<p>Contact your <b>network administrator</b> for more information about\n"
"the network configuration.</p>"
msgstr ""
-#: src/include/network/lan/help.rb:230
+#: src/include/network/lan/help.rb:231
msgid ""
"<p>DHCP configuration is not recommended for this product.\n"
"Components of this product might not work with DHCP.</p>"
msgstr ""
-#: src/include/network/lan/help.rb:234
+#: src/include/network/lan/help.rb:235
msgid ""
"<p><b><big>Firewall Zone</big></b></p>\n"
"<p>Select the firewall zone to put the interface into. If you\n"
@@ -2334,13 +2345,13 @@
"the firewall will be disabled.</p>"
msgstr ""
-#: src/include/network/lan/help.rb:244
+#: src/include/network/lan/help.rb:245
msgid ""
"<p><b>Mandatory Interface</b> specifies whether the network service reports "
"failure if the interface fails to start at boot time.</p>"
msgstr ""
-#: src/include/network/lan/help.rb:248
+#: src/include/network/lan/help.rb:249
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"
@@ -2351,7 +2362,7 @@
"values or define another one.</p>\n"
msgstr ""
-#: src/include/network/lan/help.rb:257
+#: src/include/network/lan/help.rb:258
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 "
@@ -2359,12 +2370,12 @@
msgstr ""
#. DHCP dialog help 1/7
-#: src/include/network/lan/help.rb:261
+#: src/include/network/lan/help.rb:262
msgid "<p><b><big>DHCP Client Options</big></b></p>"
msgstr ""
#. DHCP dialog help 2/7
-#: src/include/network/lan/help.rb:263
+#: src/include/network/lan/help.rb:264
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 "
@@ -2375,7 +2386,7 @@
msgstr ""
#. DHCP dialog help 3/7
-#: src/include/network/lan/help.rb:271
+#: src/include/network/lan/help.rb:272
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 "
@@ -2391,21 +2402,21 @@
msgstr ""
#. Aliases dialog help 1/4
-#: src/include/network/lan/help.rb:282
+#: src/include/network/lan/help.rb:283
msgid ""
"<p><b><big>Additional Addresses</big></b></p>\n"
"<p>Configure additional addresses of an interface in this table.</p>\n"
msgstr ""
#. Aliases dialog help 2/4
-#: src/include/network/lan/help.rb:286
+#: src/include/network/lan/help.rb:287
msgid ""
"<p>Enter an <b>IPv4 Address Label</b>, an <b>IP Address</b>, and\n"
"the <b>Netmask</b>.</p>"
msgstr ""
#. Aliases dialog help 3/4
-#: src/include/network/lan/help.rb:290
+#: src/include/network/lan/help.rb:291
msgid ""
"<p><b>IPv4 Address Label</b>, formerly known as Alias Name, is optional and "
"legacy. The total\n"
@@ -2415,7 +2426,7 @@
msgstr ""
#. Aliases dialog help 3/4, #83766
-#: src/include/network/lan/help.rb:296
+#: src/include/network/lan/help.rb:297
msgid ""
"<p>Do not include the interface name in the label. For example, enter "
"<b>foo</b> instead of <b>eth0:foo</b>.</p>"
@@ -2424,7 +2435,7 @@
#. shared between WirelessDialog and WirelessKeyPopup
#. this is suited to the button-switched key typing
#. Translators: dialog help
-#: src/include/network/lan/help.rb:303
+#: src/include/network/lan/help.rb:304
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"
@@ -2441,13 +2452,13 @@
msgstr ""
#. Wireless dialog help
-#: src/include/network/lan/help.rb:318
+#: src/include/network/lan/help.rb:319
msgid ""
"<p>Here, set the most important settings\n"
"for wireless networking.</p>"
msgstr ""
-#: src/include/network/lan/help.rb:321
+#: src/include/network/lan/help.rb:322
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"
@@ -2456,7 +2467,7 @@
"acts as an access point).</p>\n"
msgstr ""
-#: src/include/network/lan/help.rb:328
+#: src/include/network/lan/help.rb:329
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"
@@ -2468,7 +2479,7 @@
"signal strength.</p>\n"
msgstr ""
-#: src/include/network/lan/help.rb:337
+#: src/include/network/lan/help.rb:338
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"
@@ -2489,7 +2500,7 @@
"<b>Managed</b>.</p>\n"
msgstr ""
-#: src/include/network/lan/help.rb:355
+#: src/include/network/lan/help.rb:356
msgid ""
"<p>To use WEP, enter the\n"
"WEP encryption key to use. It can have a key\n"
@@ -2499,7 +2510,7 @@
msgstr ""
#. Wireless dialog help
-#: src/include/network/lan/help.rb:363
+#: src/include/network/lan/help.rb:364
msgid ""
"<p>To use WPA-PSK (sometimes referred to as WPA Home),\n"
"enter the preshared key. This\n"
@@ -2509,13 +2520,13 @@
"easy to guess as the passphrase.</p>\n"
msgstr ""
-#: src/include/network/lan/help.rb:371
+#: src/include/network/lan/help.rb:372
msgid ""
"<p>To use WPA-EAP (sometimes referred to as WPA Enterprise),\n"
"enter some additional parameters in the next dialog.</p>\n"
msgstr ""
-#: src/include/network/lan/help.rb:374
+#: src/include/network/lan/help.rb:375
msgid ""
"<p>These values will be written to the interface configuration file\n"
"'ifcfg-*' in '/etc/sysconfig/network'. If you need additional settings,\n"
@@ -2580,17 +2591,17 @@
#. combo box item, one of WPA EAP modes
#: src/include/network/lan/wireless.rb:79
-msgid "TTLS"
+msgid "PEAP"
msgstr ""
#. combo box item, one of WPA EAP modes
#: src/include/network/lan/wireless.rb:81
-msgid "PEAP"
+msgid "TLS"
msgstr ""
#. combo box item, one of WPA EAP modes
#: src/include/network/lan/wireless.rb:83
-msgid "TLS"
+msgid "TTLS"
msgstr ""
#: src/include/network/lan/wireless.rb:85
@@ -3012,37 +3023,37 @@
msgstr ""
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1357
+#: src/include/network/lan/wireless.rb:1355
msgid "MD5"
msgstr ""
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1359
+#: src/include/network/lan/wireless.rb:1357
msgid "GTC"
msgstr ""
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1361
+#: src/include/network/lan/wireless.rb:1359
msgid "CHAP"
msgstr ""
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1363
+#: src/include/network/lan/wireless.rb:1361
msgid "PAP"
msgstr ""
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1365
+#: src/include/network/lan/wireless.rb:1363
msgid "MSCHAPv1"
msgstr ""
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1369
+#: src/include/network/lan/wireless.rb:1365
msgid "MSCHAPv2"
msgstr ""
#. dialog caption
-#: src/include/network/lan/wireless.rb:1392
+#: src/include/network/lan/wireless.rb:1386
msgid "WPA-EAP Details"
msgstr ""
@@ -3051,28 +3062,28 @@
msgstr ""
#. Ramote Administration dialog caption
-#: src/include/network/remote/dialogs.rb:56
+#: src/include/network/remote/dialogs.rb:57
msgid "Remote Administration"
msgstr ""
#. RadioButton label
-#: src/include/network/remote/dialogs.rb:66
+#: src/include/network/remote/dialogs.rb:67
msgid "&Allow Remote Administration With Session Management"
msgstr ""
#. RadioButton label
-#: src/include/network/remote/dialogs.rb:74
+#: src/include/network/remote/dialogs.rb:75
msgid "&Allow Remote Administration Without Session Management"
msgstr ""
#. RadioButton label
-#: src/include/network/remote/dialogs.rb:82
+#: src/include/network/remote/dialogs.rb:83
msgid "&Do Not Allow Remote Administration"
msgstr ""
#. Remote Administration dialog help
#. %1 and %2 are port numbers for vnc and vnchttp, eg. 5901, 5801
-#: src/include/network/remote/dialogs.rb:99
+#: src/include/network/remote/dialogs.rb:103
msgid ""
"<p><b><big>Remote Administration Settings</big></b></p>\n"
"<p>If this feature is enabled, you can\n"
@@ -3088,17 +3099,17 @@
msgstr ""
#. Dialog frame title
-#: src/include/network/remote/dialogs.rb:123
+#: src/include/network/remote/dialogs.rb:127
msgid "Remote Administration Settings"
msgstr ""
#. Popup text
-#: src/include/network/routines.rb:140
+#: src/include/network/routines.rb:141
msgid "These packages need to be installed:"
msgstr ""
#. Popup text
-#: src/include/network/routines.rb:158
+#: src/include/network/routines.rb:159
msgid ""
"The required packages are not installed.\n"
"The configuration will be aborted.\n"
@@ -3117,7 +3128,7 @@
#. @param [Array<Hash>] l given list for conversion
#. @param [Fixnum] selected selected item (0 for the first)
#. @return a list of items
-#: src/include/network/routines.rb:206
+#: src/include/network/routines.rb:207
msgid "Unknown"
msgstr ""
@@ -3127,33 +3138,33 @@
#. if listed any items, disable them, if show_popup, show warning popup
#.
#. returns true if items were disabled
-#: src/include/network/routines.rb:868
+#: src/include/network/routines.rb:883
msgid ""
"Network is currently handled by NetworkManager\n"
"or completely disabled. YaST is unable to configure some options."
msgstr ""
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:928
+#: src/include/network/routines.rb:943
msgid "Network Cards"
msgstr ""
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:932
+#: src/include/network/routines.rb:947
msgid "Modems"
msgstr ""
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:936
+#: src/include/network/routines.rb:951
msgid "ISDN Cards"
msgstr ""
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:940
+#: src/include/network/routines.rb:955
msgid "DSL Devices"
msgstr ""
-#: src/include/network/routines.rb:945
+#: src/include/network/routines.rb:960
msgid "All Network Devices"
msgstr ""
@@ -3162,7 +3173,7 @@
#.
#. @param [Array<String>] list of incorrectly configured devices
#. @return [String] a message stating that incorrect DHCLIENT_SET_HOSTNAME setup was detected
-#: src/include/network/routines.rb:956
+#: src/include/network/routines.rb:971
msgid ""
"More than one interface asks to control the hostname via DHCP.\n"
"If you keep the current settings, the behavior is non-deterministic.\n"
@@ -3191,82 +3202,82 @@
msgid "Set Hostname via DHCP"
msgstr ""
-#: src/include/network/services/dns.rb:133
+#: src/include/network/services/dns.rb:129
msgid "&Assign Hostname to Loopback IP"
msgstr ""
-#: src/include/network/services/dns.rb:139
+#: src/include/network/services/dns.rb:135
msgid "&Modify DNS Configuration"
msgstr ""
-#: src/include/network/services/dns.rb:142
+#: src/include/network/services/dns.rb:138
msgid "Only Manually"
msgstr ""
-#: src/include/network/services/dns.rb:143
+#: src/include/network/services/dns.rb:139
msgid "Use Default Policy"
msgstr ""
-#: src/include/network/services/dns.rb:144
+#: src/include/network/services/dns.rb:140
msgid "Use Custom Policy"
msgstr ""
-#: src/include/network/services/dns.rb:155
+#: src/include/network/services/dns.rb:151
msgid "&Custom Policy Rule"
msgstr ""
-#: src/include/network/services/dns.rb:164
+#: src/include/network/services/dns.rb:160
msgid "Name Server &1"
msgstr ""
#. validation error popup
-#: src/include/network/services/dns.rb:180
+#: src/include/network/services/dns.rb:176
msgid "The IP address of the name server is invalid."
msgstr ""
#. NAMESERVER_2 and NAMESERVER_3 are cloned in the dialog function
-#: src/include/network/services/dns.rb:187
+#: src/include/network/services/dns.rb:183
msgid "Do&main Search"
msgstr ""
-#: src/include/network/services/dns.rb:212
+#: src/include/network/services/dns.rb:208
msgid "Name Server &2"
msgstr ""
-#: src/include/network/services/dns.rb:213
+#: src/include/network/services/dns.rb:209
msgid "Name Server &3"
msgstr ""
-#: src/include/network/services/dns.rb:217
+#: src/include/network/services/dns.rb:213
msgid "Hostname and Domain Name"
msgstr ""
#. global help, init, store for all dialog
-#: src/include/network/services/dns.rb:234
+#: src/include/network/services/dns.rb:230
msgid "Name Servers and Domain Search List"
msgstr ""
-#: src/include/network/services/dns.rb:251
+#: src/include/network/services/dns.rb:247
msgid "Hostname/DNS"
msgstr ""
#. Init handler for DHCP_HOSTNAME
-#: src/include/network/services/dns.rb:434
+#: src/include/network/services/dns.rb:430
msgid "keep current settings"
msgstr ""
#. translators: no device selected placeholder
-#: src/include/network/services/dns.rb:439
+#: src/include/network/services/dns.rb:435
msgid "no"
msgstr ""
#. translators: placeholder for "set hostname via any DHCP aware device"
-#: src/include/network/services/dns.rb:441
+#: src/include/network/services/dns.rb:437
msgid "yes: any"
msgstr ""
#. translators: label is in form yes: <device name>
-#: src/include/network/services/dns.rb:445
+#: src/include/network/services/dns.rb:441
msgid "yes: %s"
msgstr ""
@@ -3274,30 +3285,30 @@
#. @param [String] key the widget being validated
#. @param [Hash] event the event being handled
#. @return whether valid
-#: src/include/network/services/dns.rb:524
+#: src/include/network/services/dns.rb:527
msgid ""
"It's not recommended to use .local as domainname due to Multicast DNS. Use "
"it at your own risk?"
msgstr ""
#. Popup::Error text
-#: src/include/network/services/dns.rb:542
+#: src/include/network/services/dns.rb:545
msgid "The search list can have at most %1 domains."
msgstr ""
#. Popup::Error text
-#: src/include/network/services/dns.rb:548
+#: src/include/network/services/dns.rb:551
msgid "The search list can have at most %1 characters."
msgstr ""
#. Popup::Error text
-#: src/include/network/services/dns.rb:557
+#: src/include/network/services/dns.rb:560
msgid "The search domain '%1' is invalid."
msgstr ""
#. Standalone dialog only - embedded one is handled separately
#. via CWMTab
-#: src/include/network/services/dns.rb:692
+#: src/include/network/services/dns.rb:695
msgid "Hostname and Name Server Configuration"
msgstr ""
@@ -3411,9 +3422,8 @@
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:436
+#. An input validator for the Routing dialog
+#: src/include/network/services/routing.rb:446
msgid "The default gateway is invalid."
msgstr ""
@@ -3547,115 +3557,130 @@
"%1</p>\n"
msgstr ""
-#: src/include/network/widgets.rb:235
+#. translators: a possible value for: IPoIB device mode
+#: src/include/network/widgets.rb:218
+msgid "connected"
+msgstr ""
+
+#: src/include/network/widgets.rb:219
+msgid "datagram"
+msgstr ""
+
+#. ipoib_modes contains known IPoIB modes, "default" is place holder for
+#. "do not set anything explicitly -> driver will choose"
+#: src/include/network/widgets.rb:243
+msgid "default"
+msgstr ""
+
+#: src/include/network/widgets.rb:244
msgid "IPoIB Device Mode"
msgstr ""
-#: src/include/network/widgets.rb:246
+#: src/include/network/widgets.rb:255
msgid "Firewall is not installed."
msgstr ""
#. translators: MTU value description (size in bytes, desc)
-#: src/include/network/widgets.rb:253
+#: src/include/network/widgets.rb:262
msgid "1500 (Ethernet, DSL broadband)"
msgstr ""
-#: src/include/network/widgets.rb:254
+#: src/include/network/widgets.rb:263
msgid "1492 (PPPoE broadband)"
msgstr ""
-#: src/include/network/widgets.rb:255
+#: src/include/network/widgets.rb:264
msgid "576 (dial-up)"
msgstr ""
#. translators: MTU value description (size in bytes, desc)
-#: src/include/network/widgets.rb:262
+#: src/include/network/widgets.rb:271
msgid "65520 (IPoIB in connected mode)"
msgstr ""
-#: src/include/network/widgets.rb:263
+#: src/include/network/widgets.rb:272
msgid "2044 (IPoIB in datagram mode)"
msgstr ""
#. textentry label, Maximum Transfer Unit
-#: src/include/network/widgets.rb:271
+#: src/include/network/widgets.rb:280
msgid "Set &MTU"
msgstr ""
#. the user can control the network with the NetworkManager program
-#: src/include/network/widgets.rb:287
+#: src/include/network/widgets.rb:296
msgid "NetworkManager Service"
msgstr ""
#. ifup is a program name
-#: src/include/network/widgets.rb:295
+#: src/include/network/widgets.rb:304
msgid "Traditional ifup"
msgstr ""
#. wicked is network configuration backend like netconfig
-#: src/include/network/widgets.rb:303
+#: src/include/network/widgets.rb:312
msgid "Wicked Service"
msgstr ""
#. used when no network service is active or to disable network service
-#: src/include/network/widgets.rb:311
+#: src/include/network/widgets.rb:320
msgid "Network Services Disabled"
msgstr ""
#. Store the NetworkManager widget
#. @param [String] key id of the widget
#. @param [Hash] event the event being handled
-#: src/include/network/widgets.rb:342
+#: src/include/network/widgets.rb:351
msgid "Applet needed"
msgstr ""
-#: src/include/network/widgets.rb:343
+#: src/include/network/widgets.rb:352
msgid ""
"NetworkManager is controlled by desktop applet\n"
"(KDE plasma widget and nm-applet for GNOME).\n"
"Be sure it's running and if not, start it manually."
msgstr ""
-#: src/include/network/widgets.rb:359
+#: src/include/network/widgets.rb:368
msgid "General Network Settings"
msgstr ""
-#: src/include/network/widgets.rb:403
+#: src/include/network/widgets.rb:412
msgid "IPv6 Protocol Settings"
msgstr ""
-#: src/include/network/widgets.rb:404
+#: src/include/network/widgets.rb:413
msgid "Enable IPv6"
msgstr ""
#. TRANSLATORS: Informs that device name is not known
-#: src/include/network/widgets.rb:421
+#: src/include/network/widgets.rb:430
msgid "Unknown device"
msgstr ""
#. TRANSLATORS: Part of label, device with IP address assigned by DHCP
-#: src/include/network/widgets.rb:430
+#: src/include/network/widgets.rb:439
msgid "DHCP address"
msgstr ""
#. TRANSLATORS: Informs that no IP has been assigned to the device
-#: src/include/network/widgets.rb:437
+#: src/include/network/widgets.rb:446
msgid "No IP address assigned"
msgstr ""
-#: src/include/network/widgets.rb:440
+#: src/include/network/widgets.rb:449
msgid ""
"%1 \n"
"%2 - %3"
msgstr ""
#. #186102
-#: src/include/network/widgets.rb:493
+#: src/include/network/widgets.rb:502
msgid "&Change Device"
msgstr ""
#. popup dialog title
-#: src/include/network/widgets.rb:526
+#: src/include/network/widgets.rb:535
msgid "Network Device Select"
msgstr ""
@@ -3664,7 +3689,7 @@
#. to "0.0.0.0/32"
#.
#. translators: a note that listed device is already configured
-#: src/include/network/widgets.rb:572
+#: src/include/network/widgets.rb:581
msgid "configured"
msgstr ""
@@ -3682,399 +3707,412 @@
msgstr ""
#. Opens dialog for editing NIC name
-#: src/lib/network/edit_nic_name.rb:86
+#: src/lib/network/edit_nic_name.rb:94
msgid "Device Name:"
msgstr ""
-#: src/lib/network/edit_nic_name.rb:92
+#: src/lib/network/edit_nic_name.rb:100
msgid "Base Udev Rule On"
msgstr ""
#. make sure there is enough space (#367239)
-#: src/lib/network/edit_nic_name.rb:101
+#: src/lib/network/edit_nic_name.rb:109
msgid "MAC address: %s"
msgstr ""
-#: src/lib/network/edit_nic_name.rb:107
+#: src/lib/network/edit_nic_name.rb:115
msgid "BusID: %s"
msgstr ""
#. check if the name is assigned to another device already
-#: src/lib/network/edit_nic_name.rb:144
+#: src/lib/network/edit_nic_name.rb:149
msgid "Configuration name already exists."
msgstr ""
-#: src/lib/network/edit_nic_name.rb:148
+#: src/lib/network/edit_nic_name.rb:153
msgid "Invalid configuration name."
msgstr ""
+#. TRANSLATORS: informs that multiple interfaces are configured
+#: src/lib/network/lan_items_summary.rb:93
+msgid "Multiple Interfaces"
+msgstr ""
+
#. Progress stage 1
-#: src/modules/DNS.rb:377
+#: src/modules/DNS.rb:380
msgid "Write hostname"
msgstr ""
#. Progress stage 2
#. Progress stage 10
-#: src/modules/DNS.rb:379 src/modules/Lan.rb:518
+#: src/modules/DNS.rb:382 src/modules/Lan.rb:527
msgid "Update configuration"
msgstr ""
#. Progress stage 3
-#: src/modules/DNS.rb:381
+#: src/modules/DNS.rb:384
msgid "Update /etc/resolv.conf"
msgstr ""
#. Write dialog caption
-#: src/modules/DNS.rb:385
+#: src/modules/DNS.rb:388
msgid "Saving Hostname and DNS Configuration"
msgstr ""
#. Allow to set hostname even if it's modified by DHCP (#13427)
#. if(NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"]:false != true) {
#. Progress step 1/3
-#: src/modules/DNS.rb:394
+#: src/modules/DNS.rb:397
msgid "Writing hostname..."
msgstr ""
#. Progress step 2/3
#. Progress step 10
-#: src/modules/DNS.rb:411 src/modules/Lan.rb:606
+#: src/modules/DNS.rb:414 src/modules/Lan.rb:615
msgid "Updating configuration..."
msgstr ""
#. if(SCR::Read(.target.size, resolv_conf) < 0)
#. SCR::Write(.target.string, resolv_conf, "");
#. Progress step 3/3
-#: src/modules/DNS.rb:421
+#: src/modules/DNS.rb:424
msgid "Updating /etc/resolv.conf ..."
msgstr ""
#. Summary text
-#: src/modules/DNS.rb:543
+#: src/modules/DNS.rb:549
msgid "Hostname: Set by DHCP"
msgstr ""
#. Summary text
-#: src/modules/DNS.rb:549
+#: src/modules/DNS.rb:555
msgid "Hostname: %1"
msgstr ""
-#: src/modules/DNS.rb:557
+#: src/modules/DNS.rb:563
msgid "Hostname will not be written to /etc/hosts"
msgstr ""
#. Summary text
-#: src/modules/DNS.rb:578
+#: src/modules/DNS.rb:584
msgid "Name Servers: %1"
msgstr ""
#. Summary text
-#: src/modules/DNS.rb:588
+#: src/modules/DNS.rb:594
msgid "Search List: %1"
msgstr ""
+#. TRANSLATORS: Warning message, the AutoYaST XML profile is incorrect
+#: src/modules/DNS.rb:692
+msgid ""
+"DNS configuration error: The DNS configuration\n"
+"is written in the second installation stage (after reboot)\n"
+"but the second stage is disabled in the AutoYaST XML profile."
+msgstr ""
+
#. Check if there is anything to do
-#: src/modules/Host.rb:144
+#: src/modules/Host.rb:140
msgid "Update /etc/hosts"
msgstr ""
-#: src/modules/Host.rb:146
+#: src/modules/Host.rb:142
msgid "Saving Hostname Configuration"
msgstr ""
-#: src/modules/Host.rb:150
+#: src/modules/Host.rb:146
msgid "Updating /etc/hosts ..."
msgstr ""
#. Read dialog caption
-#: src/modules/Lan.rb:254
+#: src/modules/Lan.rb:255
msgid "Initializing Network Configuration"
msgstr ""
#. Progress stage 1/9
-#: src/modules/Lan.rb:267
+#: src/modules/Lan.rb:268
msgid "Detect network devices"
msgstr ""
#. Progress stage 2/9
-#: src/modules/Lan.rb:269
+#: src/modules/Lan.rb:270
msgid "Read driver information"
msgstr ""
#. Progress stage 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:271
+#: src/modules/Lan.rb:272
msgid "Read device configuration"
msgstr ""
#. Progress stage 4/9
-#: src/modules/Lan.rb:273
+#: src/modules/Lan.rb:274
msgid "Read network configuration"
msgstr ""
#. Progress stage 5/9
-#: src/modules/Lan.rb:275
+#: src/modules/Lan.rb:276
msgid "Read firewall settings"
msgstr ""
#. Progress stage 6/9
-#: src/modules/Lan.rb:277
+#: src/modules/Lan.rb:278
msgid "Read hostname and DNS configuration"
msgstr ""
#. Progress stage 7/9
-#: src/modules/Lan.rb:279
+#: src/modules/Lan.rb:280
msgid "Read installation information"
msgstr ""
#. Progress stage 8/9
-#: src/modules/Lan.rb:281
+#: src/modules/Lan.rb:282
msgid "Read routing configuration"
msgstr ""
#. Progress stage 9/9
-#: src/modules/Lan.rb:283
+#: src/modules/Lan.rb:284
msgid "Detect current status"
msgstr ""
#. Progress step 1/9
-#: src/modules/Lan.rb:297
+#: src/modules/Lan.rb:295
msgid "Detecting ndiswrapper..."
msgstr ""
#. modprobe ndiswrapper before hwinfo when needed (#343893)
-#: src/modules/Lan.rb:316
+#: src/modules/Lan.rb:314
msgid ""
"Detected a ndiswrapper configuration,\n"
"but the kernel module was not modprobed.\n"
"Do you want to modprobe ndiswrapper?\n"
msgstr ""
-#: src/modules/Lan.rb:324
+#: src/modules/Lan.rb:322
msgid ""
"ndiswrapper kernel module has not been loaded.\n"
"Check configuration manually.\n"
msgstr ""
#. Progress step 2/9
-#: src/modules/Lan.rb:338
+#: src/modules/Lan.rb:336
msgid "Detecting network devices..."
msgstr ""
#. Progress step 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:346
+#: src/modules/Lan.rb:344
msgid "Reading device configuration..."
msgstr ""
#. Progress step 4/9
-#: src/modules/Lan.rb:353
+#: src/modules/Lan.rb:351
msgid "Reading network configuration..."
msgstr ""
#. Progress step 5/9
-#: src/modules/Lan.rb:362
+#: src/modules/Lan.rb:361
msgid "Reading firewall settings..."
msgstr ""
-#. Progress step 6/9
-#: src/modules/Lan.rb:370
+#. Progress step 5/8
+#: src/modules/Lan.rb:369
msgid "Reading hostname and DNS configuration..."
msgstr ""
-#. Progress step 7/9
+#. Progress step 6/8
#: src/modules/Lan.rb:377
msgid "Reading installation information..."
msgstr ""
-#. Progress step 8/9
-#: src/modules/Lan.rb:383
+#. Progress step 7/8
+#: src/modules/Lan.rb:382
msgid "Reading routing configuration..."
msgstr ""
-#. Progress step 9/9
-#: src/modules/Lan.rb:389
+#. Progress step 8/8
+#: src/modules/Lan.rb:388
msgid "Detecting current status..."
msgstr ""
+#: src/modules/Lan.rb:394
+msgid ""
+"Network configuration is corrupted.\n"
+"If you continue resulting configuration can be malformed.\n"
+"\n"
+"%s"
+msgstr ""
+
#. Final progress step
#. Final progress step
-#: src/modules/Lan.rb:395 src/modules/Lan.rb:627
+#: src/modules/Lan.rb:402 src/modules/Lan.rb:636
msgid "Finished"
msgstr ""
#. (a specialization used when a parameterless function is needed)
#. @return Read(`cache)
-#: src/modules/Lan.rb:422
+#: src/modules/Lan.rb:429
msgid "To apply this change, a reboot is needed."
msgstr ""
#. Write dialog caption
-#: src/modules/Lan.rb:490
+#: src/modules/Lan.rb:499
msgid "Saving Network Configuration"
msgstr ""
#. Progress stage 2
-#: src/modules/Lan.rb:497
+#: src/modules/Lan.rb:506
msgid "Write drivers information"
msgstr ""
#. Progress stage 3 - multiple devices may be present,really plural
-#: src/modules/Lan.rb:499
+#: src/modules/Lan.rb:508
msgid "Write device configuration"
msgstr ""
#. Progress stage 4
-#: src/modules/Lan.rb:501
+#: src/modules/Lan.rb:510
msgid "Write network configuration"
msgstr ""
#. Progress stage 5
-#: src/modules/Lan.rb:503
+#: src/modules/Lan.rb:512
msgid "Write routing configuration"
msgstr ""
#. Progress stage 6
-#: src/modules/Lan.rb:505
+#: src/modules/Lan.rb:514
msgid "Write hostname and DNS configuration"
msgstr ""
#. Progress stage 7
-#: src/modules/Lan.rb:507
+#: src/modules/Lan.rb:516
msgid "Set up network services"
msgstr ""
#. Progress stage 8
#. Progress stage 1
-#: src/modules/Lan.rb:511 src/modules/Remote.rb:201
+#: src/modules/Lan.rb:520 src/modules/Remote.rb:201
msgid "Write firewall settings"
msgstr ""
#. Progress stage 9
-#: src/modules/Lan.rb:515
+#: src/modules/Lan.rb:524
msgid "Activate network services"
msgstr ""
#. Progress step 2
-#: src/modules/Lan.rb:531
+#: src/modules/Lan.rb:540
msgid "Writing /etc/modprobe.conf..."
msgstr ""
#. Progress step 3 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:536
+#: src/modules/Lan.rb:545
msgid "Writing device configuration..."
msgstr ""
#. Progress step 4
-#: src/modules/Lan.rb:542
+#: src/modules/Lan.rb:551
msgid "Writing network configuration..."
msgstr ""
#. Progress step 5
-#: src/modules/Lan.rb:548
+#: src/modules/Lan.rb:557
msgid "Writing routing configuration..."
msgstr ""
#. Progress step 6
-#: src/modules/Lan.rb:556
+#: src/modules/Lan.rb:565
msgid "Writing hostname and DNS configuration..."
msgstr ""
#. Progress step 7
-#: src/modules/Lan.rb:569
+#: src/modules/Lan.rb:578
msgid "Setting up network services..."
msgstr ""
#. Progress step 8
-#: src/modules/Lan.rb:577 src/modules/Remote.rb:215
+#: src/modules/Lan.rb:586 src/modules/Remote.rb:215
msgid "Writing firewall settings..."
msgstr ""
#. Progress step 9
-#: src/modules/Lan.rb:587
+#: src/modules/Lan.rb:596
msgid "Activating network services..."
msgstr ""
-#: src/modules/Lan.rb:623
+#: src/modules/Lan.rb:632
msgid "No network running"
msgstr ""
#. header for network summary list
-#: src/modules/Lan.rb:732
+#: src/modules/Lan.rb:745
msgid "Network Mode"
msgstr ""
#. network mode: the interfaces are controlled by the user
-#: src/modules/Lan.rb:737
+#: src/modules/Lan.rb:750
msgid "Interfaces controlled by NetworkManager"
msgstr ""
#. switch from network manager to wicked
-#: src/modules/Lan.rb:739
+#: src/modules/Lan.rb:752
msgid "switch to Wicked"
msgstr ""
#. network mode
-#: src/modules/Lan.rb:743
+#: src/modules/Lan.rb:756
msgid "Traditional network setup with Wicked"
msgstr ""
#. switch from wicked to network manager
-#: src/modules/Lan.rb:745
+#: src/modules/Lan.rb:758
msgid "switch to NetworkManager"
msgstr ""
#. ipv6 support is enabled
-#: src/modules/Lan.rb:751
+#: src/modules/Lan.rb:764
msgid "Support for IPv6 protocol is enabled"
msgstr ""
#. disable ipv6 support
-#: src/modules/Lan.rb:753
+#: src/modules/Lan.rb:766
msgid "disable"
msgstr ""
#. ipv6 support is disabled
-#: src/modules/Lan.rb:757
+#: src/modules/Lan.rb:770
msgid "Support for IPv6 protocol is disabled"
msgstr ""
#. enable ipv6 support
-#: src/modules/Lan.rb:759
+#: src/modules/Lan.rb:772
msgid "enable"
msgstr ""
-#. translators: a possible value for: IPoIB device mode
-#: src/modules/LanItems.rb:202
-msgid "connected"
-msgstr ""
-
-#: src/modules/LanItems.rb:203
-msgid "datagram"
-msgstr ""
-
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=hotplug
-#: src/modules/LanItems.rb:1337 src/modules/LanItems.rb:1341
-#: src/modules/LanItems.rb:1345
+#. summary description of STARTMODE=nfsroot
+#: src/modules/LanItems.rb:1380 src/modules/LanItems.rb:1384
+#: src/modules/LanItems.rb:1388 src/modules/LanItems.rb:1392
msgid "Started automatically at boot"
msgstr ""
#. summary description of STARTMODE=ifplugd
-#: src/modules/LanItems.rb:1349
+#: src/modules/LanItems.rb:1396
msgid "Started automatically on cable connection"
msgstr ""
#. summary description of STARTMODE=managed
-#: src/modules/LanItems.rb:1353
+#: src/modules/LanItems.rb:1400
msgid "Managed by NetworkManager"
msgstr ""
#. summary description of STARTMODE=off
-#: src/modules/LanItems.rb:1357
+#: src/modules/LanItems.rb:1404
msgid "Will not be started at all"
msgstr ""
-#: src/modules/LanItems.rb:1363
+#: src/modules/LanItems.rb:1410
msgid "Started manually"
msgstr ""
@@ -4086,63 +4124,63 @@
#.
#. @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:1393
+#: src/modules/LanItems.rb:1440
msgid "IP address assigned using"
msgstr ""
-#: src/modules/LanItems.rb:1397
+#: src/modules/LanItems.rb:1444
msgid "IP address: %s/%s"
msgstr ""
-#: src/modules/LanItems.rb:1400
+#: src/modules/LanItems.rb:1447
msgid "IP address: %s, subnet mask %s"
msgstr ""
#. 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:1444 src/modules/LanItems.rb:1500
+#: src/modules/LanItems.rb:1491 src/modules/LanItems.rb:1547
msgid "Device Name: %s"
msgstr ""
-#: src/modules/LanItems.rb:1469
+#: src/modules/LanItems.rb:1516
msgid "Bonding master"
msgstr ""
-#: src/modules/LanItems.rb:1472
+#: src/modules/LanItems.rb:1519
msgid "Bridge"
msgstr ""
-#: src/modules/LanItems.rb:1474
+#: src/modules/LanItems.rb:1521
msgid "enslaved in %s"
msgstr ""
-#: src/modules/LanItems.rb:1488
+#: src/modules/LanItems.rb:1535
msgid "Not connected"
msgstr ""
-#: src/modules/LanItems.rb:1489
+#: src/modules/LanItems.rb:1536
msgid "No hwinfo"
msgstr ""
-#: src/modules/LanItems.rb:1506
+#: src/modules/LanItems.rb:1553
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 ""
-#: src/modules/LanItems.rb:1512
+#: src/modules/LanItems.rb:1559
msgid ""
"The device is not configured. Press <b>Edit</b>\n"
"to configure.\n"
msgstr ""
-#: src/modules/LanItems.rb:1519
+#: src/modules/LanItems.rb:1566
msgid "Needed firmware"
msgstr ""
-#: src/modules/LanItems.rb:1519
+#: src/modules/LanItems.rb:1566
msgid "unknown"
msgstr ""
@@ -4152,17 +4190,17 @@
#. @param [String] ifcfg_type
#. @param [String] ifcfg_name
#. @return [String] formated string with the interface type and the interfaces enslaved
-#: src/modules/LanItems.rb:2545
+#: src/modules/LanItems.rb:2591
msgid "Bonding slaves"
msgstr ""
-#: src/modules/LanItems.rb:2548
+#: src/modules/LanItems.rb:2594
msgid "Bridge Ports"
msgstr ""
#. Package containing SuSEfirewall2 services has to be installed before
#. reading SuSEFirewall, otherwise exception is thrown by firewall
-#: src/modules/Remote.rb:158
+#: src/modules/Remote.rb:193
msgid ""
"Package %{package} is not installed\n"
"firewall settings will be disabled."
@@ -4217,21 +4255,21 @@
msgstr ""
#. Progress stage 1
-#: src/modules/Routing.rb:312
+#: src/modules/Routing.rb:318
msgid "Write IP forwarding settings"
msgstr ""
#. Progress stage 2
-#: src/modules/Routing.rb:314
+#: src/modules/Routing.rb:320
msgid "Write routing settings"
msgstr ""
-#: src/modules/Routing.rb:317
+#: src/modules/Routing.rb:323
msgid "Saving Routing Configuration"
msgstr ""
#. Progress stage 1/2
-#: src/modules/Routing.rb:322
+#: src/modules/Routing.rb:328
msgid "Writing IP forwarding settings..."
msgstr ""
@@ -4240,22 +4278,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:332
+#: src/modules/Routing.rb:338
msgid "Writing routing settings..."
msgstr ""
#. Summary text
-#: src/modules/Routing.rb:502
+#: src/modules/Routing.rb:508
msgid "Gateway: %s"
msgstr ""
#. Summary text
-#: src/modules/Routing.rb:506
+#: src/modules/Routing.rb:512
msgid "IP Forwarding for IPv4: %s"
msgstr ""
#. Summary text
-#: src/modules/Routing.rb:510
+#: src/modules/Routing.rb:516
msgid "IP Forwarding for IPv6: %s"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/nfs.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/nfs.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/nfs.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:28+0200\n"
-"PO-Revision-Date: 2016-08-30 18:28+0200\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -154,15 +154,16 @@
msgid ""
"<p>Each NFS share is identified by remote NFS server address and\n"
"exported directory, local directory where the remote directory is mounted, \n"
-"NFS type (either plain nfs or nfsv4) and mount options. For further informatio"
-"n \n"
+"NFS type (either plain nfs or nfsv4) and mount options. For further "
+"information \n"
"about mounting NFS and mount options, refer to <tt>man nfs.</tt></p>"
msgstr ""
#. Help, part 3 of 3
#: src/include/nfs/ui.rb:53
msgid ""
-"<p>To mount a new NFS share, click <B>Add</B>. To change the configuration of\n"
+"<p>To mount a new NFS share, click <B>Add</B>. To change the configuration "
+"of\n"
"a currently mounted share, click <B>Edit</B>. Remove and unmount a selected\n"
"share with <B>Delete</B>.</p>\n"
msgstr ""
@@ -170,9 +171,10 @@
#: src/include/nfs/ui.rb:60
msgid ""
"<p>If you need to access NFSv4 shares (NFSv4 is a newer version of the NFS\n"
-"protocol), check the <b>Enable NFSv4</b> option. In that case, you might need\n"
-"to supply specific a <b>NFSv4 Domain Name</b> required for the correct setting"
-"\n"
+"protocol), check the <b>Enable NFSv4</b> option. In that case, you might "
+"need\n"
+"to supply specific a <b>NFSv4 Domain Name</b> required for the correct "
+"setting\n"
"of file/directory access rights.</p>\n"
msgstr ""
@@ -290,8 +292,8 @@
#: src/include/nfs/ui.rb:439
msgid ""
"<p>\t\t\n"
-"For <b>Mount Point</b>, enter the path in the local file system where the dire"
-"ctory should be mounted. With\n"
+"For <b>Mount Point</b>, enter the path in the local file system where the "
+"directory should be mounted. With\n"
"<b>Browse</b>, select your mount point\n"
"interactively.</p>"
msgstr ""
@@ -349,60 +351,60 @@
msgstr ""
#. error popup message
-#: src/modules/Nfs.rb:385
+#: src/modules/Nfs.rb:387
msgid "Unable to create directory '%1'."
msgstr ""
#. error popup message
-#: src/modules/Nfs.rb:403
+#: src/modules/Nfs.rb:406
msgid ""
"Unable to write to /etc/fstab.\n"
-"No changes will be made to the\n"
+"No changes will be made to\n"
"the NFS client configuration.\n"
msgstr ""
#. dialog label
-#: src/modules/Nfs.rb:446
+#: src/modules/Nfs.rb:449
msgid "Writing NFS Configuration"
msgstr ""
#. progress stage label
-#: src/modules/Nfs.rb:451
+#: src/modules/Nfs.rb:454
msgid "Stop services"
msgstr ""
#. progress stage label
-#: src/modules/Nfs.rb:453
+#: src/modules/Nfs.rb:456
msgid "Start services"
msgstr ""
#. progress step label
-#: src/modules/Nfs.rb:457
+#: src/modules/Nfs.rb:460
msgid "Stopping services..."
msgstr ""
#. progress step label
-#: src/modules/Nfs.rb:459
+#: src/modules/Nfs.rb:462
msgid "Starting services..."
msgstr ""
#. final progress step label
-#: src/modules/Nfs.rb:461
+#: src/modules/Nfs.rb:464
msgid "Finished"
msgstr ""
#. help text
-#: src/modules/Nfs.rb:467
+#: src/modules/Nfs.rb:470
msgid "Writing NFS client settings. Please wait..."
msgstr ""
#. error popup message
-#: src/modules/Nfs.rb:487
+#: src/modules/Nfs.rb:490
msgid "Unable to mount the NFS entries from /etc/fstab."
msgstr ""
#. summary header
-#: src/modules/Nfs.rb:506
+#: src/modules/Nfs.rb:508
msgid "NFS Entries"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/nfs_server.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/nfs_server.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/nfs_server.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:28+0200\n"
-"PO-Revision-Date: 2016-08-30 18:28+0200\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -62,8 +62,8 @@
#: src/clients/nfs_server.rb:113
msgid ""
-"Domain specification for NFSv4 ID mapping, such as 'localdomain' or 'abc.com' "
-"etc."
+"Domain specification for NFSv4 ID mapping, such as 'localdomain' or 'abc."
+"com' etc."
msgstr ""
#: src/clients/nfs_server.rb:119
@@ -105,13 +105,14 @@
#. @param [Hash] options command options
#. @return whether successful
#: src/clients/nfs_server.rb:319
-msgid "Domain cannot be set without enabling NFSv4. Use the 'set enablev4' command."
+msgid ""
+"Domain cannot be set without enabling NFSv4. Use the 'set enablev4' command."
msgstr ""
#: src/clients/nfs_server.rb:330
msgid ""
-"Command 'set' must be used in the form 'set option=value'. Use 'set help' to g"
-"et information about available options."
+"Command 'set' must be used in the form 'set option=value'. Use 'set help' to "
+"get information about available options."
msgstr ""
#. Then no need to check for conflict.
@@ -219,8 +220,8 @@
#. @return `back, `abort, `next `or finish
#: src/include/nfs_server/ui.rb:272
msgid ""
-"Unable to read the /etc/idmapd.conf file. Setting the default setting for the "
-"domain to 'localdomain'."
+"Unable to read the /etc/idmapd.conf file. Setting the default setting for "
+"the domain to 'localdomain'."
msgstr ""
#. Help, part 1 of 2
@@ -240,18 +241,18 @@
#: src/include/nfs_server/ui.rb:311
msgid ""
"<P>If the server needs to handle NFSv4 clients, check <B>Enable NFSv4</B>\n"
-"and fill in the NFSv4 domain name you want the ID mapping daemon to use. Leave"
-"\n"
-"it as localdomain or refer to the man page for idmapd and idmapd.conf if you a"
-"re not sure.</P>\n"
+"and fill in the NFSv4 domain name you want the ID mapping daemon to use. "
+"Leave\n"
+"it as localdomain or refer to the man page for idmapd and idmapd.conf if you "
+"are not sure.</P>\n"
msgstr ""
#. FIXME: use %1 as nfs-utils.src.rpm produces nfs-kernel-server.rpm
#: src/include/nfs_server/ui.rb:321
msgid ""
"<P>If the server and client must authenticate using GSS library, check the\n"
-"<B>Enable GSS Security</B> box. To use GSS API, you currently need to have Ker"
-"beros and gssapi (nfs-utils > 1.0.7) on your system.</P>\n"
+"<B>Enable GSS Security</B> box. To use GSS API, you currently need to have "
+"Kerberos and gssapi (nfs-utils > 1.0.7) on your system.</P>\n"
msgstr ""
#. frame label
@@ -302,20 +303,21 @@
#. Help, part 2 of 4
#: src/include/nfs_server/ui.rb:495
msgid ""
-"<P><b>Host Wild Card</b> sets which hosts can access the selected directory.\n"
+"<P><b>Host Wild Card</b> sets which hosts can access the selected "
+"directory.\n"
"It can be a single host, groups, wild cards, or\n"
"IP networks.</P>\n"
msgstr ""
#. Help, part 3 of 4
#: src/include/nfs_server/ui.rb:503
-msgid "<p>Enter an asterisk (<tt>*</tt>) instead of a name to specify all hosts.</p>"
+msgid ""
+"<p>Enter an asterisk (<tt>*</tt>) instead of a name to specify all hosts.</p>"
msgstr ""
#. Help, part 4 of 4
#: src/include/nfs_server/ui.rb:509
-msgid ""
-"<P>Refer to <tt>man exports</tt> for more information.</P>\n"
+msgid "<P>Refer to <tt>man exports</tt> for more information.</P>\n"
msgstr ""
#. push button label
@@ -421,8 +423,8 @@
#. FIXME svcgssd is gone! (only nfsserver is left)
#: src/modules/NfsServer.rb:266
msgid ""
-"Unable to start svcgssd. Ensure your kerberos and gssapi (nfs-utils) setup is "
-"correct."
+"Unable to start svcgssd. Ensure your kerberos and gssapi (nfs-utils) setup "
+"is correct."
msgstr ""
#: src/modules/NfsServer.rb:275
Modified: branches/SLE12-SP5/yast/50-pot/nis.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/nis.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/nis.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-20 17:12+0200\n"
-"PO-Revision-Date: 2016-10-20 17:12+0200\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
Modified: branches/SLE12-SP5/yast/50-pot/nis_server.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/nis_server.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/nis_server.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:28+0200\n"
-"PO-Revision-Date: 2016-08-30 18:28+0200\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -127,14 +127,12 @@
#. error message
#: src/clients/nis_server.rb:282
-msgid ""
-"Invalid netmask: %1.\n"
+msgid "Invalid netmask: %1.\n"
msgstr ""
#. error message
#: src/clients/nis_server.rb:289
-msgid ""
-"Invalid network: %1.\n"
+msgid "Invalid network: %1.\n"
msgstr ""
#. error message
@@ -159,7 +157,8 @@
#. help text 2/3
#: src/include/nis_server/details.rb:73
msgid ""
-"<p>Select if your <i>passwd</i> file should be merged with the <i>shadow</i>\n"
+"<p>Select if your <i>passwd</i> file should be merged with the <i>shadow</"
+"i>\n"
"file (only possible if the <i>shadow</i> file exists).</p>\n"
msgstr ""
@@ -214,8 +213,8 @@
#. help text 1/3
#: src/include/nis_server/master.rb:71
msgid ""
-"<p>Enter a NIS <b>domain</b>. If this host is also a NIS client using this mac"
-"hine as a server, check\n"
+"<p>Enter a NIS <b>domain</b>. If this host is also a NIS client using this "
+"machine as a server, check\n"
"the corresponding option.</p>\n"
msgstr ""
@@ -302,8 +301,8 @@
"<p><b>Firewall Settings</b><br>\n"
"To open the firewall to allow accessing the NIS server\n"
"from remote computers, set <b>Open Port in Firewall</b>.\n"
-"To select interfaces on which to open the port, click <b>Firewall Details</b>."
-"\n"
+"To select interfaces on which to open the port, click <b>Firewall Details</"
+"b>.\n"
"This option is only available if the firewall is enabled.</p>\n"
msgstr ""
@@ -324,14 +323,12 @@
#. To translators: error message
#: src/include/nis_server/securenets.rb:149
-msgid ""
-"Wrong netmask!\n"
+msgid "Wrong netmask!\n"
msgstr ""
#. To translators: error message
#: src/include/nis_server/securenets.rb:154
-msgid ""
-"Wrong network!\n"
+msgid "Wrong network!\n"
msgstr ""
#. help text 1/4
@@ -378,15 +375,15 @@
#. help text 1/2
#: src/include/nis_server/slave.rb:62
msgid ""
-"<p>Enter the NIS <b>domain</b> and the IP <b>address</b> or host name of the m"
-"aster NIS server.</p>"
+"<p>Enter the NIS <b>domain</b> and the IP <b>address</b> or host name of the "
+"master NIS server.</p>"
msgstr ""
#. help text 2/2
#: src/include/nis_server/slave.rb:69
msgid ""
-"<p>If this host is also a NIS client using this machine as a server, check the"
-" corresponding option.</p>"
+"<p>If this host is also a NIS client using this machine as a server, check "
+"the corresponding option.</p>"
msgstr ""
#. textentry label
@@ -427,9 +424,9 @@
#. help text 1/1
#: src/include/nis_server/slaves.rb:175
msgid ""
-"<p>Here, enter the names of hosts to configure as NIS server slaves. Use <i>Ad"
-"d</i> to add a new one, <i>Edit</i> to change an existing entry, and <i>Delet"
-"e</i> to remove an entry.</p>"
+"<p>Here, enter the names of hosts to configure as NIS server slaves. Use "
+"<i>Add</i> to add a new one, <i>Edit</i> to change an existing entry, and "
+"<i>Delete</i> to remove an entry.</p>"
msgstr ""
#. To translators: selection box label
@@ -673,32 +670,27 @@
#. To translators: message in the popup dialog
#: src/modules/NisServer.rb:574
-msgid ""
-"Error while removing %1\n"
+msgid "Error while removing %1\n"
msgstr ""
#. To translators: message in the popup dialog
#: src/modules/NisServer.rb:601
-msgid ""
-"Directory %1 cannot be created.\n"
+msgid "Directory %1 cannot be created.\n"
msgstr ""
#. To translators: message in the popup dialog
#: src/modules/NisServer.rb:632
-msgid ""
-"Cannot get list of maps.\n"
+msgid "Cannot get list of maps.\n"
msgstr ""
#. To translators: message in the popup dialog
#: src/modules/NisServer.rb:663
-msgid ""
-"Error while retrieving %1 map from master.\n"
+msgid "Error while retrieving %1 map from master.\n"
msgstr ""
#. To translators: message in the popup dialog
#: src/modules/NisServer.rb:674
-msgid ""
-"Could not get list with slaves.\n"
+msgid "Could not get list with slaves.\n"
msgstr ""
#. To translators: message in the popup dialog, %1 is hostname
@@ -714,56 +706,47 @@
#. To translators: message in the popup dialog
#: src/modules/NisServer.rb:732 src/modules/NisServer.rb:749
#: src/modules/NisServer.rb:796 src/modules/NisServer.rb:804
-msgid ""
-"Error saving file %1\n"
+msgid "Error saving file %1\n"
msgstr ""
#. To translators: message in the popup dialog
#: src/modules/NisServer.rb:762
-msgid ""
-"Error setting up domain name\n"
+msgid "Error setting up domain name\n"
msgstr ""
#. To translators: message in the popup dialog
#: src/modules/NisServer.rb:787
-msgid ""
-"Error setting up variable %1\n"
+msgid "Error setting up variable %1\n"
msgstr ""
#. To translators: message in the popup dialog
#: src/modules/NisServer.rb:847
-msgid ""
-"Error while stopping %1 daemon\n"
+msgid "Error while stopping %1 daemon\n"
msgstr ""
#. To translators: message in the popup dialog
#: src/modules/NisServer.rb:858
-msgid ""
-"Error while starting %1 daemon\n"
+msgid "Error while starting %1 daemon\n"
msgstr ""
#. error popup
#: src/modules/NisServer.rb:905
-msgid ""
-"Error while creating an empty user database.\n"
+msgid "Error while creating an empty user database.\n"
msgstr ""
#. To translators: message in the popup dialog
#: src/modules/NisServer.rb:927
-msgid ""
-"Error while creating the ypservers map.\n"
+msgid "Error while creating the ypservers map.\n"
msgstr ""
#. To translators: message in the popup dialog
#: src/modules/NisServer.rb:946
-msgid ""
-"Error while creating database.\n"
+msgid "Error while creating database.\n"
msgstr ""
#. To translators: message in the popup dialog
#: src/modules/NisServer.rb:973
-msgid ""
-"Error while configuring the client.\n"
+msgid "Error while configuring the client.\n"
msgstr ""
#. To translators: progress label
Modified: branches/SLE12-SP5/yast/50-pot/ntp-client.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/ntp-client.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/ntp-client.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-24 02:28+0000\n"
-"PO-Revision-Date: 2017-03-24 02:28+0000\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -83,32 +83,32 @@
msgid "&Configure..."
msgstr ""
-#. Otherwise, prompt user for confirming pkg installation
-#: src/clients/ntp-client_proposal.rb:378
-msgid ""
-"Synchronization with NTP server is not possible\n"
-"without package %1 installed."
-msgstr ""
-
#. Only if network is running try to synchronize the ntp server
-#: src/clients/ntp-client_proposal.rb:389
+#: src/clients/ntp-client_proposal.rb:377
msgid "Synchronizing with NTP server..."
msgstr ""
#. update time widgets
-#: src/clients/ntp-client_proposal.rb:437
+#: src/clients/ntp-client_proposal.rb:408
msgid "Connection to selected NTP server failed."
msgstr ""
#. Translators: yes-no popup,
#. ntpdate is a command, %1 is the server address
-#: src/clients/ntp-client_proposal.rb:468
+#: src/clients/ntp-client_proposal.rb:439
msgid ""
"Test query to server '%1' failed.\n"
"If server is not yet accessible or network is not configured\n"
"click 'No' to ignore. Revisit NTP server configuration?"
msgstr ""
+#. Otherwise, prompt user for confirming pkg installation
+#: src/clients/ntp-client_proposal.rb:471
+msgid ""
+"Synchronization with NTP server is not possible\n"
+"without package %1 installed."
+msgstr ""
+
#. local clock type name
#: src/include/ntp-client/clocktypes.rb:17
msgid "Undisciplined Local Clock (LOCAL)"
@@ -490,14 +490,12 @@
msgstr ""
#. TRANSLATORS: frame label
-#: src/include/ntp-client/dialogs.rb:320
-#: src/include/ntp-client/widgets.rb:1488
+#: src/include/ntp-client/dialogs.rb:320 src/include/ntp-client/widgets.rb:1488
msgid "Local NTP Server"
msgstr ""
#. TRANSLATORS: frame label
-#: src/include/ntp-client/dialogs.rb:364
-#: src/include/ntp-client/widgets.rb:1489
+#: src/include/ntp-client/dialogs.rb:364 src/include/ntp-client/widgets.rb:1489
msgid "Public NTP Server"
msgstr ""
@@ -1203,58 +1201,58 @@
#. changes, so call it always. bnc#476951
#. progress step
#. progress step
-#: src/modules/NtpClient.rb:516 src/modules/NtpClient.rb:646
-#: src/modules/NtpClient.rb:1061 src/modules/NtpClient.rb:1085
+#: src/modules/NtpClient.rb:542 src/modules/NtpClient.rb:674
+#: src/modules/NtpClient.rb:1155 src/modules/NtpClient.rb:1179
msgid "Finished"
msgstr ""
#. summary string
-#: src/modules/NtpClient.rb:729
+#: src/modules/NtpClient.rb:764
msgid "The NTP daemon starts when starting the system."
msgstr ""
#. summary string
-#: src/modules/NtpClient.rb:735
+#: src/modules/NtpClient.rb:770
msgid "The NTP daemon does not start automatically."
msgstr ""
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:741
+#: src/modules/NtpClient.rb:776
msgid "Servers: %1"
msgstr ""
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:745
+#: src/modules/NtpClient.rb:780
msgid "Radio Clocks: %1"
msgstr ""
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:749
+#: src/modules/NtpClient.rb:784
msgid "Peers: %1"
msgstr ""
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:753
+#: src/modules/NtpClient.rb:788
msgid "Broadcast time information to: %1"
msgstr ""
#. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:757
+#: src/modules/NtpClient.rb:792
msgid "Accept broadcasted time information from: %1"
msgstr ""
#. summary string, FIXME
-#: src/modules/NtpClient.rb:773
+#: src/modules/NtpClient.rb:808
msgid "Combine static and DHCP configuration."
msgstr ""
#. summary string, FIXME
-#: src/modules/NtpClient.rb:777
+#: src/modules/NtpClient.rb:812
msgid "Static configuration only."
msgstr ""
#. summary string, FIXME: too generic!
-#: src/modules/NtpClient.rb:780
+#: src/modules/NtpClient.rb:815
msgid "Custom configuration policy."
msgstr ""
@@ -1263,75 +1261,75 @@
#. @param [Symbol] verbosity `no_ui: ..., `transient_popup: pop up while scanning,
#. `result_popup: also final pop up about the result
#. @return [Boolean] true if NTP server answers properly
-#: src/modules/NtpClient.rb:838
+#: src/modules/NtpClient.rb:873
msgid "Testing the NTP server..."
msgstr ""
#. message report - result of test of connection to NTP server
-#: src/modules/NtpClient.rb:846
+#: src/modules/NtpClient.rb:881
msgid "Server is reachable and responds properly."
msgstr ""
#. error message - result of test of connection to NTP server
#. report error instead of simple message (#306018)
-#: src/modules/NtpClient.rb:850
+#: src/modules/NtpClient.rb:885
msgid "Server is unreachable or does not respond properly."
msgstr ""
#. if package is not installed (in the inst-sys, it is: bnc#399659)
-#: src/modules/NtpClient.rb:868
+#: src/modules/NtpClient.rb:903
msgid ""
"Cannot search for NTP server in local network\n"
"without package %1 installed.\n"
msgstr ""
#. Start a new progress for Read NTP Configuration
-#: src/modules/NtpClient.rb:1046
+#: src/modules/NtpClient.rb:1140
msgid "Initializing NTP Client Configuration"
msgstr ""
#. progress stage
-#: src/modules/NtpClient.rb:1051
+#: src/modules/NtpClient.rb:1145
msgid "Read network configuration"
msgstr ""
#. progress stage
-#: src/modules/NtpClient.rb:1053
+#: src/modules/NtpClient.rb:1147
msgid "Read NTP settings"
msgstr ""
#. progress step
-#: src/modules/NtpClient.rb:1057
+#: src/modules/NtpClient.rb:1151
msgid "Reading network configuration..."
msgstr ""
#. progress step
-#: src/modules/NtpClient.rb:1059
+#: src/modules/NtpClient.rb:1153
msgid "Reading NTP settings..."
msgstr ""
#. Start a new progress for Write NTP Configuration
-#: src/modules/NtpClient.rb:1070
+#: src/modules/NtpClient.rb:1164
msgid "Saving NTP Client Configuration"
msgstr ""
#. progress stage
-#: src/modules/NtpClient.rb:1075
+#: src/modules/NtpClient.rb:1169
msgid "Write NTP settings"
msgstr ""
#. progress stage
-#: src/modules/NtpClient.rb:1077
+#: src/modules/NtpClient.rb:1171
msgid "Restart NTP daemon"
msgstr ""
#. progress step
-#: src/modules/NtpClient.rb:1081
+#: src/modules/NtpClient.rb:1175
msgid "Writing the settings..."
msgstr ""
#. progress step
-#: src/modules/NtpClient.rb:1083
+#: src/modules/NtpClient.rb:1177
msgid "Restarting NTP daemon..."
msgstr ""
@@ -1339,11 +1337,11 @@
#. error if some of the call fails.
#.
#. @return [Boolean] true if write and update success
-#: src/modules/NtpClient.rb:1149
+#: src/modules/NtpClient.rb:1243
msgid "Cannot update the dynamic configuration policy."
msgstr ""
#. error report
-#: src/modules/NtpClient.rb:1181
+#: src/modules/NtpClient.rb:1275
msgid "Cannot restart the NTP daemon."
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/online-update-configuration.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/online-update-configuration.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/online-update-configuration.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:28+0200\n"
-"PO-Revision-Date: 2016-08-30 18:28+0200\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -148,21 +148,21 @@
#: src/include/online-update-configuration/OUCDialogs.rb:97
msgid ""
-"<p>Select an update interval and specify if interactive patches should be igno"
-"red and if licenses should be automatically agreed with.</p>"
+"<p>Select an update interval and specify if interactive patches should be "
+"ignored and if licenses should be automatically agreed with.</p>"
msgstr ""
#: src/include/online-update-configuration/OUCDialogs.rb:102
msgid ""
-"<p>All packages that are recommended by an updated package will be installed w"
-"hen <b>%1</b> is enabled.</p>"
+"<p>All packages that are recommended by an updated package will be installed "
+"when <b>%1</b> is enabled.</p>"
msgstr ""
#: src/include/online-update-configuration/OUCDialogs.rb:108
msgid ""
-"<p>Category filter for patches can be configured in the section <b>%1</b>. Onl"
-"y patches of the listed categories will be installed. Others will be skipped.<"
-"/p>"
+"<p>Category filter for patches can be configured in the section <b>%1</b>. "
+"Only patches of the listed categories will be installed. Others will be "
+"skipped.</p>"
msgstr ""
#. cache the base product details
Modified: branches/SLE12-SP5/yast/50-pot/online-update.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/online-update.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/online-update.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:28+0200\n"
-"PO-Revision-Date: 2016-08-30 18:28+0200\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -62,8 +62,9 @@
#. help text for online-update initialization
#: src/clients/online_update.rb:130
msgid ""
-"<p>The system is initializing the installation and update repositories. Softwa"
-"re repositories can be altered in the <b>Installation Source</b> module.</p>"
+"<p>The system is initializing the installation and update repositories. "
+"Software repositories can be altered in the <b>Installation Source</b> "
+"module.</p>"
msgstr ""
#. progress stage label
@@ -151,8 +152,8 @@
#. help text for online update
#: src/clients/online_update_install.rb:73
msgid ""
-"<p>If special messages associated with patches are available, they will be sho"
-"wn in an extra dialog when the patch is installed.</p>\n"
+"<p>If special messages associated with patches are available, they will be "
+"shown in an extra dialog when the patch is installed.</p>\n"
msgstr ""
#. using SetContents (define in online_update.ycp)
@@ -162,8 +163,7 @@
#. progress information
#: src/clients/online_update_install.rb:114
-msgid ""
-"Installation finished.\n"
+msgid "Installation finished.\n"
msgstr ""
#. label
@@ -253,8 +253,8 @@
#. continue/cancel popup text
#: src/modules/OnlineUpdate.rb:76
msgid ""
-"There are patches for package management available that require a restart of Y"
-"aST.\n"
+"There are patches for package management available that require a restart of "
+"YaST.\n"
"They should be installed first and all other patches after the restart.\n"
"\n"
"You selected some other patches to be installed now.\n"
Modified: branches/SLE12-SP5/yast/50-pot/packager.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/packager.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/packager.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-29 02:28+0000\n"
-"PO-Revision-Date: 2017-04-29 02:28+0000\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -63,8 +63,8 @@
#. an error popup
#. an error popup
#. an error popup
-#: src/clients/inst_kickoff.rb:377 src/clients/inst_kickoff.rb:460
-#: src/clients/inst_kickoff.rb:536 src/clients/inst_kickoff.rb:593
+#: src/clients/inst_kickoff.rb:367 src/clients/inst_kickoff.rb:450
+#: src/clients/inst_kickoff.rb:526 src/clients/inst_kickoff.rb:583
msgid "Backup of %1 failed. See %2 for details."
msgstr ""
@@ -91,8 +91,8 @@
#. table header - name of the repo
#: src/clients/inst_mediacopy.rb:65
#: src/include/packager/key_manager_dialogs.rb:306
-#: src/lib/packager/clients/repositories.rb:719
-#: src/lib/packager/clients/repositories.rb:732
+#: src/lib/packager/clients/repositories.rb:729
+#: src/lib/packager/clients/repositories.rb:742
msgid "Name"
msgstr ""
@@ -391,7 +391,7 @@
#. dialog caption
#. dialog caption
#. dialog caption
-#: src/clients/key_manager.rb:70 src/lib/packager/clients/repositories.rb:1505
+#: src/clients/key_manager.rb:70 src/lib/packager/clients/repositories.rb:1515
#: src/modules/AddOnProduct.rb:699
msgid "Initializing..."
msgstr ""
@@ -882,7 +882,7 @@
#. popup message part 1
#. Import GPG keys found in the inst-sys
#: src/include/packager/repositories_include.rb:287
-#: src/modules/Packages.rb:1209 src/modules/SourceManager.rb:306
+#: src/modules/Packages.rb:1250 src/modules/SourceManager.rb:306
msgid ""
"Unable to create repository\n"
"from URL '%1'."
@@ -913,81 +913,81 @@
msgstr ""
#. default (minimal) priority of a repository
-#: src/lib/packager/clients/repositories.rb:63
+#: src/lib/packager/clients/repositories.rb:65
msgid "&Priority"
msgstr ""
-#: src/lib/packager/clients/repositories.rb:65
+#: src/lib/packager/clients/repositories.rb:67
msgid "Keep Downloaded Packages"
msgstr ""
#. Command line help text for the repository module, %1 is "zypper"
-#: src/lib/packager/clients/repositories.rb:80
+#: src/lib/packager/clients/repositories.rb:82
msgid ""
"Installation Repositories - This module does not support the command line "
"interface, use '%1' instead."
msgstr ""
#. pad to 3 characters
-#: src/lib/packager/clients/repositories.rb:174
+#: src/lib/packager/clients/repositories.rb:184
msgid "Default"
msgstr ""
#. unkown name (alias) of the source
#. get the editable propertis from 'source' parameter,
#. get the fixed propertis from the package manager
-#: src/lib/packager/clients/repositories.rb:204
-#: src/lib/packager/clients/repositories.rb:269
+#: src/lib/packager/clients/repositories.rb:214
+#: src/lib/packager/clients/repositories.rb:279
msgid "Unknown Name"
msgstr ""
#. displaye only repositories from the selected service
-#: src/lib/packager/clients/repositories.rb:339
-#: src/lib/packager/clients/repositories.rb:340
-#: src/lib/packager/clients/repositories.rb:382
-#: src/lib/packager/clients/repositories.rb:388
+#: src/lib/packager/clients/repositories.rb:349
+#: src/lib/packager/clients/repositories.rb:350
+#: src/lib/packager/clients/repositories.rb:392
+#: src/lib/packager/clients/repositories.rb:398
#: src/modules/SourceManager.rb:436
msgid "Unknown"
msgstr ""
#. label to be used instead of URL if not found
-#: src/lib/packager/clients/repositories.rb:342
-#: src/lib/packager/clients/repositories.rb:381
+#: src/lib/packager/clients/repositories.rb:352
+#: src/lib/packager/clients/repositories.rb:391
#: src/modules/AddOnProduct.rb:1366
msgid "URL: %1"
msgstr ""
#. TRANSLATORS: Raw URL is the address without expanding repo variables
#. e.g. Raw URL = http://something/$arch -> URL = http://something/x86_64
-#: src/lib/packager/clients/repositories.rb:347
+#: src/lib/packager/clients/repositories.rb:357
msgid "Raw URL: %s"
msgstr ""
#. heading - in case repo name not found
-#: src/lib/packager/clients/repositories.rb:377
+#: src/lib/packager/clients/repositories.rb:387
msgid "Unknown Repository Name"
msgstr ""
#. label, %1 is repo category (eg. YUM)
-#: src/lib/packager/clients/repositories.rb:387
+#: src/lib/packager/clients/repositories.rb:397
msgid "Category: %1"
msgstr ""
#. label, %1 is repo category (eg. YUM)
-#: src/lib/packager/clients/repositories.rb:397
+#: src/lib/packager/clients/repositories.rb:407
msgid "Service: %1"
msgstr ""
#. #176013
-#: src/lib/packager/clients/repositories.rb:656
+#: src/lib/packager/clients/repositories.rb:666
msgid "All repositories"
msgstr ""
-#: src/lib/packager/clients/repositories.rb:659
+#: src/lib/packager/clients/repositories.rb:669
msgid "All services"
msgstr ""
-#: src/lib/packager/clients/repositories.rb:668
+#: src/lib/packager/clients/repositories.rb:678
msgid "Service '%1'"
msgstr ""
@@ -995,25 +995,25 @@
#. repositories not associated with service. Sometimes called also
#. third party as they are usually repositories not provided by SUSE
#. within product subscription.
-#: src/lib/packager/clients/repositories.rb:685
+#: src/lib/packager/clients/repositories.rb:695
msgid "Only repositories not provided by a service"
msgstr ""
#. combobox label
-#: src/lib/packager/clients/repositories.rb:697
+#: src/lib/packager/clients/repositories.rb:707
msgid "View"
msgstr ""
#. table header - priority of the repository - keep the translation as short as possible!
-#: src/lib/packager/clients/repositories.rb:712
+#: src/lib/packager/clients/repositories.rb:722
msgid "Priority"
msgstr ""
#. table header - is the repo enabled? - keep the translation as short as possible!
#. table header - is the repo enabled? - keep the translation as short as possible!
#. status info, to be used inside summary
-#: src/lib/packager/clients/repositories.rb:714
-#: src/lib/packager/clients/repositories.rb:727
+#: src/lib/packager/clients/repositories.rb:724
+#: src/lib/packager/clients/repositories.rb:737
#: src/modules/SourceManager.rb:393
msgid "Enabled"
msgstr ""
@@ -1022,96 +1022,96 @@
#. keep the translation as short as possible!
#. table header - is autorefresh enabled for the repo?
#. keep the translation as short as possible!
-#: src/lib/packager/clients/repositories.rb:717
-#: src/lib/packager/clients/repositories.rb:730
+#: src/lib/packager/clients/repositories.rb:727
+#: src/lib/packager/clients/repositories.rb:740
msgid "Autorefresh"
msgstr ""
#. table header - service to which the repo belongs
-#: src/lib/packager/clients/repositories.rb:721
+#: src/lib/packager/clients/repositories.rb:731
msgid "Service"
msgstr ""
#. table header - URL of the repo
#. table header - URL of the repo
-#: src/lib/packager/clients/repositories.rb:723
-#: src/lib/packager/clients/repositories.rb:734
+#: src/lib/packager/clients/repositories.rb:733
+#: src/lib/packager/clients/repositories.rb:744
msgid "URL"
msgstr ""
#. push button - change URL of the selected repository
-#: src/lib/packager/clients/repositories.rb:834
+#: src/lib/packager/clients/repositories.rb:844
msgid "&Replace..."
msgstr ""
#. push button - refresh the selected repository now
-#: src/lib/packager/clients/repositories.rb:836
+#: src/lib/packager/clients/repositories.rb:846
msgid "Re&fresh Selected"
msgstr ""
#. push button - disable/enable the selected repository
-#: src/lib/packager/clients/repositories.rb:838
+#: src/lib/packager/clients/repositories.rb:848
msgid "Status &on or off"
msgstr ""
#. push button - disable/enable automatic refresh of the selected repository
-#: src/lib/packager/clients/repositories.rb:840
+#: src/lib/packager/clients/repositories.rb:850
msgid "Refre&sh on or off"
msgstr ""
#. push button - set name of the selected repository
-#: src/lib/packager/clients/repositories.rb:842
+#: src/lib/packager/clients/repositories.rb:852
msgid "Set &Name..."
msgstr ""
#. label
-#: src/lib/packager/clients/repositories.rb:849
+#: src/lib/packager/clients/repositories.rb:859
msgid "Properties"
msgstr ""
#. check box
-#: src/lib/packager/clients/repositories.rb:854
+#: src/lib/packager/clients/repositories.rb:864
msgid "&Enabled"
msgstr ""
#. check box
-#: src/lib/packager/clients/repositories.rb:860
+#: src/lib/packager/clients/repositories.rb:870
msgid "Automatically &Refresh"
msgstr ""
#. push button label
-#: src/lib/packager/clients/repositories.rb:898
+#: src/lib/packager/clients/repositories.rb:908
msgid "&GPG Keys..."
msgstr ""
#. menu button label
-#: src/lib/packager/clients/repositories.rb:903
+#: src/lib/packager/clients/repositories.rb:913
msgid "Refresh"
msgstr ""
#. menu button label
-#: src/lib/packager/clients/repositories.rb:907
+#: src/lib/packager/clients/repositories.rb:917
msgid "Refresh all Autor&efreshed"
msgstr ""
#. menu button label
-#: src/lib/packager/clients/repositories.rb:909
+#: src/lib/packager/clients/repositories.rb:919
msgid "Refresh all &Enabled"
msgstr ""
#. dialog caption
-#: src/lib/packager/clients/repositories.rb:916
+#: src/lib/packager/clients/repositories.rb:926
msgid "Configured Software Repositories"
msgstr ""
#. help
-#: src/lib/packager/clients/repositories.rb:919
+#: src/lib/packager/clients/repositories.rb:929
msgid ""
"<p>\n"
"Manage configured software repositories and services.</p>\n"
msgstr ""
-#: src/lib/packager/clients/repositories.rb:925
+#: src/lib/packager/clients/repositories.rb:935
msgid ""
"<P>A <B>service</B> or <B>Repository Index Service (RIS) </B> is a protocol "
"for package repository management. A service can offer one or more software "
@@ -1119,7 +1119,7 @@
"P>"
msgstr ""
-#: src/lib/packager/clients/repositories.rb:932
+#: src/lib/packager/clients/repositories.rb:942
msgid ""
"<p>\n"
"<b>Adding a new Repository or a Service</b><br>\n"
@@ -1131,7 +1131,7 @@
msgstr ""
#. help, continued
-#: src/lib/packager/clients/repositories.rb:944
+#: src/lib/packager/clients/repositories.rb:954
msgid ""
"<p>\n"
"To install packages from <b>CD</b>,\n"
@@ -1140,7 +1140,7 @@
msgstr ""
#. help, continued
-#: src/lib/packager/clients/repositories.rb:955
+#: src/lib/packager/clients/repositories.rb:965
msgid ""
"<p>\n"
"The CDs can be copied to <b>hard disk</b>\n"
@@ -1153,7 +1153,7 @@
msgstr ""
#. help, continued
-#: src/lib/packager/clients/repositories.rb:971
+#: src/lib/packager/clients/repositories.rb:981
msgid ""
"<p>\n"
"<b>Modifying Status of a Repository or a Service</b><br>\n"
@@ -1166,7 +1166,7 @@
msgstr ""
#. help text, continued
-#: src/lib/packager/clients/repositories.rb:983
+#: src/lib/packager/clients/repositories.rb:993
msgid ""
"<P><B>Priority of a Repository</B><BR>\n"
"Priority of a repository is an integer value between 0 (the highest "
@@ -1176,14 +1176,14 @@
msgstr ""
#. help text, continued
-#: src/lib/packager/clients/repositories.rb:991
+#: src/lib/packager/clients/repositories.rb:1001
msgid ""
"<P>Select the appropriate option on top of the window for navigation in "
"repositories and services.</P>"
msgstr ""
#. help text, continued
-#: src/lib/packager/clients/repositories.rb:999
+#: src/lib/packager/clients/repositories.rb:1009
msgid ""
"<P><B>Keep Downloaded Packages</B><BR>Check this option to keep downloaded\n"
"packages in a local cache so they can be reused later when the packages are\n"
@@ -1191,14 +1191,14 @@
"installation.</P>"
msgstr ""
-#: src/lib/packager/clients/repositories.rb:1005
+#: src/lib/packager/clients/repositories.rb:1015
msgid ""
"<P>The default local cache is located in directory <B>/var/cache/zypp/"
"packages</B>. Change the location in <B>/etc/zypp/zypp.conf</B> file.</P>"
msgstr ""
#. popup message part 1
-#: src/lib/packager/clients/repositories.rb:1050
+#: src/lib/packager/clients/repositories.rb:1060
msgid ""
"Unable to save changes to the repository\n"
"configuration."
@@ -1206,7 +1206,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:1214
+#: src/lib/packager/clients/repositories.rb:1066 src/modules/Packages.rb:1255
#: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310
msgid "Details:"
msgstr ""
@@ -1214,53 +1214,53 @@
#. 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:1222
+#: src/lib/packager/clients/repositories.rb:1068 src/modules/Packages.rb:1263
#: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312
msgid "Try again?"
msgstr ""
#. popup headline
-#: src/lib/packager/clients/repositories.rb:1075
+#: src/lib/packager/clients/repositories.rb:1085
msgid "Abort Repository Configuration"
msgstr ""
#. popup message
-#: src/lib/packager/clients/repositories.rb:1077
+#: src/lib/packager/clients/repositories.rb:1087
msgid ""
"Abort the repository configuration?\n"
"All changes will be lost."
msgstr ""
#. TODO: add help text
-#: src/lib/packager/clients/repositories.rb:1256
+#: src/lib/packager/clients/repositories.rb:1266
msgid "Refreshing Repositories"
msgstr ""
-#: src/lib/packager/clients/repositories.rb:1257
+#: src/lib/packager/clients/repositories.rb:1267
msgid "Refreshing Services"
msgstr ""
-#: src/lib/packager/clients/repositories.rb:1262
+#: src/lib/packager/clients/repositories.rb:1272
msgid "Refresh Repositories"
msgstr ""
-#: src/lib/packager/clients/repositories.rb:1263
+#: src/lib/packager/clients/repositories.rb:1273
msgid "Refresh Services"
msgstr ""
#. progress bar label
-#: src/lib/packager/clients/repositories.rb:1295
+#: src/lib/packager/clients/repositories.rb:1305
msgid "Refreshing Repository %1..."
msgstr ""
#. refreshing services
#. progress bar label
-#: src/lib/packager/clients/repositories.rb:1321
+#: src/lib/packager/clients/repositories.rb:1331
msgid "Refreshing Service %1..."
msgstr ""
#. popup question, %1 is repository URL
-#: src/lib/packager/clients/repositories.rb:1463
+#: src/lib/packager/clients/repositories.rb:1473
msgid ""
"Repository %1\n"
"has been already added. Each repository should be added only once.\n"
@@ -1269,18 +1269,18 @@
msgstr ""
#. Error popup
-#: src/lib/packager/clients/repositories.rb:1531
+#: src/lib/packager/clients/repositories.rb:1541
msgid "<p>Errors occurred while restoring the repository configuration.</p>\n"
msgstr ""
#. Handle the "Delete" button in the service view
#. @param [Integer] current index of the selected item in the table
-#: src/lib/packager/clients/repositories.rb:1609
+#: src/lib/packager/clients/repositories.rb:1619
msgid "The services of type 'plugin' cannot be removed."
msgstr ""
#. yes-no popup
-#: src/lib/packager/clients/repositories.rb:1615
+#: src/lib/packager/clients/repositories.rb:1625
msgid ""
"Delete service %1\n"
"and its repositories?"
@@ -1288,41 +1288,49 @@
#. Handle the "Delete" button in the repository view
#. @param [Integer] global_current index of the repository in the @sourceStatesOut
-#: src/lib/packager/clients/repositories.rb:1635
+#: src/lib/packager/clients/repositories.rb:1645
msgid ""
"The repositories belonging to a service of type 'plugin' cannot be removed."
msgstr ""
#. yes-no popup
-#: src/lib/packager/clients/repositories.rb:1639
+#: src/lib/packager/clients/repositories.rb:1649
msgid "Delete the selected repository from the list?"
msgstr ""
#. popup message
-#: src/lib/packager/clients/repositories.rb:1700
+#: src/lib/packager/clients/repositories.rb:1713
msgid ""
"For the selected repository, refresh\n"
"cannot be set."
msgstr ""
#. refresh also the combobox widget
-#: src/lib/packager/clients/repositories.rb:1982
+#: src/lib/packager/clients/repositories.rb:2000
msgid ""
"There is no service at URL:\n"
"%1"
msgstr ""
#. TRANSLATORS: An error message
-#: src/lib/packager/clients/repositories.rb:2023
+#: src/lib/packager/clients/repositories.rb:2041
msgid "The services of type 'plugin' cannot be changed."
msgstr ""
#. TRANSLATORS: An error message
-#: src/lib/packager/clients/repositories.rb:2030
+#: src/lib/packager/clients/repositories.rb:2048
msgid ""
"The repositories belonging to a service of type 'plugin' cannot be changed."
msgstr ""
+#. Shows a warning message when repository managed by a service
+#. @param [Hash] sourceState the current state of the repository or service
+#: src/lib/packager/clients/repositories.rb:2071
+msgid ""
+"Repository '%{name}' is managed by service '%{service}'.\n"
+"Your manual changes might be reset by the next service refresh!"
+msgstr ""
+
#. this is a heading
#: src/lib/packager/clients/software_proposal.rb:115
msgid "Software"
@@ -1362,7 +1370,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:464
+#: src/modules/AddOnProduct.rb:1754 src/modules/Packages.rb:469
msgid "Unknown Product"
msgstr ""
@@ -1548,14 +1556,14 @@
msgstr ""
#. warning text
-#: src/modules/Packages.rb:304
+#: src/modules/Packages.rb:309
msgid ""
"Your computer is a 64-bit x86-64 system, but you are trying to install a 32-"
"bit distribution."
msgstr ""
#. help text for software proposal
-#: src/modules/Packages.rb:320
+#: src/modules/Packages.rb:325
msgid ""
"<P>The pattern list states which functionality will be available after "
"installing the system.</P>"
@@ -1563,7 +1571,7 @@
#. (see bnc#178357 why these numbers)
#. translators: help text for software proposal
-#: src/modules/Packages.rb:332
+#: src/modules/Packages.rb:337
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 "
@@ -1573,7 +1581,7 @@
msgstr ""
#. help text for software proposal
-#: src/modules/Packages.rb:337
+#: src/modules/Packages.rb:342
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 "
@@ -1581,118 +1589,118 @@
msgstr ""
#. help text for software proposal - header
-#: src/modules/Packages.rb:346
+#: src/modules/Packages.rb:351
msgid "<P><B>Software Proposal</B></P>"
msgstr ""
#. installation proposal - SW summary, %1 is name of the installed product
#. (e.g. openSUSE 10.3, SUSE Linux Enterprise ...)
-#: src/modules/Packages.rb:363
+#: src/modules/Packages.rb:368
msgid "Product: %1"
msgstr ""
#. installation proposal - SW summary, %1 is name of the selected desktop or system type (e.g. KDE)
-#: src/modules/Packages.rb:377
+#: src/modules/Packages.rb:382
msgid "System Type: %1"
msgstr ""
-#: src/modules/Packages.rb:388
+#: src/modules/Packages.rb:393
msgid "Patterns:<br>"
msgstr ""
#. installation proposal - SW summary, %1 is size of the selected packages (in MB or GB)
-#: src/modules/Packages.rb:398
+#: src/modules/Packages.rb:403
msgid "Size of Packages to Install: %1"
msgstr ""
#. 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:411
+#: src/modules/Packages.rb:416
msgid "Downloading from Remote Repositories: %1"
msgstr ""
-#: src/modules/Packages.rb:473
+#: src/modules/Packages.rb:478
msgid "These add-on products have been marked for auto-removal: %1"
msgstr ""
#. Warning message when some add-ons are marked to be removed automatically
-#: src/modules/Packages.rb:497
+#: src/modules/Packages.rb:502
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:501
+#: src/modules/Packages.rb:506
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:542
+#: src/modules/Packages.rb:547
msgid ""
"Error: Cannot check free space in basic directory %1 (device %2), cannot "
"start installation."
msgstr ""
#. error message: %1: e.g. "/local", %2: "/dev/sda2"
-#: src/modules/Packages.rb:562
+#: src/modules/Packages.rb:567
msgid "Warning: Cannot check free space in directory %1 (device %2)."
msgstr ""
#. summary warning
-#: src/modules/Packages.rb:605
+#: src/modules/Packages.rb:610
msgid "Not enough disk space."
msgstr ""
#. summary warning
-#: src/modules/Packages.rb:607
+#: src/modules/Packages.rb:612
msgid "Not enough disk space. Remove some packages in the single selection."
msgstr ""
#. add a backslash if it's missing
-#: src/modules/Packages.rb:628
+#: src/modules/Packages.rb:633
msgid "Only %1 (%2%%) free space available on partition %3.<BR>"
msgstr ""
#. Check the YaST required packages.
-#: src/modules/Packages.rb:648
+#: src/modules/Packages.rb:653
msgid "Please manually select the needed items to install."
msgstr ""
#. newly installed products
-#: src/modules/Packages.rb:710
+#: src/modules/Packages.rb:715
msgid "New product <b>%s</b> will be installed"
msgstr ""
#. product update: %s is a product name
-#: src/modules/Packages.rb:720
+#: src/modules/Packages.rb:725
msgid "Product <b>%s</b> will be updated"
msgstr ""
#. product update: %{old_product} is an old product, %{new_product} is the new one
-#: src/modules/Packages.rb:722
+#: src/modules/Packages.rb:727
msgid "Product <b>%{old_product}</b> will be updated to <b>%{new_product}</b>"
msgstr ""
-#: src/modules/Packages.rb:729
+#: src/modules/Packages.rb:734
msgid "Product <b>%s</b> will stay installed"
msgstr ""
#. Removing another product might be an issue
#. (just warn if removed by user or by YaST)
-#: src/modules/Packages.rb:739
+#: src/modules/Packages.rb:744
msgid "<b>Warning:</b> Product <b>%s</b> will be removed."
msgstr ""
-#: src/modules/Packages.rb:740
+#: src/modules/Packages.rb:745
msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed."
msgstr ""
#. TRANSLATORS: update proposal warning, do NOT translate "-release",
#. it is part of a package name (like "sles-release")
-#: src/modules/Packages.rb:766
+#: src/modules/Packages.rb:771
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"
@@ -1705,12 +1713,12 @@
msgstr ""
#. error in proposal, %1 is URL
-#: src/modules/Packages.rb:1230
+#: src/modules/Packages.rb:1271
msgid "No repository found at '%1'."
msgstr ""
#. TRANSLATORS: beginning of the rich text with the release notes
-#: src/modules/Packages.rb:1503
+#: src/modules/Packages.rb:1544
msgid ""
"<p><b>The release notes for the initial release are part of the "
"installation\n"
@@ -1719,68 +1727,68 @@
msgstr ""
#. popup - information label
-#: src/modules/Packages.rb:1530
+#: src/modules/Packages.rb:1571
msgid "Integrating booted media..."
msgstr ""
#. close the popup in order to be able to ask about the license
-#: src/modules/Packages.rb:1552
+#: src/modules/Packages.rb:1593
msgid "Failed to integrate the service pack repository."
msgstr ""
#. popup - information label
-#: src/modules/Packages.rb:1585
+#: src/modules/Packages.rb:1626
msgid "Initializing repositories..."
msgstr ""
#. message popup, %1 is product name
-#: src/modules/Packages.rb:1825
+#: src/modules/Packages.rb:1866
msgid "Insert %1 CD 1"
msgstr ""
-#: src/modules/Packages.rb:1827
+#: src/modules/Packages.rb:1868
msgid "%1 CD 1 not found"
msgstr ""
#. an error message
-#: src/modules/Packages.rb:1937
+#: src/modules/Packages.rb:1978
msgid ""
"Error while initializing package descriptions.\n"
"Check the log file %1 for more details."
msgstr ""
#. bnc #436925
-#: src/modules/Packages.rb:2209
+#: src/modules/Packages.rb:2268
msgid ""
"The software selection has been changed externally.\n"
"Software proposal will be called again."
msgstr ""
#. popup label
-#: src/modules/Packages.rb:2227
+#: src/modules/Packages.rb:2286
msgid "Evaluating package selection..."
msgstr ""
#. Error message, %{pattern_name} is replaced with the missing pattern name in runtime
-#: src/modules/Packages.rb:2570
+#: src/modules/Packages.rb:2629
msgid ""
"Failed to select default product pattern %{pattern_name}.\n"
"Pattern has not been found."
msgstr ""
#. TRANSLATORS: %s is a package list
-#: src/modules/Packages.rb:2743
+#: src/modules/Packages.rb:2802
msgid "These packages need to be selected to install: %s"
msgstr ""
#. TRANSLATORS: %s is a pattern list
-#: src/modules/Packages.rb:2746
+#: src/modules/Packages.rb:2805
msgid "These patterns need to be selected to install: %s"
msgstr ""
#. 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:2750
+#: src/modules/Packages.rb:2809
msgid "These items (%{type}) need to be selected to install: %{list}"
msgstr ""
@@ -1835,8 +1843,8 @@
#. #459391
#. If a progress is running open another dialog
#. dialog caption
-#: src/modules/ProductLicense.rb:448 src/modules/ProductLicense.rb:1197
-#: src/modules/ProductLicense.rb:1270
+#: src/modules/ProductLicense.rb:448 src/modules/ProductLicense.rb:1199
+#: src/modules/ProductLicense.rb:1272
msgid "License Agreement"
msgstr ""
@@ -1854,73 +1862,73 @@
msgstr ""
#. timed ok/cancel popup
-#: src/modules/ProductLicense.rb:1107
+#: src/modules/ProductLicense.rb:1109
msgid "The system is shutting down..."
msgstr ""
#. TRANSLATORS: %s is an extension name
#. e.g. "SUSE Linux Enterprise Software Development Kit"
-#: src/modules/ProductLicense.rb:1206
+#: src/modules/ProductLicense.rb:1208
msgid "%s License Agreement"
msgstr ""
#. TRANSLATORS: %{license_url} is an URL where the displayed license can be found
-#: src/modules/ProductLicense.rb:1622
+#: src/modules/ProductLicense.rb:1624
msgid ""
"If you want to print this EULA, you can download it from\n"
"%{license_url}"
msgstr ""
#. popup yes-no
-#: src/modules/SlideShowCallbacks.rb:59
+#: src/modules/SlideShowCallbacks.rb:62
msgid ""
"Do you really want\n"
"to quit the installation?"
msgstr ""
#. Mode::update (), Stage::cont ()
-#: src/modules/SlideShowCallbacks.rb:71
+#: src/modules/SlideShowCallbacks.rb:74
msgid "Aborted"
msgstr ""
#. message in the installation log widget, %1 is a patch name which contains the script
-#: src/modules/SlideShowCallbacks.rb:143
+#: src/modules/SlideShowCallbacks.rb:146
msgid "Starting script %1"
msgstr ""
#. label, %1 is patch name with version and architecture
-#: src/modules/SlideShowCallbacks.rb:198
+#: src/modules/SlideShowCallbacks.rb:201
msgid ""
"Patch %1\n"
"\n"
msgstr ""
#. warning popup - %1 is directory name (e.g. /boot)
-#: src/modules/SlideShowCallbacks.rb:333
+#: src/modules/SlideShowCallbacks.rb:367
msgid ""
"The disk space in partition %1 is nearly exhausted.\n"
"Continue with the installation?"
msgstr ""
#. yes-no popup
-#: src/modules/SlideShowCallbacks.rb:367
+#: src/modules/SlideShowCallbacks.rb:404
msgid ""
"The disk space is nearly exhausted.\n"
"Continue with the installation?"
msgstr ""
#. remote
-#: src/modules/SlideShowCallbacks.rb:443
+#: src/modules/SlideShowCallbacks.rb:480
msgid "Downloading delta RPM %1 (download size %2)"
msgstr ""
#. error in installation log, %1 is detail error description
-#: src/modules/SlideShowCallbacks.rb:472
+#: src/modules/SlideShowCallbacks.rb:509
msgid "Failed to download delta RPM: %1"
msgstr ""
#. error in installation log, %1 is detail error description
-#: src/modules/SlideShowCallbacks.rb:481
+#: src/modules/SlideShowCallbacks.rb:518
msgid "Failed to apply delta RPM: %1"
msgstr ""
@@ -1961,7 +1969,7 @@
#. radio button
#. radio button
-#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1776
+#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1779
msgid "S&MB/CIFS"
msgstr ""
@@ -2026,7 +2034,7 @@
#. text entry
#. text entry
-#: src/modules/SourceDialogs.rb:147 src/modules/SourceDialogs.rb:1640
+#: src/modules/SourceDialogs.rb:147 src/modules/SourceDialogs.rb:1643
msgid "&Path to Directory or ISO Image"
msgstr ""
@@ -2167,11 +2175,11 @@
#. @return widget description map
#. Get widget description map
#. @return widget description map
-#: src/modules/SourceDialogs.rb:771 src/modules/SourceDialogs.rb:1912
+#: src/modules/SourceDialogs.rb:771 src/modules/SourceDialogs.rb:1915
msgid "Edit Parts of the URL"
msgstr ""
-#: src/modules/SourceDialogs.rb:778 src/modules/SourceDialogs.rb:1919
+#: src/modules/SourceDialogs.rb:778 src/modules/SourceDialogs.rb:1922
msgid "Edit Complete URL"
msgstr ""
@@ -2241,8 +2249,8 @@
msgstr ""
#. checkbox label
-#: src/modules/SourceDialogs.rb:1066 src/modules/SourceDialogs.rb:1324
-#: src/modules/SourceDialogs.rb:1391
+#: src/modules/SourceDialogs.rb:1066 src/modules/SourceDialogs.rb:1327
+#: src/modules/SourceDialogs.rb:1394
msgid "&Plain RPM Directory"
msgstr ""
@@ -2256,20 +2264,20 @@
msgstr ""
#. `opt(`hstretch),
-#: src/modules/SourceDialogs.rb:1317
+#: src/modules/SourceDialogs.rb:1320
msgid "&USB Mass Storage Device"
msgstr ""
#. the spacing is added to make the widget wider
-#: src/modules/SourceDialogs.rb:1322 src/modules/SourceDialogs.rb:1389
+#: src/modules/SourceDialogs.rb:1325 src/modules/SourceDialogs.rb:1392
msgid "&File System"
msgstr ""
-#: src/modules/SourceDialogs.rb:1323 src/modules/SourceDialogs.rb:1390
+#: src/modules/SourceDialogs.rb:1326 src/modules/SourceDialogs.rb:1393
msgid "Dire&ctory"
msgstr ""
-#: src/modules/SourceDialogs.rb:1328
+#: src/modules/SourceDialogs.rb:1331
msgid ""
"<p><big><b>USB Stick or Disk</b></big><br>\n"
"Select the USB device on which the repository is located.\n"
@@ -2282,7 +2290,7 @@
#. 'auto' is a value in the combo box widget, do not translate it!
#. 'auto' is a value in the combo box widget, do not translate it!
-#: src/modules/SourceDialogs.rb:1338 src/modules/SourceDialogs.rb:1405
+#: src/modules/SourceDialogs.rb:1341 src/modules/SourceDialogs.rb:1408
msgid ""
"<p>The file system used on the device will be detected automatically\n"
"if you select file system 'auto'. If the detection fails or you\n"
@@ -2290,11 +2298,11 @@
msgstr ""
#. combobox title
-#: src/modules/SourceDialogs.rb:1388
+#: src/modules/SourceDialogs.rb:1391
msgid "&Disk Device"
msgstr ""
-#: src/modules/SourceDialogs.rb:1395
+#: src/modules/SourceDialogs.rb:1398
msgid ""
"<p><big><b>Disk</b></big><br>\n"
"Select the disk on which the repository is located.\n"
@@ -2306,12 +2314,12 @@
msgstr ""
#. text entry
-#: src/modules/SourceDialogs.rb:1421
+#: src/modules/SourceDialogs.rb:1424
msgid "&Path to ISO Image"
msgstr ""
#. push button
-#: src/modules/SourceDialogs.rb:1441
+#: src/modules/SourceDialogs.rb:1444
msgid ""
"<p><big><b>Local ISO Image</b></big><br>\n"
"Use <b>Path to ISO Image</b> to specify the path to the\n"
@@ -2319,71 +2327,71 @@
msgstr ""
#. text entry
-#: src/modules/SourceDialogs.rb:1622
+#: src/modules/SourceDialogs.rb:1625
msgid "Server &Name"
msgstr ""
-#: src/modules/SourceDialogs.rb:1626
+#: src/modules/SourceDialogs.rb:1629
msgid "&Port"
msgstr ""
#. text entry
-#: src/modules/SourceDialogs.rb:1631
+#: src/modules/SourceDialogs.rb:1634
msgid "&Share"
msgstr ""
#. checkbox label
-#: src/modules/SourceDialogs.rb:1644
+#: src/modules/SourceDialogs.rb:1647
msgid "ISO &Image"
msgstr ""
#. text entry
-#: src/modules/SourceDialogs.rb:1647
+#: src/modules/SourceDialogs.rb:1650
msgid "&Directory on Server"
msgstr ""
#. frame
-#: src/modules/SourceDialogs.rb:1652
+#: src/modules/SourceDialogs.rb:1655
msgid "Au&thentication"
msgstr ""
#. check box
-#: src/modules/SourceDialogs.rb:1659
+#: src/modules/SourceDialogs.rb:1662
msgid "&Anonymous"
msgstr ""
#. text entry
-#: src/modules/SourceDialogs.rb:1668
+#: src/modules/SourceDialogs.rb:1671
msgid "&Workgroup or Domain"
msgstr ""
#. text entry
-#: src/modules/SourceDialogs.rb:1677
+#: src/modules/SourceDialogs.rb:1680
msgid "&User Name"
msgstr ""
#. password entry
-#: src/modules/SourceDialogs.rb:1684
+#: src/modules/SourceDialogs.rb:1687
msgid "&Password"
msgstr ""
#. radio button
-#: src/modules/SourceDialogs.rb:1759
+#: src/modules/SourceDialogs.rb:1762
msgid "&FTP"
msgstr ""
#. radio button
-#: src/modules/SourceDialogs.rb:1762
+#: src/modules/SourceDialogs.rb:1765
msgid "H&TTP"
msgstr ""
#. radio button
-#: src/modules/SourceDialogs.rb:1769
+#: src/modules/SourceDialogs.rb:1772
msgid "HTT&PS"
msgstr ""
#. help text - server dialog
-#: src/modules/SourceDialogs.rb:1943
+#: src/modules/SourceDialogs.rb:1946
msgid ""
"<p><big><b>Server and Directory</b></big><br>\n"
"Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n"
@@ -2399,7 +2407,7 @@
msgstr ""
#. help text - server dialog, there is a "Port" widget
-#: src/modules/SourceDialogs.rb:1956
+#: src/modules/SourceDialogs.rb:1959
msgid ""
"<p>It is possible to set the <b>Port</b> number for a HTTP/HTTPS "
"repository.\n"
@@ -2409,16 +2417,16 @@
#. Returns whether Community Repositories are defined in the control file.
#.
#. @return [Boolean] whether defined
-#: src/modules/SourceDialogs.rb:2018
+#: src/modules/SourceDialogs.rb:2021
msgid "I would li&ke to install an additional Add On Product"
msgstr ""
-#: src/modules/SourceDialogs.rb:2037
+#: src/modules/SourceDialogs.rb:2040
msgid "Net&work Configuration..."
msgstr ""
#. help text
-#: src/modules/SourceDialogs.rb:2153
+#: src/modules/SourceDialogs.rb:2156
msgid ""
"<p><big><b>Media Type</b></big><br>\n"
"The software repository can be located on CD, on a network server,\n"
@@ -2426,7 +2434,7 @@
msgstr ""
#. help, continued
-#: src/modules/SourceDialogs.rb:2162
+#: src/modules/SourceDialogs.rb:2165
msgid ""
"<p>\n"
"To add <b>CD</b> or <b>DVD</b>,\n"
@@ -2434,7 +2442,7 @@
msgstr ""
#. help, continued
-#: src/modules/SourceDialogs.rb:2172
+#: src/modules/SourceDialogs.rb:2175
msgid ""
"<p>\n"
"The product CDs can be copied to the hard disk.\n"
@@ -2444,7 +2452,7 @@
msgstr ""
#. help, continued
-#: src/modules/SourceDialogs.rb:2184
+#: src/modules/SourceDialogs.rb:2187
msgid ""
"<p>\n"
"Network installation requires a working network connection.\n"
@@ -2453,25 +2461,25 @@
msgstr ""
#. error popup
-#: src/modules/SourceDialogs.rb:2201
+#: src/modules/SourceDialogs.rb:2204
msgid "Select the media type"
msgstr ""
-#: src/modules/SourceDialogs.rb:2207
+#: src/modules/SourceDialogs.rb:2210
msgid "Insert the add-on product CD"
msgstr ""
-#: src/modules/SourceDialogs.rb:2208
+#: src/modules/SourceDialogs.rb:2211
msgid "Insert the add-on product DVD"
msgstr ""
#. ask for a medium
-#: src/modules/SourceDialogs.rb:2226
+#: src/modules/SourceDialogs.rb:2229
msgid "No USB disk was detected."
msgstr ""
#. use three slashes as third slash means path
-#: src/modules/SourceDialogs.rb:2442
+#: src/modules/SourceDialogs.rb:2445
msgid ""
"<p><b>Download Files</b><br>\n"
"Each repository has description files which describe the content of the\n"
@@ -2482,19 +2490,19 @@
msgstr ""
#. dialog caption
-#: src/modules/SourceDialogs.rb:2662
+#: src/modules/SourceDialogs.rb:2665
msgid "Media Type"
msgstr ""
#. dialog caption
-#: src/modules/SourceDialogs.rb:2686
+#: src/modules/SourceDialogs.rb:2689
msgid "Add On Product"
msgstr ""
#. Returns boolean whether user confirmed to abort the configuration
#.
#. @return [Boolean] whether to abort
-#: src/modules/SourceDialogs.rb:2717
+#: src/modules/SourceDialogs.rb:2720
msgid "URL scheme '%s' is not valid."
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/pam.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/pam.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/pam.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:29+0200\n"
-"PO-Revision-Date: 2016-08-30 18:29+0200\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
Modified: branches/SLE12-SP5/yast/50-pot/pkg-bindings.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/pkg-bindings.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/pkg-bindings.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:29+0200\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -23,34 +23,46 @@
#. help text
#: src/HelpTexts.h:36
-msgid "<P><BIG><B>Loading Available Packages</B></BIG></P><P>Loading available objects from the configured repositories is in progress. This may take a while...</P>"
+msgid ""
+"<P><BIG><B>Loading Available Packages</B></BIG></P><P>Loading available "
+"objects from the configured repositories is in progress. This may take a "
+"while...</P>"
msgstr ""
#. help text
#: src/HelpTexts.h:42
-msgid "<P><BIG><B>Loading Installed Packages</B></BIG></P><P>The package manager is reading installed packages...</P>"
+msgid ""
+"<P><BIG><B>Loading Installed Packages</B></BIG></P><P>The package manager is "
+"reading installed packages...</P>"
msgstr ""
#. help text
#: src/HelpTexts.h:47
-msgid "<P><BIG><B>Registering a New Repository</B></BIG></P><P>A new repository is being registered. The package manager is reading the list of available packages in the repository...</P>"
+msgid ""
+"<P><BIG><B>Registering a New Repository</B></BIG></P><P>A new repository is "
+"being registered. The package manager is reading the list of available "
+"packages in the repository...</P>"
msgstr ""
#: src/HelpTexts.h:52
-msgid "<P><BIG><B>Saving Repositories</B></BIG></P><P>The package manager is updating configured repositories...</P>"
+msgid ""
+"<P><BIG><B>Saving Repositories</B></BIG></P><P>The package manager is "
+"updating configured repositories...</P>"
msgstr ""
#: src/HelpTexts.h:55
-msgid "<P><BIG><B>Refreshing the Repository</B></BIG></P><P>The package manager is updating the repository content...</P>"
+msgid ""
+"<P><BIG><B>Refreshing the Repository</B></BIG></P><P>The package manager is "
+"updating the repository content...</P>"
msgstr ""
#. error message
-#: src/Package.cc:658
+#: src/Package.cc:654
msgid "The package cannot be selected to install."
msgstr ""
#. error message
-#: src/Package.cc:664
+#: src/Package.cc:660
msgid "The package is not available."
msgstr ""
@@ -85,11 +97,11 @@
msgstr ""
#: src/Source_Create.cc:590 src/Source_Download.cc:407 src/Source_Load.cc:155
-#: src/Source_Load.cc:479
+#: src/Source_Load.cc:491
msgid "Rebuild Cache"
msgstr ""
-#: src/Source_Create.cc:594 src/Source_Load.cc:156 src/Source_Load.cc:480
+#: src/Source_Create.cc:594 src/Source_Load.cc:156 src/Source_Load.cc:492
#: src/Source_Set.cc:76
msgid "Load Data"
msgstr ""
@@ -142,17 +154,17 @@
msgid "Error refreshing service"
msgstr ""
-#: src/Source_Load.cc:154 src/Source_Load.cc:478
+#: src/Source_Load.cc:154 src/Source_Load.cc:490
msgid "Refresh Sources"
msgstr ""
#. 3 steps per repository (download, cache rebuild, load resolvables)
-#: src/Source_Load.cc:161 src/Source_Load.cc:483 src/Source_Set.cc:83
+#: src/Source_Load.cc:161 src/Source_Load.cc:495 src/Source_Set.cc:83
#: src/Target_Load.cc:74 src/Target_Load.cc:204
msgid "Loading the Package Manager..."
msgstr ""
-#: src/Source_Load.cc:477
+#: src/Source_Load.cc:489
msgid "Load Sources"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/printer.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/printer.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/printer.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:29+0200\n"
-"PO-Revision-Date: 2016-08-30 18:29+0200\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -66,16 +66,19 @@
#. If cups is missing, there can be no local running cupsd which is
#. mandatory to set up local print queues.
#: src/clients/printer_proposal.rb:92
-msgid "Cannot configure printing (required package cups-client is not installed)."
+msgid ""
+"Cannot configure printing (required package cups-client is not installed)."
msgstr ""
#: src/clients/printer_proposal.rb:102
-msgid "Cannot configure local printers (required package cups is not installed)."
+msgid ""
+"Cannot configure local printers (required package cups is not installed)."
msgstr ""
#. Skip automated queue setup when it is a client-only config:
#: src/clients/printer_proposal.rb:117
-msgid "No local printer accessible (using remote CUPS server '%1' for printing)."
+msgid ""
+"No local printer accessible (using remote CUPS server '%1' for printing)."
msgstr ""
#. Wait half a minute for a new started cupsd:
@@ -175,7 +178,8 @@
#. Header for a dialog section where the user can
#. specify if USB printers are configured automatically:
#: src/include/printer/autoconfig.rb:61
-msgid "Specify if automatic USB printer configuration should happen when plug in"
+msgid ""
+"Specify if automatic USB printer configuration should happen when plug in"
msgstr ""
#. CheckBox for automatic configuration of USB printers
@@ -183,8 +187,8 @@
#. Do not change or translate "udev-configure-printer", it is a RPM package name.
#: src/include/printer/autoconfig.rb:75
msgid ""
-"&Use the package udev-configure-printer for automatic USB printer configuratio"
-"n"
+"&Use the package udev-configure-printer for automatic USB printer "
+"configuration"
msgstr ""
#. where %1 will be replaced by the server name:
@@ -203,8 +207,8 @@
#. PopupYesNoHeadline body:
#: src/include/printer/autoconfig.rb:101
msgid ""
-"A remote CUPS server setting conflicts with automatic configuration of printer"
-"s for the local system."
+"A remote CUPS server setting conflicts with automatic configuration of "
+"printers for the local system."
msgstr ""
#. Only a simple message because this error does not happen on a normal system
@@ -492,8 +496,8 @@
#. Body of a Popup::AnyMessage when a wrong queue name was entered:
#: src/include/printer/basicadd.rb:379
msgid ""
-"Only letters (a-z and A-Z), numbers (0-9), and the underscore '_' are allowed "
-"for the queue name."
+"Only letters (a-z and A-Z), numbers (0-9), and the underscore '_' are "
+"allowed for the queue name."
msgstr ""
#. when a queue name is changed to be valid:
@@ -517,8 +521,8 @@
#. which has a 'Refresh List' button to update the shown printer configurations:
#: src/include/printer/basicadd.rb:430 src/include/printer/basicadd.rb:821
msgid ""
-"If the next dialog does not show the new printer configuration as expected, wa"
-"it some time and use the 'Refresh List' button."
+"If the next dialog does not show the new printer configuration as expected, "
+"wait some time and use the 'Refresh List' button."
msgstr ""
#. Only a simple message because before the RunHpsetup function was called
@@ -566,8 +570,8 @@
#. Do not change or translate "System V style interface script", it is a technical term.
#: src/include/printer/basicmodify.rb:315
msgid ""
-"No driver is used (it is a 'raw' queue or a 'System V style interface script' "
-"is used)"
+"No driver is used (it is a 'raw' queue or a 'System V style interface "
+"script' is used)"
msgstr ""
#: src/include/printer/basicmodify.rb:323
@@ -620,8 +624,8 @@
#. which has a 'Refresh List' button to update the shown printer configurations:
#: src/include/printer/basicmodify.rb:823
msgid ""
-"If the next dialog does not show the expected modifications, wait some time an"
-"d use the 'Refresh List' button."
+"If the next dialog does not show the expected modifications, wait some time "
+"and use the 'Refresh List' button."
msgstr ""
#. Exit this dialog in any case:
@@ -647,7 +651,8 @@
#. Do not change or translate "raw", it is a technical term
#. when no driver is used for a print queue.
#: src/include/printer/connectionwizard.rb:432
-msgid "Keep the model or select a &manufacturer if no 'raw queue' should be set up"
+msgid ""
+"Keep the model or select a &manufacturer if no 'raw queue' should be set up"
msgstr ""
#. Header for a ComboBox to select the printer manufacturer:
@@ -764,7 +769,8 @@
msgstr ""
#: src/include/printer/connectionwizard.rb:1076
-msgid "To access a bluetooth printer, the RPM package bluez-cups must be installed."
+msgid ""
+"To access a bluetooth printer, the RPM package bluez-cups must be installed."
msgstr ""
#. The user can also decide during the actual installation not to install it
@@ -842,7 +848,9 @@
msgstr ""
#: src/include/printer/connectionwizard.rb:1402
-msgid "To access a SMB printer share, the RPM package samba-client must be installed."
+msgid ""
+"To access a SMB printer share, the RPM package samba-client must be "
+"installed."
msgstr ""
#. The user can also decide during the actual installation not to install it
@@ -1153,7 +1161,8 @@
msgstr ""
#: src/include/printer/connectionwizard.rb:2509
-msgid "The 'mark' parity checking is only supported with 7 data bits and 1 stop bit."
+msgid ""
+"The 'mark' parity checking is only supported with 7 data bits and 1 stop bit."
msgstr ""
#: src/include/printer/connectionwizard.rb:2551
@@ -1317,8 +1326,8 @@
#. the rest makes no sense (in particular the ln commands would create nonsense links in $PWD):
#: src/include/printer/connectionwizard.rb:3273
msgid ""
-"To support Active Directory (R), the RPM package samba-krb-printing must be in"
-"stalled."
+"To support Active Directory (R), the RPM package samba-krb-printing must be "
+"installed."
msgstr ""
#. Show a user notification before it gets disabled:
@@ -1502,7 +1511,8 @@
#. Simply exit this dialog because it does not make sense to proceed here
#. and there is nothing else to be done after this:
#: src/include/printer/driveradd.rb:685
-msgid "The printer description file is not in compliance with the specification."
+msgid ""
+"The printer description file is not in compliance with the specification."
msgstr ""
#. when a PPD file is not in compliance:
@@ -1513,7 +1523,8 @@
#. Body of a Popup::ContinueCancelHeadline
#. when PPD file is not in compliance:
#: src/include/printer/driveradd.rb:705
-msgid "A non-compliant printer description file can lead to arbitrary failures."
+msgid ""
+"A non-compliant printer description file can lead to arbitrary failures."
msgstr ""
#: src/include/printer/driveradd.rb:722
@@ -1556,13 +1567,14 @@
"<b><big>Print Queue Overview</big></b><br>\n"
"A printer device is not used directly but via a print queue.<br>\n"
"When various applications submit print jobs simultaneously,\n"
-"these jobs are put in a queue and are sent one after the other to the printer\n"
+"these jobs are put in a queue and are sent one after the other to the "
+"printer\n"
"device.<br>\n"
"It is possible to have several different print queues for the same printer\n"
"device.\n"
"For example a second queue with a monochrome-only driver for a color device\n"
-"or a PostScript queue and a queue with a PCL driver for a PostScript+PCL print"
-"er.\n"
+"or a PostScript queue and a queue with a PCL driver for a PostScript+PCL "
+"printer.\n"
"</p>\n"
msgstr ""
@@ -1647,18 +1659,19 @@
"<b><big>Set Up a New Queue for a Printer Device</big></b><br>\n"
"A printer device is not used directly but via a print queue.<br>\n"
"When various application programs submit print jobs simultaneously,\n"
-"the jobs queue up and are sent one after the other to the printer device.<br>\n"
-"It is possible to have several different print queues for the same printer dev"
-"ice.\n"
-"Usually several print queues are needed when several different printer drivers"
-"\n"
+"the jobs queue up and are sent one after the other to the printer device."
+"<br>\n"
+"It is possible to have several different print queues for the same printer "
+"device.\n"
+"Usually several print queues are needed when several different printer "
+"drivers\n"
"should be used for the same printer device.\n"
"For example a second queue with a monochrome-only driver\n"
"to enforce black-only printout on a color device\n"
-"or a PostScript queue and a queue with a PCL driver for a PostScript+PCL print"
-"er\n"
-"because printing via the PCL driver is usually faster (but with less quality)."
-"\n"
+"or a PostScript queue and a queue with a PCL driver for a PostScript+PCL "
+"printer\n"
+"because printing via the PCL driver is usually faster (but with less "
+"quality).\n"
"</p>"
msgstr ""
@@ -1677,8 +1690,8 @@
#: src/include/printer/helps.rb:152
msgid ""
"<p>\n"
-"The <b>connection</b> determines which way data is sent to the printer device."
-"<br>\n"
+"The <b>connection</b> determines which way data is sent to the printer "
+"device.<br>\n"
"If a wrong connection is selected, no data can be sent to the device\n"
"so that there cannot be any printout.<br>\n"
"If a printer device is accessible via more than one connection type,\n"
@@ -1686,9 +1699,10 @@
"In particular HP devices are often accessible both via the 'usb:/...'\n"
"and the 'hp:/...' connection.\n"
"The latter is provided by the HP driver package 'hplip'.\n"
-"For plain printing, both kinds of connections should work, but for anything el"
-"se\n"
-"(e.g. device status via 'hp-toolbox' or scanning with a HP all-in-one device)\n"
+"For plain printing, both kinds of connections should work, but for anything "
+"else\n"
+"(e.g. device status via 'hp-toolbox' or scanning with a HP all-in-one "
+"device)\n"
"the 'hp:/...' connection must be used.\n"
"</p>\n"
msgstr ""
@@ -1700,8 +1714,8 @@
"The <b>driver</b> determines that the right data is produced for the\n"
"specific printer model.<br>\n"
"If a wrong driver is assigned, wrong data is sent to the printer\n"
-"which results bad looking printout, chaotic printout, or no printout at all.<b"
-"r>\n"
+"which results bad looking printout, chaotic printout, or no printout at all."
+"<br>\n"
"Initially the input field for the driver search string is preset\n"
"with the autodetected model name of the currently selected connection\n"
"and those drivers where the driver description matches to the model name\n"
@@ -1726,7 +1740,8 @@
"and feel free to play around and modify the settings\n"
"to what you know what works best for your printer.<br>\n"
"If no driver description matches to the autodetected model name,\n"
-"it does not necessarily mean that there is no driver available for the model.\n"
+"it does not necessarily mean that there is no driver available for the "
+"model.\n"
"Often only the model name in the driver descriptions\n"
"is different from the autodetected model name.\n"
"Therefore you can enter whatever you like as driver search string\n"
@@ -1807,7 +1822,8 @@
#: src/include/printer/helps.rb:268
msgid ""
"<p>\n"
-"The <b>connection</b> determines how data is sent to the printer device.<br>\n"
+"The <b>connection</b> determines how data is sent to the printer device."
+"<br>\n"
"If a wrong connection is selected, no data can be sent to the device\n"
"so that there cannot be any printout.<br>\n"
"If a printer device is accessible via more than one connection type,\n"
@@ -1815,9 +1831,10 @@
"In particular HP devices are often accessible both via the 'usb:/...'\n"
"and the 'hp:/...' connection.\n"
"The latter is provided by the HP driver package 'hplip'.\n"
-"For plain printing, both kinds of connections should work, but for anything el"
-"se\n"
-"(e.g. device status via 'hp-toolbox' or scanning with a HP all-in-one device)\n"
+"For plain printing, both kinds of connections should work, but for anything "
+"else\n"
+"(e.g. device status via 'hp-toolbox' or scanning with a HP all-in-one "
+"device)\n"
"the 'hp:/...' connection must be used.<br>\n"
"When you exchange the currently used connection with another one,\n"
"the input field for the driver search string is preset\n"
@@ -1854,12 +1871,12 @@
"The <b>driver</b> determines that the right data is produced for the\n"
"specific printer model.<br>\n"
"If a wrong driver is assigned, wrong data is sent to the printer\n"
-"which results bad looking printout, chaotic printout, or no printout at all.<b"
-"r>\n"
-"You can either select another driver and modify its driver option settings lat"
-"er\n"
-"or keep the currently used driver and modify its driver option settings now.<b"
-"r>\n"
+"which results bad looking printout, chaotic printout, or no printout at all."
+"<br>\n"
+"You can either select another driver and modify its driver option settings "
+"later\n"
+"or keep the currently used driver and modify its driver option settings now."
+"<br>\n"
"Some driver option settings must match to your particular printer.\n"
"For example the default paper size setting of the driver\n"
"must match to the paper which is actually loaded in your printer.<br>\n"
@@ -1868,7 +1885,8 @@
"should work for the particular driver.\n"
"Nevertheless it may happen that your particular printer fails to print\n"
"with high resolution. For example when you have a laser printer\n"
-"which has insufficient built-in memory to process high resolution pages.<br>\n"
+"which has insufficient built-in memory to process high resolution pages."
+"<br>\n"
"When you exchange the currently used driver by another one,\n"
"you must first apply this change to the print queue\n"
"so that the new driver is used for the queue\n"
@@ -1876,8 +1894,8 @@
"and then in a second step you can adjust all driver options\n"
"by using this dialog again.<br>\n"
"Initially the input field for the driver search string is preset\n"
-"with the description of the currently used driver when the connection was not "
-"changed.\n"
+"with the description of the currently used driver when the connection was "
+"not changed.\n"
"This results usually only one single driver which matches\n"
"so that you would have to enter a less specific driver search string\n"
"to get also other drivers or you use the 'Find More' button.\n"
@@ -1892,9 +1910,10 @@
msgid ""
"<p>\n"
"In contrast to connection and driver where you must select the right one,\n"
-"you are free to enter arbitrary strings for <b>description</b> and <b>location"
-"</b>.\n"
-"Application programs often show description and location in the print dialog.\n"
+"you are free to enter arbitrary strings for <b>description</b> and "
+"<b>location</b>.\n"
+"Application programs often show description and location in the print "
+"dialog.\n"
"To make sure that those strings look correct in any language\n"
"which a particular user of a particular application program may use,\n"
"it is safe when you use only plain ASCII text without\n"
@@ -2000,7 +2019,8 @@
msgid ""
"<p>\n"
"<b><big>Specify the Connection</big></b><br>\n"
-"The <b>connection</b> determines how data is sent to the printer device.<br>\n"
+"The <b>connection</b> determines how data is sent to the printer device."
+"<br>\n"
"If a wrong connection is used, no data can be sent to the device\n"
"so that there cannot be any printout.\n"
"</p>\n"
@@ -2012,22 +2032,24 @@
"<p>\n"
"<b><big>Printer Device URI</big></b><br>\n"
"A connection is specified as so called <b>device URI</b>.<br>\n"
-"Its first word (the so called URI scheme) specifies the kind of data-transfer,"
-"\n"
+"Its first word (the so called URI scheme) specifies the kind of data-"
+"transfer,\n"
"for example 'usb', 'socket', 'lpd', or 'ipp'.<br>\n"
"After the scheme there are more or less additional components\n"
"which specify the details for this kind of data-transfer.<br>\n"
"Space characters are not allowed in an URI.\n"
"Therefore a space character in a value of an URI component\n"
-"is encoded as '%20' (20 is the hexadecimal value of the space character).<br>\n"
+"is encoded as '%20' (20 is the hexadecimal value of the space character)."
+"<br>\n"
"The components of an URI are separated by special reserved characters like\n"
-"colon ':', slash '/', question mark '?', ampersand '&', or equals sign '='"
-".<br>\n"
-"Finally there could be optional parameters (separated by a question mark '?')\n"
+"colon ':', slash '/', question mark '?', ampersand '&', or equals sign "
+"'='.<br>\n"
+"Finally there could be optional parameters (separated by a question mark "
+"'?')\n"
"of the form 'option1=value1&option2=value2&option3=value3' so that\n"
"a full device URI could be for example:<br>\n"
-"ipp://server.domain:631/printers/queuename?waitjob=false&waitprinter=false"
-"<br>\n"
+"ipp://server.domain:631/printers/queuename?waitjob=false&"
+"waitprinter=false<br>\n"
"Some examples:<br>\n"
"A USB printer model 'Fun Printer 1000+' made by 'ACME'\n"
"with serial number 'A1B2C3' may have a device URI like:<br>\n"
@@ -2134,8 +2156,8 @@
#: src/include/printer/helps.rb:588
msgid ""
"<p>\n"
-"<b><big>Device URIs to Access a Network Printer or a Printserver Box</big></b>"
-"<br>\n"
+"<b><big>Device URIs to Access a Network Printer or a Printserver Box</big></"
+"b><br>\n"
"A printserver box is a small device with a network connection\n"
"and a USB or parallel port connection to connect the actual printer.\n"
"A network printer has such a device built-in.\n"
@@ -2183,8 +2205,8 @@
"Ask your network administrator what which print server machine\n"
"provides in your particular network:<br>\n"
"<b>Windows (R) or Samba (SMB/CIFS)</b><br>\n"
-"To access a SMB printer share, the RPM package samba-client must be installed."
-"\n"
+"To access a SMB printer share, the RPM package samba-client must be "
+"installed.\n"
"The package provides the CUPS backend 'smb' which is a link to\n"
"the <tt>/usr/bin/smbspool</tt> program which actually sends the data\n"
"to a SMB printer share.<br>\n"
@@ -2227,8 +2249,8 @@
"the following device URI to access a 'Fun Printer 1000+' share:<br>\n"
"smb://John%20Doe:%40home%21@MYGROUP/homeserver/Fun%20Printer%201000%2B<br>\n"
"For <b>more information</b> have a look at <tt>man smbspool</tt> and<br>\n"
-"http://en.opensuse.org/SDB:Printing_via_SMB_(Samba)_Share_or_Windows_Share<br>"
-"\n"
+"http://en.opensuse.org/SDB:"
+"Printing_via_SMB_(Samba)_Share_or_Windows_Share<br>\n"
"'Windows' and 'Active Directory' are registered trademarks\n"
"of Microsoft Corporation in the United States and/or other countries.<br>\n"
"<b>Traditional UNIX Server (LPR)</b><br>\n"
@@ -2283,11 +2305,12 @@
"The last parameter is the original URI, which the queue had before.<br>\n"
"Example:<br>\n"
"beh:/1/3/5/socket://ip-address:port-number<br>\n"
-"The beh backend tries to access a network printer 3 times with 5 second delay\n"
+"The beh backend tries to access a network printer 3 times with 5 second "
+"delay\n"
"between the attempts. If access still fails, the queue is not disabled\n"
"and the print job is lost.<br>\n"
-"For <b>more information</b> have a look at <tt>/usr/lib[64]/cups/backend/beh</"
-"tt> and<br>\n"
+"For <b>more information</b> have a look at <tt>/usr/lib[64]/cups/backend/"
+"beh</tt> and<br>\n"
"http://www.linuxfoundation.org/en/OpenPrinting/Database/BackendErrorHandler…"
"</p>"
msgstr ""
@@ -2297,7 +2320,8 @@
msgid ""
"<p>\n"
"<b><big>Printing Via Network</big></b><br>\n"
-"Usually CUPS (Common Unix Printing System) is used to print via network.<br>\n"
+"Usually CUPS (Common Unix Printing System) is used to print via network."
+"<br>\n"
"By default CUPS uses its so called 'Browsing' mode\n"
"to make printers available via network.<br>\n"
"In this case remote CUPS servers must publish their printers via network\n"
@@ -2353,9 +2377,10 @@
msgid ""
"<p>\n"
"If you print only via network and if you use only one single CUPS server,\n"
-"there is no need to use CUPS Browsing and have a CUPS daemon running on your h"
-"ost.\n"
-"Instead it is simpler to specify the CUPS server and access it directly.<br>\n"
+"there is no need to use CUPS Browsing and have a CUPS daemon running on your "
+"host.\n"
+"Instead it is simpler to specify the CUPS server and access it directly."
+"<br>\n"
"A possible drawback is that application programs may be delayed\n"
"for some time (until a timeout happens) when they try\n"
"to access the CUPS server but it is actually not available\n"
@@ -2388,8 +2413,8 @@
"Usually CUPS (Common Unix Printing System) should be set up to use\n"
"its so called 'Browsing' mode to make printers available via network.<br>\n"
"In this case CUPS servers publish their local print queues via network\n"
-"and accordingly on CUPS client systems the CUPS daemon process (cupsd) must ru"
-"n\n"
+"and accordingly on CUPS client systems the CUPS daemon process (cupsd) must "
+"run\n"
"which is listening for incoming information about published printers.<br>\n"
"CUPS Browsing information is received via UDP port 631.\n"
"</p>"
@@ -2400,15 +2425,17 @@
msgid ""
"<p>\n"
"First of all CUPS client systems must be allowed to access the CUPS server.\n"
-"Then specify whether or not printers should be published to the clients.<br>\n"
+"Then specify whether or not printers should be published to the clients."
+"<br>\n"
"In a local network the usual way to set up CUPS Browsing is\n"
"to allow remote access for all hosts in the local network\n"
"and to publish printers to all those hosts.<br>\n"
"It is not required to publish printers in any case.<br>\n"
-"If you have only one single CUPS server, there is no need to use CUPS Browsing"
-".\n"
+"If you have only one single CUPS server, there is no need to use CUPS "
+"Browsing.\n"
"Instead it is simpler to specify the CUPS server on the client systems\n"
-"(via 'Printing Via Network') so that the clients access the server directly.\n"
+"(via 'Printing Via Network') so that the clients access the server "
+"directly.\n"
"</p>"
msgstr ""
@@ -2501,8 +2528,8 @@
"<br>\n"
"The following error policies exist:<br>\n"
"Stop the printer and keep the job for future printing.<br>\n"
-"Re-send the job from the beginning after waiting some time (30 seconds by defa"
-"ult).<br>\n"
+"Re-send the job from the beginning after waiting some time (30 seconds by "
+"default).<br>\n"
"Abort and delete the job and proceed with the next job.\n"
"</p>"
msgstr ""
@@ -2634,7 +2661,8 @@
#. to have him informed what goes on here and what he can do on his own.
#: src/include/printer/overview.rb:131
msgid ""
-"A locally running CUPS daemon is required, but it seems to be not accessible.\n"
+"A locally running CUPS daemon is required, but it seems to be not "
+"accessible.\n"
"Check with 'lpstat -h localhost -r' whether a local cupsd is accessible.\n"
"A non-accessible cupsd leads to an endless sequence of further failures.\n"
msgstr ""
@@ -2681,7 +2709,8 @@
#. so that it is now no longer a real client-only config and
#. therefore the Printerlib::client_* values must be determined anew:
#: src/include/printer/overview.rb:226 src/include/printer/overview.rb:237
-msgid "A non-accessible server leads to an endless sequence of delays and failures."
+msgid ""
+"A non-accessible server leads to an endless sequence of delays and failures."
msgstr ""
#. where %1 will be replaced by the CUPS server name.
@@ -2709,7 +2738,8 @@
#. Body of a Popup::AnyMessage when a remote queue was selected to be deleted:
#: src/include/printer/overview.rb:610
-msgid "This is a remote configuration. Only local configurations can be deleted."
+msgid ""
+"This is a remote configuration. Only local configurations can be deleted."
msgstr ""
#: src/include/printer/overview.rb:617
@@ -2719,8 +2749,8 @@
#. Body of a confirmation popup before a queue will be deleted:
#: src/include/printer/overview.rb:619
msgid ""
-"The selected configuration would be deleted immediately and cannot be restored"
-"."
+"The selected configuration would be deleted immediately and cannot be "
+"restored."
msgstr ""
#. 'Yes' button label of a confirmation popup before a queue will be deleted:
@@ -2777,8 +2807,8 @@
#. to assume that there are no pending jobs in the queue:
#: src/include/printer/overview.rb:731
msgid ""
-"There are pending print jobs which might be deleted before the testpage is pri"
-"nted."
+"There are pending print jobs which might be deleted before the testpage is "
+"printed."
msgstr ""
#. where %1 will be replaced by the queue name.
@@ -2911,7 +2941,8 @@
msgstr ""
#: src/include/printer/overview.rb:1051
-msgid "CUPS log information while processing the testpage for %1 (English only)"
+msgid ""
+"CUPS log information while processing the testpage for %1 (English only)"
msgstr ""
#. but the test_print_cups_error_log was effectively empty,
@@ -2923,8 +2954,8 @@
#. show a very generic info to the user to show at least something:
#: src/include/printer/overview.rb:1078
msgid ""
-"When printing via a remote system fails, you may ask an admin of the remote sy"
-"stem."
+"When printing via a remote system fails, you may ask an admin of the remote "
+"system."
msgstr ""
#. PopupYesNoHeadline body:
@@ -2938,7 +2969,8 @@
#. Body of a Popup::AnyMessage when a remote queue was selected to be modified:
#: src/include/printer/overview.rb:1164
-msgid "This is a remote configuration. Only local configurations can be modified."
+msgid ""
+"This is a remote configuration. Only local configurations can be modified."
msgstr ""
#. An entry for a ComboBox from which the user can select that the CUPS error policy
@@ -2995,8 +3027,8 @@
#. PopupYesNoHeadline body:
#: src/include/printer/policies.rb:139
msgid ""
-"A remote CUPS server setting conflicts with setting policies for the local sys"
-"tem."
+"A remote CUPS server setting conflicts with setting policies for the local "
+"system."
msgstr ""
#. where %1 will be replaced by the print queue name.
@@ -3234,8 +3266,8 @@
#. they are at least informend why there may be still remote queues:
#: src/include/printer/printingvianetwork.rb:727
msgid ""
-"When switching from 'accept printer announcements' to 'not accept announcement"
-"s'\n"
+"When switching from 'accept printer announcements' to 'not accept "
+"announcements'\n"
"or after 'request printer information from CUPS servers' was disabled\n"
"it takes usually 5 minutes until already received information faded away..."
msgstr ""
@@ -3315,15 +3347,16 @@
#. TextEntry to allow remote access to local print queues
#. for hosts and/or networks:
#: src/include/printer/sharing.rb:180
-msgid "Allow access from those IP addresses or &network/netmask (separated by space)"
+msgid ""
+"Allow access from those IP addresses or &network/netmask (separated by space)"
msgstr ""
#. TextEntry to publish local print queues
#. to IP addresses and/or network broadcast addresses:
#: src/include/printer/sharing.rb:192
msgid ""
-"Publish to these IP addresses or network &broadcast addresses (separated by sp"
-"ace)"
+"Publish to these IP addresses or network &broadcast addresses (separated by "
+"space)"
msgstr ""
#. A CheckBox label to publish local print queues by default
@@ -3380,8 +3413,8 @@
#. PopupYesNoHeadline body:
#: src/include/printer/sharing.rb:643
msgid ""
-"A remote CUPS server setting conflicts with sharing local printer configuratio"
-"ns."
+"A remote CUPS server setting conflicts with sharing local printer "
+"configurations."
msgstr ""
#. Only "Printing via Network" configuration of printer.
@@ -3705,8 +3738,8 @@
#: src/modules/Printer.rb:2389
msgid ""
"Launched hp-setup.\n"
-"You must finish hp-setup before you can proceed with the printer configuration"
-".\n"
+"You must finish hp-setup before you can proceed with the printer "
+"configuration.\n"
msgstr ""
#. from the BasicAdd dialog but the RPM package hplip is not installed:
@@ -3723,13 +3756,14 @@
#. Package::Available returns nil if no package source is available.
#: src/modules/Printerlib.rb:179
msgid ""
-"Required package %1 is not installed and there is no package repository availa"
-"ble."
+"Required package %1 is not installed and there is no package repository "
+"available."
msgstr ""
#. Message of a Popup::Error where %1 will be replaced by the package name:
#: src/modules/Printerlib.rb:194
-msgid "Required package %1 is not installed and not available in the repository."
+msgid ""
+"Required package %1 is not installed and not available in the repository."
msgstr ""
#. Only a simple message because:
Modified: branches/SLE12-SP5/yast/50-pot/product-creator.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/product-creator.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/product-creator.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-30 02:28+0000\n"
-"PO-Revision-Date: 2017-03-30 02:28+0000\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -782,7 +782,7 @@
#. busy message
#: src/include/product-creator/dialogs.rb:1300
#: src/include/product-creator/dialogs.rb:1525
-#: src/modules/ProductCreator.rb:295
+#: src/modules/ProductCreator.rb:297
msgid "Reading data from Package Database..."
msgstr ""
@@ -792,7 +792,7 @@
#: src/include/product-creator/kiwi_dialogs.rb:1477
#: src/include/product-creator/kiwi_dialogs.rb:1822
#: src/include/product-creator/kiwi_dialogs.rb:3131
-#: src/modules/ProductCreator.rb:300
+#: src/modules/ProductCreator.rb:302
msgid "Please wait..."
msgstr ""
@@ -1954,17 +1954,17 @@
msgstr ""
#. ProductCreator read dialog caption
-#: src/modules/ProductCreator.rb:457
+#: src/modules/ProductCreator.rb:459
msgid "Initializing Product Creator Configuration"
msgstr ""
#. translators: progress stage 1/1
-#: src/modules/ProductCreator.rb:471
+#: src/modules/ProductCreator.rb:473
msgid "Read the configuration"
msgstr ""
#. translators: progress step 1/1
-#: src/modules/ProductCreator.rb:475
+#: src/modules/ProductCreator.rb:477
msgid "Reading the database..."
msgstr ""
@@ -1972,49 +1972,49 @@
#. translators: progress finished
#. translators: progress finished
#. translators: progress finished
-#: src/modules/ProductCreator.rb:477 src/modules/ProductCreator.rb:504
-#: src/modules/ProductCreator.rb:557 src/modules/ProductCreator.rb:583
+#: src/modules/ProductCreator.rb:479 src/modules/ProductCreator.rb:506
+#: src/modules/ProductCreator.rb:559 src/modules/ProductCreator.rb:585
msgid "Finished"
msgstr ""
#. translators: error message
-#: src/modules/ProductCreator.rb:498
+#: src/modules/ProductCreator.rb:500
msgid "Cannot read the configuration."
msgstr ""
#. ProductCreator read dialog caption
-#: src/modules/ProductCreator.rb:537
+#: src/modules/ProductCreator.rb:539
msgid "Saving Product Creator Configuration"
msgstr ""
#. translators: progress stage 1/2
-#: src/modules/ProductCreator.rb:551
+#: src/modules/ProductCreator.rb:553
msgid "Write the settings"
msgstr ""
#. translators: progress step 1/1
-#: src/modules/ProductCreator.rb:555
+#: src/modules/ProductCreator.rb:557
msgid "Writing the settings..."
msgstr ""
#. translators: error message
-#: src/modules/ProductCreator.rb:577
+#: src/modules/ProductCreator.rb:579
msgid "Error while writing settings."
msgstr ""
#. translators: Configuration summary text for autoyast
-#: src/modules/ProductCreator.rb:610
+#: src/modules/ProductCreator.rb:612
msgid "Configuration summary ..."
msgstr ""
#. Create an overview table with all configured cards
#. @return table items
-#: src/modules/ProductCreator.rb:623
+#: src/modules/ProductCreator.rb:625
msgid "No Files"
msgstr ""
#. an error message, %1 is the directory, %2 is URL of the source
-#: src/modules/ProductCreator.rb:1003
+#: src/modules/ProductCreator.rb:1005
msgid ""
"Cannot read directory %1\n"
"from source %2."
@@ -2022,43 +2022,43 @@
#. the copy is not needed if the sourse will be signed with a gpg key
#. check if the metadata are gzipped
-#: src/modules/ProductCreator.rb:2089 src/modules/ProductCreator.rb:3691
+#: src/modules/ProductCreator.rb:2091 src/modules/ProductCreator.rb:3699
msgid "Error reading control file."
msgstr ""
#. workaround for bnc#498464
-#: src/modules/ProductCreator.rb:2698
+#: src/modules/ProductCreator.rb:2704
msgid ""
"Could not add GPG key %1 to initrd\n"
"%2.\n"
msgstr ""
#. yes/no popup: error message
-#: src/modules/ProductCreator.rb:2892
+#: src/modules/ProductCreator.rb:2898
msgid ""
"Error: Could not digitally sign the source.\n"
"Try again?\n"
msgstr ""
#. error message, %1 is list of URLs (one URL per line)
-#: src/modules/ProductCreator.rb:3002
+#: src/modules/ProductCreator.rb:3008
msgid ""
"These sources were not found:\n"
"%1"
msgstr ""
#. popup question, %1 is directory name
-#: src/modules/ProductCreator.rb:3254
+#: src/modules/ProductCreator.rb:3260
msgid "Remove the destination directory %1?"
msgstr ""
#. remove the destination
-#: src/modules/ProductCreator.rb:3279
+#: src/modules/ProductCreator.rb:3285
msgid "The destination %1 already exists."
msgstr ""
#. TODO ask in interactive mode
-#: src/modules/ProductCreator.rb:3288
+#: src/modules/ProductCreator.rb:3294
msgid ""
"Destination directory exists or is a file.\n"
"Remove directory %1?"
@@ -2066,29 +2066,29 @@
#. Check if selected packages are available
#. @return [String] error message
-#: src/modules/ProductCreator.rb:3309
+#: src/modules/ProductCreator.rb:3315
msgid "Checking for package availability..."
msgstr ""
#. add an empty map if the source doesn't exist
-#: src/modules/ProductCreator.rb:3368
+#: src/modules/ProductCreator.rb:3374
msgid "%1 package not available."
msgstr ""
#. change the label
#. copy the packages
-#: src/modules/ProductCreator.rb:3424 src/modules/ProductCreator.rb:3563
+#: src/modules/ProductCreator.rb:3430 src/modules/ProductCreator.rb:3571
msgid "Copying %1"
msgstr ""
#. string dir = basedir + product_map[source]:"/" + datadir + "/" + package["arch"]:"";
-#: src/modules/ProductCreator.rb:3599
+#: src/modules/ProductCreator.rb:3607
msgid ""
"Cannot download package %1\n"
" from source %2.\n"
msgstr ""
-#: src/modules/ProductCreator.rb:3616
+#: src/modules/ProductCreator.rb:3624
msgid ""
"Error while copying packages. \n"
"\t\t Check the created directory for possible hints."
Modified: branches/SLE12-SP5/yast/50-pot/proxy.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/proxy.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/proxy.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:29+0200\n"
-"PO-Revision-Date: 2016-08-30 18:29+0200\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -91,10 +91,10 @@
#: src/include/proxy/dialogs.rb:405
msgid ""
"<p>Configure your Internet proxy (caching) settings here.</p>\n"
-"<p><b>Note:</b> It is generally recommended to relogin for the settings to tak"
-"e effect, \n"
-"however in some cases the application may pick up new settings immediately. Pl"
-"ease check \n"
+"<p><b>Note:</b> It is generally recommended to relogin for the settings to "
+"take effect, \n"
+"however in some cases the application may pick up new settings immediately. "
+"Please check \n"
"what your application (web browser, ftp client,...) supports. </p>"
msgstr ""
@@ -108,8 +108,8 @@
#. Proxy dialog help 3/8
#: src/include/proxy/dialogs.rb:416
msgid ""
-"<p><b>HTTPS Proxy URL</b> is the name of the proxy server for your secured acc"
-"ess\n"
+"<p><b>HTTPS Proxy URL</b> is the name of the proxy server for your secured "
+"access\n"
"to the World Wide Web (WWW).</p>\n"
msgstr ""
@@ -146,7 +146,8 @@
msgid ""
"<p>If you are using a proxy server with authorization, enter\n"
"the <b>Proxy User Name</b> and <b>Proxy Password</b>. A valid username\n"
-"consists of printable ASCII characters only (except for quotation marks).</p>\n"
+"consists of printable ASCII characters only (except for quotation marks).</"
+"p>\n"
msgstr ""
#. Proxy dialog help 8/8
@@ -359,51 +360,51 @@
msgstr ""
#. Popup headline
-#: src/modules/Proxy.rb:38
+#: src/modules/Proxy.rb:60
msgid "Proxy Configuration Successfully Saved"
msgstr ""
-#: src/modules/Proxy.rb:39
+#: src/modules/Proxy.rb:61
msgid "It is recommended to relogin to make new proxy settings effective."
msgstr ""
#. Write proxy settings and apply changes
#. @return true if success
-#: src/modules/Proxy.rb:174
+#: src/modules/Proxy.rb:195
msgid "Update proxy configuration"
msgstr ""
-#: src/modules/Proxy.rb:176
+#: src/modules/Proxy.rb:197
msgid "Saving Proxy Configuration"
msgstr ""
#. sleep for longer time, so that progress does not disappear right afterwards
#. but only when Progress is visible
-#: src/modules/Proxy.rb:184
+#: src/modules/Proxy.rb:205
msgid "Updating proxy configuration..."
msgstr ""
#. Summary text
-#: src/modules/Proxy.rb:418
+#: src/modules/Proxy.rb:439
msgid "Proxy is disabled."
msgstr ""
#. Summary text
-#: src/modules/Proxy.rb:423
+#: src/modules/Proxy.rb:444
msgid "Proxy is enabled."
msgstr ""
#. Summary text
-#: src/modules/Proxy.rb:432
+#: src/modules/Proxy.rb:453
msgid "HTTP Proxy: %1"
msgstr ""
#. Summary text
-#: src/modules/Proxy.rb:440
+#: src/modules/Proxy.rb:461
msgid "HTTPS Proxy: %1"
msgstr ""
#. Summary text
-#: src/modules/Proxy.rb:447
+#: src/modules/Proxy.rb:468
msgid "FTP Proxy: %1"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/qt.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/qt.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/qt.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -49,8 +49,8 @@
msgstr ""
#. Close button for wizard help window
-#: src/QY2HelpDialog.cc:66 src/QY2HelpDialog.cc:113
-#: src/QY2RelNotesDialog.cc:86 src/QY2RelNotesDialog.cc:134
+#: src/QY2HelpDialog.cc:66 src/QY2HelpDialog.cc:113 src/QY2RelNotesDialog.cc:86
+#: src/QY2RelNotesDialog.cc:134
msgid "&Close"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/rdp.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/rdp.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/rdp.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:29+0200\n"
-"PO-Revision-Date: 2016-08-30 18:29+0200\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -75,9 +75,9 @@
#: src/include/rdp/dialogs.rb:40
msgid ""
"<p><b><big>Remote Administration via RDP</big></b></p>\n"
-"<p>Remote Desktop Protocol (RDP) is a secure remote administration protocol ru"
-"nning on TCP port 3389.</p><p>If the feature is enabled, you will be able to l"
-"ogin to this computer\n"
+"<p>Remote Desktop Protocol (RDP) is a secure remote administration protocol "
+"running on TCP port 3389.</p><p>If the feature is enabled, you will be able "
+"to login to this computer\n"
"remotely via an RDP client such as Windows Remote Desktop Viewer.\n"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/rear.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/rear.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/rear.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-09 02:30+0000\n"
-"PO-Revision-Date: 2017-02-09 02:30+0000\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
Modified: branches/SLE12-SP5/yast/50-pot/registration.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/registration.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/registration.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-19 02:29+0000\n"
-"PO-Revision-Date: 2017-05-19 02:29+0000\n"
+"POT-Creation-Date: 2019-09-20 15:57+0200\n"
+"PO-Revision-Date: 2019-09-20 15:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -33,7 +33,7 @@
#. dialog title
#. display and run a dialog for updating the current registration
#. @return [Symbol] user input
-#: src/clients/inst_scc.rb:183
+#: src/clients/inst_scc.rb:181
#: 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:317
@@ -44,13 +44,13 @@
#. Command line help text for the repository module, %1 is "SUSEconnect"
#. Command line help text for the repository module, %1 is "SUSEconnect"
-#: src/clients/registration.rb:68 src/clients/scc.rb:68
+#: src/clients/registration.rb:74 src/clients/scc.rb:74
msgid "Use '%s' instead of this YaST module."
msgstr ""
#. TRANSLATORS: Error message in RichText format, %s contains the details from libzypp
#. TRANSLATORS: Error message in RichText format, %s contains the details from libzypp
-#: src/clients/registration.rb:79 src/clients/scc.rb:79
+#: src/clients/registration.rb:85 src/clients/scc.rb:85
msgid ""
"<p>The repository initialization failed. Disable (or remove) the offending "
"service or repository in the repository manager.</p><p>Details:</p><p>%s</p>"
@@ -229,61 +229,42 @@
"the connection is reliable."
msgstr ""
-#. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:91
-msgid "Check that this system is known to the registration server."
-msgstr ""
-
-#. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:97
-msgid ""
-"If you are upgrading from SLE11 make sure the SCC server\n"
-"knows the old NCC registration. Synchronization from NCC to SCC\n"
-"might take very long time.\n"
-"\n"
-"If the SLE11 system was installed recently you could log into\n"
-"%s to speed up the synchronization process.\n"
-"Just wait several minutes after logging in and then retry \n"
-"the upgrade again."
-msgstr ""
-
-#. add the hint to the error details
#. update the message when an old SMT server is found
#. Error popup
#. update the message when an old SMT server is found
-#: src/lib/registration/connect_helpers.rb:111
-#: src/lib/registration/connect_helpers.rb:116
-#: src/lib/registration/connect_helpers.rb:119
-#: src/lib/registration/connect_helpers.rb:126
-#: src/lib/registration/connect_helpers.rb:177
-#: src/lib/registration/connect_helpers.rb:181
+#: src/lib/registration/connect_helpers.rb:91
+#: src/lib/registration/connect_helpers.rb:95
+#: src/lib/registration/connect_helpers.rb:98
+#: src/lib/registration/connect_helpers.rb:105
+#: src/lib/registration/connect_helpers.rb:157
+#: src/lib/registration/connect_helpers.rb:161
msgid "Connection to registration server failed."
msgstr ""
-#: src/lib/registration/connect_helpers.rb:121
+#: src/lib/registration/connect_helpers.rb:100
msgid "Registration client error."
msgstr ""
-#: src/lib/registration/connect_helpers.rb:123
+#: src/lib/registration/connect_helpers.rb:102
msgid ""
"Registration server error.\n"
"Retry the operation later."
msgstr ""
#. error message
-#: src/lib/registration/connect_helpers.rb:165
+#: src/lib/registration/connect_helpers.rb:144
msgid "Received SSL Certificate does not match the expected certificate."
msgstr ""
#. %s are error details
-#: src/lib/registration/connect_helpers.rb:198
+#: src/lib/registration/connect_helpers.rb:176
msgid "Details: %s"
msgstr ""
#. TRANSLATORS: multiline error message - a SSL certificate has been
#. imported but the registration server still cannot be accessed securely,
#. user has to solve the certificate issue manually.
-#: src/lib/registration/connect_helpers.rb:227
+#: src/lib/registration/connect_helpers.rb:205
msgid ""
"A certificate has been already imported\n"
"but the server connection still cannot be trusted.\n"
@@ -293,22 +274,22 @@
msgstr ""
#. progress label
-#: src/lib/registration/connect_helpers.rb:239
+#: src/lib/registration/connect_helpers.rb:217
msgid "Importing the SSL certificate"
msgstr ""
-#: src/lib/registration/connect_helpers.rb:240
+#: src/lib/registration/connect_helpers.rb:218
msgid "Importing '%s' certificate..."
msgstr ""
#. workaround after string freeze
-#: src/lib/registration/connect_helpers.rb:264
+#: src/lib/registration/connect_helpers.rb:242
msgid "Secure connection error: %s"
msgstr ""
#. TRANSLATORS: error message, %s is a server URL,
#. e.g. https://smt.example.com
-#: src/lib/registration/connect_helpers.rb:283
+#: src/lib/registration/connect_helpers.rb:264
msgid ""
"An old registration server was detected at\n"
"%s.\n"
@@ -318,22 +299,40 @@
#. 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/connect_helpers.rb:276
#: src/lib/registration/ui/base_system_registration_dialog.rb:537
msgid "Invalid URL."
msgstr ""
#. Error popup
-#: src/lib/registration/connect_helpers.rb:299
+#: src/lib/registration/connect_helpers.rb:280
msgid ""
"Network is not configured, the registration server cannot be reached.\n"
"Do you want to configure the network now?"
msgstr ""
-#: src/lib/registration/connect_helpers.rb:306
+#: src/lib/registration/connect_helpers.rb:287
msgid "Network error, check the network configuration."
msgstr ""
+#. TRANSLATORS: additional hint for an error message
+#: src/lib/registration/connect_helpers.rb:297
+msgid "Check that this system is known to the registration server."
+msgstr ""
+
+#. TRANSLATORS: additional hint for an error message
+#: src/lib/registration/connect_helpers.rb:303
+msgid ""
+"If you are upgrading from SLE11 make sure the SCC server\n"
+"knows the old NCC registration. Synchronization from NCC to SCC\n"
+"might take very long time.\n"
+"\n"
+"If the SLE11 system was installed recently you could log into\n"
+"%s to speed up the synchronization process.\n"
+"Just wait several minutes after logging in and then retry \n"
+"the upgrade again."
+msgstr ""
+
#. progress step title
#: src/lib/registration/finish_dialog.rb:35
msgid "Storing Registration Configuration..."
@@ -451,7 +450,7 @@
#. TRANSLATORS: error popup, %s is a repository name, the popup is displayed
#. when a migration repository cannot be accessed, there are [Skip]
#. and [Abort] buttons displayed below the question
-#: src/lib/registration/sw_mgmt.rb:99
+#: src/lib/registration/sw_mgmt.rb:102
msgid ""
"Repository '%s'\n"
"cannot be loaded.\n"
@@ -462,39 +461,39 @@
#. create UI label for a base product
#. @param base_product [Hash] Product (hash from pkg-bindings)
#. @return [String] UI Label
-#: src/lib/registration/sw_mgmt.rb:175
+#: src/lib/registration/sw_mgmt.rb:178
msgid "Unknown product"
msgstr ""
#. error message
#. error message
-#: src/lib/registration/sw_mgmt.rb:202 src/lib/registration/sw_mgmt.rb:275
+#: src/lib/registration/sw_mgmt.rb:205 src/lib/registration/sw_mgmt.rb:278
msgid "Saving repository configuration failed."
msgstr ""
#. # error message
#. error message
-#: src/lib/registration/sw_mgmt.rb:238 src/lib/registration/sw_mgmt.rb:249
+#: src/lib/registration/sw_mgmt.rb:241 src/lib/registration/sw_mgmt.rb:252
msgid "Updating service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:244
+#: src/lib/registration/sw_mgmt.rb:247
msgid "Adding service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:256
+#: src/lib/registration/sw_mgmt.rb:259
msgid "Saving service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:262
+#: src/lib/registration/sw_mgmt.rb:265
msgid "Refreshing service '%s' failed."
msgstr ""
#. TRANSLATORS: %s is a product name
-#: src/lib/registration/sw_mgmt.rb:474
+#: src/lib/registration/sw_mgmt.rb:477
msgid ""
"Cannot find remote product %s.\n"
"The product cannot be registered."
@@ -507,23 +506,23 @@
msgstr ""
#. dialog title
-#: src/lib/registration/ui/addon_eula_dialog.rb:43
+#: src/lib/registration/ui/addon_eula_dialog.rb:44
msgid "License Agreement"
msgstr ""
-#: src/lib/registration/ui/addon_eula_dialog.rb:44
+#: src/lib/registration/ui/addon_eula_dialog.rb:45
msgid "Downloading Licenses..."
msgstr ""
#. download the addon EULAs to a temp dir
#. @param [Addon] addon the addon
#. @param [String] tmpdir target where to download the files
-#: src/lib/registration/ui/addon_eula_dialog.rb:75
+#: src/lib/registration/ui/addon_eula_dialog.rb:71
msgid "Downloading License Agreement..."
msgstr ""
#. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit"
-#: src/lib/registration/ui/addon_eula_dialog.rb:88
+#: src/lib/registration/ui/addon_eula_dialog.rb:84
msgid ""
"Downloading the license for\n"
"%s\n"
@@ -531,7 +530,7 @@
msgstr ""
#. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit"
-#: src/lib/registration/ui/addon_eula_dialog.rb:102
+#: src/lib/registration/ui/addon_eula_dialog.rb:98
msgid "%s License Agreement"
msgstr ""
@@ -824,6 +823,13 @@
msgid "Net&work Configuration..."
msgstr ""
+#. TRANSLATORS: error message, the entered registration code is not valid.
+#: src/lib/registration/ui/base_system_registration_dialog.rb:548
+msgid ""
+"Invalid registration code.\n"
+"CRLF characters are not allowed."
+msgstr ""
+
#. SSL error message
#: src/lib/registration/ui/import_certificate_dialog.rb:23
msgid "Certificate has expired"
@@ -1077,21 +1083,21 @@
msgstr ""
#. FIXME: Maybe we could remove this option and just warn the user
-#: src/lib/registration/ui/not_installed_products_dialog.rb:85
+#: src/lib/registration/ui/not_installed_products_dialog.rb:88
msgid "Ins&tall products"
msgstr ""
-#: src/lib/registration/ui/not_installed_products_dialog.rb:86
+#: src/lib/registration/ui/not_installed_products_dialog.rb:89
msgid "&Deactivate"
msgstr ""
-#: src/lib/registration/ui/not_installed_products_dialog.rb:87
+#: src/lib/registration/ui/not_installed_products_dialog.rb:90
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
+#: src/lib/registration/ui/not_installed_products_dialog.rb:105
msgid ""
"These addons were not installed:\n"
"\n"
@@ -1100,13 +1106,13 @@
#. TRANSLATORS: A RichText warning about all the products registered but
#. not installed. (1/2)
-#: src/lib/registration/ui/not_installed_products_dialog.rb:153
+#: src/lib/registration/ui/not_installed_products_dialog.rb:156
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
+#: src/lib/registration/ui/not_installed_products_dialog.rb:162
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>"
@@ -1183,11 +1189,11 @@
msgstr ""
#. @return [Array<Yast::SlpServiceClass::Service>]
-#: src/lib/registration/url_helpers.rb:220
+#: src/lib/registration/url_helpers.rb:225
msgid "Searching..."
msgstr ""
-#: src/lib/registration/url_helpers.rb:220
+#: src/lib/registration/url_helpers.rb:225
msgid "Looking up local registration servers..."
msgstr ""
@@ -1227,26 +1233,3 @@
"The SMT Server URL must use http or https protocol, other schemes are not "
"supported.</p>\n"
msgstr ""
-
-#. Constructor
-#.
-#. @param services [Array<SlpServiceClass::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 ""
-
-#: src/lib/slp/dialogs/service_selection.rb:79
-msgid "Select a detected service from the list."
-msgstr ""
-
-#: src/lib/slp/dialogs/service_selection.rb:80
-msgid "No service was selected."
-msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/reipl.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/reipl.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/reipl.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-11 02:29+0000\n"
-"PO-Revision-Date: 2017-04-11 02:29+0000\n"
+"POT-Creation-Date: 2019-09-20 15:58+0200\n"
+"PO-Revision-Date: 2019-09-20 15:58+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
Modified: branches/SLE12-SP5/yast/50-pot/relocation-server.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/relocation-server.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/relocation-server.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:31+0200\n"
-"PO-Revision-Date: 2016-08-30 18:31+0200\n"
+"POT-Creation-Date: 2019-09-20 15:59+0200\n"
+"PO-Revision-Date: 2019-09-20 15:59+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -216,10 +216,11 @@
"<p><b>Relocation Address</b><br>\n"
"Address xend should listen on for relocation-socket connections</p>\n"
"<p><b>Allowed Hosts</b><br>\n"
-"The hosts allowed to talk to the relocation port. If this is empty, then all c"
-"onnections are allowed. Otherwise, this should be a space-separated sequence o"
-"f regular expressions. Any host with a fully-qualified domain name or an IP ad"
-"dress that matches one of these regular expressions will be accepted.</p>\n"
+"The hosts allowed to talk to the relocation port. If this is empty, then all "
+"connections are allowed. Otherwise, this should be a space-separated "
+"sequence of regular expressions. Any host with a fully-qualified domain name "
+"or an IP address that matches one of these regular expressions will be "
+"accepted.</p>\n"
"<p><b>SSL Key File/SSL Cert File</b><br>\n"
"SSL key and certificate to use for the ssl relocation interface</p>"
msgstr ""
@@ -227,13 +228,13 @@
#: src/include/relocation-server/helps.rb:62
msgid ""
"<p><b><big>Tunneled migration</big></b><br>\n"
-"The source host libvirtd opens a direct connection to the destination host lib"
-"virtd for sending migration data. This allows the option of encrypting the dat"
-"a stream.</p>\n"
+"The source host libvirtd opens a direct connection to the destination host "
+"libvirtd for sending migration data. This allows the option of encrypting "
+"the data stream.</p>\n"
"<p><b><big>Plain migration</big></b><br>\n"
-"The source host VM opens a direct unencrypted TCP connection to the destinatio"
-"n host for sending the migration data. Unless a port is manually specified, li"
-"bvirt will choose a migration port in the default range.</p>"
+"The source host VM opens a direct unencrypted TCP connection to the "
+"destination host for sending the migration data. Unless a port is manually "
+"specified, libvirt will choose a migration port in the default range.</p>"
msgstr ""
#. Main workflow of the relocation-server configuration
Modified: branches/SLE12-SP5/yast/50-pot/s390.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/s390.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/s390.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-16 19:52+0200\n"
-"PO-Revision-Date: 2017-05-16 19:52+0200\n"
+"POT-Creation-Date: 2019-09-20 15:58+0200\n"
+"PO-Revision-Date: 2019-09-20 15:58+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -383,8 +383,8 @@
#. Disk selection dialog help 3/4
#: src/include/s390/dasd/helps.rb:81
msgid ""
-"<p>To perform actions on multiple disks at once, mark these disks. To select a"
-"ll displayed disk (possibly after applying a filter), click\n"
+"<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"
msgstr ""
@@ -412,8 +412,7 @@
#. Disk add help 3/3
#: src/include/s390/dasd/helps.rb:102
-msgid ""
-"<p>To use DIAG mode, select <b>Use DIAG</b>.</p>\n"
+msgid "<p>To use DIAG mode, select <b>Use DIAG</b>.</p>\n"
msgstr ""
#. Initialization dialog caption
@@ -437,28 +436,29 @@
#. Dump dialog help 2/8
#: src/include/s390/dump/ui.rb:54
msgid ""
-"<p>Supported devices are ECKD DASD and ZFCP disks, while multi-volumes are lim"
-"ited to DASD.<br>"
+"<p>Supported devices are ECKD DASD and ZFCP disks, while multi-volumes are "
+"limited to DASD.<br>"
msgstr ""
#. Dump dialog help 3/8
#: src/include/s390/dump/ui.rb:58
msgid ""
"Only whole disks can be used, no partitions. If the device is incompatibly\n"
-"formatted or partitioned, activate the checkbox <b>Force overwrite of disk</b>"
-".</p>"
+"formatted or partitioned, activate the checkbox <b>Force overwrite of disk</"
+"b>.</p>"
msgstr ""
#. Dump dialog help 4/8
#: src/include/s390/dump/ui.rb:63
msgid ""
-"<p>To use DASD and ZFCP devices activate them in the respective YaST DASD or Z"
-"FCP dialog.<br>"
+"<p>To use DASD and ZFCP devices activate them in the respective YaST DASD or "
+"ZFCP dialog.<br>"
msgstr ""
#. Dump dialog help 5/8
#: src/include/s390/dump/ui.rb:67
-msgid "Devices which are in use or have mounted partitions will not be shown.</p>"
+msgid ""
+"Devices which are in use or have mounted partitions will not be shown.</p>"
msgstr ""
#. Dump dialog help 6/8
@@ -488,19 +488,19 @@
msgstr ""
#. prevent leading space
-#: src/include/s390/dump/ui.rb:186
+#: src/include/s390/dump/ui.rb:183
msgid "You haven't selected any device."
msgstr ""
#. warn only in case of force
-#: src/include/s390/dump/ui.rb:191
+#: src/include/s390/dump/ui.rb:188
msgid ""
-"The disk %1 will be formatted as a dump device. All data on this device will b"
-"e lost! Continue?"
+"The disk %1 will be formatted as a dump device. All data on this device will "
+"be lost! Continue?"
msgstr ""
#. don't quit in case of failures, error messages are reported by FormatDisk()
-#: src/include/s390/dump/ui.rb:203
+#: src/include/s390/dump/ui.rb:200
msgid "Operation successful. Initialize another dump device?"
msgstr ""
@@ -522,16 +522,16 @@
#: 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>"
+"<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 ""
#. TS-Shell dialog help 2/5
#: src/include/s390/iucvterminal-server/helps.rb:52
msgid ""
-"<p>Each allowed z/VM ID can be selected manually under <b>Selection</b>, defin"
-"ed by a <b>Regex</b> or loaded from a <b>File</b> which contains all allowed z"
-"/VM IDs separated by line breaks.</p>"
+"<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 ""
#. TS-Shell dialog help 3/5
@@ -544,15 +544,16 @@
#. TS-Shell dialog help 4/5
#: 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"
+"<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>"
msgstr ""
#. TS-Shell dialog help 5/5
#: 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>"
+"<p>With <b>Audited IDs</b> specify the z/VM IDs from which transcripts "
+"should be gathered.</p>"
msgstr ""
#. TS-Shell User creation dialog help 1/3
@@ -562,17 +563,17 @@
#: 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>"
+"<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>"
msgstr ""
#. TS-Shell User creation dialog help 2/3
#: src/include/s390/iucvterminal-server/helps.rb:81
msgid ""
-"<p>To ensure that the user changes his password after the first login, activat"
-"e <b>Force Password Change</b>.</p>"
+"<p>To ensure that the user changes his password after the first login, "
+"activate <b>Force Password Change</b>.</p>"
msgstr ""
#. TS-Shell User creation dialog help 3/3
@@ -597,8 +598,8 @@
#: 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 Desele"
-"ct</b>. The current status is shown in the column <b>TS-Auth</b>.</p>"
+"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>"
msgstr ""
#. TS-Shell Managing Groups dialog help 3/5
@@ -611,10 +612,10 @@
#. TS-Shell Managing Groups dialog help 4/5
#: 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> in"
-"put field and confirming with <b>Create</b>.\n"
-"\t<br>To delete previously created groups the <b>YaST users</b> dialog has to b"
-"e used.</p>"
+"<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>"
msgstr ""
#. TS-Shell Managing Groups dialog help 5/5
@@ -629,16 +630,16 @@
#: 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."
+"<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 ""
#. IUCVConn on Login dialog help 2/2
#: 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 jus"
-"t confirming the changes with <b>Ok</b> while <b>IUCVConn on Login</b> is enab"
-"led. </p>"
+"<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 ""
#. Text approval
@@ -876,11 +877,13 @@
msgstr ""
#: src/include/s390/iucvterminal-server/ui.rb:1012
-msgid "Wrong z/VM ID \"%1\" in line %2, numbers at the beginning are not allowed."
+msgid ""
+"Wrong z/VM ID \"%1\" in line %2, numbers at the beginning are not allowed."
msgstr ""
#: src/include/s390/iucvterminal-server/ui.rb:1024
-msgid "Wrong z/VM ID \"%1\" in line %2, more than eight characters are not allowed."
+msgid ""
+"Wrong z/VM ID \"%1\" in line %2, more than eight characters are not allowed."
msgstr ""
#. only the last entry is allowed to be empty
@@ -914,8 +917,8 @@
#. @return true for valid inputs
#: src/include/s390/iucvterminal/ui.rb:55
msgid ""
-"Wrong input, only lower case letters, numbers and for separation commas are al"
-"lowed."
+"Wrong input, only lower case letters, numbers and for separation commas are "
+"allowed."
msgstr ""
#: src/include/s390/iucvterminal/ui.rb:60
@@ -948,17 +951,18 @@
#. IUCVTerminal dialog help 3/11
#: src/include/s390/iucvterminal/ui.rb:125
msgid ""
-"<p>Several <b>IUCVtty instances</b> can run to provide multiple terminal devic"
-"es. The instances are distinguished by a terminal ID, which is a combination o"
-"f the <b>Terminal ID Prefix</b> and the number of the instance.<br>"
+"<p>Several <b>IUCVtty instances</b> can run to provide multiple terminal "
+"devices. The instances are distinguished by a terminal ID, which is a "
+"combination of the <b>Terminal ID Prefix</b> and the number of the instance."
+"<br>"
msgstr ""
#. IUCVTerminal dialog help 4/11
#: src/include/s390/iucvterminal/ui.rb:131
msgid ""
-"For example, if you define ten instances with the prefix "<i>lxterm</i>&q"
-"uot;, the terminal IDs from <i>lxterm0</i> to <i>lxterm9</i> are available.</p"
-">"
+"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 ""
#. IUCVTerminal dialog help 5/11
@@ -969,45 +973,46 @@
#. IUCVTerminal dialog help 6/11
#: 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 p"
-"rograms.</p>"
+"<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 ""
#. IUCVTerminal dialog help 7/11
#: src/include/s390/iucvterminal/ui.rb:143
msgid ""
-"<p>With <b>restrict access</b>, allow only connections from certain <b>termina"
-"l servers</b>.</p>"
+"<p>With <b>restrict access</b>, allow only connections from certain "
+"<b>terminal servers</b>.</p>"
msgstr ""
#. IUCVTerminal dialog help 8/11
#: src/include/s390/iucvterminal/ui.rb:147
msgid ""
-"<p>Define the emulation for all instances at once or for each one separately.<"
-"/p>"
+"<p>Define the emulation for all instances at once or for each one separately."
+"</p>"
msgstr ""
#. IUCVTerminal dialog help 9/11
#: src/include/s390/iucvterminal/ui.rb:151
msgid ""
-"<p>Activate <b>route kernel messages to hvc0</b> to route kernel messages to\n"
+"<p>Activate <b>route kernel messages to hvc0</b> to route kernel messages "
+"to\n"
"the hvc0 device instead of ttyS0.<br>"
msgstr ""
#. IUCVTerminal dialog help 10/11
#: 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 m"
-"odule</b>.</p>"
+"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 ""
#. IUCVTerminal dialog help 11/11
#: 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>"
+"<h3>Warning: HVC Terminals stay logged on without a manual logout through "
+"the shortcut: ctrl _ d</h3>"
msgstr ""
#. Dialog content
@@ -1075,14 +1080,15 @@
#. OnPanic dialog help 1/11
#: src/include/s390/onpanic/ui.rb:111
-msgid "<p><b>Configure the actions to be taken if a kernel panic occurs</b></p>"
+msgid ""
+"<p><b>Configure the actions to be taken if a kernel panic occurs</b></p>"
msgstr ""
#. OnPanic dialog help 2/11
#: src/include/s390/onpanic/ui.rb:115
msgid ""
-"<p>The <b>Dumpconf</b> daemon needs to be enabled to influence the behavior du"
-"ring kernel panics.</p>"
+"<p>The <b>Dumpconf</b> daemon needs to be enabled to influence the behavior "
+"during kernel panics.</p>"
msgstr ""
#. OnPanic dialog help 3/11
@@ -1108,7 +1114,8 @@
#. OnPanic dialog help 7/11
#: src/include/s390/onpanic/ui.rb:128
msgid ""
-"<b>dump_reipl</b> Dump Linux and reboot system. This option is only available\n"
+"<b>dump_reipl</b> Dump Linux and reboot system. This option is only "
+"available\n"
"on LPAR with z9(r) machines and later and on z/VMversion 5.3 and later.<br>"
msgstr ""
@@ -1120,24 +1127,25 @@
#. OnPanic dialog help 9/11
#: src/include/s390/onpanic/ui.rb:135
msgid ""
-"<p>The time defined in <b>Delay Minutes</b> defers activating the specified pa"
-"nic 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>"
+"<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 ""
#. OnPanic dialog help 10/11
#: 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> dial"
-"og.</p>"
+"<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 ""
#. OnPanic dialog help 11/11
#: src/include/s390/onpanic/ui.rb:147
msgid ""
-"<p>With <b>VMCMD</b> specify CP commands to be executed before the Linux syste"
-"m is stopped. Only %1 lines and a total of %2 chars are allowed.</p>"
+"<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 ""
#. radio button label
@@ -1230,7 +1238,7 @@
#: 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_"
+"If no WWPN and no LUN have been defined the system is trying to use auto LUN "
"scan."
msgstr ""
@@ -1280,11 +1288,11 @@
#. Disk selection dialog Warning
#. Disk selection dialog Warning
-#: src/include/s390/zfcp/helps.rb:65 src/include/s390/zfcp/helps.rb:90
+#: src/include/s390/zfcp/helps.rb:65 src/include/s390/zfcp/helps.rb:91
msgid "<h1>Warning</h1>"
msgstr ""
-#: src/include/s390/zfcp/helps.rb:66 src/include/s390/zfcp/helps.rb:91
+#: src/include/s390/zfcp/helps.rb:66 src/include/s390/zfcp/helps.rb:92
msgid ""
"<p>When accessing a ZFCP device\n"
"<b>READ</b>/<b>WRITE</b>, make sure that this access is exclusive.\n"
@@ -1303,17 +1311,18 @@
#. Disk add help 2/2, This is HTML, so finally "<devno>" is displayed as "<devno>"
#: src/include/s390/zfcp/helps.rb:79
msgid ""
-"<p>The <b>Channel ID</b> must be entered with lowercase letters in a sysfs con"
-"forming\n"
+"<p>The <b>Channel ID</b> must be entered with lowercase letters in a sysfs "
+"conforming\n"
"format 0.0.<devno>, such as <tt>0.0.5c51</tt>.</p>\n"
-"<p>The WWPN must be entered with lowercase letters as a 16-digit hex value, su"
-"ch as\n"
+"<p>The WWPN must be entered with lowercase letters as a 16-digit hex value, "
+"such as\n"
"<tt>0x5005076300c40e5a</tt>.</p>\n"
-"<p>The LUN must be entered with lowercase letters as a 16-digit hex value with"
-"\n"
-"all trailing zeros, such as <tt>0x52ca000000000000</tt>.</p><p>If no WWPN <b>a"
-"nd</b> no LUN have been defined the system is trying to use allow_lun_scan.</p"
-">"
+"<p>The LUN must be entered with lowercase letters as a 16-digit hex value "
+"with\n"
+"all trailing zeros, such as <tt>0x52ca000000000000</tt>.</p><p>If no WWPN "
+"<b>and</b> no LUN have been defined the system is trying to use auto LUN "
+"scan. Auto LUN scan can be turned off using the kernel parameter "
+"<tt>allow_lun_scan=0</tt>.</p>"
msgstr ""
#. popup label
@@ -1340,7 +1349,7 @@
#. error report, %1 is device identification
#. error report, %1 is device identification
#. error report, %1 is device identification
-#: src/modules/DASDController.rb:446 src/modules/ZFCPController.rb:422
+#: src/modules/DASDController.rb:448 src/modules/ZFCPController.rb:422
#: src/modules/ZFCPController.rb:515
msgid "%1: sysfs not mounted."
msgstr ""
@@ -1348,65 +1357,65 @@
#. error report, %1 is device identification
#. error report, %1 is device identification
#. error report, %1 is device identification
-#: src/modules/DASDController.rb:454 src/modules/ZFCPController.rb:430
+#: src/modules/DASDController.rb:456 src/modules/ZFCPController.rb:430
#: src/modules/ZFCPController.rb:523
msgid "%1: Invalid status for <online>."
msgstr ""
#. error report, %1 is device identification
#. error report, %1 is device identification
-#: src/modules/DASDController.rb:462 src/modules/ZFCPController.rb:438
+#: src/modules/DASDController.rb:464 src/modules/ZFCPController.rb:438
msgid "%1: No device found for <ccwid>."
msgstr ""
#. error report, %1 is device identification
-#: src/modules/DASDController.rb:470
+#: src/modules/DASDController.rb:472
msgid "%1: Could not change state of the device."
msgstr ""
#. error report, %1 is device identification
-#: src/modules/DASDController.rb:479
+#: src/modules/DASDController.rb:481
msgid "%1: Device is not a DASD."
msgstr ""
#. error report, %1 is device identification
-#: src/modules/DASDController.rb:488
+#: src/modules/DASDController.rb:490
msgid "%1: Could not load module."
msgstr ""
#. error report, %1 is device identification
-#: src/modules/DASDController.rb:497
+#: src/modules/DASDController.rb:499
msgid "%1: Failed to activate DASD."
msgstr ""
#. error report, %1 is device identification
-#: src/modules/DASDController.rb:506
+#: src/modules/DASDController.rb:508
msgid "%1: DASD is not formatted."
msgstr ""
#. 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:514 src/modules/ZFCPController.rb:494
+#: src/modules/DASDController.rb:516 src/modules/ZFCPController.rb:494
#: src/modules/ZFCPController.rb:571
msgid "%1: Unknown error %2."
msgstr ""
#. progress bar
-#: src/modules/DASDController.rb:622
+#: src/modules/DASDController.rb:634
msgid "Formatting %1:"
msgstr ""
#. error report, %1 is exit code of the command (integer)
#. error report, %1 is exit code of the command (integer)
-#: src/modules/DASDController.rb:651 src/modules/DASDController.rb:747
+#: src/modules/DASDController.rb:663 src/modules/DASDController.rb:759
msgid "Disks formatting failed. Exit code: %1."
msgstr ""
#. progress bar, %1 is device name, %2 and %3
#. integers,
#. eg. Formatting /dev/dasda: cylinder 123 of 12334 done
-#: src/modules/DASDController.rb:718
+#: src/modules/DASDController.rb:730
msgid "Formatting %1: cylinder %2 of %3 done"
msgstr ""
@@ -1756,6 +1765,6 @@
msgstr ""
#. message, %1 is device identification
-#: src/modules/ZFCPController.rb:563
-msgid "%1: This host adapter supports allow_lun_scan."
+#: src/modules/ZFCPController.rb:562
+msgid "%1: This host adapter supports auto LUN scan."
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/samba-client.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/samba-client.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/samba-client.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-18 10:46+0200\n"
-"PO-Revision-Date: 2016-10-18 10:46+0200\n"
+"POT-Creation-Date: 2019-09-20 15:58+0200\n"
+"PO-Revision-Date: 2019-09-20 15:58+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -85,28 +85,28 @@
#. error message for isdomainmember command line action
#. must provide the domain name to be joined
#. error message for joindomain command line action
-#: src/clients/samba-client.rb:211 src/clients/samba-client.rb:255
+#: src/clients/samba-client.rb:212 src/clients/samba-client.rb:256
msgid "Enter the name of a domain."
msgstr ""
#. translators: error message for isdomainmember command line action
-#: src/clients/samba-client.rb:224
+#: src/clients/samba-client.rb:225
msgid "Cannot test domain membership."
msgstr ""
#. translators: result message for isdomainmember command line action
-#: src/clients/samba-client.rb:231
+#: src/clients/samba-client.rb:232
msgid "This machine is a member of %1."
msgstr ""
#. translators: result message for isdomainmember command line action
-#: src/clients/samba-client.rb:236
+#: src/clients/samba-client.rb:237
msgid "This machine is not a member of %1."
msgstr ""
#. translators: result message for joindomain command line action
#. Translators: Information popup, %1 is the name of the domain
-#: src/clients/samba-client.rb:278 src/include/samba-client/routines.rb:280
+#: src/clients/samba-client.rb:279 src/include/samba-client/routines.rb:280
msgid "Domain %1 joined successfully."
msgstr ""
@@ -156,225 +156,229 @@
msgstr ""
#. help text, do not translate 'winbind uid', 'winbind gid'
-#: src/include/samba-client/dialogs.rb:174
+#: src/include/samba-client/dialogs.rb:177
msgid ""
"<p>Specify the <b>Range</b> for Samba user and group IDs (<tt>winbind uid</"
"tt> and <tt>winbind gid</tt> values).</p>"
msgstr ""
#. frame label
-#: src/include/samba-client/dialogs.rb:235
-msgid "&UID Range"
+#: src/include/samba-client/dialogs.rb:248
+msgid "&Default Range"
msgstr ""
#. int field label
-#: src/include/samba-client/dialogs.rb:238
+#: src/include/samba-client/dialogs.rb:251
msgid "&Minimum"
msgstr ""
#. int field label
-#: src/include/samba-client/dialogs.rb:240
+#: src/include/samba-client/dialogs.rb:253
msgid "Ma&ximum"
msgstr ""
#. frame label
-#: src/include/samba-client/dialogs.rb:246
-msgid "&GID Range"
+#: src/include/samba-client/dialogs.rb:259
+msgid "Domain &Range"
msgstr ""
#. int field label
-#: src/include/samba-client/dialogs.rb:249
+#: src/include/samba-client/dialogs.rb:262
msgid "M&inimum"
msgstr ""
#. int field label
-#: src/include/samba-client/dialogs.rb:251
+#: src/include/samba-client/dialogs.rb:264
msgid "M&aximum"
msgstr ""
+#: src/include/samba-client/dialogs.rb:265
+msgid "Back&end"
+msgstr ""
+
#. require_groups
-#: src/include/samba-client/dialogs.rb:256
+#: src/include/samba-client/dialogs.rb:272
msgid "Allowed Group(s)"
msgstr ""
-#: src/include/samba-client/dialogs.rb:261
+#: src/include/samba-client/dialogs.rb:277
msgid "Group Name(s) or SID(s)"
msgstr ""
#. combobox label
-#: src/include/samba-client/dialogs.rb:271
+#: src/include/samba-client/dialogs.rb:287
msgid "&Kerberos Method"
msgstr ""
#. frame label
-#: src/include/samba-client/dialogs.rb:277
+#: src/include/samba-client/dialogs.rb:293
msgid "Windows Internet Name Service"
msgstr ""
#. frame label
-#: src/include/samba-client/dialogs.rb:286
+#: src/include/samba-client/dialogs.rb:302
msgid "Mount Server Directories"
msgstr ""
#. table header
-#: src/include/samba-client/dialogs.rb:294
+#: src/include/samba-client/dialogs.rb:310
msgid "Server Name"
msgstr ""
#. table header
-#: src/include/samba-client/dialogs.rb:296
+#: src/include/samba-client/dialogs.rb:312
msgid "Remote Path"
msgstr ""
#. table header
-#: src/include/samba-client/dialogs.rb:298
+#: src/include/samba-client/dialogs.rb:314
msgid "Local Mount Point"
msgstr ""
#. table header
-#: src/include/samba-client/dialogs.rb:300
+#: src/include/samba-client/dialogs.rb:316
msgid "User Name"
msgstr ""
#. table header
-#: src/include/samba-client/dialogs.rb:302
+#: src/include/samba-client/dialogs.rb:318
msgid "Options"
msgstr ""
#. dialog title
-#: src/include/samba-client/dialogs.rb:320
+#: src/include/samba-client/dialogs.rb:336
msgid "Expert Settings"
msgstr ""
#. error popup: min >= max
-#: src/include/samba-client/dialogs.rb:377
+#: src/include/samba-client/dialogs.rb:394
msgid ""
"The minimum value in the range cannot be\n"
"larger than maximum one.\n"
msgstr ""
#. Samba-client workgroup dialog caption
-#: src/include/samba-client/dialogs.rb:428
+#: src/include/samba-client/dialogs.rb:455
msgid "Windows Domain Membership"
msgstr ""
#. busy popup text
-#: src/include/samba-client/dialogs.rb:449
+#: src/include/samba-client/dialogs.rb:476
msgid "Verifying AD domain membership..."
msgstr ""
#. push button label
-#: src/include/samba-client/dialogs.rb:461
+#: src/include/samba-client/dialogs.rb:488
msgid "&Leave"
msgstr ""
#. status label
-#: src/include/samba-client/dialogs.rb:468
+#: src/include/samba-client/dialogs.rb:495
msgid "Currently a member of this domain"
msgstr ""
#. translators: checkbox label to enable winbind
-#: src/include/samba-client/dialogs.rb:489
+#: src/include/samba-client/dialogs.rb:516
msgid "&Use SMB Information for Linux Authentication"
msgstr ""
#. checkbox label
-#: src/include/samba-client/dialogs.rb:500
+#: src/include/samba-client/dialogs.rb:527
msgid "&Create Home Directory on Login"
msgstr ""
#. frame label
-#: src/include/samba-client/dialogs.rb:511
+#: src/include/samba-client/dialogs.rb:538
msgid "Join Settings"
msgstr ""
#. text entry label
#. text entry label
-#: src/include/samba-client/dialogs.rb:517
+#: src/include/samba-client/dialogs.rb:544
#: src/include/samba-client/routines.rb:90
msgid "&Username"
msgstr ""
#. text entry label
-#: src/include/samba-client/dialogs.rb:526
+#: src/include/samba-client/dialogs.rb:553
msgid "&Password"
msgstr ""
#. text entry label
-#: src/include/samba-client/dialogs.rb:533
+#: src/include/samba-client/dialogs.rb:560
msgid "Mac&hine Account OU"
msgstr ""
#. text entry label
-#: src/include/samba-client/dialogs.rb:542
+#: src/include/samba-client/dialogs.rb:569
msgid "Active Directory Server"
msgstr ""
#. button label (run YaST client for NTP)
-#: src/include/samba-client/dialogs.rb:551
+#: src/include/samba-client/dialogs.rb:578
msgid "N&TP Configuration..."
msgstr ""
#. checkbox label
-#: src/include/samba-client/dialogs.rb:555
+#: src/include/samba-client/dialogs.rb:582
msgid "Disable Name Service Cache"
msgstr ""
#. checkbox label
-#: src/include/samba-client/dialogs.rb:557
+#: src/include/samba-client/dialogs.rb:584
msgid "Start File Alteration Monitor"
msgstr ""
#. translators: frame label
-#: src/include/samba-client/dialogs.rb:572
+#: src/include/samba-client/dialogs.rb:599
msgid "Membership"
msgstr ""
-#: src/include/samba-client/dialogs.rb:580
+#: src/include/samba-client/dialogs.rb:607
msgid "&Domain"
msgstr ""
#. translators: text entry label
-#: src/include/samba-client/dialogs.rb:582
+#: src/include/samba-client/dialogs.rb:609
msgid "&Domain or Workgroup"
msgstr ""
#. checkbox label
-#: src/include/samba-client/dialogs.rb:596
+#: src/include/samba-client/dialogs.rb:623
msgid "Off&line Authentication"
msgstr ""
#. checkbox label
-#: src/include/samba-client/dialogs.rb:605
+#: src/include/samba-client/dialogs.rb:632
msgid "&Single Sign-on for SSH"
msgstr ""
#. checkbox label
-#: src/include/samba-client/dialogs.rb:615
+#: src/include/samba-client/dialogs.rb:642
msgid "Change primary DNS suffix"
msgstr ""
#. button label
-#: src/include/samba-client/dialogs.rb:622
+#: src/include/samba-client/dialogs.rb:649
msgid "&Expert Settings..."
msgstr ""
#. 1st part of an error message:
#. winbind cannot provide user information taken from
#. a workgroup, must be a domain; %1 is the workgroup name
-#: src/include/samba-client/dialogs.rb:778
+#: src/include/samba-client/dialogs.rb:809
msgid ""
"Cannot use the workgroup\n"
"'%1' for Linux authentication."
msgstr ""
#. translators: 2nd part of an error message
-#: src/include/samba-client/dialogs.rb:787
+#: src/include/samba-client/dialogs.rb:818
msgid "Enter a valid domain."
msgstr ""
#. translators: 2nd part of an error message
-#: src/include/samba-client/dialogs.rb:789
+#: src/include/samba-client/dialogs.rb:820
msgid ""
"Enter a domain or disable\n"
"using SMB for Linux authentication."
@@ -382,7 +386,7 @@
#. we might use it to warn user (#155716)
#. continue/cancel popup
-#: src/include/samba-client/dialogs.rb:809
+#: src/include/samba-client/dialogs.rb:840
msgid ""
"Configuring this system as a client for Active Directory resets the "
"following\n"
@@ -393,26 +397,26 @@
#. 1st part of an error message:
#. winbind cannot provide user information if the host
#. is not in a domain
-#: src/include/samba-client/dialogs.rb:828
+#: src/include/samba-client/dialogs.rb:859
msgid ""
"The host must be a member of a domain\n"
"for Linux authentication using SMB."
msgstr ""
#. translators: 2nd part of an error message
-#: src/include/samba-client/dialogs.rb:832
+#: src/include/samba-client/dialogs.rb:863
msgid ""
"Join a domain or disable use of SMB\n"
"for Linux authentication."
msgstr ""
#. used outside this module for autologin function. must be complete sentence.
-#: src/include/samba-client/dialogs.rb:841
+#: src/include/samba-client/dialogs.rb:872
msgid "Samba is now enabled."
msgstr ""
#. yes/no popup text
-#: src/include/samba-client/dialogs.rb:853
+#: src/include/samba-client/dialogs.rb:884
msgid ""
"In a Microsoft environment,\n"
"hostname changes with DHCP are problematic.\n"
@@ -420,7 +424,7 @@
msgstr ""
#. message popup, part 1/2
-#: src/include/samba-client/dialogs.rb:888
+#: src/include/samba-client/dialogs.rb:919
msgid ""
"This change only affects newly created processes and not already\n"
"running services. Restart your services manually or reboot \n"
@@ -891,13 +895,13 @@
#. summary value
#. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1019 src/modules/Samba.rb:1112
+#: src/modules/Kerberos.rb:1019 src/modules/Samba.rb:1113
msgid "Yes"
msgstr ""
#. summary value
#. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1021 src/modules/Samba.rb:1114
+#: src/modules/Kerberos.rb:1021 src/modules/Samba.rb:1115
msgid "No"
msgstr ""
@@ -1023,40 +1027,40 @@
msgstr ""
#. summary header
-#: src/modules/Samba.rb:1052
+#: src/modules/Samba.rb:1053
msgid "Global Configuration"
msgstr ""
#. autoyast summary item: configured workgroup
-#: src/modules/Samba.rb:1059
+#: src/modules/Samba.rb:1060
msgid "Workgroup or Domain: %1"
msgstr ""
#. autoyast summary item
-#: src/modules/Samba.rb:1068
+#: src/modules/Samba.rb:1069
msgid "Create Home Directory on Login"
msgstr ""
#. autoyast summary item
-#: src/modules/Samba.rb:1075
+#: src/modules/Samba.rb:1076
msgid "Offline Authentication Enabled"
msgstr ""
#. autoyast summary item
-#: src/modules/Samba.rb:1083
+#: src/modules/Samba.rb:1084
msgid "Maximum Number of Shares: %1"
msgstr ""
#. summary item: configured workgroup
-#: src/modules/Samba.rb:1104
+#: src/modules/Samba.rb:1105
msgid "<p><b>Workgroup or Domain</b>: %1</p>"
msgstr ""
#. summary item: authentication using winbind
-#: src/modules/Samba.rb:1109
+#: src/modules/Samba.rb:1110
msgid "<p><b>Authentication with SMB</b>: %1</p>"
msgstr ""
-#: src/modules/SambaNetJoin.pm:322
+#: src/modules/SambaNetJoin.pm:323
msgid "Unable to proceed with join: Inconsistent cluster state"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/samba-server.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/samba-server.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/samba-server.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-05 02:29+0000\n"
-"PO-Revision-Date: 2017-04-05 02:29+0000\n"
+"POT-Creation-Date: 2019-09-20 15:58+0200\n"
+"PO-Revision-Date: 2019-09-20 15:58+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
Modified: branches/SLE12-SP5/yast/50-pot/samba-users.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/samba-users.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/samba-users.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:29+0200\n"
-"PO-Revision-Date: 2016-08-30 18:29+0200\n"
+"POT-Creation-Date: 2019-09-20 15:58+0200\n"
+"PO-Revision-Date: 2019-09-20 15:58+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
Modified: branches/SLE12-SP5/yast/50-pot/scanner.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/scanner.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/scanner.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-04 02:29+0000\n"
-"PO-Revision-Date: 2017-04-04 02:29+0000\n"
+"POT-Creation-Date: 2019-09-20 15:58+0200\n"
+"PO-Revision-Date: 2019-09-20 15:58+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
Modified: branches/SLE12-SP5/yast/50-pot/security.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/security.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/security.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-13 20:10+0200\n"
-"PO-Revision-Date: 2016-09-13 20:10+0200\n"
+"POT-Creation-Date: 2019-09-20 15:58+0200\n"
+"PO-Revision-Date: 2019-09-20 15:58+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
Modified: branches/SLE12-SP5/yast/50-pot/services-manager.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/services-manager.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/services-manager.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-16 02:29+0000\n"
-"PO-Revision-Date: 2017-02-16 02:29+0000\n"
+"POT-Creation-Date: 2019-09-20 15:58+0200\n"
+"PO-Revision-Date: 2019-09-20 15:58+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -26,95 +26,95 @@
msgstr ""
#. TODO implement behaviour if force_reset parameter provided
-#: src/clients/default_target_proposal.rb:51
+#: src/clients/default_target_proposal.rb:50
msgid "&Default systemd target"
msgstr ""
-#: src/clients/default_target_proposal.rb:52
+#: src/clients/default_target_proposal.rb:51
msgid "Default systemd target"
msgstr ""
#. create the proposal dialog and get the sequence symbol from block
-#: src/clients/default_target_proposal.rb:116
+#: src/clients/default_target_proposal.rb:115
msgid "Set Default Systemd Target"
msgstr ""
-#: src/clients/default_target_proposal.rb:134
+#: src/clients/default_target_proposal.rb:133
msgid "Selecting the Default Systemd Target"
msgstr ""
-#: src/clients/default_target_proposal.rb:136
+#: src/clients/default_target_proposal.rb:135
msgid ""
"Systemd is a system and service manager for Linux. It consists of units "
"whose job is to activate services and other units."
msgstr ""
-#: src/clients/default_target_proposal.rb:139
+#: src/clients/default_target_proposal.rb:138
msgid ""
"Default target unit is activated on boot by default. Usually it is a symlink "
"located in path/etc/systemd/system/default.target . See more on systemd man "
"page."
msgstr ""
-#: src/clients/default_target_proposal.rb:143
+#: src/clients/default_target_proposal.rb:142
msgid ""
"Multi-User target is for setting up a non-graphical multi-user system with "
"network suitable for server (similar to runlevel 3)."
msgstr ""
-#: src/clients/default_target_proposal.rb:146
+#: src/clients/default_target_proposal.rb:145
msgid ""
"Graphical target for setting up a graphical login screen with network which "
"is typical for workstations (similar to runlevel 5)."
msgstr ""
-#: src/clients/default_target_proposal.rb:149
+#: src/clients/default_target_proposal.rb:148
msgid ""
"When you are not sure what would be the best option for you then go with "
"graphical target."
msgstr ""
-#: src/clients/default_target_proposal.rb:160
+#: src/clients/default_target_proposal.rb:159
msgid "Available Targets"
msgstr ""
#. Check if the user forced a particular target before; if he did and the
#. autodetection recommends a different one now, warn the user about this
#. and keep the default target unchanged.
-#: src/clients/default_target_proposal.rb:220
+#: src/clients/default_target_proposal.rb:219
msgid "The installer is recommending you the default target '%s' "
msgstr ""
-#: src/clients/default_target_proposal.rb:232
+#: src/clients/default_target_proposal.rb:231
msgid "X11 packages have been selected for installation"
msgstr ""
-#: src/clients/default_target_proposal.rb:235
+#: src/clients/default_target_proposal.rb:234
msgid "Live Installation is typically used for full GUI in target system"
msgstr ""
-#: src/clients/default_target_proposal.rb:238
+#: src/clients/default_target_proposal.rb:237
msgid "Serial connection does typically not support GUI"
msgstr ""
-#: src/clients/default_target_proposal.rb:242
+#: src/clients/default_target_proposal.rb:241
msgid "Text mode installation assumes no GUI on the target system"
msgstr ""
-#: src/clients/default_target_proposal.rb:245
-#: src/clients/default_target_proposal.rb:249
+#: src/clients/default_target_proposal.rb:244
+#: src/clients/default_target_proposal.rb:248
msgid "Using VNC assumes a GUI on the target system"
msgstr ""
-#: src/clients/default_target_proposal.rb:252
+#: src/clients/default_target_proposal.rb:251
msgid "SSH installation mode assumes no GUI on the target system"
msgstr ""
-#: src/clients/default_target_proposal.rb:255
+#: src/clients/default_target_proposal.rb:254
msgid "X11 packages have not been selected for installation"
msgstr ""
-#: src/clients/default_target_proposal.rb:258
+#: src/clients/default_target_proposal.rb:257
msgid ""
"This recommendation is based on the analysis of other installation settings"
msgstr ""
@@ -227,22 +227,22 @@
msgstr ""
#. TODO implement behaviour if force_reset parameter provided
-#: src/clients/services_proposal.rb:52
+#: src/clients/services_proposal.rb:51
msgid "&Services"
msgstr ""
-#: src/clients/services_proposal.rb:53
+#: src/clients/services_proposal.rb:52
#: src/data/services-manager/autoyast_summary.erb:15
msgid "Services"
msgstr ""
-#: src/clients/services_proposal.rb:116
+#: src/clients/services_proposal.rb:115
msgid ""
"<p><big><b>Services</b></big><br>\n"
"The current setup does not provide any functionality now.</p>"
msgstr ""
-#: src/clients/services_proposal.rb:121
+#: src/clients/services_proposal.rb:120
msgid ""
"<p><big><b>Services</b></big><br>\n"
"This installation proposal allows you to start and enable a service from "
@@ -253,27 +253,27 @@
"and a particular service requires opening them.</p>\n"
msgstr ""
-#: src/clients/services_proposal.rb:145
+#: src/clients/services_proposal.rb:144
msgid ""
"Service %service will be %toggled and port in firewall will be %switched "
"%link"
msgstr ""
-#: src/clients/services_proposal.rb:160
+#: src/clients/services_proposal.rb:159
msgid "Service %service will be %toggled %link"
msgstr ""
-#: src/clients/services_proposal.rb:258
+#: src/clients/services_proposal.rb:257
msgid "Package %1 is not available"
msgstr ""
-#: src/clients/services_proposal.rb:268
+#: src/clients/services_proposal.rb:267
msgid ""
"Installation of required packages has failed; \n"
"enabling and starting the services may also fail"
msgstr ""
-#: src/clients/services_proposal.rb:283
+#: src/clients/services_proposal.rb:282
msgid "Cannot enable service %1"
msgstr ""
@@ -294,11 +294,11 @@
#. Do not start or stop services that are already in the desired state.
#. They might be coming from AutoYast import and thus marked as :modified.
-#: src/modules/services_manager_service.rb:452
+#: src/modules/services_manager_service.rb:507
msgid "Could not %{change} %{service} which is currently %{status}. "
msgstr ""
-#: src/modules/services_manager_service.rb:471
+#: src/modules/services_manager_service.rb:526
msgid "Could not %{change} %{service}. "
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/slp-server.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/slp-server.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/slp-server.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:29+0200\n"
-"PO-Revision-Date: 2016-08-30 18:29+0200\n"
+"POT-Creation-Date: 2019-09-20 15:58+0200\n"
+"PO-Revision-Date: 2019-09-20 15:58+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -32,121 +32,104 @@
msgid "&SLP Server"
msgstr ""
-#. radio button (starting SLP service - option 1)
-#: src/include/slp-server/dialogs.rb:49
-msgid "When &Booting"
-msgstr ""
-
-#. radio button (starting SLP service - option 2)
-#: src/include/slp-server/dialogs.rb:53
-msgid "&Manually"
-msgstr ""
-
-#. part of help text, used to describe radiobuttons (matching starting SLP service but without "&")
-#: src/include/slp-server/dialogs.rb:59
-msgid "When Booting"
-msgstr ""
-
-#. part of help text, used to describe radiobuttons (matching starting SLP service but without "&")
-#: src/include/slp-server/dialogs.rb:61
-msgid "Manually"
-msgstr ""
-
#. button for view log files
-#: src/include/slp-server/dialogs.rb:73 src/include/slp-server/dialogs.rb:78
+#: src/include/slp-server/dialogs.rb:48 src/include/slp-server/dialogs.rb:53
msgid "Show Log"
msgstr ""
#. button for expert settings (all config options)
-#: src/include/slp-server/dialogs.rb:84 src/include/slp-server/dialogs.rb:89
+#: src/include/slp-server/dialogs.rb:59 src/include/slp-server/dialogs.rb:64
msgid "Expert Settings"
msgstr ""
#. response + scopes widget
-#: src/include/slp-server/dialogs.rb:99
+#: src/include/slp-server/dialogs.rb:74
msgid "Response To"
msgstr ""
-#: src/include/slp-server/dialogs.rb:100
+#: src/include/slp-server/dialogs.rb:75
msgid "Broadcast"
msgstr ""
-#: src/include/slp-server/dialogs.rb:101
+#: src/include/slp-server/dialogs.rb:76
msgid "Multicast"
msgstr ""
-#: src/include/slp-server/dialogs.rb:102
+#: src/include/slp-server/dialogs.rb:77
msgid "DA Server"
msgstr ""
-#: src/include/slp-server/dialogs.rb:107
+#: src/include/slp-server/dialogs.rb:82
msgid "Becomes DA Server"
msgstr ""
-#: src/include/slp-server/dialogs.rb:112
+#: src/include/slp-server/dialogs.rb:87
msgid "&IP Addresses of DA Servers"
msgstr ""
-#: src/include/slp-server/dialogs.rb:113
+#: src/include/slp-server/dialogs.rb:88
msgid "&Scopes"
msgstr ""
-#: src/include/slp-server/dialogs.rb:132
+#: src/include/slp-server/dialogs.rb:107
msgid "SLP Server Settings"
msgstr ""
#. description map for tabs in overview dialog
-#: src/include/slp-server/dialogs.rb:251
+#: src/include/slp-server/dialogs.rb:226
msgid "Global SLP Configuration"
msgstr ""
#. Initialization dialog caption
-#: src/include/slp-server/dialogs.rb:273 src/include/slp-server/wizards.rb:81
+#: src/include/slp-server/dialogs.rb:248 src/include/slp-server/wizards.rb:81
msgid "SLP Server Configuration"
msgstr ""
-#: src/include/slp-server/dialogs.rb:288
+#: src/include/slp-server/dialogs.rb:263
msgid "Server Details"
msgstr ""
-#: src/include/slp-server/dialogs.rb:303
+#: src/include/slp-server/dialogs.rb:278
msgid "Static Configuration Files"
msgstr ""
-#: src/include/slp-server/dialogs.rb:667
+#. Widget to define state and start mode of the service
+#.
+#. @return [::CWM::ServiceWidget]
+#: src/include/slp-server/dialogs.rb:649
msgid "Really delete this file?"
msgstr ""
#. translators: combo box for selsect module from installed unknown modules
-#: src/include/slp-server/dialogs.rb:690
+#: src/include/slp-server/dialogs.rb:672
msgid "Name of New File"
msgstr ""
#. UI::ChangeWidget(`id(`scope), `Enabled, false);
-#: src/include/slp-server/dialogs.rb:866
+#: src/include/slp-server/dialogs.rb:848
msgid "Scope and IP address must be inserted."
msgstr ""
-#: src/include/slp-server/dialogs.rb:872
+#: src/include/slp-server/dialogs.rb:854
msgid "Scope must be inserted."
msgstr ""
#. SlpServer overview dialog caption
-#: src/include/slp-server/dialogs.rb:883
+#: src/include/slp-server/dialogs.rb:865
msgid "SLP Server Overview"
msgstr ""
-#: src/include/slp-server/dialogs.rb:892
+#: src/include/slp-server/dialogs.rb:874
msgid "<h1>SLP Server</h1>"
msgstr ""
#. dialog for expert settings
-#: src/include/slp-server/dialogs.rb:929
+#: src/include/slp-server/dialogs.rb:911
msgid "SLP Server Configuration--Expert Dialog"
msgstr ""
#. edit reg file dialog
-#: src/include/slp-server/dialogs.rb:957
+#: src/include/slp-server/dialogs.rb:939
msgid "SLP Server Configuration--Edit .reg File"
msgstr ""
@@ -234,29 +217,29 @@
#: src/include/slp-server/helps.rb:78
msgid ""
-"<p>Here, set the mode in which to run the SLP daemon. The simplest mode is <b>"
-"Broadcast</b>.\n"
-"In it, the SLP daemon answers all requests sent by broadcast. The next mode is"
-" <b>Multicast</b>. In it, the daemon answers queries\n"
-"sent by multicast in appropriate SCOPES. In the <b>DA Server</b> mode, it info"
-"rms DA servers on the specified IP addresses\n"
-"about statically and dynamically registered services. The last options is <b>B"
-"ecomes DA Server</b>. This is a cache server for service\n"
+"<p>Here, set the mode in which to run the SLP daemon. The simplest mode is "
+"<b>Broadcast</b>.\n"
+"In it, the SLP daemon answers all requests sent by broadcast. The next mode "
+"is <b>Multicast</b>. In it, the daemon answers queries\n"
+"sent by multicast in appropriate SCOPES. In the <b>DA Server</b> mode, it "
+"informs DA servers on the specified IP addresses\n"
+"about statically and dynamically registered services. The last options is "
+"<b>Becomes DA Server</b>. This is a cache server for service\n"
"answers.</p>\n"
msgstr ""
#: src/include/slp-server/helps.rb:85
msgid ""
-"<p>With <b>Expert Settings</b>, access all options available in /etc/slp.conf."
-"</p>"
+"<p>With <b>Expert Settings</b>, access all options available in /etc/slp."
+"conf.</p>"
msgstr ""
#: src/include/slp-server/helps.rb:88
msgid ""
-"Configuration files for static registration to SLP. With <b>Add</b>, create a "
-"new empty file. With <b>Modify</b>,\n"
-"change the values of any existing file. With <b>Delete</b>, it is possible to "
-"delete files not owned by any package."
+"Configuration files for static registration to SLP. With <b>Add</b>, create "
+"a new empty file. With <b>Modify</b>,\n"
+"change the values of any existing file. With <b>Delete</b>, it is possible "
+"to delete files not owned by any package."
msgstr ""
#: src/include/slp-server/helps.rb:91
@@ -269,92 +252,93 @@
msgstr ""
#. check for package openslp-server installed
-#: src/modules/SlpServer.rb:181
-msgid "<p>To configure the SLP server, the <b>%1</b> package must be installed.</p>"
+#: src/modules/SlpServer.rb:190
+msgid ""
+"<p>To configure the SLP server, the <b>%1</b> package must be installed.</p>"
msgstr ""
-#: src/modules/SlpServer.rb:184
+#: src/modules/SlpServer.rb:193
msgid "<p>Do you want to install it now?</p>"
msgstr ""
#. SlpServer read dialog caption
-#: src/modules/SlpServer.rb:199
+#: src/modules/SlpServer.rb:208
msgid "Initializing SLP Server Configuration"
msgstr ""
#. Progress stage 1/3
-#: src/modules/SlpServer.rb:215
+#: src/modules/SlpServer.rb:224
msgid "Read the database"
msgstr ""
#. Progress stage 2/3
-#: src/modules/SlpServer.rb:217
+#: src/modules/SlpServer.rb:226
msgid "Read the previous settings"
msgstr ""
#. Progress stage 3/3
-#: src/modules/SlpServer.rb:219
+#: src/modules/SlpServer.rb:228
msgid "Detect the devices"
msgstr ""
#. Progress step 1/3
-#: src/modules/SlpServer.rb:223
+#: src/modules/SlpServer.rb:232
msgid "Reading the database..."
msgstr ""
#. Progress step 2/3
-#: src/modules/SlpServer.rb:225
+#: src/modules/SlpServer.rb:234
msgid "Reading the previous settings..."
msgstr ""
#. Progress step 3/3
-#: src/modules/SlpServer.rb:227
+#: src/modules/SlpServer.rb:236
msgid "Detecting the devices..."
msgstr ""
#. Progress finished
#. Progress finished
-#: src/modules/SlpServer.rb:229 src/modules/SlpServer.rb:302
+#: src/modules/SlpServer.rb:238 src/modules/SlpServer.rb:310
msgid "Finished"
msgstr ""
#. read another database
-#: src/modules/SlpServer.rb:253
+#: src/modules/SlpServer.rb:261
msgid "Cannot read database2."
msgstr ""
#. SlpServer read dialog caption
-#: src/modules/SlpServer.rb:276
+#: src/modules/SlpServer.rb:284
msgid "Saving SLP Server Configuration"
msgstr ""
#. Progress stage 1/2
-#: src/modules/SlpServer.rb:292
+#: src/modules/SlpServer.rb:300
msgid "Write the settings"
msgstr ""
#. Progress stage 2/2
-#: src/modules/SlpServer.rb:294
+#: src/modules/SlpServer.rb:302
msgid "Run SuSEconfig"
msgstr ""
#. Progress step 1/2
-#: src/modules/SlpServer.rb:298
+#: src/modules/SlpServer.rb:306
msgid "Writing the settings..."
msgstr ""
#. Progress step 2/2
-#: src/modules/SlpServer.rb:300
+#: src/modules/SlpServer.rb:308
msgid "Running SuSEconfig..."
msgstr ""
#. Error message
-#: src/modules/SlpServer.rb:313
+#: src/modules/SlpServer.rb:322
msgid "Cannot write settings."
msgstr ""
#. Create a textual summary and a list of unconfigured cards
#. @return summary of the current configuration
-#: src/modules/SlpServer.rb:378
+#: src/modules/SlpServer.rb:405
msgid "Configuration summary..."
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/slp.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/slp.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/slp.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-10 15:34+0200\n"
-"PO-Revision-Date: 2016-10-10 15:34+0200\n"
+"POT-Creation-Date: 2019-09-20 15:58+0200\n"
+"PO-Revision-Date: 2019-09-20 15:58+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
Modified: branches/SLE12-SP5/yast/50-pot/smt.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/smt.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/smt.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -727,8 +727,8 @@
#. %1 is replaced with a translated patch type
#: src/include/smt/dialogs.rb:1590
msgid ""
-"<b>Patch is filtered-out by patch-category filter (%1) and thus cannot be enab"
-"led in this dialog.</b>"
+"<b>Patch is filtered-out by patch-category filter (%1) and thus cannot be "
+"enabled in this dialog.</b>"
msgstr ""
#: src/include/smt/dialogs.rb:1616
@@ -917,8 +917,7 @@
msgstr ""
#: src/include/smt/dialogs.rb:2665
-msgid ""
-"Started mirroring the selected repository with process ID: %1\n"
+msgid "Started mirroring the selected repository with process ID: %1\n"
msgstr ""
#. a headline
@@ -942,19 +941,16 @@
msgstr ""
#: src/include/smt/dialogs.rb:2700
-msgid ""
-"Aborting...\n"
+msgid "Aborting...\n"
msgstr ""
#. BNC #519216: Purge cache right after mirroring
#: src/include/smt/dialogs.rb:2738
-msgid ""
-"Finished\n"
+msgid "Finished\n"
msgstr ""
#: src/include/smt/dialogs.rb:2744
-msgid ""
-"Mirroring failed\n"
+msgid "Mirroring failed\n"
msgstr ""
#. BNC #520557: Manual or additional cron commands
@@ -1072,25 +1068,26 @@
#. TRANSLATORS: help a2
#: src/include/smt/helps.rb:21
msgid ""
-"<p><b>User</b> and <b>Password</b> are needed for Customer Center authenticati"
-"on.\n"
+"<p><b>User</b> and <b>Password</b> are needed for Customer Center "
+"authentication.\n"
"To test the credentials you entered, click <b>Test</b>.\n"
-"SMT then connects to the Customer Center server for authentication and downloa"
-"d of\n"
+"SMT then connects to the Customer Center server for authentication and "
+"download of\n"
"test data.</p>\n"
msgstr ""
#. TRANSLATORS: help a3
#: src/include/smt/helps.rb:28
-msgid "<p>E-mail should be the one you used to register to the customer center.</p>"
+msgid ""
+"<p>E-mail should be the one you used to register to the customer center.</p>"
msgstr ""
#. TRANSLATORS: help b1
#: src/include/smt/helps.rb:33
msgid ""
"<p><big><b>Database</b></big><br>\n"
-"For security reasons, SMT requires a separate user to connect to the database."
-"\n"
+"For security reasons, SMT requires a separate user to connect to the "
+"database.\n"
"With <b>Database Password</b>, set or change the database\n"
"password for that user. The password should not be empty.</p>\n"
msgstr ""
@@ -1099,8 +1096,8 @@
#: src/include/smt/helps.rb:41
msgid ""
"<p><big><b>Reporting</b></big><br>\n"
-"Here you can set up a list of e-mail addresses that SMT will send reports to.<"
-"/p>\n"
+"Here you can set up a list of e-mail addresses that SMT will send reports to."
+"</p>\n"
msgstr ""
#. TRANSLATORS: help d1
@@ -1118,10 +1115,11 @@
#. TRANSLATORS: help d3
#: src/include/smt/helps.rb:52
msgid ""
-"<p>When editing a current job or adding new one, the <b>Frequency</b> selectio"
-"n box\n"
+"<p>When editing a current job or adding new one, the <b>Frequency</b> "
+"selection box\n"
"switches dialog mode according to the currently selected value.\n"
-"Some fields are enabled or disabled accordingly, e.g., <b>Day of the Week</b>\n"
+"Some fields are enabled or disabled accordingly, e.g., <b>Day of the Week</"
+"b>\n"
"is disabled for <tt>Daily</tt> job frequency.</p>\n"
msgstr ""
@@ -1190,8 +1188,8 @@
#: src/include/smt/helps.rb:102
msgid ""
"<p>To create <tt>testing</tt> or <tt>production</tt> snapshots\n"
-"click <b>Create Snapshot...->From Full Mirror to Testing/From Testing to Pr"
-"oduction</b>.</p>"
+"click <b>Create Snapshot...->From Full Mirror to Testing/From Testing to "
+"Production</b>.</p>"
msgstr ""
#: src/include/smt/helps.rb:105
@@ -1264,10 +1262,10 @@
#: src/modules/SMTData.rb:695
msgid ""
"<p><b><big>Details:</big></b></p>\n"
-" <p><b>stdout:</b><br><pre>%1</pre></p"
-">\n"
-" <p><b>stderr:</b><br><pre>%2</pre></p"
-">"
+" <p><b>stdout:</b><br><pre>%1</pre></"
+"p>\n"
+" <p><b>stderr:</b><br><pre>%2</pre></"
+"p>"
msgstr ""
#. take care the the post script do not reschedule again
@@ -1291,8 +1289,8 @@
"Server certificate %1 does not exist.\n"
"Would you like to run CA management to create one?\n"
"\n"
-"The server certificate is vitally important for the update server to support S"
-"SL.\n"
+"The server certificate is vitally important for the update server to support "
+"SSL.\n"
msgstr ""
#: src/modules/SMTData.rb:880
@@ -1373,8 +1371,8 @@
msgid ""
"The current MariaDB root password is empty.\n"
"\n"
-" For security reasons, please, set a "
-"new one."
+" For security reasons, please, set "
+"a new one."
msgstr ""
#: src/modules/SMTData.rb:1093
Modified: branches/SLE12-SP5/yast/50-pot/snapper.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/snapper.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/snapper.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:29+0200\n"
-"PO-Revision-Date: 2016-08-30 18:29+0200\n"
+"POT-Creation-Date: 2019-09-20 15:58+0200\n"
+"PO-Revision-Date: 2019-09-20 15:58+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -304,7 +304,7 @@
msgstr ""
#. yes/no question, %1 is file name, %2 is number
-#: src/include/snapper/dialogs.rb:1125
+#: src/include/snapper/dialogs.rb:1123
msgid ""
"Do you want to delete the file\n"
"\n"
@@ -315,7 +315,7 @@
#. yes/no question, %1 is file name, %2 is number
#. yes/no question, %1 is file name, %2 is number
-#: src/include/snapper/dialogs.rb:1146 src/include/snapper/dialogs.rb:1165
+#: src/include/snapper/dialogs.rb:1144 src/include/snapper/dialogs.rb:1163
msgid ""
"Do you want to copy the file\n"
"\n"
@@ -325,23 +325,24 @@
msgstr ""
#. popup message
-#: src/include/snapper/dialogs.rb:1191
+#: src/include/snapper/dialogs.rb:1189
msgid "No file was selected for restoring."
msgstr ""
#. popup headline
-#: src/include/snapper/dialogs.rb:1201
+#: src/include/snapper/dialogs.rb:1199
msgid "Restoring files"
msgstr ""
#. popup message, %1 is snapshot number, %2 list of files
-#: src/include/snapper/dialogs.rb:1204
+#: src/include/snapper/dialogs.rb:1202
msgid ""
"<p>These files will be restored from snapshot '%1':</p>\n"
"<p>\n"
"%2\n"
"</p>\n"
-"<p>Files existing in original snapshot will be copied to current system.</p>\n"
+"<p>Files existing in original snapshot will be copied to current system.</"
+"p>\n"
"<p>Files that did not exist in the snapshot will be deleted.</p>Are you sure?"
msgstr ""
@@ -356,14 +357,16 @@
#: src/include/snapper/helps.rb:39
msgid ""
"<p><b><big>Snapshots Configuration</big></b><p>\n"
-"<p>The table shows a list of root filesystem snapshots. There are three types\n"
-"of snapshots, <b>single</b>, <b>pre</b> and <b>post</b>. Single snapshots are\n"
-"used for storing the file system state in a certain time, while Pre and Post a"
-"re used to define the changes done by special operation performed between taki"
-"ng those two snapshots. Pre and Post snapshots are paired together in the tabl"
-"e.</p>\n"
-"<p>Select a snapshot or snapshot pair and click <b>Show Changes</b> to see the"
-"\n"
+"<p>The table shows a list of root filesystem snapshots. There are three "
+"types\n"
+"of snapshots, <b>single</b>, <b>pre</b> and <b>post</b>. Single snapshots "
+"are\n"
+"used for storing the file system state in a certain time, while Pre and Post "
+"are used to define the changes done by special operation performed between "
+"taking those two snapshots. Pre and Post snapshots are paired together in "
+"the table.</p>\n"
+"<p>Select a snapshot or snapshot pair and click <b>Show Changes</b> to see "
+"the\n"
"new file system changes in the specified snapshot.</p>\n"
msgstr ""
@@ -372,15 +375,15 @@
msgid ""
"<p><b><big>Snapshot Overview</big></b><p>\n"
"<p>\n"
-"The tree shows all the files that were modified between creating the first ('p"
-"re') and second ('post') snapshot. On the right side, you see the description "
-"generated when the first snapshot was created and the time of creation for bot"
-"h snapshots.\n"
+"The tree shows all the files that were modified between creating the first "
+"('pre') and second ('post') snapshot. On the right side, you see the "
+"description generated when the first snapshot was created and the time of "
+"creation for both snapshots.\n"
"</p>\n"
"<p>\n"
-"When a file is selected in the tree, you see the changes done to it. By defaul"
-"t, changes between selected paired snapshots are shown, but it is possible to "
-"compare the file with different versions.\n"
+"When a file is selected in the tree, you see the changes done to it. By "
+"default, changes between selected paired snapshots are shown, but it is "
+"possible to compare the file with different versions.\n"
"</p>\n"
msgstr ""
@@ -389,48 +392,43 @@
msgid ""
"<p><b><big>Snapshot Overview</big></b><p>\n"
"<p>\n"
-"The tree shows all the files that differ in a selected snapshot and the curren"
-"t system. On the right side, you see the snapshot description and time of its "
-"creation.\n"
+"The tree shows all the files that differ in a selected snapshot and the "
+"current system. On the right side, you see the snapshot description and time "
+"of its creation.\n"
"</p>\n"
"<p>\n"
-"When a file is selected in the tree, you can see the its difference between sn"
-"apshot version and current system.\n"
+"When a file is selected in the tree, you can see the its difference between "
+"snapshot version and current system.\n"
"</p>\n"
msgstr ""
#. Return Tree of files modified between given snapshots
#. Map is recursively describing the filesystem structure; helps to build Tree widget contents
#: src/modules/Snapper.rb:108
-msgid ""
-"Failed to get config:\n"
+msgid "Failed to get config:\n"
msgstr ""
#. Return the path to given snapshot
#: src/modules/Snapper.rb:129
-msgid ""
-"Failed to get snapshot mount point:\n"
+msgid "Failed to get snapshot mount point:\n"
msgstr ""
#. Create new snapshot
#. Return true on success
#: src/modules/Snapper.rb:276
-msgid ""
-"Failed to create new snapshot:\n"
+msgid "Failed to create new snapshot:\n"
msgstr ""
#. Modify existing snapshot
#. Return true on success
#: src/modules/Snapper.rb:291
-msgid ""
-"Failed to modify snapshot:\n"
+msgid "Failed to modify snapshot:\n"
msgstr ""
#. Delete existing snapshot
#. Return true on success
#: src/modules/Snapper.rb:306
-msgid ""
-"Failed to delete snapshot:\n"
+msgid "Failed to delete snapshot:\n"
msgstr ""
#. Snapper read dialog caption
@@ -485,12 +483,10 @@
#. log entry (%1 is file name)
#: src/modules/Snapper.rb:428
-msgid ""
-"Deleted %1\n"
+msgid "Deleted %1\n"
msgstr ""
#. log entry (%1 is file name)
#: src/modules/Snapper.rb:481
-msgid ""
-"%1 skipped\n"
+msgid "%1 skipped\n"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/sound.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/sound.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/sound.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:30+0200\n"
-"PO-Revision-Date: 2016-08-30 18:30+0200\n"
+"POT-Creation-Date: 2019-09-20 15:58+0200\n"
+"PO-Revision-Date: 2019-09-20 15:58+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -66,8 +66,8 @@
#. help text for unknownd parameters; do not translate 'show'
#: src/clients/sound.rb:121
msgid ""
-"Value of the specific module parameter. Use the 'show' command to see a list o"
-"f allowed parameters."
+"Value of the specific module parameter. Use the 'show' command to see a list "
+"of allowed parameters."
msgstr ""
#. translators: command line help text for volume action
@@ -79,8 +79,8 @@
#. help text; do not translate 'channels' as command name
#: src/clients/sound.rb:137
msgid ""
-"Value of the specific channel (0-100). Use the 'channels' command to see a lis"
-"t of available channels."
+"Value of the specific channel (0-100). Use the 'channels' command to see a "
+"list of available channels."
msgstr ""
#. translators: command line help text for modules action
@@ -145,8 +145,7 @@
#. label: list of card parameters will follow; %1 is card name, %2 driver
#: src/clients/sound.rb:437
-msgid ""
-"Parameters of card '%1' (using module %2):\n"
+msgid "Parameters of card '%1' (using module %2):\n"
msgstr ""
#. label (default value of sound module parameter)
@@ -530,10 +529,10 @@
#. help text - mixer setting
#: src/include/sound/mixer.rb:377
msgid ""
-"<P>With this dialog you can set volume for each channel of the selected sound "
-"card. \n"
-"Press <B>Next</B> to save your volume settings, press <B>Back</B> to restore t"
-"he original settings.</P>"
+"<P>With this dialog you can set volume for each channel of the selected "
+"sound card. \n"
+"Press <B>Next</B> to save your volume settings, press <B>Back</B> to restore "
+"the original settings.</P>"
msgstr ""
#. dialog header, %1 = card id (number), %2 = name
@@ -863,8 +862,7 @@
#. error message
#: src/include/sound/texts.rb:174
-msgid ""
-"Error while saving '/etc/modules.conf'.\n"
+msgid "Error while saving '/etc/modules.conf'.\n"
msgstr ""
#. list of error
@@ -887,14 +885,12 @@
#. error message
#: src/include/sound/texts.rb:186
-msgid ""
-"Error while saving file: %1 \n"
+msgid "Error while saving file: %1 \n"
msgstr ""
#. error message
#: src/include/sound/texts.rb:189
-msgid ""
-"Error while setting volume.\n"
+msgid "Error while setting volume.\n"
msgstr ""
#: src/include/sound/texts.rb:190
@@ -1025,15 +1021,16 @@
#: src/include/sound/texts.rb:273
msgid ""
-"<p>The sound device with index 0 is the default device used by system and appl"
-"ications.\n"
+"<p>The sound device with index 0 is the default device used by system and "
+"applications.\n"
"Use <b>Other</b> to set the selected sound device as the primary device.</p>"
msgstr ""
#: src/include/sound/texts.rb:276
msgid ""
"The applications which use OSS (Open Sound System) can use the software\n"
-"mixer by using aoss wrapper. Use command <tt>aoss <application></tt> to\n"
+"mixer by using aoss wrapper. Use command <tt>aoss <application></tt> "
+"to\n"
"start the application."
msgstr ""
@@ -1074,8 +1071,7 @@
#. this is the first part of message "The sound card 'cardname'
#. will be configured as the first snd card"
#: src/include/sound/ui.rb:73
-msgid ""
-"The sound card\n"
+msgid "The sound card\n"
msgstr ""
#. radio button label - type of setup
Modified: branches/SLE12-SP5/yast/50-pot/squid.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/squid.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/squid.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:30+0200\n"
-"PO-Revision-Date: 2016-08-30 18:30+0200\n"
+"POT-Creation-Date: 2019-09-20 15:58+0200\n"
+"PO-Revision-Date: 2019-09-20 15:58+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -553,8 +553,8 @@
#. Cache Dialog
#: src/include/squid/helps.rb:70
msgid ""
-"<p><b>Refresh Patterns</b> define how Squid treats the objects in the cache.</"
-"p>\n"
+"<p><b>Refresh Patterns</b> define how Squid treats the objects in the cache."
+"</p>\n"
msgstr ""
#: src/include/squid/helps.rb:73
@@ -585,8 +585,8 @@
#. Cache 2 Dialog
#: src/include/squid/helps.rb:88
msgid ""
-"<p><b>Cache memory</b> defines the ideal amount of memory to be used for objec"
-"ts.</p>"
+"<p><b>Cache memory</b> defines the ideal amount of memory to be used for "
+"objects.</p>"
msgstr ""
#: src/include/squid/helps.rb:91
@@ -613,11 +613,11 @@
#: src/include/squid/helps.rb:105
msgid ""
-"<p><b>Cache Replacement Policy</b> determines which objects are to be replaced"
-"\n"
+"<p><b>Cache Replacement Policy</b> determines which objects are to be "
+"replaced\n"
"when disk space is needed.\n"
-"<b>Memory Replacement Policy</b> specifies the policy for object replacement i"
-"n\n"
+"<b>Memory Replacement Policy</b> specifies the policy for object replacement "
+"in\n"
"memory when space for new objects is not available.\n"
"Policies could be:\n"
"<table>\n"
@@ -644,48 +644,49 @@
#. Cache Directory
#: src/include/squid/helps.rb:132
msgid ""
-"<p><b>Directory Name</b> defines a top-level directory where cache swap files "
-"will be stored.</p>"
+"<p><b>Directory Name</b> defines a top-level directory where cache swap "
+"files will be stored.</p>"
msgstr ""
#: src/include/squid/helps.rb:135
msgid ""
-"<p><b>Size</b> defines the amount of disk space (in MB) to use under this dire"
-"ctory.</p>"
+"<p><b>Size</b> defines the amount of disk space (in MB) to use under this "
+"directory.</p>"
msgstr ""
#: src/include/squid/helps.rb:138
msgid ""
-"<p><b>Level 1 Directories</b> defines a number of first-level subdirectories, "
-"\n"
+"<p><b>Level 1 Directories</b> defines a number of first-level "
+"subdirectories, \n"
"which will be created under the <b>Directory Name</b> directory.</p>\n"
msgstr ""
#: src/include/squid/helps.rb:141
msgid ""
-"<p><b>Level 2 Directories</b> defines a number of second-level subdirectories,"
-"\n"
+"<p><b>Level 2 Directories</b> defines a number of second-level "
+"subdirectories,\n"
"which will be created under each first-level directory.</p>\n"
msgstr ""
#. ACL Groups
#: src/include/squid/helps.rb:145
-msgid "<p>Access to the Squid server can be controlled via <b>ACL Groups</b>.</p>"
+msgid ""
+"<p>Access to the Squid server can be controlled via <b>ACL Groups</b>.</p>"
msgstr ""
#: src/include/squid/helps.rb:148
msgid ""
-"<p><b>ACL Group</b> has various types and the description of ACL Group depends"
-"\n"
+"<p><b>ACL Group</b> has various types and the description of ACL Group "
+"depends\n"
"on the particular type.</p>\n"
msgstr ""
#: src/include/squid/helps.rb:151
msgid ""
-"<p>In the <b>Access Control</b> table, access can be denied or allowed to ACL "
-"Groups.\n"
-"If there are more ACL Groups in one line, it means that access will be allowed"
-"\n"
+"<p>In the <b>Access Control</b> table, access can be denied or allowed to "
+"ACL Groups.\n"
+"If there are more ACL Groups in one line, it means that access will be "
+"allowed\n"
"or denied to members who belong to all ACL Groups at the same time.</p>\n"
msgstr ""
@@ -698,21 +699,23 @@
#. Logging and Timeouts Dialog
#: src/include/squid/helps.rb:160
msgid ""
-"<p><b>Access Log</b> defines the file in which client activities are logged.</"
-"p>"
+"<p><b>Access Log</b> defines the file in which client activities are logged."
+"</p>"
msgstr ""
#: src/include/squid/helps.rb:163
msgid ""
-"<p><b>Cache Log</b> defines the file in which general information about your\n"
+"<p><b>Cache Log</b> defines the file in which general information about "
+"your\n"
"cache's behavior is logged.</p>\n"
msgstr ""
#: src/include/squid/helps.rb:166
msgid ""
-"<p><b>Cache Store Log</b> defines the location of the transaction log of all\n"
-"objects that are stored in the object store, as well as the time when an objec"
-"t\n"
+"<p><b>Cache Store Log</b> defines the location of the transaction log of "
+"all\n"
+"objects that are stored in the object store, as well as the time when an "
+"object\n"
"gets deleted. This option can be left empty.</p>\n"
msgstr ""
@@ -852,13 +855,11 @@
#. test, if exists ACL with same name but different type
#: src/include/squid/store_del.rb:429
-msgid ""
-"ACL Group '%1' already exists with different type.\n"
+msgid "ACL Group '%1' already exists with different type.\n"
msgstr ""
#: src/include/squid/store_del.rb:433
-msgid ""
-"ACL Group '%1' must have type '%2'.\n"
+msgid "ACL Group '%1' must have type '%2'.\n"
msgstr ""
#: src/include/squid/store_del.rb:438
@@ -907,8 +908,7 @@
msgstr ""
#: src/include/squid/store_del.rb:524
-msgid ""
-"If you delete this ACL Group, these options might be affected: \n"
+msgid "If you delete this ACL Group, these options might be affected: \n"
msgstr ""
#. +
@@ -1198,8 +1198,8 @@
#: src/modules/SquidACL.rb:148
msgid ""
-"This refers to the destination domain, i.e. the source domain where the origin"
-" server is located."
+"This refers to the destination domain, i.e. the source domain where the "
+"origin server is located."
msgstr ""
#: src/modules/SquidACL.rb:155
@@ -1259,7 +1259,8 @@
msgstr ""
#: src/modules/SquidACL.rb:213
-msgid "Matches the URL path minus any protocol, port, and host name information"
+msgid ""
+"Matches the URL path minus any protocol, port, and host name information"
msgstr ""
#: src/modules/SquidACL.rb:220
@@ -1312,8 +1313,8 @@
#: src/modules/SquidACL.rb:278
msgid ""
-"A regular expression that matches the client's browser type based on the user "
-"agent header."
+"A regular expression that matches the client's browser type based on the "
+"user agent header."
msgstr ""
#: src/modules/SquidACL.rb:288
@@ -1322,8 +1323,8 @@
#: src/modules/SquidACL.rb:300
msgid ""
-"Matches when the client's IP address has more than the specified number of HTT"
-"P connections established."
+"Matches when the client's IP address has more than the specified number of "
+"HTTP connections established."
msgstr ""
#: src/modules/SquidACL.rb:307
@@ -1344,7 +1345,8 @@
#: src/modules/SquidACL.rb:351
msgid ""
-"Regular expression matching the mime type of the reply received by squid. Can\n"
+"Regular expression matching the mime type of the reply received by squid. "
+"Can\n"
"be used to detect file download or some types of HTTP tunnelling requests.\n"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/storage.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/storage.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/storage.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-21 11:49+0200\n"
-"PO-Revision-Date: 2017-07-21 11:49+0200\n"
+"POT-Creation-Date: 2019-09-20 15:58+0200\n"
+"PO-Revision-Date: 2019-09-20 15:58+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -91,7 +91,7 @@
#. TRANSLATORS: button text
#. 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
+#: src/clients/inst_disk_proposal.rb:136 src/clients/inst_target_part.rb:501
msgid "Edit Proposal Settings"
msgstr ""
@@ -138,7 +138,7 @@
msgstr ""
#. TRANSLATORS: popup error message
-#: src/clients/inst_disk_proposal.rb:245 src/clients/inst_target_part.rb:449
+#: src/clients/inst_disk_proposal.rb:245
msgid "Not enough space available to propose separate /home."
msgstr ""
@@ -486,6 +486,10 @@
"remove or select a larger disk."
msgstr ""
+#: src/clients/inst_target_part.rb:450
+msgid "Not enough space available to propose separate %1."
+msgstr ""
+
#. loop over targetMap and build radio buttons for selection
#. dont use foreach here since we need a counter (as a shortcut)
#. anyway
@@ -509,7 +513,8 @@
#. 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:173
-msgid "No disks found. Try using the update CD, if available, for installation."
+msgid ""
+"No disks found. Try using the update CD, if available, for installation."
msgstr ""
#. There are several hard disks found. Linux is completely installed on
@@ -788,7 +793,7 @@
#. Label text
#. TRANSLATORS: checkbox text
#: src/include/partitioning/auto_part_ui.rb:341
-#: src/modules/StorageProposal.rb:6295
+#: src/modules/StorageProposal.rb:6318
msgid "Propose Separate &Home Partition"
msgstr ""
@@ -806,7 +811,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:248
+#: src/include/partitioning/custom_part_check_generated.rb:303
msgid ""
"You have not assigned a root partition for\n"
"installation. This does not work. Assign the root mount point \"/\" to a\n"
@@ -816,7 +821,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:261
+#: src/include/partitioning/custom_part_check_generated.rb:316
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"
@@ -826,7 +831,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:274
+#: src/include/partitioning/custom_part_check_generated.rb:329
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"
@@ -836,7 +841,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:288
+#: src/include/partitioning/custom_part_check_generated.rb:343
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"
@@ -847,7 +852,11 @@
#. 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:302
+#.
+#. Note:
+#. This covers the case *with* /boot but no prep. There's a similar blob below
+#. covering the case *without* /boot.
+#: src/include/partitioning/custom_part_check_generated.rb:361
msgid ""
"Warning:\n"
"Your system needs a boot partition, either with type 0x41 PReP/CHRP\n"
@@ -858,7 +867,7 @@
msgstr ""
#. popup text, %1 is a number
-#: src/include/partitioning/custom_part_check_generated.rb:318
+#: src/include/partitioning/custom_part_check_generated.rb:377
msgid ""
"Warning:\n"
"Your boot partition ends above cylinder %1.\n"
@@ -871,7 +880,7 @@
msgstr ""
#. popup text, %1 is a size
-#: src/include/partitioning/custom_part_check_generated.rb:338
+#: src/include/partitioning/custom_part_check_generated.rb:397
msgid ""
"Warning:\n"
"Your boot partition is smaller than %1.\n"
@@ -881,7 +890,7 @@
msgstr ""
#. /////////////////////////// NO BOOT ///////////////////////////
-#: src/include/partitioning/custom_part_check_generated.rb:355
+#: src/include/partitioning/custom_part_check_generated.rb:414
msgid ""
"Warning: There is no partition of type bios_grub present.\n"
"Such a partition is recommended (required with Btrfs) when Grub2 is\n"
@@ -893,7 +902,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:375
+#: src/include/partitioning/custom_part_check_generated.rb:434
msgid ""
"Warning: There is no partition mounted as /boot.\n"
"To boot from your hard disk, a small /boot partition\n"
@@ -905,7 +914,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:395
+#: src/include/partitioning/custom_part_check_generated.rb:454
msgid ""
"Warning: According to your setup, you intend to\n"
"boot your machine from the root partition (/), which, unfortunately,\n"
@@ -917,7 +926,7 @@
"Really use this setup?\n"
msgstr ""
-#: src/include/partitioning/custom_part_check_generated.rb:421
+#: src/include/partitioning/custom_part_check_generated.rb:480
msgid ""
"Warning: Some subvolumes of the root filesystem are shadowed by\n"
"mount points of other filesystem. This could lead to problems.\n"
@@ -926,7 +935,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:441
+#: src/include/partitioning/custom_part_check_generated.rb:500
msgid ""
"Warning: With your current setup, your %1\n"
"installation might not be directly bootable, because\n"
@@ -937,7 +946,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:459
+#: src/include/partitioning/custom_part_check_generated.rb:518
msgid ""
"Warning: With your current setup, your %2 installation\n"
"will encounter problems when booting, because you have no\n"
@@ -952,7 +961,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:481
+#: src/include/partitioning/custom_part_check_generated.rb:540
msgid ""
"Warning: With your current setup, your %2 installation will\n"
"encounter problems when booting, because you have no \n"
@@ -967,25 +976,26 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:504
+#: src/include/partitioning/custom_part_check_generated.rb:563
msgid "Really use this setup?"
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:512
+#: src/include/partitioning/custom_part_check_generated.rb:571
msgid ""
"\n"
"You have not assigned a swap partition. In most cases, we highly recommend \n"
"to create and assign a swap partition.\n"
"Swap partitions on your system are listed in the main window with the\n"
-"type \"Linux Swap\". An assigned swap partition has the mount point \"swap\".\n"
+"type \"Linux Swap\". An assigned swap partition has the mount point \"swap"
+"\".\n"
"You can assign more than one swap partition, if desired.\n"
"\n"
"Really use the setup without swap partition?\n"
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:528
+#: src/include/partitioning/custom_part_check_generated.rb:587
msgid ""
"\n"
"You chose to install onto an existing partition that will not be\n"
@@ -994,7 +1004,7 @@
msgstr ""
#. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:535
+#: src/include/partitioning/custom_part_check_generated.rb:594
msgid ""
"- if this is an existing ReiserFS partition\n"
"- if this partition already contains a Linux distribution that will be\n"
@@ -1003,15 +1013,16 @@
msgstr ""
#. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:542
+#: src/include/partitioning/custom_part_check_generated.rb:601
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"
+"formatting, especially if it is assigned to one of the standard mount "
+"points\n"
"like /, /boot, /opt or /var.\n"
msgstr ""
#. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:548
+#: src/include/partitioning/custom_part_check_generated.rb:607
msgid ""
"If you decide to format the partition, all data on it will be lost.\n"
"\n"
@@ -1019,64 +1030,64 @@
msgstr ""
#. popup text %1 is replaced by a raid name e.g. md0
-#: src/include/partitioning/custom_part_check_generated.rb:609
+#: src/include/partitioning/custom_part_check_generated.rb:668
msgid ""
"The selected device belongs to the RAID (%1).\n"
"Remove it from the RAID before editing it.\n"
msgstr ""
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:620
+#: src/include/partitioning/custom_part_check_generated.rb:679
msgid ""
"The selected device belongs to a volume group (%1).\n"
"Remove it from the volume group before editing it.\n"
msgstr ""
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:630
+#: src/include/partitioning/custom_part_check_generated.rb:689
msgid ""
"The selected device is used by volume (%1).\n"
"Remove the volume before editing it.\n"
msgstr ""
#. popup text %2 is a device name, %1 is the raid name
-#: src/include/partitioning/custom_part_check_generated.rb:663
+#: src/include/partitioning/custom_part_check_generated.rb:722
msgid ""
"The device (%2) belongs to the RAID (%1).\n"
"Remove it from the RAID before deleting it.\n"
msgstr ""
#. popup text, %1 and %2 are device names
-#: src/include/partitioning/custom_part_check_generated.rb:674
+#: src/include/partitioning/custom_part_check_generated.rb:733
msgid ""
"The device (%2) is used by %1.\n"
"Remove %1 before deleting it.\n"
msgstr ""
-#: src/include/partitioning/custom_part_check_generated.rb:686
+#: src/include/partitioning/custom_part_check_generated.rb:745
msgid "It cannot be deleted while mounted."
msgstr ""
#. popup text, %1 is a device name
-#: src/include/partitioning/custom_part_check_generated.rb:722
+#: src/include/partitioning/custom_part_check_generated.rb:781
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"
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:798
+#: src/include/partitioning/custom_part_check_generated.rb:857
msgid ""
-"The selected extended partition contains partitions which are currently mounte"
-"d:\n"
+"The selected extended partition contains partitions which are currently "
+"mounted:\n"
"%1\n"
-"We *strongly* recommend to unmount these partitions before you delete the exte"
-"nded partition.\n"
+"We *strongly* recommend to unmount these partitions before you delete the "
+"extended partition.\n"
"Choose Cancel unless you know exactly what you are doing.\n"
msgstr ""
#. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_check_generated.rb:816
+#: src/include/partitioning/custom_part_check_generated.rb:875
msgid ""
"\n"
"The selected extended partition contains at least one LVM partition\n"
@@ -1086,7 +1097,7 @@
msgstr ""
#. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_check_generated.rb:827
+#: src/include/partitioning/custom_part_check_generated.rb:886
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1096,7 +1107,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:838
+#: src/include/partitioning/custom_part_check_generated.rb:897
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1105,7 +1116,7 @@
msgstr ""
#. popup text, %1 is a size
-#: src/include/partitioning/custom_part_check_generated.rb:905
+#: src/include/partitioning/custom_part_check_generated.rb:964
msgid ""
"Warning:\n"
"\n"
@@ -1124,7 +1135,7 @@
#. label text
#: src/include/partitioning/custom_part_dialogs.rb:74
#: src/include/partitioning/ep-dialogs.rb:805
-#: src/modules/StorageProposal.rb:6423
+#: src/modules/StorageProposal.rb:6446
msgid "Do not forget what you enter here!"
msgstr ""
@@ -1167,7 +1178,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:817 src/modules/Storage.rb:4005
+#: src/include/partitioning/ep-dialogs.rb:817 src/modules/Storage.rb:4007
msgid "Reenter the Password for &Verification:"
msgstr ""
@@ -1187,7 +1198,7 @@
#. popup text
#. popup text
#: src/include/partitioning/custom_part_dialogs.rb:196
-#: src/modules/Storage.rb:3961
+#: src/modules/Storage.rb:3963
msgid ""
"You did not enter a password.\n"
"Try again.\n"
@@ -1196,7 +1207,7 @@
#. popup text
#. popup text
#: src/include/partitioning/custom_part_dialogs.rb:203
-#: src/modules/Storage.rb:3969
+#: src/modules/Storage.rb:3971
msgid ""
"The password must have at least %1 characters.\n"
"Try again.\n"
@@ -1225,7 +1236,8 @@
"Normally, a file system to mount is identified in /etc/fstab\n"
"by the device name. This identification can be changed so the file system \n"
"to mount is found by searching for a UUID or a volume label. Not all file \n"
-"systems can be mounted by UUID or a volume label. If an option is disabled, \n"
+"systems can be mounted by UUID or a volume label. If an option is "
+"disabled, \n"
"this is not possible.\n"
msgstr ""
@@ -1233,8 +1245,8 @@
#: src/include/partitioning/custom_part_dialogs.rb:479
msgid ""
"<p><b>Volume Label:</b>\n"
-"The name entered in this field is used as the volume label. This usually makes"
-" sense only \n"
+"The name entered in this field is used as the volume label. This usually "
+"makes sense only \n"
"when you activate the option for mounting by volume label.\n"
"A volume label cannot contain the / character or spaces.\n"
msgstr ""
@@ -1307,7 +1319,7 @@
#. Translators: checkbox text
#. TRANSLATORS: checkbox text
#: src/include/partitioning/custom_part_dialogs.rb:1069
-#: src/modules/StorageProposal.rb:6276
+#: src/modules/StorageProposal.rb:6299
msgid "Enable Snapshots"
msgstr ""
@@ -1434,8 +1446,8 @@
msgid ""
"The selected device contains partitions that are currently mounted:\n"
"%1\n"
-"We *strongly* recommended to unmount these partitions before deleting the part"
-"ition table.\n"
+"We *strongly* recommended to unmount these partitions before deleting the "
+"partition table.\n"
"Choose Cancel unless you know exactly what you are doing.\n"
msgstr ""
@@ -1470,8 +1482,7 @@
#. help text, richtext format
#: src/include/partitioning/custom_part_dialogs.rb:1558
-msgid ""
-"<p>Create and remove subvolumes from a Btrfs filesystem.</p>\n"
+msgid "<p>Create and remove subvolumes from a Btrfs filesystem.</p>\n"
msgstr ""
#: src/include/partitioning/custom_part_dialogs.rb:1563
@@ -1556,7 +1567,8 @@
#: src/include/partitioning/ep-dialogs.rb:745
msgid ""
"<p>\n"
-"This mount point corresponds to a temporary filesystem like /tmp or /var/tmp.\n"
+"This mount point corresponds to a temporary filesystem like /tmp or /var/"
+"tmp.\n"
"If you leave the encryption password empty, the system will create\n"
"a random password at system startup for you. This means, you will lose all\n"
"data on these filesystems at system shutdown.\n"
@@ -1569,8 +1581,8 @@
#: 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 sys"
-"tem.\n"
+"If you forget your password, you will lose access to the data on your file "
+"system.\n"
"Choose your password carefully. A combination of letters and numbers\n"
"is recommended. To ensure the password was entered correctly,\n"
"enter it twice.\n"
@@ -1583,8 +1595,8 @@
#: src/include/partitioning/ep-dialogs.rb:774
msgid ""
"<p>\n"
-"You must distinguish between uppercase and lowercase. A password should have a"
-"t\n"
+"You must distinguish between uppercase and lowercase. A password should have "
+"at\n"
"least %1 characters and, as a rule, not contain any special characters\n"
"(e.g., letters with accents or umlauts).\n"
"</p>\n"
@@ -1622,8 +1634,8 @@
#: src/include/partitioning/custom_part_helptexts.rb:159
msgid ""
"<p>\n"
-"If the encrypted file system does not contain any system file and therefore is"
-"\n"
+"If the encrypted file system does not contain any system file and therefore "
+"is\n"
"not needed for the update, you may select <b>Skip</b>. In this case, the\n"
"file system is not accessed during update.\n"
"</p>\n"
@@ -1652,8 +1664,7 @@
#. error popup text
#: src/include/partitioning/custom_part_lib.rb:50
-msgid ""
-"You cannot use the mount point \"%1\" for LVM.\n"
+msgid "You cannot use the mount point \"%1\" for LVM.\n"
msgstr ""
#. error popup text
@@ -1716,7 +1727,8 @@
#. error popup text
#: src/include/partitioning/custom_part_lib.rb:228
-msgid "Invalid character in mount point. Do not use \"`'!\"%#\" in a mount point."
+msgid ""
+"Invalid character in mount point. Do not use \"`'!\"%#\" in a mount point."
msgstr ""
#. error popup text
@@ -2235,7 +2247,8 @@
#: src/include/partitioning/ep-dialogs.rb:127
msgid ""
"<p>If you want to encrypt all data on the\n"
-"volume, select <b>Encrypt Device</b>. Changing the encryption on an existing\n"
+"volume, select <b>Encrypt Device</b>. Changing the encryption on an "
+"existing\n"
"volume will delete all data on it.</p>\n"
msgstr ""
@@ -2695,7 +2708,7 @@
#. error popup
#. TRANSLATORS: error popup
-#: src/include/partitioning/ep-hd-lib.rb:57 src/modules/Storage.rb:5234
+#: src/include/partitioning/ep-hd-lib.rb:57 src/modules/Storage.rb:5236
msgid "The disk is in use and cannot be modified."
msgstr ""
@@ -3165,8 +3178,8 @@
#: src/include/partitioning/ep-loop-dialogs.rb:36
msgid ""
"\n"
-"<p><b>Path Name of Loop File:</b><br>This must be an absolute path to the file"
-"\n"
+"<p><b>Path Name of Loop File:</b><br>This must be an absolute path to the "
+"file\n"
"containing the data for the encrypted loop device to set up.</p>\n"
msgstr ""
@@ -3431,7 +3444,8 @@
#: src/include/partitioning/ep-lvm-dialogs.rb:491
msgid ""
"<p>Enter the size as well as the number and size\n"
-"of stripes for the new logical volume. The number of stripes cannot be higher\n"
+"of stripes for the new logical volume. The number of stripes cannot be "
+"higher\n"
"than the number of physical volumes of the volume group.</p>"
msgstr ""
@@ -3477,8 +3491,8 @@
#: src/include/partitioning/ep-lvm-dialogs.rb:778
msgid ""
"<p>You can declare the logical volume as a <b>Normal Volume</b>.\n"
-"This is the default and means plain LVM Volumes like all volumes were before t"
-"he feature of <b>Thin Provisioning</b> existed.\n"
+"This is the default and means plain LVM Volumes like all volumes were before "
+"the feature of <b>Thin Provisioning</b> existed.\n"
"If in doubt this is most probably the right choice</p>"
msgstr ""
@@ -3486,16 +3500,16 @@
#: src/include/partitioning/ep-lvm-dialogs.rb:787
msgid ""
"<p>You can declare the logical volume as a <b>Thin Pool</b>.\n"
-"This means <b>Thin Volumes</b> allocate their needed space on demand from such"
-" a pool.</p>"
+"This means <b>Thin Volumes</b> allocate their needed space on demand from "
+"such a pool.</p>"
msgstr ""
#. helptext
#: src/include/partitioning/ep-lvm-dialogs.rb:794
msgid ""
"<p>You can declare the logical volume as a <b>Thin Volume</b>.\n"
-"This means the volume allocates needed space on demand from a <b>Thin Pool</b>"
-".</p>"
+"This means the volume allocates needed space on demand from a <b>Thin Pool</"
+"b>.</p>"
msgstr ""
#. heading for frame
@@ -3550,8 +3564,8 @@
msgid ""
"There are not enough suitable unused devices to create a volume group.\n"
"\n"
-"To use LVM, at least one unused partition of type 0x8e (or 0x83) or one unused"
-"\n"
+"To use LVM, at least one unused partition of type 0x8e (or 0x83) or one "
+"unused\n"
"RAID device is required. Change your partition table accordingly."
msgstr ""
@@ -3768,8 +3782,8 @@
#. fallback dialog content
#: src/include/partitioning/ep-nfs.rb:55
msgid ""
-"NFS configuration is not available. Check yast2-nfs-client package installatio"
-"n."
+"NFS configuration is not available. Check yast2-nfs-client package "
+"installation."
msgstr ""
#. heading
@@ -3799,18 +3813,18 @@
#: src/include/partitioning/ep-raid-dialogs.rb:87
msgid ""
"<p><b>RAID 0:</b> This level increases your disk performance.\n"
-"There is <b>NO</b> redundancy in this mode. If one of the drives crashes, data"
-" recovery will not be possible.</p>\n"
+"There is <b>NO</b> redundancy in this mode. If one of the drives crashes, "
+"data recovery will not be possible.</p>\n"
msgstr ""
#. helptext
#: src/include/partitioning/ep-raid-dialogs.rb:95
msgid ""
"<p><b>RAID 1:</b> <br>This mode has the best redundancy. It can be\n"
-"used with two or more disks. This mode maintains an exact copy of all data on "
-"all\n"
-"disks. As long as at least one disk is still working, no data is lost. The par"
-"titions\n"
+"used with two or more disks. This mode maintains an exact copy of all data "
+"on all\n"
+"disks. As long as at least one disk is still working, no data is lost. The "
+"partitions\n"
"used for this type of RAID should have approximately the same size.</p>\n"
msgstr ""
@@ -3818,10 +3832,10 @@
#: src/include/partitioning/ep-raid-dialogs.rb:106
msgid ""
"<p><b>RAID 5:</b> <br>This mode combines management of a larger number\n"
-"of disks and still maintains some redundancy. This mode can be used on three d"
-"isks or more.\n"
-"If one disk fails, all data is still intact. If two disks fail simultaneously,"
-" all data is lost</p>\n"
+"of disks and still maintains some redundancy. This mode can be used on three "
+"disks or more.\n"
+"If one disk fails, all data is still intact. If two disks fail "
+"simultaneously, all data is lost</p>\n"
msgstr ""
#. helptext
@@ -3836,9 +3850,10 @@
#: src/include/partitioning/ep-raid-dialogs.rb:126
msgid ""
"<p>Add partitions to your RAID. According to\n"
-"the RAID type, the usable disk size is the sum of these partitions (RAID0), th"
-"e size\n"
-"of the smallest partition (RAID 1), or (N-1)*smallest partition (RAID 5).</p>\n"
+"the RAID type, the usable disk size is the sum of these partitions (RAID0), "
+"the size\n"
+"of the smallest partition (RAID 1), or (N-1)*smallest partition (RAID 5).</"
+"p>\n"
msgstr ""
#. helptext
@@ -3900,10 +3915,10 @@
#: src/include/partitioning/ep-raid-dialogs.rb:338
msgid ""
"<p><b>Chunk Size:</b><br>It is the smallest \"atomic\" mass\n"
-"of data that can be written to the devices. A reasonable chunk size for RAID 5"
-" is 128 kB. For RAID 0,\n"
-"32 kB is a good starting point. For RAID 1, the chunk size does not affect the"
-" array very much.</p>\n"
+"of data that can be written to the devices. A reasonable chunk size for RAID "
+"5 is 128 kB. For RAID 0,\n"
+"32 kB is a good starting point. For RAID 1, the chunk size does not affect "
+"the array very much.</p>\n"
msgstr ""
#: src/include/partitioning/ep-raid-dialogs.rb:346
@@ -3914,8 +3929,8 @@
#: src/include/partitioning/ep-raid-dialogs.rb:353
msgid ""
"The parity algorithm to use with RAID5/6.\n"
-"Left-symmetric is the one that offers maximum performance on typical disks wit"
-"h rotating platters.\n"
+"Left-symmetric is the one that offers maximum performance on typical disks "
+"with rotating platters.\n"
msgstr ""
#. helptext
@@ -4178,9 +4193,11 @@
msgid ""
"<p><b>Default Mount by</b> gives the mount by\n"
"method for newly created file systems. <i>Device Name</i> uses the kernel\n"
-"device name, which is not persistent. <i>Device ID</i> and <i>Device Path</i>\n"
+"device name, which is not persistent. <i>Device ID</i> and <i>Device Path</"
+"i>\n"
"use names generated by udev from hardware information. These should be\n"
-"persistent but unfortunately this is not always true. Finally <i>UUID</i> and\n"
+"persistent but unfortunately this is not always true. Finally <i>UUID</i> "
+"and\n"
"<i>Volume Label</i> use the file systems UUID and label.</p>\n"
msgstr ""
@@ -4195,8 +4212,9 @@
#: src/include/partitioning/ep-settings.rb:217
msgid ""
"<p><b>Alignment of Newly Created Partitions</b>\n"
-"determines how created partitions are aligned. <b>cylinder</b> is the traditio"
-"nal alignment at cylinder boundaries of the disk. <b>optimal</b> aligns the \n"
+"determines how created partitions are aligned. <b>cylinder</b> is the "
+"traditional alignment at cylinder boundaries of the disk. <b>optimal</b> "
+"aligns the \n"
"partitions for best performance according to hints provided by the Linux \n"
"kernel or tries to be compatible with Windows Vista and Win 7.</p>\n"
msgstr ""
@@ -4445,8 +4463,8 @@
#: src/modules/DualMultiSelectionBox.rb:316
msgid ""
"<p>This dialog is for defining classes for the raid devices\n"
-"contained in the raid. Available classes are A, B, C, D and E but for many cas"
-"es\n"
+"contained in the raid. Available classes are A, B, C, D and E but for many "
+"cases\n"
"fewer classes are needed (e.g. only A and B). </p>"
msgstr ""
@@ -4454,10 +4472,12 @@
#: src/modules/DualMultiSelectionBox.rb:325
msgid ""
"<p>You can put a device into a class by right-clicking on the\n"
-"device and choosing the appropriate class from context menu. By pressing the \n"
-"Ctrl or Shift key you can select multiple devices and put them into a class i"
-"n\n"
-"one step. One can also use the buttons labeled \"%1\" to \"%2\" to put currently \n"
+"device and choosing the appropriate class from context menu. By pressing "
+"the \n"
+"Ctrl or Shift key you can select multiple devices and put them into a class "
+"in\n"
+"one step. One can also use the buttons labeled \"%1\" to \"%2\" to put "
+"currently \n"
"selected devices into this class.</p>"
msgstr ""
@@ -4480,7 +4500,8 @@
msgid ""
"<b>Interleaved</b> uses first device of class A, then first device of \n"
"class B, then all the following classes with assigned devices. Then the \n"
-"second device of class A, the second device of class B, and so on will follow."
+"second device of class A, the second device of class B, and so on will "
+"follow."
msgstr ""
#. dialog help text
@@ -4495,16 +4516,16 @@
#: src/modules/DualMultiSelectionBox.rb:379
msgid ""
"By pressing button \"<b>%1</b>\" you can select a file that contains\n"
-"lines with a regular expression and a class name (e.g. \"sda.* A\"). All device"
-"s that match \n"
-"the regular expression will be put into the class on this line. The regular ex"
-"pression is \n"
+"lines with a regular expression and a class name (e.g. \"sda.* A\"). All "
+"devices that match \n"
+"the regular expression will be put into the class on this line. The regular "
+"expression is \n"
"matched against the kernel name (e.g. /dev/sda1), \n"
-"the udev path name (e.g. /dev/disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0-part1"
-") and the\n"
+"the udev path name (e.g. /dev/disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0-"
+"part1) and the\n"
"the udev id (e.g. /dev/disk/by-id/ata-ST3500418AS_9VMN8X8L-part1). \n"
-"The first match finally determines the class if a devices name matches more th"
-"en one\n"
+"The first match finally determines the class if a devices name matches more "
+"then one\n"
"regular expression.</p>"
msgstr ""
@@ -4539,8 +4560,8 @@
#: 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 G"
-"igabyte or\n"
+"Size may be either entered as a number followed by K,M,G for Kilo-, Mega- or "
+"Gigabyte or\n"
"as a number followed by a percent sign meaning percentage of memory.</p>"
msgstr ""
@@ -4570,8 +4591,8 @@
#: 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 installat"
-"ion\n"
+"Writing to the file system is not possible. Default is false. During "
+"installation\n"
"the file system is always mounted read-write.</p>"
msgstr ""
@@ -4610,10 +4631,10 @@
"<p><b>Do Not Mount at System Start-up:</b>\n"
"The file system is not automatically mounted when the system starts.\n"
"An entry in /etc/fstab is created and the file system is mounted\n"
-"with the appropriate options when the command <tt>mount <mount point></t"
-"t>\n"
-"is entered (<mount point> is the directory to which the file system is m"
-"ounted). Default is false.</p>\n"
+"with the appropriate options when the command <tt>mount <mount point></"
+"tt>\n"
+"is entered (<mount point> is the directory to which the file system is "
+"mounted). Default is false.</p>\n"
msgstr ""
#. button text
@@ -4642,10 +4663,10 @@
"<tt>journal</tt> -- All data is committed to the journal prior to being\n"
"written into the main file system. Highest performance impact.<br>\n"
"<tt>ordered</tt> -- All data is forced directly out to the main file system\n"
-"prior to its metadata being committed to the journal. Medium performance impac"
-"t.<br>\n"
-"<tt>writeback</tt> -- Data ordering is not preserved. No performance impact.</"
-"p>\n"
+"prior to its metadata being committed to the journal. Medium performance "
+"impact.<br>\n"
+"<tt>writeback</tt> -- Data ordering is not preserved. No performance impact."
+"</p>\n"
msgstr ""
#. button text
@@ -4679,16 +4700,16 @@
#: src/modules/FileSystems.rb:660
msgid ""
-"Invalid characters in arbitrary option value. Do not use spaces or tabs. Try a"
-"gain."
+"Invalid characters in arbitrary option value. Do not use spaces or tabs. Try "
+"again."
msgstr ""
#. help text, richtext format
#: 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"
+"In this field, type any legal mount option allowed in the fourth field of /"
+"etc/fstab.\n"
"Multiple options are separated by commas.</p>\n"
msgstr ""
@@ -4713,8 +4734,8 @@
#: 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 syste"
-"ms.</p>\n"
+"This codepage is used for converting to shortname characters on FAT file "
+"systems.</p>\n"
msgstr ""
#. label text
@@ -4726,8 +4747,8 @@
#: 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 i"
-"s 2.</p>"
+"Specify the number of file allocation tables in the file system. The default "
+"is 2.</p>"
msgstr ""
#. label text
@@ -4739,9 +4760,9 @@
#: 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"
+"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"
msgstr ""
#. label text
@@ -4770,8 +4791,8 @@
#: 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"
+"This specifies the name of the hash function to use to sort the file names "
+"in directories.</p>\n"
msgstr ""
#. label text
@@ -4783,9 +4804,10 @@
#: 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 backward"
-"s compatibility with kernels of the 2.2.x series. '3.6' is more recent, but ca"
-"n only be used with kernel versions greater than or equal to 2.4.</p>\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"
msgstr ""
#. label text
@@ -4798,9 +4820,9 @@
#: 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, 20"
-"48 and 4096 bytes per block. If auto is selected, the standard block size of 4"
-"096 is used.</p>\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"
msgstr ""
#. label text
@@ -4826,8 +4848,8 @@
#: 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 spa"
-"ce in the file system that can be allocated to inodes.</p>\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"
msgstr ""
#. label text
@@ -4839,7 +4861,8 @@
#: 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"
+"The option \"Inode Aligned\" is used to specify whether inode allocation is "
+"or\n"
"is not aligned. By default inodes are aligned, which\n"
"is usually more efficient than unaligned access.</p>\n"
msgstr ""
@@ -4861,8 +4884,8 @@
#: 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"
+"Set the log size (in megabytes). If auto, the default is 40% of the "
+"aggregate size.</p>\n"
msgstr ""
#. label text
@@ -4895,9 +4918,9 @@
#: 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, a"
-"nd 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"
+"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"
msgstr ""
#. label text
@@ -4914,7 +4937,8 @@
"bytes-per-inode ratio, the fewer inodes will be created. Generally, this\n"
"value should not be smaller than the block size of the file system, or else\n"
"too many inodes will be created. It is not possible to expand the number of\n"
-"inodes on a file system after its creation. So be sure to enter a reasonable\n"
+"inodes on a file system after its creation. So be sure to enter a "
+"reasonable\n"
"value for this parameter.</p>\n"
msgstr ""
@@ -4934,10 +4958,10 @@
#. help text, richtext format
#: src/modules/FileSystems.rb:1046
msgid ""
-"<p><b>Percentage of Blocks Reserved for root:</b> Specify the percentage of bl"
-"ocks reserved for the super user. The default is computed so that normally 1 G"
-"ig is reserved. Upper limit for reserved default is 5.0, lowest reserved defau"
-"lt is 0.1.</p>"
+"<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 ""
#. checkbox text
@@ -4973,15 +4997,14 @@
#: 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"
+"Suppressed use of journaling on filesystem. Only activate this when you "
+"really\n"
"know what you are doing.</p>\n"
msgstr ""
#. this version makes some problems with interpreter, above lookup/add is OK
#: src/modules/Partitions.rb:937
-msgid ""
-"Operation not permitted on disk %{device}.\n"
+msgid "Operation not permitted on disk %{device}.\n"
msgstr ""
#. popup text %{device} is replaced by disk name e.g. /dev/hda
@@ -5048,7 +5071,7 @@
#. @param integer testsize
#. @param [Symbol] used_fs
#. @param [Boolean] verbose
-#: src/modules/Storage.rb:992
+#: src/modules/Storage.rb:994
msgid "Resize Not Possible:"
msgstr ""
@@ -5061,7 +5084,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:2695 src/modules/Storage.rb:3918
+#: src/modules/Storage.rb:2697 src/modules/Storage.rb:3920
msgid ""
"Could not set encryption.\n"
"System error code is %1.\n"
@@ -5070,7 +5093,7 @@
msgstr ""
#. popup text
-#: src/modules/Storage.rb:3949
+#: src/modules/Storage.rb:3951
msgid ""
"The first and the second version\n"
"of the password do not match.\n"
@@ -5078,7 +5101,7 @@
msgstr ""
#. popup text
-#: src/modules/Storage.rb:3980
+#: src/modules/Storage.rb:3982
msgid ""
"The password may only contain the following characters:\n"
"0..9, a..z, A..Z, and any of \"@#* ,.;:._-+=!$%&/|?{[()]}^\\<>\".\n"
@@ -5087,24 +5110,24 @@
#. Label: get password for encrypted volume
#. Please use newline if label is longer than 40 characters
-#: src/modules/Storage.rb:4034
+#: src/modules/Storage.rb:4036
msgid "&Enter Encryption Password:"
msgstr ""
#. Clear password fields on every round.
-#: src/modules/Storage.rb:4093
+#: src/modules/Storage.rb:4095
msgid "Provide Password"
msgstr ""
-#: src/modules/Storage.rb:4112
+#: src/modules/Storage.rb:4114
msgid "The following encrypted volumes are already available."
msgstr ""
-#: src/modules/Storage.rb:4127
+#: src/modules/Storage.rb:4129
msgid "Encrypted Volume Activation"
msgstr ""
-#: src/modules/Storage.rb:4131
+#: src/modules/Storage.rb:4133
msgid ""
"The following volumes contain an encryption signature but the \n"
"passwords are not yet known.\n"
@@ -5112,12 +5135,12 @@
"during an update or if they contain an encrypted LVM physical volume."
msgstr ""
-#: src/modules/Storage.rb:4143
+#: src/modules/Storage.rb:4145
msgid "Do you want to provide encryption passwords?"
msgstr ""
#. text in help field
-#: src/modules/Storage.rb:4200
+#: src/modules/Storage.rb:4202
msgid ""
"Enter encryption password for any of the\n"
"devices in the locked devices list.\n"
@@ -5125,97 +5148,98 @@
msgstr ""
#. header text
-#: src/modules/Storage.rb:4206
+#: src/modules/Storage.rb:4208
msgid "Enter Encryption Password"
msgstr ""
-#: src/modules/Storage.rb:4209
+#: src/modules/Storage.rb:4211
msgid "There are no encrypted volume to unlock."
msgstr ""
#. label text, multiple device names follow
-#: src/modules/Storage.rb:4222
+#: src/modules/Storage.rb:4224
msgid "Provide password for any of the following devices:"
msgstr ""
#. label text, one device name follows
-#: src/modules/Storage.rb:4225
+#: src/modules/Storage.rb:4227
msgid "Provide password for the following device:"
msgstr ""
-#: src/modules/Storage.rb:4238
+#: src/modules/Storage.rb:4240
msgid "Trying to unlock encrypted volumes..."
msgstr ""
-#: src/modules/Storage.rb:4262
+#: src/modules/Storage.rb:4264
msgid "Password did not unlock any volume."
msgstr ""
-#: src/modules/Storage.rb:4348
+#: src/modules/Storage.rb:4350
msgid "IDE Disk"
msgstr ""
-#: src/modules/Storage.rb:4354
+#: src/modules/Storage.rb:4356
msgid "SCSI Disk"
msgstr ""
-#: src/modules/Storage.rb:4360
+#: src/modules/Storage.rb:4362
msgid "Disk"
msgstr ""
-#: src/modules/Storage.rb:4388
+#: src/modules/Storage.rb:4390
msgid "DM RAID"
msgstr ""
-#: src/modules/Storage.rb:4401
+#: src/modules/Storage.rb:4403
msgid "MD RAID"
msgstr ""
#. TODO: more informative error message, but the Package module does
#. not provide anything
#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:4906
+#: src/modules/Storage.rb:4908
msgid "Installing required packages failed."
msgstr ""
-#: src/modules/Storage.rb:4907 src/modules/StorageClients.rb:159
+#: src/modules/Storage.rb:4909 src/modules/StorageClients.rb:159
msgid "Continue despite the error?"
msgstr ""
#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:5246
-msgid "Partitions cannot be created since other partitions on the disk are used."
+#: src/modules/Storage.rb:5248
+msgid ""
+"Partitions cannot be created since other partitions on the disk are used."
msgstr ""
-#: src/modules/Storage.rb:5272
+#: src/modules/Storage.rb:5274
msgid ""
"\n"
"Device %1 cannot be modified because it contains activated swap\n"
"that is needed to run the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5286
+#: src/modules/Storage.rb:5288
msgid ""
"\n"
"Device %1 cannot be modified because it contains the installation\n"
"data needed to perform the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5315
+#: src/modules/Storage.rb:5317
msgid ""
"\n"
"Device %1 cannot be removed because it contains activated swap\n"
"that is needed to run the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5324
+#: src/modules/Storage.rb:5326
msgid ""
"\n"
"Device %1 cannot be removed because it contains the installation\n"
"data needed to perform the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5353
+#: src/modules/Storage.rb:5355
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -5223,7 +5247,7 @@
"the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5364
+#: src/modules/Storage.rb:5366
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -5231,7 +5255,7 @@
msgstr ""
#. the check for verbose is needed for calls from StorageProposal (see bnc#871779)
-#: src/modules/Storage.rb:5386
+#: src/modules/Storage.rb:5388
msgid ""
"\n"
"Partition %1 cannot be removed since other partitions on the\n"
@@ -5239,18 +5263,18 @@
msgstr ""
#. FIXME: please, add description of the list that is returned by this function.
-#: src/modules/Storage.rb:5475
+#: src/modules/Storage.rb:5477
msgid "Nothing assigned as root filesystem!"
msgstr ""
-#: src/modules/Storage.rb:5476
+#: src/modules/Storage.rb:5478
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:6027
+#: src/modules/Storage.rb:6029
msgid "Adding the following resolvables failed: %1"
msgstr ""
@@ -5475,7 +5499,8 @@
#: src/modules/StorageFields.rb:346
msgid ""
"<b>Mount by</b> indicates how the file system\n"
-"is mounted: (Kernel) by kernel name, (Label) by file system label, (UUID) by\n"
+"is mounted: (Kernel) by kernel name, (Label) by file system label, (UUID) "
+"by\n"
"file system UUID, (ID) by device ID, and (Path) by device path.\n"
msgstr ""
@@ -5484,7 +5509,8 @@
msgid ""
"A question mark (?) indicates that\n"
"the file system is not listed in <tt>/etc/fstab</tt>. It is either mounted\n"
-"manually or by some automount system. When changing settings for this volume\n"
+"manually or by some automount system. When changing settings for this "
+"volume\n"
"YaST will not update <tt>/etc/fstab</tt>.\n"
msgstr ""
@@ -5499,8 +5525,8 @@
#: src/modules/StorageFields.rb:374
msgid ""
"An asterisk (*) after the mount point\n"
-"indicates a file system that is currently not mounted (for example, because it"
-"\n"
+"indicates a file system that is currently not mounted (for example, because "
+"it\n"
"has the <tt>noauto</tt> option set in <tt>/etc/fstab</tt>)."
msgstr ""
@@ -5834,34 +5860,35 @@
msgstr ""
#. bsc#983003
-#. penalty for not having separate /home
-#: src/modules/StorageProposal.rb:4624 src/modules/StorageProposal.rb:5747
+#. Make an LVM-based (VM: "Volume Manager") storage proposal.
+#. This is called from get_inst_prop().
+#: src/modules/StorageProposal.rb:4656 src/modules/StorageProposal.rb:5766
msgid ""
-"Resize impossible due to inconsistent file system. Try checking file system un"
-"der Windows."
+"Resize impossible due to inconsistent file system. Try checking file system "
+"under Windows."
msgstr ""
#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6262
+#: src/modules/StorageProposal.rb:6285
msgid "File System for Root Partition"
msgstr ""
#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6309
+#: src/modules/StorageProposal.rb:6332
msgid "File System for Home Partition"
msgstr ""
#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6327
+#: src/modules/StorageProposal.rb:6350
msgid "Enlarge &Swap for Suspend"
msgstr ""
-#: src/modules/StorageProposal.rb:6337
+#: src/modules/StorageProposal.rb:6360
msgid "Proposal Settings"
msgstr ""
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6352
+#: src/modules/StorageProposal.rb:6375
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"
@@ -5869,7 +5896,7 @@
msgstr ""
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6360
+#: src/modules/StorageProposal.rb:6383
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"
@@ -5878,45 +5905,45 @@
msgstr ""
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6369
+#: src/modules/StorageProposal.rb:6392
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>"
msgstr ""
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6376
+#: src/modules/StorageProposal.rb:6399
msgid ""
"<p>The swap partition can be made large enough to be used to suspend\n"
"the system to disk in most cases.</p>"
msgstr ""
-#: src/modules/StorageProposal.rb:6401
+#: src/modules/StorageProposal.rb:6424
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:6408
+#: src/modules/StorageProposal.rb:6431
msgid "Password:"
msgstr ""
#. Label: get same password again for verification
#. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6419
+#: src/modules/StorageProposal.rb:6442
msgid "Reenter the password for verification:"
msgstr ""
#. Clear password fields on every round.
-#: src/modules/StorageProposal.rb:6617
+#: src/modules/StorageProposal.rb:6640
msgid "&Partition-based Proposal"
msgstr ""
-#: src/modules/StorageProposal.rb:6619
+#: src/modules/StorageProposal.rb:6642
msgid "&LVM-based Proposal"
msgstr ""
-#: src/modules/StorageProposal.rb:6621
+#: src/modules/StorageProposal.rb:6644
msgid "&Encrypted LVM-based Proposal"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/sudo.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/sudo.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/sudo.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:30+0200\n"
-"PO-Revision-Date: 2016-08-30 18:30+0200\n"
+"POT-Creation-Date: 2019-09-20 15:58+0200\n"
+"PO-Revision-Date: 2019-09-20 15:58+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -322,32 +322,32 @@
#: src/include/sudo/dialogs.rb:486
msgid ""
"Host alias %1 is being used in one of the sudo rules.\n"
-"Deleting it may result in an inconsistent sudo configuration file. Really dele"
-"te it?\n"
+"Deleting it may result in an inconsistent sudo configuration file. Really "
+"delete it?\n"
msgstr ""
#. No alias name set so far
#: src/include/sudo/dialogs.rb:549
msgid ""
"User alias %1 is being used in one of the sudo rules.\n"
-"Deleting it may result in an inconsistent sudo configuration file. Really dele"
-"te it?\n"
+"Deleting it may result in an inconsistent sudo configuration file. Really "
+"delete it?\n"
msgstr ""
#. No alias name set so far
#: src/include/sudo/dialogs.rb:612
msgid ""
"RunAs alias %1 is being used in one of the sudo rules.\n"
-"Deleting it may result in an inconsistent sudo configuration file. Really dele"
-"te it?\n"
+"Deleting it may result in an inconsistent sudo configuration file. Really "
+"delete it?\n"
msgstr ""
#. No alias name set so far
#: src/include/sudo/dialogs.rb:674
msgid ""
"Command alias %1 is being used in one of the sudo rules.\n"
-"Deleting it may result in an inconsistent sudo configuration file. Really dele"
-"te it?\n"
+"Deleting it may result in an inconsistent sudo configuration file. Really "
+"delete it?\n"
msgstr ""
#. Read dialog help 1/2
@@ -407,8 +407,10 @@
#: src/include/sudo/helps.rb:74
msgid ""
"<b>RunAs</b> column is an\n"
-"\toptional parameter, containing user name (or alias) whose access privileges\n"
-"\twill be used to run commands. <b>NOPASSWD</b> is a tag, determining whether\n"
+"\toptional parameter, containing user name (or alias) whose access "
+"privileges\n"
+"\twill be used to run commands. <b>NOPASSWD</b> is a tag, determining "
+"whether\n"
"\tusers need to authorize themselves before running commands.\n"
"\t</p>\n"
"\t"
@@ -436,7 +438,8 @@
#: src/include/sudo/helps.rb:97
msgid ""
"<p>To edit existing rule, select an entry from the table and click on \n"
-"\t<b>Edit</b> button. To delete selected entry, click on <b>Delete</b> button.\n"
+"\t<b>Edit</b> button. To delete selected entry, click on <b>Delete</b> "
+"button.\n"
"\t</p> \n"
"\t"
msgstr ""
@@ -444,11 +447,11 @@
#. Single User Specification help 1/4
#: src/include/sudo/helps.rb:104
msgid ""
-"<p><b>User Name or Alias</b> may be specified by single username (e.g.foo), gr"
-"oup name prefixed\n"
+"<p><b>User Name or Alias</b> may be specified by single username (e.g.foo), "
+"group name prefixed\n"
"\twith '%' (e.g. %bar), or user alias name. If \n"
-"\tkeyword 'ALL' is used, it stands for any user. Select from existing users, gr"
-"oups and aliases \n"
+"\tkeyword 'ALL' is used, it stands for any user. Select from existing users, "
+"groups and aliases \n"
"\tin drop-down menu, or enter your own value. \n"
"\t</p>\n"
"\t"
@@ -456,14 +459,14 @@
#: src/include/sudo/helps.rb:112
msgid ""
-"<p><b>Hostname or Alias</b> entry consists of either hostname(e.g. www.example"
-".com), single IP \n"
-"\taddress (e.g. 192.168.0.1), IP address combined with netmask, or host alias. "
-"If commands may be\n"
-"\trun on any host, use keyword 'ALL'. Hostname or IP address is matched against"
-" your own hostname\n"
-"\tor IP address, so if you don't intend to share one /etc/sudoers file between "
-"multiple machines, \n"
+"<p><b>Hostname or Alias</b> entry consists of either hostname(e.g. www."
+"example.com) single IP \n"
+"\taddress (e.g. 192.168.0.1), IP address combined with netmask, or host "
+"alias. If commands may be\n"
+"\trun on any host, use keyword 'ALL'. Hostname or IP address is matched "
+"against your own hostname\n"
+"\tor IP address, so if you don't intend to share one /etc/sudoers file "
+"between multiple machines, \n"
"\t'ALL' or 'localhost' entry will be sufficient for almost all purposes. \n"
"\t</p>\n"
"\t"
@@ -472,15 +475,15 @@
#. Single User Specification help 2/4
#: src/include/sudo/helps.rb:122
msgid ""
-"<p><b>RunAs Username or Alias</b> is an optional parameter specifying an user,"
-" \n"
+"<p><b>RunAs Username or Alias</b> is an optional parameter specifying an "
+"user, \n"
"\twhose access privileges \n"
-"\twill be used to execute particular command. If empty, user <b>root</b> is the"
-" default\n"
-"\tone. It can be again single username, groupname prefixed with '%' or run_as a"
-"lias name\n"
-"\tSelect from existing users, groups and aliases in drop-down menu, or enter yo"
-"ur own value.\n"
+"\twill be used to execute particular command. If empty, user <b>root</b> is "
+"the default\n"
+"\tone. It can be again single username, groupname prefixed with '%' or "
+"run_as alias name\n"
+"\tSelect from existing users, groups and aliases in drop-down menu, or enter "
+"your own value.\n"
"\t</p>\n"
"\t"
msgstr ""
@@ -488,10 +491,10 @@
#. Single User Specification help 3/4
#: src/include/sudo/helps.rb:132
msgid ""
-"<p><b>No Password</b> is an optional tag. Normally, users have to authenticate"
-"\n"
-"\tthemselves (i.e. supply their own password, not root's one) before running pa"
-"rticular \n"
+"<p><b>No Password</b> is an optional tag. Normally, users have to "
+"authenticate\n"
+"\tthemselves (i.e. supply their own password, not root's one) before running "
+"particular \n"
"\tcommand. Set No Password tag to 'Yes' if you want to\n"
"\tdisable this authentication\n"
"\t</p>\n"
@@ -502,10 +505,10 @@
#: src/include/sudo/helps.rb:141
msgid ""
"<p><b>Commands to Run</b> table is a list of commands (optionally with\n"
-"\tparameters), directories and command aliases that particular user will be all"
-"owed \n"
-"\tto run. If a directory name is used, any command in that directory can be run"
-". \n"
+"\tparameters), directories and command aliases that particular user will be "
+"allowed \n"
+"\tto run. If a directory name is used, any command in that directory can be "
+"run. \n"
"\tAgain, keyword 'ALL' stands for any command, so use it with care.\n"
"\t</p>\n"
"\t"
@@ -513,10 +516,10 @@
#: src/include/sudo/helps.rb:149
msgid ""
-"To add a new command, click on <b>Add</b> button, fill in command name with op"
-"tional\n"
-"\tparameters and click <b>OK</b>. To remove command, select appropriate entry f"
-"rom the table\n"
+"To add a new command, click on <b>Add</b> button, fill in command name with "
+"optional\n"
+"\tparameters and click <b>OK</b>. To remove command, select appropriate "
+"entry from the table\n"
"\tand click on <b>Delete</b> button.\n"
"\t"
msgstr ""
@@ -525,10 +528,10 @@
#: src/include/sudo/helps.rb:156
msgid ""
"<p><b><big>User Aliases</big></b><br>\n"
-"\tIn this dialog, you can configure user aliases. User alias is a set of users "
-"that is given\n"
-"\tan unique name. This name is later used to refer to all users in this set in "
-"sudo configuration. \n"
+"\tIn this dialog, you can configure user aliases. User alias is a set of "
+"users that is given\n"
+"\tan unique name. This name is later used to refer to all users in this set "
+"in sudo configuration. \n"
"\t</p> \n"
"\t"
msgstr ""
@@ -536,8 +539,8 @@
#. User Aliases help 2/3
#: src/include/sudo/helps.rb:164
msgid ""
-"<p>To add a new user alias, click on <b>Add</b> button and fill in appropriate"
-" entries. \n"
+"<p>To add a new user alias, click on <b>Add</b> button and fill in "
+"appropriate entries. \n"
"\tAlias name and list of users in the alias must not be empty. \n"
"\t</p>\n"
"\t"
@@ -546,8 +549,8 @@
#. User Aliases help 3/3
#: src/include/sudo/helps.rb:171
msgid ""
-"<p>To edit existing user alias, select an entry from the table and click on <b"
-">Edit</b>\n"
+"<p>To edit existing user alias, select an entry from the table and click on "
+"<b>Edit</b>\n"
"\tbutton. To delete selected entry, click on <b>Delete</b> button. \n"
"\t</p>\n"
"\t"
@@ -557,10 +560,10 @@
#: src/include/sudo/helps.rb:178
msgid ""
"<p><b><big>Host Aliases</big></b><br>\n"
-"\tIn this dialog, you can configure host aliases. Host alias is a set of hosts "
-"that is given\n"
-"\tan unique name. This name is later used to refer to all hosts in this set in "
-"sudo configuration. \n"
+"\tIn this dialog, you can configure host aliases. Host alias is a set of "
+"hosts that is given\n"
+"\tan unique name. This name is later used to refer to all hosts in this set "
+"in sudo configuration. \n"
"\t</p>\n"
"\t"
msgstr ""
@@ -568,8 +571,8 @@
#. Host Aliases help 2/3
#: src/include/sudo/helps.rb:186
msgid ""
-"<p>To add a new host alias, click on <b>Add</b> button and fill in appropriate"
-" entries. \n"
+"<p>To add a new host alias, click on <b>Add</b> button and fill in "
+"appropriate entries. \n"
"\tAlias name and list of hosts in the alias must not be empty. \n"
"\t</p>\n"
"\t"
@@ -578,8 +581,8 @@
#. Host Aliases help 3/3
#: src/include/sudo/helps.rb:193
msgid ""
-"<p>To edit existing host alias, select an entry from the table and click on <b"
-">Edit</b>\n"
+"<p>To edit existing host alias, select an entry from the table and click on "
+"<b>Edit</b>\n"
"\tbutton. To delete selected entry, click on <b>Delete</b> button. \n"
"\t</p>\n"
"\t"
@@ -589,10 +592,10 @@
#: src/include/sudo/helps.rb:200
msgid ""
"<p><b><big>RunAs Aliases</big></b><br>\n"
-"\tIn this dialog, you can configure RunAs aliases. RunAs alias is a set of user"
-"s that is given\n"
-"\tan unique name. This name is later used to refer to all users in this set in "
-"sudo configuration. \n"
+"\tIn this dialog, you can configure RunAs aliases. RunAs alias is a set of "
+"users that is given\n"
+"\tan unique name. This name is later used to refer to all users in this set "
+"in sudo configuration. \n"
"\t</p> \n"
"\t"
msgstr ""
@@ -600,8 +603,8 @@
#. RunAs Aliases help 2/3
#: src/include/sudo/helps.rb:208
msgid ""
-"<p>To add a new RunAs alias, click on <b>Add</b> button and fill in appropriat"
-"e entries. \n"
+"<p>To add a new RunAs alias, click on <b>Add</b> button and fill in "
+"appropriate entries. \n"
"\tAlias name and list of users in the alias must not be empty. \n"
"\t</p>\n"
"\t"
@@ -610,8 +613,8 @@
#. RunAs Aliases help 3/3
#: src/include/sudo/helps.rb:215
msgid ""
-"<p>To edit existing RunAs alias, select an entry from the table and click on <"
-"b>Edit</b>\n"
+"<p>To edit existing RunAs alias, select an entry from the table and click on "
+"<b>Edit</b>\n"
"\tbutton. To delete selected entry, click on <b>Delete</b> button. \n"
"\t</p>\n"
"\t"
@@ -621,10 +624,10 @@
#: src/include/sudo/helps.rb:222
msgid ""
"<p><b><big>Command Aliases</big></b><br>\n"
-"\tIn this dialog, you can configure command aliases. Command alias is a set of "
-"commands \n"
-"\t(optionally with parameters) that is given an unique name. This name is then "
-"used to refer\n"
+"\tIn this dialog, you can configure command aliases. Command alias is a set "
+"of commands \n"
+"\t(optionally with parameters) that is given an unique name. This name is "
+"then used to refer\n"
"\tto all commands in this set in sudo configuration. \n"
"\t</p>\n"
"\t"
@@ -633,8 +636,8 @@
#. Command Aliases help 2/3
#: src/include/sudo/helps.rb:231
msgid ""
-"<p>To add a new command alias, click on <b>Add</b> button and fill in appropri"
-"ate entries. \n"
+"<p>To add a new command alias, click on <b>Add</b> button and fill in "
+"appropriate entries. \n"
"\tAlias name and list of commands in the alias must not be empty. \n"
"\t</p>\n"
"\t"
@@ -643,8 +646,8 @@
#. Command Aliases help 3/3
#: src/include/sudo/helps.rb:238
msgid ""
-"<p>To edit existing command alias, select an entry from the table and click on"
-" <b>Edit</b>\n"
+"<p>To edit existing command alias, select an entry from the table and click "
+"on <b>Edit</b>\n"
"\tbutton. To delete selected entry, click on <b>Delete</b> button. \n"
"\t</p>\n"
"\t"
@@ -654,11 +657,11 @@
#: src/include/sudo/helps.rb:245
msgid ""
"<p><b><big>User Alias</big></b><br>\n"
-"\tUser alias consists of one or more users, system groups (prefixed with '%') o"
-"r other\n"
-"\tuser aliases. It is given single name (must contain uppercase letters, number"
-"s and underscore\tonly), which is then used to refer to all users in this alias"
-".\n"
+"\tUser alias consists of one or more users, system groups (prefixed with "
+"'%') or other\n"
+"\tuser aliases. It is given single name (must contain uppercase letters, "
+"numbers and underscore\tonly), which is then used to refer to all users in "
+"this alias.\n"
"\t</p>\n"
"\t"
msgstr ""
@@ -667,12 +670,12 @@
#. Single User Alias Help 2/3
#: src/include/sudo/helps.rb:253 src/include/sudo/helps.rb:306
msgid ""
-"<p>Enter unique name into <b>Alias Name</b> text entry. To add users or groups"
-" to the\n"
-"\talias, select user or group name from the drop-down menu and click on <b>Add<"
-"/b> button.\n"
-"\tTo remove user from the alias, select appropriate entry from the table, and c"
-"lick on\n"
+"<p>Enter unique name into <b>Alias Name</b> text entry. To add users or "
+"groups to the\n"
+"\talias, select user or group name from the drop-down menu and click on "
+"<b>Add</b> button.\n"
+"\tTo remove user from the alias, select appropriate entry from the table, "
+"and click on\n"
"\t<b>Remove</b> button. To finish the configuration, click <b>OK</b>.\n"
"\t</p>\n"
"\t"
@@ -685,8 +688,8 @@
#: src/include/sudo/helps.rb:262 src/include/sudo/helps.rb:292
#: src/include/sudo/helps.rb:315 src/include/sudo/helps.rb:346
msgid ""
-"<b>Note:</b> Alias name must not be empty. Each alias must have at least one m"
-"ember.\n"
+"<b>Note:</b> Alias name must not be empty. Each alias must have at least one "
+"member.\n"
"\t"
msgstr ""
@@ -694,14 +697,14 @@
#: src/include/sudo/helps.rb:266
msgid ""
"<p><b><big>Host Alias</big></b><br>\n"
-"\tHost alias consists of one or more hostnames, single IP addresses, IP address"
-"es\n"
-"\tcombined with netmask id dotted quad notation (e.g. 192.168.0.0/255.255.255.0"
-") or\n"
-"\tCIDR number of bits notation (e.g. 192.168.0.0/24), or other host aliases. It"
-" is \n"
-"\tgiven single name (must contain uppercase letters, numbers and underscore onl"
-"y), which \n"
+"\tHost alias consists of one or more hostnames, single IP addresses, IP "
+"addresses\n"
+"\tcombined with netmask id dotted quad notation (e.g. "
+"192.168.0.0/255.255.255.0) or\n"
+"\tCIDR number of bits notation (e.g. 192.168.0.0/24), or other host aliases. "
+"It is \n"
+"\tgiven single name (must contain uppercase letters, numbers and underscore "
+"only), which \n"
"\tis then used to refer to all hosts in this alias.\n"
"\t</p>\n"
"\t"
@@ -711,8 +714,8 @@
#: src/include/sudo/helps.rb:277
msgid ""
"<p>Enter unique name into <b>Alias Name</b> text entry. To add hosts to the\n"
-"\talias, click on <b>Add</b> button. A pop-up window will appear, where you can"
-" enter\n"
+"\talias, click on <b>Add</b> button. A pop-up window will appear, where you "
+"can enter\n"
"\tvalid hostname or IP address and then click <b>OK</b>.\n"
"\t<p>\n"
"\t"
@@ -721,8 +724,8 @@
#. Single Host Alias Help 3/4
#: src/include/sudo/helps.rb:285
msgid ""
-"To remove host from the alias, select appropriate entry from the table, and cl"
-"ick on\n"
+"To remove host from the alias, select appropriate entry from the table, and "
+"click on\n"
"\t<b>Remove</b> button. To finish the configuration, click <b>OK</b>.\n"
"\t</p>\n"
"\t"
@@ -732,12 +735,12 @@
#: src/include/sudo/helps.rb:296
msgid ""
"<p><b><big>RunAs Alias</big></b><br>\n"
-"\tRunAs alias is very similar to User Alias. It consists of one or more users, "
-"system groups \n"
-"\t(prefixed with '%') or other RunAs aliases. It is given single name (must con"
-"tain \n"
-"\tuppercase letters, numbers and underscore only), which is then used to refer "
-"to all users \n"
+"\tRunAs alias is very similar to User Alias. It consists of one or more "
+"users, system groups \n"
+"\t(prefixed with '%') or other RunAs aliases. It is given single name (must "
+"contain \n"
+"\tuppercase letters, numbers and underscore only), which is then used to "
+"refer to all users \n"
"\tin this alias.\n"
"\t</p>\n"
"\t"
@@ -747,15 +750,15 @@
#: src/include/sudo/helps.rb:319
msgid ""
"<p><b><big>Command Alias</big></b><br>\n"
-"\tCommand Alias is a list of one or more commands (with optional parameters), d"
-"irectories, or\n"
-"\tother command aliases. It is given single name (must contain uppercase letter"
-"s, numbers and\n"
+"\tCommand Alias is a list of one or more commands (with optional "
+"parameters), directories, or\n"
+"\tother command aliases. It is given single name (must contain uppercase "
+"letters, numbers and\n"
"\tunderscore only), which is \n"
-"\tthen used to refer to all commands in this alias. A command can optionally ha"
-"ve one or more\n"
-"\tparameters specified. If so, users can run the command with these parameters "
-"only. If a \n"
+"\tthen used to refer to all commands in this alias. A command can optionally "
+"have one or more\n"
+"\tparameters specified. If so, users can run the command with these "
+"parameters only. If a \n"
"\tdirectory name is used, any command in that directory can be run. \n"
"\t</p>\n"
"\t"
@@ -764,12 +767,12 @@
#. Single Command Alias Help 2/4
#: src/include/sudo/helps.rb:331
msgid ""
-"<p>Enter unique name into <b>Alias Name</b> text entry. To add a new command t"
-"o the alias,\n"
-"\tclick on <b>Add</b> button.A pop-up window will appear, where you can enter c"
-"ommand name\n"
-"\t(or select one from file browser by clicking on <b>Browse</b> button. Additio"
-"nally, you can\n"
+"<p>Enter unique name into <b>Alias Name</b> text entry. To add a new command "
+"to the alias,\n"
+"\tclick on <b>Add</b> button.A pop-up window will appear, where you can "
+"enter command name\n"
+"\t(or select one from file browser by clicking on <b>Browse</b> button. "
+"Additionally, you can\n"
"\tspecify command parameters in <b>Parameters</b> text entry\n"
"\t"
msgstr ""
@@ -777,8 +780,8 @@
#. Single Command Alias Help 3/4
#: src/include/sudo/helps.rb:339
msgid ""
-"To remove command from the alias, select appropriate entry from the table, and"
-" click on\n"
+"To remove command from the alias, select appropriate entry from the table, "
+"and click on\n"
"\t<b>Remove</b> button. To finish the configuration, click <b>OK</b>.\n"
"\t</p>\n"
"\t"
@@ -809,7 +812,8 @@
#. end Commands
#: src/modules/Sudo.rb:545
-msgid "All changes will be lost. Really quit sudo configuration without saving?"
+msgid ""
+"All changes will be lost. Really quit sudo configuration without saving?"
msgstr ""
#. Error message
Modified: branches/SLE12-SP5/yast/50-pot/support.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/support.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/support.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:30+0200\n"
-"PO-Revision-Date: 2016-08-30 18:30+0200\n"
+"POT-Creation-Date: 2019-09-20 15:58+0200\n"
+"PO-Revision-Date: 2019-09-20 15:58+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -107,7 +107,7 @@
msgid "Upload log files tarball to URL"
msgstr ""
-#: src/include/support/dialogs.rb:259 src/include/support/dialogs.rb:760
+#: src/include/support/dialogs.rb:259 src/include/support/dialogs.rb:723
msgid "Upload Target"
msgstr ""
@@ -194,76 +194,76 @@
msgstr ""
#. Support configure2 dialog caption
-#: src/include/support/dialogs.rb:684
+#: src/include/support/dialogs.rb:693
msgid "Supportconfig Contact Configuration"
msgstr ""
#. Support configure2 dialog contents
-#: src/include/support/dialogs.rb:689
+#: src/include/support/dialogs.rb:698
msgid "Contact Information"
msgstr ""
-#: src/include/support/dialogs.rb:694
+#: src/include/support/dialogs.rb:702
msgid "Company"
msgstr ""
-#: src/include/support/dialogs.rb:705
+#: src/include/support/dialogs.rb:703
msgid "Email Address"
msgstr ""
-#: src/include/support/dialogs.rb:712
+#: src/include/support/dialogs.rb:704
msgid "Name"
msgstr ""
-#: src/include/support/dialogs.rb:719
+#: src/include/support/dialogs.rb:705
msgid "Phone Number"
msgstr ""
-#: src/include/support/dialogs.rb:726
+#: src/include/support/dialogs.rb:710
msgid "Store ID"
msgstr ""
-#: src/include/support/dialogs.rb:737
+#: src/include/support/dialogs.rb:711
msgid "Terminal ID"
msgstr ""
-#: src/include/support/dialogs.rb:748
+#: src/include/support/dialogs.rb:712
msgid "GPG UID"
msgstr ""
-#: src/include/support/dialogs.rb:755
+#: src/include/support/dialogs.rb:718
msgid "Upload Information"
msgstr ""
-#: src/include/support/dialogs.rb:774
-msgid "11-digit service request number"
+#: src/include/support/dialogs.rb:733
+msgid "Service request number"
msgstr ""
#. abort?
-#: src/include/support/dialogs.rb:851
-msgid "The SR number must be 11 digits"
+#: src/include/support/dialogs.rb:810
+msgid "The service request number must be at least 11 digits"
msgstr ""
-#: src/include/support/dialogs.rb:869
+#: src/include/support/dialogs.rb:828
msgid "Collecting Data"
msgstr ""
-#: src/include/support/dialogs.rb:870
+#: src/include/support/dialogs.rb:831
msgid "Progress"
msgstr ""
-#. Remove ANSI escape codes for cursor movement (bnc#921233)
-#: src/include/support/dialogs.rb:939
+#. work around bsc#1106744
+#: src/include/support/dialogs.rb:902
msgid "Collected Data Review"
msgstr ""
#. FIXME use list of generated files, as well as directory prefix
#. `MultiLineEdit (`id (`file), `opt (`read_only), _("File Contents"))
-#: src/include/support/dialogs.rb:986 src/include/support/dialogs.rb:1034
+#: src/include/support/dialogs.rb:949 src/include/support/dialogs.rb:997
msgid "File Name"
msgstr ""
-#: src/include/support/dialogs.rb:992
+#: src/include/support/dialogs.rb:955
msgid "Remove from Data"
msgstr ""
@@ -326,10 +326,10 @@
msgid ""
"\n"
"<p><b><big>Opening SUSE Support Center</big></b><br>\n"
-"To start a Web browser that opens the SUSE Support Center Portal, use <b>Open "
-"SUSE Support Center</b>.\n"
-"You can then open a Service Request with Global Technical Support. Make sure y"
-"ou write down\n"
+"To start a Web browser that opens the SUSE Support Center Portal, use "
+"<b>Open SUSE Support Center</b>.\n"
+"You can then open a Service Request with Global Technical Support. Make sure "
+"you write down\n"
"the Service Request number to include in the supportconfig data upload.</p>\n"
msgstr ""
@@ -352,7 +352,8 @@
#: src/include/support/helps.rb:90
msgid ""
"<p><b><big>Supportconfig Options</big></b><br>\n"
-"Select an option to override the defaults. You can use the default settings,\n"
+"Select an option to override the defaults. You can use the default "
+"settings,\n"
"gather the most data or only gather a minimum amount of data."
msgstr ""
@@ -369,36 +370,38 @@
msgid ""
"<p><b><big>Options</big></b><br>\n"
"Collect additional information. Usually these options are not\n"
-"necessary, but can be included if circumstances require more information.</p>\n"
+"necessary, but can be included if circumstances require more information.</"
+"p>\n"
msgstr ""
#. Expert dialog help 1/1
#: src/include/support/helps.rb:108
msgid ""
"<p><big><b>Default Options</b></big><br>\n"
-"Select or deselect each of the data sets you would like to include in the supp"
-"ortconfig tarball.</p>"
+"Select or deselect each of the data sets you would like to include in the "
+"supportconfig tarball.</p>"
msgstr ""
#. Contact dialog help 1/4
#: src/include/support/helps.rb:112
msgid ""
"<p><big><b>Contact Information</b></big><br>\n"
-"Fill in each of the contact information fields that you would like to include\n"
-"in the supportconfig tarball. The fields are saved in the basic-environment.tx"
-"t file.</p>"
+"Fill in each of the contact information fields that you would like to "
+"include\n"
+"in the supportconfig tarball. The fields are saved in the basic-environment."
+"txt file.</p>"
msgstr ""
#. Contact dialog help 2/4
#: src/include/support/helps.rb:118
msgid ""
"<p><b><big>Upload Information</big></b><br>\n"
-"The upload target is the supportconfig tarball's destination URI. Supported up"
-"load services include\n"
-"ftp, http, https, scp. If you need to include the supportconfig tarball filena"
-"me in your upload target,\n"
-"use the <i>tarball</i> keyword. This will get replaced with the actual tarball"
-" filename.\n"
+"The upload target is the supportconfig tarball's destination URI. Supported "
+"upload services include\n"
+"ftp, http, https, scp. If you need to include the supportconfig tarball "
+"filename in your upload target,\n"
+"use the <i>tarball</i> keyword. This will get replaced with the actual "
+"tarball filename.\n"
"See <i>man supportconfig(1)</i> for further details.</p>"
msgstr ""
@@ -406,8 +409,8 @@
#: src/include/support/helps.rb:126
msgid ""
"<p><b><big>Upload Target Examples</big></b><br>\n"
-"https://secure-www.novell.com/upload?appname=supportconfig&file=<i>tarball</i>"
-"<br>\n"
+"https://secure-www.novell.com/upload?appname=supportconfig&file=<i>tarball</"
+"i><br>\n"
"ftp://ftp.novell.com/incoming<br>\n"
"scp://central.server.foo.com/supportconfig/archives</p>"
msgstr ""
@@ -415,10 +418,10 @@
#. Contact dialog help 4/4
#: src/include/support/helps.rb:133
msgid ""
-"<p><b>Note:</b> If you are uploading a supportconfig tarball to Global Technic"
-"al Support,\n"
-"make sure you include the 11-digit service request number from your open servi"
-"ce request.\n"
+"<p><b>Note:</b> If you are uploading a supportconfig tarball to Global "
+"Technical Support,\n"
+"make sure you include the service request number from your open service "
+"request.\n"
msgstr ""
#. Collecting data dialkog help 1/1
@@ -432,16 +435,16 @@
#: src/include/support/helps.rb:141
msgid ""
"<p><b><big>Collected Data Review</big></b><br>\n"
-"Review the data collected by supportconfig. If you do not want to share some o"
-"f the collected data,\n"
+"Review the data collected by supportconfig. If you do not want to share some "
+"of the collected data,\n"
"use <b>Remove from Data</b> and the selected file will be removed.</p>\n"
msgstr ""
#. Configure1 dialog help 1/3
#: src/include/support/helps.rb:148
msgid ""
-"<p><b><big>Upload supportconfig tarball to Global Technical Support</big></b><"
-"br>\n"
+"<p><b><big>Upload supportconfig tarball to Global Technical Support</big></"
+"b><br>\n"
"If you want to store a copy of the supportconfig tarball, select the target\n"
"directory and make sure that this option is checked.\n"
"<br></p>\n"
@@ -452,8 +455,8 @@
#: src/include/support/helps.rb:155 src/include/support/helps.rb:180
msgid ""
"<p><b><big>Upload URL</big></b><br>\n"
-"This option has the location to which the supportconfig tarball will be upload"
-"ed\n"
+"This option has the location to which the supportconfig tarball will be "
+"uploaded\n"
"as default value.\n"
"Change this value only in special cases.\n"
"</p>\n"
@@ -470,8 +473,8 @@
#: src/include/support/helps.rb:173
msgid ""
-"<p><b><big>Upload supportconfig tarball to Global Technical Support</big></b><"
-"br>\n"
+"<p><b><big>Upload supportconfig tarball to Global Technical Support</big></"
+"b><br>\n"
"If you have already created the supportconfig tarball, write the full path\n"
"into the <i>Package with log files</i> field.\n"
"<br></p>\n"
@@ -553,14 +556,14 @@
#: src/include/support/supportconfig_conf.rb:57
msgid ""
-"System environment information, including sysctl and root's environment. env.t"
-"xt"
+"System environment information, including sysctl and root's environment. env."
+"txt"
msgstr ""
#: src/include/support/supportconfig_conf.rb:60
msgid ""
-"Recursively gets *.conf files, along with various other configuration files in"
-" /etc. etc.txt"
+"Recursively gets *.conf files, along with various other configuration files "
+"in /etc. etc.txt"
msgstr ""
#: src/include/support/supportconfig_conf.rb:63
@@ -581,8 +584,8 @@
#: src/include/support/supportconfig_conf.rb:75
msgid ""
-"Novell Linux User Management-related information, including a root DSE, UNIX C"
-"onfig and workstation object searches. novell-lum.txt"
+"Novell Linux User Management-related information, including a root DSE, UNIX "
+"Config and workstation object searches. novell-lum.txt"
msgstr ""
#: src/include/support/supportconfig_conf.rb:78
@@ -639,8 +642,8 @@
#: src/include/support/supportconfig_conf.rb:117
msgid ""
-"Pluggable Authentication Module-related information, including user account in"
-"formation. pam.txt"
+"Pluggable Authentication Module-related information, including user account "
+"information. pam.txt"
msgstr ""
#: src/include/support/supportconfig_conf.rb:120
@@ -661,8 +664,8 @@
#: src/include/support/supportconfig_conf.rb:132
msgid ""
-"System Activity Reporting-related information, including copies of the SAR dat"
-"a files. sar.txt"
+"System Activity Reporting-related information, including copies of the SAR "
+"data files. sar.txt"
msgstr ""
#: src/include/support/supportconfig_conf.rb:135
@@ -675,10 +678,10 @@
#: src/include/support/supportconfig_conf.rb:141
msgid ""
-"Self-Monitoring, Analysis, and Reporting Technology-related information for ha"
-"rd disks. WARNING: Some hard disk controllers and drives do not\n"
-"behave nicely. Probing SMART data has been known to change file systems to rea"
-"d only mode or even hang the server. Make sure probing SMART data\n"
+"Self-Monitoring, Analysis, and Reporting Technology-related information for "
+"hard disks. WARNING: Some hard disk controllers and drives do not\n"
+"behave nicely. Probing SMART data has been known to change file systems to "
+"read only mode or even hang the server. Make sure probing SMART data\n"
"works in your environment before enabling this option. fs-smartmon.txt\n"
msgstr ""
@@ -712,18 +715,20 @@
#: src/include/support/supportconfig_conf.rb:167
msgid ""
-"Tells supportconfig to search the file system for all eDirectory instances fil"
-"es. If set, ADD_OPTION_FSLIST is automatically set as well. -e"
+"Tells supportconfig to search the file system for all eDirectory instances "
+"files. If set, ADD_OPTION_FSLIST is automatically set as well. -e"
msgstr ""
#: src/include/support/supportconfig_conf.rb:170
-msgid "A full file list using find from the root of the filesytem. -L, fs-files.txt"
+msgid ""
+"A full file list using find from the root of the filesytem. -L, fs-files.txt"
msgstr ""
#: src/include/support/supportconfig_conf.rb:173
msgid ""
-"Includes the entire log file, including comments, instead of just VAR_OPTION_L"
-"INE_COUNT lines of it. Additional rotated logs are included if available. -l"
+"Includes the entire log file, including comments, instead of just "
+"VAR_OPTION_LINE_COUNT lines of it. Additional rotated logs are included if "
+"available. -l"
msgstr ""
#: src/include/support/supportconfig_conf.rb:176
@@ -732,20 +737,20 @@
#: src/include/support/supportconfig_conf.rb:179
msgid ""
-"Normally all of the /var/log/YaST2/* logs are included. This option minimizes "
-"the amount of each file retrieved."
+"Normally all of the /var/log/YaST2/* logs are included. This option "
+"minimizes the amount of each file retrieved."
msgstr ""
#: src/include/support/supportconfig_conf.rb:182
msgid ""
-"Runs an rpm -V on every installed RPM package. This takes some time to complet"
-"e. -v, rpm-verify.txt"
+"Runs an rpm -V on every installed RPM package. This takes some time to "
+"complete. -v, rpm-verify.txt"
msgstr ""
#: src/include/support/supportconfig_conf.rb:185
msgid ""
-"Normally only the base SLP service types are listed. This option allows you to"
-" query each of the discovered service types individually. -s, slp.txt"
+"Normally only the base SLP service types are listed. This option allows you "
+"to query each of the discovered service types individually. -s, slp.txt"
msgstr ""
#: src/include/support/supportconfig_conf.rb:188
@@ -766,44 +771,46 @@
#: src/include/support/supportconfig_conf.rb:200
msgid ""
-"The number of lines to include when getting a log file. Zero means get the ent"
-"ire file."
+"The number of lines to include when getting a log file. Zero means get the "
+"entire file."
msgstr ""
#: src/include/support/supportconfig_conf.rb:203
msgid ""
-"The supportconfig tarball location. The first valid location in the list is al"
-"ways used."
+"The supportconfig tarball location. The first valid location in the list is "
+"always used."
msgstr ""
#: src/include/support/supportconfig_conf.rb:206
msgid ""
-"The maximum number of /var/log/messages lines to get. Zero means get the entir"
-"e file."
+"The maximum number of /var/log/messages lines to get. Zero means get the "
+"entire file."
msgstr ""
#: src/include/support/supportconfig_conf.rb:209
msgid ""
-"The maximum number of heartbeat policy engine log files to include in the supp"
-"ortconfig tarball."
+"The maximum number of heartbeat policy engine log files to include in the "
+"supportconfig tarball."
msgstr ""
#: src/include/support/supportconfig_conf.rb:212
-msgid "The maximum number of SAR data files to include in the supportconfig tarball."
+msgid ""
+"The maximum number of SAR data files to include in the supportconfig tarball."
msgstr ""
#: src/include/support/supportconfig_conf.rb:215
msgid ""
-"When set to 1, supportconfig runs in quiet mode. This option is useful if you\n"
-"plan on running supportconfig regularly in a cron job for example. Set with -Q"
-"."
+"When set to 1, supportconfig runs in quiet mode. This option is useful if "
+"you\n"
+"plan on running supportconfig regularly in a cron job for example. Set with -"
+"Q."
msgstr ""
#: src/include/support/supportconfig_conf.rb:218
msgid ""
-"Used to specify where the supportconfig tarball will be uploaded, when using t"
-"he -u srnum startup option. You can specify any FTP server that supports anony"
-"mous uploads. The default is SUSE's public ftp server."
+"Used to specify where the supportconfig tarball will be uploaded, when using "
+"the -u srnum startup option. You can specify any FTP server that supports "
+"anonymous uploads. The default is SUSE's public ftp server."
msgstr ""
#. Initialization dialog caption
Modified: branches/SLE12-SP5/yast/50-pot/sysconfig.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/sysconfig.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/sysconfig.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:30+0200\n"
-"PO-Revision-Date: 2016-08-30 18:30+0200\n"
+"POT-Creation-Date: 2019-09-20 15:58+0200\n"
+"PO-Revision-Date: 2019-09-20 15:58+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -87,13 +87,11 @@
#. header (command line mode output)
#: src/include/sysconfig/cmdline.rb:43
-msgid ""
-"All Variables:\n"
+msgid "All Variables:\n"
msgstr ""
#: src/include/sysconfig/cmdline.rb:43
-msgid ""
-"Modified Variables:\n"
+msgid "Modified Variables:\n"
msgstr ""
#. status message - %1 is a device name (/dev/hdc), %2 is a mode name (udma2), %3 is a result (translated Success/Failed text)
@@ -299,17 +297,17 @@
#: src/include/sysconfig/complex.rb:819
msgid ""
"<p>After you save your changes, this editor changes the variables in the\n"
-"corresponding sysconfig file. Then it starts activation commands, which change"
-"s the underlying configuration files, stops and starts daemons,\n"
-"and runs low-level configuration tools so your configuration in sysconfig take"
-"s effect.</p>\n"
+"corresponding sysconfig file. Then it starts activation commands, which "
+"changes the underlying configuration files, stops and starts daemons,\n"
+"and runs low-level configuration tools so your configuration in sysconfig "
+"takes effect.</p>\n"
msgstr ""
#. helptext for popup - part 2/2
#: src/include/sysconfig/complex.rb:825
msgid ""
-"<p><b>Important:</b> You still can edit each individual configuration file man"
-"ually. The name of file is displayed in the variable description.</p>"
+"<p><b>Important:</b> You still can edit each individual configuration file "
+"manually. The name of file is displayed in the variable description.</p>"
msgstr ""
#: src/include/sysconfig/complex.rb:830
@@ -324,16 +322,16 @@
#. help rich text displayed after module start (1/2)
#: src/include/sysconfig/complex.rb:866
msgid ""
-"<P><B>System Configuration Editor</B></P><P>With the system configuration edit"
-"or, you can change some system settings. You can also use YaST to configure yo"
-"ur hardware and system settings.</P>"
+"<P><B>System Configuration Editor</B></P><P>With the system configuration "
+"editor, you can change some system settings. You can also use YaST to "
+"configure your hardware and system settings.</P>"
msgstr ""
#. help rich text displayed after module start (2/2)
#: src/include/sysconfig/complex.rb:870
msgid ""
-"<P><B>Note:</B> Descriptions are not translated because they are read directly"
-" from configuration files.</P>"
+"<P><B>Note:</B> Descriptions are not translated because they are read "
+"directly from configuration files.</P>"
msgstr ""
#. push button label - displayed only in autoinstallation config mode
@@ -364,8 +362,8 @@
#. help text in popup dialog
#: src/include/sysconfig/complex.rb:951
msgid ""
-"The search results are displayed here. If you see the item you want, select it"
-" then click \"Go to\". Otherwise, click \"Cancel\" to close this dialog."
+"The search results are displayed here. If you see the item you want, select "
+"it then click \"Go to\". Otherwise, click \"Cancel\" to close this dialog."
msgstr ""
#. push button label
Modified: branches/SLE12-SP5/yast/50-pot/tftp-server.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/tftp-server.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/tftp-server.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:30+0200\n"
-"PO-Revision-Date: 2016-08-30 18:30+0200\n"
+"POT-Creation-Date: 2019-09-20 15:58+0200\n"
+"PO-Revision-Date: 2019-09-20 15:58+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -83,8 +83,8 @@
#. dialog help text
#: src/include/tftp-server/dialogs.rb:83
msgid ""
-"<p>Use this to enable a server for TFTP (trivial file transfer protocol). The "
-"server will be started using xinetd.</p>"
+"<p>Use this to enable a server for TFTP (trivial file transfer protocol). "
+"The server will be started using xinetd.</p>"
msgstr ""
#. enlighten newbies, #102946
@@ -99,8 +99,8 @@
"<p><b>Boot Image Directory</b>:\n"
"Specify the directory where served files are located. The usual value is\n"
"<tt>/tftpboot</tt>. The directory will be created if it does not exist. \n"
-"The server uses this as its root directory (using the <tt>-s</tt> option).</p>"
-"\n"
+"The server uses this as its root directory (using the <tt>-s</tt> option).</"
+"p>\n"
msgstr ""
#. Radio button label, disable TFTP server
Modified: branches/SLE12-SP5/yast/50-pot/timezone_db.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/timezone_db.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/timezone_db.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:27+0200\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -216,7 +216,7 @@
msgstr ""
#: timezone/src/data/timezone_raw.ycp:83
-msgid "Uzhgorod"
+msgid "Ukraine (Uzhgorod)"
msgstr ""
#: timezone/src/data/timezone_raw.ycp:84
Modified: branches/SLE12-SP5/yast/50-pot/tune.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/tune.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/tune.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-01 02:30+0000\n"
-"PO-Revision-Date: 2017-02-01 02:30+0000\n"
+"POT-Creation-Date: 2019-09-20 15:58+0200\n"
+"PO-Revision-Date: 2019-09-20 15:58+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
Modified: branches/SLE12-SP5/yast/50-pot/update.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/update.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/update.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-20 02:29+0000\n"
-"PO-Revision-Date: 2017-04-20 02:29+0000\n"
+"POT-Creation-Date: 2019-09-20 15:58+0200\n"
+"PO-Revision-Date: 2019-09-20 15:58+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -156,8 +156,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:1445 src/modules/RootPart.rb:1451
-#: src/modules/RootPart.rb:2009
+#: src/modules/RootPart.rb:1452 src/modules/RootPart.rb:1458
+#: src/modules/RootPart.rb:2016
msgid "Unknown"
msgstr ""
@@ -617,7 +617,7 @@
msgstr ""
#. label in a popup, %1 is device (eg. /dev/hda1), %2 is output of the 'mount' command
-#: src/modules/RootPart.rb:1269
+#: src/modules/RootPart.rb:1276
msgid ""
"The partition %1 could not be mounted.\n"
"\n"
@@ -630,39 +630,39 @@
msgstr ""
#. push button
-#: src/modules/RootPart.rb:1287
+#: src/modules/RootPart.rb:1294
msgid "&Specify Mount Options"
msgstr ""
#. popup heading
-#: src/modules/RootPart.rb:1303
+#: src/modules/RootPart.rb:1310
msgid "Mount Options"
msgstr ""
#. text entry label
-#: src/modules/RootPart.rb:1306
+#: src/modules/RootPart.rb:1313
msgid "&Mount Point"
msgstr ""
#. tex entry label
-#: src/modules/RootPart.rb:1309
+#: src/modules/RootPart.rb:1316
msgid "&Device"
msgstr ""
#. text entry label
-#: src/modules/RootPart.rb:1314
+#: src/modules/RootPart.rb:1321
msgid ""
"&File System\n"
"(empty for autodetection)"
msgstr ""
#. error message
-#: src/modules/RootPart.rb:1391
+#: src/modules/RootPart.rb:1398
msgid "The /var partition %1 could not be mounted.\n"
msgstr ""
#. Informational text about selected partition, %x are replaced with values later
-#: src/modules/RootPart.rb:1432
+#: src/modules/RootPart.rb:1439
msgid ""
"<b>File system:</b> %1, <b>Type:</b> %2,<br>\n"
"<b>Label:</b> %3, <b>Size:</b> %4,<br>\n"
@@ -670,17 +670,17 @@
"<b>udev path:</b> %6"
msgstr ""
-#: src/modules/RootPart.rb:1446
+#: src/modules/RootPart.rb:1453
msgid "None"
msgstr ""
#. a popup caption
-#: src/modules/RootPart.rb:1469
+#: src/modules/RootPart.rb:1476
msgid "Unable to find the /var partition automatically"
msgstr ""
#. a popup message
-#: src/modules/RootPart.rb:1474
+#: src/modules/RootPart.rb:1481
msgid ""
"Your system uses a separate /var partition which is required for the "
"upgrade\n"
@@ -690,22 +690,22 @@
msgstr ""
#. a combo-box label
-#: src/modules/RootPart.rb:1487
+#: src/modules/RootPart.rb:1494
msgid "&Select /var Partition Device"
msgstr ""
#. an informational rich-text widget label
-#: src/modules/RootPart.rb:1493
+#: src/modules/RootPart.rb:1500
msgid "Device Info"
msgstr ""
#. error message
-#: src/modules/RootPart.rb:1634
+#: src/modules/RootPart.rb:1641
msgid "Unable to mount /var partition with this disk configuration.\n"
msgstr ""
#. popup message, %1 will be replace with the name of the logfile
-#: src/modules/RootPart.rb:1665
+#: src/modules/RootPart.rb:1672
msgid ""
"Partitions could not be mounted.\n"
"\n"
@@ -715,7 +715,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:1709
+#: src/modules/RootPart.rb:1716
msgid ""
"Some partitions in the system on %1 are mounted by kernel-device name. This "
"is\n"
@@ -726,37 +726,37 @@
msgstr ""
#. error message
-#: src/modules/RootPart.rb:1727
+#: src/modules/RootPart.rb:1734
msgid "No fstab found."
msgstr ""
#. message part 1
-#: src/modules/RootPart.rb:1752
+#: src/modules/RootPart.rb:1759
msgid "The root partition in /etc/fstab has an invalid root device.\n"
msgstr ""
#. message part 2
-#: src/modules/RootPart.rb:1757
+#: src/modules/RootPart.rb:1764
msgid "It is currently mounted as %1 but listed as %2.\n"
msgstr ""
#. TRANSLATORS: label for filesystem snapshot taken before system update
-#: src/modules/RootPart.rb:1813
+#: src/modules/RootPart.rb:1820
msgid "before update"
msgstr ""
#. prepare progress-bar
-#: src/modules/RootPart.rb:2134
+#: src/modules/RootPart.rb:2141
msgid "Evaluating root partition. One moment please..."
msgstr ""
#. intermediate popup while mounting partitions
-#: src/modules/RootPart.rb:2217
+#: src/modules/RootPart.rb:2224
msgid "Mounting partitions. One moment please..."
msgstr ""
#. TRANSLATORS: dialog caption
-#: src/modules/RootPart.rb:2232
+#: src/modules/RootPart.rb:2239
msgid "Searching for Available Systems"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/users.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/users.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/users.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -1940,8 +1940,7 @@
#. the type of user set
#. New user is the default option
-#: src/include/users/widgets.rb:79
-#: src/lib/users/dialogs/inst_user_first.rb:279
+#: src/include/users/widgets.rb:79 src/lib/users/dialogs/inst_user_first.rb:279
msgid "Local Users"
msgstr ""
Modified: branches/SLE12-SP5/yast/50-pot/vm.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/vm.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/vm.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-31 02:29+0000\n"
-"PO-Revision-Date: 2017-03-31 02:29+0000\n"
+"POT-Creation-Date: 2019-09-20 15:59+0200\n"
+"PO-Revision-Date: 2019-09-20 15:59+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
Modified: branches/SLE12-SP5/yast/50-pot/vpn.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/vpn.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/vpn.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-20 00:30+0000\n"
-"PO-Revision-Date: 2016-10-20 00:30+0000\n"
+"POT-Creation-Date: 2019-09-20 15:59+0200\n"
+"PO-Revision-Date: 2019-09-20 15:59+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
Modified: branches/SLE12-SP5/yast/50-pot/wol.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/wol.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/wol.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:26+0200\n"
-"PO-Revision-Date: 2016-08-30 18:26+0200\n"
+"POT-Creation-Date: 2019-09-20 15:56+0200\n"
+"PO-Revision-Date: 2019-09-20 15:56+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
Modified: branches/SLE12-SP5/yast/50-pot/xpram.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/xpram.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/xpram.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-16 19:52+0200\n"
-"PO-Revision-Date: 2017-05-16 19:52+0200\n"
+"POT-Creation-Date: 2019-09-20 15:58+0200\n"
+"PO-Revision-Date: 2019-09-20 15:58+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
@@ -55,10 +55,10 @@
#. help text for XPRAM 2/4
#: src/include/s390/xpram/ui.rb:53
msgid ""
-"<p>This tool currently only supports assigning the entire XPRAM to one partiti"
-"on. To have multiple partitions, look at \"Device Drivers, Features and Command"
-"s November 30, 2004\" for the Linux kernel 2.6 - April 2004 stream.</p><p>In th"
-"is case disable XPRAM in this module.</p>"
+"<p>This tool currently only supports assigning the entire XPRAM to one "
+"partition. To have multiple partitions, look at \"Device Drivers, Features "
+"and Commands November 30, 2004\" for the Linux kernel 2.6 - April 2004 "
+"stream.</p><p>In this case disable XPRAM in this module.</p>"
msgstr ""
#. help text for XPRAM 3/4
Modified: branches/SLE12-SP5/yast/50-pot/yast2-apparmor.pot
===================================================================
--- branches/SLE12-SP5/yast/50-pot/yast2-apparmor.pot 2019-08-27 13:05:53 UTC (rev 97439)
+++ branches/SLE12-SP5/yast/50-pot/yast2-apparmor.pot 2019-09-20 15:19:27 UTC (rev 97440)
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-05 02:27+0000\n"
-"PO-Revision-Date: 2017-04-05 02:27+0000\n"
+"POT-Creation-Date: 2019-09-20 15:55+0200\n"
+"PO-Revision-Date: 2019-09-20 15:55+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
"Language: \n"
1
0