[opensuse-translation-commit] r90434 - trunk/yast/en_GB/po

29 Oct 2014

Author: keichwa
Date: 2014-10-29 17:01:59 +0100 (Wed, 29 Oct 2014)
New Revision: 90434

Modified:
   trunk/yast/en_GB/po/audit-laf.en_GB.po
   trunk/yast/en_GB/po/auth-client.en_GB.po
   trunk/yast/en_GB/po/auth-server.en_GB.po
   trunk/yast/en_GB/po/autoinst.en_GB.po
   trunk/yast/en_GB/po/base.en_GB.po
   trunk/yast/en_GB/po/bootloader.en_GB.po
   trunk/yast/en_GB/po/cluster.en_GB.po
   trunk/yast/en_GB/po/control.en_GB.po
   trunk/yast/en_GB/po/crowbar.en_GB.po
   trunk/yast/en_GB/po/drbd.en_GB.po
   trunk/yast/en_GB/po/ftp-server.en_GB.po
   trunk/yast/en_GB/po/geo-cluster.en_GB.po
   trunk/yast/en_GB/po/inetd.en_GB.po
   trunk/yast/en_GB/po/installation.en_GB.po
   trunk/yast/en_GB/po/instserver.en_GB.po
   trunk/yast/en_GB/po/iscsi-lio-server.en_GB.po
   trunk/yast/en_GB/po/isns.en_GB.po
   trunk/yast/en_GB/po/ldap.en_GB.po
   trunk/yast/en_GB/po/mail.en_GB.po
   trunk/yast/en_GB/po/network.en_GB.po
   trunk/yast/en_GB/po/packager.en_GB.po
   trunk/yast/en_GB/po/proxy.en_GB.po
   trunk/yast/en_GB/po/registration.en_GB.po
   trunk/yast/en_GB/po/s390.en_GB.po
   trunk/yast/en_GB/po/samba-server.en_GB.po
   trunk/yast/en_GB/po/security.en_GB.po
   trunk/yast/en_GB/po/services-manager.en_GB.po
   trunk/yast/en_GB/po/storage.en_GB.po
   trunk/yast/en_GB/po/vm.en_GB.po
Log:
merged

Modified: trunk/yast/en_GB/po/audit-laf.en_GB.po
===================================================================

--- trunk/yast/en_GB/po/audit-laf.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/audit-laf.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:51+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2001-07-17 16:27+0200\n"
 "Last-Translator: James Ogley <ogley@suse.co.uk>\n"
 "Language-Team: English <i18n@suse.de>\n"
@@ -871,47 +871,51 @@
 #: src/modules/AuditLaf.rb:463
 #, fuzzy
 #| msgid "Do you want to skip Registration?"
-msgid "Do you want to start it and enable start at boot\n"
+msgid ""
+"Do you want to start it and enable start at boot\n"
+"or only start the daemon for now?"
 msgstr "Do you want to skip Registration?"
 
-#. question continues
-#: src/modules/AuditLaf.rb:467
+#: src/modules/AuditLaf.rb:466
 msgid "The daemon 'auditd' doesn't run.\n"
 msgstr ""
 
 #. message about loaded kernel module
-#: src/modules/AuditLaf.rb:471
-msgid "The 'apparmor' kernel module is loaded.\n"
+#: src/modules/AuditLaf.rb:470
+msgid ""
+"The 'apparmor' kernel module is loaded.\n"
+"The kernel uses a running audit daemon to log audit\n"
+"events to /var/log/audit/audit.log (default).\n"
 msgstr ""
 
 #. Headline of a popup
-#: src/modules/AuditLaf.rb:480
+#: src/modules/AuditLaf.rb:477
 #, fuzzy
 #| msgid "Start daemon."
 msgid "Start of Audit Daemon"
 msgstr "Start daemon."
 
 #. label of three buttons belonging to the popup
-#: src/modules/AuditLaf.rb:482
+#: src/modules/AuditLaf.rb:479
 msgid "Start and &Enable"
 msgstr ""
 
-#: src/modules/AuditLaf.rb:482
+#: src/modules/AuditLaf.rb:479
 msgid "&Start"
 msgstr "&Start"
 
-#: src/modules/AuditLaf.rb:482
+#: src/modules/AuditLaf.rb:479
 #, fuzzy
 #| msgid "Do not install"
 msgid "&Do not start"
 msgstr "Do not install"
 
-#: src/modules/AuditLaf.rb:491
+#: src/modules/AuditLaf.rb:488
 #, fuzzy
 msgid "Cannot start the audit daemon."
 msgstr "Cannot restart the NTP daemon."
 
-#: src/modules/AuditLaf.rb:492
+#: src/modules/AuditLaf.rb:489
 msgid ""
 "The rules may be locked.\n"
 "Continue to check the rules. You can change\n"
@@ -920,40 +924,40 @@
 msgstr ""
 
 #. Auditd read dialog caption
-#: src/modules/AuditLaf.rb:548
+#: src/modules/AuditLaf.rb:545
 #, fuzzy
 msgid "Saving Audit Configuration"
 msgstr "Saving sudo Configuration"
 
 #. Progress stage 1/2
-#: src/modules/AuditLaf.rb:564
+#: src/modules/AuditLaf.rb:561
 msgid "Write the settings"
 msgstr "Write the settings"
 
 #. Progress stage 2/2
-#: src/modules/AuditLaf.rb:566
+#: src/modules/AuditLaf.rb:563
 #, fuzzy
 msgid "Write the rules"
 msgstr "Write the patterns"
 
 #. Progress step 1/2
-#: src/modules/AuditLaf.rb:570
+#: src/modules/AuditLaf.rb:567
 msgid "Writing the settings..."
 msgstr "Writing the settings..."
 
 #. Progress step 2/2
-#: src/modules/AuditLaf.rb:572
+#: src/modules/AuditLaf.rb:569
 #, fuzzy
 msgid "Writing the rules..."
 msgstr "Writing the patterns..."
 
 #. check first whether rules are already locked
-#: src/modules/AuditLaf.rb:588
+#: src/modules/AuditLaf.rb:585
 #, fuzzy
 msgid "The rules are already locked."
 msgstr "The target is already connected."
 
-#: src/modules/AuditLaf.rb:589
+#: src/modules/AuditLaf.rb:586
 msgid ""
 "Do you want to change the 'Enabled Flag'?\n"
 "If yes, the new rules will be written to /etc/audit/audit.rules.\n"
@@ -961,30 +965,30 @@
 msgstr ""
 
 #. Error message
-#: src/modules/AuditLaf.rb:614
+#: src/modules/AuditLaf.rb:611
 #, fuzzy
 msgid "Restart of the audit daemon failed."
 msgstr "Restart of the service %1 failed"
 
 #. Error message
-#: src/modules/AuditLaf.rb:621
+#: src/modules/AuditLaf.rb:618
 #, fuzzy
 msgid "Cannot write settings to auditd.conf."
 msgstr "Cannot write settings to /etc/ntp.conf."
 
 #. Error message, rules cannot be set
-#: src/modules/AuditLaf.rb:652
+#: src/modules/AuditLaf.rb:649
 msgid "Start yast2-audit-laf again and check the rules."
 msgstr ""
 
-#: src/modules/AuditLaf.rb:658
+#: src/modules/AuditLaf.rb:655
 #, fuzzy
 msgid "Cannot write settings to auditd.rules."
 msgstr "Cannot write settings to %1."
 
 #. Create a textual summary and a list of unconfigured cards
 #. @return summary of the current configuration
-#: src/modules/AuditLaf.rb:707
+#: src/modules/AuditLaf.rb:704
 #, fuzzy
 msgid "Log file"
 msgstr "&Log Files"

Modified: trunk/yast/en_GB/po/auth-client.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/auth-client.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/auth-client.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:51+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2014-05-19 09:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -183,11 +183,13 @@
 
 #. Main dialog contents
 #: src/include/dialogs.rb:512
-msgid "SPAM Prevention"
-msgstr "SPAM Prevention"
+#, fuzzy
+#| msgid "Authentication Key"
+msgid "Authentication Client"
+msgstr "Authentication Key"
 
-#: src/include/dialogs.rb:526 src/include/dialogs.rb:580
-#: src/include/dialogs.rb:586
+#: src/include/dialogs.rb:526 src/include/dialogs.rb:599
+#: src/include/dialogs.rb:605
 msgid "Configured Authentication Domains"
 msgstr "Configured Authentication Domains"
 
@@ -210,881 +212,881 @@
 
 #. initialize GUI
 #: src/include/dialogs.rb:553
-msgid "TODO WRITE HELP"
-msgstr "TODO WRITE HELP"
+msgid "SSSD provides a set of daemons to manage access to remote directories and authentication mechanisms.<br>You have to confiugre at least one authentication domain.<br>The first you have to set for a authentication domain is the identification and auth provider used for the domain.<br>In the next step you have to set some mandatory parameter for the selected providers.You can select later all parameters available for the selected identification and auth provider.SSSD provides following id_provider:<br><b>proxy</b>: Support a legacy NSS provider.<br><b>local</b>: SSSD internal provider for local users.<br><b>ldap</b>: LDAP provider. See sssd-ldap(5) for more information on configuring LDAP.<br><b>ipa</b>: FreeIPA and Red Hat Enterprise Identity Management provider.<br><b>ad</b>: Active Directory provider.<br>Supported auth providers are:<br><b>ldap</b> for native LDAP authentication.<br><b>krb5</b> for Kerberos authentication.<br><b>ipa</b> FreeIPA and Red Hat Enterprise Identity
  Management provider.<br><b>ad</b> Active Directory provider.<br><b>proxy</b> for relaying authentication to some other PAM target.<br><b>none</b> disables authentication explicitly.<br>The default auth provider is the id_provider.<br>"
+msgstr ""
 
 #. Define Global Parameters
 #: src/include/sssd-parameters.rb:17
 msgid "Indicates what is the syntax of the config file."
 msgstr "Indicates what is the syntax of the config file."
 
-#: src/include/sssd-parameters.rb:22
+#: src/include/sssd-parameters.rb:21
 msgid "Comma separated list of services that are started when sssd itself starts."
 msgstr "Comma separated list of services that are started when sssd itself starts."
 
-#: src/include/sssd-parameters.rb:27 src/include/sssd-parameters.rb:80
+#: src/include/sssd-parameters.rb:26 src/include/sssd-parameters.rb:79
 msgid "Number of times services should attempt to reconnect in the event of a Data Provider crash or restart before they give up"
 msgstr "Number of times services should attempt to reconnect in the event of a Data Provider crash or restart before they give up"
 
-#: src/include/sssd-parameters.rb:31
+#: src/include/sssd-parameters.rb:30
 msgid "SSSD can use more domains at the same time, but at least one must be configured or SSSD won't start."
 msgstr "SSSD can use more domains at the same time, but at least one must be configured or SSSD won't start."
 
-#: src/include/sssd-parameters.rb:32
+#: src/include/sssd-parameters.rb:31
 msgid "This parameter contains the list of domains in the order these will be queried."
 msgstr "This parameter contains the list of domains in the order these will be queried."
 
-#: src/include/sssd-parameters.rb:36
+#: src/include/sssd-parameters.rb:35
 msgid "Default regular expression that describes how to parse the string containing user name and domain into these components"
 msgstr "Default regular expression that describes how to parse the string containing user name and domain into these components"
 
-#: src/include/sssd-parameters.rb:40
+#: src/include/sssd-parameters.rb:39
 msgid "The default printf(3)-compatible format that describes how to translate a (name, domain) tuple into a fully qualified name."
 msgstr "The default printf(3)-compatible format that describes how to translate a (name, domain) tuple into a fully qualified name."
 
-#: src/include/sssd-parameters.rb:44
+#: src/include/sssd-parameters.rb:43
 msgid "SSSD monitors the state of resolv.conf to identify when it needs to update its internal DNS resolver."
 msgstr "SSSD monitors the state of resolv.conf to identify when it needs to update its internal DNS resolver."
 
-#: src/include/sssd-parameters.rb:45
+#: src/include/sssd-parameters.rb:44
 msgid "By default, we will attempt to use inotify for this, and will fall back to polling resolv.conf every five seconds if inotify cannot be used."
 msgstr "By default, we will attempt to use inotify for this, and will fall back to polling resolv.conf every five seconds if inotify cannot be used."
 
-#: src/include/sssd-parameters.rb:49
+#: src/include/sssd-parameters.rb:48
 msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files."
 msgstr "Directory on the filesystem where SSSD should store Kerberos replay cache files."
 
-#: src/include/sssd-parameters.rb:53
+#: src/include/sssd-parameters.rb:52
 msgid "This string will be used as a default domain name for all names without a domain name component."
 msgstr "This string will be used as a default domain name for all names without a domain name component."
 
 #. Define Global Services Parameters
-#: src/include/sssd-parameters.rb:60
+#: src/include/sssd-parameters.rb:59
 msgid "Bit mask that indicates which debug levels will be visible. 0x0010 is the default value as well as the lowest allowed value, 0xFFF0 is the most verbose mode."
 msgstr "Bit mask that indicates which debug levels will be visible. 0x0010 is the default value as well as the lowest allowed value, 0xFFF0 is the most verbose mode."
 
-#: src/include/sssd-parameters.rb:65
+#: src/include/sssd-parameters.rb:64
 msgid "Add a timestamp to the debug messages"
 msgstr "Add a timestamp to the debug messages"
 
-#: src/include/sssd-parameters.rb:70
+#: src/include/sssd-parameters.rb:69
 msgid "Add microseconds to the timestamp in debug messages"
 msgstr "Add microseconds to the timestamp in debug messages"
 
-#: src/include/sssd-parameters.rb:75
+#: src/include/sssd-parameters.rb:74
 msgid "Timeout in seconds between heartbeats for this service."
 msgstr "Timeout in seconds between heartbeats for this service."
 
-#: src/include/sssd-parameters.rb:85
+#: src/include/sssd-parameters.rb:84
 msgid "This option specifies the maximum number of file descriptors that may be opened at one time by this SSSD process."
 msgstr "This option specifies the maximum number of file descriptors that may be opened at one time by this SSSD process."
 
-#: src/include/sssd-parameters.rb:90
+#: src/include/sssd-parameters.rb:89
 msgid "This option specifies the number of seconds that a client of an SSSD process can hold onto a file descriptor without communicating on it."
 msgstr "This option specifies the number of seconds that a client of an SSSD process can hold onto a file descriptor without communicating on it."
 
-#: src/include/sssd-parameters.rb:95
+#: src/include/sssd-parameters.rb:94
 msgid "If a service is not responding to ping checks (see the “timeout” option), it is first sent the SIGTERM signal that instructs it to quit gracefully."
 msgstr "If a service is not responding to ping checks (see the “timeout” option), it is first sent the SIGTERM signal that instructs it to quit gracefully."
 
 #. NSS configuration options
-#: src/include/sssd-parameters.rb:103
+#: src/include/sssd-parameters.rb:102
 msgid "How many seconds should cache nss_sss enumerations (requests for info about all users)?"
 msgstr "How many seconds should cache nss_sss enumerations (requests for info about all users)?"
 
-#: src/include/sssd-parameters.rb:108
+#: src/include/sssd-parameters.rb:107
 msgid "The entry cache can be set to automatically update entries in the background if they are requested beyond a percentage of the entry_cache_timeout value for the domain."
 msgstr "The entry cache can be set to automatically update entries in the background if they are requested beyond a percentage of the entry_cache_timeout value for the domain."
 
-#: src/include/sssd-parameters.rb:113
+#: src/include/sssd-parameters.rb:112
 msgid "Specifies for how many seconds nss_sss should cache negative cache hits (that is, queries for invalid database entries, like nonexistent ones) before asking the back end again."
 msgstr "Specifies for how many seconds nss_sss should cache negative cache hits (that is, queries for invalid database entries, like nonexistent ones) before asking the back end again."
 
-#: src/include/sssd-parameters.rb:118
+#: src/include/sssd-parameters.rb:117
 msgid "Exclude certain users from being fetched from the sss NSS database."
 msgstr "Exclude certain users from being fetched from the sss NSS database."
 
-#: src/include/sssd-parameters.rb:123
+#: src/include/sssd-parameters.rb:122
 msgid "Exclude certain groups from being fetched from the sss NSS database."
 msgstr "Exclude certain groups from being fetched from the sss NSS database."
 
-#: src/include/sssd-parameters.rb:128
+#: src/include/sssd-parameters.rb:127
 msgid "If you want filtered user to still be group members set this option to false."
 msgstr "If you want filtered user to still be group members set this option to false."
 
-#: src/include/sssd-parameters.rb:132
+#: src/include/sssd-parameters.rb:131
 msgid "Override the user's home directory. You can either provide an absolute value or a template."
 msgstr "Override the user's home directory. You can either provide an absolute value or a template."
 
-#: src/include/sssd-parameters.rb:136 src/include/sssd-parameters.rb:1103
+#: src/include/sssd-parameters.rb:135 src/include/sssd-parameters.rb:1101
 msgid "Set a default template for a user's home directory if one is not specified explicitly by the domain's data provider."
 msgstr "Set a default template for a user's home directory if one is not specified explicitly by the domain's data provider."
 
-#: src/include/sssd-parameters.rb:140
+#: src/include/sssd-parameters.rb:139
 msgid "Override the login shell for all users."
 msgstr "Override the login shell for all users."
 
-#: src/include/sssd-parameters.rb:144
+#: src/include/sssd-parameters.rb:143
 msgid "Restrict user shell to one of the listed values."
 msgstr "Restrict user shell to one of the listed values."
 
-#: src/include/sssd-parameters.rb:148
+#: src/include/sssd-parameters.rb:147
 msgid "Replace any instance of these shells with the shell_fallback"
 msgstr "Replace any instance of these shells with the shell_fallback"
 
-#: src/include/sssd-parameters.rb:153
+#: src/include/sssd-parameters.rb:152
 msgid "The default shell to use if an allowed shell is not installed on the machine."
 msgstr "The default shell to use if an allowed shell is not installed on the machine."
 
-#: src/include/sssd-parameters.rb:157 src/include/sssd-parameters.rb:1107
+#: src/include/sssd-parameters.rb:156 src/include/sssd-parameters.rb:1105
 msgid "The default shell to use if the provider does not return one during lookup."
 msgstr "The default shell to use if the provider does not return one during lookup."
 
-#: src/include/sssd-parameters.rb:162 src/include/sssd-parameters.rb:205
+#: src/include/sssd-parameters.rb:161 src/include/sssd-parameters.rb:204
 msgid "Specifies time in seconds for which the list of subdomains will be considered valid."
 msgstr "Specifies time in seconds for which the list of subdomains will be considered valid."
 
-#: src/include/sssd-parameters.rb:167
+#: src/include/sssd-parameters.rb:166
 msgid "Specifies time in seconds for which records in the in-memory cache will be valid."
 msgstr "Specifies time in seconds for which records in the in-memory cache will be valid."
 
 #. PAM configuration options
-#: src/include/sssd-parameters.rb:175
+#: src/include/sssd-parameters.rb:174
 msgid "If the authentication provider is offline, how long we should allow cached logins (in days since the last successful online login)."
 msgstr "If the authentication provider is offline, how long we should allow cached logins (in days since the last successful online login)."
 
-#: src/include/sssd-parameters.rb:180 src/include/sssd-parameters.rb:185
+#: src/include/sssd-parameters.rb:179 src/include/sssd-parameters.rb:184
 msgid "The time in minutes which has to pass after offline_failed_login_attempts has been reached before a new login attempt is possible."
 msgstr "The time in minutes which has to pass after offline_failed_login_attempts has been reached before a new login attempt is possible."
 
-#: src/include/sssd-parameters.rb:190
+#: src/include/sssd-parameters.rb:189
 msgid "Controls what kind of messages are shown to the user during authentication."
 msgstr "Controls what kind of messages are shown to the user during authentication."
 
-#: src/include/sssd-parameters.rb:195
+#: src/include/sssd-parameters.rb:194
 msgid "For any PAM request while SSSD is online, the SSSD will attempt to immediately update the cached identity information for the user in order to ensure that authentication takes place with the latest information."
 msgstr "For any PAM request while SSSD is online, the SSSD will attempt to immediately update the cached identity information for the user in order to ensure that authentication takes place with the latest information."
 
 #. The kerberos domain section
-#: src/include/sssd-parameters.rb:200 src/include/sssd-parameters.rb:693
-#: src/include/sssd-parameters.rb:990
+#: src/include/sssd-parameters.rb:199 src/include/sssd-parameters.rb:691
+#: src/include/sssd-parameters.rb:988
 msgid "Display a warning N days before the password expires."
 msgstr "Display a warning N days before the password expires."
 
 #. SUDO configuration options
-#: src/include/sssd-parameters.rb:213
+#: src/include/sssd-parameters.rb:212
 msgid "Whether or not to evaluate the sudoNotBefore and sudoNotAfter attributes that implement time-dependent sudoers entries."
 msgstr "Whether or not to evaluate the sudoNotBefore and sudoNotAfter attributes that implement time-dependent sudoers entries."
 
 #. AUTOFS configuration options
-#: src/include/sssd-parameters.rb:221
+#: src/include/sssd-parameters.rb:220
 msgid "Specifies for how many seconds the autofs responder should cache negative hits before asking the back end again."
 msgstr "Specifies for how many seconds the autofs responder should cache negative hits before asking the back end again."
 
 #. SSH configuration options
-#: src/include/sssd-parameters.rb:229
+#: src/include/sssd-parameters.rb:228
 msgid "Whether or not to hash host names and addresses in the managed known_hosts file."
 msgstr "Whether or not to hash host names and addresses in the managed known_hosts file."
 
-#: src/include/sssd-parameters.rb:234
+#: src/include/sssd-parameters.rb:233
 msgid "How many seconds to keep a host in the managed known_hosts file after its host keys were requested."
 msgstr "How many seconds to keep a host in the managed known_hosts file after its host keys were requested."
 
 #. DOMAIN SECTIONS
 #. These configuration options can be present in a domain configuration section, that is, in a section called “[domain/NAME]”
-#: src/include/sssd-parameters.rb:243 src/include/sssd-parameters.rb:248
+#: src/include/sssd-parameters.rb:242 src/include/sssd-parameters.rb:247
 msgid "UID and GID limits for the domain. If a domain contains an entry that is outside these limits, it is ignored."
 msgstr "UID and GID limits for the domain. If a domain contains an entry that is outside these limits, it is ignored."
 
-#: src/include/sssd-parameters.rb:253
+#: src/include/sssd-parameters.rb:252
 msgid "Determines if a domain can be enumerated."
 msgstr "Determines if a domain can be enumerated."
 
-#: src/include/sssd-parameters.rb:258
+#: src/include/sssd-parameters.rb:257
 msgid "If the service does not terminate after “force_timeout” seconds, the monitor will forcibly shut it down by sending a SIGKILL signal."
 msgstr "If the service does not terminate after “force_timeout” seconds, the monitor will forcibly shut it down by sending a SIGKILL signal."
 
-#: src/include/sssd-parameters.rb:263
+#: src/include/sssd-parameters.rb:262
 #, fuzzy
 #| msgid "How many seconds nss_sss schould consider entries valid before asking the backend again."
 msgid "How many seconds nss_sss should consider entries valid before asking the backend again."
 msgstr "How many seconds nss_sss schould consider entries valid before asking the backend again."
 
-#: src/include/sssd-parameters.rb:268
+#: src/include/sssd-parameters.rb:267
 #, fuzzy
 #| msgid "How many seconds nss_sss schould consider user entries valid before asking the backend again."
 msgid "How many seconds nss_sss should consider user entries valid before asking the backend again."
 msgstr "How many seconds nss_sss schould consider user entries valid before asking the backend again."
 
-#: src/include/sssd-parameters.rb:273
+#: src/include/sssd-parameters.rb:272
 #, fuzzy
 #| msgid "How many seconds nss_sss schould consider group entries valid before asking the backend again."
 msgid "How many seconds nss_sss should consider group entries valid before asking the backend again."
 msgstr "How many seconds nss_sss schould consider group entries valid before asking the backend again."
 
-#: src/include/sssd-parameters.rb:278
+#: src/include/sssd-parameters.rb:277
 #, fuzzy
 #| msgid "How many seconds nss_sss schould consider netgroup entries valid before asking the backend again."
 msgid "How many seconds nss_sss should consider netgroup entries valid before asking the backend again."
 msgstr "How many seconds nss_sss schould consider netgroup entries valid before asking the backend again."
 
-#: src/include/sssd-parameters.rb:283
+#: src/include/sssd-parameters.rb:282
 #, fuzzy
 #| msgid "How many seconds nss_sss schould consider service entries valid before asking the backend again."
 msgid "How many seconds nss_sss should consider service entries valid before asking the backend again."
 msgstr "How many seconds nss_sss schould consider service entries valid before asking the backend again."
 
-#: src/include/sssd-parameters.rb:288
+#: src/include/sssd-parameters.rb:287
 msgid "How many seconds sudo should consider rules valid before asking the backend again."
 msgstr "How many seconds sudo should consider rules valid before asking the backend again."
 
-#: src/include/sssd-parameters.rb:293
+#: src/include/sssd-parameters.rb:292
 msgid "How many seconds the autofs service should consider automounter maps valid before asking the backend again."
 msgstr "How many seconds the autofs service should consider automounter maps valid before asking the backend again."
 
-#: src/include/sssd-parameters.rb:298
+#: src/include/sssd-parameters.rb:297
 msgid "Determines if user credentials are also cached in the local LDB cache."
 msgstr "Determines if user credentials are also cached in the local LDB cache."
 
-#: src/include/sssd-parameters.rb:303
+#: src/include/sssd-parameters.rb:302
 msgid "Number of days entries are left in cache after last successful login before being removed during a cleanup of the cache."
 msgstr "Number of days entries are left in cache after last successful login before being removed during a cleanup of the cache."
 
-#: src/include/sssd-parameters.rb:308
+#: src/include/sssd-parameters.rb:307
 msgid "The identification provider used for the domain."
 msgstr "The identification provider used for the domain."
 
-#: src/include/sssd-parameters.rb:313
+#: src/include/sssd-parameters.rb:312
 msgid "Use the full name and domain (as formatted by the domain's full_name_format) as the user's login name reported to NSS."
 msgstr "Use the full name and domain (as formatted by the domain's full_name_format) as the user's login name reported to NSS."
 
-#: src/include/sssd-parameters.rb:319
+#: src/include/sssd-parameters.rb:318
 msgid "The authentication provider used for the domain."
 msgstr "The authentication provider used for the domain."
 
-#: src/include/sssd-parameters.rb:325
+#: src/include/sssd-parameters.rb:324
 msgid "The access control provider used for the domain."
 msgstr "The access control provider used for the domain."
 
-#: src/include/sssd-parameters.rb:331
+#: src/include/sssd-parameters.rb:330
 msgid "The provider which should handle change password operations for the domain."
 msgstr "The provider which should handle change password operations for the domain."
 
-#: src/include/sssd-parameters.rb:337
+#: src/include/sssd-parameters.rb:336
 msgid "The SUDO provider used for the domain."
 msgstr "The SUDO provider used for the domain."
 
-#: src/include/sssd-parameters.rb:343
+#: src/include/sssd-parameters.rb:342
 msgid "The provider which should handle loading of selinux settings."
 msgstr "The provider which should handle loading of selinux settings."
 
-#: src/include/sssd-parameters.rb:349
+#: src/include/sssd-parameters.rb:348
 msgid "The provider which should handle fetching of subdomains."
 msgstr "The provider which should handle fetching of subdomains."
 
-#: src/include/sssd-parameters.rb:355
+#: src/include/sssd-parameters.rb:354
 msgid "The autofs provider used for the domain."
 msgstr "The autofs provider used for the domain."
 
-#: src/include/sssd-parameters.rb:361
+#: src/include/sssd-parameters.rb:360
 msgid "The provider used for retrieving host identity information."
 msgstr "The provider used for retrieving host identity information."
 
-#: src/include/sssd-parameters.rb:366
+#: src/include/sssd-parameters.rb:365
 msgid "Regular expression for this domain that describes how to parse the string containing user name and domain into these components."
 msgstr "Regular expression for this domain that describes how to parse the string containing user name and domain into these components."
 
-#: src/include/sssd-parameters.rb:371
+#: src/include/sssd-parameters.rb:370
 msgid "A printf(3)-compatible format that describes how to translate a (name, domain) tuple for this domain into a fully qualified name."
 msgstr "A printf(3)-compatible format that describes how to translate a (name, domain) tuple for this domain into a fully qualified name."
 
-#: src/include/sssd-parameters.rb:377
+#: src/include/sssd-parameters.rb:376
 msgid "Provides the ability to select preferred address family to use when performing DNS lookups."
 msgstr "Provides the ability to select preferred address family to use when performing DNS lookups."
 
-#: src/include/sssd-parameters.rb:382
+#: src/include/sssd-parameters.rb:381
 msgid "Defines the amount of time (in seconds) to wait for a reply from the DNS resolver before assuming that it is unreachable."
 msgstr "Defines the amount of time (in seconds) to wait for a reply from the DNS resolver before assuming that it is unreachable."
 
-#: src/include/sssd-parameters.rb:386
+#: src/include/sssd-parameters.rb:385
 msgid "Use the domain part of machine's hostname."
 msgstr "Use the domain part of machine's hostname."
 
-#: src/include/sssd-parameters.rb:387
+#: src/include/sssd-parameters.rb:386
 msgid "If service discovery is used in the back end, specifies the domain part of the service discovery DNS query."
 msgstr "If service discovery is used in the back end, specifies the domain part of the service discovery DNS query."
 
-#: src/include/sssd-parameters.rb:391
+#: src/include/sssd-parameters.rb:390
 msgid "Override the primary GID value with the one specified."
 msgstr "Override the primary GID value with the one specified."
 
-#: src/include/sssd-parameters.rb:396
+#: src/include/sssd-parameters.rb:395
 msgid "Treat user and group names as case sensitive."
 msgstr "Treat user and group names as case sensitive."
 
-#: src/include/sssd-parameters.rb:401
+#: src/include/sssd-parameters.rb:400
 msgid "When a user or group is looked up by name in the proxy provider, a second lookup by ID is performed to 'canonicalize' the name in case the requested name was an alias."
 msgstr "When a user or group is looked up by name in the proxy provider, a second lookup by ID is performed to 'canonicalize' the name in case the requested name was an alias."
 
-#: src/include/sssd-parameters.rb:406
+#: src/include/sssd-parameters.rb:405
 msgid "Use this homedir as default value for all subdomains within this domain."
 msgstr "Use this homedir as default value for all subdomains within this domain."
 
 #. Following options will be provided by SSSD's 'simple' access-control provider
-#: src/include/sssd-parameters.rb:412
+#: src/include/sssd-parameters.rb:411
 msgid "Comma separated list of users who are allowed to log in."
 msgstr "Comma separated list of users who are allowed to log in."
 
-#: src/include/sssd-parameters.rb:417
+#: src/include/sssd-parameters.rb:416
 msgid "Comma separated list of groups who are allowed to log in. This applies only to groups within this SSSD domain."
 msgstr "Comma separated list of groups who are allowed to log in. This applies only to groups within this SSSD domain."
 
-#: src/include/sssd-parameters.rb:422
+#: src/include/sssd-parameters.rb:421
 msgid "Comma separated list of users who are explicitly denied access."
 msgstr "Comma separated list of users who are explicitly denied access."
 
-#: src/include/sssd-parameters.rb:427
+#: src/include/sssd-parameters.rb:426
 msgid "Comma separated list of groups that are explicitly denied access. This applies only to groups within this SSSD domain."
 msgstr "Comma separated list of groups that are explicitly denied access. This applies only to groups within this SSSD domain."
 
-#: src/include/sssd-parameters.rb:433
+#: src/include/sssd-parameters.rb:432
 msgid "The default base DN to use for performing LDAP sudo rules."
 msgstr "The default base DN to use for performing LDAP sudo rules."
 
 #. The local domain section
 #. This section contains settings for domain that stores users and groups in SSSD native database, that is, a domain that uses id_provider=local.
-#: src/include/sssd-parameters.rb:442
+#: src/include/sssd-parameters.rb:441
 msgid "The tools append the login name to base_directory and use that as the home directory."
 msgstr "The tools append the login name to base_directory and use that as the home directory."
 
-#: src/include/sssd-parameters.rb:447
+#: src/include/sssd-parameters.rb:446
 msgid "Indicate if a home directory should be created by default for new users."
 msgstr "Indicate if a home directory should be created by default for new users."
 
-#: src/include/sssd-parameters.rb:452
+#: src/include/sssd-parameters.rb:451
 msgid "Indicate if a home directory should be removed by default for deleted users."
 msgstr "Indicate if a home directory should be removed by default for deleted users."
 
-#: src/include/sssd-parameters.rb:457
+#: src/include/sssd-parameters.rb:456
 msgid "Used by sss_useradd(8) to specify the default permissions on a newly created home directory."
 msgstr "Used by sss_useradd(8) to specify the default permissions on a newly created home directory."
 
-#: src/include/sssd-parameters.rb:462
+#: src/include/sssd-parameters.rb:461
 msgid "The skeleton directory, which contains files and directories to be copied in the user's home directory, when the home directory is created by sss_useradd(8)"
 msgstr "The skeleton directory, which contains files and directories to be copied in the user's home directory, when the home directory is created by sss_useradd(8)"
 
-#: src/include/sssd-parameters.rb:467
+#: src/include/sssd-parameters.rb:466
 msgid "The mail spool directory."
 msgstr "The mail spool directory."
 
-#: src/include/sssd-parameters.rb:471
+#: src/include/sssd-parameters.rb:470
 msgid "The command that is run after a user is removed."
 msgstr "The command that is run after a user is removed."
 
 #. The ldap domain section
-#: src/include/sssd-parameters.rb:480 src/include/sssd-parameters.rb:485
+#: src/include/sssd-parameters.rb:479 src/include/sssd-parameters.rb:484
 msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference."
 msgstr "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference."
 
-#: src/include/sssd-parameters.rb:491 src/include/sssd-parameters.rb:497
+#: src/include/sssd-parameters.rb:490 src/include/sssd-parameters.rb:496
 msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference to change the password of a user."
 msgstr "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference to change the password of a user."
 
-#: src/include/sssd-parameters.rb:503
+#: src/include/sssd-parameters.rb:501
 msgid "The default base DN to use for performing LDAP user operations."
 msgstr "The default base DN to use for performing LDAP user operations."
 
-#: src/include/sssd-parameters.rb:509
+#: src/include/sssd-parameters.rb:507
 msgid "Specifies the Schema Type in use on the target LDAP server."
 msgstr "Specifies the Schema Type in use on the target LDAP server."
 
-#: src/include/sssd-parameters.rb:513
+#: src/include/sssd-parameters.rb:511
 msgid "The default bind DN to use for performing LDAP operations."
 msgstr "The default bind DN to use for performing LDAP operations."
 
-#: src/include/sssd-parameters.rb:519
+#: src/include/sssd-parameters.rb:517
 msgid "The type of the authentication token of the default bind DN."
 msgstr "The type of the authentication token of the default bind DN."
 
-#: src/include/sssd-parameters.rb:523
+#: src/include/sssd-parameters.rb:521
 msgid "The authentication token of the default bind DN."
 msgstr "The authentication token of the default bind DN."
 
-#: src/include/sssd-parameters.rb:528
+#: src/include/sssd-parameters.rb:526
 msgid "The object class of a user entry in LDAP."
 msgstr "The object class of a user entry in LDAP."
 
-#: src/include/sssd-parameters.rb:533
+#: src/include/sssd-parameters.rb:531
 msgid "The LDAP attribute that corresponds to the user's login name."
 msgstr "The LDAP attribute that corresponds to the user's login name."
 
-#: src/include/sssd-parameters.rb:538
+#: src/include/sssd-parameters.rb:536
 msgid "The LDAP attribute that corresponds to the user's id."
 msgstr "The LDAP attribute that corresponds to the user's id."
 
-#: src/include/sssd-parameters.rb:543
+#: src/include/sssd-parameters.rb:541
 msgid "The LDAP attribute that corresponds to the user's primary group id."
 msgstr "The LDAP attribute that corresponds to the user's primary group id."
 
-#: src/include/sssd-parameters.rb:548
+#: src/include/sssd-parameters.rb:546
 msgid "The LDAP attribute that corresponds to the user's gecos field."
 msgstr "The LDAP attribute that corresponds to the user's gecos field."
 
-#: src/include/sssd-parameters.rb:553
+#: src/include/sssd-parameters.rb:551
 msgid " The LDAP attribute that contains the name of the user's home directory."
 msgstr " The LDAP attribute that contains the name of the user's home directory."
 
-#: src/include/sssd-parameters.rb:558
+#: src/include/sssd-parameters.rb:556
 msgid "The LDAP attribute that contains the path to the user's default shell."
 msgstr "The LDAP attribute that contains the path to the user's default shell."
 
-#: src/include/sssd-parameters.rb:563
+#: src/include/sssd-parameters.rb:561
 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP user object."
 msgstr "The LDAP attribute that contains the UUID/GUID of an LDAP user object."
 
-#: src/include/sssd-parameters.rb:568
+#: src/include/sssd-parameters.rb:566
 msgid "The LDAP attribute that contains the objectSID of an LDAP user object."
 msgstr "The LDAP attribute that contains the objectSID of an LDAP user object."
 
-#: src/include/sssd-parameters.rb:573 src/include/sssd-parameters.rb:778
+#: src/include/sssd-parameters.rb:571 src/include/sssd-parameters.rb:776
 msgid "The LDAP attribute that contains timestamp of the last modification of the parent object."
 msgstr "The LDAP attribute that contains timestamp of the last modification of the parent object."
 
-#: src/include/sssd-parameters.rb:578
+#: src/include/sssd-parameters.rb:576
 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (date of the last password change)."
 msgstr "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (date of the last password change)."
 
-#: src/include/sssd-parameters.rb:583
+#: src/include/sssd-parameters.rb:581
 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (minimum password age)."
 msgstr "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (minimum password age)."
 
-#: src/include/sssd-parameters.rb:588
+#: src/include/sssd-parameters.rb:586
 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (maximum password age)."
 msgstr "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (maximum password age)."
 
-#: src/include/sssd-parameters.rb:593
+#: src/include/sssd-parameters.rb:591
 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (password warning period)."
 msgstr "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (password warning period)."
 
-#: src/include/sssd-parameters.rb:598
+#: src/include/sssd-parameters.rb:596
 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (password inactivity period)."
 msgstr "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (password inactivity period)."
 
-#: src/include/sssd-parameters.rb:603
+#: src/include/sssd-parameters.rb:601
 msgid "When using ldap_pwd_policy=shadow or ldap_account_expire_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (account expiration date)."
 msgstr "When using ldap_pwd_policy=shadow or ldap_account_expire_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (account expiration date)."
 
-#: src/include/sssd-parameters.rb:608
+#: src/include/sssd-parameters.rb:606
 msgid "When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of an LDAP attribute storing the date and time of last password change in kerberos."
 msgstr "When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of an LDAP attribute storing the date and time of last password change in kerberos."
 
-#: src/include/sssd-parameters.rb:613
+#: src/include/sssd-parameters.rb:611
 msgid "When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of an LDAP attribute storing the date and time when current password expires."
 msgstr "When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of an LDAP attribute storing the date and time when current password expires."
 
-#: src/include/sssd-parameters.rb:618
+#: src/include/sssd-parameters.rb:616
 msgid "When using ldap_account_expire_policy=ad, this parameter contains the name of an LDAP attribute storing the expiration time of the account."
 msgstr "When using ldap_account_expire_policy=ad, this parameter contains the name of an LDAP attribute storing the expiration time of the account."
 
-#: src/include/sssd-parameters.rb:623
+#: src/include/sssd-parameters.rb:621
 msgid "When using ldap_account_expire_policy=ad, this parameter contains the name of an LDAP attribute storing the user account control bit field."
 msgstr "When using ldap_account_expire_policy=ad, this parameter contains the name of an LDAP attribute storing the user account control bit field."
 
-#: src/include/sssd-parameters.rb:628
+#: src/include/sssd-parameters.rb:626
 msgid "When using ldap_account_expire_policy=rhds or equivalent, this parameter determines if access is allowed or not."
 msgstr "When using ldap_account_expire_policy=rhds or equivalent, this parameter determines if access is allowed or not."
 
-#: src/include/sssd-parameters.rb:633
+#: src/include/sssd-parameters.rb:631
 msgid "When using ldap_account_expire_policy=nds, this attribute determines if access is allowed or not."
 msgstr "When using ldap_account_expire_policy=nds, this attribute determines if access is allowed or not."
 
-#: src/include/sssd-parameters.rb:638
+#: src/include/sssd-parameters.rb:636
 msgid "When using ldap_account_expire_policy=nds, this attribute determines until which date access is granted."
 msgstr "When using ldap_account_expire_policy=nds, this attribute determines until which date access is granted."
 
-#: src/include/sssd-parameters.rb:643
+#: src/include/sssd-parameters.rb:641
 msgid "When using ldap_account_expire_policy=nds, this attribute determines the hours of a day in a week when access is granted."
 msgstr "When using ldap_account_expire_policy=nds, this attribute determines the hours of a day in a week when access is granted."
 
-#: src/include/sssd-parameters.rb:648
+#: src/include/sssd-parameters.rb:646
 msgid "The LDAP attribute that contains the user's Kerberos User Principal Name (UPN)."
 msgstr "The LDAP attribute that contains the user's Kerberos User Principal Name (UPN)."
 
-#: src/include/sssd-parameters.rb:652
+#: src/include/sssd-parameters.rb:650
 msgid "The LDAP attribute that contains the user's SSH public keys."
 msgstr "The LDAP attribute that contains the user's SSH public keys."
 
-#: src/include/sssd-parameters.rb:657
+#: src/include/sssd-parameters.rb:655
 msgid "Some directory servers, for example Active Directory, might deliver the realm part of the UPN in lower case, which might cause the authentication to fail."
 msgstr "Some directory servers, for example Active Directory, might deliver the realm part of the UPN in lower case, which might cause the authentication to fail."
 
-#: src/include/sssd-parameters.rb:658
+#: src/include/sssd-parameters.rb:656
 msgid "Set this option to true if you want to use an upper-case realm."
 msgstr "Set this option to true if you want to use an upper-case realm."
 
-#: src/include/sssd-parameters.rb:663
+#: src/include/sssd-parameters.rb:661
 msgid "Specifies how many seconds SSSD has to wait before refreshing its cache of enumerated records."
 msgstr "Specifies how many seconds SSSD has to wait before refreshing its cache of enumerated records."
 
-#: src/include/sssd-parameters.rb:668
+#: src/include/sssd-parameters.rb:666
 msgid "Determine how often to check the cache for inactive entries (such as groups with no members and users who have never logged in) and remove them to save space."
 msgstr "Determine how often to check the cache for inactive entries (such as groups with no members and users who have never logged in) and remove them to save space."
 
-#: src/include/sssd-parameters.rb:673
+#: src/include/sssd-parameters.rb:671
 msgid "The LDAP attribute that corresponds to the user's full name."
 msgstr "The LDAP attribute that corresponds to the user's full name."
 
-#: src/include/sssd-parameters.rb:678
+#: src/include/sssd-parameters.rb:676
 msgid "The LDAP attribute that lists the user's group memberships."
 msgstr "The LDAP attribute that lists the user's group memberships."
 
-#: src/include/sssd-parameters.rb:683
+#: src/include/sssd-parameters.rb:681
 msgid "If access_provider=ldap and ldap_access_order=authorized_service, SSSD will use the presence of the authorizedService attribute in the user's LDAP entry to determine access privilege."
 msgstr "If access_provider=ldap and ldap_access_order=authorized_service, SSSD will use the presence of the authorizedService attribute in the user's LDAP entry to determine access privilege."
 
-#: src/include/sssd-parameters.rb:688
+#: src/include/sssd-parameters.rb:686
 msgid "If access_provider=ldap and ldap_access_order=host, SSSD will use the presence of the host attribute in the user's LDAP entry to determine access privilege."
 msgstr "If access_provider=ldap and ldap_access_order=host, SSSD will use the presence of the host attribute in the user's LDAP entry to determine access privilege."
 
-#: src/include/sssd-parameters.rb:698
+#: src/include/sssd-parameters.rb:696
 msgid "The object class of a group entry in LDAP."
 msgstr "The object class of a group entry in LDAP."
 
-#: src/include/sssd-parameters.rb:703
+#: src/include/sssd-parameters.rb:701
 msgid "The LDAP attribute that corresponds to the group name."
 msgstr "The LDAP attribute that corresponds to the group name."
 
-#: src/include/sssd-parameters.rb:708
+#: src/include/sssd-parameters.rb:706
 msgid "The LDAP attribute that corresponds to the group's id."
 msgstr "The LDAP attribute that corresponds to the group's id."
 
-#: src/include/sssd-parameters.rb:713
+#: src/include/sssd-parameters.rb:711
 msgid "The LDAP attribute that contains the names of the group's members."
 msgstr "The LDAP attribute that contains the names of the group's members."
 
-#: src/include/sssd-parameters.rb:718
+#: src/include/sssd-parameters.rb:716
 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP group object."
 msgstr "The LDAP attribute that contains the UUID/GUID of an LDAP group object."
 
-#: src/include/sssd-parameters.rb:723
+#: src/include/sssd-parameters.rb:721
 msgid "The LDAP attribute that contains the objectSID of an LDAP group object."
 msgstr "The LDAP attribute that contains the objectSID of an LDAP group object."
 
-#: src/include/sssd-parameters.rb:728
+#: src/include/sssd-parameters.rb:726
 msgid " The LDAP attribute that contains timestamp of the last modification of the parent object."
 msgstr " The LDAP attribute that contains timestamp of the last modification of the parent object."
 
-#: src/include/sssd-parameters.rb:734
+#: src/include/sssd-parameters.rb:732
 msgid "If ldap_schema is set to a schema format that supports nested groups (e.g. RFC2307bis), then this option controls how many levels of nesting SSSD will follow."
 msgstr "If ldap_schema is set to a schema format that supports nested groups (e.g. RFC2307bis), then this option controls how many levels of nesting SSSD will follow."
 
-#: src/include/sssd-parameters.rb:740
+#: src/include/sssd-parameters.rb:738
 msgid "This option tells SSSD to take advantage of an Active Directory-specific feature which may speed up group lookup operations on deployments with complex or deep nested groups."
 msgstr "This option tells SSSD to take advantage of an Active Directory-specific feature which may speed up group lookup operations on deployments with complex or deep nested groups."
 
-#: src/include/sssd-parameters.rb:746
+#: src/include/sssd-parameters.rb:744
 msgid "This option tells SSSD to take advantage of an Active Directory-specific feature which might speed up initgroups operations (most notably when dealing with complex or deep nested groups)."
 msgstr "This option tells SSSD to take advantage of an Active Directory-specific feature which might speed up initgroups operations (most notably when dealing with complex or deep nested groups)."
 
-#: src/include/sssd-parameters.rb:752
+#: src/include/sssd-parameters.rb:750
 msgid "           The object class of a netgroup entry in LDAP."
 msgstr "           The object class of a netgroup entry in LDAP."
 
-#: src/include/sssd-parameters.rb:758
+#: src/include/sssd-parameters.rb:756
 msgid "The LDAP attribute that corresponds to the netgroup name."
 msgstr "The LDAP attribute that corresponds to the netgroup name."
 
-#: src/include/sssd-parameters.rb:763
+#: src/include/sssd-parameters.rb:761
 msgid "The LDAP attribute that contains the names of the netgroup's members."
 msgstr "The LDAP attribute that contains the names of the netgroup's members."
 
-#: src/include/sssd-parameters.rb:768
+#: src/include/sssd-parameters.rb:766
 msgid "The LDAP attribute that contains the (host, user, domain) netgroup triples."
 msgstr "The LDAP attribute that contains the (host, user, domain) netgroup triples."
 
-#: src/include/sssd-parameters.rb:773
+#: src/include/sssd-parameters.rb:771
 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object."
 msgstr "The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object."
 
-#: src/include/sssd-parameters.rb:783
+#: src/include/sssd-parameters.rb:781
 msgid "The object class of a service entry in LDAP."
 msgstr "The object class of a service entry in LDAP."
 
-#: src/include/sssd-parameters.rb:788
+#: src/include/sssd-parameters.rb:786
 msgid "The LDAP attribute that contains the name of service attributes and their aliases."
 msgstr "The LDAP attribute that contains the name of service attributes and their aliases."
 
-#: src/include/sssd-parameters.rb:793
+#: src/include/sssd-parameters.rb:791
 msgid "The LDAP attribute that contains the port managed by this service."
 msgstr "The LDAP attribute that contains the port managed by this service."
 
-#: src/include/sssd-parameters.rb:798
+#: src/include/sssd-parameters.rb:796
 msgid "The LDAP attribute that contains the protocols understood by this service."
 msgstr "The LDAP attribute that contains the protocols understood by this service."
 
-#: src/include/sssd-parameters.rb:804
+#: src/include/sssd-parameters.rb:802
 msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type."
 msgstr "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type."
 
-#: src/include/sssd-parameters.rb:809
+#: src/include/sssd-parameters.rb:807
 msgid " Specifies the timeout (in seconds) that ldap searches are allowed to run before they are cancelled and cached results are returned (and offline mode is entered)."
 msgstr " Specifies the timeout (in seconds) that ldap searches are allowed to run before they are cancelled and cached results are returned (and offline mode is entered)."
 
-#: src/include/sssd-parameters.rb:814
+#: src/include/sssd-parameters.rb:812
 msgid "Specifies the timeout (in seconds) that ldap searches for user and group enumerations are allowed to run before they are cancelled and cached results are returned (and offline mode is entered)."
 msgstr "Specifies the timeout (in seconds) that ldap searches for user and group enumerations are allowed to run before they are cancelled and cached results are returned (and offline mode is entered)."
 
-#: src/include/sssd-parameters.rb:819
+#: src/include/sssd-parameters.rb:817
 msgid "Specifies the timeout (in seconds) after which the poll(2)/select(2) following a connect(2) returns in case of no activity."
 msgstr "Specifies the timeout (in seconds) after which the poll(2)/select(2) following a connect(2) returns in case of no activity."
 
-#: src/include/sssd-parameters.rb:824
+#: src/include/sssd-parameters.rb:822
 msgid "Specifies a timeout (in seconds) after which calls to synchronous LDAP APIs will abort if no response is received."
 msgstr "Specifies a timeout (in seconds) after which calls to synchronous LDAP APIs will abort if no response is received."
 
-#: src/include/sssd-parameters.rb:829
+#: src/include/sssd-parameters.rb:827
 msgid "Specifies a timeout (in seconds) that a connection to an LDAP server will be maintained."
 msgstr "Specifies a timeout (in seconds) that a connection to an LDAP server will be maintained."
 
-#: src/include/sssd-parameters.rb:834
+#: src/include/sssd-parameters.rb:832
 msgid "Specify the number of records to retrieve from LDAP in a single request. Some LDAP servers enforce a maximum limit per-request."
 msgstr "Specify the number of records to retrieve from LDAP in a single request. Some LDAP servers enforce a maximum limit per-request."
 
-#: src/include/sssd-parameters.rb:839
+#: src/include/sssd-parameters.rb:837
 msgid "Disable the LDAP paging control."
 msgstr "Disable the LDAP paging control."
 
-#: src/include/sssd-parameters.rb:844
+#: src/include/sssd-parameters.rb:842
 msgid "When communicating with an LDAP server using SASL, specify the minimum security level necessary to establish the connection."
 msgstr "When communicating with an LDAP server using SASL, specify the minimum security level necessary to establish the connection."
 
-#: src/include/sssd-parameters.rb:849
+#: src/include/sssd-parameters.rb:847
 msgid "Specify the number of group members that must be missing from the internal cache in order to trigger a dereference lookup."
 msgstr "Specify the number of group members that must be missing from the internal cache in order to trigger a dereference lookup."
 
-#: src/include/sssd-parameters.rb:855
+#: src/include/sssd-parameters.rb:853
 msgid "Specifies what checks to perform on server certificates in a TLS session, if any."
 msgstr "Specifies what checks to perform on server certificates in a TLS session, if any."
 
-#: src/include/sssd-parameters.rb:860
+#: src/include/sssd-parameters.rb:858
 msgid "Specifies the file that contains certificates for all of the Certificate Authorities that sssd will recognize."
 msgstr "Specifies the file that contains certificates for all of the Certificate Authorities that sssd will recognize."
 
-#: src/include/sssd-parameters.rb:865
+#: src/include/sssd-parameters.rb:863
 msgid "Specifies the path of a directory that contains Certificate Authority certificates in separate individual files."
 msgstr "Specifies the path of a directory that contains Certificate Authority certificates in separate individual files."
 
-#: src/include/sssd-parameters.rb:869
+#: src/include/sssd-parameters.rb:867
 msgid "Specifies the file that contains the certificate for the client's key."
 msgstr "Specifies the file that contains the certificate for the client's key."
 
-#: src/include/sssd-parameters.rb:873
+#: src/include/sssd-parameters.rb:871
 msgid "Specifies the file that contains the client's key."
 msgstr "Specifies the file that contains the client's key."
 
-#: src/include/sssd-parameters.rb:878
+#: src/include/sssd-parameters.rb:876
 msgid "Specifies acceptable cipher suites."
 msgstr "Specifies acceptable cipher suites."
 
-#: src/include/sssd-parameters.rb:883
+#: src/include/sssd-parameters.rb:881
 msgid "Specifies that the id_provider connection must also use tls to protect the channel."
 msgstr "Specifies that the id_provider connection must also use tls to protect the channel."
 
-#: src/include/sssd-parameters.rb:888
+#: src/include/sssd-parameters.rb:886
 msgid "Specifies that SSSD should attempt to map user and group IDs from the ldap_user_objectsid and ldap_group_objectsid attributes instead of relying on ldap_user_uid_number and ldap_group_gid_number."
 msgstr "Specifies that SSSD should attempt to map user and group IDs from the ldap_user_objectsid and ldap_group_objectsid attributes instead of relying on ldap_user_uid_number and ldap_group_gid_number."
 
-#: src/include/sssd-parameters.rb:892
+#: src/include/sssd-parameters.rb:890
 msgid "Specify the SASL mechanism to use."
 msgstr "Specify the SASL mechanism to use."
 
-#: src/include/sssd-parameters.rb:897
+#: src/include/sssd-parameters.rb:895
 msgid "Specify the SASL authorization id to use."
 msgstr "Specify the SASL authorization id to use."
 
-#: src/include/sssd-parameters.rb:902
+#: src/include/sssd-parameters.rb:900
 msgid "Specify the SASL realm to use."
 msgstr "Specify the SASL realm to use."
 
-#: src/include/sssd-parameters.rb:907
+#: src/include/sssd-parameters.rb:905
 msgid "If set to true, the LDAP library would perform a reverse lookup to canonicalize the host name during a SASL bind."
 msgstr "If set to true, the LDAP library would perform a reverse lookup to canonicalize the host name during a SASL bind."
 
-#: src/include/sssd-parameters.rb:912
+#: src/include/sssd-parameters.rb:910
 msgid "Specify the keytab to use when using SASL/GSSAPI."
 msgstr "Specify the keytab to use when using SASL/GSSAPI."
 
-#: src/include/sssd-parameters.rb:917
+#: src/include/sssd-parameters.rb:915
 msgid "Specifies that the id_provider should init Kerberos credentials (TGT)."
 msgstr "Specifies that the id_provider should init Kerberos credentials (TGT)."
 
-#: src/include/sssd-parameters.rb:922
+#: src/include/sssd-parameters.rb:920
 msgid "Specifies the lifetime in seconds of the TGT if GSSAPI is used."
 msgstr "Specifies the lifetime in seconds of the TGT if GSSAPI is used."
 
-#: src/include/sssd-parameters.rb:927
+#: src/include/sssd-parameters.rb:925
 msgid "Select the policy to evaluate the password expiration on the client side."
 msgstr "Select the policy to evaluate the password expiration on the client side."
 
-#: src/include/sssd-parameters.rb:932
+#: src/include/sssd-parameters.rb:930
 msgid "Specifies whether automatic referral chasing should be enabled."
 msgstr "Specifies whether automatic referral chasing should be enabled."
 
-#: src/include/sssd-parameters.rb:937
+#: src/include/sssd-parameters.rb:935
 msgid "Specifies the service name to use when service discovery is enabled."
 msgstr "Specifies the service name to use when service discovery is enabled."
 
-#: src/include/sssd-parameters.rb:941
+#: src/include/sssd-parameters.rb:939
 msgid "Specifies the service name to use to find an LDAP server which allows password changes when service discovery is enabled."
 msgstr "Specifies the service name to use to find an LDAP server which allows password changes when service discovery is enabled."
 
-#: src/include/sssd-parameters.rb:946
+#: src/include/sssd-parameters.rb:944
 msgid "Specifies whether to update the ldap_user_shadow_last_change attribute with days since the Epoch after a password change operation."
 msgstr "Specifies whether to update the ldap_user_shadow_last_change attribute with days since the Epoch after a password change operation."
 
-#: src/include/sssd-parameters.rb:951
+#: src/include/sssd-parameters.rb:949
 msgid "If using access_provider = ldap and ldap_access_order = filter (default), this option is mandatory. It specifies an LDAP search filter criterion that must be met for the user to be granted access on this host."
 msgstr "If using access_provider = ldap and ldap_access_order = filter (default), this option is mandatory. It specifies an LDAP search filter criterion that must be met for the user to be granted access on this host."
 
-#: src/include/sssd-parameters.rb:956
+#: src/include/sssd-parameters.rb:954
 msgid " With this option a client side evaluation of access control attributes can be enabled."
 msgstr " With this option a client side evaluation of access control attributes can be enabled."
 
-#: src/include/sssd-parameters.rb:962
+#: src/include/sssd-parameters.rb:960
 msgid "Comma separated list of access control options."
 msgstr "Comma separated list of access control options."
 
-#: src/include/sssd-parameters.rb:967
+#: src/include/sssd-parameters.rb:965
 msgid "Specifies how alias dereferencing is done when performing a search."
 msgstr "Specifies how alias dereferencing is done when performing a search."
 
-#: src/include/sssd-parameters.rb:972
+#: src/include/sssd-parameters.rb:970
 msgid "Allows to retain local users as members of an LDAP group for servers that use the RFC2307 schema."
 msgstr "Allows to retain local users as members of an LDAP group for servers that use the RFC2307 schema."
 
-#: src/include/sssd-parameters.rb:995 src/include/sssd-parameters.rb:999
+#: src/include/sssd-parameters.rb:993 src/include/sssd-parameters.rb:997
 msgid "Specifies the comma-separated list of IP addresses or hostnames of the Kerberos servers to which SSSD should connect, in the order of preference."
 msgstr "Specifies the comma-separated list of IP addresses or hostnames of the Kerberos servers to which SSSD should connect, in the order of preference."
 
-#: src/include/sssd-parameters.rb:1004
+#: src/include/sssd-parameters.rb:1002
 msgid "The name of the Kerberos realm."
 msgstr "The name of the Kerberos realm."
 
-#: src/include/sssd-parameters.rb:1009 src/include/sssd-parameters.rb:1014
+#: src/include/sssd-parameters.rb:1007 src/include/sssd-parameters.rb:1012
 msgid "If the change password service is not running on the KDC, alternative servers can be defined here."
 msgstr "If the change password service is not running on the KDC, alternative servers can be defined here."
 
-#: src/include/sssd-parameters.rb:1019
+#: src/include/sssd-parameters.rb:1017
 msgid "Directory to store credential caches."
 msgstr "Directory to store credential caches."
 
-#: src/include/sssd-parameters.rb:1024
+#: src/include/sssd-parameters.rb:1022
 msgid "Location of the user's credential cache."
 msgstr "Location of the user's credential cache."
 
-#: src/include/sssd-parameters.rb:1029
+#: src/include/sssd-parameters.rb:1027
 msgid " Timeout in seconds after an online authentication request or change password request is aborted."
 msgstr " Timeout in seconds after an online authentication request or change password request is aborted."
 
-#: src/include/sssd-parameters.rb:1034
+#: src/include/sssd-parameters.rb:1032
 msgid "Verify with the help of krb5_keytab that the TGT obtained has not been spoofed."
 msgstr "Verify with the help of krb5_keytab that the TGT obtained has not been spoofed."
 
-#: src/include/sssd-parameters.rb:1039
+#: src/include/sssd-parameters.rb:1037
 msgid "The location of the keytab to use when validating credentials obtained from KDCs."
 msgstr "The location of the keytab to use when validating credentials obtained from KDCs."
 
-#: src/include/sssd-parameters.rb:1044
+#: src/include/sssd-parameters.rb:1042
 msgid "Store the password of the user if the provider is offline and use it to request a TGT when the provider comes online again."
 msgstr "Store the password of the user if the provider is offline and use it to request a TGT when the provider comes online again."
 
-#: src/include/sssd-parameters.rb:1048
+#: src/include/sssd-parameters.rb:1046
 msgid "Request a renewable ticket with a total lifetime, given as an integer immediately followed by a time unit."
 msgstr "Request a renewable ticket with a total lifetime, given as an integer immediately followed by a time unit."
 
-#: src/include/sssd-parameters.rb:1052
+#: src/include/sssd-parameters.rb:1050
 msgid "Request ticket with a with a lifetime, given as an integer immediately followed by a time unit."
 msgstr "Request ticket with a with a lifetime, given as an integer immediately followed by a time unit."
 
-#: src/include/sssd-parameters.rb:1056
+#: src/include/sssd-parameters.rb:1054
 msgid "The time in seconds between two checks if the TGT should be renewed."
 msgstr "The time in seconds between two checks if the TGT should be renewed."
 
-#: src/include/sssd-parameters.rb:1061
+#: src/include/sssd-parameters.rb:1059
 msgid "Enables flexible authentication secure tunneling (FAST) for Kerberos pre-authentication."
 msgstr "Enables flexible authentication secure tunneling (FAST) for Kerberos pre-authentication."
 
-#: src/include/sssd-parameters.rb:1065
+#: src/include/sssd-parameters.rb:1063
 msgid "Specifies the server principal to use for FAST."
 msgstr "Specifies the server principal to use for FAST."
 
-#: src/include/sssd-parameters.rb:1070
+#: src/include/sssd-parameters.rb:1068
 msgid "Specifies if the host and user principal should be canonicalized."
 msgstr "Specifies if the host and user principal should be canonicalized."
 
 #. The Active Directory domain section
-#: src/include/sssd-parameters.rb:1083
+#: src/include/sssd-parameters.rb:1081
 msgid "Specifies the name of the Active Directory domain."
 msgstr "Specifies the name of the Active Directory domain."
 
-#: src/include/sssd-parameters.rb:1087 src/include/sssd-parameters.rb:1091
+#: src/include/sssd-parameters.rb:1085 src/include/sssd-parameters.rb:1089
 msgid "The comma-separated list of IP addresses or hostnames of the AD servers to which SSSD should connect in order of preference."
 msgstr "The comma-separated list of IP addresses or hostnames of the AD servers to which SSSD should connect in order of preference."
 
-#: src/include/sssd-parameters.rb:1095
+#: src/include/sssd-parameters.rb:1093
 msgid "Optional. May be set on machines where the hostname(5) does not reflect the fully qualified name used in the Active Directory domain to identify this host."
 msgstr "Optional. May be set on machines where the hostname(5) does not reflect the fully qualified name used in the Active Directory domain to identify this host."
 
-#: src/include/sssd-parameters.rb:1099
+#: src/include/sssd-parameters.rb:1097
 msgid "Override the user's home directory."
 msgstr "Override the user's home directory."
 
-#: src/include/sssd-parameters.rb:1112
+#: src/include/sssd-parameters.rb:1110
 msgid " Specifies the lower bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
 msgstr " Specifies the lower bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
 
-#: src/include/sssd-parameters.rb:1117
+#: src/include/sssd-parameters.rb:1115
 msgid "Specifies the upper bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
 msgstr "Specifies the upper bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
 
-#: src/include/sssd-parameters.rb:1122
+#: src/include/sssd-parameters.rb:1120
 msgid "Specifies the number of IDs available for each slice."
 msgstr "Specifies the number of IDs available for each slice."
 
-#: src/include/sssd-parameters.rb:1126
+#: src/include/sssd-parameters.rb:1124
 msgid "Specify the domain SID of the default domain."
 msgstr "Specify the domain SID of the default domain."
 
-#: src/include/sssd-parameters.rb:1130
+#: src/include/sssd-parameters.rb:1128
 msgid "Specify the name of the default domain."
 msgstr "Specify the name of the default domain."
 
-#: src/include/sssd-parameters.rb:1135
+#: src/include/sssd-parameters.rb:1133
 msgid "Changes the behavior of the ID-mapping algorithm to behave more similarly to winbind's “idmap_autorid” algorithm."
 msgstr "Changes the behavior of the ID-mapping algorithm to behave more similarly to winbind's “idmap_autorid” algorithm."
 
 #. The Active Directory domain section
-#: src/include/sssd-parameters.rb:1147
+#: src/include/sssd-parameters.rb:1145
 msgid "Specifies the name of the IPA domain."
 msgstr "Specifies the name of the IPA domain."
 
-#: src/include/sssd-parameters.rb:1151
+#: src/include/sssd-parameters.rb:1149
 msgid "The comma-separated list of IP addresses or hostnames of the IPA servers to which SSSD should connect in the order of preference."
 msgstr "The comma-separated list of IP addresses or hostnames of the IPA servers to which SSSD should connect in the order of preference."
 
-#: src/include/sssd-parameters.rb:1155
+#: src/include/sssd-parameters.rb:1153
 msgid "May be set on machines where the hostname(5) does not reflect the fully qualified name."
 msgstr "May be set on machines where the hostname(5) does not reflect the fully qualified name."
 
-#: src/include/sssd-parameters.rb:1160
+#: src/include/sssd-parameters.rb:1158
 msgid "This option tells SSSD to automatically update the DNS server built into FreeIPA v2 with the IP address of this client."
 msgstr "This option tells SSSD to automatically update the DNS server built into FreeIPA v2 with the IP address of this client."
 
-#: src/include/sssd-parameters.rb:1165
+#: src/include/sssd-parameters.rb:1163
 msgid "The TTL to apply to the client DNS record when updating it."
 msgstr "The TTL to apply to the client DNS record when updating it."
 
-#: src/include/sssd-parameters.rb:1169
+#: src/include/sssd-parameters.rb:1167
 msgid "Choose the interface whose IP address should be used for dynamic DNS updates."
 msgstr "Choose the interface whose IP address should be used for dynamic DNS updates."
 
@@ -1094,18 +1096,24 @@
 #. Summary()
 #. returns html formated configuration summary
 #. @return summary
-#: src/modules/AuthClient.rb:334
+#: src/modules/AuthClient.rb:336
 msgid "System is configured for using nss_ldap.\n"
 msgstr "System is configured for using nss_ldap.\n"
 
-#: src/modules/AuthClient.rb:337
+#: src/modules/AuthClient.rb:339
 msgid "System is configured for using sssd.\n"
 msgstr "System is configured for using sssd.\n"
 
-#: src/modules/AuthClient.rb:343
+#: src/modules/AuthClient.rb:345
 msgid "System is configured for using OES.\n"
 msgstr "System is configured for using OES.\n"
 
-#: src/modules/AuthClient.rb:346
+#: src/modules/AuthClient.rb:348
 msgid "System is configured for using /etc/passwd only.\n"
 msgstr "System is configured for using /etc/passwd only.\n"
+
+#~ msgid "SPAM Prevention"
+#~ msgstr "SPAM Prevention"
+
+#~ msgid "TODO WRITE HELP"
+#~ msgstr "TODO WRITE HELP"

Modified: trunk/yast/en_GB/po/auth-server.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/auth-server.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/auth-server.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:51+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2014-05-19 09:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -285,8 +285,8 @@
 #. Initialization dialog caption
 #: src/include/auth-server/dialogs.rb:32 src/include/auth-server/wizards.rb:52
 #: src/include/auth-server/wizards.rb:122
-#: src/include/auth-server/wizards.rb:202
-#: src/include/auth-server/wizards.rb:295
+#: src/include/auth-server/wizards.rb:205
+#: src/include/auth-server/wizards.rb:298
 msgid "Authentication Server Configuration"
 msgstr "Authentication Server Configuration"
 
@@ -472,15 +472,15 @@
 
 #: src/include/auth-server/dialogs.rb:1093
 #: src/include/auth-server/dialogs.rb:1565
-#: src/include/auth-server/tree_structure.rb:907
-#: src/include/auth-server/widgets.rb:420
+#: src/include/auth-server/tree_structure.rb:910
+#: src/include/auth-server/widgets.rb:424
 msgid "Enter a password"
 msgstr "Enter a password"
 
 #: src/include/auth-server/dialogs.rb:1101
 #: src/include/auth-server/dialogs.rb:1570
-#: src/include/auth-server/tree_structure.rb:913
-#: src/include/auth-server/widgets.rb:430
+#: src/include/auth-server/tree_structure.rb:916
+#: src/include/auth-server/widgets.rb:435
 msgid "The passwords you have entered do not match. Try again."
 msgstr "The passwords you have entered do not match. Try again."
 
@@ -620,9 +620,9 @@
 msgstr "Enter new &Password"
 
 #: src/include/auth-server/dialogs.rb:1537
-#: src/include/auth-server/tree_structure.rb:961
-#: src/include/auth-server/tree_structure.rb:1003
-#: src/include/auth-server/widgets.rb:405 src/modules/LdapDatabase.rb:219
+#: src/include/auth-server/tree_structure.rb:964
+#: src/include/auth-server/tree_structure.rb:1006
+#: src/include/auth-server/widgets.rb:406 src/modules/LdapDatabase.rb:219
 msgid "&Validate Password"
 msgstr "&Validate Password"
 
@@ -2067,8 +2067,8 @@
 #: src/include/auth-server/mirrormode-wizard.rb:175
 #: src/include/auth-server/wizards.rb:53
 #: src/include/auth-server/wizards.rb:124
-#: src/include/auth-server/wizards.rb:204
-#: src/include/auth-server/wizards.rb:297
+#: src/include/auth-server/wizards.rb:207
+#: src/include/auth-server/wizards.rb:300
 msgid "Initializing..."
 msgstr "Initializing..."
 
@@ -2180,74 +2180,74 @@
 #. Error Popup
 #. Error Popup
 #: src/include/auth-server/tree_structure.rb:750
-#: src/include/auth-server/tree_structure.rb:884
+#: src/include/auth-server/tree_structure.rb:887
 msgid "Unable to write settings for the current database."
 msgstr "Unable to write settings for the current database."
 
 #: src/include/auth-server/tree_structure.rb:804
-#: src/include/auth-server/tree_structure.rb:941
+#: src/include/auth-server/tree_structure.rb:944
 msgid "Unable to read settings for the current database."
 msgstr "Unable to read settings for the current database."
 
-#: src/include/auth-server/tree_structure.rb:959
-#: src/include/auth-server/tree_structure.rb:1001
-#: src/include/auth-server/widgets.rb:403
+#: src/include/auth-server/tree_structure.rb:962
+#: src/include/auth-server/tree_structure.rb:1004
+#: src/include/auth-server/widgets.rb:404
 msgid "New Administrator &Password"
 msgstr "New Administrator &Password"
 
-#: src/include/auth-server/tree_structure.rb:965
-#: src/include/auth-server/tree_structure.rb:1007
-#: src/include/auth-server/widgets.rb:407
+#: src/include/auth-server/tree_structure.rb:968
+#: src/include/auth-server/tree_structure.rb:1010
+#: src/include/auth-server/widgets.rb:408
 msgid "Password &Encryption"
 msgstr "Password &Encryption"
 
-#: src/include/auth-server/tree_structure.rb:1015
+#: src/include/auth-server/tree_structure.rb:1018
 #: src/include/auth-server/widgets.rb:368
 msgid "Change Administration Password"
 msgstr "Change Administration Password"
 
-#: src/include/auth-server/tree_structure.rb:1038
-#: src/include/auth-server/tree_structure.rb:1039
-#: src/include/auth-server/tree_structure.rb:1040
 #: src/include/auth-server/tree_structure.rb:1041
+#: src/include/auth-server/tree_structure.rb:1042
+#: src/include/auth-server/tree_structure.rb:1043
+#: src/include/auth-server/tree_structure.rb:1044
 #: src/modules/AuthServer.pm:2193 src/modules/AuthServer.pm:2212
 #: src/modules/AuthServer.pm:2213 src/modules/AuthServer.pm:2214
 msgid "No"
 msgstr "No"
 
-#: src/include/auth-server/tree_structure.rb:1043
-#: src/include/auth-server/tree_structure.rb:1044
-#: src/include/auth-server/tree_structure.rb:1045
+#: src/include/auth-server/tree_structure.rb:1046
+#: src/include/auth-server/tree_structure.rb:1047
+#: src/include/auth-server/tree_structure.rb:1048
 #: src/modules/AuthServer.pm:2193 src/modules/AuthServer.pm:2212
 #: src/modules/AuthServer.pm:2213 src/modules/AuthServer.pm:2214
 msgid "Yes"
 msgstr "Yes"
 
 #. skip attribute that already have an index defined
-#: src/include/auth-server/tree_structure.rb:1188
+#: src/include/auth-server/tree_structure.rb:1191
 msgid "Multiple Replication Consumers not supported currently"
 msgstr "Multiple Replication Consumers not supported currently"
 
 #. ****************************************
 #. tree generation functions       **
 #. ***************************************
-#: src/include/auth-server/tree_structure.rb:1290
+#: src/include/auth-server/tree_structure.rb:1293
 msgid "Index Configuration"
 msgstr "Index Configuration"
 
-#: src/include/auth-server/tree_structure.rb:1298
+#: src/include/auth-server/tree_structure.rb:1301
 msgid "Password Policy Configuration"
 msgstr "Password Policy Configuration"
 
-#: src/include/auth-server/tree_structure.rb:1307
+#: src/include/auth-server/tree_structure.rb:1310
 msgid "Access Control Configuration"
 msgstr "Access Control Configuration"
 
-#: src/include/auth-server/tree_structure.rb:1316
+#: src/include/auth-server/tree_structure.rb:1319
 msgid "Replication Provider"
 msgstr "Replication Provider"
 
-#: src/include/auth-server/tree_structure.rb:1325
+#: src/include/auth-server/tree_structure.rb:1328
 msgid "Replication Consumer"
 msgstr "Replication Consumer"
 
@@ -2481,25 +2481,31 @@
 msgstr "Attribute"
 
 #: src/include/auth-server/widgets.rb:384
-#: src/include/auth-server/widgets.rb:452
+#: src/include/auth-server/widgets.rb:457
 msgid "Presence"
 msgstr "Presence"
 
 #: src/include/auth-server/widgets.rb:384
-#: src/include/auth-server/widgets.rb:453
+#: src/include/auth-server/widgets.rb:458
 msgid "Equality"
 msgstr "Equality"
 
 #: src/include/auth-server/widgets.rb:384
-#: src/include/auth-server/widgets.rb:454
+#: src/include/auth-server/widgets.rb:459
 msgid "Substring"
 msgstr "Substring"
 
-#: src/include/auth-server/widgets.rb:402
+#: src/include/auth-server/widgets.rb:403
 msgid "Change Administrator Password"
 msgstr "Change Administrator Password"
 
-#: src/include/auth-server/widgets.rb:447
+#: src/include/auth-server/widgets.rb:410
+#, fuzzy
+#| msgid "Use Kerberos"
+msgid "Update Kerberos Stash"
+msgstr "Use Kerberos"
+
+#: src/include/auth-server/widgets.rb:452
 msgid "Add Index"
 msgstr "Add Index"
 
@@ -2956,7 +2962,7 @@
 msgstr "Kerberos Schema unknown by the LDAP server."
 
 #: src/modules/AuthServer.pm:975 src/modules/AuthServer.pm:3482
-#: src/modules/AuthServer.pm:3529 src/modules/AuthServer.pm:3575
+#: src/modules/AuthServer.pm:3536 src/modules/AuthServer.pm:3581
 msgid "Cannot execute kdb5_ldap_util."
 msgstr "Cannot execute kdb5_ldap_util."
 
@@ -3219,7 +3225,7 @@
 msgid "Could not create database directory."
 msgstr "Could not create database directory."
 
-#: src/modules/AuthServer.pm:2810 src/modules/AuthServer.pm:4101
+#: src/modules/AuthServer.pm:2810 src/modules/AuthServer.pm:4107
 #: src/modules/YaPI/LdapServer.pm:498
 msgid "Could not adjust ownership of database directory."
 msgstr "Could not adjust ownership of database directory."
@@ -3242,70 +3248,70 @@
 msgid "Creating Kerberos database failed."
 msgstr "Creating Kerberos database failed."
 
-#: src/modules/AuthServer.pm:3560 src/modules/AuthServer.pm:3606
+#: src/modules/AuthServer.pm:3566 src/modules/AuthServer.pm:3612
 msgid "Writing to password file failed."
 msgstr "Writing to password file failed."
 
-#: src/modules/AuthServer.pm:3972 src/modules/AuthServer.pm:3982
+#: src/modules/AuthServer.pm:3978 src/modules/AuthServer.pm:3988
 msgid "is not a valid LDAP DN."
 msgstr "is not a valid LDAP DN."
 
-#: src/modules/AuthServer.pm:3977 src/modules/AuthServer.pm:3987
+#: src/modules/AuthServer.pm:3983 src/modules/AuthServer.pm:3993
 msgid "has multivalued RDNs."
 msgstr "has multivalued RDNs."
 
-#: src/modules/AuthServer.pm:4019
+#: src/modules/AuthServer.pm:4025
 #, perl-format
 msgid "Invalid LDAP DN: \"%s\", cannot extract RDN values"
 msgstr "Invalid LDAP DN: \"%s\", cannot extract RDN values"
 
-#: src/modules/AuthServer.pm:4027
+#: src/modules/AuthServer.pm:4033
 msgid "The value of the \"c\" attribute must contain a valid ISO-3166 country 2-letter code."
 msgstr "The value of the \"c\" attribute must contain a valid ISO-3166 country 2-letter code."
 
 #. parameter check failed
-#: src/modules/AuthServer.pm:4034 src/modules/YaPI/LdapServer.pm:373
+#: src/modules/AuthServer.pm:4040 src/modules/YaPI/LdapServer.pm:373
 msgid "First part of suffix must be c=, st=, l=, o=, ou= or dc=."
 msgstr "First part of suffix must be c=, st=, l=, o=, ou= or dc=."
 
-#: src/modules/AuthServer.pm:4046
+#: src/modules/AuthServer.pm:4052
 #, perl-format
 msgid "Base DN \"%s\" is not a valid LDAP DN."
 msgstr "Base DN \"%s\" is not a valid LDAP DN."
 
-#: src/modules/AuthServer.pm:4051
+#: src/modules/AuthServer.pm:4057
 #, perl-format
 msgid "Base DN \"%s\" has multivalued RDNs (not supported by YaST)."
 msgstr "Base DN \"%s\" has multivalued RDNs (not supported by YaST)."
 
-#: src/modules/AuthServer.pm:4060
+#: src/modules/AuthServer.pm:4066
 #, perl-format
 msgid "Root DN \"%s\" is not a valid LDAP DN."
 msgstr "Root DN \"%s\" is not a valid LDAP DN."
 
-#: src/modules/AuthServer.pm:4065
+#: src/modules/AuthServer.pm:4071
 #, perl-format
 msgid "Root DN \"%s\" has multivalued RDNs (not supported by YaST)."
 msgstr "Root DN \"%s\" has multivalued RDNs (not supported by YaST)."
 
-#: src/modules/AuthServer.pm:4072
+#: src/modules/AuthServer.pm:4078
 msgid "The Root DN must be a child object of the Base DN."
 msgstr "The Root DN must be a child object of the Base DN."
 
-#: src/modules/AuthServer.pm:4094 src/modules/YaPI/LdapServer.pm:484
+#: src/modules/AuthServer.pm:4100 src/modules/YaPI/LdapServer.pm:484
 msgid "Could not create directory."
 msgstr "Could not create directory."
 
-#: src/modules/AuthServer.pm:4871
+#: src/modules/AuthServer.pm:4877
 #, perl-format
 msgid "CA Certificate File: \"%s\" does not exist."
 msgstr "CA Certificate File: \"%s\" does not exist."
 
-#: src/modules/AuthServer.pm:4881
+#: src/modules/AuthServer.pm:4887
 msgid "Error while trying to verify the server certificate of the provider server.\n"
 msgstr "Error while trying to verify the server certificate of the provider server.\n"
 
-#: src/modules/AuthServer.pm:4882
+#: src/modules/AuthServer.pm:4888
 #, perl-format
 msgid ""
 "Please make sure that \"%s\" contains the correct\n"
@@ -3314,21 +3320,21 @@
 "Please make sure that \"%s\" contains the correct\n"
 "CA file to verify the remote Server Certificate."
 
-#: src/modules/AuthServer.pm:4890
+#: src/modules/AuthServer.pm:4896
 #, perl-format
 msgid "Certificate File: \"%s\" does not exist."
 msgstr "Certificate File: \"%s\" does not exist."
 
-#: src/modules/AuthServer.pm:4895
+#: src/modules/AuthServer.pm:4901
 #, perl-format
 msgid "Certificate Key File: \"%s\" does not exist."
 msgstr "Certificate Key File: \"%s\" does not exist."
 
-#: src/modules/AuthServer.pm:4976 src/modules/AuthServer.pm:4986
+#: src/modules/AuthServer.pm:4982 src/modules/AuthServer.pm:4992
 msgid "Writing to krb5.conf failed."
 msgstr "Writing to krb5.conf failed."
 
-#: src/modules/AuthServer.pm:5354 src/modules/AuthServer.pm:5363
+#: src/modules/AuthServer.pm:5360 src/modules/AuthServer.pm:5369
 msgid "Writing to kdc.conf failed."
 msgstr "Writing to kdc.conf failed."
 

Modified: trunk/yast/en_GB/po/autoinst.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/autoinst.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/autoinst.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: autoinst\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:51+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2008-03-27 19:11+0000\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"
@@ -58,9 +58,9 @@
 #. 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:188 src/clients/inst_autosetup.rb:374
-#: src/clients/inst_autosetup_upgrade.rb:423
-#: src/modules/AutoInstallRules.rb:1001
+#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:403
+#: src/clients/inst_autosetup_upgrade.rb:482
+#: src/modules/AutoInstallRules.rb:1006
 msgid ""
 "Error while parsing the control file.\n"
 "Check the log files for more details or fix the\n"
@@ -116,7 +116,7 @@
 msgid "enable/disable all package handling"
 msgstr "Enable/disable chrooting."
 
-#: src/clients/ayast_setup.rb:87 src/clients/clone_system.rb:82
+#: src/clients/ayast_setup.rb:87 src/clients/clone_system.rb:81
 #, fuzzy
 msgid "Empty parameter list"
 msgstr "Some parameter missing"
@@ -129,29 +129,36 @@
 msgstr "Path to AutoYaST Profile"
 
 #. if we get no argument or map of options we are not in command line
-#: src/clients/clone_system.rb:47
+#: src/clients/clone_system.rb:46
 #, fuzzy
 msgid "Client for creating an AutoYaST profile based on the currently running system"
 msgstr "Saving configuration data on target system."
 
-#: src/clients/clone_system.rb:57
+#: src/clients/clone_system.rb:56
 #, fuzzy
 #| msgid "Unknown mode"
 msgid "known modules: %1"
 msgstr "Unknown mode"
 
-#: src/clients/clone_system.rb:64
+#: src/clients/clone_system.rb:63
 #, fuzzy
 #| msgid "Comma-separated list of modules to enable"
 msgid "comma separated list of modules to clone"
 msgstr "Comma-separated list of modules to enable"
 
-#: src/clients/clone_system.rb:89
+#. TRANSLATORS: Warning that an already existing autoyast configuration file will be overwritten.
+#: src/clients/clone_system.rb:94
+#, fuzzy
+#| msgid "%1 exists! Really overwrite?"
+msgid "File %s exists! Really overwrite?"
+msgstr "%1 exists! Really overwrite?"
+
+#: src/clients/clone_system.rb:98
 msgid "Cloning the system..."
 msgstr "Cloning the system..."
 
 #. TRANSLATORS: %s is path where profile can be found
-#: src/clients/clone_system.rb:91
+#: src/clients/clone_system.rb:100
 #, fuzzy
 #| msgid "The resulting autoyast profile can be found in /root/autoinst.xml."
 msgid "The resulting autoyast profile can be found in %s."
@@ -514,56 +521,66 @@
 msgid "Create partition plans"
 msgstr "Create partition plans"
 
-#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:54
+#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:56
+msgid "Configure Bootloader"
+msgstr "Configure Bootloader"
+
+#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:54
+msgid "Registration"
+msgstr "Registration"
+
+#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:55
 msgid "Configure Software selections"
 msgstr "Configure Software selections"
 
-#: src/clients/inst_autosetup.rb:58
-msgid "Configure Bootloader"
-msgstr "Configure Bootloader"
-
-#: src/clients/inst_autosetup.rb:59
+#: src/clients/inst_autosetup.rb:60
 msgid "Configure Systemd Default Target"
 msgstr ""
 
-#: src/clients/inst_autosetup.rb:63 src/clients/inst_autosetup_upgrade.rb:59
+#: src/clients/inst_autosetup.rb:64 src/clients/inst_autosetup_upgrade.rb:61
 msgid "Executing pre-install user scripts..."
 msgstr "Executing pre-install user scripts..."
 
-#: src/clients/inst_autosetup.rb:64 src/clients/inst_autosetup_upgrade.rb:58
+#: src/clients/inst_autosetup.rb:65 src/clients/inst_autosetup_upgrade.rb:60
 msgid "Configuring general settings..."
 msgstr "Configuring general settings..."
 
-#: src/clients/inst_autosetup.rb:65
+#: src/clients/inst_autosetup.rb:66 src/clients/inst_autosetup_upgrade.rb:62
 #, fuzzy
 #| msgid "Set up language"
 msgid "Setting up language..."
 msgstr "Set up language"
 
-#: src/clients/inst_autosetup.rb:66
+#: src/clients/inst_autosetup.rb:67
 msgid "Creating partition plans..."
 msgstr "Creating partition plans..."
 
-#: src/clients/inst_autosetup.rb:67 src/clients/inst_autosetup_upgrade.rb:60
-msgid "Configuring Software selections..."
-msgstr "Configuring Software selections..."
-
-#: src/clients/inst_autosetup.rb:68
+#: src/clients/inst_autosetup.rb:68 src/clients/inst_autosetup_upgrade.rb:65
 msgid "Configuring Bootloader..."
 msgstr "Configuring Bootloader..."
 
-#: src/clients/inst_autosetup.rb:69
+#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:63
 #, fuzzy
+#| msgid "Repairing file system..."
+msgid "Registering the system..."
+msgstr "Repairing file system..."
+
+#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:64
+msgid "Configuring Software selections..."
+msgstr "Configuring Software selections..."
+
+#: src/clients/inst_autosetup.rb:71
+#, fuzzy
 #| msgid "Configuring language..."
 msgid "Configuring Systemd Default Target..."
 msgstr "Configuring language..."
 
-#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:64
+#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:69
 msgid "Preparing System for Automated Installation"
 msgstr "Preparing System for Automated Installation"
 
 #. configure general settings
-#: src/clients/inst_autosetup.rb:161
+#: src/clients/inst_autosetup.rb:163
 #, fuzzy
 #| msgid "Signing the Add-On Product"
 msgid "Handling Add-On Products..."
@@ -572,12 +589,12 @@
 #. Set it in the Language module.
 #.
 #. Set it in the Language module.
-#: src/clients/inst_autosetup.rb:181 src/clients/inst_autosetup_upgrade.rb:144
+#: src/clients/inst_autosetup.rb:183 src/clients/inst_autosetup_upgrade.rb:149
 msgid "Configuring language..."
 msgstr "Configuring language..."
 
 #. Yes, do not set Storage testsuite here as we want really GUI with proposal
-#: src/clients/inst_autosetup.rb:267
+#: src/clients/inst_autosetup.rb:272
 msgid ""
 "Error while configuring partitions.\n"
 "Try again.\n"
@@ -586,7 +603,7 @@
 "Try again.\n"
 
 #. Software
-#: src/clients/inst_autosetup.rb:289
+#: src/clients/inst_autosetup.rb:328
 msgid ""
 "Error while configuring software selections.\n"
 "Try again.\n"
@@ -596,55 +613,55 @@
 
 #. ReportingDialog()
 #. @return sumbol
-#: src/clients/report_auto.rb:99
+#: src/clients/report_auto.rb:103
 msgid "Messages"
 msgstr "Messages"
 
-#: src/clients/report_auto.rb:105
+#: src/clients/report_auto.rb:109
 msgid "Sho&w messages"
 msgstr "Sho&w messages"
 
-#: src/clients/report_auto.rb:113
+#: src/clients/report_auto.rb:117
 msgid "Lo&g messages"
 msgstr "Lo&g messages"
 
-#: src/clients/report_auto.rb:124
+#: src/clients/report_auto.rb:128
 msgid "&Time-out (in sec.)"
 msgstr "&Time-out (in sec.)"
 
-#: src/clients/report_auto.rb:136
+#: src/clients/report_auto.rb:140
 msgid "Warnings"
 msgstr "Warnings"
 
-#: src/clients/report_auto.rb:142
+#: src/clients/report_auto.rb:146
 msgid "Sh&ow warnings"
 msgstr "Sh&ow warnings"
 
-#: src/clients/report_auto.rb:150
+#: src/clients/report_auto.rb:154
 msgid "Log wa&rnings"
 msgstr "Log wa&rnings"
 
-#: src/clients/report_auto.rb:161
+#: src/clients/report_auto.rb:165
 msgid "Time-out (in s&ec.)"
 msgstr "Time-out (in s&ec.)"
 
-#: src/clients/report_auto.rb:173
+#: src/clients/report_auto.rb:177
 msgid "Errors"
 msgstr "Errors"
 
-#: src/clients/report_auto.rb:179
+#: src/clients/report_auto.rb:183
 msgid "Show error&s"
 msgstr "Show error&s"
 
-#: src/clients/report_auto.rb:187
+#: src/clients/report_auto.rb:191
 msgid "&Log errors"
 msgstr "&Log errors"
 
-#: src/clients/report_auto.rb:198
+#: src/clients/report_auto.rb:202
 msgid "Time-o&ut (in sec.)"
 msgstr "Time-o&ut (in sec.)"
 
-#: src/clients/report_auto.rb:213
+#: src/clients/report_auto.rb:217
 msgid ""
 "<p>Depending on your experience, you can skip, log, and show (with time-out)\n"
 "installation messages.</p> \n"
@@ -652,7 +669,7 @@
 "<p>Depending on your experience, you can skip, log, and show (with time-out)\n"
 "installation messages.</p> \n"
 
-#: src/clients/report_auto.rb:219
+#: src/clients/report_auto.rb:223
 msgid ""
 "<p>It is recommended to show all  <b>messages</b> with time-out.\n"
 "Warnings can be skipped in some places, but should not be ignored.</p>\n"
@@ -660,7 +677,7 @@
 "<p>It is recommended to show all  <b>messages</b> with time-out.\n"
 "Warnings can be skipped in some places, but should not be ignored.</p>\n"
 
-#: src/clients/report_auto.rb:226
+#: src/clients/report_auto.rb:230
 msgid "Messages and Logging"
 msgstr "Messages and Logging"
 
@@ -1078,7 +1095,7 @@
 msgstr "Ne&w"
 
 #: src/include/autoinstall/classes.rb:65
-#: src/include/autoinstall/conftree.rb:172
+#: src/include/autoinstall/conftree.rb:175
 msgid "&Edit"
 msgstr "&Edit"
 
@@ -1276,34 +1293,30 @@
 msgid "Groups"
 msgstr "Groups"
 
-#. Creates the modules selection box displaying modules in the specified group.
-#. The specified YaST module is selected.
-#.
-#. @param [String] group_name YaST group of modules to display.
-#. @param [String] selectedModule Module to preselect.
-#: src/include/autoinstall/conftree.rb:151
+#. bnc #887115 comment #9: Desktop file is "hidden" and should not be shown at all
+#: src/include/autoinstall/conftree.rb:154
 #, fuzzy
 msgid "No modules available"
 msgstr "No updates available."
 
-#: src/include/autoinstall/conftree.rb:154
+#: src/include/autoinstall/conftree.rb:157
 msgid "Modules"
 msgstr "Modules"
 
 #. Creates an `HBox containing the buttons to be displayed below the summary column
 #.
 #. @return The `HBox widget.
-#: src/include/autoinstall/conftree.rb:167
+#: src/include/autoinstall/conftree.rb:170
 #, fuzzy
 msgid "&Clone"
 msgstr "&Close"
 
-#: src/include/autoinstall/conftree.rb:168
+#: src/include/autoinstall/conftree.rb:171
 #, fuzzy
 msgid "&Apply to System"
 msgstr "Copy Profile to CD I&mage"
 
-#: src/include/autoinstall/conftree.rb:173
+#: src/include/autoinstall/conftree.rb:176
 #, fuzzy
 msgid "Clea&r"
 msgstr "&Clear"
@@ -1312,7 +1325,7 @@
 #.
 #. @param [String] module_name The module to summarize.
 #. @return The `VBox widget.
-#: src/include/autoinstall/conftree.rb:192
+#: src/include/autoinstall/conftree.rb:195
 msgid "Details"
 msgstr "Details"
 
@@ -1618,7 +1631,7 @@
 #. list<any> l = [ "key1",0,"key3" ];
 #. m[ l ] = v;
 #. @return [Hash]
-#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:791
+#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:794
 msgid "Checking XML with RNG validation..."
 msgstr "Checking XML with RNG validation..."
 
@@ -1629,7 +1642,7 @@
 msgstr "Section %1 not found."
 
 #. jing validation -- validates complete xml profile
-#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:803
+#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:806
 msgid "Checking XML with RNC validation..."
 msgstr "Checking XML with RNC validation..."
 
@@ -1671,7 +1684,7 @@
 msgstr "Turn Off the Machine after the First Stage"
 
 #: src/include/autoinstall/general_dialogs.rb:90
-#: src/modules/AutoinstGeneral.rb:118
+#: src/modules/AutoinstGeneral.rb:121
 msgid "Signature Handling"
 msgstr "Signature Handling"
 
@@ -2357,7 +2370,7 @@
 
 #. Read rules file
 #. @return [void]
-#: src/modules/AutoInstallRules.rb:448
+#: src/modules/AutoInstallRules.rb:453
 msgid "Parsing the rules file failed. XML parser reports:\n"
 msgstr "Parsing the rules file failed. XML parser reports:\n"
 
@@ -2365,12 +2378,12 @@
 #. @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:909 src/modules/Profile.rb:722
+#: src/modules/AutoInstallRules.rb:914 src/modules/Profile.rb:725
 msgid "The XML parser reported an error while parsing the autoyast profile. The error message is:\n"
 msgstr "The XML parser reported an error while parsing the autoyast profile. The error message is:\n"
 
 #. backdoor for merging problems.
-#: src/modules/AutoInstallRules.rb:1054
+#: src/modules/AutoInstallRules.rb:1059
 msgid ""
 "\n"
 "User-defined classes could not be retrieved.  Make sure all classes \n"
@@ -2386,46 +2399,46 @@
 
 #. The line above needs to be fixed when we have more attributes
 #. comment will look like this: "(description=BLA BLA)"
-#: src/modules/AutoinstConfig.rb:271
+#: src/modules/AutoinstConfig.rb:273
 #, fuzzy
 msgid "Choose Profile"
 msgstr "&Use Profile"
 
 #. SetProtocolMessage ()
 #. @return [void]
-#: src/modules/AutoinstConfig.rb:327
+#: src/modules/AutoinstConfig.rb:329
 msgid "Retrieving control file from floppy."
 msgstr "Retrieving control file from floppy."
 
-#: src/modules/AutoinstConfig.rb:330
+#: src/modules/AutoinstConfig.rb:332
 msgid "Retrieving control file (%1) from TFTP server: %2."
 msgstr "Retrieving control file (%1) from TFTP server: %2."
 
-#: src/modules/AutoinstConfig.rb:336
+#: src/modules/AutoinstConfig.rb:338
 msgid "Retrieving control file (%1) from NFS server: %2."
 msgstr "Retrieving control file (%1) from NFS server: %2."
 
-#: src/modules/AutoinstConfig.rb:342
+#: src/modules/AutoinstConfig.rb:344
 msgid "Retrieving control file (%1) from HTTP server: %2."
 msgstr "Retrieving control file (%1) from HTTP server: %2."
 
-#: src/modules/AutoinstConfig.rb:348
+#: src/modules/AutoinstConfig.rb:350
 msgid "Retrieving control file (%1) from FTP server: %2."
 msgstr "Retrieving control file (%1) from FTP server: %2."
 
-#: src/modules/AutoinstConfig.rb:354
+#: src/modules/AutoinstConfig.rb:356
 msgid "Copying control file from file: %1."
 msgstr "Copying control file from file: %1."
 
-#: src/modules/AutoinstConfig.rb:359
+#: src/modules/AutoinstConfig.rb:361
 msgid "Copying control file from device: /dev/%1."
 msgstr "Copying control file from device: /dev/%1."
 
-#: src/modules/AutoinstConfig.rb:363
+#: src/modules/AutoinstConfig.rb:365
 msgid "Copying control file from default location."
 msgstr "Copying control file from default location."
 
-#: src/modules/AutoinstConfig.rb:365
+#: src/modules/AutoinstConfig.rb:367
 msgid "Source unknown."
 msgstr "Source unknown."
 
@@ -2435,7 +2448,7 @@
 #. {
 #. local_rules_file = (string)WFM::Args(1);
 #. }
-#: src/modules/AutoinstConfig.rb:445
+#: src/modules/AutoinstConfig.rb:447
 msgid ""
 "<h3>AutoYaST Configuration Management System</h3>\n"
 "<p>Almost all resources of the control file can be\n"
@@ -2445,7 +2458,7 @@
 "<p>Almost all resources of the control file can be\n"
 "configured using the configuration management system.</p>\n"
 
-#: src/modules/AutoinstConfig.rb:450
+#: src/modules/AutoinstConfig.rb:452
 #, fuzzy
 msgid ""
 "<p>Most of the modules used to create the configuration are identical to those available\n"
@@ -2460,7 +2473,7 @@
 "install another system using AutoYaST.\n"
 "</p>\n"
 
-#: src/modules/AutoinstConfig.rb:457
+#: src/modules/AutoinstConfig.rb:459
 msgid ""
 "<p>In addition to the existing and familiar modules,\n"
 "new interfaces were created for special and complex configurations, including\n"
@@ -2478,13 +2491,13 @@
 #. @param [Hash{String => Object}] drive to create node name for
 #.
 #. @return the newly created node name
-#: src/modules/AutoinstDrive.rb:129
+#: src/modules/AutoinstDrive.rb:128
 #, fuzzy
 msgid " - Drive"
 msgstr "&Drive"
 
 #. volume group
-#: src/modules/AutoinstDrive.rb:133
+#: src/modules/AutoinstDrive.rb:132
 #, fuzzy
 msgid " - Volume group"
 msgstr " Volume Group "
@@ -2496,76 +2509,76 @@
 
 #. string language_name		= "";
 #. string keyboard_name		= "";
-#: src/modules/AutoinstGeneral.rb:82
+#: src/modules/AutoinstGeneral.rb:85
 msgid "Confirm installation?"
 msgstr "Confirm installation?"
 
-#: src/modules/AutoinstGeneral.rb:85 src/modules/AutoinstGeneral.rb:91
-#: src/modules/AutoinstGeneral.rb:100 src/modules/AutoinstGeneral.rb:107
-#: src/modules/AutoinstGeneral.rb:114
+#: src/modules/AutoinstGeneral.rb:88 src/modules/AutoinstGeneral.rb:94
+#: src/modules/AutoinstGeneral.rb:103 src/modules/AutoinstGeneral.rb:110
+#: src/modules/AutoinstGeneral.rb:117
 msgid "Yes"
 msgstr "Yes"
 
-#: src/modules/AutoinstGeneral.rb:85 src/modules/AutoinstGeneral.rb:91
-#: src/modules/AutoinstGeneral.rb:100
+#: src/modules/AutoinstGeneral.rb:88 src/modules/AutoinstGeneral.rb:94
+#: src/modules/AutoinstGeneral.rb:103
 msgid "No"
 msgstr "No"
 
-#: src/modules/AutoinstGeneral.rb:88
+#: src/modules/AutoinstGeneral.rb:91
 msgid "Second Stage of AutoYaST"
 msgstr "Second Stage of AutoYaST"
 
-#: src/modules/AutoinstGeneral.rb:96
+#: src/modules/AutoinstGeneral.rb:99
 msgid "Halting the machine after stage one"
 msgstr "Halting the machine after stage one"
 
-#: src/modules/AutoinstGeneral.rb:105
+#: src/modules/AutoinstGeneral.rb:108
 #, fuzzy
 msgid "Halting the machine after stage two"
 msgstr "Halting the machine after stage one"
 
-#: src/modules/AutoinstGeneral.rb:112
+#: src/modules/AutoinstGeneral.rb:115
 #, fuzzy
 msgid "Reboot the machine after stage two"
 msgstr "Halting the machine after stage one"
 
-#: src/modules/AutoinstGeneral.rb:122
+#: src/modules/AutoinstGeneral.rb:125
 msgid "Accepting unsigned files"
 msgstr "Accepting unsigned files"
 
-#: src/modules/AutoinstGeneral.rb:123
+#: src/modules/AutoinstGeneral.rb:126
 msgid "Not accepting unsigned files"
 msgstr "Not accepting unsigned files"
 
-#: src/modules/AutoinstGeneral.rb:132
+#: src/modules/AutoinstGeneral.rb:135
 msgid "Accepting files without a checksum"
 msgstr "Accepting files without a checksum"
 
-#: src/modules/AutoinstGeneral.rb:133
+#: src/modules/AutoinstGeneral.rb:136
 msgid "Not accepting files without a checksum"
 msgstr "Not accepting files without a checksum"
 
-#: src/modules/AutoinstGeneral.rb:142
+#: src/modules/AutoinstGeneral.rb:145
 msgid "Accepting failed verifications"
 msgstr "Accepting failed verifications"
 
-#: src/modules/AutoinstGeneral.rb:143
+#: src/modules/AutoinstGeneral.rb:146
 msgid "Not accepting failed verifications"
 msgstr "Not accepting failed verifications"
 
-#: src/modules/AutoinstGeneral.rb:148
+#: src/modules/AutoinstGeneral.rb:151
 msgid "Accepting unknown GPG keys"
 msgstr "Accepting unknown GPG keys"
 
-#: src/modules/AutoinstGeneral.rb:149
+#: src/modules/AutoinstGeneral.rb:152
 msgid "Not accepting unknown GPG Keys"
 msgstr "Not accepting unknown GPG Keys"
 
-#: src/modules/AutoinstGeneral.rb:154
+#: src/modules/AutoinstGeneral.rb:157
 msgid "Importing new GPG keys"
 msgstr "Importing new GPG keys"
 
-#: src/modules/AutoinstGeneral.rb:155
+#: src/modules/AutoinstGeneral.rb:158
 msgid "Not importing new GPG Keys"
 msgstr "Not importing new GPG Keys"
 
@@ -2587,11 +2600,11 @@
 #. @return  [String] configuration summary dialog
 #. return Summary of configuration
 #. @return  [String] configuration summary dialog
-#: src/modules/AutoinstPartPlan.rb:681 src/modules/AutoinstStorage.rb:912
+#: src/modules/AutoinstPartPlan.rb:682 src/modules/AutoinstStorage.rb:912
 msgid "Drives"
 msgstr "Drives"
 
-#: src/modules/AutoinstPartPlan.rb:685 src/modules/AutoinstStorage.rb:916
+#: src/modules/AutoinstPartPlan.rb:686 src/modules/AutoinstStorage.rb:916
 #, fuzzy
 #| msgid "Total of %1 drive"
 #| msgid_plural "Total of %1 drives"
@@ -2661,29 +2674,29 @@
 
 #. 4 means "already exists"
 #. Add add-ons
-#: src/modules/AutoinstSoftware.rb:312 src/modules/AutoinstSoftware.rb:332
+#: src/modules/AutoinstSoftware.rb:315 src/modules/AutoinstSoftware.rb:335
 #, fuzzy
 #| msgid "Reading file on %1 failed.\n"
 msgid "Adding repo %1 failed"
 msgstr "Reading file on %1 failed.\n"
 
 #. Install
-#: src/modules/AutoinstSoftware.rb:360
+#: src/modules/AutoinstSoftware.rb:363
 msgid "Image creation failed while pattern installation. Please check /tmp/ay_image.log"
 msgstr ""
 
-#: src/modules/AutoinstSoftware.rb:368
+#: src/modules/AutoinstSoftware.rb:371
 #, fuzzy
 #| msgid "Checking installed packages..."
 msgid "Creating Image - installing packages"
 msgstr "Checking installed packages..."
 
-#: src/modules/AutoinstSoftware.rb:378
+#: src/modules/AutoinstSoftware.rb:381
 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:389
+#: src/modules/AutoinstSoftware.rb:392
 #, fuzzy
 #| msgid "Retrieving image file..."
 msgid "Store image to ..."
@@ -2691,60 +2704,60 @@
 
 #. Compress image:
 #. tar cfz /srv/www/htdocs/image.tar.gz --exclude="proc*"  .
-#: src/modules/AutoinstSoftware.rb:418
+#: src/modules/AutoinstSoftware.rb:421
 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:432
+#: src/modules/AutoinstSoftware.rb:435
 msgid "Image compressing failed in '%1'. Please check /tmp/ay_image.log"
 msgstr ""
 
-#: src/modules/AutoinstSoftware.rb:439
+#: src/modules/AutoinstSoftware.rb:442
 #, fuzzy
 #| msgid "Archive created successfully"
 msgid "Image created successfully"
 msgstr "Archive created successfully"
 
 #. copy a directory (ends with / in directory.yast)
-#: src/modules/AutoinstSoftware.rb:475
+#: src/modules/AutoinstSoftware.rb:478
 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:509
+#: src/modules/AutoinstSoftware.rb:512
 #, fuzzy
 #| msgid "Cannot read configuration file."
 msgid "can not read '%1'. Try again?"
 msgstr "Cannot read configuration file."
 
 #. copy a file
-#: src/modules/AutoinstSoftware.rb:527
+#: src/modules/AutoinstSoftware.rb:530
 #, fuzzy
 #| msgid "Cannot read configuration file."
 msgid "can not read '%1'. ISO creation failed"
 msgstr "Cannot read configuration file."
 
 #. we will have the image.tar.gz and autoinst.xml on the root of the DVD/CD
-#: src/modules/AutoinstSoftware.rb:557
+#: src/modules/AutoinstSoftware.rb:560
 #, fuzzy
 #| msgid "Creating ISO image directory..."
 msgid "Preparing ISO Filestructure ..."
 msgstr "Creating ISO image directory..."
 
 #. prepare and save isolinux.cfg boot menu of the media
-#: src/modules/AutoinstSoftware.rb:606
+#: src/modules/AutoinstSoftware.rb:609
 msgid "boot config for the DVD"
 msgstr ""
 
-#: src/modules/AutoinstSoftware.rb:610
+#: src/modules/AutoinstSoftware.rb:613
 msgid "Ok"
 msgstr "Ok"
 
-#: src/modules/AutoinstSoftware.rb:613
+#: src/modules/AutoinstSoftware.rb:616
 msgid ""
 "You can do changes to the ISO now in %1, like adding a complete different AutoYaST XML file.\n"
 "If you press the ok-button, the iso will be created."
@@ -2752,19 +2765,19 @@
 
 #. 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:632
+#: src/modules/AutoinstSoftware.rb:635
 #, fuzzy
 #| msgid "Creating ISO image..."
 msgid "Store ISO image to ..."
 msgstr "Creating ISO image..."
 
-#: src/modules/AutoinstSoftware.rb:633
+#: src/modules/AutoinstSoftware.rb:636
 #, fuzzy
 #| msgid "Creating ISO image..."
 msgid "Creating ISO File ..."
 msgstr "Creating ISO image..."
 
-#: src/modules/AutoinstSoftware.rb:654
+#: src/modules/AutoinstSoftware.rb:657
 #, fuzzy
 #| msgid "Successfully Tested %1"
 msgid "ISO successfully created at %1"
@@ -2772,29 +2785,29 @@
 
 #. Summary
 #. @return Html formatted configuration summary
-#: src/modules/AutoinstSoftware.rb:730
+#: src/modules/AutoinstSoftware.rb:733
 msgid "Selected Patterns"
 msgstr "Selected Patterns"
 
-#: src/modules/AutoinstSoftware.rb:740
+#: src/modules/AutoinstSoftware.rb:743
 msgid "Individually Selected Packages"
 msgstr "Individually Selected Packages"
 
-#: src/modules/AutoinstSoftware.rb:746
+#: src/modules/AutoinstSoftware.rb:749
 msgid "Packages to Remove"
 msgstr "Packages to Remove"
 
-#: src/modules/AutoinstSoftware.rb:753
+#: src/modules/AutoinstSoftware.rb:756
 msgid "Force Kernel Package"
 msgstr "Force Kernel Package"
 
 #. set SoftLock to avoid the installation of recommended patterns (#159466)
-#: src/modules/AutoinstSoftware.rb:843
+#: src/modules/AutoinstSoftware.rb:846
 msgid "Could not set patterns: %1."
 msgstr "Could not set patterns: %1."
 
 #. Solve dependencies
-#: src/modules/AutoinstSoftware.rb:903
+#: src/modules/AutoinstSoftware.rb:907
 msgid "The package resolver run failed. Please check your software section in the autoyast profile."
 msgstr "The package resolver run failed. Please check your software section in the autoyast profile."
 
@@ -2843,7 +2856,7 @@
 #. Save YCP data into XML
 #. @param  path to file
 #. @return	[Boolean] true on success
-#: src/modules/Profile.rb:438
+#: src/modules/Profile.rb:441
 msgid "Encrypted AutoYaST profile. Enter the password twice."
 msgstr ""
 
@@ -2851,7 +2864,7 @@
 #.
 #. @param [String] dir - directory to store section xml files in
 #. @return	  - list of filenames
-#: src/modules/Profile.rb:512
+#: src/modules/Profile.rb:515
 #, fuzzy
 msgid "Could not write section %1 to file %2."
 msgstr "Cannot write comment to file %1."
@@ -2859,7 +2872,7 @@
 #. Read XML into  YCP data
 #. @param  path to file
 #. @return	[Boolean]
-#: src/modules/Profile.rb:679 src/modules/ProfileLocation.rb:190
+#: src/modules/Profile.rb:682 src/modules/ProfileLocation.rb:190
 msgid "Encrypted AutoYaST profile. Enter the correct password."
 msgstr ""
 

Modified: trunk/yast/en_GB/po/base.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/base.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/base.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: base\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-07 13:28+0200\n"
+"POT-Creation-Date: 2014-10-29 16:22+0100\n"
 "PO-Revision-Date: 2008-03-27 19:13+0000\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"
@@ -1295,7 +1295,7 @@
 #. this media (CD) so no packages from this media will be installed
 #. PushButton label
 #: library/general/src/modules/Label.rb:250
-#: library/packages/src/modules/PackageCallbacks.rb:887
+#: library/packages/src/modules/PackageCallbacks.rb:889
 #: library/wizard/src/modules/Confirm.rb:127
 msgid "&Skip"
 msgstr "&Skip"
@@ -1318,7 +1318,7 @@
 #. TextEntry Label
 #. textentry label
 #: library/general/src/modules/Label.rb:319
-#: library/packages/src/modules/PackageCallbacks.rb:2562
+#: library/packages/src/modules/PackageCallbacks.rb:2581
 msgid "&Password"
 msgstr "&Password"
 
@@ -2672,37 +2672,37 @@
 "No spaces are allowed.\n"
 
 #. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:109
+#: library/network/src/modules/SuSEFirewall.rb:114
 msgid "External Zone"
 msgstr "External Zone"
 
 #. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:113
+#: library/network/src/modules/SuSEFirewall.rb:118
 msgid "Internal Zone"
 msgstr "Internal Zone"
 
 #. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:117
+#: library/network/src/modules/SuSEFirewall.rb:122
 msgid "Demilitarized Zone"
 msgstr "Demilitarized Zone"
 
 #. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:238
+#: library/network/src/modules/SuSEFirewall.rb:243
 msgid "TCP"
 msgstr "TCP"
 
 #. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:240
+#: library/network/src/modules/SuSEFirewall.rb:245
 msgid "UDP"
 msgstr "UDP"
 
 #. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:242
+#: library/network/src/modules/SuSEFirewall.rb:247
 msgid "RPC"
 msgstr "RPC"
 
 #. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:244
+#: library/network/src/modules/SuSEFirewall.rb:249
 msgid "IP"
 msgstr "IP"
 
@@ -2738,82 +2738,72 @@
 "Run YaST2 Firewall and assign it.\n"
 
 #. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2486
+#: library/network/src/modules/SuSEFirewall.rb:2478
 msgid "Initializing Firewall Configuration"
 msgstr "Initialising Firewall Configuration"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2494
+#: library/network/src/modules/SuSEFirewall.rb:2486
 msgid "Check for network devices"
 msgstr "Check for network devices"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2496
+#: library/network/src/modules/SuSEFirewall.rb:2488
 msgid "Read current configuration"
 msgstr "Read current configuration"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2498
+#: library/network/src/modules/SuSEFirewall.rb:2490
 msgid "Check possibly conflicting services"
 msgstr "Check possibly conflicting services"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2500
-msgid "Read dynamic definitions of installed services"
-msgstr "Read dynamic definitions of installed services"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2504
+#: library/network/src/modules/SuSEFirewall.rb:2494
 msgid "Checking for network devices..."
 msgstr "Checking for network devices..."
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2506
+#: library/network/src/modules/SuSEFirewall.rb:2496
 msgid "Reading current configuration..."
 msgstr "Reading current configuration..."
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2508
+#: library/network/src/modules/SuSEFirewall.rb:2498
 msgid "Checking possibly conflicting services..."
 msgstr "Checking possibly conflicting services..."
 
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2510
-msgid "Reading dynamic definitions of installed services..."
-msgstr "Reading dynamic definitions of installed services..."
-
 #. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2671
+#: library/network/src/modules/SuSEFirewall.rb:2655
 msgid "Writing Firewall Configuration"
 msgstr "Writing Firewall Configuration"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2679
+#: library/network/src/modules/SuSEFirewall.rb:2663
 msgid "Write firewall settings"
 msgstr "Write firewall settings"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2681
+#: library/network/src/modules/SuSEFirewall.rb:2665
 msgid "Adjust firewall service"
 msgstr "Adjust firewall service"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2685
+#: library/network/src/modules/SuSEFirewall.rb:2669
 msgid "Writing firewall settings..."
 msgstr "Writing firewall settings..."
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2687
+#: library/network/src/modules/SuSEFirewall.rb:2671
 msgid "Adjusting firewall service..."
 msgstr "Adjusting firewall service..."
 
 #. TRANSLATORS: a popup error message
-#: library/network/src/modules/SuSEFirewall.rb:2706
+#: library/network/src/modules/SuSEFirewall.rb:2690
 msgid "Writing settings failed"
 msgstr "Writing settings failed"
 
 #. table item, %1 stands for the buggy protocol name
-#: library/network/src/modules/SuSEFirewall.rb:3504
+#: library/network/src/modules/SuSEFirewall.rb:3488
 msgid "Unknown protocol (%1)"
 msgstr "Unknown protocol (%1)"
 
@@ -2942,20 +2932,20 @@
 #. "broadcast_ports" : [ ],
 #. ]
 #. );
-#: library/network/src/modules/SuSEFirewallServices.rb:345
-#: library/network/src/modules/SuSEFirewallServices.rb:617
+#: library/network/src/modules/SuSEFirewallServices.rb:355
+#: library/network/src/modules/SuSEFirewallServices.rb:638
 msgid "Service with name '%{service_name}' does not exist"
 msgstr ""
 
 #. Fallback for presented service
-#: library/network/src/modules/SuSEFirewallServices.rb:420
+#: library/network/src/modules/SuSEFirewallServices.rb:431
 #, fuzzy
 #| msgid "Service: %1"
 msgid "Service: %{filename}"
 msgstr "Service: %1"
 
 #. TRANSLATORS: Name of unknown service. %1 is a requested service id like nis-server
-#: library/network/src/modules/SuSEFirewallServices.rb:483
+#: library/network/src/modules/SuSEFirewallServices.rb:504
 msgid "Unknown service '%1'"
 msgstr "Unknown service '%1'"
 
@@ -2980,52 +2970,52 @@
 msgstr "&Uninstall"
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:205
-#: library/packages/src/modules/PackageCallbacks.rb:1725
+#: library/packages/src/modules/PackageCallbacks.rb:207
+#: library/packages/src/modules/PackageCallbacks.rb:1727
 msgid "Package: "
 msgstr "Package: "
 
-#: library/packages/src/modules/PackageCallbacks.rb:206
+#: library/packages/src/modules/PackageCallbacks.rb:208
 msgid "Size: "
 msgstr "Size: "
 
-#: library/packages/src/modules/PackageCallbacks.rb:229
+#: library/packages/src/modules/PackageCallbacks.rb:231
 msgid "Remaining time to automatic retry: %1"
 msgstr ""
 
 #. at start of file providal
-#: library/packages/src/modules/PackageCallbacks.rb:242
-#: library/packages/src/modules/PackageCallbacks.rb:250
+#: library/packages/src/modules/PackageCallbacks.rb:244
+#: library/packages/src/modules/PackageCallbacks.rb:252
 msgid "Downloading package %1 (%2)..."
 msgstr "Downloading package %1 (%2)..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:254
+#: library/packages/src/modules/PackageCallbacks.rb:256
 msgid "Downloading Package"
 msgstr "Downloading Package"
 
 #. check box
-#: library/packages/src/modules/PackageCallbacks.rb:312
+#: library/packages/src/modules/PackageCallbacks.rb:314
 msgid "Show &details"
 msgstr "Show &details"
 
 #. error message, %1 is a package name
-#: library/packages/src/modules/PackageCallbacks.rb:378
+#: library/packages/src/modules/PackageCallbacks.rb:380
 #, fuzzy
 msgid "Package %1 is broken, integrity check has failed."
 msgstr "File integrity check failed: "
 
 #. command line mode - ask user whether installation of the failed package should be retried
 #. command line mode - ask user whether installation of the failed package should be retried
-#: library/packages/src/modules/PackageCallbacks.rb:391
-#: library/packages/src/modules/PackageCallbacks.rb:608
+#: library/packages/src/modules/PackageCallbacks.rb:393
+#: library/packages/src/modules/PackageCallbacks.rb:610
 msgid "Retry installation of the package?"
 msgstr "Retry installation of the package?"
 
 #. command line mode - ask user whether the installation should be aborted
 #. command line mode - ask user whether the installation should be aborted
-#: library/packages/src/modules/PackageCallbacks.rb:399
-#: library/packages/src/modules/PackageCallbacks.rb:616
+#: library/packages/src/modules/PackageCallbacks.rb:401
+#: library/packages/src/modules/PackageCallbacks.rb:618
 msgid "Abort the installation?"
 msgstr "Abort the installation?"
 
@@ -3034,58 +3024,58 @@
 #. detail string is appended to the end
 #. error message, %1 is code of the error,
 #. detail string is appended to the end
-#: library/packages/src/modules/PackageCallbacks.rb:427
-#: library/packages/src/modules/PackageCallbacks.rb:461
-#: library/packages/src/modules/PackageCallbacks.rb:2491
+#: library/packages/src/modules/PackageCallbacks.rb:429
+#: library/packages/src/modules/PackageCallbacks.rb:463
+#: library/packages/src/modules/PackageCallbacks.rb:2493
 #, fuzzy
 msgid "Error: %1:"
 msgstr "Error: "
 
 #. TODO: add "Don't show again" checkbox
 #. a warning popup displayed after pressing [Ignore] after a download error
-#: library/packages/src/modules/PackageCallbacks.rb:484
+#: library/packages/src/modules/PackageCallbacks.rb:486
 msgid ""
 "Ignoring a download failure may result in a broken system.\n"
 "Verify the system later by running the Software Management module.\n"
 msgstr ""
 
 #. At start of package install.
-#: library/packages/src/modules/PackageCallbacks.rb:524
+#: library/packages/src/modules/PackageCallbacks.rb:526
 msgid "Uninstalling package %1 (%2)..."
 msgstr "Uninstalling package %1 (%2)..."
 
-#: library/packages/src/modules/PackageCallbacks.rb:525
+#: library/packages/src/modules/PackageCallbacks.rb:527
 msgid "Installing package %1 (%2)..."
 msgstr "Installing package %1 (%2)..."
 
-#: library/packages/src/modules/PackageCallbacks.rb:532
+#: library/packages/src/modules/PackageCallbacks.rb:534
 msgid "Uninstalling Package"
 msgstr "Uninstalling Package"
 
-#: library/packages/src/modules/PackageCallbacks.rb:532
+#: library/packages/src/modules/PackageCallbacks.rb:534
 msgid "Installing Package"
 msgstr "Installing Package"
 
 #. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:593
+#: library/packages/src/modules/PackageCallbacks.rb:595
 msgid "Removal of package %1 failed."
 msgstr "Removal of package %1 failed."
 
 #. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:595
+#: library/packages/src/modules/PackageCallbacks.rb:597
 msgid "Installation of package %1 failed."
 msgstr "Installation of package %1 failed."
 
 #. TODO: add "Don't show again" checkbox
 #. a warning popup displayed after pressing [Ignore] after a package installation error
-#: library/packages/src/modules/PackageCallbacks.rb:667
+#: library/packages/src/modules/PackageCallbacks.rb:669
 msgid ""
 "Ignoring a package failure may result in a broken system.\n"
 "The system should be later verified by running the Software Management module."
 msgstr ""
 
 #. error report
-#: library/packages/src/modules/PackageCallbacks.rb:790
+#: library/packages/src/modules/PackageCallbacks.rb:792
 #, fuzzy
 msgid ""
 "<p>The repository at the specified URL now provides a different media ID.\n"
@@ -3101,29 +3091,29 @@
 #. media is double sided, we want the user to insert the 'Side A' of the media
 #. the complete string will be "<product> <media> <number>, <side>"
 #. e.g. "'SuSE Linux 9.0' DVD 1, Side A"
-#: library/packages/src/modules/PackageCallbacks.rb:805
+#: library/packages/src/modules/PackageCallbacks.rb:807
 msgid "Side A"
 msgstr "Side A"
 
 #. media is double sided, we want the user to insert the 'Side B' of the media
-#: library/packages/src/modules/PackageCallbacks.rb:808
+#: library/packages/src/modules/PackageCallbacks.rb:810
 msgid "Side B"
 msgstr "Side B"
 
 #. label for a repository - %1 product name (e.g. openSUSE 10.2), %2 medium number (e.g. 2)
-#: library/packages/src/modules/PackageCallbacks.rb:822
+#: library/packages/src/modules/PackageCallbacks.rb:824
 #, fuzzy
 msgid "%1 (Disc %2)"
 msgstr "%1 (%2)"
 
 #. label for a repository - %1 product name (e.g. openSUSE 10.2), %2 medium number (e.g. 2)
-#: library/packages/src/modules/PackageCallbacks.rb:824
+#: library/packages/src/modules/PackageCallbacks.rb:826
 #, fuzzy
 msgid "%1 (Medium %2)"
 msgstr "Medium: %1"
 
 #. prompt to insert product (%1 == "SuSE Linux version 9.2 CD 2")
-#: library/packages/src/modules/PackageCallbacks.rb:829
+#: library/packages/src/modules/PackageCallbacks.rb:831
 msgid ""
 "Insert\n"
 "'%1'"
@@ -3132,7 +3122,7 @@
 "'%1'"
 
 #. report error while accessing local directory with product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:834
+#: library/packages/src/modules/PackageCallbacks.rb:836
 #, fuzzy
 msgid ""
 "Cannot access installation media\n"
@@ -3145,7 +3135,7 @@
 "Check that the directory is accessible."
 
 #. report error while accessing network media of product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:846
+#: library/packages/src/modules/PackageCallbacks.rb:848
 #, fuzzy
 msgid ""
 "Cannot access installation media \n"
@@ -3158,61 +3148,61 @@
 "Check that the server is accessible."
 
 #. currently unused
-#: library/packages/src/modules/PackageCallbacks.rb:858
+#: library/packages/src/modules/PackageCallbacks.rb:860
 #, fuzzy
 msgid "The correct repository medium could not be mounted."
 msgstr "The correct source medium could not be mounted."
 
 #. wrong media id, offer "Ignore"
 #. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:879
-#: library/packages/src/modules/PackageCallbacks.rb:2168
+#: library/packages/src/modules/PackageCallbacks.rb:881
+#: library/packages/src/modules/PackageCallbacks.rb:2170
 #, fuzzy
 msgid "Skip Autorefresh"
 msgstr "&Skip Refresh"
 
 #. menu button label - used for more then one device
 #. push button label - in the media change popup, user can eject the CD/DVD
-#: library/packages/src/modules/PackageCallbacks.rb:902
-#: library/packages/src/modules/PackageCallbacks.rb:907
+#: library/packages/src/modules/PackageCallbacks.rb:904
+#: library/packages/src/modules/PackageCallbacks.rb:909
 msgid "&Eject"
 msgstr "&Eject"
 
-#: library/packages/src/modules/PackageCallbacks.rb:919
+#: library/packages/src/modules/PackageCallbacks.rb:921
 #, fuzzy
 msgid "A&utomatically Eject CD or DVD Medium"
 msgstr "Read &CD or DVD Medium"
 
 #. command line mode - ask user whether installation of the failed package should be retried
-#: library/packages/src/modules/PackageCallbacks.rb:987
+#: library/packages/src/modules/PackageCallbacks.rb:989
 msgid "Retry the installation?"
 msgstr "Retry the installation?"
 
 #. command line mode - ask user whether the installation should be aborted
-#: library/packages/src/modules/PackageCallbacks.rb:995
+#: library/packages/src/modules/PackageCallbacks.rb:997
 msgid "Skip the medium?"
 msgstr "Skip the medium?"
 
 #. otherwise ignore the medium
-#: library/packages/src/modules/PackageCallbacks.rb:1002
+#: library/packages/src/modules/PackageCallbacks.rb:1004
 msgid "Ignoring the bad medium..."
 msgstr "Ignoring the bad medium..."
 
 #. TextEntry label
 #. TextEntry label
-#: library/packages/src/modules/PackageCallbacks.rb:1023
-#: library/packages/src/modules/PackageCallbacks.rb:1084
+#: library/packages/src/modules/PackageCallbacks.rb:1025
+#: library/packages/src/modules/PackageCallbacks.rb:1086
 msgid "&URL"
 msgstr "&URL"
 
 #. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1331
+#: library/packages/src/modules/PackageCallbacks.rb:1333
 #, fuzzy
 msgid "Creating Repository %1"
 msgstr "Probing repository "
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1364
+#: library/packages/src/modules/PackageCallbacks.rb:1366
 #, fuzzy
 msgid "An error occurred while creating the repository."
 msgstr "Error occurred while reading the log."
@@ -3220,9 +3210,9 @@
 #. error message - a label followed by a richtext with details
 #. error message - a label followed by a richtext with details
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1368
-#: library/packages/src/modules/PackageCallbacks.rb:1499
-#: library/packages/src/modules/PackageCallbacks.rb:1611
+#: library/packages/src/modules/PackageCallbacks.rb:1370
+#: library/packages/src/modules/PackageCallbacks.rb:1501
+#: library/packages/src/modules/PackageCallbacks.rb:1613
 #, fuzzy
 msgid "Unable to retrieve the remote repository description."
 msgstr "Unable to retrieve the remote source description."
@@ -3230,24 +3220,24 @@
 #. error message - a label followed by a richtext with details
 #. error message - a label followed by a richtext with details
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1371
-#: library/packages/src/modules/PackageCallbacks.rb:1502
-#: library/packages/src/modules/PackageCallbacks.rb:1614
+#: library/packages/src/modules/PackageCallbacks.rb:1373
+#: library/packages/src/modules/PackageCallbacks.rb:1504
+#: library/packages/src/modules/PackageCallbacks.rb:1616
 msgid "An error occurred while retrieving the new metadata."
 msgstr "An error occurred while retrieving the new metadata."
 
 #. error message - a label followed by a richtext with details
 #. error message - a label followed by a richtext with details
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1374
-#: library/packages/src/modules/PackageCallbacks.rb:1505
-#: library/packages/src/modules/PackageCallbacks.rb:1617
+#: library/packages/src/modules/PackageCallbacks.rb:1376
+#: library/packages/src/modules/PackageCallbacks.rb:1507
+#: library/packages/src/modules/PackageCallbacks.rb:1619
 #, fuzzy
 msgid "The repository is not valid."
 msgstr "The entered URL is not valid."
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1377
+#: library/packages/src/modules/PackageCallbacks.rb:1379
 #, fuzzy
 msgid "The repository metadata is invalid."
 msgstr "The host name is invalid."
@@ -3256,113 +3246,113 @@
 #. command line mode - ask user whether the repository refreshment should be retried
 #. command line mode - ask user whether the repository refreshment should be retried
 #. command line mode - ask user whether target initializatin can be restarted
-#: library/packages/src/modules/PackageCallbacks.rb:1390
-#: library/packages/src/modules/PackageCallbacks.rb:1524
-#: library/packages/src/modules/PackageCallbacks.rb:1630
-#: library/packages/src/modules/PackageCallbacks.rb:2445
+#: library/packages/src/modules/PackageCallbacks.rb:1392
+#: library/packages/src/modules/PackageCallbacks.rb:1526
+#: library/packages/src/modules/PackageCallbacks.rb:1632
+#: library/packages/src/modules/PackageCallbacks.rb:2447
 #, fuzzy
 msgid "Retry?"
 msgstr "Retry"
 
 #. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1438
-#: library/packages/src/modules/PackageCallbacks.rb:1446
+#: library/packages/src/modules/PackageCallbacks.rb:1440
+#: library/packages/src/modules/PackageCallbacks.rb:1448
 #, fuzzy
 msgid "Probing Repository %1"
 msgstr "Probing repository "
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1495
+#: library/packages/src/modules/PackageCallbacks.rb:1497
 #, fuzzy
 msgid "Error occurred while probing the repository."
 msgstr "Error occurred while reading the log."
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1508
+#: library/packages/src/modules/PackageCallbacks.rb:1510
 #, fuzzy
 msgid "Repository probing details."
 msgstr "Repository Configuration"
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1511
+#: library/packages/src/modules/PackageCallbacks.rb:1513
 #, fuzzy
 msgid "Repository metadata is invalid."
 msgstr "Host name is invalid."
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1607
+#: library/packages/src/modules/PackageCallbacks.rb:1609
 #, fuzzy
 msgid "Repository %1"
 msgstr "Repository: "
 
 #. at start of delta providal
-#: library/packages/src/modules/PackageCallbacks.rb:1695
+#: library/packages/src/modules/PackageCallbacks.rb:1697
 #, fuzzy
 msgid "Downloading delta RPM package %1 (%2)..."
 msgstr "Downloading package %1 (%2)..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1703
+#: library/packages/src/modules/PackageCallbacks.rb:1705
 #, fuzzy
 msgid "Downloading Delta RPM package"
 msgstr "Downloading delta RPM %1"
 
 #. at start of delta application
-#: library/packages/src/modules/PackageCallbacks.rb:1716
+#: library/packages/src/modules/PackageCallbacks.rb:1718
 #, fuzzy
 msgid "Applying delta RPM package %1..."
 msgstr "Applying delta RPM: %1"
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1723
+#: library/packages/src/modules/PackageCallbacks.rb:1725
 #, fuzzy
 msgid "Applying delta RPM package"
 msgstr "Applying delta RPM: %1"
 
 #. at start of patch providal
-#: library/packages/src/modules/PackageCallbacks.rb:1744
+#: library/packages/src/modules/PackageCallbacks.rb:1746
 #, fuzzy
 msgid "Downloading patch RPM package %1 (%2)..."
 msgstr "Downloading package %1 (%2)..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1752
+#: library/packages/src/modules/PackageCallbacks.rb:1754
 #, fuzzy
 msgid "Downloading Patch RPM Package"
 msgstr "Downloading patch RPM %1"
 
 #. close popup
-#: library/packages/src/modules/PackageCallbacks.rb:1822
+#: library/packages/src/modules/PackageCallbacks.rb:1824
 #, fuzzy
 msgid "Starting script %1 (patch %2)..."
 msgstr "Starting script %1"
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1831
+#: library/packages/src/modules/PackageCallbacks.rb:1833
 #, fuzzy
 msgid "Running Script"
 msgstr "Running scripts..."
 
 #. label, patch name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1836
+#: library/packages/src/modules/PackageCallbacks.rb:1838
 #, fuzzy
 msgid "Patch: "
 msgstr "Patch"
 
 #. label, script name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1843
+#: library/packages/src/modules/PackageCallbacks.rb:1845
 #, fuzzy
 msgid "Script: "
 msgstr "Script"
 
 #. label
-#: library/packages/src/modules/PackageCallbacks.rb:1849
+#: library/packages/src/modules/PackageCallbacks.rb:1851
 #, fuzzy
 msgid "Output of the Script"
 msgstr "The Output of the Script mkinitrd"
 
 #. label, %1 is patch name with version and architecture
-#: library/packages/src/modules/PackageCallbacks.rb:1937
+#: library/packages/src/modules/PackageCallbacks.rb:1939
 #, fuzzy
 msgid ""
 "Patch: %1\n"
@@ -3372,7 +3362,7 @@
 "\n"
 
 #. a popup question with "Continue", "Skip" and "Abort" buttons
-#: library/packages/src/modules/PackageCallbacks.rb:1954
+#: library/packages/src/modules/PackageCallbacks.rb:1956
 msgid ""
 "The repositories are being refreshed.\n"
 "Continue with refreshing?\n"
@@ -3382,45 +3372,45 @@
 msgstr ""
 
 #. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:1969
+#: library/packages/src/modules/PackageCallbacks.rb:1971
 msgid "&Skip Refresh"
 msgstr "&Skip Refresh"
 
 #. heading of popup
 #. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:2003
-#: library/packages/src/modules/PackageCallbacks.rb:2045
+#: library/packages/src/modules/PackageCallbacks.rb:2005
+#: library/packages/src/modules/PackageCallbacks.rb:2047
 #, fuzzy
 msgid "Downloading"
 msgstr "&Downloading"
 
 #. message in a progress popup
 #. progress bar label, %1 is URL with optional download rate
-#: library/packages/src/modules/PackageCallbacks.rb:2053
-#: library/packages/src/modules/PackageCallbacks.rb:2101
+#: library/packages/src/modules/PackageCallbacks.rb:2055
+#: library/packages/src/modules/PackageCallbacks.rb:2103
 msgid "Downloading: %1"
 msgstr "Downloading: %1"
 
 #. heading of popup
 #. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:2206
-#: library/packages/src/modules/PackageCallbacks.rb:2281
+#: library/packages/src/modules/PackageCallbacks.rb:2208
+#: library/packages/src/modules/PackageCallbacks.rb:2283
 msgid "Checking Package Database"
 msgstr "Checking Package Database"
 
 #. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:2209
+#: library/packages/src/modules/PackageCallbacks.rb:2211
 msgid "Rebuilding package database. This process can take some time."
 msgstr "Rebuilding package database. This process can take some time."
 
 #. progress bar label
-#: library/packages/src/modules/PackageCallbacks.rb:2214
-#: library/packages/src/modules/PackageCallbacks.rb:2297
+#: library/packages/src/modules/PackageCallbacks.rb:2216
+#: library/packages/src/modules/PackageCallbacks.rb:2299
 msgid "Status"
 msgstr "Status"
 
 #. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:2247
+#: library/packages/src/modules/PackageCallbacks.rb:2249
 msgid ""
 "Rebuilding of package database failed:\n"
 "%1"
@@ -3429,12 +3419,12 @@
 "%1"
 
 #. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:2284
+#: library/packages/src/modules/PackageCallbacks.rb:2286
 msgid "Converting package database. This process can take some time."
 msgstr "Converting package database. This process can take some time."
 
 #. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:2323
+#: library/packages/src/modules/PackageCallbacks.rb:2325
 msgid ""
 "Conversion of package database failed:\n"
 "%1"
@@ -3443,13 +3433,13 @@
 "%1"
 
 #. progress message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2363
+#: library/packages/src/modules/PackageCallbacks.rb:2365
 #, fuzzy
 msgid "Reading RPM database..."
 msgstr "Reading the database..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:2373
+#: library/packages/src/modules/PackageCallbacks.rb:2375
 #, fuzzy
 msgid "Reading Installed Packages"
 msgstr "Verify Installed Packages"
@@ -3461,30 +3451,30 @@
 #. `Label(""),
 #. `PushButton(`id(`abort), Label::AbortButton())
 #. )
-#: library/packages/src/modules/PackageCallbacks.rb:2379
-#: library/packages/src/modules/PackageCallbacks.rb:2395
+#: library/packages/src/modules/PackageCallbacks.rb:2381
+#: library/packages/src/modules/PackageCallbacks.rb:2397
 #, fuzzy
 msgid "Scanning RPM database..."
 msgstr "Writing SCPM database..."
 
 #. error message, could not read RPM database
-#: library/packages/src/modules/PackageCallbacks.rb:2434
+#: library/packages/src/modules/PackageCallbacks.rb:2436
 #, fuzzy
 msgid "Initialization of the target failed."
 msgstr "Initialising the target directory failed"
 
 #. status message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2525
+#: library/packages/src/modules/PackageCallbacks.rb:2527
 #, fuzzy
 msgid "RPM database read"
 msgstr "MySQL database admin"
 
 #. heading in a popup window
-#: library/packages/src/modules/PackageCallbacks.rb:2544
+#: library/packages/src/modules/PackageCallbacks.rb:2563
 msgid "User Authentication"
 msgstr "User Authentication"
 
-#: library/packages/src/modules/PackageCallbacks.rb:2550
+#: library/packages/src/modules/PackageCallbacks.rb:2569
 #, fuzzy
 msgid ""
 "URL: %1\n"
@@ -3493,7 +3483,7 @@
 msgstr "URL: %1"
 
 #. textentry label
-#: library/packages/src/modules/PackageCallbacks.rb:2559
+#: library/packages/src/modules/PackageCallbacks.rb:2578
 msgid "&User Name"
 msgstr "&User Name"
 
@@ -4994,7 +4984,7 @@
 msgstr "Do not show this message again."
 
 #. error report
-#: library/system/src/modules/Initrd.rb:409
+#: library/system/src/modules/Initrd.rb:416
 msgid "An error occurred during initrd creation."
 msgstr "An error occurred during initrd creation."
 
@@ -6033,6 +6023,12 @@
 "There is no reverse zone for %1 administered by your DNS server.\n"
 "Hostname %2 cannot be added."
 
+#~ msgid "Read dynamic definitions of installed services"
+#~ msgstr "Read dynamic definitions of installed services"
+
+#~ msgid "Reading dynamic definitions of installed services..."
+#~ msgstr "Reading dynamic definitions of installed services..."
+
 #, fuzzy
 #~| msgid "No running network detected!"
 #~ msgid "No running network detected."

Modified: trunk/yast/en_GB/po/bootloader.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/bootloader.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/bootloader.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: bootloader\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-30 10:10+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2008-03-27 19:13+0000\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"
@@ -30,77 +30,53 @@
 
 #. command line help text for delete action
 #: src/clients/bootloader.rb:58
-msgid "Delete a global option or option of a section"
-msgstr "Delete a global option or option of a section"
+#, fuzzy
+#| msgid "Set a global option"
+msgid "Delete a global option"
+msgstr "Set a global option"
 
 #. command line help text for set action
 #: src/clients/bootloader.rb:65
-msgid "Set a global option or option of a section"
-msgstr "Set a global option or option of a section"
+msgid "Set a global option"
+msgstr "Set a global option"
 
-#. command line help text for add action
-#: src/clients/bootloader.rb:72
-msgid "Add a new section - please use interactive mode"
-msgstr ""
-
 #. command line help text for print action
-#: src/clients/bootloader.rb:82
+#: src/clients/bootloader.rb:75
 msgid "Print value of specified option"
 msgstr "Print value of specified option"
 
 #. command line help text for an option
-#: src/clients/bootloader.rb:90
-msgid "The name of the section"
-msgstr "The name of the section"
-
-#. command line help text for an option
-#: src/clients/bootloader.rb:97
+#: src/clients/bootloader.rb:83
 msgid "The key of the option"
 msgstr "The key of the option"
 
 #. command line help text for an option
-#: src/clients/bootloader.rb:104
+#: src/clients/bootloader.rb:90
 msgid "The value of the option"
 msgstr "The value of the option"
 
-#. command line error report, %1 is section name
-#. command line error report, %1 is section name
-#: src/clients/bootloader.rb:185 src/clients/bootloader.rb:225
-msgid "Section %1 not found."
-msgstr "Section %1 not found."
-
 #. command line error report
-#: src/clients/bootloader.rb:201
+#: src/clients/bootloader.rb:154
 msgid "Value was not specified."
 msgstr "Value was not specified."
 
-#. Add a new bootloader section with specified name
-#. @param [Hash] options a list of parameters passed as args
-#. @return [Boolean] true on success
-#: src/clients/bootloader.rb:239
-msgid "Add option is available only in commandline interactive mode"
-msgstr ""
-
 #. command line error report
-#: src/clients/bootloader.rb:245
-msgid "Section name must be specified."
-msgstr "Section name must be specified."
-
-#. command line error report
-#: src/clients/bootloader.rb:265
+#: src/clients/bootloader.rb:176
 msgid "Option was not specified."
 msgstr "Option was not specified."
 
+#. command line, %1 is the value of bootloader option
+#: src/clients/bootloader.rb:182
+#, fuzzy
+#| msgid "Value: %1"
+msgid "Value: %s"
+msgstr "Value: %1"
+
 #. command line error report
-#: src/clients/bootloader.rb:284
+#: src/clients/bootloader.rb:185
 msgid "Specified option does not exist."
 msgstr "Specified option does not exist."
 
-#. command line, %1 is the value of bootloader option
-#: src/clients/bootloader.rb:287
-msgid "Value: %1"
-msgstr "Value: %1"
-
 #. progress step title
 #: src/clients/bootloader_finish.rb:52
 msgid "Saving bootloader configuration..."
@@ -125,53 +101,25 @@
 msgstr "The system will reboot now..."
 
 #. warning text in the summary richtext
-#: src/clients/bootloader_proposal.rb:116
+#: src/clients/bootloader_proposal.rb:115
 msgid "No boot loader is selected for installation. Your system might not be bootable."
 msgstr "No boot loader is selected for installation. Your system might not be bootable."
 
 #. error in the proposal
-#: src/clients/bootloader_proposal.rb:126
+#: src/clients/bootloader_proposal.rb:125
 msgid "Because of the partitioning, the bootloader cannot be installed properly"
 msgstr "Because of the partitioning, the bootloader cannot be installed properly"
 
 #. proposal part - bootloader label
-#: src/clients/bootloader_proposal.rb:225
+#: src/clients/bootloader_proposal.rb:224
 msgid "Booting"
 msgstr "Booting"
 
 #. menubutton entry
-#: src/clients/bootloader_proposal.rb:227
+#: src/clients/bootloader_proposal.rb:226
 msgid "&Booting"
 msgstr "&Booting"
 
-#. Run dialog to adjust installation on i386 and AMD64
-#. @return [Symbol] for wizard sequencer
-#. Run dialog to adjust installation on i386 and AMD64
-#. @return [Symbol] for wizard sequencer
-#: src/include/bootloader/grub/dialogs.rb:41
-#: src/include/bootloader/grub2/dialogs.rb:221
-msgid "Disk Order"
-msgstr "Disk Order"
-
-#: src/include/bootloader/grub/dialogs.rb:50
-#: src/include/bootloader/grub2/dialogs.rb:230
-#, fuzzy
-msgid "Disk order settings"
-msgstr "Filter settings"
-
-#. Run dialog for loader installation details on i386
-#. @return [Symbol] for wizard sequencer
-#: src/include/bootloader/grub/dialogs.rb:68
-msgid "Boot Menu"
-msgstr "Boot Menu"
-
-#. `VSpacing(1),
-#. Window title
-#: src/include/bootloader/grub/dialogs.rb:106
-#: src/include/bootloader/grub2/dialogs.rb:143
-msgid "Boot Loader Options"
-msgstr "Boot Loader Options"
-
 #. encoding: utf-8
 #. File:
 #. include/bootloader/grup/helps.ycp
@@ -264,19 +212,13 @@
 
 #: src/include/bootloader/grub/helps.rb:47
 msgid ""
-"<p><b>Use Trusted Grub</b> means install trusted grub and use it. Option <i>Graphical Menu File</i> will be ignored.\n"
-"It is recommended to install grub to MBR</p>"
-msgstr ""
-
-#: src/include/bootloader/grub/helps.rb:50
-msgid ""
 "<p><b>Boot from Master Boot Record</b> is not recommended if you have another operating system\n"
 "installed on your computer</p>"
 msgstr ""
 "<p><b>Boot from Master Boot Record</b> is not recommended if you have another operating system\n"
 "installed on your computer</p>"
 
-#: src/include/bootloader/grub/helps.rb:53
+#: src/include/bootloader/grub/helps.rb:50
 msgid ""
 "<p><b>Boot from Root Partition</b> is the recommended option whenever there is a suitable\n"
 "partition. Either select <b>Set active Flag in Partition Table for Boot Partition</b> and <b>Write generic Boot Code to MBR</b>\n"
@@ -288,33 +230,33 @@
 "in <b>Boot Loader Options</b> to update the master boot record if that is needed or configure your other boot manager\n"
 "to start this section.</p>"
 
-#: src/include/bootloader/grub/helps.rb:59
+#: src/include/bootloader/grub/helps.rb:56
 msgid ""
 "<p><b>Boot from Extended Partition</b> should be selected if your root partition is on \n"
 "logical partition and the /boot partition is missing</p>"
 msgstr ""
 
-#: src/include/bootloader/grub/helps.rb:62
+#: src/include/bootloader/grub/helps.rb:59
 #, fuzzy
 msgid "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"
 msgstr "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from</p>"
 
-#: src/include/bootloader/grub/helps.rb:65
+#: src/include/bootloader/grub/helps.rb:62
 msgid ""
 "<p>MD array is build from 2 disks. <b>Enable Redundancy for MD Array</b>\n"
 "enable to write GRUB to MBR of both disks.</p>"
 msgstr ""
 
-#: src/include/bootloader/grub/helps.rb:68
+#: src/include/bootloader/grub/helps.rb:65
 #, fuzzy
 msgid ""
 "<p><b>Use Serial Console</b> lets you define the parameters to use\n"
-"for a serial console. Please see the grub documentation (<code>info grub</code>) for details.</p>"
+"for a serial console. Please see the grub documentation (<code>info grub2</code>) for details.</p>"
 msgstr ""
 "<p><b>Serial Connection Parameters</b> lets you define the parameters to use\n"
 "for a serial console. Please see the grub documentation (<code>info grub</code>) for details.</p>"
 
-#: src/include/bootloader/grub/helps.rb:71
+#: src/include/bootloader/grub/helps.rb:68
 msgid ""
 "<p><b>Terminal Definition</b></p><br>\n"
 "Defines the type of terminal you want to use. For a serial terminal (eg. a serial console),\n"
@@ -328,7 +270,7 @@
 "command, as <code>serial console</code>. In this case, a terminal in which you\n"
 "press any key will be selected as a GRUB terminal.</p>"
 
-#: src/include/bootloader/grub/helps.rb:78
+#: src/include/bootloader/grub/helps.rb:75
 msgid ""
 "<p><b>Fallback Sections if default Fails</b> contains a list of section numbers\n"
 "that will be used for booting in case the default section is unbootable.</p>"
@@ -336,20 +278,12 @@
 "<p><b>Fallback Sections if default Fails</b> contains a list of section numbers\n"
 "that will be used for booting in case the default section is unbootable.</p>"
 
-#: src/include/bootloader/grub/helps.rb:81
+#: src/include/bootloader/grub/helps.rb:78
 #, fuzzy
 msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>"
 msgstr "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu</p>"
 
-#: src/include/bootloader/grub/helps.rb:84
-msgid "<p><b>Graphical Menu File</b> defines the file to use for the graphical boot menu.</p>"
-msgstr "<p><b>Graphical Menu File</b> defines the file to use for the graphical boot menu.</p>"
-
-#: src/include/bootloader/grub/helps.rb:87
-msgid "<p><b>Enable Acoustic Signals</b> turn on/off acoustic signals.</p>"
-msgstr ""
-
-#: src/include/bootloader/grub/helps.rb:90
+#: src/include/bootloader/grub/helps.rb:81
 #, fuzzy
 msgid ""
 "<p><b>Protect Boot Loader with Password</b><br>\n"
@@ -361,7 +295,7 @@
 "it in <b>Retype Password</b>.</p>"
 
 #. help text 1/5
-#: src/include/bootloader/grub/helps.rb:97
+#: src/include/bootloader/grub/helps.rb:88
 #, fuzzy
 msgid ""
 "<p><big><b>Disks Order</b></big><br>\n"
@@ -374,218 +308,135 @@
 "To specify the order of the disks according to the order in BIOS, use\n"
 "the <b>Up</b> and <b>Down</b> buttons to reorder the disks.</p>"
 
-#: src/include/bootloader/grub/helps.rb:108
+#: src/include/bootloader/grub/helps.rb:99
 msgid "Boot Loader Locations"
 msgstr "Boot Loader Locations"
 
-#: src/include/bootloader/grub/helps.rb:109
+#: src/include/bootloader/grub/helps.rb:100
 #, fuzzy
 msgid "Set &active Flag in Partition Table for Boot Partition"
 msgstr "Set active Flag in Partition Table for Boot Partition"
 
-#: src/include/bootloader/grub/helps.rb:112
+#: src/include/bootloader/grub/helps.rb:103
 #: src/include/bootloader/routines/common_helps.rb:29
 #, fuzzy
 msgid "&Timeout in Seconds"
 msgstr "Timeout in Seconds"
 
-#: src/include/bootloader/grub/helps.rb:113
+#: src/include/bootloader/grub/helps.rb:104
 #, fuzzy
 msgid "&Default Boot Section"
 msgstr "Default Boot Section"
 
-#: src/include/bootloader/grub/helps.rb:114
+#: src/include/bootloader/grub/helps.rb:105
 #, fuzzy
 msgid "Write &generic Boot Code to MBR"
 msgstr "Write generic Boot Code to MBR"
 
-#: src/include/bootloader/grub/helps.rb:115
-msgid "Use &Trusted Grub"
-msgstr ""
-
-#: src/include/bootloader/grub/helps.rb:116
+#: src/include/bootloader/grub/helps.rb:106
 msgid "Custom Boot Partition"
 msgstr "Custom Boot Partition"
 
-#: src/include/bootloader/grub/helps.rb:117
+#: src/include/bootloader/grub/helps.rb:107
 msgid "Boot from Master Boot Record"
 msgstr "Boot from Master Boot Record"
 
-#: src/include/bootloader/grub/helps.rb:118
+#: src/include/bootloader/grub/helps.rb:108
 msgid "Boot from Root Partition"
 msgstr "Boot from Root Partition"
 
-#: src/include/bootloader/grub/helps.rb:119
+#: src/include/bootloader/grub/helps.rb:109
 msgid "Boot from Boot Partition"
 msgstr "Boot from Boot Partition"
 
-#: src/include/bootloader/grub/helps.rb:120
+#: src/include/bootloader/grub/helps.rb:110
 #, fuzzy
 msgid "Boot from Extended Partition"
 msgstr "Boot from Root Partition"
 
-#: src/include/bootloader/grub/helps.rb:121
+#: src/include/bootloader/grub/helps.rb:111
 #, fuzzy
 msgid "Serial Connection &Parameters"
 msgstr "Serial Connection Parameters"
 
-#: src/include/bootloader/grub/helps.rb:122
+#: src/include/bootloader/grub/helps.rb:112
 #, fuzzy
 msgid "Fallback Sections if Default fails"
 msgstr "Fallback Sections if default Fails"
 
-#: src/include/bootloader/grub/helps.rb:123
+#: src/include/bootloader/grub/helps.rb:113
 #, fuzzy
 msgid "&Hide Menu on Boot"
 msgstr "Hide Menu on Boot"
 
-#: src/include/bootloader/grub/helps.rb:124
+#: src/include/bootloader/grub/helps.rb:114
 #, fuzzy
-msgid "Graphical &Menu File"
-msgstr "Graphical Menu File"
-
-#: src/include/bootloader/grub/helps.rb:125
-#, fuzzy
 msgid "Pa&ssword for the Menu Interface"
 msgstr "Password for the Menu Interface"
 
-#: src/include/bootloader/grub/helps.rb:126
+#: src/include/bootloader/grub/helps.rb:115
 #, fuzzy
 msgid "Debugg&ing Flag"
 msgstr "Debugging Flag"
 
-#. encoding: utf-8
-#. File:
-#. modules/BootGRUB.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Module containing specific functions for GRUB configuration
-#. and installation
-#.
-#. Authors:
-#. Jiri Srain <jsrain@suse.cz>
-#. Joachim Plack <jplack@suse.de>
-#. Olaf Dabrunz <od@suse.de>
-#. Philipp Thomas <pth@suse.de>
-#.
-#. $Id$
-#: src/include/bootloader/grub/options.rb:68
-#, fuzzy
-msgid "Choose new graphical menu file"
-msgstr "Graphical Menu File"
-
-#. `Left(`CheckBox(`id(`enable_acoustic_signals), _("Enable Acoustic &Signals"))),
-#: src/include/bootloader/grub/options.rb:129
-#, fuzzy
-msgid "Enable Acoustic &Signals"
-msgstr "&Enable Authentication"
-
 #. Validate function of a popup
 #. @param [String] key any widget key
 #. @param [Hash] event map event that caused validation
 #. @return [Boolean] true if widget settings ok
-#: src/include/bootloader/grub/options.rb:254
+#: src/include/bootloader/grub/options.rb:73
 msgid "Prot&ect Boot Loader with Password"
 msgstr "Prot&ect Boot Loader with Password"
 
 #. text entry
-#: src/include/bootloader/grub/options.rb:259
+#: src/include/bootloader/grub/options.rb:78
 msgid "&Password"
 msgstr "&Password"
 
 #. text entry
-#: src/include/bootloader/grub/options.rb:262
+#: src/include/bootloader/grub/options.rb:81
 msgid "Re&type Password"
 msgstr "Re&type Password"
 
-#. Common widget of a console
-#. @return [Hash{String => Object}] CWS widget
-#: src/include/bootloader/grub/options.rb:359
-#: src/include/bootloader/grub2/options.rb:295
-#, fuzzy
-msgid "Use &serial console"
-msgstr "Serial Console"
-
-#: src/include/bootloader/grub/options.rb:366
-#: src/include/bootloader/grub2/options.rb:302
-#, fuzzy
-msgid "&Console arguments"
-msgstr "invalid arguments"
-
-#. textentry header
-#: src/include/bootloader/grub/options.rb:455
-msgid "&Device"
-msgstr "&Device"
-
-#. disabling & enabling up/down
-#: src/include/bootloader/grub/options.rb:544
-#, fuzzy
-msgid "Device map must contain at least one device"
-msgstr "A class must contain at least one printer."
-
-#: src/include/bootloader/grub/options.rb:553
-msgid "D&isks"
-msgstr "D&isks"
-
-#: src/include/bootloader/grub/options.rb:565
-msgid "&Up"
-msgstr "&Up"
-
-#: src/include/bootloader/grub/options.rb:566
-msgid "&Down"
-msgstr "&Down"
-
 #. Create Frame "Boot Loader Location"
 #.
 #. @return [Yast::Term] with widgets
-#: src/include/bootloader/grub/options.rb:740
+#: src/include/bootloader/grub/options.rb:217
 #, fuzzy
 msgid "Boot from &Root Partition"
 msgstr "Boot from Root Partition"
 
-#: src/include/bootloader/grub/options.rb:741
+#: src/include/bootloader/grub/options.rb:218
 #, fuzzy
 msgid "Boo&t from Boot Partition"
 msgstr "Boot from Boot Partition"
 
-#: src/include/bootloader/grub/options.rb:749
-#: src/include/bootloader/grub/options.rb:776
-#: src/include/bootloader/grub/options.rb:811
+#: src/include/bootloader/grub/options.rb:228
+#, fuzzy
+msgid "C&ustom Boot Partition"
+msgstr "Custom Boot Partition"
+
+#: src/include/bootloader/grub/options.rb:243
+#: src/include/bootloader/grub/options.rb:271
+#: src/include/bootloader/grub/options.rb:292
 msgid "Boot Loader Location"
 msgstr "Boot Loader Location"
 
-#: src/include/bootloader/grub/options.rb:755
-#: src/include/bootloader/grub/options.rb:782
-#: src/include/bootloader/grub/options.rb:817
+#: src/include/bootloader/grub/options.rb:249
+#: src/include/bootloader/grub/options.rb:277
+#: src/include/bootloader/grub/options.rb:298
 #, fuzzy
 msgid "Boot from &Master Boot Record"
 msgstr "Boot from Master Boot Record"
 
-#: src/include/bootloader/grub/options.rb:762
+#: src/include/bootloader/grub/options.rb:256
 #, fuzzy
 msgid "Boot from &Extended Partition"
 msgstr "Boot from Root Partition"
 
-#: src/include/bootloader/grub/options.rb:788
-#: src/include/bootloader/grub/options.rb:829
-#, fuzzy
-msgid "C&ustom Boot Partition"
-msgstr "Custom Boot Partition"
-
-#: src/include/bootloader/grub/options.rb:822
+#: src/include/bootloader/grub/options.rb:303
 msgid "Enable Red&undancy for MD Array"
 msgstr ""
 
-#. push button
-#. push button
-#: src/include/bootloader/grub/options.rb:881
-#: src/include/bootloader/routines/global_widgets.rb:831
-msgid "Boot Loader Installation &Details"
-msgstr "Boot Loader Installation &Details"
-
 #. Title in tab
 #: src/include/bootloader/grub2/dialogs.rb:57
 #, fuzzy
@@ -607,6 +458,11 @@
 msgid "Bootloader Options"
 msgstr "Boot Loader Options"
 
+#. Window title
+#: src/include/bootloader/grub2/dialogs.rb:143
+msgid "Boot Loader Options"
+msgstr "Boot Loader Options"
+
 #: src/include/bootloader/grub2/dialogs.rb:183
 #, fuzzy
 #| msgid "Secure"
@@ -620,14 +476,14 @@
 msgstr "Enable &Quota Support"
 
 #. TRANSLATORS: place where boot code is installed
-#: src/include/bootloader/grub2/dialogs.rb:262
+#: src/include/bootloader/grub2/dialogs.rb:240
 #, fuzzy
 #| msgid "Boot Loader Location"
 msgid "Boot &Loader Location"
 msgstr "Boot Loader Location"
 
 #. help text
-#: src/include/bootloader/grub2/dialogs.rb:281
+#: src/include/bootloader/grub2/dialogs.rb:259
 msgid "Choose partition where is boot sequence installed."
 msgstr ""
 
@@ -646,13 +502,11 @@
 #.
 #. $Id: helps.ycp 58279 2009-08-04 16:01:51Z juhliarik $
 #: src/include/bootloader/grub2/helps.rb:23
-#: src/include/bootloader/routines/section_helps.rb:33
 #, fuzzy
 msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"
 msgstr "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel</p>"
 
 #: src/include/bootloader/grub2/helps.rb:26
-#: src/include/bootloader/routines/section_helps.rb:30
 #, fuzzy
 msgid "<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>"
 msgstr "<p><b>Vga Mode</b> defines the VGA mode for the <i>console</i> the kernel should set when booting</p>"
@@ -675,7 +529,6 @@
 msgstr ""
 
 #: src/include/bootloader/grub2/helps.rb:44
-#: src/include/bootloader/routines/section_helps.rb:99
 #, fuzzy
 msgid "O&ptional Kernel Command Line Parameter"
 msgstr "Optional Kernel Command Line Parameter"
@@ -687,7 +540,6 @@
 msgstr "Distribution:"
 
 #: src/include/bootloader/grub2/helps.rb:46
-#: src/include/bootloader/routines/section_helps.rb:98
 #, fuzzy
 msgid "&Vga Mode"
 msgstr "Vga Mode"
@@ -710,31 +562,21 @@
 #. %2 is Y resolution (height) in pixels
 #. %3 is color depth (usually one of 8, 16, 24, 32)
 #. %4 is the VGA mode ID (hexadecimal number)
-#. combo box item
-#. %1 is X resolution (width) in pixels
-#. %2 is Y resolution (height) in pixels
-#. %3 is color depth (usually one of 8, 16, 24, 32)
-#. %4 is the VGA mode ID (hexadecimal number)
 #: src/include/bootloader/grub2/options.rb:58
-#: src/include/bootloader/routines/section_widgets.rb:523
 msgid "%1x%2, %3 bits (mode %4)"
 msgstr "%1x%2, %3 bits (mode %4)"
 
 #: src/include/bootloader/grub2/options.rb:68
-#: src/include/bootloader/routines/section_widgets.rb:537
 #, fuzzy
 msgid "Standard 8-pixel font mode."
 msgstr "Standard Options"
 
 #. item of a combo box
-#. item of a combo box
 #: src/include/bootloader/grub2/options.rb:71
-#: src/include/bootloader/routines/section_widgets.rb:540
 msgid "Text Mode"
 msgstr "Text Mode"
 
 #: src/include/bootloader/grub2/options.rb:72
-#: src/include/bootloader/routines/section_widgets.rb:541
 #, fuzzy
 #| msgid "&Unspecified"
 msgid "Unspecified"
@@ -792,17 +634,23 @@
 msgid "&Console theme"
 msgstr "invalid arguments"
 
+#: src/include/bootloader/grub2/options.rb:295
+#, fuzzy
+msgid "Use &serial console"
+msgstr "Serial Console"
+
+#: src/include/bootloader/grub2/options.rb:302
+#, fuzzy
+msgid "&Console arguments"
+msgstr "invalid arguments"
+
 #. FIXME this should be better handled by exception and show it properly, but it require too big change now
-#: src/include/bootloader/routines/autoinstall.rb:169
+#: src/include/bootloader/routines/autoinstall.rb:132
 msgid "Unsupported bootloader '%s'. Adapt your AutoYaST profile accordingly."
 msgstr ""
 
 #. file open popup caption
-#. file open popup caption
-#. file open popup caption
 #: src/include/bootloader/routines/common_options.rb:102
-#: src/include/bootloader/routines/section_widgets.rb:265
-#: src/include/bootloader/routines/section_widgets.rb:279
 msgid "Select File"
 msgstr "Select File"
 
@@ -810,185 +658,27 @@
 #. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
 #. F#300779 - Install diskless client (NFS-root)
 #. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
-#: src/include/bootloader/routines/dialogs.rb:90 src/modules/Bootloader.rb:270
+#: src/include/bootloader/routines/dialogs.rb:85 src/modules/Bootloader.rb:256
 msgid "The boot partition is of type NFS. Bootloader cannot be installed."
 msgstr "The boot partition is of type NFS. Bootloader cannot be installed."
 
 #. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:131
+#: src/include/bootloader/routines/dialogs.rb:115
 msgid "Boot Loader Settings"
 msgstr "Boot Loader Settings"
 
 #. message
-#: src/include/bootloader/routines/dialogs.rb:159
+#: src/include/bootloader/routines/dialogs.rb:143
 msgid "There are no options to set for the current boot loader."
 msgstr "There are no options to set for the current boot loader."
 
-#. heading
-#. heading
-#. heading
-#: src/include/bootloader/routines/dialogs.rb:177
-#: src/include/bootloader/routines/dialogs.rb:255
-#: src/include/bootloader/routines/dialogs.rb:325
-msgid "Kernel Section"
-msgstr "Kernel Section"
-
-#. frame
-#. frame
-#. frame
-#. frame
-#. frame
-#. frame
-#. frame
-#. frame
-#: src/include/bootloader/routines/dialogs.rb:183
-#: src/include/bootloader/routines/dialogs.rb:261
-#: src/include/bootloader/routines/dialogs.rb:331
-#: src/include/bootloader/routines/dialogs.rb:399
-#: src/include/bootloader/routines/dialogs.rb:474
-#: src/include/bootloader/routines/dialogs.rb:522
-#: src/include/bootloader/routines/dialogs.rb:581
-#: src/include/bootloader/routines/dialogs.rb:636
-msgid "Section Settings"
-msgstr "Section Settings"
-
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:231
-#: src/include/bootloader/routines/dialogs.rb:302
-#: src/include/bootloader/routines/dialogs.rb:370
-#: src/include/bootloader/routines/dialogs.rb:445
-#: src/include/bootloader/routines/dialogs.rb:494
-#: src/include/bootloader/routines/dialogs.rb:542
-#: src/include/bootloader/routines/dialogs.rb:605
-#: src/include/bootloader/routines/dialogs.rb:683
-#: src/include/bootloader/routines/dialogs.rb:721
-msgid "Boot Loader Settings: Section Management"
-msgstr "Boot Loader Settings: Section Management"
-
-#. heading
-#. radio button
-#: src/include/bootloader/routines/dialogs.rb:393
-#: src/include/bootloader/routines/section_helps.rb:108
-#: src/include/bootloader/routines/section_widgets.rb:585
-msgid "Xen Section"
-msgstr "Xen Section"
-
-#. heading
-#. radio button
-#: src/include/bootloader/routines/dialogs.rb:468
-#: src/include/bootloader/routines/section_helps.rb:111
-#: src/include/bootloader/routines/section_helps.rb:121
-#: src/include/bootloader/routines/section_widgets.rb:591
-msgid "Menu Section"
-msgstr "Menu Section"
-
-#. heading
-#. radio button
-#: src/include/bootloader/routines/dialogs.rb:516
-#: src/include/bootloader/routines/section_widgets.rb:593
-#, fuzzy
-msgid "Dump Section"
-msgstr "Menu Section"
-
-#. label
-#. label
-#: src/include/bootloader/routines/dialogs.rb:573
-#: src/include/bootloader/routines/dialogs.rb:628
-msgid "Other System Section"
-msgstr "Other System Section"
-
-#. combobox label
-#: src/include/bootloader/routines/dialogs.rb:803
-msgid "&Filename"
-msgstr "&Filename"
-
-#. label. %1 is name of file (eg. /etc/lilo.conf
-#: src/include/bootloader/routines/dialogs.rb:811
-msgid "Filename: %1"
-msgstr "Filename: %1"
-
-#. multiline edit header
-#: src/include/bootloader/routines/dialogs.rb:828
-msgid "Fi&le Contents"
-msgstr "Fi&le Contents"
-
-#. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:836
-msgid "Expert Manual Configuration"
-msgstr "Expert Manual Configuration"
-
-#. sections list widget
-#. Refresh and redraw widget wits sections
-#. @param [Array<Hash{String => Object>}] sects list of current sections
-#. menu button
-#: src/include/bootloader/routines/global_widgets.rb:114
-#: src/include/bootloader/routines/global_widgets.rb:641
-msgid "Other"
-msgstr "Other"
-
-#: src/include/bootloader/routines/global_widgets.rb:116
-msgid "Image"
-msgstr "Image"
-
-#: src/include/bootloader/routines/global_widgets.rb:134
-msgid "Xen"
-msgstr ""
-
-#: src/include/bootloader/routines/global_widgets.rb:152
-msgid "Floppy"
-msgstr "Floppy"
-
-#: src/include/bootloader/routines/global_widgets.rb:154
-#, fuzzy
-msgid "Menu"
-msgstr "Boot Menu"
-
-#: src/include/bootloader/routines/global_widgets.rb:161
-msgid "Dump"
-msgstr ""
-
-#. table header, Def stands for default
-#: src/include/bootloader/routines/global_widgets.rb:255
-msgid "Def."
-msgstr "Def."
-
-#. table header
-#: src/include/bootloader/routines/global_widgets.rb:257
-msgid "Label"
-msgstr "Label"
-
-#. table header
-#: src/include/bootloader/routines/global_widgets.rb:259
-#: src/include/bootloader/routines/global_widgets.rb:746
-msgid "Type"
-msgstr "Type"
-
-#. table header; header for section details, either
-#. the specification of the kernel image to load,
-#. or the specification of device to boot from
-#: src/include/bootloader/routines/global_widgets.rb:263
-msgid "Image / Device"
-msgstr "Image / Device"
-
-#: src/include/bootloader/routines/global_widgets.rb:271
-msgid "Set as De&fault"
-msgstr "Set as De&fault"
-
 #. combo box
-#: src/include/bootloader/routines/global_widgets.rb:312
+#: src/include/bootloader/routines/global_widgets.rb:114
 msgid "&Boot Loader"
 msgstr "&Boot Loader"
 
 #. popup - Continue/Cancel
-#: src/include/bootloader/routines/global_widgets.rb:343
+#: src/include/bootloader/routines/global_widgets.rb:144
 msgid ""
 "\n"
 "If you do not install any boot loader, the system\n"
@@ -1002,117 +692,67 @@
 "\n"
 "Proceed?\n"
 
-#. warning - popup, followed by radio buttons
-#: src/include/bootloader/routines/global_widgets.rb:377
-msgid ""
-"\n"
-"You chose to change your boot loader. When converting \n"
-"the configuration, some settings might be lost.\n"
-"\n"
-"The current configuration will be saved and you can\n"
-"restore it if you return to the current boot loader.\n"
-"\n"
-"Select a course of action:\n"
-msgstr ""
-"\n"
-"You chose to change your boot loader. When converting \n"
-"the configuration, some settings might be lost.\n"
-"\n"
-"The current configuration will be saved and you can\n"
-"restore it if you return to the current boot loader.\n"
-"\n"
-"Select a course of action:\n"
+#. menu button entry
+#: src/include/bootloader/routines/global_widgets.rb:181
+msgid "E&dit Configuration Files"
+msgstr "E&dit Configuration Files"
 
-#. radiobutton
 #. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:399
-#: src/include/bootloader/routines/global_widgets.rb:593
+#: src/include/bootloader/routines/global_widgets.rb:188
 msgid "&Propose New Configuration"
 msgstr "&Propose New Configuration"
 
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:406
-msgid "Co&nvert Current Configuration"
-msgstr "Co&nvert Current Configuration"
-
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:415
-msgid "&Start New Configuration from Scratch"
-msgstr "&Start New Configuration from Scratch"
-
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:423
-msgid "&Read Configuration Saved on Disk"
-msgstr "&Read Configuration Saved on Disk"
-
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:433
-msgid "Res&tore Configuration Saved before Conversion"
-msgstr "Res&tore Configuration Saved before Conversion"
-
-#. popup message
-#: src/include/bootloader/routines/global_widgets.rb:514
-msgid "Select the boot loader before editing sections."
-msgstr "Select the boot loader before editing sections."
-
-#. pushbutton
-#. menu button entry
-#: src/include/bootloader/routines/global_widgets.rb:563
-#: src/include/bootloader/routines/global_widgets.rb:586
-msgid "E&dit Configuration Files"
-msgstr "E&dit Configuration Files"
-
 #. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:600
+#: src/include/bootloader/routines/global_widgets.rb:195
 msgid "&Start from Scratch"
 msgstr "&Start from Scratch"
 
 #. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:608
+#: src/include/bootloader/routines/global_widgets.rb:203
 msgid "&Reread Configuration from Disk"
 msgstr "&Reread Configuration from Disk"
 
 #. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:625
+#: src/include/bootloader/routines/global_widgets.rb:220
 msgid "Restore MBR of Hard Disk"
 msgstr "Restore MBR of Hard Disk"
 
 #. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:633
+#: src/include/bootloader/routines/global_widgets.rb:228
 msgid "Write bootloader boot code to disk"
 msgstr "Write bootloader boot code to disk"
 
+#. menu button
+#: src/include/bootloader/routines/global_widgets.rb:236
+msgid "Other"
+msgstr "Other"
+
 #. message popup
-#: src/include/bootloader/routines/global_widgets.rb:665
+#: src/include/bootloader/routines/global_widgets.rb:260
 msgid "MBR restored successfully."
 msgstr "MBR restored successfully."
 
 #. message popup
-#: src/include/bootloader/routines/global_widgets.rb:668
+#: src/include/bootloader/routines/global_widgets.rb:263
 msgid "Failed to restore MBR."
 msgstr "Failed to restore MBR."
 
 #. Bootloader::blSave (false, false, false);
-#: src/include/bootloader/routines/global_widgets.rb:691
+#: src/include/bootloader/routines/global_widgets.rb:286
 #, fuzzy
 msgid "Writing bootloader settings failed."
 msgstr "Writing network settings failed."
 
-#. tab header
-#: src/include/bootloader/routines/global_widgets.rb:730
-msgid "&Section Management"
-msgstr "&Section Management"
-
-#. tab header
-#: src/include/bootloader/routines/global_widgets.rb:740
-msgid "Boot Loader &Installation"
-msgstr "Boot Loader &Installation"
-
 #. push button
-#: src/include/bootloader/routines/global_widgets.rb:818
+#: src/include/bootloader/routines/global_widgets.rb:340
 msgid "Boot &Loader Options"
 msgstr "Boot &Loader Options"
 
+#. push button
+#: src/include/bootloader/routines/global_widgets.rb:353
+msgid "Boot Loader Installation &Details"
+msgstr "Boot Loader Installation &Details"
+
 #. help text 1/1 (shown during settings reading progress)
 #: src/include/bootloader/routines/helps.rb:32
 msgid ""
@@ -1131,18 +771,9 @@
 "<P><B><BIG>Saving Boot Loader Configuration</BIG></B><BR>\n"
 "Please wait...<br></p>"
 
-#. help text, optional part of following
+#. help text 1/2 (%1 may be following sentence, optionally empty)
 #: src/include/bootloader/routines/helps.rb:52
 msgid ""
-"If you have multiple Linux systems installed,\n"
-"YaST can try to find them and merge their menus."
-msgstr ""
-"If you have multiple Linux systems installed,\n"
-"YaST can try to find them and merge their menus."
-
-#. help text 1/2 (%1 may be following sentence, optionally empty)
-#: src/include/bootloader/routines/helps.rb:58
-msgid ""
 "<P>From <B>Other</B>,\n"
 "you can manually edit the boot loader configuration files, clear the current \n"
 "configuration and propose a new configuration, start from scratch, or reread\n"
@@ -1154,7 +785,7 @@
 "the configuration saved on your disk. %1</P>"
 
 #. help text 1/1
-#: src/include/bootloader/routines/helps.rb:73
+#: src/include/bootloader/routines/helps.rb:67
 msgid ""
 "<P>To edit boot loader configuration files\n"
 "manually, click <B>Edit Configuration Files</B>.</P>"
@@ -1163,7 +794,7 @@
 "manually, click <B>Edit Configuration Files</B>.</P>"
 
 #. help 1/4
-#: src/include/bootloader/routines/helps.rb:83
+#: src/include/bootloader/routines/helps.rb:77
 msgid ""
 "<P> In the table, each section represents one item\n"
 "in the boot menu.</P>"
@@ -1172,7 +803,7 @@
 "in the boot menu.</P>"
 
 #. help 2/4
-#: src/include/bootloader/routines/helps.rb:87
+#: src/include/bootloader/routines/helps.rb:81
 msgid ""
 "<P> Press <B>Edit</B> to display the properties of the\n"
 "selected section.</P>"
@@ -1181,7 +812,7 @@
 "selected section.</P>"
 
 #. help 3/4
-#: src/include/bootloader/routines/helps.rb:91
+#: src/include/bootloader/routines/helps.rb:85
 msgid ""
 "<P> By pressing <b>Set as Default</b>, mark the selected \n"
 "section as default. When booting, the boot loader will provide \n"
@@ -1198,7 +829,7 @@
 "menu can be changed using the <B>Up</B> and <B>Down</B> buttons.</P>"
 
 #. help 4/4
-#: src/include/bootloader/routines/helps.rb:100
+#: src/include/bootloader/routines/helps.rb:94
 msgid ""
 "<P>Press <B>Add</B> to create a new boot loader section\n"
 "or <B>Delete</B> to delete the selected section.</P>"
@@ -1209,7 +840,7 @@
 #. help text for the custom boot manager installation, 1 of 7
 #. %1 = name of boot loader (e.g. "LILO")
 #. this should be per architecture
-#: src/include/bootloader/routines/helps.rb:115
+#: src/include/bootloader/routines/helps.rb:109
 msgid ""
 "<p><big><b>Boot Loader Location</b></big><br>\n"
 "The boot manager (%1) can be installed in the following ways:</p>"
@@ -1218,7 +849,7 @@
 "The boot manager (%1) can be installed in the following ways:</p>"
 
 #. custom bootloader help text, 2 of 7
-#: src/include/bootloader/routines/helps.rb:124
+#: src/include/bootloader/routines/helps.rb:118
 msgid ""
 "<p>- In the <b>Master Boot Record</b> (MBR).\n"
 "This is not recommended if there is another operating system installed\n"
@@ -1229,7 +860,7 @@
 "on the computer.</p>"
 
 #. custom bootloader help text, 3 of 7
-#: src/include/bootloader/routines/helps.rb:134
+#: src/include/bootloader/routines/helps.rb:128
 msgid ""
 "<p>\n"
 "- In the <b>Boot Sector</b> of the <tt>/boot</tt> or <tt>/</tt> (root) \n"
@@ -1249,24 +880,8 @@
 "if it is needed or configure your other boot manager\n"
 "to start &product;.</p>"
 
-#. custom bootloader help text, 4 of 7
-#. this part will only be shown if a floppy drive is attached.
-#: src/include/bootloader/routines/helps.rb:151
-msgid ""
-"<p>\n"
-"- On a <b>Floppy Disk</b>.\n"
-"Use this to avoid the risk of interfering with an already existing\n"
-"boot mechanism. Enable booting from floppy disk in\n"
-"the BIOS of your machine to use this option.</p>"
-msgstr ""
-"<p>\n"
-"- On a <b>Floppy Disk</b>.\n"
-"Use this to avoid the risk of interfering with an already existing\n"
-"boot mechanism. Enable booting from floppy disk in\n"
-"the BIOS of your machine to use this option.</p>"
-
 #. custom bootloader help text, 5 of 7
-#: src/include/bootloader/routines/helps.rb:164
+#: src/include/bootloader/routines/helps.rb:143
 msgid ""
 "<p>\n"
 "- In some <b>Other</b> partition. Consider your system's restrictions\n"
@@ -1277,7 +892,7 @@
 "when selecting this option.</p>"
 
 #. optional part, only inserted on x86 architectures. 6 of 7
-#: src/include/bootloader/routines/helps.rb:174
+#: src/include/bootloader/routines/helps.rb:153
 msgid ""
 "<p>For example, most PCs have a BIOS\n"
 "limit that restricts booting to\n"
@@ -1290,7 +905,7 @@
 "you may or may not be able to boot from a logical partition.</p>"
 
 #. custom bootloader help text, 7 of 7
-#: src/include/bootloader/routines/helps.rb:186
+#: src/include/bootloader/routines/helps.rb:165
 msgid ""
 "<p>\n"
 "Enter the device name of the partition (for example, <tt>/dev/hda3</tt> or\n"
@@ -1301,7 +916,7 @@
 "<tt>/dev/sdb</tt>) in the input field.</p>"
 
 #. help text 1/1
-#: src/include/bootloader/routines/helps.rb:199
+#: src/include/bootloader/routines/helps.rb:178
 #, fuzzy
 msgid ""
 "<p><b>Boot Loader Installation Details</b><br>\n"
@@ -1313,7 +928,7 @@
 "mapping), click <b>Boot Loader Installation Details</b>.</p>"
 
 #. help text 1/1
-#: src/include/bootloader/routines/helps.rb:210
+#: src/include/bootloader/routines/helps.rb:189
 #, fuzzy
 msgid ""
 "<p><b>Boot Loader Type</b><br>\n"
@@ -1325,7 +940,7 @@
 "use <b>Boot Loader</b>.</p>"
 
 #. help text 1/1
-#: src/include/bootloader/routines/helps.rb:222
+#: src/include/bootloader/routines/helps.rb:201
 #, fuzzy
 msgid ""
 "<p><b>Boot Loader Options</b><br>\n"
@@ -1337,7 +952,7 @@
 "<b>Boot Loader Options</b>.</p>"
 
 #. help text 1/1
-#: src/include/bootloader/routines/helps.rb:233
+#: src/include/bootloader/routines/helps.rb:212
 msgid ""
 "<P><B>Expert Manual Configuration</B><BR>\n"
 "Here, manually edit the boot loader configuration.</P>\n"
@@ -1348,7 +963,7 @@
 "<P>Note: The final configuration file may have different indenting.</P>"
 
 #. help text 1/1
-#: src/include/bootloader/routines/helps.rb:244
+#: src/include/bootloader/routines/helps.rb:223
 #, fuzzy
 msgid ""
 "<p><b>Section Name</b><br>\n"
@@ -1360,7 +975,7 @@
 "name must be unique.</p>"
 
 #. help text 1/5
-#: src/include/bootloader/routines/helps.rb:255
+#: src/include/bootloader/routines/helps.rb:234
 msgid ""
 "<p><big><b>Type of the New Section</b></big><br>\n"
 "Select the type of the new section to create.</p>"
@@ -1369,7 +984,7 @@
 "Select the type of the new section to create.</p>"
 
 #. help text 2/5
-#: src/include/bootloader/routines/helps.rb:259
+#: src/include/bootloader/routines/helps.rb:238
 msgid ""
 "<p>Select <b>Clone Selected Section</b> to clone the currently selected\n"
 "section. Then modify the options that should differ from the\n"
@@ -1380,7 +995,7 @@
 "selected section.</p>"
 
 #. help text 3/5
-#: src/include/bootloader/routines/helps.rb:265
+#: src/include/bootloader/routines/helps.rb:244
 #, fuzzy
 msgid ""
 "<p>Select <b>Image Section</b> to add a new Linux kernel or other image\n"
@@ -1390,7 +1005,7 @@
 "to load and start.</p>"
 
 #. help text 4/5
-#: src/include/bootloader/routines/helps.rb:269
+#: src/include/bootloader/routines/helps.rb:248
 #, fuzzy
 msgid ""
 "<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n"
@@ -1400,7 +1015,7 @@
 "but to start it in a XEN environment.</p>"
 
 #. help text 5/5
-#: src/include/bootloader/routines/helps.rb:273
+#: src/include/bootloader/routines/helps.rb:252
 msgid ""
 "<p>Select <b>Other System (Chainloader)</b> to add a section that \n"
 "loads and starts a boot sector of a partition of the disk. This is used for\n"
@@ -1410,7 +1025,7 @@
 "loads and starts a boot sector of a partition of the disk. This is used for\n"
 "booting other operating systems.</p>"
 
-#: src/include/bootloader/routines/helps.rb:278
+#: src/include/bootloader/routines/helps.rb:257
 #, fuzzy
 msgid ""
 "<p>Select <b>Menu Section</b> to add a section that \n"
@@ -1422,50 +1037,40 @@
 "booting other operating systems.</p>"
 
 #. part of summary, %1 is a list of hard disks device names
-#: src/include/bootloader/routines/lilolike.rb:743
+#: src/include/bootloader/routines/lilolike.rb:266
 msgid "Order of Hard Disks: %1"
 msgstr "Order of Hard Disks: %1"
 
 #. summary string
-#: src/include/bootloader/routines/misc.rb:48
+#: src/include/bootloader/routines/misc.rb:51
 msgid "Do not install any boot loader"
 msgstr "Do not install any boot loader"
 
 #. combo box item
-#: src/include/bootloader/routines/misc.rb:50
+#: src/include/bootloader/routines/misc.rb:53
 msgid "Do Not Install Any Boot Loader"
 msgstr "Do Not Install Any Boot Loader"
 
 #. summary string
-#: src/include/bootloader/routines/misc.rb:55
+#: src/include/bootloader/routines/misc.rb:58
 msgid "Install the default boot loader"
 msgstr "Install the default boot loader"
 
 #. combo box item
-#: src/include/bootloader/routines/misc.rb:57
+#: src/include/bootloader/routines/misc.rb:60
 msgid "Install Default Boot Loader"
 msgstr "Install Default Boot Loader"
 
 #. summary string
-#: src/include/bootloader/routines/misc.rb:61
+#: src/include/bootloader/routines/misc.rb:64
 msgid "Boot loader"
 msgstr "Boot loader"
 
 #. combo box item
-#: src/include/bootloader/routines/misc.rb:63
+#: src/include/bootloader/routines/misc.rb:66
 msgid "Boot Loader"
 msgstr "Boot Loader"
 
-#. popup, %1 is bootloader name
-#: src/include/bootloader/routines/misc.rb:101
-msgid "The %1 boot sector has been written to the floppy disk."
-msgstr "The %1 boot sector has been written to the floppy disk."
-
-#. popup - continuing
-#: src/include/bootloader/routines/misc.rb:113
-msgid "Leave the floppy disk in the drive."
-msgstr "Leave the floppy disk in the drive."
-
 #. popup message
 #: src/include/bootloader/routines/popups.rb:35
 msgid ""
@@ -1484,18 +1089,13 @@
 "Really leave the boot loader configuration without saving?\n"
 "All changes will be lost.\n"
 
-#. yes-no popup question
-#: src/include/bootloader/routines/popups.rb:59
-msgid "Really delete section %1?"
-msgstr "Really delete section %1?"
-
 #. error popup
-#: src/include/bootloader/routines/popups.rb:65
+#: src/include/bootloader/routines/popups.rb:57
 msgid "The password must not be empty."
 msgstr "The password must not be empty."
 
 #. error popup
-#: src/include/bootloader/routines/popups.rb:74
+#: src/include/bootloader/routines/popups.rb:66
 msgid ""
 "'Password' and 'Retype password'\n"
 "do not match. Retype the password."
@@ -1503,81 +1103,15 @@
 "'Password' and 'Retype password'\n"
 "do not match. Retype the password."
 
-#. message popup, %1 is sectino label
-#: src/include/bootloader/routines/popups.rb:88
-msgid ""
-"The disk settings have changed.\n"
-"Check section %1 settings.\n"
-msgstr ""
-"The disk settings have changed.\n"
-"Check section %1 settings.\n"
-
-#. message popup
-#: src/include/bootloader/routines/popups.rb:100
-msgid ""
-"The disk settings have changed and you edited boot loader\n"
-"configuration files manually. Check the boot loader settings.\n"
-msgstr ""
-"The disk settings have changed and you edited boot loader\n"
-"configuration files manually. Check the boot loader settings.\n"
-
 #. Confirmation box with yes-no popup. %1 is reason why we need to set
 #. default location. It is translated on caller side and it is complete
 #. sentence.
-#: src/include/bootloader/routines/popups.rb:116
+#: src/include/bootloader/routines/popups.rb:82
 msgid "%1Set default boot loader location?\n"
 msgstr "%1Set default boot loader location?\n"
 
-#. combobox item
-#: src/include/bootloader/routines/popups.rb:128
-msgid "Do Not Create a File System"
-msgstr "Do Not Create a File System"
-
-#. combobox item
-#: src/include/bootloader/routines/popups.rb:130
-msgid "Create an ext2 File System"
-msgstr "Create an ext2 File System"
-
-#. combobox item
-#: src/include/bootloader/routines/popups.rb:136
-msgid "Create a FAT File System"
-msgstr "Create a FAT File System"
-
-#. label
-#: src/include/bootloader/routines/popups.rb:142
-msgid ""
-"The boot loader boot sector will be written\n"
-"to a floppy disk. Insert a floppy disk\n"
-"and confirm with OK.\n"
-msgstr ""
-"The boot loader boot sector will be written\n"
-"to a floppy disk. Insert a floppy disk\n"
-"and confirm with OK.\n"
-
-#. checkbox
-#: src/include/bootloader/routines/popups.rb:150
-msgid "&Low Level Format"
-msgstr "&Low Level Format"
-
-#. combobox
-#: src/include/bootloader/routines/popups.rb:153
-msgid "&Create File System"
-msgstr "&Create File System"
-
-#. yes-no popup
-#: src/include/bootloader/routines/popups.rb:182
-msgid "Low level format failed. Try again?"
-msgstr "Low level format failed. Try again?"
-
-#. error report
-#. error report
-#: src/include/bootloader/routines/popups.rb:195
-#: src/include/bootloader/routines/popups.rb:207
-msgid "Creating file system failed."
-msgstr "Creating file system failed."
-
 #. error popup
-#: src/include/bootloader/routines/popups.rb:218
+#: src/include/bootloader/routines/popups.rb:90
 msgid ""
 "The name selected is already used.\n"
 "Use a different one.\n"
@@ -1586,7 +1120,7 @@
 "Use a different one.\n"
 
 #. yes-no popup
-#: src/include/bootloader/routines/popups.rb:229
+#: src/include/bootloader/routines/popups.rb:101
 msgid ""
 "An error occurred during boot loader\n"
 "installation. Retry boot loader configuration?\n"
@@ -1594,14 +1128,9 @@
 "An error occurred during boot loader\n"
 "installation. Retry boot loader configuration?\n"
 
-#. FIXME too generic, but was already translated
-#: src/include/bootloader/routines/popups.rb:241
-msgid "Unable to install the boot loader."
-msgstr "Unable to install the boot loader."
-
 #. warning popup. %1 is device name, %2 is date/time in form of
 #. 'date' command output
-#: src/include/bootloader/routines/popups.rb:283
+#: src/include/bootloader/routines/popups.rb:125
 msgid ""
 "Warning!\n"
 "\n"
@@ -1624,354 +1153,10 @@
 "Continue?\n"
 
 #. PushButton
-#: src/include/bootloader/routines/popups.rb:305
+#: src/include/bootloader/routines/popups.rb:147
 msgid "&Yes, Rewrite"
 msgstr "&Yes, Rewrite"
 
-#. encoding: utf-8
-#. File:
-#. include/bootloader/routines/section_helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader section widgets
-#.
-#. Authors:
-#. Josef Reidinger <jreidinger@suse.cz>
-#.
-#. $Id$
-#: src/include/bootloader/routines/section_helps.rb:23
-msgid "<p><b>Image Section</b></p>"
-msgstr "<p><b>Image Section</b></p>"
-
-#: src/include/bootloader/routines/section_helps.rb:24
-#, fuzzy
-msgid "<p><b>Kernel Image</b> defines the kernel to boot. Either enter the name directly or choose via <b>Browse</b>.</p>"
-msgstr "<p><b>Kernel Image</b> defines the kernel to boot. Either enter the name directly or choose via <b>Browse</b></p>"
-
-#: src/include/bootloader/routines/section_helps.rb:27
-msgid "<p><b>Root Device</b> sets the device to pass to the kernel as root device.</p>"
-msgstr "<p><b>Root Device</b> sets the device to pass to the kernel as root device.</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:36
-#, fuzzy
-msgid ""
-"<p><b>Initial RAM Disk</b>, if not empty, defines the initial ramdisk to use. Either enter the path and file name\n"
-"directly or choose by using <b>Browse</b>.</p>\n"
-msgstr ""
-"<p><b>Initial RAM Disk</b>, if non-empty, defines the initial ramdisk to use. Either enter the path and file name\n"
-"directly or choose by using <b>Browse</b></p>"
-
-#: src/include/bootloader/routines/section_helps.rb:39
-#, fuzzy
-msgid "<p>Select <b>Chainloader Section</b> if you want to define a section for booting an OS other than Linux.</p>"
-msgstr "<p>Select <b>Chainloader Section</b> if you want to define a section for booting an OS other than Linux</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:42
-#, fuzzy
-msgid "<p>Setting <b>Use Password Protection</p> will require a password to select this section.</p>"
-msgstr "<p>Setting <b>Use Password Protection</p> will require a password to select this section</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:45
-msgid "<p><b>Other System</b> lets you choose among the non-Linux operating systems found on your computer.</p>"
-msgstr "<p><b>Other System</b> lets you choose among the non-Linux operating systems found on your computer.</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:48
-msgid "<p>Select <b>Activate this Partition when selected for Boot</b> if your BIOS needs this flag set in order to boot it</p>"
-msgstr "<p>Select <b>Activate this Partition when selected for Boot</b> if your BIOS needs this flag set in order to boot it</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:51
-#, fuzzy
-msgid ""
-"<p><b>Block Offset for Chainloading</b> lets you specify the list of blocks to boot. In most cases you want\n"
-"to specify <code>+1</code> here. For specifics on blocklist notation see the grub documentation.</p>\n"
-msgstr ""
-"<p><b>Block Offset for Chainloading</b> lets you specify the list of blocks to boot. In most cases you want\n"
-"to specify <code>+1</code> here. For specifics on blocklist notation see the grub documentation</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:54
-#, fuzzy
-msgid ""
-"<p>Select <b>Xen Section</b> if you want to add a new Linux kernel or other image \n"
-"and start it in a Xen environment.</p>\n"
-msgstr ""
-"<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n"
-"but to start it in a XEN environment.</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:57
-msgid "<p><b>Hypervisor</b> specifies the Hypervisor to use.</p>"
-msgstr "<p><b>Hypervisor</b> specifies the Hypervisor to use.</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:60
-#, fuzzy
-msgid "<p><b>Additional Xen Hypervisor Parameters</b> lets you define additional parameters to pass to the xen hypervisor.</p>"
-msgstr "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:63
-msgid "<p><b>Menu Section</b></p>"
-msgstr "<p><b>Menu Section</b></p>"
-
-#: src/include/bootloader/routines/section_helps.rb:64
-msgid "<p><b>Partition of Menu File</b></p>"
-msgstr "<p><b>Partition of Menu File</b></p>"
-
-#: src/include/bootloader/routines/section_helps.rb:65
-#, fuzzy
-#| msgid ""
-#| "<p><b>Min Object Size</b> specifies the minimum object size below which\n"
-#| "will not be saved to the disk.</p>"
-msgid "<p><b>Menu Description File</b> specifies path on root device from which is loaded menu file.</p>"
-msgstr ""
-"<p><b>Min Object Size</b> specifies the minimum object size below which\n"
-"will not be saved to the disk.</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:68
-msgid "<p><b>Map Section to the First Disk from Device Map</b> Windows usually need to be on the first disk.</p>"
-msgstr ""
-
-#: src/include/bootloader/routines/section_helps.rb:71
-msgid ""
-"<p><b>Measures</b> includes measured files with PCR. Change table is possible via buttons: <b>Add</b> , \n"
-"<b>Edit</b> and <b>Delete</b></p>"
-msgstr ""
-
-#: src/include/bootloader/routines/section_helps.rb:74
-#, fuzzy
-msgid ""
-"<p><b>Allow attempt to relocate</b>\n"
-"Usually specified in global section</p>"
-msgstr ""
-"<p><b>Allow attempt to relocate</b></p>\n"
-"Usually specified in global section</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:77
-msgid ""
-"<p><b>Force root filesystem to be mounted read-only</b><br>\n"
-"Usually specified in global section</p>"
-msgstr ""
-"<p><b>Force root filesystem to be mounted read-only</b><br>\n"
-"Usually specified in global section</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:80
-msgid ""
-"<p>Select <b>Dump Section</b> to add a section that specifies how to\n"
-"create a system dump either on a DASD disk partition or tape device or to a\n"
-"file on a SCSI disk partition.</p>"
-msgstr ""
-"<p>Select <b>Dump Section</b> to add a section that specifies how to\n"
-"create a system dump either on a DASD disk partition or tape device or to a\n"
-"file on a SCSI disk partition.</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:85
-#, fuzzy
-msgid ""
-"<p>Select <b>Menu Section</b> to add a new menu to the configuration.\n"
-"Menu sections represent a list of tasks which are grouped together.</p>\n"
-msgstr ""
-"<p>Select <b>Menu Section</b> to add a new menu to the configuration.\n"
-"Menu sections represent a list of tasks which are grouped together</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:88
-msgid ""
-"<p>Select <b>Enable SELinux</b> to add the needed kernel boot parameters to enable the SELinux security framework. \n"
-"Please note that this will also disable AppArmor.</p>"
-msgstr ""
-
-#. radio button
-#: src/include/bootloader/routines/section_helps.rb:95
-#: src/include/bootloader/routines/section_widgets.rb:583
-msgid "Image Section"
-msgstr "Image Section"
-
-#: src/include/bootloader/routines/section_helps.rb:96
-msgid "&Kernel Image"
-msgstr "&Kernel Image"
-
-#: src/include/bootloader/routines/section_helps.rb:97
-#, fuzzy
-msgid "&Root Device"
-msgstr "Root Device"
-
-#: src/include/bootloader/routines/section_helps.rb:100
-msgid "&Initial RAM Disk"
-msgstr "&Initial RAM Disk"
-
-#: src/include/bootloader/routines/section_helps.rb:101
-msgid "Chainloader Section"
-msgstr "Chainloader Section"
-
-#: src/include/bootloader/routines/section_helps.rb:102
-msgid "Use Password Protection"
-msgstr "Use Password Protection"
-
-#: src/include/bootloader/routines/section_helps.rb:103
-#, fuzzy
-msgid "&Other System"
-msgstr "Other System"
-
-#: src/include/bootloader/routines/section_helps.rb:104
-#, fuzzy
-msgid "Do not &verify Filesystem before Booting"
-msgstr "Do not verify Filesystem before Booting"
-
-#: src/include/bootloader/routines/section_helps.rb:105
-#, fuzzy
-msgid "&Activate this Partition when selected for Boot"
-msgstr "Activate this Partition when selected for Boot"
-
-#: src/include/bootloader/routines/section_helps.rb:106
-#, fuzzy
-msgid "B&lock Offset for Chainloading"
-msgstr "Block Offset for Chainloading"
-
-#: src/include/bootloader/routines/section_helps.rb:107
-msgid "&Map Section to the First Disk in Device Map"
-msgstr ""
-
-#: src/include/bootloader/routines/section_helps.rb:109
-#, fuzzy
-msgid "&Hypervisor"
-msgstr "Hypervisor"
-
-#: src/include/bootloader/routines/section_helps.rb:110
-#, fuzzy
-msgid "&Additional Xen Hypervisor Parameters"
-msgstr "Additional Xen Hypervisor Parameters"
-
-#: src/include/bootloader/routines/section_helps.rb:112
-#, fuzzy
-msgid "&Partition of Menu File"
-msgstr "Partition of Menu File"
-
-#: src/include/bootloader/routines/section_helps.rb:113
-#, fuzzy
-msgid "&Menu Description File"
-msgstr "Menu Description File"
-
-#: src/include/bootloader/routines/section_helps.rb:114
-#, fuzzy
-msgid "&Force root filesystem to be mounted read-only"
-msgstr "Force root filesystem to be mounted read-only"
-
-#: src/include/bootloader/routines/section_helps.rb:115
-#, fuzzy
-msgid "Allow attempt to &relocate"
-msgstr "Allow attempt to relocate"
-
-#: src/include/bootloader/routines/section_helps.rb:116
-#, fuzzy
-msgid "Tar&get Directory for Section"
-msgstr "Target Directory for Dump Section"
-
-#: src/include/bootloader/routines/section_helps.rb:117
-#, fuzzy
-msgid "Op&tional Parameter File"
-msgstr "Optional Parameter File"
-
-#: src/include/bootloader/routines/section_helps.rb:118
-msgid "Dump Section (obsolete)"
-msgstr "Dump Section (obsolete)"
-
-#: src/include/bootloader/routines/section_helps.rb:119
-msgid "&Dump Device"
-msgstr "&Dump Device"
-
-#: src/include/bootloader/routines/section_helps.rb:120
-#, fuzzy
-msgid "&SCSI Dump Device"
-msgstr "SCSI Dump Device"
-
-#: src/include/bootloader/routines/section_helps.rb:122
-#, fuzzy
-msgid "&List of Menu Entries"
-msgstr "List of Menu Entries"
-
-#: src/include/bootloader/routines/section_helps.rb:123
-#, fuzzy
-msgid "&Number of Default Entry"
-msgstr "Number of Default Entry"
-
-#: src/include/bootloader/routines/section_helps.rb:124
-#, fuzzy
-msgid "&Timeout in seconds"
-msgstr "Timeout in seconds"
-
-#: src/include/bootloader/routines/section_helps.rb:125
-#, fuzzy
-msgid "&Show boot menu"
-msgstr "Show boot menu"
-
-#: src/include/bootloader/routines/section_helps.rb:126
-#, fuzzy
-msgid "C&opy Image to Boot Partition"
-msgstr "Copy Image to Boot Partition"
-
-#: src/include/bootloader/routines/section_helps.rb:127
-#, fuzzy
-msgid "&Skip Section gracefully on Errors"
-msgstr "Skip Section gracefully on Errors"
-
-#: src/include/bootloader/routines/section_helps.rb:128
-#, fuzzy
-msgid "Boot &Partition of Other System"
-msgstr "Boot Partition of Other System"
-
-#. Cache for CommonSectionWidgets
-#: src/include/bootloader/routines/section_widgets.rb:58
-msgid "Image section must have specified kernel image"
-msgstr ""
-
-#: src/include/bootloader/routines/section_widgets.rb:65
-#, fuzzy
-msgid "Image file doesn't exist now. Do you really want use it?"
-msgstr ""
-"Archive %1 already exists.\n"
-"Do you really want to overwrite it?"
-
-#: src/include/bootloader/routines/section_widgets.rb:82
-#, fuzzy
-msgid "Initrd file doesn't exist now. Do you really want use it?"
-msgstr ""
-"Archive %1 already exists.\n"
-"Do you really want to overwrite it?"
-
-#. string append = BootCommon::current_section["append"]:"";
-#: src/include/bootloader/routines/section_widgets.rb:227
-#, fuzzy
-msgid "Enable &SELinux"
-msgstr "Enable &TLS"
-
-#. bnc#456362 filter out special chars like diacritics china chars etc.
-#: src/include/bootloader/routines/section_widgets.rb:401
-msgid "The name includes unallowable char(s)"
-msgstr ""
-
-#: src/include/bootloader/routines/section_widgets.rb:533
-msgid "Ask for resolution during boot."
-msgstr ""
-
-#. radio button
-#: src/include/bootloader/routines/section_widgets.rb:573
-msgid "Clone Selected Section"
-msgstr "Clone Selected Section"
-
-#. radio button (don't translate 'chainloader')
-#: src/include/bootloader/routines/section_widgets.rb:587
-msgid "Other System (Chainloader)"
-msgstr "Other System (Chainloader)"
-
-#. frame
-#: src/include/bootloader/routines/section_widgets.rb:609
-msgid "Section Type"
-msgstr "Section Type"
-
-#. text entry
-#: src/include/bootloader/routines/section_widgets.rb:668
-msgid "Section &Name"
-msgstr "Section &Name"
-
 #. error report
 #: src/include/bootloader/routines/wizards.rb:36
 #, fuzzy
@@ -1982,107 +1167,73 @@
 
 #. FATE#303643 Enable one-click changes in bootloader proposal
 #.
-#.
-#. FIXME identical code in BootGRUB module
-#: src/modules/BootGRUB.rb:657 src/modules/BootGRUB2.rb:189
+#: src/modules/BootGRUB2.rb:193
 #, fuzzy
 msgid "Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not install</a>)"
 msgstr "Firewall is enabled (<a href=\"firewall--disable_firewall_in_proposal\">disable</a>)"
 
-#: src/modules/BootGRUB.rb:661 src/modules/BootGRUB2.rb:193
+#: src/modules/BootGRUB2.rb:197
 #, fuzzy
 msgid "Do not install bootcode into MBR (<a href=\"enable_boot_mbr\">install</a>)"
 msgstr "Firewall is disabled (<a href=\"firewall--enable_firewall_in_proposal\">enable</a>)"
 
 #. check for separated boot partition, use root otherwise
-#. check for separated boot partition, use root otherwise
-#: src/modules/BootGRUB.rb:673 src/modules/BootGRUB2.rb:206
+#: src/modules/BootGRUB2.rb:210
 #, fuzzy
 msgid "Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do not install</a>)"
 msgstr "Firewall is enabled (<a href=\"firewall--disable_firewall_in_proposal\">disable</a>)"
 
-#: src/modules/BootGRUB.rb:677 src/modules/BootGRUB2.rb:210
+#: src/modules/BootGRUB2.rb:214
 #, fuzzy
 msgid "Do not install bootcode into /boot partition (<a href=\"enable_boot_boot\">install</a>)"
 msgstr "Firewall is enabled (<a href=\"firewall--disable_firewall_in_proposal\">disable</a>)"
 
-#: src/modules/BootGRUB.rb:683 src/modules/BootGRUB2.rb:216
+#: src/modules/BootGRUB2.rb:220
 #, fuzzy
 msgid "Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do not install</a>)"
 msgstr "Firewall is enabled (<a href=\"firewall--disable_firewall_in_proposal\">disable</a>)"
 
-#: src/modules/BootGRUB.rb:687 src/modules/BootGRUB2.rb:220
+#: src/modules/BootGRUB2.rb:224
 #, fuzzy
 msgid "Do not install bootcode into \"/\" partition (<a href=\"enable_boot_root\">install</a>)"
 msgstr "Firewall is disabled (<a href=\"firewall--enable_firewall_in_proposal\">enable</a>)"
 
+#. no location chosen, so warn user that it is problem unless he is sure
+#: src/modules/BootGRUB2.rb:234
+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/modules/BootGRUB.rb:695 src/modules/BootGRUB2.rb:238
+#: src/modules/BootGRUB2.rb:242
 #, fuzzy
 msgid "Change Location: %s"
 msgstr "Location: %1"
 
-#. summary text, %1 is bootloader name (eg. LILO)
 #. Display bootloader summary
 #. @return a list of summary lines
 #. Display bootloader summary
 #. @return a list of summary lines
-#: src/modules/BootGRUB.rb:708 src/modules/BootGRUB2.rb:248
-#: src/modules/BootGRUB2EFI.rb:94
+#: src/modules/BootGRUB2.rb:252 src/modules/BootGRUB2EFI.rb:96
 msgid "Boot Loader Type: %1"
 msgstr "Boot Loader Type: %1"
 
-#. summary text, location is location description (eg. /dev/hda)
-#: src/modules/BootGRUB.rb:718
-msgid " (\"/boot\")"
-msgstr ""
-
 #. TRANSLATORS: extended is here for extended partition. Keep translation short.
-#: src/modules/BootGRUB.rb:724 src/modules/BootGRUB2.rb:259
+#: src/modules/BootGRUB2.rb:263
 msgid " (extended)"
 msgstr ""
 
-#: src/modules/BootGRUB.rb:730
-msgid " (\"/\")"
-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/modules/BootGRUB.rb:736 src/modules/BootGRUB2.rb:267
+#: src/modules/BootGRUB2.rb:271
 msgid " (MBR)"
 msgstr ""
 
-#. FIXME: should we translate all devices to names and add MBR suffixes?
-#: src/modules/BootGRUB.rb:750 src/modules/BootGRUB2.rb:274
+#: src/modules/BootGRUB2.rb:278
 #, fuzzy
 msgid "Status Location: %1"
 msgstr "Location: %1"
 
-#. section name "suffix" for default section
-#: src/modules/BootGRUB.rb:768
-msgid " (default)"
-msgstr " (default)"
-
-#: src/modules/BootGRUB.rb:779
-msgid "Sections:<br>%1"
-msgstr "Sections:<br>%1"
-
-#. summary text
-#: src/modules/BootGRUB.rb:788
-msgid "Do not install boot loader; just create configuration files"
-msgstr "Do not install boot loader; just create configuration files"
-
-#. menubutton item, keep as short as possible
-#: src/modules/BootGRUB.rb:919
-msgid "Propose and &Merge with Existing GRUB Menus"
-msgstr "Propose and &Merge with Existing GRUB Menus"
-
-#. no location chosen, so warn user that it is problem unless he is sure
-#: src/modules/BootGRUB2.rb:230
-msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
-msgstr ""
-
-#: src/modules/BootGRUB2EFI.rb:102
+#: src/modules/BootGRUB2EFI.rb:104
 #, fuzzy
 #| msgid "Enable &GSS Security"
 msgid "Enable Secure Boot: %1"
@@ -2099,113 +1250,579 @@
 msgid "Unsupported combination of hardware platform %1 and bootloader %2"
 msgstr ""
 
-#. TODO add more devices
-#: src/modules/BootSupportCheck.rb:128
-msgid "Partition number > 3 is being used for booting with GPT partition table"
-msgstr ""
-
 #. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation.
-#: src/modules/BootSupportCheck.rb:153
+#: src/modules/BootSupportCheck.rb:140
 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."
 msgstr ""
 
 #. check if boot device is on raid0
-#: src/modules/BootSupportCheck.rb:181
+#: src/modules/BootSupportCheck.rb:168
 #, fuzzy
 msgid "The boot device is on raid type: %1. System will not boot."
 msgstr "No boot device was found"
 
 #. bnc#501043 added check for valid configuration
-#: src/modules/BootSupportCheck.rb:201
+#: src/modules/BootSupportCheck.rb:188
 msgid "The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record"
 msgstr ""
 
-#. s390 do not have bios boot order (bnc#874106)
-#: src/modules/BootSupportCheck.rb:256
-msgid "YaST could not determine the exact boot order of disks needed for the device map. Review and possibly adjust the boot order of disks in \"Boot Loader Installation Details\""
-msgstr ""
-
 #. if partitioning worked before upgrade, it will keep working (bnc#886604)
-#: src/modules/BootSupportCheck.rb:276
+#: src/modules/BootSupportCheck.rb:244
 msgid "Missing ext partition for booting. Cannot install boot code."
 msgstr ""
 
 #. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:170
+#: src/modules/Bootloader.rb:159
 msgid "Check boot loader"
 msgstr "Check boot loader"
 
 #. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:172
+#: src/modules/Bootloader.rb:161
 msgid "Read partitioning"
 msgstr "Read partitioning"
 
 #. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:174
+#: src/modules/Bootloader.rb:163
 msgid "Load boot loader settings"
 msgstr "Load boot loader settings"
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:178
+#: src/modules/Bootloader.rb:167
 msgid "Checking boot loader..."
 msgstr "Checking boot loader..."
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:180
+#: src/modules/Bootloader.rb:169
 msgid "Reading partitioning..."
 msgstr "Reading partitioning..."
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:182
+#: src/modules/Bootloader.rb:171
 msgid "Loading boot loader settings..."
 msgstr "Loading boot loader settings..."
 
 #. dialog header
-#: src/modules/Bootloader.rb:186
+#: src/modules/Bootloader.rb:175
 msgid "Initializing Boot Loader Configuration"
 msgstr "Initialising Boot Loader Configuration"
 
-#. part of summary, %1 is a part of kernel command line
-#: src/modules/Bootloader.rb:307
-msgid "Added Kernel Parameters: %1"
-msgstr "Added Kernel Parameters: %1"
-
 #. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:367
+#: src/modules/Bootloader.rb:322
 msgid "Create initrd"
 msgstr "Create initrd"
 
 #. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:369
+#: src/modules/Bootloader.rb:324
 msgid "Save boot loader configuration files"
 msgstr "Save boot loader configuration files"
 
 #. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:371
+#: src/modules/Bootloader.rb:326
 msgid "Install boot loader"
 msgstr "Install boot loader"
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:375
+#: src/modules/Bootloader.rb:330
 msgid "Creating initrd..."
 msgstr "Creating initrd..."
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:377
+#: src/modules/Bootloader.rb:332
 msgid "Saving boot loader configuration files..."
 msgstr "Saving boot loader configuration files..."
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:379
+#: src/modules/Bootloader.rb:334
 msgid "Installing boot loader..."
 msgstr "Installing boot loader..."
 
 #. progress line
-#: src/modules/Bootloader.rb:385
+#: src/modules/Bootloader.rb:340
 msgid "Saving Boot Loader Configuration"
 msgstr "Saving Boot Loader Configuration"
 
+#~ msgid "Delete a global option or option of a section"
+#~ msgstr "Delete a global option or option of a section"
+
+#~ msgid "Set a global option or option of a section"
+#~ msgstr "Set a global option or option of a section"
+
+#~ msgid "The name of the section"
+#~ msgstr "The name of the section"
+
+#~ msgid "Section %1 not found."
+#~ msgstr "Section %1 not found."
+
+#~ msgid "Section name must be specified."
+#~ msgstr "Section name must be specified."
+
+#~ msgid "Disk Order"
+#~ msgstr "Disk Order"
+
 #, fuzzy
+#~ msgid "Disk order settings"
+#~ msgstr "Filter settings"
+
+#~ msgid "Boot Menu"
+#~ msgstr "Boot Menu"
+
+#~ msgid "<p><b>Graphical Menu File</b> defines the file to use for the graphical boot menu.</p>"
+#~ msgstr "<p><b>Graphical Menu File</b> defines the file to use for the graphical boot menu.</p>"
+
+#, fuzzy
+#~ msgid "Graphical &Menu File"
+#~ msgstr "Graphical Menu File"
+
+#, fuzzy
+#~ msgid "Choose new graphical menu file"
+#~ msgstr "Graphical Menu File"
+
+#, fuzzy
+#~ msgid "Enable Acoustic &Signals"
+#~ msgstr "&Enable Authentication"
+
+#~ msgid "&Device"
+#~ msgstr "&Device"
+
+#, fuzzy
+#~ msgid "Device map must contain at least one device"
+#~ msgstr "A class must contain at least one printer."
+
+#~ msgid "D&isks"
+#~ msgstr "D&isks"
+
+#~ msgid "&Up"
+#~ msgstr "&Up"
+
+#~ msgid "&Down"
+#~ msgstr "&Down"
+
+#~ msgid "Kernel Section"
+#~ msgstr "Kernel Section"
+
+#~ msgid "Section Settings"
+#~ msgstr "Section Settings"
+
+#~ msgid "Boot Loader Settings: Section Management"
+#~ msgstr "Boot Loader Settings: Section Management"
+
+#~ msgid "Xen Section"
+#~ msgstr "Xen Section"
+
+#~ msgid "Menu Section"
+#~ msgstr "Menu Section"
+
+#, fuzzy
+#~ msgid "Dump Section"
+#~ msgstr "Menu Section"
+
+#~ msgid "Other System Section"
+#~ msgstr "Other System Section"
+
+#~ msgid "&Filename"
+#~ msgstr "&Filename"
+
+#~ msgid "Filename: %1"
+#~ msgstr "Filename: %1"
+
+#~ msgid "Fi&le Contents"
+#~ msgstr "Fi&le Contents"
+
+#~ msgid "Expert Manual Configuration"
+#~ msgstr "Expert Manual Configuration"
+
+#~ msgid "Image"
+#~ msgstr "Image"
+
+#~ msgid "Floppy"
+#~ msgstr "Floppy"
+
+#, fuzzy
+#~ msgid "Menu"
+#~ msgstr "Boot Menu"
+
+#~ msgid "Def."
+#~ msgstr "Def."
+
+#~ msgid "Label"
+#~ msgstr "Label"
+
+#~ msgid "Type"
+#~ msgstr "Type"
+
+#~ msgid "Image / Device"
+#~ msgstr "Image / Device"
+
+#~ msgid "Set as De&fault"
+#~ msgstr "Set as De&fault"
+
+#~ msgid ""
+#~ "\n"
+#~ "You chose to change your boot loader. When converting \n"
+#~ "the configuration, some settings might be lost.\n"
+#~ "\n"
+#~ "The current configuration will be saved and you can\n"
+#~ "restore it if you return to the current boot loader.\n"
+#~ "\n"
+#~ "Select a course of action:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "You chose to change your boot loader. When converting \n"
+#~ "the configuration, some settings might be lost.\n"
+#~ "\n"
+#~ "The current configuration will be saved and you can\n"
+#~ "restore it if you return to the current boot loader.\n"
+#~ "\n"
+#~ "Select a course of action:\n"
+
+#~ msgid "Co&nvert Current Configuration"
+#~ msgstr "Co&nvert Current Configuration"
+
+#~ msgid "&Start New Configuration from Scratch"
+#~ msgstr "&Start New Configuration from Scratch"
+
+#~ msgid "&Read Configuration Saved on Disk"
+#~ msgstr "&Read Configuration Saved on Disk"
+
+#~ msgid "Res&tore Configuration Saved before Conversion"
+#~ msgstr "Res&tore Configuration Saved before Conversion"
+
+#~ msgid "Select the boot loader before editing sections."
+#~ msgstr "Select the boot loader before editing sections."
+
+#~ msgid "&Section Management"
+#~ msgstr "&Section Management"
+
+#~ msgid "Boot Loader &Installation"
+#~ msgstr "Boot Loader &Installation"
+
+#~ msgid ""
+#~ "If you have multiple Linux systems installed,\n"
+#~ "YaST can try to find them and merge their menus."
+#~ msgstr ""
+#~ "If you have multiple Linux systems installed,\n"
+#~ "YaST can try to find them and merge their menus."
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "- On a <b>Floppy Disk</b>.\n"
+#~ "Use this to avoid the risk of interfering with an already existing\n"
+#~ "boot mechanism. Enable booting from floppy disk in\n"
+#~ "the BIOS of your machine to use this option.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "- On a <b>Floppy Disk</b>.\n"
+#~ "Use this to avoid the risk of interfering with an already existing\n"
+#~ "boot mechanism. Enable booting from floppy disk in\n"
+#~ "the BIOS of your machine to use this option.</p>"
+
+#~ msgid "The %1 boot sector has been written to the floppy disk."
+#~ msgstr "The %1 boot sector has been written to the floppy disk."
+
+#~ msgid "Leave the floppy disk in the drive."
+#~ msgstr "Leave the floppy disk in the drive."
+
+#~ msgid "Really delete section %1?"
+#~ msgstr "Really delete section %1?"
+
+#~ msgid ""
+#~ "The disk settings have changed.\n"
+#~ "Check section %1 settings.\n"
+#~ msgstr ""
+#~ "The disk settings have changed.\n"
+#~ "Check section %1 settings.\n"
+
+#~ msgid ""
+#~ "The disk settings have changed and you edited boot loader\n"
+#~ "configuration files manually. Check the boot loader settings.\n"
+#~ msgstr ""
+#~ "The disk settings have changed and you edited boot loader\n"
+#~ "configuration files manually. Check the boot loader settings.\n"
+
+#~ msgid "Do Not Create a File System"
+#~ msgstr "Do Not Create a File System"
+
+#~ msgid "Create an ext2 File System"
+#~ msgstr "Create an ext2 File System"
+
+#~ msgid "Create a FAT File System"
+#~ msgstr "Create a FAT File System"
+
+#~ msgid ""
+#~ "The boot loader boot sector will be written\n"
+#~ "to a floppy disk. Insert a floppy disk\n"
+#~ "and confirm with OK.\n"
+#~ msgstr ""
+#~ "The boot loader boot sector will be written\n"
+#~ "to a floppy disk. Insert a floppy disk\n"
+#~ "and confirm with OK.\n"
+
+#~ msgid "&Low Level Format"
+#~ msgstr "&Low Level Format"
+
+#~ msgid "&Create File System"
+#~ msgstr "&Create File System"
+
+#~ msgid "Low level format failed. Try again?"
+#~ msgstr "Low level format failed. Try again?"
+
+#~ msgid "Creating file system failed."
+#~ msgstr "Creating file system failed."
+
+#~ msgid "Unable to install the boot loader."
+#~ msgstr "Unable to install the boot loader."
+
+#~ msgid "<p><b>Image Section</b></p>"
+#~ msgstr "<p><b>Image Section</b></p>"
+
+#, fuzzy
+#~ msgid "<p><b>Kernel Image</b> defines the kernel to boot. Either enter the name directly or choose via <b>Browse</b>.</p>"
+#~ msgstr "<p><b>Kernel Image</b> defines the kernel to boot. Either enter the name directly or choose via <b>Browse</b></p>"
+
+#~ msgid "<p><b>Root Device</b> sets the device to pass to the kernel as root device.</p>"
+#~ msgstr "<p><b>Root Device</b> sets the device to pass to the kernel as root device.</p>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p><b>Initial RAM Disk</b>, if not empty, defines the initial ramdisk to use. Either enter the path and file name\n"
+#~ "directly or choose by using <b>Browse</b>.</p>\n"
+#~ msgstr ""
+#~ "<p><b>Initial RAM Disk</b>, if non-empty, defines the initial ramdisk to use. Either enter the path and file name\n"
+#~ "directly or choose by using <b>Browse</b></p>"
+
+#, fuzzy
+#~ msgid "<p>Select <b>Chainloader Section</b> if you want to define a section for booting an OS other than Linux.</p>"
+#~ msgstr "<p>Select <b>Chainloader Section</b> if you want to define a section for booting an OS other than Linux</p>"
+
+#, fuzzy
+#~ msgid "<p>Setting <b>Use Password Protection</p> will require a password to select this section.</p>"
+#~ msgstr "<p>Setting <b>Use Password Protection</p> will require a password to select this section</p>"
+
+#~ msgid "<p><b>Other System</b> lets you choose among the non-Linux operating systems found on your computer.</p>"
+#~ msgstr "<p><b>Other System</b> lets you choose among the non-Linux operating systems found on your computer.</p>"
+
+#~ msgid "<p>Select <b>Activate this Partition when selected for Boot</b> if your BIOS needs this flag set in order to boot it</p>"
+#~ msgstr "<p>Select <b>Activate this Partition when selected for Boot</b> if your BIOS needs this flag set in order to boot it</p>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p><b>Block Offset for Chainloading</b> lets you specify the list of blocks to boot. In most cases you want\n"
+#~ "to specify <code>+1</code> here. For specifics on blocklist notation see the grub documentation.</p>\n"
+#~ msgstr ""
+#~ "<p><b>Block Offset for Chainloading</b> lets you specify the list of blocks to boot. In most cases you want\n"
+#~ "to specify <code>+1</code> here. For specifics on blocklist notation see the grub documentation</p>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p>Select <b>Xen Section</b> if you want to add a new Linux kernel or other image \n"
+#~ "and start it in a Xen environment.</p>\n"
+#~ msgstr ""
+#~ "<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n"
+#~ "but to start it in a XEN environment.</p>"
+
+#~ msgid "<p><b>Hypervisor</b> specifies the Hypervisor to use.</p>"
+#~ msgstr "<p><b>Hypervisor</b> specifies the Hypervisor to use.</p>"
+
+#, fuzzy
+#~ msgid "<p><b>Additional Xen Hypervisor Parameters</b> lets you define additional parameters to pass to the xen hypervisor.</p>"
+#~ msgstr "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel</p>"
+
+#~ msgid "<p><b>Menu Section</b></p>"
+#~ msgstr "<p><b>Menu Section</b></p>"
+
+#~ msgid "<p><b>Partition of Menu File</b></p>"
+#~ msgstr "<p><b>Partition of Menu File</b></p>"
+
+#, fuzzy
+#~| msgid ""
+#~| "<p><b>Min Object Size</b> specifies the minimum object size below which\n"
+#~| "will not be saved to the disk.</p>"
+#~ msgid "<p><b>Menu Description File</b> specifies path on root device from which is loaded menu file.</p>"
+#~ msgstr ""
+#~ "<p><b>Min Object Size</b> specifies the minimum object size below which\n"
+#~ "will not be saved to the disk.</p>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p><b>Allow attempt to relocate</b>\n"
+#~ "Usually specified in global section</p>"
+#~ msgstr ""
+#~ "<p><b>Allow attempt to relocate</b></p>\n"
+#~ "Usually specified in global section</p>"
+
+#~ msgid ""
+#~ "<p><b>Force root filesystem to be mounted read-only</b><br>\n"
+#~ "Usually specified in global section</p>"
+#~ msgstr ""
+#~ "<p><b>Force root filesystem to be mounted read-only</b><br>\n"
+#~ "Usually specified in global section</p>"
+
+#~ msgid ""
+#~ "<p>Select <b>Dump Section</b> to add a section that specifies how to\n"
+#~ "create a system dump either on a DASD disk partition or tape device or to a\n"
+#~ "file on a SCSI disk partition.</p>"
+#~ msgstr ""
+#~ "<p>Select <b>Dump Section</b> to add a section that specifies how to\n"
+#~ "create a system dump either on a DASD disk partition or tape device or to a\n"
+#~ "file on a SCSI disk partition.</p>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p>Select <b>Menu Section</b> to add a new menu to the configuration.\n"
+#~ "Menu sections represent a list of tasks which are grouped together.</p>\n"
+#~ msgstr ""
+#~ "<p>Select <b>Menu Section</b> to add a new menu to the configuration.\n"
+#~ "Menu sections represent a list of tasks which are grouped together</p>"
+
+#~ msgid "Image Section"
+#~ msgstr "Image Section"
+
+#~ msgid "&Kernel Image"
+#~ msgstr "&Kernel Image"
+
+#, fuzzy
+#~ msgid "&Root Device"
+#~ msgstr "Root Device"
+
+#~ msgid "&Initial RAM Disk"
+#~ msgstr "&Initial RAM Disk"
+
+#~ msgid "Chainloader Section"
+#~ msgstr "Chainloader Section"
+
+#~ msgid "Use Password Protection"
+#~ msgstr "Use Password Protection"
+
+#, fuzzy
+#~ msgid "&Other System"
+#~ msgstr "Other System"
+
+#, fuzzy
+#~ msgid "Do not &verify Filesystem before Booting"
+#~ msgstr "Do not verify Filesystem before Booting"
+
+#, fuzzy
+#~ msgid "&Activate this Partition when selected for Boot"
+#~ msgstr "Activate this Partition when selected for Boot"
+
+#, fuzzy
+#~ msgid "B&lock Offset for Chainloading"
+#~ msgstr "Block Offset for Chainloading"
+
+#, fuzzy
+#~ msgid "&Hypervisor"
+#~ msgstr "Hypervisor"
+
+#, fuzzy
+#~ msgid "&Additional Xen Hypervisor Parameters"
+#~ msgstr "Additional Xen Hypervisor Parameters"
+
+#, fuzzy
+#~ msgid "&Partition of Menu File"
+#~ msgstr "Partition of Menu File"
+
+#, fuzzy
+#~ msgid "&Menu Description File"
+#~ msgstr "Menu Description File"
+
+#, fuzzy
+#~ msgid "&Force root filesystem to be mounted read-only"
+#~ msgstr "Force root filesystem to be mounted read-only"
+
+#, fuzzy
+#~ msgid "Allow attempt to &relocate"
+#~ msgstr "Allow attempt to relocate"
+
+#, fuzzy
+#~ msgid "Tar&get Directory for Section"
+#~ msgstr "Target Directory for Dump Section"
+
+#, fuzzy
+#~ msgid "Op&tional Parameter File"
+#~ msgstr "Optional Parameter File"
+
+#~ msgid "Dump Section (obsolete)"
+#~ msgstr "Dump Section (obsolete)"
+
+#~ msgid "&Dump Device"
+#~ msgstr "&Dump Device"
+
+#, fuzzy
+#~ msgid "&SCSI Dump Device"
+#~ msgstr "SCSI Dump Device"
+
+#, fuzzy
+#~ msgid "&List of Menu Entries"
+#~ msgstr "List of Menu Entries"
+
+#, fuzzy
+#~ msgid "&Number of Default Entry"
+#~ msgstr "Number of Default Entry"
+
+#, fuzzy
+#~ msgid "&Timeout in seconds"
+#~ msgstr "Timeout in seconds"
+
+#, fuzzy
+#~ msgid "&Show boot menu"
+#~ msgstr "Show boot menu"
+
+#, fuzzy
+#~ msgid "C&opy Image to Boot Partition"
+#~ msgstr "Copy Image to Boot Partition"
+
+#, fuzzy
+#~ msgid "&Skip Section gracefully on Errors"
+#~ msgstr "Skip Section gracefully on Errors"
+
+#, fuzzy
+#~ msgid "Boot &Partition of Other System"
+#~ msgstr "Boot Partition of Other System"
+
+#, fuzzy
+#~ msgid "Image file doesn't exist now. Do you really want use it?"
+#~ msgstr ""
+#~ "Archive %1 already exists.\n"
+#~ "Do you really want to overwrite it?"
+
+#, fuzzy
+#~ msgid "Initrd file doesn't exist now. Do you really want use it?"
+#~ msgstr ""
+#~ "Archive %1 already exists.\n"
+#~ "Do you really want to overwrite it?"
+
+#, fuzzy
+#~ msgid "Enable &SELinux"
+#~ msgstr "Enable &TLS"
+
+#~ msgid "Clone Selected Section"
+#~ msgstr "Clone Selected Section"
+
+#~ msgid "Other System (Chainloader)"
+#~ msgstr "Other System (Chainloader)"
+
+#~ msgid "Section Type"
+#~ msgstr "Section Type"
+
+#~ msgid "Section &Name"
+#~ msgstr "Section &Name"
+
+#~ msgid " (default)"
+#~ msgstr " (default)"
+
+#~ msgid "Sections:<br>%1"
+#~ msgstr "Sections:<br>%1"
+
+#~ msgid "Do not install boot loader; just create configuration files"
+#~ msgstr "Do not install boot loader; just create configuration files"
+
+#~ msgid "Propose and &Merge with Existing GRUB Menus"
+#~ msgstr "Propose and &Merge with Existing GRUB Menus"
+
+#~ msgid "Added Kernel Parameters: %1"
+#~ msgstr "Added Kernel Parameters: %1"
+
+#, fuzzy
 #~ msgid "The boot device is on iSCSI disk: %1. System may not boot."
 #~ msgstr "No boot device was found"
 

Modified: trunk/yast/en_GB/po/cluster.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/cluster.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/cluster.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2001-07-17 16:27+0200\n"
 "Last-Translator: James Ogley <ogley@suse.co.uk>\n"
 "Language-Team: English <i18n@suse.de>\n"
@@ -112,10 +112,62 @@
 msgid "Redundant IP Address"
 msgstr "Remote Address:"
 
-#: src/include/cluster/dialogs.rb:115
-msgid "nodeid"
+#: src/include/cluster/dialogs.rb:115 src/include/cluster/dialogs.rb:499
+#, fuzzy
+#| msgid "Node List"
+msgid "Node ID"
+msgstr "Node List"
+
+#. Set need to require 'set'
+#: src/include/cluster/dialogs.rb:163
+msgid "Node ID has to be fulfilled with a positive integer"
 msgstr ""
 
+#: src/include/cluster/dialogs.rb:170
+#, fuzzy
+#| msgid "The hardware address must be unique."
+msgid "Node ID must be unique"
+msgstr "The hardware address must be unique."
+
+#. BNC#871970, change member address struct
+#: src/include/cluster/dialogs.rb:191 src/include/cluster/dialogs.rb:245
+#, fuzzy
+#| msgid "Network &Address:"
+msgid "The Bind Network Address has to be fulfilled"
+msgstr "Network &Address:"
+
+#: src/include/cluster/dialogs.rb:197
+msgid "The cluster name has to be fulfilled"
+msgstr ""
+
+#: src/include/cluster/dialogs.rb:214
+#, fuzzy
+#| msgid "The hardware address must be defined."
+msgid "The Member Address has to be fulfilled"
+msgstr "The hardware address must be defined."
+
+#. BNC#880242, expected_votes must have value when "udp"
+#: src/include/cluster/dialogs.rb:220
+#, fuzzy
+#| msgid "Play the test sound when the card is configured"
+msgid "The Expected Votes has to be fulfilled when udp is configured"
+msgstr "Play the test sound when the card is configured"
+
+#: src/include/cluster/dialogs.rb:226 src/include/cluster/dialogs.rb:254
+#: src/include/cluster/dialogs.rb:1463
+msgid "The Multicast Address has to be fulfilled"
+msgstr ""
+
+#: src/include/cluster/dialogs.rb:236 src/include/cluster/dialogs.rb:264
+#, fuzzy
+#| msgid "The value for pos must be a positive integer."
+msgid "The Multicast port must be a positive integer"
+msgstr "The value for pos must be a positive integer."
+
+#: src/include/cluster/dialogs.rb:270
+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:439
 #, fuzzy
@@ -123,201 +175,234 @@
 msgid "Transport:"
 msgstr "Transport"
 
-#: src/include/cluster/dialogs.rb:444
+#: src/include/cluster/dialogs.rb:447
 msgid "Channel"
 msgstr "Channel"
 
-#: src/include/cluster/dialogs.rb:449 src/include/cluster/dialogs.rb:470
+#: src/include/cluster/dialogs.rb:452 src/include/cluster/dialogs.rb:473
 #, fuzzy
 #| msgid "Network &Address:"
 msgid "Bind Network Address:"
 msgstr "Network &Address:"
 
-#: src/include/cluster/dialogs.rb:455 src/include/cluster/dialogs.rb:473
-#: src/include/cluster/dialogs.rb:1396
+#: src/include/cluster/dialogs.rb:458 src/include/cluster/dialogs.rb:476
+#: src/include/cluster/dialogs.rb:1399
 #, fuzzy
 #| msgid "Last IP Address:"
 msgid "Multicast Address:"
 msgstr "Last IP Address:"
 
-#: src/include/cluster/dialogs.rb:457 src/include/cluster/dialogs.rb:474
+#: src/include/cluster/dialogs.rb:460 src/include/cluster/dialogs.rb:477
 #, fuzzy
 #| msgid "Multicast"
 msgid "Multicast Port:"
 msgstr "Multicast"
 
-#: src/include/cluster/dialogs.rb:464
+#: src/include/cluster/dialogs.rb:467
 #, fuzzy
 #| msgid "R&ead Channel"
 msgid "Redundant Channel"
 msgstr "R&ead Channel"
 
-#: src/include/cluster/dialogs.rb:480
+#: src/include/cluster/dialogs.rb:483
 #, fuzzy
 #| msgid "Clustering"
 msgid "Cluster Name:"
 msgstr "Clustering"
 
-#: src/include/cluster/dialogs.rb:481
+#: src/include/cluster/dialogs.rb:484
 #, fuzzy
 #| msgid "Expected MD5: %1"
 msgid "Expected Votes:"
 msgstr "Expected MD5: %1"
 
-#: src/include/cluster/dialogs.rb:485
+#: src/include/cluster/dialogs.rb:488
 msgid "rrp mode:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:490
+#: src/include/cluster/dialogs.rb:493
 msgid "Auto Generate Node ID"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:495
+#: src/include/cluster/dialogs.rb:498
 #, fuzzy
 #| msgid "Remote Address:"
 msgid "Member Address:"
 msgstr "Remote Address:"
 
+#: src/include/cluster/dialogs.rb:499
+msgid "IP"
+msgstr "IP"
+
+#: src/include/cluster/dialogs.rb:499
+#, fuzzy
+#| msgid "Remote Address:"
+msgid "Redundant IP"
+msgstr "Remote Address:"
+
+#. BNC#879596, check the corosync.conf format
+#: src/include/cluster/dialogs.rb:539
+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:731
+#: src/include/cluster/dialogs.rb:690
+msgid "Number of threads must be integer"
+msgstr ""
+
+#: src/include/cluster/dialogs.rb:696
+msgid "Number of threads must larger then 0"
+msgstr ""
+
+#: src/include/cluster/dialogs.rb:734
 #, fuzzy
 #| msgid "Enable &GSS Security"
 msgid "Enable Security Auth"
 msgstr "Enable &GSS Security"
 
-#: src/include/cluster/dialogs.rb:734
+#: src/include/cluster/dialogs.rb:737
 msgid "Threads:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:737
+#: src/include/cluster/dialogs.rb:740
 msgid "For a newly created cluster, push the button below to generate /etc/corosync/authkey."
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:742
+#: src/include/cluster/dialogs.rb:745
 msgid "To join an existing cluster, please copy /etc/corosync/authkey from other nodes manually."
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:847 src/include/cluster/dialogs.rb:917
+#: src/include/cluster/dialogs.rb:773
+msgid "Failed to create /etc/corosync/authkey"
+msgstr ""
+
+#: src/include/cluster/dialogs.rb:775
+msgid "Create /etc/corosync/authkey succeeded"
+msgstr ""
+
+#: src/include/cluster/dialogs.rb:850 src/include/cluster/dialogs.rb:920
 msgid "Running"
 msgstr "Running"
 
-#: src/include/cluster/dialogs.rb:849
+#: src/include/cluster/dialogs.rb:852
 msgid "Not running"
 msgstr "Not running"
 
 #. servie:cluster is the  name of /etc/sysconfig/SuSEfirewall2.d/services/cluster
-#: src/include/cluster/dialogs.rb:885
+#: src/include/cluster/dialogs.rb:888
 msgid "Booting"
 msgstr "Booting"
 
-#: src/include/cluster/dialogs.rb:895
+#: src/include/cluster/dialogs.rb:898
 #, fuzzy
 #| msgid "On -- Start Service when Booting"
-msgid "On -- Start pacemaker at booting"
+msgid "On -- Start pacemaker during boot"
 msgstr "On -- Start Service when Booting"
 
-#: src/include/cluster/dialogs.rb:902
+#: src/include/cluster/dialogs.rb:905
 #, fuzzy
 #| msgid "Off -- Start Service Manually"
-msgid "Off -- Start pacemaker manually only"
+msgid "Off -- Start pacemaker manually"
 msgstr "Off -- Start Service Manually"
 
-#: src/include/cluster/dialogs.rb:911
+#: src/include/cluster/dialogs.rb:914
 msgid "Switch On and Off"
 msgstr "Switch On and Off"
 
-#: src/include/cluster/dialogs.rb:916
+#: src/include/cluster/dialogs.rb:919
 msgid "Current Status: "
 msgstr "Current Status: "
 
-#: src/include/cluster/dialogs.rb:925
+#: src/include/cluster/dialogs.rb:928
 #, fuzzy
 #| msgid "Start Squid Now"
 msgid "Start pacemaker Now"
 msgstr "Start Squid Now"
 
-#: src/include/cluster/dialogs.rb:926
+#: src/include/cluster/dialogs.rb:929
 #, fuzzy
 #| msgid "Stop Firewall Now"
 msgid "Stop pacemaker Now"
 msgstr "Stop Firewall Now"
 
 #. BNC#874563,stop pacemaker could stop corosync since BNC#872651 is fixed
-#: src/include/cluster/dialogs.rb:1024
+#: src/include/cluster/dialogs.rb:1027
 #, fuzzy
 #| msgid "Main Host"
 msgid "Sync Host"
 msgstr "Main Host"
 
-#: src/include/cluster/dialogs.rb:1028 src/include/cluster/dialogs.rb:1040
+#: src/include/cluster/dialogs.rb:1031 src/include/cluster/dialogs.rb:1043
 msgid "Add"
 msgstr "Add"
 
-#: src/include/cluster/dialogs.rb:1029 src/include/cluster/dialogs.rb:1041
+#: src/include/cluster/dialogs.rb:1032 src/include/cluster/dialogs.rb:1044
 #, fuzzy
 #| msgid "Delay"
 msgid "Del"
 msgstr "Delay"
 
-#: src/include/cluster/dialogs.rb:1030 src/include/cluster/dialogs.rb:1042
+#: src/include/cluster/dialogs.rb:1033 src/include/cluster/dialogs.rb:1045
 msgid "Edit"
 msgstr "Edit"
 
-#: src/include/cluster/dialogs.rb:1036
+#: src/include/cluster/dialogs.rb:1039
 #, fuzzy
 #| msgid "Select File"
 msgid "Sync File"
 msgstr "Select File"
 
-#: src/include/cluster/dialogs.rb:1043
+#: src/include/cluster/dialogs.rb:1046
 #, fuzzy
 #| msgid "Suggested fstab Lines"
 msgid "Add Suggested Files"
 msgstr "Suggested fstab Lines"
 
-#: src/include/cluster/dialogs.rb:1052
+#: src/include/cluster/dialogs.rb:1055
 msgid "Generate Pre-Shared-Keys"
 msgstr ""
 
 #. remove duplicated elements
-#: src/include/cluster/dialogs.rb:1176
+#: src/include/cluster/dialogs.rb:1179
 msgid "Csync2 Status Unknown"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1179
+#: src/include/cluster/dialogs.rb:1182
 msgid "Turn csync2 ON"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1182
+#: src/include/cluster/dialogs.rb:1185
 msgid "Turn csync2 OFF"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1212
+#: src/include/cluster/dialogs.rb:1215
 #, fuzzy
 #| msgid "Enter a user name."
 msgid "Enter a hostname"
 msgstr "Enter a user name."
 
-#: src/include/cluster/dialogs.rb:1226
+#: src/include/cluster/dialogs.rb:1229
 #, fuzzy
 #| msgid "Write hostname"
 msgid "Edit the hostname"
 msgstr "Write hostname"
 
-#: src/include/cluster/dialogs.rb:1240
+#: src/include/cluster/dialogs.rb:1243
 #, fuzzy
 #| msgid "Enter a new name for the %1 profile."
 msgid "Enter a filename to synchronize"
 msgstr "Enter a new name for the %1 profile."
 
-#: src/include/cluster/dialogs.rb:1255
+#: src/include/cluster/dialogs.rb:1258
 #, fuzzy
 #| msgid "Enter the file name"
 msgid "Edit the filename"
 msgstr "Enter the file name"
 
 #. key file exist
-#: src/include/cluster/dialogs.rb:1287
+#: src/include/cluster/dialogs.rb:1290
 #, fuzzy
 #| msgid ""
 #| "File %1 already exists.\n"
@@ -330,56 +415,62 @@
 "Do you wish to overwrite it?"
 
 #. remove exist key file
-#: src/include/cluster/dialogs.rb:1297
+#: src/include/cluster/dialogs.rb:1300
 #, fuzzy
 #| msgid "Parsing the key file failed."
 msgid "Delete key file %1 failed."
 msgstr "Parsing the key file failed."
 
 #. generate key file
-#: src/include/cluster/dialogs.rb:1311
+#: src/include/cluster/dialogs.rb:1314
 msgid ""
 "Key file %1 is generated.\n"
 "Clicking \"Add Suggested Files\" button adds it to sync list."
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1318
+#: src/include/cluster/dialogs.rb:1321
 #, fuzzy
 #| msgid "Image creation failed."
 msgid "Key generation failed."
 msgstr "Image creation failed."
 
 #. SaveCsync2();
-#: src/include/cluster/dialogs.rb:1380
+#: src/include/cluster/dialogs.rb:1383
 msgid ""
 "Conntrackd is a daemon which helps to duplicate firewall status between cluster nodes.\n"
 "YaST can help to configure some basic aspects of conntrackd.\n"
 "You need to start it with the ocf:heartbeat:conntrackd."
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1391
+#: src/include/cluster/dialogs.rb:1394
 msgid "Dedicated Interface:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1394
+#: src/include/cluster/dialogs.rb:1397
 msgid "IP:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1397
+#: src/include/cluster/dialogs.rb:1400
 msgid "Group Number:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1401
+#: src/include/cluster/dialogs.rb:1404
 msgid "Generate /etc/conntrackd/conntrackd.conf"
 msgstr ""
 
+#: src/include/cluster/dialogs.rb:1471
+#, fuzzy
+#| msgid "The value for pos must be a positive integer."
+msgid "The Group Number must be a positive integer"
+msgstr "The value for pos must be a positive integer."
+
 #. All helps are here
 #: src/include/cluster/helps.rb:35
 msgid ""
 "<p><b><big>Bind Network Address</big></b><br>This  specifies  the  address which the openais executive should bind.  This address should always end in  zero.   If  the  totem traffic  should  be routed over 192.168.5.92, set bindnetaddr to 192.168.5.0.<br>This may also be an IPV6 address, in which case IPV6  networking will  be used.  In this case, the full address must be specified and there is no automatic selection  of  the  network  interface within a specific subnet as with IPv4. If IPv6 networking is used, the nodeid field must be specified.<br></p>\n"
 "<p><b><big>Multicast Address</big></b><br>This is the multicast address used by  openais  executive.   The default  should work for most networks, but the network administrator should be queried  about  a  multicast  address  to  use.  Avoid 224.x.x.x because this is a \"config\" multicast address.<br>This  may  also be an IPV6 multicast address, in which case IPV6 networking will be used.  If IPv6 networking is used, the nodeid field must be specified.</p>\n"
 "<p><b><big>Port</big></b><br>This  specifies  the UDP port number.  It is possible to use the same multicast address on a network with  the  openais  services configured for different UDP ports.<br></p>\n"
-"<p><b><big>Member Address</big></b><br>This list specifies all the nodes in the cluster by IP address. This could be configurable when using udpu <br></p>\n"
+"<p><b><big>Member Address</big></b><br>This list specifies all the nodes in the cluster by IP address. This could be configurable when using udpu(Unicast). <br></p>\n"
 "<p><b><big>Node ID</big></b><br>This  configuration  option  is  optional  when  using  IPv4 and required when using IPv6.  This is a 32 bit value specifying the node identifier delivered to the cluster membership service.  If this is not specified with IPv4, the node id will be  determined from  the  32  bit  IP address the system to which the system is bound with ring identifier of 0.  The node identifier  value  of zero is reserved and should not be used.<br></p>\n"
 "<p><b><big>rrp_mode</big></b><br>This specifies the mode of redundant ring, which  may  be  none, active,  or  passive.   Active replication offers slightly lower latency from transmit to delivery in faulty network environments but  with less performance.  Passive replication may nearly double the speed of the totem  protocol  if  the  protocol  doesn't become  cpu bound.  The final option is none, in which case only one network interface will be used to operate the  totem  protocol.  If  only one interface directive is specified, none is automatically chosen.  If multiple interface directives  are  specified, only active or passive may be chosen.<br></p>\n"
 "<p><b><big>Expected votes</big></b><br>Expect vote number for voting quorum.  Will be automatically calculated when the nodelist {} section is present in corosync.conf or can be specified in the quorum {} section.<br></p>\n"
@@ -390,7 +481,7 @@
 msgid ""
 "\n"
 "<p><b><big>Threads</big></b><br>This directive controls how many threads are used to encrypt and send multicast messages.  If secauth is off, the  protocol  will never  use  threaded  sending.  If secauth is on, this directive allows systems to be  configured  to  use  multiple  threads  to encrypt and send multicast messages.  A  thread  directive of 0 indicates that no threaded send should be used.  This mode offers best performance for non-SMP systems.  The default is 0. <br></p>\n"
-"<p><b><big>Enable Security Auth</big></b><br>This  specifies  that HMAC/SHA1 authentication should be used to authenticate all messages.  It further specifies that  all  data should  be  encrypted  with the sober128 encryption algorithm to protect data from eavesdropping.  Enabling this option adds a 36 byte header to every message sent by totem which reduces total throughput.  Encryption and authentication consume 75% of CPU cycles in aisexec as  measured  with gprof when enabled.  For  100mbit  networks  with  1500  MTU  frame  transmissions: A throughput of 9mb/sec is possible with 100% cpu utilization when this  option  is enabled on 3ghz cpus.  A throughput of 10mb/sec is possible wth 20% cpu utilization when this option is  disabled on 3ghz cpus.  For  gig-e networks with large frame transmissions: A throughput of 20mb/sec is possible when this  option  is  enabled  on  3ghz cpus.   A throughput of 60mb/sec is possible when this option is disabled on 3ghz cpus.  The default i
 s on. <br></p>\n"
+"<p><b><big>Enable Security Auth</big></b><br>This  specifies  that HMAC/SHA1 authentication should be used to authenticate all messages.  It further specifies that  all  data should  be  encrypted  with the sober128 encryption algorithm to protect data from eavesdropping.  Enabling this option adds a 36 byte header to every message sent by totem which reduces total throughput.  Encryption and authentication consume 75% of CPU cycles in aisexec as  measured  with gprof when enabled.  For  100Mbit  networks  with  1500  MTU  frame  transmissions: A throughput of 9Mb/s is possible with 100% cpu utilization when this  option  is enabled on 3GHz cpus.  A throughput of 10Mb/s is possible wth 20% cpu utilization when this option is  disabled on 3GHz cpus.  For  gig-e networks with large frame transmissions: A throughput of 20Mb/s is possible when this  option  is  enabled  on  3GHz cpus.   A throughput of 60Mb/s is possible when this option is disabled on 3GHz cpus.  The default is on. <b
 r></p>\n"
 msgstr ""
 
 #: src/include/cluster/helps.rb:50

Modified: trunk/yast/en_GB/po/control.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/control.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/control.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: control\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:53+0200\n"
+"POT-Creation-Date: 2014-10-29 16:21+0100\n"
 "PO-Revision-Date: 2008-03-27 19:15+0000\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"
@@ -18,242 +18,319 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: control/control.SLES.glade.translations.glade:3
+#: control/control.openSUSE.glade.translations.glade:3
 #, fuzzy
-#| 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"
-#| "</p>\n"
-#| "<p>\n"
-#| "Please visit us at http://www.novell.com/linux/.\n"
-#| "</p>\n"
-#| "\t"
 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"
-"</p>\n"
-"<p>\n"
-"Please visit us at http://www.suse.com/.\n"
-"</p>\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 ""
 "\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"
-"</p>\n"
-"<p>\n"
-"Please visit us at http://www.openSUSE.org.\n"
-"</p>\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"
 "\t"
 
-#: control/control.SLES.glade.translations.glade:14
+#: control/control.openSUSE.glade.translations.glade:10
+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, 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."
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:21
 #, fuzzy
-#| msgid "Mail Server"
-msgid "CIM Server"
-msgstr "Mail Server"
+msgid "GNOME Desktop"
+msgstr "GNOME desktop"
 
-#: control/control.SLES.glade.translations.glade:15
-#: control/control.SLES.glade.translations.glade:16
-#: control/control.SLES.glade.translations.glade:17
-#: control/control.SLES.glade.translations.glade:22
-#: control/control.SLES.glade.translations.glade:23
-#: control/control.SLES.glade.translations.glade:58
-#: control/control.SLES.glade.translations.glade:59
+#: control/control.openSUSE.glade.translations.glade:22
+#, fuzzy
+msgid "KDE Desktop"
+msgstr "KDE desktop"
+
+#: control/control.openSUSE.glade.translations.glade:23
+#, fuzzy
+msgid "XFCE Desktop"
+msgstr "XFCE desktop"
+
+#: control/control.openSUSE.glade.translations.glade:24
+#, fuzzy
+msgid "LXDE Desktop"
+msgstr "KDE desktop"
+
+#: control/control.openSUSE.glade.translations.glade:25
+msgid "Minimal X Window"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:26
+#, fuzzy
+#| msgid "Alternate Desktops"
+msgid "Enlightenment Desktop"
+msgstr "Alternate Desktops"
+
+#: control/control.openSUSE.glade.translations.glade:27
+msgid "Minimal Server Selection (Text Mode)"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:28
+#: control/control.openSUSE.glade.translations.glade:29
+#: control/control.openSUSE.glade.translations.glade:32
+#: control/control.openSUSE.glade.translations.glade:70
+#: control/control.openSUSE.glade.translations.glade:71
 msgid "Installation Settings"
 msgstr "Installation Settings"
 
-#: control/control.SLES.glade.translations.glade:18
-msgid "Overview"
-msgstr "Overview"
-
-#: control/control.SLES.glade.translations.glade:19
-msgid "Expert"
-msgstr "Expert"
-
-#: control/control.SLES.glade.translations.glade:20
+#: control/control.openSUSE.glade.translations.glade:30
 msgid "Live Installation Settings"
 msgstr "Live Installation Settings"
 
-#: control/control.SLES.glade.translations.glade:21
+#: control/control.openSUSE.glade.translations.glade:31
+#: control/control.openSUSE.glade.translations.glade:85
 msgid "Update Settings"
 msgstr "Update Settings"
 
-#: control/control.SLES.glade.translations.glade:24
-#: control/control.SLES.glade.translations.glade:25
+#: control/control.openSUSE.glade.translations.glade:33
 msgid "Network Configuration"
 msgstr "Network Configuration"
 
-#: control/control.SLES.glade.translations.glade:26
-#, fuzzy
-#| msgid "Network Services Configuration %1"
-msgid "Network Services Configuration"
-msgstr "Network Services Configuration %1"
-
-#: control/control.SLES.glade.translations.glade:27
-#: control/control.SLES.glade.translations.glade:28
-#: control/control.SLES.glade.translations.glade:29
+#: control/control.openSUSE.glade.translations.glade:34
 msgid "Hardware Configuration"
 msgstr "Hardware Configuration"
 
-#: control/control.SLES.glade.translations.glade:30
-#: control/control.SLES.glade.translations.glade:65
-#: control/control.SLES.glade.translations.glade:91
+#: control/control.openSUSE.glade.translations.glade:35
+#: control/control.openSUSE.glade.translations.glade:77
+#: control/control.openSUSE.glade.translations.glade:103
 msgid "Preparation"
 msgstr "Preparation"
 
-#: control/control.SLES.glade.translations.glade:31
-#: control/control.SLES.glade.translations.glade:52
-#: control/control.SLES.glade.translations.glade:66
+#: control/control.openSUSE.glade.translations.glade:36
+#: control/control.openSUSE.glade.translations.glade:63
 #, fuzzy
 #| msgid "Saving Network Configuration"
-msgid "Load Linuxrc Network Configuration"
+msgid "Load linuxrc Network Configuration"
 msgstr "Saving Network Configuration"
 
-#: control/control.SLES.glade.translations.glade:32
-#: control/control.SLES.glade.translations.glade:53
-#: control/control.SLES.glade.translations.glade:67
+#: control/control.openSUSE.glade.translations.glade:37
+#: control/control.openSUSE.glade.translations.glade:64
 #, fuzzy
 #| msgid "Network Setup"
 msgid "Network Autosetup"
 msgstr "Network Setup Method"
 
-#: control/control.SLES.glade.translations.glade:33
-#: control/control.SLES.glade.translations.glade:54
-#: control/control.SLES.glade.translations.glade:68
+#: control/control.openSUSE.glade.translations.glade:38
+#: control/control.openSUSE.glade.translations.glade:65
+#: control/control.openSUSE.glade.translations.glade:78
 msgid "Welcome"
 msgstr "Welcome"
 
-#: control/control.SLES.glade.translations.glade:34
-#: control/control.SLES.glade.translations.glade:55
-#: control/control.SLES.glade.translations.glade:69
+#: control/control.openSUSE.glade.translations.glade:39
 #, fuzzy
 #| msgid "Disk Activation"
 msgid "Network Activation"
 msgstr "Disk Activation"
 
-#: control/control.SLES.glade.translations.glade:35
-#: control/control.SLES.glade.translations.glade:70
+#: control/control.openSUSE.glade.translations.glade:40
+#: control/control.openSUSE.glade.translations.glade:79
 msgid "Disk Activation"
 msgstr "Disk Activation"
 
-#: control/control.SLES.glade.translations.glade:36
-#: control/control.SLES.glade.translations.glade:37
-#: control/control.SLES.glade.translations.glade:71
-#: control/control.SLES.glade.translations.glade:92
+#: control/control.openSUSE.glade.translations.glade:41
+#: control/control.openSUSE.glade.translations.glade:42
+#: control/control.openSUSE.glade.translations.glade:80
+#: control/control.openSUSE.glade.translations.glade:104
 msgid "System Analysis"
 msgstr "System Analysis"
 
-#: control/control.SLES.glade.translations.glade:38
-#: control/control.SLES.glade.translations.glade:73
-msgid "Add-On Products"
-msgstr "Add-On Products"
-
-#: control/control.SLES.glade.translations.glade:39
-#: control/control.SLES.glade.translations.glade:56
+#: control/control.openSUSE.glade.translations.glade:43
+#: control/control.openSUSE.glade.translations.glade:67
 msgid "Disk"
 msgstr "Disk"
 
-#: control/control.SLES.glade.translations.glade:40
-#: control/control.SLES.glade.translations.glade:57
+#: control/control.openSUSE.glade.translations.glade:44
+#: control/control.openSUSE.glade.translations.glade:66
 msgid "Time Zone"
 msgstr "Time Zone"
 
-#: control/control.SLES.glade.translations.glade:41
-#: control/control.SLES.glade.translations.glade:51
+#: control/control.openSUSE.glade.translations.glade:45
+#: control/control.openSUSE.glade.translations.glade:82
+msgid "Online Repositories"
+msgstr "Online Repositories"
+
+#: control/control.openSUSE.glade.translations.glade:46
+#: control/control.openSUSE.glade.translations.glade:83
+msgid "Add-On Products"
+msgstr "Add-On Products"
+
+#: control/control.openSUSE.glade.translations.glade:47
+msgid "Desktop Selection"
+msgstr "Desktop Selection"
+
+#: control/control.openSUSE.glade.translations.glade:48
+#: control/control.openSUSE.glade.translations.glade:49
+#: control/control.openSUSE.glade.translations.glade:68
+#: control/control.openSUSE.glade.translations.glade:69
+msgid "User Settings"
+msgstr "User Settings"
+
+#: control/control.openSUSE.glade.translations.glade:50
+#: control/control.openSUSE.glade.translations.glade:62
 msgid "Installation"
 msgstr "Installation"
 
-#: control/control.SLES.glade.translations.glade:42
-msgid "Installation Summary"
-msgstr "Installation Summary"
+#: control/control.openSUSE.glade.translations.glade:51
+msgid "Installation Overview"
+msgstr "Installation Overview"
 
-#: control/control.SLES.glade.translations.glade:43
-#: control/control.SLES.glade.translations.glade:44
-#: control/control.SLES.glade.translations.glade:45
-#: control/control.SLES.glade.translations.glade:46
-#: control/control.SLES.glade.translations.glade:47
-#: control/control.SLES.glade.translations.glade:48
-#: control/control.SLES.glade.translations.glade:49
-#: control/control.SLES.glade.translations.glade:50
-#: control/control.SLES.glade.translations.glade:60
-#: control/control.SLES.glade.translations.glade:61
-#: control/control.SLES.glade.translations.glade:62
-#: control/control.SLES.glade.translations.glade:63
-#: control/control.SLES.glade.translations.glade:64
-#: control/control.SLES.glade.translations.glade:85
-#: control/control.SLES.glade.translations.glade:86
-#: control/control.SLES.glade.translations.glade:87
-#: control/control.SLES.glade.translations.glade:88
-#: control/control.SLES.glade.translations.glade:89
-#: control/control.SLES.glade.translations.glade:90
-#: control/control.SLES.glade.translations.glade:105
-#: control/control.SLES.glade.translations.glade:106
-#: control/control.SLES.glade.translations.glade:107
+#: control/control.openSUSE.glade.translations.glade:52
+#: control/control.openSUSE.glade.translations.glade:53
+#: control/control.openSUSE.glade.translations.glade:54
+#: control/control.openSUSE.glade.translations.glade:55
+#: control/control.openSUSE.glade.translations.glade:56
+#: control/control.openSUSE.glade.translations.glade:57
+#: control/control.openSUSE.glade.translations.glade:58
+#: control/control.openSUSE.glade.translations.glade:59
+#: control/control.openSUSE.glade.translations.glade:60
+#: control/control.openSUSE.glade.translations.glade:61
+#: 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:96
+#: control/control.openSUSE.glade.translations.glade:97
+#: control/control.openSUSE.glade.translations.glade:98
+#: control/control.openSUSE.glade.translations.glade:99
+#: 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:117
+#: control/control.openSUSE.glade.translations.glade:118
+#: control/control.openSUSE.glade.translations.glade:119
 msgid "Perform Installation"
 msgstr "Perform Installation"
 
-#: control/control.SLES.glade.translations.glade:72
-#: control/control.SLES.glade.translations.glade:93
+#: control/control.openSUSE.glade.translations.glade:81
+#: control/control.openSUSE.glade.translations.glade:105
 msgid "System for Update"
 msgstr "System for Update"
 
-#: control/control.SLES.glade.translations.glade:74
-#: control/control.SLES.glade.translations.glade:96
+#: control/control.openSUSE.glade.translations.glade:84
+#: control/control.openSUSE.glade.translations.glade:108
 msgid "Update"
 msgstr "Update"
 
-#: control/control.SLES.glade.translations.glade:75
-msgid "Update Summary"
-msgstr "Update Summary"
-
-#: control/control.SLES.glade.translations.glade:76
-#: control/control.SLES.glade.translations.glade:77
-#: control/control.SLES.glade.translations.glade:78
-#: control/control.SLES.glade.translations.glade:79
-#: control/control.SLES.glade.translations.glade:80
-#: control/control.SLES.glade.translations.glade:98
-#: control/control.SLES.glade.translations.glade:99
-#: 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:104
-#: control/control.SLES.glade.translations.glade:110
-#: control/control.SLES.glade.translations.glade:111
+#: control/control.openSUSE.glade.translations.glade:86
+#: control/control.openSUSE.glade.translations.glade:87
+#: control/control.openSUSE.glade.translations.glade:88
+#: control/control.openSUSE.glade.translations.glade:89
+#: control/control.openSUSE.glade.translations.glade:90
+#: control/control.openSUSE.glade.translations.glade:110
+#: control/control.openSUSE.glade.translations.glade:111
+#: control/control.openSUSE.glade.translations.glade:112
+#: control/control.openSUSE.glade.translations.glade:113
+#: control/control.openSUSE.glade.translations.glade:114
+#: control/control.openSUSE.glade.translations.glade:115
+#: control/control.openSUSE.glade.translations.glade:116
+#: control/control.openSUSE.glade.translations.glade:122
+#: control/control.openSUSE.glade.translations.glade:123
 msgid "Perform Update"
 msgstr "Perform Update"
 
-#: control/control.SLES.glade.translations.glade:81
+#: control/control.openSUSE.glade.translations.glade:91
+#: control/control.openSUSE.glade.translations.glade:120
+#: control/control.openSUSE.glade.translations.glade:124
+msgid "Configuration"
+msgstr "Configuration"
+
+#: control/control.openSUSE.glade.translations.glade:92
 msgid "Base Installation"
 msgstr "Base Installation"
 
-#: control/control.SLES.glade.translations.glade:82
-#: control/control.SLES.glade.translations.glade:83
-#: control/control.SLES.glade.translations.glade:84
-#: control/control.SLES.glade.translations.glade:94
-#: control/control.SLES.glade.translations.glade:95
-#: control/control.SLES.glade.translations.glade:97
+#: 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:106
+#: control/control.openSUSE.glade.translations.glade:107
+#: control/control.openSUSE.glade.translations.glade:109
 msgid "AutoYaST Settings"
 msgstr "AutoYaST Settings"
 
-#: control/control.SLES.glade.translations.glade:108
-#: control/control.SLES.glade.translations.glade:112
-msgid "Configuration"
-msgstr "Configuration"
-
-#: control/control.SLES.glade.translations.glade:109
-#: control/control.SLES.glade.translations.glade:113
+#: control/control.openSUSE.glade.translations.glade:121
+#: control/control.openSUSE.glade.translations.glade:125
 msgid "System Configuration"
 msgstr "System Configuration"
 
+#, fuzzy
+#~| 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"
+#~| "</p>\n"
+#~| "<p>\n"
+#~| "Please visit us at http://www.novell.com/linux/.\n"
+#~| "</p>\n"
+#~| "\t"
+#~ 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"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "Please visit us at http://www.suse.com/.\n"
+#~ "</p>\n"
+#~ "        "
+#~ msgstr ""
+#~ "\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"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "Please visit us at http://www.openSUSE.org.\n"
+#~ "</p>\n"
+#~ "\t"
+
+#, fuzzy
+#~| msgid "Mail Server"
+#~ msgid "CIM Server"
+#~ msgstr "Mail Server"
+
+#~ msgid "Overview"
+#~ msgstr "Overview"
+
+#~ msgid "Expert"
+#~ msgstr "Expert"
+
+#, fuzzy
+#~| msgid "Network Services Configuration %1"
+#~ msgid "Network Services Configuration"
+#~ msgstr "Network Services Configuration %1"
+
+#~ msgid "Installation Summary"
+#~ msgstr "Installation Summary"
+
+#~ msgid "Update Summary"
+#~ msgstr "Update Summary"
+
 #~ msgid "Add-On Product Installation"
 #~ msgstr "Add-On Product Installation"
 
@@ -300,12 +377,6 @@
 #~ msgid "Finishing configuration..."
 #~ msgstr "Finishing Configuration"
 
-#~ msgid "User Settings"
-#~ msgstr "User Settings"
-
-#~ msgid "Installation Overview"
-#~ msgstr "Installation Overview"
-
 #, fuzzy
 #~ msgid "Repair"
 #~ msgstr "&Repair"
@@ -361,57 +432,12 @@
 #~ msgid "Service"
 #~ msgstr "Service"
 
-#~ msgid "Desktop Selection"
-#~ msgstr "Desktop Selection"
-
 #~ msgid "Root Password"
 #~ msgstr "Root Password"
 
-#, fuzzy
 #~ 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"
-#~ "\t    "
-#~ msgstr ""
-#~ "\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"
-#~ "\t"
-
-#, fuzzy
-#~ msgid "GNOME Desktop"
-#~ msgstr "GNOME desktop"
-
-#, fuzzy
-#~ msgid "KDE Desktop"
-#~ msgstr "KDE desktop"
-
-#, fuzzy
-#~ msgid "XFCE Desktop"
-#~ msgstr "XFCE desktop"
-
-#, fuzzy
-#~ msgid "LXDE Desktop"
-#~ msgstr "KDE desktop"
-
-#, fuzzy
-#~| msgid "Alternate Desktops"
-#~ msgid "Enlightenment Desktop"
-#~ msgstr "Alternate Desktops"
-
-#~ msgid "Online Repositories"
-#~ msgstr "Online Repositories"
-
-#~ msgid ""
-#~ "\n"
-#~ "<p><b>Congratulations!</b></p>\n"
 #~ "<p>The installation of &product; 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"

Modified: trunk/yast/en_GB/po/crowbar.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/crowbar.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/crowbar.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2001-07-17 16:27+0200\n"
 "Last-Translator: James Ogley <ogley@suse.co.uk>\n"
 "Language-Team: English <i18n@suse.de>\n"
@@ -25,111 +25,206 @@
 msgid "Configuration of crowbar"
 msgstr "Configuration of CD creator"
 
+#. table header
+#: src/include/crowbar/complex.rb:96
+#, fuzzy
+#| msgid "Repository &Name:"
+msgid "Repository Name"
+msgstr "Repository &Name:"
+
+#: src/include/crowbar/complex.rb:96
+msgid "URL"
+msgstr "URL"
+
+#: src/include/crowbar/complex.rb:96
+#, fuzzy
+#| msgid "User Found Error"
+msgid "Ask On Error"
+msgstr "User Found Error"
+
+#. help text
+#: src/include/crowbar/complex.rb:106
+msgid ""
+"<p>Here you can edit the location of your <b>Update Repositories</b>.</p>\n"
+"<p>\n"
+"Some examples of how the URL could look like:\n"
+"</p><p>\n"
+"<ul>\n"
+"<li><i>http://smt.example.com/repo/$RCE/SLES11-SP3-Pool/sle-11-x86_64/</i> for SMT server\n"
+"<li><i>http://manager.example.com/ks/dist/child/suse-cloud-3.0-pool-x86_64/sles11-sp3-x86_64/</i> for SUSE Manager Server.\n"
+"</p><p>\n"
+"For detailed description, check the Deployment Guide.\n"
+"</p>"
+msgstr ""
+
 #. textentry label
-#: src/include/crowbar/complex.rb:71
+#: src/include/crowbar/complex.rb:122
 #, fuzzy
-#| msgid "Password for \"root\", the system administrator"
-msgid "Password for Crowbar Administrator"
-msgstr "Password for \"root\", the system administrator"
+#| msgid "&Repository URL"
+msgid "Repository &URL"
+msgstr "&Repository URL"
 
+#. textentry label
+#: src/include/crowbar/complex.rb:135
+#, fuzzy
+#| msgid "User Found Error"
+msgid "&Ask On Error"
+msgstr "User Found Error"
+
+#. table header
+#: src/include/crowbar/complex.rb:155
+#, fuzzy
+#| msgid "Administrator DN"
+msgid "Administrator Name"
+msgstr "Administrator DN"
+
 #. help text
-#: src/include/crowbar/complex.rb:75
+#: src/include/crowbar/complex.rb:165
 #, fuzzy
 #| msgid "U&se this password for system administrator"
-msgid "<p>Enter the password for Crowbar administrator.</p>"
+msgid "<p>Manage user names and passwords for Crowbar administrators.</p>"
 msgstr "U&se this password for system administrator"
 
 #. textentry label
-#: src/include/crowbar/complex.rb:97
+#: src/include/crowbar/complex.rb:201
 #, fuzzy
-#| msgid "Reenter the &Password"
-msgid "Repeat the Password"
-msgstr "Reenter the &Password"
+#| msgid "&Model"
+msgid "&Mode"
+msgstr "&Model"
 
-#. textentry label
-#: src/include/crowbar/complex.rb:104
-msgid "Mode"
-msgstr "Mode"
+#. help text for the Network mode tab (do not translate bastion)
+#: src/include/crowbar/complex.rb:203
+msgid ""
+"<p>Here, define a <b>Network Mode</b> with relevant <b>Bonding Policy</b>.</p>\n"
+"<p>You can also specify interface names for the bastion network conduits as space-separated list.</p>"
+msgstr ""
 
 #. textentry label
-#: src/include/crowbar/complex.rb:113
+#: src/include/crowbar/complex.rb:213
 #, fuzzy
 #| msgid "Cooling Policy"
-msgid "Bonding Policy"
+msgid "Bonding &Policy"
 msgstr "Cooling Policy"
 
+#. textentry label
+#: src/include/crowbar/complex.rb:222
+msgid "P&hysical interfaces mapping for bastion network"
+msgstr ""
+
+#. help text for conduit if list
+#: src/include/crowbar/complex.rb:231
+msgid ""
+"<p>Each physical interface definition needs to fit the pattern\n"
+"<tt>[Quantifier][Speed][Order]</tt>.\n"
+"Valid examples are <tt>+1g2</tt>, <tt>10g1</tt> or <tt>?1g2</tt>.</p>"
+msgstr ""
+
 #. table header
-#: src/include/crowbar/complex.rb:139
+#: src/include/crowbar/complex.rb:265
 msgid "Network"
 msgstr "Network"
 
-#: src/include/crowbar/complex.rb:140
+#: src/include/crowbar/complex.rb:266
 #, fuzzy
 #| msgid "Sender Address"
 msgid "Subnet Address"
 msgstr "Sender Address"
 
-#: src/include/crowbar/complex.rb:141
+#: src/include/crowbar/complex.rb:267
 msgid "Network Mask"
 msgstr "Network Mask"
 
-#: src/include/crowbar/complex.rb:142
+#: src/include/crowbar/complex.rb:268
 msgid "VLAN"
 msgstr "VLAN"
 
 #. checkbox label
-#: src/include/crowbar/complex.rb:159
+#: src/include/crowbar/complex.rb:286
 #, fuzzy
 #| msgid "&Use LDAP"
-msgid "Use VLAN"
+msgid "Use &VLAN"
 msgstr "&Use LDAP"
 
 #. textentry label
-#: src/include/crowbar/complex.rb:169
+#: src/include/crowbar/complex.rb:296
 #, fuzzy
 #| msgid "VLAN"
-msgid "VLAN ID"
+msgid "VLAN &ID"
 msgstr "VLAN"
 
 #. textentry label
-#: src/include/crowbar/complex.rb:179
+#: src/include/crowbar/complex.rb:306
+msgid "Rou&ter"
+msgstr ""
+
+#. textentry label
+#: src/include/crowbar/complex.rb:328
 #, fuzzy
-#| msgid "Routing"
-msgid "Router"
-msgstr "Routing"
+#| msgid "&Preferences"
+msgid "Router pre&ference"
+msgstr "&Preferences"
 
 #. textentry label
-#: src/include/crowbar/complex.rb:201
-#, fuzzy
-#| msgid "&Subnet"
-msgid "Subnet"
+#: src/include/crowbar/complex.rb:338
+msgid "&Subnet"
 msgstr "&Subnet"
 
 #. textentry label
-#: src/include/crowbar/complex.rb:224
-msgid "Netmask"
-msgstr "Netmask"
+#: src/include/crowbar/complex.rb:361
+msgid "Net&mask"
+msgstr "Net&mask"
 
-#: src/include/crowbar/complex.rb:246
-msgid "Broadcast"
+#: src/include/crowbar/complex.rb:383
+#, fuzzy
+#| msgid "Broadcast"
+msgid "Broa&dcast"
 msgstr "Broadcast"
 
 #. checkbox label
-#: src/include/crowbar/complex.rb:256
+#: src/include/crowbar/complex.rb:393
 #, fuzzy
 #| msgid "Bridge"
-msgid "Add Bridge"
+msgid "&Add Bridge"
 msgstr "Bridge"
 
-#. push button label
-#: src/include/crowbar/complex.rb:265
+#. push button label&
+#: src/include/crowbar/complex.rb:402
 #, fuzzy
 #| msgid "&Edit Zone..."
-msgid "&Edit Ranges..."
+msgid "Edit Ran&ges..."
 msgstr "&Edit Zone..."
 
+#. checkbox label
+#: src/include/crowbar/complex.rb:413
+#, fuzzy
+#| msgid "Bond Network"
+msgid "Add &Bastion Network"
+msgstr "Bond Network"
+
+#. textentry label
+#: src/include/crowbar/complex.rb:425
+msgid "&IP Address"
+msgstr "&IP Address"
+
+#. text entry label
+#: src/include/crowbar/complex.rb:585
+msgid "User Name"
+msgstr "User Name"
+
+#. text entry label
+#: src/include/crowbar/complex.rb:587
+msgid "Password"
+msgstr "Password"
+
+#. text entry label
+#: src/include/crowbar/complex.rb:589
+#, fuzzy
+#| msgid "Reenter the &Password"
+msgid "Repeat the Password"
+msgstr "Reenter the &Password"
+
 #. error popup
-#: src/include/crowbar/complex.rb:391
+#: src/include/crowbar/complex.rb:627
 msgid ""
 "The passwords do not match.\n"
 "Try again."
@@ -137,13 +232,33 @@
 "The passwords do not match.\n"
 "Try again."
 
+#. error popup
+#: src/include/crowbar/complex.rb:636
+#, fuzzy
+#| msgid ""
+#| "Hardware configuration %1 already exists.\n"
+#| "Choose a different one."
+msgid ""
+"User '%1' already exists.\n"
+"Choose a different name."
+msgstr ""
+"Hardware configuration %1 already exists.\n"
+"Choose a different one."
+
+#. error popup
+#: src/include/crowbar/complex.rb:781
+#, fuzzy
+#| msgid "The entered URL '%1' is invalid"
+msgid "The interface format '%1' is not valid"
+msgstr "The entered URL '%1' is invalid"
+
 #. table entry (VLAN status)
-#: src/include/crowbar/complex.rb:426
+#: src/include/crowbar/complex.rb:861
 msgid "disabled"
 msgstr "disabled"
 
 #. error popup
-#: src/include/crowbar/complex.rb:527
+#: src/include/crowbar/complex.rb:986
 #, fuzzy
 #| msgid "The subnet mask is invalid."
 msgid ""
@@ -152,7 +267,8 @@
 msgstr "The subnet mask is invalid."
 
 #. error popup
-#: src/include/crowbar/complex.rb:540
+#. error popup
+#: src/include/crowbar/complex.rb:999 src/include/crowbar/complex.rb:1036
 #, fuzzy
 #| msgid "The IP address is invalid."
 msgid ""
@@ -161,7 +277,7 @@
 msgstr "The IP address is invalid."
 
 #. error popup
-#: src/include/crowbar/complex.rb:552
+#: src/include/crowbar/complex.rb:1011
 #, fuzzy
 #| msgid "The remote IP address is invalid."
 msgid ""
@@ -170,34 +286,45 @@
 msgstr "The remote IP address is invalid."
 
 #. error popup
-#: src/include/crowbar/complex.rb:564
+#: src/include/crowbar/complex.rb:1023
 #, fuzzy
 #| msgid "The format of server address '%1' is not correct."
 msgid "The router address '%1' is not part of network '%2'."
 msgstr "The format of server address '%1' is not correct."
 
+#. error popup
+#: src/include/crowbar/complex.rb:1047
+#, fuzzy
+#| msgid ""
+#| "IP address %1 does not match\n"
+#| "the current network %2/%3.\n"
+msgid "The IP address '%1' is not part of network '%2'."
+msgstr ""
+"IP address %1 does not match\n"
+"the current network %2/%3.\n"
+
 #. popup message
-#: src/include/crowbar/complex.rb:585
+#: src/include/crowbar/complex.rb:1068
 msgid ""
 "Some address ranges are not part of network '%1'.\n"
 "Adapt them using 'Edit ranges' button."
 msgstr ""
 
 #. inputfield label
-#: src/include/crowbar/complex.rb:687
+#: src/include/crowbar/complex.rb:1173
 #, fuzzy
 #| msgid "Min&imum IP Address"
 msgid "Min IP Address"
 msgstr "Min&imum IP Address"
 
 #. inputfield label
-#: src/include/crowbar/complex.rb:694
+#: src/include/crowbar/complex.rb:1180
 #, fuzzy
 #| msgid "Ma&ximum IP Address"
 msgid "Max IP Address"
 msgstr "Ma&ximum IP Address"
 
-#: src/include/crowbar/complex.rb:761
+#: src/include/crowbar/complex.rb:1247
 #, fuzzy
 #| msgid ""
 #| "IP address %1 does not match\n"
@@ -208,36 +335,61 @@
 "the current network %2/%3.\n"
 
 #. error message
-#: src/include/crowbar/complex.rb:777
+#: src/include/crowbar/complex.rb:1263
 msgid "The lowest address must be lower than the highest one."
 msgstr "The lowest address must be lower than the highest one."
 
 #. error message
-#: src/include/crowbar/complex.rb:810
+#: src/include/crowbar/complex.rb:1296
 msgid "Ranges '%1' and '%2' are overlapping."
 msgstr ""
 
 #. tab header
-#: src/include/crowbar/complex.rb:841
+#: src/include/crowbar/complex.rb:1373
 #, fuzzy
-#| msgid "Ad&ministration Settings"
-msgid "Administration Settings"
-msgstr "Ad&ministration Settings"
+#| msgid "User Settings"
+msgid "&User Settings"
+msgstr "User Settings"
 
+#. label (hint for user)
+#: src/include/crowbar/complex.rb:1385
+msgid "If no user is present, user 'crowbar' with default password will be used."
+msgstr ""
+
 #. tab header
-#: src/include/crowbar/complex.rb:851
-msgid "Network Mode"
+#: src/include/crowbar/complex.rb:1403
+#, fuzzy
+#| msgid "Network Mode"
+msgid "N&etwork Mode"
 msgstr "Network Mode"
 
+#: src/include/crowbar/complex.rb:1411
+#, fuzzy
+#| msgid "Bond Network"
+msgid "Bastion Network"
+msgstr "Bond Network"
+
 #. tab header
-#: src/include/crowbar/complex.rb:861
+#: src/include/crowbar/complex.rb:1454
 #, fuzzy
 #| msgid "Network"
-msgid "Networks"
+msgid "Net&works"
 msgstr "Network"
 
+#. tab header
+#: src/include/crowbar/complex.rb:1490
+#, fuzzy
+#| msgid "Repositories"
+msgid "Re&positories"
+msgstr "Repositories"
+
+#. label (hint for user)
+#: src/include/crowbar/complex.rb:1501
+msgid "Empty URL means that default value will be used."
+msgstr ""
+
 #. popup message %1 is FQDN
-#: src/include/crowbar/complex.rb:925
+#: src/include/crowbar/complex.rb:1653
 msgid ""
 "The SUSE Cloud Admin Server has been deployed. Changing the network is\n"
 "currently not supported.\n"
@@ -246,7 +398,7 @@
 msgstr ""
 
 #. default dialog caption
-#: src/include/crowbar/complex.rb:943
+#: src/include/crowbar/complex.rb:1671
 #, fuzzy
 #| msgid "CD Creator Configuration Overview"
 msgid "Crowbar Configuration Overview"
@@ -309,43 +461,69 @@
 msgstr "Initialising..."
 
 #. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:114
+#: src/modules/Crowbar.rb:144
 #, fuzzy
 #| msgid "Initializing Scanner Configuration"
 msgid "Initializing crowbar Configuration"
 msgstr "Initialising Scanner Configuration"
 
 #. Progress stage
-#: src/modules/Crowbar.rb:125
+#: src/modules/Crowbar.rb:155
 #, fuzzy
 #| msgid "Read the configuration"
 msgid "Read the configuraton"
 msgstr "Read the configuration"
 
 #. Progress step
-#: src/modules/Crowbar.rb:129
+#: src/modules/Crowbar.rb:159
 msgid "Reading the configuration..."
 msgstr "Reading the configuration..."
 
 #. Progress finished
 #. Progress finished
-#: src/modules/Crowbar.rb:131 src/modules/Crowbar.rb:200
+#: src/modules/Crowbar.rb:161 src/modules/Crowbar.rb:255
 msgid "Finished"
 msgstr "Finished"
 
 #. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:183
+#: src/modules/Crowbar.rb:238
 #, fuzzy
 #| msgid "Saving Proxy Configuration"
 msgid "Saving crowbar Configuration"
 msgstr "Saving Proxy Configuration"
 
 #. Progress stage 1/2
-#: src/modules/Crowbar.rb:194
+#: src/modules/Crowbar.rb:249
 msgid "Write the settings"
 msgstr "Write the settings"
 
 #. Progress step 1/2
-#: src/modules/Crowbar.rb:198
+#: src/modules/Crowbar.rb:253
 msgid "Writing the settings..."
 msgstr "Writing the settings..."
+
+#, fuzzy
+#~| msgid "Password for \"root\", the system administrator"
+#~ msgid "Password for Crowbar Administrator"
+#~ msgstr "Password for \"root\", the system administrator"
+
+#~ msgid "Mode"
+#~ msgstr "Mode"
+
+#, fuzzy
+#~| msgid "Routing"
+#~ msgid "Router"
+#~ msgstr "Routing"
+
+#, fuzzy
+#~| msgid "&Subnet"
+#~ msgid "Subnet"
+#~ msgstr "&Subnet"
+
+#~ msgid "Netmask"
+#~ msgstr "Netmask"
+
+#, fuzzy
+#~| msgid "Ad&ministration Settings"
+#~ msgid "Administration Settings"
+#~ msgstr "Ad&ministration Settings"

Modified: trunk/yast/en_GB/po/drbd.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/drbd.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/drbd.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2001-07-17 16:27+0200\n"
 "Last-Translator: James Ogley <ogley@suse.co.uk>\n"
 "Language-Team: English <i18n@suse.de>\n"
@@ -255,10 +255,10 @@
 #: src/include/drbd/helps.rb:75
 msgid ""
 "\n"
-"\t\t<p>\"Name\" is mandatory and must match the Linux host name (uname -n) of one of the nodes</p>\n"
+"\t\t<p>\"Name\" is mandatory and must match the Linux host name (uname -n) of one of the nodes. Should not include \".\" in hostname.</p>\n"
 "\t\t<p>\"Address:Port\": A resource needs one IP address per device, which is used to wait for incoming connections from the partner device to reach the device. Each DRBD resource needs a TCP port which is used to connect to the node's partner device.</p>\n"
-"\t\t<p>\"Device\": The  name of the block device node of the resource being described.  You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter,following its minor number.\n"
-"\t\tLike: '/dev/drbd_r0 minor 0'</p>\n"
+"\t\t<p>\"Device\": The name of the block device node of the resource being described.  You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter,following its minor number. Or either omit the name or minor and the minor number. If you omit the name a default of /dev/drbdminor will be used.\n"
+"\t\tLike: '/dev/drbd{service} minor {minor drbd number [0...255]}' or '/dev/drbd{minor drbd number [0...255]}'</p>\n"
 "\t\t<p>\"Disk\":  DRBD uses this block device to actually store and retrieve the data.  Never access such a device while DRBD is running on top of  it.</p>\n"
 "\t\t<p>\"Meta-disk\": internal. Internal means that the last part of the backing device is used to store the meta-data.</p>\n"
 "\t\t"
@@ -450,7 +450,11 @@
 msgid "Node names must be different."
 msgstr "Scheme name must be set."
 
-#: src/include/drbd/resource_conf.rb:568
+#: src/include/drbd/resource_conf.rb:552
+msgid "Node names must not include \".\" , using the local hostname."
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:582
 msgid "Please fill out all fields."
 msgstr ""
 
@@ -606,7 +610,7 @@
 msgid "Reading daemon status..."
 msgstr "Reading daemon status..."
 
-#: src/modules/Drbd.rb:149 src/modules/Drbd.rb:492
+#: src/modules/Drbd.rb:149 src/modules/Drbd.rb:494
 msgid "Finished"
 msgstr "Finished"
 
@@ -639,35 +643,37 @@
 msgid "Writing DRBD Configuration"
 msgstr "Writing NFS Configuration"
 
-#. if (!modified) return true;
+#. Comment code below due to change the "booting" status
+#. won't change modified flag
+#. return true if !@modified
 #. We do not set help text here, because it was set outside
-#: src/modules/Drbd.rb:484
+#: src/modules/Drbd.rb:486
 msgid "Write global settings"
 msgstr "Write global settings"
 
-#: src/modules/Drbd.rb:485
+#: src/modules/Drbd.rb:487
 msgid "Write resources"
 msgstr "Write resources"
 
-#: src/modules/Drbd.rb:486
+#: src/modules/Drbd.rb:488
 #, fuzzy
 msgid "Set daemon status"
 msgstr "Read daemon status"
 
-#: src/modules/Drbd.rb:489
+#: src/modules/Drbd.rb:491
 msgid "Writing global settings..."
 msgstr "Writing global settings..."
 
-#: src/modules/Drbd.rb:490
+#: src/modules/Drbd.rb:492
 msgid "Writing resources..."
 msgstr "Writing resources..."
 
-#: src/modules/Drbd.rb:491
+#: src/modules/Drbd.rb:493
 #, fuzzy
 msgid "Setting daemon status..."
 msgstr "Reading daemon status..."
 
-#: src/modules/Drbd.rb:502
+#: src/modules/Drbd.rb:504
 #, fuzzy
 #| msgid "Unable to create directory '%1'."
 msgid "Failed to make directory /etc/drbd.d"

Modified: trunk/yast/en_GB/po/ftp-server.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/ftp-server.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/ftp-server.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: ftp-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2007-08-16 20:49+0100\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"
@@ -891,8 +891,8 @@
 #: src/include/ftp-server/wid_functions.rb:263
 #: src/include/ftp-server/wid_functions.rb:317
 #: src/include/ftp-server/wid_functions.rb:408
-#: src/include/ftp-server/wid_functions.rb:498
-#: src/include/ftp-server/wid_functions.rb:507
+#: src/include/ftp-server/wid_functions.rb:502
+#: src/include/ftp-server/wid_functions.rb:511
 msgid "FTP is running"
 msgstr "FTP is running"
 
@@ -1968,7 +1968,7 @@
 #. Valid function of "Umask (umask files:umask dirs)"
 #. check value of textentry
 #. only pure-ftpd
-#: src/include/ftp-server/wid_functions.rb:619
+#: src/include/ftp-server/wid_functions.rb:623
 #, fuzzy
 msgid "Not a valid umask."
 msgstr "No valid Netmask."
@@ -1977,25 +1977,25 @@
 #. handling value in textentry of "Umask for Anonynmous Users"
 #. Handle function of "Browse"
 #. handling value in textentry of "Umask for Authenticated Users"
-#: src/include/ftp-server/wid_functions.rb:781
-#: src/include/ftp-server/wid_functions.rb:819
+#: src/include/ftp-server/wid_functions.rb:785
+#: src/include/ftp-server/wid_functions.rb:823
 #, fuzzy
 #| msgid "Select Directory"
 msgid "Select directory"
 msgstr "Select Directory"
 
 #. end of if (button == "EnableUpload") {
-#: src/include/ftp-server/wid_functions.rb:1055
+#: src/include/ftp-server/wid_functions.rb:1059
 #, fuzzy
 msgid "Create the \"upload\" directory in %1\n"
 msgstr "Cannot create target directory %1."
 
-#: src/include/ftp-server/wid_functions.rb:1060
+#: src/include/ftp-server/wid_functions.rb:1064
 #, fuzzy
 msgid "and enable write access?\n"
 msgstr "Allow remote access"
 
-#: src/include/ftp-server/wid_functions.rb:1062
+#: src/include/ftp-server/wid_functions.rb:1066
 #, fuzzy
 msgid ""
 "If you want anonymous users to be able to upload,\n"
@@ -2006,16 +2006,16 @@
 " you need to create a directory that allows writing.\n"
 "\n"
 
-#: src/include/ftp-server/wid_functions.rb:1069
-#: src/include/ftp-server/wid_functions.rb:1090
-#: src/include/ftp-server/wid_functions.rb:1116
-#: src/include/ftp-server/wid_functions.rb:1139
+#: src/include/ftp-server/wid_functions.rb:1073
+#: src/include/ftp-server/wid_functions.rb:1094
+#: src/include/ftp-server/wid_functions.rb:1120
+#: src/include/ftp-server/wid_functions.rb:1143
 #, fuzzy
 msgid " is a home directory after the login of anonymous users."
 msgstr " is a home directory after login of \"anonymous\" users."
 
-#: src/include/ftp-server/wid_functions.rb:1080
-#: src/include/ftp-server/wid_functions.rb:1127
+#: src/include/ftp-server/wid_functions.rb:1084
+#: src/include/ftp-server/wid_functions.rb:1131
 #, fuzzy
 msgid ""
 "Do you want to change permissions\n"
@@ -2024,13 +2024,13 @@
 "Do you want to change permission\n"
 "for"
 
-#: src/include/ftp-server/wid_functions.rb:1083
-#: src/include/ftp-server/wid_functions.rb:1130
+#: src/include/ftp-server/wid_functions.rb:1087
+#: src/include/ftp-server/wid_functions.rb:1134
 #, fuzzy
 msgid "Upload (allow writing)?"
 msgstr "upload (allow writing)?"
 
-#: src/include/ftp-server/wid_functions.rb:1085
+#: src/include/ftp-server/wid_functions.rb:1089
 #, fuzzy
 msgid ""
 "To allow anonymous users to upload, you need a directory with write access.\n"
@@ -2040,17 +2040,17 @@
 " you need a directory that allows writing \n"
 "\n"
 
-#: src/include/ftp-server/wid_functions.rb:1104
+#: src/include/ftp-server/wid_functions.rb:1108
 #, fuzzy
 msgid "Do you want to create a directory?\n"
 msgstr "Do you want to create directory\n"
 
-#: src/include/ftp-server/wid_functions.rb:1107
+#: src/include/ftp-server/wid_functions.rb:1111
 #, fuzzy
 msgid "Upload with write access?"
 msgstr "Allow remote access"
 
-#: src/include/ftp-server/wid_functions.rb:1109
+#: src/include/ftp-server/wid_functions.rb:1113
 #, fuzzy
 msgid ""
 "If you want to allow anonymous users to create directories,\n"
@@ -2061,7 +2061,7 @@
 " you need to create directory that allows writing.\n"
 "\n"
 
-#: src/include/ftp-server/wid_functions.rb:1132
+#: src/include/ftp-server/wid_functions.rb:1136
 #, fuzzy
 msgid ""
 "If you want anonymous users to be able to create directories,\n"
@@ -2080,16 +2080,16 @@
 #. check permissions for upload dir
 #.
 #. end of if (FtpServer::pure_ftp_allowed_permissios_upload == 0)
-#: src/include/ftp-server/wid_functions.rb:1199
-#: src/include/ftp-server/wid_functions.rb:1219
-#: src/include/ftp-server/wid_functions.rb:1286
-#: src/include/ftp-server/wid_functions.rb:1306
+#: src/include/ftp-server/wid_functions.rb:1203
+#: src/include/ftp-server/wid_functions.rb:1223
+#: src/include/ftp-server/wid_functions.rb:1290
+#: src/include/ftp-server/wid_functions.rb:1310
 #, fuzzy
 msgid "Change permissions of %1 ?\n"
 msgstr "Change p&ermissions"
 
-#: src/include/ftp-server/wid_functions.rb:1203
-#: src/include/ftp-server/wid_functions.rb:1290
+#: src/include/ftp-server/wid_functions.rb:1207
+#: src/include/ftp-server/wid_functions.rb:1294
 #, fuzzy
 msgid ""
 "If you want to allow uploads for \"anonymous\" users, \n"
@@ -2099,142 +2099,142 @@
 " you need a directory that allows writing \n"
 "\n"
 
-#: src/include/ftp-server/wid_functions.rb:1223
+#: src/include/ftp-server/wid_functions.rb:1227
 msgid "For anonymous connections the home directory of an anonymous user should have no write access.\n"
 msgstr ""
 
-#: src/include/ftp-server/wid_functions.rb:1310
+#: src/include/ftp-server/wid_functions.rb:1314
 msgid "For anonymous connections the home directory of an anonymous user should have no write access."
 msgstr ""
 
 #. Valid function of "Max Port for Pas. Mode"
 #. check values Max Port >= Min Port
-#: src/include/ftp-server/wid_functions.rb:1453
+#: src/include/ftp-server/wid_functions.rb:1457
 msgid "Condition for ports is max port > min port."
 msgstr "Condition for ports is max port > min port."
 
 #. Valid function of "DSA 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:1633
+#: src/include/ftp-server/wid_functions.rb:1637
 msgid "DSA certificate is missing."
 msgstr "DSA certificate is missing."
 
 #. Handle function of "Browse"
 #. handling value in textentry of "DSA Certificate to Use for SSL Encrypted Connections"
-#: src/include/ftp-server/wid_functions.rb:1660
+#: src/include/ftp-server/wid_functions.rb:1664
 msgid "Select File"
 msgstr "Select File"
 
 #. Valid function of "Security Settings"
 #. check of existing certificate
-#: src/include/ftp-server/wid_functions.rb:1718
+#: src/include/ftp-server/wid_functions.rb:1722
 #, fuzzy
 msgid "The <tt>/etc/ssl/private/pure-ftpd.pem</tt> certificate for the SSL connection is missing."
 msgstr "Certificate /etc/ssl/private/pure-ftpd.pem for SSL connection is missing."
 
 #. 0 => anonymous only, 1 => authenticated only, 2=> both
-#: src/modules/FtpServer.rb:219
+#: src/modules/FtpServer.rb:214
 #, fuzzy
 msgid "Welcome message"
 msgstr "&Welcome message"
 
 #. FtpServer read dialog caption
-#: src/modules/FtpServer.rb:893
+#: src/modules/FtpServer.rb:816
 msgid "Initializing FTP Configuration"
 msgstr "Initialising FTP Configuration"
 
 #. Part for commandline - it is necessary choose daemon if both are installed
-#: src/modules/FtpServer.rb:904
+#: src/modules/FtpServer.rb:827
 msgid "You have installed both daemons:"
 msgstr "You have installed both daemons:"
 
-#: src/modules/FtpServer.rb:906
+#: src/modules/FtpServer.rb:829
 #, fuzzy
 msgid "Choose one of them for configuration."
 msgstr "It is necessary choose one of them for configuration."
 
-#: src/modules/FtpServer.rb:908
+#: src/modules/FtpServer.rb:831
 #, fuzzy
 msgid "Do you want to configure vsftpd? Alternatively choose pure-ftpd."
 msgstr "Do you want to configure vsftpd? (if not you choose pure-ftpd)"
 
-#: src/modules/FtpServer.rb:916
+#: src/modules/FtpServer.rb:839
 #, fuzzy
 msgid "You have installed both daemons. Therefore you have to run the configuration in interactive mode."
 msgstr "You have installed both daemons. It is necessary run configuration in interactive mode."
 
 #. Progress stage 1/2
-#: src/modules/FtpServer.rb:935
+#: src/modules/FtpServer.rb:858
 msgid "Read settings from the config file"
 msgstr "Read settings from the config file"
 
 #. Progress stage 2/2
-#: src/modules/FtpServer.rb:937
+#: src/modules/FtpServer.rb:860
 msgid "Read the previous settings"
 msgstr "Read the previous settings"
 
 #. Progress stage 1/2
-#: src/modules/FtpServer.rb:941
+#: src/modules/FtpServer.rb:864
 msgid "Reading the settings..."
 msgstr "Reading the settings..."
 
 #. calling read function for reading settings form config file
-#: src/modules/FtpServer.rb:951
+#: src/modules/FtpServer.rb:874
 msgid "Cannot Read Current Settings."
 msgstr "Cannot Read Current Settings."
 
 #. FtpServer read dialog caption
-#: src/modules/FtpServer.rb:968
+#: src/modules/FtpServer.rb:891
 msgid "Saving FTP Configuration"
 msgstr "Saving FTP Configuration"
 
 #. Progress stage 1/2
-#: src/modules/FtpServer.rb:978
+#: src/modules/FtpServer.rb:901
 msgid "Write the settings to the config file"
 msgstr "Write the settings to the config file"
 
 #. Progress stage 2/2
-#: src/modules/FtpServer.rb:980
+#: src/modules/FtpServer.rb:903
 msgid "Write the settings for starting daemon"
 msgstr "Write the settings for starting daemon"
 
 #. Progress step 1/1
-#: src/modules/FtpServer.rb:984
+#: src/modules/FtpServer.rb:907
 msgid "Writing the settings..."
 msgstr "Writing the settings..."
 
 #. write options to the config file
-#: src/modules/FtpServer.rb:994
+#: src/modules/FtpServer.rb:917
 msgid "Cannot write settings!"
 msgstr "Cannot write settings!"
 
 #. write settings for starting daemon
-#: src/modules/FtpServer.rb:1000
+#: src/modules/FtpServer.rb:923
 msgid "Cannot write settings for xinetd!"
 msgstr "Cannot write settings for xinetd!"
 
 #. write settings for starting daemon
-#: src/modules/FtpServer.rb:1008
+#: src/modules/FtpServer.rb:931
 #, fuzzy
 msgid "Cannot create upload directory for anonymous connections."
 msgstr "Cannot create upload directory for anonymous connections!"
 
 #. anonymous dir
-#: src/modules/FtpServer.rb:1150
+#: src/modules/FtpServer.rb:1074
 msgid "<p><ul><i>FTP daemon is not configured.</i></ul></p>"
 msgstr "<p><ul><i>FTP daemon is not configured.</i></ul></p>"
 
 #. Translators: Summary head, if nothing configured
-#: src/modules/FtpServer.rb:1162
+#: src/modules/FtpServer.rb:1084
 msgid "FTP daemon"
 msgstr "FTP daemon"
 
 #. Translators: Summary head, if something configured
-#: src/modules/FtpServer.rb:1167
+#: src/modules/FtpServer.rb:1089
 msgid "FTP daemon %1"
 msgstr "FTP daemon %1"
 
-#: src/modules/FtpServer.rb:1171
+#: src/modules/FtpServer.rb:1093
 msgid "These options will be configured"
 msgstr "These options will be configured"
 

Modified: trunk/yast/en_GB/po/geo-cluster.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/geo-cluster.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/geo-cluster.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2014-05-19 09:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,16 +34,47 @@
 
 #. GeoCluster summary dialog caption
 #. GeoCluster configure2 dialog caption
+#. encoding: utf-8
+#. ------------------------------------------------------------------------------
+#. Copyright (c) 2006 Novell, Inc. All Rights Reserved.
+#.
+#.
+#. This program is free software; you can redistribute it and/or modify it under
+#. the terms of version 2 of the GNU General Public License as published by the
+#. Free Software Foundation.
+#.
+#. This program is distributed in the hope that it will be useful, but WITHOUT
+#. ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#. FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#.
+#. You should have received a copy of the GNU General Public License along with
+#. this program; if not, contact Novell, Inc.
+#.
+#. To contact Novell about this file by physical or electronic mail, you may find
+#. current contact information at www.novell.com.
+#. ------------------------------------------------------------------------------
+#. File:	include/geo-cluster/wizards.ycp
+#. Package:	Configuration of geo-cluster
+#. Summary:	Wizards definitions
+#. Authors:	Dongmao Zhang <dmzhang@suse.com>
+#.
+#. $Id: wizards.ycp 27914 2006-02-13 14:32:08Z locilka $
 #. Initialization dialog caption
 #: src/include/geo-cluster/complex.rb:83
-#: src/include/geo-cluster/dialogs.rb:430
+#: src/include/geo-cluster/dialogs.rb:416
+#: src/include/geo-cluster/dialogs.rb:689
+#: src/include/geo-cluster/wizards.rb:46
 #: src/include/geo-cluster/wizards.rb:140
-msgid "GeoCluster Configuration"
+#, fuzzy
+#| msgid "GeoCluster Configuration"
+msgid "Geo Cluster Configuration"
 msgstr "GeoCluster Configuration"
 
 #. GeoCluster overview dialog caption
 #: src/include/geo-cluster/complex.rb:143
-msgid "GeoCluster Overview"
+#, fuzzy
+#| msgid "GeoCluster Overview"
+msgid "Geo Cluster Overview"
 msgstr "GeoCluster Overview"
 
 #. encoding: utf-8
@@ -77,219 +108,218 @@
 msgid "configuration file"
 msgstr "Read configuration file"
 
-#: src/include/geo-cluster/dialogs.rb:59
-msgid "arbitrator ip"
-msgstr "arbitrator ip"
-
-#: src/include/geo-cluster/dialogs.rb:65
+#: src/include/geo-cluster/dialogs.rb:58
 msgid "transport"
 msgstr "transport"
 
-#: src/include/geo-cluster/dialogs.rb:71
+#: src/include/geo-cluster/dialogs.rb:65
 msgid "port"
 msgstr "port"
 
-#: src/include/geo-cluster/dialogs.rb:76
-msgid "site"
-msgstr "site"
+#: src/include/geo-cluster/dialogs.rb:71
+#, fuzzy
+#| msgid "arbitrator ip"
+msgid "arbitrator"
+msgstr "arbitrator ip"
 
-#: src/include/geo-cluster/dialogs.rb:79
-#: src/include/geo-cluster/dialogs.rb:653
+#: src/include/geo-cluster/dialogs.rb:74 src/include/geo-cluster/dialogs.rb:85
+#: src/include/geo-cluster/dialogs.rb:679
 msgid "Add"
 msgstr "Add"
 
-#: src/include/geo-cluster/dialogs.rb:80
-#: src/include/geo-cluster/dialogs.rb:654
+#: src/include/geo-cluster/dialogs.rb:75 src/include/geo-cluster/dialogs.rb:86
+#: src/include/geo-cluster/dialogs.rb:680
 msgid "Edit"
 msgstr "Edit"
 
-#: src/include/geo-cluster/dialogs.rb:81
-#: src/include/geo-cluster/dialogs.rb:655
+#: src/include/geo-cluster/dialogs.rb:76 src/include/geo-cluster/dialogs.rb:87
+#: src/include/geo-cluster/dialogs.rb:681
 msgid "Delete"
 msgstr "Delete"
 
-#: src/include/geo-cluster/dialogs.rb:87
-#: src/include/geo-cluster/dialogs.rb:178
+#: src/include/geo-cluster/dialogs.rb:82
+msgid "site"
+msgstr "site"
+
+#: src/include/geo-cluster/dialogs.rb:94
+#: src/include/geo-cluster/dialogs.rb:186
 msgid "ticket"
 msgstr "ticket"
 
 #. return `cacel or a string
-#: src/include/geo-cluster/dialogs.rb:98
-#: src/include/geo-cluster/dialogs.rb:120
-#: src/include/geo-cluster/dialogs.rb:197
+#: src/include/geo-cluster/dialogs.rb:106
+#: src/include/geo-cluster/dialogs.rb:128
+#: src/include/geo-cluster/dialogs.rb:205
 msgid "OK"
 msgstr "OK"
 
-#: src/include/geo-cluster/dialogs.rb:99
-#: src/include/geo-cluster/dialogs.rb:121
-#: src/include/geo-cluster/dialogs.rb:198
+#: src/include/geo-cluster/dialogs.rb:107
+#: src/include/geo-cluster/dialogs.rb:129
+#: src/include/geo-cluster/dialogs.rb:206
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/include/geo-cluster/dialogs.rb:135
+#: src/include/geo-cluster/dialogs.rb:143
 #, fuzzy
 #| msgid "Enter a valid e-mail address"
-msgid "Please enter valid ip address"
+msgid "Please enter a valid ip address"
 msgstr "Enter a valid e-mail address."
 
-#: src/include/geo-cluster/dialogs.rb:176
+#: src/include/geo-cluster/dialogs.rb:184
 msgid "Enter ticket and timeout"
 msgstr "Enter ticket and timeout"
 
-#: src/include/geo-cluster/dialogs.rb:182
+#: src/include/geo-cluster/dialogs.rb:190
 msgid "timeout"
 msgstr "timeout"
 
-#: src/include/geo-cluster/dialogs.rb:184
+#: src/include/geo-cluster/dialogs.rb:192
 #, fuzzy
 #| msgid "NFS entries"
 msgid "retries"
 msgstr "NFS entries"
 
-#: src/include/geo-cluster/dialogs.rb:186
+#: src/include/geo-cluster/dialogs.rb:194
 #, fuzzy
 #| msgid "Height"
 msgid "weights"
 msgstr "Height"
 
-#: src/include/geo-cluster/dialogs.rb:188
+#: src/include/geo-cluster/dialogs.rb:196
 #, fuzzy
 #| msgid "Expired"
 msgid "expire"
 msgstr "Expired"
 
-#: src/include/geo-cluster/dialogs.rb:190
+#: src/include/geo-cluster/dialogs.rb:198
 #, fuzzy
 #| msgid "Required patterns"
 msgid "acquire-after"
 msgstr "Required patterns"
 
-#: src/include/geo-cluster/dialogs.rb:192
+#: src/include/geo-cluster/dialogs.rb:200
 msgid "before-acquire-handler"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:229
-msgid "timeout is no valid"
+#: src/include/geo-cluster/dialogs.rb:237
+#, fuzzy
+#| msgid "timeout is no valid"
+msgid "timeout is invalid"
 msgstr "timeout is no valid"
 
-#: src/include/geo-cluster/dialogs.rb:231
+#: src/include/geo-cluster/dialogs.rb:239
 #, fuzzy
 #| msgid "timeout is no valid"
-msgid "expire is no valid"
+msgid "expire is invalid"
 msgstr "timeout is no valid"
 
-#: src/include/geo-cluster/dialogs.rb:233
+#: src/include/geo-cluster/dialogs.rb:241
 #, fuzzy
 #| msgid "timeout is no valid"
-msgid "acquireafter is no valid"
+msgid "acquireafter is invalid"
 msgstr "timeout is no valid"
 
-#: src/include/geo-cluster/dialogs.rb:235
+#: src/include/geo-cluster/dialogs.rb:243
 #, fuzzy
 #| msgid "timeout is no valid"
-msgid "retries is no valid"
+msgid "retries is invalid"
 msgstr "timeout is no valid"
 
-#: src/include/geo-cluster/dialogs.rb:237
+#: src/include/geo-cluster/dialogs.rb:245
 msgid "retries values lower than 3 is illegal"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:239
+#: src/include/geo-cluster/dialogs.rb:247
 #, fuzzy
 #| msgid "timeout is no valid"
-msgid "weights is no valid"
+msgid "weights is invalid"
 msgstr "timeout is no valid"
 
-#: src/include/geo-cluster/dialogs.rb:241
-msgid "ticket can not be null"
+#: src/include/geo-cluster/dialogs.rb:249
+#, fuzzy
+#| msgid "ticket can not be null"
+msgid "ticket can not be empty"
 msgstr "ticket can not be null"
 
 #. fill confs with global_files
-#: src/include/geo-cluster/dialogs.rb:332
-#, fuzzy
-#| msgid "Software to be installed:"
-msgid "site have to be filled"
-msgstr "Software to be installed:"
+#: src/include/geo-cluster/dialogs.rb:358
+#: src/include/geo-cluster/wizards.rb:47
+msgid "Firewall Configuration"
+msgstr "Firewall Configuration"
 
-#: src/include/geo-cluster/dialogs.rb:337
+#. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
+#. Label::BackButton(), Label::NextButton());
+#: src/include/geo-cluster/dialogs.rb:494
 #, fuzzy
-#| msgid "ticket can not be null"
-msgid "ticket have to be filled"
-msgstr "ticket can not be null"
+#| msgid "Enter an IP address of your site"
+msgid "Enter an IP address of your arbitrator"
+msgstr "Enter an IP address of your site"
 
-#: src/include/geo-cluster/dialogs.rb:344
-#: src/include/geo-cluster/dialogs.rb:582
+#: src/include/geo-cluster/dialogs.rb:505
 #, fuzzy
-#| msgid "Gateway IP address is invalid."
-msgid "arbitrator IP address is invalid!"
-msgstr "Gateway IP address is invalid."
+#| msgid "Edit IP address of your site"
+msgid "Edit IP address of your arbitrator"
+msgstr "Edit IP address of your site"
 
-#. servie:geo-cluster is the  name of /etc/sysconfig/SuSEfirewall2.d/services/geo-cluster
-#: src/include/geo-cluster/dialogs.rb:389
-msgid "Geo Cluster(geo-cluster) firewall configure"
-msgstr "Geo Cluster(geo-cluster) firewall configure"
-
-#. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
-#. Label::BackButton(), Label::NextButton());
-#. FIXME ugly work. Better use alias and function, see yast2 drbd.
-#: src/include/geo-cluster/dialogs.rb:439
-#: src/include/geo-cluster/dialogs.rb:669
-msgid "Geo Cluster configure"
-msgstr "Geo Cluster configure"
-
-#: src/include/geo-cluster/dialogs.rb:494
+#: src/include/geo-cluster/dialogs.rb:521
 msgid "Enter an IP address of your site"
 msgstr "Enter an IP address of your site"
 
-#: src/include/geo-cluster/dialogs.rb:505
+#: src/include/geo-cluster/dialogs.rb:532
 msgid "Edit IP address of your site"
 msgstr "Edit IP address of your site"
 
-#: src/include/geo-cluster/dialogs.rb:527
+#: src/include/geo-cluster/dialogs.rb:554
 #, fuzzy
 #| msgid "Zone name %1 already exists."
 msgid "Ticket name already exist!"
 msgstr "Zone name %1 already exists."
 
 #. abort?
-#: src/include/geo-cluster/dialogs.rb:573
+#: src/include/geo-cluster/dialogs.rb:600
 #, fuzzy
 #| msgid "Error: Configuration name cannot be empty."
-msgid "Configuration name can not be null"
+msgid "Configuration name can not be empty."
 msgstr "Error: Configuration name cannot be empty."
 
-#: src/include/geo-cluster/dialogs.rb:576
+#: src/include/geo-cluster/dialogs.rb:603
 #, fuzzy
 #| msgid "Error: Configuration name cannot be empty."
 msgid "Configuration name can not be duplicated."
 msgstr "Error: Configuration name cannot be empty."
 
-#: src/include/geo-cluster/dialogs.rb:589
+#: src/include/geo-cluster/dialogs.rb:610
 #, fuzzy
 #| msgid "Key is invalid."
 msgid "port is invalid!"
 msgstr "Key is invalid."
 
-#: src/include/geo-cluster/dialogs.rb:595
+#: src/include/geo-cluster/dialogs.rb:616
 #, fuzzy
 #| msgid "Software to be installed:"
 msgid "transport have to be filled!"
 msgstr "Software to be installed:"
 
-#: src/include/geo-cluster/dialogs.rb:600
+#: src/include/geo-cluster/dialogs.rb:621
 #, fuzzy
 #| msgid "Software to be installed:"
+msgid "arbitrator have to be filled!"
+msgstr "Software to be installed:"
+
+#: src/include/geo-cluster/dialogs.rb:626
+#, fuzzy
+#| msgid "Software to be installed:"
 msgid "site have to be filled!"
 msgstr "Software to be installed:"
 
-#: src/include/geo-cluster/dialogs.rb:605
+#: src/include/geo-cluster/dialogs.rb:631
 #, fuzzy
 #| msgid "ticket can not be null"
 msgid "ticket have to be filled!"
 msgstr "ticket can not be null"
 
 #. GeoCluster choose configure dialog caption
-#: src/include/geo-cluster/dialogs.rb:644
+#: src/include/geo-cluster/dialogs.rb:670
 #, fuzzy
 #| msgid "GeoCluster Configuration"
 msgid "GeoCluster Configuration Select"
@@ -297,47 +327,12 @@
 
 #. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
 #. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:650
+#: src/include/geo-cluster/dialogs.rb:676
 #, fuzzy
 #| msgid "Read configuration file"
 msgid "Choose configuration file:"
 msgstr "Read configuration file"
 
-#. encoding: utf-8
-#. ------------------------------------------------------------------------------
-#. Copyright (c) 2006 Novell, Inc. All Rights Reserved.
-#.
-#.
-#. This program is free software; you can redistribute it and/or modify it under
-#. the terms of version 2 of the GNU General Public License as published by the
-#. Free Software Foundation.
-#.
-#. This program is distributed in the hope that it will be useful, but WITHOUT
-#. ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-#. FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#.
-#. You should have received a copy of the GNU General Public License along with
-#. this program; if not, contact Novell, Inc.
-#.
-#. To contact Novell about this file by physical or electronic mail, you may find
-#. current contact information at www.novell.com.
-#. ------------------------------------------------------------------------------
-#. File:	include/geo-cluster/wizards.ycp
-#. Package:	Configuration of geo-cluster
-#. Summary:	Wizards definitions
-#. Authors:	Dongmao Zhang <dmzhang@suse.com>
-#.
-#. $Id: wizards.ycp 27914 2006-02-13 14:32:08Z locilka $
-#: src/include/geo-cluster/wizards.rb:46
-#, fuzzy
-#| msgid "GeoCluster Configuration"
-msgid "GeoCluster Configurations"
-msgstr "GeoCluster Configuration"
-
-#: src/include/geo-cluster/wizards.rb:47
-msgid "Firewall Configuration"
-msgstr "Firewall Configuration"
-
 #. Initialization dialog contents
 #: src/include/geo-cluster/wizards.rb:142
 msgid "Initializing..."
@@ -364,10 +359,16 @@
 msgstr "Cannot write global settings."
 
 #. GeoCluster read dialog caption
-#: src/modules/GeoCluster.rb:273 src/modules/GeoCluster2.pm:129
-msgid "Initializing geo-cluster Configuration"
+#: src/modules/GeoCluster.rb:273
+#, fuzzy
+#| msgid "Initializing geo-cluster Configuration"
+msgid "Initializing Geo Cluster Configuration"
 msgstr "Initializing geo-cluster Configuration"
 
+#: src/modules/GeoCluster.rb:286 src/modules/GeoCluster.rb:289
+msgid "Read SuSEFirewall Settings"
+msgstr "Read SuSEFirewall Settings"
+
 #. #-#-#-#-#  geo-cluster.rxgettext.pot (PACKAGE VERSION)  #-#-#-#-#
 #. TODO FIXME Names of real stages
 #. We do not set help text here, because it was set outside
@@ -377,10 +378,6 @@
 msgid "Read the previous settings"
 msgstr "Read the previous settings"
 
-#: src/modules/GeoCluster.rb:286 src/modules/GeoCluster.rb:289
-msgid "Read SuSEFirewall Settings"
-msgstr "Read SuSEFirewall Settings"
-
 #. #-#-#-#-#  geo-cluster.xgettext.pot  #-#-#-#-#
 #. Progress step 2/3
 #: src/modules/GeoCluster.rb:288 src/modules/GeoCluster2.pm:150
@@ -393,12 +390,11 @@
 msgid "Finished"
 msgstr "Finished"
 
-#. #-#-#-#-#  geo-cluster.rxgettext.pot (PACKAGE VERSION)  #-#-#-#-#
 #. GeoCluster write dialog caption
-#. #-#-#-#-#  geo-cluster.xgettext.pot  #-#-#-#-#
-#. GeoCluster read dialog caption
-#: src/modules/GeoCluster.rb:332 src/modules/GeoCluster2.pm:211
-msgid "Saving geo-cluster Configuration"
+#: src/modules/GeoCluster.rb:332
+#, fuzzy
+#| msgid "Saving geo-cluster Configuration"
+msgid "Saving Geo Cluster Configuration"
 msgstr "Saving geo-cluster Configuration"
 
 #. Progress stage 1/2
@@ -433,6 +429,11 @@
 msgid "Configuration summary..."
 msgstr "Configuration summary..."
 
+#. GeoCluster read dialog caption
+#: src/modules/GeoCluster2.pm:129
+msgid "Initializing geo-cluster Configuration"
+msgstr "Initializing geo-cluster Configuration"
+
 #. Progress stage 1/3
 #: src/modules/GeoCluster2.pm:141
 msgid "Read the database"
@@ -465,6 +466,11 @@
 msgid "Cannot detect devices."
 msgstr "Cannot detect devices."
 
+#. GeoCluster read dialog caption
+#: src/modules/GeoCluster2.pm:211
+msgid "Saving geo-cluster Configuration"
+msgstr "Saving geo-cluster Configuration"
+
 #. Progress stage 2/2
 #: src/modules/GeoCluster2.pm:225
 msgid "Run SuSEconfig"
@@ -479,6 +485,37 @@
 msgid "Configuration summary ..."
 msgstr "Configuration summary ..."
 
+#, fuzzy
+#~| msgid "Software to be installed:"
+#~ msgid "site have to be filled"
+#~ msgstr "Software to be installed:"
+
+#, fuzzy
+#~| msgid "ticket can not be null"
+#~ msgid "ticket have to be filled"
+#~ msgstr "ticket can not be null"
+
+#, fuzzy
+#~| msgid "Gateway IP address is invalid."
+#~ msgid "arbitrator IP address is invalid!"
+#~ msgstr "Gateway IP address is invalid."
+
+#~ msgid "Geo Cluster(geo-cluster) firewall configure"
+#~ msgstr "Geo Cluster(geo-cluster) firewall configure"
+
+#~ msgid "Geo Cluster configure"
+#~ msgstr "Geo Cluster configure"
+
+#, fuzzy
+#~| msgid "Error: Configuration name cannot be empty."
+#~ msgid "Configuration name can not be null"
+#~ msgstr "Error: Configuration name cannot be empty."
+
+#, fuzzy
+#~| msgid "GeoCluster Configuration"
+#~ msgid "GeoCluster Configurations"
+#~ msgstr "GeoCluster Configuration"
+
 #~ msgid "Cannot write sites settings."
 #~ msgstr "Cannot write sites settings."
 

Modified: trunk/yast/en_GB/po/inetd.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/inetd.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/inetd.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2003-09-09 10:54+0200\n"
 "Last-Translator: Karl Eichwalder <ke@suse.de>\n"
 "Language-Team: English <i18n@suse.de>\n"
@@ -102,11 +102,11 @@
 msgid "The 'id' option cannot be combined with other options."
 msgstr "The 'id' option cannot be combined with other options."
 
-#: src/clients/inetd.rb:401 src/include/inetd/dialogs.rb:353
+#: src/clients/inetd.rb:401 src/include/inetd/dialogs.rb:356
 msgid "Status"
 msgstr "Status"
 
-#: src/clients/inetd.rb:402 src/include/inetd/dialogs.rb:354
+#: src/clients/inetd.rb:402 src/include/inetd/dialogs.rb:357
 msgid "Service"
 msgstr "Service"
 
@@ -118,15 +118,15 @@
 msgid "Prot."
 msgstr "Prot."
 
-#: src/clients/inetd.rb:405 src/include/inetd/dialogs.rb:357
+#: src/clients/inetd.rb:405 src/include/inetd/dialogs.rb:360
 msgid "Wait"
 msgstr "Wait"
 
-#: src/clients/inetd.rb:406 src/include/inetd/dialogs.rb:358
+#: src/clients/inetd.rb:406 src/include/inetd/dialogs.rb:361
 msgid "User"
 msgstr "User"
 
-#: src/clients/inetd.rb:407 src/include/inetd/dialogs.rb:359
+#: src/clients/inetd.rb:407 src/include/inetd/dialogs.rb:362
 msgid "Server"
 msgstr "Server"
 
@@ -141,12 +141,12 @@
 msgstr "Off"
 
 #. determine wait mode (convert to string)
-#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:851
+#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:855
 #: src/include/inetd/routines.rb:211
 msgid "Yes"
 msgstr "Yes"
 
-#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:851
+#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:855
 #: src/include/inetd/routines.rb:213
 msgid "No"
 msgstr "No"
@@ -162,127 +162,127 @@
 
 #. Translators: In autoinstallation mode:
 #. The package name is stored in %1. This is Popup::ContinueCancel.
-#: src/include/inetd/dialogs.rb:160
+#: src/include/inetd/dialogs.rb:164
 msgid "Package %1 will be installed during the write process."
 msgstr "Package %1 will be installed during the write process."
 
 #. if (true) { // for debugging
 #. Translators: The package name is stored in %1. This is Popup::Message.
-#: src/include/inetd/dialogs.rb:179
+#: src/include/inetd/dialogs.rb:183
 msgid "Package %1 was not installed. The service cannot be edited."
 msgstr "Package %1 was not installed. The service cannot be edited."
 
 #. Translators: The package name is stored in %1
-#: src/include/inetd/dialogs.rb:201
+#: src/include/inetd/dialogs.rb:205
 msgid "Package %1 was successfully installed."
 msgstr "Package %1 was successfully installed."
 
 #. This is main inetd module dialog.
 #. @return dialog result
-#: src/include/inetd/dialogs.rb:299
+#: src/include/inetd/dialogs.rb:303
 msgid "&Activate All Services"
 msgstr "&Activate All Services"
 
-#: src/include/inetd/dialogs.rb:300
+#: src/include/inetd/dialogs.rb:304
 msgid "&Deactivate All Services"
 msgstr "&Deactivate All Services"
 
 #. Translators: Initial and target state of xinetd (or inetd)
-#: src/include/inetd/dialogs.rb:334
+#: src/include/inetd/dialogs.rb:339
 msgid "D&isable"
 msgstr "D&isable"
 
-#: src/include/inetd/dialogs.rb:336
+#: src/include/inetd/dialogs.rb:340
 msgid "Enab&le"
 msgstr "Enab&le"
 
 #. Main dialog edit inetd.conf
 #. Translators: Name of table with services (echo, chargen, ...)
-#: src/include/inetd/dialogs.rb:344
+#: src/include/inetd/dialogs.rb:347
 msgid "Currently Available Services"
 msgstr "Currently Available Services"
 
 #. `opt(`notify),
 #. `opt(`keepSorting),
-#: src/include/inetd/dialogs.rb:352
+#: src/include/inetd/dialogs.rb:355
 msgid "Ch"
 msgstr "Ch"
 
-#: src/include/inetd/dialogs.rb:355
+#: src/include/inetd/dialogs.rb:358
 msgid "Type "
 msgstr "Type "
 
-#: src/include/inetd/dialogs.rb:356
+#: src/include/inetd/dialogs.rb:359
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/include/inetd/dialogs.rb:360
+#: src/include/inetd/dialogs.rb:363
 msgid "Server / Args"
 msgstr "Server / Args"
 
 #. Translators: Add service
-#: src/include/inetd/dialogs.rb:370
+#: src/include/inetd/dialogs.rb:373
 msgid "&Add"
 msgstr "&Add"
 
 #. Translators: Edit service
-#: src/include/inetd/dialogs.rb:373
+#: src/include/inetd/dialogs.rb:376
 msgid "&Edit"
 msgstr "&Edit"
 
 #. Translators: Delete service
-#: src/include/inetd/dialogs.rb:376
+#: src/include/inetd/dialogs.rb:379
 msgid "&Delete"
 msgstr "&Delete"
 
 #. Translators: Change service status
-#: src/include/inetd/dialogs.rb:384
+#: src/include/inetd/dialogs.rb:387
 msgid "&Toggle Status (On or Off)"
 msgstr "&Toggle Status (On or Off)"
 
-#: src/include/inetd/dialogs.rb:396
+#: src/include/inetd/dialogs.rb:399
 msgid "Status for All &Services"
 msgstr "Status for All &Services"
 
 #. Inetd configure dialog caption
-#: src/include/inetd/dialogs.rb:410
+#: src/include/inetd/dialogs.rb:413
 msgid "Network Service Configuration (xinetd)"
 msgstr "Network Service Configuration (xinetd)"
 
 #. execute dialog
 #. Translators: Caption for EditOrCreateServiceDlg()
-#: src/include/inetd/dialogs.rb:498
+#: src/include/inetd/dialogs.rb:504
 msgid "Add a New Service Entry"
 msgstr "Add a New Service Entry"
 
 #. Translators: Popup::Error
-#: src/include/inetd/dialogs.rb:528
+#: src/include/inetd/dialogs.rb:534
 msgid "Cannot delete the service. It is not installed."
 msgstr "Cannot delete the service. It is not installed."
 
 #. Translators: Popup::Message
-#: src/include/inetd/dialogs.rb:552
+#: src/include/inetd/dialogs.rb:558
 msgid "To delete a service, select one in the main dialog"
 msgstr "To delete a service, select one in the main dialogue"
 
 #. Translators: Popup::Message
-#: src/include/inetd/dialogs.rb:599
+#: src/include/inetd/dialogs.rb:605
 msgid "To activate or deactivate a service, select one in the main dialog."
 msgstr "To activate or deactivate a service, select one in the main dialogue."
 
 #. y2milestone("Current line %1", current_line);
 #. Translators: Caption of EditOrCreateServiceDlg()
-#: src/include/inetd/dialogs.rb:736
+#: src/include/inetd/dialogs.rb:742
 msgid "Edit a service entry"
 msgstr "Edit a service entry"
 
 #. Translators: Popup::Message
-#: src/include/inetd/dialogs.rb:751
+#: src/include/inetd/dialogs.rb:757
 msgid "To edit a service, select one in the main dialog"
 msgstr "To edit a service, select one in the main dialogue"
 
 #. Translators: Popup::Warning
-#: src/include/inetd/dialogs.rb:782
+#: src/include/inetd/dialogs.rb:788
 msgid ""
 "All services are marked as disabled (locked).\n"
 "Internet super-server will be disabled."
@@ -291,54 +291,54 @@
 "Internet super-server will be disabled."
 
 #. service name
-#: src/include/inetd/dialogs.rb:807
+#: src/include/inetd/dialogs.rb:811
 msgid "&Service"
 msgstr "&Service"
 
-#: src/include/inetd/dialogs.rb:809
+#: src/include/inetd/dialogs.rb:813
 msgid "RPC Versio&n"
 msgstr "RPC Versio&n"
 
 #. service status (running or stopped)
-#: src/include/inetd/dialogs.rb:815
+#: src/include/inetd/dialogs.rb:819
 msgid "Service is acti&ve."
 msgstr "Service is acti&ve."
 
 #. service socket type
-#: src/include/inetd/dialogs.rb:828
+#: src/include/inetd/dialogs.rb:832
 msgid "Socket T&ype"
 msgstr "Socket T&ype"
 
 #. for protocol option - ediatble ComboBox
-#: src/include/inetd/dialogs.rb:839
+#: src/include/inetd/dialogs.rb:843
 msgid "&Protocol"
 msgstr "&Protocol"
 
 #. for flags (wait/nowait) - noneditable ComboBox
-#: src/include/inetd/dialogs.rb:850
+#: src/include/inetd/dialogs.rb:854
 msgid "&Wait"
 msgstr "&Wait"
 
 #. user and group ComboBoxes
-#: src/include/inetd/dialogs.rb:860
+#: src/include/inetd/dialogs.rb:864
 msgid "&User"
 msgstr "&User"
 
-#: src/include/inetd/dialogs.rb:862
+#: src/include/inetd/dialogs.rb:866
 msgid "&Group"
 msgstr "&Group"
 
 #. Server arguments
-#: src/include/inetd/dialogs.rb:865
+#: src/include/inetd/dialogs.rb:869
 msgid "S&erver"
 msgstr "S&erver"
 
-#: src/include/inetd/dialogs.rb:866
+#: src/include/inetd/dialogs.rb:870
 msgid "Server Argumen&ts"
 msgstr "Server Argumen&ts"
 
 #. Comment above the service line in inetd.conf
-#: src/include/inetd/dialogs.rb:868
+#: src/include/inetd/dialogs.rb:872
 msgid "Co&mment"
 msgstr "Co&mment"
 
@@ -352,14 +352,14 @@
 #. It does not get the NIS entries.
 #. "+" is filtered out.
 #. @return [Array] groups
-#: src/include/inetd/dialogs.rb:914 src/include/inetd/dialogs.rb:952
-#: src/include/inetd/dialogs.rb:957 src/include/inetd/dialogs.rb:996
+#: src/include/inetd/dialogs.rb:918 src/include/inetd/dialogs.rb:956
+#: src/include/inetd/dialogs.rb:961 src/include/inetd/dialogs.rb:1000
 #: src/include/inetd/routines.rb:333 src/include/inetd/routines.rb:353
 msgid "--default--"
 msgstr "--default--"
 
 #. Translators: Popup::Message
-#: src/include/inetd/dialogs.rb:942
+#: src/include/inetd/dialogs.rb:946
 msgid ""
 "Service is empty.\n"
 "Enter valid values.\n"
@@ -368,12 +368,12 @@
 "Enter valid values.\n"
 
 #. Error message
-#: src/include/inetd/dialogs.rb:948
+#: src/include/inetd/dialogs.rb:952
 msgid "Service name contains disallowed character \"/\"."
 msgstr ""
 
 #. Translators: sformat-ed() 3 strings
-#: src/include/inetd/dialogs.rb:956
+#: src/include/inetd/dialogs.rb:960
 msgid "The user %1 is reserved for internal server processes only."
 msgstr "The user %1 is reserved for internal server processes only."
 
@@ -653,57 +653,57 @@
 msgstr "Initialising ..."
 
 #. Inetd read dialog caption
-#: src/modules/Inetd.rb:185
+#: src/modules/Inetd.rb:188
 msgid "Initializing inetd Configuration"
 msgstr "Initialising inetd Configuration"
 
-#: src/modules/Inetd.rb:193
+#: src/modules/Inetd.rb:196
 msgid "Read the Configuration"
 msgstr "Read the Configuration"
 
-#: src/modules/Inetd.rb:194
+#: src/modules/Inetd.rb:197
 msgid "Reading the configuration..."
 msgstr "Reading the configuration..."
 
 #. read database
-#: src/modules/Inetd.rb:194 src/modules/Inetd.rb:212 src/modules/Inetd.rb:276
-#: src/modules/Inetd.rb:340
+#: src/modules/Inetd.rb:197 src/modules/Inetd.rb:214 src/modules/Inetd.rb:278
+#: src/modules/Inetd.rb:306
 msgid "Finished"
 msgstr "Finished"
 
 #. Inetd read dialog caption
-#: src/modules/Inetd.rb:267
+#: src/modules/Inetd.rb:269
 msgid "Saving inetd Configuration"
 msgstr "Saving inetd Configuration"
 
-#: src/modules/Inetd.rb:275
+#: src/modules/Inetd.rb:277
 msgid "Write the settings"
 msgstr "Write the settings"
 
-#: src/modules/Inetd.rb:276
+#: src/modules/Inetd.rb:278
 msgid "Writing the settings..."
 msgstr "Writing the settings..."
 
 #. in future: catch errors
-#: src/modules/Inetd.rb:337
+#: src/modules/Inetd.rb:303
 msgid "Cannot write settings!"
 msgstr "Cannot write settings!"
 
 #. "enabled" defaults to true
-#: src/modules/Inetd.rb:607
+#: src/modules/Inetd.rb:598
 msgid "<p><ul><i>All services are marked as stopped.</i></ul></p>"
 msgstr "<p><ul><i>All services are marked as stopped.</i></ul></p>"
 
 #. Translators: Summary head, if nothing configured
-#: src/modules/Inetd.rb:618
+#: src/modules/Inetd.rb:609
 msgid "Network services"
 msgstr "Network services"
 
 #. Translators: Summary head, if something configured
-#: src/modules/Inetd.rb:623
+#: src/modules/Inetd.rb:613
 msgid "Network services are managed via %1"
 msgstr "Network services are managed via %1"
 
-#: src/modules/Inetd.rb:627
+#: src/modules/Inetd.rb:616
 msgid "These services will be enabled"
 msgstr "These services will be enabled"

Modified: trunk/yast/en_GB/po/installation.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/installation.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/installation.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: installation.en_GB\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-03 16:45+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2008-05-16 13:44+0200\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"

Modified: trunk/yast/en_GB/po/instserver.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/instserver.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/instserver.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2001-07-17 16:27+0200\n"
 "Last-Translator: James Ogley <ogley@suse.co.uk>\n"
 "Language-Team: English <i18n@suse.de>\n"
@@ -63,25 +63,25 @@
 msgstr "Change Media"
 
 #. %1 is the current cd number
-#: src/include/instserver/dialogs.rb:241
+#: src/include/instserver/dialogs.rb:230
 msgid "Insert CD %1 then press continue."
 msgstr "Insert CD %1 then press continue."
 
-#: src/include/instserver/dialogs.rb:246
+#: src/include/instserver/dialogs.rb:235
 msgid "Select ISO image %1 then press continue."
 msgstr "Select ISO image %1 then press continue."
 
 #. %2 is the product name and version
-#: src/include/instserver/dialogs.rb:252
+#: src/include/instserver/dialogs.rb:241
 msgid "Insert CD %1 of %2."
 msgstr "Insert CD %1 of %2."
 
-#: src/include/instserver/dialogs.rb:253
+#: src/include/instserver/dialogs.rb:242
 msgid "Select ISO image %1 of %2."
 msgstr "Select ISO image %1 of %2."
 
 #. popup request, %1 is CD medium name
-#: src/include/instserver/dialogs.rb:292
+#: src/include/instserver/dialogs.rb:281
 #, fuzzy
 msgid ""
 "Insert\n"
@@ -91,12 +91,12 @@
 "'%1'"
 
 #. popup request, %1 is ISO name
-#: src/include/instserver/dialogs.rb:321
+#: src/include/instserver/dialogs.rb:310
 msgid "Select %1"
 msgstr "Select %1"
 
 #. add-on medium (e.g. service pack) doesn't match configured repository
-#: src/include/instserver/dialogs.rb:573
+#: src/include/instserver/dialogs.rb:551
 msgid ""
 "The medium requires product %1, which is not provided\n"
 "by the current repository.\n"
@@ -109,63 +109,63 @@
 "Select the base product medium first."
 
 #. else, we create CD1, CD2, etc. (for code10 always)
-#: src/include/instserver/dialogs.rb:697
+#: src/include/instserver/dialogs.rb:669
 msgid "Copying CD contents to local directory"
 msgstr "Copying CD contents to local directory"
 
-#: src/include/instserver/dialogs.rb:698
+#: src/include/instserver/dialogs.rb:670
 msgid "This may take a while..."
 msgstr "This may take a while..."
 
 #. TODO: report more details (stderr)
 #. rename the directory
-#: src/include/instserver/dialogs.rb:755 src/modules/Instserver.rb:1361
+#: src/include/instserver/dialogs.rb:727 src/modules/Instserver.rb:1341
 msgid "Error while moving repository content."
 msgstr "Error while moving repository content."
 
 #. Instserver configuration dialog caption
 #. Instserver configuration dialog caption
-#: src/include/instserver/dialogs.rb:978
-#: src/include/instserver/dialogs.rb:1191
+#: src/include/instserver/dialogs.rb:949
+#: src/include/instserver/dialogs.rb:1162
 msgid "Repository Configuration"
 msgstr "Repository Configuration"
 
 #. Instserver configure1 dialog contents
-#: src/include/instserver/dialogs.rb:994
+#: src/include/instserver/dialogs.rb:965
 msgid "Read &CD or DVD Medium"
 msgstr "Read &CD or DVD Medium"
 
-#: src/include/instserver/dialogs.rb:1000
+#: src/include/instserver/dialogs.rb:971
 msgid "Data &Source"
 msgstr "Data &Source"
 
-#: src/include/instserver/dialogs.rb:1008
+#: src/include/instserver/dialogs.rb:979
 msgid "Use &ISO Images"
 msgstr "Use &ISO Images"
 
-#: src/include/instserver/dialogs.rb:1017
+#: src/include/instserver/dialogs.rb:988
 msgid "Di&rectory with CD Images:"
 msgstr "Di&rectory with CD Images:"
 
-#: src/include/instserver/dialogs.rb:1020
-#: src/include/instserver/dialogs.rb:1400
+#: src/include/instserver/dialogs.rb:991
+#: src/include/instserver/dialogs.rb:1371
 msgid "Select &Directory"
 msgstr "Select &Directory"
 
 #. abort?
 #. abort?
-#: src/include/instserver/dialogs.rb:1063
-#: src/include/instserver/dialogs.rb:1469
+#: src/include/instserver/dialogs.rb:1034
+#: src/include/instserver/dialogs.rb:1440
 msgid "Select Directory"
 msgstr "Select Directory"
 
 #. abort?
-#: src/include/instserver/dialogs.rb:1080
-#: src/include/instserver/dialogs.rb:1244
+#: src/include/instserver/dialogs.rb:1051
+#: src/include/instserver/dialogs.rb:1215
 msgid "Installation server name missing."
 msgstr "Installation server name missing."
 
-#: src/include/instserver/dialogs.rb:1095
+#: src/include/instserver/dialogs.rb:1066
 msgid ""
 "Contents already exist in this directory.\n"
 "Not copying CDs."
@@ -174,7 +174,7 @@
 "Not copying CDs."
 
 #. for translators: popup question (prefer more shorter lines than few long lines)
-#: src/include/instserver/dialogs.rb:1123
+#: src/include/instserver/dialogs.rb:1094
 msgid ""
 "Add an additional product (Service Pack, Additional\n"
 "Package CD, etc.) to the repository?"
@@ -183,20 +183,20 @@
 "Package CD, etc.) to the repository?"
 
 #. Instserver configure1 dialog contents
-#: src/include/instserver/dialogs.rb:1199
+#: src/include/instserver/dialogs.rb:1170
 msgid "Repository &Name:"
 msgstr "Repository &Name:"
 
-#: src/include/instserver/dialogs.rb:1204
+#: src/include/instserver/dialogs.rb:1175
 msgid "A&nnounce as Installation Service with SLP"
 msgstr "A&nnounce as Installation Service with SLP"
 
-#: src/include/instserver/dialogs.rb:1252
+#: src/include/instserver/dialogs.rb:1223
 msgid "Invalid repository name."
 msgstr "Invalid repository name."
 
 #. an error message - entered repository name already exists
-#: src/include/instserver/dialogs.rb:1260
+#: src/include/instserver/dialogs.rb:1231
 msgid ""
 "Repository '%1' already exists,\n"
 "enter another name."
@@ -205,7 +205,7 @@
 "enter another name."
 
 #. create directory only for a new repository
-#: src/include/instserver/dialogs.rb:1273
+#: src/include/instserver/dialogs.rb:1244
 #, fuzzy
 msgid ""
 "Error while creating <tt>repository</tt> directory.\n"
@@ -219,7 +219,7 @@
 "is writable and try again."
 
 #. confirm removal of a repository, the action is done immediately and cannot be reverted
-#: src/include/instserver/dialogs.rb:1292
+#: src/include/instserver/dialogs.rb:1263
 msgid ""
 "Repository '%1' has been marked to delete.\n"
 "When adding a new repository with the same name\n"
@@ -229,88 +229,88 @@
 msgstr ""
 
 #. Instserver server dialog caption
-#: src/include/instserver/dialogs.rb:1376
+#: src/include/instserver/dialogs.rb:1347
 #, fuzzy
 msgid "Initial Setup -- Initial Setup"
 msgstr "Initial Setup -- Servers"
 
-#: src/include/instserver/dialogs.rb:1392
+#: src/include/instserver/dialogs.rb:1363
 msgid "Do Not Configure Any Net&work Services"
 msgstr "Do Not Configure Any Net&work Services"
 
-#: src/include/instserver/dialogs.rb:1397
+#: src/include/instserver/dialogs.rb:1368
 msgid "Di&rectory to Contain Repositories:"
 msgstr "Di&rectory to Contain Repositories:"
 
 #. radio button label
-#: src/include/instserver/dialogs.rb:1412
+#: src/include/instserver/dialogs.rb:1383
 msgid "&Configure as HTTP Repository"
 msgstr "&Configure as HTTP Repository"
 
 #. radio button label
-#: src/include/instserver/dialogs.rb:1420
+#: src/include/instserver/dialogs.rb:1391
 msgid "&Configure as FTP Repository"
 msgstr "&Configure as FTP Repository"
 
 #. radio button label
-#: src/include/instserver/dialogs.rb:1428
+#: src/include/instserver/dialogs.rb:1399
 msgid "&Configure as NFS Repository"
 msgstr "&Configure as NFS Repository"
 
-#: src/include/instserver/dialogs.rb:1480
+#: src/include/instserver/dialogs.rb:1451
 msgid "Directory path for the installation server missing."
 msgstr "Directory path for the installation server missing."
 
 #. Instserver configure2 dialog caption
-#: src/include/instserver/dialogs.rb:1507
+#: src/include/instserver/dialogs.rb:1478
 msgid "Installation Server -- NFS"
 msgstr "Installation Server -- NFS"
 
 #. Instserver nfs dialog contents
-#: src/include/instserver/dialogs.rb:1525
+#: src/include/instserver/dialogs.rb:1496
 msgid "&Host Wild Card"
 msgstr "&Host Wild Card"
 
-#: src/include/instserver/dialogs.rb:1527
+#: src/include/instserver/dialogs.rb:1498
 msgid "&Options"
 msgstr "&Options"
 
 #. store the firewall setting, (activation is in SetupNFS())
-#: src/include/instserver/dialogs.rb:1585
+#: src/include/instserver/dialogs.rb:1556
 msgid "Error occurred while configuring NFS."
 msgstr "Error occurred while configuring NFS."
 
 #. Instserver configure2 dialog caption
-#: src/include/instserver/dialogs.rb:1617
+#: src/include/instserver/dialogs.rb:1588
 msgid "Installation Server -- FTP"
 msgstr "Installation Server -- FTP"
 
 #. Instserver nfs dialog contents
-#: src/include/instserver/dialogs.rb:1625
+#: src/include/instserver/dialogs.rb:1596
 msgid "&FTP Server Root Directory:"
 msgstr "&FTP Server Root Directory:"
 
-#: src/include/instserver/dialogs.rb:1627
+#: src/include/instserver/dialogs.rb:1598
 msgid "&Directory Alias:"
 msgstr "&Directory Alias:"
 
 #. store the firewall setting, (activation is in SetupFTP())
-#: src/include/instserver/dialogs.rb:1684
+#: src/include/instserver/dialogs.rb:1655
 msgid "Error occurred while configuring FTP."
 msgstr "Error occurred while configuring FTP."
 
 #. Instserver configure2 dialog caption
-#: src/include/instserver/dialogs.rb:1704
+#: src/include/instserver/dialogs.rb:1675
 msgid "Installation Server -- HTTP"
 msgstr "Installation Server -- HTTP"
 
 #. Instserver nfs dialog contents
-#: src/include/instserver/dialogs.rb:1720
+#: src/include/instserver/dialogs.rb:1691
 msgid "&Directory Alias"
 msgstr "&Directory Alias"
 
 #. store the firewall setting, (activation is in SetupHTTP())
-#: src/include/instserver/dialogs.rb:1777
+#: src/include/instserver/dialogs.rb:1748
 msgid "Error creating HTTPD configuration."
 msgstr "Error creating HTTPD configuration."
 
@@ -654,7 +654,7 @@
 "Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n"
 
 #. Read service data using _auto
-#: src/modules/Instserver.rb:308
+#: src/modules/Instserver.rb:306
 msgid ""
 "The FTP installation server requires an FTP server package. The vsftpd package\n"
 "will now be installed.\n"
@@ -681,82 +681,82 @@
 #. @param string directory
 #. @param [String] options
 #. @return [Boolean]
-#: src/modules/Instserver.rb:570
+#: src/modules/Instserver.rb:569
 msgid ""
 "Directory is already exported via NFS.\n"
 "Leave NFS exports unmodified?\n"
 msgstr ""
 
 #. Instserver read dialog caption
-#: src/modules/Instserver.rb:1152
+#: src/modules/Instserver.rb:1155
 msgid "Initializing Configuration"
 msgstr "Initialising Configuration"
 
 #. Progress stage 1/2
-#: src/modules/Instserver.rb:1166
+#: src/modules/Instserver.rb:1165
 msgid "Read configuration file"
 msgstr "Read configuration file"
 
 #. Progress stage 2/2
-#: src/modules/Instserver.rb:1168
+#: src/modules/Instserver.rb:1167
 #, fuzzy
 msgid "Search for a new repository"
 msgstr "Look for a new repository"
 
 #. Progress step 1/2
-#: src/modules/Instserver.rb:1172
+#: src/modules/Instserver.rb:1171
 msgid "Reading configuration file..."
 msgstr "Reading configuration file..."
 
 #. Progress step 2/2
-#: src/modules/Instserver.rb:1174
+#: src/modules/Instserver.rb:1173
 #, fuzzy
 msgid "Searching for a new repository..."
 msgstr "Looking for a new repository..."
 
 #. Progress finished
 #. Progress finished
-#: src/modules/Instserver.rb:1176 src/modules/Instserver.rb:1278
+#: src/modules/Instserver.rb:1175 src/modules/Instserver.rb:1260
 msgid "Finished"
 msgstr "Finished"
 
-#. Error message
-#: src/modules/Instserver.rb:1224
+#. TRANSLATORS: Error message
+#: src/modules/Instserver.rb:1188
 msgid "Cannot read current settings."
 msgstr "Cannot read current settings."
 
 #. Instserver read dialog caption
-#: src/modules/Instserver.rb:1254
+#: src/modules/Instserver.rb:1240
 msgid "Saving Installation Server Configuration"
 msgstr "Saving Installation Server Configuration"
 
 #. Progress stage 1/2
-#: src/modules/Instserver.rb:1268
+#: src/modules/Instserver.rb:1250
 msgid "Write the settings"
 msgstr "Write the settings"
 
 #. Progress stage 2/2
-#: src/modules/Instserver.rb:1270
+#: src/modules/Instserver.rb:1252
 msgid "Run SuSEconfig"
 msgstr "Run SuSEconfig"
 
 #. Progress step 1/2
-#: src/modules/Instserver.rb:1274
+#: src/modules/Instserver.rb:1256
 msgid "Writing the settings..."
 msgstr "Writing the settings..."
 
 #. Progress step 2/2
-#: src/modules/Instserver.rb:1276
+#: src/modules/Instserver.rb:1258
 msgid "Running SuSEconfig..."
 msgstr "Running SuSEconfig..."
 
 #. Error message
-#: src/modules/Instserver.rb:1292
+#: src/modules/Instserver.rb:1274
 msgid "Cannot write settings."
 msgstr "Cannot write settings."
 
 #. Configuration summary text for autoyast
-#: src/modules/Instserver.rb:1465
+#: src/modules/Instserver.rb:1441
 msgid "Configured Repositories"
 msgstr "Configured Repositories"
 

Modified: trunk/yast/en_GB/po/iscsi-lio-server.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/iscsi-lio-server.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/iscsi-lio-server.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2001-07-17 16:27+0200\n"
 "Last-Translator: James Ogley <ogley@suse.co.uk>\n"
 "Language-Team: English <i18n@suse.de>\n"
@@ -53,24 +53,24 @@
 #. third tab - targets / luns
 #. targets dialog
 #: src/include/iscsi-lio-server/dialogs.rb:89
-#: src/include/iscsi-lio-server/dialogs.rb:318
+#: src/include/iscsi-lio-server/dialogs.rb:320
 #: src/modules/IscsiLioServer.rb:443
 msgid "Targets"
 msgstr "Targets"
 
 #: src/include/iscsi-lio-server/dialogs.rb:115
-#: src/include/iscsi-lio-server/dialogs.rb:174
+#: src/include/iscsi-lio-server/dialogs.rb:176
 msgid "Target"
 msgstr "Target"
 
 #: src/include/iscsi-lio-server/dialogs.rb:124
-#: src/include/iscsi-lio-server/dialogs.rb:183
+#: src/include/iscsi-lio-server/dialogs.rb:185
 msgid "Identifier"
 msgstr "Identifier"
 
 #: src/include/iscsi-lio-server/dialogs.rb:128
-#: src/include/iscsi-lio-server/dialogs.rb:187
-#: src/include/iscsi-lio-server/dialogs.rb:318
+#: src/include/iscsi-lio-server/dialogs.rb:189
+#: src/include/iscsi-lio-server/dialogs.rb:320
 #, fuzzy
 #| msgid "Write groups"
 msgid "Portal group"
@@ -90,151 +90,157 @@
 
 #: src/include/iscsi-lio-server/dialogs.rb:143
 #, fuzzy
+#| msgid "Invalid IP address."
+msgid "Bind all IP addresses"
+msgstr "Invalid IP address."
+
+#: src/include/iscsi-lio-server/dialogs.rb:145
+#, fuzzy
 #| msgid "User Authentication"
 msgid "Use Authentication"
 msgstr "User Authentication"
 
-#: src/include/iscsi-lio-server/dialogs.rb:147
+#: src/include/iscsi-lio-server/dialogs.rb:149
 #: src/include/iscsi-lio-server/widgets.rb:301
 msgid "LUN"
 msgstr "LUN"
 
-#: src/include/iscsi-lio-server/dialogs.rb:147
+#: src/include/iscsi-lio-server/dialogs.rb:149
 msgid "Name"
 msgstr "Name"
 
-#: src/include/iscsi-lio-server/dialogs.rb:147
+#: src/include/iscsi-lio-server/dialogs.rb:149
 msgid "Path"
 msgstr "Path"
 
-#: src/include/iscsi-lio-server/dialogs.rb:152
-#: src/include/iscsi-lio-server/dialogs.rb:196
-#: src/include/iscsi-lio-server/dialogs.rb:235
-#: src/include/iscsi-lio-server/dialogs.rb:323
-#: src/include/iscsi-lio-server/dialogs.rb:370
+#: src/include/iscsi-lio-server/dialogs.rb:154
+#: src/include/iscsi-lio-server/dialogs.rb:198
+#: src/include/iscsi-lio-server/dialogs.rb:237
+#: src/include/iscsi-lio-server/dialogs.rb:325
+#: src/include/iscsi-lio-server/dialogs.rb:372
 #: src/include/iscsi-lio-server/widgets.rb:442
 msgid "Add"
 msgstr "Add"
 
-#: src/include/iscsi-lio-server/dialogs.rb:153
-#: src/include/iscsi-lio-server/dialogs.rb:236
-#: src/include/iscsi-lio-server/dialogs.rb:324
-#: src/include/iscsi-lio-server/dialogs.rb:371
+#: src/include/iscsi-lio-server/dialogs.rb:155
+#: src/include/iscsi-lio-server/dialogs.rb:238
+#: src/include/iscsi-lio-server/dialogs.rb:326
+#: src/include/iscsi-lio-server/dialogs.rb:373
 msgid "Edit"
 msgstr "Edit"
 
-#: src/include/iscsi-lio-server/dialogs.rb:154
-#: src/include/iscsi-lio-server/dialogs.rb:199
-#: src/include/iscsi-lio-server/dialogs.rb:237
-#: src/include/iscsi-lio-server/dialogs.rb:325
-#: src/include/iscsi-lio-server/dialogs.rb:372
+#: src/include/iscsi-lio-server/dialogs.rb:156
+#: src/include/iscsi-lio-server/dialogs.rb:201
+#: src/include/iscsi-lio-server/dialogs.rb:239
+#: src/include/iscsi-lio-server/dialogs.rb:327
+#: src/include/iscsi-lio-server/dialogs.rb:374
 #: src/include/iscsi-lio-server/widgets.rb:443
 msgid "Delete"
 msgstr "Delete"
 
-#: src/include/iscsi-lio-server/dialogs.rb:191
+#: src/include/iscsi-lio-server/dialogs.rb:193
 #, fuzzy
 #| msgid "Clients"
 msgid "Client"
 msgstr "Clients"
 
-#: src/include/iscsi-lio-server/dialogs.rb:191
+#: src/include/iscsi-lio-server/dialogs.rb:193
 msgid "Lun Mapping"
 msgstr ""
 
-#: src/include/iscsi-lio-server/dialogs.rb:191
+#: src/include/iscsi-lio-server/dialogs.rb:193
 #, fuzzy
 #| msgid "Authors"
 msgid "Auth"
 msgstr "Authors"
 
-#: src/include/iscsi-lio-server/dialogs.rb:197
+#: src/include/iscsi-lio-server/dialogs.rb:199
 #, fuzzy
 #| msgid "Edit "
 msgid "Edit LUN"
 msgstr "Edit "
 
-#: src/include/iscsi-lio-server/dialogs.rb:198
+#: src/include/iscsi-lio-server/dialogs.rb:200
 #, fuzzy
 #| msgid "Edit &SOA"
 msgid "Edit Auth"
 msgstr "Edit &SOA"
 
-#: src/include/iscsi-lio-server/dialogs.rb:200
+#: src/include/iscsi-lio-server/dialogs.rb:202
 msgid "Copy"
 msgstr ""
 
 #. enable/disable none/incoming/outgoing authentication
-#: src/include/iscsi-lio-server/dialogs.rb:214
+#: src/include/iscsi-lio-server/dialogs.rb:216
 #: src/include/iscsi-lio-server/widgets.rb:207
 #: src/modules/IscsiLioServer.rb:434
 msgid "No Authentication"
 msgstr "No Authentication"
 
-#: src/include/iscsi-lio-server/dialogs.rb:223
+#: src/include/iscsi-lio-server/dialogs.rb:225
 #: src/include/iscsi-lio-server/widgets.rb:218
 #: src/modules/IscsiLioServer.rb:437
 msgid "Incoming Authentication"
 msgstr "Incoming Authentication"
 
 #. dialog to add/modify user and password
-#: src/include/iscsi-lio-server/dialogs.rb:230
-#: src/include/iscsi-lio-server/dialogs.rb:251
+#: src/include/iscsi-lio-server/dialogs.rb:232
+#: src/include/iscsi-lio-server/dialogs.rb:253
 #: src/include/iscsi-lio-server/widgets.rb:223
 #: src/include/iscsi-lio-server/widgets.rb:236
-#: src/include/iscsi-lio-server/widgets.rb:721
+#: src/include/iscsi-lio-server/widgets.rb:720
 msgid "Username"
 msgstr "Username"
 
-#: src/include/iscsi-lio-server/dialogs.rb:230
-#: src/include/iscsi-lio-server/dialogs.rb:252
+#: src/include/iscsi-lio-server/dialogs.rb:232
+#: src/include/iscsi-lio-server/dialogs.rb:254
 #: src/include/iscsi-lio-server/widgets.rb:224
 #: src/include/iscsi-lio-server/widgets.rb:237
-#: src/include/iscsi-lio-server/widgets.rb:722
+#: src/include/iscsi-lio-server/widgets.rb:721
 msgid "Password"
 msgstr "Password"
 
-#: src/include/iscsi-lio-server/dialogs.rb:246
+#: src/include/iscsi-lio-server/dialogs.rb:248
 #: src/include/iscsi-lio-server/widgets.rb:231
 #: src/modules/IscsiLioServer.rb:440
 msgid "Outgoing Authentication"
 msgstr "Outgoing Authentication"
 
 #. radio button (starting LIO target service - option 1)
-#: src/include/iscsi-lio-server/dialogs.rb:272
+#: src/include/iscsi-lio-server/dialogs.rb:274
 msgid "When &Booting"
 msgstr "When &Booting"
 
 #. radio button (starting LIO target service - option 2)
-#: src/include/iscsi-lio-server/dialogs.rb:276
+#: src/include/iscsi-lio-server/dialogs.rb:278
 msgid "&Manually"
 msgstr "&Manually"
 
 #. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:282
+#: src/include/iscsi-lio-server/dialogs.rb:284
 #: src/modules/IscsiLioServer.rb:429
 msgid "When Booting"
 msgstr "When Booting"
 
 #. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:284
+#: src/include/iscsi-lio-server/dialogs.rb:286
 #: src/modules/IscsiLioServer.rb:431
 msgid "Manually"
 msgstr "Manually"
 
 #. dialog for expert settings
-#: src/include/iscsi-lio-server/dialogs.rb:367
+#: src/include/iscsi-lio-server/dialogs.rb:369
 msgid "Key"
 msgstr "Key"
 
-#: src/include/iscsi-lio-server/dialogs.rb:367
+#: src/include/iscsi-lio-server/dialogs.rb:369
 msgid "Value"
 msgstr "Value"
 
 #. Summary dialog
 #. @return dialog result
 #. Main dialog - tabbed
-#: src/include/iscsi-lio-server/dialogs.rb:428
+#: src/include/iscsi-lio-server/dialogs.rb:430
 #, fuzzy
 #| msgid "iSCSI Target Overview"
 msgid "iSCSI LIO Target Overview"
@@ -242,33 +248,33 @@
 
 #. expert dialog
 #. LUN details
-#: src/include/iscsi-lio-server/dialogs.rb:436
+#: src/include/iscsi-lio-server/dialogs.rb:438
 #: src/include/iscsi-lio-server/helps.rb:178
 #: src/include/iscsi-lio-server/helps.rb:183
 msgid "<h1>iSCSI Target</h1>"
 msgstr "<h1>iSCSI Target</h1>"
 
 #. dialog for add target
-#: src/include/iscsi-lio-server/dialogs.rb:471
+#: src/include/iscsi-lio-server/dialogs.rb:473
 msgid "Add iSCSI Target"
 msgstr "Add iSCSI Target"
 
 #. discovery authentication dialog
-#: src/include/iscsi-lio-server/dialogs.rb:505
+#: src/include/iscsi-lio-server/dialogs.rb:507
 #, fuzzy
 #| msgid "Modify iSCSI Target"
 msgid "Modify iSCSI Target Client Setup"
 msgstr "Modify iSCSI Target"
 
 #. edit target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:539
+#: src/include/iscsi-lio-server/dialogs.rb:541
 #, fuzzy
 #| msgid "Modify iSCSI Target"
 msgid "Modify iSCSI Target Lun Setup"
 msgstr "Modify iSCSI Target"
 
 #. expert target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:572
+#: src/include/iscsi-lio-server/dialogs.rb:574
 msgid "iSCSI Target Expert Settings"
 msgstr "iSCSI Target Expert Settings"
 
@@ -605,20 +611,20 @@
 msgid "Need to enable at least one Authentification!"
 msgstr "You must specify at least one authentication mechanism."
 
-#: src/include/iscsi-lio-server/widgets.rb:620
+#: src/include/iscsi-lio-server/widgets.rb:619
 #, fuzzy
 #| msgid "Clients"
 msgid "Client name:"
 msgstr "Clients"
 
-#: src/include/iscsi-lio-server/widgets.rb:623
+#: src/include/iscsi-lio-server/widgets.rb:622
 #, fuzzy
 #| msgid "Import CA from Disk"
 msgid "Import LUNs from TPG"
 msgstr "Import CA from Disk"
 
-#: src/include/iscsi-lio-server/widgets.rb:639
-#: src/include/iscsi-lio-server/widgets.rb:695
+#: src/include/iscsi-lio-server/widgets.rb:638
+#: src/include/iscsi-lio-server/widgets.rb:694
 #, fuzzy
 #| msgid "Alias name must not be empty."
 msgid "Client name must not be empty!"
@@ -627,8 +633,8 @@
 #. Don't check IscsiLioData.GetClntList(@curr_target, @curr_tpg) for existing
 #. client name. It's allowed to have several LUNs accessable for same client.
 #. TODO: verify whether it's necessary to check @changed_lun here?
-#: src/include/iscsi-lio-server/widgets.rb:645
-#: src/include/iscsi-lio-server/widgets.rb:701
+#: src/include/iscsi-lio-server/widgets.rb:644
+#: src/include/iscsi-lio-server/widgets.rb:700
 #, fuzzy
 #| msgid "Alias with name %1 already exists"
 msgid "Client name already exists!"
@@ -636,33 +642,32 @@
 
 #. Copy exisiting LUN, i.e. give additional client access to the LUN
 #. (which is allowed, makes sense e.g. with multipath)
-#: src/include/iscsi-lio-server/widgets.rb:678
+#: src/include/iscsi-lio-server/widgets.rb:677
 msgid "New client name:"
 msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:724
+#: src/include/iscsi-lio-server/widgets.rb:723
 msgid "OK"
 msgstr "OK"
 
-#: src/include/iscsi-lio-server/widgets.rb:725
+#: src/include/iscsi-lio-server/widgets.rb:724
 msgid "Cancel"
 msgstr "Cancel"
 
 #. remove a item
 #. **************** Edit Dialog	*****************************
 #. init values for modifying target (read it from stored map)
-#: src/include/iscsi-lio-server/widgets.rb:820
-#: src/include/iscsi-lio-server/widgets.rb:934
-#: src/include/iscsi-lio-server/widgets.rb:1292
+#: src/include/iscsi-lio-server/widgets.rb:819
+#: src/include/iscsi-lio-server/widgets.rb:933
+#: src/include/iscsi-lio-server/widgets.rb:1291
 msgid "Really delete the selected item?"
 msgstr "Really delete the selected item?"
 
-#: src/include/iscsi-lio-server/widgets.rb:1002
+#: src/include/iscsi-lio-server/widgets.rb:1001
 msgid "Problem creating target %1 with tpg %2"
 msgstr ""
 
-#. brackets needed around IPv6
-#: src/include/iscsi-lio-server/widgets.rb:1024
+#: src/include/iscsi-lio-server/widgets.rb:1023
 #, fuzzy
 #| msgid ""
 #| "Problem with resetting resource group:\n"
@@ -672,66 +677,66 @@
 "Problem with resetting resource group:\n"
 "%1\n"
 
-#: src/include/iscsi-lio-server/widgets.rb:1045
+#: src/include/iscsi-lio-server/widgets.rb:1044
 #, fuzzy
 #| msgid "Error while removing %1\n"
 msgid "Problem removing lun %1"
 msgstr "Error while removing %1\n"
 
-#: src/include/iscsi-lio-server/widgets.rb:1070
+#: src/include/iscsi-lio-server/widgets.rb:1069
 msgid "Problem setting lun %1 (name:%2) to path %3"
 msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:1084
+#: src/include/iscsi-lio-server/widgets.rb:1083
 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:1202
+#: src/include/iscsi-lio-server/widgets.rb:1201
 msgid "The target cannot be empty."
 msgstr "The target cannot be empty."
 
-#: src/include/iscsi-lio-server/widgets.rb:1206
+#: src/include/iscsi-lio-server/widgets.rb:1205
 #, fuzzy
 #| msgid "The target cannot be empty."
 msgid "The target portal group cannot be empty."
 msgstr "The target cannot be empty."
 
-#: src/include/iscsi-lio-server/widgets.rb:1217
+#: src/include/iscsi-lio-server/widgets.rb:1216
 msgid "The target already exists."
 msgstr "The target already exists."
 
-#: src/include/iscsi-lio-server/widgets.rb:1237
+#: src/include/iscsi-lio-server/widgets.rb:1236
 msgid "Incoming"
 msgstr "Incoming"
 
-#: src/include/iscsi-lio-server/widgets.rb:1240
+#: src/include/iscsi-lio-server/widgets.rb:1239
 msgid "Outgoing"
 msgstr "Outgoing"
 
-#: src/include/iscsi-lio-server/widgets.rb:1242
+#: src/include/iscsi-lio-server/widgets.rb:1241
 msgid "None"
 msgstr "None"
 
-#: src/include/iscsi-lio-server/widgets.rb:1265
-#: src/include/iscsi-lio-server/widgets.rb:1368
-#: src/include/iscsi-lio-server/widgets.rb:1405
+#: src/include/iscsi-lio-server/widgets.rb:1264
+#: src/include/iscsi-lio-server/widgets.rb:1367
+#: src/include/iscsi-lio-server/widgets.rb:1404
 msgid "Disabled"
 msgstr "Disabled"
 
-#: src/include/iscsi-lio-server/widgets.rb:1457
+#: src/include/iscsi-lio-server/widgets.rb:1456
 msgid "Problem removing lun %4 for client %3 in %1:%2"
 msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:1472
+#: src/include/iscsi-lio-server/widgets.rb:1471
 msgid "Problem adding lun %4:%5 for client %3 in %1:%2"
 msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:1493
+#: src/include/iscsi-lio-server/widgets.rb:1492
 msgid "Problem removing client %3 from %1:%2"
 msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:1517
+#: src/include/iscsi-lio-server/widgets.rb:1516
 #, fuzzy
 #| msgid ""
 #| "Error occurred while creating directory %1:\n"
@@ -741,7 +746,7 @@
 "Error occurred while creating directory %1:\n"
 "%2"
 
-#: src/include/iscsi-lio-server/widgets.rb:1553
+#: src/include/iscsi-lio-server/widgets.rb:1551
 msgid "Problem changing auth for client %3 in %1:%2"
 msgstr ""
 
@@ -758,11 +763,11 @@
 msgstr "Initialising..."
 
 #. local IPv6
-#: src/modules/IscsiLioData.rb:1409
+#: src/modules/IscsiLioData.rb:1420
 msgid "Cannot save lio setup"
 msgstr ""
 
-#: src/modules/IscsiLioData.rb:1413
+#: src/modules/IscsiLioData.rb:1424
 msgid "Cannot save tcm setup"
 msgstr ""
 

Modified: trunk/yast/en_GB/po/isns.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/isns.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/isns.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2001-07-17 16:27+0200\n"
 "Last-Translator: James Ogley <ogley@suse.co.uk>\n"
 "Language-Team: English <i18n@suse.de>\n"
@@ -45,119 +45,87 @@
 msgstr "Service"
 
 #. second tab - iSCSI Nodes
-#: src/include/isns/dialogs.rb:57 src/include/isns/dialogs.rb:132
+#: src/include/isns/dialogs.rb:55 src/include/isns/dialogs.rb:102
 #, fuzzy
 msgid "iSCSI Nodes"
 msgstr "&SCSI devices"
 
 #. third tab - Discovery Domains
-#: src/include/isns/dialogs.rb:67 src/include/isns/dialogs.rb:150
+#: src/include/isns/dialogs.rb:65 src/include/isns/dialogs.rb:120
 #, fuzzy
 msgid "Discovery Domains"
 msgstr "Mailserver Domains"
 
-#. fourth tab - discovery domain sets
-#: src/include/isns/dialogs.rb:77 src/include/isns/dialogs.rb:211
-#, fuzzy
-msgid "Discovery Domains Sets"
-msgstr "Discovered Targets"
-
-#: src/include/isns/dialogs.rb:99
+#: src/include/isns/dialogs.rb:87
 msgid "When &Booting"
 msgstr "When &Booting"
 
-#: src/include/isns/dialogs.rb:100
+#: src/include/isns/dialogs.rb:88
 msgid "&Manually"
 msgstr "&Manually"
 
-#: src/include/isns/dialogs.rb:103
+#: src/include/isns/dialogs.rb:91
 msgid "When Booting"
 msgstr "When Booting"
 
-#: src/include/isns/dialogs.rb:104
+#: src/include/isns/dialogs.rb:92
 msgid "Manually"
 msgstr "Manually"
 
-#: src/include/isns/dialogs.rb:115
+#: src/include/isns/dialogs.rb:105 src/include/isns/dialogs.rb:156
+#: src/include/isns/widgets.rb:66
 #, fuzzy
-msgid "Address of iSNS Server"
-msgstr "IP Address of A&FS Server"
-
-#: src/include/isns/dialogs.rb:135 src/include/isns/dialogs.rb:186
-#: src/include/isns/widgets.rb:164
-#, fuzzy
 msgid "iSCSI Node Name"
 msgstr "This Node Name"
 
-#: src/include/isns/dialogs.rb:135 src/include/isns/dialogs.rb:186
-#: src/include/isns/widgets.rb:206
+#: src/include/isns/dialogs.rb:105 src/include/isns/dialogs.rb:156
+#: src/include/isns/widgets.rb:108
 #, fuzzy
 msgid "Node Type"
 msgstr "Zone Type"
 
-#: src/include/isns/dialogs.rb:138 src/include/isns/dialogs.rb:163
-#: src/include/isns/dialogs.rb:224
+#: src/include/isns/dialogs.rb:108 src/include/isns/dialogs.rb:133
 msgid "Delete"
 msgstr "Delete"
 
-#: src/include/isns/dialogs.rb:156 src/include/isns/dialogs.rb:247
-#: src/include/isns/widgets.rb:32
+#: src/include/isns/dialogs.rb:126 src/include/isns/widgets.rb:29
 #, fuzzy
 msgid "Discovery Domain Name"
 msgstr "Clients Domain Name"
 
-#: src/include/isns/dialogs.rb:162
+#: src/include/isns/dialogs.rb:132
 #, fuzzy
 msgid "Create Discovery Domain"
 msgstr "Create Home Directory on Login"
 
-#: src/include/isns/dialogs.rb:181
+#: src/include/isns/dialogs.rb:151
 #, fuzzy
 msgid "Discovery Domain Members"
 msgstr "Windows Domain Membership"
 
-#: src/include/isns/dialogs.rb:192
+#: src/include/isns/dialogs.rb:162
 #, fuzzy
 msgid "Add Existing iSCSI Node"
 msgstr "Add an Existing TSIG Key"
 
-#: src/include/isns/dialogs.rb:193
+#: src/include/isns/dialogs.rb:163
 msgid "Create iSCSI Node Member"
 msgstr ""
 
-#: src/include/isns/dialogs.rb:194 src/include/isns/dialogs.rb:254
+#: src/include/isns/dialogs.rb:164
 msgid "Remove"
 msgstr "Remove"
 
-#: src/include/isns/dialogs.rb:217 src/include/isns/widgets.rb:122
-#, fuzzy
-msgid "Discovery Domain Set Name"
-msgstr "Clients Domain Name"
-
-#: src/include/isns/dialogs.rb:223
-msgid "Create Discovery Domain Set"
-msgstr ""
-
-#: src/include/isns/dialogs.rb:242
-#, fuzzy
-msgid "Discovery Domain Set Members"
-msgstr "Windows Domain Membership"
-
-#: src/include/isns/dialogs.rb:253 src/include/isns/widgets.rb:252
-#, fuzzy
-msgid "Add Discovery Domain"
-msgstr "Mailserver Domains"
-
 #. Summary dialog
 #. @return dialog result
 #. Main dialog - tabbed
-#: src/include/isns/dialogs.rb:275
+#: src/include/isns/dialogs.rb:185
 #, fuzzy
 msgid "iSNS Service"
 msgstr "Service"
 
 #. curr_target = "";
-#: src/include/isns/dialogs.rb:289
+#: src/include/isns/dialogs.rb:198
 #, fuzzy
 msgid "<h1>iSNS Service</h1>"
 msgstr "<h1>iSCSI Server</h1>"
@@ -215,96 +183,73 @@
 "Configure iSCSI Server here.<br></p>\n"
 
 #: src/include/isns/helps.rb:39
-msgid "<b><big>iSNS Server location</big></b><br>The DNS name or the IP address of the iSNS service can be entered as the iSNS address.\n"
-msgstr ""
-
-#: src/include/isns/helps.rb:42
 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>"
 msgstr ""
 
 #. discovery domains
-#: src/include/isns/helps.rb:46
+#: 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 members from the domain but does not delete the iSCSI node members.</p>"
 msgstr ""
 
-#: src/include/isns/helps.rb:49
+#: src/include/isns/helps.rb:46
 msgid "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:53
+#: src/include/isns/helps.rb:50
 msgid "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:56
+#: src/include/isns/helps.rb:53
 msgid "<p>The discovery domain set members list is refreshed whenever a different discovery domain set is selected.</p>"
 msgstr ""
 
 #. **************** global funcions and variables *****
-#: src/include/isns/widgets.rb:28
+#: src/include/isns/widgets.rb:25
 #, fuzzy
 msgid "Create New Discovery Domain"
 msgstr "Create Home Directory on Login"
 
-#: src/include/isns/widgets.rb:39
-msgid "Select discovery domain set to which discovery domain will be added."
-msgstr ""
-
-#: src/include/isns/widgets.rb:43
+#: src/include/isns/widgets.rb:102
 #, fuzzy
-msgid "Discovery Domain Name Set"
-msgstr "Clients Domain Name"
-
-#: src/include/isns/widgets.rb:200
-#, fuzzy
 msgid "Add iSCSI node to discovery domain"
 msgstr "iSCSI Initiator Discovery"
 
-#: src/include/isns/widgets.rb:203
+#: src/include/isns/widgets.rb:105
 #, fuzzy
 msgid "Available Nodes to Add"
 msgstr "Available modules"
 
-#: src/include/isns/widgets.rb:206 src/include/isns/widgets.rb:249
+#: src/include/isns/widgets.rb:108
 msgid "Name"
 msgstr "Name"
 
-#: src/include/isns/widgets.rb:210
+#: src/include/isns/widgets.rb:112
 #, fuzzy
 msgid "Add Node"
 msgstr "Add Nodes"
 
-#: src/include/isns/widgets.rb:211 src/include/isns/widgets.rb:253
+#: src/include/isns/widgets.rb:113
 msgid "Done"
 msgstr "Done"
 
-#: src/include/isns/widgets.rb:245
-msgid "Add Discovery Domain to Set"
-msgstr ""
-
-#: src/include/isns/widgets.rb:248
+#: src/include/isns/widgets.rb:145 src/include/isns/widgets.rb:168
 #, fuzzy
-msgid "Available Discovery Domains"
-msgstr "Mailserver Domains"
-
-#: src/include/isns/widgets.rb:297 src/include/isns/widgets.rb:320
-#, fuzzy
 msgid "Target or Initiator"
 msgstr "Target Directory"
 
-#. IsnsServer::addDD(address, add_map["VALUE"]:"");
-#: src/include/isns/widgets.rb:506 src/include/isns/widgets.rb:586
+#: src/include/isns/widgets.rb:241
 msgid "Really delete the selected item?"
 msgstr "Really delete the selected item?"
 
-#: src/include/isns/widgets.rb:541
+#: src/include/isns/widgets.rb:270
 msgid "Really delete this domain?"
 msgstr "Really delete this domain?"
 
 #. boolean display = true;
 #. Report::DisplayErrors(display,10);
-#: src/include/isns/widgets.rb:711
-msgid "Unable to connect to iSNS server. Check iSNS server address."
+#: src/include/isns/widgets.rb:351
+msgid "Unable to connect to iSNS server. Check if iSNS server is running."
 msgstr ""
 
 #. Initialization dialog caption
@@ -319,84 +264,87 @@
 msgstr "Initialising..."
 
 #. test if required package ("open-isns") is installed
-#: src/modules/IsnsServer.rb:172
+#: src/modules/IsnsServer.rb:149
 #, fuzzy
 msgid "<p>To configure the isns service, the <b>%1</b> package must be installed.</p>"
 msgstr "<p>To configure the SLP server, the <b>%1</b> package must be installed.</p>"
 
-#: src/modules/IsnsServer.rb:175
+#: src/modules/IsnsServer.rb:152
 msgid "<p>Install it now?</p>"
 msgstr "<p>Install it now?</p>"
 
 #. IsnsServer read dialog caption
-#: src/modules/IsnsServer.rb:569
+#: src/modules/IsnsServer.rb:277
 #, fuzzy
 msgid "Initializing isns daemon configuration"
 msgstr "Initialising modem configuration"
 
-#. Progress stage 1/3
-#: src/modules/IsnsServer.rb:585
-msgid "Read the database"
-msgstr "Read the database"
+#. IsnsServer write dialog caption
+#: src/modules/IsnsServer.rb:300
+#, fuzzy
+msgid "Saving isns Configuration"
+msgstr "Saving inetd Configuration"
 
-#. Progress stage 2/3
-#: src/modules/IsnsServer.rb:587
-msgid "Read the previous settings"
-msgstr "Read the previous settings"
+#, fuzzy
+#~ msgid "Discovery Domains Sets"
+#~ msgstr "Discovered Targets"
 
-#. Progress stage 3/3
-#: src/modules/IsnsServer.rb:589
-msgid "Detect the devices"
-msgstr "Detect the devices"
+#, fuzzy
+#~ msgid "Address of iSNS Server"
+#~ msgstr "IP Address of A&FS Server"
 
-#. Progress step 1/3
-#: src/modules/IsnsServer.rb:593
-msgid "Reading the database..."
-msgstr "Reading the database..."
+#, fuzzy
+#~ msgid "Discovery Domain Set Name"
+#~ msgstr "Clients Domain Name"
 
-#. Progress step 2/3
-#: src/modules/IsnsServer.rb:595
-msgid "Reading the previous settings..."
-msgstr "Reading the previous settings..."
+#, fuzzy
+#~ msgid "Discovery Domain Set Members"
+#~ msgstr "Windows Domain Membership"
 
-#. Progress step 3/3
-#: src/modules/IsnsServer.rb:597
-msgid "Detecting the devices..."
-msgstr "Detecting the devices..."
+#, fuzzy
+#~ msgid "Add Discovery Domain"
+#~ msgstr "Mailserver Domains"
 
-#. Progress finished
-#. Progress finished
-#: src/modules/IsnsServer.rb:599 src/modules/IsnsServer.rb:677
-msgid "Finished"
-msgstr "Finished"
+#, fuzzy
+#~ msgid "Discovery Domain Name Set"
+#~ msgstr "Clients Domain Name"
 
-#. IsnsServer write dialog caption
-#: src/modules/IsnsServer.rb:651
 #, fuzzy
-msgid "Saving isns Configuration"
-msgstr "Saving inetd Configuration"
+#~ msgid "Available Discovery Domains"
+#~ msgstr "Mailserver Domains"
 
-#. Progress stage 1/2
-#: src/modules/IsnsServer.rb:667
-msgid "Write the settings"
-msgstr "Write the settings"
+#~ msgid "Read the database"
+#~ msgstr "Read the database"
 
-#. Progress stage 2/2
-#: src/modules/IsnsServer.rb:669
-msgid "Run SuSEconfig"
-msgstr "Run SuSEconfig"
+#~ msgid "Read the previous settings"
+#~ msgstr "Read the previous settings"
 
-#. Progress step 1/2
-#: src/modules/IsnsServer.rb:673
-msgid "Writing the settings..."
-msgstr "Writing the settings..."
+#~ msgid "Detect the devices"
+#~ msgstr "Detect the devices"
 
-#. Progress step 2/2
-#: src/modules/IsnsServer.rb:675
-msgid "Running SuSEconfig..."
-msgstr "Running SuSEconfig..."
+#~ msgid "Reading the database..."
+#~ msgstr "Reading the database..."
 
-#. write configuration (/etc/isns.conf)
-#: src/modules/IsnsServer.rb:689
-msgid "Cannot write settings."
-msgstr "Cannot write settings."
+#~ msgid "Reading the previous settings..."
+#~ msgstr "Reading the previous settings..."
+
+#~ msgid "Detecting the devices..."
+#~ msgstr "Detecting the devices..."
+
+#~ msgid "Finished"
+#~ msgstr "Finished"
+
+#~ msgid "Write the settings"
+#~ msgstr "Write the settings"
+
+#~ msgid "Run SuSEconfig"
+#~ msgstr "Run SuSEconfig"
+
+#~ msgid "Writing the settings..."
+#~ msgstr "Writing the settings..."
+
+#~ msgid "Running SuSEconfig..."
+#~ msgstr "Running SuSEconfig..."
+
+#~ msgid "Cannot write settings."
+#~ msgstr "Cannot write settings."

Modified: trunk/yast/en_GB/po/ldap.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/ldap.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/ldap.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2014-05-19 09:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -184,8 +184,17 @@
 "does not exist in the LDAP directory.\n"
 "The object with the selected DN cannot be created.\n"
 
+#. error message
+#: src/Ldap.rb:1431
+msgid ""
+"An object with the selected DN exists, but it is not a template object.\n"
+"Select another one.\n"
+msgstr ""
+"An object with the selected DN exists, but it is not a template object.\n"
+"Select another one.\n"
+
 #. yes/no popup, %1 is value of DN
-#: src/Ldap.rb:1634
+#: src/Ldap.rb:1717
 msgid ""
 "No entry with DN '%1'\n"
 "exists on the LDAP server. Create it now?\n"

Modified: trunk/yast/en_GB/po/mail.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/mail.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/mail.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2014-10-29 16:21+0100\n"
 "PO-Revision-Date: 2008-05-21 15:49+0200\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"
@@ -362,6 +362,18 @@
 msgid "Start &fetchmail"
 msgstr "Start Detection"
 
+#: src/include/mail/ui.rb:523
+#, fuzzy
+#| msgid "[manually set]"
+msgid "manual"
+msgstr "[manually set]"
+
+#: src/include/mail/ui.rb:523
+#, fuzzy
+#| msgid "Daemon"
+msgid "daemon"
+msgstr "Daemon"
+
 #. frame label: mail downloading (fetchmail)
 #: src/include/mail/ui.rb:529
 msgid "&Downloading"

Modified: trunk/yast/en_GB/po/network.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/network.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/network.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-10 11:10+0200\n"
+"POT-Creation-Date: 2014-10-29 16:21+0100\n"
 "PO-Revision-Date: 2009-10-08 07:09+0200\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"
@@ -2249,7 +2249,7 @@
 "Abort saving by pressing <b>Abort</b>.</p>\n"
 
 #. Network setup method help
-#. NetworkManager and wicked are programs
+#. NetworkManager and ifup are programs
 #: src/include/network/lan/help.rb:51
 #, fuzzy
 msgid ""
@@ -2263,7 +2263,9 @@
 "manage connections for all interfaces. It is well-suited\n"
 "to switching among wired and multiple wireless networks.</p>\n"
 
-#: src/include/network/lan/help.rb:57
+#. Network setup method help
+#. NetworkManager and wicked are programs
+#: src/include/network/lan/help.rb:59
 #, fuzzy
 msgid ""
 "<p>Use <b>wicked</b> if you do not run a desktop environment\n"
@@ -2273,17 +2275,8 @@
 "if you do not run a desktop environment (GNOME or KDE)\n"
 "or need to use multiple interfaces at once.</p>\n"
 
-#. For systems not including NetworkManager by default (bnc#892678)
-#: src/include/network/lan/help.rb:62
+#: src/include/network/lan/help.rb:63
 msgid ""
-"<p><b>NetworkManager</b> is not part of every base\n"
-"installation repository. For example, to enable it on SUSE\n"
-"Linux Enterprise Server add the Workstation Extension\n"
-"repository and install the 'NetworkManager' package.</p>\n"
-msgstr ""
-
-#: src/include/network/lan/help.rb:68
-msgid ""
 "<p><b><big>Network Card Overview</big></b><br>\n"
 "Obtain an overview of installed network cards. Additionally,\n"
 "edit their configuration.<br></p>\n"
@@ -2292,7 +2285,7 @@
 "Obtain an overview of installed network cards. Additionally,\n"
 "edit their configuration.<br></p>\n"
 
-#: src/include/network/lan/help.rb:73
+#: src/include/network/lan/help.rb:68
 msgid ""
 "<p><b><big>Adding a Network Card:</big></b><br>\n"
 "Press <b>Add</b> to configure a new network card manually.</p>\n"
@@ -2300,7 +2293,7 @@
 "<p><b><big>Adding a Network Card:</big></b><br>\n"
 "Press <b>Add</b> to configure a new network card manually.</p>\n"
 
-#: src/include/network/lan/help.rb:76
+#: src/include/network/lan/help.rb:71
 #, fuzzy
 msgid ""
 "<p><b><big>Configuring or Deleting:</big></b><br>\n"
@@ -2312,7 +2305,7 @@
 "Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n"
 
 #. IPv6 help
-#: src/include/network/lan/help.rb:83
+#: src/include/network/lan/help.rb:78
 #, fuzzy
 msgid ""
 "<p><b><big>IPv6 Protocol Settings</big></b></p>\n"
@@ -2329,12 +2322,12 @@
 "module for ipv6). When ipv6 protocol is not used on your network, response \n"
 "time can be faster."
 
-#: src/include/network/lan/help.rb:91
+#: src/include/network/lan/help.rb:86
 msgid "<p>All changes will be applied after reboot.</p>"
 msgstr "<p>All changes will be applied after reboot.</p>"
 
 #. Routing dialog help 1/2
-#: src/include/network/lan/help.rb:94
+#: src/include/network/lan/help.rb:89
 msgid ""
 "<p>The routing can be set up in this dialog.\n"
 "The <b>Default Gateway</b> matches every possible destination, but poorly. \n"
@@ -2348,7 +2341,7 @@
 "used instead of the default route. The idea of the default route is simply\n"
 "to enable you to say \"and everything else should go here.\"</p>\n"
 
-#: src/include/network/lan/help.rb:101
+#: src/include/network/lan/help.rb:96
 msgid ""
 "<p>For each route, enter destination network IP address, gateway address,\n"
 "and netmask. To omit any of these values, use a dash sign \"-\". Select\n"
@@ -2356,13 +2349,13 @@
 msgstr ""
 
 #. Routing dialog help 2/2
-#: src/include/network/lan/help.rb:107
+#: src/include/network/lan/help.rb:102
 msgid ""
 "<p>Enable <b>IPv4 Forwarding</b> (forwarding packets from external networks\n"
 "to the internal one) if this system is a router.\n"
 msgstr ""
 
-#: src/include/network/lan/help.rb:111
+#: src/include/network/lan/help.rb:106
 msgid ""
 "<p>Enable <b>IPv6 Forwarding</b> (forwarding packets from external networks\n"
 "to the internal one) if this system is a router.\n"
@@ -2370,14 +2363,14 @@
 "autoconfiguration (SLAAC)."
 msgstr ""
 
-#: src/include/network/lan/help.rb:117
+#: src/include/network/lan/help.rb:112
 msgid ""
 "<p><b>Important:</b> if the firewall is enabled, allowing forwarding alone is not enough. \n"
 "You should enable masquerading and/or set at least one redirect rule in the\n"
 "firewall configuration. Use the YaST firewall module.</p>\n"
 msgstr ""
 
-#: src/include/network/lan/help.rb:122
+#: src/include/network/lan/help.rb:117
 #, fuzzy
 msgid ""
 "<p>If you are using DHCP to get an IP address, check whether you get\n"
@@ -2395,7 +2388,7 @@
 "the hostname at runtime may confuse the graphical desktop.\n"
 "</p> "
 
-#: src/include/network/lan/help.rb:129
+#: src/include/network/lan/help.rb:124
 msgid ""
 "<p><b>Assign Hostname to Loopback IP</b> associates your hostname with \n"
 "the IP address <tt>127.0.0.2</tt> (loopback) in <tt>/etc/hosts</tt>. This is a \n"
@@ -2404,7 +2397,7 @@
 "if this computer provides some network services.</p>\n"
 msgstr ""
 
-#: src/include/network/lan/help.rb:136
+#: src/include/network/lan/help.rb:131
 msgid ""
 "<p>Enter the name servers and domain search list for resolving \n"
 "hostnames. Usually they can be obtained by DHCP.</p>\n"
@@ -2413,7 +2406,7 @@
 "hostnames. Usually they can be obtained by DHCP.</p>\n"
 
 #. resolver dialog help
-#: src/include/network/lan/help.rb:140
+#: src/include/network/lan/help.rb:135
 msgid ""
 "<p>A name server is a computer that translates hostnames into\n"
 "IP addresses. This value must be entered as an <b>IP address</b>\n"
@@ -2424,7 +2417,7 @@
 "(for example, 192.168.0.42), not as a hostname.</p>\n"
 
 #. resolver dialog help
-#: src/include/network/lan/help.rb:146
+#: src/include/network/lan/help.rb:141
 msgid ""
 "<p>Search domain is the domain name where hostname searching starts.\n"
 "The primary search domain is usually the same as the domain name of\n"
@@ -2436,7 +2429,7 @@
 "your computer (for example, suse.de). There may be additional search domains\n"
 "(such as suse.com). Separate the domains with commas or white space.</p>\n"
 
-#: src/include/network/lan/help.rb:152
+#: src/include/network/lan/help.rb:147
 msgid ""
 "<p>Enter the short name for this computer (e.g. <i>mymachine</i>) and the DNS domain\n"
 "(e.g. <i>example.com</i>) that it belongs to. The domain is especially important if this \n"
@@ -2444,7 +2437,7 @@
 "command.</p>"
 msgstr ""
 
-#: src/include/network/lan/help.rb:158
+#: src/include/network/lan/help.rb:153
 msgid ""
 "<p>Select the way how the DNS configuration will be modified (name servers,\n"
 "search list, the content of <i>/etc/resolv.conf</i>). Normally, it is handled\n"
@@ -2454,7 +2447,7 @@
 "configurations.</p>\n"
 msgstr ""
 
-#: src/include/network/lan/help.rb:166
+#: src/include/network/lan/help.rb:161
 msgid ""
 "<p>By choosing <b>Only Manually</b>, <i>netconfig</i> will no longer be\n"
 "allowed to modify <i>/etc/resolv.conf</i>. You can however edit the file\n"
@@ -2468,7 +2461,7 @@
 
 #. Address dialog help 1-6/8: dynamic address preferred
 #. Address dialog help 1/8
-#: src/include/network/lan/help.rb:179
+#: src/include/network/lan/help.rb:174
 #, fuzzy
 msgid ""
 "<p><b><big>Address Setup</big></b></p>\n"
@@ -2479,12 +2472,12 @@
 "<p>Select <b>No Address Setup</b> if you don't want any IP address for this device.\n"
 "This is particularly useful for bonding ethernet devices.</p>"
 
-#: src/include/network/lan/help.rb:184
+#: src/include/network/lan/help.rb:179
 msgid "<p>Check <b>iBFT</b> if you want to keep the network configured in your BIOS.</p>\n"
 msgstr ""
 
 #. Address dialog help 2/8
-#: src/include/network/lan/help.rb:188
+#: src/include/network/lan/help.rb:183
 #, fuzzy
 msgid ""
 "<p>Select <b>Dynamic Address</b> if you do not have a static IP address \n"
@@ -2494,7 +2487,7 @@
 "assigned by the system administrator or your cable or DSL provider.</p>"
 
 #. Address dialog help 3/8
-#: src/include/network/lan/help.rb:192
+#: src/include/network/lan/help.rb:187
 #, fuzzy
 msgid ""
 "<p>Choose one of the dynamic address assignment methods. Select <b>DHCP</b>\n"
@@ -2506,7 +2499,7 @@
 "obtained automatically from the server.<p>"
 
 #. Address dialog help 4/8
-#: src/include/network/lan/help.rb:198
+#: src/include/network/lan/help.rb:193
 #, fuzzy
 msgid ""
 "<p>To search for an IP address and assign it statically, select \n"
@@ -2518,7 +2511,7 @@
 "</b>. Otherwise, network addresses must be assigned <b>statically</b>.</p>"
 
 #. Address dialog help 5/8
-#: src/include/network/lan/help.rb:204
+#: src/include/network/lan/help.rb:199
 #, fuzzy
 msgid ""
 "<p>Enter the <b>IP Address</b> (for example: <tt>192.168.100.99</tt>) for your computer, and the \n"
@@ -2530,7 +2523,7 @@
 "of your peer.</p>"
 
 #. Address dialog help 6/8
-#: src/include/network/lan/help.rb:210
+#: src/include/network/lan/help.rb:205
 #, fuzzy
 msgid ""
 "<p>For <b>Static Address Setup</b> enter the static IP address for your computer (for example: <tt>192.168.100.99</tt>) and\n"
@@ -2542,7 +2535,7 @@
 "fully qualified hostname for this IP address. It will be written to <i>/etc/hosts</i>.</p>"
 
 #. Address dialog help 8/8
-#: src/include/network/lan/help.rb:216
+#: src/include/network/lan/help.rb:211
 msgid ""
 "<p>Contact your <b>network administrator</b> for more information about\n"
 "the network configuration.</p>"
@@ -2550,7 +2543,7 @@
 "<p>Contact your <b>network administrator</b> for more information about\n"
 "the network configuration.</p>"
 
-#: src/include/network/lan/help.rb:219
+#: src/include/network/lan/help.rb:214
 msgid ""
 "<p>DHCP configuration is not recommended for this product.\n"
 "Components of this product might not work with DHCP.</p>"
@@ -2558,7 +2551,7 @@
 "<p>DHCP configuration is not recommended for this product.\n"
 "Components of this product might not work with DHCP.</p>"
 
-#: src/include/network/lan/help.rb:222
+#: src/include/network/lan/help.rb:217
 msgid ""
 "<p><b><big>Firewall Zone</big></b></p>\n"
 "<p>Select the firewall zone to put the interface into. If you\n"
@@ -2576,11 +2569,11 @@
 "interface. If you do not select a zone and no others exist, \n"
 "the firewall will be disabled.</p>"
 
-#: src/include/network/lan/help.rb:231
+#: src/include/network/lan/help.rb:226
 msgid "<p><b>Mandatory Interface</b> specifies whether the network service reports failure if the interface fails to start at boot time.</p>"
 msgstr "<p><b>Mandatory Interface</b> specifies whether the network service reports failure if the interface fails to start at boot time.</p>"
 
-#: src/include/network/lan/help.rb:234
+#: src/include/network/lan/help.rb:229
 #, fuzzy
 msgid ""
 "<p><b><big>Maximum Transfer Unit</big></b></p>\n"
@@ -2597,7 +2590,7 @@
 "especially on slow dial-up connections. Select one of the recommended values\n"
 "or define your own one.</p>"
 
-#: src/include/network/lan/help.rb:242
+#: src/include/network/lan/help.rb:237
 #, fuzzy
 msgid ""
 "<p>Select the slave devices for the bond device.\n"
@@ -2605,13 +2598,13 @@
 msgstr "<p>Select the slave devices for the bond device. Only the devices whose Device Activation is set to Never and have No Address Setup are available.</p>"
 
 #. DHCP dialog help 1/7
-#: src/include/network/lan/help.rb:247
+#: src/include/network/lan/help.rb:242
 #, fuzzy
 msgid "<p><b><big>DHCP Client Options</big></b></p>"
 msgstr "<p><b><big>DHCP client options</big></b></p>"
 
 #. DHCP dialog help 2/7
-#: src/include/network/lan/help.rb:249
+#: src/include/network/lan/help.rb:244
 msgid ""
 "<p>The <b>DHCP Client Identifier</b>, if left empty, defaults to\n"
 "the hardware address of the network interface. It must be different for each\n"
@@ -2626,7 +2619,7 @@
 "network interface and thus the same hardware address.</p>"
 
 #. DHCP dialog help 3/7
-#: src/include/network/lan/help.rb:257
+#: src/include/network/lan/help.rb:252
 #, fuzzy
 msgid ""
 "<p>The <b>Hostname to Send</b> specifies a string used for the\n"
@@ -2649,7 +2642,7 @@
 "Leave empty not to send a hostname.</p>"
 
 #. Aliases dialog help 1/4
-#: src/include/network/lan/help.rb:269
+#: src/include/network/lan/help.rb:264
 #, fuzzy
 msgid ""
 "<p><b><big>Additional Addresses</big></b></p>\n"
@@ -2659,7 +2652,7 @@
 "<p>Configure additional addresses of an interface (its aliases) in this table.</p>"
 
 #. Aliases dialog help 2/4
-#: src/include/network/lan/help.rb:273
+#: src/include/network/lan/help.rb:268
 #, fuzzy
 #| msgid ""
 #| "<p>Enter an <b>Alias Name</b>, an <b>IP Address</b>, and\n"
@@ -2672,7 +2665,7 @@
 "the <b>Netmask</b>.</p>"
 
 #. Aliases dialog help 3/4
-#: src/include/network/lan/help.rb:277
+#: src/include/network/lan/help.rb:272
 msgid ""
 "<p><b>IPv4 Address Label</b>, formerly known as Alias Name, is optional and legacy. The total\n"
 "              length of interface name (inclusive of the colon and label) is\n"
@@ -2680,14 +2673,14 @@
 msgstr ""
 
 #. Aliases dialog help 3/4, #83766
-#: src/include/network/lan/help.rb:283
+#: src/include/network/lan/help.rb:278
 msgid "<p>Do not include the interface name in the alias name. For example, enter <b>foo</b> instead of <b>eth0:foo</b>.</p>"
 msgstr "<p>Do not include the interface name in the alias name. For example, enter <b>foo</b> instead of <b>eth0:foo</b>.</p>"
 
 #. shared between WirelessDialog and WirelessKeyPopup
 #. this is suited to the button-switched key typing
 #. Translators: dialog help
-#: src/include/network/lan/help.rb:289
+#: src/include/network/lan/help.rb:284
 #, fuzzy
 msgid ""
 "<p>Choose between three <b>Key Input Types</b> for your key.\n"
@@ -2717,7 +2710,7 @@
 "</p> "
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:304
+#: src/include/network/lan/help.rb:299
 msgid ""
 "<p>Here, set the most important settings\n"
 "for wireless networking.</p>"
@@ -2726,7 +2719,7 @@
 "for wireless networking.</p>"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:308
+#: src/include/network/lan/help.rb:303
 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"
@@ -2741,7 +2734,7 @@
 "acts as an access point).</p>\n"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:316
+#: src/include/network/lan/help.rb:311
 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"
@@ -2760,7 +2753,7 @@
 "signal strength.</p>\n"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:326
+#: src/include/network/lan/help.rb:321
 #, fuzzy
 msgid ""
 "<p>In some networks, you need to set an <b>Authentication Mode</b>.\n"
@@ -2798,7 +2791,7 @@
 "<b>Managed</b>.</p>\n"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:345
+#: src/include/network/lan/help.rb:340
 msgid ""
 "<p>To use WEP, enter the\n"
 "WEP encryption key to use. It can have a key\n"
@@ -2813,7 +2806,7 @@
 "are dynamically generated, so you only need to enter 40 to 232 bits.</p>\n"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:353
+#: src/include/network/lan/help.rb:348
 msgid ""
 "<p>To use WPA-PSK (sometimes referred to as WPA Home),\n"
 "enter the preshared key. This\n"
@@ -2830,7 +2823,7 @@
 "easy to guess as the passphrase.</p>\n"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:362
+#: src/include/network/lan/help.rb:357
 msgid ""
 "<p>To use WPA-EAP (sometimes referred to as WPA Enterprise),\n"
 "enter some additional parameters in the next dialog.</p>\n"
@@ -2839,7 +2832,7 @@
 "enter some additional parameters in the next dialogue.</p>\n"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:366
+#: src/include/network/lan/help.rb:361
 msgid ""
 "<p>These values will be written to the interface configuration file\n"
 "'ifcfg-*' in '/etc/sysconfig/network'. If you need additional settings,\n"

Modified: trunk/yast/en_GB/po/packager.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/packager.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/packager.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: yast2 9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-15 15:57+0200\n"
+"POT-Creation-Date: 2014-10-29 16:21+0100\n"
 "PO-Revision-Date: 2007-08-16 20:13+0100\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"
@@ -180,8 +180,8 @@
 #. an error popup
 #. an error popup
 #. an error popup
-#: src/clients/inst_kickoff.rb:490 src/clients/inst_kickoff.rb:573
-#: src/clients/inst_kickoff.rb:649 src/clients/inst_kickoff.rb:706
+#: src/clients/inst_kickoff.rb:461 src/clients/inst_kickoff.rb:544
+#: src/clients/inst_kickoff.rb:620 src/clients/inst_kickoff.rb:677
 msgid "Backup of %1 failed. See %2 for details."
 msgstr "Backup of %1 failed. See %2 for details."
 
@@ -880,7 +880,7 @@
 
 #. popup message part 2 followed by other info
 #. popup message, after message header, header of details
-#: src/clients/repositories.rb:1011 src/modules/Packages.rb:1326
+#: src/clients/repositories.rb:1011 src/modules/Packages.rb:1323
 #: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310
 msgid "Details:"
 msgstr "Details:"
@@ -888,7 +888,7 @@
 #. popup message part 3
 #. end of popup message, question
 #. end of popup message, question
-#: src/clients/repositories.rb:1013 src/modules/Packages.rb:1334
+#: src/clients/repositories.rb:1013 src/modules/Packages.rb:1331
 #: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312
 msgid "Try again?"
 msgstr "Try again?"
@@ -1576,7 +1576,7 @@
 #. popup message part 1
 #. Import GPG keys found in the inst-sys
 #: src/include/packager/repositories_include.rb:319
-#: src/modules/Packages.rb:1321 src/modules/SourceManager.rb:306
+#: src/modules/Packages.rb:1318 src/modules/SourceManager.rb:306
 #, fuzzy
 msgid ""
 "Unable to create repository\n"
@@ -1616,7 +1616,7 @@
 #. popup error
 #. popup error
 #: src/modules/AddOnProduct.rb:517 src/modules/AddOnProduct.rb:619
-#: src/modules/ProductLicense.rb:538 src/modules/ProductLicense.rb:729
+#: src/modules/ProductLicense.rb:534 src/modules/ProductLicense.rb:725
 #, fuzzy
 msgid "An error occurred while preparing the installation system."
 msgstr "An error occurred during the installation of"
@@ -1692,7 +1692,7 @@
 #. adding the product to the list of products (BNC #269625)
 #. no such products
 #: src/modules/AddOnProduct.rb:1754 src/modules/AddOnProduct.rb:1760
-#: src/modules/Packages.rb:463
+#: src/modules/Packages.rb:469
 msgid "Unknown Product"
 msgstr "Unknown Product"
 
@@ -1848,85 +1848,85 @@
 msgstr "Applying delta"
 
 #. warning text
-#: src/modules/Packages.rb:303
+#: src/modules/Packages.rb:309
 #, fuzzy
 msgid "Your computer is a 64-bit x86-64 system, but you are trying to install a 32-bit distribution."
 msgstr "However, you are trying to install a 32-bit distribution."
 
 #. help text for software proposal
-#: src/modules/Packages.rb:319
+#: src/modules/Packages.rb:325
 msgid "<P>The pattern list states which functionality will be available after installing the system.</P>"
 msgstr ""
 
 #. (see bnc#178357 why these numbers)
 #. translators: help text for software proposal
-#: src/modules/Packages.rb:331
+#: 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 working files) so the used space will be slightly larger than the proposed value. Therefore it is a good idea to have at least 25% (or about 300MB) free space before starting the installation.</P>"
 msgstr ""
 
 #. help text for software proposal
-#: src/modules/Packages.rb:336
+#: 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 the connection is slow or if there is a data limit for downloading.</P>\n"
 msgstr ""
 
 #. help text for software proposal - header
-#: src/modules/Packages.rb:345
+#: src/modules/Packages.rb:351
 #, fuzzy
 msgid "<P><B>Software Proposal</B></P>"
 msgstr "<P><B>UML Installation Proposal</B></P>"
 
 #. installation proposal - SW summary, %1 is name of the installed product
 #. (e.g. openSUSE 10.3, SUSE Linux Enterprise ...)
-#: src/modules/Packages.rb:362
+#: src/modules/Packages.rb:368
 msgid "Product: %1"
 msgstr "Product: %1"
 
 #. installation proposal - SW summary, %1 is name of the selected desktop or system type (e.g. KDE)
-#: src/modules/Packages.rb:376
+#: src/modules/Packages.rb:382
 #, fuzzy
 msgid "System Type: %1"
 msgstr "System: %1"
 
-#: src/modules/Packages.rb:387
+#: src/modules/Packages.rb:393
 #, fuzzy
 msgid "Patterns:<br>"
 msgstr "Patterns"
 
 #. installation proposal - SW summary, %1 is size of the selected packages (in MB or GB)
-#: src/modules/Packages.rb:397
+#: src/modules/Packages.rb:403
 msgid "Size of Packages to Install: %1"
 msgstr "Size of Packages to Install: %1"
 
 #. installation proposal - SW summary, %1 is download size of the selected packages
 #. which will be installed from an ftp or http repository (in MB or GB)
-#: src/modules/Packages.rb:410
+#: src/modules/Packages.rb:416
 #, fuzzy
 msgid "Downloading from Remote Repositories: %1"
 msgstr "Download of Release Notes"
 
-#: src/modules/Packages.rb:472
+#: 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:496
+#: 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:500
+#: 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:541
+#: 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:561
+#: src/modules/Packages.rb:567
 #, fuzzy
 #| msgid ""
 #| "There is not enough free space in directory %1.\n"
@@ -1937,43 +1937,43 @@
 "Continue anyway?\n"
 
 #. summary warning
-#: src/modules/Packages.rb:604
+#: src/modules/Packages.rb:610
 #, fuzzy
 msgid "Not enough disk space."
 msgstr "more disk space."
 
 #. summary warning
-#: src/modules/Packages.rb:606
+#: src/modules/Packages.rb:612
 #, fuzzy
 msgid "Not enough disk space. Remove some packages in the single selection."
 msgstr "Not enough disk space.  Remove some packages in the single selection."
 
 #. add a backslash if it's missing
-#: src/modules/Packages.rb:627
+#: src/modules/Packages.rb:633
 #, fuzzy
 msgid "Only %1 (%2%%) free space available on partition %3.<BR>"
 msgstr "No free space available on %1"
 
 #. newly installed products
-#: src/modules/Packages.rb:696
+#: src/modules/Packages.rb:702
 #, fuzzy
 #| msgid "Package %1 will be installed"
 msgid "New product <b>%s</b> will be installed"
 msgstr "Package %1 will be installed"
 
 #. product update: %s is a product name
-#: src/modules/Packages.rb:706
+#: src/modules/Packages.rb:712
 #, fuzzy
 #| msgid "%1 packages will be updated"
 msgid "Product <b>%s</b> will be updated"
 msgstr "%1 packages will be updated"
 
 #. product update: %{old_product} is an old product, %{new_product} is the new one
-#: src/modules/Packages.rb:708
+#: src/modules/Packages.rb:714
 msgid "Product <b>%{old_product}</b> will be updated to <b>%{new_product}</b>"
 msgstr ""
 
-#: src/modules/Packages.rb:715
+#: src/modules/Packages.rb:721
 #, fuzzy
 #| msgid "Package %1 will be installed."
 msgid "Product <b>%s</b> will stay installed"
@@ -1981,17 +1981,17 @@
 
 #. Removing another product might be an issue
 #. (just warn if removed by user or by YaST)
-#: src/modules/Packages.rb:725
+#: src/modules/Packages.rb:731
 msgid "<b>Warning:</b> Product <b>%s</b> will be removed."
 msgstr ""
 
-#: src/modules/Packages.rb:726
+#: src/modules/Packages.rb:732
 msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed.</font>"
 msgstr ""
 
 #. TRANSLATORS: update proposal warning, do NOT translate "-release",
 #. it is part of a package name (like "sles-release")
-#: src/modules/Packages.rb:752
+#: src/modules/Packages.rb:758
 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"
@@ -2002,13 +2002,13 @@
 msgstr ""
 
 #. error in proposal, %1 is URL
-#: src/modules/Packages.rb:1342
+#: src/modules/Packages.rb:1339
 #, fuzzy
 msgid "No repository found at '%1'."
 msgstr "No source found at '%1'."
 
 #. TRANSLATORS: beginning of the rich text with the release notes
-#: src/modules/Packages.rb:1615
+#: src/modules/Packages.rb:1612
 #, fuzzy
 #| msgid ""
 #| "<p><b>These are the release notes made for the first initial release. They are\n"
@@ -2026,29 +2026,29 @@
 "from the SUSE Linux Web server.</b></p>"
 
 #. popup - information label
-#: src/modules/Packages.rb:1642
+#: src/modules/Packages.rb:1639
 #, fuzzy
 msgid "Integrating booted media..."
 msgstr "Installing boot manager..."
 
 #. close the popup in order to be able to ask about the license
-#: src/modules/Packages.rb:1664
+#: src/modules/Packages.rb:1661
 #, fuzzy
 msgid "Failed to integrate the service pack repository."
 msgstr "Failed to integrate service pack source"
 
 #. popup - information label
-#: src/modules/Packages.rb:1697
+#: src/modules/Packages.rb:1694
 #, fuzzy
 msgid "Initializing repositories..."
 msgstr "Initialising fonts..."
 
 #. message popup, %1 is product name
-#: src/modules/Packages.rb:1929
+#: src/modules/Packages.rb:1926
 msgid "Insert %1 CD 1"
 msgstr "Insert %1 CD 1"
 
-#: src/modules/Packages.rb:1931
+#: src/modules/Packages.rb:1928
 #, fuzzy
 msgid "%1 CD 1 not found"
 msgstr ""
@@ -2056,7 +2056,7 @@
 "CA not found"
 
 #. an error message
-#: src/modules/Packages.rb:2041
+#: src/modules/Packages.rb:2038
 msgid ""
 "Error while initializing package descriptions.\n"
 "Check the log file %1 for more details."
@@ -2065,19 +2065,19 @@
 "Check the log file %1 for more details."
 
 #. bnc #436925
-#: src/modules/Packages.rb:2302
+#: src/modules/Packages.rb:2299
 msgid ""
 "The software selection has been changed externally.\n"
 "Software proposal will be called again."
 msgstr ""
 
 #. popup label
-#: src/modules/Packages.rb:2320
+#: src/modules/Packages.rb:2317
 msgid "Evaluating package selection..."
 msgstr "Evaluating package selection..."
 
 #. Error message, %{pattern_name} is replaced with the missing pattern name in runtime
-#: src/modules/Packages.rb:2595
+#: src/modules/Packages.rb:2615
 msgid ""
 "Failed to select default product pattern %{pattern_name}.\n"
 "Pattern has not been found."
@@ -2086,17 +2086,17 @@
 #. Sets that the license (file) has been already accepted
 #.
 #. @param string filename
-#: src/modules/ProductLicense.rb:148 src/modules/ProductLicense.rb:155
+#: src/modules/ProductLicense.rb:150 src/modules/ProductLicense.rb:157
 #, fuzzy
 msgid "Cannot read license file %1"
 msgstr "Cannot read file %1"
 
-#: src/modules/ProductLicense.rb:149
+#: src/modules/ProductLicense.rb:151
 msgid "To show the product license properly, put the license.tar.gz file to the root of the live media when building the image."
 msgstr ""
 
 #. combo box
-#: src/modules/ProductLicense.rb:293
+#: src/modules/ProductLicense.rb:295
 msgid "&Language"
 msgstr "&Language"
 
@@ -2107,23 +2107,16 @@
 msgid "I &Agree to the License Terms."
 msgstr "Yes, I Agree to the License Agreement"
 
-#. %{license_url} is an URL where the displayed license can be found
-#: src/modules/ProductLicense.rb:385
-msgid ""
-"If you want to print this EULA, you can download it from\n"
-"%{license_url}"
-msgstr ""
-
 #. TRANSLATORS: addition license information
 #. %1 is replaced with the filename
-#: src/modules/ProductLicense.rb:391
+#: src/modules/ProductLicense.rb:383
 msgid ""
 "If you want to print this EULA, you can find it\n"
 "on the first media in the file %1"
 msgstr ""
 
 #. help text
-#: src/modules/ProductLicense.rb:407
+#: src/modules/ProductLicense.rb:400
 msgid ""
 "<p>Read the license agreement carefully and select\n"
 "one of the available options. If you do not agree to the license agreement,\n"
@@ -2135,36 +2128,43 @@
 
 #. dialog title
 #. dialog caption
-#: src/modules/ProductLicense.rb:417 src/modules/ProductLicense.rb:1212
+#: src/modules/ProductLicense.rb:410 src/modules/ProductLicense.rb:1211
 msgid "License Agreement"
 msgstr "License Agreement"
 
 #. popup question
-#: src/modules/ProductLicense.rb:1017
+#: src/modules/ProductLicense.rb:1016
 #, fuzzy
 msgid "Really abort the add-on product installation?"
 msgstr "Really abort the installation?"
 
 #. text asking whether to refuse a license (Yes-No popup)
-#: src/modules/ProductLicense.rb:1041
+#: src/modules/ProductLicense.rb:1040
 msgid ""
 "Refusing the license agreement cancels the installation.\n"
 "Really refuse the agreement?"
 msgstr ""
 
 #. text asking whether to refuse a license (Yes-No popup)
-#: src/modules/ProductLicense.rb:1044
+#: src/modules/ProductLicense.rb:1043
 msgid ""
 "Refusing the license agreement cancels the add-on\n"
 "product installation. Really refuse the agreement?"
 msgstr ""
 
 #. timed ok/cancel popup
-#: src/modules/ProductLicense.rb:1054
+#: src/modules/ProductLicense.rb:1053
 #, fuzzy
 msgid "The system is shutting down..."
 msgstr "System is shutting down..."
 
+#. TRANSLATORS: %{license_url} is an URL where the displayed license can be found
+#: src/modules/ProductLicense.rb:1577
+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
 msgid ""
@@ -2244,152 +2244,152 @@
 msgstr "Failed to deactivate %1."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:30
+#: src/modules/SourceDialogs.rb:31
 msgid "&Scan Using SLP..."
 msgstr "&Scan Using SLP..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:32
+#: src/modules/SourceDialogs.rb:33
 #, fuzzy
 msgid "Commun&ity Repositories"
 msgstr "Configured Hosts"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:34
+#: src/modules/SourceDialogs.rb:35
 msgid "&Extensions and Modules from Registration Server..."
 msgstr ""
 
 #. radio button
-#: src/modules/SourceDialogs.rb:36
+#: src/modules/SourceDialogs.rb:37
 msgid "Specify &URL..."
 msgstr "Specify &URL..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:38
+#: src/modules/SourceDialogs.rb:39
 msgid "&FTP..."
 msgstr "&FTP..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:40
+#: src/modules/SourceDialogs.rb:41
 msgid "&HTTP..."
 msgstr "&HTTP..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:42
+#: src/modules/SourceDialogs.rb:43
 msgid "HTT&PS..."
 msgstr "HTT&PS..."
 
 #. radio button
 #. radio button
-#: src/modules/SourceDialogs.rb:44 src/modules/SourceDialogs.rb:1719
+#: src/modules/SourceDialogs.rb:45 src/modules/SourceDialogs.rb:1720
 msgid "&SMB/CIFS"
 msgstr "&SMB/CIFS"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:46
+#: src/modules/SourceDialogs.rb:47
 msgid "&NFS..."
 msgstr "&NFS..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:48
+#: src/modules/SourceDialogs.rb:49
 msgid "&CD..."
 msgstr "&CD..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:50
+#: src/modules/SourceDialogs.rb:51
 msgid "&DVD..."
 msgstr "&DVD..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:52
+#: src/modules/SourceDialogs.rb:53
 #, fuzzy
 msgid "&Hard Disk..."
 msgstr "&Hard Disk"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:54
+#: src/modules/SourceDialogs.rb:55
 msgid "&USB Mass Storage (USB Stick, Disk)..."
 msgstr ""
 
 #. radio button
-#: src/modules/SourceDialogs.rb:56
+#: src/modules/SourceDialogs.rb:57
 msgid "&Local Directory..."
 msgstr "&Local Directory..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:58
+#: src/modules/SourceDialogs.rb:59
 #, fuzzy
 msgid "&Local ISO Image..."
 msgstr "Use &ISO Images"
 
 #. check box
-#: src/modules/SourceDialogs.rb:60
+#: src/modules/SourceDialogs.rb:61
 #, fuzzy
 msgid "&Download repository description files"
 msgstr "No Description"
 
 #. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:109
+#: src/modules/SourceDialogs.rb:110
 msgid ""
 "<p>If the location is a file holding an ISO image\n"
 "of the media, set <b>ISO Image</b>.</p>"
 msgstr ""
 
 #. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:114
+#: src/modules/SourceDialogs.rb:115
 msgid ""
 "<p>If the repository is on multiple media,\n"
 "set the location of the first media of the set.</p>\n"
 msgstr ""
 
 #. text entry
-#: src/modules/SourceDialogs.rb:128
+#: src/modules/SourceDialogs.rb:129
 msgid "&Server Name"
 msgstr "&Server Name"
 
 #. text entry
 #. text entry
-#: src/modules/SourceDialogs.rb:136 src/modules/SourceDialogs.rb:1583
+#: src/modules/SourceDialogs.rb:137 src/modules/SourceDialogs.rb:1584
 msgid "&Path to Directory or ISO Image"
 msgstr "&Path to Directory or ISO Image"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:144
+#: src/modules/SourceDialogs.rb:145
 #, fuzzy
 msgid "&ISO Image"
 msgstr "ISO Image"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:146
+#: src/modules/SourceDialogs.rb:147
 #, fuzzy
 #| msgid "&Protocol"
 msgid "N&FS v4 Protocol"
 msgstr "&Protocol"
 
-#: src/modules/SourceDialogs.rb:152
+#: src/modules/SourceDialogs.rb:153
 msgid "Mount Options"
 msgstr "Mount Options"
 
 #. TRANSLATORS: "(default)" - is a combobox value and means default libzypp
 #. NFS mount option (users can change it to anything else, the field is editable)
-#: src/modules/SourceDialogs.rb:156
+#: src/modules/SourceDialogs.rb:157
 #, fuzzy
 #| msgid " (default)"
 msgid "(default)"
 msgstr " (default)"
 
-#: src/modules/SourceDialogs.rb:167
+#: src/modules/SourceDialogs.rb:168
 #, fuzzy
 msgid "URL of the Repository"
 msgstr "Name of the group"
 
 #. frame
-#: src/modules/SourceDialogs.rb:176
+#: src/modules/SourceDialogs.rb:177
 msgid "P&rotocol"
 msgstr "P&rotocol"
 
 #. input field label
-#: src/modules/SourceDialogs.rb:186
+#: src/modules/SourceDialogs.rb:187
 #, fuzzy
 msgid "&URL of the Repository"
 msgstr "Name of the group"
@@ -2397,42 +2397,42 @@
 #. label / dialog caption
 #. bugzilla #219759
 #. service label can be empty (not defined)
-#: src/modules/SourceDialogs.rb:201 src/modules/SourceManagerSLP.rb:323
+#: src/modules/SourceDialogs.rb:202 src/modules/SourceManagerSLP.rb:323
 #, fuzzy
 msgid "Repository URL"
 msgstr "Repository"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:203
+#: src/modules/SourceDialogs.rb:204
 msgid "NFS Server"
 msgstr "NFS Server"
 
 #. label / dialog caption
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:205 src/modules/SourceDialogs.rb:207
+#: src/modules/SourceDialogs.rb:206 src/modules/SourceDialogs.rb:208
 #, fuzzy
 msgid "CD or DVD Media"
 msgstr "Read &CD or DVD Medium"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:209
+#: src/modules/SourceDialogs.rb:210
 msgid "Hard Disk"
 msgstr "Hard Disk"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:211
+#: src/modules/SourceDialogs.rb:212
 #, fuzzy
 msgid "USB Stick or Disk"
 msgstr "&USB Stick Boot Image"
 
 #. label / dialog caption
 #. dialog caption
-#: src/modules/SourceDialogs.rb:213 src/modules/SourceDialogs.rb:888
+#: src/modules/SourceDialogs.rb:214 src/modules/SourceDialogs.rb:889
 msgid "Local Directory"
 msgstr "Local Directory"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:215
+#: src/modules/SourceDialogs.rb:216
 #, fuzzy
 msgid "Local ISO Image"
 msgstr "Use &ISO Images"
@@ -2442,26 +2442,26 @@
 #. label / dialog caption
 #. label / dialog caption
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:217 src/modules/SourceDialogs.rb:219
-#: src/modules/SourceDialogs.rb:221 src/modules/SourceDialogs.rb:223
-#: src/modules/SourceDialogs.rb:225
+#: src/modules/SourceDialogs.rb:218 src/modules/SourceDialogs.rb:220
+#: src/modules/SourceDialogs.rb:222 src/modules/SourceDialogs.rb:224
+#: src/modules/SourceDialogs.rb:226
 msgid "Server and Directory"
 msgstr "Server and Directory"
 
 #. popup message
-#: src/modules/SourceDialogs.rb:440
+#: src/modules/SourceDialogs.rb:441
 #, fuzzy
 msgid "The name of the repository cannot be empty."
 msgstr "Share path cannot be empty."
 
 #. text entry
-#: src/modules/SourceDialogs.rb:452
+#: src/modules/SourceDialogs.rb:453
 #, fuzzy
 msgid "&Repository Name"
 msgstr "Repository"
 
 #. help text
-#: src/modules/SourceDialogs.rb:467
+#: src/modules/SourceDialogs.rb:468
 #, fuzzy
 msgid ""
 "<p><big><b>Repository Name</b></big><br>\n"
@@ -2472,13 +2472,13 @@
 "loaded.</p>\n"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:481
+#: src/modules/SourceDialogs.rb:482
 #, fuzzy
 msgid "&Service Name"
 msgstr "Service Name"
 
 #. help text
-#: src/modules/SourceDialogs.rb:489
+#: src/modules/SourceDialogs.rb:490
 #, fuzzy
 msgid ""
 "<p><big><b>Service Name</b></big><br>\n"
@@ -2489,17 +2489,17 @@
 "loaded.</p>\n"
 
 #. popup message
-#: src/modules/SourceDialogs.rb:524
+#: src/modules/SourceDialogs.rb:525
 msgid "URL cannot be empty."
 msgstr "URL cannot be empty."
 
 #. text entry
-#: src/modules/SourceDialogs.rb:537
+#: src/modules/SourceDialogs.rb:538
 msgid "&URL"
 msgstr "&URL"
 
 #. help text
-#: src/modules/SourceDialogs.rb:551
+#: src/modules/SourceDialogs.rb:552
 #, fuzzy
 msgid ""
 "<p><big><b>Repository URL</b></big><br>\n"
@@ -2512,17 +2512,17 @@
 #. @return widget description map
 #. Get widget description map
 #. @return widget description map
-#: src/modules/SourceDialogs.rb:724 src/modules/SourceDialogs.rb:1851
+#: src/modules/SourceDialogs.rb:725 src/modules/SourceDialogs.rb:1852
 msgid "Edit Parts of the URL"
 msgstr ""
 
-#: src/modules/SourceDialogs.rb:731 src/modules/SourceDialogs.rb:1858
+#: src/modules/SourceDialogs.rb:732 src/modules/SourceDialogs.rb:1859
 #, fuzzy
 msgid "Edit Complete URL"
 msgstr "Show Complete &List"
 
 #. help text
-#: src/modules/SourceDialogs.rb:743
+#: src/modules/SourceDialogs.rb:744
 #, fuzzy
 msgid ""
 "<p><big><b>NFS Server</b></big><br>\n"
@@ -2532,7 +2532,7 @@
 "<p><big><b>Kernel</b></big><br>\n"
 "Use <b>Kernel</b> to specify the kernel image to load.</p>"
 
-#: src/modules/SourceDialogs.rb:750
+#: src/modules/SourceDialogs.rb:751
 msgid ""
 "<p><big><b>Mount Options</b></big><br>\n"
 "You can specify extra options used for mounting the NFS volume.\n"
@@ -2541,16 +2541,16 @@
 msgstr ""
 
 #. radio button
-#: src/modules/SourceDialogs.rb:805
+#: src/modules/SourceDialogs.rb:806
 msgid "&CD-ROM"
 msgstr "&CD-ROM"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:807
+#: src/modules/SourceDialogs.rb:808
 msgid "&DVD-ROM"
 msgstr "&DVD-ROM"
 
-#: src/modules/SourceDialogs.rb:812
+#: src/modules/SourceDialogs.rb:813
 #, fuzzy
 msgid ""
 "<p><big><b>CD or DVD Media</b></big><br>\n"
@@ -2560,12 +2560,12 @@
 "Use <b>Kernel</b> to specify the kernel image to load.</p>"
 
 #. dialog caption
-#: src/modules/SourceDialogs.rb:903
+#: src/modules/SourceDialogs.rb:904
 msgid "ISO Image File"
 msgstr "ISO Image File"
 
 #. error popup - the entered path is not a directory
-#: src/modules/SourceDialogs.rb:926
+#: src/modules/SourceDialogs.rb:927
 #, fuzzy
 msgid ""
 "The entered path is not a directory\n"
@@ -2575,7 +2575,7 @@
 "Try again.\n"
 
 #. error popup - the entered path is not a regular file
-#: src/modules/SourceDialogs.rb:956
+#: src/modules/SourceDialogs.rb:957
 #, fuzzy
 msgid ""
 "The entered path is not a file\n"
@@ -2583,7 +2583,7 @@
 msgstr "The specified file does not exist."
 
 #. continue/cancel popup, %1 is a file name
-#: src/modules/SourceDialogs.rb:980
+#: src/modules/SourceDialogs.rb:981
 msgid ""
 "File '%1'\n"
 "does not seem to be an ISO image.\n"
@@ -2591,19 +2591,19 @@
 msgstr ""
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1001
+#: src/modules/SourceDialogs.rb:1002
 #, fuzzy
 msgid "&Path to Directory"
 msgstr "&Path to Generated Directory Tree:"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:1009 src/modules/SourceDialogs.rb:1267
-#: src/modules/SourceDialogs.rb:1334
+#: src/modules/SourceDialogs.rb:1010 src/modules/SourceDialogs.rb:1268
+#: src/modules/SourceDialogs.rb:1335
 #, fuzzy
 msgid "&Plain RPM Directory"
 msgstr "&Path to Generated Directory Tree:"
 
-#: src/modules/SourceDialogs.rb:1024
+#: src/modules/SourceDialogs.rb:1025
 #, fuzzy
 msgid ""
 "<p><big><b>Local Directory</b></big><br>\n"
@@ -2616,22 +2616,22 @@
 "Use <b>Kernel</b> to specify the kernel image to load.</p>"
 
 #. `opt(`hstretch),
-#: src/modules/SourceDialogs.rb:1260
+#: src/modules/SourceDialogs.rb:1261
 #, fuzzy
 msgid "&USB Mass Storage Device"
 msgstr "Mass Storage Device"
 
 #. the spacing is added to make the widget wider
-#: src/modules/SourceDialogs.rb:1265 src/modules/SourceDialogs.rb:1332
+#: src/modules/SourceDialogs.rb:1266 src/modules/SourceDialogs.rb:1333
 msgid "&File System"
 msgstr "&File System"
 
-#: src/modules/SourceDialogs.rb:1266 src/modules/SourceDialogs.rb:1333
+#: src/modules/SourceDialogs.rb:1267 src/modules/SourceDialogs.rb:1334
 #, fuzzy
 msgid "Dire&ctory"
 msgstr "Directory"
 
-#: src/modules/SourceDialogs.rb:1271
+#: src/modules/SourceDialogs.rb:1272
 #, fuzzy
 msgid ""
 "<p><big><b>USB Stick or Disk</b></big><br>\n"
@@ -2647,7 +2647,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:1281 src/modules/SourceDialogs.rb:1348
+#: src/modules/SourceDialogs.rb:1282 src/modules/SourceDialogs.rb:1349
 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"
@@ -2655,12 +2655,12 @@
 msgstr ""
 
 #. combobox title
-#: src/modules/SourceDialogs.rb:1331
+#: src/modules/SourceDialogs.rb:1332
 #, fuzzy
 msgid "&Disk Device"
 msgstr "&Floppy Disk Device"
 
-#: src/modules/SourceDialogs.rb:1338
+#: src/modules/SourceDialogs.rb:1339
 #, fuzzy
 msgid ""
 "<p><big><b>Disk</b></big><br>\n"
@@ -2675,13 +2675,13 @@
 "Use <b>Kernel</b> to specify the kernel image to load.</p>"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1364
+#: src/modules/SourceDialogs.rb:1365
 #, fuzzy
 msgid "&Path to ISO Image"
 msgstr "&Path to Generated Directory Tree:"
 
 #. push button
-#: src/modules/SourceDialogs.rb:1384
+#: src/modules/SourceDialogs.rb:1385
 #, fuzzy
 msgid ""
 "<p><big><b>Local ISO Image</b></big><br>\n"
@@ -2692,73 +2692,73 @@
 "Use <b>Kernel</b> to specify the kernel image to load.</p>"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1565
+#: src/modules/SourceDialogs.rb:1566
 msgid "Server &Name"
 msgstr "Server &Name"
 
-#: src/modules/SourceDialogs.rb:1569
+#: src/modules/SourceDialogs.rb:1570
 msgid "&Port"
 msgstr "&Port"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1574
+#: src/modules/SourceDialogs.rb:1575
 msgid "&Share"
 msgstr "&Share"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:1587
+#: src/modules/SourceDialogs.rb:1588
 #, fuzzy
 msgid "ISO &Image"
 msgstr "Use &ISO Images"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1590
+#: src/modules/SourceDialogs.rb:1591
 msgid "&Directory on Server"
 msgstr "&Directory on Server"
 
 #. frame
-#: src/modules/SourceDialogs.rb:1595
+#: src/modules/SourceDialogs.rb:1596
 msgid "Au&thentication"
 msgstr "Au&thentication"
 
 #. check box
-#: src/modules/SourceDialogs.rb:1602
+#: src/modules/SourceDialogs.rb:1603
 msgid "&Anonymous"
 msgstr "&Anonymous"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1611
+#: src/modules/SourceDialogs.rb:1612
 #, fuzzy
 msgid "&Workgroup or Domain"
 msgstr "Workgroup or Domain"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1620
+#: src/modules/SourceDialogs.rb:1621
 msgid "&User Name"
 msgstr "&User Name"
 
 #. password entry
-#: src/modules/SourceDialogs.rb:1627
+#: src/modules/SourceDialogs.rb:1628
 msgid "&Password"
 msgstr "&Password"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1702
+#: src/modules/SourceDialogs.rb:1703
 msgid "&FTP"
 msgstr "&FTP"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1705
+#: src/modules/SourceDialogs.rb:1706
 msgid "H&TTP"
 msgstr "H&TTP"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1712
+#: src/modules/SourceDialogs.rb:1713
 msgid "HTT&PS"
 msgstr "HTT&PS"
 
 #. help text - server dialog
-#: src/modules/SourceDialogs.rb:1882
+#: src/modules/SourceDialogs.rb:1883
 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"
@@ -2773,7 +2773,7 @@
 msgstr ""
 
 #. help text - server dialog, there is a "Port" widget
-#: src/modules/SourceDialogs.rb:1895
+#: src/modules/SourceDialogs.rb:1896
 msgid ""
 "<p>It is possible to set the <b>Port</b> number for a HTTP/HTTPS repository.\n"
 "Leave it empty to use the default port.</p>\n"
@@ -2782,12 +2782,12 @@
 #. Returns whether Community Repositories are defined in the control file.
 #.
 #. @return [Boolean] whether defined
-#: src/modules/SourceDialogs.rb:1957
+#: src/modules/SourceDialogs.rb:1958
 msgid "I would like to install an additional Add On Product"
 msgstr ""
 
 #. help text
-#: src/modules/SourceDialogs.rb:2076
+#: src/modules/SourceDialogs.rb:2085
 #, fuzzy
 msgid ""
 "<p><big><b>Media Type</b></big><br>\n"
@@ -2800,7 +2800,7 @@
 "</p>\n"
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2085
+#: src/modules/SourceDialogs.rb:2094
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -2813,7 +2813,7 @@
 "</p>\n"
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2095
+#: src/modules/SourceDialogs.rb:2104
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -2832,7 +2832,7 @@
 "</p>\n"
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2107
+#: src/modules/SourceDialogs.rb:2116
 #, fuzzy
 #| msgid ""
 #| "<p>\n"
@@ -2851,27 +2851,27 @@
 "the first CD are located, such as /data1/CD1.</p>\n"
 
 #. error popup
-#: src/modules/SourceDialogs.rb:2122
+#: src/modules/SourceDialogs.rb:2131
 #, fuzzy
 msgid "Select the media type"
 msgstr "Select the printer type."
 
-#: src/modules/SourceDialogs.rb:2128
+#: src/modules/SourceDialogs.rb:2137
 msgid "Insert the add-on product CD"
 msgstr "Insert the add-on product CD"
 
-#: src/modules/SourceDialogs.rb:2129
+#: src/modules/SourceDialogs.rb:2138
 msgid "Insert the add-on product DVD"
 msgstr "Insert the add-on product DVD"
 
 #. ask for a medium
-#: src/modules/SourceDialogs.rb:2147
+#: src/modules/SourceDialogs.rb:2156
 #, fuzzy
 msgid "No USB disk was detected."
 msgstr "No DASD disk detected"
 
 #. TODO: disable "download" option when CD or DVD source is selected
-#: src/modules/SourceDialogs.rb:2344
+#: src/modules/SourceDialogs.rb:2359
 msgid ""
 "<p><b>Download Files</b><br>\n"
 "Each repository has description files which describe the content of the\n"
@@ -2881,13 +2881,13 @@
 msgstr ""
 
 #. dialog caption
-#: src/modules/SourceDialogs.rb:2563
+#: src/modules/SourceDialogs.rb:2578
 #, fuzzy
 msgid "Media Type"
 msgstr "Media Check"
 
 #. dialog caption
-#: src/modules/SourceDialogs.rb:2587
+#: src/modules/SourceDialogs.rb:2602
 #, fuzzy
 #| msgid "Add-On Products"
 msgid "Add On Product"
@@ -3102,12 +3102,12 @@
 msgstr "No SLP catalogues have been found on your network."
 
 #. Warning message, e.g.: Partition /usr needs 35 MB more disk space
-#: src/modules/SpaceCalculation.rb:936
+#: src/modules/SpaceCalculation.rb:869
 msgid "Partition \"%1\" needs %2 more disk space."
 msgstr "Partition \"%1\" needs %2 more disk space."
 
 #. popup message
-#: src/modules/SpaceCalculation.rb:956
+#: src/modules/SpaceCalculation.rb:889
 #, fuzzy
 #| msgid ""
 #| "Deselect some packages or delete some data\n"
@@ -3120,7 +3120,7 @@
 "or temporary files before updating the system."
 
 #. popup message
-#: src/modules/SpaceCalculation.rb:965
+#: src/modules/SpaceCalculation.rb:898
 #, fuzzy
 #| msgid "Please deselect some packages."
 msgid "Deselect some packages."

Modified: trunk/yast/en_GB/po/proxy.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/proxy.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/proxy.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:53+0200\n"
+"POT-Creation-Date: 2014-10-29 16:21+0100\n"
 "PO-Revision-Date: 2001-07-17 16:27+0200\n"
 "Last-Translator: James Ogley <ogley@suse.co.uk>\n"
 "Language-Team: English <i18n@suse.de>\n"
@@ -20,9 +20,7 @@
 
 #. Commandline help title
 #. Proxy dialog caption
-#. Proxy dialog caption
-#: src/clients/proxy.rb:32 src/clients/proxy_proposal.rb:448
-#: src/include/proxy/dialogs.rb:398
+#: src/clients/proxy.rb:32 src/include/proxy/dialogs.rb:399
 msgid "Proxy Configuration"
 msgstr "Proxy Configuration"
 
@@ -115,36 +113,30 @@
 msgstr "FTP"
 
 #. Informative label
-#. Informative label
-#: src/clients/proxy_proposal.rb:100 src/include/proxy/dialogs.rb:101
+#: src/include/proxy/dialogs.rb:101
 msgid "No details available."
 msgstr "No details available."
 
 #. A push button
-#. A push button
-#: src/clients/proxy_proposal.rb:103 src/include/proxy/dialogs.rb:104
+#: src/include/proxy/dialogs.rb:104
 msgid "&Details <<"
 msgstr "&Details <<"
 
+#. avoid confusing Emacs
 #. A push button
-#. A push button
-#: src/clients/proxy_proposal.rb:105 src/include/proxy/dialogs.rb:106
+#: src/include/proxy/dialogs.rb:106
 msgid "&Details >>"
 msgstr "&Details >>"
 
 #. The default error code, replaced with the current error code got from proxy if any code found
-#. The default error code, replaced with the current error code got from proxy if any code found
-#: src/clients/proxy_proposal.rb:220 src/include/proxy/dialogs.rb:172
+#: src/include/proxy/dialogs.rb:173
 msgid "Unknown Error Code"
 msgstr "Unknown Error Code"
 
 #. Error message,
 #. %1 is a string "HTTP", "HTTPS" or "FTP"
 #. %2 is an error string such as "HTTP/1.0 403 Forbidden"
-#. Error message,
-#. %1 is a string "HTTP", "HTTPS" or "FTP"
-#. %2 is an error string such as "HTTP/1.0 403 Forbidden"
-#: src/clients/proxy_proposal.rb:238 src/include/proxy/dialogs.rb:190
+#: src/include/proxy/dialogs.rb:191
 msgid ""
 "An error occurred during the %1 proxy test.\n"
 "Proxy return code: %2.\n"
@@ -155,10 +147,7 @@
 #. Unknown return code,
 #. %1 is the string HTTP, "HTTPS" or FTP,
 #. %2 is an error string such as "HTTP/1.0 403 Forbidden"
-#. Unknown return code,
-#. %1 is the string HTTP, "HTTPS" or FTP,
-#. %2 is an error string such as "HTTP/1.0 403 Forbidden"
-#: src/clients/proxy_proposal.rb:253 src/include/proxy/dialogs.rb:205
+#: src/include/proxy/dialogs.rb:206
 msgid ""
 "An unknown error occurred during the %1 proxy test.\n"
 "Proxy return code: %2.\n"
@@ -167,38 +156,32 @@
 "Proxy return code: %2.\n"
 
 #. An informative popup label diring the proxy testings
-#. An informative popup label diring the proxy testings
-#: src/clients/proxy_proposal.rb:274 src/include/proxy/dialogs.rb:226
+#: src/include/proxy/dialogs.rb:227
 msgid "Testing the current proxy settings..."
 msgstr "Testing the current proxy settings..."
 
 #. TRANSLATORS: Error popup message
-#. TRANSLATORS: Error popup message
-#: src/clients/proxy_proposal.rb:284 src/include/proxy/dialogs.rb:236
+#: src/include/proxy/dialogs.rb:237
 msgid "An error occurred during the HTTP proxy test."
 msgstr "An error occurred during the HTTP proxy test."
 
 #. TRANSLATORS: Error popup message
-#. TRANSLATORS: Error popup message
-#: src/clients/proxy_proposal.rb:306 src/include/proxy/dialogs.rb:258
+#: src/include/proxy/dialogs.rb:259
 msgid "An error occurred during the HTTPS proxy test."
 msgstr "An error occurred during the HTTPS proxy test."
 
 #. TRANSLATORS: Error popup message
-#. TRANSLATORS: Error popup message
-#: src/clients/proxy_proposal.rb:328 src/include/proxy/dialogs.rb:280
+#: src/include/proxy/dialogs.rb:281
 msgid "An error occurred during the FTP proxy test."
 msgstr "An error occurred during the FTP proxy test."
 
 #. Popup message
-#. Popup message
-#: src/clients/proxy_proposal.rb:346 src/include/proxy/dialogs.rb:298
+#: src/include/proxy/dialogs.rb:299
 msgid "Proxy settings work correctly."
 msgstr "Proxy settings work correctly."
 
 #. Proxy dialog help 1/8
-#. Proxy dialog help 1/8
-#: src/clients/proxy_proposal.rb:454 src/include/proxy/dialogs.rb:404
+#: 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 take effect, \n"
@@ -207,8 +190,7 @@
 msgstr ""
 
 #. Proxy dialog help 2/8
-#. Proxy dialog help 2/8
-#: src/clients/proxy_proposal.rb:461 src/include/proxy/dialogs.rb:411
+#: src/include/proxy/dialogs.rb:412
 msgid ""
 "<p><b>HTTP Proxy URL</b> is the name of the proxy server for your access\n"
 "to the World Wide Web (WWW).</p>\n"
@@ -217,8 +199,7 @@
 "to the World Wide Web (WWW).</p>\n"
 
 #. Proxy dialog help 3/8
-#. Proxy dialog help 3/8
-#: src/clients/proxy_proposal.rb:465 src/include/proxy/dialogs.rb:415
+#: src/include/proxy/dialogs.rb:416
 msgid ""
 "<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"
@@ -227,14 +208,12 @@
 "to the World Wide Web (WWW).</p>\n"
 
 #. Proxy dialog help 3.5/8
-#. Proxy dialog help 3.5/8
-#: src/clients/proxy_proposal.rb:469 src/include/proxy/dialogs.rb:419
+#: src/include/proxy/dialogs.rb:420
 msgid "<p>Example: <i>http://proxy.example.com:3128/</i></p>"
 msgstr "<p>Example: <i>http://proxy.example.com:3128/</i></p>"
 
 #. Proxy dialog help 4/8
-#. Proxy dialog help 4/8
-#: src/clients/proxy_proposal.rb:471 src/include/proxy/dialogs.rb:421
+#: src/include/proxy/dialogs.rb:422
 msgid ""
 "<p><b>FTP Proxy URL</b> is the name of the proxy server for your access\n"
 "to the file transfer services (FTP).</p>"
@@ -243,8 +222,7 @@
 "to the file transfer services (FTP).</p>"
 
 #. Proxy dialog help 5/8
-#. Proxy dialog help 5/8
-#: src/clients/proxy_proposal.rb:475 src/include/proxy/dialogs.rb:425
+#: src/include/proxy/dialogs.rb:426
 #, fuzzy
 #| msgid ""
 #| "<p>With <b>Use the Same Proxy for All Protocols</b> option checked, it is\n"
@@ -260,8 +238,7 @@
 "(HTTP, HTTPS and FTP)."
 
 #. Proxy dialog help 6/8
-#. Proxy dialog help 6/8
-#: src/clients/proxy_proposal.rb:482 src/include/proxy/dialogs.rb:432
+#: src/include/proxy/dialogs.rb:433
 msgid ""
 "<p><b>No Proxy Domains</b> is a comma-separated list of domains\n"
 "for which the requests should be made directly without caching,\n"
@@ -272,8 +249,7 @@
 "for example, <i>%1</i>.</p>\n"
 
 #. Proxy dialog help 7/8
-#. Proxy dialog help 7/8
-#: src/clients/proxy_proposal.rb:491 src/include/proxy/dialogs.rb:441
+#: src/include/proxy/dialogs.rb:442
 #, fuzzy
 #| msgid ""
 #| "<p>If you are using a proxy server with authorization, enter\n"
@@ -289,8 +265,7 @@
 "consists of printable ASCII characters (except for quotation marks) only.</p>\n"
 
 #. Proxy dialog help 8/8
-#. Proxy dialog help 8/8
-#: src/clients/proxy_proposal.rb:499 src/include/proxy/dialogs.rb:449
+#: src/include/proxy/dialogs.rb:450
 msgid ""
 "<p>Press <b>Test Proxy Settings</b> to test\n"
 "the current configuration for HTTP, HTTPS, and FTP proxy.</p> \n"
@@ -299,70 +274,60 @@
 "the current configuration for HTTP, HTTPS, and FTP proxy.</p> \n"
 
 #. CheckBox entry label
-#. CheckBox entry label
-#: src/clients/proxy_proposal.rb:519 src/include/proxy/dialogs.rb:466
+#: src/include/proxy/dialogs.rb:467
 msgid "&Enable Proxy"
 msgstr "&Enable Proxy"
 
 #. Frame label
-#. Frame label
-#: src/clients/proxy_proposal.rb:527 src/include/proxy/dialogs.rb:472
+#: src/include/proxy/dialogs.rb:473
 msgid "Proxy Settings"
 msgstr "Proxy Settings"
 
 #. Text entry label
-#. Text entry label
-#: src/clients/proxy_proposal.rb:533 src/include/proxy/dialogs.rb:478
+#: src/include/proxy/dialogs.rb:479
 msgid "&HTTP Proxy URL"
 msgstr "&HTTP Proxy URL"
 
-#: src/clients/proxy_proposal.rb:535 src/include/proxy/dialogs.rb:480
+#: src/include/proxy/dialogs.rb:481
 msgid "HTTP&S Proxy URL"
 msgstr "HTTP&S Proxy URL"
 
 #. Text entry label
-#. Text entry label
-#: src/clients/proxy_proposal.rb:538 src/include/proxy/dialogs.rb:483
+#: src/include/proxy/dialogs.rb:484
 msgid "F&TP Proxy URL"
 msgstr "F&TP Proxy URL"
 
-#: src/clients/proxy_proposal.rb:544 src/include/proxy/dialogs.rb:489
+#: src/include/proxy/dialogs.rb:490
 msgid "Us&e the Same Proxy for All Protocols"
 msgstr "Us&e the Same Proxy for All Protocols"
 
 #. Text entry label
 #. domains without proxying
-#. Text entry label
-#. domains without proxying
-#: src/clients/proxy_proposal.rb:549 src/include/proxy/dialogs.rb:494
+#: src/include/proxy/dialogs.rb:495
 msgid "No Proxy &Domains"
 msgstr "No Proxy &Domains"
 
-#: src/clients/proxy_proposal.rb:558 src/include/proxy/dialogs.rb:503
+#: src/include/proxy/dialogs.rb:504
 msgid "Proxy Authentication"
 msgstr "Proxy Authentication"
 
 #. Text entry label
-#. Text entry label
-#: src/clients/proxy_proposal.rb:567 src/include/proxy/dialogs.rb:512
+#: src/include/proxy/dialogs.rb:513
 msgid "Proxy &User Name"
 msgstr "Proxy &User Name"
 
 #. Password entry label
-#. Password entry label
-#: src/clients/proxy_proposal.rb:575 src/include/proxy/dialogs.rb:520
+#: src/include/proxy/dialogs.rb:521
 msgid "Proxy &Password"
 msgstr "Proxy &Password"
 
 #. Test Proxy Settings - push button
-#. Test Proxy Settings - push button
-#: src/clients/proxy_proposal.rb:587 src/include/proxy/dialogs.rb:532
+#: src/include/proxy/dialogs.rb:533
 msgid "Test Pr&oxy Settings"
 msgstr "Test Pr&oxy Settings"
 
 #. Popup error text - http, https and ftp proxy URLs are blank
-#. Popup error text - http, https and ftp proxy URLs are blank
-#: src/clients/proxy_proposal.rb:673 src/include/proxy/dialogs.rb:618
+#: src/include/proxy/dialogs.rb:619
 msgid ""
 "Proxy is enabled, but no proxy URL has been specified.\n"
 "Really use these settings?"
@@ -370,7 +335,7 @@
 "Proxy is enabled, but no proxy URL has been specified.\n"
 "Really use these settings?"
 
-#: src/clients/proxy_proposal.rb:686 src/include/proxy/dialogs.rb:631
+#: src/include/proxy/dialogs.rb:632
 msgid ""
 "Security warning:\n"
 "Username and password will be stored unencrypted\n"
@@ -379,50 +344,42 @@
 msgstr ""
 
 #. Popup::Error text
-#. Popup::Error text
-#: src/clients/proxy_proposal.rb:701 src/include/proxy/dialogs.rb:646
+#: src/include/proxy/dialogs.rb:647
 msgid "You cannot enter a password and leave the user name empty."
 msgstr "You cannot enter a password and leave the user name empty."
 
 #. Popup::Error text
-#. Popup::Error text
-#: src/clients/proxy_proposal.rb:711 src/include/proxy/dialogs.rb:654
+#: src/include/proxy/dialogs.rb:655
 msgid "HTTP proxy URL is invalid."
 msgstr "HTTP proxy URL is invalid."
 
 #. Popup::Error text
-#. Popup::Error text
-#: src/clients/proxy_proposal.rb:719 src/include/proxy/dialogs.rb:662
+#: src/include/proxy/dialogs.rb:663
 msgid "HTTP proxy URL must contain a scheme specification (http)."
 msgstr "HTTP proxy URL must contain a scheme specification (http)."
 
 #. Popup::Error text
-#. Popup::Error text
-#: src/clients/proxy_proposal.rb:730 src/include/proxy/dialogs.rb:671
+#: src/include/proxy/dialogs.rb:672
 msgid "The HTTPS proxy URL is invalid."
 msgstr "The HTTPS proxy URL is invalid."
 
 #. Popup::Error text
-#. Popup::Error text
-#: src/clients/proxy_proposal.rb:738 src/include/proxy/dialogs.rb:679
+#: src/include/proxy/dialogs.rb:680
 msgid "The HTTPS proxy URL must contain a scheme specification (http)."
 msgstr "The HTTPS proxy URL must contain a scheme specification (http)."
 
 #. Popup::Error text
-#. Popup::Error text
-#: src/clients/proxy_proposal.rb:749 src/include/proxy/dialogs.rb:690
+#: src/include/proxy/dialogs.rb:691
 msgid "FTP proxy URL is invalid."
 msgstr "FTP proxy URL is invalid."
 
 #. Popup::Error text
-#. Popup::Error text
-#: src/clients/proxy_proposal.rb:757 src/include/proxy/dialogs.rb:698
+#: src/include/proxy/dialogs.rb:699
 msgid "FTP proxy URL must contain a scheme specification (http)."
 msgstr "FTP proxy URL must contain a scheme specification (http)."
 
 #. Translators: no proxy domain is a domain that can be accessed without proxy
-#. Translators: no proxy domain is a domain that can be accessed without proxy
-#: src/clients/proxy_proposal.rb:769 src/include/proxy/dialogs.rb:708
+#: src/include/proxy/dialogs.rb:709
 msgid ""
 "One or more no proxy domains are invalid. \n"
 "Check if all domains match one of the following:\n"
@@ -432,16 +389,6 @@
 "* Domain name prefixed by '.'"
 msgstr ""
 
-#. Rich text title
-#: src/clients/proxy_proposal.rb:839
-msgid "Proxy"
-msgstr "Proxy"
-
-#. MenuButton title
-#: src/clients/proxy_proposal.rb:841
-msgid "&Proxy"
-msgstr "&Proxy"
-
 #. Popup headline
 #: src/modules/Proxy.rb:45
 msgid "Proxy Configuration Successfully Saved"
@@ -493,3 +440,9 @@
 #: src/modules/Proxy.rb:466
 msgid "FTP Proxy: %1"
 msgstr "FTP Proxy: %1"
+
+#~ msgid "Proxy"
+#~ msgstr "Proxy"
+
+#~ msgid "&Proxy"
+#~ msgstr "&Proxy"

Modified: trunk/yast/en_GB/po/registration.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/registration.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/registration.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: registration\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-15 15:56+0200\n"
+"POT-Creation-Date: 2014-10-29 16:21+0100\n"
 "PO-Revision-Date: 2008-03-27 23:04+0000\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"
@@ -23,25 +23,25 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. popup heading (in bold)
-#: src/clients/discover_registration_services.rb:35
+#: src/clients/discover_registration_services.rb:40
 #, fuzzy
 msgid "Local Registration Servers"
 msgstr "Registration Code"
 
-#: src/clients/discover_registration_services.rb:37
+#: src/clients/discover_registration_services.rb:42
 msgid ""
 "Select a detected registration server from the list\n"
 "or the default SUSE registration server."
 msgstr ""
 
 #. error popup
-#: src/clients/discover_registration_services.rb:65
+#: src/clients/discover_registration_services.rb:66
 #, fuzzy
 msgid "No registration server selected."
 msgstr "Registration Code"
 
 #. %s is the default SCC URL
-#: src/clients/discover_registration_services.rb:100
+#: src/clients/discover_registration_services.rb:112
 #, fuzzy
 #| msgid "Novell Customer Center Configuration"
 msgid "SUSE Customer Center (%s)"
@@ -49,61 +49,38 @@
 
 #. popup message
 #. popup message
-#: src/clients/inst_scc.rb:52 src/clients/scc_auto.rb:48
+#. popup message
+#: src/clients/inst_scc.rb:53 src/clients/scc_auto.rb:49
+#: src/lib/registration/registration_ui.rb:39
 #, fuzzy
 msgid "Contacting the Registration Server"
 msgstr "Registration Code"
 
-#. reset the user input in case an exception is raised
-#. nil = use the default URL
-#: src/clients/inst_scc.rb:147 src/clients/scc_auto.rb:169
-msgid "Registering the System..."
-msgstr ""
-
-#. then register the product(s)
-#. %s is name of given product
-#. register the base product
-#. %s is name of given product
-#: src/clients/inst_scc.rb:156 src/clients/inst_scc.rb:427
-#: src/clients/scc_auto.rb:177 src/clients/scc_auto.rb:192
-#, fuzzy
-#| msgid "Registration Code"
-msgid "Registering %s ..."
-msgstr "Registration Code"
-
-#. updating base product registration, %s is a new base product name
-#. updating registered addon/extension, %s is an extension name
-#: src/clients/inst_scc.rb:206 src/clients/inst_scc.rb:236
-#, fuzzy
-#| msgid "Updating zone files..."
-msgid "Updating to %s ..."
-msgstr "Updating zone files..."
-
 #. display the registration update dialog
 #. dialog title
 #. dialog title
 #. Translators: Text for UI Label - capitalized
-#: src/clients/inst_scc.rb:260 src/clients/inst_scc.rb:352
-#: src/clients/inst_scc.rb:504 src/clients/inst_scc.rb:552
+#: src/clients/inst_scc.rb:215 src/clients/inst_scc.rb:310
+#: src/clients/inst_scc.rb:467 src/clients/inst_scc.rb:515
 #: src/lib/registration/ui/autoyast_config_dialog.rb:92
 #, fuzzy
 #| msgid "Registration Code"
 msgid "Registration"
 msgstr "Registration Code"
 
-#: src/clients/inst_scc.rb:261
+#: src/clients/inst_scc.rb:216
 #, fuzzy
 #| msgid "Registration Code"
 msgid "Registration is being updated..."
 msgstr "Registration Code"
 
-#: src/clients/inst_scc.rb:262
+#: src/clients/inst_scc.rb:217
 #, fuzzy
 msgid "The previous registration is being updated."
 msgstr "No software repository found on medium."
 
 #. automatic registration refresh during system upgrade failed, register from scratch
-#: src/clients/inst_scc.rb:275
+#: src/clients/inst_scc.rb:233
 msgid ""
 "Automatic registration upgrade failed.\n"
 "You can manually register the system from scratch."
@@ -111,7 +88,7 @@
 
 #. label text describing the registration (1/2)
 #. use \n to split to more lines if needed (use max. 76 chars/line)
-#: src/clients/inst_scc.rb:289
+#: src/clients/inst_scc.rb:247
 msgid ""
 "Please enter a registration or evaluation code for this product and your\n"
 "User Name/E-mail address from the SUSE Customer Center in the fields below.\n"
@@ -122,23 +99,23 @@
 #. label text describing the registration (2/2),
 #. not displayed in installed system
 #. use \n to split to more lines if needed (use max. 76 chars/line)
-#: src/clients/inst_scc.rb:301
+#: src/clients/inst_scc.rb:259
 msgid ""
 "If you skip product registration now, remember to register after\n"
 "installation has completed."
 msgstr ""
 
-#: src/clients/inst_scc.rb:309
+#: src/clients/inst_scc.rb:267
 #, fuzzy
 #| msgid "Novell Customer Center Configuration"
 msgid "Network Configuration..."
 msgstr "Novell Customer Centre Configuration"
 
-#: src/clients/inst_scc.rb:318 src/clients/inst_scc.rb:491
+#: src/clients/inst_scc.rb:276 src/clients/inst_scc.rb:452
 msgid "The system is already registered."
 msgstr ""
 
-#: src/clients/inst_scc.rb:325
+#: src/clients/inst_scc.rb:283
 #: src/lib/registration/ui/autoyast_config_dialog.rb:94
 #, fuzzy
 #| msgid "Email Address"
@@ -146,7 +123,7 @@
 msgstr "Email Address"
 
 #. handle nil specifically, it cannot be stored in XML profile
-#: src/clients/inst_scc.rb:327
+#: src/clients/inst_scc.rb:285
 #: src/lib/registration/ui/autoyast_addon_dialog.rb:167
 #: src/lib/registration/ui/autoyast_config_dialog.rb:96
 #, fuzzy
@@ -155,25 +132,25 @@
 msgstr "Registration Code"
 
 #. button label
-#: src/clients/inst_scc.rb:332
+#: src/clients/inst_scc.rb:290
 #, fuzzy
 msgid "&Local Registration Server..."
 msgstr "Registration Code"
 
 #. button label
-#: src/clients/inst_scc.rb:335
+#: src/clients/inst_scc.rb:293
 #, fuzzy
 #| msgid "Registration"
 msgid "&Skip Registration"
 msgstr "Registration"
 
 #. help text
-#: src/clients/inst_scc.rb:343
+#: src/clients/inst_scc.rb:301
 msgid "Enter SUSE Customer Center credentials here to register the system to get updates and extensions."
 msgstr ""
 
 #. not set yet?
-#: src/clients/inst_scc.rb:377
+#: src/clients/inst_scc.rb:334
 msgid ""
 "Registration added some update repositories.\n"
 "\n"
@@ -181,29 +158,31 @@
 "on-line updates during installation?"
 msgstr ""
 
-#. cache the available addons
-#. create a new dialog for accepting and importing a SSL certificate and run it
-#: src/clients/inst_scc.rb:406
-#: src/lib/registration/ui/autoyast_config_workflow.rb:101
+#. %s is name of given product
+#. %s is name of given product
+#. then register the product(s)
+#: src/clients/inst_scc.rb:385 src/clients/scc_auto.rb:284
+#: src/lib/registration/registration_ui.rb:71
 #, fuzzy
-msgid "Loading Available Extensions and Modules..."
+#| msgid "Registration Code"
+msgid "Registering %s ..."
 msgstr "Registration Code"
 
 #. dialog title
-#: src/clients/inst_scc.rb:458
+#: src/clients/inst_scc.rb:419
 #, fuzzy
 msgid "Register Extensions and Modules"
 msgstr "Registration Code"
 
 #. help text
-#: src/clients/inst_scc.rb:462
+#: src/clients/inst_scc.rb:423
 #, fuzzy
 #| msgid "<p>Please wait, while volumes are being detected.</p>"
 msgid "<p>Extensions and Modules are being registered.</p>"
 msgstr "<p>Please wait, while volumes are being detected.</p>"
 
 #. Popup question: confirm skipping the registration
-#: src/clients/inst_scc.rb:480
+#: src/clients/inst_scc.rb:441
 msgid ""
 "If you do not register your system we will not be able\n"
 "to grant you access to the update repositories.\n"
@@ -215,47 +194,47 @@
 msgstr ""
 
 #. button label
-#: src/clients/inst_scc.rb:494
+#: src/clients/inst_scc.rb:455
 #, fuzzy
 #| msgid "Register New User"
 msgid "Register Again"
 msgstr "Register New User"
 
 #. button label
-#: src/clients/inst_scc.rb:497
+#: src/clients/inst_scc.rb:458
 msgid "Select Extensions"
 msgstr ""
 
 #. help text
-#: src/clients/inst_scc.rb:507
+#: src/clients/inst_scc.rb:470
 #, fuzzy
 #| msgid "<p>Your system is ready for use.</p>"
 msgid "<p>The system is already registered.</p>"
 msgstr "<p>Your system is ready for use.</p>"
 
-#: src/clients/inst_scc.rb:508
+#: src/clients/inst_scc.rb:471
 msgid "<p>You can re-register it again or you can register additional extension or modules to enhance the functionality of the system.</p>"
 msgstr ""
 
-#: src/clients/inst_scc.rb:510
+#: src/clients/inst_scc.rb:473
 msgid "<p>If you want to deregister your system you need to log into the SUSE Customer Center and remove the system manually there.</p>"
 msgstr ""
 
 #. error message
-#: src/clients/inst_scc.rb:534
+#: src/clients/inst_scc.rb:497
 msgid ""
 "The base product was not found,\n"
 "check your system."
 msgstr ""
 
 #. TRANSLATORS: %s = bugzilla URL
-#: src/clients/inst_scc.rb:538
+#: src/clients/inst_scc.rb:501
 msgid ""
 "The installation medium or the installer itself is seriously broken.\n"
 "Report a bug at %s."
 msgstr ""
 
-#: src/clients/inst_scc.rb:541
+#: src/clients/inst_scc.rb:504
 msgid ""
 "Make sure a product is installed and /etc/products.d/baseproduct\n"
 "is a symlink pointing to the base product .prod file."
@@ -267,26 +246,26 @@
 msgstr ""
 
 #. popup message: registration finished properly
-#: src/clients/scc_auto.rb:208
+#: src/clients/scc_auto.rb:184
 #, fuzzy
 msgid "Registration was successfull."
 msgstr "Installation was successful"
 
 #. remove possible duplicates
-#: src/clients/scc_auto.rb:243
+#: src/clients/scc_auto.rb:212
 msgid "SLP discovery failed, no server found"
 msgstr ""
 
 #. more than one server found: let the user select, we cannot automatically
 #. decide which one to use, asking user in AutoYast mode is not nice
 #. but better than aborting the installation...
-#: src/clients/scc_auto.rb:259
+#: src/clients/scc_auto.rb:228
 #, fuzzy
 #| msgid "Downloading SMT certificate file failed"
 msgid "Downloading SSL Certificate"
 msgstr "Downloading SMT certificate file failed"
 
-#: src/clients/scc_auto.rb:263
+#: src/clients/scc_auto.rb:232
 #, fuzzy
 #| msgid "Import Certificate"
 msgid "Importing SSL Certificate"
@@ -466,30 +445,30 @@
 msgstr "Fingerprint: "
 
 #. Error popup
-#: src/lib/registration/connect_helpers.rb:71
+#: src/lib/registration/connect_helpers.rb:72
 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:77
+#: src/lib/registration/connect_helpers.rb:78
 msgid "Network error, check the network configuration."
 msgstr ""
 
 #. Error popup
-#: src/lib/registration/connect_helpers.rb:82
+#: src/lib/registration/connect_helpers.rb:83
 msgid "Connection time out."
 msgstr ""
 
 #. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:90
+#: src/lib/registration/connect_helpers.rb:91
 #, fuzzy
 #| msgid "Destination is invalid."
 msgid "Check that this system is known to the registration server."
 msgstr "Destination is invalid."
 
 #. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:96
+#: 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"
@@ -502,73 +481,105 @@
 msgstr ""
 
 #. add the hint to the error details
+#. update the message when an old SMT server is found
 #. Error popup
-#: src/lib/registration/connect_helpers.rb:110
-#: src/lib/registration/connect_helpers.rb:113
+#. 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:167
+#: src/lib/registration/connect_helpers.rb:125
+#: src/lib/registration/connect_helpers.rb:175
+#: src/lib/registration/connect_helpers.rb:178
 #, fuzzy
 #| msgid "Registration Code"
 msgid "Registration failed."
 msgstr "Registration Code"
 
-#: src/lib/registration/connect_helpers.rb:115
+#: src/lib/registration/connect_helpers.rb:121
 #, fuzzy
 msgid "Registration client error."
 msgstr "Registration Data to Use"
 
-#: src/lib/registration/connect_helpers.rb:117
+#: src/lib/registration/connect_helpers.rb:123
 msgid ""
 "Registration server error.\n"
 "Retry registration later."
 msgstr ""
 
 #. error message
-#: src/lib/registration/connect_helpers.rb:158
+#: src/lib/registration/connect_helpers.rb:164
 msgid "Received SSL Certificate does not match the expected certificate."
 msgstr ""
 
 #. %s are error details
-#: src/lib/registration/connect_helpers.rb:184
+#: src/lib/registration/connect_helpers.rb:195
 #, fuzzy
 #| msgid "Details..."
 msgid "Details: %s"
 msgstr "Details..."
 
 #. progress label
-#: src/lib/registration/connect_helpers.rb:209
+#: src/lib/registration/connect_helpers.rb:220
 msgid "Importing the SSL certificate"
 msgstr ""
 
-#: src/lib/registration/connect_helpers.rb:210
+#: src/lib/registration/connect_helpers.rb:221
 msgid "Importing '%s' certificate..."
 msgstr ""
 
 #. try to use a translatable message first, if not found then use
 #. the original error message from openSSL
-#: src/lib/registration/connect_helpers.rb:228
+#: src/lib/registration/connect_helpers.rb:241
 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:260
+msgid ""
+"An old registration server was detected at\n"
+"%s.\n"
+"Make sure the latest product supporting the new registration\n"
+"protocol is installed at the server."
+msgstr ""
+
 #. progress step title
-#: src/lib/registration/finish_dialog.rb:34
+#: src/lib/registration/finish_dialog.rb:35
 #, fuzzy
 #| msgid "Saving Remote Administration Configuration"
 msgid "Storing Registration Configuration..."
 msgstr "Saving Remote Administration Configuration"
 
-#. this is just a placeholder for texts which will/might be needed after the text freeze
-#. TODO FIXME: remove this file before GM!
-#: src/lib/registration/new_messages.rb:8
+#. register the system and the base product
+#. @return [Array<Boolean, SUSE::Connect::Remote::Service>] array with two
+#. items: boolean (true on success), remote service (or nil)
+#. TODO FIXME: split to two separate parts
+#. TODO FIXME: reused an existing message due to text freeze
+#. (later use a better text, it's system update actually...)
+#: src/lib/registration/registration_ui.rb:62
+#: src/lib/registration/registration_ui.rb:95
+msgid "Registering the System..."
+msgstr ""
+
+#. updating base product registration, %s is a new base product name
+#. updating registered addon/extension, %s is an extension name
+#: src/lib/registration/registration_ui.rb:121
+#: src/lib/registration/registration_ui.rb:146
 #, fuzzy
-#| msgid "SMT Certificate"
-msgid "SSL Certificate"
-msgstr "SMT Certificate"
+#| msgid "Updating zone files..."
+msgid "Updating to %s ..."
+msgstr "Updating zone files..."
 
-#. checkbox: use SLP discovery later again in the installed system
-#: src/lib/registration/new_messages.rb:10
-msgid "Use SLP Discovery Also Later in Installed System"
-msgstr ""
+#. load available addons from SCC server
+#. the result is cached to avoid reloading when going back and forth in the
+#. installation workflow
+#. @return [Array<Registration::Addon>] available addons
+#. create a new dialog for accepting and importing a SSL certificate and run it
+#: src/lib/registration/registration_ui.rb:174
+#: src/lib/registration/ui/autoyast_config_workflow.rb:101
+#, fuzzy
+msgid "Loading Available Extensions and Modules..."
+msgstr "Registration Code"
 
 #. indent size used in summary text
 #: src/lib/registration/ssl_certificate_details.rb:35
@@ -580,36 +591,36 @@
 #. create UI label for a base product
 #. @param [Hash] Product (hash from pkg-bindings)
 #. @return [String] UI Label
-#: src/lib/registration/sw_mgmt.rb:119
+#: src/lib/registration/sw_mgmt.rb:120
 #, fuzzy
 #| msgid "Unknown error"
 msgid "Unknown product"
 msgstr "Unknown error"
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:152
+#: src/lib/registration/sw_mgmt.rb:153
 #, fuzzy
 msgid "Saving repository configuration failed."
 msgstr "Starting Installation"
 
 #. # error message
 #. error message
-#: src/lib/registration/sw_mgmt.rb:190 src/lib/registration/sw_mgmt.rb:201
+#: src/lib/registration/sw_mgmt.rb:191 src/lib/registration/sw_mgmt.rb:202
 msgid "Updating service '%s' failed."
 msgstr ""
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:196
+#: src/lib/registration/sw_mgmt.rb:197
 msgid "Adding service '%s' failed."
 msgstr ""
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:208
+#: src/lib/registration/sw_mgmt.rb:209
 msgid "Saving service '%s' failed."
 msgstr ""
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:213
+#: src/lib/registration/sw_mgmt.rb:214
 msgid "Refreshing service '%s' failed."
 msgstr ""
 
@@ -622,10 +633,10 @@
 msgid "Downloading Licenses..."
 msgstr ""
 
-#. ask user to accept an addon EULA
-#. @param addon [SUSE::Connect::Product] the addon
-#. @return [Symbol] :accepted, :back, :abort, :halt
-#: src/lib/registration/ui/addon_eula_dialog.rb:73
+#. download the addon EULAs to a temp dir
+#. @param [SUSE::Connect::Product] addon the addon
+#. @param [String] tmpdir target where to download the files
+#: src/lib/registration/ui/addon_eula_dialog.rb:72
 msgid "Downloading License Agreement..."
 msgstr ""
 
@@ -640,7 +651,7 @@
 msgstr "Downloading SMT certificate file failed"
 
 #. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit"
-#: src/lib/registration/ui/addon_eula_dialog.rb:94
+#: src/lib/registration/ui/addon_eula_dialog.rb:100
 msgid "%s License Agreement"
 msgstr ""
 
@@ -672,53 +683,53 @@
 msgstr[1] "Enter the registration data."
 
 #. dialog title
-#: src/lib/registration/ui/addon_selection_dialog.rb:39
+#: src/lib/registration/ui/addon_selection_dialog.rb:44
 #, fuzzy
 msgid "Extension and Module Selection"
 msgstr "Registration Code"
 
 #. help text (1/3)
-#: src/lib/registration/ui/addon_selection_dialog.rb:42
+#: src/lib/registration/ui/addon_selection_dialog.rb:47
 #, fuzzy
 #| msgid "<p>First you can set the mail addresses and aliases for the user.</p>"
 msgid "<p>Here you can select available extensions and modules for yoursystem.</p>"
 msgstr "<p>First you can set the mail addresses and aliases for the user.</p>"
 
 #. help text (2/3)
-#: src/lib/registration/ui/addon_selection_dialog.rb:45
+#: src/lib/registration/ui/addon_selection_dialog.rb:50
 msgid "<p>Please note, that some extensions or modules might need specific registration code.</p>"
 msgstr ""
 
 #. help text (3/3)
-#: src/lib/registration/ui/addon_selection_dialog.rb:48
+#: src/lib/registration/ui/addon_selection_dialog.rb:53
 msgid "<p>If you want to remove any extension or module you need to loginto the SUSE Customer Center and remove them manually there.</p>"
 msgstr ""
 
 #. always enable Back/Next, the dialog cannot be the first in workflow
-#: src/lib/registration/ui/addon_selection_dialog.rb:67
+#: src/lib/registration/ui/addon_selection_dialog.rb:72
 msgid "Available Extensions and Modules"
 msgstr ""
 
-#: src/lib/registration/ui/addon_selection_dialog.rb:69
+#: src/lib/registration/ui/addon_selection_dialog.rb:74
 #, fuzzy
 #| msgid "Details..."
 msgid "Details"
 msgstr "Details..."
 
-#: src/lib/registration/ui/addon_selection_dialog.rb:72
+#: src/lib/registration/ui/addon_selection_dialog.rb:77
 msgid "Select an extension or a module to show details here"
 msgstr ""
 
 #. checkbox label for an unavailable extension
 #. (%s is an extension name)
-#: src/lib/registration/ui/addon_selection_dialog.rb:131
+#: src/lib/registration/ui/addon_selection_dialog.rb:136
 #, fuzzy
 #| msgid "is not available"
 msgid "%s (not available)"
 msgstr "is not available"
 
 #. check the addons requiring a reg. code
-#: src/lib/registration/ui/addon_selection_dialog.rb:212
+#: src/lib/registration/ui/addon_selection_dialog.rb:217
 msgid "YaST allows to select at most %s extensions or modules."
 msgstr ""
 
@@ -888,61 +899,66 @@
 msgstr ""
 
 #. push button
-#: src/lib/registration/ui/import_certificate_dialog.rb:90
+#: src/lib/registration/ui/import_certificate_dialog.rb:73
 msgid "&Trust and Import"
 msgstr ""
 
 #. help text (RichText) for importing a SSL certificate (1/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:118
+#: src/lib/registration/ui/import_certificate_dialog.rb:119
 msgid "<p>Secure connection (HTTPS) uses SSL certificates for verifying the authenticity of the server and for encrypting the transferred data.</p>"
 msgstr ""
 
 #. help text (RichText) for importing a SSL certificate (2/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:122
+#: src/lib/registration/ui/import_certificate_dialog.rb:123
 msgid "<p>You can choose to import the certificate it into the list of known certificate autohorities (CA), meaning that you trust the subject and the issuer of the unknown certificate.</p>"
 msgstr ""
 
 #. help text (RichText) for importing a SSL certificate (3/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:127
+#: src/lib/registration/ui/import_certificate_dialog.rb:128
 msgid "<p>Importing a certificate will allow to use for example a self-signed certificate.</p>"
 msgstr ""
 
 #. help text (RichText) for importing a SSL certificate (4/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:131
+#: src/lib/registration/ui/import_certificate_dialog.rb:132
 msgid "<p><b>Important:</b> You should verify the fingerprint of the certificate to be sure you import the genuine certificate from the requested server.</p>"
 msgstr ""
 
 #. help text (RichText) for importing a SSL certificate (5/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:136
+#: src/lib/registration/ui/import_certificate_dialog.rb:137
 msgid "<p><b>Importing an unknown certificate without verification is a big security risk.</b></p>"
 msgstr ""
 
 #. error message, the entered URL is not valid
-#: src/lib/registration/ui/local_server_dialog.rb:51
+#: src/lib/registration/ui/local_server_dialog.rb:60
 #, fuzzy
 #| msgid "Invalid value."
 msgid "Invalid URL."
 msgstr "Invalid value."
 
 #. input field label
-#: src/lib/registration/ui/local_server_dialog.rb:78
+#: src/lib/registration/ui/local_server_dialog.rb:97
 #, fuzzy
 msgid "&Local Registration Server URL"
 msgstr "Registration Code"
 
-#. return the boot command line parameter
-#: src/lib/registration/url_helpers.rb:205
+#. ignore SUSE manager registration servers (bnc#894470)
+#: src/lib/registration/url_helpers.rb:213
 #, fuzzy
 #| msgid "Checking..."
 msgid "Searching..."
 msgstr "Checking..."
 
-#: src/lib/registration/url_helpers.rb:205
+#: src/lib/registration/url_helpers.rb:213
 #, fuzzy
 msgid "Looking up local registration servers..."
 msgstr "1 item of registration data"
 
 #, fuzzy
+#~| msgid "SMT Certificate"
+#~ msgid "SSL Certificate"
+#~ msgstr "SMT Certificate"
+
+#, fuzzy
 #~| msgid "Registration Code"
 #~ msgid "Registering Product..."
 #~ msgid_plural "Registering Products..."

Modified: trunk/yast/en_GB/po/s390.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/s390.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/s390.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: s390\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:53+0200\n"
+"POT-Creation-Date: 2014-10-29 16:21+0100\n"
 "PO-Revision-Date: 2008-03-27 23:00+0000\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"
@@ -164,46 +164,46 @@
 msgid "Set Format Off"
 msgstr "File Format"
 
+#. integer field (count of disks formatted parallel)
+#: src/include/s390/dasd/dialogs.rb:201
+msgid "&Parallel Formatted Disks"
+msgstr "&Parallel Formatted Disks"
+
 #. error popup message
 #. error popup message
 #. error popup message
-#: src/include/s390/dasd/dialogs.rb:200 src/include/s390/dasd/dialogs.rb:677
+#: src/include/s390/dasd/dialogs.rb:225 src/include/s390/dasd/dialogs.rb:687
 #: src/include/s390/zfcp/dialogs.rb:471
 msgid "No disk selected."
 msgstr "No disk selected."
 
 #. 8 means disk is not formatted
 #. unformtted disk, manual (not AutoYaS)
-#: src/include/s390/dasd/dialogs.rb:229 src/modules/DASDController.rb:161
+#: src/include/s390/dasd/dialogs.rb:254 src/modules/DASDController.rb:161
 msgid "Device %1 is not formatted. Format device now?"
 msgstr ""
 
-#: src/include/s390/dasd/dialogs.rb:231 src/modules/DASDController.rb:163
+#: src/include/s390/dasd/dialogs.rb:256 src/modules/DASDController.rb:163
 msgid "There are %1 unformatted devices. Format them now?"
 msgstr ""
 
 #. for autoinst, format unformatted disks later
-#: src/include/s390/dasd/dialogs.rb:242
+#: src/include/s390/dasd/dialogs.rb:267
 msgid "Couldn't find device for channel %1."
 msgstr ""
 
 #. error report, %1 is device identification
-#: src/include/s390/dasd/dialogs.rb:294
+#: src/include/s390/dasd/dialogs.rb:321
 msgid "Disk %1 is not active."
 msgstr "Disk %1 is not active."
 
 #. error report, %1 is device identification
-#: src/include/s390/dasd/dialogs.rb:300
+#: src/include/s390/dasd/dialogs.rb:327
 msgid "Disk %1 is not accessible for writing."
 msgstr "Disk %1 is not accessible for writing."
 
-#. integer field (count of disks formatted at parallely)
-#: src/include/s390/dasd/dialogs.rb:318
-msgid "&Parallel Formatted Disks"
-msgstr "&Parallel Formatted Disks"
-
 #. popup question
-#: src/include/s390/dasd/dialogs.rb:343
+#: src/include/s390/dasd/dialogs.rb:353
 msgid ""
 "Formatting these disks destroys all data on them.<br>\n"
 "Really format the following disks?<br>\n"
@@ -214,7 +214,7 @@
 "%1"
 
 #. Dialog caption
-#: src/include/s390/dasd/dialogs.rb:406
+#: src/include/s390/dasd/dialogs.rb:416
 msgid "DASD Disk Management"
 msgstr "DASD Disk Management"
 
@@ -222,7 +222,7 @@
 #. table header
 #. table header
 #. table header
-#: src/include/s390/dasd/dialogs.rb:413 src/include/s390/dasd/dialogs.rb:422
+#: src/include/s390/dasd/dialogs.rb:423 src/include/s390/dasd/dialogs.rb:432
 #: src/include/s390/zfcp/dialogs.rb:120 src/include/s390/zfcp/dialogs.rb:129
 #, fuzzy
 #| msgid "Channel"
@@ -230,47 +230,47 @@
 msgstr "Channel"
 
 #. table header
-#: src/include/s390/dasd/dialogs.rb:415
+#: src/include/s390/dasd/dialogs.rb:425
 msgid "Format"
 msgstr "Format"
 
 #. table header
 #. table header
-#: src/include/s390/dasd/dialogs.rb:417 src/include/s390/dasd/dialogs.rb:430
+#: src/include/s390/dasd/dialogs.rb:427 src/include/s390/dasd/dialogs.rb:440
 msgid "Use DIAG"
 msgstr "Use DIAG"
 
 #. table header
 #. table header
-#: src/include/s390/dasd/dialogs.rb:424 src/include/s390/zfcp/dialogs.rb:135
+#: src/include/s390/dasd/dialogs.rb:434 src/include/s390/zfcp/dialogs.rb:135
 msgid "Device"
 msgstr "Device"
 
 #. table header
 #. table header
-#: src/include/s390/dasd/dialogs.rb:426
+#: src/include/s390/dasd/dialogs.rb:436
 #: src/include/s390/iucvterminal-server/ui.rb:242
 msgid "Type"
 msgstr "Type"
 
 #. table header
-#: src/include/s390/dasd/dialogs.rb:428
+#: src/include/s390/dasd/dialogs.rb:438
 msgid "Access Type"
 msgstr "Access Type"
 
 #. table header
-#: src/include/s390/dasd/dialogs.rb:432
+#: src/include/s390/dasd/dialogs.rb:442
 msgid "Formatted"
 msgstr "Formatted"
 
 #. table header
-#: src/include/s390/dasd/dialogs.rb:434
+#: src/include/s390/dasd/dialogs.rb:444
 msgid "Partition Information"
 msgstr "Partition Information"
 
 #. text entry
 #. text entry
-#: src/include/s390/dasd/dialogs.rb:445 src/include/s390/zfcp/dialogs.rb:146
+#: src/include/s390/dasd/dialogs.rb:455 src/include/s390/zfcp/dialogs.rb:146
 #, fuzzy
 #| msgid "Mi&nimum Channel"
 msgid "Mi&nimum Channel ID"
@@ -278,7 +278,7 @@
 
 #. text entry
 #. text entry
-#: src/include/s390/dasd/dialogs.rb:452 src/include/s390/zfcp/dialogs.rb:153
+#: src/include/s390/dasd/dialogs.rb:462 src/include/s390/zfcp/dialogs.rb:153
 #, fuzzy
 #| msgid "Ma&ximum Channel"
 msgid "Ma&ximum Channel ID"
@@ -286,57 +286,57 @@
 
 #. push button
 #. push button
-#: src/include/s390/dasd/dialogs.rb:458 src/include/s390/zfcp/dialogs.rb:159
+#: src/include/s390/dasd/dialogs.rb:468 src/include/s390/zfcp/dialogs.rb:159
 msgid "&Filter"
 msgstr "&Filter"
 
 #. menu button
 #. menu button
-#: src/include/s390/dasd/dialogs.rb:468 src/include/s390/dasd/dialogs.rb:475
+#: src/include/s390/dasd/dialogs.rb:478 src/include/s390/dasd/dialogs.rb:485
 msgid "Perform &Action"
 msgstr "Perform &Action"
 
-#: src/include/s390/dasd/dialogs.rb:471
+#: src/include/s390/dasd/dialogs.rb:481
 #, fuzzy
 #| msgid "&Selections"
 msgid "&Select All"
 msgstr "&Selections"
 
-#: src/include/s390/dasd/dialogs.rb:472
+#: src/include/s390/dasd/dialogs.rb:482
 msgid "&Deselect All"
 msgstr "&Deselect All"
 
 #. error popup
 #. error popup
-#: src/include/s390/dasd/dialogs.rb:543 src/include/s390/zfcp/dialogs.rb:221
+#: src/include/s390/dasd/dialogs.rb:553 src/include/s390/zfcp/dialogs.rb:221
 msgid "Invalid filter channel IDs."
 msgstr ""
 
 #. Dialog caption
-#: src/include/s390/dasd/dialogs.rb:587
+#: src/include/s390/dasd/dialogs.rb:597
 msgid "Add New DASD Disk"
 msgstr "Add New DASD Disk"
 
 #. text entry
 #. combo box
-#: src/include/s390/dasd/dialogs.rb:598 src/include/s390/zfcp/dialogs.rb:301
+#: src/include/s390/dasd/dialogs.rb:608 src/include/s390/zfcp/dialogs.rb:301
 #, fuzzy
 #| msgid "Channel"
 msgid "&Channel ID"
 msgstr "Channel"
 
 #. check box
-#: src/include/s390/dasd/dialogs.rb:602
+#: src/include/s390/dasd/dialogs.rb:612
 msgid "Format the Disk"
 msgstr "Format the Disk"
 
 #. check box
-#: src/include/s390/dasd/dialogs.rb:605
+#: src/include/s390/dasd/dialogs.rb:615
 msgid "Use &DIAG"
 msgstr "Use &DIAG"
 
 #. yes-no popup
-#: src/include/s390/dasd/dialogs.rb:627
+#: src/include/s390/dasd/dialogs.rb:637
 #, fuzzy
 #| msgid ""
 #| "Really leave the ZFCP disk configuration without saving?\n"
@@ -352,14 +352,14 @@
 #. error popup
 #. error popup
 #. error popup
-#: src/include/s390/dasd/dialogs.rb:638 src/include/s390/zfcp/dialogs.rb:347
+#: src/include/s390/dasd/dialogs.rb:648 src/include/s390/zfcp/dialogs.rb:347
 #: src/include/s390/zfcp/dialogs.rb:364 src/include/s390/zfcp/dialogs.rb:400
 msgid "Not a valid channel ID."
 msgstr ""
 
 #. error popup
 #. error popup
-#: src/include/s390/dasd/dialogs.rb:648 src/include/s390/zfcp/dialogs.rb:428
+#: src/include/s390/dasd/dialogs.rb:658 src/include/s390/zfcp/dialogs.rb:428
 msgid "Device already exists."
 msgstr ""
 
@@ -1558,27 +1558,27 @@
 
 #. Create a textual summary and a list of configured devices
 #. @return summary of the current configuration
-#: src/modules/DASDController.rb:318
+#: src/modules/DASDController.rb:334
 #, fuzzy
 #| msgid "Channel ID: %1, Format: %2, Use DIAG: %3"
 msgid "Channel ID: %1, Format: %2, DIAG: %3"
 msgstr "Channel ID: %1, Format: %2, Use DIAG: %3"
 
-#: src/modules/DASDController.rb:331
+#: src/modules/DASDController.rb:347
 #, fuzzy
 #| msgid "Channel ID: %1, Format: %2, Use DIAG: %3"
 msgid "Channel ID: %1, Device: %2, DIAG: %3"
 msgstr "Channel ID: %1, Format: %2, Use DIAG: %3"
 
 #. popup label
-#: src/modules/DASDController.rb:366
+#: src/modules/DASDController.rb:382
 msgid "Reading Configured DASD Disks"
 msgstr "Reading Configured DASD Disks"
 
 #. error report, %1 is device identification
 #. error report, %1 is device identification
 #. error report, %1 is device identification
-#: src/modules/DASDController.rb:457 src/modules/ZFCPController.rb:422
+#: src/modules/DASDController.rb:473 src/modules/ZFCPController.rb:422
 #: src/modules/ZFCPController.rb:516
 msgid "%1: sysfs not mounted."
 msgstr "%1: sysfs not mounted."
@@ -1586,46 +1586,46 @@
 #. error report, %1 is device identification
 #. error report, %1 is device identification
 #. error report, %1 is device identification
-#: src/modules/DASDController.rb:465 src/modules/ZFCPController.rb:430
+#: src/modules/DASDController.rb:481 src/modules/ZFCPController.rb:430
 #: src/modules/ZFCPController.rb:524
 msgid "%1: Invalid status for <online>."
 msgstr "%1: Invalid status for <online>."
 
 #. error report, %1 is device identification
 #. error report, %1 is device identification
-#: src/modules/DASDController.rb:473 src/modules/ZFCPController.rb:438
+#: src/modules/DASDController.rb:489 src/modules/ZFCPController.rb:438
 msgid "%1: No device found for <ccwid>."
 msgstr "%1: No device found for <ccwid>."
 
 #. error report, %1 is device identification
-#: src/modules/DASDController.rb:481
+#: src/modules/DASDController.rb:497
 #, fuzzy
 #| msgid "%1: Could not change state of the device"
 msgid "%1: Could not change state of the device."
 msgstr "%1: Could not change state of the device"
 
 #. error report, %1 is device identification
-#: src/modules/DASDController.rb:490
+#: src/modules/DASDController.rb:506
 #, fuzzy
 #| msgid "%1: Device <ccwid> does not exist."
 msgid "%1: Device is not a DASD."
 msgstr "%1: Device <ccwid> does not exist."
 
 #. error report, %1 is device identification
-#: src/modules/DASDController.rb:499
+#: src/modules/DASDController.rb:515
 #, fuzzy
 msgid "%1: Could not load module."
 msgstr "Could not load module %1."
 
 #. error report, %1 is device identification
-#: src/modules/DASDController.rb:508
+#: src/modules/DASDController.rb:524
 #, fuzzy
 #| msgid "Failed to activate %1."
 msgid "%1: Failed to activate DASD."
 msgstr "Failed to activate %1."
 
 #. error report, %1 is device identification
-#: src/modules/DASDController.rb:517
+#: src/modules/DASDController.rb:533
 #, fuzzy
 #| msgid "Do ¬ format"
 msgid "%1: DASD is not formatted."
@@ -1634,13 +1634,13 @@
 #. 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:525 src/modules/ZFCPController.rb:494
+#: src/modules/DASDController.rb:541 src/modules/ZFCPController.rb:494
 #: src/modules/ZFCPController.rb:564
 msgid "%1: Unknown error %2."
 msgstr "%1: Unknown error %2."
 
 #. progress bar
-#: src/modules/DASDController.rb:638
+#: src/modules/DASDController.rb:654
 #, fuzzy
 #| msgid "Formatted"
 msgid "Formatting %1:"
@@ -1648,7 +1648,7 @@
 
 #. error report, %1 is exit code of the command (integer)
 #. error report, %1 is exit code of the command (integer)
-#: src/modules/DASDController.rb:667 src/modules/DASDController.rb:764
+#: src/modules/DASDController.rb:683 src/modules/DASDController.rb:780
 #, fuzzy
 #| msgid "Disks formatting failed. Exit code: %1"
 msgid "Disks formatting failed. Exit code: %1."
@@ -1657,7 +1657,7 @@
 #. progress bar, %1 is device name, %2 and %3
 #. integers,
 #. eg. Formatting /dev/dasda: cylinder 123 of 12334 done
-#: src/modules/DASDController.rb:735
+#: src/modules/DASDController.rb:751
 msgid "Formatting %1: cylinder %2 of %3 done"
 msgstr "Formatting %1: cylinder %2 of %3 done"
 

Modified: trunk/yast/en_GB/po/samba-server.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/samba-server.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/samba-server.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: samba-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:53+0200\n"
+"POT-Creation-Date: 2014-10-29 16:21+0100\n"
 "PO-Revision-Date: 2008-03-27 22:59+0000\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"
@@ -747,10 +747,6 @@
 msgid "Start-&Up"
 msgstr "Start-&Up"
 
-#: src/include/samba-server/dialogs.rb:1250
-msgid "Firewall Settings"
-msgstr "Firewall Settings"
-
 #: src/include/samba-server/dialogs.rb:1259
 msgid "&Shares"
 msgstr "&Shares"
@@ -1656,187 +1652,190 @@
 msgstr "Domain Member Server"
 
 #. Samba-server read dialog caption
-#: src/modules/SambaServer.pm:120
+#: src/modules/SambaServer.pm:138
 msgid "Initializing Samba Server Configuration"
 msgstr "Initialising Samba Server Configuration"
 
 #. translators: progress stage
-#: src/modules/SambaServer.pm:125
+#: src/modules/SambaServer.pm:143
 msgid "Read global Samba settings"
 msgstr "Read global Samba settings"
 
 #. translators: progress stage
-#: src/modules/SambaServer.pm:127
+#: src/modules/SambaServer.pm:145
 msgid "Read Samba secrets"
 msgstr "Read Samba secrets"
 
 #. translators: progress stage
-#: src/modules/SambaServer.pm:129
+#: src/modules/SambaServer.pm:147
 msgid "Read Samba service settings"
 msgstr "Read Samba service settings"
 
 #. translators: progress stage
-#: src/modules/SambaServer.pm:131
+#: src/modules/SambaServer.pm:149
 msgid "Read Samba accounts"
 msgstr "Read Samba accounts"
 
 #. translators: progress stage
-#: src/modules/SambaServer.pm:133
+#: src/modules/SambaServer.pm:151
 msgid "Read the back-end settings"
 msgstr "Read the back-end settings"
 
 #. translators: progress stage
-#: src/modules/SambaServer.pm:135
+#: src/modules/SambaServer.pm:153
 msgid "Read the firewall settings"
 msgstr "Read the firewall settings"
 
 #. translators: progress stage
-#: src/modules/SambaServer.pm:137
+#: src/modules/SambaServer.pm:155
 msgid "Read Samba service role settings"
 msgstr "Read Samba service role settings"
 
 #. translators: progress step
-#: src/modules/SambaServer.pm:140
+#: src/modules/SambaServer.pm:158
 msgid "Reading global Samba settings..."
 msgstr "Reading global Samba settings..."
 
 #. translators: progress step
-#: src/modules/SambaServer.pm:142
+#: src/modules/SambaServer.pm:160
 msgid "Reading Samba secrets..."
 msgstr "Reading Samba secrets..."
 
 #. translators: progress step
-#: src/modules/SambaServer.pm:144
+#: src/modules/SambaServer.pm:162
 msgid "Reading Samba service settings..."
 msgstr "Reading Samba service settings..."
 
 #. translators: progress step
-#: src/modules/SambaServer.pm:146
+#: src/modules/SambaServer.pm:164
 msgid "Reading Samba accounts..."
 msgstr "Reading Samba accounts..."
 
 #. translators: progress step
-#: src/modules/SambaServer.pm:148
+#: src/modules/SambaServer.pm:166
 msgid "Reading the back-end settings..."
 msgstr "Reading the back-end settings..."
 
 #. translators: progress step
-#: src/modules/SambaServer.pm:150
+#: src/modules/SambaServer.pm:168
 msgid "Reading the firewall settings..."
 msgstr "Reading the firewall settings..."
 
 #. translators: progress stage
-#: src/modules/SambaServer.pm:152
+#: src/modules/SambaServer.pm:170
 msgid "Reading Samba service role settings..."
 msgstr "Reading Samba service role settings..."
 
 #. translators: progress finished
 #. translators: write progress step
-#: src/modules/SambaServer.pm:154 src/modules/SambaServer.pm:264
+#: src/modules/SambaServer.pm:172 src/modules/SambaServer.pm:285
 msgid "Finished"
 msgstr "Finished"
 
 #. Samba-server read dialog caption
-#: src/modules/SambaServer.pm:234
+#: src/modules/SambaServer.pm:255
 msgid "Saving Samba Server Configuration"
 msgstr "Saving Samba Server Configuration"
 
 #. translators: write progress stage
-#: src/modules/SambaServer.pm:239
+#: src/modules/SambaServer.pm:260
 msgid "Write global settings"
 msgstr "Write global settings"
 
 #. translators: write progress stage
-#: src/modules/SambaServer.pm:241
+#: src/modules/SambaServer.pm:262
 msgid "Disable Samba services"
 msgstr "Disable Samba services"
 
 #. translators: write progress stage
-#: src/modules/SambaServer.pm:243
+#: src/modules/SambaServer.pm:264
 msgid "Enable Samba services"
 msgstr "Enable Samba services"
 
 #. translators: write progress stage
-#: src/modules/SambaServer.pm:245
+#: src/modules/SambaServer.pm:266
 msgid "Write back-end settings"
 msgstr "Write back-end settings"
 
 #. translators: write progress stage
-#: src/modules/SambaServer.pm:247
+#: src/modules/SambaServer.pm:268
 msgid "Write Samba accounts"
 msgstr "Write Samba accounts"
 
 #. translators: write progress stage
-#: src/modules/SambaServer.pm:249
+#: src/modules/SambaServer.pm:270
 msgid "Save firewall settings"
 msgstr "Save firewall settings"
 
 #. translators: write progress step
-#: src/modules/SambaServer.pm:252
+#: src/modules/SambaServer.pm:273
 msgid "Writing global settings..."
 msgstr "Writing global settings..."
 
 #. translators: write progress step
-#: src/modules/SambaServer.pm:254
+#: src/modules/SambaServer.pm:275
 msgid "Disabling Samba services..."
 msgstr "Disabling Samba services..."
 
 #. translators: write progress step
-#: src/modules/SambaServer.pm:256
+#: src/modules/SambaServer.pm:277
 msgid "Enabling Samba services..."
 msgstr "Enabling Samba services..."
 
 #. translators: write progress step
-#: src/modules/SambaServer.pm:258
+#: src/modules/SambaServer.pm:279
 msgid "Writing back-end settings..."
 msgstr "Writing back-end settings..."
 
 #. translators: write progress step
-#: src/modules/SambaServer.pm:260
+#: src/modules/SambaServer.pm:281
 msgid "Writing Samba accounts..."
 msgstr "Writing Samba accounts..."
 
 #. translators: write progress step
-#: src/modules/SambaServer.pm:262
+#: src/modules/SambaServer.pm:283
 msgid "Saving firewall settings..."
 msgstr "Saving firewall settings..."
 
 #. /etc/samba/smb.conf is filename
-#: src/modules/SambaServer.pm:288
+#: src/modules/SambaServer.pm:309
 msgid "Cannot write settings to /etc/samba/smb.conf."
 msgstr "Cannot write settings to /etc/samba/smb.conf."
 
 #. summary item: configured workgroup/domain
-#: src/modules/SambaServer.pm:385
+#: src/modules/SambaServer.pm:406
 msgid "Global Configuration:"
 msgstr "Global Configuration:"
 
-#: src/modules/SambaServer.pm:387
+#: src/modules/SambaServer.pm:408
 #, perl-format
 msgid "Workgroup or Domain: %s"
 msgstr "Workgroup or Domain: %s"
 
 #. summary item: selected role for the samba server
-#: src/modules/SambaServer.pm:391
+#: src/modules/SambaServer.pm:412
 #, perl-format
 msgid "Role: %s"
 msgstr "Role: %s"
 
 #. summary item: status of the samba service
-#: src/modules/SambaServer.pm:394
+#: src/modules/SambaServer.pm:415
 msgid "Samba server is disabled"
 msgstr "Samba server is disabled"
 
 #. summary heading: configured shares
-#: src/modules/SambaServer.pm:398
+#: src/modules/SambaServer.pm:419
 msgid "Share Configuration:"
 msgstr "Share Configuration:"
 
 #. summary item: no configured shares
-#: src/modules/SambaServer.pm:404
+#: src/modules/SambaServer.pm:425
 msgid "None"
 msgstr "None"
 
+#~ msgid "Firewall Settings"
+#~ msgstr "Firewall Settings"
+
 #, fuzzy
 #~| msgid "SSL Support"
 #~ msgid "Snapper Support"

Modified: trunk/yast/en_GB/po/security.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/security.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/security.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: security\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:53+0200\n"
+"POT-Creation-Date: 2014-10-29 16:21+0100\n"
 "PO-Revision-Date: 2008-03-27 22:54+0000\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"
@@ -239,112 +239,113 @@
 
 #. table header
 #. table header
-#: src/include/security/dialogs.rb:186 src/include/security/dialogs.rb:476
+#: src/include/security/dialogs.rb:186 src/include/security/dialogs.rb:470
 #, fuzzy
 msgid "Security Setting"
 msgstr "Security Settings"
 
-#: src/include/security/dialogs.rb:187 src/include/security/dialogs.rb:477
+#: src/include/security/dialogs.rb:187 src/include/security/dialogs.rb:471
 msgid "Status"
 msgstr "Status"
 
-#: src/include/security/dialogs.rb:188 src/include/security/dialogs.rb:478
+#: src/include/security/dialogs.rb:188 src/include/security/dialogs.rb:472
 #, fuzzy
 msgid "Security Status"
 msgstr "Security Settings"
 
 #. add one line for each security setting
-#: src/include/security/dialogs.rb:356
+#: src/include/security/dialogs.rb:348
 msgid "Help"
 msgstr "Help"
 
 #. this is a separator between service names
 #. e.g.: "postfix" + " or " + "sendmail"
-#: src/include/security/dialogs.rb:402
+#: src/include/security/dialogs.rb:395
 msgid " or "
 msgstr ""
 
 #. richtext message: %1 = runlevel ("3" or "5"), %2 = list of services
-#: src/include/security/dialogs.rb:411
+#: src/include/security/dialogs.rb:404
 #, fuzzy
 msgid "<P>These basic system services are not enabled in runlevel %1:<BR><B>%2</B></P>"
 msgstr ""
 "These required services are missing:\n"
 "%1."
 
-#: src/include/security/dialogs.rb:419
+#: src/include/security/dialogs.rb:412
 msgid "<P>All basic services are enabled.</P>"
 msgstr ""
 
-#: src/include/security/dialogs.rb:431
+#. TODO: runlevel is not longer needed (read above)
+#: src/include/security/dialogs.rb:425
 #, fuzzy
 msgid "<P>These extra services are enabled in runlevel %1:<BR><B>%2</B></P>"
 msgstr ""
 "These required services are missing:\n"
 "%1."
 
-#: src/include/security/dialogs.rb:440
+#: src/include/security/dialogs.rb:434
 msgid "<P>Check the list of services and disable all unused services.</P>"
 msgstr ""
 
-#: src/include/security/dialogs.rb:447
+#: src/include/security/dialogs.rb:441
 msgid "<P>Only basic system services are enabled.</P>"
 msgstr ""
 
-#: src/include/security/dialogs.rb:454
+#: src/include/security/dialogs.rb:448
 msgid "Description"
 msgstr "Description"
 
 #. Overview dialog caption
 #. params: input tree, parent, label, id
-#: src/include/security/dialogs.rb:466 src/include/security/wizards.rb:49
+#: src/include/security/dialogs.rb:460 src/include/security/wizards.rb:49
 #, fuzzy
 msgid "Security Overview"
 msgstr "Special Keys Overview"
 
 #. push button label
-#: src/include/security/dialogs.rb:491
+#: src/include/security/dialogs.rb:485
 #, fuzzy
 msgid "Change &Status"
 msgstr "Change this?"
 
 #. push button label
-#: src/include/security/dialogs.rb:494
+#: src/include/security/dialogs.rb:488
 msgid "&Description"
 msgstr "&Description"
 
 #. Boot dialog caption
-#: src/include/security/dialogs.rb:640 src/include/security/wizards.rb:57
+#: src/include/security/dialogs.rb:634 src/include/security/wizards.rb:57
 msgid "Boot Settings"
 msgstr "Boot Settings"
 
 #. Frame label
-#: src/include/security/dialogs.rb:652
+#: src/include/security/dialogs.rb:646
 msgid "Boot Permissions"
 msgstr "Boot Permissions"
 
 #. Misc dialog caption
-#: src/include/security/dialogs.rb:729 src/include/security/wizards.rb:60
+#: src/include/security/dialogs.rb:723 src/include/security/wizards.rb:60
 msgid "Miscellaneous Settings"
 msgstr "Miscellaneous Settings"
 
 #. Password dialog caption
-#: src/include/security/dialogs.rb:815 src/include/security/wizards.rb:56
+#: src/include/security/dialogs.rb:803 src/include/security/wizards.rb:56
 msgid "Password Settings"
 msgstr "Password Settings"
 
 #. Frame label
-#: src/include/security/dialogs.rb:824
+#: src/include/security/dialogs.rb:812
 msgid "Checks"
 msgstr "Checks"
 
 #. Frame label
-#: src/include/security/dialogs.rb:839
+#: src/include/security/dialogs.rb:827
 msgid "Password Age"
 msgstr "Password Age"
 
 #. Popup text
-#: src/include/security/dialogs.rb:917
+#: src/include/security/dialogs.rb:905
 msgid ""
 "The minimum number of days cannot be larger\n"
 "than the maximum."
@@ -353,7 +354,7 @@
 "than the maximum."
 
 #. Popup text, %1 is number
-#: src/include/security/dialogs.rb:934
+#: src/include/security/dialogs.rb:922
 msgid ""
 "The minimum password length cannot be larger than the maximum.\n"
 "The maximum password length for the selected encryption method is %1."
@@ -362,12 +363,12 @@
 "The maximum password length for the selected encryption method is %1."
 
 #. Login dialog caption
-#: src/include/security/dialogs.rb:966 src/include/security/wizards.rb:58
+#: src/include/security/dialogs.rb:954 src/include/security/wizards.rb:58
 msgid "Login Settings"
 msgstr "Login Settings"
 
 #. Frame label
-#: src/include/security/dialogs.rb:975
+#: src/include/security/dialogs.rb:963
 msgid "Login"
 msgstr "Login"
 
@@ -1025,165 +1026,155 @@
 
 #. CheckBox label
 #: src/include/security/widgets.rb:116
-msgid "&Current Directory in root's Path"
-msgstr "&Current Directory in root's Path"
-
-#. CheckBox label
-#: src/include/security/widgets.rb:122
-msgid "Curr&ent Directory in Path of Regular Users"
-msgstr "Curr&ent Directory in Path of Regular Users"
-
-#. CheckBox label
-#: src/include/security/widgets.rb:130
 msgid "Allow Remote &Graphical Login"
 msgstr "Allow Remote &Graphical Login"
 
 #. CheckBox label
-#: src/include/security/widgets.rb:136
+#: src/include/security/widgets.rb:122
 #, fuzzy
 #| msgid "Enable &Magic SysRq Keys"
 msgid "&Magic SysRq Keys"
 msgstr "Enable &Magic SysRq Keys"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:139
+#: src/include/security/widgets.rb:125
 msgid "Disable"
 msgstr "Disable"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:141
+#: src/include/security/widgets.rb:127
 #, fuzzy
 #| msgid "Enable AppArmor Functions"
 msgid "Enable All Functions"
 msgstr "Enable AppArmor Functions"
 
 #. IntField label
-#: src/include/security/widgets.rb:148
+#: src/include/security/widgets.rb:134
 msgid "&Delay after Incorrect Login Attempt"
 msgstr "&Delay after Incorrect Login Attempt"
 
 #. IntField label
 #. IntField label
-#: src/include/security/widgets.rb:156 src/include/security/widgets.rb:223
+#: src/include/security/widgets.rb:142 src/include/security/widgets.rb:209
 msgid "Maxim&um"
 msgstr "Maxim&um"
 
 #. IntField label
 #. IntField label
-#: src/include/security/widgets.rb:162 src/include/security/widgets.rb:236
+#: src/include/security/widgets.rb:148 src/include/security/widgets.rb:222
 msgid "M&inimum"
 msgstr "M&inimum"
 
 #. ComboBox label
-#: src/include/security/widgets.rb:168
+#: src/include/security/widgets.rb:154
 #, fuzzy
 #| msgid "&Shutdown Behaviour of Login Manager:"
 msgid "&Shutdown Behaviour of KDM Login Manager:"
 msgstr "&Shutdown Behaviour of Login Manager:"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:173
+#: src/include/security/widgets.rb:159
 msgid "Only root"
 msgstr "Only root"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:175
+#: src/include/security/widgets.rb:161
 msgid "All Users"
 msgstr "All Users"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:177
+#: src/include/security/widgets.rb:163
 msgid "Nobody"
 msgstr "Nobody"
 
 #. ComboBox value
 #. ["local",_("Local Users")],
 #. ComboBox value
-#: src/include/security/widgets.rb:181
+#: src/include/security/widgets.rb:167
 msgid "Automatic"
 msgstr "Automatic"
 
 #. ComboBox label
-#: src/include/security/widgets.rb:188
+#: src/include/security/widgets.rb:174
 #, fuzzy
 #| msgid "System Information"
 msgid "System Hybernation"
 msgstr "System Information"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:191
+#: src/include/security/widgets.rb:177
 msgid "User on the active console"
 msgstr ""
 
 #. ComboBox value
-#: src/include/security/widgets.rb:193
+#: src/include/security/widgets.rb:179
 msgid "Anyone can hibernate"
 msgstr ""
 
 #. ComboBox value
-#: src/include/security/widgets.rb:195
+#: src/include/security/widgets.rb:181
 #, fuzzy
 #| msgid "Authentication Realms"
 msgid "Authentication always required"
 msgstr "Authentication Realms"
 
 #. ComboBox label
-#: src/include/security/widgets.rb:202
+#: src/include/security/widgets.rb:188
 msgid "P&assword Encryption Method"
 msgstr "P&assword Encryption Method"
 
 #. CheckBox label
-#: src/include/security/widgets.rb:216
+#: src/include/security/widgets.rb:202
 msgid "&Check New Passwords"
 msgstr "&Check New Passwords"
 
 #. IntField label
-#: src/include/security/widgets.rb:229
+#: src/include/security/widgets.rb:215
 msgid "Numb&er of Passwords to Remember"
 msgstr "Numb&er of Passwords to Remember"
 
 #. IntField label
-#: src/include/security/widgets.rb:242
+#: src/include/security/widgets.rb:228
 msgid "&Minimum Acceptable Password Length"
 msgstr "&Minimum Acceptable Password Length"
 
 #. IntField label
-#: src/include/security/widgets.rb:250
+#: src/include/security/widgets.rb:236
 msgid "&Days before Password Expires Warning"
 msgstr "&Days before Password Expires Warning"
 
 #. ComboBox label
-#: src/include/security/widgets.rb:258
+#: src/include/security/widgets.rb:244
 msgid "&File Permissions"
 msgstr "&File Permissions"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:261
+#: src/include/security/widgets.rb:247
 msgid "Easy"
 msgstr "Easy"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:263
+#: src/include/security/widgets.rb:249
 msgid "Secure"
 msgstr "Secure"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:265
+#: src/include/security/widgets.rb:251
 msgid "Paranoid"
 msgstr "Paranoid"
 
 #. ComboBox label
-#: src/include/security/widgets.rb:272
+#: src/include/security/widgets.rb:258
 msgid "&User Launching updatedb"
 msgstr "&User Launching updatedb"
 
 #. IntField label
-#: src/include/security/widgets.rb:279
+#: src/include/security/widgets.rb:265
 msgid "Ma&ximum"
 msgstr "Ma&ximum"
 
 #. IntField label
-#: src/include/security/widgets.rb:285
+#: src/include/security/widgets.rb:271
 msgid "&Minimum"
 msgstr "&Minimum"
 
@@ -1203,69 +1194,75 @@
 msgstr "Initialising..."
 
 #. Security read dialog caption
-#: src/modules/Security.rb:640
+#: src/modules/Security.rb:608
 msgid "Saving Security Configuration"
 msgstr "Saving Security Configuration"
 
 #. Progress stage 1/4
-#: src/modules/Security.rb:649
+#: src/modules/Security.rb:617
 msgid "Write security settings"
 msgstr "Write security settings"
 
 #. Progress stage 2/4
-#: src/modules/Security.rb:651
+#: src/modules/Security.rb:619
 msgid "Write inittab settings"
 msgstr "Write inittab settings"
 
 #. Progress stage 3/4
-#: src/modules/Security.rb:653
+#: src/modules/Security.rb:621
 msgid "Write PAM settings"
 msgstr "Write PAM settings"
 
 #. Progress stage 4/4
-#: src/modules/Security.rb:655
+#: src/modules/Security.rb:623
 #, fuzzy
 #| msgid "Save system settings"
 msgid "Update system settings"
 msgstr "Save system settings"
 
 #. Progress step 1/5
-#: src/modules/Security.rb:659
+#: src/modules/Security.rb:627
 msgid "Writing security settings..."
 msgstr "Writing security settings..."
 
 #. Progress step 2/5
-#: src/modules/Security.rb:661
+#: src/modules/Security.rb:629
 msgid "Writing inittab settings..."
 msgstr "Writing inittab settings..."
 
 #. Progress step 3/5
-#: src/modules/Security.rb:663
+#: src/modules/Security.rb:631
 msgid "Writing PAM settings..."
 msgstr "Writing PAM settings..."
 
 #. Progress step 4/5
-#: src/modules/Security.rb:665
+#: src/modules/Security.rb:633
 #, fuzzy
 #| msgid "Saving system settings..."
 msgid "Updating system settings..."
 msgstr "Saving system settings..."
 
 #. Progress step 5/5
-#: src/modules/Security.rb:667
+#: src/modules/Security.rb:635
 msgid "Finished"
 msgstr "Finished"
 
 #. Summary text
-#: src/modules/Security.rb:901
+#: src/modules/Security.rb:869
 msgid "Current Security Level: Custom settings"
 msgstr "Current Security Level: Custom settings"
 
 #. Summary text
-#: src/modules/Security.rb:905
+#: src/modules/Security.rb:873
 msgid "Current Security Level: %1"
 msgstr "Current Security Level: %1"
 
+#~ msgid "&Current Directory in root's Path"
+#~ msgstr "&Current Directory in root's Path"
+
+#~ msgid "Curr&ent Directory in Path of Regular Users"
+#~ msgstr "Curr&ent Directory in Path of Regular Users"
+
 #, fuzzy
 #~ msgid "Use current directory in root's path"
 #~ msgstr "&Current Directory in root's Path"

Modified: trunk/yast/en_GB/po/services-manager.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/services-manager.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/services-manager.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-18 16:19+0200\n"
+"POT-Creation-Date: 2014-10-29 16:21+0100\n"
 "PO-Revision-Date: 2014-05-19 09:35+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,218 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/clients/default_target_finish.rb:33
-#, fuzzy
-#| msgid "Reading the default system settings..."
-msgid "Saving default systemd target..."
-msgstr "Reading the default system settings..."
-
-#: src/clients/default_target_proposal.rb:26
-msgid "VNC needs graphical system to be available"
-msgstr ""
-
 #. TODO implement behaviour if force_reset parameter provided
-#: src/clients/default_target_proposal.rb:51
-#, fuzzy
-#| msgid "Default initrd Path"
-msgid "&Default systemd target"
-msgstr "Default initrd Path"
-
-#: src/clients/default_target_proposal.rb:52
-#, fuzzy
-#| msgid "Default initrd Path"
-msgid "Default systemd target"
-msgstr "Default initrd Path"
-
-#. create the proposal dialog and get the sequence symbol from block
-#: src/clients/default_target_proposal.rb:116
-#, fuzzy
-#| msgid "Read the default system settings"
-msgid "Set Default Systemd Target"
-msgstr "Read the default system settings"
-
-#: src/clients/default_target_proposal.rb:134
-#, fuzzy
-#| msgid "Reading the default system settings..."
-msgid "Selecting the Default Systemd Target"
-msgstr "Reading the default system settings..."
-
-#: src/clients/default_target_proposal.rb:136
-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
-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
-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
-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
-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
-#, fuzzy
-#| msgid "Available Shares"
-msgid "Available Targets"
-msgstr "Available Shares"
-
-#. 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:219
-msgid "The installer is recommending you the default target '%s' "
-msgstr ""
-
-#: src/clients/default_target_proposal.rb:231
-#, fuzzy
-#| msgid "No patches have been selected for installation.\n"
-msgid "X11 packages have been selected for installation"
-msgstr "No patches have been selected for installation.\n"
-
-#: 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:237
-msgid "Serial connection does typically not support GUI"
-msgstr ""
-
-#: 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: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:251
-msgid "SSH installation mode assumes no GUI on the target system"
-msgstr ""
-
-#: src/clients/default_target_proposal.rb:254
-#, fuzzy
-#| msgid "No patches have been selected for installation.\n"
-msgid "X11 packages have not been selected for installation"
-msgstr "No patches have been selected for installation.\n"
-
-#: src/clients/default_target_proposal.rb:257
-msgid "This recommendation is based on the analysis of other installation settings"
-msgstr ""
-
-#. Default for double-click in the table
-#. Default for double-click in the table
-#: src/clients/services-manager.rb:71 src/clients/services.rb:71
-msgid "Writing configuration..."
-msgstr "Writing configuration..."
-
-#: src/clients/services-manager.rb:76 src/clients/services.rb:76
-#, fuzzy
-#| msgid "Writing the system configuration"
-msgid "Writing the configuration failed:\n"
-msgstr "Writing the system configuration"
-
-#. Fills the dialog contents
-#. Fills the dialog contents
-#: src/clients/services-manager.rb:91 src/clients/services.rb:91
-#, fuzzy
-#| msgid "Default &Lease Time"
-msgid "Default System &Target"
-msgstr "Default &Lease Time"
-
-#: src/clients/services-manager.rb:99 src/clients/services.rb:99
-msgid "Service"
-msgstr "Service"
-
-#: src/clients/services-manager.rb:100 src/clients/services-manager.rb:130
-#: src/clients/services-manager.rb:146 src/clients/services.rb:100
-#: src/clients/services.rb:130 src/clients/services.rb:146
-#: src/data/services-manager/autoyast_summary.erb:16
-msgid "Enabled"
-msgstr "Enabled"
-
-#. The current state matches the futural state
-#. The current state matches the futural state
-#: src/clients/services-manager.rb:101 src/clients/services-manager.rb:131
-#: src/clients/services-manager.rb:156 src/clients/services.rb:101
-#: src/clients/services.rb:131 src/clients/services.rb:156
-msgid "Active"
-msgstr "Active"
-
-#: src/clients/services-manager.rb:102 src/clients/services.rb:102
-msgid "Description"
-msgstr "Description"
-
-#: src/clients/services-manager.rb:107 src/clients/services.rb:107
-#, fuzzy
-#| msgid "&Start"
-msgid "&Start/Stop"
-msgstr "&Start"
-
-#: src/clients/services-manager.rb:109 src/clients/services.rb:109
-#, fuzzy
-#| msgid "Enable/Disable Kdump"
-msgid "&Enable/Disable"
-msgstr "Enable/Disable Kdump"
-
-#: src/clients/services-manager.rb:111 src/clients/services.rb:111
-msgid "Show &Details"
-msgstr "Show &Details"
-
-#: src/clients/services-manager.rb:114 src/clients/services.rb:114
-#: src/data/services-manager/autoyast_summary.erb:5
-#, fuzzy
-#| msgid "Security Manager"
-msgid "Services Manager"
-msgstr "Security Manager"
-
-#. Redraws the services dialog
-#. Redraws the services dialog
-#: src/clients/services-manager.rb:126 src/clients/services.rb:126
-#, fuzzy
-#| msgid "Reading Samba service settings..."
-msgid "Reading services status..."
-msgstr "Reading Samba service settings..."
-
-#: src/clients/services-manager.rb:130 src/clients/services-manager.rb:146
-#: src/clients/services.rb:130 src/clients/services.rb:146
-#: src/data/services-manager/autoyast_summary.erb:23
-msgid "Disabled"
-msgstr "Disabled"
-
-#: src/clients/services-manager.rb:131 src/clients/services-manager.rb:156
-#: src/clients/services.rb:131 src/clients/services.rb:156
-#, fuzzy
-#| msgid "active"
-msgid "Inactive"
-msgstr "active"
-
-#. The current state differs the the futural state
-#. The current state differs the the futural state
-#: src/clients/services-manager.rb:163 src/clients/services.rb:163
-msgid "Active (will start)"
-msgstr ""
-
-#: src/clients/services-manager.rb:163 src/clients/services.rb:163
-msgid "Inactive (will stop)"
-msgstr ""
-
-#. Opens up a popup with details about the currently selected service
-#. Opens up a popup with details about the currently selected service
-#: src/clients/services-manager.rb:190 src/clients/services.rb:190
-#, fuzzy
-#| msgid "Service %service will be %toggled %link"
-msgid "Service %{service} Full Info"
-msgstr "Service %service will be %toggled %link"
-
-#. TODO implement behaviour if force_reset parameter provided
 #: src/clients/services_proposal.rb:52
 msgid "&Services"
 msgstr "&Services"
@@ -284,82 +73,166 @@
 msgid "Cannot enable service %1"
 msgstr "Cannot enable service %1"
 
+#: src/data/services-manager/autoyast_summary.erb:5
+#, fuzzy
+#| msgid "Security Manager"
+msgid "Services Manager"
+msgstr "Security Manager"
+
 #: src/data/services-manager/autoyast_summary.erb:6
 #, fuzzy
 #| msgid "Default Hat"
 msgid "Default Target"
 msgstr "Default Hat"
 
+#: src/data/services-manager/autoyast_summary.erb:16
+msgid "Enabled"
+msgstr "Enabled"
+
+#: src/data/services-manager/autoyast_summary.erb:23
+msgid "Disabled"
+msgstr "Disabled"
+
 #. Name of the systemd default target unit. Suffix '.target' is optional.
 #. @return [String] if the target has been specified in the profile. Can be nil.
 #: src/lib/services-manager/services_manager_profile.rb:104
 msgid "Unknown autoyast services profile schema for 'services-manager'"
 msgstr ""
 
-#. AutoYast summary
-#: src/modules/services_manager.rb:29
-msgid "Not configured yet."
-msgstr "Not configured yet."
+#, fuzzy
+#~| msgid "Reading the default system settings..."
+#~ msgid "Saving default systemd target..."
+#~ msgstr "Reading the default system settings..."
 
-#. Do not start or stop services that are already in the desired state
-#. they might be coming from AutoYast import and thus they are :modified.
-#: src/modules/services_manager_service.rb:407
-msgid "Could not %{change} %{service} which is currently %{status}. "
-msgstr ""
+#, fuzzy
+#~| msgid "Default initrd Path"
+#~ msgid "&Default systemd target"
+#~ msgstr "Default initrd Path"
 
-#: src/modules/services_manager_service.rb:426
 #, fuzzy
-#| msgid "%1: Could not change state of the device"
-msgid "Could not %{change} %{service}. "
-msgstr "%1: Could not change state of the device"
+#~| msgid "Default initrd Path"
+#~ msgid "Default systemd target"
+#~ msgstr "Default initrd Path"
 
-#. Default systemd target (previously: runlevel 5) option #1
-#: src/modules/services_manager_target.rb:22
 #, fuzzy
-#| msgid "Dial mode"
-msgid "Graphical mode"
-msgstr "Dial mode"
+#~| msgid "Read the default system settings"
+#~ msgid "Set Default Systemd Target"
+#~ msgstr "Read the default system settings"
 
-#. Default systemd target (previously: runlevel 3) option #2
-#: src/modules/services_manager_target.rb:24
 #, fuzzy
-#| msgid "Text Mode"
-msgid "Text mode"
-msgstr "Text Mode"
+#~| msgid "Reading the default system settings..."
+#~ msgid "Selecting the Default Systemd Target"
+#~ msgstr "Reading the default system settings..."
 
-#. Systemd targets
-#: src/modules/services_manager_target.rb:27
 #, fuzzy
-#| msgid "&Graphical interface"
-msgid "Graphical Interface"
-msgstr "&Graphical interface"
+#~| msgid "Available Shares"
+#~ msgid "Available Targets"
+#~ msgstr "Available Shares"
 
-#: src/modules/services_manager_target.rb:28
 #, fuzzy
-#| msgid "Select Mode"
-msgid "Emergency Mode"
-msgstr "Select Mode"
+#~| msgid "No patches have been selected for installation.\n"
+#~ msgid "X11 packages have been selected for installation"
+#~ msgstr "No patches have been selected for installation.\n"
 
-#: src/modules/services_manager_target.rb:29
 #, fuzzy
-#| msgid "Switch Mode"
-msgid "Switch Root"
-msgstr "Switch Mode"
+#~| msgid "No patches have been selected for installation.\n"
+#~ msgid "X11 packages have not been selected for installation"
+#~ msgstr "No patches have been selected for installation.\n"
 
-#: src/modules/services_manager_target.rb:30
+#~ msgid "Writing configuration..."
+#~ msgstr "Writing configuration..."
+
 #, fuzzy
-#| msgid "Default Bridge"
-msgid "Initrd Default Target"
-msgstr "Default Bridge"
+#~| msgid "Writing the system configuration"
+#~ msgid "Writing the configuration failed:\n"
+#~ msgstr "Writing the system configuration"
 
-#: src/modules/services_manager_target.rb:31
 #, fuzzy
-#| msgid "Other System"
-msgid "Multi-User System"
-msgstr "Other System"
+#~| msgid "Default &Lease Time"
+#~ msgid "Default System &Target"
+#~ msgstr "Default &Lease Time"
 
-#: src/modules/services_manager_target.rb:32
+#~ msgid "Service"
+#~ msgstr "Service"
+
+#~ msgid "Active"
+#~ msgstr "Active"
+
+#~ msgid "Description"
+#~ msgstr "Description"
+
 #, fuzzy
-#| msgid "Required DMA Mode"
-msgid "Rescue Mode"
-msgstr "Required DMA Mode"
+#~| msgid "&Start"
+#~ msgid "&Start/Stop"
+#~ msgstr "&Start"
+
+#, fuzzy
+#~| msgid "Enable/Disable Kdump"
+#~ msgid "&Enable/Disable"
+#~ msgstr "Enable/Disable Kdump"
+
+#~ msgid "Show &Details"
+#~ msgstr "Show &Details"
+
+#, fuzzy
+#~| msgid "Reading Samba service settings..."
+#~ msgid "Reading services status..."
+#~ msgstr "Reading Samba service settings..."
+
+#, fuzzy
+#~| msgid "active"
+#~ msgid "Inactive"
+#~ msgstr "active"
+
+#, fuzzy
+#~| msgid "Service %service will be %toggled %link"
+#~ msgid "Service %{service} Full Info"
+#~ msgstr "Service %service will be %toggled %link"
+
+#~ msgid "Not configured yet."
+#~ msgstr "Not configured yet."
+
+#, fuzzy
+#~| msgid "%1: Could not change state of the device"
+#~ msgid "Could not %{change} %{service}. "
+#~ msgstr "%1: Could not change state of the device"
+
+#, fuzzy
+#~| msgid "Dial mode"
+#~ msgid "Graphical mode"
+#~ msgstr "Dial mode"
+
+#, fuzzy
+#~| msgid "Text Mode"
+#~ msgid "Text mode"
+#~ msgstr "Text Mode"
+
+#, fuzzy
+#~| msgid "&Graphical interface"
+#~ msgid "Graphical Interface"
+#~ msgstr "&Graphical interface"
+
+#, fuzzy
+#~| msgid "Select Mode"
+#~ msgid "Emergency Mode"
+#~ msgstr "Select Mode"
+
+#, fuzzy
+#~| msgid "Switch Mode"
+#~ msgid "Switch Root"
+#~ msgstr "Switch Mode"
+
+#, fuzzy
+#~| msgid "Default Bridge"
+#~ msgid "Initrd Default Target"
+#~ msgstr "Default Bridge"
+
+#, fuzzy
+#~| msgid "Other System"
+#~ msgid "Multi-User System"
+#~ msgstr "Other System"
+
+#, fuzzy
+#~| msgid "Required DMA Mode"
+#~ msgid "Rescue Mode"
+#~ msgstr "Required DMA Mode"

Modified: trunk/yast/en_GB/po/storage.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/storage.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/storage.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: storage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-29 18:07+0200\n"
+"POT-Creation-Date: 2014-10-29 16:21+0100\n"
 "PO-Revision-Date: 2008-12-02 10:13+0100\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"
@@ -1688,6 +1688,12 @@
 msgstr "Volume &Label"
 
 #. label text
+#: src/include/partitioning/custom_part_dialogs.rb:516
+#, fuzzy
+msgid "&UUID"
+msgstr "ID"
+
+#. label text
 #: src/include/partitioning/custom_part_dialogs.rb:526
 msgid "Device &ID"
 msgstr "Device &ID"
@@ -1905,28 +1911,8 @@
 "\n"
 "Shrink the file system now?"
 
-#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1410
-msgid "No unsaved changes exist."
-msgstr "No unsaved changes exist."
-
-#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1417
-msgid "Changes:"
-msgstr "Changes:"
-
-#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1429
-msgid " Do you really want to execute these changes?"
-msgstr " Do you really want to execute these changes?"
-
-#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1435
-msgid "&Apply"
-msgstr "&Apply"
-
 #. popup text, %1 is replaced by device name
-#: src/include/partitioning/custom_part_dialogs.rb:1495
+#: src/include/partitioning/custom_part_dialogs.rb:1441
 #, fuzzy
 #| msgid ""
 #| "The selected device contains partitions that are currently mounted:\n"
@@ -1945,7 +1931,7 @@
 "Choose Cancel unless you know exactly what you are doing.\n"
 
 #. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_dialogs.rb:1518
+#: src/include/partitioning/custom_part_dialogs.rb:1464
 msgid ""
 "\n"
 "The selected device contains at least one LVM partition\n"
@@ -1960,7 +1946,7 @@
 "before deleting the device.\n"
 
 #. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_dialogs.rb:1529
+#: src/include/partitioning/custom_part_dialogs.rb:1475
 msgid ""
 "\n"
 "The selected device contains at least one partition\n"
@@ -1975,7 +1961,7 @@
 "deleting the device.\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1540
+#: src/include/partitioning/custom_part_dialogs.rb:1486
 msgid ""
 "\n"
 "The selected device contains at least one partition\n"
@@ -1988,7 +1974,7 @@
 "before deleting the device.\n"
 
 #. help text, richtext format
-#: src/include/partitioning/custom_part_dialogs.rb:1601
+#: src/include/partitioning/custom_part_dialogs.rb:1547
 #, fuzzy
 #| msgid ""
 #| "<p>\n"
@@ -2000,26 +1986,26 @@
 "Create an encrypted file system.\n"
 "</p>\n"
 
-#: src/include/partitioning/custom_part_dialogs.rb:1606
+#: src/include/partitioning/custom_part_dialogs.rb:1552
 msgid "<p>Enable automatic snapshots for a Btrfs filesystem with snapper.</p>"
 msgstr ""
 
 #. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1620
+#: src/include/partitioning/custom_part_dialogs.rb:1566
 #, fuzzy
 #| msgid "Existing Sudo Rule "
 msgid "Existing Subvolumes:"
 msgstr "Existing Sudo Rule "
 
 #. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1626
+#: src/include/partitioning/custom_part_dialogs.rb:1572
 #, fuzzy
 #| msgid "New Sudo Rule"
 msgid "New Subvolume"
 msgstr "New Sudo Rule"
 
 #. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1632
+#: src/include/partitioning/custom_part_dialogs.rb:1578
 #, fuzzy
 #| msgid "Add new user"
 msgid "Add new"
@@ -2027,46 +2013,46 @@
 
 #. button text
 #. push button text
-#: src/include/partitioning/custom_part_dialogs.rb:1638
+#: src/include/partitioning/custom_part_dialogs.rb:1584
 #: src/modules/DualMultiSelectionBox.rb:147
 msgid "Remove"
 msgstr "Remove"
 
 #. TRANSLATOR: checkbox text
 #. TRANSLATORS: checkbox text
-#: src/include/partitioning/custom_part_dialogs.rb:1650
+#: src/include/partitioning/custom_part_dialogs.rb:1596
 #: src/modules/StorageProposal.rb:6211
 msgid "Enable Snapshots"
 msgstr ""
 
 #. heading text
 #. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1661
+#: src/include/partitioning/custom_part_dialogs.rb:1607
 #: src/include/partitioning/custom_part_lib.rb:420
 #, fuzzy
 #| msgid "Signature Handling"
 msgid "Subvolume Handling"
 msgstr "Signature Handling"
 
-#: src/include/partitioning/custom_part_dialogs.rb:1724
+#: src/include/partitioning/custom_part_dialogs.rb:1670
 #, fuzzy
 #| msgid "Empty password is not allowed."
 msgid "Empty subvolume name not allowed."
 msgstr "Empty password is not allowed."
 
-#: src/include/partitioning/custom_part_dialogs.rb:1728
+#: src/include/partitioning/custom_part_dialogs.rb:1674
 msgid ""
 "Only subvolume names starting with \"%1\" currently allowed!\n"
 "Automatically prepending \"%1\" to name of subvolume."
 msgstr ""
 
-#: src/include/partitioning/custom_part_dialogs.rb:1738
+#: src/include/partitioning/custom_part_dialogs.rb:1684
 #, fuzzy
 #| msgid "Zone name %1 already exists."
 msgid "Subvolume name %1 already exists."
 msgstr "Zone name %1 already exists."
 
-#: src/include/partitioning/custom_part_dialogs.rb:1767
+#: src/include/partitioning/custom_part_dialogs.rb:1713
 msgid "Modifications done so far in this dialog will be lost."
 msgstr ""
 
@@ -2450,12 +2436,12 @@
 
 #. //////////////////////////////////////////////
 #. modify map new
-#: src/include/partitioning/custom_part_lib.rb:954
-#: src/include/partitioning/custom_part_lib.rb:981
+#: src/include/partitioning/custom_part_lib.rb:948
+#: src/include/partitioning/custom_part_lib.rb:975
 msgid "The file system is currently mounted on %1."
 msgstr ""
 
-#: src/include/partitioning/custom_part_lib.rb:959
+#: src/include/partitioning/custom_part_lib.rb:953
 msgid ""
 "You can try to unmount it now, continue without unmounting or cancel.\n"
 "Click Cancel unless you know exactly what you are doing."
@@ -2463,32 +2449,32 @@
 
 #. button text
 #. button text
-#: src/include/partitioning/custom_part_lib.rb:970
-#: src/include/partitioning/custom_part_lib.rb:995
+#: src/include/partitioning/custom_part_lib.rb:964
+#: src/include/partitioning/custom_part_lib.rb:989
 #, fuzzy
 #| msgid "Mount"
 msgid "Unmount"
 msgstr "Mount"
 
-#: src/include/partitioning/custom_part_lib.rb:986
+#: src/include/partitioning/custom_part_lib.rb:980
 msgid ""
 "You can try to unmount it now or cancel.\n"
 "Click Cancel unless you know exactly what you are doing."
 msgstr ""
 
-#: src/include/partitioning/custom_part_lib.rb:1032
+#: src/include/partitioning/custom_part_lib.rb:1026
 #, fuzzy
 #| msgid "It is not possible to delete a NIS user."
 msgid "It is not possible to shrink the file system while it is mounted."
 msgstr "It is not possible to delete a NIS user."
 
-#: src/include/partitioning/custom_part_lib.rb:1045
+#: src/include/partitioning/custom_part_lib.rb:1039
 #, fuzzy
 #| msgid "It is not possible to delete a NIS user."
 msgid "It is not possible to extend the file system while it is mounted."
 msgstr "It is not possible to delete a NIS user."
 
-#: src/include/partitioning/custom_part_lib.rb:1056
+#: src/include/partitioning/custom_part_lib.rb:1050
 #, fuzzy
 #| msgid ""
 #| "Partition %1 cannot be resized\n"
@@ -3541,7 +3527,7 @@
 
 #. error popup
 #. TRANSLATORS: error popup
-#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5164
+#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5165
 msgid "The disk is in use and cannot be modified."
 msgstr ""
 
@@ -5661,14 +5647,14 @@
 msgstr "Pattern"
 
 #. label text
-#: src/modules/FileSystems.rb:276
+#: src/modules/FileSystems.rb:278
 #, fuzzy
 #| msgid "&Size"
 msgid "Tmpfs &Size"
 msgstr "&Size"
 
 #. popup text
-#: src/modules/FileSystems.rb:285
+#: src/modules/FileSystems.rb:287
 #, fuzzy
 #| msgid "Value must be between 0 and 32767. Try again."
 msgid ""
@@ -5676,14 +5662,14 @@
 "Value must be above 100k or between 1% and 200%. Try again."
 msgstr "Value must be between 0 and 32767. Try again."
 
-#: src/modules/FileSystems.rb:288
+#: src/modules/FileSystems.rb:290
 #, fuzzy
 #| msgid "Value must be between 0 and 32767. Try again."
 msgid "Value must be between 1% and 200%. Try again."
 msgstr "Value must be between 0 and 32767. Try again."
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:295
+#: src/modules/FileSystems.rb:297
 msgid ""
 "<p><b>Tmpfs Size:</b>\n"
 "Size may be either entered as a number followed by K,M,G for Kilo-, Mega- or Gigabyte or\n"
@@ -5691,17 +5677,17 @@
 msgstr ""
 
 #. label text
-#: src/modules/FileSystems.rb:309
+#: src/modules/FileSystems.rb:311
 msgid "Swap &Priority"
 msgstr "Swap &Priority"
 
 #. popup text
-#: src/modules/FileSystems.rb:317
+#: src/modules/FileSystems.rb:319
 msgid "Value must be between 0 and 32767. Try again."
 msgstr "Value must be between 0 and 32767. Try again."
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:324
+#: src/modules/FileSystems.rb:326
 msgid ""
 "<p><b>Swap Priority:</b>\n"
 "Enter the swap priority. Higher numbers mean higher priority.</p>\n"
@@ -5710,14 +5696,14 @@
 "Enter the swap priority. Higher numbers mean higher priority.</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:479
+#: src/modules/FileSystems.rb:481
 #, fuzzy
 #| msgid "Mount &read-only"
 msgid "Mount &Read-Only"
 msgstr "Mount &read-only"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:483
+#: src/modules/FileSystems.rb:485
 #, fuzzy
 #| msgid ""
 #| "<p><b>Mount Read-Only:</b>\n"
@@ -5731,14 +5717,14 @@
 "No writing to the file system is possible. Default is false.</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:495
+#: src/modules/FileSystems.rb:497
 #, fuzzy
 #| msgid "No &access time"
 msgid "No &Access Time"
 msgstr "No &access time"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:499
+#: src/modules/FileSystems.rb:501
 #, fuzzy
 #| msgid ""
 #| "<p><b>No access time:</b>\n"
@@ -5751,14 +5737,14 @@
 "Access times are not updated when a file is read. Default is false.</p>"
 
 #. button text
-#: src/modules/FileSystems.rb:509
+#: src/modules/FileSystems.rb:511
 #, fuzzy
 #| msgid "Mountable by &user"
-msgid "Mountable by &User"
+msgid "Mountable by User"
 msgstr "Mountable by &user"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:513
+#: src/modules/FileSystems.rb:515
 msgid ""
 "<p><b>Mountable by User:</b>\n"
 "The file system may be mounted by an ordinary user. Default is false.</p>\n"
@@ -5767,12 +5753,12 @@
 "The file system may be mounted by an ordinary user. Default is false.</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:526
+#: src/modules/FileSystems.rb:528
 msgid "Do Not Mount at System &Start-up"
 msgstr "Do Not Mount at System &Start-up"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:532
+#: src/modules/FileSystems.rb:534
 #, fuzzy
 #| msgid ""
 #| "<p><b>Do Not Mount at System Start-up:</b>\n"
@@ -5796,12 +5782,12 @@
 "is given. Default is false.</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:549
+#: src/modules/FileSystems.rb:551
 msgid "Enable &Quota Support"
 msgstr "Enable &Quota Support"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:555
+#: src/modules/FileSystems.rb:557
 msgid ""
 "<p><b>Enable Quota Support:</b>\n"
 "The file system is mounted with user quotas enabled.\n"
@@ -5812,12 +5798,12 @@
 "Default is false.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:574
+#: src/modules/FileSystems.rb:576
 msgid "Data &Journaling Mode"
 msgstr "Data &Journaling Mode"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:583
+#: src/modules/FileSystems.rb:585
 #, fuzzy
 #| msgid ""
 #| "<p><b>Data Journaling Mode:</b>\n"
@@ -5845,12 +5831,12 @@
 "<tt>writeback</tt> -- Data ordering is not preserved. No performance impact.</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:604
+#: src/modules/FileSystems.rb:606
 msgid "&Access Control Lists (ACL)"
 msgstr "&Access Control Lists (ACL)"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:608
+#: src/modules/FileSystems.rb:610
 msgid ""
 "<p><b>Access Control Lists (ACL):</b>\n"
 "Enable access control lists on the file system.</p>\n"
@@ -5859,12 +5845,12 @@
 "Enable access control lists on the file system.</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:619
+#: src/modules/FileSystems.rb:621
 msgid "&Extended User Attributes"
 msgstr "&Extended User Attributes"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:623
+#: src/modules/FileSystems.rb:625
 msgid ""
 "<p><b>Extended User Attributes:</b>\n"
 "Allow extended user attributes on the file system.</p>\n"
@@ -5873,19 +5859,19 @@
 "Allow extended user attributes on the file system.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:640
+#: src/modules/FileSystems.rb:642
 #, fuzzy
 #| msgid "Arbitrary option &value"
 msgid "Arbitrary Option &Value"
 msgstr "Arbitrary option &value"
 
-#: src/modules/FileSystems.rb:645
+#: src/modules/FileSystems.rb:647
 #, fuzzy
 msgid "Invalid characters in arbitrary option value. Do not use spaces or tabs. Try again."
 msgstr "Invalid character in mount point. Dont use \"`'!\"%#\" in a mount point."
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:649
+#: src/modules/FileSystems.rb:651
 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"
@@ -5896,12 +5882,12 @@
 "Multiple options are separated by commas.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:666
+#: src/modules/FileSystems.rb:668
 msgid "Char&set for file names"
 msgstr "Char&set for file names"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:687
+#: src/modules/FileSystems.rb:689
 msgid ""
 "<p><b>Charset for File Names:</b>\n"
 "Set the charset used for display of file names in Windows partitions.</p>\n"
@@ -5910,12 +5896,12 @@
 "Set the charset used for display of file names in Windows partitions.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:698
+#: src/modules/FileSystems.rb:700
 msgid "Code&page for short FAT names"
 msgstr "Code&page for short FAT names"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:704
+#: src/modules/FileSystems.rb:706
 msgid ""
 "<p><b>Codepage for Short FAT Names:</b>\n"
 "This codepage is used for converting to shortname characters on FAT file systems.</p>\n"
@@ -5924,12 +5910,12 @@
 "This codepage is used for converting to shortname characters on FAT file systems.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:718
+#: src/modules/FileSystems.rb:720
 msgid "Number of &FATs"
 msgstr "Number of &FATs"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:724
+#: src/modules/FileSystems.rb:726
 msgid ""
 "<p><b>Number of FATs:</b>\n"
 "Specify the number of file allocation tables in the file system. The default is 2.</p>"
@@ -5938,14 +5924,14 @@
 "Specify the number of file allocation tables in the file system. The default is 2.</p>"
 
 #. label text
-#: src/modules/FileSystems.rb:733
+#: src/modules/FileSystems.rb:735
 #, fuzzy
 #| msgid "FAT &size"
 msgid "FAT &Size"
 msgstr "FAT &size"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:744
+#: src/modules/FileSystems.rb:746
 #, fuzzy
 msgid ""
 "<p><b>FAT Size:</b>\n"
@@ -5955,21 +5941,21 @@
 "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"
 
 #. label text
-#: src/modules/FileSystems.rb:753
+#: src/modules/FileSystems.rb:755
 #, fuzzy
 #| msgid "Root &dir entries"
 msgid "Root &Dir Entries"
 msgstr "Root &dir entries"
 
 #. popup text
-#: src/modules/FileSystems.rb:761
+#: src/modules/FileSystems.rb:763
 #, fuzzy
 #| msgid "The minimum size for \"Root dir entries\" is 112. Please try again."
 msgid "The minimum size for \"Root Dir Entries\" is 112. Try again."
 msgstr "The minimum size for \"Root dir entries\" is 112. Please try again."
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:765
+#: src/modules/FileSystems.rb:767
 #, fuzzy
 #| msgid ""
 #| "<p><b>Root dir entries:</b>\n"
@@ -5982,14 +5968,14 @@
 "Select the number of entries available in the root directory.</p>"
 
 #. label text
-#: src/modules/FileSystems.rb:778
+#: src/modules/FileSystems.rb:780
 #, fuzzy
 #| msgid "Hash &function"
 msgid "Hash &Function"
 msgstr "Hash &function"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:785
+#: src/modules/FileSystems.rb:787
 #, fuzzy
 #| msgid ""
 #| "<p><b>Hash function:</b>\n"
@@ -6002,14 +5988,14 @@
 "This specifies the name of the hash function to use to sort the file names in directories.</p>"
 
 #. label text
-#: src/modules/FileSystems.rb:794
+#: src/modules/FileSystems.rb:796
 #, fuzzy
 #| msgid "FS &revision"
 msgid "FS &Revision"
 msgstr "FS &revision"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:801
+#: src/modules/FileSystems.rb:803
 #, fuzzy
 #| msgid ""
 #| "<p><b>FS revision:</b>\n"
@@ -6023,14 +6009,14 @@
 
 #. label text
 #. label text
-#: src/modules/FileSystems.rb:814 src/modules/FileSystems.rb:978
+#: src/modules/FileSystems.rb:816 src/modules/FileSystems.rb:980
 #, fuzzy
 #| msgid "Block &size in bytes"
 msgid "Block &Size in Bytes"
 msgstr "Block &size in bytes"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:821
+#: src/modules/FileSystems.rb:823
 #, fuzzy
 #| msgid ""
 #| "<p><b>Block size:</b>\n"
@@ -6044,13 +6030,13 @@
 
 #. label text
 #. label text
-#: src/modules/FileSystems.rb:830 src/modules/FileSystems.rb:1060
+#: src/modules/FileSystems.rb:832 src/modules/FileSystems.rb:1062
 msgid "&Inode Size"
 msgstr "&Inode Size"
 
 #. help text, richtext format
 #. help text, richtext format
-#: src/modules/FileSystems.rb:836 src/modules/FileSystems.rb:1066
+#: src/modules/FileSystems.rb:838 src/modules/FileSystems.rb:1068
 msgid ""
 "<p><b>Inode Size:</b>\n"
 "This option specifies the inode size of the file system.</p>\n"
@@ -6059,14 +6045,14 @@
 "This option specifies the inode size of the file system.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:845
+#: src/modules/FileSystems.rb:847
 #, fuzzy
 #| msgid "&Percentage of inode space"
 msgid "&Percentage of Inode Space"
 msgstr "&Percentage of inode space"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:873
+#: src/modules/FileSystems.rb:875
 #, fuzzy
 #| msgid ""
 #| "<p><b>Percentage of inode space:</b>\n"
@@ -6079,14 +6065,14 @@
 "The option \"Percentage of inode space\" specifies the maximum percentage of space in the file system that can be allocated to inodes.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:882
+#: src/modules/FileSystems.rb:884
 #, fuzzy
 #| msgid "Inode &aligned"
 msgid "Inode &Aligned"
 msgstr "Inode &aligned"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:888
+#: src/modules/FileSystems.rb:890
 #, fuzzy
 #| msgid ""
 #| "<p><b>Inode Aligned:</b>\n"
@@ -6105,14 +6091,14 @@
 "is normally more efficient than unaligned access.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:918
+#: src/modules/FileSystems.rb:920
 #, fuzzy
 #| msgid "&Log size in megabytes"
 msgid "&Log Size in Megabytes"
 msgstr "&Log size in megabytes"
 
 #. popup text
-#: src/modules/FileSystems.rb:927
+#: src/modules/FileSystems.rb:929
 #, fuzzy
 #| msgid ""
 #| "The \"Log size\" value is incorrect.\n"
@@ -6126,7 +6112,7 @@
 
 #. xgettext: no-c-format
 #. help text, richtext format
-#: src/modules/FileSystems.rb:932
+#: src/modules/FileSystems.rb:934
 #, fuzzy
 #| msgid ""
 #| "<p><b>Log size</b>\n"
@@ -6139,19 +6125,19 @@
 "Set the log size (in megabytes). If auto, the default is 40% of the aggregate size.</p>"
 
 #. label text
-#: src/modules/FileSystems.rb:940
+#: src/modules/FileSystems.rb:942
 msgid "Invoke Bad Blocks List &Utility"
 msgstr "Invoke Bad Blocks List &Utility"
 
 #. label text
-#: src/modules/FileSystems.rb:954
+#: src/modules/FileSystems.rb:956
 #, fuzzy
 #| msgid "Stride &length in blocks"
 msgid "Stride &Length in Blocks"
 msgstr "Stride &length in blocks"
 
 #. popup text
-#: src/modules/FileSystems.rb:962
+#: src/modules/FileSystems.rb:964
 #, fuzzy
 #| msgid ""
 #| "The \"Stride length in blocks\" value is not possible.\n"
@@ -6164,7 +6150,7 @@
 "Please select a value greater than 1."
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:966
+#: src/modules/FileSystems.rb:968
 msgid ""
 "<p><b>Stride Length in Blocks:</b>\n"
 "Set RAID-related options for the file system. Currently, the only supported\n"
@@ -6177,7 +6163,7 @@
 "RAID stripe as its argument.</p>\n"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:985
+#: src/modules/FileSystems.rb:987
 #, fuzzy
 #| msgid ""
 #| "<p><b>Block size:</b>\n"
@@ -6190,14 +6176,14 @@
 "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"
 
 #. label text
-#: src/modules/FileSystems.rb:994
+#: src/modules/FileSystems.rb:996
 #, fuzzy
 #| msgid "Bytes per &inode"
 msgid "Bytes per &Inode"
 msgstr "Bytes per &inode"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:1000
+#: src/modules/FileSystems.rb:1002
 #, fuzzy
 #| msgid ""
 #| "<p><b>Bytes per inode:</b>\n"
@@ -6220,14 +6206,14 @@
 "number of inodes on a file system after its creation, so be sure to enter a reasonable value for this parameter.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:1016
+#: src/modules/FileSystems.rb:1018
 #, fuzzy
 #| msgid "Percentage of blocks &reserved for root"
 msgid "Percentage of Blocks &Reserved for root"
 msgstr "Percentage of blocks &reserved for root"
 
 #. popup text
-#: src/modules/FileSystems.rb:1026
+#: src/modules/FileSystems.rb:1028
 #, fuzzy
 #| msgid ""
 #| "The \"Percentage of blocks reserved for root\" value is incorrect.\n"
@@ -6241,32 +6227,32 @@
 
 #. xgettext: no-c-format
 #. help text, richtext format
-#: src/modules/FileSystems.rb:1031
+#: src/modules/FileSystems.rb:1033
 #, fuzzy
 #| msgid "<p><b>Percentage of blocks reserved for root:</b> Specify the percentage of blocks reserved for the super user. This value defaults to 5%.</p>"
 msgid "<p><b>Percentage of Blocks Reserved for root:</b> Specify the percentage of blocks reserved for the super user. The default is computed so that normally 1 Gig is reserved. Upper limit for reserved default is 5.0, lowest reserved default is 0.1.</p>"
 msgstr "<p><b>Percentage of blocks reserved for root:</b> Specify the percentage of blocks reserved for the super user. This value defaults to 5%.</p>"
 
 #. checkbox text
-#: src/modules/FileSystems.rb:1040
+#: src/modules/FileSystems.rb:1042
 #, fuzzy
 msgid "Disable Regular Checks"
 msgstr "Disable service"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:1048
+#: src/modules/FileSystems.rb:1050
 msgid ""
 "<p><b>Disable Regular Checks:</b>\n"
 "Disable regular file system check at booting.</p>\n"
 msgstr ""
 
 #. label text
-#: src/modules/FileSystems.rb:1075
+#: src/modules/FileSystems.rb:1077
 msgid "&Directory Index Feature"
 msgstr "&Directory Index Feature"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:1082
+#: src/modules/FileSystems.rb:1084
 msgid ""
 "<p><b>Directory Index:</b>\n"
 "Enables use of hashed b-trees to speed up lookups in large directories.</p>\n"
@@ -6275,12 +6261,12 @@
 "Enables use of hashed b-trees to speed up lookups in large directories.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:1094
+#: src/modules/FileSystems.rb:1096
 msgid "&No Journal"
 msgstr ""
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:1101
+#: src/modules/FileSystems.rb:1103
 msgid ""
 "<p><b>No Journal:</b>\n"
 "Suppressed use of journaling on filesystem. Only activate this when you really\n"
@@ -6562,7 +6548,7 @@
 msgstr "R&AID:"
 
 #. TRANSLATORS: error popup
-#: src/modules/Storage.rb:5176
+#: src/modules/Storage.rb:5177
 #, fuzzy
 #| msgid ""
 #| "Partition %1 cannot be resized\n"
@@ -6572,7 +6558,7 @@
 "Partition %1 cannot be resized\n"
 "because the file system could not be mounted.\n"
 
-#: src/modules/Storage.rb:5202
+#: src/modules/Storage.rb:5203
 msgid ""
 "\n"
 "Device %1 cannot be modified because it contains activated swap\n"
@@ -6582,7 +6568,7 @@
 "Device %1 cannot be modified because it contains activated swap\n"
 "that is needed to run the installation.\n"
 
-#: src/modules/Storage.rb:5216
+#: src/modules/Storage.rb:5217
 msgid ""
 "\n"
 "Device %1 cannot be modified because it contains the installation\n"
@@ -6592,7 +6578,7 @@
 "Device %1 cannot be modified because it contains the installation\n"
 "data needed to perform the installation.\n"
 
-#: src/modules/Storage.rb:5245
+#: src/modules/Storage.rb:5246
 msgid ""
 "\n"
 "Device %1 cannot be removed because it contains activated swap\n"
@@ -6602,7 +6588,7 @@
 "Device %1 cannot be removed because it contains activated swap\n"
 "that is needed to run the installation.\n"
 
-#: src/modules/Storage.rb:5254
+#: src/modules/Storage.rb:5255
 msgid ""
 "\n"
 "Device %1 cannot be removed because it contains the installation\n"
@@ -6612,7 +6598,7 @@
 "Device %1 cannot be removed because it contains the installation\n"
 "data needed to perform the installation.\n"
 
-#: src/modules/Storage.rb:5283
+#: src/modules/Storage.rb:5284
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -6630,7 +6616,7 @@
 "device %2 which contains activated swap that is needed to run \n"
 "the installation.\n"
 
-#: src/modules/Storage.rb:5294
+#: src/modules/Storage.rb:5295
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -6646,7 +6632,7 @@
 "device %2 which contains data needed to perform the installation.\n"
 
 #. the check for verbose is needed for calls from StorageProposal (see bnc#871779)
-#: src/modules/Storage.rb:5316
+#: src/modules/Storage.rb:5317
 #, fuzzy
 #| msgid ""
 #| "Partition %1 cannot be resized\n"
@@ -6660,20 +6646,20 @@
 "because the file system could not be mounted.\n"
 
 #. FIXME: please, add description of the list that is returned by this function.
-#: src/modules/Storage.rb:5405
+#: src/modules/Storage.rb:5406
 #, fuzzy
 #| msgid "Copying root filesystem..."
 msgid "Nothing assigned as root filesystem!"
 msgstr "Copying root filesystem..."
 
-#: src/modules/Storage.rb:5406
+#: src/modules/Storage.rb:5407
 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:6008
+#: src/modules/Storage.rb:6009
 #, fuzzy
 #| msgid "writing the firewall rules failed"
 msgid "Adding the following resolvables failed: %1"
@@ -7497,6 +7483,18 @@
 msgid "Visible Information on Storage Devices:"
 msgstr "User Information Sources"
 
+#~ msgid "No unsaved changes exist."
+#~ msgstr "No unsaved changes exist."
+
+#~ msgid "Changes:"
+#~ msgstr "Changes:"
+
+#~ msgid " Do you really want to execute these changes?"
+#~ msgstr " Do you really want to execute these changes?"
+
+#~ msgid "&Apply"
+#~ msgstr "&Apply"
+
 #, fuzzy
 #~ msgid ""
 #~ "Warning: With your current setup, your %1 installation\n"

Modified: trunk/yast/en_GB/po/vm.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/vm.en_GB.po	2014-10-29 16:01:16 UTC (rev 90433)
+++ trunk/yast/en_GB/po/vm.en_GB.po	2014-10-29 16:01:59 UTC (rev 90434)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: vm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:53+0200\n"
+"POT-Creation-Date: 2014-10-29 16:22+0100\n"
 "PO-Revision-Date: 2008-03-27 22:27+0000\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"
@@ -22,24 +22,24 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#. Main
+#. Definition of command line mode options
+#: src/clients/virtualization.rb:54
+msgid "Install Hypervisor and Tools"
+msgstr "Install Hypervisor and Tools"
+
 #. progress step title
 #: src/clients/vm_finish.rb:69
 msgid "Configuring the virtual machine..."
 msgstr "Configuring the virtual machine..."
 
-#. Main
-#. Definition of command line mode options
-#: src/clients/xen.rb:54
-msgid "Install Hypervisor and Tools"
-msgstr "Install Hypervisor and Tools"
-
 #. check for kernel-bigsmp
-#: src/modules/VM_XEN.rb:157
+#: src/modules/VirtConfig.rb:158
 msgid "x86_64 is the only supported architecture for hosting virtual machines. Your architecture is "
 msgstr ""
 
 #. we are already in UML, nested virtual machine is not supported
-#: src/modules/VM_XEN.rb:176
+#: src/modules/VirtConfig.rb:177
 msgid ""
 "Virtual machine installation cannot be started inside the UML machine.\n"
 "Start installation in the host system.\n"
@@ -49,176 +49,176 @@
 
 #. progress stage 1/2
 #. Generate a pop dialog to allow user selection of Xen or KVM
-#: src/modules/VM_XEN.rb:193 src/modules/VM_XEN.rb:281
+#: src/modules/VirtConfig.rb:194 src/modules/VirtConfig.rb:282
 msgid "Verify Installed Packages"
 msgstr "Verify Installed Packages"
 
 #. progress stage 2/2
-#: src/modules/VM_XEN.rb:195
+#: src/modules/VirtConfig.rb:196
 #, fuzzy
 msgid "Network Bridge Configuration"
 msgstr "Network Card Configuration"
 
 #. Headline for management domain installation
-#: src/modules/VM_XEN.rb:210
+#: src/modules/VirtConfig.rb:211
 msgid "Configuring the VM Server (domain 0)"
 msgstr "Configuring the VM Server (domain 0)"
 
 #. xen domain0 installation help text - 1/4
-#: src/modules/VM_XEN.rb:213
+#: src/modules/VirtConfig.rb:214
 msgid "<p><big><b>VM Server Configuration</b></big></p><p>Configuration of the VM Server (domain 0) has two parts.</p>"
 msgstr "<p><big><b>VM Server Configuration</b></big></p><p>Configuration of the VM Server (domain 0) has two parts.</p>"
 
 #. xen domain0 installation help text - 2/4
-#: src/modules/VM_XEN.rb:217
+#: src/modules/VirtConfig.rb:218
 msgid "<p>The required packages are installed into the system first. Then the boot loader is switched to GRUB (if not already used) and the Xen section is added to the boot loader menu if it is missing.</p>"
 msgstr "<p>The required packages are installed into the system first. Then the boot loader is switched to GRUB (if not already used) and the Xen section is added to the boot loader menu if it is missing.</p>"
 
 #. xen domain0 installation help text - 3/4
-#: src/modules/VM_XEN.rb:221
+#: src/modules/VirtConfig.rb:222
 #, fuzzy
 #| msgid "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and Linux kernel.</p>"
 msgid "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and the Linux kernel.</p>"
 msgstr "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and Linux kernel.</p>"
 
 #. xen domain0 installation help text - 4/4
-#: src/modules/VM_XEN.rb:225
+#: src/modules/VirtConfig.rb:226
 #, fuzzy
 #| msgid "<p>When the configuration is successfully finished, it is possible to boot the VM Server from the boot loader menu.</p>"
 msgid "<p>When the configuration has finished successfully, you can boot the VM Server from the boot loader menu.</p>"
 msgstr "<p>When the configuration is successfully finished, it is possible to boot the VM Server from the boot loader menu.</p>"
 
 #. error popup
-#: src/modules/VM_XEN.rb:230
+#: src/modules/VirtConfig.rb:231
 msgid "The installation will be aborted."
 msgstr "The installation will be aborted."
 
-#: src/modules/VM_XEN.rb:233
+#: src/modules/VirtConfig.rb:234
 #, fuzzy
 #| msgid "Hypervisor and tools are installed."
 msgid "Choose Hypervisor(s) to install"
 msgstr "Hypervisor and tools are installed."
 
-#: src/modules/VM_XEN.rb:236
+#: src/modules/VirtConfig.rb:237
 msgid "Server: Minimal system to get a running Hypervisor"
 msgstr ""
 
-#: src/modules/VM_XEN.rb:237
+#: src/modules/VirtConfig.rb:238
 #, fuzzy
 #| msgid "Configuring the virtual machine..."
 msgid "Tools: Configure, manage and monitor virtual machines"
 msgstr "Configuring the virtual machine..."
 
-#: src/modules/VM_XEN.rb:250
+#: src/modules/VirtConfig.rb:251
 msgid "KVM Hypervisor"
 msgstr ""
 
-#: src/modules/VM_XEN.rb:252
+#: src/modules/VirtConfig.rb:253
 msgid "KVM server"
 msgstr ""
 
-#: src/modules/VM_XEN.rb:253
+#: src/modules/VirtConfig.rb:254
 #, fuzzy
 #| msgid "Admin tools"
 msgid "KVM tools"
 msgstr "Admin tools"
 
-#: src/modules/VM_XEN.rb:258
+#: src/modules/VirtConfig.rb:259
 msgid "libvirt LXC containers"
 msgstr ""
 
-#: src/modules/VM_XEN.rb:260
+#: src/modules/VirtConfig.rb:261
 msgid "libvirt LXC daemon"
 msgstr ""
 
-#: src/modules/VM_XEN.rb:288
+#: src/modules/VirtConfig.rb:289
 msgid "Software to connect to Virtualization server"
 msgstr ""
 
-#: src/modules/VM_XEN.rb:290
+#: src/modules/VirtConfig.rb:291
 #, fuzzy
 #| msgid "Hypervisor and tools are installed."
 msgid "Virtualization client tools"
 msgstr "Hypervisor and tools are installed."
 
-#: src/modules/VM_XEN.rb:306
+#: src/modules/VirtConfig.rb:307
 msgid "Xen Hypervisor"
 msgstr ""
 
-#: src/modules/VM_XEN.rb:308
+#: src/modules/VirtConfig.rb:309
 #, fuzzy
 #| msgid "Broken server"
 msgid "Xen server"
 msgstr "Broken server"
 
-#: src/modules/VM_XEN.rb:309
+#: src/modules/VirtConfig.rb:310
 #, fuzzy
 #| msgid "Admin tools"
 msgid "Xen tools"
 msgstr "Admin tools"
 
 #. SLED doesn't have any installation capabilities (L3 support)
-#: src/modules/VM_XEN.rb:384
+#: src/modules/VirtConfig.rb:388
 #, fuzzy
 #| msgid "The installation will be aborted."
 msgid "Package installation failed\n"
 msgstr "The installation will be aborted."
 
-#: src/modules/VM_XEN.rb:392
+#: src/modules/VirtConfig.rb:396
 #, fuzzy
 #| msgid "The installation will be aborted."
 msgid "Package installation failed for lxc\n"
 msgstr "The installation will be aborted."
 
-#: src/modules/VM_XEN.rb:399
+#: src/modules/VirtConfig.rb:403
 msgid "Package installation failed for sled client pattern\n"
 msgstr ""
 
-#: src/modules/VM_XEN.rb:410
+#: src/modules/VirtConfig.rb:413
 msgid "Package installation failed for sles patterns\n"
 msgstr ""
 
 #. Assume python gtk is installed. If in text mode we don't care
-#: src/modules/VM_XEN.rb:423
+#: src/modules/VirtConfig.rb:426
 msgid "Running in text mode. Install graphical components anyway?"
 msgstr "Running in text mode. Install graphical components anyway?"
 
 #. progressbar title - check whether Xen packages are installed
-#: src/modules/VM_XEN.rb:436
+#: src/modules/VirtConfig.rb:439
 msgid "Checking packages..."
 msgstr "Checking packages..."
 
 #. progressbar title - install the required packages
-#: src/modules/VM_XEN.rb:439
+#: src/modules/VirtConfig.rb:442
 msgid "Installing packages..."
 msgstr "Installing packages..."
 
 #. error popup
 #. Now see if they really were installed (bnc#508347)
-#: src/modules/VM_XEN.rb:444 src/modules/VM_XEN.rb:451
+#: src/modules/VirtConfig.rb:447 src/modules/VirtConfig.rb:454
 msgid "Cannot install required packages."
 msgstr "Cannot install required packages."
 
 #. If grub2 is the bootloader and we succesfully installed Xen, update the grub2 files
-#: src/modules/VM_XEN.rb:461
+#: src/modules/VirtConfig.rb:464
 #, fuzzy
 #| msgid "Updating configuration files..."
 msgid "Updating grub2 configuration files..."
 msgstr "Updating configuration files..."
 
 #. Default Bridge stage
-#: src/modules/VM_XEN.rb:474
+#: src/modules/VirtConfig.rb:484
 #, fuzzy
 msgid "Configuring Default Network Bridge..."
 msgstr "Configuring general settings..."
 
 #. Popup yes/no dialog
-#: src/modules/VM_XEN.rb:495
+#: src/modules/VirtConfig.rb:505
 #, fuzzy
 msgid "Network Bridge."
 msgstr "Ethernet Network Card"
 
-#: src/modules/VM_XEN.rb:496
+#: src/modules/VirtConfig.rb:506
 msgid "<p>For normal network configurations hosting virtual machines, a network bridge is recommended.</p><p>Configure a default network bridge?</p>"
 msgstr ""
 
@@ -231,11 +231,11 @@
 #. Report::Error(_("Failed to configure the firewall to allow the Xen bridge") + "\n" + abortmsg);
 #. return false;
 #. }
-#: src/modules/VM_XEN.rb:557
+#: src/modules/VirtConfig.rb:567
 msgid "KVM components are installed. Your host is ready to install KVM guests."
 msgstr ""
 
-#: src/modules/VM_XEN.rb:560
+#: src/modules/VirtConfig.rb:570
 #, fuzzy
 #| msgid ""
 #| "The machine is ready to start the VM Server.\n"
@@ -247,7 +247,7 @@
 "\n"
 "Reboot the machine and select the Xen section in the boot loader menu to start it.\n"
 
-#: src/modules/VM_XEN.rb:563
+#: src/modules/VirtConfig.rb:573
 #, fuzzy
 #| msgid ""
 #| "The machine is ready to start the VM Server.\n"
@@ -259,19 +259,19 @@
 "\n"
 "Reboot the machine and select the Xen section in the boot loader menu to start it.\n"
 
-#: src/modules/VM_XEN.rb:566
+#: src/modules/VirtConfig.rb:576
 #, fuzzy
 #| msgid "Hypervisor and tools are installed."
 msgid "Xen Hypervisor and tools are installed."
 msgstr "Hypervisor and tools are installed."
 
-#: src/modules/VM_XEN.rb:567
+#: src/modules/VirtConfig.rb:577
 #, fuzzy
 #| msgid "Hypervisor and tools are installed."
 msgid "Virtualization client tools are installed."
 msgstr "Hypervisor and tools are installed."
 
-#: src/modules/VM_XEN.rb:568
+#: src/modules/VirtConfig.rb:578
 #, fuzzy
 #| msgid "Hypervisor and tools are installed."
 msgid "Libvirt LXC components are installed."

-- 
To unsubscribe, e-mail: opensuse-translation-commit+unsubscribe@opensuse.org
To contact the owner, e-mail: opensuse-translation-commit+owner@opensuse.org

    

[opensuse-translation-commit] r90434 - trunk/yast/en_GB/po

keichwa＠svn2.opensuse.org