[opensuse-translation-commit] r89776 - trunk/yast/am/po

7 Oct 2014

Author: keichwa
Date: 2014-10-07 17:43:37 +0200 (Tue, 07 Oct 2014)
New Revision: 89776

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

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

--- trunk/yast/am/po/add-on-creator.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/add-on-creator.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/add-on.am.po
===================================================================
--- trunk/yast/am/po/add-on.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/add-on.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -43,21 +43,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -83,10 +83,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 ""
 
@@ -110,7 +110,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 ""
 
@@ -215,40 +215,40 @@
 #. ...
 #. ]
 #: 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
 msgid "No product found in the repository."
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: src/include/add-on/add-on-workflow.rb:379
+#: src/include/add-on/add-on-workflow.rb:376
 msgid "URL: %1, Directory: %2"
 msgstr ""
 
 #. 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 ""
 
 #. help text
-#: src/include/add-on/add-on-workflow.rb:394
+#: src/include/add-on/add-on-workflow.rb:391
 msgid ""
 "<p><big><b>Software Repository Selection</b></big><br>\n"
 "Multiple repositories were found on the selected medium.\n"
 "Select the repository to use.</p>\n"
 msgstr ""
 
-#: src/include/add-on/add-on-workflow.rb:404
+#: src/include/add-on/add-on-workflow.rb:401
 msgid "Repositories &Found"
 msgstr ""
 
@@ -260,33 +260,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. dialog caption
-#: src/include/add-on/add-on-workflow.rb:713
+#: src/include/add-on/add-on-workflow.rb:710
 msgid "Product Selection"
 msgstr ""
 
 #. 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 ""
 
 #. help text
-#: src/include/add-on/add-on-workflow.rb:725
+#: src/include/add-on/add-on-workflow.rb:722
 msgid ""
 "<p><b><big>Product Selection</big></b><br/>\n"
 "Multiple products were found in the repository. Select the products\n"
@@ -294,12 +294,12 @@
 msgstr ""
 
 #. 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 ""
 
 #. Help for add-on products
-#: src/include/add-on/add-on-workflow.rb:915
+#: src/include/add-on/add-on-workflow.rb:912
 msgid ""
 "<p><big><b>Add-On Product Installation</b></big><br/>\n"
 "Here see all add-on products that are selected for installation.\n"
@@ -308,102 +308,102 @@
 msgstr ""
 
 #. 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 ""
 
 #. table header
-#: src/include/add-on/add-on-workflow.rb:970
+#: src/include/add-on/add-on-workflow.rb:967
 msgid "Product"
 msgstr ""
 
 #. table header
-#: src/include/add-on/add-on-workflow.rb:972
+#: src/include/add-on/add-on-workflow.rb:969
 msgid "Media"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. TRANSLATORS: dialog caption
-#: src/include/add-on/add-on-workflow.rb:1253
+#: src/include/add-on/add-on-workflow.rb:1259
 msgid "Installed Add-on Products"
 msgstr ""
 
 #. TRANSLATORS: table header item
-#: src/include/add-on/add-on-workflow.rb:1260
+#: src/include/add-on/add-on-workflow.rb:1266
 msgid "Add-on Product"
 msgstr ""
 
 #. 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 ""
 
 #. TRANSLATORS: push button
-#: src/include/add-on/add-on-workflow.rb:1276
+#: src/include/add-on/add-on-workflow.rb:1282
 msgid "Run &Software Manager..."
 msgstr ""
 
 #. TRANSLATORS: dialog help adp/1
-#: src/include/add-on/add-on-workflow.rb:1280
+#: src/include/add-on/add-on-workflow.rb:1286
 msgid "<p>All add-on products installed on your system are displayed.</p>"
 msgstr ""
 
 #. TRANSLATORS: dialog help adp/2
-#: src/include/add-on/add-on-workflow.rb:1282
+#: src/include/add-on/add-on-workflow.rb:1288
 msgid "<p>Click <b>Add</b> to add a new add-on product, or <b>Delete</b> to remove an add-on which is in use.</p>"
 msgstr ""
 
 #. no items
-#: src/include/add-on/add-on-workflow.rb:1335
+#: src/include/add-on/add-on-workflow.rb:1341
 msgid "<b>Vendor:</b> %1<br>"
 msgstr ""
 
-#: src/include/add-on/add-on-workflow.rb:1336
+#: src/include/add-on/add-on-workflow.rb:1342
 msgid "Unknown vendor"
 msgstr ""
 
-#: src/include/add-on/add-on-workflow.rb:1339
+#: src/include/add-on/add-on-workflow.rb:1345
 msgid "<b>Version:</b> %1<br>"
 msgstr ""
 
-#: src/include/add-on/add-on-workflow.rb:1340
+#: src/include/add-on/add-on-workflow.rb:1346
 msgid "Unknown version"
 msgstr ""
 
-#: src/include/add-on/add-on-workflow.rb:1343
+#: src/include/add-on/add-on-workflow.rb:1349
 msgid "<b>Repository URL:</b> %1<br>"
 msgstr ""
 
-#: src/include/add-on/add-on-workflow.rb:1349
+#: src/include/add-on/add-on-workflow.rb:1355
 msgid "Unknown repository URL"
 msgstr ""
 
-#: src/include/add-on/add-on-workflow.rb:1356
+#: src/include/add-on/add-on-workflow.rb:1362
 msgid "<b>Repository Alias:</b> %1<br>"
 msgstr ""
 
 #. Removes the currently selected Add-On
 #.
 #. @return [Boolean] whether something has changed its state
-#: src/include/add-on/add-on-workflow.rb: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 ""
 
-#: src/include/add-on/add-on-workflow.rb:1639
+#: src/include/add-on/add-on-workflow.rb:1645
 msgid "Unknown URL"
 msgstr ""
 
-#: 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"
@@ -412,7 +412,7 @@
 msgstr ""
 
 #. TRANSLATORS: busy popup message
-#: src/include/add-on/add-on-workflow.rb:1712
+#: src/include/add-on/add-on-workflow.rb:1718
 msgid "Removing product dependencies..."
 msgstr ""
 

Modified: trunk/yast/am/po/audit-laf.am.po
===================================================================
--- trunk/yast/am/po/audit-laf.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/audit-laf.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -780,30 +780,44 @@
 msgid "Cannot read audit.rules."
 msgstr ""
 
-#. Error message
+#. question shown in a popup about start of audit daemon
+#: src/modules/AuditLaf.rb:463
+msgid "Do you want to start it and enable start at boot\n"
+msgstr ""
+
+#. 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
+msgid "Start of Audit Daemon"
 msgstr ""
 
-#: src/modules/AuditLaf.rb:484
-msgid "Audit daemon not running."
+#. label of three buttons belonging to the popup
+#: src/modules/AuditLaf.rb:482
+msgid "Start and &Enable"
 msgstr ""
 
-#: src/modules/AuditLaf.rb:489
+#: src/modules/AuditLaf.rb:482
+msgid "&Start"
+msgstr ""
+
+#: src/modules/AuditLaf.rb:482
+msgid "&Do not start"
+msgstr ""
+
+#: src/modules/AuditLaf.rb:491
 msgid "Cannot start the audit daemon."
 msgstr ""
 
-#: 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"
@@ -812,36 +826,36 @@
 msgstr ""
 
 #. Auditd read dialog caption
-#: src/modules/AuditLaf.rb:546
+#: src/modules/AuditLaf.rb:548
 msgid "Saving Audit Configuration"
 msgstr ""
 
 #. Progress stage 1/2
-#: src/modules/AuditLaf.rb:562
+#: src/modules/AuditLaf.rb:564
 msgid "Write the settings"
 msgstr ""
 
 #. Progress stage 2/2
-#: src/modules/AuditLaf.rb:564
+#: src/modules/AuditLaf.rb:566
 msgid "Write the rules"
 msgstr ""
 
 #. Progress step 1/2
-#: src/modules/AuditLaf.rb:568
+#: src/modules/AuditLaf.rb:570
 msgid "Writing the settings..."
 msgstr ""
 
 #. Progress step 2/2
-#: src/modules/AuditLaf.rb:570
+#: src/modules/AuditLaf.rb:572
 msgid "Writing the rules..."
 msgstr ""
 
 #. check first whether rules are already locked
-#: src/modules/AuditLaf.rb:586
+#: src/modules/AuditLaf.rb:588
 msgid "The rules are already locked."
 msgstr ""
 
-#: 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"
@@ -849,26 +863,26 @@
 msgstr ""
 
 #. Error message
-#: src/modules/AuditLaf.rb:612
+#: src/modules/AuditLaf.rb:614
 msgid "Restart of the audit daemon failed."
 msgstr ""
 
 #. Error message
-#: src/modules/AuditLaf.rb:619
+#: src/modules/AuditLaf.rb:621
 msgid "Cannot write settings to auditd.conf."
 msgstr ""
 
 #. 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
 msgid "Cannot write settings to auditd.rules."
 msgstr ""
 
 #. 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
 msgid "Log file"
 msgstr ""

Modified: trunk/yast/am/po/auth-client.am.po
===================================================================
--- trunk/yast/am/po/auth-client.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/auth-client.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -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"
@@ -390,23 +390,23 @@
 msgstr ""
 
 #: src/include/sssd-parameters.rb:263
-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 ""
 
 #: src/include/sssd-parameters.rb:268
-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 ""
 
 #: src/include/sssd-parameters.rb:273
-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 ""
 
 #: src/include/sssd-parameters.rb:278
-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 ""
 
 #: src/include/sssd-parameters.rb:283
-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 ""
 
 #: src/include/sssd-parameters.rb:288

Modified: trunk/yast/am/po/auth-server.am.po
===================================================================
--- trunk/yast/am/po/auth-server.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/auth-server.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -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"
@@ -236,6 +236,10 @@
 msgstr ""
 
 #. Start new config wizward
+#: src/include/auth-server/complex.rb:134
+msgid "Migrate existing Configuration"
+msgstr ""
+
 #: src/include/auth-server/complex.rb:135
 msgid ""
 "Your system is currently configured to use the configuration file\n"
@@ -655,20 +659,22 @@
 
 #: src/include/auth-server/helps.rb:49
 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 ""
 
-#: 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>"
 msgstr ""
 
-#: 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"
@@ -678,14 +684,14 @@
 "of <tt>c=Admin,dc=example,dc=com</tt>.</p> "
 msgstr ""
 
-#: 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"
 "entered earlier in the installation process.</p> "
 msgstr ""
 
-#: 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"
@@ -695,13 +701,13 @@
 "when creating the first database on a server.</p>\n"
 msgstr ""
 
-#: 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"
 msgstr ""
 
-#: 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"
@@ -709,7 +715,7 @@
 "using sufficiently protected (e.g. SSL/TLS encrypted) connections.</p>\n"
 msgstr ""
 
-#: 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"
@@ -719,28 +725,28 @@
 "set in the configuration.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:97
+#: src/include/auth-server/helps.rb:99
 msgid "<h3>Edit BDB Database</h3>"
 msgstr ""
 
-#: 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 ""
 
-#: 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>"
 msgstr ""
 
-#: 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"
 "The password fields are initially empty even if a password has already been set in the configuration.</p>\n"
 msgstr ""
 
-#: 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"
@@ -751,17 +757,17 @@
 "thumbs).</p>"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:116
+#: src/include/auth-server/helps.rb:118
 msgid "<h3>Password Policy Settings</h3>"
 msgstr ""
 
-#: 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>"
 msgstr ""
 
-#: 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"
@@ -770,7 +776,7 @@
 "to manage passwords.</p> "
 msgstr ""
 
-#: 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"
@@ -779,30 +785,30 @@
 "option.</p> \n"
 msgstr ""
 
-#: 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 ""
 
-#: 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"
 "Policy Object being read from the server.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:142
+#: src/include/auth-server/helps.rb:144
 msgid "<h3>Index Configuration</h3>"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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"
@@ -810,34 +816,34 @@
 "of indexes.</p>\n"
 msgstr ""
 
-#: 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"
 "for attributes that occur rarely in the database.</p>\n"
 msgstr ""
 
-#: 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"
 "should always be configured with the <tt>objectclass</tt> attribute.</p>\n"
 msgstr ""
 
-#: 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"
 msgstr ""
 
-#: 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"
 "indexing options of an already indexed attribute.</p>\n"
 msgstr ""
 
-#: 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"
@@ -845,30 +851,30 @@
 "information for the database.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:177
+#: src/include/auth-server/helps.rb:179
 msgid "<h3>Access Control Configuration</h3>"
 msgstr ""
 
-#: 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"
 msgstr ""
 
-#: 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"
 "click <b>Edit</b>.</p>\n"
 msgstr ""
 
-#: 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"
 msgstr ""
 
-#: 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"
@@ -876,21 +882,21 @@
 "the <b>Up</b> and <b>Down</b> buttons.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:197
+#: src/include/auth-server/helps.rb:199
 msgid "<h3>Replication Provider Settings</h3>"
 msgstr ""
 
-#: 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>"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:203
+#: src/include/auth-server/helps.rb:205
 msgid "<h4>Checkpoint Settings</h4>"
 msgstr ""
 
-#: 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"
@@ -902,11 +908,11 @@
 "performance hit in environments with many LDAP write operations.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:214
+#: src/include/auth-server/helps.rb:216
 msgid "<h4>Session log</h4>"
 msgstr ""
 
-#: 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"
@@ -914,21 +920,21 @@
 "such a case it can speed up replication and reduce the load on the master server.</p>"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:221
+#: src/include/auth-server/helps.rb:223
 msgid "<h3>Replication Consumer Settings</h3>"
 msgstr ""
 
-#: 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"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:227
+#: src/include/auth-server/helps.rb:229
 msgid "<h4>Provider</h4>"
 msgstr ""
 
-#: 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"
@@ -938,15 +944,15 @@
 "ldap ports.\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:236
+#: src/include/auth-server/helps.rb:238
 msgid "<h4>Replication Type</h4>"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:237
+#: src/include/auth-server/helps.rb:239
 msgid "<p>OpenLDAP supports different modes of replication:</p>"
 msgstr ""
 
-#: 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"
@@ -954,28 +960,28 @@
 "<b>Replication Interval</b> setting.</p>\n"
 msgstr ""
 
-#: 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"
 "master server are immediately sent to the slave via this connection.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:249
+#: src/include/auth-server/helps.rb:251
 msgid "<h4>Authentication</h4>"
 msgstr ""
 
-#: 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"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:253
+#: src/include/auth-server/helps.rb:255
 msgid "<h4>Update Referral</h4>"
 msgstr ""
 
-#: 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"
@@ -985,22 +991,22 @@
 msgstr ""
 
 #. 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 ""
 
-#: 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>"
 msgstr ""
 
 #. 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 ""
 
-#: 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"
@@ -1008,11 +1014,11 @@
 msgstr ""
 
 #. 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 ""
 
-#: 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"
@@ -1020,78 +1026,78 @@
 msgstr ""
 
 #. 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 ""
 
-#: 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 ""
 
-#: 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"
 msgstr ""
 
 #. 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 ""
 
-#: 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"
 msgstr ""
 
-#: 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"
 msgstr ""
 
-#: 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>"
 msgstr ""
 
 #. Configuration Wizard Step 3
-#: src/include/auth-server/helps.rb:310
+#: src/include/auth-server/helps.rb:312
 msgid "<h3>TLS Settings</h3>"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:313
+#: src/include/auth-server/helps.rb:315
 msgid "<h4>Basic Settings</h4>"
 msgstr ""
 
-#: 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"
 "to use.</p>\n"
 msgstr ""
 
-#: 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"
 "support TLS encrypted connections through the StartTLS extended operation.</p>\n"
 msgstr ""
 
-#: 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"
 "the OpenLDAP server uses this certificate.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:329
+#: src/include/auth-server/helps.rb:331
 msgid "<h4>Import Certificate</h4>"
 msgstr ""
 
-#: 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"
@@ -1099,19 +1105,19 @@
 "textfields.</p>\n"
 msgstr ""
 
-#: 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"
 msgstr ""
 
 #. 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 ""
 
 #. 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"
@@ -1119,71 +1125,71 @@
 msgstr ""
 
 #. 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>"
 msgstr ""
 
 #. 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 ""
 
-#: src/include/auth-server/helps.rb:357
+#: src/include/auth-server/helps.rb:359
 msgid "<h3>Select Allow Flags</h3>"
 msgstr ""
 
-#: 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"
 msgstr ""
 
-#: 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>"
 msgstr ""
 
-#: 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>"
 msgstr ""
 
-#: 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"
 "access controls and other administrative limits.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:372
+#: src/include/auth-server/helps.rb:374
 msgid "<h3>Select Disallow Flags</h3>"
 msgstr ""
 
-#: 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"
 "prohibit anonymous directory access.</p>\n"
 msgstr ""
 
-#: 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"
 msgstr ""
 
-#: 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"
 "to the anonymous state when receiving the StartTLS operation.</p>\n"
 msgstr ""
 
-#: 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"
@@ -1191,7 +1197,7 @@
 msgstr ""
 
 #. 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"
@@ -1201,29 +1207,29 @@
 msgstr ""
 
 #. 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 ""
 
-#: 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"
 msgstr ""
 
-#: 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>"
 msgstr ""
 
-#: 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"
 msgstr ""
 
-#: 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"
@@ -1232,231 +1238,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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: src/include/auth-server/helps.rb:444
+#: src/include/auth-server/helps.rb:446
 msgid "Allow postdated"
 msgstr ""
 
 #. 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 ""
 
-#: src/include/auth-server/helps.rb:449
+#: src/include/auth-server/helps.rb:451
 msgid "Allow forwardable"
 msgstr ""
 
 #. 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 ""
 
-#: src/include/auth-server/helps.rb:454
+#: src/include/auth-server/helps.rb:456
 msgid "Allow renewable"
 msgstr ""
 
 #. 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 ""
 
-#: src/include/auth-server/helps.rb:459
+#: src/include/auth-server/helps.rb:461
 msgid "Allow proxiable"
 msgstr ""
 
 #. 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 ""
 
-#: src/include/auth-server/helps.rb:462
+#: src/include/auth-server/helps.rb:464
 msgid "Enable user-to-user authentication"
 msgstr ""
 
 #. 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 ""
 
-#: src/include/auth-server/helps.rb:467
+#: src/include/auth-server/helps.rb:469
 msgid "Requires preauth"
 msgstr ""
 
 #. 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 ""
 
-#: src/include/auth-server/helps.rb:472
+#: src/include/auth-server/helps.rb:474
 msgid "Requires hwauth"
 msgstr ""
 
 #. 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 ""
 
-#: src/include/auth-server/helps.rb:477
+#: src/include/auth-server/helps.rb:479
 msgid "Allow service"
 msgstr ""
 
 #. 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 ""
 
-#: src/include/auth-server/helps.rb:482
+#: src/include/auth-server/helps.rb:484
 msgid "Allow tgs request"
 msgstr ""
 
 #. 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 ""
 
-#: src/include/auth-server/helps.rb:487
+#: src/include/auth-server/helps.rb:489
 msgid "Allow tickets"
 msgstr ""
 
 #. 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 ""
 
-#: src/include/auth-server/helps.rb:492
+#: src/include/auth-server/helps.rb:494
 msgid "Need change"
 msgstr ""
 
 #. 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 ""
 
-#: src/include/auth-server/helps.rb:495
+#: src/include/auth-server/helps.rb:497
 msgid "Password changing service"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -1765,6 +1771,10 @@
 #. Ralf Haferkamp <rhafer@suse.de>
 #.
 #. $Id$
+#: src/include/auth-server/mirrormode-wizard.rb:25
+msgid "OpenLDAP MirrorMode Configuration"
+msgstr ""
+
 #: src/include/auth-server/mirrormode-wizard.rb:28
 msgid "MirrorMode Node List"
 msgstr ""
@@ -2690,8 +2700,8 @@
 msgid "Kerberos Schema unknown by the LDAP server."
 msgstr ""
 
-#: 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 ""
 
@@ -2954,7 +2964,7 @@
 msgid "Could not create database directory."
 msgstr ""
 
-#: 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 ""
@@ -2967,101 +2977,101 @@
 msgid "A master server for replication cannot work correctly without knowing its own fully qualified hostname."
 msgstr ""
 
-#: 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 ""
 
-#: src/modules/AuthServer.pm:3511
+#: src/modules/AuthServer.pm:3514
 msgid "Creating Kerberos database failed."
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: src/modules/AuthServer.pm:4016
+#: src/modules/AuthServer.pm:4019
 #, perl-format
 msgid "Invalid LDAP DN: \"%s\", cannot extract RDN values"
 msgstr ""
 
-#: 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 ""
 
 #. 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 ""
 
-#: src/modules/AuthServer.pm:4043
+#: src/modules/AuthServer.pm:4046
 #, perl-format
 msgid "Base DN \"%s\" is not a valid LDAP DN."
 msgstr ""
 
-#: src/modules/AuthServer.pm:4048
+#: src/modules/AuthServer.pm:4051
 #, perl-format
 msgid "Base DN \"%s\" has multivalued RDNs (not supported by YaST)."
 msgstr ""
 
-#: src/modules/AuthServer.pm:4057
+#: src/modules/AuthServer.pm:4060
 #, perl-format
 msgid "Root DN \"%s\" is not a valid LDAP DN."
 msgstr ""
 
-#: src/modules/AuthServer.pm:4062
+#: src/modules/AuthServer.pm:4065
 #, perl-format
 msgid "Root DN \"%s\" has multivalued RDNs (not supported by YaST)."
 msgstr ""
 
-#: src/modules/AuthServer.pm:4069
+#: src/modules/AuthServer.pm:4072
 msgid "The Root DN must be a child object of the Base DN."
 msgstr ""
 
-#: 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 ""
 
-#: src/modules/AuthServer.pm:4863
+#: src/modules/AuthServer.pm:4871
 #, perl-format
 msgid "CA Certificate File: \"%s\" does not exist."
 msgstr ""
 
-#: 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 ""
 
-#: src/modules/AuthServer.pm:4874
+#: src/modules/AuthServer.pm:4882
 #, perl-format
 msgid ""
 "Please make sure that \"%s\" contains the correct\n"
 "CA file to verify the remote Server Certificate."
 msgstr ""
 
-#: src/modules/AuthServer.pm:4882
+#: src/modules/AuthServer.pm:4890
 #, perl-format
 msgid "Certificate File: \"%s\" does not exist."
 msgstr ""
 
-#: src/modules/AuthServer.pm:4887
+#: src/modules/AuthServer.pm:4895
 #, perl-format
 msgid "Certificate Key File: \"%s\" does not exist."
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 

Modified: trunk/yast/am/po/autoinst.am.po
===================================================================
--- trunk/yast/am/po/autoinst.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/autoinst.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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:51+0200\n"
 "PO-Revision-Date: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -54,7 +54,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"
@@ -104,8 +104,7 @@
 msgid "enable/disable all package handling"
 msgstr ""
 
-#. 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
 msgid "Empty parameter list"
 msgstr ""
 
@@ -115,33 +114,26 @@
 msgid "Path to AutoYaST profile must be set."
 msgstr ""
 
-#. 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
 msgid "Client for creating an AutoYaST profile based on the currently running system"
 msgstr ""
 
-#: src/clients/clone_system.rb:52
+#: src/clients/clone_system.rb:57
 msgid "known modules: %1"
 msgstr ""
 
-#: src/clients/clone_system.rb:59
+#: src/clients/clone_system.rb:64
 msgid "comma separated list of modules to clone"
 msgstr ""
 
-#: src/clients/clone_system.rb:91
+#: src/clients/clone_system.rb:89
 msgid "Cloning the system..."
 msgstr ""
 
-#: 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
+msgid "The resulting autoyast profile can be found in %s."
 msgstr ""
 
 #. help 1/2
@@ -273,21 +265,21 @@
 msgid "Executing Post-Scripts"
 msgstr ""
 
-#: src/clients/inst_autoconfigure.rb:269
+#: src/clients/inst_autoconfigure.rb:268
 msgid "Restarting all running services"
 msgstr ""
 
-#: 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 ""
 
 #. NetworkInterfaces::Write( ".*" );
-#: src/clients/inst_autoconfigure.rb:405
+#: src/clients/inst_autoconfigure.rb:404
 msgid "Processing resource %1"
 msgstr ""
 
@@ -2157,12 +2149,12 @@
 #. @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
 msgid " - Drive"
 msgstr ""
 
 #. volume group
-#: src/modules/AutoinstDrive.rb:132
+#: src/modules/AutoinstDrive.rb:133
 msgid " - Volume group"
 msgstr ""
 
@@ -2261,11 +2253,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 ""
 
-#: src/modules/AutoinstPartPlan.rb:685 src/modules/AutoinstStorage.rb:912
+#: src/modules/AutoinstPartPlan.rb:685 src/modules/AutoinstStorage.rb:916
 msgid "Total of %1 drive"
 msgstr ""
 
@@ -2445,35 +2437,35 @@
 msgstr ""
 
 #. 1 cyl buffer per partition
-#: src/modules/AutoinstStorage.rb:491
+#: src/modules/AutoinstStorage.rb:494
 msgid "The partition plan configured in your XML profile does not fit on the hard disk. %1MB missing"
 msgstr ""
 
-#: src/modules/AutoinstStorage.rb:918
+#: src/modules/AutoinstStorage.rb:922
 msgid "No specific device configured"
 msgstr ""
 
 #. Handle /etc/fstab usage
 #. @return [Boolean]
-#: src/modules/AutoinstStorage.rb:1013
+#: src/modules/AutoinstStorage.rb:1017
 msgid "Evaluating root partition. One moment please..."
 msgstr ""
 
 #. a popup
-#: src/modules/AutoinstStorage.rb:1021
+#: src/modules/AutoinstStorage.rb:1025
 msgid "No Linux root partition found."
 msgstr ""
 
 #. 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"
 msgstr ""
 
 #. 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/am/po/base.am.po
===================================================================
--- trunk/yast/am/po/base.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/base.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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-07 13:28+0200\n"
 "PO-Revision-Date: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -1166,7 +1166,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 ""
@@ -1189,7 +1189,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 ""
 
@@ -1370,6 +1370,25 @@
 msgid "Failed to install required packages."
 msgstr ""
 
+#. TRANSLATORS: Popup message
+#: library/general/src/modules/Message.rb:265
+msgid "Updating system configuration..."
+msgstr ""
+
+#: library/general/src/modules/Message.rb:269
+msgid "This may take a while."
+msgstr ""
+
+#. 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
+msgid "Release file %{file} not found"
+msgstr ""
+
 #. Confirm user request to abort installation
 #: library/general/src/modules/Popup.rb:833
 msgid "Really abort the installation?"
@@ -1949,15 +1968,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 ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:406
+#: library/network/src/modules/NetworkInterfaces.rb:410
 msgid "Network Card"
 msgstr ""
 
@@ -1965,27 +1984,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 ""
 
 #. 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 ""
 
-#: 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 ""
 
@@ -1995,326 +2014,326 @@
 #. 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 ""
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1128
+#: library/network/src/modules/NetworkInterfaces.rb:1132
 msgid "ARCnet"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1128
+#: library/network/src/modules/NetworkInterfaces.rb:1132
 msgid "ARCnet Network Card"
 msgstr ""
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1131
+#: library/network/src/modules/NetworkInterfaces.rb:1135
 msgid "ATM"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1132
+#: library/network/src/modules/NetworkInterfaces.rb:1136
 msgid "Asynchronous Transfer Mode (ATM)"
 msgstr ""
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1136
+#: library/network/src/modules/NetworkInterfaces.rb:1140
 msgid "Bluetooth"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1137
+#: library/network/src/modules/NetworkInterfaces.rb:1141
 msgid "Bluetooth Connection"
 msgstr ""
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1140
+#: library/network/src/modules/NetworkInterfaces.rb:1144
 msgid "Bond"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1140
+#: library/network/src/modules/NetworkInterfaces.rb:1144
 msgid "Bond Network"
 msgstr ""
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1143
+#: library/network/src/modules/NetworkInterfaces.rb:1147
 msgid "CLAW"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1144
+#: library/network/src/modules/NetworkInterfaces.rb:1148
 msgid "Common Link Access for Workstation (CLAW)"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1147
+#: library/network/src/modules/NetworkInterfaces.rb:1151
 msgid "ISDN Card"
 msgstr ""
 
 #. 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 ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1151
+#: library/network/src/modules/NetworkInterfaces.rb:1155
 msgid "Channel to Channel Interface (CTC)"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1154
+#: library/network/src/modules/NetworkInterfaces.rb:1158
 msgid "DSL Connection"
 msgstr ""
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1156
+#: library/network/src/modules/NetworkInterfaces.rb:1160
 msgid "Dummy"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1156
+#: library/network/src/modules/NetworkInterfaces.rb:1160
 msgid "Dummy Network Device"
 msgstr ""
 
 #. 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 ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1160
+#: library/network/src/modules/NetworkInterfaces.rb:1164
 msgid "Enterprise System Connector (ESCON)"
 msgstr ""
 
 #. 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 ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1165
+#: library/network/src/modules/NetworkInterfaces.rb:1169
 msgid "Ethernet Network Card"
 msgstr ""
 
 #. 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 ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1168
+#: library/network/src/modules/NetworkInterfaces.rb:1172
 msgid "FDDI Network Card"
 msgstr ""
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1171
+#: library/network/src/modules/NetworkInterfaces.rb:1175
 msgid "FICON"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1172
+#: library/network/src/modules/NetworkInterfaces.rb:1176
 msgid "Fiberchannel System Connector (FICON)"
 msgstr ""
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1176
+#: library/network/src/modules/NetworkInterfaces.rb:1180
 msgid "HIPPI"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1177
+#: library/network/src/modules/NetworkInterfaces.rb:1181
 msgid "HIgh Performance Parallel Interface (HIPPI)"
 msgstr ""
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1181
+#: library/network/src/modules/NetworkInterfaces.rb:1185
 msgid "Hipersockets"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1182
+#: library/network/src/modules/NetworkInterfaces.rb:1186
 msgid "Hipersockets Interface (HSI)"
 msgstr ""
 
-#: 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 ""
 
 #. 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 ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1187
+#: library/network/src/modules/NetworkInterfaces.rb:1191
 msgid "Infrared Network Device"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1189
+#: library/network/src/modules/NetworkInterfaces.rb:1193
 msgid "Infrared Device"
 msgstr ""
 
 #. 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 ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1195
+#: library/network/src/modules/NetworkInterfaces.rb:1199
 msgid "Inter User Communication Vehicle (IUCV)"
 msgstr ""
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1198
+#: library/network/src/modules/NetworkInterfaces.rb:1202
 msgid "OSA LCS"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1198
+#: library/network/src/modules/NetworkInterfaces.rb:1202
 msgid "OSA LCS Network Card"
 msgstr ""
 
 #. 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 ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1200
+#: library/network/src/modules/NetworkInterfaces.rb:1204
 msgid "Loopback Device"
 msgstr ""
 
 #. 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 ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1204
+#: library/network/src/modules/NetworkInterfaces.rb:1208
 msgid "Myrinet Network Card"
 msgstr ""
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1209
+#: library/network/src/modules/NetworkInterfaces.rb:1213
 msgid "Parallel Line"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1210
+#: library/network/src/modules/NetworkInterfaces.rb:1214
 msgid "Parallel Line Connection"
 msgstr ""
 
 #. 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 ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1217
+#: library/network/src/modules/NetworkInterfaces.rb:1221
 msgid "OSA-Express or QDIO Device (QETH)"
 msgstr ""
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1221
+#: library/network/src/modules/NetworkInterfaces.rb:1225
 msgid "IPv6-in-IPv4"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1222
+#: library/network/src/modules/NetworkInterfaces.rb:1226
 msgid "IPv6-in-IPv4 Encapsulation Device"
 msgstr ""
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1226
+#: library/network/src/modules/NetworkInterfaces.rb:1230
 msgid "Serial Line"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1227
+#: library/network/src/modules/NetworkInterfaces.rb:1231
 msgid "Serial Line Connection"
 msgstr ""
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1231
+#: library/network/src/modules/NetworkInterfaces.rb:1235
 msgid "Token Ring"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1232
+#: library/network/src/modules/NetworkInterfaces.rb:1236
 msgid "Token Ring Network Card"
 msgstr ""
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1235
+#: library/network/src/modules/NetworkInterfaces.rb:1239
 msgid "USB"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1235
+#: library/network/src/modules/NetworkInterfaces.rb:1239
 msgid "USB Network Device"
 msgstr ""
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1237
+#: library/network/src/modules/NetworkInterfaces.rb:1241
 msgid "VMWare"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1237
+#: library/network/src/modules/NetworkInterfaces.rb:1241
 msgid "VMWare Network Device"
 msgstr ""
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1240
+#: library/network/src/modules/NetworkInterfaces.rb:1244
 msgid "Wireless"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1241
+#: library/network/src/modules/NetworkInterfaces.rb:1245
 msgid "Wireless Network Card"
 msgstr ""
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1244
+#: library/network/src/modules/NetworkInterfaces.rb:1248
 msgid "XPNET"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1244
+#: library/network/src/modules/NetworkInterfaces.rb:1248
 msgid "XP Network"
 msgstr ""
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1246
+#: library/network/src/modules/NetworkInterfaces.rb:1250
 msgid "VLAN"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1246
+#: library/network/src/modules/NetworkInterfaces.rb:1250
 msgid "Virtual LAN"
 msgstr ""
 
 #. 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 ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1248
+#: library/network/src/modules/NetworkInterfaces.rb:1252
 msgid "Network Bridge"
 msgstr ""
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1250
+#: library/network/src/modules/NetworkInterfaces.rb:1254
 msgid "TUN"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1250
+#: library/network/src/modules/NetworkInterfaces.rb:1254
 msgid "Network TUNnel"
 msgstr ""
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1252
+#: library/network/src/modules/NetworkInterfaces.rb:1256
 msgid "TAP"
 msgstr ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1252
+#: library/network/src/modules/NetworkInterfaces.rb:1256
 msgid "Network TAP"
 msgstr ""
 
 #. 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 ""
 
-#: library/network/src/modules/NetworkInterfaces.rb:1254
+#: library/network/src/modules/NetworkInterfaces.rb:1258
 msgid "InfiniBand Device"
 msgstr ""
 
@@ -2377,7 +2396,7 @@
 msgstr ""
 
 #. 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"
@@ -2386,26 +2405,23 @@
 msgstr ""
 
 #. 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
-msgid "No running network detected."
+#: library/network/src/modules/NetworkService.rb:349
+msgid ""
+"No running network detected.\n"
+"Restart installation and configure network in Linuxrc\n"
+"or continue without network."
 msgstr ""
 
-#: library/network/src/modules/NetworkService.rb:356
-msgid "Restart installation and configure network in Linuxrc"
-msgstr ""
-
-#: library/network/src/modules/NetworkService.rb:357
+#: library/network/src/modules/NetworkService.rb:355
 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 ""
 
-#: library/network/src/modules/NetworkService.rb:360
-msgid "or continue without network."
-msgstr ""
-
 #. TRANSLATORS: popup informing message, allowed characters for port-names
 #: library/network/src/modules/PortAliases.rb:136
 msgid ""
@@ -2706,51 +2722,51 @@
 msgstr ""
 
 #. 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 ""
 
-#: library/packages/src/modules/PackageCallbacks.rb:204
+#: library/packages/src/modules/PackageCallbacks.rb:206
 msgid "Size: "
 msgstr ""
 
-#: 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 ""
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:252
+#: library/packages/src/modules/PackageCallbacks.rb:254
 msgid "Downloading Package"
 msgstr ""
 
 #. check box
-#: library/packages/src/modules/PackageCallbacks.rb:310
+#: library/packages/src/modules/PackageCallbacks.rb:312
 msgid "Show &details"
 msgstr ""
 
 #. error message, %1 is a package name
-#: library/packages/src/modules/PackageCallbacks.rb:376
+#: library/packages/src/modules/PackageCallbacks.rb:378
 msgid "Package %1 is broken, integrity check has failed."
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -2759,57 +2775,57 @@
 #. 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
 msgid "Error: %1:"
 msgstr ""
 
 #. 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 ""
 
-#: library/packages/src/modules/PackageCallbacks.rb:523
+#: library/packages/src/modules/PackageCallbacks.rb:525
 msgid "Installing package %1 (%2)..."
 msgstr ""
 
-#: library/packages/src/modules/PackageCallbacks.rb:530
+#: library/packages/src/modules/PackageCallbacks.rb:532
 msgid "Uninstalling Package"
 msgstr ""
 
-#: library/packages/src/modules/PackageCallbacks.rb:530
+#: library/packages/src/modules/PackageCallbacks.rb:532
 msgid "Installing Package"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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
 msgid ""
 "<p>The repository at the specified URL now provides a different media ID.\n"
 "If the URL is correct, this indicates that the repository content has changed. To \n"
@@ -2820,34 +2836,34 @@
 #. 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 ""
 
 #. 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 ""
 
 #. 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
 msgid "%1 (Disc %2)"
 msgstr ""
 
 #. 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
 msgid "%1 (Medium %2)"
 msgstr ""
 
 #. 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'"
 msgstr ""
 
 #. 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
 msgid ""
 "Cannot access installation media\n"
 "%1\n"
@@ -2856,7 +2872,7 @@
 msgstr ""
 
 #. 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
 msgid ""
 "Cannot access installation media \n"
 "%1\n"
@@ -2865,89 +2881,89 @@
 msgstr ""
 
 #. currently unused
-#: library/packages/src/modules/PackageCallbacks.rb:848
+#: library/packages/src/modules/PackageCallbacks.rb:858
 msgid "The correct repository medium could not be mounted."
 msgstr ""
 
 #. 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
 msgid "Skip Autorefresh"
 msgstr ""
 
 #. 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 ""
 
-#: library/packages/src/modules/PackageCallbacks.rb:909
+#: library/packages/src/modules/PackageCallbacks.rb:919
 msgid "A&utomatically Eject CD or DVD Medium"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. otherwise ignore the medium
-#: library/packages/src/modules/PackageCallbacks.rb:992
+#: library/packages/src/modules/PackageCallbacks.rb:1002
 msgid "Ignoring the bad medium..."
 msgstr ""
 
 #. 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 ""
 
 #. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1321
+#: library/packages/src/modules/PackageCallbacks.rb:1331
 msgid "Creating Repository %1"
 msgstr ""
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1354
+#: library/packages/src/modules/PackageCallbacks.rb:1364
 msgid "An error occurred while creating the repository."
 msgstr ""
 
 #. 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
 msgid "Unable to retrieve the remote repository description."
 msgstr ""
 
 #. 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 ""
 
 #. 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
 msgid "The repository is not valid."
 msgstr ""
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1367
+#: library/packages/src/modules/PackageCallbacks.rb:1377
 msgid "The repository metadata is invalid."
 msgstr ""
 
@@ -2955,103 +2971,103 @@
 #. 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
 msgid "Retry?"
 msgstr ""
 
 #. 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
 msgid "Probing Repository %1"
 msgstr ""
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1485
+#: library/packages/src/modules/PackageCallbacks.rb:1495
 msgid "Error occurred while probing the repository."
 msgstr ""
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1498
+#: library/packages/src/modules/PackageCallbacks.rb:1508
 msgid "Repository probing details."
 msgstr ""
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1501
+#: library/packages/src/modules/PackageCallbacks.rb:1511
 msgid "Repository metadata is invalid."
 msgstr ""
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1597
+#: library/packages/src/modules/PackageCallbacks.rb:1607
 msgid "Repository %1"
 msgstr ""
 
 #. at start of delta providal
-#: library/packages/src/modules/PackageCallbacks.rb:1685
+#: library/packages/src/modules/PackageCallbacks.rb:1695
 msgid "Downloading delta RPM package %1 (%2)..."
 msgstr ""
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1693
+#: library/packages/src/modules/PackageCallbacks.rb:1703
 msgid "Downloading Delta RPM package"
 msgstr ""
 
 #. at start of delta application
-#: library/packages/src/modules/PackageCallbacks.rb:1706
+#: library/packages/src/modules/PackageCallbacks.rb:1716
 msgid "Applying delta RPM package %1..."
 msgstr ""
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1713
+#: library/packages/src/modules/PackageCallbacks.rb:1723
 msgid "Applying delta RPM package"
 msgstr ""
 
 #. at start of patch providal
-#: library/packages/src/modules/PackageCallbacks.rb:1734
+#: library/packages/src/modules/PackageCallbacks.rb:1744
 msgid "Downloading patch RPM package %1 (%2)..."
 msgstr ""
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1742
+#: library/packages/src/modules/PackageCallbacks.rb:1752
 msgid "Downloading Patch RPM Package"
 msgstr ""
 
 #. close popup
-#: library/packages/src/modules/PackageCallbacks.rb:1812
+#: library/packages/src/modules/PackageCallbacks.rb:1822
 msgid "Starting script %1 (patch %2)..."
 msgstr ""
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1821
+#: library/packages/src/modules/PackageCallbacks.rb:1831
 msgid "Running Script"
 msgstr ""
 
 #. label, patch name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1826
+#: library/packages/src/modules/PackageCallbacks.rb:1836
 msgid "Patch: "
 msgstr ""
 
 #. label, script name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1833
+#: library/packages/src/modules/PackageCallbacks.rb:1843
 msgid "Script: "
 msgstr ""
 
 #. label
-#: library/packages/src/modules/PackageCallbacks.rb:1839
+#: library/packages/src/modules/PackageCallbacks.rb:1849
 msgid "Output of the Script"
 msgstr ""
 
 #. label, %1 is patch name with version and architecture
-#: library/packages/src/modules/PackageCallbacks.rb:1927
+#: library/packages/src/modules/PackageCallbacks.rb:1937
 msgid ""
 "Patch: %1\n"
 "\n"
 msgstr ""
 
 #. 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"
@@ -3061,68 +3077,68 @@
 msgstr ""
 
 #. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:1959
+#: library/packages/src/modules/PackageCallbacks.rb:1969
 msgid "&Skip Refresh"
 msgstr ""
 
 #. 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
 msgid "Downloading"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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"
 msgstr ""
 
 #. 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 ""
 
 #. 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"
 msgstr ""
 
 #. progress message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2353
+#: library/packages/src/modules/PackageCallbacks.rb:2363
 msgid "Reading RPM database..."
 msgstr ""
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:2363
+#: library/packages/src/modules/PackageCallbacks.rb:2373
 msgid "Reading Installed Packages"
 msgstr ""
 
@@ -3133,27 +3149,27 @@
 #. `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
 msgid "Scanning RPM database..."
 msgstr ""
 
 #. error message, could not read RPM database
-#: library/packages/src/modules/PackageCallbacks.rb:2424
+#: library/packages/src/modules/PackageCallbacks.rb:2434
 msgid "Initialization of the target failed."
 msgstr ""
 
 #. status message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2515
+#: library/packages/src/modules/PackageCallbacks.rb:2525
 msgid "RPM database read"
 msgstr ""
 
 #. heading in a popup window
-#: library/packages/src/modules/PackageCallbacks.rb:2534
+#: library/packages/src/modules/PackageCallbacks.rb:2544
 msgid "User Authentication"
 msgstr ""
 
-#: library/packages/src/modules/PackageCallbacks.rb:2540
+#: library/packages/src/modules/PackageCallbacks.rb:2550
 msgid ""
 "URL: %1\n"
 "\n"
@@ -3161,7 +3177,7 @@
 msgstr ""
 
 #. textentry label
-#: library/packages/src/modules/PackageCallbacks.rb:2549
+#: library/packages/src/modules/PackageCallbacks.rb:2559
 msgid "&User Name"
 msgstr ""
 
@@ -3217,44 +3233,20 @@
 msgid "Do you accept this license agreement?"
 msgstr ""
 
-#. 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 ""
 
 #. 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"
@@ -3262,12 +3254,12 @@
 msgstr ""
 
 #. error report
-#: library/packages/src/modules/PackageSystem.rb:535
+#: library/packages/src/modules/PackageSystem.rb:430
 msgid "Cannot continue without installing required packages."
 msgstr ""
 
 #. 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"
@@ -3384,7 +3376,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 ""
 
@@ -3709,7 +3701,7 @@
 msgstr ""
 
 #. popup message - label, part 2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:981
+#: library/packages/src/modules/SignatureCheckDialogs.rb:982
 msgid ""
 "You can choose to import it into your keyring of trusted\n"
 "public keys, meaning that you trust the owner of the key.\n"
@@ -3718,23 +3710,23 @@
 msgstr ""
 
 #. 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 ""
 
 #. push button
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1035
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1036
 msgid "&Trust"
 msgstr ""
 
 #. 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
 msgid ""
 "The expected checksum of file %1\n"
 "is %2,\n"
@@ -3748,12 +3740,12 @@
 msgstr ""
 
 #. dialog heading - displayed in a big bold font
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1129
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1130
 msgid "Wrong Digest"
 msgstr ""
 
 #. 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
 msgid ""
 "The checksum of file %1\n"
 "is %2,\n"
@@ -3766,96 +3758,102 @@
 msgstr ""
 
 #. dialog heading - displayed in a big bold font
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1162
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1163
 msgid "Unknown Digest"
 msgstr ""
 
 #. 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
 msgid "Installing..."
 msgstr ""
 
 #. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:544
+#: library/packages/src/modules/SlideShow.rb:541
 msgid "Media"
 msgstr ""
 
 #. 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
 msgid "Remaining"
 msgstr ""
 
 #. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:550
+#: library/packages/src/modules/SlideShow.rb:547
 msgid "Time"
 msgstr ""
 
 #. 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
 msgid "Actions performed:"
 msgstr ""
 
 #. 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
 msgid "<p>Packages are being installed.</p>"
 msgstr ""
 
-#: 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
 msgid "%s Release Notes"
 msgstr ""
 
 #. tab
-#: library/packages/src/modules/SlideShow.rb:681
+#: library/packages/src/modules/SlideShow.rb:678
 msgid "Slide Sho&w"
 msgstr ""
 
 #. tab
-#: library/packages/src/modules/SlideShow.rb:683
+#: library/packages/src/modules/SlideShow.rb:680
 msgid "&Details"
 msgstr ""
 
-#. 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
+msgid "Performing Upgrade"
+msgstr ""
+
+#. Dialog heading - software packages are being installed
+#: library/packages/src/modules/SlideShow.rb:722
 msgid "Performing Installation"
 msgstr ""
 
 #. 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 ""
 
 #. 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?"
 msgstr ""
 
 #. Mode::update (), Stage::cont ()
-#: library/packages/src/modules/SlideShow.rb:845
+#: library/packages/src/modules/SlideShow.rb:847
 msgid "Aborted"
 msgstr ""
 
 #. read file content
-#: library/system/src/clients/view_anymsg.rb:185
+#: library/system/src/clients/view_anymsg.rb:187
 msgid "File not found."
 msgstr ""
 
 #. 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 ""
 
@@ -4463,7 +4461,7 @@
 msgstr ""
 
 #. 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"

Modified: trunk/yast/am/po/bootloader.am.po
===================================================================
--- trunk/yast/am/po/bootloader.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/bootloader.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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-30 10:10+0200\n"
 "PO-Revision-Date: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -122,22 +122,22 @@
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. proposal part - bootloader label
-#: src/clients/bootloader_proposal.rb:217
+#: src/clients/bootloader_proposal.rb:225
 msgid "Booting"
 msgstr ""
 
 #. menubutton entry
-#: src/clients/bootloader_proposal.rb:219
+#: src/clients/bootloader_proposal.rb:227
 msgid "&Booting"
 msgstr ""
 
@@ -146,12 +146,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 ""
 
 #: src/include/bootloader/grub/dialogs.rb:50
-#: src/include/bootloader/grub2/dialogs.rb:221
+#: src/include/bootloader/grub2/dialogs.rb:230
 msgid "Disk order settings"
 msgstr ""
 
@@ -162,10 +162,9 @@
 msgstr ""
 
 #. `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 ""
 
@@ -258,23 +257,29 @@
 "to start this section.</p>"
 msgstr ""
 
-#: 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
 msgid "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"
 msgstr ""
 
-#: 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
 msgid ""
 "<p><b>Use Serial Console</b> lets you define the parameters to use\n"
 "for a serial console. Please see the grub documentation (<code>info grub</code>) for details.</p>"
 msgstr ""
 
-#: 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"
@@ -283,25 +288,25 @@
 "press any key will be selected as a GRUB terminal.</p>"
 msgstr ""
 
-#: 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>"
 msgstr ""
 
-#: src/include/bootloader/grub/helps.rb:79
+#: src/include/bootloader/grub/helps.rb:81
 msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>"
 msgstr ""
 
-#: 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 ""
 
-#: 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
 msgid ""
 "<p><b>Protect Boot Loader with Password</b><br>\n"
 "Define the password that will be required to access the boot menu. YaST will only accept the password if you repeat\n"
@@ -309,7 +314,7 @@
 msgstr ""
 
 #. help text 1/5
-#: src/include/bootloader/grub/helps.rb:95
+#: src/include/bootloader/grub/helps.rb:97
 msgid ""
 "<p><big><b>Disks Order</b></big><br>\n"
 "To specify the order of the disks according to the order in BIOS, use\n"
@@ -318,72 +323,72 @@
 "To remove a disk, push <b>Remove</b>.</p>"
 msgstr ""
 
-#: src/include/bootloader/grub/helps.rb:106
+#: src/include/bootloader/grub/helps.rb:108
 msgid "Boot Loader Locations"
 msgstr ""
 
-#: src/include/bootloader/grub/helps.rb:107
+#: src/include/bootloader/grub/helps.rb:109
 msgid "Set &active Flag in Partition Table for Boot Partition"
 msgstr ""
 
-#: src/include/bootloader/grub/helps.rb:110
+#: src/include/bootloader/grub/helps.rb:112
 #: src/include/bootloader/routines/common_helps.rb:29
 msgid "&Timeout in Seconds"
 msgstr ""
 
-#: src/include/bootloader/grub/helps.rb:111
+#: src/include/bootloader/grub/helps.rb:113
 msgid "&Default Boot Section"
 msgstr ""
 
-#: src/include/bootloader/grub/helps.rb:112
+#: src/include/bootloader/grub/helps.rb:114
 msgid "Write &generic Boot Code to MBR"
 msgstr ""
 
-#: 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 ""
 
-#: src/include/bootloader/grub/helps.rb:115
+#: src/include/bootloader/grub/helps.rb:117
 msgid "Boot from Master Boot Record"
 msgstr ""
 
-#: src/include/bootloader/grub/helps.rb:116
+#: src/include/bootloader/grub/helps.rb:118
 msgid "Boot from Root Partition"
 msgstr ""
 
-#: src/include/bootloader/grub/helps.rb:117
+#: src/include/bootloader/grub/helps.rb:119
 msgid "Boot from Boot Partition"
 msgstr ""
 
-#: src/include/bootloader/grub/helps.rb:118
+#: src/include/bootloader/grub/helps.rb:120
 msgid "Boot from Extended Partition"
 msgstr ""
 
-#: src/include/bootloader/grub/helps.rb:119
+#: src/include/bootloader/grub/helps.rb:121
 msgid "Serial Connection &Parameters"
 msgstr ""
 
-#: src/include/bootloader/grub/helps.rb:120
+#: src/include/bootloader/grub/helps.rb:122
 msgid "Fallback Sections if Default fails"
 msgstr ""
 
-#: src/include/bootloader/grub/helps.rb:121
+#: src/include/bootloader/grub/helps.rb:123
 msgid "&Hide Menu on Boot"
 msgstr ""
 
-#: src/include/bootloader/grub/helps.rb:122
+#: src/include/bootloader/grub/helps.rb:124
 msgid "Graphical &Menu File"
 msgstr ""
 
-#: src/include/bootloader/grub/helps.rb:123
+#: src/include/bootloader/grub/helps.rb:125
 msgid "Pa&ssword for the Menu Interface"
 msgstr ""
 
-#: src/include/bootloader/grub/helps.rb:124
+#: src/include/bootloader/grub/helps.rb:126
 msgid "Debugg&ing Flag"
 msgstr ""
 
@@ -435,110 +440,110 @@
 #. 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
 msgid "Use &serial console"
 msgstr ""
 
 #: src/include/bootloader/grub/options.rb:366
-#: src/include/bootloader/grub2/options.rb:276
+#: src/include/bootloader/grub2/options.rb:302
 msgid "&Console arguments"
 msgstr ""
 
 #. textentry header
-#: src/include/bootloader/grub/options.rb:453
+#: src/include/bootloader/grub/options.rb:455
 msgid "&Device"
 msgstr ""
 
 #. disabling & enabling up/down
-#: src/include/bootloader/grub/options.rb:542
+#: src/include/bootloader/grub/options.rb:544
 msgid "Device map must contain at least one device"
 msgstr ""
 
-#: src/include/bootloader/grub/options.rb:551
+#: src/include/bootloader/grub/options.rb:553
 msgid "D&isks"
 msgstr ""
 
-#: src/include/bootloader/grub/options.rb:563
+#: src/include/bootloader/grub/options.rb:565
 msgid "&Up"
 msgstr ""
 
-#: src/include/bootloader/grub/options.rb:564
+#: src/include/bootloader/grub/options.rb:566
 msgid "&Down"
 msgstr ""
 
 #. 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"
+#: src/include/bootloader/grub/options.rb:740
+msgid "Boot from &Root Partition"
 msgstr ""
 
-#: src/include/bootloader/grub/options.rb:745
-#: src/include/bootloader/grub/options.rb:774
-#: src/include/bootloader/grub/options.rb:809
-msgid "Boot from &Master Boot Record"
+#: src/include/bootloader/grub/options.rb:741
+msgid "Boo&t from Boot Partition"
 msgstr ""
 
-#: src/include/bootloader/grub/options.rb:748
-msgid "Boot from &Root Partition"
+#: 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 ""
 
-#: src/include/bootloader/grub/options.rb:749
-msgid "Boo&t from Boot Partition"
+#: src/include/bootloader/grub/options.rb:755
+#: src/include/bootloader/grub/options.rb:782
+#: src/include/bootloader/grub/options.rb:817
+msgid "Boot from &Master Boot Record"
 msgstr ""
 
-#: src/include/bootloader/grub/options.rb:754
+#: src/include/bootloader/grub/options.rb:762
 msgid "Boot from &Extended Partition"
 msgstr ""
 
-#: 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
 msgid "C&ustom Boot Partition"
 msgstr ""
 
-#: 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 ""
 
-#. Cache for genericWidgets function
-#: src/include/bootloader/grub2/dialogs.rb:52
+#. Title in tab
+#: src/include/bootloader/grub2/dialogs.rb:57
 msgid "Boot Code Options"
 msgstr ""
 
-#. 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
 msgid "Kernel Parameters"
 msgstr ""
 
-#. 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
 msgid "Bootloader Options"
 msgstr ""
 
-#: src/include/bootloader/grub2/dialogs.rb:174
+#: src/include/bootloader/grub2/dialogs.rb:183
 msgid "Secure Boot"
 msgstr ""
 
-#: src/include/bootloader/grub2/dialogs.rb:180
+#: src/include/bootloader/grub2/dialogs.rb:189
 msgid "Enable &Secure Boot Support"
 msgstr ""
 
 #. TRANSLATORS: place where boot code is installed
-#: src/include/bootloader/grub2/dialogs.rb:253
+#: src/include/bootloader/grub2/dialogs.rb:262
 msgid "Boot &Loader Location"
 msgstr ""
 
 #. 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 ""
 
@@ -574,24 +579,40 @@
 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
 msgid "O&ptional Kernel Command Line Parameter"
 msgstr ""
 
-#: src/include/bootloader/grub2/helps.rb:39
+#: src/include/bootloader/grub2/helps.rb:45
+msgid "D&istributor"
+msgstr ""
+
+#: src/include/bootloader/grub2/helps.rb:46
 #: src/include/bootloader/routines/section_helps.rb:98
 msgid "&Vga Mode"
 msgstr ""
 
-#: src/include/bootloader/grub2/helps.rb:40
+#: src/include/bootloader/grub2/helps.rb:47
 msgid "&Failsafe Kernel Command Line Parameter"
 msgstr ""
 
-#: 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
@@ -624,30 +645,50 @@
 msgid "Unspecified"
 msgstr ""
 
+#. TRANSLATORS: set flag on disk
+#: src/include/bootloader/grub2/options.rb:102
+msgid "set"
+msgstr ""
+
+#. TRANSLATORS: remove flag from disk
+#: src/include/bootloader/grub2/options.rb:104
+msgid "remove"
+msgstr ""
+
+#. TRANSLATORS: do not change flag on disk
+#: src/include/bootloader/grub2/options.rb:106
+msgid "do not change"
+msgstr ""
+
 #. Init function for console
 #. @param [String] widget
-#: src/include/bootloader/grub2/options.rb:148
+#: src/include/bootloader/grub2/options.rb:174
 msgid "Autodetect by grub2"
 msgstr ""
 
 #. 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
 msgid "Choose new graphical theme file"
 msgstr ""
 
-#: src/include/bootloader/grub2/options.rb:235
+#: src/include/bootloader/grub2/options.rb:261
 msgid "Use &graphical console"
 msgstr ""
 
-#: src/include/bootloader/grub2/options.rb:242
+#: src/include/bootloader/grub2/options.rb:268
 msgid "&Console resolution"
 msgstr ""
 
-#: src/include/bootloader/grub2/options.rb:250
+#: src/include/bootloader/grub2/options.rb:276
 msgid "&Console theme"
 msgstr ""
 
+#. 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
@@ -661,7 +702,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 ""
 
@@ -792,11 +833,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 ""
 
@@ -1647,33 +1684,34 @@
 #.
 #.
 #. 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
 msgid "Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not install</a>)"
 msgstr ""
 
-#: src/modules/BootGRUB.rb:661 src/modules/BootGRUB2.rb:171
+#: src/modules/BootGRUB.rb:661 src/modules/BootGRUB2.rb:193
 msgid "Do not install bootcode into MBR (<a href=\"enable_boot_mbr\">install</a>)"
 msgstr ""
 
 #. 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
 msgid "Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do not install</a>)"
 msgstr ""
 
-#: src/modules/BootGRUB.rb:677 src/modules/BootGRUB2.rb:187
+#: src/modules/BootGRUB.rb:677 src/modules/BootGRUB2.rb:210
 msgid "Do not install bootcode into /boot partition (<a href=\"enable_boot_boot\">install</a>)"
 msgstr ""
 
-#: src/modules/BootGRUB.rb:683 src/modules/BootGRUB2.rb:193
+#: src/modules/BootGRUB.rb:683 src/modules/BootGRUB2.rb:216
 msgid "Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do not install</a>)"
 msgstr ""
 
-#: src/modules/BootGRUB.rb:687 src/modules/BootGRUB2.rb:197
+#: src/modules/BootGRUB.rb:687 src/modules/BootGRUB2.rb:220
 msgid "Do not install bootcode into \"/\" partition (<a href=\"enable_boot_root\">install</a>)"
 msgstr ""
 
-#: 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
 msgid "Change Location: %s"
 msgstr ""
 
@@ -1682,31 +1720,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 ""
 
 #. 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
 msgid "Status Location: %1"
 msgstr ""
 
@@ -1729,232 +1769,126 @@
 msgid "Propose and &Merge with Existing GRUB Menus"
 msgstr ""
 
-#: 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
 msgid "Enable Secure Boot: %1"
 msgstr ""
 
 #. Check that bootloader is known and supported
-#: src/modules/BootSupportCheck.rb:68
+#: src/modules/BootSupportCheck.rb:70
 msgid "Unknown bootloader: %1"
 msgstr ""
 
 #. 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
-msgid "The boot device is on iSCSI disk: %1. System may not boot."
+#. 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
 msgid "The boot device is on raid type: %1. System will not boot."
 msgstr ""
 
 #. bnc#501043 added check for valid configuration
-#: src/modules/BootSupportCheck.rb: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 ""
 
 #. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:171
+#: src/modules/Bootloader.rb:172
 msgid "Read partitioning"
 msgstr ""
 
 #. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:173
+#: src/modules/Bootloader.rb:174
 msgid "Load boot loader settings"
 msgstr ""
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:177
+#: src/modules/Bootloader.rb:178
 msgid "Checking boot loader..."
 msgstr ""
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:179
+#: src/modules/Bootloader.rb:180
 msgid "Reading partitioning..."
 msgstr ""
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:181
+#: src/modules/Bootloader.rb:182
 msgid "Loading boot loader settings..."
 msgstr ""
 
 #. dialog header
-#: src/modules/Bootloader.rb:185
+#: src/modules/Bootloader.rb:186
 msgid "Initializing Boot Loader Configuration"
 msgstr ""
 
 #. 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 ""
 
 #. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:366
+#: src/modules/Bootloader.rb:367
 msgid "Create initrd"
 msgstr ""
 
 #. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:368
+#: src/modules/Bootloader.rb:369
 msgid "Save boot loader configuration files"
 msgstr ""
 
 #. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:370
+#: src/modules/Bootloader.rb:371
 msgid "Install boot loader"
 msgstr ""
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:374
+#: src/modules/Bootloader.rb:375
 msgid "Creating initrd..."
 msgstr ""
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:376
+#: src/modules/Bootloader.rb:377
 msgid "Saving boot loader configuration files..."
 msgstr ""
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:378
+#: src/modules/Bootloader.rb:379
 msgid "Installing boot loader..."
 msgstr ""
 
 #. progress line
-#: src/modules/Bootloader.rb:384
+#: src/modules/Bootloader.rb:385
 msgid "Saving Boot Loader Configuration"
 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/modules/GfxMenu.rb:79
-msgid "Linux"
-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/modules/GfxMenu.rb:85
-msgid "Failsafe"
-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/modules/GfxMenu.rb:97
-msgid "Hard Disk"
-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/modules/GfxMenu.rb:103
-msgid "Memory Test"
-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/modules/GfxMenu.rb:109
-msgid "MBR before Installation"
-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/modules/GfxMenu.rb:115
-msgid "Previous Kernel"
-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/modules/GfxMenu.rb:121
-msgid "Vendor Diagnostics"
-msgstr ""
-
-#. 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 ""
-
-#. 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 ""
-
-#. 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 ""
-
-#. 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 ""
-
-#. 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 ""
-
-#. 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 ""
-
-#. 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 ""
-
-#. 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 ""

Modified: trunk/yast/am/po/ca-management.am.po
===================================================================
--- trunk/yast/am/po/ca-management.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/ca-management.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -53,25 +53,25 @@
 msgstr ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
@@ -258,7 +258,7 @@
 msgstr ""
 
 #. 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 ""
@@ -274,7 +274,7 @@
 msgid "Email"
 msgstr ""
 
-#: 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 ""
@@ -573,7 +573,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
@@ -614,7 +614,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 ""
@@ -659,11 +659,18 @@
 msgid "<p>For more information, please read the manual.</p>"
 msgstr ""
 
+#. popup text
+#: src/clients/common_cert.rb:154
+msgid ""
+"<pre>Common Server Certificate not found.\n"
+"You can import a certificate from disk</pre>"
+msgstr ""
+
 #. 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
@@ -671,29 +678,29 @@
 msgstr ""
 
 #. push button label
-#: src/clients/common_cert.rb:166
+#: src/clients/common_cert.rb:167
 msgid "&Remove"
 msgstr ""
 
 #. push button label
-#: src/clients/common_cert.rb:168
+#: src/clients/common_cert.rb:169
 msgid "&Import/Replace"
 msgstr ""
 
 #. To translators: warning popup yes/no question (1/3)
-#: src/clients/common_cert.rb:208
+#: src/clients/common_cert.rb:209
 msgid "The certificate is not yet expired.\n"
 msgstr ""
 
 #. 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
 msgid "Are you sure, that you want to remove the certificate?"
 msgstr ""
 
@@ -724,51 +731,99 @@
 msgid "<p><b>Issued For:</b></p>"
 msgstr ""
 
-#: 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
+msgid ""
+"\n"
+"Common Name:  "
+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/ca.rb:192 src/include/ca-management/ca.rb:229
+msgid ""
+"\n"
+"Organization: "
+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/ca.rb:197 src/include/ca-management/ca.rb:234
+msgid ""
+"\n"
+"Location:     "
+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/ca.rb:202 src/include/ca-management/ca.rb:239
+msgid ""
+"\n"
+"State:        "
+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/ca.rb:207 src/include/ca-management/ca.rb:244
+msgid ""
+"\n"
+"Country:      "
+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/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 ""
 
-#: src/include/ca-management/ca.rb:244
+#: src/include/ca-management/ca.rb:256
 msgid ""
 "\n"
 "Valid from: "
 msgstr ""
 
-#: src/include/ca-management/ca.rb:248
+#: src/include/ca-management/ca.rb:260
 msgid ""
 "\n"
 "Valid to: "
 msgstr ""
 
 #. To translators: pushbutton label
-#: src/include/ca-management/ca.rb:271
+#: src/include/ca-management/ca.rb:283
 msgid "&Advanced..."
 msgstr ""
 
-#: 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 ""
 
-#: src/include/ca-management/ca.rb:274
+#: src/include/ca-management/ca.rb:286
 msgid "&Change CA Password"
 msgstr ""
 
-#: src/include/ca-management/ca.rb:275
+#: src/include/ca-management/ca.rb:287
 msgid "C&reate SubCA"
 msgstr ""
 
-#: src/include/ca-management/ca.rb:276
+#: src/include/ca-management/ca.rb:288
 msgid "Export to &File"
 msgstr ""
 
-#: src/include/ca-management/ca.rb:277
+#: src/include/ca-management/ca.rb:289
 msgid "Export to &LDAP"
 msgstr ""
 
-#: src/include/ca-management/ca.rb:278
+#: src/include/ca-management/ca.rb:290
 msgid "&Edit Default"
 msgstr ""
 
@@ -822,7 +877,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 ""
 
@@ -854,18 +909,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 ""
 
@@ -877,40 +932,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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
 #: 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 ""
 
@@ -984,83 +1039,203 @@
 "Certificate not found"
 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:302
+#: src/include/ca-management/signRequest.rb:65
+msgid ""
+"\n"
+"Common Name:        "
+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:307
+#: src/include/ca-management/signRequest.rb:80
+msgid ""
+"\n"
+"Organization:       "
+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:312
+#: src/include/ca-management/signRequest.rb:85
+msgid ""
+"\n"
+"Location:           "
+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:317
+#: src/include/ca-management/signRequest.rb:90
+msgid ""
+"\n"
+"State:              "
+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:322
+#: src/include/ca-management/signRequest.rb:95
+msgid ""
+"\n"
+"Country:            "
+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:327
+#: src/include/ca-management/signRequest.rb:100
+msgid ""
+"\n"
+"EMAIL:              "
+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:333
+#: src/include/ca-management/signRequest.rb:107
+msgid ""
+"\n"
+"Is CA:              "
+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:338
+#: src/include/ca-management/signRequest.rb:112
+msgid ""
+"\n"
+"Key Size:           "
+msgstr ""
+
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:343
+msgid ""
+"\n"
+"Serialnumber:       "
+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:348
+#: src/include/ca-management/signRequest.rb:117
+msgid ""
+"\n"
+"Version:            "
+msgstr ""
+
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:353
+msgid ""
+"\n"
+"Valid from:         "
+msgstr ""
+
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:358
+msgid ""
+"\n"
+"Valid to:           "
+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: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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. To translators: table headers
-#: src/include/ca-management/certificate.rb:439
+#: src/include/ca-management/certificate.rb:453
 msgid "Status"
 msgstr ""
 
-#: 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 ""
 
-#: src/include/ca-management/certificate.rb:456
+#: src/include/ca-management/certificate.rb:470
 #: src/include/ca-management/request.rb:338
 msgid "Add"
 msgstr ""
 
-#: src/include/ca-management/certificate.rb:458
+#: src/include/ca-management/certificate.rb:472
 msgid "Add Server Certificate"
 msgstr ""
 
-#: src/include/ca-management/certificate.rb:459
+#: src/include/ca-management/certificate.rb:473
 msgid "Add Client Certificate"
 msgstr ""
 
-#: src/include/ca-management/certificate.rb:463
+#: src/include/ca-management/certificate.rb:477
 #: src/include/ca-management/request.rb:351
 msgid "&Change Password"
 msgstr ""
 
-#: src/include/ca-management/certificate.rb:464
+#: src/include/ca-management/certificate.rb:478
 msgid "&Revoke"
 msgstr ""
 
-#: src/include/ca-management/certificate.rb:465
+#: src/include/ca-management/certificate.rb:479
 #: src/include/ca-management/request.rb:361
 msgid "&Delete"
 msgstr ""
 
 #. 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 ""
 
-#: 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 ""
 
 #. 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 ""
 
-#: src/include/ca-management/certificate.rb:473
+#: src/include/ca-management/certificate.rb:487
 msgid "Export as Common Server Certificate"
 msgstr ""
 
-#: src/include/ca-management/certificate.rb:572
+#: src/include/ca-management/certificate.rb:586
 msgid "Delete current certificate?"
 msgstr ""
 
@@ -1150,7 +1325,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 ""
 
@@ -1578,7 +1753,7 @@
 msgstr ""
 
 #: 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 ""
 
@@ -1780,6 +1955,13 @@
 "Request not found.\n"
 msgstr ""
 
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/signRequest.rb:74
+msgid ""
+"\n"
+"generation Time:    "
+msgstr ""
+
 #. Reset an accpetation of a RequestExtention
 #. @param request extention
 #. @return [void]
@@ -1788,77 +1970,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 ""
 
 #. 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 ""
 
-#: 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: src/include/ca-management/signRequest.rb:719
+#: src/include/ca-management/signRequest.rb:731
 msgid "Requested Extensions"
 msgstr ""
 
-#: src/include/ca-management/signRequest.rb:725
+#: src/include/ca-management/signRequest.rb:737
 msgid "Sign Request as a %1 (Step 1/2)"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: src/include/ca-management/signRequest.rb:789
+#: src/include/ca-management/signRequest.rb:801
 msgid " days"
 msgstr ""
 
-#: src/include/ca-management/signRequest.rb:795
+#: src/include/ca-management/signRequest.rb:807
 msgid " (critical)</p>"
 msgstr ""
 
-#: src/include/ca-management/signRequest.rb:1221
+#: src/include/ca-management/signRequest.rb:1233
 msgid "&Edit Request"
 msgstr ""
 
 #. 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 ""
 
-#: src/include/ca-management/signRequest.rb:1232
+#: src/include/ca-management/signRequest.rb:1244
 msgid "Sign Request"
 msgstr ""
 
 #. signing request
-#: src/include/ca-management/signRequest.rb:1245
+#: src/include/ca-management/signRequest.rb:1257
 msgid "The request has been signed."
 msgstr ""
 

Added: trunk/yast/am/po/cio.am.po
===================================================================
--- trunk/yast/am/po/cio.am.po	                        (rev 0)
+++ trunk/yast/am/po/cio.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -0,0 +1,94 @@
+# Amharic message file for YaST2 (@memory@).
+# Copyright (C) 2007 SUSE Linux Products GmbH.
+#
+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: 2002-07-18 14:04+0200\n"
+"Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
+"Language-Team: Amharic <i18n@suse.de>\n"
+"Language: am\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\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
+msgid "Available Input/Output Channels"
+msgstr ""
+
+#: src/lib/iochannel/channels_dialog.rb:132
+msgid "Device"
+msgstr ""
+
+#: src/lib/iochannel/channels_dialog.rb:132
+msgid "Used"
+msgstr ""
+
+#: src/lib/iochannel/channels_dialog.rb:142
+msgid "no"
+msgstr ""
+
+#: src/lib/iochannel/channels_dialog.rb:142
+msgid "yes"
+msgstr ""
+
+#. filter can be empty if dialog is not yet created
+#: src/lib/iochannel/channels_dialog.rb:160
+msgid "Filter channels"
+msgstr ""
+
+#: src/lib/iochannel/channels_dialog.rb:162
+msgid "&Select All"
+msgstr ""
+
+#: src/lib/iochannel/channels_dialog.rb:163
+msgid "&Clear selection"
+msgstr ""
+
+#: src/lib/iochannel/channels_dialog.rb:164
+msgid "&Blacklist Selected Channels"
+msgstr ""
+
+#: src/lib/iochannel/channels_dialog.rb:165
+msgid "&Unban Channels"
+msgstr ""
+
+#: src/lib/iochannel/channels_dialog.rb:170
+msgid "&Exit"
+msgstr ""
+
+#. 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/am/po/cluster.am.po
===================================================================
--- trunk/yast/am/po/cluster.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/cluster.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -76,229 +76,229 @@
 msgstr ""
 
 #. 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 ""
 
-#: 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 ""
 
 #. BNC#871970, change member address struct
-#: src/include/cluster/dialogs.rb:109
+#: src/include/cluster/dialogs.rb:111
 msgid "IP Address"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:111
+#: src/include/cluster/dialogs.rb:113
 msgid "Redundant IP Address"
 msgstr ""
 
-#: 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
 msgid "Transport:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:391
+#: src/include/cluster/dialogs.rb:444
 msgid "Channel"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:396 src/include/cluster/dialogs.rb:417
+#: src/include/cluster/dialogs.rb:449 src/include/cluster/dialogs.rb:470
 msgid "Bind Network Address:"
 msgstr ""
 
-#: 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
 msgid "Multicast Address:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:404 src/include/cluster/dialogs.rb:421
+#: src/include/cluster/dialogs.rb:457 src/include/cluster/dialogs.rb:474
 msgid "Multicast Port:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:411
+#: src/include/cluster/dialogs.rb:464
 msgid "Redundant Channel"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:427
+#: src/include/cluster/dialogs.rb:480
 msgid "Cluster Name:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:428
-msgid "expected votes:"
+#: src/include/cluster/dialogs.rb:481
+msgid "Expected Votes:"
 msgstr ""
 
-#: 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
 msgid "Member Address:"
 msgstr ""
 
-#. 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
 msgid "Enable Security Auth"
 msgstr ""
 
-#: 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 ""
 
-#: src/include/cluster/dialogs.rb:789
+#: src/include/cluster/dialogs.rb:849
 msgid "Not running"
 msgstr ""
 
 #. 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 ""
 
-#: src/include/cluster/dialogs.rb:835
+#: src/include/cluster/dialogs.rb:895
 msgid "On -- Start pacemaker at booting"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:842
+#: src/include/cluster/dialogs.rb:902
 msgid "Off -- Start pacemaker manually only"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:851
+#: src/include/cluster/dialogs.rb:911
 msgid "Switch On and Off"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:856
+#: src/include/cluster/dialogs.rb:916
 msgid "Current Status: "
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:865
+#: src/include/cluster/dialogs.rb:925
 msgid "Start pacemaker Now"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:866
+#: src/include/cluster/dialogs.rb:926
 msgid "Stop pacemaker Now"
 msgstr ""
 
 #. BNC#874563,stop pacemaker could stop corosync since BNC#872651 is fixed
-#: src/include/cluster/dialogs.rb:962
+#: src/include/cluster/dialogs.rb:1024
 msgid "Sync Host"
 msgstr ""
 
-#: 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 ""
 
-#: src/include/cluster/dialogs.rb:967 src/include/cluster/dialogs.rb:979
+#: src/include/cluster/dialogs.rb:1029 src/include/cluster/dialogs.rb:1041
 msgid "Del"
 msgstr ""
 
-#: 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 ""
 
-#: src/include/cluster/dialogs.rb:974
+#: src/include/cluster/dialogs.rb:1036
 msgid "Sync File"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:981
+#: src/include/cluster/dialogs.rb:1043
 msgid "Add Suggested Files"
 msgstr ""
 
-#: 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
 msgid "Enter a hostname"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1164
+#: src/include/cluster/dialogs.rb:1226
 msgid "Edit the hostname"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1178
+#: src/include/cluster/dialogs.rb:1240
 msgid "Enter a filename to synchronize"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1193
+#: src/include/cluster/dialogs.rb:1255
 msgid "Edit the filename"
 msgstr ""
 
 #. key file exist
-#: src/include/cluster/dialogs.rb:1225
+#: src/include/cluster/dialogs.rb:1287
 msgid ""
 "Key file %1 already exist.\n"
 "Do you want to overwrite it?"
 msgstr ""
 
 #. remove exist key file
-#: src/include/cluster/dialogs.rb:1235
+#: src/include/cluster/dialogs.rb:1297
 msgid "Delete key file %1 failed."
 msgstr ""
 
 #. 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
 msgid "Key generation failed."
 msgstr ""
 
 #. 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 ""
 
@@ -311,23 +311,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"
@@ -336,7 +339,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"
@@ -347,28 +350,28 @@
 msgstr ""
 
 #. Read dialog help 1/2
-#: src/include/cluster/helps.rb:69
+#: src/include/cluster/helps.rb:72
 msgid ""
 "<p><b><big>Initializing cluster Configuration</big></b><br>\n"
 "Please wait...<br></p>\n"
 msgstr ""
 
 #. 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"
 msgstr ""
 
 #. Write dialog help 1/2
-#: src/include/cluster/helps.rb:77
+#: src/include/cluster/helps.rb:80
 msgid ""
 "<p><b><big>Saving cluster Configuration</big></b><br>\n"
 "Please wait...<br></p>\n"
 msgstr ""
 
 #. 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"
@@ -387,96 +390,96 @@
 msgstr ""
 
 #. Cluster read dialog caption
-#: src/modules/Cluster.rb:384
+#: src/modules/Cluster.rb:395
 msgid "Initializing cluster Configuration"
 msgstr ""
 
 #. Progress stage 1/3
-#: src/modules/Cluster.rb:400
+#: src/modules/Cluster.rb:411
 msgid "Read the database"
 msgstr ""
 
 #. Progress stage 2/3
-#: src/modules/Cluster.rb:402
+#: src/modules/Cluster.rb:413
 msgid "Read the previous settings"
 msgstr ""
 
 #. Progress stage 3/3
-#: src/modules/Cluster.rb:404
+#: src/modules/Cluster.rb:415
 msgid "Read SuSEFirewall Settings"
 msgstr ""
 
 #. Progress step 1/3
-#: src/modules/Cluster.rb:408
+#: src/modules/Cluster.rb:419
 msgid "Reading the database..."
 msgstr ""
 
 #. Progress step 2/3
-#: src/modules/Cluster.rb:410
+#: src/modules/Cluster.rb:421
 msgid "Reading the previous settings..."
 msgstr ""
 
 #. Progress step 3/3
-#: src/modules/Cluster.rb:412
+#: src/modules/Cluster.rb:423
 msgid "Reading SuSEFirewall settings..."
 msgstr ""
 
 #. 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 ""
 
-#: src/modules/Cluster.rb:429
+#: src/modules/Cluster.rb:440
 msgid "Cannot install required package"
 msgstr ""
 
 #. read database
-#: src/modules/Cluster.rb:438
+#: src/modules/Cluster.rb:449
 msgid "Cannot load existing configuration"
 msgstr ""
 
 #. Error message
-#: src/modules/Cluster.rb:449
+#: src/modules/Cluster.rb:460
 msgid "Cannot read database1."
 msgstr ""
 
 #. Error message
-#: src/modules/Cluster.rb:457
+#: src/modules/Cluster.rb:468
 msgid "Cannot read database2."
 msgstr ""
 
 #. Error message
-#: src/modules/Cluster.rb:473
+#: src/modules/Cluster.rb:484
 msgid "Cannot detect devices."
 msgstr ""
 
 #. Cluster read dialog caption
-#: src/modules/Cluster.rb:490
+#: src/modules/Cluster.rb:502
 msgid "Saving cluster Configuration"
 msgstr ""
 
 #. Progress stage 1/2
-#: src/modules/Cluster.rb:506
+#: src/modules/Cluster.rb:517
 msgid "Write the settings"
 msgstr ""
 
 #. Progress stage 2/2
-#: src/modules/Cluster.rb:508
+#: src/modules/Cluster.rb:519
 msgid "Save changes to SuSEFirewall"
 msgstr ""
 
 #. Progress step 1/2
-#: src/modules/Cluster.rb:512
+#: src/modules/Cluster.rb:523
 msgid "Writing the settings..."
 msgstr ""
 
 #. Progress step 2/2
-#: src/modules/Cluster.rb:514
+#: src/modules/Cluster.rb:525
 msgid "Saving changes to SuSEFirewall..."
 msgstr ""
 
 #. Error message
-#: src/modules/Cluster.rb:526
+#: src/modules/Cluster.rb:537
 msgid "Cannot write settings."
 msgstr ""

Modified: trunk/yast/am/po/control-center.am.po
===================================================================
--- trunk/yast/am/po/control-center.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/control-center.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/control.am.po
===================================================================
--- trunk/yast/am/po/control.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/control.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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:53+0200\n"
 "PO-Revision-Date: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -15,708 +15,206 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: control/add-on-template_installation.glade:7
-msgid "Add-On Product Installation"
-msgstr ""
-
-#: control/add-on-template_installation.glade:15
-msgid "Language Installation"
-msgstr ""
-
-#: control/control.SLED.glade:355
+#: control/control.SLES.glade.translations.glade:3
 msgid ""
 "\n"
 "<p>\n"
 "The installation has completed successfully.\n"
 "Your system is ready for use.\n"
-"Click <b>Finish</b> to log in to the system.\n"
+"Click Finish to log in to the system.\n"
 "</p>\n"
 "<p>\n"
 "Please visit us at http://www.suse.com/.\n"
 "</p>\n"
-"\t"
+"        "
 msgstr ""
 
-#: control/control.SLED.glade:371 control/control.openSUSE.glade:429
-msgid "Initialization..."
-msgstr ""
-
-#: control/control.SLED.glade:372 control/control.openSUSE.glade:430
-msgid "Configuring network..."
-msgstr ""
-
-#: control/control.SLED.glade:373 control/control.openSUSE.glade:431
-msgid "Configuring hardware..."
-msgstr ""
-
-#: control/control.SLED.glade:374 control/control.openSUSE.glade:432
-msgid "Finishing configuration..."
-msgstr ""
-
-#: control/control.SLED.glade:377 control/control.SLES-for-VMware.glade:319
-#: control/control.SLES.glade:343
+#: control/control.SLES.glade.translations.glade:14
 msgid "CIM Server"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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
+msgid "Network Services Configuration"
+msgstr ""
+
+#: 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 ""
 
-#: 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 ""
 
-#: 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
+msgid "Load Linuxrc Network Configuration"
+msgstr ""
+
+#: control/control.SLES.glade.translations.glade:32
+#: control/control.SLES.glade.translations.glade:53
+#: control/control.SLES.glade.translations.glade:67
+msgid "Network Autosetup"
+msgstr ""
+
+#: control/control.SLES.glade.translations.glade:33
+#: control/control.SLES.glade.translations.glade:54
+#: control/control.SLES.glade.translations.glade:68
 msgid "Welcome"
 msgstr ""
 
-#: 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
 msgid "Network Activation"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
+
+#: control/control.SLES.glade.translations.glade:40
+#: control/control.SLES.glade.translations.glade:57
 msgid "Time Zone"
 msgstr ""
 
-#: 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"
+#: control/control.SLES.glade.translations.glade:41
+#: control/control.SLES.glade.translations.glade:51
+msgid "Installation"
 msgstr ""
 
-#: control/control.SLED.glade:655 control/control.openSUSE.glade:747
-msgid "Installation Overview"
+#: control/control.SLES.glade.translations.glade:42
+msgid "Installation Summary"
 msgstr ""
 
-#: 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 ""
 
-#: control/control.SLED.glade:720 control/control.SLES-for-VMware.glade:835
-#: control/control.SLES.glade:859 control/control.openSUSE.glade:822
-msgid "Repair"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#. 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 ""
 
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
 
-#: 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"
+#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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
-msgid "Automatic Configuration"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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
+#: control/control.SLES.glade.translations.glade:109
+#: control/control.SLES.glade.translations.glade:113
 msgid "System Configuration"
 msgstr ""
-
-#: 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 ""
-
-#: control/control.SLES-for-VMware.glade:291 control/control.SLES.glade:314
-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 ""
-
-#: control/control.SLES-for-VMware.glade:307 control/control.SLES.glade:330
-msgid "Server Base Scenario"
-msgstr ""
-
-#: 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 ""
-
-#: control/control.SLES-for-VMware.glade:314 control/control.SLES.glade:337
-msgid "Physical Machine (Also for Fully Virtualized Guests)"
-msgstr ""
-
-#: control/control.SLES-for-VMware.glade:315 control/control.SLES.glade:338
-msgid "Virtual Machine (For Paravirtualized Environments Like Xen)"
-msgstr ""
-
-#: control/control.SLES-for-VMware.glade:316 control/control.SLES.glade:339
-msgid "Xen Virtualization Host (Local X11 Not Configured by Default)"
-msgstr ""
-
-#: control/control.SLES-for-VMware.glade:639 control/control.SLES.glade:663
-msgid "Network Services Configuration"
-msgstr ""
-
-#: control/control.SLES-for-VMware.glade:760 control/control.SLES.glade:784
-msgid "Server Scenario"
-msgstr ""
-
-#: control/control.SLES-for-VMware.glade:765 control/control.SLES.glade:789
-#: control/control.glade:286
-msgid "Installation Summary"
-msgstr ""
-
-#: control/control.SLES-for-VMware.glade:1326 control/control.SLES.glade:1350
-msgid "Service"
-msgstr ""
-
-#: control/control.SLES.glade:340
-msgid "KVM Virtualization Host (Local X11 Not Configured by Default)"
-msgstr ""
-
-#: control/control.glade:276 control/control.openSUSE.glade:717
-msgid "Desktop Selection"
-msgstr ""
-
-#: control/control.glade:634
-msgid "Root Password"
-msgstr ""
-
-#: control/control.openSUSE.glade:420
-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 ""
-
-#: 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 ""
-
-#: control/control.openSUSE.glade:451
-msgid "GNOME Desktop"
-msgstr ""
-
-#: control/control.openSUSE.glade:452
-msgid "KDE Desktop"
-msgstr ""
-
-#: control/control.openSUSE.glade:453
-msgid "XFCE Desktop"
-msgstr ""
-
-#: control/control.openSUSE.glade:454
-msgid "LXDE Desktop"
-msgstr ""
-
-#: control/control.openSUSE.glade:455
-msgid "Minimal X Window"
-msgstr ""
-
-#: control/control.openSUSE.glade:456
-msgid "Enlightenment Desktop"
-msgstr ""
-
-#: control/control.openSUSE.glade:457
-msgid "Minimal Server Selection (Text Mode)"
-msgstr ""
-
-#: control/control.openSUSE.glade:699 control/control.openSUSE.glade:970
-msgid "Online Repositories"
-msgstr ""

Modified: trunk/yast/am/po/country.am.po
===================================================================
--- trunk/yast/am/po/country.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/country.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/crowbar.am.po
===================================================================
--- trunk/yast/am/po/crowbar.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/crowbar.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/dhcp-server.am.po
===================================================================
--- trunk/yast/am/po/dhcp-server.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/dhcp-server.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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-08-18 12:43+0000\n"
 "PO-Revision-Date: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -514,7 +514,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 ""
 
@@ -535,75 +535,74 @@
 
 #. 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 ""
 
 #. 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
 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. Textentry with name of the domain
-#: src/include/dhcp-server/dialogs2.rb:653
+#: src/include/dhcp-server/dialogs2.rb:652
 msgid "&Domain Name"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -611,48 +610,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 ""
 
 #. frame
-#: src/include/dhcp-server/dialogs2.rb:1068
+#: src/include/dhcp-server/dialogs2.rb:1067
 msgid "Subnet Information"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: src/include/dhcp-server/dialogs2.rb:1104
+#: src/include/dhcp-server/dialogs2.rb:1103
 msgid "IP Address Range"
 msgstr ""
 
@@ -660,7 +659,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
@@ -671,7 +670,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
@@ -679,53 +678,53 @@
 msgstr ""
 
 #. 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 ""
 
 #. frame label
-#: src/include/dhcp-server/dialogs2.rb:1125
+#: src/include/dhcp-server/dialogs2.rb:1124
 msgid "Lease Time"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: src/include/dhcp-server/dialogs2.rb:1372
+#: src/include/dhcp-server/dialogs2.rb:1371
 msgid "Edit Current DNS Zone"
 msgstr ""
 
 #. 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 ""
 
-#: src/include/dhcp-server/dialogs2.rb:1386
+#: src/include/dhcp-server/dialogs2.rb:1385
 msgid "&Synchronize DNS Server..."
 msgstr ""
 
 #. Show DNS Zone Information
-#: src/include/dhcp-server/dialogs2.rb:1415
+#: src/include/dhcp-server/dialogs2.rb:1414
 msgid ""
 "DNS zone %1 is not a master zone.\n"
 "Therefore, you cannot change it here.\n"
@@ -733,8 +732,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 ""
 
@@ -742,135 +741,135 @@
 #. %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."
 msgstr ""
 
 #. Label of the registered hosts table
-#: src/include/dhcp-server/dialogs2.rb:1643
+#: src/include/dhcp-server/dialogs2.rb:1642
 msgid "Registered Host"
 msgstr ""
 
 #. Table header item - Name of the host
-#: src/include/dhcp-server/dialogs2.rb:1649
+#: src/include/dhcp-server/dialogs2.rb:1648
 msgid "Name"
 msgstr ""
 
 #. MAC address of the host
-#: src/include/dhcp-server/dialogs2.rb:1653
+#: src/include/dhcp-server/dialogs2.rb:1652
 msgid "Hardware Address"
 msgstr ""
 
 #. Network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1655
+#: src/include/dhcp-server/dialogs2.rb:1654
 msgid "Type"
 msgstr ""
 
 #. Frame label - configuration of particular host
-#: src/include/dhcp-server/dialogs2.rb:1662
+#: src/include/dhcp-server/dialogs2.rb:1661
 msgid "List Setup"
 msgstr ""
 
 #. Textentry label - name of the host
-#: src/include/dhcp-server/dialogs2.rb:1670
+#: src/include/dhcp-server/dialogs2.rb:1669
 msgid "&Name"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. Radiobutton label - network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1690
+#: src/include/dhcp-server/dialogs2.rb:1689
 msgid "&Ethernet"
 msgstr ""
 
-#: src/include/dhcp-server/dialogs2.rb:1692
+#: src/include/dhcp-server/dialogs2.rb:1691
 msgid "&Token Ring"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. error popup
-#: src/include/dhcp-server/dialogs2.rb:1932
+#: src/include/dhcp-server/dialogs2.rb:1931
 msgid "The hardware address must be unique."
 msgstr ""
 
 #. error popup
-#: src/include/dhcp-server/dialogs2.rb:1942
+#: src/include/dhcp-server/dialogs2.rb:1941
 msgid "The hostname cannot be empty."
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. error popup
-#: src/include/dhcp-server/dialogs2.rb:1985
+#: src/include/dhcp-server/dialogs2.rb:1984
 msgid "The hardware address must be defined."
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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"
@@ -883,15 +882,15 @@
 msgstr ""
 
 #. 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 ""
 
-#: src/include/dhcp-server/dialogs2.rb:2145
+#: src/include/dhcp-server/dialogs2.rb:2144
 msgid "DHCP server commandline option \"-%1\" requires an argument"
 msgstr ""
 
-#: src/include/dhcp-server/dialogs2.rb:2156
+#: src/include/dhcp-server/dialogs2.rb:2155
 msgid ""
 "You have specified an alternate configuration file for the DHCP server.\n"
 "\n"
@@ -903,7 +902,7 @@
 msgstr ""
 
 #. 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 ""
 

Modified: trunk/yast/am/po/dns-server.am.po
===================================================================
--- trunk/yast/am/po/dns-server.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/dns-server.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/drbd.am.po
===================================================================
--- trunk/yast/am/po/drbd.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/drbd.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -20,6 +20,16 @@
 msgid "Configuration of DRBD"
 msgstr ""
 
+#. 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.
@@ -57,20 +67,72 @@
 msgid "Resource Configuration"
 msgstr ""
 
+#: src/include/drbd/common.rb:47
+msgid "Resource Basic Configuration"
+msgstr ""
+
+#: src/include/drbd/common.rb:48
+msgid "Resource Advanced Configuration"
+msgstr ""
+
+#. 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
+msgid "Failed to read DRBD configuration file:\n"
+msgstr ""
+
+#: src/include/drbd/dialogs.rb:86
+msgid "Failed to write configuration to disk:\n"
+msgstr ""
+
 #. 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
 msgid "DRBD Configuration"
 msgstr ""
 
 #. Drbd configure1 dialog contents
-#: src/include/drbd/dialogs.rb:63
-msgid "First part of DRBD configuration"
+#: src/include/drbd/dialogs.rb:102
+msgid "First part of configuration of DRBD"
 msgstr ""
 
 #. Drbd configure2 dialog contents
-#: src/include/drbd/dialogs.rb:102
-msgid "Second part of DRBD configuration"
+#: src/include/drbd/dialogs.rb:141
+msgid "Second part of configuration of DRBD"
 msgstr ""
 
 #. encoding: utf-8
@@ -94,7 +156,7 @@
 #: src/include/drbd/helps.rb:36
 msgid ""
 "<p><b><big>Initializing DRBD Configuration</big></b><br>\n"
-"</p>\n"
+"Please wait...<br></p>\n"
 msgstr ""
 
 #. Read dialog help 2/2
@@ -108,7 +170,7 @@
 #: src/include/drbd/helps.rb:44
 msgid ""
 "<p><b><big>Saving DRBD Configuration</big></b><br>\n"
-"</p>\n"
+"Please wait...<br></p>\n"
 msgstr ""
 
 #. Write dialog help 2/2
@@ -125,14 +187,77 @@
 msgstr ""
 
 #: src/include/drbd/helps.rb:55
+msgid "<p><b><big>Startup Configuration of DRBD</big></b></p>"
+msgstr ""
+
+#: 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
+msgid "<p><b><big>Resource Configuration of DRBD</big></b></p>"
+msgstr ""
+
+#: 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
 msgid "<p><b><big>Global Configuration of DRBD</big></b></p>"
 msgstr ""
 
-#: 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"
@@ -142,32 +267,33 @@
 "                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
 msgid ""
 "<p><b><big>DRBD Configuration</big></b><br>\n"
-"Configure DRBD here.<br></p>\n"
+"Configure drbd here.<br></p>\n"
 msgstr ""
 
 #. Summary dialog help 2/3
-#: src/include/drbd/helps.rb:80
+#: src/include/drbd/helps.rb:138
 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 ""
 
 #. 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"
@@ -175,30 +301,30 @@
 msgstr ""
 
 #. Ovreview dialog help 1/3
-#: src/include/drbd/helps.rb:93
+#: src/include/drbd/helps.rb:151
 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 ""
 
 #. Ovreview dialog help 2/3
-#: src/include/drbd/helps.rb:99
+#: src/include/drbd/helps.rb:157
 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 ""
 
 #. Ovreview dialog help 3/3
-#: src/include/drbd/helps.rb:103
+#: src/include/drbd/helps.rb:161
 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 ""
 
 #. 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"
@@ -207,7 +333,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"
@@ -215,7 +341,7 @@
 msgstr ""
 
 #. 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"
@@ -231,12 +357,13 @@
 msgid "Protocol"
 msgstr ""
 
-#: src/include/drbd/resource_conf.rb:545
+#. myHelp("basic_conf");
+#: src/include/drbd/resource_conf.rb:546
 msgid "Node names must be different."
 msgstr ""
 
-#: 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
@@ -278,8 +405,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 ""
 
 #. }
@@ -293,85 +420,144 @@
 
 #. Report::Error ( Service::Error());
 #: src/include/drbd/startup_conf.rb:142
-msgid "Starting DRBD service failed."
+msgid "Start DRBD service failed"
 msgstr ""
 
 #. Report::Error ( Service::Error() );
 #: src/include/drbd/startup_conf.rb:150
-msgid "Stopping DRBD service failed."
+msgid "Stop DRBD service failed"
 msgstr ""
 
 #. Initialization dialog caption
-#: src/include/drbd/wizards.rb:136
+#: src/include/drbd/wizards.rb:137
 msgid "Heartbeat Configuration"
 msgstr ""
 
 #. Initialization dialog contents
-#: src/include/drbd/wizards.rb:138
+#: src/include/drbd/wizards.rb:139
 msgid "Initializing..."
 msgstr ""
 
+#. 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
+msgid "Failed to write drbd.conf.YaST2prepare"
+msgstr ""
+
 #. DRBD read dialog caption
-#: src/modules/Drbd.rb:71
+#: src/modules/Drbd.rb:133
 msgid "Initializing DRBD Configuration"
 msgstr ""
 
 #. We do not set help text here, because it was set outside
-#: src/modules/Drbd.rb:79
+#: src/modules/Drbd.rb:141
 msgid "Read global settings"
 msgstr ""
 
-#: src/modules/Drbd.rb:80
+#: src/modules/Drbd.rb:142
 msgid "Read resources"
 msgstr ""
 
-#: src/modules/Drbd.rb:81
+#: src/modules/Drbd.rb:143
 msgid "Read daemon status"
 msgstr ""
 
-#: src/modules/Drbd.rb:84
+#: src/modules/Drbd.rb:146
 msgid "Reading global settings..."
 msgstr ""
 
-#: src/modules/Drbd.rb:85
+#: src/modules/Drbd.rb:147
 msgid "Reading resources..."
 msgstr ""
 
-#: src/modules/Drbd.rb:86
+#: src/modules/Drbd.rb:148
 msgid "Reading daemon status..."
 msgstr ""
 
-#: src/modules/Drbd.rb:87 src/modules/Drbd.rb:293
+#: src/modules/Drbd.rb:149 src/modules/Drbd.rb:492
 msgid "Finished"
 msgstr ""
 
+#. new_map = remove(new_map, key);
+#: src/modules/Drbd.rb:412
+msgid "Failed to backup drbd.conf"
+msgstr ""
+
+#: src/modules/Drbd.rb:421
+msgid "Failed to clean drbd.conf for drbdadm test"
+msgstr ""
+
+#: src/modules/Drbd.rb:445
+msgid ""
+"Invalid configuration of resource %1\n"
+"%2"
+msgstr ""
+
+#: 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
 msgid "Writing DRBD Configuration"
 msgstr ""
 
 #. 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 ""
 
-#: src/modules/Drbd.rb:286
+#: src/modules/Drbd.rb:485
 msgid "Write resources"
 msgstr ""
 
-#: src/modules/Drbd.rb:287
+#: src/modules/Drbd.rb:486
 msgid "Set daemon status"
 msgstr ""
 
-#: src/modules/Drbd.rb:290
+#: src/modules/Drbd.rb:489
 msgid "Writing global settings..."
 msgstr ""
 
-#: src/modules/Drbd.rb:291
+#: src/modules/Drbd.rb:490
 msgid "Writing resources..."
 msgstr ""
 
-#: src/modules/Drbd.rb:292
+#: src/modules/Drbd.rb:491
 msgid "Setting daemon status..."
 msgstr ""
+
+#: src/modules/Drbd.rb:502
+msgid "Failed to make directory /etc/drbd.d"
+msgstr ""

Modified: trunk/yast/am/po/fcoe-client.am.po
===================================================================
--- trunk/yast/am/po/fcoe-client.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/fcoe-client.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -35,20 +35,55 @@
 msgid "&FcoeClient"
 msgstr ""
 
+#. setting of config value is 'yes'
+#: src/include/fcoe-client/complex.rb:48
+msgid "yes"
+msgstr ""
+
+#. setting of config value is 'no'
+#: src/include/fcoe-client/complex.rb:50
+msgid "no"
+msgstr ""
+
 #. text of an error popup
-#: src/include/fcoe-client/complex.rb:92
+#: src/include/fcoe-client/complex.rb:102
 msgid ""
 "Cannot remove the FCoE interface.\n"
 "Command %1 failed."
 msgstr ""
 
+#. FCoE is not available on the interface
+#: src/include/fcoe-client/complex.rb:195
+msgid "not available"
+msgstr ""
+
+#. the interface is not configured for FCoE
+#: src/include/fcoe-client/complex.rb:197
+msgid "not configured"
+msgstr ""
+
+#. 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
 msgid "Configuration of VLAN interface %1 on %2"
 msgstr ""
 
 #. 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"
@@ -56,7 +91,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"
@@ -64,12 +99,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"
@@ -77,28 +112,28 @@
 msgstr ""
 
 #. text of an error popup
-#: src/include/fcoe-client/complex.rb:417
+#: src/include/fcoe-client/complex.rb:443
 msgid "Cannot create and start FCoE on %1."
 msgstr ""
 
 #. text of an error popup: command failed on the network interface
-#: src/include/fcoe-client/complex.rb:454
+#: src/include/fcoe-client/complex.rb:480
 msgid "Command \"%1\" on %2 failed."
 msgstr ""
 
-#: 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
 msgid "Do you really want to remove the FCoE interface %1?"
 msgstr ""
 
 #. 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"
@@ -106,30 +141,30 @@
 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
 msgid "Removing of interface %1 failed."
 msgstr ""
 
-#: src/include/fcoe-client/complex.rb:736
+#: src/include/fcoe-client/complex.rb:762
 msgid "Destroying interface %1 failed."
 msgstr ""
 
 #. 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'."
@@ -449,197 +484,188 @@
 msgstr ""
 
 #. 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
 msgid "Cannot start service 'fcoe'"
 msgstr ""
 
 #. 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
+msgid "Cannot start lldpad service."
+msgstr ""
+
+#: src/modules/FcoeClient.rb:922
 msgid "Cannot start fcoemon systemd socket."
 msgstr ""
 
+#: src/modules/FcoeClient.rb:935
+msgid "Cannot start fcoe service."
+msgstr ""
+
 #. 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
 msgid "Initializing fcoe-client Configuration"
 msgstr ""
 
 #. Progress stage 1/3
-#: src/modules/FcoeClient.rb:1457
+#: src/modules/FcoeClient.rb:1481
 msgid "Check installed packages"
 msgstr ""
 
 #. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1459
+#: src/modules/FcoeClient.rb:1483
 msgid "Check services"
 msgstr ""
 
 #. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1461
+#: src/modules/FcoeClient.rb:1485
 msgid "Detect network cards"
 msgstr ""
 
 #. Progress stage 4/4
-#: src/modules/FcoeClient.rb:1463
+#: src/modules/FcoeClient.rb:1487
 msgid "Read /etc/fcoe/config"
 msgstr ""
 
 #. Progress step 1/3
-#: src/modules/FcoeClient.rb:1467
+#: src/modules/FcoeClient.rb:1491
 msgid "Checking for installed packages..."
 msgstr ""
 
 #. Progress step 2/3
-#: src/modules/FcoeClient.rb:1469
+#: src/modules/FcoeClient.rb:1493
 msgid "Checking for services..."
 msgstr ""
 
 #. Progress step 3/3
-#: src/modules/FcoeClient.rb:1471
+#: src/modules/FcoeClient.rb:1495
 msgid "Detecting network cards..."
 msgstr ""
 
 #. Progress step 4/4
-#: src/modules/FcoeClient.rb:1473
+#: src/modules/FcoeClient.rb:1497
 msgid "Reading /etc/fcoe/config"
 msgstr ""
 
 #. 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 ""
 
 #. Error message
-#: src/modules/FcoeClient.rb:1501
+#: src/modules/FcoeClient.rb:1525
 msgid "Starting of services failed."
 msgstr ""
 
 #. Error message
-#: src/modules/FcoeClient.rb:1514
+#: src/modules/FcoeClient.rb:1538
 msgid "Cannot detect devices."
 msgstr ""
 
 #. Error message
-#: src/modules/FcoeClient.rb:1524
+#: src/modules/FcoeClient.rb:1548
 msgid "Cannot read /etc/fcoe/config."
 msgstr ""
 
 #. FcoeClient read dialog caption
-#: src/modules/FcoeClient.rb:1540
+#: src/modules/FcoeClient.rb:1564
 msgid "Saving fcoe-client Configuration"
 msgstr ""
 
 #. Progress stage 1/2
-#: src/modules/FcoeClient.rb:1555
+#: src/modules/FcoeClient.rb:1579
 msgid "Write the settings"
 msgstr ""
 
 #. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1557
+#: src/modules/FcoeClient.rb:1581
 msgid "Restart FCoE service"
 msgstr ""
 
 #. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1559
+#: src/modules/FcoeClient.rb:1583
 msgid "Adjust start of services"
 msgstr ""
 
 #. Progress step 1/2
-#: src/modules/FcoeClient.rb:1563
+#: src/modules/FcoeClient.rb:1587
 msgid "Writing the settings..."
 msgstr ""
 
 #. Progress step 2/3
-#: src/modules/FcoeClient.rb:1565
+#: src/modules/FcoeClient.rb:1589
 msgid "Restarting FCoE service..."
 msgstr ""
 
 #. Progress sstep 3/3
-#: src/modules/FcoeClient.rb:1567
+#: src/modules/FcoeClient.rb:1591
 msgid "Adjusting start of services..."
 msgstr ""
 
 #. Error message
-#: src/modules/FcoeClient.rb:1587
+#: src/modules/FcoeClient.rb:1611
 msgid "Cannot write settings to /etc/fcoe/config."
 msgstr ""
 
-#: 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
 msgid "Restarting of service fcoe failed."
 msgstr ""
 
 #. Error message
-#: src/modules/FcoeClient.rb:1612
+#: src/modules/FcoeClient.rb:1636
 msgid "Cannot write /etc/sysconfig/network/ifcfg-files."
 msgstr ""
 
 #. Configuration summary text for autoyast
-#: src/modules/FcoeClient.rb:1669
+#: src/modules/FcoeClient.rb:1693
 msgid "<b>General FCoE configuration</b>"
 msgstr ""
 
 #. options from config file, not meant for translation
-#: src/modules/FcoeClient.rb:1683
+#: src/modules/FcoeClient.rb:1707
 msgid "<b>Interfaces</b>"
 msgstr ""
 
 #. 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
 msgid "<b>Starting of services</b>"
 msgstr ""
 
 #. starting of service "fcoe" at boot time is enabled or disabled
 #. starting of service "lldpad" at boot time is enabled or disabled
-#: src/modules/FcoeClient.rb:1709 src/modules/FcoeClient.rb:1719
+#: src/modules/FcoeClient.rb:1733 src/modules/FcoeClient.rb:1743
 msgid "enabled"
 msgstr ""
 
-#: src/modules/FcoeClient.rb:1710 src/modules/FcoeClient.rb:1720
+#: src/modules/FcoeClient.rb:1734 src/modules/FcoeClient.rb:1744
 msgid "disabled"
 msgstr ""

Modified: trunk/yast/am/po/firewall-services.am.po
===================================================================
--- trunk/yast/am/po/firewall-services.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/firewall-services.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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:54+0200\n"
 "PO-Revision-Date: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/firewall.am.po
===================================================================
--- trunk/yast/am/po/firewall.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/firewall.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/firstboot.am.po
===================================================================
--- trunk/yast/am/po/firstboot.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/firstboot.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/ftp-server.am.po
===================================================================
--- trunk/yast/am/po/ftp-server.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/ftp-server.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/geo-cluster.am.po
===================================================================
--- trunk/yast/am/po/geo-cluster.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/geo-cluster.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -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"
@@ -35,8 +35,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 ""
 
@@ -71,92 +71,249 @@
 #.
 #. $Id: dialogs.ycp 27914 2006-02-13 14:32:08Z locilka $
 #: src/include/geo-cluster/dialogs.rb:51
+msgid "configuration file"
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:59
 msgid "arbitrator ip"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:57
+#: src/include/geo-cluster/dialogs.rb:65
 msgid "transport"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:63
+#: src/include/geo-cluster/dialogs.rb:71
 msgid "port"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:68
+#: src/include/geo-cluster/dialogs.rb:76
 msgid "site"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
 #. 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 ""
 
-#: 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 ""
 
-#. parser value first
-#: src/include/geo-cluster/dialogs.rb:142
+#: src/include/geo-cluster/dialogs.rb:135
+msgid "Please enter valid ip address"
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:176
 msgid "Enter ticket and timeout"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:145
+#: src/include/geo-cluster/dialogs.rb:182
 msgid "timeout"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:164
+#: src/include/geo-cluster/dialogs.rb:184
+msgid "retries"
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:186
+msgid "weights"
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:188
+msgid "expire"
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:190
+msgid "acquire-after"
+msgstr ""
+
+#: 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 ""
 
-#: src/include/geo-cluster/dialogs.rb:166
+#: src/include/geo-cluster/dialogs.rb:231
+msgid "expire is no valid"
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:233
+msgid "acquireafter is no valid"
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:235
+msgid "retries is no valid"
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:237
+msgid "retries values lower than 3 is illegal"
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:239
+msgid "weights is no valid"
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:241
 msgid "ticket can not be null"
 msgstr ""
 
+#. fill confs with global_files
+#: src/include/geo-cluster/dialogs.rb:332
+msgid "site have to be filled"
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:337
+msgid "ticket have to be filled"
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:344
+#: src/include/geo-cluster/dialogs.rb:582
+msgid "arbitrator IP address is invalid!"
+msgstr ""
+
 #. 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 ""
 
 #. 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 ""
 
-#: src/include/geo-cluster/dialogs.rb:330
+#: src/include/geo-cluster/dialogs.rb:494
 msgid "Enter an IP address of your site"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:343
+#: src/include/geo-cluster/dialogs.rb:505
 msgid "Edit IP address of your site"
 msgstr ""
 
+#: src/include/geo-cluster/dialogs.rb:527
+msgid "Ticket name already exist!"
+msgstr ""
+
+#. abort?
+#: src/include/geo-cluster/dialogs.rb:573
+msgid "Configuration name can not be null"
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:576
+msgid "Configuration name can not be duplicated."
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:589
+msgid "port is invalid!"
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:595
+msgid "transport have to be filled!"
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:600
+msgid "site have to be filled!"
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:605
+msgid "ticket have to be filled!"
+msgstr ""
+
+#. GeoCluster choose configure dialog caption
+#: src/include/geo-cluster/dialogs.rb:644
+msgid "GeoCluster Configuration Select"
+msgstr ""
+
+#. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
+#. Label::BackButton(), Label::NextButton());
+#: src/include/geo-cluster/dialogs.rb:650
+msgid "Choose configuration file:"
+msgstr ""
+
+#. 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
+msgid "GeoCluster Configurations"
+msgstr ""
+
+#: src/include/geo-cluster/wizards.rb:47
+msgid "Firewall Configuration"
+msgstr ""
+
 #. Initialization dialog contents
-#: src/include/geo-cluster/wizards.rb:99
+#: src/include/geo-cluster/wizards.rb:142
 msgid "Initializing..."
 msgstr ""
 
+#. Not necessary to use remove_list_quote?
+#: src/modules/GeoCluster.rb:224
+msgid "Cannot write global conf settings."
+msgstr ""
+
+#. List like site
+#: src/modules/GeoCluster.rb:242
+msgid "Cannot write global settings."
+msgstr ""
+
+#. Empty (all Int) ticket will be ignore by ag_booth
+#. Create a ticket item
+#: src/modules/GeoCluster.rb:266
+msgid "Cannot write global ticket settings."
+msgstr ""
+
 #. 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 ""
 
@@ -165,75 +322,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 ""
 
-#: 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 ""
 
 #. #-#-#-#-#  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 ""
 
 #. 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 ""
 
+#. #-#-#-#-#  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 ""
 
 #. 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 ""
 
 #. Progress stage 2/2
-#: src/modules/GeoCluster.rb:274
+#: src/modules/GeoCluster.rb:350
 msgid "Write the SuSEfirewall settings"
 msgstr ""
 
 #. 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 ""
 
 #. Progress step 2/2
-#: src/modules/GeoCluster.rb:280
+#: src/modules/GeoCluster.rb:356
 msgid "Writing the SuSEFirewall settings"
 msgstr ""
 
-#. read sites
-#: src/modules/GeoCluster.rb:311
-msgid "Cannot write global settings."
-msgstr ""
-
-#. write site
-#: src/modules/GeoCluster.rb:315
-msgid "Cannot write sites settings."
-msgstr ""
-
-#. write ticket
-#: src/modules/GeoCluster.rb:318
-msgid "Cannot write ticket settings."
-msgstr ""
-
 #. #-#-#-#-#  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 ""
 
 #. TODO FIXME: your code here...
 #. Configuration summary text for autoyast
-#: src/modules/GeoCluster.rb:372
+#: src/modules/GeoCluster.rb:440
 msgid "Configuration summary..."
 msgstr ""
 

Modified: trunk/yast/am/po/gtk.am.po
===================================================================
--- trunk/yast/am/po/gtk.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/gtk.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/http-server.am.po
===================================================================
--- trunk/yast/am/po/http-server.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/http-server.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/inetd.am.po
===================================================================
--- trunk/yast/am/po/inetd.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/inetd.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/installation.am.po
===================================================================
--- trunk/yast/am/po/installation.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/installation.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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-09-03 16:45+0200\n"
 "PO-Revision-Date: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -51,22 +51,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 ""
 
@@ -214,7 +214,7 @@
 msgstr ""
 
 #. progress step title
-#: src/clients/desktop_finish.rb:73
+#: src/clients/desktop_finish.rb:70
 msgid "Initializing default window manager..."
 msgstr ""
 
@@ -245,6 +245,7 @@
 msgstr ""
 
 #: src/clients/inst_addon_update_sources.rb:173
+#: src/clients/inst_system_analysis.rb:301
 msgid "Unknown Product"
 msgstr ""
 
@@ -301,7 +302,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 ""
 
@@ -355,10 +356,22 @@
 "</p>\n"
 msgstr ""
 
-#: src/clients/inst_complex_welcome.rb:336
-msgid "License needs to be accepted"
+#. 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
+msgid "Re&lease Notes..."
 msgstr ""
 
+#: 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
 msgid "&Disable ZMD Service"
@@ -546,11 +559,11 @@
 msgid "Configure &FCoE Interfaces"
 msgstr ""
 
-#: src/clients/inst_disks_activate.rb:112
+#: src/clients/inst_disks_activate.rb:111
 msgid "Configure &iSCSI Disks"
 msgstr ""
 
-#: src/clients/inst_disks_activate.rb:113
+#: src/clients/inst_disks_activate.rb:112
 msgid "Change Net&work Configuration"
 msgstr ""
 
@@ -571,13 +584,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
-msgid "Re&lease 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 ""
 
+#. TRANSLATORS: dialog progress message
+#: src/clients/inst_download_release_notes.rb:147
+#: src/clients/inst_initialization.rb:44
+msgid "Initializing the installation..."
+msgstr ""
+
 #. 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:"
@@ -596,64 +618,64 @@
 #. 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 ""
 
 #. Might be left from the previous stage
-#: src/clients/inst_finish.rb:111
+#: src/clients/inst_finish.rb:114
 msgid "Creating list of finish scripts to call..."
 msgstr ""
 
 #. progress stage
-#: src/clients/inst_finish.rb:127
+#: src/clients/inst_finish.rb:213
 msgid "Copy files to installed system"
 msgstr ""
 
 #. progress stage
-#: src/clients/inst_finish.rb:142
+#: src/clients/inst_finish.rb:220
 msgid "Save configuration"
 msgstr ""
 
 #. progress stage
-#: src/clients/inst_finish.rb:169
+#: src/clients/inst_finish.rb:227
 msgid "Save installation settings"
 msgstr ""
 
 #. progress stage
-#: src/clients/inst_finish.rb:188
+#: src/clients/inst_finish.rb:236
 msgid "Install boot manager"
 msgstr ""
 
 #. progress stage
-#: src/clients/inst_finish.rb:200
+#: src/clients/inst_finish.rb:243
 msgid "Prepare system for initial boot"
 msgstr ""
 
 #. merge steps from add-on products
 #. bnc #438678
-#: src/clients/inst_finish.rb:305
+#: src/clients/inst_finish.rb:348
 msgid "Checking stage: %1..."
 msgstr ""
 
 #. a fallback busy message
-#: src/clients/inst_finish.rb:394
+#: src/clients/inst_finish.rb:437
 msgid "Calling step %1..."
 msgstr ""
 
 #. 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 ""
 
 #. get the latest errors
-#: src/clients/inst_finish.rb:582
+#: src/clients/inst_finish.rb:625
 msgid "Installation Error"
 msgstr ""
 
@@ -672,11 +694,6 @@
 msgid "Installation is being initialized."
 msgstr ""
 
-#. TRANSLATORS: dialog progress message
-#: src/clients/inst_initialization.rb:44
-msgid "Initializing the installation..."
-msgstr ""
-
 #. TRANSLATORS: dialog help
 #. help for the dialog - busy message
 #: src/clients/inst_initialization.rb:48
@@ -689,13 +706,6 @@
 msgid "Preparing the initial system configuration..."
 msgstr ""
 
-#. TRANSLATORS: dialog caption
-#. bug #302384
-#: src/clients/inst_initialization.rb:56
-#: src/clients/inst_installation_options.rb:151
-msgid "Initializing"
-msgstr ""
-
 #. dialog caption
 #: src/clients/inst_installation_options.rb:83
 msgid "Installation Options"
@@ -874,12 +884,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 ""
 
 #. 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"
@@ -888,38 +898,38 @@
 #. 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 ""
 
 #. busy message
-#: src/clients/inst_proposal.rb:525
+#: src/clients/inst_proposal.rb:523
 msgid "Adapting the proposal to the current settings..."
 msgstr ""
 
 #. 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 ""
 
 #. fallback proposal, means usually an internal error
-#: src/clients/inst_proposal.rb:700
+#: src/clients/inst_proposal.rb:698
 msgid "ERROR: No proposal"
 msgstr ""
 
 #. 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."
 msgstr ""
 
 #. dialog headline
-#: src/clients/inst_proposal.rb:949
+#: src/clients/inst_proposal.rb:947
 msgid "Installation Overview"
 msgstr ""
 
@@ -928,45 +938,45 @@
 #. 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 ""
 
 #. radio button
-#: src/clients/inst_proposal.rb:982
+#: src/clients/inst_proposal.rb:980
 msgid "&Use Following Configuration"
 msgstr ""
 
 #. 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 ""
 
 #. 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
 msgid "&Export Configuration"
 msgstr ""
 
 #. 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
 msgid "Click a headline to make changes or use the \"Change...\" menu below."
 msgstr ""
 
-#: src/clients/inst_proposal.rb:1075
+#: src/clients/inst_proposal.rb:1073
 msgid "Click a headline to make changes."
 msgstr ""
 
 #. menu button item
-#: src/clients/inst_proposal.rb:1172
+#: src/clients/inst_proposal.rb:1170
 msgid "&Reset to defaults"
 msgstr ""
 
 #. 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"
@@ -976,7 +986,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
 msgid ""
 "<p>\n"
 "Select <b>Install</b> to perform a new installation with the values displayed.\n"
@@ -1004,7 +1014,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
 msgid ""
 "<p>\n"
 "Your hard disk has not been modified yet. You can still safely abort.\n"
@@ -1013,7 +1023,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
 msgid ""
 "<p>\n"
 "Select <b>Update</b> to perform an update with the values displayed.\n"
@@ -1022,7 +1032,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"
@@ -1031,7 +1041,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"
@@ -1040,7 +1050,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"
@@ -1048,12 +1058,12 @@
 msgstr ""
 
 #. 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 ""
 
 #. 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>"
@@ -1062,7 +1072,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"
@@ -1070,7 +1080,7 @@
 msgstr ""
 
 #. help text
-#: src/clients/inst_proposal.rb:1345
+#: src/clients/inst_proposal.rb:1343
 msgid ""
 "<p>Some proposals might be\n"
 "locked by the system administrator and therefore cannot be changed. If a\n"
@@ -1078,11 +1088,11 @@
 msgstr ""
 
 #. FATE #120373
-#: src/clients/inst_proposal.rb:1371
+#: src/clients/inst_proposal.rb:1369
 msgid "&Update"
 msgstr ""
 
-#: src/clients/inst_proposal.rb:1372
+#: src/clients/inst_proposal.rb:1370
 msgid "&Install"
 msgstr ""
 
@@ -1197,65 +1207,49 @@
 msgid "Probing hard disks..."
 msgstr ""
 
-#: src/clients/inst_system_analysis.rb:127
-msgid "Search for Linux partitions"
-msgstr ""
-
+#. FATE #302980: Simplified user config during installation
 #: src/clients/inst_system_analysis.rb:128
-msgid "Searching for Linux partitions..."
-msgstr ""
-
-#. FATE #302980: Simplified user config during installation
-#: src/clients/inst_system_analysis.rb:132
 msgid "Search for system files"
 msgstr ""
 
-#: src/clients/inst_system_analysis.rb:133
+#: src/clients/inst_system_analysis.rb:129
 msgid "Searching for system files..."
 msgstr ""
 
-#: src/clients/inst_system_analysis.rb:136
+#: src/clients/inst_system_analysis.rb:132
 msgid "Initialize software manager"
 msgstr ""
 
-#: src/clients/inst_system_analysis.rb:137
+#: src/clients/inst_system_analysis.rb:133
 msgid "Initializing software manager..."
 msgstr ""
 
-#: src/clients/inst_system_analysis.rb:140
-msgid "Evaluate update possibility"
-msgstr ""
-
-#: src/clients/inst_system_analysis.rb:141
-msgid "Evaluating update possibility..."
-msgstr ""
-
 #. TRANSLATORS: dialog caption
-#: src/clients/inst_system_analysis.rb:146
+#: src/clients/inst_system_analysis.rb:138
 msgid "System Probing"
 msgstr ""
 
 #. TRANSLATORS: dialog help
-#: src/clients/inst_system_analysis.rb:152
+#: src/clients/inst_system_analysis.rb:144
 msgid "YaST is probing computer hardware and installed systems now."
 msgstr ""
 
 #. additonal error when HW was not found
-#: src/clients/inst_system_analysis.rb:255
+#: src/clients/inst_system_analysis.rb:241
 msgid ""
 "\n"
 "Check 'drivers.suse.com' if you need specific hardware drivers for installation."
 msgstr ""
 
 #. pop-up error report
-#: src/clients/inst_system_analysis.rb:269
+#: src/clients/inst_system_analysis.rb:255
 msgid ""
 "No hard disks were found for the installation.\n"
 "Please check your hardware!\n"
 "%1\n"
 msgstr ""
 
-#: 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"
@@ -1263,7 +1257,7 @@
 msgstr ""
 
 #. pop-up error report
-#: src/clients/inst_system_analysis.rb:290
+#: src/clients/inst_system_analysis.rb:276
 msgid ""
 "No hard disks and no hard disk controllers were\n"
 "found for the installation.\n"
@@ -1272,151 +1266,151 @@
 msgstr ""
 
 #. popup message
-#: src/clients/inst_system_analysis.rb:343
+#: src/clients/inst_system_analysis.rb:318
 msgid ""
 "Failed to initialize the software repositories.\n"
 "Aborting the installation."
 msgstr ""
 
 #. TRANSLATORS: Table item status (repository)
-#: src/clients/inst_upgrade_urls.rb:96
+#: src/clients/inst_upgrade_urls.rb:104
 msgid "Removed"
 msgstr ""
 
 #. TRANSLATORS: Table item status (repository)
-#: src/clients/inst_upgrade_urls.rb:100
+#: src/clients/inst_upgrade_urls.rb:108
 msgid "Enabled"
 msgstr ""
 
 #. TRANSLATORS: Table item status (repository)
-#: src/clients/inst_upgrade_urls.rb:104
+#: src/clients/inst_upgrade_urls.rb:112
 msgid "Disabled"
 msgstr ""
 
 #. 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 ""
 
 #. 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
 msgid ""
 "These repositories were found on the system\n"
 "you are upgrading:"
 msgstr ""
 
 #. TRANSLATORS: Table header item
-#: src/clients/inst_upgrade_urls.rb:215
+#: src/clients/inst_upgrade_urls.rb:225
 msgid "Current Status"
 msgstr ""
 
 #. TRANSLATORS: Table header item
-#: src/clients/inst_upgrade_urls.rb:217
+#: src/clients/inst_upgrade_urls.rb:227
 msgid "Repository"
 msgstr ""
 
 #. TRANSLATORS: Table header item
-#: src/clients/inst_upgrade_urls.rb:219
+#: src/clients/inst_upgrade_urls.rb:229
 msgid "URL"
 msgstr ""
 
 #. TRANSLATORS: Push button
-#: src/clients/inst_upgrade_urls.rb:229
+#: src/clients/inst_upgrade_urls.rb:239
 msgid "&Toggle Status"
 msgstr ""
 
 #. TRANSLATORS: help text 1/3
-#: src/clients/inst_upgrade_urls.rb:235
+#: src/clients/inst_upgrade_urls.rb:245
 msgid ""
 "<p>Here you see all software repositories found\n"
 "on the system you are upgrading. Enable the ones you want to include in the upgrade process.</p>"
 msgstr ""
 
 #. TRANSLATORS: help text 2/3
-#: src/clients/inst_upgrade_urls.rb:239
+#: src/clients/inst_upgrade_urls.rb:249
 msgid ""
 "<p>To enable, remove or disable an URL, click on the\n"
 "<b>Toggle Status</b> button or double-click on the respective table item.</p>"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. TRANSLATORS: textentry
-#: src/clients/inst_upgrade_urls.rb:373
+#: src/clients/inst_upgrade_urls.rb:383
 msgid "&Repository URL"
 msgstr ""
 
 #. TRANSLATORS: popup header
-#: src/clients/inst_upgrade_urls.rb:637
+#: src/clients/inst_upgrade_urls.rb:647
 msgid "Network is not Configured"
 msgstr ""
 
 #. TRANSLATORS: popup question
-#: src/clients/inst_upgrade_urls.rb:639
+#: src/clients/inst_upgrade_urls.rb:649
 msgid ""
 "Remote repositories require an Internet connection.\n"
 "Configure it?"
 msgstr ""
 
 #. 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 ""
 
 #. 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
 msgid "<p>Repositories are being added and removed.</p>"
 msgstr ""
 
-#: src/clients/inst_upgrade_urls.rb:692
+#: src/clients/inst_upgrade_urls.rb:702
 msgid "Remove unused repositories"
 msgstr ""
 
-#. 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
 msgid "Removing unused repositories..."
 msgstr ""
 
-#: src/clients/inst_upgrade_urls.rb:703
+#: src/clients/inst_upgrade_urls.rb:713
 msgid "Add enabled repositories"
 msgstr ""
 
 #. 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
 msgid "Adding enabled repositories..."
 msgstr ""
 
-#: src/clients/inst_upgrade_urls.rb:715
+#: src/clients/inst_upgrade_urls.rb:725
 msgid "Add disabled repositories"
 msgstr ""
 
 #. 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
 msgid "Adding disabled repositories..."
 msgstr ""
 
 #. 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"
@@ -1426,7 +1420,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"
@@ -1436,7 +1430,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
 msgid ""
 "Cannot add enabled repository\n"
 "Name: %1\n"
@@ -1445,7 +1439,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
 msgid ""
 "An error occurred while refreshing repository\n"
 "Name: %1\n"
@@ -1454,7 +1448,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
 msgid ""
 "An error occurred while enabling repository\n"
 "Name: %1\n"
@@ -1462,7 +1456,7 @@
 msgstr ""
 
 #. do not probe! adding as disabled!
-#: src/clients/inst_upgrade_urls.rb:1064
+#: src/clients/inst_upgrade_urls.rb:1122
 msgid ""
 "Cannot add disabled repository\n"
 "Name: %1\n"
@@ -1531,52 +1525,47 @@
 msgstr ""
 
 #. 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 ""
 
 #. progress step title
-#: src/clients/save_config_finish.rb:143
+#: src/clients/save_config_finish.rb:145
 msgid "Saving language..."
 msgstr ""
 
 #. progress step title
-#: src/clients/save_config_finish.rb:148
+#: src/clients/save_config_finish.rb:150
 msgid "Saving console configuration..."
 msgstr ""
 
 #. progress step title
-#: src/clients/save_config_finish.rb:167
+#: src/clients/save_config_finish.rb:169
 msgid "Saving keyboard configuration..."
 msgstr ""
 
 #. progress step title
-#: src/clients/save_config_finish.rb:172
+#: src/clients/save_config_finish.rb:174
 msgid "Saving product information..."
 msgstr ""
 
 #. progress step title
-#: src/clients/save_config_finish.rb:177
+#: src/clients/save_config_finish.rb:179
 msgid "Saving automatic installation settings..."
 msgstr ""
 
 #. progress step title
-#: src/clients/save_config_finish.rb:183
+#: src/clients/save_config_finish.rb:185
 msgid "Saving security settings..."
 msgstr ""
 
 #. progress step title
-#: src/clients/save_config_finish.rb:192
+#: src/clients/save_config_finish.rb:208
 msgid "Saving boot scripts settings..."
 msgstr ""
 
 #. progress step title
-#: src/clients/save_hw_status_finish.rb:70
+#: src/clients/save_hw_status_finish.rb:67
 msgid "Saving hardware configuration..."
 msgstr ""
 
@@ -1608,7 +1597,7 @@
 msgstr ""
 
 #. call command
-#: src/clients/yast_inf_finish.rb:111
+#: src/clients/yast_inf_finish.rb:109
 msgid ""
 "\n"
 "**************************************************************\n"
@@ -1801,3 +1790,44 @@
 #: src/lib/installation/prep_shrink.rb:35
 msgid "Shrinking PREP partition..."
 msgstr ""
+
+#. Text to display
+#.
+#. @return String
+#: src/lib/installation/remote_finish_client.rb:68
+msgid "Enabling remote administration..."
+msgstr ""
+
+#. checking whether images are supported
+#. BNC #409927
+#. Checking files for signatures
+#: src/modules/ImageInstallation.rb:845
+msgid "Failed to read information about installation images"
+msgstr ""
+
+#. sleep in order not to kill -USR1 to dd too early, otherwise it finishes
+#: src/modules/ImageInstallation.rb:1193
+msgid "Deploying..."
+msgstr ""
+
+#. Function stores all new/requested states of all handled/supported types.
+#.
+#. @see #all_supported_types
+#. @see #objects_state
+#: src/modules/ImageInstallation.rb:1216
+msgid "Storing user preferences..."
+msgstr ""
+
+#. Restores packages statuses from 'objects_state': Selects packages for removal, installation, upgrade.
+#.
+#. @return [Boolean] if successful
+#: src/modules/ImageInstallation.rb:1348
+msgid "Restoring user preferences..."
+msgstr ""
+
+#. 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 ""

Modified: trunk/yast/am/po/instserver.am.po
===================================================================
--- trunk/yast/am/po/instserver.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/instserver.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/iplb.am.po
===================================================================
--- trunk/yast/am/po/iplb.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/iplb.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -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"
@@ -91,6 +91,22 @@
 msgstr ""
 
 #. ids of widget of global dialog
+#: src/include/iplb/global_conf.rb:61
+msgid "yes"
+msgstr ""
+
+#: src/include/iplb/global_conf.rb:61
+msgid "no"
+msgstr ""
+
+#: src/include/iplb/global_conf.rb:68 src/include/iplb/vserver_conf.rb:226
+msgid "&Global Configuration"
+msgstr ""
+
+#: src/include/iplb/global_conf.rb:69 src/include/iplb/vserver_conf.rb:227
+msgid "&Virtual Server Configuration"
+msgstr ""
+
 #: src/include/iplb/global_conf.rb:75
 msgid "Check Interval"
 msgstr ""
@@ -200,7 +216,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"
@@ -440,7 +456,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"
@@ -578,6 +594,12 @@
 msgstr ""
 
 #. 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 ""
@@ -590,6 +612,20 @@
 msgid "weight"
 msgstr ""
 
+#. find next ]
+#: src/include/iplb/vserver_conf.rb:456
+msgid "IP address is not Valid"
+msgstr ""
+
+#. tab switch events end
+#: src/include/iplb/vserver_conf.rb:547
+msgid "Add a new real server:"
+msgstr ""
+
+#: src/include/iplb/vserver_conf.rb:564
+msgid "Edit the real server:"
+msgstr ""
+
 #. Initialization dialog contents
 #: src/include/iplb/wizards.rb:142
 msgid "Initializing..."

Modified: trunk/yast/am/po/iscsi-client.am.po
===================================================================
--- trunk/yast/am/po/iscsi-client.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/iscsi-client.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -63,146 +63,150 @@
 msgid "iSNS Port"
 msgstr ""
 
-#: 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
+msgid "&Initiator Name"
 msgstr ""
 
-#: src/include/iscsi-client/dialogs.rb:115
-msgid "Offloa&d Card"
+#. 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
+msgid "Offload Car&d"
 msgstr ""
 
 #. 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: src/include/iscsi-client/dialogs.rb:155
+#: src/include/iscsi-client/dialogs.rb:159
 msgid "Add"
 msgstr ""
 
 #. `PushButton(`id(`toggle), _("Toggle Start-Up"))
-#: src/include/iscsi-client/dialogs.rb:156
+#: src/include/iscsi-client/dialogs.rb:160
 msgid "Edit"
 msgstr ""
 
-#: src/include/iscsi-client/dialogs.rb:157
+#: src/include/iscsi-client/dialogs.rb:161
 msgid "Log Out"
 msgstr ""
 
-#: src/include/iscsi-client/dialogs.rb:182
+#: src/include/iscsi-client/dialogs.rb:186
 msgid "Connected"
 msgstr ""
 
-#: src/include/iscsi-client/dialogs.rb:188
+#: src/include/iscsi-client/dialogs.rb:192
 msgid "Discovery"
 msgstr ""
 
-#: src/include/iscsi-client/dialogs.rb:189
+#: src/include/iscsi-client/dialogs.rb:193
 msgid "Log In"
 msgstr ""
 
-#: src/include/iscsi-client/dialogs.rb:219
+#: src/include/iscsi-client/dialogs.rb:223
 msgid "Connect"
 msgstr ""
 
 #. 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
 #. "handle" : handleDiscAuth,
-#: src/include/iscsi-client/dialogs.rb:297
+#: src/include/iscsi-client/dialogs.rb:301
 msgid "Startup"
 msgstr ""
 
 #. widget for portal address
-#: src/include/iscsi-client/dialogs.rb:308
+#: src/include/iscsi-client/dialogs.rb:312
 msgid "IP Address"
 msgstr ""
 
-#: src/include/iscsi-client/dialogs.rb:309
+#: src/include/iscsi-client/dialogs.rb:313
 msgid "Port"
 msgstr ""
 
-#: src/include/iscsi-client/dialogs.rb:324
+#: src/include/iscsi-client/dialogs.rb:328
 msgid "Key"
 msgstr ""
 
-#: src/include/iscsi-client/dialogs.rb:324
+#: src/include/iscsi-client/dialogs.rb:328
 msgid "Value"
 msgstr ""
 
 #. service status dialog
-#: src/include/iscsi-client/dialogs.rb:335
+#: src/include/iscsi-client/dialogs.rb:339
 msgid "Service"
 msgstr ""
 
 #. list og connected targets
-#: src/include/iscsi-client/dialogs.rb:358
+#: src/include/iscsi-client/dialogs.rb:362
 msgid "Connected Targets"
 msgstr ""
 
 #. list of discovered targets
-#: src/include/iscsi-client/dialogs.rb:366
+#: src/include/iscsi-client/dialogs.rb:370
 msgid "Discovered Targets"
 msgstr ""
 
 #. main tabbed dialog
-#: src/include/iscsi-client/dialogs.rb:385
+#: src/include/iscsi-client/dialogs.rb:389
 msgid "iSCSI Initiator Overview"
 msgstr ""
 
 #. discovery new target
 #. dialog for all targets from portal (connected/disconnected)
 #. authentification dialog for add/discovery target
-#: src/include/iscsi-client/dialogs.rb: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>"
@@ -211,9 +215,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 ""
 
@@ -421,12 +425,12 @@
 msgstr ""
 
 #. brackets needed around IPv6
-#: src/include/iscsi-client/widgets.rb:626
+#: src/include/iscsi-client/widgets.rb:625
 msgid "Insert the IP address."
 msgstr ""
 
 #. validate port number
-#: src/include/iscsi-client/widgets.rb:632
+#: src/include/iscsi-client/widgets.rb:631
 msgid "Insert the port."
 msgstr ""
 
@@ -434,36 +438,36 @@
 #. ******************* 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 ""
 
-#: 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 ""
 
 #. 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
 msgid "The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption."
 msgstr ""
 
-#: src/include/iscsi-client/widgets.rb: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 ""
 
-#: 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 ""
 
 #. 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 ""
 
@@ -543,12 +547,16 @@
 msgstr ""
 
 #. interface type for hardware offloading
-#: src/modules/IscsiClientLib.rb:70
-msgid "(Software)"
+#: src/modules/IscsiClientLib.rb:72
+msgid "default (Software)"
 msgstr ""
 
+#: src/modules/IscsiClientLib.rb:73
+msgid "all"
+msgstr ""
+
 #. }
-#: src/modules/IscsiClientLib.rb:672
+#: src/modules/IscsiClientLib.rb:694
 msgid ""
 "InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt>\n"
 "differ. The old initiator name will be replaced by the value of iBFT and a \n"
@@ -557,6 +565,6 @@
 msgstr ""
 
 #. do discovery first
-#: src/modules/IscsiClientLib.rb:1112
+#: src/modules/IscsiClientLib.rb:1147
 msgid "Configuration summary..."
 msgstr ""

Modified: trunk/yast/am/po/iscsi-lio-server.am.po
===================================================================
--- trunk/yast/am/po/iscsi-lio-server.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/iscsi-lio-server.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/iscsi-server.am.po
===================================================================
--- trunk/yast/am/po/iscsi-server.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/iscsi-server.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/isns.am.po
===================================================================
--- trunk/yast/am/po/isns.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/isns.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -277,81 +277,81 @@
 msgstr ""
 
 #. test if required package ("open-isns") is installed
-#: src/modules/IsnsServer.rb:106
+#: src/modules/IsnsServer.rb:172
 msgid "<p>To configure the isns service, the <b>%1</b> package must be installed.</p>"
 msgstr ""
 
-#: src/modules/IsnsServer.rb:109
+#: src/modules/IsnsServer.rb:175
 msgid "<p>Install it now?</p>"
 msgstr ""
 
 #. IsnsServer read dialog caption
-#: src/modules/IsnsServer.rb:486
+#: src/modules/IsnsServer.rb:569
 msgid "Initializing isns daemon configuration"
 msgstr ""
 
 #. Progress stage 1/3
-#: src/modules/IsnsServer.rb:502
+#: src/modules/IsnsServer.rb:585
 msgid "Read the database"
 msgstr ""
 
 #. Progress stage 2/3
-#: src/modules/IsnsServer.rb:504
+#: src/modules/IsnsServer.rb:587
 msgid "Read the previous settings"
 msgstr ""
 
 #. Progress stage 3/3
-#: src/modules/IsnsServer.rb:506
+#: src/modules/IsnsServer.rb:589
 msgid "Detect the devices"
 msgstr ""
 
 #. Progress step 1/3
-#: src/modules/IsnsServer.rb:510
+#: src/modules/IsnsServer.rb:593
 msgid "Reading the database..."
 msgstr ""
 
 #. Progress step 2/3
-#: src/modules/IsnsServer.rb:512
+#: src/modules/IsnsServer.rb:595
 msgid "Reading the previous settings..."
 msgstr ""
 
 #. Progress step 3/3
-#: src/modules/IsnsServer.rb:514
+#: src/modules/IsnsServer.rb:597
 msgid "Detecting the devices..."
 msgstr ""
 
 #. 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 ""
 
 #. IsnsServer write dialog caption
-#: src/modules/IsnsServer.rb:568
+#: src/modules/IsnsServer.rb:651
 msgid "Saving isns Configuration"
 msgstr ""
 
 #. Progress stage 1/2
-#: src/modules/IsnsServer.rb:584
+#: src/modules/IsnsServer.rb:667
 msgid "Write the settings"
 msgstr ""
 
 #. Progress stage 2/2
-#: src/modules/IsnsServer.rb:586
+#: src/modules/IsnsServer.rb:669
 msgid "Run SuSEconfig"
 msgstr ""
 
 #. Progress step 1/2
-#: src/modules/IsnsServer.rb:590
+#: src/modules/IsnsServer.rb:673
 msgid "Writing the settings..."
 msgstr ""
 
 #. Progress step 2/2
-#: src/modules/IsnsServer.rb:592
+#: src/modules/IsnsServer.rb:675
 msgid "Running SuSEconfig..."
 msgstr ""
 
 #. write configuration (/etc/isns.conf)
-#: src/modules/IsnsServer.rb:606
+#: src/modules/IsnsServer.rb:689
 msgid "Cannot write settings."
 msgstr ""

Modified: trunk/yast/am/po/kdump.am.po
===================================================================
--- trunk/yast/am/po/kdump.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/kdump.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -359,8 +359,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
 msgid "To apply changes a reboot is necessary."
 msgstr ""
 
@@ -488,15 +488,6 @@
 msgid "&Kdump"
 msgstr ""
 
-#. 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 ""
-
-#: src/include/kdump/complex.rb:113 src/include/kdump/complex.rb:115
-msgid "Package for kdump is not available."
-msgstr ""
-
 #. TRANSLATORS: RadioButtonGroup Label
 #: src/include/kdump/dialogs.rb:53
 msgid "Enable/Disable Kdump"
@@ -1079,126 +1070,126 @@
 #. 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 ""
 
 #. 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 ""
 
 #. Progress stage 3/4
-#: src/modules/Kdump.rb:604
+#: src/modules/Kdump.rb:605
 msgid "Reading kernel boot options..."
 msgstr ""
 
 #. 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 ""
 
 #. Progress step 2/4
-#: src/modules/Kdump.rb:612
+#: src/modules/Kdump.rb:613
 msgid "Reading partitions of disks..."
 msgstr ""
 
 #. Error message
-#: src/modules/Kdump.rb:626
+#: src/modules/Kdump.rb:627
 msgid "Cannot read config file /etc/sysconfig/kdump"
 msgstr ""
 
 #. Error message
-#: src/modules/Kdump.rb:634
+#: src/modules/Kdump.rb:635
 msgid "Cannot read kernel boot options."
 msgstr ""
 
 #. Error message
-#: src/modules/Kdump.rb:641
+#: src/modules/Kdump.rb:642
 msgid "Cannot read available memory."
 msgstr ""
 
 #. Kdump read dialog caption
-#: src/modules/Kdump.rb:667
+#: src/modules/Kdump.rb:668
 msgid "Saving kdump Configuration"
 msgstr ""
 
 #. Progress stage 1/2
-#: src/modules/Kdump.rb:696
+#: src/modules/Kdump.rb:697
 msgid "Write the settings"
 msgstr ""
 
 #. Progress stage 2/2
-#: src/modules/Kdump.rb:698
+#: src/modules/Kdump.rb:699
 msgid "Update boot options"
 msgstr ""
 
 #. Progress step 1/2
-#: src/modules/Kdump.rb:702
+#: src/modules/Kdump.rb:703
 msgid "Writing the settings..."
 msgstr ""
 
 #. Progress step 2/2
-#: src/modules/Kdump.rb:704
+#: src/modules/Kdump.rb:705
 msgid "Updating boot options..."
 msgstr ""
 
 #. Progress finished
-#: src/modules/Kdump.rb:706
+#: src/modules/Kdump.rb:707
 msgid "Finished"
 msgstr ""
 
 #. Error message
-#: src/modules/Kdump.rb:716
+#: src/modules/Kdump.rb:717
 msgid "Cannot write settings."
 msgstr ""
 
 #. Error message
-#: src/modules/Kdump.rb:725
+#: src/modules/Kdump.rb:726
 msgid "Adding crashkernel parameter to bootloader fault."
 msgstr ""
 
 #. 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
 msgid "Kdump status: %1"
 msgstr ""
 
-#: src/modules/Kdump.rb:845
+#: src/modules/Kdump.rb:834
 msgid "enabled"
 msgstr ""
 
-#: src/modules/Kdump.rb:845
+#: src/modules/Kdump.rb:834
 msgid "disabled"
 msgstr ""
 
-#: src/modules/Kdump.rb:852
+#: src/modules/Kdump.rb:841
 msgid "Value of crashkernel option: %1"
 msgstr ""
 
-#: src/modules/Kdump.rb:859
+#: src/modules/Kdump.rb:848
 msgid "Dump format: %1"
 msgstr ""
 
-#: src/modules/Kdump.rb:866
+#: src/modules/Kdump.rb:855
 msgid "Target of dumps: %1"
 msgstr ""
 
-#: src/modules/Kdump.rb:873
+#: src/modules/Kdump.rb:862
 msgid "Number of dumps: %1"
 msgstr ""
 
 #. 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."

Modified: trunk/yast/am/po/kerberos-server.am.po
===================================================================
--- trunk/yast/am/po/kerberos-server.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/kerberos-server.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/kerberos.am.po
===================================================================
--- trunk/yast/am/po/kerberos.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/kerberos.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/languages_db.am.po
===================================================================
--- trunk/yast/am/po/languages_db.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/languages_db.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/ldap-client.am.po
===================================================================
--- trunk/yast/am/po/ldap-client.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/ldap-client.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/ldap-server.am.po
===================================================================
--- trunk/yast/am/po/ldap-server.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/ldap-server.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/ldap.am.po
===================================================================
--- trunk/yast/am/po/ldap.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/ldap.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -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"
@@ -230,46 +230,46 @@
 msgstr ""
 
 #. error popup
-#: src/LdapPopup.rb:437
+#: src/LdapPopup.rb:439
 msgid ""
 "The value '%1' already exists.\n"
 "Please select another one."
 msgstr ""
 
 #. description of configuration object
-#: src/LdapPopup.rb:465
+#: src/LdapPopup.rb:467
 msgid "Configuration of user management tools"
 msgstr ""
 
 #. description of configuration object
-#: src/LdapPopup.rb:469
+#: src/LdapPopup.rb:471
 msgid "Configuration of group management tools"
 msgstr ""
 
 #. label
-#: src/LdapPopup.rb:474
+#: src/LdapPopup.rb:476
 msgid "Object Class of New Module"
 msgstr ""
 
 #. textentry label, do not translate "cn"
-#: src/LdapPopup.rb:502
+#: src/LdapPopup.rb:504
 msgid "&Name of New Module (\"cn\" Value)"
 msgstr ""
 
 #. error popup
-#: src/LdapPopup.rb:528
+#: src/LdapPopup.rb:530
 msgid ""
 "The entered value already exists.\n"
 "Select another one.\n"
 msgstr ""
 
 #. error popup
-#: src/LdapPopup.rb:534
+#: src/LdapPopup.rb:536
 msgid "Enter the module name."
 msgstr ""
 
 #. 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"
@@ -282,7 +282,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"
@@ -291,12 +291,12 @@
 msgstr ""
 
 #. combobox label
-#: src/LdapPopup.rb:588
+#: src/LdapPopup.rb:590
 msgid "Attribute &Name"
 msgstr ""
 
 #. textentry label
-#: src/LdapPopup.rb:594
+#: src/LdapPopup.rb:596
 msgid "Attribute &Value"
 msgstr ""
 

Modified: trunk/yast/am/po/live-installer.am.po
===================================================================
--- trunk/yast/am/po/live-installer.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/live-installer.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/lxc.am.po
===================================================================
--- trunk/yast/am/po/lxc.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/lxc.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/mail.am.po
===================================================================
--- trunk/yast/am/po/mail.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/mail.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/multipath.am.po
===================================================================
--- trunk/yast/am/po/multipath.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/multipath.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/ncurses-pkg.am.po
===================================================================
--- trunk/yast/am/po/ncurses-pkg.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/ncurses-pkg.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/ncurses.am.po
===================================================================
--- trunk/yast/am/po/ncurses.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/ncurses.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/network.am.po
===================================================================
--- trunk/yast/am/po/network.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/network.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -83,84 +83,50 @@
 msgstr ""
 
 #. progress step title
-#: src/clients/firewall_stage1_finish.rb:67
+#: src/clients/firewall_stage1_finish.rb:63
 msgid "Writing Firewall Configuration..."
 msgstr ""
 
-#. 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
-msgid "VNC ports will be open (<a href=\"%s\">close</a>)"
-msgstr ""
-
-#: src/clients/firewall_stage1_proposal.rb:104
-msgid "VNC ports will be blocked (<a href=\"%s\">open</a>)"
-msgstr ""
-
-#: src/clients/firewall_stage1_proposal.rb:110
-msgid "Firewall will be enabled (<a href=\"%s\">disable</a>)"
-msgstr ""
-
-#: src/clients/firewall_stage1_proposal.rb:114
-msgid "Firewall will be disabled (<a href=\"%s\">enable</a>)"
-msgstr ""
-
-#: src/clients/firewall_stage1_proposal.rb:119
-msgid "SSH port will be open (<a href=\"%s\">block</a>)"
-msgstr ""
-
-#: src/clients/firewall_stage1_proposal.rb:123
-msgid "SSH port will be blocked (<a href=\"%s\">open</a>)"
-msgstr ""
-
-#: src/clients/firewall_stage1_proposal.rb:128
-msgid "SSH service will be enabled (<a href=\"%s\">disable</a>)"
-msgstr ""
-
-#: src/clients/firewall_stage1_proposal.rb:132
-msgid "SSH service will be disabled (<a href=\"%s\">enable</a>)"
-msgstr ""
-
 #. Proposal title
-#: src/clients/firewall_stage1_proposal.rb:218
+#: src/clients/firewall_stage1_proposal.rb:133
 msgid "Firewall and SSH"
 msgstr ""
 
 #. Menu entry label
-#: src/clients/firewall_stage1_proposal.rb:220
+#: src/clients/firewall_stage1_proposal.rb:135
 msgid "&Firewall and SSH"
 msgstr ""
 
-#: src/clients/firewall_stage1_proposal.rb:231
+#: src/clients/firewall_stage1_proposal.rb:146
 msgid "Basic Firewall and SSH Configuration"
 msgstr ""
 
 #. TRANSLATORS: check-box label
-#: src/clients/firewall_stage1_proposal.rb:237
+#: src/clients/firewall_stage1_proposal.rb:152
 msgid "Open &VNC Ports"
 msgstr ""
 
 #. frame label
-#: src/clients/firewall_stage1_proposal.rb:245
+#: src/clients/firewall_stage1_proposal.rb:160
 msgid "Firewall and SSH service"
 msgstr ""
 
 #. TRANSLATORS: check-box label
-#: src/clients/firewall_stage1_proposal.rb:256
+#: src/clients/firewall_stage1_proposal.rb:171
 msgid "Enable Firewall"
 msgstr ""
 
 #. TRANSLATORS: check-box label
-#: src/clients/firewall_stage1_proposal.rb:264
+#: src/clients/firewall_stage1_proposal.rb:179
 msgid "Open SSH Port"
 msgstr ""
 
 #. TRANSLATORS: check-box label
-#: src/clients/firewall_stage1_proposal.rb:272
+#: src/clients/firewall_stage1_proposal.rb:187
 msgid "Enable SSH Service"
 msgstr ""
 
-#: src/clients/firewall_stage1_proposal.rb:284
+#: src/clients/firewall_stage1_proposal.rb:199
 msgid ""
 "<p><b><big>Firewall and SSH</big></b><br>\n"
 "Firewall is a defensive mechanism that protects your computer from network attacks.\n"
@@ -168,13 +134,13 @@
 "SSH client</p>"
 msgstr ""
 
-#: 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"
@@ -182,13 +148,48 @@
 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
+msgid "Firewall will be enabled (<a href=\"%s\">disable</a>)"
+msgstr ""
+
+#: src/clients/firewall_stage1_proposal.rb:296
+msgid "Firewall will be disabled (<a href=\"%s\">enable</a>)"
+msgstr ""
+
+#: src/clients/firewall_stage1_proposal.rb:301
+msgid "SSH service will be enabled (<a href=\"%s\">disable</a>)"
+msgstr ""
+
+#: src/clients/firewall_stage1_proposal.rb:305
+msgid "SSH service will be disabled (<a href=\"%s\">enable</a>)"
+msgstr ""
+
+#. Display vnc port only if installing over VNC
+#: src/clients/firewall_stage1_proposal.rb:317
+msgid "VNC ports will be open (<a href=\"%s\">close</a>)"
+msgstr ""
+
+#: src/clients/firewall_stage1_proposal.rb:319
+msgid "VNC ports will be blocked (<a href=\"%s\">open</a>)"
+msgstr ""
+
+#: src/clients/firewall_stage1_proposal.rb:324
+msgid "SSH port will be open (<a href=\"%s\">block</a>)"
+msgstr ""
+
+#: src/clients/firewall_stage1_proposal.rb:328
+msgid "SSH port will be blocked (<a href=\"%s\">open</a>)"
+msgstr ""
+
 #. Commandline help title
 #. configuration of hosts
 #. Hosts dialog caption
@@ -450,9 +451,18 @@
 msgid "Interfaces for Bridging"
 msgstr ""
 
-#. 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
 msgid "Configuration Error: uninitialized interface."
 msgstr ""
 
@@ -532,7 +542,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 ""
 
@@ -630,7 +640,7 @@
 msgid "Device"
 msgstr ""
 
-#: 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 ""
 
@@ -699,13 +709,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 ""
 
 #. 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 ""
 
@@ -1064,14 +1074,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 ""
 
 #. 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 ""
 
@@ -1084,7 +1094,7 @@
 msgstr ""
 
 #: src/include/network/lan/address.rb:193
-#: src/include/network/lan/address.rb:1312
+#: src/include/network/lan/address.rb:1316
 msgid "Bridged Devices"
 msgstr ""
 
@@ -1267,35 +1277,35 @@
 
 #. 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 tab help
-#: src/include/network/lan/address.rb:1292
+#: src/include/network/lan/address.rb:1296
 msgid "<p>Configure your IP address.</p>"
 msgstr ""
 
-#: src/include/network/lan/address.rb:1298
+#: src/include/network/lan/address.rb:1302
 msgid "&Hardware"
 msgstr ""
 
-#: src/include/network/lan/address.rb:1305
+#: src/include/network/lan/address.rb:1309
 msgid "&Bond Slaves"
 msgstr ""
 
-#: src/include/network/lan/address.rb:1319
+#: src/include/network/lan/address.rb:1323
 msgid "&Wireless"
 msgstr ""
 
 #. 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
 msgid "Ifplugd Priority"
 msgstr ""
 
 #. 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"
@@ -1309,11 +1319,11 @@
 msgid "Network Card Setup"
 msgstr ""
 
-#. 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
 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 ""
 
 #. Network card name (wireless)
@@ -1524,7 +1534,7 @@
 msgid "The device was deleted."
 msgstr ""
 
-#. encoding: utf-8
+#. , :gw6dev encoding: utf-8
 #. ***************************************************************************
 #.
 #. Copyright (c) 2012 Novell, Inc.
@@ -1612,7 +1622,7 @@
 msgstr ""
 
 #. 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"
@@ -1622,13 +1632,12 @@
 msgstr ""
 
 #. 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 ""
 
@@ -1637,7 +1646,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 ""
 
@@ -1664,7 +1673,7 @@
 msgstr ""
 
 #. Manual network card setup help 1/4
-#: src/include/network/lan/hardware.rb:82
+#: src/include/network/lan/hardware.rb:81
 msgid ""
 "<p>Set up hardware-specific options for \n"
 "your network device here.</p>\n"
@@ -1672,20 +1681,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"
@@ -1693,7 +1702,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"
@@ -1701,19 +1710,19 @@
 msgstr ""
 
 #. Manual networ card setup help 3/4
-#: src/include/network/lan/hardware.rb:125
+#: src/include/network/lan/hardware.rb:124
 msgid ""
 "<p>Additionally, specify <b>Options</b> for the kernel module. Use this\n"
 "format: <i>option</i>=<i>value</i>. Each entry should be space-separated, for example: <i>io=0x300 irq=5</i>. <b>Note:</b> If two cards are \n"
 "configured with the same module name, the options will be merged while saving.</p>\n"
 msgstr ""
 
-#: 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"
@@ -1721,92 +1730,92 @@
 
 #. 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"
 msgstr ""
 
 #. 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>"
 msgstr ""
 
 #. Manual dialog caption
-#: src/include/network/lan/hardware.rb:271
+#: src/include/network/lan/hardware.rb:269
 msgid "Manual Network Card Configuration"
 msgstr ""
 
 #. CheckBox label
-#: src/include/network/lan/hardware.rb:281
+#: src/include/network/lan/hardware.rb:282
 msgid "&PCMCIA"
 msgstr ""
 
 #. CheckBox label
-#: src/include/network/lan/hardware.rb:289
+#: src/include/network/lan/hardware.rb:291
 msgid "&USB"
 msgstr ""
 
 #. ComboBox label
-#: src/include/network/lan/hardware.rb:298
+#: src/include/network/lan/hardware.rb:300
 msgid "&Hotplug Type"
 msgstr ""
 
 #. CheckBox label
-#: src/include/network/lan/hardware.rb:303
+#: src/include/network/lan/hardware.rb:305
 msgid "P&CI"
 msgstr ""
 
 #. #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 ""
 
 #. Text entry label
-#: src/include/network/lan/hardware.rb:325
+#: src/include/network/lan/hardware.rb:327
 msgid "&Module Name"
 msgstr ""
 
 #. TODO: Ud ... Rules
-#: src/include/network/lan/hardware.rb:380
-msgid "Udev rules"
+#: src/include/network/lan/hardware.rb:382
+msgid "Udev Rules"
 msgstr ""
 
-#: src/include/network/lan/hardware.rb:382
+#: src/include/network/lan/hardware.rb:384
 msgid "Device Name"
 msgstr ""
 
-#: src/include/network/lan/hardware.rb:383
+#: src/include/network/lan/hardware.rb:385
 msgid "Change"
 msgstr ""
 
-#: src/include/network/lan/hardware.rb:394
-msgid "Show visible port identification"
+#: src/include/network/lan/hardware.rb:396
+msgid "Show Visible Port Identification"
 msgstr ""
 
 #. 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 ""
 
-#: src/include/network/lan/hardware.rb:404
+#: src/include/network/lan/hardware.rb:406
 msgid "Blink"
 msgstr ""
 
-#: src/include/network/lan/hardware.rb:409
-msgid "Ethtool options"
+#: src/include/network/lan/hardware.rb:411
+msgid "Ethtool Options"
 msgstr ""
 
 #. Manual selection caption
-#: src/include/network/lan/hardware.rb:495
+#: src/include/network/lan/hardware.rb:491
 msgid "Manual Network Card Selection"
 msgstr ""
 
 #. 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>"
@@ -1814,26 +1823,26 @@
 
 #. 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 ""
 
 #. Text entry field
-#: src/include/network/lan/hardware.rb:512
+#: src/include/network/lan/hardware.rb:508
 msgid "&Search"
 msgstr ""
 
 #. Remember current device number (#308763)
 #. see also bnc#391802
-#: src/include/network/lan/hardware.rb:833
+#: src/include/network/lan/hardware.rb:824
 msgid ""
 "Configuration name %1 already exists.\n"
 "Choose a different one."
 msgstr ""
 
 #. 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 ""
 
@@ -1841,138 +1850,138 @@
 #. 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 ""
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:907
+#: src/include/network/lan/hardware.rb:898
 msgid "&Port Name"
 msgstr ""
 
-#: src/include/network/lan/hardware.rb:912
+#: src/include/network/lan/hardware.rb:903
 msgid "Port Number"
 msgstr ""
 
 #. CheckBox label
-#: src/include/network/lan/hardware.rb:926
+#: src/include/network/lan/hardware.rb:917
 msgid "&Enable IPA Takeover"
 msgstr ""
 
 #. CheckBox label
-#: src/include/network/lan/hardware.rb:933
+#: src/include/network/lan/hardware.rb:924
 msgid "Enable &Layer 2 Support"
 msgstr ""
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:940
+#: src/include/network/lan/hardware.rb:931
 msgid "Layer2 &MAC Address"
 msgstr ""
 
-#: 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
 msgid "Read Channel"
 msgstr ""
 
-#: 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
 msgid "Write Channel"
 msgstr ""
 
-#: src/include/network/lan/hardware.rb:960
+#: src/include/network/lan/hardware.rb:951
 msgid "Control Channel"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:1008
+#: src/include/network/lan/hardware.rb:999
 msgid "&Port Number"
 msgstr ""
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:1016
+#: src/include/network/lan/hardware.rb:1007
 msgid "&LANCMD Time-Out"
 msgstr ""
 
 #. 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 ""
 
-#: 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 ""
 
 #. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1047
+#: src/include/network/lan/hardware.rb:1038
 msgid "Compatibility Mode"
 msgstr ""
 
 #. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1049
+#: src/include/network/lan/hardware.rb:1040
 msgid "Extended Mode"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:1072
+#: src/include/network/lan/hardware.rb:1063
 msgid "&Protocol"
 msgstr ""
 
 #. 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 ""
 
 #. TextEntry label, #42789
-#: src/include/network/lan/hardware.rb:1112
+#: src/include/network/lan/hardware.rb:1103
 msgid "&Peer Name"
 msgstr ""
 
 #. 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"
 msgstr ""
 
 #. #176330, must be static
-#: src/include/network/lan/hardware.rb:1250
+#: src/include/network/lan/hardware.rb:1238
 msgid ""
 "An error occurred while creating device.\n"
 "See YaST log for details."
@@ -1980,7 +1989,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 ""
 
@@ -2023,28 +2032,27 @@
 msgstr ""
 
 #. Network setup method help
-#. NetworkManager and ifup are programs
+#. NetworkManager and wicked are programs
 #: src/include/network/lan/help.rb:59
 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 ""
 
-#: 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"
 "edit their configuration.<br></p>\n"
 msgstr ""
 
-#: 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"
 msgstr ""
 
-#: src/include/network/lan/help.rb:72
+#: src/include/network/lan/help.rb:71
 msgid ""
 "<p><b><big>Configuring or Deleting:</big></b><br>\n"
 "Choose a network card to change or remove.\n"
@@ -2052,7 +2060,7 @@
 msgstr ""
 
 #. IPv6 help
-#: src/include/network/lan/help.rb:79
+#: src/include/network/lan/help.rb:78
 msgid ""
 "<p><b><big>IPv6 Protocol Settings</big></b></p>\n"
 "<p>Check <b>Enable IPv6</b> to enable the ipv6 module in the kernel.\n"
@@ -2062,12 +2070,12 @@
 "time can be faster.</p>\n"
 msgstr ""
 
-#: 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 ""
 
 #. 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"
@@ -2076,7 +2084,7 @@
 "to enable you to say \"and everything else should go here.\"</p>\n"
 msgstr ""
 
-#: 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"
@@ -2084,13 +2092,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"
@@ -2098,14 +2106,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
 msgid ""
 "<p>If you are using DHCP to get an IP address, check whether you get\n"
 "also a hostname via DHCP.  The hostname will be set automatically by the DHCP client.\n"
@@ -2114,7 +2122,7 @@
 "different hostnames.</p> "
 msgstr ""
 
-#: 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"
@@ -2123,14 +2131,14 @@
 "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"
 msgstr ""
 
 #. 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"
@@ -2138,7 +2146,7 @@
 msgstr ""
 
 #. 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"
@@ -2146,7 +2154,7 @@
 "(such as suse.com). Separate the domains with commas or white space.</p>\n"
 msgstr ""
 
-#: 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"
@@ -2154,7 +2162,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"
@@ -2164,7 +2172,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"
@@ -2178,26 +2186,26 @@
 
 #. 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
 msgid ""
 "<p><b><big>Address Setup</big></b></p>\n"
 "<p>Select <b>No Address Setup</b> if you do not want to assign an IP address to this device.\n"
 "This is particularly useful for bonding ethernet devices.</p>\n"
 msgstr ""
 
-#: 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
 msgid ""
 "<p>Select <b>Dynamic Address</b> if you do not have a static IP address \n"
 "assigned by the system administrator or your Internet provider.</p>\n"
 msgstr ""
 
 #. Address dialog help 3/8
-#: src/include/network/lan/help.rb:188
+#: src/include/network/lan/help.rb:187
 msgid ""
 "<p>Choose one of the dynamic address assignment methods. Select <b>DHCP</b>\n"
 "if you have a DHCP server running on your local network. Network addresses \n"
@@ -2205,7 +2213,7 @@
 msgstr ""
 
 #. Address dialog help 4/8
-#: src/include/network/lan/help.rb:194
+#: src/include/network/lan/help.rb:193
 msgid ""
 "<p>To search for an IP address and assign it statically, select \n"
 "<b>Zeroconf</b>. To use DHCP and fall back to zeroconf, select <b>DHCP + Zeroconf\n"
@@ -2213,7 +2221,7 @@
 msgstr ""
 
 #. Address dialog help 5/8
-#: src/include/network/lan/help.rb:200
+#: src/include/network/lan/help.rb:199
 msgid ""
 "<p>Enter the <b>IP Address</b> (for example: <tt>192.168.100.99</tt>) for your computer, and the \n"
 " <b>Remote IP Address</b> (for example: <tt>192.168.100.254</tt>)\n"
@@ -2221,7 +2229,7 @@
 msgstr ""
 
 #. Address dialog help 6/8
-#: src/include/network/lan/help.rb:206
+#: src/include/network/lan/help.rb:205
 msgid ""
 "<p>For <b>Static Address Setup</b> enter the static IP address for your computer (for example: <tt>192.168.100.99</tt>) and\n"
 "the network mask (usually <tt>255.255.255.0</tt> or just length of prefix <tt>/24</tt>).Optionally, you can enter\n"
@@ -2229,19 +2237,19 @@
 msgstr ""
 
 #. 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>"
 msgstr ""
 
-#: 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>"
 msgstr ""
 
-#: 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"
@@ -2252,11 +2260,11 @@
 "the firewall will be disabled.</p>"
 msgstr ""
 
-#: 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 ""
 
-#: src/include/network/lan/help.rb:230
+#: src/include/network/lan/help.rb:229
 msgid ""
 "<p><b><big>Maximum Transfer Unit</big></b></p>\n"
 "<p>Maximum transfer unit (<b>MTU</b>) is the maximum size of the packet,\n"
@@ -2266,19 +2274,19 @@
 "values or define another one.</p>\n"
 msgstr ""
 
-#: src/include/network/lan/help.rb:238
+#: src/include/network/lan/help.rb:237
 msgid ""
 "<p>Select the slave devices for the bond device.\n"
 "Only devices with the device activation set to <b>Never</b> and with <b>No Address Setup</b> are available.</p>"
 msgstr ""
 
 #. DHCP dialog help 1/7
-#: src/include/network/lan/help.rb:243
+#: src/include/network/lan/help.rb:242
 msgid "<p><b><big>DHCP Client Options</big></b></p>"
 msgstr ""
 
 #. 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"
@@ -2288,7 +2296,7 @@
 msgstr ""
 
 #. DHCP dialog help 3/7
-#: src/include/network/lan/help.rb:253
+#: src/include/network/lan/help.rb:252
 msgid ""
 "<p>The <b>Hostname to Send</b> specifies a string used for the\n"
 "hostname option field when the DHCP client sends messages to the DHCP server. Some \n"
@@ -2301,21 +2309,21 @@
 msgstr ""
 
 #. Aliases dialog help 1/4
-#: src/include/network/lan/help.rb:265
+#: src/include/network/lan/help.rb:264
 msgid ""
 "<p><b><big>Additional Addresses</big></b></p>\n"
 "<p>Configure additional addresses of an interface in this table.</p>\n"
 msgstr ""
 
 #. Aliases dialog help 2/4
-#: src/include/network/lan/help.rb:269
+#: src/include/network/lan/help.rb:268
 msgid ""
 "<p>Enter an <b>IPv4 Address Label</b>, an <b>IP Address</b>, and\n"
 "the <b>Netmask</b>.</p>"
 msgstr ""
 
 #. Aliases dialog help 3/4
-#: src/include/network/lan/help.rb: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"
@@ -2323,14 +2331,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 ""
 
 #. 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
 msgid ""
 "<p>Choose between three <b>Key Input Types</b> for your key.\n"
 "<br><b>Passphrase</b>: The key is generated from the phrase entered.\n"
@@ -2347,14 +2355,14 @@
 msgstr ""
 
 #. 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>"
 msgstr ""
 
 #. 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"
@@ -2364,7 +2372,7 @@
 msgstr ""
 
 #. 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"
@@ -2376,7 +2384,7 @@
 msgstr ""
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:322
+#: src/include/network/lan/help.rb:321
 msgid ""
 "<p>In some networks, you need to set an <b>Authentication Mode</b>.\n"
 "It depends on the protection technology used, WEP or WPA. <b>WEP</b>\n"
@@ -2397,7 +2405,7 @@
 msgstr ""
 
 #. 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"
@@ -2407,7 +2415,7 @@
 msgstr ""
 
 #. 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"
@@ -2418,14 +2426,14 @@
 msgstr ""
 
 #. 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"
 msgstr ""
 
 #. 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"
@@ -2969,23 +2977,23 @@
 msgstr ""
 
 #. Ramote Administration dialog caption
-#: src/include/network/remote/dialogs.rb:57
+#: src/include/network/remote/dialogs.rb:56
 msgid "Remote Administration"
 msgstr ""
 
 #. RadioButton label
-#: src/include/network/remote/dialogs.rb:65
+#: src/include/network/remote/dialogs.rb:64
 msgid "&Allow Remote Administration"
 msgstr ""
 
 #. RadioButton label
-#: src/include/network/remote/dialogs.rb:73
+#: src/include/network/remote/dialogs.rb:72
 msgid "&Do Not Allow Remote Administration"
 msgstr ""
 
 #. Remote Administration dialog help
 #. %1 and %2 are port numbers for vnc and vnchttp, eg. 5901, 5801
-#: src/include/network/remote/dialogs.rb:90
+#: src/include/network/remote/dialogs.rb:89
 msgid ""
 "<p><b><big>Remote Administration Settings</big></b></p>\n"
 "<p>If this feature is enabled, you can\n"
@@ -2996,17 +3004,17 @@
 msgstr ""
 
 #. Dialog frame title
-#: src/include/network/remote/dialogs.rb:110
+#: src/include/network/remote/dialogs.rb:109
 msgid "Remote Administration Settings"
 msgstr ""
 
 #. Popup text
-#: src/include/network/routines.rb:143
+#: src/include/network/routines.rb:144
 msgid "These packages need to be installed:"
 msgstr ""
 
 #. 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"
@@ -3017,112 +3025,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 ""
 
 #. Table field (Unknown device)
-#: src/include/network/routines.rb:259
+#: src/include/network/routines.rb:260
 msgid "Unknown"
 msgstr ""
 
 #. Popup headline
-#: src/include/network/routines.rb:287
+#: src/include/network/routines.rb:288
 msgid "Configuration Successfully Saved"
 msgstr ""
 
 #. Popup headline
-#: src/include/network/routines.rb:292
+#: src/include/network/routines.rb:293
 msgid "DNS Configuration Successfully Saved"
 msgstr ""
 
 #. Popup headline
-#: src/include/network/routines.rb:294
+#: src/include/network/routines.rb:295
 msgid "DSL Configuration Successfully Saved"
 msgstr ""
 
 #. Popup headline
-#: src/include/network/routines.rb:296
+#: src/include/network/routines.rb:297
 msgid "Hosts Configuration Successfully Saved"
 msgstr ""
 
 #. Popup headline
-#: src/include/network/routines.rb:300
+#: src/include/network/routines.rb:301
 msgid "ISDN Configuration Successfully Saved"
 msgstr ""
 
 #. Popup headline
-#: src/include/network/routines.rb:304
+#: src/include/network/routines.rb:305
 msgid "Network Card Configuration Successfully Saved"
 msgstr ""
 
 #. Popup headline
-#: src/include/network/routines.rb:308
+#: src/include/network/routines.rb:309
 msgid "Modem Configuration Successfully Saved"
 msgstr ""
 
 #. Popup headline
-#: src/include/network/routines.rb:312
+#: src/include/network/routines.rb:313
 msgid "Proxy Configuration Successfully Saved"
 msgstr ""
 
 #. Popup headline
-#: src/include/network/routines.rb:316
+#: src/include/network/routines.rb:317
 msgid "Provider Configuration Successfully Saved"
 msgstr ""
 
 #. Popup headline
-#: src/include/network/routines.rb:320
+#: src/include/network/routines.rb:321
 msgid "Routing Configuration Successfully Saved"
 msgstr ""
 
 #. Popup text
-#: src/include/network/routines.rb:329
+#: src/include/network/routines.rb:330
 msgid "Configure mail now?"
 msgstr ""
 
 #. Popup text
-#: src/include/network/routines.rb:334
+#: src/include/network/routines.rb:335
 msgid "Run configuration of %1?"
 msgstr ""
 
+#. 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 ""
 
 #. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:686
+#: src/include/network/routines.rb:1071
 msgid "Modems"
 msgstr ""
 
 #. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:690
+#: src/include/network/routines.rb:1075
 msgid "ISDN Cards"
 msgstr ""
 
 #. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:694
+#: src/include/network/routines.rb:1079
 msgid "DSL Devices"
 msgstr ""
 
-#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:700
+#: src/include/network/routines.rb:1084
 msgid "All Network Devices"
 msgstr ""
 
-#. 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
@@ -3367,7 +3374,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 ""
 
@@ -3561,76 +3568,81 @@
 msgid "Set &MTU"
 msgstr ""
 
+#. the user can control the network with the NetworkManager program
+#: src/include/network/widgets.rb:300
+msgid "NetworkManager Service"
+msgstr ""
+
+#. ifup is a program name
+#: src/include/network/widgets.rb:308
+msgid "Traditional ifup"
+msgstr ""
+
+#. wicked is network configuration backend like netconfig
+#: src/include/network/widgets.rb:316
+msgid "Wicked Service"
+msgstr ""
+
+#. used when no network service is active or to disable network service
+#: src/include/network/widgets.rb:324
+msgid "Network Services Disabled"
+msgstr ""
+
 #. Store the NetworkManager widget
 #. @param [String] key	id of the widget
 #. @param [Hash] event	the event being handled
-#: src/include/network/widgets.rb: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 ""
-
-#. radio button label
-#. ifup is a program name
-#: src/include/network/widgets.rb:365
-msgid "&Traditional Method with ifup"
-msgstr ""
-
-#. radio button label
-#. wicked is network configuration backend like netconfig
 #: src/include/network/widgets.rb:371
-msgid "Controlled by &wicked"
+msgid "General Network Settings"
 msgstr ""
 
-#: src/include/network/widgets.rb:410
+#: src/include/network/widgets.rb:417
 msgid "IPv6 Protocol Settings"
 msgstr ""
 
 #. 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 ""
 
 #. TRANSLATORS: Informs that device name is not known
-#: src/include/network/widgets.rb:428
+#: src/include/network/widgets.rb:435
 msgid "Unknown device"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: src/include/network/widgets.rb:448
+#: src/include/network/widgets.rb:455
 msgid ""
 "%1 \n"
 "%2 - %3"
 msgstr ""
 
 #. #186102
-#: src/include/network/widgets.rb:503
+#: src/include/network/widgets.rb:510
 msgid "&Change Device"
 msgstr ""
 
 #. popup dialog title
-#: src/include/network/widgets.rb:537
+#: src/include/network/widgets.rb:544
 msgid "Network Device Select"
 msgstr ""
 
@@ -3646,98 +3658,94 @@
 msgstr ""
 
 #. Opens dialog for editing NIC name
-#: src/lib/network/edit_nic_name.rb:97
-msgid "Device name:"
+#: src/lib/network/edit_nic_name.rb:95
+msgid "Device Name:"
 msgstr ""
 
-#: 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
 msgid "MAC address: %s"
 msgstr ""
 
-#: 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
 msgid "Configuration name already exists."
 msgstr ""
 
-#: src/lib/network/edit_nic_name.rb:158
+#: src/lib/network/edit_nic_name.rb:157
 msgid "Invalid configuration name."
 msgstr ""
 
 #. Progress stage 1
-#: src/modules/DNS.rb:398
+#: src/modules/DNS.rb:371
 msgid "Write hostname"
 msgstr ""
 
 #. 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 ""
 
 #. Progress stage 3
-#: src/modules/DNS.rb:402
+#: src/modules/DNS.rb:375
 msgid "Update /etc/resolv.conf"
 msgstr ""
 
 #. Write dialog caption
-#: src/modules/DNS.rb:406
+#: src/modules/DNS.rb:379
 msgid "Saving Hostname and DNS Configuration"
 msgstr ""
 
 #. Allow to set hostname even if it's modified by DHCP (#13427)
 #. if(NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"]:false != true) {
 #. Progress step 1/3
-#: src/modules/DNS.rb:415
+#: src/modules/DNS.rb:388
 msgid "Writing hostname..."
 msgstr ""
 
 #. 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 ""
 
 #. 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
 msgid "Updating /etc/resolv.conf ..."
 msgstr ""
 
 #. Summary text
-#: src/modules/DNS.rb:557
+#: src/modules/DNS.rb:533
 msgid "Hostname: Set by DHCP"
 msgstr ""
 
 #. Summary text
-#: src/modules/DNS.rb:563
+#: src/modules/DNS.rb:539
 msgid "Hostname: %1"
 msgstr ""
 
-#: src/modules/DNS.rb:571
+#: src/modules/DNS.rb:547
 msgid "Hostname will not be written to /etc/hosts"
 msgstr ""
 
 #. Summary text
-#: src/modules/DNS.rb:593
+#: src/modules/DNS.rb:569
 msgid "Name Servers: %1"
 msgstr ""
 
 #. Summary text
-#: src/modules/DNS.rb:603
+#: src/modules/DNS.rb:579
 msgid "Search List: %1"
 msgstr ""
 
@@ -3756,389 +3764,408 @@
 msgstr ""
 
 #. Read dialog caption
-#: src/modules/Lan.rb:275
+#: src/modules/Lan.rb:272
 msgid "Initializing Network Configuration"
 msgstr ""
 
 #. Progress stage 1/9
-#: src/modules/Lan.rb:288
+#: src/modules/Lan.rb:285
 msgid "Detect network devices"
 msgstr ""
 
 #. Progress stage 2/9
-#: src/modules/Lan.rb:290
+#: src/modules/Lan.rb:287
 msgid "Read driver information"
 msgstr ""
 
 #. 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 ""
 
 #. Progress stage 4/9
-#: src/modules/Lan.rb:294
+#: src/modules/Lan.rb:291
 msgid "Read network configuration"
 msgstr ""
 
 #. Progress stage 5/9
-#: src/modules/Lan.rb:296
+#: src/modules/Lan.rb:293
 msgid "Read firewall settings"
 msgstr ""
 
 #. Progress stage 6/9
-#: src/modules/Lan.rb:298
+#: src/modules/Lan.rb:295
 msgid "Read hostname and DNS configuration"
 msgstr ""
 
 #. Progress stage 7/9
-#: src/modules/Lan.rb:300
+#: src/modules/Lan.rb:297
 msgid "Read installation information"
 msgstr ""
 
 #. Progress stage 8/9
-#: src/modules/Lan.rb:302
+#: src/modules/Lan.rb:299
 msgid "Read routing configuration"
 msgstr ""
 
 #. Progress stage 9/9
-#: src/modules/Lan.rb:304
+#: src/modules/Lan.rb:301
 msgid "Detect current status"
 msgstr ""
 
 #. Progress step 1/9
-#: src/modules/Lan.rb:318
+#: src/modules/Lan.rb:315
 msgid "Detecting ndiswrapper..."
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. Progress step 4/9
-#: src/modules/Lan.rb:373
+#: src/modules/Lan.rb:370
 msgid "Reading network configuration..."
 msgstr ""
 
 #. Progress step 5/9
-#: src/modules/Lan.rb:382
+#: src/modules/Lan.rb:379
 msgid "Reading firewall settings..."
 msgstr ""
 
 #. Progress step 6/9
-#: src/modules/Lan.rb:390
+#: src/modules/Lan.rb:387
 msgid "Reading hostname and DNS configuration..."
 msgstr ""
 
 #. Progress step 7/9
-#: src/modules/Lan.rb:397
+#: src/modules/Lan.rb:394
 msgid "Reading installation information..."
 msgstr ""
 
 #. Progress step 8/9
-#: src/modules/Lan.rb:403
+#: src/modules/Lan.rb:400
 msgid "Reading routing configuration..."
 msgstr ""
 
 #. Progress step 9/9
-#: src/modules/Lan.rb:409
+#: src/modules/Lan.rb:406
 msgid "Detecting current status..."
 msgstr ""
 
 #. 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 ""
 
 #. (a specialization used when a parameterless function is needed)
 #. @return Read(`cache)
-#: src/modules/Lan.rb:441
+#: src/modules/Lan.rb:438
 msgid "To apply this change, a reboot is needed."
 msgstr ""
 
 #. Write dialog caption
-#: src/modules/Lan.rb:510
+#: src/modules/Lan.rb:507
 msgid "Saving Network Configuration"
 msgstr ""
 
 #. Progress stage 2
-#: src/modules/Lan.rb:517
+#: src/modules/Lan.rb:514
 msgid "Write drivers information"
 msgstr ""
 
 #. 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 ""
 
 #. Progress stage 4
-#: src/modules/Lan.rb:521
+#: src/modules/Lan.rb:518
 msgid "Write network configuration"
 msgstr ""
 
 #. Progress stage 5
-#: src/modules/Lan.rb:523
+#: src/modules/Lan.rb:520
 msgid "Write routing configuration"
 msgstr ""
 
 #. Progress stage 6
-#: src/modules/Lan.rb:525
+#: src/modules/Lan.rb:522
 msgid "Write hostname and DNS configuration"
 msgstr ""
 
 #. Progress stage 7
-#: src/modules/Lan.rb:527
+#: src/modules/Lan.rb:524
 msgid "Set up network services"
 msgstr ""
 
 #. 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 ""
 
 #. Progress stage 9
-#: src/modules/Lan.rb:535
+#: src/modules/Lan.rb:532
 msgid "Activate network services"
 msgstr ""
 
 #. Progress step 2
-#: src/modules/Lan.rb:552
+#: src/modules/Lan.rb:549
 msgid "Writing /etc/modprobe.conf..."
 msgstr ""
 
 #. 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 ""
 
 #. Progress step 4
-#: src/modules/Lan.rb:573
+#: src/modules/Lan.rb:560
 msgid "Writing network configuration..."
 msgstr ""
 
 #. Progress step 5
-#: src/modules/Lan.rb:579
+#: src/modules/Lan.rb:566
 msgid "Writing routing configuration..."
 msgstr ""
 
 #. Progress step 6
-#: src/modules/Lan.rb:587
+#: src/modules/Lan.rb:574
 msgid "Writing hostname and DNS configuration..."
 msgstr ""
 
 #. Progress step 7
-#: src/modules/Lan.rb:600
+#: src/modules/Lan.rb:587
 msgid "Setting up network services..."
 msgstr ""
 
 #. 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 ""
 
 #. Progress step 9
-#: src/modules/Lan.rb:618
+#: src/modules/Lan.rb:605
 msgid "Activating network services..."
 msgstr ""
 
-#: src/modules/Lan.rb:657
+#: src/modules/Lan.rb:647
 msgid "No network running"
 msgstr ""
 
+#. 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: the interfaces are controlled by the user
-#: src/modules/Lan.rb:802
+#: src/modules/Lan.rb:797
 msgid "Interfaces controlled by NetworkManager"
 msgstr ""
 
 #. disable NetworkManager applet
-#: src/modules/Lan.rb:804
+#: src/modules/Lan.rb:799
 msgid "Disable NetworkManager"
 msgstr ""
 
 #. network mode
-#: src/modules/Lan.rb:808
+#: src/modules/Lan.rb:803
 msgid "Traditional network setup with NetControl - ifup"
 msgstr ""
 
 #. 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 ""
 
 #. ipv6 support is enabled
-#: src/modules/Lan.rb:817
+#: src/modules/Lan.rb:812
 msgid "Support for IPv6 protocol is enabled"
 msgstr ""
 
 #. disable ipv6 support
-#: src/modules/Lan.rb:819
+#: src/modules/Lan.rb:814
 msgid "Disable IPv6"
 msgstr ""
 
 #. ipv6 support is disabled
-#: src/modules/Lan.rb:823
+#: src/modules/Lan.rb:818
 msgid "Support for IPv6 protocol is disabled"
 msgstr ""
 
 #. translators: a possible value for: IPoIB device mode
-#: src/modules/LanItems.rb:181
+#: src/modules/LanItems.rb:195
 msgid "connected"
 msgstr ""
 
-#: 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 ""
 
 #. summary description of STARTMODE=ifplugd
-#: src/modules/LanItems.rb:1202
+#: src/modules/LanItems.rb:1263
 msgid "Started automatically on cable connection"
 msgstr ""
 
 #. summary description of STARTMODE=managed
-#: src/modules/LanItems.rb:1206
+#: src/modules/LanItems.rb:1267
 msgid "Managed by NetworkManager"
 msgstr ""
 
 #. summary description of STARTMODE=off
-#: src/modules/LanItems.rb:1210
+#: src/modules/LanItems.rb:1271
 msgid "Will not be started at all"
 msgstr ""
 
-#: src/modules/LanItems.rb:1215
+#: src/modules/LanItems.rb:1276
 msgid "Started manually"
 msgstr ""
 
 #. do nothing
-#: src/modules/LanItems.rb:1227
+#: src/modules/LanItems.rb:1288
 msgid "IP address assigned using"
 msgstr ""
 
-#: src/modules/LanItems.rb:1231
+#: src/modules/LanItems.rb:1292
 msgid "IP address: %s/%s"
 msgstr ""
 
-#: src/modules/LanItems.rb:1234
+#: src/modules/LanItems.rb:1295
 msgid "IP address: %s, subnet mask %s"
 msgstr ""
 
 #. FIXME:
 #. - side effect: sets @type. No reason for that. It should only build item
 #. overview. Check and remove.
-#: src/modules/LanItems.rb:1265
+#: src/modules/LanItems.rb:1326
 msgid "Not configured"
 msgstr ""
 
 #. 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
 msgid "Device Name: %s"
 msgstr ""
 
-#: src/modules/LanItems.rb:1308
+#: src/modules/LanItems.rb:1369
 msgid "Bonding slaves"
 msgstr ""
 
-#: 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
 msgid "Not connected"
 msgstr ""
 
-#: src/modules/LanItems.rb:1336
+#: src/modules/LanItems.rb:1401
 msgid "No hwinfo"
 msgstr ""
 
-#: src/modules/LanItems.rb:1356
+#: src/modules/LanItems.rb:1421
 msgid "Unable to configure the network card because the kernel device (eth0, wlan0) is not present. This is mostly caused by missing firmware (for wlan devices). See dmesg output for details."
 msgstr ""
 
-#: src/modules/LanItems.rb:1362
+#: src/modules/LanItems.rb:1427
 msgid ""
 "The device is not configured. Press <b>Edit</b>\n"
 "to configure.\n"
 msgstr ""
 
-#: src/modules/LanItems.rb:1369
+#: src/modules/LanItems.rb:1434
 msgid "Needed firmware"
 msgstr ""
 
-#: src/modules/LanItems.rb:1369
+#: src/modules/LanItems.rb:1434
 msgid "unknown"
 msgstr ""
 
+#. Package containing SuSEfirewall2 services has to be installed before
+#. reading SuSEFirewall, otherwise exception is thrown by firewall
+#: src/modules/Remote.rb:239
+msgid ""
+"Package %{package} is not installed\n"
+"firewall settings will be disabled."
+msgstr ""
+
 #. Progress stage 2
-#: src/modules/Remote.rb:288
+#: src/modules/Remote.rb:291
 msgid "Configure display manager"
 msgstr ""
 
 #. Progress stage 3
-#: src/modules/Remote.rb:293
+#: src/modules/Remote.rb:296
 msgid "Restart the services"
 msgstr ""
 
-#: src/modules/Remote.rb:296
+#: src/modules/Remote.rb:299
 msgid "Saving Remote Administration Configuration"
 msgstr ""
 
-#: src/modules/Remote.rb:307
+#: src/modules/Remote.rb:308
 msgid "Configuring display manager..."
 msgstr ""
 
+#. Enable xinetd
+#. Enable XDM
+#: src/modules/Remote.rb:327 src/modules/Remote.rb:335
+msgid "Enabling service %{service} has failed"
+msgstr ""
+
 #. Do this only if package xinetd is installed (#256385)
-#: src/modules/Remote.rb:364
+#: src/modules/Remote.rb:359
 msgid "Restarting the service..."
 msgstr ""
 
-#. Label in proposal text
-#: src/modules/Remote.rb:415
+#. description in proposal
+#: src/modules/Remote.rb:393
 msgid "Remote administration is enabled."
 msgstr ""
 
-#. Label in proposal text
-#: src/modules/Remote.rb:418
+#: src/modules/Remote.rb:393
 msgid "Remote administration is disabled."
 msgstr ""
 
@@ -4186,16 +4213,16 @@
 msgstr ""
 
 #. item in combo box Firewall Zone
-#: src/modules/SuSEFirewall4Network.rb:82
+#: src/modules/SuSEFirewall4Network.rb:121
 msgid "Automatically Assigned Zone"
 msgstr ""
 
 #. item in combo box Firewall Zone
-#: src/modules/SuSEFirewall4Network.rb:84
+#: src/modules/SuSEFirewall4Network.rb:123
 msgid "Firewall Disabled"
 msgstr ""
 
 #. TRANSLATORS: Part of combo box item -> "Internal Zone (Unprotected)"
-#: src/modules/SuSEFirewall4Network.rb:96
+#: src/modules/SuSEFirewall4Network.rb:135
 msgid "(Unprotected)"
 msgstr ""

Modified: trunk/yast/am/po/nfs.am.po
===================================================================
--- trunk/yast/am/po/nfs.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/nfs.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/nfs_server.am.po
===================================================================
--- trunk/yast/am/po/nfs_server.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/nfs_server.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -71,27 +71,27 @@
 msgstr ""
 
 #. summary text
-#: src/clients/nfs_server.rb:202
+#: src/clients/nfs_server.rb:196
 msgid "NFS server is enabled"
 msgstr ""
 
 #. summary text
-#: src/clients/nfs_server.rb:205
+#: src/clients/nfs_server.rb:199
 msgid "NFS server is disabled"
 msgstr ""
 
 #. error message
-#: src/clients/nfs_server.rb:221
+#: src/clients/nfs_server.rb:215
 msgid "Required packages (%1) are not installed."
 msgstr ""
 
 #. 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 ""
 
-#: src/clients/nfs_server.rb:266
+#: src/clients/nfs_server.rb:260
 msgid ""
 "The exports table already\n"
 "contains this directory."
@@ -100,11 +100,11 @@
 #. CLI action handler.
 #. @param [Hash] options command options
 #. @return whether successful
-#: src/clients/nfs_server.rb:325
+#: src/clients/nfs_server.rb:319
 msgid "Domain cannot be set without enabling NFSv4. Use the 'set enablev4' command."
 msgstr ""
 
-#: src/clients/nfs_server.rb:336
+#: src/clients/nfs_server.rb:330
 msgid "Command 'set' must be used in the form 'set option=value'. Use 'set help' to get information about available options."
 msgstr ""
 
@@ -155,63 +155,55 @@
 msgstr ""
 
 #. text entry label
-#: src/include/nfs_server/ui.rb:68
+#: src/include/nfs_server/ui.rb:58
 msgid "&Directory to Export"
 msgstr ""
 
 #. button label
-#: src/include/nfs_server/ui.rb:74
+#: src/include/nfs_server/ui.rb:64
 msgid "&Browse..."
 msgstr ""
 
-#: src/include/nfs_server/ui.rb:97
+#: src/include/nfs_server/ui.rb:87
 msgid "Enter a non-empty export path. For example, /exports."
 msgstr ""
 
 #. 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 ""
 
-#. 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 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 ""
 
 #. 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 ""
 
 #. text entry label
-#: src/include/nfs_server/ui.rb:193
+#: src/include/nfs_server/ui.rb:168
 msgid "&Host Wild Card"
 msgstr ""
 
 #. text entry label
-#: src/include/nfs_server/ui.rb:195
+#: src/include/nfs_server/ui.rb:170
 msgid "O&ptions"
 msgstr ""
 
 #. 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
 msgid ""
 "'fsid=0' is not a valid option unless \n"
 "NFSv4 is enabled (previous page).\n"
 msgstr ""
 
 #. 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."
@@ -219,25 +211,25 @@
 
 #. Opening NFS server dialog
 #. @return `back, `abort, `next `or finish
-#: src/include/nfs_server/ui.rb:300
+#: src/include/nfs_server/ui.rb:272
 msgid "Unable to read the /etc/idmapd.conf file. Setting the default setting for the domain to 'localdomain'."
 msgstr ""
 
 #. 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>"
 msgstr ""
 
 #. 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>"
 msgstr ""
 
-#: src/include/nfs_server/ui.rb:339
+#: src/include/nfs_server/ui.rb:311
 msgid ""
 "<P>If the server needs to handle NFSv4 clients, check <B>Enable NFSv4</B>\n"
 "and fill in the NFSv4 domain name you want the ID mapping daemon to use. Leave\n"
@@ -245,51 +237,51 @@
 msgstr ""
 
 #. 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
 msgid ""
 "<P>If the server and client must authenticate using GSS library, check the\n"
 "<B>Enable GSS Security</B> box. To use GSS API, you currently need to have Kerberos and gssapi (nfs-utils > 1.0.7) on your system.</P>\n"
 msgstr ""
 
 #. frame label
-#: src/include/nfs_server/ui.rb:359
+#: src/include/nfs_server/ui.rb:331
 msgid "NFS Server"
 msgstr ""
 
 #. radio button label
-#: src/include/nfs_server/ui.rb:370
+#: src/include/nfs_server/ui.rb:342
 msgid "&Start"
 msgstr ""
 
 #. radio button label
-#: src/include/nfs_server/ui.rb:379
+#: src/include/nfs_server/ui.rb:351
 msgid "Do &Not Start"
 msgstr ""
 
 #. frame label
-#: src/include/nfs_server/ui.rb:397
+#: src/include/nfs_server/ui.rb:369
 msgid "Enable NFSv4"
 msgstr ""
 
-#: src/include/nfs_server/ui.rb:404
+#: src/include/nfs_server/ui.rb:376
 msgid "Enable NFS&v4"
 msgstr ""
 
-#: src/include/nfs_server/ui.rb:409
+#: src/include/nfs_server/ui.rb:381
 msgid "Enter NFSv4 do&main name:"
 msgstr ""
 
-#: src/include/nfs_server/ui.rb:419
+#: src/include/nfs_server/ui.rb:391
 msgid "Enable &GSS Security"
 msgstr ""
 
 #. dialog title
-#: src/include/nfs_server/ui.rb:439
+#: src/include/nfs_server/ui.rb:411
 msgid "NFS Server Configuration"
 msgstr ""
 
 #. 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"
@@ -297,82 +289,77 @@
 msgstr ""
 
 #. 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"
 "IP networks.</P>\n"
 msgstr ""
 
-#. 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
 msgid "<p>Enter an asterisk (<tt>*</tt>) instead of a name to specify all hosts.</p>"
 msgstr ""
 
-#. 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 ""
-
 #. 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 ""
 
 #. push button label
-#: src/include/nfs_server/ui.rb:567
+#: src/include/nfs_server/ui.rb:524
 msgid "Add &Directory"
 msgstr ""
 
 #. push button label
-#: src/include/nfs_server/ui.rb:569
+#: src/include/nfs_server/ui.rb:526
 msgid "&Edit"
 msgstr ""
 
 #. push button label
-#: src/include/nfs_server/ui.rb:571
+#: src/include/nfs_server/ui.rb:528
 msgid "De&lete"
 msgstr ""
 
 #. table header
-#: src/include/nfs_server/ui.rb:584
+#: src/include/nfs_server/ui.rb:541
 msgid "Host Wild Card"
 msgstr ""
 
 #. table header
-#: src/include/nfs_server/ui.rb:586
+#: src/include/nfs_server/ui.rb:543
 msgid "Options"
 msgstr ""
 
 #. push button label
-#: src/include/nfs_server/ui.rb:597
+#: src/include/nfs_server/ui.rb:554
 msgid "Add &Host"
 msgstr ""
 
 #. push button label
-#: src/include/nfs_server/ui.rb:599
+#: src/include/nfs_server/ui.rb:556
 msgid "Ed&it"
 msgstr ""
 
 #. push button label
-#: src/include/nfs_server/ui.rb:601
+#: src/include/nfs_server/ui.rb:558
 msgid "Dele&te"
 msgstr ""
 
 #. dialog title
-#: src/include/nfs_server/ui.rb:608
+#: src/include/nfs_server/ui.rb:565
 msgid "Directories to Export"
 msgstr ""
 
 #. not fatal - write other dirs.
-#: src/modules/NfsServer.rb:182
+#: src/modules/NfsServer.rb:158
 msgid ""
 "Unable to create a missing directory:\n"
 "%1"
 msgstr ""
 
 #. 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"
@@ -380,83 +367,71 @@
 msgstr ""
 
 #. dialog label
-#: src/modules/NfsServer.rb:216
+#: src/modules/NfsServer.rb:192
 msgid "Writing NFS Server Configuration"
 msgstr ""
 
 #. progress stage label
-#: src/modules/NfsServer.rb:221
+#: src/modules/NfsServer.rb:197
 msgid "Save /etc/exports"
 msgstr ""
 
 #. progress stage label
-#: src/modules/NfsServer.rb:223
+#: src/modules/NfsServer.rb:199
 msgid "Restart services"
 msgstr ""
 
 #. progress step label
-#: src/modules/NfsServer.rb:227
+#: src/modules/NfsServer.rb:203
 msgid "Saving /etc/exports..."
 msgstr ""
 
 #. progress step label
-#: src/modules/NfsServer.rb:229
+#: src/modules/NfsServer.rb:205
 msgid "Restarting services..."
 msgstr ""
 
 #. final progress step label
-#: src/modules/NfsServer.rb:231
+#: src/modules/NfsServer.rb:207
 msgid "Finished"
 msgstr ""
 
 #. help text
-#: src/modules/NfsServer.rb:239
+#: src/modules/NfsServer.rb:215
 msgid "Writing NFS server settings. Please wait..."
 msgstr ""
 
 #. 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 ""
 
-#: src/modules/NfsServer.rb:302
-msgid "Unable to start idmapd. Check your domain setting."
-msgstr ""
-
-#: src/modules/NfsServer.rb:308
-msgid "Unable to restart idmapd."
-msgstr ""
-
-#: src/modules/NfsServer.rb:315
-msgid "Unable to stop idmapd."
-msgstr ""
-
 #. FIXME svcgssd is gone! (only nfsserver is left)
-#: src/modules/NfsServer.rb:326
+#: src/modules/NfsServer.rb:266
 msgid "Unable to start svcgssd. Ensure your kerberos and gssapi (nfs-utils) setup is correct."
 msgstr ""
 
-#: src/modules/NfsServer.rb:335
+#: src/modules/NfsServer.rb:275
 msgid "Unable to restart 'svcgssd' service."
 msgstr ""
 
-#: src/modules/NfsServer.rb:343
+#: src/modules/NfsServer.rb:283
 msgid "'svcgssd' is running. Unable to stop it."
 msgstr ""
 
 #. 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"
 msgstr ""
 
 #. summary header; directories exported by NFS
-#: src/modules/NfsServer.rb:384
+#: src/modules/NfsServer.rb:322
 msgid "NFS Exports"
 msgstr ""
 
 #. add information reg NFSv4 support, domain and security
-#: src/modules/NfsServer.rb:402
+#: src/modules/NfsServer.rb:340
 msgid "The NFSv4 domain for idmapping is %1."
 msgstr ""

Modified: trunk/yast/am/po/nis.am.po
===================================================================
--- trunk/yast/am/po/nis.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/nis.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/nis_server.am.po
===================================================================
--- trunk/yast/am/po/nis_server.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/nis_server.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -249,7 +249,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 ""
 
@@ -368,22 +368,27 @@
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. textentry label
-#: src/include/nis_server/slave.rb:84
-msgid "N&IS domain name:"
+#: src/include/nis_server/slave.rb:82
+msgid "N&IS Domain Name:"
 msgstr ""
 
+#. text entry label
+#: src/include/nis_server/slave.rb:90
+msgid "NIS &Master Server:"
+msgstr ""
+
 #. To translators: dialog label
-#: src/include/nis_server/slave.rb:111
+#: src/include/nis_server/slave.rb:109
 msgid "Slave Server Setup"
 msgstr ""
 

Modified: trunk/yast/am/po/ntp-client.am.po
===================================================================
--- trunk/yast/am/po/ntp-client.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/ntp-client.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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-09-03 16:51+0200\n"
 "PO-Revision-Date: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -45,21 +45,20 @@
 msgstr ""
 
 #. combo box label
-#: src/clients/ntp-client_proposal.rb:239
+#: src/clients/ntp-client_proposal.rb:240
 msgid "&NTP Server Address"
 msgstr ""
 
 #. check box label
-#: src/clients/ntp-client_proposal.rb:249
+#: src/clients/ntp-client_proposal.rb:250
 msgid "&Run NTP as daemon"
 msgstr ""
 
 #. check box label
-#: src/clients/ntp-client_proposal.rb:258
+#: src/clients/ntp-client_proposal.rb:259
 msgid "&Save NTP Configuration"
 msgstr ""
 
-#. try to line up the widgets horizontally
 #. push button label
 #: src/clients/ntp-client_proposal.rb:269
 msgid "S&ynchronize now"
@@ -72,21 +71,29 @@
 msgstr ""
 
 #. Otherwise, prompt user for confirming pkg installation
-#: src/clients/ntp-client_proposal.rb:388
+#: src/clients/ntp-client_proposal.rb:386
 msgid ""
 "Synchronization with NTP server is not possible\n"
 "without package %1 installed."
 msgstr ""
 
 #. Only if network is running try to synchronize the ntp server
-#: src/clients/ntp-client_proposal.rb:399
+#: src/clients/ntp-client_proposal.rb:398
 msgid "Synchronizing with NTP server..."
 msgstr ""
 
+#. update time widgets
+#: src/clients/ntp-client_proposal.rb:443
+msgid "Connection to selected NTP server failed."
+msgstr ""
+
 #. Translators: yes-no popup,
 #. ntpdate is a command, %1 is the server address
-#: src/clients/ntp-client_proposal.rb: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
@@ -588,10 +595,13 @@
 "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 ""
 
 #. 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"
@@ -599,7 +609,7 @@
 "is more secure and strongly recommended.</p>"
 msgstr ""
 
-#: src/include/ntp-client/helps.rb:48
+#: src/include/ntp-client/helps.rb:51
 msgid ""
 "<p><b><big>Secure NTP Configuration</big></b><br>\n"
 "By selecting <b>Restrict NTP Service to Configured Servers Only</b>, remote hosts will not be able to view and modify NTP settings on your \n"
@@ -608,7 +618,7 @@
 msgstr ""
 
 #. 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"
@@ -618,7 +628,7 @@
 msgstr ""
 
 #. 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"
@@ -628,14 +638,14 @@
 msgstr ""
 
 #. help text 5/5
-#: src/include/ntp-client/helps.rb:71
+#: src/include/ntp-client/helps.rb:74
 msgid ""
 "<p><b><big>Display Log</big></b></p>\n"
 "<p>To view the logs of the NTP daemon, click <b>Display Log</b>.</p>\n"
 msgstr ""
 
 #. 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"
@@ -643,14 +653,14 @@
 msgstr ""
 
 #. 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>"
 msgstr ""
 
 #. 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"
@@ -658,7 +668,7 @@
 msgstr ""
 
 #. 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"
@@ -670,14 +680,14 @@
 msgstr ""
 
 #. 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>"
 msgstr ""
 
 #. 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"
@@ -686,7 +696,7 @@
 msgstr ""
 
 #. 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"
@@ -695,7 +705,7 @@
 msgstr ""
 
 #. 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"
@@ -703,7 +713,7 @@
 msgstr ""
 
 #. 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"
@@ -711,7 +721,7 @@
 msgstr ""
 
 #. 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"
@@ -719,7 +729,7 @@
 msgstr ""
 
 #. 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"
@@ -728,7 +738,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
 msgid ""
 "<p><b><big>Options</big></b><br>\n"
 "To fine-tune the synchronization source, enter the respective options in the\n"
@@ -736,7 +746,7 @@
 "<i>/usr/share/doc/packages/ntp-doc/confopt.htm</i>.</p>\n"
 msgstr ""
 
-#: src/include/ntp-client/helps.rb:151
+#: src/include/ntp-client/helps.rb:154
 msgid ""
 "<p><b><big>Access Control Options</big></b><br>\n"
 "Define the access control flags (<b><tt>restrict</tt></b> directive in\n"
@@ -748,49 +758,49 @@
 msgstr ""
 
 #. 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>"
 msgstr ""
 
 #. 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>"
 msgstr ""
 
 #. 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>"
 msgstr ""
 
 #. 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>"
 msgstr ""
 
 #. 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>"
 msgstr ""
 
 #. 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>"
 msgstr ""
 
 #. 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"
@@ -798,7 +808,7 @@
 msgstr ""
 
 #. 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"
@@ -808,7 +818,7 @@
 msgstr ""
 
 #. 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"
@@ -816,7 +826,7 @@
 msgstr ""
 
 #. 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"
@@ -829,7 +839,7 @@
 msgstr ""
 
 #. 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>"
@@ -837,7 +847,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"
@@ -847,7 +857,7 @@
 msgstr ""
 
 #. 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"
@@ -856,7 +866,7 @@
 msgstr ""
 
 #. help text 2/2
-#: src/include/ntp-client/helps.rb:242
+#: src/include/ntp-client/helps.rb:245
 msgid ""
 "To learn more about available options, install the package\n"
 "<i>ntp-doc</i> and see <i>/usr/share/doc/packages/ntp-doc/html/refclock.htm</i>.</p>\n"
@@ -1189,117 +1199,120 @@
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. progress stage
-#: src/modules/NtpClient.rb:745
+#: src/modules/NtpClient.rb:748
 msgid "Write NTP settings"
 msgstr ""
 
 #. progress stage
-#: src/modules/NtpClient.rb:747
+#: src/modules/NtpClient.rb:750
 msgid "Restart NTP daemon"
 msgstr ""
 
 #. progress step
-#: src/modules/NtpClient.rb:751
+#: src/modules/NtpClient.rb:754
 msgid "Writing the settings..."
 msgstr ""
 
 #. progress step
-#: src/modules/NtpClient.rb:753
+#: src/modules/NtpClient.rb:756
 msgid "Restarting NTP daemon..."
 msgstr ""
 
 #. error message
-#: src/modules/NtpClient.rb:838
+#: src/modules/NtpClient.rb:841
 msgid "Cannot update the dynamic configuration policy."
 msgstr ""
 
 #. error report
-#: src/modules/NtpClient.rb:876
+#: src/modules/NtpClient.rb:879
 msgid "Cannot restart the NTP daemon."
 msgstr ""
 
 #. summary string
-#: src/modules/NtpClient.rb:970
+#: src/modules/NtpClient.rb:973
 msgid "The NTP daemon starts when starting the system."
 msgstr ""
 
 #. summary string
-#: src/modules/NtpClient.rb:976
+#: src/modules/NtpClient.rb:979
 msgid "The NTP daemon does not start automatically."
 msgstr ""
 
 #. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:982
+#: src/modules/NtpClient.rb:985
 msgid "Servers: %1"
 msgstr ""
 
 #. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:986
+#: src/modules/NtpClient.rb:989
 msgid "Radio Clocks: %1"
 msgstr ""
 
 #. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:990
+#: src/modules/NtpClient.rb:993
 msgid "Peers: %1"
 msgstr ""
 
 #. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:994
+#: src/modules/NtpClient.rb:997
 msgid "Broadcast time information to: %1"
 msgstr ""
 
 #. 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 ""
 
 #. summary string, FIXME
-#: src/modules/NtpClient.rb:1014
+#: src/modules/NtpClient.rb:1017
 msgid "Combine static and DHCP configuration."
 msgstr ""
 
 #. summary string, FIXME
-#: src/modules/NtpClient.rb:1018
+#: src/modules/NtpClient.rb:1021
 msgid "Static configuration only."
 msgstr ""
 
 #. summary string, FIXME
-#: src/modules/NtpClient.rb:1021
+#: src/modules/NtpClient.rb:1024
 msgid "Custom configuration policy."
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. if package is not installed (in the inst-sys, it is: bnc#399659)
-#: src/modules/NtpClient.rb:1106
+#: src/modules/NtpClient.rb:1109
 msgid ""
 "Cannot search for NTP server in local network\n"
 "without package %1 installed.\n"

Modified: trunk/yast/am/po/oneclickinstall.am.po
===================================================================
--- trunk/yast/am/po/oneclickinstall.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/oneclickinstall.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/online-update-configuration.am.po
===================================================================
--- trunk/yast/am/po/online-update-configuration.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/online-update-configuration.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/online-update.am.po
===================================================================
--- trunk/yast/am/po/online-update.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/online-update.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -107,13 +107,18 @@
 msgid "Initializing Online Update"
 msgstr ""
 
-#. 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
+msgid "No update repository configured yet."
+msgstr ""
+
 #. progress window label
 #: src/clients/online_update_install.rb:49
 msgid "Progress Log"

Added: trunk/yast/am/po/opensuse_mirror.am.po
===================================================================
--- trunk/yast/am/po/opensuse_mirror.am.po	                        (rev 0)
+++ trunk/yast/am/po/opensuse_mirror.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -0,0 +1,61 @@
+# Amharic message file for YaST2 (@memory@).
+# Copyright (C) 2007 SUSE Linux Products GmbH.
+#
+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: 2002-07-18 14:04+0200\n"
+"Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
+"Language-Team: Amharic <i18n@suse.de>\n"
+"Language: am\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\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 ""
+
+#: src/lib/opensuse_mirror/main_dialog.rb:119
+msgid "Mirrored"
+msgstr ""
+
+#: src/lib/opensuse_mirror/main_dialog.rb:129
+msgid "yes"
+msgstr ""
+
+#: src/lib/opensuse_mirror/main_dialog.rb:129
+msgid "no"
+msgstr ""
+
+#: src/lib/opensuse_mirror/main_dialog.rb:139
+msgid "&Exit"
+msgstr ""
+
+#: src/lib/opensuse_mirror/main_dialog.rb:144
+msgid "&Mirror"
+msgstr ""
+
+#: src/lib/opensuse_mirror/main_dialog.rb:145
+msgid "&Do not Mirror"
+msgstr ""
+
+#: src/lib/opensuse_mirror/main_dialog.rb:146
+msgid "Select/Deselect &All"
+msgstr ""

Modified: trunk/yast/am/po/packager.am.po
===================================================================
--- trunk/yast/am/po/packager.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/packager.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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-15 15:57+0200\n"
 "PO-Revision-Date: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -138,6 +138,15 @@
 msgid "&Text Mode"
 msgstr ""
 
+#. 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 ""
+
 #. dialog heading
 #: src/clients/inst_mediacopy.rb:49
 msgid "Copy Installation Media"
@@ -455,7 +464,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 ""
 
@@ -518,7 +527,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 ""
 
@@ -737,7 +746,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 ""
@@ -745,7 +754,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 ""
@@ -1071,7 +1080,7 @@
 msgid "&Start Check"
 msgstr ""
 
-#: 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 ""
 
@@ -1292,7 +1301,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
 msgid ""
 "Unable to create repository\n"
 "from URL '%1'."
@@ -1324,71 +1333,71 @@
 #. 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
 msgid "An error occurred while preparing the installation system."
 msgstr ""
 
 #. error report
-#: src/modules/AddOnProduct.rb:639
+#: src/modules/AddOnProduct.rb:654
 msgid "Control file %1 not found on media."
 msgstr ""
 
 #. 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
 msgid "Unable to use additional products."
 msgstr ""
 
 #. 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
 msgid "%1, URL: %2"
 msgstr ""
 
-#: src/modules/AddOnProduct.rb:1302
+#: src/modules/AddOnProduct.rb:1319
 msgid "URL: %1, Path: %2"
 msgstr ""
 
 #. TRANSLATORS: popup heading
-#: src/modules/AddOnProduct.rb:1333
+#: src/modules/AddOnProduct.rb:1350
 msgid "Additional Products"
 msgstr ""
 
 #. 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
 msgid "Additional Products to Select"
 msgstr ""
 
 #. push button label
-#: src/modules/AddOnProduct.rb:1357
+#: src/modules/AddOnProduct.rb:1374
 msgid "Add Selected &Products"
 msgstr ""
 
 #. %1 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1488
+#: src/modules/AddOnProduct.rb:1505
 msgid "Insert the addon %1 medium"
 msgstr ""
 
 #. %1 is the product name, %2 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1493
+#: src/modules/AddOnProduct.rb:1510
 msgid "Insert the %1 %2 medium"
 msgstr ""
 
 #. TRANSLATORS: error message, %1 is replaced with product URL
-#: src/modules/AddOnProduct.rb:1545
+#: src/modules/AddOnProduct.rb:1562
 msgid "Unable to add product %1."
 msgstr ""
 
 #. 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 ""
 
@@ -1433,7 +1442,7 @@
 msgstr ""
 
 #. the string is follwed by a media number, e.g. "Medium 1"
-#: src/modules/PackageSlideShow.rb:35
+#: src/modules/PackageSlideShow.rb:50
 msgid "Medium %1"
 msgstr ""
 
@@ -1441,13 +1450,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 ""
 
 #. 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 ""
 
@@ -1455,21 +1464,21 @@
 #. %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
 msgid "Next: %1 -- %2"
 msgstr ""
 
 #. 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
 msgid "Next: %1"
 msgstr ""
 
 #. 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 ""
 
@@ -1478,144 +1487,185 @@
 #.
 #. 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
 msgid "Downloading %1 (download size %2)"
 msgstr ""
 
-#: src/modules/PackageSlideShow.rb:1198
+#: src/modules/PackageSlideShow.rb:1081
 msgid " (Remaining: %1%2 packages)"
 msgstr ""
 
 #. display download progress in DownloadInAdvance mode
 #. translations: progress message (part1)
-#: src/modules/PackageSlideShow.rb:1231
+#: src/modules/PackageSlideShow.rb:1114
 msgid "Downloading Packages..."
 msgstr ""
 
 #. progress message (part2)
-#: src/modules/PackageSlideShow.rb:1234
+#: src/modules/PackageSlideShow.rb:1117
 msgid " (Downloaded %1 of %2 packages)"
 msgstr ""
 
 #. 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 ""
 
 #. 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
 msgid "Installing %1 (installed size %2)"
 msgstr ""
 
 #. message in the installatino log, %1 is package name,
 #. %2 is package size
-#: src/modules/PackageSlideShow.rb:1456
+#: src/modules/PackageSlideShow.rb:1338
 msgid "Applying delta RPM: %1"
 msgstr ""
 
 #. warning text
-#: src/modules/Packages.rb:299
+#: src/modules/Packages.rb:303
 msgid "Your computer is a 64-bit x86-64 system, but you are trying to install a 32-bit distribution."
 msgstr ""
 
 #. help text for software proposal
-#: src/modules/Packages.rb: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
 msgid "<P><B>Software Proposal</B></P>"
 msgstr ""
 
 #. installation proposal - SW summary, %1 is name of the installed product
 #. (e.g. openSUSE 10.3, SUSE Linux Enterprise ...)
-#: src/modules/Packages.rb:358
+#: src/modules/Packages.rb:362
 msgid "Product: %1"
 msgstr ""
 
 #. installation proposal - SW summary, %1 is name of the selected desktop or system type (e.g. KDE)
-#: src/modules/Packages.rb:372
+#: src/modules/Packages.rb:376
 msgid "System Type: %1"
 msgstr ""
 
-#: src/modules/Packages.rb:383
+#: src/modules/Packages.rb:387
 msgid "Patterns:<br>"
 msgstr ""
 
 #. 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 ""
 
 #. 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
 msgid "Downloading from Remote Repositories: %1"
 msgstr ""
 
-#: 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
 msgid "Warning: Cannot check free space in directory %1 (device %2)."
 msgstr ""
 
 #. summary warning
-#: src/modules/Packages.rb:600
+#: src/modules/Packages.rb:604
 msgid "Not enough disk space."
 msgstr ""
 
 #. summary warning
-#: src/modules/Packages.rb:602
+#: src/modules/Packages.rb:606
 msgid "Not enough disk space. Remove some packages in the single selection."
 msgstr ""
 
 #. add a backslash if it's missing
-#: src/modules/Packages.rb:623
+#: src/modules/Packages.rb:627
 msgid "Only %1 (%2%%) free space available on partition %3.<BR>"
 msgstr ""
 
+#. newly installed products
+#: src/modules/Packages.rb:696
+msgid "New product <b>%s</b> will be installed"
+msgstr ""
+
+#. product update: %s is a product name
+#: src/modules/Packages.rb:706
+msgid "Product <b>%s</b> will be updated"
+msgstr ""
+
+#. product update: %{old_product} is an old product, %{new_product} is the new one
+#: src/modules/Packages.rb:708
+msgid "Product <b>%{old_product}</b> will be updated to <b>%{new_product}</b>"
+msgstr ""
+
+#: src/modules/Packages.rb:715
+msgid "Product <b>%s</b> will stay installed"
+msgstr ""
+
+#. Removing another product might be an issue
+#. (just warn if removed by user or by YaST)
+#: src/modules/Packages.rb: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
 msgid "No repository found at '%1'."
 msgstr ""
 
 #. TRANSLATORS: beginning of the rich text with the release notes
-#: src/modules/Packages.rb:1489
+#: src/modules/Packages.rb:1615
 msgid ""
 "<p><b>The release notes for the initial release are part of the installation\n"
 "media. If an Internet connection is available during configuration, you can\n"
@@ -1623,50 +1673,50 @@
 msgstr ""
 
 #. popup - information label
-#: src/modules/Packages.rb:1516
+#: src/modules/Packages.rb:1642
 msgid "Integrating booted media..."
 msgstr ""
 
 #. close the popup in order to be able to ask about the license
-#: src/modules/Packages.rb:1538
+#: src/modules/Packages.rb:1664
 msgid "Failed to integrate the service pack repository."
 msgstr ""
 
 #. popup - information label
-#: src/modules/Packages.rb:1571
+#: src/modules/Packages.rb:1697
 msgid "Initializing repositories..."
 msgstr ""
 
 #. message popup, %1 is product name
-#: src/modules/Packages.rb:1803
+#: src/modules/Packages.rb:1929
 msgid "Insert %1 CD 1"
 msgstr ""
 
-#: src/modules/Packages.rb:1805
+#: src/modules/Packages.rb:1931
 msgid "%1 CD 1 not found"
 msgstr ""
 
 #. 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."
 msgstr ""
 
 #. 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 ""
 
 #. 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."
@@ -1675,72 +1725,74 @@
 #. 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
 msgid "Cannot read license file %1"
 msgstr ""
 
-#: 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 ""
 
-#. radio button
-#: src/modules/ProductLicense.rb:391
-msgid "&Yes, I Agree to the License Agreement"
+#. check box label
+#: src/modules/ProductLicense.rb:345
+msgid "I &Agree to the License Terms."
 msgstr ""
 
-#. radio button
-#: src/modules/ProductLicense.rb:399
-msgid "N&o, 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"
 "the configuration will be aborted.</p>\n"
 msgstr ""
 
+#. 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 ""
 
 #. popup question
-#: src/modules/ProductLicense.rb:1096
+#: src/modules/ProductLicense.rb:1017
 msgid "Really abort the add-on product installation?"
 msgstr ""
 
 #. 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
 msgid "The system is shutting down..."
 msgstr ""
 
@@ -1819,165 +1871,170 @@
 
 #. 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 ""
 
 #. radio button
-#: src/modules/SourceDialogs.rb:36
+#: src/modules/SourceDialogs.rb:38
 msgid "&FTP..."
 msgstr ""
 
 #. radio button
-#: src/modules/SourceDialogs.rb:38
+#: src/modules/SourceDialogs.rb:40
 msgid "&HTTP..."
 msgstr ""
 
 #. radio button
-#: src/modules/SourceDialogs.rb:40
+#: src/modules/SourceDialogs.rb:42
 msgid "HTT&PS..."
 msgstr ""
 
 #. 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 ""
 
 #. radio button
-#: src/modules/SourceDialogs.rb:44
+#: src/modules/SourceDialogs.rb:46
 msgid "&NFS..."
 msgstr ""
 
 #. radio button
-#: src/modules/SourceDialogs.rb:46
+#: src/modules/SourceDialogs.rb:48
 msgid "&CD..."
 msgstr ""
 
 #. radio button
-#: src/modules/SourceDialogs.rb:48
+#: src/modules/SourceDialogs.rb:50
 msgid "&DVD..."
 msgstr ""
 
 #. radio button
-#: src/modules/SourceDialogs.rb:50
+#: src/modules/SourceDialogs.rb:52
 msgid "&Hard Disk..."
 msgstr ""
 
 #. 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 ""
 
 #. radio button
-#: src/modules/SourceDialogs.rb:56
+#: src/modules/SourceDialogs.rb:58
 msgid "&Local ISO Image..."
 msgstr ""
 
 #. check box
-#: src/modules/SourceDialogs.rb:58
+#: src/modules/SourceDialogs.rb:60
 msgid "&Download repository description files"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:136
+#: src/modules/SourceDialogs.rb:144
 msgid "&ISO Image"
 msgstr ""
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:138
+#: src/modules/SourceDialogs.rb:146
 msgid "N&FS v4 Protocol"
 msgstr ""
 
-#: src/modules/SourceDialogs.rb:144
+#: src/modules/SourceDialogs.rb:152
 msgid "Mount Options"
 msgstr ""
 
 #. TRANSLATORS: "(default)" - is a combobox value and means default libzypp
 #. NFS mount option (users can change it to anything else, the field is editable)
-#: src/modules/SourceDialogs.rb:148
+#: src/modules/SourceDialogs.rb:156
 msgid "(default)"
 msgstr ""
 
-#: src/modules/SourceDialogs.rb:159
+#: src/modules/SourceDialogs.rb:167
 msgid "URL of the Repository"
 msgstr ""
 
 #. frame
-#: src/modules/SourceDialogs.rb:168
+#: src/modules/SourceDialogs.rb:176
 msgid "P&rotocol"
 msgstr ""
 
 #. input field label
-#: src/modules/SourceDialogs.rb:178
+#: src/modules/SourceDialogs.rb:186
 msgid "&URL of the Repository"
 msgstr ""
 
 #. 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
 msgid "Repository URL"
 msgstr ""
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:195
+#: src/modules/SourceDialogs.rb:203
 msgid "NFS Server"
 msgstr ""
 
 #. 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
 msgid "CD or DVD Media"
 msgstr ""
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:201
+#: src/modules/SourceDialogs.rb:209
 msgid "Hard Disk"
 msgstr ""
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:203
+#: src/modules/SourceDialogs.rb:211
 msgid "USB Stick or Disk"
 msgstr ""
 
 #. 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 ""
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:207
+#: src/modules/SourceDialogs.rb:215
 msgid "Local ISO Image"
 msgstr ""
 
@@ -1986,53 +2043,53 @@
 #. 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 ""
 
 #. popup message
-#: src/modules/SourceDialogs.rb:432
+#: src/modules/SourceDialogs.rb:440
 msgid "The name of the repository cannot be empty."
 msgstr ""
 
 #. text entry
-#: src/modules/SourceDialogs.rb:444
+#: src/modules/SourceDialogs.rb:452
 msgid "&Repository Name"
 msgstr ""
 
 #. help text
-#: src/modules/SourceDialogs.rb:459
+#: src/modules/SourceDialogs.rb:467
 msgid ""
 "<p><big><b>Repository Name</b></big><br>\n"
 "Use <b>Repository Name</b> to specify the name of the repository. If it is empty, YaST will use the product name (if available) or the URL as the name.</p>\n"
 msgstr ""
 
 #. text entry
-#: src/modules/SourceDialogs.rb:473
+#: src/modules/SourceDialogs.rb:481
 msgid "&Service Name"
 msgstr ""
 
 #. help text
-#: src/modules/SourceDialogs.rb:481
+#: src/modules/SourceDialogs.rb:489
 msgid ""
 "<p><big><b>Service Name</b></big><br>\n"
 "Use <b>Service Name</b> to specify the name of the service. If it is empty, YaST will use part of the service URL as the name.</p>\n"
 msgstr ""
 
 #. popup message
-#: src/modules/SourceDialogs.rb:516
+#: src/modules/SourceDialogs.rb:524
 msgid "URL cannot be empty."
 msgstr ""
 
 #. text entry
-#: src/modules/SourceDialogs.rb:529
+#: src/modules/SourceDialogs.rb:537
 msgid "&URL"
 msgstr ""
 
 #. help text
-#: src/modules/SourceDialogs.rb:543
+#: src/modules/SourceDialogs.rb:551
 msgid ""
 "<p><big><b>Repository URL</b></big><br>\n"
 "Use <b>URL</b> to specify the URL of the repository.</p>"
@@ -2042,23 +2099,23 @@
 #. @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
 msgid "Edit Complete URL"
 msgstr ""
 
 #. help text
-#: src/modules/SourceDialogs.rb:735
+#: src/modules/SourceDialogs.rb:743
 msgid ""
 "<p><big><b>NFS Server</b></big><br>\n"
 "Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n"
 "to specify the NFS server host name and path on the server.</p>"
 msgstr ""
 
-#: 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"
@@ -2067,42 +2124,42 @@
 msgstr ""
 
 #. radio button
-#: src/modules/SourceDialogs.rb:797
+#: src/modules/SourceDialogs.rb:805
 msgid "&CD-ROM"
 msgstr ""
 
 #. radio button
-#: src/modules/SourceDialogs.rb:799
+#: src/modules/SourceDialogs.rb:807
 msgid "&DVD-ROM"
 msgstr ""
 
-#: src/modules/SourceDialogs.rb:804
+#: src/modules/SourceDialogs.rb:812
 msgid ""
 "<p><big><b>CD or DVD Media</b></big><br>\n"
 "Set <b>CD-ROM</b> or <b>DVD-ROM</b> to specify the type of media.</p>"
 msgstr ""
 
 #. dialog caption
-#: src/modules/SourceDialogs.rb:895
+#: src/modules/SourceDialogs.rb:903
 msgid "ISO Image File"
 msgstr ""
 
 #. error popup - the entered path is not a directory
-#: src/modules/SourceDialogs.rb:918
+#: src/modules/SourceDialogs.rb:926
 msgid ""
 "The entered path is not a directory\n"
 "or the directory does not exist.\n"
 msgstr ""
 
 #. error popup - the entered path is not a regular file
-#: src/modules/SourceDialogs.rb:948
+#: src/modules/SourceDialogs.rb:956
 msgid ""
 "The entered path is not a file\n"
 "or the file does not exist.\n"
 msgstr ""
 
 #. 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"
@@ -2110,17 +2167,17 @@
 msgstr ""
 
 #. text entry
-#: src/modules/SourceDialogs.rb:993
+#: src/modules/SourceDialogs.rb:1001
 msgid "&Path to Directory"
 msgstr ""
 
 #. 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
 msgid "&Plain RPM Directory"
 msgstr ""
 
-#: src/modules/SourceDialogs.rb:1016
+#: src/modules/SourceDialogs.rb:1024
 msgid ""
 "<p><big><b>Local Directory</b></big><br>\n"
 "Use <b>Path to Directory</b> to specify the path to the\n"
@@ -2130,20 +2187,20 @@
 msgstr ""
 
 #. `opt(`hstretch),
-#: src/modules/SourceDialogs.rb:1252
+#: src/modules/SourceDialogs.rb:1260
 msgid "&USB Mass Storage Device"
 msgstr ""
 
 #. 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 ""
 
-#: src/modules/SourceDialogs.rb:1258 src/modules/SourceDialogs.rb:1325
+#: src/modules/SourceDialogs.rb:1266 src/modules/SourceDialogs.rb:1333
 msgid "Dire&ctory"
 msgstr ""
 
-#: src/modules/SourceDialogs.rb:1263
+#: src/modules/SourceDialogs.rb:1271
 msgid ""
 "<p><big><b>USB Stick or Disk</b></big><br>\n"
 "Select the USB device on which the repository is located.\n"
@@ -2156,7 +2213,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"
@@ -2164,11 +2221,11 @@
 msgstr ""
 
 #. combobox title
-#: src/modules/SourceDialogs.rb:1323
+#: src/modules/SourceDialogs.rb:1331
 msgid "&Disk Device"
 msgstr ""
 
-#: src/modules/SourceDialogs.rb:1330
+#: src/modules/SourceDialogs.rb:1338
 msgid ""
 "<p><big><b>Disk</b></big><br>\n"
 "Select the disk on which the repository is located.\n"
@@ -2180,12 +2237,12 @@
 msgstr ""
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1356
+#: src/modules/SourceDialogs.rb:1364
 msgid "&Path to ISO Image"
 msgstr ""
 
 #. push button
-#: src/modules/SourceDialogs.rb:1376
+#: src/modules/SourceDialogs.rb:1384
 msgid ""
 "<p><big><b>Local ISO Image</b></big><br>\n"
 "Use <b>Path to ISO Image</b> to specify the path to the\n"
@@ -2193,71 +2250,71 @@
 msgstr ""
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1557
+#: src/modules/SourceDialogs.rb:1565
 msgid "Server &Name"
 msgstr ""
 
-#: src/modules/SourceDialogs.rb:1561
+#: src/modules/SourceDialogs.rb:1569
 msgid "&Port"
 msgstr ""
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1566
+#: src/modules/SourceDialogs.rb:1574
 msgid "&Share"
 msgstr ""
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:1579
+#: src/modules/SourceDialogs.rb:1587
 msgid "ISO &Image"
 msgstr ""
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1582
+#: src/modules/SourceDialogs.rb:1590
 msgid "&Directory on Server"
 msgstr ""
 
 #. frame
-#: src/modules/SourceDialogs.rb:1587
+#: src/modules/SourceDialogs.rb:1595
 msgid "Au&thentication"
 msgstr ""
 
 #. check box
-#: src/modules/SourceDialogs.rb:1594
+#: src/modules/SourceDialogs.rb:1602
 msgid "&Anonymous"
 msgstr ""
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1603
+#: src/modules/SourceDialogs.rb:1611
 msgid "&Workgroup or Domain"
 msgstr ""
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1612
+#: src/modules/SourceDialogs.rb:1620
 msgid "&User Name"
 msgstr ""
 
 #. password entry
-#: src/modules/SourceDialogs.rb:1619
+#: src/modules/SourceDialogs.rb:1627
 msgid "&Password"
 msgstr ""
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1694
+#: src/modules/SourceDialogs.rb:1702
 msgid "&FTP"
 msgstr ""
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1697
+#: src/modules/SourceDialogs.rb:1705
 msgid "H&TTP"
 msgstr ""
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1704
+#: src/modules/SourceDialogs.rb:1712
 msgid "HTT&PS"
 msgstr ""
 
 #. 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"
@@ -2272,7 +2329,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"
@@ -2281,12 +2338,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
 msgid ""
 "<p><big><b>Media Type</b></big><br>\n"
 "The software repository can be located on CD, on a network server,\n"
@@ -2294,7 +2351,7 @@
 msgstr ""
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2076
+#: src/modules/SourceDialogs.rb:2085
 msgid ""
 "<p>\n"
 "To add  <b>CD</b> or <b>DVD</b>,\n"
@@ -2302,7 +2359,7 @@
 msgstr ""
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2086
+#: src/modules/SourceDialogs.rb:2095
 msgid ""
 "<p>\n"
 "The product CDs can be copied to the hard disk.\n"
@@ -2312,7 +2369,7 @@
 msgstr ""
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2098
+#: src/modules/SourceDialogs.rb:2107
 msgid ""
 "<p>\n"
 "Network installation requires a working network connection.\n"
@@ -2321,25 +2378,25 @@
 msgstr ""
 
 #. error popup
-#: src/modules/SourceDialogs.rb:2113
+#: src/modules/SourceDialogs.rb:2122
 msgid "Select the media type"
 msgstr ""
 
-#: src/modules/SourceDialogs.rb:2119
+#: src/modules/SourceDialogs.rb:2128
 msgid "Insert the add-on product CD"
 msgstr ""
 
-#: src/modules/SourceDialogs.rb:2120
+#: src/modules/SourceDialogs.rb:2129
 msgid "Insert the add-on product DVD"
 msgstr ""
 
 #. ask for a medium
-#: src/modules/SourceDialogs.rb:2138
+#: src/modules/SourceDialogs.rb:2147
 msgid "No USB disk was detected."
 msgstr ""
 
 #. 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"
@@ -2349,11 +2406,15 @@
 msgstr ""
 
 #. dialog caption
-#. dialog caption
-#: src/modules/SourceDialogs.rb:2551 src/modules/SourceDialogs.rb:2575
+#: src/modules/SourceDialogs.rb:2563
 msgid "Media Type"
 msgstr ""
 
+#. dialog caption
+#: src/modules/SourceDialogs.rb:2587
+msgid "Add On Product"
+msgstr ""
+
 #. SourceManager read dialog caption
 #: src/modules/SourceManager.rb:100
 msgid "Initializing Available Repositories"
@@ -2445,7 +2506,9 @@
 msgid "Configured Repositories"
 msgstr ""
 
-#: 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 ""
 
@@ -2515,12 +2578,12 @@
 msgstr ""
 
 #. progress information, %1 stands for number of services
-#: src/modules/SourceManagerSLP.rb:520
+#: src/modules/SourceManagerSLP.rb:493
 msgid "Collecting information of %1 services found..."
 msgstr ""
 
 #. error popup
-#: src/modules/SourceManagerSLP.rb:618
+#: src/modules/SourceManagerSLP.rb:591
 msgid ""
 "No SLP repositories have been found on your network.\n"
 "This could be caused by a running SuSEfirewall2,\n"
@@ -2528,7 +2591,7 @@
 msgstr ""
 
 #. error popup
-#: src/modules/SourceManagerSLP.rb:627
+#: src/modules/SourceManagerSLP.rb:600
 msgid "No SLP repositories have been found on your network."
 msgstr ""
 

Modified: trunk/yast/am/po/pam.am.po
===================================================================
--- trunk/yast/am/po/pam.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/pam.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/pkg-bindings.am.po
===================================================================
--- trunk/yast/am/po/pkg-bindings.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/pkg-bindings.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -146,7 +146,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
 msgid "Loading the Package Manager..."
 msgstr ""
 
@@ -177,6 +177,6 @@
 msgid "Initialize the Target System"
 msgstr ""
 
-#: src/Target_Load.cc:71 src/Target_Load.cc:183
+#: src/Target_Load.cc:71 src/Target_Load.cc:200
 msgid "Read Installed Packages"
 msgstr ""

Modified: trunk/yast/am/po/printer.am.po
===================================================================
--- trunk/yast/am/po/printer.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/printer.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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:53+0200\n"
 "PO-Revision-Date: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/product-creator.am.po
===================================================================
--- trunk/yast/am/po/product-creator.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/product-creator.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/proxy.am.po
===================================================================
--- trunk/yast/am/po/proxy.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/proxy.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/qt-pkg.am.po
===================================================================
--- trunk/yast/am/po/qt-pkg.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/qt-pkg.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -39,47 +39,47 @@
 msgid "&Repositories"
 msgstr ""
 
-#: src/YQPackageSelector.cc:418
+#: src/YQPackageSelector.cc:419
 msgid "S&earch"
 msgstr ""
 
 #. DEBUG
-#: src/YQPackageSelector.cc:425 src/YQPkgSearchFilterView.cc:113
+#: src/YQPackageSelector.cc:426 src/YQPkgSearchFilterView.cc:113
 msgid "&Keywords"
 msgstr ""
 
-#: src/YQPackageSelector.cc:434
+#: src/YQPackageSelector.cc:435
 msgid "&Installation Summary"
 msgstr ""
 
-#: src/YQPackageSelector.cc:519
+#: src/YQPackageSelector.cc:520
 msgid "D&escription"
 msgstr ""
 
-#: src/YQPackageSelector.cc:532
+#: src/YQPackageSelector.cc:533
 msgid "&Technical Data"
 msgstr ""
 
-#: src/YQPackageSelector.cc:545 src/YQPkgProductDialog.cc:115
+#: src/YQPackageSelector.cc:546 src/YQPkgProductDialog.cc:115
 msgid "Dependencies"
 msgstr ""
 
-#: src/YQPackageSelector.cc:561
+#: src/YQPackageSelector.cc:562
 msgid "&Versions"
 msgstr ""
 
-#: src/YQPackageSelector.cc:579
+#: src/YQPackageSelector.cc:580
 msgid "File List"
 msgstr ""
 
-#: src/YQPackageSelector.cc:596
+#: src/YQPackageSelector.cc:597
 msgid "Change Log"
 msgstr ""
 
 #. "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
@@ -89,175 +89,175 @@
 msgstr ""
 
 #. 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 ""
 
-#: src/YQPackageSelector.cc:676
+#: src/YQPackageSelector.cc:677
 msgid "&File"
 msgstr ""
 
-#: src/YQPackageSelector.cc:678
+#: src/YQPackageSelector.cc:679
 msgid "&Import..."
 msgstr ""
 
-#: src/YQPackageSelector.cc:679
+#: src/YQPackageSelector.cc:680
 msgid "&Export..."
 msgstr ""
 
-#: src/YQPackageSelector.cc:683
+#: src/YQPackageSelector.cc:684
 msgid "E&xit -- Discard Changes"
 msgstr ""
 
-#: src/YQPackageSelector.cc:684
+#: src/YQPackageSelector.cc:685
 msgid "&Quit -- Save Changes"
 msgstr ""
 
-#: src/YQPackageSelector.cc:696
+#: src/YQPackageSelector.cc:697
 msgid "&Package"
 msgstr ""
 
-#: src/YQPackageSelector.cc:736 src/YQPkgPackageKitGroupsFilterView.cc:92
+#: src/YQPackageSelector.cc:737 src/YQPkgPackageKitGroupsFilterView.cc:92
 #: src/YQPkgRepoFilterView.cc:149
 msgid "All Packages"
 msgstr ""
 
-#: src/YQPackageSelector.cc:738 src/YQPkgObjList.cc:430
+#: src/YQPackageSelector.cc:739 src/YQPkgObjList.cc:430
 msgid "Update if newer version available"
 msgstr ""
 
-#: src/YQPackageSelector.cc:741 src/YQPkgObjList.cc:415
+#: src/YQPackageSelector.cc:742 src/YQPkgObjList.cc:415
 #: src/YQPkgObjList.cc:436
 msgid "Update unconditionally"
 msgstr ""
 
-#: src/YQPackageSelector.cc:755
+#: src/YQPackageSelector.cc:756
 msgid "&Patch"
 msgstr ""
 
-#: src/YQPackageSelector.cc:782
+#: src/YQPackageSelector.cc:783
 msgid "Confi&guration"
 msgstr ""
 
-#: src/YQPackageSelector.cc:783
+#: src/YQPackageSelector.cc:784
 msgid "&Repositories..."
 msgstr ""
 
-#: src/YQPackageSelector.cc:784
+#: src/YQPackageSelector.cc:785
 msgid "&Online Update..."
 msgstr ""
 
-#: src/YQPackageSelector.cc:794
+#: src/YQPackageSelector.cc:795
 msgid "&Dependencies"
 msgstr ""
 
-#: src/YQPackageSelector.cc:796
+#: src/YQPackageSelector.cc:797
 msgid "&Check Now"
 msgstr ""
 
-#: src/YQPackageSelector.cc:797
+#: src/YQPackageSelector.cc:798
 msgid "&Autocheck"
 msgstr ""
 
 #. Translators: Menu for view options (Use a noun, not a verb!)
-#: src/YQPackageSelector.cc:810
+#: src/YQPackageSelector.cc:811
 msgid "&Options"
 msgstr ""
 
 #. 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 ""
 
 #. Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"!
-#: src/YQPackageSelector.cc:822
+#: src/YQPackageSelector.cc:823
 msgid "Show -&debuginfo/-debugsource Packages"
 msgstr ""
 
-#: src/YQPackageSelector.cc:830
+#: src/YQPackageSelector.cc:831
 msgid "&System Verification Mode"
 msgstr ""
 
-#: 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
 msgid "&Cleanup when deleting packages"
 msgstr ""
 
-#: src/YQPackageSelector.cc:845
+#: src/YQPackageSelector.cc:846
 msgid "&Allow vendor change"
 msgstr ""
 
-#: src/YQPackageSelector.cc:858
+#: src/YQPackageSelector.cc:859
 msgid "E&xtras"
 msgstr ""
 
-#: src/YQPackageSelector.cc:860
+#: src/YQPackageSelector.cc:861
 msgid "Show &Products"
 msgstr ""
 
-#: src/YQPackageSelector.cc:861
+#: src/YQPackageSelector.cc:862
 msgid "Show P&ackage Changes"
 msgstr ""
 
-#: src/YQPackageSelector.cc:862
+#: src/YQPackageSelector.cc:863
 msgid "Show &History"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. Translators: This is about packages ending in "-debugsource", so don't translate that "-debugsource"!
-#: src/YQPackageSelector.cc:877
+#: src/YQPackageSelector.cc:878
 msgid "Install All Matching -debug&source Packages"
 msgstr ""
 
-#: src/YQPackageSelector.cc:882
+#: src/YQPackageSelector.cc:883
 msgid "Generate Dependency Resolver &Test Case"
 msgstr ""
 
-#: src/YQPackageSelector.cc:902
+#: src/YQPackageSelector.cc:903
 msgid "&Help"
 msgstr ""
 
 #. Note: The help functions and their texts are moved out
 #. to a separate source file YQPackageSelectorHelp.cc
 #. Menu entry for help overview
-#: src/YQPackageSelector.cc:908
+#: src/YQPackageSelector.cc:909
 msgid "&Overview"
 msgstr ""
 
 #. Menu entry for help about used symbols ( icons )
-#: src/YQPackageSelector.cc:911
+#: src/YQPackageSelector.cc:912
 msgid "&Symbols"
 msgstr ""
 
 #. Menu entry for keyboard help
-#: src/YQPackageSelector.cc:914
+#: src/YQPackageSelector.cc:915
 msgid "&Keys"
 msgstr ""
 
-#: src/YQPackageSelector.cc:1100
+#: src/YQPackageSelector.cc:1101
 msgid "All package dependencies are OK."
 msgstr ""
 
-#: src/YQPackageSelector.cc:1116
+#: src/YQPackageSelector.cc:1117
 msgid "P&atches"
 msgstr ""
 
 #. startsWith
 #. filter
-#: src/YQPackageSelector.cc:1178
+#: src/YQPackageSelector.cc:1179
 msgid "Save Package List"
 msgstr ""
 
@@ -265,56 +265,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 ""
 
 #. caption
-#: src/YQPackageSelector.cc:1218
+#: src/YQPackageSelector.cc:1219
 msgid "Error exporting package list to %1"
 msgstr ""
 
-#: src/YQPackageSelector.cc:1230
+#: src/YQPackageSelector.cc:1231
 msgid "Load Package List"
 msgstr ""
 
 #. caption
-#: src/YQPackageSelector.cc:1312
+#: src/YQPackageSelector.cc:1313
 msgid "Error loading package list from %1"
 msgstr ""
 
 #. caption
 #. Translators: %1 is the number of affected packages
-#: src/YQPackageSelector.cc:1414
+#: src/YQPackageSelector.cc:1415
 msgid "%1 packages will be updated"
 msgstr ""
 
-#: src/YQPackageSelector.cc:1415
+#: src/YQPackageSelector.cc:1416
 msgid "&Continue"
 msgstr ""
 
-#: src/YQPackageSelector.cc:1415
+#: src/YQPackageSelector.cc:1416
 msgid "C&ancel"
 msgstr ""
 
-#: 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 ""
 
 #. "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/am/po/qt.am.po
===================================================================
--- trunk/yast/am/po/qt.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/qt.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -58,14 +58,14 @@
 msgid "Stylesheet Editor"
 msgstr ""
 
-#: 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?"
 msgstr ""
 
 #. Popup dialog caption
-#: src/YQApplication.cc:653
+#: src/YQApplication.cc:656
 msgid "Unexpected Click"
 msgstr ""
 

Modified: trunk/yast/am/po/rdp.am.po
===================================================================
--- trunk/yast/am/po/rdp.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/rdp.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/rear.am.po
===================================================================
--- trunk/yast/am/po/rear.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/rear.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/registration.am.po
===================================================================
--- trunk/yast/am/po/registration.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/registration.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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-15 15:56+0200\n"
 "PO-Revision-Date: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -16,45 +16,84 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. popup heading (in bold)
-#: src/clients/discover_registration_services.rb:34
+#: src/clients/discover_registration_services.rb:35
 msgid "Local Registration Servers"
 msgstr ""
 
-#: 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
 msgid "No registration server selected."
 msgstr ""
 
+#. %s is the default SCC URL
+#: src/clients/discover_registration_services.rb:100
+msgid "SUSE Customer Center (%s)"
+msgstr ""
+
 #. popup message
-#: src/clients/inst_scc.rb:52
+#. popup message
+#: src/clients/inst_scc.rb:52 src/clients/scc_auto.rb:48
 msgid "Contacting the Registration Server"
 msgstr ""
 
 #. 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
 msgid "Registering %s ..."
 msgstr ""
 
-#. 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
+msgid "Updating to %s ..."
+msgstr ""
+
+#. 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
+msgid "Registration"
+msgstr ""
+
+#: src/clients/inst_scc.rb:261
+msgid "Registration is being updated..."
+msgstr ""
+
+#: src/clients/inst_scc.rb:262
+msgid "The previous registration is being updated."
+msgstr ""
+
+#. 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 ""
@@ -62,47 +101,49 @@
 #. 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
 msgid "Network Configuration..."
 msgstr ""
 
-#. 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"
+#: src/clients/inst_scc.rb:325
+#: src/lib/registration/ui/autoyast_config_dialog.rb:94
+msgid "&E-mail Address"
 msgstr ""
 
-#: 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
 msgid "Registration &Code"
 msgstr ""
 
-#: src/clients/inst_scc.rb:218
-msgid "&Skip Registration"
+#. button label
+#: src/clients/inst_scc.rb:332
+msgid "&Local Registration Server..."
 msgstr ""
 
-#. 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."
+#. button label
+#: src/clients/inst_scc.rb:335
+msgid "&Skip Registration"
 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
-msgid "Registration"
+#. 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 ""
 
 #. not set yet?
-#: src/clients/inst_scc.rb:259
+#: src/clients/inst_scc.rb:377
 msgid ""
 "Registration added some update repositories.\n"
 "\n"
@@ -110,55 +151,25 @@
 "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
-msgid "Details"
-msgstr ""
-
-#: 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..."
+#. 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
+msgid "Loading Available Extensions and Modules..."
 msgstr ""
 
 #. dialog title
-#: src/clients/inst_scc.rb:582
+#: src/clients/inst_scc.rb:458
 msgid "Register Extensions and Modules"
 msgstr ""
 
-#. dialog title
-#: src/clients/inst_scc.rb:595
-msgid "Extension and Module Registration Codes"
+#. help text
+#: src/clients/inst_scc.rb:462
+msgid "<p>Extensions and Modules are being registered.</p>"
 msgstr ""
 
 #. 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"
@@ -170,325 +181,613 @@
 msgstr ""
 
 #. button label
-#: src/clients/inst_scc.rb:636
+#: src/clients/inst_scc.rb:494
 msgid "Register Again"
 msgstr ""
 
 #. 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
+msgid "<p>The system is already registered.</p>"
+msgstr ""
+
+#: 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
-msgid "Registering Product..."
-msgid_plural "Registering Products..."
-msgstr[0] ""
-msgstr[1] ""
+#. 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
 msgid "Registration was successfull."
 msgstr ""
 
-#. ---------------------------------------------------------
-#: 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'?"
+#. 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
+msgid "Downloading SSL Certificate"
 msgstr ""
 
-#: src/clients/scc_auto.rb:301
-msgid "Name"
+#: src/clients/scc_auto.rb:263
+msgid "Importing SSL Certificate"
 msgstr ""
 
-#: src/clients/scc_auto.rb:301
-msgid "Registration Code"
+#. 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 ""
 
-#. TODO FIXME: add a help text
-#: src/clients/scc_auto.rb:312
-msgid "Register Optional Add-ons"
+#: src/data/registration/autoyast_summary.erb:9
+msgid "Run registration during autoinstallation"
 msgstr ""
 
-#: src/clients/scc_auto.rb:349
-msgid "Product Registration"
+#: src/data/registration/autoyast_summary.erb:10
+msgid "Skip registration during autoinstallation"
 msgstr ""
 
-#: src/clients/scc_auto.rb:351
-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>"
+#: src/data/registration/autoyast_summary.erb:15
+msgid "Registration Settings"
 msgstr ""
 
-#: src/clients/scc_auto.rb:356
-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>"
+#: src/data/registration/autoyast_summary.erb:17
+msgid "E-mail Address: %s"
 msgstr ""
 
-#: src/clients/scc_auto.rb:364
-msgid "Register the Product"
+#: src/data/registration/autoyast_summary.erb:19
+msgid "Registration Code is Configured"
 msgstr ""
 
-#: src/clients/scc_auto.rb:379
-msgid "Install Available Patches from Update Repositories"
+#: src/data/registration/autoyast_summary.erb:23
+msgid "Install Available Updates"
 msgstr ""
 
-#. Translators: Text for UI Label - capitalized
-#: src/clients/scc_auto.rb:387
-msgid "Server Settings"
+#: src/data/registration/autoyast_summary.erb:27
+msgid "Registration Server"
 msgstr ""
 
-#: src/clients/scc_auto.rb:391
-msgid "Find Registration Server Using SLP Discovery"
+#: src/data/registration/autoyast_summary.erb:30
+#: src/data/registration/autoyast_summary.erb:32
+msgid "Server URL: %s"
 msgstr ""
 
-#. Translators: Text for UI Label - capitalized
-#: src/clients/scc_auto.rb:396
-msgid "Use Specific Server URL Instead of the Default"
+#: src/data/registration/autoyast_summary.erb:32
+msgid "Use SLP discovery"
 msgstr ""
 
-#. Translators: Text for UI Label - capitalized
-#: src/clients/scc_auto.rb:403
-msgid "Optional Server Certificate"
+#: src/data/registration/autoyast_summary.erb:36
+msgid "SSL Server Certificate URL: %s"
 msgstr ""
 
-#: src/clients/scc_auto.rb:421
-msgid "Register Add-ons..."
+#: src/data/registration/autoyast_summary.erb:40
+msgid "SSL Certificate Fingerprint: %s"
 msgstr ""
 
-#. remove possible duplicates
-#: src/clients/scc_auto.rb:478
-msgid "SLP discovery failed, no server found"
+#: src/data/registration/autoyast_summary.erb:48
+msgid "Extensions and Modules"
 msgstr ""
 
-#. Error popup
-#: src/lib/registration/connect_helpers.rb:65
-msgid ""
-"Network is not configured, the registration server cannot be reached.\n"
-"Do you want to configure the network now?"
+#: src/data/registration/certificate_error.erb:6
+msgid "Secure Connection Error"
 msgstr ""
 
-#: src/lib/registration/connect_helpers.rb:71
-msgid "Network error, check the network configuration."
+#: src/data/registration/certificate_error.erb:10
+msgid "Details:"
 msgstr ""
 
-#. Error popup
-#: src/lib/registration/connect_helpers.rb:76
-msgid "Connection time out."
+#: src/data/registration/certificate_error.erb:14
+msgid "Failed Certificate Details"
 msgstr ""
 
-#. Error popup
-#: src/lib/registration/connect_helpers.rb:83
-msgid ""
-"The email address is not known or\n"
-"the registration code is not valid."
+#: src/data/registration/certificate_summary.erb:4
+#: src/lib/registration/ssl_certificate_details.rb:35
+msgid "Issued To"
 msgstr ""
 
-#: src/lib/registration/connect_helpers.rb:85
-msgid "Registration client error."
+#. 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 ""
 
-#: src/lib/registration/connect_helpers.rb:87
-msgid ""
-"Registration server error.\n"
-"Retry registration later."
+#. 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 ""
 
-#: src/lib/registration/connect_helpers.rb:89
-#: src/lib/registration/connect_helpers.rb:125
-msgid "Registration failed."
+#. 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 ""
 
-#. 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"
+#: src/data/registration/certificate_summary.erb:13
+#: src/lib/registration/ssl_certificate_details.rb:36
+msgid "Issued By"
 msgstr ""
 
-#. %s are error details
-#: src/lib/registration/connect_helpers.rb:142
-msgid "Details: %s"
+#: src/data/registration/certificate_summary.erb:22
+msgid "Validity"
 msgstr ""
 
-#. label follwed by a certificate description
-#: src/lib/registration/connect_helpers.rb:147
-msgid "Certificate:"
+#: src/data/registration/certificate_summary.erb:26
+msgid "Issued On: "
 msgstr ""
 
-#: src/lib/registration/connect_helpers.rb:151
-msgid "Issued To"
+#: src/data/registration/certificate_summary.erb:29
+msgid "WARNING: The certificate is not valid yet!"
 msgstr ""
 
-#: src/lib/registration/connect_helpers.rb:154
-msgid "Issued By"
+#: src/data/registration/certificate_summary.erb:32
+msgid "Expires On: "
 msgstr ""
 
-#: src/lib/registration/connect_helpers.rb:157
+#: src/data/registration/certificate_summary.erb:35
+msgid "WARNING: The certificate has expired!"
+msgstr ""
+
+#: src/data/registration/certificate_summary.erb:43
+msgid "Serial Number: "
+msgstr ""
+
+#: src/data/registration/certificate_summary.erb:44
+#: src/lib/registration/ssl_certificate_details.rb:36
 msgid "SHA1 Fingerprint: "
 msgstr ""
 
-#: src/lib/registration/connect_helpers.rb:159
+#: src/data/registration/certificate_summary.erb:46
+#: src/lib/registration/ssl_certificate_details.rb:38
 msgid "SHA256 Fingerprint: "
 msgstr ""
 
-#. label followed by the SSL certificate identification
-#: src/lib/registration/connect_helpers.rb:176
-msgid "Common Name (CN): "
+#. Error popup
+#: 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 ""
 
-#. label followed by the SSL certificate identification
-#: src/lib/registration/connect_helpers.rb:178
-msgid "Organization (O): "
+#: src/lib/registration/connect_helpers.rb:77
+msgid "Network error, check the network configuration."
 msgstr ""
 
-#. label followed by the SSL certificate identification
-#: src/lib/registration/connect_helpers.rb:180
-msgid "Organization Unit (OU): "
+#. Error popup
+#: src/lib/registration/connect_helpers.rb:82
+msgid "Connection time out."
 msgstr ""
 
+#. TRANSLATORS: additional hint for an error message
+#: src/lib/registration/connect_helpers.rb:90
+msgid "Check that this system is known to the registration server."
+msgstr ""
+
+#. TRANSLATORS: additional hint for an error message
+#: src/lib/registration/connect_helpers.rb: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
+msgid "Registration failed."
+msgstr ""
+
+#: src/lib/registration/connect_helpers.rb:115
+msgid "Registration client error."
+msgstr ""
+
+#: src/lib/registration/connect_helpers.rb:117
+msgid ""
+"Registration server error.\n"
+"Retry registration later."
+msgstr ""
+
+#. 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:184
+msgid "Details: %s"
+msgstr ""
+
 #. progress label
-#: src/lib/registration/connect_helpers.rb:194
+#: src/lib/registration/connect_helpers.rb:209
 msgid "Importing the SSL certificate"
 msgstr ""
 
-#: src/lib/registration/connect_helpers.rb:195
+#: src/lib/registration/connect_helpers.rb:210
 msgid "Importing '%s' certificate..."
 msgstr ""
 
-#. return the boot command line parameter
-#: src/lib/registration/helpers.rb:218
-msgid "Searching..."
+#. 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/helpers.rb:218
-msgid "Looking up local registration servers..."
+#. progress step title
+#: src/lib/registration/finish_dialog.rb:34
+msgid "Storing Registration Configuration..."
 msgstr ""
 
+#. 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
+msgid "SSL Certificate"
+msgstr ""
+
+#. 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 ""
+
+#. indent size used in summary text
+#: src/lib/registration/ssl_certificate_details.rb:35
+msgid "Certificate:"
+msgstr ""
+
 #. 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
 msgid "Unknown product"
 msgstr ""
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:139
+#: src/lib/registration/sw_mgmt.rb:152
 msgid "Saving repository configuration failed."
 msgstr ""
 
 #. # 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 ""
 
-#: 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
 msgid ""
 "Downloading the license for\n"
 "%s\n"
 "failed."
 msgstr ""
 
+#. %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
+msgid "Enter the registration code into the field below."
+msgid_plural "Enter the registration codes into the fields below."
+msgstr[0] ""
+msgstr[1] ""
+
+#. dialog title
+#: src/lib/registration/ui/addon_selection_dialog.rb:39
+msgid "Extension and Module Selection"
+msgstr ""
+
+#. help text (1/3)
+#: src/lib/registration/ui/addon_selection_dialog.rb:42
+msgid "<p>Here you can select available extensions and modules for yoursystem.</p>"
+msgstr ""
+
+#. 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
+msgid "Details"
+msgstr ""
+
+#: 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
+msgid "%s (not available)"
+msgstr ""
+
+#. 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
+msgid "Register Optional Extensions or Modules"
+msgstr ""
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:50
+msgid "Identifier"
+msgstr ""
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:51
+msgid "Version"
+msgstr ""
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:52
+msgid "Architecture"
+msgstr ""
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:53
+msgid "Release Type"
+msgstr ""
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:54
+msgid "Registration Code"
+msgstr ""
+
+#. button label
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:65
+msgid "Download Available Extensions..."
+msgstr ""
+
+#. disable download on a non-registered system
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:119
+msgid "Really delete '%s'?"
+msgstr ""
+
+#. replace the content
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:161
+msgid "Extension or Module &Identifier"
+msgstr ""
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:162
+msgid "&Version"
+msgstr ""
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:163
+msgid "&Architecture"
+msgstr ""
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:164
+msgid "&Release Type"
+msgstr ""
+
+#: src/lib/registration/ui/autoyast_config_dialog.rb:51
+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 ""
+
+#: src/lib/registration/ui/autoyast_config_dialog.rb:56
+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 ""
+
+#. FIXME the dialog should be created by external code before calling this
+#: src/lib/registration/ui/autoyast_config_dialog.rb:83
+msgid "Register the Product"
+msgstr ""
+
+#: src/lib/registration/ui/autoyast_config_dialog.rb:100
+msgid "Install Available Updates from Update Repositories"
+msgstr ""
+
+#. Translators: Text for UI Label - capitalized
+#: src/lib/registration/ui/autoyast_config_dialog.rb:114
+msgid "Server Settings"
+msgstr ""
+
+#: src/lib/registration/ui/autoyast_config_dialog.rb:118
+msgid "Find Registration Server Using SLP Discovery"
+msgstr ""
+
+#. 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
+msgid "Optional SSL Server Certificate URL"
+msgstr ""
+
+#. Translators: Text for UI Label - capitalized
+#: src/lib/registration/ui/autoyast_config_dialog.rb:139
+msgid "Optional SSL Server Certificate Fingerprint"
+msgstr ""
+
+#: src/lib/registration/ui/autoyast_config_dialog.rb:141
+msgid "none"
+msgstr ""
+
+#. Translators: Text for UI Label - capitalized
+#: src/lib/registration/ui/autoyast_config_dialog.rb:152
+msgid "SSL Certificate Fingerprint"
+msgstr ""
+
+#: src/lib/registration/ui/autoyast_config_dialog.rb:173
+msgid "Register Extensions or Modules..."
+msgstr ""
+
 #. SSL error message
-#: src/lib/registration/ui/import_certificate_dialog.rb:26
+#: src/lib/registration/ui/import_certificate_dialog.rb:25
+msgid "Certificate has expired"
+msgstr ""
+
+#. SSL error message
+#: src/lib/registration/ui/import_certificate_dialog.rb:27
 msgid "Self signed certificate"
 msgstr ""
 
 #. 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
+msgid "Invalid URL."
+msgstr ""
+
+#. input field label
+#: src/lib/registration/ui/local_server_dialog.rb:78
+msgid "&Local Registration Server URL"
+msgstr ""
+
+#. return the boot command line parameter
+#: src/lib/registration/url_helpers.rb:205
+msgid "Searching..."
+msgstr ""
+
+#: src/lib/registration/url_helpers.rb:205
+msgid "Looking up local registration servers..."
+msgstr ""

Modified: trunk/yast/am/po/reipl.am.po
===================================================================
--- trunk/yast/am/po/reipl.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/reipl.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -23,7 +23,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
 msgid ""
 "\n"
 "After shutdown, reload the system\n"
@@ -35,7 +35,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
 msgid ""
 "\n"
 "After shutdown, reload the system\n"
@@ -44,7 +44,7 @@
 "and LUN '%3'.\n"
 msgstr ""
 
-#: src/clients/reipl_bootloader_finish.rb:105
+#: src/clients/reipl_bootloader_finish.rb:97
 msgid ""
 "\n"
 "After shutdown, reload the system \n"
@@ -238,30 +238,30 @@
 
 #. 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
 msgid "Configured reipl methods"
 msgstr ""
 
-#: 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
 msgid "The method ccw is configured."
 msgstr ""
 
-#: src/modules/Reipl.rb:354
+#: src/modules/Reipl.rb:341
 msgid "The method ccw is not supported."
 msgstr ""
 
-#: 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
 msgid "The method fcp is configured."
 msgstr ""
 
-#: src/modules/Reipl.rb:367
+#: src/modules/Reipl.rb:354
 msgid "The method fcp is not supported."
 msgstr ""

Modified: trunk/yast/am/po/relocation-server.am.po
===================================================================
--- trunk/yast/am/po/relocation-server.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/relocation-server.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/s390.am.po
===================================================================
--- trunk/yast/am/po/s390.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/s390.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/samba-client.am.po
===================================================================
--- trunk/yast/am/po/samba-client.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/samba-client.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -188,6 +188,15 @@
 msgid "M&aximum"
 msgstr ""
 
+#. require_groups
+#: src/include/samba-client/dialogs.rb:256
+msgid "Allowed Group(s)"
+msgstr ""
+
+#: src/include/samba-client/dialogs.rb:261
+msgid "Group Name(s) or SID(s)"
+msgstr ""
+
 #. combobox label
 #: src/include/samba-client/dialogs.rb:271
 msgid "&Kerberos Method"
@@ -760,7 +769,10 @@
 msgstr ""
 
 #. 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 ""
 
@@ -830,12 +842,14 @@
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -858,6 +872,143 @@
 "Try again."
 msgstr ""
 
+#. Samba-client read dialog caption
+#: src/modules/Samba.rb:621
+msgid "Initializing Samba Client Configuration"
+msgstr ""
+
+#. translators: progress stage 1/2
+#: src/modules/Samba.rb:632
+msgid "Read the global Samba settings"
+msgstr ""
+
+#. translators: progress stage 2/2
+#: src/modules/Samba.rb:634
+msgid "Read the winbind status"
+msgstr ""
+
+#. translators: progress step 1/2
+#: src/modules/Samba.rb:638
+msgid "Reading the global Samba settings..."
+msgstr ""
+
+#. translators: progress step 2/2
+#: src/modules/Samba.rb:640
+msgid "Reading the winbind status..."
+msgstr ""
+
+#. Samba-client read dialog caption
+#: src/modules/Samba.rb:741
+msgid "Saving Samba Client Configuration"
+msgstr ""
+
+#. translators: write progress stage
+#: src/modules/Samba.rb:745
+msgid "Write the settings"
+msgstr ""
+
+#. translators: write progress stage
+#: src/modules/Samba.rb:748
+msgid "Disable Samba services"
+msgstr ""
+
+#. translators: write progress stage
+#: src/modules/Samba.rb:750
+msgid "Enable Samba services"
+msgstr ""
+
+#. translators: write progress step
+#: src/modules/Samba.rb:754
+msgid "Writing the settings..."
+msgstr ""
+
+#. translators: write progress step
+#: src/modules/Samba.rb:757
+msgid "Disabling Samba services..."
+msgstr ""
+
+#. translators: write progress step
+#: src/modules/Samba.rb:759
+msgid "Enabling Samba services..."
+msgstr ""
+
+#. write progress stage
+#: src/modules/Samba.rb:769
+msgid "Write Kerberos configuration"
+msgstr ""
+
+#. write progress step
+#: src/modules/Samba.rb:771
+msgid "Writing Kerberos configuration..."
+msgstr ""
+
+#. 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 ""
+
+#. translators: error message, do not change winbind
+#: src/modules/Samba.rb:838
+msgid "Cannot start winbind service."
+msgstr ""
+
+#. translators: error message, do not change winbind
+#: src/modules/Samba.rb:843
+msgid "Cannot start winbind daemon."
+msgstr ""
+
+#. translators: error message, do not change winbind
+#: src/modules/Samba.rb:849
+msgid "Cannot stop winbind service."
+msgstr ""
+
+#. translators: error message, do not change winbind
+#: src/modules/Samba.rb:854
+msgid "Cannot stop winbind daemon."
+msgstr ""
+
+#. translators: error message
+#: src/modules/Samba.rb:870
+msgid "Cannot write PAM settings."
+msgstr ""
+
+#. summary header
+#: src/modules/Samba.rb:1044
+msgid "Global Configuration"
+msgstr ""
+
+#. autoyast summary item: configured workgroup
+#: src/modules/Samba.rb:1051
+msgid "Workgroup or Domain: %1"
+msgstr ""
+
+#. autoyast summary item
+#: src/modules/Samba.rb:1060
+msgid "Create Home Directory on Login"
+msgstr ""
+
+#. autoyast summary item
+#: src/modules/Samba.rb:1067
+msgid "Offline Authentication Enabled"
+msgstr ""
+
+#. autoyast summary item
+#: src/modules/Samba.rb:1075
+msgid "Maximum Number of Shares: %1"
+msgstr ""
+
+#. summary item: configured workgroup
+#: src/modules/Samba.rb:1096
+msgid "<p><b>Workgroup or Domain</b>: %1</p>"
+msgstr ""
+
+#. summary item: authentication using winbind
+#: src/modules/Samba.rb:1101
+msgid "<p><b>Authentication with SMB</b>: %1</p>"
+msgstr ""
+
 #: src/modules/SambaNetJoin.pm:328
 msgid "Unable to proceed with join: Inconsistent cluster state"
 msgstr ""

Modified: trunk/yast/am/po/samba-server.am.po
===================================================================
--- trunk/yast/am/po/samba-server.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/samba-server.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/samba-users.am.po
===================================================================
--- trunk/yast/am/po/samba-users.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/samba-users.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/scanner.am.po
===================================================================
--- trunk/yast/am/po/scanner.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/scanner.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/security.am.po
===================================================================
--- trunk/yast/am/po/security.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/security.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/services-manager.am.po
===================================================================
--- trunk/yast/am/po/services-manager.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/services-manager.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -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"
@@ -16,12 +16,192 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: src/clients/default_target_finish.rb:33
+msgid "Saving default systemd target..."
+msgstr ""
+
+#: 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
+msgid "&Default systemd target"
+msgstr ""
+
+#: src/clients/default_target_proposal.rb:52
+msgid "Default systemd target"
+msgstr ""
+
+#. create the proposal dialog and get the sequence symbol from block
+#: src/clients/default_target_proposal.rb:116
+msgid "Set Default Systemd Target"
+msgstr ""
+
+#: src/clients/default_target_proposal.rb:134
+msgid "Selecting the Default Systemd Target"
+msgstr ""
+
+#: 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
+msgid "Available Targets"
+msgstr ""
+
+#. Check if the user forced a particular target before; if he did and the
+#. autodetection recommends a different one now, warn the user about this
+#. and keep the default target unchanged.
+#: src/clients/default_target_proposal.rb:219
+msgid "The installer is recommending you the default target '%s' "
+msgstr ""
+
+#: src/clients/default_target_proposal.rb:231
+msgid "X11 packages have been selected for installation"
+msgstr ""
+
+#: 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
+msgid "X11 packages have not been selected for installation"
+msgstr ""
+
+#: 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 ""
+
+#: src/clients/services-manager.rb:76 src/clients/services.rb:76
+msgid "Writing the configuration failed:\n"
+msgstr ""
+
+#. Fills the dialog contents
+#. Fills the dialog contents
+#: src/clients/services-manager.rb:91 src/clients/services.rb:91
+msgid "Default System &Target"
+msgstr ""
+
+#: src/clients/services-manager.rb:99 src/clients/services.rb:99
+msgid "Service"
+msgstr ""
+
+#: 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 ""
+
+#. 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 ""
+
+#: src/clients/services-manager.rb:102 src/clients/services.rb:102
+msgid "Description"
+msgstr ""
+
+#: src/clients/services-manager.rb:107 src/clients/services.rb:107
+msgid "&Start/Stop"
+msgstr ""
+
+#: src/clients/services-manager.rb:109 src/clients/services.rb:109
+msgid "&Enable/Disable"
+msgstr ""
+
+#: src/clients/services-manager.rb:111 src/clients/services.rb:111
+msgid "Show &Details"
+msgstr ""
+
+#: src/clients/services-manager.rb:114 src/clients/services.rb:114
+#: src/data/services-manager/autoyast_summary.erb:5
+msgid "Services Manager"
+msgstr ""
+
+#. Redraws the services dialog
+#. Redraws the services dialog
+#: src/clients/services-manager.rb:126 src/clients/services.rb:126
+msgid "Reading services status..."
+msgstr ""
+
+#: 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 ""
+
+#: src/clients/services-manager.rb:131 src/clients/services-manager.rb:156
+#: src/clients/services.rb:131 src/clients/services.rb:156
+msgid "Inactive"
+msgstr ""
+
+#. 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
+msgid "Service %{service} Full Info"
+msgstr ""
+
+#. TODO implement behaviour if force_reset parameter provided
 #: src/clients/services_proposal.rb:52
 msgid "&Services"
 msgstr ""
 
 #: src/clients/services_proposal.rb:53
+#: src/data/services-manager/autoyast_summary.erb:15
 msgid "Services"
 msgstr ""
 
@@ -61,3 +241,63 @@
 #: src/clients/services_proposal.rb:283
 msgid "Cannot enable service %1"
 msgstr ""
+
+#: src/data/services-manager/autoyast_summary.erb:6
+msgid "Default Target"
+msgstr ""
+
+#. 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 ""
+
+#. 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
+msgid "Could not %{change} %{service}. "
+msgstr ""
+
+#. Default systemd target (previously: runlevel 5) option #1
+#: src/modules/services_manager_target.rb:22
+msgid "Graphical mode"
+msgstr ""
+
+#. Default systemd target (previously: runlevel 3) option #2
+#: src/modules/services_manager_target.rb:24
+msgid "Text mode"
+msgstr ""
+
+#. Systemd targets
+#: src/modules/services_manager_target.rb:27
+msgid "Graphical Interface"
+msgstr ""
+
+#: src/modules/services_manager_target.rb:28
+msgid "Emergency Mode"
+msgstr ""
+
+#: src/modules/services_manager_target.rb:29
+msgid "Switch Root"
+msgstr ""
+
+#: src/modules/services_manager_target.rb:30
+msgid "Initrd Default Target"
+msgstr ""
+
+#: src/modules/services_manager_target.rb:31
+msgid "Multi-User System"
+msgstr ""
+
+#: src/modules/services_manager_target.rb:32
+msgid "Rescue Mode"
+msgstr ""

Modified: trunk/yast/am/po/slp-server.am.po
===================================================================
--- trunk/yast/am/po/slp-server.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/slp-server.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/snapper.am.po
===================================================================
--- trunk/yast/am/po/snapper.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/snapper.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -22,258 +22,258 @@
 
 #. 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 ""
 
 #. 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
 msgid "User data"
 msgstr ""
 
 #. 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
 msgid "Cleanup algorithm"
 msgstr ""
 
 #. 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
 msgid "Pre (%1)"
 msgstr ""
 
 #. label
-#: src/include/snapper/dialogs.rb:167
+#: src/include/snapper/dialogs.rb:173
 msgid "Post (%1)"
 msgstr ""
 
 #. popup label
-#: src/include/snapper/dialogs.rb:243
+#: src/include/snapper/dialogs.rb:249
 msgid "Create New Snapshot"
 msgstr ""
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:256
+#: src/include/snapper/dialogs.rb:262
 msgid "Single snapshot"
 msgstr ""
 
 #. 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 ""
 
 #. 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
 msgid "Really delete snapshot '%1'?"
 msgstr ""
 
 #. 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
 msgid "Single"
 msgstr ""
 
 #. 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
 msgid "Reading list of snapshots..."
 msgstr ""
 
 #. combo box label
-#: src/include/snapper/dialogs.rb:477
+#: src/include/snapper/dialogs.rb:475
 msgid "Current Configuration"
 msgstr ""
 
 #. table header
-#: src/include/snapper/dialogs.rb:488
+#: src/include/snapper/dialogs.rb:486
 msgid "ID"
 msgstr ""
 
-#: src/include/snapper/dialogs.rb:489
+#: src/include/snapper/dialogs.rb:487
 msgid "Type"
 msgstr ""
 
-#: src/include/snapper/dialogs.rb:490
+#: src/include/snapper/dialogs.rb:488
 msgid "Start Date"
 msgstr ""
 
-#: src/include/snapper/dialogs.rb:491
+#: src/include/snapper/dialogs.rb:489
 msgid "End Date"
 msgstr ""
 
-#: src/include/snapper/dialogs.rb:493
+#: src/include/snapper/dialogs.rb:491
 msgid "User Data"
 msgstr ""
 
 #. button label
-#: src/include/snapper/dialogs.rb:499
+#: src/include/snapper/dialogs.rb:497
 msgid "Show Changes"
 msgstr ""
 
 #. button label
-#: src/include/snapper/dialogs.rb:502
+#: src/include/snapper/dialogs.rb:500
 msgid "Modify"
 msgstr ""
 
 #. 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
 msgid "Selected Snapshot Overview"
 msgstr ""
 
 #. '%1: %2' means 'ID: description', adapt the order if necessary
-#: src/include/snapper/dialogs.rb:636
+#: src/include/snapper/dialogs.rb:626
 msgid "%1: %2"
 msgstr ""
 
 #. busy popup message
-#: src/include/snapper/dialogs.rb:655
+#: src/include/snapper/dialogs.rb:645
 msgid "Calculating changed files..."
 msgstr ""
 
 #. busy popup message
-#: src/include/snapper/dialogs.rb:752
+#: src/include/snapper/dialogs.rb:742
 msgid "Calculating file modifications..."
 msgstr ""
 
 #. 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
 msgid "File was removed."
 msgstr ""
 
 #. 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
 msgid "File does not exist in either snapshot."
 msgstr ""
 
 #. label
-#: src/include/snapper/dialogs.rb:781
+#: src/include/snapper/dialogs.rb:771
 msgid "File content was modified."
 msgstr ""
 
 #. 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
 msgid "R&estore from First"
 msgstr ""
 
 #. button label
-#: src/include/snapper/dialogs.rb:859
+#: src/include/snapper/dialogs.rb:849
 msgid "Restore"
 msgstr ""
 
-#: src/include/snapper/dialogs.rb:882
+#: src/include/snapper/dialogs.rb:872
 msgid "Res&tore from Second"
 msgstr ""
 
 #. 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 ""
 
 #. button label
-#: src/include/snapper/dialogs.rb:1122
+#: src/include/snapper/dialogs.rb:1112
 msgid "Restore Selected"
 msgstr ""
 
 #. yes/no question, %1 is file name, %2 is number
-#: src/include/snapper/dialogs.rb:1196
+#: src/include/snapper/dialogs.rb:1186
 msgid ""
 "Do you want to delete the file\n"
 "\n"
@@ -284,7 +284,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"
@@ -294,17 +294,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 ""
 
 #. 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/am/po/sound.am.po
===================================================================
--- trunk/yast/am/po/sound.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/sound.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/squid.am.po
===================================================================
--- trunk/yast/am/po/squid.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/squid.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/sshd.am.po
===================================================================
--- trunk/yast/am/po/sshd.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/sshd.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/storage.am.po
===================================================================
--- trunk/yast/am/po/storage.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/storage.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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-09-29 18:07+0200\n"
 "PO-Revision-Date: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -80,7 +80,7 @@
 msgstr ""
 
 #. 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"
@@ -91,13 +91,13 @@
 #. 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
 msgid "Edit Proposal Settings"
 msgstr ""
 
 #. 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"
@@ -106,7 +106,7 @@
 
 #. help text continued
 #. %1 is replaced by button text
-#: src/clients/inst_disk_proposal.rb:169
+#: src/clients/inst_disk_proposal.rb:175
 msgid ""
 "<p>\n"
 "To make only small adjustments to the proposed\n"
@@ -116,7 +116,7 @@
 msgstr ""
 
 #. help text continued
-#: src/clients/inst_disk_proposal.rb:182
+#: src/clients/inst_disk_proposal.rb:188
 msgid ""
 "<p>\n"
 "If the suggestion does not fit your needs, create\n"
@@ -129,15 +129,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 ""
 
-#: 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?"
@@ -753,7 +759,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 ""
 
@@ -771,7 +777,7 @@
 msgstr ""
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:253
+#: src/include/partitioning/custom_part_check_generated.rb:246
 msgid ""
 "You have not assigned a root partition for\n"
 "installation. This does not work. Assign the root mount point \"/\" to a\n"
@@ -781,7 +787,7 @@
 msgstr ""
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:266
+#: src/include/partitioning/custom_part_check_generated.rb:259
 msgid ""
 "You tried to mount a FAT partition to one of the following mount\n"
 "points: /, /usr, /home, /opt or /var. This will very likely cause problems.\n"
@@ -791,7 +797,7 @@
 msgstr ""
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:279
+#: src/include/partitioning/custom_part_check_generated.rb:272
 msgid ""
 "You tried to mount a FAT partition to the\n"
 "mount point /boot. This will very likely cause problems. Use a Linux file\n"
@@ -801,7 +807,7 @@
 msgstr ""
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:293
+#: src/include/partitioning/custom_part_check_generated.rb:286
 msgid ""
 "You have mounted a partition with Btrfs to the\n"
 "mount point /boot. This will very likely cause problems. Use a Linux file\n"
@@ -811,7 +817,7 @@
 msgstr ""
 
 #. popup text, %1 is a number
-#: src/include/partitioning/custom_part_check_generated.rb:308
+#: src/include/partitioning/custom_part_check_generated.rb:301
 msgid ""
 "Warning:\n"
 "Your boot partition ends above cylinder %1.\n"
@@ -824,7 +830,7 @@
 msgstr ""
 
 #. popup text, %1 is a size
-#: src/include/partitioning/custom_part_check_generated.rb:328
+#: src/include/partitioning/custom_part_check_generated.rb:321
 msgid ""
 "Warning:\n"
 "Your boot partition is smaller than %1.\n"
@@ -834,7 +840,7 @@
 msgstr ""
 
 #. /////////////////////////// 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"
@@ -845,7 +851,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
 msgid ""
 "Warning: There is no partition mounted as /boot.\n"
 "To boot from your hard disk, a small /boot partition\n"
@@ -857,7 +863,7 @@
 msgstr ""
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:385
+#: src/include/partitioning/custom_part_check_generated.rb:378
 msgid ""
 "Warning: According to your setup, you intend to\n"
 "boot your machine from the root partition (/), which, unfortunately,\n"
@@ -869,7 +875,7 @@
 "Really use this setup?\n"
 msgstr ""
 
-#: 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"
@@ -878,7 +884,7 @@
 msgstr ""
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:422
+#: src/include/partitioning/custom_part_check_generated.rb:415
 msgid ""
 "Warning: With your current setup, your %1\n"
 "installation might not be directly bootable, because\n"
@@ -889,22 +895,8 @@
 msgstr ""
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:443
+#: src/include/partitioning/custom_part_check_generated.rb:433
 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 ""
-
-#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:464
-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"
@@ -918,7 +910,7 @@
 msgstr ""
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:486
+#: src/include/partitioning/custom_part_check_generated.rb:455
 msgid ""
 "Warning: With your current setup, your %2 installation will\n"
 "encounter problems when booting, because you have no \n"
@@ -933,12 +925,12 @@
 msgstr ""
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:509
+#: src/include/partitioning/custom_part_check_generated.rb:478
 msgid "Really use this setup?"
 msgstr ""
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:517
+#: src/include/partitioning/custom_part_check_generated.rb:486
 msgid ""
 "\n"
 "You have not assigned a swap partition. In most cases, we highly recommend \n"
@@ -951,7 +943,7 @@
 msgstr ""
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:533
+#: src/include/partitioning/custom_part_check_generated.rb:502
 msgid ""
 "\n"
 "You chose to install onto an existing partition that will not be\n"
@@ -960,7 +952,7 @@
 msgstr ""
 
 #. 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"
@@ -969,7 +961,7 @@
 msgstr ""
 
 #. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:547
+#: src/include/partitioning/custom_part_check_generated.rb:516
 msgid ""
 "If in doubt, better go back and mark this partition for\n"
 "formatting, especially if it is assigned to one of the standard mount points\n"
@@ -977,7 +969,7 @@
 msgstr ""
 
 #. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:553
+#: src/include/partitioning/custom_part_check_generated.rb:522
 msgid ""
 "If you decide to format the partition, all data on it will be lost.\n"
 "\n"
@@ -985,53 +977,53 @@
 msgstr ""
 
 #. 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"
 msgstr ""
 
 #. 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"
 msgstr ""
 
 #. 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"
 msgstr ""
 
 #. 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"
 msgstr ""
 
 #. 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"
 msgstr ""
 
-#: src/include/partitioning/custom_part_check_generated.rb:685
+#: src/include/partitioning/custom_part_check_generated.rb:654
 msgid "It cannot be deleted while mounted."
 msgstr ""
 
 #. 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
 msgid ""
 "The device (%1) cannot be removed since it is a logical partition and \n"
 "another logical partition with a higher number is in use.\n"
 msgstr ""
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:797
+#: src/include/partitioning/custom_part_check_generated.rb:766
 msgid ""
 "The selected extended partition contains partitions which are currently mounted:\n"
 "%1\n"
@@ -1040,7 +1032,7 @@
 msgstr ""
 
 #. 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"
@@ -1050,7 +1042,7 @@
 msgstr ""
 
 #. 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"
@@ -1060,7 +1052,7 @@
 msgstr ""
 
 #. 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"
@@ -1075,13 +1067,13 @@
 
 #. 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
 msgid "Do not forget what you enter here!"
 msgstr ""
 
 #: src/include/partitioning/custom_part_dialogs.rb:79
-#: src/include/partitioning/ep-dialogs.rb:675
+#: src/include/partitioning/ep-dialogs.rb:771
 msgid "Empty password allowed."
 msgstr ""
 
@@ -1108,7 +1100,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
 msgid "&Enter a Password for your File System:"
 msgstr ""
 
@@ -1119,7 +1111,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
 msgid "Reenter the Password for &Verification:"
 msgstr ""
 
@@ -1139,7 +1131,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"
@@ -1148,7 +1140,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"
@@ -1460,7 +1452,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 ""
 
@@ -1471,21 +1463,21 @@
 msgid "Subvolume Handling"
 msgstr ""
 
-#: src/include/partitioning/custom_part_dialogs.rb:1721
+#: src/include/partitioning/custom_part_dialogs.rb:1724
 msgid "Empty subvolume name not allowed."
 msgstr ""
 
-#: 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
 msgid "Subvolume name %1 already exists."
 msgstr ""
 
-#: 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 ""
 
@@ -1517,7 +1509,7 @@
 
 #. helptext
 #: src/include/partitioning/custom_part_helptexts.rb:87
-#: src/include/partitioning/ep-dialogs.rb:612
+#: src/include/partitioning/ep-dialogs.rb:708
 msgid ""
 "<p>\n"
 "This mount point corresponds to a temporary filesystem like /tmp or /var/tmp.\n"
@@ -1530,7 +1522,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"
@@ -1543,7 +1535,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"
@@ -1565,7 +1557,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"
@@ -1739,12 +1731,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."
@@ -1752,31 +1744,31 @@
 
 #. 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
 msgid "Unmount"
 msgstr ""
 
-#: 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
 msgid "It is not possible to shrink the file system while it is mounted."
 msgstr ""
 
-#: src/include/partitioning/custom_part_lib.rb:1038
+#: src/include/partitioning/custom_part_lib.rb:1045
 msgid "It is not possible to extend the file system while it is mounted."
 msgstr ""
 
-#: src/include/partitioning/custom_part_lib.rb:1049
+#: src/include/partitioning/custom_part_lib.rb:1056
 msgid "It is not possible to resize the file system while it is mounted."
 msgstr ""
 
 #. push button text
-#: src/include/partitioning/ep-all.rb:78
+#: src/include/partitioning/ep-all.rb:80
 msgid "Rescan Devices"
 msgstr ""
 
@@ -1786,54 +1778,59 @@
 msgstr ""
 
 #. menu entry text
-#: src/include/partitioning/ep-all.rb:100
+#: src/include/partitioning/ep-all.rb:94
 msgid "Provide Crypt &Passwords..."
 msgstr ""
 
 #. menu entry text
-#: src/include/partitioning/ep-all.rb:112
+#: src/include/partitioning/ep-all.rb:99
 msgid "Configure &iSCSI..."
 msgstr ""
 
 #. menu entry text
-#: src/include/partitioning/ep-all.rb:124
+#: src/include/partitioning/ep-all.rb:104
+msgid "Configure &FCoE..."
+msgstr ""
+
+#. menu entry text
+#: src/include/partitioning/ep-all.rb:109
 msgid "Configure &Multipath..."
 msgstr ""
 
 #. menu entry text
-#: src/include/partitioning/ep-all.rb:133
+#: src/include/partitioning/ep-all.rb:114
 msgid "Configure &DASD..."
 msgstr ""
 
 #. menu entry text
-#: src/include/partitioning/ep-all.rb:141
+#: src/include/partitioning/ep-all.rb:119
 msgid "Configure &zFCP..."
 msgstr ""
 
 #. menu entry text
-#: src/include/partitioning/ep-all.rb:149
+#: src/include/partitioning/ep-all.rb:124
 msgid "Configure &XPRAM..."
 msgstr ""
 
 #. menu button text
-#: src/include/partitioning/ep-all.rb:157
+#: src/include/partitioning/ep-all.rb:129
 msgid "Configure..."
 msgstr ""
 
 #. dialog heading, %1 is replaced with hostname
-#: src/include/partitioning/ep-all.rb:169
+#: src/include/partitioning/ep-all.rb:140
 msgid "Available Storage on %1"
 msgstr ""
 
 #. 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"
@@ -1841,51 +1838,58 @@
 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
 msgid ""
 "Rescaning disks cancels all current changes.\n"
 "Really rescan disks?"
 msgstr ""
 
 #. popup text
-#: src/include/partitioning/ep-all.rb:280
+#: src/include/partitioning/ep-all.rb:251
 msgid ""
 "Calling iSCSI configuration cancels all current changes.\n"
 "Really call iSCSI configuration?"
 msgstr ""
 
 #. popup text
+#: src/include/partitioning/ep-all.rb:260
+msgid ""
+"Calling FCoE configuration cancels all current changes.\n"
+"Really call FCoE configuration?"
+msgstr ""
+
 #. 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
 msgid ""
 "Calling multipath configuration cancels all current changes.\n"
 "Really call multipath configuration?\n"
 msgstr ""
 
 #. popup text
-#: src/include/partitioning/ep-all.rb:320
+#: src/include/partitioning/ep-all.rb:300
 msgid ""
 "Calling DASD configuration cancels all current changes.\n"
 "Really call DASD configuration?"
 msgstr ""
 
 #. popup text
-#: src/include/partitioning/ep-all.rb:329
+#: src/include/partitioning/ep-all.rb:309
 msgid ""
 "Calling zFCP configuration cancels all current changes.\n"
 "Really call zFCP configuration?"
 msgstr ""
 
 #. popup text
-#: src/include/partitioning/ep-all.rb:338
+#: src/include/partitioning/ep-all.rb:318
 msgid ""
 "Calling XPRAM configuration cancels all current changes.\n"
 "Really call XPRAM configuration?"
@@ -2150,14 +2154,44 @@
 msgstr ""
 
 #. helptext
-#: src/include/partitioning/ep-dialogs.rb:38
+#: src/include/partitioning/ep-dialogs.rb:39
+msgid "<p>Choose the role of the device.</p>"
+msgstr ""
+
+#. radio button text
+#: src/include/partitioning/ep-dialogs.rb:55
+msgid "Operating System"
+msgstr ""
+
+#. radio button text
+#: src/include/partitioning/ep-dialogs.rb:60
+msgid "Data and ISV Applications"
+msgstr ""
+
+#. 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
+msgid "Role"
+msgstr ""
+
+#. helptext
+#: src/include/partitioning/ep-dialogs.rb:107
 msgid ""
 "<p>First, choose whether the partition should be\n"
 "formatted and the desired file system type.</p>"
 msgstr ""
 
 #. 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"
@@ -2165,54 +2199,54 @@
 msgstr ""
 
 #. helptext
-#: src/include/partitioning/ep-dialogs.rb:55
+#: src/include/partitioning/ep-dialogs.rb:124
 msgid ""
 "<p>Then, choose whether the partition should\n"
 "be mounted and enter the mount point (/, /boot, /home, /var, etc.).</p>"
 msgstr ""
 
 #. set globals
-#: src/include/partitioning/ep-dialogs.rb:213
+#: src/include/partitioning/ep-dialogs.rb:309
 msgid "Formatting Options"
 msgstr ""
 
-#: src/include/partitioning/ep-dialogs.rb:221
+#: src/include/partitioning/ep-dialogs.rb:317
 msgid "Format partition"
 msgstr ""
 
-#: src/include/partitioning/ep-dialogs.rb:232
+#: src/include/partitioning/ep-dialogs.rb:328
 msgid "Do not format partition"
 msgstr ""
 
-#: src/include/partitioning/ep-dialogs.rb:248
+#: src/include/partitioning/ep-dialogs.rb:344
 msgid "Do not mount partition"
 msgstr ""
 
-#: src/include/partitioning/ep-dialogs.rb:267
+#: src/include/partitioning/ep-dialogs.rb:363
 msgid "Mounting Options"
 msgstr ""
 
-#: src/include/partitioning/ep-dialogs.rb:275
+#: src/include/partitioning/ep-dialogs.rb:371
 msgid "Mount partition"
 msgstr ""
 
 #. 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 ""
 
 #. button text
-#: src/include/partitioning/ep-dialogs.rb:288
+#: src/include/partitioning/ep-dialogs.rb:384
 msgid "Fs&tab Options..."
 msgstr ""
 
 #. error popup
-#: src/include/partitioning/ep-dialogs.rb:462
+#: src/include/partitioning/ep-dialogs.rb:558
 msgid "Crypt files must be encrypted."
 msgstr ""
 
 #. error popup
-#: src/include/partitioning/ep-dialogs.rb:473
+#: src/include/partitioning/ep-dialogs.rb:569
 msgid ""
 "You chose to create the crypt file, but did not specify\n"
 "that it should be formatted. This does not make sense.\n"
@@ -2221,17 +2255,17 @@
 msgstr ""
 
 #. error popup
-#: src/include/partitioning/ep-dialogs.rb:489
+#: src/include/partitioning/ep-dialogs.rb:585
 msgid "Crypt files require a mount point."
 msgstr ""
 
 #. error popup
-#: src/include/partitioning/ep-dialogs.rb:503
+#: src/include/partitioning/ep-dialogs.rb:599
 msgid "Tmpfs requires a mount point."
 msgstr ""
 
 #. helptext
-#: src/include/partitioning/ep-dialogs.rb:587
+#: src/include/partitioning/ep-dialogs.rb:683
 msgid ""
 "<p>\n"
 "Keep in mind that this file system is only protected when it is not\n"
@@ -2241,7 +2275,7 @@
 msgstr ""
 
 #. 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"
@@ -2250,56 +2284,56 @@
 "</p>\n"
 msgstr ""
 
-#: src/include/partitioning/ep-dialogs.rb:670
+#: src/include/partitioning/ep-dialogs.rb:766
 msgid "All data stored on the volume will be lost!"
 msgstr ""
 
-#: src/include/partitioning/ep-dialogs.rb:693
+#: src/include/partitioning/ep-dialogs.rb:789
 msgid "Password"
 msgstr ""
 
 #. 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"
 "on this partition does not support resizing.\n"
 msgstr ""
 
-#: src/include/partitioning/ep-dialogs.rb:819
+#: src/include/partitioning/ep-dialogs.rb:915
 msgid ""
 "It is not possible to check whether a NTFS\n"
 "can be resized while it is mounted."
 msgstr ""
 
 #. FIXME: Really?
-#: src/include/partitioning/ep-dialogs.rb:838
+#: src/include/partitioning/ep-dialogs.rb:934
 msgid ""
 "Partition %1 cannot be resized\n"
 "because the filesystem seems to be inconsistent.\n"
 msgstr ""
 
 #. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:865
+#: src/include/partitioning/ep-dialogs.rb:961
 msgid "Resize Partition %1"
 msgstr ""
 
 #. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:886
+#: src/include/partitioning/ep-dialogs.rb:982
 msgid "Resize Logical Volume %1"
 msgstr ""
 
 #. size_k + min_size_k could be > max_size_k
-#: src/include/partitioning/ep-dialogs.rb:918
+#: src/include/partitioning/ep-dialogs.rb:1014
 msgid "Current size: %1"
 msgstr ""
 
-#: src/include/partitioning/ep-dialogs.rb:930
+#: src/include/partitioning/ep-dialogs.rb:1026
 msgid "Currently used: %1"
 msgstr ""
 
@@ -2307,8 +2341,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
@@ -2320,33 +2354,33 @@
 
 #. 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
 msgid "Maximum Size (%1)"
 msgstr ""
 
 #. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:963
+#: src/include/partitioning/ep-dialogs.rb:1059
 msgid "Minimum Size (%1)"
 msgstr ""
 
 #. 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
 msgid "Custom Size"
 msgstr ""
 
 #. help text
-#: src/include/partitioning/ep-dialogs.rb:1006
+#: src/include/partitioning/ep-dialogs.rb:1102
 msgid "<p>Choose new size.</p>"
 msgstr ""
 
 #. 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
 msgid "The size entered is invalid. Enter a size between %1 and %2."
@@ -2356,7 +2390,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"
@@ -2365,12 +2399,12 @@
 msgstr ""
 
 #. label for log view
-#: src/include/partitioning/ep-dialogs.rb:1176
+#: src/include/partitioning/ep-dialogs.rb:1272
 msgid "Output of %1"
 msgstr ""
 
 #. popup text
-#: src/include/partitioning/ep-dialogs.rb:1203
+#: src/include/partitioning/ep-dialogs.rb:1299
 msgid "Rescanning disks..."
 msgstr ""
 
@@ -2553,56 +2587,56 @@
 msgstr ""
 
 #. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:537
+#: src/include/partitioning/ep-hd-dialogs.rb:548
 msgid "Add Partition on %1"
 msgstr ""
 
 #. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:583
+#: src/include/partitioning/ep-hd-dialogs.rb:594
 msgid "Edit Partition %1"
 msgstr ""
 
 #. 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
 msgid "No space to moved partition %1."
 msgstr ""
 
 #. 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
 msgid "Move partition %1 forward?"
 msgstr ""
 
 #. 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
 msgid "Move partition %1?"
 msgstr ""
 
 #. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:656
+#: src/include/partitioning/ep-hd-dialogs.rb:667
 msgid "Forward"
 msgstr ""
 
 #. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:658
+#: src/include/partitioning/ep-hd-dialogs.rb:669
 msgid "Backward"
 msgstr ""
 
-#: src/include/partitioning/ep-hd-dialogs.rb:714
+#: src/include/partitioning/ep-hd-dialogs.rb:725
 msgid "Confirm Deleting of All Partitions"
 msgstr ""
 
-#: 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
 msgid "Really delete all partitions on \"%1\"?"
 msgstr ""
 
@@ -2615,7 +2649,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 ""
 
@@ -3468,12 +3502,12 @@
 msgstr ""
 
 #. dialog title, %1 is a volume group
-#: src/include/partitioning/ep-lvm-dialogs.rb:1017
+#: src/include/partitioning/ep-lvm-dialogs.rb:1028
 msgid "Add Logical Volume on %1"
 msgstr ""
 
 #. 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
 msgid "Edit Logical Volume %1 on %2"
 msgstr ""
 
@@ -3669,7 +3703,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 ""
 
@@ -3867,17 +3901,17 @@
 msgstr ""
 
 #. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:631
+#: src/include/partitioning/ep-raid-dialogs.rb:642
 msgid "Add RAID %1"
 msgstr ""
 
 #. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:665
+#: src/include/partitioning/ep-raid-dialogs.rb:676
 msgid "Resize RAID %1"
 msgstr ""
 
 #. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:711
+#: src/include/partitioning/ep-raid-dialogs.rb:722
 msgid "Edit RAID %1"
 msgstr ""
 
@@ -3978,115 +4012,123 @@
 
 #. 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 ""
 
 #. 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
 msgid "UUID"
 msgstr ""
 
 #. 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
 msgid "Mount by"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. list entry
-#: src/include/partitioning/ep-settings.rb:45
+#: src/include/partitioning/ep-settings.rb:47
 msgid "Cylinder information"
 msgstr ""
 
 #. list entry
-#: src/include/partitioning/ep-settings.rb:50
+#: src/include/partitioning/ep-settings.rb:52
 msgid "Fibre Channel information"
 msgstr ""
 
 #. list entry
-#: src/include/partitioning/ep-settings.rb:54
+#: src/include/partitioning/ep-settings.rb:56
 msgid "Encryption"
 msgstr ""
 
 #. 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 ""
 
 #. combo box entry
-#: src/include/partitioning/ep-settings.rb:61
+#: src/include/partitioning/ep-settings.rb:63
 msgid "Volume Label"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
+#. combo box entry
+#: src/include/partitioning/ep-settings.rb:74
+msgid "Optimal"
+msgstr ""
+
+#. combo box entry
+#: src/include/partitioning/ep-settings.rb:76
+msgid "Cylinder"
+msgstr ""
+
 #. combo box label
-#: src/include/partitioning/ep-settings.rb:115
+#: src/include/partitioning/ep-settings.rb:136
 msgid "Default Mount by"
 msgstr ""
 
 #. combo box label
-#: src/include/partitioning/ep-settings.rb:126
+#: src/include/partitioning/ep-settings.rb:145
 msgid "Default File System"
 msgstr ""
 
 #. 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
 msgid "Show Storage Devices by"
 msgstr ""
 
 #. multi selection box label
-#: src/include/partitioning/ep-settings.rb:169
+#: src/include/partitioning/ep-settings.rb:177
 msgid "Visible Information on Storage Devices"
 msgstr ""
 
 #. helptext
-#: src/include/partitioning/ep-settings.rb:183
+#: src/include/partitioning/ep-settings.rb:191
 msgid ""
 "<p>This view shows general storage\n"
 "settings:</p>"
 msgstr ""
 
 #. 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"
@@ -4097,14 +4139,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"
@@ -4113,14 +4155,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>"
@@ -4425,23 +4467,23 @@
 msgstr ""
 
 #. label text
-#: src/modules/FileSystems.rb:275
+#: src/modules/FileSystems.rb:276
 msgid "Tmpfs &Size"
 msgstr ""
 
 #. popup text
-#: src/modules/FileSystems.rb:284
+#: src/modules/FileSystems.rb:285
 msgid ""
 "Invalid Size specified. Use number followed by K, M, G or %.\n"
 "Value must be above 100k or between 1% and 200%. Try again."
 msgstr ""
 
-#: src/modules/FileSystems.rb:287
+#: src/modules/FileSystems.rb:288
 msgid "Value must be between 1% and 200%. Try again."
 msgstr ""
 
 #. 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"
@@ -4449,29 +4491,29 @@
 msgstr ""
 
 #. label text
-#: src/modules/FileSystems.rb:308
+#: src/modules/FileSystems.rb:309
 msgid "Swap &Priority"
 msgstr ""
 
 #. popup text
-#: src/modules/FileSystems.rb:316
+#: src/modules/FileSystems.rb:317
 msgid "Value must be between 0 and 32767. Try again."
 msgstr ""
 
 #. 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"
 msgstr ""
 
 #. button text
-#: src/modules/FileSystems.rb:470
+#: src/modules/FileSystems.rb:479
 msgid "Mount &Read-Only"
 msgstr ""
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:474
+#: src/modules/FileSystems.rb:483
 msgid ""
 "<p><b>Mount Read-Only:</b>\n"
 "Writing to the file system is not possible. Default is false. During installation\n"
@@ -4479,36 +4521,36 @@
 msgstr ""
 
 #. button text
-#: src/modules/FileSystems.rb:486
+#: src/modules/FileSystems.rb:495
 msgid "No &Access Time"
 msgstr ""
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:490
+#: src/modules/FileSystems.rb:499
 msgid ""
 "<p><b>No Access Time:</b>\n"
 "Access times are not updated when a file is read. Default is false.</p>\n"
 msgstr ""
 
 #. button text
-#: src/modules/FileSystems.rb:500
+#: src/modules/FileSystems.rb:509
 msgid "Mountable by &User"
 msgstr ""
 
 #. 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"
 msgstr ""
 
 #. button text
-#: src/modules/FileSystems.rb:517
+#: src/modules/FileSystems.rb:526
 msgid "Do Not Mount at System &Start-up"
 msgstr ""
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:523
+#: src/modules/FileSystems.rb:532
 msgid ""
 "<p><b>Do Not Mount at System Start-up:</b>\n"
 "The file system is not automatically mounted when the system starts.\n"
@@ -4518,12 +4560,12 @@
 msgstr ""
 
 #. button text
-#: src/modules/FileSystems.rb:540
+#: src/modules/FileSystems.rb:549
 msgid "Enable &Quota Support"
 msgstr ""
 
 #. 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"
@@ -4531,12 +4573,12 @@
 msgstr ""
 
 #. label text
-#: src/modules/FileSystems.rb:565
+#: src/modules/FileSystems.rb:574
 msgid "Data &Journaling Mode"
 msgstr ""
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:574
+#: src/modules/FileSystems.rb:583
 msgid ""
 "<p><b>Data Journaling Mode:</b>\n"
 "Specifies the journaling mode for file data.\n"
@@ -4548,40 +4590,40 @@
 msgstr ""
 
 #. button text
-#: src/modules/FileSystems.rb:595
+#: src/modules/FileSystems.rb:604
 msgid "&Access Control Lists (ACL)"
 msgstr ""
 
 #. 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"
 msgstr ""
 
 #. button text
-#: src/modules/FileSystems.rb:610
+#: src/modules/FileSystems.rb:619
 msgid "&Extended User Attributes"
 msgstr ""
 
 #. 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"
 msgstr ""
 
 #. label text
-#: src/modules/FileSystems.rb:631
+#: src/modules/FileSystems.rb:640
 msgid "Arbitrary Option &Value"
 msgstr ""
 
-#: src/modules/FileSystems.rb:636
+#: src/modules/FileSystems.rb:645
 msgid "Invalid characters in arbitrary option value. Do not use spaces or tabs. Try again."
 msgstr ""
 
 #. 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"
@@ -4589,89 +4631,89 @@
 msgstr ""
 
 #. label text
-#: src/modules/FileSystems.rb:657
+#: src/modules/FileSystems.rb:666
 msgid "Char&set for file names"
 msgstr ""
 
 #. 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"
 msgstr ""
 
 #. label text
-#: src/modules/FileSystems.rb:689
+#: src/modules/FileSystems.rb:698
 msgid "Code&page for short FAT names"
 msgstr ""
 
 #. 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"
 msgstr ""
 
 #. label text
-#: src/modules/FileSystems.rb:709
+#: src/modules/FileSystems.rb:718
 msgid "Number of &FATs"
 msgstr ""
 
 #. 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>"
 msgstr ""
 
 #. label text
-#: src/modules/FileSystems.rb:724
+#: src/modules/FileSystems.rb:733
 msgid "FAT &Size"
 msgstr ""
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:735
+#: src/modules/FileSystems.rb:744
 msgid ""
 "<p><b>FAT Size:</b>\n"
 "Specifies the type of file allocation tables used (12, 16, or 32-bit). If auto is specified, YaST will automatically select the value most suitable for the file system size.</p>\n"
 msgstr ""
 
 #. label text
-#: src/modules/FileSystems.rb:744
+#: src/modules/FileSystems.rb:753
 msgid "Root &Dir Entries"
 msgstr ""
 
 #. popup text
-#: src/modules/FileSystems.rb:752
+#: src/modules/FileSystems.rb:761
 msgid "The minimum size for \"Root Dir Entries\" is 112. Try again."
 msgstr ""
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:756
+#: src/modules/FileSystems.rb:765
 msgid ""
 "<p><b>Root Dir Entries:</b>\n"
 "Select the number of entries available in the root directory.</p>\n"
 msgstr ""
 
 #. label text
-#: src/modules/FileSystems.rb:769
+#: src/modules/FileSystems.rb:778
 msgid "Hash &Function"
 msgstr ""
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:776
+#: src/modules/FileSystems.rb:785
 msgid ""
 "<p><b>Hash Function:</b>\n"
 "This specifies the name of the hash function to use to sort the file names in directories.</p>\n"
 msgstr ""
 
 #. label text
-#: src/modules/FileSystems.rb:785
+#: src/modules/FileSystems.rb:794
 msgid "FS &Revision"
 msgstr ""
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:792
+#: src/modules/FileSystems.rb:801
 msgid ""
 "<p><b>FS Revision:</b>\n"
 "This option defines the reiserfs format revision to use. '3.5' is for backwards compatibility with kernels of the 2.2.x series. '3.6' is more recent, but can only be used with kernel versions greater than or equal to 2.4.</p>\n"
@@ -4679,12 +4721,12 @@
 
 #. label text
 #. label text
-#: src/modules/FileSystems.rb:805 src/modules/FileSystems.rb:969
+#: src/modules/FileSystems.rb:814 src/modules/FileSystems.rb:978
 msgid "Block &Size in Bytes"
 msgstr ""
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:812
+#: src/modules/FileSystems.rb:821
 msgid ""
 "<p><b>Block Size:</b>\n"
 "Specify the size of blocks in bytes. Valid block size values are 512, 1024, 2048 and 4096 bytes per block. If auto is selected, the standard block size of 4096 is used.</p>\n"
@@ -4692,37 +4734,37 @@
 
 #. 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 ""
 
 #. 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"
 msgstr ""
 
 #. label text
-#: src/modules/FileSystems.rb:836
+#: src/modules/FileSystems.rb:845
 msgid "&Percentage of Inode Space"
 msgstr ""
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:864
+#: src/modules/FileSystems.rb:873
 msgid ""
 "<p><b>Percentage of Inode Space:</b>\n"
 "The option \"Percentage of Inode Space\" specifies the maximum percentage of space in the file system that can be allocated to inodes.</p>\n"
 msgstr ""
 
 #. label text
-#: src/modules/FileSystems.rb:873
+#: src/modules/FileSystems.rb:882
 msgid "Inode &Aligned"
 msgstr ""
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:879
+#: src/modules/FileSystems.rb:888
 msgid ""
 "<p><b>Inode Aligned:</b>\n"
 "The option \"Inode Aligned\" is used to specify whether inode allocation is or\n"
@@ -4731,12 +4773,12 @@
 msgstr ""
 
 #. label text
-#: src/modules/FileSystems.rb:909
+#: src/modules/FileSystems.rb:918
 msgid "&Log Size in Megabytes"
 msgstr ""
 
 #. popup text
-#: src/modules/FileSystems.rb:918
+#: src/modules/FileSystems.rb:927
 msgid ""
 "The \"Log Size\" value is incorrect.\n"
 "Enter a value greater than zero.\n"
@@ -4744,31 +4786,31 @@
 
 #. xgettext: no-c-format
 #. help text, richtext format
-#: src/modules/FileSystems.rb:923
+#: src/modules/FileSystems.rb:932
 msgid ""
 "<p><b>Log Size</b>\n"
 "Set the log size (in megabytes). If auto, the default is 40% of the aggregate size.</p>\n"
 msgstr ""
 
 #. label text
-#: src/modules/FileSystems.rb:931
+#: src/modules/FileSystems.rb:940
 msgid "Invoke Bad Blocks List &Utility"
 msgstr ""
 
 #. label text
-#: src/modules/FileSystems.rb:945
+#: src/modules/FileSystems.rb:954
 msgid "Stride &Length in Blocks"
 msgstr ""
 
 #. popup text
-#: src/modules/FileSystems.rb:953
+#: src/modules/FileSystems.rb:962
 msgid ""
 "The \"Stride Length in Blocks\" value is invalid.\n"
 "Select a value greater than 1.\n"
 msgstr ""
 
 #. 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"
@@ -4777,19 +4819,19 @@
 msgstr ""
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:976
+#: src/modules/FileSystems.rb:985
 msgid ""
 "<p><b>Block Size:</b>\n"
 "Specify the size of blocks in bytes. Valid block size values are 1024, 2048, and 4096 bytes per block. If auto is selected, the block size is determined by the file system size and the expected use of the file system.</p>\n"
 msgstr ""
 
 #. label text
-#: src/modules/FileSystems.rb:985
+#: src/modules/FileSystems.rb:994
 msgid "Bytes per &Inode"
 msgstr ""
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:991
+#: src/modules/FileSystems.rb:1000
 msgid ""
 "<p><b>Bytes per Inode:</b> \n"
 "Specify the bytes to inode ratio. YaST creates an inode for every\n"
@@ -4802,12 +4844,12 @@
 msgstr ""
 
 #. label text
-#: src/modules/FileSystems.rb:1007
+#: src/modules/FileSystems.rb:1016
 msgid "Percentage of Blocks &Reserved for root"
 msgstr ""
 
 #. popup text
-#: src/modules/FileSystems.rb:1017
+#: src/modules/FileSystems.rb:1026
 msgid ""
 "The \"Percentage of Blocks Reserved for root\" value is incorrect.\n"
 "Allowed are float numbers no larger than 99 (e.g. 0.5).\n"
@@ -4815,41 +4857,41 @@
 
 #. xgettext: no-c-format
 #. help text, richtext format
-#: src/modules/FileSystems.rb:1022
+#: src/modules/FileSystems.rb:1031
 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 ""
 
 #. checkbox text
-#: src/modules/FileSystems.rb:1031
+#: src/modules/FileSystems.rb:1040
 msgid "Disable Regular Checks"
 msgstr ""
 
 #. 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 ""
 
 #. 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"
 msgstr ""
 
 #. 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"
@@ -4857,12 +4899,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
 msgid ""
 "\n"
 "The partitioning on your disk %1 is either not readable or not \n"
@@ -4875,7 +4917,7 @@
 msgstr ""
 
 #. popup text %1 is replaced by disk name e.g. /dev/dasda
-#: src/modules/Partitions.rb:950
+#: src/modules/Partitions.rb:958
 msgid ""
 "\n"
 "The disk %1 does not contain a partition table but for\n"
@@ -4888,7 +4930,7 @@
 msgstr ""
 
 #. popup text
-#: src/modules/Partitions.rb:969
+#: src/modules/Partitions.rb:977
 msgid ""
 "\n"
 "\n"
@@ -4898,7 +4940,7 @@
 msgstr ""
 
 #. popup text
-#: src/modules/Partitions.rb:981
+#: src/modules/Partitions.rb:989
 msgid ""
 "\n"
 "\n"
@@ -4912,7 +4954,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 ""
 
@@ -4925,7 +4967,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
 msgid ""
 "Could not set encryption.\n"
 "System error code is %1.\n"
@@ -4934,7 +4976,7 @@
 msgstr ""
 
 #. popup text
-#: src/modules/Storage.rb:3939
+#: src/modules/Storage.rb:3942
 msgid ""
 "The first and the second version\n"
 "of the password do not match.\n"
@@ -4942,7 +4984,7 @@
 msgstr ""
 
 #. popup text
-#: src/modules/Storage.rb:3970
+#: src/modules/Storage.rb:3973
 msgid ""
 "The password may only contain the following characters:\n"
 "0..9, a..z, A..Z, and any of \"@#* ,.;:._-+=!$%&/|?{[()]}^\\<>\".\n"
@@ -4951,24 +4993,24 @@
 
 #. 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
 msgid "&Enter Encryption Password:"
 msgstr ""
 
 #. Clear password fields on every round.
-#: src/modules/Storage.rb:4083
+#: src/modules/Storage.rb:4086
 msgid "Provide Password"
 msgstr ""
 
-#: 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
 msgid "Encrypted Volume Activation"
 msgstr ""
 
-#: 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"
@@ -4976,12 +5018,12 @@
 "during an update or if they contain an encrypted LVM physical volume."
 msgstr ""
 
-#: src/modules/Storage.rb:4133
+#: src/modules/Storage.rb:4136
 msgid "Do you want to provide encryption passwords?"
 msgstr ""
 
 #. 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"
@@ -4989,86 +5031,86 @@
 msgstr ""
 
 #. header text
-#: src/modules/Storage.rb:4196
+#: src/modules/Storage.rb:4199
 msgid "Enter Encryption Password"
 msgstr ""
 
-#: 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
 msgid "Provide password for any of the following devices:"
 msgstr ""
 
 #. label text, one device name follows
-#: src/modules/Storage.rb:4215
+#: src/modules/Storage.rb:4218
 msgid "Provide password for the following device:"
 msgstr ""
 
-#: 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
 msgid "IDE Disk"
 msgstr ""
 
-#: src/modules/Storage.rb:4344
+#: src/modules/Storage.rb:4347
 msgid "SCSI Disk"
 msgstr ""
 
-#: src/modules/Storage.rb:4350
+#: src/modules/Storage.rb:4353
 msgid "Disk"
 msgstr ""
 
-#: src/modules/Storage.rb:4378
+#: src/modules/Storage.rb:4381
 msgid "DM RAID"
 msgstr ""
 
-#: src/modules/Storage.rb:4391
+#: src/modules/Storage.rb:4394
 msgid "MD RAID"
 msgstr ""
 
 #. TRANSLATORS: error popup
-#: src/modules/Storage.rb:5173
+#: src/modules/Storage.rb:5176
 msgid "Partitions cannot be created since other partitions on the disk are used."
 msgstr ""
 
-#: src/modules/Storage.rb:5199
+#: src/modules/Storage.rb:5202
 msgid ""
 "\n"
 "Device %1 cannot be modified because it contains activated swap\n"
 "that is needed to run the installation.\n"
 msgstr ""
 
-#: src/modules/Storage.rb:5213
+#: src/modules/Storage.rb:5216
 msgid ""
 "\n"
 "Device %1 cannot be modified because it contains the installation\n"
 "data needed to perform the installation.\n"
 msgstr ""
 
-#: src/modules/Storage.rb:5242
+#: src/modules/Storage.rb:5245
 msgid ""
 "\n"
 "Device %1 cannot be removed because it contains activated swap\n"
 "that is needed to run the installation.\n"
 msgstr ""
 
-#: src/modules/Storage.rb:5251
+#: src/modules/Storage.rb:5254
 msgid ""
 "\n"
 "Device %1 cannot be removed because it contains the installation\n"
 "data needed to perform the installation.\n"
 msgstr ""
 
-#: src/modules/Storage.rb:5280
+#: src/modules/Storage.rb:5283
 msgid ""
 "\n"
 "Device %1 cannot be removed because this would indirectly change\n"
@@ -5076,7 +5118,7 @@
 "the installation.\n"
 msgstr ""
 
-#: src/modules/Storage.rb:5291
+#: src/modules/Storage.rb:5294
 msgid ""
 "\n"
 "Device %1 cannot be removed because this would indirectly change\n"
@@ -5084,7 +5126,7 @@
 msgstr ""
 
 #. the check for verbose is needed for calls from StorageProposal (see bnc#871779)
-#: src/modules/Storage.rb:5313
+#: src/modules/Storage.rb:5316
 msgid ""
 "\n"
 "Partition %1 cannot be removed since other partitions on the\n"
@@ -5092,18 +5134,18 @@
 msgstr ""
 
 #. FIXME: please, add description of the list that is returned by this function.
-#: src/modules/Storage.rb:5402
+#: src/modules/Storage.rb:5405
 msgid "Nothing assigned as root filesystem!"
 msgstr ""
 
-#: 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
 msgid "Adding the following resolvables failed: %1"
 msgstr ""
 
@@ -5691,48 +5733,48 @@
 
 #. 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
 msgid "Resize impossible due to inconsistent file system. Try checking file system under Windows."
 msgstr ""
 
 #. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6143
+#: src/modules/StorageProposal.rb:6164
 msgid "Create &LVM-based Proposal"
 msgstr ""
 
 #. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6158
+#: src/modules/StorageProposal.rb:6179
 msgid "Encr&ypt Volume Group"
 msgstr ""
 
 #. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6176
+#: src/modules/StorageProposal.rb:6197
 msgid "File System for Root Partition"
 msgstr ""
 
 #. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6223
+#: src/modules/StorageProposal.rb:6244
 msgid "File System for Home Partition"
 msgstr ""
 
 #. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6241
+#: src/modules/StorageProposal.rb:6262
 msgid "Enlarge &Swap for Suspend"
 msgstr ""
 
-#: src/modules/StorageProposal.rb:6251
+#: src/modules/StorageProposal.rb:6272
 msgid "Proposal Settings"
 msgstr ""
 
 #. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6266
+#: src/modules/StorageProposal.rb:6287
 msgid ""
 "<p>To create an LVM-based proposal, choose the corresponding button. The\n"
 "LVM-based proposal can be encrypted.</p>\n"
 msgstr ""
 
 #. 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"
@@ -5741,32 +5783,32 @@
 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
 msgid "Enter your password for the proposal encryption."
 msgstr ""
 
 #. Label: get password for user root
 #. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6321
+#: src/modules/StorageProposal.rb:6342
 msgid "Password:"
 msgstr ""
 
 #. 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
 msgid "Reenter the password for verification:"
 msgstr ""
 
@@ -5793,22 +5835,22 @@
 #. Package:	yast2-storage
 #. Summary:	Expert Partitioner
 #. Authors:	Arvin Schnell <aschnell@suse.de>
-#: src/modules/StorageSettings.rb:177
+#: src/modules/StorageSettings.rb:179
 msgid "Default Mount-by:"
 msgstr ""
 
-#: src/modules/StorageSettings.rb:178
+#: src/modules/StorageSettings.rb:180
 msgid "Default File System:"
 msgstr ""
 
-#: src/modules/StorageSettings.rb:179
+#: src/modules/StorageSettings.rb:181
 msgid "Show Storage Devices by:"
 msgstr ""
 
-#: src/modules/StorageSettings.rb:180
+#: src/modules/StorageSettings.rb:182
 msgid "Partition Alignment:"
 msgstr ""
 
-#: src/modules/StorageSettings.rb:181
+#: src/modules/StorageSettings.rb:183
 msgid "Visible Information on Storage Devices:"
 msgstr ""

Modified: trunk/yast/am/po/sudo.am.po
===================================================================
--- trunk/yast/am/po/sudo.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/sudo.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/support.am.po
===================================================================
--- trunk/yast/am/po/support.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/support.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -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"
@@ -38,11 +38,11 @@
 
 #. Support configure1 dialog contents
 #: src/include/support/dialogs.rb:53
-msgid "Open Novell Support Center"
+msgid "Open SUSE Support Center"
 msgstr ""
 
 #: src/include/support/dialogs.rb:58
-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 ""
 
 #: src/include/support/dialogs.rb:68
@@ -235,7 +235,7 @@
 msgstr ""
 
 #: src/include/support/dialogs.rb:770
-msgid "Novell 11-digit service request number"
+msgid "11-digit service request number"
 msgstr ""
 
 #. abort?
@@ -323,8 +323,8 @@
 #: src/include/support/helps.rb:72
 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 ""
@@ -406,7 +406,7 @@
 #: src/include/support/helps.rb:133
 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 ""
 
 #. Collecting data dialkog help 1/1
@@ -449,7 +449,7 @@
 #: src/include/support/helps.rb:164 src/include/support/helps.rb:189
 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 ""
 
@@ -753,7 +753,7 @@
 msgstr ""
 
 #: 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."
+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 ""
 
 #. Initialization dialog caption

Modified: trunk/yast/am/po/sysconfig.am.po
===================================================================
--- trunk/yast/am/po/sysconfig.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/sysconfig.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -463,3 +463,99 @@
 "Please wait...<br></p>\n"
 "\n"
 msgstr ""
+
+#. Translation: Progress bar label
+#: src/modules/Sysconfig.rb:159
+msgid "Searching..."
+msgstr ""
+
+#. 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 ""
+
+#. button label
+#: src/modules/Sysconfig.rb:889
+msgid "S&kip"
+msgstr ""
+
+#. 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 ""
+
+#: src/modules/Sysconfig.rb:968 src/modules/Sysconfig.rb:1172
+msgid "Starting command: %1..."
+msgstr ""
+
+#: src/modules/Sysconfig.rb:969 src/modules/Sysconfig.rb:1173
+msgid "Command %1 failed"
+msgstr ""
+
+#. write dialog caption
+#: src/modules/Sysconfig.rb:1009
+msgid "Saving sysconfig Configuration"
+msgstr ""
+
+#. progress bar item
+#: src/modules/Sysconfig.rb:1036
+msgid "Write the new settings"
+msgstr ""
+
+#: src/modules/Sysconfig.rb:1037
+msgid "Activate the changes"
+msgstr ""
+
+#. 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 ""
+
+#. progress bar label, %1 is variable name (e.g. DISPLAYMANAGER)
+#: src/modules/Sysconfig.rb:1068
+msgid "Saving variable %1..."
+msgstr ""
+
+#: src/modules/Sysconfig.rb:1073
+msgid "Saving changes to the files..."
+msgstr ""
+
+#. service is running, reload it
+#: src/modules/Sysconfig.rb:1100
+msgid "Service %1 will be reloaded"
+msgstr ""
+
+#: src/modules/Sysconfig.rb:1103
+msgid "Reloading service %1..."
+msgstr ""
+
+#: src/modules/Sysconfig.rb:1105
+msgid "Reload of the service %1 failed"
+msgstr ""
+
+#. service is running, restart it
+#: src/modules/Sysconfig.rb:1143
+msgid "Service %1 will be restarted"
+msgstr ""
+
+#: src/modules/Sysconfig.rb:1146
+msgid "Restarting service %1..."
+msgstr ""
+
+#: src/modules/Sysconfig.rb:1148
+msgid "Restart of the service %1 failed"
+msgstr ""
+
+#. set 100% in progress bar
+#: src/modules/Sysconfig.rb:1186
+msgid "Finished"
+msgstr ""
+
+#. configuration summary headline
+#: src/modules/Sysconfig.rb:1269
+msgid "Configuration Summary"
+msgstr ""

Modified: trunk/yast/am/po/tftp-server.am.po
===================================================================
--- trunk/yast/am/po/tftp-server.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/tftp-server.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/timezone_db.am.po
===================================================================
--- trunk/yast/am/po/timezone_db.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/timezone_db.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/tune.am.po
===================================================================
--- trunk/yast/am/po/tune.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/tune.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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-08-04 16:02+0200\n"
 "PO-Revision-Date: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -16,53 +16,58 @@
 "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 ""
 
 #. translators: popup heading
-#: src/clients/hwinfo.rb:71
+#: src/clients/hwinfo.rb:73
 msgid "Probing Hardware..."
 msgstr ""
 
 #. progress bar label
-#: src/clients/hwinfo.rb:74
+#: src/clients/hwinfo.rb:76
 msgid "Progress"
 msgstr ""
 
 #. title label
-#: src/clients/hwinfo.rb:292
+#: src/clients/hwinfo.rb:311
 msgid "&All Entries"
 msgstr ""
 
-#: src/clients/hwinfo.rb:304
+#: src/clients/hwinfo.rb:323
 msgid "&Save to File..."
 msgstr ""
 
 #. dialog header
-#: src/clients/hwinfo.rb:313
+#: src/clients/hwinfo.rb:332
 msgid "Hardware Information"
 msgstr ""
 
 #. 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"
 msgstr ""
 
-#: 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 ""
 
+#. installation proposal header
+#: src/clients/hwinfo_proposal.rb:31
+msgid "System and Hardware Settings"
+msgstr ""
+
 #. 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 ""
 
 #. this is a menu entry
-#: src/clients/hwinfo_proposal.rb:50
+#: src/clients/hwinfo_proposal.rb:52
 msgid "S&ystem"
 msgstr ""
 

Modified: trunk/yast/am/po/update.am.po
===================================================================
--- trunk/yast/am/po/update.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/update.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -125,7 +125,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 ""
 
@@ -148,18 +148,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 ""
 
 #. 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 ""
 
@@ -218,9 +218,19 @@
 "packages during the update.</p>\n"
 msgstr ""
 
-#. 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 ""
@@ -228,13 +238,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 ""
 
 #. 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 ""
 
@@ -305,12 +315,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 ""
 
 #. 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 ""
 
@@ -318,14 +328,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 ""
 
 #. 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
 msgid ""
 "Updating system to another version (%1 -> %2) is not supported on the running system.<br>\n"
 "Boot from the installation media and use a normal upgrade\n"
@@ -333,22 +343,22 @@
 msgstr ""
 
 #. 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 ""
 
 #. Proposal for backup during update
-#: src/clients/update_proposal.rb:214
+#: src/clients/update_proposal.rb:191
 msgid "Only update installed packages"
 msgstr ""
 
 #. proposal string
-#: src/clients/update_proposal.rb:229
+#: src/clients/update_proposal.rb:206
 msgid "Update based on patterns"
 msgstr ""
 
 #. TRANSLATORS: proposal dialog help
-#: src/clients/update_proposal.rb:255
+#: src/clients/update_proposal.rb:232
 msgid ""
 "<p><b><big>Update Options</big></b> Select how your system will be updated.\n"
 "Choose if only installed packages should be updated or new ones should be\n"
@@ -357,17 +367,17 @@
 msgstr ""
 
 #. this is a menu entry
-#: src/clients/update_proposal.rb:300
+#: src/clients/update_proposal.rb:280
 msgid "&Update Options"
 msgstr ""
 
 #. 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 ""
 
 #. 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"
@@ -376,27 +386,27 @@
 msgstr ""
 
 #. Table item (unknown system)
-#: src/include/update/rootpart.rb:88
+#: src/include/update/rootpart.rb:93
 msgid "Unknown Linux"
 msgstr ""
 
 #. Table item (unknown system)
-#: src/include/update/rootpart.rb:91
+#: src/include/update/rootpart.rb:96
 msgid "Unknown or Non-Linux"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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"
@@ -404,12 +414,12 @@
 msgstr ""
 
 #. 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 ""
 
 #. 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"
@@ -417,12 +427,12 @@
 msgstr ""
 
 #. headline for dialog "Select for update"
-#: src/include/update/rootpart.rb:202
+#: src/include/update/rootpart.rb:207
 msgid "Select for Update"
 msgstr ""
 
 #. 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"
@@ -431,69 +441,69 @@
 msgstr ""
 
 #. table header
-#: src/include/update/rootpart.rb:229
+#: src/include/update/rootpart.rb:234
 msgid "System"
 msgstr ""
 
 #. table header item
-#: src/include/update/rootpart.rb:231
+#: src/include/update/rootpart.rb:236
 msgid "Partition"
 msgstr ""
 
 #. table header item
-#: src/include/update/rootpart.rb:233
+#: src/include/update/rootpart.rb:238
 msgid "Architecture"
 msgstr ""
 
 #. table header item
-#: src/include/update/rootpart.rb:235
+#: src/include/update/rootpart.rb:240
 msgid "File System"
 msgstr ""
 
 #. table header item
-#: src/include/update/rootpart.rb:237
+#: src/include/update/rootpart.rb:242
 msgid "Label"
 msgstr ""
 
 #. check box
-#: src/include/update/rootpart.rb:247
+#: src/include/update/rootpart.rb:252
 msgid "&Show All Partitions"
 msgstr ""
 
 #. pushbutton to (rightaway) boot the system selected above
-#: src/include/update/rootpart.rb:278
+#: src/include/update/rootpart.rb:283
 msgid "&Boot"
 msgstr ""
 
-#. 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."
 msgstr ""
 
 #. continue-cancel popup
-#: src/include/update/rootpart.rb:358
+#: src/include/update/rootpart.rb:364
 msgid ""
 "The architecture of the system installed in the selected partition\n"
 "is different from the one of this product.\n"
 msgstr ""
 
 #. 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 ""
 
 #. 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"
@@ -501,29 +511,29 @@
 "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
 msgid "&Yes, Continue"
 msgstr ""
 
 #. Link to SDB article concerning renaming of devices.
-#: src/modules/RootPart.rb:109
+#: src/modules/RootPart.rb:108
 msgid ""
 "See the SDB article at %1 for details\n"
 "about how to solve this problem."
 msgstr ""
 
 #. label - name of sustem to update
-#: src/modules/RootPart.rb:147
+#: src/modules/RootPart.rb:146
 msgid "Unknown Linux System"
 msgstr ""
 
 #. label - name of sustem to update
-#: src/modules/RootPart.rb:152
+#: src/modules/RootPart.rb:151
 msgid "Non-Linux System"
 msgstr ""
 
 #. 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"
@@ -533,7 +543,7 @@
 msgstr ""
 
 #. label, %1 is partition
-#: src/modules/RootPart.rb:379
+#: src/modules/RootPart.rb:378
 msgid "Checking partition %1"
 msgstr ""
 
@@ -542,23 +552,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 ""
 
 #. #176292, run fsck before jfs is mounted
-#: src/modules/RootPart.rb:498
+#: src/modules/RootPart.rb:497
 msgid "Checking file system on %1..."
 msgstr ""
 
 #. popup headline
-#: src/modules/RootPart.rb:530
+#: src/modules/RootPart.rb:529
 msgid "File System Check Failed"
 msgstr ""
 
 #. popup question (continue/cancel dialog)
 #. %1 is a device name such as /dev/hda5
-#: src/modules/RootPart.rb:534
+#: src/modules/RootPart.rb:533
 msgid ""
 "The file system check of device %1 has failed.\n"
 "\n"
@@ -566,24 +576,24 @@
 msgstr ""
 
 #. button
-#: src/modules/RootPart.rb:543
+#: src/modules/RootPart.rb:542
 msgid "&Skip Mounting"
 msgstr ""
 
 #. yes-no popup
-#: src/modules/RootPart.rb:1059
+#: src/modules/RootPart.rb:1058
 msgid "Incorrect password. Try again?"
 msgstr ""
 
 #. TRANSLATORS: a popup headline
-#: src/modules/RootPart.rb:1162
+#: src/modules/RootPart.rb:1161
 msgid "Warning"
 msgstr ""
 
 #. 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
 msgid ""
 "Your /boot partition is too small (%1 MB).\n"
 "We recommend a size of no less than %2 MB or else the new Kernel may not fit.\n"
@@ -594,7 +604,7 @@
 msgstr ""
 
 #. 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
 msgid ""
 "The partition %1 could not be mounted.\n"
 "\n"
@@ -607,39 +617,39 @@
 msgstr ""
 
 #. push button
-#: src/modules/RootPart.rb:1277
+#: src/modules/RootPart.rb:1276
 msgid "&Specify Mount Options"
 msgstr ""
 
 #. popup heading
-#: src/modules/RootPart.rb:1293
+#: src/modules/RootPart.rb:1292
 msgid "Mount Options"
 msgstr ""
 
 #. text entry label
-#: src/modules/RootPart.rb:1296
+#: src/modules/RootPart.rb:1295
 msgid "&Mount Point"
 msgstr ""
 
 #. tex entry label
-#: src/modules/RootPart.rb:1299
+#: src/modules/RootPart.rb:1298
 msgid "&Device"
 msgstr ""
 
 #. text entry label
-#: src/modules/RootPart.rb:1304
+#: src/modules/RootPart.rb:1303
 msgid ""
 "&File System\n"
 "(empty for autodetection)"
 msgstr ""
 
 #. error message
-#: src/modules/RootPart.rb:1381
+#: src/modules/RootPart.rb:1380
 msgid "The /var partition %1 could not be mounted.\n"
 msgstr ""
 
 #. Informational text about selected partition, %x are replaced with values later
-#: src/modules/RootPart.rb: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"
@@ -647,17 +657,17 @@
 "<b>udev path:</b> %6"
 msgstr ""
 
-#: src/modules/RootPart.rb:1436
+#: src/modules/RootPart.rb:1435
 msgid "None"
 msgstr ""
 
 #. a popup caption
-#: src/modules/RootPart.rb:1459
+#: src/modules/RootPart.rb:1458
 msgid "Unable to find the /var partition automatically"
 msgstr ""
 
 #. 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"
@@ -665,22 +675,22 @@
 msgstr ""
 
 #. a combo-box label
-#: src/modules/RootPart.rb:1477
+#: src/modules/RootPart.rb:1476
 msgid "&Select /var Partition Device"
 msgstr ""
 
 #. an informational rich-text widget label
-#: src/modules/RootPart.rb:1483
+#: src/modules/RootPart.rb:1482
 msgid "Device Info"
 msgstr ""
 
 #. error message
-#: src/modules/RootPart.rb:1624
+#: src/modules/RootPart.rb:1623
 msgid "Unable to mount /var partition with this disk configuration.\n"
 msgstr ""
 
 #. popup message, %1 will be replace with the name of the logfile
-#: src/modules/RootPart.rb:1655
+#: src/modules/RootPart.rb:1654
 msgid ""
 "Partitions could not be mounted.\n"
 "\n"
@@ -690,7 +700,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"
@@ -699,17 +709,17 @@
 msgstr ""
 
 #. error message
-#: src/modules/RootPart.rb:1717
+#: src/modules/RootPart.rb:1716
 msgid "No fstab found."
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -728,34 +738,60 @@
 msgid "Searching for Available Systems"
 msgstr ""
 
+#. 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
+msgid "Release file %{file} not found"
+msgstr ""
+
+#: src/modules/SUSERelease.rb:74
+msgid "Cannot read release file %{file}"
+msgstr ""
+
 #. -----------------------------------------------------------------------
 #. GLOBAL FUNCTIONS
 #. -----------------------------------------------------------------------
-#: src/modules/Update.rb:304
+#: src/modules/Update.rb:309
 msgid "Unknown Product"
 msgstr ""
 
-#. TRANSLATORS: check-box, it might happen that we need to downgrade some packages during update
-#: src/modules/Update.rb:817
-msgid "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
+msgid ""
+"Cannot select these packages required for installation:\n"
+"%{packages}"
+msgstr ""
+
+#: control/update.glade.translations.glade:3
+#: control/update.glade.translations.glade:5
 msgid "Update Settings"
 msgstr ""
 
-#: control/update.glade:34
+#: control/update.glade.translations.glade:4
 msgid "Update"
 msgstr ""
 
-#: control/update.glade:48 control/update.glade:52
+#: control/update.glade.translations.glade:6
+#: control/update.glade.translations.glade:7
 msgid "Perform Update"
 msgstr ""
 
-#: control/update.glade:63
+#: control/update.glade.translations.glade:8
 msgid "Update System Configuration"
 msgstr ""
 
-#: control/update.glade:71
+#: control/update.glade.translations.glade:9
 msgid "Update Configuration"
 msgstr ""

Modified: trunk/yast/am/po/users.am.po
===================================================================
--- trunk/yast/am/po/users.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/users.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -259,7 +259,7 @@
 msgstr ""
 
 #. 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 ""
@@ -3978,22 +3978,22 @@
 msgstr ""
 
 #. summary label
-#: src/modules/Users.pm:6596
+#: src/modules/Users.pm:6601
 msgid "<h3>Users</h3>"
 msgstr ""
 
 #. summary label
-#: src/modules/Users.pm:6606
+#: src/modules/Users.pm:6611
 msgid "<h3>Groups</h3>"
 msgstr ""
 
 #. summary label
-#: src/modules/Users.pm:6617
+#: src/modules/Users.pm:6622
 msgid "<h3>Login Settings</h3>"
 msgstr ""
 
 #. 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/am/po/vm.am.po
===================================================================
--- trunk/yast/am/po/vm.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/vm.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -27,132 +27,164 @@
 msgstr ""
 
 #. 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"
 msgstr ""
 
 #. 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 ""
 
 #. progress stage 2/2
-#: src/modules/VM_XEN.rb:186
+#: src/modules/VM_XEN.rb:195
 msgid "Network Bridge Configuration"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. xen domain0 installation help text - 3/4
-#: src/modules/VM_XEN.rb:212
+#: src/modules/VM_XEN.rb:221
 msgid "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and the Linux kernel.</p>"
 msgstr ""
 
 #. xen domain0 installation help text - 4/4
-#: src/modules/VM_XEN.rb:216
+#: src/modules/VM_XEN.rb:225
 msgid "<p>When the configuration has finished successfully, you can boot the VM Server from the boot loader menu.</p>"
 msgstr ""
 
 #. error popup
-#: src/modules/VM_XEN.rb:221
+#: src/modules/VM_XEN.rb:230
 msgid "The installation will be aborted."
 msgstr ""
 
-#: src/modules/VM_XEN.rb:224
+#: src/modules/VM_XEN.rb:233
 msgid "Choose Hypervisor(s) to install"
 msgstr ""
 
-#: 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
+msgid "Tools: Configure, manage and monitor virtual machines"
+msgstr ""
+
+#: 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
+msgid "KVM tools"
+msgstr ""
+
+#: 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
+msgid "Virtualization client tools"
+msgstr ""
+
+#: src/modules/VM_XEN.rb:306
 msgid "Xen Hypervisor"
 msgstr ""
 
+#: src/modules/VM_XEN.rb:308
+msgid "Xen server"
+msgstr ""
+
+#: src/modules/VM_XEN.rb:309
+msgid "Xen tools"
+msgstr ""
+
 #. SLED doesn't have any installation capabilities (L3 support)
-#: src/modules/VM_XEN.rb:372
+#: src/modules/VM_XEN.rb:384
 msgid "Package installation failed\n"
 msgstr ""
 
-#: src/modules/VM_XEN.rb:380
+#: src/modules/VM_XEN.rb:392
 msgid "Package installation failed for lxc\n"
 msgstr ""
 
-#: 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 ""
 
 #. progressbar title - check whether Xen packages are installed
-#: src/modules/VM_XEN.rb:424
+#: src/modules/VM_XEN.rb:436
 msgid "Checking packages..."
 msgstr ""
 
 #. progressbar title - install the required packages
-#: src/modules/VM_XEN.rb:427
+#: src/modules/VM_XEN.rb:439
 msgid "Installing packages..."
 msgstr ""
 
 #. 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 ""
 
 #. 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
 msgid "Updating grub2 configuration files..."
 msgstr ""
 
 #. Default Bridge stage
-#: src/modules/VM_XEN.rb:460
+#: src/modules/VM_XEN.rb:474
 msgid "Configuring Default Network Bridge..."
 msgstr ""
 
 #. Popup yes/no dialog
-#: src/modules/VM_XEN.rb:481
+#: src/modules/VM_XEN.rb:495
 msgid "Network Bridge."
 msgstr ""
 
-#: 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 ""
 
@@ -165,26 +197,26 @@
 #. 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
 msgid "KVM components are installed. Reboot the machine and select the native kernel in the boot loader menu to install KVM guests."
 msgstr ""
 
-#: src/modules/VM_XEN.rb:546
+#: src/modules/VM_XEN.rb:563
 msgid "For installing Xen guests, reboot the machine and select the Xen section in the boot loader menu."
 msgstr ""
 
-#: src/modules/VM_XEN.rb:549
+#: src/modules/VM_XEN.rb:566
 msgid "Xen Hypervisor and tools are installed."
 msgstr ""
 
-#: src/modules/VM_XEN.rb:550
+#: src/modules/VM_XEN.rb:567
 msgid "Virtualization client tools are installed."
 msgstr ""
 
-#: src/modules/VM_XEN.rb:551
+#: src/modules/VM_XEN.rb:568
 msgid "Libvirt LXC components are installed."
 msgstr ""

Modified: trunk/yast/am/po/wagon.am.po
===================================================================
--- trunk/yast/am/po/wagon.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/wagon.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/wol.am.po
===================================================================
--- trunk/yast/am/po/wol.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/wol.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/xpram.am.po
===================================================================
--- trunk/yast/am/po/xpram.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/xpram.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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:53+0200\n"
 "PO-Revision-Date: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"

Modified: trunk/yast/am/po/yast2-apparmor.am.po
===================================================================
--- trunk/yast/am/po/yast2-apparmor.am.po	2014-10-07 15:43:20 UTC (rev 89775)
+++ trunk/yast/am/po/yast2-apparmor.am.po	2014-10-07 15:43:37 UTC (rev 89776)
@@ -5,7 +5,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:51+0200\n"
 "PO-Revision-Date: 2002-07-18 14:04+0200\n"
 "Last-Translator: Alemayehu Gemeda <netsasoft@gmail.com>\n"
 "Language-Team: Amharic <i18n@suse.de>\n"
@@ -295,11 +295,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 ""
@@ -1059,61 +1059,69 @@
 msgid "Could not recognize mode: "
 msgstr ""
 
-#. 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
+msgid "enforce"
+msgstr ""
+
+#: src/include/apparmor/config_complain.rb:118
+msgid "complain"
+msgstr ""
+
+#: src/include/apparmor/config_complain.rb:134
 msgid "Show All Profiles"
 msgstr ""
 
-#: src/include/apparmor/config_complain.rb:129
+#: src/include/apparmor/config_complain.rb:135
 msgid "Configure Mode for Active Profiles"
 msgstr ""
 
-#: src/include/apparmor/config_complain.rb:132
+#: src/include/apparmor/config_complain.rb:138
 msgid "Show Active Profiles"
 msgstr ""
 
-#: src/include/apparmor/config_complain.rb:133
+#: src/include/apparmor/config_complain.rb:139
 msgid "Configure Mode for All Profiles"
 msgstr ""
 
 #. `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 ""
 
-#: src/include/apparmor/config_complain.rb:147
+#: src/include/apparmor/config_complain.rb:153
 msgid "Mode"
 msgstr ""
 
-#: src/include/apparmor/config_complain.rb:154
+#: src/include/apparmor/config_complain.rb:160
 msgid "Toggle Mode"
 msgstr ""
 
-#: src/include/apparmor/config_complain.rb:155
+#: src/include/apparmor/config_complain.rb:161
 msgid "Set All to Enforce"
 msgstr ""
 
-#: src/include/apparmor/config_complain.rb:156
+#: src/include/apparmor/config_complain.rb:162
 msgid "Set All to Complain"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
-#: src/include/apparmor/config_complain.rb:291
+#: src/include/apparmor/config_complain.rb:297
 msgid "Select an action to perform."
 msgstr ""
 

-- 
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] r89776 - trunk/yast/am/po

keichwa＠svn2.opensuse.org