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

7 Oct 2014

Author: keichwa
Date: 2014-10-07 17:47:26 +0200 (Tue, 07 Oct 2014)
New Revision: 89781

Added:
   trunk/yast/en_GB/po/cio.en_GB.po
   trunk/yast/en_GB/po/opensuse_mirror.en_GB.po
Modified:
   trunk/yast/en_GB/po/add-on-creator.en_GB.po
   trunk/yast/en_GB/po/add-on.en_GB.po
   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/ca-management.en_GB.po
   trunk/yast/en_GB/po/cluster.en_GB.po
   trunk/yast/en_GB/po/control-center.en_GB.po
   trunk/yast/en_GB/po/control.en_GB.po
   trunk/yast/en_GB/po/country.en_GB.po
   trunk/yast/en_GB/po/crowbar.en_GB.po
   trunk/yast/en_GB/po/dhcp-server.en_GB.po
   trunk/yast/en_GB/po/dns-server.en_GB.po
   trunk/yast/en_GB/po/drbd.en_GB.po
   trunk/yast/en_GB/po/fcoe-client.en_GB.po
   trunk/yast/en_GB/po/firewall-services.en_GB.po
   trunk/yast/en_GB/po/firewall.en_GB.po
   trunk/yast/en_GB/po/firstboot.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/gtk.en_GB.po
   trunk/yast/en_GB/po/http-server.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/iplb.en_GB.po
   trunk/yast/en_GB/po/iscsi-client.en_GB.po
   trunk/yast/en_GB/po/iscsi-lio-server.en_GB.po
   trunk/yast/en_GB/po/iscsi-server.en_GB.po
   trunk/yast/en_GB/po/isns.en_GB.po
   trunk/yast/en_GB/po/kdump.en_GB.po
   trunk/yast/en_GB/po/kerberos-server.en_GB.po
   trunk/yast/en_GB/po/kerberos.en_GB.po
   trunk/yast/en_GB/po/languages_db.en_GB.po
   trunk/yast/en_GB/po/ldap-client.en_GB.po
   trunk/yast/en_GB/po/ldap-server.en_GB.po
   trunk/yast/en_GB/po/ldap.en_GB.po
   trunk/yast/en_GB/po/live-installer.en_GB.po
   trunk/yast/en_GB/po/lxc.en_GB.po
   trunk/yast/en_GB/po/mail.en_GB.po
   trunk/yast/en_GB/po/multipath.en_GB.po
   trunk/yast/en_GB/po/ncurses-pkg.en_GB.po
   trunk/yast/en_GB/po/ncurses.en_GB.po
   trunk/yast/en_GB/po/network.en_GB.po
   trunk/yast/en_GB/po/nfs.en_GB.po
   trunk/yast/en_GB/po/nfs_server.en_GB.po
   trunk/yast/en_GB/po/nis.en_GB.po
   trunk/yast/en_GB/po/nis_server.en_GB.po
   trunk/yast/en_GB/po/ntp-client.en_GB.po
   trunk/yast/en_GB/po/oneclickinstall.en_GB.po
   trunk/yast/en_GB/po/online-update-configuration.en_GB.po
   trunk/yast/en_GB/po/online-update.en_GB.po
   trunk/yast/en_GB/po/packager.en_GB.po
   trunk/yast/en_GB/po/pam.en_GB.po
   trunk/yast/en_GB/po/pkg-bindings.en_GB.po
   trunk/yast/en_GB/po/printer.en_GB.po
   trunk/yast/en_GB/po/product-creator.en_GB.po
   trunk/yast/en_GB/po/proxy.en_GB.po
   trunk/yast/en_GB/po/qt-pkg.en_GB.po
   trunk/yast/en_GB/po/qt.en_GB.po
   trunk/yast/en_GB/po/rdp.en_GB.po
   trunk/yast/en_GB/po/rear.en_GB.po
   trunk/yast/en_GB/po/registration.en_GB.po
   trunk/yast/en_GB/po/reipl.en_GB.po
   trunk/yast/en_GB/po/relocation-server.en_GB.po
   trunk/yast/en_GB/po/s390.en_GB.po
   trunk/yast/en_GB/po/samba-client.en_GB.po
   trunk/yast/en_GB/po/samba-server.en_GB.po
   trunk/yast/en_GB/po/samba-users.en_GB.po
   trunk/yast/en_GB/po/scanner.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/slp-server.en_GB.po
   trunk/yast/en_GB/po/snapper.en_GB.po
   trunk/yast/en_GB/po/sound.en_GB.po
   trunk/yast/en_GB/po/squid.en_GB.po
   trunk/yast/en_GB/po/sshd.en_GB.po
   trunk/yast/en_GB/po/storage.en_GB.po
   trunk/yast/en_GB/po/sudo.en_GB.po
   trunk/yast/en_GB/po/support.en_GB.po
   trunk/yast/en_GB/po/sysconfig.en_GB.po
   trunk/yast/en_GB/po/tftp-server.en_GB.po
   trunk/yast/en_GB/po/timezone_db.en_GB.po
   trunk/yast/en_GB/po/tune.en_GB.po
   trunk/yast/en_GB/po/update.en_GB.po
   trunk/yast/en_GB/po/users.en_GB.po
   trunk/yast/en_GB/po/vm.en_GB.po
   trunk/yast/en_GB/po/wagon.en_GB.po
   trunk/yast/en_GB/po/wol.en_GB.po
   trunk/yast/en_GB/po/xpram.en_GB.po
   trunk/yast/en_GB/po/yast2-apparmor.en_GB.po
Log:
merged

Modified: trunk/yast/en_GB/po/add-on-creator.en_GB.po
===================================================================

--- trunk/yast/en_GB/po/add-on-creator.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/add-on-creator.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: add-on-creator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:55+0100\n"
+"POT-Creation-Date: 2014-07-04 15:51+0200\n"
 "PO-Revision-Date: 2008-03-27 19:10+0000\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"

Modified: trunk/yast/en_GB/po/add-on.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/add-on.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/add-on.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: add-on\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:33+0200\n"
+"POT-Creation-Date: 2014-07-04 15:51+0200\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"
@@ -65,21 +65,21 @@
 #. this is a heading
 #. Cleanup UI - Prepare it for progress callbacks
 #: src/clients/add-on.rb:105 src/clients/add-on_proposal.rb:76
-#: src/include/add-on/add-on-workflow.rb:1871
+#: src/include/add-on/add-on-workflow.rb:1877
 msgid "Add-On Products"
 msgstr "Add-On Products"
 
 #. busy message (dialog)
 #. TRANSLATORS: dialog content - a very simple label
 #: src/clients/add-on.rb:107 src/clients/inst_language_add-on.rb:155
-#: src/include/add-on/add-on-workflow.rb:1872
+#: src/include/add-on/add-on-workflow.rb:1878
 msgid "Initializing..."
 msgstr "Initialising..."
 
 #. help
 #. TRANSLATORS: help text
 #: src/clients/add-on.rb:109 src/clients/inst_language_add-on.rb:157
-#: src/include/add-on/add-on-workflow.rb:1873
+#: src/include/add-on/add-on-workflow.rb:1879
 msgid "<p>Initializing add-on products...</p>"
 msgstr "<p>Initialising add-on products...</p>"
 
@@ -105,10 +105,10 @@
 #. placeholder for unknown path
 #. placeholder for unknown URL
 #: src/clients/add-on_proposal.rb:35 src/clients/add-on_proposal.rb:41
-#: src/include/add-on/add-on-workflow.rb:374
-#: src/include/add-on/add-on-workflow.rb:384
-#: src/include/add-on/add-on-workflow.rb:940
-#: src/include/add-on/add-on-workflow.rb:949
+#: src/include/add-on/add-on-workflow.rb:371
+#: src/include/add-on/add-on-workflow.rb:381
+#: src/include/add-on/add-on-workflow.rb:937
+#: src/include/add-on/add-on-workflow.rb:946
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -133,7 +133,7 @@
 #. main screen heading
 #: src/clients/inst_language_add-on.rb:153
 #: src/clients/inst_language_add-on.rb:212
-#: src/include/add-on/add-on-workflow.rb:912
+#: src/include/add-on/add-on-workflow.rb:909
 msgid "Add-On Product Installation"
 msgstr "Add-On Product Installation"
 
@@ -249,35 +249,35 @@
 #. ...
 #. ]
 #: src/include/add-on/add-on-workflow.rb:163
-#: src/include/add-on/add-on-workflow.rb:585
-#: src/include/add-on/add-on-workflow.rb:1586
-#: src/include/add-on/add-on-workflow.rb:1598
+#: src/include/add-on/add-on-workflow.rb:582
+#: src/include/add-on/add-on-workflow.rb:1592
+#: src/include/add-on/add-on-workflow.rb:1604
 #, fuzzy
 #| msgid "No product found in the repository"
 msgid "No product found in the repository."
 msgstr "No product found in the repository"
 
 #. error report
-#: src/include/add-on/add-on-workflow.rb:319
+#: src/include/add-on/add-on-workflow.rb:316
 msgid "No software repository found on medium."
 msgstr "No software repository found on medium."
 
 #. busy message
-#: src/include/add-on/add-on-workflow.rb:338
+#: src/include/add-on/add-on-workflow.rb:335
 msgid "Initializing new source..."
 msgstr "Initialising new source..."
 
-#: src/include/add-on/add-on-workflow.rb:379
+#: src/include/add-on/add-on-workflow.rb:376
 msgid "URL: %1, Directory: %2"
 msgstr "URL: %1, Directory: %2"
 
 #. dialog caption
-#: src/include/add-on/add-on-workflow.rb:392
+#: src/include/add-on/add-on-workflow.rb:389
 msgid "Software Repository Selection"
 msgstr "Software Repository Selection"
 
 #. help text
-#: src/include/add-on/add-on-workflow.rb:394
+#: src/include/add-on/add-on-workflow.rb:391
 #, fuzzy
 msgid ""
 "<p><big><b>Software Repository Selection</b></big><br>\n"
@@ -288,7 +288,7 @@
 "There were multiple repositories found on the selected medium.\n"
 "Select the repository to use.</p>\n"
 
-#: src/include/add-on/add-on-workflow.rb:404
+#: src/include/add-on/add-on-workflow.rb:401
 msgid "Repositories &Found"
 msgstr "Repositories &Found"
 
@@ -300,33 +300,33 @@
 #. else
 #. {
 #. yes-no popup
-#: src/include/add-on/add-on-workflow.rb:416
-#: src/include/add-on/add-on-workflow.rb:743
+#: src/include/add-on/add-on-workflow.rb:413
+#: src/include/add-on/add-on-workflow.rb:740
 msgid "Really abort add-on product installation?"
 msgstr "Really abort add-on product installation?"
 
 #. popup message
-#: src/include/add-on/add-on-workflow.rb:427
+#: src/include/add-on/add-on-workflow.rb:424
 msgid "Select a repository."
 msgstr "Select a repository."
 
 #. message popup
-#: src/include/add-on/add-on-workflow.rb:632
+#: src/include/add-on/add-on-workflow.rb:629
 msgid "Dependencies of the add-on product cannot be fulfilled."
 msgstr "Dependencies of the add-on product cannot be fulfilled."
 
 #. dialog caption
-#: src/include/add-on/add-on-workflow.rb:713
+#: src/include/add-on/add-on-workflow.rb:710
 msgid "Product Selection"
 msgstr "Product Selection"
 
 #. multi selection list
-#: src/include/add-on/add-on-workflow.rb:719
+#: src/include/add-on/add-on-workflow.rb:716
 msgid "Available Products"
 msgstr "Available Products"
 
 #. help text
-#: src/include/add-on/add-on-workflow.rb:725
+#: src/include/add-on/add-on-workflow.rb:722
 #, fuzzy
 msgid ""
 "<p><b><big>Product Selection</big></b><br/>\n"
@@ -338,12 +338,12 @@
 "to install.</p>\n"
 
 #. message popup
-#: src/include/add-on/add-on-workflow.rb:793
+#: src/include/add-on/add-on-workflow.rb:790
 msgid "Dependencies of the selected add-on products cannot be fulfilled."
 msgstr "Dependencies of the selected add-on products cannot be fulfilled."
 
 #. Help for add-on products
-#: src/include/add-on/add-on-workflow.rb:915
+#: src/include/add-on/add-on-workflow.rb:912
 #, fuzzy
 #| msgid ""
 #| "<p><big><b>Add-On Product Installation</b></big></br>\n"
@@ -362,97 +362,97 @@
 "select it and click <b>Delete</b>.</p>"
 
 #. table cell, %1 is URL, %2 is directory name
-#: src/include/add-on/add-on-workflow.rb:944
+#: src/include/add-on/add-on-workflow.rb:941
 msgid "%1, Directory: %2"
 msgstr "%1, Directory: %2"
 
 #. table header
-#: src/include/add-on/add-on-workflow.rb:970
+#: src/include/add-on/add-on-workflow.rb:967
 msgid "Product"
 msgstr "Product"
 
 #. table header
-#: src/include/add-on/add-on-workflow.rb:972
+#: src/include/add-on/add-on-workflow.rb:969
 msgid "Media"
 msgstr "Media"
 
 #. message report
-#: src/include/add-on/add-on-workflow.rb:1127
+#: src/include/add-on/add-on-workflow.rb:1124
 msgid "Select a product to delete."
 msgstr "Select a product to delete."
 
 #. TRANSLATORS: busy message
-#: src/include/add-on/add-on-workflow.rb:1135
+#: src/include/add-on/add-on-workflow.rb:1132
 msgid "Removing selected add-on..."
 msgstr "Removing selected add-on..."
 
 #. TRANSLATORS: dialog caption
-#: src/include/add-on/add-on-workflow.rb:1253
+#: src/include/add-on/add-on-workflow.rb:1259
 #, fuzzy
 msgid "Installed Add-on Products"
 msgstr "Add-On Products"
 
 #. TRANSLATORS: table header item
-#: src/include/add-on/add-on-workflow.rb:1260
+#: src/include/add-on/add-on-workflow.rb:1266
 #, fuzzy
 msgid "Add-on Product"
 msgstr "Add-On Products"
 
 #. TRANSLATORS: table header item
-#: src/include/add-on/add-on-workflow.rb:1262
+#: src/include/add-on/add-on-workflow.rb:1268
 msgid "URL"
 msgstr "URL"
 
 #. TRANSLATORS: push button
-#: src/include/add-on/add-on-workflow.rb:1276
+#: src/include/add-on/add-on-workflow.rb:1282
 #, fuzzy
 msgid "Run &Software Manager..."
 msgstr "Pac&kage Manager"
 
 #. TRANSLATORS: dialog help adp/1
-#: src/include/add-on/add-on-workflow.rb:1280
+#: src/include/add-on/add-on-workflow.rb:1286
 #, fuzzy
 msgid "<p>All add-on products installed on your system are displayed.</p>"
 msgstr "<p>Here, see the list of TV stations defined for your system.</p>"
 
 #. TRANSLATORS: dialog help adp/2
-#: src/include/add-on/add-on-workflow.rb:1282
+#: src/include/add-on/add-on-workflow.rb:1288
 #, fuzzy
 msgid "<p>Click <b>Add</b> to add a new add-on product, or <b>Delete</b> to remove an add-on which is in use.</p>"
 msgstr "<p>Use <b>New</b> to create a new pattern or <b>Import</b> to import an existing one.</p>"
 
 #. no items
-#: src/include/add-on/add-on-workflow.rb:1335
+#: src/include/add-on/add-on-workflow.rb:1341
 #, fuzzy
 msgid "<b>Vendor:</b> %1<br>"
 msgstr "<b>Summary:</b> %1<br>"
 
-#: src/include/add-on/add-on-workflow.rb:1336
+#: src/include/add-on/add-on-workflow.rb:1342
 #, fuzzy
 msgid "Unknown vendor"
 msgstr "unknown vendor"
 
-#: src/include/add-on/add-on-workflow.rb:1339
+#: src/include/add-on/add-on-workflow.rb:1345
 #, fuzzy
 msgid "<b>Version:</b> %1<br>"
 msgstr "<b>Version: </b>"
 
-#: src/include/add-on/add-on-workflow.rb:1340
+#: src/include/add-on/add-on-workflow.rb:1346
 #, fuzzy
 msgid "Unknown version"
 msgstr "Unknown error"
 
-#: src/include/add-on/add-on-workflow.rb:1343
+#: src/include/add-on/add-on-workflow.rb:1349
 #, fuzzy
 msgid "<b>Repository URL:</b> %1<br>"
 msgstr "<b>Summary:</b> %1<br>"
 
-#: src/include/add-on/add-on-workflow.rb:1349
+#: src/include/add-on/add-on-workflow.rb:1355
 #, fuzzy
 msgid "Unknown repository URL"
 msgstr "&Repository URL"
 
-#: src/include/add-on/add-on-workflow.rb:1356
+#: src/include/add-on/add-on-workflow.rb:1362
 #, fuzzy
 msgid "<b>Repository Alias:</b> %1<br>"
 msgstr "<b>Summary:</b> %1<br>"
@@ -460,17 +460,17 @@
 #. Removes the currently selected Add-On
 #.
 #. @return [Boolean] whether something has changed its state
-#: src/include/add-on/add-on-workflow.rb:1636
-#: src/include/add-on/add-on-workflow.rb:1689
+#: src/include/add-on/add-on-workflow.rb:1642
+#: src/include/add-on/add-on-workflow.rb:1695
 msgid "Unknown product"
 msgstr "Unknown product"
 
-#: src/include/add-on/add-on-workflow.rb:1639
+#: src/include/add-on/add-on-workflow.rb:1645
 #, fuzzy
 msgid "Unknown URL"
 msgstr "Unknown"
 
-#: src/include/add-on/add-on-workflow.rb:1695
+#: src/include/add-on/add-on-workflow.rb:1701
 msgid ""
 "Deleting the add-on product %1 may result in removing all the packages\n"
 "installed from this add-on.\n"
@@ -479,7 +479,7 @@
 msgstr ""
 
 #. TRANSLATORS: busy popup message
-#: src/include/add-on/add-on-workflow.rb:1712
+#: src/include/add-on/add-on-workflow.rb:1718
 #, fuzzy
 msgid "Removing product dependencies..."
 msgstr "Updating kernel module dependencies..."

Modified: trunk/yast/en_GB/po/audit-laf.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/audit-laf.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/audit-laf.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:37+0200\n"
+"POT-Creation-Date: 2014-07-04 15:51+0200\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"
@@ -867,32 +867,51 @@
 msgid "Cannot read audit.rules."
 msgstr "Cannot read sources."
 
-#. Error message
+#. question shown in a popup about start of audit daemon
+#: 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"
+msgstr "Do you want to skip Registration?"
+
+#. question continues
+#: src/modules/AuditLaf.rb:467
+msgid "The daemon 'auditd' doesn't run.\n"
+msgstr ""
+
+#. message about loaded kernel module
 #: src/modules/AuditLaf.rb:471
-msgid ""
-"The audit daemon doesn't run.\n"
-"Do you want to start it now?"
+msgid "The 'apparmor' kernel module is loaded.\n"
 msgstr ""
 
-#: src/modules/AuditLaf.rb:476
-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"
-"Do you want to start the daemon now?"
+#. Headline of a popup
+#: src/modules/AuditLaf.rb:480
+#, 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
+msgid "Start and &Enable"
 msgstr ""
 
-#: src/modules/AuditLaf.rb:484
+#: src/modules/AuditLaf.rb:482
+msgid "&Start"
+msgstr "&Start"
+
+#: src/modules/AuditLaf.rb:482
 #, fuzzy
-msgid "Audit daemon not running."
-msgstr "Squid is not running"
+#| msgid "Do not install"
+msgid "&Do not start"
+msgstr "Do not install"
 
-#: src/modules/AuditLaf.rb:489
+#: src/modules/AuditLaf.rb:491
 #, fuzzy
 msgid "Cannot start the audit daemon."
 msgstr "Cannot restart the NTP daemon."
 
-#: src/modules/AuditLaf.rb:490
+#: src/modules/AuditLaf.rb:492
 msgid ""
 "The rules may be locked.\n"
 "Continue to check the rules. You can change\n"
@@ -901,40 +920,40 @@
 msgstr ""
 
 #. Auditd read dialog caption
-#: src/modules/AuditLaf.rb:546
+#: src/modules/AuditLaf.rb:548
 #, fuzzy
 msgid "Saving Audit Configuration"
 msgstr "Saving sudo Configuration"
 
 #. Progress stage 1/2
-#: src/modules/AuditLaf.rb:562
+#: src/modules/AuditLaf.rb:564
 msgid "Write the settings"
 msgstr "Write the settings"
 
 #. Progress stage 2/2
-#: src/modules/AuditLaf.rb:564
+#: src/modules/AuditLaf.rb:566
 #, fuzzy
 msgid "Write the rules"
 msgstr "Write the patterns"
 
 #. Progress step 1/2
-#: src/modules/AuditLaf.rb:568
+#: src/modules/AuditLaf.rb:570
 msgid "Writing the settings..."
 msgstr "Writing the settings..."
 
 #. Progress step 2/2
-#: src/modules/AuditLaf.rb:570
+#: src/modules/AuditLaf.rb:572
 #, fuzzy
 msgid "Writing the rules..."
 msgstr "Writing the patterns..."
 
 #. check first whether rules are already locked
-#: src/modules/AuditLaf.rb:586
+#: src/modules/AuditLaf.rb:588
 #, fuzzy
 msgid "The rules are already locked."
 msgstr "The target is already connected."
 
-#: src/modules/AuditLaf.rb:587
+#: src/modules/AuditLaf.rb:589
 msgid ""
 "Do you want to change the 'Enabled Flag'?\n"
 "If yes, the new rules will be written to /etc/audit/audit.rules.\n"
@@ -942,35 +961,39 @@
 msgstr ""
 
 #. Error message
-#: src/modules/AuditLaf.rb:612
+#: src/modules/AuditLaf.rb:614
 #, fuzzy
 msgid "Restart of the audit daemon failed."
 msgstr "Restart of the service %1 failed"
 
 #. Error message
-#: src/modules/AuditLaf.rb:619
+#: src/modules/AuditLaf.rb:621
 #, 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:650
+#: src/modules/AuditLaf.rb:652
 msgid "Start yast2-audit-laf again and check the rules."
 msgstr ""
 
-#: src/modules/AuditLaf.rb:656
+#: src/modules/AuditLaf.rb:658
 #, 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:705
+#: src/modules/AuditLaf.rb:707
 #, fuzzy
 msgid "Log file"
 msgstr "&Log Files"
 
 #, fuzzy
+#~ msgid "Audit daemon not running."
+#~ msgstr "Squid is not running"
+
+#, fuzzy
 #~ msgid "Unknown option"
 #~ msgstr "Unknown option."
 

Modified: trunk/yast/en_GB/po/auth-client.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/auth-client.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/auth-client.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:51+0200\n"
 "PO-Revision-Date: 2014-05-19 09:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -405,23 +405,33 @@
 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
-msgid "How many seconds nss_sss schould consider entries valid before asking the backend again."
+#, 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
-msgid "How many seconds nss_sss schould consider user entries valid before asking the backend again."
+#, 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
-msgid "How many seconds nss_sss schould consider group entries valid before asking the backend again."
+#, 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
-msgid "How many seconds nss_sss schould consider netgroup entries valid before asking the backend again."
+#, 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
-msgid "How many seconds nss_sss schould consider service entries valid before asking the backend again."
+#, 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

Modified: trunk/yast/en_GB/po/auth-server.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/auth-server.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/auth-server.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:51+0200\n"
 "PO-Revision-Date: 2014-05-19 09:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -247,6 +247,12 @@
 msgstr "New Configuration"
 
 #. Start new config wizward
+#: src/include/auth-server/complex.rb:134
+#, fuzzy
+#| msgid "Migrate existing configuration"
+msgid "Migrate existing Configuration"
+msgstr "Migrate existing configuration"
+
 #: src/include/auth-server/complex.rb:135
 msgid ""
 "Your system is currently configured to use the configuration file\n"
@@ -695,12 +701,21 @@
 msgstr "<h3>Basic Database Settings</h3>"
 
 #: src/include/auth-server/helps.rb:49
+#, fuzzy
+#| msgid ""
+#| "<p>Choose the <b>Database</b> from <b>hdb</b> and <b>bdb</b>. <b>Hdb</b> is a\n"
+#| "variant of the <b>bdb</b> backend that uses a hierarchical database layout and\n"
+#| "supports subtree renames. Otherwise it is identical to <b>bdb</b>. A\n"
+#| "<b>hdb</b>-Database needs a larger <b>idlcachesize</b> than a\n"
+#| "<b>bdb</b>-Database for a good search performance.</p>\n"
 msgid ""
-"<p>Choose the <b>Database</b> from <b>hdb</b> and <b>bdb</b>. <b>Hdb</b> is a\n"
+"<p>Choose the <b>Database</b> from <b>hdb</b> <b>bdb</b> and <b>mdb</b>. <b>Hdb</b> is a\n"
 "variant of the <b>bdb</b> backend that uses a hierarchical database layout and\n"
 "supports subtree renames. Otherwise it is identical to <b>bdb</b>. A\n"
 "<b>hdb</b>-Database needs a larger <b>idlcachesize</b> than a\n"
-"<b>bdb</b>-Database for a good search performance.</p>\n"
+"<b>bdb</b>-Database for a good search performance.\n"
+"<b>mdb</b>-Database uses OpenLDAP's Lightning Memory-Mapped DB (LMDB) library to store data.\n"
+"It similar to the <b>hdb</b> backend but it is both more space-efficient and more execution-efficient.</p>\n"
 msgstr ""
 "<p>Choose the <b>Database</b> from <b>hdb</b> and <b>bdb</b>. <b>Hdb</b> is a\n"
 "variant of the <b>bdb</b> backend that uses a hierarchical database layout and\n"
@@ -708,7 +723,7 @@
 "<b>hdb</b>-Database needs a larger <b>idlcachesize</b> than a\n"
 "<b>bdb</b>-Database for a good search performance.</p>\n"
 
-#: src/include/auth-server/helps.rb:56
+#: src/include/auth-server/helps.rb:58
 msgid ""
 "<p>The <b>Base DN</b> option specifies the name of the root entry \n"
 "of the database being created.</p>"
@@ -716,7 +731,7 @@
 "<p>The <b>Base DN</b> option specifies the name of the root entry \n"
 "of the database being created.</p>"
 
-#: src/include/auth-server/helps.rb:59
+#: src/include/auth-server/helps.rb:61
 msgid ""
 "<p>The <b>Administrator DN</b> along with a <b>LDAP Administrator Password</b> \n"
 "specifies a superuser identity for the database, surpassing all ACLs and other \n"
@@ -732,7 +747,7 @@
 "and Administrator DN of <tt>c=Admin</tt> would combine to an effective Administrator DN\n"
 "of <tt>c=Admin,dc=example,dc=com</tt>.</p> "
 
-#: src/include/auth-server/helps.rb:67
+#: src/include/auth-server/helps.rb:69
 msgid ""
 "<p>If this wizard was started during installation, the \n"
 "<b>LDAP Administrator Password</b> is initially set to the system's root password\n"
@@ -742,7 +757,7 @@
 "<b>LDAP Administrator Password</b> is initially set to the system's root password\n"
 "entered earlier in the installation process.</p> "
 
-#: src/include/auth-server/helps.rb:72
+#: src/include/auth-server/helps.rb:74
 msgid ""
 "<p>To use this database as default for the OpenLDAP client tools \n"
 "(e.g. ldapsearch), check <b>Use this database as the default for OpenLDAP\n"
@@ -758,7 +773,7 @@
 "file <tt>/etc/openldap/ldap.conf</tt>. This checkbox is selected by default\n"
 "when creating the first database on a server.</p>\n"
 
-#: src/include/auth-server/helps.rb:80
+#: src/include/auth-server/helps.rb:82
 msgid ""
 "YaST currently does not support this database. You can not \n"
 "change any configuration settings here.\n"
@@ -766,7 +781,7 @@
 "YaST currently does not support this database. You can not \n"
 "change any configuration settings here.\n"
 
-#: src/include/auth-server/helps.rb:83
+#: src/include/auth-server/helps.rb:85
 msgid ""
 "<p>To enable or disable plaintext authentication (LDAP Simple Bind)\n"
 "for the configuration database, click the associated checkbox. Plaintext \n"
@@ -778,7 +793,7 @@
 "authentication to the configuration database will only be allowed when \n"
 "using sufficiently protected (e.g. SSL/TLS encrypted) connections.</p>\n"
 
-#: src/include/auth-server/helps.rb:89
+#: src/include/auth-server/helps.rb:91
 msgid ""
 "<p>To change the administration password for the configuration database, \n"
 "click <b>Change Password</b>. \n"
@@ -794,15 +809,15 @@
 "The password fields are initially empty even if a password has already been \n"
 "set in the configuration.</p>\n"
 
-#: src/include/auth-server/helps.rb:97
+#: src/include/auth-server/helps.rb:99
 msgid "<h3>Edit BDB Database</h3>"
 msgstr "<h3>Edit BDB Database</h3>"
 
-#: src/include/auth-server/helps.rb:98
+#: src/include/auth-server/helps.rb:100
 msgid "<p>Change basic settings of BDB and HDB Databases.</p>"
 msgstr "<p>Change basic settings of BDB and HDB Databases.</p>"
 
-#: src/include/auth-server/helps.rb:99
+#: src/include/auth-server/helps.rb:101
 msgid ""
 "<p>Enter the complete DN or only the first part and append the base DN automatically\n"
 "with <b>Append Base DN</b>.</p>"
@@ -810,7 +825,7 @@
 "<p>Enter the complete DN or only the first part and append the base DN automatically\n"
 "with <b>Append Base DN</b>.</p>"
 
-#: src/include/auth-server/helps.rb:102
+#: src/include/auth-server/helps.rb:104
 msgid ""
 "<p>To change the password for the administrator account, click <b>Change Password</b>.\n"
 "A Popup will prompt you to enter the new password and select the <b>Password Encryption</b>.\n"
@@ -820,7 +835,7 @@
 "A Popup will prompt you to enter the new password and select the <b>Password Encryption</b>.\n"
 "The password fields are initially empty even if a password has already been set in the configuration.</p>\n"
 
-#: src/include/auth-server/helps.rb:107
+#: src/include/auth-server/helps.rb:109
 msgid ""
 "<p>With the <b>Entry Cache</b> and <b>Index Cache (IDL cache)</b> you can adjust\n"
 "the sizes of OpenLDAP's internal caches. The <b>Entry Cache</b> defines the number of entries\n"
@@ -838,11 +853,11 @@
 "large IDL cache for good search performance (three times the size of the entry cache as a rule of\n"
 "thumbs).</p>"
 
-#: src/include/auth-server/helps.rb:116
+#: src/include/auth-server/helps.rb:118
 msgid "<h3>Password Policy Settings</h3>"
 msgstr "<h3>Password Policy Settings</h3>"
 
-#: src/include/auth-server/helps.rb:117
+#: src/include/auth-server/helps.rb:119
 msgid ""
 "<p>To make use of password policies for this database, enable \n"
 "<b>Enable Password Policies</b>.</p>"
@@ -850,7 +865,7 @@
 "<p>To make use of password policies for this database, enable \n"
 "<b>Enable Password Policies</b>.</p>"
 
-#: src/include/auth-server/helps.rb:120
+#: src/include/auth-server/helps.rb:122
 msgid ""
 "<p>Check <b>Hash Clear Text Passwords</b> to specify that the OpenLDAP server\n"
 "should encrypt clear text passwords present in add and modify requests before storing them\n"
@@ -864,7 +879,7 @@
 "needed to compensate for LDAP clients that do not use the password modify extended operation \n"
 "to manage passwords.</p> "
 
-#: src/include/auth-server/helps.rb:127
+#: src/include/auth-server/helps.rb:129
 msgid ""
 "<p>If <b>Disclose \"Account Locked\" Status</b> is enabled, users trying to\n"
 "authenticate to a locked account are notified that their account is\n"
@@ -878,11 +893,11 @@
 "attacker. Sites sensitive to security issues should not enable this\n"
 "option.</p> \n"
 
-#: src/include/auth-server/helps.rb:134
+#: src/include/auth-server/helps.rb:136
 msgid "<p>Enter the name of the default policy object in <b>Default Policy Object DN</b>.</p>"
 msgstr "<p>Enter the name of the default policy object in <b>Default Policy Object DN</b>.</p>"
 
-#: src/include/auth-server/helps.rb:137
+#: src/include/auth-server/helps.rb:139
 msgid ""
 "<p>Create or change the default policy by clicking <b>Edit Policy</b>. You may\n"
 "be asked to enter the LDAP administrator password afterwards to allow the\n"
@@ -892,19 +907,19 @@
 "be asked to enter the LDAP administrator password afterwards to allow the\n"
 "Policy Object being read from the server.</p>\n"
 
-#: src/include/auth-server/helps.rb:142
+#: src/include/auth-server/helps.rb:144
 msgid "<h3>Index Configuration</h3>"
 msgstr "<h3>Index Configuration</h3>"
 
-#: src/include/auth-server/helps.rb:143
+#: src/include/auth-server/helps.rb:145
 msgid "<p>Change the indexing options of a hdb of bdb-Database.</p>"
 msgstr "<p>Change the indexing options of a hdb of bdb-Database.</p>"
 
-#: src/include/auth-server/helps.rb:144
+#: src/include/auth-server/helps.rb:146
 msgid "<p>The table displays a list of attributes which currently have an index defined.</p>"
 msgstr "<p>The table displays a list of attributes which currently have an index defined.</p>"
 
-#: src/include/auth-server/helps.rb:147
+#: src/include/auth-server/helps.rb:149
 msgid ""
 "<p>Indexes are used by OpenLDAP to improve search performance on specific\n"
 "types of searches. Indexes should be configured corresponding to the most\n"
@@ -916,7 +931,7 @@
 "common searches on a database. YaST allows you to setup three different types\n"
 "of indexes.</p>\n"
 
-#: src/include/auth-server/helps.rb:153
+#: src/include/auth-server/helps.rb:155
 msgid ""
 "<p><b>Presence</b>: This index is used for searches with presence filters\n"
 "(i.e. <tt>(attributeType=*)</tt>). Presence indexes should only be configured\n"
@@ -926,7 +941,7 @@
 "(i.e. <tt>(attributeType=*)</tt>). Presence indexes should only be configured\n"
 "for attributes that occur rarely in the database.</p>\n"
 
-#: src/include/auth-server/helps.rb:158
+#: src/include/auth-server/helps.rb:160
 msgid ""
 "<p><b>Equality</b>: This index is used for searches with equality filters \n"
 "(i.e.(<tt>(attributeType=<exact values>)</tt>). An <b>Equality</b> index\n"
@@ -936,7 +951,7 @@
 "(i.e.(<tt>(attributeType=<exact values>)</tt>). An <b>Equality</b> index\n"
 "should always be configured with the <tt>objectclass</tt> attribute.</p>\n"
 
-#: src/include/auth-server/helps.rb:163
+#: src/include/auth-server/helps.rb:165
 msgid ""
 "<p><b>Substring</b>: This index is used for searches with substring filters\n"
 "(i.e. <tt>(attributeType=<substring>*)</tt>)</p>\n"
@@ -944,7 +959,7 @@
 "<p><b>Substring</b>: This index is used for searches with substring filters\n"
 "(i.e. <tt>(attributeType=<substring>*)</tt>)</p>\n"
 
-#: src/include/auth-server/helps.rb:166
+#: src/include/auth-server/helps.rb:168
 msgid ""
 "<p>Use <b>Add</b> to define indexing options for a new attribute,\n"
 "<b>Delete</b> to delete an existing index and <b>Edit</b> to change the\n"
@@ -954,7 +969,7 @@
 "<b>Delete</b> to delete an existing index and <b>Edit</b> to change the\n"
 "indexing options of an already indexed attribute.</p>\n"
 
-#: src/include/auth-server/helps.rb:171
+#: src/include/auth-server/helps.rb:173
 msgid ""
 "<p>Note: Depending on the database size it can take a while until newly added\n"
 "indexes will get active on a database. After the configuration has been\n"
@@ -966,11 +981,11 @@
 "written to the server, a background task will start to generate the indexing\n"
 "information for the database.</p>\n"
 
-#: src/include/auth-server/helps.rb:177
+#: src/include/auth-server/helps.rb:179
 msgid "<h3>Access Control Configuration</h3>"
 msgstr "<h3>Access Control Configuration</h3>"
 
-#: src/include/auth-server/helps.rb:180
+#: src/include/auth-server/helps.rb:182
 msgid ""
 "<p>This table gives you an overview of all Access Control rules that are\n"
 "currently configured for the selected database</p>\n"
@@ -978,7 +993,7 @@
 "<p>This table gives you an overview of all Access Control rules that are\n"
 "currently configured for the selected database</p>\n"
 
-#: src/include/auth-server/helps.rb:183
+#: src/include/auth-server/helps.rb:185
 msgid ""
 "<p>For each rule, you can see which target objects it matches. To see a more\n"
 "detailed view of a rule or to change one, select the rule in the table and\n"
@@ -988,7 +1003,7 @@
 "detailed view of a rule or to change one, select the rule in the table and\n"
 "click <b>Edit</b>.</p>\n"
 
-#: src/include/auth-server/helps.rb:188
+#: src/include/auth-server/helps.rb:190
 msgid ""
 "<p>Use <b>Add</b> to create new access control rules and <b>Delete</b> to\n"
 "delete an access control rule.</p>\n"
@@ -996,7 +1011,7 @@
 "<p>Use <b>Add</b> to create new access control rules and <b>Delete</b> to\n"
 "delete an access control rule.</p>\n"
 
-#: src/include/auth-server/helps.rb:191
+#: src/include/auth-server/helps.rb:193
 msgid ""
 "<p>OpenLDAP's access control evaluation stops at the first rule whose target\n"
 "definition (DN, filter and attributes) matches the entry being\n"
@@ -1008,11 +1023,11 @@
 "accessed. Therefore you should order the rules according to your needs, using\n"
 "the <b>Up</b> and <b>Down</b> buttons.</p>\n"
 
-#: src/include/auth-server/helps.rb:197
+#: src/include/auth-server/helps.rb:199
 msgid "<h3>Replication Provider Settings</h3>"
 msgstr "<h3>Replication Provider Settings</h3>"
 
-#: src/include/auth-server/helps.rb:200
+#: src/include/auth-server/helps.rb:202
 msgid ""
 "<p>Select the \"<b>Enable ldapsync provider for this database</b>\" checkbox, if you want to \n"
 "be able to replicate the currently selected database to another server.</p>"
@@ -1020,11 +1035,11 @@
 "<p>Select the \"<b>Enable ldapsync provider for this database</b>\" checkbox, if you want to \n"
 "be able to replicate the currently selected database to another server.</p>"
 
-#: src/include/auth-server/helps.rb:203
+#: src/include/auth-server/helps.rb:205
 msgid "<h4>Checkpoint Settings</h4>"
 msgstr "<h4>Checkpoint Settings</h4>"
 
-#: src/include/auth-server/helps.rb:204
+#: src/include/auth-server/helps.rb:206
 msgid ""
 "<p>Here you can specify how often the synchronization state indicator (stored\n"
 "in the \"<i>contextCSN</i>\"-Attribute) is written to the database. It is synced\n"
@@ -1044,11 +1059,11 @@
 "a faster startup time after an unclean shutdown but might result in a small\n"
 "performance hit in environments with many LDAP write operations.</p>\n"
 
-#: src/include/auth-server/helps.rb:214
+#: src/include/auth-server/helps.rb:216
 msgid "<h4>Session log</h4>"
 msgstr "<h4>Session log</h4>"
 
-#: src/include/auth-server/helps.rb:215
+#: src/include/auth-server/helps.rb:217
 msgid ""
 "<p>Configures an in-memory session log for recording information about write operations\n"
 "made on the database. Specify how many write operation should be recorded in the session log. \n"
@@ -1060,11 +1075,11 @@
 "Configuring a session log is only useful for \"<i>refreshOnly</i>\" replication. In \n"
 "such a case it can speed up replication and reduce the load on the master server.</p>"
 
-#: src/include/auth-server/helps.rb:221
+#: src/include/auth-server/helps.rb:223
 msgid "<h3>Replication Consumer Settings</h3>"
 msgstr "<h3>Replication Consumer Settings</h3>"
 
-#: src/include/auth-server/helps.rb:224
+#: src/include/auth-server/helps.rb:226
 msgid ""
 "<p>Select \"<b>This database is a Replication Consumer</b>\" if you want the\n"
 "database to be a replica of a database on another server.</p>\n"
@@ -1072,11 +1087,11 @@
 "<p>Select \"<b>This database is a Replication Consumer</b>\" if you want the\n"
 "database to be a replica of a database on another server.</p>\n"
 
-#: src/include/auth-server/helps.rb:227
+#: src/include/auth-server/helps.rb:229
 msgid "<h4>Provider</h4>"
 msgstr "<h4>Provider</h4>"
 
-#: src/include/auth-server/helps.rb:228
+#: src/include/auth-server/helps.rb:230
 msgid ""
 "Enter the connection details for the replication connection to the master\n"
 "server here. Select the protocol to use (<b>ldap</b> or <b>ldaps</b>) and\n"
@@ -1092,15 +1107,15 @@
 "certificate. Adjust the port number if the master server is using non-standard\n"
 "ldap ports.\n"
 
-#: src/include/auth-server/helps.rb:236
+#: src/include/auth-server/helps.rb:238
 msgid "<h4>Replication Type</h4>"
 msgstr "<h4>Replication Type</h4>"
 
-#: src/include/auth-server/helps.rb:237
+#: src/include/auth-server/helps.rb:239
 msgid "<p>OpenLDAP supports different modes of replication:</p>"
 msgstr "<p>OpenLDAP supports different modes of replication:</p>"
 
-#: src/include/auth-server/helps.rb:238
+#: src/include/auth-server/helps.rb:240
 msgid ""
 "<p><b>refreshOnly</b>: The slave server will periodically open a new\n"
 "connection, trigger a synchronization and close the connection again. The\n"
@@ -1112,7 +1127,7 @@
 "interval how often this synchronization happens can be configured via the\n"
 "<b>Replication Interval</b> setting.</p>\n"
 
-#: src/include/auth-server/helps.rb:244
+#: src/include/auth-server/helps.rb:246
 msgid ""
 "<p><b>refreshAndPersist</b>: The slave server will open a persistent\n"
 "connection to the master server for synchronization. Updated entries on the\n"
@@ -1122,11 +1137,11 @@
 "connection to the master server for synchronization. Updated entries on the\n"
 "master server are immediately sent to the slave via this connection.</p>\n"
 
-#: src/include/auth-server/helps.rb:249
+#: src/include/auth-server/helps.rb:251
 msgid "<h4>Authentication</h4>"
 msgstr "<h4>Authentication</h4>"
 
-#: src/include/auth-server/helps.rb:250
+#: src/include/auth-server/helps.rb:252
 msgid ""
 "<p>Specify a DN and password which the slave server should use to authenticate against the master.\n"
 "The specified DN needs to have read access to all entries in the replicated database on the master.</p>\n"
@@ -1134,11 +1149,11 @@
 "<p>Specify a DN and password which the slave server should use to authenticate against the master.\n"
 "The specified DN needs to have read access to all entries in the replicated database on the master.</p>\n"
 
-#: src/include/auth-server/helps.rb:253
+#: src/include/auth-server/helps.rb:255
 msgid "<h4>Update Referral</h4>"
 msgstr "<h4>Update Referral</h4>"
 
-#: src/include/auth-server/helps.rb:254
+#: src/include/auth-server/helps.rb:256
 msgid ""
 "<p>As the slave database is readonly, the slave server will answer write\n"
 "operations with an LDAP referral. \n"
@@ -1153,11 +1168,11 @@
 "slave server is as slave server too. </p>\n"
 
 #. Read dialog help
-#: src/include/auth-server/helps.rb:262
+#: src/include/auth-server/helps.rb:264
 msgid "<p><b><big>Initializing LDAP Server Configuration</big></b></p>"
 msgstr "<p><b><big>Initializing LDAP Server Configuration</big></b></p>"
 
-#: src/include/auth-server/helps.rb:265
+#: src/include/auth-server/helps.rb:267
 msgid ""
 "<p><b><big>Aborting Initialization:</big></b><br>\n"
 "Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
@@ -1166,11 +1181,11 @@
 "Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
 
 #. Write dialog help
-#: src/include/auth-server/helps.rb:269
+#: src/include/auth-server/helps.rb:271
 msgid "<p><b><big>Saving LDAP Server Configuration</big></b></p> \n"
 msgstr "<p><b><big>Saving LDAP Server Configuration</big></b></p> \n"
 
-#: src/include/auth-server/helps.rb:272
+#: src/include/auth-server/helps.rb:274
 msgid ""
 "<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>. An additional dialog\n"
@@ -1181,11 +1196,11 @@
 "informs you whether it is safe to do so.</p>\n"
 
 #. Summary dialog help 1/3
-#: src/include/auth-server/helps.rb:278
+#: src/include/auth-server/helps.rb:280
 msgid "<h3>LDAP Server Configuration Summary</h3>"
 msgstr "<h3>LDAP Server Configuration Summary</h3>"
 
-#: src/include/auth-server/helps.rb:281
+#: src/include/auth-server/helps.rb:283
 msgid ""
 "<p>This dialog provides a short summary about the configuration you have\n"
 "created. Click <b>Finish</b> to write the configuration and leave the LDAP\n"
@@ -1196,15 +1211,15 @@
 "Server module.</p>\n"
 
 #. Configuration Wizard Step 1
-#: src/include/auth-server/helps.rb:287
+#: src/include/auth-server/helps.rb:289
 msgid "<p>With <b>Start LDAP Server Yes or No</b>, start or stop the LDAP server.</p> "
 msgstr "<p>With <b>Start LDAP Server Yes or No</b>, start or stop the LDAP server.</p> "
 
-#: src/include/auth-server/helps.rb:290
+#: src/include/auth-server/helps.rb:292
 msgid "<p>If you select <b>Yes</b>, click <b>Next</b> to start the configuration wizard.</p>"
 msgstr "<p>If you select <b>Yes</b>, click <b>Next</b> to start the configuration wizard.</p>"
 
-#: src/include/auth-server/helps.rb:293
+#: src/include/auth-server/helps.rb:295
 msgid ""
 "<p>If the Firewall is enabled, open the required network ports\n"
 "for OpenLDAP by checking the corresponding checkbox.</p>\n"
@@ -1213,11 +1228,11 @@
 "for OpenLDAP by checking the corresponding checkbox.</p>\n"
 
 #. Configuration Wizard Step 2
-#: src/include/auth-server/helps.rb:297
+#: src/include/auth-server/helps.rb:299
 msgid "<p>Select the type of LDAP server you want to setup. The following scenarios are available:</p>"
 msgstr "<p>Select the type of LDAP server you want to setup. The following scenarios are available:</p>"
 
-#: src/include/auth-server/helps.rb:300
+#: src/include/auth-server/helps.rb:302
 msgid ""
 "<p><b>Stand-alone server</b>: Setup a single stand-alone OpenLDAP server with\n"
 "no preparations for replication.</p>\n"
@@ -1225,7 +1240,7 @@
 "<p><b>Stand-alone server</b>: Setup a single stand-alone OpenLDAP server with\n"
 "no preparations for replication.</p>\n"
 
-#: src/include/auth-server/helps.rb:303
+#: src/include/auth-server/helps.rb:305
 msgid ""
 "<p><b>Master server in a replication setup</b>: Create an OpenLDAP setup\n"
 "prepared to act as a master server (provider) in a replication setup.</p>\n"
@@ -1233,7 +1248,7 @@
 "<p><b>Master server in a replication setup</b>: Create an OpenLDAP setup\n"
 "prepared to act as a master server (provider) in a replication setup.</p>\n"
 
-#: src/include/auth-server/helps.rb:306
+#: src/include/auth-server/helps.rb:308
 msgid ""
 "<p><b>Replica slave server</b>: Setup an OpenLDAP slave server that replicates all its data,\n"
 "including configuration, from a master server.</p>"
@@ -1242,15 +1257,15 @@
 "including configuration, from a master server.</p>"
 
 #. Configuration Wizard Step 3
-#: src/include/auth-server/helps.rb:310
+#: src/include/auth-server/helps.rb:312
 msgid "<h3>TLS Settings</h3>"
 msgstr "<h3>TLS Settings</h3>"
 
-#: src/include/auth-server/helps.rb:313
+#: src/include/auth-server/helps.rb:315
 msgid "<h4>Basic Settings</h4>"
 msgstr "<h4>Basic Settings</h4>"
 
-#: src/include/auth-server/helps.rb:314
+#: src/include/auth-server/helps.rb:316
 msgid ""
 "<p>To enable encryption via TLS/SSL, check the <b>Enabled TLS</b>\n"
 "checkbox. Additionally you need to configure a certificate for the Server \n"
@@ -1260,7 +1275,7 @@
 "checkbox. Additionally you need to configure a certificate for the Server \n"
 "to use.</p>\n"
 
-#: src/include/auth-server/helps.rb:319
+#: src/include/auth-server/helps.rb:321
 msgid ""
 "<p>Check <b>Enable LDAP over SSL (ldaps) interface</b>, to enable the server\n"
 "to accept LDAPS connections on port 636. If not checked, OpenLDAP will only\n"
@@ -1270,7 +1285,7 @@
 "to accept LDAPS connections on port 636. If not checked, OpenLDAP will only\n"
 "support TLS encrypted connections through the StartTLS extended operation.</p>\n"
 
-#: src/include/auth-server/helps.rb:324
+#: src/include/auth-server/helps.rb:326
 msgid ""
 "<p>If you already have a common server certificate installed using the\n"
 "corresponding YaST Module, check <b>Use common Server Certificate</b> so that\n"
@@ -1280,11 +1295,11 @@
 "corresponding YaST Module, check <b>Use common Server Certificate</b> so that\n"
 "the OpenLDAP server uses this certificate.</p>\n"
 
-#: src/include/auth-server/helps.rb:329
+#: src/include/auth-server/helps.rb:331
 msgid "<h4>Import Certificate</h4>"
 msgstr "<h4>Import Certificate</h4>"
 
-#: src/include/auth-server/helps.rb:330
+#: src/include/auth-server/helps.rb:332
 msgid ""
 "<p>If you have no common server certificate or you want OpenLDAP to use a\n"
 "different certificate, enter the file names of the <b>CA Certificate File</b>,\n"
@@ -1296,7 +1311,7 @@
 "<b>Certificate File</b> and <b>Certificate Key File</b> into the corresponding\n"
 "textfields.</p>\n"
 
-#: src/include/auth-server/helps.rb:336
+#: src/include/auth-server/helps.rb:338
 msgid ""
 "<p>To create a new CA or certificate, launch the CA management module by\n"
 "clicking <b>Launch CA Management Module</b>.</p>\n"
@@ -1305,12 +1320,12 @@
 "clicking <b>Launch CA Management Module</b>.</p>\n"
 
 #. Tree Item Dialog "global" 1/1
-#: src/include/auth-server/helps.rb:340
+#: src/include/auth-server/helps.rb:342
 msgid "<p>Below this item, configure some global parameters.</p>"
 msgstr "<p>Below this item, configure some global parameters.</p>"
 
 #. Tree Item Dialog "schema" 1/
-#: src/include/auth-server/helps.rb:344
+#: src/include/auth-server/helps.rb:346
 msgid ""
 "<p>Add schema files in this dialog. Press <b>Add</b> to open a file dialog in which to choose\n"
 "a new schema. Note: OpenLDAP (when used with back-config) does currently not support the removal of \n"
@@ -1321,7 +1336,7 @@
 "Schema Data</p>"
 
 #. Tree Item Dialog "loglevel"
-#: src/include/auth-server/helps.rb:350
+#: src/include/auth-server/helps.rb:352
 msgid ""
 "<p>Select the subsystems that should log debugging statements and statistics\n"
 "to syslog.</p>"
@@ -1330,15 +1345,15 @@
 "to syslog.</p>"
 
 #. Tree Item Dialog "allow" 1/1
-#: src/include/auth-server/helps.rb:354
+#: src/include/auth-server/helps.rb:356
 msgid "<p>Select which special features the OpenLDAP Server should allow or disallow:</p>"
 msgstr "<p>Select which special features the OpenLDAP Server should allow or disallow:</p>"
 
-#: src/include/auth-server/helps.rb:357
+#: src/include/auth-server/helps.rb:359
 msgid "<h3>Select Allow Flags</h3>"
 msgstr "<h3>Select Allow Flags</h3>"
 
-#: src/include/auth-server/helps.rb:358
+#: src/include/auth-server/helps.rb:360
 msgid ""
 "<p><b>LDAPv2 Bind Requests</b>: To let the server accept LDAPv2 bind requests.\n"
 "Note that OpenLDAP does not truly implement LDAPv2.</p>\n"
@@ -1346,7 +1361,7 @@
 "<p><b>LDAPv2 Bind Requests</b>: To let the server accept LDAPv2 bind requests.\n"
 "Note that OpenLDAP does not truly implement LDAPv2.</p>\n"
 
-#: src/include/auth-server/helps.rb:361
+#: src/include/auth-server/helps.rb:363
 msgid ""
 "<p><b>Anonymous Bind when credentials not empty</b>: To allow anonymous bind when \n"
 "credentials are not empty (i.e. password is present but bind DN is not present) </p>"
@@ -1354,7 +1369,7 @@
 "<p><b>Anonymous Bind when credentials not empty</b>: To allow anonymous bind when \n"
 "credentials are not empty (i.e. password is present but bind DN is not present) </p>"
 
-#: src/include/auth-server/helps.rb:364
+#: src/include/auth-server/helps.rb:366
 msgid ""
 "<p><b>Unauthenticated Bind when DN not empty</b>: To allow unauthenticated \n"
 "(anonymous) binds when DN is not empty</p>"
@@ -1362,7 +1377,7 @@
 "<p><b>Unauthenticated Bind when DN not empty</b>: To allow unauthenticated \n"
 "(anonymous) binds when DN is not empty</p>"
 
-#: src/include/auth-server/helps.rb:367
+#: src/include/auth-server/helps.rb:369
 msgid ""
 "<p><b>Unauthenticated Update Operations to process</b>: To allow unauthenticated\n"
 "(anonymous) update operations to be processed. They are still subject to\n"
@@ -1372,11 +1387,11 @@
 "(anonymous) update operations to be processed. They are still subject to\n"
 "access controls and other administrative limits.</p>\n"
 
-#: src/include/auth-server/helps.rb:372
+#: src/include/auth-server/helps.rb:374
 msgid "<h3>Select Disallow Flags</h3>"
 msgstr "<h3>Select Disallow Flags</h3>"
 
-#: src/include/auth-server/helps.rb:373
+#: src/include/auth-server/helps.rb:375
 msgid ""
 "<p><b>Disable acceptance of anonymous Bind Requests</b>: The Server will\n"
 "not accept anonymous bind requests. Note that this does not generally\n"
@@ -1386,7 +1401,7 @@
 "not accept anonymous bind requests. Note that this does not generally\n"
 "prohibit anonymous directory access.</p>\n"
 
-#: src/include/auth-server/helps.rb:378
+#: src/include/auth-server/helps.rb:380
 msgid ""
 "<p><b>Disable Simple Bind authentication</b>: Completely disable Simple Bind\n"
 "authentication</p>\n"
@@ -1394,7 +1409,7 @@
 "<p><b>Disable Simple Bind authentication</b>: Completely disable Simple Bind\n"
 "authentication</p>\n"
 
-#: src/include/auth-server/helps.rb:381
+#: src/include/auth-server/helps.rb:383
 msgid ""
 "<p><b>Disable forcing session to anonymous status upon StartTLS operation\n"
 "receipt</b>: The server will no longer force an authenticated connection back\n"
@@ -1404,7 +1419,7 @@
 "receipt</b>: The server will no longer force an authenticated connection back\n"
 "to the anonymous state when receiving the StartTLS operation.</p>\n"
 
-#: src/include/auth-server/helps.rb:386
+#: src/include/auth-server/helps.rb:388
 msgid ""
 "<p><b>Disallow the StartTLS operation if authenticated</b>:\n"
 "The server will not allow the StartTLS operation on already authenticated\n"
@@ -1415,7 +1430,7 @@
 "connections.</p>\n"
 
 #. Tree Item Dialog "databases"
-#: src/include/auth-server/helps.rb:392
+#: src/include/auth-server/helps.rb:394
 msgid ""
 "<p>This lists shows all configured databases. The databases with the type\n"
 "\"frontend\" and \"config\" represent special internal databases. The \"Frontend\"\n"
@@ -1430,11 +1445,11 @@
 "the LDAP server itself.</p>\n"
 
 #. Tree Item Dialog "databases" 2/2
-#: src/include/auth-server/helps.rb:400
+#: src/include/auth-server/helps.rb:402
 msgid "<p>To add a new database, press <b>Add Database...</b>.</p>"
 msgstr "<p>To add a new database, press <b>Add Database...</b>.</p>"
 
-#: src/include/auth-server/helps.rb:401
+#: src/include/auth-server/helps.rb:403
 msgid ""
 "<p>To delete a database, select a database from the list and press <b>Delete Database...</b>.\n"
 "You cannot delete the \"config\" and \"frontend\" databases.</p>\n"
@@ -1442,7 +1457,7 @@
 "<p>To delete a database, select a database from the list and press <b>Delete Database...</b>.\n"
 "You cannot delete the \"config\" and \"frontend\" databases.</p>\n"
 
-#: src/include/auth-server/helps.rb:404
+#: src/include/auth-server/helps.rb:406
 msgid ""
 "<p>Enter a password for the configuration database (\"<i>cn=config</i>\") here. This is required to make\n"
 "the configuration database accessible remotely.</p>"
@@ -1450,7 +1465,7 @@
 "<p>Enter a password for the configuration database (\"<i>cn=config</i>\") here. This is required to make\n"
 "the configuration database accessible remotely.</p>"
 
-#: src/include/auth-server/helps.rb:407
+#: src/include/auth-server/helps.rb:409
 msgid ""
 "<p>If the server is supposed to participate in a MirrorMode setup, select the \"<b>Prepare for MirrorMode replication</b>\"\n"
 "checkbox. This will ensure that the serverId attribute is generated as needed for MirrorMode replication.</p>\n"
@@ -1458,7 +1473,7 @@
 "<p>If the server is supposed to participate in a MirrorMode setup, select the \"<b>Prepare for MirrorMode replication</b>\"\n"
 "checkbox. This will ensure that the serverId attribute is generated as needed for MirrorMode replication.</p>\n"
 
-#: src/include/auth-server/helps.rb:410
+#: src/include/auth-server/helps.rb:412
 msgid ""
 "<p>To setup a slave server some details need to be queried from the master server. Please enter the master\n"
 "server's hostname, adjust the protocol (either \"<i>ldap</i>\" or \"<i>ldaps</i>\") and port number as needed and enter the password\n"
@@ -1470,231 +1485,231 @@
 
 #. ########## kerberos
 #. Help text: basic settings 1/2
-#: src/include/auth-server/helps.rb:417
+#: src/include/auth-server/helps.rb:419
 msgid "<p>Specify the <big>Realm</big> and the <big>Master Password</big> for your Kerberos server.</p>"
 msgstr "<p>Specify the <big>Realm</big> and the <big>Master Password</big> for your Kerberos server.</p>"
 
 #. Help text: basic settings 2/2
-#: src/include/auth-server/helps.rb:421
+#: src/include/auth-server/helps.rb:423
 msgid "<p>Although your Kerberos realm can be any ASCII string, the convention is to use upper-case letters as in your domain name.</p>\n"
 msgstr "<p>Although your Kerberos realm can be any ASCII string, the convention is to use upper-case letters as in your domain name.</p>\n"
 
 #. advanced item help: database_name
-#: src/include/auth-server/helps.rb:425
+#: src/include/auth-server/helps.rb:427
 msgid "<p>This string specifies the location of the Kerberos database for this realm.</p>"
 msgstr "<p>This string specifies the location of the Kerberos database for this realm.</p>"
 
 #. advanced item help: acl_file
-#: src/include/auth-server/helps.rb:429
+#: src/include/auth-server/helps.rb:431
 msgid "<p>This string specifies the location of the access control list (ACL) file that kadmin uses to determine the principals' permissions on the database.</p>"
 msgstr "<p>This string specifies the location of the access control list (ACL) file that kadmin uses to determine the principals' permissions on the database.</p>"
 
 #. advanced item help: admin_keytab
-#: src/include/auth-server/helps.rb:433
+#: src/include/auth-server/helps.rb:435
 msgid "<p>This string specifies the location of the keytab file that kadmin uses to authenticate to the database.</p>"
 msgstr "<p>This string specifies the location of the keytab file that kadmin uses to authenticate to the database.</p>"
 
 #. advanced item help: default_principal_expiration
-#: src/include/auth-server/helps.rb:437
+#: src/include/auth-server/helps.rb:439
 msgid "<p>This absolute time specifies the default expiration date of principals created in this realm.</p>"
 msgstr "<p>This absolute time specifies the default expiration date of principals created in this realm.</p>"
 
 #. advanced item help principal_flags 1/13
-#: src/include/auth-server/helps.rb:441
+#: src/include/auth-server/helps.rb:443
 msgid "<p>These flags specify the default attributes of the principal created in this realm.</p>"
 msgstr "<p>These flags specify the default attributes of the principal created in this realm.</p>"
 
-#: src/include/auth-server/helps.rb:444
+#: src/include/auth-server/helps.rb:446
 msgid "Allow postdated"
 msgstr "Allow postdated"
 
 #. advanced item help principal_flags 2/13 :Allow postdated
-#: src/include/auth-server/helps.rb:446
+#: src/include/auth-server/helps.rb:448
 msgid "Enabling this flag allows the principal to obtain postdateable tickets."
 msgstr "Enabling this flag allows the principal to obtain postdateable tickets."
 
-#: src/include/auth-server/helps.rb:449
+#: src/include/auth-server/helps.rb:451
 msgid "Allow forwardable"
 msgstr "Allow forwardable"
 
 #. advanced item help principal_flags 3/13 :Allow forwardable
-#: src/include/auth-server/helps.rb:451
+#: src/include/auth-server/helps.rb:453
 msgid "Enabling this flag allows the principal to obtain forwardable tickets."
 msgstr "Enabling this flag allows the principal to obtain forwardable tickets."
 
-#: src/include/auth-server/helps.rb:454
+#: src/include/auth-server/helps.rb:456
 msgid "Allow renewable"
 msgstr "Allow renewable"
 
 #. advanced item help principal_flags 4/13 :Allow renewable
-#: src/include/auth-server/helps.rb:456
+#: src/include/auth-server/helps.rb:458
 msgid "Enabling this flag allows the principal to obtain renewable tickets."
 msgstr "Enabling this flag allows the principal to obtain renewable tickets."
 
-#: src/include/auth-server/helps.rb:459
+#: src/include/auth-server/helps.rb:461
 msgid "Allow proxiable"
 msgstr "Allow proxiable"
 
 #. advanced item help principal_flags 5/13 :Allow proxiable
-#: src/include/auth-server/helps.rb:461
+#: src/include/auth-server/helps.rb:463
 msgid "Enabling this flag allows the principal to obtain proxy tickets."
 msgstr "Enabling this flag allows the principal to obtain proxy tickets."
 
-#: src/include/auth-server/helps.rb:462
+#: src/include/auth-server/helps.rb:464
 msgid "Enable user-to-user authentication"
 msgstr "Enable user-to-user authentication"
 
 #. advanced item help principal_flags 6/13 :Enable user-to-user authentication
-#: src/include/auth-server/helps.rb:464
+#: src/include/auth-server/helps.rb:466
 msgid "Enabling this flag allows the principal to obtain a session key for another user, permitting user-to-user authentication for this  principal."
 msgstr "Enabling this flag allows the principal to obtain a session key for another user, permitting user-to-user authentication for this  principal."
 
-#: src/include/auth-server/helps.rb:467
+#: src/include/auth-server/helps.rb:469
 msgid "Requires preauth"
 msgstr "Requires preauth"
 
 #. advanced item help principal_flags 7/13 :Requires preauth
-#: src/include/auth-server/helps.rb:469
+#: src/include/auth-server/helps.rb:471
 msgid "If this flag is enabled on a client principal, that principal is required to preauthenticate to the KDC before receiving any tickets. If you enable this flag on a service principal, the service tickets for this principal will only be issued to clients with a TGT that has the preauthenticated ticket set."
 msgstr "If this flag is enabled on a client principal, that principal is required to preauthenticate to the KDC before receiving any tickets. If you enable this flag on a service principal, the service tickets for this principal will only be issued to clients with a TGT that has the preauthenticated ticket set."
 
-#: src/include/auth-server/helps.rb:472
+#: src/include/auth-server/helps.rb:474
 msgid "Requires hwauth"
 msgstr "Requires hwauth"
 
 #. advanced item help principal_flags 8/13 :Requires hwauth
-#: src/include/auth-server/helps.rb:474
+#: src/include/auth-server/helps.rb:476
 msgid "If this flag is enabled, the principal is required to preauthenticate using a hardware device before receiving any tickets."
 msgstr "If this flag is enabled, the principal is required to preauthenticate using a hardware device before receiving any tickets."
 
-#: src/include/auth-server/helps.rb:477
+#: src/include/auth-server/helps.rb:479
 msgid "Allow service"
 msgstr "Allow service"
 
 #. advanced item help principal_flags 9/13 :Allow service
-#: src/include/auth-server/helps.rb:479
+#: src/include/auth-server/helps.rb:481
 msgid "Enabling this flag allows the KDC to issue service tickets for this principal."
 msgstr "Enabling this flag allows the KDC to issue service tickets for this principal."
 
-#: src/include/auth-server/helps.rb:482
+#: src/include/auth-server/helps.rb:484
 msgid "Allow tgs request"
 msgstr "Allow tgs request"
 
 #. advanced item help principal_flags 10/13 :Allow tgs request
-#: src/include/auth-server/helps.rb:484
+#: src/include/auth-server/helps.rb:486
 msgid "Enabling this flag allows a principal to obtain tickets based on a ticket-granting-ticket, rather than repeating the authentication process that was used to obtain the TGT."
 msgstr "Enabling this flag allows a principal to obtain tickets based on a ticket-granting-ticket, rather than repeating the authentication process that was used to obtain the TGT."
 
-#: src/include/auth-server/helps.rb:487
+#: src/include/auth-server/helps.rb:489
 msgid "Allow tickets"
 msgstr "Allow tickets"
 
 #. advanced item help principal_flags 11/13 :Allow tickets
-#: src/include/auth-server/helps.rb:489
+#: src/include/auth-server/helps.rb:491
 msgid "Enabling  this  flag  means  that the KDC will issue tickets for this principal. Disabling this flag essentially deactivates the principal within this realm."
 msgstr "Enabling  this  flag  means  that the KDC will issue tickets for this principal. Disabling this flag essentially deactivates the principal within this realm."
 
-#: src/include/auth-server/helps.rb:492
+#: src/include/auth-server/helps.rb:494
 msgid "Need change"
 msgstr "Need change"
 
 #. advanced item help principal_flags 12/13 :Needchange
-#: src/include/auth-server/helps.rb:494
+#: src/include/auth-server/helps.rb:496
 msgid "Enabling this flag forces a password change for this principal."
 msgstr "Enabling this flag forces a password change for this principal."
 
-#: src/include/auth-server/helps.rb:495
+#: src/include/auth-server/helps.rb:497
 msgid "Password changing service"
 msgstr "Password changing service"
 
 #. advanced item help principal_flags 13/13 :Password changing service
-#: src/include/auth-server/helps.rb:497
+#: src/include/auth-server/helps.rb:499
 msgid "If this flag is enabled, it marks this principal as a password change service.  This should only be used in special cases, for example,  if a  user's  password  has  expired,  the user has to get tickets for that principal to be able to change it without going through the normal password authentication."
 msgstr "If this flag is enabled, it marks this principal as a password change service.  This should only be used in special cases, for example,  if a  user's  password  has  expired,  the user has to get tickets for that principal to be able to change it without going through the normal password authentication."
 
 #. advanced item help : dict_file
-#: src/include/auth-server/helps.rb:501
+#: src/include/auth-server/helps.rb:503
 msgid "<p>The string location of the dictionary file containing strings that are not allowed as passwords. If this tag is not set or if there is no policy assigned to the principal, no check will be done.</p>"
 msgstr "<p>The string location of the dictionary file containing strings that are not allowed as passwords. If this tag is not set or if there is no policy assigned to the principal, no check will be done.</p>"
 
 #. advanced item help : kadmind_port
 #. advanced item help : kpasswd_port
-#: src/include/auth-server/helps.rb:505 src/include/auth-server/helps.rb:509
+#: src/include/auth-server/helps.rb:507 src/include/auth-server/helps.rb:511
 msgid "<p>This port number specifies the port on which the kadmind daemon listens for this realm.</p>"
 msgstr "<p>This port number specifies the port on which the kadmind daemon listens for this realm.</p>"
 
 #. advanced item help : key_stash_file
-#: src/include/auth-server/helps.rb:513
+#: src/include/auth-server/helps.rb:515
 msgid "<p>This string specifies the location where the master key has been stored with kdb5_stash.</p>"
 msgstr "<p>This string specifies the location where the master key has been stored with kdb5_stash.</p>"
 
 #. advanced item help : kdc_ports
-#: src/include/auth-server/helps.rb:517
+#: src/include/auth-server/helps.rb:519
 msgid "<p>This string specifies the list of ports that the KDC listens to for this realm.</p>"
 msgstr "<p>This string specifies the list of ports that the KDC listens to for this realm.</p>"
 
 #. advanced item help : master_key_name
-#: src/include/auth-server/helps.rb:521
+#: src/include/auth-server/helps.rb:523
 msgid "<p>This string specifies the name of the principal associated with the master key. The default value is K/M.</p>"
 msgstr "<p>This string specifies the name of the principal associated with the master key. The default value is K/M.</p>"
 
 #. advanced item help : master_key_type
-#: src/include/auth-server/helps.rb:525
+#: src/include/auth-server/helps.rb:527
 msgid "<p>This key type string represents the master keys key type.</p>"
 msgstr "<p>This key type string represents the master keys key type.</p>"
 
 #. advanced item help : max_life
-#: src/include/auth-server/helps.rb:529
+#: src/include/auth-server/helps.rb:531
 msgid "<p>This delta time specifies the maximum time period that a ticket may be valid for in this realm.</p>"
 msgstr "<p>This delta time specifies the maximum time period that a ticket may be valid for in this realm.</p>"
 
 #. advanced item help : max_renew_life
-#: src/include/auth-server/helps.rb:533
+#: src/include/auth-server/helps.rb:535
 msgid "<p>This delta time specifies the maximum time period that a ticket may be renewed for in this realm.</p>"
 msgstr "<p>This delta time specifies the maximum time period that a ticket may be renewed for in this realm.</p>"
 
 #. advanced item help : supported_enctypes
-#: src/include/auth-server/helps.rb:537
+#: src/include/auth-server/helps.rb:539
 msgid "<p>A list of key/salt strings that specifies the default key/salt combinations of principals for this realm.</p>"
 msgstr "<p>A list of key/salt strings that specifies the default key/salt combinations of principals for this realm.</p>"
 
 #. advanced item help : kdc_supported_enctypes
-#: src/include/auth-server/helps.rb:541
+#: src/include/auth-server/helps.rb:543
 msgid "<p>Specifies the permitted key/salt combinations of principals for this realm.</p>"
 msgstr "<p>Specifies the permitted key/salt combinations of principals for this realm.</p>"
 
 #. advanced item help : reject_bad_transit
-#: src/include/auth-server/helps.rb:545
+#: src/include/auth-server/helps.rb:547
 msgid "<p>Specifies whether or not the list of transited realms for cross-realm tickets should be checked against the transit path computed from the realm names and the [capaths] section of its krb5.conf file</p>"
 msgstr "<p>Specifies whether or not the list of transited realms for cross-realm tickets should be checked against the transit path computed from the realm names and the [capaths] section of its krb5.conf file</p>"
 
 #. advanced item help : ldap_conns_per_server
-#: src/include/auth-server/helps.rb:549
+#: src/include/auth-server/helps.rb:551
 msgid "<p>This LDAP specific tag indicates the number of connections to be maintained via the LDAP server.</p>"
 msgstr "<p>This LDAP specific tag indicates the number of connections to be maintained via the LDAP server.</p>"
 
 #. advanced item help : ldap_service_password_file
-#: src/include/auth-server/helps.rb:553
+#: src/include/auth-server/helps.rb:555
 msgid "<p>This LDAP-specific tag indicates the file containing the stashed passwords for the objects used for starting the Kerberos servers.</p>"
 msgstr "<p>This LDAP-specific tag indicates the file containing the stashed passwords for the objects used for starting the Kerberos servers.</p>"
 
 #. advanced item help : kdb_subtrees
-#: src/include/auth-server/helps.rb:557
+#: src/include/auth-server/helps.rb:559
 msgid "<p>Specifies the list of subtrees containing the principals of a realm. The list contains the DNs of the subtree objects separated by colon(:).</p><p>The search scope specifies the scope for searching the principals under the subtree.</p>"
 msgstr "<p>Specifies the list of subtrees containing the principals of a realm. The list contains the DNs of the subtree objects separated by colon(:).</p><p>The search scope specifies the scope for searching the principals under the subtree.</p>"
 
 #. advanced item help : kdb_containerref
-#: src/include/auth-server/helps.rb:561
+#: src/include/auth-server/helps.rb:563
 msgid "<p>Specifies the DN of the container object in which the principals of a realm will be created. If the container reference is not configured for a realm, the principals will be created in the realm container.</p>"
 msgstr "<p>Specifies the DN of the container object in which the principals of a realm will be created. If the container reference is not configured for a realm, the principals will be created in the realm container.</p>"
 
 #. advanced item help : kdb_maxtktlife
-#: src/include/auth-server/helps.rb:565
+#: src/include/auth-server/helps.rb:567
 msgid "<p>Specifies maximum ticket life for principals in this realm.</p>"
 msgstr "<p>Specifies maximum ticket life for principals in this realm.</p>"
 
 #. advanced item help : kdb_maxrenewlife
-#: src/include/auth-server/helps.rb:569
+#: src/include/auth-server/helps.rb:571
 msgid "<p>Specifies maximum renewable life of tickets for principals in this realm.</p>"
 msgstr "<p>Specifies maximum renewable life of tickets for principals in this realm.</p>"
 
@@ -2003,6 +2018,12 @@
 #. Ralf Haferkamp <rhafer@suse.de>
 #.
 #. $Id$
+#: src/include/auth-server/mirrormode-wizard.rb:25
+#, fuzzy
+#| msgid "LDAP Client Configuration"
+msgid "OpenLDAP MirrorMode Configuration"
+msgstr "LDAP Client Configuration"
+
 #: src/include/auth-server/mirrormode-wizard.rb:28
 msgid "MirrorMode Node List"
 msgstr "MirrorMode Node List"
@@ -2934,8 +2955,8 @@
 msgid "Kerberos Schema unknown by the LDAP server."
 msgstr "Kerberos Schema unknown by the LDAP server."
 
-#: src/modules/AuthServer.pm:975 src/modules/AuthServer.pm:3479
-#: src/modules/AuthServer.pm:3526 src/modules/AuthServer.pm:3572
+#: src/modules/AuthServer.pm:975 src/modules/AuthServer.pm:3482
+#: src/modules/AuthServer.pm:3529 src/modules/AuthServer.pm:3575
 msgid "Cannot execute kdb5_ldap_util."
 msgstr "Cannot execute kdb5_ldap_util."
 
@@ -3198,7 +3219,7 @@
 msgid "Could not create database directory."
 msgstr "Could not create database directory."
 
-#: src/modules/AuthServer.pm:2810 src/modules/AuthServer.pm:4096
+#: src/modules/AuthServer.pm:2810 src/modules/AuthServer.pm:4101
 #: src/modules/YaPI/LdapServer.pm:498
 msgid "Could not adjust ownership of database directory."
 msgstr "Could not adjust ownership of database directory."
@@ -3211,80 +3232,80 @@
 msgid "A master server for replication cannot work correctly without knowing its own fully qualified hostname."
 msgstr "A master server for replication cannot work correctly without knowing its own fully qualified hostname."
 
-#: src/modules/AuthServer.pm:3373 src/modules/AuthServer.pm:3386
-#: src/modules/AuthServer.pm:3399 src/modules/AuthServer.pm:3412
-#: src/modules/AuthServer.pm:3425
+#: src/modules/AuthServer.pm:3376 src/modules/AuthServer.pm:3389
+#: src/modules/AuthServer.pm:3402 src/modules/AuthServer.pm:3415
+#: src/modules/AuthServer.pm:3428
 msgid "Cannot write krb5.conf."
 msgstr "Cannot write krb5.conf."
 
-#: src/modules/AuthServer.pm:3511
+#: src/modules/AuthServer.pm:3514
 msgid "Creating Kerberos database failed."
 msgstr "Creating Kerberos database failed."
 
-#: src/modules/AuthServer.pm:3557 src/modules/AuthServer.pm:3603
+#: src/modules/AuthServer.pm:3560 src/modules/AuthServer.pm:3606
 msgid "Writing to password file failed."
 msgstr "Writing to password file failed."
 
-#: src/modules/AuthServer.pm:3969 src/modules/AuthServer.pm:3979
+#: src/modules/AuthServer.pm:3972 src/modules/AuthServer.pm:3982
 msgid "is not a valid LDAP DN."
 msgstr "is not a valid LDAP DN."
 
-#: src/modules/AuthServer.pm:3974 src/modules/AuthServer.pm:3984
+#: src/modules/AuthServer.pm:3977 src/modules/AuthServer.pm:3987
 msgid "has multivalued RDNs."
 msgstr "has multivalued RDNs."
 
-#: src/modules/AuthServer.pm:4016
+#: src/modules/AuthServer.pm:4019
 #, perl-format
 msgid "Invalid LDAP DN: \"%s\", cannot extract RDN values"
 msgstr "Invalid LDAP DN: \"%s\", cannot extract RDN values"
 
-#: src/modules/AuthServer.pm:4024
+#: src/modules/AuthServer.pm:4027
 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:4031 src/modules/YaPI/LdapServer.pm:373
+#: src/modules/AuthServer.pm:4034 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:4043
+#: src/modules/AuthServer.pm:4046
 #, 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:4048
+#: src/modules/AuthServer.pm:4051
 #, 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:4057
+#: src/modules/AuthServer.pm:4060
 #, 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:4062
+#: src/modules/AuthServer.pm:4065
 #, 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:4069
+#: src/modules/AuthServer.pm:4072
 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:4089 src/modules/YaPI/LdapServer.pm:484
+#: src/modules/AuthServer.pm:4094 src/modules/YaPI/LdapServer.pm:484
 msgid "Could not create directory."
 msgstr "Could not create directory."
 
-#: src/modules/AuthServer.pm:4863
+#: src/modules/AuthServer.pm:4871
 #, perl-format
 msgid "CA Certificate File: \"%s\" does not exist."
 msgstr "CA Certificate File: \"%s\" does not exist."
 
-#: src/modules/AuthServer.pm:4873
+#: src/modules/AuthServer.pm:4881
 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:4874
+#: src/modules/AuthServer.pm:4882
 #, perl-format
 msgid ""
 "Please make sure that \"%s\" contains the correct\n"
@@ -3293,21 +3314,21 @@
 "Please make sure that \"%s\" contains the correct\n"
 "CA file to verify the remote Server Certificate."
 
-#: src/modules/AuthServer.pm:4882
+#: src/modules/AuthServer.pm:4890
 #, perl-format
 msgid "Certificate File: \"%s\" does not exist."
 msgstr "Certificate File: \"%s\" does not exist."
 
-#: src/modules/AuthServer.pm:4887
+#: src/modules/AuthServer.pm:4895
 #, perl-format
 msgid "Certificate Key File: \"%s\" does not exist."
 msgstr "Certificate Key File: \"%s\" does not exist."
 
-#: src/modules/AuthServer.pm:4968 src/modules/AuthServer.pm:4978
+#: src/modules/AuthServer.pm:4976 src/modules/AuthServer.pm:4986
 msgid "Writing to krb5.conf failed."
 msgstr "Writing to krb5.conf failed."
 
-#: src/modules/AuthServer.pm:5346 src/modules/AuthServer.pm:5355
+#: src/modules/AuthServer.pm:5354 src/modules/AuthServer.pm:5363
 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-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/autoinst.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: autoinst\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:51+0200\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"
@@ -59,7 +59,7 @@
 #. 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:422
+#: src/clients/inst_autosetup_upgrade.rb:423
 #: src/modules/AutoInstallRules.rb:1001
 msgid ""
 "Error while parsing the control file.\n"
@@ -116,8 +116,7 @@
 msgid "enable/disable all package handling"
 msgstr "Enable/disable chrooting."
 
-#. doClone();
-#: src/clients/ayast_setup.rb:87 src/clients/clone_system.rb:84
+#: src/clients/ayast_setup.rb:87 src/clients/clone_system.rb:82
 #, fuzzy
 msgid "Empty parameter list"
 msgstr "Some parameter missing"
@@ -129,38 +128,33 @@
 msgid "Path to AutoYaST profile must be set."
 msgstr "Path to AutoYaST Profile"
 
-#. encoding: utf-8
-#. File:        clients/clone_system.ycp
-#. Package:     Auto-installation
-#. Author:      Uwe Gansert <ug@suse.de>
-#. Summary:     This client is clones some settings of the
-#. system.
-#.
-#. Changes:     * initial - just do a simple clone
-#. $Id$
-#: src/clients/clone_system.rb:42
+#. if we get no argument or map of options we are not in command line
+#: src/clients/clone_system.rb:47
 #, 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:52
+#: src/clients/clone_system.rb:57
 #, fuzzy
 #| msgid "Unknown mode"
 msgid "known modules: %1"
 msgstr "Unknown mode"
 
-#: src/clients/clone_system.rb:59
+#: src/clients/clone_system.rb:64
 #, 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:91
+#: src/clients/clone_system.rb:89
 msgid "Cloning the system..."
 msgstr "Cloning the system..."
 
-#: src/clients/clone_system.rb:92
-msgid "The resulting autoyast profile can be found in /root/autoinst.xml."
+#. TRANSLATORS: %s is path where profile can be found
+#: src/clients/clone_system.rb:91
+#, fuzzy
+#| msgid "The resulting autoyast profile can be found in /root/autoinst.xml."
+msgid "The resulting autoyast profile can be found in %s."
 msgstr "The resulting autoyast profile can be found in /root/autoinst.xml."
 
 #. help 1/2
@@ -310,23 +304,23 @@
 msgid "Executing Post-Scripts"
 msgstr "Executing Post-Scripts"
 
-#: src/clients/inst_autoconfigure.rb:269
+#: src/clients/inst_autoconfigure.rb:268
 #, fuzzy
 #| msgid "Determine running services"
 msgid "Restarting all running services"
 msgstr "Determine running services"
 
-#: src/clients/inst_autoconfigure.rb:289
+#: src/clients/inst_autoconfigure.rb:288
 msgid "Activating systemd default target"
 msgstr ""
 
 #. Just in case, remove this file to avoid reconfiguring...
-#: src/clients/inst_autoconfigure.rb:302
+#: src/clients/inst_autoconfigure.rb:301
 msgid "Finishing Configuration"
 msgstr "Finishing Configuration"
 
 #. NetworkInterfaces::Write( ".*" );
-#: src/clients/inst_autoconfigure.rb:405
+#: src/clients/inst_autoconfigure.rb:404
 #, fuzzy
 msgid "Processing resource %1"
 msgstr "Reading resources..."
@@ -2484,13 +2478,13 @@
 #. @param [Hash{String => Object}] drive to create node name for
 #.
 #. @return the newly created node name
-#: src/modules/AutoinstDrive.rb:128
+#: src/modules/AutoinstDrive.rb:129
 #, fuzzy
 msgid " - Drive"
 msgstr "&Drive"
 
 #. volume group
-#: src/modules/AutoinstDrive.rb:132
+#: src/modules/AutoinstDrive.rb:133
 #, fuzzy
 msgid " - Volume group"
 msgstr " Volume Group "
@@ -2593,11 +2587,11 @@
 #. @return  [String] configuration summary dialog
 #. return Summary of configuration
 #. @return  [String] configuration summary dialog
-#: src/modules/AutoinstPartPlan.rb:681 src/modules/AutoinstStorage.rb:908
+#: src/modules/AutoinstPartPlan.rb:681 src/modules/AutoinstStorage.rb:912
 msgid "Drives"
 msgstr "Drives"
 
-#: src/modules/AutoinstPartPlan.rb:685 src/modules/AutoinstStorage.rb:912
+#: src/modules/AutoinstPartPlan.rb:685 src/modules/AutoinstStorage.rb:916
 #, fuzzy
 #| msgid "Total of %1 drive"
 #| msgid_plural "Total of %1 drives"
@@ -2805,29 +2799,29 @@
 msgstr "The package resolver run failed. Please check your software section in the autoyast profile."
 
 #. 1 cyl buffer per partition
-#: src/modules/AutoinstStorage.rb:491
+#: src/modules/AutoinstStorage.rb:494
 #, fuzzy
 msgid "The partition plan configured in your XML profile does not fit on the hard disk. %1MB missing"
 msgstr "The partition plan configured in your XML profile does not fit on the harddisk. %1MB missing"
 
-#: src/modules/AutoinstStorage.rb:918
+#: src/modules/AutoinstStorage.rb:922
 msgid "No specific device configured"
 msgstr "No specific device configured"
 
 #. Handle /etc/fstab usage
 #. @return [Boolean]
-#: src/modules/AutoinstStorage.rb:1013
+#: src/modules/AutoinstStorage.rb:1017
 msgid "Evaluating root partition. One moment please..."
 msgstr "Evaluating root partition. One moment please..."
 
 #. a popup
-#: src/modules/AutoinstStorage.rb:1021
+#: src/modules/AutoinstStorage.rb:1025
 msgid "No Linux root partition found."
 msgstr "No Linux root partition found."
 
 #. We must only change RootPart::selectedRootPartition if booting
 #. is inevitable.
-#: src/modules/AutoinstStorage.rb:1034
+#: src/modules/AutoinstStorage.rb:1038
 msgid ""
 "Multiple root partitions found, but you did not configure\n"
 "which root partition should be used.  Automatic installation not possible.\n"
@@ -2836,7 +2830,7 @@
 "which root partition should be used.  Automatic installation not possible.\n"
 
 #. return list of available devices
-#: src/modules/AutoinstStorage.rb:1116
+#: src/modules/AutoinstStorage.rb:1121
 msgid "device '%1' not found by storage backend"
 msgstr ""
 

Modified: trunk/yast/en_GB/po/base.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/base.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/base.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: base\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-08-07 13:28+0200\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:877
+#: library/packages/src/modules/PackageCallbacks.rb:887
 #: 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:2552
+#: library/packages/src/modules/PackageCallbacks.rb:2562
 msgid "&Password"
 msgstr "&Password"
 
@@ -1517,6 +1517,31 @@
 msgid "Failed to install required packages."
 msgstr "Failed to install required packages."
 
+#. TRANSLATORS: Popup message
+#: library/general/src/modules/Message.rb:265
+#, fuzzy
+#| msgid "Updating configuration..."
+msgid "Updating system configuration..."
+msgstr "Updating configuration..."
+
+#: library/general/src/modules/Message.rb:269
+#, fuzzy
+#| msgid "This may take a while"
+msgid "This may take a while."
+msgstr "This may take a while"
+
+#. Get information about the OS release
+#. Throws exception Yast::OSReleaseFileMissingError if release file
+#. is missing.
+#.
+#. @param [String] directory containing the installed system (/ in installed system)
+#. @return [String] the release information
+#: library/general/src/modules/OSRelease.rb:63
+#, fuzzy
+#| msgid "listen value to delete not found"
+msgid "Release file %{file} not found"
+msgstr "listen value to delete not found"
+
 #. Confirm user request to abort installation
 #: library/general/src/modules/Popup.rb:833
 msgid "Really abort the installation?"
@@ -2166,15 +2191,15 @@
 #. pppN must be tried before pN, modem before netcard
 #. Device type label
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:401
-#: library/network/src/modules/NetworkInterfaces.rb:1202
-#: library/network/src/modules/NetworkInterfaces.rb:1213
+#: library/network/src/modules/NetworkInterfaces.rb:405
+#: library/network/src/modules/NetworkInterfaces.rb:1206
+#: library/network/src/modules/NetworkInterfaces.rb:1217
 #: library/system/src/include/hwinfo/classnames.rb:108
 #: library/system/src/include/hwinfo/classnames.rb:198
 msgid "Modem"
 msgstr "Modem"
 
-#: library/network/src/modules/NetworkInterfaces.rb:406
+#: library/network/src/modules/NetworkInterfaces.rb:410
 msgid "Network Card"
 msgstr "Network Card"
 
@@ -2182,27 +2207,27 @@
 #. Device type label
 #. Device type label
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:411
-#: library/network/src/modules/NetworkInterfaces.rb:1147
-#: library/network/src/modules/NetworkInterfaces.rb:1185
-#: library/network/src/modules/NetworkInterfaces.rb:1191
-#: library/network/src/modules/NetworkInterfaces.rb:1206
+#: library/network/src/modules/NetworkInterfaces.rb:415
+#: library/network/src/modules/NetworkInterfaces.rb:1151
+#: library/network/src/modules/NetworkInterfaces.rb:1189
+#: library/network/src/modules/NetworkInterfaces.rb:1195
+#: library/network/src/modules/NetworkInterfaces.rb:1210
 msgid "ISDN"
 msgstr "ISDN"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:416
-#: library/network/src/modules/NetworkInterfaces.rb:1154
+#: library/network/src/modules/NetworkInterfaces.rb:420
+#: library/network/src/modules/NetworkInterfaces.rb:1158
 msgid "DSL"
 msgstr "DSL"
 
-#: library/network/src/modules/NetworkInterfaces.rb:418
+#: library/network/src/modules/NetworkInterfaces.rb:422
 #: library/packages/src/modules/SignatureCheckDialogs.rb:485
 #: library/packages/src/modules/SignatureCheckDialogs.rb:486
 #: library/packages/src/modules/SignatureCheckDialogs.rb:746
 #: library/packages/src/modules/SignatureCheckDialogs.rb:747
 #: library/packages/src/modules/SignatureCheckDialogs.rb:976
-#: library/packages/src/modules/SignatureCheckDialogs.rb:977
+#: library/packages/src/modules/SignatureCheckDialogs.rb:978
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -2212,331 +2237,331 @@
 #. are represented as its sub-interfaces.
 #. And also we frequently confuse "device" and "interface"
 #. :-(
-#: library/network/src/modules/NetworkInterfaces.rb:1123
+#: library/network/src/modules/NetworkInterfaces.rb:1127
 msgid "Additional Address"
 msgstr "Additional Address"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1128
+#: library/network/src/modules/NetworkInterfaces.rb:1132
 msgid "ARCnet"
 msgstr "ARCnet"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1128
+#: library/network/src/modules/NetworkInterfaces.rb:1132
 msgid "ARCnet Network Card"
 msgstr "ARCnet Network Card"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1131
+#: library/network/src/modules/NetworkInterfaces.rb:1135
 msgid "ATM"
 msgstr "ATM"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1132
+#: library/network/src/modules/NetworkInterfaces.rb:1136
 msgid "Asynchronous Transfer Mode (ATM)"
 msgstr "Asynchronous Transfer Mode (ATM)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1136
+#: library/network/src/modules/NetworkInterfaces.rb:1140
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1137
+#: library/network/src/modules/NetworkInterfaces.rb:1141
 msgid "Bluetooth Connection"
 msgstr "Bluetooth Connection"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1140
+#: library/network/src/modules/NetworkInterfaces.rb:1144
 msgid "Bond"
 msgstr "Bond"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1140
+#: library/network/src/modules/NetworkInterfaces.rb:1144
 msgid "Bond Network"
 msgstr "Bond Network"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1143
+#: library/network/src/modules/NetworkInterfaces.rb:1147
 msgid "CLAW"
 msgstr "CLAW"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1144
+#: library/network/src/modules/NetworkInterfaces.rb:1148
 msgid "Common Link Access for Workstation (CLAW)"
 msgstr "Common Link Access for Workstation (CLAW)"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1147
+#: library/network/src/modules/NetworkInterfaces.rb:1151
 msgid "ISDN Card"
 msgstr "ISDN Card"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1150
+#: library/network/src/modules/NetworkInterfaces.rb:1154
 #: library/system/src/include/hwinfo/classnames.rb:223
 msgid "CTC"
 msgstr "CTC"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1151
+#: library/network/src/modules/NetworkInterfaces.rb:1155
 msgid "Channel to Channel Interface (CTC)"
 msgstr "Channel to Channel Interface (CTC)"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1154
+#: library/network/src/modules/NetworkInterfaces.rb:1158
 msgid "DSL Connection"
 msgstr "DSL Connection"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1156
+#: library/network/src/modules/NetworkInterfaces.rb:1160
 msgid "Dummy"
 msgstr "Dummy"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1156
+#: library/network/src/modules/NetworkInterfaces.rb:1160
 msgid "Dummy Network Device"
 msgstr "Dummy Network Device"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1159
+#: library/network/src/modules/NetworkInterfaces.rb:1163
 #: library/system/src/include/hwinfo/classnames.rb:227
 msgid "ESCON"
 msgstr "ESCON"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1160
+#: library/network/src/modules/NetworkInterfaces.rb:1164
 msgid "Enterprise System Connector (ESCON)"
 msgstr "Enterprise System Connector (ESCON)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1164
+#: library/network/src/modules/NetworkInterfaces.rb:1168
 #: library/system/src/include/hwinfo/classnames.rb:220
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1165
+#: library/network/src/modules/NetworkInterfaces.rb:1169
 msgid "Ethernet Network Card"
 msgstr "Ethernet Network Card"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1168
+#: library/network/src/modules/NetworkInterfaces.rb:1172
 #: library/system/src/include/hwinfo/classnames.rb:222
 msgid "FDDI"
 msgstr "FDDI"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1168
+#: library/network/src/modules/NetworkInterfaces.rb:1172
 msgid "FDDI Network Card"
 msgstr "FDDI Network Card"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1171
+#: library/network/src/modules/NetworkInterfaces.rb:1175
 msgid "FICON"
 msgstr "FICON"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1172
+#: library/network/src/modules/NetworkInterfaces.rb:1176
 msgid "Fiberchannel System Connector (FICON)"
 msgstr "Fibrechannel System Connector (FICON)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1176
+#: library/network/src/modules/NetworkInterfaces.rb:1180
 msgid "HIPPI"
 msgstr "HIPPI"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1177
+#: library/network/src/modules/NetworkInterfaces.rb:1181
 msgid "HIgh Performance Parallel Interface (HIPPI)"
 msgstr "HIgh Performance Parallel Interface (HIPPI)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1181
+#: library/network/src/modules/NetworkInterfaces.rb:1185
 msgid "Hipersockets"
 msgstr "Hipersockets"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1182
+#: library/network/src/modules/NetworkInterfaces.rb:1186
 msgid "Hipersockets Interface (HSI)"
 msgstr "Hipersockets Interface (HSI)"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1185
-#: library/network/src/modules/NetworkInterfaces.rb:1191
-#: library/network/src/modules/NetworkInterfaces.rb:1206
+#: library/network/src/modules/NetworkInterfaces.rb:1189
+#: library/network/src/modules/NetworkInterfaces.rb:1195
+#: library/network/src/modules/NetworkInterfaces.rb:1210
 msgid "ISDN Connection"
 msgstr "ISDN Connection"
 
 #. Device type label
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1187
-#: library/network/src/modules/NetworkInterfaces.rb:1189
+#: library/network/src/modules/NetworkInterfaces.rb:1191
+#: library/network/src/modules/NetworkInterfaces.rb:1193
 msgid "IrDA"
 msgstr "IrDA"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1187
+#: library/network/src/modules/NetworkInterfaces.rb:1191
 msgid "Infrared Network Device"
 msgstr "Infrared Network Device"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1189
+#: library/network/src/modules/NetworkInterfaces.rb:1193
 msgid "Infrared Device"
 msgstr "Infrared Device"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1194
+#: library/network/src/modules/NetworkInterfaces.rb:1198
 #: library/system/src/include/hwinfo/classnames.rb:224
 msgid "IUCV"
 msgstr "IUCV"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1195
+#: library/network/src/modules/NetworkInterfaces.rb:1199
 msgid "Inter User Communication Vehicle (IUCV)"
 msgstr "Inter User Communication Vehicle (IUCV)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1198
+#: library/network/src/modules/NetworkInterfaces.rb:1202
 msgid "OSA LCS"
 msgstr "OSA LCS"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1198
+#: library/network/src/modules/NetworkInterfaces.rb:1202
 msgid "OSA LCS Network Card"
 msgstr "OSA LCS Network Card"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1200
+#: library/network/src/modules/NetworkInterfaces.rb:1204
 #: library/system/src/include/hwinfo/classnames.rb:219
 msgid "Loopback"
 msgstr "Loopback"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1200
+#: library/network/src/modules/NetworkInterfaces.rb:1204
 msgid "Loopback Device"
 msgstr "Loopback Device"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1204
+#: library/network/src/modules/NetworkInterfaces.rb:1208
 #: library/system/src/include/hwinfo/classnames.rb:228
 msgid "Myrinet"
 msgstr "Myrinet"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1204
+#: library/network/src/modules/NetworkInterfaces.rb:1208
 msgid "Myrinet Network Card"
 msgstr "Myrinet Network Card"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1209
+#: library/network/src/modules/NetworkInterfaces.rb:1213
 msgid "Parallel Line"
 msgstr "Parallel Line"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1210
+#: library/network/src/modules/NetworkInterfaces.rb:1214
 msgid "Parallel Line Connection"
 msgstr "Parallel Line Connection"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1216
+#: library/network/src/modules/NetworkInterfaces.rb:1220
 #: library/system/src/include/hwinfo/classnames.rb:226
 msgid "QETH"
 msgstr "QETH"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1217
+#: library/network/src/modules/NetworkInterfaces.rb:1221
 msgid "OSA-Express or QDIO Device (QETH)"
 msgstr "OSA-Express or QDIO Device (QETH)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1221
+#: library/network/src/modules/NetworkInterfaces.rb:1225
 msgid "IPv6-in-IPv4"
 msgstr "IPv6-in-IPv4"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1222
+#: library/network/src/modules/NetworkInterfaces.rb:1226
 msgid "IPv6-in-IPv4 Encapsulation Device"
 msgstr "IPv6-in-IPv4 Encapsulation Device"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1226
+#: library/network/src/modules/NetworkInterfaces.rb:1230
 msgid "Serial Line"
 msgstr "Serial Line"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1227
+#: library/network/src/modules/NetworkInterfaces.rb:1231
 msgid "Serial Line Connection"
 msgstr "Serial Line Connection"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1231
+#: library/network/src/modules/NetworkInterfaces.rb:1235
 msgid "Token Ring"
 msgstr "Token Ring"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1232
+#: library/network/src/modules/NetworkInterfaces.rb:1236
 msgid "Token Ring Network Card"
 msgstr "Token Ring Network Card"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1235
+#: library/network/src/modules/NetworkInterfaces.rb:1239
 msgid "USB"
 msgstr "USB"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1235
+#: library/network/src/modules/NetworkInterfaces.rb:1239
 msgid "USB Network Device"
 msgstr "USB Network Device"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1237
+#: library/network/src/modules/NetworkInterfaces.rb:1241
 msgid "VMWare"
 msgstr "VMWare"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1237
+#: library/network/src/modules/NetworkInterfaces.rb:1241
 msgid "VMWare Network Device"
 msgstr "VMWare Network Device"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1240
+#: library/network/src/modules/NetworkInterfaces.rb:1244
 msgid "Wireless"
 msgstr "Wireless"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1241
+#: library/network/src/modules/NetworkInterfaces.rb:1245
 msgid "Wireless Network Card"
 msgstr "Wireless Network Card"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1244
+#: library/network/src/modules/NetworkInterfaces.rb:1248
 msgid "XPNET"
 msgstr "XPNET"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1244
+#: library/network/src/modules/NetworkInterfaces.rb:1248
 msgid "XP Network"
 msgstr "XP Network"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1246
+#: library/network/src/modules/NetworkInterfaces.rb:1250
 msgid "VLAN"
 msgstr "VLAN"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1246
+#: library/network/src/modules/NetworkInterfaces.rb:1250
 msgid "Virtual LAN"
 msgstr "Virtual LAN"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1248
+#: library/network/src/modules/NetworkInterfaces.rb:1252
 #: library/system/src/include/hwinfo/classnames.rb:89
 #: library/system/src/include/hwinfo/classnames.rb:101
 msgid "Bridge"
 msgstr "Bridge"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1248
+#: library/network/src/modules/NetworkInterfaces.rb:1252
 #, fuzzy
 msgid "Network Bridge"
 msgstr "Network Card"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1250
+#: library/network/src/modules/NetworkInterfaces.rb:1254
 #, fuzzy
 msgid "TUN"
 msgstr "LUN"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1250
+#: library/network/src/modules/NetworkInterfaces.rb:1254
 #, fuzzy
 msgid "Network TUNnel"
 msgstr "Network Mode"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1252
+#: library/network/src/modules/NetworkInterfaces.rb:1256
 #, fuzzy
 msgid "TAP"
 msgstr "TCP"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1252
+#: library/network/src/modules/NetworkInterfaces.rb:1256
 #, fuzzy
 msgid "Network TAP"
 msgstr "Network Card"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1254
+#: library/network/src/modules/NetworkInterfaces.rb:1258
 #: library/system/src/include/hwinfo/classnames.rb:152
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1254
+#: library/network/src/modules/NetworkInterfaces.rb:1258
 #, fuzzy
 msgid "InfiniBand Device"
 msgstr "Infrared Device"
@@ -2600,7 +2625,7 @@
 msgstr "&Exported Directories"
 
 #. TRANSLATORS: pop-up question when reading the service configuration
-#: library/network/src/modules/NetworkService.rb:288
+#: library/network/src/modules/NetworkService.rb:281
 msgid ""
 "Your network interfaces are currently controlled by NetworkManager\n"
 "but the service to configure might not work well with it.\n"
@@ -2613,31 +2638,28 @@
 "Really continue?"
 
 #. If there is network running, return true.
-#. Otherwise show error popup depending on Mode and return false
+#. Otherwise show error popup depending on Stage and return false
 #. @return true if network running
-#: library/network/src/modules/NetworkService.rb:354
+#: library/network/src/modules/NetworkService.rb:349
 #, fuzzy
-#| msgid "No running network detected!"
-msgid "No running network detected."
-msgstr "No running network detected!"
-
-#: library/network/src/modules/NetworkService.rb:356
-msgid "Restart installation and configure network in Linuxrc"
+#| msgid "Restart installation and configure network in Linuxrc"
+msgid ""
+"No running network detected.\n"
+"Restart installation and configure network in Linuxrc\n"
+"or continue without network."
 msgstr "Restart installation and configure network in Linuxrc"
 
-#: library/network/src/modules/NetworkService.rb:357
+#: library/network/src/modules/NetworkService.rb:355
 #, fuzzy
 msgid ""
+"No running network detected.\n"
 "Configure network with YaST or Network Manager plug-in\n"
-"and start this module again"
+"and start this module again\n"
+"or continue without network."
 msgstr ""
 "Configure network with YaST or NetworkManager-plugin\n"
 "and start this module again"
 
-#: library/network/src/modules/NetworkService.rb:360
-msgid "or continue without network."
-msgstr "or continue without network."
-
 #. TRANSLATORS: popup informing message, allowed characters for port-names
 #: library/network/src/modules/PortAliases.rb:136
 msgid ""
@@ -2958,52 +2980,52 @@
 msgstr "&Uninstall"
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:203
-#: library/packages/src/modules/PackageCallbacks.rb:1715
+#: library/packages/src/modules/PackageCallbacks.rb:205
+#: library/packages/src/modules/PackageCallbacks.rb:1725
 msgid "Package: "
 msgstr "Package: "
 
-#: library/packages/src/modules/PackageCallbacks.rb:204
+#: library/packages/src/modules/PackageCallbacks.rb:206
 msgid "Size: "
 msgstr "Size: "
 
-#: library/packages/src/modules/PackageCallbacks.rb:227
+#: library/packages/src/modules/PackageCallbacks.rb:229
 msgid "Remaining time to automatic retry: %1"
 msgstr ""
 
 #. at start of file providal
-#: library/packages/src/modules/PackageCallbacks.rb:240
-#: library/packages/src/modules/PackageCallbacks.rb:248
+#: library/packages/src/modules/PackageCallbacks.rb:242
+#: library/packages/src/modules/PackageCallbacks.rb:250
 msgid "Downloading package %1 (%2)..."
 msgstr "Downloading package %1 (%2)..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:252
+#: library/packages/src/modules/PackageCallbacks.rb:254
 msgid "Downloading Package"
 msgstr "Downloading Package"
 
 #. check box
-#: library/packages/src/modules/PackageCallbacks.rb:310
+#: library/packages/src/modules/PackageCallbacks.rb:312
 msgid "Show &details"
 msgstr "Show &details"
 
 #. error message, %1 is a package name
-#: library/packages/src/modules/PackageCallbacks.rb:376
+#: library/packages/src/modules/PackageCallbacks.rb:378
 #, 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:389
-#: library/packages/src/modules/PackageCallbacks.rb:598
+#: library/packages/src/modules/PackageCallbacks.rb:391
+#: library/packages/src/modules/PackageCallbacks.rb:608
 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:397
-#: library/packages/src/modules/PackageCallbacks.rb:606
+#: library/packages/src/modules/PackageCallbacks.rb:399
+#: library/packages/src/modules/PackageCallbacks.rb:616
 msgid "Abort the installation?"
 msgstr "Abort the installation?"
 
@@ -3012,58 +3034,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:425
-#: library/packages/src/modules/PackageCallbacks.rb:459
-#: library/packages/src/modules/PackageCallbacks.rb:2481
+#: library/packages/src/modules/PackageCallbacks.rb:427
+#: library/packages/src/modules/PackageCallbacks.rb:461
+#: library/packages/src/modules/PackageCallbacks.rb:2491
 #, 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:482
+#: library/packages/src/modules/PackageCallbacks.rb:484
 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:522
+#: library/packages/src/modules/PackageCallbacks.rb:524
 msgid "Uninstalling package %1 (%2)..."
 msgstr "Uninstalling package %1 (%2)..."
 
-#: library/packages/src/modules/PackageCallbacks.rb:523
+#: library/packages/src/modules/PackageCallbacks.rb:525
 msgid "Installing package %1 (%2)..."
 msgstr "Installing package %1 (%2)..."
 
-#: library/packages/src/modules/PackageCallbacks.rb:530
+#: library/packages/src/modules/PackageCallbacks.rb:532
 msgid "Uninstalling Package"
 msgstr "Uninstalling Package"
 
-#: library/packages/src/modules/PackageCallbacks.rb:530
+#: library/packages/src/modules/PackageCallbacks.rb:532
 msgid "Installing Package"
 msgstr "Installing Package"
 
 #. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:583
+#: library/packages/src/modules/PackageCallbacks.rb:593
 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:585
+#: library/packages/src/modules/PackageCallbacks.rb:595
 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:657
+#: library/packages/src/modules/PackageCallbacks.rb:667
 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:780
+#: library/packages/src/modules/PackageCallbacks.rb:790
 #, fuzzy
 msgid ""
 "<p>The repository at the specified URL now provides a different media ID.\n"
@@ -3079,29 +3101,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:795
+#: library/packages/src/modules/PackageCallbacks.rb:805
 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:798
+#: library/packages/src/modules/PackageCallbacks.rb:808
 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:812
+#: library/packages/src/modules/PackageCallbacks.rb:822
 #, 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:814
+#: library/packages/src/modules/PackageCallbacks.rb:824
 #, 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:819
+#: library/packages/src/modules/PackageCallbacks.rb:829
 msgid ""
 "Insert\n"
 "'%1'"
@@ -3110,7 +3132,7 @@
 "'%1'"
 
 #. report error while accessing local directory with product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:824
+#: library/packages/src/modules/PackageCallbacks.rb:834
 #, fuzzy
 msgid ""
 "Cannot access installation media\n"
@@ -3123,7 +3145,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:836
+#: library/packages/src/modules/PackageCallbacks.rb:846
 #, fuzzy
 msgid ""
 "Cannot access installation media \n"
@@ -3136,61 +3158,61 @@
 "Check that the server is accessible."
 
 #. currently unused
-#: library/packages/src/modules/PackageCallbacks.rb:848
+#: library/packages/src/modules/PackageCallbacks.rb:858
 #, 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:869
-#: library/packages/src/modules/PackageCallbacks.rb:2158
+#: library/packages/src/modules/PackageCallbacks.rb:879
+#: library/packages/src/modules/PackageCallbacks.rb:2168
 #, 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:892
-#: library/packages/src/modules/PackageCallbacks.rb:897
+#: library/packages/src/modules/PackageCallbacks.rb:902
+#: library/packages/src/modules/PackageCallbacks.rb:907
 msgid "&Eject"
 msgstr "&Eject"
 
-#: library/packages/src/modules/PackageCallbacks.rb:909
+#: library/packages/src/modules/PackageCallbacks.rb:919
 #, 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:977
+#: library/packages/src/modules/PackageCallbacks.rb:987
 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:985
+#: library/packages/src/modules/PackageCallbacks.rb:995
 msgid "Skip the medium?"
 msgstr "Skip the medium?"
 
 #. otherwise ignore the medium
-#: library/packages/src/modules/PackageCallbacks.rb:992
+#: library/packages/src/modules/PackageCallbacks.rb:1002
 msgid "Ignoring the bad medium..."
 msgstr "Ignoring the bad medium..."
 
 #. TextEntry label
 #. TextEntry label
-#: library/packages/src/modules/PackageCallbacks.rb:1013
-#: library/packages/src/modules/PackageCallbacks.rb:1074
+#: library/packages/src/modules/PackageCallbacks.rb:1023
+#: library/packages/src/modules/PackageCallbacks.rb:1084
 msgid "&URL"
 msgstr "&URL"
 
 #. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1321
+#: library/packages/src/modules/PackageCallbacks.rb:1331
 #, fuzzy
 msgid "Creating Repository %1"
 msgstr "Probing repository "
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1354
+#: library/packages/src/modules/PackageCallbacks.rb:1364
 #, fuzzy
 msgid "An error occurred while creating the repository."
 msgstr "Error occurred while reading the log."
@@ -3198,9 +3220,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:1358
-#: library/packages/src/modules/PackageCallbacks.rb:1489
-#: library/packages/src/modules/PackageCallbacks.rb:1601
+#: library/packages/src/modules/PackageCallbacks.rb:1368
+#: library/packages/src/modules/PackageCallbacks.rb:1499
+#: library/packages/src/modules/PackageCallbacks.rb:1611
 #, fuzzy
 msgid "Unable to retrieve the remote repository description."
 msgstr "Unable to retrieve the remote source description."
@@ -3208,24 +3230,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:1361
-#: library/packages/src/modules/PackageCallbacks.rb:1492
-#: library/packages/src/modules/PackageCallbacks.rb:1604
+#: library/packages/src/modules/PackageCallbacks.rb:1371
+#: library/packages/src/modules/PackageCallbacks.rb:1502
+#: library/packages/src/modules/PackageCallbacks.rb:1614
 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:1364
-#: library/packages/src/modules/PackageCallbacks.rb:1495
-#: library/packages/src/modules/PackageCallbacks.rb:1607
+#: library/packages/src/modules/PackageCallbacks.rb:1374
+#: library/packages/src/modules/PackageCallbacks.rb:1505
+#: library/packages/src/modules/PackageCallbacks.rb:1617
 #, 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:1367
+#: library/packages/src/modules/PackageCallbacks.rb:1377
 #, fuzzy
 msgid "The repository metadata is invalid."
 msgstr "The host name is invalid."
@@ -3234,113 +3256,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:1380
-#: library/packages/src/modules/PackageCallbacks.rb:1514
-#: library/packages/src/modules/PackageCallbacks.rb:1620
-#: library/packages/src/modules/PackageCallbacks.rb:2435
+#: 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
 #, fuzzy
 msgid "Retry?"
 msgstr "Retry"
 
 #. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1428
-#: library/packages/src/modules/PackageCallbacks.rb:1436
+#: library/packages/src/modules/PackageCallbacks.rb:1438
+#: library/packages/src/modules/PackageCallbacks.rb:1446
 #, fuzzy
 msgid "Probing Repository %1"
 msgstr "Probing repository "
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1485
+#: library/packages/src/modules/PackageCallbacks.rb:1495
 #, 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:1498
+#: library/packages/src/modules/PackageCallbacks.rb:1508
 #, fuzzy
 msgid "Repository probing details."
 msgstr "Repository Configuration"
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1501
+#: library/packages/src/modules/PackageCallbacks.rb:1511
 #, 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:1597
+#: library/packages/src/modules/PackageCallbacks.rb:1607
 #, fuzzy
 msgid "Repository %1"
 msgstr "Repository: "
 
 #. at start of delta providal
-#: library/packages/src/modules/PackageCallbacks.rb:1685
+#: library/packages/src/modules/PackageCallbacks.rb:1695
 #, fuzzy
 msgid "Downloading delta RPM package %1 (%2)..."
 msgstr "Downloading package %1 (%2)..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1693
+#: library/packages/src/modules/PackageCallbacks.rb:1703
 #, fuzzy
 msgid "Downloading Delta RPM package"
 msgstr "Downloading delta RPM %1"
 
 #. at start of delta application
-#: library/packages/src/modules/PackageCallbacks.rb:1706
+#: library/packages/src/modules/PackageCallbacks.rb:1716
 #, fuzzy
 msgid "Applying delta RPM package %1..."
 msgstr "Applying delta RPM: %1"
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1713
+#: library/packages/src/modules/PackageCallbacks.rb:1723
 #, fuzzy
 msgid "Applying delta RPM package"
 msgstr "Applying delta RPM: %1"
 
 #. at start of patch providal
-#: library/packages/src/modules/PackageCallbacks.rb:1734
+#: library/packages/src/modules/PackageCallbacks.rb:1744
 #, fuzzy
 msgid "Downloading patch RPM package %1 (%2)..."
 msgstr "Downloading package %1 (%2)..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1742
+#: library/packages/src/modules/PackageCallbacks.rb:1752
 #, fuzzy
 msgid "Downloading Patch RPM Package"
 msgstr "Downloading patch RPM %1"
 
 #. close popup
-#: library/packages/src/modules/PackageCallbacks.rb:1812
+#: library/packages/src/modules/PackageCallbacks.rb:1822
 #, fuzzy
 msgid "Starting script %1 (patch %2)..."
 msgstr "Starting script %1"
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1821
+#: library/packages/src/modules/PackageCallbacks.rb:1831
 #, fuzzy
 msgid "Running Script"
 msgstr "Running scripts..."
 
 #. label, patch name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1826
+#: library/packages/src/modules/PackageCallbacks.rb:1836
 #, fuzzy
 msgid "Patch: "
 msgstr "Patch"
 
 #. label, script name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1833
+#: library/packages/src/modules/PackageCallbacks.rb:1843
 #, fuzzy
 msgid "Script: "
 msgstr "Script"
 
 #. label
-#: library/packages/src/modules/PackageCallbacks.rb:1839
+#: library/packages/src/modules/PackageCallbacks.rb:1849
 #, 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:1927
+#: library/packages/src/modules/PackageCallbacks.rb:1937
 #, fuzzy
 msgid ""
 "Patch: %1\n"
@@ -3350,7 +3372,7 @@
 "\n"
 
 #. a popup question with "Continue", "Skip" and "Abort" buttons
-#: library/packages/src/modules/PackageCallbacks.rb:1944
+#: library/packages/src/modules/PackageCallbacks.rb:1954
 msgid ""
 "The repositories are being refreshed.\n"
 "Continue with refreshing?\n"
@@ -3360,45 +3382,45 @@
 msgstr ""
 
 #. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:1959
+#: library/packages/src/modules/PackageCallbacks.rb:1969
 msgid "&Skip Refresh"
 msgstr "&Skip Refresh"
 
 #. heading of popup
 #. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1993
-#: library/packages/src/modules/PackageCallbacks.rb:2035
+#: library/packages/src/modules/PackageCallbacks.rb:2003
+#: library/packages/src/modules/PackageCallbacks.rb:2045
 #, 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:2043
-#: library/packages/src/modules/PackageCallbacks.rb:2091
+#: library/packages/src/modules/PackageCallbacks.rb:2053
+#: library/packages/src/modules/PackageCallbacks.rb:2101
 msgid "Downloading: %1"
 msgstr "Downloading: %1"
 
 #. heading of popup
 #. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:2196
-#: library/packages/src/modules/PackageCallbacks.rb:2271
+#: library/packages/src/modules/PackageCallbacks.rb:2206
+#: library/packages/src/modules/PackageCallbacks.rb:2281
 msgid "Checking Package Database"
 msgstr "Checking Package Database"
 
 #. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:2199
+#: library/packages/src/modules/PackageCallbacks.rb:2209
 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:2204
-#: library/packages/src/modules/PackageCallbacks.rb:2287
+#: library/packages/src/modules/PackageCallbacks.rb:2214
+#: library/packages/src/modules/PackageCallbacks.rb:2297
 msgid "Status"
 msgstr "Status"
 
 #. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:2237
+#: library/packages/src/modules/PackageCallbacks.rb:2247
 msgid ""
 "Rebuilding of package database failed:\n"
 "%1"
@@ -3407,12 +3429,12 @@
 "%1"
 
 #. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:2274
+#: library/packages/src/modules/PackageCallbacks.rb:2284
 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:2313
+#: library/packages/src/modules/PackageCallbacks.rb:2323
 msgid ""
 "Conversion of package database failed:\n"
 "%1"
@@ -3421,13 +3443,13 @@
 "%1"
 
 #. progress message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2353
+#: library/packages/src/modules/PackageCallbacks.rb:2363
 #, fuzzy
 msgid "Reading RPM database..."
 msgstr "Reading the database..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:2363
+#: library/packages/src/modules/PackageCallbacks.rb:2373
 #, fuzzy
 msgid "Reading Installed Packages"
 msgstr "Verify Installed Packages"
@@ -3439,30 +3461,30 @@
 #. `Label(""),
 #. `PushButton(`id(`abort), Label::AbortButton())
 #. )
-#: library/packages/src/modules/PackageCallbacks.rb:2369
-#: library/packages/src/modules/PackageCallbacks.rb:2385
+#: library/packages/src/modules/PackageCallbacks.rb:2379
+#: library/packages/src/modules/PackageCallbacks.rb:2395
 #, fuzzy
 msgid "Scanning RPM database..."
 msgstr "Writing SCPM database..."
 
 #. error message, could not read RPM database
-#: library/packages/src/modules/PackageCallbacks.rb:2424
+#: library/packages/src/modules/PackageCallbacks.rb:2434
 #, fuzzy
 msgid "Initialization of the target failed."
 msgstr "Initialising the target directory failed"
 
 #. status message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2515
+#: library/packages/src/modules/PackageCallbacks.rb:2525
 #, fuzzy
 msgid "RPM database read"
 msgstr "MySQL database admin"
 
 #. heading in a popup window
-#: library/packages/src/modules/PackageCallbacks.rb:2534
+#: library/packages/src/modules/PackageCallbacks.rb:2544
 msgid "User Authentication"
 msgstr "User Authentication"
 
-#: library/packages/src/modules/PackageCallbacks.rb:2540
+#: library/packages/src/modules/PackageCallbacks.rb:2550
 #, fuzzy
 msgid ""
 "URL: %1\n"
@@ -3471,7 +3493,7 @@
 msgstr "URL: %1"
 
 #. textentry label
-#: library/packages/src/modules/PackageCallbacks.rb:2549
+#: library/packages/src/modules/PackageCallbacks.rb:2559
 msgid "&User Name"
 msgstr "&User Name"
 
@@ -3545,44 +3567,20 @@
 msgid "Do you accept this license agreement?"
 msgstr "Do you accept this licence agreement?"
 
-#. display an error message and advice to manually fix the system
-#: library/packages/src/modules/PackageSystem.rb:236
-msgid ""
-"The current system is not consistent,\n"
-"some packages have unresolved dependencies."
-msgstr ""
-
-#: library/packages/src/modules/PackageSystem.rb:243
-msgid "Automatic resolving failed, manual dependency resolving is needed."
-msgstr ""
-
-#: library/packages/src/modules/PackageSystem.rb:252
-msgid ""
-"Yast has automatically added or removed some packages,\n"
-"check the changes scheduled to fix the system\n"
-"in the software manager."
-msgstr ""
-
-#: library/packages/src/modules/PackageSystem.rb:263
-msgid ""
-"Start the software manager and fix the problems\n"
-"or skip fixing and install the already confirmed packages only?"
-msgstr ""
-
 #. error message, after pressing [OK] the package manager is displayed
-#: library/packages/src/modules/PackageSystem.rb:325
+#: library/packages/src/modules/PackageSystem.rb:223
 msgid ""
 "There are unresolved dependencies which need\n"
 "to be solved manually in the software manager."
 msgstr ""
 
 #. error report
-#: library/packages/src/modules/PackageSystem.rb:520
+#: library/packages/src/modules/PackageSystem.rb:415
 msgid "Installing required packages failed."
 msgstr "Installing required packages failed."
 
 #. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:524
+#: library/packages/src/modules/PackageSystem.rb:419
 msgid ""
 "Installing required packages failed. If you continue\n"
 "without installing required packages,\n"
@@ -3593,12 +3591,12 @@
 "YaST may not work properly.\n"
 
 #. error report
-#: library/packages/src/modules/PackageSystem.rb:535
+#: library/packages/src/modules/PackageSystem.rb:430
 msgid "Cannot continue without installing required packages."
 msgstr "Cannot continue without installing required packages."
 
 #. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:540
+#: library/packages/src/modules/PackageSystem.rb:435
 msgid ""
 "If you continue without installing required \n"
 "packages, YaST may not work properly.\n"
@@ -3737,7 +3735,7 @@
 
 #. Table headings for CD statistics during installation
 #: library/packages/src/modules/PackagesUI.rb:552
-#: library/packages/src/modules/SlideShow.rb:548
+#: library/packages/src/modules/SlideShow.rb:545
 msgid "Packages"
 msgstr "Packages"
 
@@ -4186,7 +4184,7 @@
 msgstr ""
 
 #. popup message - label, part 2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:981
+#: library/packages/src/modules/SignatureCheckDialogs.rb:982
 #, fuzzy
 #| msgid ""
 #| "The GnuPG key %1\n"
@@ -4211,17 +4209,17 @@
 "the key really belongs to that owner before importing it."
 
 #. warning label - the key to import is expired
-#: library/packages/src/modules/SignatureCheckDialogs.rb:993
+#: library/packages/src/modules/SignatureCheckDialogs.rb:994
 msgid "WARNING: The key has expired!"
 msgstr ""
 
 #. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1019
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1020
 msgid "Import Untrusted GnuPG Key"
 msgstr "Import Untrusted GnuPG Key"
 
 #. push button
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1035
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1036
 #, fuzzy
 #| msgid "Trust"
 msgid "&Trust"
@@ -4229,7 +4227,7 @@
 
 #. popup question, %1 stands for the filename, %2 is expected checksum
 #. %3 is the current checksum (e.g. "803a8ff00d00c9075a1bd223a480bcf92d2481c1")
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1112
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1113
 #, fuzzy
 msgid ""
 "The expected checksum of file %1\n"
@@ -4252,13 +4250,13 @@
 "Use it anyway?"
 
 #. dialog heading - displayed in a big bold font
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1129
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1130
 #, fuzzy
 msgid "Wrong Digest"
 msgstr "Warnings"
 
 #. popup question, %1 stands for the filename, %2 is expected digest, %3 is the current digest
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1148
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1149
 #, fuzzy
 msgid ""
 "The checksum of file %1\n"
@@ -4277,87 +4275,95 @@
 "Use it anyway?"
 
 #. dialog heading - displayed in a big bold font
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1162
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1163
 #, fuzzy
 msgid "Unknown Digest"
 msgstr "Unknown file system"
 
 #. we need to remember the values for tab switching
+#. these are the initial values
 #. Return the description for the current stage.
 #. @return [String]	localized string description
 #. translators: default global progress bar label
-#: library/packages/src/modules/SlideShow.rb:145
-#: library/packages/src/modules/SlideShow.rb:146
-#: library/packages/src/modules/SlideShow.rb:319
-#: library/packages/src/modules/SlideShow.rb:340
+#: library/packages/src/modules/SlideShow.rb:151
+#: library/packages/src/modules/SlideShow.rb:152
+#: library/packages/src/modules/SlideShow.rb:326
+#: library/packages/src/modules/SlideShow.rb:347
 #, fuzzy
 msgid "Installing..."
 msgstr "Installing driver..."
 
 #. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:544
+#: library/packages/src/modules/SlideShow.rb:541
 msgid "Media"
 msgstr "Media"
 
 #. Table headings for CD statistics during installation - keep as short as possible!
-#: library/packages/src/modules/SlideShow.rb:546
+#: library/packages/src/modules/SlideShow.rb:543
 #, fuzzy
 msgid "Remaining"
 msgstr "Removing Packages..."
 
 #. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:550
+#: library/packages/src/modules/SlideShow.rb:547
 msgid "Time"
 msgstr "Time"
 
 #. Construct widgets for the "details" page
 #.
 #. @return	A term describing the widgets
-#: library/packages/src/modules/SlideShow.rb:566
+#: library/packages/src/modules/SlideShow.rb:563
 #, fuzzy
 msgid "Actions performed:"
 msgstr "Actions Allowed for Users:\n"
 
 #. Help text while software packages are being installed (displayed only in rare cases)
-#: library/packages/src/modules/SlideShow.rb:650
+#: library/packages/src/modules/SlideShow.rb:647
 #, fuzzy
 msgid "<p>Packages are being installed.</p>"
 msgstr "<p>Please wait while packages are installed.</p>"
 
-#: library/packages/src/modules/SlideShow.rb:651
+#: library/packages/src/modules/SlideShow.rb:648
 msgid "<P><B>Aborting Installation</B> Package installation can be aborted using the <B>Abort</B> button. However, the system then can be in an inconsistent or unusable state or it may not boot if the basic system component is not installed.</P>"
 msgstr ""
 
 #. Translators: Tab name, keep short, %s is product name, e.g. SLES
-#: library/packages/src/modules/SlideShow.rb:669
+#: library/packages/src/modules/SlideShow.rb:666
 #, fuzzy
 msgid "%s Release Notes"
 msgstr "Release Notes"
 
 #. tab
-#: library/packages/src/modules/SlideShow.rb:681
+#: library/packages/src/modules/SlideShow.rb:678
 msgid "Slide Sho&w"
 msgstr "Slide Sho&w"
 
 #. tab
-#: library/packages/src/modules/SlideShow.rb:683
+#: library/packages/src/modules/SlideShow.rb:680
 msgid "&Details"
 msgstr "&Details"
 
-#. Dialog heading while software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:721
+#. Dialog heading - software packages are being upgraded
+#: library/packages/src/modules/SlideShow.rb:719
 #, fuzzy
+#| msgid "Perform Update"
+msgid "Performing Upgrade"
+msgstr "Perform Update"
+
+#. Dialog heading - software packages are being installed
+#: library/packages/src/modules/SlideShow.rb:722
+#, fuzzy
 #| msgid "Perform Installation"
 msgid "Performing Installation"
 msgstr "Perform Installation"
 
 #. Dialog heading while software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:757
+#: library/packages/src/modules/SlideShow.rb:759
 msgid "Package Installation"
 msgstr "Package Installation"
 
 #. popup yes-no
-#: library/packages/src/modules/SlideShow.rb:833
+#: library/packages/src/modules/SlideShow.rb:835
 msgid ""
 "Do you really want\n"
 "to quit the installation?"
@@ -4366,17 +4372,17 @@
 "to quit the installation?"
 
 #. Mode::update (), Stage::cont ()
-#: library/packages/src/modules/SlideShow.rb:845
+#: library/packages/src/modules/SlideShow.rb:847
 msgid "Aborted"
 msgstr "Aborted"
 
 #. read file content
-#: library/system/src/clients/view_anymsg.rb:185
+#: library/system/src/clients/view_anymsg.rb:187
 msgid "File not found."
-msgstr ""
+msgstr "File not found."
 
 #. Fill the LogView with file content
-#: library/system/src/clients/view_anymsg.rb:191
+#: library/system/src/clients/view_anymsg.rb:199
 msgid "System Log (%1)"
 msgstr "System Log (%1)"
 
@@ -4993,7 +4999,7 @@
 msgstr "An error occurred during initrd creation."
 
 #. inform the user that he/she has to reboot to activate new kernel
-#: library/system/src/modules/Kernel.rb:648
+#: library/system/src/modules/Kernel.rb:659
 msgid ""
 "Reboot your system\n"
 "to activate the new kernel.\n"
@@ -5111,7 +5117,7 @@
 #. KiloByte abbreviated
 #: library/types/src/modules/String.rb:146
 msgid "KiB"
-msgstr ""
+msgstr "KiB"
 
 #. MegaByte abbreviated
 #: library/types/src/modules/String.rb:148
@@ -6028,6 +6034,14 @@
 "Hostname %2 cannot be added."
 
 #, fuzzy
+#~| msgid "No running network detected!"
+#~ msgid "No running network detected."
+#~ msgstr "No running network detected!"
+
+#~ msgid "or continue without network."
+#~ msgstr "or continue without network."
+
+#, fuzzy
 #~ msgid "Installed Size"
 #~ msgstr "Installed Size:"
 

Modified: trunk/yast/en_GB/po/bootloader.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/bootloader.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/bootloader.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: bootloader\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-30 10:10+0200\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"
@@ -125,22 +125,22 @@
 msgstr "The system will reboot now..."
 
 #. warning text in the summary richtext
-#: src/clients/bootloader_proposal.rb:108
+#: src/clients/bootloader_proposal.rb:116
 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:118
+#: src/clients/bootloader_proposal.rb:126
 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:217
+#: src/clients/bootloader_proposal.rb:225
 msgid "Booting"
 msgstr "Booting"
 
 #. menubutton entry
-#: src/clients/bootloader_proposal.rb:219
+#: src/clients/bootloader_proposal.rb:227
 msgid "&Booting"
 msgstr "&Booting"
 
@@ -149,12 +149,12 @@
 #. 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:212
+#: 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:221
+#: src/include/bootloader/grub2/dialogs.rb:230
 #, fuzzy
 msgid "Disk order settings"
 msgstr "Filter settings"
@@ -166,10 +166,9 @@
 msgstr "Boot Menu"
 
 #. `VSpacing(1),
-#. Run dialog for loader installation details for Grub2
-#. @return [Symbol] for wizard sequencer
+#. Window title
 #: src/include/bootloader/grub/dialogs.rb:106
-#: src/include/bootloader/grub2/dialogs.rb:134
+#: src/include/bootloader/grub2/dialogs.rb:143
 msgid "Boot Loader Options"
 msgstr "Boot Loader Options"
 
@@ -289,18 +288,24 @@
 "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:60
+#: src/include/bootloader/grub/helps.rb:59
+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
 #, 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:63
+#: src/include/bootloader/grub/helps.rb:65
 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:66
+#: src/include/bootloader/grub/helps.rb:68
 #, fuzzy
 msgid ""
 "<p><b>Use Serial Console</b> lets you define the parameters to use\n"
@@ -309,7 +314,7 @@
 "<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:69
+#: src/include/bootloader/grub/helps.rb:71
 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"
@@ -323,7 +328,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:76
+#: src/include/bootloader/grub/helps.rb:78
 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>"
@@ -331,20 +336,20 @@
 "<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:79
+#: src/include/bootloader/grub/helps.rb:81
 #, 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:82
+#: 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:85
+#: 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:88
+#: src/include/bootloader/grub/helps.rb:90
 #, fuzzy
 msgid ""
 "<p><b>Protect Boot Loader with Password</b><br>\n"
@@ -356,7 +361,7 @@
 "it in <b>Retype Password</b>.</p>"
 
 #. help text 1/5
-#: src/include/bootloader/grub/helps.rb:95
+#: src/include/bootloader/grub/helps.rb:97
 #, fuzzy
 msgid ""
 "<p><big><b>Disks Order</b></big><br>\n"
@@ -369,82 +374,82 @@
 "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:106
+#: src/include/bootloader/grub/helps.rb:108
 msgid "Boot Loader Locations"
 msgstr "Boot Loader Locations"
 
-#: src/include/bootloader/grub/helps.rb:107
+#: src/include/bootloader/grub/helps.rb:109
 #, 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:110
+#: src/include/bootloader/grub/helps.rb:112
 #: src/include/bootloader/routines/common_helps.rb:29
 #, fuzzy
 msgid "&Timeout in Seconds"
 msgstr "Timeout in Seconds"
 
-#: src/include/bootloader/grub/helps.rb:111
+#: src/include/bootloader/grub/helps.rb:113
 #, fuzzy
 msgid "&Default Boot Section"
 msgstr "Default Boot Section"
 
-#: src/include/bootloader/grub/helps.rb:112
+#: src/include/bootloader/grub/helps.rb:114
 #, fuzzy
 msgid "Write &generic Boot Code to MBR"
 msgstr "Write generic Boot Code to MBR"
 
-#: src/include/bootloader/grub/helps.rb:113
+#: src/include/bootloader/grub/helps.rb:115
 msgid "Use &Trusted Grub"
 msgstr ""
 
-#: src/include/bootloader/grub/helps.rb:114
+#: src/include/bootloader/grub/helps.rb:116
 msgid "Custom Boot Partition"
 msgstr "Custom Boot Partition"
 
-#: src/include/bootloader/grub/helps.rb:115
+#: src/include/bootloader/grub/helps.rb:117
 msgid "Boot from Master Boot Record"
 msgstr "Boot from Master Boot Record"
 
-#: src/include/bootloader/grub/helps.rb:116
+#: src/include/bootloader/grub/helps.rb:118
 msgid "Boot from Root Partition"
 msgstr "Boot from Root Partition"
 
-#: src/include/bootloader/grub/helps.rb:117
+#: src/include/bootloader/grub/helps.rb:119
 msgid "Boot from Boot Partition"
 msgstr "Boot from Boot Partition"
 
-#: src/include/bootloader/grub/helps.rb:118
+#: src/include/bootloader/grub/helps.rb:120
 #, fuzzy
 msgid "Boot from Extended Partition"
 msgstr "Boot from Root Partition"
 
-#: src/include/bootloader/grub/helps.rb:119
+#: src/include/bootloader/grub/helps.rb:121
 #, fuzzy
 msgid "Serial Connection &Parameters"
 msgstr "Serial Connection Parameters"
 
-#: src/include/bootloader/grub/helps.rb:120
+#: src/include/bootloader/grub/helps.rb:122
 #, fuzzy
 msgid "Fallback Sections if Default fails"
 msgstr "Fallback Sections if default Fails"
 
-#: src/include/bootloader/grub/helps.rb:121
+#: src/include/bootloader/grub/helps.rb:123
 #, fuzzy
 msgid "&Hide Menu on Boot"
 msgstr "Hide Menu on Boot"
 
-#: src/include/bootloader/grub/helps.rb:122
+#: src/include/bootloader/grub/helps.rb:124
 #, fuzzy
 msgid "Graphical &Menu File"
 msgstr "Graphical Menu File"
 
-#: src/include/bootloader/grub/helps.rb:123
+#: 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:124
+#: src/include/bootloader/grub/helps.rb:126
 #, fuzzy
 msgid "Debugg&ing Flag"
 msgstr "Debugging Flag"
@@ -499,130 +504,130 @@
 #. Common widget of a console
 #. @return [Hash{String => Object}] CWS widget
 #: src/include/bootloader/grub/options.rb:359
-#: src/include/bootloader/grub2/options.rb:269
+#: 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:276
+#: src/include/bootloader/grub2/options.rb:302
 #, fuzzy
 msgid "&Console arguments"
 msgstr "invalid arguments"
 
 #. textentry header
-#: src/include/bootloader/grub/options.rb:453
+#: src/include/bootloader/grub/options.rb:455
 msgid "&Device"
 msgstr "&Device"
 
 #. disabling & enabling up/down
-#: src/include/bootloader/grub/options.rb:542
+#: 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:551
+#: src/include/bootloader/grub/options.rb:553
 msgid "D&isks"
 msgstr "D&isks"
 
-#: src/include/bootloader/grub/options.rb:563
+#: src/include/bootloader/grub/options.rb:565
 msgid "&Up"
 msgstr "&Up"
 
-#: src/include/bootloader/grub/options.rb:564
+#: 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:739
-#: src/include/bootloader/grub/options.rb:768
-#: src/include/bootloader/grub/options.rb:803
-msgid "Boot Loader Location"
-msgstr "Boot Loader Location"
-
-#: src/include/bootloader/grub/options.rb:745
-#: src/include/bootloader/grub/options.rb:774
-#: src/include/bootloader/grub/options.rb:809
+#: src/include/bootloader/grub/options.rb:740
 #, fuzzy
-msgid "Boot from &Master Boot Record"
-msgstr "Boot from Master Boot Record"
-
-#: src/include/bootloader/grub/options.rb:748
-#, fuzzy
 msgid "Boot from &Root Partition"
 msgstr "Boot from Root Partition"
 
-#: src/include/bootloader/grub/options.rb:749
+#: src/include/bootloader/grub/options.rb:741
 #, fuzzy
 msgid "Boo&t from Boot Partition"
 msgstr "Boot from Boot Partition"
 
-#: src/include/bootloader/grub/options.rb:754
+#: src/include/bootloader/grub/options.rb:749
+#: src/include/bootloader/grub/options.rb:776
+#: src/include/bootloader/grub/options.rb:811
+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
 #, fuzzy
+msgid "Boot from &Master Boot Record"
+msgstr "Boot from Master Boot Record"
+
+#: src/include/bootloader/grub/options.rb:762
+#, fuzzy
 msgid "Boot from &Extended Partition"
 msgstr "Boot from Root Partition"
 
-#: src/include/bootloader/grub/options.rb:780
-#: src/include/bootloader/grub/options.rb:821
+#: 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:814
+#: src/include/bootloader/grub/options.rb:822
 msgid "Enable Red&undancy for MD Array"
 msgstr ""
 
 #. push button
 #. push button
-#: src/include/bootloader/grub/options.rb:873
+#: 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"
 
-#. Cache for genericWidgets function
-#: src/include/bootloader/grub2/dialogs.rb:52
+#. Title in tab
+#: src/include/bootloader/grub2/dialogs.rb:57
 #, fuzzy
 #| msgid "Boot Loader Options"
 msgid "Boot Code Options"
 msgstr "Boot Loader Options"
 
-#. there is no graphic adapter on s390 (bnc#874010)
-#: src/include/bootloader/grub2/dialogs.rb:75
+#. Title in tab
+#: src/include/bootloader/grub2/dialogs.rb:82
 #, fuzzy
 #| msgid "Other Kernel &Parameters"
 msgid "Kernel Parameters"
 msgstr "Other Kernel &Parameters"
 
-#. there is no os prober on s390(bnc#868909)
-#: src/include/bootloader/grub2/dialogs.rb:94
+#. Title in tab
+#: src/include/bootloader/grub2/dialogs.rb:102
 #, fuzzy
 #| msgid "Boot Loader Options"
 msgid "Bootloader Options"
 msgstr "Boot Loader Options"
 
-#: src/include/bootloader/grub2/dialogs.rb:174
+#: src/include/bootloader/grub2/dialogs.rb:183
 #, fuzzy
 #| msgid "Secure"
 msgid "Secure Boot"
 msgstr "Secure"
 
-#: src/include/bootloader/grub2/dialogs.rb:180
+#: src/include/bootloader/grub2/dialogs.rb:189
 #, fuzzy
 #| msgid "Enable &Quota Support"
 msgid "Enable &Secure Boot Support"
 msgstr "Enable &Quota Support"
 
 #. TRANSLATORS: place where boot code is installed
-#: src/include/bootloader/grub2/dialogs.rb:253
+#: src/include/bootloader/grub2/dialogs.rb:262
 #, fuzzy
 #| msgid "Boot Loader Location"
 msgid "Boot &Loader Location"
 msgstr "Boot Loader Location"
 
 #. help text
-#: src/include/bootloader/grub2/dialogs.rb:272
+#: src/include/bootloader/grub2/dialogs.rb:281
 msgid "Choose partition where is boot sequence installed."
 msgstr ""
 
@@ -661,27 +666,45 @@
 msgid "<p><b>Probe Foreign OS</b> by means of os-prober for multiboot with other foreign distribution </p>"
 msgstr ""
 
+#: src/include/bootloader/grub2/helps.rb:35
+msgid "<p><b>Protective MBR flag</b> is expert only settings, that is needed only on exotic hardware. For details see Protective MBR in GPT disks. Do not touch if you are not sure.</p>"
+msgstr ""
+
 #: src/include/bootloader/grub2/helps.rb:38
+msgid "<p><b>Distributor</b> specifies name of distributor of kernel used to create boot entry name. </p>"
+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"
 
-#: src/include/bootloader/grub2/helps.rb:39
+#: src/include/bootloader/grub2/helps.rb:45
+#, fuzzy
+#| msgid "Distribution:"
+msgid "D&istributor"
+msgstr "Distribution:"
+
+#: src/include/bootloader/grub2/helps.rb:46
 #: src/include/bootloader/routines/section_helps.rb:98
 #, fuzzy
 msgid "&Vga Mode"
 msgstr "Vga Mode"
 
-#: src/include/bootloader/grub2/helps.rb:40
+#: src/include/bootloader/grub2/helps.rb:47
 #, fuzzy
 msgid "&Failsafe Kernel Command Line Parameter"
 msgstr "Optional Kernel Command Line Parameter"
 
-#: src/include/bootloader/grub2/helps.rb:41
+#: src/include/bootloader/grub2/helps.rb:48
 msgid "Probe Foreign OS"
 msgstr ""
 
+#: src/include/bootloader/grub2/helps.rb:49
+msgid "Protective MBR flag"
+msgstr ""
+
 #. combo box item
 #. %1 is X resolution (width) in pixels
 #. %2 is Y resolution (height) in pixels
@@ -717,9 +740,30 @@
 msgid "Unspecified"
 msgstr "&Unspecified"
 
+#. TRANSLATORS: set flag on disk
+#: src/include/bootloader/grub2/options.rb:102
+#, fuzzy
+#| msgid "[set]"
+msgid "set"
+msgstr "[set]"
+
+#. TRANSLATORS: remove flag from disk
+#: src/include/bootloader/grub2/options.rb:104
+#, fuzzy
+#| msgid "_remove"
+msgid "remove"
+msgstr "_remove"
+
+#. TRANSLATORS: do not change flag on disk
+#: src/include/bootloader/grub2/options.rb:106
+#, fuzzy
+#| msgid "Do not change name"
+msgid "do not change"
+msgstr "Do not change name"
+
 #. Init function for console
 #. @param [String] widget
-#: src/include/bootloader/grub2/options.rb:148
+#: src/include/bootloader/grub2/options.rb:174
 #, fuzzy
 #| msgid "Autodetected card"
 msgid "Autodetect by grub2"
@@ -727,27 +771,32 @@
 
 #. FATE: #110038: Serial console
 #. add or remove console key with value for sections
-#: src/include/bootloader/grub2/options.rb:223
+#: src/include/bootloader/grub2/options.rb:249
 #, fuzzy
 msgid "Choose new graphical theme file"
 msgstr "Graphical Menu File"
 
-#: src/include/bootloader/grub2/options.rb:235
+#: src/include/bootloader/grub2/options.rb:261
 #, fuzzy
 msgid "Use &graphical console"
 msgstr "Serial Console"
 
-#: src/include/bootloader/grub2/options.rb:242
+#: src/include/bootloader/grub2/options.rb:268
 #, fuzzy
 #| msgid "Conflict Resolution:"
 msgid "&Console resolution"
 msgstr "Conflict Resolution:"
 
-#: src/include/bootloader/grub2/options.rb:250
+#: src/include/bootloader/grub2/options.rb:276
 #, fuzzy
 msgid "&Console theme"
 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
+msgid "Unsupported bootloader '%s'. Adapt your AutoYaST profile accordingly."
+msgstr ""
+
 #. file open popup caption
 #. file open popup caption
 #. file open popup caption
@@ -761,7 +810,7 @@
 #. 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:269
+#: src/include/bootloader/routines/dialogs.rb:90 src/modules/Bootloader.rb:270
 msgid "The boot partition is of type NFS. Bootloader cannot be installed."
 msgstr "The boot partition is of type NFS. Bootloader cannot be installed."
 
@@ -893,11 +942,7 @@
 msgid "Xen"
 msgstr ""
 
-#. entry of bootloader menu - only a-z, A-Z, 0-9, _ and blank space
-#. are allowed, otherwise translartion won't be used
-#. try to keep short, may be shortened due to bootloader limitations
 #: src/include/bootloader/routines/global_widgets.rb:152
-#: src/modules/GfxMenu.rb:91
 msgid "Floppy"
 msgstr "Floppy"
 
@@ -1939,39 +1984,40 @@
 #.
 #.
 #. FIXME identical code in BootGRUB module
-#: src/modules/BootGRUB.rb:657 src/modules/BootGRUB2.rb:167
+#: src/modules/BootGRUB.rb:657 src/modules/BootGRUB2.rb:189
 #, 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:171
+#: src/modules/BootGRUB.rb:661 src/modules/BootGRUB2.rb:193
 #, 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:183
+#: src/modules/BootGRUB.rb:673 src/modules/BootGRUB2.rb:206
 #, 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:187
+#: src/modules/BootGRUB.rb:677 src/modules/BootGRUB2.rb:210
 #, 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:193
+#: src/modules/BootGRUB.rb:683 src/modules/BootGRUB2.rb:216
 #, 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:197
+#: src/modules/BootGRUB.rb:687 src/modules/BootGRUB2.rb:220
 #, 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>)"
 
-#: src/modules/BootGRUB.rb:695 src/modules/BootGRUB2.rb:205
+#. TRANSLATORS: title for list of location proposals
+#: src/modules/BootGRUB.rb:695 src/modules/BootGRUB2.rb:238
 #, fuzzy
 msgid "Change Location: %s"
 msgstr "Location: %1"
@@ -1981,31 +2027,33 @@
 #. @return a list of summary lines
 #. Display bootloader summary
 #. @return a list of summary lines
-#: src/modules/BootGRUB.rb:708 src/modules/BootGRUB2.rb:215
-#: src/modules/BootGRUB2EFI.rb:68
+#: src/modules/BootGRUB.rb:708 src/modules/BootGRUB2.rb:248
+#: src/modules/BootGRUB2EFI.rb:94
 msgid "Boot Loader Type: %1"
 msgstr "Boot Loader Type: %1"
 
 #. summary text, location is location description (eg. /dev/hda)
-#: src/modules/BootGRUB.rb:718 src/modules/BootGRUB2.rb:224
+#: src/modules/BootGRUB.rb:718
 msgid " (\"/boot\")"
 msgstr ""
 
-#: src/modules/BootGRUB.rb:724 src/modules/BootGRUB2.rb:230
+#. TRANSLATORS: extended is here for extended partition. Keep translation short.
+#: src/modules/BootGRUB.rb:724 src/modules/BootGRUB2.rb:259
 msgid " (extended)"
 msgstr ""
 
-#: src/modules/BootGRUB.rb:730 src/modules/BootGRUB2.rb:236
+#: src/modules/BootGRUB.rb:730
 msgid " (\"/\")"
 msgstr ""
 
-#: src/modules/BootGRUB.rb:736 src/modules/BootGRUB2.rb:242
+#. 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
 msgid " (MBR)"
 msgstr ""
 
 #. FIXME: should we translate all devices to names and add MBR suffixes?
-#. FIXME: should we translate all devices to names and add MBR suffixes?
-#: src/modules/BootGRUB.rb:750 src/modules/BootGRUB2.rb:256
+#: src/modules/BootGRUB.rb:750 src/modules/BootGRUB2.rb:274
 #, fuzzy
 msgid "Status Location: %1"
 msgstr "Location: %1"
@@ -2029,241 +2077,183 @@
 msgid "Propose and &Merge with Existing GRUB Menus"
 msgstr "Propose and &Merge with Existing GRUB Menus"
 
-#: src/modules/BootGRUB2EFI.rb:76
+#. 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
 #, fuzzy
 #| msgid "Enable &GSS Security"
 msgid "Enable Secure Boot: %1"
 msgstr "Enable &GSS Security"
 
 #. Check that bootloader is known and supported
-#: src/modules/BootSupportCheck.rb:68
+#: src/modules/BootSupportCheck.rb:70
 #, fuzzy
 msgid "Unknown bootloader: %1"
 msgstr "Unknown Model: %1"
 
 #. grub2 is sooo cool...
-#: src/modules/BootSupportCheck.rb:99
+#: src/modules/BootSupportCheck.rb:101
 msgid "Unsupported combination of hardware platform %1 and bootloader %2"
 msgstr ""
 
 #. TODO add more devices
-#: src/modules/BootSupportCheck.rb:126
+#: src/modules/BootSupportCheck.rb:128
 msgid "Partition number > 3 is being used for booting with GPT partition table"
 msgstr ""
 
-#. if "iscsi" is true
-#: src/modules/BootSupportCheck.rb:166
-#, fuzzy
-msgid "The boot device is on iSCSI disk: %1. System may not boot."
-msgstr "No boot device was found"
+#. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation.
+#: src/modules/BootSupportCheck.rb:153
+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 ""
 
-#: src/modules/BootSupportCheck.rb:184
+#. check if boot device is on raid0
+#: src/modules/BootSupportCheck.rb:181
 #, 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:204
+#: src/modules/BootSupportCheck.rb:201
 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:259
-msgid "It was not possible to determine the exact order of disks for device map. The order of disks can be changed in \"Boot Loader Installation Details\""
+#: 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 ""
 
-#: src/modules/BootSupportCheck.rb:278
+#. if partitioning worked before upgrade, it will keep working (bnc#886604)
+#: src/modules/BootSupportCheck.rb:276
 msgid "Missing ext partition for booting. Cannot install boot code."
 msgstr ""
 
 #. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:169
+#: src/modules/Bootloader.rb:170
 msgid "Check boot loader"
 msgstr "Check boot loader"
 
 #. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:171
+#: src/modules/Bootloader.rb:172
 msgid "Read partitioning"
 msgstr "Read partitioning"
 
 #. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:173
+#: src/modules/Bootloader.rb:174
 msgid "Load boot loader settings"
 msgstr "Load boot loader settings"
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:177
+#: src/modules/Bootloader.rb:178
 msgid "Checking boot loader..."
 msgstr "Checking boot loader..."
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:179
+#: src/modules/Bootloader.rb:180
 msgid "Reading partitioning..."
 msgstr "Reading partitioning..."
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:181
+#: src/modules/Bootloader.rb:182
 msgid "Loading boot loader settings..."
 msgstr "Loading boot loader settings..."
 
 #. dialog header
-#: src/modules/Bootloader.rb:185
+#: src/modules/Bootloader.rb:186
 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:306
+#: 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:366
+#: src/modules/Bootloader.rb:367
 msgid "Create initrd"
 msgstr "Create initrd"
 
 #. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:368
+#: src/modules/Bootloader.rb:369
 msgid "Save boot loader configuration files"
 msgstr "Save boot loader configuration files"
 
 #. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:370
+#: src/modules/Bootloader.rb:371
 msgid "Install boot loader"
 msgstr "Install boot loader"
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:374
+#: src/modules/Bootloader.rb:375
 msgid "Creating initrd..."
 msgstr "Creating initrd..."
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:376
+#: src/modules/Bootloader.rb:377
 msgid "Saving boot loader configuration files..."
 msgstr "Saving boot loader configuration files..."
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:378
+#: src/modules/Bootloader.rb:379
 msgid "Installing boot loader..."
 msgstr "Installing boot loader..."
 
 #. progress line
-#: src/modules/Bootloader.rb:384
+#: src/modules/Bootloader.rb:385
 msgid "Saving Boot Loader Configuration"
 msgstr "Saving Boot Loader Configuration"
 
-#. entry of bootloader menu - only a-z, A-Z, 0-9, _ and blank space
-#. are allowed, otherwise translartion won't be used
-#. try to keep short, may be shortened due to bootloader limitations
-#: src/modules/GfxMenu.rb:79
-msgid "Linux"
-msgstr "Linux"
+#, fuzzy
+#~ msgid "The boot device is on iSCSI disk: %1. System may not boot."
+#~ msgstr "No boot device was found"
 
-#. entry of bootloader menu - only a-z, A-Z, 0-9, _ and blank space
-#. are allowed, otherwise translartion won't be used
-#. try to keep short, may be shortened due to bootloader limitations
-#: src/modules/GfxMenu.rb:85
-msgid "Failsafe"
-msgstr "Failsafe"
+#~ msgid "Linux"
+#~ msgstr "Linux"
 
-#. entry of bootloader menu - only a-z, A-Z, 0-9, _ and blank space
-#. are allowed, otherwise translartion won't be used
-#. try to keep short, may be shortened due to bootloader limitations
-#: src/modules/GfxMenu.rb:97
-msgid "Hard Disk"
-msgstr "Hard Disk"
+#~ msgid "Failsafe"
+#~ msgstr "Failsafe"
 
-#. entry of bootloader menu - only a-z, A-Z, 0-9, _ and blank space
-#. are allowed, otherwise translartion won't be used
-#. try to keep short, may be shortened due to bootloader limitations
-#: src/modules/GfxMenu.rb:103
-msgid "Memory Test"
-msgstr "Memory Test"
+#~ msgid "Hard Disk"
+#~ msgstr "Hard Disk"
 
-#. entry of bootloader menu - only a-z, A-Z, 0-9, _ and blank space
-#. are allowed, otherwise translartion won't be used
-#. try to keep short, may be shortened due to bootloader limitations
-#: src/modules/GfxMenu.rb:109
-msgid "MBR before Installation"
-msgstr "MBR before Installation"
+#~ msgid "Memory Test"
+#~ msgstr "Memory Test"
 
-#. entry of bootloader menu - only a-z, A-Z, 0-9, _ and blank space
-#. are allowed, otherwise translartion won't be used
-#. try to keep short, may be shortened due to bootloader limitations
-#: src/modules/GfxMenu.rb:115
-msgid "Previous Kernel"
-msgstr "Previous Kernel"
+#~ msgid "MBR before Installation"
+#~ msgstr "MBR before Installation"
 
-#. entry of bootloader menu - only a-z, A-Z, 0-9, _ and blank space
-#. are allowed, otherwise translartion won't be used
-#. try to keep short, may be shortened due to bootloader limitations
-#: src/modules/GfxMenu.rb:121
-msgid "Vendor Diagnostics"
-msgstr "Vendor Diagnostics"
+#~ msgid "Previous Kernel"
+#~ msgstr "Previous Kernel"
 
-#. entry of bootloader menu - only ISO 8859-1, -2 and -15 characters
-#. are allowed. Always remove the leading '_', its just to
-#. be able to have translations with and without diacritics
-#. please use diacritics here
-#: src/modules/GfxMenu.rb:230
-msgid "_Linux"
-msgstr "_Linux"
+#~ msgid "Vendor Diagnostics"
+#~ msgstr "Vendor Diagnostics"
 
-#. entry of bootloader menu - only ISO 8859-1, -2 and -15 characters
-#. are allowed. Always remove the leading '_', its just to
-#. be able to have translations with and without diacritics
-#. please use diacritics here
-#: src/modules/GfxMenu.rb:237
-msgid "_Failsafe"
-msgstr "_Failsafe"
+#~ msgid "_Linux"
+#~ msgstr "_Linux"
 
-#. entry of bootloader menu - only ISO 8859-1, -2 and -15 characters
-#. are allowed. Always remove the leading '_', its just to
-#. be able to have translations with and without diacritics
-#. please use diacritics here
-#: src/modules/GfxMenu.rb:244
-msgid "_Floppy"
-msgstr "_Floppy"
+#~ msgid "_Failsafe"
+#~ msgstr "_Failsafe"
 
-#. entry of bootloader menu - only ISO 8859-1, -2 and -15 characters
-#. are allowed. Always remove the leading '_', its just to
-#. be able to have translations with and without diacritics
-#. please use diacritics here
-#: src/modules/GfxMenu.rb:251
-msgid "_Hard Disk"
-msgstr "_Hard Disk"
+#~ msgid "_Floppy"
+#~ msgstr "_Floppy"
 
-#. entry of bootloader menu - only ISO 8859-1, -2 and -15 characters
-#. are allowed. Always remove the leading '_', its just to
-#. be able to have translations with and without diacritics
-#. please use diacritics here
-#: src/modules/GfxMenu.rb:258
-msgid "_Memory Test"
-msgstr "_Memory Test"
+#~ msgid "_Hard Disk"
+#~ msgstr "_Hard Disk"
 
-#. entry of bootloader menu - only ISO 8859-1, -2 and -15 characters
-#. are allowed. Always remove the leading '_', its just to
-#. be able to have translations with and without diacritics
-#. please use diacritics here
-#: src/modules/GfxMenu.rb:265
-msgid "_MBR before Installation"
-msgstr "_MBR before Installation"
+#~ msgid "_Memory Test"
+#~ msgstr "_Memory Test"
 
-#. entry of bootloader menu - only ISO 8859-1, -2 and -15 characters
-#. are allowed. Always remove the leading '_', its just to
-#. be able to have translations with and without diacritics
-#. please use diacritics here
-#: src/modules/GfxMenu.rb:272
-msgid "_Previous Kernel"
-msgstr "_Previous Kernel"
+#~ msgid "_MBR before Installation"
+#~ msgstr "_MBR before Installation"
 
-#. entry of bootloader menu - only ISO 8859-1, -2 and -15 characters
-#. are allowed. Always remove the leading '_', its just to
-#. be able to have translations with and without diacritics
-#. please use diacritics here
-#: src/modules/GfxMenu.rb:279
-msgid "_Vendor Diagnostics"
-msgstr "_Vendor Diagnostics"
+#~ msgid "_Previous Kernel"
+#~ msgstr "_Previous Kernel"
 
+#~ msgid "_Vendor Diagnostics"
+#~ msgstr "_Vendor Diagnostics"
+
 #, fuzzy
 #~ msgid ""
 #~ "Configure a valid boot loader location before continuing.<br/>\n"

Modified: trunk/yast/en_GB/po/ca-management.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/ca-management.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/ca-management.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: ca-management\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\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"
@@ -59,25 +59,25 @@
 msgstr "Organizational unit"
 
 #: src/clients/ca_mgm.rb:73 src/clients/ca_mgm_auto.rb:870
-#: src/include/ca-management/certificate.rb:442
+#: src/include/ca-management/certificate.rb:456
 #: src/include/ca-management/request.rb:321
 msgid "Organization"
 msgstr "Organization"
 
 #: src/clients/ca_mgm.rb:74 src/clients/ca_mgm_auto.rb:884
-#: src/include/ca-management/certificate.rb:444
+#: src/include/ca-management/certificate.rb:458
 #: src/include/ca-management/request.rb:323
 msgid "Locality"
 msgstr "Locality"
 
 #: src/clients/ca_mgm.rb:75 src/clients/ca_mgm_auto.rb:889
-#: src/include/ca-management/certificate.rb:445
+#: src/include/ca-management/certificate.rb:459
 #: src/include/ca-management/request.rb:324
 msgid "State"
 msgstr "State"
 
 #: src/clients/ca_mgm.rb:76 src/clients/ca_mgm_auto.rb:865
-#: src/include/ca-management/certificate.rb:446
+#: src/include/ca-management/certificate.rb:460
 #: src/include/ca-management/request.rb:325
 msgid "Country"
 msgstr "Country"
@@ -269,7 +269,7 @@
 msgstr "CA Name"
 
 #. To translators: table headers
-#: src/clients/ca_mgm_auto.rb:851 src/include/ca-management/certificate.rb:440
+#: src/clients/ca_mgm_auto.rb:851 src/include/ca-management/certificate.rb:454
 #: src/include/ca-management/request.rb:319
 msgid "Common Name"
 msgstr "Common Name"
@@ -285,7 +285,7 @@
 msgid "Email"
 msgstr "Email"
 
-#: src/clients/ca_mgm_auto.rb:875 src/include/ca-management/certificate.rb:443
+#: src/clients/ca_mgm_auto.rb:875 src/include/ca-management/certificate.rb:457
 #: src/include/ca-management/request.rb:322
 msgid "Organizational Unit"
 msgstr "Organizational Unit"
@@ -607,7 +607,7 @@
 #. To translators: ContinueCancel Popup headline
 #. we need to fake a certificate name
 #: src/clients/ca_select_proposal.rb:364
-#: src/include/ca-management/certificate.rb:571
+#: src/include/ca-management/certificate.rb:585
 #: src/include/ca-management/new_cert_callbacks.rb:523
 #: src/include/ca-management/new_cert_callbacks.rb:958
 #: src/include/ca-management/request.rb:429
@@ -654,7 +654,7 @@
 #. The main ()
 #. To translators: dialog label
 #. To translators: ContinueCancel Popup headline
-#: src/clients/common_cert.rb:56 src/clients/common_cert.rb:174
+#: src/clients/common_cert.rb:56 src/clients/common_cert.rb:175
 #: src/include/ca-management/util.rb:1313
 msgid "Common Server Certificate"
 msgstr "Common Server Certificate"
@@ -701,11 +701,20 @@
 msgid "<p>For more information, please read the manual.</p>"
 msgstr "<p>For a list of <b>Options</b> please read the manpage mount(8).</p>"
 
+#. popup text
+#: src/clients/common_cert.rb:154
+#, fuzzy
+#| msgid "<p>This certificate can be exchanged by importing a certificate from a file.</p>"
+msgid ""
+"<pre>Common Server Certificate not found.\n"
+"You can import a certificate from disk</pre>"
+msgstr "<p>This certificate can be exchanged by importing a certificate from a file.</p>"
+
 #. popup window header
 #. popup window header
 #. popup window header
 #. popup window header
-#: src/clients/common_cert.rb:159 src/include/ca-management/ca.rb:141
+#: src/clients/common_cert.rb:160 src/include/ca-management/ca.rb:141
 #: src/include/ca-management/certificate.rb:264
 #: src/include/ca-management/crl.rb:166
 #: src/include/ca-management/request.rb:238
@@ -713,33 +722,33 @@
 msgstr "Description"
 
 #. push button label
-#: src/clients/common_cert.rb:166
+#: src/clients/common_cert.rb:167
 msgid "&Remove"
 msgstr "&Remove"
 
 #. push button label
-#: src/clients/common_cert.rb:168
+#: src/clients/common_cert.rb:169
 #, fuzzy
 #| msgid "&Replace"
 msgid "&Import/Replace"
 msgstr "&Replace"
 
 #. To translators: warning popup yes/no question (1/3)
-#: src/clients/common_cert.rb:208
+#: src/clients/common_cert.rb:209
 #, fuzzy
 #| msgid "CA certificate does not exist."
 msgid "The certificate is not yet expired.\n"
 msgstr "CA certificate does not exist."
 
 #. To translators: warning popup yes/no question (2/3)
-#: src/clients/common_cert.rb:210
+#: src/clients/common_cert.rb:211
 msgid ""
 "Please make sure, that no service use this certificate anymore.\n"
 "\n"
 msgstr ""
 
 #. To translators: warning popup yes/no question (3/3)
-#: src/clients/common_cert.rb:214
+#: src/clients/common_cert.rb:215
 #, fuzzy
 #| msgid "Are you sure you want to delete the profile "
 msgid "Are you sure, that you want to remove the certificate?"
@@ -774,11 +783,69 @@
 msgid "<p><b>Issued For:</b></p>"
 msgstr "<p><b>Issued For:</b></p>"
 
-#: src/include/ca-management/ca.rb:214
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/ca.rb:187 src/include/ca-management/ca.rb:224
+#, fuzzy
+#| msgid "Common Name: "
+msgid ""
+"\n"
+"Common Name:  "
+msgstr "Common Name: "
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/ca.rb:192 src/include/ca-management/ca.rb:229
+#, fuzzy
+#| msgid "O&rganization:"
+msgid ""
+"\n"
+"Organization: "
+msgstr "O&rganization:"
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/ca.rb:197 src/include/ca-management/ca.rb:234
+#, fuzzy
+#| msgid "Location:"
+msgid ""
+"\n"
+"Location:     "
+msgstr "Location:"
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/ca.rb:202 src/include/ca-management/ca.rb:239
+#, fuzzy
+#| msgid "State:                    "
+msgid ""
+"\n"
+"State:        "
+msgstr "State:                    "
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/ca.rb:207 src/include/ca-management/ca.rb:244
+#, fuzzy
+#| msgid "Country: "
+msgid ""
+"\n"
+"Country:      "
+msgstr "Country: "
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/ca.rb:212 src/include/ca-management/ca.rb:249
+msgid ""
+"\n"
+"EMAIL:        "
+msgstr ""
+
+#: src/include/ca-management/ca.rb:220
 msgid "<p><b>Issued By:</b></p>"
 msgstr "<p><b>Issued By:</b></p>"
 
-#: src/include/ca-management/ca.rb:244
+#: src/include/ca-management/ca.rb:256
 msgid ""
 "\n"
 "Valid from: "
@@ -786,7 +853,7 @@
 "\n"
 "Valid from: "
 
-#: src/include/ca-management/ca.rb:248
+#: src/include/ca-management/ca.rb:260
 msgid ""
 "\n"
 "Valid to: "
@@ -795,35 +862,35 @@
 "Valid to: "
 
 #. To translators: pushbutton label
-#: src/include/ca-management/ca.rb:271
+#: src/include/ca-management/ca.rb:283
 msgid "&Advanced..."
 msgstr "&Advanced..."
 
-#: src/include/ca-management/ca.rb:273
-#: src/include/ca-management/certificate.rb:462
+#: src/include/ca-management/ca.rb:285
+#: src/include/ca-management/certificate.rb:476
 #: src/include/ca-management/crl.rb:261
 #: src/include/ca-management/request.rb:350
 msgid "&View"
 msgstr "&View"
 
-#: src/include/ca-management/ca.rb:274
+#: src/include/ca-management/ca.rb:286
 #, fuzzy
 msgid "&Change CA Password"
 msgstr "Enter CA Password"
 
-#: src/include/ca-management/ca.rb:275
+#: src/include/ca-management/ca.rb:287
 msgid "C&reate SubCA"
 msgstr "C&reate SubCA"
 
-#: src/include/ca-management/ca.rb:276
+#: src/include/ca-management/ca.rb:288
 msgid "Export to &File"
 msgstr "Export to &File"
 
-#: src/include/ca-management/ca.rb:277
+#: src/include/ca-management/ca.rb:289
 msgid "Export to &LDAP"
 msgstr "Export to &LDAP"
 
-#: src/include/ca-management/ca.rb:278
+#: src/include/ca-management/ca.rb:290
 msgid "&Edit Default"
 msgstr "&Edit Default"
 
@@ -877,7 +944,7 @@
 
 #: src/include/ca-management/certDefault.rb:145
 #: src/include/ca-management/new_cert.rb:731
-#: src/include/ca-management/signRequest.rb:774
+#: src/include/ca-management/signRequest.rb:786
 msgid "<p><b>Summary</b></p>"
 msgstr "<p><b>Summary</b></p>"
 
@@ -909,18 +976,18 @@
 #: src/include/ca-management/new_cert.rb:1256
 #: src/include/ca-management/new_cert.rb:1265
 #: src/include/ca-management/new_cert.rb:1274
-#: src/include/ca-management/signRequest.rb:815
-#: src/include/ca-management/signRequest.rb:826
-#: src/include/ca-management/signRequest.rb:929
-#: src/include/ca-management/signRequest.rb:938
-#: src/include/ca-management/signRequest.rb:947
-#: src/include/ca-management/signRequest.rb:1036
-#: src/include/ca-management/signRequest.rb:1045
+#: src/include/ca-management/signRequest.rb:827
+#: src/include/ca-management/signRequest.rb:838
+#: src/include/ca-management/signRequest.rb:941
+#: src/include/ca-management/signRequest.rb:950
+#: src/include/ca-management/signRequest.rb:959
+#: src/include/ca-management/signRequest.rb:1048
 #: src/include/ca-management/signRequest.rb:1057
-#: src/include/ca-management/signRequest.rb:1184
-#: src/include/ca-management/signRequest.rb:1193
-#: src/include/ca-management/signRequest.rb:1202
-#: src/include/ca-management/signRequest.rb:1211
+#: src/include/ca-management/signRequest.rb:1069
+#: src/include/ca-management/signRequest.rb:1196
+#: src/include/ca-management/signRequest.rb:1205
+#: src/include/ca-management/signRequest.rb:1214
+#: src/include/ca-management/signRequest.rb:1223
 msgid " (critical)\n"
 msgstr " (critical)\n"
 
@@ -932,40 +999,40 @@
 #: src/include/ca-management/certDefault.rb:462
 #: src/include/ca-management/new_cert.rb:861
 #: src/include/ca-management/new_cert.rb:1147
-#: src/include/ca-management/signRequest.rb:954
-#: src/include/ca-management/signRequest.rb:994
+#: src/include/ca-management/signRequest.rb:966
+#: src/include/ca-management/signRequest.rb:1006
 msgid "(critical) "
 msgstr "(critical) "
 
 #: src/include/ca-management/certDefault.rb:182
 #: src/include/ca-management/new_cert.rb:866
 #: src/include/ca-management/new_cert_items.rb:266
-#: src/include/ca-management/signRequest.rb:999
+#: src/include/ca-management/signRequest.rb:1011
 msgid "Copy Subject Alt Name from CA"
 msgstr "Copy Subject Alt Name from CA"
 
 #: src/include/ca-management/certDefault.rb:224
 #: src/include/ca-management/new_cert.rb:908
-#: src/include/ca-management/signRequest.rb:1070
+#: src/include/ca-management/signRequest.rb:1082
 msgid "(critical)\n"
 msgstr "(critical)\n"
 
 #: src/include/ca-management/certDefault.rb:336
 #: src/include/ca-management/new_cert.rb:1020
-#: src/include/ca-management/signRequest.rb:812
+#: src/include/ca-management/signRequest.rb:824
 msgid "nsComment:                "
 msgstr "nsComment:                "
 
 #: src/include/ca-management/certDefault.rb:350
 #: src/include/ca-management/new_cert.rb:1034
-#: src/include/ca-management/signRequest.rb:825
+#: src/include/ca-management/signRequest.rb:837
 msgid "nsCertType:               "
 msgstr "nsCertType:               "
 
 #: src/include/ca-management/certDefault.rb:467
 #: src/include/ca-management/new_cert.rb:1152
 #: src/include/ca-management/new_cert_items.rb:522
-#: src/include/ca-management/signRequest.rb:959
+#: src/include/ca-management/signRequest.rb:971
 msgid "Copy Standard E-Mail Address"
 msgstr "Copy Standard E-Mail Address"
 
@@ -1041,84 +1108,228 @@
 "\n"
 "Certificate not found"
 
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:302
+#: src/include/ca-management/signRequest.rb:65
+#, fuzzy
+#| msgid "Common Name:              "
+msgid ""
+"\n"
+"Common Name:        "
+msgstr "Common Name:              "
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:307
+#: src/include/ca-management/signRequest.rb:80
+#, fuzzy
+#| msgid "Organization:             "
+msgid ""
+"\n"
+"Organization:       "
+msgstr "Organization:             "
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:312
+#: src/include/ca-management/signRequest.rb:85
+#, fuzzy
+#| msgid "Organization:             "
+msgid ""
+"\n"
+"Location:           "
+msgstr "Organization:             "
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:317
+#: src/include/ca-management/signRequest.rb:90
+#, fuzzy
+#| msgid "State:                    "
+msgid ""
+"\n"
+"State:              "
+msgstr "State:                    "
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:322
+#: src/include/ca-management/signRequest.rb:95
+#, fuzzy
+#| msgid "Country:                  "
+msgid ""
+"\n"
+"Country:            "
+msgstr "Country:                  "
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:327
+#: src/include/ca-management/signRequest.rb:100
+#, fuzzy
+#| msgid "        Type        "
+msgid ""
+"\n"
+"EMAIL:              "
+msgstr "        Type        "
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:333
+#: src/include/ca-management/signRequest.rb:107
+#, fuzzy
+#| msgid "        Type        "
+msgid ""
+"\n"
+"Is CA:              "
+msgstr "        Type        "
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:338
+#: src/include/ca-management/signRequest.rb:112
+#, fuzzy
+#| msgid "Key Length:               "
+msgid ""
+"\n"
+"Key Size:           "
+msgstr "Key Length:               "
+
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:343
+#, fuzzy
+#| msgid "Serial number of zone update"
+msgid ""
+"\n"
+"Serialnumber:       "
+msgstr "Serial number of zone update"
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:348
+#: src/include/ca-management/signRequest.rb:117
+#, fuzzy
+#| msgid "Valid Period:             "
+msgid ""
+"\n"
+"Version:            "
+msgstr "Valid Period:             "
+
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:353
+#, fuzzy
+#| msgid "Valid Period:             "
+msgid ""
+"\n"
+"Valid from:         "
+msgstr "Valid Period:             "
+
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:358
+#, fuzzy
+#| msgid "Valid Period:             "
+msgid ""
+"\n"
+"Valid to:           "
+msgstr "Valid Period:             "
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:363
+#: src/include/ca-management/signRequest.rb:122
+msgid ""
+"\n"
+"algo. of pub. Key : "
+msgstr ""
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:368
+#: src/include/ca-management/signRequest.rb:127
+msgid ""
+"\n"
+"algo. of signature: "
+msgstr ""
+
 #. Certificate status displayed in a table (Valid, Revoked, Expired)
 #. Initialize the tab of the dialog
-#: src/include/ca-management/certificate.rb:389
-#: src/include/ca-management/certificate.rb:518
+#: src/include/ca-management/certificate.rb:403
+#: src/include/ca-management/certificate.rb:532
 msgid "Valid"
 msgstr "Valid"
 
 #. Certificate status displayed in a table (Valid, Revoked, Expired)
-#: src/include/ca-management/certificate.rb:392
+#: src/include/ca-management/certificate.rb:406
 msgid "Revoked"
 msgstr "Revoked"
 
 #. Certificate status displayed in a table (Valid, Revoked, Expired)
-#: src/include/ca-management/certificate.rb:396
+#: src/include/ca-management/certificate.rb:410
 msgid "Expired"
 msgstr "Expired"
 
 #. To translators: table headers
-#: src/include/ca-management/certificate.rb:439
+#: src/include/ca-management/certificate.rb:453
 msgid "Status"
 msgstr "Status"
 
-#: src/include/ca-management/certificate.rb:441
+#: src/include/ca-management/certificate.rb:455
 #: src/include/ca-management/request.rb:320
 msgid "E-Mail Address"
 msgstr "E-Mail Address"
 
-#: src/include/ca-management/certificate.rb:456
+#: src/include/ca-management/certificate.rb:470
 #: src/include/ca-management/request.rb:338
 msgid "Add"
 msgstr "Add"
 
-#: src/include/ca-management/certificate.rb:458
+#: src/include/ca-management/certificate.rb:472
 msgid "Add Server Certificate"
 msgstr "Add Server Certificate"
 
-#: src/include/ca-management/certificate.rb:459
+#: src/include/ca-management/certificate.rb:473
 msgid "Add Client Certificate"
 msgstr "Add Client Certificate"
 
-#: src/include/ca-management/certificate.rb:463
+#: src/include/ca-management/certificate.rb:477
 #: src/include/ca-management/request.rb:351
 #, fuzzy
 msgid "&Change Password"
 msgstr "&User Can Change Password"
 
-#: src/include/ca-management/certificate.rb:464
+#: src/include/ca-management/certificate.rb:478
 msgid "&Revoke"
 msgstr "&Revoke"
 
-#: src/include/ca-management/certificate.rb:465
+#: src/include/ca-management/certificate.rb:479
 #: src/include/ca-management/request.rb:361
 msgid "&Delete"
 msgstr "&Delete"
 
 #. Fate (#2613)
-#: src/include/ca-management/certificate.rb:469
+#: src/include/ca-management/certificate.rb:483
 #: src/include/ca-management/crl.rb:265
 msgid "Export"
 msgstr "Export"
 
-#: src/include/ca-management/certificate.rb:471
+#: src/include/ca-management/certificate.rb:485
 #: src/include/ca-management/request.rb:362
 msgid "Export to File"
 msgstr "Export to File"
 
 #. popup window header
-#: src/include/ca-management/certificate.rb:472
+#: src/include/ca-management/certificate.rb:486
 #: src/include/ca-management/crlExport.rb:507
 #: src/include/ca-management/util.rb:494
 msgid "Export to LDAP"
 msgstr "Export to LDAP"
 
-#: src/include/ca-management/certificate.rb:473
+#: src/include/ca-management/certificate.rb:487
 msgid "Export as Common Server Certificate"
 msgstr "Export as Common Server Certificate"
 
-#: src/include/ca-management/certificate.rb:572
+#: src/include/ca-management/certificate.rb:586
 msgid "Delete current certificate?"
 msgstr "Delete current certificate?"
 
@@ -1216,7 +1427,7 @@
 
 #: src/include/ca-management/crlDefault.rb:164
 #: src/include/ca-management/new_cert.rb:602
-#: src/include/ca-management/signRequest.rb:712
+#: src/include/ca-management/signRequest.rb:724
 msgid "&Valid Period (days):"
 msgstr "&Valid Period (days):"
 
@@ -1657,7 +1868,7 @@
 msgstr " days\n"
 
 #: src/include/ca-management/new_cert.rb:831
-#: src/include/ca-management/signRequest.rb:802
+#: src/include/ca-management/signRequest.rb:814
 msgid "Path Length "
 msgstr "Path Length "
 
@@ -1866,6 +2077,15 @@
 "\n"
 "Request not found.\n"
 
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/signRequest.rb:74
+#, fuzzy
+#| msgid "Generate Time"
+msgid ""
+"\n"
+"generation Time:    "
+msgstr "Generate Time"
+
 #. Reset an accpetation of a RequestExtention
 #. @param request extention
 #. @return [void]
@@ -1874,77 +2094,77 @@
 #. @param request extention
 #. @return [void]
 #. Filling up reqeust extentions
-#: src/include/ca-management/signRequest.rb:245
-#: src/include/ca-management/signRequest.rb:569
-#: src/include/ca-management/signRequest.rb:674
+#: src/include/ca-management/signRequest.rb:257
+#: src/include/ca-management/signRequest.rb:581
+#: src/include/ca-management/signRequest.rb:686
 msgid "Extension \"%1\" not found."
 msgstr "Extension \"%1\" not found."
 
 #. IS CA ?
-#: src/include/ca-management/signRequest.rb:632
+#: src/include/ca-management/signRequest.rb:644
 msgid "This is a CA request. Really sign it as a %1?"
 msgstr "This is a CA request. Really sign it as a %1?"
 
-#: src/include/ca-management/signRequest.rb:639
+#: src/include/ca-management/signRequest.rb:651
 msgid "This is not a CA request. Really sign it as a CA request?"
 msgstr "This is not a CA request. Really sign it as a CA request?"
 
 #. help text 1/3
-#: src/include/ca-management/signRequest.rb:691
+#: src/include/ca-management/signRequest.rb:703
 msgid "<p>This frame shows the signing request.</p>"
 msgstr "<p>This frame shows the signing request.</p>"
 
 #. help text 2/3
-#: src/include/ca-management/signRequest.rb:696
+#: src/include/ca-management/signRequest.rb:708
 msgid "<p>The request has special request extensions, which you can accept.</p>"
 msgstr "<p>The request has special request extensions, which you can accept.</p>"
 
 #. help text 3/3
-#: src/include/ca-management/signRequest.rb:703
+#: src/include/ca-management/signRequest.rb:715
 msgid "<p>If you reject these extensions, the default values are taken instead.</p>"
 msgstr "<p>If you reject these extensions, the default values are taken instead.</p>"
 
-#: src/include/ca-management/signRequest.rb:719
+#: src/include/ca-management/signRequest.rb:731
 msgid "Requested Extensions"
 msgstr "Requested Extensions"
 
-#: src/include/ca-management/signRequest.rb:725
+#: src/include/ca-management/signRequest.rb:737
 msgid "Sign Request as a %1 (Step 1/2)"
 msgstr "Sign Request as a %1 (Step 1/2)"
 
 #. help text 1/2
-#: src/include/ca-management/signRequest.rb:765
+#: src/include/ca-management/signRequest.rb:777
 msgid "<p>This frame gives an overview of all settings for the request that will be signed.</p>"
 msgstr "<p>This frame gives an overview of all settings for the request that will be signed.</p>"
 
 #. help text 2/2
-#: src/include/ca-management/signRequest.rb:771
+#: src/include/ca-management/signRequest.rb:783
 msgid "<p>Click <b>Sign Request</b> to go on.</p>"
 msgstr "<p>Click <b>Sign Request</b> to go on.</p>"
 
-#: src/include/ca-management/signRequest.rb:789
+#: src/include/ca-management/signRequest.rb:801
 msgid " days"
 msgstr " days"
 
-#: src/include/ca-management/signRequest.rb:795
+#: src/include/ca-management/signRequest.rb:807
 msgid " (critical)</p>"
 msgstr " (critical)</p>"
 
-#: src/include/ca-management/signRequest.rb:1221
+#: src/include/ca-management/signRequest.rb:1233
 msgid "&Edit Request"
 msgstr "&Edit Request"
 
 #. To translators: dialog label
-#: src/include/ca-management/signRequest.rb:1226
+#: src/include/ca-management/signRequest.rb:1238
 msgid "Sign Request as a %1 (Step 2/2)"
 msgstr "Sign Request as a %1 (Step 2/2)"
 
-#: src/include/ca-management/signRequest.rb:1232
+#: src/include/ca-management/signRequest.rb:1244
 msgid "Sign Request"
 msgstr "Sign Request"
 
 #. signing request
-#: src/include/ca-management/signRequest.rb:1245
+#: src/include/ca-management/signRequest.rb:1257
 msgid "The request has been signed."
 msgstr "The request has been signed."
 
@@ -2952,9 +3172,6 @@
 #~ msgid "<p>The <b>Common Server Certificate</b> will be used by other YaST modules.</p>"
 #~ msgstr "<p>The <b>Common Server Certificate</b> will be used by other YaST modules.</p>"
 
-#~ msgid "<p>This certificate can be exchanged by importing a certificate from a file.</p>"
-#~ msgstr "<p>This certificate can be exchanged by importing a certificate from a file.</p>"
-
 #~ msgid "Invalid value'%s' for parameter '%s'."
 #~ msgstr "Invalid value'%s' for parameter '%s'."
 

Added: trunk/yast/en_GB/po/cio.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/cio.en_GB.po	                        (rev 0)
+++ trunk/yast/en_GB/po/cio.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -0,0 +1,109 @@
+# English message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 2000, 2001 SuSE GmbH.
+# James Ogley <ogley@suse.co.uk>, 2000, 2001.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\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"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 of the GNU General
+#. Public License as published by the Free Software Foundation.
+#. This program is distributed in the hope that it will be useful,
+#. but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.   See the
+#. GNU General Public License for more details.
+#. You should have received a copy of the GNU General Public License
+#. along with this program; if not, contact SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/iochannel/channels_dialog.rb:125
+#, fuzzy
+#| msgid "Available Interfaces"
+msgid "Available Input/Output Channels"
+msgstr "Available Interfaces"
+
+#: src/lib/iochannel/channels_dialog.rb:132
+msgid "Device"
+msgstr "Device"
+
+#: src/lib/iochannel/channels_dialog.rb:132
+msgid "Used"
+msgstr "Used"
+
+#: src/lib/iochannel/channels_dialog.rb:142
+msgid "no"
+msgstr "no"
+
+#: src/lib/iochannel/channels_dialog.rb:142
+msgid "yes"
+msgstr "yes"
+
+#. filter can be empty if dialog is not yet created
+#: src/lib/iochannel/channels_dialog.rb:160
+#, fuzzy
+#| msgid "Fiber channel"
+msgid "Filter channels"
+msgstr "Fibre channel"
+
+#: src/lib/iochannel/channels_dialog.rb:162
+msgid "&Select All"
+msgstr "&Select All"
+
+#: src/lib/iochannel/channels_dialog.rb:163
+#, fuzzy
+#| msgid "File selection"
+msgid "&Clear selection"
+msgstr "File selection"
+
+#: src/lib/iochannel/channels_dialog.rb:164
+#, fuzzy
+#| msgid "&Scan the Channels"
+msgid "&Blacklist Selected Channels"
+msgstr "&Scan the Channels"
+
+#: src/lib/iochannel/channels_dialog.rb:165
+#, fuzzy
+#| msgid "&Scan the Channels"
+msgid "&Unban Channels"
+msgstr "&Scan the Channels"
+
+#: src/lib/iochannel/channels_dialog.rb:170
+#, fuzzy
+#| msgid "Exit"
+msgid "&Exit"
+msgstr "Exit"
+
+#. TRANSLATORS: %s stands for the smallest snippet inside which we detect syntax error
+#: src/lib/iochannel/unban_dialog.rb:80
+msgid "Specified range is invalid. Wrong value is inside snippet '%s'"
+msgstr ""
+
+#: src/lib/iochannel/unban_dialog.rb:101
+msgid "Unban Input/Output Channels"
+msgstr ""
+
+#: src/lib/iochannel/unban_dialog.rb:106
+msgid ""
+"List of ranges of channels to unban separated by comma.\n"
+"Range can be channel, part of channel which will be filled to zero or range specified with dash.\n"
+"Example value: 0.0.0001, AA00, 0.1.0100-200"
+msgstr ""
+
+#: src/lib/iochannel/unban_dialog.rb:110
+msgid "Ranges to Unban."
+msgstr ""

Modified: trunk/yast/en_GB/po/cluster.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/cluster.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/cluster.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\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"
@@ -91,231 +91,233 @@
 msgstr "Configure CUPS"
 
 #. return `cancel or a string
-#: src/include/cluster/dialogs.rb:83 src/include/cluster/dialogs.rb:118
+#: src/include/cluster/dialogs.rb:85 src/include/cluster/dialogs.rb:120
 msgid "OK"
 msgstr "OK"
 
-#: src/include/cluster/dialogs.rb:84 src/include/cluster/dialogs.rb:119
+#: src/include/cluster/dialogs.rb:86 src/include/cluster/dialogs.rb:121
 msgid "Cancel"
 msgstr "Cancel"
 
 #. BNC#871970, change member address struct
-#: src/include/cluster/dialogs.rb:109
+#: src/include/cluster/dialogs.rb:111
 #, fuzzy
 #| msgid "Remote Address:"
 msgid "IP Address"
 msgstr "Remote Address:"
 
-#: src/include/cluster/dialogs.rb:111
+#: src/include/cluster/dialogs.rb:113
 #, fuzzy
 #| msgid "Remote Address:"
 msgid "Redundant IP Address"
 msgstr "Remote Address:"
 
-#: src/include/cluster/dialogs.rb:113
+#: src/include/cluster/dialogs.rb:115
 msgid "nodeid"
 msgstr ""
 
 #. BNC#871970, change member address struct to memberaddr
-#: src/include/cluster/dialogs.rb:386
+#: src/include/cluster/dialogs.rb:439
 #, fuzzy
 #| msgid "Transport"
 msgid "Transport:"
 msgstr "Transport"
 
-#: src/include/cluster/dialogs.rb:391
+#: src/include/cluster/dialogs.rb:444
 msgid "Channel"
 msgstr "Channel"
 
-#: src/include/cluster/dialogs.rb:396 src/include/cluster/dialogs.rb:417
+#: src/include/cluster/dialogs.rb:449 src/include/cluster/dialogs.rb:470
 #, fuzzy
 #| msgid "Network &Address:"
 msgid "Bind Network Address:"
 msgstr "Network &Address:"
 
-#: src/include/cluster/dialogs.rb:402 src/include/cluster/dialogs.rb:420
-#: src/include/cluster/dialogs.rb:1334
+#: src/include/cluster/dialogs.rb:455 src/include/cluster/dialogs.rb:473
+#: src/include/cluster/dialogs.rb:1396
 #, fuzzy
 #| msgid "Last IP Address:"
 msgid "Multicast Address:"
 msgstr "Last IP Address:"
 
-#: src/include/cluster/dialogs.rb:404 src/include/cluster/dialogs.rb:421
+#: src/include/cluster/dialogs.rb:457 src/include/cluster/dialogs.rb:474
 #, fuzzy
 #| msgid "Multicast"
 msgid "Multicast Port:"
 msgstr "Multicast"
 
-#: src/include/cluster/dialogs.rb:411
+#: src/include/cluster/dialogs.rb:464
 #, fuzzy
 #| msgid "R&ead Channel"
 msgid "Redundant Channel"
 msgstr "R&ead Channel"
 
-#: src/include/cluster/dialogs.rb:427
+#: src/include/cluster/dialogs.rb:480
 #, fuzzy
 #| msgid "Clustering"
 msgid "Cluster Name:"
 msgstr "Clustering"
 
-#: src/include/cluster/dialogs.rb:428
-msgid "expected votes:"
-msgstr ""
+#: src/include/cluster/dialogs.rb:481
+#, fuzzy
+#| msgid "Expected MD5: %1"
+msgid "Expected Votes:"
+msgstr "Expected MD5: %1"
 
-#: src/include/cluster/dialogs.rb:432
+#: src/include/cluster/dialogs.rb:485
 msgid "rrp mode:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:437
+#: src/include/cluster/dialogs.rb:490
 msgid "Auto Generate Node ID"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:442
+#: src/include/cluster/dialogs.rb:495
 #, fuzzy
 #| msgid "Remote Address:"
 msgid "Member Address:"
 msgstr "Remote Address:"
 
-#. Changewidget items will change value to first one automatically
-#: src/include/cluster/dialogs.rb:671
+#. Notice, current could be "nil" if the list is empty.
+#: src/include/cluster/dialogs.rb:731
 #, fuzzy
 #| msgid "Enable &GSS Security"
 msgid "Enable Security Auth"
 msgstr "Enable &GSS Security"
 
-#: src/include/cluster/dialogs.rb:674
+#: src/include/cluster/dialogs.rb:734
 msgid "Threads:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:677
-msgid "For newly created cluster, push the button below to generate /etc/corosync/authkey."
+#: src/include/cluster/dialogs.rb:737
+msgid "For a newly created cluster, push the button below to generate /etc/corosync/authkey."
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:682
+#: src/include/cluster/dialogs.rb:742
 msgid "To join an existing cluster, please copy /etc/corosync/authkey from other nodes manually."
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:787 src/include/cluster/dialogs.rb:857
+#: src/include/cluster/dialogs.rb:847 src/include/cluster/dialogs.rb:917
 msgid "Running"
 msgstr "Running"
 
-#: src/include/cluster/dialogs.rb:789
+#: src/include/cluster/dialogs.rb:849
 msgid "Not running"
 msgstr "Not running"
 
 #. servie:cluster is the  name of /etc/sysconfig/SuSEfirewall2.d/services/cluster
-#: src/include/cluster/dialogs.rb:825
+#: src/include/cluster/dialogs.rb:885
 msgid "Booting"
 msgstr "Booting"
 
-#: src/include/cluster/dialogs.rb:835
+#: src/include/cluster/dialogs.rb:895
 #, fuzzy
 #| msgid "On -- Start Service when Booting"
 msgid "On -- Start pacemaker at booting"
 msgstr "On -- Start Service when Booting"
 
-#: src/include/cluster/dialogs.rb:842
+#: src/include/cluster/dialogs.rb:902
 #, fuzzy
 #| msgid "Off -- Start Service Manually"
 msgid "Off -- Start pacemaker manually only"
 msgstr "Off -- Start Service Manually"
 
-#: src/include/cluster/dialogs.rb:851
+#: src/include/cluster/dialogs.rb:911
 msgid "Switch On and Off"
 msgstr "Switch On and Off"
 
-#: src/include/cluster/dialogs.rb:856
+#: src/include/cluster/dialogs.rb:916
 msgid "Current Status: "
 msgstr "Current Status: "
 
-#: src/include/cluster/dialogs.rb:865
+#: src/include/cluster/dialogs.rb:925
 #, fuzzy
 #| msgid "Start Squid Now"
 msgid "Start pacemaker Now"
 msgstr "Start Squid Now"
 
-#: src/include/cluster/dialogs.rb:866
+#: src/include/cluster/dialogs.rb:926
 #, 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:962
+#: src/include/cluster/dialogs.rb:1024
 #, fuzzy
 #| msgid "Main Host"
 msgid "Sync Host"
 msgstr "Main Host"
 
-#: src/include/cluster/dialogs.rb:966 src/include/cluster/dialogs.rb:978
+#: src/include/cluster/dialogs.rb:1028 src/include/cluster/dialogs.rb:1040
 msgid "Add"
 msgstr "Add"
 
-#: src/include/cluster/dialogs.rb:967 src/include/cluster/dialogs.rb:979
+#: src/include/cluster/dialogs.rb:1029 src/include/cluster/dialogs.rb:1041
 #, fuzzy
 #| msgid "Delay"
 msgid "Del"
 msgstr "Delay"
 
-#: src/include/cluster/dialogs.rb:968 src/include/cluster/dialogs.rb:980
+#: src/include/cluster/dialogs.rb:1030 src/include/cluster/dialogs.rb:1042
 msgid "Edit"
 msgstr "Edit"
 
-#: src/include/cluster/dialogs.rb:974
+#: src/include/cluster/dialogs.rb:1036
 #, fuzzy
 #| msgid "Select File"
 msgid "Sync File"
 msgstr "Select File"
 
-#: src/include/cluster/dialogs.rb:981
+#: src/include/cluster/dialogs.rb:1043
 #, fuzzy
 #| msgid "Suggested fstab Lines"
 msgid "Add Suggested Files"
 msgstr "Suggested fstab Lines"
 
-#: src/include/cluster/dialogs.rb:990
+#: src/include/cluster/dialogs.rb:1052
 msgid "Generate Pre-Shared-Keys"
 msgstr ""
 
 #. remove duplicated elements
-#: src/include/cluster/dialogs.rb:1114
+#: src/include/cluster/dialogs.rb:1176
 msgid "Csync2 Status Unknown"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1117
+#: src/include/cluster/dialogs.rb:1179
 msgid "Turn csync2 ON"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1120
+#: src/include/cluster/dialogs.rb:1182
 msgid "Turn csync2 OFF"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1150
+#: src/include/cluster/dialogs.rb:1212
 #, fuzzy
 #| msgid "Enter a user name."
 msgid "Enter a hostname"
 msgstr "Enter a user name."
 
-#: src/include/cluster/dialogs.rb:1164
+#: src/include/cluster/dialogs.rb:1226
 #, fuzzy
 #| msgid "Write hostname"
 msgid "Edit the hostname"
 msgstr "Write hostname"
 
-#: src/include/cluster/dialogs.rb:1178
+#: src/include/cluster/dialogs.rb:1240
 #, 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:1193
+#: src/include/cluster/dialogs.rb:1255
 #, fuzzy
 #| msgid "Enter the file name"
 msgid "Edit the filename"
 msgstr "Enter the file name"
 
 #. key file exist
-#: src/include/cluster/dialogs.rb:1225
+#: src/include/cluster/dialogs.rb:1287
 #, fuzzy
 #| msgid ""
 #| "File %1 already exists.\n"
@@ -328,46 +330,46 @@
 "Do you wish to overwrite it?"
 
 #. remove exist key file
-#: src/include/cluster/dialogs.rb:1235
+#: src/include/cluster/dialogs.rb:1297
 #, 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:1249
+#: src/include/cluster/dialogs.rb:1311
 msgid ""
 "Key file %1 is generated.\n"
 "Clicking \"Add Suggested Files\" button adds it to sync list."
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1256
+#: src/include/cluster/dialogs.rb:1318
 #, fuzzy
 #| msgid "Image creation failed."
 msgid "Key generation failed."
 msgstr "Image creation failed."
 
 #. SaveCsync2();
-#: src/include/cluster/dialogs.rb:1318
+#: src/include/cluster/dialogs.rb:1380
 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:1329
+#: src/include/cluster/dialogs.rb:1391
 msgid "Dedicated Interface:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1332
+#: src/include/cluster/dialogs.rb:1394
 msgid "IP:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1335
+#: src/include/cluster/dialogs.rb:1397
 msgid "Group Number:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1339
+#: src/include/cluster/dialogs.rb:1401
 msgid "Generate /etc/conntrackd/conntrackd.conf"
 msgstr ""
 
@@ -380,23 +382,26 @@
 "<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>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"
+"<p><b><big>Auto Generate Node ID</big></b><br>Nodeid is required when using IPv6. Auto node ID enabled will generate nodeid automatically.<br></p>\n"
 msgstr ""
 
-#: src/include/cluster/helps.rb:43
+#: src/include/cluster/helps.rb:45
 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"
 msgstr ""
 
-#: src/include/cluster/helps.rb:48
+#: src/include/cluster/helps.rb:50
 msgid ""
 "\n"
-"\t\t\t<p><b><big>Booting</big></b><br>Starting openais service during boot or not</p>\n"
+"\t\t\t<p><b><big>Booting</big></b><br>Starting corosync service during boot or not</p>\n"
+"\t\t\t<p><b><big>Firewall Settings</big></b><br>Enable the port when Firewall is enabled</p>\n"
 "\t\t\t"
 msgstr ""
 
-#: src/include/cluster/helps.rb:53
+#: src/include/cluster/helps.rb:56
 msgid ""
 "\n"
 "\t\t<p><b><big>Sync Host</big></b><br>The hostnames used here must be the local hostnames of the cluster nodes. That means you must use exactly the same string as printed out by the hostname command.</p>\n"
@@ -405,7 +410,7 @@
 "\t"
 msgstr ""
 
-#: src/include/cluster/helps.rb:60
+#: src/include/cluster/helps.rb:63
 msgid ""
 "\n"
 "\t\t<p><b><big>Dedicated Interface</big></b><br>A dedicated network interface for syncing. The interface must support multicast, and is UP for using. You may have to have it pre-configured. </p>\n"
@@ -416,7 +421,7 @@
 msgstr ""
 
 #. Read dialog help 1/2
-#: src/include/cluster/helps.rb:69
+#: src/include/cluster/helps.rb:72
 #, fuzzy
 #| msgid ""
 #| "<p><b><big>Initializing DHCP Server Configuration</big></b><br>\n"
@@ -429,7 +434,7 @@
 "Please wait...</p>"
 
 #. Read dialog help 2/2
-#: src/include/cluster/helps.rb:73
+#: src/include/cluster/helps.rb:76
 msgid ""
 "<p><b><big>Aborting Initialization:</big></b><br>\n"
 "Safely abort the configuration utility by pressing <b>Abort</b> now.</p>\n"
@@ -438,7 +443,7 @@
 "Safely abort the configuration utility by pressing <b>Abort</b> now.</p>\n"
 
 #. Write dialog help 1/2
-#: src/include/cluster/helps.rb:77
+#: src/include/cluster/helps.rb:80
 #, fuzzy
 #| msgid ""
 #| "<p><b><big>NFS Server Configuration</big></b><br>\n"
@@ -451,7 +456,7 @@
 "</p>"
 
 #. Write dialog help 2/2
-#: src/include/cluster/helps.rb:81
+#: src/include/cluster/helps.rb:84
 msgid ""
 "<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.\n"
@@ -476,41 +481,41 @@
 msgstr "Initialising..."
 
 #. Cluster read dialog caption
-#: src/modules/Cluster.rb:384
+#: src/modules/Cluster.rb:395
 #, fuzzy
 #| msgid "Initializing Printer Configuration"
 msgid "Initializing cluster Configuration"
 msgstr "Initialising Printer Configuration"
 
 #. Progress stage 1/3
-#: src/modules/Cluster.rb:400
+#: src/modules/Cluster.rb:411
 msgid "Read the database"
 msgstr "Read the database"
 
 #. Progress stage 2/3
-#: src/modules/Cluster.rb:402
+#: src/modules/Cluster.rb:413
 msgid "Read the previous settings"
 msgstr "Read the previous settings"
 
 #. Progress stage 3/3
-#: src/modules/Cluster.rb:404
+#: src/modules/Cluster.rb:415
 #, fuzzy
 #| msgid "Read firewall settings"
 msgid "Read SuSEFirewall Settings"
 msgstr "Read firewall settings"
 
 #. Progress step 1/3
-#: src/modules/Cluster.rb:408
+#: src/modules/Cluster.rb:419
 msgid "Reading the database..."
 msgstr "Reading the database..."
 
 #. Progress step 2/3
-#: src/modules/Cluster.rb:410
+#: src/modules/Cluster.rb:421
 msgid "Reading the previous settings..."
 msgstr "Reading the previous settings..."
 
 #. Progress step 3/3
-#: src/modules/Cluster.rb:412
+#: src/modules/Cluster.rb:423
 #, fuzzy
 #| msgid "Reading firewall settings..."
 msgid "Reading SuSEFirewall settings..."
@@ -518,71 +523,71 @@
 
 #. Progress finished
 #. Progress finished
-#: src/modules/Cluster.rb:414 src/modules/Cluster.rb:516
+#: src/modules/Cluster.rb:425 src/modules/Cluster.rb:527
 msgid "Finished"
 msgstr "Finished"
 
-#: src/modules/Cluster.rb:429
+#: src/modules/Cluster.rb:440
 #, fuzzy
 #| msgid "Cannot install required packages."
 msgid "Cannot install required package"
 msgstr "Cannot install required packages."
 
 #. read database
-#: src/modules/Cluster.rb:438
+#: src/modules/Cluster.rb:449
 #, fuzzy
 #| msgid "Change existing configuration"
 msgid "Cannot load existing configuration"
 msgstr "Change existing configuration"
 
 #. Error message
-#: src/modules/Cluster.rb:449
+#: src/modules/Cluster.rb:460
 msgid "Cannot read database1."
 msgstr "Cannot read database1."
 
 #. Error message
-#: src/modules/Cluster.rb:457
+#: src/modules/Cluster.rb:468
 msgid "Cannot read database2."
 msgstr "Cannot read database2."
 
 #. Error message
-#: src/modules/Cluster.rb:473
+#: src/modules/Cluster.rb:484
 msgid "Cannot detect devices."
 msgstr "Cannot detect devices."
 
 #. Cluster read dialog caption
-#: src/modules/Cluster.rb:490
+#: src/modules/Cluster.rb:502
 #, fuzzy
 #| msgid "Saving the Configuration"
 msgid "Saving cluster Configuration"
 msgstr "Saving the Configuration"
 
 #. Progress stage 1/2
-#: src/modules/Cluster.rb:506
+#: src/modules/Cluster.rb:517
 msgid "Write the settings"
 msgstr "Write the settings"
 
 #. Progress stage 2/2
-#: src/modules/Cluster.rb:508
+#: src/modules/Cluster.rb:519
 #, fuzzy
 #| msgid "Save changes to the Profile"
 msgid "Save changes to SuSEFirewall"
 msgstr "Save changes to the Profile"
 
 #. Progress step 1/2
-#: src/modules/Cluster.rb:512
+#: src/modules/Cluster.rb:523
 msgid "Writing the settings..."
 msgstr "Writing the settings..."
 
 #. Progress step 2/2
-#: src/modules/Cluster.rb:514
+#: src/modules/Cluster.rb:525
 #, fuzzy
 #| msgid "Saving changes to the files..."
 msgid "Saving changes to SuSEFirewall..."
 msgstr "Saving changes to the files..."
 
 #. Error message
-#: src/modules/Cluster.rb:526
+#: src/modules/Cluster.rb:537
 msgid "Cannot write settings."
 msgstr "Cannot write settings."
 

Modified: trunk/yast/en_GB/po/control-center.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/control-center.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/control-center.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: control-center\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 08:16+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2007-08-16 16:26+0100\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"

Modified: trunk/yast/en_GB/po/control.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/control.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/control.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: control\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:39+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\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,27 +18,30 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: control/add-on-template_installation.glade:7
-msgid "Add-On Product Installation"
-msgstr "Add-On Product Installation"
-
-#: control/add-on-template_installation.glade:15
-msgid "Language Installation"
-msgstr "Language Installation"
-
-#: control/control.SLED.glade:355
+#: control/control.SLES.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 <b>Finish</b> to log in to the system.\n"
+"Click Finish to log in to the system.\n"
 "</p>\n"
 "<p>\n"
 "Please visit us at http://www.suse.com/.\n"
 "</p>\n"
-"\t"
+"        "
 msgstr ""
 "\n"
 "<p>\n"
@@ -51,740 +54,361 @@
 "</p>\n"
 "\t"
 
-#: control/control.SLED.glade:371 control/control.openSUSE.glade:429
+#: control/control.SLES.glade.translations.glade:14
 #, fuzzy
-msgid "Initialization..."
-msgstr "Initialisation"
-
-#: control/control.SLED.glade:372 control/control.openSUSE.glade:430
-#, fuzzy
-msgid "Configuring network..."
-msgstr "Configuring Bootloader..."
-
-#: control/control.SLED.glade:373 control/control.openSUSE.glade:431
-#, fuzzy
-msgid "Configuring hardware..."
-msgstr "Configuring language..."
-
-#: control/control.SLED.glade:374 control/control.openSUSE.glade:432
-#, fuzzy
-msgid "Finishing configuration..."
-msgstr "Finishing Configuration"
-
-#: control/control.SLED.glade:377 control/control.SLES-for-VMware.glade:319
-#: control/control.SLES.glade:343
-#, fuzzy
 #| msgid "Mail Server"
 msgid "CIM Server"
 msgstr "Mail Server"
 
-#: control/control.SLED.glade:382 control/control.SLED.glade:493
-#: control/control.SLED.glade:771 control/control.SLED.glade:775
-#: control/control.SLED.glade:956 control/control.SLED.glade:997
-#: control/control.SLES-for-VMware.glade:324
-#: control/control.SLES-for-VMware.glade:412
-#: control/control.SLES-for-VMware.glade:530
-#: control/control.SLES-for-VMware.glade:551
-#: control/control.SLES-for-VMware.glade:886
-#: control/control.SLES-for-VMware.glade:890
-#: control/control.SLES-for-VMware.glade:1077
-#: control/control.SLES-for-VMware.glade:1118 control/control.SLES.glade:348
-#: control/control.SLES.glade:436 control/control.SLES.glade:554
-#: control/control.SLES.glade:575 control/control.SLES.glade:910
-#: control/control.SLES.glade:914 control/control.SLES.glade:1101
-#: control/control.SLES.glade:1142 control/control.glade:72
-#: control/control.glade:132 control/control.glade:464
-#: control/control.glade:508 control/control.openSUSE.glade:463
-#: control/control.openSUSE.glade:583 control/control.openSUSE.glade:895
-#: control/control.openSUSE.glade:899 control/control.openSUSE.glade:1071
-#: control/control.openSUSE.glade:1116
+#: 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
 msgid "Installation Settings"
 msgstr "Installation Settings"
 
-#: control/control.SLED.glade:436 control/control.SLES-for-VMware.glade:382
-#: control/control.SLES-for-VMware.glade:470 control/control.SLES.glade:406
-#: control/control.SLES.glade:494 control/control.glade:92
+#: control/control.SLES.glade.translations.glade:18
 msgid "Overview"
 msgstr "Overview"
 
-#: control/control.SLED.glade:444 control/control.SLES-for-VMware.glade:392
-#: control/control.SLES-for-VMware.glade:478 control/control.SLES.glade:416
-#: control/control.SLES.glade:502 control/control.glade:100
+#: control/control.SLES.glade.translations.glade:19
 msgid "Expert"
 msgstr "Expert"
 
-#: control/control.SLED.glade:461 control/control.SLES-for-VMware.glade:497
-#: control/control.SLES.glade:521 control/control.openSUSE.glade:550
+#: control/control.SLES.glade.translations.glade:20
 msgid "Live Installation Settings"
 msgstr "Live Installation Settings"
 
-#: control/control.SLED.glade:478 control/control.SLES-for-VMware.glade:515
-#: control/control.SLES.glade:539 control/control.glade:117
-#: control/control.openSUSE.glade:568 control/control.openSUSE.glade:984
-#: control/control.openSUSE.glade:989
+#: control/control.SLES.glade.translations.glade:21
 msgid "Update Settings"
 msgstr "Update Settings"
 
-#: control/control.SLED.glade:512 control/control.SLES-for-VMware.glade:570
-#: control/control.SLES-for-VMware.glade:613 control/control.SLES.glade:594
-#: control/control.SLES.glade:637 control/control.glade:153
-#: control/control.openSUSE.glade:601
+#: control/control.SLES.glade.translations.glade:24
+#: control/control.SLES.glade.translations.glade:25
 msgid "Network Configuration"
 msgstr "Network Configuration"
 
-#: control/control.SLED.glade:559 control/control.SLED.glade:1212
-#: control/control.SLED.glade:1218 control/control.SLES-for-VMware.glade:653
-#: control/control.SLES-for-VMware.glade:666
-#: control/control.SLES-for-VMware.glade:677
-#: control/control.SLES-for-VMware.glade:1350
-#: control/control.SLES-for-VMware.glade:1356
-#: control/control.SLES-for-VMware.glade:1362
-#: control/control.SLES-for-VMware.glade:1374 control/control.SLES.glade:677
-#: control/control.SLES.glade:690 control/control.SLES.glade:701
-#: control/control.SLES.glade:1374 control/control.SLES.glade:1380
-#: control/control.SLES.glade:1386 control/control.SLES.glade:1398
-#: control/control.glade:194 control/control.glade:692
-#: control/control.glade:697 control/control.glade:701
-#: control/control.openSUSE.glade:643 control/control.openSUSE.glade:1305
-#: control/control.openSUSE.glade:1311
+#: 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
 msgid "Hardware Configuration"
 msgstr "Hardware Configuration"
 
-#: control/control.SLED.glade:579 control/control.SLED.glade:692
-#: control/control.SLED.glade:816 control/control.SLED.glade:926
-#: control/control.SLED.glade:1320 control/control.SLES-for-VMware.glade:695
-#: control/control.SLES-for-VMware.glade:807
-#: control/control.SLES-for-VMware.glade:931
-#: control/control.SLES-for-VMware.glade:1047
-#: control/control.SLES-for-VMware.glade:1486 control/control.SLES.glade:719
-#: control/control.SLES.glade:831 control/control.SLES.glade:955
-#: control/control.SLES.glade:1071 control/control.SLES.glade:1510
-#: control/control.glade:213 control/control.glade:313
-#: control/control.glade:416 control/control.openSUSE.glade:667
-#: control/control.openSUSE.glade:794 control/control.openSUSE.glade:937
-#: control/control.openSUSE.glade:1038 control/control.openSUSE.glade:1428
+#: control/control.SLES.glade.translations.glade:30
+#: control/control.SLES.glade.translations.glade:65
+#: control/control.SLES.glade.translations.glade:91
 msgid "Preparation"
 msgstr "Preparation"
 
-#: control/control.SLED.glade:585 control/control.SLED.glade:594
-#: control/control.SLED.glade:697 control/control.SLED.glade:739
-#: control/control.SLED.glade:822 control/control.SLED.glade:831
-#: control/control.SLES-for-VMware.glade:701
-#: control/control.SLES-for-VMware.glade:710
-#: control/control.SLES-for-VMware.glade:812
-#: control/control.SLES-for-VMware.glade:854
-#: control/control.SLES-for-VMware.glade:937
-#: control/control.SLES-for-VMware.glade:946 control/control.SLES.glade:725
-#: control/control.SLES.glade:734 control/control.SLES.glade:836
-#: control/control.SLES.glade:878 control/control.SLES.glade:961
-#: control/control.SLES.glade:970 control/control.glade:219
-#: control/control.glade:228 control/control.glade:237
-#: control/control.glade:319 control/control.glade:328
-#: control/control.glade:337 control/control.glade:449
-#: control/control.glade:493 control/control.openSUSE.glade:672
-#: control/control.openSUSE.glade:799 control/control.openSUSE.glade:841
-#: control/control.openSUSE.glade:943 control/control.openSUSE.glade:1066
-#: control/control.openSUSE.glade:1111
+#: control/control.SLES.glade.translations.glade:31
+#: control/control.SLES.glade.translations.glade:52
+#: control/control.SLES.glade.translations.glade:66
+#, fuzzy
+#| msgid "Saving 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
+#, 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
 msgid "Welcome"
 msgstr "Welcome"
 
-#: control/control.SLED.glade:600 control/control.SLES-for-VMware.glade:716
-#: control/control.SLES.glade:740 control/control.glade:343
-#: control/control.openSUSE.glade:682
+#: control/control.SLES.glade.translations.glade:34
+#: control/control.SLES.glade.translations.glade:55
+#: control/control.SLES.glade.translations.glade:69
 #, fuzzy
 #| msgid "Disk Activation"
 msgid "Network Activation"
 msgstr "Disk Activation"
 
-#: control/control.SLED.glade:606 control/control.SLED.glade:707
-#: control/control.SLED.glade:837 control/control.SLES-for-VMware.glade:722
-#: control/control.SLES-for-VMware.glade:822
-#: control/control.SLES-for-VMware.glade:952 control/control.SLES.glade:746
-#: control/control.SLES.glade:846 control/control.SLES.glade:976
-#: control/control.glade:243 control/control.glade:349
-#: control/control.openSUSE.glade:686 control/control.openSUSE.glade:809
-#: control/control.openSUSE.glade:951
+#: control/control.SLES.glade.translations.glade:35
+#: control/control.SLES.glade.translations.glade:70
 msgid "Disk Activation"
 msgstr "Disk Activation"
 
-#: control/control.SLED.glade:612 control/control.SLED.glade:618
-#: control/control.SLED.glade:711 control/control.SLED.glade:715
-#: control/control.SLED.glade:843 control/control.SLED.glade:849
-#: control/control.SLED.glade:1325 control/control.SLES-for-VMware.glade:728
-#: control/control.SLES-for-VMware.glade:734
-#: control/control.SLES-for-VMware.glade:826
-#: control/control.SLES-for-VMware.glade:830
-#: control/control.SLES-for-VMware.glade:958
-#: control/control.SLES-for-VMware.glade:964
-#: control/control.SLES-for-VMware.glade:1491 control/control.SLES.glade:752
-#: control/control.SLES.glade:758 control/control.SLES.glade:850
-#: control/control.SLES.glade:854 control/control.SLES.glade:982
-#: control/control.SLES.glade:988 control/control.SLES.glade:1515
-#: control/control.glade:249 control/control.glade:255
-#: control/control.glade:355 control/control.glade:361
-#: control/control.openSUSE.glade:690 control/control.openSUSE.glade:694
-#: control/control.openSUSE.glade:813 control/control.openSUSE.glade:817
-#: control/control.openSUSE.glade:955 control/control.openSUSE.glade:959
-#: control/control.openSUSE.glade:1433
+#: 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
 msgid "System Analysis"
 msgstr "System Analysis"
 
-#: control/control.SLED.glade:624 control/control.SLED.glade:865
-#: control/control.SLES-for-VMware.glade:740
-#: control/control.SLES-for-VMware.glade:980 control/control.SLES.glade:764
-#: control/control.SLES.glade:1004 control/control.glade:261
-#: control/control.glade:378 control/control.openSUSE.glade:704
-#: control/control.openSUSE.glade:975
+#: control/control.SLES.glade.translations.glade:38
+#: control/control.SLES.glade.translations.glade:73
 msgid "Add-On Products"
 msgstr "Add-On Products"
 
-#: control/control.SLED.glade:630 control/control.SLED.glade:749
-#: control/control.SLES-for-VMware.glade:746
-#: control/control.SLES-for-VMware.glade:864 control/control.SLES.glade:770
-#: control/control.SLES.glade:888 control/control.glade:267
-#: control/control.openSUSE.glade:709 control/control.openSUSE.glade:861
+#: control/control.SLES.glade.translations.glade:39
+#: control/control.SLES.glade.translations.glade:56
+msgid "Disk"
+msgstr "Disk"
+
+#: control/control.SLES.glade.translations.glade:40
+#: control/control.SLES.glade.translations.glade:57
 msgid "Time Zone"
 msgstr "Time Zone"
 
-#: control/control.SLED.glade:647 control/control.SLED.glade:651
-#: control/control.SLED.glade:763 control/control.SLED.glade:767
-#: control/control.SLES-for-VMware.glade:878
-#: control/control.SLES-for-VMware.glade:882 control/control.SLES.glade:902
-#: control/control.SLES.glade:906 control/control.openSUSE.glade:735
-#: control/control.openSUSE.glade:739 control/control.openSUSE.glade:875
-#: control/control.openSUSE.glade:879
-msgid "User Settings"
-msgstr "User Settings"
+#: control/control.SLES.glade.translations.glade:41
+#: control/control.SLES.glade.translations.glade:51
+msgid "Installation"
+msgstr "Installation"
 
-#: control/control.SLED.glade:655 control/control.openSUSE.glade:747
-msgid "Installation Overview"
-msgstr "Installation Overview"
+#: control/control.SLES.glade.translations.glade:42
+msgid "Installation Summary"
+msgstr "Installation Summary"
 
-#: control/control.SLED.glade:662 control/control.SLED.glade:666
-#: control/control.SLED.glade:670 control/control.SLED.glade:674
-#: control/control.SLED.glade:678 control/control.SLED.glade:781
-#: control/control.SLED.glade:785 control/control.SLED.glade:791
-#: control/control.SLED.glade:795 control/control.SLED.glade:799
-#: control/control.SLED.glade:805 control/control.SLED.glade:963
-#: control/control.SLED.glade:967 control/control.SLED.glade:971
-#: control/control.SLED.glade:975 control/control.SLED.glade:1004
-#: control/control.SLED.glade:1008 control/control.SLED.glade:1012
-#: control/control.SLED.glade:1016 control/control.SLED.glade:1290
-#: control/control.SLED.glade:1294 control/control.SLED.glade:1298
-#: control/control.SLED.glade:1302 control/control.SLED.glade:1306
-#: control/control.SLED.glade:1310 control/control.SLED.glade:1414
-#: control/control.SLED.glade:1418 control/control.SLED.glade:1422
-#: control/control.SLES-for-VMware.glade:772
-#: control/control.SLES-for-VMware.glade:776
-#: control/control.SLES-for-VMware.glade:780
-#: control/control.SLES-for-VMware.glade:784
-#: control/control.SLES-for-VMware.glade:789
-#: control/control.SLES-for-VMware.glade:794
-#: control/control.SLES-for-VMware.glade:896
-#: control/control.SLES-for-VMware.glade:900
-#: control/control.SLES-for-VMware.glade:906
-#: control/control.SLES-for-VMware.glade:910
-#: control/control.SLES-for-VMware.glade:914
-#: control/control.SLES-for-VMware.glade:920
-#: control/control.SLES-for-VMware.glade:1084
-#: control/control.SLES-for-VMware.glade:1088
-#: control/control.SLES-for-VMware.glade:1092
-#: control/control.SLES-for-VMware.glade:1096
-#: control/control.SLES-for-VMware.glade:1125
-#: control/control.SLES-for-VMware.glade:1129
-#: control/control.SLES-for-VMware.glade:1133
-#: control/control.SLES-for-VMware.glade:1137
-#: control/control.SLES-for-VMware.glade:1450
-#: control/control.SLES-for-VMware.glade:1454
-#: control/control.SLES-for-VMware.glade:1458
-#: control/control.SLES-for-VMware.glade:1462
-#: control/control.SLES-for-VMware.glade:1466
-#: control/control.SLES-for-VMware.glade:1471
-#: control/control.SLES-for-VMware.glade:1476
-#: control/control.SLES-for-VMware.glade:1580
-#: control/control.SLES-for-VMware.glade:1584
-#: control/control.SLES-for-VMware.glade:1588 control/control.SLES.glade:796
-#: control/control.SLES.glade:800 control/control.SLES.glade:804
-#: control/control.SLES.glade:808 control/control.SLES.glade:813
-#: control/control.SLES.glade:818 control/control.SLES.glade:920
-#: control/control.SLES.glade:924 control/control.SLES.glade:930
-#: control/control.SLES.glade:934 control/control.SLES.glade:938
-#: control/control.SLES.glade:944 control/control.SLES.glade:1108
-#: control/control.SLES.glade:1112 control/control.SLES.glade:1116
-#: control/control.SLES.glade:1120 control/control.SLES.glade:1149
-#: control/control.SLES.glade:1153 control/control.SLES.glade:1157
-#: control/control.SLES.glade:1161 control/control.SLES.glade:1474
-#: control/control.SLES.glade:1478 control/control.SLES.glade:1482
-#: control/control.SLES.glade:1486 control/control.SLES.glade:1490
-#: control/control.SLES.glade:1495 control/control.SLES.glade:1500
-#: control/control.SLES.glade:1604 control/control.SLES.glade:1608
-#: control/control.SLES.glade:1612 control/control.glade:291
-#: control/control.glade:295 control/control.glade:299
-#: control/control.glade:303 control/control.glade:469
-#: control/control.glade:473 control/control.glade:477
-#: control/control.glade:513 control/control.glade:517
-#: control/control.glade:521 control/control.glade:612
-#: control/control.glade:620 control/control.glade:624
-#: control/control.glade:744 control/control.glade:748
-#: control/control.glade:752 control/control.glade:756
-#: control/control.glade:760 control/control.glade:777
-#: control/control.glade:785 control/control.glade:789
-#: control/control.glade:793 control/control.openSUSE.glade:754
-#: control/control.openSUSE.glade:758 control/control.openSUSE.glade:763
-#: control/control.openSUSE.glade:770 control/control.openSUSE.glade:774
-#: control/control.openSUSE.glade:780 control/control.openSUSE.glade:905
-#: control/control.openSUSE.glade:909 control/control.openSUSE.glade:913
-#: control/control.openSUSE.glade:917 control/control.openSUSE.glade:923
-#: control/control.openSUSE.glade:1078 control/control.openSUSE.glade:1082
-#: control/control.openSUSE.glade:1086 control/control.openSUSE.glade:1090
-#: control/control.openSUSE.glade:1123 control/control.openSUSE.glade:1127
-#: control/control.openSUSE.glade:1131 control/control.openSUSE.glade:1135
-#: control/control.openSUSE.glade:1393 control/control.openSUSE.glade:1397
-#: control/control.openSUSE.glade:1401 control/control.openSUSE.glade:1405
-#: control/control.openSUSE.glade:1409 control/control.openSUSE.glade:1413
-#: control/control.openSUSE.glade:1417 control/control.openSUSE.glade:1522
-#: control/control.openSUSE.glade:1526 control/control.openSUSE.glade:1530
+#: 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
 msgid "Perform Installation"
 msgstr "Perform Installation"
 
-#: control/control.SLED.glade:720 control/control.SLES-for-VMware.glade:835
-#: control/control.SLES.glade:859 control/control.openSUSE.glade:822
-#, fuzzy
-msgid "Repair"
-msgstr "&Repair"
-
-#: control/control.SLED.glade:734 control/control.SLES-for-VMware.glade:756
-#: control/control.SLES-for-VMware.glade:849 control/control.SLES.glade:780
-#: control/control.SLES.glade:873 control/control.glade:283
-#: control/control.openSUSE.glade:744 control/control.openSUSE.glade:836
-msgid "Installation"
-msgstr "Installation"
-
-#: control/control.SLED.glade:757 control/control.SLES-for-VMware.glade:872
-#: control/control.SLES.glade:896 control/control.openSUSE.glade:729
-#: control/control.openSUSE.glade:869
-msgid "Disk"
-msgstr "Disk"
-
-#: control/control.SLED.glade:855 control/control.SLED.glade:1331
-#: control/control.SLES-for-VMware.glade:970
-#: control/control.SLES-for-VMware.glade:1497 control/control.SLES.glade:994
-#: control/control.SLES.glade:1521 control/control.glade:367
-#: control/control.openSUSE.glade:963 control/control.openSUSE.glade:1439
+#: control/control.SLES.glade.translations.glade:72
+#: control/control.SLES.glade.translations.glade:93
 msgid "System for Update"
 msgstr "System for Update"
 
-#: control/control.SLED.glade:872 control/control.SLED.glade:1348
-#: control/control.SLES-for-VMware.glade:987
-#: control/control.SLES-for-VMware.glade:1514 control/control.SLES.glade:1011
-#: control/control.SLES.glade:1538 control/control.glade:385
-#: control/control.openSUSE.glade:981 control/control.openSUSE.glade:1456
+#: control/control.SLES.glade.translations.glade:74
+#: control/control.SLES.glade.translations.glade:96
 msgid "Update"
 msgstr "Update"
 
-#: control/control.SLED.glade:875 control/control.SLED.glade:880
-#: control/control.SLES-for-VMware.glade:990
-#: control/control.SLES-for-VMware.glade:995 control/control.SLES.glade:1014
-#: control/control.SLES.glade:1019 control/control.glade:388
+#: control/control.SLES.glade.translations.glade:75
 msgid "Update Summary"
 msgstr "Update Summary"
 
-#. FATE #304940: s390 reIPL
-#: control/control.SLED.glade:890 control/control.SLED.glade:899
-#: control/control.SLED.glade:903 control/control.SLED.glade:907
-#: control/control.SLED.glade:911 control/control.SLED.glade:915
-#: control/control.SLED.glade:1032 control/control.SLED.glade:1359
-#: control/control.SLED.glade:1364 control/control.SLED.glade:1369
-#: control/control.SLED.glade:1375 control/control.SLED.glade:1379
-#: control/control.SLED.glade:1383 control/control.SLED.glade:1387
-#: control/control.SLED.glade:1392 control/control.SLED.glade:1397
-#: control/control.SLED.glade:1450 control/control.SLED.glade:1454
-#: control/control.SLES-for-VMware.glade:1005
-#: control/control.SLES-for-VMware.glade:1014
-#: control/control.SLES-for-VMware.glade:1018
-#: control/control.SLES-for-VMware.glade:1022
-#: control/control.SLES-for-VMware.glade:1026
-#: control/control.SLES-for-VMware.glade:1031
-#: control/control.SLES-for-VMware.glade:1036
-#: control/control.SLES-for-VMware.glade:1153
-#: control/control.SLES-for-VMware.glade:1525
-#: control/control.SLES-for-VMware.glade:1530
-#: control/control.SLES-for-VMware.glade:1535
-#: control/control.SLES-for-VMware.glade:1541
-#: control/control.SLES-for-VMware.glade:1545
-#: control/control.SLES-for-VMware.glade:1549
-#: control/control.SLES-for-VMware.glade:1553
-#: control/control.SLES-for-VMware.glade:1558
-#: control/control.SLES-for-VMware.glade:1563
-#: control/control.SLES-for-VMware.glade:1617
-#: control/control.SLES-for-VMware.glade:1621 control/control.SLES.glade:1029
-#: control/control.SLES.glade:1038 control/control.SLES.glade:1042
-#: control/control.SLES.glade:1046 control/control.SLES.glade:1050
-#: control/control.SLES.glade:1055 control/control.SLES.glade:1060
-#: control/control.SLES.glade:1177 control/control.SLES.glade:1549
-#: control/control.SLES.glade:1554 control/control.SLES.glade:1559
-#: control/control.SLES.glade:1565 control/control.SLES.glade:1569
-#: control/control.SLES.glade:1573 control/control.SLES.glade:1577
-#: control/control.SLES.glade:1582 control/control.SLES.glade:1587
-#: control/control.SLES.glade:1641 control/control.SLES.glade:1645
-#: control/control.glade:393 control/control.glade:397
-#: control/control.glade:401 control/control.glade:405
-#: control/control.glade:538 control/control.glade:546
-#: control/control.openSUSE.glade:999 control/control.openSUSE.glade:1008
-#: control/control.openSUSE.glade:1012 control/control.openSUSE.glade:1016
-#: control/control.openSUSE.glade:1020 control/control.openSUSE.glade:1026
-#: control/control.openSUSE.glade:1467 control/control.openSUSE.glade:1472
-#: control/control.openSUSE.glade:1477 control/control.openSUSE.glade:1483
-#: control/control.openSUSE.glade:1487 control/control.openSUSE.glade:1491
-#: control/control.openSUSE.glade:1495 control/control.openSUSE.glade:1500
-#: control/control.openSUSE.glade:1505 control/control.openSUSE.glade:1555
-#: control/control.openSUSE.glade:1559
+#: 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
 msgid "Perform Update"
 msgstr "Perform Update"
 
-#: control/control.SLED.glade:930 control/control.SLES-for-VMware.glade:1051
-#: control/control.SLES.glade:1075 control/control.glade:421
-#: control/control.glade:429 control/control.openSUSE.glade:1042
-msgid "System Information"
-msgstr "System Information"
-
-#: control/control.SLED.glade:934 control/control.SLES-for-VMware.glade:1055
-#: control/control.SLES.glade:1079 control/control.glade:433
-#: control/control.openSUSE.glade:1046
-msgid "Perform Repair"
-msgstr "Perform Repair"
-
-#: control/control.SLED.glade:945 control/control.SLED.glade:986
-#: control/control.SLED.glade:1262 control/control.SLES-for-VMware.glade:1066
-#: control/control.SLES-for-VMware.glade:1107
-#: control/control.SLES-for-VMware.glade:1422 control/control.SLES.glade:1090
-#: control/control.SLES.glade:1131 control/control.SLES.glade:1446
-#: control/control.glade:444 control/control.glade:488
-#: control/control.glade:709 control/control.openSUSE.glade:1060
-#: control/control.openSUSE.glade:1106 control/control.openSUSE.glade:1365
+#: control/control.SLES.glade.translations.glade:81
 msgid "Base Installation"
 msgstr "Base Installation"
 
-#: control/control.SLED.glade:951 control/control.SLED.glade:992
-#: control/control.SLES-for-VMware.glade:1072
-#: control/control.SLES-for-VMware.glade:1113 control/control.SLES.glade:1096
-#: control/control.SLES.glade:1137 control/control.glade:459
-#: control/control.glade:503
-msgid "Language"
-msgstr "Language"
+#: 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
+msgid "AutoYaST Settings"
+msgstr "AutoYaST Settings"
 
-#: control/control.SLED.glade:1038 control/control.SLED.glade:1107
-#: control/control.SLED.glade:1239 control/control.SLED.glade:1428
-#: control/control.SLED.glade:1460 control/control.SLES-for-VMware.glade:1159
-#: control/control.SLES-for-VMware.glade:1252
-#: control/control.SLES-for-VMware.glade:1399
-#: control/control.SLES-for-VMware.glade:1594
-#: control/control.SLES-for-VMware.glade:1627 control/control.SLES.glade:1183
-#: control/control.SLES.glade:1276 control/control.SLES.glade:1423
-#: control/control.SLES.glade:1618 control/control.SLES.glade:1651
-#: control/control.glade:551 control/control.glade:631
-#: control/control.glade:798 control/control.openSUSE.glade:1213
-#: control/control.openSUSE.glade:1332 control/control.openSUSE.glade:1536
-#: control/control.openSUSE.glade:1565
+#: control/control.SLES.glade.translations.glade:108
+#: control/control.SLES.glade.translations.glade:112
 msgid "Configuration"
 msgstr "Configuration"
 
-#: control/control.SLED.glade:1041 control/control.SLED.glade:1048
-#: control/control.SLED.glade:1145 control/control.SLED.glade:1151
-#: control/control.SLED.glade:1155 control/control.SLES-for-VMware.glade:1162
-#: control/control.SLES-for-VMware.glade:1169
-#: control/control.SLES-for-VMware.glade:1284
-#: control/control.SLES-for-VMware.glade:1290
-#: control/control.SLES-for-VMware.glade:1294 control/control.SLES.glade:1186
-#: control/control.SLES.glade:1193 control/control.SLES.glade:1308
-#: control/control.SLES.glade:1314 control/control.SLES.glade:1318
-#: control/control.glade:554 control/control.glade:560
-#: control/control.glade:643 control/control.glade:648
-#: control/control.glade:652 control/control.openSUSE.glade:1254
-#: control/control.openSUSE.glade:1260 control/control.openSUSE.glade:1264
-msgid "Network"
-msgstr "Network"
+#: control/control.SLES.glade.translations.glade:109
+#: control/control.SLES.glade.translations.glade:113
+msgid "System Configuration"
+msgstr "System Configuration"
 
-#: control/control.SLED.glade:1054 control/control.SLED.glade:1058
-#: control/control.SLED.glade:1159 control/control.SLED.glade:1163
-#: control/control.SLES-for-VMware.glade:1175
-#: control/control.SLES-for-VMware.glade:1179
-#: control/control.SLES-for-VMware.glade:1298
-#: control/control.SLES-for-VMware.glade:1302 control/control.SLES.glade:1199
-#: control/control.SLES.glade:1203 control/control.SLES.glade:1322
-#: control/control.SLES.glade:1326 control/control.glade:566
-#: control/control.glade:656
-msgid "Customer Center"
-msgstr "Customer Centre"
+#~ msgid "Add-On Product Installation"
+#~ msgstr "Add-On Product Installation"
 
-#: control/control.SLED.glade:1064 control/control.SLED.glade:1070
-#: control/control.SLED.glade:1076 control/control.SLED.glade:1170
-#: control/control.SLED.glade:1176 control/control.SLED.glade:1180
-#: control/control.SLED.glade:1184 control/control.SLES-for-VMware.glade:1185
-#: control/control.SLES-for-VMware.glade:1191
-#: control/control.SLES-for-VMware.glade:1197
-#: control/control.SLES-for-VMware.glade:1308
-#: control/control.SLES-for-VMware.glade:1314
-#: control/control.SLES-for-VMware.glade:1318
-#: control/control.SLES-for-VMware.glade:1322 control/control.SLES.glade:1209
-#: control/control.SLES.glade:1215 control/control.SLES.glade:1221
-#: control/control.SLES.glade:1332 control/control.SLES.glade:1338
-#: control/control.SLES.glade:1342 control/control.SLES.glade:1346
-#: control/control.glade:572 control/control.glade:578
-#: control/control.glade:584 control/control.glade:662
-#: control/control.glade:668 control/control.glade:672
-#: control/control.glade:676 control/control.openSUSE.glade:1268
-#: control/control.openSUSE.glade:1272 control/control.openSUSE.glade:1276
-#: control/control.openSUSE.glade:1280 control/control.openSUSE.glade:1284
-msgid "Online Update"
-msgstr "Online Update"
+#~ msgid "Language Installation"
+#~ msgstr "Language Installation"
 
-#: control/control.SLED.glade:1083 control/control.SLED.glade:1208
-#: control/control.SLES-for-VMware.glade:1205
-#: control/control.SLES-for-VMware.glade:1346 control/control.SLES.glade:1229
-#: control/control.SLES.glade:1370 control/control.glade:588
-#: control/control.glade:688 control/control.openSUSE.glade:1301
-msgid "Release Notes"
-msgstr "Release Notes"
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "<p>\n"
+#~ "The installation has completed successfully.\n"
+#~ "Your system is ready for use.\n"
+#~ "Click <b>Finish</b> to log in to the system.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "Please visit us at http://www.suse.com/.\n"
+#~ "</p>\n"
+#~ "\t"
+#~ 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"
 
-#: control/control.SLED.glade:1110 control/control.SLED.glade:1242
-#: control/control.SLES-for-VMware.glade:1402 control/control.SLES.glade:1426
-#: control/control.openSUSE.glade:1221 control/control.openSUSE.glade:1335
 #, fuzzy
-msgid "Automatic Configuration"
-msgstr "Autofs Configuration"
+#~ msgid "Initialization..."
+#~ msgstr "Initialisation"
 
-#: control/control.SLED.glade:1116 control/control.SLES-for-VMware.glade:1255
-#: control/control.SLES.glade:1279 control/control.openSUSE.glade:1227
-msgid "root Password"
-msgstr "root Password"
+#, fuzzy
+#~ msgid "Configuring network..."
+#~ msgstr "Configuring Bootloader..."
 
-#: control/control.SLED.glade:1121 control/control.SLED.glade:1127
-#: control/control.SLED.glade:1133 control/control.SLES-for-VMware.glade:1260
-#: control/control.SLES-for-VMware.glade:1266
-#: control/control.SLES-for-VMware.glade:1272 control/control.SLES.glade:1284
-#: control/control.SLES.glade:1290 control/control.SLES.glade:1296
-#: control/control.openSUSE.glade:1232 control/control.openSUSE.glade:1238
-#: control/control.openSUSE.glade:1244
-msgid "Check Installation"
-msgstr "Check Installation"
+#, fuzzy
+#~ msgid "Configuring hardware..."
+#~ msgstr "Configuring language..."
 
-#: control/control.SLED.glade:1139 control/control.SLES-for-VMware.glade:1278
-#: control/control.SLES.glade:1302 control/control.glade:639
-#: control/control.openSUSE.glade:1250
-msgid "Hostname"
-msgstr "Hostname"
+#, fuzzy
+#~ msgid "Finishing configuration..."
+#~ msgstr "Finishing Configuration"
 
-#: control/control.SLED.glade:1188 control/control.SLED.glade:1192
-#: control/control.SLES-for-VMware.glade:1332
-#: control/control.SLES-for-VMware.glade:1336 control/control.SLES.glade:1356
-#: control/control.SLES.glade:1360 control/control.glade:680
-#: control/control.glade:684 control/control.openSUSE.glade:1288
-#: control/control.openSUSE.glade:1292 control/control.openSUSE.glade:1342
-#: control/control.openSUSE.glade:1346
-msgid "Users"
-msgstr "Users"
+#~ msgid "User Settings"
+#~ msgstr "User Settings"
 
-#: control/control.SLED.glade:1271 control/control.SLED.glade:1277
-#: control/control.SLED.glade:1281 control/control.SLED.glade:1337
-#: control/control.SLED.glade:1343 control/control.SLED.glade:1351
-#: control/control.SLES-for-VMware.glade:1431
-#: control/control.SLES-for-VMware.glade:1437
-#: control/control.SLES-for-VMware.glade:1441
-#: control/control.SLES-for-VMware.glade:1503
-#: control/control.SLES-for-VMware.glade:1509
-#: control/control.SLES-for-VMware.glade:1517 control/control.SLES.glade:1455
-#: control/control.SLES.glade:1461 control/control.SLES.glade:1465
-#: control/control.SLES.glade:1527 control/control.SLES.glade:1533
-#: control/control.SLES.glade:1541 control/control.glade:719
-#: control/control.glade:727 control/control.glade:733
-#: control/control.glade:737 control/control.openSUSE.glade:1374
-#: control/control.openSUSE.glade:1380 control/control.openSUSE.glade:1384
-#: control/control.openSUSE.glade:1445 control/control.openSUSE.glade:1451
-#: control/control.openSUSE.glade:1459
-msgid "AutoYaST Settings"
-msgstr "AutoYaST Settings"
+#~ msgid "Installation Overview"
+#~ msgstr "Installation Overview"
 
-#: control/control.SLED.glade:1431 control/control.SLED.glade:1463
-#: control/control.SLES-for-VMware.glade:1597
-#: control/control.SLES-for-VMware.glade:1630 control/control.SLES.glade:1621
-#: control/control.SLES.glade:1654 control/control.glade:801
-#: control/control.openSUSE.glade:1539 control/control.openSUSE.glade:1568
-msgid "System Configuration"
-msgstr "System Configuration"
+#, fuzzy
+#~ msgid "Repair"
+#~ msgstr "&Repair"
 
-#: control/control.SLED.glade:1467 control/control.SLES-for-VMware.glade:1201
-#: control/control.SLES-for-VMware.glade:1340
-#: control/control.SLES-for-VMware.glade:1601
-#: control/control.SLES-for-VMware.glade:1634 control/control.SLES.glade:1225
-#: control/control.SLES.glade:1364 control/control.SLES.glade:1625
-#: control/control.SLES.glade:1658
-msgid "Clean Up"
-msgstr "Clean Up"
+#~ msgid "System Information"
+#~ msgstr "System Information"
 
-#: control/control.SLES-for-VMware.glade:291 control/control.SLES.glade:314
-#, 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"
-"\t"
-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"
+#~ msgid "Perform Repair"
+#~ msgstr "Perform Repair"
 
-#: control/control.SLES-for-VMware.glade:307 control/control.SLES.glade:330
-#, fuzzy
-msgid "Server Base Scenario"
-msgstr "Server Name: "
+#~ msgid "Language"
+#~ msgstr "Language"
 
-#: control/control.SLES-for-VMware.glade:308 control/control.SLES.glade:331
-msgid ""
-"SUSE Linux Enterprise Server offers several base scenarios.\n"
-"Choose the one that matches your server the best."
-msgstr ""
+#~ msgid "Network"
+#~ msgstr "Network"
 
-#: control/control.SLES-for-VMware.glade:314 control/control.SLES.glade:337
-msgid "Physical Machine (Also for Fully Virtualized Guests)"
-msgstr ""
+#~ msgid "Customer Center"
+#~ msgstr "Customer Centre"
 
-#: control/control.SLES-for-VMware.glade:315 control/control.SLES.glade:338
-msgid "Virtual Machine (For Paravirtualized Environments Like Xen)"
-msgstr ""
+#~ msgid "Online Update"
+#~ msgstr "Online Update"
 
-#: control/control.SLES-for-VMware.glade:316 control/control.SLES.glade:339
-msgid "Xen Virtualization Host (Local X11 Not Configured by Default)"
-msgstr ""
+#~ msgid "Release Notes"
+#~ msgstr "Release Notes"
 
-#: control/control.SLES-for-VMware.glade:639 control/control.SLES.glade:663
 #, fuzzy
-#| msgid "Network Services Configuration %1"
-msgid "Network Services Configuration"
-msgstr "Network Services Configuration %1"
+#~ msgid "Automatic Configuration"
+#~ msgstr "Autofs Configuration"
 
-#: control/control.SLES-for-VMware.glade:760 control/control.SLES.glade:784
-#, fuzzy
-msgid "Server Scenario"
-msgstr "Server Settings"
+#~ msgid "root Password"
+#~ msgstr "root Password"
 
-#: control/control.SLES-for-VMware.glade:765 control/control.SLES.glade:789
-#: control/control.glade:286
-msgid "Installation Summary"
-msgstr "Installation Summary"
+#~ msgid "Check Installation"
+#~ msgstr "Check Installation"
 
-#: control/control.SLES-for-VMware.glade:1326 control/control.SLES.glade:1350
-msgid "Service"
-msgstr "Service"
+#~ msgid "Hostname"
+#~ msgstr "Hostname"
 
-#: control/control.SLES.glade:340
-msgid "KVM Virtualization Host (Local X11 Not Configured by Default)"
-msgstr ""
+#~ msgid "Users"
+#~ msgstr "Users"
 
-#: control/control.glade:276 control/control.openSUSE.glade:717
-msgid "Desktop Selection"
-msgstr "Desktop Selection"
+#~ msgid "Clean Up"
+#~ msgstr "Clean Up"
 
-#: control/control.glade:634
-msgid "Root Password"
-msgstr "Root Password"
+#, fuzzy
+#~ msgid "Server Base Scenario"
+#~ msgstr "Server Name: "
 
-#: control/control.openSUSE.glade:420
 #, 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"
+#~ msgid "Server Scenario"
+#~ msgstr "Server Settings"
 
-#: control/control.openSUSE.glade:438
-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 ""
+#~ msgid "Service"
+#~ msgstr "Service"
 
-#: control/control.openSUSE.glade:451
+#~ msgid "Desktop Selection"
+#~ msgstr "Desktop Selection"
+
+#~ msgid "Root Password"
+#~ msgstr "Root Password"
+
 #, fuzzy
-msgid "GNOME Desktop"
-msgstr "GNOME desktop"
+#~ 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"
 
-#: control/control.openSUSE.glade:452
 #, fuzzy
-msgid "KDE Desktop"
-msgstr "KDE desktop"
+#~ msgid "GNOME Desktop"
+#~ msgstr "GNOME desktop"
 
-#: control/control.openSUSE.glade:453
 #, fuzzy
-msgid "XFCE Desktop"
-msgstr "XFCE desktop"
+#~ msgid "KDE Desktop"
+#~ msgstr "KDE desktop"
 
-#: control/control.openSUSE.glade:454
 #, fuzzy
-msgid "LXDE Desktop"
-msgstr "KDE desktop"
+#~ msgid "XFCE Desktop"
+#~ msgstr "XFCE desktop"
 
-#: control/control.openSUSE.glade:455
-msgid "Minimal X Window"
-msgstr ""
+#, fuzzy
+#~ msgid "LXDE Desktop"
+#~ msgstr "KDE desktop"
 
-#: control/control.openSUSE.glade:456
 #, fuzzy
-#| msgid "Alternate Desktops"
-msgid "Enlightenment Desktop"
-msgstr "Alternate Desktops"
+#~| msgid "Alternate Desktops"
+#~ msgid "Enlightenment Desktop"
+#~ msgstr "Alternate Desktops"
 
-#: control/control.openSUSE.glade:457
-msgid "Minimal Server Selection (Text Mode)"
-msgstr ""
+#~ msgid "Online Repositories"
+#~ msgstr "Online Repositories"
 
-#: control/control.openSUSE.glade:699 control/control.openSUSE.glade:970
-msgid "Online Repositories"
-msgstr "Online Repositories"
-
 #~ msgid ""
 #~ "\n"
 #~ "<p><b>Congratulations!</b></p>\n"

Modified: trunk/yast/en_GB/po/country.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/country.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/country.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: country\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2008-03-27 19:17+0000\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"

Modified: trunk/yast/en_GB/po/crowbar.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/crowbar.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/crowbar.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:37+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\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"

Modified: trunk/yast/en_GB/po/dhcp-server.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/dhcp-server.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/dhcp-server.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: dhcp-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:38+0200\n"
+"POT-Creation-Date: 2014-08-18 12:43+0000\n"
 "PO-Revision-Date: 2008-03-27 19:18+0000\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"
@@ -519,7 +519,7 @@
 #. TRANSLATORS: table header item
 #. Table header item - IP of the host
 #: src/include/dhcp-server/dialogs2.rb:455
-#: src/include/dhcp-server/dialogs2.rb:1651
+#: src/include/dhcp-server/dialogs2.rb:1650
 msgid "IP"
 msgstr "IP"
 
@@ -540,22 +540,21 @@
 
 #. TRANSLATORS: popup error, DHCP Server needs to run on one or more interfaces,
 #. currently no one is selected
-#: src/include/dhcp-server/dialogs2.rb:609
+#: src/include/dhcp-server/dialogs2.rb:608
 msgid "At least one network interface must be selected."
 msgstr "At least one network interface must be selected."
 
 #. TRANSLATORS: popup error, DHCP Server requires selected interface to have
 #. at least minimal configuration
-#: src/include/dhcp-server/dialogs2.rb:617
+#: src/include/dhcp-server/dialogs2.rb:616
 #, fuzzy
 #| msgid ""
 #| "The selected network interface has currently no configuration (no assigned IP address \n"
 #| "and netmask). Using it in the DHCP server configuration may not work.\n"
 #| "Really use this interface?\n"
 msgid ""
-"The selected network interface is not configured (no assigned IP address \n"
-"and netmask). Using it in the DHCP server configuration may not work.\n"
-"Really use this interface?\n"
+"One or more selected network interfaces is not configured (no assigned IP address \n"
+"and netmask)."
 msgstr ""
 "The selected network interface has currently no configuration (no assigned IP address \n"
 "and netmask). Using it in the DHCP server configuration may not work.\n"
@@ -563,60 +562,60 @@
 
 #. configuration will be saved in ldap?
 #. check box
-#: src/include/dhcp-server/dialogs2.rb:633
+#: src/include/dhcp-server/dialogs2.rb:632
 #: src/include/dhcp-server/widgets.rb:1079
 msgid "&LDAP Support"
 msgstr "&LDAP Support"
 
 #. FATE #227, comments #5 and #17
-#: src/include/dhcp-server/dialogs2.rb:640
+#: src/include/dhcp-server/dialogs2.rb:639
 msgid "DHCP Server &Name (optional)"
 msgstr "DHCP Server &Name (optional)"
 
 #. Textentry with name of the domain
-#: src/include/dhcp-server/dialogs2.rb:653
+#: src/include/dhcp-server/dialogs2.rb:652
 msgid "&Domain Name"
 msgstr "&Domain Name"
 
 #. Textentry with IP address of primary name server
-#: src/include/dhcp-server/dialogs2.rb:655
+#: src/include/dhcp-server/dialogs2.rb:654
 msgid "&Primary Name Server IP"
 msgstr "&Primary Name Server IP"
 
 #. Textentry with IP address of secondary name server
-#: src/include/dhcp-server/dialogs2.rb:658
+#: src/include/dhcp-server/dialogs2.rb:657
 msgid "&Secondary Name Server IP"
 msgstr "&Secondary Name Server IP"
 
 #. Textentry with IP address of default router
-#: src/include/dhcp-server/dialogs2.rb:661
+#: src/include/dhcp-server/dialogs2.rb:660
 msgid "Default &Gateway (Router) "
 msgstr "Default &Gateway (Router) "
 
 #. Textentry with IP address of time server
-#: src/include/dhcp-server/dialogs2.rb:666
+#: src/include/dhcp-server/dialogs2.rb:665
 msgid "NTP &Time Server"
 msgstr "NTP &Time Server"
 
 #. Textentry with IP address of print server
-#: src/include/dhcp-server/dialogs2.rb:668
+#: src/include/dhcp-server/dialogs2.rb:667
 msgid "&Print Server"
 msgstr "&Print Server"
 
 #. Textentry with IP address of WINS (Windows Internet Naming Service) server
-#: src/include/dhcp-server/dialogs2.rb:670
+#: src/include/dhcp-server/dialogs2.rb:669
 msgid "&WINS Server"
 msgstr "&WINS Server"
 
 #. Textentry with default lease time of IP address from dhcp server
-#: src/include/dhcp-server/dialogs2.rb:675
+#: src/include/dhcp-server/dialogs2.rb:674
 msgid "Default &Lease Time"
 msgstr "Default &Lease Time"
 
 #. Units for defaultleasetime
 #. Combobox - type of units for lease time
-#: src/include/dhcp-server/dialogs2.rb:684
-#: src/include/dhcp-server/dialogs2.rb:1140
+#: src/include/dhcp-server/dialogs2.rb:683
+#: src/include/dhcp-server/dialogs2.rb:1139
 msgid "&Units"
 msgstr "&Units"
 
@@ -624,48 +623,48 @@
 #. error popup
 #. error popup
 #. error popup
-#: src/include/dhcp-server/dialogs2.rb:1018
-#: src/include/dhcp-server/dialogs2.rb:1030
-#: src/include/dhcp-server/dialogs2.rb:1042
-#: src/include/dhcp-server/dialogs2.rb:1054
+#: src/include/dhcp-server/dialogs2.rb:1017
+#: src/include/dhcp-server/dialogs2.rb:1029
+#: src/include/dhcp-server/dialogs2.rb:1041
+#: src/include/dhcp-server/dialogs2.rb:1053
 msgid "The specified value is not a valid hostname or IP address."
 msgstr "The specified value is not a valid hostname or IP address."
 
 #. frame
-#: src/include/dhcp-server/dialogs2.rb:1068
+#: src/include/dhcp-server/dialogs2.rb:1067
 msgid "Subnet Information"
 msgstr "Subnet Information"
 
 #. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1074
+#: src/include/dhcp-server/dialogs2.rb:1073
 msgid "Current &Network"
 msgstr "Current &Network"
 
 #. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1079
+#: src/include/dhcp-server/dialogs2.rb:1078
 msgid "Current Net&mask"
 msgstr "Current Net&mask"
 
 #. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1084
+#: src/include/dhcp-server/dialogs2.rb:1083
 msgid "Netmask Bi&ts"
 msgstr "Netmask Bi&ts"
 
 #. text entry
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1091
+#: src/include/dhcp-server/dialogs2.rb:1090
 #: src/include/dhcp-server/dns-server-dialogs.rb:81
 msgid "Min&imum IP Address"
 msgstr "Min&imum IP Address"
 
 #. text entry
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1096
+#: src/include/dhcp-server/dialogs2.rb:1095
 #: src/include/dhcp-server/dns-server-dialogs.rb:83
 msgid "Ma&ximum IP Address"
 msgstr "Ma&ximum IP Address"
 
-#: src/include/dhcp-server/dialogs2.rb:1104
+#: src/include/dhcp-server/dialogs2.rb:1103
 msgid "IP Address Range"
 msgstr "IP Address Range"
 
@@ -673,7 +672,7 @@
 #. TRANSLATORS: text entry
 #. TRANSLATORS: text entry
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1110
+#: src/include/dhcp-server/dialogs2.rb:1109
 #: src/include/dhcp-server/dns-server-dialogs.rb:93
 #: src/include/dhcp-server/dns-server-management.rb:356
 #: src/include/dhcp-server/dns-server-management.rb:917
@@ -684,7 +683,7 @@
 #. TRANSLATORS: text entry
 #. TRANSLATORS: text entry
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1115
+#: src/include/dhcp-server/dialogs2.rb:1114
 #: src/include/dhcp-server/dns-server-dialogs.rb:95
 #: src/include/dhcp-server/dns-server-management.rb:358
 #: src/include/dhcp-server/dns-server-management.rb:919
@@ -692,53 +691,53 @@
 msgstr "&Last IP Address"
 
 #. checkbox
-#: src/include/dhcp-server/dialogs2.rb:1119
+#: src/include/dhcp-server/dialogs2.rb:1118
 #: src/include/dhcp-server/options.rb:1094
 msgid "Allow Dynamic &BOOTP"
 msgstr "Allow Dynamic &BOOTP"
 
 #. frame label
-#: src/include/dhcp-server/dialogs2.rb:1125
+#: src/include/dhcp-server/dialogs2.rb:1124
 msgid "Lease Time"
 msgstr "Lease Time"
 
 #. Textentry label - lease time for IPs in the range
-#: src/include/dhcp-server/dialogs2.rb:1131
+#: src/include/dhcp-server/dialogs2.rb:1130
 msgid "&Default"
 msgstr "&Default"
 
 #. TextEntryLabel - max. time for leasing of IPs from the range
-#: src/include/dhcp-server/dialogs2.rb:1149
+#: src/include/dhcp-server/dialogs2.rb:1148
 msgid "&Maximum"
 msgstr "&Maximum"
 
 #. Combobox - type of units for max lease time
-#: src/include/dhcp-server/dialogs2.rb:1159
+#: src/include/dhcp-server/dialogs2.rb:1158
 msgid "Uni&ts"
 msgstr "Uni&ts"
 
 #. zone is not maintained by the DNS server
 #. zone is maintained and it is a 'master'
-#: src/include/dhcp-server/dialogs2.rb:1361
-#: src/include/dhcp-server/dialogs2.rb:1370
+#: src/include/dhcp-server/dialogs2.rb:1360
+#: src/include/dhcp-server/dialogs2.rb:1369
 msgid "Create New DNS Zone from Scratch"
 msgstr "Create New DNS Zone from Scratch"
 
-#: src/include/dhcp-server/dialogs2.rb:1372
+#: src/include/dhcp-server/dialogs2.rb:1371
 msgid "Edit Current DNS Zone"
 msgstr "Edit Current DNS Zone"
 
 #. zone is maintained but it is not a 'master'
-#: src/include/dhcp-server/dialogs2.rb:1378
+#: src/include/dhcp-server/dialogs2.rb:1377
 msgid "Get Current Zone Information"
 msgstr "Get Current Zone Information"
 
-#: src/include/dhcp-server/dialogs2.rb:1386
+#: src/include/dhcp-server/dialogs2.rb:1385
 msgid "&Synchronize DNS Server..."
 msgstr "&Synchronize DNS Server..."
 
 #. Show DNS Zone Information
-#: src/include/dhcp-server/dialogs2.rb:1415
+#: src/include/dhcp-server/dialogs2.rb:1414
 #, fuzzy
 msgid ""
 "DNS zone %1 is not a master zone.\n"
@@ -749,8 +748,8 @@
 
 #. A popup error text
 #. A popup error text
-#: src/include/dhcp-server/dialogs2.rb:1548
-#: src/include/dhcp-server/dialogs2.rb:1556
+#: src/include/dhcp-server/dialogs2.rb:1547
+#: src/include/dhcp-server/dialogs2.rb:1555
 msgid "Enter values for both ends of the IP address range."
 msgstr "Enter values for both ends of the IP address range."
 
@@ -758,8 +757,8 @@
 #. %1 is the tested IP which should match network %2 and netmask %3
 #. TRANSLATORS: popup error message
 #. %1 is the tested IP which should match network %2 and netmask %3
-#: src/include/dhcp-server/dialogs2.rb:1595
-#: src/include/dhcp-server/dialogs2.rb:1618
+#: src/include/dhcp-server/dialogs2.rb:1594
+#: src/include/dhcp-server/dialogs2.rb:1617
 msgid ""
 "The dynamic DHCP address range must be in the same network as the DHCP server.\n"
 "IP %1 does not match the network %2/%3."
@@ -768,127 +767,127 @@
 "IP %1 does not match the network %2/%3."
 
 #. Label of the registered hosts table
-#: src/include/dhcp-server/dialogs2.rb:1643
+#: src/include/dhcp-server/dialogs2.rb:1642
 msgid "Registered Host"
 msgstr "Registered Host"
 
 #. Table header item - Name of the host
-#: src/include/dhcp-server/dialogs2.rb:1649
+#: src/include/dhcp-server/dialogs2.rb:1648
 msgid "Name"
 msgstr "Name"
 
 #. MAC address of the host
-#: src/include/dhcp-server/dialogs2.rb:1653
+#: src/include/dhcp-server/dialogs2.rb:1652
 msgid "Hardware Address"
 msgstr "Hardware Address"
 
 #. Network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1655
+#: src/include/dhcp-server/dialogs2.rb:1654
 msgid "Type"
 msgstr "Type"
 
 #. Frame label - configuration of particular host
-#: src/include/dhcp-server/dialogs2.rb:1662
+#: src/include/dhcp-server/dialogs2.rb:1661
 msgid "List Setup"
 msgstr "List Setup"
 
 #. Textentry label - name of the host
-#: src/include/dhcp-server/dialogs2.rb:1670
+#: src/include/dhcp-server/dialogs2.rb:1669
 msgid "&Name"
 msgstr "&Name"
 
 #. Textentry label - IP address of the host
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1675
+#: src/include/dhcp-server/dialogs2.rb:1674
 #: src/include/dhcp-server/dns-server-management.rb:229
 msgid "&IP Address"
 msgstr "&IP Address"
 
 #. Textentry label - hardware (mac) address of the host
-#: src/include/dhcp-server/dialogs2.rb:1683
+#: src/include/dhcp-server/dialogs2.rb:1682
 msgid "&Hardware Address"
 msgstr "&Hardware Address"
 
 #. Radiobutton label - network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1690
+#: src/include/dhcp-server/dialogs2.rb:1689
 msgid "&Ethernet"
 msgstr "&Ethernet"
 
-#: src/include/dhcp-server/dialogs2.rb:1692
+#: src/include/dhcp-server/dialogs2.rb:1691
 msgid "&Token Ring"
 msgstr "&Token Ring"
 
 #. Pushbutton label - change host in list
-#: src/include/dhcp-server/dialogs2.rb:1707
+#: src/include/dhcp-server/dialogs2.rb:1706
 msgid "C&hange in List"
 msgstr "C&hange in List"
 
 #. Pushbutton label - delete host from list
-#: src/include/dhcp-server/dialogs2.rb:1710
+#: src/include/dhcp-server/dialogs2.rb:1709
 msgid "Dele&te from List"
 msgstr "Dele&te from List"
 
 #. now, fill the dialog
 #. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1811
+#: src/include/dhcp-server/dialogs2.rb:1810
 #: src/include/dhcp-server/options.rb:1039
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1812
+#: src/include/dhcp-server/dialogs2.rb:1811
 #: src/include/dhcp-server/options.rb:1041
 msgid "Token Ring"
 msgstr "Token Ring"
 
 #. error popup
 #. error popup
-#: src/include/dhcp-server/dialogs2.rb:1886
+#: src/include/dhcp-server/dialogs2.rb:1885
 #: src/include/dhcp-server/options.rb:935
 msgid "The hardware address is invalid.\n"
 msgstr "The hardware address is invalid.\n"
 
 #. error popup
-#: src/include/dhcp-server/dialogs2.rb:1932
+#: src/include/dhcp-server/dialogs2.rb:1931
 msgid "The hardware address must be unique."
 msgstr "The hardware address must be unique."
 
 #. error popup
-#: src/include/dhcp-server/dialogs2.rb:1942
+#: src/include/dhcp-server/dialogs2.rb:1941
 msgid "The hostname cannot be empty."
 msgstr "The hostname cannot be empty."
 
 #. error popup, %1 is host name
-#: src/include/dhcp-server/dialogs2.rb:1952
+#: src/include/dhcp-server/dialogs2.rb:1951
 msgid "A host named %1 already exists."
 msgstr "A host named %1 already exists."
 
 #. error popup
 #. FIXME: text?
-#: src/include/dhcp-server/dialogs2.rb:1970
-#: src/include/dhcp-server/dialogs2.rb:2034
+#: src/include/dhcp-server/dialogs2.rb:1969
+#: src/include/dhcp-server/dialogs2.rb:2033
 msgid "Enter a host IP."
 msgstr "Enter a host IP."
 
 #. error popup
-#: src/include/dhcp-server/dialogs2.rb:1985
+#: src/include/dhcp-server/dialogs2.rb:1984
 msgid "The hardware address must be defined."
 msgstr "The hardware address must be defined."
 
 #. error popup
 #. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:2006
-#: src/include/dhcp-server/dialogs2.rb:2021
+#: src/include/dhcp-server/dialogs2.rb:2005
+#: src/include/dhcp-server/dialogs2.rb:2020
 msgid "Select a host first."
 msgstr "Select a host first."
 
 #. checking new MAC
-#: src/include/dhcp-server/dialogs2.rb:2048
+#: src/include/dhcp-server/dialogs2.rb:2047
 msgid "The input value must be defined."
 msgstr "The input value must be defined."
 
 #. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:2087
+#: src/include/dhcp-server/dialogs2.rb:2086
 msgid ""
 "If you enter the expert settings, you cannot return \n"
 "to this dialog. You may be able to display this dialog \n"
@@ -909,15 +908,15 @@
 "Continue?"
 
 #. remove leading '-'
-#: src/include/dhcp-server/dialogs2.rb:2134
+#: src/include/dhcp-server/dialogs2.rb:2133
 msgid "\"-%1\" is not a valid DHCP server commandline option"
 msgstr "\"-%1\" is not a valid DHCP server commandline option"
 
-#: src/include/dhcp-server/dialogs2.rb:2145
+#: src/include/dhcp-server/dialogs2.rb:2144
 msgid "DHCP server commandline option \"-%1\" requires an argument"
 msgstr "DHCP server commandline option \"-%1\" requires an argument"
 
-#: src/include/dhcp-server/dialogs2.rb:2156
+#: src/include/dhcp-server/dialogs2.rb:2155
 #, fuzzy
 #| msgid ""
 #| "You have specified an alternate configuration file for the DHCP server.\n"
@@ -945,7 +944,7 @@
 "Really continue?\n"
 
 #. dialog caption, %1 is step number
-#: src/include/dhcp-server/dialogs2.rb:2237
+#: src/include/dhcp-server/dialogs2.rb:2236
 msgid "DHCP Server Wizard (%1 of 4)"
 msgstr "DHCP Server Wizard (%1 of 4)"
 

Modified: trunk/yast/en_GB/po/dns-server.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/dns-server.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/dns-server.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: dns-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2007-08-16 16:32+0100\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"

Modified: trunk/yast/en_GB/po/drbd.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/drbd.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/drbd.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:38+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\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"
@@ -24,6 +24,16 @@
 msgid "Configuration of DRBD"
 msgstr "Global Configuration"
 
+#. Rich text title for Drbd in proposals
+#: src/clients/drbd_proposal.rb:86
+msgid "DRBD"
+msgstr ""
+
+#. Menu title for Drbd in proposals
+#: src/clients/drbd_proposal.rb:88
+msgid "&DRBD"
+msgstr ""
+
 #. encoding: utf-8
 #. ------------------------------------------------------------------------------
 #. Copyright (c) 2006 Novell, Inc. All Rights Reserved.
@@ -62,23 +72,83 @@
 msgid "Resource Configuration"
 msgstr "Source Configuration"
 
+#: src/include/drbd/common.rb:47
+#, fuzzy
+msgid "Resource Basic Configuration"
+msgstr "Source Configuration"
+
+#: src/include/drbd/common.rb:48
+#, fuzzy
+msgid "Resource Advanced Configuration"
+msgstr "Source Configuration"
+
+#. 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/drbd/dialogs.ycp
+#. Package:	Configuration of drbd
+#. Summary:	Dialogs definitions
+#. Authors:	xwhu <xwhu@novell.com>
+#.
+#. $Id: dialogs.ycp 27914 2006-02-13 14:32:08Z locilka $
+#: src/include/drbd/dialogs.rb:51
+msgid "Warning: YaST2 DRBD module will rename all\n"
+msgstr ""
+
+#: src/include/drbd/dialogs.rb:52
+msgid ""
+"included files for DRBD into a supported schema.\n"
+"\n"
+"Do you want to continue?"
+msgstr ""
+
+#: src/include/drbd/dialogs.rb:69
+#, fuzzy
+#| msgid "Cannot read configuration file."
+msgid "Failed to read DRBD configuration file:\n"
+msgstr "Cannot read configuration file."
+
+#: src/include/drbd/dialogs.rb:86
+#, fuzzy
+#| msgid "Failed to determine the configuration for scanning via network."
+msgid "Failed to write configuration to disk:\n"
+msgstr "Failed to determine the configuration for scanning via network."
+
 #. Drbd configure1 dialog caption
 #. Drbd configure2 dialog caption
-#: src/include/drbd/dialogs.rb:60 src/include/drbd/dialogs.rb:99
+#: src/include/drbd/dialogs.rb:99 src/include/drbd/dialogs.rb:138
 #, fuzzy
 msgid "DRBD Configuration"
 msgstr "Node Configuration"
 
 #. Drbd configure1 dialog contents
-#: src/include/drbd/dialogs.rb:63
+#: src/include/drbd/dialogs.rb:102
 #, fuzzy
-msgid "First part of DRBD configuration"
-msgstr "First part of configuration of squidguard"
+#| msgid "First part of configuration of CASA"
+msgid "First part of configuration of DRBD"
+msgstr "First part of configuration of CASA"
 
 #. Drbd configure2 dialog contents
-#: src/include/drbd/dialogs.rb:102
+#: src/include/drbd/dialogs.rb:141
 #, fuzzy
-msgid "Second part of DRBD configuration"
+#| msgid "Second part of configuration of CASA"
+msgid "Second part of configuration of DRBD"
 msgstr "Second part of configuration of CASA"
 
 #. encoding: utf-8
@@ -110,7 +180,7 @@
 #| "Please wait...<br></p>\n"
 msgid ""
 "<p><b><big>Initializing DRBD Configuration</big></b><br>\n"
-"</p>\n"
+"Please wait...<br></p>\n"
 msgstr ""
 "<p><b><big>Initialising Configuration</big></b><br>\n"
 "Please wait...<br></p>\n"
@@ -128,14 +198,14 @@
 #: src/include/drbd/helps.rb:44
 #, fuzzy
 #| msgid ""
-#| "<p><b><big>NFS Server Configuration</big></b><br>\n"
-#| "</p>"
+#| "<p><b><big>Saving Configuration</big></b><br>\n"
+#| "Please wait...<br></p>\n"
 msgid ""
 "<p><b><big>Saving DRBD Configuration</big></b><br>\n"
-"</p>\n"
+"Please wait...<br></p>\n"
 msgstr ""
-"<p><b><big>NFS Server Configuration</big></b><br>\n"
-"</p>"
+"<p><b><big>Saving Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 
 #. Write dialog help 2/2
 #: src/include/drbd/helps.rb:48
@@ -157,14 +227,79 @@
 
 #: src/include/drbd/helps.rb:55
 #, fuzzy
+msgid "<p><b><big>Startup Configuration of DRBD</big></b></p>"
+msgstr "<p><b><big>Connection Configuration</big></b></p>"
+
+#: src/include/drbd/helps.rb:58
+msgid ""
+"<p><b>Booting:</b></p>\n"
+"\t\t\t<p>checking \"On\" to start DRBD server Now and when booting</p>\n"
+"\t\t\t<p>checking \"Off\", DRBD server only starts manually</p>\n"
+"\t\t<p><b>Switch On and Off:</b></p>\n"
+"\t\t\t<p>Starting or Stopping DRBD Server right now</p>\n"
+"\t\t"
+msgstr ""
+
+#: src/include/drbd/helps.rb:66 src/include/drbd/helps.rb:72
+#: src/include/drbd/helps.rb:85
+#, fuzzy
+msgid "<p><b><big>Resource Configuration of DRBD</big></b></p>"
+msgstr "<p><b><big>Connection Configuration</big></b></p>"
+
+#: src/include/drbd/helps.rb:69
+msgid ""
+"<p>Clicking \"Add\", \"Edit\", \"Delete\" button to add, edit or delete a resource</p>\n"
+"\t\t"
+msgstr ""
+
+#: 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>\"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>\"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"
+msgstr ""
+
+#: src/include/drbd/helps.rb:88
+msgid ""
+"\n"
+"\t\t<p><b>Protocol</b></p>\n"
+"\t\t<p>Protocol A: write IO is reported as completed, if it has reached local disk and local TCP send buffer.</p>\n"
+"\t\t<p>Protocol B: write IO is reported as completed, if it has reached local disk and remote buffer cache.</p>\n"
+"\t\t<p>Protocol C: write IO is reported as completed, if it has reached both local and remote disk.</p>\n"
+"\t\t\t\t\t\t\t\t\t\t  \n"
+"\t\t<p><b>wfc-timeout</b>: Wait for connection timeout</p>\n"
+"\t\t<p><b>degr-wfc-timeout</b>: Wait for connection timeout, if this node was a degraded cluster</p>\n"
+"\n"
+"\t\t<p><b>on-io-error</b>: What to do when the lower level device reports io-error to the upper layers</p>\n"
+"\t\t<p><b>sndbuf-size</b>: The size of the TCP socket send buffer</p>\n"
+"\t\t<p><b>max-buffers</b>: Maximum number of requests to be allocated by DRBD</p>\n"
+"\n"
+"\t\t<p><b>timeout</b>: If the partner node fails to send an expected response packet within time 10ths of a second, the partner node is considered dead and therefore  the TCP/IP connection is abandoned. This must be lower than connect-int and ping-int. The default value is 60 = 6 seconds, the unit 0.1 seconds.</p>\n"
+"\t\t<p><b>connect-int</b>: The time the peer has time to answer to a keep-alive packet. In case the peer's reply is not received within this time period, it is considered as dead. The default value is 500ms, the default unit is 100ms</p>\n"
+"\t\t<p><b>ping-int</b>: The time the peer has time to answer to a keep-alive packet</p>\n"
+"\n"
+"\t\t<p><b>max-epoch-size</b>: The highest number of data blocks between two write barriers</p>\n"
+"\t\t<p><b>ko-count</b>: the secondary node fails to complete a single write request for count times the timeout, it is expelled from the cluster. The default value is 0, which disables this feature.</p>\n"
+"\t\t<p><b>rate</b>: To  ensure a smooth operation of the application on top of DRBD, it is possible to limit the bandwidth which may be used by background synchronizations. The default is 250 KB/sec, the default unit is KB/sec.</p>\n"
+"\t\t<p><b>al-extents</b>: parameter  you control how big the hot area (= active set) can get. The default number of extents is 127. (Minimum: 7, Maximum: 3843)</p>\n"
+"\t\t"
+msgstr ""
+
+#: src/include/drbd/helps.rb:112
+#, fuzzy
 msgid "<p><b><big>Global Configuration of DRBD</big></b></p>"
 msgstr "<p><b><big>Connection Configuration</big></b></p>"
 
-#: src/include/drbd/helps.rb:58
+#: src/include/drbd/helps.rb:115
 msgid "<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's sanity check</p>"
 msgstr ""
 
-#: src/include/drbd/helps.rb:61
+#: src/include/drbd/helps.rb:118
 msgid ""
 "<p><b>Dialog Refresh:</b> The user dialog counts and displays the seconds it waited so\n"
 "                far. You might want to disable this if you have the console\n"
@@ -174,31 +309,37 @@
 "                set it to 0 to disable redrawing completely. </p>"
 msgstr ""
 
-#: src/include/drbd/helps.rb:69
+#: src/include/drbd/helps.rb:126
 msgid ""
 "<p><b>Minor Count:</b>\n"
-"Use this option if you want to define more resources later without reloading the\n"
-"module. By default we load the module with exactly as many devices as\n"
-"configured in this file.</p>\n"
+"           use this if you want to define more resources later\n"
+"           without reloading the module.\n"
+"           by default we load the module with exactly as many devices\n"
+"           as configured mentioned in this file. </p>"
 msgstr ""
 
 #. Summary dialog help 1/3
-#: src/include/drbd/helps.rb:76
+#: src/include/drbd/helps.rb:134
 #, fuzzy
 msgid ""
 "<p><b><big>DRBD Configuration</big></b><br>\n"
-"Configure DRBD here.<br></p>\n"
+"Configure drbd here.<br></p>\n"
 msgstr ""
 "<p><b><big>Squid Configuration</big></b><br>\n"
 "Configure squid here.<br></p>\n"
 
 #. Summary dialog help 2/3
-#: src/include/drbd/helps.rb:80
+#: src/include/drbd/helps.rb:138
 #, fuzzy
+#| msgid ""
+#| "<p><b><big>Adding a Kdump:</big></b><br>\n"
+#| "Choose an kdump from the list of detected kdumps.\n"
+#| "If your kdump was not detected, use <b>Other (not detected)</b>.\n"
+#| "Then press <b>Configure</b>.</p>\n"
 msgid ""
-"<p><b><big>Adding a DRBD:</big></b><br>\n"
-"Choose a DRBD from the list of detected DRBDs.\n"
-"If your DRBD was not detected, use <b>Other (not detected)</b>.\n"
+"<p><b><big>Adding a drbd:</big></b><br>\n"
+"Choose an drbd from the list of detected drbds.\n"
+"If your drbd was not detected, use <b>Other (not detected)</b>.\n"
 "Then press <b>Configure</b>.</p>\n"
 msgstr ""
 "<p><b><big>Adding a Kdump:</big></b><br>\n"
@@ -207,7 +348,7 @@
 "Then press <b>Configure</b>.</p>\n"
 
 #. Summary dialog help 3/3
-#: src/include/drbd/helps.rb:87
+#: src/include/drbd/helps.rb:145
 msgid ""
 "<p><b><big>Editing or Deleting:</big></b><br>\n"
 "If you press <b>Edit</b>, an additional dialog in which to change\n"
@@ -218,11 +359,11 @@
 "the configuration opens.</p>\n"
 
 #. Ovreview dialog help 1/3
-#: src/include/drbd/helps.rb:93
+#: src/include/drbd/helps.rb:151
 #, fuzzy
 msgid ""
 "<p><b><big>DRBD Configuration Overview</big></b><br>\n"
-"Obtain an overview of installed DRBDS. Additionally\n"
+"Obtain an overview of installed drbds. Additionally\n"
 "edit their configurations.<br></p>\n"
 msgstr ""
 "<p><b><big>Squid Configuration Overview</big></b><br>\n"
@@ -230,21 +371,28 @@
 "edit their configurations.<br></p>\n"
 
 #. Ovreview dialog help 2/3
-#: src/include/drbd/helps.rb:99
+#: src/include/drbd/helps.rb:157
 #, fuzzy
+#| msgid ""
+#| "<p><b><big>Adding a Kdump:</big></b><br>\n"
+#| "Press <b>Add</b> to configure a kdump.</p>"
 msgid ""
-"<p><b><big>Adding a DRBD:</big></b><br>\n"
-"Press <b>Add</b> to configure a DRBD.</p>\n"
+"<p><b><big>Adding a drbd:</big></b><br>\n"
+"Press <b>Add</b> to configure a drbd.</p>"
 msgstr ""
 "<p><b><big>Adding a Kdump:</big></b><br>\n"
 "Press <b>Add</b> to configure a kdump.</p>"
 
 #. Ovreview dialog help 3/3
-#: src/include/drbd/helps.rb:103
+#: src/include/drbd/helps.rb:161
 #, fuzzy
+#| msgid ""
+#| "<p><b><big>Editing or Deleting:</big></b><br>\n"
+#| "Choose a kdump to change or remove.\n"
+#| "Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n"
 msgid ""
 "<p><b><big>Editing or Deleting:</big></b><br>\n"
-"Choose a DRBD to change or remove.\n"
+"Choose a drbd to change or remove.\n"
 "Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n"
 msgstr ""
 "<p><b><big>Editing or Deleting:</big></b><br>\n"
@@ -252,7 +400,7 @@
 "Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n"
 
 #. Configure1 dialog help 1/2
-#: src/include/drbd/helps.rb:109
+#: src/include/drbd/helps.rb:167
 msgid ""
 "<p><b><big>Configuration Part One</big></b><br>\n"
 "Press <b>Next</b> to continue.\n"
@@ -264,7 +412,7 @@
 
 #. Configure1 dialog help 2/2
 #. Configure2 dialog help 2/2
-#: src/include/drbd/helps.rb:115 src/include/drbd/helps.rb:127
+#: src/include/drbd/helps.rb:173 src/include/drbd/helps.rb:185
 msgid ""
 "<p><b><big>Selecting Something</big></b><br>\n"
 "It is not possible. You must code it first. :-)\n"
@@ -275,7 +423,7 @@
 "</p>"
 
 #. Configure2 dialog help 1/2
-#: src/include/drbd/helps.rb:121
+#: src/include/drbd/helps.rb:179
 msgid ""
 "<p><b><big>Configuration Part Two</big></b><br>\n"
 "Press <b>Next</b> to continue.\n"
@@ -295,14 +443,15 @@
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/include/drbd/resource_conf.rb:545
+#. myHelp("basic_conf");
+#: src/include/drbd/resource_conf.rb:546
 #, fuzzy
 #| msgid "Scheme name must be set."
 msgid "Node names must be different."
 msgstr "Scheme name must be set."
 
-#: src/include/drbd/resource_conf.rb:567
-msgid "Fill out all fields."
+#: src/include/drbd/resource_conf.rb:568
+msgid "Please fill out all fields."
 msgstr ""
 
 #. encoding: utf-8
@@ -347,8 +496,8 @@
 
 #: src/include/drbd/startup_conf.rb:81
 msgid ""
-"To propagate this configuration,\n"
-"copy the configuration file '/etc/drbd.conf' to the rest of nodes manually.\n"
+"To propagate this configuration ,\n"
+"copy the configuration file '/etc/drbd.conf' to the rest of nodes manually."
 msgstr ""
 
 #. }
@@ -366,98 +515,225 @@
 #: src/include/drbd/startup_conf.rb:142
 #, fuzzy
 #| msgid "Starting the 'lirc' service failed."
-msgid "Starting DRBD service failed."
+msgid "Start DRBD service failed"
 msgstr "Starting the 'lirc' service failed."
 
 #. Report::Error ( Service::Error() );
 #: src/include/drbd/startup_conf.rb:150
 #, fuzzy
 #| msgid "Stop services"
-msgid "Stopping DRBD service failed."
+msgid "Stop DRBD service failed"
 msgstr "Stop services"
 
 #. Initialization dialog caption
-#: src/include/drbd/wizards.rb:136
+#: src/include/drbd/wizards.rb:137
 msgid "Heartbeat Configuration"
 msgstr "Heartbeat Configuration"
 
 #. Initialization dialog contents
-#: src/include/drbd/wizards.rb:138
+#: src/include/drbd/wizards.rb:139
 msgid "Initializing..."
 msgstr "Initialising..."
 
+#. 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:	modules/Drbd.ycp
+#. Package:	Configuration of drbd
+#. Summary:	Drbd settings, input and output functions
+#. Authors:	xwhu <xwhu@novell.com>
+#.
+#. $Id: Drbd.ycp 27914 2006-02-13 14:32:08Z locilka $
+#.
+#. Representation of the configuration of drbd.
+#. Input and output routines.
+#: src/modules/Drbd.rb:101
+msgid "Failed to merge separated DRBD conf files\n"
+msgstr ""
+
+#: src/modules/Drbd.rb:123
+#, fuzzy
+#| msgid "Unable to write to idmapd.conf."
+msgid "Failed to write drbd.conf.YaST2prepare"
+msgstr "Unable to write to idmapd.conf."
+
 #. DRBD read dialog caption
-#: src/modules/Drbd.rb:71
+#: src/modules/Drbd.rb:133
 #, fuzzy
 msgid "Initializing DRBD Configuration"
 msgstr "Initialising DSL Configuration"
 
 #. We do not set help text here, because it was set outside
-#: src/modules/Drbd.rb:79
+#: src/modules/Drbd.rb:141
 #, fuzzy
 msgid "Read global settings"
 msgstr "Read global Samba settings"
 
-#: src/modules/Drbd.rb:80
+#: src/modules/Drbd.rb:142
 msgid "Read resources"
 msgstr "Read resources"
 
-#: src/modules/Drbd.rb:81
+#: src/modules/Drbd.rb:143
 msgid "Read daemon status"
 msgstr "Read daemon status"
 
-#: src/modules/Drbd.rb:84
+#: src/modules/Drbd.rb:146
 #, fuzzy
 msgid "Reading global settings..."
 msgstr "Reading global Samba settings..."
 
-#: src/modules/Drbd.rb:85
+#: src/modules/Drbd.rb:147
 msgid "Reading resources..."
 msgstr "Reading resources..."
 
-#: src/modules/Drbd.rb:86
+#: src/modules/Drbd.rb:148
 msgid "Reading daemon status..."
 msgstr "Reading daemon status..."
 
-#: src/modules/Drbd.rb:87 src/modules/Drbd.rb:293
+#: src/modules/Drbd.rb:149 src/modules/Drbd.rb:492
 msgid "Finished"
 msgstr "Finished"
 
+#. new_map = remove(new_map, key);
+#: src/modules/Drbd.rb:412
+#, fuzzy
+#| msgid "Failed to save ipsec.conf:"
+msgid "Failed to backup drbd.conf"
+msgstr "Failed to save ipsec.conf:"
+
+#: src/modules/Drbd.rb:421
+msgid "Failed to clean drbd.conf for drbdadm test"
+msgstr ""
+
+#: src/modules/Drbd.rb:445
+#, fuzzy
+#| msgid "Configuration of Resource Groups"
+msgid ""
+"Invalid configuration of resource %1\n"
+"%2"
+msgstr "Configuration of Resource Groups"
+
+#: src/modules/Drbd.rb:464
+msgid "Failed to bring drbd.conf back"
+msgstr ""
+
 #. DRBD write dialog caption
-#: src/modules/Drbd.rb:275
+#: src/modules/Drbd.rb:474
 #, fuzzy
 msgid "Writing DRBD Configuration"
 msgstr "Writing NFS Configuration"
 
 #. if (!modified) return true;
 #. We do not set help text here, because it was set outside
-#: src/modules/Drbd.rb:285
+#: src/modules/Drbd.rb:484
 msgid "Write global settings"
 msgstr "Write global settings"
 
-#: src/modules/Drbd.rb:286
+#: src/modules/Drbd.rb:485
 msgid "Write resources"
 msgstr "Write resources"
 
-#: src/modules/Drbd.rb:287
+#: src/modules/Drbd.rb:486
 #, fuzzy
 msgid "Set daemon status"
 msgstr "Read daemon status"
 
-#: src/modules/Drbd.rb:290
+#: src/modules/Drbd.rb:489
 msgid "Writing global settings..."
 msgstr "Writing global settings..."
 
-#: src/modules/Drbd.rb:291
+#: src/modules/Drbd.rb:490
 msgid "Writing resources..."
 msgstr "Writing resources..."
 
-#: src/modules/Drbd.rb:292
+#: src/modules/Drbd.rb:491
 #, fuzzy
 msgid "Setting daemon status..."
 msgstr "Reading daemon status..."
 
+#: src/modules/Drbd.rb:502
 #, fuzzy
+#| msgid "Unable to create directory '%1'."
+msgid "Failed to make directory /etc/drbd.d"
+msgstr "Unable to create directory '%1'."
+
+#, fuzzy
+#~ msgid "First part of DRBD configuration"
+#~ msgstr "First part of configuration of squidguard"
+
+#, fuzzy
+#~ msgid "Second part of DRBD configuration"
+#~ msgstr "Second part of configuration of CASA"
+
+#, fuzzy
+#~| msgid ""
+#~| "<p><b><big>Initializing Configuration</big></b><br>\n"
+#~| "Please wait...<br></p>\n"
+#~ msgid ""
+#~ "<p><b><big>Initializing DRBD Configuration</big></b><br>\n"
+#~ "</p>\n"
+#~ msgstr ""
+#~ "<p><b><big>Initialising Configuration</big></b><br>\n"
+#~ "Please wait...<br></p>\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "<p><b><big>NFS Server Configuration</big></b><br>\n"
+#~| "</p>"
+#~ msgid ""
+#~ "<p><b><big>Saving DRBD Configuration</big></b><br>\n"
+#~ "</p>\n"
+#~ msgstr ""
+#~ "<p><b><big>NFS Server Configuration</big></b><br>\n"
+#~ "</p>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p><b><big>Adding a DRBD:</big></b><br>\n"
+#~ "Choose a DRBD from the list of detected DRBDs.\n"
+#~ "If your DRBD was not detected, use <b>Other (not detected)</b>.\n"
+#~ "Then press <b>Configure</b>.</p>\n"
+#~ msgstr ""
+#~ "<p><b><big>Adding a Kdump:</big></b><br>\n"
+#~ "Choose an kdump from the list of detected kdumps.\n"
+#~ "If your kdump was not detected, use <b>Other (not detected)</b>.\n"
+#~ "Then press <b>Configure</b>.</p>\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p><b><big>Adding a DRBD:</big></b><br>\n"
+#~ "Press <b>Add</b> to configure a DRBD.</p>\n"
+#~ msgstr ""
+#~ "<p><b><big>Adding a Kdump:</big></b><br>\n"
+#~ "Press <b>Add</b> to configure a kdump.</p>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p><b><big>Editing or Deleting:</big></b><br>\n"
+#~ "Choose a DRBD to change or remove.\n"
+#~ "Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n"
+#~ msgstr ""
+#~ "<p><b><big>Editing or Deleting:</big></b><br>\n"
+#~ "Choose a kdump to change or remove.\n"
+#~ "Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n"
+
+#, fuzzy
 #~ msgid "Configuration of drbd"
 #~ msgstr "Configuration of IrDA"
 

Modified: trunk/yast/en_GB/po/fcoe-client.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/fcoe-client.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/fcoe-client.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\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"
@@ -46,8 +46,18 @@
 msgid "&FcoeClient"
 msgstr "NFS Client"
 
+#. setting of config value is 'yes'
+#: src/include/fcoe-client/complex.rb:48
+msgid "yes"
+msgstr "yes"
+
+#. setting of config value is 'no'
+#: src/include/fcoe-client/complex.rb:50
+msgid "no"
+msgstr "no"
+
 #. text of an error popup
-#: src/include/fcoe-client/complex.rb:92
+#: src/include/fcoe-client/complex.rb:102
 #, fuzzy
 #| msgid "Removal of package %1 failed."
 msgid ""
@@ -55,15 +65,44 @@
 "Command %1 failed."
 msgstr "Removal of package %1 failed."
 
+#. FCoE is not available on the interface
+#: src/include/fcoe-client/complex.rb:195
+#, fuzzy
+#| msgid "is not available"
+msgid "not available"
+msgstr "is not available"
+
+#. the interface is not configured for FCoE
+#: src/include/fcoe-client/complex.rb:197
+#, fuzzy
+#| msgid "Not configured"
+msgid "not configured"
+msgstr "Not configured"
+
+#. the flag is 'true'
+#: src/include/fcoe-client/complex.rb:203
+msgid "true"
+msgstr ""
+
+#. the flag is 'false'
+#: src/include/fcoe-client/complex.rb:205
+msgid "false"
+msgstr ""
+
+#. the flag is not set at all
+#: src/include/fcoe-client/complex.rb:207
+msgid "not set"
+msgstr ""
+
 #. headline of the edit dialog - configuration of values for a certain network interface
-#: src/include/fcoe-client/complex.rb:280
+#: src/include/fcoe-client/complex.rb:306
 #, fuzzy
 #| msgid "Configuration of IPsec"
 msgid "Configuration of VLAN interface %1 on %2"
 msgstr "Configuration of IPsec"
 
 #. text of an error popup
-#: src/include/fcoe-client/complex.rb:342
+#: src/include/fcoe-client/complex.rb:368
 msgid ""
 "Cannot start FCoE on VLAN interface %1\n"
 "because FCoE is already configured on\n"
@@ -71,7 +110,7 @@
 msgstr ""
 
 #. text of an error popup
-#: src/include/fcoe-client/complex.rb:357
+#: src/include/fcoe-client/complex.rb:383
 msgid ""
 "Cannot start FCoE on network interface %1 itself\n"
 "because FCoE is already configured on\n"
@@ -79,12 +118,12 @@
 msgstr ""
 
 #. headline of a popup: creating and starting Fibre Channel over Ethernet
-#: src/include/fcoe-client/complex.rb:391
+#: src/include/fcoe-client/complex.rb:417
 msgid "Creating and Starting FCoE on Detected VLAN Device"
 msgstr ""
 
 #. question to the user: really create and start FCoE
-#: src/include/fcoe-client/complex.rb:394
+#: src/include/fcoe-client/complex.rb:420
 msgid ""
 "Do you really want to create a FCoE network\n"
 "interface for discovered VLAN interface %1\n"
@@ -92,34 +131,34 @@
 msgstr ""
 
 #. text of an error popup
-#: src/include/fcoe-client/complex.rb:417
+#: src/include/fcoe-client/complex.rb:443
 #, fuzzy
 #| msgid "Cannot create zone %1."
 msgid "Cannot create and start FCoE on %1."
 msgstr "Cannot create zone %1."
 
 #. text of an error popup: command failed on the network interface
-#: src/include/fcoe-client/complex.rb:454
+#: src/include/fcoe-client/complex.rb:480
 #, fuzzy
 #| msgid "Command %1 failed"
 msgid "Command \"%1\" on %2 failed."
 msgstr "Command %1 failed"
 
-#: src/include/fcoe-client/complex.rb:462
+#: src/include/fcoe-client/complex.rb:488
 msgid ""
 "Creating FCoE interface failed.\n"
 "Continue because running in test mode"
 msgstr ""
 
 #. popup text: really remove FCoE VLAN interface
-#: src/include/fcoe-client/complex.rb:557
+#: src/include/fcoe-client/complex.rb:583
 #, fuzzy
 #| msgid "Do you really want to remove the current volume group?"
 msgid "Do you really want to remove the FCoE interface %1?"
 msgstr "Do you really want to remove the current volume group?"
 
 #. popup text continues
-#: src/include/fcoe-client/complex.rb:565
+#: src/include/fcoe-client/complex.rb:591
 msgid ""
 "Attention:\n"
 "Make sure the interface is not essential for a used device.\n"
@@ -127,34 +166,34 @@
 msgstr ""
 
 #. popup text continues
-#: src/include/fcoe-client/complex.rb:575
+#: src/include/fcoe-client/complex.rb:601
 msgid ""
 "Don't remove the interface if it's related\n"
 "to an already activated multipath device."
 msgstr ""
 
 #. replace values in table
-#: src/include/fcoe-client/complex.rb:724
+#: src/include/fcoe-client/complex.rb:750
 #, fuzzy
 #| msgid "Removal of package %1 failed."
 msgid "Removing of interface %1 failed."
 msgstr "Removal of package %1 failed."
 
-#: src/include/fcoe-client/complex.rb:736
+#: src/include/fcoe-client/complex.rb:762
 #, fuzzy
 #| msgid "Removal of package %1 failed."
 msgid "Destroying interface %1 failed."
 msgstr "Removal of package %1 failed."
 
 #. text of a warning popup
-#: src/include/fcoe-client/complex.rb:768
+#: src/include/fcoe-client/complex.rb:794
 msgid ""
 "DCB Required is set to \"yes\" but the\n"
 "interface isn't DCB capable."
 msgstr ""
 
 #. text of an information (notify)  popup
-#: src/include/fcoe-client/complex.rb:805
+#: src/include/fcoe-client/complex.rb:831
 msgid ""
 "Service 'fcoe' requires enabled service 'lldpad'.\n"
 "Enabling start on boot of service 'lldpad'."
@@ -185,7 +224,7 @@
 #: src/include/fcoe-client/dialogs.rb:230
 #: src/include/fcoe-client/dialogs.rb:241
 msgid "Yes"
-msgstr ""
+msgstr "Yes"
 
 #: src/include/fcoe-client/dialogs.rb:110
 #: src/include/fcoe-client/dialogs.rb:118
@@ -193,7 +232,7 @@
 #: src/include/fcoe-client/dialogs.rb:230
 #: src/include/fcoe-client/dialogs.rb:241
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #. combo box label: require DCB (yes/no)
 #: src/include/fcoe-client/dialogs.rb:117
@@ -270,7 +309,7 @@
 
 #: src/include/fcoe-client/dialogs.rb:188
 msgid "Driver"
-msgstr ""
+msgstr "Driver"
 
 #: src/include/fcoe-client/dialogs.rb:189
 msgid "Flag FCoE"
@@ -587,104 +626,99 @@
 msgstr "<p>Install it now?</p>"
 
 #. start service lldpad first
-#: src/modules/FcoeClient.rb:862
+#: src/modules/FcoeClient.rb:868
 msgid "Cannot start service 'lldpad'"
 msgstr ""
 
-#: src/modules/FcoeClient.rb:871
+#: src/modules/FcoeClient.rb:877
 #, fuzzy
 #| msgid "Cannot detect devices."
 msgid "Cannot start service 'fcoe'"
 msgstr "Cannot detect devices."
 
 #. first start lldpad
-#: src/modules/FcoeClient.rb:891
+#: src/modules/FcoeClient.rb:897
 msgid "Cannot start lldpad systemd socket"
 msgstr ""
 
-#: src/modules/FcoeClient.rb:905
+#: src/modules/FcoeClient.rb:910
+#, fuzzy
+#| msgid "Cannot start winbind service."
+msgid "Cannot start lldpad service."
+msgstr "Cannot start winbind service."
+
+#: src/modules/FcoeClient.rb:922
 msgid "Cannot start fcoemon systemd socket."
 msgstr ""
 
+#: src/modules/FcoeClient.rb:935
+#, fuzzy
+#| msgid "Cannot restart the service."
+msgid "Cannot start fcoe service."
+msgstr "Cannot restart the service."
+
 #. warning if no valid configuration found
-#: src/modules/FcoeClient.rb:1061
+#: src/modules/FcoeClient.rb:1101
 msgid ""
 "Cannot read config file for %1.\n"
 "You may edit the settings and recreate the FCoE\n"
 "VLAN interface to get a valid configuration."
 msgstr ""
 
-#. it's about a flag which is not set at all
-#: src/modules/FcoeClient.rb:1099 src/modules/FcoeClient.rb:1105
-#: src/modules/FcoeClient.rb:1110
-msgid "not set"
-msgstr ""
-
-#. also about setting of a flag
-#: src/modules/FcoeClient.rb:1102 src/modules/FcoeClient.rb:1107
-#: src/modules/FcoeClient.rb:1112
-msgid "true"
-msgstr ""
-
-#: src/modules/FcoeClient.rb:1102 src/modules/FcoeClient.rb:1107
-#: src/modules/FcoeClient.rb:1112
-msgid "false"
-msgstr ""
-
 #. FcoeClient read dialog caption
-#: src/modules/FcoeClient.rb:1442
+#: src/modules/FcoeClient.rb:1466
 #, fuzzy
 #| msgid "Initializing inetd Configuration"
 msgid "Initializing fcoe-client Configuration"
 msgstr "Initialising inetd Configuration"
 
 #. Progress stage 1/3
-#: src/modules/FcoeClient.rb:1457
+#: src/modules/FcoeClient.rb:1481
 msgid "Check installed packages"
 msgstr "Check installed packages"
 
 #. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1459
+#: src/modules/FcoeClient.rb:1483
 #, fuzzy
 #| msgid "Check required services"
 msgid "Check services"
 msgstr "Check required services"
 
 #. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1461
+#: src/modules/FcoeClient.rb:1485
 #, fuzzy
 #| msgid "Detecting network cards..."
 msgid "Detect network cards"
 msgstr "Detecting network cards..."
 
 #. Progress stage 4/4
-#: src/modules/FcoeClient.rb:1463
+#: src/modules/FcoeClient.rb:1487
 #, fuzzy
 #| msgid "Read /etc/ipsec.conf"
 msgid "Read /etc/fcoe/config"
 msgstr "Read /etc/ipsec.conf"
 
 #. Progress step 1/3
-#: src/modules/FcoeClient.rb:1467
+#: src/modules/FcoeClient.rb:1491
 #, fuzzy
 #| msgid "Checking for installed RPM packages..."
 msgid "Checking for installed packages..."
 msgstr "Checking for installed RPM packages..."
 
 #. Progress step 2/3
-#: src/modules/FcoeClient.rb:1469
+#: src/modules/FcoeClient.rb:1493
 #, fuzzy
 #| msgid "Checking for network devices..."
 msgid "Checking for services..."
 msgstr "Checking for network devices..."
 
 #. Progress step 3/3
-#: src/modules/FcoeClient.rb:1471
+#: src/modules/FcoeClient.rb:1495
 msgid "Detecting network cards..."
 msgstr "Detecting network cards..."
 
 #. Progress step 4/4
-#: src/modules/FcoeClient.rb:1473
+#: src/modules/FcoeClient.rb:1497
 #, fuzzy
 #| msgid "Reading /etc/modprobe.conf..."
 msgid "Reading /etc/fcoe/config"
@@ -692,123 +726,123 @@
 
 #. Progress finished
 #. Progress finished
-#: src/modules/FcoeClient.rb:1475 src/modules/FcoeClient.rb:1569
+#: src/modules/FcoeClient.rb:1499 src/modules/FcoeClient.rb:1593
 msgid "Finished"
 msgstr "Finished"
 
 #. Error message
-#: src/modules/FcoeClient.rb:1501
+#: src/modules/FcoeClient.rb:1525
 #, fuzzy
 #| msgid "Starting the 'lirc' service failed."
 msgid "Starting of services failed."
 msgstr "Starting the 'lirc' service failed."
 
 #. Error message
-#: src/modules/FcoeClient.rb:1514
+#: src/modules/FcoeClient.rb:1538
 msgid "Cannot detect devices."
 msgstr "Cannot detect devices."
 
 #. Error message
-#: src/modules/FcoeClient.rb:1524
+#: src/modules/FcoeClient.rb:1548
 #, fuzzy
 #| msgid "Cannot read the configuration."
 msgid "Cannot read /etc/fcoe/config."
 msgstr "Cannot read the configuration."
 
 #. FcoeClient read dialog caption
-#: src/modules/FcoeClient.rb:1540
+#: src/modules/FcoeClient.rb:1564
 #, fuzzy
 #| msgid "Saving inetd Configuration"
 msgid "Saving fcoe-client Configuration"
 msgstr "Saving inetd Configuration"
 
 #. Progress stage 1/2
-#: src/modules/FcoeClient.rb:1555
+#: src/modules/FcoeClient.rb:1579
 msgid "Write the settings"
 msgstr "Write the settings"
 
 #. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1557
+#: src/modules/FcoeClient.rb:1581
 #, fuzzy
 #| msgid "Restart services"
 msgid "Restart FCoE service"
 msgstr "Restart services"
 
 #. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1559
+#: src/modules/FcoeClient.rb:1583
 #, fuzzy
 #| msgid "Adjust spooler services"
 msgid "Adjust start of services"
 msgstr "Adjust spooler services"
 
 #. Progress step 1/2
-#: src/modules/FcoeClient.rb:1563
+#: src/modules/FcoeClient.rb:1587
 msgid "Writing the settings..."
 msgstr "Writing the settings..."
 
 #. Progress step 2/3
-#: src/modules/FcoeClient.rb:1565
+#: src/modules/FcoeClient.rb:1589
 #, fuzzy
 #| msgid "Restarting service..."
 msgid "Restarting FCoE service..."
 msgstr "Restarting service..."
 
 #. Progress sstep 3/3
-#: src/modules/FcoeClient.rb:1567
+#: src/modules/FcoeClient.rb:1591
 #, fuzzy
 #| msgid "Adjusting spooler services..."
 msgid "Adjusting start of services..."
 msgstr "Adjusting spooler services..."
 
 #. Error message
-#: src/modules/FcoeClient.rb:1587
+#: src/modules/FcoeClient.rb:1611
 #, fuzzy
 #| msgid "Cannot write settings to /etc/ntp.conf."
 msgid "Cannot write settings to /etc/fcoe/config."
 msgstr "Cannot write settings to /etc/ntp.conf."
 
-#: src/modules/FcoeClient.rb:1593
+#: src/modules/FcoeClient.rb:1617
 msgid ""
 "Cannot write settings for FCoE interfaces.\n"
 "For details, see /var/log/YaST2/y2log."
 msgstr ""
 
 #. Error message
-#: src/modules/FcoeClient.rb:1605
+#: src/modules/FcoeClient.rb:1629
 #, fuzzy
 #| msgid "Starting the 'lirc' service failed."
 msgid "Restarting of service fcoe failed."
 msgstr "Starting the 'lirc' service failed."
 
 #. Error message
-#: src/modules/FcoeClient.rb:1612
+#: src/modules/FcoeClient.rb:1636
 #, fuzzy
 #| msgid "Cannot write sysconfig variables."
 msgid "Cannot write /etc/sysconfig/network/ifcfg-files."
 msgstr "Cannot write sysconfig variables."
 
 #. Configuration summary text for autoyast
-#: src/modules/FcoeClient.rb:1669
+#: src/modules/FcoeClient.rb:1693
 #, fuzzy
 #| msgid "<p><b><big>Connection Configuration</big></b></p>"
 msgid "<b>General FCoE configuration</b>"
 msgstr "<p><b><big>Connection Configuration</big></b></p>"
 
 #. options from config file, not meant for translation
-#: src/modules/FcoeClient.rb:1683
+#: src/modules/FcoeClient.rb:1707
 #, fuzzy
 #| msgid "Interfaces"
 msgid "<b>Interfaces</b>"
 msgstr "Interfaces"
 
 #. network card, e.g. eth0
-#: src/modules/FcoeClient.rb:1691
+#: src/modules/FcoeClient.rb:1715
 msgid "<i>Netcard</i>:"
 msgstr ""
 
 #. nothing to translate here (abbreviation for
 #. Fibre Channel over Ethernet Virtual LAN interface)
-#: src/modules/FcoeClient.rb:1701
+#: src/modules/FcoeClient.rb:1725
 #, fuzzy
 #| msgid "Starting the 'lirc' service failed."
 msgid "<b>Starting of services</b>"
@@ -816,11 +850,11 @@
 
 #. starting of service "fcoe" at boot time is enabled or disabled
 #. starting of service "lldpad" at boot time is enabled or disabled
-#: src/modules/FcoeClient.rb:1709 src/modules/FcoeClient.rb:1719
+#: src/modules/FcoeClient.rb:1733 src/modules/FcoeClient.rb:1743
 msgid "enabled"
 msgstr "enabled"
 
-#: src/modules/FcoeClient.rb:1710 src/modules/FcoeClient.rb:1720
+#: src/modules/FcoeClient.rb:1734 src/modules/FcoeClient.rb:1744
 msgid "disabled"
 msgstr "disabled"
 

Modified: trunk/yast/en_GB/po/firewall-services.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/firewall-services.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/firewall-services.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: firewall-services\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:32+0200\n"
+"POT-Creation-Date: 2014-07-04 15:54+0200\n"
 "PO-Revision-Date: 2007-08-16 16:37+0100\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"

Modified: trunk/yast/en_GB/po/firewall.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/firewall.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/firewall.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: firewall\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:56+0100\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2007-08-16 16:36+0100\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"

Modified: trunk/yast/en_GB/po/firstboot.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/firstboot.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/firstboot.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: firstboot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:56+0100\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2007-08-16 16:37+0100\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"

Modified: trunk/yast/en_GB/po/ftp-server.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/ftp-server.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/ftp-server.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: ftp-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:38+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2007-08-16 20:49+0100\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"

Modified: trunk/yast/en_GB/po/geo-cluster.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/geo-cluster.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/geo-cluster.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2014-05-19 09:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -36,8 +36,8 @@
 #. GeoCluster configure2 dialog caption
 #. Initialization dialog caption
 #: src/include/geo-cluster/complex.rb:83
-#: src/include/geo-cluster/dialogs.rb:310
-#: src/include/geo-cluster/wizards.rb:97
+#: src/include/geo-cluster/dialogs.rb:430
+#: src/include/geo-cluster/wizards.rb:140
 msgid "GeoCluster Configuration"
 msgstr "GeoCluster Configuration"
 
@@ -72,92 +72,299 @@
 #.
 #. $Id: dialogs.ycp 27914 2006-02-13 14:32:08Z locilka $
 #: src/include/geo-cluster/dialogs.rb:51
+#, fuzzy
+#| msgid "Read configuration file"
+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:57
+#: src/include/geo-cluster/dialogs.rb:65
 msgid "transport"
 msgstr "transport"
 
-#: src/include/geo-cluster/dialogs.rb:63
+#: src/include/geo-cluster/dialogs.rb:71
 msgid "port"
 msgstr "port"
 
-#: src/include/geo-cluster/dialogs.rb:68
+#: src/include/geo-cluster/dialogs.rb:76
 msgid "site"
 msgstr "site"
 
-#: src/include/geo-cluster/dialogs.rb:71 src/include/geo-cluster/dialogs.rb:81
+#: src/include/geo-cluster/dialogs.rb:79
+#: src/include/geo-cluster/dialogs.rb:653
 msgid "Add"
 msgstr "Add"
 
-#: src/include/geo-cluster/dialogs.rb:72 src/include/geo-cluster/dialogs.rb:82
+#: src/include/geo-cluster/dialogs.rb:80
+#: src/include/geo-cluster/dialogs.rb:654
 msgid "Edit"
 msgstr "Edit"
 
-#: src/include/geo-cluster/dialogs.rb:73 src/include/geo-cluster/dialogs.rb:83
+#: src/include/geo-cluster/dialogs.rb:81
+#: src/include/geo-cluster/dialogs.rb:655
 msgid "Delete"
 msgstr "Delete"
 
-#: src/include/geo-cluster/dialogs.rb:78
-#: src/include/geo-cluster/dialogs.rb:144
+#: src/include/geo-cluster/dialogs.rb:87
+#: src/include/geo-cluster/dialogs.rb:178
 msgid "ticket"
 msgstr "ticket"
 
 #. return `cacel or a string
-#: src/include/geo-cluster/dialogs.rb:104
-#: src/include/geo-cluster/dialogs.rb:150
+#: src/include/geo-cluster/dialogs.rb:98
+#: src/include/geo-cluster/dialogs.rb:120
+#: src/include/geo-cluster/dialogs.rb:197
 msgid "OK"
 msgstr "OK"
 
-#: src/include/geo-cluster/dialogs.rb:105
-#: src/include/geo-cluster/dialogs.rb:151
+#: src/include/geo-cluster/dialogs.rb:99
+#: src/include/geo-cluster/dialogs.rb:121
+#: src/include/geo-cluster/dialogs.rb:198
 msgid "Cancel"
 msgstr "Cancel"
 
-#. parser value first
-#: src/include/geo-cluster/dialogs.rb:142
+#: src/include/geo-cluster/dialogs.rb:135
+#, fuzzy
+#| msgid "Enter a valid e-mail address"
+msgid "Please enter valid ip address"
+msgstr "Enter a valid e-mail address."
+
+#: src/include/geo-cluster/dialogs.rb:176
 msgid "Enter ticket and timeout"
 msgstr "Enter ticket and timeout"
 
-#: src/include/geo-cluster/dialogs.rb:145
+#: src/include/geo-cluster/dialogs.rb:182
 msgid "timeout"
 msgstr "timeout"
 
-#: src/include/geo-cluster/dialogs.rb:164
+#: src/include/geo-cluster/dialogs.rb:184
+#, fuzzy
+#| msgid "NFS entries"
+msgid "retries"
+msgstr "NFS entries"
+
+#: src/include/geo-cluster/dialogs.rb:186
+#, fuzzy
+#| msgid "Height"
+msgid "weights"
+msgstr "Height"
+
+#: src/include/geo-cluster/dialogs.rb:188
+#, fuzzy
+#| msgid "Expired"
+msgid "expire"
+msgstr "Expired"
+
+#: src/include/geo-cluster/dialogs.rb:190
+#, fuzzy
+#| msgid "Required patterns"
+msgid "acquire-after"
+msgstr "Required patterns"
+
+#: src/include/geo-cluster/dialogs.rb:192
+msgid "before-acquire-handler"
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:229
 msgid "timeout is no valid"
 msgstr "timeout is no valid"
 
-#: src/include/geo-cluster/dialogs.rb:166
+#: src/include/geo-cluster/dialogs.rb:231
+#, fuzzy
+#| msgid "timeout is no valid"
+msgid "expire is no valid"
+msgstr "timeout is no valid"
+
+#: src/include/geo-cluster/dialogs.rb:233
+#, fuzzy
+#| msgid "timeout is no valid"
+msgid "acquireafter is no valid"
+msgstr "timeout is no valid"
+
+#: src/include/geo-cluster/dialogs.rb:235
+#, fuzzy
+#| msgid "timeout is no valid"
+msgid "retries is no valid"
+msgstr "timeout is no valid"
+
+#: src/include/geo-cluster/dialogs.rb:237
+msgid "retries values lower than 3 is illegal"
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:239
+#, fuzzy
+#| msgid "timeout is no valid"
+msgid "weights is no valid"
+msgstr "timeout is no valid"
+
+#: src/include/geo-cluster/dialogs.rb:241
 msgid "ticket can not be null"
 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:337
+#, fuzzy
+#| msgid "ticket can not be null"
+msgid "ticket have to be filled"
+msgstr "ticket can not be null"
+
+#: src/include/geo-cluster/dialogs.rb:344
+#: src/include/geo-cluster/dialogs.rb:582
+#, fuzzy
+#| msgid "Gateway IP address is invalid."
+msgid "arbitrator IP address is invalid!"
+msgstr "Gateway IP address is invalid."
+
 #. servie:geo-cluster is the  name of /etc/sysconfig/SuSEfirewall2.d/services/geo-cluster
-#: src/include/geo-cluster/dialogs.rb:278
+#: 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());
-#: src/include/geo-cluster/dialogs.rb:317
+#. 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:330
+#: src/include/geo-cluster/dialogs.rb:494
 msgid "Enter an IP address of your site"
 msgstr "Enter an IP address of your site"
 
-#: src/include/geo-cluster/dialogs.rb:343
+#: src/include/geo-cluster/dialogs.rb:505
 msgid "Edit IP address of your site"
 msgstr "Edit IP address of your site"
 
+#: src/include/geo-cluster/dialogs.rb:527
+#, 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
+#, fuzzy
+#| msgid "Error: Configuration name cannot be empty."
+msgid "Configuration name can not be null"
+msgstr "Error: Configuration name cannot be empty."
+
+#: src/include/geo-cluster/dialogs.rb:576
+#, 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
+#, fuzzy
+#| msgid "Key is invalid."
+msgid "port is invalid!"
+msgstr "Key is invalid."
+
+#: src/include/geo-cluster/dialogs.rb:595
+#, fuzzy
+#| msgid "Software to be installed:"
+msgid "transport have to be filled!"
+msgstr "Software to be installed:"
+
+#: src/include/geo-cluster/dialogs.rb:600
+#, fuzzy
+#| msgid "Software to be installed:"
+msgid "site have to be filled!"
+msgstr "Software to be installed:"
+
+#: src/include/geo-cluster/dialogs.rb:605
+#, 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
+#, fuzzy
+#| msgid "GeoCluster Configuration"
+msgid "GeoCluster Configuration Select"
+msgstr "GeoCluster Configuration"
+
+#. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
+#. Label::BackButton(), Label::NextButton());
+#: src/include/geo-cluster/dialogs.rb:650
+#, 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:99
+#: src/include/geo-cluster/wizards.rb:142
 msgid "Initializing..."
 msgstr "Initializing..."
 
+#. Not necessary to use remove_list_quote?
+#: src/modules/GeoCluster.rb:224
+#, fuzzy
+#| msgid "Cannot write global settings."
+msgid "Cannot write global conf settings."
+msgstr "Cannot write global settings."
+
+#. List like site
+#: src/modules/GeoCluster.rb:242
+msgid "Cannot write global settings."
+msgstr "Cannot write global settings."
+
+#. Empty (all Int) ticket will be ignore by ag_booth
+#. Create a ticket item
+#: src/modules/GeoCluster.rb:266
+#, fuzzy
+#| msgid "Cannot write global settings."
+msgid "Cannot write global ticket settings."
+msgstr "Cannot write global settings."
+
 #. GeoCluster read dialog caption
-#: src/modules/GeoCluster.rb:168 src/modules/GeoCluster2.pm:129
+#: src/modules/GeoCluster.rb:273 src/modules/GeoCluster2.pm:129
 msgid "Initializing geo-cluster Configuration"
 msgstr "Initializing geo-cluster Configuration"
 
@@ -166,75 +373,63 @@
 #. We do not set help text here, because it was set outside
 #. #-#-#-#-#  geo-cluster.xgettext.pot  #-#-#-#-#
 #. Progress stage 2/3
-#: src/modules/GeoCluster.rb:182 src/modules/GeoCluster2.pm:143
+#: src/modules/GeoCluster.rb:286 src/modules/GeoCluster2.pm:143
 msgid "Read the previous settings"
 msgstr "Read the previous settings"
 
-#: src/modules/GeoCluster.rb:182 src/modules/GeoCluster.rb:185
+#: 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:184 src/modules/GeoCluster2.pm:150
+#: src/modules/GeoCluster.rb:288 src/modules/GeoCluster2.pm:150
 msgid "Reading the previous settings..."
 msgstr "Reading the previous settings..."
 
 #. Progress finished
-#: src/modules/GeoCluster.rb:186 src/modules/GeoCluster.rb:282
+#: src/modules/GeoCluster.rb:290 src/modules/GeoCluster.rb:358
 #: src/modules/GeoCluster2.pm:154 src/modules/GeoCluster2.pm:232
 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:255 src/modules/GeoCluster2.pm:211
+#: src/modules/GeoCluster.rb:332 src/modules/GeoCluster2.pm:211
 msgid "Saving geo-cluster Configuration"
 msgstr "Saving geo-cluster Configuration"
 
 #. Progress stage 1/2
-#: src/modules/GeoCluster.rb:272 src/modules/GeoCluster2.pm:223
+#: src/modules/GeoCluster.rb:348 src/modules/GeoCluster2.pm:223
 msgid "Write the settings"
 msgstr "Write the settings"
 
 #. Progress stage 2/2
-#: src/modules/GeoCluster.rb:274
+#: src/modules/GeoCluster.rb:350
 msgid "Write the SuSEfirewall settings"
 msgstr "Write the SuSEfirewall settings"
 
 #. Progress step 1/2
-#: src/modules/GeoCluster.rb:278 src/modules/GeoCluster2.pm:228
+#: src/modules/GeoCluster.rb:354 src/modules/GeoCluster2.pm:228
 msgid "Writing the settings..."
 msgstr "Writing the settings..."
 
 #. Progress step 2/2
-#: src/modules/GeoCluster.rb:280
+#: src/modules/GeoCluster.rb:356
 msgid "Writing the SuSEFirewall settings"
 msgstr "Writing the SuSEFirewall settings"
 
-#. read sites
-#: src/modules/GeoCluster.rb:311
-msgid "Cannot write global settings."
-msgstr "Cannot write global settings."
-
-#. write site
-#: src/modules/GeoCluster.rb:315
-msgid "Cannot write sites settings."
-msgstr "Cannot write sites settings."
-
-#. write ticket
-#: src/modules/GeoCluster.rb:318
-msgid "Cannot write ticket settings."
-msgstr "Cannot write ticket settings."
-
 #. #-#-#-#-#  geo-cluster.rxgettext.pot (PACKAGE VERSION)  #-#-#-#-#
 #. Error message
-#: src/modules/GeoCluster.rb:324 src/modules/GeoCluster2.pm:242
+#: src/modules/GeoCluster.rb:379 src/modules/GeoCluster2.pm:242
 msgid "Cannot write settings."
 msgstr "Cannot write settings."
 
 #. TODO FIXME: your code here...
 #. Configuration summary text for autoyast
-#: src/modules/GeoCluster.rb:372
+#: src/modules/GeoCluster.rb:440
 msgid "Configuration summary..."
 msgstr "Configuration summary..."
 
@@ -283,3 +478,9 @@
 #: src/modules/GeoCluster2.pm:295
 msgid "Configuration summary ..."
 msgstr "Configuration summary ..."
+
+#~ msgid "Cannot write sites settings."
+#~ msgstr "Cannot write sites settings."
+
+#~ msgid "Cannot write ticket settings."
+#~ msgstr "Cannot write ticket settings."

Modified: trunk/yast/en_GB/po/gtk.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/gtk.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/gtk.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\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"
@@ -197,11 +197,11 @@
 
 #: src/YGUtils.cc:643
 msgid "Back"
-msgstr ""
+msgstr "Back"
 
 #: src/YGUtils.cc:644
 msgid "Next"
-msgstr ""
+msgstr "Next"
 
 #: src/ygtksteps.c:75
 #, fuzzy

Modified: trunk/yast/en_GB/po/http-server.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/http-server.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/http-server.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: http-server.en_GB\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:38+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2007-08-16 20:49+0100\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"

Modified: trunk/yast/en_GB/po/inetd.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/inetd.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/inetd.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\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"

Modified: trunk/yast/en_GB/po/installation.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/installation.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/installation.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: installation.en_GB\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-09-03 16:45+0200\n"
 "PO-Revision-Date: 2008-05-16 13:44+0200\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"
@@ -64,22 +64,22 @@
 
 #. TRANSLATORS: Installation overview
 #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
-#: src/clients/clone_proposal.rb:96
+#: src/clients/clone_proposal.rb:98
 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)."
 msgstr ""
 
 #. TRANSLATORS: Installation overview
 #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
-#: src/clients/clone_proposal.rb:105
+#: src/clients/clone_proposal.rb:107
 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)."
 msgstr ""
 
-#: src/clients/clone_proposal.rb:117
+#: src/clients/clone_proposal.rb:119
 msgid "Write AutoYaST profile to /root/autoinst.xml"
 msgstr ""
 
 #. progress step title
-#: src/clients/copy_files_finish.rb:78
+#: src/clients/copy_files_finish.rb:81
 msgid "Copying files to installed system..."
 msgstr "Copying files to installed system..."
 
@@ -238,7 +238,7 @@
 msgstr "Installation Mode"
 
 #. progress step title
-#: src/clients/desktop_finish.rb:73
+#: src/clients/desktop_finish.rb:70
 msgid "Initializing default window manager..."
 msgstr "Initialising default window manager..."
 
@@ -276,6 +276,7 @@
 msgstr "Alias for %1"
 
 #: src/clients/inst_addon_update_sources.rb:173
+#: src/clients/inst_system_analysis.rb:301
 msgid "Unknown Product"
 msgstr "Unknown Product"
 
@@ -335,7 +336,7 @@
 #. this type of contents will be shown only for initial installation dialog
 #. TRANSLATORS: dialog caption
 #: src/clients/inst_complex_welcome.rb:137
-#: src/clients/inst_complex_welcome.rb:312
+#: src/clients/inst_complex_welcome.rb:318
 msgid "License Agreement"
 msgstr "License Agreement"
 
@@ -407,11 +408,24 @@
 "installation process.\n"
 "</p>\n"
 
-#: src/clients/inst_complex_welcome.rb:336
+#. In case of going back, Release Notes button may be shown, retranslate it (bnc#886660)
+#. Assure that relnotes have been downloaded first
+#. exit codes (see "man curl"):
+#. 7 = Failed to connect to host.
+#. 28 = Operation timeout.
+#. push button
+#: src/clients/inst_complex_welcome.rb:230
+#: src/clients/inst_download_release_notes.rb:139
+#: src/clients/inst_system_analysis.rb:299
 #, fuzzy
-msgid "License needs to be accepted"
-msgstr "needs to be reinstalled"
+#| msgid "Release Notes"
+msgid "Re&lease Notes..."
+msgstr "Release Notes"
 
+#: src/clients/inst_complex_welcome.rb:342
+msgid "You must accept the license to install this product"
+msgstr ""
+
 #. TRANSLATORS: check box, see #ZMD
 #: src/clients/inst_congratulate.rb:107
 #, fuzzy
@@ -531,7 +545,7 @@
 #. OEM image if target disk is defined
 #: src/clients/inst_deploy_image.rb:46
 msgid "The system will reboot now..."
-msgstr ""
+msgstr "The system will reboot now..."
 
 #. bnc #395030
 #. Use less memory
@@ -630,11 +644,11 @@
 msgid "Configure &FCoE Interfaces"
 msgstr "Configure &Resources"
 
-#: src/clients/inst_disks_activate.rb:112
+#: src/clients/inst_disks_activate.rb:111
 msgid "Configure &iSCSI Disks"
 msgstr "Configure &iSCSI Disks"
 
-#: src/clients/inst_disks_activate.rb:113
+#: src/clients/inst_disks_activate.rb:112
 #, fuzzy
 #| msgid "Saving network configuration..."
 msgid "Change Net&work Configuration"
@@ -658,15 +672,22 @@
 msgid "<p>Installation is just about to start!</p>"
 msgstr ""
 
-#. download release notes now
-#. push button
-#: src/clients/inst_download_release_notes.rb:135
-#: src/clients/inst_system_analysis.rb:356
-#, fuzzy
-#| msgid "Release Notes"
-msgid "Re&lease Notes..."
-msgstr "Release Notes"
+#. Set the UI content to show some progress.
+#. TODO FIXME: use a better title (reused existing texts because of text freeze)
+#. TRANSLATORS: dialog caption
+#. bug #302384
+#: src/clients/inst_download_release_notes.rb:147
+#: src/clients/inst_initialization.rb:56
+#: src/clients/inst_installation_options.rb:151
+msgid "Initializing"
+msgstr "Initialising"
 
+#. TRANSLATORS: dialog progress message
+#: src/clients/inst_download_release_notes.rb:147
+#: src/clients/inst_initialization.rb:44
+msgid "Initializing the installation..."
+msgstr "Initialising the installation..."
+
 #. popup message, list of repositores is appended to the text
 #: src/clients/inst_extrasources.rb:150
 msgid "Package updates have been found in these additional repositories:"
@@ -687,67 +708,67 @@
 #. Adjust a SlideShow dialog if not configured
 #. kilobytes
 #. just make it longer than inst_finish, TODO: better value later
-#: src/clients/inst_finish.rb:85 src/clients/inst_prepareprogress.rb:139
+#: src/clients/inst_finish.rb:88 src/clients/inst_prepareprogress.rb:139
 #: src/clients/inst_prepareprogress.rb:157
 msgid "Finishing Basic Installation"
 msgstr "Finishing Basic Installation"
 
 #. Might be left from the previous stage
-#: src/clients/inst_finish.rb:111
+#: src/clients/inst_finish.rb:114
 #, fuzzy
 msgid "Creating list of finish scripts to call..."
 msgstr "Preinstallation Scripts"
 
 #. progress stage
-#: src/clients/inst_finish.rb:127
+#: src/clients/inst_finish.rb:213
 msgid "Copy files to installed system"
 msgstr "Copy files to installed system"
 
 #. progress stage
-#: src/clients/inst_finish.rb:142
+#: src/clients/inst_finish.rb:220
 msgid "Save configuration"
 msgstr "Save configuration"
 
 #. progress stage
-#: src/clients/inst_finish.rb:169
+#: src/clients/inst_finish.rb:227
 msgid "Save installation settings"
 msgstr "Save installation settings"
 
 #. progress stage
-#: src/clients/inst_finish.rb:188
+#: src/clients/inst_finish.rb:236
 msgid "Install boot manager"
 msgstr "Install boot manager"
 
 #. progress stage
-#: src/clients/inst_finish.rb:200
+#: src/clients/inst_finish.rb:243
 msgid "Prepare system for initial boot"
 msgstr "Prepare system for initial boot"
 
 #. merge steps from add-on products
 #. bnc #438678
-#: src/clients/inst_finish.rb:305
+#: src/clients/inst_finish.rb:348
 #, fuzzy
 msgid "Checking stage: %1..."
 msgstr "Checking for binary %1..."
 
 #. a fallback busy message
-#: src/clients/inst_finish.rb:394
+#: src/clients/inst_finish.rb:437
 #, fuzzy
 msgid "Calling step %1..."
 msgstr "Saving queue %1..."
 
 #. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log
-#: src/clients/inst_finish.rb:414
+#: src/clients/inst_finish.rb:457
 msgid " * %1"
 msgstr ""
 
 #. Anything else
-#: src/clients/inst_finish.rb:451
+#: src/clients/inst_finish.rb:494
 msgid "Finished"
 msgstr "Finished"
 
 #. get the latest errors
-#: src/clients/inst_finish.rb:582
+#: src/clients/inst_finish.rb:625
 msgid "Installation Error"
 msgstr "Installation Error"
 
@@ -768,11 +789,6 @@
 msgid "Installation is being initialized."
 msgstr "Please wait while the installation is being initialised."
 
-#. TRANSLATORS: dialog progress message
-#: src/clients/inst_initialization.rb:44
-msgid "Initializing the installation..."
-msgstr "Initialising the installation..."
-
 #. TRANSLATORS: dialog help
 #. help for the dialog - busy message
 #: src/clients/inst_initialization.rb:48
@@ -786,13 +802,6 @@
 msgid "Preparing the initial system configuration..."
 msgstr "Preparing the 1st system configuration..."
 
-#. TRANSLATORS: dialog caption
-#. bug #302384
-#: src/clients/inst_initialization.rb:56
-#: src/clients/inst_installation_options.rb:151
-msgid "Initializing"
-msgstr "Initialising"
-
 #. dialog caption
 #: src/clients/inst_installation_options.rb:83
 #, fuzzy
@@ -1019,12 +1028,12 @@
 msgstr ""
 
 #. message show when user has disabled the configuration
-#: src/clients/inst_proposal.rb:240
+#: src/clients/inst_proposal.rb:238
 msgid "Skipping configuration upon user request"
 msgstr "Skipping configuration upon user request"
 
 #. error message is a popup
-#: src/clients/inst_proposal.rb:257
+#: src/clients/inst_proposal.rb:255
 msgid ""
 "The proposal contains an error that must be\n"
 "resolved before continuing.\n"
@@ -1035,32 +1044,32 @@
 #. not using tabs
 #. heading in proposal, in case the module doesn't create one
 #. heading in proposal, in case the module doesn't create one
-#: src/clients/inst_proposal.rb:498 src/clients/inst_proposal.rb:500
-#: src/clients/inst_proposal.rb:514 src/clients/inst_proposal.rb:557
-#: src/clients/inst_proposal.rb:559 src/clients/inst_proposal.rb:569
+#: src/clients/inst_proposal.rb:496 src/clients/inst_proposal.rb:498
+#: src/clients/inst_proposal.rb:512 src/clients/inst_proposal.rb:555
+#: src/clients/inst_proposal.rb:557 src/clients/inst_proposal.rb:567
 msgid "ERROR: Missing Title"
 msgstr "ERROR: Missing Title"
 
 #. busy message
-#: src/clients/inst_proposal.rb:525
+#: src/clients/inst_proposal.rb:523
 #, fuzzy
 msgid "Adapting the proposal to the current settings..."
 msgstr "Cannot read the current settings."
 
 #. busy message;
 #. Initial contents of proposal subwindow while proposals are calculated
-#: src/clients/inst_proposal.rb:529 src/clients/inst_proposal.rb:1031
+#: src/clients/inst_proposal.rb:527 src/clients/inst_proposal.rb:1029
 msgid "Analyzing your system..."
 msgstr "Analysing your system..."
 
 #. fallback proposal, means usually an internal error
-#: src/clients/inst_proposal.rb:700
+#: src/clients/inst_proposal.rb:698
 msgid "ERROR: No proposal"
 msgstr "ERROR: No proposal"
 
 #. Submodules handle their own error reporting
 #. text for a message box
-#: src/clients/inst_proposal.rb:745
+#: src/clients/inst_proposal.rb:743
 msgid ""
 "Configuration saved.\n"
 "There were errors."
@@ -1069,7 +1078,7 @@
 "There were errors."
 
 #. dialog headline
-#: src/clients/inst_proposal.rb:949
+#: src/clients/inst_proposal.rb:947
 #, fuzzy
 msgid "Installation Overview"
 msgstr "Installation Server"
@@ -1079,25 +1088,25 @@
 #. Translators: About 40 characters max,
 #. use newlines for longer translations.
 #. radio button
-#: src/clients/inst_proposal.rb:973
+#: src/clients/inst_proposal.rb:971
 msgid "&Skip Configuration"
 msgstr "&Skip Configuration"
 
 #. radio button
-#: src/clients/inst_proposal.rb:982
+#: src/clients/inst_proposal.rb:980
 msgid "&Use Following Configuration"
 msgstr "&Use Following Configuration"
 
 #. menu button
 #. menu button
 #. TRANSLATORS: Push button
-#: src/clients/inst_proposal.rb:994 src/clients/inst_proposal.rb:1178
-#: src/clients/inst_upgrade_urls.rb:226
+#: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176
+#: src/clients/inst_upgrade_urls.rb:236
 msgid "&Change..."
 msgstr "&Change..."
 
 #. menu button
-#: src/clients/inst_proposal.rb:1000 src/clients/inst_proposal.rb:1173
+#: src/clients/inst_proposal.rb:998 src/clients/inst_proposal.rb:1171
 #, fuzzy
 #| msgid "&Skip Configuration"
 msgid "&Export Configuration"
@@ -1105,25 +1114,25 @@
 
 #. Help message between headline and installation proposal / settings summary.
 #. May contain newlines, but don't make it very much longer than the original.
-#: src/clients/inst_proposal.rb:1071
+#: src/clients/inst_proposal.rb:1069
 #, fuzzy
 #| msgid "Click any headline to make changes or use the \"Change...\" menu below."
 msgid "Click a headline to make changes or use the \"Change...\" menu below."
 msgstr "Click any headline to make changes or use the \"Change...\" menu below."
 
-#: src/clients/inst_proposal.rb:1075
+#: src/clients/inst_proposal.rb:1073
 #, fuzzy
 #| msgid "Click any headline to make changes or use the \"Change...\" menu below."
 msgid "Click a headline to make changes."
 msgstr "Click any headline to make changes or use the \"Change...\" menu below."
 
 #. menu button item
-#: src/clients/inst_proposal.rb:1172
+#: src/clients/inst_proposal.rb:1170
 msgid "&Reset to defaults"
 msgstr "&Reset to defaults"
 
 #. General part of the help text for all types of proposals
-#: src/clients/inst_proposal.rb:1208
+#: src/clients/inst_proposal.rb:1206
 msgid ""
 "<p>\n"
 "Change the values by clicking on the respective headline\n"
@@ -1137,7 +1146,7 @@
 
 #. Help text for installation proposal
 #. General part ("You can change values...") is added as the next paragraph.
-#: src/clients/inst_proposal.rb:1219
+#: src/clients/inst_proposal.rb:1217
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -1169,7 +1178,7 @@
 #. - sh@suse.de 2002-02-26
 #.
 #. Help text for installation proposal, continued
-#: src/clients/inst_proposal.rb:1245 src/clients/inst_proposal.rb:1272
+#: src/clients/inst_proposal.rb:1243 src/clients/inst_proposal.rb:1270
 #, fuzzy
 #| msgid ""
 #| "<p>\n"
@@ -1186,7 +1195,7 @@
 
 #. Help text for update proposal
 #. General part ("You can change values...") is added as the next paragraph.
-#: src/clients/inst_proposal.rb:1255
+#: src/clients/inst_proposal.rb:1253
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -1199,7 +1208,7 @@
 
 #. Help text for network configuration proposal
 #. General part ("You can change values...") is added as the next paragraph.
-#: src/clients/inst_proposal.rb:1282
+#: src/clients/inst_proposal.rb:1280
 msgid ""
 "<p>\n"
 "Put the network settings into effect by pressing <b>Next</b>.\n"
@@ -1211,7 +1220,7 @@
 
 #. Help text for service configuration proposal
 #. General part ("You can change values...") is added as the next paragraph.
-#: src/clients/inst_proposal.rb:1293
+#: src/clients/inst_proposal.rb:1291
 msgid ""
 "<p>\n"
 "Put the service settings into effect by pressing <b>Next</b>.\n"
@@ -1223,7 +1232,7 @@
 
 #. Help text for hardware configuration proposal
 #. General part ("You can change values...") is added as the next paragraph.
-#: src/clients/inst_proposal.rb:1304
+#: src/clients/inst_proposal.rb:1302
 msgid ""
 "<p>\n"
 "Put the hardware settings into effect by pressing <b>Next</b>.\n"
@@ -1234,12 +1243,12 @@
 "</p>\n"
 
 #. Proposal in uml module
-#: src/clients/inst_proposal.rb:1313
+#: src/clients/inst_proposal.rb:1311
 msgid "<P><B>UML Installation Proposal</B></P>"
 msgstr "<P><B>UML Installation Proposal</B></P>"
 
 #. help text
-#: src/clients/inst_proposal.rb:1315
+#: src/clients/inst_proposal.rb:1313
 msgid ""
 "<P>UML (User Mode Linux) installation allows you to start independent\n"
 "Linux virtual machines in the host system.</P>"
@@ -1250,7 +1259,7 @@
 #. Generic help text for other proposals (not basic installation or
 #. hardhware configuration.
 #. General part ("You can change values...") is added as the next paragraph.
-#: src/clients/inst_proposal.rb:1332
+#: src/clients/inst_proposal.rb:1330
 msgid ""
 "<p>\n"
 "To use the settings as displayed, press <b>Next</b>.\n"
@@ -1261,7 +1270,7 @@
 "</p>\n"
 
 #. help text
-#: src/clients/inst_proposal.rb:1345
+#: src/clients/inst_proposal.rb:1343
 #, fuzzy
 #| msgid ""
 #| "<p>Some proposals might be\n"
@@ -1277,11 +1286,11 @@
 "a proposal that is locked, ask your system administrator.</p>"
 
 #. FATE #120373
-#: src/clients/inst_proposal.rb:1371
+#: src/clients/inst_proposal.rb:1369
 msgid "&Update"
 msgstr "&Update"
 
-#: src/clients/inst_proposal.rb:1372
+#: src/clients/inst_proposal.rb:1370
 msgid "&Install"
 msgstr "&Install"
 
@@ -1404,59 +1413,43 @@
 msgid "Probing hard disks..."
 msgstr "Probing hard disks..."
 
-#: src/clients/inst_system_analysis.rb:127
-msgid "Search for Linux partitions"
-msgstr "Search for Linux partitions"
-
+#. FATE #302980: Simplified user config during installation
 #: src/clients/inst_system_analysis.rb:128
-msgid "Searching for Linux partitions..."
-msgstr "Searching for Linux partitions..."
-
-#. FATE #302980: Simplified user config during installation
-#: src/clients/inst_system_analysis.rb:132
 #, fuzzy
 msgid "Search for system files"
 msgstr "Search for Patch Name"
 
-#: src/clients/inst_system_analysis.rb:133
+#: src/clients/inst_system_analysis.rb:129
 #, fuzzy
 msgid "Searching for system files..."
 msgstr "Searching for modified files"
 
-#: src/clients/inst_system_analysis.rb:136
+#: src/clients/inst_system_analysis.rb:132
 #, fuzzy
 #| msgid "Initialize package manager"
 msgid "Initialize software manager"
 msgstr "Initialise package manager"
 
-#: src/clients/inst_system_analysis.rb:137
+#: src/clients/inst_system_analysis.rb:133
 #, fuzzy
 #| msgid "Initializing package manager..."
 msgid "Initializing software manager..."
 msgstr "Initialising package manager..."
 
-#: src/clients/inst_system_analysis.rb:140
-msgid "Evaluate update possibility"
-msgstr "Evaluate update possibility"
-
-#: src/clients/inst_system_analysis.rb:141
-msgid "Evaluating update possibility..."
-msgstr "Evaluating update possibility..."
-
 #. TRANSLATORS: dialog caption
-#: src/clients/inst_system_analysis.rb:146
+#: src/clients/inst_system_analysis.rb:138
 msgid "System Probing"
 msgstr "System Probing"
 
 #. TRANSLATORS: dialog help
-#: src/clients/inst_system_analysis.rb:152
+#: src/clients/inst_system_analysis.rb:144
 #, fuzzy
 #| msgid "Please wait while computer hardware and installed systems are being probed..."
 msgid "YaST is probing computer hardware and installed systems now."
 msgstr "Please wait while computer hardware and installed systems are being probed..."
 
 #. additonal error when HW was not found
-#: src/clients/inst_system_analysis.rb:255
+#: src/clients/inst_system_analysis.rb:241
 #, fuzzy
 #| msgid ""
 #| "No hard disks were found for the installation.\n"
@@ -1469,7 +1462,7 @@
 "Please check your hardware!\n"
 
 #. pop-up error report
-#: src/clients/inst_system_analysis.rb:269
+#: src/clients/inst_system_analysis.rb:255
 #, fuzzy
 #| msgid ""
 #| "No hard disks were found for the installation.\n"
@@ -1482,7 +1475,7 @@
 "No hard disks were found for the installation.\n"
 "Please check your hardware!\n"
 
-#: src/clients/inst_system_analysis.rb:279
+#: src/clients/inst_system_analysis.rb:265
 msgid ""
 "No hard disks were found for the installation.\n"
 "During an automatic installation, they might be detected later.\n"
@@ -1490,7 +1483,7 @@
 msgstr ""
 
 #. pop-up error report
-#: src/clients/inst_system_analysis.rb:290
+#: src/clients/inst_system_analysis.rb:276
 #, fuzzy
 #| msgid ""
 #| "No hard disks and no hard disk controllers were\n"
@@ -1507,7 +1500,7 @@
 "Check your hardware.\n"
 
 #. popup message
-#: src/clients/inst_system_analysis.rb:343
+#: src/clients/inst_system_analysis.rb:318
 #, fuzzy
 msgid ""
 "Failed to initialize the software repositories.\n"
@@ -1517,33 +1510,33 @@
 "Aborting the installation."
 
 #. TRANSLATORS: Table item status (repository)
-#: src/clients/inst_upgrade_urls.rb:96
+#: src/clients/inst_upgrade_urls.rb:104
 #, fuzzy
 #| msgid "Remove"
 msgid "Removed"
 msgstr "Remove"
 
 #. TRANSLATORS: Table item status (repository)
-#: src/clients/inst_upgrade_urls.rb:100
+#: src/clients/inst_upgrade_urls.rb:108
 msgid "Enabled"
 msgstr "Enabled"
 
 #. TRANSLATORS: Table item status (repository)
-#: src/clients/inst_upgrade_urls.rb:104
+#: src/clients/inst_upgrade_urls.rb:112
 msgid "Disabled"
 msgstr "Disabled"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: dialog caption
-#: src/clients/inst_upgrade_urls.rb:199 src/clients/inst_upgrade_urls.rb:667
-#: src/clients/inst_upgrade_urls.rb:726
+#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677
+#: src/clients/inst_upgrade_urls.rb:736
 msgid "Previously Used Repositories"
 msgstr "Previously Used Repositories"
 
 #. TRANSLATORS: dialog text, possibly multiline,
 #. Please, do not use more than 50 characters per line.
-#: src/clients/inst_upgrade_urls.rb:205
+#: src/clients/inst_upgrade_urls.rb:215
 #, fuzzy
 msgid ""
 "These repositories were found on the system\n"
@@ -1553,27 +1546,27 @@
 "you are just upgrading:"
 
 #. TRANSLATORS: Table header item
-#: src/clients/inst_upgrade_urls.rb:215
+#: src/clients/inst_upgrade_urls.rb:225
 msgid "Current Status"
 msgstr "Current Status"
 
 #. TRANSLATORS: Table header item
-#: src/clients/inst_upgrade_urls.rb:217
+#: src/clients/inst_upgrade_urls.rb:227
 msgid "Repository"
 msgstr "Repository"
 
 #. TRANSLATORS: Table header item
-#: src/clients/inst_upgrade_urls.rb:219
+#: src/clients/inst_upgrade_urls.rb:229
 msgid "URL"
 msgstr "URL"
 
 #. TRANSLATORS: Push button
-#: src/clients/inst_upgrade_urls.rb:229
+#: src/clients/inst_upgrade_urls.rb:239
 msgid "&Toggle Status"
 msgstr "&Toggle Status"
 
 #. TRANSLATORS: help text 1/3
-#: src/clients/inst_upgrade_urls.rb:235
+#: src/clients/inst_upgrade_urls.rb:245
 #, fuzzy
 msgid ""
 "<p>Here you see all software repositories found\n"
@@ -1584,7 +1577,7 @@
 "those you want to include in the upgrade process.</p>"
 
 #. TRANSLATORS: help text 2/3
-#: src/clients/inst_upgrade_urls.rb:239
+#: src/clients/inst_upgrade_urls.rb:249
 #, fuzzy
 #| msgid ""
 #| "<p>To enable or disable an URL, click on the\n"
@@ -1597,30 +1590,30 @@
 "<b>Toggle Status</b> button or double-click on the respective table item.</p>"
 
 #. TRANSLATORS: help text 3/3
-#: src/clients/inst_upgrade_urls.rb:243
+#: src/clients/inst_upgrade_urls.rb:253
 msgid "<p>To change the URL, click on the <b>Change...</b> button.</p>"
 msgstr "<p>To change the URL, click on the <b>Change...</b> button.</p>"
 
 #. one_url already has "id" and some items might be deleted
 #. looking to id_to_name is done via the original key
 #. TRANSLATORS: Fallback name for a repository
-#: src/clients/inst_upgrade_urls.rb:265 src/clients/inst_upgrade_urls.rb:272
-#: src/clients/inst_upgrade_urls.rb:278
+#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282
+#: src/clients/inst_upgrade_urls.rb:288
 msgid "Unknown"
 msgstr "Unknown"
 
 #. TRANSLATORS: textentry
-#: src/clients/inst_upgrade_urls.rb:373
+#: src/clients/inst_upgrade_urls.rb:383
 msgid "&Repository URL"
 msgstr "&Repository URL"
 
 #. TRANSLATORS: popup header
-#: src/clients/inst_upgrade_urls.rb:637
+#: src/clients/inst_upgrade_urls.rb:647
 msgid "Network is not Configured"
 msgstr "Network is not Configured"
 
 #. TRANSLATORS: popup question
-#: src/clients/inst_upgrade_urls.rb:639
+#: src/clients/inst_upgrade_urls.rb:649
 #, fuzzy
 msgid ""
 "Remote repositories require an Internet connection.\n"
@@ -1631,57 +1624,57 @@
 "Would you like to configure it?"
 
 #. TRANSLATORS: Progress text
-#: src/clients/inst_upgrade_urls.rb:670 src/clients/inst_upgrade_urls.rb:727
+#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737
 msgid "Adding and removing repositories..."
 msgstr "Adding and removing repositories..."
 
 #. TRANSLATORS: help text
 #. TRANSLATORS: help text
-#: src/clients/inst_upgrade_urls.rb:673 src/clients/inst_upgrade_urls.rb:732
+#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742
 #, fuzzy
 #| msgid "<p>Please wait while repositories are being added and removed.</p>"
 msgid "<p>Repositories are being added and removed.</p>"
 msgstr "<p>Please wait while repositories are being added and removed.</p>"
 
-#: src/clients/inst_upgrade_urls.rb:692
+#: src/clients/inst_upgrade_urls.rb:702
 #, fuzzy
 msgid "Remove unused repositories"
 msgstr "Read previously used repositories"
 
-#. Removes selected repositories
-#: src/clients/inst_upgrade_urls.rb:696 src/clients/inst_upgrade_urls.rb:813
+#. force reloading the libzypp repomanager to notice the removed files
+#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859
 #, fuzzy
 msgid "Removing unused repositories..."
 msgstr "Reading previously used repositories..."
 
-#: src/clients/inst_upgrade_urls.rb:703
+#: src/clients/inst_upgrade_urls.rb:713
 #, fuzzy
 msgid "Add enabled repositories"
 msgstr "Available Repositories"
 
 #. Adds selected repositories as <tt>enabled</tt>
-#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:867
+#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925
 #, fuzzy
 msgid "Adding enabled repositories..."
 msgstr "Adding Repositories..."
 
-#: src/clients/inst_upgrade_urls.rb:715
+#: src/clients/inst_upgrade_urls.rb:725
 #, fuzzy
 msgid "Add disabled repositories"
 msgstr "Available Repositories"
 
 #. Adds selected repositories as <tt>disabled</tt>
-#: src/clients/inst_upgrade_urls.rb:719 src/clients/inst_upgrade_urls.rb:1024
+#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082
 #, fuzzy
 msgid "Adding disabled repositories..."
 msgstr "Adding Repositories..."
 
 #. true - OK, continue
-#: src/clients/inst_upgrade_urls.rb:841
+#: src/clients/inst_upgrade_urls.rb:899
 msgid "Correct Media Requested"
 msgstr ""
 
-#: src/clients/inst_upgrade_urls.rb:843
+#: src/clients/inst_upgrade_urls.rb:901
 msgid ""
 "Make sure that media with label %1\n"
 "is in the CD/DVD drive.\n"
@@ -1691,7 +1684,7 @@
 
 #. Adding repositories in a disabled state, then enable them
 #. for the system upgrade
-#: src/clients/inst_upgrade_urls.rb:906
+#: src/clients/inst_upgrade_urls.rb:964
 msgid ""
 "Cannot add repository %1\n"
 "URL: %2\n"
@@ -1701,7 +1694,7 @@
 msgstr ""
 
 #. bnc #543468, do not check aliases of repositories stored in Installation::destdir
-#: src/clients/inst_upgrade_urls.rb:943
+#: src/clients/inst_upgrade_urls.rb:1001
 #, fuzzy
 msgid ""
 "Cannot add enabled repository\n"
@@ -1713,7 +1706,7 @@
 
 #. TRANSLATORS: error report
 #. %1 is replaced with repo-name, %2 with repo-URL
-#: src/clients/inst_upgrade_urls.rb:963
+#: src/clients/inst_upgrade_urls.rb:1021
 #, fuzzy
 msgid ""
 "An error occurred while refreshing repository\n"
@@ -1723,7 +1716,7 @@
 
 #. TRANSLATORS: error report
 #. %1 is replaced with repo-name, %2 with repo-URL
-#: src/clients/inst_upgrade_urls.rb:983
+#: src/clients/inst_upgrade_urls.rb:1041
 #, fuzzy
 msgid ""
 "An error occurred while enabling repository\n"
@@ -1734,7 +1727,7 @@
 "%2"
 
 #. do not probe! adding as disabled!
-#: src/clients/inst_upgrade_urls.rb:1064
+#: src/clients/inst_upgrade_urls.rb:1122
 #, fuzzy
 msgid ""
 "Cannot add disabled repository\n"
@@ -1819,58 +1812,53 @@
 msgstr "Saving proxy configuration..."
 
 #. progress step title
-#: src/clients/random_finish.rb:62
-msgid "Enabling random number generator..."
-msgstr ""
-
-#. progress step title
-#: src/clients/save_config_finish.rb:134
+#: src/clients/save_config_finish.rb:136
 msgid "Saving time zone..."
 msgstr "Saving time zone..."
 
 #. progress step title
-#: src/clients/save_config_finish.rb:143
+#: src/clients/save_config_finish.rb:145
 msgid "Saving language..."
 msgstr "Saving language..."
 
 #. progress step title
-#: src/clients/save_config_finish.rb:148
+#: src/clients/save_config_finish.rb:150
 msgid "Saving console configuration..."
 msgstr "Saving console configuration..."
 
 #. progress step title
-#: src/clients/save_config_finish.rb:167
+#: src/clients/save_config_finish.rb:169
 msgid "Saving keyboard configuration..."
 msgstr "Saving keyboard configuration..."
 
 #. progress step title
-#: src/clients/save_config_finish.rb:172
+#: src/clients/save_config_finish.rb:174
 msgid "Saving product information..."
 msgstr "Saving product information..."
 
 #. progress step title
-#: src/clients/save_config_finish.rb:177
+#: src/clients/save_config_finish.rb:179
 #, fuzzy
 #| msgid "Saving automatical installation settings..."
 msgid "Saving automatic installation settings..."
 msgstr "Saving automatical installation settings..."
 
 #. progress step title
-#: src/clients/save_config_finish.rb:183
+#: src/clients/save_config_finish.rb:185
 #, fuzzy
 #| msgid "Reading security settings..."
 msgid "Saving security settings..."
 msgstr "Reading security settings..."
 
 #. progress step title
-#: src/clients/save_config_finish.rb:192
+#: src/clients/save_config_finish.rb:208
 #, fuzzy
 #| msgid "Saving sound card settings..."
 msgid "Saving boot scripts settings..."
 msgstr "Saving sound card settings..."
 
 #. progress step title
-#: src/clients/save_hw_status_finish.rb:70
+#: src/clients/save_hw_status_finish.rb:67
 msgid "Saving hardware configuration..."
 msgstr "Saving hardware configuration..."
 
@@ -1904,7 +1892,7 @@
 msgstr "Writing YaST Configuration..."
 
 #. call command
-#: src/clients/yast_inf_finish.rb:111
+#: src/clients/yast_inf_finish.rb:109
 #, fuzzy
 msgid ""
 "\n"
@@ -2180,6 +2168,70 @@
 msgid "Shrinking PREP partition..."
 msgstr "Searching for Linux partitions..."
 
+#. Text to display
+#.
+#. @return String
+#: src/lib/installation/remote_finish_client.rb:68
+#, fuzzy
+#| msgid "Remote Administration"
+msgid "Enabling remote administration..."
+msgstr "Remote Administration"
+
+#. checking whether images are supported
+#. BNC #409927
+#. Checking files for signatures
+#: src/modules/ImageInstallation.rb:845
+#, fuzzy
+#| msgid "Failed to copy %1 to installation system"
+msgid "Failed to read information about installation images"
+msgstr "Failed to copy %1 to installation system"
+
+#. sleep in order not to kill -USR1 to dd too early, otherwise it finishes
+#: src/modules/ImageInstallation.rb:1193
+#, fuzzy
+msgid "Deploying..."
+msgstr "Downloading image..."
+
+#. Function stores all new/requested states of all handled/supported types.
+#.
+#. @see #all_supported_types
+#. @see #objects_state
+#: src/modules/ImageInstallation.rb:1216
+#, fuzzy
+msgid "Storing user preferences..."
+msgstr "Storing volume settings..."
+
+#. Restores packages statuses from 'objects_state': Selects packages for removal, installation, upgrade.
+#.
+#. @return [Boolean] if successful
+#: src/modules/ImageInstallation.rb:1348
+#, fuzzy
+msgid "Restoring user preferences..."
+msgstr "Restarting services..."
+
+#. Error message
+#: src/modules/ImageInstallation.rb:1446
+msgid ""
+"Installation was unable to solve package dependencies automatically.\n"
+"Software manager will be opened for you to solve them manually."
+msgstr ""
+
+#, fuzzy
+#~ msgid "License needs to be accepted"
+#~ msgstr "needs to be reinstalled"
+
+#~ msgid "Search for Linux partitions"
+#~ msgstr "Search for Linux partitions"
+
+#~ msgid "Searching for Linux partitions..."
+#~ msgstr "Searching for Linux partitions..."
+
+#~ msgid "Evaluate update possibility"
+#~ msgstr "Evaluate update possibility"
+
+#~ msgid "Evaluating update possibility..."
+#~ msgstr "Evaluating update possibility..."
+
 #~ msgid "Network Device: %1"
 #~ msgstr "Network Device: %1"
 
@@ -2758,18 +2810,6 @@
 #~ "Check your hardware.\n"
 
 #, fuzzy
-#~ msgid "Deploying..."
-#~ msgstr "Downloading image..."
-
-#, fuzzy
-#~ msgid "Storing user preferences..."
-#~ msgstr "Storing volume settings..."
-
-#, fuzzy
-#~ msgid "Restoring user preferences..."
-#~ msgstr "Restarting services..."
-
-#, fuzzy
 #~ msgid ""
 #~ "No system type was selected.\n"
 #~ "Select the default type."

Modified: trunk/yast/en_GB/po/instserver.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/instserver.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/instserver.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:36+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\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"

Modified: trunk/yast/en_GB/po/iplb.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/iplb.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/iplb.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2014-05-19 09:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -92,6 +92,26 @@
 msgstr "Second part of configuration of IPLB"
 
 #. ids of widget of global dialog
+#: src/include/iplb/global_conf.rb:61
+msgid "yes"
+msgstr "yes"
+
+#: src/include/iplb/global_conf.rb:61
+msgid "no"
+msgstr "no"
+
+#: src/include/iplb/global_conf.rb:68 src/include/iplb/vserver_conf.rb:226
+#, fuzzy
+#| msgid "Global Configuration"
+msgid "&Global Configuration"
+msgstr "Global Configuration"
+
+#: src/include/iplb/global_conf.rb:69 src/include/iplb/vserver_conf.rb:227
+#, fuzzy
+#| msgid "Virtual Servers Configuration"
+msgid "&Virtual Server Configuration"
+msgstr "Virtual Servers Configuration"
+
 #: src/include/iplb/global_conf.rb:75
 msgid "Check Interval"
 msgstr "Check Interval"
@@ -154,6 +174,98 @@
 
 #. All helps are here
 #: src/include/iplb/helps.rb:35
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "<p><b><big>check interval</big> =</b> <i>n</i>\n"
+#| "</p><p>Defines the number of second between server checks.\n"
+#| "</p><p>Default: 10 seconds\n"
+#| "\n"
+#| "</p><p><b><big>check timeout</big> =</b> <i>n</i>\n"
+#| "</p><p>Timeout in seconds for connect, external and ping checks. If the timeout is exceeded then the real server is declared dead.\n"
+#| "</p><p>If defined in a virtual server section then the global value is overridden.\n"
+#| "</p><p>If undefined then the value of negotiatetimeout is used. negotiatetimeout is also a global value that may be overriden by a per-virtual setting.\n"
+#| "</p><p>If both checktimeout and negotiatetimeout are unset, the default is used.\n"
+#| "</p><p>Default: 5 seconds\n"
+#| "\n"
+#| "</p><p><b><big>failure count</big> =</b> <i>n</i>\n"
+#| "</p><p>The number of consecutive times a failure will have to be reported by a check before the realserver is considered to have failed.  A value of 1 will have the realserver considered failed on the first failure.  A successful check will reset the failure counter to 0.\n"
+#| "</p><p>If defined in a virtual server section then the global value is overridden.\n"
+#| "</p><p>Default: 1\n"
+#| "\n"
+#| "</p><p><b><big>negotiate timeout</big> =</b> <i>n</i>\n"
+#| "</p><p>Timeout in seconds for negotiate checks.\n"
+#| "</p><p>If defined in a virtual server section then the global value is overridden.\n"
+#| "</p><p>If undefined then the value of connecttimeout is used. connecttimeout is also a global value that may be overriden by a per-virtual setting.\n"
+#| "</p><p>If both negotiatetimeout and connecttimeout are unset, the default is used.\n"
+#| "</p><p>Default: 30 seconds\n"
+#| "\n"
+#| "</p><p><b><big>fallback</big> =</b> <i>ip_address|hostname[:portnumber|sercvicename]</i> [<b>gate</b>|<b>masq</b>|<b>ipip</b>]\n"
+#| "</p><p>the server onto which a webservice is redirected if all real servers are down. Typically this would be 127.0.0.1 with an emergency page.\n"
+#| "</p><p>If defined in a virtual server section then the global value is overridden.\n"
+#| "\n"
+#| "</p><p><b><big>log file</big> = \"</b><i>/path/to/logfile</i><b>\"</b>|syslog_facility\n"
+#| "</p><p>An alternative logfile might be specified with this directive. If the logfile does not have a leading '/', it is assumed to be a <b><a href=\"/man/3/syslog\">syslog</a></b>(3) facility name.\n"
+#| "</p><p>Default: log directly to the file <i>/var/log/ldirectord.log</i>.\n"
+#| "\n"
+#| "</p><p><b><big>email alert</big> = \"</b><i>emailaddress</i><b>\"</b>\n"
+#| "</p><p>A valid email address for sending alerts about the changed connection status to any real server defined in the virtual service. This option requires perl\n"
+#| "module MailTools to be installed. Automatically tries to send email using any of the built-in methods. See perldoc Mail::Mailer for more info on methods.\n"
+#| "</p><p>If defined in a virtual server section then the global value is overridden.\n"
+#| "\n"
+#| "</p><p><b><big>email alert freq</big> =</b> <i>n</i>\n"
+#| "</p><p>Delay in seconds between repeating email alerts while any given real server in the virtual service remains inaccessible. A setting of zero seconds will\n"
+#| "inhibit the repeating alerts. The email timing accuracy of this setting is dependent on the number of seconds defined in the checkinterval configuration\n"
+#| "option.\n"
+#| "</p><p>If defined in a virtual server section then the global value is overridden.\n"
+#| "</p><p>Default: 0\n"
+#| "\n"
+#| "</p><p><b><big>email alert status</big> = all</b>|<b>none</b>|<b>starting</b>|<b>running</b>|<b>stopping</b>|<b>reloading</b>,...\n"
+#| "</p><p>Comma delimited list of server states in which email alerts should be sent. <b>all</b> is a short-hand for\n"
+#| "\"<b>starting</b>,<b>running</b>,<b>stopping</b>,<b>reloading</b>\". If <b>none</b> is specified, no other option may be specified, otherwise options are ored\n"
+#| "with each other.\n"
+#| "</p><p>If defined in a virtual server section then the global value is overridden.\n"
+#| "</p><p>Default: all\n"
+#| "\n"
+#| "</p><p><b><big>callback</big> = \"</b><i>/path/to/callback</i><b>\"</b>\n"
+#| "</p><p>If this directive is defined, <b>ldirectord</b> automatically calls the executable <i>/path/to/callback</i> after the configuration file has changed on\n"
+#| "disk. This is useful to update the configuration file through <b>scp</b> on the other heartbeated host. The first argument to the callback is the name of the\n"
+#| "configuration.\n"
+#| "</p><p>This directive might also be used to restart <b>ldirectord</b> automatically after the configuration file changed on disk. However, if <b>autoreload</b> is\n"
+#| "set to yes, the configuration is reloaded anyway.\n"
+#| "\n"
+#| "</p><p><b><big>execute</big> = \"</b><i>configuration</i><b>\"</b>\n"
+#| "</p><p>Use this directive to start an instance of ldirectord for the named <i>configuration</i>.\n"
+#| "\n"
+#| "</p><p><b><big>auto reload</big> = yes</b>|<b>no</b>\n"
+#| "</p><p>Defines if <ldirectord> should continuously check the configuration file for modification. If this is set to 'yes' and the configuration file changed\n"
+#| "on disk and its modification time (mtime) is newer than the previous version, the configuration is automatically reloaded.\n"
+#| "</p><p>Default: no\n"
+#| "\n"
+#| "</p><p><b><big>quiescent</big> = yes</b>|<b>no</b>\n"
+#| "</p><p>If <i>yes</i>, then when real or failback servers are determined to be down, they are not actually removed from the kernel's <small>LVS</small> table.\n"
+#| "Rather, their weight is set to zero which means that no new connections will be accepted.\n"
+#| "</p><p>This has the side effect, that if the real server has persistent connections, new connections from any existing clients will continue to be routed to the\n"
+#| "real server, until the persistant timeout can expire. See ipvsadm for more information on persistant connections.\n"
+#| "</p><p>This side-effect can be avoided by running the following:\n"
+#| "</p><p>echo 1 > /proc/sys/net/ipv4/vs/expire_quiescent_template\n"
+#| "</p><p>If the proc file isn't present this probably means that the kernel doesn't have lvs support, <small>LVS</small> support isn't loaded, or the kernel is too\n"
+#| "old to have the proc file. Running ipvsadm as root should load <small>LVS</small> into the kernel if it is possible.\n"
+#| "</p><p>If <i>no</i>, then the real or failback servers will be removed from the kernel's <small>LVS</small> table. The default is <i>yes</i>.\n"
+#| "</p><p>If defined in a virtual server section then the global value is overridden.\n"
+#| "</p><p>Default: <i>yes</i>\n"
+#| "\n"
+#| "</p><p><b><big>fork</big> = yes</b>|<b>no</b>\n"
+#| "</p><p>If <i>yes</i>, then ldirectord will spawn a child proccess for every virtual server, and run checks against the real servers from them. This will increase\n"
+#| "response times to changes in real server status in configurations with many virtual servers. This may also use less memory then running many seperate instances\n"
+#| "of ldirectord. Child processes will be automaticly restarted if they die.\n"
+#| "</p><p>Default: <i>no</i>\n"
+#| "\n"
+#| "</p><p><b><big>supervised</big> = yes</b>|<b>no</b>\n"
+#| "</p><p>If <i>yes</i>, then ldirectord does not go into background mode. All log-messages are redirected to stdout instead of a logfile. This is useful to run\n"
+#| "<b>ldirectord</b> supervised from daemontools. See <a href=\"http://untroubled.org/rpms/daemontools/\">http://untroubled.org/rpms/daemontools/</a> or <a href=\"http://cr.yp.to/daemontools.html\">http://cr.yp.to/daemontools.html</a> for details.\n"
+#| "</p><p>Default: <i>no</i>\n"
+#| "</p>\n"
 msgid ""
 "\n"
 "<p><b><big>check interval</big> =</b> <i>n</i>\n"
@@ -201,7 +313,7 @@
 "\n"
 "</p><p><b><big>email alert status</big> = all</b>|<b>none</b>|<b>starting</b>|<b>running</b>|<b>stopping</b>|<b>reloading</b>,...\n"
 "</p><p>Comma delimited list of server states in which email alerts should be sent. <b>all</b> is a short-hand for\n"
-"\"<b>starting</b>,<b>running</b>,<b>stopping</b>,<b>reloading</b>\". If <b>none</b> is specified, no other option may be specified, otherwise options are ored\n"
+"\"<b>starting</b>,<b>running</b>,<b>stopping</b>,<b>reloading</b>\". If <b>none</b> is specified, no other option may be specified, otherwise options are ORed\n"
 "with each other.\n"
 "</p><p>If defined in a virtual server section then the global value is overridden.\n"
 "</p><p>Default: all\n"
@@ -338,6 +450,224 @@
 "</p>\n"
 
 #: src/include/iplb/helps.rb:127
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "<p><b><big>virtual server</big> =</b> <i>(ip_address|hostname:portnumber|servicename)|firewall-mark</i>\n"
+#| "</p><p>Defines a virtual service by IP-address (or hostname) and port (or servicename) or firewall-mark. A firewall-mark is an integer greater than zero. The\n"
+#| "configuration of marking packets is controled using the <tt>\"-m\"</tt> option to <b>ipchains</b>(8). All real services and flags for a virtual service\n"
+#| "must follow this line immediately and be indented.\n"
+#| "\n"
+#| "\n"
+#| "</p><p><b><big>real servers</big> =</b> <i>ip_address|hostname[->ip_address|hostname][:portnumber|servicename</i>]\n"
+#| "<b>gate</b>|<b>masq</b>|<b>ipip</b> [<i>weight</i>] [<b>\"</b><i>request</i><b>\", \"</b><i>receive</i><b>\"</b>]\n"
+#| "</p><p>Defines a real service by IP-address (or hostname) and port (or servicename). If the port is omitted then a 0 will be used, this is intended primarily for\n"
+#| "fwmark services where the port for real servers is ignored. Optionally a range of <small>IP</small> addresses (or two hostnames) may be given, in which case\n"
+#| "each <small>IP</small> address in the range will be treated as a real server using the given port. The second argument defines the forwarding method, must be\n"
+#| "<b>gate</b>, <b>ipip</b> or <b>masq</b>. The thrid argument is optional and defines the weight for that real server. If omitted then a weight of 1 will be\n"
+#| "used. The last two arguments are also optional. They define a request-receive pair to be used to check if a server is alive. They override the request-receive\n"
+#| "pair in the virtual server section. These two strings must be quoted. If the request string starts with http://... the IP-address and port of the real\n"
+#| "server is overridden, otherwise the IP-address and port of the real server is used.\n"
+#| "</p><p>For <small>TCP</small> and <small>UDP</small> (non fwmark) virtual services, unless the forwarding method is masq and the <small>IP</small> address of a\n"
+#| "real server is non-local (not present on a interface on the host running ldirectord) then the port of the real server will be set to that of its virtual\n"
+#| "service. That is, port-mapping is only available to if the real server is another machine and the forwarding method is masq. This is due to the way that the\n"
+#| "underlying <small>LVS</small> code in the kernel functions.\n"
+#| "</p><p>More than one of these entries may be inside a virtual section. The checktimeout, negotiatetimeout, failurecount, fallback, emailalert, emailalertfreq and\n"
+#| "quiescent options listed above may also appear inside a virtual section, in which case the global setting is overridden.\n"
+#| "\n"
+#| "\n"
+#| "</p><p><b><big>check type</big> = connect</b>|<b>external</b>|<b>negotiate</b>|<b>off</b>|<b>on</b>|<b>ping</b>|<b>checktimeout</b><i>N</i>\n"
+#| "</p><p>Type of check to perform. Negotiate sends a request and matches a receive string. Connect only attemts to make a <small>TCP/IP</small> connection, thus the\n"
+#| "request and receive strings may be omitted. If checktype is a number then negotiate and connect is combined so that after each N connect attempts one negotiate\n"
+#| "attempt is performed. This is useful to check often if a service answers and in much longer intervalls a negotiating check is done. Ping means that\n"
+#| "<small>ICMP</small> ping will be used to test the availability of real servers. Ping is also used as the connect check for <small>UDP</small> services. Off\n"
+#| "means no checking will take place and no real or fallback servers will be activated. On means no checking will take place and real servers will always be\n"
+#| "activated. Default is <i>negotiate</i>.\n"
+#| "\n"
+#| "\n"
+#| "</p><p><b><big>service</big> = dns</b>|<b>ftp</b>|<b>http</b>|<b>https</b>|<b>imap</b>|<b>imaps</b>|<b>ldap</b>|<b>mysql</b>|<b>nntp</b>|<b>none</b>|<b>oracle</b>|<b>pgsql</b>|<b>pop</b>|<b>pops</b>|<b>radius</b>|<b>simpletcp</b>|<b>sip</b>|<b>smtp</b>\n"
+#| "</p><p>The type of service to monitor when using checktype=negotiate. None denotes a service that will not be monitored.\n"
+#| "</p><p>simpletcp sends the <b>request</b> string to the server and tests it against the <b>receive</b> regexp. The other types of checks connect to the server\n"
+#| "using the specified protocol. Please see the <b>request</b> and <b>receive</b> sections for protocol specific information.\n"
+#| "</p><p>Default:\n"
+#| "</p><dl compact=\"compact\">\n"
+#| "<dt>* Virtual server port is 21: ftp\n"
+#| "</dt><dt>* Virtual server port is 25: smtp\n"
+#| "</dt><dt>* Virtual server port is 53: dns\n"
+#| "</dt><dt>* Virtual server port is 80: http\n"
+#| "</dt><dt>* Virtual server port is 110: pop\n"
+#| "</dt><dt>* Virtual server port is 119: nntp\n"
+#| "</dt><dt>* Virtual server port is 143: imap\n"
+#| "</dt><dt>* Virtual server port is 389: ldap\n"
+#| "</dt><dt>* Virtual server port is 443: https\n"
+#| "</dt><dt>* Virtual server port is 993: imaps\n"
+#| "</dt><dt>* Virtual server port is 995: pops\n"
+#| "</dt><dt>* Virtual server port is 1521: oracle\n"
+#| "</dt><dt>* Virtual server port is 1812: radius\n"
+#| "</dt><dt>* Virtual server port is 3306: mysql\n"
+#| "</dt><dt>* Virtual server port is 5432: pgsql\n"
+#| "</dt><dt>* Virtual server port is 5060: sip\n"
+#| "</dt><dt>* Otherwise: none\n"
+#| "\n"
+#| "\n"
+#| "</dt><dt><b><big>check command</big> = \"</b><i>path to script</i><b>\"</b>\n"
+#| "<p>This setting is used if checktype is external and is the command to be run to check the status of a real server. It should exit with status 0 if everything\n"
+#| "is ok, or non-zero otherwise.\n"
+#| "</p><p>Four parameters are passed to the script:\n"
+#| "</p></dt><dt>* virtual server ip/firewall mark\n"
+#| "</dt><dt>* virtual server port\n"
+#| "</dt><dt>* real server ip\n"
+#| "</dt><dt>* real server port\n"
+#| "</dt><dt>Default: /bin/true\n"
+#| "\n"
+#| "\n"
+#| "<p><b><big>check port</big> =</b> <i>n</i>\n"
+#| "</p><p>Number of port to monitor. Sometimes check port differs from service port.\n"
+#| "</p><p>Default: port specified for each real server\n"
+#| "\n"
+#| "\n"
+#| "</p><p><b><big>request</big> = \"</b><i>uri to requested object</i><b>\"</b>\n"
+#| "</p><p>This object will be requested each checkinterval seconds on each real server. The string must be inside quotes. Note that this string may be overridden by\n"
+#| "an optional per real-server based request-string.\n"
+#| "</p><p>For a <small>DNS</small> check this should the name of an A record, or the address of a <small>PTR</small> record to look up.\n"
+#| "</p><p>For a MySQL, Oracle or PostgeSQL check, this should be an <small>SQL</small> query. The data returned is not checked, only that the answer is one or more\n"
+#| "rows. This is a required setting.\n"
+#| "</p><p>For a simpletcp check, this string is sent verbatim except any occurances of \n"
+#| " are replaced with a new line character.\n"
+#| "\n"
+#| "\n"
+#| "</p><p><b><big>receive</big> = \"</b><i>regexp to compare</i><b>\"</b>\n"
+#| "</p><p>If the requested result contains this <i>regexp to compare</i>, the real server is declared alive. The regexp must be inside quotes. Keep in mind that\n"
+#| "regexps are not plain strings and that you need to escape the special characters if they should as literals. Note that this regexp may be overridden by an\n"
+#| "optional per real-server based receive regexp.\n"
+#| "</p><p>For a <small>DNS</small> check this should be any one the A record's addresses or any one of the <small>PTR</small> record's names.\n"
+#| "</p><p>For a MySQL check, the receive setting is not used.\n"
+#| "\n"
+#| "\n"
+#| "</p><p><b><big>http method</big> = <small>GET</small></b> | <b><small>HEAD</small></b>\n"
+#| "</p><p>Sets the <small>HTTP</small> method which should be used to fetch the <small>URI</small> specified in the request-string. <small>GET</small> is the\n"
+#| "method used by default if the parameter is not set. If <small>HEAD</small> is used, the receive-string should be unset.\n"
+#| "</p><p>Default: <small>GET</small>\n"
+#| "\n"
+#| "\n"
+#| "</p><p><b><big>virtual host</big> = \"</b><i>hostname</i><b>\"</b>\n"
+#| "</p><p>Used when using a negotiate check with <small>HTTP</small> or <small>HTTPS</small> . Sets the host header used in the <small>HTTP</small> request. In the\n"
+#| "case of <small>HTTPS</small> this generally needs to match the common name of the <small>SSL</small> certificate. If not set then the host header will be\n"
+#| "derived from the request url for the real server if present. As a last resort the <small>IP</small> address of the real server will be used.\n"
+#| "\n"
+#| "\n"
+#| "</p><p><b><big>login</big> = \"</b><i>username</i><b>\"</b>\n"
+#| "</p><p>For <small>FTP</small> , <small>IMAP</small> , <small>LDAP</small> , MySQL, Oracle, <small>POP</small> and PostgreSQL, the username used to log in.\n"
+#| "</p><p>For Radius the passwd is used for the attribute User-Name.\n"
+#| "</p><p>For <small>SIP</small> , the username is used as both the to and from address for an <small>OPTIONS</small> query.\n"
+#| "</p><p>Default:\n"
+#| "</p></dt><dt>* <small>FTP:</small> Anonymous\n"
+#| "</dt><dt>* MySQL Oracle, and PostgreSQL: Must be specified in the configuration\n"
+#| "</dt><dt>* <small>SIP:</small> ldirectord@<hostname>, hostname is derived as per the passwd option below.\n"
+#| "</dt><dt>* Otherwise: empty string, which denotes that case authentication will not be attempted.\n"
+#| "\n"
+#| "\n"
+#| "</dt><dt><b><big>password</big> = \"</b><i>password</i><b>\"</b>\n"
+#| "<p>Password to use to login to <small>FTP</small> , <small>IMAP</small> , <small>LDAP</small> , MySQL, Oracle, <small>POP</small> , PostgreSQL and\n"
+#| "<small>SIP</small> servers.\n"
+#| "</p><p>For Radius the passwd is used for the attribute User-Password.\n"
+#| "</p><p>Default:\n"
+#| "</p></dt><dt>* <small>FTP:</small> ldirectord@<hostname>, where hostname is the environment variable <small>HOSTNAME</small> evaluated at run time, or sourced\n"
+#| "from uname if unset.\n"
+#| "</dt><dt>* Otherwise: empty string. In the case of <small>LDAP</small> , MySQL, Oracle, and PostgreSQL this means that authentication will not be performed.\n"
+#| "\n"
+#| "\n"
+#| "</dt><dt><b><big>database name</big> = \"</b><i>databasename</i><b>\"</b>\n"
+#| "<p>Database to use for MySQL, Oracle and PostgreSQL servers, this is the database that the query (set by <b>receive</b> above) will be performed against. This\n"
+#| "is a required setting.\n"
+#| "\n"
+#| "\n"
+#| "</p><p><b><big>radius secret</big> = \"</b><i>radiussecret</i><b>\"</b>\n"
+#| "</p><p>Secret to use for Radius servers, this is the secret used to perform an Access-Request with the username (set by <b>login</b> above) and passwd (set by\n"
+#| "<b>passwd</b> above).\n"
+#| "</p><p>Default: empty string\n"
+#| "\n"
+#| "\n"
+#| "</p><p><b><big>persistent</big> =</b> <i>n</i>\n"
+#| "</p><p>Number of seconds for persistent client connections.\n"
+#| "\n"
+#| "\n"
+#| "</p><p><b><big>netmask</big> =</b> <i>w.x.y.z</i>\n"
+#| "</p><p>Netmask to be used for granularity of persistent client connections.\n"
+#| "\n"
+#| "\n"
+#| "</p><p><b><big>scheduler</big> =</b> <i>scheduler_name</i>\n"
+#| "</p><p>Scheduler to be used by <small>LVS</small> for loadbalancing. For an information on the available sehedulers please see the <b><a href=\"ipvsadm\">ipvsadm</a></b>(8) man page.\n"
+#| "</p><p>Default: \"wrr\"\n"
+#| "\n"
+#| "\n"
+#| "</p><p><b><big>protocol</big> = tcp</b>|<b>udp</b>|<b>fwm</b>\n"
+#| "</p><p>Protocol to be used. If the virtual is specified as an <small>IP</small> address and port then it must be one of tcp or udp. If a firewall mark then the\n"
+#| "protocol must be fwm.\n"
+#| "</p><p>Default:\n"
+#| "</p></dt><dt>* Virtual is an <small>IP</small> address and port, and the port is not 53: tcp\n"
+#| "</dt><dt>* Virtual is an <small>IP</small> address and port, and the port is 53: udp\n"
+#| "</dt><dt>* Virtual is a firewall mark: fwm\n"
+#| "</dt></dl>\n"
+#| "\n"
+#| "\n"
+#| "</p><p><b><big>check timeout</big> =</b> <i>n</i>\n"
+#| "</p><p>Timeout in seconds for connect, external and ping checks. If the timeout is exceeded then the real server is declared dead.\n"
+#| "</p><p>If defined in a virtual server section then the global value is overridden.\n"
+#| "</p><p>If undefined then the value of negotiatetimeout is used. negotiatetimeout is also a global value that may be overriden by a per-virtual setting.\n"
+#| "</p><p>If both checktimeout and negotiatetimeout are unset, the default is used.\n"
+#| "</p><p>Default: 5 seconds\n"
+#| "\n"
+#| "</p><p><b><big>negotiate timeout</big> =</b> <i>n</i>\n"
+#| "</p><p>Timeout in seconds for negotiate checks.\n"
+#| "</p><p>If defined in a virtual server section then the global value is overridden.\n"
+#| "</p><p>If undefined then the value of connecttimeout is used. connecttimeout is also a global value that may be overriden by a per-virtual setting.\n"
+#| "</p><p>If both negotiatetimeout and connecttimeout are unset, the default is used.\n"
+#| "</p><p>Default: 30 seconds\n"
+#| "\n"
+#| "</p><p><b><big>failure count</big> =</b> <i>n</i>\n"
+#| "</p><p>The number of consecutive times a failure will have to be reported by a check before the realserver is considered to have failed.  A value of 1 will have the realserver considered failed on the first failure.  A successful check will reset the failure counter to 0.\n"
+#| "</p><p>If defined in a virtual server section then the global value is overridden.\n"
+#| "</p><p>Default: 1\n"
+#| "\n"
+#| "</p><p><b><big>email alert</big> = \"</b><i>emailaddress</i><b>\"</b>\n"
+#| "</p><p>A valid email address for sending alerts about the changed connection status to any real server defined in the virtual service. This option requires perl\n"
+#| "module MailTools to be installed. Automatically tries to send email using any of the built-in methods. See perldoc Mail::Mailer for more info on methods.\n"
+#| "</p><p>If defined in a virtual server section then the global value is overridden.\n"
+#| "\n"
+#| "</p><p><b><big>email alert freq</big> =</b> <i>n</i>\n"
+#| "</p><p>Delay in seconds between repeating email alerts while any given real server in the virtual service remains inaccessible. A setting of zero seconds will\n"
+#| "inhibit the repeating alerts. The email timing accuracy of this setting is dependent on the number of seconds defined in the checkinterval configuration\n"
+#| "option.\n"
+#| "</p><p>If defined in a virtual server section then the global value is overridden.\n"
+#| "</p><p>Default: 0\n"
+#| "\n"
+#| "</p><p><b><big>email alert status</big> = all</b>|<b>none</b>|<b>starting</b>|<b>running</b>|<b>stopping</b>|<b>reloading</b>,...\n"
+#| "</p><p>Comma delimited list of server states in which email alerts should be sent. <b>all</b> is a short-hand for\n"
+#| "\"<b>starting</b>,<b>running</b>,<b>stopping</b>,<b>reloading</b>\". If <b>none</b> is specified, no other option may be specified, otherwise options are ored\n"
+#| "with each other.\n"
+#| "</p><p>If defined in a virtual server section then the global value is overridden.\n"
+#| "</p><p>Default: all\n"
+#| "\n"
+#| "</p><p><b><big>fallback</big> =</b> <i>ip_address|hostname[:portnumber|sercvicename]</i> [<b>gate</b>|<b>masq</b>|<b>ipip</b>]\n"
+#| "</p><p>the server onto which a webservice is redirected if all real servers are down. Typically this would be 127.0.0.1 with an emergency page.\n"
+#| "</p><p>If defined in a virtual server section then the global value is overridden.\n"
+#| "\n"
+#| "</p><p><b><big>quiescent</big> = yes</b>|<b>no</b>\n"
+#| "</p><p>If <i>yes</i>, then when real or failback servers are determined to be down, they are not actually removed from the kernel's <small>LVS</small> table.\n"
+#| "Rather, their weight is set to zero which means that no new connections will be accepted.\n"
+#| "</p><p>This has the side effect, that if the real server has persistent connections, new connections from any existing clients will continue to be routed to the\n"
+#| "real server, until the persistant timeout can expire. See ipvsadm for more information on persistant connections.\n"
+#| "</p><p>This side-effect can be avoided by running the following:\n"
+#| "</p><p>echo 1 > /proc/sys/net/ipv4/vs/expire_quiescent_template\n"
+#| "</p><p>If the proc file isn't present this probably means that the kernel doesn't have lvs support, <small>LVS</small> support isn't loaded, or the kernel is too\n"
+#| "old to have the proc file. Running ipvsadm as root should load <small>LVS</small> into the kernel if it is possible.\n"
+#| "</p><p>If <i>no</i>, then the real or failback servers will be removed from the kernel's <small>LVS</small> table. The default is <i>yes</i>.\n"
+#| "</p><p>If defined in a virtual server section then the global value is overridden.\n"
+#| "</p><p>Default: <i>yes</i>\n"
+#| "\n"
+#| "\n"
+#| "\n"
 msgid ""
 "\n"
 "<p><b><big>virtual server</big> =</b> <i>(ip_address|hostname:portnumber|servicename)|firewall-mark</i>\n"
@@ -531,7 +861,7 @@
 "\n"
 "</p><p><b><big>email alert status</big> = all</b>|<b>none</b>|<b>starting</b>|<b>running</b>|<b>stopping</b>|<b>reloading</b>,...\n"
 "</p><p>Comma delimited list of server states in which email alerts should be sent. <b>all</b> is a short-hand for\n"
-"\"<b>starting</b>,<b>running</b>,<b>stopping</b>,<b>reloading</b>\". If <b>none</b> is specified, no other option may be specified, otherwise options are ored\n"
+"\"<b>starting</b>,<b>running</b>,<b>stopping</b>,<b>reloading</b>\". If <b>none</b> is specified, no other option may be specified, otherwise options are ORed\n"
 "with each other.\n"
 "</p><p>If defined in a virtual server section then the global value is overridden.\n"
 "</p><p>Default: all\n"
@@ -885,6 +1215,12 @@
 msgstr "Cancel"
 
 #. split the real server ip value;
+#: src/include/iplb/vserver_conf.rb:411
+msgid ""
+"If using IPv6,the format should like this\n"
+"[fe80::5054:ff:fe00:2]"
+msgstr ""
+
 #: src/include/iplb/vserver_conf.rb:413
 msgid "Real Server's IP Address"
 msgstr "Real Server's IP Address"
@@ -897,6 +1233,26 @@
 msgid "weight"
 msgstr "weight"
 
+#. find next ]
+#: src/include/iplb/vserver_conf.rb:456
+#, fuzzy
+#| msgid "The IP address is invalid."
+msgid "IP address is not Valid"
+msgstr "The IP address is invalid."
+
+#. tab switch events end
+#: src/include/iplb/vserver_conf.rb:547
+#, fuzzy
+#| msgid "Add a New Name Server"
+msgid "Add a new real server:"
+msgstr "Add a New Name Server"
+
+#: src/include/iplb/vserver_conf.rb:564
+#, fuzzy
+#| msgid "Set the role of the server"
+msgid "Edit the real server:"
+msgstr "Set the role of the server"
+
 #. Initialization dialog contents
 #: src/include/iplb/wizards.rb:142
 msgid "Initializing..."

Modified: trunk/yast/en_GB/po/iscsi-client.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/iscsi-client.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/iscsi-client.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2007-08-16 19:20+0100\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"
@@ -68,149 +68,155 @@
 msgid "iSNS Port"
 msgstr "iSNS Port"
 
-#: src/include/iscsi-client/dialogs.rb:109
-msgid "Initiator Name"
+#. name of iscsi client (/etc/iscsi/initiatorname.iscsi)
+#: src/include/iscsi-client/dialogs.rb:110
+#, fuzzy
+#| msgid "Initiator Name"
+msgid "&Initiator Name"
 msgstr "Initiator Name"
 
-#: src/include/iscsi-client/dialogs.rb:115
+#. prefer to not translate 'Offload' unless there is a well
+#. known word for this technology (it's special hardware
+#. shifting load from processor to card)
+#: src/include/iscsi-client/dialogs.rb:119
 #, fuzzy
 #| msgid "Sound Card"
-msgid "Offloa&d Card"
+msgid "Offload Car&d"
 msgstr "Sound Card"
 
 #. table of connected targets
 #. table of discovered targets
 #. dialog for all targets from portal (connected/disconnected)
-#: src/include/iscsi-client/dialogs.rb:146
-#: src/include/iscsi-client/dialogs.rb:179
-#: src/include/iscsi-client/dialogs.rb:212
+#: src/include/iscsi-client/dialogs.rb:150
+#: src/include/iscsi-client/dialogs.rb:183
+#: src/include/iscsi-client/dialogs.rb:216
 msgid "Interface"
 msgstr "Interface"
 
-#: src/include/iscsi-client/dialogs.rb:147
-#: src/include/iscsi-client/dialogs.rb:180
-#: src/include/iscsi-client/dialogs.rb:213
+#: src/include/iscsi-client/dialogs.rb:151
+#: src/include/iscsi-client/dialogs.rb:184
+#: src/include/iscsi-client/dialogs.rb:217
 msgid "Portal Address"
 msgstr "Portal Address"
 
-#: src/include/iscsi-client/dialogs.rb:148
-#: src/include/iscsi-client/dialogs.rb:181
-#: src/include/iscsi-client/dialogs.rb:214
+#: src/include/iscsi-client/dialogs.rb:152
+#: src/include/iscsi-client/dialogs.rb:185
+#: src/include/iscsi-client/dialogs.rb:218
 msgid "Target Name"
 msgstr "Target Name"
 
-#: src/include/iscsi-client/dialogs.rb:149
-#: src/include/iscsi-client/dialogs.rb:215
+#: src/include/iscsi-client/dialogs.rb:153
+#: src/include/iscsi-client/dialogs.rb:219
 msgid "Start-Up"
 msgstr "Start-Up"
 
-#: src/include/iscsi-client/dialogs.rb:155
+#: src/include/iscsi-client/dialogs.rb:159
 msgid "Add"
 msgstr "Add"
 
 #. `PushButton(`id(`toggle), _("Toggle Start-Up"))
-#: src/include/iscsi-client/dialogs.rb:156
+#: src/include/iscsi-client/dialogs.rb:160
 msgid "Edit"
 msgstr "Edit"
 
-#: src/include/iscsi-client/dialogs.rb:157
+#: src/include/iscsi-client/dialogs.rb:161
 msgid "Log Out"
 msgstr "Log Out"
 
-#: src/include/iscsi-client/dialogs.rb:182
+#: src/include/iscsi-client/dialogs.rb:186
 msgid "Connected"
 msgstr "Connected"
 
-#: src/include/iscsi-client/dialogs.rb:188
+#: src/include/iscsi-client/dialogs.rb:192
 msgid "Discovery"
 msgstr "Discovery"
 
-#: src/include/iscsi-client/dialogs.rb:189
+#: src/include/iscsi-client/dialogs.rb:193
 msgid "Log In"
 msgstr "Log In"
 
-#: src/include/iscsi-client/dialogs.rb:219
+#: src/include/iscsi-client/dialogs.rb:223
 msgid "Connect"
 msgstr "Connect"
 
 #. authentification dialog for add/discovery target
 #. authentication dialog for add target
-#: src/include/iscsi-client/dialogs.rb:234
-#: src/include/iscsi-client/dialogs.rb:268
+#: src/include/iscsi-client/dialogs.rb:238
+#: src/include/iscsi-client/dialogs.rb:272
 msgid "No Authentication"
 msgstr "No Authentication"
 
-#: src/include/iscsi-client/dialogs.rb:237
-#: src/include/iscsi-client/dialogs.rb:271
+#: src/include/iscsi-client/dialogs.rb:241
+#: src/include/iscsi-client/dialogs.rb:275
 msgid "Incoming Authentication"
 msgstr "Incoming Authentication"
 
-#: src/include/iscsi-client/dialogs.rb:239
-#: src/include/iscsi-client/dialogs.rb:245
-#: src/include/iscsi-client/dialogs.rb:273
-#: src/include/iscsi-client/dialogs.rb:279
+#: src/include/iscsi-client/dialogs.rb:243
+#: src/include/iscsi-client/dialogs.rb:249
+#: src/include/iscsi-client/dialogs.rb:277
+#: src/include/iscsi-client/dialogs.rb:283
 msgid "Username"
 msgstr "Username"
 
-#: src/include/iscsi-client/dialogs.rb:240
-#: src/include/iscsi-client/dialogs.rb:246
-#: src/include/iscsi-client/dialogs.rb:274
-#: src/include/iscsi-client/dialogs.rb:280
+#: src/include/iscsi-client/dialogs.rb:244
+#: src/include/iscsi-client/dialogs.rb:250
+#: src/include/iscsi-client/dialogs.rb:278
+#: src/include/iscsi-client/dialogs.rb:284
 msgid "Password"
 msgstr "Password"
 
-#: src/include/iscsi-client/dialogs.rb:243
-#: src/include/iscsi-client/dialogs.rb:277
+#: src/include/iscsi-client/dialogs.rb:247
+#: src/include/iscsi-client/dialogs.rb:281
 msgid "Outgoing Authentication"
 msgstr "Outgoing Authentication"
 
 #. "handle" : handleDiscAuth,
-#: src/include/iscsi-client/dialogs.rb:297
+#: src/include/iscsi-client/dialogs.rb:301
 #, fuzzy
 msgid "Startup"
 msgstr "Start"
 
 #. widget for portal address
-#: src/include/iscsi-client/dialogs.rb:308
+#: src/include/iscsi-client/dialogs.rb:312
 msgid "IP Address"
 msgstr "IP Address"
 
-#: src/include/iscsi-client/dialogs.rb:309
+#: src/include/iscsi-client/dialogs.rb:313
 msgid "Port"
 msgstr "Port"
 
-#: src/include/iscsi-client/dialogs.rb:324
+#: src/include/iscsi-client/dialogs.rb:328
 msgid "Key"
 msgstr "Key"
 
-#: src/include/iscsi-client/dialogs.rb:324
+#: src/include/iscsi-client/dialogs.rb:328
 msgid "Value"
 msgstr "Value"
 
 #. service status dialog
-#: src/include/iscsi-client/dialogs.rb:335
+#: src/include/iscsi-client/dialogs.rb:339
 msgid "Service"
 msgstr "Service"
 
 #. list og connected targets
-#: src/include/iscsi-client/dialogs.rb:358
+#: src/include/iscsi-client/dialogs.rb:362
 msgid "Connected Targets"
 msgstr "Connected Targets"
 
 #. list of discovered targets
-#: src/include/iscsi-client/dialogs.rb:366
+#: src/include/iscsi-client/dialogs.rb:370
 msgid "Discovered Targets"
 msgstr "Discovered Targets"
 
 #. main tabbed dialog
-#: src/include/iscsi-client/dialogs.rb:385
+#: src/include/iscsi-client/dialogs.rb:389
 msgid "iSCSI Initiator Overview"
 msgstr "iSCSI Initiator Overview"
 
 #. discovery new target
 #. dialog for all targets from portal (connected/disconnected)
 #. authentification dialog for add/discovery target
-#: src/include/iscsi-client/dialogs.rb:400
+#: src/include/iscsi-client/dialogs.rb:404
 #: src/include/iscsi-client/helps.rb:107 src/include/iscsi-client/helps.rb:119
 #: src/include/iscsi-client/helps.rb:126
 msgid "<h1>iSCSI Initiator</h1>"
@@ -219,9 +225,9 @@
 #. authentication dialog for add new target
 #. list of connected targets
 #. authentication for connect to portal
-#: src/include/iscsi-client/dialogs.rb:435
-#: src/include/iscsi-client/dialogs.rb:474
-#: src/include/iscsi-client/dialogs.rb:500
+#: src/include/iscsi-client/dialogs.rb:439
+#: src/include/iscsi-client/dialogs.rb:478
+#: src/include/iscsi-client/dialogs.rb:504
 msgid "iSCSI Initiator Discovery"
 msgstr "iSCSI Initiator Discovery"
 
@@ -478,12 +484,12 @@
 "iqn.2007-04.cz.server:storage.disk.sdb\n"
 
 #. brackets needed around IPv6
-#: src/include/iscsi-client/widgets.rb:626
+#: src/include/iscsi-client/widgets.rb:625
 msgid "Insert the IP address."
 msgstr "Insert the IP address."
 
 #. validate port number
-#: src/include/iscsi-client/widgets.rb:632
+#: src/include/iscsi-client/widgets.rb:631
 msgid "Insert the port."
 msgstr "Insert the port."
 
@@ -491,37 +497,37 @@
 #. ******************* target table *************************
 #. initialize dialog for all targets from portal (connected/disconnected)
 #. enable/disable connect button according target is or not already connected
-#: src/include/iscsi-client/widgets.rb:734
-#: src/include/iscsi-client/widgets.rb:839
-#: src/include/iscsi-client/widgets.rb:867
+#: src/include/iscsi-client/widgets.rb:733
+#: src/include/iscsi-client/widgets.rb:838
+#: src/include/iscsi-client/widgets.rb:866
 msgid "True"
 msgstr "True"
 
-#: src/include/iscsi-client/widgets.rb:734
-#: src/include/iscsi-client/widgets.rb:839
+#: src/include/iscsi-client/widgets.rb:733
+#: src/include/iscsi-client/widgets.rb:838
 msgid "False"
 msgstr "False"
 
 #. check if not already connected
 #. check if not already connected
-#: src/include/iscsi-client/widgets.rb:772
-#: src/include/iscsi-client/widgets.rb:892
+#: src/include/iscsi-client/widgets.rb:771
+#: src/include/iscsi-client/widgets.rb:891
 #, fuzzy
 msgid "The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption."
 msgstr "The target with this TargetName is already connected. Make sure that Multipathing is enabled to prevent data corruption."
 
-#: src/include/iscsi-client/widgets.rb:775
-#: src/include/iscsi-client/widgets.rb:895
+#: src/include/iscsi-client/widgets.rb:774
+#: src/include/iscsi-client/widgets.rb:894
 msgid "Continue"
 msgstr "Continue"
 
-#: src/include/iscsi-client/widgets.rb:776
-#: src/include/iscsi-client/widgets.rb:896
+#: src/include/iscsi-client/widgets.rb:775
+#: src/include/iscsi-client/widgets.rb:895
 msgid "Cancel"
 msgstr "Cancel"
 
 #. check if is not already connected
-#: src/include/iscsi-client/widgets.rb:886
+#: src/include/iscsi-client/widgets.rb:885
 msgid "The target is already connected."
 msgstr "The target is already connected."
 
@@ -603,14 +609,18 @@
 msgstr "Cannot read service status."
 
 #. interface type for hardware offloading
-#: src/modules/IscsiClientLib.rb:70
+#: src/modules/IscsiClientLib.rb:72
 #, fuzzy
 #| msgid "Software"
-msgid "(Software)"
+msgid "default (Software)"
 msgstr "Software"
 
+#: src/modules/IscsiClientLib.rb:73
+msgid "all"
+msgstr "all"
+
 #. }
-#: src/modules/IscsiClientLib.rb:672
+#: src/modules/IscsiClientLib.rb:694
 #, fuzzy
 msgid ""
 "InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt>\n"
@@ -623,7 +633,7 @@
 "If you want to use different initiatorname change it in BIOS."
 
 #. do discovery first
-#: src/modules/IscsiClientLib.rb:1112
+#: src/modules/IscsiClientLib.rb:1147
 msgid "Configuration summary..."
 msgstr "Configuration summary..."
 

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-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/iscsi-lio-server.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\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"

Modified: trunk/yast/en_GB/po/iscsi-server.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/iscsi-server.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/iscsi-server.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:39+0200\n"
+"POT-Creation-Date: 2014-03-27 15:58+0100\n"
 "PO-Revision-Date: 2007-08-16 19:41+0100\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"

Modified: trunk/yast/en_GB/po/isns.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/isns.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/isns.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\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"
@@ -319,84 +319,84 @@
 msgstr "Initialising..."
 
 #. test if required package ("open-isns") is installed
-#: src/modules/IsnsServer.rb:106
+#: src/modules/IsnsServer.rb:172
 #, 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:109
+#: src/modules/IsnsServer.rb:175
 msgid "<p>Install it now?</p>"
 msgstr "<p>Install it now?</p>"
 
 #. IsnsServer read dialog caption
-#: src/modules/IsnsServer.rb:486
+#: src/modules/IsnsServer.rb:569
 #, fuzzy
 msgid "Initializing isns daemon configuration"
 msgstr "Initialising modem configuration"
 
 #. Progress stage 1/3
-#: src/modules/IsnsServer.rb:502
+#: src/modules/IsnsServer.rb:585
 msgid "Read the database"
 msgstr "Read the database"
 
 #. Progress stage 2/3
-#: src/modules/IsnsServer.rb:504
+#: src/modules/IsnsServer.rb:587
 msgid "Read the previous settings"
 msgstr "Read the previous settings"
 
 #. Progress stage 3/3
-#: src/modules/IsnsServer.rb:506
+#: src/modules/IsnsServer.rb:589
 msgid "Detect the devices"
 msgstr "Detect the devices"
 
 #. Progress step 1/3
-#: src/modules/IsnsServer.rb:510
+#: src/modules/IsnsServer.rb:593
 msgid "Reading the database..."
 msgstr "Reading the database..."
 
 #. Progress step 2/3
-#: src/modules/IsnsServer.rb:512
+#: src/modules/IsnsServer.rb:595
 msgid "Reading the previous settings..."
 msgstr "Reading the previous settings..."
 
 #. Progress step 3/3
-#: src/modules/IsnsServer.rb:514
+#: src/modules/IsnsServer.rb:597
 msgid "Detecting the devices..."
 msgstr "Detecting the devices..."
 
 #. Progress finished
 #. Progress finished
-#: src/modules/IsnsServer.rb:516 src/modules/IsnsServer.rb:594
+#: src/modules/IsnsServer.rb:599 src/modules/IsnsServer.rb:677
 msgid "Finished"
 msgstr "Finished"
 
 #. IsnsServer write dialog caption
-#: src/modules/IsnsServer.rb:568
+#: src/modules/IsnsServer.rb:651
 #, fuzzy
 msgid "Saving isns Configuration"
 msgstr "Saving inetd Configuration"
 
 #. Progress stage 1/2
-#: src/modules/IsnsServer.rb:584
+#: src/modules/IsnsServer.rb:667
 msgid "Write the settings"
 msgstr "Write the settings"
 
 #. Progress stage 2/2
-#: src/modules/IsnsServer.rb:586
+#: src/modules/IsnsServer.rb:669
 msgid "Run SuSEconfig"
 msgstr "Run SuSEconfig"
 
 #. Progress step 1/2
-#: src/modules/IsnsServer.rb:590
+#: src/modules/IsnsServer.rb:673
 msgid "Writing the settings..."
 msgstr "Writing the settings..."
 
 #. Progress step 2/2
-#: src/modules/IsnsServer.rb:592
+#: src/modules/IsnsServer.rb:675
 msgid "Running SuSEconfig..."
 msgstr "Running SuSEconfig..."
 
 #. write configuration (/etc/isns.conf)
-#: src/modules/IsnsServer.rb:606
+#: src/modules/IsnsServer.rb:689
 msgid "Cannot write settings."
 msgstr "Cannot write settings."

Modified: trunk/yast/en_GB/po/kdump.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/kdump.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/kdump.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2007-08-16 19:49+0100\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"
@@ -389,8 +389,8 @@
 #. TRANSLATORS: CommandLine printed text
 #. Popup::Message(crash_value);
 #. delete crashkernel paramter from bootloader
-#: src/clients/kdump.rb:751 src/clients/kdump.rb:756 src/modules/Kdump.rb:558
-#: src/modules/Kdump.rb:577
+#: src/clients/kdump.rb:751 src/clients/kdump.rb:756 src/modules/Kdump.rb:559
+#: src/modules/Kdump.rb:578
 #, fuzzy
 msgid "To apply changes a reboot is necessary."
 msgstr "To apply this change reboot is needed."
@@ -528,16 +528,6 @@
 msgid "&Kdump"
 msgstr "&Disable Kdump"
 
-#. checking if packages are available
-#: src/include/kdump/complex.rb:101 src/include/kdump/complex.rb:103
-msgid "Package for kexec-tools is not available."
-msgstr "Package for kexec-tools is not available."
-
-#: src/include/kdump/complex.rb:113 src/include/kdump/complex.rb:115
-#, fuzzy
-msgid "Package for kdump is not available."
-msgstr "Package for ftp is not available."
-
 #. TRANSLATORS: RadioButtonGroup Label
 #: src/include/kdump/dialogs.rb:53
 msgid "Enable/Disable Kdump"
@@ -1236,139 +1226,146 @@
 #. See FATE#315780
 #. See https://www.suse.com/support/kb/doc.php?id=7012786
 #. FIXME what about dracut?
-#: src/modules/Kdump.rb:483
+#: src/modules/Kdump.rb:484
 msgid ""
 "Error updating initrd while calling '%{cmd}'.\n"
 "See %{log} for details."
 msgstr ""
 
 #. Kdump read dialog caption
-#: src/modules/Kdump.rb:593
+#: src/modules/Kdump.rb:594
 msgid "Initializing kdump Configuration"
 msgstr "Initialising kdump Configuration"
 
 #. Progress stage 1/4
 #. Progress step 1/4
-#: src/modules/Kdump.rb:602 src/modules/Kdump.rb:610
+#: src/modules/Kdump.rb:603 src/modules/Kdump.rb:611
 msgid "Reading the config file..."
 msgstr "Reading the config file..."
 
 #. Progress stage 3/4
-#: src/modules/Kdump.rb:604
+#: src/modules/Kdump.rb:605
 #, fuzzy
 msgid "Reading kernel boot options..."
 msgstr "Read kernel boot options"
 
 #. Progress stage 4/4
 #. Progress finished 3/4
-#: src/modules/Kdump.rb:606 src/modules/Kdump.rb:614
+#: src/modules/Kdump.rb:607 src/modules/Kdump.rb:615
 msgid "Reading available memory..."
 msgstr "Reading available memory..."
 
 #. Progress step 2/4
-#: src/modules/Kdump.rb:612
+#: src/modules/Kdump.rb:613
 msgid "Reading partitions of disks..."
 msgstr "Reading partitions of disks..."
 
 #. Error message
-#: src/modules/Kdump.rb:626
+#: src/modules/Kdump.rb:627
 msgid "Cannot read config file /etc/sysconfig/kdump"
 msgstr "Cannot read config file /etc/sysconfig/kdump"
 
 #. Error message
-#: src/modules/Kdump.rb:634
+#: src/modules/Kdump.rb:635
 #, fuzzy
 msgid "Cannot read kernel boot options."
 msgstr "Cannot read kernel boot options"
 
 #. Error message
-#: src/modules/Kdump.rb:641
+#: src/modules/Kdump.rb:642
 #, fuzzy
 msgid "Cannot read available memory."
 msgstr "Cannot read available memory"
 
 #. Kdump read dialog caption
-#: src/modules/Kdump.rb:667
+#: src/modules/Kdump.rb:668
 msgid "Saving kdump Configuration"
 msgstr "Saving kdump Configuration"
 
 #. Progress stage 1/2
-#: src/modules/Kdump.rb:696
+#: src/modules/Kdump.rb:697
 msgid "Write the settings"
 msgstr "Write the settings"
 
 #. Progress stage 2/2
-#: src/modules/Kdump.rb:698
+#: src/modules/Kdump.rb:699
 msgid "Update boot options"
 msgstr "Update boot options"
 
 #. Progress step 1/2
-#: src/modules/Kdump.rb:702
+#: src/modules/Kdump.rb:703
 msgid "Writing the settings..."
 msgstr "Writing the settings..."
 
 #. Progress step 2/2
-#: src/modules/Kdump.rb:704
+#: src/modules/Kdump.rb:705
 msgid "Updating boot options..."
 msgstr "Updating boot options..."
 
 #. Progress finished
-#: src/modules/Kdump.rb:706
+#: src/modules/Kdump.rb:707
 msgid "Finished"
 msgstr "Finished"
 
 #. Error message
-#: src/modules/Kdump.rb:716
+#: src/modules/Kdump.rb:717
 msgid "Cannot write settings."
 msgstr "Cannot write settings."
 
 #. Error message
-#: src/modules/Kdump.rb:725
+#: src/modules/Kdump.rb:726
 msgid "Adding crashkernel parameter to bootloader fault."
 msgstr "Adding crashkernel parameter to bootloader fault."
 
 #. Create a textual summary and a list of unconfigured cards
 #. @return summary of the current configuration
-#: src/modules/Kdump.rb:844
+#: src/modules/Kdump.rb:833
 #, fuzzy
 msgid "Kdump status: %1"
 msgstr "Kdump runlevel: %1"
 
-#: src/modules/Kdump.rb:845
+#: src/modules/Kdump.rb:834
 msgid "enabled"
 msgstr "enabled"
 
-#: src/modules/Kdump.rb:845
+#: src/modules/Kdump.rb:834
 msgid "disabled"
 msgstr "disabled"
 
-#: src/modules/Kdump.rb:852
+#: src/modules/Kdump.rb:841
 #, fuzzy
 msgid "Value of crashkernel option: %1"
 msgstr "Empty value for option: %1"
 
-#: src/modules/Kdump.rb:859
+#: src/modules/Kdump.rb:848
 #, fuzzy
 msgid "Dump format: %1"
 msgstr "Dump Format: %1"
 
-#: src/modules/Kdump.rb:866
+#: src/modules/Kdump.rb:855
 #, fuzzy
 msgid "Target of dumps: %1"
 msgstr "Numbers of old dumps: %1"
 
-#: src/modules/Kdump.rb:873
+#: src/modules/Kdump.rb:862
 #, fuzzy
 msgid "Number of dumps: %1"
 msgstr "Numbers of old dumps: %1"
 
 #. Trying to use fadump on unsupported hardware
-#: src/modules/Kdump.rb:961
+#: src/modules/Kdump.rb:950
 msgid ""
 "Cannot use Firmware-assisted dump.\n"
 "It is not supported on this hardware."
 msgstr ""
 
+#~ msgid "Package for kexec-tools is not available."
+#~ msgstr "Package for kexec-tools is not available."
+
+#, fuzzy
+#~ msgid "Package for kdump is not available."
+#~ msgstr "Package for ftp is not available."
+
 #~ msgid "ENABLED"
 #~ msgstr "ENABLED"
 

Modified: trunk/yast/en_GB/po/kerberos-server.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/kerberos-server.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/kerberos-server.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:39+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2007-08-16 19:52+0100\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"

Modified: trunk/yast/en_GB/po/kerberos.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/kerberos.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/kerberos.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: yast2 9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:56+0100\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2007-08-16 19:49+0100\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"

Modified: trunk/yast/en_GB/po/languages_db.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/languages_db.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/languages_db.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:32+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\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"

Modified: trunk/yast/en_GB/po/ldap-client.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/ldap-client.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/ldap-client.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: yast2 9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:56+0100\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2007-08-16 19:55+0100\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"

Modified: trunk/yast/en_GB/po/ldap-server.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/ldap-server.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/ldap-server.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2007-08-16 19:56+0100\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"

Modified: trunk/yast/en_GB/po/ldap.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/ldap.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/ldap.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2014-05-19 09:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -258,7 +258,7 @@
 msgstr "Bro&wse"
 
 #. error popup
-#: src/LdapPopup.rb:437
+#: src/LdapPopup.rb:439
 msgid ""
 "The value '%1' already exists.\n"
 "Please select another one."
@@ -267,27 +267,27 @@
 "Please select another one."
 
 #. description of configuration object
-#: src/LdapPopup.rb:465
+#: src/LdapPopup.rb:467
 msgid "Configuration of user management tools"
 msgstr "Configuration of user management tools"
 
 #. description of configuration object
-#: src/LdapPopup.rb:469
+#: src/LdapPopup.rb:471
 msgid "Configuration of group management tools"
 msgstr "Configuration of group management tools"
 
 #. label
-#: src/LdapPopup.rb:474
+#: src/LdapPopup.rb:476
 msgid "Object Class of New Module"
 msgstr "Object Class of New Module"
 
 #. textentry label, do not translate "cn"
-#: src/LdapPopup.rb:502
+#: src/LdapPopup.rb:504
 msgid "&Name of New Module (\"cn\" Value)"
 msgstr "&Name of New Module (\"cn\" Value)"
 
 #. error popup
-#: src/LdapPopup.rb:528
+#: src/LdapPopup.rb:530
 msgid ""
 "The entered value already exists.\n"
 "Select another one.\n"
@@ -296,12 +296,12 @@
 "Select another one.\n"
 
 #. error popup
-#: src/LdapPopup.rb:534
+#: src/LdapPopup.rb:536
 msgid "Enter the module name."
 msgstr "Enter the module name."
 
 #. help text 1/3
-#: src/LdapPopup.rb:553
+#: src/LdapPopup.rb:555
 msgid ""
 "<p>Here, set the values of attributes belonging\n"
 "to an object using the current template. Such values are used as defaults when\n"
@@ -317,7 +317,7 @@
 #. entry of the current template.</p>
 #. ") +
 #. help text 3/3 do not translate "homedirectory"
-#: src/LdapPopup.rb:565
+#: src/LdapPopup.rb:567
 msgid ""
 "<p>You can use special syntax to create attribute\n"
 "values from existing ones. The expression <i>%attr_name</i> will be replaced\n"
@@ -330,12 +330,12 @@
 "as a value of \"homeDirectory\").</p>\n"
 
 #. combobox label
-#: src/LdapPopup.rb:588
+#: src/LdapPopup.rb:590
 msgid "Attribute &Name"
 msgstr "Attribute &Name"
 
 #. textentry label
-#: src/LdapPopup.rb:594
+#: src/LdapPopup.rb:596
 msgid "Attribute &Value"
 msgstr "Attribute &Value"
 

Modified: trunk/yast/en_GB/po/live-installer.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/live-installer.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/live-installer.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:39+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2007-08-16 19:57+0100\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"

Modified: trunk/yast/en_GB/po/lxc.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/lxc.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/lxc.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:39+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\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"

Modified: trunk/yast/en_GB/po/mail.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/mail.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/mail.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:56+0100\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2008-05-21 15:49+0200\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"

Modified: trunk/yast/en_GB/po/multipath.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/multipath.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/multipath.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:40+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\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"

Modified: trunk/yast/en_GB/po/ncurses-pkg.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/ncurses-pkg.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/ncurses-pkg.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: yast2 9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2007-08-16 20:14+0100\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"

Modified: trunk/yast/en_GB/po/ncurses.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/ncurses.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/ncurses.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\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"

Modified: trunk/yast/en_GB/po/network.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/network.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/network.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-08-18 11:54+0000\n"
 "PO-Revision-Date: 2009-10-08 07:09+0200\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"
@@ -105,107 +105,61 @@
 msgstr "Internal error"
 
 #. progress step title
-#: src/clients/firewall_stage1_finish.rb:67
+#: src/clients/firewall_stage1_finish.rb:63
 #, fuzzy
 msgid "Writing Firewall Configuration..."
 msgstr "Writing Firewall Configuration"
 
-#. Summary is visible only if installing over VNC
-#. and if firewall is enabled - otherwise port could not be blocked
-#: src/clients/firewall_stage1_proposal.rb:102
-#, fuzzy
-#| msgid "SSH port is blocked (<a href=\"firewall--enable_ssh_in_proposal\">open</a>)"
-msgid "VNC ports will be open (<a href=\"%s\">close</a>)"
-msgstr "SSH port is blocked (<a href=\"firewall--enable_ssh_in_proposal\">open</a>)"
-
-#: src/clients/firewall_stage1_proposal.rb:104
-#, fuzzy
-#| msgid "SSH port is blocked (<a href=\"firewall--enable_ssh_in_proposal\">open</a>)"
-msgid "VNC ports will be blocked (<a href=\"%s\">open</a>)"
-msgstr "SSH port is blocked (<a href=\"firewall--enable_ssh_in_proposal\">open</a>)"
-
-#: src/clients/firewall_stage1_proposal.rb:110
-#, fuzzy
-msgid "Firewall will be enabled (<a href=\"%s\">disable</a>)"
-msgstr "Firewall is enabled (<a href=\"firewall--disable_firewall_in_proposal\">disable</a>)"
-
-#: src/clients/firewall_stage1_proposal.rb:114
-#, fuzzy
-msgid "Firewall will be disabled (<a href=\"%s\">enable</a>)"
-msgstr "Firewall is disabled (<a href=\"firewall--enable_firewall_in_proposal\">enable</a>)"
-
-#: src/clients/firewall_stage1_proposal.rb:119
-#, fuzzy
-#| msgid "SSH port is blocked (<a href=\"firewall--enable_ssh_in_proposal\">open</a>)"
-msgid "SSH port will be open (<a href=\"%s\">block</a>)"
-msgstr "SSH port is blocked (<a href=\"firewall--enable_ssh_in_proposal\">open</a>)"
-
-#: src/clients/firewall_stage1_proposal.rb:123
-#, fuzzy
-#| msgid "SSH port is blocked (<a href=\"firewall--enable_ssh_in_proposal\">open</a>)"
-msgid "SSH port will be blocked (<a href=\"%s\">open</a>)"
-msgstr "SSH port is blocked (<a href=\"firewall--enable_ssh_in_proposal\">open</a>)"
-
-#: src/clients/firewall_stage1_proposal.rb:128
-#, fuzzy
-msgid "SSH service will be enabled (<a href=\"%s\">disable</a>)"
-msgstr "Firewall is enabled (<a href=\"firewall--disable_firewall_in_proposal\">disable</a>)"
-
-#: src/clients/firewall_stage1_proposal.rb:132
-#, fuzzy
-msgid "SSH service will be disabled (<a href=\"%s\">enable</a>)"
-msgstr "Firewall is disabled (<a href=\"firewall--enable_firewall_in_proposal\">enable</a>)"
-
 #. Proposal title
-#: src/clients/firewall_stage1_proposal.rb:218
+#: src/clients/firewall_stage1_proposal.rb:133
 #, fuzzy
 msgid "Firewall and SSH"
 msgstr "Firewall Zone"
 
 #. Menu entry label
-#: src/clients/firewall_stage1_proposal.rb:220
+#: src/clients/firewall_stage1_proposal.rb:135
 #, fuzzy
 msgid "&Firewall and SSH"
 msgstr "&Firewall"
 
-#: src/clients/firewall_stage1_proposal.rb:231
+#: src/clients/firewall_stage1_proposal.rb:146
 #, fuzzy
 msgid "Basic Firewall and SSH Configuration"
 msgstr "Firewall Configuration"
 
 #. TRANSLATORS: check-box label
-#: src/clients/firewall_stage1_proposal.rb:237
+#: src/clients/firewall_stage1_proposal.rb:152
 #, fuzzy
 #| msgid "&RPC Ports"
 msgid "Open &VNC Ports"
 msgstr "&RPC Ports"
 
 #. frame label
-#: src/clients/firewall_stage1_proposal.rb:245
+#: src/clients/firewall_stage1_proposal.rb:160
 #, fuzzy
 msgid "Firewall and SSH service"
 msgstr "Firewall Service"
 
 #. TRANSLATORS: check-box label
-#: src/clients/firewall_stage1_proposal.rb:256
+#: src/clients/firewall_stage1_proposal.rb:171
 #, fuzzy
 msgid "Enable Firewall"
 msgstr "&Enable Firewall"
 
 #. TRANSLATORS: check-box label
-#: src/clients/firewall_stage1_proposal.rb:264
+#: src/clients/firewall_stage1_proposal.rb:179
 #, fuzzy
 #| msgid "&RPC Ports"
 msgid "Open SSH Port"
 msgstr "&RPC Ports"
 
 #. TRANSLATORS: check-box label
-#: src/clients/firewall_stage1_proposal.rb:272
+#: src/clients/firewall_stage1_proposal.rb:187
 #, fuzzy
 msgid "Enable SSH Service"
 msgstr "Firewall Service"
 
-#: src/clients/firewall_stage1_proposal.rb:284
+#: src/clients/firewall_stage1_proposal.rb:199
 #, fuzzy
 msgid ""
 "<p><b><big>Firewall and SSH</big></b><br>\n"
@@ -216,13 +170,13 @@
 "<p><b><big>Firewall</big></b><br />\n"
 "Firewall is a defensive mechanism that protects your computer from network attacks.</p>"
 
-#: src/clients/firewall_stage1_proposal.rb:290
+#: src/clients/firewall_stage1_proposal.rb:205
 msgid ""
 "<p>Here you can choose whether the firewall will be enabled or disabled after\n"
 "the installation. It is recommended to keep it enabled.</p>"
 msgstr ""
 
-#: src/clients/firewall_stage1_proposal.rb:293
+#: src/clients/firewall_stage1_proposal.rb:208
 msgid ""
 "<p>With enabled firewall, you can decide whether to open firewall port for SSH\n"
 "service and allow remote SSH logins. Independently you can also enable SSH service (i.e. it\n"
@@ -230,13 +184,60 @@
 msgstr ""
 
 #. TRANSLATORS: help text
-#: src/clients/firewall_stage1_proposal.rb:300
+#: src/clients/firewall_stage1_proposal.rb:215
 msgid ""
 "<p>You can also open VNC ports in firewall. It will not enable\n"
 "the remote administration service on a running system but it is\n"
 "started by the installer automatically if needed.</p>"
 msgstr ""
 
+#. anything but enabling the firewall closes this dialog
+#. (VNC and SSH checkboxes do nothing)
+#: src/clients/firewall_stage1_proposal.rb:292
+#, fuzzy
+msgid "Firewall will be enabled (<a href=\"%s\">disable</a>)"
+msgstr "Firewall is enabled (<a href=\"firewall--disable_firewall_in_proposal\">disable</a>)"
+
+#: src/clients/firewall_stage1_proposal.rb:296
+#, fuzzy
+msgid "Firewall will be disabled (<a href=\"%s\">enable</a>)"
+msgstr "Firewall is disabled (<a href=\"firewall--enable_firewall_in_proposal\">enable</a>)"
+
+#: src/clients/firewall_stage1_proposal.rb:301
+#, fuzzy
+msgid "SSH service will be enabled (<a href=\"%s\">disable</a>)"
+msgstr "Firewall is enabled (<a href=\"firewall--disable_firewall_in_proposal\">disable</a>)"
+
+#: src/clients/firewall_stage1_proposal.rb:305
+#, fuzzy
+msgid "SSH service will be disabled (<a href=\"%s\">enable</a>)"
+msgstr "Firewall is disabled (<a href=\"firewall--enable_firewall_in_proposal\">enable</a>)"
+
+#. Display vnc port only if installing over VNC
+#: src/clients/firewall_stage1_proposal.rb:317
+#, fuzzy
+#| msgid "SSH port is blocked (<a href=\"firewall--enable_ssh_in_proposal\">open</a>)"
+msgid "VNC ports will be open (<a href=\"%s\">close</a>)"
+msgstr "SSH port is blocked (<a href=\"firewall--enable_ssh_in_proposal\">open</a>)"
+
+#: src/clients/firewall_stage1_proposal.rb:319
+#, fuzzy
+#| msgid "SSH port is blocked (<a href=\"firewall--enable_ssh_in_proposal\">open</a>)"
+msgid "VNC ports will be blocked (<a href=\"%s\">open</a>)"
+msgstr "SSH port is blocked (<a href=\"firewall--enable_ssh_in_proposal\">open</a>)"
+
+#: src/clients/firewall_stage1_proposal.rb:324
+#, fuzzy
+#| msgid "SSH port is blocked (<a href=\"firewall--enable_ssh_in_proposal\">open</a>)"
+msgid "SSH port will be open (<a href=\"%s\">block</a>)"
+msgstr "SSH port is blocked (<a href=\"firewall--enable_ssh_in_proposal\">open</a>)"
+
+#: src/clients/firewall_stage1_proposal.rb:328
+#, fuzzy
+#| msgid "SSH port is blocked (<a href=\"firewall--enable_ssh_in_proposal\">open</a>)"
+msgid "SSH port will be blocked (<a href=\"%s\">open</a>)"
+msgstr "SSH port is blocked (<a href=\"firewall--enable_ssh_in_proposal\">open</a>)"
+
 #. Commandline help title
 #. configuration of hosts
 #. Hosts dialog caption
@@ -531,9 +532,18 @@
 msgid "Interfaces for Bridging"
 msgstr "Interface or String"
 
-#. Lan::PrepareForAutoinst();
-#. Lan::Autoinstall();
-#: src/clients/lan_auto.rb:173
+#. copy the keys/values that are not existing in the XML
+#. so we merge the inst-sys settings with the XML while XML
+#. has higher priority
+#.
+#. bnc#796580 The problem with this is that due to compatibility with
+#. older profiles, a missing element may have a different meaning than
+#. "use what the filesystem/kernel currently uses".
+#. In particular, a missing write_hostname [1] means
+#. "use the product default from DVD1/control.xml".
+#. Other elements may have similar problems,
+#. to be fixed post-PTF for maintenance.
+#: src/clients/lan_auto.rb:171
 #, fuzzy
 msgid "Configuration Error: uninitialized interface."
 msgstr "Configuration Error : uninitialised interface!"
@@ -630,7 +640,7 @@
 #. Commandline help title
 #. Main routing dialog
 #. @return dialog result
-#: src/clients/routing.rb:57 src/include/network/services/routing.rb:476
+#: src/clients/routing.rb:57 src/include/network/services/routing.rb:479
 msgid "Routing Configuration"
 msgstr "Routing Configuration"
 
@@ -741,7 +751,7 @@
 msgid "Device"
 msgstr "Device"
 
-#: src/clients/routing.rb:212 src/include/network/lan/hardware.rb:414
+#: src/clients/routing.rb:212 src/include/network/lan/hardware.rb:416
 msgid "Options"
 msgstr "Options"
 
@@ -821,13 +831,13 @@
 
 #. interface summary: WiFi without encryption
 #. interface summary: WiFi without encryption
-#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1300
+#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1361
 msgid "Warning: no encryption is used."
 msgstr "Warning: no encryption is used."
 
 #. Hyperlink: Change the configuration of an interface
 #. Hyperlink: Change the configuration of an interface
-#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1302
+#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1363
 msgid "Change."
 msgstr "Change."
 
@@ -1202,14 +1212,14 @@
 #. ComboBox label
 #. ComboBox label
 #: src/include/network/lan/address.rb:155
-#: src/include/network/lan/hardware.rb:365
+#: src/include/network/lan/hardware.rb:367
 msgid "&Device Type"
 msgstr "&Device Type"
 
 #. ComboBox label
 #. TextEntry label
 #: src/include/network/lan/address.rb:174
-#: src/include/network/lan/hardware.rb:351
+#: src/include/network/lan/hardware.rb:353
 msgid "&Configuration Name"
 msgstr "&Configuration Name"
 
@@ -1223,7 +1233,7 @@
 msgstr "Unknown group"
 
 #: src/include/network/lan/address.rb:193
-#: src/include/network/lan/address.rb:1312
+#: src/include/network/lan/address.rb:1316
 #, fuzzy
 msgid "Bridged Devices"
 msgstr "Modem Devices"
@@ -1431,30 +1441,30 @@
 
 #. FIXME: here it does not complain about missing
 #. shortcuts
-#: src/include/network/lan/address.rb:1289
+#: src/include/network/lan/address.rb:1293
 msgid "&Address"
 msgstr "&Address"
 
 #. Address tab help
-#: src/include/network/lan/address.rb:1292
+#: src/include/network/lan/address.rb:1296
 msgid "<p>Configure your IP address.</p>"
 msgstr "<p>Configure your IP address.</p>"
 
-#: src/include/network/lan/address.rb:1298
+#: src/include/network/lan/address.rb:1302
 msgid "&Hardware"
 msgstr "&Hardware"
 
-#: src/include/network/lan/address.rb:1305
+#: src/include/network/lan/address.rb:1309
 #, fuzzy
 msgid "&Bond Slaves"
 msgstr "Bond &Slaves"
 
-#: src/include/network/lan/address.rb:1319
+#: src/include/network/lan/address.rb:1323
 msgid "&Wireless"
 msgstr "&Wireless"
 
 #. Combo box label - when to activate device (e.g. on boot, manually, never,..)
-#: src/include/network/lan/address.rb:1404
+#: src/include/network/lan/address.rb:1408
 #, fuzzy
 #| msgid "Swap &Priority"
 msgid "Ifplugd Priority"
@@ -1462,7 +1472,7 @@
 
 #. Device activation main help. The individual parts will be
 #. substituted as %1
-#: src/include/network/lan/address.rb:1410
+#: src/include/network/lan/address.rb:1414
 msgid ""
 "<p><b><big>IFPLUGD PRIORITY</big></b></p> \n"
 "<p> All interfaces configured with <b>On Cable Connection</b> and with IFPLUGD_PRIORITY != 0 will be\n"
@@ -1477,12 +1487,12 @@
 msgstr "Network Card Setup"
 
 # bnc#384167
-#. allow to add bonding device into bridge and also device with mask /32(bnc#405343)
-#: src/include/network/lan/bridge.rb:131
+#. remove all aliases (bnc#590167)
+#: src/include/network/lan/bridge.rb:103
 #, fuzzy
 msgid ""
 "At least one selected device is already configured.\n"
-"Adapt the configuration for bridge (IP address 0.0.0.0/32)?\n"
+"Adapt the configuration for bridge?\n"
 msgstr ""
 "At least one selected device is already configured.\n"
 "Remove the configuration?\n"
@@ -1698,7 +1708,7 @@
 msgid "The device was deleted."
 msgstr "The device was deleted."
 
-#. encoding: utf-8
+#. , :gw6dev encoding: utf-8
 #. ***************************************************************************
 #.
 #. Copyright (c) 2012 Novell, Inc.
@@ -1794,7 +1804,7 @@
 msgstr "An error occurred during installation."
 
 #. Continue-Cancel popup
-#: src/include/network/lan/complex.rb:404
+#: src/include/network/lan/complex.rb:403
 msgid ""
 "The interface is currently set to be managed\n"
 "by the NetworkManager applet.\n"
@@ -1809,13 +1819,12 @@
 "the interface will no longer be managed by NetworkManager.\n"
 
 #. warn user when device to delete has STARTMODE=nfsroot (bnc#433867)
-#: src/include/network/lan/complex.rb:458
+#: src/include/network/lan/complex.rb:457
 msgid "Device you select has STARTMODE=nfsroot. Really delete?"
 msgstr ""
 
 #. Network setup method dialog caption
-#. radio button group label, method of setup
-#: src/include/network/lan/complex.rb:494 src/include/network/widgets.rb:352
+#: src/include/network/lan/complex.rb:493 src/include/network/widgets.rb:376
 msgid "Network Setup Method"
 msgstr "Network Setup Method"
 
@@ -1824,7 +1833,7 @@
 #. it is basically useful if user aborts dialog and he has done some
 #. changes already. Calling this function may results in confirmation
 #. popup.
-#: src/include/network/lan/complex.rb:524
+#: src/include/network/lan/complex.rb:523
 msgid "Network Settings"
 msgstr "Network Settings"
 
@@ -1852,7 +1861,7 @@
 msgstr "&Change Hostname via DHCP"
 
 #. Manual network card setup help 1/4
-#: src/include/network/lan/hardware.rb:82
+#: src/include/network/lan/hardware.rb:81
 #, fuzzy
 msgid ""
 "<p>Set up hardware-specific options for \n"
@@ -1861,20 +1870,20 @@
 
 #. Manual network card setup help 2/4
 #. translators: do not translated udev, MAC, BusID
-#: src/include/network/lan/hardware.rb:91
+#: src/include/network/lan/hardware.rb:90
 msgid ""
 "<p><b>Device Type</b>. Various device types are available, select \n"
 "one according your needs.</p>"
 msgstr ""
 
-#: src/include/network/lan/hardware.rb:99
+#: src/include/network/lan/hardware.rb:98
 msgid ""
 "<p><b>Udev Rules</b> are rules for the kernel device manager that allow\n"
 "associating the MAC address or BusID of the network device with its name (for\n"
 "example, eth1, wlan0 ) and assures a persistent device name upon reboot.\n"
 msgstr ""
 
-#: src/include/network/lan/hardware.rb:105
+#: src/include/network/lan/hardware.rb:104
 msgid ""
 "<p><b>Show visible port identification</b> allows you to physically identify now configured NIC. \n"
 "Set appropriate time, click <b>Blink</b> and LED diodes on you NIC will start blinking for selected time.\n"
@@ -1882,7 +1891,7 @@
 msgstr ""
 
 #. Manual network card setup help 2/4
-#: src/include/network/lan/hardware.rb:118
+#: src/include/network/lan/hardware.rb:117
 msgid ""
 "<p><b>Kernel Module</b>. Enter the kernel module (driver) name \n"
 "for your network device here. If the device is already configured, see if there is more than one driver available for\n"
@@ -1890,7 +1899,7 @@
 msgstr ""
 
 #. Manual networ card setup help 3/4
-#: src/include/network/lan/hardware.rb:125
+#: src/include/network/lan/hardware.rb:124
 #, fuzzy
 msgid ""
 "<p>Additionally, specify <b>Options</b> for the kernel module. Use this\n"
@@ -1902,12 +1911,12 @@
 "for example, <i>io=0x300 irq=5</i>. <b>Note:</b> If  two cards are configured\n"
 "with the same module name, options will be merged while saving.</p>"
 
-#: src/include/network/lan/hardware.rb:131
+#: src/include/network/lan/hardware.rb:130
 msgid "<p>If you specify options via <b>Ethtool options</b>, ifup will call ethtool with these options.</p>\n"
 msgstr ""
 
 #. Manual dialog help 4/4
-#: src/include/network/lan/hardware.rb:140
+#: src/include/network/lan/hardware.rb:139
 msgid ""
 "<p>If you have a <b>PCMCIA</b> network card, select PCMCIA.\n"
 "If you have a <b>USB</b> network card, select USB.</p>\n"
@@ -1917,7 +1926,7 @@
 
 #. overwrite help
 #. Manual dialog help 5/4
-#: src/include/network/lan/hardware.rb:149
+#: src/include/network/lan/hardware.rb:148
 msgid ""
 "<p>Here, set up your networking device. The values will be\n"
 "written to <i>/etc/modprobe.conf</i> or <i>/etc/chandev.conf</i>.</p>\n"
@@ -1926,7 +1935,7 @@
 "written to <i>/etc/modprobe.conf</i> or <i>/etc/chandev.conf</i>.</p>\n"
 
 #. Manual dialog help 6/4
-#: src/include/network/lan/hardware.rb:153
+#: src/include/network/lan/hardware.rb:152
 msgid ""
 "<p>Options for the module should be written in the format specified\n"
 "in the <b>IBM Device Drivers and Installation Commands</b> manual.</p>"
@@ -1935,83 +1944,85 @@
 "in the <b>IBM Device Drivers and Installation Commands</b> manual.</p>"
 
 #. Manual dialog caption
-#: src/include/network/lan/hardware.rb:271
+#: src/include/network/lan/hardware.rb:269
 msgid "Manual Network Card Configuration"
 msgstr "Manual Network Card Configuration"
 
 #. CheckBox label
-#: src/include/network/lan/hardware.rb:281
+#: src/include/network/lan/hardware.rb:282
 msgid "&PCMCIA"
 msgstr "&PCMCIA"
 
 #. CheckBox label
-#: src/include/network/lan/hardware.rb:289
+#: src/include/network/lan/hardware.rb:291
 msgid "&USB"
 msgstr "&USB"
 
 #. ComboBox label
-#: src/include/network/lan/hardware.rb:298
+#: src/include/network/lan/hardware.rb:300
 msgid "&Hotplug Type"
 msgstr "&Hotplug Type"
 
 #. CheckBox label
-#: src/include/network/lan/hardware.rb:303
+#: src/include/network/lan/hardware.rb:305
 msgid "P&CI"
 msgstr "P&CI"
 
 #. #116211 - allow user to change modules from list
 #. Frame label
-#: src/include/network/lan/hardware.rb:315
+#: src/include/network/lan/hardware.rb:317
 msgid "&Kernel Module"
 msgstr "&Kernel Module"
 
 #. Text entry label
-#: src/include/network/lan/hardware.rb:325
+#: src/include/network/lan/hardware.rb:327
 msgid "&Module Name"
 msgstr "&Module Name"
 
 #. TODO: Ud ... Rules
-#: src/include/network/lan/hardware.rb:380
-msgid "Udev rules"
+#: src/include/network/lan/hardware.rb:382
+#, fuzzy
+#| msgid "Udev rules"
+msgid "Udev Rules"
 msgstr "Udev rules"
 
-#: src/include/network/lan/hardware.rb:382
+#: src/include/network/lan/hardware.rb:384
 msgid "Device Name"
 msgstr "Device Name"
 
-#: src/include/network/lan/hardware.rb:383
+#: src/include/network/lan/hardware.rb:385
 msgid "Change"
 msgstr "Change"
 
-#: src/include/network/lan/hardware.rb:394
+#: src/include/network/lan/hardware.rb:396
 #, fuzzy
 #| msgid "Server Identification"
-msgid "Show visible port identification"
+msgid "Show Visible Port Identification"
 msgstr "Server Identification"
 
 #. translators: how many seconds will card be blinking
-#: src/include/network/lan/hardware.rb:399
+#: src/include/network/lan/hardware.rb:401
 msgid "Seconds"
 msgstr "Seconds"
 
-#: src/include/network/lan/hardware.rb:404
+#: src/include/network/lan/hardware.rb:406
 #, fuzzy
 #| msgid "Blin"
 msgid "Blink"
 msgstr "Blin"
 
-#: src/include/network/lan/hardware.rb:409
+#: src/include/network/lan/hardware.rb:411
 #, fuzzy
-msgid "Ethtool options"
+msgid "Ethtool Options"
 msgstr "&Additional ipppd options"
 
 #. Manual selection caption
-#: src/include/network/lan/hardware.rb:495
+#: src/include/network/lan/hardware.rb:491
 msgid "Manual Network Card Selection"
 msgstr "Manual Network Card Selection"
 
 #. Manual selection help
-#: src/include/network/lan/hardware.rb:498
+#: src/include/network/lan/hardware.rb:494
 msgid ""
 "<p>Select the network card to configure. Search\n"
 "for a particular network card by entering the name in the search entry.</p>"
@@ -2021,19 +2032,19 @@
 
 #. Selection box label
 #. Selection box title
-#: src/include/network/lan/hardware.rb:508
-#: src/include/network/lan/hardware.rb:564
+#: src/include/network/lan/hardware.rb:504
+#: src/include/network/lan/hardware.rb:559
 msgid "&Network Card"
 msgstr "&Network Card"
 
 #. Text entry field
-#: src/include/network/lan/hardware.rb:512
+#: src/include/network/lan/hardware.rb:508
 msgid "&Search"
 msgstr "&Search"
 
 #. Remember current device number (#308763)
 #. see also bnc#391802
-#: src/include/network/lan/hardware.rb:833
+#: src/include/network/lan/hardware.rb:824
 #, fuzzy
 msgid ""
 "Configuration name %1 already exists.\n"
@@ -2043,7 +2054,7 @@
 "Choose a different one."
 
 #. S/390 dialog caption
-#: src/include/network/lan/hardware.rb:877
+#: src/include/network/lan/hardware.rb:868
 msgid "S/390 Network Card Configuration"
 msgstr "S/390 Network Card Configuration"
 
@@ -2051,134 +2062,134 @@
 #. Frame label
 #. Frame label
 #. Frame label
-#: src/include/network/lan/hardware.rb:897
-#: src/include/network/lan/hardware.rb:999
-#: src/include/network/lan/hardware.rb:1066
-#: src/include/network/lan/hardware.rb:1103
+#: src/include/network/lan/hardware.rb:888
+#: src/include/network/lan/hardware.rb:990
+#: src/include/network/lan/hardware.rb:1057
+#: src/include/network/lan/hardware.rb:1094
 msgid "S/390 Device Settings"
 msgstr "S/390 Device Settings"
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:907
+#: src/include/network/lan/hardware.rb:898
 msgid "&Port Name"
 msgstr "&Port Name"
 
-#: src/include/network/lan/hardware.rb:912
+#: src/include/network/lan/hardware.rb:903
 msgid "Port Number"
 msgstr "Port Number"
 
 #. CheckBox label
-#: src/include/network/lan/hardware.rb:926
+#: src/include/network/lan/hardware.rb:917
 msgid "&Enable IPA Takeover"
 msgstr "&Enable IPA Takeover"
 
 #. CheckBox label
-#: src/include/network/lan/hardware.rb:933
+#: src/include/network/lan/hardware.rb:924
 msgid "Enable &Layer 2 Support"
 msgstr "Enable &Layer 2 Support"
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:940
+#: src/include/network/lan/hardware.rb:931
 msgid "Layer2 &MAC Address"
 msgstr "Layer2 &MAC Address"
 
-#: src/include/network/lan/hardware.rb:948
-#: src/include/network/lan/hardware.rb:1024
-#: src/include/network/lan/hardware.rb:1078
+#: src/include/network/lan/hardware.rb:939
+#: src/include/network/lan/hardware.rb:1015
+#: src/include/network/lan/hardware.rb:1069
 #, fuzzy
 msgid "Read Channel"
 msgstr "R&ead Channel"
 
-#: src/include/network/lan/hardware.rb:954
-#: src/include/network/lan/hardware.rb:1030
-#: src/include/network/lan/hardware.rb:1084
+#: src/include/network/lan/hardware.rb:945
+#: src/include/network/lan/hardware.rb:1021
+#: src/include/network/lan/hardware.rb:1075
 #, fuzzy
 msgid "Write Channel"
 msgstr "&Write Channel"
 
-#: src/include/network/lan/hardware.rb:960
+#: src/include/network/lan/hardware.rb:951
 #, fuzzy
 msgid "Control Channel"
 msgstr "Control file changed."
 
 #. S/390 dialog help: QETH Port name
-#: src/include/network/lan/hardware.rb:971
+#: src/include/network/lan/hardware.rb:962
 msgid "<p>Enter the <b>Port Name</b> for this interface (case-sensitive).</p>"
 msgstr "<p>Enter the <b>Port Name</b> for this interface (case-sensitive).</p>"
 
 #. S/390 dialog help: QETH Options
-#: src/include/network/lan/hardware.rb:975
+#: src/include/network/lan/hardware.rb:966
 msgid "<p>Enter any additional <b>Options</b> for this interface (separated by spaces).</p>"
 msgstr "<p>Enter any additional <b>Options</b> for this interface (separated by spaces).</p>"
 
-#: src/include/network/lan/hardware.rb:978
+#: src/include/network/lan/hardware.rb:969
 msgid "<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be enabled for this interface.</p>"
 msgstr "<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be enabled for this interface.</p>"
 
-#: src/include/network/lan/hardware.rb:981
+#: src/include/network/lan/hardware.rb:972
 msgid "<p>Select <b>Enable Layer 2 Support</b> if this card has been configured with layer 2 support.</p>"
 msgstr "<p>Select <b>Enable Layer 2 Support</b> if this card has been configured with layer 2 support.</p>"
 
-#: src/include/network/lan/hardware.rb:984
+#: src/include/network/lan/hardware.rb:975
 msgid "<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>"
 msgstr "<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>"
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:1008
+#: src/include/network/lan/hardware.rb:999
 msgid "&Port Number"
 msgstr "&Port Number"
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:1016
+#: src/include/network/lan/hardware.rb:1007
 msgid "&LANCMD Time-Out"
 msgstr "&LANCMD Time-Out"
 
 #. S/390 dialog help: LCS
-#: src/include/network/lan/hardware.rb:1041
+#: src/include/network/lan/hardware.rb:1032
 msgid "<p>Choose the <b>Port Number</b> for this interface.</p>"
 msgstr "<p>Choose the <b>Port Number</b> for this interface.</p>"
 
-#: src/include/network/lan/hardware.rb:1042
+#: src/include/network/lan/hardware.rb:1033
 msgid "<p>Specify the <b>LANCMD Time-Out</b> for this interface.</p>"
 msgstr "<p>Specify the <b>LANCMD Time-Out</b> for this interface.</p>"
 
 #. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1047
+#: src/include/network/lan/hardware.rb:1038
 msgid "Compatibility Mode"
 msgstr "Compatibility Mode"
 
 #. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1049
+#: src/include/network/lan/hardware.rb:1040
 msgid "Extended Mode"
 msgstr "Extended Mode"
 
 #. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1051
+#: src/include/network/lan/hardware.rb:1042
 msgid "CTC-Based tty (Linux to Linux Connections)"
 msgstr "CTC-Based tty (Linux to Linux Connections)"
 
 #. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1053
+#: src/include/network/lan/hardware.rb:1044
 msgid "Compatibility Mode with OS/390 and z/OS"
 msgstr "Compatibility Mode with OS/390 and z/OS"
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:1072
+#: src/include/network/lan/hardware.rb:1063
 msgid "&Protocol"
 msgstr "&Protocol"
 
 #. S/390 dialog help: CTC
-#: src/include/network/lan/hardware.rb:1095
+#: src/include/network/lan/hardware.rb:1086
 msgid "<p>Choose the <b>Protocol</b> for this interface.</p>"
 msgstr "<p>Choose the <b>Protocol</b> for this interface.</p>"
 
 #. TextEntry label, #42789
-#: src/include/network/lan/hardware.rb:1112
+#: src/include/network/lan/hardware.rb:1103
 msgid "&Peer Name"
 msgstr "&Peer Name"
 
 #. S/390 dialog help: IUCV, #42789
-#: src/include/network/lan/hardware.rb:1123
+#: src/include/network/lan/hardware.rb:1114
 msgid ""
 "<p>Enter the name of the IUCV peer,\n"
 "for example, the z/VM user name with which to connect (case-sensitive).</p>\n"
@@ -2187,7 +2198,7 @@
 "for example, the z/VM user name with which to connect (case-sensitive).</p>\n"
 
 #. #176330, must be static
-#: src/include/network/lan/hardware.rb:1250
+#: src/include/network/lan/hardware.rb:1238
 #, fuzzy
 msgid ""
 "An error occurred while creating device.\n"
@@ -2196,7 +2207,7 @@
 
 #. Manual network card configuration dialog
 #. @return dialog result
-#: src/include/network/lan/hardware.rb:1272
+#: src/include/network/lan/hardware.rb:1260
 msgid "Hardware Dialog"
 msgstr "Hardware Dialogue"
 
@@ -2252,19 +2263,18 @@
 "to switching among wired and multiple wireless networks.</p>\n"
 
 #. Network setup method help
-#. NetworkManager and ifup are programs
+#. NetworkManager and wicked are programs
 #: src/include/network/lan/help.rb:59
 #, fuzzy
 msgid ""
-"<p>Use the <b>Traditional Method with <tt>ifup</tt></b>\n"
-"if you do not run a desktop environment (GNOME or KDE)\n"
+"<p>Use <b>wicked</b> if you do not run a desktop environment\n"
 "or need to use multiple interfaces at the same time.</p>\n"
 msgstr ""
 "<p>Use the <b>Traditional Method with <tt>ifup</tt></b>\n"
 "if you do not run a desktop environment (GNOME or KDE)\n"
 "or need to use multiple interfaces at once.</p>\n"
 
-#: src/include/network/lan/help.rb:64
+#: src/include/network/lan/help.rb:63
 msgid ""
 "<p><b><big>Network Card Overview</big></b><br>\n"
 "Obtain an overview of installed network cards. Additionally,\n"
@@ -2274,7 +2284,7 @@
 "Obtain an overview of installed network cards. Additionally,\n"
 "edit their configuration.<br></p>\n"
 
-#: src/include/network/lan/help.rb:69
+#: 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"
@@ -2282,7 +2292,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:72
+#: src/include/network/lan/help.rb:71
 #, fuzzy
 msgid ""
 "<p><b><big>Configuring or Deleting:</big></b><br>\n"
@@ -2294,7 +2304,7 @@
 "Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n"
 
 #. IPv6 help
-#: src/include/network/lan/help.rb:79
+#: src/include/network/lan/help.rb:78
 #, fuzzy
 msgid ""
 "<p><b><big>IPv6 Protocol Settings</big></b></p>\n"
@@ -2311,12 +2321,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:87
+#: 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:90
+#: 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"
@@ -2330,7 +2340,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:97
+#: 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"
@@ -2338,13 +2348,13 @@
 msgstr ""
 
 #. Routing dialog help 2/2
-#: src/include/network/lan/help.rb:103
+#: 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:107
+#: 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"
@@ -2352,14 +2362,14 @@
 "autoconfiguration (SLAAC)."
 msgstr ""
 
-#: src/include/network/lan/help.rb:113
+#: 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:118
+#: 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"
@@ -2377,7 +2387,7 @@
 "the hostname at runtime may confuse the graphical desktop.\n"
 "</p> "
 
-#: src/include/network/lan/help.rb:125
+#: 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"
@@ -2386,7 +2396,7 @@
 "if this computer provides some network services.</p>\n"
 msgstr ""
 
-#: src/include/network/lan/help.rb:132
+#: 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"
@@ -2395,7 +2405,7 @@
 "hostnames. Usually they can be obtained by DHCP.</p>\n"
 
 #. resolver dialog help
-#: src/include/network/lan/help.rb:136
+#: 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"
@@ -2406,7 +2416,7 @@
 "(for example, 192.168.0.42), not as a hostname.</p>\n"
 
 #. resolver dialog help
-#: src/include/network/lan/help.rb:142
+#: 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"
@@ -2418,7 +2428,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:148
+#: 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"
@@ -2426,7 +2436,7 @@
 "command.</p>"
 msgstr ""
 
-#: src/include/network/lan/help.rb:154
+#: 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"
@@ -2436,7 +2446,7 @@
 "configurations.</p>\n"
 msgstr ""
 
-#: src/include/network/lan/help.rb:162
+#: 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"
@@ -2450,7 +2460,7 @@
 
 #. Address dialog help 1-6/8: dynamic address preferred
 #. Address dialog help 1/8
-#: src/include/network/lan/help.rb:175
+#: src/include/network/lan/help.rb:174
 #, fuzzy
 msgid ""
 "<p><b><big>Address Setup</big></b></p>\n"
@@ -2461,12 +2471,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:180
+#: 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:184
+#: 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"
@@ -2476,7 +2486,7 @@
 "assigned by the system administrator or your cable or DSL provider.</p>"
 
 #. Address dialog help 3/8
-#: src/include/network/lan/help.rb:188
+#: src/include/network/lan/help.rb:187
 #, fuzzy
 msgid ""
 "<p>Choose one of the dynamic address assignment methods. Select <b>DHCP</b>\n"
@@ -2488,7 +2498,7 @@
 "obtained automatically from the server.<p>"
 
 #. Address dialog help 4/8
-#: src/include/network/lan/help.rb:194
+#: src/include/network/lan/help.rb:193
 #, fuzzy
 msgid ""
 "<p>To search for an IP address and assign it statically, select \n"
@@ -2500,7 +2510,7 @@
 "</b>. Otherwise, network addresses must be assigned <b>statically</b>.</p>"
 
 #. Address dialog help 5/8
-#: src/include/network/lan/help.rb:200
+#: 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"
@@ -2512,7 +2522,7 @@
 "of your peer.</p>"
 
 #. Address dialog help 6/8
-#: src/include/network/lan/help.rb:206
+#: 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"
@@ -2524,7 +2534,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:212
+#: src/include/network/lan/help.rb:211
 msgid ""
 "<p>Contact your <b>network administrator</b> for more information about\n"
 "the network configuration.</p>"
@@ -2532,7 +2542,7 @@
 "<p>Contact your <b>network administrator</b> for more information about\n"
 "the network configuration.</p>"
 
-#: src/include/network/lan/help.rb:215
+#: 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>"
@@ -2540,7 +2550,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:218
+#: 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"
@@ -2558,11 +2568,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:227
+#: 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:230
+#: src/include/network/lan/help.rb:229
 #, fuzzy
 msgid ""
 "<p><b><big>Maximum Transfer Unit</big></b></p>\n"
@@ -2579,7 +2589,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:238
+#: src/include/network/lan/help.rb:237
 #, fuzzy
 msgid ""
 "<p>Select the slave devices for the bond device.\n"
@@ -2587,13 +2597,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:243
+#: 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:245
+#: 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"
@@ -2608,7 +2618,7 @@
 "network interface and thus the same hardware address.</p>"
 
 #. DHCP dialog help 3/7
-#: src/include/network/lan/help.rb:253
+#: src/include/network/lan/help.rb:252
 #, fuzzy
 msgid ""
 "<p>The <b>Hostname to Send</b> specifies a string used for the\n"
@@ -2631,7 +2641,7 @@
 "Leave empty not to send a hostname.</p>"
 
 #. Aliases dialog help 1/4
-#: src/include/network/lan/help.rb:265
+#: src/include/network/lan/help.rb:264
 #, fuzzy
 msgid ""
 "<p><b><big>Additional Addresses</big></b></p>\n"
@@ -2641,7 +2651,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:269
+#: src/include/network/lan/help.rb:268
 #, fuzzy
 #| msgid ""
 #| "<p>Enter an <b>Alias Name</b>, an <b>IP Address</b>, and\n"
@@ -2654,7 +2664,7 @@
 "the <b>Netmask</b>.</p>"
 
 #. Aliases dialog help 3/4
-#: src/include/network/lan/help.rb:273
+#: 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"
@@ -2662,14 +2672,14 @@
 msgstr ""
 
 #. Aliases dialog help 3/4, #83766
-#: src/include/network/lan/help.rb:279
+#: 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:285
+#: src/include/network/lan/help.rb:284
 #, fuzzy
 msgid ""
 "<p>Choose between three <b>Key Input Types</b> for your key.\n"
@@ -2699,7 +2709,7 @@
 "</p> "
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:300
+#: src/include/network/lan/help.rb:299
 msgid ""
 "<p>Here, set the most important settings\n"
 "for wireless networking.</p>"
@@ -2708,7 +2718,7 @@
 "for wireless networking.</p>"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:304
+#: 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"
@@ -2723,7 +2733,7 @@
 "acts as an access point).</p>\n"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:312
+#: 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"
@@ -2742,7 +2752,7 @@
 "signal strength.</p>\n"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:322
+#: src/include/network/lan/help.rb:321
 #, fuzzy
 msgid ""
 "<p>In some networks, you need to set an <b>Authentication Mode</b>.\n"
@@ -2780,7 +2790,7 @@
 "<b>Managed</b>.</p>\n"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:341
+#: 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"
@@ -2795,7 +2805,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:349
+#: 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"
@@ -2812,7 +2822,7 @@
 "easy to guess as the passphrase.</p>\n"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:358
+#: 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"
@@ -2821,7 +2831,7 @@
 "enter some additional parameters in the next dialogue.</p>\n"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:362
+#: 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"
@@ -3426,23 +3436,23 @@
 msgstr "Initialising..."
 
 #. Ramote Administration dialog caption
-#: src/include/network/remote/dialogs.rb:57
+#: src/include/network/remote/dialogs.rb:56
 msgid "Remote Administration"
 msgstr "Remote Administration"
 
 #. RadioButton label
-#: src/include/network/remote/dialogs.rb:65
+#: src/include/network/remote/dialogs.rb:64
 msgid "&Allow Remote Administration"
 msgstr "&Allow Remote Administration"
 
 #. RadioButton label
-#: src/include/network/remote/dialogs.rb:73
+#: src/include/network/remote/dialogs.rb:72
 msgid "&Do Not Allow Remote Administration"
 msgstr "&Do Not Allow Remote Administration"
 
 #. Remote Administration dialog help
 #. %1 and %2 are port numbers for vnc and vnchttp, eg. 5901, 5801
-#: src/include/network/remote/dialogs.rb:90
+#: src/include/network/remote/dialogs.rb:89
 #, fuzzy
 msgid ""
 "<p><b><big>Remote Administration Settings</big></b></p>\n"
@@ -3460,17 +3470,17 @@
 "This form of remote administration is less secure than using SSH.</p>\n"
 
 #. Dialog frame title
-#: src/include/network/remote/dialogs.rb:110
+#: src/include/network/remote/dialogs.rb:109
 msgid "Remote Administration Settings"
 msgstr "Remote Administration Settings"
 
 #. Popup text
-#: src/include/network/routines.rb:143
+#: src/include/network/routines.rb:144
 msgid "These packages need to be installed:"
 msgstr "These packages need to be installed:"
 
 #. Popup text
-#: src/include/network/routines.rb:161
+#: src/include/network/routines.rb:162
 msgid ""
 "The required packages are not installed.\n"
 "The configuration will be aborted.\n"
@@ -3485,112 +3495,111 @@
 #. Translators: Appended after a network card name to indicate that
 #. there is no carrier, no link to the network, the cable is not
 #. plugged in. Preferably a short string.
-#: src/include/network/routines.rb:253
+#: src/include/network/routines.rb:254
 msgid "unplugged"
 msgstr "unplugged"
 
 #. Table field (Unknown device)
-#: src/include/network/routines.rb:259
+#: src/include/network/routines.rb:260
 msgid "Unknown"
 msgstr "Unknown"
 
 #. Popup headline
-#: src/include/network/routines.rb:287
+#: src/include/network/routines.rb:288
 msgid "Configuration Successfully Saved"
 msgstr "Configuration Successfully Saved"
 
 #. Popup headline
-#: src/include/network/routines.rb:292
+#: src/include/network/routines.rb:293
 msgid "DNS Configuration Successfully Saved"
 msgstr "DNS Configuration Successfully Saved"
 
 #. Popup headline
-#: src/include/network/routines.rb:294
+#: src/include/network/routines.rb:295
 msgid "DSL Configuration Successfully Saved"
 msgstr "DSL Configuration Successfully Saved"
 
 #. Popup headline
-#: src/include/network/routines.rb:296
+#: src/include/network/routines.rb:297
 msgid "Hosts Configuration Successfully Saved"
 msgstr "Hosts Configuration Successfully Saved"
 
 #. Popup headline
-#: src/include/network/routines.rb:300
+#: src/include/network/routines.rb:301
 msgid "ISDN Configuration Successfully Saved"
 msgstr "ISDN Configuration Successfully Saved"
 
 #. Popup headline
-#: src/include/network/routines.rb:304
+#: src/include/network/routines.rb:305
 msgid "Network Card Configuration Successfully Saved"
 msgstr "Network Card Configuration Successfully Saved"
 
 #. Popup headline
-#: src/include/network/routines.rb:308
+#: src/include/network/routines.rb:309
 msgid "Modem Configuration Successfully Saved"
 msgstr "Modem Configuration Successfully Saved"
 
 #. Popup headline
-#: src/include/network/routines.rb:312
+#: src/include/network/routines.rb:313
 msgid "Proxy Configuration Successfully Saved"
 msgstr "Proxy Configuration Successfully Saved"
 
 #. Popup headline
-#: src/include/network/routines.rb:316
+#: src/include/network/routines.rb:317
 msgid "Provider Configuration Successfully Saved"
 msgstr "Provider Configuration Successfully Saved"
 
 #. Popup headline
-#: src/include/network/routines.rb:320
+#: src/include/network/routines.rb:321
 msgid "Routing Configuration Successfully Saved"
 msgstr "Routing Configuration Successfully Saved"
 
 #. Popup text
-#: src/include/network/routines.rb:329
+#: src/include/network/routines.rb:330
 msgid "Configure mail now?"
 msgstr "Configure mail now?"
 
 #. Popup text
-#: src/include/network/routines.rb:334
+#: src/include/network/routines.rb:335
 msgid "Run configuration of %1?"
 msgstr "Run configuration of %1?"
 
+#. Disables all widgets which cannot be configured with current network service
+#.
+#. see bnc#433084
+#. if listed any items, disable them, if show_popup, show warning popup
+#.
+#. returns true if items were disabled
+#: src/include/network/routines.rb:1008
+msgid ""
+"Network is currently handled by NetworkManager\n"
+"or completely disabled. YaST is unable to configure some options."
+msgstr ""
+
 #. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:682
+#: src/include/network/routines.rb:1067
 msgid "Network Cards"
 msgstr "Network Cards"
 
 #. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:686
+#: src/include/network/routines.rb:1071
 msgid "Modems"
 msgstr "Modems"
 
 #. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:690
+#: src/include/network/routines.rb:1075
 msgid "ISDN Cards"
 msgstr "ISDN Cards"
 
 #. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:694
+#: src/include/network/routines.rb:1079
 msgid "DSL Devices"
 msgstr "DSL Devices"
 
-#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:700
+#: src/include/network/routines.rb:1084
 msgid "All Network Devices"
 msgstr "All Network Devices"
 
-#. Check if we're running in "normal" stage with NM
-#. see bnc#433084
-#. if listed any items, disable them, if show_popup, show warning popup
-#: src/include/network/routines.rb:1100
-msgid ""
-"Network is currently controlled by NetworkManager and its settings \n"
-"cannot be edited by YaST.\n"
-"\n"
-"To edit the settings, use the NetworkManager connection editor or\n"
-"switch the network setup method to Traditional with ifup.\n"
-msgstr ""
-
 #. validation error popup
 #. Popup::Error text
 #: src/include/network/services/dns.rb:93
@@ -3853,7 +3862,7 @@
 
 #. #178538 - disable routing dialog when NetworkManager is used
 #. but instead of default route (#299448) - NM reads it
-#: src/include/network/services/routing.rb:417
+#: src/include/network/services/routing.rb:420
 msgid "The default gateway is invalid."
 msgstr "The default gateway is invalid."
 
@@ -4080,64 +4089,77 @@
 msgid "Set &MTU"
 msgstr "Set &MTU"
 
+#. the user can control the network with the NetworkManager program
+#: src/include/network/widgets.rb:300
+#, fuzzy
+#| msgid "Network Services"
+msgid "NetworkManager Service"
+msgstr "Network Services"
+
+#. ifup is a program name
+#: src/include/network/widgets.rb:308
+#, fuzzy
+#| msgid "Traditional Chinese"
+msgid "Traditional ifup"
+msgstr "Traditional Chinese"
+
+#. wicked is network configuration backend like netconfig
+#: src/include/network/widgets.rb:316
+#, fuzzy
+#| msgid "Web Services"
+msgid "Wicked Service"
+msgstr "Web Services"
+
+#. used when no network service is active or to disable network service
+#: src/include/network/widgets.rb:324
+#, fuzzy
+#| msgid "Network Services"
+msgid "Network Services Disabled"
+msgstr "Network Services"
+
 #. Store the NetworkManager widget
 #. @param [String] key	id of the widget
 #. @param [Hash] event	the event being handled
-#: src/include/network/widgets.rb:336
+#: src/include/network/widgets.rb:355
 msgid "Applet needed"
 msgstr ""
 
-#: src/include/network/widgets.rb:337
+#: src/include/network/widgets.rb:356
 msgid ""
 "NetworkManager is controlled by desktop applet\n"
 "(KDE plasma widget and nm-applet for GNOME).\n"
 "Be sure it's running and if not, start it manually."
 msgstr ""
 
-#. radio button label
-#. the user can control the network with the NetworkManager
-#. program
-#: src/include/network/widgets.rb:359
-msgid "&User Controlled with NetworkManager"
-msgstr "&User Controlled with NetworkManager"
-
-#. radio button label
-#. ifup is a program name
-#: src/include/network/widgets.rb:365
-msgid "&Traditional Method with ifup"
-msgstr "&Traditional Method with ifup"
-
-#. radio button label
-#. wicked is network configuration backend like netconfig
 #: src/include/network/widgets.rb:371
-msgid "Controlled by &wicked"
-msgstr ""
+msgid "General Network Settings"
+msgstr "General Network Settings"
 
-#: src/include/network/widgets.rb:410
+#: src/include/network/widgets.rb:417
 msgid "IPv6 Protocol Settings"
 msgstr "IPv6 Protocol Settings"
 
 #. enable ipv6 support
-#: src/include/network/widgets.rb:411 src/modules/Lan.rb:825
+#: src/include/network/widgets.rb:418 src/modules/Lan.rb:820
 msgid "Enable IPv6"
 msgstr "Enable IPv6"
 
 #. TRANSLATORS: Informs that device name is not known
-#: src/include/network/widgets.rb:428
+#: src/include/network/widgets.rb:435
 msgid "Unknown device"
 msgstr "Unknown device"
 
 #. TRANSLATORS: Part of label, device with IP address assigned by DHCP
-#: src/include/network/widgets.rb:440
+#: src/include/network/widgets.rb:447
 msgid "DHCP address"
 msgstr "DHCP address"
 
 #. TRANSLATORS: Informs that no IP has been assigned to the device
-#: src/include/network/widgets.rb:445
+#: src/include/network/widgets.rb:452
 msgid "No IP address assigned"
 msgstr "No IP address assigned"
 
-#: src/include/network/widgets.rb:448
+#: src/include/network/widgets.rb:455
 msgid ""
 "%1 \n"
 "%2 - %3"
@@ -4146,12 +4168,12 @@
 "%2 - %3"
 
 #. #186102
-#: src/include/network/widgets.rb:503
+#: src/include/network/widgets.rb:510
 msgid "&Change Device"
 msgstr "&Change Device"
 
 #. popup dialog title
-#: src/include/network/widgets.rb:537
+#: src/include/network/widgets.rb:544
 msgid "Network Device Select"
 msgstr "Network Device Select"
 
@@ -4168,106 +4190,102 @@
 msgstr ""
 
 #. Opens dialog for editing NIC name
-#: src/lib/network/edit_nic_name.rb:97
+#: src/lib/network/edit_nic_name.rb:95
 #, fuzzy
 #| msgid "Device Name"
-msgid "Device name:"
+msgid "Device Name:"
 msgstr "Device Name"
 
-#: src/lib/network/edit_nic_name.rb:103
-msgid "Base udev rule on"
+#: src/lib/network/edit_nic_name.rb:101
+msgid "Base Udev Rule On"
 msgstr ""
 
 #. make sure there is enough space (#367239)
-#: src/lib/network/edit_nic_name.rb:112
+#: src/lib/network/edit_nic_name.rb:110
 #, fuzzy
 #| msgid "MAC Address: %1"
 msgid "MAC address: %s"
 msgstr "MAC Address: %1"
 
-#: src/lib/network/edit_nic_name.rb:118
+#: src/lib/network/edit_nic_name.rb:116
 msgid "BusID: %s"
 msgstr ""
 
-#. Checks if given name can be accepted as nic's new one.
-#.
-#. Pops up an explanation if the name is invalid
-#.
-#. @return [boolean] false if name is invalid
-#: src/lib/network/edit_nic_name.rb:154
+#. check if the name is assigned to another device already
+#: src/lib/network/edit_nic_name.rb:153
 #, fuzzy
 msgid "Configuration name already exists."
 msgstr "Configuration %1 already present."
 
-#: src/lib/network/edit_nic_name.rb:158
+#: src/lib/network/edit_nic_name.rb:157
 #, fuzzy
 #| msgid "Read configuration file"
 msgid "Invalid configuration name."
 msgstr "Read configuration file"
 
 #. Progress stage 1
-#: src/modules/DNS.rb:398
+#: src/modules/DNS.rb:371
 msgid "Write hostname"
 msgstr "Write hostname"
 
 #. Progress stage 2
 #. Progress stage 10
-#: src/modules/DNS.rb:400 src/modules/Lan.rb:538
+#: src/modules/DNS.rb:373 src/modules/Lan.rb:535
 msgid "Update configuration"
 msgstr "Update configuration"
 
 #. Progress stage 3
-#: src/modules/DNS.rb:402
+#: src/modules/DNS.rb:375
 msgid "Update /etc/resolv.conf"
 msgstr "Update /etc/resolv.conf"
 
 #. Write dialog caption
-#: src/modules/DNS.rb:406
+#: src/modules/DNS.rb:379
 msgid "Saving Hostname and DNS Configuration"
 msgstr "Saving Hostname and DNS Configuration"
 
 #. Allow to set hostname even if it's modified by DHCP (#13427)
 #. if(NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"]:false != true) {
 #. Progress step 1/3
-#: src/modules/DNS.rb:415
+#: src/modules/DNS.rb:388
 msgid "Writing hostname..."
 msgstr "Writing hostname..."
 
 #. Progress step 2/3
 #. Progress step 10
-#: src/modules/DNS.rb:429 src/modules/Lan.rb:640
+#: src/modules/DNS.rb:405 src/modules/Lan.rb:630
 msgid "Updating configuration..."
 msgstr "Updating configuration..."
 
 #. if(SCR::Read(.target.size, resolv_conf) < 0)
 #. SCR::Write(.target.string, resolv_conf, "");
 #. Progress step 3/3
-#: src/modules/DNS.rb:440
+#: src/modules/DNS.rb:416
 #, fuzzy
 msgid "Updating /etc/resolv.conf ..."
 msgstr "Updating /etc/resolv.conf..."
 
 #. Summary text
-#: src/modules/DNS.rb:557
+#: src/modules/DNS.rb:533
 msgid "Hostname: Set by DHCP"
 msgstr "Hostname: Set by DHCP"
 
 #. Summary text
-#: src/modules/DNS.rb:563
+#: src/modules/DNS.rb:539
 msgid "Hostname: %1"
 msgstr "Hostname: %1"
 
-#: src/modules/DNS.rb:571
+#: src/modules/DNS.rb:547
 msgid "Hostname will not be written to /etc/hosts"
 msgstr "Hostname will not be written to /etc/hosts"
 
 #. Summary text
-#: src/modules/DNS.rb:593
+#: src/modules/DNS.rb:569
 msgid "Name Servers: %1"
 msgstr "Name Servers: %1"
 
 #. Summary text
-#: src/modules/DNS.rb:603
+#: src/modules/DNS.rb:579
 msgid "Search List: %1"
 msgstr "Search List: %1"
 
@@ -4287,312 +4305,318 @@
 msgstr "Updating /etc/hosts..."
 
 #. Read dialog caption
-#: src/modules/Lan.rb:275
+#: src/modules/Lan.rb:272
 msgid "Initializing Network Configuration"
 msgstr "Initialising Network Configuration"
 
 #. Progress stage 1/9
-#: src/modules/Lan.rb:288
+#: src/modules/Lan.rb:285
 msgid "Detect network devices"
 msgstr "Detect network devices"
 
 #. Progress stage 2/9
-#: src/modules/Lan.rb:290
+#: src/modules/Lan.rb:287
 msgid "Read driver information"
 msgstr "Read driver information"
 
 #. Progress stage 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:292
+#: src/modules/Lan.rb:289
 msgid "Read device configuration"
 msgstr "Read device configuration"
 
 #. Progress stage 4/9
-#: src/modules/Lan.rb:294
+#: src/modules/Lan.rb:291
 msgid "Read network configuration"
 msgstr "Read network configuration"
 
 #. Progress stage 5/9
-#: src/modules/Lan.rb:296
+#: src/modules/Lan.rb:293
 msgid "Read firewall settings"
 msgstr "Read firewall settings"
 
 #. Progress stage 6/9
-#: src/modules/Lan.rb:298
+#: src/modules/Lan.rb:295
 msgid "Read hostname and DNS configuration"
 msgstr "Read hostname and DNS configuration"
 
 #. Progress stage 7/9
-#: src/modules/Lan.rb:300
+#: src/modules/Lan.rb:297
 msgid "Read installation information"
 msgstr "Read installation information"
 
 #. Progress stage 8/9
-#: src/modules/Lan.rb:302
+#: src/modules/Lan.rb:299
 msgid "Read routing configuration"
 msgstr "Read routing configuration"
 
 #. Progress stage 9/9
-#: src/modules/Lan.rb:304
+#: src/modules/Lan.rb:301
 msgid "Detect current status"
 msgstr "Detect current status"
 
 #. Progress step 1/9
-#: src/modules/Lan.rb:318
+#: src/modules/Lan.rb:315
 #, fuzzy
 msgid "Detecting ndiswrapper..."
 msgstr "Detecting hardware..."
 
 #. modprobe ndiswrapper before hwinfo when needed (#343893)
-#: src/modules/Lan.rb:337
+#: src/modules/Lan.rb:334
 msgid ""
 "Detected a ndiswrapper configuration,\n"
 "but the kernel module was not modprobed.\n"
 "Do you want to modprobe ndiswrapper?\n"
 msgstr ""
 
-#: src/modules/Lan.rb:345
+#: src/modules/Lan.rb:342
 msgid ""
 "ndiswrapper kernel module has not been loaded.\n"
 "Check configuration manually.\n"
 msgstr ""
 
 #. Progress step 2/9
-#: src/modules/Lan.rb:359
+#: src/modules/Lan.rb:356
 msgid "Detecting network devices..."
 msgstr "Detecting network devices..."
 
 #. Progress step 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:367
+#: src/modules/Lan.rb:364
 msgid "Reading device configuration..."
 msgstr "Reading device configuration..."
 
 #. Progress step 4/9
-#: src/modules/Lan.rb:373
+#: src/modules/Lan.rb:370
 msgid "Reading network configuration..."
 msgstr "Reading network configuration..."
 
 #. Progress step 5/9
-#: src/modules/Lan.rb:382
+#: src/modules/Lan.rb:379
 msgid "Reading firewall settings..."
 msgstr "Reading firewall settings..."
 
 #. Progress step 6/9
-#: src/modules/Lan.rb:390
+#: src/modules/Lan.rb:387
 msgid "Reading hostname and DNS configuration..."
 msgstr "Reading hostname and DNS configuration..."
 
 #. Progress step 7/9
-#: src/modules/Lan.rb:397
+#: src/modules/Lan.rb:394
 msgid "Reading installation information..."
 msgstr "Reading installation information..."
 
 #. Progress step 8/9
-#: src/modules/Lan.rb:403
+#: src/modules/Lan.rb:400
 msgid "Reading routing configuration..."
 msgstr "Reading routing configuration..."
 
 #. Progress step 9/9
-#: src/modules/Lan.rb:409
+#: src/modules/Lan.rb:406
 msgid "Detecting current status..."
 msgstr "Detecting current status..."
 
 #. Final progress step
 #. Final progress step
-#: src/modules/Lan.rb:415 src/modules/Lan.rb:661
+#: src/modules/Lan.rb:412 src/modules/Lan.rb:651
 msgid "Finished"
 msgstr "Finished"
 
 #. (a specialization used when a parameterless function is needed)
 #. @return Read(`cache)
-#: src/modules/Lan.rb:441
+#: src/modules/Lan.rb:438
 #, fuzzy
 msgid "To apply this change, a reboot is needed."
 msgstr "To apply this change reboot is needed."
 
 #. Write dialog caption
-#: src/modules/Lan.rb:510
+#: src/modules/Lan.rb:507
 msgid "Saving Network Configuration"
 msgstr "Saving Network Configuration"
 
 #. Progress stage 2
-#: src/modules/Lan.rb:517
+#: src/modules/Lan.rb:514
 msgid "Write drivers information"
 msgstr "Write drivers information"
 
 #. Progress stage 3 - multiple devices may be present,really plural
-#: src/modules/Lan.rb:519
+#: src/modules/Lan.rb:516
 msgid "Write device configuration"
 msgstr "Write device configuration"
 
 #. Progress stage 4
-#: src/modules/Lan.rb:521
+#: src/modules/Lan.rb:518
 msgid "Write network configuration"
 msgstr "Write network configuration"
 
 #. Progress stage 5
-#: src/modules/Lan.rb:523
+#: src/modules/Lan.rb:520
 msgid "Write routing configuration"
 msgstr "Write routing configuration"
 
 #. Progress stage 6
-#: src/modules/Lan.rb:525
+#: src/modules/Lan.rb:522
 msgid "Write hostname and DNS configuration"
 msgstr "Write hostname and DNS configuration"
 
 #. Progress stage 7
-#: src/modules/Lan.rb:527
+#: src/modules/Lan.rb:524
 msgid "Set up network services"
 msgstr "Set up network services"
 
 #. Progress stage 8
 #. Progress stage 1
-#: src/modules/Lan.rb:531 src/modules/Remote.rb:286
+#: src/modules/Lan.rb:528 src/modules/Remote.rb:289
 msgid "Write firewall settings"
 msgstr "Write firewall settings"
 
 #. Progress stage 9
-#: src/modules/Lan.rb:535
+#: src/modules/Lan.rb:532
 msgid "Activate network services"
 msgstr "Activate network services"
 
 #. Progress step 2
-#: src/modules/Lan.rb:552
+#: src/modules/Lan.rb:549
 msgid "Writing /etc/modprobe.conf..."
 msgstr "Writing /etc/modprobe.conf..."
 
 #. Progress step 3 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:557
+#: src/modules/Lan.rb:554
 msgid "Writing device configuration..."
 msgstr "Writing device configuration..."
 
 #. Progress step 4
-#: src/modules/Lan.rb:573
+#: src/modules/Lan.rb:560
 msgid "Writing network configuration..."
 msgstr "Writing network configuration..."
 
 #. Progress step 5
-#: src/modules/Lan.rb:579
+#: src/modules/Lan.rb:566
 msgid "Writing routing configuration..."
 msgstr "Writing routing configuration..."
 
 #. Progress step 6
-#: src/modules/Lan.rb:587
+#: src/modules/Lan.rb:574
 msgid "Writing hostname and DNS configuration..."
 msgstr "Writing hostname and DNS configuration..."
 
 #. Progress step 7
-#: src/modules/Lan.rb:600
+#: src/modules/Lan.rb:587
 msgid "Setting up network services..."
 msgstr "Setting up network services..."
 
 #. Progress step 8
-#. 100; //for testing
-#: src/modules/Lan.rb:608 src/modules/Remote.rb:301
+#: src/modules/Lan.rb:595 src/modules/Remote.rb:303
 msgid "Writing firewall settings..."
 msgstr "Writing firewall settings..."
 
 #. Progress step 9
-#: src/modules/Lan.rb:618
+#: src/modules/Lan.rb:605
 msgid "Activating network services..."
 msgstr "Activating network services..."
 
-#: src/modules/Lan.rb:657
+#: src/modules/Lan.rb:647
 #, fuzzy
 msgid "No network running"
 msgstr "Network Settings"
 
+#. Import data
+#. @param [Hash] settings settings to be imported
+#. @return true on success
+#: src/modules/Lan.rb:706
+msgid "AutoYaST setting networking/managed: NetworkManager is not available, Wicked will be used."
+msgstr ""
+
 #. Create a textual summary for the general network settings
 #. proposal (NetworkManager + ipv6)
 #. @return [rich text, links]
-#: src/modules/Lan.rb:797
+#: src/modules/Lan.rb:792
 msgid "Network Mode"
 msgstr "Network Mode"
 
 #. network mode: the interfaces are controlled by the user
-#: src/modules/Lan.rb:802
+#: src/modules/Lan.rb:797
 msgid "Interfaces controlled by NetworkManager"
 msgstr "Interfaces controlled by NetworkManager"
 
 #. disable NetworkManager applet
-#: src/modules/Lan.rb:804
+#: src/modules/Lan.rb:799
 msgid "Disable NetworkManager"
 msgstr "Disable NetworkManager"
 
 #. network mode
-#: src/modules/Lan.rb:808
+#: src/modules/Lan.rb:803
 msgid "Traditional network setup with NetControl - ifup"
 msgstr "Traditional network setup with NetControl - ifup"
 
 #. enable NetworkManager applet
 #. for virtual network proposal (bridged) don't show hyperlink to enable networkmanager
-#: src/modules/Lan.rb:811
+#: src/modules/Lan.rb:806
 msgid "Enable NetworkManager"
 msgstr "Enable NetworkManager"
 
 #. ipv6 support is enabled
-#: src/modules/Lan.rb:817
+#: src/modules/Lan.rb:812
 msgid "Support for IPv6 protocol is enabled"
 msgstr "Support for IPv6 protocol is enabled"
 
 #. disable ipv6 support
-#: src/modules/Lan.rb:819
+#: src/modules/Lan.rb:814
 msgid "Disable IPv6"
 msgstr "Disable IPv6"
 
 #. ipv6 support is disabled
-#: src/modules/Lan.rb:823
+#: src/modules/Lan.rb:818
 msgid "Support for IPv6 protocol is disabled"
 msgstr "Support for IPv6 protocol is disabled"
 
 #. translators: a possible value for: IPoIB device mode
-#: src/modules/LanItems.rb:181
+#: src/modules/LanItems.rb:195
 #, fuzzy
 msgid "connected"
 msgstr "(not connected)"
 
-#: src/modules/LanItems.rb:182
+#: src/modules/LanItems.rb:196
 msgid "datagram"
 msgstr ""
 
 #. summary description of STARTMODE=auto
 #. summary description of STARTMODE=auto
 #. summary description of STARTMODE=hotplug
-#: src/modules/LanItems.rb:1190 src/modules/LanItems.rb:1194
-#: src/modules/LanItems.rb:1198
+#: src/modules/LanItems.rb:1251 src/modules/LanItems.rb:1255
+#: src/modules/LanItems.rb:1259
 msgid "Started automatically at boot"
 msgstr "Started automatically at boot"
 
 #. summary description of STARTMODE=ifplugd
-#: src/modules/LanItems.rb:1202
+#: src/modules/LanItems.rb:1263
 msgid "Started automatically on cable connection"
 msgstr "Started automatically on cable connection"
 
 #. summary description of STARTMODE=managed
-#: src/modules/LanItems.rb:1206
+#: src/modules/LanItems.rb:1267
 msgid "Managed by NetworkManager"
 msgstr "Managed by NetworkManager"
 
 #. summary description of STARTMODE=off
-#: src/modules/LanItems.rb:1210
+#: src/modules/LanItems.rb:1271
 msgid "Will not be started at all"
 msgstr "Will not be started at all"
 
-#: src/modules/LanItems.rb:1215
+#: src/modules/LanItems.rb:1276
 msgid "Started manually"
 msgstr "Started manually"
 
 #. do nothing
-#: src/modules/LanItems.rb:1227
+#: src/modules/LanItems.rb:1288
 #, fuzzy
 msgid "IP address assigned using"
 msgstr "IP address assigned using DHCP"
 
-#: src/modules/LanItems.rb:1231
+#: src/modules/LanItems.rb:1292
 #, fuzzy
 msgid "IP address: %s/%s"
 msgstr "IP Address: %1"
 
-#: src/modules/LanItems.rb:1234
+#: src/modules/LanItems.rb:1295
 #, fuzzy
 #| msgid "IP address: %1, subnet mask %2"
 msgid "IP address: %s, subnet mask %s"
@@ -4601,91 +4625,108 @@
 #. FIXME:
 #. - side effect: sets @type. No reason for that. It should only build item
 #. overview. Check and remove.
-#: src/modules/LanItems.rb:1265
+#: src/modules/LanItems.rb:1326
 msgid "Not configured"
 msgstr "Not configured"
 
 #. display it only if we need it, don't duplicate "ifcfg_name" above
-#: src/modules/LanItems.rb:1288 src/modules/LanItems.rb:1350
+#: src/modules/LanItems.rb:1349 src/modules/LanItems.rb:1415
 #, fuzzy
 #| msgid "Device Name: %1"
 msgid "Device Name: %s"
 msgstr "Device Name: %1"
 
-#: src/modules/LanItems.rb:1308
+#: src/modules/LanItems.rb:1369
 #, fuzzy
 #| msgid "Bond slaves"
 msgid "Bonding slaves"
 msgstr "Bond slaves"
 
-#: src/modules/LanItems.rb:1322
+#: src/modules/LanItems.rb:1383
 msgid "enslaved in %s"
 msgstr ""
 
-#: src/modules/LanItems.rb:1323
+#: src/modules/LanItems.rb:1384
 msgid "Bonding master"
 msgstr ""
 
-#: src/modules/LanItems.rb:1333
+#: src/modules/LanItems.rb:1398
 #, fuzzy
 msgid "Not connected"
 msgstr "(not connected)"
 
-#: src/modules/LanItems.rb:1336
+#: src/modules/LanItems.rb:1401
 msgid "No hwinfo"
 msgstr ""
 
-#: src/modules/LanItems.rb:1356
+#: src/modules/LanItems.rb:1421
 #, fuzzy
 msgid "Unable to configure the network card because the kernel device (eth0, wlan0) is not present. This is mostly caused by missing firmware (for wlan devices). See dmesg output for details."
 msgstr "<p>Unable to configure network card because kernel device is not present</p>"
 
-#: src/modules/LanItems.rb:1362
+#: src/modules/LanItems.rb:1427
 #, fuzzy
 msgid ""
 "The device is not configured. Press <b>Edit</b>\n"
 "to configure.\n"
 msgstr "<P><UL><LI>The device is not configured</LI><LI>Press <B>Configure</B> to configure</LI></UL></P>"
 
-#: src/modules/LanItems.rb:1369
+#: src/modules/LanItems.rb:1434
 #, fuzzy
 msgid "Needed firmware"
 msgstr "Needed Information"
 
-#: src/modules/LanItems.rb:1369
+#: src/modules/LanItems.rb:1434
 msgid "unknown"
 msgstr "unknown"
 
+#. Package containing SuSEfirewall2 services has to be installed before
+#. reading SuSEFirewall, otherwise exception is thrown by firewall
+#: src/modules/Remote.rb:239
+#, fuzzy
+#| msgid "SuSEfirewall2 package is not installed, firewall will be disabled."
+msgid ""
+"Package %{package} is not installed\n"
+"firewall settings will be disabled."
+msgstr "SuSEfirewall2 package is not installed, firewall will be disabled."
+
 #. Progress stage 2
-#: src/modules/Remote.rb:288
+#: src/modules/Remote.rb:291
 msgid "Configure display manager"
 msgstr "Configure display manager"
 
 #. Progress stage 3
-#: src/modules/Remote.rb:293
+#: src/modules/Remote.rb:296
 msgid "Restart the services"
 msgstr "Restart the services"
 
-#: src/modules/Remote.rb:296
+#: src/modules/Remote.rb:299
 msgid "Saving Remote Administration Configuration"
 msgstr "Saving Remote Administration Configuration"
 
-#: src/modules/Remote.rb:307
+#: src/modules/Remote.rb:308
 msgid "Configuring display manager..."
 msgstr "Configuring display manager..."
 
+#. Enable xinetd
+#. Enable XDM
+#: src/modules/Remote.rb:327 src/modules/Remote.rb:335
+#, fuzzy
+#| msgid "Enabling service 'uml' failed."
+msgid "Enabling service %{service} has failed"
+msgstr "Enabling service 'uml' failed."
+
 #. Do this only if package xinetd is installed (#256385)
-#: src/modules/Remote.rb:364
+#: src/modules/Remote.rb:359
 msgid "Restarting the service..."
 msgstr "Restarting the service..."
 
-#. Label in proposal text
-#: src/modules/Remote.rb:415
+#. description in proposal
+#: src/modules/Remote.rb:393
 msgid "Remote administration is enabled."
 msgstr "Remote administration is enabled."
 
-#. Label in proposal text
-#: src/modules/Remote.rb:418
+#: src/modules/Remote.rb:393
 msgid "Remote administration is disabled."
 msgstr "Remote administration is disabled."
 
@@ -4737,22 +4778,33 @@
 msgstr "IP Forwarding: on"
 
 #. item in combo box Firewall Zone
-#: src/modules/SuSEFirewall4Network.rb:82
+#: src/modules/SuSEFirewall4Network.rb:121
 #, fuzzy
 msgid "Automatically Assigned Zone"
 msgstr "Automatically &Reconnect"
 
 #. item in combo box Firewall Zone
-#: src/modules/SuSEFirewall4Network.rb:84
+#: src/modules/SuSEFirewall4Network.rb:123
 msgid "Firewall Disabled"
 msgstr "Firewall Disabled"
 
 #. TRANSLATORS: Part of combo box item -> "Internal Zone (Unprotected)"
-#: src/modules/SuSEFirewall4Network.rb:96
+#: src/modules/SuSEFirewall4Network.rb:135
 msgid "(Unprotected)"
 msgstr "(Unprotected)"
 
+#~ msgid "&User Controlled with NetworkManager"
+#~ msgstr "&User Controlled with NetworkManager"
+
+#~ msgid "&Traditional Method with ifup"
+#~ msgstr "&Traditional Method with ifup"
+
 #, fuzzy
+#~| msgid "Device Name"
+#~ msgid "Device name:"
+#~ msgstr "Device Name"
+
+#, fuzzy
 #~ msgid "SSH service will be enabled, SSH port will be open (<a href=\"%1\">disable and close</a>)"
 #~ msgstr "SSH port is open (<a href=\"firewall--disable_ssh_in_proposal\">close</a>)"
 
@@ -4761,9 +4813,6 @@
 #~ msgid "SSH service will be disabled, SSH port will be blocked (<a href=\"%1\">enable and open</a>)"
 #~ msgstr "SSH service will be disabled, SSH port will be blocked (<a href=\"firewall--enable_ssh_in_proposal\">enable and open</a>)"
 
-#~ msgid "General Network Settings"
-#~ msgstr "General Network Settings"
-
 #~ msgid "General &Network Settings"
 #~ msgstr "General &Network Settings"
 
@@ -5282,9 +5331,6 @@
 #~ msgid "Add &Provider to Existing Interface"
 #~ msgstr "Add &Provider to Existing Interface"
 
-#~ msgid "Network Services"
-#~ msgstr "Network Services"
-
 #~ msgid "S&kip"
 #~ msgstr "S&kip"
 

Modified: trunk/yast/en_GB/po/nfs.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/nfs.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/nfs.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\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"

Modified: trunk/yast/en_GB/po/nfs_server.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/nfs_server.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/nfs_server.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2007-08-16 20:05+0100\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"
@@ -81,27 +81,27 @@
 msgstr "Yes/No option for enabling/disabling secure NFS"
 
 #. summary text
-#: src/clients/nfs_server.rb:202
+#: src/clients/nfs_server.rb:196
 msgid "NFS server is enabled"
 msgstr "NFS server is enabled"
 
 #. summary text
-#: src/clients/nfs_server.rb:205
+#: src/clients/nfs_server.rb:199
 msgid "NFS server is disabled"
 msgstr "NFS server is disabled"
 
 #. error message
-#: src/clients/nfs_server.rb:221
+#: src/clients/nfs_server.rb:215
 msgid "Required packages (%1) are not installed."
 msgstr "Required packages (%1) are not installed."
 
 #. error
 #. error
-#: src/clients/nfs_server.rb:261 src/clients/nfs_server.rb:291
+#: src/clients/nfs_server.rb:255 src/clients/nfs_server.rb:285
 msgid "No mount point specified."
 msgstr "No mount point specified."
 
-#: src/clients/nfs_server.rb:266
+#: src/clients/nfs_server.rb:260
 msgid ""
 "The exports table already\n"
 "contains this directory."
@@ -112,12 +112,12 @@
 #. CLI action handler.
 #. @param [Hash] options command options
 #. @return whether successful
-#: src/clients/nfs_server.rb:325
+#: src/clients/nfs_server.rb:319
 #, fuzzy
 msgid "Domain cannot be set without enabling NFSv4. Use the 'set enablev4' command."
 msgstr "Domain can not be set without enabling NFSv4. Please use 'set enablev4' command."
 
-#: src/clients/nfs_server.rb:336
+#: src/clients/nfs_server.rb:330
 #, fuzzy
 msgid "Command 'set' must be used in the form 'set option=value'. Use 'set help' to get information about available options."
 msgstr "Command set must be used as in 'set option=value'. Please use 'set help' to know the options."
@@ -188,60 +188,49 @@
 "Probably there is spurious whitespace in the configuration file."
 
 #. text entry label
-#: src/include/nfs_server/ui.rb:68
+#: src/include/nfs_server/ui.rb:58
 msgid "&Directory to Export"
 msgstr "&Directory to Export"
 
 #. button label
-#: src/include/nfs_server/ui.rb:74
+#: src/include/nfs_server/ui.rb:64
 msgid "&Browse..."
 msgstr "&Browse..."
 
-#: src/include/nfs_server/ui.rb:97
+#: src/include/nfs_server/ui.rb:87
 #, fuzzy
 msgid "Enter a non-empty export path. For example, /exports."
 msgstr "Please enter a non-empty export path. Eg: /exports"
 
 #. error popup message
-#: src/include/nfs_server/ui.rb:105
+#: src/include/nfs_server/ui.rb:95
 msgid "The exports table already contains this directory."
 msgstr "The exports table already contains this directory."
 
-#. message popup; %1, %2 are package names
-#: src/include/nfs_server/ui.rb:113
-msgid ""
-"The user mode NFS server (%1) cannot export directories\n"
-"with spaces in their names.\n"
-"Use the kernel-based server (%2) to do that."
-msgstr ""
-"The user mode NFS server (%1) cannot export directories\n"
-"with spaces in their names.\n"
-"Use the kernel-based server (%2) to do that."
-
 #. the dir does not exist
-#: src/include/nfs_server/ui.rb:126
+#: src/include/nfs_server/ui.rb:101
 msgid "The directory does not exist. Create it?"
 msgstr "The directory does not exist. Create it?"
 
 #. title in the file selection dialog
-#: src/include/nfs_server/ui.rb:136
+#: src/include/nfs_server/ui.rb:111
 msgid "Select the Directory to Export"
 msgstr "Select the Directory to Export"
 
 #. text entry label
-#: src/include/nfs_server/ui.rb:193
+#: src/include/nfs_server/ui.rb:168
 msgid "&Host Wild Card"
 msgstr "&Host Wild Card"
 
 #. text entry label
-#: src/include/nfs_server/ui.rb:195
+#: src/include/nfs_server/ui.rb:170
 msgid "O&ptions"
 msgstr "O&ptions"
 
 #. check to see if user has changed options entry in the dialogue
 #. thrown due to a "Add Hosts" (as opposed to editing existing ones).
 #. If yes, suggest the user with a suitable default option set.
-#: src/include/nfs_server/ui.rb:250
+#: src/include/nfs_server/ui.rb:222
 #, fuzzy
 #| msgid ""
 #| "'fsid=0'is not a valid option unless \n"
@@ -254,7 +243,7 @@
 "NFSv4 is enabled (previous page)"
 
 #. error popup message
-#: src/include/nfs_server/ui.rb:268
+#: src/include/nfs_server/ui.rb:240
 msgid ""
 "Options for this wild card\n"
 "are already set."
@@ -264,13 +253,13 @@
 
 #. Opening NFS server dialog
 #. @return `back, `abort, `next `or finish
-#: src/include/nfs_server/ui.rb:300
+#: src/include/nfs_server/ui.rb:272
 #, fuzzy
 msgid "Unable to read the /etc/idmapd.conf file. Setting the default setting for the domain to 'localdomain'."
 msgstr "Unable to read /etc/idmapd.conf file. Defaulting the domain to 'localdomain'"
 
 #. Help, part 1 of 2
-#: src/include/nfs_server/ui.rb:323
+#: src/include/nfs_server/ui.rb:295
 msgid ""
 "<P>Here, choose whether to start an NFS server on your computer\n"
 "and export some of your directories to others.</P>"
@@ -279,7 +268,7 @@
 "and export some of your directories to others.</P>"
 
 #. Help, part 2 of 2
-#: src/include/nfs_server/ui.rb:330
+#: src/include/nfs_server/ui.rb:302
 msgid ""
 "<P>If you choose <B>Start NFS Server</B>, clicking <B>Next</B> opens\n"
 "a configuration dialog in which to specify the directories to export.</P>"
@@ -287,7 +276,7 @@
 "<P>If you choose <B>Start NFS Server</B>, clicking <B>Next</B> opens\n"
 "a configuration dialogue in which to specify the directories to export.</P>"
 
-#: src/include/nfs_server/ui.rb:339
+#: src/include/nfs_server/ui.rb:311
 #, fuzzy
 msgid ""
 "<P>If the server needs to handle NFSv4 clients, check <B>Enable NFSv4</B>\n"
@@ -299,7 +288,7 @@
 "it as localdomain or refer to man page for idmapd and idmapd.conf if you are not sure.</P>"
 
 #. FIXME: use %1 as nfs-utils.src.rpm produces nfs-kernel-server.rpm
-#: src/include/nfs_server/ui.rb:349
+#: src/include/nfs_server/ui.rb:321
 #, fuzzy
 msgid ""
 "<P>If the server and client must authenticate using GSS library, check the\n"
@@ -309,44 +298,44 @@
 "checkbox. For being able to use GSS API, currently you need to have kerberos and gssapi (nfs-utils > 1.0.7) on your system</P>"
 
 #. frame label
-#: src/include/nfs_server/ui.rb:359
+#: src/include/nfs_server/ui.rb:331
 msgid "NFS Server"
 msgstr "NFS Server"
 
 #. radio button label
-#: src/include/nfs_server/ui.rb:370
+#: src/include/nfs_server/ui.rb:342
 msgid "&Start"
 msgstr "&Start"
 
 #. radio button label
-#: src/include/nfs_server/ui.rb:379
+#: src/include/nfs_server/ui.rb:351
 msgid "Do &Not Start"
 msgstr "Do &Not Start"
 
 #. frame label
-#: src/include/nfs_server/ui.rb:397
+#: src/include/nfs_server/ui.rb:369
 msgid "Enable NFSv4"
 msgstr "Enable NFSv4"
 
-#: src/include/nfs_server/ui.rb:404
+#: src/include/nfs_server/ui.rb:376
 msgid "Enable NFS&v4"
 msgstr "Enable NFS&v4"
 
-#: src/include/nfs_server/ui.rb:409
+#: src/include/nfs_server/ui.rb:381
 msgid "Enter NFSv4 do&main name:"
 msgstr "Enter NFSv4 do&main name:"
 
-#: src/include/nfs_server/ui.rb:419
+#: src/include/nfs_server/ui.rb:391
 msgid "Enable &GSS Security"
 msgstr "Enable &GSS Security"
 
 #. dialog title
-#: src/include/nfs_server/ui.rb:439
+#: src/include/nfs_server/ui.rb:411
 msgid "NFS Server Configuration"
 msgstr "NFS Server Configuration"
 
 #. Help, part 1 of 4
-#: src/include/nfs_server/ui.rb:515
+#: src/include/nfs_server/ui.rb:487
 msgid ""
 "<P>The upper box contains all the directories to export.\n"
 "If a directory is selected, the lower box shows the hosts allowed to\n"
@@ -357,7 +346,7 @@
 "mount this directory.</P>\n"
 
 #. Help, part 2 of 4
-#: src/include/nfs_server/ui.rb:524
+#: src/include/nfs_server/ui.rb:495
 msgid ""
 "<P><b>Host Wild Card</b> sets which hosts can access the selected directory.\n"
 "It can be a single host, groups, wild cards, or\n"
@@ -367,69 +356,64 @@
 "It can be a single host, groups, wild cards, or\n"
 "IP networks.</P>\n"
 
-#. Help, part 3 of 4, variant for kernel space server
-#: src/include/nfs_server/ui.rb:536
+#. Help, part 3 of 4
+#: src/include/nfs_server/ui.rb:503
 #, fuzzy
 msgid "<p>Enter an asterisk (<tt>*</tt>) instead of a name to specify all hosts.</p>"
 msgstr "<p>Enter an asterisk (<tt>*</tt>) to specify all hosts.</p>"
 
-#. Help, part 3 of 4, variant for user space server
-#: src/include/nfs_server/ui.rb:544
-msgid "<p>Leave the field empty to specify all hosts.</p>"
-msgstr "<p>Leave the field empty to specify all hosts.</p>"
-
 #. Help, part 4 of 4
-#: src/include/nfs_server/ui.rb:551
+#: src/include/nfs_server/ui.rb:509
 msgid "<P>Refer to <tt>man exports</tt> for more information.</P>\n"
 msgstr "<P>Refer to <tt>man exports</tt> for more information.</P>\n"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:567
+#: src/include/nfs_server/ui.rb:524
 msgid "Add &Directory"
 msgstr "Add &Directory"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:569
+#: src/include/nfs_server/ui.rb:526
 msgid "&Edit"
 msgstr "&Edit"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:571
+#: src/include/nfs_server/ui.rb:528
 msgid "De&lete"
 msgstr "De&lete"
 
 #. table header
-#: src/include/nfs_server/ui.rb:584
+#: src/include/nfs_server/ui.rb:541
 msgid "Host Wild Card"
 msgstr "Host Wild Card"
 
 #. table header
-#: src/include/nfs_server/ui.rb:586
+#: src/include/nfs_server/ui.rb:543
 msgid "Options"
 msgstr "Options"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:597
+#: src/include/nfs_server/ui.rb:554
 msgid "Add &Host"
 msgstr "Add &Host"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:599
+#: src/include/nfs_server/ui.rb:556
 msgid "Ed&it"
 msgstr "Ed&it"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:601
+#: src/include/nfs_server/ui.rb:558
 msgid "Dele&te"
 msgstr "Dele&te"
 
 #. dialog title
-#: src/include/nfs_server/ui.rb:608
+#: src/include/nfs_server/ui.rb:565
 msgid "Directories to Export"
 msgstr "Directories to Export"
 
 #. not fatal - write other dirs.
-#: src/modules/NfsServer.rb:182
+#: src/modules/NfsServer.rb:158
 msgid ""
 "Unable to create a missing directory:\n"
 "%1"
@@ -438,7 +422,7 @@
 "%1"
 
 #. error popup message
-#: src/modules/NfsServer.rb:194
+#: src/modules/NfsServer.rb:170
 msgid ""
 "Unable to write to /etc/exports.\n"
 "No changes will be made to the\n"
@@ -449,81 +433,63 @@
 "exported directories.\n"
 
 #. dialog label
-#: src/modules/NfsServer.rb:216
+#: src/modules/NfsServer.rb:192
 msgid "Writing NFS Server Configuration"
 msgstr "Writing NFS Server Configuration"
 
 #. progress stage label
-#: src/modules/NfsServer.rb:221
+#: src/modules/NfsServer.rb:197
 msgid "Save /etc/exports"
 msgstr "Save /etc/exports"
 
 #. progress stage label
-#: src/modules/NfsServer.rb:223
+#: src/modules/NfsServer.rb:199
 msgid "Restart services"
 msgstr "Restart services"
 
 #. progress step label
-#: src/modules/NfsServer.rb:227
+#: src/modules/NfsServer.rb:203
 msgid "Saving /etc/exports..."
 msgstr "Saving /etc/exports..."
 
 #. progress step label
-#: src/modules/NfsServer.rb:229
+#: src/modules/NfsServer.rb:205
 msgid "Restarting services..."
 msgstr "Restarting services..."
 
 #. final progress step label
-#: src/modules/NfsServer.rb:231
+#: src/modules/NfsServer.rb:207
 msgid "Finished"
 msgstr "Finished"
 
 #. help text
-#: src/modules/NfsServer.rb:239
+#: src/modules/NfsServer.rb:215
 msgid "Writing NFS server settings. Please wait..."
 msgstr "Writing NFS server settings. Please wait..."
 
 #. Independent of @ref start because of Heartbeat (#27001).
-#: src/modules/NfsServer.rb:253
+#: src/modules/NfsServer.rb:229
 msgid "Unable to write to idmapd.conf."
 msgstr "Unable to write to idmapd.conf."
 
-#: src/modules/NfsServer.rb:302
-#, fuzzy
-#| msgid "Unable to start idmapd. Please check your domain setting."
-msgid "Unable to start idmapd. Check your domain setting."
-msgstr "Unable to start idmapd. Please check your domain setting."
-
-#: src/modules/NfsServer.rb:308
-#, fuzzy
-#| msgid "Unable to restart idmapd"
-msgid "Unable to restart idmapd."
-msgstr "Unable to restart idmapd"
-
-#: src/modules/NfsServer.rb:315
-#, fuzzy
-#| msgid "Unable to stop idmapd"
-msgid "Unable to stop idmapd."
-msgstr "Unable to stop idmapd"
-
 #. FIXME svcgssd is gone! (only nfsserver is left)
-#: src/modules/NfsServer.rb:326
+#: src/modules/NfsServer.rb:266
 #, fuzzy
 msgid "Unable to start svcgssd. Ensure your kerberos and gssapi (nfs-utils) setup is correct."
 msgstr "Unable to start svcgssd. Please ensure your kerberos and gssapi (nfs-utils) set up is fine."
 
-#: src/modules/NfsServer.rb:335
+#: src/modules/NfsServer.rb:275
 #, fuzzy
 #| msgid "Unable to restart idmapd"
 msgid "Unable to restart 'svcgssd' service."
 msgstr "Unable to restart idmapd"
 
-#: src/modules/NfsServer.rb:343
+#: src/modules/NfsServer.rb:283
 msgid "'svcgssd' is running. Unable to stop it."
 msgstr "'svcgssd' is running. Unable to stop it."
 
 #. error popup message
-#: src/modules/NfsServer.rb:361
+#: src/modules/NfsServer.rb:299
 msgid ""
 "Unable to restart the NFS server.\n"
 "Your changes will be active after reboot.\n"
@@ -532,16 +498,43 @@
 "Your changes will be active after reboot.\n"
 
 #. summary header; directories exported by NFS
-#: src/modules/NfsServer.rb:384
+#: src/modules/NfsServer.rb:322
 msgid "NFS Exports"
 msgstr "NFS Exports"
 
 #. add information reg NFSv4 support, domain and security
-#: src/modules/NfsServer.rb:402
+#: src/modules/NfsServer.rb:340
 #, fuzzy
 msgid "The NFSv4 domain for idmapping is %1."
 msgstr "And the NFSv4 domain for idmapping is %1."
 
+#~ msgid ""
+#~ "The user mode NFS server (%1) cannot export directories\n"
+#~ "with spaces in their names.\n"
+#~ "Use the kernel-based server (%2) to do that."
+#~ msgstr ""
+#~ "The user mode NFS server (%1) cannot export directories\n"
+#~ "with spaces in their names.\n"
+#~ "Use the kernel-based server (%2) to do that."
+
+#~ msgid "<p>Leave the field empty to specify all hosts.</p>"
+#~ msgstr "<p>Leave the field empty to specify all hosts.</p>"
+
+#, fuzzy
+#~| msgid "Unable to start idmapd. Please check your domain setting."
+#~ msgid "Unable to start idmapd. Check your domain setting."
+#~ msgstr "Unable to start idmapd. Please check your domain setting."
+
+#, fuzzy
+#~| msgid "Unable to restart idmapd"
+#~ msgid "Unable to restart idmapd."
+#~ msgstr "Unable to restart idmapd"
+
+#, fuzzy
+#~| msgid "Unable to stop idmapd"
+#~ msgid "Unable to stop idmapd."
+#~ msgstr "Unable to stop idmapd"
+
 #~ msgid "'svcgssd' is already running. Unable to restart it."
 #~ msgstr "'svcgssd' is already running. Unable to restart it."
 

Modified: trunk/yast/en_GB/po/nis.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/nis.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/nis.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: yast2 9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:56+0100\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2004-03-18 11:36+0100\n"
 "Last-Translator: proofreader\n"
 "Language-Team: en_US\n"

Modified: trunk/yast/en_GB/po/nis_server.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/nis_server.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/nis_server.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:40+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2007-08-16 20:06+0100\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"
@@ -270,7 +270,7 @@
 
 #. To translators: checkbox label
 #. checkbox label
-#: src/include/nis_server/master.rb:150 src/include/nis_server/slave.rb:100
+#: src/include/nis_server/master.rb:150 src/include/nis_server/slave.rb:98
 msgid "This host is also a NIS &client"
 msgstr "This host is also a NIS &client"
 
@@ -403,23 +403,31 @@
 msgstr "NIS Server Query Hosts Setup"
 
 #. help text 1/2
-#: src/include/nis_server/slave.rb:64
+#: src/include/nis_server/slave.rb:62
 msgid "<p>Enter the NIS <b>domain</b> and the IP <b>address</b> or host name of the master NIS server.</p>"
 msgstr "<p>Enter the NIS <b>domain</b> and the IP <b>address</b> or host name of the master NIS server.</p>"
 
 #. help text 2/2
-#: src/include/nis_server/slave.rb:71
+#: src/include/nis_server/slave.rb:69
 msgid "<p>If this host is also a NIS client using this machine as a server, check the corresponding option.</p>"
 msgstr "<p>If this host is also a NIS client using this machine as a server, check the corresponding option.</p>"
 
 #. textentry label
-#: src/include/nis_server/slave.rb:84
+#: src/include/nis_server/slave.rb:82
 #, fuzzy
-msgid "N&IS domain name:"
-msgstr "NIS &domain name:"
+#| msgid "NIS &Domain Name"
+msgid "N&IS Domain Name:"
+msgstr "NIS &Domain Name"
 
+#. text entry label
+#: src/include/nis_server/slave.rb:90
+#, fuzzy
+#| msgid "NIS Master Server: "
+msgid "NIS &Master Server:"
+msgstr "NIS Master Server: "
+
 #. To translators: dialog label
-#: src/include/nis_server/slave.rb:111
+#: src/include/nis_server/slave.rb:109
 msgid "Slave Server Setup"
 msgstr "Slave Server Setup"
 
@@ -890,6 +898,10 @@
 msgid "Stopping NIS client."
 msgstr "Stopping NIS client."
 
+#, fuzzy
+#~ msgid "N&IS domain name:"
+#~ msgstr "NIS &domain name:"
+
 #~ msgid "NIS &master server:"
 #~ msgstr "NIS &master server:"
 

Modified: trunk/yast/en_GB/po/ntp-client.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/ntp-client.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/ntp-client.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: yast2 9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-09-03 16:51+0200\n"
 "PO-Revision-Date: 2007-08-16 20:07+0100\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"
@@ -51,25 +51,24 @@
 msgstr "Invalid server name."
 
 #. combo box label
-#: src/clients/ntp-client_proposal.rb:239
+#: src/clients/ntp-client_proposal.rb:240
 #, fuzzy
 msgid "&NTP Server Address"
 msgstr "NTP Server Address"
 
 #. check box label
-#: src/clients/ntp-client_proposal.rb:249
+#: src/clients/ntp-client_proposal.rb:250
 #, fuzzy
 #| msgid "NTP daemon"
 msgid "&Run NTP as daemon"
 msgstr "NTP daemon"
 
 #. check box label
-#: src/clients/ntp-client_proposal.rb:258
+#: src/clients/ntp-client_proposal.rb:259
 #, fuzzy
 msgid "&Save NTP Configuration"
 msgstr "NTP Configuration"
 
-#. try to line up the widgets horizontally
 #. push button label
 #: src/clients/ntp-client_proposal.rb:269
 #, fuzzy
@@ -83,7 +82,7 @@
 msgstr "&Configure..."
 
 #. Otherwise, prompt user for confirming pkg installation
-#: src/clients/ntp-client_proposal.rb:388
+#: src/clients/ntp-client_proposal.rb:386
 #, fuzzy
 msgid ""
 "Synchronization with NTP server is not possible\n"
@@ -93,15 +92,25 @@
 "without having package %1 installed."
 
 #. Only if network is running try to synchronize the ntp server
-#: src/clients/ntp-client_proposal.rb:399
+#: src/clients/ntp-client_proposal.rb:398
 #, fuzzy
 msgid "Synchronizing with NTP server..."
 msgstr "Synchronise with NTP Server"
 
+#. update time widgets
+#: src/clients/ntp-client_proposal.rb:443
+#, fuzzy
+#| msgid "Connection to the LDAP server cannot be established."
+msgid "Connection to selected NTP server failed."
+msgstr "Connection to the LDAP server cannot be established."
+
 #. Translators: yes-no popup,
 #. ntpdate is a command, %1 is the server address
-#: src/clients/ntp-client_proposal.rb:481
-msgid "'Test query to server '%1' failed. If server is not yet accessible or network is not configured click 'No' to ignore. Revisit NTP server configuration?"
+#: src/clients/ntp-client_proposal.rb:474
+msgid ""
+"Test query to server '%1' failed.\n"
+"If server is not yet accessible or network is not configured\n"
+"click 'No' to ignore. Revisit NTP server configuration?"
 msgstr ""
 
 #. local clock type name
@@ -613,6 +622,9 @@
 "Select whether to start the NTP daemon now and on every system boot. \n"
 "The NTP daemon resolves host names when initializing. Your\n"
 "network connection must be started before the NTP daemon starts.</p>\n"
+"Selecting <b>Synchronize without Daemon</b> the ntp daemon will not be activated. \n"
+"The system time will be set periodically. The interval is configurable. It is 15 minutes by default.\n"
+" You can change this when the system was set up."
 msgstr ""
 "<p><b><big>Automatically Start NTP Daemon</big></b><br>\n"
 "Select whether to start the NTP daemon when booting the system. The\n"
@@ -620,7 +632,7 @@
 "network connection must be started before the NTP daemon starts.</p>"
 
 #. help text 2/5
-#: src/include/ntp-client/helps.rb:42
+#: src/include/ntp-client/helps.rb:45
 msgid ""
 "<p><b><big>Chroot Jail</big></b><br>\n"
 "To run the NTP daemon in chroot jail, set\n"
@@ -632,7 +644,7 @@
 "<b>Run NTP Daemon in Chroot Jail</b>. Starting any daemon in a chroot jail\n"
 "is more secure and strongly recommended.</p>"
 
-#: src/include/ntp-client/helps.rb:48
+#: src/include/ntp-client/helps.rb:51
 #, fuzzy
 msgid ""
 "<p><b><big>Secure NTP Configuration</big></b><br>\n"
@@ -650,7 +662,7 @@
 "configured via DHCP.</p>"
 
 #. help text 3/5
-#: src/include/ntp-client/helps.rb:55
+#: src/include/ntp-client/helps.rb:58
 msgid ""
 "<p><b><big>Configuring via DHCP</big></b><br>\n"
 "To retrieve the information about NTP servers via the DHCP protocol from\n"
@@ -665,7 +677,7 @@
 "the information about NTP servers is provided by the DHCP server.</p>"
 
 #. help text 4/5
-#: src/include/ntp-client/helps.rb:63
+#: src/include/ntp-client/helps.rb:66
 msgid ""
 "<p><b><big>Configured Servers</big></b><br>\n"
 "To adjust NTP servers, peers, local clocks, and NTP broadcasting,\n"
@@ -680,7 +692,7 @@
 "select it and click <b>Delete</b>.</p>"
 
 #. help text 5/5
-#: src/include/ntp-client/helps.rb:71
+#: src/include/ntp-client/helps.rb:74
 #, fuzzy
 msgid ""
 "<p><b><big>Display Log</big></b></p>\n"
@@ -690,7 +702,7 @@
 "To view the logs of NTP daemon in new window, click on <b>Display Log</b> button.</p>"
 
 #. help text to a button
-#: src/include/ntp-client/helps.rb:75
+#: src/include/ntp-client/helps.rb:78
 msgid ""
 "<p><b><big>Advanced configuration</big></b><br>\n"
 "To configure this host to synchronize against multiple remote hosts or against\n"
@@ -701,7 +713,7 @@
 "a locally connected clock, use <b>Advanced Configuration</b>."
 
 #. help text 1/4
-#: src/include/ntp-client/helps.rb:81
+#: src/include/ntp-client/helps.rb:84
 msgid ""
 "<p><b><big>Clock Type</big></b><br>\n"
 "Select the driver for the clock to configure.</p>"
@@ -710,7 +722,7 @@
 "Select the driver for the clock to configure.</p>"
 
 #. help text 2/4
-#: src/include/ntp-client/helps.rb:85
+#: src/include/ntp-client/helps.rb:88
 msgid ""
 "<p><b><big>Unit Number</big></b><br>\n"
 "If you have multiple clocks of the same type, you must set\n"
@@ -721,7 +733,7 @@
 "<b>Unit Number</b>.</p>"
 
 #. help text 3/4
-#: src/include/ntp-client/helps.rb:91
+#: src/include/ntp-client/helps.rb:94
 msgid ""
 "<p><b><big>Device</big></b><br>\n"
 "To make the clock work, it may be necessary to create a special symbolic link to \n"
@@ -740,7 +752,7 @@
 "it must be created manually.</p>"
 
 #. help text 4/4
-#: src/include/ntp-client/helps.rb:101
+#: src/include/ntp-client/helps.rb:104
 msgid ""
 "<p><b><big>Driver Calibration</big></b><br>\n"
 "To calibrate the clock driver, click <b>Driver Calibration</b>.</p>"
@@ -749,7 +761,7 @@
 "To calibrate the clock driver, click <b>Driver Calibration</b>.</p>"
 
 #. help text 1/1, alt. 1 part 1/3
-#: src/include/ntp-client/helps.rb:105
+#: src/include/ntp-client/helps.rb:108
 msgid ""
 "<p><b><big>Address of the NTP Server</big></b><br>\n"
 "To set the address of the NTP server, use the <b>Address</b> entry.\n"
@@ -762,7 +774,7 @@
 "provider.</p>"
 
 #. help text 1/1, alt. 1 part 2/3
-#: src/include/ntp-client/helps.rb:112
+#: src/include/ntp-client/helps.rb:115
 msgid ""
 "<p><b><big>Selecting a Server</big></b><br>\n"
 "To select an NTP server from those found in the local network\n"
@@ -775,7 +787,7 @@
 "choose between <b>Local NTP Server</b> and <b>Public NTP Server</b>.</p>"
 
 #. help text 1/1, alt. 1 part 3/3
-#: src/include/ntp-client/helps.rb:119
+#: src/include/ntp-client/helps.rb:122
 msgid ""
 "<p><b><big>Testing Server Accessibility</big></b><br>\n"
 "To test if the selected server is up and responds properly,\n"
@@ -786,7 +798,7 @@
 "click <b>Test</b>.</p>"
 
 #. help text 1/1, alt. 2
-#: src/include/ntp-client/helps.rb:125
+#: src/include/ntp-client/helps.rb:128
 msgid ""
 "<p><b><big>Address</big></b><br>\n"
 "To set the address of the host with which to synchronize mutually,\n"
@@ -797,7 +809,7 @@
 "use <b>Address</b>.</p>"
 
 #. help text 1/1, alt. 3
-#: src/include/ntp-client/helps.rb:131
+#: src/include/ntp-client/helps.rb:134
 msgid ""
 "<p><b><big>Address</big></b><br>\n"
 "To set the address to which to broadcast, use the <b>Address</b>\n"
@@ -808,7 +820,7 @@
 "text field.</p>"
 
 #. help text 1/1, alt. 4
-#: src/include/ntp-client/helps.rb:137
+#: src/include/ntp-client/helps.rb:140
 msgid ""
 "<p><b><big>Address</big></b><br>\n"
 "To set the address from which to accept broadcast packets, use \n"
@@ -820,7 +832,7 @@
 
 #. help text 2/4, was removed
 #. help text 3/4, optional
-#: src/include/ntp-client/helps.rb:145
+#: src/include/ntp-client/helps.rb:148
 #, fuzzy
 msgid ""
 "<p><b><big>Options</big></b><br>\n"
@@ -833,7 +845,7 @@
 "<b>Options</b> text field. For details, see\n"
 "<i>/usr/share/doc/packages/xntp-doc/html/confopt.htm</i>.</p>"
 
-#: src/include/ntp-client/helps.rb:151
+#: src/include/ntp-client/helps.rb:154
 #, fuzzy
 msgid ""
 "<p><b><big>Access Control Options</big></b><br>\n"
@@ -853,7 +865,7 @@
 "<b>Security Settings</b>.</p>\n"
 
 #. help text 1/6
-#: src/include/ntp-client/helps.rb:161
+#: src/include/ntp-client/helps.rb:164
 msgid ""
 "<p><b><big>Synchronization Peer Type</big></b><br>\n"
 "Select the kind of synchronization peer to add here.</p>"
@@ -862,7 +874,7 @@
 "Select the kind of synchronization peer to add here.</p>"
 
 #. help text 2/6
-#: src/include/ntp-client/helps.rb:165
+#: src/include/ntp-client/helps.rb:168
 msgid ""
 "<p>To add an NTP server to which to synchronize,\n"
 "select <b>Server</b>.</p>"
@@ -871,7 +883,7 @@
 "select <b>Server</b>.</p>"
 
 #. help text 3/6
-#: src/include/ntp-client/helps.rb:169
+#: src/include/ntp-client/helps.rb:172
 msgid ""
 "<p>To add an NTP peer to synchronize mutually, select\n"
 "<b>Peer</b>.</p>"
@@ -880,7 +892,7 @@
 "<b>Peer</b>.</p>"
 
 #. help text 4/6
-#: src/include/ntp-client/helps.rb:173
+#: src/include/ntp-client/helps.rb:176
 msgid ""
 "<p>To configure a local clock connected directly to your computer,\n"
 "select <b>Radio Clock</b>.</p>"
@@ -889,7 +901,7 @@
 "select <b>Radio Clock</b>.</p>"
 
 #. help text 5/6
-#: src/include/ntp-client/helps.rb:177
+#: src/include/ntp-client/helps.rb:180
 msgid ""
 "<p>To broadcast time information through your network, select\n"
 "<b>Outgoing Broadcast</b>.</p>"
@@ -898,7 +910,7 @@
 "<b>Outgoing Broadcast</b>.</p>"
 
 #. help text 6/6
-#: src/include/ntp-client/helps.rb:181
+#: src/include/ntp-client/helps.rb:184
 msgid ""
 "<p>To accept NTP packets broadcasted by other hosts on the network\n"
 "and use them for setting local time, select <b>Incoming Broadcast<b>.</p>"
@@ -907,7 +919,7 @@
 "and use them for setting local time, select <b>Incoming Broadcast<b>.</p>"
 
 #. help text 1/5
-#: src/include/ntp-client/helps.rb:185
+#: src/include/ntp-client/helps.rb:188
 msgid ""
 "<p><big><b>Server Location</b></big>\n"
 "Select if you want to find the NTP server in the local network or select\n"
@@ -918,7 +930,7 @@
 "the NTP server from the list of known NTP servers.</p>"
 
 #. help text 2/5
-#: src/include/ntp-client/helps.rb:191
+#: src/include/ntp-client/helps.rb:194
 msgid ""
 "<p><big><b>Finding Server in the Local\n"
 "Network</b></big><br>\n"
@@ -933,7 +945,7 @@
 "Then select a server from the list of found servers.</p>"
 
 #. help text 3/5
-#: src/include/ntp-client/helps.rb:199
+#: src/include/ntp-client/helps.rb:202
 msgid ""
 "<p><big><b>Selecting a Public NTP Server</b></big><br>\n"
 "Select the NTP server to use from the <b>Public NTP Servers</b> list. To display\n"
@@ -944,7 +956,7 @@
 "NTP servers only for a particular country, select it in <b>Country</b>.</p>"
 
 #. help text 4/5
-#: src/include/ntp-client/helps.rb:205
+#: src/include/ntp-client/helps.rb:208
 msgid ""
 "<p><big><b>Note</b></big><br>\n"
 "The listed NTP servers may not be available from any country, but only\n"
@@ -965,7 +977,7 @@
 "to find an NTP server near you.</p>"
 
 #. help text 5/5
-#: src/include/ntp-client/helps.rb:216
+#: src/include/ntp-client/helps.rb:219
 msgid ""
 "<p><big><b>Testing Server Accessibility</b></big><br>\n"
 "To test if the selected server responds properly, click <b>Test</b>.</p>"
@@ -975,7 +987,7 @@
 
 #. help text connected with checkbox: "Use Random Server from pool.ntp.org"
 #. rwalter, please, correct it ;)
-#: src/include/ntp-client/helps.rb:221
+#: src/include/ntp-client/helps.rb:224
 msgid ""
 "<p><big><b>Use Random Servers</b></big><br>\n"
 "This service is offered by pool.ntp.org. If you select this option,\n"
@@ -990,7 +1002,7 @@
 "your NTP client is synchronized with different servers every hour.</p>\n"
 
 #. help text 1/2
-#: src/include/ntp-client/helps.rb:235
+#: src/include/ntp-client/helps.rb:238
 msgid ""
 "<p><big><b>Clock Driver Calibration</b></big><br>\n"
 "The clock driver may need to be calibrated. In this dialog, various calibration\n"
@@ -1003,7 +1015,7 @@
 "driver. Some drivers do not use all the options.</p>"
 
 #. help text 2/2
-#: src/include/ntp-client/helps.rb:242
+#: src/include/ntp-client/helps.rb:245
 #, fuzzy
 msgid ""
 "To learn more about available options, install the package\n"
@@ -1367,121 +1379,124 @@
 msgstr "Reading NTP settings..."
 
 #. progress step
-#. error report
+#. While calling "yast clone_system" it is possible that
+#. the ntp server has not already been installed at that time.
+#. (This would be done if yast2-ntp-client will be called in the UI)
+#. In that case the error popup will not be shown. (bnc#889557)
 #. progress step
-#: src/modules/NtpClient.rb:502 src/modules/NtpClient.rb:594
-#: src/modules/NtpClient.rb:755 src/modules/NtpClient.rb:906
+#: src/modules/NtpClient.rb:502 src/modules/NtpClient.rb:597
+#: src/modules/NtpClient.rb:758 src/modules/NtpClient.rb:909
 msgid "Finished"
 msgstr "Finished"
 
 #. boolean update_dhcp = original_config_dhcp != config_dhcp;
 #. NtpClient read dialog caption
-#: src/modules/NtpClient.rb:728
+#: src/modules/NtpClient.rb:731
 msgid "Saving NTP Client Configuration"
 msgstr "Saving NTP Client Configuration"
 
 #. progress stage
-#: src/modules/NtpClient.rb:745
+#: src/modules/NtpClient.rb:748
 msgid "Write NTP settings"
 msgstr "Write NTP settings"
 
 #. progress stage
-#: src/modules/NtpClient.rb:747
+#: src/modules/NtpClient.rb:750
 msgid "Restart NTP daemon"
 msgstr "Restart NTP daemon"
 
 #. progress step
-#: src/modules/NtpClient.rb:751
+#: src/modules/NtpClient.rb:754
 msgid "Writing the settings..."
 msgstr "Writing the settings..."
 
 #. progress step
-#: src/modules/NtpClient.rb:753
+#: src/modules/NtpClient.rb:756
 msgid "Restarting NTP daemon..."
 msgstr "Restarting NTP daemon..."
 
 #. error message
-#: src/modules/NtpClient.rb:838
+#: src/modules/NtpClient.rb:841
 #, fuzzy
 msgid "Cannot update the dynamic configuration policy."
 msgstr "Cannot update the configuration of the virtual machine."
 
 #. error report
-#: src/modules/NtpClient.rb:876
+#: src/modules/NtpClient.rb:879
 msgid "Cannot restart the NTP daemon."
 msgstr "Cannot restart the NTP daemon."
 
 #. summary string
-#: src/modules/NtpClient.rb:970
+#: src/modules/NtpClient.rb:973
 msgid "The NTP daemon starts when starting the system."
 msgstr "The NTP daemon starts when starting the system."
 
 #. summary string
-#: src/modules/NtpClient.rb:976
+#: src/modules/NtpClient.rb:979
 msgid "The NTP daemon does not start automatically."
 msgstr "The NTP daemon does not start automatically."
 
 #. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:982
+#: src/modules/NtpClient.rb:985
 msgid "Servers: %1"
 msgstr "Servers: %1"
 
 #. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:986
+#: src/modules/NtpClient.rb:989
 msgid "Radio Clocks: %1"
 msgstr "Radio Clocks: %1"
 
 #. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:990
+#: src/modules/NtpClient.rb:993
 msgid "Peers: %1"
 msgstr "Peers: %1"
 
 #. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:994
+#: src/modules/NtpClient.rb:997
 msgid "Broadcast time information to: %1"
 msgstr "Broadcast time information to: %1"
 
 #. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:998
+#: src/modules/NtpClient.rb:1001
 msgid "Accept broadcasted time information from: %1"
 msgstr "Accept broadcasted time information from: %1"
 
 #. summary string, FIXME
-#: src/modules/NtpClient.rb:1014
+#: src/modules/NtpClient.rb:1017
 #, fuzzy
 msgid "Combine static and DHCP configuration."
 msgstr "Write hostname and DNS configuration"
 
 #. summary string, FIXME
-#: src/modules/NtpClient.rb:1018
+#: src/modules/NtpClient.rb:1021
 #, fuzzy
 msgid "Static configuration only."
 msgstr "Static Configuration Files"
 
 #. summary string, FIXME
-#: src/modules/NtpClient.rb:1021
+#: src/modules/NtpClient.rb:1024
 #, fuzzy
 msgid "Custom configuration policy."
 msgstr "Modem configuration overview"
 
 #. An informative popup label diring the NTP server testings
-#: src/modules/NtpClient.rb:1054
+#: src/modules/NtpClient.rb:1057
 msgid "Testing the NTP server..."
 msgstr "Testing the NTP server..."
 
 #. message report - result of test of connection to NTP server
-#: src/modules/NtpClient.rb:1084
+#: src/modules/NtpClient.rb:1087
 msgid "Server is reachable and responds properly."
 msgstr "Server is reachable and responds properly."
 
 #. error message  - result of test of connection to NTP server
 #. report error instead of simple message (#306018)
-#: src/modules/NtpClient.rb:1088
+#: src/modules/NtpClient.rb:1091
 msgid "Server is unreachable or does not respond properly."
 msgstr "Server is unreachable or does not respond properly."
 
 #. if package is not installed (in the inst-sys, it is: bnc#399659)
-#: src/modules/NtpClient.rb:1106
+#: src/modules/NtpClient.rb:1109
 #, fuzzy
 #| msgid ""
 #| "Cannot search for NTP server in local network\n"

Modified: trunk/yast/en_GB/po/oneclickinstall.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/oneclickinstall.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/oneclickinstall.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\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"

Modified: trunk/yast/en_GB/po/online-update-configuration.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/online-update-configuration.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/online-update-configuration.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:56+0100\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\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"

Modified: trunk/yast/en_GB/po/online-update.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/online-update.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/online-update.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: yast2 9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2007-08-16 20:11+0100\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"
@@ -117,13 +117,20 @@
 msgid "Initializing Online Update"
 msgstr "Initialising Online Update"
 
-#. yes/no message
-#: src/clients/online_update.rb:204
+#. yes/no question
+#: src/clients/online_update.rb:209
 msgid ""
 "No update repository\n"
 "configured yet. Run configuration workflow now?"
 msgstr ""
 
+#. error message
+#: src/clients/online_update.rb:222
+#, fuzzy
+#| msgid "Not configured yet."
+msgid "No update repository configured yet."
+msgstr "Not configured yet."
+
 #. progress window label
 #: src/clients/online_update_install.rb:49
 msgid "Progress Log"

Added: trunk/yast/en_GB/po/opensuse_mirror.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/opensuse_mirror.en_GB.po	                        (rev 0)
+++ trunk/yast/en_GB/po/opensuse_mirror.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -0,0 +1,72 @@
+# English message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 2000, 2001 SuSE GmbH.
+# James Ogley <ogley@suse.co.uk>, 2000, 2001.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\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"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 of the GNU General
+#. Public License as published by the Free Software Foundation.
+#. This program is distributed in the hope that it will be useful,
+#. but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.   See the
+#. GNU General Public License for more details.
+#. You should have received a copy of the GNU General Public License
+#. along with this program; if not, contact SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/opensuse_mirror/main_dialog.rb:119
+msgid "Directory"
+msgstr "Directory"
+
+#: src/lib/opensuse_mirror/main_dialog.rb:119
+#, fuzzy
+#| msgid "Error"
+msgid "Mirrored"
+msgstr "Error"
+
+#: src/lib/opensuse_mirror/main_dialog.rb:129
+msgid "yes"
+msgstr "yes"
+
+#: src/lib/opensuse_mirror/main_dialog.rb:129
+msgid "no"
+msgstr "no"
+
+#: src/lib/opensuse_mirror/main_dialog.rb:139
+#, fuzzy
+#| msgid "Exit"
+msgid "&Exit"
+msgstr "Exit"
+
+#: src/lib/opensuse_mirror/main_dialog.rb:144
+#, fuzzy
+#| msgid "Error"
+msgid "&Mirror"
+msgstr "Error"
+
+#: src/lib/opensuse_mirror/main_dialog.rb:145
+msgid "&Do not Mirror"
+msgstr ""
+
+#: src/lib/opensuse_mirror/main_dialog.rb:146
+#, fuzzy
+#| msgid "Select or Deselect &All"
+msgid "Select/Deselect &All"
+msgstr "Select or Deselect &All"

Modified: trunk/yast/en_GB/po/packager.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/packager.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/packager.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: yast2 9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-08-15 15:57+0200\n"
 "PO-Revision-Date: 2007-08-16 20:13+0100\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"
@@ -176,6 +176,15 @@
 msgid "&Text Mode"
 msgstr "&Text Mode"
 
+#. an error popup
+#. 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
+msgid "Backup of %1 failed. See %2 for details."
+msgstr "Backup of %1 failed. See %2 for details."
+
 #. dialog heading
 #: src/clients/inst_mediacopy.rb:49
 msgid "Copy Installation Media"
@@ -546,7 +555,7 @@
 #. dialog caption
 #. dialog caption
 #: src/clients/key_manager.rb:70 src/clients/repositories.rb:1809
-#: src/modules/AddOnProduct.rb:668
+#: src/modules/AddOnProduct.rb:683
 msgid "Initializing..."
 msgstr "Initialising..."
 
@@ -613,7 +622,7 @@
 
 #. label to be used instead of URL if not found
 #: src/clients/repositories.rb:328 src/clients/repositories.rb:361
-#: src/modules/AddOnProduct.rb:1308
+#: src/modules/AddOnProduct.rb:1325
 msgid "URL: %1"
 msgstr "URL: %1"
 
@@ -871,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:1200
+#: src/clients/repositories.rb:1011 src/modules/Packages.rb:1326
 #: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310
 msgid "Details:"
 msgstr "Details:"
@@ -879,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:1208
+#: src/clients/repositories.rb:1013 src/modules/Packages.rb:1334
 #: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312
 msgid "Try again?"
 msgstr "Try again?"
@@ -1300,7 +1309,7 @@
 msgid "&Start Check"
 msgstr "&Start Check"
 
-#: src/include/checkmedia/ui.rb:361 src/modules/SourceManager.rb:694
+#: src/include/checkmedia/ui.rb:361 src/modules/SourceManager.rb:684
 msgid "&Eject"
 msgstr "&Eject"
 
@@ -1567,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:1195 src/modules/SourceManager.rb:306
+#: src/modules/Packages.rb:1321 src/modules/SourceManager.rb:306
 #, fuzzy
 msgid ""
 "Unable to create repository\n"
@@ -1606,84 +1615,84 @@
 #. error report
 #. popup error
 #. popup error
-#: src/modules/AddOnProduct.rb:502 src/modules/AddOnProduct.rb:604
-#: src/modules/ProductLicense.rb:582 src/modules/ProductLicense.rb:773
+#: src/modules/AddOnProduct.rb:517 src/modules/AddOnProduct.rb:619
+#: src/modules/ProductLicense.rb:538 src/modules/ProductLicense.rb:729
 #, fuzzy
 msgid "An error occurred while preparing the installation system."
 msgstr "An error occurred during the installation of"
 
 #. error report
-#: src/modules/AddOnProduct.rb:639
+#: src/modules/AddOnProduct.rb:654
 #, fuzzy
 msgid "Control file %1 not found on media."
 msgstr "Control file %1 was not found."
 
 #. TRANSLATORS: error report
 #. TRANSLATORS: error report
-#: src/modules/AddOnProduct.rb:1235 src/modules/AddOnProduct.rb:1399
+#: src/modules/AddOnProduct.rb:1252 src/modules/AddOnProduct.rb:1416
 #, fuzzy
 msgid "Unable to use additional products."
 msgstr "Insert the add-on product CD"
 
 #. fill up internal map (used later when item selected)
-#: src/modules/AddOnProduct.rb:1286 src/modules/AddOnProduct.rb:1292
+#: src/modules/AddOnProduct.rb:1303 src/modules/AddOnProduct.rb:1309
 #, fuzzy
 msgid "%1, URL: %2"
 msgstr "%1, %2"
 
-#: src/modules/AddOnProduct.rb:1302
+#: src/modules/AddOnProduct.rb:1319
 #, fuzzy
 msgid "URL: %1, Path: %2"
 msgstr "URL: %1, Directory: %2"
 
 #. TRANSLATORS: popup heading
-#: src/modules/AddOnProduct.rb:1333
+#: src/modules/AddOnProduct.rb:1350
 #, fuzzy
 msgid "Additional Products"
 msgstr "Additional &LDAP Groups"
 
 #. TRANSLATORS: additional dialog information
-#: src/modules/AddOnProduct.rb:1339
+#: src/modules/AddOnProduct.rb:1356
 msgid ""
 "The installation repository also contains the listed additional repositories.\n"
 "Select the ones you want to use.\n"
 msgstr ""
 
-#: src/modules/AddOnProduct.rb:1350
+#: src/modules/AddOnProduct.rb:1367
 #, fuzzy
 msgid "Additional Products to Select"
 msgstr "Additional Group Settings"
 
 #. push button label
-#: src/modules/AddOnProduct.rb:1357
+#: src/modules/AddOnProduct.rb:1374
 #, fuzzy
 msgid "Add Selected &Products"
 msgstr "Add-On Products"
 
 #. %1 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1488
+#: src/modules/AddOnProduct.rb:1505
 #, fuzzy
 #| msgid "Insert the add-on product CD"
 msgid "Insert the addon %1 medium"
 msgstr "Insert the add-on product CD"
 
 #. %1 is the product name, %2 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1493
+#: src/modules/AddOnProduct.rb:1510
 #, fuzzy
 #| msgid "Insert the first installation medium."
 msgid "Insert the %1 %2 medium"
 msgstr "Insert the first installation medium."
 
 #. TRANSLATORS: error message, %1 is replaced with product URL
-#: src/modules/AddOnProduct.rb:1545
+#: src/modules/AddOnProduct.rb:1562
 #, fuzzy
 msgid "Unable to add product %1."
 msgstr "Unable to write %1."
 
 #. adding the product to the list of products (BNC #269625)
 #. no such products
-#: src/modules/AddOnProduct.rb:1737 src/modules/AddOnProduct.rb:1743
-#: src/modules/Packages.rb:459
+#: src/modules/AddOnProduct.rb:1754 src/modules/AddOnProduct.rb:1760
+#: src/modules/Packages.rb:463
 msgid "Unknown Product"
 msgstr "Unknown Product"
 
@@ -1740,7 +1749,7 @@
 msgstr "Installation aborted."
 
 #. the string is follwed by a media number, e.g. "Medium 1"
-#: src/modules/PackageSlideShow.rb:35
+#: src/modules/PackageSlideShow.rb:50
 #, fuzzy
 #| msgid "Medium: %1"
 msgid "Medium %1"
@@ -1750,13 +1759,13 @@
 #. When data throughput goes downhill (stalled network connection etc.),
 #. cut off the predicted time at a reasonable maximum.
 #. "%1" is a predefined maximum time.
-#: src/modules/PackageSlideShow.rb:237
+#: src/modules/PackageSlideShow.rb:204
 msgid ">%1"
 msgstr ">%1"
 
 #. Nothing more to install from this CD (very concise - little space!!)
 #. Nothing more to install from this CD (very concise - little space!!)
-#: src/modules/PackageSlideShow.rb:255 src/modules/PackageSlideShow.rb:270
+#: src/modules/PackageSlideShow.rb:222 src/modules/PackageSlideShow.rb:237
 msgid "Done."
 msgstr "Done."
 
@@ -1764,7 +1773,7 @@
 #. %1: Media type ("CD" / "DVD", ???)
 #. %2: Media name ("SuSE Linux Professional CD 2" )
 #. %3: Time remaining until this media will be needed
-#: src/modules/PackageSlideShow.rb:295
+#: src/modules/PackageSlideShow.rb:262
 #, fuzzy
 #| msgid "Next %1: %2"
 msgid "Next: %1 -- %2"
@@ -1773,7 +1782,7 @@
 #. Status line informing about the next CD that will be used
 #. %1: Media type ("CD" / "DVD", ???)
 #. %2: Media name ("SuSE Linux Professional CD 2" )
-#: src/modules/PackageSlideShow.rb:312
+#: src/modules/PackageSlideShow.rb:279
 #, fuzzy
 #| msgid "Name: %1"
 msgid "Next: %1"
@@ -1782,7 +1791,7 @@
 #. Add "Total" item - at the top so it is visible by default even if there are many items
 #.
 #. List column header for total remaining MB and time to install
-#: src/modules/PackageSlideShow.rb:1042
+#: src/modules/PackageSlideShow.rb:924
 msgid "Total"
 msgstr "Total"
 
@@ -1791,13 +1800,13 @@
 #.
 #. message in the installatino log, %1 is package name,
 #. %2 is package size
-#: src/modules/PackageSlideShow.rb:1168 src/modules/PackageSlideShow.rb:1421
-#: src/modules/PackageSlideShow.rb:1473
+#: src/modules/PackageSlideShow.rb:1051 src/modules/PackageSlideShow.rb:1303
+#: src/modules/PackageSlideShow.rb:1355
 #, fuzzy
 msgid "Downloading %1 (download size %2)"
 msgstr "Downloading %1 (%2)"
 
-#: src/modules/PackageSlideShow.rb:1198
+#: src/modules/PackageSlideShow.rb:1081
 #, fuzzy
 msgid " (Remaining: %1%2 packages)"
 msgstr ""
@@ -1806,118 +1815,118 @@
 
 #. display download progress in DownloadInAdvance mode
 #. translations: progress message (part1)
-#: src/modules/PackageSlideShow.rb:1231
+#: src/modules/PackageSlideShow.rb:1114
 #, fuzzy
 #| msgid "Downloading Package"
 msgid "Downloading Packages..."
 msgstr "Downloading Package"
 
 #. progress message (part2)
-#: src/modules/PackageSlideShow.rb:1234
+#: src/modules/PackageSlideShow.rb:1117
 #, fuzzy
 msgid " (Downloaded %1 of %2 packages)"
 msgstr "Downloading Package"
 
 #. Heading for the progress bar for the current package
 #. while it is deleted. "%1" is the package name.
-#: src/modules/PackageSlideShow.rb:1371
+#: src/modules/PackageSlideShow.rb:1253
 msgid "Deleting %1"
 msgstr "Deleting %1"
 
 #. package installation - summary text
 #. %1 is RPM name, %2 is installed (unpacked) size (e.g. 6.20MB)
-#: src/modules/PackageSlideShow.rb:1378
+#: src/modules/PackageSlideShow.rb:1260
 #, fuzzy
 msgid "Installing %1 (installed size %2)"
 msgstr "Not installed (%1 -> %2)"
 
 #. message in the installatino log, %1 is package name,
 #. %2 is package size
-#: src/modules/PackageSlideShow.rb:1456
+#: src/modules/PackageSlideShow.rb:1338
 #, fuzzy
 msgid "Applying delta RPM: %1"
 msgstr "Applying delta"
 
 #. warning text
-#: src/modules/Packages.rb:299
+#: src/modules/Packages.rb:303
 #, 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:315
+#: src/modules/Packages.rb:319
 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:327
+#: src/modules/Packages.rb:331
 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:332
+#: src/modules/Packages.rb:336
 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:341
+#: src/modules/Packages.rb:345
 #, 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:358
+#: src/modules/Packages.rb:362
 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:372
+#: src/modules/Packages.rb:376
 #, fuzzy
 msgid "System Type: %1"
 msgstr "System: %1"
 
-#: src/modules/Packages.rb:383
+#: src/modules/Packages.rb:387
 #, 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:393
+#: src/modules/Packages.rb:397
 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:406
+#: src/modules/Packages.rb:410
 #, fuzzy
 msgid "Downloading from Remote Repositories: %1"
 msgstr "Download of Release Notes"
 
-#: src/modules/Packages.rb:468
+#: src/modules/Packages.rb:472
 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:492
+#: src/modules/Packages.rb:496
 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:496
+#: src/modules/Packages.rb:500
 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:537
+#: src/modules/Packages.rb:541
 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:557
+#: src/modules/Packages.rb:561
 #, fuzzy
 #| msgid ""
 #| "There is not enough free space in directory %1.\n"
@@ -1928,31 +1937,78 @@
 "Continue anyway?\n"
 
 #. summary warning
-#: src/modules/Packages.rb:600
+#: src/modules/Packages.rb:604
 #, fuzzy
 msgid "Not enough disk space."
 msgstr "more disk space."
 
 #. summary warning
-#: src/modules/Packages.rb:602
+#: src/modules/Packages.rb:606
 #, 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:623
+#: src/modules/Packages.rb:627
 #, 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
+#, 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
+#, 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
+msgid "Product <b>%{old_product}</b> will be updated to <b>%{new_product}</b>"
+msgstr ""
+
+#: src/modules/Packages.rb:715
+#, fuzzy
+#| msgid "Package %1 will be installed."
+msgid "Product <b>%s</b> will stay installed"
+msgstr "Package %1 will be installed."
+
+#. Removing another product might be an issue
+#. (just warn if removed by user or by YaST)
+#: src/modules/Packages.rb:725
+msgid "<b>Warning:</b> Product <b>%s</b> will be removed."
+msgstr ""
+
+#: src/modules/Packages.rb:726
+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
+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"
+"installation media</li><li>Or select the appropriate online extension or module\n"
+"in the registration step</li><li>Or to continue with product upgrade go to the\n"
+"software selection and mark the product (the -release package) for removal.\n"
+"</li></ul></li></ul>"
+msgstr ""
+
 #. error in proposal, %1 is URL
-#: src/modules/Packages.rb:1216
+#: src/modules/Packages.rb:1342
 #, 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:1489
+#: src/modules/Packages.rb:1615
 #, fuzzy
 #| msgid ""
 #| "<p><b>These are the release notes made for the first initial release. They are\n"
@@ -1970,29 +2026,29 @@
 "from the SUSE Linux Web server.</b></p>"
 
 #. popup - information label
-#: src/modules/Packages.rb:1516
+#: src/modules/Packages.rb:1642
 #, 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:1538
+#: src/modules/Packages.rb:1664
 #, fuzzy
 msgid "Failed to integrate the service pack repository."
 msgstr "Failed to integrate service pack source"
 
 #. popup - information label
-#: src/modules/Packages.rb:1571
+#: src/modules/Packages.rb:1697
 #, fuzzy
 msgid "Initializing repositories..."
 msgstr "Initialising fonts..."
 
 #. message popup, %1 is product name
-#: src/modules/Packages.rb:1803
+#: src/modules/Packages.rb:1929
 msgid "Insert %1 CD 1"
 msgstr "Insert %1 CD 1"
 
-#: src/modules/Packages.rb:1805
+#: src/modules/Packages.rb:1931
 #, fuzzy
 msgid "%1 CD 1 not found"
 msgstr ""
@@ -2000,7 +2056,7 @@
 "CA not found"
 
 #. an error message
-#: src/modules/Packages.rb:1915
+#: src/modules/Packages.rb:2041
 msgid ""
 "Error while initializing package descriptions.\n"
 "Check the log file %1 for more details."
@@ -2009,19 +2065,19 @@
 "Check the log file %1 for more details."
 
 #. bnc #436925
-#: src/modules/Packages.rb:2176
+#: src/modules/Packages.rb:2302
 msgid ""
 "The software selection has been changed externally.\n"
 "Software proposal will be called again."
 msgstr ""
 
 #. popup label
-#: src/modules/Packages.rb:2194
+#: src/modules/Packages.rb:2320
 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:2469
+#: src/modules/Packages.rb:2595
 msgid ""
 "Failed to select default product pattern %{pattern_name}.\n"
 "Pattern has not been found."
@@ -2030,42 +2086,44 @@
 #. Sets that the license (file) has been already accepted
 #.
 #. @param string filename
-#: src/modules/ProductLicense.rb:191 src/modules/ProductLicense.rb:198
+#: src/modules/ProductLicense.rb:148 src/modules/ProductLicense.rb:155
 #, fuzzy
 msgid "Cannot read license file %1"
 msgstr "Cannot read file %1"
 
-#: src/modules/ProductLicense.rb:192
+#: src/modules/ProductLicense.rb:149
 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:334
+#: src/modules/ProductLicense.rb:293
 msgid "&Language"
 msgstr "&Language"
 
-#. radio button
-#: src/modules/ProductLicense.rb:391
+#. check box label
+#: src/modules/ProductLicense.rb:345
 #, fuzzy
-msgid "&Yes, I Agree to the License Agreement"
+#| msgid "Yes, I Agree to the License Agreement"
+msgid "I &Agree to the License Terms."
 msgstr "Yes, I Agree to the License Agreement"
 
-#. radio button
-#: src/modules/ProductLicense.rb:399
-#, fuzzy
-msgid "N&o, I Do not Agree"
-msgstr "No, I Do Not Agree"
+#. %{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:439
+#: src/modules/ProductLicense.rb:391
 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:455
+#: src/modules/ProductLicense.rb:407
 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"
@@ -2075,34 +2133,34 @@
 "one of the available options. If you do not agree to the license agreement,\n"
 "the configuration will be aborted.</p>\n"
 
+#. dialog title
 #. dialog caption
-#. dialog caption
-#: src/modules/ProductLicense.rb:467 src/modules/ProductLicense.rb:1303
+#: src/modules/ProductLicense.rb:417 src/modules/ProductLicense.rb:1212
 msgid "License Agreement"
 msgstr "License Agreement"
 
 #. popup question
-#: src/modules/ProductLicense.rb:1096
+#: src/modules/ProductLicense.rb:1017
 #, 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:1116
+#: src/modules/ProductLicense.rb:1041
 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:1120
+#: src/modules/ProductLicense.rb:1044
 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:1137
+#: src/modules/ProductLicense.rb:1054
 #, fuzzy
 msgid "The system is shutting down..."
 msgstr "System is shutting down..."
@@ -2198,135 +2256,140 @@
 
 #. radio button
 #: src/modules/SourceDialogs.rb:34
+msgid "&Extensions and Modules from Registration Server..."
+msgstr ""
+
+#. radio button
+#: src/modules/SourceDialogs.rb:36
 msgid "Specify &URL..."
 msgstr "Specify &URL..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:36
+#: src/modules/SourceDialogs.rb:38
 msgid "&FTP..."
 msgstr "&FTP..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:38
+#: src/modules/SourceDialogs.rb:40
 msgid "&HTTP..."
 msgstr "&HTTP..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:40
+#: src/modules/SourceDialogs.rb:42
 msgid "HTT&PS..."
 msgstr "HTT&PS..."
 
 #. radio button
 #. radio button
-#: src/modules/SourceDialogs.rb:42 src/modules/SourceDialogs.rb:1711
+#: src/modules/SourceDialogs.rb:44 src/modules/SourceDialogs.rb:1719
 msgid "&SMB/CIFS"
 msgstr "&SMB/CIFS"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:44
+#: src/modules/SourceDialogs.rb:46
 msgid "&NFS..."
 msgstr "&NFS..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:46
+#: src/modules/SourceDialogs.rb:48
 msgid "&CD..."
 msgstr "&CD..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:48
+#: src/modules/SourceDialogs.rb:50
 msgid "&DVD..."
 msgstr "&DVD..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:50
+#: src/modules/SourceDialogs.rb:52
 #, fuzzy
 msgid "&Hard Disk..."
 msgstr "&Hard Disk"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:52
+#: src/modules/SourceDialogs.rb:54
 msgid "&USB Mass Storage (USB Stick, Disk)..."
 msgstr ""
 
 #. radio button
-#: src/modules/SourceDialogs.rb:54
+#: src/modules/SourceDialogs.rb:56
 msgid "&Local Directory..."
 msgstr "&Local Directory..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:56
+#: src/modules/SourceDialogs.rb:58
 #, fuzzy
 msgid "&Local ISO Image..."
 msgstr "Use &ISO Images"
 
 #. check box
-#: src/modules/SourceDialogs.rb:58
+#: src/modules/SourceDialogs.rb:60
 #, fuzzy
 msgid "&Download repository description files"
 msgstr "No Description"
 
 #. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:106
+#: src/modules/SourceDialogs.rb:109
 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:111
+#: src/modules/SourceDialogs.rb:114
 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:120
+#: src/modules/SourceDialogs.rb:128
 msgid "&Server Name"
 msgstr "&Server Name"
 
 #. text entry
 #. text entry
-#: src/modules/SourceDialogs.rb:128 src/modules/SourceDialogs.rb:1575
+#: src/modules/SourceDialogs.rb:136 src/modules/SourceDialogs.rb:1583
 msgid "&Path to Directory or ISO Image"
 msgstr "&Path to Directory or ISO Image"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:136
+#: src/modules/SourceDialogs.rb:144
 #, fuzzy
 msgid "&ISO Image"
 msgstr "ISO Image"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:138
+#: src/modules/SourceDialogs.rb:146
 #, fuzzy
 #| msgid "&Protocol"
 msgid "N&FS v4 Protocol"
 msgstr "&Protocol"
 
-#: src/modules/SourceDialogs.rb:144
+#: src/modules/SourceDialogs.rb:152
 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:148
+#: src/modules/SourceDialogs.rb:156
 #, fuzzy
 #| msgid " (default)"
 msgid "(default)"
 msgstr " (default)"
 
-#: src/modules/SourceDialogs.rb:159
+#: src/modules/SourceDialogs.rb:167
 #, fuzzy
 msgid "URL of the Repository"
 msgstr "Name of the group"
 
 #. frame
-#: src/modules/SourceDialogs.rb:168
+#: src/modules/SourceDialogs.rb:176
 msgid "P&rotocol"
 msgstr "P&rotocol"
 
 #. input field label
-#: src/modules/SourceDialogs.rb:178
+#: src/modules/SourceDialogs.rb:186
 #, fuzzy
 msgid "&URL of the Repository"
 msgstr "Name of the group"
@@ -2334,42 +2397,42 @@
 #. label / dialog caption
 #. bugzilla #219759
 #. service label can be empty (not defined)
-#: src/modules/SourceDialogs.rb:193 src/modules/SourceManagerSLP.rb:323
+#: src/modules/SourceDialogs.rb:201 src/modules/SourceManagerSLP.rb:323
 #, fuzzy
 msgid "Repository URL"
 msgstr "Repository"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:195
+#: src/modules/SourceDialogs.rb:203
 msgid "NFS Server"
 msgstr "NFS Server"
 
 #. label / dialog caption
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:197 src/modules/SourceDialogs.rb:199
+#: src/modules/SourceDialogs.rb:205 src/modules/SourceDialogs.rb:207
 #, fuzzy
 msgid "CD or DVD Media"
 msgstr "Read &CD or DVD Medium"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:201
+#: src/modules/SourceDialogs.rb:209
 msgid "Hard Disk"
 msgstr "Hard Disk"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:203
+#: src/modules/SourceDialogs.rb:211
 #, fuzzy
 msgid "USB Stick or Disk"
 msgstr "&USB Stick Boot Image"
 
 #. label / dialog caption
 #. dialog caption
-#: src/modules/SourceDialogs.rb:205 src/modules/SourceDialogs.rb:880
+#: src/modules/SourceDialogs.rb:213 src/modules/SourceDialogs.rb:888
 msgid "Local Directory"
 msgstr "Local Directory"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:207
+#: src/modules/SourceDialogs.rb:215
 #, fuzzy
 msgid "Local ISO Image"
 msgstr "Use &ISO Images"
@@ -2379,26 +2442,26 @@
 #. label / dialog caption
 #. label / dialog caption
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:209 src/modules/SourceDialogs.rb:211
-#: src/modules/SourceDialogs.rb:213 src/modules/SourceDialogs.rb:215
-#: src/modules/SourceDialogs.rb:217
+#: 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
 msgid "Server and Directory"
 msgstr "Server and Directory"
 
 #. popup message
-#: src/modules/SourceDialogs.rb:432
+#: src/modules/SourceDialogs.rb:440
 #, fuzzy
 msgid "The name of the repository cannot be empty."
 msgstr "Share path cannot be empty."
 
 #. text entry
-#: src/modules/SourceDialogs.rb:444
+#: src/modules/SourceDialogs.rb:452
 #, fuzzy
 msgid "&Repository Name"
 msgstr "Repository"
 
 #. help text
-#: src/modules/SourceDialogs.rb:459
+#: src/modules/SourceDialogs.rb:467
 #, fuzzy
 msgid ""
 "<p><big><b>Repository Name</b></big><br>\n"
@@ -2409,13 +2472,13 @@
 "loaded.</p>\n"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:473
+#: src/modules/SourceDialogs.rb:481
 #, fuzzy
 msgid "&Service Name"
 msgstr "Service Name"
 
 #. help text
-#: src/modules/SourceDialogs.rb:481
+#: src/modules/SourceDialogs.rb:489
 #, fuzzy
 msgid ""
 "<p><big><b>Service Name</b></big><br>\n"
@@ -2426,17 +2489,17 @@
 "loaded.</p>\n"
 
 #. popup message
-#: src/modules/SourceDialogs.rb:516
+#: src/modules/SourceDialogs.rb:524
 msgid "URL cannot be empty."
 msgstr "URL cannot be empty."
 
 #. text entry
-#: src/modules/SourceDialogs.rb:529
+#: src/modules/SourceDialogs.rb:537
 msgid "&URL"
 msgstr "&URL"
 
 #. help text
-#: src/modules/SourceDialogs.rb:543
+#: src/modules/SourceDialogs.rb:551
 #, fuzzy
 msgid ""
 "<p><big><b>Repository URL</b></big><br>\n"
@@ -2449,17 +2512,17 @@
 #. @return widget description map
 #. Get widget description map
 #. @return widget description map
-#: src/modules/SourceDialogs.rb:716 src/modules/SourceDialogs.rb:1843
+#: src/modules/SourceDialogs.rb:724 src/modules/SourceDialogs.rb:1851
 msgid "Edit Parts of the URL"
 msgstr ""
 
-#: src/modules/SourceDialogs.rb:723 src/modules/SourceDialogs.rb:1850
+#: src/modules/SourceDialogs.rb:731 src/modules/SourceDialogs.rb:1858
 #, fuzzy
 msgid "Edit Complete URL"
 msgstr "Show Complete &List"
 
 #. help text
-#: src/modules/SourceDialogs.rb:735
+#: src/modules/SourceDialogs.rb:743
 #, fuzzy
 msgid ""
 "<p><big><b>NFS Server</b></big><br>\n"
@@ -2469,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:742
+#: src/modules/SourceDialogs.rb:750
 msgid ""
 "<p><big><b>Mount Options</b></big><br>\n"
 "You can specify extra options used for mounting the NFS volume.\n"
@@ -2478,16 +2541,16 @@
 msgstr ""
 
 #. radio button
-#: src/modules/SourceDialogs.rb:797
+#: src/modules/SourceDialogs.rb:805
 msgid "&CD-ROM"
 msgstr "&CD-ROM"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:799
+#: src/modules/SourceDialogs.rb:807
 msgid "&DVD-ROM"
 msgstr "&DVD-ROM"
 
-#: src/modules/SourceDialogs.rb:804
+#: src/modules/SourceDialogs.rb:812
 #, fuzzy
 msgid ""
 "<p><big><b>CD or DVD Media</b></big><br>\n"
@@ -2497,12 +2560,12 @@
 "Use <b>Kernel</b> to specify the kernel image to load.</p>"
 
 #. dialog caption
-#: src/modules/SourceDialogs.rb:895
+#: src/modules/SourceDialogs.rb:903
 msgid "ISO Image File"
 msgstr "ISO Image File"
 
 #. error popup - the entered path is not a directory
-#: src/modules/SourceDialogs.rb:918
+#: src/modules/SourceDialogs.rb:926
 #, fuzzy
 msgid ""
 "The entered path is not a directory\n"
@@ -2512,7 +2575,7 @@
 "Try again.\n"
 
 #. error popup - the entered path is not a regular file
-#: src/modules/SourceDialogs.rb:948
+#: src/modules/SourceDialogs.rb:956
 #, fuzzy
 msgid ""
 "The entered path is not a file\n"
@@ -2520,7 +2583,7 @@
 msgstr "The specified file does not exist."
 
 #. continue/cancel popup, %1 is a file name
-#: src/modules/SourceDialogs.rb:972
+#: src/modules/SourceDialogs.rb:980
 msgid ""
 "File '%1'\n"
 "does not seem to be an ISO image.\n"
@@ -2528,19 +2591,19 @@
 msgstr ""
 
 #. text entry
-#: src/modules/SourceDialogs.rb:993
+#: src/modules/SourceDialogs.rb:1001
 #, fuzzy
 msgid "&Path to Directory"
 msgstr "&Path to Generated Directory Tree:"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:1001 src/modules/SourceDialogs.rb:1259
-#: src/modules/SourceDialogs.rb:1326
+#: src/modules/SourceDialogs.rb:1009 src/modules/SourceDialogs.rb:1267
+#: src/modules/SourceDialogs.rb:1334
 #, fuzzy
 msgid "&Plain RPM Directory"
 msgstr "&Path to Generated Directory Tree:"
 
-#: src/modules/SourceDialogs.rb:1016
+#: src/modules/SourceDialogs.rb:1024
 #, fuzzy
 msgid ""
 "<p><big><b>Local Directory</b></big><br>\n"
@@ -2553,22 +2616,22 @@
 "Use <b>Kernel</b> to specify the kernel image to load.</p>"
 
 #. `opt(`hstretch),
-#: src/modules/SourceDialogs.rb:1252
+#: src/modules/SourceDialogs.rb:1260
 #, fuzzy
 msgid "&USB Mass Storage Device"
 msgstr "Mass Storage Device"
 
 #. the spacing is added to make the widget wider
-#: src/modules/SourceDialogs.rb:1257 src/modules/SourceDialogs.rb:1324
+#: src/modules/SourceDialogs.rb:1265 src/modules/SourceDialogs.rb:1332
 msgid "&File System"
 msgstr "&File System"
 
-#: src/modules/SourceDialogs.rb:1258 src/modules/SourceDialogs.rb:1325
+#: src/modules/SourceDialogs.rb:1266 src/modules/SourceDialogs.rb:1333
 #, fuzzy
 msgid "Dire&ctory"
 msgstr "Directory"
 
-#: src/modules/SourceDialogs.rb:1263
+#: src/modules/SourceDialogs.rb:1271
 #, fuzzy
 msgid ""
 "<p><big><b>USB Stick or Disk</b></big><br>\n"
@@ -2584,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:1273 src/modules/SourceDialogs.rb:1340
+#: src/modules/SourceDialogs.rb:1281 src/modules/SourceDialogs.rb:1348
 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"
@@ -2592,12 +2655,12 @@
 msgstr ""
 
 #. combobox title
-#: src/modules/SourceDialogs.rb:1323
+#: src/modules/SourceDialogs.rb:1331
 #, fuzzy
 msgid "&Disk Device"
 msgstr "&Floppy Disk Device"
 
-#: src/modules/SourceDialogs.rb:1330
+#: src/modules/SourceDialogs.rb:1338
 #, fuzzy
 msgid ""
 "<p><big><b>Disk</b></big><br>\n"
@@ -2612,13 +2675,13 @@
 "Use <b>Kernel</b> to specify the kernel image to load.</p>"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1356
+#: src/modules/SourceDialogs.rb:1364
 #, fuzzy
 msgid "&Path to ISO Image"
 msgstr "&Path to Generated Directory Tree:"
 
 #. push button
-#: src/modules/SourceDialogs.rb:1376
+#: src/modules/SourceDialogs.rb:1384
 #, fuzzy
 msgid ""
 "<p><big><b>Local ISO Image</b></big><br>\n"
@@ -2629,73 +2692,73 @@
 "Use <b>Kernel</b> to specify the kernel image to load.</p>"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1557
+#: src/modules/SourceDialogs.rb:1565
 msgid "Server &Name"
 msgstr "Server &Name"
 
-#: src/modules/SourceDialogs.rb:1561
+#: src/modules/SourceDialogs.rb:1569
 msgid "&Port"
 msgstr "&Port"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1566
+#: src/modules/SourceDialogs.rb:1574
 msgid "&Share"
 msgstr "&Share"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:1579
+#: src/modules/SourceDialogs.rb:1587
 #, fuzzy
 msgid "ISO &Image"
 msgstr "Use &ISO Images"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1582
+#: src/modules/SourceDialogs.rb:1590
 msgid "&Directory on Server"
 msgstr "&Directory on Server"
 
 #. frame
-#: src/modules/SourceDialogs.rb:1587
+#: src/modules/SourceDialogs.rb:1595
 msgid "Au&thentication"
 msgstr "Au&thentication"
 
 #. check box
-#: src/modules/SourceDialogs.rb:1594
+#: src/modules/SourceDialogs.rb:1602
 msgid "&Anonymous"
 msgstr "&Anonymous"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1603
+#: src/modules/SourceDialogs.rb:1611
 #, fuzzy
 msgid "&Workgroup or Domain"
 msgstr "Workgroup or Domain"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1612
+#: src/modules/SourceDialogs.rb:1620
 msgid "&User Name"
 msgstr "&User Name"
 
 #. password entry
-#: src/modules/SourceDialogs.rb:1619
+#: src/modules/SourceDialogs.rb:1627
 msgid "&Password"
 msgstr "&Password"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1694
+#: src/modules/SourceDialogs.rb:1702
 msgid "&FTP"
 msgstr "&FTP"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1697
+#: src/modules/SourceDialogs.rb:1705
 msgid "H&TTP"
 msgstr "H&TTP"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1704
+#: src/modules/SourceDialogs.rb:1712
 msgid "HTT&PS"
 msgstr "HTT&PS"
 
 #. help text - server dialog
-#: src/modules/SourceDialogs.rb:1874
+#: src/modules/SourceDialogs.rb:1882
 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"
@@ -2710,7 +2773,7 @@
 msgstr ""
 
 #. help text - server dialog, there is a "Port" widget
-#: src/modules/SourceDialogs.rb:1887
+#: src/modules/SourceDialogs.rb:1895
 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"
@@ -2719,12 +2782,12 @@
 #. Returns whether Community Repositories are defined in the control file.
 #.
 #. @return [Boolean] whether defined
-#: src/modules/SourceDialogs.rb:1949
-msgid "I would like to install an Add On Product"
+#: src/modules/SourceDialogs.rb:1957
+msgid "I would like to install an additional Add On Product"
 msgstr ""
 
 #. help text
-#: src/modules/SourceDialogs.rb:2067
+#: src/modules/SourceDialogs.rb:2076
 #, fuzzy
 msgid ""
 "<p><big><b>Media Type</b></big><br>\n"
@@ -2737,7 +2800,7 @@
 "</p>\n"
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2076
+#: src/modules/SourceDialogs.rb:2085
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -2750,7 +2813,7 @@
 "</p>\n"
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2086
+#: src/modules/SourceDialogs.rb:2095
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -2769,7 +2832,7 @@
 "</p>\n"
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2098
+#: src/modules/SourceDialogs.rb:2107
 #, fuzzy
 #| msgid ""
 #| "<p>\n"
@@ -2788,27 +2851,27 @@
 "the first CD are located, such as /data1/CD1.</p>\n"
 
 #. error popup
-#: src/modules/SourceDialogs.rb:2113
+#: src/modules/SourceDialogs.rb:2122
 #, fuzzy
 msgid "Select the media type"
 msgstr "Select the printer type."
 
-#: src/modules/SourceDialogs.rb:2119
+#: src/modules/SourceDialogs.rb:2128
 msgid "Insert the add-on product CD"
 msgstr "Insert the add-on product CD"
 
-#: src/modules/SourceDialogs.rb:2120
+#: src/modules/SourceDialogs.rb:2129
 msgid "Insert the add-on product DVD"
 msgstr "Insert the add-on product DVD"
 
 #. ask for a medium
-#: src/modules/SourceDialogs.rb:2138
+#: src/modules/SourceDialogs.rb:2147
 #, 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:2332
+#: src/modules/SourceDialogs.rb:2344
 msgid ""
 "<p><b>Download Files</b><br>\n"
 "Each repository has description files which describe the content of the\n"
@@ -2818,12 +2881,18 @@
 msgstr ""
 
 #. dialog caption
-#. dialog caption
-#: src/modules/SourceDialogs.rb:2551 src/modules/SourceDialogs.rb:2575
+#: src/modules/SourceDialogs.rb:2563
 #, fuzzy
 msgid "Media Type"
 msgstr "Media Check"
 
+#. dialog caption
+#: src/modules/SourceDialogs.rb:2587
+#, fuzzy
+#| msgid "Add-On Products"
+msgid "Add On Product"
+msgstr "Add-On Products"
+
 #. SourceManager read dialog caption
 #: src/modules/SourceManager.rb:100
 #, fuzzy
@@ -2929,7 +2998,9 @@
 msgid "Configured Repositories"
 msgstr "Configured Hosts"
 
-#: src/modules/SourceManager.rb:680
+#. To adjust the width of the dialog, look for the more lengthy device label
+#. (and add some extra space for the frame)
+#: src/modules/SourceManager.rb:670
 msgid "&Drive to eject"
 msgstr "&Drive to eject"
 
@@ -3007,13 +3078,13 @@
 msgstr "An internal error occurred. View the log file."
 
 #. progress information, %1 stands for number of services
-#: src/modules/SourceManagerSLP.rb:520
+#: src/modules/SourceManagerSLP.rb:493
 #, fuzzy
 msgid "Collecting information of %1 services found..."
 msgstr "Collecting node information..."
 
 #. error popup
-#: src/modules/SourceManagerSLP.rb:618
+#: src/modules/SourceManagerSLP.rb:591
 #, fuzzy
 msgid ""
 "No SLP repositories have been found on your network.\n"
@@ -3025,7 +3096,7 @@
 "which probably blocks the network scanning."
 
 #. error popup
-#: src/modules/SourceManagerSLP.rb:627
+#: src/modules/SourceManagerSLP.rb:600
 #, fuzzy
 msgid "No SLP repositories have been found on your network."
 msgstr "No SLP catalogues have been found on your network."
@@ -3056,6 +3127,14 @@
 msgstr "Please deselect some packages."
 
 #, fuzzy
+#~ msgid "&Yes, I Agree to the License Agreement"
+#~ msgstr "Yes, I Agree to the License Agreement"
+
+#, fuzzy
+#~ msgid "N&o, I Do not Agree"
+#~ msgstr "No, I Do Not Agree"
+
+#, fuzzy
 #~ msgid "&USB Stick or Disk..."
 #~ msgstr "&USB Stick Boot Image"
 
@@ -4270,9 +4349,6 @@
 #~ msgid "Minimal &Graphical System"
 #~ msgstr "Minimal &Graphical System"
 
-#~ msgid "Backup of %1 failed. See %2 for details."
-#~ msgstr "Backup of %1 failed. See %2 for details."
-
 #~ msgid "Registered Catalogs"
 #~ msgstr "Registered Repositories"
 

Modified: trunk/yast/en_GB/po/pam.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/pam.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/pam.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: yast2 9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:33+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2004-MO-DA HO:MI+ZONE\n"
 "Last-Translator: proofreader\n"
 "Language-Team: en_US\n"

Modified: trunk/yast/en_GB/po/pkg-bindings.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/pkg-bindings.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/pkg-bindings.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2008-05-05 12:07+0200\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"
@@ -173,7 +173,7 @@
 
 #. 3 steps per repository (download, cache rebuild, load resolvables)
 #: src/Source_Load.cc:161 src/Source_Load.cc:483 src/Source_Set.cc:83
-#: src/Target_Load.cc:74 src/Target_Load.cc:187
+#: src/Target_Load.cc:74 src/Target_Load.cc:204
 #, fuzzy
 msgid "Loading the Package Manager..."
 msgstr "Initialising package manager..."
@@ -210,7 +210,7 @@
 msgid "Initialize the Target System"
 msgstr "Initialise the target system"
 
-#: src/Target_Load.cc:71 src/Target_Load.cc:183
+#: src/Target_Load.cc:71 src/Target_Load.cc:200
 #, fuzzy
 msgid "Read Installed Packages"
 msgstr "Installed &Packages"

Modified: trunk/yast/en_GB/po/printer.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/printer.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/printer.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: yast2 9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:40+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2007-08-16 20:16+0100\n"
 "Last-Translator: Karl Eichwalder\n"
 "Language-Team: British English\n"

Modified: trunk/yast/en_GB/po/product-creator.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/product-creator.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/product-creator.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2007-08-16 20:49+0100\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"

Modified: trunk/yast/en_GB/po/proxy.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/proxy.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/proxy.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\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"

Modified: trunk/yast/en_GB/po/qt-pkg.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/qt-pkg.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/qt-pkg.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: yast2 9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2007-08-16 20:15+0100\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"
@@ -45,48 +45,48 @@
 msgid "&Repositories"
 msgstr "&Repositories"
 
-#: src/YQPackageSelector.cc:418
+#: src/YQPackageSelector.cc:419
 msgid "S&earch"
 msgstr "S&earch"
 
 #. DEBUG
-#: src/YQPackageSelector.cc:425 src/YQPkgSearchFilterView.cc:113
+#: src/YQPackageSelector.cc:426 src/YQPkgSearchFilterView.cc:113
 #, fuzzy
 msgid "&Keywords"
 msgstr "Keywords"
 
-#: src/YQPackageSelector.cc:434
+#: src/YQPackageSelector.cc:435
 msgid "&Installation Summary"
 msgstr "&Installation Summary"
 
-#: src/YQPackageSelector.cc:519
+#: src/YQPackageSelector.cc:520
 msgid "D&escription"
 msgstr "D&escription"
 
-#: src/YQPackageSelector.cc:532
+#: src/YQPackageSelector.cc:533
 msgid "&Technical Data"
 msgstr "&Technical Data"
 
-#: src/YQPackageSelector.cc:545 src/YQPkgProductDialog.cc:115
+#: src/YQPackageSelector.cc:546 src/YQPkgProductDialog.cc:115
 msgid "Dependencies"
 msgstr "Dependencies"
 
-#: src/YQPackageSelector.cc:561
+#: src/YQPackageSelector.cc:562
 msgid "&Versions"
 msgstr "&Versions"
 
-#: src/YQPackageSelector.cc:579
+#: src/YQPackageSelector.cc:580
 msgid "File List"
 msgstr "File List"
 
-#: src/YQPackageSelector.cc:596
+#: src/YQPackageSelector.cc:597
 msgid "Change Log"
 msgstr "Change Log"
 
 #. "Cancel" button
 #. button #0
 #. text
-#: src/YQPackageSelector.cc:623 src/YQPackageSelectorBase.cc:194
+#: src/YQPackageSelector.cc:624 src/YQPackageSelectorBase.cc:194
 #: src/YQPackageSelectorBase.cc:249 src/YQPackageSelectorBase.cc:305
 #: src/YQPackageSelectorBase.cc:326 src/YQPatternSelector.cc:259
 #: src/YQPkgConflictDialog.cc:163 src/YQPkgConflictDialog.cc:398
@@ -96,192 +96,192 @@
 msgstr "&Cancel"
 
 #. Translators: "Accept" here refers to licenses or similar
-#: src/YQPackageSelector.cc:633 src/YQPatternSelector.cc:268
+#: src/YQPackageSelector.cc:634 src/YQPatternSelector.cc:268
 #: src/YQPkgTextDialog.cc:258 src/YQSimplePatchSelector.cc:228
 msgid "&Accept"
 msgstr "&Accept"
 
-#: src/YQPackageSelector.cc:676
+#: src/YQPackageSelector.cc:677
 msgid "&File"
 msgstr "&File"
 
-#: src/YQPackageSelector.cc:678
+#: src/YQPackageSelector.cc:679
 msgid "&Import..."
 msgstr "&Import..."
 
-#: src/YQPackageSelector.cc:679
+#: src/YQPackageSelector.cc:680
 msgid "&Export..."
 msgstr "&Export..."
 
-#: src/YQPackageSelector.cc:683
+#: src/YQPackageSelector.cc:684
 msgid "E&xit -- Discard Changes"
 msgstr "E&xit -- Discard Changes"
 
-#: src/YQPackageSelector.cc:684
+#: src/YQPackageSelector.cc:685
 msgid "&Quit -- Save Changes"
 msgstr "&Quit -- Save Changes"
 
-#: src/YQPackageSelector.cc:696
+#: src/YQPackageSelector.cc:697
 msgid "&Package"
 msgstr "&Package"
 
-#: src/YQPackageSelector.cc:736 src/YQPkgPackageKitGroupsFilterView.cc:92
+#: src/YQPackageSelector.cc:737 src/YQPkgPackageKitGroupsFilterView.cc:92
 #: src/YQPkgRepoFilterView.cc:149
 msgid "All Packages"
 msgstr "All Packages"
 
-#: src/YQPackageSelector.cc:738 src/YQPkgObjList.cc:430
+#: src/YQPackageSelector.cc:739 src/YQPkgObjList.cc:430
 msgid "Update if newer version available"
 msgstr "Update if newer version available"
 
-#: src/YQPackageSelector.cc:741 src/YQPkgObjList.cc:415
+#: src/YQPackageSelector.cc:742 src/YQPkgObjList.cc:415
 #: src/YQPkgObjList.cc:436
 msgid "Update unconditionally"
 msgstr "Update unconditionally"
 
-#: src/YQPackageSelector.cc:755
+#: src/YQPackageSelector.cc:756
 msgid "&Patch"
 msgstr "&Patch"
 
-#: src/YQPackageSelector.cc:782
+#: src/YQPackageSelector.cc:783
 #, fuzzy
 #| msgid "Configuration"
 msgid "Confi&guration"
 msgstr "Configuration"
 
-#: src/YQPackageSelector.cc:783
+#: src/YQPackageSelector.cc:784
 #, fuzzy
 msgid "&Repositories..."
 msgstr "&Repositories"
 
-#: src/YQPackageSelector.cc:784
+#: src/YQPackageSelector.cc:785
 #, fuzzy
 msgid "&Online Update..."
 msgstr "Online Update"
 
-#: src/YQPackageSelector.cc:794
+#: src/YQPackageSelector.cc:795
 msgid "&Dependencies"
 msgstr "&Dependencies"
 
-#: src/YQPackageSelector.cc:796
+#: src/YQPackageSelector.cc:797
 #, fuzzy
 msgid "&Check Now"
 msgstr "Chec&k"
 
-#: src/YQPackageSelector.cc:797
+#: src/YQPackageSelector.cc:798
 #, fuzzy
 msgid "&Autocheck"
 msgstr "A&utocheck"
 
 #. Translators: Menu for view options (Use a noun, not a verb!)
-#: src/YQPackageSelector.cc:810
+#: src/YQPackageSelector.cc:811
 msgid "&Options"
 msgstr "&Options"
 
 #. Translators: This is about packages ending in "-devel", so don't translate that "-devel"!
-#: src/YQPackageSelector.cc:813
+#: src/YQPackageSelector.cc:814
 msgid "Show -de&vel Packages"
 msgstr "Show -de&vel Packages"
 
 #. Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"!
-#: src/YQPackageSelector.cc:822
+#: src/YQPackageSelector.cc:823
 #, fuzzy
 msgid "Show -&debuginfo/-debugsource Packages"
 msgstr "Show -&debuginfo Packages"
 
-#: src/YQPackageSelector.cc:830
+#: src/YQPackageSelector.cc:831
 #, fuzzy
 msgid "&System Verification Mode"
 msgstr "&Authentication Mode"
 
-#: src/YQPackageSelector.cc:835
+#: src/YQPackageSelector.cc:836
 msgid "&Ignore Recommended Packages for Already Installed Packages"
 msgstr ""
 
-#: src/YQPackageSelector.cc:841
+#: src/YQPackageSelector.cc:842
 #, fuzzy
 #| msgid "Selecting packages..."
 msgid "&Cleanup when deleting packages"
 msgstr "Selecting packages..."
 
-#: src/YQPackageSelector.cc:845
+#: src/YQPackageSelector.cc:846
 msgid "&Allow vendor change"
 msgstr ""
 
-#: src/YQPackageSelector.cc:858
+#: src/YQPackageSelector.cc:859
 #, fuzzy
 #| msgid "&Extras"
 msgid "E&xtras"
 msgstr "&Extras"
 
-#: src/YQPackageSelector.cc:860
+#: src/YQPackageSelector.cc:861
 msgid "Show &Products"
 msgstr "Show &Products"
 
-#: src/YQPackageSelector.cc:861
+#: src/YQPackageSelector.cc:862
 #, fuzzy
 msgid "Show P&ackage Changes"
 msgstr "Show &Automatic Package Changes"
 
-#: src/YQPackageSelector.cc:862
+#: src/YQPackageSelector.cc:863
 #, fuzzy
 #| msgid "History"
 msgid "Show &History"
 msgstr "History"
 
 #. Translators: This is about packages ending in "-devel", so don't translate that "-devel"!
-#: src/YQPackageSelector.cc:870
+#: src/YQPackageSelector.cc:871
 msgid "Install All Matching -&devel Packages"
 msgstr "Install All Matching -&devel Packages"
 
 #. Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"!
-#: src/YQPackageSelector.cc:874
+#: src/YQPackageSelector.cc:875
 msgid "Install All Matching -de&buginfo Packages"
 msgstr "Install All Matching -de&buginfo Packages"
 
 #. Translators: This is about packages ending in "-debugsource", so don't translate that "-debugsource"!
-#: src/YQPackageSelector.cc:877
+#: src/YQPackageSelector.cc:878
 #, fuzzy
 msgid "Install All Matching -debug&source Packages"
 msgstr "Install All Matching -de&buginfo Packages"
 
-#: src/YQPackageSelector.cc:882
+#: src/YQPackageSelector.cc:883
 msgid "Generate Dependency Resolver &Test Case"
 msgstr "Generate Dependency Resolver &Test Case"
 
-#: src/YQPackageSelector.cc:902
+#: src/YQPackageSelector.cc:903
 msgid "&Help"
 msgstr "&Help"
 
 #. Note: The help functions and their texts are moved out
 #. to a separate source file YQPackageSelectorHelp.cc
 #. Menu entry for help overview
-#: src/YQPackageSelector.cc:908
+#: src/YQPackageSelector.cc:909
 msgid "&Overview"
 msgstr "&Overview"
 
 #. Menu entry for help about used symbols ( icons )
-#: src/YQPackageSelector.cc:911
+#: src/YQPackageSelector.cc:912
 msgid "&Symbols"
 msgstr "&Symbols"
 
 #. Menu entry for keyboard help
-#: src/YQPackageSelector.cc:914
+#: src/YQPackageSelector.cc:915
 msgid "&Keys"
 msgstr "&Keys"
 
-#: src/YQPackageSelector.cc:1100
+#: src/YQPackageSelector.cc:1101
 msgid "All package dependencies are OK."
 msgstr "All package dependencies are OK."
 
-#: src/YQPackageSelector.cc:1116
+#: src/YQPackageSelector.cc:1117
 #, fuzzy
 msgid "P&atches"
 msgstr "Patches"
 
 #. startsWith
 #. filter
-#: src/YQPackageSelector.cc:1178
+#: src/YQPackageSelector.cc:1179
 msgid "Save Package List"
 msgstr "Save Package List"
 
@@ -289,56 +289,56 @@
 #. parent
 #. Post error popup.
 #. parent
-#: src/YQPackageSelector.cc:1217 src/YQPackageSelector.cc:1311
+#: src/YQPackageSelector.cc:1218 src/YQPackageSelector.cc:1312
 #: src/YQPkgConflictDialog.cc:425 src/YQPkgConflictList.cc:201
 #: src/YQPkgList.cc:605
 msgid "Error"
 msgstr "Error"
 
 #. caption
-#: src/YQPackageSelector.cc:1218
+#: src/YQPackageSelector.cc:1219
 msgid "Error exporting package list to %1"
 msgstr "Error exporting package list to %1"
 
-#: src/YQPackageSelector.cc:1230
+#: src/YQPackageSelector.cc:1231
 msgid "Load Package List"
 msgstr "Load Package List"
 
 #. caption
-#: src/YQPackageSelector.cc:1312
+#: src/YQPackageSelector.cc:1313
 msgid "Error loading package list from %1"
 msgstr "Error loading package list from %1"
 
 #. caption
 #. Translators: %1 is the number of affected packages
-#: src/YQPackageSelector.cc:1414
+#: src/YQPackageSelector.cc:1415
 msgid "%1 packages will be updated"
 msgstr "%1 packages will be updated"
 
-#: src/YQPackageSelector.cc:1415
+#: src/YQPackageSelector.cc:1416
 msgid "&Continue"
 msgstr "&Continue"
 
-#: src/YQPackageSelector.cc:1415
+#: src/YQPackageSelector.cc:1416
 msgid "C&ancel"
 msgstr "C&ancel"
 
-#: src/YQPackageSelector.cc:1454
+#: src/YQPackageSelector.cc:1455
 msgid "<p><small><a href=\"repoupgraderemove:///%1\">Cancel switching</a> system packages to versions in repository %2</small></p>"
 msgstr ""
 
-#: src/YQPackageSelector.cc:1473
+#: src/YQPackageSelector.cc:1474
 msgid "<p><a href=\"repoupgradeadd:///%1\">Switch system packages</a> to the versions in this repository (%2)</p>"
 msgstr ""
 
-#: src/YQPackageSelector.cc:1696
+#: src/YQPackageSelector.cc:1697
 msgid "Added Subpackages:"
 msgstr "Added Subpackages:"
 
 #. "OK" button
 #. addHStretch( hbox );
 #. "OK" button
-#: src/YQPackageSelector.cc:1698 src/YQPackageSelectorBase.cc:214
+#: src/YQPackageSelector.cc:1699 src/YQPackageSelectorBase.cc:214
 #: src/YQPkgDescriptionDialog.cc:120 src/YQPkgDiskUsageList.cc:156
 #: src/YQPkgDiskUsageList.cc:165 src/YQPkgProductDialog.cc:135
 #: src/YQPkgTextDialog.cc:71

Modified: trunk/yast/en_GB/po/qt.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/qt.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/qt.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: qt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\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"
@@ -66,7 +66,7 @@
 msgid "Stylesheet Editor"
 msgstr "Section Editor"
 
-#: src/YQApplication.cc:640
+#: src/YQApplication.cc:643
 msgid ""
 "You clicked the right mouse button where a left-click was expected.\n"
 "Switch left and right mouse buttons?"
@@ -75,7 +75,7 @@
 "Switch left and right mouse buttons?"
 
 #. Popup dialog caption
-#: src/YQApplication.cc:653
+#: src/YQApplication.cc:656
 msgid "Unexpected Click"
 msgstr "Unexpected Click"
 

Modified: trunk/yast/en_GB/po/rdp.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/rdp.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/rdp.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:41+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\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"

Modified: trunk/yast/en_GB/po/rear.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/rear.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/rear.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:57+0100\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\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"

Modified: trunk/yast/en_GB/po/registration.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/registration.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/registration.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: registration\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-08-15 15:56+0200\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,50 +23,98 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. popup heading (in bold)
-#: src/clients/discover_registration_services.rb:34
+#: src/clients/discover_registration_services.rb:35
 #, fuzzy
 msgid "Local Registration Servers"
 msgstr "Registration Code"
 
-#: src/clients/discover_registration_services.rb:36
+#: src/clients/discover_registration_services.rb:37
 msgid ""
-"Select a server from the list or press Cancel\n"
-"to use the default SUSE registration server."
+"Select a detected registration server from the list\n"
+"or the default SUSE registration server."
 msgstr ""
 
 #. error popup
-#: src/clients/discover_registration_services.rb:64
+#: src/clients/discover_registration_services.rb:65
 #, fuzzy
 msgid "No registration server selected."
 msgstr "Registration Code"
 
+#. %s is the default SCC URL
+#: src/clients/discover_registration_services.rb:100
+#, fuzzy
+#| msgid "Novell Customer Center Configuration"
+msgid "SUSE Customer Center (%s)"
+msgstr "Novell Customer Centre Configuration"
+
 #. popup message
-#: src/clients/inst_scc.rb:52
+#. popup message
+#: src/clients/inst_scc.rb:52 src/clients/scc_auto.rb:48
 #, fuzzy
 msgid "Contacting the Registration Server"
 msgstr "Registration Code"
 
 #. reset the user input in case an exception is raised
-#. register the system
-#: src/clients/inst_scc.rb:134 src/clients/scc_auto.rb:164
+#. 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
-#: src/clients/inst_scc.rb:144 src/clients/inst_scc.rb:549
+#. 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"
 
-#. TODO FIXME: still not the final text
+#. 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/lib/registration/ui/autoyast_config_dialog.rb:92
+#, fuzzy
+#| msgid "Registration Code"
+msgid "Registration"
+msgstr "Registration Code"
+
+#: src/clients/inst_scc.rb:261
+#, fuzzy
+#| msgid "Registration Code"
+msgid "Registration is being updated..."
+msgstr "Registration Code"
+
+#: src/clients/inst_scc.rb:262
+#, 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
+msgid ""
+"Automatic registration upgrade failed.\n"
+"You can manually register the system from scratch."
+msgstr ""
+
 #. 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:177
+#: src/clients/inst_scc.rb:289
 msgid ""
 "Please enter a registration or evaluation code for this product and your\n"
-"User Name/EMail from the SUSE Customer Center in the fields below.\n"
+"User Name/E-mail address from the SUSE Customer Center in the fields below.\n"
 "Access to security and general software updates is only possible on\n"
 "a registered system."
 msgstr ""
@@ -74,55 +122,58 @@
 #. 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:189
-msgid "If you skip the registration now be sure to do so in the installed system."
+#: src/clients/inst_scc.rb:301
+msgid ""
+"If you skip product registration now, remember to register after\n"
+"installation has completed."
 msgstr ""
 
-#: src/clients/inst_scc.rb:196
+#: src/clients/inst_scc.rb:309
 #, fuzzy
 #| msgid "Novell Customer Center Configuration"
 msgid "Network Configuration..."
 msgstr "Novell Customer Centre Configuration"
 
-#. make sure to revert the change if something goes wrong
-#: src/clients/inst_scc.rb:205 src/clients/inst_scc.rb:633
+#: src/clients/inst_scc.rb:318 src/clients/inst_scc.rb:491
 msgid "The system is already registered."
 msgstr ""
 
-#: src/clients/inst_scc.rb:212 src/clients/scc_auto.rb:373
-msgid "&Email"
-msgstr ""
+#: src/clients/inst_scc.rb:325
+#: src/lib/registration/ui/autoyast_config_dialog.rb:94
+#, fuzzy
+#| msgid "Email Address"
+msgid "&E-mail Address"
+msgstr "Email Address"
 
-#: src/clients/inst_scc.rb:214 src/clients/scc_auto.rb:239
-#: src/clients/scc_auto.rb:375
+#. handle nil specifically, it cannot be stored in XML profile
+#: src/clients/inst_scc.rb:327
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:167
+#: src/lib/registration/ui/autoyast_config_dialog.rb:96
 #, fuzzy
 #| msgid "Registration Code"
 msgid "Registration &Code"
 msgstr "Registration Code"
 
-#: src/clients/inst_scc.rb:218
+#. button label
+#: src/clients/inst_scc.rb:332
 #, fuzzy
+msgid "&Local Registration Server..."
+msgstr "Registration Code"
+
+#. button label
+#: src/clients/inst_scc.rb:335
+#, fuzzy
 #| msgid "Registration"
 msgid "&Skip Registration"
 msgstr "Registration"
 
-#. TODO: improve the help text
-#: src/clients/inst_scc.rb:226
-msgid "Enter SUSE Customer Center credentials here to register the system to get updates and add-on products."
+#. help text
+#: src/clients/inst_scc.rb:343
+msgid "Enter SUSE Customer Center credentials here to register the system to get updates and extensions."
 msgstr ""
 
-#. dialog title
-#. dialog title
-#. Translators: Text for UI Label - capitalized
-#: src/clients/inst_scc.rb:234 src/clients/inst_scc.rb:646
-#: src/clients/scc_auto.rb:371
-#, fuzzy
-#| msgid "Registration Code"
-msgid "Registration"
-msgstr "Registration Code"
-
 #. not set yet?
-#: src/clients/inst_scc.rb:259
+#: src/clients/inst_scc.rb:377
 msgid ""
 "Registration added some update repositories.\n"
 "\n"
@@ -130,58 +181,29 @@
 "on-line updates during installation?"
 msgstr ""
 
-#. use two column layout if needed
-#: src/clients/inst_scc.rb:312
-msgid "Available Extensions and Modules"
-msgstr ""
-
-#: src/clients/inst_scc.rb:317
+#. 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
 #, fuzzy
-#| msgid "Details..."
-msgid "Details"
-msgstr "Details..."
+msgid "Loading Available Extensions and Modules..."
+msgstr "Registration Code"
 
-#: src/clients/inst_scc.rb:320
-msgid "Select an extension or a module to show details here"
-msgstr ""
-
-#. popup message, %s are product names
-#: src/clients/inst_scc.rb:343
-msgid ""
-"Automatically selecting '%s'\n"
-"dependencies:\n"
-"\n"
-"%s"
-msgstr ""
-
-#. check the addons requiring a reg. code
-#: src/clients/inst_scc.rb:358
-msgid "YaST allows to select at most %s addons."
-msgstr ""
-
 #. dialog title
-#: src/clients/inst_scc.rb:411
-msgid "Extension Selection"
-msgstr ""
-
-#. cache the available addons
-#: src/clients/inst_scc.rb:485
-msgid "Loading Available Add-on Products and Extensions..."
-msgstr ""
-
-#. dialog title
-#: src/clients/inst_scc.rb:582
+#: src/clients/inst_scc.rb:458
 #, fuzzy
 msgid "Register Extensions and Modules"
 msgstr "Registration Code"
 
-#. dialog title
-#: src/clients/inst_scc.rb:595
-msgid "Extension and Module Registration Codes"
-msgstr ""
+#. help text
+#: src/clients/inst_scc.rb:462
+#, 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:610
+#: src/clients/inst_scc.rb:480
 msgid ""
 "If you do not register your system we will not be able\n"
 "to grant you access to the update repositories.\n"
@@ -193,313 +215,422 @@
 msgstr ""
 
 #. button label
-#: src/clients/inst_scc.rb:636
+#: src/clients/inst_scc.rb:494
 #, fuzzy
 #| msgid "Register New User"
 msgid "Register Again"
 msgstr "Register New User"
 
 #. button label
-#: src/clients/inst_scc.rb:639
+#: src/clients/inst_scc.rb:497
 msgid "Select Extensions"
 msgstr ""
 
+#. help text
+#: src/clients/inst_scc.rb:507
+#, 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
+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
+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:672
+#: src/clients/inst_scc.rb:534
 msgid ""
 "The base product was not found,\n"
 "check your system."
 msgstr ""
 
-#. Command line help text for the repository module, %1 is "SUSEconnect"
-#: src/clients/scc.rb:42
-msgid "Use '%s' instead of this YaST module."
+#. TRANSLATORS: %s = bugzilla URL
+#: src/clients/inst_scc.rb:538
+msgid ""
+"The installation medium or the installer itself is seriously broken.\n"
+"Report a bug at %s."
 msgstr ""
 
-#: src/clients/scc_auto.rb:165 src/clients/scc_auto.rb:174
-#: src/clients/scc_auto.rb:194
-msgid "Contacting the SUSE Customer Center server"
+#: src/clients/inst_scc.rb:541
+msgid ""
+"Make sure a product is installed and /etc/products.d/baseproduct\n"
+"is a symlink pointing to the base product .prod file."
 msgstr ""
 
-#. register the base product
-#. register addons
-#: src/clients/scc_auto.rb:173 src/clients/scc_auto.rb:193
-#, fuzzy
-#| msgid "Registration Code"
-msgid "Registering Product..."
-msgid_plural "Registering Products..."
-msgstr[0] "Registration Code"
-msgstr[1] "Registration Code"
+#. Command line help text for the repository module, %1 is "SUSEconnect"
+#: src/clients/scc.rb:44
+msgid "Use '%s' instead of this YaST module."
+msgstr ""
 
 #. popup message: registration finished properly
-#: src/clients/scc_auto.rb:213
+#: src/clients/scc_auto.rb:208
 #, fuzzy
 msgid "Registration was successfull."
 msgstr "Installation was successful"
 
-#. ---------------------------------------------------------
-#: src/clients/scc_auto.rb:238
-msgid "Add-on &Name"
+#. remove possible duplicates
+#: src/clients/scc_auto.rb:243
+msgid "SLP discovery failed, no server found"
 msgstr ""
 
-#: src/clients/scc_auto.rb:267
-msgid "Really delete add-on '%s'?"
-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
+#, fuzzy
+#| msgid "Downloading SMT certificate file failed"
+msgid "Downloading SSL Certificate"
+msgstr "Downloading SMT certificate file failed"
 
-#: src/clients/scc_auto.rb:301
-msgid "Name"
-msgstr ""
+#: src/clients/scc_auto.rb:263
+#, fuzzy
+#| msgid "Import Certificate"
+msgid "Importing SSL Certificate"
+msgstr "Import Certificate"
 
-#: src/clients/scc_auto.rb:301
+#. display the extension selection dialog and wait for a button click
+#. @return [Symbol] user input (:import, :cancel)
+#: src/data/registration/autoyast_summary.erb:5
+#: src/lib/registration/ui/autoyast_config_dialog.rb:49
+msgid "Product Registration"
+msgstr "Product Registration"
+
+#: src/data/registration/autoyast_summary.erb:9
 #, fuzzy
+#| msgid "Run during autoinstallation"
+msgid "Run registration during autoinstallation"
+msgstr "Run during autoinstallation"
+
+#: src/data/registration/autoyast_summary.erb:10
+#, fuzzy
+#| msgid "Do not run during autoinstallation"
+msgid "Skip registration during autoinstallation"
+msgstr "Do not run during autoinstallation"
+
+#: src/data/registration/autoyast_summary.erb:15
+#, fuzzy
+#| msgid "Registration Data to Use"
+msgid "Registration Settings"
+msgstr "Registration Data to Use"
+
+#: src/data/registration/autoyast_summary.erb:17
+#, fuzzy
+#| msgid "Email Address"
+msgid "E-mail Address: %s"
+msgstr "Email Address"
+
+#: src/data/registration/autoyast_summary.erb:19
+#, fuzzy
 #| msgid "Registration Code"
-msgid "Registration Code"
+msgid "Registration Code is Configured"
 msgstr "Registration Code"
 
-#. TODO FIXME: add a help text
-#: src/clients/scc_auto.rb:312
+#: src/data/registration/autoyast_summary.erb:23
 #, fuzzy
-#| msgid "Registration Code"
-msgid "Register Optional Add-ons"
+#| msgid "&Install All Available Sources"
+msgid "Install Available Updates"
+msgstr "&Install All Available Sources"
+
+#: src/data/registration/autoyast_summary.erb:27
+#, fuzzy
+msgid "Registration Server"
 msgstr "Registration Code"
 
-#: src/clients/scc_auto.rb:349
-msgid "Product Registration"
-msgstr "Product Registration"
+#: src/data/registration/autoyast_summary.erb:30
+#: src/data/registration/autoyast_summary.erb:32
+#, fuzzy
+#| msgid "Server URL: "
+msgid "Server URL: %s"
+msgstr "Server URL: "
 
-#: src/clients/scc_auto.rb:351
+#: src/data/registration/autoyast_summary.erb:32
 #, fuzzy
-#| msgid "<p>Product registration includes your product in Novell's database, enabling you to get online updates and technical support. To register while installing automatically, select <b>Run Product Registration</b>. To simplify the procedure, include information from your system with <b>Hardware Profile</b> and <b>Optional Information</b>.</p>"
-msgid ""
-"<p>Product registration includes your product in SUSE Customer Center database,\n"
-"enabling you to get online updates and technical support.\n"
-"To register while installing automatically, select <b>Run Product Registration</b>.</p>"
-msgstr "<p>Product registration includes your product in Novell's database, enabling you to get online updates and technical support. To register while installing automatically, select <b>Run Product Registration</b>. To simplify the procedure, include information from your system with <b>Hardware Profile</b> and <b>Optional Information</b>.</p>"
+#| msgid "Discovery"
+msgid "Use SLP discovery"
+msgstr "Discovery"
 
-#: src/clients/scc_auto.rb:356
+#: src/data/registration/autoyast_summary.erb:36
 #, fuzzy
-#| msgid "<p>If your network deploys a custom SMT server, please set the URL of the SMT Server and the location of the SMT Certificate in <b>SMT Server Settings</b>. Please see your SMT manual for further assistance.</p>"
-msgid ""
-"<p>If your network deploys a custom registration server, set the correct URL of the server\n"
-"and the location of the SMT certificate in <b>SMT Server Settings</b>. Refer\n"
-"to your SMT manual for further assistance.</p>"
-msgstr "<p>If your network deploys a custom SMT server, please set the URL of the SMT Server and the location of the SMT Certificate in <b>SMT Server Settings</b>. Please see your SMT manual for further assistance.</p>"
+#| msgid "As Server Certificate"
+msgid "SSL Server Certificate URL: %s"
+msgstr "As Server Certificate"
 
-#: src/clients/scc_auto.rb:364
+#: src/data/registration/autoyast_summary.erb:40
 #, fuzzy
-#| msgid "Registration Code"
-msgid "Register the Product"
+#| msgid "SMT Certificate: %1"
+msgid "SSL Certificate Fingerprint: %s"
+msgstr "SMT Certificate: %1"
+
+#: src/data/registration/autoyast_summary.erb:48
+#, fuzzy
+msgid "Extensions and Modules"
 msgstr "Registration Code"
 
-#: src/clients/scc_auto.rb:379
-msgid "Install Available Patches from Update Repositories"
-msgstr ""
+#: src/data/registration/certificate_error.erb:6
+#, fuzzy
+#| msgid "Prepare Connection"
+msgid "Secure Connection Error"
+msgstr "Prepare Connection"
 
-#. Translators: Text for UI Label - capitalized
-#: src/clients/scc_auto.rb:387
+#: src/data/registration/certificate_error.erb:10
+msgid "Details:"
+msgstr "Details:"
+
+#: src/data/registration/certificate_error.erb:14
 #, fuzzy
-#| msgid "SMT Server Settings"
-msgid "Server Settings"
-msgstr "SMT Server Settings"
+#| msgid "Select Certificate File"
+msgid "Failed Certificate Details"
+msgstr "Select Certificate File"
 
-#: src/clients/scc_auto.rb:391
+#: src/data/registration/certificate_summary.erb:4
+#: src/lib/registration/ssl_certificate_details.rb:35
+msgid "Issued To"
+msgstr ""
+
+#. label followed by the SSL certificate identification
+#: src/data/registration/certificate_summary.erb:7
+#: src/data/registration/certificate_summary.erb:16
+#: src/lib/registration/ssl_certificate_details.rb:61
+msgid "Common Name (CN): "
+msgstr ""
+
+#. label followed by the SSL certificate identification
+#: src/data/registration/certificate_summary.erb:8
+#: src/data/registration/certificate_summary.erb:17
+#: src/lib/registration/ssl_certificate_details.rb:63
+msgid "Organization (O): "
+msgstr ""
+
+#. label followed by the SSL certificate identification
+#: src/data/registration/certificate_summary.erb:9
+#: src/data/registration/certificate_summary.erb:18
+#: src/lib/registration/ssl_certificate_details.rb:65
+msgid "Organization Unit (OU): "
+msgstr ""
+
+#: src/data/registration/certificate_summary.erb:13
+#: src/lib/registration/ssl_certificate_details.rb:36
+msgid "Issued By"
+msgstr ""
+
+#: src/data/registration/certificate_summary.erb:22
 #, fuzzy
-msgid "Find Registration Server Using SLP Discovery"
-msgstr "Registration Code"
+#| msgid "Valid"
+msgid "Validity"
+msgstr "Valid"
 
-#. Translators: Text for UI Label - capitalized
-#: src/clients/scc_auto.rb:396
-msgid "Use Specific Server URL Instead of the Default"
+#: src/data/registration/certificate_summary.erb:26
+msgid "Issued On: "
 msgstr ""
 
-#. Translators: Text for UI Label - capitalized
-#: src/clients/scc_auto.rb:403
+#: src/data/registration/certificate_summary.erb:29
 #, fuzzy
-msgid "Optional Server Certificate"
-msgstr "&Server Certificate"
+#| msgid "Getting the certificate list failed."
+msgid "WARNING: The certificate is not valid yet!"
+msgstr "Getting the certificate list failed."
 
-#: src/clients/scc_auto.rb:421
+#: src/data/registration/certificate_summary.erb:32
 #, fuzzy
-#| msgid "Registration Code"
-msgid "Register Add-ons..."
-msgstr "Registration Code"
+#| msgid "port: %1"
+msgid "Expires On: "
+msgstr "port: %1"
 
-#. remove possible duplicates
-#: src/clients/scc_auto.rb:478
-msgid "SLP discovery failed, no server found"
-msgstr ""
+#: src/data/registration/certificate_summary.erb:35
+#, fuzzy
+#| msgid "Revoking the certificate failed."
+msgid "WARNING: The certificate has expired!"
+msgstr "Revoking the certificate failed."
 
+#: src/data/registration/certificate_summary.erb:43
+#, fuzzy
+#| msgid "If &Serial Number is Known"
+msgid "Serial Number: "
+msgstr "If &Serial Number is Known"
+
+#: src/data/registration/certificate_summary.erb:44
+#: src/lib/registration/ssl_certificate_details.rb:36
+#, fuzzy
+#| msgid "Fingerprint: "
+msgid "SHA1 Fingerprint: "
+msgstr "Fingerprint: "
+
+#: src/data/registration/certificate_summary.erb:46
+#: src/lib/registration/ssl_certificate_details.rb:38
+#, fuzzy
+#| msgid "Fingerprint: "
+msgid "SHA256 Fingerprint: "
+msgstr "Fingerprint: "
+
 #. Error popup
-#: src/lib/registration/connect_helpers.rb:65
+#: src/lib/registration/connect_helpers.rb:71
 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:71
+#: src/lib/registration/connect_helpers.rb:77
 msgid "Network error, check the network configuration."
 msgstr ""
 
 #. Error popup
-#: src/lib/registration/connect_helpers.rb:76
+#: src/lib/registration/connect_helpers.rb:82
 msgid "Connection time out."
 msgstr ""
 
-#. Error popup
-#: src/lib/registration/connect_helpers.rb:83
+#. TRANSLATORS: additional hint for an error message
+#: src/lib/registration/connect_helpers.rb:90
 #, fuzzy
 #| msgid "Destination is invalid."
-msgid ""
-"The email address is not known or\n"
-"the registration code is not valid."
+msgid "Check that this system is known to the registration server."
 msgstr "Destination is invalid."
 
-#: src/lib/registration/connect_helpers.rb:85
+#. TRANSLATORS: additional hint for an error message
+#: src/lib/registration/connect_helpers.rb:96
+msgid ""
+"If you are upgrading from SLE11 make sure the SCC server\n"
+"knows the old NCC registration. Synchronization from NCC to SCC\n"
+"might take very long time.\n"
+"\n"
+"If the SLE11 system was installed recently you could log into\n"
+"%s to speed up the synchronization process.\n"
+"Just wait several minutes after logging in and then retry \n"
+"the upgrade again."
+msgstr ""
+
+#. add the hint to the error details
+#. Error popup
+#: src/lib/registration/connect_helpers.rb:110
+#: src/lib/registration/connect_helpers.rb:113
+#: src/lib/registration/connect_helpers.rb:119
+#: src/lib/registration/connect_helpers.rb:167
 #, fuzzy
+#| msgid "Registration Code"
+msgid "Registration failed."
+msgstr "Registration Code"
+
+#: src/lib/registration/connect_helpers.rb:115
+#, fuzzy
 msgid "Registration client error."
 msgstr "Registration Data to Use"
 
-#: src/lib/registration/connect_helpers.rb:87
+#: src/lib/registration/connect_helpers.rb:117
 msgid ""
 "Registration server error.\n"
 "Retry registration later."
 msgstr ""
 
-#: src/lib/registration/connect_helpers.rb:89
-#: src/lib/registration/connect_helpers.rb:125
-#, fuzzy
-#| msgid "Registration Code"
-msgid "Registration failed."
-msgstr "Registration Code"
-
-#. try to use a translatable message first, if not found then use
-#. the original error message from openSSL
-#: src/lib/registration/connect_helpers.rb:118
-msgid "Secure connection error: %s"
+#. error message
+#: src/lib/registration/connect_helpers.rb:158
+msgid "Received SSL Certificate does not match the expected certificate."
 msgstr ""
 
 #. %s are error details
-#: src/lib/registration/connect_helpers.rb:142
+#: src/lib/registration/connect_helpers.rb:184
 #, fuzzy
 #| msgid "Details..."
 msgid "Details: %s"
 msgstr "Details..."
 
-#. label follwed by a certificate description
-#: src/lib/registration/connect_helpers.rb:147
-#, fuzzy
-#| msgid "SMT Certificate"
-msgid "Certificate:"
-msgstr "SMT Certificate"
+#. progress label
+#: src/lib/registration/connect_helpers.rb:209
+msgid "Importing the SSL certificate"
+msgstr ""
 
-#: src/lib/registration/connect_helpers.rb:151
-msgid "Issued To"
+#: src/lib/registration/connect_helpers.rb:210
+msgid "Importing '%s' certificate..."
 msgstr ""
 
-#: src/lib/registration/connect_helpers.rb:154
-msgid "Issued By"
+#. 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
+msgid "Secure connection error: %s"
 msgstr ""
 
-#: src/lib/registration/connect_helpers.rb:157
+#. progress step title
+#: src/lib/registration/finish_dialog.rb:34
 #, fuzzy
-#| msgid "Fingerprint: "
-msgid "SHA1 Fingerprint: "
-msgstr "Fingerprint: "
+#| msgid "Saving Remote Administration Configuration"
+msgid "Storing Registration Configuration..."
+msgstr "Saving Remote Administration Configuration"
 
-#: src/lib/registration/connect_helpers.rb:159
+#. 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
 #, fuzzy
-#| msgid "Fingerprint: "
-msgid "SHA256 Fingerprint: "
-msgstr "Fingerprint: "
+#| msgid "SMT Certificate"
+msgid "SSL Certificate"
+msgstr "SMT Certificate"
 
-#. label followed by the SSL certificate identification
-#: src/lib/registration/connect_helpers.rb:176
-msgid "Common Name (CN): "
+#. 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 ""
 
-#. label followed by the SSL certificate identification
-#: src/lib/registration/connect_helpers.rb:178
-msgid "Organization (O): "
-msgstr ""
-
-#. label followed by the SSL certificate identification
-#: src/lib/registration/connect_helpers.rb:180
-msgid "Organization Unit (OU): "
-msgstr ""
-
-#. progress label
-#: src/lib/registration/connect_helpers.rb:194
-msgid "Importing the SSL certificate"
-msgstr ""
-
-#: src/lib/registration/connect_helpers.rb:195
-msgid "Importing '%s' certificate..."
-msgstr ""
-
-#. return the boot command line parameter
-#: src/lib/registration/helpers.rb:218
+#. indent size used in summary text
+#: src/lib/registration/ssl_certificate_details.rb:35
 #, fuzzy
-#| msgid "Checking..."
-msgid "Searching..."
-msgstr "Checking..."
+#| msgid "SMT Certificate"
+msgid "Certificate:"
+msgstr "SMT Certificate"
 
-#: src/lib/registration/helpers.rb:218
-#, fuzzy
-msgid "Looking up local registration servers..."
-msgstr "1 item of registration data"
-
 #. create UI label for a base product
 #. @param [Hash] Product (hash from pkg-bindings)
 #. @return [String] UI Label
-#: src/lib/registration/sw_mgmt.rb:108
+#: src/lib/registration/sw_mgmt.rb:119
 #, fuzzy
 #| msgid "Unknown error"
 msgid "Unknown product"
 msgstr "Unknown error"
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:139
+#: src/lib/registration/sw_mgmt.rb:152
 #, fuzzy
 msgid "Saving repository configuration failed."
 msgstr "Starting Installation"
 
 #. # error message
-#: src/lib/registration/sw_mgmt.rb:176
+#. error message
+#: src/lib/registration/sw_mgmt.rb:190 src/lib/registration/sw_mgmt.rb:201
 msgid "Updating service '%s' failed."
 msgstr ""
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:182
+#: src/lib/registration/sw_mgmt.rb:196
 msgid "Adding service '%s' failed."
 msgstr ""
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:189
+#: src/lib/registration/sw_mgmt.rb:208
 msgid "Saving service '%s' failed."
 msgstr ""
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:194
+#: src/lib/registration/sw_mgmt.rb:213
 msgid "Refreshing service '%s' failed."
 msgstr ""
 
 #. dialog title
-#: src/lib/registration/ui/addon_eula_dialog.rb:37
+#: src/lib/registration/ui/addon_eula_dialog.rb:40
 msgid "License Agreement"
-msgstr ""
+msgstr "License Agreement"
 
-#: src/lib/registration/ui/addon_eula_dialog.rb:38
+#: src/lib/registration/ui/addon_eula_dialog.rb:41
 msgid "Downloading Licenses..."
 msgstr ""
 
-#. go back if any EULA has not been accepted, let the user deselect the
-#. not accepted extension
-#: src/lib/registration/ui/addon_eula_dialog.rb:65
+#. 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
 msgid "Downloading License Agreement..."
 msgstr ""
 
 #. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit"
-#: src/lib/registration/ui/addon_eula_dialog.rb:77
+#: src/lib/registration/ui/addon_eula_dialog.rb:85
 #, fuzzy
 #| msgid "Downloading SMT certificate file failed"
 msgid ""
@@ -508,63 +639,327 @@
 "failed."
 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
+msgid "%s License Agreement"
+msgstr ""
+
 #. dialog title
-#: src/lib/registration/ui/addon_eula_dialog.rb:93
-msgid "Extension and Module License Agreement"
+#: src/lib/registration/ui/addon_reg_codes_dialog.rb:37
+msgid "Extension and Module Registration Codes"
 msgstr ""
 
-#. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit"
-#: src/lib/registration/ui/addon_eula_dialog.rb:95
-msgid "%s License Agreement"
+#. help text
+#: src/lib/registration/ui/addon_reg_codes_dialog.rb:41
+msgid ""
+"<p>Enter registration codes for the requested extensions or modules.</p>\n"
+"<p>Registration codes are required for successfull registration.If you cannot provide a registration code then go back and deselect the respective extension or module.</p>"
 msgstr ""
 
+#. round the half up (more items in the first column for odd number of items)
+#: src/lib/registration/ui/addon_reg_codes_dialog.rb:87
+msgid "The extension you selected needs a separate registration code."
+msgid_plural "The extensions you selected need separate registration codes."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/lib/registration/ui/addon_reg_codes_dialog.rb:92
+#, fuzzy
+#| msgid "Enter the registration data."
+msgid "Enter the registration code into the field below."
+msgid_plural "Enter the registration codes into the fields below."
+msgstr[0] "Enter the registration data."
+msgstr[1] "Enter the registration data."
+
+#. dialog title
+#: src/lib/registration/ui/addon_selection_dialog.rb:39
+#, fuzzy
+msgid "Extension and Module Selection"
+msgstr "Registration Code"
+
+#. help text (1/3)
+#: src/lib/registration/ui/addon_selection_dialog.rb:42
+#, 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
+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
+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
+msgid "Available Extensions and Modules"
+msgstr ""
+
+#: src/lib/registration/ui/addon_selection_dialog.rb:69
+#, fuzzy
+#| msgid "Details..."
+msgid "Details"
+msgstr "Details..."
+
+#: src/lib/registration/ui/addon_selection_dialog.rb:72
+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
+#, 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
+msgid "YaST allows to select at most %s extensions or modules."
+msgstr ""
+
+#. help text
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:33
+msgid "<p>Here you can select which extensions or moduleswill be registered together with the base product.</p>"
+msgstr ""
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:36
+#, fuzzy
+msgid "Register Optional Extensions or Modules"
+msgstr "Registration Code"
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:50
+msgid "Identifier"
+msgstr "Identifier"
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:51
+msgid "Version"
+msgstr "Version"
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:52
+msgid "Architecture"
+msgstr "Architecture"
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:53
+#, fuzzy
+#| msgid "Rule Type"
+msgid "Release Type"
+msgstr "Rule Type"
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:54
+#, fuzzy
+#| msgid "Registration Code"
+msgid "Registration Code"
+msgstr "Registration Code"
+
+#. button label
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:65
+#, fuzzy
+#| msgid "Downloading installation system language extension..."
+msgid "Download Available Extensions..."
+msgstr "Downloading installation system language extension..."
+
+#. disable download on a non-registered system
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:119
+#, fuzzy
+#| msgid "Really delete '%1'?"
+msgid "Really delete '%s'?"
+msgstr "Really delete '%1'?"
+
+#. replace the content
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:161
+#, fuzzy
+#| msgid "Vendor Identifier"
+msgid "Extension or Module &Identifier"
+msgstr "Vendor Identifier"
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:162
+msgid "&Version"
+msgstr "&Version"
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:163
+#, fuzzy
+#| msgid "Architecture"
+msgid "&Architecture"
+msgstr "Architecture"
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:164
+#, fuzzy
+#| msgid "Rule Type"
+msgid "&Release Type"
+msgstr "Rule Type"
+
+#: src/lib/registration/ui/autoyast_config_dialog.rb:51
+#, fuzzy
+#| msgid "<p>Product registration includes your product in Novell's database, enabling you to get online updates and technical support. To register while installing automatically, select <b>Run Product Registration</b>. To simplify the procedure, include information from your system with <b>Hardware Profile</b> and <b>Optional Information</b>.</p>"
+msgid ""
+"<p>Product registration includes your product in SUSE Customer Center database,\n"
+"enabling you to get online updates and technical support.\n"
+"To register while installing automatically, select <b>Run Product Registration</b>.</p>"
+msgstr "<p>Product registration includes your product in Novell's database, enabling you to get online updates and technical support. To register while installing automatically, select <b>Run Product Registration</b>. To simplify the procedure, include information from your system with <b>Hardware Profile</b> and <b>Optional Information</b>.</p>"
+
+#: src/lib/registration/ui/autoyast_config_dialog.rb:56
+#, fuzzy
+#| msgid "<p>If your network deploys a custom SMT server, please set the URL of the SMT Server and the location of the SMT Certificate in <b>SMT Server Settings</b>. Please see your SMT manual for further assistance.</p>"
+msgid ""
+"<p>If your network deploys a custom registration server, set the correct URL of the server\n"
+"and the location of the SMT certificate in <b>SMT Server Settings</b>. Refer\n"
+"to your SMT manual for further assistance.</p>"
+msgstr "<p>If your network deploys a custom SMT server, please set the URL of the SMT Server and the location of the SMT Certificate in <b>SMT Server Settings</b>. Please see your SMT manual for further assistance.</p>"
+
+#. FIXME the dialog should be created by external code before calling this
+#: src/lib/registration/ui/autoyast_config_dialog.rb:83
+#, fuzzy
+#| msgid "Registration Code"
+msgid "Register the Product"
+msgstr "Registration Code"
+
+#: src/lib/registration/ui/autoyast_config_dialog.rb:100
+#, fuzzy
+#| msgid "Available Repositories"
+msgid "Install Available Updates from Update Repositories"
+msgstr "Available Repositories"
+
+#. Translators: Text for UI Label - capitalized
+#: src/lib/registration/ui/autoyast_config_dialog.rb:114
+#, fuzzy
+#| msgid "SMT Server Settings"
+msgid "Server Settings"
+msgstr "SMT Server Settings"
+
+#: src/lib/registration/ui/autoyast_config_dialog.rb:118
+#, fuzzy
+msgid "Find Registration Server Using SLP Discovery"
+msgstr "Registration Code"
+
+#. Translators: Text for UI Label - capitalized
+#: src/lib/registration/ui/autoyast_config_dialog.rb:123
+msgid "Use Specific Server URL Instead of the Default"
+msgstr ""
+
+#. Translators: Text for UI Label - capitalized
+#: src/lib/registration/ui/autoyast_config_dialog.rb:130
+#, fuzzy
+msgid "Optional SSL Server Certificate URL"
+msgstr "&Server Certificate"
+
+#. Translators: Text for UI Label - capitalized
+#: src/lib/registration/ui/autoyast_config_dialog.rb:139
+#, fuzzy
+msgid "Optional SSL Server Certificate Fingerprint"
+msgstr "&Server Certificate"
+
+#: src/lib/registration/ui/autoyast_config_dialog.rb:141
+msgid "none"
+msgstr "none"
+
+#. Translators: Text for UI Label - capitalized
+#: src/lib/registration/ui/autoyast_config_dialog.rb:152
+#, fuzzy
+#| msgid "Select Certificate File"
+msgid "SSL Certificate Fingerprint"
+msgstr "Select Certificate File"
+
+#: src/lib/registration/ui/autoyast_config_dialog.rb:173
+#, fuzzy
+msgid "Register Extensions or Modules..."
+msgstr "Registration Code"
+
 #. SSL error message
-#: src/lib/registration/ui/import_certificate_dialog.rb:26
+#: src/lib/registration/ui/import_certificate_dialog.rb:25
 #, fuzzy
+#| msgid "Certificate has been imported."
+msgid "Certificate has expired"
+msgstr "Certificate has been imported."
+
+#. SSL error message
+#: src/lib/registration/ui/import_certificate_dialog.rb:27
+#, fuzzy
 msgid "Self signed certificate"
 msgstr "&Server Certificate"
 
 #. SSL error message
-#: src/lib/registration/ui/import_certificate_dialog.rb:28
+#: src/lib/registration/ui/import_certificate_dialog.rb:29
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
 #. push button
-#: src/lib/registration/ui/import_certificate_dialog.rb:95
+#: src/lib/registration/ui/import_certificate_dialog.rb:90
 msgid "&Trust and Import"
 msgstr ""
 
 #. help text (RichText) for importing a SSL certificate (1/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:124
+#: src/lib/registration/ui/import_certificate_dialog.rb:118
 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:128
+#: src/lib/registration/ui/import_certificate_dialog.rb:122
 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:133
+#: src/lib/registration/ui/import_certificate_dialog.rb:127
 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:137
+#: src/lib/registration/ui/import_certificate_dialog.rb:131
 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:142
+#: src/lib/registration/ui/import_certificate_dialog.rb:136
 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
 #, fuzzy
-#~| msgid "Novell Customer Center Configuration"
-#~ msgid "SUSE Customer Center Credentials"
-#~ msgstr "Novell Customer Centre Configuration"
+#| msgid "Invalid value."
+msgid "Invalid URL."
+msgstr "Invalid value."
 
+#. input field label
+#: src/lib/registration/ui/local_server_dialog.rb:78
 #, fuzzy
+msgid "&Local Registration Server URL"
+msgstr "Registration Code"
+
+#. return the boot command line parameter
+#: src/lib/registration/url_helpers.rb:205
+#, fuzzy
+#| msgid "Checking..."
+msgid "Searching..."
+msgstr "Checking..."
+
+#: src/lib/registration/url_helpers.rb:205
+#, fuzzy
+msgid "Looking up local registration servers..."
+msgstr "1 item of registration data"
+
+#, fuzzy
+#~| msgid "Registration Code"
+#~ msgid "Registering Product..."
+#~ msgid_plural "Registering Products..."
+#~ msgstr[0] "Registration Code"
+#~ msgstr[1] "Registration Code"
+
+#, fuzzy
+#~| msgid "Registration Code"
+#~ msgid "Register Optional Add-ons"
+#~ msgstr "Registration Code"
+
+#, fuzzy
+#~| msgid "Registration Code"
+#~ msgid "Register Add-ons..."
+#~ msgstr "Registration Code"
+
+#, fuzzy
 #~| msgid "Novell Customer Center Configuration"
 #~ msgid "SUSE Customer Center Registration"
 #~ msgstr "Novell Customer Centre Configuration"
@@ -616,11 +1011,6 @@
 #~ msgid "Hardware Profile"
 #~ msgstr "Hardware Profile"
 
-#, fuzzy
-#~| msgid "Registration Data to Use"
-#~ msgid "Registration Status"
-#~ msgstr "Registration Data to Use"
-
 #~ msgid "Optional Information"
 #~ msgstr "Optional Information"
 
@@ -955,11 +1345,6 @@
 #~ msgstr "Option is empty."
 
 #, fuzzy
-#~| msgid "Registration Code"
-#~ msgid "Registration code is missing."
-#~ msgstr "Registration Code"
-
-#, fuzzy
 #~| msgid "Registration Data to Use"
 #~ msgid "Registration Status at: <b>%1</b>"
 #~ msgstr "Registration Data to Use"
@@ -976,11 +1361,6 @@
 #~ msgstr "Message:"
 
 #, fuzzy
-#~| msgid "port: %1"
-#~ msgid "Expiry: %1"
-#~ msgstr "port: %1"
-
-#, fuzzy
 #~| msgid "Package for ftp is not available."
 #~ msgid "Registration status is not available."
 #~ msgstr "Package for ftp is not available."
@@ -1033,12 +1413,6 @@
 #~ msgid "unknown status"
 #~ msgstr "unknown process"
 
-#~ msgid "Run during autoinstallation"
-#~ msgstr "Run during autoinstallation"
-
-#~ msgid "Do not run during autoinstallation"
-#~ msgstr "Do not run during autoinstallation"
-
 #, fuzzy
 #~ msgid "%1 item of registration data"
 #~ msgstr "%1 items of registration data"
@@ -1055,9 +1429,6 @@
 #~ msgid "SMT Server: %1"
 #~ msgstr "SMT Server: %1"
 
-#~ msgid "SMT Certificate: %1"
-#~ msgstr "SMT Certificate: %1"
-
 #~ msgid "&Key"
 #~ msgstr "&Key"
 
@@ -1135,10 +1506,6 @@
 #~ msgstr "Additional Software Repositories"
 
 #, fuzzy
-#~ msgid "The software repositories have been updated."
-#~ msgstr "No software repository found on medium."
-
-#, fuzzy
 #~ msgid "Find details in the Software Repositories module."
 #~ msgstr "Additional Software Repositories"
 

Modified: trunk/yast/en_GB/po/reipl.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/reipl.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/reipl.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\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"
@@ -27,7 +27,7 @@
 #. TRANSLATORS: part of a shutdown message
 #. %1 is replaced with a device name
 #. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:68
+#: src/clients/reipl_bootloader_finish.rb:64
 #, fuzzy
 msgid ""
 "\n"
@@ -44,7 +44,7 @@
 #. %2 is replaced with a WWPN name
 #. %3 is replaced with a LUN name
 #. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:91
+#: src/clients/reipl_bootloader_finish.rb:83
 #, fuzzy
 msgid ""
 "\n"
@@ -58,7 +58,7 @@
 "After shutdown, reload the system\n"
 "with the load address of your root DASD.\n"
 
-#: src/clients/reipl_bootloader_finish.rb:105
+#: src/clients/reipl_bootloader_finish.rb:97
 #, fuzzy
 msgid ""
 "\n"
@@ -150,7 +150,7 @@
 
 #: src/include/reipl/dialogs.rb:155
 msgid "&Name"
-msgstr ""
+msgstr "&Name"
 
 #: src/include/reipl/dialogs.rb:175
 #, fuzzy
@@ -282,35 +282,35 @@
 
 #. Create a textual summary and a list of unconfigured cards
 #. @return summary of the current configuration
-#: src/modules/Reipl.rb:342
+#: src/modules/Reipl.rb:329
 #, fuzzy
 msgid "Configured reipl methods"
 msgstr "Configured Files:"
 
-#: src/modules/Reipl.rb:349
+#: src/modules/Reipl.rb:336
 msgid "The method ccw is configured and being used."
 msgstr ""
 
-#: src/modules/Reipl.rb:351
+#: src/modules/Reipl.rb:338
 #, fuzzy
 msgid "The method ccw is configured."
 msgstr "The device is not configured"
 
-#: src/modules/Reipl.rb:354
+#: src/modules/Reipl.rb:341
 #, fuzzy
 msgid "The method ccw is not supported."
 msgstr "Zone type %1 is not supported."
 
-#: src/modules/Reipl.rb:362
+#: src/modules/Reipl.rb:349
 msgid "The method fcp is configured and being used."
 msgstr ""
 
-#: src/modules/Reipl.rb:364
+#: src/modules/Reipl.rb:351
 #, fuzzy
 msgid "The method fcp is configured."
 msgstr "The device is not configured"
 
-#: src/modules/Reipl.rb:367
+#: src/modules/Reipl.rb:354
 #, fuzzy
 msgid "The method fcp is not supported."
 msgstr "Zone type %1 is not supported."

Modified: trunk/yast/en_GB/po/relocation-server.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/relocation-server.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/relocation-server.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:57+0100\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\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"

Modified: trunk/yast/en_GB/po/s390.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/s390.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/s390.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: s390\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\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"
@@ -304,7 +304,7 @@
 
 #: src/include/s390/dasd/dialogs.rb:472
 msgid "&Deselect All"
-msgstr ""
+msgstr "&Deselect All"
 
 #. error popup
 #. error popup

Modified: trunk/yast/en_GB/po/samba-client.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/samba-client.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/samba-client.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: samba-client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\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"
@@ -210,6 +210,19 @@
 msgid "M&aximum"
 msgstr "M&aximum"
 
+#. require_groups
+#: src/include/samba-client/dialogs.rb:256
+#, fuzzy
+#| msgid "Allowed Services"
+msgid "Allowed Group(s)"
+msgstr "Allowed Services"
+
+#: src/include/samba-client/dialogs.rb:261
+#, fuzzy
+#| msgid "Group Name"
+msgid "Group Name(s) or SID(s)"
+msgstr "Group Name"
+
 #. combobox label
 #: src/include/samba-client/dialogs.rb:271
 #, fuzzy
@@ -907,59 +920,62 @@
 msgstr "Writing the settings..."
 
 #. final progress step label
-#: src/modules/Kerberos.rb:669
+#. translators: progress finished
+#. translators: write progress finished
+#: src/modules/Kerberos.rb:669 src/modules/Samba.rb:642
+#: src/modules/Samba.rb:761
 msgid "Finished"
 msgstr "Finished"
 
 #. progress stage label
 #: src/modules/Kerberos.rb:673
 msgid "Install required packages"
-msgstr ""
+msgstr "Install required packages"
 
 #. progress step label
 #: src/modules/Kerberos.rb:675
 msgid "Installing required packages..."
-msgstr ""
+msgstr "Installing required packages..."
 
 #. summary header
 #: src/modules/Kerberos.rb:947
 msgid "PAM Login"
-msgstr ""
+msgstr "PAM Login"
 
 #. summary item
 #: src/modules/Kerberos.rb:953
 msgid "Use Kerberos"
-msgstr ""
+msgstr "Use Kerberos"
 
 #. summary item
 #: src/modules/Kerberos.rb:955
 msgid "Do Not Use Kerberos"
-msgstr ""
+msgstr "Do Not Use Kerberos"
 
 #. summary header
 #: src/modules/Kerberos.rb:959
 msgid "Default Realm"
-msgstr ""
+msgstr "Default Realm"
 
 #. summary header
 #: src/modules/Kerberos.rb:966
 msgid "Default Domain"
-msgstr ""
+msgstr "Default Domain"
 
 #. summary header
 #: src/modules/Kerberos.rb:973
 msgid "KDC Server Address"
-msgstr ""
+msgstr "KDC Server Address"
 
 #. summary header
 #: src/modules/Kerberos.rb:977
 msgid "Clock Skew"
-msgstr ""
+msgstr "Clock Skew"
 
 #. summary text, %1 is value
 #: src/modules/Kerberos.rb:993
 msgid "<b>KDC Server</b>: %1<br>"
-msgstr ""
+msgstr "<b>KDC Server</b>: %1<br>"
 
 #. summary text, %1 is value
 #: src/modules/Kerberos.rb:998
@@ -971,7 +987,7 @@
 #. summary text, %1 is value
 #: src/modules/Kerberos.rb:1004
 msgid "<b>Default Realm</b>: %1<br>"
-msgstr ""
+msgstr "<b>Default Realm</b>: %1<br>"
 
 #. summary text (yes/no follows)
 #: src/modules/Kerberos.rb:1010
@@ -981,12 +997,14 @@
 msgstr "Offline Authentication Enabled"
 
 #. summary value
-#: src/modules/Kerberos.rb:1013
+#. translators: winbind status in summary
+#: src/modules/Kerberos.rb:1013 src/modules/Samba.rb:1104
 msgid "Yes"
 msgstr "Yes"
 
 #. summary value
-#: src/modules/Kerberos.rb:1015
+#. translators: winbind status in summary
+#: src/modules/Kerberos.rb:1015 src/modules/Samba.rb:1106
 msgid "No"
 msgstr "No"
 
@@ -1001,6 +1019,8 @@
 "Clock skew is invalid.\n"
 "Try again.\n"
 msgstr ""
+"Clock skew is invalid.\n"
+"Try again.\n"
 
 #. error popup (wrong format of entered value)
 #: src/modules/Kerberos.rb:1053
@@ -1008,71 +1028,150 @@
 "Lifetime is invalid.\n"
 "Try again."
 msgstr ""
+"Lifetime is invalid.\n"
+"Try again."
 
-#: src/modules/SambaNetJoin.pm:328
-msgid "Unable to proceed with join: Inconsistent cluster state"
-msgstr ""
+#. Samba-client read dialog caption
+#: src/modules/Samba.rb:621
+msgid "Initializing Samba Client Configuration"
+msgstr "Initialising Samba Client Configuration"
 
-#~ msgid "Initializing Samba Client Configuration"
-#~ msgstr "Initialising Samba Client Configuration"
+#. translators: progress stage 1/2
+#: src/modules/Samba.rb:632
+msgid "Read the global Samba settings"
+msgstr "Read the global Samba settings"
 
-#~ msgid "Read the global Samba settings"
-#~ msgstr "Read the global Samba settings"
+#. translators: progress stage 2/2
+#: src/modules/Samba.rb:634
+msgid "Read the winbind status"
+msgstr "Read the winbind status"
 
-#~ msgid "Read the winbind status"
-#~ msgstr "Read the winbind status"
+#. translators: progress step 1/2
+#: src/modules/Samba.rb:638
+msgid "Reading the global Samba settings..."
+msgstr "Reading the global Samba settings..."
 
-#~ msgid "Reading the global Samba settings..."
-#~ msgstr "Reading the global Samba settings..."
+#. translators: progress step 2/2
+#: src/modules/Samba.rb:640
+msgid "Reading the winbind status..."
+msgstr "Reading the winbind status..."
 
-#~ msgid "Reading the winbind status..."
-#~ msgstr "Reading the winbind status..."
+#. Samba-client read dialog caption
+#: src/modules/Samba.rb:741
+msgid "Saving Samba Client Configuration"
+msgstr "Saving Samba Client Configuration"
 
-#~ msgid "Disable Samba services"
-#~ msgstr "Disable Samba services"
+#. translators: write progress stage
+#: src/modules/Samba.rb:745
+msgid "Write the settings"
+msgstr "Write the settings"
 
-#~ msgid "Enable Samba services"
-#~ msgstr "Enable Samba services"
+#. translators: write progress stage
+#: src/modules/Samba.rb:748
+msgid "Disable Samba services"
+msgstr "Disable Samba services"
 
-#~ msgid "Disabling Samba services..."
-#~ msgstr "Disabling Samba services..."
+#. translators: write progress stage
+#: src/modules/Samba.rb:750
+msgid "Enable Samba services"
+msgstr "Enable Samba services"
 
-#~ msgid "Enabling Samba services..."
-#~ msgstr "Enabling Samba services..."
+#. translators: write progress step
+#: src/modules/Samba.rb:754
+msgid "Writing the settings..."
+msgstr "Writing the settings..."
 
-#~ msgid "Cannot write settings to %1."
-#~ msgstr "Cannot write settings to %1."
+#. translators: write progress step
+#: src/modules/Samba.rb:757
+msgid "Disabling Samba services..."
+msgstr "Disabling Samba services..."
 
-#~ msgid "Cannot start winbind service."
-#~ msgstr "Cannot start winbind service."
+#. translators: write progress step
+#: src/modules/Samba.rb:759
+msgid "Enabling Samba services..."
+msgstr "Enabling Samba services..."
 
-#~ msgid "Cannot start winbind daemon."
-#~ msgstr "Cannot start winbind daemon."
+#. write progress stage
+#: src/modules/Samba.rb:769
+msgid "Write Kerberos configuration"
+msgstr "Write Kerberos configuration"
 
-#~ msgid "Cannot stop winbind service."
-#~ msgstr "Cannot stop winbind service."
+#. write progress step
+#: src/modules/Samba.rb:771
+msgid "Writing Kerberos configuration..."
+msgstr "Writing Kerberos configuration..."
 
-#~ msgid "Cannot stop winbind daemon."
-#~ msgstr "Cannot stop winbind daemon."
+#. translators: error message, %1 is filename
+#. translators: error message, %1 is filename
+#. translators: error message, %1 is filename
+#: src/modules/Samba.rb:825 src/modules/Samba.rb:862 src/modules/Samba.rb:879
+msgid "Cannot write settings to %1."
+msgstr "Cannot write settings to %1."
 
-#~ msgid "Cannot write PAM settings."
-#~ msgstr "Cannot write PAM settings."
+#. translators: error message, do not change winbind
+#: src/modules/Samba.rb:838
+msgid "Cannot start winbind service."
+msgstr "Cannot start winbind service."
 
-#~ msgid "Global Configuration"
-#~ msgstr "Global Configuration"
+#. translators: error message, do not change winbind
+#: src/modules/Samba.rb:843
+msgid "Cannot start winbind daemon."
+msgstr "Cannot start winbind daemon."
 
-#~ msgid "Workgroup or Domain: %1"
-#~ msgstr "Workgroup or Domain: %1"
+#. translators: error message, do not change winbind
+#: src/modules/Samba.rb:849
+msgid "Cannot stop winbind service."
+msgstr "Cannot stop winbind service."
 
-#~ msgid "Create Home Directory on Login"
-#~ msgstr "Create Home Directory on Login"
+#. translators: error message, do not change winbind
+#: src/modules/Samba.rb:854
+msgid "Cannot stop winbind daemon."
+msgstr "Cannot stop winbind daemon."
 
-#~ msgid "Maximum Number of Shares: %1"
-#~ msgstr "Maximum Number of Shares: %1"
+#. translators: error message
+#: src/modules/Samba.rb:870
+msgid "Cannot write PAM settings."
+msgstr "Cannot write PAM settings."
 
-#~ msgid "<p><b>Authentication with SMB</b>: %1</p>"
-#~ msgstr "<p><b>Authentication with SMB</b>: %1</p>"
+#. summary header
+#: src/modules/Samba.rb:1044
+msgid "Global Configuration"
+msgstr "Global Configuration"
 
+#. autoyast summary item: configured workgroup
+#: src/modules/Samba.rb:1051
+msgid "Workgroup or Domain: %1"
+msgstr "Workgroup or Domain: %1"
+
+#. autoyast summary item
+#: src/modules/Samba.rb:1060
+msgid "Create Home Directory on Login"
+msgstr "Create Home Directory on Login"
+
+#. autoyast summary item
+#: src/modules/Samba.rb:1067
+msgid "Offline Authentication Enabled"
+msgstr "Offline Authentication Enabled"
+
+#. autoyast summary item
+#: src/modules/Samba.rb:1075
+msgid "Maximum Number of Shares: %1"
+msgstr "Maximum Number of Shares: %1"
+
+#. summary item: configured workgroup
+#: src/modules/Samba.rb:1096
+msgid "<p><b>Workgroup or Domain</b>: %1</p>"
+msgstr "<p><b>Workgroup or Domain</b>: %1</p>"
+
+#. summary item: authentication using winbind
+#: src/modules/Samba.rb:1101
+msgid "<p><b>Authentication with SMB</b>: %1</p>"
+msgstr "<p><b>Authentication with SMB</b>: %1</p>"
+
+#: src/modules/SambaNetJoin.pm:328
+msgid "Unable to proceed with join: Inconsistent cluster state"
+msgstr ""
+
 #, fuzzy
 #~ msgid "&UNC Path"
 #~ msgstr "&YOU Patch"

Modified: trunk/yast/en_GB/po/samba-server.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/samba-server.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/samba-server.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: samba-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\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"

Modified: trunk/yast/en_GB/po/samba-users.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/samba-users.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/samba-users.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:41+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2007-08-16 20:22+0100\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"

Modified: trunk/yast/en_GB/po/scanner.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/scanner.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/scanner.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: scanner\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:41+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\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"

Modified: trunk/yast/en_GB/po/security.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/security.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/security.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: security\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:57+0100\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\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"

Modified: trunk/yast/en_GB/po/services-manager.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/services-manager.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/services-manager.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-08-18 16:19+0200\n"
 "PO-Revision-Date: 2014-05-19 09:35+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,12 +17,224 @@
 "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"
 
 #: src/clients/services_proposal.rb:53
+#: src/data/services-manager/autoyast_summary.erb:15
 msgid "Services"
 msgstr "Services"
 
@@ -71,3 +283,83 @@
 #: src/clients/services_proposal.rb:283
 msgid "Cannot enable service %1"
 msgstr "Cannot enable service %1"
+
+#: src/data/services-manager/autoyast_summary.erb:6
+#, fuzzy
+#| msgid "Default Hat"
+msgid "Default Target"
+msgstr "Default Hat"
+
+#. 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."
+
+#. 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 ""
+
+#: 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"
+
+#. 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"
+
+#. 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"
+
+#. Systemd targets
+#: src/modules/services_manager_target.rb:27
+#, fuzzy
+#| msgid "&Graphical interface"
+msgid "Graphical Interface"
+msgstr "&Graphical interface"
+
+#: src/modules/services_manager_target.rb:28
+#, fuzzy
+#| msgid "Select Mode"
+msgid "Emergency Mode"
+msgstr "Select Mode"
+
+#: src/modules/services_manager_target.rb:29
+#, fuzzy
+#| msgid "Switch Mode"
+msgid "Switch Root"
+msgstr "Switch Mode"
+
+#: src/modules/services_manager_target.rb:30
+#, fuzzy
+#| msgid "Default Bridge"
+msgid "Initrd Default Target"
+msgstr "Default Bridge"
+
+#: src/modules/services_manager_target.rb:31
+#, fuzzy
+#| msgid "Other System"
+msgid "Multi-User System"
+msgstr "Other System"
+
+#: src/modules/services_manager_target.rb:32
+#, fuzzy
+#| msgid "Required DMA Mode"
+msgid "Rescue Mode"
+msgstr "Required DMA Mode"

Modified: trunk/yast/en_GB/po/slp-server.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/slp-server.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/slp-server.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:57+0100\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2007-08-16 20:24+0100\n"
 "Last-Translator: Benjamin Weber\n"
 "Language-Team: British English\n"

Modified: trunk/yast/en_GB/po/snapper.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/snapper.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/snapper.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\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"
@@ -27,14 +27,14 @@
 
 #. text entry label
 #. text entry label
-#: src/include/snapper/dialogs.rb:124 src/include/snapper/dialogs.rb:245
-#: src/include/snapper/dialogs.rb:492
+#: src/include/snapper/dialogs.rb:130 src/include/snapper/dialogs.rb:251
+#: src/include/snapper/dialogs.rb:490
 msgid "Description"
 msgstr "Description"
 
 #. text entry label
 #. text entry label
-#: src/include/snapper/dialogs.rb:130 src/include/snapper/dialogs.rb:291
+#: src/include/snapper/dialogs.rb:136 src/include/snapper/dialogs.rb:297
 #, fuzzy
 #| msgid "User name"
 msgid "User data"
@@ -42,45 +42,45 @@
 
 #. combo box label
 #. text entry label
-#: src/include/snapper/dialogs.rb:138 src/include/snapper/dialogs.rb:296
+#: src/include/snapper/dialogs.rb:144 src/include/snapper/dialogs.rb:302
 #, fuzzy
 #| msgid "C&leanup Script"
 msgid "Cleanup algorithm"
 msgstr "C&leanup Script"
 
 #. popup label, %1 is number
-#: src/include/snapper/dialogs.rb:152
+#: src/include/snapper/dialogs.rb:158
 msgid "Modify Snapshot %1"
 msgstr ""
 
 #. popup label, %1, %2 are numbers (range)
-#: src/include/snapper/dialogs.rb:160
+#: src/include/snapper/dialogs.rb:166
 msgid "Modify Snapshots %1 - %2"
 msgstr ""
 
 #. label
-#: src/include/snapper/dialogs.rb:163
+#: src/include/snapper/dialogs.rb:169
 #, fuzzy
 #| msgid "PReP (%1)"
 msgid "Pre (%1)"
 msgstr "PReP (%1)"
 
 #. label
-#: src/include/snapper/dialogs.rb:167
+#: src/include/snapper/dialogs.rb:173
 #, fuzzy
 #| msgid "Host %1"
 msgid "Post (%1)"
 msgstr "Host %1"
 
 #. popup label
-#: src/include/snapper/dialogs.rb:243
+#: src/include/snapper/dialogs.rb:249
 #, fuzzy
 #| msgid "Create New "
 msgid "Create New Snapshot"
 msgstr "Create New "
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:256
+#: src/include/snapper/dialogs.rb:262
 #, fuzzy
 #| msgid "Read the list of profiles"
 msgid "Single snapshot"
@@ -88,243 +88,243 @@
 
 #. radio button label
 #. 0 means there's no post
-#: src/include/snapper/dialogs.rb:265 src/include/snapper/dialogs.rb:437
+#: src/include/snapper/dialogs.rb:271 src/include/snapper/dialogs.rb:435
 msgid "Pre"
 msgstr "Pre"
 
 #. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:275
+#: src/include/snapper/dialogs.rb:281
 msgid "Post, paired with:"
 msgstr ""
 
 #. yes/no popup question
-#: src/include/snapper/dialogs.rb:346
+#: src/include/snapper/dialogs.rb:352
 #, fuzzy
 #| msgid "Really delete '%1'?"
 msgid "Really delete snapshot '%1'?"
 msgstr "Really delete '%1'?"
 
 #. summary dialog caption
-#: src/include/snapper/dialogs.rb:359
+#: src/include/snapper/dialogs.rb:365
 msgid "Snapshots"
 msgstr ""
 
 #. generate list of snapshot table items
-#: src/include/snapper/dialogs.rb:392
+#: src/include/snapper/dialogs.rb:394
 #, fuzzy
 #| msgid "Singlehead"
 msgid "Single"
 msgstr "Singlehead"
 
 #. pre canot be 0
-#: src/include/snapper/dialogs.rb:421
+#: src/include/snapper/dialogs.rb:419
 msgid "Pre & Post"
 msgstr ""
 
 #. busy popup message
-#: src/include/snapper/dialogs.rb:456
+#: src/include/snapper/dialogs.rb:454
 #, fuzzy
 #| msgid "Read the list of profiles"
 msgid "Reading list of snapshots..."
 msgstr "Read the list of profiles"
 
 #. combo box label
-#: src/include/snapper/dialogs.rb:477
+#: src/include/snapper/dialogs.rb:475
 #, fuzzy
 #| msgid "Current Configuration:"
 msgid "Current Configuration"
 msgstr "Current Configuration:"
 
 #. table header
-#: src/include/snapper/dialogs.rb:488
+#: src/include/snapper/dialogs.rb:486
 msgid "ID"
 msgstr "ID"
 
-#: src/include/snapper/dialogs.rb:489
+#: src/include/snapper/dialogs.rb:487
 msgid "Type"
 msgstr "Type"
 
-#: src/include/snapper/dialogs.rb:490
+#: src/include/snapper/dialogs.rb:488
 msgid "Start Date"
 msgstr "Start Date"
 
-#: src/include/snapper/dialogs.rb:491
+#: src/include/snapper/dialogs.rb:489
 msgid "End Date"
 msgstr "End Date"
 
-#: src/include/snapper/dialogs.rb:493
+#: src/include/snapper/dialogs.rb:491
 msgid "User Data"
 msgstr "User Data"
 
 #. button label
-#: src/include/snapper/dialogs.rb:499
+#: src/include/snapper/dialogs.rb:497
 #, fuzzy
 #| msgid "&Show Changes"
 msgid "Show Changes"
 msgstr "&Show Changes"
 
 #. button label
-#: src/include/snapper/dialogs.rb:502
+#: src/include/snapper/dialogs.rb:500
 #, fuzzy
 #| msgid "&Modify"
 msgid "Modify"
 msgstr "&Modify"
 
 #. popup message
-#: src/include/snapper/dialogs.rb:544
+#: src/include/snapper/dialogs.rb:542
 msgid ""
 "This 'Pre' snapshot is not paired with any 'Post' one yet.\n"
 "Showing differences is not possible."
 msgstr ""
 
 #. dialog caption
-#: src/include/snapper/dialogs.rb:590
+#: src/include/snapper/dialogs.rb:588
 #, fuzzy
 #| msgid "Selected Service"
 msgid "Selected Snapshot Overview"
 msgstr "Selected Service"
 
 #. '%1: %2' means 'ID: description', adapt the order if necessary
-#: src/include/snapper/dialogs.rb:636
+#: src/include/snapper/dialogs.rb:626
 #, fuzzy
 #| msgid "Next %1: %2"
 msgid "%1: %2"
 msgstr "Next %1: %2"
 
 #. busy popup message
-#: src/include/snapper/dialogs.rb:655
+#: src/include/snapper/dialogs.rb:645
 #, fuzzy
 #| msgid "Saving changes to the files..."
 msgid "Calculating changed files..."
 msgstr "Saving changes to the files..."
 
 #. busy popup message
-#: src/include/snapper/dialogs.rb:752
+#: src/include/snapper/dialogs.rb:742
 #, fuzzy
 #| msgid "Accepting failed verifications"
 msgid "Calculating file modifications..."
 msgstr "Accepting failed verifications"
 
 #. label
-#: src/include/snapper/dialogs.rb:760
+#: src/include/snapper/dialogs.rb:750
 msgid "New file was created."
 msgstr ""
 
 #. label
-#: src/include/snapper/dialogs.rb:764
+#: src/include/snapper/dialogs.rb:754
 #, fuzzy
 #| msgid "Card removed"
 msgid "File was removed."
 msgstr "Card removed"
 
 #. label
-#: src/include/snapper/dialogs.rb:769
+#: src/include/snapper/dialogs.rb:759
 msgid "File content was not changed."
 msgstr ""
 
 #. label
-#: src/include/snapper/dialogs.rb:775
+#: src/include/snapper/dialogs.rb:765
 #, fuzzy
 #| msgid "File %1 does not exist."
 msgid "File does not exist in either snapshot."
 msgstr "File %1 does not exist."
 
 #. label
-#: src/include/snapper/dialogs.rb:781
+#: src/include/snapper/dialogs.rb:771
 #, fuzzy
 #| msgid "Nothing was modified yet."
 msgid "File content was modified."
 msgstr "Nothing was modified yet."
 
 #. text label, %1, %2 are file modes (like '-rw-r--r--')
-#: src/include/snapper/dialogs.rb:791
+#: src/include/snapper/dialogs.rb:781
 msgid "File mode was changed from '%1' to '%2'."
 msgstr ""
 
 #. text label, %1, %2 are user names
-#: src/include/snapper/dialogs.rb:806
+#: src/include/snapper/dialogs.rb:796
 msgid "File user ownership was changed from '%1' to '%2'."
 msgstr ""
 
 #. text label, %1, %2 are group names
-#: src/include/snapper/dialogs.rb:822
+#: src/include/snapper/dialogs.rb:812
 msgid "File group ownership was changed from '%1' to '%2'."
 msgstr ""
 
 #. button label
-#: src/include/snapper/dialogs.rb:857
+#: src/include/snapper/dialogs.rb:847
 #, fuzzy
 #| msgid "Restore options"
 msgid "R&estore from First"
 msgstr "Restore options"
 
 #. button label
-#: src/include/snapper/dialogs.rb:859
+#: src/include/snapper/dialogs.rb:849
 #, fuzzy
 #| msgid "Restore Options"
 msgid "Restore"
 msgstr "Restore Options"
 
-#: src/include/snapper/dialogs.rb:882
+#: src/include/snapper/dialogs.rb:872
 #, fuzzy
 #| msgid "Selected"
 msgid "Res&tore from Second"
 msgstr "Selected"
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:919
+#: src/include/snapper/dialogs.rb:909
 msgid "Show the difference between snapshot and current system"
 msgstr ""
 
 #. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:931
+#: src/include/snapper/dialogs.rb:921
 msgid "Show the difference between current and selected snapshot:"
 msgstr ""
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:978
+#: src/include/snapper/dialogs.rb:968
 msgid "Show the difference between first and second snapshot"
 msgstr ""
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:989
+#: src/include/snapper/dialogs.rb:979
 msgid "Show the difference between first snapshot and current system"
 msgstr ""
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:1000
+#: src/include/snapper/dialogs.rb:990
 msgid "Show the difference between second snapshot and current system"
 msgstr ""
 
 #. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:1041
+#: src/include/snapper/dialogs.rb:1031
 msgid "Time of taking the first snapshot:"
 msgstr ""
 
 #. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:1046
+#: src/include/snapper/dialogs.rb:1036
 msgid "Time of taking the second snapshot:"
 msgstr ""
 
 #. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:1054
+#: src/include/snapper/dialogs.rb:1044
 msgid "Time of taking the snapshot:"
 msgstr ""
 
 #. button label
-#: src/include/snapper/dialogs.rb:1076
+#: src/include/snapper/dialogs.rb:1066
 msgid "&Open"
 msgstr "&Open"
 
 #. button label
-#: src/include/snapper/dialogs.rb:1122
+#: src/include/snapper/dialogs.rb:1112
 #, fuzzy
 #| msgid "Selected"
 msgid "Restore Selected"
 msgstr "Selected"
 
 #. yes/no question, %1 is file name, %2 is number
-#: src/include/snapper/dialogs.rb:1196
+#: src/include/snapper/dialogs.rb:1186
 #, fuzzy
 #| msgid "Do you really want to delete this entry?"
 msgid ""
@@ -337,7 +337,7 @@
 
 #. yes/no question, %1 is file name, %2 is number
 #. yes/no question, %1 is file name, %2 is number
-#: src/include/snapper/dialogs.rb:1216 src/include/snapper/dialogs.rb:1234
+#: src/include/snapper/dialogs.rb:1206 src/include/snapper/dialogs.rb:1224
 msgid ""
 "Do you want to copy the file\n"
 "\n"
@@ -347,17 +347,17 @@
 msgstr ""
 
 #. popup message
-#: src/include/snapper/dialogs.rb:1269
+#: src/include/snapper/dialogs.rb:1259
 msgid "No file was selected for restoring"
 msgstr ""
 
 #. popup headline
-#: src/include/snapper/dialogs.rb:1274
+#: src/include/snapper/dialogs.rb:1264
 msgid "Restoring files"
 msgstr "Restoring files"
 
 #. popup message, %1 is snapshot number, %2 list of files
-#: src/include/snapper/dialogs.rb:1277
+#: src/include/snapper/dialogs.rb:1267
 msgid ""
 "<p>These files will be restored from snapshot '%1':</p>\n"
 "<p>\n"

Modified: trunk/yast/en_GB/po/sound.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/sound.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/sound.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: sound\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:57+0100\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2008-03-27 22:53+0000\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"

Modified: trunk/yast/en_GB/po/squid.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/squid.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/squid.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: squid\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2008-03-27 22:53+0000\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"
@@ -1653,11 +1653,11 @@
 #. TRANSLATORS: language name - combo box entry
 #: src/modules/SquidErrorMessages.rb:53
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
 #: src/modules/SquidErrorMessages.rb:54
 msgid "Arabic"
-msgstr ""
+msgstr "Arabic"
 
 #: src/modules/SquidErrorMessages.rb:55
 msgid "Armenian"
@@ -1705,7 +1705,7 @@
 
 #: src/modules/SquidErrorMessages.rb:66
 msgid "Persian"
-msgstr ""
+msgstr "Persian"
 
 #: src/modules/SquidErrorMessages.rb:67
 msgid "Finnish"
@@ -1725,7 +1725,7 @@
 
 #: src/modules/SquidErrorMessages.rb:71
 msgid "Indonesian"
-msgstr ""
+msgstr "Indonesian"
 
 #: src/modules/SquidErrorMessages.rb:72
 msgid "Italian"
@@ -1741,7 +1741,7 @@
 
 #: src/modules/SquidErrorMessages.rb:75
 msgid "Latvian"
-msgstr ""
+msgstr "Latvian"
 
 #: src/modules/SquidErrorMessages.rb:76
 msgid "Lithuanian"
@@ -1749,7 +1749,7 @@
 
 #: src/modules/SquidErrorMessages.rb:77
 msgid "Malay"
-msgstr ""
+msgstr "Malay"
 
 #: src/modules/SquidErrorMessages.rb:78
 msgid "Dutch"
@@ -1810,7 +1810,7 @@
 
 #: src/modules/SquidErrorMessages.rb:90
 msgid "Thai"
-msgstr ""
+msgstr "Thai"
 
 #: src/modules/SquidErrorMessages.rb:91
 msgid "Turkish"
@@ -1823,11 +1823,11 @@
 
 #: src/modules/SquidErrorMessages.rb:93
 msgid "Uzbek"
-msgstr ""
+msgstr "Uzbek"
 
 #: src/modules/SquidErrorMessages.rb:94
 msgid "Vietnamese"
-msgstr ""
+msgstr "Vietnamese"
 
 #: src/modules/SquidErrorMessages.rb:95
 msgid "Simplified Chinese"

Modified: trunk/yast/en_GB/po/sshd.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/sshd.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/sshd.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: sshd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:56+0100\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2008-03-27 22:42+0000\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"
@@ -281,7 +281,7 @@
 #. Table header
 #: tutorials/tutorial-includes/sshd/t1-start-complex.ycp:63
 msgid "Number"
-msgstr ""
+msgstr "Number"
 
 #: tutorials/tutorial-includes/sshd/t1-start-complex.ycp:63
 msgid "Sshd"

Modified: trunk/yast/en_GB/po/storage.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/storage.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/storage.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: storage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-09-29 18:07+0200\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"
@@ -114,7 +114,7 @@
 msgstr "&Create Partition Setup..."
 
 #. popup text
-#: src/clients/inst_disk_proposal.rb:117
+#: src/clients/inst_disk_proposal.rb:123
 #: src/clients/partitions_proposal.rb:105
 msgid ""
 "No automatic proposal possible.\n"
@@ -127,7 +127,7 @@
 #. this is the resize case
 #.
 #. this is the normal case
-#: src/clients/inst_disk_proposal.rb:129 src/clients/inst_target_part.rb:164
+#: src/clients/inst_disk_proposal.rb:135 src/clients/inst_target_part.rb:164
 #: src/clients/inst_target_part.rb:178 src/clients/inst_target_part.rb:185
 #, fuzzy
 #| msgid "Special settings"
@@ -135,7 +135,7 @@
 msgstr "Special settings"
 
 #. help on suggested partitioning
-#: src/clients/inst_disk_proposal.rb:159
+#: src/clients/inst_disk_proposal.rb:165
 msgid ""
 "<p>\n"
 "Your hard disks have been checked. The partition setup\n"
@@ -147,7 +147,7 @@
 
 #. help text continued
 #. %1 is replaced by button text
-#: src/clients/inst_disk_proposal.rb:169
+#: src/clients/inst_disk_proposal.rb:175
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -163,7 +163,7 @@
 "partioner dialog.</p>\n"
 
 #. help text continued
-#: src/clients/inst_disk_proposal.rb:182
+#: src/clients/inst_disk_proposal.rb:188
 #, fuzzy
 #| msgid ""
 #| "<p>\n"
@@ -192,15 +192,21 @@
 
 #. Attention! besides the testsuite, AutoYaST is using this to turn off
 #. the proposal screen too. See inst_autosetup.ycp
-#: src/clients/inst_disk_proposal.rb:226
+#: src/clients/inst_disk_proposal.rb:232
 msgid "Impossible to create the requested proposal."
 msgstr "Impossible to create the requested proposal."
 
-#: src/clients/inst_disk_proposal.rb:230 src/clients/inst_target_part.rb:449
+#. TRANSLATORS: popup error message
+#: src/clients/inst_disk_proposal.rb:238
+msgid "Not enough space available to propose snapshots for root volume."
+msgstr ""
+
+#. TRANSLATORS: popup error message
+#: src/clients/inst_disk_proposal.rb:244 src/clients/inst_target_part.rb:449
 msgid "Not enough space available to propose separate /home."
 msgstr ""
 
-#: src/clients/inst_disk_proposal.rb:314
+#: src/clients/inst_disk_proposal.rb:295
 msgid ""
 "Computing this proposal will overwrite manual changes \n"
 "done so far. Continue with computing proposal?"
@@ -1043,7 +1049,7 @@
 #. Label text
 #. TRANSLATORS: checkbox text
 #: src/include/partitioning/auto_part_ui.rb:341
-#: src/modules/StorageProposal.rb:6209
+#: src/modules/StorageProposal.rb:6230
 msgid "Propose Separate &Home Partition"
 msgstr "Propose Separate &Home Partition"
 
@@ -1062,7 +1068,7 @@
 msgstr "Proposal type"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:253
+#: src/include/partitioning/custom_part_check_generated.rb:246
 #, fuzzy
 msgid ""
 "You have not assigned a root partition for\n"
@@ -1076,7 +1082,7 @@
 "Assign the root mount point \"/\" to a partition.\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:266
+#: src/include/partitioning/custom_part_check_generated.rb:259
 #, fuzzy
 msgid ""
 "You tried to mount a FAT partition to one of the following mount\n"
@@ -1090,7 +1096,7 @@
 "Use a Linux file system, such as ext3 or reiserfs, for these mount points.\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:279
+#: src/include/partitioning/custom_part_check_generated.rb:272
 #, fuzzy
 msgid ""
 "You tried to mount a FAT partition to the\n"
@@ -1103,7 +1109,7 @@
 "Use a Linux file system, such as ext2, ext3 or reiserfs, for this mount point.\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:293
+#: src/include/partitioning/custom_part_check_generated.rb:286
 #, fuzzy
 msgid ""
 "You have mounted a partition with Btrfs to the\n"
@@ -1116,7 +1122,7 @@
 "Use a Linux file system, such as ext2, ext3 or reiserfs, for this mount point.\n"
 
 #. popup text, %1 is a number
-#: src/include/partitioning/custom_part_check_generated.rb:308
+#: src/include/partitioning/custom_part_check_generated.rb:301
 #, fuzzy
 msgid ""
 "Warning:\n"
@@ -1138,7 +1144,7 @@
 "Change this?\n"
 
 #. popup text, %1 is a size
-#: src/include/partitioning/custom_part_check_generated.rb:328
+#: src/include/partitioning/custom_part_check_generated.rb:321
 #, fuzzy
 msgid ""
 "Warning:\n"
@@ -1154,7 +1160,7 @@
 "Do you want to do this?\n"
 
 #. /////////////////////////// NO BOOT ///////////////////////////
-#: src/include/partitioning/custom_part_check_generated.rb:345
+#: src/include/partitioning/custom_part_check_generated.rb:338
 msgid ""
 "Warning: There is no partition of type bios_grub present.\n"
 "To boot from a GPT disk using grub2 such a partition is needed.\n"
@@ -1165,7 +1171,7 @@
 #. popup text
 #. If the user chooses 'no' here, the system will not be able to
 #. boot from the hard drive!
-#: src/include/partitioning/custom_part_check_generated.rb:365
+#: src/include/partitioning/custom_part_check_generated.rb:358
 #, fuzzy
 msgid ""
 "Warning: There is no partition mounted as /boot.\n"
@@ -1185,7 +1191,7 @@
 "Do you want to change your setup?\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:385
+#: src/include/partitioning/custom_part_check_generated.rb:378
 #, fuzzy
 msgid ""
 "Warning: According to your setup, you intend to\n"
@@ -1206,7 +1212,7 @@
 "\n"
 "Change this?\n"
 
-#: src/include/partitioning/custom_part_check_generated.rb:403
+#: src/include/partitioning/custom_part_check_generated.rb:398
 msgid ""
 "Warning: Some subvolumes of the root filesystem are shadowed by\n"
 "mount points of other filesystem. This could lead to problems.\n"
@@ -1215,7 +1221,7 @@
 msgstr ""
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:422
+#: src/include/partitioning/custom_part_check_generated.rb:415
 #, fuzzy
 msgid ""
 "Warning: With your current setup, your %1\n"
@@ -1233,34 +1239,9 @@
 "Change this?\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:443
+#: src/include/partitioning/custom_part_check_generated.rb:433
 #, fuzzy
 msgid ""
-"Warning: With your current setup, your %1 installation\n"
-"will encounter problems when booting, because you have no \"boot\"\n"
-"partition and your \"root\" partition is an LVM logical volume.\n"
-"This does not work.\n"
-"\n"
-"If you do not know exactly what you are doing, use a normal\n"
-"partition for your files below /boot.\n"
-"\n"
-"Really use this setup?\n"
-msgstr ""
-"Warning: With your current setup, your %1 installation\n"
-"will encounter problems when booting, because you have no \"boot\"\n"
-"partition and your \"root\" partition is an LVM logical volume.\n"
-"This does not work.\n"
-"\n"
-"\n"
-"If you do not know exactly what you are doing, use a normal\n"
-"partition for your files below /boot.\n"
-"\n"
-"Change this?\n"
-
-#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:464
-#, fuzzy
-msgid ""
 "Warning: With your current setup, your %2 installation\n"
 "will encounter problems when booting, because you have no\n"
 "FAT partition mounted on %1.\n"
@@ -1284,7 +1265,7 @@
 "Change this?\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:486
+#: src/include/partitioning/custom_part_check_generated.rb:455
 #, fuzzy
 msgid ""
 "Warning: With your current setup, your %2 installation will\n"
@@ -1310,13 +1291,13 @@
 "Change this?\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:509
+#: src/include/partitioning/custom_part_check_generated.rb:478
 #, fuzzy
 msgid "Really use this setup?"
 msgstr "Really delete this entry?"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:517
+#: src/include/partitioning/custom_part_check_generated.rb:486
 #, fuzzy
 msgid ""
 "\n"
@@ -1339,7 +1320,7 @@
 "Do you want to change this?\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:533
+#: src/include/partitioning/custom_part_check_generated.rb:502
 #, fuzzy
 msgid ""
 "\n"
@@ -1355,7 +1336,7 @@
 "particularly in any of the following cases:\n"
 
 #. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:540
+#: src/include/partitioning/custom_part_check_generated.rb:509
 msgid ""
 "- if this is an existing ReiserFS partition\n"
 "- if this partition already contains a Linux distribution that will be\n"
@@ -1368,7 +1349,7 @@
 "- if this partition does not yet contain a file system\n"
 
 #. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:547
+#: src/include/partitioning/custom_part_check_generated.rb:516
 #, fuzzy
 #| msgid ""
 #| "If in doubt, you might want to go back and mark this partition for\n"
@@ -1384,7 +1365,7 @@
 "like /, /boot, /usr, /opt, or /var.\n"
 
 #. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:553
+#: src/include/partitioning/custom_part_check_generated.rb:522
 #, fuzzy
 msgid ""
 "If you decide to format the partition, all data on it will be lost.\n"
@@ -1396,7 +1377,7 @@
 "Do you want to change your setup?\n"
 
 #. popup text %1 is replaced by a raid name e.g. md0
-#: src/include/partitioning/custom_part_check_generated.rb:608
+#: src/include/partitioning/custom_part_check_generated.rb:577
 msgid ""
 "The selected device belongs to the RAID (%1).\n"
 "Remove it from the RAID before editing it.\n"
@@ -1405,7 +1386,7 @@
 "Remove it from the RAID before editing it.\n"
 
 #. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:619
+#: src/include/partitioning/custom_part_check_generated.rb:588
 msgid ""
 "The selected device belongs to a volume group (%1).\n"
 "Remove it from the volume group before editing it.\n"
@@ -1414,7 +1395,7 @@
 "Remove it from the volume group before editing it.\n"
 
 #. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:629
+#: src/include/partitioning/custom_part_check_generated.rb:598
 msgid ""
 "The selected device is used by volume (%1).\n"
 "Remove the volume before editing it.\n"
@@ -1423,7 +1404,7 @@
 "Remove the volume before editing it.\n"
 
 #. popup text %2 is a device name, %1 is the raid name
-#: src/include/partitioning/custom_part_check_generated.rb:662
+#: src/include/partitioning/custom_part_check_generated.rb:631
 msgid ""
 "The device (%2) belongs to the RAID (%1).\n"
 "Remove it from the RAID before deleting it.\n"
@@ -1432,7 +1413,7 @@
 "Remove it from the RAID before deleting it.\n"
 
 #. popup text, %1 and %2 are device names
-#: src/include/partitioning/custom_part_check_generated.rb:673
+#: src/include/partitioning/custom_part_check_generated.rb:642
 msgid ""
 "The device (%2) is used by %1.\n"
 "Remove %1 before deleting it.\n"
@@ -1440,13 +1421,13 @@
 "The device (%2) is used by %1.\n"
 "Remove %1 before deleting it.\n"
 
-#: src/include/partitioning/custom_part_check_generated.rb:685
+#: src/include/partitioning/custom_part_check_generated.rb:654
 #, fuzzy
 msgid "It cannot be deleted while mounted."
 msgstr "The selected scheme cannot be deleted."
 
 #. popup text, %1 is a device name
-#: src/include/partitioning/custom_part_check_generated.rb:721
+#: src/include/partitioning/custom_part_check_generated.rb:690
 #, fuzzy
 #| msgid ""
 #| "The device (%1) cannot be removed\n"
@@ -1461,7 +1442,7 @@
 "partition with higher number is in use.\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:797
+#: src/include/partitioning/custom_part_check_generated.rb:766
 #, fuzzy
 #| msgid ""
 #| "The selected extended partition contains partitions which are currently mounted:\n"
@@ -1480,7 +1461,7 @@
 "Please choose Cancel unless you know exactly what you are doing.\n"
 
 #. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_check_generated.rb:815
+#: src/include/partitioning/custom_part_check_generated.rb:784
 msgid ""
 "\n"
 "The selected extended partition contains at least one LVM partition\n"
@@ -1495,7 +1476,7 @@
 "before deleting the extended partition.\n"
 
 #. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_check_generated.rb:826
+#: src/include/partitioning/custom_part_check_generated.rb:795
 msgid ""
 "\n"
 "The selected extended partition contains at least one partition\n"
@@ -1510,7 +1491,7 @@
 "deleting the extended partition.\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:837
+#: src/include/partitioning/custom_part_check_generated.rb:806
 msgid ""
 "\n"
 "The selected extended partition contains at least one partition\n"
@@ -1531,15 +1512,15 @@
 
 #. label text
 #: src/include/partitioning/custom_part_dialogs.rb:75
-#: src/include/partitioning/ep-dialogs.rb:672
-#: src/modules/StorageProposal.rb:6336
+#: src/include/partitioning/ep-dialogs.rb:768
+#: src/modules/StorageProposal.rb:6357
 #, fuzzy
 #| msgid "Do not forget what you enter here."
 msgid "Do not forget what you enter here!"
 msgstr "Do not forget what you enter here."
 
 #: src/include/partitioning/custom_part_dialogs.rb:79
-#: src/include/partitioning/ep-dialogs.rb:675
+#: src/include/partitioning/ep-dialogs.rb:771
 #, fuzzy
 msgid "Empty password allowed."
 msgstr "Empty password is not allowed."
@@ -1575,7 +1556,7 @@
 #. Label: get password for user root
 #. Please use newline if label is longer than 40 characters
 #: src/include/partitioning/custom_part_dialogs.rb:137
-#: src/include/partitioning/ep-dialogs.rb:700
+#: src/include/partitioning/ep-dialogs.rb:796
 #, fuzzy
 #| msgid "&Enter a password for your file system:"
 msgid "&Enter a Password for your File System:"
@@ -1588,7 +1569,7 @@
 #. Label: get same password again for verification
 #. Please use newline if label is longer than 40 characters
 #: src/include/partitioning/custom_part_dialogs.rb:148
-#: src/include/partitioning/ep-dialogs.rb:684 src/modules/Storage.rb:3995
+#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:3998
 #, fuzzy
 #| msgid "Reenter the password for &verification:"
 msgid "Reenter the Password for &Verification:"
@@ -1614,7 +1595,7 @@
 #. popup text
 #. popup text
 #: src/include/partitioning/custom_part_dialogs.rb:197
-#: src/modules/Storage.rb:3951
+#: src/modules/Storage.rb:3954
 msgid ""
 "You did not enter a password.\n"
 "Try again.\n"
@@ -1625,7 +1606,7 @@
 #. popup text
 #. popup text
 #: src/include/partitioning/custom_part_dialogs.rb:204
-#: src/modules/Storage.rb:3959
+#: src/modules/Storage.rb:3962
 msgid ""
 "The password must have at least %1 characters.\n"
 "Try again.\n"
@@ -2054,7 +2035,7 @@
 #. TRANSLATOR: checkbox text
 #. TRANSLATORS: checkbox text
 #: src/include/partitioning/custom_part_dialogs.rb:1650
-#: src/modules/StorageProposal.rb:6190
+#: src/modules/StorageProposal.rb:6211
 msgid "Enable Snapshots"
 msgstr ""
 
@@ -2067,25 +2048,25 @@
 msgid "Subvolume Handling"
 msgstr "Signature Handling"
 
-#: src/include/partitioning/custom_part_dialogs.rb:1721
+#: src/include/partitioning/custom_part_dialogs.rb:1724
 #, 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:1725
+#: src/include/partitioning/custom_part_dialogs.rb:1728
 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:1734
+#: src/include/partitioning/custom_part_dialogs.rb:1738
 #, 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:1765
+#: src/include/partitioning/custom_part_dialogs.rb:1767
 msgid "Modifications done so far in this dialog will be lost."
 msgstr ""
 
@@ -2128,7 +2109,7 @@
 
 #. helptext
 #: src/include/partitioning/custom_part_helptexts.rb:87
-#: src/include/partitioning/ep-dialogs.rb:612
+#: src/include/partitioning/ep-dialogs.rb:708
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -2148,7 +2129,7 @@
 #. help text, continued
 #. helptext
 #: src/include/partitioning/custom_part_helptexts.rb:100
-#: src/include/partitioning/ep-dialogs.rb:627
+#: src/include/partitioning/ep-dialogs.rb:723
 msgid ""
 "<p>\n"
 "If you forget your password, you will lose access to the data on your file system.\n"
@@ -2167,7 +2148,7 @@
 #. help text, continued
 #. helptext, %1 is replaced by integer
 #: src/include/partitioning/custom_part_helptexts.rb:114
-#: src/include/partitioning/ep-dialogs.rb:641
+#: src/include/partitioning/ep-dialogs.rb:737
 msgid ""
 "<p>\n"
 "You must distinguish between uppercase and lowercase. A password should have at\n"
@@ -2199,7 +2180,7 @@
 #. help text, continued
 #. helptext
 #: src/include/partitioning/custom_part_helptexts.rb:142
-#: src/include/partitioning/ep-dialogs.rb:653
+#: src/include/partitioning/ep-dialogs.rb:749
 msgid ""
 "<p>\n"
 "Do not forget this password!\n"
@@ -2469,12 +2450,12 @@
 
 #. //////////////////////////////////////////////
 #. modify map new
-#: src/include/partitioning/custom_part_lib.rb:947
-#: src/include/partitioning/custom_part_lib.rb:974
+#: src/include/partitioning/custom_part_lib.rb:954
+#: src/include/partitioning/custom_part_lib.rb:981
 msgid "The file system is currently mounted on %1."
 msgstr ""
 
-#: src/include/partitioning/custom_part_lib.rb:952
+#: src/include/partitioning/custom_part_lib.rb:959
 msgid ""
 "You can try to unmount it now, continue without unmounting or cancel.\n"
 "Click Cancel unless you know exactly what you are doing."
@@ -2482,32 +2463,32 @@
 
 #. button text
 #. button text
-#: src/include/partitioning/custom_part_lib.rb:963
-#: src/include/partitioning/custom_part_lib.rb:988
+#: src/include/partitioning/custom_part_lib.rb:970
+#: src/include/partitioning/custom_part_lib.rb:995
 #, fuzzy
 #| msgid "Mount"
 msgid "Unmount"
 msgstr "Mount"
 
-#: src/include/partitioning/custom_part_lib.rb:979
+#: src/include/partitioning/custom_part_lib.rb:986
 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:1025
+#: src/include/partitioning/custom_part_lib.rb:1032
 #, 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:1038
+#: src/include/partitioning/custom_part_lib.rb:1045
 #, 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:1049
+#: src/include/partitioning/custom_part_lib.rb:1056
 #, fuzzy
 #| msgid ""
 #| "Partition %1 cannot be resized\n"
@@ -2518,7 +2499,7 @@
 "because the file system could not be mounted.\n"
 
 #. push button text
-#: src/include/partitioning/ep-all.rb:78
+#: src/include/partitioning/ep-all.rb:80
 #, fuzzy
 msgid "Rescan Devices"
 msgstr "Raid Device"
@@ -2530,62 +2511,68 @@
 msgstr "Empty Mount Point"
 
 #. menu entry text
-#: src/include/partitioning/ep-all.rb:100
+#: src/include/partitioning/ep-all.rb:94
 #, fuzzy
 #| msgid "Enter Provider Password"
 msgid "Provide Crypt &Passwords..."
 msgstr "Enter Provider Password"
 
 #. menu entry text
-#: src/include/partitioning/ep-all.rb:112
+#: src/include/partitioning/ep-all.rb:99
 #, fuzzy
 msgid "Configure &iSCSI..."
 msgstr "Configure &iSCSI Disks"
 
 #. menu entry text
-#: src/include/partitioning/ep-all.rb:124
+#: src/include/partitioning/ep-all.rb:104
 #, fuzzy
+msgid "Configure &FCoE..."
+msgstr "Configure CUPS"
+
+#. menu entry text
+#: src/include/partitioning/ep-all.rb:109
+#, fuzzy
 msgid "Configure &Multipath..."
 msgstr "&Configure Fully Automatic Update..."
 
 #. menu entry text
-#: src/include/partitioning/ep-all.rb:133
+#: src/include/partitioning/ep-all.rb:114
 #, fuzzy
 msgid "Configure &DASD..."
 msgstr "Configure &DASD Disks"
 
 #. menu entry text
-#: src/include/partitioning/ep-all.rb:141
+#: src/include/partitioning/ep-all.rb:119
 #, fuzzy
 msgid "Configure &zFCP..."
 msgstr "Configure CUPS"
 
 #. menu entry text
-#: src/include/partitioning/ep-all.rb:149
+#: src/include/partitioning/ep-all.rb:124
 #, fuzzy
 msgid "Configure &XPRAM..."
 msgstr "Configure X11"
 
 #. menu button text
-#: src/include/partitioning/ep-all.rb:157
+#: src/include/partitioning/ep-all.rb:129
 msgid "Configure..."
 msgstr "Configure..."
 
 #. dialog heading, %1 is replaced with hostname
-#: src/include/partitioning/ep-all.rb:169
+#: src/include/partitioning/ep-all.rb:140
 #, fuzzy
 msgid "Available Storage on %1"
 msgstr "Available Sections"
 
 #. helptext
-#: src/include/partitioning/ep-all.rb:184
+#: src/include/partitioning/ep-all.rb:155
 msgid ""
 "<p>This view shows all storage devices\n"
 "available.</p>"
 msgstr ""
 
 #. helptext
-#: src/include/partitioning/ep-all.rb:192
+#: src/include/partitioning/ep-all.rb:163
 msgid ""
 "<p>By double clicking a table entry,\n"
 "you navigate to the view with detailed information about the\n"
@@ -2593,14 +2580,14 @@
 msgstr ""
 
 #. helptext
-#: src/include/partitioning/ep-all.rb:202
+#: src/include/partitioning/ep-all.rb:173
 msgid ""
 "<p>By selecting a table entry you can\n"
 "navigate to the view with detailed information about the device.</p>"
 msgstr ""
 
 #. popup text
-#: src/include/partitioning/ep-all.rb:262
+#: src/include/partitioning/ep-all.rb:233
 #, fuzzy
 msgid ""
 "Rescaning disks cancels all current changes.\n"
@@ -2610,7 +2597,7 @@
 "Really do this?"
 
 #. popup text
-#: src/include/partitioning/ep-all.rb:280
+#: src/include/partitioning/ep-all.rb:251
 #, fuzzy
 msgid ""
 "Calling iSCSI configuration cancels all current changes.\n"
@@ -2620,9 +2607,19 @@
 "Really do this?"
 
 #. popup text
+#: src/include/partitioning/ep-all.rb:260
+#, fuzzy
+msgid ""
+"Calling FCoE configuration cancels all current changes.\n"
+"Really call FCoE configuration?"
+msgstr ""
+"Calling iSCSI configuration cancels all current changes.\n"
+"Really do this?"
+
 #. popup text
-#: src/include/partitioning/ep-all.rb:294
-#: src/include/partitioning/ep-all.rb:303
+#. popup text
+#: src/include/partitioning/ep-all.rb:274
+#: src/include/partitioning/ep-all.rb:283
 #, fuzzy
 msgid ""
 "Calling multipath configuration cancels all current changes.\n"
@@ -2632,7 +2629,7 @@
 "Really do this?"
 
 #. popup text
-#: src/include/partitioning/ep-all.rb:320
+#: src/include/partitioning/ep-all.rb:300
 #, fuzzy
 msgid ""
 "Calling DASD configuration cancels all current changes.\n"
@@ -2642,7 +2639,7 @@
 "Really do this?"
 
 #. popup text
-#: src/include/partitioning/ep-all.rb:329
+#: src/include/partitioning/ep-all.rb:309
 #, fuzzy
 msgid ""
 "Calling zFCP configuration cancels all current changes.\n"
@@ -2652,7 +2649,7 @@
 "Really do this?"
 
 #. popup text
-#: src/include/partitioning/ep-all.rb:338
+#: src/include/partitioning/ep-all.rb:318
 #, fuzzy
 msgid ""
 "Calling XPRAM configuration cancels all current changes.\n"
@@ -2942,15 +2939,53 @@
 msgstr "&Detect Devices"
 
 #. helptext
-#: src/include/partitioning/ep-dialogs.rb:38
+#: src/include/partitioning/ep-dialogs.rb:39
 #, fuzzy
+msgid "<p>Choose the role of the device.</p>"
+msgstr ""
+"<p>\n"
+"Choose the new size for your %1 partition.\n"
+"</p>"
+
+#. radio button text
+#: src/include/partitioning/ep-dialogs.rb:55
+msgid "Operating System"
+msgstr "Operating System"
+
+#. radio button text
+#: src/include/partitioning/ep-dialogs.rb:60
+#, fuzzy
+#| msgid "Delta RPM Application Progress"
+msgid "Data and ISV Applications"
+msgstr "Delta RPM Application Progress"
+
+#. radio button text
+#: src/include/partitioning/ep-dialogs.rb:65
+msgid "Swap"
+msgstr ""
+
+#. radio button text
+#: src/include/partitioning/ep-dialogs.rb:70
+msgid "Raw Volume (unformatted)"
+msgstr ""
+
+#. heading for a frame in a dialog
+#: src/include/partitioning/ep-dialogs.rb:78
+#, fuzzy
+#| msgid "Role: %s"
+msgid "Role"
+msgstr "Role: %s"
+
+#. helptext
+#: src/include/partitioning/ep-dialogs.rb:107
+#, fuzzy
 msgid ""
 "<p>First, choose whether the partition should be\n"
 "formatted and the desired file system type.</p>"
 msgstr "<p>First, choose the type of the partition and whether this partition should be formatted.</p>"
 
 #. helptext
-#: src/include/partitioning/ep-dialogs.rb:45
+#: src/include/partitioning/ep-dialogs.rb:114
 msgid ""
 "<p>If you want to encrypt all data on the\n"
 "volume, select <b>Encrypt Device</b>. Changing the encryption on an existing\n"
@@ -2958,7 +2993,7 @@
 msgstr ""
 
 #. helptext
-#: src/include/partitioning/ep-dialogs.rb:55
+#: src/include/partitioning/ep-dialogs.rb:124
 #, fuzzy
 msgid ""
 "<p>Then, choose whether the partition should\n"
@@ -2966,55 +3001,55 @@
 msgstr "<p>Then, enter the mount point ( /, /boot, /usr, /var, etc.)</p>"
 
 #. set globals
-#: src/include/partitioning/ep-dialogs.rb:213
+#: src/include/partitioning/ep-dialogs.rb:309
 #, fuzzy
 msgid "Formatting Options"
 msgstr "Logging Options"
 
-#: src/include/partitioning/ep-dialogs.rb:221
+#: src/include/partitioning/ep-dialogs.rb:317
 #, fuzzy
 msgid "Format partition"
 msgstr "Size of the partition."
 
-#: src/include/partitioning/ep-dialogs.rb:232
+#: src/include/partitioning/ep-dialogs.rb:328
 #, fuzzy
 msgid "Do not format partition"
 msgstr "Do ¬ format"
 
-#: src/include/partitioning/ep-dialogs.rb:248
+#: src/include/partitioning/ep-dialogs.rb:344
 #, fuzzy
 msgid "Do not mount partition"
 msgstr "Disk to Partition"
 
-#: src/include/partitioning/ep-dialogs.rb:267
+#: src/include/partitioning/ep-dialogs.rb:363
 #, fuzzy
 msgid "Mounting Options"
 msgstr "Mount Options"
 
-#: src/include/partitioning/ep-dialogs.rb:275
+#: src/include/partitioning/ep-dialogs.rb:371
 #, fuzzy
 msgid "Mount partition"
 msgstr "Mounting all partitions..."
 
 #. Column header
-#: src/include/partitioning/ep-dialogs.rb:281 src/modules/StorageFields.rb:144
+#: src/include/partitioning/ep-dialogs.rb:377 src/modules/StorageFields.rb:144
 msgid "Mount Point"
 msgstr "Mount Point"
 
 #. button text
-#: src/include/partitioning/ep-dialogs.rb:288
+#: src/include/partitioning/ep-dialogs.rb:384
 #, fuzzy
 msgid "Fs&tab Options..."
 msgstr "Fs&tab Options"
 
 #. error popup
-#: src/include/partitioning/ep-dialogs.rb:462
+#: src/include/partitioning/ep-dialogs.rb:558
 #, fuzzy
 msgid "Crypt files must be encrypted."
 msgstr "No scheme selected."
 
 #. error popup
-#: src/include/partitioning/ep-dialogs.rb:473
+#: src/include/partitioning/ep-dialogs.rb:569
 #, fuzzy
 msgid ""
 "You chose to create the crypt file, but did not specify\n"
@@ -3028,19 +3063,19 @@
 "Also check the format option.\n"
 
 #. error popup
-#: src/include/partitioning/ep-dialogs.rb:489
+#: src/include/partitioning/ep-dialogs.rb:585
 #, fuzzy
 msgid "Crypt files require a mount point."
 msgstr "Provide a mount point."
 
 #. error popup
-#: src/include/partitioning/ep-dialogs.rb:503
+#: src/include/partitioning/ep-dialogs.rb:599
 #, fuzzy
 msgid "Tmpfs requires a mount point."
 msgstr "Provide a mount point."
 
 #. helptext
-#: src/include/partitioning/ep-dialogs.rb:587
+#: src/include/partitioning/ep-dialogs.rb:683
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -3056,7 +3091,7 @@
 "</p>\n"
 
 #. helptext
-#: src/include/partitioning/ep-dialogs.rb:600
+#: src/include/partitioning/ep-dialogs.rb:696
 msgid ""
 "<p>\n"
 "The file system used for this volume is swap. You can leave the encryption \n"
@@ -3065,23 +3100,23 @@
 "</p>\n"
 msgstr ""
 
-#: src/include/partitioning/ep-dialogs.rb:670
+#: src/include/partitioning/ep-dialogs.rb:766
 #, fuzzy
 #| msgid "All changes will be lost!"
 msgid "All data stored on the volume will be lost!"
 msgstr "All changes will be lost!"
 
-#: src/include/partitioning/ep-dialogs.rb:693
+#: src/include/partitioning/ep-dialogs.rb:789
 msgid "Password"
 msgstr "Password"
 
 #. popup text
-#: src/include/partitioning/ep-dialogs.rb:790
+#: src/include/partitioning/ep-dialogs.rb:886
 msgid "Resize not supported by underlying device."
 msgstr ""
 
 #. popup text
-#: src/include/partitioning/ep-dialogs.rb:795
+#: src/include/partitioning/ep-dialogs.rb:891
 msgid ""
 "\n"
 "You cannot resize the selected partition because the file system\n"
@@ -3091,7 +3126,7 @@
 "You cannot resize the selected partition because the file system\n"
 "on this partition does not support resizing.\n"
 
-#: src/include/partitioning/ep-dialogs.rb:819
+#: src/include/partitioning/ep-dialogs.rb:915
 #, fuzzy
 #| msgid "It is not possible to create a partition on %1."
 msgid ""
@@ -3100,7 +3135,7 @@
 msgstr "It is not possible to create a partition on %1."
 
 #. FIXME: Really?
-#: src/include/partitioning/ep-dialogs.rb:838
+#: src/include/partitioning/ep-dialogs.rb:934
 #, fuzzy
 #| msgid ""
 #| "Partition %1 cannot be resized\n"
@@ -3113,24 +3148,24 @@
 "because the file system seems to be inconsistent.\n"
 
 #. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:865
+#: src/include/partitioning/ep-dialogs.rb:961
 #, fuzzy
 msgid "Resize Partition %1"
 msgstr "R&esize Partition"
 
 #. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:886
+#: src/include/partitioning/ep-dialogs.rb:982
 #, fuzzy
 msgid "Resize Logical Volume %1"
 msgstr "Resize Logical Volume"
 
 #. size_k + min_size_k could be > max_size_k
-#: src/include/partitioning/ep-dialogs.rb:918
+#: src/include/partitioning/ep-dialogs.rb:1014
 #, fuzzy
 msgid "Current size: %1"
 msgstr "Current Time Zone: %1"
 
-#: src/include/partitioning/ep-dialogs.rb:930
+#: src/include/partitioning/ep-dialogs.rb:1026
 #, fuzzy
 msgid "Currently used: %1"
 msgstr ""
@@ -3141,8 +3176,8 @@
 #. input field label
 #. combo box label
 #. Column header
-#: src/include/partitioning/ep-dialogs.rb:943
-#: src/include/partitioning/ep-dialogs.rb:980
+#: src/include/partitioning/ep-dialogs.rb:1039
+#: src/include/partitioning/ep-dialogs.rb:1076
 #: src/include/partitioning/ep-hd-dialogs.rb:256
 #: src/include/partitioning/ep-loop-dialogs.rb:118
 #: src/include/partitioning/ep-lvm-dialogs.rb:559
@@ -3154,7 +3189,7 @@
 
 #. radio button text, %1 is replaced by size
 #. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:953
+#: src/include/partitioning/ep-dialogs.rb:1049
 #: src/include/partitioning/ep-hd-dialogs.rb:242
 #: src/include/partitioning/ep-lvm-dialogs.rb:535
 #, fuzzy
@@ -3162,14 +3197,14 @@
 msgstr "Maximum &Size (MB)"
 
 #. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:963
+#: src/include/partitioning/ep-dialogs.rb:1059
 #, fuzzy
 msgid "Minimum Size (%1)"
 msgstr "Maximum &Size (MB)"
 
 #. radio button text
 #. radio button text
-#: src/include/partitioning/ep-dialogs.rb:972
+#: src/include/partitioning/ep-dialogs.rb:1068
 #: src/include/partitioning/ep-hd-dialogs.rb:251
 #: src/include/partitioning/ep-lvm-dialogs.rb:568
 #, fuzzy
@@ -3177,7 +3212,7 @@
 msgstr "Custom &Size"
 
 #. help text
-#: src/include/partitioning/ep-dialogs.rb:1006
+#: src/include/partitioning/ep-dialogs.rb:1102
 #, fuzzy
 msgid "<p>Choose new size.</p>"
 msgstr ""
@@ -3187,7 +3222,7 @@
 
 #. error popup, %1 and %2 are replaced by sizes
 #. error popup, %1 and %2 are replaced by sizes
-#: src/include/partitioning/ep-dialogs.rb:1057
+#: src/include/partitioning/ep-dialogs.rb:1153
 #: src/include/partitioning/ep-hd-dialogs.rb:359
 #: src/include/partitioning/ep-lvm-dialogs.rb:692
 #, fuzzy
@@ -3200,7 +3235,7 @@
 #. after user tries to do that is stupid - in some cases
 #. we can tell beforehand, thus user should never get to this
 #. point (e.g. when the partition is mounted)
-#: src/include/partitioning/ep-dialogs.rb:1100
+#: src/include/partitioning/ep-dialogs.rb:1196
 msgid ""
 "You are extending a mounted filesystem by %1 Gigabyte. \n"
 "This may be quite slow and can take hours. You might possibly want \n"
@@ -3209,13 +3244,13 @@
 msgstr ""
 
 #. label for log view
-#: src/include/partitioning/ep-dialogs.rb:1176
+#: src/include/partitioning/ep-dialogs.rb:1272
 #, fuzzy
 msgid "Output of %1"
 msgstr "\tOutput directory: %1"
 
 #. popup text
-#: src/include/partitioning/ep-dialogs.rb:1203
+#: src/include/partitioning/ep-dialogs.rb:1299
 #, fuzzy
 msgid "Rescanning disks..."
 msgstr "Running scripts..."
@@ -3433,65 +3468,65 @@
 msgstr "The entered WWPN is invalid."
 
 #. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:537
+#: src/include/partitioning/ep-hd-dialogs.rb:548
 #, fuzzy
 msgid "Add Partition on %1"
 msgstr "Edit Partition %1"
 
 #. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:583
+#: src/include/partitioning/ep-hd-dialogs.rb:594
 msgid "Edit Partition %1"
 msgstr "Edit Partition %1"
 
 #. error popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:616
+#: src/include/partitioning/ep-hd-dialogs.rb:627
 #, fuzzy
 #| msgid "No space is left in the extended partition."
 msgid "No space to moved partition %1."
 msgstr "No space is left in the extended partition."
 
 #. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:626
+#: src/include/partitioning/ep-hd-dialogs.rb:637
 #, fuzzy
 #| msgid "Adding partition %1 to swap"
 msgid "Move partition %1 forward?"
 msgstr "Adding partition %1 to swap"
 
 #. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:635
+#: src/include/partitioning/ep-hd-dialogs.rb:646
 msgid "Move partition %1 backward?"
 msgstr ""
 
 #. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:654
+#: src/include/partitioning/ep-hd-dialogs.rb:665
 #, fuzzy
 msgid "Move partition %1?"
 msgstr "Mounting all partitions..."
 
 #. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:656
+#: src/include/partitioning/ep-hd-dialogs.rb:667
 msgid "Forward"
 msgstr "Forward"
 
 #. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:658
+#: src/include/partitioning/ep-hd-dialogs.rb:669
 #, fuzzy
 #| msgid "Background"
 msgid "Backward"
 msgstr "Background"
 
-#: src/include/partitioning/ep-hd-dialogs.rb:714
+#: src/include/partitioning/ep-hd-dialogs.rb:725
 #, fuzzy
 msgid "Confirm Deleting of All Partitions"
 msgstr "Mounting all partitions..."
 
-#: src/include/partitioning/ep-hd-dialogs.rb:716
+#: src/include/partitioning/ep-hd-dialogs.rb:727
 msgid ""
 "The disk \"%1\" contains at least one partition.\n"
 "If you proceed, the following partitions will be deleted:"
 msgstr ""
 
-#: src/include/partitioning/ep-hd-dialogs.rb:721
+#: src/include/partitioning/ep-hd-dialogs.rb:732
 #, fuzzy
 msgid "Really delete all partitions on \"%1\"?"
 msgstr "Really delete all partitions on %1?"
@@ -3506,7 +3541,7 @@
 
 #. error popup
 #. TRANSLATORS: error popup
-#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5161
+#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5164
 msgid "The disk is in use and cannot be modified."
 msgstr ""
 
@@ -4514,13 +4549,13 @@
 msgstr "Used by"
 
 #. dialog title, %1 is a volume group
-#: src/include/partitioning/ep-lvm-dialogs.rb:1017
+#: src/include/partitioning/ep-lvm-dialogs.rb:1028
 #, fuzzy
 msgid "Add Logical Volume on %1"
 msgstr "Edit Logical Volume"
 
 #. dialog title - %1 is a logical volume name, %2 is a volume group
-#: src/include/partitioning/ep-lvm-dialogs.rb:1064
+#: src/include/partitioning/ep-lvm-dialogs.rb:1075
 #, fuzzy
 msgid "Edit Logical Volume %1 on %2"
 msgstr "Edit Logical Volume"
@@ -4748,7 +4783,7 @@
 #. tree node label
 #. dialog heading
 #: src/include/partitioning/ep-main.rb:491
-#: src/include/partitioning/ep-settings.rb:107
+#: src/include/partitioning/ep-settings.rb:130
 msgid "Settings"
 msgstr "Settings"
 
@@ -4990,19 +5025,19 @@
 msgstr "<p>Select the type of the declaration to add.</p>"
 
 #. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:631
+#: src/include/partitioning/ep-raid-dialogs.rb:642
 #, fuzzy
 msgid "Add RAID %1"
 msgstr "Add RAI&D"
 
 #. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:665
+#: src/include/partitioning/ep-raid-dialogs.rb:676
 #, fuzzy
 msgid "Resize RAID %1"
 msgstr "Remo&ve RAID"
 
 #. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:711
+#: src/include/partitioning/ep-raid-dialogs.rb:722
 #, fuzzy
 msgid "Edit RAID %1"
 msgstr "&Edit RAID"
@@ -5114,65 +5149,65 @@
 
 #. list entry
 #. Column header
-#: src/include/partitioning/ep-settings.rb:34 src/modules/StorageFields.rb:165
+#: src/include/partitioning/ep-settings.rb:36 src/modules/StorageFields.rb:165
 msgid "Label"
 msgstr "Label"
 
 #. list entry
 #. combo box entry
 #. Column header
-#: src/include/partitioning/ep-settings.rb:36
-#: src/include/partitioning/ep-settings.rb:63 src/modules/StorageFields.rb:162
+#: src/include/partitioning/ep-settings.rb:38
+#: src/include/partitioning/ep-settings.rb:65 src/modules/StorageFields.rb:162
 #, fuzzy
 msgid "UUID"
 msgstr "ID"
 
 #. list entry
 #. Column header
-#: src/include/partitioning/ep-settings.rb:38 src/modules/StorageFields.rb:147
+#: src/include/partitioning/ep-settings.rb:40 src/modules/StorageFields.rb:147
 #, fuzzy
 msgid "Mount by"
 msgstr "Mount By"
 
 #. list entry
 #. Column header
-#: src/include/partitioning/ep-settings.rb:40 src/modules/StorageFields.rb:150
+#: src/include/partitioning/ep-settings.rb:42 src/modules/StorageFields.rb:150
 msgid "Used by"
 msgstr "Used by"
 
 #. list entry
 #. Column header
-#: src/include/partitioning/ep-settings.rb:42 src/modules/StorageFields.rb:174
+#: src/include/partitioning/ep-settings.rb:44 src/modules/StorageFields.rb:174
 msgid "BIOS ID"
 msgstr "BIOS ID"
 
 #. list entry
-#: src/include/partitioning/ep-settings.rb:45
+#: src/include/partitioning/ep-settings.rb:47
 #, fuzzy
 msgid "Cylinder information"
 msgstr "Write drivers information"
 
 #. list entry
-#: src/include/partitioning/ep-settings.rb:50
+#: src/include/partitioning/ep-settings.rb:52
 #, fuzzy
 msgid "Fibre Channel information"
 msgstr "Store host information"
 
 #. list entry
-#: src/include/partitioning/ep-settings.rb:54
+#: src/include/partitioning/ep-settings.rb:56
 #, fuzzy
 msgid "Encryption"
 msgstr "&Encryption"
 
 #. combo box entry
 #. combo box entry
-#: src/include/partitioning/ep-settings.rb:59
-#: src/include/partitioning/ep-settings.rb:152
+#: src/include/partitioning/ep-settings.rb:61
+#: src/include/partitioning/ep-settings.rb:81
 msgid "Device Name"
 msgstr "Device Name"
 
 #. combo box entry
-#: src/include/partitioning/ep-settings.rb:61
+#: src/include/partitioning/ep-settings.rb:63
 #, fuzzy
 msgid "Volume Label"
 msgstr "Volume &Label"
@@ -5180,52 +5215,65 @@
 #. combo box entry
 #. combo box entry
 #. Column header
-#: src/include/partitioning/ep-settings.rb:65
-#: src/include/partitioning/ep-settings.rb:154
-#: src/modules/StorageFields.rb:171
+#: src/include/partitioning/ep-settings.rb:67
+#: src/include/partitioning/ep-settings.rb:83 src/modules/StorageFields.rb:171
 msgid "Device ID"
 msgstr "Device ID"
 
 #. combo box entry
 #. combo box entry
 #. Column header
-#: src/include/partitioning/ep-settings.rb:67
-#: src/include/partitioning/ep-settings.rb:156
-#: src/modules/StorageFields.rb:168
+#: src/include/partitioning/ep-settings.rb:69
+#: src/include/partitioning/ep-settings.rb:85 src/modules/StorageFields.rb:168
 msgid "Device Path"
 msgstr "Device Path"
 
+#. combo box entry
+#: src/include/partitioning/ep-settings.rb:74
+#, fuzzy
+#| msgid "Optional"
+msgid "Optimal"
+msgstr "Optional"
+
+#. combo box entry
+#: src/include/partitioning/ep-settings.rb:76
+#, fuzzy
+msgid "Cylinder"
+msgstr ""
+"\n"
+"End cylinder:  "
+
 #. combo box label
-#: src/include/partitioning/ep-settings.rb:115
+#: src/include/partitioning/ep-settings.rb:136
 #, fuzzy
 msgid "Default Mount by"
 msgstr "Default Host"
 
 #. combo box label
-#: src/include/partitioning/ep-settings.rb:126
+#: src/include/partitioning/ep-settings.rb:145
 #, fuzzy
 msgid "Default File System"
 msgstr "Local Filesystem"
 
 #. combo box label
-#: src/include/partitioning/ep-settings.rb:137
+#: src/include/partitioning/ep-settings.rb:154
 msgid "Alignment of Newly Created Partitions"
 msgstr ""
 
 #. combo box label
-#: src/include/partitioning/ep-settings.rb:149
+#: src/include/partitioning/ep-settings.rb:164
 #, fuzzy
 msgid "Show Storage Devices by"
 msgstr "Storage Device"
 
 #. multi selection box label
-#: src/include/partitioning/ep-settings.rb:169
+#: src/include/partitioning/ep-settings.rb:177
 #, fuzzy
 msgid "Visible Information on Storage Devices"
 msgstr "User Information Sources"
 
 #. helptext
-#: src/include/partitioning/ep-settings.rb:183
+#: src/include/partitioning/ep-settings.rb:191
 #, fuzzy
 msgid ""
 "<p>This view shows general storage\n"
@@ -5233,7 +5281,7 @@
 msgstr "<p>This frame shows the signing request.</p>"
 
 #. helptext
-#: src/include/partitioning/ep-settings.rb:188
+#: src/include/partitioning/ep-settings.rb:196
 msgid ""
 "<p><b>Default Mount by</b> gives the mount by\n"
 "method for newly created file systems. <i>Device Name</i> uses the kernel\n"
@@ -5244,14 +5292,14 @@
 msgstr ""
 
 #. helptext
-#: src/include/partitioning/ep-settings.rb:201
+#: src/include/partitioning/ep-settings.rb:209
 msgid ""
 "<p><b>Default File System</b> gives the file\n"
 "system type for newly created file systems.</p>\n"
 msgstr ""
 
 #. helptext
-#: src/include/partitioning/ep-settings.rb:209
+#: src/include/partitioning/ep-settings.rb:217
 msgid ""
 "<p><b>Alignment of Newly Created Partitions</b>\n"
 "determines how created partitions are aligned. <b>cylinder</b> is the traditional alignment at cylinder boundaries of the disk. <b>optimal</b> aligns the \n"
@@ -5260,14 +5308,14 @@
 msgstr ""
 
 #. helptext
-#: src/include/partitioning/ep-settings.rb:220
+#: src/include/partitioning/ep-settings.rb:228
 msgid ""
 "<p><b>Show Storage Devices by</b> controls\n"
 "the name displayed for hard disks in the navigation tree.</p>"
 msgstr ""
 
 #. helptext
-#: src/include/partitioning/ep-settings.rb:228
+#: src/include/partitioning/ep-settings.rb:236
 msgid ""
 "<p><b>Visible Information On Storage\n"
 "Devices</b> allows to hide information in the tables and overview.</p>"
@@ -5613,14 +5661,14 @@
 msgstr "Pattern"
 
 #. label text
-#: src/modules/FileSystems.rb:275
+#: src/modules/FileSystems.rb:276
 #, fuzzy
 #| msgid "&Size"
 msgid "Tmpfs &Size"
 msgstr "&Size"
 
 #. popup text
-#: src/modules/FileSystems.rb:284
+#: src/modules/FileSystems.rb:285
 #, fuzzy
 #| msgid "Value must be between 0 and 32767. Try again."
 msgid ""
@@ -5628,14 +5676,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:287
+#: src/modules/FileSystems.rb:288
 #, 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:294
+#: src/modules/FileSystems.rb:295
 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"
@@ -5643,17 +5691,17 @@
 msgstr ""
 
 #. label text
-#: src/modules/FileSystems.rb:308
+#: src/modules/FileSystems.rb:309
 msgid "Swap &Priority"
 msgstr "Swap &Priority"
 
 #. popup text
-#: src/modules/FileSystems.rb:316
+#: src/modules/FileSystems.rb:317
 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:323
+#: src/modules/FileSystems.rb:324
 msgid ""
 "<p><b>Swap Priority:</b>\n"
 "Enter the swap priority. Higher numbers mean higher priority.</p>\n"
@@ -5662,14 +5710,14 @@
 "Enter the swap priority. Higher numbers mean higher priority.</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:470
+#: src/modules/FileSystems.rb:479
 #, fuzzy
 #| msgid "Mount &read-only"
 msgid "Mount &Read-Only"
 msgstr "Mount &read-only"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:474
+#: src/modules/FileSystems.rb:483
 #, fuzzy
 #| msgid ""
 #| "<p><b>Mount Read-Only:</b>\n"
@@ -5683,14 +5731,14 @@
 "No writing to the file system is possible. Default is false.</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:486
+#: src/modules/FileSystems.rb:495
 #, fuzzy
 #| msgid "No &access time"
 msgid "No &Access Time"
 msgstr "No &access time"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:490
+#: src/modules/FileSystems.rb:499
 #, fuzzy
 #| msgid ""
 #| "<p><b>No access time:</b>\n"
@@ -5703,14 +5751,14 @@
 "Access times are not updated when a file is read. Default is false.</p>"
 
 #. button text
-#: src/modules/FileSystems.rb:500
+#: src/modules/FileSystems.rb:509
 #, fuzzy
 #| msgid "Mountable by &user"
 msgid "Mountable by &User"
 msgstr "Mountable by &user"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:504
+#: src/modules/FileSystems.rb:513
 msgid ""
 "<p><b>Mountable by User:</b>\n"
 "The file system may be mounted by an ordinary user. Default is false.</p>\n"
@@ -5719,12 +5767,12 @@
 "The file system may be mounted by an ordinary user. Default is false.</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:517
+#: src/modules/FileSystems.rb:526
 msgid "Do Not Mount at System &Start-up"
 msgstr "Do Not Mount at System &Start-up"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:523
+#: src/modules/FileSystems.rb:532
 #, fuzzy
 #| msgid ""
 #| "<p><b>Do Not Mount at System Start-up:</b>\n"
@@ -5748,12 +5796,12 @@
 "is given. Default is false.</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:540
+#: src/modules/FileSystems.rb:549
 msgid "Enable &Quota Support"
 msgstr "Enable &Quota Support"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:546
+#: src/modules/FileSystems.rb:555
 msgid ""
 "<p><b>Enable Quota Support:</b>\n"
 "The file system is mounted with user quotas enabled.\n"
@@ -5764,12 +5812,12 @@
 "Default is false.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:565
+#: src/modules/FileSystems.rb:574
 msgid "Data &Journaling Mode"
 msgstr "Data &Journaling Mode"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:574
+#: src/modules/FileSystems.rb:583
 #, fuzzy
 #| msgid ""
 #| "<p><b>Data Journaling Mode:</b>\n"
@@ -5797,12 +5845,12 @@
 "<tt>writeback</tt> -- Data ordering is not preserved. No performance impact.</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:595
+#: src/modules/FileSystems.rb:604
 msgid "&Access Control Lists (ACL)"
 msgstr "&Access Control Lists (ACL)"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:599
+#: src/modules/FileSystems.rb:608
 msgid ""
 "<p><b>Access Control Lists (ACL):</b>\n"
 "Enable access control lists on the file system.</p>\n"
@@ -5811,12 +5859,12 @@
 "Enable access control lists on the file system.</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:610
+#: src/modules/FileSystems.rb:619
 msgid "&Extended User Attributes"
 msgstr "&Extended User Attributes"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:614
+#: src/modules/FileSystems.rb:623
 msgid ""
 "<p><b>Extended User Attributes:</b>\n"
 "Allow extended user attributes on the file system.</p>\n"
@@ -5825,19 +5873,19 @@
 "Allow extended user attributes on the file system.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:631
+#: src/modules/FileSystems.rb:640
 #, fuzzy
 #| msgid "Arbitrary option &value"
 msgid "Arbitrary Option &Value"
 msgstr "Arbitrary option &value"
 
-#: src/modules/FileSystems.rb:636
+#: src/modules/FileSystems.rb:645
 #, 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:640
+#: src/modules/FileSystems.rb:649
 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"
@@ -5848,12 +5896,12 @@
 "Multiple options are separated by commas.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:657
+#: src/modules/FileSystems.rb:666
 msgid "Char&set for file names"
 msgstr "Char&set for file names"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:678
+#: src/modules/FileSystems.rb:687
 msgid ""
 "<p><b>Charset for File Names:</b>\n"
 "Set the charset used for display of file names in Windows partitions.</p>\n"
@@ -5862,12 +5910,12 @@
 "Set the charset used for display of file names in Windows partitions.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:689
+#: src/modules/FileSystems.rb:698
 msgid "Code&page for short FAT names"
 msgstr "Code&page for short FAT names"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:695
+#: src/modules/FileSystems.rb:704
 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"
@@ -5876,12 +5924,12 @@
 "This codepage is used for converting to shortname characters on FAT file systems.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:709
+#: src/modules/FileSystems.rb:718
 msgid "Number of &FATs"
 msgstr "Number of &FATs"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:715
+#: src/modules/FileSystems.rb:724
 msgid ""
 "<p><b>Number of FATs:</b>\n"
 "Specify the number of file allocation tables in the file system. The default is 2.</p>"
@@ -5890,14 +5938,14 @@
 "Specify the number of file allocation tables in the file system. The default is 2.</p>"
 
 #. label text
-#: src/modules/FileSystems.rb:724
+#: src/modules/FileSystems.rb:733
 #, fuzzy
 #| msgid "FAT &size"
 msgid "FAT &Size"
 msgstr "FAT &size"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:735
+#: src/modules/FileSystems.rb:744
 #, fuzzy
 msgid ""
 "<p><b>FAT Size:</b>\n"
@@ -5907,21 +5955,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:744
+#: src/modules/FileSystems.rb:753
 #, fuzzy
 #| msgid "Root &dir entries"
 msgid "Root &Dir Entries"
 msgstr "Root &dir entries"
 
 #. popup text
-#: src/modules/FileSystems.rb:752
+#: src/modules/FileSystems.rb:761
 #, 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:756
+#: src/modules/FileSystems.rb:765
 #, fuzzy
 #| msgid ""
 #| "<p><b>Root dir entries:</b>\n"
@@ -5934,14 +5982,14 @@
 "Select the number of entries available in the root directory.</p>"
 
 #. label text
-#: src/modules/FileSystems.rb:769
+#: src/modules/FileSystems.rb:778
 #, fuzzy
 #| msgid "Hash &function"
 msgid "Hash &Function"
 msgstr "Hash &function"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:776
+#: src/modules/FileSystems.rb:785
 #, fuzzy
 #| msgid ""
 #| "<p><b>Hash function:</b>\n"
@@ -5954,14 +6002,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:785
+#: src/modules/FileSystems.rb:794
 #, fuzzy
 #| msgid "FS &revision"
 msgid "FS &Revision"
 msgstr "FS &revision"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:792
+#: src/modules/FileSystems.rb:801
 #, fuzzy
 #| msgid ""
 #| "<p><b>FS revision:</b>\n"
@@ -5975,14 +6023,14 @@
 
 #. label text
 #. label text
-#: src/modules/FileSystems.rb:805 src/modules/FileSystems.rb:969
+#: src/modules/FileSystems.rb:814 src/modules/FileSystems.rb:978
 #, fuzzy
 #| msgid "Block &size in bytes"
 msgid "Block &Size in Bytes"
 msgstr "Block &size in bytes"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:812
+#: src/modules/FileSystems.rb:821
 #, fuzzy
 #| msgid ""
 #| "<p><b>Block size:</b>\n"
@@ -5996,13 +6044,13 @@
 
 #. label text
 #. label text
-#: src/modules/FileSystems.rb:821 src/modules/FileSystems.rb:1051
+#: src/modules/FileSystems.rb:830 src/modules/FileSystems.rb:1060
 msgid "&Inode Size"
 msgstr "&Inode Size"
 
 #. help text, richtext format
 #. help text, richtext format
-#: src/modules/FileSystems.rb:827 src/modules/FileSystems.rb:1057
+#: src/modules/FileSystems.rb:836 src/modules/FileSystems.rb:1066
 msgid ""
 "<p><b>Inode Size:</b>\n"
 "This option specifies the inode size of the file system.</p>\n"
@@ -6011,14 +6059,14 @@
 "This option specifies the inode size of the file system.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:836
+#: src/modules/FileSystems.rb:845
 #, fuzzy
 #| msgid "&Percentage of inode space"
 msgid "&Percentage of Inode Space"
 msgstr "&Percentage of inode space"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:864
+#: src/modules/FileSystems.rb:873
 #, fuzzy
 #| msgid ""
 #| "<p><b>Percentage of inode space:</b>\n"
@@ -6031,14 +6079,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:873
+#: src/modules/FileSystems.rb:882
 #, fuzzy
 #| msgid "Inode &aligned"
 msgid "Inode &Aligned"
 msgstr "Inode &aligned"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:879
+#: src/modules/FileSystems.rb:888
 #, fuzzy
 #| msgid ""
 #| "<p><b>Inode Aligned:</b>\n"
@@ -6057,14 +6105,14 @@
 "is normally more efficient than unaligned access.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:909
+#: src/modules/FileSystems.rb:918
 #, fuzzy
 #| msgid "&Log size in megabytes"
 msgid "&Log Size in Megabytes"
 msgstr "&Log size in megabytes"
 
 #. popup text
-#: src/modules/FileSystems.rb:918
+#: src/modules/FileSystems.rb:927
 #, fuzzy
 #| msgid ""
 #| "The \"Log size\" value is incorrect.\n"
@@ -6078,7 +6126,7 @@
 
 #. xgettext: no-c-format
 #. help text, richtext format
-#: src/modules/FileSystems.rb:923
+#: src/modules/FileSystems.rb:932
 #, fuzzy
 #| msgid ""
 #| "<p><b>Log size</b>\n"
@@ -6091,19 +6139,19 @@
 "Set the log size (in megabytes). If auto, the default is 40% of the aggregate size.</p>"
 
 #. label text
-#: src/modules/FileSystems.rb:931
+#: src/modules/FileSystems.rb:940
 msgid "Invoke Bad Blocks List &Utility"
 msgstr "Invoke Bad Blocks List &Utility"
 
 #. label text
-#: src/modules/FileSystems.rb:945
+#: src/modules/FileSystems.rb:954
 #, fuzzy
 #| msgid "Stride &length in blocks"
 msgid "Stride &Length in Blocks"
 msgstr "Stride &length in blocks"
 
 #. popup text
-#: src/modules/FileSystems.rb:953
+#: src/modules/FileSystems.rb:962
 #, fuzzy
 #| msgid ""
 #| "The \"Stride length in blocks\" value is not possible.\n"
@@ -6116,7 +6164,7 @@
 "Please select a value greater than 1."
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:957
+#: src/modules/FileSystems.rb:966
 msgid ""
 "<p><b>Stride Length in Blocks:</b>\n"
 "Set RAID-related options for the file system. Currently, the only supported\n"
@@ -6129,7 +6177,7 @@
 "RAID stripe as its argument.</p>\n"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:976
+#: src/modules/FileSystems.rb:985
 #, fuzzy
 #| msgid ""
 #| "<p><b>Block size:</b>\n"
@@ -6142,14 +6190,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:985
+#: src/modules/FileSystems.rb:994
 #, fuzzy
 #| msgid "Bytes per &inode"
 msgid "Bytes per &Inode"
 msgstr "Bytes per &inode"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:991
+#: src/modules/FileSystems.rb:1000
 #, fuzzy
 #| msgid ""
 #| "<p><b>Bytes per inode:</b>\n"
@@ -6172,14 +6220,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:1007
+#: src/modules/FileSystems.rb:1016
 #, 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:1017
+#: src/modules/FileSystems.rb:1026
 #, fuzzy
 #| msgid ""
 #| "The \"Percentage of blocks reserved for root\" value is incorrect.\n"
@@ -6193,32 +6241,32 @@
 
 #. xgettext: no-c-format
 #. help text, richtext format
-#: src/modules/FileSystems.rb:1022
+#: src/modules/FileSystems.rb:1031
 #, 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:1031
+#: src/modules/FileSystems.rb:1040
 #, fuzzy
 msgid "Disable Regular Checks"
 msgstr "Disable service"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:1039
+#: src/modules/FileSystems.rb:1048
 msgid ""
 "<p><b>Disable Regular Checks:</b>\n"
 "Disable regular file system check at booting.</p>\n"
 msgstr ""
 
 #. label text
-#: src/modules/FileSystems.rb:1066
+#: src/modules/FileSystems.rb:1075
 msgid "&Directory Index Feature"
 msgstr "&Directory Index Feature"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:1073
+#: src/modules/FileSystems.rb:1082
 msgid ""
 "<p><b>Directory Index:</b>\n"
 "Enables use of hashed b-trees to speed up lookups in large directories.</p>\n"
@@ -6227,12 +6275,12 @@
 "Enables use of hashed b-trees to speed up lookups in large directories.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:1085
+#: src/modules/FileSystems.rb:1094
 msgid "&No Journal"
 msgstr ""
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:1092
+#: src/modules/FileSystems.rb:1101
 msgid ""
 "<p><b>No Journal:</b>\n"
 "Suppressed use of journaling on filesystem. Only activate this when you really\n"
@@ -6240,12 +6288,12 @@
 msgstr ""
 
 #. this version makes some problems with interpreter, above lookup/add is OK
-#: src/modules/Partitions.rb:922
+#: src/modules/Partitions.rb:930
 msgid "Operation not permitted on disk %1.\n"
 msgstr ""
 
 #. popup text %1 is replaced by disk name e.g. /dev/hda
-#: src/modules/Partitions.rb:932
+#: src/modules/Partitions.rb:940
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -6278,7 +6326,7 @@
 "disk here.\n"
 
 #. popup text %1 is replaced by disk name e.g. /dev/dasda
-#: src/modules/Partitions.rb:950
+#: src/modules/Partitions.rb:958
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -6311,7 +6359,7 @@
 "disk here.\n"
 
 #. popup text
-#: src/modules/Partitions.rb:969
+#: src/modules/Partitions.rb:977
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -6335,7 +6383,7 @@
 "disk.\n"
 
 #. popup text
-#: src/modules/Partitions.rb:981
+#: src/modules/Partitions.rb:989
 msgid ""
 "\n"
 "\n"
@@ -6353,7 +6401,7 @@
 #. @param integer testsize
 #. @param [Symbol] used_fs
 #. @param [Boolean] verbose
-#: src/modules/Storage.rb:975
+#: src/modules/Storage.rb:976
 msgid "Resize Not Possible:"
 msgstr "Resize Not Possible:"
 
@@ -6366,7 +6414,7 @@
 #. mark swap-partitions with pseudo Mountpoint swap in targetMap
 #. @param [Hash{String => map}] target Disk map
 #. @return [Hash{String => map}] modified target
-#: src/modules/Storage.rb:2703 src/modules/Storage.rb:3908
+#: src/modules/Storage.rb:2706 src/modules/Storage.rb:3911
 #, fuzzy
 #| msgid ""
 #| "Could not set encryption.\n"
@@ -6385,7 +6433,7 @@
 "The crypt password provided could be incorrect.\n"
 
 #. popup text
-#: src/modules/Storage.rb:3939
+#: src/modules/Storage.rb:3942
 #, fuzzy
 msgid ""
 "The first and the second version\n"
@@ -6397,7 +6445,7 @@
 "Please try again."
 
 #. popup text
-#: src/modules/Storage.rb:3970
+#: src/modules/Storage.rb:3973
 #, fuzzy
 msgid ""
 "The password may only contain the following characters:\n"
@@ -6410,29 +6458,29 @@
 
 #. Label: get password for encrypted volume
 #. Please use newline if label is longer than 40 characters
-#: src/modules/Storage.rb:4024
+#: src/modules/Storage.rb:4027
 #, fuzzy
 #| msgid "Enter Encryption Key"
 msgid "&Enter Encryption Password:"
 msgstr "Enter Encryption Key"
 
 #. Clear password fields on every round.
-#: src/modules/Storage.rb:4083
+#: src/modules/Storage.rb:4086
 #, fuzzy
 #| msgid "Enter Provider Password"
 msgid "Provide Password"
 msgstr "Enter Provider Password"
 
-#: src/modules/Storage.rb:4102
+#: src/modules/Storage.rb:4105
 msgid "The following encrypted volumes are already available."
 msgstr ""
 
-#: src/modules/Storage.rb:4117
+#: src/modules/Storage.rb:4120
 #, fuzzy
 msgid "Encrypted Volume Activation"
 msgstr " Volume Group "
 
-#: src/modules/Storage.rb:4121
+#: src/modules/Storage.rb:4124
 msgid ""
 "The following volumes contain an encryption signature but the \n"
 "passwords are not yet known.\n"
@@ -6440,14 +6488,14 @@
 "during an update or if they contain an encrypted LVM physical volume."
 msgstr ""
 
-#: src/modules/Storage.rb:4133
+#: src/modules/Storage.rb:4136
 #, fuzzy
 #| msgid "Do you want to retry?"
 msgid "Do you want to provide encryption passwords?"
 msgstr "Do you want to retry?"
 
 #. text in help field
-#: src/modules/Storage.rb:4190
+#: src/modules/Storage.rb:4193
 msgid ""
 "Enter encryption password for any of the\n"
 "devices in the locked devices list.\n"
@@ -6455,66 +6503,66 @@
 msgstr ""
 
 #. header text
-#: src/modules/Storage.rb:4196
+#: src/modules/Storage.rb:4199
 #, fuzzy
 #| msgid "Enter Encryption Key"
 msgid "Enter Encryption Password"
 msgstr "Enter Encryption Key"
 
-#: src/modules/Storage.rb:4199
+#: src/modules/Storage.rb:4202
 msgid "There are no encrypted volume to unlock."
 msgstr ""
 
 #. label text, multiple device names follow
-#: src/modules/Storage.rb:4212
+#: src/modules/Storage.rb:4215
 #, fuzzy
 #| msgid "YaST2 detected the following device"
 msgid "Provide password for any of the following devices:"
 msgstr "YaST2 detected the following device"
 
 #. label text, one device name follows
-#: src/modules/Storage.rb:4215
+#: src/modules/Storage.rb:4218
 #, fuzzy
 #| msgid "YaST2 detected the following device"
 msgid "Provide password for the following device:"
 msgstr "YaST2 detected the following device"
 
-#: src/modules/Storage.rb:4228
+#: src/modules/Storage.rb:4231
 msgid "Trying to unlock encrypted volumes..."
 msgstr ""
 
-#: src/modules/Storage.rb:4252
+#: src/modules/Storage.rb:4255
 msgid "Password did not unlock any volume."
 msgstr ""
 
-#: src/modules/Storage.rb:4338
+#: src/modules/Storage.rb:4341
 #, fuzzy
 #| msgid "DASD Disks"
 msgid "IDE Disk"
 msgstr "DASD Disks"
 
-#: src/modules/Storage.rb:4344
+#: src/modules/Storage.rb:4347
 #, fuzzy
 #| msgid "DASD Disks"
 msgid "SCSI Disk"
 msgstr "DASD Disks"
 
-#: src/modules/Storage.rb:4350
+#: src/modules/Storage.rb:4353
 msgid "Disk"
 msgstr "Disk"
 
-#: src/modules/Storage.rb:4378
+#: src/modules/Storage.rb:4381
 #, fuzzy
 msgid "DM RAID"
 msgstr "R&AID:"
 
-#: src/modules/Storage.rb:4391
+#: src/modules/Storage.rb:4394
 #, fuzzy
 msgid "MD RAID"
 msgstr "R&AID:"
 
 #. TRANSLATORS: error popup
-#: src/modules/Storage.rb:5173
+#: src/modules/Storage.rb:5176
 #, fuzzy
 #| msgid ""
 #| "Partition %1 cannot be resized\n"
@@ -6524,7 +6572,7 @@
 "Partition %1 cannot be resized\n"
 "because the file system could not be mounted.\n"
 
-#: src/modules/Storage.rb:5199
+#: src/modules/Storage.rb:5202
 msgid ""
 "\n"
 "Device %1 cannot be modified because it contains activated swap\n"
@@ -6534,7 +6582,7 @@
 "Device %1 cannot be modified because it contains activated swap\n"
 "that is needed to run the installation.\n"
 
-#: src/modules/Storage.rb:5213
+#: src/modules/Storage.rb:5216
 msgid ""
 "\n"
 "Device %1 cannot be modified because it contains the installation\n"
@@ -6544,7 +6592,7 @@
 "Device %1 cannot be modified because it contains the installation\n"
 "data needed to perform the installation.\n"
 
-#: src/modules/Storage.rb:5242
+#: src/modules/Storage.rb:5245
 msgid ""
 "\n"
 "Device %1 cannot be removed because it contains activated swap\n"
@@ -6554,7 +6602,7 @@
 "Device %1 cannot be removed because it contains activated swap\n"
 "that is needed to run the installation.\n"
 
-#: src/modules/Storage.rb:5251
+#: src/modules/Storage.rb:5254
 msgid ""
 "\n"
 "Device %1 cannot be removed because it contains the installation\n"
@@ -6564,7 +6612,7 @@
 "Device %1 cannot be removed because it contains the installation\n"
 "data needed to perform the installation.\n"
 
-#: src/modules/Storage.rb:5280
+#: src/modules/Storage.rb:5283
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -6582,7 +6630,7 @@
 "device %2 which contains activated swap that is needed to run \n"
 "the installation.\n"
 
-#: src/modules/Storage.rb:5291
+#: src/modules/Storage.rb:5294
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -6598,7 +6646,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:5313
+#: src/modules/Storage.rb:5316
 #, fuzzy
 #| msgid ""
 #| "Partition %1 cannot be resized\n"
@@ -6612,20 +6660,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:5402
+#: src/modules/Storage.rb:5405
 #, fuzzy
 #| msgid "Copying root filesystem..."
 msgid "Nothing assigned as root filesystem!"
 msgstr "Copying root filesystem..."
 
-#: src/modules/Storage.rb:5403
+#: src/modules/Storage.rb:5406
 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:6005
+#: src/modules/Storage.rb:6008
 #, fuzzy
 #| msgid "writing the firewall rules failed"
 msgid "Adding the following resolvables failed: %1"
@@ -7300,54 +7348,54 @@
 
 #. enable snapshots for root volume if desired
 #. penalty for not having separate /home
-#: src/modules/StorageProposal.rb:4545 src/modules/StorageProposal.rb:5675
+#: src/modules/StorageProposal.rb:4552 src/modules/StorageProposal.rb:5675
 #, fuzzy
 #| msgid "Resize impossible due to inconsistent fs. Try checking fs under Windows."
 msgid "Resize impossible due to inconsistent file system. Try checking file system under Windows."
 msgstr "Resize impossible due to inconsistent fs. Try checking fs under Windows."
 
 #. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6143
+#: src/modules/StorageProposal.rb:6164
 #, fuzzy
 #| msgid "Create &LVM Based Proposal"
 msgid "Create &LVM-based Proposal"
 msgstr "Create &LVM Based Proposal"
 
 #. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6158
+#: src/modules/StorageProposal.rb:6179
 #, fuzzy
 msgid "Encr&ypt Volume Group"
 msgstr " Volume Group "
 
 #. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6176
+#: src/modules/StorageProposal.rb:6197
 #, fuzzy
 #| msgid "File system options:"
 msgid "File System for Root Partition"
 msgstr "File system options:"
 
 #. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6223
+#: src/modules/StorageProposal.rb:6244
 #, fuzzy
 #| msgid "Propose Separate &Home Partition"
 msgid "File System for Home Partition"
 msgstr "Propose Separate &Home Partition"
 
 #. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6241
+#: src/modules/StorageProposal.rb:6262
 #, fuzzy
 #| msgid "&Enable Suspend"
 msgid "Enlarge &Swap for Suspend"
 msgstr "&Enable Suspend"
 
-#: src/modules/StorageProposal.rb:6251
+#: src/modules/StorageProposal.rb:6272
 #, fuzzy
 #| msgid "Special settings"
 msgid "Proposal Settings"
 msgstr "Special settings"
 
 #. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6266
+#: src/modules/StorageProposal.rb:6287
 #, fuzzy
 #| msgid ""
 #| "<p>\n"
@@ -7360,7 +7408,7 @@
 "To create an LVM based proposal, choose the corresponding button.</p>\n"
 
 #. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6273
+#: src/modules/StorageProposal.rb:6294
 msgid ""
 "<p>The filesystem for the root partition can be selected with the\n"
 "corresponding combo box. With the filesystem BtrFS the proposal can\n"
@@ -7369,33 +7417,33 @@
 msgstr ""
 
 #. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6282
+#: src/modules/StorageProposal.rb:6303
 msgid ""
 "<p>The proposal can create a separate home partition. The filesystem for\n"
 "the home partition can be selected with the corresponding combo box.</p>"
 msgstr ""
 
 #. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6289
+#: src/modules/StorageProposal.rb:6310
 msgid ""
 "<p>The swap partition can be made large enough to be used to suspend\n"
 "the system to disk in most cases.</p>"
 msgstr ""
 
-#: src/modules/StorageProposal.rb:6314
+#: src/modules/StorageProposal.rb:6335
 #, fuzzy
 msgid "Enter your password for the proposal encryption."
 msgstr "Enter your password for the encrypted file system."
 
 #. Label: get password for user root
 #. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6321
+#: src/modules/StorageProposal.rb:6342
 msgid "Password:"
 msgstr "Password:"
 
 #. Label: get same password again for verification
 #. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6332
+#: src/modules/StorageProposal.rb:6353
 #, fuzzy
 msgid "Reenter the password for verification:"
 msgstr "Reenter the password for &verification:"
@@ -7423,32 +7471,55 @@
 #. Package:	yast2-storage
 #. Summary:	Expert Partitioner
 #. Authors:	Arvin Schnell <aschnell@suse.de>
-#: src/modules/StorageSettings.rb:177
+#: src/modules/StorageSettings.rb:179
 #, fuzzy
 msgid "Default Mount-by:"
 msgstr "Default Host"
 
-#: src/modules/StorageSettings.rb:178
+#: src/modules/StorageSettings.rb:180
 #, fuzzy
 msgid "Default File System:"
 msgstr "Local Filesystem"
 
-#: src/modules/StorageSettings.rb:179
+#: src/modules/StorageSettings.rb:181
 #, fuzzy
 msgid "Show Storage Devices by:"
 msgstr "Storage Device"
 
-#: src/modules/StorageSettings.rb:180
+#: src/modules/StorageSettings.rb:182
 #, fuzzy
 #| msgid "Partition mounted"
 msgid "Partition Alignment:"
 msgstr "Partition mounted"
 
-#: src/modules/StorageSettings.rb:181
+#: src/modules/StorageSettings.rb:183
 #, fuzzy
 msgid "Visible Information on Storage Devices:"
 msgstr "User Information Sources"
 
+#, fuzzy
+#~ msgid ""
+#~ "Warning: With your current setup, your %1 installation\n"
+#~ "will encounter problems when booting, because you have no \"boot\"\n"
+#~ "partition and your \"root\" partition is an LVM logical volume.\n"
+#~ "This does not work.\n"
+#~ "\n"
+#~ "If you do not know exactly what you are doing, use a normal\n"
+#~ "partition for your files below /boot.\n"
+#~ "\n"
+#~ "Really use this setup?\n"
+#~ msgstr ""
+#~ "Warning: With your current setup, your %1 installation\n"
+#~ "will encounter problems when booting, because you have no \"boot\"\n"
+#~ "partition and your \"root\" partition is an LVM logical volume.\n"
+#~ "This does not work.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you do not know exactly what you are doing, use a normal\n"
+#~ "partition for your files below /boot.\n"
+#~ "\n"
+#~ "Change this?\n"
+
 #~ msgid "&Edit Partition Setup..."
 #~ msgstr "&Edit Partition Setup..."
 

Modified: trunk/yast/en_GB/po/sudo.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/sudo.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/sudo.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: sudo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:42+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2008-03-27 22:39+0000\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"

Modified: trunk/yast/en_GB/po/support.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/support.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/support.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2014-05-19 09:35+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -39,11 +39,15 @@
 
 #. Support configure1 dialog contents
 #: src/include/support/dialogs.rb:53
-msgid "Open Novell Support Center"
+#, fuzzy
+#| msgid "Open Novell Support Center"
+msgid "Open SUSE Support Center"
 msgstr "Open Novell Support Center"
 
 #: src/include/support/dialogs.rb:58
-msgid "This will start a browser connecting to the Novell Support Center Portal."
+#, fuzzy
+#| msgid "This will start a browser connecting to the Novell Support Center Portal."
+msgid "This will start a browser connecting to the SUSE Support Center Portal."
 msgstr "This will start a browser connecting to the Novell Support Center Portal."
 
 #: src/include/support/dialogs.rb:68
@@ -240,7 +244,9 @@
 msgstr "Upload Information"
 
 #: src/include/support/dialogs.rb:770
-msgid "Novell 11-digit service request number"
+#, fuzzy
+#| msgid "Novell 11-digit service request number"
+msgid "11-digit service request number"
 msgstr "Novell 11-digit service request number"
 
 #. abort?
@@ -345,10 +351,17 @@
 
 #. Ovreview dialog help 1/3
 #: src/include/support/helps.rb:72
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "<p><b><big>Opening Novell Support Center</big></b><br>\n"
+#| "To start a Web browser that opens the Novell Support Center Portal, use <b>Open Novell Support Center</b>.\n"
+#| "You can then open a Service Request with Global Technical Support. Make sure you write down\n"
+#| "the Service Request number to include in the supportconfig data upload.</p>\n"
 msgid ""
 "\n"
-"<p><b><big>Opening Novell Support Center</big></b><br>\n"
-"To start a Web browser that opens the Novell Support Center Portal, use <b>Open Novell Support Center</b>.\n"
+"<p><b><big>Opening SUSE Support Center</big></b><br>\n"
+"To start a Web browser that opens the SUSE Support Center Portal, use <b>Open SUSE Support Center</b>.\n"
 "You can then open a Service Request with Global Technical Support. Make sure you write down\n"
 "the Service Request number to include in the supportconfig data upload.</p>\n"
 msgstr ""
@@ -461,9 +474,13 @@
 
 #. Contact dialog help 4/4
 #: src/include/support/helps.rb:133
+#, fuzzy
+#| msgid ""
+#| "<p><b>Note:</b> If you are uploading a supportconfig tarball to Global Technical Support,\n"
+#| "make sure you include the Novell 11-digit service request number from your open service request.\n"
 msgid ""
 "<p><b>Note:</b> If you are uploading a supportconfig tarball to Global Technical Support,\n"
-"make sure you include the Novell 11-digit service request number from your open service request.\n"
+"make sure you include the 11-digit service request number from your open service request.\n"
 msgstr ""
 "<p><b>Note:</b> If you are uploading a supportconfig tarball to Global Technical Support,\n"
 "make sure you include the Novell 11-digit service request number from your open service request.\n"
@@ -520,9 +537,14 @@
 #. Configure1 dialog help 3/3, %1 is a URL
 #. Configure1 dialog help 3/3
 #: src/include/support/helps.rb:164 src/include/support/helps.rb:189
+#, fuzzy
+#| msgid ""
+#| "<p><b><big>Privacy Policy</big></b><br>\n"
+#| "Find Novell's privacy policy at\n"
+#| "<i>%1</i>.</p>\n"
 msgid ""
 "<p><b><big>Privacy Policy</big></b><br>\n"
-"Find Novell's privacy policy at\n"
+"Find SUSE's privacy policy at\n"
 "<i>%1</i>.</p>\n"
 msgstr ""
 "<p><b><big>Privacy Policy</big></b><br>\n"
@@ -844,7 +866,9 @@
 "plan on running supportconfig regularly in a cron job for example. Set with -Q."
 
 #: src/include/support/supportconfig_conf.rb:218
-msgid "Used to specify where the supportconfig tarball will be uploaded, when using the -u srnum startup option. You can specify any FTP server that supports anonymous uploads. The default is Novell's public ftp server."
+#, fuzzy
+#| msgid "Used to specify where the supportconfig tarball will be uploaded, when using the -u srnum startup option. You can specify any FTP server that supports anonymous uploads. The default is Novell's public ftp server."
+msgid "Used to specify where the supportconfig tarball will be uploaded, when using the -u srnum startup option. You can specify any FTP server that supports anonymous uploads. The default is SUSE's public ftp server."
 msgstr "Used to specify where the supportconfig tarball will be uploaded, when using the -u srnum startup option. You can specify any FTP server that supports anonymous uploads. The default is Novell's public ftp server."
 
 #. Initialization dialog caption

Modified: trunk/yast/en_GB/po/sysconfig.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/sysconfig.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/sysconfig.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: yast2 9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2004-03-18 15:42+0100\n"
 "Last-Translator: proofreader\n"
 "Language-Team: en_US\n"
@@ -488,51 +488,111 @@
 "Please wait...<br></p>\n"
 "\n"
 
-#~ msgid ""
-#~ "<p> SuSEconfig saves a checksum of each configuration file, so it can detect if\n"
-#~ " you have manually changed any of them. If you have changed a configuration file manually,\n"
-#~ " it will not touch it.</p>\n"
-#~ msgstr ""
-#~ "<p> SuSEconfig saves a checksum of each configuration file, so it can detect if\n"
-#~ " you have manually changed any of them. If you have changed a configuration file manually,\n"
-#~ " it will not touch it.</p>\n"
+#. Translation: Progress bar label
+#: src/modules/Sysconfig.rb:159
+msgid "Searching..."
+msgstr "Searching..."
 
-#~ msgid "Searching..."
-#~ msgstr "Searching..."
+#. Display confirmation dialog
+#. @param [String] message Confirmation message
+#. @param [String] command Command to confirm
+#. @return [Symbol] `cont - start command, `skip - skip this command, `abort - skip all remaining commands
+#: src/modules/Sysconfig.rb:883
+msgid "Command: "
+msgstr "Command: "
 
-#~ msgid "Command: "
-#~ msgstr "Command: "
+#. button label
+#: src/modules/Sysconfig.rb:889
+msgid "S&kip"
+msgstr "S&kip"
 
-#~ msgid "S&kip"
-#~ msgstr "S&kip"
+#. get activation map for variable
+#. start generic commands
+#: src/modules/Sysconfig.rb:967 src/modules/Sysconfig.rb:1171
+msgid "A command will be executed"
+msgstr "A command will be executed"
 
-#~ msgid "A command will be executed"
-#~ msgstr "A command will be executed"
+#: src/modules/Sysconfig.rb:968 src/modules/Sysconfig.rb:1172
+msgid "Starting command: %1..."
+msgstr "Starting command: %1..."
 
-#~ msgid "Starting command: %1..."
-#~ msgstr "Starting command: %1..."
+#: src/modules/Sysconfig.rb:969 src/modules/Sysconfig.rb:1173
+msgid "Command %1 failed"
+msgstr "Command %1 failed"
 
-#~ msgid "Command %1 failed"
-#~ msgstr "Command %1 failed"
+#. write dialog caption
+#: src/modules/Sysconfig.rb:1009
+msgid "Saving sysconfig Configuration"
+msgstr "Saving sysconfig Configuration"
 
-#~ msgid "Saving sysconfig Configuration"
-#~ msgstr "Saving sysconfig Configuration"
+#. progress bar item
+#: src/modules/Sysconfig.rb:1036
+msgid "Write the new settings"
+msgstr "Write the new settings"
 
-#~ msgid "Write the new settings"
-#~ msgstr "Write the new settings"
+#: src/modules/Sysconfig.rb:1037
+msgid "Activate the changes"
+msgstr "Activate the changes"
 
-#~ msgid "Activate the changes"
-#~ msgstr "Activate the changes"
+#. error popup: %1 - variable name (e.g. DISPLAYMANAGER), %2 - file name (/etc/sysconfig/displaymanager)
+#: src/modules/Sysconfig.rb:1060
+msgid "Saving variable %1 to the file %2 failed."
+msgstr "Saving variable %1 to the file %2 failed."
 
-#~ msgid "Saving variable %1 to the file %2 failed."
-#~ msgstr "Saving variable %1 to the file %2 failed."
+#. progress bar label, %1 is variable name (e.g. DISPLAYMANAGER)
+#: src/modules/Sysconfig.rb:1068
+msgid "Saving variable %1..."
+msgstr "Saving variable %1..."
 
-#~ msgid "Saving variable %1..."
-#~ msgstr "Saving variable %1..."
+#: src/modules/Sysconfig.rb:1073
+msgid "Saving changes to the files..."
+msgstr "Saving changes to the files..."
 
-#~ msgid "Saving changes to the files..."
-#~ msgstr "Saving changes to the files..."
+#. service is running, reload it
+#: src/modules/Sysconfig.rb:1100
+msgid "Service %1 will be reloaded"
+msgstr "Service %1 will be reloaded"
 
+#: src/modules/Sysconfig.rb:1103
+msgid "Reloading service %1..."
+msgstr "Reloading service %1..."
+
+#: src/modules/Sysconfig.rb:1105
+msgid "Reload of the service %1 failed"
+msgstr "Reload of the service %1 failed"
+
+#. service is running, restart it
+#: src/modules/Sysconfig.rb:1143
+msgid "Service %1 will be restarted"
+msgstr "Service %1 will be restarted"
+
+#: src/modules/Sysconfig.rb:1146
+msgid "Restarting service %1..."
+msgstr "Restarting service %1..."
+
+#: src/modules/Sysconfig.rb:1148
+msgid "Restart of the service %1 failed"
+msgstr "Restart of the service %1 failed"
+
+#. set 100% in progress bar
+#: src/modules/Sysconfig.rb:1186
+msgid "Finished"
+msgstr "Finished"
+
+#. configuration summary headline
+#: src/modules/Sysconfig.rb:1269
+msgid "Configuration Summary"
+msgstr "Configuration Summary"
+
+#~ msgid ""
+#~ "<p> SuSEconfig saves a checksum of each configuration file, so it can detect if\n"
+#~ " you have manually changed any of them. If you have changed a configuration file manually,\n"
+#~ " it will not touch it.</p>\n"
+#~ msgstr ""
+#~ "<p> SuSEconfig saves a checksum of each configuration file, so it can detect if\n"
+#~ " you have manually changed any of them. If you have changed a configuration file manually,\n"
+#~ " it will not touch it.</p>\n"
+
 #~ msgid "All configuration scripts will be started."
 #~ msgstr "All configuration scripts will be started."
 
@@ -551,30 +611,6 @@
 #~ msgid "Configuration module %1 failed."
 #~ msgstr "Configuration module %1 failed."
 
-#~ msgid "Service %1 will be reloaded"
-#~ msgstr "Service %1 will be reloaded"
-
-#~ msgid "Reloading service %1..."
-#~ msgstr "Reloading service %1..."
-
-#~ msgid "Reload of the service %1 failed"
-#~ msgstr "Reload of the service %1 failed"
-
-#~ msgid "Service %1 will be restarted"
-#~ msgstr "Service %1 will be restarted"
-
-#~ msgid "Restarting service %1..."
-#~ msgstr "Restarting service %1..."
-
-#~ msgid "Restart of the service %1 failed"
-#~ msgstr "Restart of the service %1 failed"
-
-#~ msgid "Finished"
-#~ msgstr "Finished"
-
-#~ msgid "Configuration Summary"
-#~ msgstr "Configuration Summary"
-
 #~ msgid ""
 #~ "Here, see the values YaST2 will change.\n"
 #~ "Choose \"OK\" for YaST2 to save these changes.\n"

Modified: trunk/yast/en_GB/po/tftp-server.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/tftp-server.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/tftp-server.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\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"

Modified: trunk/yast/en_GB/po/timezone_db.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/timezone_db.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/timezone_db.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: timezone_db\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:32+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2008-03-27 22:36+0000\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"

Modified: trunk/yast/en_GB/po/tune.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/tune.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/tune.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: tune\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:57+0100\n"
+"POT-Creation-Date: 2014-08-04 16:02+0200\n"
 "PO-Revision-Date: 2008-03-27 22:33+0000\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"
@@ -20,36 +20,36 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Command line help text for the hardware detection module, %1 is "hwinfo"
-#: src/clients/hwinfo.rb:47
+#: src/clients/hwinfo.rb:49
 msgid "Hardware Detection - this module does not support the command line interface, use '%1' instead."
 msgstr "Hardware Detection - this module does not support the command line interface, use '%1' instead."
 
 #. translators: popup heading
-#: src/clients/hwinfo.rb:71
+#: src/clients/hwinfo.rb:73
 msgid "Probing Hardware..."
 msgstr "Probing Hardware..."
 
 #. progress bar label
-#: src/clients/hwinfo.rb:74
+#: src/clients/hwinfo.rb:76
 msgid "Progress"
 msgstr "Progress"
 
 #. title label
-#: src/clients/hwinfo.rb:292
+#: src/clients/hwinfo.rb:311
 msgid "&All Entries"
 msgstr "&All Entries"
 
-#: src/clients/hwinfo.rb:304
+#: src/clients/hwinfo.rb:323
 msgid "&Save to File..."
 msgstr "&Save to File..."
 
 #. dialog header
-#: src/clients/hwinfo.rb:313
+#: src/clients/hwinfo.rb:332
 msgid "Hardware Information"
 msgstr "Hardware Information"
 
 #. help text
-#: src/clients/hwinfo.rb:316
+#: src/clients/hwinfo.rb:335
 msgid ""
 "<P>The <B>Hardware Information</B> module displays the hardware\n"
 "details of your computer. Click any node for more information.</p>\n"
@@ -57,18 +57,25 @@
 "<P>The <B>Hardware Information</B> module displays the hardware\n"
 "details of your computer. Click any node for more information.</p>\n"
 
-#: src/clients/hwinfo.rb:319
+#: src/clients/hwinfo.rb:338
 msgid "<P>You can save hardware information to a file. Click <B>Save to File</B> and enter the filename.</P>"
 msgstr "<P>You can save hardware information to a file. Click <B>Save to File</B> and enter the filename.</P>"
 
+#. installation proposal header
+#: src/clients/hwinfo_proposal.rb:31
+#, fuzzy
+#| msgid "System Settings"
+msgid "System and Hardware Settings"
+msgstr "System Settings"
+
 #. this is a heading
 #. tree node string
-#: src/clients/hwinfo_proposal.rb:48 src/include/hwinfo/routines.rb:471
+#: src/clients/hwinfo_proposal.rb:50 src/include/hwinfo/routines.rb:471
 msgid "System"
 msgstr "System"
 
 #. this is a menu entry
-#: src/clients/hwinfo_proposal.rb:50
+#: src/clients/hwinfo_proposal.rb:52
 msgid "S&ystem"
 msgstr "S&ystem"
 
@@ -1464,6 +1471,3 @@
 
 #~ msgid "&System Settings..."
 #~ msgstr "&System Settings..."
-
-#~ msgid "System Settings"
-#~ msgstr "System Settings"

Modified: trunk/yast/en_GB/po/update.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/update.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/update.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: update\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-13 13:22+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2008-03-27 22:32+0000\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"
@@ -155,7 +155,7 @@
 
 #. screen title for update options
 #. this is a heading
-#: src/clients/inst_update.rb:48 src/clients/update_proposal.rb:298
+#: src/clients/inst_update.rb:48 src/clients/update_proposal.rb:278
 msgid "Update Options"
 msgstr "Update Options"
 
@@ -180,18 +180,18 @@
 #. Table item (unknown file system)
 #. label - name of sustem to update
 #. starts with >`<
-#. label for an unknown installed system
+#. Get installed release name
+#. TRANSLATORS: label for an unknown installed system
 #: src/clients/inst_update.rb:69 src/clients/inst_update.rb:74
-#: src/include/update/rootpart.rb:95 src/include/update/rootpart.rb:101
-#: src/include/update/rootpart.rb:121 src/modules/RootPart.rb:156
-#: src/modules/RootPart.rb:1435 src/modules/RootPart.rb:1441
-#: src/modules/RootPart.rb:1969
+#: src/include/update/rootpart.rb:100 src/include/update/rootpart.rb:106
+#: src/include/update/rootpart.rb:126 src/modules/RootPart.rb:155
+#: src/modules/RootPart.rb:1434 src/modules/RootPart.rb:1440
+#: src/modules/RootPart.rb:1981
 msgid "Unknown"
 msgstr "Unknown"
 
 #. label showing to which version we are updating
-#. TRANSLATORS: proposal summary item, %1 is a product name
-#: src/clients/inst_update.rb:80 src/clients/update_proposal.rb:198
+#: src/clients/inst_update.rb:80
 msgid "Update to %1"
 msgstr "Update to %1"
 
@@ -275,9 +275,19 @@
 "function anymore. Activate <b>Delete Unmaintained Packages</b> to delete those\n"
 "packages during the update.</p>\n"
 
-#. yes/no question
+#. warning / question
 #: src/clients/inst_update.rb:231
 msgid ""
+"Changing the update method to 'Update packages only' might\n"
+"lead into non-bootable or non-working system if you do not\n"
+"adjust the list of packages yourself.\n"
+"\n"
+"Really continue?"
+msgstr ""
+
+#. yes/no question
+#: src/clients/inst_update.rb:243
+msgid ""
 "Do you really want\n"
 "to reset your detailed selection?"
 msgstr ""
@@ -287,13 +297,13 @@
 #. error report
 #. inform user in the proposal about the failed mount
 #. error report
-#: src/clients/inst_update_partition_auto.rb:70
-#: src/clients/rootpart_proposal.rb:110 src/include/update/rootpart.rb:379
+#: src/clients/inst_update_partition_auto.rb:79
+#: src/clients/rootpart_proposal.rb:110 src/include/update/rootpart.rb:385
 msgid "Failed to mount target system"
 msgstr "Failed to mount target system"
 
 #. Correctly mounted but incomplete installation found
-#: src/clients/inst_update_partition_auto.rb:75
+#: src/clients/inst_update_partition_auto.rb:84
 msgid "A possibly incomplete installation has been detected."
 msgstr ""
 
@@ -364,12 +374,12 @@
 
 #. error message in proposal
 #. part of error popup message
-#: src/clients/update_proposal.rb:83 src/clients/update_proposal.rb:404
+#: src/clients/update_proposal.rb:85 src/clients/update_proposal.rb:384
 msgid "Cannot read the current RPM Database."
 msgstr "Cannot read the current RPM Database."
 
 #. error message in proposal
-#: src/clients/update_proposal.rb:99
+#: src/clients/update_proposal.rb:101
 msgid "The installed product is not compatible with the product on the installation media."
 msgstr "The installed product is not compatible with the product on the installation media."
 
@@ -377,14 +387,14 @@
 #. TRANSLATORS: unknown product (label)
 #. TRANSLATORS: unknown product name
 #. TRANSLATORS: unknown product name
-#: src/clients/update_proposal.rb:108 src/clients/update_proposal.rb:126
-#: src/clients/update_proposal.rb:169 src/clients/update_proposal.rb:175
+#: src/clients/update_proposal.rb:110 src/clients/update_proposal.rb:128
+#: src/clients/update_proposal.rb:171 src/clients/update_proposal.rb:177
 msgid "Unknown product"
 msgstr "Unknown product"
 
 #. TRANSLATORS: proposal error, %1 is the version of installed system
 #. %2 is the version being installed
-#: src/clients/update_proposal.rb:141
+#: src/clients/update_proposal.rb:143
 #, fuzzy
 #| msgid ""
 #| "Updating system to another version (%1 -> %2) is not supported on the running system.<br>\n"
@@ -400,22 +410,22 @@
 "or disable software repositories of products with different versions."
 
 #. TRANSLATORS: proposal warning, both %1 and %2 are replaced with product names
-#: src/clients/update_proposal.rb:162
+#: src/clients/update_proposal.rb:164
 msgid "Warning: Updating from '%1' to '%2', products do not exactly match."
 msgstr "Warning: Updating from '%1' to '%2', products do not exactly match."
 
 #. Proposal for backup during update
-#: src/clients/update_proposal.rb:214
+#: src/clients/update_proposal.rb:191
 msgid "Only update installed packages"
 msgstr "Only update installed packages"
 
 #. proposal string
-#: src/clients/update_proposal.rb:229
+#: src/clients/update_proposal.rb:206
 msgid "Update based on patterns"
 msgstr "Update based on patterns"
 
 #. TRANSLATORS: proposal dialog help
-#: src/clients/update_proposal.rb:255
+#: src/clients/update_proposal.rb:232
 #, fuzzy
 msgid ""
 "<p><b><big>Update Options</big></b> Select how your system will be updated.\n"
@@ -429,17 +439,17 @@
 "(the default selection), and whether unmaintained packages should be deleted."
 
 #. this is a menu entry
-#: src/clients/update_proposal.rb:300
+#: src/clients/update_proposal.rb:280
 msgid "&Update Options"
 msgstr "&Update Options"
 
 #. part of error popup message, %1 stands for newline-separated list of files
-#: src/clients/update_proposal.rb:407
+#: src/clients/update_proposal.rb:387
 msgid "None of these files exist:%1"
 msgstr "None of these files exist:%1"
 
 #. continue-cancel popup
-#: src/clients/update_proposal.rb:541
+#: src/clients/update_proposal.rb:517
 msgid ""
 "The installed product is not compatible with the product\n"
 "on the installation media. If you try to update using the\n"
@@ -452,27 +462,27 @@
 "some applications may not run properly."
 
 #. Table item (unknown system)
-#: src/include/update/rootpart.rb:88
+#: src/include/update/rootpart.rb:93
 msgid "Unknown Linux"
 msgstr "Unknown Linux"
 
 #. Table item (unknown system)
-#: src/include/update/rootpart.rb:91
+#: src/include/update/rootpart.rb:96
 msgid "Unknown or Non-Linux"
 msgstr "Unknown or Non-Linux"
 
 #. is a linux fs, can be a root fs, has a fs name
-#: src/include/update/rootpart.rb:113
+#: src/include/update/rootpart.rb:118
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
 #. label for selection of root partition (for boot)
-#: src/include/update/rootpart.rb:181
+#: src/include/update/rootpart.rb:186
 msgid "Partition or System to Boot:"
 msgstr "Partition or System to Boot:"
 
 #. help text for root partition dialog (for boot)
-#: src/include/update/rootpart.rb:184
+#: src/include/update/rootpart.rb:189
 msgid ""
 "<p>\n"
 "Select the partition or system to boot.\n"
@@ -483,12 +493,12 @@
 "</p>\n"
 
 #. label for selection of root partition (for update)
-#: src/include/update/rootpart.rb:191
+#: src/include/update/rootpart.rb:196
 msgid "Partition or System to Update:"
 msgstr "Partition or System to Update:"
 
 #. help text for root partition dialog (for update)
-#: src/include/update/rootpart.rb:194
+#: src/include/update/rootpart.rb:199
 msgid ""
 "<p>\n"
 "Select the partition or system to update.\n"
@@ -499,12 +509,12 @@
 "</p>\n"
 
 #. headline for dialog "Select for update"
-#: src/include/update/rootpart.rb:202
+#: src/include/update/rootpart.rb:207
 msgid "Select for Update"
 msgstr "Select for Update"
 
 #. help text for root partition dialog (general part)
-#: src/include/update/rootpart.rb:209
+#: src/include/update/rootpart.rb:214
 msgid ""
 "<p>\n"
 "<b>Show All Partitions</b> expands the list to a\n"
@@ -517,42 +527,42 @@
 "</p>\n"
 
 #. table header
-#: src/include/update/rootpart.rb:229
+#: src/include/update/rootpart.rb:234
 msgid "System"
 msgstr "System"
 
 #. table header item
-#: src/include/update/rootpart.rb:231
+#: src/include/update/rootpart.rb:236
 msgid "Partition"
 msgstr "Partition"
 
 #. table header item
-#: src/include/update/rootpart.rb:233
+#: src/include/update/rootpart.rb:238
 msgid "Architecture"
 msgstr "Architecture"
 
 #. table header item
-#: src/include/update/rootpart.rb:235
+#: src/include/update/rootpart.rb:240
 msgid "File System"
 msgstr "File System"
 
 #. table header item
-#: src/include/update/rootpart.rb:237
+#: src/include/update/rootpart.rb:242
 msgid "Label"
 msgstr "Label"
 
 #. check box
-#: src/include/update/rootpart.rb:247
+#: src/include/update/rootpart.rb:252
 msgid "&Show All Partitions"
 msgstr "&Show All Partitions"
 
 #. pushbutton to (rightaway) boot the system selected above
-#: src/include/update/rootpart.rb:278
+#: src/include/update/rootpart.rb:283
 msgid "&Boot"
 msgstr "&Boot"
 
-#. continue-cancel popup
-#: src/include/update/rootpart.rb:348
+#. error popup
+#: src/include/update/rootpart.rb:354
 msgid ""
 "No installed system that can be upgraded with this product was found\n"
 "on the selected partition."
@@ -561,7 +571,7 @@
 "on the selected partition."
 
 #. continue-cancel popup
-#: src/include/update/rootpart.rb:358
+#: src/include/update/rootpart.rb:364
 #, fuzzy
 #| msgid ""
 #| "The architecture of the system installed in the selected partition\n"
@@ -574,20 +584,20 @@
 "is different than the one of this product."
 
 #. pop-up question
-#: src/include/update/rootpart.rb:388
+#: src/include/update/rootpart.rb:394
 msgid ""
 "A possibly incomplete installation has been detected on the selected partition.\n"
 "Are sure you want to use it anyway?"
 msgstr ""
 
 #. button label
-#: src/include/update/rootpart.rb:392
+#: src/include/update/rootpart.rb:398
 msgid "&Yes, Use It"
 msgstr "&Yes, Use It"
 
 #. Target load failed, #466803
 #. Target load failed, #466803
-#: src/include/update/rootpart.rb:426 src/include/update/rootpart.rb:451
+#: src/include/update/rootpart.rb:436 src/include/update/rootpart.rb:461
 msgid ""
 "Initializing the system for upgrade has failed for unknown reason.\n"
 "It is highly recommended not to continue the upgrade process.\n"
@@ -595,13 +605,13 @@
 "Are you sure you want to continue?"
 msgstr ""
 
-#: src/include/update/rootpart.rb:432 src/include/update/rootpart.rb:457
+#: src/include/update/rootpart.rb:442 src/include/update/rootpart.rb:467
 #, fuzzy
 msgid "&Yes, Continue"
 msgstr "&Continue"
 
 #. Link to SDB article concerning renaming of devices.
-#: src/modules/RootPart.rb:109
+#: src/modules/RootPart.rb:108
 #, fuzzy
 msgid ""
 "See the SDB article at %1 for details\n"
@@ -611,17 +621,17 @@
 "about how to solve this problem."
 
 #. label - name of sustem to update
-#: src/modules/RootPart.rb:147
+#: src/modules/RootPart.rb:146
 msgid "Unknown Linux System"
 msgstr "Unknown Linux System"
 
 #. label - name of sustem to update
-#: src/modules/RootPart.rb:152
+#: src/modules/RootPart.rb:151
 msgid "Non-Linux System"
 msgstr "Non-Linux System"
 
 #. error report, %1 is device (eg. /dev/hda1)
-#: src/modules/RootPart.rb:308
+#: src/modules/RootPart.rb:307
 msgid ""
 "Cannot unmount partition %1.\n"
 "\n"
@@ -636,7 +646,7 @@
 "or restart your computer.\n"
 
 #. label, %1 is partition
-#: src/modules/RootPart.rb:379
+#: src/modules/RootPart.rb:378
 msgid "Checking partition %1"
 msgstr "Checking partition %1"
 
@@ -645,23 +655,23 @@
 #. @param string button (true)
 #. @param string button (false)
 #. @param [String] details (hidden under [Details] button; optional; to disable, use "")
-#: src/modules/RootPart.rb:416
+#: src/modules/RootPart.rb:415
 msgid "Show &Details"
 msgstr "Show &Details"
 
 #. #176292, run fsck before jfs is mounted
-#: src/modules/RootPart.rb:498
+#: src/modules/RootPart.rb:497
 msgid "Checking file system on %1..."
 msgstr "Checking file system on %1..."
 
 #. popup headline
-#: src/modules/RootPart.rb:530
+#: src/modules/RootPart.rb:529
 msgid "File System Check Failed"
 msgstr "File System Check Failed"
 
 #. popup question (continue/cancel dialog)
 #. %1 is a device name such as /dev/hda5
-#: src/modules/RootPart.rb:534
+#: src/modules/RootPart.rb:533
 #, fuzzy
 #| msgid ""
 #| "The file system check of device %1 has failed.\n"
@@ -677,24 +687,24 @@
 "Would you like to continue in mounting the device?"
 
 #. button
-#: src/modules/RootPart.rb:543
+#: src/modules/RootPart.rb:542
 msgid "&Skip Mounting"
 msgstr "&Skip Mounting"
 
 #. yes-no popup
-#: src/modules/RootPart.rb:1059
+#: src/modules/RootPart.rb:1058
 msgid "Incorrect password. Try again?"
 msgstr "Incorrect password. Try again?"
 
 #. TRANSLATORS: a popup headline
-#: src/modules/RootPart.rb:1162
+#: src/modules/RootPart.rb:1161
 msgid "Warning"
 msgstr "Warning"
 
 #. TRANSLATORS: error message,
 #. %1 is replaced with the current /boot partition size
 #. %2 with the recommended size
-#: src/modules/RootPart.rb:1167
+#: src/modules/RootPart.rb:1166
 #, fuzzy
 #| msgid ""
 #| "Your /boot partition is too small (%1 MB).\n"
@@ -719,7 +729,7 @@
 "Would you like to continue updating the current system?"
 
 #. label in a popup, %1 is device (eg. /dev/hda1), %2 is output of the 'mount' command
-#: src/modules/RootPart.rb:1259
+#: src/modules/RootPart.rb:1258
 #, fuzzy
 #| msgid ""
 #| "The partition %1 could not be mounted.\n"
@@ -750,27 +760,27 @@
 "To abort update, click Cancel."
 
 #. push button
-#: src/modules/RootPart.rb:1277
+#: src/modules/RootPart.rb:1276
 msgid "&Specify Mount Options"
 msgstr "&Specify Mount Options"
 
 #. popup heading
-#: src/modules/RootPart.rb:1293
+#: src/modules/RootPart.rb:1292
 msgid "Mount Options"
 msgstr "Mount Options"
 
 #. text entry label
-#: src/modules/RootPart.rb:1296
+#: src/modules/RootPart.rb:1295
 msgid "&Mount Point"
 msgstr "&Mount Point"
 
 #. tex entry label
-#: src/modules/RootPart.rb:1299
+#: src/modules/RootPart.rb:1298
 msgid "&Device"
 msgstr "&Device"
 
 #. text entry label
-#: src/modules/RootPart.rb:1304
+#: src/modules/RootPart.rb:1303
 msgid ""
 "&File System\n"
 "(empty for autodetection)"
@@ -779,12 +789,12 @@
 "(empty for autodetection)"
 
 #. error message
-#: src/modules/RootPart.rb:1381
+#: src/modules/RootPart.rb:1380
 msgid "The /var partition %1 could not be mounted.\n"
 msgstr "The /var partition %1 could not be mounted.\n"
 
 #. Informational text about selected partition, %x are replaced with values later
-#: src/modules/RootPart.rb:1422
+#: src/modules/RootPart.rb:1421
 msgid ""
 "<b>File system:</b> %1, <b>Type:</b> %2,<br>\n"
 "<b>Label:</b> %3, <b>Size:</b> %4,<br>\n"
@@ -792,18 +802,18 @@
 "<b>udev path:</b> %6"
 msgstr ""
 
-#: src/modules/RootPart.rb:1436
+#: src/modules/RootPart.rb:1435
 msgid "None"
 msgstr "None"
 
 #. a popup caption
-#: src/modules/RootPart.rb:1459
+#: src/modules/RootPart.rb:1458
 #, fuzzy
 msgid "Unable to find the /var partition automatically"
 msgstr "Unable to mount /var partition with this disk configuration.\n"
 
 #. a popup message
-#: src/modules/RootPart.rb:1464
+#: src/modules/RootPart.rb:1463
 msgid ""
 "Your system uses a separate /var partition which is required for the upgrade\n"
 "process to detect the disk-naming changes. Select the /var partition manually\n"
@@ -811,24 +821,24 @@
 msgstr ""
 
 #. a combo-box label
-#: src/modules/RootPart.rb:1477
+#: src/modules/RootPart.rb:1476
 #, fuzzy
 msgid "&Select /var Partition Device"
 msgstr "Select a Root Partition"
 
 #. an informational rich-text widget label
-#: src/modules/RootPart.rb:1483
+#: src/modules/RootPart.rb:1482
 #, fuzzy
 msgid "Device Info"
 msgstr "Device ID"
 
 #. error message
-#: src/modules/RootPart.rb:1624
+#: src/modules/RootPart.rb:1623
 msgid "Unable to mount /var partition with this disk configuration.\n"
 msgstr "Unable to mount /var partition with this disk configuration.\n"
 
 #. popup message, %1 will be replace with the name of the logfile
-#: src/modules/RootPart.rb:1655
+#: src/modules/RootPart.rb:1654
 msgid ""
 "Partitions could not be mounted.\n"
 "\n"
@@ -841,7 +851,7 @@
 #. read the keyboard settings now, so that it used when
 #. typing passwords for encrypted partitions
 #. Calling a script because otherwise this module would depend on yast2-country
-#: src/modules/RootPart.rb:1699
+#: src/modules/RootPart.rb:1698
 msgid ""
 "Some partitions in the system on %1 are mounted by kernel-device name. This is\n"
 "not reliable for the update since kernel-device names are unfortunately not\n"
@@ -850,17 +860,17 @@
 msgstr ""
 
 #. error message
-#: src/modules/RootPart.rb:1717
+#: src/modules/RootPart.rb:1716
 msgid "No fstab found."
 msgstr "No fstab found."
 
 #. message part 1
-#: src/modules/RootPart.rb:1742
+#: src/modules/RootPart.rb:1741
 msgid "The root partition in /etc/fstab has an invalid root device.\n"
 msgstr "The root partition in /etc/fstab has an invalid root device.\n"
 
 #. message part 2
-#: src/modules/RootPart.rb:1747
+#: src/modules/RootPart.rb:1746
 msgid "It is currently mounted as %1 but listed as %2.\n"
 msgstr "It is currently mounted as %1 but listed as %2.\n"
 
@@ -881,38 +891,73 @@
 msgid "Searching for Available Systems"
 msgstr "Checking for available updates..."
 
+#. Returns product name as found in SuSE-release file.
+#. Compatible with OSRelease.ReleaseInformation.
+#. Returns SUSEReleaseFileMissingError if SuSE-release file is missing.
+#. Returns IOError is SuSE-release could not be open.
+#.
+#. @param [String] system base-directory, default is "/"
+#. @return [String] product name
+#: src/modules/SUSERelease.rb:65
+#, fuzzy
+#| msgid "listen value to delete not found"
+msgid "Release file %{file} not found"
+msgstr "listen value to delete not found"
+
+#: src/modules/SUSERelease.rb:74
+#, fuzzy
+#| msgid "Cannot read file %1"
+msgid "Cannot read release file %{file}"
+msgstr "Cannot read file %1"
+
 #. -----------------------------------------------------------------------
 #. GLOBAL FUNCTIONS
 #. -----------------------------------------------------------------------
-#: src/modules/Update.rb:304
+#: src/modules/Update.rb:309
 msgid "Unknown Product"
 msgstr "Unknown Product"
 
-#. TRANSLATORS: check-box, it might happen that we need to downgrade some packages during update
-#: src/modules/Update.rb:817
-msgid "Allow Package Downgrade"
-msgstr "Allow Package Downgrade"
+#. If the current default desktop is not installed, it's a valid use case
+#. and we don't continue further
+#: src/modules/Update.rb:791
+msgid ""
+"Cannot select these patterns required for installation:\n"
+"%{patterns}"
+msgstr ""
 
-#: control/update.glade:18 control/update.glade:42
+#: src/modules/Update.rb:796
+#, fuzzy
+#| msgid "Failed to select %1 packages for installation"
+msgid ""
+"Cannot select these packages required for installation:\n"
+"%{packages}"
+msgstr "Failed to select %1 packages for installation"
+
+#: control/update.glade.translations.glade:3
+#: control/update.glade.translations.glade:5
 msgid "Update Settings"
 msgstr "Update Settings"
 
-#: control/update.glade:34
+#: control/update.glade.translations.glade:4
 msgid "Update"
 msgstr "Update"
 
-#: control/update.glade:48 control/update.glade:52
+#: control/update.glade.translations.glade:6
+#: control/update.glade.translations.glade:7
 msgid "Perform Update"
 msgstr "Perform Update"
 
-#: control/update.glade:63
+#: control/update.glade.translations.glade:8
 msgid "Update System Configuration"
 msgstr "Update System Configuration"
 
-#: control/update.glade:71
+#: control/update.glade.translations.glade:9
 msgid "Update Configuration"
 msgstr "Configure Online Update"
 
+#~ msgid "Allow Package Downgrade"
+#~ msgstr "Allow Package Downgrade"
+
 #~ msgid "Clean Up"
 #~ msgstr "Clean Up"
 

Modified: trunk/yast/en_GB/po/users.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/users.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/users.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: users\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2008-03-27 22:31+0000\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"
@@ -277,7 +277,7 @@
 msgstr "Password for the System Administrator \"root\""
 
 #. advise user to remember his new password
-#. advise user to remember his new password
+#. advise users to remember their new password
 #: src/clients/inst_root.rb:95 src/clients/inst_root_first.rb:67
 msgid "Do not forget what you enter here."
 msgstr "Do not forget what you enter here."
@@ -4587,23 +4587,23 @@
 "Remove these users from the group first."
 
 #. summary label
-#: src/modules/Users.pm:6596
+#: src/modules/Users.pm:6601
 msgid "<h3>Users</h3>"
 msgstr "<h3>Users</h3>"
 
 #. summary label
-#: src/modules/Users.pm:6606
+#: src/modules/Users.pm:6611
 msgid "<h3>Groups</h3>"
 msgstr "<h3>Groups</h3>"
 
 #. summary label
-#: src/modules/Users.pm:6617
+#: src/modules/Users.pm:6622
 #, fuzzy
 msgid "<h3>Login Settings</h3>"
 msgstr "Login Settings"
 
 #. summary item, %1 is user name
-#: src/modules/Users.pm:6619
+#: src/modules/Users.pm:6624
 msgid "User %1 configured for automatic login"
 msgstr ""
 

Modified: trunk/yast/en_GB/po/vm.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/vm.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/vm.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: vm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\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"
@@ -34,12 +34,12 @@
 msgstr "Install Hypervisor and Tools"
 
 #. check for kernel-bigsmp
-#: src/modules/VM_XEN.rb:148
+#: src/modules/VM_XEN.rb:157
 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:167
+#: src/modules/VM_XEN.rb:176
 msgid ""
 "Virtual machine installation cannot be started inside the UML machine.\n"
 "Start installation in the host system.\n"
@@ -48,135 +48,177 @@
 "Start installation in the host system.\n"
 
 #. progress stage 1/2
-#: src/modules/VM_XEN.rb:184
+#. Generate a pop dialog to allow user selection of Xen or KVM
+#: src/modules/VM_XEN.rb:193 src/modules/VM_XEN.rb:281
 msgid "Verify Installed Packages"
 msgstr "Verify Installed Packages"
 
 #. progress stage 2/2
-#: src/modules/VM_XEN.rb:186
+#: src/modules/VM_XEN.rb:195
 #, fuzzy
 msgid "Network Bridge Configuration"
 msgstr "Network Card Configuration"
 
 #. Headline for management domain installation
-#: src/modules/VM_XEN.rb:201
+#: src/modules/VM_XEN.rb:210
 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:204
+#: src/modules/VM_XEN.rb:213
 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:208
+#: src/modules/VM_XEN.rb:217
 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:212
+#: src/modules/VM_XEN.rb:221
 #, 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:216
+#: src/modules/VM_XEN.rb:225
 #, 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:221
+#: src/modules/VM_XEN.rb:230
 msgid "The installation will be aborted."
 msgstr "The installation will be aborted."
 
-#: src/modules/VM_XEN.rb:224
+#: src/modules/VM_XEN.rb:233
 #, fuzzy
 #| msgid "Hypervisor and tools are installed."
 msgid "Choose Hypervisor(s) to install"
 msgstr "Hypervisor and tools are installed."
 
-#: src/modules/VM_XEN.rb:241
+#: src/modules/VM_XEN.rb:236
+msgid "Server: Minimal system to get a running Hypervisor"
+msgstr ""
+
+#: src/modules/VM_XEN.rb:237
+#, 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
 msgid "KVM Hypervisor"
 msgstr ""
 
-#: src/modules/VM_XEN.rb:249
+#: src/modules/VM_XEN.rb:252
+msgid "KVM server"
+msgstr ""
+
+#: src/modules/VM_XEN.rb:253
+#, fuzzy
+#| msgid "Admin tools"
+msgid "KVM tools"
+msgstr "Admin tools"
+
+#: src/modules/VM_XEN.rb:258
 msgid "libvirt LXC containers"
 msgstr ""
 
-#. Generate a pop dialog to allow user selection of Xen or KVM
-#: src/modules/VM_XEN.rb:276
+#: src/modules/VM_XEN.rb:260
+msgid "libvirt LXC daemon"
+msgstr ""
+
+#: src/modules/VM_XEN.rb:288
 msgid "Software to connect to Virtualization server"
 msgstr ""
 
-#: src/modules/VM_XEN.rb:294
+#: src/modules/VM_XEN.rb:290
+#, fuzzy
+#| msgid "Hypervisor and tools are installed."
+msgid "Virtualization client tools"
+msgstr "Hypervisor and tools are installed."
+
+#: src/modules/VM_XEN.rb:306
 msgid "Xen Hypervisor"
 msgstr ""
 
+#: src/modules/VM_XEN.rb:308
+#, fuzzy
+#| msgid "Broken server"
+msgid "Xen server"
+msgstr "Broken server"
+
+#: src/modules/VM_XEN.rb:309
+#, fuzzy
+#| msgid "Admin tools"
+msgid "Xen tools"
+msgstr "Admin tools"
+
 #. SLED doesn't have any installation capabilities (L3 support)
-#: src/modules/VM_XEN.rb:372
+#: src/modules/VM_XEN.rb:384
 #, fuzzy
 #| msgid "The installation will be aborted."
 msgid "Package installation failed\n"
 msgstr "The installation will be aborted."
 
-#: src/modules/VM_XEN.rb:380
+#: src/modules/VM_XEN.rb:392
 #, 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:387
+#: src/modules/VM_XEN.rb:399
 msgid "Package installation failed for sled client pattern\n"
 msgstr ""
 
-#: src/modules/VM_XEN.rb:398
+#: src/modules/VM_XEN.rb:410
 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:411
+#: src/modules/VM_XEN.rb:423
 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:424
+#: src/modules/VM_XEN.rb:436
 msgid "Checking packages..."
 msgstr "Checking packages..."
 
 #. progressbar title - install the required packages
-#: src/modules/VM_XEN.rb:427
+#: src/modules/VM_XEN.rb:439
 msgid "Installing packages..."
 msgstr "Installing packages..."
 
 #. error popup
 #. Now see if they really were installed (bnc#508347)
-#: src/modules/VM_XEN.rb:432 src/modules/VM_XEN.rb:439
+#: src/modules/VM_XEN.rb:444 src/modules/VM_XEN.rb:451
 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:449
+#: src/modules/VM_XEN.rb:461
 #, fuzzy
 #| msgid "Updating configuration files..."
 msgid "Updating grub2 configuration files..."
 msgstr "Updating configuration files..."
 
 #. Default Bridge stage
-#: src/modules/VM_XEN.rb:460
+#: src/modules/VM_XEN.rb:474
 #, fuzzy
 msgid "Configuring Default Network Bridge..."
 msgstr "Configuring general settings..."
 
 #. Popup yes/no dialog
-#: src/modules/VM_XEN.rb:481
+#: src/modules/VM_XEN.rb:495
 #, fuzzy
 msgid "Network Bridge."
 msgstr "Ethernet Network Card"
 
-#: src/modules/VM_XEN.rb:482
+#: src/modules/VM_XEN.rb:496
 msgid "<p>For normal network configurations hosting virtual machines, a network bridge is recommended.</p><p>Configure a default network bridge?</p>"
 msgstr ""
 
@@ -189,11 +231,11 @@
 #. Report::Error(_("Failed to configure the firewall to allow the Xen bridge") + "\n" + abortmsg);
 #. return false;
 #. }
-#: src/modules/VM_XEN.rb:540
+#: src/modules/VM_XEN.rb:557
 msgid "KVM components are installed. Your host is ready to install KVM guests."
 msgstr ""
 
-#: src/modules/VM_XEN.rb:543
+#: src/modules/VM_XEN.rb:560
 #, fuzzy
 #| msgid ""
 #| "The machine is ready to start the VM Server.\n"
@@ -205,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:546
+#: src/modules/VM_XEN.rb:563
 #, fuzzy
 #| msgid ""
 #| "The machine is ready to start the VM Server.\n"
@@ -217,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:549
+#: src/modules/VM_XEN.rb:566
 #, 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:550
+#: src/modules/VM_XEN.rb:567
 #, fuzzy
 #| msgid "Hypervisor and tools are installed."
 msgid "Virtualization client tools are installed."
 msgstr "Hypervisor and tools are installed."
 
-#: src/modules/VM_XEN.rb:551
+#: src/modules/VM_XEN.rb:568
 #, fuzzy
 #| msgid "Hypervisor and tools are installed."
 msgid "Libvirt LXC components are installed."

Modified: trunk/yast/en_GB/po/wagon.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/wagon.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/wagon.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:57+0100\n"
+"POT-Creation-Date: 2014-03-27 16:00+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"

Modified: trunk/yast/en_GB/po/wol.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/wol.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/wol.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: wol\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:37+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\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"

Modified: trunk/yast/en_GB/po/xpram.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/xpram.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/xpram.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: xpram\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:32+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2008-03-27 22:24+0000\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"

Modified: trunk/yast/en_GB/po/yast2-apparmor.en_GB.po
===================================================================
--- trunk/yast/en_GB/po/yast2-apparmor.en_GB.po	2014-10-07 15:46:38 UTC (rev 89780)
+++ trunk/yast/en_GB/po/yast2-apparmor.en_GB.po	2014-10-07 15:47:26 UTC (rev 89781)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: yast2-apparmor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:51+0200\n"
 "PO-Revision-Date: 2008-03-27 22:23+0000\n"
 "Last-Translator: Benjamin Weber <b.weber@warwick.ac.uk>\n"
 "Language-Team:  <en@li.org>\n"
@@ -327,11 +327,11 @@
 
 #. May want to replace Wizard() with UI()
 #: src/include/apparmor/aa-config.rb:518
-#: src/include/apparmor/config_complain.rb:181
-#: src/include/apparmor/config_complain.rb:229
-#: src/include/apparmor/config_complain.rb:239
-#: src/include/apparmor/config_complain.rb:268
-#: src/include/apparmor/config_complain.rb:287
+#: src/include/apparmor/config_complain.rb:187
+#: src/include/apparmor/config_complain.rb:235
+#: src/include/apparmor/config_complain.rb:245
+#: src/include/apparmor/config_complain.rb:274
+#: src/include/apparmor/config_complain.rb:293
 #: src/include/apparmor/profile_dialogs.rb:1112
 msgid "&Done"
 msgstr "&Done"
@@ -1169,61 +1169,71 @@
 msgid "Could not recognize mode: "
 msgstr "Couldn't recognise mode: "
 
-#. restarts ag_complain agent if necessary
-#: src/include/apparmor/config_complain.rb:128
+#. translators: string is value in table for mode of apparmor
+#: src/include/apparmor/config_complain.rb:117
+#, fuzzy
+#| msgid "Enforce"
+msgid "enforce"
+msgstr "Enforce"
+
+#: src/include/apparmor/config_complain.rb:118
+msgid "complain"
+msgstr ""
+
+#: src/include/apparmor/config_complain.rb:134
 msgid "Show All Profiles"
 msgstr "Show All Profiles"
 
-#: src/include/apparmor/config_complain.rb:129
+#: src/include/apparmor/config_complain.rb:135
 msgid "Configure Mode for Active Profiles"
 msgstr "Configure Mode for Active Profiles"
 
-#: src/include/apparmor/config_complain.rb:132
+#: src/include/apparmor/config_complain.rb:138
 msgid "Show Active Profiles"
 msgstr "Show Active Profiles"
 
-#: src/include/apparmor/config_complain.rb:133
+#: src/include/apparmor/config_complain.rb:139
 msgid "Configure Mode for All Profiles"
 msgstr "Configure Mode for All Profiles"
 
 #. `Frame( `id(`changeMode), _("Configure Profile Mode"),
 #. TODO switch to variable in a module
 #. TODO plain reread does not work here
-#: src/include/apparmor/config_complain.rb:147
+#: src/include/apparmor/config_complain.rb:153
 #: src/include/apparmor/profile_dialogs.rb:1439
 msgid "Profile Name"
 msgstr "Profile Name"
 
-#: src/include/apparmor/config_complain.rb:147
+#: src/include/apparmor/config_complain.rb:153
 msgid "Mode"
 msgstr "Mode"
 
-#: src/include/apparmor/config_complain.rb:154
+#: src/include/apparmor/config_complain.rb:160
 msgid "Toggle Mode"
 msgstr "Toggle Mode"
 
-#: src/include/apparmor/config_complain.rb:155
+#: src/include/apparmor/config_complain.rb:161
 msgid "Set All to Enforce"
 msgstr "Set All to Enforce"
 
-#: src/include/apparmor/config_complain.rb:156
+#: src/include/apparmor/config_complain.rb:162
 msgid "Set All to Complain"
 msgstr "Set All to Complain"
 
 #. Profile Mode Configuration -- Sets Complain and Enforce Behavior
-#: src/include/apparmor/config_complain.rb:177
+#: src/include/apparmor/config_complain.rb:183
 msgid "Profile Mode Configuration"
 msgstr "Profile Mode Configuration"
 
 #. We'll need this often - cache it
-#: src/include/apparmor/config_complain.rb:225
-#: src/include/apparmor/config_complain.rb:235
-#: src/include/apparmor/config_complain.rb:264
-#: src/include/apparmor/config_complain.rb:283
+#: src/include/apparmor/config_complain.rb:231
+#: src/include/apparmor/config_complain.rb:241
+#: src/include/apparmor/config_complain.rb:270
+#: src/include/apparmor/config_complain.rb:289
 msgid "Configure Profile Mode"
 msgstr "Configure Profile Mode"
 
-#: src/include/apparmor/config_complain.rb:291
+#: src/include/apparmor/config_complain.rb:297
 #, fuzzy
 #| msgid "<p>Select an action:</p>"
 msgid "Select an action to perform."

-- 
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] r89781 - trunk/yast/en_GB/po

keichwa＠svn2.opensuse.org