[opensuse-translation-commit] r96700 - trunk/yast/nb/po

2 Sep 2016

Author: minton
Date: 2016-09-02 23:39:11 +0200 (Fri, 02 Sep 2016)
New Revision: 96700

Added:
   trunk/yast/nb/po/journalctl.nb.po
Modified:
   trunk/yast/nb/po/add-on.nb.po
   trunk/yast/nb/po/auth-client.nb.po
   trunk/yast/nb/po/auth-server.nb.po
   trunk/yast/nb/po/autoinst.nb.po
   trunk/yast/nb/po/base.nb.po
   trunk/yast/nb/po/bootloader.nb.po
   trunk/yast/nb/po/ca-management.nb.po
   trunk/yast/nb/po/cio.nb.po
   trunk/yast/nb/po/cluster.nb.po
   trunk/yast/nb/po/control.nb.po
   trunk/yast/nb/po/country.nb.po
   trunk/yast/nb/po/crowbar.nb.po
   trunk/yast/nb/po/dhcp-server.nb.po
   trunk/yast/nb/po/dns-server.nb.po
   trunk/yast/nb/po/docker.nb.po
   trunk/yast/nb/po/drbd.nb.po
   trunk/yast/nb/po/fcoe-client.nb.po
   trunk/yast/nb/po/firewall.nb.po
   trunk/yast/nb/po/firstboot.nb.po
   trunk/yast/nb/po/fonts.nb.po
   trunk/yast/nb/po/geo-cluster.nb.po
   trunk/yast/nb/po/installation.nb.po
   trunk/yast/nb/po/iscsi-client.nb.po
   trunk/yast/nb/po/iscsi-lio-server.nb.po
   trunk/yast/nb/po/kdump.nb.po
   trunk/yast/nb/po/live-installer.nb.po
   trunk/yast/nb/po/mail.nb.po
   trunk/yast/nb/po/network.nb.po
   trunk/yast/nb/po/nfs.nb.po
   trunk/yast/nb/po/nis.nb.po
   trunk/yast/nb/po/ntp-client.nb.po
   trunk/yast/nb/po/packager.nb.po
   trunk/yast/nb/po/pkg-bindings.nb.po
   trunk/yast/nb/po/printer.nb.po
   trunk/yast/nb/po/rdp.nb.po
   trunk/yast/nb/po/rear.nb.po
   trunk/yast/nb/po/registration.nb.po
   trunk/yast/nb/po/reipl.nb.po
   trunk/yast/nb/po/samba-client.nb.po
   trunk/yast/nb/po/samba-server.nb.po
   trunk/yast/nb/po/security.nb.po
   trunk/yast/nb/po/services-manager.nb.po
   trunk/yast/nb/po/snapper.nb.po
   trunk/yast/nb/po/storage.nb.po
   trunk/yast/nb/po/update.nb.po
   trunk/yast/nb/po/users.nb.po
   trunk/yast/nb/po/vm.nb.po
   trunk/yast/nb/po/vpn.nb.po
Log:
nb merged

Modified: trunk/yast/nb/po/add-on.nb.po
===================================================================

--- trunk/yast/nb/po/add-on.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/add-on.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: add-on\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:35+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2009-08-03 18:38+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: American English \n"
@@ -89,15 +89,16 @@
 msgid "<li>Media: %1, Path: %2, Product: %3</li>\n"
 msgstr "<li>Medium: %1, sti: %2, produkt: %3</li>\n"
 
-#. error report
-#: src/clients/add-on_auto.rb:185
+#. set addon specific sig-handling
+#: src/clients/add-on_auto.rb:186
+msgid "Make the add-on \"%1\" available via \"%2\"."
+msgstr "Gjør tillleggsproduktet \"%1\" tilgjengelig via \"%2\""
+
+#. just report error
+#: src/clients/add-on_auto.rb:193
 msgid "Failed to add add-on product."
 msgstr "Kunne ikke legge til tilleggsprodukt."
 
-#: src/clients/add-on_auto.rb:193
-msgid "Make the add-on \"%1\" available via \"%2\"."
-msgstr "Gjør tillleggsproduktet \"%1\" tilgjengelig via \"%2\""
-
 #. placeholder for unknown path
 #. summary item, %1 is product name, %2 media URL, %3 directory on media
 #. placeholder for unknown directory

Modified: trunk/yast/nb/po/auth-client.nb.po
===================================================================
--- trunk/yast/nb/po/auth-client.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/auth-client.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-30 10:04+0100\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2014-05-19 09:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,1169 +17,1781 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. translators: command line help text for authentication client module
-#: src/clients/auth-client.rb:46
-msgid "Authentication client configuration module"
+#. Edit Kerberos realm configuration
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:52
+msgid "Realm name"
 msgstr ""
 
-#. translators: command line help text for summary action
-#: src/clients/auth-client.rb:56
-msgid "Configuration summary of the authentication client"
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:53
+msgid "Map Domain Name to the Realm (example.com -> EXAMPLE.COM)"
 msgstr ""
 
-#. translators: command line help text for summary action
-#: src/clients/auth-client.rb:61
-msgid "Create autoyast rnc from @parameters"
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:55
+msgid "Map Wild Card Domain Name to the Realm (*.example.com -> EXAMPLE.COM)"
 msgstr ""
 
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:58
+msgid "Host Name of Administration Server (Optional)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:60
+msgid "Host Name of Master Key Distribution Server (Optional)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:62
+msgid "Key Distribution Centres (Optional If Auto-Discovery via DNS is Enabled)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:68
+msgid "Custom Mappings of Principal Names to User Names"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:69
+msgid "Principal Name"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:69
+#, fuzzy
+#| msgid "Name"
+msgid "User Name"
+msgstr "Navn"
+
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:74
+msgid "Custom Rules for Mapping Principal Names to User Names"
+msgstr ""
+
+#. Add a KDC
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:89
+msgid "Please type in the host name of Key Distribution Centre:"
+msgstr ""
+
+#. Add an auth_to_local
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:102
+msgid "Please type in the auth_to_local rule:"
+msgstr ""
+
+#. Add an auth_to_local_names
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:115
+msgid "Please type in the principal name and user name in the format of \"princ_name = user_name\":"
+msgstr ""
+
+#. Save realm settings
+#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:135
+#, fuzzy
+#| msgid "Enter a name for the new profile."
+msgid "Please enter realm name."
+msgstr "Angi et navn for den nye profilen."
+
+#. Edit more configuration items for Kerberos.
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:48
+msgid "Default Location of Keytab File"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:50
+msgid "Encryption Types for TGS (Space separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:52
+msgid "Encryption Types for Ticket (Space separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:54
+msgid "Encryption Types for Sessions (Space separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:56
+msgid "Additional Addresses to be put in Ticket (Comma separated)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:59
+msgid "Reset"
+msgstr ""
+
+#. Edit more configuration items for LDAP.
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:53
+msgid "In Case Of Connection Outage:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:54
+msgid "Retry The Operation Endlessly"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:55
+msgid "Do Not Retry And Fail The Operation"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:57
+msgid "Timeout for Bind Operations in Seconds"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:59
+msgid "Timeout for Search Operations in Seconds"
+msgstr ""
+
+#. the last saved tab
+#: src/lib/authui/ldapkrb/main_dialog.rb:44
+#: src/lib/authui/ldapkrb/main_dialog.rb:63
+msgid "Use a Directory as Identity Provider (LDAP)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:44
+#: src/lib/authui/ldapkrb/main_dialog.rb:67
+#, fuzzy
+#| msgid "&Authentication Mode"
+msgid "Authentication via Kerberos"
+msgstr "&Autentiseringsmodus"
+
+#. LDAP tab events
+#: src/lib/authui/ldapkrb/main_dialog.rb:76
+msgid ""
+"This computer is currently using SSSD to authenticate users.\n"
+"Before you may use legacy LDAP authentication (pam_ldap), please disable SSSD from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:84
+msgid ""
+"This computer is currently reading user database from SSSD identity provider.\n"
+"Before you may use LDAP user database (nss_ldap), please disable SSSD user database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:92
+msgid ""
+"This computer is currently reading group database from SSSD identity provider.\n"
+"Before you may use LDAP group database (nss_ldap), please disable SSSD group database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:100
+msgid ""
+"This computer is currently reading sudoers database from SSSD identity provider.\n"
+"Before you may use LDAP sudoers database (nss_ldap), please disable SSSD sudo database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:108
+msgid ""
+"This computer is currently reading automount database from SSSD identity provider.\n"
+"Before you may use LDAP automount database (nss_ldap), please disable SSSD automount database from \"User Logon Management\"."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:118
+msgid "Please enter server URI."
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:126
+msgid "Please enter DN of search base."
+msgstr ""
+
+#. Test URI input
+#: src/lib/authui/ldapkrb/main_dialog.rb:133
+msgid "Successfully contacted LDAP server on URI %s!"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:135
+msgid ""
+"Connection check has failed on URI %s.\n"
+"\n"
+"%s"
+msgstr ""
+
+#. Test host address input, construct URI for each one.
+#: src/lib/authui/ldapkrb/main_dialog.rb:154
+msgid "Successfully contacted LDAP server on host %s"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:156
+msgid ""
+"Connection check has failed on host %s.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:163
+msgid ""
+"The name service cache is should only used with legacy LDAP identity provider,\n"
+"but your system currently has authentication domain enabled, which is not compatible with the cache.\n"
+"\n"
+"Do you still wish to enable the cache?"
+msgstr ""
+
+#. Kerberos tab events
+#: src/lib/authui/ldapkrb/main_dialog.rb:176
+msgid ""
+"This computer is currently using SSSD to authenticate users.\n"
+"Before you may use Kerberos authentication (pam_krb5), please disable SSSD from \"User Logon Management\"."
+msgstr ""
+
+#. Save Kerberos
+#: src/lib/authui/ldapkrb/main_dialog.rb:184
+#: src/lib/authui/ldapkrb/main_dialog.rb:194
+#: src/lib/authui/ldapkrb/main_dialog.rb:205
+#: src/lib/authui/ldapkrb/main_dialog.rb:210
+#: src/lib/authui/ldapkrb/main_dialog.rb:316
+#: src/lib/authui/ldapkrb/main_dialog.rb:408
+#: src/lib/authui/ldapkrb/main_dialog.rb:432
+msgid "(not specified)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:202
+#, fuzzy
+#| msgid "Do you really want to delete partition %1?"
+msgid "Are you sure to delete realm %s?"
+msgstr "Er du sikker på at du vil slette partisjonen %1?"
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:334
+msgid "Allow LDAP Users To Authenticate (pam_ldap)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:335
+msgid "Cache LDAP Entries For Faster Response (nscd)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:336
+#: src/lib/authui/ldapkrb/main_dialog.rb:405
+#, fuzzy
+#| msgid "Create Home Directory on Login"
+msgid "Automatically Create Home Directory"
+msgstr "Opprett hjemmekatalog ved innlogging"
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:338
+msgid "Read the following items from LDAP data source:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:339
+#: src/lib/authui/sssd/main_dialog.rb:80
+msgid "Users"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:340
+#: src/lib/authui/sssd/main_dialog.rb:81
+msgid "Groups"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:341
+#: src/lib/authui/sssd/main_dialog.rb:82
+msgid "Super-User Commands (sudo)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:342
+msgid "Network Disk Locations (automount)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:344
+msgid "Enter LDAP server locations (space separated), in either format:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:345
+msgid "- Host name or IP and port number (ip:port)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:346
+msgid "- URI (ldap://server:port, ldaps://server:port)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:348
+msgid "DN of Search Base (e.g. dc=example,dc=com)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:352
+msgid "DN of Bind User (Leave Empty for Anonymous Bind)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:354
+msgid "Password of the Bind User (Leave Empty for Anonymous Bind)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:357
+msgid "Identify Group Members by Their DNs (RFC2307bis)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:359
+msgid "Leave LDAP Connections Open for Consecutive Requests"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:362
+msgid "Secure LDAP communication"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:363
+msgid "Do Not Use Security"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:364
+msgid "Secure Communication via TLS"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:365
+msgid "Secure Communication via StartTLS"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:368
+msgid "Test Connection"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:368
+#: src/lib/authui/ldapkrb/main_dialog.rb:428
+#: src/lib/authui/sssd/main_dialog.rb:186
+msgid "Extended Options"
+msgstr ""
+
+#. If not specified, append the default port number
+#: src/lib/authui/ldapkrb/main_dialog.rb:403
+msgid "Allow Kerberos Users To Authenticate (pam_krb5)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:407
+msgid "Default Realm For User Login:"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:409
+#, fuzzy
+#| msgid "&Authentication Mode"
+msgid "All Authentication Realms"
+msgstr "&Autentiseringsmodus"
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:411
+msgid "Add Realm"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:411
+msgid "Edit Realm"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:411
+#, fuzzy
+#| msgid "Delete"
+msgid "Delete Realm"
+msgstr "Slett"
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:414
+msgid "Use DNS TXT Record to Discover Realms"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:416
+msgid "Use DNS SVC record to Discover KDC servers"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:419
+msgid "Allow Insecure Encryption (Windows NT)"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:421
+msgid "Allow KDC on Other Networks to Issue Authentication Tickets"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:423
+msgid "Allow Kerberos-Enabled Services to Take on The Identity Of a User"
+msgstr ""
+
+#: src/lib/authui/ldapkrb/main_dialog.rb:425
+msgid "Issue Address-Less Tickets for Computers Behind NAT"
+msgstr ""
+
+#. Entry point can be :sssd, :ldapkrb, or :auto
+#. In auto mode, there will be two change settings buttons.
+#: src/lib/authui/main_dialog.rb:46
+msgid "LDAP and Kerberos Client"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:48
+msgid "User Logon Management"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:63
+#, fuzzy
+#| msgid "Basic Settings:"
+msgid "Change Settings"
+msgstr "Grunninnstillinger:"
+
+#. Allow entering both SSSD and ldapkrb settings
+#: src/lib/authui/main_dialog.rb:67
+#, fuzzy
+#| msgid "Global Configuration"
+msgid "User Logon Configuration"
+msgstr "Generell konfigurasjon"
+
+#: src/lib/authui/main_dialog.rb:68
+#, fuzzy
+#| msgid "Global Configuration"
+msgid "LDAP/Kerberos Configuration"
+msgstr "Generell konfigurasjon"
+
+#. Let user choose one additional parameter to customise for domain.
+#: src/lib/authui/main_dialog.rb:89
+#: src/lib/authui/sssd/extended_param_dialog.rb:54
+#: src/lib/authui/sssd/main_dialog.rb:177
+#: src/lib/authui/sssd/manage_ad_dialog.rb:98
+msgid "Name"
+msgstr "Navn"
+
+#: src/lib/authui/main_dialog.rb:89 src/lib/authui/sssd/main_dialog.rb:177
+#: src/lib/authui/sssd/manage_ad_dialog.rb:98
+msgid "Value"
+msgstr "Verdi"
+
+#: src/lib/authui/main_dialog.rb:91
+msgid "Computer Name"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:92
+msgid "Full Computer Name"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:92 src/lib/authui/main_dialog.rb:93
+msgid "(Name is not resolvable)"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:93
+#, fuzzy
+#| msgid "Network Services"
+msgid "Network Domain"
+msgstr "Nettverkstjenester"
+
+#: src/lib/authui/main_dialog.rb:94
+msgid "IP Addresses"
+msgstr ""
+
+#: src/lib/authui/main_dialog.rb:95
+msgid "Identity Domains"
+msgstr ""
+
+#: src/lib/authui/sssd/extended_param_dialog.rb:54
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: src/lib/authui/sssd/extended_param_dialog.rb:65
+msgid "Extended options"
+msgstr ""
+
+#: src/lib/authui/sssd/extended_param_dialog.rb:68
+#, fuzzy
+#| msgid "Filter:"
+msgid "Name filter:"
+msgstr "Filter:"
+
 #. Create parameter editor controls (label, input, help text) and return them.
-#: src/lib/yauthclient/initial_customisation_dialog.rb:70
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:74
 #, fuzzy
 #| msgid "None"
 msgid "None."
 msgstr "Ingen"
 
 #. Render controls for editing parameter values, according to parameter data type.
-#: src/lib/yauthclient/initial_customisation_dialog.rb:105
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:109
 #, fuzzy
 #| msgid "Mount Parameters"
 msgid "Mandatory Parameters"
 msgstr "Monteringsparametere"
 
-#: src/lib/yauthclient/initial_customisation_dialog.rb:112
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:116
 #, fuzzy
 #| msgid "Optional Parameter File"
 msgid "Optional Parameters"
 msgstr "Fil med alternative parametere"
 
 #. Check that all mandatory parameters are set
-#: src/lib/yauthclient/initial_customisation_dialog.rb:138
+#: src/lib/authui/sssd/initial_customisation_dialog.rb:142
 msgid "Please complete all of the following mandatory parameters:\n"
 msgstr ""
 
-#. Render overview and edit buttons on left side, config editor on right side.
-#: src/lib/yauthclient/main_dialog.rb:55
+#. SSSD section name to UI caption mapping
+#: src/lib/authui/sssd/main_dialog.rb:40
 #, fuzzy
-#| msgid "Authenticated Clients"
-msgid "Authentication Client Configuration"
-msgstr "Autentiserte klienter"
-
-#. Overview of all config sections
-#: src/lib/yauthclient/main_dialog.rb:62
-msgid "Global Configuration"
+#| msgid "Global Configuration"
+msgid "Global Options"
 msgstr "Generell konfigurasjon"
 
-#: src/lib/yauthclient/main_dialog.rb:65
-msgid "Create Home Directory on Login"
+#: src/lib/authui/sssd/main_dialog.rb:40
+#, fuzzy
+#| msgid "Filter:"
+msgid "Name switch"
+msgstr "Filter:"
+
+#: src/lib/authui/sssd/main_dialog.rb:41
+#, fuzzy
+#| msgid "&Authentication Mode"
+msgid "Authentication"
+msgstr "&Autentiseringsmodus"
+
+#: src/lib/authui/sssd/main_dialog.rb:41
+msgid "Sudo"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:42
+msgid "Auto-Mount"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:42 src/lib/authui/sssd/main_dialog.rb:84
+msgid "SSH Public Keys"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:43 src/lib/authui/sssd/main_dialog.rb:85
+msgid "Privilege Account Certificate (MS-PAC)"
+msgstr ""
+
+#. Render overview and edit buttons on left side, config editor on right side.
+#: src/lib/authui/sssd/main_dialog.rb:67
+msgid "Manage Domain User Logon"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:75
+msgid "Daemon Status: "
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:75
+msgid "Running"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:75
+msgid "Stopped"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:76
+msgid "Allow Domain User Logon"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:77
+#, fuzzy
+#| msgid "Create Home Directory on Login"
+msgid "Create Home Directory"
 msgstr "Opprett hjemmekatalog ved innlogging"
 
-#: src/lib/yauthclient/main_dialog.rb:68
+#: src/lib/authui/sssd/main_dialog.rb:79
+msgid "Enable domain data source:"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:83
+msgid "Map Network Drives (automount)"
+msgstr ""
+
+#: src/lib/authui/sssd/main_dialog.rb:91
 #, fuzzy
-#| msgid "Enable the NTP daemon"
-msgid "Enable SSSD daemon"
-msgstr "Aktiver NTP-nisse"
+#| msgid "Domain"
+msgid "Join Domain"
+msgstr "Domene"
 
-#: src/lib/yauthclient/main_dialog.rb:73
+#: src/lib/authui/sssd/main_dialog.rb:92
 #, fuzzy
+#| msgid "Domain"
+msgid "Leave Domain"
+msgstr "Domene"
+
+#: src/lib/authui/sssd/main_dialog.rb:93
+msgid "Clear Domain Cache"
+msgstr ""
+
+#. Render overview of all config sections in tree.
+#. For the currently selection config section, render customised parameters and values in a table.
+#: src/lib/authui/sssd/main_dialog.rb:138
+#: src/lib/authui/sssd/main_dialog.rb:150
+#, fuzzy
 #| msgid "Sections: %1"
-msgid "Sections"
+msgid "Service Options"
 msgstr "Seksjoner: %1"
 
-#: src/lib/yauthclient/main_dialog.rb:76
+#: src/lib/authui/sssd/main_dialog.rb:139
+#: src/lib/authui/sssd/main_dialog.rb:150
 #, fuzzy
-#| msgid "Network Services"
-msgid "New Service/Domain"
-msgstr "Nettverkstjenester"
+#| msgid "Domain"
+msgid "Domain Options"
+msgstr "Domene"
 
-#: src/lib/yauthclient/main_dialog.rb:77
-#, fuzzy
-#| msgid "Selected Service"
-msgid "Delete Service/Domain"
-msgstr "Valgt tjeneste"
+#: src/lib/authui/sssd/main_dialog.rb:151
+msgid "Select Global Options, a service, or a domain to customise."
+msgstr ""
 
+#. Additional widgets for a domain
+#: src/lib/authui/sssd/main_dialog.rb:157
+msgid "Use this domain"
+msgstr ""
+
+#. Additiona widgets for an AD domain
+#: src/lib/authui/sssd/main_dialog.rb:162
+msgid "Enroll to Active Directory"
+msgstr ""
+
 #. TRANSLATORS: Label of the area used to customise parameters.
 #. %s is the name of the section being customised.
-#: src/lib/yauthclient/main_dialog.rb:114
+#: src/lib/authui/sssd/main_dialog.rb:172
 #, fuzzy
 #| msgid "Custom Registration Server"
-msgid "Customisation - %s"
+msgid "Options - %s"
 msgstr "Egendefinert registreringsserver"
 
-#: src/lib/yauthclient/main_dialog.rb:118
-#: src/lib/yauthclient/main_dialog.rb:143
-msgid "Name"
-msgstr "Navn"
+#. Delete the chosen domain
+#: src/lib/authui/sssd/main_dialog.rb:217
+msgid "Please select a domain among the list."
+msgstr ""
 
-#: src/lib/yauthclient/main_dialog.rb:118
-msgid "Value"
-msgstr "Verdi"
+#: src/lib/authui/sssd/main_dialog.rb:220
+#, fuzzy
+#| msgid "Do you really want to delete partition %1?"
+msgid "Do you really wish to erase configuration for domain %s?"
+msgstr "Er du sikker på at du vil slette partisjonen %1?"
 
-#: src/lib/yauthclient/main_dialog.rb:118
-#: src/lib/yauthclient/main_dialog.rb:143
-msgid "Description"
-msgstr "Beskrivelse"
+#. Enable/disable SSSD daemon
+#: src/lib/authui/sssd/main_dialog.rb:252
+msgid ""
+"This computer is currently using legacy LDAP or Kerberos method to authenticate users.\n"
+"Before you may use SSSD to authenticate users, please disable LDAP and Kerberos authentication from \"LDAP and Kerberos Client\"."
+msgstr ""
 
-#. For the currently selected config section, render list of additional parameters for customisation.
-#: src/lib/yauthclient/main_dialog.rb:137
-#, fuzzy
-#| msgid "Modem Parameters"
-msgid "More Parameters"
-msgstr "Modemparametere"
+#. Enable/disable NSS password database
+#: src/lib/authui/sssd/main_dialog.rb:284
+msgid ""
+"This computer is currently reading user database from LDAP identity provider.\n"
+"Before you may use SSSD user database, please disable LDAP user database from \"LDAP and Kerberos Client\"."
+msgstr ""
 
-#: src/lib/yauthclient/main_dialog.rb:140
-#, fuzzy
-#| msgid "Filter:"
-msgid "Name filter:"
-msgstr "Filter:"
+#. Enable/disable NSS group database
+#: src/lib/authui/sssd/main_dialog.rb:302
+msgid ""
+"This computer is currently reading group database from LDAP identity provider.\n"
+"Before you may use SSSD group database, please disable LDAP group database from \"LDAP and Kerberos Client\"."
+msgstr ""
 
-#. Check system environment for the proper operation of SSSD
-#: src/lib/yauthclient/main_dialog.rb:169
+#. Enable/disable NSS sudoers database
+#: src/lib/authui/sssd/main_dialog.rb:320
 msgid ""
-"Your system is configured for using nss_ldap.\n"
-"This module is designed to configure your system via sssd.\n"
-"If you continue, your nss_ldap configuration will be removed.\n"
-"Do you want to continue?"
+"This computer is currently reading sudoers database from LDAP identity provider.\n"
+"Before you may use SSSD sudoers database, please disable LDAP sudoers database from \"LDAP and Kerberos Client\"."
 msgstr ""
 
-#: src/lib/yauthclient/main_dialog.rb:179
+#: src/lib/authui/sssd/main_dialog.rb:328
 msgid ""
-"Your system is configured as OES client.\n"
-"This module is designed to configure your system via sssd.\n"
-"If you continue, your OES client configuration will be deactivated.\n"
-"Do you want to continue?"
+"Sudo data source has been globally enabled.\n"
+"Please remember to also customise \"sudo_provider\" parameter in Extended Options of each individual domain that provides sudo data."
 msgstr ""
 
-#. Delete the chosen section (domain or service)
-#: src/lib/yauthclient/main_dialog.rb:223
-#, fuzzy
-#| msgid "You cannot delete the active profile."
-msgid "You may not delete section SSSD."
-msgstr "Du kan ikke slette den aktive profilen."
+#. Enable/disable NSS automount database
+#: src/lib/authui/sssd/main_dialog.rb:342
+msgid ""
+"This computer is currently reading automount database from LDAP identity provider.\n"
+"Before you may use SSSD automount database, please disable LDAP automount database from \"LDAP and Kerberos Client\"."
+msgstr ""
 
-#: src/lib/yauthclient/main_dialog.rb:225
-#, fuzzy
-#| msgid "Do you really want to delete partition %1?"
-msgid "Do you really wish to delete section %s?"
-msgstr "Er du sikker på at du vil slette partisjonen %1?"
+#: src/lib/authui/sssd/main_dialog.rb:350
+msgid ""
+"Automount data source has been globally enabled.\n"
+"Please remember to also customise \"autofs_provider\" parameter in Extended Options of each individual domain that provides automount data."
+msgstr ""
 
+#. Enable/disable PAC responder
+#: src/lib/authui/sssd/main_dialog.rb:374
+msgid ""
+"MS-PAC data source has been globally enabled.\n"
+"This optional feature depends on the capabilities of your Microsoft Active Directory domain.\n"
+"SSSD may fail to start if Active Directory domain lacks the support, in which case please turn off this feature."
+msgstr ""
+
 #. Forbid removal of mandatory parameters
-#: src/lib/yauthclient/main_dialog.rb:269
+#: src/lib/authui/sssd/main_dialog.rb:409
 msgid "This is a mandatory parameter and it may not be deleted."
 msgstr ""
 
 #. Warn against removal of important parameters
-#: src/lib/yauthclient/main_dialog.rb:274
+#: src/lib/authui/sssd/main_dialog.rb:414
 #, fuzzy
 #| msgid "Modem parameter details"
 msgid "Confirm parameter removal: "
 msgstr "Detaljerte modemparametere"
 
-#: src/lib/yauthclient/main_dialog.rb:275
+#: src/lib/authui/sssd/main_dialog.rb:415
 msgid ""
-"The parameter is important. Removal of the parameter may cause SSSD startup failure.\n"
+"The parameter is important. Removal of the parameter may cause configuration failure.\n"
 "Please consult SSSD manual page before moving on.\n"
-"Do you still wish to continue?"
+"Do you still wish to remove the parameter?"
 msgstr ""
 
 #. Save settings - validate
-#: src/lib/yauthclient/main_dialog.rb:305
+#: src/lib/authui/sssd/main_dialog.rb:434
 #, fuzzy
 #| msgid "Logging enabled"
-msgid "No domain enabled"
+msgid "No domain"
 msgstr "Logging aktivert"
 
-#: src/lib/yauthclient/main_dialog.rb:306
+#: src/lib/authui/sssd/main_dialog.rb:435
 msgid ""
-"No domain has been enabled in [sssd] \"domains\" parameter.\n"
-"SSSD will not start, and only local authentication will be available.\n"
+"You have not configured any authentication domain, yet you chose to enable domain authentication.\n"
+"SSSD will fail to start, and only local authentication will be available.\n"
 "Do you still wish to proceed?"
 msgstr ""
 
-#. user must correct the mistake
-#: src/lib/yauthclient/main_dialog.rb:323
-msgid "Inactive domain(s) found"
+#. Remove all SSSD cache files
+#: src/lib/authui/sssd/main_dialog.rb:455
+msgid "All cached data have been erased."
 msgstr ""
 
-#. Render input box and dropdowns for service/domain creation
-#: src/lib/yauthclient/new_section_dialog.rb:49
-#, fuzzy
-#| msgid "Would you like to enable access to the profile repository?"
-msgid "Would you like to enable another service or join a domain?"
-msgstr "Vil du aktivere tilgang til profilarkivet?"
+#. The frame is shown only if AD server can be discovered or is explicitly specified
+#. The frame is hidden if the module is not running in autoyast mode and AD server is not found/specified
+#: src/lib/authui/sssd/manage_ad_dialog.rb:68
+msgid "Enter AD user credentials (e.g. Administrator) to enroll or re-enroll this computer:"
+msgstr ""
 
-#. New service
-#: src/lib/yauthclient/new_section_dialog.rb:54
-msgid "Service"
-msgstr "Tjeneste"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:69
+msgid "Username"
+msgstr ""
 
-#. New domain and provider types
-#: src/lib/yauthclient/new_section_dialog.rb:58
-msgid "Domain"
-msgstr "Domene"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:70
+msgid "Password"
+msgstr ""
 
-#: src/lib/yauthclient/new_section_dialog.rb:61
-msgid "Domain name (example.com):"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:71
+msgid "Optional Organisation Unit such as \"Headquarter/HR/BuildingA\""
 msgstr ""
 
-#: src/lib/yauthclient/new_section_dialog.rb:64
-#, fuzzy
-#| msgid "Identification:"
-msgid "Identification provider:"
-msgstr "Identifikasjon:"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:72
+msgid "Overwrite Samba configuration to work with this AD"
+msgstr ""
 
-#: src/lib/yauthclient/new_section_dialog.rb:69
-#, fuzzy
-#| msgid "&Authentication Mode"
-msgid "Authentication provider:"
-msgstr "&Autentiseringsmodus"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:76
+#: src/lib/authui/sssd/manage_ad_dialog.rb:86
+msgid "(Not applicable in AutoYast editor)"
+msgstr ""
 
-#: src/lib/yauthclient/new_section_dialog.rb:72
-msgid "Activate Domain"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:78
+msgid " (Auto-discovered via DNS)"
 msgstr ""
 
-#. Create new service
-#: src/lib/yauthclient/new_section_dialog.rb:105
-#, fuzzy
-#| msgid "These services will be enabled"
-msgid "There are no more services to be enabled."
-msgstr "Disse tjenestene vil bli aktivert"
+#: src/lib/authui/sssd/manage_ad_dialog.rb:82
+msgid "(DNS error)"
+msgstr ""
 
-#. Create new domain
-#: src/lib/yauthclient/new_section_dialog.rb:123
-#, fuzzy
-#| msgid "Enter a name for the new profile."
-msgid "Please enter a name for the new domain."
-msgstr "Angi et navn for den nye profilen."
+#: src/lib/authui/sssd/manage_ad_dialog.rb:83
+msgid ""
+"The name resolution service on this computer does not satisfy AD enrollment requirements.\n"
+"Please configure your network environment to use AD server as the name resolver."
+msgstr ""
 
-#: src/lib/yauthclient/new_section_dialog.rb:126
-#, fuzzy
-#| msgid "This domain is already defined."
-msgid "The domain name is already in-use."
-msgstr "Dette domenet is allerede definert."
+#: src/lib/authui/sssd/manage_ad_dialog.rb:89
+msgid "Already enrolled"
+msgstr ""
 
-#. Define Global Parameters
-#: src/lib/yauthclient/params.rb:108
-msgid "Indicates what is the syntax of the config file."
+#: src/lib/authui/sssd/manage_ad_dialog.rb:91
+msgid "Not yet enrolled"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:114
-msgid "Comma separated list of services that are started when sssd itself starts."
+#: src/lib/authui/sssd/manage_ad_dialog.rb:114
+msgid "Active Directory enrollment"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:115
+#: src/lib/authui/sssd/manage_ad_dialog.rb:116
+msgid "Current status"
+msgstr ""
+
+#: src/lib/authui/sssd/manage_ad_dialog.rb:116
+msgid "Gathering status..."
+msgstr ""
+
+#. Enroll the computer, or save the enrollment details
+#: src/lib/authui/sssd/manage_ad_dialog.rb:134
+msgid "Please enter both username and password."
+msgstr ""
+
+#. join_ad will configure and apply Kerberos and then join AD
+#: src/lib/authui/sssd/manage_ad_dialog.rb:144
+msgid "AD enrollment details have been saved for AutoYast. Please keep in mind that AD user password is saved in plain text."
+msgstr ""
+
+#: src/lib/authui/sssd/manage_ad_dialog.rb:150
 msgid ""
+"Enrollment has completed successfully!\n"
 "\n"
-"Supported services: nss, pam, sudo, autofs, ssh"
+"Command output:\n"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:120 src/lib/yauthclient/params.rb:174
-msgid "Number of times services should attempt to reconnect in the event of a Data Provider crash or restart before they give up"
+#. If user enters this dialog once again, the details should be cleared.
+#: src/lib/authui/sssd/manage_ad_dialog.rb:158
+msgid ""
+"The enrollment process failed.\n"
+"\n"
+"Command output:\n"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:125
-msgid "SSSD can use more domains at the same time, but at least one must be configured or SSSD won't start."
+#. ID provider to UI caption mapping and reversed mapping
+#: src/lib/authui/sssd/new_section_dialog.rb:37
+#: src/lib/authui/sssd/new_section_dialog.rb:50
+msgid "Delegate to third-party software library (proxy_lib_name)"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:126
-msgid "This parameter contains the list of domains in the order these will be queried."
+#: src/lib/authui/sssd/new_section_dialog.rb:38
+#: src/lib/authui/sssd/new_section_dialog.rb:51
+msgid "Local SSSD file database"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:130
-msgid "Default regular expression that describes how to parse the string containing user name and domain into these components"
+#: src/lib/authui/sssd/new_section_dialog.rb:39
+#: src/lib/authui/sssd/new_section_dialog.rb:49
+msgid "Microsoft Active Directory"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:134
-msgid "The default printf(3)-compatible format that describes how to translate a (name, domain) tuple into a fully qualified name."
+#: src/lib/authui/sssd/new_section_dialog.rb:40
+#: src/lib/authui/sssd/new_section_dialog.rb:48
+msgid "FreeIPA"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:138
-msgid "SSSD monitors the state of resolv.conf to identify when it needs to update its internal DNS resolver."
+#: src/lib/authui/sssd/new_section_dialog.rb:41
+#: src/lib/authui/sssd/new_section_dialog.rb:46
+msgid "Generic directory service (LDAP)"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:139
-msgid "By default, we will attempt to use inotify for this, and will fall back to polling resolv.conf every five seconds if inotify cannot be used."
+#: src/lib/authui/sssd/new_section_dialog.rb:47
+msgid "Generic Kerberos service"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:143
-msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files."
+#: src/lib/authui/sssd/new_section_dialog.rb:52
+msgid "The domain does not provide authentication service"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:147
-msgid "This string will be used as a default domain name for all names without a domain name component."
+#. New domain and provider types
+#: src/lib/authui/sssd/new_section_dialog.rb:75
+msgid "Domain name (such as example.com):"
 msgstr ""
 
+#: src/lib/authui/sssd/new_section_dialog.rb:78
+msgid "Which service provides identity data, such as user names and group memberships?"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:83
+msgid "Which service handles user authentication?"
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:86
+#, fuzzy
+#| msgid "Enable the NTP daemon"
+msgid "Enable the domain"
+msgstr "Aktiver NTP-nisse"
+
+#. Create new domain
+#: src/lib/authui/sssd/new_section_dialog.rb:106
+#, fuzzy
+#| msgid "Enter a name for the new profile."
+msgid "Please enter the domain name."
+msgstr "Angi et navn for den nye profilen."
+
+#: src/lib/authui/sssd/new_section_dialog.rb:109
+msgid "The domain name collides with a reserved keyword. Please choose a different name."
+msgstr ""
+
+#: src/lib/authui/sssd/new_section_dialog.rb:112
+#, fuzzy
+#| msgid "This domain is already defined."
+msgid "The domain name is already in-use."
+msgstr "Dette domenet is allerede definert."
+
+#. Define Global Parameters
+#. Omit 'services' and 'domains' from section [sssd], because they are never customised directly by the end-user.
+#: src/lib/authui/sssd/params.rb:110
+msgid "Version of configuration file syntax (1 or 2)"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:115 src/lib/authui/sssd/params.rb:166
+msgid "Number of times services should attempt to reconnect in the event of a Data Provider crash or restart before they give up"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:119
+msgid "The regular expression parses user name and domain name into components"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:123
+msgid "The default printf(3)-compatible format that describes translation of a name/domain tuple into FQDN"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:127
+msgid "Whether or not to use inotify mechanism to monitor resolv.conf to update internal DNS resolver"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:131
+msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:135
+msgid "A default domain name for all names without a domian name component"
+msgstr ""
+
 #. Define Global Services Parameters
-#: src/lib/yauthclient/params.rb:154
-msgid "Bit mask that indicates which debug levels will be visible. 0x0010 is the default value as well as the lowest allowed value, 0xFFF0 is the most verbose mode."
+#. NSS configuration options
+#. PAM configuration options
+#. SUDO configuration options
+#. AUTOFS configuration options
+#. SSH configuration options
+#. DOMAIN SECTIONS
+#. These configuration options can be present in a domain configuration section, that is, in a section called “[domain/NAME]”
+#: src/lib/authui/sssd/params.rb:139 src/lib/authui/sssd/params.rb:146
+#: src/lib/authui/sssd/params.rb:188 src/lib/authui/sssd/params.rb:266
+#: src/lib/authui/sssd/params.rb:308 src/lib/authui/sssd/params.rb:320
+#: src/lib/authui/sssd/params.rb:332 src/lib/authui/sssd/params.rb:350
+msgid "Level of details for logging. Can be numeric (0-9) or a big mask such as 0x0010 (lowest level) or 0xFFF (highest level)"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:159
+#: src/lib/authui/sssd/params.rb:151
 msgid "Add a timestamp to the debug messages"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:164
+#: src/lib/authui/sssd/params.rb:156
 msgid "Add microseconds to the timestamp in debug messages"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:169
-msgid "Timeout in seconds between heartbeats for this service."
+#: src/lib/authui/sssd/params.rb:161
+msgid "Timeout in seconds between heartbeats for this service"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:179
-msgid "This option specifies the maximum number of file descriptors that may be opened at one time by this SSSD process."
+#: src/lib/authui/sssd/params.rb:171
+msgid "Maximum number of file descriptors that may be opened at a time by SSSD service process"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:184
-msgid "This option specifies the number of seconds that a client of an SSSD process can hold onto a file descriptor without communicating on it."
+#: src/lib/authui/sssd/params.rb:176
+msgid "Number of seconds a client of SSSD process can hold onto a file descriptor without any communication"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:189
-msgid "If a service is not responding to ping checks (see the “timeout” option), it is first sent the SIGTERM signal that instructs it to quit gracefully."
+#: src/lib/authui/sssd/params.rb:181
+msgid "The service will receive SIGTERM after this number of seconds of consecutive ping check failure"
 msgstr ""
 
-#. NSS configuration options
-#: src/lib/yauthclient/params.rb:197
+#: src/lib/authui/sssd/params.rb:193
 msgid "How many seconds should cache nss_sss enumerations (requests for info about all users)?"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:202
+#: src/lib/authui/sssd/params.rb:198
 msgid "The entry cache can be set to automatically update entries in the background if they are requested beyond a percentage of the entry_cache_timeout value for the domain."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:207
+#: src/lib/authui/sssd/params.rb:203
 msgid "Specifies for how many seconds nss_sss should cache negative cache hits (that is, queries for invalid database entries, like nonexistent ones) before asking the back end again."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:213
+#: src/lib/authui/sssd/params.rb:209
 msgid "Exclude certain users from being fetched by SSS backend"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:219
+#: src/lib/authui/sssd/params.rb:215
 msgid "Exclude certain groups from being fetched by SSS backend"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:224
+#: src/lib/authui/sssd/params.rb:220
 msgid "If you want filtered user to still be group members set this option to false."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:228
+#: src/lib/authui/sssd/params.rb:224 src/lib/authui/sssd/params.rb:510
 msgid "Override the user's home directory. You can either provide an absolute value or a template."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:232 src/lib/yauthclient/params.rb:1185
+#: src/lib/authui/sssd/params.rb:228 src/lib/authui/sssd/params.rb:1213
 msgid "Set a default template for a user's home directory if one is not specified explicitly by the domain's data provider."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:236
+#: src/lib/authui/sssd/params.rb:232
 msgid "Override the login shell for all users."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:240
+#: src/lib/authui/sssd/params.rb:236
 msgid "Restrict user shell to one of the listed values."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:244
+#: src/lib/authui/sssd/params.rb:240
 msgid "Replace any instance of these shells with the shell_fallback"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:249
+#: src/lib/authui/sssd/params.rb:245
 msgid "The default shell to use if an allowed shell is not installed on the machine."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:253 src/lib/yauthclient/params.rb:1189
+#: src/lib/authui/sssd/params.rb:249 src/lib/authui/sssd/params.rb:1217
 msgid "The default shell to use if the provider does not return one during lookup."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:258 src/lib/yauthclient/params.rb:301
+#: src/lib/authui/sssd/params.rb:254 src/lib/authui/sssd/params.rb:301
 msgid "Specifies time in seconds for which the list of subdomains will be considered valid."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:263
+#: src/lib/authui/sssd/params.rb:259
 msgid "Specifies time in seconds for which records in the in-memory cache will be valid."
 msgstr ""
 
-#. PAM configuration options
-#: src/lib/yauthclient/params.rb:271
+#: src/lib/authui/sssd/params.rb:271
 msgid "If the authentication provider is offline, how long we should allow cached logins (in days since the last successful online login)."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:276 src/lib/yauthclient/params.rb:281
+#: src/lib/authui/sssd/params.rb:276 src/lib/authui/sssd/params.rb:281
 msgid "The time in minutes which has to pass after offline_failed_login_attempts has been reached before a new login attempt is possible."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:286
+#: src/lib/authui/sssd/params.rb:286
 msgid "Controls what kind of messages are shown to the user during authentication."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:291
+#: src/lib/authui/sssd/params.rb:291
 msgid "For any PAM request while SSSD is online, the SSSD will attempt to immediately update the cached identity information for the user in order to ensure that authentication takes place with the latest information."
 msgstr ""
 
 #. The kerberos domain section
-#: src/lib/yauthclient/params.rb:296 src/lib/yauthclient/params.rb:788
-#: src/lib/yauthclient/params.rb:1073
+#: src/lib/authui/sssd/params.rb:296 src/lib/authui/sssd/params.rb:815
+#: src/lib/authui/sssd/params.rb:1100
 msgid "Display a warning N days before the password expires."
 msgstr ""
 
-#. SUDO configuration options
-#: src/lib/yauthclient/params.rb:309
+#: src/lib/authui/sssd/params.rb:313
 msgid "Whether or not to evaluate the sudoNotBefore and sudoNotAfter attributes that implement time-dependent sudoers entries."
 msgstr ""
 
-#. AUTOFS configuration options
-#: src/lib/yauthclient/params.rb:317
+#: src/lib/authui/sssd/params.rb:325
 msgid "Specifies for how many seconds the autofs responder should cache negative hits before asking the back end again."
 msgstr ""
 
-#. SSH configuration options
-#: src/lib/yauthclient/params.rb:325
+#: src/lib/authui/sssd/params.rb:337
 msgid "Whether or not to hash host names and addresses in the managed known_hosts file."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:330
+#: src/lib/authui/sssd/params.rb:342
 msgid "How many seconds to keep a host in the managed known_hosts file after its host keys were requested."
 msgstr ""
 
-#. DOMAIN SECTIONS
-#. These configuration options can be present in a domain configuration section, that is, in a section called “[domain/NAME]”
-#: src/lib/yauthclient/params.rb:339 src/lib/yauthclient/params.rb:344
+#: src/lib/authui/sssd/params.rb:355 src/lib/authui/sssd/params.rb:360
 msgid "UID and GID limits for the domain. If a domain contains an entry that is outside these limits, it is ignored."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:350
+#: src/lib/authui/sssd/params.rb:366
 msgid "Read all entities from backend database (increase server load)"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:355
+#: src/lib/authui/sssd/params.rb:371
 msgid "If the service does not terminate after “force_timeout” seconds, the monitor will forcibly shut it down by sending a SIGKILL signal."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:360
+#: src/lib/authui/sssd/params.rb:376
 msgid "How many seconds nss_sss should consider entries valid before asking the backend again."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:365
+#: src/lib/authui/sssd/params.rb:381
 msgid "How many seconds nss_sss should consider user entries valid before asking the backend again."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:370
+#: src/lib/authui/sssd/params.rb:386
 msgid "How many seconds nss_sss should consider group entries valid before asking the backend again."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:375
+#: src/lib/authui/sssd/params.rb:391
 msgid "How many seconds nss_sss should consider netgroup entries valid before asking the backend again."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:380
+#: src/lib/authui/sssd/params.rb:396
 msgid "How many seconds nss_sss should consider service entries valid before asking the backend again."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:385
+#: src/lib/authui/sssd/params.rb:401
 msgid "How many seconds sudo should consider rules valid before asking the backend again."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:390
+#: src/lib/authui/sssd/params.rb:406
 msgid "How many seconds the autofs service should consider automounter maps valid before asking the backend again."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:396
+#: src/lib/authui/sssd/params.rb:412
 msgid "Cache credentials for offline use"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:401
+#: src/lib/authui/sssd/params.rb:417
 msgid "Number of days entries are left in cache after last successful login before being removed during a cleanup of the cache."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:408
+#: src/lib/authui/sssd/params.rb:424
 msgid "The identification provider used for the domain."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:413
+#: src/lib/authui/sssd/params.rb:429
 msgid "Use the full name and domain (as formatted by the domain's full_name_format) as the user's login name reported to NSS."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:420
+#: src/lib/authui/sssd/params.rb:436
 msgid "The authentication provider used for the domain"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:426
+#: src/lib/authui/sssd/params.rb:442
 msgid "The access control provider used for the domain."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:431
+#: src/lib/authui/sssd/params.rb:447
 msgid "The provider which should handle change password operations for the domain."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:437
+#: src/lib/authui/sssd/params.rb:453
 msgid "The SUDO provider used for the domain."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:443
+#: src/lib/authui/sssd/params.rb:459
 msgid "The provider which should handle loading of selinux settings."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:449
+#: src/lib/authui/sssd/params.rb:465
 msgid "The provider which should handle fetching of subdomains."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:455
+#: src/lib/authui/sssd/params.rb:471
 msgid "The autofs provider used for the domain."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:461
+#: src/lib/authui/sssd/params.rb:477
 msgid "The provider used for retrieving host identity information."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:466
+#: src/lib/authui/sssd/params.rb:482
 msgid "Regular expression for this domain that describes how to parse the string containing user name and domain into these components."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:471
+#: src/lib/authui/sssd/params.rb:487
 msgid "A printf(3)-compatible format that describes how to translate a (name, domain) tuple for this domain into a fully qualified name."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:477
+#: src/lib/authui/sssd/params.rb:493
 msgid "Provides the ability to select preferred address family to use when performing DNS lookups."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:482
+#: src/lib/authui/sssd/params.rb:498
 msgid "Defines the amount of time (in seconds) to wait for a reply from the DNS resolver before assuming that it is unreachable."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:486
+#: src/lib/authui/sssd/params.rb:502
 msgid "If service discovery is used in the back end, specifies the domain part of the service discovery DNS query."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:490
+#: src/lib/authui/sssd/params.rb:506
 msgid "Override the primary GID value with the one specified."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:495
+#: src/lib/authui/sssd/params.rb:516
 msgid "Treat user and group names as case sensitive."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:500
+#: src/lib/authui/sssd/params.rb:521
 msgid "When a user or group is looked up by name in the proxy provider, a second lookup by ID is performed to 'canonicalize' the name in case the requested name was an alias."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:505
+#: src/lib/authui/sssd/params.rb:526
 msgid "Use this homedir as default value for all subdomains within this domain."
 msgstr ""
 
 #. Following options will be provided by SSSD's 'simple' access-control provider
-#: src/lib/yauthclient/params.rb:511
+#: src/lib/authui/sssd/params.rb:532
 msgid "Comma separated list of users who are allowed to log in."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:516
+#: src/lib/authui/sssd/params.rb:537
 msgid "Comma separated list of groups who are allowed to log in. This applies only to groups within this SSSD domain."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:521
+#: src/lib/authui/sssd/params.rb:542
 msgid "Comma separated list of groups that are explicitly denied access. This applies only to groups within this SSSD domain."
 msgstr ""
 
 #. The local domain section
 #. This section contains settings for domain that stores users and groups in SSSD native database, that is, a domain that uses id_provider=local.
-#: src/lib/yauthclient/params.rb:530
+#: src/lib/authui/sssd/params.rb:551
 msgid "The tools append the login name to base_directory and use that as the home directory."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:535
+#: src/lib/authui/sssd/params.rb:556
 msgid "Indicate if a home directory should be created by default for new users."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:540
+#: src/lib/authui/sssd/params.rb:561
 msgid "Indicate if a home directory should be removed by default for deleted users."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:545
+#: src/lib/authui/sssd/params.rb:566
 msgid "Used by sss_useradd(8) to specify the default permissions on a newly created home directory."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:550
+#: src/lib/authui/sssd/params.rb:571
 msgid "The skeleton directory, which contains files and directories to be copied in the user's home directory, when the home directory is created by sss_useradd(8)"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:555
+#: src/lib/authui/sssd/params.rb:576
 msgid "The mail spool directory."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:559
+#: src/lib/authui/sssd/params.rb:580
 msgid "The command that is run after a user is removed."
 msgstr ""
 
 #. The ldap domain section
-#: src/lib/yauthclient/params.rb:568
+#: src/lib/authui/sssd/params.rb:589
+msgid "(Active Directory specific) Use token-groups attribute if available"
+msgstr ""
+
+#: src/lib/authui/sssd/params.rb:595
 msgid "URIs (ldap://) of LDAP servers (comma separated)"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:574
+#: src/lib/authui/sssd/params.rb:601
 msgid "The default base DN to use for performing LDAP sudo rules."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:579
+#: src/lib/authui/sssd/params.rb:606
 msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:585 src/lib/yauthclient/params.rb:591
+#: src/lib/authui/sssd/params.rb:612 src/lib/authui/sssd/params.rb:618
 msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference to change the password of a user."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:597
+#: src/lib/authui/sssd/params.rb:624
 #, fuzzy
 #| msgid "Base DN for the database"
 msgid "Base DN for LDAP search"
 msgstr "Hoved-DN for database"
 
-#: src/lib/yauthclient/params.rb:604
+#: src/lib/authui/sssd/params.rb:631
 #, fuzzy
 #| msgid "LDAP secure port"
 msgid "LDAP schema type"
 msgstr "Sikker LDAP-port"
 
-#: src/lib/yauthclient/params.rb:608
+#: src/lib/authui/sssd/params.rb:635
 msgid "The default bind DN to use for performing LDAP operations."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:614
+#: src/lib/authui/sssd/params.rb:641
 msgid "The type of the authentication token of the default bind DN."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:618
+#: src/lib/authui/sssd/params.rb:645
 msgid "The authentication token of the default bind DN."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:623
+#: src/lib/authui/sssd/params.rb:650
 msgid "The object class of a user entry in LDAP."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:628
+#: src/lib/authui/sssd/params.rb:655
 msgid "The LDAP attribute that corresponds to the user's login name."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:633
+#: src/lib/authui/sssd/params.rb:660
 msgid "The LDAP attribute that corresponds to the user's id."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:638
+#: src/lib/authui/sssd/params.rb:665
 msgid "The LDAP attribute that corresponds to the user's primary group id."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:643
+#: src/lib/authui/sssd/params.rb:670
 msgid "The LDAP attribute that corresponds to the user's gecos field."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:648
+#: src/lib/authui/sssd/params.rb:675
 msgid " The LDAP attribute that contains the name of the user's home directory."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:653
+#: src/lib/authui/sssd/params.rb:680
 msgid "The LDAP attribute that contains the path to the user's default shell."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:658
+#: src/lib/authui/sssd/params.rb:685
 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP user object."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:663
+#: src/lib/authui/sssd/params.rb:690
 msgid "The LDAP attribute that contains the objectSID of an LDAP user object."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:668 src/lib/yauthclient/params.rb:873
+#: src/lib/authui/sssd/params.rb:695 src/lib/authui/sssd/params.rb:900
 msgid "The LDAP attribute that contains timestamp of the last modification of the parent object."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:673
+#: src/lib/authui/sssd/params.rb:700
 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (date of the last password change)."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:678
+#: src/lib/authui/sssd/params.rb:705
 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (minimum password age)."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:683
+#: src/lib/authui/sssd/params.rb:710
 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (maximum password age)."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:688
+#: src/lib/authui/sssd/params.rb:715
 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (password warning period)."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:693
+#: src/lib/authui/sssd/params.rb:720
 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (password inactivity period)."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:698
+#: src/lib/authui/sssd/params.rb:725
 msgid "When using ldap_pwd_policy=shadow or ldap_account_expire_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (account expiration date)."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:703
+#: src/lib/authui/sssd/params.rb:730
 msgid "When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of an LDAP attribute storing the date and time of last password change in kerberos."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:708
+#: src/lib/authui/sssd/params.rb:735
 msgid "When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of an LDAP attribute storing the date and time when current password expires."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:713
+#: src/lib/authui/sssd/params.rb:740
 msgid "When using ldap_account_expire_policy=ad, this parameter contains the name of an LDAP attribute storing the expiration time of the account."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:718
+#: src/lib/authui/sssd/params.rb:745
 msgid "When using ldap_account_expire_policy=ad, this parameter contains the name of an LDAP attribute storing the user account control bit field."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:723
+#: src/lib/authui/sssd/params.rb:750
 msgid "When using ldap_account_expire_policy=rhds or equivalent, this parameter determines if access is allowed or not."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:728
+#: src/lib/authui/sssd/params.rb:755
 msgid "When using ldap_account_expire_policy=nds, this attribute determines if access is allowed or not."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:733
+#: src/lib/authui/sssd/params.rb:760
 msgid "When using ldap_account_expire_policy=nds, this attribute determines until which date access is granted."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:738
+#: src/lib/authui/sssd/params.rb:765
 msgid "When using ldap_account_expire_policy=nds, this attribute determines the hours of a day in a week when access is granted."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:743
+#: src/lib/authui/sssd/params.rb:770
 msgid "The LDAP attribute that contains the user's Kerberos User Principal Name (UPN)."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:747
+#: src/lib/authui/sssd/params.rb:774
 msgid "The LDAP attribute that contains the user's SSH public keys."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:752
+#: src/lib/authui/sssd/params.rb:779
 msgid "Some directory servers, for example Active Directory, might deliver the realm part of the UPN in lower case, which might cause the authentication to fail."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:753
+#: src/lib/authui/sssd/params.rb:780
 msgid "Set this option to true if you want to use an upper-case realm."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:758
+#: src/lib/authui/sssd/params.rb:785
 msgid "Specifies how many seconds SSSD has to wait before refreshing its cache of enumerated records."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:763
+#: src/lib/authui/sssd/params.rb:790
 msgid "Determine how often to check the cache for inactive entries (such as groups with no members and users who have never logged in) and remove them to save space."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:768
+#: src/lib/authui/sssd/params.rb:795
 msgid "The LDAP attribute that corresponds to the user's full name."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:773
+#: src/lib/authui/sssd/params.rb:800
 msgid "The LDAP attribute that lists the user's group memberships."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:778
+#: src/lib/authui/sssd/params.rb:805
 msgid "If access_provider=ldap and ldap_access_order=authorized_service, SSSD will use the presence of the authorizedService attribute in the user's LDAP entry to determine access privilege."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:783
+#: src/lib/authui/sssd/params.rb:810
 msgid "If access_provider=ldap and ldap_access_order=host, SSSD will use the presence of the host attribute in the user's LDAP entry to determine access privilege."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:793
+#: src/lib/authui/sssd/params.rb:820
 msgid "The object class of a group entry in LDAP."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:798
+#: src/lib/authui/sssd/params.rb:825
 msgid "The LDAP attribute that corresponds to the group name."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:803
+#: src/lib/authui/sssd/params.rb:830
 msgid "The LDAP attribute that corresponds to the group's id."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:808
+#: src/lib/authui/sssd/params.rb:835
 msgid "The LDAP attribute that contains the names of the group's members."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:813
+#: src/lib/authui/sssd/params.rb:840
 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP group object."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:818
+#: src/lib/authui/sssd/params.rb:845
 msgid "The LDAP attribute that contains the objectSID of an LDAP group object."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:823
+#: src/lib/authui/sssd/params.rb:850
 msgid " The LDAP attribute that contains timestamp of the last modification of the parent object."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:829
+#: src/lib/authui/sssd/params.rb:856
 msgid "If ldap_schema is set to a schema format that supports nested groups (e.g. RFC2307bis), then this option controls how many levels of nesting SSSD will follow."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:835
+#: src/lib/authui/sssd/params.rb:862
 msgid "This option tells SSSD to take advantage of an Active Directory-specific feature which may speed up group lookup operations on deployments with complex or deep nested groups."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:841
+#: src/lib/authui/sssd/params.rb:868
 msgid "This option tells SSSD to take advantage of an Active Directory-specific feature which might speed up initgroups operations (most notably when dealing with complex or deep nested groups)."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:847
+#: src/lib/authui/sssd/params.rb:874
 msgid "           The object class of a netgroup entry in LDAP."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:853
+#: src/lib/authui/sssd/params.rb:880
 msgid "The LDAP attribute that corresponds to the netgroup name."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:858
+#: src/lib/authui/sssd/params.rb:885
 msgid "The LDAP attribute that contains the names of the netgroup's members."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:863
+#: src/lib/authui/sssd/params.rb:890
 msgid "The LDAP attribute that contains the (host, user, domain) netgroup triples."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:868
+#: src/lib/authui/sssd/params.rb:895
 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:878
+#: src/lib/authui/sssd/params.rb:905
 msgid "The object class of a service entry in LDAP."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:883
+#: src/lib/authui/sssd/params.rb:910
 msgid "The LDAP attribute that contains the name of service attributes and their aliases."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:888
+#: src/lib/authui/sssd/params.rb:915
 msgid "The LDAP attribute that contains the port managed by this service."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:893
+#: src/lib/authui/sssd/params.rb:920
 msgid "The LDAP attribute that contains the protocols understood by this service."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:899
+#: src/lib/authui/sssd/params.rb:926
 msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:904
+#: src/lib/authui/sssd/params.rb:931
 msgid " Specifies the timeout (in seconds) that ldap searches are allowed to run before they are cancelled and cached results are returned (and offline mode is entered)."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:909
+#: src/lib/authui/sssd/params.rb:936
 msgid "Specifies the timeout (in seconds) that ldap searches for user and group enumerations are allowed to run before they are cancelled and cached results are returned (and offline mode is entered)."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:914
+#: src/lib/authui/sssd/params.rb:941
 msgid "Specifies the timeout (in seconds) after which the poll(2)/select(2) following a connect(2) returns in case of no activity."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:919
+#: src/lib/authui/sssd/params.rb:946
 msgid "Specifies a timeout (in seconds) after which calls to synchronous LDAP APIs will abort if no response is received."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:924
+#: src/lib/authui/sssd/params.rb:951
 msgid "Specifies a timeout (in seconds) that a connection to an LDAP server will be maintained."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:929
+#: src/lib/authui/sssd/params.rb:956
 msgid "Specify the number of records to retrieve from LDAP in a single request. Some LDAP servers enforce a maximum limit per-request."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:934
+#: src/lib/authui/sssd/params.rb:961
 msgid "Disable the LDAP paging control."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:938
+#: src/lib/authui/sssd/params.rb:965
 msgid "When communicating with an LDAP server using SASL, specify the minimum security level necessary to establish the connection."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:943
+#: src/lib/authui/sssd/params.rb:970
 msgid "Specify the number of group members that must be missing from the internal cache in order to trigger a dereference lookup."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:950
+#: src/lib/authui/sssd/params.rb:977
 msgid "Validate server certification in LDAP TLS session"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:954
+#: src/lib/authui/sssd/params.rb:981
 msgid "Specifies the file that contains certificates for all of the Certificate Authorities that sssd will recognize."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:958
+#: src/lib/authui/sssd/params.rb:985
 msgid "Specifies the path of a directory that contains Certificate Authority certificates in separate individual files."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:962
+#: src/lib/authui/sssd/params.rb:989
 msgid "Specifies the file that contains the certificate for the client's key."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:966
+#: src/lib/authui/sssd/params.rb:993
 msgid "Specifies the file that contains the client's key."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:971
+#: src/lib/authui/sssd/params.rb:998
 msgid "Specifies acceptable cipher suites."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:976
+#: src/lib/authui/sssd/params.rb:1003
 msgid "Specifies that the id_provider connection must also use tls to protect the channel."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:981
+#: src/lib/authui/sssd/params.rb:1008
 msgid "Specifies that SSSD should attempt to map user and group IDs from the ldap_user_objectsid and ldap_group_objectsid attributes instead of relying on ldap_user_uid_number and ldap_group_gid_number."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:985
+#: src/lib/authui/sssd/params.rb:1012
 msgid "Specify the SASL mechanism to use."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:990
+#: src/lib/authui/sssd/params.rb:1017
 msgid "Specify the SASL authorization id to use."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:995
+#: src/lib/authui/sssd/params.rb:1022
 msgid "Specify the SASL realm to use."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1000
+#: src/lib/authui/sssd/params.rb:1027
 msgid "If set to true, the LDAP library would perform a reverse lookup to canonicalize the host name during a SASL bind."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1005
+#: src/lib/authui/sssd/params.rb:1032
 msgid "Specify the keytab to use when using SASL/GSSAPI."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1010
+#: src/lib/authui/sssd/params.rb:1037
 msgid "Specifies that the id_provider should init Kerberos credentials (TGT)."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1015
+#: src/lib/authui/sssd/params.rb:1042
 msgid "Specifies the lifetime in seconds of the TGT if GSSAPI is used."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1020
+#: src/lib/authui/sssd/params.rb:1047
 msgid "Select the policy to evaluate the password expiration on the client side."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1025
+#: src/lib/authui/sssd/params.rb:1052
 msgid "Specifies whether automatic referral chasing should be enabled."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1030
+#: src/lib/authui/sssd/params.rb:1057
 msgid "Specifies the service name to use when service discovery is enabled."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1034
+#: src/lib/authui/sssd/params.rb:1061
 msgid "Specifies the service name to use to find an LDAP server which allows password changes when service discovery is enabled."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1039
+#: src/lib/authui/sssd/params.rb:1066
 msgid "Specifies whether to update the ldap_user_shadow_last_change attribute with days since the Epoch after a password change operation."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1044
+#: src/lib/authui/sssd/params.rb:1071
 msgid "If using access_provider = ldap and ldap_access_order = filter (default), this option is mandatory. It specifies an LDAP search filter criterion that must be met for the user to be granted access on this host."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1049
+#: src/lib/authui/sssd/params.rb:1076
 msgid " With this option a client side evaluation of access control attributes can be enabled."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1055
+#: src/lib/authui/sssd/params.rb:1082
 msgid "Comma separated list of access control options."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1060
+#: src/lib/authui/sssd/params.rb:1087
 msgid "Specifies how alias dereferencing is done when performing a search."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1065
+#: src/lib/authui/sssd/params.rb:1092
 msgid "Allows to retain local users as members of an LDAP group for servers that use the RFC2307 schema."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1078
+#: src/lib/authui/sssd/params.rb:1105
 #, fuzzy
 #| msgid "The IP address (or host name) of the host with a fixed address"
 msgid "IP address or host names of Kerberos servers (comma separated)"
 msgstr "IP-adressen (eller vertsmaskinnavnet) til vertsmaskinen med fast adresse"
 
-#: src/lib/yauthclient/params.rb:1082
+#: src/lib/authui/sssd/params.rb:1109
 msgid "Specifies the comma-separated list of IP addresses or hostnames of the Kerberos servers to which SSSD should connect, in the order of preference."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1087
+#: src/lib/authui/sssd/params.rb:1114
 msgid "Kerberos realm (e.g. EXAMPLE.COM)"
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1091 src/lib/yauthclient/params.rb:1096
+#: src/lib/authui/sssd/params.rb:1118 src/lib/authui/sssd/params.rb:1123
 msgid "If the change password service is not running on the KDC, alternative servers can be defined here."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1101
+#: src/lib/authui/sssd/params.rb:1128
 msgid "Directory to store credential caches."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1106
+#: src/lib/authui/sssd/params.rb:1133
 msgid "Location of the user's credential cache."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1111
+#: src/lib/authui/sssd/params.rb:1138
 msgid " Timeout in seconds after an online authentication request or change password request is aborted."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1116
+#: src/lib/authui/sssd/params.rb:1143
 msgid "Verify with the help of krb5_keytab that the TGT obtained has not been spoofed."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1121
+#: src/lib/authui/sssd/params.rb:1148
 msgid "The location of the keytab to use when validating credentials obtained from KDCs."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1126
+#: src/lib/authui/sssd/params.rb:1153
 msgid "Store the password of the user if the provider is offline and use it to request a TGT when the provider comes online again."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1130
+#: src/lib/authui/sssd/params.rb:1157
 msgid "Request a renewable ticket with a total lifetime, given as an integer immediately followed by a time unit."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1134
+#: src/lib/authui/sssd/params.rb:1161
 msgid "Request ticket with a with a lifetime, given as an integer immediately followed by a time unit."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1138
+#: src/lib/authui/sssd/params.rb:1165
 msgid "The time in seconds between two checks if the TGT should be renewed."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1143
+#: src/lib/authui/sssd/params.rb:1170
 msgid "Enables flexible authentication secure tunneling (FAST) for Kerberos pre-authentication."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1147
+#: src/lib/authui/sssd/params.rb:1174
 msgid "Specifies the server principal to use for FAST."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1152
+#: src/lib/authui/sssd/params.rb:1179
 msgid "Specifies if the host and user principal should be canonicalized."
 msgstr ""
 
 #. The Active Directory domain section
-#: src/lib/yauthclient/params.rb:1164
+#: src/lib/authui/sssd/params.rb:1191
 msgid "Specifies the name of the Active Directory domain."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1169
+#: src/lib/authui/sssd/params.rb:1196
 #, fuzzy
 #| msgid "I&P address or name of NFS server:"
 msgid "IP addresses or host names of AD servers (comma separated)"
 msgstr "I&P-adresse eller navn på NFS-server:"
 
-#: src/lib/yauthclient/params.rb:1173
+#: src/lib/authui/sssd/params.rb:1200
 msgid "The comma-separated list of IP addresses or hostnames of the AD servers to which SSSD should connect in order of preference."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1177
-msgid "Optional. May be set on machines where the hostname(5) does not reflect the fully qualified name used in the Active Directory domain to identify this host."
+#: src/lib/authui/sssd/params.rb:1205
+msgid "AD hostname (optional) - may be set if hostname(5) does not reflect the FQDN used by AD to identify this host."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1181
+#: src/lib/authui/sssd/params.rb:1209
 msgid "Override the user's home directory."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1194
+#: src/lib/authui/sssd/params.rb:1222
 msgid " Specifies the lower bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1199
+#: src/lib/authui/sssd/params.rb:1227
 msgid "Specifies the upper bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1204
+#: src/lib/authui/sssd/params.rb:1232
 msgid "Specifies the number of IDs available for each slice."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1208
+#: src/lib/authui/sssd/params.rb:1236
 msgid "Specify the domain SID of the default domain."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1212
+#: src/lib/authui/sssd/params.rb:1240
 msgid "Specify the name of the default domain."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1217
+#: src/lib/authui/sssd/params.rb:1245
 msgid "Changes the behavior of the ID-mapping algorithm to behave more similarly to winbind's “idmap_autorid” algorithm."
 msgstr ""
 
 #. The Active Directory domain section
-#: src/lib/yauthclient/params.rb:1229
+#: src/lib/authui/sssd/params.rb:1257
 msgid "Specifies the name of the IPA domain."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1234
+#: src/lib/authui/sssd/params.rb:1262
 #, fuzzy
 #| msgid "I&P address or name of NFS server:"
 msgid "IP addresses or host names of IPA servers (comma separated)"
 msgstr "I&P-adresse eller navn på NFS-server:"
 
-#: src/lib/yauthclient/params.rb:1238
-msgid "May be set on machines where the hostname(5) does not reflect the fully qualified name."
+#: src/lib/authui/sssd/params.rb:1267
+msgid "IPA hostname (optional) - may be set if hostname(5) does not reflect the FQDN used by IPA to identify this host."
 msgstr ""
 
 #
-#: src/lib/yauthclient/params.rb:1243
+#: src/lib/authui/sssd/params.rb:1272
 #, fuzzy
 #| msgid "The configuration of the NIS client will be saved.\n"
 msgid "The automounter location this IPA client will be using."
 msgstr "Konfigurasjonen for NIS-klienten vil bli lagret.\n"
 
-#: src/lib/yauthclient/params.rb:1248
+#: src/lib/authui/sssd/params.rb:1277
 msgid "This option tells SSSD to automatically update the DNS server built into FreeIPA v2 with the IP address of this client."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1253
+#: src/lib/authui/sssd/params.rb:1282
 msgid "The TTL to apply to the client DNS record when updating it."
 msgstr ""
 
-#: src/lib/yauthclient/params.rb:1257
+#: src/lib/authui/sssd/params.rb:1286
 msgid "Choose the interface whose IP address should be used for dynamic DNS updates."
 msgstr ""
 
-#. autofs may only start after sssd is started
-#: src/modules/AuthClient.rb:230
-msgid "Failed to enable %s service. Please use system journal to diagnose."
-msgstr ""
+#, fuzzy
+#~| msgid "Authenticated Clients"
+#~ msgid "Authentication Client Configuration"
+#~ msgstr "Autentiserte klienter"
 
-#: src/modules/AuthClient.rb:232
-msgid "Failed to start %s service. Please use system journal (journalctl -n -u %s) to diagnose."
-msgstr ""
+#, fuzzy
+#~| msgid "Selected Service"
+#~ msgid "Delete Service/Domain"
+#~ msgstr "Valgt tjeneste"
 
-#. end Export
-#. ################################################################
-#. ################################################################
-#. Summary()
-#. returns html formated configuration summary
-#. @return summary
-#: src/modules/AuthClient.rb:345
-msgid "System is configured for using nss_ldap.\n"
-msgstr ""
+#, fuzzy
+#~| msgid "Modem Parameters"
+#~ msgid "More Parameters"
+#~ msgstr "Modemparametere"
 
-#: src/modules/AuthClient.rb:348
-msgid "System is configured for using sssd.\n"
-msgstr ""
+#, fuzzy
+#~| msgid "You cannot delete the active profile."
+#~ msgid "You may not delete section SSSD."
+#~ msgstr "Du kan ikke slette den aktive profilen."
 
-#: src/modules/AuthClient.rb:354
-msgid "System is configured for using OES.\n"
-msgstr ""
+#, fuzzy
+#~| msgid "Would you like to enable access to the profile repository?"
+#~ msgid "Would you like to enable another service or join a domain?"
+#~ msgstr "Vil du aktivere tilgang til profilarkivet?"
 
-#: src/modules/AuthClient.rb:357
-msgid "System is configured for using /etc/passwd only.\n"
-msgstr ""
+#~ msgid "Service"
+#~ msgstr "Tjeneste"
 
+#, fuzzy
+#~| msgid "Identification:"
+#~ msgid "Identification provider:"
+#~ msgstr "Identifikasjon:"
+
+#, fuzzy
+#~| msgid "These services will be enabled"
+#~ msgid "There are no more services to be enabled."
+#~ msgstr "Disse tjenestene vil bli aktivert"
+
 #~ msgid "Cancel"
 #~ msgstr "Avbryt"
 
@@ -1192,17 +1804,11 @@
 #~ msgid "New"
 #~ msgstr "Ny"
 
-#~ msgid "Basic Settings:"
-#~ msgstr "Grunninnstillinger:"
-
 #~ msgid "Add"
 #~ msgstr "Legg til"
 
 #~ msgid "Edit"
 #~ msgstr "Rediger"
 
-#~ msgid "Delete"
-#~ msgstr "Slett"
-
 #~ msgid "SPAM Prevention"
 #~ msgstr "Søppelpostblokkering"

Modified: trunk/yast/nb/po/auth-server.nb.po
===================================================================
--- trunk/yast/nb/po/auth-server.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/auth-server.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2014-05-19 09:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -304,8 +304,7 @@
 msgstr "Registrer for en &SLP-nisse"
 
 #. `HWeight(1, `PushButton( `id( `pb_interface_ldaps), "Interfaces ...")),
-#: src/include/auth-server/dialogs.rb:88
-#: src/include/auth-server/widgets.rb:127
+#: src/include/auth-server/dialogs.rb:88 src/include/auth-server/widgets.rb:127
 msgid "Firewall Settings"
 msgstr "Brannmurinnstillinger"
 
@@ -448,12 +447,12 @@
 msgid "Configure Account for Replication"
 msgstr "Sett opp konto for replikasjon"
 
-#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:914
-#: src/modules/LdapDatabase.rb:1173
+#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:908
+#: src/modules/LdapDatabase.rb:1167
 msgid "is not a valid LDAP DN"
 msgstr "er ikke en gyldig DN for LDAP"
 
-#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1679
+#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1673
 msgid "Password"
 msgstr "Passord"
 
@@ -479,8 +478,8 @@
 msgid "Provider Details"
 msgstr ""
 
-#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1607
-#: src/modules/LdapDatabase.rb:1702
+#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1601
+#: src/modules/LdapDatabase.rb:1696
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -488,7 +487,7 @@
 msgid "Provider Hostname"
 msgstr "Vertsnavn for leverandør"
 
-#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1624
+#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1618
 msgid "Use StartTLS"
 msgstr "Bruk StartTLS"
 
@@ -569,8 +568,8 @@
 msgid "Checking the authentication credentials defined in the replication configuration on the provider server failed.\n"
 msgstr ""
 
-#: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1971
-#: src/modules/LdapDatabase.rb:1998
+#: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1965
+#: src/modules/LdapDatabase.rb:1992
 msgid "The test returned the following error messages:"
 msgstr "Kontrollen genererte følgende feilmeldinger:"
 
@@ -1886,8 +1885,7 @@
 #. Initialization dialog contents
 #. Initialization dialog contents
 #: src/include/auth-server/mirrormode-wizard.rb:175
-#: src/include/auth-server/wizards.rb:53
-#: src/include/auth-server/wizards.rb:124
+#: src/include/auth-server/wizards.rb:53 src/include/auth-server/wizards.rb:124
 #: src/include/auth-server/wizards.rb:207
 #: src/include/auth-server/wizards.rb:300
 msgid "Initializing..."
@@ -2261,7 +2259,7 @@
 msgid "Index Cache (IDL cache)"
 msgstr "Indeksmellomlager (IDL cache)"
 
-#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2102
+#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2096
 msgid "Checkpoint Settings"
 msgstr ""
 
@@ -2331,7 +2329,7 @@
 msgstr "Legg til indeks"
 
 #. encoding: utf-8
-#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2239
+#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2233
 msgid "Password Policy Settings"
 msgstr "Passordregelinnstillinger"
 
@@ -2492,237 +2490,237 @@
 msgstr "Katalogen finnes ikke. Vil du opprette den?"
 
 #. try to read the ppolicy from the server
-#: src/modules/LdapDatabase.rb:637
+#: src/modules/LdapDatabase.rb:631
 msgid "Authentication failed. The password is probably incorrect.\n"
 msgstr "Autentisering mislyktes. Passordet er sannsynligvis feil.\n"
 
-#: src/modules/LdapDatabase.rb:640
+#: src/modules/LdapDatabase.rb:634
 msgid "The error message was: '"
 msgstr "Feilmeldingen er: '"
 
-#: src/modules/LdapDatabase.rb:645
+#: src/modules/LdapDatabase.rb:639
 msgid "Try again?"
 msgstr "Vil du prøve igjen?"
 
 #. PasswordPolicyDialog only returns the changes made to the original
 #. Entry, try to merge them here
-#: src/modules/LdapDatabase.rb:720
+#: src/modules/LdapDatabase.rb:714
 msgid "Available Attribute Types"
 msgstr "Tilgjengelige attributtyper"
 
-#: src/modules/LdapDatabase.rb:724
+#: src/modules/LdapDatabase.rb:718
 msgid "Selected Attribute Types"
 msgstr "Valgte attributtyper"
 
 #. Popup to add/edit the acl "by" clauses
-#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:985
+#: src/modules/LdapDatabase.rb:807 src/modules/LdapDatabase.rb:979
 msgid "Who should this rule apply to"
 msgstr "For hvem skal denne regelen gjelde"
 
-#: src/modules/LdapDatabase.rb:819 src/modules/LdapDatabase.rb:946
-#: src/modules/LdapDatabase.rb:989 src/modules/LdapDatabase.rb:1227
+#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:940
+#: src/modules/LdapDatabase.rb:983 src/modules/LdapDatabase.rb:1221
 msgid "Entry DN"
 msgstr "Oppføringens DN"
 
-#: src/modules/LdapDatabase.rb:820 src/modules/LdapDatabase.rb:990
+#: src/modules/LdapDatabase.rb:814 src/modules/LdapDatabase.rb:984
 msgid "Select"
 msgstr "Velg"
 
-#: src/modules/LdapDatabase.rb:826
+#: src/modules/LdapDatabase.rb:820
 msgid "Define the Access Level"
 msgstr "Definer tilgangsnivået"
 
-#: src/modules/LdapDatabase.rb:836
+#: src/modules/LdapDatabase.rb:830
 msgid "Stop access control evaluation here (default)"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:843
+#: src/modules/LdapDatabase.rb:837
 msgid "Continue with next access control rule (\"break\")"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:849
+#: src/modules/LdapDatabase.rb:843
 msgid "Continue evaluation of this rule (\"continue\")"
 msgstr "Fortsett evaluering av denne regelen (\"continue\")"
 
-#: src/modules/LdapDatabase.rb:904
+#: src/modules/LdapDatabase.rb:898
 msgid "Please enter a DN in the textfield"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:948 src/modules/LdapDatabase.rb:1090
-#: src/modules/LdapDatabase.rb:1225
+#: src/modules/LdapDatabase.rb:942 src/modules/LdapDatabase.rb:1084
+#: src/modules/LdapDatabase.rb:1219
 msgid "Subtree DN"
 msgstr "Underfilstruktur-DN"
 
-#: src/modules/LdapDatabase.rb:950
+#: src/modules/LdapDatabase.rb:944
 msgid "Group DN"
 msgstr "Gruppe-DN"
 
-#: src/modules/LdapDatabase.rb:973
+#: src/modules/LdapDatabase.rb:967
 msgid "Edit Access Control Rule"
 msgstr "Rediger tilgangskontrollregel"
 
-#: src/modules/LdapDatabase.rb:978
+#: src/modules/LdapDatabase.rb:972
 msgid "Target Objects"
 msgstr "Målobjekter"
 
-#: src/modules/LdapDatabase.rb:999
+#: src/modules/LdapDatabase.rb:993
 msgid "Matching the filter:"
 msgstr "Samsvarer med filteret:"
 
-#: src/modules/LdapDatabase.rb:1006
+#: src/modules/LdapDatabase.rb:1000
 msgid "LDAP Filter"
 msgstr "LDAP-filter"
 
-#: src/modules/LdapDatabase.rb:1016
+#: src/modules/LdapDatabase.rb:1010
 msgid "Apply this rule only to the listed attribute"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1021 src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1015 src/modules/LdapDatabase.rb:1309
 msgid "Attributes"
 msgstr "Attributter"
 
-#: src/modules/LdapDatabase.rb:1023
+#: src/modules/LdapDatabase.rb:1017
 msgid "Edit"
 msgstr "Rediger"
 
-#: src/modules/LdapDatabase.rb:1029 src/modules/LdapDatabase.rb:1041
+#: src/modules/LdapDatabase.rb:1023 src/modules/LdapDatabase.rb:1035
 msgid "Access Level"
 msgstr "Tilgangsnivå"
 
-#: src/modules/LdapDatabase.rb:1039
+#: src/modules/LdapDatabase.rb:1033
 msgid "Who"
 msgstr "Hvem"
 
-#: src/modules/LdapDatabase.rb:1040 src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1034 src/modules/LdapDatabase.rb:1309
 msgid "DN"
 msgstr "DN"
 
-#: src/modules/LdapDatabase.rb:1042
+#: src/modules/LdapDatabase.rb:1036
 msgid "Flow Control"
 msgstr "Flytkontroll"
 
-#: src/modules/LdapDatabase.rb:1047 src/modules/LdapDatabase.rb:1319
+#: src/modules/LdapDatabase.rb:1041 src/modules/LdapDatabase.rb:1313
 msgid "Up"
 msgstr "Opp"
 
-#: src/modules/LdapDatabase.rb:1048 src/modules/LdapDatabase.rb:1320
+#: src/modules/LdapDatabase.rb:1042 src/modules/LdapDatabase.rb:1314
 msgid "Down"
 msgstr "Ned"
 
 #. FIXME: Validate attribute types
-#: src/modules/LdapDatabase.rb:1185
+#: src/modules/LdapDatabase.rb:1179
 msgid "Enter a list of valid attributes in the <b>Attributes</b> textfield"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1197
+#: src/modules/LdapDatabase.rb:1191
 msgid "Enter valid a LDAP filter in the textfield"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1203
+#: src/modules/LdapDatabase.rb:1197
 msgid "You must add at least one item to the \"Access Level\" list."
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1309
 msgid "Target"
 msgstr "Mål"
 
-#: src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1309
 msgid "Filter"
 msgstr "Filter"
 
-#: src/modules/LdapDatabase.rb:1347
+#: src/modules/LdapDatabase.rb:1341
 msgid ""
 "The selected database contains access control rules that are currently\n"
 "not supported by YaST. The Access Control Dialog will be disabled.\n"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1594
+#: src/modules/LdapDatabase.rb:1588
 msgid "This database is a Replication Consumer."
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1614
+#: src/modules/LdapDatabase.rb:1608
 msgid "Provider Name"
 msgstr "Leverandørnavn"
 
-#: src/modules/LdapDatabase.rb:1619 src/modules/LdapDatabase.rb:1716
+#: src/modules/LdapDatabase.rb:1613 src/modules/LdapDatabase.rb:1710
 msgid "Port"
 msgstr "Port"
 
-#: src/modules/LdapDatabase.rb:1637
+#: src/modules/LdapDatabase.rb:1631
 msgid "Replication Type"
 msgstr "Replikasjonstype"
 
-#: src/modules/LdapDatabase.rb:1644
+#: src/modules/LdapDatabase.rb:1638
 msgid "Replication Interval"
 msgstr "Replikasjonsintervall"
 
-#: src/modules/LdapDatabase.rb:1647
+#: src/modules/LdapDatabase.rb:1641
 msgid "Days"
 msgstr "Dager"
 
-#: src/modules/LdapDatabase.rb:1651
+#: src/modules/LdapDatabase.rb:1645
 msgid "Hours"
 msgstr "Timer"
 
-#: src/modules/LdapDatabase.rb:1655 src/modules/LdapDatabase.rb:2118
+#: src/modules/LdapDatabase.rb:1649 src/modules/LdapDatabase.rb:2112
 msgid "Minutes"
 msgstr "Minutter"
 
-#: src/modules/LdapDatabase.rb:1659
+#: src/modules/LdapDatabase.rb:1653
 msgid "Seconds"
 msgstr "Sekunder"
 
-#: src/modules/LdapDatabase.rb:1672
+#: src/modules/LdapDatabase.rb:1666
 msgid "Authentication DN"
 msgstr "Autentiserings-DN"
 
-#: src/modules/LdapDatabase.rb:1693
+#: src/modules/LdapDatabase.rb:1687
 msgid "Custom update referral"
 msgstr "Tilpasset oppdateringshenvisning"
 
-#: src/modules/LdapDatabase.rb:1709
+#: src/modules/LdapDatabase.rb:1703
 msgid "Target Host"
 msgstr "Målvertsmaskin"
 
 #. no updateref
-#: src/modules/LdapDatabase.rb:1929
+#: src/modules/LdapDatabase.rb:1923
 msgid "Invalid replication interval specified"
 msgstr ""
 
 #. test connection
-#: src/modules/LdapDatabase.rb:1965
+#: src/modules/LdapDatabase.rb:1959
 msgid "Checking LDAP connectivity to the provider failed."
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1980 src/modules/LdapDatabase.rb:2007
+#: src/modules/LdapDatabase.rb:1974 src/modules/LdapDatabase.rb:2001
 msgid "Do you still want to continue?"
 msgstr "Vil du likevel forsøke på nytt?"
 
-#: src/modules/LdapDatabase.rb:1989
+#: src/modules/LdapDatabase.rb:1983
 msgid "Checking the LDAPsync capabilities of the provider failed."
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1995
+#: src/modules/LdapDatabase.rb:1989
 msgid "Please verify that the target server is enabled to be a LDAPsync provider"
 msgstr "Bekreft at målserveren er aktivert som LDAPsync-leverandør"
 
-#: src/modules/LdapDatabase.rb:2094
+#: src/modules/LdapDatabase.rb:2088
 msgid "Enable ldapsync provider for this database"
 msgstr "Aktiver ldapsync-leverandør for denne databasen"
 
-#: src/modules/LdapDatabase.rb:2108 src/modules/LdapDatabase.rb:2144
+#: src/modules/LdapDatabase.rb:2102 src/modules/LdapDatabase.rb:2138
 msgid "Operations"
 msgstr "Handlinger"
 
-#: src/modules/LdapDatabase.rb:2131
+#: src/modules/LdapDatabase.rb:2125
 msgid "Session Log"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:2137
+#: src/modules/LdapDatabase.rb:2131
 msgid "Enable Session Log"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:2271
+#: src/modules/LdapDatabase.rb:2265
 msgid "Replication Settings"
 msgstr ""
 

Modified: trunk/yast/nb/po/autoinst.nb.po
===================================================================
--- trunk/yast/nb/po/autoinst.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/autoinst.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: autoinst\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2009-10-08 12:43+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -39,7 +39,7 @@
 
 #: src/clients/autoinst_test_clone.rb:16 src/clients/autoyast.rb:123
 #: src/include/autoinstall/conftree.rb:622
-#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:352
+#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:364
 msgid "This may take a while"
 msgstr "Dette kan ta en stund"
 
@@ -59,14 +59,13 @@
 
 #. command line options
 #. Init variables
-#. Import users configuration from the profile
-#.
+#. unique id
 #. Backup
 #. Now check if there any classes defined in theis pre final control file
 #: src/clients/autoyast.rb:114 src/clients/ayast_setup.rb:148
-#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:410
-#: src/clients/inst_autosetup_upgrade.rb:484
-#: src/modules/AutoInstallRules.rb:1001
+#: src/clients/inst_autoinit.rb:184 src/clients/inst_autosetup.rb:457
+#: src/clients/inst_autosetup_upgrade.rb:492
+#: src/modules/AutoInstallRules.rb:997
 msgid ""
 "Error while parsing the control file.\n"
 "Check the log files for more details or fix the\n"
@@ -266,7 +265,7 @@
 msgstr "Velg først en fil fra tabellen."
 
 #. Help text for last dialog of base installation
-#: src/clients/inst_autoconfigure.rb:35
+#: src/clients/inst_autoconfigure.rb:38
 msgid ""
 "<p>\n"
 "Please wait while the system is being configured.\n"
@@ -277,73 +276,57 @@
 "</p>"
 
 #. Progress bar that displays overall progress in this dialog
-#: src/clients/inst_autoconfigure.rb:60
+#: src/clients/inst_autoconfigure.rb:63
 msgid "Progress"
 msgstr "Fremdrift"
 
 #. Dialog title for autoyast dialog
-#: src/clients/inst_autoconfigure.rb:69
+#: src/clients/inst_autoconfigure.rb:72
 msgid "Configuring System according to auto-install settings"
 msgstr "Konfigurasjon av systemet med innstillingene for autoinstallasjon"
 
 #. TRANSLATORS: Error message, %s is replaced by newline-separated
-#. list of unsupported sections of the profile
-#. Do not translate words in brackets
-#: src/clients/inst_autoconfigure.rb:88
-msgid ""
-"These sections of AutoYaST profile are not supported anymore:\n"
-"\n"
-"%s\n"
-"\n"
-"Please, use, e.g., <scripts/> or <files/> to change the configuration."
-msgstr ""
-
-#. TRANSLATORS: Error message, %s is replaced by newline-separated
 #. list of unknown sections of the profile
 #. Do not translate words in brackets
-#: src/clients/inst_autoconfigure.rb:103
-msgid ""
-"These sections of AutoYaST profile cannot be processed on this system:\n"
-"\n"
-"%s\n"
-"\n"
-"Maybe they were misspelled or your profile does not contain all the needed YaST packages in <software/> section."
+#: src/clients/inst_autoconfigure.rb:94
+msgid "These sections of AutoYaST profile cannot be processed on this system:<br><br>%s<br><br>Maybe they were misspelled or your profile does not contain all the needed YaST packages in <software/> section."
 msgstr ""
 
 #. determine name of client, if not use default name
 #. Call::Function(module_auto, ["Import", eval(Profile::current[resource]:$[])   ]);
-#: src/clients/inst_autoconfigure.rb:192 src/clients/inst_autoconfigure.rb:221
-#: src/clients/inst_autoconfigure.rb:234
+#: src/clients/inst_autoconfigure.rb:184 src/clients/inst_autoconfigure.rb:213
+#: src/clients/inst_autoconfigure.rb:226
 msgid "Configuring %1"
 msgstr "Konfigurerer %1"
 
-#: src/clients/inst_autoconfigure.rb:194 src/clients/inst_autoconfigure.rb:223
-#: src/clients/inst_autoconfigure.rb:236
+#: src/clients/inst_autoconfigure.rb:186 src/clients/inst_autoconfigure.rb:215
+#: src/clients/inst_autoconfigure.rb:228
 msgid "Not Configuring %1"
 msgstr "Konfigurerer ikke %1"
 
 #. online update
-#: src/clients/inst_autoconfigure.rb:288
+#: src/clients/inst_autoconfigure.rb:280
 msgid "Executing Post-Scripts"
 msgstr "Kjører postskript"
 
-#. Do not restart dbus. Otherwise some services will hang.
-#. bnc#937900
+#. Do not restart NetworkManager* services
+#. bnc#955260
 #: src/clients/inst_autoconfigure.rb:304
 msgid "Restarting all running services"
 msgstr "Starter alle kjørende tjenester på nytt"
 
-#: src/clients/inst_autoconfigure.rb:327
+#. Filtering out all services which must not to be restarted
+#: src/clients/inst_autoconfigure.rb:326
 msgid "Activating systemd default target"
 msgstr "Akiverer standardmål for systemd"
 
 #. Just in case, remove this file to avoid reconfiguring...
-#: src/clients/inst_autoconfigure.rb:342
+#: src/clients/inst_autoconfigure.rb:341
 msgid "Finishing Configuration"
 msgstr "Fullfører konfigurasjon"
 
 #. NetworkInterfaces::Write( ".*" );
-#: src/clients/inst_autoconfigure.rb:448
+#: src/clients/inst_autoconfigure.rb:447
 msgid "Processing resource %1"
 msgstr "Behandler ressursen %1"
 
@@ -403,8 +386,15 @@
 "kjøring av diskbildeskript mislyktes:\n"
 "%1"
 
-#. import "Arch";
 #. encoding: utf-8
+#. File:	clients/inst_autoinit.ycp
+#. Package:	Auto-installation
+#. Summary:	Parses XML Profile for automatic installation
+#. Authors:	Anas Nashif 
+#.
+#. $Id$
+#.
+#. encoding: utf-8
 #. File:	clients/autoinst_post.ycp
 #. Package:	Auto-installation
 #. Author:      Anas Nashif 
@@ -412,7 +402,7 @@
 #. the system as described in the profile file.
 #.
 #. $Id$
-#: src/clients/inst_autoinit.rb:37 src/clients/inst_autopost.rb:48
+#: src/clients/inst_autoinit.rb:38 src/clients/inst_autopost.rb:48
 msgid ""
 "<p>\n"
 "Please wait while the system is prepared for autoinstallation.</p>\n"
@@ -420,59 +410,45 @@
 "<p>\n"
 "Vent mens systemet klargjøres for autoinstallasjon.</p>\n"
 
-#: src/clients/inst_autoinit.rb:41
+#: src/clients/inst_autoinit.rb:42
 msgid "Probe hardware"
 msgstr "Søk etter maskinvare"
 
-#: src/clients/inst_autoinit.rb:42
+#: src/clients/inst_autoinit.rb:43
 msgid "Retrieve & Read Control File"
 msgstr "Hent og les kontrollfil"
 
-#: src/clients/inst_autoinit.rb:43
+#: src/clients/inst_autoinit.rb:44
 msgid "Parse control file"
 msgstr "Analyser kontrollfil"
 
-#: src/clients/inst_autoinit.rb:44 src/clients/inst_autoinit.rb:201
+#. Checking profile for unsupported sections.
+#: src/clients/inst_autoinit.rb:45 src/clients/inst_autoinit.rb:199
 msgid "Initial Configuration"
 msgstr "Innledende konfigurasjon"
 
-#: src/clients/inst_autoinit.rb:49 src/clients/inst_autopost.rb:66
+#: src/clients/inst_autoinit.rb:50 src/clients/inst_autopost.rb:66
 msgid "Preparing System for Automatic Installation"
 msgstr "Klargjør system for automatisk installasjon"
 
 #. progress bar length
-#: src/clients/inst_autoinit.rb:57
+#: src/clients/inst_autoinit.rb:58
 msgid "Preprobing stage"
 msgstr "Analysefase"
 
-#. // moved to autoset to fulfill fate #301193
-#. // the DASD section in an autoyast profile can't be changed via pre-script
-#. //
-#. if( Arch::s390 () && AutoinstConfig::remoteProfile == true ) {
-#. y2milestone("arch=s390 and remote_profile=true");
-#. symbol ret = processProfile();
-#. if( ret != `ok ) {
-#. return ret;
-#. }
-#. y2milestone("processProfile=ok");
-#. profileFetched = true;
-#.
-#. // FIXME: the hardcoded stuff should be in the control.xml later
-#. if( haskey(Profile::current, "dasd") ) {
-#. y2milestone("dasd found");
-#. Call::Function("dasd_auto", ["Import", Profile::current["dasd"]:$[] ]);
-#. }
-#. if( haskey(Profile::current, "zfcp") ) {
-#. y2milestone("zfcp found");
-#. Call::Function("zfcp_auto", ["Import", Profile::current["zfcp"]:$[] ]);
-#. }
-#. }
-#: src/clients/inst_autoinit.rb:90
+#: src/clients/inst_autoinit.rb:69
 msgid "Probing hardware..."
 msgstr "Søker etter maskinvare..."
 
+#. TRANSLATORS: Error message, %s is replaced by newline-separated
+#. list of unsupported sections of the profile
+#. Do not translate words in brackets
+#: src/clients/inst_autoinit.rb:128
+msgid "These sections of AutoYaST profile are not supported anymore:<br><br>%s<br><br>Please, use, e.g., <scripts/> or <files/> to change the configuration."
+msgstr ""
+
 #. Set reporting behaviour to default, changed later if required
-#: src/clients/inst_autoinit.rb:183
+#: src/clients/inst_autoinit.rb:179
 msgid "Parsing control file"
 msgstr "Analyserer kontrollfil"
 
@@ -516,59 +492,69 @@
 #. Uwe Gansert 
 #.
 #. $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $
-#: src/clients/inst_autosetup.rb:53 src/clients/inst_autosetup_upgrade.rb:47
+#: src/clients/inst_autosetup.rb:51 src/clients/inst_autosetup_upgrade.rb:43
 msgid "<P>Please wait while the system is prepared for autoinstallation.</P>"
 msgstr "<p>Vent mens systemet klargjøres for autoinstallasjon.</p>"
 
-#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:52
+#: src/clients/inst_autosetup.rb:55 src/clients/inst_autosetup_upgrade.rb:48
 msgid "Execute pre-install user scripts"
 msgstr "Kjør brukerskript før installasjon"
 
-#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:51
+#: src/clients/inst_autosetup.rb:56 src/clients/inst_autosetup_upgrade.rb:47
 msgid "Configure General Settings "
 msgstr "Konfigurer generelle innstillinger "
 
-#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:53
+#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:49
 msgid "Set up language"
 msgstr "Språkinnstillinger"
 
-#: src/clients/inst_autosetup.rb:60
+#: src/clients/inst_autosetup.rb:58
 msgid "Create partition plans"
 msgstr "Opprett partisjonstabeller"
 
-#: src/clients/inst_autosetup.rb:61 src/clients/inst_autosetup_upgrade.rb:56
+#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:52
 msgid "Configure Bootloader"
 msgstr "Konfigurer oppstartslaster"
 
-#: src/clients/inst_autosetup.rb:62 src/clients/inst_autosetup_upgrade.rb:54
+#: src/clients/inst_autosetup.rb:60 src/clients/inst_autosetup_upgrade.rb:50
 msgid "Registration"
 msgstr "Registrering"
 
-#: src/clients/inst_autosetup.rb:63 src/clients/inst_autosetup_upgrade.rb:55
+#: src/clients/inst_autosetup.rb:61 src/clients/inst_autosetup_upgrade.rb:51
 msgid "Configure Software selections"
 msgstr "Konfigurer programvareutvalg"
 
-#: src/clients/inst_autosetup.rb:64
+#: src/clients/inst_autosetup.rb:62
 #, fuzzy
 #| msgid "Activating systemd default target"
 msgid "Configure Systemd Default Target"
 msgstr "Akiverer standardmål for systemd"
 
-#: src/clients/inst_autosetup.rb:65
+#: src/clients/inst_autosetup.rb:63
 #, fuzzy
 #| msgid "Configure Volume Groups"
 msgid "Configure users and groups"
 msgstr "Konfigurere volumgrupper"
 
-#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:61
+#: src/clients/inst_autosetup.rb:64
+msgid "Import SSH keys/settings"
+msgstr ""
+
+#: src/clients/inst_autosetup.rb:65
+#, fuzzy
+#| msgid "Configure Drives"
+msgid "Confirm License"
+msgstr "Konfigurer disker"
+
+#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:57
 msgid "Executing pre-install user scripts..."
 msgstr "Kjører brukerskript før installasjon..."
 
-#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:60
+#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:56
 msgid "Configuring general settings..."
 msgstr "Konfigurerer generelle innstillinger..."
 
-#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:62
+#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:58
 msgid "Setting up language..."
 msgstr "Setter opp språk..."
 
@@ -576,17 +562,17 @@
 msgid "Creating partition plans..."
 msgstr "Oppretter partisjonstabeller..."
 
-#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:65
+#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:61
 msgid "Configuring Bootloader..."
 msgstr "Konfigurerer oppstartslaster..."
 
-#: src/clients/inst_autosetup.rb:74 src/clients/inst_autosetup_upgrade.rb:63
+#: src/clients/inst_autosetup.rb:74 src/clients/inst_autosetup_upgrade.rb:59
 #, fuzzy
 #| msgid "Repairing file system..."
 msgid "Registering the system..."
 msgstr "Reparerer filsystem..."
 
-#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:64
+#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:60
 msgid "Configuring Software selections..."
 msgstr "Konfigurerer programvareutvalg..."
 
@@ -600,7 +586,19 @@
 msgid "Importing users and groups configuration..."
 msgstr ""
 
-#: src/clients/inst_autosetup.rb:81 src/clients/inst_autosetup_upgrade.rb:69
+#: src/clients/inst_autosetup.rb:78
+#, fuzzy
+#| msgid "Importing Kickstart file..."
+msgid "Importing SSH keys/settings..."
+msgstr "Importerer hurtigoppstartsfil..."
+
+#: src/clients/inst_autosetup.rb:79
+#, fuzzy
+#| msgid "Configuring language..."
+msgid "Confirming License..."
+msgstr "Konfigurerer språk..."
+
+#: src/clients/inst_autosetup.rb:83 src/clients/inst_autosetup_upgrade.rb:65
 msgid "Preparing System for Automated Installation"
 msgstr "Klargjør system for automatisk installasjon"
 
@@ -609,19 +607,19 @@
 #. while the general inst_finish process at the end of the
 #. first stage. But for the installation workflow the linuxrc
 #. network settings will be taken. (bnc#944942)
-#: src/clients/inst_autosetup.rb:183
+#: src/clients/inst_autosetup.rb:185
 msgid "Handling Add-On Products..."
 msgstr "Håndterer tilleggsprodukter..."
 
 #. Set it in the Language module.
 #.
 #. Set it in the Language module.
-#: src/clients/inst_autosetup.rb:202 src/clients/inst_autosetup_upgrade.rb:149
+#: src/clients/inst_autosetup.rb:210 src/clients/inst_autosetup_upgrade.rb:145
 msgid "Configuring language..."
 msgstr "Konfigurerer språk..."
 
 #. Yes, do not set Storage testsuite here as we want really GUI with proposal
-#: src/clients/inst_autosetup.rb:290
+#: src/clients/inst_autosetup.rb:298
 msgid ""
 "Error while configuring partitions.\n"
 "Try again.\n"
@@ -629,8 +627,9 @@
 "Feil under konfigurasjon av partisjoner.\n"
 "Forsøk igjen.\n"
 
-#. Software
-#: src/clients/inst_autosetup.rb:344
+#. Adding selections (defined in PackageAI) to libzypp and solving
+#. package dependencies.
+#: src/clients/inst_autosetup.rb:361
 msgid ""
 "Error while configuring software selections.\n"
 "Try again.\n"
@@ -710,11 +709,11 @@
 
 #. Select packages
 #. @return [Symbol]
-#: src/clients/software_auto.rb:87
+#: src/clients/software_auto.rb:88
 msgid "Software Selection"
 msgstr "Programvareutvalg"
 
-#: src/clients/software_auto.rb:88
+#: src/clients/software_auto.rb:89
 msgid ""
 "<p>\n"
 "Select one of the following <b>base</b> selections and click <i>Detailed<i> to add\n"
@@ -729,19 +728,19 @@
 #. AutoinstSoftware::pmInit();
 #. string mainRepo = "http://10.10.0.162/SLES11/DVD1/";
 #. string mainRepo = "ftp://10.10.0.100/install/SLP/openSUSE-11.2/x86_64/DVD1/";
-#: src/clients/software_auto.rb:120
+#: src/clients/software_auto.rb:121
 msgid "Location of the installation source (like http://myhost/11.3/DVD1/)"
 msgstr "Plassering av installasjonskilde (f.eks. http://vertsmaskin/11.3/DVD1/)"
 
-#: src/clients/software_auto.rb:128
+#: src/clients/software_auto.rb:129
 msgid "The inst-source of this system (you can't create images if you choose this)"
 msgstr "Installasjonskilde for dette systemet (du kan ikke opprette diskbilder hvis du velger dette)"
 
-#: src/clients/software_auto.rb:164
+#: src/clients/software_auto.rb:165
 msgid "using that installation source failed"
 msgstr "installasjonskilden kunne ikke brukes"
 
-#: src/clients/software_auto.rb:189
+#: src/clients/software_auto.rb:190
 msgid "Reading package database..."
 msgstr "Leser pakkedatabase..."
 
@@ -993,6 +992,11 @@
 msgid "Volgroup device name"
 msgstr "Volumgruppens enhetsnavn"
 
+#. FIXME: why not pass the variable always?
+#: src/include/autoinstall/ask.rb:540
+msgid "A user defined script is running. This may take a while."
+msgstr ""
+
 #. Shows a dialog when 'control file' can't be found
 #. @param [String] original Original value
 #. @return [String] new value
@@ -1482,8 +1486,7 @@
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: src/include/autoinstall/dialogs.rb:94
-#: src/include/autoinstall/dialogs.rb:101
+#: src/include/autoinstall/dialogs.rb:94 src/include/autoinstall/dialogs.rb:101
 msgid "Select Directory"
 msgstr "Velg katalog"
 
@@ -1607,7 +1610,7 @@
 #. list<any> l = [ "key1",0,"key3" ];
 #. m[ l ] = v;
 #. @return [Hash]
-#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:807
+#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:819
 msgid "Checking XML with RNG validation..."
 msgstr "Kontrollerer XML med RNG-validering..."
 
@@ -1617,7 +1620,7 @@
 msgstr "Seksjon %1:"
 
 #. jing validation -- validates complete xml profile
-#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:819
+#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:831
 msgid "Checking XML with RNC validation..."
 msgstr "Kontrollerer XML med RNC-validering..."
 
@@ -1998,67 +2001,6 @@
 "en forberedelse.\n"
 "</p>\n"
 
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:123
-msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
-msgstr "Kan ikke finne nettadressen '%1' via protokollen HTTP(S). Serveren rapporterte koden %2."
-
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:143
-msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2."
-msgstr "Kan ikke finne nettadressen '%1' via protokollen FTP. Serveren rapporterte koden %2."
-
-#. FIXME: I have doubts this will ever work. Too early.
-#: src/include/autoinstall/io.rb:159
-msgid "Reading file on %1/%2 failed.\n"
-msgstr "Lesing av filen på %1/%2 mislyktes.\n"
-
-#: src/include/autoinstall/io.rb:175
-msgid "Reading file on %1 failed.\n"
-msgstr "Lesing av filen på %1 mislyktes.\n"
-
-#. autoyast tried to mount the CD but had no success.
-#. autoyast tried to mount a NFS directory which failed
-#. autoyast tried to mount a NFS directory which failed
-#: src/include/autoinstall/io.rb:237 src/include/autoinstall/io.rb:293
-#: src/include/autoinstall/io.rb:337
-msgid "Mounting %1 failed."
-msgstr "Montering av %1 mislyktes."
-
-#. autoyast tried to read a file but had no success.
-#: src/include/autoinstall/io.rb:268
-msgid "Reading a file on CD failed. Path: %1/%2."
-msgstr "Lesing av fil fra CD mislyktes. Filsti: %1/%2."
-
-#. autoyast tried to copy a file via NFS which failed
-#. autoyast tried to copy a file via NFS which failed
-#: src/include/autoinstall/io.rb:316 src/include/autoinstall/io.rb:360
-msgid "Remote file %1 cannot be retrieved"
-msgstr "Den eksterne filen %1 kan ikke hentes"
-
-#. this is workaround for bnc#849767
-#. because of changes in autoyast startup this code is now
-#. called much sooner (before Storage stuff is initialized)
-#. call dummy method to trigger Storage initialization
-#: src/include/autoinstall/io.rb:485
-msgid "%1 is not mounted and mount failed"
-msgstr "%1 er ikke montert og montering mislyktes"
-
-#. autoyast tried to copy a file but that file can't be found
-#: src/include/autoinstall/io.rb:505
-msgid "File %1 cannot be found"
-msgstr "Filen %1 ble ikke funnet"
-
-#. Device
-#: src/include/autoinstall/io.rb:527
-msgid "Cannot find URL '%1' via protocol TFTP."
-msgstr "Kan ikke finne nettadressen '%1' via protokollen TFTP."
-
-#. the user wanted autoyast to fetch it's profile via an unknown protocol
-#: src/include/autoinstall/io.rb:534
-msgid "Unknown protocol %1."
-msgstr "Ukjent protokoll %1."
-
 #. Script Configuration
 #. @return  script configuration dialog
 #: src/include/autoinstall/script_dialogs.rb:30
@@ -2325,12 +2267,12 @@
 #. @param [String] result_profile the resulting control file path
 #. @return [Boolean] true on success
 #. autoyast has read the autoyast configuration file but something went wrong
-#: src/modules/AutoInstallRules.rb:909 src/modules/Profile.rb:738
+#: src/modules/AutoInstallRules.rb:905 src/modules/Profile.rb:750
 msgid "The XML parser reported an error while parsing the autoyast profile. The error message is:\n"
 msgstr "XML-analysen rapporterte en feil under analysen av autoyast-profilen. Feilmeldingen var:\n"
 
 #. backdoor for merging problems.
-#: src/modules/AutoInstallRules.rb:1054
+#: src/modules/AutoInstallRules.rb:1050
 msgid ""
 "\n"
 "User-defined classes could not be retrieved.  Make sure all classes \n"
@@ -2346,45 +2288,45 @@
 
 #. The line above needs to be fixed when we have more attributes
 #. comment will look like this: "(description=BLA BLA)"
-#: src/modules/AutoinstConfig.rb:278
+#: src/modules/AutoinstConfig.rb:279
 msgid "Choose Profile"
 msgstr "Velg profil"
 
 #. SetProtocolMessage ()
 #. @return [void]
-#: src/modules/AutoinstConfig.rb:334
+#: src/modules/AutoinstConfig.rb:335
 msgid "Retrieving control file from floppy."
 msgstr "Henter kontrollfil fra diskett."
 
-#: src/modules/AutoinstConfig.rb:337
+#: src/modules/AutoinstConfig.rb:338
 msgid "Retrieving control file (%1) from TFTP server: %2."
 msgstr "Henter kontrollfil (%1) fra TFTP-server: %2."
 
-#: src/modules/AutoinstConfig.rb:343
+#: src/modules/AutoinstConfig.rb:344
 msgid "Retrieving control file (%1) from NFS server: %2."
 msgstr "Henter kontrollfil (%1) fra NFS-server: %2."
 
-#: src/modules/AutoinstConfig.rb:349
+#: src/modules/AutoinstConfig.rb:350
 msgid "Retrieving control file (%1) from HTTP server: %2."
 msgstr "Henter kontrollfil (%1) fra HTTP-server: %2."
 
-#: src/modules/AutoinstConfig.rb:355
+#: src/modules/AutoinstConfig.rb:356
 msgid "Retrieving control file (%1) from FTP server: %2."
 msgstr "Henter kontrollfil (%1) fra FTP-server: %2."
 
-#: src/modules/AutoinstConfig.rb:361
+#: src/modules/AutoinstConfig.rb:362
 msgid "Copying control file from file: %1."
 msgstr "Kopierer kontrollfil fra fil: %1."
 
-#: src/modules/AutoinstConfig.rb:366
+#: src/modules/AutoinstConfig.rb:367
 msgid "Copying control file from device: /dev/%1."
 msgstr "Kopierer kontrollfil fra enhet: /dev/%1."
 
-#: src/modules/AutoinstConfig.rb:370
+#: src/modules/AutoinstConfig.rb:371
 msgid "Copying control file from default location."
 msgstr "Kopierer kontrollfil fra standardplassering."
 
-#: src/modules/AutoinstConfig.rb:372
+#: src/modules/AutoinstConfig.rb:373
 msgid "Source unknown."
 msgstr "Ukjent kilde."
 
@@ -2394,7 +2336,7 @@
 #. {
 #. local_rules_file = (string)WFM::Args(1);
 #. }
-#: src/modules/AutoinstConfig.rb:452
+#: src/modules/AutoinstConfig.rb:453
 msgid ""
 "<h3>AutoYaST Configuration Management System</h3>\n"
 "<p>Almost all resources of the control file can be\n"
@@ -2404,7 +2346,7 @@
 "<p>Nesten alle ressursene i kontrollfilen kan\n"
 "konfigureres ved hjelp av konfigurasjonsadministrasjonssystemet.</p>\n"
 
-#: src/modules/AutoinstConfig.rb:457
+#: src/modules/AutoinstConfig.rb:458
 msgid ""
 "<p>Most of the modules used to create the configuration are identical to those available\n"
 "through the YaST Control Center. Instead of configuring this system, the data\n"
@@ -2418,7 +2360,7 @@
 "installere et annet system ved hjelp av AutoYaST.\n"
 "</p>\n"
 
-#: src/modules/AutoinstConfig.rb:464
+#: src/modules/AutoinstConfig.rb:465
 msgid ""
 "<p>In addition to the existing and familiar modules,\n"
 "new interfaces were created for special and complex configurations, including\n"
@@ -2524,24 +2466,24 @@
 msgstr "Ikke importere nye GPG-nøkler"
 
 #. NTP syncing
-#: src/modules/AutoinstGeneral.rb:414
+#: src/modules/AutoinstGeneral.rb:419
 #, fuzzy
 #| msgid "Syncing server..."
 msgid "Syncing time..."
 msgstr "Synkroniserer server..."
 
 #. TRANSLATORS: %s is the name of the ntp server
-#: src/modules/AutoinstGeneral.rb:416
+#: src/modules/AutoinstGeneral.rb:421
 msgid "Syncing time with %s."
 msgstr ""
 
-#: src/modules/AutoinstGeneral.rb:420
+#: src/modules/AutoinstGeneral.rb:425
 #, fuzzy
 #| msgid "Parsing failed."
 msgid "Time syncing failed."
 msgstr "Tolking mislyktes."
 
-#: src/modules/AutoinstGeneral.rb:424
+#: src/modules/AutoinstGeneral.rb:429
 #, fuzzy
 #| msgid "Cannot mount file system."
 msgid "Cannot update system time."
@@ -2564,18 +2506,18 @@
 #. @return  [String] configuration summary dialog
 #. return Summary of configuration
 #. @return  [String] configuration summary dialog
-#: src/modules/AutoinstPartPlan.rb:682 src/modules/AutoinstStorage.rb:913
+#: src/modules/AutoinstPartPlan.rb:691 src/modules/AutoinstStorage.rb:913
 msgid "Drives"
 msgstr "Disker"
 
 #. We are counting harddisks only (type CT_DISK)
-#: src/modules/AutoinstPartPlan.rb:688
+#: src/modules/AutoinstPartPlan.rb:697
 msgid "%s drive in total"
 msgid_plural "%s drives in total"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/modules/AutoinstPartPlan.rb:707
+#: src/modules/AutoinstPartPlan.rb:716
 #, fuzzy
 #| msgid "Not detected."
 msgid "Not yet cloned."
@@ -2583,55 +2525,55 @@
 
 #. Return Summary
 #. @return [String] summary
-#: src/modules/AutoinstScripts.rb:328
+#: src/modules/AutoinstScripts.rb:329
 msgid "Preinstallation Scripts"
 msgstr "Preinstallasjonsskript"
 
-#: src/modules/AutoinstScripts.rb:341
+#: src/modules/AutoinstScripts.rb:342
 msgid "Postinstallation Scripts"
 msgstr "Postinstallasjonsskript"
 
-#: src/modules/AutoinstScripts.rb:354
+#: src/modules/AutoinstScripts.rb:355
 msgid "Chroot Scripts"
 msgstr "Chroot-skript"
 
-#: src/modules/AutoinstScripts.rb:367
+#: src/modules/AutoinstScripts.rb:368
 msgid "Init Scripts"
 msgstr "Init-skript"
 
-#: src/modules/AutoinstScripts.rb:380
+#: src/modules/AutoinstScripts.rb:381
 msgid "Postpartitioning Scripts"
 msgstr "Skript etter partisjonering"
 
 #. return type of script as formatted string
 #. @param script type
 #. @return [String] type as translated string
-#: src/modules/AutoinstScripts.rb:475
+#: src/modules/AutoinstScripts.rb:476
 msgid "Pre"
 msgstr "Pre"
 
-#: src/modules/AutoinstScripts.rb:477
+#: src/modules/AutoinstScripts.rb:478
 msgid "Post"
 msgstr "Post"
 
-#: src/modules/AutoinstScripts.rb:479
+#: src/modules/AutoinstScripts.rb:480
 msgid "Init"
 msgstr "Init"
 
-#: src/modules/AutoinstScripts.rb:481
+#: src/modules/AutoinstScripts.rb:482
 msgid "Chroot"
 msgstr "Chroot"
 
-#: src/modules/AutoinstScripts.rb:483
+#: src/modules/AutoinstScripts.rb:484
 msgid "Postpartitioning"
 msgstr "Etter partisjonering"
 
-#: src/modules/AutoinstScripts.rb:485
+#: src/modules/AutoinstScripts.rb:486
 msgid "Unknown"
 msgstr "Ukjent"
 
 #. warning text during the installation. %1 is a list of package names
-#: src/modules/AutoinstSoftware.rb:172
+#: src/modules/AutoinstSoftware.rb:174
 msgid ""
 "These packages could not be found in the software repositories:\n"
 "%1"
@@ -2641,31 +2583,31 @@
 
 #. 4 means "already exists"
 #. Add add-ons
-#: src/modules/AutoinstSoftware.rb:327 src/modules/AutoinstSoftware.rb:347
+#: src/modules/AutoinstSoftware.rb:329 src/modules/AutoinstSoftware.rb:349
 msgid "Adding repo %1 failed"
 msgstr "Kunne ikke legge til pakkebrønnen %1"
 
 #. Install
-#: src/modules/AutoinstSoftware.rb:375
+#: src/modules/AutoinstSoftware.rb:377
 msgid "Image creation failed while pattern installation. Please check /tmp/ay_image.log"
 msgstr "Diskbilde kunne ikke opprettes under installasjon av mønster. Kontroller /tmp/ay_image.log"
 
-#: src/modules/AutoinstSoftware.rb:383
+#: src/modules/AutoinstSoftware.rb:385
 msgid "Creating Image - installing packages"
 msgstr "Oppretter diskbilde - installerer pakker"
 
-#: src/modules/AutoinstSoftware.rb:393
+#: src/modules/AutoinstSoftware.rb:395
 msgid "Image creation failed while package installation. Please check /tmp/ay_image.log"
 msgstr "Diskbilde kunne ikke opprettes under installasjon av pakker. Kontroller /tmp/ay_image.log"
 
 #. Popup::Message( _("in the next file dialog you have to choose the target directory to save the image") );
-#: src/modules/AutoinstSoftware.rb:404
+#: src/modules/AutoinstSoftware.rb:406
 msgid "Store image to ..."
 msgstr "Lagre diskbilde som ..."
 
 #. Compress image:
 #. tar cfz /srv/www/htdocs/image.tar.gz --exclude="proc*"  .
-#: src/modules/AutoinstSoftware.rb:433
+#: src/modules/AutoinstSoftware.rb:435
 msgid ""
 "You can do changes to the image now in %1/\n"
 "If you press the ok-button, the image will be compressed and can't be changed anymore."
@@ -2673,16 +2615,16 @@
 "Du kan fremdeles endre diskbildet i %1/\n"
 "Hvis du trykker OK, vil diskbildet bli komprimert og kan ikke lenger endres."
 
-#: src/modules/AutoinstSoftware.rb:447
+#: src/modules/AutoinstSoftware.rb:449
 msgid "Image compressing failed in '%1'. Please check /tmp/ay_image.log"
 msgstr "Komprimering av diskbilde i '%1' mislyktes. Kontroller /tmp/ay_image.log"
 
-#: src/modules/AutoinstSoftware.rb:454
+#: src/modules/AutoinstSoftware.rb:456
 msgid "Image created successfully"
 msgstr "Diskbildet er opprettet"
 
 #. copy a directory (ends with / in directory.yast)
-#: src/modules/AutoinstSoftware.rb:490
+#: src/modules/AutoinstSoftware.rb:492
 msgid ""
 "can not get the directory.yast file at `%1`.\n"
 "You can create that file with 'ls -F > directory.yast' if it's missing."
@@ -2691,30 +2633,30 @@
 "Du kan opprette filen med kommandoen 'ls -F > directory.yast' hvis den mangler."
 
 #. don't copy subdirs. They have to be mentioned explicit. Copy only files from that dir.
-#: src/modules/AutoinstSoftware.rb:524
+#: src/modules/AutoinstSoftware.rb:526
 msgid "can not read '%1'. Try again?"
 msgstr "kan ikke lese '%1'. Vil du forsøke igjen?"
 
 #. copy a file
-#: src/modules/AutoinstSoftware.rb:542
+#: src/modules/AutoinstSoftware.rb:544
 msgid "can not read '%1'. ISO creation failed"
 msgstr "Kan ikke lese '%1'. ISO kunne ikke opprettes."
 
 #. we will have the image.tar.gz and autoinst.xml on the root of the DVD/CD
-#: src/modules/AutoinstSoftware.rb:572
+#: src/modules/AutoinstSoftware.rb:574
 msgid "Preparing ISO Filestructure ..."
 msgstr "Klargjør ISO-filstruktur ..."
 
 #. prepare and save isolinux.cfg boot menu of the media
-#: src/modules/AutoinstSoftware.rb:621
+#: src/modules/AutoinstSoftware.rb:623
 msgid "boot config for the DVD"
 msgstr "Oppstartsoppsett for DVD"
 
-#: src/modules/AutoinstSoftware.rb:625
+#: src/modules/AutoinstSoftware.rb:627
 msgid "Ok"
 msgstr "OK"
 
-#: src/modules/AutoinstSoftware.rb:628
+#: src/modules/AutoinstSoftware.rb:630
 msgid ""
 "You can do changes to the ISO now in %1, like adding a complete different AutoYaST XML file.\n"
 "If you press the ok-button, the iso will be created."
@@ -2724,43 +2666,43 @@
 
 #. create the actual ISO file
 #. Popup::Message( _("Please choose a place where you want to save the ISO file in the next dialog") );
-#: src/modules/AutoinstSoftware.rb:647
+#: src/modules/AutoinstSoftware.rb:649
 msgid "Store ISO image to ..."
 msgstr "Lagre ISO-diskbilde som ..."
 
-#: src/modules/AutoinstSoftware.rb:648
+#: src/modules/AutoinstSoftware.rb:650
 msgid "Creating ISO File ..."
 msgstr "Oppretter ISO-fil ..."
 
-#: src/modules/AutoinstSoftware.rb:669
+#: src/modules/AutoinstSoftware.rb:671
 msgid "ISO successfully created at %1"
 msgstr "ISO er opprettet på %1"
 
 #. Summary
 #. @return Html formatted configuration summary
-#: src/modules/AutoinstSoftware.rb:745
+#: src/modules/AutoinstSoftware.rb:753
 msgid "Selected Patterns"
 msgstr "Valgte mønstre"
 
-#: src/modules/AutoinstSoftware.rb:755
+#: src/modules/AutoinstSoftware.rb:763
 msgid "Individually Selected Packages"
 msgstr "Valgte enkeltpakker"
 
-#: src/modules/AutoinstSoftware.rb:761
+#: src/modules/AutoinstSoftware.rb:769
 msgid "Packages to Remove"
 msgstr "Pakker som skal fjernes"
 
-#: src/modules/AutoinstSoftware.rb:768
+#: src/modules/AutoinstSoftware.rb:776
 msgid "Force Kernel Package"
 msgstr "Velg spesiell kjernepakke"
 
 #. set SoftLock to avoid the installation of recommended patterns (#159466)
-#: src/modules/AutoinstSoftware.rb:858
+#: src/modules/AutoinstSoftware.rb:871
 msgid "Could not set patterns: %1."
 msgstr "Kunne ikke definere mønstre: %1."
 
 #. Solve dependencies
-#: src/modules/AutoinstSoftware.rb:919
+#: src/modules/AutoinstSoftware.rb:932
 msgid "The package resolver run failed. Please check your software section in the autoyast profile."
 msgstr "Kjøringen av pakkeløseren mislyktes. Kontroller programvareseksjonen i autoyast-profilen."
 
@@ -2805,14 +2747,14 @@
 
 #. Prepare Profile for saving and remove empty data structs
 #. @return [void]
-#: src/modules/Profile.rb:351
+#: src/modules/Profile.rb:363
 msgid "Collecting configuration data..."
 msgstr "Henter konfigurasjonsdata..."
 
 #. Save YCP data into XML
 #. @param  path to file
 #. @return	[Boolean] true on success
-#: src/modules/Profile.rb:454
+#: src/modules/Profile.rb:466
 msgid "Encrypted AutoYaST profile. Enter the password twice."
 msgstr "Kryptert Autoast-profil. Angi passordet to ganger."
 
@@ -2820,14 +2762,14 @@
 #.
 #. @param [String] dir - directory to store section xml files in
 #. @return	  - list of filenames
-#: src/modules/Profile.rb:528
+#: src/modules/Profile.rb:540
 msgid "Could not write section %1 to file %2."
 msgstr "Kunne ikke lagre seksjonen %1 i filen %2."
 
 #. Read XML into  YCP data
 #. @param  path to file
 #. @return	[Boolean]
-#: src/modules/Profile.rb:695 src/modules/ProfileLocation.rb:190
+#: src/modules/Profile.rb:707 src/modules/ProfileLocation.rb:190
 msgid "Encrypted AutoYaST profile. Enter the correct password."
 msgstr "Kryptert AutoYast-profil. Angi riktig passord."
 
@@ -2845,6 +2787,39 @@
 msgid "&OK"
 msgstr "&OK"
 
+#~ msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
+#~ msgstr "Kan ikke finne nettadressen '%1' via protokollen HTTP(S). Serveren rapporterte koden %2."
+
+#~ msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2."
+#~ msgstr "Kan ikke finne nettadressen '%1' via protokollen FTP. Serveren rapporterte koden %2."
+
+#~ msgid "Reading file on %1/%2 failed.\n"
+#~ msgstr "Lesing av filen på %1/%2 mislyktes.\n"
+
+#~ msgid "Reading file on %1 failed.\n"
+#~ msgstr "Lesing av filen på %1 mislyktes.\n"
+
+#~ msgid "Mounting %1 failed."
+#~ msgstr "Montering av %1 mislyktes."
+
+#~ msgid "Reading a file on CD failed. Path: %1/%2."
+#~ msgstr "Lesing av fil fra CD mislyktes. Filsti: %1/%2."
+
+#~ msgid "Remote file %1 cannot be retrieved"
+#~ msgstr "Den eksterne filen %1 kan ikke hentes"
+
+#~ msgid "%1 is not mounted and mount failed"
+#~ msgstr "%1 er ikke montert og montering mislyktes"
+
+#~ msgid "File %1 cannot be found"
+#~ msgstr "Filen %1 ble ikke funnet"
+
+#~ msgid "Cannot find URL '%1' via protocol TFTP."
+#~ msgstr "Kan ikke finne nettadressen '%1' via protokollen TFTP."
+
+#~ msgid "Unknown protocol %1."
+#~ msgstr "Ukjent protokoll %1."
+
 #~ msgid "Configure runlevel"
 #~ msgstr "Konfigurer kjørenivåer"
 
@@ -2976,9 +2951,6 @@
 #~ "Du finner mer informasjon i dokumentasjonen.\n"
 #~ "</P>\n"
 
-#~ msgid "Configure Drives"
-#~ msgstr "Konfigurer disker"
-
 #~ msgid "&Drive"
 #~ msgstr "&Disk"
 

Modified: trunk/yast/nb/po/base.nb.po
===================================================================
--- trunk/yast/nb/po/base.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/base.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: base\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2009-08-07 23:21+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -85,79 +85,79 @@
 msgstr "Denne YaST2-modulen støtter ikke kommandolinjemodus."
 
 #. translators: default error message for command line
-#: library/commandline/src/modules/CommandLine.rb:324
+#: library/commandline/src/modules/CommandLine.rb:322
 msgid "Use 'help' for a complete list of available commands."
 msgstr "Bruk 'help' for å få opp en fullstendig liste over tilgjengelige kommandoer."
 
 #. translators: default error message for command line
-#: library/commandline/src/modules/CommandLine.rb:329
+#: library/commandline/src/modules/CommandLine.rb:327
 msgid "Use 'yast2 %1 help' for a complete list of available commands."
 msgstr "Bruk 'yast2 %1 help' for å få opp en fullstendig liste over tilgjengelige kommandoer."
 
 #. translators: error message in command line interface
-#: library/commandline/src/modules/CommandLine.rb:367
+#: library/commandline/src/modules/CommandLine.rb:365
 msgid "Unknown Command: %1"
 msgstr "Ukjent kommando: %1"
 
 #. translators: error message - user did not provide a value for option %1 on the command line
-#: library/commandline/src/modules/CommandLine.rb:405
+#: library/commandline/src/modules/CommandLine.rb:403
 msgid "Option '%1' is missing value."
 msgstr "Alternativet '%1' mangler en verdi."
 
 #. translators: error message, %1 is a command, %2 is the wrong option given by the user
-#: library/commandline/src/modules/CommandLine.rb:440
+#: library/commandline/src/modules/CommandLine.rb:438
 msgid "Unknown option for command '%1': %2"
 msgstr "Ukjent alternativ for kommandoen '%1': %2"
 
 #. translators: error message, %2 is the value given
 #. translators: error message, %2 is the value given
 #. translators: error message, %2 is the value given
-#: library/commandline/src/modules/CommandLine.rb:461
-#: library/commandline/src/modules/CommandLine.rb:473
-#: library/commandline/src/modules/CommandLine.rb:483
+#: library/commandline/src/modules/CommandLine.rb:459
+#: library/commandline/src/modules/CommandLine.rb:471
+#: library/commandline/src/modules/CommandLine.rb:481
 msgid "Invalid value for option '%1': %2"
 msgstr "Ugyldig verdi for alternativet '%1': %2"
 
 #. translators: error message, %2 is expected type, %3 is the value given
-#: library/commandline/src/modules/CommandLine.rb:501
+#: library/commandline/src/modules/CommandLine.rb:495
 msgid "Invalid value for option '%1' -- expected '%2', received %3"
 msgstr "Ugyldig verdi for alternativet '%1': %2 '%1' -- ventet '%2', mottatt %3"
 
 #. translators: error message if option has a value, but cannot have one
-#: library/commandline/src/modules/CommandLine.rb:522
+#: library/commandline/src/modules/CommandLine.rb:515
 msgid "Option '%1' cannot have a value. Given value: %2"
 msgstr "Alternativet '%1' kan ikke ha noen verdi. Angitt verdi: %2"
 
 #. translators: error message, how to get command line help for interactive mode
 #. %1 is the module name, %2 is the action name
-#: library/commandline/src/modules/CommandLine.rb:541
+#: library/commandline/src/modules/CommandLine.rb:533
 msgid "Use '%1 %2 help' for a complete list of available options."
 msgstr "Bruk '%1 %2 help' for å få opp en fullstendig liste over tilgjengelige alternativer."
 
 #. translators: error message, how to get command line help for non-interactive mode
 #. %1 is the module name, %2 is the action name
-#: library/commandline/src/modules/CommandLine.rb:551
+#: library/commandline/src/modules/CommandLine.rb:543
 msgid "Use 'yast2 %1 %2 help' for a complete list of available options."
 msgstr "Bruk 'yast2 %1 %2 help' for å få opp en fullstendig liste over tilgjengelige alternativer."
 
 #. translators: command line interface header, %1 is identification of the module
-#: library/commandline/src/modules/CommandLine.rb:569
+#: library/commandline/src/modules/CommandLine.rb:561
 msgid "YaST Configuration Module %1\n"
 msgstr "YaST konfigurasjonsmodul %1\n"
 
 #. translators: the command does not provide any help
-#: library/commandline/src/modules/CommandLine.rb:593
+#: library/commandline/src/modules/CommandLine.rb:585
 msgid "No help available"
 msgstr "Ingen hjelp tilgjengelig"
 
 #. Process <command> "help"
 #. translators: %1 is the command name
-#: library/commandline/src/modules/CommandLine.rb:597
+#: library/commandline/src/modules/CommandLine.rb:589
 msgid "Command '%1'"
 msgstr "Kommando '%1'"
 
 #. translators: command line options
-#: library/commandline/src/modules/CommandLine.rb:617
+#: library/commandline/src/modules/CommandLine.rb:609
 msgid ""
 "\n"
 "    Options:"
@@ -166,7 +166,7 @@
 "    Alternativer:"
 
 #. additional help for using command line
-#: library/commandline/src/modules/CommandLine.rb:706
+#: library/commandline/src/modules/CommandLine.rb:698
 msgid ""
 "\n"
 "    Options of the [string] type must be written in the form 'option=value'."
@@ -175,7 +175,7 @@
 "    Alternatier av [streng]-type må være på formatet 'alternativ=verdi'."
 
 #. translators: example title for command line
-#: library/commandline/src/modules/CommandLine.rb:713
+#: library/commandline/src/modules/CommandLine.rb:705
 msgid ""
 "\n"
 "    Example:"
@@ -184,137 +184,137 @@
 "    Eksempel:"
 
 #. translators: default module description if none is provided by the module itself
-#: library/commandline/src/modules/CommandLine.rb:743
+#: library/commandline/src/modules/CommandLine.rb:735
 msgid "This is a YaST module."
 msgstr "Dette er en YaST-modul."
 
 #. translators: short help title for command line
-#: library/commandline/src/modules/CommandLine.rb:748
+#: library/commandline/src/modules/CommandLine.rb:740
 msgid "Basic Syntax:"
 msgstr "Grunnsyntaks:"
 
 #. translators: module command line help, %1 is the module name
 #. translate <command> and [options] only!
-#: library/commandline/src/modules/CommandLine.rb:763
+#: library/commandline/src/modules/CommandLine.rb:755
 msgid "    yast2 %1 <command> [verbose] [options]"
 msgstr "    yast2 %1 <kommando> [informasjon] [alternativer]"
 
 #. translators: module command line help, %1 is the module name
 #. translate <command> only!
-#: library/commandline/src/modules/CommandLine.rb:790
+#: library/commandline/src/modules/CommandLine.rb:782
 msgid "    yast2 %1 <command> help"
 msgstr "    yast2 %1 <kommando> help"
 
 #. translators: module command line help
 #. translate <command> and [options] only!
-#: library/commandline/src/modules/CommandLine.rb:797
+#: library/commandline/src/modules/CommandLine.rb:789
 msgid "    <command> [options]"
 msgstr "    <kommando> [alternativer]"
 
 #. translators: module command line help
 #. translate <command> only!
-#: library/commandline/src/modules/CommandLine.rb:800
+#: library/commandline/src/modules/CommandLine.rb:792
 msgid "    <command> help"
 msgstr "    <kommando> help"
 
 #. translators: command line title: list of available commands
-#: library/commandline/src/modules/CommandLine.rb:812
+#: library/commandline/src/modules/CommandLine.rb:804
 msgid "Commands:"
 msgstr "Kommandoer:"
 
 #. translators: error message: module does not provide any help messages
-#: library/commandline/src/modules/CommandLine.rb:828
+#: library/commandline/src/modules/CommandLine.rb:820
 msgid "No help available."
 msgstr "Ingen hjelp tilgjengelig."
 
 #. fallback message - invalid help has been provided by the yast module
-#: library/commandline/src/modules/CommandLine.rb:864
+#: library/commandline/src/modules/CommandLine.rb:856
 msgid ""
 msgstr ""
 
 #. translators: module command line help, %1 is the module name
-#: library/commandline/src/modules/CommandLine.rb:874
+#: library/commandline/src/modules/CommandLine.rb:866
 msgid "Run 'yast2 %1 <command> help' for a list of available options."
 msgstr "Bruk 'yast2 %1 <kommando> help' for å få opp en liste over tilgjengelige alternativer."
 
 #. error message - command line option xmlfile is missing
-#: library/commandline/src/modules/CommandLine.rb:938
+#: library/commandline/src/modules/CommandLine.rb:930
 msgid "Target file name ('xmlfile' option) is missing. Use xmlfile= command line option."
 msgstr "Navn på målfil (valget 'xmlfile') mangler. Bruk kommandolinjevalget xmlfile=."
 
 #. error message - command line option xmlfile is missing
-#: library/commandline/src/modules/CommandLine.rb:950
+#: library/commandline/src/modules/CommandLine.rb:942
 msgid "Target file name ('xmlfile' option) is empty. Use xmlfile= command line option."
 msgstr "Navn på målfil (valget 'xmlfile') mangler. Bruk kommandolinjevalget xmlfile=."
 
 #. translators: fallback name for a module at command line
-#: library/commandline/src/modules/CommandLine.rb:1087
+#: library/commandline/src/modules/CommandLine.rb:1079
 msgid "unknown"
 msgstr "ukjent"
 
 #. translators: the last command %1 in a list of unique commands
-#: library/commandline/src/modules/CommandLine.rb:1461
+#: library/commandline/src/modules/CommandLine.rb:1437
 msgid "or '%1'"
 msgstr "eller '%1'"
 
 #. translators: error message - missing unique command for command line execution
-#: library/commandline/src/modules/CommandLine.rb:1469
+#: library/commandline/src/modules/CommandLine.rb:1445
 msgid "Specify the command '%1'."
 msgstr "Spesifiser kommandoen '%1'."
 
 #. translators: error message - missing unique command for command line execution
-#: library/commandline/src/modules/CommandLine.rb:1476
+#: library/commandline/src/modules/CommandLine.rb:1452
 msgid "Specify one of the commands: %1."
 msgstr "Spesifiser en av kommandoene: %1."
 
 #. size( unique_options ) == 1 here does not make sense
-#: library/commandline/src/modules/CommandLine.rb:1486
+#: library/commandline/src/modules/CommandLine.rb:1462
 msgid "Specify only one of the commands: %1."
 msgstr "Spesifiser kun én av kommandoene: %1."
 
 #. translators: error message - the module does not provide command line interface
-#: library/commandline/src/modules/CommandLine.rb:1531
+#: library/commandline/src/modules/CommandLine.rb:1507
 msgid "There is no user interface available for this module."
 msgstr "Det er ikke noe tilgjengelig brukergrensesnitt for denne modulen."
 
 #. translators: progress message - command line interface ready
-#: library/commandline/src/modules/CommandLine.rb:1560
+#: library/commandline/src/modules/CommandLine.rb:1536
 msgid "Ready"
 msgstr "Klart"
 
 #. non-GUI handling
-#: library/commandline/src/modules/CommandLine.rb:1574
+#: library/commandline/src/modules/CommandLine.rb:1550
 msgid "Initializing"
 msgstr "Initialiserer"
 
 #. translators: Progress message - the command line interface is about to finish
-#: library/commandline/src/modules/CommandLine.rb:1610
+#: library/commandline/src/modules/CommandLine.rb:1584
 msgid "Finishing"
 msgstr "Fullfører"
 
 #. translators: The command line interface is finished
-#: library/commandline/src/modules/CommandLine.rb:1617
+#: library/commandline/src/modules/CommandLine.rb:1591
 msgid "Done"
 msgstr "Fullført"
 
 #. translators: The command line interface is finished without writing the changes
-#: library/commandline/src/modules/CommandLine.rb:1620
+#: library/commandline/src/modules/CommandLine.rb:1594
 msgid "Quitting (without changes)"
 msgstr "Avslutter (uten endringer)"
 
 #. prompt message displayed in the commandline mode
 #. when user is asked to replay "yes" or "no" (localized)
-#: library/commandline/src/modules/CommandLine.rb:1634
+#: library/commandline/src/modules/CommandLine.rb:1608
 msgid "yes or no?"
 msgstr "ja eller nei?"
 
 #. yes - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/modules/CommandLine.rb:1639
+#: library/commandline/src/modules/CommandLine.rb:1613
 msgid "yes"
 msgstr "ja"
 
 #. no - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/modules/CommandLine.rb:1642
+#: library/commandline/src/modules/CommandLine.rb:1616
 msgid "no"
 msgstr "nei"
 
@@ -395,7 +395,7 @@
 #. for translators: use the localized page for your language if it exists,
 #. check the combo box "In other laguages" on top of the page
 #: library/control/src/modules/InstError.rb:167
-#: library/control/src/modules/ProductControl.rb:1444
+#: library/control/src/modules/ProductControl.rb:1435
 msgid "http://en.opensuse.org/Bugs/YaST"
 msgstr "http://en.opensuse.org/Bugs/YaST"
 
@@ -408,7 +408,7 @@
 #. from YaST logs.
 #.
 #. @param [String] error_text (e.g., "Client inst_abc returned invalid data.")
-#: library/control/src/modules/InstError.rb:226
+#: library/control/src/modules/InstError.rb:222
 msgid "Installation Error"
 msgstr "Installasjonsfeil"
 
@@ -435,7 +435,7 @@
 msgstr "Vil du fjerne pakken %1?"
 
 #. error report
-#: library/control/src/modules/ProductControl.rb:1253
+#: library/control/src/modules/ProductControl.rb:1244
 msgid "No workflow defined for this installation mode."
 msgstr "Ingen prosedyre er definert for denne installasjonsmodusen."
 
@@ -447,14 +447,14 @@
 #. button label
 #. Button that will continue with the installation
 #: library/control/src/modules/ProductProfile.rb:183
-#: library/general/src/modules/Popup.rb:744
+#: library/general/src/modules/Popup.rb:737
 msgid "&Continue Installation"
 msgstr "&Fortsett installasjonen"
 
 #. button label
 #. Button that will really abort the installation
 #: library/control/src/modules/ProductProfile.rb:185
-#: library/general/src/modules/Popup.rb:742
+#: library/general/src/modules/Popup.rb:735
 msgid "&Abort Installation"
 msgstr "&Avbryt installasjonen"
 
@@ -495,12 +495,12 @@
 
 #. make sure that every workflow is merged only once
 #. bugzilla #332436
-#: library/control/src/modules/WorkflowManager.rb:1315
+#: library/control/src/modules/WorkflowManager.rb:1306
 msgid "An internal error occurred when integrating additional workflow."
 msgstr "Det oppstod en intern feil ved integrasjon av tilleggsarbeidsflyt."
 
 #. message popup, %1 is a label of some widget
-#: library/cwm/src/modules/CWM.rb:677
+#: library/cwm/src/modules/CWM.rb:691
 msgid "The value of %1 is invalid."
 msgstr "Verdien for %1 er ugyldig."
 
@@ -547,7 +547,7 @@
 #. radio button
 #: library/cwm/src/modules/CWMServiceStart.rb:255
 #: library/cwm/src/modules/CWMServiceStart.rb:267
-#: library/cwm/src/modules/CWMServiceStart.rb:315
+#: library/cwm/src/modules/CWMServiceStart.rb:314
 msgid "During Boot"
 msgstr "Ved oppstart"
 
@@ -556,7 +556,7 @@
 #. radio button
 #: library/cwm/src/modules/CWMServiceStart.rb:257
 #: library/cwm/src/modules/CWMServiceStart.rb:269
-#: library/cwm/src/modules/CWMServiceStart.rb:322
+#: library/cwm/src/modules/CWMServiceStart.rb:321
 msgid "Manually"
 msgstr "Manuelt"
 
@@ -566,22 +566,22 @@
 msgstr "Via xinetd"
 
 #. radio button
-#: library/cwm/src/modules/CWMServiceStart.rb:329
+#: library/cwm/src/modules/CWMServiceStart.rb:328
 msgid "Via &xinetd"
 msgstr "Via &xinetd"
 
 #. frame
-#: library/cwm/src/modules/CWMServiceStart.rb:374
+#: library/cwm/src/modules/CWMServiceStart.rb:373
 msgid "Service Start"
 msgstr "Start av tjeneste"
 
 #. service status - label
-#: library/cwm/src/modules/CWMServiceStart.rb:465
+#: library/cwm/src/modules/CWMServiceStart.rb:464
 msgid "Service is running"
 msgstr "Tjenesten er aktivert"
 
 #. service status - label
-#: library/cwm/src/modules/CWMServiceStart.rb:471
+#: library/cwm/src/modules/CWMServiceStart.rb:470
 msgid "Service is not running"
 msgstr "Tjenesten er ikke aktivert"
 
@@ -590,7 +590,7 @@
 #. %1 is eg. "Start the Service Now"
 #. %2 is eg. "Stop the Service Now"
 #. (both without quotes)
-#: library/cwm/src/modules/CWMServiceStart.rb:504
+#: library/cwm/src/modules/CWMServiceStart.rb:503
 msgid ""
 "<p><b><big>Switch On or Off</big></b><br>\n"
 "To start or stop the service immediately, use \n"
@@ -604,7 +604,7 @@
 #. %3 is push button label, eg. "Save Changes and Restart Service Now"
 #. (without quotes)
 #. note: %3 is correct, do not replace with %1!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:516
+#: library/cwm/src/modules/CWMServiceStart.rb:515
 msgid ""
 "<p>To save all changes and restart the\n"
 "service immediately, use <b>%3</b>.</p>\n"
@@ -613,48 +613,48 @@
 "tjenesten straks, bruk <b>%3</b>.</p>\n"
 
 #. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:531
+#: library/cwm/src/modules/CWMServiceStart.rb:530
 msgid "Start the Service Now"
 msgstr "Aktiver tjenesten nå"
 
 #. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:533
+#: library/cwm/src/modules/CWMServiceStart.rb:532
 msgid "Stop the Service Now"
 msgstr "Deaktiver tjenesten nå"
 
 #. part of help text - push button label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:535
+#: library/cwm/src/modules/CWMServiceStart.rb:534
 msgid "Save Changes and Restart Service Now"
 msgstr "Lagre endringene og start tjenesten på nytt nå"
 
 #. push button for immediate service starting
-#: library/cwm/src/modules/CWMServiceStart.rb:577
+#: library/cwm/src/modules/CWMServiceStart.rb:575
 msgid "&Start the Service Now"
 msgstr "&Aktiver tjenesten nå"
 
 #. push button for immediate service stopping
-#: library/cwm/src/modules/CWMServiceStart.rb:584
+#: library/cwm/src/modules/CWMServiceStart.rb:582
 msgid "S&top the Service Now"
 msgstr "D&eaktiver tjenesten nå"
 
 #. push button for immediate saving of the settings and service starting
-#: library/cwm/src/modules/CWMServiceStart.rb:591
+#: library/cwm/src/modules/CWMServiceStart.rb:589
 msgid "S&ave Changes and Restart Service Now"
 msgstr "L&agre endringene og start tjenesten på nytt nå"
 
 #. Frame label (stoping starting service)
-#: library/cwm/src/modules/CWMServiceStart.rb:614
+#: library/cwm/src/modules/CWMServiceStart.rb:612
 msgid "Switch On and Off"
 msgstr "Aktivere og deaktivere"
 
 #. Current status
-#: library/cwm/src/modules/CWMServiceStart.rb:620
+#: library/cwm/src/modules/CWMServiceStart.rb:618
 msgid "Current Status: "
 msgstr "Gjeldende status: "
 
 #. help text for LDAP enablement widget
 #. %1 is button label, eg. "LDAP Support Active" (without quotes)
-#: library/cwm/src/modules/CWMServiceStart.rb:730
+#: library/cwm/src/modules/CWMServiceStart.rb:728
 msgid ""
 "<p><b><big>LDAP Support</big></b><br>\n"
 "To store the settings in LDAP instead of native configuration files,\n"
@@ -665,12 +665,12 @@
 "velg <b>%1</b>.</p>"
 
 #. part of help text - check box label, NO SHORTCUT!!!
-#: library/cwm/src/modules/CWMServiceStart.rb:743
+#: library/cwm/src/modules/CWMServiceStart.rb:741
 msgid "LDAP Support Active"
 msgstr "LDAP-støtte aktivert"
 
 #. check box
-#: library/cwm/src/modules/CWMServiceStart.rb:772
+#: library/cwm/src/modules/CWMServiceStart.rb:769
 msgid "&LDAP Support Active"
 msgstr "&LDAP-støtte aktivert"
 
@@ -682,7 +682,7 @@
 #. push button
 #. push button
 #. Button label
-#: library/cwm/src/modules/CWMTable.rb:370
+#: library/cwm/src/modules/CWMTable.rb:372
 #: library/cwm/src/modules/TablePopup.rb:940
 #: library/general/src/modules/Label.rb:166
 msgid "&Up"
@@ -690,7 +690,7 @@
 
 #. push button
 #. push button
-#: library/cwm/src/modules/CWMTable.rb:372
+#: library/cwm/src/modules/CWMTable.rb:374
 #: library/cwm/src/modules/TablePopup.rb:942
 msgid "&Down"
 msgstr "&Ned"
@@ -732,12 +732,12 @@
 msgstr "Den spesifiserte filen finnes. Vil du overskrive den?"
 
 #. error report
-#: library/cwm/src/modules/CWMTsigKeys.rb:368
+#: library/cwm/src/modules/CWMTsigKeys.rb:366
 msgid "The TSIG key ID was not specified."
 msgstr "TSIG-nøkkel-ID ble ikke spesifisert."
 
 #. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:375
+#: library/cwm/src/modules/CWMTsigKeys.rb:373
 msgid ""
 "The key with the specified ID exists and is used.\n"
 "Remove it?"
@@ -746,7 +746,7 @@
 "Vil du slette den?"
 
 #. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:395
+#: library/cwm/src/modules/CWMTsigKeys.rb:393
 msgid ""
 "A key with the specified ID was found\n"
 "on your disk. Remove it?"
@@ -755,27 +755,27 @@
 "på disken. Vil du slette den?"
 
 #. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:420
+#: library/cwm/src/modules/CWMTsigKeys.rb:418
 msgid "The key will be created now. Continue?"
 msgstr "Nøkkelen vil bli opprettet nå. Vil du fortsette?"
 
 #. error report
-#: library/cwm/src/modules/CWMTsigKeys.rb:436
+#: library/cwm/src/modules/CWMTsigKeys.rb:434
 msgid "Creating the TSIG key failed."
 msgstr "TSIG-nøkkelen kunne ikke opprettes."
 
 #. message popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:446
+#: library/cwm/src/modules/CWMTsigKeys.rb:444
 msgid "The specified file does not exist."
 msgstr "Den spesifiserte filen finnes ikke."
 
 #. message popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:452
+#: library/cwm/src/modules/CWMTsigKeys.rb:450
 msgid "The specified file does not contain any TSIG key."
 msgstr "Den spesifiserte filen inneholder ikke noen TSIG-nøkkel."
 
 #. yes-no popup
-#: library/cwm/src/modules/CWMTsigKeys.rb:462
+#: library/cwm/src/modules/CWMTsigKeys.rb:460
 msgid ""
 "The specified file contains a TSIG key with the same\n"
 "identifier as some of already present keys.\n"
@@ -786,7 +786,7 @@
 "De gamle kodene vil bli slettet. Vil du fortsette?"
 
 #. tsig keys management dialog help 1/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:565
+#: library/cwm/src/modules/CWMTsigKeys.rb:563
 msgid ""
 "<p><big><b>TSIG Key Management</b></big><br>\n"
 "Use this dialog to manage the TSIG keys.</p>\n"
@@ -795,7 +795,7 @@
 "I denne dialogen kan du administrere TSIG-nøklene.</p>\n"
 
 #. tsig keys management dialog help 2/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:569
+#: library/cwm/src/modules/CWMTsigKeys.rb:567
 msgid ""
 "<p><big><b>Adding an Existing TSIG Key</b></big><br>\n"
 "To add an already created TSIG key, select a <b>Filename</b> of the file\n"
@@ -806,7 +806,7 @@
 "som inneholder nøkkelen, og klikk <b>Legg til</b>.</p>\n"
 
 #. tsig keys management dialog help 3/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:575
+#: library/cwm/src/modules/CWMTsigKeys.rb:573
 msgid ""
 "<p><big><b>Creating a New TSIG Key</b></big><br>\n"
 "To create a new TSIG key, set the <b>Filename</b> of the file in which to\n"
@@ -819,7 +819,7 @@
 "<b>Generer</b>.</p>\n"
 
 #. tsig keys management dialog help 4/4
-#: library/cwm/src/modules/CWMTsigKeys.rb:582
+#: library/cwm/src/modules/CWMTsigKeys.rb:580
 msgid ""
 "<p><big><b>Removing a TSIG Key</b></big><br>\n"
 "To remove a configured TSIG key, select it and click <b>Delete</b>.\n"
@@ -836,27 +836,27 @@
 "i konfigurasjonen.</p>\n"
 
 #. Frame label - adding a created server key
-#: library/cwm/src/modules/CWMTsigKeys.rb:594
+#: library/cwm/src/modules/CWMTsigKeys.rb:592
 msgid "Add an Existing TSIG Key"
 msgstr "Legge til en eksisterende TSIG-nøkkel"
 
 #. Frame label - creating a new server key
-#: library/cwm/src/modules/CWMTsigKeys.rb:643
+#: library/cwm/src/modules/CWMTsigKeys.rb:641
 msgid "Create a New TSIG Key"
 msgstr "Opprette en ny TSIG-nøkkel"
 
 #. text entry
-#: library/cwm/src/modules/CWMTsigKeys.rb:655
+#: library/cwm/src/modules/CWMTsigKeys.rb:653
 msgid "&Key ID"
 msgstr "&Nøkkel-ID"
 
 #. push button
-#: library/cwm/src/modules/CWMTsigKeys.rb:687
+#: library/cwm/src/modules/CWMTsigKeys.rb:685
 msgid "&Generate"
 msgstr "&Generer"
 
 #. Table header - in fact label
-#: library/cwm/src/modules/CWMTsigKeys.rb:699
+#: library/cwm/src/modules/CWMTsigKeys.rb:697
 msgid "Current TSIG Keys"
 msgstr "Gjeldende TSIG-nøkler"
 
@@ -864,7 +864,7 @@
 #. table header - GPG key ID
 #. table header - GPG key ID
 #. GnuPG key ID used as "Key ID: 1144AAAA444"
-#: library/cwm/src/modules/CWMTsigKeys.rb:707
+#: library/cwm/src/modules/CWMTsigKeys.rb:705
 #: library/gpg/src/modules/GPGWidgets.rb:192
 #: library/gpg/src/modules/GPGWidgets.rb:224
 #: library/packages/src/modules/SignatureCheckDialogs.rb:57
@@ -872,22 +872,22 @@
 msgstr "Nøkkel-ID"
 
 #. Table header item - DNS key listing
-#: library/cwm/src/modules/CWMTsigKeys.rb:709
+#: library/cwm/src/modules/CWMTsigKeys.rb:707
 msgid "Filename"
 msgstr "Filnavn"
 
 #. combobox header
-#: library/cwm/src/modules/TablePopup.rb:487
+#: library/cwm/src/modules/TablePopup.rb:484
 msgid "&Selected Option"
 msgstr "&Valgt alternativ"
 
 #. heading / label
-#: library/cwm/src/modules/TablePopup.rb:536
+#: library/cwm/src/modules/TablePopup.rb:533
 msgid "Current Option: "
 msgstr "Gjeldende alternativ: "
 
 #. error report
-#: library/cwm/src/modules/TablePopup.rb:720
+#: library/cwm/src/modules/TablePopup.rb:717
 msgid "The selected option is already present."
 msgstr "Det valgte alternativet finnes allerede."
 
@@ -951,19 +951,19 @@
 "i listen.</p>"
 
 #. menu button
-#: library/cwm/src/modules/WizardHW.rb:209
+#: library/cwm/src/modules/WizardHW.rb:204
 msgid "&Other"
 msgstr "&Annet"
 
 #. translators: message for hardware configuration without any configured
 #. device
-#: library/cwm/src/modules/WizardHW.rb:509
+#: library/cwm/src/modules/WizardHW.rb:504
 msgid "The device is not configured"
 msgstr "Enheten er ikke konfigurert"
 
 #. translators: message for hardware configuration without any configured
 #. device
-#: library/cwm/src/modules/WizardHW.rb:512
+#: library/cwm/src/modules/WizardHW.rb:507
 msgid "Press <B>Edit</B> to configure"
 msgstr "Klikk på <B>Rediger</B> for å konfigurere"
 
@@ -1113,9 +1113,91 @@
 "<p>I noen dialoger er ingen eller bare noen\n"
 "av F-tastene tilgjengelige.</p>"
 
+#. @param service [Object] An object providing the following methods:
+#. #name, #start, #stop, #enabled?, #running?
+#. For systemd compliant services, just do
+#. Yast::SystemdService.find("name_of_the_service")
+#. Note that this widget will #start and #stop the service by itself but
+#. the actions referenced by the flags (reloading and enabling/disabling)
+#. are expected to be done by the caller, when the whole configuration is
+#. written.
+#. @param reload_flag [Boolean] Initial value for the "reload" checkbox.
+#. Keep in mind it will always be displayed as unchecked if the service
+#. is not running, despite the real value.
+#. @param reload_flag_label [Symbol] Type of label for the "reload" checkbox.
+#. :reload means the service will be reloaded.
+#. :restart means the service will be restarted.
+#: library/general/src/lib/ui/service_status.rb:59
+#, fuzzy
+#| msgid "Read Other Settings."
+msgid "Restart After Saving Settings"
+msgstr "Les andre innstillinger."
+
+#: library/general/src/lib/ui/service_status.rb:61
+#, fuzzy
+#| msgid "Read Other Settings."
+msgid "Reload After Saving Settings"
+msgstr "Les andre innstillinger."
+
+#. @return [YaST::Term]
+#: library/general/src/lib/ui/service_status.rb:68
+#, fuzzy
+#| msgid "Service Start"
+msgid "Service Status"
+msgstr "Start av tjeneste"
+
+#. Content for the help
+#: library/general/src/lib/ui/service_status.rb:129
+msgid ""
+"<p><b><big>Current status</big></b><br>\n"
+"Displays the current status of the service. The status will remain the same after saving the settings, independently of the value of 'start service during boot'.</p>\n"
+"<p><b><big>%{reload_label}</big></b><br>\n"
+"Only applicable if the service is currently running. Ensures the running service reloads the new configuration after saving it (either finishing the dialog or pressing the apply button).</p>\n"
+"<p><b><big>Start During System Boot</big></b><br>\n"
+"Check this field to enable the service at system boot. Un-check it to disable the service. This does not affect the current status of the service in the already running system.</p>\n"
+msgstr ""
+
+#. Widget displaying the status and associated buttons
+#: library/general/src/lib/ui/service_status.rb:155
+msgid "Current status:"
+msgstr "Gjeldende status:"
+
+#. Widget to configure the status on boot
+#: library/general/src/lib/ui/service_status.rb:168
+#, fuzzy
+#| msgid "Operating System Boot"
+msgid "Start During System Boot"
+msgstr "Oppstart av operativsystem"
+
+#. TRANSLATORS: status of a service
+#: library/general/src/lib/ui/service_status.rb:192
+#, fuzzy
+#| msgid "Warning"
+msgid "running"
+msgstr "Advarsel"
+
+#: library/general/src/lib/ui/service_status.rb:194
+#, fuzzy
+#| msgid "S&top now ..."
+msgid "Stop now"
+msgstr "S&topp nå ..."
+
+#. TRANSLATORS: status of a service
+#: library/general/src/lib/ui/service_status.rb:199
+#, fuzzy
+#| msgid "Stopped"
+msgid "stopped"
+msgstr "Stoppet"
+
+#: library/general/src/lib/ui/service_status.rb:201
+#, fuzzy
+#| msgid "Start it now?"
+msgid "Start now"
+msgstr "Start den nå?"
+
 #. TRANSLATORS: popup question (with continue / cancel buttons)
 #. %1 is the filesystem path
-#: library/general/src/modules/FileUtils.rb:292
+#: library/general/src/modules/FileUtils.rb:287
 msgid ""
 "Although the path %1 exists, it is not a directory.\n"
 "Continue or cancel the operation?\n"
@@ -1125,7 +1207,7 @@
 
 #. TRANSLATORS: question popup (with yes / no buttons). A user entered non-existent path
 #. for a share, %1 is entered path
-#: library/general/src/modules/FileUtils.rb:306
+#: library/general/src/modules/FileUtils.rb:300
 msgid ""
 "The path %1 does not exist.\n"
 "Create it now?\n"
@@ -1135,7 +1217,7 @@
 
 #. TRANSLATORS: popup question (with continue / cancel buttons)
 #. %1 is the name (path) of the directory
-#: library/general/src/modules/FileUtils.rb:325
+#: library/general/src/modules/FileUtils.rb:319
 msgid ""
 "Failed to create the directory %1.\n"
 "Continue or cancel the current operation?\n"
@@ -1313,7 +1395,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:664
+#: library/packages/src/modules/PackageCallbacks.rb:665
 #: library/wizard/src/modules/Confirm.rb:126
 msgid "&Skip"
 msgstr "&Hopp over"
@@ -1336,7 +1418,7 @@
 #. TextEntry Label
 #. textentry label
 #: library/general/src/modules/Label.rb:319
-#: library/packages/src/modules/PackageCallbacks.rb:2230
+#: library/packages/src/modules/PackageCallbacks.rb:2221
 msgid "&Password"
 msgstr "&Passord"
 
@@ -1561,27 +1643,27 @@
 msgstr "Kerberos-skjemafil ikke funnet"
 
 #. Confirm user request to abort installation
-#: library/general/src/modules/Popup.rb:740
+#: library/general/src/modules/Popup.rb:733
 msgid "Really abort the installation?"
 msgstr "Er du sikker på at du vil avbryte installasjonen?"
 
 #. Confirm user request to abort System Repair
-#: library/general/src/modules/Popup.rb:749
+#: library/general/src/modules/Popup.rb:742
 msgid "Really abort YaST System Repair?"
 msgstr "Er du sikker på at du vil avbryte YaST systemreparasjon?"
 
 #. Button that will really abort the repair
-#: library/general/src/modules/Popup.rb:751
+#: library/general/src/modules/Popup.rb:744
 msgid "Abort System Repair"
 msgstr "Avbryt systemreparasjon"
 
 #. Button that will continue with the repair
-#: library/general/src/modules/Popup.rb:753
+#: library/general/src/modules/Popup.rb:746
 msgid "&Continue System Repair"
 msgstr "&Fortsett systemreparasjon"
 
 #. Warning text for aborting an installation before anything is installed
-#: library/general/src/modules/Popup.rb:756
+#: library/general/src/modules/Popup.rb:749
 msgid ""
 "If you abort the installation now,\n"
 "Linux will not be installed.\n"
@@ -1594,7 +1676,7 @@
 #. Warning text for aborting an installation during the install process
 #. - After some installation steps have been performed - e.g.
 #. disks formatted / some packages already installed
-#: library/general/src/modules/Popup.rb:766
+#: library/general/src/modules/Popup.rb:759
 msgid ""
 "If you abort the installation now, you will\n"
 "have an incomplete Linux system\n"
@@ -1608,7 +1690,7 @@
 
 #. Warning text for aborting an installation during the install process
 #. right in the middle of some critical process (e.g. formatting)
-#: library/general/src/modules/Popup.rb:775
+#: library/general/src/modules/Popup.rb:768
 msgid ""
 "If you abort the installation now,\n"
 "Linux will be unusable.\n"
@@ -1619,18 +1701,18 @@
 "Du må installere på nytt."
 
 #. Confirm aborting the program
-#: library/general/src/modules/Popup.rb:829
+#: library/general/src/modules/Popup.rb:822
 msgid "Really abort?"
 msgstr "Er du sikker at du vil avbryte?"
 
 #. Additional hint when trying to abort program in spite of changes
-#: library/general/src/modules/Popup.rb:837
+#: library/general/src/modules/Popup.rb:830
 msgid "All changes will be lost!"
 msgstr "Alle endringer vil gå tapt!"
 
 #. FIXME: BNC #422612, Use `opt(`noSanityCheck) later
 #. button label
-#: library/general/src/modules/Popup.rb:867
+#: library/general/src/modules/Popup.rb:860
 msgid "&Details..."
 msgstr "&Detaljer..."
 
@@ -1658,7 +1740,7 @@
 #: library/general/src/modules/Report.rb:157
 #: library/general/src/modules/Report.rb:171
 #: library/general/src/modules/Report.rb:187
-#: library/network/src/modules/NetworkPopup.rb:86
+#: library/network/src/modules/NetworkPopup.rb:90
 #: library/types/src/modules/String.rb:101
 msgid "Yes"
 msgstr "Ja"
@@ -1669,7 +1751,7 @@
 #: library/general/src/modules/Report.rb:157
 #: library/general/src/modules/Report.rb:171
 #: library/general/src/modules/Report.rb:187
-#: library/network/src/modules/NetworkPopup.rb:85
+#: library/network/src/modules/NetworkPopup.rb:89
 #: library/types/src/modules/String.rb:101
 msgid "No"
 msgstr "Nei"
@@ -1733,19 +1815,19 @@
 msgstr "Logg feil: %1"
 
 #. translators: warnings summary header
-#: library/general/src/modules/Report.rb:662
+#: library/general/src/modules/Report.rb:664
 msgid "Warning:"
 msgstr "Advarsel:"
 
 #. translators: errors summary header
-#: library/general/src/modules/Report.rb:679
+#: library/general/src/modules/Report.rb:681
 msgid "Error:"
 msgstr "Feil:"
 
 #. translators: message summary header
 #. translators: message summary header
-#: library/general/src/modules/Report.rb:696
-#: library/general/src/modules/Report.rb:713
+#: library/general/src/modules/Report.rb:698
+#: library/general/src/modules/Report.rb:715
 msgid "Message:"
 msgstr "Melding:"
 
@@ -1798,7 +1880,7 @@
 msgstr "&Slett"
 
 #. translators: Tree header
-#: library/general/src/modules/ValueBrowser.rb:153
+#: library/general/src/modules/ValueBrowser.rb:152
 msgid "&Variable"
 msgstr "&Variabel"
 
@@ -1894,7 +1976,7 @@
 msgstr "Angi passfrase"
 
 #. ask for the passphrase in the commandline (interactive) mode
-#: library/gpg/src/modules/GPGWidgets.rb:380
+#: library/gpg/src/modules/GPGWidgets.rb:382
 msgid "Enter Passphrase to Unlock GPG Key %1: "
 msgstr "Angi passfrasen som låser opp GPG-nøkkelen %1: "
 
@@ -2000,6 +2082,235 @@
 msgid "Error occurred while reading the log."
 msgstr "Det oppstod en feil under lesing av loggen."
 
+#. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title
+#: library/network/src/lib/network/susefirewall.rb:514
+msgid "Unknown Zone"
+msgstr "Ukjent sone"
+
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#: library/network/src/lib/network/susefirewall.rb:946
+#: library/network/src/lib/network/susefirewall.rb:1022
+msgid ""
+"Interface '%1' is not assigned to any firewall zone.\n"
+"Run YaST2 Firewall and assign it.\n"
+msgstr ""
+"Grensesnittet '%1' er ikke tilordnet noen brannmursone.\n"
+"Det kan tilordnes manuelt under Brannmur i YaST2.\n"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:119
+#: library/network/src/lib/network/susefirewalld.rb:100
+msgid "External Zone"
+msgstr "Ekstern sone"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:123
+#: library/network/src/lib/network/susefirewalld.rb:106
+msgid "Internal Zone"
+msgstr "Intern sone"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewall2.rb:127
+#: library/network/src/lib/network/susefirewalld.rb:94
+msgid "Demilitarized Zone"
+msgstr "Demilitarisert sone"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:250
+msgid "TCP"
+msgstr "TCP"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:252
+msgid "UDP"
+msgstr "UDP"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:254
+msgid "RPC"
+msgstr "RPC"
+
+#. protocol name
+#: library/network/src/lib/network/susefirewall2.rb:256
+msgid "IP"
+msgstr "IP"
+
+#. TRANSLATORS: Error message, %1 = interface name (like eth0)
+#: library/network/src/lib/network/susefirewall2.rb:1066
+msgid ""
+"Interface '%1' is included in multiple firewall zones.\n"
+"Continuing with configuration can produce errors.\n"
+"\n"
+"It is recommended to leave the configuration and repair it manually in\n"
+"the file '/etc/sysconfig/SuSEFirewall'."
+msgstr ""
+"Grensesnittet %1 er med i flere brannmursoner.\n"
+"Denne konfigurasjonen kan føre til feil.\n"
+"\n"
+"Du bør avslutte konfigurasjonen og reparere den manuelt i\n"
+"filen '/etc/sysconfig/SuSEfirewall'."
+
+#. TRANSLATORS: Dialog caption
+#: library/network/src/lib/network/susefirewall2.rb:1543
+msgid "Initializing Firewall Configuration"
+msgstr "Initialiserer brannmurkonfigurasjon"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1551
+msgid "Check for network devices"
+msgstr "Søk etter nettverksenheter"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1553
+msgid "Read current configuration"
+msgstr "Les gjeldende konfigurasjon"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1555
+msgid "Check possibly conflicting services"
+msgstr "Kontroller om det finnes tjenester som skaper konflikter"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1559
+msgid "Checking for network devices..."
+msgstr "Søker etter nettverksenheter..."
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1561
+msgid "Reading current configuration..."
+msgstr "Leser gjeldende konfigurasjon..."
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1563
+msgid "Checking possibly conflicting services..."
+msgstr "Kontrollerer om det finnes tjenester som skaper konflikter..."
+
+#. TRANSLATORS: Dialog caption
+#: library/network/src/lib/network/susefirewall2.rb:1702
+msgid "Writing Firewall Configuration"
+msgstr "Lagrer brannmurkonfigurasjon"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1710
+msgid "Write firewall settings"
+msgstr "Lagre brannmurinnstillinger"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1712
+msgid "Adjust firewall service"
+msgstr "Tilpass brannmurtjenesten"
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1716
+msgid "Writing firewall settings..."
+msgstr "Lagrer brannmurinnstillinger..."
+
+#. TRANSLATORS: Progress step
+#: library/network/src/lib/network/susefirewall2.rb:1718
+msgid "Adjusting firewall service..."
+msgstr "Tilpasser brannmurtjenesten..."
+
+#. TRANSLATORS: a popup error message
+#: library/network/src/lib/network/susefirewall2.rb:1737
+msgid "Writing settings failed"
+msgstr "Innstillingene kunne ikke lagres"
+
+#. table item, %1 stands for the buggy protocol name
+#: library/network/src/lib/network/susefirewall2.rb:2392
+msgid "Unknown protocol (%1)"
+msgstr "Ukjent protokoll (%1)"
+
+#. Returns service definition.
+#. See @services for the format.
+#. If *silent* is `false` (the default), the method throws an exception
+#. {Yast::SuSEFirewalServiceNotFound} if service is not found on disk.
+#.
+#. @param [String] service name (including the "service:" prefix)
+#. @param [String] (optional) whether to silently return nil
+#. when service is not found (default false)
+#. @api private
+#. Immediately writes the configuration of service defined by package to the
+#. service definition file. Service must be defined by package, this function
+#. doesn't work for hard-coded services (SuSEFirewallServices).
+#. Function throws an exception {Yast::SuSEFirewalServiceNotFound}
+#. if service is not known (undefined) or it is not a service
+#. defined by package.
+#.
+#. @param [String] service ID (e.g., "service:ssh")
+#. @param [Hash{String => Array<String>] store_definition of full service definition
+#. @return [Boolean] if successful (nil in case of developer's mistake)
+#.
+#. @see #IsKnownService
+#. @see #ServiceDefinedByPackage
+#.
+#. @example
+#. SetNeededPortsAndProtocols (
+#. "service:something",
+#. {
+#. "tcp_ports"      => [ "22", "ftp-data", "400:420" ],
+#. "udp_ports"      => [ ],
+#. "rpc_ports"      => [ "portmap", "ypbind" ],
+#. "ip_protocols"   => [ "esp" ],
+#. "broadcast_ports"=> [ ],
+#. }
+#. )
+#. If service description is the default one then we know that we haven't read the service
+#. information just yet. Lets do it now
+#: library/network/src/lib/network/susefirewall2services.rb:340
+#: library/network/src/lib/network/susefirewall2services.rb:497
+#: library/network/src/lib/network/susefirewalldservices.rb:127
+msgid "Service with name '%{service_name}' does not exist"
+msgstr ""
+
+#. Fallback for presented service
+#: library/network/src/lib/network/susefirewall2services.rb:411
+#, fuzzy
+#| msgid "Service: %1"
+msgid "Service: %{filename}"
+msgstr "Tjeneste: %1"
+
+#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
+#: library/network/src/lib/network/susefirewalld.rb:91
+msgid "Block Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:97
+msgid "Drop Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:103
+msgid "Home Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:109
+#, fuzzy
+#| msgid "GPG Public Keys"
+msgid "Public Zone"
+msgstr "Offentlige GPG-nøkler"
+
+#: library/network/src/lib/network/susefirewalld.rb:112
+msgid "Trusted Zone"
+msgstr ""
+
+#: library/network/src/lib/network/susefirewalld.rb:115
+msgid "Work Zone"
+msgstr ""
+
+#. A good default description for all services. We will use that to
+#. determine if the service has been populated or not.
+#.
+#. @param service_name [String] The service name
+#. @return [String] Default description for service
+#: library/network/src/lib/network/susefirewalldservices.rb:149
+msgid "The %{service_name} Service"
+msgstr ""
+
+#. TRANSLATORS: Name of unknown service. %1 is a requested service id like nfs-server
+#: library/network/src/lib/network/susefirewallservices.rb:73
+msgid "Unknown service '%1'"
+msgstr "Ukjent enhet '%1'"
+
 #. label
 #: library/network/src/modules/CWMFirewallInterfaces.rb:109
 msgid "Firewall cannot be adjusted during first stage installation."
@@ -2041,13 +2352,13 @@
 msgstr "Grensesnittet er ikke tilordnet noen sone."
 
 #. transaltors: selection box title
-#: library/network/src/modules/CWMFirewallInterfaces.rb:412
+#: library/network/src/modules/CWMFirewallInterfaces.rb:407
 msgid "&Network Interfaces with Open Port in Firewall"
 msgstr "&Nettverksgrensesnitt med åpen port i brannmur"
 
 #. Check the INT zone, it's not protected by default
 #. See bnc #382686
-#: library/network/src/modules/CWMFirewallInterfaces.rb:499
+#: library/network/src/modules/CWMFirewallInterfaces.rb:494
 msgid ""
 "These network interfaces assigned to internal network cannot be deselected:\n"
 "%1\n"
@@ -2056,7 +2367,7 @@
 "%1\n"
 
 #. question popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:520
+#: library/network/src/modules/CWMFirewallInterfaces.rb:515
 msgid ""
 "No interface is selected. Service will not\n"
 "be available for other computers.\n"
@@ -2069,7 +2380,7 @@
 "Vil du fortsette?"
 
 #. yes-no popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:550
+#: library/network/src/modules/CWMFirewallInterfaces.rb:545
 msgid ""
 "Because of SuSE Firewall settings, the port\n"
 "on the following interfaces will additionally be open:\n"
@@ -2085,8 +2396,8 @@
 
 #. yes-no popup
 #. yes-no popup
-#: library/network/src/modules/CWMFirewallInterfaces.rb:569
-#: library/network/src/modules/CWMFirewallInterfaces.rb:623
+#: library/network/src/modules/CWMFirewallInterfaces.rb:564
+#: library/network/src/modules/CWMFirewallInterfaces.rb:619
 msgid ""
 "Because of SuSE Firewall settings, the port\n"
 "on the following interfaces cannot be opened:\n"
@@ -2101,29 +2412,29 @@
 "Vil du fortsette?"
 
 #. translators: selection box title
-#: library/network/src/modules/CWMFirewallInterfaces.rb:713
+#: library/network/src/modules/CWMFirewallInterfaces.rb:701
 msgid "Network &Interfaces with Open Port in Firewall"
 msgstr "Nettverks&grensesnitt vil åpne port i brannmur"
 
 #. push button to select all network intefaces for firewall
-#: library/network/src/modules/CWMFirewallInterfaces.rb:725
+#: library/network/src/modules/CWMFirewallInterfaces.rb:713
 msgid "Select &All"
 msgstr "Velg &alle"
 
 #. push button to deselect all network intefaces for firewall
-#: library/network/src/modules/CWMFirewallInterfaces.rb:733
+#: library/network/src/modules/CWMFirewallInterfaces.rb:721
 msgid "Select &None"
 msgstr "Velg &ingen"
 
 #. TRANSLATORS: Error message, do not translate %{details}
-#: library/network/src/modules/CWMFirewallInterfaces.rb:828
+#: library/network/src/modules/CWMFirewallInterfaces.rb:816
 msgid ""
 "Error checking service status:\n"
 "%{details}"
 msgstr ""
 
 #. TRANSLATORS: Error message, do not translate %{details}
-#: library/network/src/modules/CWMFirewallInterfaces.rb:862
+#: library/network/src/modules/CWMFirewallInterfaces.rb:850
 msgid ""
 "Error setting service status:\n"
 "%{details}"
@@ -2131,7 +2442,7 @@
 
 #. help text for firewall settings widget 1/3,
 #. %1 is check box label, eg. "Open Port in Firewall" (without quotes)
-#: library/network/src/modules/CWMFirewallInterfaces.rb:998
+#: library/network/src/modules/CWMFirewallInterfaces.rb:983
 msgid ""
 "<p><b><big>Firewall Settings</big></b><br>\n"
 "To open the firewall to allow access to the service from remote computers,\n"
@@ -2144,7 +2455,7 @@
 #. help text for firewall port openning widget 2/3, optional
 #. %1 is push button label, eg. "Firewall &Details" (without quotes)
 #. note: %2 is correct, do not replace with %1!!!
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1009
+#: library/network/src/modules/CWMFirewallInterfaces.rb:994
 msgid ""
 "To select interfaces on which to open the port,\n"
 "click <b>%2</b>.<br>"
@@ -2153,7 +2464,7 @@
 "klikk <b>%2</b>.<br>"
 
 #. help text for firewall settings widget 3/3,
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1017
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1002
 msgid ""
 "This option is available only if the firewall\n"
 "is enabled.</p>"
@@ -2162,46 +2473,48 @@
 "er aktivert.</p>"
 
 #. part of help text - check box label, NO SHORTCUT!!!
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1029
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1014
 msgid "Open Port in Firewall"
 msgstr "Åpne port i brannmur"
 
 #. part of help text - push button label, NO SHORTCUT!!!
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1031
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1016
 msgid "Firewall Details"
 msgstr "Brannmurinformasjon"
 
 #. check box
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1063
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1047
 msgid "Open Port in &Firewall"
 msgstr "Åpne port i &brannmur"
 
 #. push button
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1070
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1054
 msgid "Firewall &Details..."
 msgstr "Brannmur&informasjon..."
 
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1098
-msgid "Firewall Settings"
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1082
+#, fuzzy
+#| msgid "Firewall Settings"
+msgid "Firewall Settings for %{firewall}"
 msgstr "Brannmurinnstillinger"
 
 #. label text
-#: library/network/src/modules/CWMFirewallInterfaces.rb:1105
+#: library/network/src/modules/CWMFirewallInterfaces.rb:1089
 msgid "Firewall is open"
 msgstr "Brannmur er åpen"
 
 #. pppN must be tried before pN, modem before netcard
 #. Device type label
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:406
-#: library/network/src/modules/NetworkInterfaces.rb:1201
-#: library/network/src/modules/NetworkInterfaces.rb:1212
+#: library/network/src/modules/NetworkInterfaces.rb:415
+#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1256
 #: library/system/src/include/hwinfo/classnames.rb:108
 #: library/system/src/include/hwinfo/classnames.rb:198
 msgid "Modem"
 msgstr "Modem"
 
-#: library/network/src/modules/NetworkInterfaces.rb:411
+#: library/network/src/modules/NetworkInterfaces.rb:420
 msgid "Network Card"
 msgstr "Nettverkskort"
 
@@ -2209,27 +2522,27 @@
 #. Device type label
 #. Device type label
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:416
-#: library/network/src/modules/NetworkInterfaces.rb:1146
-#: library/network/src/modules/NetworkInterfaces.rb:1184
+#: library/network/src/modules/NetworkInterfaces.rb:425
 #: library/network/src/modules/NetworkInterfaces.rb:1190
-#: library/network/src/modules/NetworkInterfaces.rb:1205
+#: library/network/src/modules/NetworkInterfaces.rb:1228
+#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1249
 msgid "ISDN"
 msgstr "ISDN"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:421
-#: library/network/src/modules/NetworkInterfaces.rb:1153
+#: library/network/src/modules/NetworkInterfaces.rb:430
+#: library/network/src/modules/NetworkInterfaces.rb:1197
 msgid "DSL"
 msgstr "DSL"
 
-#: library/network/src/modules/NetworkInterfaces.rb:423
-#: library/packages/src/modules/SignatureCheckDialogs.rb:487
-#: library/packages/src/modules/SignatureCheckDialogs.rb:488
-#: library/packages/src/modules/SignatureCheckDialogs.rb:760
-#: library/packages/src/modules/SignatureCheckDialogs.rb:761
-#: library/packages/src/modules/SignatureCheckDialogs.rb:996
-#: library/packages/src/modules/SignatureCheckDialogs.rb:998
+#: library/network/src/modules/NetworkInterfaces.rb:432
+#: library/packages/src/modules/SignatureCheckDialogs.rb:480
+#: library/packages/src/modules/SignatureCheckDialogs.rb:481
+#: library/packages/src/modules/SignatureCheckDialogs.rb:753
+#: library/packages/src/modules/SignatureCheckDialogs.rb:754
+#: library/packages/src/modules/SignatureCheckDialogs.rb:989
+#: library/packages/src/modules/SignatureCheckDialogs.rb:990
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -2239,389 +2552,389 @@
 #. are represented as its sub-interfaces.
 #. And also we frequently confuse "device" and "interface"
 #. :-(
-#: library/network/src/modules/NetworkInterfaces.rb:1122
+#: library/network/src/modules/NetworkInterfaces.rb:1166
 msgid "Additional Address"
 msgstr "Tilleggsadresse"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1127
+#: library/network/src/modules/NetworkInterfaces.rb:1171
 msgid "ARCnet"
 msgstr "ARCnet"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1127
+#: library/network/src/modules/NetworkInterfaces.rb:1171
 msgid "ARCnet Network Card"
 msgstr "ARCnet-nettverkskort"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1130
+#: library/network/src/modules/NetworkInterfaces.rb:1174
 msgid "ATM"
 msgstr "ATM"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1131
+#: library/network/src/modules/NetworkInterfaces.rb:1175
 msgid "Asynchronous Transfer Mode (ATM)"
 msgstr "ATM (Asynchronous Transfer Mode)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1135
+#: library/network/src/modules/NetworkInterfaces.rb:1179
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1136
+#: library/network/src/modules/NetworkInterfaces.rb:1180
 msgid "Bluetooth Connection"
 msgstr "Bluetooth-tilkobling"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1139
+#: library/network/src/modules/NetworkInterfaces.rb:1183
 msgid "Bond"
 msgstr "Bond"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1139
+#: library/network/src/modules/NetworkInterfaces.rb:1183
 msgid "Bond Network"
 msgstr "Bond-nettverk"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1142
+#: library/network/src/modules/NetworkInterfaces.rb:1186
 msgid "CLAW"
 msgstr "CLAW"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1143
+#: library/network/src/modules/NetworkInterfaces.rb:1187
 msgid "Common Link Access for Workstation (CLAW)"
 msgstr "CLAW (Common Link Access for Workstation)"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1146
+#: library/network/src/modules/NetworkInterfaces.rb:1190
 msgid "ISDN Card"
 msgstr "ISDN-kort"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1149
+#: library/network/src/modules/NetworkInterfaces.rb:1193
 #: library/system/src/include/hwinfo/classnames.rb:223
 msgid "CTC"
 msgstr "CTC"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1150
+#: library/network/src/modules/NetworkInterfaces.rb:1194
 msgid "Channel to Channel Interface (CTC)"
 msgstr "CTC-grensesnitt (Channel to Channel)"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1153
+#: library/network/src/modules/NetworkInterfaces.rb:1197
 msgid "DSL Connection"
 msgstr "DSL-forbindelse"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1155
+#: library/network/src/modules/NetworkInterfaces.rb:1199
 msgid "Dummy"
 msgstr "Prøve"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1155
+#: library/network/src/modules/NetworkInterfaces.rb:1199
 msgid "Dummy Network Device"
 msgstr "Dummy-nettverksenhet"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1158
+#: library/network/src/modules/NetworkInterfaces.rb:1202
 #: library/system/src/include/hwinfo/classnames.rb:227
 msgid "ESCON"
 msgstr "ESCON"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1159
+#: library/network/src/modules/NetworkInterfaces.rb:1203
 msgid "Enterprise System Connector (ESCON)"
 msgstr "ESCON (Enterprise System Connector)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1163
+#: library/network/src/modules/NetworkInterfaces.rb:1207
 #: library/system/src/include/hwinfo/classnames.rb:220
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1164
+#: library/network/src/modules/NetworkInterfaces.rb:1208
 msgid "Ethernet Network Card"
 msgstr "Ethernet-nettverkskort"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1167
+#: library/network/src/modules/NetworkInterfaces.rb:1211
 #: library/system/src/include/hwinfo/classnames.rb:222
 msgid "FDDI"
 msgstr "FDDI"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1167
+#: library/network/src/modules/NetworkInterfaces.rb:1211
 msgid "FDDI Network Card"
 msgstr "FDDI-nettverkskort"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1170
+#: library/network/src/modules/NetworkInterfaces.rb:1214
 msgid "FICON"
 msgstr "FICON"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1171
+#: library/network/src/modules/NetworkInterfaces.rb:1215
 msgid "Fiberchannel System Connector (FICON)"
 msgstr "Fiberkanaltilkobling (FICON)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1175
+#: library/network/src/modules/NetworkInterfaces.rb:1219
 msgid "HIPPI"
 msgstr "HIPPI"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1176
+#: library/network/src/modules/NetworkInterfaces.rb:1220
 msgid "HIgh Performance Parallel Interface (HIPPI)"
 msgstr "HIPPI (HIgh Performance Parallel Interface)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1180
+#: library/network/src/modules/NetworkInterfaces.rb:1224
 msgid "Hipersockets"
 msgstr "Hipersockets"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1181
+#: library/network/src/modules/NetworkInterfaces.rb:1225
 msgid "Hipersockets Interface (HSI)"
 msgstr "HSI (Hipersockets Interface)"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1184
-#: library/network/src/modules/NetworkInterfaces.rb:1190
-#: library/network/src/modules/NetworkInterfaces.rb:1205
+#: library/network/src/modules/NetworkInterfaces.rb:1228
+#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1249
 msgid "ISDN Connection"
 msgstr "ISDN-forbindelse"
 
 #. Device type label
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1186
-#: library/network/src/modules/NetworkInterfaces.rb:1188
+#: library/network/src/modules/NetworkInterfaces.rb:1230
+#: library/network/src/modules/NetworkInterfaces.rb:1232
 msgid "IrDA"
 msgstr "IrDA"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1186
+#: library/network/src/modules/NetworkInterfaces.rb:1230
 msgid "Infrared Network Device"
 msgstr "Infrarød nettverksenhet"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1188
+#: library/network/src/modules/NetworkInterfaces.rb:1232
 msgid "Infrared Device"
 msgstr "Infrarød enhet"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1193
+#: library/network/src/modules/NetworkInterfaces.rb:1237
 #: library/system/src/include/hwinfo/classnames.rb:224
 msgid "IUCV"
 msgstr "IUCV"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1194
+#: library/network/src/modules/NetworkInterfaces.rb:1238
 msgid "Inter User Communication Vehicle (IUCV)"
 msgstr "IUCV (Inter User Communication Vehicle)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1197
+#: library/network/src/modules/NetworkInterfaces.rb:1241
 msgid "OSA LCS"
 msgstr "OSA LCS"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1197
+#: library/network/src/modules/NetworkInterfaces.rb:1241
 msgid "OSA LCS Network Card"
 msgstr "OSA LCS-nettverkskort"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1199
+#: library/network/src/modules/NetworkInterfaces.rb:1243
 #: library/system/src/include/hwinfo/classnames.rb:219
 msgid "Loopback"
 msgstr "Loopback"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1199
+#: library/network/src/modules/NetworkInterfaces.rb:1243
 msgid "Loopback Device"
 msgstr "Loopback-enhet"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1203
+#: library/network/src/modules/NetworkInterfaces.rb:1247
 #: library/system/src/include/hwinfo/classnames.rb:228
 msgid "Myrinet"
 msgstr "Myrinet"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1203
+#: library/network/src/modules/NetworkInterfaces.rb:1247
 msgid "Myrinet Network Card"
 msgstr "Myrinet-nettverkskort"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1208
+#: library/network/src/modules/NetworkInterfaces.rb:1252
 msgid "Parallel Line"
 msgstr "Parallell linje"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1209
+#: library/network/src/modules/NetworkInterfaces.rb:1253
 msgid "Parallel Line Connection"
 msgstr "Parallell linjetilkobling"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1215
+#: library/network/src/modules/NetworkInterfaces.rb:1259
 #: library/system/src/include/hwinfo/classnames.rb:226
 msgid "QETH"
 msgstr "QETH"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1216
+#: library/network/src/modules/NetworkInterfaces.rb:1260
 msgid "OSA-Express or QDIO Device (QETH)"
 msgstr "OSA-Express- eller QDIO-enhet (QETH)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1220
+#: library/network/src/modules/NetworkInterfaces.rb:1264
 msgid "IPv6-in-IPv4"
 msgstr "IPv6-in-IPv4"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1221
+#: library/network/src/modules/NetworkInterfaces.rb:1265
 msgid "IPv6-in-IPv4 Encapsulation Device"
 msgstr "IPv6-in-IPv4-innkapslingsenhet"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1225
+#: library/network/src/modules/NetworkInterfaces.rb:1269
 msgid "Serial Line"
 msgstr "Seriell linje"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1226
+#: library/network/src/modules/NetworkInterfaces.rb:1270
 msgid "Serial Line Connection"
 msgstr "Seriell linjetilkopling"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1230
+#: library/network/src/modules/NetworkInterfaces.rb:1274
 msgid "Token Ring"
 msgstr "Tokenring"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1231
+#: library/network/src/modules/NetworkInterfaces.rb:1275
 msgid "Token Ring Network Card"
 msgstr "Tokenring-nettverkskort"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1278
 msgid "USB"
 msgstr "USB"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1234
+#: library/network/src/modules/NetworkInterfaces.rb:1278
 msgid "USB Network Device"
 msgstr "USB-nettverksenhet"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1236
+#: library/network/src/modules/NetworkInterfaces.rb:1280
 msgid "VMWare"
 msgstr "VMWare"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1236
+#: library/network/src/modules/NetworkInterfaces.rb:1280
 msgid "VMWare Network Device"
 msgstr "VMWare-nettsverksenhet"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1239
+#: library/network/src/modules/NetworkInterfaces.rb:1283
 msgid "Wireless"
 msgstr "Trådløst"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1240
+#: library/network/src/modules/NetworkInterfaces.rb:1284
 msgid "Wireless Network Card"
 msgstr "Trådløst nettverkskort"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1243
+#: library/network/src/modules/NetworkInterfaces.rb:1287
 msgid "XPNET"
 msgstr "XPNET"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1243
+#: library/network/src/modules/NetworkInterfaces.rb:1287
 msgid "XP Network"
 msgstr "XP-nettverk"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1289
 msgid "VLAN"
 msgstr "VLAN"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1245
+#: library/network/src/modules/NetworkInterfaces.rb:1289
 msgid "Virtual LAN"
 msgstr "Virtuelt LAN"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1247
+#: library/network/src/modules/NetworkInterfaces.rb:1291
 #: library/system/src/include/hwinfo/classnames.rb:89
 #: library/system/src/include/hwinfo/classnames.rb:101
 msgid "Bridge"
 msgstr "Bro"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1247
+#: library/network/src/modules/NetworkInterfaces.rb:1291
 msgid "Network Bridge"
 msgstr "Nettverksbro"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1249
+#: library/network/src/modules/NetworkInterfaces.rb:1293
 msgid "TUN"
 msgstr "TUN"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1249
+#: library/network/src/modules/NetworkInterfaces.rb:1293
 msgid "Network TUNnel"
 msgstr "Nettverkstunnel"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1251
+#: library/network/src/modules/NetworkInterfaces.rb:1295
 msgid "TAP"
 msgstr "TAP"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1251
+#: library/network/src/modules/NetworkInterfaces.rb:1295
 msgid "Network TAP"
 msgstr "Nettverks-TAP"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1253
+#: library/network/src/modules/NetworkInterfaces.rb:1297
 #: library/system/src/include/hwinfo/classnames.rb:152
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1253
+#: library/network/src/modules/NetworkInterfaces.rb:1297
 msgid "InfiniBand Device"
 msgstr "InfiniBand-enhet"
 
 #. TRANSLATORS: Informs that device name is not known
-#: library/network/src/modules/NetworkPopup.rb:70
+#: library/network/src/modules/NetworkPopup.rb:71
 msgid "Unknown device"
 msgstr "Ukjent enhet"
 
 #. TRANSLATORS: Informs that the IP address is assigned via DHCP
-#: library/network/src/modules/NetworkPopup.rb:77
+#: library/network/src/modules/NetworkPopup.rb:80
 msgid "DHCP address"
 msgstr "DHCP-adresse"
 
 #. TRANSLATORS: table item, informing that device has no IP address
-#: library/network/src/modules/NetworkPopup.rb:83
+#: library/network/src/modules/NetworkPopup.rb:87
 msgid "No IP address assigned"
 msgstr "Ingen IP-adresse tilordnet"
 
 #. translators: table header - details about the network device
-#: library/network/src/modules/NetworkPopup.rb:105
+#: library/network/src/modules/NetworkPopup.rb:109
 msgid "Device Type"
 msgstr "Enhetstype"
 
-#: library/network/src/modules/NetworkPopup.rb:106
+#: library/network/src/modules/NetworkPopup.rb:110
 msgid "Device Name"
 msgstr "Enhetsnavn"
 
-#: library/network/src/modules/NetworkPopup.rb:107
+#: library/network/src/modules/NetworkPopup.rb:111
 msgid "IP Address"
 msgstr "IP-adresse"
 
-#: library/network/src/modules/NetworkPopup.rb:108
+#: library/network/src/modules/NetworkPopup.rb:112
 msgid "Device ID"
 msgstr "Enhets-ID"
 
-#: library/network/src/modules/NetworkPopup.rb:109
+#: library/network/src/modules/NetworkPopup.rb:113
 msgid "Connected"
 msgstr "Tilkoblet"
 
 #. label message
 #. label message
-#: library/network/src/modules/NetworkPopup.rb:191
-#: library/network/src/modules/NetworkPopup.rb:222
+#: library/network/src/modules/NetworkPopup.rb:195
+#: library/network/src/modules/NetworkPopup.rb:226
 msgid "Scanning for hosts on this LAN..."
 msgstr "Søker etter vertsmaskiner i dette lokalnettverket..."
 
 #. selection box label
-#: library/network/src/modules/NetworkPopup.rb:210
+#: library/network/src/modules/NetworkPopup.rb:214
 msgid "&NFS Servers"
 msgstr "&NFS-servere"
 
 #. selection box label
-#: library/network/src/modules/NetworkPopup.rb:234
+#: library/network/src/modules/NetworkPopup.rb:238
 msgid "Re&mote Hosts"
 msgstr "Eks&terne vertsmaskiner"
 
 #. selection box label
-#: library/network/src/modules/NetworkPopup.rb:254
+#: library/network/src/modules/NetworkPopup.rb:258
 msgid "&Exported Directories"
 msgstr "&Eksporterte kataloger"
 
 #. TRANSLATORS: pop-up question when reading the service configuration
-#: library/network/src/modules/NetworkService.rb:280
+#: 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"
@@ -2636,7 +2949,7 @@
 #. If there is network running, return true.
 #. Otherwise show error popup depending on Stage and return false
 #. @return true if network running
-#: library/network/src/modules/NetworkService.rb:348
+#: library/network/src/modules/NetworkService.rb:346
 #, fuzzy
 #| msgid "Restart installation and configure network in Linuxrc"
 msgid ""
@@ -2645,7 +2958,7 @@
 "or continue without network."
 msgstr "Start intstallasjonen på nytt og sett opp nettverket i Linuxrc"
 
-#: library/network/src/modules/NetworkService.rb:354
+#: library/network/src/modules/NetworkService.rb:352
 #, fuzzy
 #| msgid ""
 #| "Configure network with YaST or Network Manager plug-in\n"
@@ -2670,142 +2983,6 @@
 "Et portnummer kan være et tall mellom 0 og 65535.\n"
 "Mellomrom er ikke tillatt.\n"
 
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:115
-msgid "External Zone"
-msgstr "Ekstern sone"
-
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:119
-msgid "Internal Zone"
-msgstr "Intern sone"
-
-#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:123
-msgid "Demilitarized Zone"
-msgstr "Demilitarisert sone"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:246
-msgid "TCP"
-msgstr "TCP"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:248
-msgid "UDP"
-msgstr "UDP"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:250
-msgid "RPC"
-msgstr "RPC"
-
-#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:252
-msgid "IP"
-msgstr "IP"
-
-#. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:1158
-msgid "Unknown Zone"
-msgstr "Ukjent sone"
-
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/modules/SuSEFirewall.rb:1506
-msgid ""
-"Interface '%1' is included in multiple firewall zones.\n"
-"Continuing with configuration can produce errors.\n"
-"\n"
-"It is recommended to leave the configuration and repair it manually in\n"
-"the file '/etc/sysconfig/SuSEFirewall'."
-msgstr ""
-"Grensesnittet %1 er med i flere brannmursoner.\n"
-"Denne konfigurasjonen kan føre til feil.\n"
-"\n"
-"Du bør avslutte konfigurasjonen og reparere den manuelt i\n"
-"filen '/etc/sysconfig/SuSEfirewall'."
-
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/modules/SuSEFirewall.rb:1971
-#: library/network/src/modules/SuSEFirewall.rb:2047
-msgid ""
-"Interface '%1' is not assigned to any firewall zone.\n"
-"Run YaST2 Firewall and assign it.\n"
-msgstr ""
-"Grensesnittet '%1' er ikke tilordnet noen brannmursone.\n"
-"Det kan tilordnes manuelt under Brannmur i YaST2.\n"
-
-#. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2478
-msgid "Initializing Firewall Configuration"
-msgstr "Initialiserer brannmurkonfigurasjon"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2486
-msgid "Check for network devices"
-msgstr "Søk etter nettverksenheter"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2488
-msgid "Read current configuration"
-msgstr "Les gjeldende konfigurasjon"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2490
-msgid "Check possibly conflicting services"
-msgstr "Kontroller om det finnes tjenester som skaper konflikter"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2494
-msgid "Checking for network devices..."
-msgstr "Søker etter nettverksenheter..."
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2496
-msgid "Reading current configuration..."
-msgstr "Leser gjeldende konfigurasjon..."
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2498
-msgid "Checking possibly conflicting services..."
-msgstr "Kontrollerer om det finnes tjenester som skaper konflikter..."
-
-#. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2648
-msgid "Writing Firewall Configuration"
-msgstr "Lagrer brannmurkonfigurasjon"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2656
-msgid "Write firewall settings"
-msgstr "Lagre brannmurinnstillinger"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2658
-msgid "Adjust firewall service"
-msgstr "Tilpass brannmurtjenesten"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2662
-msgid "Writing firewall settings..."
-msgstr "Lagrer brannmurinnstillinger..."
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2664
-msgid "Adjusting firewall service..."
-msgstr "Tilpasser brannmurtjenesten..."
-
-#. TRANSLATORS: a popup error message
-#: library/network/src/modules/SuSEFirewall.rb:2683
-msgid "Writing settings failed"
-msgstr "Innstillingene kunne ikke lagres"
-
-#. table item, %1 stands for the buggy protocol name
-#: library/network/src/modules/SuSEFirewall.rb:3476
-msgid "Unknown protocol (%1)"
-msgstr "Ukjent protokoll (%1)"
-
 #. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...)
 #: library/network/src/modules/SuSEFirewallProposal.rb:167
 msgid "New network device '%1' found; added as an internal firewall interface"
@@ -2892,63 +3069,14 @@
 msgid "You are installing a system using iSCSI Target, but you have not opened the needed ports on the firewall."
 msgstr "Du installerer et system ved å bruke ISCSI-mål, men du har ikke åpnet nødvendige porter i brannmuren."
 
-#. Returns service definition.
-#. See @services for the format.
-#. If `silent` is not defined or set to `true`, function throws an exception
-#. SuSEFirewalServiceNotFound if service is not found on disk.
-#.
-#. @param [String] service name
-#. @param [String] (optional) whether to silently return nil
-#. when service is not found (default false)
-#. Immediately writes the configuration of service defined by package to the
-#. service definition file. Service must be defined by package, this function
-#. doesn't work for hard-coded services (SuSEFirewallServices).
-#. Function throws an exception SuSEFirewalServiceNotFound
-#. if service is not known (undefined) or it is not a service
-#. defined by package.
-#.
-#. @param [String] service ID (e.g., "service:ssh")
-#. @param map  of full service definition
-#. @return [Boolean] if successful (nil in case of developer's mistake)
-#.
-#. @see #IsKnownService()
-#. @see #ServiceDefinedByPackage()
-#.
-#. @example
-#. SetNeededPortsAndProtocols (
-#. "service:something",
-#. $[
-#. "tcp_ports"       : [ "22", "ftp-data", "400:420" ],
-#. "udp_ports"       : [ ],
-#. "rpc_ports"       : [ "portmap", "ypbind" ],
-#. "ip_protocols"    : [ "esp" ],
-#. "broadcast_ports" : [ ],
-#. ]
-#. );
-#: library/network/src/modules/SuSEFirewallServices.rb:354
-#: library/network/src/modules/SuSEFirewallServices.rb:637
-msgid "Service with name '%{service_name}' does not exist"
-msgstr ""
-
-#. Fallback for presented service
-#: library/network/src/modules/SuSEFirewallServices.rb:430
-#, fuzzy
-#| msgid "Service: %1"
-msgid "Service: %{filename}"
-msgstr "Tjeneste: %1"
-
-#. TRANSLATORS: Name of unknown service. %1 is a requested service id like nis-server
-#: library/network/src/modules/SuSEFirewallServices.rb:503
-msgid "Unknown service '%1'"
-msgstr "Ukjent enhet '%1'"
-
 #. the message is followed by list of required packages
 #. Popup Text
-#: library/packages/src/include/packages/common.rb:107
+#: library/packages/src/include/packages/common.rb:106
 #: library/packages/src/include/packages/common.rb:135
 msgid "These packages need to be installed:"
 msgstr "Følgende pakker må installeres:"
 
+#. the message is followed by list of required packages
 #. Popup Text
 #: library/packages/src/include/packages/common.rb:109
 #: library/packages/src/include/packages/common.rb:137
@@ -2962,35 +3090,77 @@
 msgid "&Uninstall"
 msgstr "&Avinstaller"
 
+#. TRANSLATORS: progress bar label
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:78
+#, fuzzy
+#| msgid "Checking possibly conflicting services..."
+msgid "Checking file conflicts..."
+msgstr "Kontrollerer om det finnes tjenester som skaper konflikter..."
+
+#. TRANSLATORS: help text for the file conflict detection progress
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:89
+msgid "<p>Detecting the file conflicts is in progress.</p>"
+msgstr ""
+
+#. TRANSLATORS: An error message, %s is the actual list of detected conflicts
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:134
+msgid ""
+"File conflicts detected, these conflicting files will be overwritten:\n"
+"\n"
+"%s"
+msgstr ""
+
+#. TRANSLATORS: A popup label, use max. 70 chars per line, use more lines if needed
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:171
+msgid ""
+"File conflicts happen when two packages attempt to install\n"
+"files with the same name but different contents. If you continue\n"
+"the conflicting files will be replaced, losing the previous content."
+msgstr ""
+
+#. TRANSLATORS: Popup heading
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:176
+msgid "A File Conflict Detected"
+msgid_plural "File Conflicts Detected"
+msgstr[0] ""
+msgstr[1] ""
+
+#. Convert one message to richtext
+#.
+#. @return [String] Message converted to richtext
+#: library/packages/src/lib/packages/update_messages_view.rb:35
+msgid "This message will be available at %s"
+msgstr ""
+
 #. --------------------------------------------------------------------------
 #. defaults
 #. at start of file providal
-#: library/packages/src/modules/PackageCallbacks.rb:149
-#: library/packages/src/modules/PackageCallbacks.rb:157
+#: library/packages/src/modules/PackageCallbacks.rb:150
+#: library/packages/src/modules/PackageCallbacks.rb:158
 msgid "Downloading package %1 (%2)..."
 msgstr "Laster ned pakken %1 (%2)..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:161
+#: library/packages/src/modules/PackageCallbacks.rb:162
 msgid "Downloading Package"
 msgstr "Laster ned pakken"
 
 #. error message, %1 is a package name
-#: library/packages/src/modules/PackageCallbacks.rb:220
+#: library/packages/src/modules/PackageCallbacks.rb:221
 msgid "Package %1 is broken, integrity check has failed."
 msgstr "Feil ved pakke %1, problemer med integriteten."
 
 #. 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:232
-#: library/packages/src/modules/PackageCallbacks.rb:447
+#: library/packages/src/modules/PackageCallbacks.rb:233
+#: library/packages/src/modules/PackageCallbacks.rb:448
 msgid "Retry installation of the package?"
 msgstr "Vil du forsøke å installere pakken på nytt?"
 
 #. 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:240
-#: library/packages/src/modules/PackageCallbacks.rb:455
+#: library/packages/src/modules/PackageCallbacks.rb:241
+#: library/packages/src/modules/PackageCallbacks.rb:456
 msgid "Abort the installation?"
 msgstr "Vil du avbryte installasjonen?"
 
@@ -2999,15 +3169,15 @@
 #. 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:268
-#: library/packages/src/modules/PackageCallbacks.rb:302
-#: library/packages/src/modules/PackageCallbacks.rb:2143
+#: library/packages/src/modules/PackageCallbacks.rb:269
+#: library/packages/src/modules/PackageCallbacks.rb:303
+#: library/packages/src/modules/PackageCallbacks.rb:2136
 msgid "Error: %1:"
 msgstr "Feil: %1:"
 
 #. TODO: add "Don't show again" checkbox
 #. a warning popup displayed after pressing [Ignore] after a download error
-#: library/packages/src/modules/PackageCallbacks.rb:326
+#: library/packages/src/modules/PackageCallbacks.rb:327
 msgid ""
 "Ignoring a download failure may result in a broken system.\n"
 "Verify the system later by running the Software Management module.\n"
@@ -3016,35 +3186,35 @@
 "Kontroller systemet senere med modulen Legg til og fjern programmer.\n"
 
 #. At start of package install.
-#: library/packages/src/modules/PackageCallbacks.rb:364
+#: library/packages/src/modules/PackageCallbacks.rb:365
 msgid "Uninstalling package %1 (%2)..."
 msgstr "Avinstallerer pakken %1 (%2)..."
 
-#: library/packages/src/modules/PackageCallbacks.rb:366
+#: library/packages/src/modules/PackageCallbacks.rb:367
 msgid "Installing package %1 (%2)..."
 msgstr "Installerer pakken %1 (%2)..."
 
-#: library/packages/src/modules/PackageCallbacks.rb:374
+#: library/packages/src/modules/PackageCallbacks.rb:375
 msgid "Uninstalling Package"
 msgstr "Avinstallerer pakke"
 
-#: library/packages/src/modules/PackageCallbacks.rb:374
+#: library/packages/src/modules/PackageCallbacks.rb:375
 msgid "Installing Package"
 msgstr "Installerer pakke"
 
 #. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:430
+#: library/packages/src/modules/PackageCallbacks.rb:431
 msgid "Removal of package %1 failed."
 msgstr "Pakken %1 kunne ikke fjernes."
 
 #. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:433
+#: library/packages/src/modules/PackageCallbacks.rb:434
 msgid "Installation of package %1 failed."
 msgstr "Installasjon av pakken %1 mislyktes."
 
 #. 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:506
+#: library/packages/src/modules/PackageCallbacks.rb:507
 msgid ""
 "Ignoring a package failure may result in a broken system.\n"
 "The system should be later verified by running the Software Management module."
@@ -3053,7 +3223,7 @@
 "Systemet bør kontrolleres senere ved å kjøre modulen Legg til og fjern programmer."
 
 #. error report
-#: library/packages/src/modules/PackageCallbacks.rb:575
+#: library/packages/src/modules/PackageCallbacks.rb:576
 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"
@@ -3068,27 +3238,27 @@
 #. 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:590
+#: library/packages/src/modules/PackageCallbacks.rb:591
 msgid "Side A"
 msgstr "Side A"
 
 #. media is double sided, we want the user to insert the 'Side B' of the media
-#: library/packages/src/modules/PackageCallbacks.rb:593
+#: library/packages/src/modules/PackageCallbacks.rb:594
 msgid "Side B"
 msgstr "Side B"
 
 #. label for a repository - %1 product name (e.g. openSUSE 10.2), %2 medium number (e.g. 2)
-#: library/packages/src/modules/PackageCallbacks.rb:608
+#: library/packages/src/modules/PackageCallbacks.rb:609
 msgid "%1 (Disc %2)"
 msgstr "%1 (Disk %2)"
 
 #. label for a repository - %1 product name (e.g. openSUSE 10.2), %2 medium number (e.g. 2)
-#: library/packages/src/modules/PackageCallbacks.rb:611
+#: library/packages/src/modules/PackageCallbacks.rb:612
 msgid "%1 (Medium %2)"
 msgstr "%1 (Medium %2)"
 
 #. prompt to insert product (%1 == "SuSE Linux version 9.2 CD 2")
-#: library/packages/src/modules/PackageCallbacks.rb:617
+#: library/packages/src/modules/PackageCallbacks.rb:618
 msgid ""
 "Insert\n"
 "'%1'"
@@ -3097,7 +3267,7 @@
 "'%1'"
 
 #. report error while accessing local directory with product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:622
+#: library/packages/src/modules/PackageCallbacks.rb:623
 msgid ""
 "Cannot access installation media\n"
 "%1\n"
@@ -3110,7 +3280,7 @@
 "Kontroller at katalogen er tilgjengelig."
 
 #. report error while accessing network media of product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:634
+#: library/packages/src/modules/PackageCallbacks.rb:635
 msgid ""
 "Cannot access installation media \n"
 "%1\n"
@@ -3124,83 +3294,83 @@
 
 #. wrong media id, offer "Ignore"
 #. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:659
-#: library/packages/src/modules/PackageCallbacks.rb:1838
+#: library/packages/src/modules/PackageCallbacks.rb:660
+#: library/packages/src/modules/PackageCallbacks.rb:1835
 msgid "Skip Autorefresh"
 msgstr "Hopp over auto-oppdatering"
 
 #. 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:678
-#: library/packages/src/modules/PackageCallbacks.rb:681
+#: library/packages/src/modules/PackageCallbacks.rb:679
+#: library/packages/src/modules/PackageCallbacks.rb:682
 msgid "&Eject"
 msgstr "&Løs ut"
 
-#: library/packages/src/modules/PackageCallbacks.rb:688
+#: library/packages/src/modules/PackageCallbacks.rb:689
 msgid "A&utomatically Eject CD or DVD Medium"
 msgstr "Løs a&utomatisk ut CD- eller DVD-medium"
 
 #. command line mode - ask user whether installation of the failed package should be retried
-#: library/packages/src/modules/PackageCallbacks.rb:755
+#: library/packages/src/modules/PackageCallbacks.rb:756
 msgid "Retry the installation?"
 msgstr "Vil du forsøke å installere på nytt?"
 
 #. command line mode - ask user whether the installation should be aborted
-#: library/packages/src/modules/PackageCallbacks.rb:763
+#: library/packages/src/modules/PackageCallbacks.rb:764
 msgid "Skip the medium?"
 msgstr "Vil du hoppe over mediet?"
 
 #. otherwise ignore the medium
-#: library/packages/src/modules/PackageCallbacks.rb:770
+#: library/packages/src/modules/PackageCallbacks.rb:771
 msgid "Ignoring the bad medium..."
 msgstr "Ignorerer ugyldig medium..."
 
 #. TextEntry label
 #. TextEntry label
-#: library/packages/src/modules/PackageCallbacks.rb:791
-#: library/packages/src/modules/PackageCallbacks.rb:847
+#: library/packages/src/modules/PackageCallbacks.rb:792
+#: library/packages/src/modules/PackageCallbacks.rb:848
 msgid "&URL"
 msgstr "&Nettadresse"
 
 #. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1039
+#: library/packages/src/modules/PackageCallbacks.rb:1040
 msgid "Creating Repository %1"
 msgstr "Oppretter pakkebrønnen %1"
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1072
+#: library/packages/src/modules/PackageCallbacks.rb:1073
 msgid "An error occurred while creating the repository."
 msgstr "Det oppstod en feil under oppretting av pakkebrønnen."
 
 #. 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:1076
-#: library/packages/src/modules/PackageCallbacks.rb:1203
-#: library/packages/src/modules/PackageCallbacks.rb:1313
+#: library/packages/src/modules/PackageCallbacks.rb:1077
+#: library/packages/src/modules/PackageCallbacks.rb:1204
+#: library/packages/src/modules/PackageCallbacks.rb:1314
 msgid "Unable to retrieve the remote repository description."
 msgstr "Kan ikke hente beskrivelse for ekstern pakkebrønn."
 
 #. 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:1079
-#: library/packages/src/modules/PackageCallbacks.rb:1206
-#: library/packages/src/modules/PackageCallbacks.rb:1316
+#: library/packages/src/modules/PackageCallbacks.rb:1080
+#: library/packages/src/modules/PackageCallbacks.rb:1207
+#: library/packages/src/modules/PackageCallbacks.rb:1317
 msgid "An error occurred while retrieving the new metadata."
 msgstr "Det oppstod en feil under henting av ny metainformasjon."
 
 #. 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:1082
-#: library/packages/src/modules/PackageCallbacks.rb:1209
-#: library/packages/src/modules/PackageCallbacks.rb:1319
+#: library/packages/src/modules/PackageCallbacks.rb:1083
+#: library/packages/src/modules/PackageCallbacks.rb:1210
+#: library/packages/src/modules/PackageCallbacks.rb:1320
 msgid "The repository is not valid."
 msgstr "Pakkebrønnen er ikke gyldig."
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1085
+#: library/packages/src/modules/PackageCallbacks.rb:1086
 msgid "The repository metadata is invalid."
 msgstr "Pakkebrønnen har ugyldige metadata."
 
@@ -3208,92 +3378,92 @@
 #. 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:1098
-#: library/packages/src/modules/PackageCallbacks.rb:1228
-#: library/packages/src/modules/PackageCallbacks.rb:1332
-#: library/packages/src/modules/PackageCallbacks.rb:2097
+#: library/packages/src/modules/PackageCallbacks.rb:1099
+#: library/packages/src/modules/PackageCallbacks.rb:1229
+#: library/packages/src/modules/PackageCallbacks.rb:1333
+#: library/packages/src/modules/PackageCallbacks.rb:2090
 msgid "Retry?"
 msgstr "Vil du prøve på nytt?"
 
 #. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1144
-#: library/packages/src/modules/PackageCallbacks.rb:1152
+#: library/packages/src/modules/PackageCallbacks.rb:1145
+#: library/packages/src/modules/PackageCallbacks.rb:1153
 msgid "Probing Repository %1"
 msgstr "Undersøker pakkebrønnen %1"
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1199
+#: library/packages/src/modules/PackageCallbacks.rb:1200
 msgid "Error occurred while probing the repository."
 msgstr "Det oppstod en feil under gransking av pakkebrønn."
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1212
+#: library/packages/src/modules/PackageCallbacks.rb:1213
 msgid "Repository probing details."
 msgstr "Granskningsdetaljer."
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1215
+#: library/packages/src/modules/PackageCallbacks.rb:1216
 msgid "Repository metadata is invalid."
 msgstr "Pakkebrønn har ugyldige metadata."
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1309
+#: library/packages/src/modules/PackageCallbacks.rb:1310
 msgid "Repository %1"
 msgstr "Pakkebrønn %1"
 
 #. at start of delta providal
-#: library/packages/src/modules/PackageCallbacks.rb:1397
+#: library/packages/src/modules/PackageCallbacks.rb:1398
 msgid "Downloading delta RPM package %1 (%2)..."
 msgstr "Laster ned delta-RPM-pakken %1 (%2)..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1405
+#: library/packages/src/modules/PackageCallbacks.rb:1406
 msgid "Downloading Delta RPM package"
 msgstr "Laster ned delta-RPM-pakke"
 
 #. at start of delta application
-#: library/packages/src/modules/PackageCallbacks.rb:1418
+#: library/packages/src/modules/PackageCallbacks.rb:1419
 msgid "Applying delta RPM package %1..."
 msgstr "Bruker delta-RPM-pakken %1..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1425
+#: library/packages/src/modules/PackageCallbacks.rb:1426
 msgid "Applying delta RPM package"
 msgstr "Bruker delta-RPM-pakke"
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1427
-#: library/packages/src/modules/PackageCallbacks.rb:3075
+#: library/packages/src/modules/PackageCallbacks.rb:1428
+#: library/packages/src/modules/PackageCallbacks.rb:3070
 msgid "Package: "
 msgstr "Pakke: "
 
 #. close popup
-#: library/packages/src/modules/PackageCallbacks.rb:1493
+#: library/packages/src/modules/PackageCallbacks.rb:1494
 msgid "Starting script %1 (patch %2)..."
 msgstr "Starter skript %1 (pakkeoppdatering %2)..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1502
+#: library/packages/src/modules/PackageCallbacks.rb:1503
 msgid "Running Script"
 msgstr "Kjører skript"
 
 #. label, patch name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1507
+#: library/packages/src/modules/PackageCallbacks.rb:1508
 msgid "Patch: "
 msgstr "Pakkeoppdatering: "
 
 #. label, script name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1516
+#: library/packages/src/modules/PackageCallbacks.rb:1517
 msgid "Script: "
 msgstr "Skript: "
 
 #. label
-#: library/packages/src/modules/PackageCallbacks.rb:1522
+#: library/packages/src/modules/PackageCallbacks.rb:1523
 msgid "Output of the Script"
 msgstr "Resultat av skriptet"
 
 #. label, %1 is patch name with version and architecture
-#: library/packages/src/modules/PackageCallbacks.rb:1610
+#: library/packages/src/modules/PackageCallbacks.rb:1611
 msgid ""
 "Patch: %1\n"
 "\n"
@@ -3302,7 +3472,7 @@
 "\n"
 
 #. a popup question with "Continue", "Skip" and "Abort" buttons
-#: library/packages/src/modules/PackageCallbacks.rb:1627
+#: library/packages/src/modules/PackageCallbacks.rb:1628
 msgid ""
 "The repositories are being refreshed.\n"
 "Continue with refreshing?\n"
@@ -3317,36 +3487,36 @@
 "mangle eller være foreldet."
 
 #. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:1642
+#: library/packages/src/modules/PackageCallbacks.rb:1643
 msgid "&Skip Refresh"
 msgstr "&Hopp over oppdatering"
 
 #. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1676
+#: library/packages/src/modules/PackageCallbacks.rb:1677
 msgid "Downloading"
 msgstr "Laster ned"
 
 #. message in a progress popup
 #. progress bar label, %1 is URL with optional download rate
-#: library/packages/src/modules/PackageCallbacks.rb:1723
-#: library/packages/src/modules/PackageCallbacks.rb:1771
+#: library/packages/src/modules/PackageCallbacks.rb:1724
+#: library/packages/src/modules/PackageCallbacks.rb:1770
 msgid "Downloading: %1"
 msgstr "Laster ned: %1"
 
 #. heading of popup
 #. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1875
-#: library/packages/src/modules/PackageCallbacks.rb:1941
+#: library/packages/src/modules/PackageCallbacks.rb:1872
+#: library/packages/src/modules/PackageCallbacks.rb:1938
 msgid "Checking Package Database"
 msgstr "Søker i pakkedatabase"
 
 #. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1878
+#: library/packages/src/modules/PackageCallbacks.rb:1875
 msgid "Rebuilding package database. This process can take some time."
 msgstr "Gjenoppretter pakkedatabasen. Denne prosessen kan ta en stund."
 
 #. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:1911
+#: library/packages/src/modules/PackageCallbacks.rb:1908
 msgid ""
 "Rebuilding of package database failed:\n"
 "%1"
@@ -3355,16 +3525,16 @@
 "%1"
 
 #. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1944
+#: library/packages/src/modules/PackageCallbacks.rb:1941
 msgid "Converting package database. This process can take some time."
 msgstr "Konverterer pakkedatabase. Denne prosessen ta en stund."
 
-#: library/packages/src/modules/PackageCallbacks.rb:1957
+#: library/packages/src/modules/PackageCallbacks.rb:1954
 msgid "Status"
 msgstr "Status"
 
 #. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:1981
+#: library/packages/src/modules/PackageCallbacks.rb:1978
 msgid ""
 "Conversion of package database failed:\n"
 "%1"
@@ -3373,12 +3543,12 @@
 "%1"
 
 #. progress message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2017
+#: library/packages/src/modules/PackageCallbacks.rb:2014
 msgid "Reading RPM database..."
 msgstr "Leser RPM-database..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:2027
+#: library/packages/src/modules/PackageCallbacks.rb:2023
 msgid "Reading Installed Packages"
 msgstr "Finner installerte pakker"
 
@@ -3389,27 +3559,27 @@
 #. `Label(""),
 #. `PushButton(`id(`abort), Label::AbortButton())
 #. )
-#: library/packages/src/modules/PackageCallbacks.rb:2033
-#: library/packages/src/modules/PackageCallbacks.rb:2049
+#: library/packages/src/modules/PackageCallbacks.rb:2029
+#: library/packages/src/modules/PackageCallbacks.rb:2045
 msgid "Scanning RPM database..."
 msgstr "Skanner RPM-database..."
 
 #. error message, could not read RPM database
-#: library/packages/src/modules/PackageCallbacks.rb:2086
+#: library/packages/src/modules/PackageCallbacks.rb:2079
 msgid "Initialization of the target failed."
 msgstr "Feil ved initialisering mål."
 
 #. status message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2178
+#: library/packages/src/modules/PackageCallbacks.rb:2171
 msgid "RPM database read"
 msgstr "RPM-database lest"
 
 #. heading in a popup window
-#: library/packages/src/modules/PackageCallbacks.rb:2212
+#: library/packages/src/modules/PackageCallbacks.rb:2203
 msgid "User Authentication"
 msgstr "Brukerautentisering"
 
-#: library/packages/src/modules/PackageCallbacks.rb:2218
+#: library/packages/src/modules/PackageCallbacks.rb:2209
 msgid ""
 "URL: %1\n"
 "\n"
@@ -3420,20 +3590,20 @@
 "%2"
 
 #. textentry label
-#: library/packages/src/modules/PackageCallbacks.rb:2227
+#: library/packages/src/modules/PackageCallbacks.rb:2218
 msgid "&User Name"
 msgstr "&Brukernavn"
 
 #. check box
-#: library/packages/src/modules/PackageCallbacks.rb:3010
+#: library/packages/src/modules/PackageCallbacks.rb:3005
 msgid "Show &details"
 msgstr "Vis &detaljer"
 
-#: library/packages/src/modules/PackageCallbacks.rb:3076
+#: library/packages/src/modules/PackageCallbacks.rb:3071
 msgid "Size: "
 msgstr "Størrelse: "
 
-#: library/packages/src/modules/PackageCallbacks.rb:3099
+#: library/packages/src/modules/PackageCallbacks.rb:3094
 msgid "Remaining time to automatic retry: %1"
 msgstr "Nytt forsøk blir automatisk utført om: %1"
 
@@ -3511,12 +3681,12 @@
 "løses manuelt i pakkebehandleren."
 
 #. error report
-#: library/packages/src/modules/PackageSystem.rb:415
+#: library/packages/src/modules/PackageSystem.rb:418
 msgid "Installing required packages failed."
 msgstr "Installasjon av nødvendige pakker mislyktes."
 
 #. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:419
+#: library/packages/src/modules/PackageSystem.rb:422
 msgid ""
 "Installing required packages failed. If you continue\n"
 "without installing required packages,\n"
@@ -3527,12 +3697,12 @@
 "kan det hende at YaST ikke fungerer riktig.\n"
 
 #. error report
-#: library/packages/src/modules/PackageSystem.rb:430
+#: library/packages/src/modules/PackageSystem.rb:432
 msgid "Cannot continue without installing required packages."
 msgstr "Kan ikke fortsette konfigurasjonen uten at alle nødvendige pakker er installert."
 
 #. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:435
+#: library/packages/src/modules/PackageSystem.rb:437
 msgid ""
 "If you continue without installing required \n"
 "packages, YaST may not work properly.\n"
@@ -3541,22 +3711,22 @@
 "installert, kan det hende at YaST ikke fungerer riktig.\n"
 
 #. dialog heading, %1 is package name
-#: library/packages/src/modules/PackagesUI.rb:152
+#: library/packages/src/modules/PackagesUI.rb:156
 msgid "Confirm Package License: %1"
 msgstr "Bekreft pakkelisens: %1"
 
 #. push button
-#: library/packages/src/modules/PackagesUI.rb:159
+#: library/packages/src/modules/PackagesUI.rb:163
 msgid "I &Agree"
 msgstr "&Godtar"
 
 #. push button
-#: library/packages/src/modules/PackagesUI.rb:161
+#: library/packages/src/modules/PackagesUI.rb:165
 msgid "I &Disagree"
 msgstr "Godtar &ikke"
 
 #. help text
-#: library/packages/src/modules/PackagesUI.rb:173
+#: library/packages/src/modules/PackagesUI.rb:177
 msgid ""
 "<p><b><big>License Confirmation</big></b><br>\n"
 "The package in the headline of the dialog requires an explicit confirmation\n"
@@ -3575,7 +3745,7 @@
 "For å avvise pakkelisensen, klikk <b>Godtar ikke</b></p>."
 
 #. Help text for software patterns / selections dialog
-#: library/packages/src/modules/PackagesUI.rb:326
+#: library/packages/src/modules/PackagesUI.rb:347
 msgid ""
 "<p>\n"
 "\t\t This dialog allows you to define this system's tasks and what software to install.\n"
@@ -3589,7 +3759,7 @@
 "\t\t fordelt på kategorier.  Velg et element i listen for å vise en beskrivelse.\n"
 "\t\t </p>"
 
-#: library/packages/src/modules/PackagesUI.rb:333
+#: library/packages/src/modules/PackagesUI.rb:354
 msgid ""
 "<p>\n"
 "\t\t Change the status of an item by clicking its status icon\n"
@@ -3603,7 +3773,7 @@
 "\t\t Du kan også endre status for alle elementer i hurtigmenyen.\n"
 "\t\t </p>"
 
-#: library/packages/src/modules/PackagesUI.rb:340
+#: library/packages/src/modules/PackagesUI.rb:361
 msgid ""
 "<p>\n"
 "\t\t <b>Details</b> opens the detailed software package selection\n"
@@ -3615,7 +3785,7 @@
 "\t\t Her kan du vise og velge individuelle programvarepakker.\n"
 "\t\t </p>"
 
-#: library/packages/src/modules/PackagesUI.rb:346
+#: library/packages/src/modules/PackagesUI.rb:367
 msgid ""
 "<p>\n"
 "\t\t The disk usage display in the lower right corner shows the remaining disk space\n"
@@ -3635,134 +3805,134 @@
 
 #. Dialog title
 #. Hint for German translation: "Softwareauswahl und Einsatzzweck des Systems"
-#: library/packages/src/modules/PackagesUI.rb:367
+#: library/packages/src/modules/PackagesUI.rb:388
 msgid "Software Selection and System Tasks"
 msgstr "Programvareutvalg og systemoppgaver"
 
 #. don't get all the way out - the user might just have
 #. been scared of the gory details.
-#: library/packages/src/modules/PackagesUI.rb:408
+#: library/packages/src/modules/PackagesUI.rb:429
 msgid "(more)"
 msgstr "(flere)"
 
-#: library/packages/src/modules/PackagesUI.rb:424
+#: library/packages/src/modules/PackagesUI.rb:445
 msgid "Installation Successfully Finished"
 msgstr "Installasjonen er fullført"
 
-#: library/packages/src/modules/PackagesUI.rb:426
+#: library/packages/src/modules/PackagesUI.rb:447
 msgid "Package Installation Failed"
 msgstr "Pakkeinstallasjonen mislyktes"
 
-#: library/packages/src/modules/PackagesUI.rb:438
+#: library/packages/src/modules/PackagesUI.rb:459
 msgid "Error Message: %1"
 msgstr "Feilmelding: %1"
 
-#: library/packages/src/modules/PackagesUI.rb:455
+#: library/packages/src/modules/PackagesUI.rb:476
 msgid "Failed Packages: %1"
 msgstr "Pakker som ikke kunne installeres: %1"
 
-#: library/packages/src/modules/PackagesUI.rb:474
+#: library/packages/src/modules/PackagesUI.rb:495
 msgid "Installed Packages: %1"
 msgstr "Installerte pakker: %1"
 
-#: library/packages/src/modules/PackagesUI.rb:493
+#: library/packages/src/modules/PackagesUI.rb:514
 msgid "Updated Packages: %1"
 msgstr "Oppdaterte pakker: %1"
 
-#: library/packages/src/modules/PackagesUI.rb:512
+#: library/packages/src/modules/PackagesUI.rb:533
 msgid "Removed Packages: %1"
 msgstr "Pakker som er fjernet: %1"
 
-#: library/packages/src/modules/PackagesUI.rb:534
+#: library/packages/src/modules/PackagesUI.rb:555
 msgid "Not Installed Packages: %1"
 msgstr "Ikke installerte pakker: %1"
 
 #. Table headings for CD statistics during installation
-#: library/packages/src/modules/PackagesUI.rb:550
-#: library/packages/src/modules/SlideShow.rb:533
+#: library/packages/src/modules/PackagesUI.rb:571
+#: library/packages/src/modules/SlideShow.rb:534
 msgid "Packages"
 msgstr "Pakker"
 
 #. reset the items list
-#: library/packages/src/modules/PackagesUI.rb:561
+#: library/packages/src/modules/PackagesUI.rb:582
 msgid "Elapsed Time: %1"
 msgstr "Brukt tid: %1"
 
-#: library/packages/src/modules/PackagesUI.rb:571
+#: library/packages/src/modules/PackagesUI.rb:592
 msgid "Total Installed Size: %1"
 msgstr "Samlet installert størrelse: %1"
 
-#: library/packages/src/modules/PackagesUI.rb:581
+#: library/packages/src/modules/PackagesUI.rb:602
 msgid "Total Downloaded Size: %1"
 msgstr "Samlet nedlastingsstørrelse: %1"
 
-#: library/packages/src/modules/PackagesUI.rb:590
+#: library/packages/src/modules/PackagesUI.rb:611
 msgid "Statistics"
 msgstr "Statistikk"
 
 #. display installation log
-#: library/packages/src/modules/PackagesUI.rb:603
-#: library/packages/src/modules/PackagesUI.rb:691
+#: library/packages/src/modules/PackagesUI.rb:624
+#: library/packages/src/modules/PackagesUI.rb:713
 msgid "Installation log"
 msgstr "Installasjonslogg"
 
-#: library/packages/src/modules/PackagesUI.rb:610
+#: library/packages/src/modules/PackagesUI.rb:631
 msgid "Details"
 msgstr "Detaljer"
 
 #. open a new wizard dialog if needed
-#: library/packages/src/modules/PackagesUI.rb:658
+#: library/packages/src/modules/PackagesUI.rb:679
 #, fuzzy
 #| msgid "Installing Package"
 msgid "After Installing Packages"
 msgstr "Installerer pakke"
 
-#: library/packages/src/modules/PackagesUI.rb:659
+#: library/packages/src/modules/PackagesUI.rb:681
 msgid "Show This Report"
 msgstr ""
 
-#: library/packages/src/modules/PackagesUI.rb:660
+#: library/packages/src/modules/PackagesUI.rb:682
 #, fuzzy
 #| msgid "&Finish"
 msgid "Finish"
 msgstr "&Fullfør"
 
-#: library/packages/src/modules/PackagesUI.rb:661
+#: library/packages/src/modules/PackagesUI.rb:683
 #, fuzzy
 #| msgid "Accessing the Software Management Failed"
 msgid "Continue in the Software Manager"
 msgstr "Feil ved tilgang til pakkebehandler"
 
-#: library/packages/src/modules/PackagesUI.rb:666
+#: library/packages/src/modules/PackagesUI.rb:688
 #, fuzzy
 #| msgid "<P><BIG><B>Installation Summary</B></BIG><BR>Here is a summary of installed packages.</P>"
 msgid "<P><BIG><B>Installation Report</B></BIG><BR>Here is a summary of installed or removed packages.</P>"
 msgstr "<P><BIG><B>Installasjonssammendrag</B></BIG><BR>Dette er en oversikt over installerte pakker.</P>"
 
-#: library/packages/src/modules/PackagesUI.rb:674
+#: library/packages/src/modules/PackagesUI.rb:696
 #, fuzzy
 #| msgid "Installation Error"
 msgid "Installation Report"
 msgstr "Installasjonsfeil"
 
-#: library/packages/src/modules/PackagesUI.rb:696
+#: library/packages/src/modules/PackagesUI.rb:718
 msgid "Installed Packages"
 msgstr "Installerte pakker"
 
-#: library/packages/src/modules/PackagesUI.rb:701
+#: library/packages/src/modules/PackagesUI.rb:723
 msgid "Updated Packages"
 msgstr "Oppdaterte pakker"
 
-#: library/packages/src/modules/PackagesUI.rb:706
+#: library/packages/src/modules/PackagesUI.rb:728
 msgid "Removed Packages"
 msgstr "Pakker som er fjernet"
 
-#: library/packages/src/modules/PackagesUI.rb:711
+#: library/packages/src/modules/PackagesUI.rb:733
 msgid "Remaining Packages"
 msgstr "Beholdte pakker"
 
 #. disabling installation report dialog, inform the user how to enable it back
-#: library/packages/src/modules/PackagesUI.rb:732
+#: library/packages/src/modules/PackagesUI.rb:754
 msgid ""
 "If you want to show this report dialog again edit\n"
 "\n"
@@ -3774,7 +3944,7 @@
 #. popup question, %1 stands for the package name
 #. %2 is a repository name
 #. %3 is URL of the repository
-#: library/packages/src/modules/SignatureCheckDialogs.rb:463
+#: library/packages/src/modules/SignatureCheckDialogs.rb:456
 msgid ""
 "The package %1 from repository %2\n"
 "%3\n"
@@ -3795,7 +3965,7 @@
 #. popup question, %1 stands for the filename
 #. %2 is a repository name
 #. %3 is URL of the repository
-#: library/packages/src/modules/SignatureCheckDialogs.rb:476
+#: library/packages/src/modules/SignatureCheckDialogs.rb:469
 msgid ""
 "The file %1 from repository %2\n"
 "%3\n"
@@ -3813,16 +3983,16 @@
 "Vil du bruke den likevel?\n"
 
 #. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:500
+#: library/packages/src/modules/SignatureCheckDialogs.rb:493
 msgid "Unsigned Package"
 msgstr "Usignerte pakker"
 
-#: library/packages/src/modules/SignatureCheckDialogs.rb:502
+#: library/packages/src/modules/SignatureCheckDialogs.rb:495
 msgid "Unsigned File"
 msgstr "Usignerte filer"
 
 #. popup question, %1 stands for the package name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:551
+#: library/packages/src/modules/SignatureCheckDialogs.rb:544
 msgid ""
 "No checksum for package %1 was found in the repository.\n"
 "While the package is part of the signed repository, it is not contained \n"
@@ -3839,7 +4009,7 @@
 "Vil du installere den likevel?\n"
 
 #. popup question, %1 stands for the filename
-#: library/packages/src/modules/SignatureCheckDialogs.rb:561
+#: library/packages/src/modules/SignatureCheckDialogs.rb:554
 msgid ""
 "No checksum for file %1 was found in the repository.\n"
 "This means that the file is part of the signed repository,\n"
@@ -3856,62 +4026,62 @@
 "Vil du bruke den likevel?"
 
 #. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:579
+#: library/packages/src/modules/SignatureCheckDialogs.rb:572
 msgid "No Checksum Found"
 msgstr "Finner ingen kontrollsum"
 
 #. Part of the GnuPG key description in popup, %1 is a GnuPG key ID
 #. Part of the GnuPG key description in popup, %1 is a GnuPG key ID
-#: library/packages/src/modules/SignatureCheckDialogs.rb:622
-#: library/packages/src/modules/SignatureCheckDialogs.rb:833
+#: library/packages/src/modules/SignatureCheckDialogs.rb:615
+#: library/packages/src/modules/SignatureCheckDialogs.rb:826
 msgid "ID: %1"
 msgstr "ID: %1"
 
 #. Part of the GnuPG key description in popup, %1 is a GnuPG key fingerprint
-#: library/packages/src/modules/SignatureCheckDialogs.rb:631
+#: library/packages/src/modules/SignatureCheckDialogs.rb:624
 msgid "Fingerprint: %1"
 msgstr "Fingeravtrykk: %1"
 
 #. Part of the GnuPG key description in popup, %1 is a GnuPG key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:637
+#: library/packages/src/modules/SignatureCheckDialogs.rb:630
 msgid "Name: %1"
 msgstr "Navn: %1"
 
-#: library/packages/src/modules/SignatureCheckDialogs.rb:643
+#: library/packages/src/modules/SignatureCheckDialogs.rb:636
 msgid "Created: %1"
 msgstr "Opprettet: %1"
 
-#: library/packages/src/modules/SignatureCheckDialogs.rb:655
+#: library/packages/src/modules/SignatureCheckDialogs.rb:648
 msgid "Expires: %1"
 msgstr "Utløper: %1"
 
 #. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:671
+#: library/packages/src/modules/SignatureCheckDialogs.rb:664
 msgid "ID: "
 msgstr "ID: "
 
 #. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:677
+#: library/packages/src/modules/SignatureCheckDialogs.rb:670
 msgid "Name: "
 msgstr "Navn:"
 
 #. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:690
+#: library/packages/src/modules/SignatureCheckDialogs.rb:683
 msgid "Fingerprint: "
 msgstr "Fingeravtrykk:"
 
 #. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:701
+#: library/packages/src/modules/SignatureCheckDialogs.rb:694
 msgid "Created: "
 msgstr "Opprettet:"
 
 #. GPG key property
-#: library/packages/src/modules/SignatureCheckDialogs.rb:712
+#: library/packages/src/modules/SignatureCheckDialogs.rb:705
 msgid "Expires: "
 msgstr "Utløper:"
 
 #. popup question, %1 stands for the package name, %2 for the complete description of the GnuPG key (multiline)
-#: library/packages/src/modules/SignatureCheckDialogs.rb:734
+#: library/packages/src/modules/SignatureCheckDialogs.rb:727
 msgid ""
 "Package %1 from repository %2\n"
 "%3\n"
@@ -3934,7 +4104,7 @@
 "Vil du installere den likevel?\n"
 
 #. popup question, %1 stands for the filename, %2 for the complete description of the GnuPG key (multiline)
-#: library/packages/src/modules/SignatureCheckDialogs.rb:747
+#: library/packages/src/modules/SignatureCheckDialogs.rb:740
 msgid ""
 "File %1 from repository %2\n"
 "%3\n"
@@ -3957,12 +4127,12 @@
 "Vil du bruke den likevel?\n"
 
 #. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:771
+#: library/packages/src/modules/SignatureCheckDialogs.rb:764
 msgid "Validation Check Failed"
 msgstr "Valideringskontroll mislyktes"
 
 #. popup question, %1 stands for the package name, %2 for the complex multiline description of the GnuPG key
-#: library/packages/src/modules/SignatureCheckDialogs.rb:801
+#: library/packages/src/modules/SignatureCheckDialogs.rb:794
 msgid ""
 "The package %1 is digitally signed\n"
 "with the following unknown GnuPG key: %2.\n"
@@ -3983,7 +4153,7 @@
 "Vil du installere den likevel?"
 
 #. popup question, %1 stands for the filename, %2 for the complex multiline description of the GnuPG key
-#: library/packages/src/modules/SignatureCheckDialogs.rb:813
+#: library/packages/src/modules/SignatureCheckDialogs.rb:806
 msgid ""
 "The file %1\n"
 "is digitally signed with the following unknown GnuPG key: %2.\n"
@@ -4004,12 +4174,12 @@
 "Vil du bruke den likevel?"
 
 #. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:843
+#: library/packages/src/modules/SignatureCheckDialogs.rb:836
 msgid "Unknown GnuPG Key"
 msgstr "Ukjent GnuPG-nøkkel"
 
 #. popup question, %1 stands for the package name, %2 for the key ID, %3 for the key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:894
+#: library/packages/src/modules/SignatureCheckDialogs.rb:887
 msgid ""
 "The package %1 is digitally signed\n"
 "with key '%2 (%3)'.\n"
@@ -4032,7 +4202,7 @@
 "å hoppe over pakken.\n"
 
 #. popup question, %1 stands for the filename, %2 for the key ID, %3 for the key name
-#: library/packages/src/modules/SignatureCheckDialogs.rb:907
+#: library/packages/src/modules/SignatureCheckDialogs.rb:900
 msgid ""
 "The file %1 is digitally signed\n"
 "with key '%2 (%3)'.\n"
@@ -4055,17 +4225,17 @@
 "å hoppe over filen.\n"
 
 #. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:930
+#: library/packages/src/modules/SignatureCheckDialogs.rb:923
 msgid "Signed with Untrusted Public Key"
 msgstr "Signert med ukjent offentlig nøkkel"
 
 #. push button
-#: library/packages/src/modules/SignatureCheckDialogs.rb:939
+#: library/packages/src/modules/SignatureCheckDialogs.rb:932
 msgid "&Trust and Import the Key"
 msgstr "&Stol på og importer nøkkelen"
 
 #. additional Richtext (HTML) warning text (kind of help), 1/2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:973
+#: library/packages/src/modules/SignatureCheckDialogs.rb:966
 msgid ""
 "<p>The owner of the key may distribute updates,\n"
 "packages, and package repositories that your system will trust and offer\n"
@@ -4080,7 +4250,7 @@
 "systemet hvis du importerer nøkkelen til din samling med pålitelige nøkler.</p>"
 
 #. additional Richtext (HTML) warning text (kind of help), 2/2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:981
+#: library/packages/src/modules/SignatureCheckDialogs.rb:974
 msgid ""
 "<p>A warning dialog opens for every package that\n"
 "is not signed by a trusted (imported) key. If you do not trust the key,\n"
@@ -4091,7 +4261,7 @@
 "vil pakker eller pakkebrønner som er opprettet av nøkkelens eier, ikke bli brukt.</p>"
 
 #. popup message - label, part 1, %1 stands for repository name, %2 for its URL
-#: library/packages/src/modules/SignatureCheckDialogs.rb:991
+#: library/packages/src/modules/SignatureCheckDialogs.rb:984
 msgid ""
 "The following GnuPG key has been found in repository\n"
 "%1\n"
@@ -4102,7 +4272,7 @@
 "(%2):"
 
 #. popup message - label, part 2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1002
+#: library/packages/src/modules/SignatureCheckDialogs.rb:994
 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"
@@ -4115,23 +4285,23 @@
 "nøkkelen virkelig tilhører den eieren, før du importerer den."
 
 #. warning label - the key to import is expired
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1014
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1006
 msgid "WARNING: The key has expired!"
 msgstr "ADVARSEL: Nøkkelen er utløpt!"
 
 #. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1042
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1034
 msgid "Import Untrusted GnuPG Key"
 msgstr "Importer ukjent GnuPG-nøkkel"
 
 #. push button
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1058
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1050
 msgid "&Trust"
 msgstr "S&tol på"
 
 #. 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:1134
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1126
 msgid ""
 "The expected checksum of file %1\n"
 "is %2,\n"
@@ -4154,12 +4324,12 @@
 "Vil du bruke den likevel?\n"
 
 #. dialog heading - displayed in a big bold font
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1151
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1143
 msgid "Wrong Digest"
 msgstr "Feil sammendrag"
 
 #. popup question, %1 stands for the filename, %2 is expected digest, %3 is the current digest
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1170
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1162
 msgid ""
 "The checksum of file %1\n"
 "is %2,\n"
@@ -4180,7 +4350,7 @@
 "Vil du bruke den likevel?\n"
 
 #. dialog heading - displayed in a big bold font
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1184
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1176
 msgid "Unknown Digest"
 msgstr "Ukjent sammendrag"
 
@@ -4189,84 +4359,84 @@
 #. Return the description for the current stage.
 #. @return [String]	localized string description
 #. translators: default global progress bar label
-#: library/packages/src/modules/SlideShow.rb:151
 #: library/packages/src/modules/SlideShow.rb:152
-#: library/packages/src/modules/SlideShow.rb:323
-#: library/packages/src/modules/SlideShow.rb:344
+#: library/packages/src/modules/SlideShow.rb:153
+#: library/packages/src/modules/SlideShow.rb:324
+#: library/packages/src/modules/SlideShow.rb:345
 msgid "Installing..."
 msgstr "Installerer..."
 
 #. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:529
+#: library/packages/src/modules/SlideShow.rb:530
 msgid "Media"
 msgstr "Medium"
 
 #. Table headings for CD statistics during installation - keep as short as possible!
-#: library/packages/src/modules/SlideShow.rb:531
+#: library/packages/src/modules/SlideShow.rb:532
 #, fuzzy
 #| msgid "Remaining Packages"
 msgid "Remaining"
 msgstr "Beholdte pakker"
 
 #. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:535
+#: library/packages/src/modules/SlideShow.rb:536
 msgid "Time"
 msgstr "Tid"
 
 #. Construct widgets for the "details" page
 #.
 #. @return	A term describing the widgets
-#: library/packages/src/modules/SlideShow.rb:551
+#: library/packages/src/modules/SlideShow.rb:552
 msgid "Actions performed:"
 msgstr "Utførte handlinger:"
 
 #. Help text while software packages are being installed (displayed only in rare cases)
-#: library/packages/src/modules/SlideShow.rb:633
+#: library/packages/src/modules/SlideShow.rb:634
 msgid "<p>Packages are being installed.</p>"
 msgstr "<p>Pakkene installeres.</p>"
 
-#: library/packages/src/modules/SlideShow.rb:634
+#: library/packages/src/modules/SlideShow.rb:635
 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 "<P><B>Avbryte installasjon</B> Pakkeinstallasjonen kan avbrytes med <B>Avbryt</B>-knappen. Men hvis ikke alle grunnleggende systemkomponenter er installert ennå, kan det hende at systemet blir inkonsistent, ubrukelig eller ikke kan startes.</P>"
 
 #. Translators: Tab name, keep short, %s is product name, e.g. SLES
-#: library/packages/src/modules/SlideShow.rb:652
+#: library/packages/src/modules/SlideShow.rb:653
 #, fuzzy
 #| msgid "Release &Notes"
 msgid "%s Release Notes"
 msgstr "Versjonsmerk&nader"
 
 #. tab
-#: library/packages/src/modules/SlideShow.rb:664
+#: library/packages/src/modules/SlideShow.rb:665
+msgid "&Details"
+msgstr "&Detaljert"
+
+#. tab
+#: library/packages/src/modules/SlideShow.rb:669
 msgid "Slide Sho&w"
 msgstr "Lysbildepresentasjo&n"
 
-#. tab
-#: library/packages/src/modules/SlideShow.rb:666
-msgid "&Details"
-msgstr "&Detaljert"
-
 #. Dialog heading - software packages are being upgraded
-#: library/packages/src/modules/SlideShow.rb:705
+#: library/packages/src/modules/SlideShow.rb:708
 #, fuzzy
 #| msgid "Perform Update"
 msgid "Performing Upgrade"
 msgstr "Utfør oppgradering"
 
 #. Dialog heading - software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:708
+#: library/packages/src/modules/SlideShow.rb:711
 #, fuzzy
 #| msgid "Perform Installation"
 msgid "Performing Installation"
 msgstr "Utfør installasjon"
 
 #. Dialog heading while software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:743
+#: library/packages/src/modules/SlideShow.rb:746
 msgid "Package Installation"
 msgstr "Pakkeinstallasjon"
 
 #. popup yes-no
-#: library/packages/src/modules/SlideShow.rb:815
+#: library/packages/src/modules/SlideShow.rb:818
 msgid ""
 "Do you really want\n"
 "to quit the installation?"
@@ -4275,7 +4445,7 @@
 "avslutte installasjonen?"
 
 #. Mode::update (), Stage::cont ()
-#: library/packages/src/modules/SlideShow.rb:827
+#: library/packages/src/modules/SlideShow.rb:830
 msgid "Aborted"
 msgstr "Avbrutt"
 
@@ -4870,17 +5040,18 @@
 msgid "Bluetooth device"
 msgstr "Bluetooth-enhet"
 
-#. Continue/Cancel question, %1 is a file name
-#: library/system/src/modules/FileChanges.rb:175
+#. Runs arguments without changed root.
+#. @see http://www.rubydoc.info/github/openSUSE/cheetah/Cheetah.run parameter docs
+#. @raise Cheetah::ExecutionFailed
+#: library/system/src/lib/yast2/execute.rb:67
 msgid ""
-"File %1 has been changed manually.\n"
-"YaST might lose some of the changes.\n"
+"Execution of command \"%{command}\" failed.\n"
+"Exit code: %{exitcode}\n"
+"Error output: %{stderr}"
 msgstr ""
-"Filen %1 er endret manuelt.\n"
-"YaST kan tilbakestille noen av endringene.\n"
 
 #. Continue/Cancel question, %1 is a coma separated list of file names
-#: library/system/src/modules/FileChanges.rb:180
+#: library/system/src/modules/FileChanges.rb:178
 msgid ""
 "Files %1 have been changed manually.\n"
 "YaST might lose some of the changes"
@@ -4888,12 +5059,22 @@
 "Filene %1 er endret manuelt.\n"
 "YaST kan tilbakestille noen av endringene."
 
-#: library/system/src/modules/FileChanges.rb:193
+#. Continue/Cancel question, %1 is a file name
+#: library/system/src/modules/FileChanges.rb:180
+msgid ""
+"File %1 has been changed manually.\n"
+"YaST might lose some of the changes.\n"
+msgstr ""
+"Filen %1 er endret manuelt.\n"
+"YaST kan tilbakestille noen av endringene.\n"
+
+#: library/system/src/modules/FileChanges.rb:192
 msgid "Do not show this message anymore"
 msgstr "Ikke vis denne meldingen igjen"
 
-#. Continue/Cancel question, %s is a file name
-#: library/system/src/modules/FileChanges.rb:236
+#. TRANSLATORS: Continue/Cancel question, %s is a single file name or
+#. a comma separated list of file names.
+#: library/system/src/modules/FileChanges.rb:229
 #, fuzzy
 #| msgid ""
 #| "File %1 has been changed manually.\n"
@@ -4901,30 +5082,23 @@
 msgid ""
 "File %s has been created manually.\n"
 "YaST might lose this file."
-msgstr ""
+msgid_plural ""
+"Files %s have been created manually.\n"
+"YaST might lose these files."
+msgstr[0] ""
 "Filen %1 er endret manuelt.\n"
 "YaST kan tilbakestille noen av endringene.\n"
+msgstr[1] ""
+"Filen %1 er endret manuelt.\n"
+"YaST kan tilbakestille noen av endringene.\n"
 
-#. Continue/Cancel question, %s is a comma separated list of file names
-#: library/system/src/modules/FileChanges.rb:239
-#, fuzzy
-#| msgid ""
-#| "Files %1 have been changed manually.\n"
-#| "YaST might lose some of the changes"
-msgid ""
-"Files %s have been created manually.\n"
-"YaST might lose these files."
-msgstr ""
-"Filene %1 er endret manuelt.\n"
-"YaST kan tilbakestille noen av endringene."
-
 #. error report
 #: library/system/src/modules/Initrd.rb:415
 msgid "An error occurred during initrd creation."
 msgstr "En feil oppstod under oppretting av initrd."
 
 #. inform the user that he/she has to reboot to activate new kernel
-#: library/system/src/modules/Kernel.rb:665
+#: library/system/src/modules/Kernel.rb:657
 msgid ""
 "Reboot your system\n"
 "to activate the new kernel.\n"
@@ -4959,7 +5133,7 @@
 "heksadesimalsiffer adskilt av kolon."
 
 #. Translators: dot: ".", hyphen: "-"
-#: library/types/src/modules/Hostname.rb:55
+#: library/types/src/modules/Hostname.rb:56
 msgid ""
 "A valid domain name consists of components separated by dots.\n"
 "Each component contains letters, digits, and hyphens. A hyphen may not\n"
@@ -4970,7 +5144,7 @@
 "innlede eller avslutte et komponentnavn, og det siste komponentnavnet kan ikke begynne med et tall."
 
 #. Translators: hyphen: "-"
-#: library/types/src/modules/Hostname.rb:66
+#: library/types/src/modules/Hostname.rb:67
 msgid ""
 "A valid host name consists of letters, digits, and hyphens.\n"
 "A host name may not begin or end with a hyphen.\n"
@@ -5057,13 +5231,13 @@
 
 #. ellipsis - used to replace part of text to make it shorter
 #. example: "/really/very/long/file/name", "/.../file/name")
-#: library/types/src/modules/String.rb:738
+#: library/types/src/modules/String.rb:730
 msgid "..."
 msgstr "..."
 
 #. covert a number to download rate string
 #. %1 is string - size in bytes, B, KiB, MiB, GiB or TiB
-#: library/types/src/modules/String.rb:855
+#: library/types/src/modules/String.rb:846
 msgid "%1/s"
 msgstr "%1/s"
 
@@ -5145,8 +5319,8 @@
 
 #. fallback name for the dialog title
 #. fallback name for the dialog title
-#: library/wizard/src/modules/Wizard.rb:1139
-#: library/wizard/src/modules/Wizard.rb:1193
+#: library/wizard/src/modules/Wizard.rb:1134
+#: library/wizard/src/modules/Wizard.rb:1188
 msgid "Module"
 msgstr "Modul"
 
@@ -5926,68 +6100,17 @@
 "Det er ikke noen baklengs sone for %1 som administreres av DNS-serveren.\n"
 "Vertsnavnet %2 kan ikke legges til."
 
-#: src/lib/ui/srv_status_component.rb:60
 #, fuzzy
-#| msgid "Service Start"
-msgid "Service Status"
-msgstr "Start av tjeneste"
+#~| msgid ""
+#~| "Files %1 have been changed manually.\n"
+#~| "YaST might lose some of the changes"
+#~ msgid ""
+#~ "Files %s have been created manually.\n"
+#~ "YaST might lose these files."
+#~ msgstr ""
+#~ "Filene %1 er endret manuelt.\n"
+#~ "YaST kan tilbakestille noen av endringene."
 
-#. Content for the help
-#: src/lib/ui/srv_status_component.rb:114
-msgid ""
-"<p><b><big>Current status</big></b><br>\n"
-"Displays the current status of the service. The status will remain the same after saving the settings, independently of the value of 'start service during boot'.</p>\n"
-"<p><b><big>Reload After Saving Settings</big></b><br>\n"
-"Only applicable if the service is currently running. Ensures the running service reloads the new configuration after saving it (via 'ok' or 'save' buttons).</p>\n"
-"<p><b><big>Start During System Boot</big></b><br>\n"
-"Check this field to enable the service at system boot. Un-check it to disable the service. This does not affect the current status of the service in the already running system.</p>\n"
-msgstr ""
-
-#. Widget displaying the status and associated buttons
-#: src/lib/ui/srv_status_component.rb:181
-msgid "Current status:"
-msgstr "Gjeldende status:"
-
-#. Widget to configure the status on boot
-#: src/lib/ui/srv_status_component.rb:194
-#, fuzzy
-#| msgid "Operating System Boot"
-msgid "Start During System Boot"
-msgstr "Oppstart av operativsystem"
-
-#. Widget to configure reloading of the running service
-#: src/lib/ui/srv_status_component.rb:208
-#, fuzzy
-#| msgid "Read Other Settings."
-msgid "Reload After Saving Settings"
-msgstr "Les andre innstillinger."
-
-#. TRANSLATORS: status of a service
-#: src/lib/ui/srv_status_component.rb:218
-#, fuzzy
-#| msgid "Warning"
-msgid "running"
-msgstr "Advarsel"
-
-#: src/lib/ui/srv_status_component.rb:220
-#, fuzzy
-#| msgid "S&top now ..."
-msgid "Stop now"
-msgstr "S&topp nå ..."
-
-#. TRANSLATORS: status of a service
-#: src/lib/ui/srv_status_component.rb:225
-#, fuzzy
-#| msgid "Stopped"
-msgid "stopped"
-msgstr "Stoppet"
-
-#: src/lib/ui/srv_status_component.rb:227
-#, fuzzy
-#| msgid "Start it now?"
-msgid "Start now"
-msgstr "Start den nå?"
-
 #~ msgid "The correct repository medium could not be mounted."
 #~ msgstr "Korrekt pakkebrønnmedium kunne ikke monteres."
 

Modified: trunk/yast/nb/po/bootloader.nb.po
===================================================================
--- trunk/yast/nb/po/bootloader.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/bootloader.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: bootloader\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2009-09-25 13:51+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -26,663 +26,568 @@
 "X-Generator: Lokalize 1.0\n"
 
 #. command line help text for Bootloader module
-#: src/clients/bootloader.rb:35
+#: src/clients/bootloader.rb:32
 msgid "Boot loader configuration module"
 msgstr "Konfigurasjonsmodul for oppstartslaster"
 
-#. command line help text for summary action
-#: src/clients/bootloader.rb:48
-msgid "Configuration summary of boot loader"
-msgstr "Konfigurasjonssammendrag for oppstartslaster"
+#. F#300779 - Install diskless client (NFS-root)
+#. additional warning that root partition is nfs type -> bootloader will not be installed
+#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
+#: src/lib/bootloader/config_dialog.rb:31 src/modules/Bootloader.rb:195
+msgid "The boot partition is of type NFS. Bootloader cannot be installed."
+msgstr "Oppstartspartisjonen er av typen NFS. Oppstartslasteren kan ikke installeres."
 
-#. command line help text for delete action
-#: src/clients/bootloader.rb:58
-#, fuzzy
-#| msgid "Set a global option"
-msgid "Delete a global option"
-msgstr "Definer et globalt alternativ"
+#. F#300779: end
+#: src/lib/bootloader/config_dialog.rb:49
+msgid "Boot Loader Settings"
+msgstr "Oppstartslasterinnstillinger"
 
-#. command line help text for set action
-#: src/clients/bootloader.rb:65
-msgid "Set a global option"
-msgstr "Definer et globalt alternativ"
+#. Represents dialog for modification of device map
+#: src/lib/bootloader/device_map_dialog.rb:56
+msgid "Device map must contain at least one device"
+msgstr "Enhetskartet må inneholde minst én enhet"
 
-#. command line help text for print action
-#: src/clients/bootloader.rb:75
-msgid "Print value of specified option"
-msgstr "Skriv ut verdien for det spesifiserte alternativet"
+#. we just go back to original dialog
+#: src/lib/bootloader/device_map_dialog.rb:108
+msgid "Disk order settings"
+msgstr "Innstillinger fir diskrekkefølge"
 
-#. command line help text for an option
-#: src/clients/bootloader.rb:83
-msgid "The key of the option"
-msgstr "Alternativets kode"
+#: src/lib/bootloader/device_map_dialog.rb:113
+msgid "D&isks"
+msgstr "D&isker"
 
-#. command line help text for an option
-#: src/clients/bootloader.rb:90
-msgid "The value of the option"
-msgstr "Alternativets verdi"
+#. textentry header
+#: src/lib/bootloader/device_map_dialog.rb:157
+msgid "&Device"
+msgstr "&Enhet"
 
-#. command line error report
-#: src/clients/bootloader.rb:152
-msgid "Value was not specified."
-msgstr "Ingen verdi spesifisert."
+#. TRANSLATORS: %s stands for partition
+#: src/lib/bootloader/disk_change_detector.rb:29
+msgid "Selected bootloader partition %s is not available any more."
+msgstr ""
 
-#. command line error report
-#: src/clients/bootloader.rb:174
-msgid "Option was not specified."
-msgstr "Alternativ ikke spesifisert."
+#. Finish client for bootloader configuration
+#: src/lib/bootloader/finish_client.rb:25
+msgid "Saving bootloader configuration..."
+msgstr "Lagrer konfigurasjon for oppstartslaster..."
 
-#. command line, %1 is the value of bootloader option
-#: src/clients/bootloader.rb:180
+#. TRANSLATORS: reboot message
+#. %1 is replaced with additional message from reIPL
+#: src/lib/bootloader/finish_client.rb:102
 #, fuzzy
-#| msgid "Value: %1"
-msgid "Value: %s"
-msgstr "Verdi: %1"
-
-#. command line error report
-#: src/clients/bootloader.rb:183
-msgid "Specified option does not exist."
-msgstr "Det spesifiserte alternativet finnes ikke."
-
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack 
-#.
-#. $Id$
-#: src/include/bootloader/grub/helps.rb:23
-msgid "<p><big><b>Boot Menu</b></big><br></p>"
-msgstr "<p><big><b>Oppstartsmeny</b></big><br></p>"
-
-#: src/include/bootloader/grub/helps.rb:24
+#| msgid ""
+#| "\n"
+#| "Your system will now shut down.%1%2\n"
+#| "For details, read the related chapter \n"
+#| "in the documentation. \n"
 msgid ""
-"<p><b>Set active Flag in Partition Table for Boot Partition</b><br>\n"
-"To activate the partition which contains the boot loader. The generic MBR code will then\n"
-"boot the active partition. Older BIOSes require one partition to be active even\n"
-"if the boot loader is installed in the MBR.</p>"
+"\n"
+"Your system will now shut down.%1\n"
+"For details, read the related chapter \n"
+"in the documentation. \n"
 msgstr ""
-"<b>Angi oppstartspartisjonen som aktiv i partisjonstabellen</b><br>\n"
-"Brukes for å aktivere partisjonen som inneholder oppstartslasteren. Den generiske MBR-koden vil da\n"
-"starte opp den aktive partisjonen. Eldre BIOS-er krever at en partisjon er aktiv selv om\n"
-"oppstartslasteren er installert i MBR.</p>"
+"\n"
+"Systemet vil bli slått av.%1%2\n"
+"Du finner mer informasjon i det aktuelle kapittelet \n"
+"i dokumentasjonen. \n"
 
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack 
-#.
-#. $Id$
-#: src/include/bootloader/grub/helps.rb:30
-#: src/include/bootloader/routines/common_helps.rb:23
-msgid ""
-"<p><b>Timeout in Seconds</b><br>\n"
-"Specifies the time the bootloader will wait until the default kernel is loaded.</p>\n"
-msgstr ""
-"<p><b>Tidsavbrudd i sekunder</b><br>\n"
-"Angir hvor lenge oppstartslasteren skal vente før standardkjernen lastes.</p>\n"
+#. Final message after all packages from CD1 are installed
+#. and we're ready to start (boot into) the installed system
+#. Message that will be displayed along with information
+#. how the boot loader was installed
+#: src/lib/bootloader/finish_client.rb:115
+msgid "The system will reboot now..."
+msgstr "Maskinen vil bli startet på nytt nå..."
 
-#: src/include/bootloader/grub/helps.rb:33
-msgid ""
-"<p> By pressing <b>Set as Default</b> you mark the selected section as\n"
-"the default. When booting, the boot loader will provide a boot menu and\n"
-"wait for the user to select a kernel or OS to boot. If no\n"
-"key is pressed before the timeout, the default kernel or OS will\n"
-"boot. The order of the sections in the boot loader menu can be changed\n"
-"using the <b>Up</b> and <b>Down</b> buttons.</p>\n"
-msgstr ""
-"<p> Ved å klikke <b>Bruk som standard</b> markerer du den valgte \n"
-"seksjonen som standard. Ved oppstart vil oppstartslasteren vise en \n"
-"oppstartsmeny og vente på at brukeren skal velge en kjerne eller annet \n"
-"operativsystem som skal startes. Hvis det ikke blir trykket noen tast før tidsavbruddet, blir \n"
-"standardkjernen/operativsystemet lastet. Rekkefølgen på seksjonene i oppstartslasteren \n"
-"kan endres ved hjelp av <b>Opp</b> og <b>Ned</b>-knappen.</p>\n"
+#. Widget to switch between all supported bootloaders
+#: src/lib/bootloader/generic_widgets.rb:20
+msgid "&Boot Loader"
+msgstr "&Oppstartslaster"
 
-#: src/include/bootloader/grub/helps.rb:41
-msgid ""
-"<p><b>Write generic Boot Code to MBR</b> replace the master boot record of your disk with generic code (OS independent code which\n"
-"boots the active partition).</p>"
+#: src/lib/bootloader/generic_widgets.rb:39
+msgid "GRUB2"
 msgstr ""
-"<p><big><b>Skriv generisk oppstartskode til MBR</b></big><br> erstatter «master boot record» på disken med generisk kode (OS-uavhengig kode som\n"
-"starter opp den aktive partisjonen).</p>"
 
-#: src/include/bootloader/grub/helps.rb:44
-msgid ""
-"<p><b>Boot from Boot Partition</b> is one of the recommended options, the other is\n"
-"<b>Boot from Root Partition</b>.</p>"
+#: src/lib/bootloader/generic_widgets.rb:40
+msgid "GRUB2 for EFI"
 msgstr ""
-"<p><b>Start fra oppstartspartisjon</b> er ett av de anbefalte alternativene, det andre er \n"
-"<b>Start fra rotpartisjon</b>.</p>"
 
-#: src/include/bootloader/grub/helps.rb:47
-msgid ""
-"<p><b>Boot from Master Boot Record</b> is not recommended if you have another operating system\n"
-"installed on your computer</p>"
+#. Translators: option in combo box when bootloader is not managed by yast2
+#: src/lib/bootloader/generic_widgets.rb:42
+msgid "Not Managed"
 msgstr ""
-"<p><b>Start fra hovedoppstartssektor</b> anbefales ikke hvis du har et annet operativsystem\n"
-"installert på datamaskinen</p>"
 
-#: src/include/bootloader/grub/helps.rb:50
-msgid ""
-"<p><b>Boot from Root Partition</b> is the recommended option whenever there is a suitable\n"
-"partition. Either select <b>Set active Flag in Partition Table for Boot Partition</b> and <b>Write generic Boot Code to MBR</b>\n"
-"in <b>Boot Loader Options</b> to update the master boot record if that is needed or configure your other boot manager\n"
-"to start this section.</p>"
-msgstr ""
-"<p><b>Start fra rotpartisjon</b> er det anbefalte alternativet når det i det hele tatt finnes en egnet\n"
-"partisjon. Du kan enten velge <b>Angi oppstartspartisjonen som aktiv i partisjonstabellen</b> og <b>Skriv generisk oppstartskode til MBR</b>\n"
-" i <b>Oppstartslastervalg</b> for å oppdatere \"master boot record\" hvis det er nødvendig, eller konfigurere den andre oppstartslasteren\n"
-" til å starte denne seksjonen.</p>"
+#: src/lib/bootloader/generic_widgets.rb:43
+#, fuzzy
+#| msgid " (default)"
+msgid "Default"
+msgstr " (standard)"
 
-#: src/include/bootloader/grub/helps.rb:56
+#. popup - Continue/Cancel
+#: src/lib/bootloader/generic_widgets.rb:57
 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>"
+"\n"
+"If you do not install any boot loader, the system\n"
+"might not start.\n"
+"\n"
+"Proceed?\n"
 msgstr ""
+"\n"
+"Hvis du ikke installer noen oppstartslaster, kan systemet\n"
+"kanskje ikke startes.\n"
+"\n"
+"Vil du fortsette?\n"
 
-#: src/include/bootloader/grub/helps.rb:59
-msgid "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"
-msgstr "<p>Med <b>Egendefinert oppstartspartisjon</b> kan du velge hvilken partisjon du vil starte fra.</p>"
-
-#: src/include/bootloader/grub/helps.rb:62
+#: src/lib/bootloader/generic_widgets.rb:75
 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>"
+"<p><b>Boot Loader Type</b><br>\n"
+"To select whether to install a boot loader and which bootloader to install,\n"
+"use <b>Boot Loader</b>.</p>"
 msgstr ""
-"<p>MD-tilordning opprettes fra 2 disker. <b>Aktiver redundans for MD-tilordning</b>\n"
-"aktiver lagring av GRUB i  MBR på begge disker.</p>"
+"<p><b>Oppstartslastertype</b><br>\n"
+"Velg om en oppstartslaster skal installeres, og i så fall hvilken\n"
+"under <b>Oppstartslaster</b>.</p>"
 
-#: src/include/bootloader/grub/helps.rb:65
-#, fuzzy
-#| msgid ""
-#| "<p><b>Use Serial Console</b> lets you define the parameters to use\n"
-#| "for a serial console. Please see the grub documentation (<code>info grub</code>) for details.</p>"
-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 grub2</code>) for details.</p>"
-msgstr ""
-"<p>Med <b>Bruk seriell konsoll</b> kan du definere parametere som skal brukes\n"
-"for en seriell konsoll. Du finner mer informasjon i grub-dokumentasjonen (<code>info grub</code>).</p>"
+#. Display bootloader summary
+#. @return a list of summary lines
+#. Display bootloader summary
+#. @return a list of summary lines
+#: src/lib/bootloader/grub2.rb:105 src/lib/bootloader/grub2efi.rb:77
+msgid "Boot Loader Type: %1"
+msgstr "Oppstartslastertype: %1"
 
-#: src/include/bootloader/grub/helps.rb:68
+#: src/lib/bootloader/grub2.rb:109
 #, fuzzy
-#| 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"
-#| "you have to specify <code>serial</code>. You can also pass <code>console</code> to the\n"
-#| "command, as <code>serial console</code>. In this case, a terminal in which you\n"
-#| "press any key will be selected as a GRUB terminal.</p>"
-msgid ""
-"<p><b>Terminal Definition</b></p><br>\n"
-"Defines the type of terminal you want to use. For a serial terminal (e.g. a serial console),\n"
-"you have to specify <code>serial</code>. You can also pass <code>console</code> to the\n"
-"command, as <code>serial console</code>. In this case, a terminal in which you\n"
-"press any key will be selected as a GRUB terminal.</p>"
-msgstr ""
-"<p><b>Terminaldefinisjon</b></p><br>\n"
-"Definerer typen terminal du vil bruke. For en seriell terminal (f.eks. en seriell konsoll),\n"
-" må du angi <code>seriell</code>. Du kan også sende <code>konsoll</code> til\n"
-" kommandoen, som <code>seriell konsoll</code>. I dette tilfellet vil det bli valgt en terminal \n"
-"der du kan trykke en hvilken som helst tast, som GRUB-terminal.</p>"
+#| msgid "Enable Secure Boot: %1"
+msgid "Enable Trusted Boot: %1"
+msgstr "Aktiver sikker oppstart: %1"
 
-#: src/include/bootloader/grub/helps.rb:75
-msgid ""
-"<p><b>Fallback Sections if default Fails</b> contains a list of section numbers\n"
-"that will be used for booting in case the default section is unbootable.</p>"
-msgstr ""
-"<p><b>Reserveseksjoner hvis standard mislykkes</b> inneholder en liste med numre \n"
-"på seksjoner som blir brukt til oppstart hvis filsystemet i standardseksjonen ikke kan startes.</p>"
-
-#: src/include/bootloader/grub/helps.rb:78
-msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>"
-msgstr "<p>Hvis du velger <b>Skjul meny ved oppstart</b>, skjules oppstartsmenyen.</p>"
-
-#: src/include/bootloader/grub/helps.rb:81
+#: src/lib/bootloader/grub2.rb:110 src/lib/bootloader/grub2efi.rb:82
 #, fuzzy
-#| 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"
-#| "it in <b>Retype Password</b>.</p>"
-msgid ""
-"<p><b>Protect Boot Loader with Password</b><br>\n"
-"At boot time, modifying or even booting any entry will require the password. If <b>Protect Entry Modification Only</b> is checked then booting any entry is not restricted but modifying entries requires the password (which is the way GRUB 1 behaved).<br>YaST will only accept the password if you repeat it in <b>Retype Password</b>.</p>"
-msgstr ""
-"<p><b>Passord for oppstartslaster</b><br>\n"
-"Angi passordet som må brukes for å få tilgang til oppstartsmenyen. YaST godkjenner bare passordet når du gjentar det i\n"
-" <b>Gjenta passordet</b>.</p>"
+#| msgid "Yes"
+msgid "yes"
+msgstr "Ja"
 
-#. help text 1/5
-#: src/include/bootloader/grub/helps.rb:91
-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"
-"the <b>Up</b> and <b>Down</b> buttons to reorder the disks.\n"
-"To add a disk, push <b>Add</b>.\n"
-"To remove a disk, push <b>Remove</b>.</p>"
+#: src/lib/bootloader/grub2.rb:110 src/lib/bootloader/grub2efi.rb:82
+msgid "no"
 msgstr ""
-"<p><big><b>Diskrekkefølge</b></big><br>\n"
-"Angi diskrekkefølgen i henhold til rekkefølgen i BIOS med\n"
-"<b>opp</b>- og <b>ned</b>-knappene.\n"
-"Bruk <b>Legg til</b> for å legge til en disk.\n"
-"Bruk <b>Fjern</b> for å fjerne en disk.</p>"
 
-#: src/include/bootloader/grub/helps.rb:101
-msgid "Boot Loader Locations"
-msgstr "Plassering av oppstartslaster"
+#: src/lib/bootloader/grub2.rb:116
+msgid "Status Location: %1"
+msgstr "Status for plassering: %1"
 
-#: src/include/bootloader/grub/helps.rb:102
-msgid "Set &active Flag in Partition Table for Boot Partition"
-msgstr "Angi oppstartspartisjonen som &aktiv i partisjonstabellen"
+#. part of summary, %1 is a list of hard disks device names
+#: src/lib/bootloader/grub2.rb:178
+msgid "Order of Hard Disks: %1"
+msgstr "Harddiskrekkefølge: %1"
 
-#: src/include/bootloader/grub/helps.rb:105
-#: src/include/bootloader/routines/common_helps.rb:28
-msgid "&Timeout in Seconds"
-msgstr "&Tidsavbrudd i sekunder"
+#. TRANSLATORS: extended is here for extended partition. Keep translation short.
+#: src/lib/bootloader/grub2.rb:190
+msgid " (extended)"
+msgstr " (utvidet)"
 
-#: src/include/bootloader/grub/helps.rb:106
-msgid "&Default Boot Section"
-msgstr "Standar&d oppstartsseksjon"
+#. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific
+#. is used in your language, then keep it as it is.
+#: src/lib/bootloader/grub2.rb:195
+msgid " (MBR)"
+msgstr " (MBR)"
 
-#: src/include/bootloader/grub/helps.rb:107
-msgid "Write &generic Boot Code to MBR"
-msgstr "Skriv &generisk oppstartskode til MBR"
+#: src/lib/bootloader/grub2.rb:216
+#, fuzzy
+#| msgid "Boot from MBR is enabled (disable</a>"
+msgid "Install bootcode into MBR (do not install</a>)"
+msgstr "Oppstart fra MBR er aktivert (deaktiver</a>"
 
-#: src/include/bootloader/grub/helps.rb:108
-msgid "Custom Boot Partition"
-msgstr "Egendefinert oppstartspartisjon"
+#: src/lib/bootloader/grub2.rb:220
+#, fuzzy
+#| msgid "Boot from MBR is disabled (enable</a>"
+msgid "Do not install bootcode into MBR (install</a>)"
+msgstr "Oppstart fra MBR er deaktivert (aktiver</a>"
 
-#: src/include/bootloader/grub/helps.rb:109
-msgid "Boot from Master Boot Record"
-msgstr "Start fra hovedoppstartssektor"
+#. check for separated boot partition, use root otherwise
+#: src/lib/bootloader/grub2.rb:230
+#, fuzzy
+#| msgid "Boot from /boot partition is enabled (disable</a>"
+msgid "Install bootcode into /boot partition (do not install</a>)"
+msgstr "Oppstart fra /boot-partisjon er aktivert (deaktiver</a>"
 
-#: src/include/bootloader/grub/helps.rb:110
-msgid "Boot from Root Partition"
-msgstr "Start fra rotpartisjon"
+#: src/lib/bootloader/grub2.rb:235
+#, fuzzy
+#| msgid "Boot from /boot partition is disabled (enable</a>"
+msgid "Do not install bootcode into /boot partition (install</a>)"
+msgstr "Oppstart fra /boot-partisjon er deaktivert (aktiver</a>"
 
-#: src/include/bootloader/grub/helps.rb:111
-msgid "Boot from Boot Partition"
-msgstr "Start fra oppstartspartisjon"
+#: src/lib/bootloader/grub2.rb:241
+#, fuzzy
+#| msgid "Boot from \"/\" partition is enabled (disable</a>"
+msgid "Install bootcode into \"/\" partition (do not install</a>)"
+msgstr "Oppstart fra «/»-partisjon er aktivert (deaktiver</a>"
 
-#: src/include/bootloader/grub/helps.rb:112
-msgid "Boot from Extended Partition"
-msgstr "Start fra utvidet partisjon"
+#: src/lib/bootloader/grub2.rb:246
+#, fuzzy
+#| msgid "Boot from \"/\" partition is disabled (enable</a>"
+msgid "Do not install bootcode into \"/\" partition (install</a>)"
+msgstr "Oppstart fra «/»-partisjon er deaktivert (aktiver</a>"
 
-#: src/include/bootloader/grub/helps.rb:113
-msgid "Serial Connection &Parameters"
-msgstr "&Parametere for seriell tilkobling"
-
-#: src/include/bootloader/grub/helps.rb:114
-msgid "Fallback Sections if Default fails"
-msgstr "Reserveseksjoner hvis standard mislykkes"
-
-#: src/include/bootloader/grub/helps.rb:115
-msgid "&Hide Menu on Boot"
-msgstr "&Skjul meny ved oppstart"
-
-#: src/include/bootloader/grub/helps.rb:116
-msgid "Pa&ssword for the Menu Interface"
-msgstr "Pa&ssord for menygrensesnitt"
-
-#: src/include/bootloader/grub/helps.rb:117
-msgid "Debugg&ing Flag"
-msgstr "Feilsøk&ingsvalg"
-
-#. Validate function of a popup
-#. @param [String] key any widget key
-#. @param [Hash] event map event that caused validation
-#. @return [Boolean] true if widget settings ok
-#: src/include/bootloader/grub/options.rb:73
-msgid "Prot&ect Boot Loader with Password"
-msgstr "B&eskytt oppstartslasteren med et passord"
-
-#. TRANSLATORS: checkbox entry
-#: src/include/bootloader/grub/options.rb:79
-msgid "P&rotect Entry Modification Only"
+#. no location chosen, so warn user that it is problem unless he is sure
+#: src/lib/bootloader/grub2.rb:271
+msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
 msgstr ""
 
-#. text entry
-#: src/include/bootloader/grub/options.rb:85
-msgid "&Password"
-msgstr "&Passord"
-
-#. text entry
-#: src/include/bootloader/grub/options.rb:88
-msgid "Re&type Password"
-msgstr "Gjen&ta passordet"
-
-#. Create Frame "Boot Loader Location"
-#.
-#. @return [Yast::Term] with widgets
-#: src/include/bootloader/grub/options.rb:222
-msgid "Boot from &Root Partition"
-msgstr "Start fra &rotpartisjon"
-
-#: src/include/bootloader/grub/options.rb:224
-msgid "Boo&t from Boot Partition"
-msgstr "Star&t fra oppstartspartisjon"
-
-#: src/include/bootloader/grub/options.rb:235
-msgid "C&ustom Boot Partition"
-msgstr "E&gendefinert oppstartspartisjon"
-
-#: src/include/bootloader/grub/options.rb:250
-#: src/include/bootloader/grub/options.rb:280
-#: src/include/bootloader/grub/options.rb:301
-msgid "Boot Loader Location"
-msgstr "Oppstartslasterens plassering"
-
-#: src/include/bootloader/grub/options.rb:256
-#: src/include/bootloader/grub/options.rb:286
-#: src/include/bootloader/grub/options.rb:307
-msgid "Boot from &Master Boot Record"
-msgstr "Start fra &Master Boot Record"
-
-#: src/include/bootloader/grub/options.rb:263
-msgid "Boot from &Extended Partition"
-msgstr "Start fra utvid&et partisjon"
-
-#: src/include/bootloader/grub/options.rb:312
-msgid "Enable Red&undancy for MD Array"
-msgstr "Aktiver red&undans for MD-tilordning"
-
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:57
+#. TRANSLATORS: title for list of location proposals
+#: src/lib/bootloader/grub2.rb:279
 #, fuzzy
-#| msgid "Boot Loader Options"
-msgid "Boot Code Options"
-msgstr "Alternativer for oppstartslaster"
+#| msgid "Change Location: %1"
+msgid "Change Location: %s"
+msgstr "Endre plassering: %1"
 
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:84
-#, fuzzy
-#| msgid "Other Kernel &Parameters"
-msgid "Kernel Parameters"
-msgstr "Andre kjerne¶metere"
+#. Represents bootloader timeout value
+#: src/lib/bootloader/grub2_widgets.rb:53
+msgid "&Timeout in Seconds"
+msgstr "&Tidsavbrudd i sekunder"
 
-#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:103
-#, fuzzy
-#| msgid "Boot Loader Options"
-msgid "Bootloader Options"
-msgstr "Alternativer for oppstartslaster"
+#: src/lib/bootloader/grub2_widgets.rb:57
+msgid ""
+"<p><b>Timeout in Seconds</b><br>\n"
+"Specifies the time the bootloader will wait until the default kernel is loaded.</p>\n"
+msgstr ""
+"<p><b>Tidsavbrudd i sekunder</b><br>\n"
+"Angir hvor lenge oppstartslasteren skal vente før standardkjernen lastes.</p>\n"
 
-#. Window title
-#: src/include/bootloader/grub2/dialogs.rb:149
-msgid "Boot Loader Options"
-msgstr "Alternativer for oppstartslaster"
+#. Represents decision if bootloader need activated partition
+#: src/lib/bootloader/grub2_widgets.rb:89
+msgid "Set &active Flag in Partition Table for Boot Partition"
+msgstr "Angi oppstartspartisjonen som &aktiv i partisjonstabellen"
 
-#: src/include/bootloader/grub2/dialogs.rb:190
-msgid "Secure Boot"
-msgstr "Sikker oppstart"
+#: src/lib/bootloader/grub2_widgets.rb:93
+msgid ""
+"<p><b>Set active Flag in Partition Table for Boot Partition</b><br>\n"
+"To activate the partition which contains the boot loader. The generic MBR code will then\n"
+"boot the active partition. Older BIOSes require one partition to be active even\n"
+"if the boot loader is installed in the MBR.</p>"
+msgstr ""
+"<b>Angi oppstartspartisjonen som aktiv i partisjonstabellen</b><br>\n"
+"Brukes for å aktivere partisjonen som inneholder oppstartslasteren. Den generiske MBR-koden vil da\n"
+"starte opp den aktive partisjonen. Eldre BIOS-er krever at en partisjon er aktiv selv om\n"
+"oppstartslasteren er installert i MBR.</p>"
 
-#: src/include/bootloader/grub2/dialogs.rb:196
-msgid "Enable &Secure Boot Support"
-msgstr "Aktiver støtte for &sikker oppstart"
+#. Represents decision if generic MBR have to be installed on disk
+#: src/lib/bootloader/grub2_widgets.rb:120
+msgid "Write &generic Boot Code to MBR"
+msgstr "Skriv &generisk oppstartskode til MBR"
 
-#. TRANSLATORS: place where boot code is installed
-#: src/include/bootloader/grub2/dialogs.rb:247
-#, fuzzy
-#| msgid "Boot Loader Location"
-msgid "Boot &Loader Location"
-msgstr "Oppstartslasterens plassering"
-
-#. help text
-#: src/include/bootloader/grub2/dialogs.rb:266
-msgid "Choose partition where is boot sequence installed."
+#: src/lib/bootloader/grub2_widgets.rb:124
+msgid ""
+"<p><b>Write generic Boot Code to MBR</b> replace the master boot record of your disk with generic code (OS independent code which\n"
+"boots the active partition).</p>"
 msgstr ""
+"<p><big><b>Skriv generisk oppstartskode til MBR</b></big><br> erstatter «master boot record» på disken med generisk kode (OS-uavhengig kode som\n"
+"starter opp den aktive partisjonen).</p>"
 
-#. encoding: utf-8
-#. File:
-#. include/bootloader/grup2/helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader installation and configuration
-#.
-#. Authors:
-#. Joachim Plack 
-#.
-#. $Id: helps.ycp 58279 2009-08-04 16:01:51Z juhliarik $
-#: src/include/bootloader/grub2/helps.rb:23
-msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"
-msgstr "<p>Med <b>Andre kommandolinjeparametere for kjernen</b> kan du definere tilleggsparametere som skal sendes til kjernen.</p>"
+#. Represents decision if menu should be hidden or visible
+#: src/lib/bootloader/grub2_widgets.rb:149
+msgid "&Hide Menu on Boot"
+msgstr "&Skjul meny ved oppstart"
 
-#: src/include/bootloader/grub2/helps.rb:26
-msgid "<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>"
-msgstr "<p><b>VGA-modus</b> definerer VGA-modusen for <i>konsollen</i> kjernen skal stille inn ved oppstart.</p>"
+#: src/lib/bootloader/grub2_widgets.rb:153
+msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>"
+msgstr "<p>Hvis du velger <b>Skjul meny ved oppstart</b>, skjules oppstartsmenyen.</p>"
 
-#: src/include/bootloader/grub2/helps.rb:29
+#. Represents if os prober should be run
+#: src/lib/bootloader/grub2_widgets.rb:172
+#, fuzzy
+#| msgid "Probe Foreign OS"
+msgid "Pro&be Foreign OS"
+msgstr "Søk etter andre OS"
+
+#: src/lib/bootloader/grub2_widgets.rb:176
 msgid "<p><b>Probe Foreign OS</b> by means of os-prober for multiboot with other foreign distribution </p>"
 msgstr "<p>Velg <b>Søk etter andre OS</b> for å søke etter oppstartsalternativer som omfatter andre operativsystemer </p>"
 
-#: src/include/bootloader/grub2/helps.rb:32
-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
+#. represents kernel command line
+#: src/lib/bootloader/grub2_widgets.rb:200
 msgid "O&ptional Kernel Command Line Parameter"
 msgstr "Andre kommandolinje¶metere for kjernen"
 
-#: src/include/bootloader/grub2/helps.rb:39
-msgid "&Vga Mode"
-msgstr "&VGA-modus"
+#: src/lib/bootloader/grub2_widgets.rb:204
+msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"
+msgstr "<p>Med <b>Andre kommandolinjeparametere for kjernen</b> kan du definere tilleggsparametere som skal sendes til kjernen.</p>"
 
-#: src/include/bootloader/grub2/helps.rb:40
-msgid "Probe Foreign OS"
-msgstr "Søk etter andre OS"
+#. Represents Protective MBR action
+#: src/lib/bootloader/grub2_widgets.rb:228
+msgid "&Protective MBR flag"
+msgstr ""
 
-#: src/include/bootloader/grub2/helps.rb:41
-msgid "Protective MBR flag"
+#: src/lib/bootloader/grub2_widgets.rb:232
+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 ""
 
-#. combo box item
-#. %1 is X resolution (width) in pixels
-#. %2 is Y resolution (height) in pixels
-#. %3 is color depth (usually one of 8, 16, 24, 32)
-#. %4 is the VGA mode ID (hexadecimal number)
-#: src/include/bootloader/grub2/options.rb:58
-msgid "%1x%2, %3 bits (mode %4)"
-msgstr "%1x%2, %3 bits (modus %4)"
-
-#: src/include/bootloader/grub2/options.rb:68
-msgid "Standard 8-pixel font mode."
-msgstr "Standard skrifttypemodus med 8 piksler."
-
-#. item of a combo box
-#: src/include/bootloader/grub2/options.rb:71
-msgid "Text Mode"
-msgstr "Tekstmodus"
-
-#: src/include/bootloader/grub2/options.rb:72
-msgid "Unspecified"
-msgstr "Uspesifisert"
-
 #. TRANSLATORS: set flag on disk
-#: src/include/bootloader/grub2/options.rb:102
+#: src/lib/bootloader/grub2_widgets.rb:246
 #, fuzzy
 #| msgid "[set]"
 msgid "set"
 msgstr "[angitt]"
 
 #. TRANSLATORS: remove flag from disk
-#: src/include/bootloader/grub2/options.rb:104
+#: src/lib/bootloader/grub2_widgets.rb:248
 msgid "remove"
 msgstr "fjern"
 
 #. TRANSLATORS: do not change flag on disk
-#: src/include/bootloader/grub2/options.rb:106
+#. force re-calculation of bootloader proposal
+#. this deletes any internally cached values, a new proposal will
+#. not be partially based on old data now any more
+#: src/lib/bootloader/grub2_widgets.rb:250
+#: src/lib/bootloader/proposal_client.rb:49
 #, fuzzy
 #| msgid "Do not change name"
 msgid "do not change"
 msgstr "Ikke endre navnet"
 
-#. Init function for console
-#. @param [String] widget
-#: src/include/bootloader/grub2/options.rb:173
-msgid "Autodetect by grub2"
-msgstr "Automatisk søk med grub2"
+#. Represents switcher for secure boot on EFI
+#: src/lib/bootloader/grub2_widgets.rb:268
+msgid "Enable &Secure Boot Support"
+msgstr "Aktiver støtte for &sikker oppstart"
 
-#. FATE: #110038: Serial console
-#. add or remove console key with value for sections
-#: src/include/bootloader/grub2/options.rb:246
+#: src/lib/bootloader/grub2_widgets.rb:272
+#, fuzzy
+#| msgid "Enable Secure Boot: %1"
+msgid "Tick to enable UEFI Secure Boot\n"
+msgstr "Aktiver sikker oppstart: %1"
+
+#. Represents switcher for Trusted Boot
+#: src/lib/bootloader/grub2_widgets.rb:293
+#, fuzzy
+#| msgid "Enable &Secure Boot Support"
+msgid "Enable &Trusted Boot Support"
+msgstr "Aktiver støtte for &sikker oppstart"
+
+#. TRANSLATORS: TrustedGRUB2 is a name, don't translate it
+#: src/lib/bootloader/grub2_widgets.rb:298
+msgid "<b>Trusted Boot</b> will install TrustedGRUB2 instead of regular GRUB2.\n"
+msgstr ""
+
+#. Represents grub password protection widget
+#: src/lib/bootloader/grub2_widgets.rb:324
+msgid "Prot&ect Boot Loader with Password"
+msgstr "B&eskytt oppstartslasteren med et passord"
+
+#. TRANSLATORS: checkbox entry
+#: src/lib/bootloader/grub2_widgets.rb:330
+msgid "P&rotect Entry Modification Only"
+msgstr ""
+
+#. TRANSLATORS: text entry, please keep it short
+#: src/lib/bootloader/grub2_widgets.rb:336
+msgid "&Password for GRUB2 User 'root'"
+msgstr ""
+
+#. text entry
+#: src/lib/bootloader/grub2_widgets.rb:339
+msgid "Re&type Password"
+msgstr "Gjen&ta passordet"
+
+#: src/lib/bootloader/grub2_widgets.rb:350
+msgid "The password must not be empty."
+msgstr "Passordfeltet må ikke være tomt."
+
+#: src/lib/bootloader/grub2_widgets.rb:357
+msgid ""
+"'Password' and 'Retype password'\n"
+"do not match. Retype the password."
+msgstr ""
+"'Passord og Bekreft passord'\n"
+"samsvarte ikke. Skriv inn passordet på nytt."
+
+#. special value as we do not know password, so it mean user do not change it
+#: src/lib/bootloader/grub2_widgets.rb:407
+#, fuzzy
+#| 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"
+#| "it in <b>Retype Password</b>.</p>"
+msgid ""
+"<p><b>Protect Boot Loader with Password</b><br>\n"
+"At boot time, modifying or even booting any entry will require the password. If <b>Protect Entry Modification Only</b> is checked then booting any entry is not restricted but modifying entries requires the password (which is the way GRUB 1 behaved).<br>YaST will only accept the password if you repeat it in <b>Retype Password</b>. The password applies to the GRUB2 user 'root' which is distinct from the Linux 'root'. YaST currently does not supportother GRUB2 users. If you need them, use a separate GRUB2 script.</p>"
+msgstr ""
+"<p><b>Passord for oppstartslaster</b><br>\n"
+"Angi passordet som må brukes for å få tilgang til oppstartsmenyen. YaST godkjenner bare passordet når du gjentar det i\n"
+" <b>Gjenta passordet</b>.</p>"
+
+#. there's mode specified, use it
+#: src/lib/bootloader/grub2_widgets.rb:485
 msgid "Choose new graphical theme file"
 msgstr "Velg ny fil for grafisk tema"
 
-#: src/include/bootloader/grub2/options.rb:258
+#: src/lib/bootloader/grub2_widgets.rb:498
 msgid "Use &graphical console"
 msgstr "Bruk &grafisk konsoll"
 
-#: src/include/bootloader/grub2/options.rb:265
+#: src/lib/bootloader/grub2_widgets.rb:503
 msgid "&Console resolution"
 msgstr "&Konsolloppløsning"
 
-#: src/include/bootloader/grub2/options.rb:273
+#: src/lib/bootloader/grub2_widgets.rb:508
 msgid "&Console theme"
 msgstr "&Konsolltema"
 
-#: src/include/bootloader/grub2/options.rb:292
+#: src/lib/bootloader/grub2_widgets.rb:539
+msgid "Autodetect by grub2"
+msgstr "Automatisk søk med grub2"
+
+#: src/lib/bootloader/grub2_widgets.rb:547
 msgid "Use &serial console"
 msgstr "Bruk &seriell konsoll"
 
-#: src/include/bootloader/grub2/options.rb:299
+#: src/lib/bootloader/grub2_widgets.rb:554
 msgid "&Console arguments"
 msgstr "&Konsollargumenter"
 
-#. 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:131
-msgid "Unsupported bootloader '%s'. Adapt your AutoYaST profile accordingly."
+#. represent choosing default section to boot
+#: src/lib/bootloader/grub2_widgets.rb:571
+msgid "&Default Boot Section"
+msgstr "Standar&d oppstartsseksjon"
+
+#: src/lib/bootloader/grub2_widgets.rb:575
+msgid ""
+"<p> By pressing <b>Set as Default</b> you mark the selected section as\n"
+"the default. When booting, the boot loader will provide a boot menu and\n"
+"wait for the user to select a kernel or OS to boot. If no\n"
+"key is pressed before the timeout, the default kernel or OS will\n"
+"boot. The order of the sections in the boot loader menu can be changed\n"
+"using the <b>Up</b> and <b>Down</b> buttons.</p>\n"
 msgstr ""
+"<p> Ved å klikke <b>Bruk som standard</b> markerer du den valgte \n"
+"seksjonen som standard. Ved oppstart vil oppstartslasteren vise en \n"
+"oppstartsmeny og vente på at brukeren skal velge en kjerne eller annet \n"
+"operativsystem som skal startes. Hvis det ikke blir trykket noen tast før tidsavbruddet, blir \n"
+"standardkjernen/operativsystemet lastet. Rekkefølgen på seksjonene i oppstartslasteren \n"
+"kan endres ved hjelp av <b>Opp</b> og <b>Ned</b>-knappen.</p>\n"
 
-#. file open popup caption
-#: src/include/bootloader/routines/common_options.rb:98
-msgid "Select File"
-msgstr "Velg fil"
+#. Represents stage1 location for bootloader
+#: src/lib/bootloader/grub2_widgets.rb:610
+msgid "Boot Loader Location"
+msgstr "Oppstartslasterens plassering"
 
-#. F#300779 - Install diskless client (NFS-root)
-#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
-#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
-#: src/include/bootloader/routines/dialogs.rb:86 src/modules/Bootloader.rb:239
-msgid "The boot partition is of type NFS. Bootloader cannot be installed."
-msgstr "Oppstartspartisjonen er av typen NFS. Oppstartslasteren kan ikke installeres."
+#: src/lib/bootloader/grub2_widgets.rb:664
+msgid "Custom boot device have to be specied if checked"
+msgstr ""
 
-#. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:114
-msgid "Boot Loader Settings"
-msgstr "Oppstartslasterinnstillinger"
+#: src/lib/bootloader/grub2_widgets.rb:692
+msgid "Boo&t from Boot Partition"
+msgstr "Star&t fra oppstartspartisjon"
 
-#. message
-#: src/include/bootloader/routines/dialogs.rb:142
-msgid "There are no options to set for the current boot loader."
-msgstr "Ingen tilgjengelige valg for denne oppstartslasteren."
+#: src/lib/bootloader/grub2_widgets.rb:693
+#, fuzzy
+#| msgid "Boot from Root Partition"
+msgid "Boo&t from Root Partition"
+msgstr "Start fra rotpartisjon"
 
-#. combo box
-#: src/include/bootloader/routines/global_widgets.rb:109
-msgid "&Boot Loader"
-msgstr "&Oppstartslaster"
+#: src/lib/bootloader/grub2_widgets.rb:694
+msgid "Boot from &Master Boot Record"
+msgstr "Start fra &Master Boot Record"
 
-#. popup - Continue/Cancel
-#: src/include/bootloader/routines/global_widgets.rb:138
-msgid ""
-"\n"
-"If you do not install any boot loader, the system\n"
-"might not start.\n"
-"\n"
-"Proceed?\n"
-msgstr ""
-"\n"
-"Hvis du ikke installer noen oppstartslaster, kan systemet\n"
-"kanskje ikke startes.\n"
-"\n"
-"Vil du fortsette?\n"
+#: src/lib/bootloader/grub2_widgets.rb:695
+msgid "Boot from &Extended Partition"
+msgstr "Start fra utvid&et partisjon"
 
-#. menu button entry
-#: src/include/bootloader/routines/global_widgets.rb:175
-msgid "E&dit Configuration Files"
-msgstr "&Rediger konfigurasjonsfiler"
+#: src/lib/bootloader/grub2_widgets.rb:706
+msgid "C&ustom Boot Partition"
+msgstr "E&gendefinert oppstartspartisjon"
 
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:182
-msgid "&Propose New Configuration"
-msgstr "&Foreslå ny konfigurasjon"
+#. Represents button that open Device Map edit dialog
+#: src/lib/bootloader/grub2_widgets.rb:719
+#, fuzzy
+#| msgid "Disk Order"
+msgid "&Edit Disk Boot Order"
+msgstr "Diskrekkefølge"
 
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:189
-msgid "&Start from Scratch"
-msgstr "&Lag helt ny"
+#: src/lib/bootloader/grub2_widgets.rb:725
+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"
+"the <b>Up</b> and <b>Down</b> buttons to reorder the disks.\n"
+"To add a disk, push <b>Add</b>.\n"
+"To remove a disk, push <b>Remove</b>.</p>"
+msgstr ""
+"<p><big><b>Diskrekkefølge</b></big><br>\n"
+"Angi diskrekkefølgen i henhold til rekkefølgen i BIOS med\n"
+"<b>opp</b>- og <b>ned</b>-knappene.\n"
+"Bruk <b>Legg til</b> for å legge til en disk.\n"
+"Bruk <b>Fjern</b> for å fjerne en disk.</p>"
 
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:197
-msgid "&Reread Configuration from Disk"
-msgstr "&Bruk konfigurasjon fra disk"
+#. represents Tab with kernel related configuration
+#: src/lib/bootloader/grub2_widgets.rb:746
+#, fuzzy
+#| msgid "Other Kernel &Parameters"
+msgid "&Kernel Parameters"
+msgstr "Andre kjerne¶metere"
 
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:214
-msgid "Restore MBR of Hard Disk"
-msgstr "Gjenopprett MBR på harddisk"
+#. Represent tab with options related to stage1 location and bootloader type
+#: src/lib/bootloader/grub2_widgets.rb:771
+#, fuzzy
+#| msgid "Boot Loader Options"
+msgid "Boot Co&de Options"
+msgstr "Alternativer for oppstartslaster"
 
-#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:222
-msgid "Write bootloader boot code to disk"
-msgstr "Skriv oppstartskode for oppstartslaster til disk"
+#. Represents bootloader specific options like its timeout, default section or password protection
+#: src/lib/bootloader/grub2_widgets.rb:837
+#, fuzzy
+#| msgid "Boot Loader Options"
+msgid "Boot&loader Options"
+msgstr "Alternativer for oppstartslaster"
 
-#. menu button
-#: src/include/bootloader/routines/global_widgets.rb:230
-msgid "Other"
-msgstr "Annet"
+#: src/lib/bootloader/grub2efi.rb:81
+msgid "Enable Secure Boot: %1"
+msgstr "Aktiver sikker oppstart: %1"
 
-#. message popup
-#: src/include/bootloader/routines/global_widgets.rb:254
-msgid "MBR restored successfully."
-msgstr "MBR gjenopprettet."
+#. TODO: not much helpful for customers
+#. error report
+#: src/lib/bootloader/main_dialog.rb:84
+msgid "Because of the partitioning, the boot loader cannot be installed properly."
+msgstr "Oppstartslasteren kan ikke installeres riktig med denne partisjoneringen."
 
-#. message popup
-#: src/include/bootloader/routines/global_widgets.rb:257
-msgid "Failed to restore MBR."
-msgstr "MBR kunne ikke gjenopprettes."
+#. Represents when bootloader want user manage itself
+#: src/lib/bootloader/none_bootloader.rb:15
+msgid "Do not install any boot loader"
+msgstr "Ikke installer noen oppstartslaster"
 
-#. Bootloader::blSave (false, false, false);
-#: src/include/bootloader/routines/global_widgets.rb:280
-msgid "Writing bootloader settings failed."
-msgstr "Oppstartslasterinnstillingene kunne ikke lagres."
+#. proposal part - bootloader label
+#: src/lib/bootloader/proposal_client.rb:94
+msgid "Booting"
+msgstr "Oppstart"
 
-#. push button
-#: src/include/bootloader/routines/global_widgets.rb:329
-msgid "Boot &Loader Options"
-msgstr "Oppstarts&lastervalg"
+#. menubutton entry
+#: src/lib/bootloader/proposal_client.rb:96
+msgid "&Booting"
+msgstr "&Oppstart"
 
-#. push button
-#: src/include/bootloader/routines/global_widgets.rb:342
-msgid "Boot Loader Installation &Details"
-msgstr "&Informasjon om oppstartslasterinstallasjon"
+#. warning text in the summary richtext
+#: src/lib/bootloader/proposal_client.rb:179
+msgid "No boot loader is selected for installation. Your system might not be bootable."
+msgstr "Ingen oppstartslaster er valgt for installasjon. Systemet vil kanskje ikke kunne startes opp."
 
-#. help text 1/1 (shown during settings reading progress)
-#: src/include/bootloader/routines/helps.rb:32
+#: src/lib/bootloader/proposal_client.rb:186
+msgid "Because of the partitioning, the bootloader cannot be installed properly"
+msgstr "Oppstartslasteren kan ikke installeres riktig med denne partisjoneringen"
+
+#. Dialog for graphical indication that bootloader configuration is read
+#: src/lib/bootloader/read_dialog.rb:22
+#, fuzzy
+#| msgid ""
+#| "<P><BIG><B>Boot Loader Configuration Tool</B></BIG><BR>\n"
+#| "Change the settings of your boot loader.</P>"
 msgid ""
 "<P><BIG><B>Boot Loader Configuration Tool</B></BIG><BR>\n"
-"Change the settings of your boot loader.</P>"
+"Reading current configuration...</P>"
 msgstr ""
 "<P><BIG><B>Konfigurasjonsverktøy for oppstartslaster</B></BIG><BR>\n"
 "Endre innstillingene for oppstartslasteren.</P>"
 
-#. help text
-#: src/include/bootloader/routines/helps.rb:41
+#. Write settings dialog
+#. @return `:abort` if aborted and `:next` otherwise
+#: src/lib/bootloader/write_dialog.rb:24
 msgid ""
 "<P><B><BIG>Saving Boot Loader Configuration</BIG></B><BR>\n"
 "Please wait...<br></p>"
@@ -690,660 +595,606 @@
 "<P><B><BIG>Lagrer konfigurasjon for oppstartslaster </BIG></B><BR>\n"
 "Vent...<br></p>"
 
-#. help text 1/2 (%1 may be following sentence, optionally empty)
-#: src/include/bootloader/routines/helps.rb:52
-msgid ""
-"<P>From <B>Other</B>,\n"
-"you can manually edit the boot loader configuration files, clear the current \n"
-"configuration and propose a new configuration, start from scratch, or reread\n"
-"the configuration saved on your disk. %1</P>"
-msgstr ""
-"<P>Under <B>Annet</B>\n"
-"kan du redigere konfigurasjonsfilene for oppstartslasteren manuelt, slette gjeldende \n"
-"konfigurasjon og foreslå en ny konfigurasjon, starte på nytt eller bruke\n"
-"konfigurasjonen som er lagret på disken som utgangspunkt. %1</P>"
+#. grub2 is sooo cool...
+#: src/modules/BootSupportCheck.rb:94
+msgid "Unsupported combination of hardware platform %1 and bootloader %2"
+msgstr "En kombinasjon av maskinvareplattformen %1 og oppstartslasteren %2 støttes ikke"
 
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:67
-msgid ""
-"<P>To edit boot loader configuration files\n"
-"manually, click <B>Edit Configuration Files</B>.</P>"
+#. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation.
+#: src/modules/BootSupportCheck.rb:117
+msgid "Boot from MBR does not work together with btrfs filesystem and GPT disk label without bios_grub partition.To fix this issue, create bios_grub partition or use any ext filesystem for boot partition or do not install stage 1 to MBR."
 msgstr ""
-"<P>For å redigere konfigurasjonsfiler for oppstartslasteren\n"
-"manuelt, klikk <B>Rediger konfigurasjonsfiler</B>.</P>"
 
-#. help 1/4
-#: src/include/bootloader/routines/helps.rb:76
-msgid ""
-"<P> In the table, each section represents one item\n"
-"in the boot menu.</P>"
-msgstr ""
-"<P> I tabellen representerer hver seksjon én oppføring\n"
-"i oppstartsmenyen.</P>"
+#. FIXME: big part of this method should be in BootStorage
+#. check if boot device is on raid0
+#: src/modules/BootSupportCheck.rb:144
+msgid "The boot device is on raid type: %1. System will not boot."
+msgstr "Oppstartsenheten er på raid-typen: %1. Systemet vil ikke starte opp."
 
-#. help 2/4
-#: src/include/bootloader/routines/helps.rb:80
-msgid ""
-"<P> Press <B>Edit</B> to display the properties of the\n"
-"selected section.</P>"
-msgstr ""
-"<P> Klikk <B>Rediger</B> for å vise egenskapene til den\n"
-"valgte seksjonen.</P>"
+#. bnc#501043 added check for valid configuration
+#: src/modules/BootSupportCheck.rb:156
+msgid "The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record"
+msgstr "Oppstartsenheten er plassert på programvarebasert RAID1. Velg en annen plassering for oppstartslasteren, f.eks. Master Boot Record."
 
-#. help 3/4
-#: src/include/bootloader/routines/helps.rb:84
-msgid ""
-"<P> By pressing <b>Set as Default</b>, mark the selected \n"
-"section as default. When booting, the boot loader will provide \n"
-"a boot menu and wait for the user to select the kernel or other \n"
-"OS to boot. If no key is pressed before the time-out, the default \n"
-"kernel or OS will be booted. The order of sections in the boot loader\n"
-"menu can be changed using the <B>Up</B> and <B>Down</B> buttons.</P>"
+#. if partitioning worked before upgrade, it will keep working (bnc#886604)
+#: src/modules/BootSupportCheck.rb:189
+msgid "Missing ext partition for booting. Cannot install boot code."
 msgstr ""
-"<P>Ved å klikke <b>Bruk som standard</b> markerer du den valgte\n"
-"seksjonen som standard. Ved oppstart vil oppstartslasteren vise \n"
-"en oppstartsmeny og vente på at brukeren skal velge en kjerne eller \n"
-"et annet operativsystem som skal startes. Dersom ingen tast blir trykket inn før forsinkelsen, blir standardkjernen \n"
-"eller -operativsystemet lastet. Rekkefølgen for seksjonene i oppstartsmenyen\n"
-"kan endres ved å bruke <B>Opp</B>- og <B>Ned</B>knappene.</P>"
 
-#. help 4/4
-#: src/include/bootloader/routines/helps.rb:93
-msgid ""
-"<P>Press <B>Add</B> to create a new boot loader section\n"
-"or <B>Delete</B> to delete the selected section.</P>"
+#. activate set or there is already activate flag
+#: src/modules/BootSupportCheck.rb:200
+msgid "Activate flag is not set by installer. If it is not set at all, some BIOSes could refuse to boot."
 msgstr ""
-"<P>Klikk <B>Legg til</B> for å opprette en ny oppstartslasterseksjon\n"
-"eller <B>Slett</B> for å slette den valgte seksjonen.</P>"
 
-#. help text for the custom boot manager installation, 1 of 7
-#. %1 = name of boot loader (e.g. "LILO")
-#. this should be per architecture
-#: src/include/bootloader/routines/helps.rb:107
-msgid ""
-"<p><big><b>Boot Loader Location</b></big><br>\n"
-"The boot manager (%1) can be installed in the following ways:</p>"
+#: src/modules/BootSupportCheck.rb:207
+msgid "The installer will not modify the MBR of the disk. Unless it already contains boot code, the BIOS won't be able to boot from this disk."
 msgstr ""
-"<p><big><b>Oppstartslasterplassering</b></big><br>\n"
-"Oppstartslasteren (%1) kan installeres på følgende måter:</p>"
 
-#. custom bootloader help text, 2 of 7
-#: src/include/bootloader/routines/helps.rb:116
-msgid ""
-"<p>- In the <b>Master Boot Record</b> (MBR).\n"
-"This is not recommended if there is another operating system installed\n"
-"on the computer.</p>"
-msgstr ""
-"<p>- I <b>Master Boot Record</b> (MBR).\n"
-"Dette anbefales ikke dersom et annet operativsystem er installert\n"
-"på datamaskinen.</p>"
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:118
+msgid "Check boot loader"
+msgstr "Kontroller oppstartslaster"
 
-#. custom bootloader help text, 3 of 7
-#: src/include/bootloader/routines/helps.rb:126
-msgid ""
-"<p>\n"
-"- In the <b>Boot Sector</b> of the <tt>/boot</tt> or <tt>/</tt> (root) \n"
-"partition.  This is the recommended option whenever there is a suitable\n"
-"partition. Either set <b>Activate Boot Loader Partition</b> and\n"
-"<b>Replace MBR with Generic Code</b> in <b>Boot Loader Installation Details</b>\n"
-"to update the master boot record\n"
-"if it is needed or configure your other boot manager\n"
-"to start &product;.</p>"
-msgstr ""
-"<p>\n"
-"- I <b>Oppstartssektor</b> på <tt>/boot</tt>- eller <tt>/</tt> (root)\n"
-"-partisjonen.  Dette anbefales hvis det finnes en egnet\n"
-"partisjon. Velg enten <b>Aktiver oppstartslasterpartisjon</b> og\n"
-"<b>Erstatt MBR med generisk kode</b> under <b>Informasjon om oppstartslasterinstallasjon</b>\n"
-"for å oppdatere master boot record\n"
-"hvis dette er nødvendig, eller konfigurer den andre oppstartslasteren\n"
-"for å starte &product;.</p>"
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:120
+msgid "Read partitioning"
+msgstr "Les partisjonstabell"
 
-#. custom bootloader help text, 5 of 7
-#: src/include/bootloader/routines/helps.rb:141
-msgid ""
-"<p>\n"
-"- In some <b>Other</b> partition. Consider your system's restrictions\n"
-"when selecting this option.</p>"
-msgstr ""
-"<p>\n"
-"- På en <b>annen</b> partisjon. Tenk på hva som er mulig i systemet\n"
-"hvis du velger dette alternativet.</p>"
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:122
+msgid "Load boot loader settings"
+msgstr "Last innstillinger for oppstartslaster"
 
-#. optional part, only inserted on x86 architectures. 6 of 7
-#: src/include/bootloader/routines/helps.rb:151
-msgid ""
-"<p>For example, most PCs have a BIOS\n"
-"limit that restricts booting to\n"
-"hard disk cylinders smaller than 1024. Depending on the boot manager used,\n"
-"you may or may not be able to boot from a logical partition.</p>"
-msgstr ""
-"<p>De fleste PC-er har for eksempel begrensninger i BIOS\n"
-"som hindrer oppstart fra\n"
-"harddisksylindre under 1024. Avhengig av oppstartslaster,\n"
-"er det kanskje mulig å starte opp fra en logisk partisjon, og kanskje ikke.</p>"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:126
+msgid "Checking boot loader..."
+msgstr "Kontrollerer oppstartslaster..."
 
-#. custom bootloader help text, 7 of 7
-#: src/include/bootloader/routines/helps.rb:163
-msgid ""
-"<p>\n"
-"Enter the device name of the partition (for example, <tt>/dev/hda3</tt> or\n"
-"<tt>/dev/sdb</tt>) in the input field.</p>"
-msgstr ""
-"<p>\n"
-"Angi partisjonens enhetsnavn (for eksempel, <tt>/dev/hda3</tt> eller\n"
-"<tt>/dev/sdb</tt>) i feltet.</p>"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:128
+msgid "Reading partitioning..."
+msgstr "Leser partisjonstabell..."
 
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:176
-msgid ""
-"<p><b>Boot Loader Installation Details</b><br>\n"
-"To adjust advanced boot loader installation options (such as the device\n"
-"mapping), click <b>Boot Loader Installation Details</b>.</p>"
-msgstr ""
-"<p><b>Informasjon om oppstartslasterinstallasjon</b><br>\n"
-"Bruk avanserte valg for oppstartslasterinstallasjonen (for eksempel\n"
-"enhetsmapping) under <b>Informasjon om oppstartslasterinstallasjon</b>.</p>"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:130
+msgid "Loading boot loader settings..."
+msgstr "Laster innstillinger for oppstartslaster..."
 
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:187
-msgid ""
-"<p><b>Boot Loader Type</b><br>\n"
-"To select whether to install a boot loader and which bootloader to install,\n"
-"use <b>Boot Loader</b>.</p>"
-msgstr ""
-"<p><b>Oppstartslastertype</b><br>\n"
-"Velg om en oppstartslaster skal installeres, og i så fall hvilken\n"
-"under <b>Oppstartslaster</b>.</p>"
+#. dialog header
+#: src/modules/Bootloader.rb:134
+msgid "Initializing Boot Loader Configuration"
+msgstr "Initialiserer konfigurasjon for oppstartslaster"
 
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:198
-msgid ""
-"<p><b>Boot Loader Options</b><br>\n"
-"To adjust options of the boot loader, such as the time-out, click\n"
-"<b>Boot Loader Options</b>.</p>"
-msgstr ""
-"<p><b>Oppstartslastervalg</b><br>\n"
-"For velge alternativer for oppstartslasteren, f.eks. forsinkelse, klikk på\n"
-"<b>Oppstartslastervalg</b>.</p>"
+#. progress stage, text in dialog (short)
+#: src/modules/Bootloader.rb:219
+msgid "Create initrd"
+msgstr "Opprett initrd"
 
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:209
-msgid ""
-"<P><B>Expert Manual Configuration</B><BR>\n"
-"Here, manually edit the boot loader configuration.</P>\n"
-"<P>Note: The final configuration file may have different indenting.</P>"
-msgstr ""
-"<P><B>Avansert manuell konfigurasjon</B><BR>\n"
-"Her kan du redigere oppstartslasterens konfigurasjon manuelt</P>\n"
-"<P>Merk: Den endelige konfigurasjonsfilen trenger ikke å ha samme tekstinnrykk.</P>"
+#. progress stage, text in dialog (short)
+#: src/modules/Bootloader.rb:221
+#, fuzzy
+#| msgid "Save boot loader configuration files"
+msgid "Save boot loader configuration"
+msgstr "Lagre konfigurasjonsfiler for oppstartslaster"
 
-#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:220
-msgid ""
-"<p><b>Section Name</b><br>\n"
-"Use <b>Section Name</b> to specify the boot loader section name. The section\n"
-"name must be unique.</p>"
-msgstr ""
-"<p><b>Seksjonsnavn</b><br>\n"
-"Klikk på <b>Seksjonsnavn</b> for å angi oppstartslasterseksjonens navn. Seksjonsnavnet\n"
-"må være unikt.</p>"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:225
+msgid "Creating initrd..."
+msgstr "Oppretter initrd..."
 
-#. help text 1/5
-#: src/include/bootloader/routines/helps.rb:231
-msgid ""
-"<p><big><b>Type of the New Section</b></big><br>\n"
-"Select the type of the new section to create.</p>"
-msgstr ""
-"<p><b><big>Ny seksjonstype</big></b><br>\n"
-"Velg hvilken ny seksjonstype som skal opprettes.</p>"
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:227
+#, fuzzy
+#| msgid "Saving bootloader configuration..."
+msgid "Saving boot loader configuration..."
+msgstr "Lagrer konfigurasjon for oppstartslaster..."
 
-#. help text 2/5
-#: src/include/bootloader/routines/helps.rb:235
-msgid ""
-"<p>Select <b>Clone Selected Section</b> to clone the currently selected\n"
-"section. Then modify the options that should differ from the\n"
-"selected section.</p>"
-msgstr ""
-"<p>Velg <b>Klon valgt seksjon</b> for å kopiere den valgte\n"
-"seksjonen. Deretter kan du endre alternativer\n"
-"som skal være annerledes.</p>"
+#. progress line
+#: src/modules/Bootloader.rb:233
+msgid "Saving Boot Loader Configuration"
+msgstr "Lagrer konfigurasjon for oppstartslaster"
 
-#. help text 3/5
-#: src/include/bootloader/routines/helps.rb:241
-msgid ""
-"<p>Select <b>Image Section</b> to add a new Linux kernel or other image\n"
-"to load and start.</p>"
-msgstr ""
-"<p>Velg <b>Diskbildeseksjon</b> for å legge til en ny Linux-kjerne eller et annet diskbilde\n"
-"som skal lastes og startes.</p>"
+#~ msgid "Configuration summary of boot loader"
+#~ msgstr "Konfigurasjonssammendrag for oppstartslaster"
 
-#. help text 4/5
-#: src/include/bootloader/routines/helps.rb:245
-msgid ""
-"<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n"
-"but to start it in a Xen environment.</p>"
-msgstr ""
-"<p>Velg <b>Xen-seksjon</b> hvis du vil legge til en ny Linux-kjerne eller et annet diskbilde,\n"
-"men starte den i et XEN-miljø.</p>"
+#, fuzzy
+#~| msgid "Set a global option"
+#~ msgid "Delete a global option"
+#~ msgstr "Definer et globalt alternativ"
 
-#. help text 5/5
-#: src/include/bootloader/routines/helps.rb:249
-msgid ""
-"<p>Select <b>Other System (Chainloader)</b> to add a section that \n"
-"loads and starts a boot sector of a partition of the disk. This is used for\n"
-"booting other operating systems.</p>"
-msgstr ""
-"<p>Velg <b>Annet system (Chainloader)</b> for å legge til en seksjon som \n"
-"skal laste og starte opp en oppstartssektor på en diskpartisjon. Dette valget benyttes for\n"
-"å starte opp andre operativsystemer.</p>"
+#~ msgid "Set a global option"
+#~ msgstr "Definer et globalt alternativ"
 
-#: src/include/bootloader/routines/helps.rb:254
-msgid ""
-"<p>Select <b>Menu Section</b> to add a section that \n"
-"loads configuration file (the list of boot sections) from a partition of the disk. This is used for\n"
-"booting other operating systems.</p>"
-msgstr ""
-"<p>Velg <b>Menyseksjon</b> for å legge til en seksjon som\n"
-"laster oppsettsfilen (listen over oppstartsseksjoner) fra en partisjon på disken. Dette benyttes for\n"
-"å starte opp andre operativsystemer.</p>"
+#~ msgid "Print value of specified option"
+#~ msgstr "Skriv ut verdien for det spesifiserte alternativet"
 
-#. part of summary, %1 is a list of hard disks device names
-#: src/include/bootloader/routines/lilolike.rb:108
-msgid "Order of Hard Disks: %1"
-msgstr "Harddiskrekkefølge: %1"
+#~ msgid "The key of the option"
+#~ msgstr "Alternativets kode"
 
-#. summary string
-#: src/include/bootloader/routines/misc.rb:51
-msgid "Do not install any boot loader"
-msgstr "Ikke installer noen oppstartslaster"
+#~ msgid "The value of the option"
+#~ msgstr "Alternativets verdi"
 
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:54
-msgid "Do Not Install Any Boot Loader"
-msgstr "Ikke installer noen oppstartslaster"
+#~ msgid "Value was not specified."
+#~ msgstr "Ingen verdi spesifisert."
 
-#. summary string
-#: src/include/bootloader/routines/misc.rb:60
-msgid "Install the default boot loader"
-msgstr "Installer standard oppstartslaster"
+#~ msgid "Option was not specified."
+#~ msgstr "Alternativ ikke spesifisert."
 
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:63
-msgid "Install Default Boot Loader"
-msgstr "Installer standard oppstartslaster"
+#, fuzzy
+#~| msgid "Value: %1"
+#~ msgid "Value: %s"
+#~ msgstr "Verdi: %1"
 
-#. summary string
-#: src/include/bootloader/routines/misc.rb:68
-msgid "Boot loader"
-msgstr "Oppstartslaster"
+#~ msgid "Specified option does not exist."
+#~ msgstr "Det spesifiserte alternativet finnes ikke."
 
-#. combo box item
-#: src/include/bootloader/routines/misc.rb:71
-msgid "Boot Loader"
-msgstr "Oppstartslaster"
+#~ msgid "<p><big><b>Boot Menu</b></big><br></p>"
+#~ msgstr "<p><big><b>Oppstartsmeny</b></big><br></p>"
 
-#. popup message
-#: src/include/bootloader/routines/popups.rb:35
-msgid ""
-"This function is not available if the boot\n"
-"loader is not specified."
-msgstr ""
-"Denne funksjonen er ikke tilgjengelig hvis ikke\n"
-"oppstartslasteren er spesifisert."
+#~ msgid ""
+#~ "<p><b>Boot from Boot Partition</b> is one of the recommended options, the other is\n"
+#~ "<b>Boot from Root Partition</b>.</p>"
+#~ msgstr ""
+#~ "<p><b>Start fra oppstartspartisjon</b> er ett av de anbefalte alternativene, det andre er \n"
+#~ "<b>Start fra rotpartisjon</b>.</p>"
 
-#. yes-no popup question
-#: src/include/bootloader/routines/popups.rb:48
-msgid ""
-"Really leave the boot loader configuration without saving?\n"
-"All changes will be lost.\n"
-msgstr ""
-"Er du sikker på at du vil avslutte konfigurasjonen av oppstartslasteren uten å lagre?\n"
-"Alle endringer vil gå tapt.\n"
+#~ msgid ""
+#~ "<p><b>Boot from Master Boot Record</b> is not recommended if you have another operating system\n"
+#~ "installed on your computer</p>"
+#~ msgstr ""
+#~ "<p><b>Start fra hovedoppstartssektor</b> anbefales ikke hvis du har et annet operativsystem\n"
+#~ "installert på datamaskinen</p>"
 
-#. error popup
-#: src/include/bootloader/routines/popups.rb:57
-msgid "The password must not be empty."
-msgstr "Passordfeltet må ikke være tomt."
+#~ msgid ""
+#~ "<p><b>Boot from Root Partition</b> is the recommended option whenever there is a suitable\n"
+#~ "partition. Either select <b>Set active Flag in Partition Table for Boot Partition</b> and <b>Write generic Boot Code to MBR</b>\n"
+#~ "in <b>Boot Loader Options</b> to update the master boot record if that is needed or configure your other boot manager\n"
+#~ "to start this section.</p>"
+#~ msgstr ""
+#~ "<p><b>Start fra rotpartisjon</b> er det anbefalte alternativet når det i det hele tatt finnes en egnet\n"
+#~ "partisjon. Du kan enten velge <b>Angi oppstartspartisjonen som aktiv i partisjonstabellen</b> og <b>Skriv generisk oppstartskode til MBR</b>\n"
+#~ " i <b>Oppstartslastervalg</b> for å oppdatere \"master boot record\" hvis det er nødvendig, eller konfigurere den andre oppstartslasteren\n"
+#~ " til å starte denne seksjonen.</p>"
 
-#. error popup
-#: src/include/bootloader/routines/popups.rb:66
-msgid ""
-"'Password' and 'Retype password'\n"
-"do not match. Retype the password."
-msgstr ""
-"'Passord og Bekreft passord'\n"
-"samsvarte ikke. Skriv inn passordet på nytt."
+#~ msgid "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"
+#~ msgstr "<p>Med <b>Egendefinert oppstartspartisjon</b> kan du velge hvilken partisjon du vil starte fra.</p>"
 
-#. Confirmation box with yes-no popup. %1 is reason why we need to set
-#. default location. It is translated on caller side and it is complete
-#. sentence.
-#: src/include/bootloader/routines/popups.rb:82
-msgid "%1Set default boot loader location?\n"
-msgstr "%1Definer oppstartslasterens plassering?\n"
+#~ 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 ""
+#~ "<p>MD-tilordning opprettes fra 2 disker. <b>Aktiver redundans for MD-tilordning</b>\n"
+#~ "aktiver lagring av GRUB i  MBR på begge disker.</p>"
 
-#. error popup
-#: src/include/bootloader/routines/popups.rb:90
-msgid ""
-"The name selected is already used.\n"
-"Use a different one.\n"
-msgstr ""
-"Navnet er allerede i bruk.\n"
-"Velg et annet.\n"
+#, fuzzy
+#~| msgid ""
+#~| "<p><b>Use Serial Console</b> lets you define the parameters to use\n"
+#~| "for a serial console. Please see the grub documentation (<code>info grub</code>) for details.</p>"
+#~ 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 grub2</code>) for details.</p>"
+#~ msgstr ""
+#~ "<p>Med <b>Bruk seriell konsoll</b> kan du definere parametere som skal brukes\n"
+#~ "for en seriell konsoll. Du finner mer informasjon i grub-dokumentasjonen (<code>info grub</code>).</p>"
 
-#. yes-no popup
-#: src/include/bootloader/routines/popups.rb:101
-msgid ""
-"An error occurred during boot loader\n"
-"installation. Retry boot loader configuration?\n"
-msgstr ""
-"En feil oppstod under installasjon av\n"
-"oppstartslasteren. Vil du forsøke å konfigurere oppstartslasteren på nytt?\n"
+#, fuzzy
+#~| 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"
+#~| "you have to specify <code>serial</code>. You can also pass <code>console</code> to the\n"
+#~| "command, as <code>serial console</code>. In this case, a terminal in which you\n"
+#~| "press any key will be selected as a GRUB terminal.</p>"
+#~ msgid ""
+#~ "<p><b>Terminal Definition</b></p><br>\n"
+#~ "Defines the type of terminal you want to use. For a serial terminal (e.g. a serial console),\n"
+#~ "you have to specify <code>serial</code>. You can also pass <code>console</code> to the\n"
+#~ "command, as <code>serial console</code>. In this case, a terminal in which you\n"
+#~ "press any key will be selected as a GRUB terminal.</p>"
+#~ msgstr ""
+#~ "<p><b>Terminaldefinisjon</b></p><br>\n"
+#~ "Definerer typen terminal du vil bruke. For en seriell terminal (f.eks. en seriell konsoll),\n"
+#~ " må du angi <code>seriell</code>. Du kan også sende <code>konsoll</code> til\n"
+#~ " kommandoen, som <code>seriell konsoll</code>. I dette tilfellet vil det bli valgt en terminal \n"
+#~ "der du kan trykke en hvilken som helst tast, som GRUB-terminal.</p>"
 
-#. warning popup. %1 is device name, %2 is date/time in form of
-#. 'date' command output
-#: src/include/bootloader/routines/popups.rb:125
-msgid ""
-"Warning!\n"
-"\n"
-"Current MBR of %1 will now be rewritten with MBR\n"
-"saved at %2.\n"
-"\n"
-"Only the booting code in the MBR will be rewritten.\n"
-"The partition table remains unchanged.\n"
-"\n"
-"Continue?\n"
-msgstr ""
-"Advarsel!\n"
-"\n"
-"Gjeldende MBR for %1 vil nå bli overskrevet av MBR\n"
-"lagret på %2.\n"
-"\n"
-"Kun oppstartskoden i MBR vil bli overskrevet.\n"
-"Partisjonstabellen vil være uendret.\n"
-"\n"
-"Vil du fortsette?\n"
+#~ 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 ""
+#~ "<p><b>Reserveseksjoner hvis standard mislykkes</b> inneholder en liste med numre \n"
+#~ "på seksjoner som blir brukt til oppstart hvis filsystemet i standardseksjonen ikke kan startes.</p>"
 
-#. PushButton
-#: src/include/bootloader/routines/popups.rb:147
-msgid "&Yes, Rewrite"
-msgstr "&Ja, overskriv"
+#~ msgid "Boot Loader Locations"
+#~ msgstr "Plassering av oppstartslaster"
 
-#. error report
-#: src/include/bootloader/routines/wizards.rb:36
-msgid "Because of the partitioning, the boot loader cannot be installed properly."
-msgstr "Oppstartslasteren kan ikke installeres riktig med denne partisjoneringen."
+#~ msgid "Custom Boot Partition"
+#~ msgstr "Egendefinert oppstartspartisjon"
 
-#. Represents dialog for modification of device map
-#: src/lib/bootloader/device_map_dialog.rb:53
-msgid "Device map must contain at least one device"
-msgstr "Enhetskartet må inneholde minst én enhet"
+#~ msgid "Boot from Master Boot Record"
+#~ msgstr "Start fra hovedoppstartssektor"
 
-#. we just go back to original dialog
-#: src/lib/bootloader/device_map_dialog.rb:96
-msgid "Disk order settings"
-msgstr "Innstillinger fir diskrekkefølge"
+#~ msgid "Boot from Boot Partition"
+#~ msgstr "Start fra oppstartspartisjon"
 
-#: src/lib/bootloader/device_map_dialog.rb:101
-msgid "D&isks"
-msgstr "D&isker"
+#~ msgid "Boot from Extended Partition"
+#~ msgstr "Start fra utvidet partisjon"
 
-#. textentry header
-#: src/lib/bootloader/device_map_dialog.rb:146
-msgid "&Device"
-msgstr "&Enhet"
+#~ msgid "Serial Connection &Parameters"
+#~ msgstr "&Parametere for seriell tilkobling"
 
-#. TRANSLATORS: %s stands for partition
-#: src/lib/bootloader/disk_change_detector.rb:47
-msgid "Selected custom bootloader partition %s is not available any more."
-msgstr ""
+#~ msgid "Fallback Sections if Default fails"
+#~ msgstr "Reserveseksjoner hvis standard mislykkes"
 
-#. TRANSLATORS the %{path} is path where bootloader stage1 is selected to install and
-#. the %{device} is device where it should be, but isn't
-#: src/lib/bootloader/disk_change_detector.rb:61
-msgid "Selected bootloader location %{path} is not on %{device} any more."
-msgstr ""
+#~ msgid "Pa&ssword for the Menu Interface"
+#~ msgstr "Pa&ssord for menygrensesnitt"
 
-#. Finish client for bootloader configuration
-#: src/lib/bootloader/finish_client.rb:28
-msgid "Saving bootloader configuration..."
-msgstr "Lagrer konfigurasjon for oppstartslaster..."
+#~ msgid "Debugg&ing Flag"
+#~ msgstr "Feilsøk&ingsvalg"
 
-#. TRANSLATORS: reboot message
-#. %1 is replaced with additional message from reIPL
-#: src/lib/bootloader/finish_client.rb:145
+#~ msgid "&Password"
+#~ msgstr "&Passord"
+
+#~ msgid "Boot from &Root Partition"
+#~ msgstr "Start fra &rotpartisjon"
+
+#~ msgid "Enable Red&undancy for MD Array"
+#~ msgstr "Aktiver red&undans for MD-tilordning"
+
+#~ msgid "Boot Loader Options"
+#~ msgstr "Alternativer for oppstartslaster"
+
+#~ msgid "Secure Boot"
+#~ msgstr "Sikker oppstart"
+
 #, fuzzy
-#| msgid ""
-#| "\n"
-#| "Your system will now shut down.%1%2\n"
-#| "For details, read the related chapter \n"
-#| "in the documentation. \n"
-msgid ""
-"\n"
-"Your system will now shut down.%1\n"
-"For details, read the related chapter \n"
-"in the documentation. \n"
-msgstr ""
-"\n"
-"Systemet vil bli slått av.%1%2\n"
-"Du finner mer informasjon i det aktuelle kapittelet \n"
-"i dokumentasjonen. \n"
+#~| msgid "Boot Loader Location"
+#~ msgid "Boot &Loader Location"
+#~ msgstr "Oppstartslasterens plassering"
 
-#. Final message after all packages from CD1 are installed
-#. and we're ready to start (boot into) the installed system
-#. Message that will be displayed along with information
-#. how the boot loader was installed
-#: src/lib/bootloader/finish_client.rb:158
-msgid "The system will reboot now..."
-msgstr "Maskinen vil bli startet på nytt nå..."
+#~ msgid "<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>"
+#~ msgstr "<p><b>VGA-modus</b> definerer VGA-modusen for <i>konsollen</i> kjernen skal stille inn ved oppstart.</p>"
 
-#. proposal part - bootloader label
-#: src/lib/bootloader/proposal_client.rb:94
-msgid "Booting"
-msgstr "Oppstart"
+#~ msgid "&Vga Mode"
+#~ msgstr "&VGA-modus"
 
-#. menubutton entry
-#: src/lib/bootloader/proposal_client.rb:96
-msgid "&Booting"
-msgstr "&Oppstart"
+#~ msgid "%1x%2, %3 bits (mode %4)"
+#~ msgstr "%1x%2, %3 bits (modus %4)"
 
-#. warning text in the summary richtext
-#: src/lib/bootloader/proposal_client.rb:174
-msgid "No boot loader is selected for installation. Your system might not be bootable."
-msgstr "Ingen oppstartslaster er valgt for installasjon. Systemet vil kanskje ikke kunne startes opp."
+#~ msgid "Standard 8-pixel font mode."
+#~ msgstr "Standard skrifttypemodus med 8 piksler."
 
-#. error in the proposal
-#: src/lib/bootloader/proposal_client.rb:183
-msgid "Because of the partitioning, the bootloader cannot be installed properly"
-msgstr "Oppstartslasteren kan ikke installeres riktig med denne partisjoneringen"
+#~ msgid "Text Mode"
+#~ msgstr "Tekstmodus"
 
-#. FATE#303643 Enable one-click changes in bootloader proposal
-#.
-#: src/modules/BootGRUB2.rb:168
-#, fuzzy
-#| msgid "Boot from MBR is enabled (disable</a>"
-msgid "Install bootcode into MBR (do not install</a>)"
-msgstr "Oppstart fra MBR er aktivert (deaktiver</a>"
+#~ msgid "Unspecified"
+#~ msgstr "Uspesifisert"
 
-#: src/modules/BootGRUB2.rb:172
-#, fuzzy
-#| msgid "Boot from MBR is disabled (enable</a>"
-msgid "Do not install bootcode into MBR (install</a>)"
-msgstr "Oppstart fra MBR er deaktivert (aktiver</a>"
+#~ msgid "Select File"
+#~ msgstr "Velg fil"
 
-#. check for separated boot partition, use root otherwise
-#: src/modules/BootGRUB2.rb:185
-#, fuzzy
-#| msgid "Boot from /boot partition is enabled (disable</a>"
-msgid "Install bootcode into /boot partition (do not install</a>)"
-msgstr "Oppstart fra /boot-partisjon er aktivert (deaktiver</a>"
+#~ msgid "There are no options to set for the current boot loader."
+#~ msgstr "Ingen tilgjengelige valg for denne oppstartslasteren."
 
-#: src/modules/BootGRUB2.rb:189
-#, fuzzy
-#| msgid "Boot from /boot partition is disabled (enable</a>"
-msgid "Do not install bootcode into /boot partition (install</a>)"
-msgstr "Oppstart fra /boot-partisjon er deaktivert (aktiver</a>"
+#~ msgid "E&dit Configuration Files"
+#~ msgstr "&Rediger konfigurasjonsfiler"
 
-#: src/modules/BootGRUB2.rb:195
-#, fuzzy
-#| msgid "Boot from \"/\" partition is enabled (disable</a>"
-msgid "Install bootcode into \"/\" partition (do not install</a>)"
-msgstr "Oppstart fra «/»-partisjon er aktivert (deaktiver</a>"
+#~ msgid "&Propose New Configuration"
+#~ msgstr "&Foreslå ny konfigurasjon"
 
-#: src/modules/BootGRUB2.rb:199
-#, fuzzy
-#| msgid "Boot from \"/\" partition is disabled (enable</a>"
-msgid "Do not install bootcode into \"/\" partition (install</a>)"
-msgstr "Oppstart fra «/»-partisjon er deaktivert (aktiver</a>"
+#~ msgid "&Start from Scratch"
+#~ msgstr "&Lag helt ny"
 
-#. no location chosen, so warn user that it is problem unless he is sure
-#: src/modules/BootGRUB2.rb:209
-msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
-msgstr ""
+#~ msgid "&Reread Configuration from Disk"
+#~ msgstr "&Bruk konfigurasjon fra disk"
 
-#. TRANSLATORS: title for list of location proposals
-#: src/modules/BootGRUB2.rb:217
-#, fuzzy
-#| msgid "Change Location: %1"
-msgid "Change Location: %s"
-msgstr "Endre plassering: %1"
+#~ msgid "Restore MBR of Hard Disk"
+#~ msgstr "Gjenopprett MBR på harddisk"
 
-#. Display bootloader summary
-#. @return a list of summary lines
-#. Display bootloader summary
-#. @return a list of summary lines
-#: src/modules/BootGRUB2.rb:226 src/modules/BootGRUB2EFI.rb:100
-msgid "Boot Loader Type: %1"
-msgstr "Oppstartslastertype: %1"
+#~ msgid "Write bootloader boot code to disk"
+#~ msgstr "Skriv oppstartskode for oppstartslaster til disk"
 
-#. TRANSLATORS: extended is here for extended partition. Keep translation short.
-#: src/modules/BootGRUB2.rb:237
-msgid " (extended)"
-msgstr " (utvidet)"
+#~ msgid "Other"
+#~ msgstr "Annet"
 
-#. 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/BootGRUB2.rb:245
-msgid " (MBR)"
-msgstr " (MBR)"
+#~ msgid "MBR restored successfully."
+#~ msgstr "MBR gjenopprettet."
 
-#: src/modules/BootGRUB2.rb:252
-msgid "Status Location: %1"
-msgstr "Status for plassering: %1"
+#~ msgid "Failed to restore MBR."
+#~ msgstr "MBR kunne ikke gjenopprettes."
 
-#: src/modules/BootGRUB2EFI.rb:108
-msgid "Enable Secure Boot: %1"
-msgstr "Aktiver sikker oppstart: %1"
+#~ msgid "Writing bootloader settings failed."
+#~ msgstr "Oppstartslasterinnstillingene kunne ikke lagres."
 
-#. Check that bootloader is known and supported
-#: src/modules/BootSupportCheck.rb:65
-msgid "Unknown bootloader: %1"
-msgstr "Ukjent oppstartslaster: %1"
+#~ msgid "Boot &Loader Options"
+#~ msgstr "Oppstarts&lastervalg"
 
-#. grub2 is sooo cool...
-#: src/modules/BootSupportCheck.rb:99
-msgid "Unsupported combination of hardware platform %1 and bootloader %2"
-msgstr "En kombinasjon av maskinvareplattformen %1 og oppstartslasteren %2 støttes ikke"
+#~ msgid "Boot Loader Installation &Details"
+#~ msgstr "&Informasjon om oppstartslasterinstallasjon"
 
-#. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation.
-#: src/modules/BootSupportCheck.rb:139
-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 ""
+#~ msgid ""
+#~ "<P>From <B>Other</B>,\n"
+#~ "you can manually edit the boot loader configuration files, clear the current \n"
+#~ "configuration and propose a new configuration, start from scratch, or reread\n"
+#~ "the configuration saved on your disk. %1</P>"
+#~ msgstr ""
+#~ "<P>Under <B>Annet</B>\n"
+#~ "kan du redigere konfigurasjonsfilene for oppstartslasteren manuelt, slette gjeldende \n"
+#~ "konfigurasjon og foreslå en ny konfigurasjon, starte på nytt eller bruke\n"
+#~ "konfigurasjonen som er lagret på disken som utgangspunkt. %1</P>"
 
-#. check if boot device is on raid0
-#: src/modules/BootSupportCheck.rb:167
-msgid "The boot device is on raid type: %1. System will not boot."
-msgstr "Oppstartsenheten er på raid-typen: %1. Systemet vil ikke starte opp."
+#~ msgid ""
+#~ "<P>To edit boot loader configuration files\n"
+#~ "manually, click <B>Edit Configuration Files</B>.</P>"
+#~ msgstr ""
+#~ "<P>For å redigere konfigurasjonsfiler for oppstartslasteren\n"
+#~ "manuelt, klikk <B>Rediger konfigurasjonsfiler</B>.</P>"
 
-#. bnc#501043 added check for valid configuration
-#: src/modules/BootSupportCheck.rb:187
-msgid "The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record"
-msgstr "Oppstartsenheten er plassert på programvarebasert RAID1. Velg en annen plassering for oppstartslasteren, f.eks. Master Boot Record."
+#~ msgid ""
+#~ "<P> In the table, each section represents one item\n"
+#~ "in the boot menu.</P>"
+#~ msgstr ""
+#~ "<P> I tabellen representerer hver seksjon én oppføring\n"
+#~ "i oppstartsmenyen.</P>"
 
-#. if partitioning worked before upgrade, it will keep working (bnc#886604)
-#: src/modules/BootSupportCheck.rb:239
-msgid "Missing ext partition for booting. Cannot install boot code."
-msgstr ""
+#~ msgid ""
+#~ "<P> Press <B>Edit</B> to display the properties of the\n"
+#~ "selected section.</P>"
+#~ msgstr ""
+#~ "<P> Klikk <B>Rediger</B> for å vise egenskapene til den\n"
+#~ "valgte seksjonen.</P>"
 
-#. activate set or there is already activate flag
-#: src/modules/BootSupportCheck.rb:248
-msgid "Activate flag is not set by installer. If it is not set at all, some BIOSes could refuse to boot."
-msgstr ""
+#~ msgid ""
+#~ "<P> By pressing <b>Set as Default</b>, mark the selected \n"
+#~ "section as default. When booting, the boot loader will provide \n"
+#~ "a boot menu and wait for the user to select the kernel or other \n"
+#~ "OS to boot. If no key is pressed before the time-out, the default \n"
+#~ "kernel or OS will be booted. The order of sections in the boot loader\n"
+#~ "menu can be changed using the <B>Up</B> and <B>Down</B> buttons.</P>"
+#~ msgstr ""
+#~ "<P>Ved å klikke <b>Bruk som standard</b> markerer du den valgte\n"
+#~ "seksjonen som standard. Ved oppstart vil oppstartslasteren vise \n"
+#~ "en oppstartsmeny og vente på at brukeren skal velge en kjerne eller \n"
+#~ "et annet operativsystem som skal startes. Dersom ingen tast blir trykket inn før forsinkelsen, blir standardkjernen \n"
+#~ "eller -operativsystemet lastet. Rekkefølgen for seksjonene i oppstartsmenyen\n"
+#~ "kan endres ved å bruke <B>Opp</B>- og <B>Ned</B>knappene.</P>"
 
-#: src/modules/BootSupportCheck.rb:255
-msgid "The installer will not modify the MBR of the disk. Unless it already contains boot code, the BIOS won't be able to boot disk."
-msgstr ""
+#~ msgid ""
+#~ "<P>Press <B>Add</B> to create a new boot loader section\n"
+#~ "or <B>Delete</B> to delete the selected section.</P>"
+#~ msgstr ""
+#~ "<P>Klikk <B>Legg til</B> for å opprette en ny oppstartslasterseksjon\n"
+#~ "eller <B>Slett</B> for å slette den valgte seksjonen.</P>"
 
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:146
-msgid "Check boot loader"
-msgstr "Kontroller oppstartslaster"
+#~ msgid ""
+#~ "<p><big><b>Boot Loader Location</b></big><br>\n"
+#~ "The boot manager (%1) can be installed in the following ways:</p>"
+#~ msgstr ""
+#~ "<p><big><b>Oppstartslasterplassering</b></big><br>\n"
+#~ "Oppstartslasteren (%1) kan installeres på følgende måter:</p>"
 
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:148
-msgid "Read partitioning"
-msgstr "Les partisjonstabell"
+#~ msgid ""
+#~ "<p>- In the <b>Master Boot Record</b> (MBR).\n"
+#~ "This is not recommended if there is another operating system installed\n"
+#~ "on the computer.</p>"
+#~ msgstr ""
+#~ "<p>- I <b>Master Boot Record</b> (MBR).\n"
+#~ "Dette anbefales ikke dersom et annet operativsystem er installert\n"
+#~ "på datamaskinen.</p>"
 
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:150
-msgid "Load boot loader settings"
-msgstr "Last innstillinger for oppstartslaster"
+#~ msgid ""
+#~ "<p>\n"
+#~ "- In the <b>Boot Sector</b> of the <tt>/boot</tt> or <tt>/</tt> (root) \n"
+#~ "partition.  This is the recommended option whenever there is a suitable\n"
+#~ "partition. Either set <b>Activate Boot Loader Partition</b> and\n"
+#~ "<b>Replace MBR with Generic Code</b> in <b>Boot Loader Installation Details</b>\n"
+#~ "to update the master boot record\n"
+#~ "if it is needed or configure your other boot manager\n"
+#~ "to start &product;.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "- I <b>Oppstartssektor</b> på <tt>/boot</tt>- eller <tt>/</tt> (root)\n"
+#~ "-partisjonen.  Dette anbefales hvis det finnes en egnet\n"
+#~ "partisjon. Velg enten <b>Aktiver oppstartslasterpartisjon</b> og\n"
+#~ "<b>Erstatt MBR med generisk kode</b> under <b>Informasjon om oppstartslasterinstallasjon</b>\n"
+#~ "for å oppdatere master boot record\n"
+#~ "hvis dette er nødvendig, eller konfigurer den andre oppstartslasteren\n"
+#~ "for å starte &product;.</p>"
 
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:154
-msgid "Checking boot loader..."
-msgstr "Kontrollerer oppstartslaster..."
+#~ msgid ""
+#~ "<p>\n"
+#~ "- In some <b>Other</b> partition. Consider your system's restrictions\n"
+#~ "when selecting this option.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "- På en <b>annen</b> partisjon. Tenk på hva som er mulig i systemet\n"
+#~ "hvis du velger dette alternativet.</p>"
 
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:156
-msgid "Reading partitioning..."
-msgstr "Leser partisjonstabell..."
+#~ msgid ""
+#~ "<p>For example, most PCs have a BIOS\n"
+#~ "limit that restricts booting to\n"
+#~ "hard disk cylinders smaller than 1024. Depending on the boot manager used,\n"
+#~ "you may or may not be able to boot from a logical partition.</p>"
+#~ msgstr ""
+#~ "<p>De fleste PC-er har for eksempel begrensninger i BIOS\n"
+#~ "som hindrer oppstart fra\n"
+#~ "harddisksylindre under 1024. Avhengig av oppstartslaster,\n"
+#~ "er det kanskje mulig å starte opp fra en logisk partisjon, og kanskje ikke.</p>"
 
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:158
-msgid "Loading boot loader settings..."
-msgstr "Laster innstillinger for oppstartslaster..."
+#~ msgid ""
+#~ "<p>\n"
+#~ "Enter the device name of the partition (for example, <tt>/dev/hda3</tt> or\n"
+#~ "<tt>/dev/sdb</tt>) in the input field.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "Angi partisjonens enhetsnavn (for eksempel, <tt>/dev/hda3</tt> eller\n"
+#~ "<tt>/dev/sdb</tt>) i feltet.</p>"
 
-#. dialog header
-#: src/modules/Bootloader.rb:162
-msgid "Initializing Boot Loader Configuration"
-msgstr "Initialiserer konfigurasjon for oppstartslaster"
+#~ msgid ""
+#~ "<p><b>Boot Loader Installation Details</b><br>\n"
+#~ "To adjust advanced boot loader installation options (such as the device\n"
+#~ "mapping), click <b>Boot Loader Installation Details</b>.</p>"
+#~ msgstr ""
+#~ "<p><b>Informasjon om oppstartslasterinstallasjon</b><br>\n"
+#~ "Bruk avanserte valg for oppstartslasterinstallasjonen (for eksempel\n"
+#~ "enhetsmapping) under <b>Informasjon om oppstartslasterinstallasjon</b>.</p>"
 
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:281
-msgid "Create initrd"
-msgstr "Opprett initrd"
+#~ msgid ""
+#~ "<p><b>Boot Loader Options</b><br>\n"
+#~ "To adjust options of the boot loader, such as the time-out, click\n"
+#~ "<b>Boot Loader Options</b>.</p>"
+#~ msgstr ""
+#~ "<p><b>Oppstartslastervalg</b><br>\n"
+#~ "For velge alternativer for oppstartslasteren, f.eks. forsinkelse, klikk på\n"
+#~ "<b>Oppstartslastervalg</b>.</p>"
 
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:283
-msgid "Save boot loader configuration files"
-msgstr "Lagre konfigurasjonsfiler for oppstartslaster"
+#~ msgid ""
+#~ "<P><B>Expert Manual Configuration</B><BR>\n"
+#~ "Here, manually edit the boot loader configuration.</P>\n"
+#~ "<P>Note: The final configuration file may have different indenting.</P>"
+#~ msgstr ""
+#~ "<P><B>Avansert manuell konfigurasjon</B><BR>\n"
+#~ "Her kan du redigere oppstartslasterens konfigurasjon manuelt</P>\n"
+#~ "<P>Merk: Den endelige konfigurasjonsfilen trenger ikke å ha samme tekstinnrykk.</P>"
 
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:285
-msgid "Install boot loader"
-msgstr "Installer oppstartslaster"
+#~ msgid ""
+#~ "<p><b>Section Name</b><br>\n"
+#~ "Use <b>Section Name</b> to specify the boot loader section name. The section\n"
+#~ "name must be unique.</p>"
+#~ msgstr ""
+#~ "<p><b>Seksjonsnavn</b><br>\n"
+#~ "Klikk på <b>Seksjonsnavn</b> for å angi oppstartslasterseksjonens navn. Seksjonsnavnet\n"
+#~ "må være unikt.</p>"
 
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:289
-msgid "Creating initrd..."
-msgstr "Oppretter initrd..."
+#~ msgid ""
+#~ "<p><big><b>Type of the New Section</b></big><br>\n"
+#~ "Select the type of the new section to create.</p>"
+#~ msgstr ""
+#~ "<p><b><big>Ny seksjonstype</big></b><br>\n"
+#~ "Velg hvilken ny seksjonstype som skal opprettes.</p>"
 
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:291
-msgid "Saving boot loader configuration files..."
-msgstr "Lagrer konfigurasjonsfiler for oppstartslaster..."
+#~ msgid ""
+#~ "<p>Select <b>Clone Selected Section</b> to clone the currently selected\n"
+#~ "section. Then modify the options that should differ from the\n"
+#~ "selected section.</p>"
+#~ msgstr ""
+#~ "<p>Velg <b>Klon valgt seksjon</b> for å kopiere den valgte\n"
+#~ "seksjonen. Deretter kan du endre alternativer\n"
+#~ "som skal være annerledes.</p>"
 
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:293
-msgid "Installing boot loader..."
-msgstr "Installerer oppstartslaster..."
+#~ msgid ""
+#~ "<p>Select <b>Image Section</b> to add a new Linux kernel or other image\n"
+#~ "to load and start.</p>"
+#~ msgstr ""
+#~ "<p>Velg <b>Diskbildeseksjon</b> for å legge til en ny Linux-kjerne eller et annet diskbilde\n"
+#~ "som skal lastes og startes.</p>"
 
-#. progress line
-#: src/modules/Bootloader.rb:299
-msgid "Saving Boot Loader Configuration"
-msgstr "Lagrer konfigurasjon for oppstartslaster"
+#~ msgid ""
+#~ "<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n"
+#~ "but to start it in a Xen environment.</p>"
+#~ msgstr ""
+#~ "<p>Velg <b>Xen-seksjon</b> hvis du vil legge til en ny Linux-kjerne eller et annet diskbilde,\n"
+#~ "men starte den i et XEN-miljø.</p>"
 
+#~ msgid ""
+#~ "<p>Select <b>Other System (Chainloader)</b> to add a section that \n"
+#~ "loads and starts a boot sector of a partition of the disk. This is used for\n"
+#~ "booting other operating systems.</p>"
+#~ msgstr ""
+#~ "<p>Velg <b>Annet system (Chainloader)</b> for å legge til en seksjon som \n"
+#~ "skal laste og starte opp en oppstartssektor på en diskpartisjon. Dette valget benyttes for\n"
+#~ "å starte opp andre operativsystemer.</p>"
+
+#~ msgid ""
+#~ "<p>Select <b>Menu Section</b> to add a section that \n"
+#~ "loads configuration file (the list of boot sections) from a partition of the disk. This is used for\n"
+#~ "booting other operating systems.</p>"
+#~ msgstr ""
+#~ "<p>Velg <b>Menyseksjon</b> for å legge til en seksjon som\n"
+#~ "laster oppsettsfilen (listen over oppstartsseksjoner) fra en partisjon på disken. Dette benyttes for\n"
+#~ "å starte opp andre operativsystemer.</p>"
+
+#~ msgid "Do Not Install Any Boot Loader"
+#~ msgstr "Ikke installer noen oppstartslaster"
+
+#~ msgid "Install the default boot loader"
+#~ msgstr "Installer standard oppstartslaster"
+
+#~ msgid "Install Default Boot Loader"
+#~ msgstr "Installer standard oppstartslaster"
+
+#~ msgid "Boot loader"
+#~ msgstr "Oppstartslaster"
+
+#~ msgid "Boot Loader"
+#~ msgstr "Oppstartslaster"
+
+#~ msgid ""
+#~ "This function is not available if the boot\n"
+#~ "loader is not specified."
+#~ msgstr ""
+#~ "Denne funksjonen er ikke tilgjengelig hvis ikke\n"
+#~ "oppstartslasteren er spesifisert."
+
+#~ msgid ""
+#~ "Really leave the boot loader configuration without saving?\n"
+#~ "All changes will be lost.\n"
+#~ msgstr ""
+#~ "Er du sikker på at du vil avslutte konfigurasjonen av oppstartslasteren uten å lagre?\n"
+#~ "Alle endringer vil gå tapt.\n"
+
+#~ msgid "%1Set default boot loader location?\n"
+#~ msgstr "%1Definer oppstartslasterens plassering?\n"
+
+#~ msgid ""
+#~ "The name selected is already used.\n"
+#~ "Use a different one.\n"
+#~ msgstr ""
+#~ "Navnet er allerede i bruk.\n"
+#~ "Velg et annet.\n"
+
+#~ msgid ""
+#~ "An error occurred during boot loader\n"
+#~ "installation. Retry boot loader configuration?\n"
+#~ msgstr ""
+#~ "En feil oppstod under installasjon av\n"
+#~ "oppstartslasteren. Vil du forsøke å konfigurere oppstartslasteren på nytt?\n"
+
+#~ msgid ""
+#~ "Warning!\n"
+#~ "\n"
+#~ "Current MBR of %1 will now be rewritten with MBR\n"
+#~ "saved at %2.\n"
+#~ "\n"
+#~ "Only the booting code in the MBR will be rewritten.\n"
+#~ "The partition table remains unchanged.\n"
+#~ "\n"
+#~ "Continue?\n"
+#~ msgstr ""
+#~ "Advarsel!\n"
+#~ "\n"
+#~ "Gjeldende MBR for %1 vil nå bli overskrevet av MBR\n"
+#~ "lagret på %2.\n"
+#~ "\n"
+#~ "Kun oppstartskoden i MBR vil bli overskrevet.\n"
+#~ "Partisjonstabellen vil være uendret.\n"
+#~ "\n"
+#~ "Vil du fortsette?\n"
+
+#~ msgid "&Yes, Rewrite"
+#~ msgstr "&Ja, overskriv"
+
+#~ msgid "Unknown bootloader: %1"
+#~ msgstr "Ukjent oppstartslaster: %1"
+
+#~ msgid "Install boot loader"
+#~ msgstr "Installer oppstartslaster"
+
+#~ msgid "Saving boot loader configuration files..."
+#~ msgstr "Lagrer konfigurasjonsfiler for oppstartslaster..."
+
+#~ msgid "Installing boot loader..."
+#~ msgstr "Installerer oppstartslaster..."
+
 #, fuzzy
 #~| msgid "Distribution:"
 #~ msgid "D&istributor"
@@ -1376,9 +1227,6 @@
 #~ msgid "Section name must be specified."
 #~ msgstr "Et seksjonsnavn må spesifiseres."
 
-#~ msgid "Disk Order"
-#~ msgstr "Diskrekkefølge"
-
 #~ msgid "Boot Menu"
 #~ msgstr "Oppstartsmeny"
 
@@ -1821,9 +1669,6 @@
 #~ msgid " (\"/\")"
 #~ msgstr " (\"/\")"
 
-#~ msgid " (default)"
-#~ msgstr " (standard)"
-
 #~ msgid "Sections:<br>%1"
 #~ msgstr "Seksjoner:<br>%1"
 
@@ -2601,9 +2446,6 @@
 #~ msgid "image"
 #~ msgstr "diskbilde"
 
-#~ msgid "Yes"
-#~ msgstr "Ja"
-
 #~ msgid "No"
 #~ msgstr "Nei"
 

Modified: trunk/yast/nb/po/ca-management.nb.po
===================================================================
--- trunk/yast/nb/po/ca-management.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/ca-management.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: ca-management.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2009-08-08 08:33+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -140,8 +140,7 @@
 #: src/clients/ca_mgm_auto.rb:235 src/clients/ca_mgm_auto.rb:362
 #: src/clients/ca_mgm_proposal.rb:301 src/clients/ca_select_proposal.rb:466
 #: src/include/ca-management/new_cert.rb:573
-#: src/include/ca-management/util.rb:277
-#: src/include/ca-management/util.rb:1211
+#: src/include/ca-management/util.rb:277 src/include/ca-management/util.rb:1211
 msgid "&Password:"
 msgstr "&Passord:"
 
@@ -213,8 +212,7 @@
 #: src/clients/ca_mgm_auto.rb:478 src/clients/ca_mgm_auto.rb:536
 #: src/clients/ca_mgm_proposal.rb:320 src/clients/ca_select_proposal.rb:536
 #: src/include/ca-management/util.rb:216 src/include/ca-management/util.rb:565
-#: src/include/ca-management/util.rb:777
-#: src/include/ca-management/util.rb:1121
+#: src/include/ca-management/util.rb:777 src/include/ca-management/util.rb:1121
 msgid "New passwords do not match."
 msgstr "Nye passord samsvarer ikke."
 
@@ -1919,14 +1917,14 @@
 
 #. Creating default CA/Certificate
 #. @return [Boolean] ( success )
-#: src/include/ca-management/new_cert_read_write.rb:1890
+#: src/include/ca-management/new_cert_read_write.rb:1891
 msgid "Creating certificate..."
 msgstr "Oppretter sertifikat..."
 
 #. Creating server certificate
 #. Exporting to common server certificate
-#: src/include/ca-management/new_cert_read_write.rb:1932
-#: src/include/ca-management/new_cert_read_write.rb:2013
+#: src/include/ca-management/new_cert_read_write.rb:1933
+#: src/include/ca-management/new_cert_read_write.rb:2014
 msgid ""
 "The default certificate can also be created in\n"
 "the CA Management module.\n"
@@ -1935,28 +1933,27 @@
 "modulen CA-administrasjon.\n"
 
 #. To translators: ContinueCancel Popup headline
-#: src/include/ca-management/popup.rb:50
+#: src/include/ca-management/popup.rb:52
 msgid "Finish"
 msgstr "Fullfør"
 
 #. To translators: ContinueCancel Popup
-#: src/include/ca-management/popup.rb:52
+#: src/include/ca-management/popup.rb:54
 msgid "Really save configuration ?"
 msgstr "Er du sikker på at du vil lagre konfigurasjonen?"
 
 #. To translators: YesNo Popup headline
-#: src/include/ca-management/popup.rb:64
+#: src/include/ca-management/popup.rb:66
 msgid "Exit"
 msgstr "Avslutt"
 
 #. To translators: YesNo Popup
-#: src/include/ca-management/popup.rb:66
+#: src/include/ca-management/popup.rb:68
 msgid "Really exit configuration without saving ?"
 msgstr "Er du sikker på at du vil avslutte konfigurasjonen uten å lagre?"
 
-#. Popup displaying openssl error messages
-#. @return [void]
-#: src/include/ca-management/popup.rb:88
+#. Show description while normal installation only.(bnc#962328)
+#: src/include/ca-management/popup.rb:91
 msgid "Details"
 msgstr "Detaljer"
 
@@ -2241,8 +2238,7 @@
 msgid "LDAP P&assword:"
 msgstr "LDAP-p&assord:"
 
-#: src/include/ca-management/util.rb:375
-#: src/include/ca-management/util.rb:1032
+#: src/include/ca-management/util.rb:375 src/include/ca-management/util.rb:1032
 #: src/include/ca-management/util.rb:1388
 msgid "Certificate &Password:"
 msgstr "Sertifikat-p&assord:"
@@ -2290,28 +2286,23 @@
 msgid "Ce&rtificate and the Key Unencrypted in PEM Format"
 msgstr "Se&rtifikat og nøkkel ukryptert i PEM-format"
 
-#: src/include/ca-management/util.rb:665
-#: src/include/ca-management/util.rb:1002
+#: src/include/ca-management/util.rb:665 src/include/ca-management/util.rb:1002
 msgid "C&ertificate and the Key Encrypted in PEM Format"
 msgstr "S&ertifikat og nøkkel kryptert i PEM-format"
 
-#: src/include/ca-management/util.rb:672
-#: src/include/ca-management/util.rb:1009
+#: src/include/ca-management/util.rb:672 src/include/ca-management/util.rb:1009
 msgid "&Certificate in DER Format"
 msgstr "&Sertifikat i DER-format"
 
-#: src/include/ca-management/util.rb:679
-#: src/include/ca-management/util.rb:1016
+#: src/include/ca-management/util.rb:679 src/include/ca-management/util.rb:1016
 msgid "Cer&tificate and the Key in PKCS12 Format"
 msgstr "Ser&tifikat og nøkkel i PKCS12-format"
 
-#: src/include/ca-management/util.rb:686
-#: src/include/ca-management/util.rb:1023
+#: src/include/ca-management/util.rb:686 src/include/ca-management/util.rb:1023
 msgid "&Like PKCS12 and Include the CA Chain"
 msgstr "&Som PKCS12 og inkluder CA-kjede"
 
-#: src/include/ca-management/util.rb:693
-#: src/include/ca-management/util.rb:1035
+#: src/include/ca-management/util.rb:693 src/include/ca-management/util.rb:1035
 msgid "&New Password"
 msgstr "&Nytt passord"
 

Modified: trunk/yast/nb/po/cio.nb.po
===================================================================
--- trunk/yast/nb/po/cio.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/cio.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2002-06-17 14:33+0200\n"
 "Last-Translator: www.linuxbutikken.no \n"
 "Language-Team: Norwegian \n"
@@ -45,13 +45,13 @@
 msgstr "Brukt"
 
 #: src/lib/iochannel/channels_dialog.rb:142
+msgid "no"
+msgstr "nei"
+
+#: src/lib/iochannel/channels_dialog.rb:142
 msgid "yes"
 msgstr "ja"
 
-#: src/lib/iochannel/channels_dialog.rb:142
-msgid "no"
-msgstr "nei"
-
 #. filter can be empty if dialog is not yet created
 #: src/lib/iochannel/channels_dialog.rb:160
 #, fuzzy

Modified: trunk/yast/nb/po/cluster.nb.po
===================================================================
--- trunk/yast/nb/po/cluster.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/cluster.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2002-06-17 14:33+0200\n"
 "Last-Translator: www.linuxbutikken.no \n"
 "Language-Team: Norwegian \n"
@@ -143,7 +143,7 @@
 msgstr "Test lyden når kortet er konfigurert"
 
 #: src/include/cluster/dialogs.rb:228 src/include/cluster/dialogs.rb:256
-#: src/include/cluster/dialogs.rb:1427
+#: src/include/cluster/dialogs.rb:1429
 msgid "The Multicast Address has to be fulfilled"
 msgstr ""
 
@@ -171,7 +171,7 @@
 msgstr "Bind-nettverksadresse:"
 
 #: src/include/cluster/dialogs.rb:460 src/include/cluster/dialogs.rb:478
-#: src/include/cluster/dialogs.rb:1363
+#: src/include/cluster/dialogs.rb:1365
 msgid "Multicast Address:"
 msgstr "Multikastadresse:"
 
@@ -225,133 +225,133 @@
 msgstr ""
 
 #. Notice, current could be "nil" if the list is empty.
-#: src/include/cluster/dialogs.rb:715
+#: src/include/cluster/dialogs.rb:717
 msgid "Enable Security Auth"
 msgstr "Aktiver sikkerhetsautorisasjon"
 
-#: src/include/cluster/dialogs.rb:719
+#: src/include/cluster/dialogs.rb:721
 #, fuzzy
 #| msgid "For newly created cluster, push the button below to generate /etc/corosync/authkey."
 msgid "For a newly created cluster, push the button below to generate /etc/corosync/authkey."
 msgstr "Bruk knappen nedenfor fo rå generere /etc/corosync/authkey for en nyopprettet klynge."
 
-#: src/include/cluster/dialogs.rb:724
+#: src/include/cluster/dialogs.rb:726
 msgid "To join an existing cluster, please copy /etc/corosync/authkey from other nodes manually."
 msgstr "For å bli medlem i en eksisterende klynge, kopier /etc/corosync/authkey manuelt fra andre noder."
 
-#: src/include/cluster/dialogs.rb:750
+#: src/include/cluster/dialogs.rb:752
 msgid "Failed to create /etc/corosync/authkey"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:752
+#: src/include/cluster/dialogs.rb:754
 msgid "Create /etc/corosync/authkey succeeded"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:813 src/include/cluster/dialogs.rb:883
+#: src/include/cluster/dialogs.rb:815 src/include/cluster/dialogs.rb:885
 msgid "Running"
 msgstr "Kjører"
 
-#: src/include/cluster/dialogs.rb:815
+#: src/include/cluster/dialogs.rb:817
 msgid "Not running"
 msgstr "Kjører ikke"
 
 #. servie:cluster is the  name of /etc/sysconfig/SuSEfirewall2.d/services/cluster
-#: src/include/cluster/dialogs.rb:851
+#: src/include/cluster/dialogs.rb:853
 msgid "Booting"
 msgstr "Oppstart"
 
-#: src/include/cluster/dialogs.rb:861
+#: src/include/cluster/dialogs.rb:863
 #, fuzzy
 #| msgid "On -- Start openais at booting"
 msgid "On -- Start pacemaker during boot"
 msgstr "På -- Start openais ved oppstart"
 
-#: src/include/cluster/dialogs.rb:868
+#: src/include/cluster/dialogs.rb:870
 #, fuzzy
 #| msgid "Off -- Start openais manually only"
 msgid "Off -- Start pacemaker manually"
 msgstr "Av -- Start openais manuelt"
 
-#: src/include/cluster/dialogs.rb:877
+#: src/include/cluster/dialogs.rb:879
 msgid "Switch On and Off"
 msgstr "Aktivere og deaktivere"
 
-#: src/include/cluster/dialogs.rb:882
+#: src/include/cluster/dialogs.rb:884
 msgid "Current Status: "
 msgstr "Gjeldende status: "
 
-#: src/include/cluster/dialogs.rb:891
+#: src/include/cluster/dialogs.rb:893
 #, fuzzy
 #| msgid "Start openais Now"
 msgid "Start pacemaker Now"
 msgstr "Start openais nå"
 
-#: src/include/cluster/dialogs.rb:892
+#: src/include/cluster/dialogs.rb:894
 #, fuzzy
 #| msgid "Stop openais Now"
 msgid "Stop pacemaker Now"
 msgstr "Stopp openais nå"
 
 #. BNC#874563,stop pacemaker could stop corosync since BNC#872651 is fixed
-#: src/include/cluster/dialogs.rb:990
+#: src/include/cluster/dialogs.rb:992
 msgid "Sync Host"
 msgstr "Synkroniseringsvert"
 
-#: src/include/cluster/dialogs.rb:994 src/include/cluster/dialogs.rb:1006
+#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
 msgid "Add"
 msgstr "Legg til"
 
-#: src/include/cluster/dialogs.rb:995 src/include/cluster/dialogs.rb:1007
+#: src/include/cluster/dialogs.rb:997 src/include/cluster/dialogs.rb:1009
 msgid "Del"
 msgstr "Slett"
 
-#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
+#: src/include/cluster/dialogs.rb:998 src/include/cluster/dialogs.rb:1010
 msgid "Edit"
 msgstr "Rediger"
 
-#: src/include/cluster/dialogs.rb:1002
+#: src/include/cluster/dialogs.rb:1004
 msgid "Sync File"
 msgstr "Synkroniseringsfil"
 
-#: src/include/cluster/dialogs.rb:1009
+#: src/include/cluster/dialogs.rb:1011
 msgid "Add Suggested Files"
 msgstr "Legg til foreslåtte filer"
 
-#: src/include/cluster/dialogs.rb:1018
+#: src/include/cluster/dialogs.rb:1020
 msgid "Generate Pre-Shared-Keys"
 msgstr "Generer forhåndsdelte nøkler"
 
 #. remove duplicated elements
-#: src/include/cluster/dialogs.rb:1143
+#: src/include/cluster/dialogs.rb:1145
 msgid "Csync2 Status Unknown"
 msgstr "Ukjent Csync2-status"
 
-#: src/include/cluster/dialogs.rb:1146
+#: src/include/cluster/dialogs.rb:1148
 msgid "Turn csync2 ON"
 msgstr "Slå PÅ csync2"
 
-#: src/include/cluster/dialogs.rb:1149
+#: src/include/cluster/dialogs.rb:1151
 msgid "Turn csync2 OFF"
 msgstr "Slå AV csync2"
 
-#: src/include/cluster/dialogs.rb:1179
+#: src/include/cluster/dialogs.rb:1181
 msgid "Enter a hostname"
 msgstr "Angi et vertsnavn."
 
-#: src/include/cluster/dialogs.rb:1193
+#: src/include/cluster/dialogs.rb:1195
 msgid "Edit the hostname"
 msgstr "Endre vertsnavn"
 
-#: src/include/cluster/dialogs.rb:1207
+#: src/include/cluster/dialogs.rb:1209
 msgid "Enter a filename to synchronize"
 msgstr "Angi et navnet på en fil som skal synkroniseres"
 
-#: src/include/cluster/dialogs.rb:1222
+#: src/include/cluster/dialogs.rb:1224
 msgid "Edit the filename"
 msgstr "Endre filnavn"
 
 #. key file exist
-#: src/include/cluster/dialogs.rb:1254
+#: src/include/cluster/dialogs.rb:1256
 msgid ""
 "Key file %1 already exist.\n"
 "Do you want to overwrite it?"
@@ -360,12 +360,12 @@
 "Vil du overskrive den?"
 
 #. remove exist key file
-#: src/include/cluster/dialogs.rb:1264
+#: src/include/cluster/dialogs.rb:1266
 msgid "Delete key file %1 failed."
 msgstr "Nøkkelfilen %1 kunne ikke slettes."
 
 #. generate key file
-#: src/include/cluster/dialogs.rb:1278
+#: src/include/cluster/dialogs.rb:1280
 msgid ""
 "Key file %1 is generated.\n"
 "Clicking \"Add Suggested Files\" button adds it to sync list."
@@ -373,35 +373,35 @@
 "Nøkkelfilen %1 er generert.\n"
 "Klikk på «Legg til foreslåtte filer» for å legge den til i synkroniseringslisten."
 
-#: src/include/cluster/dialogs.rb:1285
+#: src/include/cluster/dialogs.rb:1287
 msgid "Key generation failed."
 msgstr "Nøkkelen ble ikke genererert."
 
 #. SaveCsync2();
-#: src/include/cluster/dialogs.rb:1347
+#: src/include/cluster/dialogs.rb:1349
 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:1358
+#: src/include/cluster/dialogs.rb:1360
 msgid "Dedicated Interface:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1361
+#: src/include/cluster/dialogs.rb:1363
 msgid "IP:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1364
+#: src/include/cluster/dialogs.rb:1366
 msgid "Group Number:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1368
+#: src/include/cluster/dialogs.rb:1370
 msgid "Generate /etc/conntrackd/conntrackd.conf"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1435
+#: src/include/cluster/dialogs.rb:1437
 #, fuzzy
 #| msgid "The value for pos must be a positive integer."
 msgid "The Group Number must be a positive integer"
@@ -547,103 +547,103 @@
 msgstr "Initialiserer ..."
 
 #. Cluster read dialog caption
-#: src/modules/Cluster.rb:390
+#: src/modules/Cluster.rb:394
 #, fuzzy
 #| msgid "Initializing Cluster Configuration"
 msgid "Initializing cluster Configuration"
 msgstr "Initialiserer klyngeoppsett"
 
 #. Progress stage 1/3
-#: src/modules/Cluster.rb:406
+#: src/modules/Cluster.rb:410
 msgid "Read the database"
 msgstr "Les databasen"
 
 #. Progress stage 2/3
-#: src/modules/Cluster.rb:408
+#: src/modules/Cluster.rb:412
 msgid "Read the previous settings"
 msgstr "Les tidligere innstillinger"
 
 #. Progress stage 3/3
-#: src/modules/Cluster.rb:410
+#: src/modules/Cluster.rb:414
 msgid "Read SuSEFirewall Settings"
 msgstr "Les brannmurinnstillinger"
 
 #. Progress step 1/3
-#: src/modules/Cluster.rb:414
+#: src/modules/Cluster.rb:418
 msgid "Reading the database..."
 msgstr "Leser databasen..."
 
 #. Progress step 2/3
-#: src/modules/Cluster.rb:416
+#: src/modules/Cluster.rb:420
 msgid "Reading the previous settings..."
 msgstr "Leser tidligere innstillinger..."
 
 #. Progress step 3/3
-#: src/modules/Cluster.rb:418
+#: src/modules/Cluster.rb:422
 msgid "Reading SuSEFirewall settings..."
 msgstr "Leser brannmurinnstillinger..."
 
 #. Progress finished
 #. Progress finished
-#: src/modules/Cluster.rb:420 src/modules/Cluster.rb:522
+#: src/modules/Cluster.rb:424 src/modules/Cluster.rb:526
 msgid "Finished"
 msgstr "Fullført"
 
-#: src/modules/Cluster.rb:435
+#: src/modules/Cluster.rb:439
 msgid "Cannot install required package"
 msgstr "Kan ikke installere nødvendig pakke"
 
 #. read database
-#: src/modules/Cluster.rb:444
+#: src/modules/Cluster.rb:448
 #, fuzzy
 #| msgid "Cannot load existing configuration."
 msgid "Cannot load existing configuration"
 msgstr "Kan ikke laste gjeldende oppsett."
 
 #. Error message
-#: src/modules/Cluster.rb:455
+#: src/modules/Cluster.rb:459
 msgid "Cannot read database1."
 msgstr "Kan ikke lese database1."
 
 #. Error message
-#: src/modules/Cluster.rb:463
+#: src/modules/Cluster.rb:467
 msgid "Cannot read database2."
 msgstr "Kan ikke lese database2."
 
 #. Error message
-#: src/modules/Cluster.rb:479
+#: src/modules/Cluster.rb:483
 msgid "Cannot detect devices."
 msgstr "Finner ingen enheter."
 
 #. Cluster read dialog caption
-#: src/modules/Cluster.rb:497
+#: src/modules/Cluster.rb:501
 #, fuzzy
 #| msgid "Saving Cluster Configuration"
 msgid "Saving cluster Configuration"
 msgstr "Lagrer klyngeoppsett"
 
 #. Progress stage 1/2
-#: src/modules/Cluster.rb:512
+#: src/modules/Cluster.rb:516
 msgid "Write the settings"
 msgstr "Lagre innstillingene"
 
 #. Progress stage 2/2
-#: src/modules/Cluster.rb:514
+#: src/modules/Cluster.rb:518
 msgid "Save changes to SuSEFirewall"
 msgstr "Lagre endringer i brannmuroppsett"
 
 #. Progress step 1/2
-#: src/modules/Cluster.rb:518
+#: src/modules/Cluster.rb:522
 msgid "Writing the settings..."
 msgstr "Lagrer innstillingene..."
 
 #. Progress step 2/2
-#: src/modules/Cluster.rb:520
+#: src/modules/Cluster.rb:524
 msgid "Saving changes to SuSEFirewall..."
 msgstr "Lagrer endringer i brannmuroppsett..."
 
 #. Error message
-#: src/modules/Cluster.rb:532
+#: src/modules/Cluster.rb:536
 msgid "Cannot write settings."
 msgstr "Kan ikke lagre innstillingene."
 

Modified: trunk/yast/nb/po/control.nb.po
===================================================================
--- trunk/yast/nb/po/control.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/control.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: control\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2009-10-01 12:19+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -24,326 +24,683 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.0\n"
 
-#: control/control.openSUSE.glade.translations.glade:3
+#: control/control.SLED.glade.translations.glade:3
 #, fuzzy
 #| msgid ""
 #| "\n"
-#| "<p><b>Congratulations!</b></p>\n"
-#| "<p>The installation of openSUSE on your machine is complete.\n"
-#| "After clicking <b>Finish</b>, you can log in to the system.</p>\n"
-#| "<p>Visit us at %1.</p>\n"
-#| "<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
-#| "\t    "
+#| "<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"
 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"
-"            "
+"<p>\n"
+"The installation has completed successfully.\n"
+"Your system is ready for use.\n"
+"Click <b>Finish</b> to log in to the system.\n"
+"</p>\n"
+"<p>\n"
+"Please visit us at http://www.suse.com/.\n"
+"</p>\n"
+"        "
 msgstr ""
 "\n"
-"<p><b>Gratulerer!</b></p>\n"
-"<p>Installasjonen av openSUSE på maskinen er fullført.\n"
-"Etter at du har klikket på <b>Fullfør</b>, kan du logge på systemet.</p>\n"
-"<p>Besøk oss på %1.</p>\n"
-"<p>Ha det gøy!<br>openSUSE-utviklerne</p>\n"
+"<p>\n"
+"Installasjonen er fullført.\n"
+"Systemet er klart til bruk.\n"
+"Klikk Fullfør for å logge på systemet.\n"
+"</p>\n"
+"<p>\n"
+"Besøk oss på http://www.suse.com/.\n"
+"</p>\n"
 "\t"
 
-#: control/control.openSUSE.glade.translations.glade:10
-msgid ""
-"The desktop environment on your computer provides the graphical user\n"
-"interface for your computer, as well as a suite of applications for\n"
-"email, Web browsing, office productivity, games, and utilities to\n"
-"manage your computer.\n"
-"\n"
-"openSUSE offers a choice of desktop environments.  The most widely\n"
-"used desktop environments are GNOME and KDE, and they are equally\n"
-"supported under openSUSE. Both desktop environments are easy to use,\n"
-"highly integrated, and have an attractive look and feel. Each desktop\n"
-"environment has a distinct style, so personal taste determines which\n"
-"is the most appropriate desktop for you."
-msgstr ""
-"Skrivebordsmiljøet for datamaskinen utgjør datamaskinens grafiske\n"
-"brukergrensesnitt, og omfatter et sett programmer for\n"
-"e-post, nettlesing, kontorarbeid, spill og verktøy for å\n"
-"administrere datamaskinen.\n"
-"\n"
-"openSUSE tilbyr ulike skrivebordsmiljøer.  De mest\n"
-"brukte skrivebordsmiljøene er GNOME og KDE. Disse har like god\n"
-"støtte i openSUSE. Begge disse skrivebordsmiljøene er enkle å bruke,\n"
-"er godt integrert og har elegant utforming. De to\n"
-"skrivebordsmiljøene har sitt særpreg, så det er opp til deg\n"
-"hvilket skrivebord du foretrekker."
+#: control/control.SLED.glade.translations.glade:15
+#: control/control.SLES.glade.translations.glade:14
+msgid "CIM Server"
+msgstr "CIM-server"
 
-#: control/control.openSUSE.glade.translations.glade:21
-msgid "GNOME Desktop"
-msgstr "GNOME-skrivebord"
-
-#: control/control.openSUSE.glade.translations.glade:22
-msgid "KDE Desktop"
-msgstr "KDE-skrivebord"
-
-#: control/control.openSUSE.glade.translations.glade:23
-msgid "XFCE Desktop"
-msgstr "XFCE-skrivebordet"
-
-#: control/control.openSUSE.glade.translations.glade:24
-msgid "LXDE Desktop"
-msgstr "LXDE-skrivebord"
-
-#: control/control.openSUSE.glade.translations.glade:25
-msgid "Minimal X Window"
-msgstr "Minimalt grafisk grensesnitt"
-
-#: control/control.openSUSE.glade.translations.glade:26
-msgid "Enlightenment Desktop"
-msgstr "Skrivebordsmiljøet Enlightenment"
-
-#: control/control.openSUSE.glade.translations.glade:27
-msgid "Minimal Server Selection (Text Mode)"
-msgstr "Server uten grafisk grensesnitt (tekstmodus)"
-
-#: control/control.openSUSE.glade.translations.glade:28
+#: control/control.SLED.glade.translations.glade:16
+#: control/control.SLED.glade.translations.glade:17
+#: control/control.SLED.glade.translations.glade:22
+#: control/control.SLED.glade.translations.glade:58
+#: control/control.SLED.glade.translations.glade:59
+#: control/control.SLES.glade.translations.glade:37
+#: control/control.SLES.glade.translations.glade:38
+#: control/control.SLES.glade.translations.glade:39
+#: control/control.SLES.glade.translations.glade:44
+#: control/control.SLES.glade.translations.glade:45
+#: control/control.SLES.glade.translations.glade:82
+#: control/control.SLES.glade.translations.glade:83
 #: control/control.openSUSE.glade.translations.glade:29
-#: control/control.openSUSE.glade.translations.glade:32
-#: control/control.openSUSE.glade.translations.glade:70
-#: control/control.openSUSE.glade.translations.glade:71
+#: control/control.openSUSE.glade.translations.glade:30
+#: control/control.openSUSE.glade.translations.glade:33
+#: control/control.openSUSE.glade.translations.glade:73
+#: control/control.openSUSE.glade.translations.glade:74
 msgid "Installation Settings"
 msgstr "Installasjonsinnstillinger"
 
-#: control/control.openSUSE.glade.translations.glade:30
+#: control/control.SLED.glade.translations.glade:18
+#: control/control.SLES.glade.translations.glade:40
+msgid "Overview"
+msgstr "Oversikt"
+
+#: control/control.SLED.glade.translations.glade:19
+#: control/control.SLES.glade.translations.glade:41
+msgid "Expert"
+msgstr "Avansert"
+
+#: control/control.SLED.glade.translations.glade:20
+#: control/control.SLES.glade.translations.glade:42
+#: control/control.openSUSE.glade.translations.glade:31
 msgid "Live Installation Settings"
 msgstr "Live-installasjonsinnstillinger"
 
-#: control/control.openSUSE.glade.translations.glade:31
-#: control/control.openSUSE.glade.translations.glade:85
+#: control/control.SLED.glade.translations.glade:21
+#: control/control.SLES.glade.translations.glade:43
+#: control/control.openSUSE.glade.translations.glade:32
+#: control/control.openSUSE.glade.translations.glade:89
 msgid "Update Settings"
 msgstr "Oppdater innstillinger"
 
-#: control/control.openSUSE.glade.translations.glade:33
+#: control/control.SLED.glade.translations.glade:23
+#: control/control.SLES.glade.translations.glade:46
+#: control/control.SLES.glade.translations.glade:47
+#: control/control.openSUSE.glade.translations.glade:34
 msgid "Network Configuration"
 msgstr "Nettverkskonfigurasjon"
 
-#: control/control.openSUSE.glade.translations.glade:34
+#: control/control.SLED.glade.translations.glade:24
+#: control/control.SLES.glade.translations.glade:49
+#: control/control.SLES.glade.translations.glade:50
+#: control/control.SLES.glade.translations.glade:51
+#: control/control.openSUSE.glade.translations.glade:35
 msgid "Hardware Configuration"
 msgstr "Maskinvarekonfigurasjon"
 
-#: control/control.openSUSE.glade.translations.glade:35
-#: control/control.openSUSE.glade.translations.glade:77
-#: control/control.openSUSE.glade.translations.glade:103
+#: control/control.SLED.glade.translations.glade:25
+#: control/control.SLED.glade.translations.glade:65
+#: control/control.SLED.glade.translations.glade:96
+#: control/control.SLES.glade.translations.glade:52
+#: control/control.SLES.glade.translations.glade:89
+#: control/control.SLES.glade.translations.glade:119
+#: control/control.openSUSE.glade.translations.glade:36
+#: control/control.openSUSE.glade.translations.glade:80
+#: control/control.openSUSE.glade.translations.glade:110
 msgid "Preparation"
 msgstr "Forberedelser"
 
-#: control/control.openSUSE.glade.translations.glade:36
-#: control/control.openSUSE.glade.translations.glade:63
+#: control/control.SLED.glade.translations.glade:26
+#: control/control.SLED.glade.translations.glade:52
+#: control/control.SLED.glade.translations.glade:66
+#: control/control.openSUSE.glade.translations.glade:37
+#: control/control.openSUSE.glade.translations.glade:66
 #, fuzzy
 #| msgid "Saving Network Configuration"
 msgid "Load linuxrc Network Configuration"
 msgstr "Lagrer nettverksoppsett"
 
-#: control/control.openSUSE.glade.translations.glade:37
-#: control/control.openSUSE.glade.translations.glade:64
+#: control/control.SLED.glade.translations.glade:27
+#: control/control.SLED.glade.translations.glade:53
+#: control/control.SLED.glade.translations.glade:67
+#: control/control.SLES.glade.translations.glade:54
+#: control/control.SLES.glade.translations.glade:77
+#: control/control.SLES.glade.translations.glade:91
+#: control/control.openSUSE.glade.translations.glade:38
+#: control/control.openSUSE.glade.translations.glade:67
 #, fuzzy
 #| msgid "Network Setup"
 msgid "Network Autosetup"
 msgstr "Nettverksinnstillinger"
 
-#: control/control.openSUSE.glade.translations.glade:38
-#: control/control.openSUSE.glade.translations.glade:65
-#: control/control.openSUSE.glade.translations.glade:78
+#: control/control.SLED.glade.translations.glade:28
+#: control/control.SLED.glade.translations.glade:54
+#: control/control.SLED.glade.translations.glade:68
+#: control/control.SLES.glade.translations.glade:55
+#: control/control.SLES.glade.translations.glade:78
+#: control/control.SLES.glade.translations.glade:92
+#: control/control.openSUSE.glade.translations.glade:39
+#: control/control.openSUSE.glade.translations.glade:68
+#: control/control.openSUSE.glade.translations.glade:81
 msgid "Welcome"
 msgstr "Velkommen"
 
-#: control/control.openSUSE.glade.translations.glade:39
+#: control/control.SLED.glade.translations.glade:29
+#: control/control.SLED.glade.translations.glade:55
+#: control/control.SLED.glade.translations.glade:69
+#: control/control.SLES.glade.translations.glade:56
+#: control/control.SLES.glade.translations.glade:79
+#: control/control.SLES.glade.translations.glade:93
+#: control/control.openSUSE.glade.translations.glade:40
 msgid "Network Activation"
 msgstr "Nettverksaktivering"
 
-#: control/control.openSUSE.glade.translations.glade:40
-#: control/control.openSUSE.glade.translations.glade:79
+#: control/control.SLED.glade.translations.glade:30
+#: control/control.SLED.glade.translations.glade:70
+#: control/control.SLES.glade.translations.glade:57
+#: control/control.SLES.glade.translations.glade:94
+#: control/control.openSUSE.glade.translations.glade:41
+#: control/control.openSUSE.glade.translations.glade:82
 msgid "Disk Activation"
 msgstr "Diskaktivering"
 
-#: control/control.openSUSE.glade.translations.glade:41
+#: control/control.SLED.glade.translations.glade:31
+#: control/control.SLED.glade.translations.glade:33
+#: control/control.SLED.glade.translations.glade:71
+#: control/control.SLED.glade.translations.glade:97
+#: control/control.SLES.glade.translations.glade:58
+#: control/control.SLES.glade.translations.glade:60
+#: control/control.SLES.glade.translations.glade:95
+#: control/control.SLES.glade.translations.glade:120
 #: control/control.openSUSE.glade.translations.glade:42
-#: control/control.openSUSE.glade.translations.glade:80
-#: control/control.openSUSE.glade.translations.glade:104
+#: control/control.openSUSE.glade.translations.glade:44
+#: control/control.openSUSE.glade.translations.glade:83
+#: control/control.openSUSE.glade.translations.glade:111
 msgid "System Analysis"
 msgstr "Systemanalyse"
 
+#: control/control.SLED.glade.translations.glade:32
+#: control/control.SLED.glade.translations.glade:72
+#: control/control.SLED.glade.translations.glade:85
+#: control/control.SLED.glade.translations.glade:100
+#: control/control.SLES.glade.translations.glade:59
+#: control/control.SLES.glade.translations.glade:96
+#: control/control.SLES.glade.translations.glade:109
+#: control/control.SLES.glade.translations.glade:123
 #: control/control.openSUSE.glade.translations.glade:43
-#: control/control.openSUSE.glade.translations.glade:67
+#: control/control.openSUSE.glade.translations.glade:84
+#: control/control.openSUSE.glade.translations.glade:99
+#: control/control.openSUSE.glade.translations.glade:114
+#, fuzzy
+#| msgid "Online Update"
+msgid "Installer Update"
+msgstr "Online-oppdatering"
+
+#: control/control.SLED.glade.translations.glade:34
+#: control/control.SLED.glade.translations.glade:74
+#: control/control.SLES.glade.translations.glade:61
+#: control/control.SLES.glade.translations.glade:98
+#: control/control.openSUSE.glade.translations.glade:48
+#: control/control.openSUSE.glade.translations.glade:87
+msgid "Add-On Products"
+msgstr "Tilleggsprodukter"
+
+#: control/control.SLED.glade.translations.glade:35
+#: control/control.SLED.glade.translations.glade:56
+#: control/control.SLES.glade.translations.glade:62
+#: control/control.SLES.glade.translations.glade:80
+#: control/control.openSUSE.glade.translations.glade:45
+#: control/control.openSUSE.glade.translations.glade:70
 msgid "Disk"
 msgstr "Disk"
 
-#: control/control.openSUSE.glade.translations.glade:44
-#: control/control.openSUSE.glade.translations.glade:66
+#: control/control.SLED.glade.translations.glade:36
+#: control/control.SLED.glade.translations.glade:57
+#: control/control.SLES.glade.translations.glade:63
+#: control/control.SLES.glade.translations.glade:81
+#: control/control.openSUSE.glade.translations.glade:46
+#: control/control.openSUSE.glade.translations.glade:69
 msgid "Time Zone"
 msgstr "Tidssone"
 
-#: control/control.openSUSE.glade.translations.glade:45
-#: control/control.openSUSE.glade.translations.glade:82
-msgid "Online Repositories"
-msgstr "online-pakkebrønner"
-
-#: control/control.openSUSE.glade.translations.glade:46
-#: control/control.openSUSE.glade.translations.glade:83
-msgid "Add-On Products"
-msgstr "Tilleggsprodukter"
-
-#: control/control.openSUSE.glade.translations.glade:47
-msgid "Desktop Selection"
-msgstr "Skrivebordsvalg"
-
-#: control/control.openSUSE.glade.translations.glade:48
-#: control/control.openSUSE.glade.translations.glade:49
-#: control/control.openSUSE.glade.translations.glade:68
-#: control/control.openSUSE.glade.translations.glade:69
+#: control/control.SLED.glade.translations.glade:37
+#: control/control.SLED.glade.translations.glade:38
+#: control/control.openSUSE.glade.translations.glade:50
+#: control/control.openSUSE.glade.translations.glade:51
+#: control/control.openSUSE.glade.translations.glade:71
+#: control/control.openSUSE.glade.translations.glade:72
 msgid "User Settings"
 msgstr "Brukerinnstillinger"
 
-#: control/control.openSUSE.glade.translations.glade:50
-#: control/control.openSUSE.glade.translations.glade:62
-msgid "Installation"
-msgstr "Installasjon"
-
-#: control/control.openSUSE.glade.translations.glade:51
+#: control/control.SLED.glade.translations.glade:39
+#: control/control.openSUSE.glade.translations.glade:53
 msgid "Installation Overview"
 msgstr "Installasjonsoversikt"
 
-#: control/control.openSUSE.glade.translations.glade:52
-#: control/control.openSUSE.glade.translations.glade:53
+#: control/control.SLED.glade.translations.glade:40
+#: control/control.SLED.glade.translations.glade:41
+#: control/control.SLED.glade.translations.glade:42
+#: control/control.SLED.glade.translations.glade:44
+#: control/control.SLED.glade.translations.glade:45
+#: control/control.SLED.glade.translations.glade:46
+#: control/control.SLED.glade.translations.glade:47
+#: control/control.SLED.glade.translations.glade:48
+#: control/control.SLED.glade.translations.glade:49
+#: control/control.SLED.glade.translations.glade:50
+#: control/control.SLED.glade.translations.glade:60
+#: control/control.SLED.glade.translations.glade:61
+#: control/control.SLED.glade.translations.glade:62
+#: control/control.SLED.glade.translations.glade:63
+#: control/control.SLED.glade.translations.glade:64
+#: control/control.SLED.glade.translations.glade:88
+#: control/control.SLED.glade.translations.glade:89
+#: control/control.SLED.glade.translations.glade:91
+#: control/control.SLED.glade.translations.glade:92
+#: control/control.SLED.glade.translations.glade:93
+#: control/control.SLED.glade.translations.glade:94
+#: control/control.SLED.glade.translations.glade:95
+#: control/control.SLED.glade.translations.glade:112
+#: control/control.SLED.glade.translations.glade:113
+#: control/control.SLED.glade.translations.glade:114
+#: control/control.SLES.glade.translations.glade:66
+#: control/control.SLES.glade.translations.glade:67
+#: control/control.SLES.glade.translations.glade:69
+#: control/control.SLES.glade.translations.glade:70
+#: control/control.SLES.glade.translations.glade:71
+#: control/control.SLES.glade.translations.glade:72
+#: control/control.SLES.glade.translations.glade:73
+#: control/control.SLES.glade.translations.glade:74
+#: control/control.SLES.glade.translations.glade:84
+#: control/control.SLES.glade.translations.glade:85
+#: control/control.SLES.glade.translations.glade:86
+#: control/control.SLES.glade.translations.glade:87
+#: control/control.SLES.glade.translations.glade:88
+#: control/control.SLES.glade.translations.glade:112
+#: control/control.SLES.glade.translations.glade:113
+#: control/control.SLES.glade.translations.glade:115
+#: control/control.SLES.glade.translations.glade:116
+#: control/control.SLES.glade.translations.glade:117
+#: control/control.SLES.glade.translations.glade:118
+#: control/control.SLES.glade.translations.glade:135
+#: control/control.SLES.glade.translations.glade:136
+#: control/control.SLES.glade.translations.glade:137
 #: control/control.openSUSE.glade.translations.glade:54
 #: control/control.openSUSE.glade.translations.glade:55
 #: control/control.openSUSE.glade.translations.glade:56
-#: control/control.openSUSE.glade.translations.glade:57
 #: control/control.openSUSE.glade.translations.glade:58
 #: control/control.openSUSE.glade.translations.glade:59
 #: control/control.openSUSE.glade.translations.glade:60
 #: control/control.openSUSE.glade.translations.glade:61
-#: control/control.openSUSE.glade.translations.glade:72
-#: control/control.openSUSE.glade.translations.glade:73
-#: control/control.openSUSE.glade.translations.glade:74
+#: control/control.openSUSE.glade.translations.glade:62
+#: control/control.openSUSE.glade.translations.glade:63
+#: control/control.openSUSE.glade.translations.glade:64
 #: control/control.openSUSE.glade.translations.glade:75
 #: control/control.openSUSE.glade.translations.glade:76
-#: control/control.openSUSE.glade.translations.glade:96
-#: control/control.openSUSE.glade.translations.glade:97
-#: control/control.openSUSE.glade.translations.glade:98
-#: control/control.openSUSE.glade.translations.glade:99
-#: control/control.openSUSE.glade.translations.glade:100
-#: control/control.openSUSE.glade.translations.glade:101
+#: control/control.openSUSE.glade.translations.glade:77
+#: control/control.openSUSE.glade.translations.glade:78
+#: control/control.openSUSE.glade.translations.glade:79
 #: control/control.openSUSE.glade.translations.glade:102
-#: control/control.openSUSE.glade.translations.glade:117
-#: control/control.openSUSE.glade.translations.glade:118
-#: control/control.openSUSE.glade.translations.glade:119
+#: control/control.openSUSE.glade.translations.glade:103
+#: control/control.openSUSE.glade.translations.glade:105
+#: control/control.openSUSE.glade.translations.glade:106
+#: control/control.openSUSE.glade.translations.glade:107
+#: control/control.openSUSE.glade.translations.glade:108
+#: control/control.openSUSE.glade.translations.glade:109
+#: control/control.openSUSE.glade.translations.glade:126
+#: control/control.openSUSE.glade.translations.glade:127
+#: control/control.openSUSE.glade.translations.glade:128
 msgid "Perform Installation"
 msgstr "Utfør installasjon"
 
-#: control/control.openSUSE.glade.translations.glade:81
-#: control/control.openSUSE.glade.translations.glade:105
+#: control/control.SLED.glade.translations.glade:43
+#: control/control.SLED.glade.translations.glade:79
+#: control/control.SLED.glade.translations.glade:90
+#: control/control.SLED.glade.translations.glade:107
+#: control/control.SLES.glade.translations.glade:68
+#: control/control.SLES.glade.translations.glade:103
+#: control/control.SLES.glade.translations.glade:114
+#: control/control.SLES.glade.translations.glade:130
+#: control/control.openSUSE.glade.translations.glade:57
+#: control/control.openSUSE.glade.translations.glade:92
+#: control/control.openSUSE.glade.translations.glade:104
+#: control/control.openSUSE.glade.translations.glade:121
+#, fuzzy
+#| msgid "Installation"
+msgid "Installer Cleanup"
+msgstr "Installasjon"
+
+#: control/control.SLED.glade.translations.glade:51
+#: control/control.SLES.glade.translations.glade:64
+#: control/control.SLES.glade.translations.glade:75
+#: control/control.openSUSE.glade.translations.glade:52
+#: control/control.openSUSE.glade.translations.glade:65
+msgid "Installation"
+msgstr "Installasjon"
+
+#: control/control.SLED.glade.translations.glade:73
+#: control/control.SLED.glade.translations.glade:98
+#: control/control.SLES.glade.translations.glade:97
+#: control/control.SLES.glade.translations.glade:121
+#: control/control.openSUSE.glade.translations.glade:85
+#: control/control.openSUSE.glade.translations.glade:112
 msgid "System for Update"
 msgstr "System som skal oppgraderes"
 
-#: control/control.openSUSE.glade.translations.glade:84
-#: control/control.openSUSE.glade.translations.glade:108
+#: control/control.SLED.glade.translations.glade:75
+#: control/control.SLED.glade.translations.glade:102
+#: control/control.SLES.glade.translations.glade:99
+#: control/control.SLES.glade.translations.glade:125
+#: control/control.openSUSE.glade.translations.glade:88
+#: control/control.openSUSE.glade.translations.glade:116
 msgid "Update"
 msgstr "Oppgradering"
 
-#: control/control.openSUSE.glade.translations.glade:86
-#: control/control.openSUSE.glade.translations.glade:87
-#: control/control.openSUSE.glade.translations.glade:88
-#: control/control.openSUSE.glade.translations.glade:89
+#: control/control.SLED.glade.translations.glade:76
+#: control/control.SLES.glade.translations.glade:100
+msgid "Update Summary"
+msgstr "Oppgraderingssammendrag"
+
+#: control/control.SLED.glade.translations.glade:77
+#: control/control.SLED.glade.translations.glade:78
+#: control/control.SLED.glade.translations.glade:80
+#: control/control.SLED.glade.translations.glade:81
+#: control/control.SLED.glade.translations.glade:82
+#: control/control.SLED.glade.translations.glade:104
+#: control/control.SLED.glade.translations.glade:105
+#: control/control.SLED.glade.translations.glade:106
+#: control/control.SLED.glade.translations.glade:108
+#: control/control.SLED.glade.translations.glade:109
+#: control/control.SLED.glade.translations.glade:110
+#: control/control.SLED.glade.translations.glade:111
+#: control/control.SLED.glade.translations.glade:117
+#: control/control.SLED.glade.translations.glade:118
+#: control/control.SLES.glade.translations.glade:101
+#: control/control.SLES.glade.translations.glade:102
+#: control/control.SLES.glade.translations.glade:104
+#: control/control.SLES.glade.translations.glade:105
+#: control/control.SLES.glade.translations.glade:106
+#: control/control.SLES.glade.translations.glade:127
+#: control/control.SLES.glade.translations.glade:128
+#: control/control.SLES.glade.translations.glade:129
+#: control/control.SLES.glade.translations.glade:131
+#: control/control.SLES.glade.translations.glade:132
+#: control/control.SLES.glade.translations.glade:133
+#: control/control.SLES.glade.translations.glade:134
+#: control/control.SLES.glade.translations.glade:140
+#: control/control.SLES.glade.translations.glade:141
 #: control/control.openSUSE.glade.translations.glade:90
-#: control/control.openSUSE.glade.translations.glade:110
-#: control/control.openSUSE.glade.translations.glade:111
-#: control/control.openSUSE.glade.translations.glade:112
-#: control/control.openSUSE.glade.translations.glade:113
-#: control/control.openSUSE.glade.translations.glade:114
-#: control/control.openSUSE.glade.translations.glade:115
-#: control/control.openSUSE.glade.translations.glade:116
+#: control/control.openSUSE.glade.translations.glade:91
+#: control/control.openSUSE.glade.translations.glade:93
+#: control/control.openSUSE.glade.translations.glade:94
+#: control/control.openSUSE.glade.translations.glade:95
+#: control/control.openSUSE.glade.translations.glade:118
+#: control/control.openSUSE.glade.translations.glade:119
+#: control/control.openSUSE.glade.translations.glade:120
 #: control/control.openSUSE.glade.translations.glade:122
 #: control/control.openSUSE.glade.translations.glade:123
+#: control/control.openSUSE.glade.translations.glade:124
+#: control/control.openSUSE.glade.translations.glade:125
+#: control/control.openSUSE.glade.translations.glade:131
+#: control/control.openSUSE.glade.translations.glade:132
 msgid "Perform Update"
 msgstr "Utfør oppgradering"
 
-#: control/control.openSUSE.glade.translations.glade:91
-#: control/control.openSUSE.glade.translations.glade:120
-#: control/control.openSUSE.glade.translations.glade:124
-msgid "Configuration"
-msgstr "Konfigurasjon"
-
-#: control/control.openSUSE.glade.translations.glade:92
+#: control/control.SLED.glade.translations.glade:83
+#: control/control.SLES.glade.translations.glade:107
+#: control/control.openSUSE.glade.translations.glade:97
 msgid "Base Installation"
 msgstr "Grunninstallasjon"
 
-#: control/control.openSUSE.glade.translations.glade:93
-#: control/control.openSUSE.glade.translations.glade:94
-#: control/control.openSUSE.glade.translations.glade:95
-#: control/control.openSUSE.glade.translations.glade:106
-#: control/control.openSUSE.glade.translations.glade:107
-#: control/control.openSUSE.glade.translations.glade:109
+#: control/control.SLED.glade.translations.glade:84
+#: control/control.SLED.glade.translations.glade:86
+#: control/control.SLED.glade.translations.glade:87
+#: control/control.SLED.glade.translations.glade:99
+#: control/control.SLED.glade.translations.glade:101
+#: control/control.SLED.glade.translations.glade:103
+#: control/control.SLES.glade.translations.glade:108
+#: control/control.SLES.glade.translations.glade:110
+#: control/control.SLES.glade.translations.glade:111
+#: control/control.SLES.glade.translations.glade:122
+#: control/control.SLES.glade.translations.glade:124
+#: control/control.SLES.glade.translations.glade:126
+#: control/control.openSUSE.glade.translations.glade:98
+#: control/control.openSUSE.glade.translations.glade:100
+#: control/control.openSUSE.glade.translations.glade:101
+#: control/control.openSUSE.glade.translations.glade:113
+#: control/control.openSUSE.glade.translations.glade:115
+#: control/control.openSUSE.glade.translations.glade:117
 msgid "AutoYaST Settings"
 msgstr "AutoYaST-innstillinger"
 
-#: control/control.openSUSE.glade.translations.glade:121
-#: control/control.openSUSE.glade.translations.glade:125
+#: control/control.SLED.glade.translations.glade:115
+#: control/control.SLED.glade.translations.glade:119
+#: control/control.SLES.glade.translations.glade:138
+#: control/control.SLES.glade.translations.glade:142
+#: control/control.openSUSE.glade.translations.glade:96
+#: control/control.openSUSE.glade.translations.glade:129
+#: control/control.openSUSE.glade.translations.glade:133
+msgid "Configuration"
+msgstr "Konfigurasjon"
+
+#: control/control.SLED.glade.translations.glade:116
+#: control/control.SLED.glade.translations.glade:120
+#: control/control.SLES.glade.translations.glade:139
+#: control/control.SLES.glade.translations.glade:143
+#: control/control.openSUSE.glade.translations.glade:130
+#: control/control.openSUSE.glade.translations.glade:134
 msgid "System Configuration"
 msgstr "Systemkonfigurasjon"
 
+#: control/control.SLES.glade.translations.glade:3
 #, fuzzy
-#~| msgid ""
-#~| "\n"
-#~| "<p>\n"
-#~| "The installation has completed successfully.\n"
-#~| "Your system is ready for use.\n"
-#~| "Click Finish to log in to the system.\n"
-#~| "</p>\n"
-#~| "<p>\n"
-#~| "Please visit us at http://www.suse.com/.\n"
-#~| "</p>\n"
-#~| "\t"
-#~ msgid ""
-#~ "\n"
-#~ "<p>\n"
-#~ "The installation has completed successfully.\n"
-#~ "Your system is ready for use.\n"
-#~ "Click Finish to log in to the system.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "Please visit us at http://www.suse.com/.\n"
-#~ "</p>\n"
-#~ "        "
-#~ msgstr ""
-#~ "\n"
-#~ "<p>\n"
-#~ "Installasjonen er fullført.\n"
-#~ "Systemet er klart til bruk.\n"
-#~ "Klikk Fullfør for å logge på systemet.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "Besøk oss på http://www.suse.com/.\n"
-#~ "</p>\n"
-#~ "\t"
+#| msgid ""
+#| "\n"
+#| "<p>\n"
+#| "The installation has completed successfully.\n"
+#| "Your system is ready for use.\n"
+#| "Click Finish to log in to the system.\n"
+#| "</p>\n"
+#| "<p>\n"
+#| "Please visit us at http://www.suse.com/.\n"
+#| "</p>\n"
+#| "\t"
+msgid ""
+"\n"
+"<p>\n"
+"The installation has completed successfully.\n"
+"Your system is ready for use.\n"
+"Click Finish to log in to the system.\n"
+"</p>\n"
+"<p>\n"
+"Please visit us at http://www.suse.com/.\n"
+"</p>\n"
+"        "
+msgstr ""
+"\n"
+"<p>\n"
+"Installasjonen er fullført.\n"
+"Systemet er klart til bruk.\n"
+"Klikk Fullfør for å logge på systemet.\n"
+"</p>\n"
+"<p>\n"
+"Besøk oss på http://www.suse.com/.\n"
+"</p>\n"
+"\t"
 
-#~ msgid "CIM Server"
-#~ msgstr "CIM-server"
+#. TRANSLATORS: dialog caption
+#: control/control.SLES.glade.translations.glade:16
+#, fuzzy
+#| msgid "System for Update"
+msgid "System Role"
+msgstr "System som skal oppgraderes"
 
-#~ msgid "Overview"
-#~ msgstr "Oversikt"
+#. TRANSLATORS: label in a dialog
+#: control/control.SLES.glade.translations.glade:18
+msgid ""
+"System Roles are predefined use cases which tailor the system\n"
+"for the selected scenario."
+msgstr ""
 
-#~ msgid "Expert"
-#~ msgstr "Avansert"
+#. TRANSLATORS: dialog help
+#: control/control.SLES.glade.translations.glade:21
+msgid ""
+"<p>The system roles adjustments are in the range from package selection up \n"
+"to disk partitioning. By choosing a system role, the system is \n"
+"configured accordingly to match the use case of the role. The settings \n"
+"defined by a role can be overridden in the next steps if necessary.</p>"
+msgstr ""
 
-#~ msgid "Network Services Configuration"
-#~ msgstr "Oppsett av nettverkstjenester"
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:26
+msgid "Default System"
+msgstr ""
 
-#~ msgid "Installation Summary"
-#~ msgstr "Installasjonssammendrag"
+#: control/control.SLES.glade.translations.glade:27
+msgid ""
+"• GNOME environment, with Btrfs root (/) partition\n"
+"• Separate /home partition (XFS) for disks larger than 20GB"
+msgstr ""
 
-#~ msgid "Update Summary"
-#~ msgstr "Oppgraderingssammendrag"
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:30
+#, fuzzy
+#| msgid "XEN Virtualization Host"
+msgid "KVM Virtualization Host"
+msgstr "XEN-virtualiseringsvert"
 
+#: control/control.SLES.glade.translations.glade:31
+msgid ""
+"• Kernel-based hypervisor and tools\n"
+"• No separate /home partition"
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/control.SLES.glade.translations.glade:34
+#, fuzzy
+#| msgid "XEN Virtualization Host"
+msgid "Xen Virtualization Host"
+msgstr "XEN-virtualiseringsvert"
+
+#: control/control.SLES.glade.translations.glade:35
+msgid ""
+"• Bare metal hypervisor and tools\n"
+"• No separate /home partition"
+msgstr ""
+
+#: control/control.SLES.glade.translations.glade:48
+msgid "Network Services Configuration"
+msgstr "Oppsett av nettverkstjenester"
+
+#: control/control.SLES.glade.translations.glade:53
+#: control/control.SLES.glade.translations.glade:76
+#: control/control.SLES.glade.translations.glade:90
+#, fuzzy
+#| msgid "Saving Network Configuration"
+msgid "Load Linuxrc Network Configuration"
+msgstr "Lagrer nettverksoppsett"
+
+#: control/control.SLES.glade.translations.glade:65
+msgid "Installation Summary"
+msgstr "Installasjonssammendrag"
+
+#: control/control.openSUSE.glade.translations.glade:3
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "<p><b>Congratulations!</b></p>\n"
+#| "<p>The installation of openSUSE on your machine is complete.\n"
+#| "After clicking <b>Finish</b>, you can log in to the system.</p>\n"
+#| "<p>Visit us at %1.</p>\n"
+#| "<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
+#| "\t    "
+msgid ""
+"\n"
+"<p><b>Congratulations!</b></p>\n"
+"<p>The installation of openSUSE on your machine is complete.\n"
+"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
+"<p>Visit us at %1.</p>\n"
+"<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
+"            "
+msgstr ""
+"\n"
+"<p><b>Gratulerer!</b></p>\n"
+"<p>Installasjonen av openSUSE på maskinen er fullført.\n"
+"Etter at du har klikket på <b>Fullfør</b>, kan du logge på systemet.</p>\n"
+"<p>Besøk oss på %1.</p>\n"
+"<p>Ha det gøy!<br>openSUSE-utviklerne</p>\n"
+"\t"
+
+#: control/control.openSUSE.glade.translations.glade:10
+#, fuzzy
+#| 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."
+msgid ""
+"The desktop environment on your computer provides the graphical user\n"
+"interface for your computer, as well as a suite of applications for\n"
+"email, Web browsing, office productivity, games, and utilities to\n"
+"manage your computer.\n"
+"\n"
+"openSUSE offers a choice of desktop environments. The most widely\n"
+"used desktop environments are GNOME and KDE Plasma, and they are equally\n"
+"supported under openSUSE. Both desktop environments are easy to use,\n"
+"highly integrated, and have an attractive look and feel. Each desktop\n"
+"environment has a distinct style, so personal taste determines which\n"
+"is the most appropriate desktop for you."
+msgstr ""
+"Skrivebordsmiljøet for datamaskinen utgjør datamaskinens grafiske\n"
+"brukergrensesnitt, og omfatter et sett programmer for\n"
+"e-post, nettlesing, kontorarbeid, spill og verktøy for å\n"
+"administrere datamaskinen.\n"
+"\n"
+"openSUSE tilbyr ulike skrivebordsmiljøer.  De mest\n"
+"brukte skrivebordsmiljøene er GNOME og KDE. Disse har like god\n"
+"støtte i openSUSE. Begge disse skrivebordsmiljøene er enkle å bruke,\n"
+"er godt integrert og har elegant utforming. De to\n"
+"skrivebordsmiljøene har sitt særpreg, så det er opp til deg\n"
+"hvilket skrivebord du foretrekker."
+
+#: control/control.openSUSE.glade.translations.glade:21
+msgid "GNOME Desktop"
+msgstr "GNOME-skrivebord"
+
+#: control/control.openSUSE.glade.translations.glade:22
+#, fuzzy
+#| msgid "KDE Desktop"
+msgid "KDE Plasma Desktop"
+msgstr "KDE-skrivebord"
+
+#: control/control.openSUSE.glade.translations.glade:23
+#, fuzzy
+#| msgid "Minimal Server Selection (Text Mode)"
+msgid "Server (Text Mode)"
+msgstr "Server uten grafisk grensesnitt (tekstmodus)"
+
+#: control/control.openSUSE.glade.translations.glade:24
+#, fuzzy
+#| msgid "XFCE Desktop"
+msgid "Xfce Desktop"
+msgstr "XFCE-skrivebordet"
+
+#: control/control.openSUSE.glade.translations.glade:25
+msgid "LXDE Desktop"
+msgstr "LXDE-skrivebord"
+
+#: control/control.openSUSE.glade.translations.glade:26
+msgid "Minimal X Window"
+msgstr "Minimalt grafisk grensesnitt"
+
+#: control/control.openSUSE.glade.translations.glade:27
+msgid "Enlightenment Desktop"
+msgstr "Skrivebordsmiljøet Enlightenment"
+
+#: control/control.openSUSE.glade.translations.glade:28
+msgid "Minimal Server Selection (Text Mode)"
+msgstr "Server uten grafisk grensesnitt (tekstmodus)"
+
+#: control/control.openSUSE.glade.translations.glade:47
+#: control/control.openSUSE.glade.translations.glade:86
+msgid "Online Repositories"
+msgstr "online-pakkebrønner"
+
+#: control/control.openSUSE.glade.translations.glade:49
+msgid "Desktop Selection"
+msgstr "Skrivebordsvalg"
+
 #~ msgid "Add-On Product Installation"
 #~ msgstr "Installer tilleggsprodukt"
 
@@ -403,9 +760,6 @@
 #~ msgid "Customer Center"
 #~ msgstr "Kundesenter"
 
-#~ msgid "Online Update"
-#~ msgstr "Online-oppdatering"
-
 #~ msgid "Release Notes"
 #~ msgstr "Versjonsmerknader"
 
@@ -522,9 +876,6 @@
 #~ msgid "Virtual Machine"
 #~ msgstr "Virtuell maskin"
 
-#~ msgid "XEN Virtualization Host"
-#~ msgstr "XEN-virtualiseringsvert"
-
 #~ msgid "Software Selection"
 #~ msgstr "Programvareutvalg"
 

Modified: trunk/yast/nb/po/country.nb.po
===================================================================
--- trunk/yast/nb/po/country.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/country.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: country\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2009-10-08 12:44+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -668,7 +668,9 @@
 
 #. command line help text for 'set hwclock' option
 #: timezone/src/clients/timezone.rb:94
-msgid "New value for hardware clock"
+#, fuzzy
+#| msgid "New value for hardware clock"
+msgid "New value for hardware clock. Can be 'local', 'utc' or 'UTC'."
 msgstr "Ny verdi for maskinvareklokke"
 
 #. summary label
@@ -855,8 +857,8 @@
 "Ugyldig dato (DD-MM-ÅÅÅÅ) %1\n"
 "Angi riktig dato.\n"
 
-#. button text
-#: timezone/src/include/timezone/dialogs.rb:541
+#. TRANSLATORS: Button label
+#: timezone/src/include/timezone/dialogs.rb:535
 #, fuzzy
 #| msgid "E&xpert Settings..."
 msgid "Other &Settings..."
@@ -864,44 +866,44 @@
 
 #. frame label
 #. frame label
-#: timezone/src/include/timezone/dialogs.rb:613
-#: timezone/src/include/timezone/dialogs.rb:910
+#: timezone/src/include/timezone/dialogs.rb:612
+#: timezone/src/include/timezone/dialogs.rb:916
 msgid "Date and Time (NTP is configured)"
 msgstr "Tid og dato (NTP er satt opp)"
 
 #. frame label
 #. frame label
-#: timezone/src/include/timezone/dialogs.rb:615
-#: timezone/src/include/timezone/dialogs.rb:693
-#: timezone/src/include/timezone/dialogs.rb:912
+#: timezone/src/include/timezone/dialogs.rb:614
+#: timezone/src/include/timezone/dialogs.rb:699
+#: timezone/src/include/timezone/dialogs.rb:918
 msgid "Date and Time"
 msgstr "Dato og tid"
 
 #. check box label
-#: timezone/src/include/timezone/dialogs.rb:631
+#: timezone/src/include/timezone/dialogs.rb:630
 msgid "&Hardware Clock Set to UTC"
 msgstr "&Maskinvareklokken er innstilt på UTC"
 
 #. label text
 #. label text
-#: timezone/src/include/timezone/dialogs.rb:650
-#: timezone/src/include/timezone/dialogs.rb:684
+#: timezone/src/include/timezone/dialogs.rb:656
+#: timezone/src/include/timezone/dialogs.rb:690
 msgid "&Region"
 msgstr "&Region"
 
-#: timezone/src/include/timezone/dialogs.rb:657
-#: timezone/src/include/timezone/dialogs.rb:688
+#: timezone/src/include/timezone/dialogs.rb:663
+#: timezone/src/include/timezone/dialogs.rb:694
 msgid "Time &Zone"
 msgstr "Tids&sone"
 
-#: timezone/src/include/timezone/dialogs.rb:669
+#: timezone/src/include/timezone/dialogs.rb:675
 #, fuzzy
 #| msgid "Date and Time"
 msgid "Date and Time:"
 msgstr "Dato og tid"
 
 #. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:791
+#: timezone/src/include/timezone/dialogs.rb:797
 msgid ""
 "\n"
 "<p><b><big>Time Zone and Clock Settings</big></b></p>"
@@ -910,7 +912,7 @@
 "<p><b><big>Tidssone og tidsinnstillinger</big></b></p>"
 
 #. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:793
+#: timezone/src/include/timezone/dialogs.rb:799
 msgid ""
 "<p>\n"
 "To select the time zone to use in your system, first select the <b>Region</b>.\n"
@@ -925,7 +927,7 @@
 "</p>\n"
 
 #. general help trailer
-#: timezone/src/include/timezone/dialogs.rb:810
+#: timezone/src/include/timezone/dialogs.rb:816
 msgid ""
 "<p>\n"
 "If the current time is not correct, use <b>Change</b> to adjust it.\n"
@@ -936,12 +938,12 @@
 "</p>"
 
 #. Screen title for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:820
+#: timezone/src/include/timezone/dialogs.rb:826
 msgid "Clock and Time Zone"
 msgstr "Klokke og tidssone"
 
 #. popup text
-#: timezone/src/include/timezone/dialogs.rb:945
+#: timezone/src/include/timezone/dialogs.rb:951
 msgid "Select a valid time zone."
 msgstr "Velg gyldig tidssone."
 
@@ -1029,181 +1031,188 @@
 
 #. keyboard layout
 #: keyboard/src/data/keyboard_raw.ycp:181
+#, fuzzy
+#| msgid "Spanish (Latin America)"
+msgid "Spanish (Asturian variant)"
+msgstr "Spansk (Latin-Amerika)"
+
+#. keyboard layout
+#: keyboard/src/data/keyboard_raw.ycp:193
 msgid "Italian"
 msgstr "Italiensk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:193
+#: keyboard/src/data/keyboard_raw.ycp:205
 msgid "Portuguese"
 msgstr "Portugisisk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:205
+#: keyboard/src/data/keyboard_raw.ycp:217
 msgid "Portuguese (Brazil)"
 msgstr "Portugisisk (Brasil)"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:217
+#: keyboard/src/data/keyboard_raw.ycp:229
 msgid "Portuguese (Brazil -- US accents)"
 msgstr "Portugisisk (Brasil --US-aksenter)"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:229
+#: keyboard/src/data/keyboard_raw.ycp:241
 msgid "Greek"
 msgstr "Gresk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:241
+#: keyboard/src/data/keyboard_raw.ycp:253
 msgid "Dutch"
 msgstr "Nederlandsk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:253
+#: keyboard/src/data/keyboard_raw.ycp:265
 msgid "Danish"
 msgstr "Dansk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:265
+#: keyboard/src/data/keyboard_raw.ycp:277
 msgid "Norwegian"
 msgstr "Norsk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:277
+#: keyboard/src/data/keyboard_raw.ycp:289
 msgid "Swedish"
 msgstr "Svensk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:289
+#: keyboard/src/data/keyboard_raw.ycp:301
 msgid "Finnish"
 msgstr "Finsk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:301
+#: keyboard/src/data/keyboard_raw.ycp:313
 msgid "Czech"
 msgstr "Tsjekkisk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:316
+#: keyboard/src/data/keyboard_raw.ycp:328
 msgid "Czech (qwerty)"
 msgstr "Tsjekkisk (qwerty)"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:331
+#: keyboard/src/data/keyboard_raw.ycp:343
 msgid "Slovak"
 msgstr "Slovakisk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:346
+#: keyboard/src/data/keyboard_raw.ycp:358
 msgid "Slovak (qwerty)"
 msgstr "Slovakisk (qwerty)"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:361
+#: keyboard/src/data/keyboard_raw.ycp:373
 msgid "Slovene"
 msgstr "Slovensk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:375
+#: keyboard/src/data/keyboard_raw.ycp:387
 msgid "Hungarian"
 msgstr "Ungarsk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:389
+#: keyboard/src/data/keyboard_raw.ycp:401
 msgid "Polish"
 msgstr "Polsk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:403
+#: keyboard/src/data/keyboard_raw.ycp:415
 msgid "Russian"
 msgstr "Russisk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:417
+#: keyboard/src/data/keyboard_raw.ycp:429
 msgid "Serbian"
 msgstr "Serbisk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:429
+#: keyboard/src/data/keyboard_raw.ycp:441
 msgid "Estonian"
 msgstr "Estisk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:441
+#: keyboard/src/data/keyboard_raw.ycp:453
 msgid "Lithuanian"
 msgstr "Litauisk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:453
+#: keyboard/src/data/keyboard_raw.ycp:465
 msgid "Turkish"
 msgstr "Tyrkisk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:464
+#: keyboard/src/data/keyboard_raw.ycp:476
 msgid "Croatian"
 msgstr "Kroatisk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:486
+#: keyboard/src/data/keyboard_raw.ycp:498
 msgid "Japanese"
 msgstr "Japansk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:498
+#: keyboard/src/data/keyboard_raw.ycp:510
 msgid "Belgian"
 msgstr "Belgisk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:510
+#: keyboard/src/data/keyboard_raw.ycp:522
 msgid "Dvorak"
 msgstr "Dvorak"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:522
+#: keyboard/src/data/keyboard_raw.ycp:534
 msgid "Icelandic"
 msgstr "Islandsk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:534
+#: keyboard/src/data/keyboard_raw.ycp:546
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:556
+#: keyboard/src/data/keyboard_raw.ycp:568
 msgid "Khmer"
 msgstr "Khmer"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:578
+#: keyboard/src/data/keyboard_raw.ycp:590
 msgid "Korean"
 msgstr "Koreansk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:600
+#: keyboard/src/data/keyboard_raw.ycp:612
 msgid "Arabic"
 msgstr "Arabisk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:621
+#: keyboard/src/data/keyboard_raw.ycp:633
 msgid "Tajik"
 msgstr "Tadsjikisk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:635
+#: keyboard/src/data/keyboard_raw.ycp:647
 msgid "Traditional Chinese"
 msgstr "Tradisjonelt kinesisk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:657
+#: keyboard/src/data/keyboard_raw.ycp:669
 msgid "Simplified Chinese"
 msgstr "Forenklet kinesisk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:679
+#: keyboard/src/data/keyboard_raw.ycp:691
 msgid "Romanian"
 msgstr "Rumensk"
 
 #. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:700
+#: keyboard/src/data/keyboard_raw.ycp:712
 msgid "US International"
 msgstr "Engelsk (US-internasjonalt)"
 

Modified: trunk/yast/nb/po/crowbar.nb.po
===================================================================
--- trunk/yast/nb/po/crowbar.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/crowbar.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2002-06-17 14:33+0200\n"
 "Last-Translator: www.linuxbutikken.no \n"
 "Language-Team: Norwegian \n"
@@ -22,19 +22,9 @@
 msgid "Configuration of crowbar"
 msgstr "Oppsett av crowbar"
 
-#. radio button item: target repository is common for all available platform
-#: src/include/crowbar/complex.rb:90
-msgid "Common for All"
-msgstr ""
-
 #. target platform name
-#: src/include/crowbar/complex.rb:92
-msgid "SLES 11 SP3"
-msgstr ""
-
-#. target platform name
 #: src/include/crowbar/complex.rb:94
-msgid "SLES 12"
+msgid "SLES 12 SP1"
 msgstr ""
 
 #. combobox label
@@ -48,11 +38,11 @@
 msgid ""
 "<p>Here you can edit the location of your <b>Update Repositories</b>.</p>\n"
 "<p>\n"
-"If repositories are stored at SMT server or SUSE Manager server, it's enought to enter server's URL and the paths\n"
+"If repositories are stored at SMT server or SUSE Manager server, it's enough to enter server's URL and the paths\n"
 "              to repositories will be filled automatically.</p>It is also possible to use custom paths. Some examples of how the URL could look like:\n"
 "</p><p>\n"
 "<ul>\n"
-"<li><i>http://smt.example.com/repo/$RCE/SLES11-SP3-Pool/sle-11-x86_64/</i> for SMT server\n"
+"<li><i>http://smt.example.com/repo/SUSE/Products/SLE-HA/12-SP1/x86_64/product</i> for SMT server\n"
 "<li><i>http://manager.example.com/ks/dist/child/suse-cloud-3.0-pool-x86_64/sles11-s...</i> for SUSE Manager Server.\n"
 "</p><p>\n"
 "For detailed description, check the Deployment Guide.\n"
@@ -193,33 +183,36 @@
 msgstr "&IP-Adresse"
 
 #. text entry label
-#: src/include/crowbar/complex.rb:520
+#: src/include/crowbar/complex.rb:516
 msgid "Name"
 msgstr "Navn"
 
 #. text entry label
-#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:695
+#: src/include/crowbar/complex.rb:518 src/include/crowbar/complex.rb:704
 msgid "URL"
 msgstr "Nettadresse"
 
 # error box title
 #. text entry label
-#: src/include/crowbar/complex.rb:526 src/include/crowbar/complex.rb:696
+#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:705
 #, fuzzy
 #| msgid "I/O Error"
 msgid "Ask On Error"
 msgstr "Inn/ut-feil"
 
-#. frame label
-#: src/include/crowbar/complex.rb:531 src/include/crowbar/complex.rb:697
-#: src/include/crowbar/complex.rb:715
+#: src/include/crowbar/complex.rb:527 src/include/crowbar/complex.rb:706
 #, fuzzy
 #| msgid "Target Name"
 msgid "Target Platform"
 msgstr "Målnavn"
 
+#. radiobutton label
+#: src/include/crowbar/complex.rb:542
+msgid "Architecture"
+msgstr ""
+
 #. error popup
-#: src/include/crowbar/complex.rb:580
+#: src/include/crowbar/complex.rb:583
 #, fuzzy
 #| msgid ""
 #| "Configuration name %1 already exists.\n"
@@ -232,14 +225,14 @@
 "Velg et annet navn."
 
 #. text entry label
-#: src/include/crowbar/complex.rb:676
+#: src/include/crowbar/complex.rb:685
 #, fuzzy
 #| msgid "LDAP Server &URL"
 msgid "Server &URL"
 msgstr "LDAP-server&adresse"
 
 #. table header
-#: src/include/crowbar/complex.rb:694
+#: src/include/crowbar/complex.rb:703
 #, fuzzy
 #| msgid "&Repository Name"
 msgid "Repository Name"
@@ -247,74 +240,81 @@
 
 # error box title
 #. checkbox label
-#: src/include/crowbar/complex.rb:701
+#: src/include/crowbar/complex.rb:710
 #, fuzzy
 #| msgid "I/O Error"
 msgid "&Ask On Error"
 msgstr "Inn/ut-feil"
 
 #. text entry label
-#: src/include/crowbar/complex.rb:707
+#: src/include/crowbar/complex.rb:716
 #, fuzzy
 #| msgid "Repository URL"
 msgid "Repository &URL"
 msgstr "Pakkebrønnadresse"
 
 #. label (hint for user)
-#: src/include/crowbar/complex.rb:710
+#: src/include/crowbar/complex.rb:719
 msgid "Empty URL means that default value will be used."
 msgstr ""
 
 #. push button label
-#: src/include/crowbar/complex.rb:726
+#: src/include/crowbar/complex.rb:722
 #, fuzzy
 #| msgid "Add Repository"
 msgid "A&dd Repository"
 msgstr "Legg til pakkebrønn"
 
 #. combobox item
-#: src/include/crowbar/complex.rb:793
+#: src/include/crowbar/complex.rb:792
 #, fuzzy
 #| msgid "Remote WINS Server"
+msgid "Local SMT Server"
+msgstr "Ekstern WINS-server"
+
+#. combobox item
+#: src/include/crowbar/complex.rb:794
+#, fuzzy
+#| msgid "Remote WINS Server"
 msgid "Remote SMT Server"
 msgstr "Ekstern WINS-server"
 
 #. combobox item
-#: src/include/crowbar/complex.rb:795
+#: src/include/crowbar/complex.rb:796
 #, fuzzy
 #| msgid "Finger Server"
 msgid "SUSE Manager Server"
 msgstr "Finger-server"
 
 #. combobox item
-#: src/include/crowbar/complex.rb:797
+#: src/include/crowbar/complex.rb:798
 msgid "Custom"
 msgstr "Egendefinert"
 
 #. text entry label
-#: src/include/crowbar/complex.rb:866
+#: src/include/crowbar/complex.rb:854
 msgid "User Name"
 msgstr "Brukernavn"
 
 #. text entry label
-#: src/include/crowbar/complex.rb:868
+#: src/include/crowbar/complex.rb:856
 msgid "Password"
 msgstr "Passord"
 
 #. text entry label
-#: src/include/crowbar/complex.rb:870
+#: src/include/crowbar/complex.rb:858
 msgid "Repeat the Password"
 msgstr "Gjenta passordet"
 
 #. error popup
-#: src/include/crowbar/complex.rb:900
+#: src/include/crowbar/complex.rb:888
 #, fuzzy
 #| msgid "Server name cannot be empty."
 msgid "User name cannot be empty."
 msgstr "Du må angi et servernavn."
 
 #. error popup
-#: src/include/crowbar/complex.rb:907
+#: src/include/crowbar/complex.rb:895
 msgid ""
 "The passwords do not match.\n"
 "Try again."
@@ -323,7 +323,7 @@
 "Prøv igjen."
 
 #. error popup
-#: src/include/crowbar/complex.rb:915
+#: src/include/crowbar/complex.rb:903
 #, fuzzy
 #| msgid ""
 #| "Configuration name %1 already exists.\n"
@@ -336,19 +336,19 @@
 "Velg et annet navn."
 
 #. error popup
-#: src/include/crowbar/complex.rb:1018
+#: src/include/crowbar/complex.rb:1006
 #, fuzzy
 #| msgid "The entered URL is not valid."
 msgid "The interface format '%1' is not valid"
 msgstr "Den angitte nettadressen er ugyldig."
 
 #. Returns broadcast address. Based on current netmask and subnet
-#: src/include/crowbar/complex.rb:1076
+#: src/include/crowbar/complex.rb:1064
 msgid "disabled"
 msgstr "deaktivert"
 
 #. error popup
-#: src/include/crowbar/complex.rb:1173
+#: src/include/crowbar/complex.rb:1161
 msgid ""
 "The netmask '%1' is invalid.\n"
 "%2"
@@ -358,7 +358,7 @@
 
 #. error popup
 #. error popup
-#: src/include/crowbar/complex.rb:1184 src/include/crowbar/complex.rb:1216
+#: src/include/crowbar/complex.rb:1172 src/include/crowbar/complex.rb:1204
 msgid ""
 "The IP address '%1' is invalid.\n"
 "%2"
@@ -367,7 +367,7 @@
 "%2"
 
 #. error popup
-#: src/include/crowbar/complex.rb:1194
+#: src/include/crowbar/complex.rb:1182
 msgid ""
 "The router address '%1' is invalid.\n"
 "%2"
@@ -376,19 +376,19 @@
 "%2"
 
 #. error popup
-#: src/include/crowbar/complex.rb:1203
+#: src/include/crowbar/complex.rb:1191
 msgid "The router address '%1' is not part of network '%2'."
 msgstr "Ruteradressen '%1' tilhører ikke nettverket '%2'."
 
 #. error popup
-#: src/include/crowbar/complex.rb:1225
+#: src/include/crowbar/complex.rb:1213
 #, fuzzy
 #| msgid "The address '%1' is not part of network '%2'."
 msgid "The IP address '%1' is not part of network '%2'."
 msgstr "Adressen '%1' tilhører ikke nettverket '%2'."
 
 #. popup message
-#: src/include/crowbar/complex.rb:1246
+#: src/include/crowbar/complex.rb:1234
 msgid ""
 "Some address ranges are not part of network '%1'.\n"
 "Adapt them using 'Edit ranges' button."
@@ -397,70 +397,70 @@
 "Tilpass dem ved å bruke 'Rediger områder'-knappen."
 
 #. inputfield label
-#: src/include/crowbar/complex.rb:1335
+#: src/include/crowbar/complex.rb:1326
 msgid "Min IP Address"
 msgstr "Min. IP-adresse"
 
 #. inputfield label
-#: src/include/crowbar/complex.rb:1342
+#: src/include/crowbar/complex.rb:1333
 msgid "Max IP Address"
 msgstr "Maks. IP-adresse"
 
-#: src/include/crowbar/complex.rb:1395
+#: src/include/crowbar/complex.rb:1386
 msgid "The address '%1' is not part of network '%2'."
 msgstr "Adressen '%1' tilhører ikke nettverket '%2'."
 
 #. error message
-#: src/include/crowbar/complex.rb:1407
+#: src/include/crowbar/complex.rb:1398
 msgid "The lowest address must be lower than the highest one."
 msgstr "Den laveste adressen må være lavere enn den høyeste."
 
 #. error message
-#: src/include/crowbar/complex.rb:1431
+#: src/include/crowbar/complex.rb:1422
 msgid "Ranges '%1' and '%2' are overlapping."
 msgstr "Områdene '%1' og '%2' overlapper hverandre."
 
 #. tab header
-#: src/include/crowbar/complex.rb:1499
+#: src/include/crowbar/complex.rb:1490
 #, fuzzy
 #| msgid "User Settings"
 msgid "&User Settings"
 msgstr "Brukerinnstillinger"
 
 #. label (hint for user)
-#: src/include/crowbar/complex.rb:1511
+#: src/include/crowbar/complex.rb:1502
 msgid "If no user is present, user 'crowbar' with default password will be used."
 msgstr ""
 
 #. tab header
-#: src/include/crowbar/complex.rb:1527
+#: src/include/crowbar/complex.rb:1518
 #, fuzzy
 #| msgid "Network Mode"
 msgid "N&etwork Mode"
 msgstr "Nettverksmodus"
 
-#: src/include/crowbar/complex.rb:1535
+#: src/include/crowbar/complex.rb:1526
 #, fuzzy
 #| msgid "Bond Network"
 msgid "Bastion Network"
 msgstr "Bond-nettverk"
 
 #. tab header
-#: src/include/crowbar/complex.rb:1578
+#: src/include/crowbar/complex.rb:1569
 #, fuzzy
 #| msgid "Networks"
 msgid "Net&works"
 msgstr "Nettverk"
 
 #. tab header
-#: src/include/crowbar/complex.rb:1614
+#: src/include/crowbar/complex.rb:1605
 #, fuzzy
 #| msgid "Repositories"
 msgid "Re&positories"
 msgstr "Pakkebrønner"
 
 #. popup message %1 is FQDN
-#: src/include/crowbar/complex.rb:1731
+#: src/include/crowbar/complex.rb:1722
 #, fuzzy
 #| msgid ""
 #| "The SUSE Cloud Admin Server has been deployed. Changing the network is\n"
@@ -479,7 +479,7 @@
 "Besøk web-grensesnittet for Crowbar på http://%1:3000/"
 
 #. default dialog caption
-#: src/include/crowbar/complex.rb:1749
+#: src/include/crowbar/complex.rb:1740
 msgid "Crowbar Configuration Overview"
 msgstr "Oversikt over Crowbar-oppsett"
 
@@ -540,38 +540,38 @@
 msgstr "Initialiserer ..."
 
 #. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:142
+#: src/modules/Crowbar.rb:154
 msgid "Initializing crowbar Configuration"
 msgstr "Initialiserer crowbar-oppsett"
 
 #. Progress stage
-#: src/modules/Crowbar.rb:153
+#: src/modules/Crowbar.rb:165
 msgid "Read the configuraton"
 msgstr "Les oppsett"
 
 #. Progress step
-#: src/modules/Crowbar.rb:157
+#: src/modules/Crowbar.rb:169
 msgid "Reading the configuration..."
 msgstr "Leser konfigurasjonen..."
 
 #. Progress finished
 #. Progress finished
-#: src/modules/Crowbar.rb:159 src/modules/Crowbar.rb:249
+#: src/modules/Crowbar.rb:171 src/modules/Crowbar.rb:261
 msgid "Finished"
 msgstr "Fullført"
 
 #. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:232
+#: src/modules/Crowbar.rb:244
 msgid "Saving crowbar Configuration"
 msgstr "Lagrer crowbar-oppsett"
 
 #. Progress stage 1/2
-#: src/modules/Crowbar.rb:243
+#: src/modules/Crowbar.rb:255
 msgid "Write the settings"
 msgstr "Lagre innstillingene"
 
 #. Progress step 1/2
-#: src/modules/Crowbar.rb:247
+#: src/modules/Crowbar.rb:259
 msgid "Writing the settings..."
 msgstr "Lagrer innstillingene..."
 

Modified: trunk/yast/nb/po/dhcp-server.nb.po
===================================================================
--- trunk/yast/nb/po/dhcp-server.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/dhcp-server.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: dhcp-server.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2008-09-20 21:42+0200\n"
 "Last-Translator: Olav P. \n"
 "Language-Team: Norwegian Bokmål <>\n"
@@ -65,9 +65,7 @@
 msgstr "Administrer alternativer for DHCP-undernettverk"
 
 #. command line help text for an option
-#. command line help text for an option
 #: src/include/dhcp-server/commandline.rb:85
-#: src/include/dhcp-server/commandline.rb:138
 msgid "List all defined hosts with a fixed address"
 msgstr "Vis alle definerte vertsmaskiner med fast adresse"
 
@@ -107,242 +105,249 @@
 msgstr "IP-adresse (eller vertsnavn) til vertsmaskin med fast adresse"
 
 #. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:144
+#: src/include/dhcp-server/commandline.rb:138
 msgid "Select the network interface to use"
 msgstr "Velg nettverksgrensesnittet som skal brukes"
 
 #. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:151
+#: src/include/dhcp-server/commandline.rb:145
 msgid "Print the currently used interface and list other available interfaces"
 msgstr "Skriv ut gjeldende grensesnitt og vis andre tilgjengelige grensesnitt"
 
 #. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:157
+#: src/include/dhcp-server/commandline.rb:151
 msgid "Print current options"
 msgstr "Skriv ut gjeldende alternativer"
 
 #. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:163
+#: src/include/dhcp-server/commandline.rb:157
 msgid "Set a global option"
 msgstr "Definer et globalt alternativ"
 
 #. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:169
+#: src/include/dhcp-server/commandline.rb:163
 msgid "Option key (for example, ntp-servers)"
 msgstr "Valgnøkkel (f.eks. ntp-servers)"
 
 #. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:176
+#: src/include/dhcp-server/commandline.rb:170
 msgid "Option value (for example, IP address)"
 msgstr "Valgverdi (f.eks. IP address)"
 
 #. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:183
+#: src/include/dhcp-server/commandline.rb:177
 msgid "Lowest IP address of the dynamic address assigning range"
 msgstr "Laveste IP-adresse i tildelingsområdet for dynamiske adresser"
 
 #. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:190
+#: src/include/dhcp-server/commandline.rb:184
 msgid "Highest IP address of the dynamic address assigning range"
 msgstr "Høyeste IP-adresse i tildelingsområdet for dynamiske adresser"
 
 #. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:197
+#: src/include/dhcp-server/commandline.rb:191
 msgid "Default lease time in seconds"
 msgstr "Standard tildelingstid i sekunder"
 
 #. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:204
+#: src/include/dhcp-server/commandline.rb:198
 msgid "Maximum lease time in seconds"
 msgstr "Maksimal tildelingstid i sekunder"
 
 #. status information for command line
-#: src/include/dhcp-server/commandline.rb:245
+#: src/include/dhcp-server/commandline.rb:239
 msgid "DHCP server is enabled"
 msgstr "DHCP-serveren er aktivert"
 
 #. status information for command line
-#: src/include/dhcp-server/commandline.rb:247
+#: src/include/dhcp-server/commandline.rb:241
 msgid "DHCP server is disabled"
 msgstr "DHCP-serveren er deaktivert"
 
 #. command-line text output, %1 is host name
-#: src/include/dhcp-server/commandline.rb:300
+#: src/include/dhcp-server/commandline.rb:294
 msgid "Host: %1"
 msgstr "Vertsmaskin %1"
 
 #. command-line text output, %1 is hardwarre address
 #. and hardware type (eg. "ethernet 11:22:33:44:55:66")
-#: src/include/dhcp-server/commandline.rb:306
+#: src/include/dhcp-server/commandline.rb:300
 msgid "Hardware: %1"
 msgstr "Maskinvare: %1"
 
 #. command-line text output, %1 is IP address
-#: src/include/dhcp-server/commandline.rb:312
+#: src/include/dhcp-server/commandline.rb:306
 msgid "IP Address: %1"
 msgstr "IP-adresse: %1"
 
 #. command-line error report
-#: src/include/dhcp-server/commandline.rb:327
+#: src/include/dhcp-server/commandline.rb:321
 msgid "Hostname not specified."
 msgstr "Vertsnavn ikke spesifisert."
 
 #. command-line error report
-#: src/include/dhcp-server/commandline.rb:337
+#: src/include/dhcp-server/commandline.rb:331
 msgid "Specified host does not exist."
 msgstr "Den spesifiserte vertsmaskinen finnes ikke."
 
 #. to be eventually pasted to "Selected interfaces: %1"
 #. to be eventually pasted to "Other interfaces: %1"
-#: src/include/dhcp-server/commandline.rb:398
-#: src/include/dhcp-server/commandline.rb:402
+#: src/include/dhcp-server/commandline.rb:392
+#: src/include/dhcp-server/commandline.rb:396
 msgid "None"
 msgstr "Ingen"
 
 #. command-line text output, %1 is list of network interfaces
-#: src/include/dhcp-server/commandline.rb:406
+#: src/include/dhcp-server/commandline.rb:400
 msgid "Selected Interfaces: %1"
 msgstr "Valgte grensesnitt: %1"
 
 #. command-line text output, %1 is list of network interfaces
-#: src/include/dhcp-server/commandline.rb:409
+#: src/include/dhcp-server/commandline.rb:403
 msgid "Other Interfaces: %1"
 msgstr "Andre grensesnitt: %1"
 
 #. command-line error report
-#: src/include/dhcp-server/commandline.rb:417
+#: src/include/dhcp-server/commandline.rb:411
 msgid "Specified interface does not exist."
 msgstr "Det spesifiserte grensesnittet finnes ikke."
 
 #. command-line error report
-#: src/include/dhcp-server/commandline.rb:426
+#: src/include/dhcp-server/commandline.rb:420
 msgid "Operation with the interface not specified."
 msgstr "Operasjon med grensesnittet ikke spesifisert."
 
 #. command-line error report
-#: src/include/dhcp-server/commandline.rb:452
+#: src/include/dhcp-server/commandline.rb:446
 msgid "Option key must be set."
 msgstr "En alternativnøkkel må spesifiseres."
 
 #. command-line error report
-#: src/include/dhcp-server/commandline.rb:457
+#: src/include/dhcp-server/commandline.rb:451
 msgid "Value must be set."
 msgstr "En verdi må spesifiseres."
 
 #. command-line output text, %1  and %1 are IP addresses
-#: src/include/dhcp-server/commandline.rb:501
+#: src/include/dhcp-server/commandline.rb:495
 msgid "Address Range: %1-%2"
 msgstr "Adresseområde: %1-%2"
 
 #. command-line output text, %1 is integer
-#: src/include/dhcp-server/commandline.rb:510
+#: src/include/dhcp-server/commandline.rb:504
 msgid "Default Lease Time: %1"
 msgstr "Standard tildelingstid: %1"
 
 #. command-line output text, %1 is integer
-#: src/include/dhcp-server/commandline.rb:518
+#: src/include/dhcp-server/commandline.rb:512
 msgid "Maximum Lease Time: %1"
 msgstr "Maksimal tildelingstid: %1"
 
 #. yes-no popup
-#: src/include/dhcp-server/dialogs.rb:52
+#: src/include/dhcp-server/dialogs.rb:57
 msgid "Saving the configuration failed. Change the settings?"
 msgstr "Konfigurasjonen kunne ikke lagres. Vil du endre innstillingene?"
 
+#. Restart only if it's already running
+#: src/include/dhcp-server/dialogs.rb:76
+#, fuzzy
+#| msgid "Saving the configuration failed. Change the settings?"
+msgid "Saving the configuration failed"
+msgstr "Konfigurasjonen kunne ikke lagres. Vil du endre innstillingene?"
+
 #. dialog caption
-#: src/include/dhcp-server/dialogs.rb:84
+#: src/include/dhcp-server/dialogs.rb:118
 msgid "DHCP Server Configuration"
 msgstr "Konfigurasjon av DHCP-server"
 
 #. dialog caption
 #. Initialize the widget
 #. @param [String] id any widget id
-#: src/include/dhcp-server/dialogs.rb:116
-#: src/include/dhcp-server/widgets.rb:541
+#: src/include/dhcp-server/dialogs.rb:150
+#: src/include/dhcp-server/widgets.rb:477
 msgid "Global Options"
 msgstr "Generelle alternativer"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs.rb:151
+#: src/include/dhcp-server/dialogs.rb:185
 msgid "Subnet Configuration"
 msgstr "Subnettkonfigurasjon"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs.rb:185
+#: src/include/dhcp-server/dialogs.rb:219
 msgid "Host with Fixed Address"
 msgstr "Vert med fast adresse"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs.rb:222
+#: src/include/dhcp-server/dialogs.rb:256
 msgid "Shared Network"
 msgstr "Delt nettverk"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs.rb:256
+#: src/include/dhcp-server/dialogs.rb:290
 msgid "Pool of Addresses"
 msgstr "Adresseutvalg"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs.rb:291
+#: src/include/dhcp-server/dialogs.rb:324
 msgid "Group-Specific Options"
 msgstr "Gruppespesifikke alternativer"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs.rb:325
+#: src/include/dhcp-server/dialogs.rb:358
 msgid "Class"
 msgstr "Klasse"
 
 #. radio button
-#: src/include/dhcp-server/dialogs.rb:374
+#: src/include/dhcp-server/dialogs.rb:406
 msgid "&Subnet"
 msgstr "&Subnett"
 
 #. radio button
-#: src/include/dhcp-server/dialogs.rb:376
+#: src/include/dhcp-server/dialogs.rb:408
 msgid "&Host"
 msgstr "&Vertsmaskin"
 
 #. radio button
-#: src/include/dhcp-server/dialogs.rb:378
+#: src/include/dhcp-server/dialogs.rb:410
 msgid "Shared &Network"
 msgstr "Delt &nettverk"
 
 #. radio button
-#: src/include/dhcp-server/dialogs.rb:380
+#: src/include/dhcp-server/dialogs.rb:412
 msgid "&Group"
 msgstr "&Gruppe"
 
 #. radio button
-#: src/include/dhcp-server/dialogs.rb:382
+#: src/include/dhcp-server/dialogs.rb:414
 msgid "&Pool of Addresses"
 msgstr "&Adresseutvalg"
 
 #. radio button
-#: src/include/dhcp-server/dialogs.rb:384
+#: src/include/dhcp-server/dialogs.rb:416
 msgid "&Class"
 msgstr "&Klasse"
 
 #. frame
-#: src/include/dhcp-server/dialogs.rb:399
+#: src/include/dhcp-server/dialogs.rb:431
 msgid "Declaration Types"
 msgstr "Deklarasjonstyper"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs.rb:407
+#: src/include/dhcp-server/dialogs.rb:439
 msgid "Declaration Type"
 msgstr "Deklarasjonstype"
 
 #. dialog caption
 #. dialog caption
-#: src/include/dhcp-server/dialogs.rb:453
-#: src/include/dhcp-server/dialogs.rb:493
+#: src/include/dhcp-server/dialogs.rb:485
+#: src/include/dhcp-server/dialogs.rb:525
 msgid "Interface Configuration"
 msgstr "Grensesnittkonfigurasjon"
 
 #. dialog caption
 #. item of a menu button
-#: src/include/dhcp-server/dialogs.rb:522
-#: src/include/dhcp-server/widgets.rb:1118
+#: src/include/dhcp-server/dialogs.rb:554
+#: src/include/dhcp-server/widgets.rb:1106
 msgid "TSIG Key Management"
 msgstr "Administrasjon av TSIG-nøkkel"
 
@@ -367,190 +372,150 @@
 msgstr "Sekunder"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:93
+#: src/include/dhcp-server/dialogs2.rb:94
 msgid "DHCP Server: Start-Up"
 msgstr "DHCP-server: Oppstart"
 
 #. dialog caption
 #. tree item
 #. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:95
-#: src/include/dhcp-server/dialogs2.rb:97
-#: src/include/dhcp-server/dialogs2.rb:181
+#: src/include/dhcp-server/dialogs2.rb:96
+#: src/include/dhcp-server/dialogs2.rb:98
+#: src/include/dhcp-server/dialogs2.rb:182
 msgid "Start-Up"
 msgstr "Oppstart"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:115
+#: src/include/dhcp-server/dialogs2.rb:116
 msgid "DHCP Server: Card Selection"
 msgstr "DHCP-server: Valg av kort"
 
 #. dialog caption
 #. tree item
-#: src/include/dhcp-server/dialogs2.rb:117
-#: src/include/dhcp-server/dialogs2.rb:119
+#: src/include/dhcp-server/dialogs2.rb:118
+#: src/include/dhcp-server/dialogs2.rb:120
 msgid "Card Selection"
 msgstr "Valg av kort"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:129
+#: src/include/dhcp-server/dialogs2.rb:130
 msgid "DHCP Server: Global Settings"
 msgstr "DHCP-server: Generelle innstillinger"
 
 #. dialog caption
 #. tree item
-#: src/include/dhcp-server/dialogs2.rb:133
-#: src/include/dhcp-server/dialogs2.rb:135
+#: src/include/dhcp-server/dialogs2.rb:134
+#: src/include/dhcp-server/dialogs2.rb:136
 msgid "Global Settings"
 msgstr "Generelle innstillinger"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:141
+#: src/include/dhcp-server/dialogs2.rb:142
 msgid "DHCP Server: Dynamic DHCP"
 msgstr "DHCP-server: Dynamisk DHCP"
 
 #. dialog caption
 #. tree item
-#: src/include/dhcp-server/dialogs2.rb:143
-#: src/include/dhcp-server/dialogs2.rb:145
+#: src/include/dhcp-server/dialogs2.rb:144
+#: src/include/dhcp-server/dialogs2.rb:146
 msgid "Dynamic DHCP"
 msgstr "Dynamisk DHCP"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:151
+#: src/include/dhcp-server/dialogs2.rb:152
 msgid "DHCP Server: Host Management"
 msgstr "DHCP-server: Vertsmaskinadministrasjon"
 
 #. tree item
-#: src/include/dhcp-server/dialogs2.rb:155
+#: src/include/dhcp-server/dialogs2.rb:156
 msgid "Host Management"
 msgstr "Vertsmaskinadministrasjon"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:160
+#: src/include/dhcp-server/dialogs2.rb:161
 msgid "DHCP Server: Expert Settings"
 msgstr "DHCP-server: Avanserte innstillinger"
 
 #. tree item
-#: src/include/dhcp-server/dialogs2.rb:164
+#: src/include/dhcp-server/dialogs2.rb:165
 msgid "Expert Settings"
 msgstr "Avanserte innstillinger"
 
 #. radio button
-#: src/include/dhcp-server/dialogs2.rb:205
+#: src/include/dhcp-server/dialogs2.rb:206
 msgid "When &Booting"
 msgstr "Under &oppstart"
 
 #. radio button
-#: src/include/dhcp-server/dialogs2.rb:207
+#: src/include/dhcp-server/dialogs2.rb:208
 msgid "&Manually"
 msgstr "&Manuelt"
 
 #. part of help text - radio button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:211
+#: src/include/dhcp-server/dialogs2.rb:212
 msgid "When Booting"
 msgstr "Under oppstart"
 
 #. part of help text - radio button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:213
+#: src/include/dhcp-server/dialogs2.rb:214
 msgid "Manually"
 msgstr "Manuelt"
 
-#. label - service status
-#: src/include/dhcp-server/dialogs2.rb:221
-msgid "DHCP server is running"
-msgstr "DHCP-serveren kjører"
-
-#. label - service status
-#: src/include/dhcp-server/dialogs2.rb:225
-msgid "DHCP server is not running"
-msgstr "DHCP-serveren kjører ikke"
-
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:229
-msgid "&Start DHCP Server Now"
-msgstr "&Start DHCP-serveren nå"
-
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:233
-msgid "S&top DHCP Server Now"
-msgstr "S&topp DHCP-serveren nå"
-
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:241
-msgid "Save Settings and Restart DHCP Server &Now"
-msgstr "Lagre innstillingene og start DHCP-serveren på nytt &nå"
-
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:247
-msgid "Start DHCP Server Now"
-msgstr "Start DHCP-serveren nå"
-
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:249
-msgid "Stop DHCP Server Now"
-msgstr "Stopp DHCP-serveren nå"
-
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:251
-msgid "Save Settings and Restart DHCP Server Now"
-msgstr "Lagre innstillingene og start DHCP-serveren på nytt nå"
-
-#: src/include/dhcp-server/dialogs2.rb:371
+#: src/include/dhcp-server/dialogs2.rb:334
 msgid "DHCP Server Start-up Arguments"
 msgstr "Oppstartsargumenter for DHCP-server"
 
 #. Table - listing available network cards
-#: src/include/dhcp-server/dialogs2.rb:443
+#: src/include/dhcp-server/dialogs2.rb:404
 msgid "Network Cards for DHCP Server"
 msgstr "Nettverkskort for DHCP-server"
 
 #. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:449
+#: src/include/dhcp-server/dialogs2.rb:410
 msgid "Selected"
 msgstr "Valgte"
 
 #. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:451
+#: src/include/dhcp-server/dialogs2.rb:412
 msgid "Interface Name"
 msgstr "Grensesnittnavn"
 
 #. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:453
+#: src/include/dhcp-server/dialogs2.rb:414
 msgid "Device Name"
 msgstr "Enhetsnavn"
 
 #. TRANSLATORS: table header item
 #. Table header item - IP of the host
-#: src/include/dhcp-server/dialogs2.rb:455
-#: src/include/dhcp-server/dialogs2.rb:1650
+#: src/include/dhcp-server/dialogs2.rb:416
+#: src/include/dhcp-server/dialogs2.rb:1602
 msgid "IP"
 msgstr "IP"
 
 #. TRANSLATORS: a push-button
-#: src/include/dhcp-server/dialogs2.rb:462
+#: src/include/dhcp-server/dialogs2.rb:423
 msgid "&Select"
 msgstr "&Velg"
 
 #. TRANSLATORS: a push-button
-#: src/include/dhcp-server/dialogs2.rb:464
+#: src/include/dhcp-server/dialogs2.rb:425
 msgid "&Deselect"
 msgstr "&Velg bort"
 
 #. TRANSLATORS: Table items; Informs that the IP is a DHCP Address
-#: src/include/dhcp-server/dialogs2.rb:533
+#: src/include/dhcp-server/dialogs2.rb:494
 msgid "DHCP address"
 msgstr "DHCP-adresse"
 
 #. TRANSLATORS: popup error, DHCP Server needs to run on one or more interfaces,
 #. currently no one is selected
-#: src/include/dhcp-server/dialogs2.rb:608
+#: src/include/dhcp-server/dialogs2.rb:569
 msgid "At least one network interface must be selected."
 msgstr "Minst ett nettverksgrensesnitt må velges."
 
 #. TRANSLATORS: popup error, DHCP Server requires selected interface to have
 #. at least minimal configuration
-#: src/include/dhcp-server/dialogs2.rb:616
+#: src/include/dhcp-server/dialogs2.rb:577
 #, fuzzy
 #| msgid ""
 #| "The selected network interface is not configured (no assigned IP address \n"
@@ -566,60 +531,60 @@
 
 #. configuration will be saved in ldap?
 #. check box
-#: src/include/dhcp-server/dialogs2.rb:632
-#: src/include/dhcp-server/widgets.rb:1079
+#: src/include/dhcp-server/dialogs2.rb:593
+#: src/include/dhcp-server/widgets.rb:1058
 msgid "&LDAP Support"
 msgstr "&LDAP-støtte"
 
 #. FATE #227, comments #5 and #17
-#: src/include/dhcp-server/dialogs2.rb:639
+#: src/include/dhcp-server/dialogs2.rb:600
 msgid "DHCP Server &Name (optional)"
 msgstr "DHCP-server&navn (valgfritt)"
 
 #. Textentry with name of the domain
-#: src/include/dhcp-server/dialogs2.rb:652
+#: src/include/dhcp-server/dialogs2.rb:613
 msgid "&Domain Name"
 msgstr "&Domenenavn"
 
 #. Textentry with IP address of primary name server
-#: src/include/dhcp-server/dialogs2.rb:654
+#: src/include/dhcp-server/dialogs2.rb:615
 msgid "&Primary Name Server IP"
 msgstr "&Primær navneserver-IP"
 
 #. Textentry with IP address of secondary name server
-#: src/include/dhcp-server/dialogs2.rb:657
+#: src/include/dhcp-server/dialogs2.rb:618
 msgid "&Secondary Name Server IP"
 msgstr "&Sekundær navneserver-IP"
 
 #. Textentry with IP address of default router
-#: src/include/dhcp-server/dialogs2.rb:660
+#: src/include/dhcp-server/dialogs2.rb:621
 msgid "Default &Gateway (Router) "
 msgstr "Standard &systemport (ruter) "
 
 #. Textentry with IP address of time server
-#: src/include/dhcp-server/dialogs2.rb:665
+#: src/include/dhcp-server/dialogs2.rb:626
 msgid "NTP &Time Server"
 msgstr "NTP-&tidsserver"
 
 #. Textentry with IP address of print server
-#: src/include/dhcp-server/dialogs2.rb:667
+#: src/include/dhcp-server/dialogs2.rb:628
 msgid "&Print Server"
 msgstr "&Utskriftsserver"
 
 #. Textentry with IP address of WINS (Windows Internet Naming Service) server
-#: src/include/dhcp-server/dialogs2.rb:669
+#: src/include/dhcp-server/dialogs2.rb:630
 msgid "&WINS Server"
 msgstr "&WINS-server"
 
 #. Textentry with default lease time of IP address from dhcp server
-#: src/include/dhcp-server/dialogs2.rb:674
+#: src/include/dhcp-server/dialogs2.rb:635
 msgid "Default &Lease Time"
 msgstr "Standard tilde&lingstid"
 
 #. Units for defaultleasetime
 #. Combobox - type of units for lease time
-#: src/include/dhcp-server/dialogs2.rb:683
-#: src/include/dhcp-server/dialogs2.rb:1139
+#: src/include/dhcp-server/dialogs2.rb:644
+#: src/include/dhcp-server/dialogs2.rb:1097
 msgid "&Units"
 msgstr "&Enheter"
 
@@ -627,48 +592,48 @@
 #. error popup
 #. error popup
 #. error popup
-#: 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
+#: src/include/dhcp-server/dialogs2.rb:975
+#: src/include/dhcp-server/dialogs2.rb:987
+#: src/include/dhcp-server/dialogs2.rb:999
+#: src/include/dhcp-server/dialogs2.rb:1011
 msgid "The specified value is not a valid hostname or IP address."
 msgstr "Den spesifiserte verdien er ikke et gyldig vertsnavn eller IP-adresse."
 
 #. frame
-#: src/include/dhcp-server/dialogs2.rb:1067
+#: src/include/dhcp-server/dialogs2.rb:1025
 msgid "Subnet Information"
 msgstr "Subnettkonfigurasjon"
 
 #. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1073
+#: src/include/dhcp-server/dialogs2.rb:1031
 msgid "Current &Network"
 msgstr "Gjeldende &nettverk"
 
 #. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1078
+#: src/include/dhcp-server/dialogs2.rb:1036
 msgid "Current Net&mask"
 msgstr "Gjeldende nettverks&maske"
 
 #. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1083
+#: src/include/dhcp-server/dialogs2.rb:1041
 msgid "Netmask Bi&ts"
 msgstr "Nettverksmaskebi&ts"
 
 #. text entry
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1090
+#: src/include/dhcp-server/dialogs2.rb:1048
 #: src/include/dhcp-server/dns-server-dialogs.rb:81
 msgid "Min&imum IP Address"
 msgstr "Laveste &IP-adresse"
 
 #. text entry
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1095
+#: src/include/dhcp-server/dialogs2.rb:1053
 #: src/include/dhcp-server/dns-server-dialogs.rb:83
 msgid "Ma&ximum IP Address"
 msgstr "Hø&yeste IP-adresse"
 
-#: src/include/dhcp-server/dialogs2.rb:1103
+#: src/include/dhcp-server/dialogs2.rb:1061
 msgid "IP Address Range"
 msgstr "IP-adresseområde"
 
@@ -676,10 +641,10 @@
 #. TRANSLATORS: text entry
 #. TRANSLATORS: text entry
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1109
+#: src/include/dhcp-server/dialogs2.rb:1067
 #: 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
+#: src/include/dhcp-server/dns-server-management.rb:355
+#: src/include/dhcp-server/dns-server-management.rb:915
 msgid "&First IP Address"
 msgstr "&Første IP-adresse"
 
@@ -687,61 +652,61 @@
 #. TRANSLATORS: text entry
 #. TRANSLATORS: text entry
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1114
+#: src/include/dhcp-server/dialogs2.rb:1072
 #: 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
+#: src/include/dhcp-server/dns-server-management.rb:357
+#: src/include/dhcp-server/dns-server-management.rb:917
 msgid "&Last IP Address"
 msgstr "&Siste IP-adresse"
 
 #. checkbox
-#: src/include/dhcp-server/dialogs2.rb:1118
-#: src/include/dhcp-server/options.rb:1094
+#: src/include/dhcp-server/dialogs2.rb:1076
+#: src/include/dhcp-server/options.rb:1093
 msgid "Allow Dynamic &BOOTP"
 msgstr "Tillat dynamisk &BOOTP"
 
 #. frame label
-#: src/include/dhcp-server/dialogs2.rb:1124
+#: src/include/dhcp-server/dialogs2.rb:1082
 msgid "Lease Time"
 msgstr "Tildelingstid"
 
 #. Textentry label - lease time for IPs in the range
-#: src/include/dhcp-server/dialogs2.rb:1130
+#: src/include/dhcp-server/dialogs2.rb:1088
 msgid "&Default"
 msgstr "&Standard"
 
 #. TextEntryLabel - max. time for leasing of IPs from the range
-#: src/include/dhcp-server/dialogs2.rb:1148
+#: src/include/dhcp-server/dialogs2.rb:1106
 msgid "&Maximum"
 msgstr "&Maks. tildelingstid"
 
 #. Combobox - type of units for max lease time
-#: src/include/dhcp-server/dialogs2.rb:1158
+#: src/include/dhcp-server/dialogs2.rb:1116
 msgid "Uni&ts"
 msgstr "Enhe&ter"
 
 #. zone is not maintained by the DNS server
 #. zone is maintained and it is a 'master'
-#: src/include/dhcp-server/dialogs2.rb:1360
-#: src/include/dhcp-server/dialogs2.rb:1369
+#: src/include/dhcp-server/dialogs2.rb:1318
+#: src/include/dhcp-server/dialogs2.rb:1327
 msgid "Create New DNS Zone from Scratch"
 msgstr "Opprett ny DNS-sone"
 
-#: src/include/dhcp-server/dialogs2.rb:1371
+#: src/include/dhcp-server/dialogs2.rb:1329
 msgid "Edit Current DNS Zone"
 msgstr "Rediger Gjeldende DNS-sone"
 
 #. zone is maintained but it is not a 'master'
-#: src/include/dhcp-server/dialogs2.rb:1377
+#: src/include/dhcp-server/dialogs2.rb:1335
 msgid "Get Current Zone Information"
 msgstr "Hent informasjon om gjeldende sone"
 
-#: src/include/dhcp-server/dialogs2.rb:1385
+#: src/include/dhcp-server/dialogs2.rb:1343
 msgid "&Synchronize DNS Server..."
 msgstr "&Synkroniser DNS-server..."
 
 #. Show DNS Zone Information
-#: src/include/dhcp-server/dialogs2.rb:1414
+#: src/include/dhcp-server/dialogs2.rb:1372
 msgid ""
 "DNS zone %1 is not a master zone.\n"
 "Therefore, you cannot change it here.\n"
@@ -751,8 +716,8 @@
 
 #. A popup error text
 #. A popup error text
-#: src/include/dhcp-server/dialogs2.rb:1547
-#: src/include/dhcp-server/dialogs2.rb:1555
+#: src/include/dhcp-server/dialogs2.rb:1499
+#: src/include/dhcp-server/dialogs2.rb:1507
 msgid "Enter values for both ends of the IP address range."
 msgstr "Angi start- og sluttverdier for IP-adresseområdet."
 
@@ -760,8 +725,8 @@
 #. %1 is the tested IP which should match network %2 and netmask %3
 #. TRANSLATORS: popup error message
 #. %1 is the tested IP which should match network %2 and netmask %3
-#: src/include/dhcp-server/dialogs2.rb:1594
-#: src/include/dhcp-server/dialogs2.rb:1617
+#: src/include/dhcp-server/dialogs2.rb:1546
+#: src/include/dhcp-server/dialogs2.rb:1569
 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."
@@ -770,127 +735,127 @@
 "IP '%1' samsvarer ikke med nettverket %2/%3."
 
 #. Label of the registered hosts table
-#: src/include/dhcp-server/dialogs2.rb:1642
+#: src/include/dhcp-server/dialogs2.rb:1594
 msgid "Registered Host"
 msgstr "Registrert vertsmaskin"
 
 #. Table header item - Name of the host
-#: src/include/dhcp-server/dialogs2.rb:1648
+#: src/include/dhcp-server/dialogs2.rb:1600
 msgid "Name"
 msgstr "Navn"
 
 #. MAC address of the host
-#: src/include/dhcp-server/dialogs2.rb:1652
+#: src/include/dhcp-server/dialogs2.rb:1604
 msgid "Hardware Address"
 msgstr "Maskinvareadresse"
 
 #. Network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1654
+#: src/include/dhcp-server/dialogs2.rb:1606
 msgid "Type"
 msgstr "Type"
 
 #. Frame label - configuration of particular host
-#: src/include/dhcp-server/dialogs2.rb:1661
+#: src/include/dhcp-server/dialogs2.rb:1613
 msgid "List Setup"
 msgstr "Oppsettliste"
 
 #. Textentry label - name of the host
-#: src/include/dhcp-server/dialogs2.rb:1669
+#: src/include/dhcp-server/dialogs2.rb:1621
 msgid "&Name"
 msgstr "&Navn"
 
 #. Textentry label - IP address of the host
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1674
-#: src/include/dhcp-server/dns-server-management.rb:229
+#: src/include/dhcp-server/dialogs2.rb:1626
+#: src/include/dhcp-server/dns-server-management.rb:228
 msgid "&IP Address"
 msgstr "&IP-Adresse"
 
 #. Textentry label - hardware (mac) address of the host
-#: src/include/dhcp-server/dialogs2.rb:1682
+#: src/include/dhcp-server/dialogs2.rb:1634
 msgid "&Hardware Address"
 msgstr "&Maskinvareadresse"
 
 #. Radiobutton label - network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1689
+#: src/include/dhcp-server/dialogs2.rb:1641
 msgid "&Ethernet"
 msgstr "&Ethernet"
 
-#: src/include/dhcp-server/dialogs2.rb:1691
+#: src/include/dhcp-server/dialogs2.rb:1643
 msgid "&Token Ring"
 msgstr "&Tokenring"
 
 #. Pushbutton label - change host in list
-#: src/include/dhcp-server/dialogs2.rb:1706
+#: src/include/dhcp-server/dialogs2.rb:1658
 msgid "C&hange in List"
 msgstr "E&ndre i liste"
 
 #. Pushbutton label - delete host from list
-#: src/include/dhcp-server/dialogs2.rb:1709
+#: src/include/dhcp-server/dialogs2.rb:1661
 msgid "Dele&te from List"
 msgstr "Slet&te fra liste"
 
 #. now, fill the dialog
 #. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1810
-#: src/include/dhcp-server/options.rb:1039
+#: src/include/dhcp-server/dialogs2.rb:1762
+#: src/include/dhcp-server/options.rb:1038
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1811
-#: src/include/dhcp-server/options.rb:1041
+#: src/include/dhcp-server/dialogs2.rb:1763
+#: src/include/dhcp-server/options.rb:1040
 msgid "Token Ring"
 msgstr "Tokenring"
 
 #. error popup
 #. error popup
-#: src/include/dhcp-server/dialogs2.rb:1885
-#: src/include/dhcp-server/options.rb:935
+#: src/include/dhcp-server/dialogs2.rb:1837
+#: src/include/dhcp-server/options.rb:934
 msgid "The hardware address is invalid.\n"
 msgstr "Maskinvareadressen er ugyldig.\n"
 
 #. error popup
-#: src/include/dhcp-server/dialogs2.rb:1931
+#: src/include/dhcp-server/dialogs2.rb:1883
 msgid "The hardware address must be unique."
 msgstr "Maskinvareadressen må være unik."
 
 #. error popup
-#: src/include/dhcp-server/dialogs2.rb:1941
+#: src/include/dhcp-server/dialogs2.rb:1893
 msgid "The hostname cannot be empty."
 msgstr "Du må angi et vertsnavn."
 
 #. error popup, %1 is host name
-#: src/include/dhcp-server/dialogs2.rb:1951
+#: src/include/dhcp-server/dialogs2.rb:1903
 msgid "A host named %1 already exists."
 msgstr "En vertsmaskin med navnet %1 finnes allerede."
 
 #. error popup
 #. FIXME: text?
-#: src/include/dhcp-server/dialogs2.rb:1969
-#: src/include/dhcp-server/dialogs2.rb:2033
+#: src/include/dhcp-server/dialogs2.rb:1921
+#: src/include/dhcp-server/dialogs2.rb:1985
 msgid "Enter a host IP."
 msgstr "Angi IP for vertsmaskin."
 
 #. error popup
-#: src/include/dhcp-server/dialogs2.rb:1984
+#: src/include/dhcp-server/dialogs2.rb:1936
 msgid "The hardware address must be defined."
 msgstr "Maskinvareadressen må spesifiseres."
 
 #. error popup
 #. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:2005
-#: src/include/dhcp-server/dialogs2.rb:2020
+#: src/include/dhcp-server/dialogs2.rb:1957
+#: src/include/dhcp-server/dialogs2.rb:1972
 msgid "Select a host first."
 msgstr "Velg en vertsmaskin først."
 
 #. checking new MAC
-#: src/include/dhcp-server/dialogs2.rb:2047
+#: src/include/dhcp-server/dialogs2.rb:1999
 msgid "The input value must be defined."
 msgstr "Verdien må spesifiseres."
 
 #. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:2086
+#: src/include/dhcp-server/dialogs2.rb:2038
 msgid ""
 "If you enter the expert settings, you cannot return \n"
 "to this dialog. You may be able to display this dialog \n"
@@ -910,15 +875,15 @@
 "Vil du fortsette?"
 
 #. remove leading '-'
-#: src/include/dhcp-server/dialogs2.rb:2133
+#: src/include/dhcp-server/dialogs2.rb:2085
 msgid "\"-%1\" is not a valid DHCP server commandline option"
 msgstr "\"-%1\" er ikke et gyldig kommandolinjevalg for DHCP-serveren"
 
-#: src/include/dhcp-server/dialogs2.rb:2144
+#: src/include/dhcp-server/dialogs2.rb:2096
 msgid "DHCP server commandline option \"-%1\" requires an argument"
 msgstr "Kommandolinjevalget \"-%1\" for DHCP-serveren krever et argument"
 
-#: src/include/dhcp-server/dialogs2.rb:2155
+#: src/include/dhcp-server/dialogs2.rb:2107
 msgid ""
 "You have specified an alternate configuration file for the DHCP server.\n"
 "\n"
@@ -937,7 +902,7 @@
 "Vil du fortsette likevel?\n"
 
 #. dialog caption, %1 is step number
-#: src/include/dhcp-server/dialogs2.rb:2236
+#: src/include/dhcp-server/dialogs2.rb:2179
 msgid "DHCP Server Wizard (%1 of 4)"
 msgstr "Veiviser for DHCP-server (%1 av 4)"
 
@@ -1227,7 +1192,7 @@
 #. TRANSLATORS: popup error
 #. TRANSLATORS: popup error
 #: src/include/dhcp-server/dns-server-dialogs.rb:228
-#: src/include/dhcp-server/dns-server-management.rb:455
+#: src/include/dhcp-server/dns-server-management.rb:454
 msgid "The last IP address must be higher than the first one."
 msgstr "Den siste IP-adressen må være høyere enn den første."
 
@@ -1254,7 +1219,7 @@
 #. TRANSLATORS: popup error, followed by a newline and a valid hostname description
 #. TRANSLATORS: popup error, followed by a newline and a valid hostname description
 #: src/include/dhcp-server/dns-server-dialogs.rb:453
-#: src/include/dhcp-server/dns-server-management.rb:256
+#: src/include/dhcp-server/dns-server-management.rb:255
 msgid "Invalid hostname."
 msgstr "Ugyldig vertsnavn."
 
@@ -1265,9 +1230,9 @@
 #. TRANSLATORS: popup error, followed by a newline and a valid IPv4 description
 #: src/include/dhcp-server/dns-server-dialogs.rb:462
 #: src/include/dhcp-server/dns-server-dialogs.rb:490
-#: src/include/dhcp-server/dns-server-management.rb:265
-#: src/include/dhcp-server/dns-server-management.rb:394
-#: src/include/dhcp-server/dns-server-management.rb:402
+#: src/include/dhcp-server/dns-server-management.rb:264
+#: src/include/dhcp-server/dns-server-management.rb:393
+#: src/include/dhcp-server/dns-server-management.rb:401
 msgid "Invalid IP address."
 msgstr "Ugyldig IP-adresse."
 
@@ -1285,44 +1250,44 @@
 "IP-adresser (%2-%3) som er definert for DHCP-serveren.\n"
 
 #. TRANSLATORS: busy message
-#: src/include/dhcp-server/dns-server-management.rb:157
+#: src/include/dhcp-server/dns-server-management.rb:156
 msgid "Regenerating DNS zone entries..."
 msgstr "Genererer DNS-soneoppføringer på nytt..."
 
 #. TRANSLATORS: dialog frame label
-#: src/include/dhcp-server/dns-server-management.rb:224
+#: src/include/dhcp-server/dns-server-management.rb:223
 msgid "Adding a New DNS Record"
 msgstr "Legge til ny DNS-oppføring"
 
 #. TRANSLATORS: text entry
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:227
+#: src/include/dhcp-server/dns-server-management.rb:226
 #: src/include/dhcp-server/dns-server-wizard.rb:148
 msgid "&Hostname"
 msgstr "&Vertsmaskinnavn"
 
 #. TRANSLATORS: busy message
 #. %1 is the first IP address of the range, %2 is the last one
-#: src/include/dhcp-server/dns-server-management.rb:317
+#: src/include/dhcp-server/dns-server-management.rb:316
 msgid "Adding DHCP range %1-%2 to the DNS server..."
 msgstr "Legger til DHCP-område %1-%2 for DNS-server..."
 
 #. TRANSLATORS: dialog frame label
 #. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:353
-#: src/include/dhcp-server/dns-server-management.rb:955
+#: src/include/dhcp-server/dns-server-management.rb:352
+#: src/include/dhcp-server/dns-server-management.rb:953
 msgid "Removing DNS Records Matching Range"
 msgstr "Fjerne samsvarsområde for DNS-oppføringer"
 
 #. TRANSLATORS: busy message
 #. %1 is the first IP address of the range, %2 is the last one
-#: src/include/dhcp-server/dns-server-management.rb:465
+#: src/include/dhcp-server/dns-server-management.rb:464
 msgid "Removing records in the range %1-%2 from the DNS server..."
 msgstr "Fjerner oppføringer i området %1-%2 fra DNS-server..."
 
 #. TRANSLATORS: popup error, %1 is the zone name
 #. please, do not translate 'master' (exact DNS definition)
-#: src/include/dhcp-server/dns-server-management.rb:556
+#: src/include/dhcp-server/dns-server-management.rb:555
 msgid ""
 "Zone %1 is not of the type master.\n"
 "The DNS server cannot write any records to it.\n"
@@ -1331,7 +1296,7 @@
 "DNS-serveren kan ikke lagre oppføringer her.\n"
 
 #. TRANSLATORS: popup question, %1 is a DNS zone name
-#: src/include/dhcp-server/dns-server-management.rb:570
+#: src/include/dhcp-server/dns-server-management.rb:569
 msgid ""
 "Zone %1 does not yet exist in the current DNS server configuration.\n"
 "Create it?\n"
@@ -1341,18 +1306,18 @@
 
 #. TRANSLATORS: popup error, %1 is a zone name
 #. TRANSLATORS: error message, %1 is a zone name
-#: src/include/dhcp-server/dns-server-management.rb:590
+#: src/include/dhcp-server/dns-server-management.rb:589
 #: src/include/dhcp-server/dns-server-wizard.rb:1107
 msgid "Cannot create zone %1."
 msgstr "Kan ikke opprette sonen %1."
 
 #. TRANSLATORS: busy message
-#: src/include/dhcp-server/dns-server-management.rb:815
+#: src/include/dhcp-server/dns-server-management.rb:813
 msgid "Synchronizing DNS reverse records..."
 msgstr "Synkroniserer reverserte DNS-oppføringer..."
 
 #. TRANSLATORS: popup question - canceling dns synchronization with dhcp
-#: src/include/dhcp-server/dns-server-management.rb:860
+#: src/include/dhcp-server/dns-server-management.rb:858
 msgid ""
 "If you cancel, all changes made to the DNS server will be lost.\n"
 "Really cancel this operation?\n"
@@ -1361,62 +1326,62 @@
 "Vil du virkelig avbryte denne handlingen?\n"
 
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:909
+#: src/include/dhcp-server/dns-server-management.rb:907
 msgid "&Domain"
 msgstr "&Domene"
 
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:911
+#: src/include/dhcp-server/dns-server-management.rb:909
 msgid "&Network"
 msgstr "&Nettverk"
 
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:913
+#: src/include/dhcp-server/dns-server-management.rb:911
 msgid "Net&mask"
 msgstr "Nettverks&maske"
 
 #. TRANSLATORS: table label
-#: src/include/dhcp-server/dns-server-management.rb:923
+#: src/include/dhcp-server/dns-server-management.rb:921
 msgid "DNS Zone Records"
 msgstr "DNS-soneoppføringer"
 
 #. TRANSLATORS: table header item
-#: src/include/dhcp-server/dns-server-management.rb:928
+#: src/include/dhcp-server/dns-server-management.rb:926
 msgid "Hostname"
 msgstr "Vertsnavn"
 
 #. TRANSLATORS: table header item
-#: src/include/dhcp-server/dns-server-management.rb:930
+#: src/include/dhcp-server/dns-server-management.rb:928
 msgid "Assigned IP"
 msgstr "Tilordnet IP"
 
 #. TRANSLATORS: push button
-#: src/include/dhcp-server/dns-server-management.rb:937
+#: src/include/dhcp-server/dns-server-management.rb:935
 msgid "&Add..."
 msgstr "Le&gg til..."
 
 #. TRANSLATORS: menu button
-#: src/include/dhcp-server/dns-server-management.rb:945
+#: src/include/dhcp-server/dns-server-management.rb:943
 msgid "&Special Tasks"
 msgstr "&Spesielle oppgaver"
 
 #. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:953
+#: src/include/dhcp-server/dns-server-management.rb:951
 msgid "Add New Range of DNS Records"
 msgstr "Legg til nytt område for DNS-oppføringer"
 
 #. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:959
+#: src/include/dhcp-server/dns-server-management.rb:957
 msgid "Run Wizard to Rewrite the DNS Zone from Scratch"
 msgstr "Kjør veiviseren for å opprette DNS-sonen på nytt"
 
 #. TRANSLATORS: checkbox, %1 is a zone name
-#: src/include/dhcp-server/dns-server-management.rb:1031
+#: src/include/dhcp-server/dns-server-management.rb:1029
 msgid "Synchronize with Reverse Zone %1"
 msgstr "Synkroniser med baklengssone %1"
 
 #. TRANSLATORS: dialog caption
-#: src/include/dhcp-server/dns-server-management.rb:1084
+#: src/include/dhcp-server/dns-server-management.rb:1082
 msgid "DHCP Server: DNS Server Synchronization"
 msgstr "DHCP-server: Synkronisering av DNS-server"
 
@@ -1712,8 +1677,7 @@
 "Vent...</p>"
 
 #. help text 1/2
-#. help text 1/2
-#: src/include/dhcp-server/helps.rb:24 src/include/dhcp-server/helps.rb:233
+#: src/include/dhcp-server/helps.rb:24
 msgid ""
 "<p><b><big>Network Interfaces</big></b><br>\n"
 "Select the network interfaces to which the DHCP server should listen from\n"
@@ -1740,20 +1704,9 @@
 "Dette alternativet er tilgjengelig bare dersom brannmuren\n"
 "er aktivert.</p>"
 
-#. help text 1/5
+#. help text 2/5
 #: src/include/dhcp-server/helps.rb:39
 msgid ""
-"<p><b><big>DHCP Server</big></b></p>\n"
-"<p>To run the DHCP server every time your computer is started, set\n"
-"<b>Start DHCP Server</b>.</p>"
-msgstr ""
-"<p><b><big>Start DHCP-server</big></b><br>\n"
-"For å kjøre DHCP-serveren hver gang datamaskinen starter opp, velg\n"
-"<b>Start DHCP-server</b>.</p>"
-
-#. help text 2/5
-#: src/include/dhcp-server/helps.rb:45
-msgid ""
 "<p>\n"
 "To run the DHCP server in chroot jail, set\n"
 "<b>Run DHCP Server in Chroot Jail</b>. Starting any daemon in a chroot jail\n"
@@ -1765,7 +1718,7 @@
 "øker sikkerheten og anbefales sterkt.</p>"
 
 #. help text 3/5
-#: src/include/dhcp-server/helps.rb:52
+#: src/include/dhcp-server/helps.rb:46
 msgid ""
 "<p>\n"
 "To store the DHCP configuration in LDAP,\n"
@@ -1776,7 +1729,7 @@
 "aktiver <b>LDAP-støtte</b>.</p>"
 
 #. help text 4/5
-#: src/include/dhcp-server/helps.rb:58
+#: src/include/dhcp-server/helps.rb:52
 msgid ""
 "<p><b>Configured Declarations</b> shows the configuration options in use.\n"
 "To modify an existing declaration, select it and click <b>Edit</b>.\n"
@@ -1791,7 +1744,7 @@
 "Velg en deklarasjon og klikk <b>Slett</b> for å slette den.</p>"
 
 #. help text 5/5
-#: src/include/dhcp-server/helps.rb:66
+#: src/include/dhcp-server/helps.rb:60
 msgid ""
 "<p><b><big>Advanced Functions</big></b><br>\n"
 "Use <b>Advanced</b> to display the log of the DHCP server,\n"
@@ -1806,7 +1759,7 @@
 "dynamiske DNS-oppdateringer.</p>"
 
 #. help text 1/3, alt. 1
-#: src/include/dhcp-server/helps.rb:74
+#: src/include/dhcp-server/helps.rb:68
 msgid ""
 "<p><b><big>Subnet Configuration</big></b><br>\n"
 "Set the <b>Network Address</b> and <b>Network Mask</b> of the subnet.</p>"
@@ -1815,7 +1768,7 @@
 "Angi <b>Nettverksadresse</b> og <b>Nettverksmaske</b>.</p>"
 
 #. help text 1/3, alt. 1
-#: src/include/dhcp-server/helps.rb:78
+#: src/include/dhcp-server/helps.rb:72
 msgid ""
 "<p><b><big>Host with Fixed Address</big></b><br>\n"
 "Set the name of the host for which to set the fixed address or other\n"
@@ -1826,7 +1779,7 @@
 "spesielle valg.</p>"
 
 #. help text 1/3, alt. 3
-#: src/include/dhcp-server/helps.rb:84
+#: src/include/dhcp-server/helps.rb:78
 msgid ""
 "<p><b><big>Group-Specific Options</big></b><br>\n"
 "Set the name of the group of declarations in <b>Group Name</b>.  \n"
@@ -1839,7 +1792,7 @@
 "Navnet påvirker ikke funksjonen til DHCP-serveren.</p>"
 
 #. help text 1/3, alt. 4
-#: src/include/dhcp-server/helps.rb:91
+#: src/include/dhcp-server/helps.rb:85
 msgid ""
 "<p><b><big>Pool of Addresses</big></b><br>\n"
 "Set the name of the pool of addresses in <b>Pool Name</b>. \n"
@@ -1852,7 +1805,7 @@
 "Navnet påvirker ikke funksjonen til DHCP-serveren.</p>"
 
 #. help text 1/3, alt. 5
-#: src/include/dhcp-server/helps.rb:98
+#: src/include/dhcp-server/helps.rb:92
 msgid ""
 "<p><b><big>Shared Network</big></b><br>\n"
 "Set the name for the shared network in <b>Shared Network Name</b>. \n"
@@ -1865,7 +1818,7 @@
 "Navnet påvirker ikke funksjonen til DHCP-serveren.</p>"
 
 #. help text 1/3, alt. 6
-#: src/include/dhcp-server/helps.rb:105
+#: src/include/dhcp-server/helps.rb:99
 msgid ""
 "<p><b><big>Class</big></b><br>\n"
 "Set the name of the class of hosts in <b>Class Name</b>.</p>"
@@ -1874,7 +1827,7 @@
 "Angi et navn for vertsmaskinklassen under <b>Klassenavn</b>.</p>"
 
 #. help text 2/3
-#: src/include/dhcp-server/helps.rb:109
+#: src/include/dhcp-server/helps.rb:103
 msgid ""
 "<p>\n"
 "To edit DHCP options, choose the appropriate\n"
@@ -1889,7 +1842,7 @@
 "et alternativ, velg alternativet og klikk <b>Slett</b>.</p>"
 
 #. help text 3/3
-#: src/include/dhcp-server/helps.rb:117
+#: src/include/dhcp-server/helps.rb:111
 msgid ""
 "<p>\n"
 "To adjust dynamic DNS for hosts of this subnet, use <b>Dynamic DNS</b>.</p>"
@@ -1898,7 +1851,7 @@
 "Bruk <b>Dynamisk DNS</b> for å justere dynamisk DNS for vertsmaskinene i subnettet.</p>"
 
 #. help text 1/4
-#: src/include/dhcp-server/helps.rb:121
+#: src/include/dhcp-server/helps.rb:115
 msgid ""
 "<p><b><big>Enabling Dynamic DNS</big></b><br>\n"
 "To enable Dynamic DNS updates for this subnet, set\n"
@@ -1909,7 +1862,7 @@
 "<b>Aktiver dynamisk DNS for dette subnettet</b>.</p>"
 
 #. help text 2/4
-#: src/include/dhcp-server/helps.rb:127
+#: src/include/dhcp-server/helps.rb:121
 msgid ""
 "<p><b><big>TSIG Key</big></b><br>\n"
 "To make Dynamic DNS updates, the authentication key must be set. Use\n"
@@ -1924,7 +1877,7 @@
 "og baklengs navnesone.</p>"
 
 #. help text 3/4
-#: src/include/dhcp-server/helps.rb:135
+#: src/include/dhcp-server/helps.rb:129
 msgid ""
 "<p><b><big>Global DHCP Server Settings</big></b><br>\n"
 "Global settings of DHCP server must be updated to make Dynamic\n"
@@ -1937,7 +1890,7 @@
 "<b>Oppdater generelle innstillinger for dynamisk DNS</b>.</p>"
 
 #. help text 4/4
-#: src/include/dhcp-server/helps.rb:142
+#: src/include/dhcp-server/helps.rb:136
 msgid ""
 "<p><b><big>Zones to Update</big></b><br>\n"
 "Specify forward and reverse zones to update. For both, also specify \n"
@@ -1950,7 +1903,7 @@
 "serveren, kan du la feltene være tomme.</p>"
 
 #. help text
-#: src/include/dhcp-server/helps.rb:149
+#: src/include/dhcp-server/helps.rb:143
 msgid ""
 "<p><b><big>DHCP Server Start-Up Arguments</big></b><br>\n"
 "Here you can specify parameters that you want DHCP Server to be started with \n"
@@ -1963,7 +1916,7 @@
 "på manualsiden for dhcpd. Standardverdier vil bli brukt dersom ingen argumenter angis.</p>"
 
 #. Wizard Installation - Step 1 (version for expert UI)
-#: src/include/dhcp-server/helps.rb:156
+#: src/include/dhcp-server/helps.rb:150
 msgid ""
 "<p><b><big>Network Card Selection</big></b><br>\n"
 "Select one or more of the listed network cards to use for the DHCP server.</p>\n"
@@ -1972,7 +1925,7 @@
 "Velg ett eller flere nettverkskort som skal brukes for DHCP-serveren.</p>\n"
 
 #. Optional field - used with LDAP support
-#: src/include/dhcp-server/helps.rb:160
+#: src/include/dhcp-server/helps.rb:154
 msgid ""
 "Optionally, you can also specify <b>DHCP Server Name</b>\n"
 "(the name of dhcpServer LDAP object), if it differs from your hostname.\n"
@@ -1981,7 +1934,7 @@
 "(navnet på LDAP-objektet dhcpServer) dersom dette avviker fra vertsnavnet.\n"
 
 #. Wizard Installation - Step 2 1/9
-#: src/include/dhcp-server/helps.rb:164
+#: src/include/dhcp-server/helps.rb:158
 msgid ""
 "<p><b><big>Global Settings</big></b><br>\n"
 "Here, make several DHCP settings.</p>"
@@ -1991,7 +1944,7 @@
 
 #. Wizard Installation - Step 2 2/9
 #. Wizard Installation - Step 2 3/9 (2 is removed)
-#: src/include/dhcp-server/helps.rb:171
+#: src/include/dhcp-server/helps.rb:165
 msgid ""
 "<p><b>Domain Name</b> sets the domain for which the DHCP server\n"
 "leases IPs to clients.</p>"
@@ -2000,7 +1953,7 @@
 "tildeler IP-adresser til klientene.</p>"
 
 #. Wizard Installation - Step 2 4/9
-#: src/include/dhcp-server/helps.rb:175
+#: src/include/dhcp-server/helps.rb:169
 msgid ""
 "<p><b>Primary Name Server IP</b> and <b>Secondary Name Server IP</b> \n"
 "offer these name servers to the DHCP clients.\n"
@@ -2011,7 +1964,7 @@
 "Disse verdiene må være IP-adresser.</p>"
 
 #. Wizard Installation - Step 2 5/9
-#: src/include/dhcp-server/helps.rb:181
+#: src/include/dhcp-server/helps.rb:175
 msgid ""
 "<p><b>Default Gateway</b> inserts this\n"
 "value as the default route in the routing table of clients.</p>"
@@ -2020,19 +1973,19 @@
 "verdien som standardrute i klientenes rutingtabell.</p>"
 
 #. Wizard Installation - Step 2 6/9
-#: src/include/dhcp-server/helps.rb:185
+#: src/include/dhcp-server/helps.rb:179
 msgid ""
 "<p><b>Time Server</b> tells clients to use this server\n"
 "for time synchronization.</p>"
 msgstr "<p><b>Tidsserver</b> forteller klientene at de skal bruke denne serveren til tidssynkronisering.</p>"
 
 #. Wizard Installation - Step 2 7/9
-#: src/include/dhcp-server/helps.rb:189
+#: src/include/dhcp-server/helps.rb:183
 msgid "<p><b>Print Server</b> offers this server as the default print server.</p>"
 msgstr "<p><b>Utskriftsserver</b> definerer standard utskriftsserver.</p>"
 
 #. Wizard Installation - Step 2 8/9
-#: src/include/dhcp-server/helps.rb:193
+#: src/include/dhcp-server/helps.rb:187
 msgid ""
 "<p><b>WINS Server</b> offers this server as the WINS server\n"
 "(Windows Internet Naming Service).</p>"
@@ -2041,7 +1994,7 @@
 "(Windows Internet Naming Service).</p>"
 
 #. Wizard Installation - Step 2 9/9
-#: src/include/dhcp-server/helps.rb:197
+#: src/include/dhcp-server/helps.rb:191
 msgid ""
 "<p><b>Default Lease Time</b> sets the time after which the leased IP expires\n"
 "and the client must ask for an IP again.</p>"
@@ -2050,7 +2003,7 @@
 "slik at klienten må be om en ny IP-adresse.</p>"
 
 #. Wizard Installation - Step 3 1/4
-#: src/include/dhcp-server/helps.rb:201
+#: src/include/dhcp-server/helps.rb:195
 msgid ""
 "<p><b><big>Subnet Information</big></b></br>\n"
 "View information about the current subnet, such as its address,\n"
@@ -2063,7 +2016,7 @@
 "</p>\n"
 
 #. Wizard Installation - Step 3 2/4
-#: src/include/dhcp-server/helps.rb:208
+#: src/include/dhcp-server/helps.rb:202
 msgid ""
 "<p><b><big>IP Address Range</big></b><br>\n"
 "Set the <b>First IP Address</b> and the <b>Last IP Address</b>\n"
@@ -2080,7 +2033,7 @@
 "og ordinære DHCP-klienter.</p>\n"
 
 #. Wizard Installation - Step 3 3/4
-#: src/include/dhcp-server/helps.rb:217
+#: src/include/dhcp-server/helps.rb:211
 msgid ""
 "<p><b><big>Lease Time</big></b><br>\n"
 "Set the <b>Default</b> lease time for the current IP address range,\n"
@@ -2091,7 +2044,7 @@
 "Dette definerer den optimale IP-oppdateringstiden for klientene.<br></p>"
 
 #. Wizard Installation - Step 3 4/4
-#: src/include/dhcp-server/helps.rb:223
+#: src/include/dhcp-server/helps.rb:217
 msgid ""
 "<p><b>Maximum</b> (optional value) sets the maximum time period\n"
 "for which this IP is blocked for the client on the DHCP server.</p>"
@@ -2100,7 +2053,7 @@
 "når denne IP-adressen er sperret på DHCP-serveren for klienten.</p>"
 
 #. Help text
-#: src/include/dhcp-server/helps.rb:227
+#: src/include/dhcp-server/helps.rb:221
 msgid ""
 "<p><b><big>Expert Configuration</big></b><br>\n"
 "To enter the complete configuration of the DHCP server, click\n"
@@ -2111,7 +2064,7 @@
 "<b>Avansert konfigurasjon av DHCP-server</b>.</p>"
 
 #. host management help 1/3
-#: src/include/dhcp-server/helps.rb:239
+#: src/include/dhcp-server/helps.rb:227
 msgid ""
 "<p><b><big>Host Management</big></b><br>\n"
 "Use this dialog to edit hosts with static address binding.</p>"
@@ -2120,7 +2073,7 @@
 "Bruk denne dialogen for å redigere vertsmaskiner med statisk adressebinding.</p>"
 
 #. host management help 1/3
-#: src/include/dhcp-server/helps.rb:243
+#: src/include/dhcp-server/helps.rb:231
 msgid ""
 "<p>To add a new new host, set its <b>Name</b>,\n"
 "<b>Hardware Address</b>, and <b>IP Address</b>\n"
@@ -2135,17 +2088,17 @@
 "rediger alle verdiene og klikk <b>Endre i liste</b>.</p>"
 
 #. host management help 1/3
-#: src/include/dhcp-server/helps.rb:251
+#: src/include/dhcp-server/helps.rb:239
 msgid "<p>To remove a host, select it and click <b>Delete from List</b>.</p>"
 msgstr "<p>For å fjerne en vertsmaskin, velg den og klikk <b>Slett fra liste</b>.</p>"
 
 #. help text 1/7
-#: src/include/dhcp-server/helps.rb:263
+#: src/include/dhcp-server/helps.rb:251
 msgid "<p>Select the type of declaration to add.</p>"
 msgstr "<p>Velg deklarasjonstypen som skal legges til.</p>"
 
 #. help text 2/7, optional
-#: src/include/dhcp-server/helps.rb:269
+#: src/include/dhcp-server/helps.rb:257
 msgid ""
 "<p>To add a network declaration,\n"
 "select <b>Subnet</b>.</p>"
@@ -2154,7 +2107,7 @@
 "velg <b>Subnett</b>.</p>"
 
 #. help text 3/7, optional
-#: src/include/dhcp-server/helps.rb:276
+#: src/include/dhcp-server/helps.rb:264
 msgid ""
 "<p>To add a host that needs special parameters\n"
 "(usually a fixed address), select <b>Host</b>.</p>"
@@ -2163,7 +2116,7 @@
 "(vanligvis en fast adresse), velg <b>Vertsmaskin</b>.</p>"
 
 #. help text 4/7, optional
-#: src/include/dhcp-server/helps.rb:285
+#: src/include/dhcp-server/helps.rb:273
 msgid ""
 "<p>To add a shared network (physical network with\n"
 "multiple logical networks), select <b>Shared Network</b>.</p>"
@@ -2172,7 +2125,7 @@
 "flere logiske nettverk), velg <b>Delt nettverk</b>.</p>"
 
 #. help text 5/7, optional
-#: src/include/dhcp-server/helps.rb:294
+#: src/include/dhcp-server/helps.rb:282
 msgid ""
 "<p>To add a group of other declarations (usually\n"
 "if they should share some settings), select <b>Group</b>.</p>"
@@ -2181,7 +2134,7 @@
 "fordi de deler noen innstillinger, velg <b>Gruppe</b>.</p>"
 
 #. help text 6/7, optional
-#: src/include/dhcp-server/helps.rb:303
+#: src/include/dhcp-server/helps.rb:291
 msgid ""
 "<p>To add a pool of addresses that will be treated\n"
 "differently than other address pools although they are in the same\n"
@@ -2192,7 +2145,7 @@
 "subnett, velg <b>Adresseutvalg</b>.</p>"
 
 #. help text 7/7, optional
-#: src/include/dhcp-server/helps.rb:314
+#: src/include/dhcp-server/helps.rb:302
 msgid ""
 "<p>To create a condition class that can be used for\n"
 "handling clients differently depending on the class to which they belong,\n"
@@ -2205,23 +2158,23 @@
 #. selection box
 #. selection box
 #. selection box
-#: src/include/dhcp-server/options.rb:454
-#: src/include/dhcp-server/options.rb:475
-#: src/include/dhcp-server/options.rb:568
-#: src/include/dhcp-server/options.rb:781
-#: src/include/dhcp-server/options.rb:857
+#: src/include/dhcp-server/options.rb:453
+#: src/include/dhcp-server/options.rb:474
+#: src/include/dhcp-server/options.rb:567
+#: src/include/dhcp-server/options.rb:780
+#: src/include/dhcp-server/options.rb:856
 msgid "A&ddresses"
 msgstr "A&dresser"
 
 #. popup message
-#: src/include/dhcp-server/options.rb:470
+#: src/include/dhcp-server/options.rb:469
 msgid "The entered address is not valid."
 msgstr "Denne adressen er ikke gyldig."
 
 #. message popup
 #. message popup
-#: src/include/dhcp-server/options.rb:490
-#: src/include/dhcp-server/options.rb:543
+#: src/include/dhcp-server/options.rb:489
+#: src/include/dhcp-server/options.rb:542
 msgid "At least one address must be specified."
 msgstr "Minst én adresse må spesifiseres."
 
@@ -2231,94 +2184,94 @@
 #. @param [String] key string option key
 #. @param [Hash] event map event to be handled
 #. selection box
-#: src/include/dhcp-server/options.rb:512
-#: src/include/dhcp-server/options.rb:528
-#: src/include/dhcp-server/options.rb:819
+#: src/include/dhcp-server/options.rb:511
+#: src/include/dhcp-server/options.rb:527
+#: src/include/dhcp-server/options.rb:818
 msgid "&Values"
 msgstr "&Verdier"
 
 #. message popup
-#: src/include/dhcp-server/options.rb:563
+#: src/include/dhcp-server/options.rb:562
 msgid "The entered addresses are not valid."
 msgstr "Disse adressene er ikke gyldige."
 
 #. message popup
-#: src/include/dhcp-server/options.rb:583
+#: src/include/dhcp-server/options.rb:582
 msgid "At least one address pair must be specified."
 msgstr "Minst ett adressepar må spesifiseres."
 
 #. table item, means switched on
 #. table item, means switched on
-#: src/include/dhcp-server/options.rb:620
-#: src/include/dhcp-server/options.rb:661
+#: src/include/dhcp-server/options.rb:619
+#: src/include/dhcp-server/options.rb:660
 msgid "On"
 msgstr "På"
 
 #. table item, means switched off
 #. table item, means switched off
-#: src/include/dhcp-server/options.rb:623
-#: src/include/dhcp-server/options.rb:664
+#: src/include/dhcp-server/options.rb:622
+#: src/include/dhcp-server/options.rb:663
 msgid "Off"
 msgstr "Av"
 
 #. popup message
-#: src/include/dhcp-server/options.rb:694
+#: src/include/dhcp-server/options.rb:693
 msgid "A value must be specified."
 msgstr "En verdi må spesifiseres."
 
 #. text entry
-#: src/include/dhcp-server/options.rb:786
+#: src/include/dhcp-server/options.rb:785
 msgid "&New Address"
 msgstr "&Ny adresse"
 
 #. int field
-#: src/include/dhcp-server/options.rb:824
+#: src/include/dhcp-server/options.rb:823
 msgid "&New Value"
 msgstr "&Ny Verdi"
 
 #. label (in role of help text)
-#: src/include/dhcp-server/options.rb:861
+#: src/include/dhcp-server/options.rb:860
 msgid "Separate multiple addresses with spaces."
 msgstr "Adressene må være adskilt av mellomrom."
 
 #. push button
-#: src/include/dhcp-server/options.rb:864
+#: src/include/dhcp-server/options.rb:863
 msgid "&Add Address Pair"
 msgstr "&Legg til adressepar"
 
 #. popup message
-#: src/include/dhcp-server/options.rb:1008
+#: src/include/dhcp-server/options.rb:1007
 msgid "The lowest address must be lower than the highest one."
 msgstr "Den laveste adressen må være lavere enn den høyeste."
 
 #. label -- help text
-#: src/include/dhcp-server/options.rb:1024
+#: src/include/dhcp-server/options.rb:1023
 msgid "If you change this, also update the syslog configuration."
 msgstr "Hvis du endrer dette, må du også oppdatere syslog-konfigurasjonen."
 
 #. combo box
-#: src/include/dhcp-server/options.rb:1036
+#: src/include/dhcp-server/options.rb:1035
 msgid "&Hardware Type"
 msgstr "&Maskinvaretype"
 
 #. test entry, MAC better not to be translated,
 #. translation would decrease the understandability
-#: src/include/dhcp-server/options.rb:1046
+#: src/include/dhcp-server/options.rb:1045
 msgid "&MAC Address"
 msgstr "&MAC-adresse"
 
 #. text entry
-#: src/include/dhcp-server/options.rb:1089
+#: src/include/dhcp-server/options.rb:1088
 msgid "&Lowest IP Address"
 msgstr "&Laveste IP-adresse"
 
 #. text entry
-#: src/include/dhcp-server/options.rb:1091
+#: src/include/dhcp-server/options.rb:1090
 msgid "&Highest IP Address"
 msgstr "&Høyeste IP-adresse"
 
 #. Yes-No popup
-#: src/include/dhcp-server/widgets.rb:174
+#: src/include/dhcp-server/widgets.rb:191
 msgid ""
 "If you leave the DHCP server configuration without saving,\n"
 "all changes will be lost. Really leave?"
@@ -2327,7 +2280,7 @@
 "vil alle endringer vil gå tapt. Vil du avslutte likevel?"
 
 #. yes-no popup
-#: src/include/dhcp-server/widgets.rb:355
+#: src/include/dhcp-server/widgets.rb:311
 msgid ""
 "The port in firewall is not open. The DHCP server\n"
 "will not be able to serve your network.\n"
@@ -2338,7 +2291,7 @@
 "Vil du fortsette?"
 
 #. TRANSLATORS: popup error message, %1 is list of network interfaces
-#: src/include/dhcp-server/widgets.rb:383
+#: src/include/dhcp-server/widgets.rb:339
 msgid ""
 "The network interfaces listed below are not mentioned in any firewall zone.\n"
 "%1\n"
@@ -2349,7 +2302,7 @@
 "De kan tilordnes en sone i brannmurmodulen i YaST."
 
 #. TRANSLATORS: popup error message, %1 a network interface name
-#: src/include/dhcp-server/widgets.rb:398
+#: src/include/dhcp-server/widgets.rb:354
 msgid ""
 "Network interface %1 is not mentioned in any firewall zone.\n"
 "Run the YaST firewall configuration to assign it to a zone."
@@ -2359,8 +2312,8 @@
 
 #. popup message
 #. popup message
-#: src/include/dhcp-server/widgets.rb:424
-#: src/include/dhcp-server/widgets.rb:653
+#: src/include/dhcp-server/widgets.rb:374
+#: src/include/dhcp-server/widgets.rb:588
 msgid ""
 "This function is not available during\n"
 "preparation for autoinstallation."
@@ -2368,199 +2321,188 @@
 "Denne funksjonen er ikke tilgjengelig under\n"
 "forberedelser til autoinstallasjon."
 
-#. menubutton entry, try to keep short
-#: src/include/dhcp-server/widgets.rb:445
-msgid "Restart DHCP Server"
-msgstr "Start DHCP-serveren på nytt"
-
-#. menubutton entry, try to keep short
-#: src/include/dhcp-server/widgets.rb:450
-msgid "Save Settings and Restart DHCP Server"
-msgstr "Lagre innstillingene og start DHCP-serveren på nytt"
-
 #. tree widget
 #. tree widget
-#: src/include/dhcp-server/widgets.rb:548
-#: src/include/dhcp-server/widgets.rb:1097
+#: src/include/dhcp-server/widgets.rb:484
+#: src/include/dhcp-server/widgets.rb:1076
 msgid "&Configured Declarations"
 msgstr "&Konfigurerte deklarasjoner"
 
 #. push button
-#: src/include/dhcp-server/widgets.rb:637
+#: src/include/dhcp-server/widgets.rb:572
 msgid "&Dynamic DNS"
 msgstr "&Dynamisk DNS"
 
 #. combo box
 #. combo box
-#: src/include/dhcp-server/widgets.rb:733
-#: src/include/dhcp-server/widgets.rb:1239
+#: src/include/dhcp-server/widgets.rb:668
+#: src/include/dhcp-server/widgets.rb:1219
 msgid "Forward Zone TSIG &Key"
 msgstr "TSIG-&nøkkel for forlengssone"
 
 #. combo box
 #. combo box
-#: src/include/dhcp-server/widgets.rb:742
-#: src/include/dhcp-server/widgets.rb:1246
+#: src/include/dhcp-server/widgets.rb:677
+#: src/include/dhcp-server/widgets.rb:1226
 msgid "Reverse Zone TSIG &Key"
 msgstr "TSIG-&nøkkel for baklengssone"
 
 #. popup headline
-#: src/include/dhcp-server/widgets.rb:861
+#: src/include/dhcp-server/widgets.rb:796
 msgid "Select File with Authentication Key"
 msgstr "Velg filen med autentiseringsnøkkelen"
 
-#. check box
-#: src/include/dhcp-server/widgets.rb:1060
-msgid "&Start DHCP Server"
-msgstr "&Start DHCP-serveren"
+#. FIXME CWM should be able to handle virtual widgets
+#: src/include/dhcp-server/widgets.rb:1042
+msgid "Apply Changes"
+msgstr ""
 
 #. check box
-#: src/include/dhcp-server/widgets.rb:1070
+#: src/include/dhcp-server/widgets.rb:1049
 msgid "&Run DHCP Server in Chroot Jail"
 msgstr "&Kjør DHCP-serveren i Chroot-varetekt"
 
-#. menu button
-#: src/include/dhcp-server/widgets.rb:1111
+#: src/include/dhcp-server/widgets.rb:1099
 msgid "Ad&vanced"
 msgstr "A&vansert"
 
 #. item of a menu button
-#: src/include/dhcp-server/widgets.rb:1114
+#: src/include/dhcp-server/widgets.rb:1102
 msgid "Display &Log"
 msgstr "Vis &logg"
 
 #. item of a menu button
-#: src/include/dhcp-server/widgets.rb:1116
+#: src/include/dhcp-server/widgets.rb:1104
 msgid "&Interface Configuration"
 msgstr "&Grensesnittkonfigurasjon"
 
 #. text entry
-#: src/include/dhcp-server/widgets.rb:1136
+#: src/include/dhcp-server/widgets.rb:1116
 msgid "&Network Address"
 msgstr "&Nettverksadresse"
 
 #. text entry
-#: src/include/dhcp-server/widgets.rb:1138
+#: src/include/dhcp-server/widgets.rb:1118
 msgid "Network &Mask"
 msgstr "Nettverks&maske"
 
 #. text entry
-#: src/include/dhcp-server/widgets.rb:1156
+#: src/include/dhcp-server/widgets.rb:1136
 msgid "Group &Name"
 msgstr "Gruppe&navn"
 
 #. text entry
-#: src/include/dhcp-server/widgets.rb:1164
+#: src/include/dhcp-server/widgets.rb:1144
 msgid "Pool &Name"
 msgstr "&Navn på utvalg"
 
 #. text entry
-#: src/include/dhcp-server/widgets.rb:1172
+#: src/include/dhcp-server/widgets.rb:1152
 msgid "Shared Network &Name"
 msgstr "&Navn på delt nettverk"
 
 #. text entry
-#: src/include/dhcp-server/widgets.rb:1180
+#: src/include/dhcp-server/widgets.rb:1160
 msgid "Class &Name"
 msgstr "Klasse&navn"
 
 #. multi selection box
-#: src/include/dhcp-server/widgets.rb:1190
+#: src/include/dhcp-server/widgets.rb:1170
 msgid "Available Interfaces"
 msgstr "Tilgjengelige grensesnitt"
 
 #. check box
-#: src/include/dhcp-server/widgets.rb:1205
+#: src/include/dhcp-server/widgets.rb:1185
 msgid "Open &Firewall for Selected Interfaces"
 msgstr "Åpne &brannmur for valgte grensesnitt"
 
 #. check box
-#: src/include/dhcp-server/widgets.rb:1231
+#: src/include/dhcp-server/widgets.rb:1211
 msgid "&Enable Dynamic DNS for This Subnet"
 msgstr "&Aktiver dynamisk DNS for dette subnettet"
 
 #. check box
-#: src/include/dhcp-server/widgets.rb:1253
+#: src/include/dhcp-server/widgets.rb:1233
 msgid "&Update Global Dynamic DNS Settings"
 msgstr "&Oppdater globale dynamiske DNS-innstillinger"
 
 #. text entry
-#: src/include/dhcp-server/widgets.rb:1263
+#: src/include/dhcp-server/widgets.rb:1243
 msgid "&Zone"
 msgstr "&Sone"
 
 #. text entry
-#: src/include/dhcp-server/widgets.rb:1290
+#: src/include/dhcp-server/widgets.rb:1270
 msgid "&Primary DNS Server"
 msgstr "&Primær DNS-server"
 
 #. text entry
-#: src/include/dhcp-server/widgets.rb:1296
+#: src/include/dhcp-server/widgets.rb:1276
 msgid "Re&verse Zone"
 msgstr "&Baklengssone"
 
 #. text entry
-#: src/include/dhcp-server/widgets.rb:1305
+#: src/include/dhcp-server/widgets.rb:1285
 msgid "Pr&imary DNS Server"
 msgstr "Pr&imær DNS-server"
 
 #. push button
-#: src/include/dhcp-server/widgets.rb:1335
+#: src/include/dhcp-server/widgets.rb:1315
 msgid "DHCP Server &Expert Configuration..."
 msgstr "&Avansert konfigurasjon av DHCP-server..."
 
 #. Dhcp-server read dialog caption
-#: src/modules/DhcpServer.pm:1388
+#: src/modules/DhcpServer.pm:1401
 msgid "Initializing DHCP Server Configuration"
 msgstr "Initialiserer oppsett av DHCP-server"
 
 #. progress stage
-#: src/modules/DhcpServer.pm:1392
+#: src/modules/DhcpServer.pm:1405
 msgid "Check the environment"
 msgstr "Kontroller miljøet"
 
 #. progress stage
-#: src/modules/DhcpServer.pm:1394
+#: src/modules/DhcpServer.pm:1407
 msgid "Read firewall settings"
 msgstr "Les brannmurinnstillinger"
 
 #. progress stage
-#: src/modules/DhcpServer.pm:1396
+#: src/modules/DhcpServer.pm:1409
 msgid "Read DHCP server settings"
 msgstr "Les innstillinger for DHCP-server"
 
 #. progress stage
-#: src/modules/DhcpServer.pm:1398
+#: src/modules/DhcpServer.pm:1411
 msgid "Read DNS server settings"
 msgstr "Les innstillinger for DNS-server"
 
 #. progress step
-#: src/modules/DhcpServer.pm:1402
+#: src/modules/DhcpServer.pm:1415
 msgid "Checking the environment..."
 msgstr "Kontrollerer miljøet..."
 
 #. progress step
-#: src/modules/DhcpServer.pm:1404
+#: src/modules/DhcpServer.pm:1417
 msgid "Reading firewall settings..."
 msgstr "Leser brannmurinnstillinger..."
 
 #. progress step
-#: src/modules/DhcpServer.pm:1406
+#: src/modules/DhcpServer.pm:1419
 msgid "Reading DHCP server settings..."
 msgstr "Leser innstillinger for DHCP-server..."
 
 #. progress step
-#: src/modules/DhcpServer.pm:1408
+#: src/modules/DhcpServer.pm:1421
 msgid "Reading DNS server settings..."
 msgstr "Leser innstillinger for DNS-server..."
 
 #. progress step
-#: src/modules/DhcpServer.pm:1410 src/modules/DhcpServer.pm:1638
+#: src/modules/DhcpServer.pm:1423 src/modules/DhcpServer.pm:1651
 msgid "Finished"
 msgstr "Fullført"
 
 #. TRANSLATORS: error report popup
-#: src/modules/DhcpServer.pm:1440
+#: src/modules/DhcpServer.pm:1453
 msgid ""
 "This server needs at least one\n"
 "configured network device (besides loopback) to\n"
@@ -2577,7 +2519,7 @@
 "Avslutter."
 
 #. error report 
-#: src/modules/DhcpServer.pm:1475
+#: src/modules/DhcpServer.pm:1488
 msgid ""
 "Cannot determine hostname. LDAP-based configuration of \n"
 "DHCP server will not be available."
@@ -2586,7 +2528,7 @@
 "DHCP-server vil ikke være tilgjengelig."
 
 #. yes-no popup
-#: src/modules/DhcpServer.pm:1543
+#: src/modules/DhcpServer.pm:1556
 msgid ""
 "The DHCP server does not seem to have been\n"
 "configured yet. Create a new configuration?"
@@ -2595,87 +2537,87 @@
 "konfigurert ennå. Vil du opprette en ny konfigurasjon?"
 
 #. Dhcp-server read dialog caption */
-#: src/modules/DhcpServer.pm:1616
+#: src/modules/DhcpServer.pm:1629
 msgid "Saving DHCP Server Configuration"
 msgstr "Lagrer konfigurasjon for DHCP-server"
 
 #. progress stage
-#: src/modules/DhcpServer.pm:1621
+#: src/modules/DhcpServer.pm:1634
 msgid "Write DHCP server settings"
 msgstr "Les innstillinger for DHCP-server"
 
 #. progress stage
-#: src/modules/DhcpServer.pm:1623
+#: src/modules/DhcpServer.pm:1636
 msgid "Write firewall settings"
 msgstr "Lagre brannmurinnstillinger"
 
 #. progress stage
-#: src/modules/DhcpServer.pm:1625
+#: src/modules/DhcpServer.pm:1638
 msgid "Restart DHCP server"
 msgstr "Start DHCP-serveren på nytt"
 
 #. progress stage
-#: src/modules/DhcpServer.pm:1627
+#: src/modules/DhcpServer.pm:1640
 msgid "Write DNS server settings"
 msgstr "Lagre innstillinger for DNS-server"
 
 #. progress step
-#: src/modules/DhcpServer.pm:1630
+#: src/modules/DhcpServer.pm:1643
 msgid "Writing DHCP server settings..."
 msgstr "Lagrer innstillinger for DHCP-server..."
 
 #. progress step
-#: src/modules/DhcpServer.pm:1632
+#: src/modules/DhcpServer.pm:1645
 msgid "Writing firewall settings..."
 msgstr "Lagrer brannmurinnstillinger..."
 
 #. progress step
-#: src/modules/DhcpServer.pm:1634
+#: src/modules/DhcpServer.pm:1647
 msgid "Restarting DHCP server..."
 msgstr "Starter DHCP-serveren på nytt..."
 
 #. progress step
-#: src/modules/DhcpServer.pm:1636
+#: src/modules/DhcpServer.pm:1649
 msgid "Writing DNS server settings..."
 msgstr "Lagrer innstillinger for DNS-server..."
 
 #. error report
-#: src/modules/DhcpServer.pm:1749
+#: src/modules/DhcpServer.pm:1762
 msgid "Error occurred while restarting the DHCP daemon."
 msgstr "Det oppstod en feil under omstart av DHCP-nissen."
 
 #. summary string
-#: src/modules/DhcpServer.pm:1888
+#: src/modules/DhcpServer.pm:1901
 msgid "The DHCP server is started at boot time"
 msgstr "DHCP-serveren starter når systemet startes opp"
 
 #. summary string
-#: src/modules/DhcpServer.pm:1893
+#: src/modules/DhcpServer.pm:1906
 msgid "The DHCP server is not started at boot time"
 msgstr "DHCP-en starter ikke når systemet startes opp"
 
 #. summary string, %1 is list of network interfaces
-#: src/modules/DhcpServer.pm:1901
+#: src/modules/DhcpServer.pm:1914
 msgid "Listen On: %1"
 msgstr "Lytt på: %1"
 
 #. summary string, %1 is IP address range
-#: src/modules/DhcpServer.pm:1920
+#: src/modules/DhcpServer.pm:1933
 msgid "Dynamic Address Range: %1"
 msgstr "Dynamisk adresseområde: %1"
 
 #. error message
-#: src/modules/DhcpServer.pm:2313
+#: src/modules/DhcpServer.pm:2328
 msgid "Invalid LDAP configuration. Cannot use LDAP."
 msgstr "Ugyldig LDAP-konfigurasjon. Kan ikke bruke LDAP."
 
 #. error report
-#: src/modules/DhcpServer.pm:2553 src/modules/DhcpServer.pm:2594
+#: src/modules/DhcpServer.pm:2568 src/modules/DhcpServer.pm:2609
 msgid "Support for multiple dhcpServiceDN not implemented."
 msgstr "Støtte for flere dhcpServiceDN er ikke implementert."
 
 #. error report
-#: src/modules/DhcpServer.pm:2559
+#: src/modules/DhcpServer.pm:2574
 msgid "DHCP service DN is not defined."
 msgstr "DN for DHCP-tjeneste ikke spesifisert."
 
@@ -2683,27 +2625,69 @@
 #. Error report, %1 is LDAP record key
 #. Error report
 #. error report, %1 is LDAP record key
-#: src/modules/DhcpServer.pm:2674 src/modules/DhcpServer.pm:2708
-#: src/modules/DhcpServer.pm:2772 src/modules/DhcpServer.pm:2847
+#: src/modules/DhcpServer.pm:2689 src/modules/DhcpServer.pm:2723
+#: src/modules/DhcpServer.pm:2787 src/modules/DhcpServer.pm:2862
 msgid "Error occurred while creating %1."
 msgstr "Det oppstod en feil under uppretting av %1."
 
 #. error report, %1 is LDAP record key 
-#: src/modules/DhcpServer.pm:2739
+#: src/modules/DhcpServer.pm:2754
 msgid "Error occurred while updating %1."
 msgstr "Det oppstod en feil under oppdatering av %1."
 
 #. error report, %1=ldap domain, %2=dhcp server
-#: src/modules/DhcpServer.pm:2810
+#: src/modules/DhcpServer.pm:2825
 msgid "Error occurred while creating cn=%2,ou=DHCP,%1."
 msgstr "Det oppstod en feil under oppretting av cn=%2,ou=DHCP,%1."
 
 #. error report, /etc/dhcpd.conf is filename
-#: src/modules/DhcpServer.pm:2907
+#: src/modules/DhcpServer.pm:2922
 msgid "Error occurred while writing /etc/dhcpd.conf."
 msgstr "Det oppstod en feil under lagring av /etc/dhcpd.conf."
 
+#~ msgid "DHCP server is running"
+#~ msgstr "DHCP-serveren kjører"
+
+#~ msgid "DHCP server is not running"
+#~ msgstr "DHCP-serveren kjører ikke"
+
+#~ msgid "&Start DHCP Server Now"
+#~ msgstr "&Start DHCP-serveren nå"
+
+#~ msgid "S&top DHCP Server Now"
+#~ msgstr "S&topp DHCP-serveren nå"
+
+#~ msgid "Save Settings and Restart DHCP Server &Now"
+#~ msgstr "Lagre innstillingene og start DHCP-serveren på nytt &nå"
+
+#~ msgid "Start DHCP Server Now"
+#~ msgstr "Start DHCP-serveren nå"
+
+#~ msgid "Stop DHCP Server Now"
+#~ msgstr "Stopp DHCP-serveren nå"
+
+#~ msgid "Save Settings and Restart DHCP Server Now"
+#~ msgstr "Lagre innstillingene og start DHCP-serveren på nytt nå"
+
 #~ msgid ""
+#~ "<p><b><big>DHCP Server</big></b></p>\n"
+#~ "<p>To run the DHCP server every time your computer is started, set\n"
+#~ "<b>Start DHCP Server</b>.</p>"
+#~ msgstr ""
+#~ "<p><b><big>Start DHCP-server</big></b><br>\n"
+#~ "For å kjøre DHCP-serveren hver gang datamaskinen starter opp, velg\n"
+#~ "<b>Start DHCP-server</b>.</p>"
+
+#~ msgid "Restart DHCP Server"
+#~ msgstr "Start DHCP-serveren på nytt"
+
+#~ msgid "Save Settings and Restart DHCP Server"
+#~ msgstr "Lagre innstillingene og start DHCP-serveren på nytt"
+
+#~ msgid "&Start DHCP Server"
+#~ msgstr "&Start DHCP-serveren"
+
+#~ msgid ""
 #~ "IP address %1 does not match\n"
 #~ "the current network %2/%3\n"
 #~ msgstr ""

Modified: trunk/yast/nb/po/dns-server.nb.po
===================================================================
--- trunk/yast/nb/po/dns-server.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/dns-server.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: dns-server.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:54+0200\n"
 "PO-Revision-Date: 2009-08-08 08:44+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -307,8 +307,7 @@
 #. TRANSLATORS: commandline error message
 #. Both Add and Remove defined => Error!
 #: src/include/dns-server/cmdline.rb:580 src/include/dns-server/cmdline.rb:867
-#: src/include/dns-server/cmdline.rb:999
-#: src/include/dns-server/cmdline.rb:1049
+#: src/include/dns-server/cmdline.rb:999 src/include/dns-server/cmdline.rb:1049
 #: src/include/dns-server/cmdline.rb:1108
 #: src/include/dns-server/cmdline.rb:1244
 #: src/include/dns-server/cmdline.rb:1303
@@ -379,11 +378,10 @@
 #. Table header item - ACL-options
 #. Table menu item - Records listing
 #: src/include/dns-server/cmdline.rb:731 src/include/dns-server/cmdline.rb:743
-#: src/include/dns-server/cmdline.rb:944
-#: src/include/dns-server/cmdline.rb:1157
-#: src/include/dns-server/dialog-main.rb:1032
-#: src/include/dns-server/dialog-main.rb:1625
-#: src/include/dns-server/dialog-masterzone.rb:1419
+#: src/include/dns-server/cmdline.rb:944 src/include/dns-server/cmdline.rb:1157
+#: src/include/dns-server/dialog-main.rb:766
+#: src/include/dns-server/dialog-main.rb:1359
+#: src/include/dns-server/dialog-masterzone.rb:1409
 msgid "Value"
 msgstr "Verdi"
 
@@ -401,7 +399,7 @@
 #. TRANSLATORS: commandline table header item
 #. Textentry - DNS adding zone - Name
 #: src/include/dns-server/cmdline.rb:840 src/include/dns-server/cmdline.rb:940
-#: src/include/dns-server/dialog-main.rb:1859
+#: src/include/dns-server/dialog-main.rb:1593
 msgid "Name"
 msgstr "Navn"
 
@@ -411,9 +409,9 @@
 #. Table header item - DNS listing zones
 #. Table menu item - Records listing
 #: src/include/dns-server/cmdline.rb:842 src/include/dns-server/cmdline.rb:942
-#: src/include/dns-server/dialog-main.rb:1865
-#: src/include/dns-server/dialog-main.rb:1907
-#: src/include/dns-server/dialog-masterzone.rb:1417
+#: src/include/dns-server/dialog-main.rb:1599
+#: src/include/dns-server/dialog-main.rb:1641
+#: src/include/dns-server/dialog-masterzone.rb:1407
 msgid "Type"
 msgstr "Type"
 
@@ -426,8 +424,8 @@
 #. Dialog Label - DNS - expert settings
 #. Tree Menu Item - DNS - expert settings
 #: src/include/dns-server/cmdline.rb:846
-#: src/include/dns-server/dialog-main.rb:443
-#: src/include/dns-server/dialog-main.rb:446
+#: src/include/dns-server/dialog-main.rb:1993
+#: src/include/dns-server/dialog-main.rb:1996
 msgid "Forwarders"
 msgstr "Videresendere"
 
@@ -457,12 +455,11 @@
 #. TRANSLATORS: commandline table header item
 #. TRANSLATORS: commandline table header item
 #. Table header item - DNS listing zones
-#: src/include/dns-server/cmdline.rb:980
-#: src/include/dns-server/cmdline.rb:1032
+#: src/include/dns-server/cmdline.rb:980 src/include/dns-server/cmdline.rb:1032
 #: src/include/dns-server/cmdline.rb:1089
 #: src/include/dns-server/cmdline.rb:1220
 #: src/include/dns-server/cmdline.rb:1284
-#: src/include/dns-server/dialog-main.rb:1905
+#: src/include/dns-server/dialog-main.rb:1639
 msgid "Zone"
 msgstr "Sone"
 
@@ -491,14 +488,14 @@
 #. TRANSLATORS: commandline table header item
 #. Table header item - listing mail servers
 #: src/include/dns-server/cmdline.rb:1091
-#: src/include/dns-server/dialog-masterzone.rb:739
+#: src/include/dns-server/dialog-masterzone.rb:729
 msgid "Mail Server"
 msgstr "E-postserver"
 
 #. TRANSLATORS: commandline table header item
 #. Table header item - listing mail servers
 #: src/include/dns-server/cmdline.rb:1093
-#: src/include/dns-server/dialog-masterzone.rb:741
+#: src/include/dns-server/dialog-masterzone.rb:731
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -560,8 +557,8 @@
 #. Dialog Label - DNS - expert settings
 #. Tree Menu Item - DNS - expert settings
 #: src/include/dns-server/dialog-installwizard.rb:79
-#: src/include/dns-server/dialog-main.rb:517
-#: src/include/dns-server/dialog-main.rb:520
+#: src/include/dns-server/dialog-main.rb:2067
+#: src/include/dns-server/dialog-main.rb:2070
 msgid "DNS Zones"
 msgstr "DNS-soner"
 
@@ -583,7 +580,7 @@
 #. check box
 #. TRANSLATORS: checkbox label, turning LDAP support on or off
 #: src/include/dns-server/dialog-installwizard.rb:175
-#: src/include/dns-server/dialog-main.rb:291
+#: src/include/dns-server/dialog-main.rb:2108
 msgid "&LDAP Support Active"
 msgstr "&LDAP-støtte aktivert"
 
@@ -608,139 +605,94 @@
 msgstr "&Avansert konfigurasjon av DNS-server..."
 
 #. Dialog label DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:261
+#: src/include/dns-server/dialog-main.rb:256
 msgid "DNS Server"
 msgstr "DNS-server"
 
-#. FIXME: new startup
-#: src/include/dns-server/dialog-main.rb:419
-#, fuzzy
-#| msgid "Apply Changes to Dialog"
-msgid "Apply Changes"
-msgstr "Lagre endringer for dialogboks"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:425
-#: src/include/dns-server/dialog-main.rb:428
-msgid "Start-Up"
-msgstr "Oppstart"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:456
-#: src/include/dns-server/dialog-main.rb:459
-msgid "Basic Options"
-msgstr "Grunnleggende valg"
-
-#. Dialog Label - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:469
-#: src/include/dns-server/dialog-main.rb:471
-msgid "Logging"
-msgstr "Logging"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#. multi selection box
-#. multi selection box
-#: src/include/dns-server/dialog-main.rb:482
-#: src/include/dns-server/dialog-main.rb:485
-#: src/include/dns-server/dialog-masterzone.rb:163
-#: src/include/dns-server/dialog-masterzone.rb:2729
-msgid "ACLs"
-msgstr "ACLer"
-
-#. Dialog Label - DNS - expert settings
-#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:499
-#: src/include/dns-server/dialog-main.rb:502
-msgid "TSIG Keys"
-msgstr "TSIG-nøkler"
-
 #. T: ComboBox label
-#: src/include/dns-server/dialog-main.rb:563
+#: src/include/dns-server/dialog-main.rb:297
 msgid "Local DNS Resolution &Policy"
 msgstr ""
 
 #. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:566
+#: src/include/dns-server/dialog-main.rb:300
 msgid "Merging forwarders is disabled"
 msgstr ""
 
 #. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:568
+#: src/include/dns-server/dialog-main.rb:302
 msgid "Automatic merging"
 msgstr ""
 
 #. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:570
+#: src/include/dns-server/dialog-main.rb:304
 msgid "Merging forwarders is enabled"
 msgstr ""
 
 #. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:572
+#: src/include/dns-server/dialog-main.rb:306
 #, fuzzy
 #| msgid "DNS server configuration"
 msgid "Custom configuration"
 msgstr "Konfigurasjon av DNS-server"
 
-#: src/include/dns-server/dialog-main.rb:576
+#: src/include/dns-server/dialog-main.rb:310
 msgid "Custom policy"
 msgstr "Tilpassede regler"
 
 #. T: ComboBox label
-#: src/include/dns-server/dialog-main.rb:583
+#: src/include/dns-server/dialog-main.rb:317
 msgid "Local DNS Resolution &Forwarder"
 msgstr ""
 
 #. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:586
+#: src/include/dns-server/dialog-main.rb:320
 #, fuzzy
 #| msgid "Zone name servers"
 msgid "Using system name servers"
 msgstr "Sonenavneservere"
 
 #. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:588
+#: src/include/dns-server/dialog-main.rb:322
 #, fuzzy
 #| msgid "Zone name servers"
 msgid "This name server (bind)"
 msgstr "Sonenavneservere"
 
 #. T: ComboBox item
-#: src/include/dns-server/dialog-main.rb:590
+#: src/include/dns-server/dialog-main.rb:324
 msgid "Local dnsmasq server"
 msgstr ""
 
 #. Frame label for DNS-Forwarders adding IP
-#: src/include/dns-server/dialog-main.rb:600
+#: src/include/dns-server/dialog-main.rb:334
 msgid "Add IP Address"
 msgstr "Legg til IP-adresse"
 
 #. Textentry for DNS-Forwarders adding IP
-#: src/include/dns-server/dialog-main.rb:609
+#: src/include/dns-server/dialog-main.rb:343
 msgid "IPv4 or IPv6 A&ddress"
 msgstr "IPv4- eller IPv6-&adresse"
 
 #. Selectionbox for listing current DNS-Forwarders
 #. Selectionbox for listing current DNS-Forwarders
-#: src/include/dns-server/dialog-main.rb:638
-#: src/include/dns-server/dialog-main.rb:669
+#: src/include/dns-server/dialog-main.rb:372
+#: src/include/dns-server/dialog-main.rb:403
 msgid "Forwarder &List"
 msgstr "&Liste over videresendere"
 
 #. Store settings of a tab of a dialog
-#: src/include/dns-server/dialog-main.rb:813
+#: src/include/dns-server/dialog-main.rb:547
 msgid "Cannot set local forwarder to %{forwarder}"
 msgstr ""
 
 #. An error message, %1 is replaced with a variable IP
-#: src/include/dns-server/dialog-main.rb:877
+#: src/include/dns-server/dialog-main.rb:611
 msgid "Cannot find local equivalent for IP %1."
 msgstr "Finner ikke lokal ekvivalent for IP %1."
 
 #. TRANSLATORS: A warning message, %1 is replaced with the input IP, %2 with the output IP
-#: src/include/dns-server/dialog-main.rb:883
+#: src/include/dns-server/dialog-main.rb:617
 msgid ""
 "Forwarding DNS queries to itself would create an infinite loop.\n"
 "IP address %1 is currently used by this server, so it has\n"
@@ -751,11 +703,11 @@
 "er endret til sin lokale ekvivalent %2."
 
 #. both IPv4 and IPv6
-#: src/include/dns-server/dialog-main.rb:911
+#: src/include/dns-server/dialog-main.rb:645
 msgid "Invalid IPv4 or IPv6 address."
 msgstr "Ugyldig IPv4- eller IPv6-adresse."
 
-#: src/include/dns-server/dialog-main.rb:914
+#: src/include/dns-server/dialog-main.rb:648
 msgid ""
 "A valid IPv6 address consists of letters a-f, numbers,\n"
 "and colons."
@@ -764,46 +716,46 @@
 "og ett eller flere kolon."
 
 #. error report
-#: src/include/dns-server/dialog-main.rb:930
+#: src/include/dns-server/dialog-main.rb:664
 msgid "The specified forwarder is already present."
 msgstr "Denne videresenderen finnes allerede."
 
 #. Frame label for Basic-Options
-#: src/include/dns-server/dialog-main.rb:959
+#: src/include/dns-server/dialog-main.rb:693
 msgid "Add or Change Option"
 msgstr "Legg til eller endre alternativ"
 
 #. Combobox for choosing the basic-option
-#: src/include/dns-server/dialog-main.rb:973
+#: src/include/dns-server/dialog-main.rb:707
 msgid "O&ption"
 msgstr "A<ernativ"
 
 #. Textentry for setting the basic-option value
 #. Textentry - adding ACL-optiopn - value
-#: src/include/dns-server/dialog-main.rb:983
-#: src/include/dns-server/dialog-main.rb:1588
+#: src/include/dns-server/dialog-main.rb:717
+#: src/include/dns-server/dialog-main.rb:1322
 msgid "&Value"
 msgstr "&Verdi"
 
 #. Pushbutton for changing the basic-option
 #. Pushbutton - Change Record
-#: src/include/dns-server/dialog-main.rb:1007
-#: src/include/dns-server/dialog-masterzone.rb:1387
+#: src/include/dns-server/dialog-main.rb:741
+#: src/include/dns-server/dialog-masterzone.rb:1377
 msgid "C&hange"
 msgstr "E&ndre"
 
 #. Table label for basic-options listing
-#: src/include/dns-server/dialog-main.rb:1021
+#: src/include/dns-server/dialog-main.rb:755
 msgid "Current Options"
 msgstr "Gjeldende alternativer"
 
 #. Table header item - basic-options listing
-#: src/include/dns-server/dialog-main.rb:1030
+#: src/include/dns-server/dialog-main.rb:764
 msgid "Option"
 msgstr "Alternativ"
 
 #. TRANSLATORS: Popup question
-#: src/include/dns-server/dialog-main.rb:1161
+#: src/include/dns-server/dialog-main.rb:895
 msgid ""
 "Really set this\n"
 "option without any value?\n"
@@ -812,7 +764,7 @@
 "alternativet uten noen verdi?\n"
 
 #. TRANSLATORS: Popup question. Please, do not translate 'yes' and 'no' strings. %1 is a name of the option, %2 is the value of the option.
-#: src/include/dns-server/dialog-main.rb:1173
+#: src/include/dns-server/dialog-main.rb:907
 msgid ""
 "Option %1 can only have a yes or no value set.\n"
 "Really set it to %2?\n"
@@ -821,7 +773,7 @@
 "Er du sikker på at du vil bruke %2?\n"
 
 #. TRANSLATORS: Popup question. %1 is a name of the option, %2 is the value of the option.
-#: src/include/dns-server/dialog-main.rb:1190
+#: src/include/dns-server/dialog-main.rb:924
 msgid ""
 "Option %1 can only be a number.\n"
 "Really set it to %2?\n"
@@ -830,7 +782,7 @@
 "Er du sikker på at du vil bruke %2?\n"
 
 #. TRANSLATORS: Popup question. %1 is the value of the option.
-#: src/include/dns-server/dialog-main.rb:1202
+#: src/include/dns-server/dialog-main.rb:936
 msgid ""
 "Quotes are not used correctly in this option.\n"
 "Really set it to %1?\n"
@@ -839,7 +791,7 @@
 "Er du sikker på at du vil bruke %1?\n"
 
 #. TRANSLATORS: Popup question. %1 is the value of the option.
-#: src/include/dns-server/dialog-main.rb:1214
+#: src/include/dns-server/dialog-main.rb:948
 msgid ""
 "Brackets are not used correctly in this option.\n"
 "Really set it to %1?\n"
@@ -848,7 +800,7 @@
 "Er du sikker på at du vil bruke %1?\n"
 
 #. Popup question, %1 is the name of the option
-#: src/include/dns-server/dialog-main.rb:1258
+#: src/include/dns-server/dialog-main.rb:992
 msgid ""
 "Option %1 should be set only once.\n"
 "Really add another one?\n"
@@ -857,77 +809,77 @@
 "Er du sikker på at du vil legge til enda et alternativ?\n"
 
 #. Table header - logging options
-#: src/include/dns-server/dialog-main.rb:1298
+#: src/include/dns-server/dialog-main.rb:1032
 msgid "Log Type"
 msgstr "Loggtype"
 
 #. Radiobutton - log type
-#: src/include/dns-server/dialog-main.rb:1310
+#: src/include/dns-server/dialog-main.rb:1044
 msgid "&System Log"
 msgstr "&Systemlogg"
 
 #. Radiobutton - log type
-#: src/include/dns-server/dialog-main.rb:1319
+#: src/include/dns-server/dialog-main.rb:1053
 msgid "&File"
 msgstr "&Fil"
 
 #. IntField - max. log size
-#: src/include/dns-server/dialog-main.rb:1352
+#: src/include/dns-server/dialog-main.rb:1086
 msgid "Maximum &Size (MB)"
 msgstr "Maksimal &størrelse (MB)"
 
 #. IntField - max. log age
-#: src/include/dns-server/dialog-main.rb:1363
+#: src/include/dns-server/dialog-main.rb:1097
 msgid "Maximum &Versions"
 msgstr "Maksimalt antall &versjoner"
 
 #. Frame label - additional-logging
-#: src/include/dns-server/dialog-main.rb:1381
+#: src/include/dns-server/dialog-main.rb:1115
 msgid "Additional Logging"
 msgstr "Andre typer logging"
 
 #. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1386
+#: src/include/dns-server/dialog-main.rb:1120
 msgid "Log All DNS &Queries"
 msgstr "Logg alle DNS-&forespørsler"
 
 #. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1389
+#: src/include/dns-server/dialog-main.rb:1123
 msgid "Log Zone &Updates"
 msgstr "Logg sone&oppdateringer"
 
 #. Checkbox - additional-logging
-#: src/include/dns-server/dialog-main.rb:1392
+#: src/include/dns-server/dialog-main.rb:1126
 msgid "Log Zone &Transfers"
 msgstr "Logg sone&overføringer"
 
 #. popup headline
-#: src/include/dns-server/dialog-main.rb:1549
+#: src/include/dns-server/dialog-main.rb:1283
 msgid "Select File for Log"
 msgstr "Velg loggfil"
 
 #. Frame label - adding ACL-optiopn
-#: src/include/dns-server/dialog-main.rb:1566
+#: src/include/dns-server/dialog-main.rb:1300
 msgid "Option Setup"
 msgstr "Velg alternativer"
 
 #. Textentry - adding ACL-optiopn - name
-#: src/include/dns-server/dialog-main.rb:1579
+#: src/include/dns-server/dialog-main.rb:1313
 msgid "&Name"
 msgstr "&Navn"
 
 #. Table header - ACL-options listing
-#: src/include/dns-server/dialog-main.rb:1615
+#: src/include/dns-server/dialog-main.rb:1349
 msgid "Current ACL List"
 msgstr "Gjeldende ACL-liste"
 
 #. Table header item - ACL-options
-#: src/include/dns-server/dialog-main.rb:1623
+#: src/include/dns-server/dialog-main.rb:1357
 msgid "ACL"
 msgstr "ACL"
 
 #. A popup question, %1 is number of zones
-#: src/include/dns-server/dialog-main.rb:1743
+#: src/include/dns-server/dialog-main.rb:1477
 msgid ""
 "This ACL is used by %1 zones.\n"
 "Really remove it?\n"
@@ -936,12 +888,12 @@
 "Vil du virkelig fjerne den?\n"
 
 #. An error popup message
-#: src/include/dns-server/dialog-main.rb:1830
+#: src/include/dns-server/dialog-main.rb:1564
 msgid "The specified ACL entry already exists."
 msgstr "Denne ACL-oppføringen finnes allerede."
 
 #. frame label
-#: src/include/dns-server/dialog-main.rb:1847
+#: src/include/dns-server/dialog-main.rb:1581
 msgid "Add New Zone "
 msgstr "Legg til ny sone "
 
@@ -950,8 +902,8 @@
 #. TRANSLATORS: Table item - Server type
 #. #-#-#-#-#  dns-server.xgettext.pot  #-#-#-#-#
 #. type of zone to be used in summary
-#: src/include/dns-server/dialog-main.rb:1868
-#: src/include/dns-server/dialog-main.rb:1958 src/modules/DnsServer.pm:1658
+#: src/include/dns-server/dialog-main.rb:1602
+#: src/include/dns-server/dialog-main.rb:1692 src/modules/DnsServer.pm:1667
 msgid "Master"
 msgstr "Hoved"
 
@@ -961,9 +913,9 @@
 #. TRANSLATORS: Table item - Server type
 #. #-#-#-#-#  dns-server.xgettext.pot  #-#-#-#-#
 #. type of zone to be used in summary
-#: src/include/dns-server/dialog-main.rb:1870
-#: src/include/dns-server/dialog-main.rb:1961
-#: src/include/dns-server/dialog-main.rb:1964 src/modules/DnsServer.pm:1660
+#: src/include/dns-server/dialog-main.rb:1604
+#: src/include/dns-server/dialog-main.rb:1695
+#: src/include/dns-server/dialog-main.rb:1698 src/modules/DnsServer.pm:1669
 msgid "Slave"
 msgstr "Slave"
 
@@ -972,36 +924,36 @@
 #. TRANSLATORS: Table item - Server type
 #. #-#-#-#-#  dns-server.xgettext.pot  #-#-#-#-#
 #. type of zone to be used in summary
-#: src/include/dns-server/dialog-main.rb:1872
-#: src/include/dns-server/dialog-main.rb:1967 src/modules/DnsServer.pm:1666
+#: src/include/dns-server/dialog-main.rb:1606
+#: src/include/dns-server/dialog-main.rb:1701 src/modules/DnsServer.pm:1675
 msgid "Forward"
 msgstr "Forlengs"
 
 #. Table header - DNS listing zones
-#: src/include/dns-server/dialog-main.rb:1895
+#: src/include/dns-server/dialog-main.rb:1629
 msgid "Configured DNS Zones"
 msgstr "Konfigurerte DNS-soner"
 
 #. error report
-#: src/include/dns-server/dialog-main.rb:2104
+#: src/include/dns-server/dialog-main.rb:1838
 msgid "A zone with the specified name is already configured."
 msgstr "En sone med dette navnet er allerede konfigurert."
 
 #. Write settings dialog
 #. @return `abort if aborted and `next otherwise
-#: src/include/dns-server/dialog-main.rb:2153
+#: src/include/dns-server/dialog-main.rb:1887
 msgid "Saving the configuration failed. Change the settings?"
 msgstr "Konfigurasjonen kunne ikke lagres. Vil du endre innstillingene?"
 
 #. Writes settings and restores the dialog without exiting
-#: src/include/dns-server/dialog-main.rb:2169
+#: src/include/dns-server/dialog-main.rb:1903
 #, fuzzy
 #| msgid "Save configuration files"
 msgid "Saving the configuration failed"
 msgstr "Lagre konfigurasjonsfiler"
 
 #. Yes-No popup
-#: src/include/dns-server/dialog-main.rb:2182
+#: src/include/dns-server/dialog-main.rb:1916
 msgid ""
 "All changes will be lost.\n"
 "Really leave the DNS server configuration without saving?"
@@ -1009,40 +961,85 @@
 "Alle endringer vil gå tapt.\n"
 "Vil du virkelig avbryte konfigurasjonen av DNS-serveren uten å lagre?"
 
+#. FIXME: new startup
+#: src/include/dns-server/dialog-main.rb:1969
+#, fuzzy
+#| msgid "Apply Changes to Dialog"
+msgid "Apply Changes"
+msgstr "Lagre endringer for dialogboks"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:1975
+#: src/include/dns-server/dialog-main.rb:1978
+msgid "Start-Up"
+msgstr "Oppstart"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2006
+#: src/include/dns-server/dialog-main.rb:2009
+msgid "Basic Options"
+msgstr "Grunnleggende valg"
+
+#. Dialog Label - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2019
+#: src/include/dns-server/dialog-main.rb:2021
+msgid "Logging"
+msgstr "Logging"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#. multi selection box
+#. multi selection box
+#: src/include/dns-server/dialog-main.rb:2032
+#: src/include/dns-server/dialog-main.rb:2035
+#: src/include/dns-server/dialog-masterzone.rb:156
+#: src/include/dns-server/dialog-masterzone.rb:2694
+msgid "ACLs"
+msgstr "ACLer"
+
+#. Dialog Label - DNS - expert settings
+#. Tree Menu Item - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:2049
+#: src/include/dns-server/dialog-main.rb:2052
+msgid "TSIG Keys"
+msgstr "TSIG-nøkler"
+
 #. check box
-#: src/include/dns-server/dialog-masterzone.rb:95
+#: src/include/dns-server/dialog-masterzone.rb:93
 msgid "A&llow Dynamic Updates"
 msgstr "T&illat dynamiske oppdateringer"
 
 #. combo box
-#: src/include/dns-server/dialog-masterzone.rb:105
+#: src/include/dns-server/dialog-masterzone.rb:103
 msgid "TSIG &Key"
 msgstr "TSIG-&nøkkel"
 
 #. check box
 #. check box
-#: src/include/dns-server/dialog-masterzone.rb:158
-#: src/include/dns-server/dialog-masterzone.rb:2725
+#: src/include/dns-server/dialog-masterzone.rb:151
+#: src/include/dns-server/dialog-masterzone.rb:2690
 msgid "Enable &Zone Transport"
 msgstr "Aktiver &sonetransport"
 
 #. check box
-#: src/include/dns-server/dialog-masterzone.rb:178
+#: src/include/dns-server/dialog-masterzone.rb:171
 msgid "A&utomatically Generate Records From"
 msgstr "Generer oppføringer a&utomatisk fra"
 
 #. multi selection box
-#: src/include/dns-server/dialog-masterzone.rb:187
+#: src/include/dns-server/dialog-masterzone.rb:180
 msgid "Zon&e"
 msgstr "Son&e"
 
 #. frame label
-#: src/include/dns-server/dialog-masterzone.rb:199
+#: src/include/dns-server/dialog-masterzone.rb:192
 msgid "Connected Reverse Zones"
 msgstr "Tilkoblede baklengssoner"
 
 #. popup message
-#: src/include/dns-server/dialog-masterzone.rb:465
+#: src/include/dns-server/dialog-masterzone.rb:455
 msgid ""
 "This function is not available during\n"
 "preparation for autoinstallation.\n"
@@ -1051,34 +1048,34 @@
 "forberedelser til autoinstallasjon.\n"
 
 #. error report
-#: src/include/dns-server/dialog-masterzone.rb:476
+#: src/include/dns-server/dialog-masterzone.rb:466
 msgid "No TSIG key is defined."
 msgstr "Ingen TSIG-nøkkel er definert."
 
 #. Textentry - adding nameserver
-#: src/include/dns-server/dialog-masterzone.rb:506
+#: src/include/dns-server/dialog-masterzone.rb:496
 msgid "&Name Server to Add"
 msgstr "&Navneserver som skal legges til"
 
 #. Selectionbox - listing current nameservers
 #. selection box label
-#: src/include/dns-server/dialog-masterzone.rb:529
-#: src/include/dns-server/dialog-masterzone.rb:555
+#: src/include/dns-server/dialog-masterzone.rb:519
+#: src/include/dns-server/dialog-masterzone.rb:545
 msgid "Na&me Server List"
 msgstr "Na&vneserverliste"
 
 #. error message
-#: src/include/dns-server/dialog-masterzone.rb:653
+#: src/include/dns-server/dialog-masterzone.rb:643
 msgid "The specified name server already exists."
 msgstr "Denne navneserveren finnes allerede."
 
 #. Frame label - adding mail server
-#: src/include/dns-server/dialog-masterzone.rb:699
+#: src/include/dns-server/dialog-masterzone.rb:689
 msgid "Mail Server to Add"
 msgstr "E-postserver som skal legges til"
 
 #. Textentry - addind mail server - Name
-#: src/include/dns-server/dialog-masterzone.rb:709
+#: src/include/dns-server/dialog-masterzone.rb:699
 msgid "&Address"
 msgstr "&Adresse"
 
@@ -1086,116 +1083,116 @@
 #. IntField - zone settings - Record Value
 #. IntField - zone settings - Record Value
 #. int field
-#: src/include/dns-server/dialog-masterzone.rb:712
-#: src/include/dns-server/dialog-masterzone.rb:1237
-#: src/include/dns-server/dialog-masterzone.rb:1295
+#: src/include/dns-server/dialog-masterzone.rb:702
+#: src/include/dns-server/dialog-masterzone.rb:1227
+#: src/include/dns-server/dialog-masterzone.rb:1285
 #: src/include/dns-server/options.rb:435
 msgid "&Priority"
 msgstr "&Prioritet"
 
 #. Table label - listing mail servers
-#: src/include/dns-server/dialog-masterzone.rb:734
+#: src/include/dns-server/dialog-masterzone.rb:724
 msgid "Mail Relay List"
 msgstr "Liste over E-postsystemer"
 
 #. A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:871
+#: src/include/dns-server/dialog-masterzone.rb:861
 msgid "The specified value is not a valid hostname or IP address."
 msgstr "Den angitte verdien er ikke et gyldig vertsnavn eller en IP-adresse."
 
 #. error message
-#: src/include/dns-server/dialog-masterzone.rb:893
+#: src/include/dns-server/dialog-masterzone.rb:883
 msgid "The specified mail server already exists."
 msgstr "Denne e-postserveren finnes allerede."
 
 #. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:940
+#: src/include/dns-server/dialog-masterzone.rb:930
 msgid "Seconds"
 msgstr "Sekunder"
 
 #. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:942
+#: src/include/dns-server/dialog-masterzone.rb:932
 msgid "Minutes"
 msgstr "Minutter"
 
 #. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:944
+#: src/include/dns-server/dialog-masterzone.rb:934
 msgid "Hours"
 msgstr "Timer"
 
 #. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:946
+#: src/include/dns-server/dialog-masterzone.rb:936
 msgid "Days"
 msgstr "Dager"
 
 #. DNS Settings time units (combobox item)
-#: src/include/dns-server/dialog-masterzone.rb:948
+#: src/include/dns-server/dialog-masterzone.rb:938
 msgid "Weeks"
 msgstr "Uker"
 
 #. Textentry - setting Serial for zone
-#: src/include/dns-server/dialog-masterzone.rb:960
+#: src/include/dns-server/dialog-masterzone.rb:950
 msgid "Seri&al"
 msgstr "Seri&e"
 
 #. Textentry - setting TTL for zone
-#: src/include/dns-server/dialog-masterzone.rb:969
+#: src/include/dns-server/dialog-masterzone.rb:959
 msgid "TT&L"
 msgstr "TT&L"
 
 #. Combobox - Setting DNS Retry - Unit
-#: src/include/dns-server/dialog-masterzone.rb:974
-#: src/include/dns-server/dialog-masterzone.rb:1011
+#: src/include/dns-server/dialog-masterzone.rb:964
+#: src/include/dns-server/dialog-masterzone.rb:1001
 msgid "&Unit"
 msgstr "&Enhet"
 
 #. IntField - Setting DNS Refresh - Value
-#: src/include/dns-server/dialog-masterzone.rb:988
+#: src/include/dns-server/dialog-masterzone.rb:978
 msgid "Re&fresh"
 msgstr "Opp&dater"
 
 #. Combobox - Setting DNS Refresh - Unit
-#: src/include/dns-server/dialog-masterzone.rb:996
+#: src/include/dns-server/dialog-masterzone.rb:986
 msgid "Un&it"
 msgstr "En&het"
 
 #. IntField - Setting DNS Retry - Value
-#: src/include/dns-server/dialog-masterzone.rb:1005
+#: src/include/dns-server/dialog-masterzone.rb:995
 msgid "Retr&y"
 msgstr "Prøv &igjen"
 
 #. IntField - Setting DNS Expiry - Value
-#: src/include/dns-server/dialog-masterzone.rb:1018
+#: src/include/dns-server/dialog-masterzone.rb:1008
 msgid "Ex&piration"
 msgstr "Utlø&pstid"
 
 #. Combobox - Setting DNS Expiry - Unit
-#: src/include/dns-server/dialog-masterzone.rb:1026
+#: src/include/dns-server/dialog-masterzone.rb:1016
 msgid "U&nit"
 msgstr "E&nhet"
 
 #. IntField - Setting DNS Minimum - Value
-#: src/include/dns-server/dialog-masterzone.rb:1035
+#: src/include/dns-server/dialog-masterzone.rb:1025
 msgid "&Minimum"
 msgstr "&Minimum"
 
 #. Combobox - Setting DNS Minimum - Unit
-#: src/include/dns-server/dialog-masterzone.rb:1043
+#: src/include/dns-server/dialog-masterzone.rb:1033
 msgid "Uni&t"
 msgstr "Enh&et"
 
 #. Handle events in a tab of a dialog
-#: src/include/dns-server/dialog-masterzone.rb:1166
+#: src/include/dns-server/dialog-masterzone.rb:1156
 msgid "The serial number of the zone must be specified."
 msgstr "Et serienummer for sonen må angis."
 
 #. error report, %1 is an integer
-#: src/include/dns-server/dialog-masterzone.rb:1174
+#: src/include/dns-server/dialog-masterzone.rb:1164
 msgid "The serial number must be no more than %1 digits long."
 msgstr "Serienummeret kan inneholde maksimalt %1 siffer."
 
 #. TRANSLATORS: A popup with question, current setting could produce errors
-#: src/include/dns-server/dialog-masterzone.rb:1195
+#: src/include/dns-server/dialog-masterzone.rb:1185
 msgid ""
 "The expiration time-out is higher than the time period\n"
 "of zone refreshes. The zone will not be reachable\n"
@@ -1210,104 +1207,104 @@
 #. Textentry - zone settings - Record Name
 #. Textentry - zone settings - Record Name
 #. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1219
-#: src/include/dns-server/dialog-masterzone.rb:1254
-#: src/include/dns-server/dialog-masterzone.rb:1311
+#: src/include/dns-server/dialog-masterzone.rb:1209
+#: src/include/dns-server/dialog-masterzone.rb:1244
+#: src/include/dns-server/dialog-masterzone.rb:1301
 msgid "&Record Key"
 msgstr "&Oppføringsnøkkel"
 
 #. Combobox - zone settings - Record Type
 #. Combobox - zone settings - Record Type
 #. Combobox - zone settings - Record Type
-#: src/include/dns-server/dialog-masterzone.rb:1227
-#: src/include/dns-server/dialog-masterzone.rb:1286
-#: src/include/dns-server/dialog-masterzone.rb:1319
+#: src/include/dns-server/dialog-masterzone.rb:1217
+#: src/include/dns-server/dialog-masterzone.rb:1276
+#: src/include/dns-server/dialog-masterzone.rb:1309
 msgid "T&ype"
 msgstr "T&ype"
 
 #. Textentry - zone settings - Record Value
 #. IntField - zone settings - Record Value
 #. Textentry - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1245
-#: src/include/dns-server/dialog-masterzone.rb:1292
-#: src/include/dns-server/dialog-masterzone.rb:1324
+#: src/include/dns-server/dialog-masterzone.rb:1235
+#: src/include/dns-server/dialog-masterzone.rb:1282
+#: src/include/dns-server/dialog-masterzone.rb:1314
 msgid "Val&ue"
 msgstr "Ver&di"
 
 #. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1261
+#: src/include/dns-server/dialog-masterzone.rb:1251
 msgid "&Service"
 msgstr "&Tjeneste"
 
 #. Textentry - zone settings - Record Name
-#: src/include/dns-server/dialog-masterzone.rb:1275
+#: src/include/dns-server/dialog-masterzone.rb:1265
 msgid "&Protocol"
 msgstr "&Protokoll"
 
 #. IntField - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1297
+#: src/include/dns-server/dialog-masterzone.rb:1287
 msgid "&Weight"
 msgstr "&Vekt"
 
 #. IntField - zone settings - Record Value
-#: src/include/dns-server/dialog-masterzone.rb:1299
+#: src/include/dns-server/dialog-masterzone.rb:1289
 msgid "&Port"
 msgstr "&Port"
 
 #. reverse zone
-#: src/include/dns-server/dialog-masterzone.rb:1344
+#: src/include/dns-server/dialog-masterzone.rb:1334
 msgid "A: IPv4 Domain Name Translation"
 msgstr "A: Oversettelse av IPv4-domenenavn"
 
-#: src/include/dns-server/dialog-masterzone.rb:1345
+#: src/include/dns-server/dialog-masterzone.rb:1335
 msgid "AAAA: IPv6 Domain Name Translation"
 msgstr "AAAA: Oversettelse av IPv6-domenenavn"
 
-#: src/include/dns-server/dialog-masterzone.rb:1346
+#: src/include/dns-server/dialog-masterzone.rb:1336
 msgid "CNAME: Alias for Domain Name"
 msgstr "CNAME: Alias for domenenavn"
 
-#: src/include/dns-server/dialog-masterzone.rb:1347
+#: src/include/dns-server/dialog-masterzone.rb:1337
 msgid "NS: Name Server"
 msgstr "NS: Navneserver"
 
-#: src/include/dns-server/dialog-masterzone.rb:1348
+#: src/include/dns-server/dialog-masterzone.rb:1338
 msgid "MX: Mail Relay"
 msgstr "MX: E-postsystem"
 
-#: src/include/dns-server/dialog-masterzone.rb:1349
+#: src/include/dns-server/dialog-masterzone.rb:1339
 msgid "PTR: Reverse Translation"
 msgstr "PTR: Baklengs oversettelse"
 
-#: src/include/dns-server/dialog-masterzone.rb:1350
+#: src/include/dns-server/dialog-masterzone.rb:1340
 msgid "SRV: Services Record"
 msgstr "SRV: Tjenesteoppføring"
 
-#: src/include/dns-server/dialog-masterzone.rb:1351
+#: src/include/dns-server/dialog-masterzone.rb:1341
 msgid "TXT: Text Record"
 msgstr "TXT: Tekstoppføring"
 
-#: src/include/dns-server/dialog-masterzone.rb:1352
+#: src/include/dns-server/dialog-masterzone.rb:1342
 msgid "SPF: Sender Policy Framework"
 msgstr "SPF: Retningslinjer for avsender"
 
 #. Frame label - Adding/Changing IP/CNAME/Type... zone settings
-#: src/include/dns-server/dialog-masterzone.rb:1369
+#: src/include/dns-server/dialog-masterzone.rb:1359
 msgid "Record Settings"
 msgstr "Oppføringsinnstillinger"
 
 #. Table label - Records listing
-#: src/include/dns-server/dialog-masterzone.rb:1405
+#: src/include/dns-server/dialog-masterzone.rb:1395
 msgid "Configured Resource Records"
 msgstr "Konfigurerte oppføringer"
 
 #. Table menu item - Records listing
-#: src/include/dns-server/dialog-masterzone.rb:1415
+#: src/include/dns-server/dialog-masterzone.rb:1405
 msgid "Record Key"
 msgstr "Oppføringsnøkkel"
 
 #. Pop-up error message, %1 is replaced with an example
-#: src/include/dns-server/dialog-masterzone.rb:1845
+#: src/include/dns-server/dialog-masterzone.rb:1835
 msgid ""
 "Invalid IPv6 reverse IP.\n"
 "\n"
@@ -1320,13 +1317,13 @@
 "eller relativt format til gjeldende sone."
 
 #. (hostname or FQ)
-#: src/include/dns-server/dialog-masterzone.rb:1883
+#: src/include/dns-server/dialog-masterzone.rb:1873
 msgid "Invalid IPv6 address."
 msgstr "Ugyldig IPv6-adresse."
 
 #. TRANSLATORS: Error message
 #. %{type} replaced with record type (TXT or SPF)
-#: src/include/dns-server/dialog-masterzone.rb:1916
+#: src/include/dns-server/dialog-masterzone.rb:1906
 msgid ""
 "Invalid %{type} record key. It should consist of printable US-ASCII characters excluding '='\n"
 "and must be at least one character long."
@@ -1338,7 +1335,7 @@
 #. %{type}    - replaced with record type (TXT or SPF)
 #. %{max}     - replaced with the maximal length
 #. %{current} - replaced with the current length of a new TXT record.
-#: src/include/dns-server/dialog-masterzone.rb:1934
+#: src/include/dns-server/dialog-masterzone.rb:1924
 msgid ""
 "Maximal length of a %{type} record is %{max} characters.\n"
 "This message is %{current} characters long."
@@ -1347,72 +1344,66 @@
 "Denne meldingen inneholder {current}  tegn."
 
 #. TRANSLATORS: a popup message, CNAME (link) points to itself
-#: src/include/dns-server/dialog-masterzone.rb:1965
+#: src/include/dns-server/dialog-masterzone.rb:1955
 msgid "CNAME cannot point to itself."
 msgstr "CNAME kan ikke peke på seg selv."
 
 #. When no dialog defined for this tab (software error)
-#: src/include/dns-server/dialog-masterzone.rb:2341
+#: src/include/dns-server/dialog-masterzone.rb:2331
 msgid "An internal error has occurred."
 msgstr "Det har oppstått en intern feil."
 
 #. Dialog Caption - Expert Settings - Zone Editor
 #. dialog caption
-#: src/include/dns-server/dialog-masterzone.rb:2413
-#: src/include/dns-server/dialog-masterzone.rb:2734
+#: src/include/dns-server/dialog-masterzone.rb:2403
+#: src/include/dns-server/dialog-masterzone.rb:2699
 msgid "Zone Editor"
 msgstr "Soneredigering"
 
 #. Menu Item - Zone Editor - Tab
 #. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2434
-#: src/include/dns-server/dialog-masterzone.rb:2446
+#: src/include/dns-server/dialog-masterzone.rb:2424
+#: src/include/dns-server/dialog-masterzone.rb:2436
 msgid "&Basics"
 msgstr "&Grunnleggende"
 
 #. Menu Item - Zone Editor - Tab
 #. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2436
-#: src/include/dns-server/dialog-masterzone.rb:2448
+#: src/include/dns-server/dialog-masterzone.rb:2426
+#: src/include/dns-server/dialog-masterzone.rb:2438
 msgid "NS Recor&ds"
 msgstr "NS-oppføring&er"
 
 #. Menu Item - Zone Editor - Tab
 #. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2438
-#: src/include/dns-server/dialog-masterzone.rb:2452
+#: src/include/dns-server/dialog-masterzone.rb:2428
+#: src/include/dns-server/dialog-masterzone.rb:2442
 msgid "&SOA"
 msgstr "&SOA"
 
 #. Menu Item - Zone Editor - Tab
 #. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2440
-#: src/include/dns-server/dialog-masterzone.rb:2454
+#: src/include/dns-server/dialog-masterzone.rb:2430
+#: src/include/dns-server/dialog-masterzone.rb:2444
 msgid "R&ecords"
 msgstr "O&ppføringer"
 
 #. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2450
+#: src/include/dns-server/dialog-masterzone.rb:2440
 msgid "M&X Records"
 msgstr "M&X-oppføringer"
 
 #. Label - connected with Textentry which shows current edited zone
 #. Label - connected with Textentry which shows current edited zone
 #. Label - connected with Textentry which shows current edited zone
-#: src/include/dns-server/dialog-masterzone.rb:2466
-#: src/include/dns-server/dialog-masterzone.rb:2703
-#: src/include/dns-server/dialog-masterzone.rb:2906
+#: src/include/dns-server/dialog-masterzone.rb:2455
+#: src/include/dns-server/dialog-masterzone.rb:2668
+#: src/include/dns-server/dialog-masterzone.rb:2871
 msgid "Settings for Zone"
 msgstr "Soneinnstillinger"
 
-#. );
-#. Menu Item - Zone Editor - Tab
-#: src/include/dns-server/dialog-masterzone.rb:2502
-msgid "Ad&vanced"
-msgstr "A&vansert"
-
 #. at least one NS server must be set
-#: src/include/dns-server/dialog-masterzone.rb:2550
+#: src/include/dns-server/dialog-masterzone.rb:2532
 msgid "At least one NS server must be set."
 msgstr "Minst én NS-server må angis."
 
@@ -1420,7 +1411,7 @@
 #.
 #. Automatically Generate Records From is a feature that makes YaST to generate
 #. DNS records manually from selected zone
-#: src/include/dns-server/dialog-masterzone.rb:2612
+#: src/include/dns-server/dialog-masterzone.rb:2594
 msgid ""
 "Current zone records are automatically generated from %1 zone.\n"
 "To change records manually disable the Automatically Generate Records From feature."
@@ -1429,17 +1420,17 @@
 "Deaktiver funksjonen 'Generer oppføringer automatisk fra' for å endre oppføringer."
 
 #. TRANSLATORS: Text entry
-#: src/include/dns-server/dialog-masterzone.rb:2717
+#: src/include/dns-server/dialog-masterzone.rb:2682
 msgid "&Master DNS Server IP"
 msgstr "&Hoved-DNS-server-IP"
 
 #. TRANSLATORS: Popup error headline
-#: src/include/dns-server/dialog-masterzone.rb:2781
+#: src/include/dns-server/dialog-masterzone.rb:2746
 msgid "Missing Master Server"
 msgstr "Hovedserver mangler"
 
 #. TRANSLATORS: Popup error text
-#: src/include/dns-server/dialog-masterzone.rb:2783
+#: src/include/dns-server/dialog-masterzone.rb:2748
 msgid ""
 "Every slave zone must have its master server IP defined.\n"
 "Configuration of a DNS server without a master server would fail.\n"
@@ -1450,32 +1441,32 @@
 "Hvis du fortsetter, vil gjeldende sone bli fjernet."
 
 #. TRANSLATORS: A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:2803
+#: src/include/dns-server/dialog-masterzone.rb:2768
 msgid "No master DNS server defined."
 msgstr "Ingen hoved-DNS-server er definert."
 
 #. A popup error message
-#: src/include/dns-server/dialog-masterzone.rb:2815
+#: src/include/dns-server/dialog-masterzone.rb:2780
 msgid "The specified master name server is not a valid IP address."
 msgstr "Denne hovednavneserveren er ikke en gyldig IP-adresse."
 
 #. Textentry - adding forwarder
-#: src/include/dns-server/dialog-masterzone.rb:2926
+#: src/include/dns-server/dialog-masterzone.rb:2891
 msgid "New &Forwarder IP Address"
 msgstr "IP-adresse for &ny videresender"
 
 #. Selectionbox - listing current forwarders
-#: src/include/dns-server/dialog-masterzone.rb:2951
+#: src/include/dns-server/dialog-masterzone.rb:2916
 msgid "Current &Zone Forwarders"
 msgstr "Gjeldende &sonevideresendere"
 
 #. dialog caption
-#: src/include/dns-server/dialog-masterzone.rb:2973
+#: src/include/dns-server/dialog-masterzone.rb:2938
 msgid "Forward Zone Editor"
 msgstr "Rediger sonevideresendere"
 
 #. TRANSLATORS: popup question
-#: src/include/dns-server/dialog-masterzone.rb:3009
+#: src/include/dns-server/dialog-masterzone.rb:2974
 msgid ""
 "This forward zone has no forwarders defined, which means\n"
 "that all DNS queries for this zone are denied.\n"
@@ -2514,56 +2505,56 @@
 msgstr "&E-postsystem"
 
 #. DNS server read dialog caption
-#: src/modules/DnsServer.pm:960
+#: src/modules/DnsServer.pm:969
 msgid "Initializing DNS Server Configuration"
 msgstr "Initialiserer oppsett av DNS-server"
 
 #. progress stage
-#: src/modules/DnsServer.pm:964
+#: src/modules/DnsServer.pm:973
 msgid "Check the environment"
 msgstr "Kontroller miljøet"
 
 #. progress stage
-#: src/modules/DnsServer.pm:966 src/modules/DnsServer.pm:1337
+#: src/modules/DnsServer.pm:975 src/modules/DnsServer.pm:1346
 msgid "Flush caches of the DNS daemon"
 msgstr "Tøm mellomlagre for DNS-nissen"
 
 #. progress stage
-#: src/modules/DnsServer.pm:968
+#: src/modules/DnsServer.pm:977
 msgid "Read the firewall settings"
 msgstr "Les brannmurinnstillinger"
 
 #. progress stage
-#: src/modules/DnsServer.pm:970
+#: src/modules/DnsServer.pm:979
 msgid "Read the settings"
 msgstr "Les innstillingene"
 
 #. progress step
-#: src/modules/DnsServer.pm:974
+#: src/modules/DnsServer.pm:983
 msgid "Checking the environment..."
 msgstr "Kontrollerer miljøet..."
 
 #. progress step
-#: src/modules/DnsServer.pm:976 src/modules/DnsServer.pm:1353
+#: src/modules/DnsServer.pm:985 src/modules/DnsServer.pm:1362
 msgid "Flushing caches of the DNS daemon..."
 msgstr "Tømmer mellomlagre for DNS-nissen..."
 
 #. progress step
-#: src/modules/DnsServer.pm:978
+#: src/modules/DnsServer.pm:987
 msgid "Reading the firewall settings..."
 msgstr "Leser brannmurinnstillinger..."
 
 #. progress step
-#: src/modules/DnsServer.pm:980
+#: src/modules/DnsServer.pm:989
 msgid "Reading the settings..."
 msgstr "Leser innstillingene..."
 
 #. progress step
-#: src/modules/DnsServer.pm:982 src/modules/DnsServer.pm:1367
+#: src/modules/DnsServer.pm:991 src/modules/DnsServer.pm:1376
 msgid "Finished"
 msgstr "Fullført"
 
-#: src/modules/DnsServer.pm:1266
+#: src/modules/DnsServer.pm:1275
 msgid ""
 "Error occurred while calling netconfig.\n"
 "Error: "
@@ -2572,72 +2563,72 @@
 "Feil: "
 
 #. DNS server read dialog caption
-#: src/modules/DnsServer.pm:1333
+#: src/modules/DnsServer.pm:1342
 msgid "Saving DNS Server Configuration"
 msgstr "Lagrer konfigurasjon for DNS-server"
 
 #. progress stage
-#: src/modules/DnsServer.pm:1339
+#: src/modules/DnsServer.pm:1348
 msgid "Save configuration files"
 msgstr "Lagre konfigurasjonsfiler"
 
 #. progress stage
-#: src/modules/DnsServer.pm:1341
+#: src/modules/DnsServer.pm:1350
 msgid "Restart the DNS daemon"
 msgstr "Start DNS-nissen på nytt"
 
 #. progress stage
-#: src/modules/DnsServer.pm:1343
+#: src/modules/DnsServer.pm:1352
 msgid "Update zone files"
 msgstr "Oppdater sonefiler"
 
 #. progress stage
-#: src/modules/DnsServer.pm:1345
+#: src/modules/DnsServer.pm:1354
 msgid "Adjust the DNS service"
 msgstr "Tilpass DNS-tjenesten"
 
 #. progress stage
-#: src/modules/DnsServer.pm:1347
+#: src/modules/DnsServer.pm:1356
 msgid "Call netconfig"
 msgstr "Kjør netconfig"
 
 #. progress stage
-#: src/modules/DnsServer.pm:1349
+#: src/modules/DnsServer.pm:1358
 msgid "Write the firewall settings"
 msgstr "Lagre brannmurinnstillinger"
 
 #. progress step
-#: src/modules/DnsServer.pm:1355
+#: src/modules/DnsServer.pm:1364
 msgid "Saving configuration files..."
 msgstr "Lagrer konfigurasjonsfiler..."
 
 #. progress step
-#: src/modules/DnsServer.pm:1357
+#: src/modules/DnsServer.pm:1366
 msgid "Restarting the DNS daemon..."
 msgstr "Starter DNS-nissen på nytt..."
 
 #. progress step
-#: src/modules/DnsServer.pm:1359
+#: src/modules/DnsServer.pm:1368
 msgid "Updating zone files..."
 msgstr "Oppdaterer sonefiler..."
 
 #. progress step
-#: src/modules/DnsServer.pm:1361
+#: src/modules/DnsServer.pm:1370
 msgid "Adjusting the DNS service..."
 msgstr "Tilpasser DNS-tjenesten..."
 
 #. progress step
-#: src/modules/DnsServer.pm:1363
+#: src/modules/DnsServer.pm:1372
 msgid "Calling netconfig..."
 msgstr "Kjører netconfig..."
 
 #. progress step
-#: src/modules/DnsServer.pm:1365
+#: src/modules/DnsServer.pm:1374
 msgid "Writing the firewall settings..."
 msgstr "Lagrer brannmurinnstillinger..."
 
 #. Cannot start service 'named', because of error that follows Error:.  Do not translate named.
-#: src/modules/DnsServer.pm:1538
+#: src/modules/DnsServer.pm:1547
 #, fuzzy
 #| msgid ""
 #| "Error occurred while starting service named.\n"
@@ -2650,43 +2641,43 @@
 "Feil: "
 
 #. type of zone to be used in summary
-#: src/modules/DnsServer.pm:1662
+#: src/modules/DnsServer.pm:1671
 msgid "Stub"
 msgstr "Stub"
 
 #. type of zone to be used in summary
-#: src/modules/DnsServer.pm:1664
+#: src/modules/DnsServer.pm:1673
 msgid "Hint"
 msgstr "Hint"
 
 #. summary string
-#: src/modules/DnsServer.pm:1673
+#: src/modules/DnsServer.pm:1682
 msgid "The DNS server starts when booting the system."
 msgstr "DNS-serveren starter når systemet starter opp."
 
 #. summary string
-#: src/modules/DnsServer.pm:1679
+#: src/modules/DnsServer.pm:1688
 msgid "The DNS server does not start when booting the system."
 msgstr "DNS-serveren starter ikke når systemet starter opp."
 
 #. summary string, %s is list of DNS zones (their names), coma separated
-#: src/modules/DnsServer.pm:1707
+#: src/modules/DnsServer.pm:1716
 #, perl-format
 msgid "Configured Zones: %s"
 msgstr "Konfigurerte soner: %s"
 
 #. error message
-#: src/modules/DnsServer.pm:1721
+#: src/modules/DnsServer.pm:1730
 msgid "Invalid LDAP configuration. Cannot use LDAP."
 msgstr "Ugyldig LDAP-konfigurasjon. Kan ikke bruke LDAP."
 
 #. yes-no popup
-#: src/modules/DnsServer.pm:1802
+#: src/modules/DnsServer.pm:1811
 msgid "Enable LDAP support?"
 msgstr "Vil du aktivere LDAP-støtte?"
 
 #. error popup
-#: src/modules/DnsServer.pm:1890
+#: src/modules/DnsServer.pm:1899
 msgid ""
 "Installation of required packages failed.\n"
 "LDAP support will not be active."
@@ -2695,30 +2686,33 @@
 "LDAP-støtte vil ikke bli aktivert."
 
 #. BNC #679960
-#: src/modules/DnsServer.pm:1949
+#: src/modules/DnsServer.pm:1958
 msgid "Unknown LDAP initialization error."
 msgstr "Ukjent feil ved LDAP-initialisering."
 
 #. TRANSLATORS: Popup error message, %1 is an LDAP object whose creation failed
-#: src/modules/DnsServer.pm:1985
+#: src/modules/DnsServer.pm:1994
 msgid "Error occurred while creating %1."
 msgstr "Det oppstod en feil under oppretting av %1."
 
 #. error report, %1 is ldap object
-#: src/modules/DnsServer.pm:2021
+#: src/modules/DnsServer.pm:2030
 msgid "Error occurred while creating cn=defaultDNS,%1. Not using LDAP."
 msgstr "Det oppstod en feil under oppretting av cn=defaultDNS,%1. LDAP vil ikke bli brukt."
 
 #. error report, %1 is LDAP record DN
-#: src/modules/DnsServer.pm:2047
+#: src/modules/DnsServer.pm:2056
 msgid "Error occurred while updating %1."
 msgstr "Det oppstod en feil under oppdatering av %1."
 
 #. error report, %1 is LDAP record DN
-#: src/modules/DnsServer.pm:2082
+#: src/modules/DnsServer.pm:2091
 msgid "Error occurred while creating %1. Not using LDAP."
 msgstr "Det oppstod en feil under oppretting av %1. LDAP vil ikke bli brukt."
 
+#~ msgid "Ad&vanced"
+#~ msgstr "A&vansert"
+
 #~ msgid "When &Booting"
 #~ msgstr "Under &oppstart"
 

Modified: trunk/yast/nb/po/docker.nb.po
===================================================================
--- trunk/yast/nb/po/docker.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/docker.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2002-06-17 14:33+0200\n"
 "Last-Translator: www.linuxbutikken.no \n"
 "Language-Team: Norwegian \n"
@@ -17,6 +17,120 @@
 "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/ydocker/changes_dialog.rb:71
+#, fuzzy
+#| msgid " Container"
+msgid "Changes in Container"
+msgstr " Container"
+
+#: src/lib/ydocker/changes_dialog.rb:79
+msgid "Path"
+msgstr ""
+
+#: src/lib/ydocker/changes_dialog.rb:80 src/lib/ydocker/main_dialog.rb:235
+msgid "Status"
+msgstr "Status"
+
+#. TODO translation
+#: src/lib/ydocker/changes_dialog.rb:110 src/lib/ydocker/main_dialog.rb:304
+#, fuzzy
+#| msgid "Exit"
+msgid "&Exit"
+msgstr "Avslutt"
+
+#. 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/ydocker/commit_dialog.rb:81
+#, fuzzy
+#| msgid " Container"
+msgid "Commit Container"
+msgstr " Container"
+
+#: src/lib/ydocker/commit_dialog.rb:90 src/lib/ydocker/main_dialog.rb:217
+msgid "Repository"
+msgstr "Lagringskatalog"
+
+#: src/lib/ydocker/commit_dialog.rb:96
+msgid "Name"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:102 src/lib/ydocker/main_dialog.rb:218
+#, fuzzy
+#| msgid "Tab"
+msgid "Tag"
+msgstr "Fane"
+
+#: src/lib/ydocker/commit_dialog.rb:105
+msgid "Author"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:106
+msgid "Message"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:112
+#: src/lib/ydocker/inject_shell_dialog.rb:92
+#: src/lib/ydocker/run_image_dialog.rb:162
+msgid "&Ok"
+msgstr ""
+
+#: src/lib/ydocker/commit_dialog.rb:113
+#: src/lib/ydocker/inject_shell_dialog.rb:93
+#: src/lib/ydocker/run_image_dialog.rb:163
+msgid "&Cancel"
+msgstr ""
+
+#. 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/ydocker/inject_shell_dialog.rb:75
+#, fuzzy
+#| msgid "Terminals"
+msgid "Inject Shell"
+msgstr "Terminaler"
+
+#: src/lib/ydocker/inject_shell_dialog.rb:84
+msgid "Target Shell"
+msgstr ""
+
+#: src/lib/ydocker/inject_shell_dialog.rb:110
+msgid "Failed to run terminal. Error: %{error}"
+msgstr ""
+
 #. Only root can start process
 #: src/lib/ydocker/main_dialog.rb:74
 msgid "Docker service does not run. Should YaST start docker? Otherwise YaST quits."
@@ -82,16 +196,6 @@
 msgid "Running Docker Containers"
 msgstr "Kontrollerer internettforbindelse"
 
-#: src/lib/ydocker/main_dialog.rb:217
-msgid "Repository"
-msgstr "Lagringskatalog"
-
-#: src/lib/ydocker/main_dialog.rb:218
-#, fuzzy
-#| msgid "Tab"
-msgid "Tag"
-msgstr "Fane"
-
 #: src/lib/ydocker/main_dialog.rb:219
 #, fuzzy
 #| msgid "Image"
@@ -120,15 +224,11 @@
 msgid "Image"
 msgstr "Diskbilde"
 
-#: src/lib/ydocker/main_dialog.rb:233
+#: src/lib/ydocker/main_dialog.rb:233 src/lib/ydocker/run_image_dialog.rb:127
 msgid "Command"
 msgstr "Kommando"
 
-#: src/lib/ydocker/main_dialog.rb:235
-msgid "Status"
-msgstr "Status"
-
-#: src/lib/ydocker/main_dialog.rb:236
+#: src/lib/ydocker/main_dialog.rb:236 src/lib/ydocker/run_image_dialog.rb:123
 #, fuzzy
 #| msgid "Port"
 msgid "Ports"
@@ -177,14 +277,65 @@
 msgid "&Commit"
 msgstr "Kommentar"
 
-#: src/lib/ydocker/main_dialog.rb:304
-#, fuzzy
-#| msgid "Exit"
-msgid "&Exit"
-msgstr "Avslutt"
-
 #: src/lib/ydocker/main_dialog.rb:315
 #, fuzzy
 #| msgid "Do you really want to delete this user?"
 msgid "Do you really want to delete image \"%s\"?"
 msgstr "Er du sikker på at du vil slette denne brukeren?"
+
+#. 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/ydocker/run_image_dialog.rb:90
+#, fuzzy
+#| msgid " Container"
+msgid "Run Container"
+msgstr " Container"
+
+#: src/lib/ydocker/run_image_dialog.rb:100
+msgid "Host"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:101
+#, fuzzy
+#| msgid " Container"
+msgid "Container"
+msgstr " Container"
+
+#: src/lib/ydocker/run_image_dialog.rb:108
+msgid "Add"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:112
+msgid "Remove"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:122
+msgid "Volumes"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:168
+msgid "Choose directory to share"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:173
+msgid "Choose target directory"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:200
+msgid "Choose external port"
+msgstr ""
+
+#: src/lib/ydocker/run_image_dialog.rb:201
+msgid "Choose internal port"
+msgstr ""

Modified: trunk/yast/nb/po/drbd.nb.po
===================================================================
--- trunk/yast/nb/po/drbd.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/drbd.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2008-09-21 10:37+0200\n"
 "Last-Translator: Olav P. \n"
 "Language-Team: Norwegian Bokmål <>\n"
@@ -240,7 +240,7 @@
 msgstr ""
 
 #: src/include/drbd/helps.rb:66 src/include/drbd/helps.rb:72
-#: src/include/drbd/helps.rb:85
+#: src/include/drbd/helps.rb:86
 #, fuzzy
 #| msgid "<p><b><big>Global Configuration of DRBD</big></b></p>"
 msgid "<p><b><big>Resource Configuration of DRBD</big></b></p>"
@@ -256,15 +256,16 @@
 msgid ""
 "\n"
 "\t\t<p>\"Name\" is mandatory and must match the Linux host name (uname -n) of one of the nodes. Should not include \".\" in hostname.</p>\n"
-"\t\t<p>\"Address:Port\": A resource needs one IP address per device, which is used to wait for incoming connections from the partner device to reach the device. Each DRBD resource needs a TCP port which is used to connect to the node's partner device.</p>\n"
+"\t\t<p>\"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. For IPv6, the actual address that follows the ipv6 keyword must be placed inside brackets: ipv6 [2001:1945:fc03:abcd::1]:7788</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. Otherwise, you may omit the name, or the word minor and its number. If you omit the name a default of /dev/drbd'minor number' will be used.\n"
 "\t\tLike: '/dev/drbd{service} minor {minor drbd number [0...255]}' or '/dev/drbd{minor drbd number [0...255]}'</p>\n"
 "\t\t<p>\"Disk\":  DRBD uses this block device to actually store and retrieve the data.  Never access such a device while DRBD is running on top of  it.</p>\n"
 "\t\t<p>\"Meta-disk\": internal. Internal means that the last part of the backing device is used to store the meta-data.</p>\n"
+"\t\t<p>\"Node-id\": Node id is an internal value for drbd, will be generated by yast automatically. A host can have different \"node-id\" in different resources.</p>\n"
 "\t\t"
 msgstr ""
 
-#: src/include/drbd/helps.rb:88
+#: src/include/drbd/helps.rb:89
 msgid ""
 "\n"
 "\t\t<p><b>Protocol</b></p>\n"
@@ -290,13 +291,13 @@
 "\t\t"
 msgstr ""
 
-#: src/include/drbd/helps.rb:112
+#: src/include/drbd/helps.rb:113
 #, fuzzy
 #| msgid "<p><b><big>s390 reIPL Configuration</big></b></p>"
 msgid "<p><b><big>LVM Configuration</big></b></p>"
 msgstr "<p><b><big>reiIPL-oppsett for s390</big></b></p>"
 
-#: src/include/drbd/helps.rb:115
+#: src/include/drbd/helps.rb:116
 msgid ""
 "\n"
 "\t\t<p><b>LVM configuration file /etc/lvm/lvm.conf</b></p>\n"
@@ -305,20 +306,22 @@
 "\t\t<p><b>Device Filter</b>: This masks the underlying block device from the list of devices LVM scans for Physical Volume signatures. This way, LVM is instructed to read Physical Volume signatures from DRBD devices, rather than from the underlying backing block devices.</p>\t\t<p><b>AutoFilter</b>: According to the configuration of drbd, LVM filter will always be changed automatically. To change it manually, disable the checkbox of AutoFilter.</p>\n"
 "\t\t<p>The filter consists of an array of regular expressions. These expressions can be delimited by a character of your choice, and prefixed with either an 'a' (for accept) or 'r' (for reject).</p>\t\t<p>For example, setting filter as [\"r|/dev/sda.*|\"]</p>\n"
 "\n"
-"\t\t<p><b>LVM cache</b>: Enable/turn on writing the LVM cache is default. Disable cache when for network storage, like nfs. </p>\n"
+"\t\t<p><b>LVM cache</b>: Enable/turn on writing the LVM cache is default. Should disable the LVM cache when combined drbd with LVM.</p>\n"
 "\n"
+"\t\t<p><b>LVMetad</b>: When lvmetad is enabled, the volume group metadata and PV state flags are obtained from the lvmetad instance and no scanning is done by the individual commands. Because lvmetad's cache cannot be synchronized between nodes, users are advised to disable lvmetad in cluster environments.</p>\n"
+"\n"
 "\t\t"
 msgstr ""
 
-#: src/include/drbd/helps.rb:130
+#: src/include/drbd/helps.rb:133
 msgid "<p><b><big>Global Configuration of DRBD</big></b></p>"
 msgstr "<p><b><big>Globalt oppsett for DRBD</big></b></p>"
 
-#: src/include/drbd/helps.rb:133
+#: src/include/drbd/helps.rb:136
 msgid "<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's sanity check</p>"
 msgstr "<p>Kryss av for <b>Deaktiver IP-verifisering\"</b> for å deaktivere en av gyldighetskontrollene i drbdadm</p>"
 
-#: src/include/drbd/helps.rb:136
+#: src/include/drbd/helps.rb:139
 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"
@@ -334,7 +337,7 @@
 "                Dialogen vil oppdatere telleverdien i henhold til sekundverdien i 'Oppdater dialog'.\n"
 "                Bruk 0 for å deaktivere oppdatering av skjermen helt. </p>"
 
-#: src/include/drbd/helps.rb:144
+#: src/include/drbd/helps.rb:147
 msgid ""
 "<p><b>Minor Count:</b>\n"
 "           use this if you want to define more resources later\n"
@@ -349,7 +352,7 @@
 "           som denne filen angir. </p>"
 
 #. Summary dialog help 1/3
-#: src/include/drbd/helps.rb:152
+#: src/include/drbd/helps.rb:155
 #, fuzzy
 #| msgid ""
 #| "<p><b><big>Drbd Configuration</big></b><br>\n"
@@ -362,7 +365,7 @@
 "Sett opp drbd her.<br></p>\n"
 
 #. Summary dialog help 2/3
-#: src/include/drbd/helps.rb:156
+#: src/include/drbd/helps.rb:159
 msgid ""
 "<p><b><big>Adding a drbd:</big></b><br>\n"
 "Choose an drbd from the list of detected drbds.\n"
@@ -375,7 +378,7 @@
 "Klikk deretter <b>Sett opp</b>.</p>\n"
 
 #. Summary dialog help 3/3
-#: src/include/drbd/helps.rb:163
+#: src/include/drbd/helps.rb:166
 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"
@@ -386,7 +389,7 @@
 "du kan endre konfigurasjonen.</p>\n"
 
 #. Ovreview dialog help 1/3
-#: src/include/drbd/helps.rb:169
+#: src/include/drbd/helps.rb:172
 #, fuzzy
 #| msgid ""
 #| "<p><b><big>Drbd Configuration Overview</big></b><br>\n"
@@ -402,7 +405,7 @@
 "redigere oppsettene.<br></p>\n"
 
 #. Ovreview dialog help 2/3
-#: src/include/drbd/helps.rb:175
+#: src/include/drbd/helps.rb:178
 msgid ""
 "<p><b><big>Adding a drbd:</big></b><br>\n"
 "Press <b>Add</b> to configure a drbd.</p>"
@@ -411,7 +414,7 @@
 "Klikk <b>Legg til</b> for å sette opp en drbd.</p>"
 
 #. Ovreview dialog help 3/3
-#: src/include/drbd/helps.rb:179
+#: src/include/drbd/helps.rb:182
 msgid ""
 "<p><b><big>Editing or Deleting:</big></b><br>\n"
 "Choose a drbd to change or remove.\n"
@@ -422,7 +425,7 @@
 "Klikk deretter <b>Rediger</b> eller <b>Slett</b> etter ønske.</p>\n"
 
 #. Configure1 dialog help 1/2
-#: src/include/drbd/helps.rb:185
+#: src/include/drbd/helps.rb:188
 msgid ""
 "<p><b><big>Configuration Part One</big></b><br>\n"
 "Press <b>Next</b> to continue.\n"
@@ -434,7 +437,7 @@
 
 #. Configure1 dialog help 2/2
 #. Configure2 dialog help 2/2
-#: src/include/drbd/helps.rb:191 src/include/drbd/helps.rb:203
+#: src/include/drbd/helps.rb:194 src/include/drbd/helps.rb:206
 msgid ""
 "<p><b><big>Selecting Something</big></b><br>\n"
 "It is not possible. You must code it first. :-)\n"
@@ -445,7 +448,7 @@
 "</p>"
 
 #. Configure2 dialog help 1/2
-#: src/include/drbd/helps.rb:197
+#: src/include/drbd/helps.rb:200
 msgid ""
 "<p><b><big>Configuration Part Two</big></b><br>\n"
 "Press <b>Next</b> to continue.\n"
@@ -456,60 +459,140 @@
 "<br></p>\n"
 
 #. Default is always true (auto)
-#: src/include/drbd/lvm_conf.rb:36
+#: src/include/drbd/lvm_conf.rb:44
 #, fuzzy
 #| msgid "Configuration of DRBD"
 msgid "LVM Filter Configuration of DRBD"
 msgstr "Oppsett av DRBD"
 
-#: src/include/drbd/lvm_conf.rb:44
+#: src/include/drbd/lvm_conf.rb:52
 msgid "Modify LVM Device filter Automatically"
 msgstr ""
 
-#: src/include/drbd/lvm_conf.rb:54
+#: src/include/drbd/lvm_conf.rb:62
 #, fuzzy
 #| msgid "Device type"
 msgid "Device Filter"
 msgstr "Enhetstype"
 
-#: src/include/drbd/lvm_conf.rb:64
+#: src/include/drbd/lvm_conf.rb:72
 #, fuzzy
 #| msgid "Writing the SCPM database..."
 msgid "Writing the LVM cache"
 msgstr "Lagrer SCPM-database..."
 
-#: src/include/drbd/lvm_conf.rb:73
+#: src/include/drbd/lvm_conf.rb:81
 #, fuzzy
 #| msgid "Enable Microphone."
 msgid "Enable LVM Cache"
 msgstr "Aktiver mikrofon."
 
+#: src/include/drbd/lvm_conf.rb:86
+msgid "Warning!  Should disable LVM cache for using drbd."
+msgstr ""
+
+#: src/include/drbd/lvm_conf.rb:97
+msgid "Use lvmetad for LVM"
+msgstr ""
+
+#: src/include/drbd/lvm_conf.rb:106
+msgid "Use LVM metad"
+msgstr ""
+
+#: src/include/drbd/lvm_conf.rb:111
+msgid "Warning!  Should not use lvmetad for cluster."
+msgstr ""
+
 #. encoding: utf-8
-#: src/include/drbd/resource_conf.rb:134
+#: src/include/drbd/resource_conf.rb:144
 msgid "Resource Name"
 msgstr "Ressursnavn"
 
-#. Update new add disk used of drbd res for LVM filter
-#. Ignore the removed disk
-#: src/include/drbd/resource_conf.rb:326
+#: src/include/drbd/resource_conf.rb:151
+msgid "Nodes"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:154
+msgid "Add"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:155
+msgid "Edit"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:156
+msgid "Delete"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:188
+msgid "Save"
+msgstr ""
+
+#. Since n_name can't be edit, so set direct is OK
+#: src/include/drbd/resource_conf.rb:336
 msgid "Protocol"
 msgstr "Protokoll"
 
-#. myHelp("basic_conf");
-#: src/include/drbd/resource_conf.rb:572
-msgid "Node names must be different."
+#. return `cancel or a string
+#: src/include/drbd/resource_conf.rb:560
+msgid "OK"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:561
+msgid "Cancel"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:575
+#, fuzzy
+#| msgid "Node names must be different."
+msgid "Node name can not be empty."
 msgstr "Andre nodenavn må angis."
 
-#: src/include/drbd/resource_conf.rb:578
+#. eg. ipv6 [fd01:2345:6789:abcd::1]:7800
+#: src/include/drbd/resource_conf.rb:623
+msgid "IPv6 address must be placed inside brackets."
+msgstr ""
+
+#. IPv6 should including port
+#: src/include/drbd/resource_conf.rb:631 src/include/drbd/resource_conf.rb:636
+msgid "IP/port should use 'addr:port' combination."
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:644
+msgid "Please enter a valid IP address."
+msgstr ""
+
+#. Checking the port is number
+#: src/include/drbd/resource_conf.rb:651
+msgid "Please enter a valid port number."
+msgstr ""
+
+#. myHelp("basic_conf");
+#: src/include/drbd/resource_conf.rb:719
 msgid "Node names must not include \".\" , using the local hostname."
 msgstr ""
 
-#: src/include/drbd/resource_conf.rb:608
+#: src/include/drbd/resource_conf.rb:739
 #, fuzzy
 #| msgid "Fill out all fields."
 msgid "Please fill out all fields."
 msgstr "Fyll ut alle felter."
 
+#: src/include/drbd/resource_conf.rb:754
+msgid "Please configure at least two nodes."
+msgstr ""
+
+#. No need to check integrity since it will disabled when configuring
+#: src/include/drbd/resource_conf.rb:789
+msgid "Enter the node name:"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:795
+#, fuzzy
+#| msgid "Node names must be different."
+msgid "Node name must be different."
+msgstr "Andre nodenavn må angis."
+
 #. encoding: utf-8
 #. Package:	Configuration of heartbeat
 #. Authors:	Martin Lazar 
@@ -619,80 +702,80 @@
 #.
 #. Representation of the configuration of drbd.
 #. Input and output routines.
-#: src/modules/Drbd.rb:110
+#: src/modules/Drbd.rb:114
 msgid "Failed to merge separated DRBD conf files\n"
 msgstr ""
 
-#: src/modules/Drbd.rb:132
+#: src/modules/Drbd.rb:136
 #, fuzzy
 #| msgid "Unable to write to idmapd.conf."
 msgid "Failed to write drbd.conf.YaST2prepare"
 msgstr "Kan ikke skrive til idmapd.conf."
 
 #. DRBD read dialog caption
-#: src/modules/Drbd.rb:185
+#: src/modules/Drbd.rb:191
 msgid "Initializing DRBD Configuration"
 msgstr "Initialiserer DRBD-oppsett"
 
 #. We do not set help text here, because it was set outside
-#: src/modules/Drbd.rb:193
+#: src/modules/Drbd.rb:199
 msgid "Read global settings"
 msgstr "Les globale innstillinger"
 
-#: src/modules/Drbd.rb:194
+#: src/modules/Drbd.rb:200
 msgid "Read resources"
 msgstr "Les ressurser"
 
-#: src/modules/Drbd.rb:195
+#: src/modules/Drbd.rb:201
 #, fuzzy
 #| msgid "Read configurations"
 msgid "Read LVM configurations"
 msgstr "Les oppsett"
 
-#: src/modules/Drbd.rb:196
+#: src/modules/Drbd.rb:202
 msgid "Read daemon status"
 msgstr "Les nissestatus"
 
-#: src/modules/Drbd.rb:197 src/modules/Drbd.rb:204
+#: src/modules/Drbd.rb:203 src/modules/Drbd.rb:210
 #, fuzzy
 #| msgid "Read Firewall Settings."
 msgid "Read SuSEFirewall Settings"
 msgstr "Les brannmurinnstillinger."
 
-#: src/modules/Drbd.rb:200
+#: src/modules/Drbd.rb:206
 msgid "Reading global settings..."
 msgstr "Leser globale innstillinger..."
 
-#: src/modules/Drbd.rb:201
+#: src/modules/Drbd.rb:207
 msgid "Reading resources..."
 msgstr "Leser ressurser..."
 
-#: src/modules/Drbd.rb:202
+#: src/modules/Drbd.rb:208
 #, fuzzy
 #| msgid "Reading the configurations..."
 msgid "Reading LVM configurations..."
 msgstr "Leser oppsett..."
 
-#: src/modules/Drbd.rb:203
+#: src/modules/Drbd.rb:209
 msgid "Reading daemon status..."
 msgstr "Leser nissestatus..."
 
-#: src/modules/Drbd.rb:205 src/modules/Drbd.rb:629
+#: src/modules/Drbd.rb:211 src/modules/Drbd.rb:661
 msgid "Finished"
 msgstr "Fullført"
 
 #. new_map = remove(new_map, key);
-#: src/modules/Drbd.rb:497
+#: src/modules/Drbd.rb:514
 #, fuzzy
 #| msgid "Failed to save ipsec.conf:"
 msgid "Failed to backup drbd.conf"
 msgstr "Kunne ikke lagre ipsec.conf:"
 
-#: src/modules/Drbd.rb:506
+#: src/modules/Drbd.rb:523
 msgid "Failed to clean drbd.conf for drbdadm test"
 msgstr ""
 
-#: src/modules/Drbd.rb:530
+#: src/modules/Drbd.rb:547
 #, fuzzy
 #| msgid "Configuration of Resource Groups"
 msgid ""
@@ -700,12 +783,12 @@
 "%2"
 msgstr "Konfigurasjon av ressursgrupper"
 
-#: src/modules/Drbd.rb:549
+#: src/modules/Drbd.rb:566
 msgid "Failed to bring drbd.conf back"
 msgstr ""
 
 #. DRBD write dialog caption
-#: src/modules/Drbd.rb:605
+#: src/modules/Drbd.rb:637
 msgid "Writing DRBD Configuration"
 msgstr "Lagrer DRBD-oppsett"
 
@@ -713,55 +796,55 @@
 #. won't change modified flag
 #. return true if !@modified
 #. We do not set help text here, because it was set outside
-#: src/modules/Drbd.rb:617
+#: src/modules/Drbd.rb:649
 msgid "Write global settings"
 msgstr "Lagre generelle innstillinger"
 
-#: src/modules/Drbd.rb:618
+#: src/modules/Drbd.rb:650
 msgid "Write resources"
 msgstr "Lagre ressursene"
 
-#: src/modules/Drbd.rb:619
+#: src/modules/Drbd.rb:651
 #, fuzzy
 #| msgid "Write configuration"
 msgid "Write LVM configurations"
 msgstr "Lagre oppsett"
 
-#: src/modules/Drbd.rb:620
+#: src/modules/Drbd.rb:652
 msgid "Set daemon status"
 msgstr "Definer nissestatus"
 
-#: src/modules/Drbd.rb:621
+#: src/modules/Drbd.rb:653
 #, fuzzy
 #| msgid "Write the firewall settings"
 msgid "Write the SuSEfirewall settings"
 msgstr "Lagre brannmurinnstillinger"
 
-#: src/modules/Drbd.rb:624
+#: src/modules/Drbd.rb:656
 msgid "Writing global settings..."
 msgstr "Lagrer generelle innstillinger..."
 
-#: src/modules/Drbd.rb:625
+#: src/modules/Drbd.rb:657
 msgid "Writing resources..."
 msgstr "Lagrer ressurser..."
 
-#: src/modules/Drbd.rb:626
+#: src/modules/Drbd.rb:658
 #, fuzzy
 #| msgid "Writing configuration..."
 msgid "Writing LVM configurations..."
 msgstr "Lagrer oppsett..."
 
-#: src/modules/Drbd.rb:627
+#: src/modules/Drbd.rb:659
 msgid "Setting daemon status..."
 msgstr "Definerer nissestatus..."
 
-#: src/modules/Drbd.rb:628
+#: src/modules/Drbd.rb:660
 #, fuzzy
 #| msgid "Writing the firewall settings..."
 msgid "Writing the SuSEFirewall settings"
 msgstr "Lagrer brannmurinnstillinger..."
 
-#: src/modules/Drbd.rb:639
+#: src/modules/Drbd.rb:671
 #, fuzzy
 #| msgid "Unable to create directory '%1'."
 msgid "Failed to make directory /etc/drbd.d"

Modified: trunk/yast/nb/po/fcoe-client.nb.po
===================================================================
--- trunk/yast/nb/po/fcoe-client.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/fcoe-client.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2002-06-17 14:33+0200\n"
 "Last-Translator: www.linuxbutikken.no \n"
 "Language-Team: Norwegian \n"
@@ -598,39 +598,39 @@
 msgstr "<p>Vil du installere den nå?</p>"
 
 #. start service lldpad first
-#: src/modules/FcoeClient.rb:868
+#: src/modules/FcoeClient.rb:859
 msgid "Cannot start service 'lldpad'"
 msgstr ""
 
-#: src/modules/FcoeClient.rb:877
+#: src/modules/FcoeClient.rb:868
 #, fuzzy
 #| msgid "Cannot detect devices."
 msgid "Cannot start service 'fcoe'"
 msgstr "Finner ingen enheter."
 
 #. first start lldpad
-#: src/modules/FcoeClient.rb:897
+#: src/modules/FcoeClient.rb:888
 msgid "Cannot start lldpad systemd socket"
 msgstr ""
 
-#: src/modules/FcoeClient.rb:910
+#: src/modules/FcoeClient.rb:901
 #, fuzzy
 #| msgid "Cannot start winbind service."
 msgid "Cannot start lldpad service."
 msgstr "Kan ikke starte winbind-tjeneste."
 
-#: src/modules/FcoeClient.rb:922
+#: src/modules/FcoeClient.rb:913
 msgid "Cannot start fcoemon systemd socket."
 msgstr ""
 
-#: src/modules/FcoeClient.rb:935
+#: src/modules/FcoeClient.rb:926
 #, fuzzy
 #| msgid "Cannot restart the service."
 msgid "Cannot start fcoe service."
 msgstr "Kan ikke starte tjenesten på nytt."
 
 #. warning if no valid configuration found
-#: src/modules/FcoeClient.rb:1101
+#: src/modules/FcoeClient.rb:1092
 msgid ""
 "Cannot read config file for %1.\n"
 "You may edit the settings and recreate the FCoE\n"
@@ -641,112 +641,112 @@
 "VLAN-grensesnittet på nytt for å lage et gyldig oppsett."
 
 #. FcoeClient read dialog caption
-#: src/modules/FcoeClient.rb:1466
+#: src/modules/FcoeClient.rb:1457
 msgid "Initializing fcoe-client Configuration"
 msgstr "Initialiserer oppsett for fcoe-klient"
 
 #. Progress stage 1/3
-#: src/modules/FcoeClient.rb:1481
+#: src/modules/FcoeClient.rb:1472
 msgid "Check installed packages"
 msgstr "Kontroller installerte pakker"
 
 #. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1483
+#: src/modules/FcoeClient.rb:1474
 msgid "Check services"
 msgstr "Kontroller tjenester"
 
 #. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1485
+#: src/modules/FcoeClient.rb:1476
 msgid "Detect network cards"
 msgstr "Søk etter nettverkskort"
 
 #. Progress stage 4/4
-#: src/modules/FcoeClient.rb:1487
+#: src/modules/FcoeClient.rb:1478
 msgid "Read /etc/fcoe/config"
 msgstr "Les /etc/fcoe/config"
 
 #. Progress step 1/3
-#: src/modules/FcoeClient.rb:1491
+#: src/modules/FcoeClient.rb:1482
 msgid "Checking for installed packages..."
 msgstr "Søker etter installerte pakker..."
 
 #. Progress step 2/3
-#: src/modules/FcoeClient.rb:1493
+#: src/modules/FcoeClient.rb:1484
 msgid "Checking for services..."
 msgstr "Søker etter tjenester..."
 
 #. Progress step 3/3
-#: src/modules/FcoeClient.rb:1495
+#: src/modules/FcoeClient.rb:1486
 msgid "Detecting network cards..."
 msgstr "Søker etter nettverkskort..."
 
 #. Progress step 4/4
-#: src/modules/FcoeClient.rb:1497
+#: src/modules/FcoeClient.rb:1488
 msgid "Reading /etc/fcoe/config"
 msgstr "Leser /etc/fcoe/config"
 
 #. Progress finished
 #. Progress finished
-#: src/modules/FcoeClient.rb:1499 src/modules/FcoeClient.rb:1593
+#: src/modules/FcoeClient.rb:1490 src/modules/FcoeClient.rb:1584
 msgid "Finished"
 msgstr "Fullført"
 
 #. Error message
-#: src/modules/FcoeClient.rb:1525
+#: src/modules/FcoeClient.rb:1516
 msgid "Starting of services failed."
 msgstr "Start av tjenester mislyktes."
 
 #. Error message
-#: src/modules/FcoeClient.rb:1538
+#: src/modules/FcoeClient.rb:1529
 msgid "Cannot detect devices."
 msgstr "Finner ingen enheter."
 
 #. Error message
-#: src/modules/FcoeClient.rb:1548
+#: src/modules/FcoeClient.rb:1539
 msgid "Cannot read /etc/fcoe/config."
 msgstr "Kan ikke lese /etc/fcoe/config."
 
 #. FcoeClient read dialog caption
-#: src/modules/FcoeClient.rb:1564
+#: src/modules/FcoeClient.rb:1555
 msgid "Saving fcoe-client Configuration"
 msgstr "Lagrer oppsett for fcoe-klient"
 
 #. Progress stage 1/2
-#: src/modules/FcoeClient.rb:1579
+#: src/modules/FcoeClient.rb:1570
 msgid "Write the settings"
 msgstr "Lagre innstillingene"
 
 #. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1581
+#: src/modules/FcoeClient.rb:1572
 msgid "Restart FCoE service"
 msgstr "Start FCoE-tjenestene på nytt"
 
 #. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1583
+#: src/modules/FcoeClient.rb:1574
 msgid "Adjust start of services"
 msgstr "Tilpass start av tjenester"
 
 #. Progress step 1/2
-#: src/modules/FcoeClient.rb:1587
+#: src/modules/FcoeClient.rb:1578
 msgid "Writing the settings..."
 msgstr "Lagrer innstillingene..."
 
 #. Progress step 2/3
-#: src/modules/FcoeClient.rb:1589
+#: src/modules/FcoeClient.rb:1580
 msgid "Restarting FCoE service..."
 msgstr "Starter FCoE-tjenestene på nytt..."
 
 #. Progress sstep 3/3
-#: src/modules/FcoeClient.rb:1591
+#: src/modules/FcoeClient.rb:1582
 msgid "Adjusting start of services..."
 msgstr "Tilpasser start av tjenester..."
 
 #. Error message
-#: src/modules/FcoeClient.rb:1611
+#: src/modules/FcoeClient.rb:1602
 msgid "Cannot write settings to /etc/fcoe/config."
 msgstr "Kan ikke lagre innstillinger i /etc/fcoe/config."
 
-#: src/modules/FcoeClient.rb:1617
+#: src/modules/FcoeClient.rb:1608
 msgid ""
 "Cannot write settings for FCoE interfaces.\n"
 "For details, see /var/log/YaST2/y2log."
@@ -755,43 +755,43 @@
 "Du finner mer informasjon i /var/log/YaST2/y2log."
 
 #. Error message
-#: src/modules/FcoeClient.rb:1629
+#: src/modules/FcoeClient.rb:1620
 msgid "Restarting of service fcoe failed."
 msgstr "Kunne ikke starte fcoe-tjenesten på nytt."
 
 #. Error message
-#: src/modules/FcoeClient.rb:1636
+#: src/modules/FcoeClient.rb:1627
 msgid "Cannot write /etc/sysconfig/network/ifcfg-files."
 msgstr "Kan ikke lagre /etc/sysconfig/network/ifcfg-filer."
 
 #. Configuration summary text for autoyast
-#: src/modules/FcoeClient.rb:1693
+#: src/modules/FcoeClient.rb:1684
 msgid "<b>General FCoE configuration</b>"
 msgstr "<b>Generelt FCoE-oppsett</b>"
 
 #. options from config file, not meant for translation
-#: src/modules/FcoeClient.rb:1707
+#: src/modules/FcoeClient.rb:1698
 msgid "<b>Interfaces</b>"
 msgstr "<b>Grensesnitt</b>"
 
 #. network card, e.g. eth0
-#: src/modules/FcoeClient.rb:1715
+#: src/modules/FcoeClient.rb:1706
 msgid "<i>Netcard</i>:"
 msgstr "<i>Nettverkskort</i>:"
 
 #. nothing to translate here (abbreviation for
 #. Fibre Channel over Ethernet Virtual LAN interface)
-#: src/modules/FcoeClient.rb:1725
+#: src/modules/FcoeClient.rb:1716
 msgid "<b>Starting of services</b>"
 msgstr "<b>Start av tjenester</b>"
 
 #. 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:1733 src/modules/FcoeClient.rb:1743
+#: src/modules/FcoeClient.rb:1724 src/modules/FcoeClient.rb:1734
 msgid "enabled"
 msgstr "aktivert"
 
-#: src/modules/FcoeClient.rb:1734 src/modules/FcoeClient.rb:1744
+#: src/modules/FcoeClient.rb:1725 src/modules/FcoeClient.rb:1735
 msgid "disabled"
 msgstr "deaktivert"
 

Modified: trunk/yast/nb/po/firewall.nb.po
===================================================================
--- trunk/yast/nb/po/firewall.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/firewall.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: firewall\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2009-08-08 08:45+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -25,6 +25,16 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.0\n"
 
+#. We can't do ncurces. Lets see if the firewalld-config
+#. is installed
+#: src/clients/firewall.rb:70
+msgid "Your display can't support the 'firewall-config' UI.\n"
+msgstr ""
+
+#: src/clients/firewall.rb:71
+msgid "Either use the Yast2 command line or the 'firewall-cmd' utility."
+msgstr ""
+
 #. TRANSLATORS: message popup
 #: src/clients/firewall_proposal.rb:113
 msgid ""
@@ -185,7 +195,7 @@
 #. TRANSLATORS: tree menu item
 #: src/include/firewall/dialogs.rb:379 src/include/firewall/dialogs.rb:382
 #: src/include/firewall/subdialogs.rb:840
-#: src/modules/SuSEFirewallCMDLine.rb:727
+#: src/modules/SuSEFirewallCMDLine.rb:740
 msgid "Logging Level"
 msgstr "Nivå for logging"
 
@@ -705,7 +715,7 @@
 #: src/include/firewall/subdialogs.rb:349
 #: src/include/firewall/subdialogs.rb:509
 #: src/include/firewall/subdialogs.rb:1056
-#: src/modules/SuSEFirewallCMDLine.rb:1405
+#: src/modules/SuSEFirewallCMDLine.rb:1418
 msgid "Source Network"
 msgstr "Kildenettverk"
 
@@ -716,8 +726,8 @@
 #: src/include/firewall/subdialogs.rb:351
 #: src/include/firewall/subdialogs.rb:511
 #: src/include/firewall/subdialogs.rb:1057
-#: src/modules/SuSEFirewallCMDLine.rb:1131
-#: src/modules/SuSEFirewallCMDLine.rb:1407
+#: src/modules/SuSEFirewallCMDLine.rb:1144
+#: src/modules/SuSEFirewallCMDLine.rb:1420
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -771,28 +781,28 @@
 #. TRANSLATORS: table header item, Req. == Requested
 #. TRANSLATORS: CommandLine table header item, Req.=Requested
 #: src/include/firewall/subdialogs.rb:513
-#: src/modules/SuSEFirewallCMDLine.rb:1409
+#: src/modules/SuSEFirewallCMDLine.rb:1422
 msgid "Req. IP"
 msgstr "Forsp. IP"
 
 #. TRANSLATORS: table header item, Req. == Requested
 #. TRANSLATORS: CommandLine table header item, Req.=Requested
 #: src/include/firewall/subdialogs.rb:515
-#: src/modules/SuSEFirewallCMDLine.rb:1411
+#: src/modules/SuSEFirewallCMDLine.rb:1424
 msgid "Req. Port"
 msgstr "Foresp. port"
 
 #. TRANSLATORS: table header item, Redir. == Redirect
 #. TRANSLATORS: CommandLine table header item, Redir.=Redirect
 #: src/include/firewall/subdialogs.rb:518
-#: src/modules/SuSEFirewallCMDLine.rb:1413
+#: src/modules/SuSEFirewallCMDLine.rb:1426
 msgid "Redir. to IP"
 msgstr "Omdir. til IP"
 
 #. TRANSLATORS: table header item, Redir. == Redirect
 #. TRANSLATORS: CommandLine table header item, Redir.=Redirect
 #: src/include/firewall/subdialogs.rb:520
-#: src/modules/SuSEFirewallCMDLine.rb:1415
+#: src/modules/SuSEFirewallCMDLine.rb:1428
 msgid "Redir. to Port"
 msgstr "Omdir. til port"
 
@@ -912,10 +922,10 @@
 #. TRANSLATORS: CommandLine table header item
 #. TRANSLATORS: CommandLine table header item
 #: src/include/firewall/subdialogs.rb:911
-#: src/modules/SuSEFirewallCMDLine.rb:601
-#: src/modules/SuSEFirewallCMDLine.rb:1084
-#: src/modules/SuSEFirewallCMDLine.rb:1129
-#: src/modules/SuSEFirewallCMDLine.rb:1176
+#: src/modules/SuSEFirewallCMDLine.rb:614
+#: src/modules/SuSEFirewallCMDLine.rb:1097
+#: src/modules/SuSEFirewallCMDLine.rb:1142
+#: src/modules/SuSEFirewallCMDLine.rb:1189
 msgid "Zone"
 msgstr "Sone"
 
@@ -1415,217 +1425,219 @@
 msgstr "Velg et element som skal slettes."
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:55
+#: src/modules/SuSEFirewallCMDLine.rb:56
 msgid "Firewall configuration"
 msgstr "Brannmurkonfigurasjon"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:64
+#: src/modules/SuSEFirewallCMDLine.rb:65
 msgid "Start-up settings"
 msgstr "Oppstartsinnstillinger"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:70
+#: src/modules/SuSEFirewallCMDLine.rb:71
 msgid "Known firewall zones"
 msgstr "Kjente brannmursoner"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:78
+#: src/modules/SuSEFirewallCMDLine.rb:79
 msgid "Network interfaces configuration"
 msgstr "Konfigurasjon av nettverksgrensesnitt"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:89
+#: src/modules/SuSEFirewallCMDLine.rb:90
 msgid "Allowed services, ports, and protocols"
 msgstr "Tillatte tjenester, porter og protokoller"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:102
+#: src/modules/SuSEFirewallCMDLine.rb:103
 msgid "Broadcast packet settings"
 msgstr "Innstillinger for kringkastede pakker"
 
 #. TRANSLATORS: CommandLine
-#: src/modules/SuSEFirewallCMDLine.rb:110
+#: src/modules/SuSEFirewallCMDLine.rb:111
 msgid "Masquerading settings"
 msgstr "Maskeringsinnstillinger"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:116
+#: src/modules/SuSEFirewallCMDLine.rb:117
 msgid "Redirect requests to masqueraded IP"
 msgstr "Omdiriger forespørsler til maskert IP"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:124
+#: src/modules/SuSEFirewallCMDLine.rb:125
 msgid "Logging settings"
 msgstr "Innstillinger for logging"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:133
+#: src/modules/SuSEFirewallCMDLine.rb:134
 msgid "Firewall configuration summary"
 msgstr "Sammendrag av brannmurkonfigurasjon"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:141
+#: src/modules/SuSEFirewallCMDLine.rb:142
 msgid "Enables firewall"
 msgstr "Aktiverer brannmur"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:147
+#: src/modules/SuSEFirewallCMDLine.rb:148
 msgid "Disables firewall"
 msgstr "Deaktiverer brannmur"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:154
+#: src/modules/SuSEFirewallCMDLine.rb:155
 msgid "Show current settings"
 msgstr "Vis gjeldende innstillinger"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:158
+#: src/modules/SuSEFirewallCMDLine.rb:159
 msgid "Start firewall in the boot process"
 msgstr "Aktiver brannmur ved oppstart av maskinen"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:164
+#: src/modules/SuSEFirewallCMDLine.rb:165
 msgid "Start firewall manually"
 msgstr "Aktiver brannmur manuelt"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:170
+#: src/modules/SuSEFirewallCMDLine.rb:171
 msgid "List configured entries"
 msgstr "Vis konfigurerte oppføringer"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:177
+#: src/modules/SuSEFirewallCMDLine.rb:178
 msgid "Zone short name"
 msgstr "Kort sonenavn"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:181
+#: src/modules/SuSEFirewallCMDLine.rb:182
 msgid "Add a new record"
 msgstr "Legg til en ny oppføring"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:185
+#: src/modules/SuSEFirewallCMDLine.rb:186
 msgid "Remove a record"
 msgstr "Fjern en oppføring"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:190
+#: src/modules/SuSEFirewallCMDLine.rb:191
 msgid "Network interface configuration name"
 msgstr "Navn på konfigurasjon for nettverksgrensesnitt"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:197
+#: src/modules/SuSEFirewallCMDLine.rb:198
 msgid "Logging accepted packets (all|crit|none)"
 msgstr "Logging av godkjente pakker (all|crit|none)"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:204
+#: src/modules/SuSEFirewallCMDLine.rb:205
 msgid "Logging not accepted packets (all|crit|none)"
 msgstr "Logging av ikke godkjente pakker (all|crit|none)"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:211
+#: src/modules/SuSEFirewallCMDLine.rb:212
 msgid "Logging broadcast packets (yes|no)"
 msgstr "Logging av kringkastede pakker (ja|nei)"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:217
+#: src/modules/SuSEFirewallCMDLine.rb:218
 msgid "Set value"
 msgstr "Spesifiser verdi"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:222
+#: src/modules/SuSEFirewallCMDLine.rb:223
 msgid "Port name or number; comma-separate multiple ports"
 msgstr "Portnavn eller -nummer; flere porter adskilt av komma"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:229
+#: src/modules/SuSEFirewallCMDLine.rb:230
 msgid "Known firewall service; comma-separate multiple services"
 msgstr "Kjente brannmurtjenester; flere tjenester adskilt av komma"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:236
+#: src/modules/SuSEFirewallCMDLine.rb:237
 msgid "TCP port name or number; comma-separate multiple ports"
 msgstr "TCP-portnavn eller -nummer; flere porter adskilt av komma"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:243
+#: src/modules/SuSEFirewallCMDLine.rb:244
 msgid "UDP port name or number; comma-separate multiple ports"
 msgstr "UDP-portnavn eller -nummer; flere porter adskilt av komma"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:250
+#: src/modules/SuSEFirewallCMDLine.rb:251
 msgid "RPC port name; comma-separate multiple ports"
 msgstr "RPC-portnavn; flere porter adskilt av komma"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:257
+#: src/modules/SuSEFirewallCMDLine.rb:258
 msgid "IP protocol name; comma-separate multiple protocols"
 msgstr "IP-protokollnavn; flere protokoller adskilt av komma"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:264
+#: src/modules/SuSEFirewallCMDLine.rb:265
 msgid "Set zone protection (yes|no)"
 msgstr "Spesifiser sonebeskyttelse (ja|nei)"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:270
+#: src/modules/SuSEFirewallCMDLine.rb:271
 msgid "Detailed information"
 msgstr "Detaljert informasjon"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:274
+#: src/modules/SuSEFirewallCMDLine.rb:275
 msgid "Enable option"
 msgstr "Aktiver alternativ"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:278
+#: src/modules/SuSEFirewallCMDLine.rb:279
 msgid "Disable option"
 msgstr "Deaktiver alternativ"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:283
+#: src/modules/SuSEFirewallCMDLine.rb:284
 msgid "Source network, such as 0/0 or 145.12.35.0/255.255.255.0"
 msgstr "Kildenettverk, f.eks. 0/0 eller 145.12.35.0/255.255.255.0"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:290
+#: src/modules/SuSEFirewallCMDLine.rb:291
 msgid "Protocol (tcp|udp)"
 msgstr "Protokoll (tcp|udp)"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:295
+#: src/modules/SuSEFirewallCMDLine.rb:296
 msgid "Requested external IP (optional)"
 msgstr "Forespurt ekstern IP (valgfritt)"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:302
+#: src/modules/SuSEFirewallCMDLine.rb:303
 msgid "Requested port name or number"
 msgstr "Forespurt portnavn eller -nummer"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:309
+#: src/modules/SuSEFirewallCMDLine.rb:310
 msgid "Redirect to internal IP"
 msgstr "Omdiriger til intern IP"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:316
+#: src/modules/SuSEFirewallCMDLine.rb:317
 msgid "Redirect to port on internal IP (optional)"
 msgstr "Omdiriger til port på intern IP (valgfritt)"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:323
+#: src/modules/SuSEFirewallCMDLine.rb:324
 msgid "Record number"
 msgstr "Oppføringsnummer"
 
 #. TRANSLATORS: CommandLine help
-#: src/modules/SuSEFirewallCMDLine.rb:327
+#: src/modules/SuSEFirewallCMDLine.rb:328
 msgid "Use port names instead of port numbers"
 msgstr "Bruk portnavn i stedet for portnummer"
 
 #. TRANSLATORS: CommandLine error, %1 is a firewall zone shortcut
-#: src/modules/SuSEFirewallCMDLine.rb:401
+#. TRANSLATORS: CommandLine error, %1 is zone
+#: src/modules/SuSEFirewallCMDLine.rb:405
+#: src/modules/SuSEFirewallCMDLine.rb:1556
 msgid "Unknown zone %1."
 msgstr "Ukjent sone %1."
 
@@ -1638,180 +1650,180 @@
 #. TRANSLATORS: CommandLine error, %1 is needed parameter name
 #. TRANSLATORS: CommandLine error, %1 is needed parameter name
 #. TRANSLATORS: CommandLine error, %1 is needed parameter name
-#: src/modules/SuSEFirewallCMDLine.rb:414
-#: src/modules/SuSEFirewallCMDLine.rb:616
-#: src/modules/SuSEFirewallCMDLine.rb:623
-#: src/modules/SuSEFirewallCMDLine.rb:655
-#: src/modules/SuSEFirewallCMDLine.rb:662
-#: src/modules/SuSEFirewallCMDLine.rb:915
-#: src/modules/SuSEFirewallCMDLine.rb:927
-#: src/modules/SuSEFirewallCMDLine.rb:1442
-#: src/modules/SuSEFirewallCMDLine.rb:1517
+#: src/modules/SuSEFirewallCMDLine.rb:418
+#: src/modules/SuSEFirewallCMDLine.rb:629
+#: src/modules/SuSEFirewallCMDLine.rb:636
+#: src/modules/SuSEFirewallCMDLine.rb:668
+#: src/modules/SuSEFirewallCMDLine.rb:675
+#: src/modules/SuSEFirewallCMDLine.rb:928
+#: src/modules/SuSEFirewallCMDLine.rb:940
+#: src/modules/SuSEFirewallCMDLine.rb:1455
+#: src/modules/SuSEFirewallCMDLine.rb:1530
 msgid "Parameter %1 must be set."
 msgstr "Parameteren %1 må spesifiseres."
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:425
+#: src/modules/SuSEFirewallCMDLine.rb:429
 msgid "Listing Known Firewall Zones:"
 msgstr "Viser kjente brannmursoner:"
 
 #. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:440
+#: src/modules/SuSEFirewallCMDLine.rb:444
 msgid "Shortcut"
 msgstr "Snarvei"
 
 #. TRANSLATORS: CommandLine table header item
 #. TRANSLATORS: CommandLine table header item
 #. TRANSLATORS: CommandLine header item
-#: src/modules/SuSEFirewallCMDLine.rb:442
-#: src/modules/SuSEFirewallCMDLine.rb:775
-#: src/modules/SuSEFirewallCMDLine.rb:895
+#: src/modules/SuSEFirewallCMDLine.rb:446
+#: src/modules/SuSEFirewallCMDLine.rb:788
+#: src/modules/SuSEFirewallCMDLine.rb:908
 msgid "Zone Name"
 msgstr "Sonenavn"
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:487
+#: src/modules/SuSEFirewallCMDLine.rb:491
 msgid "Summary:"
 msgstr "Sammendrag:"
 
 #. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:502
+#: src/modules/SuSEFirewallCMDLine.rb:516
 msgid "Only one parameter is allowed."
 msgstr "Kun én parameter er tillatt."
 
 #. TRANSLATORS: CommandLine header
 #. TRANSLATORS: CommandLine header
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:506
-#: src/modules/SuSEFirewallCMDLine.rb:515
-#: src/modules/SuSEFirewallCMDLine.rb:524
+#: src/modules/SuSEFirewallCMDLine.rb:520
+#: src/modules/SuSEFirewallCMDLine.rb:529
+#: src/modules/SuSEFirewallCMDLine.rb:538
 msgid "Start-Up:"
 msgstr "Oppstart:"
 
 #. TRANSLATORS: CommandLine progress information
-#: src/modules/SuSEFirewallCMDLine.rb:509
+#: src/modules/SuSEFirewallCMDLine.rb:523
 msgid "Enabling firewall in the boot process..."
 msgstr "Aktiverer brannmur ved oppstart av maskinen..."
 
 #. TRANSLATORS: CommandLine progress information
-#: src/modules/SuSEFirewallCMDLine.rb:518
+#: src/modules/SuSEFirewallCMDLine.rb:532
 msgid "Removing firewall from the boot process..."
 msgstr "Brannmur blir ikke aktivert under oppstart av maskinen..."
 
 #. TRANSLATORS: CommandLine informative text
-#: src/modules/SuSEFirewallCMDLine.rb:528
+#: src/modules/SuSEFirewallCMDLine.rb:542
 msgid "Firewall is enabled in the boot process"
 msgstr "Brannmurport aktiveres ved oppstart av maskinen"
 
 #. TRANSLATORS: CommandLine informative text
-#: src/modules/SuSEFirewallCMDLine.rb:531
+#: src/modules/SuSEFirewallCMDLine.rb:545
 msgid "Firewall needs manual starting"
 msgstr "Brannmuren må aktiveres manuelt"
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:564
+#: src/modules/SuSEFirewallCMDLine.rb:578
 msgid "Network Interfaces in Firewall Zones:"
 msgstr "Nettverksgrensesnitt i brannmursoner:"
 
 #. TRANSLATORS: CommandLine table item (unknown/special string/interface)
-#: src/modules/SuSEFirewallCMDLine.rb:583
+#: src/modules/SuSEFirewallCMDLine.rb:596
 msgid "Special firewall string"
 msgstr "Spesiell brannmurkommando"
 
 #. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:603
+#: src/modules/SuSEFirewallCMDLine.rb:616
 msgid "Interface"
 msgstr "Grensesnitt"
 
 #. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:605
+#: src/modules/SuSEFirewallCMDLine.rb:618
 msgid "Device Name"
 msgstr "Enhetsnavn"
 
 #. TRANSLATORS: CommandLine progress information, %1 is the special string, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:632
+#: src/modules/SuSEFirewallCMDLine.rb:645
 msgid "Adding special string %1 into zone %2..."
 msgstr "Legger til spesialkommandoen %1 for sonen %2..."
 
 #. TRANSLATORS: CommandLine progress information, %1 is the network interface name, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:642
+#: src/modules/SuSEFirewallCMDLine.rb:655
 msgid "Adding interface %1 into zone %2..."
 msgstr "Legger til grensesnittet %1 for sonen %2..."
 
 #. TRANSLATORS: CommandLine progress information, %1 is the special string, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:671
+#: src/modules/SuSEFirewallCMDLine.rb:684
 msgid "Removing special string %1 from zone %2..."
 msgstr "Fjerner spesialkommandoen %1 fra sonen %2..."
 
 #. TRANSLATORS: CommandLine progress information, %1 is the network interface name, %2 is the zone name
-#: src/modules/SuSEFirewallCMDLine.rb:681
+#: src/modules/SuSEFirewallCMDLine.rb:694
 msgid "Removing interface %1 from zone %2..."
 msgstr "Fjerner grensesnittet %1 fra sonen %2..."
 
 #. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:702
+#: src/modules/SuSEFirewallCMDLine.rb:715
 msgid "Log all"
 msgstr "Logg alt"
 
 #. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:704
+#: src/modules/SuSEFirewallCMDLine.rb:717
 msgid "Log only critical"
 msgstr "Logg bare kritiske"
 
 #. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:706
+#: src/modules/SuSEFirewallCMDLine.rb:719
 msgid "Do not log any"
 msgstr "Ikke logg noen"
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:716
+#: src/modules/SuSEFirewallCMDLine.rb:729
 msgid "Global Logging Settings:"
 msgstr "Globale innstillinger for logging:"
 
 #. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:724
+#: src/modules/SuSEFirewallCMDLine.rb:737
 msgid "Rule Type"
 msgstr "Regeltype"
 
 #. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:726
+#: src/modules/SuSEFirewallCMDLine.rb:739
 msgid "Value"
 msgstr "Verdi"
 
 #. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:732
+#: src/modules/SuSEFirewallCMDLine.rb:745
 msgid "Accepted"
 msgstr "Godkjent"
 
 #. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:738
+#: src/modules/SuSEFirewallCMDLine.rb:751
 msgid "Not accepted"
 msgstr "Ikke godkjent"
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:750
+#: src/modules/SuSEFirewallCMDLine.rb:763
 msgid "Logging Broadcast Packets:"
 msgstr "Logging av kringkastede pakker:"
 
 #. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:763
+#: src/modules/SuSEFirewallCMDLine.rb:776
 msgid "Logging enabled"
 msgstr "Logging aktivert"
 
 #. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:765
+#: src/modules/SuSEFirewallCMDLine.rb:778
 msgid "Logging disabled"
 msgstr "Logging deaktivert"
 
 #. TRANSLATORS: CommandLine table header item
 #. TRANSLATORS: CommandLine header item
-#: src/modules/SuSEFirewallCMDLine.rb:773
-#: src/modules/SuSEFirewallCMDLine.rb:893
+#: src/modules/SuSEFirewallCMDLine.rb:786
+#: src/modules/SuSEFirewallCMDLine.rb:906
 msgid "Short"
 msgstr "Kort"
 
 #. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:777
+#: src/modules/SuSEFirewallCMDLine.rb:790
 msgid "Logging Status"
 msgstr "Status for logging"
 
@@ -1820,168 +1832,181 @@
 #. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
 #. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
 #. TRANSLATORS: CommandLine error message, %1 is an option value, %2 is an option name
-#: src/modules/SuSEFirewallCMDLine.rb:794
-#: src/modules/SuSEFirewallCMDLine.rb:809
-#: src/modules/SuSEFirewallCMDLine.rb:838
-#: src/modules/SuSEFirewallCMDLine.rb:1262
-#: src/modules/SuSEFirewallCMDLine.rb:1468
+#: src/modules/SuSEFirewallCMDLine.rb:807
+#: src/modules/SuSEFirewallCMDLine.rb:822
+#: src/modules/SuSEFirewallCMDLine.rb:851
+#: src/modules/SuSEFirewallCMDLine.rb:1275
+#: src/modules/SuSEFirewallCMDLine.rb:1481
 msgid "Value %1 is not allowed for option %2."
 msgstr "Verdien %1 er ikke tillatt for alternativet %2."
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:878
+#: src/modules/SuSEFirewallCMDLine.rb:891
 msgid "Allowed Broadcast Ports:"
 msgstr "Tillatte kringkastingsporter:"
 
 #. TRANSLATORS: CommandLine header item
 #. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:897
-#: src/modules/SuSEFirewallCMDLine.rb:1133
+#: src/modules/SuSEFirewallCMDLine.rb:910
+#: src/modules/SuSEFirewallCMDLine.rb:1146
 msgid "Port"
 msgstr "Port"
 
 #. TRANSLATORS: CommandLine error message
 #. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:908
-#: src/modules/SuSEFirewallCMDLine.rb:1304
+#: src/modules/SuSEFirewallCMDLine.rb:921
+#: src/modules/SuSEFirewallCMDLine.rb:1317
 msgid "Only one action command is allowed here."
 msgstr "Bare én handlingskommando er tillatt her."
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:974
+#: src/modules/SuSEFirewallCMDLine.rb:987
 msgid "Defined Firewall Services:"
 msgstr "Spesifiserte brannmurtjenester:"
 
 #. TRANSLATORS: CommandLine table header item
 #. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:985
-#: src/modules/SuSEFirewallCMDLine.rb:1403
+#: src/modules/SuSEFirewallCMDLine.rb:998
+#: src/modules/SuSEFirewallCMDLine.rb:1416
 msgid "ID"
 msgstr "ID"
 
 #. TRANSLATORS: CommandLine table header item
 #. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:987
-#: src/modules/SuSEFirewallCMDLine.rb:1088
+#: src/modules/SuSEFirewallCMDLine.rb:1000
+#: src/modules/SuSEFirewallCMDLine.rb:1101
 msgid "Service Name"
 msgstr "Navn på tjeneste"
 
 #. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1009
+#: src/modules/SuSEFirewallCMDLine.rb:1022
 msgid "TCP port"
 msgstr "TCP-port"
 
 #. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1011
+#: src/modules/SuSEFirewallCMDLine.rb:1024
 msgid "UDP port"
 msgstr "UDP-port"
 
 #. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1013
+#: src/modules/SuSEFirewallCMDLine.rb:1026
 msgid "RPC port"
 msgstr "RPC-port"
 
 #. TRANSLATORS: CommandLine table item
-#: src/modules/SuSEFirewallCMDLine.rb:1015
+#: src/modules/SuSEFirewallCMDLine.rb:1028
 msgid "IP protocol"
 msgstr "IP-protokoll"
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1021
+#: src/modules/SuSEFirewallCMDLine.rb:1034
 msgid "Allowed Services in Zones:"
 msgstr "Tillatte tjenester i soner:"
 
 #. TRANSLATORS: CommandLine table item (all firewall services are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1034
+#: src/modules/SuSEFirewallCMDLine.rb:1047
 msgid "All services"
 msgstr "Alle tjenester"
 
 #. TRANSLATORS: CommandLine table item (this zone is not protected at all)
 #. TRANSLATORS: CommandLine table item (this zone is not protected at all)
 #. TRANSLATORS: CommandLine table item (this zone is not protected at all)
-#: src/modules/SuSEFirewallCMDLine.rb:1037
-#: src/modules/SuSEFirewallCMDLine.rb:1114
-#: src/modules/SuSEFirewallCMDLine.rb:1163
+#: src/modules/SuSEFirewallCMDLine.rb:1050
+#: src/modules/SuSEFirewallCMDLine.rb:1127
+#: src/modules/SuSEFirewallCMDLine.rb:1176
 msgid "Entire zone unprotected"
 msgstr "Hele sonen ubeskyttet"
 
 #. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:1086
+#: src/modules/SuSEFirewallCMDLine.rb:1099
 msgid "Service ID"
 msgstr "Tjeneste-ID"
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1098
+#: src/modules/SuSEFirewallCMDLine.rb:1111
 msgid "Additional Allowed Ports:"
 msgstr "Flere tillatte porter:"
 
 #. TRANSLATORS: CommandLine table item (all ports are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1111
+#: src/modules/SuSEFirewallCMDLine.rb:1124
 msgid "All ports"
 msgstr "Alle porter"
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1145
+#: src/modules/SuSEFirewallCMDLine.rb:1158
 msgid "Allowed Additional IP Protocols in Zones:"
 msgstr "Flere tillatte IP-protokoller i soner:"
 
 #. TRANSLATORS: CommandLine table item (all protocols are allowed in this zone)
-#: src/modules/SuSEFirewallCMDLine.rb:1160
+#: src/modules/SuSEFirewallCMDLine.rb:1173
 msgid "All IP protocols"
 msgstr "Alle IP-protokoller"
 
 #. TRANSLATORS: CommandLine table header item
-#: src/modules/SuSEFirewallCMDLine.rb:1178
+#: src/modules/SuSEFirewallCMDLine.rb:1191
 msgid "IP Protocol"
 msgstr "IP-protokoll"
 
 #. TRANSLATORS: CommandLine error message, %1 is a service id
-#: src/modules/SuSEFirewallCMDLine.rb:1199
+#: src/modules/SuSEFirewallCMDLine.rb:1212
 msgid "Unknown service %1."
 msgstr "Ukjent tjeneste %1."
 
 #. TRANSLATORS: CommandLine error message
-#: src/modules/SuSEFirewallCMDLine.rb:1272
+#: src/modules/SuSEFirewallCMDLine.rb:1285
 msgid "Protection can only be set for internal zones."
 msgstr "Beskyttelse kan bare spesifiseres for interne soner."
 
 #. TRANSLATORS: CommandLine error message, %1 is a list of possible entries (without translation)
-#: src/modules/SuSEFirewallCMDLine.rb:1333
+#: src/modules/SuSEFirewallCMDLine.rb:1346
 msgid "At least one of %1 must be set."
 msgstr "Minst én av %1 må spesifiseres."
 
 #. TRANSLATORS: CommandLine error message, %1 is a list of possible action commands
-#: src/modules/SuSEFirewallCMDLine.rb:1348
+#: src/modules/SuSEFirewallCMDLine.rb:1361
 msgid "At least one action command from %1 must be set."
 msgstr "Minst én handlingskommando fra %1 må spesifiseres."
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1365
+#: src/modules/SuSEFirewallCMDLine.rb:1378
 msgid "Redirect Requests to Masqueraded IP:"
 msgstr "Omdiriger forespørsler til maskert IP:"
 
 #. TRANSLATORS: CommandLine error message, %1 is a port name
-#: src/modules/SuSEFirewallCMDLine.rb:1491
+#: src/modules/SuSEFirewallCMDLine.rb:1504
 msgid "Unknown port name %1."
 msgstr "Ukjent portnavn %1."
 
 #. TRANSLATORS: CommandLine header
-#: src/modules/SuSEFirewallCMDLine.rb:1541
+#: src/modules/SuSEFirewallCMDLine.rb:1570
 msgid "Masquerading Settings:"
 msgstr "Maskeringsinnstillinger:"
 
+#. TRANSLATORS: CommandLine informative text, either "everywhere" or
+#. "in the %1 zone" where %1 is zone name.
+#: src/modules/SuSEFirewallCMDLine.rb:1576
+msgid "everywhere"
+msgstr ""
+
+#: src/modules/SuSEFirewallCMDLine.rb:1577
+msgid "in the %1 zone"
+msgstr ""
+
 #. TRANSLATORS: CommandLine informative text, %1 is "enabled" or "disabled"
-#: src/modules/SuSEFirewallCMDLine.rb:1547
-msgid "Masquerading is %1"
+#. %2 is previously mentioned zone_msg
+#: src/modules/SuSEFirewallCMDLine.rb:1583
+#, fuzzy
+#| msgid "Masquerading is %1"
+msgid "Masquerading is %1 %2"
 msgstr "Maskering er %1"
 
 #. TRANSLATORS: CommandLine masquerade status
-#: src/modules/SuSEFirewallCMDLine.rb:1550
+#: src/modules/SuSEFirewallCMDLine.rb:1586
 msgid "enabled"
 msgstr "aktivert"
 
 #. TRANSLATORS: CommandLine masquerade status
-#: src/modules/SuSEFirewallCMDLine.rb:1552
+#: src/modules/SuSEFirewallCMDLine.rb:1588
 msgid "disabled"
 msgstr "deaktivert"
 

Modified: trunk/yast/nb/po/firstboot.nb.po
===================================================================
--- trunk/yast/nb/po/firstboot.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/firstboot.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: firstboot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2009-10-01 12:23+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -122,13 +122,13 @@
 msgstr "Betegnelse"
 
 #: src/clients/firstboot_config.rb:68
+msgid "Status"
+msgstr "Status"
+
+#: src/clients/firstboot_config.rb:68
 msgid "Module Name"
 msgstr "Modulnavn"
 
-#: src/clients/firstboot_config.rb:68
-msgid "Status"
-msgstr "Status"
-
 #. translators: dialog text
 #: src/clients/firstboot_desktop.rb:90
 msgid ""
@@ -300,7 +300,7 @@
 "</p>\n"
 
 #. error message
-#: src/clients/firstboot_language_keyboard.rb:271
+#: src/clients/firstboot_language_keyboard.rb:265
 msgid "There is not enough space to install all additional packages."
 msgstr "Det er ikke nok plass til å installere alle tilleggspakkene."
 

Modified: trunk/yast/nb/po/fonts.nb.po
===================================================================
--- trunk/yast/nb/po/fonts.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/fonts.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2002-06-17 14:33+0200\n"
 "Last-Translator: www.linuxbutikken.no \n"
 "Language-Team: Norwegian \n"
@@ -20,63 +20,63 @@
 #. in case of changing profiles, please reflect
 #. edits in test/data/sysconfig.fonts-config.*
 #. otherwise testsuite will fail
-#: src/lib/fonts/fonts-config-state.rb:58
+#: src/lib/fonts/fonts-config-state.rb:59
 #, fuzzy
 #| msgid "Bitmap Editors"
 msgid "Bitmap Fonts"
 msgstr "Bitmap-redigering"
 
-#: src/lib/fonts/fonts-config-state.rb:103
+#: src/lib/fonts/fonts-config-state.rb:104
 msgid "Unlike 'outline fonts' (fonts described mathematically via curves; chosen in the rest of profiles), 'bitmap fonts' represents group of fonts, which contain bitmap for each glyph and size. Thus, only several sizes exist for each font. They are very fast to render, because there's no need to compute the bitmap and are considered more readable especially on small sizes (even, some outline fonts contains so called 'embedded bitmaps', bitmap versions of itself, for small sizes). Bitmap fonts are rendered black and white, not smoothed."
 msgstr ""
 
-#: src/lib/fonts/fonts-config-state.rb:106
+#: src/lib/fonts/fonts-config-state.rb:107
 msgid "Black and White Rendering"
 msgstr ""
 
-#: src/lib/fonts/fonts-config-state.rb:123
+#: src/lib/fonts/fonts-config-state.rb:124
 msgid "Fonts rendered without antialiasing (grayscale smoothing), black and white. In contrast with smoothed fonts, they are much more readable without any drawback of smoothing (fuzzy or uneven stems etc.). In connection with good hinted fonts (e. g. Liberation 1 fonts), this setting can give bitmap quality fonts while maintaining scalability."
 msgstr ""
 
-#: src/lib/fonts/fonts-config-state.rb:126
+#: src/lib/fonts/fonts-config-state.rb:127
 msgid "Black and White Rendering for Monospaced Fonts"
 msgstr ""
 
-#: src/lib/fonts/fonts-config-state.rb:143
+#: src/lib/fonts/fonts-config-state.rb:144
 msgid "Monospaced fonts rendered not smoothed, other fonts (sans-serif, sans and unspecified) will use default setting. Default family preference list is used."
 msgstr ""
 
-#: src/lib/fonts/fonts-config-state.rb:146
+#: src/lib/fonts/fonts-config-state.rb:147
 msgid "Default"
 msgstr "Standard"
 
-#: src/lib/fonts/fonts-config-state.rb:163
+#: src/lib/fonts/fonts-config-state.rb:164
 msgid "Fonts are smoothed with antialiasing. Unlike black and white rendered fonts, this setting can produce 'beautiful' fonts sometimes to the detriment of readability. TrueType fonts, which are known to have good hinting instructions are rendered with bytecode interpreter, otherwise FreeType autohinter is used on the 'hintslight' hinting level. Using font native hinting instructions produces glyphs displayed with thiner stems. Default family preference list is used (nowdays TrueType fonts with good instructions are prefered)."
 msgstr ""
 
-#: src/lib/fonts/fonts-config-state.rb:166
+#: src/lib/fonts/fonts-config-state.rb:167
 #, fuzzy
 #| msgid "Fonts"
 msgid "CFF Fonts"
 msgstr "Skrifter"
 
-#: src/lib/fonts/fonts-config-state.rb:206
+#: src/lib/fonts/fonts-config-state.rb:207
 msgid "Given Adobe's contribution to FreeType library, CFF fonts can be considered good compromise between readability and smoothness of rendered glyphs."
 msgstr ""
 
-#: src/lib/fonts/fonts-config-state.rb:209
+#: src/lib/fonts/fonts-config-state.rb:210
 msgid "Exclusive Autohinter Rendering"
 msgstr ""
 
-#: src/lib/fonts/fonts-config-state.rb:226
+#: src/lib/fonts/fonts-config-state.rb:227
 msgid "Unlike in default profile, even for good hinted fonts, FreeType's autohinter is used (on the 'hintslight' level). That leads to thicker, but sometimes fuzzier (and therefore less readable), glyphs. Default family preference list is used."
 msgstr ""
 
-#: src/lib/fonts/fonts-config-state.rb:229 src/lib/fonts/fonts-dialog.rb:818
+#: src/lib/fonts/fonts-config-state.rb:230 src/lib/fonts/fonts-dialog.rb:818
 msgid "Subpixel Rendering"
 msgstr ""
 
-#: src/lib/fonts/fonts-config-state.rb:254
+#: src/lib/fonts/fonts-config-state.rb:255
 msgid "Use subpixel rendering capability of LCD monitor. Requires subpixel rendering enabled FreeType library."
 msgstr ""
 

Modified: trunk/yast/nb/po/geo-cluster.nb.po
===================================================================
--- trunk/yast/nb/po/geo-cluster.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/geo-cluster.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2014-05-19 09:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -60,10 +60,8 @@
 #.
 #. $Id: wizards.ycp 27914 2006-02-13 14:32:08Z locilka $
 #. Initialization dialog caption
-#: src/include/geo-cluster/complex.rb:83
-#: src/include/geo-cluster/dialogs.rb:465
-#: src/include/geo-cluster/dialogs.rb:814
-#: src/include/geo-cluster/wizards.rb:46
+#: src/include/geo-cluster/complex.rb:83 src/include/geo-cluster/dialogs.rb:480
+#: src/include/geo-cluster/dialogs.rb:829 src/include/geo-cluster/wizards.rb:46
 #: src/include/geo-cluster/wizards.rb:141
 #, fuzzy
 #| msgid "Printer Configurations"
@@ -121,17 +119,17 @@
 msgstr ""
 
 #: src/include/geo-cluster/dialogs.rb:74 src/include/geo-cluster/dialogs.rb:85
-#: src/include/geo-cluster/dialogs.rb:804
+#: src/include/geo-cluster/dialogs.rb:819
 msgid "Add"
 msgstr "Legg til"
 
 #: src/include/geo-cluster/dialogs.rb:75 src/include/geo-cluster/dialogs.rb:86
-#: src/include/geo-cluster/dialogs.rb:805
+#: src/include/geo-cluster/dialogs.rb:820
 msgid "Edit"
 msgstr "Rediger"
 
 #: src/include/geo-cluster/dialogs.rb:76 src/include/geo-cluster/dialogs.rb:87
-#: src/include/geo-cluster/dialogs.rb:806
+#: src/include/geo-cluster/dialogs.rb:821
 msgid "Delete"
 msgstr "Slett"
 
@@ -139,19 +137,18 @@
 msgid "site"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:93
-#: src/include/geo-cluster/dialogs.rb:235
+#: src/include/geo-cluster/dialogs.rb:93 src/include/geo-cluster/dialogs.rb:240
 msgid "ticket"
 msgstr ""
 
 #: src/include/geo-cluster/dialogs.rb:106
 #, fuzzy
 #| msgid "Authentication"
-msgid "Authentification"
+msgid "Authentication"
 msgstr "Autentisering"
 
 #: src/include/geo-cluster/dialogs.rb:108
-#: src/include/geo-cluster/dialogs.rb:156
+#: src/include/geo-cluster/dialogs.rb:161
 #, fuzzy
 #| msgid "Cancel"
 msgid "Ca&ncel"
@@ -159,9 +156,9 @@
 
 #. return `cancel or a string
 #: src/include/geo-cluster/dialogs.rb:109
-#: src/include/geo-cluster/dialogs.rb:157
-#: src/include/geo-cluster/dialogs.rb:177
-#: src/include/geo-cluster/dialogs.rb:254
+#: src/include/geo-cluster/dialogs.rb:162
+#: src/include/geo-cluster/dialogs.rb:182
+#: src/include/geo-cluster/dialogs.rb:259
 msgid "OK"
 msgstr "OK"
 
@@ -174,195 +171,198 @@
 #: src/include/geo-cluster/dialogs.rb:128
 #, fuzzy
 #| msgid "Authentication Key"
-msgid "Authentification file"
+msgid "Authentication file"
 msgstr "Autentiseringsnøkkel"
 
 #: src/include/geo-cluster/dialogs.rb:132
-msgid "A relative path will be saved in /etc/booth, or using absolute path directly."
+msgid "The file will be written to /etc/booth."
 msgstr ""
 
 #: src/include/geo-cluster/dialogs.rb:137
-msgid "For a newly created geo cluster, push the button below to generate /etc/booth/<key>."
+msgid "To write it to a different directory, enter an absolute path."
 msgstr ""
 
 #: src/include/geo-cluster/dialogs.rb:142
-msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other node manually."
+msgid "For a newly created geo cluster, push the button below to generate /etc/booth/<key>."
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:146
+#: src/include/geo-cluster/dialogs.rb:147
+msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other nodes manually."
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:151
 #, fuzzy
 #| msgid "Authentication Key"
-msgid "Generate Authentification Key File"
+msgid "Generate Authentication Key File"
 msgstr "Autentiseringsnøkkel"
 
-#: src/include/geo-cluster/dialogs.rb:154
+#: src/include/geo-cluster/dialogs.rb:159
 #, fuzzy
 #| msgid "&Basics"
 msgid "Basic"
 msgstr "&Grunnleggende"
 
-#: src/include/geo-cluster/dialogs.rb:178
-#: src/include/geo-cluster/dialogs.rb:255
+#: src/include/geo-cluster/dialogs.rb:183
+#: src/include/geo-cluster/dialogs.rb:260
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/include/geo-cluster/dialogs.rb:192
+#: src/include/geo-cluster/dialogs.rb:197
 #, fuzzy
 #| msgid "Please enter a password"
 msgid "Please enter a valid ip address"
 msgstr "Angi et passord"
 
-#: src/include/geo-cluster/dialogs.rb:233
+#: src/include/geo-cluster/dialogs.rb:238
 msgid "Enter ticket and timeout"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:239
+#: src/include/geo-cluster/dialogs.rb:244
 msgid "timeout"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:241
+#: src/include/geo-cluster/dialogs.rb:246
 #, fuzzy
 #| msgid "No entries."
 msgid "retries"
 msgstr "Ingen oppføringer."
 
-#: src/include/geo-cluster/dialogs.rb:243
+#: src/include/geo-cluster/dialogs.rb:248
 #, fuzzy
 #| msgid "Height"
 msgid "weights"
 msgstr "Høyde"
 
-#: src/include/geo-cluster/dialogs.rb:245
+#: src/include/geo-cluster/dialogs.rb:250
 #, fuzzy
 #| msgid "Expired"
 msgid "expire"
 msgstr "Utløpt"
 
-#: src/include/geo-cluster/dialogs.rb:247
+#: src/include/geo-cluster/dialogs.rb:252
 #, fuzzy
 #| msgid "Required patterns"
 msgid "acquire-after"
 msgstr "Nødvendige mønstre"
 
-#: src/include/geo-cluster/dialogs.rb:249
+#: src/include/geo-cluster/dialogs.rb:254
 msgid "before-acquire-handler"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:286
+#: src/include/geo-cluster/dialogs.rb:291
 #, fuzzy
 #| msgid "Action is invalid."
 msgid "timeout is invalid"
 msgstr "Handlingen er ugyldig."
 
-#: src/include/geo-cluster/dialogs.rb:288
+#: src/include/geo-cluster/dialogs.rb:293
 #, fuzzy
 #| msgid "' is not valid."
 msgid "expire is invalid"
 msgstr "' er ikke gyldig."
 
 #
-#: src/include/geo-cluster/dialogs.rb:290
+#: src/include/geo-cluster/dialogs.rb:295
 #, fuzzy
 #| msgid "URL entered is not valid"
 msgid "acquireafter is invalid"
 msgstr "Den angitte nettadressen er ikke gyldig"
 
 #
-#: src/include/geo-cluster/dialogs.rb:292
+#: src/include/geo-cluster/dialogs.rb:297
 #, fuzzy
 #| msgid "URL entered is not valid"
 msgid "retries is invalid"
 msgstr "Den angitte nettadressen er ikke gyldig"
 
-#: src/include/geo-cluster/dialogs.rb:294
+#: src/include/geo-cluster/dialogs.rb:299
 msgid "retries values lower than 3 is illegal"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:296
+#: src/include/geo-cluster/dialogs.rb:301
 #, fuzzy
 #| msgid "' is not valid."
 msgid "weights is invalid"
 msgstr "' er ikke gyldig."
 
-#: src/include/geo-cluster/dialogs.rb:298
+#: src/include/geo-cluster/dialogs.rb:303
 #, fuzzy
 #| msgid "Port field cannot be empty"
 msgid "ticket can not be empty"
 msgstr "Port-feltet kan ikke være tomt"
 
 #. fill confs with global_files
-#: src/include/geo-cluster/dialogs.rb:407
-#: src/include/geo-cluster/wizards.rb:48
+#: src/include/geo-cluster/dialogs.rb:422 src/include/geo-cluster/wizards.rb:48
 msgid "Firewall Configuration"
 msgstr "Brannmurkonfigurasjon"
 
 #. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
 #. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:554
+#: src/include/geo-cluster/dialogs.rb:569
 #, fuzzy
 #| msgid "&Local IP address of your machine"
 msgid "Enter an IP address of your arbitrator"
 msgstr "&Lokal IP-adresse for maskinen"
 
-#: src/include/geo-cluster/dialogs.rb:565
+#: src/include/geo-cluster/dialogs.rb:580
 #, fuzzy
 #| msgid "&Local IP address of your machine"
 msgid "Edit IP address of your arbitrator"
 msgstr "&Lokal IP-adresse for maskinen"
 
-#: src/include/geo-cluster/dialogs.rb:581
+#: src/include/geo-cluster/dialogs.rb:596
 msgid "Enter an IP address of your site"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:592
+#: src/include/geo-cluster/dialogs.rb:607
 msgid "Edit IP address of your site"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:614
+#: src/include/geo-cluster/dialogs.rb:629
 #, fuzzy
 #| msgid "Zone name %1 already exists."
 msgid "Ticket name already exist!"
 msgstr "Sonenavnet %1 finnes allerede."
 
-#. Validation check before switch to authentification
-#. Still fall to :authentification or :ok
-#: src/include/geo-cluster/dialogs.rb:646
+#. Validation check before switch to authentication
+#. Still fall to :authentication or :ok
+#: src/include/geo-cluster/dialogs.rb:661
 #, fuzzy
 #| msgid "Configuration name cannot be empty."
 msgid "Configuration name can not be empty."
 msgstr "Du må angi et navn på oppsettet."
 
-#: src/include/geo-cluster/dialogs.rb:649
+#: src/include/geo-cluster/dialogs.rb:664
 #, fuzzy
 #| msgid "Configuration name cannot be empty."
 msgid "Configuration name can not be duplicated."
 msgstr "Du må angi et navn på oppsettet."
 
 #. "5405d4" will show like "5405"
-#: src/include/geo-cluster/dialogs.rb:657
+#: src/include/geo-cluster/dialogs.rb:672
 #, fuzzy
 #| msgid "Key is invalid."
 msgid "port is invalid!"
 msgstr "Nøkkelen er ugyldig."
 
-#: src/include/geo-cluster/dialogs.rb:663
+#: src/include/geo-cluster/dialogs.rb:678
 msgid "transport have to be filled!"
 msgstr ""
 
 #. Same to UI.QueryWidget(:arbitrator_box, :Value).to_s == ""
-#: src/include/geo-cluster/dialogs.rb:669
+#: src/include/geo-cluster/dialogs.rb:684
 #, fuzzy
 #| msgid "Software to be installed:"
 msgid "arbitrator have to be filled!"
 msgstr "Programvare som skal installeres:"
 
-#: src/include/geo-cluster/dialogs.rb:674
+#: src/include/geo-cluster/dialogs.rb:689
 #, fuzzy
 #| msgid "Software to be installed:"
 msgid "site have to be filled!"
 msgstr "Programvare som skal installeres:"
 
-#: src/include/geo-cluster/dialogs.rb:679
+#: src/include/geo-cluster/dialogs.rb:694
 #, fuzzy
 #| msgid "Software to be installed:"
 msgid "ticket have to be filled!"
@@ -370,20 +370,24 @@
 
 #. Validation check before switch to basic
 #. Still fall to :basic or :ok
-#: src/include/geo-cluster/dialogs.rb:733
+#: src/include/geo-cluster/dialogs.rb:748
 #, fuzzy
 #| msgid "Failed to create the installation RAM disk."
-msgid "Failed to create authentification file "
+msgid "Failed to create authentication file "
 msgstr "Kan ikke opprette RAM-disk for installasjon."
 
-#: src/include/geo-cluster/dialogs.rb:736
+#: src/include/geo-cluster/dialogs.rb:751
 #, fuzzy
-#| msgid "Set the authentication for proxy"
-msgid "Succeed to created authentification file "
-msgstr "Definer autentisering for mellomserver"
+#| msgid "Authentication Key"
+msgid "Authentication file "
+msgstr "Autentiseringsnøkkel"
 
+#: src/include/geo-cluster/dialogs.rb:751
+msgid " created successfully."
+msgstr ""
+
 #. GeoCluster choose configure dialog caption
-#: src/include/geo-cluster/dialogs.rb:795
+#: src/include/geo-cluster/dialogs.rb:810
 #, fuzzy
 #| msgid "Host Configuration Summary:"
 msgid "GeoCluster Configuration Select"
@@ -391,7 +395,7 @@
 
 #. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
 #. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:801
+#: src/include/geo-cluster/dialogs.rb:816
 #, fuzzy
 #| msgid "Read configuration file"
 msgid "Choose configuration file:"
@@ -400,7 +404,7 @@
 #: src/include/geo-cluster/wizards.rb:47
 #, fuzzy
 #| msgid "Autoinstallation - Configuration"
-msgid "Authentification Configuration"
+msgid "Authentication Configuration"
 msgstr "Oppsett av autoinstallasjon"
 
 #. Initialization dialog contents
@@ -557,6 +561,11 @@
 msgstr "Konfigurasjonssammendrag..."
 
 #, fuzzy
+#~| msgid "Set the authentication for proxy"
+#~ msgid "Succeed to created authentification file "
+#~ msgstr "Definer autentisering for mellomserver"
+
+#, fuzzy
 #~| msgid "Software to be installed:"
 #~ msgid "site have to be filled"
 #~ msgstr "Programvare som skal installeres:"

Modified: trunk/yast/nb/po/installation.nb.po
===================================================================
--- trunk/yast/nb/po/installation.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/installation.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: installation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-27 10:52+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2011-01-13 22:52+0100\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -45,7 +45,7 @@
 #. dialog caption
 #. TRANSLATORS: progress message
 #: src/include/installation/inst_inc_all.rb:64
-#: src/lib/installation/clients/inst_installation_options.rb:154
+#: src/lib/installation/clients/inst_installation_options.rb:151
 msgid "Initializing..."
 msgstr "Initialiserer ..."
 
@@ -120,29 +120,29 @@
 "er forskjellige fra illustrasjonene i brukerveiledningen.\n"
 
 #. TRANSLATORS: progress stage, %1 stands for service name
-#: src/include/installation/inst_inc_second.rb:277
+#: src/include/installation/inst_inc_second.rb:275
 msgid "Start service %1"
 msgstr "Start tjeneste %1"
 
 #. TRANSLATORS: progress stage, %1 stands for service name
 #. TRANSLATORS: busy message
-#: src/include/installation/inst_inc_second.rb:282
+#: src/include/installation/inst_inc_second.rb:280
 #: src/lib/installation/clients/inst_restore_settings.rb:47
 msgid "Starting service %1..."
 msgstr "Starter tjenesten %1..."
 
 #. TRANSLATORS: dialog caption
-#: src/include/installation/inst_inc_second.rb:297
+#: src/include/installation/inst_inc_second.rb:295
 msgid "Adjusting Network Settings"
 msgstr "Tilpasser nettverksinnstillinger"
 
 #. TRANSLATORS: dialog help
-#: src/include/installation/inst_inc_second.rb:303
+#: src/include/installation/inst_inc_second.rb:301
 msgid "Network settings are being adjusted."
 msgstr "Nettverksinnstillingene tilpasses."
 
 #. popup question (#x1)
-#: src/include/installation/inst_inc_second.rb:356
+#: src/include/installation/inst_inc_second.rb:354
 msgid ""
 "The previous installation has failed.\n"
 "Would you like it to continue?\n"
@@ -155,7 +155,7 @@
 "Merk: Du må kanskje legge inn noen typer informasjon på nytt."
 
 #. popup question (#x1)
-#: src/include/installation/inst_inc_second.rb:364
+#: src/include/installation/inst_inc_second.rb:362
 msgid ""
 "The previous installation has been aborted.\n"
 "Would you like it to continue?\n"
@@ -170,7 +170,7 @@
 #. popup headline (#x1)
 #. TRANSLATORS: starting the installation process
 #. dialog cotent (progress information)
-#: src/include/installation/inst_inc_second.rb:378
+#: src/include/installation/inst_inc_second.rb:376
 #: src/lib/installation/clients/inst_doit.rb:60
 msgid "Starting Installation..."
 msgstr "Starter installasjon..."
@@ -213,28 +213,28 @@
 #. Text for confirmation popup before the update really starts 3/3
 #. Text for confirmation popup before the update really starts 3/3
 #: src/include/installation/misc.rb:204 src/include/installation/misc.rb:222
-#: src/lib/installation/proposal_runner.rb:136
+#: src/lib/installation/proposal_runner.rb:133
 msgid "<p>Go back and check the settings if you are unsure.</p>"
 msgstr "<p>Hvis du er usikker, kan du gå tilbake og kontrollere innstillingene.</p>"
 
 #. Heading for confirmation popup before the update really starts
 #. Heading for confirmation popup before the update really starts
 #: src/include/installation/misc.rb:210
-#: src/lib/installation/proposal_runner.rb:124
+#: src/lib/installation/proposal_runner.rb:121
 msgid "Confirm Update"
 msgstr "Bekreft oppgradering"
 
 #. Text for confirmation popup before the update really starts 1/3
 #. Text for confirmation popup before the update really starts 1/3
 #: src/include/installation/misc.rb:214
-#: src/lib/installation/proposal_runner.rb:128
+#: src/lib/installation/proposal_runner.rb:125
 msgid "<p>Information required to perform an update is now complete.</p>"
 msgstr "<p>All nødvendig informasjon for å utføre oppgraderingen er nå fullført.</p>"
 
 #. Text for confirmation popup before the update really starts 2/3
 #. Text for confirmation popup before the update really starts 2/3
 #: src/include/installation/misc.rb:216
-#: src/lib/installation/proposal_runner.rb:130
+#: src/lib/installation/proposal_runner.rb:127
 msgid ""
 "\n"
 "<p>If you continue now, data on your hard disk will be overwritten\n"
@@ -247,7 +247,7 @@
 #. Label for the button that confirms startint the installation
 #. Label for the button that confirms startint the installation
 #: src/include/installation/misc.rb:225
-#: src/lib/installation/proposal_runner.rb:139
+#: src/lib/installation/proposal_runner.rb:136
 msgid "Start &Update"
 msgstr "Start &oppgradering"
 
@@ -290,61 +290,7 @@
 msgstr "Starter tjenesten %1..."
 
 #. progress step title
-#: src/lib/installation/clients/clone_finish.rb:43
-msgid "Generating AutoYaST profile if needed..."
-msgstr ""
-
-#. TRANSLATORS: help text
-#: src/lib/installation/clients/clone_proposal.rb:39
-#, fuzzy
-#| msgid ""
-#| "<p>Use <b>Clone</b> if you want to create an AutoYaST profile.\n"
-#| "AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
-#| "needs a profile to know what the installed system should look like. If this option is\n"
-#| "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>.</p>"
-msgid ""
-"<p>Use <b>Clone System Settings</b> if you want to create an AutoYaST profile.\n"
-"AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
-"needs a profile to know what the installed system should look like. If this option is\n"
-"selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>.</p>"
-msgstr ""
-"<p>Bruk <b>Klon</b> hvis du vil opprette en AutoYaST-profil.\n"
-"Med AutoYaST kan hele SUSE Linux-installasjonen utføres uten medvirkning fra brukeren. AutoYaST\n"
-"trenger en profil for å vite hvordan det installerte systemet skal se ut. Når du krysser av for dette,\n"
-"blir en profil for gjeldende system lagret i <tt>/root/autoinst.xml</tt>.</p>"
-
-#: src/lib/installation/clients/clone_proposal.rb:60
-msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?"
-msgstr ""
-
-#. this is a heading
-#: src/lib/installation/clients/clone_proposal.rb:71
-#, fuzzy
-#| msgid "Writing the system configuration..."
-msgid "Clone System Configuration"
-msgstr "Lagrer systemoppsettet..."
-
-#. this is a menu entry
-#: src/lib/installation/clients/clone_proposal.rb:73
-#, fuzzy
-#| msgid "&Skip Configuration"
-msgid "&Clone System Configuration"
-msgstr "&Hopp over konfigurasjon"
-
-#. TRANSLATORS: Installation overview
-#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
-#: src/lib/installation/clients/clone_proposal.rb:101
-msgid "The AutoYaST profile will be written under /root/autoinst.xml (do not write it</a>)."
-msgstr ""
-
-#. TRANSLATORS: Installation overview
-#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
-#: src/lib/installation/clients/clone_proposal.rb:110
-msgid "The AutoYaST profile will not be saved (write it</a>)."
-msgstr ""
-
-#. progress step title
-#: src/lib/installation/clients/copy_files_finish.rb:81
+#: src/lib/installation/clients/copy_files_finish.rb:83
 msgid "Copying files to installed system..."
 msgstr "Kopierer filer til installert system..."
 
@@ -541,7 +487,7 @@
 msgstr "Oppdateringer for %1 %2"
 
 #: src/lib/installation/clients/inst_addon_update_sources.rb:172
-#: src/lib/installation/clients/inst_system_analysis.rb:304
+#: src/lib/installation/clients/inst_system_analysis.rb:321
 msgid "Unknown Product"
 msgstr "Ukjent produkt"
 
@@ -570,54 +516,28 @@
 "Velg om du vil kjøre en online-oppgradering nå.\n"
 "Du kan hoppe over dette trinnet nå, og kjøre oppgraderingen senere.\n"
 
-#. ----------------------------------------------------------------------
-#. Build dialog
-#. ----------------------------------------------------------------------
-#. heading text
-#: src/lib/installation/clients/inst_complex_welcome.rb:65
+#. This client shows main dialog for choosing the language,
+#. keyboard and accepting the license.
+#: src/lib/installation/clients/inst_complex_welcome.rb:33
 msgid "Language, Keyboard and License Agreement"
 msgstr ""
 
-#. combo box label
-#. combobox
-#. TRANSLATORS: Combo box
-#: src/lib/installation/clients/inst_complex_welcome.rb:71
-#: src/lib/installation/clients/inst_release_notes.rb:217
-#: src/lib/installation/clients/inst_release_notes.rb:431
-msgid "&Language"
-msgstr "&Språk"
-
-#. combo box label
-#: src/lib/installation/clients/inst_complex_welcome.rb:79
-msgid "&Keyboard Layout"
-msgstr "&Tastaturoppsett"
-
-#. bnc #359456
-#. TRANSLATORS: check-box
-#: src/lib/installation/clients/inst_complex_welcome.rb:91
-msgid "I &Agree to the License Terms."
-msgstr "Jeg godkjenner lisens&avtalen."
-
-#. this type of contents will be shown only for initial installation dialog
-#: src/lib/installation/clients/inst_complex_welcome.rb:110
+#. 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/lib/installation/clients/inst_complex_welcome.rb:184
+#: src/lib/installation/clients/inst_download_release_notes.rb:126
+#: src/lib/installation/clients/inst_system_analysis.rb:319
 #, fuzzy
-#| msgid "Keyboard &test:"
-msgid "K&eyboard Test"
-msgstr "&Test tastaturet"
+#| msgid "Release Notes"
+msgid "Re&lease Notes..."
+msgstr "Versjonsmerknader"
 
-#. TRANSLATORS: dialog caption
-#: src/lib/installation/clients/inst_complex_welcome.rb:119
-#: src/lib/installation/clients/inst_complex_welcome.rb:299
-msgid "License Agreement"
-msgstr "Lisensavtale"
-
-#. TRANSLATORS: button label
-#: src/lib/installation/clients/inst_complex_welcome.rb:141
-msgid "License &Translations..."
-msgstr "Lisensoverse&ttelser..."
-
 #. help text for initial (first time) language screen
-#: src/lib/installation/clients/inst_complex_welcome.rb:153
+#: src/lib/installation/clients/inst_complex_welcome.rb:198
 msgid ""
 "<p>\n"
 "Choose the <b>Language</b> and the <b>Keyboard layout</b> to be used during\n"
@@ -631,7 +551,7 @@
 
 #. help text, continued
 #. Describes the #ICW_B1 button
-#: src/lib/installation/clients/inst_complex_welcome.rb:161
+#: src/lib/installation/clients/inst_complex_welcome.rb:206
 msgid ""
 "<p>\n"
 "The license must be accepted before the installation continues.\n"
@@ -644,7 +564,7 @@
 "</p>\n"
 
 #. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:168
+#: src/lib/installation/clients/inst_complex_welcome.rb:213
 msgid ""
 "<p>\n"
 "Click <b>Next</b> to proceed to the next dialog.\n"
@@ -655,7 +575,7 @@
 "</p>\n"
 
 #. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:174
+#: src/lib/installation/clients/inst_complex_welcome.rb:219
 msgid ""
 "<p>\n"
 "Nothing will happen to your computer until you confirm\n"
@@ -668,7 +588,7 @@
 "</p>\n"
 
 #. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:181
+#: src/lib/installation/clients/inst_complex_welcome.rb:226
 msgid ""
 "<p>\n"
 "Select <b>Abort</b> to abort the\n"
@@ -680,24 +600,57 @@
 "installasjonen når som helst.\n"
 "</p>\n"
 
-#. 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/lib/installation/clients/inst_complex_welcome.rb:211
-#: src/lib/installation/clients/inst_download_release_notes.rb:126
-#: src/lib/installation/clients/inst_system_analysis.rb:302
-#, fuzzy
-#| msgid "Release Notes"
-msgid "Re&lease Notes..."
-msgstr "Versjonsmerknader"
+#. TRANSLATORS: dialog caption
+#: src/lib/installation/clients/inst_complex_welcome.rb:242
+#: src/lib/installation/clients/inst_complex_welcome.rb:469
+msgid "License Agreement"
+msgstr "Lisensavtale"
 
-#: src/lib/installation/clients/inst_complex_welcome.rb:323
+#. combo box label
+#. combobox
+#. TRANSLATORS: Combo box
+#: src/lib/installation/clients/inst_complex_welcome.rb:266
+#: src/lib/installation/clients/inst_release_notes.rb:217
+#: src/lib/installation/clients/inst_release_notes.rb:429
+msgid "&Language"
+msgstr "&Språk"
+
+#. combo box label
+#: src/lib/installation/clients/inst_complex_welcome.rb:276
+msgid "&Keyboard Layout"
+msgstr "&Tastaturoppsett"
+
+#. TRANSLATORS: check-box
+#: src/lib/installation/clients/inst_complex_welcome.rb:290
+msgid "I &Agree to the License Terms."
+msgstr "Jeg godkjenner lisens&avtalen."
+
+#. Report error about missing license acceptance
+#: src/lib/installation/clients/inst_complex_welcome.rb:317
 msgid "You must accept the license to install this product"
 msgstr ""
 
+#. TRANSLATORS: addition license information
+#. %1 is replaced with the filename. Please keep
+#. the translation VERY short.
+#: src/lib/installation/clients/inst_complex_welcome.rb:437
+#, fuzzy
+#| msgid "Checking the installed system..."
+msgid "EULA location in the installed system: %s"
+msgstr "Kontrollerer det installerte systemet..."
+
+#. this type of contents will be shown only for initial installation dialog
+#: src/lib/installation/clients/inst_complex_welcome.rb:460
+#, fuzzy
+#| msgid "Keyboard &test:"
+msgid "K&eyboard Test"
+msgstr "&Test tastaturet"
+
+#. TRANSLATORS: button label
+#: src/lib/installation/clients/inst_complex_welcome.rb:494
+msgid "License &Translations..."
+msgstr "Lisensoverse&ttelser..."
+
 #. TRANSLATORS: check box, see #ZMD
 #: src/lib/installation/clients/inst_congratulate.rb:107
 msgid "&Disable ZMD Service"
@@ -800,7 +753,7 @@
 msgstr "Pakken autoyast2 er ikke installert. Kloning deaktivert."
 
 #. OEM image if target disk is defined
-#: src/lib/installation/clients/inst_deploy_image.rb:46
+#: src/lib/installation/clients/inst_deploy_image.rb:49
 msgid "The system will reboot now..."
 msgstr "Maskinen vil bli startet på nytt nå..."
 
@@ -809,16 +762,16 @@
 #. twice more steps
 #. FIXME: 2 minutes
 #. own workflow for OEM image deployment
-#: src/lib/installation/clients/inst_deploy_image.rb:106
-#: src/lib/installation/clients/inst_deploy_image.rb:351
+#: src/lib/installation/clients/inst_deploy_image.rb:107
+#: src/lib/installation/clients/inst_deploy_image.rb:352
 #: src/lib/installation/clients/inst_prepareprogress.rb:110
-#: src/lib/installation/clients/inst_prepareprogress.rb:152
+#: src/lib/installation/clients/inst_prepareprogress.rb:150
 msgid "Deploying Images..."
 msgstr "Bruker diskbilder..."
 
 #. BNC #444209
 #. false == error
-#: src/lib/installation/clients/inst_deploy_image.rb:167
+#: src/lib/installation/clients/inst_deploy_image.rb:168
 msgid ""
 "Deploying images has failed.\n"
 "Aborting the installation...\n"
@@ -827,7 +780,7 @@
 "Avbryter installasjonen...\n"
 
 #. TRANSLATORS: pop-up message
-#: src/lib/installation/clients/inst_deploy_image.rb:199
+#: src/lib/installation/clients/inst_deploy_image.rb:200
 msgid ""
 "Debugging has been turned on.\n"
 "YaST will open a software manager for you to check the current status of packages."
@@ -836,20 +789,20 @@
 "YaST vil åpne en pakkebehandler slik at du kan kontrollere gjeldende status for pakkene."
 
 #. unknown image
-#: src/lib/installation/clients/inst_deploy_image.rb:375
+#: src/lib/installation/clients/inst_deploy_image.rb:376
 msgid "Downloading image at speed %1/s"
 msgstr "Laster ned diskbilde med hastigheten %1/s"
 
-#: src/lib/installation/clients/inst_deploy_image.rb:380
+#: src/lib/installation/clients/inst_deploy_image.rb:381
 msgid "Downloading image %1 at speed %2/s"
 msgstr "Laster ned diskbildet %1 med hastigheten %2/s"
 
 #. reset the label
-#: src/lib/installation/clients/inst_deploy_image.rb:442
+#: src/lib/installation/clients/inst_deploy_image.rb:441
 msgid "Deploying image..."
 msgstr "Bruker diskbilde..."
 
-#: src/lib/installation/clients/inst_deploy_image.rb:445
+#: src/lib/installation/clients/inst_deploy_image.rb:444
 msgid "Deploying image %1..."
 msgstr "Bruker diskbildet %1..."
 
@@ -866,44 +819,45 @@
 msgid "&Disk to Use"
 msgstr ""
 
-#: src/lib/installation/clients/inst_disk_for_image.rb:93
+#: src/lib/installation/clients/inst_disk_for_image.rb:92
 msgid "Select the disk, which the image will be deployed to. All data on the disk will be lost and the disk will be partitioned as defined in the image."
 msgstr ""
 
-#: src/lib/installation/clients/inst_disk_for_image.rb:100
+#: src/lib/installation/clients/inst_disk_for_image.rb:99
 msgid "Hard Disk for Image Deployment"
 msgstr ""
 
 #. popup label
-#: src/lib/installation/clients/inst_disks_activate.rb:60
+#: src/lib/installation/clients/inst_disks_activate.rb:65
 msgid "Detecting Available Controllers"
 msgstr "Søker etter tilgjengelige kontrollere"
 
 #. dialog caption
-#: src/lib/installation/clients/inst_disks_activate.rb:76
+#: src/lib/installation/clients/inst_disks_activate.rb:81
 msgid "Disk Activation"
 msgstr "Diskaktivering"
 
-#: src/lib/installation/clients/inst_disks_activate.rb:86
+#: src/lib/installation/clients/inst_disks_activate.rb:91
 msgid "Configure &DASD Disks"
 msgstr "Konfigurer &DASD-disker"
 
-#: src/lib/installation/clients/inst_disks_activate.rb:92
+#: src/lib/installation/clients/inst_disks_activate.rb:97
 msgid "Configure &ZFCP Disks"
 msgstr "Konfigurer &ZFCP-disker"
 
-#: src/lib/installation/clients/inst_disks_activate.rb:98
+#: src/lib/installation/clients/inst_disks_activate.rb:103
 msgid "Configure &FCoE Interfaces"
 msgstr "Sett opp &FCoE-grensesnitt"
 
-#: src/lib/installation/clients/inst_disks_activate.rb:110
+#: src/lib/installation/clients/inst_disks_activate.rb:117
 msgid "Configure &iSCSI Disks"
 msgstr "Konfigurer &iSCSI-disker"
 
-#: src/lib/installation/clients/inst_disks_activate.rb:111
+#. Finish
+#: src/lib/installation/clients/inst_disks_activate.rb:178
 #, fuzzy
 #| msgid "Saving network configuration..."
-msgid "Change Net&work Configuration"
+msgid "Net&work Configuration..."
 msgstr "Lagrer nettverkskonfigurasjon..."
 
 #. TRANSLATORS: dialog caption
@@ -922,7 +876,7 @@
 #. bug #302384
 #: src/lib/installation/clients/inst_download_release_notes.rb:134
 #: src/lib/installation/clients/inst_initialization.rb:56
-#: src/lib/installation/clients/inst_installation_options.rb:152
+#: src/lib/installation/clients/inst_installation_options.rb:149
 msgid "Initializing"
 msgstr "Initialiserer"
 
@@ -947,71 +901,74 @@
 msgid "Show &package updates"
 msgstr "Vis &pakkeoppdateringer"
 
+#. a fallback busy message
+#: src/lib/installation/clients/inst_finish.rb:98
+msgid "Calling step %1..."
+msgstr "Kjører trinn %1..."
+
+#. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log
+#: src/lib/installation/clients/inst_finish.rb:112
+msgid " * %1"
+msgstr " * %1"
+
+#. get the latest errors
+#: src/lib/installation/clients/inst_finish.rb:253
+msgid "Installation Error"
+msgstr "Installasjonsfeil"
+
 #. Adjust a SlideShow dialog if not configured
 #. kilobytes
 #. just make it longer than inst_finish, TODO: better value later
-#: src/lib/installation/clients/inst_finish.rb:79
-#: src/lib/installation/clients/inst_prepareprogress.rb:140
-#: src/lib/installation/clients/inst_prepareprogress.rb:158
+#: src/lib/installation/clients/inst_finish.rb:276
+#: src/lib/installation/clients/inst_prepareprogress.rb:138
+#: src/lib/installation/clients/inst_prepareprogress.rb:156
 msgid "Finishing Basic Installation"
 msgstr "Fullfører grunninstallasjon"
 
 #. Might be left from the previous stage
-#: src/lib/installation/clients/inst_finish.rb:105
+#: src/lib/installation/clients/inst_finish.rb:299
 msgid "Creating list of finish scripts to call..."
 msgstr "Oppretter liste over fullføringsskript som skal kjøres..."
 
+#: src/lib/installation/clients/inst_finish.rb:307
+msgid "Finished"
+msgstr "Fullført"
+
 #. progress stage
-#: src/lib/installation/clients/inst_finish.rb:204
+#: src/lib/installation/clients/inst_finish.rb:456
 msgid "Copy files to installed system"
 msgstr "Kopier filer til installert system"
 
 #. progress stage
-#: src/lib/installation/clients/inst_finish.rb:211
+#: src/lib/installation/clients/inst_finish.rb:463
 msgid "Save configuration"
 msgstr "Lagre konfigurasjon"
 
 #. progress stage
-#: src/lib/installation/clients/inst_finish.rb:218
+#: src/lib/installation/clients/inst_finish.rb:470
 msgid "Save installation settings"
 msgstr "Lagre installasjonsinnstillinger"
 
 #. progress stage
-#: src/lib/installation/clients/inst_finish.rb:227
+#: src/lib/installation/clients/inst_finish.rb:479
 msgid "Install boot manager"
 msgstr "Installer oppstartslaster"
 
 #. progress stage
-#: src/lib/installation/clients/inst_finish.rb:234
+#: src/lib/installation/clients/inst_finish.rb:486
 msgid "Prepare system for initial boot"
 msgstr "Klargjør systemet for første oppstart"
 
-#. merge steps from add-on products
-#. bnc #438678
-#: src/lib/installation/clients/inst_finish.rb:338
+#. some steps are called in live installer only
+#: src/lib/installation/clients/inst_finish.rb:549
+msgid "Client %1 returned invalid data."
+msgstr ""
+
+#. FIXME: looks like product specific finish steps are not used at all
+#: src/lib/installation/clients/inst_finish.rb:581
 msgid "Checking stage: %1..."
 msgstr "Kontrollerer trinn: %1..."
 
-#. a fallback busy message
-#: src/lib/installation/clients/inst_finish.rb:425
-msgid "Calling step %1..."
-msgstr "Kjører trinn %1..."
-
-#. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log
-#: src/lib/installation/clients/inst_finish.rb:445
-msgid " * %1"
-msgstr " * %1"
-
-#. Anything else
-#: src/lib/installation/clients/inst_finish.rb:482
-msgid "Finished"
-msgstr "Fullført"
-
-#. get the latest errors
-#: src/lib/installation/clients/inst_finish.rb:614
-msgid "Installation Error"
-msgstr "Installasjonsfeil"
-
 #. Button to accept a license agreement
 #: src/lib/installation/clients/inst_info.rb:63
 msgid "I &Agree"
@@ -1033,24 +990,24 @@
 msgstr "Klargjør første systemkonfigurasjon..."
 
 #. dialog caption
-#: src/lib/installation/clients/inst_installation_options.rb:83
+#: src/lib/installation/clients/inst_installation_options.rb:80
 #, fuzzy
 #| msgid "Installation Mode"
 msgid "Installation Options"
 msgstr "Installasjonsmodus"
 
 #. check box
-#: src/lib/installation/clients/inst_installation_options.rb:181
+#: src/lib/installation/clients/inst_installation_options.rb:177
 msgid "&Add Online Repositories Before Installation"
 msgstr "Legg til online-p&akkebrønner før installasjon"
 
 #. check box
-#: src/lib/installation/clients/inst_installation_options.rb:193
+#: src/lib/installation/clients/inst_installation_options.rb:189
 msgid "In&clude Add-on Products from Separate Media"
 msgstr "In&kluder tilleggsprodukter fra separate medier"
 
 #. help text for installation method
-#: src/lib/installation/clients/inst_installation_options.rb:204
+#: src/lib/installation/clients/inst_installation_options.rb:200
 #, fuzzy
 #| msgid ""
 #| "<p><big><b>Installation Mode</b></big><br>\n"
@@ -1061,7 +1018,7 @@
 "Velg hva du vil gjøre:</p>"
 
 #. help text for installation option
-#: src/lib/installation/clients/inst_installation_options.rb:207
+#: src/lib/installation/clients/inst_installation_options.rb:203
 msgid ""
 "<p>\n"
 "To use suggested remote repositories during installation or update, select\n"
@@ -1072,7 +1029,7 @@
 "<b>Legg til online-pakkebrønner før installasjon</b>.</p>"
 
 #. help text for installation method
-#: src/lib/installation/clients/inst_installation_options.rb:213
+#: src/lib/installation/clients/inst_installation_options.rb:209
 msgid ""
 "<p>\n"
 "To install an add-on product from separate media together with &product;, select\n"
@@ -1083,7 +1040,7 @@
 "<b>Inkluder tilleggsprodukter fra separate medier</b>.</p>\n"
 
 #. help text: additional help for installation
-#: src/lib/installation/clients/inst_installation_options.rb:216
+#: src/lib/installation/clients/inst_installation_options.rb:212
 msgid "<p>If you need specific hardware drivers for installation, see <i>http://drivers.suse.com</i> site.</p>"
 msgstr "<p>Hvis du trenger spesifikke maskinvaredrivere for å installere, se <i>http://drivers.suse.com</i> site.</p>"
 
@@ -1210,7 +1167,7 @@
 
 #. Use 'zero' if image installation is not used
 #. BNC #439104
-#: src/lib/installation/clients/inst_prepareprogress.rb:126
+#: src/lib/installation/clients/inst_prepareprogress.rb:124
 msgid "Installing Packages..."
 msgstr "Installerer pakker..."
 
@@ -1244,7 +1201,7 @@
 "Linux-systemet. De inneholder et kort sammendrag av nye funksjoner og endringer.</p>\n"
 
 #. informative message in RichText widget
-#: src/lib/installation/clients/inst_release_notes.rb:457
+#: src/lib/installation/clients/inst_release_notes.rb:455
 msgid "<p>No release notes have been installed.</p>"
 msgstr "<p>Ingen versjonsnotater ble installert.</p>"
 
@@ -1269,88 +1226,88 @@
 
 #. This dialog in not interactive
 #. always return `back when came from the previous dialog
-#: src/lib/installation/clients/inst_system_analysis.rb:80
+#: src/lib/installation/clients/inst_system_analysis.rb:86
 msgid "Analyzing the Computer"
 msgstr "Analyserer datamaskinen"
 
 #. TRANSLATORS: progress steps in system probing
-#: src/lib/installation/clients/inst_system_analysis.rb:99
+#: src/lib/installation/clients/inst_system_analysis.rb:105
 msgid "Probe USB devices"
 msgstr "Søk etter USB-enheter"
 
-#: src/lib/installation/clients/inst_system_analysis.rb:100
+#: src/lib/installation/clients/inst_system_analysis.rb:106
 msgid "Probing USB devices..."
 msgstr "Søker etter USB-enheter..."
 
-#: src/lib/installation/clients/inst_system_analysis.rb:103
+#: src/lib/installation/clients/inst_system_analysis.rb:109
 msgid "Probe FireWire devices"
 msgstr "Søk etter FireWire-enheter"
 
-#: src/lib/installation/clients/inst_system_analysis.rb:104
+#: src/lib/installation/clients/inst_system_analysis.rb:110
 msgid "Probing FireWire devices..."
 msgstr "Søker etter FireWire-enheter..."
 
-#: src/lib/installation/clients/inst_system_analysis.rb:107
+#: src/lib/installation/clients/inst_system_analysis.rb:113
 msgid "Probe floppy disk devices"
 msgstr "Søk etter diskettenheter"
 
-#: src/lib/installation/clients/inst_system_analysis.rb:108
+#: src/lib/installation/clients/inst_system_analysis.rb:114
 msgid "Probing floppy disk devices..."
 msgstr "Søker etter diskettenheter..."
 
-#: src/lib/installation/clients/inst_system_analysis.rb:112
+#: src/lib/installation/clients/inst_system_analysis.rb:118
 msgid "Probe hard disk controllers"
 msgstr "Søk etter harddiskkontrollere"
 
-#: src/lib/installation/clients/inst_system_analysis.rb:113
+#: src/lib/installation/clients/inst_system_analysis.rb:119
 msgid "Probing hard disk controllers..."
 msgstr "Søker etter harddiskkontrollere..."
 
-#: src/lib/installation/clients/inst_system_analysis.rb:116
+#: src/lib/installation/clients/inst_system_analysis.rb:122
 msgid "Load kernel modules for hard disk controllers"
 msgstr "Last kjernemoduler for harddiskkontrollere"
 
-#: src/lib/installation/clients/inst_system_analysis.rb:117
+#: src/lib/installation/clients/inst_system_analysis.rb:123
 msgid "Loading kernel modules for hard disk controllers..."
 msgstr "Laster kjernemoduler for harddiskkontrollere..."
 
-#: src/lib/installation/clients/inst_system_analysis.rb:120
+#: src/lib/installation/clients/inst_system_analysis.rb:126
 msgid "Probe hard disks"
 msgstr "Søk etter harddisker"
 
-#: src/lib/installation/clients/inst_system_analysis.rb:121
+#: src/lib/installation/clients/inst_system_analysis.rb:127
 msgid "Probing hard disks..."
 msgstr "Søker etter harddisker..."
 
 #. FATE #302980: Simplified user config during installation
-#: src/lib/installation/clients/inst_system_analysis.rb:128
+#: src/lib/installation/clients/inst_system_analysis.rb:134
 msgid "Search for system files"
 msgstr "Søk etter systemfiler"
 
-#: src/lib/installation/clients/inst_system_analysis.rb:129
+#: src/lib/installation/clients/inst_system_analysis.rb:135
 msgid "Searching for system files..."
 msgstr "Søker etter systemfiler"
 
-#: src/lib/installation/clients/inst_system_analysis.rb:132
+#: src/lib/installation/clients/inst_system_analysis.rb:138
 msgid "Initialize software manager"
 msgstr "Initialiser pakkebehandleren"
 
-#: src/lib/installation/clients/inst_system_analysis.rb:133
+#: src/lib/installation/clients/inst_system_analysis.rb:139
 msgid "Initializing software manager..."
 msgstr "Initialiserer pakkebehandleren..."
 
 #. TRANSLATORS: dialog caption
-#: src/lib/installation/clients/inst_system_analysis.rb:138
+#: src/lib/installation/clients/inst_system_analysis.rb:144
 msgid "System Probing"
 msgstr "Systemsøk"
 
 #. TRANSLATORS: dialog help
-#: src/lib/installation/clients/inst_system_analysis.rb:144
+#: src/lib/installation/clients/inst_system_analysis.rb:150
 msgid "YaST is probing computer hardware and installed systems now."
 msgstr "YaST søker etter maskinvare og installerte systemer."
 
 #. additonal error when HW was not found
-#: src/lib/installation/clients/inst_system_analysis.rb:240
+#: src/lib/installation/clients/inst_system_analysis.rb:257
 msgid ""
 "\n"
 "Check 'drivers.suse.com' if you need specific hardware drivers for installation."
@@ -1359,7 +1316,7 @@
 "Se «drivers.suse.com» hvis du trenger spesielle maskinvaredrivere for å installere."
 
 #. pop-up error report
-#: src/lib/installation/clients/inst_system_analysis.rb:254
+#: src/lib/installation/clients/inst_system_analysis.rb:271
 msgid ""
 "No hard disks were found for the installation.\n"
 "Please check your hardware!\n"
@@ -1369,7 +1326,7 @@
 "Kontroller maskinvaren!\n"
 "%1\n"
 
-#: src/lib/installation/clients/inst_system_analysis.rb:264
+#: src/lib/installation/clients/inst_system_analysis.rb:281
 msgid ""
 "No hard disks were found for the installation.\n"
 "During an automatic installation, they might be detected later.\n"
@@ -1380,7 +1337,7 @@
 "(spesielt på S/390- eller iSCSI-systemer).\n"
 
 #. pop-up error report
-#: src/lib/installation/clients/inst_system_analysis.rb:275
+#: src/lib/installation/clients/inst_system_analysis.rb:292
 msgid ""
 "No hard disks and no hard disk controllers were\n"
 "found for the installation.\n"
@@ -1393,7 +1350,7 @@
 "%1\n"
 
 #. popup message
-#: src/lib/installation/clients/inst_system_analysis.rb:320
+#: src/lib/installation/clients/inst_system_analysis.rb:337
 msgid ""
 "Failed to initialize the software repositories.\n"
 "Aborting the installation."
@@ -1401,6 +1358,52 @@
 "Kunne ikke initialisere pakkebrønner.\n"
 "Avbryter installasjonen."
 
+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:187
+msgid ""
+"A valid update could not be found at\n"
+"%s.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:193
+msgid ""
+"Could not fetch update from\n"
+"%s.\n"
+"\n"
+msgstr ""
+
+#. Launch the network configuration client on users' demand
+#.
+#. Ask the user about checking network configuration. If she/he accepts,
+#. the `inst_lan` client will be launched.
+#.
+#. @return [Boolean] true if the network configuration client was launched;
+#. false if the network is not configured.
+#: src/lib/installation/clients/inst_update_installer.rb:221
+msgid ""
+"\n"
+"Would you like to check your network configuration\n"
+"and try installing the updates again?"
+msgstr ""
+
+#. Note: the proxy cannot be configured in the YaST installer yet,
+#. it needs to be set via the "proxy" boot option.
+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:265
+msgid ""
+"Downloading the optional installer updates from \n"
+"%s\n"
+"failed.\n"
+"\n"
+"You can continue the installation without applying the updates.\n"
+"However, some potentially important bug fixes might be missing.\n"
+"\n"
+"If you need a proxy server to access the update repository\n"
+"then use the \"proxy\" boot parameter.\n"
+msgstr ""
+
 #. TRANSLATORS: Table item status (repository)
 #: src/lib/installation/clients/inst_upgrade_urls.rb:109
 msgid "Removed"
@@ -1454,8 +1457,8 @@
 #. menu button
 #. menu button
 #: src/lib/installation/clients/inst_upgrade_urls.rb:247
-#: src/lib/installation/proposal_runner.rb:659
-#: src/lib/installation/proposal_runner.rb:783
+#: src/lib/installation/proposal_runner.rb:647
+#: src/lib/installation/proposal_runner.rb:762
 msgid "&Change..."
 msgstr "&Endre..."
 
@@ -1670,7 +1673,7 @@
 "grunnoppsettet av systemet.</p>\n"
 
 #. TRANSLATORS: error message
-#: src/lib/installation/clients/installation.rb:83
+#: src/lib/installation/clients/installation.rb:87
 msgid "No workflow defined for this kind of installation."
 msgstr "Ingen prosedyre er definert for denne installasjonsmodusen."
 
@@ -1690,7 +1693,7 @@
 msgstr "Setter opp kommunikasjonsbuffer..."
 
 #. progress step title
-#: src/lib/installation/clients/network_finish.rb:68
+#: src/lib/installation/clients/network_finish.rb:60
 msgid "Saving network configuration..."
 msgstr "Lagrer nettverkskonfigurasjon..."
 
@@ -1744,6 +1747,26 @@
 msgid "Saving hardware configuration..."
 msgstr "Lagrer maskinvarekonfigurasjon..."
 
+#. normal=configuration in an installed system
+#: src/lib/installation/clients/ssh_import_auto.rb:138
+msgid "It makes no sense to write these settings to system."
+msgstr ""
+
+#. proposal part - bootloader label
+#: src/lib/installation/clients/ssh_import_proposal.rb:21
+#: src/lib/installation/dialogs/ssh_import.rb:91
+#, fuzzy
+#| msgid "Writing the system configuration..."
+msgid "Import SSH Host Keys and Configuration"
+msgstr "Lagrer systemoppsettet..."
+
+#. menubutton entry
+#: src/lib/installation/clients/ssh_import_proposal.rb:23
+#, fuzzy
+#| msgid "&Skip Configuration"
+msgid "&Import SSH Host Keys and Configuration"
+msgstr "&Hopp over konfigurasjon"
+
 #. progress step title
 #: src/lib/installation/clients/ssh_settings_finish.rb:64
 msgid "Copying SSH settings to installed system..."
@@ -1811,6 +1834,34 @@
 msgid "Copying log files to installed system..."
 msgstr "Kopierer loggfiler til installert system..."
 
+#. Event callback for the 'ok' button
+#: src/lib/installation/dialogs/ssh_import.rb:69
+msgid "I would like to import SSH keys from a previous installation"
+msgstr ""
+
+#: src/lib/installation/dialogs/ssh_import.rb:95
+msgid "<p>Every SSH server is identified by one or several public host keys. Choose an existing Linux installation to reuse the host keys -and thus the identity- of its SSH server. The key files found in /etc/ssh (one pair of files per host key) will be copied to the new system being installed.</p><p>Check <b>Import SSH Configuration</b> to also copy other files found in /etc/ssh, in addition to the keys.</p>"
+msgstr ""
+
+#. AutoYaST configuration mode. The user can input the device e.b. /dev/sda0
+#: src/lib/installation/dialogs/ssh_import.rb:108
+#, fuzzy
+#| msgid "Device"
+msgid "&Device"
+msgstr "Enhet"
+
+#. TRANSLATORS: %{system_name} is a string like "openSUSE 13.2", %{device}
+#. is a string like /dev/sda1
+#: src/lib/installation/dialogs/ssh_import.rb:129
+msgid "%{system_name} at %{device}"
+msgstr ""
+
+#: src/lib/installation/dialogs/ssh_import.rb:134
+#, fuzzy
+#| msgid "&Skip Configuration"
+msgid "Import SSH Configuration"
+msgstr "&Hopp over konfigurasjon"
+
 #. progress step title
 #: src/lib/installation/prep_shrink.rb:34
 #, fuzzy
@@ -1819,35 +1870,22 @@
 msgstr "Søker etter Linux-partisjoner..."
 
 #. question in a popup box
-#: src/lib/installation/proposal_runner.rb:207
+#: src/lib/installation/proposal_runner.rb:204
 msgid "Really reset everything to default values?"
 msgstr "Er du sikker på at du vil tilbakestille alt til standardinnstillinger?"
 
 #. explain consequences of a decision
-#: src/lib/installation/proposal_runner.rb:209
+#: src/lib/installation/proposal_runner.rb:206
 msgid "You will lose all changes."
 msgstr "Alle endringer vil gå tapt."
 
-#. while input loop
-#: src/lib/installation/proposal_runner.rb:251
-#, fuzzy
-#| msgid "Automatic Configuration"
-msgid "Location of Stored Configuration"
-msgstr "Automatisk oppsett"
-
-#. force write, so it always write profile even if user do not want
-#. to store profile after installation
-#: src/lib/installation/proposal_runner.rb:257
-msgid "Failed to store configuration. Details can be found in log."
-msgstr ""
-
 #. message show when user has disabled the configuration
-#: src/lib/installation/proposal_runner.rb:268
+#: src/lib/installation/proposal_runner.rb:252
 msgid "Skipping configuration upon user request"
 msgstr "Hopper over konfigurasjon etter ønske fra bruker"
 
 #. error message is a popup
-#: src/lib/installation/proposal_runner.rb:288
+#: src/lib/installation/proposal_runner.rb:272
 msgid ""
 "The proposal contains an error that must be\n"
 "resolved before continuing.\n"
@@ -1856,25 +1894,25 @@
 "rettes før du fortsetter.\n"
 
 #. busy message
-#: src/lib/installation/proposal_runner.rb:394
+#: src/lib/installation/proposal_runner.rb:381
 msgid "Adapting the proposal to the current settings..."
 msgstr "Tilpasser forslaget til gjeldende innstillinger..."
 
 #. busy message;
 #. Initial contents of proposal subwindow while proposals are calculated
-#: src/lib/installation/proposal_runner.rb:398
-#: src/lib/installation/proposal_runner.rb:687
+#: src/lib/installation/proposal_runner.rb:385
+#: src/lib/installation/proposal_runner.rb:667
 msgid "Analyzing your system..."
 msgstr "Analyserer systemet..."
 
 #. fallback proposal, means usually an internal error
-#: src/lib/installation/proposal_runner.rb:500
+#: src/lib/installation/proposal_runner.rb:487
 msgid "ERROR: No proposal"
 msgstr "FEIL: Ingen forslag"
 
 #. Submodules handle their own error reporting
 #. text for a message box
-#: src/lib/installation/proposal_runner.rb:539
+#: src/lib/installation/proposal_runner.rb:526
 msgid ""
 "Configuration saved.\n"
 "There were errors."
@@ -1887,46 +1925,38 @@
 #. Translators: About 40 characters max,
 #. use newlines for longer translations.
 #. radio button
-#: src/lib/installation/proposal_runner.rb:634
+#: src/lib/installation/proposal_runner.rb:621
 msgid "&Skip Configuration"
 msgstr "&Hopp over konfigurasjon"
 
 #. radio button
-#: src/lib/installation/proposal_runner.rb:643
+#: src/lib/installation/proposal_runner.rb:630
 msgid "&Use Following Configuration"
 msgstr "&Bruk følgende konfigurasjon"
 
-#. menu button
-#: src/lib/installation/proposal_runner.rb:667
-#: src/lib/installation/proposal_runner.rb:778
-#, fuzzy
-#| msgid "&Skip Configuration"
-msgid "&Export Configuration"
-msgstr "&Hopp over konfigurasjon"
-
 #. Help message between headline and installation proposal / settings summary.
 #. May contain newlines, but don't make it very much longer than the original.
-#: src/lib/installation/proposal_runner.rb:713
+#: src/lib/installation/proposal_runner.rb:693
 msgid "Click a headline to make changes or use the \"Change...\" menu below."
 msgstr "Klikk på en overskrift for å endre, eller bruk menyen \"Endre...\" nedenfor."
 
-#: src/lib/installation/proposal_runner.rb:717
+#: src/lib/installation/proposal_runner.rb:697
 #, fuzzy
 #| msgid "Click a headline to make changes or use the \"Change...\" menu below."
 msgid "Click a headline to make changes."
 msgstr "Klikk på en overskrift for å endre, eller bruk menyen \"Endre...\" nedenfor."
 
 #. menu button item
-#: src/lib/installation/proposal_runner.rb:777
+#: src/lib/installation/proposal_runner.rb:757
 msgid "&Reset to defaults"
 msgstr "&Tilbakestill til standardinnstillinger"
 
 #. FATE #120373
-#: src/lib/installation/proposal_runner.rb:800
+#: src/lib/installation/proposal_runner.rb:779
 msgid "&Update"
 msgstr "&Oppgradering"
 
-#: src/lib/installation/proposal_runner.rb:800
+#: src/lib/installation/proposal_runner.rb:779
 msgid "&Install"
 msgstr "&Installer"
 
@@ -1961,7 +1991,7 @@
 
 #. Help text for installation proposal
 #. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:417
+#: src/lib/installation/proposal_store.rb:426
 msgid ""
 "<p>\n"
 "Select <b>Install</b> to perform a new installation with the values displayed.\n"
@@ -1974,7 +2004,7 @@
 #. so update
 #. Help text for update proposal
 #. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:425
+#: src/lib/installation/proposal_store.rb:434
 msgid ""
 "<p>\n"
 "Select <b>Update</b> to perform an update with the values displayed.\n"
@@ -1986,7 +2016,7 @@
 
 #. Help text for network configuration proposal
 #. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:434
+#: src/lib/installation/proposal_store.rb:443
 msgid ""
 "<p>\n"
 "Put the network settings into effect by pressing <b>Next</b>.\n"
@@ -1998,7 +2028,7 @@
 
 #. Help text for service configuration proposal
 #. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:442
+#: src/lib/installation/proposal_store.rb:451
 msgid ""
 "<p>\n"
 "Put the service settings into effect by pressing <b>Next</b>.\n"
@@ -2010,7 +2040,7 @@
 
 #. Help text for hardware configuration proposal
 #. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:450
+#: src/lib/installation/proposal_store.rb:459
 msgid ""
 "<p>\n"
 "Put the hardware settings into effect by pressing <b>Next</b>.\n"
@@ -2021,12 +2051,12 @@
 "</p>\n"
 
 #. Proposal in uml module
-#: src/lib/installation/proposal_store.rb:457
+#: src/lib/installation/proposal_store.rb:466
 msgid "<P><B>UML Installation Proposal</B></P>"
 msgstr "<P><B>Forslag til UML-installasjon</B></P>"
 
 #. help text
-#: src/lib/installation/proposal_store.rb:459
+#: src/lib/installation/proposal_store.rb:468
 msgid ""
 "<P>UML (User Mode Linux) installation allows you to start independent\n"
 "Linux virtual machines in the host system.</P>"
@@ -2037,7 +2067,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/lib/installation/proposal_store.rb:473
+#: src/lib/installation/proposal_store.rb:482
 msgid ""
 "<p>\n"
 "To use the settings as displayed, press <b>Next</b>.\n"
@@ -2056,6 +2086,11 @@
 msgid "Enabling remote administration..."
 msgstr "Ekstern administrasjon"
 
+#. A Continue-Cancel popup
+#: src/lib/installation/select_system_role.rb:79
+msgid "Changing the system role may undo adjustments you may have done."
+msgstr ""
+
 #. Writes configuration
 #.
 #. It creates a snapshot when no second stage is required and
@@ -2063,21 +2098,113 @@
 #.
 #. @return [TrueClass,FalseClass] True if snapshot was created;
 #. otherwise it returns false.
-#: src/lib/installation/snapshots_finish.rb:40
+#: src/lib/installation/snapshots_finish.rb:41
 #, fuzzy
 #| msgid "Copying root filesystem..."
 msgid "Creating root filesystem snapshot..."
 msgstr "Kopierer rotfilsystem..."
 
+#. TRANSLATORS: default name for a found Linux system (we don't know if
+#. it's an openSUSE, Ubuntu...)
+#: src/lib/installation/ssh_config.rb:64
+msgid "Linux"
+msgstr ""
+
+#. Build a formatted summary based on the status of the importer
+#.
+#. @return [String] HTML formatted summary.
+#: src/lib/installation/ssh_importer_presenter.rb:45
+msgid "No previous Linux installation found"
+msgstr ""
+
+#: src/lib/installation/ssh_importer_presenter.rb:47
+msgid "No existing SSH host keys will be copied"
+msgstr ""
+
+#. TRANSLATORS: %s is the name of a Linux system found in the hard
+#. disk, like 'openSUSE 13.2'
+#: src/lib/installation/ssh_importer_presenter.rb:54
+msgid "SSH host keys and configuration will be copied from %s"
+msgstr ""
+
+#. TRANSLATORS: %s is the name of a Linux system found in the hard
+#. disk, like 'openSUSE 13.2'
+#: src/lib/installation/ssh_importer_presenter.rb:58
+msgid "SSH host keys will be copied from %s"
+msgstr ""
+
+#. autoyast tried to read a file but had no success.
+#: src/lib/transfer/file_from_url.rb:156
+msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
+msgstr ""
+
+#. autoyast tried to read a file but had no success.
+#: src/lib/transfer/file_from_url.rb:176
+msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2."
+msgstr ""
+
+#. FIXME: I have doubts this will ever work. Too early.
+#: src/lib/transfer/file_from_url.rb:192
+msgid "Reading file on %1/%2 failed.\n"
+msgstr ""
+
+#: src/lib/transfer/file_from_url.rb:208
+msgid "Reading file on %1 failed.\n"
+msgstr ""
+
+#. autoyast tried to mount the CD but had no success.
+#. autoyast tried to mount a NFS directory which failed
+#. autoyast tried to mount a NFS directory which failed
+#: src/lib/transfer/file_from_url.rb:271 src/lib/transfer/file_from_url.rb:327
+#: src/lib/transfer/file_from_url.rb:371
+msgid "Mounting %1 failed."
+msgstr ""
+
+#. autoyast tried to read a file but had no success.
+#: src/lib/transfer/file_from_url.rb:302
+msgid "Reading a file on CD failed. Path: %1/%2."
+msgstr ""
+
+#. autoyast tried to copy a file via NFS which failed
+#. autoyast tried to copy a file via NFS which failed
+#: src/lib/transfer/file_from_url.rb:350 src/lib/transfer/file_from_url.rb:394
+msgid "Remote file %1 cannot be retrieved"
+msgstr ""
+
+#. this is workaround for bnc#849767
+#. because of changes in autoyast startup this code is now
+#. called much sooner (before Storage stuff is initialized)
+#. call dummy method to trigger Storage initialization
+#: src/lib/transfer/file_from_url.rb:519
+msgid "%1 is not mounted and mount failed"
+msgstr ""
+
+#. autoyast tried to copy a file but that file can't be found
+#: src/lib/transfer/file_from_url.rb:539
+msgid "File %1 cannot be found"
+msgstr ""
+
+#. Device
+#: src/lib/transfer/file_from_url.rb:561
+msgid "Cannot find URL '%1' via protocol TFTP."
+msgstr ""
+
+#. the user wanted autoyast to fetch it's profile via an unknown protocol
+#: src/lib/transfer/file_from_url.rb:568
+#, fuzzy
+#| msgid "Unknown Product"
+msgid "Unknown protocol %1."
+msgstr "Ukjent produkt"
+
 #. checking whether images are supported
 #. BNC #409927
 #. Checking files for signatures
-#: src/modules/ImageInstallation.rb:840
+#: src/modules/ImageInstallation.rb:841
 msgid "Failed to read information about installation images"
 msgstr "Kunne ikke lese informasjon om installasjonsdiskbilder"
 
 #. count megabytes
-#: src/modules/ImageInstallation.rb:1196
+#: src/modules/ImageInstallation.rb:1192
 msgid "Deploying..."
 msgstr "Bruker..."
 
@@ -2085,19 +2212,19 @@
 #.
 #. @see #all_supported_types
 #. @see #objects_state
-#: src/modules/ImageInstallation.rb:1219
+#: src/modules/ImageInstallation.rb:1215
 msgid "Storing user preferences..."
 msgstr "Lagrer brukerinnstillinger..."
 
 #. Restores packages statuses from 'objects_state': Selects packages for removal, installation, upgrade.
 #.
 #. @return [Boolean] if successful
-#: src/modules/ImageInstallation.rb:1351
+#: src/modules/ImageInstallation.rb:1347
 msgid "Restoring user preferences..."
 msgstr "Gjenoppretter brukerinnstillinger..."
 
 #. Error message
-#: src/modules/ImageInstallation.rb:1448
+#: src/modules/ImageInstallation.rb:1444
 msgid ""
 "Installation was unable to solve package dependencies automatically.\n"
 "Software manager will be opened for you to solve them manually."
@@ -2105,6 +2232,28 @@
 "Installasjonsprogrammet kunne ikke løse pakkekonfliktene automatisk.\n"
 "Pakkebehandleren vil bli åpnet, slik at du kan løse dem manuelt."
 
+#, fuzzy
+#~| msgid ""
+#~| "<p>Use <b>Clone</b> if you want to create an AutoYaST profile.\n"
+#~| "AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
+#~| "needs a profile to know what the installed system should look like. If this option is\n"
+#~| "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>.</p>"
+#~ msgid ""
+#~ "<p>Use <b>Clone System Settings</b> if you want to create an AutoYaST profile.\n"
+#~ "AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
+#~ "needs a profile to know what the installed system should look like. If this option is\n"
+#~ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>.</p>"
+#~ msgstr ""
+#~ "<p>Bruk <b>Klon</b> hvis du vil opprette en AutoYaST-profil.\n"
+#~ "Med AutoYaST kan hele SUSE Linux-installasjonen utføres uten medvirkning fra brukeren. AutoYaST\n"
+#~ "trenger en profil for å vite hvordan det installerte systemet skal se ut. Når du krysser av for dette,\n"
+#~ "blir en profil for gjeldende system lagret i <tt>/root/autoinst.xml</tt>.</p>"
+
+#, fuzzy
+#~| msgid "Automatic Configuration"
+#~ msgid "Location of Stored Configuration"
+#~ msgstr "Automatisk oppsett"
+
 #~ msgid "ERROR: Missing Title"
 #~ msgstr "FEIL: Tittel mangler"
 
@@ -2222,9 +2371,6 @@
 #~ msgid "Network Card"
 #~ msgstr "Nettverkskort"
 
-#~ msgid "Device"
-#~ msgstr "Enhet"
-
 #~ msgid "Hardware Information of the Selected Network Card"
 #~ msgstr "Maskinvareinformasjon om valgt nettverkskort"
 

Modified: trunk/yast/nb/po/iscsi-client.nb.po
===================================================================
--- trunk/yast/nb/po/iscsi-client.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/iscsi-client.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: iscsi-client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2009-08-11 22:34+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -116,7 +116,6 @@
 msgid "Add"
 msgstr "Legg til"
 
-#. `PushButton(`id(`toggle), _("Toggle Start-Up"))
 #: src/include/iscsi-client/dialogs.rb:160
 msgid "Edit"
 msgstr "Rediger"
@@ -176,47 +175,64 @@
 msgid "Startup"
 msgstr "Oppstart"
 
+#. iSCSI target has to be connected manually
+#: src/include/iscsi-client/dialogs.rb:304
+#, fuzzy
+#| msgid "Manually"
+msgid "manual"
+msgstr "Manuelt"
+
+#. iSCSI target available at boot (respected by 'dracut')
+#: src/include/iscsi-client/dialogs.rb:306
+msgid "onboot"
+msgstr ""
+
+#. iSCSI target enabled automatically (by 'systemd')
+#: src/include/iscsi-client/dialogs.rb:308
+msgid "automatic"
+msgstr ""
+
 #. widget for portal address
-#: src/include/iscsi-client/dialogs.rb:312
+#: src/include/iscsi-client/dialogs.rb:315
 msgid "IP Address"
 msgstr "IP-adresse"
 
-#: src/include/iscsi-client/dialogs.rb:313
+#: src/include/iscsi-client/dialogs.rb:316
 msgid "Port"
 msgstr "Port"
 
-#: src/include/iscsi-client/dialogs.rb:328
+#: src/include/iscsi-client/dialogs.rb:331
 msgid "Key"
 msgstr "Nøkkel"
 
-#: src/include/iscsi-client/dialogs.rb:328
+#: src/include/iscsi-client/dialogs.rb:331
 msgid "Value"
 msgstr "Verdi"
 
 #. service status dialog
-#: src/include/iscsi-client/dialogs.rb:339
+#: src/include/iscsi-client/dialogs.rb:342
 msgid "Service"
 msgstr "Tjeneste"
 
 #. list og connected targets
-#: src/include/iscsi-client/dialogs.rb:362
+#: src/include/iscsi-client/dialogs.rb:365
 msgid "Connected Targets"
 msgstr "Tilkoblede mål"
 
 #. list of discovered targets
-#: src/include/iscsi-client/dialogs.rb:370
+#: src/include/iscsi-client/dialogs.rb:373
 msgid "Discovered Targets"
 msgstr "Mål som ble funnet"
 
 #. main tabbed dialog
-#: src/include/iscsi-client/dialogs.rb:389
+#: src/include/iscsi-client/dialogs.rb:392
 msgid "iSCSI Initiator Overview"
 msgstr "Oversikt over iSCSI-initiator"
 
 #. discovery new target
 #. dialog for all targets from portal (connected/disconnected)
 #. authentification dialog for add/discovery target
-#: src/include/iscsi-client/dialogs.rb:404
+#: src/include/iscsi-client/dialogs.rb:407
 #: src/include/iscsi-client/helps.rb:110 src/include/iscsi-client/helps.rb:122
 #: src/include/iscsi-client/helps.rb:129
 msgid "<h1>iSCSI Initiator</h1>"
@@ -225,9 +241,9 @@
 #. authentication dialog for add new target
 #. list of connected targets
 #. authentication for connect to portal
-#: src/include/iscsi-client/dialogs.rb:439
-#: src/include/iscsi-client/dialogs.rb:478
-#: src/include/iscsi-client/dialogs.rb:504
+#: src/include/iscsi-client/dialogs.rb:442
+#: src/include/iscsi-client/dialogs.rb:481
+#: src/include/iscsi-client/dialogs.rb:507
 msgid "iSCSI Initiator Discovery"
 msgstr "Søk etter iSCSI-initiator"
 
@@ -453,29 +469,27 @@
 msgid "Error occurred while logging out from the selected target."
 msgstr "Det oppstod en feil under utlogging fra det valgte målet."
 
-#. toggle all 3 possible values (bnc#457252)
 #: src/include/iscsi-client/widgets.rb:228
-#: src/include/iscsi-client/widgets.rb:266
 msgid "No record found."
 msgstr "Finner ingen oppføring."
 
 #. if nothing selected - disable some buttons, otherwise enable them
-#: src/include/iscsi-client/widgets.rb:305
+#: src/include/iscsi-client/widgets.rb:270
 msgid "No valid IP address"
 msgstr "Ingen gyldig IP-adresse"
 
-#: src/include/iscsi-client/widgets.rb:310
+#: src/include/iscsi-client/widgets.rb:275
 msgid "Port field cannot be empty"
 msgstr "Port-feltet kan ikke være tomt"
 
 #. regexp for "cz.suse" or just "suse", "cz.su-se"
-#: src/include/iscsi-client/widgets.rb:428
+#: src/include/iscsi-client/widgets.rb:393
 #, fuzzy
 #| msgid "Initiator Name"
 msgid "Incorrect Initiator Name"
 msgstr "Initiatornavn"
 
-#: src/include/iscsi-client/widgets.rb:429
+#: src/include/iscsi-client/widgets.rb:394
 #, fuzzy
 #| msgid ""
 #| "Incorrect InitiatorName.\n"
@@ -504,13 +518,18 @@
 "Eksempel:\n"
 "iqn.2007-04.no.server:storage.disk.sdb\n"
 
-#. brackets needed around IPv6
-#: src/include/iscsi-client/widgets.rb:635
+#. validate ip
+#: src/include/iscsi-client/widgets.rb:572
 msgid "Insert the IP address."
 msgstr "Angi IP-adressen."
 
+#. check for valid host name
+#: src/include/iscsi-client/widgets.rb:584
+msgid "Please check IP address resp. host name.\n"
+msgstr ""
+
 #. validate port number
-#: src/include/iscsi-client/widgets.rb:641
+#: src/include/iscsi-client/widgets.rb:596
 msgid "Insert the port."
 msgstr "Angi porten."
 
@@ -518,37 +537,37 @@
 #. ******************* target table *************************
 #. initialize dialog for all targets from portal (connected/disconnected)
 #. enable/disable connect button according target is or not already connected
-#: src/include/iscsi-client/widgets.rb:754
-#: src/include/iscsi-client/widgets.rb:859
-#: src/include/iscsi-client/widgets.rb:887
+#: src/include/iscsi-client/widgets.rb:717
+#: src/include/iscsi-client/widgets.rb:822
+#: src/include/iscsi-client/widgets.rb:850
 msgid "True"
 msgstr "Sann"
 
-#: src/include/iscsi-client/widgets.rb:754
-#: src/include/iscsi-client/widgets.rb:859
+#: src/include/iscsi-client/widgets.rb:717
+#: src/include/iscsi-client/widgets.rb:822
 msgid "False"
 msgstr "Usann"
 
 #. check if not already connected
 #. check if not already connected
-#: src/include/iscsi-client/widgets.rb:792
-#: src/include/iscsi-client/widgets.rb:912
+#: src/include/iscsi-client/widgets.rb:755
+#: src/include/iscsi-client/widgets.rb:875
 msgid "The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption."
 msgstr "Målet med dette målnavnet er allerede tilkoblet. Pass på at Multipath er aktivert for å unngå ødelagte data."
 
 # continue button label
-#: src/include/iscsi-client/widgets.rb:795
-#: src/include/iscsi-client/widgets.rb:915
+#: src/include/iscsi-client/widgets.rb:758
+#: src/include/iscsi-client/widgets.rb:878
 msgid "Continue"
 msgstr "Fortsett"
 
-#: src/include/iscsi-client/widgets.rb:796
-#: src/include/iscsi-client/widgets.rb:916
+#: src/include/iscsi-client/widgets.rb:759
+#: src/include/iscsi-client/widgets.rb:879
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. check if is not already connected
-#: src/include/iscsi-client/widgets.rb:906
+#: src/include/iscsi-client/widgets.rb:869
 msgid "The target is already connected."
 msgstr "Målet er allerede tilkoblet."
 
@@ -640,7 +659,7 @@
 msgstr "alle"
 
 #. }
-#: src/modules/IscsiClientLib.rb:698
+#: src/modules/IscsiClientLib.rb:730
 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"
@@ -651,15 +670,16 @@
 "Gammelt initiatornavn vil bli erstattet med verdien fra iBFT, og det vil bli opprettet en sikkerhetskopi.\n"
 "Hvis du vil bruke et annet initiatornavn, kan du endre det i BIOS.\n"
 
-#. change startup status (manual/onboot) for target
-#: src/modules/IscsiClientLib.rb:1013
+#. Report a warning (not an error) if login failed for other reasons
+#. (also related to bsc#981693, warning popups usually are skipped)
+#: src/modules/IscsiClientLib.rb:1070
 #, fuzzy
 #| msgid "Image creation failed."
 msgid "Target connection failed.\n"
 msgstr "Feil under oppretting av diskbilde."
 
 #. do discovery first
-#: src/modules/IscsiClientLib.rb:1156
+#: src/modules/IscsiClientLib.rb:1208
 msgid "Configuration summary..."
 msgstr "Oppsettsammendrag..."
 

Modified: trunk/yast/nb/po/iscsi-lio-server.nb.po
===================================================================
--- trunk/yast/nb/po/iscsi-lio-server.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/iscsi-lio-server.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2002-06-17 14:33+0200\n"
 "Last-Translator: www.linuxbutikken.no \n"
 "Language-Team: Norwegian \n"
@@ -38,15 +38,14 @@
 msgstr "Tjeneste"
 
 #. second tab - global authentication
-#: src/include/iscsi-lio-server/dialogs.rb:73
-#: src/modules/IscsiLioServer.rb:427
+#: src/include/iscsi-lio-server/dialogs.rb:73 src/modules/IscsiLioServer.rb:427
 msgid "Global"
 msgstr "Global"
 
 #. third tab - targets / luns
 #. targets dialog
 #: src/include/iscsi-lio-server/dialogs.rb:89
-#: src/include/iscsi-lio-server/dialogs.rb:320
+#: src/include/iscsi-lio-server/dialogs.rb:321
 #: src/modules/IscsiLioServer.rb:443
 msgid "Targets"
 msgstr "Mål"
@@ -63,7 +62,7 @@
 
 #: src/include/iscsi-lio-server/dialogs.rb:128
 #: src/include/iscsi-lio-server/dialogs.rb:189
-#: src/include/iscsi-lio-server/dialogs.rb:320
+#: src/include/iscsi-lio-server/dialogs.rb:321
 msgid "Portal group"
 msgstr "Portalgruppe"
 
@@ -86,7 +85,7 @@
 msgstr "Brukerautorisasjon"
 
 #: src/include/iscsi-lio-server/dialogs.rb:149
-#: src/include/iscsi-lio-server/widgets.rb:301
+#: src/include/iscsi-lio-server/widgets.rb:312
 msgid "LUN"
 msgstr "LUN"
 
@@ -99,153 +98,163 @@
 msgstr "Sti"
 
 #: src/include/iscsi-lio-server/dialogs.rb:154
-#: src/include/iscsi-lio-server/dialogs.rb:198
-#: src/include/iscsi-lio-server/dialogs.rb:237
-#: src/include/iscsi-lio-server/dialogs.rb:325
-#: src/include/iscsi-lio-server/dialogs.rb:372
-#: src/include/iscsi-lio-server/widgets.rb:442
+#: src/include/iscsi-lio-server/dialogs.rb:199
+#: src/include/iscsi-lio-server/dialogs.rb:238
+#: src/include/iscsi-lio-server/dialogs.rb:326
+#: src/include/iscsi-lio-server/dialogs.rb:373
+#: src/include/iscsi-lio-server/widgets.rb:453
 msgid "Add"
 msgstr "Legg til"
 
 #: src/include/iscsi-lio-server/dialogs.rb:155
-#: src/include/iscsi-lio-server/dialogs.rb:238
-#: src/include/iscsi-lio-server/dialogs.rb:326
-#: src/include/iscsi-lio-server/dialogs.rb:373
+#: src/include/iscsi-lio-server/dialogs.rb:239
+#: src/include/iscsi-lio-server/dialogs.rb:327
+#: src/include/iscsi-lio-server/dialogs.rb:374
 msgid "Edit"
 msgstr "Rediger"
 
 #: src/include/iscsi-lio-server/dialogs.rb:156
-#: src/include/iscsi-lio-server/dialogs.rb:201
-#: src/include/iscsi-lio-server/dialogs.rb:239
-#: src/include/iscsi-lio-server/dialogs.rb:327
-#: src/include/iscsi-lio-server/dialogs.rb:374
-#: src/include/iscsi-lio-server/widgets.rb:443
+#: src/include/iscsi-lio-server/dialogs.rb:202
+#: src/include/iscsi-lio-server/dialogs.rb:240
+#: src/include/iscsi-lio-server/dialogs.rb:328
+#: src/include/iscsi-lio-server/dialogs.rb:375
+#: src/include/iscsi-lio-server/widgets.rb:454
 msgid "Delete"
 msgstr "Slett"
 
-#: src/include/iscsi-lio-server/dialogs.rb:193
-msgid "Client"
-msgstr "Klient"
+#. table header (Initiator: iSCSI client, LUN Mapping: logical unit client/target mapping, Auth: authorization)
+#: src/include/iscsi-lio-server/dialogs.rb:194
+msgid "Initiator"
+msgstr ""
 
-#: src/include/iscsi-lio-server/dialogs.rb:193
-msgid "Lun Mapping"
+#: src/include/iscsi-lio-server/dialogs.rb:194
+#, fuzzy
+#| msgid "Lun Mapping"
+msgid "LUN Mapping"
 msgstr "LUN-mapping"
 
-#: src/include/iscsi-lio-server/dialogs.rb:193
+#: src/include/iscsi-lio-server/dialogs.rb:194
 msgid "Auth"
 msgstr "Aut."
 
-#: src/include/iscsi-lio-server/dialogs.rb:199
+#: src/include/iscsi-lio-server/dialogs.rb:200
 msgid "Edit LUN"
 msgstr "Rediger LUN"
 
-#: src/include/iscsi-lio-server/dialogs.rb:200
+#: src/include/iscsi-lio-server/dialogs.rb:201
 msgid "Edit Auth"
 msgstr "Rediger aut."
 
-#: src/include/iscsi-lio-server/dialogs.rb:202
+#: src/include/iscsi-lio-server/dialogs.rb:203
 msgid "Copy"
 msgstr "Kopier"
 
 #. enable/disable none/incoming/outgoing authentication
-#: src/include/iscsi-lio-server/dialogs.rb:216
-#: src/include/iscsi-lio-server/widgets.rb:207
+#: src/include/iscsi-lio-server/dialogs.rb:217
+#: src/include/iscsi-lio-server/widgets.rb:218
 #: src/modules/IscsiLioServer.rb:434
 msgid "No Authentication"
 msgstr "Ingen autentisering"
 
-#: src/include/iscsi-lio-server/dialogs.rb:225
-#: src/include/iscsi-lio-server/widgets.rb:218
+#: src/include/iscsi-lio-server/dialogs.rb:226
+#: src/include/iscsi-lio-server/widgets.rb:229
 #: src/modules/IscsiLioServer.rb:437
 msgid "Incoming Authentication"
 msgstr "Innkommende autentisering"
 
 #. dialog to add/modify user and password
-#: src/include/iscsi-lio-server/dialogs.rb:232
-#: src/include/iscsi-lio-server/dialogs.rb:253
-#: src/include/iscsi-lio-server/widgets.rb:223
-#: src/include/iscsi-lio-server/widgets.rb:236
-#: src/include/iscsi-lio-server/widgets.rb:721
+#: src/include/iscsi-lio-server/dialogs.rb:233
+#: src/include/iscsi-lio-server/dialogs.rb:254
+#: src/include/iscsi-lio-server/widgets.rb:234
+#: src/include/iscsi-lio-server/widgets.rb:247
+#: src/include/iscsi-lio-server/widgets.rb:732
 msgid "Username"
 msgstr "Brukernavn"
 
-#: src/include/iscsi-lio-server/dialogs.rb:232
-#: src/include/iscsi-lio-server/dialogs.rb:254
-#: src/include/iscsi-lio-server/widgets.rb:224
-#: src/include/iscsi-lio-server/widgets.rb:237
-#: src/include/iscsi-lio-server/widgets.rb:722
+#: src/include/iscsi-lio-server/dialogs.rb:233
+#: src/include/iscsi-lio-server/dialogs.rb:255
+#: src/include/iscsi-lio-server/widgets.rb:235
+#: src/include/iscsi-lio-server/widgets.rb:248
+#: src/include/iscsi-lio-server/widgets.rb:733
 msgid "Password"
 msgstr "Passord"
 
-#: src/include/iscsi-lio-server/dialogs.rb:248
-#: src/include/iscsi-lio-server/widgets.rb:231
+#: src/include/iscsi-lio-server/dialogs.rb:249
+#: src/include/iscsi-lio-server/widgets.rb:242
 #: src/modules/IscsiLioServer.rb:440
 msgid "Outgoing Authentication"
 msgstr "Utgående autentisering"
 
 #. radio button (starting LIO target service - option 1)
-#: src/include/iscsi-lio-server/dialogs.rb:274
+#: src/include/iscsi-lio-server/dialogs.rb:275
 msgid "When &Booting"
 msgstr "Under &oppstart"
 
 #. radio button (starting LIO target service - option 2)
-#: src/include/iscsi-lio-server/dialogs.rb:278
+#: src/include/iscsi-lio-server/dialogs.rb:279
 msgid "&Manually"
 msgstr "&Manuelt"
 
 #. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:284
+#: src/include/iscsi-lio-server/dialogs.rb:285
 #: src/modules/IscsiLioServer.rb:429
 msgid "When Booting"
 msgstr "Under oppstart"
 
 #. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:286
+#: src/include/iscsi-lio-server/dialogs.rb:287
 #: src/modules/IscsiLioServer.rb:431
 msgid "Manually"
 msgstr "Manuelt"
 
+#: src/include/iscsi-lio-server/dialogs.rb:321
+msgid "TPG Status"
+msgstr ""
+
 #. dialog for expert settings
-#: src/include/iscsi-lio-server/dialogs.rb:369
+#: src/include/iscsi-lio-server/dialogs.rb:370
 msgid "Key"
 msgstr "Nøkkel"
 
-#: src/include/iscsi-lio-server/dialogs.rb:369
+#: src/include/iscsi-lio-server/dialogs.rb:370
 msgid "Value"
 msgstr "Verdi"
 
 #. Summary dialog
 #. @return dialog result
 #. Main dialog - tabbed
-#: src/include/iscsi-lio-server/dialogs.rb:430
+#: src/include/iscsi-lio-server/dialogs.rb:431
 msgid "iSCSI LIO Target Overview"
 msgstr "Oversikt over iSCSI LIO-mål"
 
 #. expert dialog
 #. LUN details
-#: src/include/iscsi-lio-server/dialogs.rb:438
-#: src/include/iscsi-lio-server/helps.rb:178
-#: src/include/iscsi-lio-server/helps.rb:183
+#: src/include/iscsi-lio-server/dialogs.rb:439
+#: src/include/iscsi-lio-server/helps.rb:179
+#: src/include/iscsi-lio-server/helps.rb:184
 msgid "<h1>iSCSI Target</h1>"
 msgstr "<h1>iSCSI-mål</h1>"
 
 #. dialog for add target
-#: src/include/iscsi-lio-server/dialogs.rb:473
+#: src/include/iscsi-lio-server/dialogs.rb:474
 msgid "Add iSCSI Target"
 msgstr "Legg til iSCSI-mål"
 
-#. discovery authentication dialog
-#: src/include/iscsi-lio-server/dialogs.rb:507
-msgid "Modify iSCSI Target Client Setup"
-msgstr "Endre  klientoppsett for iSCSI-mål"
+#. dialog for modifying initiator setup for a target
+#. (includes authentication)
+#: src/include/iscsi-lio-server/dialogs.rb:509
+#, fuzzy
+#| msgid "Modify iSCSI Target Lun Setup"
+msgid "Modify iSCSI Target Initiator Setup"
+msgstr "Endre LUN-oppsett for iSCSI-mål"
 
 #. edit target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:541
+#: src/include/iscsi-lio-server/dialogs.rb:543
 msgid "Modify iSCSI Target Lun Setup"
 msgstr "Endre LUN-oppsett for iSCSI-mål"
 
 #. expert target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:574
+#: src/include/iscsi-lio-server/dialogs.rb:576
 msgid "iSCSI Target Expert Settings"
 msgstr "Avansert innstillinger for iSCSI-mål"
 
@@ -403,21 +412,26 @@
 
 #. target client setup.
 #: src/include/iscsi-lio-server/helps.rb:124
-msgid "<p>Use <b>Add</b> to give a client access for a LUN imported from target portal group. Specify which client is allowed to access it (client name is <i>InitiatorName</i> in '/etc/iscsi/initiatorname.iscsi' on iscsi initiator). <b>Delete</b> will remove the client access to the LUN.</p>"
+msgid ""
+"<p>Use <b>Add</b> to give an initiator (iSCSI client) access to a LUN imported from\n"
+" target portal group. Specify which initiator is allowed to connect (use <i>InitiatorName</i>\n"
+" from '/etc/iscsi/initiatorname.iscsi' on iSCSI initiator). <b>Delete</b> will remove the initiator access to the LUN.</p>"
 msgstr ""
 
 #: src/include/iscsi-lio-server/helps.rb:130
 #, fuzzy
 #| msgid "With <b>Edit LUN</b> on can modify which LUNs the client can access.After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>.If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</b> is disabled here."
-msgid "<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN target number must be unique.<br>After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>. If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</b> is disabled here.</p>"
+msgid ""
+"<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN target number must be unique.<br>After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>. Please make sure to set different passwords for incoming and outgoing authentication.\n"
+" If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</b> is disabled here.</p>"
 msgstr "Med <b>Rediger LUN</b> kan du endre hvilke LUN-er klienten har tilgang til. Velg <b>Rediger aut.</b>, og velg autentiseringstype. Bruk <b>Innkommende</b>, <b>Utgående</b> eller begge sammen. Angi deretter<b>Bruker</b> og <b>Passord</b>. Hvis <b>Bruk autentisering</b> var dektivert i forrige dialog, vil <b>Rediger autentisering</b> være deaktivert her."
 
-#: src/include/iscsi-lio-server/helps.rb:136
-msgid "<p><b>Copy</b> offers the possibility to give an additional client access to the LUN.</p>"
+#: src/include/iscsi-lio-server/helps.rb:137
+msgid "<p><b>Copy</b> offers the possibility to give an additional initiator access to the LUN.</p>"
 msgstr ""
 
 #. target dialog
-#: src/include/iscsi-lio-server/helps.rb:138
+#: src/include/iscsi-lio-server/helps.rb:139
 #, fuzzy
 #| msgid ""
 #| "List of offered targets and target portal groups. Create a new target by clicking <b>Add</b>. \n"
@@ -431,12 +445,12 @@
 
 #. edit target
 #. add target
-#: src/include/iscsi-lio-server/helps.rb:143
-#: src/include/iscsi-lio-server/helps.rb:159
+#: src/include/iscsi-lio-server/helps.rb:144
+#: src/include/iscsi-lio-server/helps.rb:160
 msgid "<h1>iSCSI Target IP/Port and LUN setup</h1>"
 msgstr "<h1>IP/Port og LUN-oppsett for iSCSI-mål</h1>"
 
-#: src/include/iscsi-lio-server/helps.rb:146
+#: src/include/iscsi-lio-server/helps.rb:147
 #, fuzzy
 #| msgid ""
 #| "It is possible to make arbitary block devices or files available under a lun.\n"
@@ -457,8 +471,8 @@
 "Navnet må være unikt innenfor målportalgruppen. Hvis brukeren\n"
 "ikke angir et nav for LUN, blir det generert automatisk."
 
-#: src/include/iscsi-lio-server/helps.rb:153
-#: src/include/iscsi-lio-server/helps.rb:172
+#: src/include/iscsi-lio-server/helps.rb:154
+#: src/include/iscsi-lio-server/helps.rb:173
 msgid ""
 "<p>Under <b>Ip Address</b> and <b>Port Number</b> you specify under which address\n"
 "and port the service will be available. Default for port number is 3260.\n"
@@ -468,11 +482,11 @@
 "og port tjenesten vil være tilgjengelige. Standard portnummer er 3260.\n"
 "Bare IP-adresser som er tilordnet et av nettverkskortene, kan brukes."
 
-#: src/include/iscsi-lio-server/helps.rb:162
+#: src/include/iscsi-lio-server/helps.rb:163
 msgid "Create a new target. Replace template values with the correct values."
 msgstr "Opprett et nytt mål. Bytt ut verdiene i malen med riktige verdier."
 
-#: src/include/iscsi-lio-server/helps.rb:165
+#: src/include/iscsi-lio-server/helps.rb:166
 msgid ""
 "It is possible to make arbitary block devices or files available under a lun.\n"
 "You have to provide <b>path</b> to either block devices or file. \n"
@@ -486,11 +500,11 @@
 "Navnet må være unikt innenfor målportalgruppen. Hvis brukeren\n"
 "ikke angir et nav for LUN, blir det generert automatisk."
 
-#: src/include/iscsi-lio-server/helps.rb:179
+#: src/include/iscsi-lio-server/helps.rb:180
 msgid "It is possible to <b>add</b>, <b>edit</b> or <b>delete</b> all additional configuration options."
 msgstr "Det er mulig å <b>legge til</b>, <b>redigere</b> eller <b>slette</b> alle tilleggsinnstilinger."
 
-#: src/include/iscsi-lio-server/helps.rb:184
+#: src/include/iscsi-lio-server/helps.rb:185
 #, fuzzy
 #| msgid ""
 #| "Edit <b>LUN</b> number if needed, set <b>Type</b> (nullio is for testing purposes). \n"
@@ -503,193 +517,217 @@
 "Hvis Type=fileio, angi <b>Sti</b> til diskenhet eller fil. <b>SCSI-id</b> og <b>Sektorer</b> er valgfritt."
 
 #. save discovery authentication or authentication for given target
-#: src/include/iscsi-lio-server/widgets.rb:145
+#: src/include/iscsi-lio-server/widgets.rb:156
 msgid "Problem changing authentication"
 msgstr "Problem under endring av autorisasjon"
 
 #. validate functions checks the secret for incoming and outgoing cannot be same
-#: src/include/iscsi-lio-server/widgets.rb:161
-#: src/include/iscsi-lio-server/widgets.rb:171
+#: src/include/iscsi-lio-server/widgets.rb:172
+#: src/include/iscsi-lio-server/widgets.rb:182
 msgid "Invalid Username"
 msgstr "Ugyldig brukernavn"
 
-#: src/include/iscsi-lio-server/widgets.rb:161
-#: src/include/iscsi-lio-server/widgets.rb:171
+#: src/include/iscsi-lio-server/widgets.rb:172
+#: src/include/iscsi-lio-server/widgets.rb:182
 msgid "Invalid Password."
 msgstr "Ugyldig passord."
 
-#: src/include/iscsi-lio-server/widgets.rb:251
-msgid "Selected Lun is already in use!"
+#: src/include/iscsi-lio-server/widgets.rb:262
+#, fuzzy
+#| msgid "Selected Lun is already in use!"
+msgid "Selected LUN is already in use!"
 msgstr "Valgt LUN er i bruk!"
 
-#: src/include/iscsi-lio-server/widgets.rb:260
+#: src/include/iscsi-lio-server/widgets.rb:271
 msgid "Selected Name is already in use!"
 msgstr "Det valgte navnet er i bruk!"
 
-#: src/include/iscsi-lio-server/widgets.rb:269
+#: src/include/iscsi-lio-server/widgets.rb:280
 msgid "Selected Path must be either block device or normal file!"
 msgstr "Valgt filsti må enten være en blokkenhet eller en vanlig fil!"
 
-#: src/include/iscsi-lio-server/widgets.rb:275
+#: src/include/iscsi-lio-server/widgets.rb:286
 msgid "Selected Path is already in use!"
 msgstr "Den valgte filstien finnes allerede!"
 
-#: src/include/iscsi-lio-server/widgets.rb:310
+#: src/include/iscsi-lio-server/widgets.rb:321
 msgid "Path:"
 msgstr "Sti:"
 
-#: src/include/iscsi-lio-server/widgets.rb:313
+#: src/include/iscsi-lio-server/widgets.rb:324
 msgid "Browse"
 msgstr "Bla gjennom"
 
-#: src/include/iscsi-lio-server/widgets.rb:333
+#: src/include/iscsi-lio-server/widgets.rb:344
 msgid "Select file or device"
 msgstr "Velg fil eller enhet"
 
-#: src/include/iscsi-lio-server/widgets.rb:436
-msgid "Client Lun"
-msgstr "Klient-LUN"
+#: src/include/iscsi-lio-server/widgets.rb:447
+msgid "Initiator LUN"
+msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:436
+#: src/include/iscsi-lio-server/widgets.rb:447
 msgid "Target LUN"
 msgstr "Mål-LUN"
 
-#: src/include/iscsi-lio-server/widgets.rb:444
+#: src/include/iscsi-lio-server/widgets.rb:455
 msgid "Change:"
 msgstr "Endring:"
 
-#: src/include/iscsi-lio-server/widgets.rb:537
+#: src/include/iscsi-lio-server/widgets.rb:548
 msgid "Target LUN %1 used more than once!"
 msgstr "Mål-LUN %1 brukt mer enn én gang!"
 
-#: src/include/iscsi-lio-server/widgets.rb:599
+#: src/include/iscsi-lio-server/widgets.rb:610
 msgid "Need to enable at least one Authentification!"
 msgstr "Du må angi minst én autentisering!"
 
-#: src/include/iscsi-lio-server/widgets.rb:619
-#, fuzzy
-#| msgid "New client name:"
-msgid "Client name:"
-msgstr "Nytt klientnavn:"
+#: src/include/iscsi-lio-server/widgets.rb:630
+msgid "Initiator name:"
+msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:622
+#: src/include/iscsi-lio-server/widgets.rb:633
 msgid "Import LUNs from TPG"
 msgstr "Importer LUN-er fra TPG"
 
-#: src/include/iscsi-lio-server/widgets.rb:638
-#: src/include/iscsi-lio-server/widgets.rb:695
-msgid "Client name must not be empty!"
+#: src/include/iscsi-lio-server/widgets.rb:649
+#: src/include/iscsi-lio-server/widgets.rb:706
+#, fuzzy
+#| msgid "Client name must not be empty!"
+msgid "Initiator name must not be empty!"
 msgstr "Et klientnavn må angis!"
 
 #. Don't check IscsiLioData.GetClntList(@curr_target, @curr_tpg) for existing
-#. client name. It's allowed to have several LUNs accessable for same client.
+#. initiator name. It's allowed to have several LUNs accessable for same initiator.
 #. TODO: verify whether it's necessary to check @changed_lun here?
-#: src/include/iscsi-lio-server/widgets.rb:644
-#: src/include/iscsi-lio-server/widgets.rb:701
-msgid "Client name already exists!"
+#: src/include/iscsi-lio-server/widgets.rb:655
+#: src/include/iscsi-lio-server/widgets.rb:712
+#, fuzzy
+#| msgid "Client name already exists!"
+msgid "Initiator name already exists!"
 msgstr "Klientnavnet finnes allerede!"
 
-#. Copy exisiting LUN, i.e. give additional client access to the LUN
+#. Copy exisiting LUN, i.e. give additional initiator access to the LUN
 #. (which is allowed, makes sense e.g. with multipath)
-#: src/include/iscsi-lio-server/widgets.rb:678
-msgid "New client name:"
+#: src/include/iscsi-lio-server/widgets.rb:689
+#, fuzzy
+#| msgid "New client name:"
+msgid "New initiator name:"
 msgstr "Nytt klientnavn:"
 
-#: src/include/iscsi-lio-server/widgets.rb:724
+#: src/include/iscsi-lio-server/widgets.rb:735
 msgid "OK"
 msgstr "OK"
 
-#: src/include/iscsi-lio-server/widgets.rb:725
+#: src/include/iscsi-lio-server/widgets.rb:736
 msgid "Cancel"
 msgstr "Avbryt"
 
+#. create items from targets
+#: src/include/iscsi-lio-server/widgets.rb:796
+#, fuzzy
+#| msgid "Disabled"
+msgid "Enabled"
+msgstr "Deaktivert"
+
+#: src/include/iscsi-lio-server/widgets.rb:796
+#: src/include/iscsi-lio-server/widgets.rb:1274
+#: src/include/iscsi-lio-server/widgets.rb:1377
+#: src/include/iscsi-lio-server/widgets.rb:1414
+msgid "Disabled"
+msgstr "Deaktivert"
+
 #. remove a item
 #. **************** Edit Dialog	*****************************
 #. init values for modifying target (read it from stored map)
-#: src/include/iscsi-lio-server/widgets.rb:820
-#: src/include/iscsi-lio-server/widgets.rb:934
-#: src/include/iscsi-lio-server/widgets.rb:1288
+#: src/include/iscsi-lio-server/widgets.rb:833
+#: src/include/iscsi-lio-server/widgets.rb:947
+#: src/include/iscsi-lio-server/widgets.rb:1301
 msgid "Really delete the selected item?"
 msgstr "Er du sikker på at du vil slette valg oppføring?"
 
-#: src/include/iscsi-lio-server/widgets.rb:1002
+#: src/include/iscsi-lio-server/widgets.rb:1015
 msgid "Problem creating target %1 with tpg %2"
 msgstr "Problem under oppretting av målet %1 med tpg %2"
 
-#: src/include/iscsi-lio-server/widgets.rb:1024
+#: src/include/iscsi-lio-server/widgets.rb:1037
 msgid "Problem setting network portal to %1"
 msgstr "Problem under definisjon av nettverksportalen %1"
 
-#: src/include/iscsi-lio-server/widgets.rb:1045
+#: src/include/iscsi-lio-server/widgets.rb:1058
 msgid "Problem removing lun %1"
 msgstr "Problem under fjerning av LUN %1"
 
-#: src/include/iscsi-lio-server/widgets.rb:1070
+#: src/include/iscsi-lio-server/widgets.rb:1083
 msgid "Problem setting lun %1 (name:%2) to path %3"
 msgstr "Problem under definisjon av LUN %1 (navn:%2) med filstien %3"
 
-#: src/include/iscsi-lio-server/widgets.rb:1084
+#: src/include/iscsi-lio-server/widgets.rb:1097
 msgid "Problem setting auth on %1:%2 to %3"
 msgstr "Problem under definisjona av autorisajson for %1:%2 til %3"
 
 #. validate function checks if target/tpg are unique and not empty
-#: src/include/iscsi-lio-server/widgets.rb:1198
+#: src/include/iscsi-lio-server/widgets.rb:1211
 msgid "The target cannot be empty."
 msgstr "Målet kan ikke være blankt."
 
-#: src/include/iscsi-lio-server/widgets.rb:1202
+#: src/include/iscsi-lio-server/widgets.rb:1215
 msgid "The target portal group cannot be empty."
 msgstr "Det må angis en målportalgruppe."
 
-#: src/include/iscsi-lio-server/widgets.rb:1213
+#: src/include/iscsi-lio-server/widgets.rb:1226
 msgid "The target already exists."
 msgstr "Målet eksisterer allerede."
 
-#: src/include/iscsi-lio-server/widgets.rb:1233
+#: src/include/iscsi-lio-server/widgets.rb:1246
 msgid "Incoming"
 msgstr "Innkommende"
 
-#: src/include/iscsi-lio-server/widgets.rb:1236
+#: src/include/iscsi-lio-server/widgets.rb:1249
 msgid "Outgoing"
 msgstr "Utgående"
 
-#: src/include/iscsi-lio-server/widgets.rb:1238
+#: src/include/iscsi-lio-server/widgets.rb:1251
 msgid "None"
 msgstr "Ingen"
 
-#: src/include/iscsi-lio-server/widgets.rb:1261
-#: src/include/iscsi-lio-server/widgets.rb:1364
-#: src/include/iscsi-lio-server/widgets.rb:1401
-msgid "Disabled"
-msgstr "Deaktivert"
-
-#: src/include/iscsi-lio-server/widgets.rb:1450
+#: src/include/iscsi-lio-server/widgets.rb:1463
 msgid ""
-"There isn't any client specified.\n"
-"To allow a client login to the target, please\n"
+"There isn't any initiator specified.\n"
+"To allow an initiator login to the target, please\n"
 "use the 'Add' button and enter the name\n"
 "(see /etc/iscsi/initiatorname.iscsi on initiator).\n"
-"Really want to continue without client access?"
+"Really want to continue without initiator access?"
 msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:1464
-msgid "Problem removing lun %4 for client %3 in %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1477
+#, fuzzy
+#| msgid "Problem removing lun %4 for client %3 in %1:%2"
+msgid "Problem removing LUN %4 for initiator %3 in %1:%2"
 msgstr "Problem med å fjerne LUN %4 for klienten %3 i %1:%2"
 
-#: src/include/iscsi-lio-server/widgets.rb:1479
-msgid "Problem adding lun %4:%5 for client %3 in %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1492
+#, fuzzy
+#| msgid "Problem adding lun %4:%5 for client %3 in %1:%2"
+msgid "Problem adding LUN %4:%5 for initiator %3 in %1:%2"
 msgstr "Problem med å legge til lun %4:%5 for klienten %3 i %1:%2"
 
-#: src/include/iscsi-lio-server/widgets.rb:1500
-msgid "Problem removing client %3 from %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1513
+#, fuzzy
+#| msgid "Problem removing client %3 from %1:%2"
+msgid "Problem removing initiator %3 from %1:%2"
 msgstr "Problem med å fjerne klienten %3 fra %1:%2"
 
-#: src/include/iscsi-lio-server/widgets.rb:1524
-msgid "Problem creating client %3 for %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1537
+#, fuzzy
+#| msgid "Problem creating client %3 for %1:%2"
+msgid "Problem creating initiator %3 for %1:%2"
 msgstr "Problem med å opprette klienten %3 for %1:%2"
 
-#: src/include/iscsi-lio-server/widgets.rb:1559
-msgid "Problem changing auth for client %3 in %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1572
+#, fuzzy
+#| msgid "Problem changing auth for client %3 in %1:%2"
+msgid "Problem changing auth for initiator %3 in %1:%2"
 msgstr "Problem med å endre autorisasjone for klienten %3 i %1:%2"
 
 #. Initialization dialog caption
@@ -703,11 +741,11 @@
 msgstr "Initialiserer ..."
 
 #. scope link IPv6
-#: src/modules/IscsiLioData.rb:1424
+#: src/modules/IscsiLioData.rb:1428
 msgid "Cannot save lio setup"
 msgstr ""
 
-#: src/modules/IscsiLioData.rb:1428
+#: src/modules/IscsiLioData.rb:1432
 msgid "Cannot save tcm setup"
 msgstr ""
 
@@ -812,6 +850,20 @@
 msgid "Configuration summary..."
 msgstr "Konfigurasjonssammendrag..."
 
+#~ msgid "Client"
+#~ msgstr "Klient"
+
+#~ msgid "Modify iSCSI Target Client Setup"
+#~ msgstr "Endre  klientoppsett for iSCSI-mål"
+
+#~ msgid "Client Lun"
+#~ msgstr "Klient-LUN"
+
+#, fuzzy
+#~| msgid "New client name:"
+#~ msgid "Client name:"
+#~ msgstr "Nytt klientnavn:"
+
 #~ msgid "Run SuSEconfig"
 #~ msgstr "Kjør SuSEconfig"
 

Added: trunk/yast/nb/po/journalctl.nb.po
===================================================================
--- trunk/yast/nb/po/journalctl.nb.po	                        (rev 0)
+++ trunk/yast/nb/po/journalctl.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -0,0 +1,126 @@
+# Norwegian Bokmal translations for opensuse-i package.
+# Copyright (C) 2016 SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the opensuse-i package.
+# Automatically generated, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: opensuse-i 18n\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
+"PO-Revision-Date: 2016-08-04 14:55+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: nb\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"
+
+#. Header
+#: src/lib/journalctl/entries_dialog.rb:62
+msgid "Journal entries"
+msgstr ""
+
+#. Filters
+#: src/lib/journalctl/entries_dialog.rb:67
+msgid "Displaying entries with the following text"
+msgstr ""
+
+#. Footer buttons
+#: src/lib/journalctl/entries_dialog.rb:81
+msgid "Change filter..."
+msgstr ""
+
+#: src/lib/journalctl/entries_dialog.rb:83
+msgid "Refresh"
+msgstr ""
+
+#. Header
+#: src/lib/journalctl/query_dialog.rb:85
+msgid "Entries to display"
+msgstr ""
+
+#. Boot selector
+#: src/lib/journalctl/query_dialog.rb:89
+msgid "Log entries for"
+msgstr ""
+
+#. Filter checkboxes
+#: src/lib/journalctl/query_dialog.rb:96
+msgid "Filters"
+msgstr ""
+
+#. User readable description of the current filters
+#: src/lib/journalctl/query_presenter.rb:60
+msgid "from previous boot"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:62
+msgid "since system's boot"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:66
+msgid "unit (%s)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:67
+msgid "file (%s)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:68
+msgid "priority (%s)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:79
+msgid "with no additional conditions"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:81
+msgid "filtering by %s"
+msgstr ""
+
+#. Possible options for the :boot filter to be used in forms
+#.
+#. @return [Array<Hash>] each option is represented by a hash with two keys
+#. :value and :label
+#: src/lib/journalctl/query_presenter.rb:93
+msgid "Since system's boot"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:94
+msgid "From previous boot"
+msgstr ""
+
+#. Possible filters (in addition to :boot) to be used in forms
+#.
+#. @return [Array<Hash>] for each filter there are 3 possible keys
+#. * :name name of the filter
+#. * :label label for the widget used to set the filter
+#. * :values optional list of valid values
+#: src/lib/journalctl/query_presenter.rb:108
+msgid "For this systemd unit"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:112
+msgid "For this file (executable or device)"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:116
+msgid "With at least this priority"
+msgstr ""
+
+#. Fields to display for listing the entries
+#.
+#. @return [Array<Hash>] for each column a :label and a :method is provided
+#: src/lib/journalctl/query_presenter.rb:128
+msgid "Time"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:129
+msgid "Source"
+msgstr ""
+
+#: src/lib/journalctl/query_presenter.rb:130
+msgid "Message"
+msgstr ""

Modified: trunk/yast/nb/po/kdump.nb.po
===================================================================
--- trunk/yast/nb/po/kdump.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/kdump.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: kdump\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2009-08-12 10:04+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -380,10 +380,8 @@
 
 #. Force value to false, so it's actually rewritten
 #. TRANSLATORS: CommandLine printed text
-#. start kdump at boot
 #. delete crashkernel parameter from bootloader
-#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:487
-#: src/modules/Kdump.rb:500
+#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:501
 msgid "To apply changes a reboot is necessary."
 msgstr "Maskinen må startes på nytt for å aktivere endringer."
 
@@ -1242,154 +1240,169 @@
 #. several ranges and ask user about rewritting
 #.
 #. "KdumpMemory"
-#: src/include/kdump/uifunctions.rb:1449
+#: src/include/kdump/uifunctions.rb:1454
 #, fuzzy
 #| msgid "Kernel option includes several ranges. Rewrite it?"
 msgid "Kernel option includes several ranges or redundant values. Rewrite it?"
 msgstr "Kjernevalget inkluderer flere områder. Vil du lagre på nytt?"
 
 #. T: Checkbox label
-#: src/include/kdump/uifunctions.rb:1482
+#: src/include/kdump/uifunctions.rb:1487
 msgid "Use &Firmware-Assisted Dump"
 msgstr ""
 
+#. Function validates options in
+#. "Dump Format"
+#. install makedumpfile if KDUMP_DUMPFORMAT == "compressed"
+#: src/include/kdump/uifunctions.rb:1849
+msgid ""
+"Kdump is not supported on this system.\n"
+"If you continue now, the module may not function properly.\n"
+"For example, some settings will not be correctly read\n"
+"and the resulting configuration will probably be useless.\n"
+msgstr ""
+
+#: src/include/kdump/uifunctions.rb:1855
+msgid "Kdump not supported"
+msgstr ""
+
 #. See FATE#315780
 #. See https://www.suse.com/support/kb/doc.php?id=7012786
 #. FIXME what about dracut?
-#: src/modules/Kdump.rb:412
+#: src/modules/Kdump.rb:398
 msgid ""
 "Error updating initrd while calling '%{cmd}'.\n"
 "See %{log} for details."
 msgstr ""
 
 #. Kdump read dialog caption
-#: src/modules/Kdump.rb:514
+#: src/modules/Kdump.rb:511
 msgid "Initializing kdump Configuration"
 msgstr "Initialiserer kdump-oppsett"
 
 #. Progress stage 1/4
 #. Progress step 1/4
-#: src/modules/Kdump.rb:523 src/modules/Kdump.rb:531
+#: src/modules/Kdump.rb:520 src/modules/Kdump.rb:528
 msgid "Reading the config file..."
 msgstr "Leser oppsettsfil..."
 
 #. Progress stage 3/4
-#: src/modules/Kdump.rb:525
+#: src/modules/Kdump.rb:522
 msgid "Reading kernel boot options..."
 msgstr "Leser oppstartsvalg for kjernen..."
 
 #. Progress stage 4/4
-#: src/modules/Kdump.rb:527
+#: src/modules/Kdump.rb:524
 msgid "Calculating memory limits..."
 msgstr ""
 
 #. Progress step 2/4
-#: src/modules/Kdump.rb:533
+#: src/modules/Kdump.rb:530
 msgid "Reading partitions of disks..."
 msgstr "Leser diskenes partisjoner..."
 
 #. Progress finished 3/4
-#: src/modules/Kdump.rb:535
+#: src/modules/Kdump.rb:532
 #, fuzzy
 #| msgid "Reading available memory..."
 msgid "Reading available memory and calibrating usage..."
 msgstr "Leser tilgjengelig minne..."
 
 #. Error message
-#: src/modules/Kdump.rb:547
+#: src/modules/Kdump.rb:544
 msgid "Cannot read config file /etc/sysconfig/kdump"
 msgstr "Kan ikke lese oppsettsfilen /etc/sysconfig/kdump"
 
 #. Error message
-#: src/modules/Kdump.rb:555
+#: src/modules/Kdump.rb:552
 msgid "Cannot read kernel boot options."
 msgstr "Kan ikke lese oppstartsvalg for kjerne."
 
 #. Error message
-#: src/modules/Kdump.rb:563
+#: src/modules/Kdump.rb:560
 msgid "Cannot read available memory."
 msgstr "Kan ikke lese tilgjengelig minne."
 
 #. Kdump read dialog caption
-#: src/modules/Kdump.rb:589
+#: src/modules/Kdump.rb:586
 msgid "Saving kdump Configuration"
 msgstr "Lagrer kdump-oppsett"
 
 #. Progress stage 1/2
-#: src/modules/Kdump.rb:618
+#: src/modules/Kdump.rb:615
 msgid "Write the settings"
 msgstr "Lagre innstillingene"
 
 #. Progress stage 2/2
-#: src/modules/Kdump.rb:620
+#: src/modules/Kdump.rb:617
 msgid "Update boot options"
 msgstr "Oppdater oppstartsvalg"
 
 #. Progress step 1/2
-#: src/modules/Kdump.rb:624
+#: src/modules/Kdump.rb:621
 msgid "Writing the settings..."
 msgstr "Lagrer innstillingene..."
 
 #. Progress step 2/2
-#: src/modules/Kdump.rb:626
+#: src/modules/Kdump.rb:623
 msgid "Updating boot options..."
 msgstr "Oppdaterer oppstartsvalg..."
 
 #. Progress finished
-#: src/modules/Kdump.rb:628
+#: src/modules/Kdump.rb:625
 msgid "Finished"
 msgstr "Fullført"
 
 #. Error message
-#: src/modules/Kdump.rb:638
+#: src/modules/Kdump.rb:635
 msgid "Cannot write settings."
 msgstr "Kan ikke lagre innstillingene."
 
 #. Error message
-#: src/modules/Kdump.rb:647
+#: src/modules/Kdump.rb:644
 msgid "Adding crashkernel parameter to bootloader fault."
 msgstr "Legger til crashkernel-parameter for oppstartslasterfeil."
 
 #. Create a textual summary
 #. @return summary of the current configuration
-#: src/modules/Kdump.rb:758
+#: src/modules/Kdump.rb:764
 msgid "Kdump status: %1"
 msgstr "Kdump-status: %1"
 
-#: src/modules/Kdump.rb:759
+#: src/modules/Kdump.rb:765
 msgid "enabled"
 msgstr "aktivert"
 
-#: src/modules/Kdump.rb:759
+#: src/modules/Kdump.rb:765
 msgid "disabled"
 msgstr "deaktivert"
 
-#: src/modules/Kdump.rb:766
+#: src/modules/Kdump.rb:772
 #, fuzzy
 #| msgid "Value of crashkernel option: %1"
 msgid "Value(s) of crashkernel option: %1"
 msgstr "Verdi for crashkernel-valg: %1"
 
-#: src/modules/Kdump.rb:773
+#: src/modules/Kdump.rb:779
 msgid "Dump format: %1"
 msgstr "Dump-format: %1"
 
-#: src/modules/Kdump.rb:780
+#: src/modules/Kdump.rb:786
 msgid "Target of dumps: %1"
 msgstr "Dump-mål: %1"
 
-#: src/modules/Kdump.rb:787
+#: src/modules/Kdump.rb:793
 msgid "Number of dumps: %1"
 msgstr "Antall dumper: %1"
 
 #. TRANSLATORS: warning message in installation proposal,
 #. do not translate %{requested} and %{available} - they are replaced with actual sizes later
-#: src/modules/Kdump.rb:879
+#: src/modules/Kdump.rb:885
 msgid "Warning! There might not be enough free space. %{required} required, but only %{available} are available."
 msgstr ""
 
 #. Trying to use fadump on unsupported hardware
-#: src/modules/Kdump.rb:974
+#: src/modules/Kdump.rb:972
 msgid ""
 "Cannot use Firmware-assisted dump.\n"
 "It is not supported on this hardware."

Modified: trunk/yast/nb/po/live-installer.nb.po
===================================================================
--- trunk/yast/nb/po/live-installer.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/live-installer.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: live-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2009-10-01 12:31+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -43,27 +43,27 @@
 #.
 #. Progress::NextStage ();
 #. Progress::Title (_("Evaluating filesystems to copy..."));
-#: src/clients/inst_live_doit.rb:57 src/clients/inst_live_doit.rb:58
+#: src/clients/inst_live_doit.rb:58 src/clients/inst_live_doit.rb:59
 msgid "Evaluating filesystems to copy..."
 msgstr "Evaulerer filsystemer som skal kopieres..."
 
-#: src/clients/inst_live_doit.rb:60 src/clients/inst_live_doit.rb:61
+#: src/clients/inst_live_doit.rb:61 src/clients/inst_live_doit.rb:62
 msgid "Copying root filesystem..."
 msgstr "Kopierer rotfilsystem..."
 
-#: src/clients/inst_live_doit.rb:62
+#: src/clients/inst_live_doit.rb:63
 msgid "Copying live image..."
 msgstr "Kopierer live-diskbilde..."
 
 #. Copy all the symlinks as needed
 #. @param [Hash{String => String}] symlinks a map of resolved symlinks
 #. @return [Boolean] true on success
-#: src/clients/inst_live_doit.rb:152 src/clients/inst_live_doit.rb:154
+#: src/clients/inst_live_doit.rb:149 src/clients/inst_live_doit.rb:151
 msgid "Copying %1..."
 msgstr "Kopierer %1..."
 
 #. need to set some lower limit - roughly estimated maximum size of the last file which could have failed
-#: src/clients/inst_live_doit.rb:222
+#: src/clients/inst_live_doit.rb:226
 msgid ""
 "Copying the live image to hard disk failed.\n"
 "\n"
@@ -78,71 +78,53 @@
 "av live-systemet."
 
 #. generic error report
-#: src/clients/inst_live_doit.rb:250
+#: src/clients/inst_live_doit.rb:254
 msgid "Copying the live image to hard disk failed."
 msgstr "Kopiering av Live-diskbilde til harddisk mislyktes."
 
 #. dialog caption
-#: src/clients/inst_live_simple_proposal.rb:45
-#: src/clients/inst_live_simple_proposal.rb:211
+#: src/clients/inst_live_simple_proposal.rb:44
+#: src/clients/inst_live_simple_proposal.rb:179
 msgid "Installation Settings"
 msgstr "Installasjonsinnstillinger"
 
 #. label
-#: src/clients/inst_live_simple_proposal.rb:47
+#: src/clients/inst_live_simple_proposal.rb:46
 msgid "Analyzing the system..."
 msgstr "Analyserer systemet..."
 
 #. partitioning summary
-#: src/clients/inst_live_simple_proposal.rb:111
+#: src/clients/inst_live_simple_proposal.rb:110
 msgid "Use %1%% of disk %2 for Linux"
 msgstr "Bruk %1%% av disken %2 for Linux"
 
-#: src/clients/inst_live_simple_proposal.rb:120
+#: src/clients/inst_live_simple_proposal.rb:119
 msgid "Do not use disk %1"
 msgstr "Ikke bruk disken %1"
 
-#: src/clients/inst_live_simple_proposal.rb:127
+#: src/clients/inst_live_simple_proposal.rb:126
 msgid "Partitioning"
 msgstr "Partisjonering"
 
 #. end of partitioning summary
-#. bootloader summary
-#: src/clients/inst_live_simple_proposal.rb:143
-msgid "System start-up"
-msgstr "Oppstart av systemet"
-
-#: src/clients/inst_live_simple_proposal.rb:149
-msgid "Ask whether to boot Linux or existing system"
-msgstr "Spør om Linux eller det eksisterende systemet skal startes opp"
-
-#: src/clients/inst_live_simple_proposal.rb:150
-msgid "Boot only Linux"
-msgstr "Start bare opp Linux"
-
-#: src/clients/inst_live_simple_proposal.rb:158
-msgid "System start time-out: %1 seconds"
-msgstr "Tidsavbrudd for systemoppstart: %1 sekunder"
-
-#. end of bootloader summary
 #. keyboard entry
-#: src/clients/inst_live_simple_proposal.rb:167
+#: src/clients/inst_live_simple_proposal.rb:135
 msgid "Keyboard"
 msgstr "Tastatur"
 
 #. end of keyboard entry
 #. timezone entry
-#: src/clients/inst_live_simple_proposal.rb:177
+#: src/clients/inst_live_simple_proposal.rb:145
 msgid "Time Zone"
 msgstr "Tidssone"
 
 #. end of timezone entry
-#: src/clients/inst_live_simple_proposal.rb:187
+#: src/clients/inst_live_simple_proposal.rb:155
 msgid "Change Installation Settings"
 msgstr "Endre installasjonsinnstillinger"
 
 #. help text 1/3
-#: src/clients/inst_live_simple_proposal.rb:192
+#: src/clients/inst_live_simple_proposal.rb:160
 msgid ""
 "<p>\n"
 "Use <b>Accept</b> to perform a new installation with the values displayed.</p>"
@@ -151,7 +133,7 @@
 "Velg <b>Bekreft</b> for å utføre en ny installasjon med disse verdiene.</p>"
 
 #. help text 2/3
-#: src/clients/inst_live_simple_proposal.rb:196
+#: src/clients/inst_live_simple_proposal.rb:164
 msgid ""
 "<p>\n"
 "To change the values, click the respective headline\n"
@@ -162,7 +144,7 @@
 "eller på <b>Endre installasjonsinnstillinger.</b></p>\n"
 
 #. help text 3/3
-#: src/clients/inst_live_simple_proposal.rb:202
+#: src/clients/inst_live_simple_proposal.rb:170
 msgid ""
 "<p>\n"
 "Your hard disk has not been modified, you can still safely abort.\n"
@@ -277,7 +259,7 @@
 "nytt med 'Reset'-knappen."
 
 #. progress step title
-#: src/clients/live_copy_files_finish.rb:76
+#: src/clients/live_copy_files_finish.rb:75
 msgid "Copying files to installed system..."
 msgstr "Kopierer filer til installert system..."
 
@@ -301,6 +283,18 @@
 msgid "Saving time zone..."
 msgstr "Lagrer tidssone..."
 
+#~ msgid "System start-up"
+#~ msgstr "Oppstart av systemet"
+
+#~ msgid "Ask whether to boot Linux or existing system"
+#~ msgstr "Spør om Linux eller det eksisterende systemet skal startes opp"
+
+#~ msgid "Boot only Linux"
+#~ msgstr "Start bare opp Linux"
+
+#~ msgid "System start time-out: %1 seconds"
+#~ msgstr "Tidsavbrudd for systemoppstart: %1 sekunder"
+
 #~ msgid "Installation settings"
 #~ msgstr "Installasjonsinnstillinger"
 

Modified: trunk/yast/nb/po/mail.nb.po
===================================================================
--- trunk/yast/nb/po/mail.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/mail.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: mail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2009-10-08 12:48+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -314,73 +314,80 @@
 
 #. Translators: dialog caption
 #. frame label
-#: src/include/mail/ui.rb:394 src/include/mail/ui.rb:419
+#: src/include/mail/ui.rb:394 src/include/mail/ui.rb:421
 msgid "Outgoing Mail"
 msgstr "Utgående e-post"
 
+#. OUTGOING NOMX
+#: src/include/mail/ui.rb:400
+#, fuzzy
+#| msgid "You cannot define local domains for the mail server."
+msgid "Do not make MX lookup for the outgoing mail server."
+msgstr "Du kan ikke definere lokale domener for e-postserveren."
+
 #. TLS
-#: src/include/mail/ui.rb:400
+#: src/include/mail/ui.rb:402
 msgid "TLS encryption"
 msgstr ""
 
-#: src/include/mail/ui.rb:404 src/modules/Mail.rb:1353
-#: src/modules/Mail.rb:1356 src/modules/Mail.rb:1359
+#: src/include/mail/ui.rb:406 src/modules/Mail.rb:1335 src/modules/Mail.rb:1338
+#: src/modules/Mail.rb:1341
 msgid "No"
 msgstr "Nei"
 
-#: src/include/mail/ui.rb:405
+#: src/include/mail/ui.rb:407
 msgid "Use"
 msgstr "Bruk"
 
-#: src/include/mail/ui.rb:406
+#: src/include/mail/ui.rb:408
 msgid "Enforce"
 msgstr "Bruk alltid"
 
-#: src/include/mail/ui.rb:410
+#: src/include/mail/ui.rb:412
 msgid "&Masquerading"
 msgstr "&Maskering"
 
-#: src/include/mail/ui.rb:411
+#: src/include/mail/ui.rb:413
 msgid "&Authentication"
 msgstr "&Autentisering"
 
 #. Translators: dialog caption
-#: src/include/mail/ui.rb:476
+#: src/include/mail/ui.rb:479
 msgid "Incoming Mail"
 msgstr "Innkommende e-post"
 
 #. pushbutton
-#: src/include/mail/ui.rb:516
+#: src/include/mail/ui.rb:519
 msgid "&Details..."
 msgstr "&Detaljer..."
 
-#: src/include/mail/ui.rb:522
+#: src/include/mail/ui.rb:525
 msgid "Start &fetchmail"
 msgstr "Start &fetchmail"
 
-#: src/include/mail/ui.rb:523
+#: src/include/mail/ui.rb:526
 #, fuzzy
 #| msgid "[manually set]"
 msgid "manual"
 msgstr "[manuelt angitt]"
 
-#: src/include/mail/ui.rb:523
+#: src/include/mail/ui.rb:526
 #, fuzzy
 #| msgid "FTP daemon"
 msgid "daemon"
 msgstr "FTP-nisse"
 
 #. frame label: mail downloading (fetchmail)
-#: src/include/mail/ui.rb:529
+#: src/include/mail/ui.rb:532
 msgid "&Downloading"
 msgstr "&Nedlasting"
 
 #. menu button: details of incoming mail
-#: src/include/mail/ui.rb:548
+#: src/include/mail/ui.rb:551
 msgid "&Aliases..."
 msgstr "&Aliaser..."
 
-#: src/include/mail/ui.rb:549
+#: src/include/mail/ui.rb:552
 msgid "&Virtual domains..."
 msgstr "&Virtuelle domener..."
 
@@ -388,7 +395,7 @@
 #. %1: variable name (eg. POSTFIX_LOCALDOMAINS)
 #. %2: file name (eg. /etc/sysconfig/postfix)
 #. %3: value (about 50 characters)
-#: src/include/mail/ui.rb:629
+#: src/include/mail/ui.rb:632
 msgid ""
 "To be able to deliver mail to your local MTA,\n"
 "the value of %1 in %2 will be set to\n"
@@ -402,7 +409,7 @@
 #. correct and complete.  The login name may contain only
 #. certain characters and must begin with a letter.
 #. Already in Translation Memory
-#: src/include/mail/ui.rb:670
+#: src/include/mail/ui.rb:673
 msgid ""
 "The user login may contain only\n"
 "lower case letters, digits, \"-\" and \"_\"\n"
@@ -415,39 +422,39 @@
 "Prøv igjen.\n"
 
 #. Translators: popup dialog heading
-#: src/include/mail/ui.rb:709
+#: src/include/mail/ui.rb:712
 msgid "Sender address rewriting"
 msgstr "Omskriving av avsenderadresse"
 
 #. Translators: text entry label
 #. Translators: combo box label
-#: src/include/mail/ui.rb:712 src/include/mail/ui.rb:717
+#: src/include/mail/ui.rb:715 src/include/mail/ui.rb:720
 #: src/include/mail/widgets.rb:269
 msgid "&Local user"
 msgstr "&Lokal bruker"
 
 #. Translators: text entry label
-#: src/include/mail/ui.rb:722
+#: src/include/mail/ui.rb:725
 msgid "&Display as"
 msgstr "&Vis som"
 
 #. Translators: error message
-#: src/include/mail/ui.rb:754
+#: src/include/mail/ui.rb:757
 msgid "The address for this user is already defined."
 msgstr "Denne brukerens adresse er allerede definert."
 
 #. error popup
-#: src/include/mail/ui.rb:760
+#: src/include/mail/ui.rb:763
 msgid "The mail address format is incorrect."
 msgstr "E-postadressen har feil format."
 
 #. Translators: dialog caption
-#: src/include/mail/ui.rb:785
+#: src/include/mail/ui.rb:788
 msgid "Masquerading"
 msgstr "Maskering"
 
 #. Translators: radio button label
-#: src/include/mail/ui.rb:800
+#: src/include/mail/ui.rb:803
 msgid "Masquerade &local domains"
 msgstr "Masker &lokale domener"
 
@@ -457,23 +464,23 @@
 #. //			`Left (`Label (`opt (`outputField, `hstretch), ld))
 #. ),
 #. Translators: radio button label
-#: src/include/mail/ui.rb:813
+#: src/include/mail/ui.rb:816
 msgid "Ma&squerade other domains"
 msgstr "Ma&sker andre domener"
 
 #. Translators: text entry label
-#: src/include/mail/ui.rb:823
+#: src/include/mail/ui.rb:826
 msgid "Do&mains to masquerade"
 msgstr "Do&mener som skal maskeres"
 
 #. Translators: table column headings
 #. Translators: table column headings
-#: src/include/mail/ui.rb:835 src/include/mail/ui.rb:1153
+#: src/include/mail/ui.rb:838 src/include/mail/ui.rb:1156
 msgid "Local user"
 msgstr "Lokal bruker"
 
 #. Translators: table column headings
-#: src/include/mail/ui.rb:837
+#: src/include/mail/ui.rb:840
 msgid "Display as"
 msgstr "Vis som"
 
@@ -482,23 +489,23 @@
 #. ["holly", "jane", "tarzan"])),
 #. `HWeight (2, `TextEntry (`id (`address), _("Display as"), "holly@red.dwarf"))
 #. ),
-#: src/include/mail/ui.rb:847 src/include/mail/ui.rb:1158
-#: src/include/mail/ui.rb:1314 src/include/mail/ui.rb:1397
+#: src/include/mail/ui.rb:850 src/include/mail/ui.rb:1161
+#: src/include/mail/ui.rb:1317 src/include/mail/ui.rb:1400
 msgid "A&dd"
 msgstr "&Legg til"
 
-#: src/include/mail/ui.rb:848 src/include/mail/ui.rb:1159
-#: src/include/mail/ui.rb:1315 src/include/mail/ui.rb:1398
+#: src/include/mail/ui.rb:851 src/include/mail/ui.rb:1162
+#: src/include/mail/ui.rb:1318 src/include/mail/ui.rb:1401
 msgid "&Edit"
 msgstr "&Rediger"
 
-#: src/include/mail/ui.rb:849
+#: src/include/mail/ui.rb:852
 msgid "Dele&te"
 msgstr "S&lett"
 
 #. Translators: error popup
 #. Already in Translation Memory
-#: src/include/mail/ui.rb:916
+#: src/include/mail/ui.rb:919
 msgid "The domain name is incorrect"
 msgstr "Domenenavnet er feil"
 
@@ -506,106 +513,106 @@
 #. list<string> lmod = [];
 #. list<map> mu = Mail::masquerade_users;
 #. Translators: dialog caption
-#: src/include/mail/ui.rb:952
+#: src/include/mail/ui.rb:955
 msgid "Outgoing Server Authentication"
 msgstr "Utgående serverautentisering"
 
 #. text entry
-#: src/include/mail/ui.rb:960
+#: src/include/mail/ui.rb:963
 msgid "Outgoing &Server"
 msgstr "Utgående &server"
 
 #. text entry
-#: src/include/mail/ui.rb:962
+#: src/include/mail/ui.rb:965
 msgid "&User name"
 msgstr "&Brukernavn"
 
 #. password entry
-#: src/include/mail/ui.rb:964
+#: src/include/mail/ui.rb:967
 msgid "&Password"
 msgstr "&Passord"
 
 #. Translators: popup dialog heading
 #. Translators: dialog caption
-#: src/include/mail/ui.rb:1068 src/include/mail/ui.rb:1119
+#: src/include/mail/ui.rb:1071 src/include/mail/ui.rb:1122
 msgid "Mail downloading"
 msgstr "Nedlasting av e-post"
 
 #. Translators: table column headings
-#: src/include/mail/ui.rb:1147
+#: src/include/mail/ui.rb:1150
 msgid "Server"
 msgstr "Server"
 
 #. Translators: table column headings
-#: src/include/mail/ui.rb:1149
+#: src/include/mail/ui.rb:1152
 msgid "Protocol"
 msgstr "Protokoll"
 
 #. Translators: table column headings
-#: src/include/mail/ui.rb:1151
+#: src/include/mail/ui.rb:1154
 msgid "User"
 msgstr "Bruker"
 
-#: src/include/mail/ui.rb:1160 src/include/mail/ui.rb:1316
-#: src/include/mail/ui.rb:1399
+#: src/include/mail/ui.rb:1163 src/include/mail/ui.rb:1319
+#: src/include/mail/ui.rb:1402
 msgid "De&lete"
 msgstr "&Slett"
 
 #. Translators: popup dialog heading
-#: src/include/mail/ui.rb:1232
+#: src/include/mail/ui.rb:1235
 msgid "Incoming mail redirection"
 msgstr "Omadressering av innkommende e-post"
 
 #. Translators: text entry label
-#: src/include/mail/ui.rb:1234
+#: src/include/mail/ui.rb:1237
 msgid "&Alias"
 msgstr "&Alias"
 
 #. Translators: text entry label
-#: src/include/mail/ui.rb:1236
+#: src/include/mail/ui.rb:1239
 msgid "&Destinations"
 msgstr "&Bestemmelsessteder"
 
 #. Translators: error message
-#: src/include/mail/ui.rb:1269
+#: src/include/mail/ui.rb:1272
 msgid "The alias format is incorrect."
 msgstr "Alias er feilformatert."
 
 #. Translators: error message
-#: src/include/mail/ui.rb:1274
+#: src/include/mail/ui.rb:1277
 msgid "The destinations for this alias are already defined."
 msgstr "Bestemmelsesstedene for dette aliaset er allerede definert."
 
 #. Translators: dialog caption
 #. summary item
-#: src/include/mail/ui.rb:1298 src/modules/Mail.rb:1366
+#: src/include/mail/ui.rb:1301 src/modules/Mail.rb:1348
 msgid "Aliases"
 msgstr "Aliaser"
 
 #. Translators: table column headings
 #. Translators: table column headings
-#: src/include/mail/ui.rb:1306 src/include/mail/ui.rb:1389
+#: src/include/mail/ui.rb:1309 src/include/mail/ui.rb:1392
 msgid "Alias"
 msgstr "Alias"
 
 #. Translators: table column headings
 #. Translators: table column headings
-#: src/include/mail/ui.rb:1308 src/include/mail/ui.rb:1391
+#: src/include/mail/ui.rb:1311 src/include/mail/ui.rb:1394
 msgid "Destinations"
 msgstr "Bestemmelsessteder"
 
 #. Translators: dialog caption
-#: src/include/mail/ui.rb:1381
+#: src/include/mail/ui.rb:1384
 msgid "Virtual domains"
 msgstr "Virtuelle domener"
 
 #. Translators: dialog caption
-#: src/include/mail/ui.rb:1499
+#: src/include/mail/ui.rb:1502
 msgid "Mail configuration"
 msgstr "E-postkonfigurasjon"
 
 #. label
-#: src/include/mail/ui.rb:1501
+#: src/include/mail/ui.rb:1504
 msgid "Initializing..."
 msgstr "Initialiserer ..."
 
@@ -891,12 +898,12 @@
 msgstr "Til Cyrus IMAP-server"
 
 #. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:214
+#: src/modules/Mail.rb:216
 msgid "AMaViS, a virus scanner, will be installed.\n"
 msgstr "Antivirusprogrammet AMaViS vil bli installert.\n"
 
 #. error popup.
-#: src/modules/Mail.rb:228
+#: src/modules/Mail.rb:230
 msgid ""
 "AMaViS needs a virus scanner such as ClamAV\n"
 "to do the actual scanning, but ClamAV was not found.\n"
@@ -907,58 +914,58 @@
 "Vil du konfigurere en skanner manuelt."
 
 #. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:247
+#: src/modules/Mail.rb:249
 msgid "Fetchmail, a mail downloading utility, will be installed.\n"
 msgstr "Fetchmail, et nedlastingsverktøy for e-post, vil bli installert.\n"
 
 #. Translators: popup message part, ends with a newline
-#: src/modules/Mail.rb:256
+#: src/modules/Mail.rb:258
 #, fuzzy
 #| msgid "Cyrus-imapd, an IMAP server, will be installed.\n"
 msgid "Dovecot IMAP server, will be installed.\n"
 msgstr "Cyrus-imapd, en IMAP-server, vil bli installert.\n"
 
 #. Translators: dialog caption
-#: src/modules/Mail.rb:300
+#: src/modules/Mail.rb:302
 msgid "Initializing mail configuration"
 msgstr "Initialiserer e-postkonfigurasjon"
 
 #. Translators: progress label
 #. do not translate MTA
-#: src/modules/Mail.rb:309
+#: src/modules/Mail.rb:311
 msgid "Determining Mail Transport Agent (MTA)"
 msgstr "Bestemmer MTA (e-postsystem)"
 
 #. Translators: progress label
-#: src/modules/Mail.rb:311
+#: src/modules/Mail.rb:313
 msgid "Reading general settings"
 msgstr "Leser generelle innstillinger"
 
 #. Translators: progress label
-#: src/modules/Mail.rb:313
+#: src/modules/Mail.rb:315
 msgid "Reading masquerading settings"
 msgstr "Leser maskeringsinnstillinger"
 
 #. Translators: progress label
-#: src/modules/Mail.rb:315
+#: src/modules/Mail.rb:317
 msgid "Reading downloading settings"
 msgstr "Leser nedlastingsinnstillinger"
 
 #. Translators: progress label
-#: src/modules/Mail.rb:317
+#: src/modules/Mail.rb:319
 msgid "Reading alias tables"
 msgstr "Leser aliastabeller"
 
 #. Translators: progress label
 #. smtp-auth
-#: src/modules/Mail.rb:320
+#: src/modules/Mail.rb:322
 msgid "Reading authentication settings..."
 msgstr "Leser innstillinger for autentisering..."
 
 #. Translators: error message,
 #. %1 is a file name,
 #. %2 is a long file name - leave it on a separate line
-#: src/modules/Mail.rb:491
+#: src/modules/Mail.rb:496
 msgid ""
 "Error reading file %1. The file must have\n"
 "a fixed format to be readable by YaST.  For details, see\n"
@@ -969,161 +976,161 @@
 "%2"
 
 #. Translators: error message
-#: src/modules/Mail.rb:841
+#: src/modules/Mail.rb:823
 msgid "Error writing the fetchmail configuration."
 msgstr "Feil under lagring av fetchmail-konfigurasjon."
 
 #. Translators: error message
 #. Translators: error message
-#: src/modules/Mail.rb:933 src/modules/Mail.rb:942
+#: src/modules/Mail.rb:915 src/modules/Mail.rb:924
 msgid "Error writing file %1"
 msgstr "Feil under lagring av filen %1"
 
 #. Translators: error message
-#: src/modules/Mail.rb:963
+#: src/modules/Mail.rb:945
 msgid "Error running config.postfix"
 msgstr "Feil under kjøring av av config.postfix."
 
 #. Translators: error message
 #. Translators: error message
 #. Translators: error message
-#: src/modules/Mail.rb:978 src/modules/Mail.rb:996 src/modules/Mail.rb:1013
+#: src/modules/Mail.rb:960 src/modules/Mail.rb:978 src/modules/Mail.rb:995
 msgid "Error starting service %1."
 msgstr "Feil under aktivering av tjenesten %1."
 
 #. Translators: progress label
-#: src/modules/Mail.rb:1032
+#: src/modules/Mail.rb:1014
 msgid "Writing general settings"
 msgstr "Lagrer generelle innstillinger"
 
 #. Translators: progress label
-#: src/modules/Mail.rb:1041
+#: src/modules/Mail.rb:1023
 msgid "Writing masquerading settings"
 msgstr "Lagrer maskeringsinnstillinger"
 
 #. Translators: progress label
-#: src/modules/Mail.rb:1049
+#: src/modules/Mail.rb:1031
 msgid "Writing alias tables"
 msgstr "Lagrer aliastabeller"
 
 #. Write them unconditionally, because it is now possible to
 #. enter them also in the Permanent mode. Bug #17417.
 #. Translators: progress label
-#: src/modules/Mail.rb:1061
+#: src/modules/Mail.rb:1043
 msgid "Writing downloading settings"
 msgstr "Lagrer nedlastingsinnstillinger"
 
 #. Translators: progress label
-#: src/modules/Mail.rb:1071
+#: src/modules/Mail.rb:1053
 msgid "Writing authentication settings..."
 msgstr "Lagrer innstillinger for autentisering..."
 
 #. Translators: progress label
-#: src/modules/Mail.rb:1080
+#: src/modules/Mail.rb:1062
 msgid "Finishing writing configuration files"
 msgstr "Fullfører lagring av konfigurasjonsfiler"
 
 #. Translators: progress label
-#: src/modules/Mail.rb:1088
+#: src/modules/Mail.rb:1070
 msgid "Running Config Postfix"
 msgstr "Kjører config.postfix"
 
 #. Translators: progress label
-#: src/modules/Mail.rb:1098
+#: src/modules/Mail.rb:1080
 msgid "Restarting services"
 msgstr "Starter tjenester på nytt"
 
 #. Translators: dialog caption
-#: src/modules/Mail.rb:1105
+#: src/modules/Mail.rb:1087
 msgid "Saving mail configuration"
 msgstr "Lagrer e-postkonfigurasjon"
 
 #. MTA used: other than Sendmail or Postfix
-#: src/modules/Mail.rb:1300
+#: src/modules/Mail.rb:1282
 msgid "Other"
 msgstr "Annet"
 
 #. summary: connection type
-#: src/modules/Mail.rb:1307
+#: src/modules/Mail.rb:1289
 msgid "Permanent"
 msgstr "Permanent"
 
 #. summary: connection type
-#: src/modules/Mail.rb:1310
+#: src/modules/Mail.rb:1292
 msgid "Dial-up"
 msgstr "Oppringt"
 
 #. summary: connection type
-#: src/modules/Mail.rb:1313
+#: src/modules/Mail.rb:1295
 msgid "None"
 msgstr "Ingen"
 
 #. summary header; mail transfer agent
-#: src/modules/Mail.rb:1319
+#: src/modules/Mail.rb:1301
 msgid "MTA"
 msgstr "MTA"
 
 #. summary header
-#: src/modules/Mail.rb:1322
+#: src/modules/Mail.rb:1304
 msgid "Connection Type"
 msgstr "Tilkoblingstype"
 
 #. summary header
-#: src/modules/Mail.rb:1326
+#: src/modules/Mail.rb:1308
 msgid "Outgoing Mail Server"
 msgstr "Utgående e-postserver"
 
 #. summary header; the "From: foo@bar.com" mail header
-#: src/modules/Mail.rb:1333
+#: src/modules/Mail.rb:1315
 msgid "From Header"
 msgstr "Fra-meldingshode"
 
 #. summary item
-#: src/modules/Mail.rb:1339
+#: src/modules/Mail.rb:1321
 msgid "Local Domains"
 msgstr "Lokale domener"
 
 #. summary item
-#: src/modules/Mail.rb:1344
+#: src/modules/Mail.rb:1326
 msgid "Masquerade Other Domains"
 msgstr "Masker andre domener"
 
 #. summary item
-#: src/modules/Mail.rb:1349
+#: src/modules/Mail.rb:1331
 msgid "Masquerade Users"
 msgstr "Masker brukere"
 
 #. summary header
-#: src/modules/Mail.rb:1352
+#: src/modules/Mail.rb:1334
 msgid "Accept remote SMTP connections"
 msgstr "Godkjenn eksterne SMTP-tilkoplinger"
 
-#: src/modules/Mail.rb:1353 src/modules/Mail.rb:1356 src/modules/Mail.rb:1359
+#: src/modules/Mail.rb:1335 src/modules/Mail.rb:1338 src/modules/Mail.rb:1341
 msgid "Yes"
 msgstr "Ja"
 
 #. summary header
-#: src/modules/Mail.rb:1355
+#: src/modules/Mail.rb:1337
 msgid "Use AMaViS"
 msgstr "Bruk AMaViS"
 
 #. summary header
-#: src/modules/Mail.rb:1358
+#: src/modules/Mail.rb:1340
 msgid "Use DKIM"
 msgstr "Bruk DKIM"
 
 #. summary item
-#: src/modules/Mail.rb:1361
+#: src/modules/Mail.rb:1343
 msgid "Fetchmail"
 msgstr "Fetchmail"
 
 #. summary item
-#: src/modules/Mail.rb:1374
+#: src/modules/Mail.rb:1356
 msgid "Virtual Users"
 msgstr "Virtuelle brukere"
 
 #. summary item
-#: src/modules/Mail.rb:1379
+#: src/modules/Mail.rb:1361
 msgid "Authentication"
 msgstr "Autentisering"
 
@@ -1598,9 +1605,6 @@
 #~ "Passordene er ikke identiske.\n"
 #~ "Prøv igjen."
 
-#~ msgid "You cannot define local domains for the mail server."
-#~ msgstr "Du kan ikke definere lokale domener for e-postserveren."
-
 #~ msgid "Defined Domains"
 #~ msgstr "Definerte domener"
 

Modified: trunk/yast/nb/po/network.nb.po
===================================================================
--- trunk/yast/nb/po/network.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/network.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: network\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2009-10-08 12:56+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -248,7 +248,7 @@
 
 #. Command line output Headline
 #. configuration of hosts
-#: src/clients/host.rb:123
+#: src/clients/host.rb:114
 msgid "Host Configuration Summary:"
 msgstr "Vertsmaskiner, oppsettssammendrag:"
 
@@ -369,13 +369,13 @@
 msgstr "Installasjon av nedlastede versjonsmerknader mislyktes."
 
 #. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:782
+#: src/clients/inst_do_net_test.rb:780
 msgid "Opening of Connection"
 msgstr "Tilkobling"
 
 #. popup to inform user about the failure
 #. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:789 src/clients/inst_do_net_test.rb:815
+#: src/clients/inst_do_net_test.rb:787 src/clients/inst_do_net_test.rb:812
 msgid ""
 "Connecting to the Internet failed. View\n"
 "the logs for details.\n"
@@ -384,13 +384,13 @@
 "logger med mer informasjon.\n"
 
 #. Fallback for situation that mustn't exist
-#: src/clients/inst_do_net_test.rb:873
+#: src/clients/inst_do_net_test.rb:870
 msgid "No URL for the release notes defined. Internet test cannot be performed."
 msgstr "Ingen nettadresse for versjonsmerknader er angitt. Internett-testen kan ikke utføres."
 
 #. popup informing user about the failure to retrieve release notes
 #. most likely due to server-side error
-#: src/clients/inst_do_net_test.rb:886
+#: src/clients/inst_do_net_test.rb:882
 msgid ""
 "Download of latest release notes failed due to server-side error. \n"
 "This does not necessarily imply a faulty network configuration.\n"
@@ -408,7 +408,7 @@
 "og klikk 'Avbryt'.\n"
 
 #. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:898
+#: src/clients/inst_do_net_test.rb:894
 msgid ""
 "Download of latest release notes failed. View\n"
 "the logs for details."
@@ -417,12 +417,12 @@
 "logg for mer informasjon."
 
 #. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:945
+#: src/clients/inst_do_net_test.rb:940
 msgid "Check for Patches"
 msgstr "Søk etter oppgraderinger"
 
 #. popup to inform user about the failure
-#: src/clients/inst_do_net_test.rb:954
+#: src/clients/inst_do_net_test.rb:949
 msgid ""
 "Check for latest updates failed. View\n"
 "the logs for details.\n"
@@ -431,7 +431,7 @@
 "logger med mer informasjon.\n"
 
 #. label of combobox where the log is selected
-#: src/clients/inst_do_net_test.rb:980
+#: src/clients/inst_do_net_test.rb:975
 msgid "Closing of Connection"
 msgstr "Frakobling av forbindelse"
 
@@ -521,7 +521,7 @@
 #. in case keep_install_network is set to true (in AY)
 #. we'll keep values from installation
 #. and merge with XML data (bnc#712864)
-#: src/clients/lan_auto.rb:136
+#: src/clients/lan_auto.rb:108
 msgid "Configuration Error: uninitialized interface."
 msgstr "Oppsettfeil: Grensesnitt er ikke initialisert."
 
@@ -610,7 +610,7 @@
 #. Commandline help title
 #. Main routing dialog
 #. @return dialog result
-#: src/clients/routing.rb:57 src/include/network/services/routing.rb:468
+#: src/clients/routing.rb:57 src/include/network/services/routing.rb:473
 msgid "Routing Configuration"
 msgstr "Rutingoppsett"
 
@@ -702,7 +702,7 @@
 msgstr "Systemport"
 
 #. Table header label
-#: src/clients/routing.rb:208 src/include/network/lan/address.rb:99
+#: src/clients/routing.rb:208 src/include/network/lan/address.rb:101
 msgid "Netmask"
 msgstr "Nettverksmaske"
 
@@ -720,90 +720,90 @@
 
 #. Handler for action "list"
 #. @param [Hash{String => String}] options action options
-#: src/clients/routing.rb:239 src/clients/routing.rb:377
-#: src/clients/routing.rb:423
+#: src/clients/routing.rb:240 src/clients/routing.rb:378
+#: src/clients/routing.rb:422
 msgid "No entry for destination '%1' in routing table"
 msgstr "Ingen oppføring for destinasjon '%1' i rutingtabell"
 
 #. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:261
+#: src/clients/routing.rb:262
 #, fuzzy
 #| msgid "IP forwarding is enabled"
 msgid "%s forwarding is enabled"
 msgstr "IP-overføring er aktivert"
 
 #. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:264
+#: src/clients/routing.rb:265
 #, fuzzy
 #| msgid "IP forwarding is disabled"
 msgid "%s forwarding is disabled"
 msgstr "IP-overføring er deaktivert"
 
 #. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:268
+#: src/clients/routing.rb:269
 #, fuzzy
 #| msgid "Enabling IP forwarding..."
 msgid "Enabling %s forwarding..."
 msgstr "Aktiverer IP-overføring..."
 
 #. translators: %s is "IPv4" or "IPv6"
-#: src/clients/routing.rb:272
+#: src/clients/routing.rb:273
 #, fuzzy
 #| msgid "Disabling IP forwarding..."
 msgid "Disabling %s forwarding..."
 msgstr "Deaktiverer IP-overføring..."
 
-#: src/clients/routing.rb:278
+#: src/clients/routing.rb:279
 #, fuzzy
 #| msgid "IP Forwarding:"
 msgid "IPv4 Forwarding:"
 msgstr "IP-overføring:"
 
-#: src/clients/routing.rb:288
+#: src/clients/routing.rb:289
 #, fuzzy
 #| msgid "IP Forwarding:"
 msgid "IPv6 Forwarding:"
 msgstr "IP-overføring:"
 
-#: src/clients/routing.rb:298
+#: src/clients/routing.rb:299
 #, fuzzy
 #| msgid "IP Forwarding:"
 msgid "IPv4 and IPv6 Forwarding:"
 msgstr "IP-overføring:"
 
-#: src/clients/routing.rb:320
+#: src/clients/routing.rb:321
 msgid "At least destination and gateway IP addresses must be specified."
 msgstr "Minst destinasjon og IP-adresser for systemport må angis."
 
-#: src/clients/routing.rb:329
+#: src/clients/routing.rb:330
 msgid "Adding '%1' destination to routing table ..."
 msgstr "Legger destinasjonen '%1' til rutingtabell ..."
 
-#: src/clients/routing.rb:343
+#: src/clients/routing.rb:344
 msgid "Destination IP address must be specified."
 msgstr "IP-adresse for destinasjon må angis."
 
-#: src/clients/routing.rb:348
+#: src/clients/routing.rb:349
 msgid "At least one of the following parameters (gateway, netmask, device, options) must be specified"
 msgstr "Minst én av følgende parametere (systemport, nettverksmaske, enhet, valg) må angis"
 
-#: src/clients/routing.rb:370
+#: src/clients/routing.rb:371
 msgid "Updating '%1' destination in routing table ..."
 msgstr "Oppdaterer destinasjonen '%1' i rutingtabellen ..."
 
-#: src/clients/routing.rb:415
+#: src/clients/routing.rb:414
 msgid "Deleting '%1' destination from routing table ..."
 msgstr "Sletter destinasjonen '%1' fra rutingtabellen ..."
 
 #. interface summary: WiFi without encryption
 #. interface summary: WiFi without encryption
-#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1363
+#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1371
 msgid "Warning: no encryption is used."
 msgstr "Advarsel: ingen kryptering benyttes."
 
 #. Hyperlink: Change the configuration of an interface
 #. Hyperlink: Change the configuration of an interface
-#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1365
+#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1373
 msgid "Change."
 msgstr "Endre."
 
@@ -904,70 +904,70 @@
 msgstr "Trådløst USB-nettverkskort"
 
 #. Device type label
-#: src/include/network/complex.rb:257
+#: src/include/network/complex.rb:255
 msgid "Unknown Network Device"
 msgstr "Ukjent nettverksenhet"
 
 #. Modem status (%1 is device)
 #. ISDN device status (%1 is device)
 #. Network card status (%1 is device)
-#: src/include/network/complex.rb:312 src/include/network/complex.rb:324
-#: src/include/network/complex.rb:383
+#: src/include/network/complex.rb:309 src/include/network/complex.rb:320
+#: src/include/network/complex.rb:374
 msgid "Configured as %1"
 msgstr "Satt opp som %1"
 
 #. Modem status (%1 is device, %2 is provider)
-#: src/include/network/complex.rb:316
+#: src/include/network/complex.rb:313
 msgid "Configured as %1 with provider %2"
 msgstr "Satt opp som %1 med leverandør %2"
 
 #. ISDN status (%1 is device, %2 is provider, %3 protocol)
-#: src/include/network/complex.rb:333
+#: src/include/network/complex.rb:329
 msgid "Configured as %1 with provider %2 (protocol %3)"
 msgstr "Satt opp som %1 med leverandør %2 (protokoll %3)"
 
-#: src/include/network/complex.rb:348
+#: src/include/network/complex.rb:343
 msgid "Configured without address (NONE)"
 msgstr "Konfigurert uten adresse (INGEN)"
 
 #. Network card status
-#: src/include/network/complex.rb:351
+#: src/include/network/complex.rb:345
 msgid "Configured without an address"
 msgstr "Konfigurert uten adresse"
 
 #. Network card status (%1 is address)
-#: src/include/network/complex.rb:355
+#: src/include/network/complex.rb:348
 msgid "Configured with address %1"
 msgstr "Satt opp med adressen %1"
 
 #. Network card status (%1 is address, %2 is address)
-#: src/include/network/complex.rb:361
+#: src/include/network/complex.rb:354
 msgid "Configured with address %1 (remote %2)"
 msgstr "Satt opp med adressen %1 (ekstern %2)"
 
 #. Network card status (%1 is protocol)
-#: src/include/network/complex.rb:369
+#: src/include/network/complex.rb:361
 msgid "Configured with %1"
 msgstr "Satt opp med %1"
 
 #. Network card status (%1 is device, %2 is address)
-#: src/include/network/complex.rb:387
+#: src/include/network/complex.rb:378
 msgid "Configured as %1 with address %2"
 msgstr "Satt opp som %1 med adressen %2"
 
 #. Network card status (%1 is device, %2 is address, %3 is address)
-#: src/include/network/complex.rb:394
+#: src/include/network/complex.rb:383
 msgid "Configured as %1 with address %2 (remote %3)"
 msgstr "Satt opp som %1 med adressen %2 (ekstern %3)"
 
 #. Network card status (%1 is device, %2 is protocol)
-#: src/include/network/complex.rb:403
+#: src/include/network/complex.rb:392
 msgid "Configured as %1 with %2"
 msgstr "Satt opp som %1 med %2"
 
 #. Abbreviation for "The interface is Managed by NetworkManager"
 #. ComboBox item
-#: src/include/network/complex.rb:419 src/include/network/lan/wireless.rb:438
+#: src/include/network/complex.rb:407 src/include/network/lan/wireless.rb:434
 msgid "Managed"
 msgstr "Styrt"
 
@@ -1106,12 +1106,12 @@
 msgstr "&Velg logg:"
 
 #. Frame label
-#: src/include/network/lan/address.rb:83
+#: src/include/network/lan/address.rb:85
 msgid "Additional Addresses"
 msgstr "Tilleggsadresser"
 
 #. Table header label
-#: src/include/network/lan/address.rb:95
+#: src/include/network/lan/address.rb:97
 #, fuzzy
 #| msgid "IP Address"
 msgid "IPv4 Address Label"
@@ -1119,16 +1119,16 @@
 
 #. Table header label
 #. Table header label
-#: src/include/network/lan/address.rb:97 src/include/network/lan/complex.rb:75
-#: src/include/network/services/host.rb:128
+#: src/include/network/lan/address.rb:99 src/include/network/lan/complex.rb:75
+#: src/include/network/services/host.rb:129
 msgid "IP Address"
 msgstr "IP-adresse"
 
 #. PushButton label
 #. PushButton label
 #. PushButton label
-#: src/include/network/lan/address.rb:106
-#: src/include/network/services/host.rb:139
+#: src/include/network/lan/address.rb:108
+#: src/include/network/services/host.rb:140
 #: src/include/network/services/routing.rb:100
 msgid "Ad&d"
 msgstr "Le&gg til"
@@ -1137,8 +1137,8 @@
 #. PushButton label
 #. PushButton label
 #. Pushbutton label
-#: src/include/network/lan/address.rb:108
-#: src/include/network/services/host.rb:141
+#: src/include/network/lan/address.rb:110
+#: src/include/network/services/host.rb:142
 #: src/include/network/services/routing.rb:102
 #: src/include/network/summary.rb:69
 msgid "&Edit"
@@ -1148,122 +1148,122 @@
 #. PushButton label
 #. PushButton label
 #. Pushbutton label
-#: src/include/network/lan/address.rb:110
-#: src/include/network/services/host.rb:143
+#: src/include/network/lan/address.rb:112
+#: src/include/network/services/host.rb:144
 #: src/include/network/services/routing.rb:104
 #: src/include/network/summary.rb:71
 msgid "De&lete"
 msgstr "&Slett"
 
-#: src/include/network/lan/address.rb:131
+#: src/include/network/lan/address.rb:133
 msgid "&Name of Interface"
 msgstr "&Navn på grensesnitt"
 
-#: src/include/network/lan/address.rb:133
+#: src/include/network/lan/address.rb:135
 msgid "<p>TODO kind of vague!</p>"
 msgstr "<p>TODO er litt ullen!</p>"
 
 #. Combo Box label
-#: src/include/network/lan/address.rb:138
+#: src/include/network/lan/address.rb:140
 msgid "Assign Interface to Firewall &Zone"
 msgstr "Tilordne grensesnitt til &brannmursone"
 
 #. check box label
-#: src/include/network/lan/address.rb:146
+#: src/include/network/lan/address.rb:148
 msgid "&Mandatory Interface"
 msgstr "&Obligatorisk grensesnitt"
 
 #. ComboBox label
 #. ComboBox label
-#: src/include/network/lan/address.rb:154
+#: src/include/network/lan/address.rb:156
 #: src/include/network/lan/hardware.rb:351
 msgid "&Device Type"
 msgstr "&Enhetstype"
 
 #. ComboBox label
 #. TextEntry label
-#: src/include/network/lan/address.rb:172
+#: src/include/network/lan/address.rb:174
 #: src/include/network/lan/hardware.rb:337
 msgid "&Configuration Name"
 msgstr "&Oppsettsnavn"
 
-#: src/include/network/lan/address.rb:181
+#: src/include/network/lan/address.rb:183
 msgid "Tunnel owner"
 msgstr "Tunneleier"
 
-#: src/include/network/lan/address.rb:182
+#: src/include/network/lan/address.rb:184
 msgid "Tunnel group"
 msgstr "Tunnelgruppe"
 
-#: src/include/network/lan/address.rb:191
-#: src/include/network/lan/address.rb:1297
+#: src/include/network/lan/address.rb:193
+#: src/include/network/lan/address.rb:1307
 msgid "Bridged Devices"
 msgstr "Bro-enheter"
 
-#: src/include/network/lan/address.rb:211
+#: src/include/network/lan/address.rb:213
 msgid "Real Interface for &VLAN"
 msgstr "Ekste grensesnitt for &VLAN"
 
-#: src/include/network/lan/address.rb:214
+#: src/include/network/lan/address.rb:216
 msgid "VLAN ID"
 msgstr "VLAN ID"
 
-#: src/include/network/lan/address.rb:231
+#: src/include/network/lan/address.rb:233
 msgid "Bond Slaves and Order"
 msgstr "Bond-slaver og rekkefølge"
 
-#: src/include/network/lan/address.rb:235
+#: src/include/network/lan/address.rb:237
 msgid "Up"
 msgstr "Opp"
 
-#: src/include/network/lan/address.rb:236
+#: src/include/network/lan/address.rb:238
 msgid "Down"
 msgstr "Ned"
 
-#: src/include/network/lan/address.rb:240
+#: src/include/network/lan/address.rb:242
 msgid "Bond &Slaves"
 msgstr "Bond-&slaver"
 
 #. ComboBox label
-#: src/include/network/lan/address.rb:256
+#: src/include/network/lan/address.rb:263
 msgid "&Bond Driver Options"
 msgstr "Valg for &bond-driver"
 
-#: src/include/network/lan/address.rb:258
+#: src/include/network/lan/address.rb:265
 msgid "<p>Select the bond driver options and edit them if necessary. </p>"
 msgstr "<p>Velg alternativer for bond-driveren, og rediger ved behov. </p>"
 
 #. if (LanItems::type=="br") UI::ReplaceWidget(`rp, `Empty());
 #. else
-#: src/include/network/lan/address.rb:283
-#: src/include/network/lan/address.rb:798
+#: src/include/network/lan/address.rb:290
+#: src/include/network/lan/address.rb:813
 msgid "No Link and IP Setup (Bonding Slaves)"
 msgstr "Tilkoblings- og IP-oppsett mangler (bonding-slaver)"
 
-#: src/include/network/lan/address.rb:286
+#: src/include/network/lan/address.rb:293
 #, fuzzy
 #| msgid "Use iBFT values"
 msgid "Use iBFT Values"
 msgstr "Bruk iBFT-verdier"
 
-#: src/include/network/lan/address.rb:292
+#: src/include/network/lan/address.rb:299
 msgid "Dynamic Address"
 msgstr "Dynamisk IP-adresse"
 
-#: src/include/network/lan/address.rb:308
+#: src/include/network/lan/address.rb:315
 msgid "DHCP both version 4 and 6"
 msgstr "DHCP-versjon 4 og 6"
 
-#: src/include/network/lan/address.rb:309
+#: src/include/network/lan/address.rb:316
 msgid "DHCP version 4 only"
 msgstr "Kun DHCP-versjon 4"
 
-#: src/include/network/lan/address.rb:310
+#: src/include/network/lan/address.rb:317
 msgid "DHCP version 6 only"
 msgstr "Kun DHCP-versjon 6"
 
 #. TODO : Stat ... Assigned
-#: src/include/network/lan/address.rb:321
+#: src/include/network/lan/address.rb:328
 #, fuzzy
 #| msgid "Statically assigned IP Address"
 msgid "Statically Assigned IP Address"
@@ -1271,37 +1271,37 @@
 
 #. TextEntry label
 #. TextEntry label
-#: src/include/network/lan/address.rb:325
-#: src/include/network/lan/virtual.rb:213
-#: src/include/network/services/host.rb:341
+#: src/include/network/lan/address.rb:332
+#: src/include/network/lan/virtual.rb:210
+#: src/include/network/services/host.rb:330
 msgid "&IP Address"
 msgstr "&IP-Adresse"
 
-#: src/include/network/lan/address.rb:327
+#: src/include/network/lan/address.rb:334
 msgid "&Subnet Mask"
 msgstr "&Nettverksmaske"
 
-#: src/include/network/lan/address.rb:329
+#: src/include/network/lan/address.rb:336
 msgid "&Hostname"
 msgstr "&Vertsmaskinnavn"
 
 #. Text entry label
-#: src/include/network/lan/address.rb:360
+#: src/include/network/lan/address.rb:367
 msgid "R&emote IP Address"
 msgstr "E&kstern IP-adresse"
 
 #. validation error popup
-#: src/include/network/lan/address.rb:369
+#: src/include/network/lan/address.rb:376
 msgid "The remote IP address is invalid."
 msgstr "Den eksterne IP-adressen er ugyldig."
 
 #. push button label
-#: src/include/network/lan/address.rb:377
+#: src/include/network/lan/address.rb:384
 msgid "&S/390"
 msgstr "&S/390"
 
 #. validate device type, misdetection
-#: src/include/network/lan/address.rb:1018
+#: src/include/network/lan/address.rb:1030
 msgid ""
 "You have changed the interface type from the one\n"
 "that has been detected. This only makes sense\n"
@@ -1312,13 +1312,13 @@
 "du er sikker på at feil grensesnittype ble funnet."
 
 #. Popup text
-#: src/include/network/lan/address.rb:1038
+#: src/include/network/lan/address.rb:1050
 msgid "Configuration %1 already present."
 msgstr "Oppsettet %1 finnes allerede."
 
 #. If firewall is active and interface in no zone, nothing
 #. gets through (#62309) so warn and redirect to details
-#: src/include/network/lan/address.rb:1062
+#: src/include/network/lan/address.rb:1074
 msgid ""
 "The firewall is active, but this interface is not\n"
 "in any zone. All its traffic would be blocked.\n"
@@ -1332,20 +1332,20 @@
 #. @param [String] key	the widget being validated
 #. @param [Hash] event	the event being handled
 #. @return whether valid
-#: src/include/network/lan/address.rb:1082
+#: src/include/network/lan/address.rb:1094
 msgid "No valid IP address."
 msgstr "Ugyldig IP-adresse."
 
-#: src/include/network/lan/address.rb:1089
+#: src/include/network/lan/address.rb:1101
 msgid "No valid netmask or prefix length."
 msgstr "Ugyldig nettverksmaske eller prefikslengde."
 
-#: src/include/network/lan/address.rb:1097
+#: src/include/network/lan/address.rb:1109
 msgid "Invalid hostname."
 msgstr "Ugyldig vertsnavn."
 
 #. There'll be no 127.0.0.2 -> remind user to define some hostname
-#: src/include/network/lan/address.rb:1105
+#: src/include/network/lan/address.rb:1116
 msgid ""
 "No hostname has been specified. We recommend to associate \n"
 "a hostname with a static IP, otherwise the machine name will \n"
@@ -1360,7 +1360,7 @@
 "Vil du likevel ikke angi noe vertsnavn?\n"
 
 #. Popup text
-#: src/include/network/lan/address.rb:1124
+#: src/include/network/lan/address.rb:1134
 msgid ""
 "Duplicate IP address detected.\n"
 "Really continue?\n"
@@ -1370,54 +1370,54 @@
 
 #. @param [Array<String>] types network card types
 #. @return their descriptions for CWM
-#: src/include/network/lan/address.rb:1177
+#: src/include/network/lan/address.rb:1187
 msgid "&General"
 msgstr "&Generelt"
 
 #. TODO: "MANDATORY",
-#: src/include/network/lan/address.rb:1188
+#: src/include/network/lan/address.rb:1198
 msgid "Device Activation"
 msgstr "Enhetsaktivering"
 
-#: src/include/network/lan/address.rb:1192
+#: src/include/network/lan/address.rb:1202
 msgid "Firewall Zone"
 msgstr "Brannmursone"
 
-#: src/include/network/lan/address.rb:1197
+#: src/include/network/lan/address.rb:1207
 msgid "Maximum Transfer Unit (MTU)"
 msgstr "Største overføringsenhet (MTU)"
 
 #. FIXME: we have helps per widget and for the whole
 #. tab set but not for one tab
-#: src/include/network/lan/address.rb:1207
+#: src/include/network/lan/address.rb:1217
 msgid "<p>Configure the detailed network card settings here.</p>"
 msgstr "<p>Velg detaljerte innstillinger for nettverkskort her.</p>"
 
 #. FIXME: here it does not complain about missing
 #. shortcuts
-#: src/include/network/lan/address.rb:1274
+#: src/include/network/lan/address.rb:1284
 msgid "&Address"
 msgstr "&Adresse"
 
 #. Address tab help
-#: src/include/network/lan/address.rb:1277
+#: src/include/network/lan/address.rb:1287
 msgid "<p>Configure your IP address.</p>"
 msgstr "<p>Sett opp IP-adressen din.</p>"
 
-#: src/include/network/lan/address.rb:1283
+#: src/include/network/lan/address.rb:1293
 msgid "&Hardware"
 msgstr "&Maskinvare"
 
-#: src/include/network/lan/address.rb:1290
+#: src/include/network/lan/address.rb:1300
 msgid "&Bond Slaves"
 msgstr "&Bond-slaver"
 
-#: src/include/network/lan/address.rb:1304
+#: src/include/network/lan/address.rb:1314
 msgid "&Wireless"
 msgstr "&Trådløst"
 
 #. Combo box label - when to activate device (e.g. on boot, manually, never,..)
-#: src/include/network/lan/address.rb:1388
+#: src/include/network/lan/address.rb:1398
 #, fuzzy
 #| msgid "Ifplugd priority"
 msgid "Ifplugd Priority"
@@ -1425,7 +1425,7 @@
 
 #. Device activation main help. The individual parts will be
 #. substituted as %1
-#: src/include/network/lan/address.rb:1394
+#: src/include/network/lan/address.rb:1404
 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"
@@ -1440,12 +1440,23 @@
 " det angis en prioritet for hvert grensesnitt.  </p>\n"
 
 #. Address dialog caption
-#: src/include/network/lan/address.rb:1476
+#: src/include/network/lan/address.rb:1486
 msgid "Network Card Setup"
 msgstr "Nettverkskortoppsett"
 
+#. Translators: Warn the user about not desired effect
+#: src/include/network/lan/address.rb:1617
+msgid ""
+"The interfaces selected share the same physical port and bonding them \n"
+"may not have the desired effect of redundancy.\n"
+"\n"
+"%s\n"
+"\n"
+"Really continue?\n"
+msgstr ""
+
 #. remove all aliases (bnc#590167)
-#: src/include/network/lan/bridge.rb:103
+#: src/include/network/lan/bridge.rb:86
 #, fuzzy
 #| msgid ""
 #| "At least one selected device is already configured.\n"
@@ -1645,23 +1656,23 @@
 #. @param [Hash{String => String}] options action options
 #. Handler for action "edit"
 #. @param [Hash{String => String}] options action options
-#: src/include/network/lan/cmdline.rb:214
-#: src/include/network/lan/cmdline.rb:265
+#: src/include/network/lan/cmdline.rb:215
+#: src/include/network/lan/cmdline.rb:266
 msgid "Impossible value for bootproto."
 msgstr "Ugyldig verdi for bootproto."
 
-#: src/include/network/lan/cmdline.rb:223
-#: src/include/network/lan/cmdline.rb:289
+#: src/include/network/lan/cmdline.rb:224
+#: src/include/network/lan/cmdline.rb:290
 msgid "Impossible value for startmode."
 msgstr "Ugyldig verdi for startmode."
 
-#: src/include/network/lan/cmdline.rb:271
+#: src/include/network/lan/cmdline.rb:272
 msgid "For static configuration, the \"ip\" option is needed."
 msgstr "Valget «ip» kreves for et statisk oppsett."
 
 #. Handler for action "delete"
 #. @param [Hash{String => String}] options action options
-#: src/include/network/lan/cmdline.rb:316
+#: src/include/network/lan/cmdline.rb:318
 msgid "The device was deleted."
 msgstr "Enheten er slettet."
 
@@ -1723,7 +1734,7 @@
 
 #. Write settings dialog
 #. @return `abort if aborted and `next otherwise
-#: src/include/network/lan/complex.rb:199
+#: src/include/network/lan/complex.rb:198
 msgid ""
 "Firmware is needed. Install it from \n"
 "the add-on CD.\n"
@@ -1735,7 +1746,7 @@
 "Legg først til CD-en som pakkebrønn i YaST, og gå tilbake \n"
 "til denne oppsettdialogen.\n"
 
-#: src/include/network/lan/complex.rb:213
+#: src/include/network/lan/complex.rb:212
 msgid ""
 "The device needs a firmware to function properly. Usually, it can be\n"
 "downloaded from your driver vendor's Web page. \n"
@@ -1752,20 +1763,20 @@
 #. - kernel modules (InstallKernel): before loaded
 #. - wlan firmware: here, just because it is copied from modems
 #. #45960
-#: src/include/network/lan/complex.rb:232
+#: src/include/network/lan/complex.rb:231
 msgid "Installing firmware"
 msgstr "Installerer fastvare"
 
-#: src/include/network/lan/complex.rb:233
+#: src/include/network/lan/complex.rb:232
 msgid "For successful firmware installation, the 'install_bcm43xx_firmware' script needs to be executed. Execute it now?"
 msgstr "For å installere fastvare må skriptet 'install_bcm43xx_firmware' kjøres. Vil du kjøre skriptet nå?"
 
-#: src/include/network/lan/complex.rb:247
+#: src/include/network/lan/complex.rb:246
 msgid "An error occurred during firmware installation."
 msgstr "Det oppstod en feil under installasjon av fastvare."
 
 #. Continue-Cancel popup
-#: src/include/network/lan/complex.rb:402
+#: src/include/network/lan/complex.rb:401
 msgid ""
 "The interface is currently set to be managed\n"
 "by the NetworkManager applet.\n"
@@ -1780,12 +1791,12 @@
 "vil det ikke lenger kunne styres via NetworkManager.\n"
 
 #. warn user when device to delete has STARTMODE=nfsroot (bnc#433867)
-#: src/include/network/lan/complex.rb:456
+#: src/include/network/lan/complex.rb:453
 msgid "Device you select has STARTMODE=nfsroot. Really delete?"
 msgstr "Den valgte enheten har STARTMODE=nfsroot. Vil du virkelig slette den?"
 
 #. Network setup method dialog caption
-#: src/include/network/lan/complex.rb:487 src/include/network/widgets.rb:363
+#: src/include/network/lan/complex.rb:484 src/include/network/widgets.rb:364
 msgid "Network Setup Method"
 msgstr "Oppsettsmetode for nettverk"
 
@@ -1794,7 +1805,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:519
+#: src/include/network/lan/complex.rb:515
 msgid "Network Settings"
 msgstr "Nettverksinnstillinger"
 
@@ -1986,7 +1997,7 @@
 #. Selection box label
 #. Selection box title
 #: src/include/network/lan/hardware.rb:485
-#: src/include/network/lan/hardware.rb:540
+#: src/include/network/lan/hardware.rb:537
 msgid "&Network Card"
 msgstr "&Nettverkskort"
 
@@ -1996,7 +2007,7 @@
 msgstr "&Søk"
 
 #. bnc#767946
-#: src/include/network/lan/hardware.rb:799
+#: src/include/network/lan/hardware.rb:796
 msgid ""
 "Configuration name %1 already exists.\n"
 "Choose a different one."
@@ -2005,7 +2016,7 @@
 "Velg et annet navn."
 
 #. S/390 dialog caption
-#: src/include/network/lan/hardware.rb:854
+#: src/include/network/lan/hardware.rb:853
 msgid "S/390 Network Card Configuration"
 msgstr "Oppsett av S/390-nettverkskort"
 
@@ -2013,131 +2024,131 @@
 #. Frame label
 #. Frame label
 #. Frame label
-#: src/include/network/lan/hardware.rb:873
-#: src/include/network/lan/hardware.rb:975
-#: src/include/network/lan/hardware.rb:1042
-#: src/include/network/lan/hardware.rb:1079
+#: src/include/network/lan/hardware.rb:872
+#: src/include/network/lan/hardware.rb:974
+#: src/include/network/lan/hardware.rb:1041
+#: src/include/network/lan/hardware.rb:1078
 msgid "S/390 Device Settings"
 msgstr "Innstillinger for S/390-enhet"
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:883
+#: src/include/network/lan/hardware.rb:882
 msgid "&Port Name"
 msgstr "&Portnavn"
 
-#: src/include/network/lan/hardware.rb:888
+#: src/include/network/lan/hardware.rb:887
 msgid "Port Number"
 msgstr "Portnummer"
 
 #. CheckBox label
-#: src/include/network/lan/hardware.rb:902
+#: src/include/network/lan/hardware.rb:901
 msgid "&Enable IPA Takeover"
 msgstr "&Aktiver IPA-overtakelse"
 
 #. CheckBox label
-#: src/include/network/lan/hardware.rb:909
+#: src/include/network/lan/hardware.rb:908
 msgid "Enable &Layer 2 Support"
 msgstr "Vil du aktivere &Layer 2-støtte"
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:916
+#: src/include/network/lan/hardware.rb:915
 msgid "Layer2 &MAC Address"
 msgstr "&MAC-adresse for Layer2"
 
-#: src/include/network/lan/hardware.rb:924
-#: src/include/network/lan/hardware.rb:1000
-#: src/include/network/lan/hardware.rb:1054
+#: src/include/network/lan/hardware.rb:923
+#: src/include/network/lan/hardware.rb:999
+#: src/include/network/lan/hardware.rb:1053
 msgid "Read Channel"
 msgstr "Lesekanal"
 
-#: src/include/network/lan/hardware.rb:930
-#: src/include/network/lan/hardware.rb:1006
-#: src/include/network/lan/hardware.rb:1060
+#: src/include/network/lan/hardware.rb:929
+#: src/include/network/lan/hardware.rb:1005
+#: src/include/network/lan/hardware.rb:1059
 msgid "Write Channel"
 msgstr "Skrivekanal"
 
-#: src/include/network/lan/hardware.rb:936
+#: src/include/network/lan/hardware.rb:935
 msgid "Control Channel"
 msgstr "Kontrollkanal"
 
 #. S/390 dialog help: QETH Port name
-#: src/include/network/lan/hardware.rb:947
+#: src/include/network/lan/hardware.rb:946
 msgid "<p>Enter the <b>Port Name</b> for this interface (case-sensitive).</p>"
 msgstr "<p>Angi <b>portnavnet</b> for dette grensesnittet (det skilles mellom små og store bokstaver).</p>"
 
 #. S/390 dialog help: QETH Options
-#: src/include/network/lan/hardware.rb:951
+#: src/include/network/lan/hardware.rb:950
 msgid "<p>Enter any additional <b>Options</b> for this interface (separated by spaces).</p>"
 msgstr "<p>Angi eventuelle ekstra <b>Alternativer</b> for dette grensesnittet (adskilt av mellomrom).</p>"
 
-#: src/include/network/lan/hardware.rb:954
+#: src/include/network/lan/hardware.rb:953
 msgid "<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be enabled for this interface.</p>"
 msgstr "<p>Velg <b>Aktiver IPA-overtakelse</b> hvis overtakelse av IP-adresse skal aktiveres for dette grensesnittet.</p>"
 
-#: src/include/network/lan/hardware.rb:957
+#: src/include/network/lan/hardware.rb:956
 msgid "<p>Select <b>Enable Layer 2 Support</b> if this card has been configured with layer 2 support.</p>"
 msgstr "<p>Velg <b>Aktiver Layer 2-støtte</b> hvis dette kortet er satt opp med Layer 2-støtte.</p>"
 
-#: src/include/network/lan/hardware.rb:960
+#: src/include/network/lan/hardware.rb:959
 msgid "<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>"
 msgstr "<p>Angi <b>MAC-adresse for Layer 2-støtte</b> hvis dette kortet er satt opp med Layer 2-støtte.</p>"
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:984
+#: src/include/network/lan/hardware.rb:983
 msgid "&Port Number"
 msgstr "&Portnummer"
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:992
+#: src/include/network/lan/hardware.rb:991
 msgid "&LANCMD Time-Out"
 msgstr "&LANCMD-tidsavbrudd"
 
 #. S/390 dialog help: LCS
-#: src/include/network/lan/hardware.rb:1017
+#: src/include/network/lan/hardware.rb:1016
 msgid "<p>Choose the <b>Port Number</b> for this interface.</p>"
 msgstr "<p>Velg <b>portnummeret</b> for dette grensesnittet.</p>"
 
-#: src/include/network/lan/hardware.rb:1018
+#: src/include/network/lan/hardware.rb:1017
 msgid "<p>Specify the <b>LANCMD Time-Out</b> for this interface.</p>"
 msgstr "<p>Angi <b>LANCMD-tidsavbrudd</b> for dette grensesnittet.</p>"
 
 #. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1023
+#: src/include/network/lan/hardware.rb:1022
 msgid "Compatibility Mode"
 msgstr "Kompatibilitetsmodus"
 
 #. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1025
+#: src/include/network/lan/hardware.rb:1024
 msgid "Extended Mode"
 msgstr "Utvidet modus"
 
 #. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1027
+#: src/include/network/lan/hardware.rb:1026
 msgid "CTC-Based tty (Linux to Linux Connections)"
 msgstr "CTC-basert tty (Linux til Linux-forbindelser)"
 
 #. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1029
+#: src/include/network/lan/hardware.rb:1028
 msgid "Compatibility Mode with OS/390 and z/OS"
 msgstr "Kompatibilitetsmodus med OS/390 og z/OS"
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:1048
+#: src/include/network/lan/hardware.rb:1047
 msgid "&Protocol"
 msgstr "&Protokoll"
 
 #. S/390 dialog help: CTC
-#: src/include/network/lan/hardware.rb:1071
+#: src/include/network/lan/hardware.rb:1070
 msgid "<p>Choose the <b>Protocol</b> for this interface.</p>"
 msgstr "<p>Velg <b>protokollen</b> for dette grenssnittet.</p>"
 
 #. TextEntry label, #42789
-#: src/include/network/lan/hardware.rb:1088
+#: src/include/network/lan/hardware.rb:1087
 msgid "&Peer Name"
 msgstr "Navn på &annen maskin"
 
 #. S/390 dialog help: IUCV, #42789
-#: src/include/network/lan/hardware.rb:1099
+#: src/include/network/lan/hardware.rb:1098
 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"
@@ -2145,8 +2156,7 @@
 "<p>Angi navnet til en annen IUCV-maskin,\n"
 "for eksempel z/VM-brukernavnet som skal brukes ved tilkobling (det skilles mellom små og store bokstaver).</p>\n"
 
-#. #176330, must be static
-#: src/include/network/lan/hardware.rb:1220
+#: src/include/network/lan/hardware.rb:1211
 msgid ""
 "An error occurred while creating device.\n"
 "See YaST log for details."
@@ -2156,7 +2166,7 @@
 
 #. Manual network card configuration dialog
 #. @return dialog result
-#: src/include/network/lan/hardware.rb:1242
+#: src/include/network/lan/hardware.rb:1233
 msgid "Hardware Dialog"
 msgstr "Maskinvaredialog"
 
@@ -2837,31 +2847,31 @@
 "samme katalog.</p>"
 
 #. TextEntry label
-#: src/include/network/lan/virtual.rb:209
+#: src/include/network/lan/virtual.rb:206
 #, fuzzy
 #| msgid "IP Address"
 msgid "IPv4 &Address Label"
 msgstr "IP-adresse"
 
 #. TextEntry label
-#: src/include/network/lan/virtual.rb:217
+#: src/include/network/lan/virtual.rb:214
 msgid "Net&mask"
 msgstr "Nettverks&maske"
 
 #. Popup::Error text
-#: src/include/network/lan/virtual.rb:247
+#: src/include/network/lan/virtual.rb:244
 msgid "Label is too long."
 msgstr "For lang betegnelse."
 
 #. Popup::Error text
 #. Popup::Error text
-#: src/include/network/lan/virtual.rb:257
-#: src/include/network/services/host.rb:386
+#: src/include/network/lan/virtual.rb:254
+#: src/include/network/services/host.rb:375
 msgid "The IP address is invalid."
 msgstr "IP-adressen er ugyldig."
 
 #. Popup::Error text
-#: src/include/network/lan/virtual.rb:266
+#: src/include/network/lan/virtual.rb:263
 msgid "The subnet mask is invalid."
 msgstr "Ugyldig nettverksmaske."
 
@@ -3041,127 +3051,127 @@
 
 #. Wireless authentication modes:
 #. ComboBox item
-#: src/include/network/lan/wireless.rb:357
+#: src/include/network/lan/wireless.rb:353
 msgid "No Encryption"
 msgstr "Ingen kryptering"
 
 #. ComboBox item
-#: src/include/network/lan/wireless.rb:361
+#: src/include/network/lan/wireless.rb:357
 msgid "WEP - Open"
 msgstr "WEP - Åpen"
 
 #. ComboBox item
-#: src/include/network/lan/wireless.rb:363
+#: src/include/network/lan/wireless.rb:359
 msgid "WEP - Shared Key"
 msgstr "WEP - Delt nøkkel"
 
 #. ComboBox item
 #. Ask me what it means, I don't know yet
-#: src/include/network/lan/wireless.rb:366
+#: src/include/network/lan/wireless.rb:362
 msgid "WPA-PSK (WPA version 1 or 2)"
 msgstr "WPA-PSK (WPA-versjon 1 eller 2)"
 
 #. ComboBox item
-#: src/include/network/lan/wireless.rb:370
+#: src/include/network/lan/wireless.rb:366
 msgid "WPA-EAP (WPA version 1 or 2)"
 msgstr "WPA-EAP (WPA-versjon 1 eller 2)"
 
 #. Wireless dialog caption
-#: src/include/network/lan/wireless.rb:394
+#: src/include/network/lan/wireless.rb:390
 msgid "Wireless Network Card Configuration"
 msgstr "Oppsett av trådløst nettverkskort"
 
 #. Frame label
-#: src/include/network/lan/wireless.rb:424
+#: src/include/network/lan/wireless.rb:420
 msgid "Wireless Device Settings"
 msgstr "Innstillinger for trådløst nettverk"
 
 #. ComboBox label
-#: src/include/network/lan/wireless.rb:433
+#: src/include/network/lan/wireless.rb:429
 msgid "O&perating Mode"
 msgstr "D&riftsmodus"
 
 #. ComboBox item
-#: src/include/network/lan/wireless.rb:436
+#: src/include/network/lan/wireless.rb:432
 msgid "Ad-Hoc"
 msgstr "Ad-hoc"
 
 #. ComboBox item
-#: src/include/network/lan/wireless.rb:440
+#: src/include/network/lan/wireless.rb:436
 msgid "Master"
 msgstr "Master"
 
 #. Text entry label
-#: src/include/network/lan/wireless.rb:449
+#: src/include/network/lan/wireless.rb:445
 msgid "Ne&twork Name (ESSID)"
 msgstr "Ne&ttverksnavn (ESSID)"
 
-#: src/include/network/lan/wireless.rb:452
+#: src/include/network/lan/wireless.rb:448
 msgid "Scan Network"
 msgstr "Skann nettverk"
 
 #. ComboBox label
-#: src/include/network/lan/wireless.rb:459
+#: src/include/network/lan/wireless.rb:455
 msgid "&Authentication Mode"
 msgstr "&Autentiseringsmodus"
 
 #. Text entry label
-#: src/include/network/lan/wireless.rb:466
+#: src/include/network/lan/wireless.rb:462
 msgid "&Encryption Key"
 msgstr "&Krypteringsnøkkel"
 
 #. PushButton label
-#: src/include/network/lan/wireless.rb:475
+#: src/include/network/lan/wireless.rb:471
 msgid "E&xpert Settings"
 msgstr "&Avanserte innstillinger"
 
 #. PushButton label, keys for WEP encryption
-#: src/include/network/lan/wireless.rb:478
+#: src/include/network/lan/wireless.rb:474
 msgid "&WEP Keys"
 msgstr "&WEP-nøkler"
 
 #. Popup text
-#: src/include/network/lan/wireless.rb:560
+#: src/include/network/lan/wireless.rb:558
 msgid "WPA authentication mode is only possible in managed operating mode."
 msgstr "WPA-autentiseringsmodus er bare mulig i styrt driftsmodus."
 
 #. Popup text
 #. modes: combination of operation and authentication
-#: src/include/network/lan/wireless.rb:571
+#: src/include/network/lan/wireless.rb:569
 msgid "Specify the network name for this mode."
 msgstr "Angi nettverksnavnet for denne modusen."
 
 #. Popup text
-#: src/include/network/lan/wireless.rb:578
+#: src/include/network/lan/wireless.rb:576
 msgid "The network name must be shorter than 32 characters."
 msgstr "Nettverksnavnet må ikke inneholde mer enn 32 tegn."
 
 #. Error popup
-#: src/include/network/lan/wireless.rb:598
+#: src/include/network/lan/wireless.rb:596
 msgid "The passphrase must have between 8 and 63 characters (inclusively)."
 msgstr "Passfrasen må inneholde mellom 8 og 63 tegn (totalt)."
 
 #. Error popup
-#: src/include/network/lan/wireless.rb:609
+#: src/include/network/lan/wireless.rb:607
 msgid "The key must have %1 hexadecimal digits."
 msgstr "Nøkkelen må ha %1 heksadesimalsiffer."
 
 #. Popup text
 #. Popup text
-#: src/include/network/lan/wireless.rb:621
-#: src/include/network/lan/wireless.rb:939
+#: src/include/network/lan/wireless.rb:619
+#: src/include/network/lan/wireless.rb:941
 msgid "The encryption key is invalid."
 msgstr "Krypteringsnøkkelen er ugyldig."
 
 #. error
 #. Popup text
-#: src/include/network/lan/wireless.rb:629
+#: src/include/network/lan/wireless.rb:627
 msgid "The encryption key must be specified for this authentication mode."
 msgstr "Krypteringsnøkkelen må angis for denne autentiseringsmodusen."
 
 #. warning only
 #. Popup text
-#: src/include/network/lan/wireless.rb:636
+#: src/include/network/lan/wireless.rb:634
 msgid ""
 "Using no encryption is a security risk.\n"
 "Really continue?\n"
@@ -3259,27 +3269,27 @@
 msgstr "AP ScanMode"
 
 #. Translators: popup dialog heading
-#: src/include/network/lan/wireless.rb:897
+#: src/include/network/lan/wireless.rb:899
 msgid "Enter Encryption Key"
 msgstr "Angi krypteringsnøkkel"
 
 #. Translators: text entry label
-#: src/include/network/lan/wireless.rb:901
+#: src/include/network/lan/wireless.rb:903
 msgid "&Key"
 msgstr "&Nøkkel"
 
 #. Translators: popup title
-#: src/include/network/lan/wireless.rb:925
+#: src/include/network/lan/wireless.rb:927
 msgid "Help"
 msgstr "Hjelp"
 
 #. Wireless keys dialog caption
-#: src/include/network/lan/wireless.rb:974
+#: src/include/network/lan/wireless.rb:976
 msgid "Wireless Keys"
 msgstr "Trådløsnøkler"
 
 #. Wireless keys dialog help 1/3
-#: src/include/network/lan/wireless.rb:977
+#: src/include/network/lan/wireless.rb:979
 msgid ""
 "<p>In this dialog, define your WEP keys used\n"
 "to encrypt your data before it is transmitted. You can have up to four keys,\n"
@@ -3294,7 +3304,7 @@
 "én nøkkel.</p>"
 
 #. Wireless keys dialog help 2/3
-#: src/include/network/lan/wireless.rb:985
+#: src/include/network/lan/wireless.rb:987
 msgid ""
 "<p><b>Key Length</b> defines the bit length of your WEP keys.\n"
 "Possible are 64 and 128 bit, sometimes also referred to as 40 and 104 bit.\n"
@@ -3309,43 +3319,43 @@
 "verdien til 64.</p>"
 
 #. Frame label
-#: src/include/network/lan/wireless.rb:1010
+#: src/include/network/lan/wireless.rb:1012
 msgid "WEP Keys"
 msgstr "WEP-nøkler"
 
 #. ComboBox label
-#: src/include/network/lan/wireless.rb:1016
+#: src/include/network/lan/wireless.rb:1018
 msgid "&Key Length"
 msgstr "&Nøkkellengde"
 
 #. Table header label
 #. Abbreviation of Number
-#: src/include/network/lan/wireless.rb:1024
+#: src/include/network/lan/wireless.rb:1026
 msgid "No."
 msgstr "Nr."
 
 #. Table header label
-#: src/include/network/lan/wireless.rb:1026
+#: src/include/network/lan/wireless.rb:1028
 msgid "Key"
 msgstr "Nøkkel"
 
 #. Table header label
-#: src/include/network/lan/wireless.rb:1028
+#: src/include/network/lan/wireless.rb:1030
 msgid "Default"
 msgstr "Standard"
 
 #. PushButton label
-#: src/include/network/lan/wireless.rb:1038
+#: src/include/network/lan/wireless.rb:1040
 msgid "&Set as Default"
 msgstr "Definer som st&andard"
 
 #. file browser dialog headline
-#: src/include/network/lan/wireless.rb:1210
+#: src/include/network/lan/wireless.rb:1214
 msgid "Choose a Certificate"
 msgstr "Velg et sertifikat"
 
 #. validated in ValidateWpaEap
-#: src/include/network/lan/wireless.rb:1255
+#: src/include/network/lan/wireless.rb:1257
 msgid ""
 "Not using a Certificate Authority (CA) certificate can result in connections\n"
 "to insecure, rogue wireless networks. Continue without CA ?"
@@ -3354,7 +3364,7 @@
 "som er usikkert og sårbart. Vil du fortsette uten CA ?"
 
 #. error popup text
-#: src/include/network/lan/wireless.rb:1283
+#: src/include/network/lan/wireless.rb:1285
 msgid ""
 "Enter either the identity and password\n"
 "or the client certificate."
@@ -3363,47 +3373,47 @@
 "eller klientsertifikatet."
 
 #. dialog caption
-#: src/include/network/lan/wireless.rb:1329
+#: src/include/network/lan/wireless.rb:1331
 msgid "WPA-EAP"
 msgstr "WPA-EAP"
 
 #. combo box item, any of EAP authentication methods
-#: src/include/network/lan/wireless.rb:1351
+#: src/include/network/lan/wireless.rb:1353
 msgid "Any"
 msgstr "Udefinert"
 
 #. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1355
+#: src/include/network/lan/wireless.rb:1357
 msgid "MD5"
 msgstr "MD5"
 
 #. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1357
+#: src/include/network/lan/wireless.rb:1359
 msgid "GTC"
 msgstr "GTC"
 
 #. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1359
+#: src/include/network/lan/wireless.rb:1361
 msgid "CHAP"
 msgstr "CHAP"
 
 #. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1361
+#: src/include/network/lan/wireless.rb:1363
 msgid "PAP"
 msgstr "PAP"
 
 #. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1363
+#: src/include/network/lan/wireless.rb:1365
 msgid "MSCHAPv1"
 msgstr "MSCHAPv1"
 
 #. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1367
+#: src/include/network/lan/wireless.rb:1369
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #. dialog caption
-#: src/include/network/lan/wireless.rb:1390
+#: src/include/network/lan/wireless.rb:1392
 msgid "WPA-EAP Details"
 msgstr "WPA-EAP-informasjon"
 
@@ -3418,24 +3428,44 @@
 
 #. RadioButton label
 #: src/include/network/remote/dialogs.rb:64
-msgid "&Allow Remote Administration"
+#, fuzzy
+#| msgid "&Allow Remote Administration"
+msgid "&Allow Remote Administration With Session Management"
 msgstr "&Tillat ekstern administrasjon"
 
 #. RadioButton label
 #: src/include/network/remote/dialogs.rb:72
+#, fuzzy
+#| msgid "&Allow Remote Administration"
+msgid "&Allow Remote Administration Without Session Management"
+msgstr "&Tillat ekstern administrasjon"
+
+#. RadioButton label
+#: src/include/network/remote/dialogs.rb:80
 msgid "&Do Not Allow Remote Administration"
 msgstr "&Ikke tillat ekstern administrasjon"
 
 #. Remote Administration dialog help
 #. %1 and %2 are port numbers for vnc and vnchttp, eg. 5901, 5801
-#: src/include/network/remote/dialogs.rb:89
+#: src/include/network/remote/dialogs.rb:97
+#, fuzzy
+#| msgid ""
+#| "<p><b><big>Remote Administration Settings</big></b></p>\n"
+#| "<p>If this feature is enabled, you can\n"
+#| "administer this machine remotely from another machine. Use a VNC\n"
+#| "client, such as krdc (connect to <tt><hostname>:%1</tt>), or\n"
+#| "a Java-capable Web browser (connect to <tt>http://<hostname>:%2/</tt>).\n"
+#| "This form of remote administration is less secure than using SSH.</p>\n"
 msgid ""
 "<p><b><big>Remote Administration Settings</big></b></p>\n"
 "<p>If this feature is enabled, you can\n"
 "administer this machine remotely from another machine. Use a VNC\n"
 "client, such as krdc (connect to <tt><hostname>:%1</tt>), or\n"
-"a Java-capable Web browser (connect to <tt>http://<hostname>:%2/</tt>).\n"
-"This form of remote administration is less secure than using SSH.</p>\n"
+"a Java-capable Web browser (connect to <tt>https://<hostname>:%2/</tt>).</p>\n"
+"<p>Without Session Management, only one user can be connected\n"
+"at a time to a session, and that session is terminated when the VNC client\n"
+"disconnects.</p><p>With Session Management, multiple users can interact with a single\n"
+"session, and the session may persist even if noone is connected.</p>"
 msgstr ""
 "<p><b><big>Innstillinger for ekstern administrasjon</big></b></p>\n"
 "<p>Hvis denne funksjonen er aktivert, kan du\n"
@@ -3445,17 +3475,17 @@
 "Denne typen ekstern administrasjon er mindre sikker enn SSH.</p>\n"
 
 #. Dialog frame title
-#: src/include/network/remote/dialogs.rb:109
+#: src/include/network/remote/dialogs.rb:121
 msgid "Remote Administration Settings"
 msgstr "Innstillinger for ekstern administrasjon"
 
 #. Popup text
-#: src/include/network/routines.rb:144
+#: src/include/network/routines.rb:129
 msgid "These packages need to be installed:"
 msgstr "Følgende pakker må installeres:"
 
 #. Popup text
-#: src/include/network/routines.rb:162
+#: src/include/network/routines.rb:147
 msgid ""
 "The required packages are not installed.\n"
 "The configuration will be aborted.\n"
@@ -3467,111 +3497,61 @@
 "\n"
 "Vil du forsøke igjen?\n"
 
-#. Table field (Unknown device)
-#: src/include/network/routines.rb:255
+#. Create a list of items for UI from the given hardware list.
+#.
+#. This list is used when selecting <ol>
+#. <li> detected unconfigured cards,
+#. there we want to see the link status </li>
+#. <li> undetected cards manually. there is no link status there
+#. and it won't be displayed. all is ok. </li>
+#. </ol>
+#. @param [Array<Hash>] l given list for conversion
+#. @param [Fixnum] selected selected item (0 for the first)
+#. @return a list of items
+#: src/include/network/routines.rb:195
 msgid "Unknown"
 msgstr "Ukjent"
 
-#. Popup headline
-#: src/include/network/routines.rb:279
-msgid "Configuration Successfully Saved"
-msgstr "Oppsettet er lagret"
-
-#. Popup headline
-#: src/include/network/routines.rb:284
-msgid "DNS Configuration Successfully Saved"
-msgstr "DNS-oppsettet er lagret"
-
-#. Popup headline
-#: src/include/network/routines.rb:286
-msgid "DSL Configuration Successfully Saved"
-msgstr "DSL-oppsettet er lagret"
-
-#. Popup headline
-#: src/include/network/routines.rb:288
-msgid "Hosts Configuration Successfully Saved"
-msgstr "Vertsmaskinoppsettet er lagret"
-
-#. Popup headline
-#: src/include/network/routines.rb:292
-msgid "ISDN Configuration Successfully Saved"
-msgstr "ISDN-oppsettet er lagret"
-
-#. Popup headline
-#: src/include/network/routines.rb:296
-msgid "Network Card Configuration Successfully Saved"
-msgstr "Oppsettet for nettverkskort er lagret"
-
-#. Popup headline
-#: src/include/network/routines.rb:300
-msgid "Modem Configuration Successfully Saved"
-msgstr "Modemoppsettet er lagret"
-
-#. Popup headline
-#: src/include/network/routines.rb:304
-msgid "Proxy Configuration Successfully Saved"
-msgstr "Mellomserveroppsettet er lagret"
-
-#. Popup headline
-#: src/include/network/routines.rb:308
-msgid "Provider Configuration Successfully Saved"
-msgstr "Leverandøroppsettet er lagret"
-
-#. Popup headline
-#: src/include/network/routines.rb:312
-msgid "Routing Configuration Successfully Saved"
-msgstr "Rutingoppsettet er lagret"
-
-#. Popup text
-#: src/include/network/routines.rb:321
-msgid "Configure mail now?"
-msgstr "Vil du sette opp e-postsystemet nå?"
-
-#. Popup text
-#: src/include/network/routines.rb:326
-msgid "Run configuration of %1?"
-msgstr "Vil du sette opp %1?"
-
 #. Disables all widgets which cannot be configured with current network service
 #.
 #. see bnc#433084
 #. if listed any items, disable them, if show_popup, show warning popup
 #.
 #. returns true if items were disabled
-#: src/include/network/routines.rb:1004
+#: src/include/network/routines.rb:829
 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:1064
+#: src/include/network/routines.rb:889
 msgid "Network Cards"
 msgstr "Nettverkskort"
 
 #. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1068
+#: src/include/network/routines.rb:893
 msgid "Modems"
 msgstr "Modemer"
 
 #. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1072
+#: src/include/network/routines.rb:897
 msgid "ISDN Cards"
 msgstr "ISDN-kort"
 
 #. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1076
+#: src/include/network/routines.rb:901
 msgid "DSL Devices"
 msgstr "DSL-enheter"
 
-#: src/include/network/routines.rb:1081
+#: src/include/network/routines.rb:906
 msgid "All Network Devices"
 msgstr "Alle nettverksenheter"
 
 #. validation error popup
 #. Popup::Error text
 #: src/include/network/services/dns.rb:92
-#: src/include/network/services/host.rb:398
+#: src/include/network/services/host.rb:387
 msgid "The hostname is invalid."
 msgstr "Vertsnavnet er ugyldig."
 
@@ -3645,8 +3625,8 @@
 #. Frame label
 #. dialog caption
 #: src/include/network/services/dns.rb:234
-#: src/include/network/services/dns.rb:684
-#: src/include/network/services/dns.rb:697
+#: src/include/network/services/dns.rb:677
+#: src/include/network/services/dns.rb:690
 msgid "Hostname and Domain Name"
 msgstr "Vertsmaskin- og domenenavn"
 
@@ -3672,28 +3652,28 @@
 #. @param [String] key	the widget being validated
 #. @param [Hash] event	the event being handled
 #. @return whether valid
-#: src/include/network/services/dns.rb:496
+#: src/include/network/services/dns.rb:495
 msgid "It's not recommended to use .local as domainname due to Multicast DNS. Use it at your own risk?"
 msgstr "På grunn av multikast-DNS anbefales det ikke å bruke .local som domenenavn. Vil du bruke det likevel?"
 
 #. Popup::Error text
-#: src/include/network/services/dns.rb:520
+#: src/include/network/services/dns.rb:513
 msgid "The search list can have at most %1 domains."
 msgstr "Søkelisten kan ha maksimalt %1 domener."
 
 #. Popup::Error text
-#: src/include/network/services/dns.rb:526
+#: src/include/network/services/dns.rb:519
 msgid "The search list can have at most %1 characters."
 msgstr "Søkelisten kan ha maksimalt %1 tegn."
 
 #. Popup::Error text
-#: src/include/network/services/dns.rb:535
+#: src/include/network/services/dns.rb:528
 msgid "The search domain '%1' is invalid."
 msgstr "Søkedomenet '%1' er ugyldig."
 
 #. Standalone dialog only - embedded one is handled separately
 #. via CWMTab
-#: src/include/network/services/dns.rb:725
+#: src/include/network/services/dns.rb:718
 msgid "Hostname and Name Server Configuration"
 msgstr "Vertsnavn- og navneserveroppsett"
 
@@ -3727,27 +3707,27 @@
 "<b>vertsmaskinaliaser</b> (valgfritt) adskilt av mellomrom.</p>\n"
 
 #. Frame label
-#: src/include/network/services/host.rb:118
+#: src/include/network/services/host.rb:119
 msgid "Current Hosts"
 msgstr "Gjeldende vertsmaskiner"
 
 #. Table header label
-#: src/include/network/services/host.rb:130
+#: src/include/network/services/host.rb:131
 msgid "Hostnames"
 msgstr "Vertsnavn"
 
 #. Table header label
-#: src/include/network/services/host.rb:132
+#: src/include/network/services/host.rb:133
 msgid "Host Aliases"
 msgstr "Vertsmaskinaliaser"
 
 #. TextEntry label
-#: src/include/network/services/host.rb:351
+#: src/include/network/services/host.rb:340
 msgid "Hos&t Aliases"
 msgstr "Ver&tsmaskinaliaser"
 
 #. Popup::Error text
-#: src/include/network/services/host.rb:414
+#: src/include/network/services/host.rb:403
 msgid "Alias name \"%1\" is invalid."
 msgstr "Aliasnavnet \"%1\" er ugyldig."
 
@@ -3787,40 +3767,40 @@
 #. @param [Yast::Term] entry edited entry
 #. @param [Array] devs available devices
 #. @return route or nil, if canceled
-#: src/include/network/services/routing.rb:161
+#: src/include/network/services/routing.rb:163
 msgid "&Destination"
 msgstr "&Bestemmelsessted"
 
-#: src/include/network/services/routing.rb:167
+#: src/include/network/services/routing.rb:171
 msgid "Ge&nmask"
 msgstr "Ge&nmaske"
 
-#: src/include/network/services/routing.rb:175
+#: src/include/network/services/routing.rb:180
 msgid "&Gateway"
 msgstr "&Systemport"
 
-#: src/include/network/services/routing.rb:181
+#: src/include/network/services/routing.rb:188
 msgid "De&vice"
 msgstr "En&het"
 
 #. Popup::Error text
-#: src/include/network/services/routing.rb:240
+#: src/include/network/services/routing.rb:247
 msgid "Destination is invalid."
 msgstr "Destinasjonen er ugyldig."
 
 #. Popup::Error text
-#: src/include/network/services/routing.rb:248
+#: src/include/network/services/routing.rb:255
 msgid "Gateway IP address is invalid."
 msgstr "Systemportens IP-adresse er ugyldig."
 
 #. Popup::Error text
-#: src/include/network/services/routing.rb:256
+#: src/include/network/services/routing.rb:263
 msgid "Subnetmask is invalid."
 msgstr "Nettverksmasken er ugyldig."
 
 #. #178538 - disable routing dialog when NetworkManager is used
 #. but instead of default route (#299448) - NM reads it
-#: src/include/network/services/routing.rb:414
+#: src/include/network/services/routing.rb:422
 msgid "The default gateway is invalid."
 msgstr "Standard systemport er ugyldig."
 
@@ -4077,35 +4057,35 @@
 "(plasmaskjermelement for KDE og nm-applet for GNOME).\n"
 "Hvis den ikke allerede kjører, start den manuelt."
 
-#: src/include/network/widgets.rb:358
+#: src/include/network/widgets.rb:359
 msgid "General Network Settings"
 msgstr "Generelt nettverksoppsett"
 
-#: src/include/network/widgets.rb:402
+#: src/include/network/widgets.rb:403
 msgid "IPv6 Protocol Settings"
 msgstr "IPv6-protokollinnstillinger"
 
 #. enable ipv6 support
-#: src/include/network/widgets.rb:403 src/modules/Lan.rb:810
+#: src/include/network/widgets.rb:404 src/modules/Lan.rb:787
 msgid "Enable IPv6"
 msgstr "Aktiver IPv6"
 
 #. TRANSLATORS: Informs that device name is not known
-#: src/include/network/widgets.rb:420
+#: src/include/network/widgets.rb:421
 msgid "Unknown device"
 msgstr "Ukjent enhet"
 
 #. TRANSLATORS: Part of label, device with IP address assigned by DHCP
-#: src/include/network/widgets.rb:429
+#: src/include/network/widgets.rb:430
 msgid "DHCP address"
 msgstr "DHCP-adresse"
 
 #. TRANSLATORS: Informs that no IP has been assigned to the device
-#: src/include/network/widgets.rb:436
+#: src/include/network/widgets.rb:437
 msgid "No IP address assigned"
 msgstr "Ingen IP-adresse tilordnet"
 
-#: src/include/network/widgets.rb:439
+#: src/include/network/widgets.rb:440
 msgid ""
 "%1 \n"
 "%2 - %3"
@@ -4114,12 +4094,12 @@
 "%2 - %3"
 
 #. #186102
-#: src/include/network/widgets.rb:492
+#: src/include/network/widgets.rb:493
 msgid "&Change Device"
 msgstr "&Endre enhet"
 
 #. popup dialog title
-#: src/include/network/widgets.rb:525
+#: src/include/network/widgets.rb:526
 msgid "Network Device Select"
 msgstr "Valg av nettverksenhet"
 
@@ -4128,7 +4108,7 @@
 #. to "0.0.0.0/32"
 #.
 #. translators: a note that listed device is already configured
-#: src/include/network/widgets.rb:571
+#: src/include/network/widgets.rb:572
 #, fuzzy
 #| msgid "Not configured"
 msgid "configured"
@@ -4186,7 +4166,7 @@
 
 #. Progress stage 2
 #. Progress stage 10
-#: src/modules/DNS.rb:379 src/modules/Lan.rb:534
+#: src/modules/DNS.rb:379 src/modules/Lan.rb:537
 msgid "Update configuration"
 msgstr "Oppdater konfigurasjon"
 
@@ -4209,7 +4189,7 @@
 
 #. Progress step 2/3
 #. Progress step 10
-#: src/modules/DNS.rb:411 src/modules/Lan.rb:622
+#: src/modules/DNS.rb:411 src/modules/Lan.rb:625
 msgid "Updating configuration..."
 msgstr "Oppdaterer konfigurasjon..."
 
@@ -4221,100 +4201,100 @@
 msgstr "Oppdaterer /etc/resolve.conf..."
 
 #. Summary text
-#: src/modules/DNS.rb:538
+#: src/modules/DNS.rb:543
 msgid "Hostname: Set by DHCP"
 msgstr "Vertsnavn: Definert av DHCP"
 
 #. Summary text
-#: src/modules/DNS.rb:544
+#: src/modules/DNS.rb:549
 msgid "Hostname: %1"
 msgstr "Vertsnavn: %1"
 
-#: src/modules/DNS.rb:552
+#: src/modules/DNS.rb:557
 msgid "Hostname will not be written to /etc/hosts"
 msgstr "Vertsnavnet vil ikke bli lagret i /etc/hosts"
 
 #. Summary text
-#: src/modules/DNS.rb:573
+#: src/modules/DNS.rb:578
 msgid "Name Servers: %1"
 msgstr "Navneservere: %1"
 
 #. Summary text
-#: src/modules/DNS.rb:583
+#: src/modules/DNS.rb:588
 msgid "Search List: %1"
 msgstr "Søkeliste: %1"
 
 #. Check if there is anything to do
-#: src/modules/Host.rb:138
+#: src/modules/Host.rb:165
 msgid "Update /etc/hosts"
 msgstr "Oppdater /etc/hosts"
 
-#: src/modules/Host.rb:140
+#: src/modules/Host.rb:167
 msgid "Saving Hostname Configuration"
 msgstr "Lagrer vertsnavnoppsett"
 
 #. sleep for longer time, so that progress does not disappear right afterwards
-#: src/modules/Host.rb:145
+#: src/modules/Host.rb:172
 msgid "Updating /etc/hosts ..."
 msgstr "Oppdaterer /etc/hosts..."
 
 #. Read dialog caption
-#: src/modules/Lan.rb:272
+#: src/modules/Lan.rb:276
 msgid "Initializing Network Configuration"
 msgstr "Initialiserer nettverksoppsett"
 
 #. Progress stage 1/9
-#: src/modules/Lan.rb:285
+#: src/modules/Lan.rb:289
 msgid "Detect network devices"
 msgstr "Søk etter nettverksenheter"
 
 #. Progress stage 2/9
-#: src/modules/Lan.rb:287
+#: src/modules/Lan.rb:291
 msgid "Read driver information"
 msgstr "Les driverinformasjon"
 
 #. Progress stage 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:289
+#: src/modules/Lan.rb:293
 msgid "Read device configuration"
 msgstr "Les enhetsoppsett"
 
 #. Progress stage 4/9
-#: src/modules/Lan.rb:291
+#: src/modules/Lan.rb:295
 msgid "Read network configuration"
 msgstr "Les nettverksoppsett"
 
 #. Progress stage 5/9
-#: src/modules/Lan.rb:293
+#: src/modules/Lan.rb:297
 msgid "Read firewall settings"
 msgstr "Les brannmurinnstillinger"
 
 #. Progress stage 6/9
-#: src/modules/Lan.rb:295
+#: src/modules/Lan.rb:299
 msgid "Read hostname and DNS configuration"
 msgstr "Les vertsnavn og DNS-oppsett"
 
 #. Progress stage 7/9
-#: src/modules/Lan.rb:297
+#: src/modules/Lan.rb:301
 msgid "Read installation information"
 msgstr "Les installasjonsinformasjon"
 
 #. Progress stage 8/9
-#: src/modules/Lan.rb:299
+#: src/modules/Lan.rb:303
 msgid "Read routing configuration"
 msgstr "Les rutingoppsett"
 
 #. Progress stage 9/9
-#: src/modules/Lan.rb:301
+#: src/modules/Lan.rb:305
 msgid "Detect current status"
 msgstr "Søk etter gjeldende status"
 
 #. Progress step 1/9
-#: src/modules/Lan.rb:315
+#: src/modules/Lan.rb:319
 msgid "Detecting ndiswrapper..."
 msgstr "Søker etter ndiswrapper..."
 
 #. modprobe ndiswrapper before hwinfo when needed (#343893)
-#: src/modules/Lan.rb:334
+#: src/modules/Lan.rb:338
 msgid ""
 "Detected a ndiswrapper configuration,\n"
 "but the kernel module was not modprobed.\n"
@@ -4324,7 +4304,7 @@
 "men det ble ikke kjørt modprobe for kjernemodulen.\n"
 "Vil du kjøre modprobe for ndiswrapper?\n"
 
-#: src/modules/Lan.rb:342
+#: src/modules/Lan.rb:346
 msgid ""
 "ndiswrapper kernel module has not been loaded.\n"
 "Check configuration manually.\n"
@@ -4333,247 +4313,240 @@
 "Kontroller oppsettet manuelt.\n"
 
 #. Progress step 2/9
-#: src/modules/Lan.rb:356
+#: src/modules/Lan.rb:360
 msgid "Detecting network devices..."
 msgstr "Søker etter nettverksenheter..."
 
 #. Progress step 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:364
+#: src/modules/Lan.rb:368
 msgid "Reading device configuration..."
 msgstr "Leser enhetsoppsett..."
 
 #. Progress step 4/9
-#: src/modules/Lan.rb:370
+#: src/modules/Lan.rb:374
 msgid "Reading network configuration..."
 msgstr "Leser nettverksoppsett..."
 
 #. Progress step 5/9
-#: src/modules/Lan.rb:379
+#: src/modules/Lan.rb:383
 msgid "Reading firewall settings..."
 msgstr "Leser brannmurinnstillinger..."
 
 #. Progress step 6/9
-#: src/modules/Lan.rb:387
+#: src/modules/Lan.rb:391
 msgid "Reading hostname and DNS configuration..."
 msgstr "Leser vertsnavn og DNS-oppsett..."
 
 #. Progress step 7/9
-#: src/modules/Lan.rb:394
+#: src/modules/Lan.rb:398
 msgid "Reading installation information..."
 msgstr "Leser installasjonsinformasjon..."
 
 #. Progress step 8/9
-#: src/modules/Lan.rb:400
+#: src/modules/Lan.rb:404
 msgid "Reading routing configuration..."
 msgstr "Leser rutinginformasjon..."
 
 #. Progress step 9/9
-#: src/modules/Lan.rb:406
+#: src/modules/Lan.rb:410
 msgid "Detecting current status..."
 msgstr "Søker etter gjeldende status..."
 
 #. Final progress step
 #. Final progress step
-#: src/modules/Lan.rb:412 src/modules/Lan.rb:643
+#: src/modules/Lan.rb:416 src/modules/Lan.rb:646
 msgid "Finished"
 msgstr "Fullført"
 
 #. (a specialization used when a parameterless function is needed)
 #. @return Read(`cache)
-#: src/modules/Lan.rb:438
+#: src/modules/Lan.rb:441
 msgid "To apply this change, a reboot is needed."
 msgstr "Start maskinen på nytt for å aktivere denne endringen."
 
 #. Write dialog caption
-#: src/modules/Lan.rb:506
+#: src/modules/Lan.rb:509
 msgid "Saving Network Configuration"
 msgstr "Lagrer nettverksoppsett"
 
 #. Progress stage 2
-#: src/modules/Lan.rb:513
+#: src/modules/Lan.rb:516
 msgid "Write drivers information"
 msgstr "Lagre driverinformasjon"
 
 #. Progress stage 3 - multiple devices may be present,really plural
-#: src/modules/Lan.rb:515
+#: src/modules/Lan.rb:518
 msgid "Write device configuration"
 msgstr "Lagre enhetsoppsett"
 
 #. Progress stage 4
-#: src/modules/Lan.rb:517
+#: src/modules/Lan.rb:520
 msgid "Write network configuration"
 msgstr "Lagre nettverksoppsett"
 
 #. Progress stage 5
-#: src/modules/Lan.rb:519
+#: src/modules/Lan.rb:522
 msgid "Write routing configuration"
 msgstr "Lagre rutingoppsett"
 
 #. Progress stage 6
-#: src/modules/Lan.rb:521
+#: src/modules/Lan.rb:524
 msgid "Write hostname and DNS configuration"
 msgstr "Lagre vertsnavn og DNS-oppsett"
 
 #. Progress stage 7
-#: src/modules/Lan.rb:523
+#: src/modules/Lan.rb:526
 msgid "Set up network services"
 msgstr "Sett opp nettverkstjenester"
 
 #. Progress stage 8
 #. Progress stage 1
-#: src/modules/Lan.rb:527 src/modules/Remote.rb:293
+#: src/modules/Lan.rb:530 src/modules/Remote.rb:201
 msgid "Write firewall settings"
 msgstr "Lagre brannmurinnstillinger"
 
 #. Progress stage 9
-#: src/modules/Lan.rb:531
+#: src/modules/Lan.rb:534
 msgid "Activate network services"
 msgstr "Aktiver nettverkstjenester"
 
 #. Progress step 2
-#: src/modules/Lan.rb:547
+#: src/modules/Lan.rb:550
 msgid "Writing /etc/modprobe.conf..."
 msgstr "Lagrer /etc/modprobe.conf..."
 
 #. Progress step 3 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:552
+#: src/modules/Lan.rb:555
 msgid "Writing device configuration..."
 msgstr "Lagrer enhetsoppsett..."
 
 #. Progress step 4
-#: src/modules/Lan.rb:558
+#: src/modules/Lan.rb:561
 msgid "Writing network configuration..."
 msgstr "Lagrer nettverksoppsett..."
 
 #. Progress step 5
-#: src/modules/Lan.rb:564
+#: src/modules/Lan.rb:567
 msgid "Writing routing configuration..."
 msgstr "Lagrer rutinginformasjon..."
 
 #. Progress step 6
-#: src/modules/Lan.rb:572
+#: src/modules/Lan.rb:575
 msgid "Writing hostname and DNS configuration..."
 msgstr "Lagrer vertsnavn og DNS-oppsett..."
 
 #. Progress step 7
-#: src/modules/Lan.rb:585
+#: src/modules/Lan.rb:588
 msgid "Setting up network services..."
 msgstr "Setter opp nettverkstjenester..."
 
 #. Progress step 8
-#: src/modules/Lan.rb:593 src/modules/Remote.rb:307
+#: src/modules/Lan.rb:596 src/modules/Remote.rb:215
 msgid "Writing firewall settings..."
 msgstr "Lagrer brannmurinnstillinger..."
 
 #. Progress step 9
-#: src/modules/Lan.rb:603
+#: src/modules/Lan.rb:606
 msgid "Activating network services..."
 msgstr "Aktiverer nettverkstjenester..."
 
-#: src/modules/Lan.rb:639
+#: src/modules/Lan.rb:642
 msgid "No network running"
 msgstr "Ingen nettverk er aktivert"
 
-#. Import data
-#. @param [Hash] settings settings to be imported
-#. @return true on success
-#: src/modules/Lan.rb:698
-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:782
+#: src/modules/Lan.rb:759
 msgid "Network Mode"
 msgstr "Nettverksmodus"
 
 #. network mode: the interfaces are controlled by the user
-#: src/modules/Lan.rb:787
+#: src/modules/Lan.rb:764
 msgid "Interfaces controlled by NetworkManager"
 msgstr "Grensesnitt som kontrolleres av NetworkManager"
 
 #. disable NetworkManager applet
-#: src/modules/Lan.rb:789
+#: src/modules/Lan.rb:766
 msgid "Disable NetworkManager"
 msgstr "Deaktiver NetworkManager"
 
 #. network mode
-#: src/modules/Lan.rb:793
+#: src/modules/Lan.rb:770
 msgid "Traditional network setup with NetControl - ifup"
 msgstr "Tradisjonelt nettveksoppsett med NetControl - ifup"
 
 #. enable NetworkManager applet
 #. for virtual network proposal (bridged) don't show hyperlink to enable networkmanager
-#: src/modules/Lan.rb:796
+#: src/modules/Lan.rb:773
 msgid "Enable NetworkManager"
 msgstr "Aktiver NetworkManager"
 
 #. ipv6 support is enabled
-#: src/modules/Lan.rb:802
+#: src/modules/Lan.rb:779
 msgid "Support for IPv6 protocol is enabled"
 msgstr "Støtte for IPv6-protokollen er aktivert"
 
 #. disable ipv6 support
-#: src/modules/Lan.rb:804
+#: src/modules/Lan.rb:781
 msgid "Disable IPv6"
 msgstr "Deaktiver IPv6"
 
 #. ipv6 support is disabled
-#: src/modules/Lan.rb:808
+#: src/modules/Lan.rb:785
 msgid "Support for IPv6 protocol is disabled"
 msgstr "Støtte for IPv6-protokollen er deaktivert"
 
 #. translators: a possible value for: IPoIB device mode
-#: src/modules/LanItems.rb:193
+#: src/modules/LanItems.rb:198
 #, fuzzy
 #| msgid "Not connected"
 msgid "connected"
 msgstr "Ikke tilkoblet"
 
-#: src/modules/LanItems.rb:194
+#: src/modules/LanItems.rb:199
 msgid "datagram"
 msgstr ""
 
 #. summary description of STARTMODE=auto
 #. summary description of STARTMODE=auto
 #. summary description of STARTMODE=hotplug
-#: src/modules/LanItems.rb:1260 src/modules/LanItems.rb:1264
-#: src/modules/LanItems.rb:1268
+#: src/modules/LanItems.rb:1268 src/modules/LanItems.rb:1272
+#: src/modules/LanItems.rb:1276
 msgid "Started automatically at boot"
 msgstr "Startet automatisk ved oppstart"
 
 #. summary description of STARTMODE=ifplugd
-#: src/modules/LanItems.rb:1272
+#: src/modules/LanItems.rb:1280
 msgid "Started automatically on cable connection"
 msgstr "Startet automatisk via kabelforbindelse"
 
 #. summary description of STARTMODE=managed
-#: src/modules/LanItems.rb:1276
+#: src/modules/LanItems.rb:1284
 msgid "Managed by NetworkManager"
 msgstr "Bruk NetworkManager"
 
 #. summary description of STARTMODE=off
-#: src/modules/LanItems.rb:1280
+#: src/modules/LanItems.rb:1288
 msgid "Will not be started at all"
 msgstr "Vil ikke bli startet i det hele tatt"
 
-#: src/modules/LanItems.rb:1286
+#: src/modules/LanItems.rb:1294
 msgid "Started manually"
 msgstr "Startet manuelt"
 
 #. do nothing
-#: src/modules/LanItems.rb:1298
+#: src/modules/LanItems.rb:1306
 msgid "IP address assigned using"
 msgstr "IP-adresse tildelt via"
 
-#: src/modules/LanItems.rb:1302
+#: src/modules/LanItems.rb:1310
 #, fuzzy
 #| msgid "IP address: %1/%2"
 msgid "IP address: %s/%s"
 msgstr "IP-adresse: %1/%2"
 
-#: src/modules/LanItems.rb:1305
+#: src/modules/LanItems.rb:1313
 #, fuzzy
 #| msgid "IP address: %1, subnet mask %2"
 msgid "IP address: %s, subnet mask %s"
@@ -4581,46 +4554,46 @@
 
 #. FIXME: side effect: sets @type. No reason for that. It should only build item
 #. overview. Check and remove.
-#: src/modules/LanItems.rb:1329
+#: src/modules/LanItems.rb:1337
 msgid "Not configured"
 msgstr "Ikke satt opp"
 
 #. display it only if we need it, don't duplicate "ifcfg_name" above
-#: src/modules/LanItems.rb:1351 src/modules/LanItems.rb:1411
+#: src/modules/LanItems.rb:1359 src/modules/LanItems.rb:1421
 #, fuzzy
 #| msgid "Device Name: %1"
 msgid "Device Name: %s"
 msgstr "Enhetsnavn: %1"
 
-#: src/modules/LanItems.rb:1372
+#: src/modules/LanItems.rb:1380
 msgid "Bonding slaves"
 msgstr "Bonding-slaver"
 
-#: src/modules/LanItems.rb:1386
+#: src/modules/LanItems.rb:1394
 #, fuzzy
 #| msgid "enslaved in %1"
 msgid "enslaved in %s"
 msgstr "slave i %1"
 
-#: src/modules/LanItems.rb:1387
+#: src/modules/LanItems.rb:1395
 msgid "Bonding master"
 msgstr "Bonding-master"
 
-#: src/modules/LanItems.rb:1401
+#: src/modules/LanItems.rb:1409
 msgid "Not connected"
 msgstr "Ikke tilkoblet"
 
-#: src/modules/LanItems.rb:1402
+#: src/modules/LanItems.rb:1410
 msgid "No hwinfo"
 msgstr "Ingen maskinvareinfo"
 
-#: src/modules/LanItems.rb:1417
+#: src/modules/LanItems.rb:1427
 #, fuzzy
 #| msgid "<p>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.</p>"
 msgid "Unable to configure the network card because the kernel device (eth0, wlan0) is not present. This is mostly caused by missing firmware (for wlan devices). See dmesg output for details."
 msgstr "<p>Kunne ikke sette opp nettverkskortet fordi kjerneenheten (eth0, wlan0) ikke finnes. Dette skyldes vanligvis manglende fastvare (for wlan-enheter). Se resultatet av dmesg-kommandoen.</p>"
 
-#: src/modules/LanItems.rb:1423
+#: src/modules/LanItems.rb:1433
 #, fuzzy
 #| msgid ""
 #| "<p>The device is not configured. Press <b>Edit</b>\n"
@@ -4632,17 +4605,17 @@
 "<p>Enheten er ikke satt opp. Klikk <b>Rediger</b>\n"
 "for å gå til oppsett.</p>\n"
 
-#: src/modules/LanItems.rb:1430
+#: src/modules/LanItems.rb:1440
 msgid "Needed firmware"
 msgstr "Nødvendig fastvare"
 
-#: src/modules/LanItems.rb:1430
+#: src/modules/LanItems.rb:1440
 msgid "unknown"
 msgstr "ukjent"
 
 #. Package containing SuSEfirewall2 services has to be installed before
 #. reading SuSEFirewall, otherwise exception is thrown by firewall
-#: src/modules/Remote.rb:243
+#: src/modules/Remote.rb:158
 #, fuzzy
 #| msgid "SuSEfirewall2 package is not installed, firewall will be disabled."
 msgid ""
@@ -4651,37 +4624,42 @@
 msgstr "SuSEfirewall2-pakken er ikke installert, brannveggsfunksjonalitet vil bli deaktivert."
 
 #. Progress stage 2
-#: src/modules/Remote.rb:295
+#: src/modules/Remote.rb:203
 msgid "Configure display manager"
 msgstr "Sett opp vindusbehandler"
 
 #. Progress stage 3
-#: src/modules/Remote.rb:300
+#: src/modules/Remote.rb:208
 msgid "Restart the services"
 msgstr "Start tjenesten på nytt"
 
-#: src/modules/Remote.rb:303
+#: src/modules/Remote.rb:211
 msgid "Saving Remote Administration Configuration"
 msgstr "Lagrer oppsett av ekstern administrasjon"
 
-#: src/modules/Remote.rb:312
+#: src/modules/Remote.rb:220
 msgid "Configuring display manager..."
 msgstr "Setter opp vindusbehandler..."
 
-#: src/modules/Remote.rb:316
+#: src/modules/Remote.rb:224
 msgid "Restarting the service..."
 msgstr "Starter tjenesten på nytt..."
 
-#. Enable xinetd
-#. Enable XDM
-#: src/modules/Remote.rb:342 src/modules/Remote.rb:350
+#. Install required packages
+#: src/modules/Remote.rb:261
 #, fuzzy
 #| msgid "Enabling service 'uml' failed."
 msgid "Enabling service %{service} has failed"
 msgstr "Aktivering av tjenesten'uml' mislyktes."
 
+#: src/modules/Remote.rb:267
+#, fuzzy
+#| msgid "Enabling service 'uml' failed."
+msgid "Disabling service %{service} has failed"
+msgstr "Aktivering av tjenesten'uml' mislyktes."
+
 #. Do this only if package xinetd is installed (#256385)
-#: src/modules/Remote.rb:377
+#: src/modules/Remote.rb:295
 msgid ""
 "Your display manager must be restarted.\n"
 "To take the changes in remote administration into account, \n"
@@ -4689,30 +4667,30 @@
 msgstr ""
 
 #. description in proposal
-#: src/modules/Remote.rb:408
+#: src/modules/Remote.rb:332
 msgid "Remote administration is enabled."
 msgstr "Ekstern administrasjon er aktivert."
 
-#: src/modules/Remote.rb:408
+#: src/modules/Remote.rb:332
 msgid "Remote administration is disabled."
 msgstr "Ekstern administrasjon is deaktivert."
 
 #. Progress stage 1
-#: src/modules/Routing.rb:261
+#: src/modules/Routing.rb:264
 msgid "Write IP forwarding settings"
 msgstr "Lagre oppsett for IP-overføring"
 
 #. Progress stage 2
-#: src/modules/Routing.rb:263
+#: src/modules/Routing.rb:266
 msgid "Write routing settings"
 msgstr "Lagre oppsett for ruter"
 
-#: src/modules/Routing.rb:266
+#: src/modules/Routing.rb:269
 msgid "Saving Routing Configuration"
 msgstr "Lagrer oppsett for ruter"
 
 #. Progress stage 1/2
-#: src/modules/Routing.rb:271
+#: src/modules/Routing.rb:274
 msgid "Writing IP forwarding settings..."
 msgstr "Lagrer oppsett for IP-overføring..."
 
@@ -4721,26 +4699,26 @@
 #. sysconfig does not support restarting routes only,
 #. so we let our caller do it together with other things
 #. Progress stage 2/2
-#: src/modules/Routing.rb:281
+#: src/modules/Routing.rb:284
 msgid "Writing routing settings..."
 msgstr "Lagrer oppsett for ruter..."
 
 #. Summary text
-#: src/modules/Routing.rb:434
+#: src/modules/Routing.rb:454
 #, fuzzy
 #| msgid "Gateway: %1"
 msgid "Gateway: %s"
 msgstr "Systemport: %1"
 
 #. Summary text
-#: src/modules/Routing.rb:438
+#: src/modules/Routing.rb:458
 #, fuzzy
 #| msgid "IP Forwarding:"
 msgid "IP Forwarding for IPv4: %s"
 msgstr "IP-overføring:"
 
 #. Summary text
-#: src/modules/Routing.rb:442
+#: src/modules/Routing.rb:462
 #, fuzzy
 #| msgid "IP Forwarding:"
 msgid "IP Forwarding for IPv6: %s"
@@ -4761,6 +4739,42 @@
 msgid "(Unprotected)"
 msgstr "(ubeskyttet"
 
+#~ msgid "Configuration Successfully Saved"
+#~ msgstr "Oppsettet er lagret"
+
+#~ msgid "DNS Configuration Successfully Saved"
+#~ msgstr "DNS-oppsettet er lagret"
+
+#~ msgid "DSL Configuration Successfully Saved"
+#~ msgstr "DSL-oppsettet er lagret"
+
+#~ msgid "Hosts Configuration Successfully Saved"
+#~ msgstr "Vertsmaskinoppsettet er lagret"
+
+#~ msgid "ISDN Configuration Successfully Saved"
+#~ msgstr "ISDN-oppsettet er lagret"
+
+#~ msgid "Network Card Configuration Successfully Saved"
+#~ msgstr "Oppsettet for nettverkskort er lagret"
+
+#~ msgid "Modem Configuration Successfully Saved"
+#~ msgstr "Modemoppsettet er lagret"
+
+#~ msgid "Proxy Configuration Successfully Saved"
+#~ msgstr "Mellomserveroppsettet er lagret"
+
+#~ msgid "Provider Configuration Successfully Saved"
+#~ msgstr "Leverandøroppsettet er lagret"
+
+#~ msgid "Routing Configuration Successfully Saved"
+#~ msgstr "Rutingoppsettet er lagret"
+
+#~ msgid "Configure mail now?"
+#~ msgstr "Vil du sette opp e-postsystemet nå?"
+
+#~ msgid "Run configuration of %1?"
+#~ msgstr "Vil du sette opp %1?"
+
 #~ msgid "Device boot protocol"
 #~ msgstr "Enhetsoppstartsprotokoll"
 

Modified: trunk/yast/nb/po/nfs.nb.po
===================================================================
--- trunk/yast/nb/po/nfs.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/nfs.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: nfs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2009-08-12 12:50+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -142,7 +142,7 @@
 "Gyldig domene: %3"
 
 #. error popup message
-#: src/include/nfs/routines.rb:116
+#: src/include/nfs/routines.rb:115
 msgid ""
 "fstab already contains an entry\n"
 "with mount point '%1'."
@@ -151,7 +151,7 @@
 "med monteringspunktet '%1'."
 
 #. error popup message (spaces are now allowed)
-#: src/include/nfs/routines.rb:139
+#: src/include/nfs/routines.rb:137
 msgid ""
 "The path entered is invalid.\n"
 "It must be shorter than 70 characters\n"
@@ -394,12 +394,12 @@
 msgstr "Konfigurasjon av NFS-klient"
 
 #. error popup message
-#: src/modules/Nfs.rb:387
+#: src/modules/Nfs.rb:385
 msgid "Unable to create directory '%1'."
 msgstr "Kunne ikke opprette katalogen '%1'."
 
 #. error popup message
-#: src/modules/Nfs.rb:405
+#: src/modules/Nfs.rb:403
 msgid ""
 "Unable to write to /etc/fstab.\n"
 "No changes will be made to the\n"
@@ -410,52 +410,52 @@
 "NFS-klientkonfigurasjonen.\n"
 
 #. dialog label
-#: src/modules/Nfs.rb:447
+#: src/modules/Nfs.rb:446
 msgid "Writing NFS Configuration"
 msgstr "Lagrer NFS-konfigurasjon"
 
 #. progress stage label
-#: src/modules/Nfs.rb:452
+#: src/modules/Nfs.rb:451
 msgid "Stop services"
 msgstr "Deaktiver tjenester"
 
 #. progress stage label
-#: src/modules/Nfs.rb:454
+#: src/modules/Nfs.rb:453
 msgid "Start services"
 msgstr "Aktiver tjenester"
 
 #. progress step label
-#: src/modules/Nfs.rb:458
+#: src/modules/Nfs.rb:457
 msgid "Stopping services..."
 msgstr "Deaktiverer tjenester..."
 
 #. progress step label
-#: src/modules/Nfs.rb:460
+#: src/modules/Nfs.rb:459
 msgid "Starting services..."
 msgstr "Aktiverer tjenester..."
 
 #. final progress step label
-#: src/modules/Nfs.rb:462
+#: src/modules/Nfs.rb:461
 msgid "Finished"
 msgstr "Fullført"
 
 #. help text
-#: src/modules/Nfs.rb:468
+#: src/modules/Nfs.rb:467
 msgid "Writing NFS client settings. Please wait..."
 msgstr "Lagrer innstillinger for NFS-klient. Vent..."
 
 #. error popup message
-#: src/modules/Nfs.rb:488
+#: src/modules/Nfs.rb:487
 msgid "Unable to mount the NFS entries from /etc/fstab."
 msgstr "Kan ikke montere NFS-oppføringer fra /etc/fstab."
 
 #. summary header
-#: src/modules/Nfs.rb:510
+#: src/modules/Nfs.rb:506
 msgid "NFS Entries"
 msgstr "NFS-oppføringer"
 
 #. summary item, %1 is a number
-#: src/modules/Nfs.rb:514
+#: src/modules/Nfs.rb:510
 msgid "%1 entries configured"
 msgstr "%1 oppføringer er konfigurert"
 

Modified: trunk/yast/nb/po/nis.nb.po
===================================================================
--- trunk/yast/nb/po/nis.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/nis.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: nis\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2008-09-25 07:30+0200\n"
 "Last-Translator: Olav P. \n"
 "Language-Team: Norwegian Bokmål <>\n"
@@ -267,9 +267,10 @@
 msgstr "&Adresser for NIS-servere"
 
 #. check box label
-#: src/include/nis/ui.rb:411
-msgid "Br&oadcast"
-msgstr "Kr&ingkast"
+#. checkbox label
+#: src/include/nis/ui.rb:411 src/include/nis/ui.rb:853
+msgid "&Broadcast"
+msgstr "&Kringkasting"
 
 #. pushbutton label, find nis servers
 #. Shortcut must not conflict with Finish and Next (#29960)
@@ -382,11 +383,6 @@
 msgstr "&Servere (adskilt av mellomrom eller komma)"
 
 #. checkbox label
-#: src/include/nis/ui.rb:853
-msgid "&Broadcast"
-msgstr "&Kringkasting"
-
-#. checkbox label
 #: src/include/nis/ui.rb:859
 msgid "&SLP"
 msgstr "&SLP"
@@ -595,6 +591,9 @@
 msgid "NIS server not found."
 msgstr "NIS-serveren ble ikke funnet."
 
+#~ msgid "Br&oadcast"
+#~ msgstr "Kr&ingkast"
+
 #~ msgid "<p>If you are using <b>DHCP</b> and the server provides the NIS domain name or servers, you can enable their use here. DHCP itself can be set up in the network module.</p>"
 #~ msgstr "<p>Hvis du bruker <b>DHCP</b> for å definere NIS-domenenavn eller tjenere, kan du aktivere dette her. DHCP kan settes opp i nettverksmodulen.</p>"
 

Modified: trunk/yast/nb/po/ntp-client.nb.po
===================================================================
--- trunk/yast/nb/po/ntp-client.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/ntp-client.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: ntp-client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2009-08-12 12:57+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -30,7 +30,7 @@
 msgstr "Lagrer NTP-oppsett..."
 
 #. help text
-#: src/clients/ntp-client_proposal.rb:92
+#: src/clients/ntp-client_proposal.rb:90
 msgid "<p>Press <b>Synchronize Now</b>, to get your system time set correctly using the selected NTP server. If you want to make use of NTP permanently, enable the <b>Save NTP Configuration</b> option</p>"
 msgstr "<p>Klikk <b>Synkroniser nå</b> for å stille inn riktig systemtid ved hjelp av valgt NTP- server. Hvis du vil bruke NTP permanent, kryss av for <b>Lagre NTP-oppsett</b>.</p>"
 
@@ -39,48 +39,48 @@
 msgstr "<p>Velg <b>Kjør NTP som nisse</b> for å starte NTP-tjenesten som en nisse. Hvis ikke, vil systemklokken bli justert periodisk. Standardintervallet er 15 min. Du kan endre dette etter installasjonen i NTP-klientmodulen i <b>YaST</b>.</p>"
 
 #. help text, cont.
-#: src/clients/ntp-client_proposal.rb:107
+#: src/clients/ntp-client_proposal.rb:110
 msgid "<p>Using the <b>Configure</b> button, open the advanced NTP configuration.</p>"
 msgstr "<p>Klikk <b>Sett opp</b> for å gå til avansert NTP-oppsett.</p>"
 
 #. help text, cont.
-#: src/clients/ntp-client_proposal.rb:116
+#: src/clients/ntp-client_proposal.rb:119
 msgid "<p>Synchronization with the NTP server can be done only when the network is configured.</p>"
 msgstr "<p>Synkronisering med NTP-serveren kan ikke utføres før nettverket er satt opp.</p>"
 
 #. translators: error popup
-#: src/clients/ntp-client_proposal.rb:141
+#: src/clients/ntp-client_proposal.rb:145
 msgid "Invalid NTP server hostname %1"
 msgstr "Vertsnavnet %1 for NTP-serveren er ugyldig"
 
 #. combo box label
-#: src/clients/ntp-client_proposal.rb:240
+#: src/clients/ntp-client_proposal.rb:243
 msgid "&NTP Server Address"
 msgstr "&NTP-serveradresse"
 
 #. check box label
-#: src/clients/ntp-client_proposal.rb:250
+#: src/clients/ntp-client_proposal.rb:253
 msgid "&Run NTP as daemon"
 msgstr "Kjø&r NTP som nisse"
 
 #. check box label
-#: src/clients/ntp-client_proposal.rb:259
+#: src/clients/ntp-client_proposal.rb:262
 msgid "&Save NTP Configuration"
 msgstr "Lagre NTP-opp&sett"
 
 #. push button label
-#: src/clients/ntp-client_proposal.rb:269
+#: src/clients/ntp-client_proposal.rb:272
 msgid "S&ynchronize now"
 msgstr "S&ynkroniser nå"
 
 #. push button label
 #. bnc#449615: only simple config for inst-sys
-#: src/clients/ntp-client_proposal.rb:275
+#: src/clients/ntp-client_proposal.rb:276
 msgid "&Configure..."
 msgstr "&Konfigurer..."
 
 #. Otherwise, prompt user for confirming pkg installation
-#: src/clients/ntp-client_proposal.rb:380
+#: src/clients/ntp-client_proposal.rb:379
 msgid ""
 "Synchronization with NTP server is not possible\n"
 "without package %1 installed."
@@ -89,12 +89,12 @@
 "uten at pakken %1 er installert."
 
 #. Only if network is running try to synchronize the ntp server
-#: src/clients/ntp-client_proposal.rb:392
+#: src/clients/ntp-client_proposal.rb:391
 msgid "Synchronizing with NTP server..."
 msgstr "Synkroniserer med NTP-server..."
 
 #. update time widgets
-#: src/clients/ntp-client_proposal.rb:438
+#: src/clients/ntp-client_proposal.rb:439
 #, fuzzy
 #| msgid "Connection to the LDAP server cannot be established."
 msgid "Connection to selected NTP server failed."
@@ -102,7 +102,7 @@
 
 #. Translators: yes-no popup,
 #. ntpdate is a command, %1 is the server address
-#: src/clients/ntp-client_proposal.rb:469
+#: src/clients/ntp-client_proposal.rb:470
 #, fuzzy
 #| 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?"
 msgid ""
@@ -309,273 +309,267 @@
 msgstr "JJY-mottakere"
 
 #. command line help text for NTP client module
-#: src/include/ntp-client/commandline.rb:23
+#: src/include/ntp-client/commandline.rb:22
 msgid "NTP client configuration module."
 msgstr "Konfigurasjonsmodul for NTP-klient."
 
 #. command line help text for an action
-#: src/include/ntp-client/commandline.rb:33
+#: src/include/ntp-client/commandline.rb:32
 msgid "Print the status of the NTP daemon"
 msgstr "Skriv ut status for NTP-nisse"
 
 #. command line help text for an action
-#: src/include/ntp-client/commandline.rb:40
+#: src/include/ntp-client/commandline.rb:39
 msgid "Print all configured synchronization relationships"
 msgstr "Skriv ut alle konfigurerte synkroniseringsforbindelser"
 
 #. command line help text for an action
-#: src/include/ntp-client/commandline.rb:47
+#: src/include/ntp-client/commandline.rb:46
 msgid "Enable the NTP daemon"
 msgstr "Aktiver NTP-nisse"
 
 #. command line help text for an action
-#: src/include/ntp-client/commandline.rb:54
+#: src/include/ntp-client/commandline.rb:53
 msgid "Disable the NTP daemon"
 msgstr "Deaktiver NTP-nisse"
 
 #. command line help text for an action
-#: src/include/ntp-client/commandline.rb:61
+#: src/include/ntp-client/commandline.rb:60
 msgid "Add new synchronization relationship"
 msgstr "Legg til ny synkroniseringsforbindelse"
 
 #. command line help text for an action
-#: src/include/ntp-client/commandline.rb:68
+#: src/include/ntp-client/commandline.rb:67
 msgid "Edit existing synchronization relationship"
 msgstr "Rediger en eksisterende synkroniseringsforbindelse"
 
 #. command line help text for an action
-#: src/include/ntp-client/commandline.rb:75
+#: src/include/ntp-client/commandline.rb:74
 msgid "Delete a synchronization relationship"
 msgstr "Slett en synkroniseringsforbindelse"
 
 #. command line help text for an option
-#: src/include/ntp-client/commandline.rb:83
+#: src/include/ntp-client/commandline.rb:82
 msgid "The address of the server"
 msgstr "Angi serveradressen"
 
 #. command line help text for an option
-#: src/include/ntp-client/commandline.rb:90
+#: src/include/ntp-client/commandline.rb:89
 msgid "The address of the peer"
 msgstr "Angi direkteforbindelsens adresse"
 
 #. command line help text for an option
-#: src/include/ntp-client/commandline.rb:97
+#: src/include/ntp-client/commandline.rb:96
 msgid "The address to which to broadcast"
 msgstr "Adressen det skal kringkastes til"
 
 #. command line help text for an option
-#: src/include/ntp-client/commandline.rb:104
+#: src/include/ntp-client/commandline.rb:103
 msgid "The address from which to accept broadcasts"
 msgstr "Adressen kringkasting skal tillates fra"
 
 #. command line help text for an option
-#: src/include/ntp-client/commandline.rb:111
+#: src/include/ntp-client/commandline.rb:110
 msgid "The options of the relationship"
 msgstr "Alternativer for forbindelsen"
 
 #. command line help text for an option
-#: src/include/ntp-client/commandline.rb:118
+#: src/include/ntp-client/commandline.rb:117
 msgid "Options for clock driver calibration"
 msgstr "Alternativer for kalibrering av klokkedriver"
 
 #. command line help text for an option
-#: src/include/ntp-client/commandline.rb:125
+#: src/include/ntp-client/commandline.rb:124
 msgid "Use the server for initial synchronization"
 msgstr "Bruk serveren ved første synkronisering"
 
 #. command line help text for an option
-#: src/include/ntp-client/commandline.rb:131
+#: src/include/ntp-client/commandline.rb:130
 msgid "Do not use the server for initial synchronization"
 msgstr "Ikke bruk serveren ved første synkronisering"
 
 #. error report for command line
-#: src/include/ntp-client/commandline.rb:191
+#: src/include/ntp-client/commandline.rb:190
 msgid "The synchronization peer not specified."
 msgstr "Synkroniseringsforbindelse ikke spesifisert."
 
 #. error report for command line
-#: src/include/ntp-client/commandline.rb:198
+#: src/include/ntp-client/commandline.rb:197
 msgid "Specified synchronization peer not found."
 msgstr "Spesifisert synkroniseringsforbindelse ikke funnet."
 
 #. status information for command line
-#: src/include/ntp-client/commandline.rb:252
+#: src/include/ntp-client/commandline.rb:249
 msgid "NTP daemon is enabled."
 msgstr "NTP-nisse er aktivert."
 
-#. status information for command line
-#: src/include/ntp-client/commandline.rb:254
+#: src/include/ntp-client/commandline.rb:249
 msgid "NTP daemon is disabled."
 msgstr "NTP-nisse er deaktivert."
 
 #. table cell, NTP relationship type
 #. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:268
-#: src/include/ntp-client/widgets.rb:565
+#: src/include/ntp-client/commandline.rb:262
+#: src/include/ntp-client/widgets.rb:542
 msgid "Server"
 msgstr "Server"
 
 #. table cell, NTP relationship type
 #. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:270
-#: src/include/ntp-client/widgets.rb:567
+#: src/include/ntp-client/commandline.rb:264
+#: src/include/ntp-client/widgets.rb:544
 msgid "Peer"
 msgstr "Direkteforbindelse"
 
 #. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:272
+#: src/include/ntp-client/commandline.rb:266
 msgid "Broadcast"
 msgstr "Kringkasting"
 
 #. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:274
+#: src/include/ntp-client/commandline.rb:268
 msgid "Accepting Broadcasts"
 msgstr "Tillater kringkasting"
 
 #. table cell, %1 is integer 0-3
 #. table cell, %1 is integer 0-3
-#: src/include/ntp-client/commandline.rb:288
-#: src/include/ntp-client/widgets.rb:587
+#: src/include/ntp-client/commandline.rb:281
+#: src/include/ntp-client/widgets.rb:564
 msgid "Unit Number: %1"
 msgstr "Enhetsnummer: %1"
 
 #. table cell, NTP relationship type
 #. table cell, NTP relationship type
-#: src/include/ntp-client/commandline.rb:294
-#: src/include/ntp-client/widgets.rb:593
+#: src/include/ntp-client/commandline.rb:287
+#: src/include/ntp-client/widgets.rb:570
 msgid "Local Radio Clock"
 msgstr "Lokal radioklokke"
 
 #. command line error message
-#: src/include/ntp-client/commandline.rb:344
+#: src/include/ntp-client/commandline.rb:335
 msgid "Reading the settings failed."
 msgstr "Innstillingene kunne ikke leses."
 
 #. frame label
-#: src/include/ntp-client/dialogs.rb:100
+#: src/include/ntp-client/dialogs.rb:99
 msgid "NTP Server Configuration"
 msgstr "Konfigurasjon av NTP-server"
 
 #. dialog caption
-#: src/include/ntp-client/dialogs.rb:113
+#: src/include/ntp-client/dialogs.rb:112
 msgid "NTP Configuration"
 msgstr "NTP-konfigurasjon"
 
-#. TRANSLATORS: UI frame label
-#: src/include/ntp-client/dialogs.rb:177
-msgid "Firewall Settings"
-msgstr "Brannmurinnstillinger"
-
-#: src/include/ntp-client/dialogs.rb:189
+#. Main dialog
+#. @return [Symbol] for wizard sequencer
+#: src/include/ntp-client/dialogs.rb:184
 msgid "General Settings"
 msgstr "Generelle innstillinger"
 
-#: src/include/ntp-client/dialogs.rb:200
+#: src/include/ntp-client/dialogs.rb:195
 msgid "Security Settings"
 msgstr "Sikkerhetsinnstillinger"
 
 #. dialog caption
-#: src/include/ntp-client/dialogs.rb:229
+#: src/include/ntp-client/dialogs.rb:222
 msgid "Advanced NTP Configuration"
 msgstr "Avansert NTP-konfigurasjon"
 
 #. dialog caption
-#: src/include/ntp-client/dialogs.rb:260
+#: src/include/ntp-client/dialogs.rb:253
 msgid "New Synchronization"
 msgstr "Ny synkronisering"
 
 #. Server editing dialog
 #. @return [Symbol] for wizard sequencer
-#: src/include/ntp-client/dialogs.rb:285
+#: src/include/ntp-client/dialogs.rb:276
 msgid "Server Settings"
 msgstr "Serverinnstillinger"
 
 #. dialog caption
-#: src/include/ntp-client/dialogs.rb:301
+#: src/include/ntp-client/dialogs.rb:292
 msgid "NTP Server"
 msgstr "NTP-server"
 
 #. TRANSLATORS: frame label
-#: src/include/ntp-client/dialogs.rb:331
-#: src/include/ntp-client/widgets.rb:1548
+#: src/include/ntp-client/dialogs.rb:320 src/include/ntp-client/widgets.rb:1492
 msgid "Local NTP Server"
 msgstr "Lokal NTP-server"
 
 #. TRANSLATORS: frame label
-#: src/include/ntp-client/dialogs.rb:377
-#: src/include/ntp-client/widgets.rb:1549
+#: src/include/ntp-client/dialogs.rb:364 src/include/ntp-client/widgets.rb:1493
 msgid "Public NTP Server"
 msgstr "Offentlig NTP-server"
 
 #. dialog caption
-#: src/include/ntp-client/dialogs.rb:420
+#: src/include/ntp-client/dialogs.rb:405
 msgid "NTP Peer"
 msgstr "NTP-server"
 
 #. dialog caption
-#: src/include/ntp-client/dialogs.rb:459
+#: src/include/ntp-client/dialogs.rb:442
 msgid "Local Reference Clock"
 msgstr "Lokal referanseklokke"
 
 #. dialog caption
 #. table cell, NTP relationship type
-#: src/include/ntp-client/dialogs.rb:494 src/include/ntp-client/widgets.rb:569
+#: src/include/ntp-client/dialogs.rb:475 src/include/ntp-client/widgets.rb:546
 msgid "Outgoing Broadcast"
 msgstr "Utgående kringkasting"
 
 #. dialog caption
 #. table cell, NTP relationship type
-#: src/include/ntp-client/dialogs.rb:521 src/include/ntp-client/widgets.rb:573
+#: src/include/ntp-client/dialogs.rb:500 src/include/ntp-client/widgets.rb:550
 msgid "Incoming Broadcast"
 msgstr "Innkommende kringkasting"
 
 #. text entry
-#: src/include/ntp-client/dialogs.rb:547
+#: src/include/ntp-client/dialogs.rb:524
 msgid "&Reference ID"
 msgstr "&Referanse-ID"
 
 #. int field
-#: src/include/ntp-client/dialogs.rb:550
+#: src/include/ntp-client/dialogs.rb:527
 msgid "&Stratum"
 msgstr "&Stratum"
 
 #. text entry
-#: src/include/ntp-client/dialogs.rb:555
+#: src/include/ntp-client/dialogs.rb:532
 msgid "Calibration Offset 1"
 msgstr "Kalibreringsforsinkelse 1"
 
 #. text entry
-#: src/include/ntp-client/dialogs.rb:558
+#: src/include/ntp-client/dialogs.rb:535
 msgid "Calibration Offset 2"
 msgstr "Kalibreringsforsinkelse 2"
 
 #. check box
-#: src/include/ntp-client/dialogs.rb:563
+#: src/include/ntp-client/dialogs.rb:540
 msgid "Flag &1"
 msgstr "Flagg &1"
 
 #. check box
-#: src/include/ntp-client/dialogs.rb:566
+#: src/include/ntp-client/dialogs.rb:543
 msgid "Flag &2"
 msgstr "Flagg &2"
 
 #. check box
-#: src/include/ntp-client/dialogs.rb:571
+#: src/include/ntp-client/dialogs.rb:548
 msgid "Flag &3"
 msgstr "Flagg &3"
 
 #. check box
-#: src/include/ntp-client/dialogs.rb:574
+#: src/include/ntp-client/dialogs.rb:551
 msgid "Flag &4"
 msgstr "Flagg &4"
 
 #. dialog caption
-#: src/include/ntp-client/dialogs.rb:582
+#: src/include/ntp-client/dialogs.rb:559
 msgid "Clock Driver Calibration"
 msgstr "Kalibrering av klokkedriver"
 
 #. Read dialog help 1/2
-#: src/include/ntp-client/helps.rb:17
+#: src/include/ntp-client/helps.rb:18
 msgid ""
 "<p><b><big>Initializing NTP Client Configuration</big></b><br>\n"
 "Please wait...<br></p>"
@@ -584,7 +578,7 @@
 "Vent...<br></p>"
 
 #. Read dialog help 2/2
-#: src/include/ntp-client/helps.rb:21
+#: src/include/ntp-client/helps.rb:22
 msgid ""
 "<p><b><big>Aborting Initialization:</big></b><br>\n"
 "Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
@@ -593,7 +587,7 @@
 "Du kan trygt avbryte konfigurasjonsverktøyet ved å klikke <b>Avbryt</b> nå.</p>"
 
 #. Write dialog help 1/2
-#: src/include/ntp-client/helps.rb:25
+#: src/include/ntp-client/helps.rb:27
 msgid ""
 "<p><b><big>Saving NTP Client Configuration</big></b><br>\n"
 "Please wait...<br></p>"
@@ -602,7 +596,7 @@
 "Vent...<br></p>"
 
 #. Write dialog help 2/2
-#: src/include/ntp-client/helps.rb:29
+#: src/include/ntp-client/helps.rb:31
 msgid ""
 "<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing  <b>Abort</b>.\n"
@@ -612,8 +606,8 @@
 "Avbryt lagringen ved å klikke <b>Avbryt</b>.\n"
 "En ny dialog forteller deg om det er trygt å gjøre dette.</p>"
 
-#. help text 1/5
-#: src/include/ntp-client/helps.rb:35
+#. help text 1/5, %d is a number of minutes
+#: src/include/ntp-client/helps.rb:37
 #, fuzzy
 #| msgid ""
 #| "<p><b><big>Start NTP Daemon</big></b><br>\n"
@@ -623,11 +617,9 @@
 msgid ""
 "<p><b><big>Start NTP Daemon</big></b><br>\n"
 "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."
+"Selecting <b>Synchronize without Daemon</b> the NTP daemon will not be activated\n"
+"and the system time will be set periodically by a <i>cron</i> script. \n"
+"The interval is configurable, by default it is %d minutes."
 msgstr ""
 "<p><b><big>Aktiver NTP-nisse</big></b><br>\n"
 "Velg om NTP-nissen skal aktiveres nå og under hver oppstart av systemet.\n"
@@ -660,7 +652,7 @@
 "Tilgangskontrollvalgene kan finjusteres i serveroversiktstabellen. Dette valget er ikke tilgjengelig hvis NTP er satt opp via DHCP.</p>\n"
 
 #. help text 3/5
-#: src/include/ntp-client/helps.rb:58
+#: src/include/ntp-client/helps.rb:60
 msgid ""
 "<p><b><big>Configuring via DHCP</big></b><br>\n"
 "To retrieve the information about NTP servers via the DHCP protocol from\n"
@@ -675,7 +667,7 @@
 "informasjon om NTP-servere er tilgjengelig via DHCP-serveren.</p>"
 
 #. help text 4/5
-#: src/include/ntp-client/helps.rb:66
+#: src/include/ntp-client/helps.rb:68
 msgid ""
 "<p><b><big>Configured Servers</big></b><br>\n"
 "To adjust NTP servers, peers, local clocks, and NTP broadcasting,\n"
@@ -690,7 +682,7 @@
 "og klikk <b>Slett</b> for å slette den.</p>"
 
 #. help text 5/5
-#: src/include/ntp-client/helps.rb:74
+#: src/include/ntp-client/helps.rb:76
 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"
@@ -699,7 +691,7 @@
 "Du kan vise loggene fra NTP-nissen ved å klikke på <b>Vis logg</b>.</p>\n"
 
 #. help text to a button
-#: src/include/ntp-client/helps.rb:78
+#: src/include/ntp-client/helps.rb:81
 msgid ""
 "<p><b><big>Advanced configuration</big></b><br>\n"
 "To configure this host to synchronize against multiple remote hosts or against\n"
@@ -710,7 +702,7 @@
 "en lokalt tilkoblet klokke, velg <b>Avansert konfigurasjon</b>."
 
 #. help text 1/4
-#: src/include/ntp-client/helps.rb:84
+#: src/include/ntp-client/helps.rb:87
 msgid ""
 "<p><b><big>Clock Type</big></b><br>\n"
 "Select the driver for the clock to configure.</p>"
@@ -719,7 +711,7 @@
 "Velg driveren for klokken som skal konfigureres.</p>"
 
 #. help text 2/4
-#: src/include/ntp-client/helps.rb:88
+#: src/include/ntp-client/helps.rb:91
 msgid ""
 "<p><b><big>Unit Number</big></b><br>\n"
 "If you have multiple clocks of the same type, you must set\n"
@@ -730,7 +722,7 @@
 "<b>Enhetsnummer</b>.</p>"
 
 #. help text 3/4
-#: src/include/ntp-client/helps.rb:94
+#: src/include/ntp-client/helps.rb:97
 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"
@@ -748,7 +740,7 @@
 "den må opprettes manuelt.</p>"
 
 #. help text 4/4
-#: src/include/ntp-client/helps.rb:104
+#: src/include/ntp-client/helps.rb:107
 msgid ""
 "<p><b><big>Driver Calibration</big></b><br>\n"
 "To calibrate the clock driver, click <b>Driver Calibration</b>.</p>"
@@ -757,7 +749,7 @@
 "Klikk <b>Kalibrering av driver</b> for å kalibrere klokkedriveren.</p>"
 
 #. help text 1/1, alt. 1 part 1/3
-#: src/include/ntp-client/helps.rb:108
+#: src/include/ntp-client/helps.rb:112
 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"
@@ -770,7 +762,7 @@
 "nettverksadministratoren.</p>"
 
 #. help text 1/1, alt. 1 part 2/3
-#: src/include/ntp-client/helps.rb:115
+#: src/include/ntp-client/helps.rb:119
 msgid ""
 "<p><b><big>Selecting a Server</big></b><br>\n"
 "To select an NTP server from those found in the local network\n"
@@ -783,7 +775,7 @@
 "velg <b>Lokal NTP-server</b> eller <b>Offentlig NTP-server</b>.</p>"
 
 #. help text 1/1, alt. 1 part 3/3
-#: src/include/ntp-client/helps.rb:122
+#: src/include/ntp-client/helps.rb:126
 msgid ""
 "<p><b><big>Testing Server Accessibility</big></b><br>\n"
 "To test if the selected server is up and responds properly,\n"
@@ -794,7 +786,7 @@
 "klikk <b>Test</b>.</p>"
 
 #. help text 1/1, alt. 2
-#: src/include/ntp-client/helps.rb:128
+#: src/include/ntp-client/helps.rb:132
 msgid ""
 "<p><b><big>Address</big></b><br>\n"
 "To set the address of the host with which to synchronize mutually,\n"
@@ -805,7 +797,7 @@
 "under <b>Adresse</b>.</p>"
 
 #. help text 1/1, alt. 3
-#: src/include/ntp-client/helps.rb:134
+#: src/include/ntp-client/helps.rb:138
 msgid ""
 "<p><b><big>Address</big></b><br>\n"
 "To set the address to which to broadcast, use the <b>Address</b>\n"
@@ -816,7 +808,7 @@
 "kringkastingsadressen.</p>"
 
 #. help text 1/1, alt. 4
-#: src/include/ntp-client/helps.rb:140
+#: src/include/ntp-client/helps.rb:144
 msgid ""
 "<p><b><big>Address</big></b><br>\n"
 "To set the address from which to accept broadcast packets, use \n"
@@ -828,7 +820,7 @@
 
 #. help text 2/4, was removed
 #. help text 3/4, optional
-#: src/include/ntp-client/helps.rb:148
+#: src/include/ntp-client/helps.rb:152
 msgid ""
 "<p><b><big>Options</big></b><br>\n"
 "To fine-tune the synchronization source, enter the respective options in the\n"
@@ -840,7 +832,7 @@
 "<b>Alternativer</b>. Du finner mer informasjon i\n"
 "<i>/usr/share/doc/packages/ntp-doc/confopt.htm</i>.</p>\n"
 
-#: src/include/ntp-client/helps.rb:154
+#: src/include/ntp-client/helps.rb:158
 msgid ""
 "<p><b><big>Access Control Options</big></b><br>\n"
 "Define the access control flags (<b><tt>restrict</tt></b> directive in\n"
@@ -859,7 +851,7 @@
 "<b>Sikkerhetsinnstillinger</b>.</p>\n"
 
 #. help text 1/6
-#: src/include/ntp-client/helps.rb:164
+#: src/include/ntp-client/helps.rb:168
 msgid ""
 "<p><b><big>Synchronization Peer Type</big></b><br>\n"
 "Select the kind of synchronization peer to add here.</p>"
@@ -868,7 +860,7 @@
 "Her velger du en direkte synkroniseringsforbindelse som skal legges til.</p>"
 
 #. help text 2/6
-#: src/include/ntp-client/helps.rb:168
+#: src/include/ntp-client/helps.rb:173
 msgid ""
 "<p>To add an NTP server to which to synchronize,\n"
 "select <b>Server</b>.</p>"
@@ -877,7 +869,7 @@
 "under <b>Server</b>.</p>"
 
 #. help text 3/6
-#: src/include/ntp-client/helps.rb:172
+#: src/include/ntp-client/helps.rb:177
 msgid ""
 "<p>To add an NTP peer to synchronize mutually, select\n"
 "<b>Peer</b>.</p>"
@@ -886,7 +878,7 @@
 "<b>Direkteforbindelse</b>.</p>"
 
 #. help text 4/6
-#: src/include/ntp-client/helps.rb:176
+#: src/include/ntp-client/helps.rb:181
 msgid ""
 "<p>To configure a local clock connected directly to your computer,\n"
 "select <b>Radio Clock</b>.</p>"
@@ -895,7 +887,7 @@
 "velger du <b>Radioklokke</b>.</p>"
 
 #. help text 5/6
-#: src/include/ntp-client/helps.rb:180
+#: src/include/ntp-client/helps.rb:186
 msgid ""
 "<p>To broadcast time information through your network, select\n"
 "<b>Outgoing Broadcast</b>.</p>"
@@ -904,7 +896,7 @@
 "<b>Utgående kringkasting</b>.</p>"
 
 #. help text 6/6
-#: src/include/ntp-client/helps.rb:184
+#: src/include/ntp-client/helps.rb:191
 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>"
@@ -913,7 +905,7 @@
 "og bruke dem til å definere lokal tid, velger du <b>Innkommende kringkasting<b>.</p>"
 
 #. help text 1/5
-#: src/include/ntp-client/helps.rb:188
+#: src/include/ntp-client/helps.rb:196
 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"
@@ -924,7 +916,7 @@
 "velge den fra en liste over kjente NTP-servere.</p>"
 
 #. help text 2/5
-#: src/include/ntp-client/helps.rb:194
+#: src/include/ntp-client/helps.rb:202
 msgid ""
 "<p><big><b>Finding Server in the Local\n"
 "Network</b></big><br>\n"
@@ -939,7 +931,7 @@
 "Velg deretter en server i listen over servere som ble funnet.</p>"
 
 #. help text 3/5
-#: src/include/ntp-client/helps.rb:202
+#: src/include/ntp-client/helps.rb:210
 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"
@@ -950,7 +942,7 @@
 "NTP-servere bare for et spesielt land, velg dette under <b>Land</b>.</p>"
 
 #. help text 4/5
-#: src/include/ntp-client/helps.rb:208
+#: src/include/ntp-client/helps.rb:216
 msgid ""
 "<p><big><b>Note</b></big><br>\n"
 "The listed NTP servers may not be available from any country, but only\n"
@@ -971,7 +963,7 @@
 "for å finne en NTP-server i nærheten.</p>"
 
 #. help text 5/5
-#: src/include/ntp-client/helps.rb:219
+#: src/include/ntp-client/helps.rb:227
 msgid ""
 "<p><big><b>Testing Server Accessibility</b></big><br>\n"
 "To test if the selected server responds properly, click <b>Test</b>.</p>"
@@ -981,7 +973,7 @@
 
 #. help text connected with checkbox: "Use Random Server from pool.ntp.org"
 #. rwalter, please, correct it ;)
-#: src/include/ntp-client/helps.rb:224
+#: src/include/ntp-client/helps.rb:233
 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"
@@ -996,7 +988,7 @@
 "NTP-klienten synkroniseres med ulike servere hver time.</p>\n"
 
 #. help text 1/2
-#: src/include/ntp-client/helps.rb:238
+#: src/include/ntp-client/helps.rb:247
 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"
@@ -1009,7 +1001,7 @@
 "driveren. Noen drivere benytter ikke alle alternativene.</p>"
 
 #. help text 2/2
-#: src/include/ntp-client/helps.rb:245
+#: src/include/ntp-client/helps.rb:254
 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"
@@ -1028,17 +1020,17 @@
 "Alle endringer vil gå tapt."
 
 #. menubutton entry, try to keep short
-#: src/include/ntp-client/widgets.rb:65
+#: src/include/ntp-client/widgets.rb:66
 msgid "Restart NTP Daemon"
 msgstr "Start NTP-nissen på nytt"
 
 #. menubutton entry, try to keep short
-#: src/include/ntp-client/widgets.rb:70
+#: src/include/ntp-client/widgets.rb:71
 msgid "Save Settings and Restart NTP Daemon"
 msgstr "Lagre innstillingene og start NTP-nissen på nytt"
 
-#. continue-cancel popup
-#: src/include/ntp-client/widgets.rb:179
+#. Do not display this warning if we use NetworkManager (#299666)
+#: src/include/ntp-client/widgets.rb:178
 msgid ""
 "Warning!\n"
 "\n"
@@ -1053,7 +1045,7 @@
 "nissen vil kanskje ikke fungere riktig."
 
 #. TRANSLATORS: Popup error message
-#: src/include/ntp-client/widgets.rb:240
+#: src/include/ntp-client/widgets.rb:237
 msgid ""
 "NTP server '%1' is not a valid hostname,\n"
 "fully qualified hostname, IPv4 address, or IPv6 address."
@@ -1062,7 +1054,7 @@
 "et fullstendig vertsmaskinnavn, en IPv4-adresse eller en IPv6-adresse."
 
 #. if there is already some server defined
-#: src/include/ntp-client/widgets.rb:531
+#: src/include/ntp-client/widgets.rb:509
 msgid ""
 "Enabling Random Servers from pool.ntp.org would\n"
 "replace the current NTP server.\n"
@@ -1075,44 +1067,44 @@
 "Vil du virkelig erstatte gjeldende NTP-server?"
 
 #. popup header
-#: src/include/ntp-client/widgets.rb:1067
+#: src/include/ntp-client/widgets.rb:1037
 msgid "Select the Device"
 msgstr "Velg enhet"
 
 #. selection box header
 #. selection box header
-#: src/include/ntp-client/widgets.rb:1132
-#: src/include/ntp-client/widgets.rb:1791
+#: src/include/ntp-client/widgets.rb:1101
+#: src/include/ntp-client/widgets.rb:1734
 msgid "Public NTP &Servers"
 msgstr "Offentlige NTP-&servere"
 
 #. message report (no server selected)
 #. report message
-#: src/include/ntp-client/widgets.rb:1143
-#: src/include/ntp-client/widgets.rb:1226
+#: src/include/ntp-client/widgets.rb:1112
+#: src/include/ntp-client/widgets.rb:1191
 msgid "Select an NTP server."
 msgstr "Velg en NTP-server."
 
 #. combo box item
-#: src/include/ntp-client/widgets.rb:1172
+#: src/include/ntp-client/widgets.rb:1139
 msgid "All Countries"
 msgstr "Alle land"
 
 #. combo box header
 #. combo box header
-#: src/include/ntp-client/widgets.rb:1179
-#: src/include/ntp-client/widgets.rb:1781
+#: src/include/ntp-client/widgets.rb:1146
+#: src/include/ntp-client/widgets.rb:1724
 msgid "&Country"
 msgstr "&Land"
 
 #. TRANSLATORS: Busy message
-#: src/include/ntp-client/widgets.rb:1252
+#: src/include/ntp-client/widgets.rb:1216
 msgid "Scanning for NTP servers on your network..."
 msgstr "Søker etter NTP-servere i lokalnettverket..."
 
 #. TRANSLATORS: Popup error - no NTP server has been found during scanning the network.
 #. There is a very high possibility that is is because of running firewall.
-#: src/include/ntp-client/widgets.rb:1267
+#: src/include/ntp-client/widgets.rb:1231
 msgid ""
 "No NTP server has been found on your network.\n"
 "This could be caused by a running SuSEfirewall2,\n"
@@ -1123,205 +1115,205 @@
 "og kanskje blokkerer nettverkssøk."
 
 #. TRANSLATORS: Popup error - no NTP server has been found during scanning the network.
-#: src/include/ntp-client/widgets.rb:1276
+#: src/include/ntp-client/widgets.rb:1240
 msgid "No NTP server has been found on your network."
 msgstr "Ingen NTP-server ble funnet på nettverket."
 
 #. combo box label
 #. table header
-#: src/include/ntp-client/widgets.rb:1287
-#: src/include/ntp-client/widgets.rb:1573
+#: src/include/ntp-client/widgets.rb:1251
+#: src/include/ntp-client/widgets.rb:1516
 msgid "Address"
 msgstr "Adresse"
 
 #. popup message
-#: src/include/ntp-client/widgets.rb:1347
+#: src/include/ntp-client/widgets.rb:1309
 msgid "No server is selected."
 msgstr "Ingen server er valgt."
 
 #. text entry label
-#: src/include/ntp-client/widgets.rb:1389
+#: src/include/ntp-client/widgets.rb:1347
 msgid "A&ddress"
 msgstr "A&dresse"
 
 #. push button label
-#: src/include/ntp-client/widgets.rb:1398
+#: src/include/ntp-client/widgets.rb:1356
 msgid "Ad&vanced Configuration"
 msgstr "A&vansert konfigurasjon"
 
 #. push button label
-#: src/include/ntp-client/widgets.rb:1409
+#: src/include/ntp-client/widgets.rb:1367
 msgid "&Driver Calibration"
 msgstr "&Kalibrering av driver"
 
-#: src/include/ntp-client/widgets.rb:1419
+#: src/include/ntp-client/widgets.rb:1377
 msgid "&Interval of the Synchronization in Minutes"
 msgstr "Synkroniserings&intervall i minutter"
 
 #. frame
-#: src/include/ntp-client/widgets.rb:1430
+#: src/include/ntp-client/widgets.rb:1388
 msgid "Start NTP Daemon"
 msgstr "Start NTP-nisse"
 
 #. radio button
-#: src/include/ntp-client/widgets.rb:1433
+#: src/include/ntp-client/widgets.rb:1391
 msgid "Only &Manually"
 msgstr "Kun &manuelt"
 
 #. radio button
-#: src/include/ntp-client/widgets.rb:1435
+#: src/include/ntp-client/widgets.rb:1393
 msgid "&Synchronize without Daemon"
 msgstr "&Synkroniser uten nisse"
 
 #. radio button
-#: src/include/ntp-client/widgets.rb:1437
+#: src/include/ntp-client/widgets.rb:1395
 msgid "Now and on &Boot"
 msgstr "Nå og ved o&ppstart"
 
 #. check box
-#: src/include/ntp-client/widgets.rb:1452
+#: src/include/ntp-client/widgets.rb:1410
 msgid "Run NTP Daemon in Chroot &Jail"
 msgstr "Kjør NTP-nisse i chroot-&varetekt"
 
 #. TRANSLATORS:
-#: src/include/ntp-client/widgets.rb:1464
+#: src/include/ntp-client/widgets.rb:1422
 msgid "&Restrict NTP Service to Configured Servers Only "
 msgstr "Beg&rens NTP-tjenesten til konfigurerte servere"
 
 #. combo box item FIXME usability
-#: src/include/ntp-client/widgets.rb:1478
+#: src/include/ntp-client/widgets.rb:1434
 msgid "Manual"
 msgstr "Manuelt"
 
 #. combo box item
-#: src/include/ntp-client/widgets.rb:1480
+#: src/include/ntp-client/widgets.rb:1436
 msgid "Auto"
 msgstr "Auto"
 
 #. combo box item
-#: src/include/ntp-client/widgets.rb:1482
+#: src/include/ntp-client/widgets.rb:1438
 msgid "Custom"
 msgstr "Egendefinert"
 
-#: src/include/ntp-client/widgets.rb:1484
+#: src/include/ntp-client/widgets.rb:1440
 msgid "&Runtime Configuration Policy"
 msgstr "Oppsetts®ler for kjøremiljø"
 
 #. FIXME
-#: src/include/ntp-client/widgets.rb:1497
+#: src/include/ntp-client/widgets.rb:1448
 msgid "&Custom Policy"
 msgstr "&Egendefinerte regler"
 
 #. check box
-#: src/include/ntp-client/widgets.rb:1508
+#: src/include/ntp-client/widgets.rb:1456
 msgid "&Use Random Servers from pool.ntp.org"
 msgstr "Br&uk vilkårlige servere fra pool.ntp.org"
 
 #. text entry label
 #. text entry
 #. combo box label
-#: src/include/ntp-client/widgets.rb:1521
-#: src/include/ntp-client/widgets.rb:1539
-#: src/include/ntp-client/widgets.rb:1739
+#: src/include/ntp-client/widgets.rb:1465
+#: src/include/ntp-client/widgets.rb:1483
+#: src/include/ntp-client/widgets.rb:1682
 msgid "&Address"
 msgstr "&Adresse"
 
 #. push button
-#: src/include/ntp-client/widgets.rb:1546
+#: src/include/ntp-client/widgets.rb:1490
 msgid "&Select..."
 msgstr "&Velg..."
 
 #. push button
 #. push button
 #. push button
-#: src/include/ntp-client/widgets.rb:1557
-#: src/include/ntp-client/widgets.rb:1818
-#: src/include/ntp-client/widgets.rb:1829
+#: src/include/ntp-client/widgets.rb:1501
+#: src/include/ntp-client/widgets.rb:1761
+#: src/include/ntp-client/widgets.rb:1772
 msgid "&Test"
 msgstr "&Test"
 
 #. table header
-#: src/include/ntp-client/widgets.rb:1571
+#: src/include/ntp-client/widgets.rb:1514
 msgid "Synchronization Type"
 msgstr "Synkroniseringstype"
 
 #. push button
-#: src/include/ntp-client/widgets.rb:1586
+#: src/include/ntp-client/widgets.rb:1529
 msgid "Display &Log..."
 msgstr "Vis &logg..."
 
 #. combo box label
-#: src/include/ntp-client/widgets.rb:1611
+#: src/include/ntp-client/widgets.rb:1554
 msgid "Clock &Type"
 msgstr "Klokke&type"
 
 #. int field
-#: src/include/ntp-client/widgets.rb:1622
+#: src/include/ntp-client/widgets.rb:1565
 msgid "Unit &Number"
 msgstr "Enhets&nummer"
 
 #. check box
-#: src/include/ntp-client/widgets.rb:1632
+#: src/include/ntp-client/widgets.rb:1575
 msgid "Create &Symlink"
 msgstr "Opprett &symlink"
 
 #. text entry
-#: src/include/ntp-client/widgets.rb:1656
+#: src/include/ntp-client/widgets.rb:1599
 msgid "&Device"
 msgstr "&Enhet"
 
 #. text entry label
-#: src/include/ntp-client/widgets.rb:1681
+#: src/include/ntp-client/widgets.rb:1624
 msgid "Access Control Options"
 msgstr "Valg for tilgangskontroll"
 
 #. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1693
+#: src/include/ntp-client/widgets.rb:1636
 msgid "&Server"
 msgstr "&Server"
 
 #. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1695
+#: src/include/ntp-client/widgets.rb:1638
 msgid "&Peer"
 msgstr "&Direkteforbindelse"
 
 #. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1697
+#: src/include/ntp-client/widgets.rb:1640
 msgid "&Radio Clock"
 msgstr "&Radioklokke"
 
 #. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1699
+#: src/include/ntp-client/widgets.rb:1642
 msgid "&Outgoing Broadcast"
 msgstr "&Utgående kringkasting"
 
 #. radio button, NTP relationship type
-#: src/include/ntp-client/widgets.rb:1701
+#: src/include/ntp-client/widgets.rb:1644
 msgid "&Incoming Broadcast"
 msgstr "&Innkommende kringkasting"
 
 #. frame
-#: src/include/ntp-client/widgets.rb:1704
+#: src/include/ntp-client/widgets.rb:1647
 msgid "Type"
 msgstr "Type"
 
 #. radio button
-#: src/include/ntp-client/widgets.rb:1718
+#: src/include/ntp-client/widgets.rb:1661
 msgid "Loc&al Network"
 msgstr "Lok&alnettverk"
 
 #. radio button
-#: src/include/ntp-client/widgets.rb:1720
+#: src/include/ntp-client/widgets.rb:1663
 msgid "&Public NTP Server"
 msgstr "&Offentlig NTP-server"
 
 #. frame label
-#: src/include/ntp-client/widgets.rb:1725
+#: src/include/ntp-client/widgets.rb:1668
 msgid "NTP Server Location"
 msgstr "NTP-serverens plassering"
 
 #. push button
-#: src/include/ntp-client/widgets.rb:1749
+#: src/include/ntp-client/widgets.rb:1692
 msgid "&Lookup"
 msgstr "&Søk"
 
@@ -1335,146 +1327,91 @@
 msgid "Initializing ..."
 msgstr "Initialiserer ..."
 
-#. NtpClient read dialog caption
-#: src/modules/NtpClient.rb:486
-msgid "Initializing NTP Client Configuration"
-msgstr "Initialiserer oppsett av NTP-klient"
-
-#. progress stage
-#: src/modules/NtpClient.rb:501
-msgid "Read network configuration"
-msgstr "Les nettverkskonfigurasjon"
-
-#. progress stage
-#: src/modules/NtpClient.rb:503
-msgid "Read NTP settings"
-msgstr "Les NTP-innstillinger"
-
-#. progress step
-#: src/modules/NtpClient.rb:507
-msgid "Reading network configuration..."
-msgstr "Leser nettverkskonfigurasjon..."
-
-#. progress step
-#: src/modules/NtpClient.rb:509
-msgid "Reading NTP settings..."
-msgstr "Leser NTP-innstillinger..."
-
-#. progress step
 #. 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)
+#. SuSEFirewall::Write checks on its own whether there are pending
+#. changes, so call it always. bnc#476951
 #. progress step
-#: src/modules/NtpClient.rb:511 src/modules/NtpClient.rb:606
-#: src/modules/NtpClient.rb:767 src/modules/NtpClient.rb:918
+#. progress step
+#: src/modules/NtpClient.rb:494 src/modules/NtpClient.rb:627
+#: src/modules/NtpClient.rb:1031 src/modules/NtpClient.rb:1055
 msgid "Finished"
 msgstr "Fullført"
 
-#. boolean update_dhcp = original_config_dhcp != config_dhcp;
-#. NtpClient read dialog caption
-#: src/modules/NtpClient.rb:740
-msgid "Saving NTP Client Configuration"
-msgstr "Lagrer konfigurasjon for NTP-klient"
-
-#. progress stage
-#: src/modules/NtpClient.rb:757
-msgid "Write NTP settings"
-msgstr "Lagre NTP-innstillinger"
-
-#. progress stage
-#: src/modules/NtpClient.rb:759
-msgid "Restart NTP daemon"
-msgstr "Start NTP-nissen på nytt"
-
-#. progress step
-#: src/modules/NtpClient.rb:763
-msgid "Writing the settings..."
-msgstr "Lagrer innstillingene..."
-
-#. progress step
-#: src/modules/NtpClient.rb:765
-msgid "Restarting NTP daemon..."
-msgstr "Starter NTP-nissen på nytt..."
-
-#. error message
-#: src/modules/NtpClient.rb:850
-msgid "Cannot update the dynamic configuration policy."
-msgstr "Kan ikke oppdatere dynamisk oppsett."
-
-#. error report
-#: src/modules/NtpClient.rb:888
-msgid "Cannot restart the NTP daemon."
-msgstr "Kan ikke starte NTP-nissen på nytt."
-
 #. summary string
-#: src/modules/NtpClient.rb:998
+#: src/modules/NtpClient.rb:704
 msgid "The NTP daemon starts when starting the system."
 msgstr "NTP-nissen aktiveres når systemet starter opp."
 
 #. summary string
-#: src/modules/NtpClient.rb:1004
+#: src/modules/NtpClient.rb:710
 msgid "The NTP daemon does not start automatically."
 msgstr "NTP-nissen starter ikke automatisk."
 
 #. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1010
+#: src/modules/NtpClient.rb:716
 msgid "Servers: %1"
 msgstr "Servere: %1"
 
 #. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1014
+#: src/modules/NtpClient.rb:720
 msgid "Radio Clocks: %1"
 msgstr "Radioklokker: %1"
 
 #. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1018
+#: src/modules/NtpClient.rb:724
 msgid "Peers: %1"
 msgstr "Direkteforbindelser: %1"
 
 #. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1022
+#: src/modules/NtpClient.rb:728
 msgid "Broadcast time information to: %1"
 msgstr "Kringkast tidsinformasjon til: %1"
 
 #. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:1026
+#: src/modules/NtpClient.rb:732
 msgid "Accept broadcasted time information from: %1"
 msgstr "Godta kringkastet tidsinformasjon fra: %1"
 
 #. summary string, FIXME
-#: src/modules/NtpClient.rb:1042
+#: src/modules/NtpClient.rb:748
 msgid "Combine static and DHCP configuration."
 msgstr "Kombiner statisk oppsett og DHCP-oppsett."
 
 #. summary string, FIXME
-#: src/modules/NtpClient.rb:1046
+#: src/modules/NtpClient.rb:752
 msgid "Static configuration only."
 msgstr "Kun statisk oppsett."
 
-#. summary string, FIXME
-#: src/modules/NtpClient.rb:1049
+#. summary string, FIXME: too generic!
+#: src/modules/NtpClient.rb:755
 msgid "Custom configuration policy."
 msgstr "Egendefinert oppsett."
 
-#. An informative popup label diring the NTP server testings
-#: src/modules/NtpClient.rb:1082
+#. Handle UI of NTP server test answers
+#. @param [String] server string host name or IP address of the NTP server
+#. @param [Symbol] verbosity `no_ui: ..., `transient_popup: pop up while scanning,
+#. `result_popup: also final pop up about the result
+#. @return [Boolean] true if NTP server answers properly
+#: src/modules/NtpClient.rb:809
 msgid "Testing the NTP server..."
 msgstr "Kontrollerer NTP-server..."
 
 #. message report - result of test of connection to NTP server
-#: src/modules/NtpClient.rb:1103
+#: src/modules/NtpClient.rb:817
 msgid "Server is reachable and responds properly."
 msgstr "Serveren er tilgjengelig og svarer som den skal."
 
 #. error message  - result of test of connection to NTP server
 #. report error instead of simple message (#306018)
-#: src/modules/NtpClient.rb:1107
+#: src/modules/NtpClient.rb:821
 msgid "Server is unreachable or does not respond properly."
 msgstr "Serveren er ikke tilgjengelig eller svarer ikke som den skal."
 
 #. if package is not installed (in the inst-sys, it is: bnc#399659)
-#: src/modules/NtpClient.rb:1125
+#: src/modules/NtpClient.rb:839
 msgid ""
 "Cannot search for NTP server in local network\n"
 "without package %1 installed.\n"
@@ -1482,6 +1419,72 @@
 "Kan ikke søke etter NTP-server i lokalnettverket\n"
 "uten å ha installert pakken %1.\n"
 
+#. Start a new progress for Read NTP Configuration
+#: src/modules/NtpClient.rb:1016
+msgid "Initializing NTP Client Configuration"
+msgstr "Initialiserer oppsett av NTP-klient"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1021
+msgid "Read network configuration"
+msgstr "Les nettverkskonfigurasjon"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1023
+msgid "Read NTP settings"
+msgstr "Les NTP-innstillinger"
+
+#. progress step
+#: src/modules/NtpClient.rb:1027
+msgid "Reading network configuration..."
+msgstr "Leser nettverkskonfigurasjon..."
+
+#. progress step
+#: src/modules/NtpClient.rb:1029
+msgid "Reading NTP settings..."
+msgstr "Leser NTP-innstillinger..."
+
+#. Start a new progress for Write NTP Configuration
+#: src/modules/NtpClient.rb:1040
+msgid "Saving NTP Client Configuration"
+msgstr "Lagrer konfigurasjon for NTP-klient"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1045
+msgid "Write NTP settings"
+msgstr "Lagre NTP-innstillinger"
+
+#. progress stage
+#: src/modules/NtpClient.rb:1047
+msgid "Restart NTP daemon"
+msgstr "Start NTP-nissen på nytt"
+
+#. progress step
+#: src/modules/NtpClient.rb:1051
+msgid "Writing the settings..."
+msgstr "Lagrer innstillingene..."
+
+#. progress step
+#: src/modules/NtpClient.rb:1053
+msgid "Restarting NTP daemon..."
+msgstr "Starter NTP-nissen på nytt..."
+
+#. Writes sysconfig ntp policy and calls netconfig to update ntp. Report an
+#. error if some of the call fails.
+#.
+#. @return [Boolean] true if write and update success
+#: src/modules/NtpClient.rb:1103
+msgid "Cannot update the dynamic configuration policy."
+msgstr "Kan ikke oppdatere dynamisk oppsett."
+
+#. error report
+#: src/modules/NtpClient.rb:1135
+msgid "Cannot restart the NTP daemon."
+msgstr "Kan ikke starte NTP-nissen på nytt."
+
+#~ msgid "Firewall Settings"
+#~ msgstr "Brannmurinnstillinger"
+
 #~ msgid "Cannot write sysconfig variables."
 #~ msgstr "Kan ikke lagre sysconfig-variabler."
 

Modified: trunk/yast/nb/po/packager.nb.po
===================================================================
--- trunk/yast/nb/po/packager.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/packager.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: packager.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-06 16:04+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2009-10-01 12:36+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -416,7 +416,7 @@
 #. TRANSLATORS: dialog help
 #. TRANSLATORS: dialog help
 #: src/clients/inst_productsources.rb:1380
-#: src/include/packager/repositories_include.rb:93
+#: src/include/packager/repositories_include.rb:95
 msgid "<p>The repository manager is downloading repository details...</p>"
 msgstr "<p>Pakkebrønnbehandleren laster ned informasjon om pakkebrønner.../p>"
 
@@ -527,7 +527,7 @@
 #. dialog caption
 #. dialog caption
 #: src/clients/key_manager.rb:70 src/clients/repositories.rb:1845
-#: src/modules/AddOnProduct.rb:684
+#: src/modules/AddOnProduct.rb:688
 msgid "Initializing..."
 msgstr "Initialiserer ..."
 
@@ -551,11 +551,6 @@
 msgid "&Media"
 msgstr "&Medier"
 
-#. progress step title
-#: src/clients/pkg_finish.rb:50
-msgid "Saving the software manager configuration..."
-msgstr "Lagrer oppsett for pakkebehandler..."
-
 #. default (minimal) priority of a repository
 #: src/clients/repositories.rb:58
 msgid "&Priority"
@@ -591,7 +586,7 @@
 
 #. label to be used instead of URL if not found
 #: src/clients/repositories.rb:337 src/clients/repositories.rb:376
-#: src/modules/AddOnProduct.rb:1336
+#: src/modules/AddOnProduct.rb:1351
 msgid "URL: %1"
 msgstr "Nettadresse: %1"
 
@@ -858,7 +853,7 @@
 
 #. popup message part 2 followed by other info
 #. popup message, after message header, header of details
-#: src/clients/repositories.rb:1040 src/modules/Packages.rb:1329
+#: src/clients/repositories.rb:1040 src/modules/Packages.rb:1328
 #: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310
 msgid "Details:"
 msgstr "Detaljer:"
@@ -866,7 +861,7 @@
 #. popup message part 3
 #. end of popup message, question
 #. end of popup message, question
-#: src/clients/repositories.rb:1042 src/modules/Packages.rb:1337
+#: src/clients/repositories.rb:1042 src/modules/Packages.rb:1336
 #: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312
 msgid "Try again?"
 msgstr "Vil du prøve igjen?"
@@ -1433,42 +1428,42 @@
 "'%2'?"
 
 #. TRANSLATORS: dialog caption
-#: src/include/packager/repositories_include.rb:79
+#: src/include/packager/repositories_include.rb:81
 msgid "Adding a New Repository"
 msgstr "Legger til ny pakkebrønn"
 
-#: src/include/packager/repositories_include.rb:83
+#: src/include/packager/repositories_include.rb:85
 msgid "Check Repository Type"
 msgstr "Kontroller pakkebrønntype"
 
-#: src/include/packager/repositories_include.rb:84
+#: src/include/packager/repositories_include.rb:86
 msgid "Add Repository"
 msgstr "Legg til pakkebrønn"
 
-#: src/include/packager/repositories_include.rb:85
+#: src/include/packager/repositories_include.rb:87
 msgid "Read Repository License"
 msgstr "Leser pakkebrønnlisens"
 
-#: src/include/packager/repositories_include.rb:88
+#: src/include/packager/repositories_include.rb:90
 msgid "Checking Repository Type"
 msgstr "Kontrollerer pakkebrønntype"
 
-#: src/include/packager/repositories_include.rb:89
+#: src/include/packager/repositories_include.rb:91
 msgid "Adding Repository"
 msgstr "Legger til pakkebrønn"
 
-#: src/include/packager/repositories_include.rb:90
+#: src/include/packager/repositories_include.rb:92
 msgid "Reading Repository License"
 msgstr "Leser pakkebrønnlisens"
 
 #. add at least one product if the scan result is empty (no product info available)
-#: src/include/packager/repositories_include.rb:154
+#: src/include/packager/repositories_include.rb:156
 msgid "Repository"
 msgstr "Pakkebrønn"
 
 #. continue-back popup
 #. continue-back popup
-#: src/include/packager/repositories_include.rb:226
+#: src/include/packager/repositories_include.rb:228
 #: src/modules/SourceManager.rb:330
 msgid ""
 "There is no product information available at the given location.\n"
@@ -1485,8 +1480,8 @@
 
 #. popup message part 1
 #. Import GPG keys found in the inst-sys
-#: src/include/packager/repositories_include.rb:321
-#: src/modules/Packages.rb:1324 src/modules/SourceManager.rb:306
+#: src/include/packager/repositories_include.rb:323
+#: src/modules/Packages.rb:1323 src/modules/SourceManager.rb:306
 msgid ""
 "Unable to create repository\n"
 "from URL '%1'."
@@ -1495,7 +1490,7 @@
 "fra adressen '%1'."
 
 #. error message
-#: src/include/packager/repositories_include.rb:333
+#: src/include/packager/repositories_include.rb:335
 msgid ""
 "Using an ISO image over ftp or http protocol is not possible.\n"
 "Change the protocol or unpack the ISO image on the server side."
@@ -1504,12 +1499,12 @@
 "Velg en annen protokoll eller pakk ut ISO-diskbildet på serveren."
 
 #. popup message part 2
-#: src/include/packager/repositories_include.rb:343
+#: src/include/packager/repositories_include.rb:345
 msgid "Change the URL and try again?"
 msgstr "Vil du endre adressen og forsøke igjen?"
 
 #. popup error message, %1 is the package name
-#: src/include/packager/repositories_include.rb:420
+#: src/include/packager/repositories_include.rb:422
 msgid ""
 "Cannot search for SLP repositories\n"
 "without having %1 package installed.\n"
@@ -1517,6 +1512,11 @@
 "For å søke etter SLP-pakkebrønner\n"
 "må pakken %1 være installert.\n"
 
+#. @see Implements ::Installation::FinishClient#title
+#: src/lib/packager/clients/pkg_finish.rb:55
+msgid "Saving the software manager configuration..."
+msgstr "Lagrer oppsett for pakkebehandler..."
+
 #. New add-on product might add also new agents.
 #. Functions Rereads all available agents.
 #.
@@ -1524,19 +1524,19 @@
 #. error report
 #. popup error
 #. popup error
-#: src/modules/AddOnProduct.rb:518 src/modules/AddOnProduct.rb:620
-#: src/modules/ProductLicense.rb:539 src/modules/ProductLicense.rb:730
+#: src/modules/AddOnProduct.rb:522 src/modules/AddOnProduct.rb:624
+#: src/modules/ProductLicense.rb:533 src/modules/ProductLicense.rb:726
 msgid "An error occurred while preparing the installation system."
 msgstr "Det oppstod en feil under klargjøring av installasjonssystemet."
 
 #. error report
-#: src/modules/AddOnProduct.rb:655
+#: src/modules/AddOnProduct.rb:659
 msgid "Control file %1 not found on media."
 msgstr "Kontrollfilen %1 ble ikke funnet på mediet."
 
 #. FATE #305578: Add-On Product Requiring Registration
 #. or check the content file
-#: src/modules/AddOnProduct.rb:896
+#: src/modules/AddOnProduct.rb:900
 #, fuzzy
 #| msgid "Package %1 was not installed. The service cannot be edited."
 msgid ""
@@ -1544,28 +1544,43 @@
 "The add-on product cannot be registered."
 msgstr "Pakken %1 ble ikke installert. Tjenesten kan ikke redigeres."
 
+#. FATE #302398: PATTERNS keyword in content file
+#. adding the product to the list of products (BNC #269625)
+#. no such products
+#: src/modules/AddOnProduct.rb:1143 src/modules/AddOnProduct.rb:1781
+#: src/modules/AddOnProduct.rb:1787 src/modules/Packages.rb:471
+msgid "Unknown Product"
+msgstr "Ukjent produkt"
+
+#. push button
+#: src/modules/AddOnProduct.rb:1152
+#, fuzzy
+#| msgid "Release &Notes"
+msgid "Re&lease Notes..."
+msgstr "Versjonsmerk&nader"
+
 #. TRANSLATORS: error report
 #. TRANSLATORS: error report
-#: src/modules/AddOnProduct.rb:1263 src/modules/AddOnProduct.rb:1427
+#: src/modules/AddOnProduct.rb:1278 src/modules/AddOnProduct.rb:1442
 msgid "Unable to use additional products."
 msgstr "Kan ikke bruke tilleggsprodukter."
 
 #. fill up internal map (used later when item selected)
-#: src/modules/AddOnProduct.rb:1314 src/modules/AddOnProduct.rb:1320
+#: src/modules/AddOnProduct.rb:1329 src/modules/AddOnProduct.rb:1335
 msgid "%1, URL: %2"
 msgstr "%1, adresse: %2"
 
-#: src/modules/AddOnProduct.rb:1330
+#: src/modules/AddOnProduct.rb:1345
 msgid "URL: %1, Path: %2"
 msgstr "Adresse: %1, Sti: %2"
 
 #. TRANSLATORS: popup heading
-#: src/modules/AddOnProduct.rb:1361
+#: src/modules/AddOnProduct.rb:1376
 msgid "Additional Products"
 msgstr "Tilleggsprodukter"
 
 #. TRANSLATORS: additional dialog information
-#: src/modules/AddOnProduct.rb:1367
+#: src/modules/AddOnProduct.rb:1382
 msgid ""
 "The installation repository also contains the listed additional repositories.\n"
 "Select the ones you want to use.\n"
@@ -1573,37 +1588,30 @@
 "Installasjsonspakkebrønnen inneholder også de angitte tilleggspakkebrønnene.\n"
 "Velg dem du vil bruke.\n"
 
-#: src/modules/AddOnProduct.rb:1378
+#: src/modules/AddOnProduct.rb:1393
 msgid "Additional Products to Select"
 msgstr "Tilleggsprodukter som kan velges"
 
 #. push button label
-#: src/modules/AddOnProduct.rb:1385
+#: src/modules/AddOnProduct.rb:1400
 msgid "Add Selected &Products"
 msgstr "Legg til valgte &produkter"
 
 #. %1 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1517
+#: src/modules/AddOnProduct.rb:1532
 msgid "Insert the addon %1 medium"
 msgstr "Sett inn mediet med tilleggsproduktet %1"
 
 #. %1 is the product name, %2 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1522
+#: src/modules/AddOnProduct.rb:1537
 msgid "Insert the %1 %2 medium"
 msgstr "Sett inn mediet %1 %2"
 
 #. TRANSLATORS: error message, %1 is replaced with product URL
-#: src/modules/AddOnProduct.rb:1574
+#: src/modules/AddOnProduct.rb:1589
 msgid "Unable to add product %1."
 msgstr "Kan ikke legge til produktet %1."
 
-#. adding the product to the list of products (BNC #269625)
-#. no such products
-#: src/modules/AddOnProduct.rb:1766 src/modules/AddOnProduct.rb:1772
-#: src/modules/Packages.rb:471
-msgid "Unknown Product"
-msgstr "Ukjent produkt"
-
 #. update the trusted flag
 #: src/modules/KeyManager.rb:214
 msgid ""
@@ -1630,27 +1638,27 @@
 msgstr "Kan ikke kopiere nøkkelen til midlertidig katalog."
 
 #. button label
-#: src/modules/PackageInstallation.rb:53
+#: src/modules/PackageInstallation.rb:54
 msgid "&Show Failed Packages List"
 msgstr "&Vis liste over pakker som ikke ble installert"
 
 #. button label
-#: src/modules/PackageInstallation.rb:62
+#: src/modules/PackageInstallation.rb:63
 msgid "&Show Full Log"
 msgstr "&Vis fullstendig logg"
 
 #. dialog headline
-#: src/modules/PackageInstallation.rb:74
+#: src/modules/PackageInstallation.rb:75
 msgid "Installation of some Packages Failed"
 msgstr "Installasjon av noen pakker mislyktes"
 
 #. collect and set installation summary data
-#: src/modules/PackageInstallation.rb:206
+#: src/modules/PackageInstallation.rb:208
 msgid "Installation aborted by user."
 msgstr "Installasjon avbrutt av bruker."
 
 #. the string is follwed by a media number, e.g. "Medium 1"
-#: src/modules/PackageSlideShow.rb:50
+#: src/modules/PackageSlideShow.rb:51
 msgid "Medium %1"
 msgstr "Medium %1"
 
@@ -1658,13 +1666,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:204
+#: src/modules/PackageSlideShow.rb:202
 msgid ">%1"
 msgstr ">%1"
 
 #. Nothing more to install from this CD (very concise - little space!!)
 #. Nothing more to install from this CD (very concise - little space!!)
-#: src/modules/PackageSlideShow.rb:222 src/modules/PackageSlideShow.rb:237
+#: src/modules/PackageSlideShow.rb:220 src/modules/PackageSlideShow.rb:235
 msgid "Done."
 msgstr "Fullført."
 
@@ -1672,21 +1680,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:262
+#: src/modules/PackageSlideShow.rb:260
 msgid "Next: %1 -- %2"
 msgstr "Neste: %1 -- %2"
 
 #. 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:279
+#: src/modules/PackageSlideShow.rb:277
 msgid "Next: %1"
 msgstr "Neste: %1"
 
 #. 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:918
+#: src/modules/PackageSlideShow.rb:922
 msgid "Total"
 msgstr "Totalt"
 
@@ -1695,41 +1703,41 @@
 #.
 #. message in the installatino log, %1 is package name,
 #. %2 is package size
-#: src/modules/PackageSlideShow.rb:1045 src/modules/PackageSlideShow.rb:1297
-#: src/modules/PackageSlideShow.rb:1349
+#: src/modules/PackageSlideShow.rb:1049 src/modules/PackageSlideShow.rb:1301
+#: src/modules/PackageSlideShow.rb:1353
 msgid "Downloading %1 (download size %2)"
 msgstr "Laster ned %1 (nedlastingsstørrelse %2)"
 
-#: src/modules/PackageSlideShow.rb:1075
+#: src/modules/PackageSlideShow.rb:1079
 msgid " (Remaining: %1%2 packages)"
 msgstr " (Gjenstår: %1%2 pakker)"
 
 #. display download progress in DownloadInAdvance mode
 #. translations: progress message (part1)
-#: src/modules/PackageSlideShow.rb:1108
+#: src/modules/PackageSlideShow.rb:1112
 msgid "Downloading Packages..."
 msgstr "Laster ned pakker..."
 
 #. progress message (part2)
-#: src/modules/PackageSlideShow.rb:1111
+#: src/modules/PackageSlideShow.rb:1115
 msgid " (Downloaded %1 of %2 packages)"
 msgstr " (%1 av %2 pakker lastet ned)"
 
 #. Heading for the progress bar for the current package
 #. while it is deleted. "%1" is the package name.
-#: src/modules/PackageSlideShow.rb:1247
+#: src/modules/PackageSlideShow.rb:1251
 msgid "Deleting %1"
 msgstr "Sletter %1"
 
 #. package installation - summary text
 #. %1 is RPM name, %2 is installed (unpacked) size (e.g. 6.20MB)
-#: src/modules/PackageSlideShow.rb:1254
+#: src/modules/PackageSlideShow.rb:1258
 msgid "Installing %1 (installed size %2)"
 msgstr "Installerer %1 (installert størrelse %2)"
 
 #. message in the installatino log, %1 is package name,
 #. %2 is package size
-#: src/modules/PackageSlideShow.rb:1332
+#: src/modules/PackageSlideShow.rb:1336
 msgid "Applying delta RPM: %1"
 msgstr "Bruker delta-RPM: %1"
 
@@ -1864,7 +1872,7 @@
 #: src/modules/Packages.rb:734
 #, fuzzy
 #| msgid "<font color='red'><b>Error:</b> Product <b>%1</b> will be automatically removed</font>"
-msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed.</font>"
+msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed."
 msgstr "<font color='red'><b>Feil:</b> Produktet <b>%1</b> vil bli automatisk fjernet</font>"
 
 #. TRANSLATORS: update proposal warning, do NOT translate "-release",
@@ -1880,12 +1888,12 @@
 msgstr ""
 
 #. error in proposal, %1 is URL
-#: src/modules/Packages.rb:1345
+#: src/modules/Packages.rb:1344
 msgid "No repository found at '%1'."
 msgstr "Ingen pakkebrønner funnet på '%1'."
 
 #. TRANSLATORS: beginning of the rich text with the release notes
-#: src/modules/Packages.rb:1618
+#: src/modules/Packages.rb:1617
 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"
@@ -1897,31 +1905,31 @@
 "fra SUSE Linux-serveren på nettet.</b></p>\n"
 
 #. popup - information label
-#: src/modules/Packages.rb:1645
+#: src/modules/Packages.rb:1644
 msgid "Integrating booted media..."
 msgstr "Integrerer medium..."
 
 #. close the popup in order to be able to ask about the license
-#: src/modules/Packages.rb:1667
+#: src/modules/Packages.rb:1666
 msgid "Failed to integrate the service pack repository."
 msgstr "Kunne ikke integrere pakkebrønnen med oppdateringspakker."
 
 #. popup - information label
-#: src/modules/Packages.rb:1700
+#: src/modules/Packages.rb:1699
 msgid "Initializing repositories..."
 msgstr "Initialiserer pakkebrønner..."
 
 #. message popup, %1 is product name
-#: src/modules/Packages.rb:1932
+#: src/modules/Packages.rb:1931
 msgid "Insert %1 CD 1"
 msgstr "Sett inn %1 CD 1"
 
-#: src/modules/Packages.rb:1934
+#: src/modules/Packages.rb:1933
 msgid "%1 CD 1 not found"
 msgstr "%1 CD 1 ikke funnet"
 
 #. an error message
-#: src/modules/Packages.rb:2044
+#: src/modules/Packages.rb:2043
 msgid ""
 "Error while initializing package descriptions.\n"
 "Check the log file %1 for more details."
@@ -1930,7 +1938,7 @@
 "Du finner mer informasjon i loggfilen %1."
 
 #. bnc #436925
-#: src/modules/Packages.rb:2305
+#: src/modules/Packages.rb:2304
 msgid ""
 "The software selection has been changed externally.\n"
 "Software proposal will be called again."
@@ -1939,12 +1947,12 @@
 " Programvareforslaget vil bli behandlet på nytt."
 
 #. popup label
-#: src/modules/Packages.rb:2323
+#: src/modules/Packages.rb:2322
 msgid "Evaluating package selection..."
 msgstr "Vurderer pakkeutvalg..."
 
 #. Error message, %{pattern_name} is replaced with the missing pattern name in runtime
-#: src/modules/Packages.rb:2621
+#: src/modules/Packages.rb:2627
 msgid ""
 "Failed to select default product pattern %{pattern_name}.\n"
 "Pattern has not been found."
@@ -1953,36 +1961,48 @@
 #. Sets that the license (file) has been already accepted
 #.
 #. @param [String] license_ident file name
-#: src/modules/ProductLicense.rb:150 src/modules/ProductLicense.rb:157
+#: src/modules/ProductLicense.rb:152 src/modules/ProductLicense.rb:159
 msgid "Cannot read license file %1"
 msgstr "Kan ikke lese lisensfilen %1"
 
-#: src/modules/ProductLicense.rb:151
+#: src/modules/ProductLicense.rb:153
 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 "For å vise produktlisensen riktig må du plassere filen license.tar.gz i rotkatalogen på live-mediet når du bygger diskbildet."
 
 #. combo box
-#: src/modules/ProductLicense.rb:295
+#: src/modules/ProductLicense.rb:297
 msgid "&Language"
 msgstr "&Språk"
 
 #. check box label
-#: src/modules/ProductLicense.rb:345
+#: src/modules/ProductLicense.rb:347
 msgid "I &Agree to the License Terms."
 msgstr "Jeg godkjenner lisens&avtalen."
 
 #. TRANSLATORS: addition license information
-#. %1 is replaced with the filename
-#: src/modules/ProductLicense.rb:383
+#. %s is replaced with the directory name
+#: src/modules/ProductLicense.rb:372
 msgid ""
+"This EULA can be found in the directory\n"
+"%s"
+msgstr ""
+
+#. TRANSLATORS: addition license information
+#. %s is replaced with the filename
+#: src/modules/ProductLicense.rb:376
+#, fuzzy
+#| msgid ""
+#| "If you want to print this EULA, you can find it\n"
+#| "on the first media in the file %1"
+msgid ""
 "If you want to print this EULA, you can find it\n"
-"on the first media in the file %1"
+"on the first media in the file %s"
 msgstr ""
 "Hvis du vil skrive ut lisensavtalen, finner du den\n"
 "i filen filen %1 på det første mediet"
 
 #. help text
-#: src/modules/ProductLicense.rb:400
+#: src/modules/ProductLicense.rb:394
 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"
@@ -1996,18 +2016,18 @@
 #. #459391
 #. If a progress is running open another dialog
 #. dialog caption
-#: src/modules/ProductLicense.rb:410 src/modules/ProductLicense.rb:1149
-#: src/modules/ProductLicense.rb:1227
+#: src/modules/ProductLicense.rb:404 src/modules/ProductLicense.rb:1144
+#: src/modules/ProductLicense.rb:1217
 msgid "License Agreement"
 msgstr "Lisensavtale"
 
 #. popup question
-#: src/modules/ProductLicense.rb:1021
+#: src/modules/ProductLicense.rb:1017
 msgid "Really abort the add-on product installation?"
 msgstr "Er du sikker på at du vil avbryte installasjonen av tilleggsproduktet?"
 
 #. text asking whether to refuse a license (Yes-No popup)
-#: src/modules/ProductLicense.rb:1045
+#: src/modules/ProductLicense.rb:1041
 msgid ""
 "Refusing the license agreement cancels the installation.\n"
 "Really refuse the agreement?"
@@ -2016,7 +2036,7 @@
 "Ønsker du å avbryte?"
 
 #. text asking whether to refuse a license (Yes-No popup)
-#: src/modules/ProductLicense.rb:1048
+#: src/modules/ProductLicense.rb:1044
 msgid ""
 "Refusing the license agreement cancels the add-on\n"
 "product installation. Really refuse the agreement?"
@@ -2025,11 +2045,12 @@
 "av tilleggsprodukt. Ønsker du å avbryte?"
 
 #. timed ok/cancel popup
-#: src/modules/ProductLicense.rb:1058
+#: src/modules/ProductLicense.rb:1054
 msgid "The system is shutting down..."
 msgstr "Systemet avsluttes..."
 
-#. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit"
+#. TRANSLATORS: %s is an extension name
+#. e.g. "SUSE Linux Enterprise Software Development Kit"
 #: src/modules/ProductLicense.rb:1153
 #, fuzzy
 #| msgid " License Agreement"
@@ -2037,7 +2058,7 @@
 msgstr "Lisensavtale"
 
 #. TRANSLATORS: %{license_url} is an URL where the displayed license can be found
-#: src/modules/ProductLicense.rb:1593
+#: src/modules/ProductLicense.rb:1573
 #, fuzzy
 #| msgid ""
 #| "If you want to print this EULA, you can find it\n"
@@ -2149,7 +2170,7 @@
 
 #. radio button
 #. radio button
-#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1757
+#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1759
 #, fuzzy
 #| msgid "&SMB/CIFS"
 msgid "S&MB/CIFS"
@@ -2198,7 +2219,7 @@
 msgstr "Last ne&d beskrivelsesfiler for pakkebrønnen"
 
 #. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:116
+#: src/modules/SourceDialogs.rb:117
 msgid ""
 "<p>If the location is a file holding an ISO image\n"
 "of the media, set <b>ISO Image</b>.</p>"
@@ -2207,7 +2228,7 @@
 "av mediet, velg <b>ISO-bilde</b>.</p>"
 
 #. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:121
+#: src/modules/SourceDialogs.rb:122
 msgid ""
 "<p>If the repository is on multiple media,\n"
 "set the location of the first media of the set.</p>\n"
@@ -2216,86 +2237,86 @@
 "hvis pakkebrønnen er fordelt på flere medier.</p>\n"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:135
+#: src/modules/SourceDialogs.rb:136
 msgid "&Server Name"
 msgstr "&Servernavn"
 
 #. text entry
 #. text entry
-#: src/modules/SourceDialogs.rb:143 src/modules/SourceDialogs.rb:1621
+#: src/modules/SourceDialogs.rb:144 src/modules/SourceDialogs.rb:1623
 msgid "&Path to Directory or ISO Image"
 msgstr "&Sti til katalog eller ISO-bilde"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:151
+#: src/modules/SourceDialogs.rb:152
 msgid "&ISO Image"
 msgstr "&ISO-bilde"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:153
+#: src/modules/SourceDialogs.rb:154
 msgid "N&FS v4 Protocol"
 msgstr "N&FS v4-protokoll"
 
-#: src/modules/SourceDialogs.rb:159
+#: src/modules/SourceDialogs.rb:160
 msgid "Mount Options"
 msgstr "Monteringsalternativer"
 
 #. 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:163
+#: src/modules/SourceDialogs.rb:164
 msgid "(default)"
 msgstr "(standard)"
 
-#: src/modules/SourceDialogs.rb:174
+#: src/modules/SourceDialogs.rb:175
 msgid "URL of the Repository"
 msgstr "Pakkebrønnadresse"
 
 #. frame
-#: src/modules/SourceDialogs.rb:183
+#: src/modules/SourceDialogs.rb:184
 msgid "P&rotocol"
 msgstr "P&rotokoll"
 
 #. input field label
-#: src/modules/SourceDialogs.rb:193
+#: src/modules/SourceDialogs.rb:194
 msgid "&URL of the Repository"
 msgstr "P&akkebrønnadresse"
 
 #. label / dialog caption
 #. bugzilla #219759
 #. service label can be empty (not defined)
-#: src/modules/SourceDialogs.rb:208 src/modules/SourceManagerSLP.rb:323
+#: src/modules/SourceDialogs.rb:209 src/modules/SourceManagerSLP.rb:323
 msgid "Repository URL"
 msgstr "Pakkebrønnadresse"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:210
+#: src/modules/SourceDialogs.rb:211
 msgid "NFS Server"
 msgstr "NFS-server"
 
 #. label / dialog caption
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:212 src/modules/SourceDialogs.rb:214
+#: src/modules/SourceDialogs.rb:213 src/modules/SourceDialogs.rb:215
 msgid "CD or DVD Media"
 msgstr "CD- eller DVD-medium"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:216
+#: src/modules/SourceDialogs.rb:217
 msgid "Hard Disk"
 msgstr "Harddisk"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:218
+#: src/modules/SourceDialogs.rb:219
 msgid "USB Stick or Disk"
 msgstr "USB-pinne eller disk"
 
 #. label / dialog caption
 #. dialog caption
-#: src/modules/SourceDialogs.rb:220 src/modules/SourceDialogs.rb:926
+#: src/modules/SourceDialogs.rb:221 src/modules/SourceDialogs.rb:928
 msgid "Local Directory"
 msgstr "Lokal katalog"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:222
+#: src/modules/SourceDialogs.rb:223
 msgid "Local ISO Image"
 msgstr "Lokalt ISO-bilde"
 
@@ -2304,24 +2325,24 @@
 #. label / dialog caption
 #. label / dialog caption
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:224 src/modules/SourceDialogs.rb:226
-#: src/modules/SourceDialogs.rb:228 src/modules/SourceDialogs.rb:230
-#: src/modules/SourceDialogs.rb:232
+#: src/modules/SourceDialogs.rb:225 src/modules/SourceDialogs.rb:227
+#: src/modules/SourceDialogs.rb:229 src/modules/SourceDialogs.rb:231
+#: src/modules/SourceDialogs.rb:233
 msgid "Server and Directory"
 msgstr "Server og katalog"
 
 #. popup message
-#: src/modules/SourceDialogs.rb:468
+#: src/modules/SourceDialogs.rb:469
 msgid "The name of the repository cannot be empty."
 msgstr "Et pakkebrønnnavn må angis."
 
 #. text entry
-#: src/modules/SourceDialogs.rb:480
+#: src/modules/SourceDialogs.rb:482
 msgid "&Repository Name"
 msgstr "Pakkeb&rønnavn"
 
 #. help text
-#: src/modules/SourceDialogs.rb:495
+#: src/modules/SourceDialogs.rb:497
 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"
@@ -2330,12 +2351,12 @@
 "Bruk <b>Pakkebrønnnavn</b> for å angi pakkebrønnens navn. Hvis feltet er tomt, vil Yast bruke produktnavnet (hvis det er tilgjengelig) eller nettadressen.</p>\n"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:509
+#: src/modules/SourceDialogs.rb:511
 msgid "&Service Name"
 msgstr "Navn på tjene&ste"
 
 #. help text
-#: src/modules/SourceDialogs.rb:517
+#: src/modules/SourceDialogs.rb:519
 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"
@@ -2344,17 +2365,17 @@
 "Bruk <b>Navn på tjeneste</b> for å angi tjenestenavnet. Hvis feltet er tomt, vil Yast bruke en del av tjenestens nettadresse.</p>\n"
 
 #. popup message
-#: src/modules/SourceDialogs.rb:552
+#: src/modules/SourceDialogs.rb:554
 msgid "URL cannot be empty."
 msgstr "Du må angi en nettadresse."
 
 #. text entry
-#: src/modules/SourceDialogs.rb:566
+#: src/modules/SourceDialogs.rb:568
 msgid "&URL"
 msgstr "&Nettadresse"
 
 #. help text
-#: src/modules/SourceDialogs.rb:580
+#: src/modules/SourceDialogs.rb:582
 msgid ""
 "<p><big><b>Repository URL</b></big><br>\n"
 "Use <b>URL</b> to specify the URL of the repository.</p>"
@@ -2366,16 +2387,16 @@
 #. @return widget description map
 #. Get widget description map
 #. @return widget description map
-#: src/modules/SourceDialogs.rb:753 src/modules/SourceDialogs.rb:1893
+#: src/modules/SourceDialogs.rb:755 src/modules/SourceDialogs.rb:1895
 msgid "Edit Parts of the URL"
 msgstr "Rediger deler av adressen"
 
-#: src/modules/SourceDialogs.rb:760 src/modules/SourceDialogs.rb:1900
+#: src/modules/SourceDialogs.rb:762 src/modules/SourceDialogs.rb:1902
 msgid "Edit Complete URL"
 msgstr "Rediger hele adressen"
 
 #. help text
-#: src/modules/SourceDialogs.rb:772
+#: src/modules/SourceDialogs.rb:774
 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"
@@ -2385,7 +2406,7 @@
 "Bruk <b>Servernavn</b> og <b>Sti til katalog eller ISO-bilde</b>\n"
 "for å  angi NFS-serverens vertsnavn og stien på serveren.<p>"
 
-#: src/modules/SourceDialogs.rb:779
+#: src/modules/SourceDialogs.rb:781
 msgid ""
 "<p><big><b>Mount Options</b></big><br>\n"
 "You can specify extra options used for mounting the NFS volume.\n"
@@ -2398,16 +2419,16 @@
 "for mer informasjon og en liste over gyldige valg."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:834
+#: src/modules/SourceDialogs.rb:836
 msgid "&CD-ROM"
 msgstr "&CD-ROM"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:836
+#: src/modules/SourceDialogs.rb:838
 msgid "&DVD-ROM"
 msgstr "&DVD-ROM"
 
-#: src/modules/SourceDialogs.rb:841
+#: src/modules/SourceDialogs.rb:843
 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>"
@@ -2416,12 +2437,12 @@
 "Velg <b>CD-ROM</b> eller <b>DVD-ROM</b> for å angi medietypen.</p>"
 
 #. dialog caption
-#: src/modules/SourceDialogs.rb:941
+#: src/modules/SourceDialogs.rb:943
 msgid "ISO Image File"
 msgstr "ISO-bildefil"
 
 #. error popup - the entered path is not a directory
-#: src/modules/SourceDialogs.rb:964
+#: src/modules/SourceDialogs.rb:966
 msgid ""
 "The entered path is not a directory\n"
 "or the directory does not exist.\n"
@@ -2430,7 +2451,7 @@
 "eller katalogen finnes ikke.\n"
 
 #. error popup - the entered path is not a regular file
-#: src/modules/SourceDialogs.rb:994
+#: src/modules/SourceDialogs.rb:996
 msgid ""
 "The entered path is not a file\n"
 "or the file does not exist.\n"
@@ -2439,7 +2460,7 @@
 "eller filen finnes ikke.\n"
 
 #. continue/cancel popup, %1 is a file name
-#: src/modules/SourceDialogs.rb:1018
+#: src/modules/SourceDialogs.rb:1020
 msgid ""
 "File '%1'\n"
 "does not seem to be an ISO image.\n"
@@ -2450,17 +2471,17 @@
 "Vil du bruke den likevel?\n"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1039
+#: src/modules/SourceDialogs.rb:1041
 msgid "&Path to Directory"
 msgstr "&Sti til katalog"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:1047 src/modules/SourceDialogs.rb:1305
-#: src/modules/SourceDialogs.rb:1372
+#: src/modules/SourceDialogs.rb:1049 src/modules/SourceDialogs.rb:1307
+#: src/modules/SourceDialogs.rb:1374
 msgid "&Plain RPM Directory"
 msgstr "&Ren RPM-katalog"
 
-#: src/modules/SourceDialogs.rb:1062
+#: src/modules/SourceDialogs.rb:1064
 msgid ""
 "<p><big><b>Local Directory</b></big><br>\n"
 "Use <b>Path to Directory</b> to specify the path to the\n"
@@ -2475,20 +2496,20 @@
 "<b>Ren RPM-katalog</b> velges.</p>\n"
 
 #. `opt(`hstretch),
-#: src/modules/SourceDialogs.rb:1298
+#: src/modules/SourceDialogs.rb:1300
 msgid "&USB Mass Storage Device"
 msgstr "&USB masselagringsenhet"
 
 #. the spacing is added to make the widget wider
-#: src/modules/SourceDialogs.rb:1303 src/modules/SourceDialogs.rb:1370
+#: src/modules/SourceDialogs.rb:1305 src/modules/SourceDialogs.rb:1372
 msgid "&File System"
 msgstr "&Filsystem"
 
-#: src/modules/SourceDialogs.rb:1304 src/modules/SourceDialogs.rb:1371
+#: src/modules/SourceDialogs.rb:1306 src/modules/SourceDialogs.rb:1373
 msgid "Dire&ctory"
 msgstr "&Katalog"
 
-#: src/modules/SourceDialogs.rb:1309
+#: src/modules/SourceDialogs.rb:1311
 msgid ""
 "<p><big><b>USB Stick or Disk</b></big><br>\n"
 "Select the USB device on which the repository is located.\n"
@@ -2508,7 +2529,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:1319 src/modules/SourceDialogs.rb:1386
+#: src/modules/SourceDialogs.rb:1321 src/modules/SourceDialogs.rb:1388
 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"
@@ -2519,11 +2540,11 @@
 "eller hvis du vil bruke et spesielt filsystem, velger du dette fra listen.</p>\n"
 
 #. combobox title
-#: src/modules/SourceDialogs.rb:1369
+#: src/modules/SourceDialogs.rb:1371
 msgid "&Disk Device"
 msgstr "&Diskenhet"
 
-#: src/modules/SourceDialogs.rb:1376
+#: src/modules/SourceDialogs.rb:1378
 msgid ""
 "<p><big><b>Disk</b></big><br>\n"
 "Select the disk on which the repository is located.\n"
@@ -2542,12 +2563,12 @@
 "<b>Ren RPM-katalog</b>.</p>\n"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1402
+#: src/modules/SourceDialogs.rb:1404
 msgid "&Path to ISO Image"
 msgstr "&Sti til ISO-bilde"
 
 #. push button
-#: src/modules/SourceDialogs.rb:1422
+#: src/modules/SourceDialogs.rb:1424
 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"
@@ -2558,71 +2579,71 @@
 "filen som inneholder ISO-bildet av installasjonsmediet.</p>"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1603
+#: src/modules/SourceDialogs.rb:1605
 msgid "Server &Name"
 msgstr "Server&navn"
 
-#: src/modules/SourceDialogs.rb:1607
+#: src/modules/SourceDialogs.rb:1609
 msgid "&Port"
 msgstr "&Port"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1612
+#: src/modules/SourceDialogs.rb:1614
 msgid "&Share"
 msgstr "&Delt ressurs"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:1625
+#: src/modules/SourceDialogs.rb:1627
 msgid "ISO &Image"
 msgstr "&ISO-bilde"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1628
+#: src/modules/SourceDialogs.rb:1630
 msgid "&Directory on Server"
 msgstr "&Katalog på server"
 
 #. frame
-#: src/modules/SourceDialogs.rb:1633
+#: src/modules/SourceDialogs.rb:1635
 msgid "Au&thentication"
 msgstr "Au&tentisering"
 
 #. check box
-#: src/modules/SourceDialogs.rb:1640
+#: src/modules/SourceDialogs.rb:1642
 msgid "&Anonymous"
 msgstr "&Anonym"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1649
+#: src/modules/SourceDialogs.rb:1651
 msgid "&Workgroup or Domain"
 msgstr "&Arbeidsgruppe eller domene"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1658
+#: src/modules/SourceDialogs.rb:1660
 msgid "&User Name"
 msgstr "&Brukernavn"
 
 #. password entry
-#: src/modules/SourceDialogs.rb:1665
+#: src/modules/SourceDialogs.rb:1667
 msgid "&Password"
 msgstr "&Passord"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1740
+#: src/modules/SourceDialogs.rb:1742
 msgid "&FTP"
 msgstr "&FTP"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1743
+#: src/modules/SourceDialogs.rb:1745
 msgid "H&TTP"
 msgstr "H&TTP"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1750
+#: src/modules/SourceDialogs.rb:1752
 msgid "HTT&PS"
 msgstr "HTT&PS"
 
 #. help text - server dialog
-#: src/modules/SourceDialogs.rb:1924
+#: src/modules/SourceDialogs.rb:1926
 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"
@@ -2647,7 +2668,7 @@
 "av mediet, velg <b>ISO-diskbilde</b>.</p>\n"
 
 #. help text - server dialog, there is a "Port" widget
-#: src/modules/SourceDialogs.rb:1937
+#: src/modules/SourceDialogs.rb:1939
 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"
@@ -2658,12 +2679,18 @@
 #. Returns whether Community Repositories are defined in the control file.
 #.
 #. @return [Boolean] whether defined
-#: src/modules/SourceDialogs.rb:1999
-msgid "I would like to install an additional Add On Product"
+#: src/modules/SourceDialogs.rb:2001
+msgid "I would li&ke to install an additional Add On Product"
 msgstr ""
 
+#: src/modules/SourceDialogs.rb:2020
+#, fuzzy
+#| msgid "Checking Network Configuration ..."
+msgid "Net&work Configuration..."
+msgstr "Kontrollerer nettverksoppsett..."
+
 #. help text
-#: src/modules/SourceDialogs.rb:2126
+#: src/modules/SourceDialogs.rb:2136
 msgid ""
 "<p><big><b>Media Type</b></big><br>\n"
 "The software repository can be located on CD, on a network server,\n"
@@ -2674,7 +2701,7 @@
 "eller på harddisken.</p>"
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2135
+#: src/modules/SourceDialogs.rb:2145
 msgid ""
 "<p>\n"
 "To add  <b>CD</b> or <b>DVD</b>,\n"
@@ -2685,7 +2712,7 @@
 "må du ha en CD  eller DVD med produktet tilgjengelig.</p>"
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2145
+#: src/modules/SourceDialogs.rb:2155
 msgid ""
 "<p>\n"
 "The product CDs can be copied to the hard disk.\n"
@@ -2701,7 +2728,7 @@
 "til samme katalog.</p>\n"
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2157
+#: src/modules/SourceDialogs.rb:2167
 msgid ""
 "<p>\n"
 "Network installation requires a working network connection.\n"
@@ -2714,25 +2741,25 @@
 "første CD er plassert, for eksempel /data1/CD1.</p>\n"
 
 #. error popup
-#: src/modules/SourceDialogs.rb:2172
+#: src/modules/SourceDialogs.rb:2182
 msgid "Select the media type"
 msgstr "Velg medietype"
 
-#: src/modules/SourceDialogs.rb:2178
+#: src/modules/SourceDialogs.rb:2188
 msgid "Insert the add-on product CD"
 msgstr "Sett inn CD-en med tilleggsproduktet"
 
-#: src/modules/SourceDialogs.rb:2179
+#: src/modules/SourceDialogs.rb:2189
 msgid "Insert the add-on product DVD"
 msgstr "Sett inn DVD-en med tilleggsproduktet"
 
 #. ask for a medium
-#: src/modules/SourceDialogs.rb:2197
+#: src/modules/SourceDialogs.rb:2207
 msgid "No USB disk was detected."
 msgstr "Ingen USB-disk ble funnet."
 
 #. use three slashes as third slash means path
-#: src/modules/SourceDialogs.rb:2403
+#: src/modules/SourceDialogs.rb:2415
 msgid ""
 "<p><b>Download Files</b><br>\n"
 "Each repository has description files which describe the content of the\n"
@@ -2747,12 +2774,12 @@
 "automatisk laste ned filene når det er behov for dem senere. </p>\n"
 
 #. dialog caption
-#: src/modules/SourceDialogs.rb:2623
+#: src/modules/SourceDialogs.rb:2635
 msgid "Media Type"
 msgstr "Medietype"
 
 #. dialog caption
-#: src/modules/SourceDialogs.rb:2647
+#: src/modules/SourceDialogs.rb:2659
 #, fuzzy
 #| msgid "Add-On Product"
 msgid "Add On Product"
@@ -2762,7 +2789,7 @@
 #. Returns boolean whether user confirmed to abort the configuration
 #.
 #. @return [Boolean] whether to abort
-#: src/modules/SourceDialogs.rb:2678
+#: src/modules/SourceDialogs.rb:2690
 #, fuzzy
 #| msgid "URL entered is not valid"
 msgid "URL scheme '%s' is not valid."
@@ -2956,12 +2983,12 @@
 msgstr "Ingen SLP-pakkebrønner ble funnet på nettverket."
 
 #. Warning message, e.g.: Partition /usr needs 35 MB more disk space
-#: src/modules/SpaceCalculation.rb:869
+#: src/modules/SpaceCalculation.rb:870
 msgid "Partition \"%1\" needs %2 more disk space."
 msgstr "Partisjonen \"%1\" trenger %2 mer plass på disken."
 
 #. popup message
-#: src/modules/SpaceCalculation.rb:889
+#: src/modules/SpaceCalculation.rb:890
 msgid ""
 "Deselect packages or delete data or temporary files\n"
 "before updating the system.\n"
@@ -2970,7 +2997,7 @@
 "eller midlertidige filer før du oppgraderer systemet.\n"
 
 #. popup message
-#: src/modules/SpaceCalculation.rb:898
+#: src/modules/SpaceCalculation.rb:899
 msgid "Deselect some packages."
 msgstr "Fjern noen pakker fra utvalget."
 
@@ -3017,9 +3044,6 @@
 #~ msgid "Initialize Software Manager"
 #~ msgstr "Initialiser pakkebehandleren"
 
-#~ msgid "Checking Network Configuration ..."
-#~ msgstr "Kontrollerer nettverksoppsett..."
-
 #~ msgid "Initializing Software Manager ... "
 #~ msgstr "Initialiserer pakkebehandleren..."
 
@@ -3424,9 +3448,6 @@
 #~ msgid "&Details"
 #~ msgstr "&Detaljert"
 
-#~ msgid "Release &Notes"
-#~ msgstr "Versjonsmerk&nader"
-
 #~ msgid "Package Installation"
 #~ msgstr "Pakkeinstallasjon"
 

Modified: trunk/yast/nb/po/pkg-bindings.nb.po
===================================================================
--- trunk/yast/nb/po/pkg-bindings.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/pkg-bindings.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: pkg-bindings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:55+0200\n"
 "PO-Revision-Date: 2009-08-12 17:54+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -50,12 +50,12 @@
 msgstr "<P><BIG><B>Oppdaterer pakkebrønn</B></BIG></P><P>Pakkebehandleren oppdaterer innholdet i pakkebrønnen...</P>"
 
 #. error message
-#: src/Package.cc:655
+#: src/Package.cc:658
 msgid "The package cannot be selected to install."
 msgstr "Pakken kan ikke velges for installasjon."
 
 #. error message
-#: src/Package.cc:661
+#: src/Package.cc:664
 msgid "The package is not available."
 msgstr "Pakken er ikke tilgjengelig."
 

Modified: trunk/yast/nb/po/printer.nb.po
===================================================================
--- trunk/yast/nb/po/printer.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/printer.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: printer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2009-08-12 23:45+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -203,7 +203,7 @@
 #. where %1 will be replaced by the server name:
 #. where %1 will be replaced by the server name:
 #. where %1 will be replaced by the server name:
-#: src/include/printer/autoconfig.rb:97 src/include/printer/overview.rb:1098
+#: src/include/printer/autoconfig.rb:97 src/include/printer/overview.rb:1101
 #: src/include/printer/policies.rb:135
 #: src/include/printer/printingvianetwork.rb:463
 #: src/include/printer/sharing.rb:639
@@ -219,8 +219,8 @@
 #. Only a simple message because this error does not happen on a normal system
 #. (i.e. a system which is not totally broken or totally messed up).
 #. Remove the 'ServerName' entry in /etc/cups/client.conf:
-#: src/include/printer/autoconfig.rb:115 src/include/printer/overview.rb:217
-#: src/include/printer/overview.rb:1115 src/include/printer/policies.rb:153
+#: src/include/printer/autoconfig.rb:115 src/include/printer/overview.rb:220
+#: src/include/printer/overview.rb:1118 src/include/printer/policies.rb:153
 #: src/include/printer/printingvianetwork.rb:478
 #: src/include/printer/sharing.rb:657
 msgid "Failed to remove the 'ServerName' entry in /etc/cups/client.conf"
@@ -345,7 +345,7 @@
 #: src/include/printer/basicmodify.rb:371
 #: src/include/printer/basicmodify.rb:899
 #: src/include/printer/connectionwizard.rb:551
-#: src/include/printer/overview.rb:86
+#: src/include/printer/overview.rb:89
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -449,8 +449,8 @@
 #. does not set a valid Printer::selected_connections_index so that the BasicAddDialog
 #. does not preselect a connection so that the first connection in the list is preselected
 #. (via Table widget fallback) which is still better than an arbitrary preselected entry:
-#: src/include/printer/basicadd.rb:337 src/include/printer/overview.rb:590
-#: src/include/printer/overview.rb:676 src/include/printer/overview.rb:1150
+#: src/include/printer/basicadd.rb:337 src/include/printer/overview.rb:593
+#: src/include/printer/overview.rb:679 src/include/printer/overview.rb:1153
 msgid "Nothing Selected"
 msgstr "Ingenting er valgt"
 
@@ -3517,56 +3517,56 @@
 #. Authors:     Johannes Meixner 
 #.
 #. $Id: overview.ycp 29363 2006-03-24 08:20:43Z mzugec $
-#: src/include/printer/overview.rb:46
+#: src/include/printer/overview.rb:49
 msgid "Show"
 msgstr "Vis"
 
 #. CheckBox to select local print queues to be listed:
-#: src/include/printer/overview.rb:52
+#: src/include/printer/overview.rb:55
 msgid "&Local"
 msgstr "&Lokal"
 
 #. CheckBox to select remote print queues to be listed:
-#: src/include/printer/overview.rb:59
+#: src/include/printer/overview.rb:62
 msgid "&Remote"
 msgstr "Ekste&rn"
 
 #. Where the queue configuration exists (local or remote):
-#: src/include/printer/overview.rb:80
+#: src/include/printer/overview.rb:83
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
 #. Header of a Table column with a list of print queues.
 #. Print queue name:
-#: src/include/printer/overview.rb:83
+#: src/include/printer/overview.rb:86
 msgid "Name"
 msgstr "Navn"
 
 #. Header of a Table column with a list of print queues.
 #. Location of the printer (e.g. second floor, room 2.3):
-#: src/include/printer/overview.rb:89
+#: src/include/printer/overview.rb:92
 msgid "Location"
 msgstr "Plassering"
 
 #. Header of a Table column with a list of print queues.
 #. Whether or not is is the default queue:
-#: src/include/printer/overview.rb:92
+#: src/include/printer/overview.rb:95
 msgid "Default"
 msgstr "Standard"
 
 #. Header of a Table column with a list of print queues.
 #. Queue status (accepting/rejecting and enabled/disabled):
-#: src/include/printer/overview.rb:95
+#: src/include/printer/overview.rb:98
 msgid "Status"
 msgstr "Status"
 
 #. PushButton label to refresh the list of print queues:
-#: src/include/printer/overview.rb:107
+#: src/include/printer/overview.rb:110
 msgid "Re&fresh List"
 msgstr "Opp&dater liste"
 
 #. PushButton label to print a test page:
-#: src/include/printer/overview.rb:112
+#: src/include/printer/overview.rb:115
 msgid "Print &Test Page"
 msgstr "Skriv ut &testside"
 
@@ -3576,7 +3576,7 @@
 #. to check whether or not a local cupsd is accessible.
 #. The command is shown here to the user (even if it is a bit technical)
 #. to have him informed what goes on here and what he can do on his own.
-#: src/include/printer/overview.rb:128
+#: src/include/printer/overview.rb:131
 msgid ""
 "A locally running CUPS daemon is required, but it seems to be not accessible.\n"
 "Check with 'lpstat -h localhost -r' whether a local cupsd is accessible.\n"
@@ -3592,7 +3592,7 @@
 #. By default the cupsd uses the official IPP port (631).
 #. If not, the user must have intentionally and manually changed
 #. the port setting for the cupsd in /etc/cups/cupsd.conf
-#: src/include/printer/overview.rb:140
+#: src/include/printer/overview.rb:143
 msgid ""
 "The CUPS daemon seems not to listen on the official IANA IPP port (631).\n"
 "Check with 'netstat -nap | grep cupsd' where the cupsd actually listens.\n"
@@ -3615,7 +3615,7 @@
 
 #. Busy message:
 #. Body of a Popup::ShowFeedback
-#: src/include/printer/overview.rb:182
+#: src/include/printer/overview.rb:185
 msgid ""
 "Running several tests regarding CUPS server accessibility...\n"
 "(this might take some time)"
@@ -3624,67 +3624,67 @@
 "(dette kan ta en stund)"
 
 #. where %1 will be replaced by the server name:
-#: src/include/printer/overview.rb:201
+#: src/include/printer/overview.rb:204
 msgid "Do no longer use the inaccessible CUPS server '%1'?"
 msgstr "Vil du ikke lenger bruker den utilgjengelige CUPS-serveren '%1'?"
 
 #. Popup::YesNoHeadline body recommendation how to answer the headline question
 #. where %1 will be replaced by the server name:
-#: src/include/printer/overview.rb:207
+#: src/include/printer/overview.rb:210
 msgid "To proceed, you should agree that '%1' will be no longer used."
 msgstr "For å fortsette må du bekrefte at '%1' ikke lenger vil bli brukt."
 
 #. The 'ServerName' entry in /etc/cups/client.conf was removed
 #. so that it is now no longer a real client-only config and
 #. therefore the Printerlib::client_* values must be determined anew:
-#: src/include/printer/overview.rb:223 src/include/printer/overview.rb:234
+#: src/include/printer/overview.rb:226 src/include/printer/overview.rb:237
 msgid "A non-accessible server leads to an endless sequence of delays and failures."
 msgstr "En server du ikke har tilgang til, fører til en endeløs rekke av forsinkelser og feil."
 
 #. where %1 will be replaced by the CUPS server name.
-#: src/include/printer/overview.rb:253
+#: src/include/printer/overview.rb:256
 msgid "CUPS Server %1"
 msgstr "CUPS-server %1"
 
 #. Busy message:
 #. Body of a Popup::ShowFeedback:
-#: src/include/printer/overview.rb:277
+#: src/include/printer/overview.rb:280
 msgid "Testing if CUPS server is accessible..."
 msgstr "Kontrollerer om en CUPS-server er tilgjengelig..."
 
 #. Body of a Popup::AnyMessage when no queue was selected from the list:
 #. Body of a Popup::AnyMessage when no queue was selected from the list:
 #. Body of a Popup::AnyMessage when no queue was selected from the list:
-#: src/include/printer/overview.rb:592 src/include/printer/overview.rb:678
-#: src/include/printer/overview.rb:1152
+#: src/include/printer/overview.rb:595 src/include/printer/overview.rb:681
+#: src/include/printer/overview.rb:1155
 msgid "Select an entry."
 msgstr "Velg en oppføring."
 
-#: src/include/printer/overview.rb:605
+#: src/include/printer/overview.rb:608
 msgid "Cannot Delete"
 msgstr "Kan ikke slette"
 
 #. Body of a Popup::AnyMessage when a remote queue was selected to be deleted:
-#: src/include/printer/overview.rb:607
+#: src/include/printer/overview.rb:610
 msgid "This is a remote configuration. Only local configurations can be deleted."
 msgstr "Dette er et eksternt oppsett. Bare lokale oppsett kan slettes."
 
-#: src/include/printer/overview.rb:614
+#: src/include/printer/overview.rb:617
 msgid "Confirm Deletion"
 msgstr "Bekreft sletting"
 
 #. Body of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:616
+#: src/include/printer/overview.rb:619
 msgid "The selected configuration would be deleted immediately and cannot be restored."
 msgstr "Det valgte oppsettet vil bli slettet umiddelbart, og kan ikke gjenopprettes."
 
 #. 'Yes' button label of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:620
+#: src/include/printer/overview.rb:623
 msgid "Delete configuration %1"
 msgstr "Slett oppsettet %1"
 
 #. 'No' button label of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:622
+#: src/include/printer/overview.rb:625
 msgid "Do not delete it"
 msgstr "Ikke slett"
 
@@ -3695,33 +3695,33 @@
 #. Nevertheless it is possible to delete a class with the YaST printer module
 #. so that the user can get rid of a class which may have been created by accident
 #. with whatever other setup tool:
-#: src/include/printer/overview.rb:637
+#: src/include/printer/overview.rb:640
 msgid "Confirm Deletion of a Class"
 msgstr "Bekreft sletting av en klasse"
 
 #. Body of a confirmation popup before a class will be deleted:
-#: src/include/printer/overview.rb:639
+#: src/include/printer/overview.rb:642
 msgid "A deleted class cannot be re-created with this tool."
 msgstr "En slettet klasse kan ikke gjenopprettes med dette verktøyet."
 
-#: src/include/printer/overview.rb:685
+#: src/include/printer/overview.rb:688
 msgid "Rejecting Print Jobs"
 msgstr "Avviser utskriftsjobber"
 
 #. Body of a Popup::AnyMessage when the queue rejects print jobs:
-#: src/include/printer/overview.rb:687
+#: src/include/printer/overview.rb:690
 msgid "The testpage cannot be printed because print jobs are rejected."
 msgstr "Testsiden kan ikke skrives ut fordi utskriftsjobber avvises."
 
 #. Do a refresh of the overview content to be on the safe side.
 #. Perhaps the actual current queue state is no longer "rejecting".
 #. Re-run the OverviewDialog (with re-created queue status) via the sequencer:
-#: src/include/printer/overview.rb:697
+#: src/include/printer/overview.rb:700
 msgid "Printout Disabled"
 msgstr "Utskrift deaktivert"
 
 #. Body of a Popup::AnyMessage when printing is disabled for the queue:
-#: src/include/printer/overview.rb:699
+#: src/include/printer/overview.rb:702
 msgid "The testpage cannot be printed because printout is disabled."
 msgstr "Testsiden kan ikke skrives ut fordi utskrift er deaktivert."
 
@@ -3730,25 +3730,25 @@
 #. the test above makes sure that the queue has printing enabled.
 #. When this command fails for whatever reason, it is a safe fallback
 #. to assume that there are no pending jobs in the queue:
-#: src/include/printer/overview.rb:728
+#: src/include/printer/overview.rb:731
 msgid "There are pending print jobs which might be deleted before the testpage is printed."
 msgstr "Det er utskriftsjobber i køen som kanskje vil bli slettet før testsiden skrives ut."
 
 #. where %1 will be replaced by the queue name.
 #. where %1 will be replaced by the queue name.
-#: src/include/printer/overview.rb:748 src/include/printer/overview.rb:917
+#: src/include/printer/overview.rb:751 src/include/printer/overview.rb:920
 msgid "Delete Pending Print Jobs For %1"
 msgstr "Slett ventende utskriftsjobber for %1"
 
 #. 'Yes' button label of a confirmation popup
 #. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:756
+#: src/include/printer/overview.rb:759
 msgid "Delete them before printing testpage"
 msgstr "Slett dem før utskrift av testside"
 
 #. 'No' button label of a confirmation popup
 #. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:759
+#: src/include/printer/overview.rb:762
 msgid "Print testpage after the other jobs"
 msgstr "Skriv ut testsiden etter de andre utskriftsjobbene"
 
@@ -3756,7 +3756,7 @@
 #. Only a simple message because this error does not happen on a normal system.
 #. where %1 will be replaced by the queue name.
 #. Only a simple message because this error does not happen on a normal system.
-#: src/include/printer/overview.rb:772 src/include/printer/overview.rb:941
+#: src/include/printer/overview.rb:775 src/include/printer/overview.rb:944
 msgid "Failed to delete all pending jobs for %1."
 msgstr "Kunne ikke slette alle jobber i køen for %1."
 
@@ -3775,28 +3775,28 @@
 #. +  (Printed with CUPS) show
 #. make it obvious that it is not a YaST testpage but a CUPS testpage
 #. and it is now independent of the CUPS version.
-#: src/include/printer/overview.rb:799
+#: src/include/printer/overview.rb:802
 msgid "Test printout"
 msgstr "Utskriftstest"
 
 #. Popup::AnyQuestion message:
-#: src/include/printer/overview.rb:801
+#: src/include/printer/overview.rb:804
 msgid "Print one or two pages e.g. to test duplex printing"
 msgstr "Skriv ut én eller to sider, f.eks. for å teste tosidig utskrift"
 
 #. Popup::AnyQuestion so called 'yes' (default) button label:
-#: src/include/printer/overview.rb:803
+#: src/include/printer/overview.rb:806
 msgid "Single test page"
 msgstr "Én testside"
 
 #. Popup::AnyQuestion so called 'no' button label:
-#: src/include/printer/overview.rb:805
+#: src/include/printer/overview.rb:808
 msgid "Two test pages"
 msgstr "To testsider"
 
 #. where %1 will be replaced by the queue name.
 #. Only a simple message because this error does not happen on a normal system.
-#: src/include/printer/overview.rb:835
+#: src/include/printer/overview.rb:838
 msgid "Failed to print testpage for %1."
 msgstr "Kunne ikke skrive ut testside for %1."
 
@@ -3804,25 +3804,25 @@
 #. there might be whatever reason (e.g. a remote queue might have been deleted in the meantime)
 #. so that a refresh of the overview content is needed to be on the safe side.
 #. Re-run the OverviewDialog (with re-created queue status) via the sequencer:
-#: src/include/printer/overview.rb:852
+#: src/include/printer/overview.rb:855
 msgid "Wait Until Testpage Printing Finished"
 msgstr "Vent til testutskriften er fullført"
 
 #. Popup::AnyQuestion message regarding testpage printout result
 #. where %1 will be replaced by the queue name.
-#: src/include/printer/overview.rb:856
+#: src/include/printer/overview.rb:859
 msgid "Sent testpage to %1. Printing should start soon."
 msgstr "Testside sendt til %1. Utskriften bør snart starte."
 
 #. Popup::AnyQuestion 'Yes' button label
 #. regarding a positive testpage printout result:
-#: src/include/printer/overview.rb:861
+#: src/include/printer/overview.rb:864
 msgid "Testpage printout was successful"
 msgstr "Testutskriften var vellykket"
 
 #. Popup::AnyQuestion 'No' button label
 #. regarding a negative testpage printout result:
-#: src/include/printer/overview.rb:864
+#: src/include/printer/overview.rb:867
 msgid "Testpage printing failed"
 msgstr "Testutskrift mislyktes."
 
@@ -3842,53 +3842,53 @@
 #. spit out zillions of sheets with nonsense characters.
 #. When this command fails for whatever reason, it is a safe fallback
 #. to assume that there are no pending jobs in the queue:
-#: src/include/printer/overview.rb:897
+#: src/include/printer/overview.rb:900
 msgid "There are pending print jobs which might be deleted now."
 msgstr "Det er utskriftsjobber i køen som kan bli slettet nå."
 
 #. 'Yes' button label of a confirmation popup
 #. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:925
+#: src/include/printer/overview.rb:928
 msgid "Delete all pending jobs"
 msgstr "Slett alle ventende jobber"
 
 #. 'No' button label of a confirmation popup
 #. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:928
+#: src/include/printer/overview.rb:931
 msgid "Do not delete them"
 msgstr "Ikke slett"
 
 #. Ignore an effectively empty test_print_cups_error_log:
-#: src/include/printer/overview.rb:1043
+#: src/include/printer/overview.rb:1046
 msgid "For the full log, see the /var/log/cups/error_log file."
 msgstr "Filen /var/log/cups/error_log inneholder hele loggen."
 
-#: src/include/printer/overview.rb:1048
+#: src/include/printer/overview.rb:1051
 msgid "CUPS log information while processing the testpage for %1 (English only)"
 msgstr "CUPS-logg for behandling av testside for %1 (kun engelsk)"
 
 #. but the test_print_cups_error_log was effectively empty,
 #. show a very generic info to the user to show at least something:
-#: src/include/printer/overview.rb:1065
+#: src/include/printer/overview.rb:1068
 msgid "For CUPS log information, see the /var/log/cups/error_log file."
 msgstr "Filen /var/log/cups/error_log inneholder CUPS-informasjon."
 
 #. show a very generic info to the user to show at least something:
-#: src/include/printer/overview.rb:1075
+#: src/include/printer/overview.rb:1078
 msgid "When printing via a remote system fails, you may ask an admin of the remote system."
 msgstr "Be en administrator for det eksterne systemet om hjelp hvis en utskrift via et eksternt system mislykkes."
 
 #. PopupYesNoHeadline body:
-#: src/include/printer/overview.rb:1102
+#: src/include/printer/overview.rb:1105
 msgid "A remote CUPS server setting conflicts with adding a configuration."
 msgstr "Det er en konflikt mellom ekstern CUPS-serverinnstilling og nytt oppsett."
 
-#: src/include/printer/overview.rb:1159
+#: src/include/printer/overview.rb:1162
 msgid "Cannot Modify"
 msgstr "Kan ikke endre"
 
 #. Body of a Popup::AnyMessage when a remote queue was selected to be modified:
-#: src/include/printer/overview.rb:1161
+#: src/include/printer/overview.rb:1164
 msgid "This is a remote configuration. Only local configurations can be modified."
 msgstr "Dette er et eksternt oppsett. Bare lokale oppsett kan endres."
 

Modified: trunk/yast/nb/po/rdp.nb.po
===================================================================
--- trunk/yast/nb/po/rdp.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/rdp.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2002-06-17 14:33+0200\n"
 "Last-Translator: www.linuxbutikken.no \n"
 "Language-Team: Norwegian \n"
@@ -101,52 +101,52 @@
 msgstr "Brannmurinnstillinger"
 
 #. Progress stage 1
-#: src/modules/RDP.rb:90
+#: src/modules/RDP.rb:85
 msgid "Write firewall settings"
 msgstr "Lagre brannmurinnstillinger"
 
 #. Progress stage 2
-#: src/modules/RDP.rb:92
+#: src/modules/RDP.rb:87
 msgid "Configure xrdp"
 msgstr "Sett opp xrdp"
 
 #. Progress stage 3
-#: src/modules/RDP.rb:98
+#: src/modules/RDP.rb:93
 msgid "Restart the services"
 msgstr "Start tjenesten på nytt"
 
-#: src/modules/RDP.rb:100
+#: src/modules/RDP.rb:95
 msgid "Stop the services"
 msgstr "Stopp tjenester"
 
-#: src/modules/RDP.rb:104
+#: src/modules/RDP.rb:99
 msgid "Saving Remote Administration Configuration"
 msgstr "Lagrer oppsett av ekstern administrasjon"
 
 #. 100; //for testing
-#: src/modules/RDP.rb:109
+#: src/modules/RDP.rb:104
 msgid "Writing firewall settings..."
 msgstr "Lagrer brannmurinnstillinger..."
 
-#: src/modules/RDP.rb:115
+#: src/modules/RDP.rb:110
 msgid "Configuring xrdp..."
 msgstr "Setter opp xrdp..."
 
 #. Disable xrdp
-#: src/modules/RDP.rb:134
+#: src/modules/RDP.rb:129
 msgid "Restarting the service..."
 msgstr "Starter tjenesten på nytt..."
 
-#: src/modules/RDP.rb:137
+#: src/modules/RDP.rb:132
 msgid "Stopping the service..."
 msgstr "stopper tjenesten..."
 
 #. Label in proposal text
-#: src/modules/RDP.rb:153
+#: src/modules/RDP.rb:148
 msgid "Remote administration is enabled."
 msgstr "Ekstern administrasjon er aktivert."
 
 #. Label in proposal text
-#: src/modules/RDP.rb:156
+#: src/modules/RDP.rb:151
 msgid "Remote administration is disabled."
 msgstr "Ekstern administrasjon is deaktivert."

Modified: trunk/yast/nb/po/rear.nb.po
===================================================================
--- trunk/yast/nb/po/rear.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/rear.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2002-06-17 14:33+0200\n"
 "Last-Translator: www.linuxbutikken.no \n"
 "Language-Team: Norwegian \n"
@@ -230,13 +230,13 @@
 msgstr "Leser Rear-oppsett"
 
 #: src/include/rear/ui.rb:698
+msgid "Reading rear settings"
+msgstr "Leser Rear-innstillinger"
+
+#: src/include/rear/ui.rb:698
 msgid "Analyzing system"
 msgstr "Analyserer systemet"
 
-#: src/include/rear/ui.rb:698
-msgid "Reading rear settings"
-msgstr "Leser Rear-innstillinger"
-
 #: src/include/rear/ui.rb:699
 msgid "Analyzing system..."
 msgstr "Analyserer systemet..."

Modified: trunk/yast/nb/po/registration.nb.po
===================================================================
--- trunk/yast/nb/po/registration.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/registration.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: registration\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:17+0200\n"
+"POT-Creation-Date: 2016-08-15 17:44+0200\n"
 "PO-Revision-Date: 2009-10-10 09:51+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -23,33 +23,6 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.0\n"
 
-#. popup heading (in bold)
-#: src/clients/discover_registration_services.rb:42
-#, fuzzy
-#| msgid "Local Registration Server"
-msgid "Local Registration Servers"
-msgstr "Lokal registreringsserver"
-
-#: src/clients/discover_registration_services.rb:44
-msgid ""
-"Select a detected registration server from the list\n"
-"or the default SUSE registration server."
-msgstr ""
-
-#. error popup
-#: src/clients/discover_registration_services.rb:68
-#, fuzzy
-#| msgid "Use custom registration server "
-msgid "No registration server selected."
-msgstr "Bruk egendefinert registreringsserver"
-
-#. %s is the default SCC URL
-#: src/clients/discover_registration_services.rb:114
-#, fuzzy
-#| msgid "Novell Customer Center Configuration"
-msgid "SUSE Customer Center (%s)"
-msgstr "Oppsett for Novell kundesenter"
-
 #. popup message
 #. popup message
 #. popup message
@@ -68,9 +41,9 @@
 #. dialog title
 #. display and run a dialog for updating the current registration
 #. @return [Symbol] user input
-#: src/clients/inst_scc.rb:186
+#: src/clients/inst_scc.rb:189
 #: src/lib/registration/ui/autoyast_config_dialog.rb:104
-#: src/lib/registration/ui/base_system_registration_dialog.rb:48
+#: src/lib/registration/ui/base_system_registration_dialog.rb:61
 #: src/lib/registration/ui/migration_repos_workflow.rb:287
 #: src/lib/registration/ui/registered_system_dialog.rb:37
 #: src/lib/registration/ui/registration_update_dialog.rb:41
@@ -86,26 +59,26 @@
 msgstr ""
 
 #. popup message: registration finished properly
-#: src/clients/scc_auto.rb:201
+#: src/clients/scc_auto.rb:204
 #, fuzzy
 #| msgid "Registration was successful."
 msgid "Registration was successfull."
 msgstr "Registreringen er fullført."
 
 #. remove possible duplicates
-#: src/clients/scc_auto.rb:229
+#: src/clients/scc_auto.rb:232
 msgid "SLP discovery failed, no server found"
 msgstr ""
 
 #. download and install the specified SSL certificate to the system
 #. @param url [String] URL of the certificate
-#: src/clients/scc_auto.rb:247
+#: src/clients/scc_auto.rb:250
 #, fuzzy
 #| msgid "Download CA Certificate"
 msgid "Downloading SSL Certificate"
 msgstr "Last ned CA-sertifikat"
 
-#: src/clients/scc_auto.rb:251
+#: src/clients/scc_auto.rb:254
 #, fuzzy
 #| msgid "Import Certificate"
 msgid "Importing SSL Certificate"
@@ -114,8 +87,8 @@
 #. %s is name of given product
 #. then register the product(s)
 #. %s is name of given product
-#: src/clients/scc_auto.rb:326 src/lib/registration/registration_ui.rb:281
-#: src/lib/registration/registration_ui.rb:311
+#: src/clients/scc_auto.rb:329 src/lib/registration/registration_ui.rb:286
+#: src/lib/registration/registration_ui.rb:319
 #, fuzzy
 #| msgid "Registration Code"
 msgid "Registering %s ..."
@@ -296,31 +269,27 @@
 msgid "SHA256 Fingerprint: "
 msgstr "Fingeravtrykk:"
 
-#. Error popup
-#: src/lib/registration/connect_helpers.rb:74
-msgid ""
-"Network is not configured, the registration server cannot be reached.\n"
-"Do you want to configure the network now?"
-msgstr ""
-
+#. FIXME: to not break existing translation, this typo should be fixed
+#. later after SP2: time -> timed
 #: src/lib/registration/connect_helpers.rb:80
-msgid "Network error, check the network configuration."
+msgid "Connection time out."
 msgstr ""
 
-#. Error popup
-#: src/lib/registration/connect_helpers.rb:85
-msgid "Connection time out."
+#: src/lib/registration/connect_helpers.rb:81
+msgid ""
+"Make sure that the registration server is reachable and\n"
+"the connection is reliable."
 msgstr ""
 
 #. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:93
+#: src/lib/registration/connect_helpers.rb:91
 #, fuzzy
 #| msgid "Registration code is invalid."
 msgid "Check that this system is known to the registration server."
 msgstr "Registreringskoden er ugyldig."
 
 #. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:99
+#: src/lib/registration/connect_helpers.rb:97
 msgid ""
 "If you are upgrading from SLE11 make sure the SCC server\n"
 "knows the old NCC registration. Synchronization from NCC to SCC\n"
@@ -336,34 +305,36 @@
 #. update the message when an old SMT server is found
 #. Error popup
 #. update the message when an old SMT server is found
-#: src/lib/registration/connect_helpers.rb:113
-#: src/lib/registration/connect_helpers.rb:118
+#: src/lib/registration/connect_helpers.rb:111
+#: src/lib/registration/connect_helpers.rb:116
+#: src/lib/registration/connect_helpers.rb:119
+#: src/lib/registration/connect_helpers.rb:126
+#: src/lib/registration/connect_helpers.rb:177
+#: src/lib/registration/connect_helpers.rb:181
+#, fuzzy
+#| msgid "Local Registration Server"
+msgid "Connection to registration server failed."
+msgstr "Lokal registreringsserver"
+
 #: src/lib/registration/connect_helpers.rb:121
-#: src/lib/registration/connect_helpers.rb:128
-#: src/lib/registration/connect_helpers.rb:179
-#: src/lib/registration/connect_helpers.rb:182
-msgid "Registration failed."
-msgstr "Registreringen mislyktes."
-
-#: src/lib/registration/connect_helpers.rb:123
 #, fuzzy
 #| msgid "Registration can not be performed."
 msgid "Registration client error."
 msgstr "Registreringen kan ikke utføres."
 
-#: src/lib/registration/connect_helpers.rb:125
+#: src/lib/registration/connect_helpers.rb:123
 msgid ""
 "Registration server error.\n"
-"Retry registration later."
+"Retry the operation later."
 msgstr ""
 
 #. error message
-#: src/lib/registration/connect_helpers.rb:167
+#: src/lib/registration/connect_helpers.rb:165
 msgid "Received SSL Certificate does not match the expected certificate."
 msgstr ""
 
 #. %s are error details
-#: src/lib/registration/connect_helpers.rb:197
+#: src/lib/registration/connect_helpers.rb:198
 #, fuzzy
 #| msgid "Details..."
 msgid "Details: %s"
@@ -372,7 +343,7 @@
 #. TRANSLATORS: multiline error message - a SSL certificate has been
 #. imported but the registration server still cannot be accessed securely,
 #. user has to solve the certificate issue manually.
-#: src/lib/registration/connect_helpers.rb:226
+#: src/lib/registration/connect_helpers.rb:227
 msgid ""
 "A certificate has been already imported\n"
 "but the server connection still cannot be trusted.\n"
@@ -382,23 +353,23 @@
 msgstr ""
 
 #. progress label
-#: src/lib/registration/connect_helpers.rb:238
+#: src/lib/registration/connect_helpers.rb:239
 msgid "Importing the SSL certificate"
 msgstr ""
 
-#: src/lib/registration/connect_helpers.rb:239
+#: src/lib/registration/connect_helpers.rb:240
 msgid "Importing '%s' certificate..."
 msgstr ""
 
 #. try to use a translatable message first, if not found then use
 #. the original error message from openSSL
-#: src/lib/registration/connect_helpers.rb:260
+#: src/lib/registration/connect_helpers.rb:261
 msgid "Secure connection error: %s"
 msgstr ""
 
 #. TRANSLATORS: error message, %s is a server URL,
 #. e.g. https://smt.example.com
-#: src/lib/registration/connect_helpers.rb:279
+#: src/lib/registration/connect_helpers.rb:280
 msgid ""
 "An old registration server was detected at\n"
 "%s.\n"
@@ -406,6 +377,26 @@
 "protocol is installed at the server."
 msgstr ""
 
+#. FIXME: use a better message, this one has been reused after the text freeze
+#. error message, the entered URL is not valid.
+#: src/lib/registration/connect_helpers.rb:292
+#: src/lib/registration/ui/base_system_registration_dialog.rb:544
+#, fuzzy
+#| msgid "Invalid value."
+msgid "Invalid URL."
+msgstr "Ugyldig verdi."
+
+#. Error popup
+#: src/lib/registration/connect_helpers.rb:296
+msgid ""
+"Network is not configured, the registration server cannot be reached.\n"
+"Do you want to configure the network now?"
+msgstr ""
+
+#: src/lib/registration/connect_helpers.rb:303
+msgid "Network error, check the network configuration."
+msgstr ""
+
 #. progress step title
 #: src/lib/registration/finish_dialog.rb:35
 #, fuzzy
@@ -414,20 +405,20 @@
 msgstr "Lagrer oppsett av ekstern administrasjon"
 
 #. error message
-#: src/lib/registration/helpers.rb:231
+#: src/lib/registration/helpers.rb:234
 msgid ""
 "The base product was not found,\n"
 "check your system."
 msgstr ""
 
 #. TRANSLATORS: %s = bugzilla URL
-#: src/lib/registration/helpers.rb:235
+#: src/lib/registration/helpers.rb:238
 msgid ""
 "The installation medium or the installer itself is seriously broken.\n"
 "Report a bug at %s."
 msgstr ""
 
-#: src/lib/registration/helpers.rb:238
+#: src/lib/registration/helpers.rb:241
 msgid ""
 "Make sure a product is installed and /etc/products.d/baseproduct\n"
 "is a symlink pointing to the base product .prod file."
@@ -436,7 +427,7 @@
 #. FIXME: reused an existing message due to text freeze
 #. (later use a better text, it's system update actually...)
 #: src/lib/registration/registration_ui.rb:80
-#: src/lib/registration/registration_ui.rb:267
+#: src/lib/registration/registration_ui.rb:272
 msgid "Registering the System..."
 msgstr ""
 
@@ -445,8 +436,8 @@
 #. updating registered addon/extension, %s is an extension name
 #. TRANSLATORS: Progress label
 #: src/lib/registration/registration_ui.rb:106
-#: src/lib/registration/registration_ui.rb:146
-#: src/lib/registration/registration_ui.rb:346
+#: src/lib/registration/registration_ui.rb:149
+#: src/lib/registration/registration_ui.rb:357
 #: src/lib/registration/ui/migration_repos_workflow.rb:304
 #, fuzzy
 #| msgid "Updating /etc/hosts ..."
@@ -454,7 +445,7 @@
 msgstr "Oppdaterer /etc/hosts..."
 
 #. TRANSLATORS: progress label
-#: src/lib/registration/registration_ui.rb:163
+#: src/lib/registration/registration_ui.rb:166
 #, fuzzy
 #| msgid "Loading configuration %1..."
 msgid "Synchronizing Products..."
@@ -466,35 +457,35 @@
 #. @return [ArrayRegistration::Addon] available addons
 #. download the addons from SCC, let the user select addons to install
 #. @return [Symbol] the user input
-#: src/lib/registration/registration_ui.rb:177
+#: src/lib/registration/registration_ui.rb:180
 #: src/lib/registration/ui/autoyast_config_workflow.rb:106
 #, fuzzy
 #| msgid "Registration Module Help"
 msgid "Loading Available Extensions and Modules..."
 msgstr "Hjelp for registreringsmodul"
 
-#: src/lib/registration/registration_ui.rb:191
+#: src/lib/registration/registration_ui.rb:195
 #, fuzzy
 #| msgid "Loading configuration %1..."
 msgid "Loading Migration Products..."
 msgstr "Leser oppsettet %1..."
 
 #. dialog title
-#: src/lib/registration/registration_ui.rb:208
+#: src/lib/registration/registration_ui.rb:213
 #, fuzzy
 #| msgid "Registration Module Help"
 msgid "Register Extensions and Modules"
 msgstr "Hjelp for registreringsmodul"
 
 #. help text
-#: src/lib/registration/registration_ui.rb:212
+#: src/lib/registration/registration_ui.rb:217
 #, fuzzy
 #| msgid "<p>Please wait, while volumes are being detected.</p>"
 msgid "<p>Extensions and Modules are being registered.</p>"
 msgstr "<p>Vent mens volumene registreres.</p>"
 
 #. TRANSLATORS: updates popup question (1/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:237
+#: src/lib/registration/registration_ui.rb:242
 #, fuzzy
 #| msgid "Use custom registration server "
 msgid ""
@@ -503,7 +494,7 @@
 msgstr "Bruk egendefinert registreringsserver"
 
 #. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:241
+#: src/lib/registration/registration_ui.rb:246
 #, fuzzy
 #| msgid ""
 #| "Would you like to use these mount points\n"
@@ -517,7 +508,7 @@
 
 #. Yast::Mode.update
 #. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:245
+#: src/lib/registration/registration_ui.rb:250
 #, fuzzy
 #| msgid "Would you like to enable access to the profile repository?"
 msgid ""
@@ -535,7 +526,7 @@
 #. TRANSLATORS: error popup, %s is a repository name, the popup is displayed
 #. when a migration repository cannot be accessed, there are [Skip]
 #. and [Abort] buttons displayed below the question
-#: src/lib/registration/sw_mgmt.rb:97
+#: src/lib/registration/sw_mgmt.rb:99
 msgid ""
 "Repository '%s'\n"
 "cannot be loaded.\n"
@@ -546,7 +537,7 @@
 #. create UI label for a base product
 #. @param base_product [Hash] Product (hash from pkg-bindings)
 #. @return [String] UI Label
-#: src/lib/registration/sw_mgmt.rb:192
+#: src/lib/registration/sw_mgmt.rb:175
 #, fuzzy
 #| msgid "Unknown error"
 msgid "Unknown product"
@@ -554,7 +545,7 @@
 
 #. error message
 #. error message
-#: src/lib/registration/sw_mgmt.rb:219 src/lib/registration/sw_mgmt.rb:292
+#: src/lib/registration/sw_mgmt.rb:202 src/lib/registration/sw_mgmt.rb:275
 #, fuzzy
 #| msgid "Starting registration..."
 msgid "Saving repository configuration failed."
@@ -562,27 +553,27 @@
 
 #. # error message
 #. error message
-#: src/lib/registration/sw_mgmt.rb:256 src/lib/registration/sw_mgmt.rb:267
+#: src/lib/registration/sw_mgmt.rb:238 src/lib/registration/sw_mgmt.rb:249
 msgid "Updating service '%s' failed."
 msgstr ""
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:262
+#: src/lib/registration/sw_mgmt.rb:244
 msgid "Adding service '%s' failed."
 msgstr ""
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:274
+#: src/lib/registration/sw_mgmt.rb:256
 msgid "Saving service '%s' failed."
 msgstr ""
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:279
+#: src/lib/registration/sw_mgmt.rb:262
 msgid "Refreshing service '%s' failed."
 msgstr ""
 
 #. TRANSLATORS: %s is a product name
-#: src/lib/registration/sw_mgmt.rb:486
+#: src/lib/registration/sw_mgmt.rb:474
 #, fuzzy
 #| msgid "No products found to be registered."
 msgid ""
@@ -657,7 +648,11 @@
 
 #. create the main dialog definition
 #. @return [Yast::Term] the main UI dialog term
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:77
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:91
+msgid "&Filter Out Beta Versions"
+msgstr ""
+
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:93
 #, fuzzy
 #| msgid "Details..."
 msgid "Details"
@@ -665,30 +660,30 @@
 
 #. addon description widget
 #. @return [Yast::Term] the addon details widget
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:88
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:103
 msgid "Select an extension or a module to show details here"
 msgstr ""
 
 #. checkbox label for an unavailable extension
 #. (%s is an extension name)
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:164
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:116
 #, fuzzy
 #| msgid "is not available"
 msgid "%s (not available)"
 msgstr "er ikke tilgjengelig"
 
 #. check if the count of addons requiring a reg. code fits two columns
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:246
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:254
 msgid "YaST allows to select at most %s extensions or modules."
 msgstr ""
 
 #. help text (2/3)
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:257
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:265
 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_base_dialog.rb:260
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:268
 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 ""
 
@@ -707,7 +702,7 @@
 msgstr "<p>Her kan du vise alle tilleggsprodukter som er installert på systemet.</p>"
 
 #. @return [String] the main dialog label
-#: src/lib/registration/ui/addon_selection_registration_dialog.rb:52
+#: src/lib/registration/ui/addon_selection_registration_dialog.rb:50
 msgid "Available Extensions and Modules"
 msgstr ""
 
@@ -777,7 +772,7 @@
 msgstr "Laster ned %1-utvidelse..."
 
 #. remove the selected addon after user confirms the removal
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:137
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:136
 #, fuzzy
 #| msgid "Really delete '%1'?"
 msgid "Really delete '%s'?"
@@ -785,30 +780,30 @@
 
 #. dialog definition for adding/editing an addon
 #. @return [Yast::Term] popup definition
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:185
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:184
 #, fuzzy
 #| msgid "Vendor Identifier"
 msgid "Extension or Module &Identifier"
 msgstr "Produsentidentifikasjon"
 
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:186
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:185
 msgid "&Version"
 msgstr "&Versjon"
 
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:187
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:186
 msgid "&Architecture"
 msgstr "&Arkitektur"
 
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:188
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:187
 #, fuzzy
 #| msgid "&Release"
 msgid "&Release Type"
 msgstr "Ve&rsjon"
 
 #. handle nil specifically, it cannot be stored in XML profile
-#: src/lib/registration/ui/autoyast_addon_dialog.rb:191
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:190
 #: src/lib/registration/ui/autoyast_config_dialog.rb:108
-#: src/lib/registration/ui/base_system_registration_dialog.rb:133
+#: src/lib/registration/ui/base_system_registration_dialog.rb:266
 #, fuzzy
 #| msgid "Registration Code"
 msgid "Registration &Code"
@@ -846,10 +841,8 @@
 msgid "Register the Product"
 msgstr "Registreringskode"
 
-#. part of the main dialog definition - the input fields
-#. @return [Yast::Term] UI term
 #: src/lib/registration/ui/autoyast_config_dialog.rb:106
-#: src/lib/registration/ui/base_system_registration_dialog.rb:131
+#: src/lib/registration/ui/base_system_registration_dialog.rb:263
 #, fuzzy
 #| msgid "Email Address"
 msgid "&E-mail Address"
@@ -862,43 +855,43 @@
 msgstr "Initialiserer tilgjengelige pakkebrønner"
 
 #. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:128
+#: src/lib/registration/ui/autoyast_config_dialog.rb:127
 #, fuzzy
 #| msgid "SMT Server Settings"
 msgid "Server Settings"
 msgstr "Innstillinger for SMT-server"
 
-#: src/lib/registration/ui/autoyast_config_dialog.rb:132
+#: src/lib/registration/ui/autoyast_config_dialog.rb:131
 #, fuzzy
 #| msgid "Local Registration Server"
 msgid "Find Registration Server Using SLP Discovery"
 msgstr "Lokal registreringsserver"
 
 #. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:137
+#: src/lib/registration/ui/autoyast_config_dialog.rb:136
 msgid "Use Specific Server URL Instead of the Default"
 msgstr ""
 
 #. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:144
+#: src/lib/registration/ui/autoyast_config_dialog.rb:143
 #, fuzzy
 #| msgid "Server CA certificate:"
 msgid "Optional SSL Server Certificate URL"
 msgstr "Serverens CA-sertifikat:"
 
 #. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:153
+#: src/lib/registration/ui/autoyast_config_dialog.rb:152
 #, fuzzy
 #| msgid "Server CA certificate:"
 msgid "Optional SSL Server Certificate Fingerprint"
 msgstr "Serverens CA-sertifikat:"
 
-#: src/lib/registration/ui/autoyast_config_dialog.rb:155
+#: src/lib/registration/ui/autoyast_config_dialog.rb:154
 msgid "none"
 msgstr "ingen"
 
 #. Translators: Text for UI Label - capitalized
-#: src/lib/registration/ui/autoyast_config_dialog.rb:166
+#: src/lib/registration/ui/autoyast_config_dialog.rb:165
 #, fuzzy
 #| msgid "CA Certificate File"
 msgid "SSL Certificate Fingerprint"
@@ -906,28 +899,40 @@
 
 #. the UI defition for the main dialog
 #. @return [Yast::Term] UI term
-#: src/lib/registration/ui/autoyast_config_dialog.rb:189
+#: src/lib/registration/ui/autoyast_config_dialog.rb:187
 #, fuzzy
 #| msgid "Registration Module Help"
 msgid "Register Extensions or Modules..."
 msgstr "Hjelp for registreringsmodul"
 
-#. button label
-#: src/lib/registration/ui/base_system_registration_dialog.rb:84
+#. TRANSLATORS: radio button; %s is a host name.
+#: src/lib/registration/ui/base_system_registration_dialog.rb:254
 #, fuzzy
+#| msgid "Registration Code"
+msgid "Register System via %s"
+msgstr "Registreringskode"
+
+#. TRANSLATORS: radio button
+#: src/lib/registration/ui/base_system_registration_dialog.rb:297
+#, fuzzy
+#| msgid "Registration server:"
+msgid "Register System via local SMT Server"
+msgstr "Registreringsserver:"
+
+#: src/lib/registration/ui/base_system_registration_dialog.rb:308
+#, fuzzy
 #| msgid "Local Registration Server"
-msgid "&Local Registration Server..."
+msgid "&Local Registration Server URL"
 msgstr "Lokal registreringsserver"
 
-#. button label
-#: src/lib/registration/ui/base_system_registration_dialog.rb:97
+#: src/lib/registration/ui/base_system_registration_dialog.rb:322
 #, fuzzy
 #| msgid "Registration"
 msgid "&Skip Registration"
 msgstr "Registrering"
 
 #. display the addon re-registration button only in registered installed system
-#: src/lib/registration/ui/base_system_registration_dialog.rb:106
+#: src/lib/registration/ui/base_system_registration_dialog.rb:334
 #, fuzzy
 #| msgid "Registration Module Help"
 msgid "&Register Extensions or Modules Again"
@@ -937,53 +942,36 @@
 #. @return [Yast::Term]  UI term
 #. the main dialog content
 #. @return [Yast::Term] UI term
-#: src/lib/registration/ui/base_system_registration_dialog.rb:118
+#: src/lib/registration/ui/base_system_registration_dialog.rb:342
 #: src/lib/registration/ui/registered_system_dialog.rb:67
 msgid "The system is already registered."
 msgstr ""
 
+#: src/lib/registration/ui/base_system_registration_dialog.rb:344
+msgid "Please select your preferred method of registration."
+msgstr ""
+
 #. help text
-#: src/lib/registration/ui/base_system_registration_dialog.rb:142
+#: src/lib/registration/ui/base_system_registration_dialog.rb:360
 msgid "Enter SUSE Customer Center credentials here to register the system to get updates and extensions."
 msgstr ""
 
 #. Popup question: confirm skipping the registration
-#: src/lib/registration/ui/base_system_registration_dialog.rb:177
+#: src/lib/registration/ui/base_system_registration_dialog.rb:369
 msgid ""
 "If you do not register your system we will not be able\n"
 "to grant you access to the update repositories.\n"
 "\n"
 "You can register after the installation or visit our\n"
-"Customer Center for online registration.\n"
-"\n"
-"Really skip the registration now?"
+"Customer Center for online registration."
 msgstr ""
 
-#. label text describing the registration (1/2)
-#. use \n to split to more lines if needed (use max. 76 chars/line)
-#: src/lib/registration/ui/base_system_registration_dialog.rb:194
-msgid ""
-"Please enter a registration or evaluation code for this product and your\n"
-"User Name/E-mail address from the SUSE Customer Center in the fields below.\n"
-"Access to security and general software updates is only possible on\n"
-"a registered system."
-msgstr ""
-
-#. 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/lib/registration/ui/base_system_registration_dialog.rb:206
-msgid ""
-"If you skip product registration now, remember to register after\n"
-"installation has completed."
-msgstr ""
-
 #. UI term for the network configuration button (or empty if not needed)
 #. @return [Yast::Term] UI term
-#: src/lib/registration/ui/base_system_registration_dialog.rb:218
+#: src/lib/registration/ui/base_system_registration_dialog.rb:381
 #, fuzzy
 #| msgid "Novell Customer Center Configuration"
-msgid "Network Configuration..."
+msgid "Net&work Configuration..."
 msgstr "Oppsett for Novell kundesenter"
 
 #. SSL error message
@@ -1012,22 +1000,22 @@
 
 #. help text (RichText) for importing a SSL certificate (1/5)
 #: src/lib/registration/ui/import_certificate_dialog.rb:122
-msgid "<p>Secure connection (HTTPS) uses SSL certificates for verifying the authenticity of the server and for encrypting the transferred data.</p>"
+msgid "<p>Secure connections (e.g. HTTPS) use SSL certificates for verifying the authenticity of the server and encrypting the data being transferred.</p>"
 msgstr ""
 
 #. help text (RichText) for importing a SSL certificate (2/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:126
-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>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:127
+msgid "<p>You can choose to import the certificate into the list of known certificate authorities (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:131
-msgid "<p>Importing a certificate will allow to use for example a self-signed certificate.</p>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:132
+msgid "<p>Importing a certificate will, for example, allow you to use a self-signed certificate.</p>"
 msgstr ""
 
 #. help text (RichText) for importing a SSL certificate (4/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:135
-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>"
+#: src/lib/registration/ui/import_certificate_dialog.rb:136
+msgid "<p><b>Important:</b> You should always verify the fingerprints of certificates you import to ensure they are genuine.</p>"
 msgstr ""
 
 #. help text (RichText) for importing a SSL certificate (5/5)
@@ -1035,20 +1023,6 @@
 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:67
-#, fuzzy
-#| msgid "Invalid value."
-msgid "Invalid URL."
-msgstr "Ugyldig verdi."
-
-#. input field label
-#: src/lib/registration/ui/local_server_dialog.rb:106
-#, fuzzy
-#| msgid "Local Registration Server"
-msgid "&Local Registration Server URL"
-msgstr "Lokal registreringsserver"
-
 #. TRANSLATORS: error message, %s are details
 #. TRANSLATORS: error message, %s are details
 #: src/lib/registration/ui/media_addon_workflow.rb:95
@@ -1083,21 +1057,21 @@
 msgstr "Velg ny målarkitektur."
 
 #. TRANSLATORS: Push button label, starts the repository management module
-#: src/lib/registration/ui/migration_repos_selection_dialog.rb:89
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:88
 #, fuzzy
 #| msgid "Saving Repositories..."
 msgid "Manage Repositories..."
 msgstr "Lagrer pakkebrønner..."
 
 #. TRANSLATORS: summary text, %s is a repository URL
-#: src/lib/registration/ui/migration_repos_selection_dialog.rb:114
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:113
 #, fuzzy
 #| msgid "URL: %1"
 msgid "URL: %s"
 msgstr "Nettadresse: %1"
 
 #. TRANSLATORS: summary text, %s is a repository priority (1-99)
-#: src/lib/registration/ui/migration_repos_selection_dialog.rb:116
+#: src/lib/registration/ui/migration_repos_selection_dialog.rb:115
 #, fuzzy
 #| msgid "Priority"
 msgid "Priority: %s"
@@ -1173,19 +1147,19 @@
 msgstr "Velg ny målarkitektur."
 
 #. TRANSLATORS: check button label
-#: src/lib/registration/ui/migration_selection_dialog.rb:138
+#: src/lib/registration/ui/migration_selection_dialog.rb:137
 msgid "Manually Adjust the Repositories for Migration"
 msgstr ""
 
 #. TRANSLATORS: selection box label
-#: src/lib/registration/ui/migration_selection_dialog.rb:153
+#: src/lib/registration/ui/migration_selection_dialog.rb:152
 #, fuzzy
 #| msgid "Possible &Solutions"
 msgid "Possible Migration Targets"
 msgstr "Mulige &løsninger"
 
 #. TRANSLATORS: RichText header (details for the selected item)
-#: src/lib/registration/ui/migration_selection_dialog.rb:191
+#: src/lib/registration/ui/migration_selection_dialog.rb:189
 #, fuzzy
 #| msgid "Configuration Summary"
 msgid "Migration Summary"
@@ -1197,14 +1171,14 @@
 #. using the selected migration.
 #. %{url} is the URL of the registration server (SMT)
 #. %{product} is a full product name, e.g. "SUSE Linux Enterprise Server 12"
-#: src/lib/registration/ui/migration_selection_dialog.rb:214
+#: src/lib/registration/ui/migration_selection_dialog.rb:212
 msgid "ERROR: Product <b>%{product}</b> is not available at the registration server (%{url}). Make the product available to allow using this migration."
 msgstr ""
 
 #. this is rather a theoretical case, but anyway....
 #. TRANSLATORS: Summary message, rich text format
 #. %s is a product name, e.g. "SUSE Linux Enterprise Server 12 SP1 x86_64"
-#: src/lib/registration/ui/migration_selection_dialog.rb:225
+#: src/lib/registration/ui/migration_selection_dialog.rb:224
 #, fuzzy
 #| msgid "Package %1 will be installed."
 msgid "%s <b>will be installed.</b>"
@@ -1212,25 +1186,25 @@
 
 #. TRANSLATORS: Summary message, rich text format
 #. %s is a product name, e.g. "SUSE Linux Enterprise Server 12"
-#: src/lib/registration/ui/migration_selection_dialog.rb:242
+#: src/lib/registration/ui/migration_selection_dialog.rb:241
 msgid "%s <b>stays unchanged.</b>"
 msgstr ""
 
 #. TRANSLATORS: Summary message, rich text format
 #. %{old_product} is a product name, e.g. "SUSE Linux Enterprise Server 12"
 #. %{new_product} is a product name, e.g. "SUSE Linux Enterprise Server 12 SP1 x86_64"
-#: src/lib/registration/ui/migration_selection_dialog.rb:252
+#: src/lib/registration/ui/migration_selection_dialog.rb:251
 msgid "%{old_product} <b>will be upgraded to</b> %{new_product}."
 msgstr ""
 
 #. TRANSLATORS: Summary message, rich text format
 #. %{old_product} and %{new_product} are product names
-#: src/lib/registration/ui/migration_selection_dialog.rb:257
+#: src/lib/registration/ui/migration_selection_dialog.rb:256
 msgid "%{old_product} <b>will be downgraded to</b> %{new_product}."
 msgstr ""
 
 #. TRANSLATORS: an error popup message
-#: src/lib/registration/ui/migration_selection_dialog.rb:290
+#: src/lib/registration/ui/migration_selection_dialog.rb:289
 msgid ""
 "The selected migration contains a product\n"
 "which is not available at the registration server.\n"
@@ -1285,19 +1259,88 @@
 "You can manually register the system from scratch."
 msgstr ""
 
-#. ignore SUSE manager registration servers (bnc#894470)
-#: src/lib/registration/url_helpers.rb:203
+#. Constructor
+#.
+#. @param services    [ArrayYast::SlpServiceClass::Service]
+#: src/lib/registration/url_helpers.rb:220
+#, fuzzy
 #| msgid "Checking..."
 msgid "Searching..."
 msgstr "Kontrollerer..."
 
-#: src/lib/registration/url_helpers.rb:203
+#: src/lib/registration/url_helpers.rb:220
 #, fuzzy
 #| msgid "Use local registration server"
 msgid "Looking up local registration servers..."
 msgstr "Bruk lokal registreringsserver"
 
+#. Constructor
+#.
+#. @param services        [ArraySlpServiceClass::Service] list of services to show
+#. @param heading         [String] Dialog's heading. If nil (or not specified), a default
+#. heading will be used).
+#. @param description     [String] Dialog's description (to be shown on top of the list).
+#. If nil (or not specified) a default description will be used.
+#. @param no_selected_msg [String] Message to be shown when no service was selected
+#. If nil (or not specified) a default description will be used.
+#. @param initial         [SlpServiceClass::Service] initially selected service. If nil
+#. (or not specified) the first service will be used.
+#: src/lib/slp/dialogs/service_selection.rb:78
+#, fuzzy
+#| msgid "SMT Server Settings"
+msgid "Service selection"
+msgstr "Innstillinger for SMT-server"
+
+#: src/lib/slp/dialogs/service_selection.rb:79
+msgid "Select a detected service from the list."
+msgstr ""
+
+#: src/lib/slp/dialogs/service_selection.rb:80
+#, fuzzy
+#| msgid "Use custom registration server "
+msgid "No service was selected."
+msgstr "Bruk egendefinert registreringsserver"
+
+#~ msgid "Registration failed."
+#~ msgstr "Registreringen mislyktes."
+
+#, fuzzy
+#~| msgid "Local Registration Server"
+#~ msgid "&Local Registration Server..."
+#~ msgstr "Lokal registreringsserver"
+
 #
 #, fuzzy
 #~| msgid "Additional Repositories"

Modified: trunk/yast/nb/po/reipl.nb.po
===================================================================
--- trunk/yast/nb/po/reipl.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/reipl.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2009-08-13 16:41+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -27,11 +27,16 @@
 #. 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:64
+#: src/clients/reipl_bootloader_finish.rb:66
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "After shutdown, reload the system\n"
+#| "with an IPL from DASD '%1'.\n"
 msgid ""
 "\n"
 "After shutdown, reload the system\n"
-"with an IPL from DASD '%1'.\n"
+"with an IPL from device '%1'.\n"
 msgstr ""
 "\n"
 "Etter at maskinen er slått av, last systemet på nytt\n"
@@ -42,7 +47,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:83
+#: src/clients/reipl_bootloader_finish.rb:85
 msgid ""
 "\n"
 "After shutdown, reload the system\n"
@@ -56,7 +61,7 @@
 "med WWPN '%2'\n"
 "og LUN '%3'.\n"
 
-#: src/clients/reipl_bootloader_finish.rb:97
+#: src/clients/reipl_bootloader_finish.rb:99
 msgid ""
 "\n"
 "After shutdown, reload the system \n"

Modified: trunk/yast/nb/po/samba-client.nb.po
===================================================================
--- trunk/yast/nb/po/samba-client.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/samba-client.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: samba-client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2008-10-18 12:34+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: norsk bokmål\n"
@@ -878,59 +878,59 @@
 msgstr "Installerer nødvendige pakker..."
 
 #. summary header
-#: src/modules/Kerberos.rb:947
+#: src/modules/Kerberos.rb:953
 msgid "PAM Login"
 msgstr "PAM-innlogging"
 
 #. summary item
-#: src/modules/Kerberos.rb:953
+#: src/modules/Kerberos.rb:959
 msgid "Use Kerberos"
 msgstr "Bruk Kerberos"
 
 #. summary item
-#: src/modules/Kerberos.rb:955
+#: src/modules/Kerberos.rb:961
 msgid "Do Not Use Kerberos"
 msgstr "Ikke bruk Kerberos"
 
 #. summary header
-#: src/modules/Kerberos.rb:959
+#: src/modules/Kerberos.rb:965
 msgid "Default Realm"
 msgstr "Standardområde"
 
 #. summary header
-#: src/modules/Kerberos.rb:966
+#: src/modules/Kerberos.rb:972
 msgid "Default Domain"
 msgstr "Standard domene"
 
 #. summary header
-#: src/modules/Kerberos.rb:973
+#: src/modules/Kerberos.rb:979
 msgid "KDC Server Address"
 msgstr "KDC-serveradresse"
 
 #. summary header
-#: src/modules/Kerberos.rb:977
+#: src/modules/Kerberos.rb:983
 msgid "Clock Skew"
 msgstr "Tidsavvik"
 
 #. summary text, %1 is value
-#: src/modules/Kerberos.rb:993
+#: src/modules/Kerberos.rb:999
 msgid "<b>KDC Server</b>: %1<br>"
 msgstr "<b>KDC-server</b>: %1<br>"
 
 #. summary text, %1 is value
-#: src/modules/Kerberos.rb:998
+#: src/modules/Kerberos.rb:1004
 #, fuzzy
 #| msgid "<p><b>Workgroup or Domain</b>: %1</p>"
 msgid "<b>Default Domain</b>: %1<br>"
 msgstr "<p><b>Arbeidsgruppe eller domene</b>: %1</p>"
 
 #. summary text, %1 is value
-#: src/modules/Kerberos.rb:1004
+#: src/modules/Kerberos.rb:1010
 msgid "<b>Default Realm</b>: %1<br>"
 msgstr "<b>Standardområde</b>: %1<br>"
 
 #. summary text (yes/no follows)
-#: src/modules/Kerberos.rb:1010
+#: src/modules/Kerberos.rb:1016
 #, fuzzy
 #| msgid "Offline Authentication Enabled"
 msgid "<b>Kerberos Authentication Enabled</b>: %1"
@@ -938,23 +938,23 @@
 
 #. summary value
 #. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1013 src/modules/Samba.rb:1112
+#: src/modules/Kerberos.rb:1019 src/modules/Samba.rb:1112
 msgid "Yes"
 msgstr "Ja"
 
 #. summary value
 #. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1015 src/modules/Samba.rb:1114
+#: src/modules/Kerberos.rb:1021 src/modules/Samba.rb:1114
 msgid "No"
 msgstr "Nei"
 
 #. summary line
-#: src/modules/Kerberos.rb:1022
+#: src/modules/Kerberos.rb:1028
 msgid "Configuration Acquired via DNS"
 msgstr "Oppsett hentet via DNS"
 
 #. error popup (wrong format of entered value)
-#: src/modules/Kerberos.rb:1050
+#: src/modules/Kerberos.rb:1056
 msgid ""
 "Clock skew is invalid.\n"
 "Try again.\n"
@@ -963,7 +963,7 @@
 "Forsøk igjen.\n"
 
 #. error popup (wrong format of entered value)
-#: src/modules/Kerberos.rb:1053
+#: src/modules/Kerberos.rb:1059
 msgid ""
 "Lifetime is invalid.\n"
 "Try again."

Modified: trunk/yast/nb/po/samba-server.nb.po
===================================================================
--- trunk/yast/nb/po/samba-server.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/samba-server.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: samba-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2008-10-31 00:45+0100\n"
 "Last-Translator: Olav P. \n"
 "Language-Team: Norwegian Bokmål <>\n"
@@ -253,11 +253,17 @@
 
 #. TRANSLATORS: a popup message
 #: src/include/samba-server/complex.rb:88
+#, fuzzy
+#| msgid ""
+#| "Because users are currently connected to this Samba server,\n"
+#| "the server configuration has been reloaded instead of restarted.\n"
+#| "To confirm that all settings are applied despite possibly disconnecting the users,\n"
+#| "run '/etc/init.d/smb restart' and '/etc/init.d/nmb restart'"
 msgid ""
 "Because users are currently connected to this Samba server,\n"
 "the server configuration has been reloaded instead of restarted.\n"
 "To confirm that all settings are applied despite possibly disconnecting the users,\n"
-"run '/etc/init.d/smb restart' and '/etc/init.d/nmb restart'"
+"run 'systemctl restart smb' and 'systemctl restart nmb'"
 msgstr ""
 "Fordi brukere er koblet til denne Samba-serveren,\n"
 "er serverkonfigurasjonen lastet på nytt uten omstart av serveren.\n"

Modified: trunk/yast/nb/po/security.nb.po
===================================================================
--- trunk/yast/nb/po/security.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/security.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: security\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2009-08-13 16:46+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -127,204 +127,204 @@
 #. Authors:	Michal Svec 
 #.
 #. $Id$
-#: src/include/security/dialogs.rb:62
+#: src/include/security/dialogs.rb:64
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: src/include/security/dialogs.rb:65
+#: src/include/security/dialogs.rb:67
 msgid "Use magic SysRq keys"
 msgstr "Aktiver magiske SysRq-taster"
 
-#: src/include/security/dialogs.rb:66
+#: src/include/security/dialogs.rb:68
 msgid "Use secure file permissions"
 msgstr "Bruk sikre filrettigheter"
 
-#: src/include/security/dialogs.rb:69
+#: src/include/security/dialogs.rb:71
 msgid "Remote access to the display manager"
 msgstr "Ekstern tilgang til grafisk innlogging"
 
-#: src/include/security/dialogs.rb:72
+#: src/include/security/dialogs.rb:74
 msgid "Write back system time to the hardware clock"
 msgstr "Lagre systemtiden tilbake til maskinvareklokken"
 
-#: src/include/security/dialogs.rb:75
+#: src/include/security/dialogs.rb:77
 msgid "Always generate syslog message for cron scripts"
 msgstr "Generer alltid syslog-melding for cron-skript"
 
-#: src/include/security/dialogs.rb:78
+#: src/include/security/dialogs.rb:80
 msgid "Run the DHCP daemon in a chroot"
 msgstr "Kjør DHCP-nissen i chroot-varetekt"
 
-#: src/include/security/dialogs.rb:81
+#: src/include/security/dialogs.rb:83
 msgid "Run the DHCP daemon as dhcp user"
 msgstr "Kjør DHCP-nissen som dhcp-bruker"
 
-#: src/include/security/dialogs.rb:84
+#: src/include/security/dialogs.rb:86
 msgid "Remote root login in the display manager"
 msgstr "Ekstern grafisk innlogging for rotbruker"
 
-#: src/include/security/dialogs.rb:87
+#: src/include/security/dialogs.rb:89
 msgid "Remote access to the X server"
 msgstr "Ekstern tilgang til X-server"
 
-#: src/include/security/dialogs.rb:90
+#: src/include/security/dialogs.rb:92
 msgid "Remote access to the email delivery subsystem"
 msgstr "Ekstern tilgang til systemet for e-posttransport"
 
-#: src/include/security/dialogs.rb:93
+#: src/include/security/dialogs.rb:95
 msgid "Restart services on update"
 msgstr "Start tjenester på nytt etter oppdatering"
 
-#: src/include/security/dialogs.rb:96
+#: src/include/security/dialogs.rb:98
 msgid "Stop services on removal"
 msgstr "Deaktiver tjenester når programvare fjernes"
 
-#: src/include/security/dialogs.rb:99
+#: src/include/security/dialogs.rb:101
 msgid "Enable TCP syncookies"
 msgstr "Aktiver TCP-syncookies"
 
-#: src/include/security/dialogs.rb:102
+#: src/include/security/dialogs.rb:104
 msgid "IPv4 forwarding"
 msgstr "IPv4-overføring"
 
-#: src/include/security/dialogs.rb:103
+#: src/include/security/dialogs.rb:105
 msgid "IPv6 forwarding"
 msgstr "IPv6-overføring"
 
-#: src/include/security/dialogs.rb:104
+#: src/include/security/dialogs.rb:106
 #, fuzzy
 #| msgid "Enable the service"
 msgid "Enable basic system services"
 msgstr "Aktiver tjenesten"
 
-#: src/include/security/dialogs.rb:107
+#: src/include/security/dialogs.rb:109
 #, fuzzy
 #| msgid "Disable the service"
 msgid "Disable extra services"
 msgstr "Deaktiver tjenesten"
 
 #. handle the special cases at first
-#: src/include/security/dialogs.rb:150
+#: src/include/security/dialogs.rb:152
 msgid "Configure"
 msgstr "Konfigurer"
 
-#: src/include/security/dialogs.rb:152
+#: src/include/security/dialogs.rb:154
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: src/include/security/dialogs.rb:154
+#: src/include/security/dialogs.rb:156
 msgid "Disabled"
 msgstr "Deaktivert"
 
 #. table header
 #. table header
-#: src/include/security/dialogs.rb:180 src/include/security/dialogs.rb:409
+#: src/include/security/dialogs.rb:182 src/include/security/dialogs.rb:411
 msgid "Security Setting"
 msgstr "Sikkerhetsinnstilling"
 
-#: src/include/security/dialogs.rb:181 src/include/security/dialogs.rb:410
+#: src/include/security/dialogs.rb:183 src/include/security/dialogs.rb:412
 msgid "Status"
 msgstr "Status"
 
-#: src/include/security/dialogs.rb:182 src/include/security/dialogs.rb:411
+#: src/include/security/dialogs.rb:184 src/include/security/dialogs.rb:413
 msgid "Security Status"
 msgstr "Sikkerhetsstatus"
 
 #. add one line for each security setting
-#: src/include/security/dialogs.rb:318
+#: src/include/security/dialogs.rb:320
 msgid "Help"
 msgstr "Hjelp"
 
 #. this is a separator between service names
 #. e.g.: "postfix" + " or " + "sendmail"
-#: src/include/security/dialogs.rb:361
+#: src/include/security/dialogs.rb:363
 msgid " or "
 msgstr " eller "
 
 #. richtext message: %1 = runlevel ("3" or "5"), %2 = list of services
-#: src/include/security/dialogs.rb:368
+#: src/include/security/dialogs.rb:370
 #, fuzzy
 #| msgid "<P>These basic system services are not running:<BR><B>%1</B></P>"
 msgid "<P>These basic system services are not enabled:<BR><B>%s</B></P>"
 msgstr "<P>Følgende grunnleggende systemtjeneser kjører ikke:<BR><B>%1</B></P>"
 
-#: src/include/security/dialogs.rb:370
+#: src/include/security/dialogs.rb:372
 msgid "<P>All basic services are enabled.</P>"
 msgstr "<P>Alle grunnleggende systemtjenester er aktivert.</P>"
 
-#: src/include/security/dialogs.rb:378
+#: src/include/security/dialogs.rb:380
 #, fuzzy
 #| msgid "<P>These extra services are running:<BR><B>%1</B></P>"
 msgid "<P>These extra services are enabled:<BR><B>%s</B></P>"
 msgstr "<P>Følgende ekstratjenester kjører:<BR><B>%1</B></P>"
 
-#: src/include/security/dialogs.rb:379
+#: src/include/security/dialogs.rb:381
 msgid "<P>Check the list of services and disable all unused services.</P>"
 msgstr "<P>Kontroller listen over tjenester, og deaktiver alle ubrukte tjenester.</P>"
 
-#: src/include/security/dialogs.rb:381
+#: src/include/security/dialogs.rb:383
 msgid "<P>Only basic system services are enabled.</P>"
 msgstr "<P>Bare grunnleggende systemtjenester er aktivert.</P>"
 
-#: src/include/security/dialogs.rb:387
+#: src/include/security/dialogs.rb:389
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Overview dialog caption
 #. params: input tree, parent, label, id
-#: src/include/security/dialogs.rb:399 src/include/security/wizards.rb:49
+#: src/include/security/dialogs.rb:401 src/include/security/wizards.rb:49
 msgid "Security Overview"
 msgstr "Sikkerhetsoversikt"
 
 #. push button label
-#: src/include/security/dialogs.rb:424
+#: src/include/security/dialogs.rb:426
 msgid "Change &Status"
 msgstr "Endre &status"
 
 #. push button label
-#: src/include/security/dialogs.rb:427
+#: src/include/security/dialogs.rb:429
 msgid "&Description"
 msgstr "&Beskrivelse"
 
 #. update the current value
-#: src/include/security/dialogs.rb:521
+#: src/include/security/dialogs.rb:523
 #, fuzzy
 #| msgid "Analyzing the system..."
 msgid "Analyzing system"
 msgstr "Analyserer systemet..."
 
 #. Boot dialog caption
-#: src/include/security/dialogs.rb:575 src/include/security/wizards.rb:57
+#: src/include/security/dialogs.rb:589 src/include/security/wizards.rb:57
 msgid "Boot Settings"
 msgstr "Oppstartsinnstillinger"
 
 #. Frame label
-#: src/include/security/dialogs.rb:587
+#: src/include/security/dialogs.rb:601
 msgid "Boot Permissions"
 msgstr "Oppstartsrettigheter"
 
 #. Misc dialog caption
-#: src/include/security/dialogs.rb:664 src/include/security/wizards.rb:60
+#: src/include/security/dialogs.rb:670 src/include/security/wizards.rb:60
 msgid "Miscellaneous Settings"
 msgstr "Diverse innstillinger"
 
 #. Password dialog caption
-#: src/include/security/dialogs.rb:744 src/include/security/wizards.rb:56
+#: src/include/security/dialogs.rb:750 src/include/security/wizards.rb:56
 msgid "Password Settings"
 msgstr "Passordinnstilliinger"
 
 #. Frame label
-#: src/include/security/dialogs.rb:753
+#: src/include/security/dialogs.rb:759
 msgid "Checks"
 msgstr "Kontroller"
 
 #. Frame label
-#: src/include/security/dialogs.rb:768
+#: src/include/security/dialogs.rb:774
 msgid "Password Age"
 msgstr "Passordvarighet"
 
 #. Popup text
-#: src/include/security/dialogs.rb:846
+#: src/include/security/dialogs.rb:852
 msgid ""
 "The minimum number of days cannot be larger\n"
 "than the maximum."
@@ -333,7 +333,7 @@
 "verdi enn største antall."
 
 #. Popup text, %1 is number
-#: src/include/security/dialogs.rb:863
+#: src/include/security/dialogs.rb:869
 msgid ""
 "The minimum password length cannot be larger than the maximum.\n"
 "The maximum password length for the selected encryption method is %1."
@@ -342,17 +342,17 @@
 "Maksimal passordlengde for den valgte krypteringsmetoden er %1."
 
 #. Login dialog caption
-#: src/include/security/dialogs.rb:895 src/include/security/wizards.rb:58
+#: src/include/security/dialogs.rb:901 src/include/security/wizards.rb:58
 msgid "Login Settings"
 msgstr "Innloggingsinnstillinger"
 
 #. Frame label
-#: src/include/security/dialogs.rb:904
+#: src/include/security/dialogs.rb:910
 msgid "Login"
 msgstr "Innlogging"
 
 #. Read dialog help 1/2
-#: src/include/security/helps.rb:39
+#: src/include/security/helps.rb:41
 msgid ""
 "<p><b><big>Initializing Security Configuration</big></b>\n"
 "<br>Please wait...<br></p>"
@@ -361,7 +361,7 @@
 "<br>Vent...<br></p>"
 
 #. Read dialog help 2/2
-#: src/include/security/helps.rb:43
+#: src/include/security/helps.rb:45
 msgid ""
 "<p><b><big>Aborting the Initialization</big></b><br>\n"
 "Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
@@ -370,7 +370,7 @@
 "Du kan trygt avslutte konfigurasjonsverktøyet ved å klikke <B>Avbryt</b> nå.</p>"
 
 #. Write dialog help 1/2
-#: src/include/security/helps.rb:47
+#: src/include/security/helps.rb:49
 msgid ""
 "<p><b><big>Saving Security Configuration</big></b>\n"
 "<br>Please wait...<br></p>"
@@ -379,7 +379,7 @@
 "<br>Vent...<br></p>"
 
 #. Write dialog help 2/2
-#: src/include/security/helps.rb:51
+#: src/include/security/helps.rb:53
 msgid ""
 "<p><b><big>Aborting Saving</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.</p>"
@@ -387,55 +387,9 @@
 "<p><b><big>Avbryte lagring</big></b><br>\n"
 "Avbryt lagringen ved å klikke <b>Avbryt</b>.</p>"
 
-#. Boot dialog help 1/4
-#: src/include/security/helps.rb:55
-msgid ""
-"<p><b><big>Boot Security</big></b></p>\n"
-"<p>In this dialog, change various boot settings related to security.</p>"
-msgstr ""
-"<p><b><big>Sikkerhet ved oppstart</big></b></p>\n"
-"<p>Bruk denne dialogen for å endre ulike innstillinger for sikkerhet ved oppstart.</p>"
-
-#. Boot dialog help 2/4
+#. Main dialog help 1/8
 #: src/include/security/helps.rb:59
 msgid ""
-"<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
-"Configure what the system should do in response to\n"
-"someone at the console pressing the CTRL + ALT + DEL key\n"
-"combination. Usually the system reboots. Sometimes it is desirable\n"
-"to ignore this event, for example, when the system serves as both\n"
-"workstation and server.</p>"
-msgstr ""
-"<p><b>Tolking av Ctrl + Alt + Del</b>:\n"
-"Velg hvordan systemet skal reagere når noen trykker\n"
-"CTRL + ALT + DEL i konsollmodus. Normalt blir systemet\n"
-"startet på nytt, men noen ganger kan det være gunstig\n"
-"å ignorere kommandoen, for eksempel hvis systemet både fungerer som\n"
-"arbeidsstasjon og server.</p>"
-
-#. Boot dialog help 3/4
-#: src/include/security/helps.rb:68
-msgid ""
-"<p><b>Shutdown Behaviour of Login Manager</b>:\n"
-"Set who is allowed to shut down the machine from KDM.</p>\n"
-msgstr ""
-"<p><b>Slå av maskinen fra innloggingsskjermen</b>\n"
-"Angi hvem som kan slå av maskinen fra KDM.</p>\n"
-
-#. Boot dialog help 4/4
-#: src/include/security/helps.rb:72
-msgid ""
-"<p><b>Hibernate System</b>:\n"
-"Set the conditions for allowing users to hibernate the system. By default, user on active console has such right.\n"
-"Other options are allowing the action to any user or requiring authentication in all cases.</p>\n"
-msgstr ""
-"<p><b>Systemdvale</b>:\n"
-"Angi betingelsene for at brukere skal kunne bruke dvalefunksjonen. Som standard har brukeren på den aktive konsollen slike rettigheter.\n"
-"Andre valg er å la alle brukere gjøre dette, eller alltid kreve autentisering.</p>\n"
-
-#. Main dialog help 1/8
-#: src/include/security/helps.rb:78
-msgid ""
 "<P><BIG><B>Configuring Local Security</B></BIG></P>\n"
 "<p>Using predefined defaults, change the local security settings, which include\n"
 "    booting, login, password, user creation, and file permissions. The default\n"
@@ -449,7 +403,7 @@
 "</p>"
 
 #. Main dialog help 5/8
-#: src/include/security/helps.rb:86
+#: src/include/security/helps.rb:67
 #, fuzzy
 #| msgid ""
 #| "<p><b>Networked Workstation</b>: For a computer connected\n"
@@ -462,14 +416,14 @@
 "til et lokalt nettverk eller til Internett.</p>"
 
 #. Main dialog help 6/8
-#: src/include/security/helps.rb:90
+#: src/include/security/helps.rb:71
 msgid ""
 "<p><b>Roaming Device</b>: For a laptop, tablet or similar device\n"
 "that connects to different networks.</p>"
 msgstr ""
 
 #. Main dialog help 7/8
-#: src/include/security/helps.rb:94
+#: src/include/security/helps.rb:75
 msgid ""
 "<p><b>Network Server</b>: For a computer that provides\n"
 "any type of service.</p>"
@@ -478,12 +432,12 @@
 "server for en eller annen tjeneste.</p>"
 
 #. Main dialog help 8/8
-#: src/include/security/helps.rb:98
+#: src/include/security/helps.rb:79
 msgid "<p><b>Custom Settings</b>: Create your own configuration.</p>"
 msgstr "<p><b>Egendefinerte innstillinger</b>: Lag ditt eget oppsett.</p>"
 
 #. Login dialog help 1/4
-#: src/include/security/helps.rb:100
+#: src/include/security/helps.rb:81
 msgid ""
 "<p><big><b>Login Security</b></big></p>\n"
 "<p>These login settings\n"
@@ -494,7 +448,7 @@
 "er hovedsaklig lagret i filen /etc/login.defs.</p>"
 
 #. Login dialog help 2/4
-#: src/include/security/helps.rb:106
+#: src/include/security/helps.rb:87
 msgid ""
 "<p><b>Delay after Incorrect Login Attempt:</b>\n"
 "It is advisable to wait some time after an incorrect login attempt to prevent\n"
@@ -507,7 +461,7 @@
 "for lenge hvis de skriver inn feil passord. Tre sekunder er en fornuftig verdi (<tt>3</tt>).</p>"
 
 #. Login dialog help 3/4
-#: src/include/security/helps.rb:113
+#: src/include/security/helps.rb:94
 msgid ""
 "<p><b>Record Successful Login Attempts:</b> Logging successful login\n"
 "attempts is useful. It can warn you of unauthorized access to the\n"
@@ -520,7 +474,7 @@
 "</p>\n"
 
 #. Login dialog help 4/4
-#: src/include/security/helps.rb:120
+#: src/include/security/helps.rb:101
 msgid ""
 "<p><b>Allow Remote Graphical Login:</b> Checking this allows access\n"
 "to a graphical login screen for this machine over the network. Remote access\n"
@@ -531,7 +485,7 @@
 "til maskinen via en innloggingsbehandler kan være en sikkerhetsrisiko.</p>"
 
 #. Password dialog help 1/8
-#: src/include/security/helps.rb:126
+#: src/include/security/helps.rb:107
 msgid ""
 "<p>These password settings\n"
 "are mainly stored in the /etc/login.defs file.</p>"
@@ -540,7 +494,7 @@
 "er hovedsaklig lagret i filen /etc/login.defs.</p>"
 
 #. Password dialog help 2/8
-#: src/include/security/helps.rb:130
+#: src/include/security/helps.rb:111
 msgid ""
 "<p><b>Check New Passwords</b>: It is wise to choose a password that\n"
 "cannot be found in a dictionary and is not a name or other simple, common word.\n"
@@ -551,7 +505,7 @@
 "Hvis du krysser av i boksen, blir nye passord kontrollert mot disse reglene.</p>"
 
 #. Password dialog help
-#: src/include/security/helps.rb:136
+#: src/include/security/helps.rb:117
 msgid ""
 "<p><b>Minimum Acceptable Password Length:</b>\n"
 "The minimum acceptable size for the new password reduced by the number\n"
@@ -566,7 +520,7 @@
 "Dette valget kan bare endres hvis <b>Kontroller nytt passord</b> er valgt.</p>"
 
 #. Password dialog help 4/8
-#: src/include/security/helps.rb:144
+#: src/include/security/helps.rb:125
 msgid ""
 "<p><b>Passwords to Remember</b>:\n"
 "Enter the number of user passwords to store and prevent the user from reusing.\n"
@@ -577,12 +531,12 @@
 "Angi 0 dersom ingen passord skal lagres.</p>"
 
 #. Password dialog help 5a/8
-#: src/include/security/helps.rb:150
+#: src/include/security/helps.rb:131
 msgid "<p><b>Password Encryption Method:</b></p>"
 msgstr "<p><b>Krypteringsmetode for passord:</b></p>"
 
 #. Password dialog help 5b/8
-#: src/include/security/helps.rb:152
+#: src/include/security/helps.rb:133
 msgid ""
 "<p><b>DES</b>, the Linux default method, works in all network environments,\n"
 "but it restricts you to passwords no longer than eight characters. If you need\n"
@@ -593,7 +547,7 @@
 "avhengig av kompatibilitet med andre systemer.</p>"
 
 #. Password dialog help 5c/8
-#: src/include/security/helps.rb:158
+#: src/include/security/helps.rb:139
 msgid ""
 "<p><b>MD5</b> allows longer passwords and is supported by all current Linux \n"
 "distributions, but not by other systems or old software.</p>"
@@ -602,12 +556,12 @@
 "distribusjoner, men ikke av andre systemer eller eldre programvare.</p>"
 
 #. Password dialog help 5d/8
-#: src/include/security/helps.rb:162
+#: src/include/security/helps.rb:143
 msgid "<p><b>SHA-512</b> is the current standard hash method, using other algorithms is not recommended unless needed for compatibility purpose.</p>"
 msgstr "<p><b>SHA-512</b> er standard hash-metode. Det anbefales ikke å bruke andre algoritmer dersom det ikke er nødvendig av kompatibilitetshensyn.</p>"
 
 #. Password dialog help 7/8
-#: src/include/security/helps.rb:166
+#: src/include/security/helps.rb:147
 msgid ""
 "<p><b>Password Age:</b> Set the minimum and\n"
 "maximum number of days a password may be used.</p>"
@@ -616,7 +570,7 @@
 "største antall dager som et passord kan benyttes.</p>"
 
 #. Password dialog help 8/8
-#: src/include/security/helps.rb:170
+#: src/include/security/helps.rb:151
 msgid ""
 "<p><b>Days before Password Expires Warning</b>: This entry sets the\n"
 "number of days users are warned before their passwords expire. The longer the\n"
@@ -627,7 +581,7 @@
 "gjør det mindre sannsynlig at noen kan gjette et passord.</p>"
 
 #. Adduser dialog help 1/2
-#: src/include/security/helps.rb:176
+#: src/include/security/helps.rb:157
 msgid ""
 "<p><big><b>User Security</b></big></P>\n"
 "<p>In this dialog, change various settings used to create users.</p>"
@@ -636,7 +590,7 @@
 "<p>I denne dialogen kan du endre ulike innstillinger i forbindelse med oppretting av brukere.</p>"
 
 #. Adduser dialog help 2/3
-#: src/include/security/helps.rb:180
+#: src/include/security/helps.rb:161
 msgid ""
 "<p><b>User ID Limitations:</b>\n"
 "Set the minimum and maximum possible user ID.</p>"
@@ -645,7 +599,7 @@
 "Definer minste og største antall mulige brukernavn.</p>"
 
 #. Adduser dialog help 3/3
-#: src/include/security/helps.rb:184
+#: src/include/security/helps.rb:165
 msgid ""
 "<p><b>Group ID Limitations</b>:\n"
 "Set the minimum and maximum possible group ID.</p>"
@@ -654,7 +608,7 @@
 "Definer minste og største antall mulige gruppenavn.</p>"
 
 #. Misc dialog help 1/14
-#: src/include/security/helps.rb:188
+#: src/include/security/helps.rb:169
 msgid ""
 "<p><big><b>Other Security Settings</b></big></P>\n"
 "<p>In this dialog, change miscellaneous settings related to local security.</p>"
@@ -663,7 +617,7 @@
 "<p>I denne dialogen kan du endre diverse innstillinger i forbindelse med lokal sikkerhet.</p>"
 
 #. Misc dialog help 2/14
-#: src/include/security/helps.rb:192
+#: src/include/security/helps.rb:173
 msgid ""
 "<p><b>File Permissions</b>: Settings for the permissions\n"
 "of certain system files are set according to the data in /etc/permissions.secure\n"
@@ -694,7 +648,7 @@
 "definere hvilke brukere som kan kjøre X- og setuid-programmer.</p>\n"
 
 #. Misc dialog help 6/14
-#: src/include/security/helps.rb:208
+#: src/include/security/helps.rb:189
 msgid ""
 "<p><b>User Launching updatedb</b>: The program updatedb runs \n"
 "once a day. It scans your entire file system and creates a database (locatedb)\n"
@@ -709,7 +663,7 @@
 "    (noen filer) eller <b>root</b> (alle filer).</p>"
 
 #. Misc dialog help 10/14
-#: src/include/security/helps.rb:216
+#: src/include/security/helps.rb:197
 msgid ""
 "<p><b>Current Directory in root's Path</b> On a DOS system,\n"
 "the system first searches for executable files (programs) in the current\n"
@@ -722,7 +676,7 @@
 "derimot utelukkende søkestien (variabelen PATH).</p>"
 
 #. Misc dialog help 11/14
-#: src/include/security/helps.rb:223
+#: src/include/security/helps.rb:204
 msgid ""
 "<p><b>Current Directory in the Path of Regular Users</b><br> A DOS\n"
 "system first searches for executable files (programs) in the current directory\n"
@@ -735,7 +689,7 @@
 "derimot utelukkende søkestien (variabelen PATH).</p>"
 
 #. Misc dialog help 12/14
-#: src/include/security/helps.rb:230
+#: src/include/security/helps.rb:211
 msgid ""
 "<p>Some systems set up a work-around by adding the dot (\".\") to the\n"
 "search path, enabling files in the current path to be found and executed.\n"
@@ -752,7 +706,7 @@
 "i systemet.</p>"
 
 #. Misc dialog help 13/14
-#: src/include/security/helps.rb:239
+#: src/include/security/helps.rb:220
 msgid ""
 "<p>\"yes\": the dot (\".\") is attached to the end of the search\n"
 "path of root, making it the last to be searched.</p>"
@@ -762,7 +716,7 @@
 "slik at denne blir gjennomsøkt sist.</p>"
 
 #. Misc dialog help 14/14
-#: src/include/security/helps.rb:243
+#: src/include/security/helps.rb:224
 msgid ""
 "<p>\"no\": the user root always must launch programs in the\n"
 "current directory prefixed with a \"./\". Example: \"./configure\".</p>"
@@ -771,7 +725,7 @@
 "gjeldende katalog ved å bruke prefikset \"./\". Eksempel: \"./configure\".</p>"
 
 #. Misc dialog help 14/14
-#: src/include/security/helps.rb:247
+#: src/include/security/helps.rb:228
 msgid ""
 "<p><b>Enable Magic SysRq Keys</b><br> If you check this option, you\n"
 "will have some control over the system even if it crashes (for example, during kernel\n"
@@ -782,26 +736,26 @@
 "oppsett av kjernen). Du finner mer informasjon i /usr/src/linux/Documentation/sysrq.txt</p>."
 
 #. help text: security overview dialog 1/
-#: src/include/security/helps.rb:253
+#: src/include/security/helps.rb:234
 msgid "<P><B>Security Overview</B><BR>This overview shows the most important security settings.</P>"
 msgstr "<P><B>Sikkerhetsoversikt</B><BR>Dette er en oversikt over de viktigste sikkerhetsinnstillingene.</P>"
 
 #. help text: security overview dialog 1/
-#: src/include/security/helps.rb:257
+#: src/include/security/helps.rb:238
 msgid "<P>To change the current value, click the link associated to the option.</P>"
 msgstr "<P>Klikk på lenkene for å endre gjeldende verdi for et valg.</P>"
 
 #. help text: security overview dialog 1/
-#: src/include/security/helps.rb:261
+#: src/include/security/helps.rb:242
 msgid "<P> A check mark in the <B>Security Status</B> column means that the current value of the option is secure.</P>"
 msgstr "<P>En hake i kolonnen <B>Sikkerhetsstatus</B> betyr at gjeldende verdi for valget er sikker.</P>"
 
 #. an error message (rich text)
-#: src/include/security/helps.rb:265
+#: src/include/security/helps.rb:246
 msgid "<P><B>The current value could not be read. The service is probably not installed or the option is missing on the system.</B></P>"
 msgstr "<P><B>Gjeldende verdi kunne ikke leses. Tjenesten er sannsynligvis ikke installert, eller valget mangler i systemet.</B></P>"
 
-#: src/include/security/helps.rb:271
+#: src/include/security/helps.rb:252
 msgid ""
 "<P>A display manager provides a graphical login screen and can be accessed\n"
 "across the network by an X server running on another system if so\n"
@@ -819,7 +773,7 @@
 "som benyttes.</P><P>Hvis du ikke trenger <EM>XDMCP</EM> for\n"
 "kstern grafisk innlogging, bør du deaktivere dette valget.</P>"
 
-#: src/include/security/helps.rb:281
+#: src/include/security/helps.rb:262
 msgid ""
 "<P>Upon startup, the system time is being set from the hardware clock of the\n"
 "computer. As a consequence, setting the hardware clock before shutting down is\n"
@@ -831,23 +785,23 @@
 "slås av.</P><P>Konsistent systemtid er avgjørende for at systemet skal opprette\n"
 "riktige loggmeldinger.</P>"
 
-#: src/include/security/helps.rb:287
+#: src/include/security/helps.rb:268
 msgid "<P>Malfunctions in a system are usually detected by anomalies in its behaviour. Syslog messages about events that reoccur on a regular basis are important to find causes of problems. And the absence of a single record can tell more than the absence of all log records.</P><P>Therefore, syslog messages of system events are only useful if they are present.</P>"
 msgstr "<P>Funksjonsfeil kan vanligvis påvises av spesielle hendelser. Syslog-meldinger om hendelser som inntreffer regelmessig, er viktige for å finner årsakene til problemer, og en manglende oppføring kan fortelle mer enn om hele systemloggen mangler.</P><P>Man kan derfor si at syslog-meldinger om systemhendelser bare er nyttige dersom de finnes.</P>"
 
-#: src/include/security/helps.rb:290
+#: src/include/security/helps.rb:271
 msgid "<P>Chroot execution environments restrict a process to only access files that it needs by placing them in a separate subdirectory and running the process with a changed root (chroot) set to that directory.</P>"
 msgstr "<P>Chroot-miljøer brukes for å begrense en prosess bare til nødvendige filer og plassere disse i en separat underkatalog. Deretter kjøres prosessen av en endret rotbruker (chroot=changedroot) med adgang til den katalogen.</P>"
 
-#: src/include/security/helps.rb:293
+#: src/include/security/helps.rb:274
 msgid "<P>The DHCP client daemon should run as the user <EM>dhcpd</EM> to minimize a possible threat if the service is found vulnerable to a weakness in its program code.</P><P>Note that dhcpd must never run as <EM>root</EM> or with the <EM>CAP_SYS_CHROOT</EM> capability for the chroot execution confinement to be effective.</P>"
 msgstr "<P>DHCP-klientnissen bør kjøres som brukeren <EM>dhcpd</EM> for å minimere trusselen ved en eventuell svakhet i programkoden.</P><P>Husk at dhcpd ikke må kjøres som <EM>rot</EM> eller med mulighet for <EM>CAP_SYS_CHROOT</EM> dersom chroot-varetekten skal være effektiv.</P>"
 
-#: src/include/security/helps.rb:296
+#: src/include/security/helps.rb:277
 msgid "<P>Administrators should never log on as <EM>root</EM> into an X Window session to minimize the usage of the root privileges.</P><P>This option does not help against careless administrators, but shall prevent attackers to be able to log on as <EM>root</EM> via the display manager if they guess or otherwise acquire the password.</P>"
 msgstr "<P>For å minimere bruken av rotprivilegier bør ikke administratorer logge på en X-vindusøkt som <EM>rot</EM>.</P><P>Dette valget hjelper ikke mot uforsiktige administratorer, men vil hindre angripere i å logge inn som <EM>rot</EM> via den grafiske innloggingsskjermen dersom de gjetter passordet eller får fatt i det på annen måte.</P>"
 
-#: src/include/security/helps.rb:299
+#: src/include/security/helps.rb:280
 msgid ""
 "<P>X Window clients, e.g. programs that open a window on your display, connect\n"
 "to the X server that runs on the physical machine. Programs can also run on a\n"
@@ -867,7 +821,7 @@
 "slik at X-vindusklienter kan koble til X-serveren\n"
 "via en kryptert ssh-forbindelse.</P>"
 
-#: src/include/security/helps.rb:309
+#: src/include/security/helps.rb:290
 msgid ""
 "<P>The email delivery subsystem is always started. However, it does not expose\n"
 "itself outside the system by default, since it does not listen on the SMTP network port 25.</P><P>If you do not deliver emails to your system through the SMTP protocol, then disable this option.</P>"
@@ -875,7 +829,7 @@
 "<P>Systemet for e-postlevering kjører alltid. Som standard er det imidlertid ikke eksponert\n"
 "utenfor systemet, fordi det ikke lytter på SMTP-nettverksport 25.</P><P>Hvis du ikke leverer e-post til systemet via SMTP-protokollen, bør du deaktivere dette valget.</P>"
 
-#: src/include/security/helps.rb:312
+#: src/include/security/helps.rb:293
 msgid ""
 "<P>If a package containing a service that is currently running is being\n"
 "updated, the service is restarted after the files in the package have been\n"
@@ -891,7 +845,7 @@
 "Denne innstillingen bør bare endres hvis det finnes spesielle\n"
 "grunner til dette.</P>"
 
-#: src/include/security/helps.rb:322
+#: src/include/security/helps.rb:303
 msgid ""
 "<P>If a package containing a service that is currently running is being\n"
 "uninstalled, the service is stopped before the files of the package are\n"
@@ -909,38 +863,139 @@
 "bare endres hvis det finnes spesielle grunner\n"
 "til dette.</P>"
 
-#: src/include/security/helps.rb:332
+#: src/include/security/helps.rb:313
 msgid "<P>A system can be overwhelmed with numerous connection attempts so that the system runs out of memory, leading to a Denial of Service (DoS) vulnerability.</P><P>The use of syncookies is a method that can help in such situations. But in configurations with a very large number of legitimate connection attempts from one source, the <EM>Enabled</EM> setting can cause problems with denied TCP connections under high load.</P><P>Still, for most environments, syncookies are the first line of defense against SYN flood DoS attacks, so the secure setting is <EM>Enabled</EM>.</P>"
 msgstr "<P>Et system kan bli overkjørt av så mange tilkoblingsforsøk, at det ikke er mer tilgjengelig minne, noe som fører til en DoS-sårbarhet (Denial of Service).</P><P>Bruk av syncookies er en metode som kan hjelpe i sånne situasjoner, men i oppsett med et svært stort antall legitime tilkoblingsforsøk fra samme kilde, kan en <EM>Aktivert</EM>-innstilling føre til problemer med at TCP-tilkoblinger avvises ved høy belastning.</P><P>I de fleste miljøer er likevel syncookies første forsvarslinje mot DoS-angrep, så den sikre innstillingen er <EM>Aktivert</EM>.</P>"
 
-#: src/include/security/helps.rb:335 src/include/security/helps.rb:339
+#: src/include/security/helps.rb:316 src/include/security/helps.rb:320
 msgid "<P>IP forwarding means to pass on network packets that have been received, but that are not destined for one of the system's configured network interfaces, e.g. network interface addresses.</P><P>If a system forwards network traffic on ISO/OSI layer 3, it is called a router. If you do not need that routing functionality, then disable this option.</P>"
 msgstr "<P>IP-overføring betyr videresending av nettverkspakker som mottas, men som ikke er beregnet for noen av systemets egne nettverksgrensesnitt, d.v.s. nettverkskortenes adresser.</P><P>Hvis et system videresender nettverkstrafikk via ISO/OSI 3, kalles det en ruter. Hvis du ikke trenger rutingfunksjonen, bør du deaktivere dette valget.</P>"
 
-#: src/include/security/helps.rb:338
+#: src/include/security/helps.rb:319
 msgid "<P>This setting applies to <EM>IPv4</EM> only.</P>"
 msgstr "<P>Denne innstillingen gjelder bare for <EM>IPv4</EM>.</P>"
 
-#: src/include/security/helps.rb:342
+#: src/include/security/helps.rb:323
 msgid "<P>This setting applies to <EM>IPv6</EM> only.</P>"
 msgstr "<P>Denne innstillingen gjelder bare for <EM>IPv6</EM>.</P>"
 
-#: src/include/security/helps.rb:343
+#: src/include/security/helps.rb:324
 msgid "<P>Magic SysRq Keys enable some control over the system even if it crashes (e.g. during kernel debugging) or if the system does not respond.</P>"
 msgstr "<P>Med magiske SysRq-taster har du en viss grad av kontroll over systemet selv om det havarerer (f.eks. under feilsøking av kjernen) eller hvis systemet ikke svarer.</P>"
 
-#: src/include/security/helps.rb:346
+#: src/include/security/helps.rb:327
 msgid "<P>There are predefined file permissions in /etc/permissions.* files. The most restrictive file permissions are defined 'secure' or 'paranoid' file.</P>"
 msgstr "<P>Det er forhåndsdefinerte filrettigheter i /etc/permissions.*-filene. De mest restriktive filrettighetene er definert som 'secure' eller 'paranoid'.</P>"
 
-#: src/include/security/helps.rb:349
+#: src/include/security/helps.rb:330
 msgid "<P>Basic system services must be enabled to provide system consistency and to run the security-related services.</P>"
 msgstr "<P>Grunnleggende systemtjenester må aktiveres for at systemet skal være konsistent og kunne kjøre sikkerhetsrelaterte tjenester.</P>"
 
-#: src/include/security/helps.rb:352
+#: src/include/security/helps.rb:333
 msgid "<P>Every running service is a potential target of a security attack. Therefore it is recommended to turn off all services which are not used by the system.</P>"
 msgstr "<P>Alle aktiverte tjenester er en potensiell sikkerhetsrisiko. Det anbefales derfor å deaktivere alle tjenester som ikke brukes av systemet.</P>"
 
+#: src/include/security/helps.rb:341
+msgid ""
+"<p><b><big>Boot Security</big></b></p>\n"
+"<p>In this dialog, change various boot settings related to security.</p>"
+msgstr ""
+"<p><b><big>Sikkerhet ved oppstart</big></b></p>\n"
+"<p>Bruk denne dialogen for å endre ulike innstillinger for sikkerhet ved oppstart.</p>"
+
+#. TRANSLATORS: part of help text - default action (the default is
+#. reboot)
+#: src/include/security/helps.rb:348
+#, fuzzy
+#| msgid ""
+#| "<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
+#| "Configure what the system should do in response to\n"
+#| "someone at the console pressing the CTRL + ALT + DEL key\n"
+#| "combination. Usually the system reboots. Sometimes it is desirable\n"
+#| "to ignore this event, for example, when the system serves as both\n"
+#| "workstation and server.</p>"
+msgid ""
+"Usually the system reboots. Sometimes it is desirable\n"
+"to ignore this event, for example, when the system serves as both\n"
+"workstation and server."
+msgstr ""
+"<p><b>Tolking av Ctrl + Alt + Del</b>:\n"
+"Velg hvordan systemet skal reagere når noen trykker\n"
+"CTRL + ALT + DEL i konsollmodus. Normalt blir systemet\n"
+"startet på nytt, men noen ganger kan det være gunstig\n"
+"å ignorere kommandoen, for eksempel hvis systemet både fungerer som\n"
+"arbeidsstasjon og server.</p>"
+
+#. TRANSLATORS: part of help text - default action (the default is halt)
+#: src/include/security/helps.rb:355
+#, fuzzy
+#| msgid ""
+#| "<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
+#| "Configure what the system should do in response to\n"
+#| "someone at the console pressing the CTRL + ALT + DEL key\n"
+#| "combination. Usually the system reboots. Sometimes it is desirable\n"
+#| "to ignore this event, for example, when the system serves as both\n"
+#| "workstation and server.</p>"
+msgid ""
+"By default the system halts but sometimes it is desirable\n"
+"to ignore this event, for example, when the system serves as both\n"
+"workstation and server."
+msgstr ""
+"<p><b>Tolking av Ctrl + Alt + Del</b>:\n"
+"Velg hvordan systemet skal reagere når noen trykker\n"
+"CTRL + ALT + DEL i konsollmodus. Normalt blir systemet\n"
+"startet på nytt, men noen ganger kan det være gunstig\n"
+"å ignorere kommandoen, for eksempel hvis systemet både fungerer som\n"
+"arbeidsstasjon og server.</p>"
+
+#. Boot dialog help 2/4
+#. TRANSLATORS: %s is help text - default action
+#: src/include/security/helps.rb:364
+#, fuzzy
+#| msgid ""
+#| "<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
+#| "Configure what the system should do in response to\n"
+#| "someone at the console pressing the CTRL + ALT + DEL key\n"
+#| "combination. Usually the system reboots. Sometimes it is desirable\n"
+#| "to ignore this event, for example, when the system serves as both\n"
+#| "workstation and server.</p>"
+msgid ""
+"<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
+"Configure what the system should do in response to\n"
+"someone at the console pressing the CTRL + ALT + DEL key\n"
+"combination. %s</p>"
+msgstr ""
+"<p><b>Tolking av Ctrl + Alt + Del</b>:\n"
+"Velg hvordan systemet skal reagere når noen trykker\n"
+"CTRL + ALT + DEL i konsollmodus. Normalt blir systemet\n"
+"startet på nytt, men noen ganger kan det være gunstig\n"
+"å ignorere kommandoen, for eksempel hvis systemet både fungerer som\n"
+"arbeidsstasjon og server.</p>"
+
+#. Boot dialog help 3/4
+#: src/include/security/helps.rb:373
+#, fuzzy
+#| msgid ""
+#| "<p><b>Shutdown Behaviour of Login Manager</b>:\n"
+#| "Set who is allowed to shut down the machine from KDM.</p>\n"
+msgid ""
+"<p><b>Shutdown Behaviour of Login Manager</b>:\n"
+"Set who is allowed to shut down the machine from %s.</p>\n"
+msgstr ""
+"<p><b>Slå av maskinen fra innloggingsskjermen</b>\n"
+"Angi hvem som kan slå av maskinen fra KDM.</p>\n"
+
+#. Boot dialog help 4/4
+#: src/include/security/helps.rb:377
+msgid ""
+"<p><b>Hibernate System</b>:\n"
+"Set the conditions for allowing users to hibernate the system. By default, user on active console has such right.\n"
+"Other options are allowing the action to any user or requiring authentication in all cases.</p>\n"
+msgstr ""
+"<p><b>Systemdvale</b>:\n"
+"Angi betingelsene for at brukere skal kunne bruke dvalefunksjonen. Som standard har brukeren på den aktive konsollen slike rettigheter.\n"
+"Andre valg er å la alle brukere gjøre dette, eller alltid kreve autentisering.</p>\n"
+
 #. level name
 #: src/include/security/levels.rb:54
 #, fuzzy
@@ -1008,163 +1063,238 @@
 "Minste antall gruppenavn kan ikke være større enn det\n"
 "største."
 
-#. ComboBox label
-#: src/include/security/widgets.rb:100
-msgid "&Interpretation of Ctrl + Alt + Del"
-msgstr "&Tolking av Ctrl + Alt + Del"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:105
+#. encoding: utf-8
+#. ------------------------------------------------------------------------------
+#. Copyright (c) 2006-2012 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/security/widgets.ycp
+#. * Module:	Security configuration
+#. * Summary:	Security widgets definitions
+#. * Authors:	Michal Svec 
+#. *
+#. * $Id$
+#. *
+#. * This file contains the definitions of all widgets used by the
+#. * security module. They are all in one map (function) called
+#. * WIDGETS.
+#.
+#. <pre>
+#.
+#. The WIDGETS format:
+#. -------------------
+#.
+#. map WIDGETS = $[
+#. "Item unique ID" : $[
+#. "Widget" : "ComboBox",
+#. "Label" : "Item Label",
+#. "Options" : [ "option1", "option2", ... ],
+#. "Value" : "option2"
+#. ],
+#. ...
+#. ];
+#.
+#. The "Value" is the current value of this option and one from "Options".
+#.
+#. Particular "Options" can be either <string> or [ <string>, <string> ]. In the
+#. latter case, the first string is used as ID and the second is displayed. For
+#. example: [ "option1", ["option2",_("Option2 translation")], ... ].
+#.
+#. Possible "Widget" values so far: "ComboBox, CheckBox, TextEntry".
+#.
+#. Implementation:
+#. ---------------
+#.
+#. map2widget("ID")
+#. - look up the "ID" in the "WIDGETS" map
+#. - create the widget
+#.
+#. widget2value("ID")
+#. - query UI for the widget with `id(ID)
+#. - return its current value
+#.
+#. updatewidget("ID")
+#. - look up the "ID" and change its "Value" to the "val"
+#. - updates the WIDGETS map
+#. - called after start and after each subdialog [OK]
+#. - must check if the value is in "Options"! (TODO)
+#.
+#. processinput()
+#. - return true (OK) or false (abort, back, nil, help!, ...)
+#.
+#. </pre>
+#.
+#. *
+#. @return [Hash] all widgets
+#: src/include/security/widgets.rb:87
 msgid "Ignore"
 msgstr "Ignorer"
 
-#. ComboBox value
-#: src/include/security/widgets.rb:107
+#: src/include/security/widgets.rb:88
 msgid "Reboot"
 msgstr "Start på nytt"
 
-#. ComboBox value
-#: src/include/security/widgets.rb:109
+#: src/include/security/widgets.rb:89
 msgid "Halt"
 msgstr "Slå av"
 
+#: src/include/security/widgets.rb:93
+msgid "Only root"
+msgstr "Bare rotbruker"
+
+#: src/include/security/widgets.rb:94
+msgid "All Users"
+msgstr "Alle brukere"
+
+#: src/include/security/widgets.rb:95
+msgid "Nobody"
+msgstr "Ingen"
+
+#. ComboBox label
+#: src/include/security/widgets.rb:117
+msgid "&Interpretation of Ctrl + Alt + Del"
+msgstr "&Tolking av Ctrl + Alt + Del"
+
 #. CheckBox label
-#: src/include/security/widgets.rb:116
+#: src/include/security/widgets.rb:126
 msgid "Allow Remote &Graphical Login"
 msgstr "Tillat ekstern &grafisk innlogging"
 
 #. CheckBox label
-#: src/include/security/widgets.rb:122
+#: src/include/security/widgets.rb:132
 msgid "&Magic SysRq Keys"
 msgstr "&Magiske SysRq-taster"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:125
+#: src/include/security/widgets.rb:135
 msgid "Disable"
 msgstr "Deaktiver"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:127
+#: src/include/security/widgets.rb:137
 msgid "Enable All Functions"
 msgstr "Aktiver alle funksjoner"
 
 #. IntField label
-#: src/include/security/widgets.rb:134
+#: src/include/security/widgets.rb:144
 msgid "&Delay after Incorrect Login Attempt"
 msgstr "&Forsinkelse etter mislykket innloggingsforsøk"
 
 #. IntField label
 #. IntField label
-#: src/include/security/widgets.rb:142 src/include/security/widgets.rb:205
+#: src/include/security/widgets.rb:152 src/include/security/widgets.rb:199
 msgid "Maxim&um"
 msgstr "Størs&te"
 
 #. IntField label
 #. IntField label
-#: src/include/security/widgets.rb:148 src/include/security/widgets.rb:218
+#: src/include/security/widgets.rb:158 src/include/security/widgets.rb:212
 msgid "M&inimum"
 msgstr "M&inste"
 
 #. ComboBox label
-#: src/include/security/widgets.rb:154
-msgid "&Shutdown Behaviour of KDM Login Manager:"
-msgstr "&Slå av maskinen fra KDM-innloggingsskjermen:"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:159
-msgid "Only root"
-msgstr "Bare rotbruker"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:161
-msgid "All Users"
-msgstr "Alle brukere"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:163
-msgid "Nobody"
-msgstr "Ingen"
-
-#. ComboBox label
-#: src/include/security/widgets.rb:170
+#: src/include/security/widgets.rb:164
 msgid "System Hybernation"
 msgstr "Systemdvale"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:173
+#: src/include/security/widgets.rb:167
 msgid "User on the active console"
 msgstr "Bruker på aktiv konsoll"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:175
+#: src/include/security/widgets.rb:169
 msgid "Anyone can hibernate"
 msgstr "Alle kan bruke dvalefunksjonen"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:177
+#: src/include/security/widgets.rb:171
 msgid "Authentication always required"
 msgstr "Autentisering kreves alltid"
 
 #. ComboBox label
-#: src/include/security/widgets.rb:184
+#: src/include/security/widgets.rb:178
 msgid "P&assword Encryption Method"
 msgstr "Krypteringsmetode for p&assord"
 
 #. CheckBox label
-#: src/include/security/widgets.rb:198
+#: src/include/security/widgets.rb:192
 msgid "&Check New Passwords"
 msgstr "&Kontroller nye passord"
 
 #. IntField label
-#: src/include/security/widgets.rb:211
+#: src/include/security/widgets.rb:205
 msgid "Numb&er of Passwords to Remember"
 msgstr "Antall passord som skal lagr&es"
 
 #. IntField label
-#: src/include/security/widgets.rb:224
+#: src/include/security/widgets.rb:218
 msgid "&Minimum Acceptable Password Length"
 msgstr "&Minste godkjente passordlengde"
 
 #. IntField label
-#: src/include/security/widgets.rb:232
+#: src/include/security/widgets.rb:226
 msgid "&Days before Password Expires Warning"
 msgstr "&Antall dager for varsel om utløp av passord"
 
 #. ComboBox label
-#: src/include/security/widgets.rb:240
+#: src/include/security/widgets.rb:234
 msgid "&File Permissions"
 msgstr "&Filrettigheter"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:243
+#: src/include/security/widgets.rb:237
 msgid "Easy"
 msgstr "Enkel"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:245
+#: src/include/security/widgets.rb:239
 msgid "Secure"
 msgstr "Sikker"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:247
+#: src/include/security/widgets.rb:241
 msgid "Paranoid"
 msgstr "Paranoid"
 
 #. ComboBox label
-#: src/include/security/widgets.rb:254
+#: src/include/security/widgets.rb:248
 msgid "&User Launching updatedb"
 msgstr "&Brukere som kan kjøre updatedb"
 
 #. IntField label
-#: src/include/security/widgets.rb:261
+#: src/include/security/widgets.rb:255
 msgid "Ma&ximum"
 msgstr "St&ørste"
 
 #. IntField label
-#: src/include/security/widgets.rb:267
+#: src/include/security/widgets.rb:261
 msgid "&Minimum"
 msgstr "&Minste"
 
+#. ComboBox label
+#. TRANSLATORS: %s will be the configured display manager usually: GDM or KDM,
+#. but could be XDM,WDM,ENTRANCE,CONSOLE
+#: src/include/security/widgets.rb:277
+#, fuzzy
+#| msgid "&Shutdown Behaviour of KDM Login Manager:"
+msgid "&Shutdown Behaviour of %s Login Manager:"
+msgstr "&Slå av maskinen fra KDM-innloggingsskjermen:"
+
 #: src/include/security/wizards.rb:53
 msgid "Predefined Security Configurations"
 msgstr "Forhåndsdefinerte sikkerhetsoppsett"
@@ -1180,62 +1310,62 @@
 msgstr "Initialiserer ..."
 
 #. Security read dialog caption
-#: src/modules/Security.rb:654
+#: src/modules/Security.rb:638
 msgid "Saving Security Configuration"
 msgstr "Lagrer sikkerhetskonfigurasjon"
 
 #. Progress stage 1/4
-#: src/modules/Security.rb:663
+#: src/modules/Security.rb:647
 msgid "Write security settings"
 msgstr "Lagre sikkerhetsinnstillinger"
 
 #. Progress stage 2/4
-#: src/modules/Security.rb:665
+#: src/modules/Security.rb:649
 msgid "Write inittab settings"
 msgstr "Lagre inittab-innstillinger"
 
 #. Progress stage 3/4
-#: src/modules/Security.rb:667
+#: src/modules/Security.rb:651
 msgid "Write PAM settings"
 msgstr "Lagre PAM-innstillinger"
 
 #. Progress stage 4/4
-#: src/modules/Security.rb:669
+#: src/modules/Security.rb:653
 msgid "Update system settings"
 msgstr "Oppdater systeminnstillinger"
 
 #. Progress step 1/5
-#: src/modules/Security.rb:673
+#: src/modules/Security.rb:657
 msgid "Writing security settings..."
 msgstr "Lagrer sikkerhetsinnstillinger..."
 
 #. Progress step 2/5
-#: src/modules/Security.rb:675
+#: src/modules/Security.rb:659
 msgid "Writing inittab settings..."
 msgstr "Lagrer inittab-innstillinger..."
 
 #. Progress step 3/5
-#: src/modules/Security.rb:677
+#: src/modules/Security.rb:661
 msgid "Writing PAM settings..."
 msgstr "Lagrer PAM-innstillinger..."
 
 #. Progress step 4/5
-#: src/modules/Security.rb:679
+#: src/modules/Security.rb:663
 msgid "Updating system settings..."
 msgstr "Oppdaterer systeminnstillinger..."
 
 #. Progress step 5/5
-#: src/modules/Security.rb:681
+#: src/modules/Security.rb:665
 msgid "Finished"
 msgstr "Fullført"
 
 #. Summary text
-#: src/modules/Security.rb:791
+#: src/modules/Security.rb:754
 msgid "Current Security Level: Custom settings"
 msgstr "Gjeldende sikkerhetsnivå: Brukerdefinerte innstillinger"
 
 #. Summary text
-#: src/modules/Security.rb:795
+#: src/modules/Security.rb:758
 msgid "Current Security Level: %1"
 msgstr "Gjeldende sikkerhetsnivå: %1"
 

Modified: trunk/yast/nb/po/services-manager.nb.po
===================================================================
--- trunk/yast/nb/po/services-manager.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/services-manager.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2014-05-19 09:35+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -304,13 +304,13 @@
 
 #. Do not start or stop services that are already in the desired state.
 #. They might be coming from AutoYast import and thus marked as :modified.
-#: src/modules/services_manager_service.rb:407
+#: src/modules/services_manager_service.rb:415
 #, fuzzy
 #| msgid "%1: Could not change state of the device"
 msgid "Could not %{change} %{service} which is currently %{status}. "
 msgstr "%1: Kunne ikke endre status på enheten"
 
-#: src/modules/services_manager_service.rb:426
+#: src/modules/services_manager_service.rb:434
 #, fuzzy
 #| msgid "%1: Could not change state of the device"
 msgid "Could not %{change} %{service}. "

Modified: trunk/yast/nb/po/snapper.nb.po
===================================================================
--- trunk/yast/nb/po/snapper.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/snapper.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2002-06-17 14:33+0200\n"
 "Last-Translator: www.linuxbutikken.no \n"
 "Language-Team: Norwegian \n"
@@ -48,144 +48,144 @@
 
 #. text entry label
 #. text entry label
-#: src/include/snapper/dialogs.rb:123 src/include/snapper/dialogs.rb:244
-#: src/include/snapper/dialogs.rb:496
+#: src/include/snapper/dialogs.rb:131 src/include/snapper/dialogs.rb:252
+#: src/include/snapper/dialogs.rb:500
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. text entry label
 #. text entry label
-#: src/include/snapper/dialogs.rb:130 src/include/snapper/dialogs.rb:290
+#: src/include/snapper/dialogs.rb:138 src/include/snapper/dialogs.rb:298
 msgid "User data"
 msgstr "Brukerdata"
 
 #. combo box label
 #. text entry label
-#: src/include/snapper/dialogs.rb:138 src/include/snapper/dialogs.rb:295
+#: src/include/snapper/dialogs.rb:146 src/include/snapper/dialogs.rb:303
 msgid "Cleanup algorithm"
 msgstr "Opprryddingsalgoritme"
 
 #. popup label, %{num} is number
-#: src/include/snapper/dialogs.rb:153
+#: src/include/snapper/dialogs.rb:161
 #, fuzzy
 #| msgid "Modify Snapshot %1"
 msgid "Modify Snapshot %{num}"
 msgstr "Endre øyeblikksbilde %1"
 
 #. popup label, %{pre} and %{post} are numbers
-#: src/include/snapper/dialogs.rb:159
+#: src/include/snapper/dialogs.rb:167
 #, fuzzy
 #| msgid "Modify Snapshots %1 - %2"
 msgid "Modify Snapshot %{pre} and %{post}"
 msgstr "Endre øyeblikksbilder %1 - %2"
 
 #. label
-#: src/include/snapper/dialogs.rb:161
+#: src/include/snapper/dialogs.rb:169
 #, fuzzy
 #| msgid "Pre (%1)"
 msgid "Pre (%{pre})"
 msgstr "Før (%1)"
 
 #. label
-#: src/include/snapper/dialogs.rb:165
+#: src/include/snapper/dialogs.rb:173
 #, fuzzy
 #| msgid "Post (%1)"
 msgid "Post (%{post})"
 msgstr "Etter (%1)"
 
 #. popup label
-#: src/include/snapper/dialogs.rb:242
+#: src/include/snapper/dialogs.rb:250
 msgid "Create New Snapshot"
 msgstr "Opprett nytt øyeblikksbilde"
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:255
+#: src/include/snapper/dialogs.rb:263
 msgid "Single snapshot"
 msgstr "Enkelt øyeblikksbilde"
 
 #. radio button label
 #. 0 means there's no post
-#: src/include/snapper/dialogs.rb:264 src/include/snapper/dialogs.rb:442
+#: src/include/snapper/dialogs.rb:272 src/include/snapper/dialogs.rb:450
 msgid "Pre"
 msgstr "Før"
 
 #. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:274
+#: src/include/snapper/dialogs.rb:282
 msgid "Post, paired with:"
 msgstr "Etter, i par med:"
 
 #. yes/no popup question
-#: src/include/snapper/dialogs.rb:350
+#: src/include/snapper/dialogs.rb:358
 #, fuzzy
 #| msgid "Really delete snapshot '%1'?"
 msgid "Really delete snapshot %{num}?"
 msgstr "Vil du virkelig slette  øyeblikksbildet '%1'?"
 
 #. yes/no popup question
-#: src/include/snapper/dialogs.rb:357
+#: src/include/snapper/dialogs.rb:365
 #, fuzzy
 #| msgid "Really delete snapshot '%1'?"
 msgid "Really delete snapshots %{pre} and %{post}?"
 msgstr "Vil du virkelig slette  øyeblikksbildet '%1'?"
 
 #. summary dialog caption
-#: src/include/snapper/dialogs.rb:372
+#: src/include/snapper/dialogs.rb:380
 msgid "Snapshots"
 msgstr "Øyeblikksbilder"
 
 #. generate list of snapshot table items
-#: src/include/snapper/dialogs.rb:401
+#: src/include/snapper/dialogs.rb:409
 msgid "Single"
 msgstr "Enkelt"
 
 #. pre canot be 0
-#: src/include/snapper/dialogs.rb:426
+#: src/include/snapper/dialogs.rb:434
 msgid "Pre & Post"
 msgstr "Før og Etter"
 
 #. busy popup message
-#: src/include/snapper/dialogs.rb:461
+#: src/include/snapper/dialogs.rb:469
 msgid "Reading list of snapshots..."
 msgstr "Leser listen over øyeblikksbilder..."
 
 #. combo box label
-#: src/include/snapper/dialogs.rb:481
+#: src/include/snapper/dialogs.rb:485
 msgid "Current Configuration"
 msgstr "Gjeldende oppsett"
 
 #. table header
-#: src/include/snapper/dialogs.rb:492
+#: src/include/snapper/dialogs.rb:496
 msgid "ID"
 msgstr "ID"
 
-#: src/include/snapper/dialogs.rb:493
+#: src/include/snapper/dialogs.rb:497
 msgid "Type"
 msgstr "Type"
 
-#: src/include/snapper/dialogs.rb:494
+#: src/include/snapper/dialogs.rb:498
 msgid "Start Date"
 msgstr "Startdato"
 
-#: src/include/snapper/dialogs.rb:495
+#: src/include/snapper/dialogs.rb:499
 msgid "End Date"
 msgstr "Sluttdato"
 
-#: src/include/snapper/dialogs.rb:497
+#: src/include/snapper/dialogs.rb:501
 msgid "User Data"
 msgstr "Brukerinformasjon"
 
 #. button label
-#: src/include/snapper/dialogs.rb:503
+#: src/include/snapper/dialogs.rb:507
 msgid "Show Changes"
 msgstr "Vis endringer"
 
 #. button label
-#: src/include/snapper/dialogs.rb:506
+#: src/include/snapper/dialogs.rb:510
 msgid "Modify"
 msgstr "Endre"
 
 #. popup message
-#: src/include/snapper/dialogs.rb:549
+#: src/include/snapper/dialogs.rb:553
 msgid ""
 "This 'Pre' snapshot is not paired with any 'Post' one yet.\n"
 "Showing differences is not possible."
@@ -194,131 +194,131 @@
 "Det er ikke mulig å vise avvik."
 
 #. dialog caption
-#: src/include/snapper/dialogs.rb:634
+#: src/include/snapper/dialogs.rb:638
 msgid "Selected Snapshot Overview"
 msgstr "Valgt oversikt over øyeblikksbilder"
 
 #. '%1: %2' means 'ID: description', adapt the order if necessary
-#: src/include/snapper/dialogs.rb:666
+#: src/include/snapper/dialogs.rb:670
 msgid "%1: %2"
 msgstr "%1: %2"
 
 #. busy popup message
-#: src/include/snapper/dialogs.rb:685
+#: src/include/snapper/dialogs.rb:689
 msgid "Calculating changed files..."
 msgstr "Beregner endrede filer..."
 
 #. busy popup message
-#: src/include/snapper/dialogs.rb:695
+#: src/include/snapper/dialogs.rb:699
 msgid "Calculating file modifications..."
 msgstr "Beregner endringer i filer..."
 
 #. label
-#: src/include/snapper/dialogs.rb:703
+#: src/include/snapper/dialogs.rb:707
 msgid "New file was created."
 msgstr "En ny fil er opprettet."
 
 #. label
-#: src/include/snapper/dialogs.rb:707
+#: src/include/snapper/dialogs.rb:711
 msgid "File was removed."
 msgstr "Filen er slettet."
 
 #. label
-#: src/include/snapper/dialogs.rb:712
+#: src/include/snapper/dialogs.rb:716
 msgid "File content was not changed."
 msgstr "Filinnholdet er ikke endret."
 
 #. label
-#: src/include/snapper/dialogs.rb:718
+#: src/include/snapper/dialogs.rb:722
 msgid "File does not exist in either snapshot."
 msgstr "Filen finnes ikke i noen av øyeblikksbildene."
 
 #. label
-#: src/include/snapper/dialogs.rb:724
+#: src/include/snapper/dialogs.rb:728
 msgid "File content was modified."
 msgstr "Innholdet i filen er endret."
 
 #. text label, %1, %2 are file modes (like '-rw-r--r--')
-#: src/include/snapper/dialogs.rb:734
+#: src/include/snapper/dialogs.rb:738
 msgid "File mode was changed from '%1' to '%2'."
 msgstr "Filmodus er endret fra '%1' til '%2'."
 
 #. text label, %1, %2 are user names
-#: src/include/snapper/dialogs.rb:749
+#: src/include/snapper/dialogs.rb:753
 msgid "File user ownership was changed from '%1' to '%2'."
 msgstr "Brukereierskap for filer er endret fra '%1' til '%2'."
 
 #. text label, %1, %2 are group names
-#: src/include/snapper/dialogs.rb:765
+#: src/include/snapper/dialogs.rb:769
 msgid "File group ownership was changed from '%1' to '%2'."
 msgstr "Gruppeeierskap for filer er endret fra '%1' til '%2'."
 
 #. button label
-#: src/include/snapper/dialogs.rb:782
+#: src/include/snapper/dialogs.rb:786
 msgid "R&estore from First"
 msgstr "Gj&enopprett fra første"
 
 #. button label
-#: src/include/snapper/dialogs.rb:784
+#: src/include/snapper/dialogs.rb:788
 msgid "Restore"
 msgstr "Gjenopprett"
 
-#: src/include/snapper/dialogs.rb:807
+#: src/include/snapper/dialogs.rb:811
 msgid "Res&tore from Second"
 msgstr "Gjenoppre&tt fra andre"
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:844
+#: src/include/snapper/dialogs.rb:848
 msgid "Show the difference between snapshot and current system"
 msgstr "Vis forskjellen mellom øyeblikksbilde og gjeldende system"
 
 #. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:856
+#: src/include/snapper/dialogs.rb:860
 msgid "Show the difference between current and selected snapshot:"
 msgstr "Vis forskjellen mellom gjeldende og valgt øyeblikksbilde:"
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:903
+#: src/include/snapper/dialogs.rb:907
 msgid "Show the difference between first and second snapshot"
 msgstr "Vis forskjellen mellom første og andre øyeblikksbilde"
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:914
+#: src/include/snapper/dialogs.rb:918
 msgid "Show the difference between first snapshot and current system"
 msgstr "Vis forskjellen mellom første øyeblikksbilde og gjeldende system"
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:925
+#: src/include/snapper/dialogs.rb:929
 msgid "Show the difference between second snapshot and current system"
 msgstr "Vis forskjellen mellom andre øyeblikksbilde og gjeldende system"
 
 #. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:954
+#: src/include/snapper/dialogs.rb:958
 msgid "Time of taking the snapshot:"
 msgstr "Tid for å opprette øyeblikksbildet:"
 
 #. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:962
+#: src/include/snapper/dialogs.rb:966
 msgid "Time of taking the first snapshot:"
 msgstr "Tid for å opprette første øyeblikksbilde:"
 
 #. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:967
+#: src/include/snapper/dialogs.rb:971
 msgid "Time of taking the second snapshot:"
 msgstr "Tid for å opprette andre øyeblikksbilde:"
 
 #. button label
-#: src/include/snapper/dialogs.rb:990
+#: src/include/snapper/dialogs.rb:994
 msgid "&Open"
 msgstr "&Åpne"
 
 #. button label
-#: src/include/snapper/dialogs.rb:1036
+#: src/include/snapper/dialogs.rb:1040
 msgid "Restore Selected"
 msgstr "Oppdater valgte"
 
 #. yes/no question, %1 is file name, %2 is number
-#: src/include/snapper/dialogs.rb:1121
+#: src/include/snapper/dialogs.rb:1125
 msgid ""
 "Do you want to delete the file\n"
 "\n"
@@ -334,7 +334,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:1142 src/include/snapper/dialogs.rb:1161
+#: src/include/snapper/dialogs.rb:1146 src/include/snapper/dialogs.rb:1165
 msgid ""
 "Do you want to copy the file\n"
 "\n"
@@ -349,19 +349,19 @@
 "fra øyeblikksbilde '%2' til gjeldende system?"
 
 #. popup message
-#: src/include/snapper/dialogs.rb:1187
+#: src/include/snapper/dialogs.rb:1191
 #, fuzzy
 #| msgid "No file was selected for restoring"
 msgid "No file was selected for restoring."
 msgstr "Ingen fil er valgt for gjenoppretting"
 
 #. popup headline
-#: src/include/snapper/dialogs.rb:1197
+#: src/include/snapper/dialogs.rb:1201
 msgid "Restoring files"
 msgstr "Gjenoppretter filer"
 
 #. popup message, %1 is snapshot number, %2 list of files
-#: src/include/snapper/dialogs.rb:1200
+#: src/include/snapper/dialogs.rb:1204
 msgid ""
 "<p>These files will be restored from snapshot '%1':</p>\n"
 "<p>\n"

Modified: trunk/yast/nb/po/storage.nb.po
===================================================================
--- trunk/yast/nb/po/storage.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/storage.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: storage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:17+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2009-10-08 13:00+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -100,8 +100,7 @@
 msgstr "&Opprett partisjonsoppsett..."
 
 #. popup text
-#: src/clients/inst_disk_proposal.rb:123
-#: src/clients/partitions_proposal.rb:105
+#: src/clients/inst_disk_proposal.rb:123 src/clients/partitions_proposal.rb:105
 msgid ""
 "No automatic proposal possible.\n"
 "Specify mount points manually in the 'Partitioner' dialog."
@@ -184,7 +183,13 @@
 msgid "Not enough space available to propose separate /home."
 msgstr "Det er ikke nok ledig plass til å foreslå en separat partisjon for /home."
 
-#: src/clients/inst_disk_proposal.rb:295
+#: src/clients/inst_disk_proposal.rb:283
+#, fuzzy
+#| msgid "Nothing assigned as root filesystem!"
+msgid "Nothing assigned as root filesystem. Cannot continue."
+msgstr "Det er ikke tilordnet noe rotfilsystem!"
+
+#: src/clients/inst_disk_proposal.rb:304
 msgid ""
 "Computing this proposal will overwrite manual changes \n"
 "done so far. Continue with computing proposal?"
@@ -972,7 +977,7 @@
 #. Label text
 #. TRANSLATORS: checkbox text
 #: src/include/partitioning/auto_part_ui.rb:341
-#: src/modules/StorageProposal.rb:6245
+#: src/modules/StorageProposal.rb:6272
 msgid "Propose Separate &Home Partition"
 msgstr "Foreslå separat partisjon for &hjemmekatalog"
 
@@ -990,7 +995,7 @@
 msgstr "Forslagstype"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:251
+#: src/include/partitioning/custom_part_check_generated.rb:244
 msgid ""
 "You have not assigned a root partition for\n"
 "installation. This does not work. Assign the root mount point \"/\" to a\n"
@@ -1005,7 +1010,7 @@
 "Vil du virkelig bruke dette oppsettet?\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:264
+#: src/include/partitioning/custom_part_check_generated.rb:257
 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"
@@ -1021,7 +1026,7 @@
 "Vil du virkelig bruke dette oppsettet?\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:277
+#: src/include/partitioning/custom_part_check_generated.rb:270
 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"
@@ -1036,7 +1041,7 @@
 "Vil du virkelig bruke dette oppsettet?\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:291
+#: src/include/partitioning/custom_part_check_generated.rb:284
 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"
@@ -1052,7 +1057,7 @@
 
 #. A PReP/CHRP partition is not supposed to be mounted. So if we find any
 #. other /boot partition, we should warn the user.
-#: src/include/partitioning/custom_part_check_generated.rb:305
+#: src/include/partitioning/custom_part_check_generated.rb:298
 msgid ""
 "Warning:\n"
 "Your system needs a boot partition with type 0x41 PReP/CHRP.\n"
@@ -1062,7 +1067,7 @@
 msgstr ""
 
 #. popup text, %1 is a number
-#: src/include/partitioning/custom_part_check_generated.rb:320
+#: src/include/partitioning/custom_part_check_generated.rb:313
 msgid ""
 "Warning:\n"
 "Your boot partition ends above cylinder %1.\n"
@@ -1083,7 +1088,7 @@
 "Vil du bruke dette oppsettet?\n"
 
 #. popup text, %1 is a size
-#: src/include/partitioning/custom_part_check_generated.rb:340
+#: src/include/partitioning/custom_part_check_generated.rb:333
 msgid ""
 "Warning:\n"
 "Your boot partition is smaller than %1.\n"
@@ -1098,7 +1103,7 @@
 "Vil du virkelig bruke denne størrelsen på oppstartspartisjonen?\n"
 
 #. /////////////////////////// NO BOOT ///////////////////////////
-#: src/include/partitioning/custom_part_check_generated.rb:357
+#: src/include/partitioning/custom_part_check_generated.rb:350
 msgid ""
 "Warning: There is no partition of type bios_grub present.\n"
 "Such a partition is recommended (required with Btrfs) when Grub2 is\n"
@@ -1110,7 +1115,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:377
+#: src/include/partitioning/custom_part_check_generated.rb:370
 #, fuzzy
 #| msgid ""
 #| "Warning: There is no partition mounted as /boot.\n"
@@ -1137,7 +1142,7 @@
 "Vil du virkelig bruke dette oppsettet uten en /boot-partisjon?\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:396
+#: src/include/partitioning/custom_part_check_generated.rb:389
 msgid ""
 "Warning: According to your setup, you intend to\n"
 "boot your machine from the root partition (/), which, unfortunately,\n"
@@ -1156,11 +1161,11 @@
 "\n"
 "Vil du virkelig bruke dette oppsettet?\n"
 
-#: src/include/partitioning/custom_part_check_generated.rb:416
+#: src/include/partitioning/custom_part_check_generated.rb:415
 msgid ""
 "Warning: Some subvolumes of the root filesystem are shadowed by\n"
 "mount points of other filesystem. This could lead to problems.\n"
-"\n"
+"%s\n"
 "Really use this setup?\n"
 msgstr ""
 
@@ -1306,7 +1311,7 @@
 "Vil du virkelig beholde partisjonen uformatert?\n"
 
 #. popup text %1 is replaced by a raid name e.g. md0
-#: src/include/partitioning/custom_part_check_generated.rb:595
+#: src/include/partitioning/custom_part_check_generated.rb:601
 msgid ""
 "The selected device belongs to the RAID (%1).\n"
 "Remove it from the RAID before editing it.\n"
@@ -1315,7 +1320,7 @@
 "Fjern den fra RAID før du gjør endringer.\n"
 
 #. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:606
+#: src/include/partitioning/custom_part_check_generated.rb:612
 msgid ""
 "The selected device belongs to a volume group (%1).\n"
 "Remove it from the volume group before editing it.\n"
@@ -1324,7 +1329,7 @@
 "Fjern den fra volumgruppen før du gjør endringer.\n"
 
 #. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:616
+#: src/include/partitioning/custom_part_check_generated.rb:622
 msgid ""
 "The selected device is used by volume (%1).\n"
 "Remove the volume before editing it.\n"
@@ -1333,7 +1338,7 @@
 "Fjern den fra volumet før du gjør endringer.\n"
 
 #. popup text %2 is a device name, %1 is the raid name
-#: src/include/partitioning/custom_part_check_generated.rb:649
+#: src/include/partitioning/custom_part_check_generated.rb:655
 msgid ""
 "The device (%2) belongs to the RAID (%1).\n"
 "Remove it from the RAID before deleting it.\n"
@@ -1342,7 +1347,7 @@
 "Fjern den fra RAID før du sletter den.\n"
 
 #. popup text, %1 and %2 are device names
-#: src/include/partitioning/custom_part_check_generated.rb:660
+#: src/include/partitioning/custom_part_check_generated.rb:666
 msgid ""
 "The device (%2) is used by %1.\n"
 "Remove %1 before deleting it.\n"
@@ -1350,12 +1355,12 @@
 "Enheten (%2) benyttes av %1.\n"
 "Fjern %1 før du sletter den.\n"
 
-#: src/include/partitioning/custom_part_check_generated.rb:672
+#: src/include/partitioning/custom_part_check_generated.rb:678
 msgid "It cannot be deleted while mounted."
 msgstr "Kan ikke slettes mens den er montert."
 
 #. popup text, %1 is a device name
-#: src/include/partitioning/custom_part_check_generated.rb:708
+#: src/include/partitioning/custom_part_check_generated.rb:714
 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"
@@ -1364,7 +1369,7 @@
 "en annen logisk partisjon med høyere nummer er i bruk.\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:784
+#: src/include/partitioning/custom_part_check_generated.rb:790
 msgid ""
 "The selected extended partition contains partitions which are currently mounted:\n"
 "%1\n"
@@ -1377,7 +1382,7 @@
 "Klikk Avbryt hvis du ikke vet nøyaktig hva du gjør.\n"
 
 #. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_check_generated.rb:802
+#: src/include/partitioning/custom_part_check_generated.rb:808
 msgid ""
 "\n"
 "The selected extended partition contains at least one LVM partition\n"
@@ -1392,7 +1397,7 @@
 "før du sletter den utvidede partisjonen.\n"
 
 #. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_check_generated.rb:813
+#: src/include/partitioning/custom_part_check_generated.rb:819
 msgid ""
 "\n"
 "The selected extended partition contains at least one partition\n"
@@ -1407,7 +1412,7 @@
 "den utvidede partisjonen.\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:824
+#: src/include/partitioning/custom_part_check_generated.rb:830
 msgid ""
 "\n"
 "The selected extended partition contains at least one partition\n"
@@ -1426,13 +1431,13 @@
 
 #. label text
 #: src/include/partitioning/custom_part_dialogs.rb:74
-#: src/include/partitioning/ep-dialogs.rb:768
-#: src/modules/StorageProposal.rb:6372
+#: src/include/partitioning/ep-dialogs.rb:806
+#: src/modules/StorageProposal.rb:6400
 msgid "Do not forget what you enter here!"
 msgstr "Ikke glem hva du skriver inn her!"
 
 #: src/include/partitioning/custom_part_dialogs.rb:78
-#: src/include/partitioning/ep-dialogs.rb:771
+#: src/include/partitioning/ep-dialogs.rb:809
 msgid "Empty password allowed."
 msgstr "Passord er ikke nødvendig."
 
@@ -1461,7 +1466,7 @@
 #. Label: get password for user root
 #. Please use newline if label is longer than 40 characters
 #: src/include/partitioning/custom_part_dialogs.rb:136
-#: src/include/partitioning/ep-dialogs.rb:796
+#: src/include/partitioning/ep-dialogs.rb:834
 msgid "&Enter a Password for your File System:"
 msgstr "Skriv inn &et passord for filsystemet:"
 
@@ -1472,7 +1477,7 @@
 #. Label: get same password again for verification
 #. Please use newline if label is longer than 40 characters
 #: src/include/partitioning/custom_part_dialogs.rb:147
-#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:4002
+#: src/include/partitioning/ep-dialogs.rb:818 src/modules/Storage.rb:4006
 msgid "Reenter the Password for &Verification:"
 msgstr "&Gjenta passordet:"
 
@@ -1495,7 +1500,7 @@
 #. popup text
 #. popup text
 #: src/include/partitioning/custom_part_dialogs.rb:196
-#: src/modules/Storage.rb:3958
+#: src/modules/Storage.rb:3962
 msgid ""
 "You did not enter a password.\n"
 "Try again.\n"
@@ -1506,7 +1511,7 @@
 #. popup text
 #. popup text
 #: src/include/partitioning/custom_part_dialogs.rb:203
-#: src/modules/Storage.rb:3966
+#: src/modules/Storage.rb:3970
 msgid ""
 "The password must have at least %1 characters.\n"
 "Try again.\n"
@@ -1874,7 +1879,7 @@
 #. TRANSLATOR: checkbox text
 #. TRANSLATORS: checkbox text
 #: src/include/partitioning/custom_part_dialogs.rb:1592
-#: src/modules/StorageProposal.rb:6226
+#: src/modules/StorageProposal.rb:6253
 msgid "Enable Snapshots"
 msgstr ""
 
@@ -1889,7 +1894,7 @@
 msgid "Empty subvolume name not allowed."
 msgstr "Du må angi et navn på undervolumet."
 
-#: src/include/partitioning/custom_part_dialogs.rb:1670
+#: src/include/partitioning/custom_part_dialogs.rb:1671
 msgid ""
 "Only subvolume names starting with \"%1\" currently allowed!\n"
 "Automatically prepending \"%1\" to name of subvolume."
@@ -1897,11 +1902,11 @@
 "Bare undervolumnavn som begynner med \"%1\" er tillat!\n"
 "Legger automatisk til \"%1\" foran undervolumnavnet."
 
-#: src/include/partitioning/custom_part_dialogs.rb:1680
+#: src/include/partitioning/custom_part_dialogs.rb:1681
 msgid "Subvolume name %1 already exists."
 msgstr "Undervolumnavnet %1 finnes allerede."
 
-#: src/include/partitioning/custom_part_dialogs.rb:1709
+#: src/include/partitioning/custom_part_dialogs.rb:1711
 msgid "Modifications done so far in this dialog will be lost."
 msgstr "Alle tidligere endringer i dialogen vil gå tapt."
 
@@ -1944,7 +1949,7 @@
 
 #. helptext
 #: src/include/partitioning/custom_part_helptexts.rb:87
-#: src/include/partitioning/ep-dialogs.rb:708
+#: src/include/partitioning/ep-dialogs.rb:746
 msgid ""
 "<p>\n"
 "This mount point corresponds to a temporary filesystem like /tmp or /var/tmp.\n"
@@ -1963,7 +1968,7 @@
 #. help text, continued
 #. helptext
 #: src/include/partitioning/custom_part_helptexts.rb:100
-#: src/include/partitioning/ep-dialogs.rb:723
+#: src/include/partitioning/ep-dialogs.rb:761
 msgid ""
 "<p>\n"
 "If you forget your password, you will lose access to the data on your file system.\n"
@@ -1982,7 +1987,7 @@
 #. help text, continued
 #. helptext, %1 is replaced by integer
 #: src/include/partitioning/custom_part_helptexts.rb:114
-#: src/include/partitioning/ep-dialogs.rb:737
+#: src/include/partitioning/ep-dialogs.rb:775
 msgid ""
 "<p>\n"
 "You must distinguish between uppercase and lowercase. A password should have at\n"
@@ -2014,7 +2019,7 @@
 #. help text, continued
 #. helptext
 #: src/include/partitioning/custom_part_helptexts.rb:142
-#: src/include/partitioning/ep-dialogs.rb:749
+#: src/include/partitioning/ep-dialogs.rb:787
 msgid ""
 "<p>\n"
 "Do not forget this password!\n"
@@ -2234,7 +2239,7 @@
 "til enheter som mangler eller ha ukjent filsystem."
 
 #. warning message, %1 is replaced by fs name (e.g. Ext3)
-#: src/include/partitioning/custom_part_lib.rb:491
+#: src/include/partitioning/custom_part_lib.rb:482
 msgid ""
 "\n"
 "WARNING:\n"
@@ -2258,12 +2263,12 @@
 
 #. //////////////////////////////////////////////
 #. modify map new
-#: src/include/partitioning/custom_part_lib.rb:919
-#: src/include/partitioning/custom_part_lib.rb:946
+#: src/include/partitioning/custom_part_lib.rb:924
+#: src/include/partitioning/custom_part_lib.rb:951
 msgid "The file system is currently mounted on %1."
 msgstr "Filsystemet er montert på %1."
 
-#: src/include/partitioning/custom_part_lib.rb:924
+#: src/include/partitioning/custom_part_lib.rb:929
 msgid ""
 "You can try to unmount it now, continue without unmounting or cancel.\n"
 "Click Cancel unless you know exactly what you are doing."
@@ -2273,12 +2278,12 @@
 
 #. button text
 #. button text
-#: src/include/partitioning/custom_part_lib.rb:935
-#: src/include/partitioning/custom_part_lib.rb:960
+#: src/include/partitioning/custom_part_lib.rb:940
+#: src/include/partitioning/custom_part_lib.rb:965
 msgid "Unmount"
 msgstr "Avmonter"
 
-#: src/include/partitioning/custom_part_lib.rb:951
+#: src/include/partitioning/custom_part_lib.rb:956
 msgid ""
 "You can try to unmount it now or cancel.\n"
 "Click Cancel unless you know exactly what you are doing."
@@ -2286,15 +2291,15 @@
 "Du kan forsøke avmontere det nå eller avbryte.\n"
 "Klikk på Avbryt hvis du ikke vet nøyaktig hva du holder på med."
 
-#: src/include/partitioning/custom_part_lib.rb:997
+#: src/include/partitioning/custom_part_lib.rb:1002
 msgid "It is not possible to shrink the file system while it is mounted."
 msgstr "Filsystemet kan ikke krympes mens det er montert."
 
-#: src/include/partitioning/custom_part_lib.rb:1010
+#: src/include/partitioning/custom_part_lib.rb:1015
 msgid "It is not possible to extend the file system while it is mounted."
 msgstr "Filsystemet kan ikke utvides mens det er montert."
 
-#: src/include/partitioning/custom_part_lib.rb:1021
+#: src/include/partitioning/custom_part_lib.rb:1026
 msgid "It is not possible to resize the file system while it is mounted."
 msgstr "Du kan ikke endre størrelse på filsystemet mens det er montert."
 
@@ -2581,11 +2586,9 @@
 #. Package:     yast2-storage
 #. Summary:     Expert Partitioner
 #. Authors:     Arvin Schnell 
-#: src/include/partitioning/ep-btrfs.rb:40
-#: src/include/partitioning/ep-dm.rb:36 src/include/partitioning/ep-hd.rb:61
-#: src/include/partitioning/ep-loop.rb:37
-#: src/include/partitioning/ep-lvm.rb:64
-#: src/include/partitioning/ep-raid.rb:38
+#: src/include/partitioning/ep-btrfs.rb:40 src/include/partitioning/ep-dm.rb:36
+#: src/include/partitioning/ep-hd.rb:61 src/include/partitioning/ep-loop.rb:37
+#: src/include/partitioning/ep-lvm.rb:64 src/include/partitioning/ep-raid.rb:38
 msgid "Edit"
 msgstr "Rediger"
 
@@ -2616,9 +2619,8 @@
 #. Package:     yast2-storage
 #. Summary:     Expert Partitioner
 #. Authors:     Arvin Schnell 
-#: src/include/partitioning/ep-btrfs.rb:45
-#: src/include/partitioning/ep-hd.rb:43 src/include/partitioning/ep-hd.rb:64
-#: src/include/partitioning/ep-loop.rb:37
+#: src/include/partitioning/ep-btrfs.rb:45 src/include/partitioning/ep-hd.rb:43
+#: src/include/partitioning/ep-hd.rb:64 src/include/partitioning/ep-loop.rb:37
 #: src/include/partitioning/ep-lvm.rb:44 src/include/partitioning/ep-lvm.rb:66
 #: src/include/partitioning/ep-raid.rb:40
 #: src/include/partitioning/ep-tmpfs.rb:36
@@ -2640,8 +2642,7 @@
 #: src/include/partitioning/ep-btrfs.rb:140
 #: src/include/partitioning/ep-btrfs.rb:205
 #: src/include/partitioning/ep-dm.rb:153 src/include/partitioning/ep-hd.rb:86
-#: src/include/partitioning/ep-loop.rb:54
-#: src/include/partitioning/ep-lvm.rb:86
+#: src/include/partitioning/ep-loop.rb:54 src/include/partitioning/ep-lvm.rb:86
 #: src/include/partitioning/ep-raid.rb:59
 msgid "Edit..."
 msgstr "Rediger..."
@@ -2658,8 +2659,7 @@
 #. push button text
 #: src/include/partitioning/ep-btrfs.rb:145
 #: src/include/partitioning/ep-hd.rb:92 src/include/partitioning/ep-loop.rb:56
-#: src/include/partitioning/ep-lvm.rb:90
-#: src/include/partitioning/ep-raid.rb:63
+#: src/include/partitioning/ep-lvm.rb:90 src/include/partitioning/ep-raid.rb:63
 #: src/include/partitioning/ep-tmpfs.rb:112
 #: src/include/partitioning/ep-tmpfs.rb:170
 msgid "Delete..."
@@ -2725,36 +2725,43 @@
 msgstr "<p>Velg størrelsen på den nye partisjonen.</p>"
 
 #. radio button text
-#: src/include/partitioning/ep-dialogs.rb:55
+#: src/include/partitioning/ep-dialogs.rb:56
+#, fuzzy
+#| msgid "Format partition"
+msgid "EFI Boot Partition"
+msgstr "Formater partisjon"
+
+#. radio button text
+#: src/include/partitioning/ep-dialogs.rb:64
 msgid "Operating System"
 msgstr "Operativsystem"
 
 #. radio button text
-#: src/include/partitioning/ep-dialogs.rb:60
+#: src/include/partitioning/ep-dialogs.rb:69
 #, fuzzy
 #| msgid "Delta RPM Application Progress"
 msgid "Data and ISV Applications"
 msgstr "Forløpsindikator for installasjon av delta-RPM"
 
 #. radio button text
-#: src/include/partitioning/ep-dialogs.rb:65
+#: src/include/partitioning/ep-dialogs.rb:75
 msgid "Swap"
 msgstr ""
 
 #. radio button text
-#: src/include/partitioning/ep-dialogs.rb:70
+#: src/include/partitioning/ep-dialogs.rb:80
 msgid "Raw Volume (unformatted)"
 msgstr ""
 
 #. heading for a frame in a dialog
-#: src/include/partitioning/ep-dialogs.rb:78
+#: src/include/partitioning/ep-dialogs.rb:88
 #, fuzzy
 #| msgid "Role: %s"
 msgid "Role"
 msgstr "Rolle: %s"
 
 #. helptext
-#: src/include/partitioning/ep-dialogs.rb:107
+#: src/include/partitioning/ep-dialogs.rb:120
 msgid ""
 "<p>First, choose whether the partition should be\n"
 "formatted and the desired file system type.</p>"
@@ -2763,7 +2770,7 @@
 "og ønsket filsystemtype.</p>"
 
 #. helptext
-#: src/include/partitioning/ep-dialogs.rb:114
+#: src/include/partitioning/ep-dialogs.rb:127
 msgid ""
 "<p>If you want to encrypt all data on the\n"
 "volume, select <b>Encrypt Device</b>. Changing the encryption on an existing\n"
@@ -2774,7 +2781,7 @@
 "volum, vil alle data på volumet bli slettet.</p>\n"
 
 #. helptext
-#: src/include/partitioning/ep-dialogs.rb:124
+#: src/include/partitioning/ep-dialogs.rb:137
 msgid ""
 "<p>Then, choose whether the partition should\n"
 "be mounted and enter the mount point (/, /boot, /home, /var, etc.).</p>"
@@ -2783,47 +2790,47 @@
 " og monteringspunktet ( /, /boot, /usr, /var osv.).</p>"
 
 #. set globals
-#: src/include/partitioning/ep-dialogs.rb:309
+#: src/include/partitioning/ep-dialogs.rb:337
 msgid "Formatting Options"
 msgstr "Formateringsvalg"
 
-#: src/include/partitioning/ep-dialogs.rb:317
+#: src/include/partitioning/ep-dialogs.rb:345
 msgid "Format partition"
 msgstr "Formater partisjon"
 
-#: src/include/partitioning/ep-dialogs.rb:328
+#: src/include/partitioning/ep-dialogs.rb:356
 msgid "Do not format partition"
 msgstr "Ikke formater partisjon"
 
-#: src/include/partitioning/ep-dialogs.rb:344
+#: src/include/partitioning/ep-dialogs.rb:372
 msgid "Do not mount partition"
 msgstr "Ikke monter partisjonen"
 
-#: src/include/partitioning/ep-dialogs.rb:363
+#: src/include/partitioning/ep-dialogs.rb:391
 msgid "Mounting Options"
 msgstr "Monteringsvalg"
 
-#: src/include/partitioning/ep-dialogs.rb:371
+#: src/include/partitioning/ep-dialogs.rb:399
 msgid "Mount partition"
 msgstr "Monter partisjonen"
 
 #. Column header
-#: src/include/partitioning/ep-dialogs.rb:377 src/modules/StorageFields.rb:144
+#: src/include/partitioning/ep-dialogs.rb:405 src/modules/StorageFields.rb:144
 msgid "Mount Point"
 msgstr "Monteringspunkt"
 
 #. button text
-#: src/include/partitioning/ep-dialogs.rb:384
+#: src/include/partitioning/ep-dialogs.rb:412
 msgid "Fs&tab Options..."
 msgstr "Fs&tab-valg..."
 
 #. error popup
-#: src/include/partitioning/ep-dialogs.rb:558
+#: src/include/partitioning/ep-dialogs.rb:596
 msgid "Crypt files must be encrypted."
 msgstr "Kryptofiler må være kryptert."
 
 #. error popup
-#: src/include/partitioning/ep-dialogs.rb:569
+#: src/include/partitioning/ep-dialogs.rb:607
 msgid ""
 "You chose to create the crypt file, but did not specify\n"
 "that it should be formatted. This does not make sense.\n"
@@ -2836,17 +2843,17 @@
 "Kryss av for formatering også.\n"
 
 #. error popup
-#: src/include/partitioning/ep-dialogs.rb:585
+#: src/include/partitioning/ep-dialogs.rb:623
 msgid "Crypt files require a mount point."
 msgstr "Krypteringsfiler må ha et monteringspunkt."
 
 #. error popup
-#: src/include/partitioning/ep-dialogs.rb:599
+#: src/include/partitioning/ep-dialogs.rb:637
 msgid "Tmpfs requires a mount point."
 msgstr "Tmpfs må ha et monteringspunkt."
 
 #. helptext
-#: src/include/partitioning/ep-dialogs.rb:683
+#: src/include/partitioning/ep-dialogs.rb:721
 msgid ""
 "<p>\n"
 "Keep in mind that this file system is only protected when it is not\n"
@@ -2861,7 +2868,7 @@
 "</p>"
 
 #. helptext
-#: src/include/partitioning/ep-dialogs.rb:696
+#: src/include/partitioning/ep-dialogs.rb:734
 msgid ""
 "<p>\n"
 "The file system used for this volume is swap. You can leave the encryption \n"
@@ -2875,21 +2882,21 @@
 "(diskdvale).\n"
 "</p>\n"
 
-#: src/include/partitioning/ep-dialogs.rb:766
+#: src/include/partitioning/ep-dialogs.rb:804
 msgid "All data stored on the volume will be lost!"
 msgstr "Alle data som er lagret på volumet, vil gåt tapt!"
 
-#: src/include/partitioning/ep-dialogs.rb:789
+#: src/include/partitioning/ep-dialogs.rb:827
 msgid "Password"
 msgstr "Passord"
 
 #. popup text
-#: src/include/partitioning/ep-dialogs.rb:886
+#: src/include/partitioning/ep-dialogs.rb:924
 msgid "Resize not supported by underlying device."
 msgstr "Enheten støtter ikke endring av størrelse."
 
 #. popup text
-#: src/include/partitioning/ep-dialogs.rb:891
+#: src/include/partitioning/ep-dialogs.rb:929
 msgid ""
 "\n"
 "You cannot resize the selected partition because the file system\n"
@@ -2899,7 +2906,7 @@
 "Du kan ikke endre størrelse på den valgte partisjonen fordi filsystemet\n"
 "på denne partisjonen ikke støtter endring av størrelse.\n"
 
-#: src/include/partitioning/ep-dialogs.rb:915
+#: src/include/partitioning/ep-dialogs.rb:953
 msgid ""
 "It is not possible to check whether a NTFS\n"
 "can be resized while it is mounted."
@@ -2908,7 +2915,7 @@
 "-størrelsen mens filsystemet er montert."
 
 #. FIXME: Really?
-#: src/include/partitioning/ep-dialogs.rb:934
+#: src/include/partitioning/ep-dialogs.rb:972
 msgid ""
 "Partition %1 cannot be resized\n"
 "because the filesystem seems to be inconsistent.\n"
@@ -2917,21 +2924,21 @@
 "fordi filsystemet ser ut til å være inkonsistent.\n"
 
 #. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:961
+#: src/include/partitioning/ep-dialogs.rb:999
 msgid "Resize Partition %1"
 msgstr "Endre størrelse på partisjon %1"
 
 #. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:982
+#: src/include/partitioning/ep-dialogs.rb:1020
 msgid "Resize Logical Volume %1"
 msgstr "Endre størrelse på logisk volum %1"
 
 #. size_k + min_size_k could be > max_size_k
-#: src/include/partitioning/ep-dialogs.rb:1014
+#: src/include/partitioning/ep-dialogs.rb:1052
 msgid "Current size: %1"
 msgstr "Gjeldende størrelse: %1"
 
-#: src/include/partitioning/ep-dialogs.rb:1026
+#: src/include/partitioning/ep-dialogs.rb:1064
 msgid "Currently used: %1"
 msgstr "Brukt størrelse: %1"
 
@@ -2939,8 +2946,8 @@
 #. input field label
 #. combo box label
 #. Column header
-#: src/include/partitioning/ep-dialogs.rb:1039
-#: src/include/partitioning/ep-dialogs.rb:1076
+#: src/include/partitioning/ep-dialogs.rb:1077
+#: src/include/partitioning/ep-dialogs.rb:1114
 #: src/include/partitioning/ep-hd-dialogs.rb:256
 #: src/include/partitioning/ep-loop-dialogs.rb:118
 #: src/include/partitioning/ep-lvm-dialogs.rb:559
@@ -2952,33 +2959,33 @@
 
 #. radio button text, %1 is replaced by size
 #. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1049
+#: src/include/partitioning/ep-dialogs.rb:1087
 #: src/include/partitioning/ep-hd-dialogs.rb:242
 #: src/include/partitioning/ep-lvm-dialogs.rb:535
 msgid "Maximum Size (%1)"
 msgstr "Maksimal størrelse (%1)"
 
 #. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1059
+#: src/include/partitioning/ep-dialogs.rb:1097
 msgid "Minimum Size (%1)"
 msgstr "Minimum størrelse (%1)"
 
 #. radio button text
 #. radio button text
-#: src/include/partitioning/ep-dialogs.rb:1068
+#: src/include/partitioning/ep-dialogs.rb:1106
 #: src/include/partitioning/ep-hd-dialogs.rb:251
 #: src/include/partitioning/ep-lvm-dialogs.rb:568
 msgid "Custom Size"
 msgstr "Egendefinert størrelse"
 
 #. help text
-#: src/include/partitioning/ep-dialogs.rb:1102
+#: src/include/partitioning/ep-dialogs.rb:1140
 msgid "<p>Choose new size.</p>"
 msgstr "<p>Velg en ny størrelse.</p>"
 
 #. error popup, %1 and %2 are replaced by sizes
 #. error popup, %1 and %2 are replaced by sizes
-#: src/include/partitioning/ep-dialogs.rb:1153
+#: src/include/partitioning/ep-dialogs.rb:1191
 #: 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."
@@ -2988,7 +2995,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:1196
+#: src/include/partitioning/ep-dialogs.rb:1234
 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"
@@ -3001,12 +3008,12 @@
 "endre størrelsen."
 
 #. label for log view
-#: src/include/partitioning/ep-dialogs.rb:1272
+#: src/include/partitioning/ep-dialogs.rb:1310
 msgid "Output of %1"
 msgstr "Resultat fra %1"
 
 #. popup text
-#: src/include/partitioning/ep-dialogs.rb:1299
+#: src/include/partitioning/ep-dialogs.rb:1337
 msgid "Rescanning disks..."
 msgstr "Skanner disker på nytt..."
 
@@ -3198,50 +3205,50 @@
 msgstr "Det angitte området er ugyldig."
 
 #. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:548
+#: src/include/partitioning/ep-hd-dialogs.rb:549
 msgid "Add Partition on %1"
 msgstr "Legg til partisjon på %1"
 
 #. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:594
+#: src/include/partitioning/ep-hd-dialogs.rb:595
 msgid "Edit Partition %1"
 msgstr "Rediger partisjonen %1"
 
 #. error popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:627
+#: src/include/partitioning/ep-hd-dialogs.rb:628
 msgid "No space to moved partition %1."
 msgstr "Ingen ledig plass på den flyttede partisjonen %1."
 
 #. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:637
+#: src/include/partitioning/ep-hd-dialogs.rb:638
 msgid "Move partition %1 forward?"
 msgstr "Vil du flytte partisjonen %1 forover?"
 
 #. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:646
+#: src/include/partitioning/ep-hd-dialogs.rb:647
 msgid "Move partition %1 backward?"
 msgstr "Vil du flytte partisjonen %1 bakover?"
 
 #. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:665
+#: src/include/partitioning/ep-hd-dialogs.rb:666
 msgid "Move partition %1?"
 msgstr "Vil du flytte partisjonen %1?"
 
 #. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:667
+#: src/include/partitioning/ep-hd-dialogs.rb:668
 msgid "Forward"
 msgstr "Forover"
 
 #. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:669
+#: src/include/partitioning/ep-hd-dialogs.rb:670
 msgid "Backward"
 msgstr "Bakover"
 
-#: src/include/partitioning/ep-hd-dialogs.rb:725
+#: src/include/partitioning/ep-hd-dialogs.rb:726
 msgid "Confirm Deleting of All Partitions"
 msgstr "Bekreft sletting av alle partisjoner"
 
-#: src/include/partitioning/ep-hd-dialogs.rb:727
+#: src/include/partitioning/ep-hd-dialogs.rb:728
 msgid ""
 "The disk \"%1\" contains at least one partition.\n"
 "If you proceed, the following partitions will be deleted:"
@@ -3249,30 +3256,35 @@
 "Disken «%1» inneholder minst én partisjon.\n"
 "Hvis du fortsetter, vil følgende partisjoner bli slettet:"
 
-#: src/include/partitioning/ep-hd-dialogs.rb:732
+#: src/include/partitioning/ep-hd-dialogs.rb:733
 msgid "Really delete all partitions on \"%1\"?"
 msgstr "Vil du virkelig slette alle partisjoner på «%1»?"
 
 #. error popup
 #. error popup
 #: src/include/partitioning/ep-hd-lib.rb:42
-#: src/include/partitioning/ep-hd-lib.rb:245
+#: src/include/partitioning/ep-hd-lib.rb:251
 msgid "No hard disk selected."
 msgstr "Ingen harddisk valgt."
 
 #. error popup
+#: src/include/partitioning/ep-hd-lib.rb:51
+msgid "Cannot create partition table on LDL formatted DASD."
+msgstr ""
+
+#. error popup
 #. TRANSLATORS: error popup
-#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5240
+#: src/include/partitioning/ep-hd-lib.rb:57 src/modules/Storage.rb:5250
 msgid "The disk is in use and cannot be modified."
 msgstr "Disken er i bruk, og kan ikke endres."
 
 #. dialog heading
-#: src/include/partitioning/ep-hd-lib.rb:86
+#: src/include/partitioning/ep-hd-lib.rb:92
 msgid "Select new partition table type for %1."
 msgstr "Velg ny partisjonstabelltype for %1."
 
 #. popup text, %1 is be replaced by disk name e.g. /dev/sda
-#: src/include/partitioning/ep-hd-lib.rb:111
+#: src/include/partitioning/ep-hd-lib.rb:117
 msgid ""
 "Really create new partition table on %1? This will delete all data\n"
 "on %1 and all RAIDs and Volume Groups using partitions on %1."
@@ -3281,29 +3293,29 @@
 "på %1, og alle RAID-enheter og volumgrupper som bruker partisjoner på %1."
 
 #. error popup
-#: src/include/partitioning/ep-hd-lib.rb:131
+#: src/include/partitioning/ep-hd-lib.rb:137
 msgid "No disk selected."
 msgstr "Ingen disk valgt."
 
 #. popup text
 #. Must be called before removing device.
-#: src/include/partitioning/ep-hd-lib.rb:145
-#: src/include/partitioning/ep-lib.rb:199
+#: src/include/partitioning/ep-hd-lib.rb:151
+#: src/include/partitioning/ep-lib.rb:202
 msgid "Really delete BIOS RAID %1?"
 msgstr "Vil du virkelig slette BIOS RAID %1?"
 
 #. popup text
-#: src/include/partitioning/ep-hd-lib.rb:159
+#: src/include/partitioning/ep-hd-lib.rb:165
 msgid "Really delete Partitioned RAID %1?"
 msgstr "Er du sikker på at du vil slette partisjonert RAID %1?"
 
 #. error ppup
-#: src/include/partitioning/ep-hd-lib.rb:176
+#: src/include/partitioning/ep-hd-lib.rb:182
 msgid "There are no partitions to delete on this disk."
 msgstr "Denne disken inneholder ingen partisjoner som kan slettes."
 
 #. error popup
-#: src/include/partitioning/ep-hd-lib.rb:229
+#: src/include/partitioning/ep-hd-lib.rb:235
 msgid "It is not possible to create a partition on %1."
 msgstr "Det er ikke mulig å opprette en partisjon på %1."
 
@@ -3311,15 +3323,15 @@
 #. error popup
 #. error popup
 #. error popup
-#: src/include/partitioning/ep-hd-lib.rb:321
-#: src/include/partitioning/ep-hd-lib.rb:370
-#: src/include/partitioning/ep-hd-lib.rb:426
-#: src/include/partitioning/ep-hd-lib.rb:483
+#: src/include/partitioning/ep-hd-lib.rb:327
+#: src/include/partitioning/ep-hd-lib.rb:376
+#: src/include/partitioning/ep-hd-lib.rb:432
+#: src/include/partitioning/ep-hd-lib.rb:489
 msgid "No partition selected."
 msgstr "Ingen partisjon er valgt."
 
 #. error popup, %1 is replace by partition device name e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:334
+#: src/include/partitioning/ep-hd-lib.rb:340
 msgid ""
 "The partition %1 is in use. It cannot be\n"
 "edited. To edit %1, make sure it is not used."
@@ -3328,12 +3340,12 @@
 "redigeres. For å redigere den %1, sørg for at den ikke er i bruk."
 
 #. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:345
+#: src/include/partitioning/ep-hd-lib.rb:351
 msgid "An extended partition cannot be edited."
 msgstr "En utvidet partisjon kan ikke redigeres."
 
 #. error popup, %1 is replace by partition device name, e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:387
+#: src/include/partitioning/ep-hd-lib.rb:393
 msgid ""
 "The partition %1 is already created on disk\n"
 "and cannot be moved."
@@ -3342,12 +3354,12 @@
 "og kan ikke flyttes."
 
 #. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:398
+#: src/include/partitioning/ep-hd-lib.rb:404
 msgid "An extended partition cannot be moved."
 msgstr "En utvidet partisjon kan ikke flyttes."
 
 #. error popup, %1 is replace by partition device name, e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:443
+#: src/include/partitioning/ep-hd-lib.rb:449
 msgid ""
 "The partition %1 is in use. It cannot be\n"
 "resized. To resize %1, make sure it is not used."
@@ -3356,12 +3368,12 @@
 "endres. For å endre størrelse på %1, sørg for at den ikke er i bruk."
 
 #. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:454
+#: src/include/partitioning/ep-hd-lib.rb:460
 msgid "An extended partition cannot be resized."
 msgstr "Du kan ikke endre størrelsen på en utvidet partisjon."
 
 #. helptext
-#: src/include/partitioning/ep-hd-lib.rb:527
+#: src/include/partitioning/ep-hd-lib.rb:533
 msgid ""
 "<p>Select one or more (if available) hard disks\n"
 "that will have the same partition layout as\n"
@@ -3377,7 +3389,7 @@
 "flere partisjoner. Etter kloning vil disse\n"
 "partisjonene bli slettet.</p>\n"
 
-#: src/include/partitioning/ep-hd-lib.rb:573
+#: src/include/partitioning/ep-hd-lib.rb:579
 msgid ""
 "The following partitions will be deleted\n"
 "and all data on them will be lost:"
@@ -3385,11 +3397,11 @@
 "Følgende partisjoner vil bli slettet\n"
 "og alle data på dem vil gå tapt:"
 
-#: src/include/partitioning/ep-hd-lib.rb:580
+#: src/include/partitioning/ep-hd-lib.rb:586
 msgid "Really delete these partitions?"
 msgstr "Er du sikker på at du vil slette disse partisjonene?"
 
-#: src/include/partitioning/ep-hd-lib.rb:596
+#: src/include/partitioning/ep-hd-lib.rb:602
 msgid ""
 "There are no partitions on this disk, but a clonable\n"
 "disk must have at least one partition.\n"
@@ -3399,7 +3411,7 @@
 "disk må ha minst én partisjon).\n"
 "Opprett noen partisjoner før du kloner disken.\n"
 
-#: src/include/partitioning/ep-hd-lib.rb:609
+#: src/include/partitioning/ep-hd-lib.rb:615
 msgid ""
 "This disk cannot be cloned. There are no suitable\n"
 "disks that could have the same partitioning layout."
@@ -3407,20 +3419,20 @@
 "Denne disken kan ikke klones. Det finnes ingen egnede\n"
 "disker som kan ha samme partisjonsoppsett."
 
-#: src/include/partitioning/ep-hd-lib.rb:638
+#: src/include/partitioning/ep-hd-lib.rb:644
 msgid "Clone partition layout of %1"
 msgstr "Klon partisjonsoppsettet for %1"
 
-#: src/include/partitioning/ep-hd-lib.rb:642
+#: src/include/partitioning/ep-hd-lib.rb:648
 msgid "Available target disks:"
 msgstr "Tilgjengelige måldisker:"
 
-#: src/include/partitioning/ep-hd-lib.rb:670
+#: src/include/partitioning/ep-hd-lib.rb:676
 msgid "Select a target disk for creating a clone"
 msgstr "Velg en måldisk for å opprette en klone."
 
 #. popup text, %1 is replaced by a dasd name e.g. /dev/dasda
-#: src/include/partitioning/ep-hd-lib.rb:751
+#: src/include/partitioning/ep-hd-lib.rb:757
 msgid ""
 "Running dasdfmt deletes all data on the disk.\n"
 "Really execute dasdfmt on disk %1?\n"
@@ -3429,7 +3441,7 @@
 "Vil du virkelig kjøre dasdfmt for disken %1?\n"
 
 #. popup text
-#: src/include/partitioning/ep-hd-lib.rb:762
+#: src/include/partitioning/ep-hd-lib.rb:768
 msgid ""
 "The disk is no longer marked for dasdfmt.\n"
 "\n"
@@ -3473,8 +3485,7 @@
 msgstr "Flytt"
 
 #: src/include/partitioning/ep-hd.rb:63 src/include/partitioning/ep-lvm.rb:43
-#: src/include/partitioning/ep-lvm.rb:65
-#: src/include/partitioning/ep-raid.rb:39
+#: src/include/partitioning/ep-lvm.rb:65 src/include/partitioning/ep-raid.rb:39
 msgid "Resize"
 msgstr "Endre størrelse"
 
@@ -3573,8 +3584,7 @@
 
 #. push button text
 #. push button text
-#: src/include/partitioning/ep-hd.rb:496
-#: src/include/partitioning/ep-lvm.rb:213
+#: src/include/partitioning/ep-hd.rb:496 src/include/partitioning/ep-lvm.rb:213
 #: src/include/partitioning/ep-lvm.rb:337
 #: src/include/partitioning/ep-tmpfs.rb:110
 msgid "Add..."
@@ -3691,11 +3701,11 @@
 msgstr "Ugyldig passord ble gitt."
 
 #. Must be called before removing device.
-#: src/include/partitioning/ep-lib.rb:107
+#: src/include/partitioning/ep-lib.rb:110
 msgid "Confirm Deleting Partition Used by LVM"
 msgstr "Bekreft sletting av partisjon som brukes av LVM"
 
-#: src/include/partitioning/ep-lib.rb:109
+#: src/include/partitioning/ep-lib.rb:112
 msgid ""
 "The selected partition is used by volume group \"%1\".\n"
 "To keep the system in a consistent state, the following volume group\n"
@@ -3705,15 +3715,15 @@
 "For at systemet skal være konsistent vil følgende volumgruppe\n"
 "med tilhørende logiske volumer bli slettet:\n"
 
-#: src/include/partitioning/ep-lib.rb:117
+#: src/include/partitioning/ep-lib.rb:120
 msgid "Delete partition \"%1\" and volume group \"%2\" now?"
 msgstr "Vil du slette partisjonen «%1» og volumgruppen «%2» nå?"
 
-#: src/include/partitioning/ep-lib.rb:127
+#: src/include/partitioning/ep-lib.rb:130
 msgid "Confirm Deleting Partition Used by RAID"
 msgstr "Bekreft sletting av partisjonen som brukes av RAID"
 
-#: src/include/partitioning/ep-lib.rb:129
+#: src/include/partitioning/ep-lib.rb:132
 msgid ""
 "The selected partition belongs to RAID  \"%1\".\n"
 "To keep the system in a consistent state, the following\n"
@@ -3723,24 +3733,24 @@
 "For at systemet skal være konsistent, vil følgende\n"
 "RAID-enhet bli slettet:\n"
 
-#: src/include/partitioning/ep-lib.rb:137
+#: src/include/partitioning/ep-lib.rb:140
 msgid "Delete partition \"%1\" and RAID \"%2\" now?"
 msgstr "Vil du slette partisjonen «%1» og RAID «%2» nå?"
 
 #. YesNo popup text %1 is replaced by a disk name e.g. /dev/hda
-#: src/include/partitioning/ep-lib.rb:207
+#: src/include/partitioning/ep-lib.rb:210
 msgid "Really delete all partitions on %1?"
 msgstr "Er du sikker på at du vil slette alle partisjonene på %1?"
 
 #. ///////////////////////////////////////////////////
 #. now delete partition!!
 #. YesNo popup text, %1 is replaced by a device name e.g. /dev/hda1
-#: src/include/partitioning/ep-lib.rb:259
+#: src/include/partitioning/ep-lib.rb:262
 msgid "Really delete %1?"
 msgstr "Vil du virkelig slette %1?"
 
 #. YesNo popup.  %1 is path to a file
-#: src/include/partitioning/ep-lib.rb:273
+#: src/include/partitioning/ep-lib.rb:276
 msgid ""
 "\n"
 "Should the loop file %1 also be removed?\n"
@@ -3750,7 +3760,7 @@
 
 #. Guarantee some minimal share (1%) of total graph width to the segment.
 #. Prevents small partitions e.g. swaps from disappearing completely.
-#: src/include/partitioning/ep-lib.rb:340
+#: src/include/partitioning/ep-lib.rb:358
 msgid "Unpartitioned"
 msgstr "Ikke partisjonert"
 
@@ -3758,33 +3768,33 @@
 #. or the end of the disk if
 #. 1. end +1th cyl is not the next one
 #. 2. end cyl is not the same as the next one (yeah, partitions may share a cylinder)
-#: src/include/partitioning/ep-lib.rb:443
+#: src/include/partitioning/ep-lib.rb:461
 msgid "Unallocated"
 msgstr "Ikke tilordnet"
 
-#: src/include/partitioning/ep-lib.rb:482
+#: src/include/partitioning/ep-lib.rb:500
 msgid "<p>No changes to partitioning.</p>"
 msgstr "<p>Ingen endringer i partisjoneringen.</p>"
 
-#: src/include/partitioning/ep-lib.rb:484
+#: src/include/partitioning/ep-lib.rb:502
 msgid "<p>Changes to partitioning:</p>"
 msgstr "<p>Endringer i partisjoneringen:</p>"
 
-#: src/include/partitioning/ep-lib.rb:487
+#: src/include/partitioning/ep-lib.rb:505
 msgid "<p>No changes to storage settings.</p>"
 msgstr "<p>Ingen endringer i lagringsinnstillingene.</p>"
 
-#: src/include/partitioning/ep-lib.rb:489
+#: src/include/partitioning/ep-lib.rb:507
 msgid "<p>Storage settings:</p>"
 msgstr "<p>Lagringsinnstillinger:</p>"
 
-#: src/include/partitioning/ep-lib.rb:498
+#: src/include/partitioning/ep-lib.rb:516
 #, fuzzy
 #| msgid "<p>Storage settings:</p>"
 msgid "<p>Packages to install:</p>"
 msgstr "<p>Lagringsinnstillinger:</p>"
 
-#: src/include/partitioning/ep-lib.rb:500
+#: src/include/partitioning/ep-lib.rb:518
 #, fuzzy
 #| msgid "<p>No changes to storage settings.</p>"
 msgid "<p>No packages need to be installed.</p>"
@@ -3904,12 +3914,12 @@
 "å opprette en fil."
 
 #. dialog title
-#: src/include/partitioning/ep-loop-dialogs.rb:281
+#: src/include/partitioning/ep-loop-dialogs.rb:282
 msgid "Add Crypt File"
 msgstr "Legg til krypteringsfil"
 
 #. dialog title
-#: src/include/partitioning/ep-loop-dialogs.rb:325
+#: src/include/partitioning/ep-loop-dialogs.rb:326
 msgid "Edit Crypt File %1"
 msgstr "Rediger krypteringsfilen %1"
 
@@ -4237,12 +4247,12 @@
 msgstr "Brukt pool"
 
 #. dialog title, %1 is a volume group
-#: src/include/partitioning/ep-lvm-dialogs.rb:1028
+#: src/include/partitioning/ep-lvm-dialogs.rb:1029
 msgid "Add Logical Volume on %1"
 msgstr "Legg til logisk volum på %1"
 
 #. dialog title - %1 is a logical volume name, %2 is a volume group
-#: src/include/partitioning/ep-lvm-dialogs.rb:1075
+#: src/include/partitioning/ep-lvm-dialogs.rb:1076
 msgid "Edit Logical Volume %1 on %2"
 msgstr "Rediger det logiske volumet %1 på %2"
 
@@ -4280,9 +4290,9 @@
 #. error popup
 #. error popup
 #: src/include/partitioning/ep-lvm-lib.rb:214
-#: src/include/partitioning/ep-lvm-lib.rb:315
-#: src/include/partitioning/ep-lvm-lib.rb:367
-#: src/include/partitioning/ep-lvm-lib.rb:402
+#: src/include/partitioning/ep-lvm-lib.rb:316
+#: src/include/partitioning/ep-lvm-lib.rb:368
+#: src/include/partitioning/ep-lvm-lib.rb:403
 msgid "No logical volume selected."
 msgstr "Ingen logiske volumer er valgt."
 
@@ -4292,7 +4302,7 @@
 msgstr "Det er ingen ledig plass i volumgruppen \"%1\"."
 
 #. error popup, %1 is replace by partition device name e.g. /dev/system/root
-#: src/include/partitioning/ep-lvm-lib.rb:326
+#: src/include/partitioning/ep-lvm-lib.rb:327
 msgid ""
 "The volume %1 is a thin pool.\n"
 "It cannot be edited."
@@ -4301,7 +4311,7 @@
 "Det kan ikke redigeres."
 
 #. error popup, %1 is replace by partition device name e.g. /dev/system/root
-#: src/include/partitioning/ep-lvm-lib.rb:337
+#: src/include/partitioning/ep-lvm-lib.rb:338
 msgid ""
 "The volume %1 is in use. It cannot be\n"
 "edited. To edit %1, make sure it is not used."
@@ -4680,17 +4690,17 @@
 msgstr "<p>Endre enhetene som brukes for RAID.</p>"
 
 #. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:642
+#: src/include/partitioning/ep-raid-dialogs.rb:643
 msgid "Add RAID %1"
 msgstr "Legg til RAID %1"
 
 #. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:676
+#: src/include/partitioning/ep-raid-dialogs.rb:677
 msgid "Resize RAID %1"
 msgstr "Endre størrelse på RAID %1"
 
 #. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:722
+#: src/include/partitioning/ep-raid-dialogs.rb:723
 msgid "Edit RAID %1"
 msgstr "Rediger RAID %1"
 
@@ -4989,7 +4999,7 @@
 msgstr "<p>Dette er et installasjonssammendrag.</p>"
 
 #. dialog title
-#: src/include/partitioning/ep-tmpfs-dialogs.rb:49
+#: src/include/partitioning/ep-tmpfs-dialogs.rb:50
 msgid "Add tmpfs Mount"
 msgstr "Legg til tmpfs-monteringspunkt"
 
@@ -5846,19 +5856,63 @@
 "du vet hva du gjør.</p>\n"
 
 #. this version makes some problems with interpreter, above lookup/add is OK
-#: src/modules/Partitions.rb:930
-msgid "Operation not permitted on disk %1.\n"
+#: src/modules/Partitions.rb:937
+#, fuzzy
+#| msgid "Operation not permitted on disk %1.\n"
+msgid "Operation not permitted on disk %{device}.\n"
 msgstr "Hanlingen er ikke tillatt for disken %1.\n"
 
-#. popup text %1 is replaced by disk name e.g. /dev/hda
-#: src/modules/Partitions.rb:940
+#. popup text %{device} is replaced by disk name e.g. /dev/hda
+#: src/modules/Partitions.rb:942
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "The partitioning on your disk %1 is either not readable or not \n"
+#| "supported by the partitioning tool parted used to change the\n"
+#| "partition table.\n"
+#| "\n"
+#| "You can use the partitions on disk %1 as they are or\n"
+#| "format them and assign mount points, but you cannot add, edit, \n"
+#| "resize, or remove partitions from that disk here.\n"
 msgid ""
 "\n"
-"The partitioning on your disk %1 is either not readable or not \n"
+"It's not supported by the partitioning tool parted to change\n"
+"the partition table on your disk %{device}\n"
+"(the disk is LDL formatted).\n"
+"\n"
+"You can use the partitions on disk %{device} as they are or\n"
+"format them and assign mount points, but you cannot add,\n"
+"resize, or remove partitions from that disk here.\n"
+msgstr ""
+"\n"
+"Partisjoneringen på disken %1 kan enten ikke leses av\n"
+"partisjoneringsverktøyet parted, som benyttes for å endre\n"
+"partisjonstabellen eller støttes ikke av dette verktøyet.\n"
+"\n"
+"Du kan bruke partisjonene på disken %1 som de er eller\n"
+"formatere dem og tilordne monteringspunkter til dem, men du\n"
+"kan ikke legge til, redigere, endre størrelser eller slette partisjoner fra denne\n"
+"disken her.\n"
+
+#. popup text %{device} is replaced by disk name e.g. /dev/hda
+#: src/modules/Partitions.rb:954
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "The partitioning on your disk %1 is either not readable or not \n"
+#| "supported by the partitioning tool parted used to change the\n"
+#| "partition table.\n"
+#| "\n"
+#| "You can use the partitions on disk %1 as they are or\n"
+#| "format them and assign mount points, but you cannot add, edit, \n"
+#| "resize, or remove partitions from that disk here.\n"
+msgid ""
+"\n"
+"The partitioning on your disk %{device} is either not readable or not \n"
 "supported by the partitioning tool parted used to change the\n"
 "partition table.\n"
 "\n"
-"You can use the partitions on disk %1 as they are or\n"
+"You can use the partitions on disk %{device} as they are or\n"
 "format them and assign mount points, but you cannot add, edit, \n"
 "resize, or remove partitions from that disk here.\n"
 msgstr ""
@@ -5872,15 +5926,25 @@
 "kan ikke legge til, redigere, endre størrelser eller slette partisjoner fra denne\n"
 "disken her.\n"
 
-#. popup text %1 is replaced by disk name e.g. /dev/dasda
-#: src/modules/Partitions.rb:958
+#. popup text %{device} is replaced by disk name e.g. /dev/dasda
+#: src/modules/Partitions.rb:966
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "The disk %1 does not contain a partition table but for\n"
+#| "compatibility the kernel has automatically generated a\n"
+#| "partition spanning almost the entire disk.\n"
+#| "\n"
+#| "You can use the partition on disk %1 as it is or\n"
+#| "format it and assign a mount point, but you cannot resize\n"
+#| "or remove the partition from that disk here.\n"
 msgid ""
 "\n"
-"The disk %1 does not contain a partition table but for\n"
+"The disk %{device} does not contain a partition table but for\n"
 "compatibility the kernel has automatically generated a\n"
 "partition spanning almost the entire disk.\n"
 "\n"
-"You can use the partition on disk %1 as it is or\n"
+"You can use the partition on disk %{device} as it is or\n"
 "format it and assign a mount point, but you cannot resize\n"
 "or remove the partition from that disk here.\n"
 msgstr ""
@@ -5894,7 +5958,7 @@
 "eller slette partisjonen fra den disken her.\n"
 
 #. popup text
-#: src/modules/Partitions.rb:977
+#: src/modules/Partitions.rb:982
 msgid ""
 "\n"
 "\n"
@@ -5909,7 +5973,7 @@
 "disken.\n"
 
 #. popup text
-#: src/modules/Partitions.rb:989
+#: src/modules/Partitions.rb:992
 msgid ""
 "\n"
 "\n"
@@ -5927,7 +5991,7 @@
 #. @param integer testsize
 #. @param [Symbol] used_fs
 #. @param [Boolean] verbose
-#: src/modules/Storage.rb:992
+#: src/modules/Storage.rb:993
 msgid "Resize Not Possible:"
 msgstr "Størrelsen kunne ikke endres:"
 
@@ -5940,7 +6004,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:2692 src/modules/Storage.rb:3915
+#: src/modules/Storage.rb:2696 src/modules/Storage.rb:3919
 msgid ""
 "Could not set encryption.\n"
 "System error code is %1.\n"
@@ -5953,7 +6017,7 @@
 "Et ugyldig krypteringspassord er kanskje angitt.\n"
 
 #. popup text
-#: src/modules/Storage.rb:3946
+#: src/modules/Storage.rb:3950
 msgid ""
 "The first and the second version\n"
 "of the password do not match.\n"
@@ -5964,7 +6028,7 @@
 "Prøv igjen."
 
 #. popup text
-#: src/modules/Storage.rb:3977
+#: src/modules/Storage.rb:3981
 msgid ""
 "The password may only contain the following characters:\n"
 "0..9, a..z, A..Z, and any of \"@#* ,.;:._-+=!$%&/|?{[()]}^\\<>\".\n"
@@ -5976,24 +6040,24 @@
 
 #. Label: get password for encrypted volume
 #. Please use newline if label is longer than 40 characters
-#: src/modules/Storage.rb:4031
+#: src/modules/Storage.rb:4035
 msgid "&Enter Encryption Password:"
 msgstr "Angi krypt&eringspassord"
 
 #. Clear password fields on every round.
-#: src/modules/Storage.rb:4090
+#: src/modules/Storage.rb:4094
 msgid "Provide Password"
 msgstr "Angi et passord"
 
-#: src/modules/Storage.rb:4109
+#: src/modules/Storage.rb:4113
 msgid "The following encrypted volumes are already available."
 msgstr "Følgende krypterte volumer er allerede tilgjengelige."
 
-#: src/modules/Storage.rb:4124
+#: src/modules/Storage.rb:4128
 msgid "Encrypted Volume Activation"
 msgstr "Aktivering av krypterte volumer"
 
-#: src/modules/Storage.rb:4128
+#: src/modules/Storage.rb:4132
 msgid ""
 "The following volumes contain an encryption signature but the \n"
 "passwords are not yet known.\n"
@@ -6005,12 +6069,12 @@
 "Passordene må være kjent hvis det er behov for volumene, enten \n"
 "under en oppdatering eller hvis de inneholder et fysisk kryptert LVM-volum."
 
-#: src/modules/Storage.rb:4140
+#: src/modules/Storage.rb:4144
 msgid "Do you want to provide encryption passwords?"
 msgstr "Vil du ang krypteringspassord?"
 
 #. text in help field
-#: src/modules/Storage.rb:4197
+#: src/modules/Storage.rb:4201
 msgid ""
 "Enter encryption password for any of the\n"
 "devices in the locked devices list.\n"
@@ -6021,65 +6085,65 @@
 "Passordet vil bli forsøkt for alle enhetene."
 
 #. header text
-#: src/modules/Storage.rb:4203
+#: src/modules/Storage.rb:4207
 msgid "Enter Encryption Password"
 msgstr "Angi krypteringspassord"
 
-#: src/modules/Storage.rb:4206
+#: src/modules/Storage.rb:4210
 msgid "There are no encrypted volume to unlock."
 msgstr "Det finnes ingen krypterte volumer å låse opp."
 
 #. label text, multiple device names follow
-#: src/modules/Storage.rb:4219
+#: src/modules/Storage.rb:4223
 msgid "Provide password for any of the following devices:"
 msgstr "Angi passordet for en av følgende enheter:"
 
 #. label text, one device name follows
-#: src/modules/Storage.rb:4222
+#: src/modules/Storage.rb:4226
 msgid "Provide password for the following device:"
 msgstr "Angi passordet for følgende enhet:"
 
-#: src/modules/Storage.rb:4235
+#: src/modules/Storage.rb:4239
 msgid "Trying to unlock encrypted volumes..."
 msgstr "Forsøker å låse opp krypterte volumer..."
 
-#: src/modules/Storage.rb:4259
+#: src/modules/Storage.rb:4263
 msgid "Password did not unlock any volume."
 msgstr "Passordet låste ikke opp noe volum."
 
-#: src/modules/Storage.rb:4345
+#: src/modules/Storage.rb:4349
 msgid "IDE Disk"
 msgstr "IDE-disk"
 
-#: src/modules/Storage.rb:4351
+#: src/modules/Storage.rb:4355
 msgid "SCSI Disk"
 msgstr "SCSI-disk"
 
-#: src/modules/Storage.rb:4357
+#: src/modules/Storage.rb:4361
 msgid "Disk"
 msgstr "Disk"
 
-#: src/modules/Storage.rb:4385
+#: src/modules/Storage.rb:4389
 msgid "DM RAID"
 msgstr "DM RAID"
 
-#: src/modules/Storage.rb:4398
+#: src/modules/Storage.rb:4402
 msgid "MD RAID"
 msgstr "MD RAID"
 
 #. TODO: more informative error message, but the Package module does
 #. not provide anything
 #. TRANSLATORS: error popup
-#: src/modules/Storage.rb:4893
+#: src/modules/Storage.rb:4897
 msgid "Installing required packages failed."
 msgstr "Installasjon av nødvendige pakker mislyktes."
 
-#: src/modules/Storage.rb:4894 src/modules/StorageClients.rb:159
+#: src/modules/Storage.rb:4898 src/modules/StorageClients.rb:159
 msgid "Continue despite the error?"
 msgstr "Vil du fortsette til tross for feilen?"
 
 #. TRANSLATORS: error popup
-#: src/modules/Storage.rb:5252
+#: src/modules/Storage.rb:5262
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -6091,7 +6155,7 @@
 "Partisjonen %1 kan ikke fjernes fordi andre partisjoner på\n"
 "disken %2 er i bruk.\n"
 
-#: src/modules/Storage.rb:5278
+#: src/modules/Storage.rb:5288
 msgid ""
 "\n"
 "Device %1 cannot be modified because it contains activated swap\n"
@@ -6101,7 +6165,7 @@
 "Enheten %1 kan ikke endres fordi den benyttes som vekselminne,\n"
 "og er nødvendig for å kjøre installasjonen.\n"
 
-#: src/modules/Storage.rb:5292
+#: src/modules/Storage.rb:5302
 msgid ""
 "\n"
 "Device %1 cannot be modified because it contains the installation\n"
@@ -6111,7 +6175,7 @@
 "Enheten %1 kan ikke endres fordi den inneholder installasjonsdata\n"
 "som er nødvendig for installasjonen.\n"
 
-#: src/modules/Storage.rb:5321
+#: src/modules/Storage.rb:5331
 msgid ""
 "\n"
 "Device %1 cannot be removed because it contains activated swap\n"
@@ -6121,7 +6185,7 @@
 "Enheten %1 kan ikke fjernes fordi den benyttes som vekselminne,\n"
 "og er nødvendig for å kjøre installasjonen.\n"
 
-#: src/modules/Storage.rb:5330
+#: src/modules/Storage.rb:5340
 msgid ""
 "\n"
 "Device %1 cannot be removed because it contains the installation\n"
@@ -6131,7 +6195,7 @@
 "Enheten %1 kan ikke fjernes fordi den inneholder installasjonsdata\n"
 "som er nødvendig for installasjonen.\n"
 
-#: src/modules/Storage.rb:5359
+#: src/modules/Storage.rb:5369
 msgid ""
 "\n"
 "Device %1 cannot be removed because this would indirectly change\n"
@@ -6143,7 +6207,7 @@
 "%2, som benyttes som vekselminne, og er nødvendig for å kjøre\n"
 "installasjonen.\n"
 
-#: src/modules/Storage.rb:5370
+#: src/modules/Storage.rb:5380
 msgid ""
 "\n"
 "Device %1 cannot be removed because this would indirectly change\n"
@@ -6155,7 +6219,7 @@
 "installasjonen.\n"
 
 #. the check for verbose is needed for calls from StorageProposal (see bnc#871779)
-#: src/modules/Storage.rb:5392
+#: src/modules/Storage.rb:5402
 msgid ""
 "\n"
 "Partition %1 cannot be removed since other partitions on the\n"
@@ -6166,18 +6230,18 @@
 "disken %2 er i bruk.\n"
 
 #. FIXME: please, add description of the list that is returned by this function.
-#: src/modules/Storage.rb:5481
+#: src/modules/Storage.rb:5491
 msgid "Nothing assigned as root filesystem!"
 msgstr "Det er ikke tilordnet noe rotfilsystem!"
 
-#: src/modules/Storage.rb:5482
+#: src/modules/Storage.rb:5492
 msgid "Installation will most certainly fail fatally!"
 msgstr "Installasjonen vil mislykkes!"
 
 #. 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:6032
+#: src/modules/Storage.rb:6042
 msgid "Adding the following resolvables failed: %1"
 msgstr "Følgende kunn ikke legges til for å løse konflikter: %1"
 
@@ -6827,64 +6891,47 @@
 "Lagringssystemet er låst av programmet \"%1\" (%2).\n"
 "Dette programmet må avsluttes før du kan fortsette."
 
-#. enable snapshots for root volume if desired
+#. bsc#983003
 #. penalty for not having separate /home
-#: src/modules/StorageProposal.rb:4560 src/modules/StorageProposal.rb:5683
+#: src/modules/StorageProposal.rb:4601 src/modules/StorageProposal.rb:5724
 msgid "Resize impossible due to inconsistent file system. Try checking file system under Windows."
 msgstr "Det er ikke mulig å endre størrelse på grunn av inkonistent filsystem. Forsøk å kontrollere filsystemet fra Windows."
 
-#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6179
-#, fuzzy
-#| msgid "Create &LVM Based Proposal"
-msgid "Create &LVM-based Proposal"
-msgstr "Opprett &LVM-basert forslag"
-
-#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6194
-msgid "Encr&ypt Volume Group"
-msgstr "Kr&ypter volumgruppen"
-
 #. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6212
+#: src/modules/StorageProposal.rb:6239
 #, fuzzy
 #| msgid "File system options:"
 msgid "File System for Root Partition"
 msgstr "Alternativer for filsystem:"
 
 #. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6259
+#: src/modules/StorageProposal.rb:6286
 #, fuzzy
 #| msgid "Propose Separate &Home Partition"
 msgid "File System for Home Partition"
 msgstr "Foreslå separat partisjon for &hjemmekatalog"
 
 #. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6277
+#: src/modules/StorageProposal.rb:6304
 msgid "Enlarge &Swap for Suspend"
 msgstr "Utvid &bytt for dvale"
 
-#: src/modules/StorageProposal.rb:6287
+#: src/modules/StorageProposal.rb:6314
 #, fuzzy
 #| msgid "Proposal settings"
 msgid "Proposal Settings"
 msgstr "Forslag til innstillinger"
 
 #. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6302
-#, fuzzy
-#| msgid ""
-#| "<p>\n"
-#| "To create an LVM-based proposal, choose the corresponding button.</p>\n"
+#: src/modules/StorageProposal.rb:6329
 msgid ""
-"<p>To create an LVM-based proposal, choose the corresponding button. The\n"
-"LVM-based proposal can be encrypted.</p>\n"
+"<p>Choose <b>Partition-based Proposal</b> if you don't want to use LVM.\n"
+"Choose <b>LVM-based Proposal</b> for plain LVM and <b>Encrypted LVM-based\n"
+"Proposal</b> if you want your system to be encrypted.</p>"
 msgstr ""
-"<p>\n"
-"For å opprette ett LVM-basert forslag, velg den aktuelle knappen.</p>\n"
 
 #. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6309
+#: src/modules/StorageProposal.rb:6337
 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"
@@ -6893,35 +6940,54 @@
 msgstr ""
 
 #. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6318
+#: src/modules/StorageProposal.rb:6346
 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:6325
+#: src/modules/StorageProposal.rb:6353
 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:6350
+#: src/modules/StorageProposal.rb:6378
 msgid "Enter your password for the proposal encryption."
 msgstr "Angi passordet for det den foreslåtte krypteringen."
 
 #. Label: get password for user root
 #. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6357
+#: src/modules/StorageProposal.rb:6385
 msgid "Password:"
 msgstr "Passord:"
 
 #. Label: get same password again for verification
 #. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6368
+#: src/modules/StorageProposal.rb:6396
 msgid "Reenter the password for verification:"
 msgstr "Gjenta passordet for å bekrefte:"
 
+#. Clear password fields on every round.
+#: src/modules/StorageProposal.rb:6594
+#, fuzzy
+#| msgid "&Partition Based"
+msgid "&Partition-based Proposal"
+msgstr "&Partisjonsbasert"
+
+#: src/modules/StorageProposal.rb:6596
+#, fuzzy
+#| msgid "Create &LVM Based Proposal"
+msgid "&LVM-based Proposal"
+msgstr "Opprett &LVM-basert forslag"
+
+#: src/modules/StorageProposal.rb:6598
+#, fuzzy
+#| msgid "Create &LVM Based Proposal"
+msgid "&Encrypted LVM-based Proposal"
+msgstr "Opprett &LVM-basert forslag"
+
 #. encoding: utf-8
 #. Copyright (c) 2012 Novell, Inc.
 #.
@@ -6965,6 +7031,20 @@
 msgid "Visible Information on Storage Devices:"
 msgstr "Synlig informasjon om lagringsenheter:"
 
+#~ msgid "Encr&ypt Volume Group"
+#~ msgstr "Kr&ypter volumgruppen"
+
+#, fuzzy
+#~| msgid ""
+#~| "<p>\n"
+#~| "To create an LVM-based proposal, choose the corresponding button.</p>\n"
+#~ msgid ""
+#~ "<p>To create an LVM-based proposal, choose the corresponding button. The\n"
+#~ "LVM-based proposal can be encrypted.</p>\n"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "For å opprette ett LVM-basert forslag, velg den aktuelle knappen.</p>\n"
+
 #~ msgid "No unsaved changes exist."
 #~ msgstr "Det finnes ingen ulagrede endringer."
 
@@ -7185,9 +7265,6 @@
 #~ msgid "Default Filesystem:"
 #~ msgstr "Standardfilsystem:"
 
-#~ msgid "&Partition Based"
-#~ msgstr "&Partisjonsbasert"
-
 #~ msgid "&LVM Based"
 #~ msgstr "&LVM-basert"
 

Modified: trunk/yast/nb/po/update.nb.po
===================================================================
--- trunk/yast/nb/po/update.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/update.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: update.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2009-08-14 10:04+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -429,7 +429,7 @@
 msgstr "Ingen av disse filene finnes:%1"
 
 #. continue-cancel popup
-#: src/clients/update_proposal.rb:529
+#: src/clients/update_proposal.rb:548
 msgid ""
 "The installed product is not compatible with the product\n"
 "on the installation media. If you try to update using the\n"
@@ -875,19 +875,19 @@
 #. -----------------------------------------------------------------------
 #. GLOBAL FUNCTIONS
 #. -----------------------------------------------------------------------
-#: src/modules/Update.rb:309
+#: src/modules/Update.rb:306
 msgid "Unknown Product"
 msgstr "Ukjent produkt"
 
 #. 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
+#: src/modules/Update.rb:788
 msgid ""
 "Cannot select these patterns required for installation:\n"
 "%{patterns}"
 msgstr ""
 
-#: src/modules/Update.rb:796
+#: src/modules/Update.rb:793
 #, fuzzy
 #| msgid "Failed to select %1 packages for installation"
 msgid ""

Modified: trunk/yast/nb/po/users.nb.po
===================================================================
--- trunk/yast/nb/po/users.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/users.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: users\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2009-10-01 12:44+0200\n"
 "Last-Translator: Olav Pettershagen \n"
 "Language-Team: Norwegian Bokmål \n"
@@ -134,637 +134,6 @@
 msgid "Do not ask for missing data; return error instead."
 msgstr "Ikke be om manglende informasjon; vis feilmelding i stedet."
 
-#. caption for dialog "User Authentication Method"
-#. dialog caption
-#: src/clients/inst_auth.rb:115 src/clients/inst_user.rb:137
-msgid "User Authentication Method"
-msgstr "Metode for brukerautentisering"
-
-#. help text for dialog "User Authentication Method" 1/3
-#: src/clients/inst_auth.rb:118
-msgid ""
-"<p>\n"
-"<b>Authentication</b><br>\n"
-"Select the authentication method to use for users on your system.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"<b>Autentisering</b><br>\n"
-"Her du kan du velge autentiseringsmetode for brukere i systemet.\n"
-"</p>"
-
-#. helptext 2/3
-#. help text for dialog "User Authentication Method" 2/2
-#: src/clients/inst_auth.rb:125 src/clients/inst_user_first.rb:164
-msgid "<p>Select <b>Local</b> to authenticate users only by using the local files <i>/etc/passwd</i> and <i>/etc/shadow</i>.</p>"
-msgstr "<p>Velg <b>Lokal</b> hvis du vil autentisere brukere bare ved hjelp av lokale filer <i>/etc/passwd</i> og <i>/etc/shadow</i>.</p>"
-
-#. optional helptext 2.5/3 (local users continued)
-#: src/clients/inst_auth.rb:133
-msgid "If you have a previous installation or alternative system, it is possible to create users based on this source. To do so, select <b>Read User Data from a Previous Installation</b>. This option uses an existing or creates a new home directory for each user in the location specified for this installation."
-msgstr "Hvis du har en annen installasjon eller et annet system, kan du opprette brukere basert på denne kilden. Velg <b>Les brukerinformasjon fra tidligere installasjon</b> for å gjøre dette. Med dette valget kan du bruke en eksisterende eller opprette en ny hjemmekatalog for hver bruker på det spesifiserte stedet for denne installasjonen."
-
-#. radiobutton to select ldap user auth.
-#: src/clients/inst_auth.rb:141
-msgid "&LDAP"
-msgstr "&LDAP"
-
-#. radiobutton to select nis user auth.
-#: src/clients/inst_auth.rb:143
-msgid "N&IS"
-msgstr "N&IS"
-
-#. radiobutton to select samba user auth.
-#. menubutton label
-#: src/clients/inst_auth.rb:145 src/include/users/widgets.rb:159
-msgid "&Samba"
-msgstr "&Samba"
-
-#. radiobutton to select samba user auth.
-#: src/clients/inst_auth.rb:147
-msgid "&Windows Domain"
-msgstr "&Windows-domene"
-
-#. radiobutton to select local user auth.
-#. radiobutton label
-#: src/clients/inst_auth.rb:151 src/clients/inst_user_first.rb:85
-msgid "L&ocal (/etc/passwd)"
-msgstr "L&okal (/etc/passwd)"
-
-#. radiobutton to select local user auth.
-#. authentication type
-#: src/clients/inst_auth.rb:155 src/clients/users_proposal.rb:48
-msgid "eDirectory LDAP"
-msgstr "eDirectory LDAP"
-
-#. helptext 3/3 -- nis & samba & ldap avialable
-#: src/clients/inst_auth.rb:185
-msgid ""
-"<p>If you are using a NIS or LDAP server to store user data or if you want\n"
-"to authenticate users against an NT server, choose the appropriate value. Then\n"
-"press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>Hvis du bruker en NIS- eller LDAP-server til lagring av brukerdata eller hvis du vil\n"
-"autentisere brukere mot en NT-server, velg den aktuelle verdien. Trykk deretter\n"
-"<b>Neste</b>, og fortsett med klientkonfigurasjonen.</p>"
-
-#. helptext 3/3 -- nis & ldap avialable
-#: src/clients/inst_auth.rb:195
-msgid ""
-"<p>If you are using a NIS or LDAP server to store user data, choose the\n"
-"appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>Hvis du bruker en NIS- eller LDAP-server til lagring av brukerdata, velg den\n"
-"aktuelle verdien. Trykk deretter <b>Neste</b>, og fortsett med klientkonfigurasjonen.</p>"
-
-#. helptext 3/3 -- samba &ldap available
-#: src/clients/inst_auth.rb:205
-msgid ""
-"<p>If you are using an LDAP server to store user data or if you want to\n"
-"authenticate users against an NT server, choose the appropriate value. Then\n"
-"press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>Hvis du bruker en LDAP-server til lagring av brukerdata eller hvis du vil\n"
-"autentisere brukere mot en NT-server, velg den aktuelle verdien. Trykk deretter\n"
-"<b>Neste</b>, og fortsett med klientkonfigurasjonen.</p>"
-
-#. helptext 3/3 -- only ldap available
-#: src/clients/inst_auth.rb:215
-msgid ""
-"<p>If you are using an LDAP server to store user data, choose the\n"
-"appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>Hvis du bruker en LDAP-server til lagring av brukerdata, velg den\n"
-"aktuelle verdien. Trykk deretter <b>Neste</b>, og fortsett med klientkonfigurasjonen.</p>"
-
-#. helptext: additional kerberos support
-#: src/clients/inst_auth.rb:225
-msgid "<p>Check <b>Set Up Kerberos Authentication</b> to configure Kerberos after configuring the user data source.</p>"
-msgstr "<p>Kryss av for <b>Sett opp Kerberos-autentisering</b> for å konfigurere Kerberos etter at du har valgt brukerinformasjonskilde.</p>"
-
-#. check box label
-#. check box label
-#: src/clients/inst_auth.rb:240 src/clients/inst_user_first.rb:102
-msgid "&Read User Data from a Previous Installation"
-msgstr "Les b&rukerinformasjon fra en tidligere installasjon"
-
-#. button label
-#. button label
-#: src/clients/inst_auth.rb:245 src/clients/inst_user_first.rb:107
-msgid "&Choose"
-msgstr "&Velg"
-
-#. frame title for authentication methods
-#: src/clients/inst_auth.rb:295 src/clients/inst_user_first.rb:136
-msgid "Authentication Method"
-msgstr "Metode for brukerautentisering"
-
-#. check box label
-#: src/clients/inst_auth.rb:303
-msgid "Set Up &Kerberos Authentication"
-msgstr "Sett opp &Kerberos-autentisering"
-
-#. selection box label
-#. selection box label
-#: src/clients/inst_auth.rb:428 src/clients/inst_user_first.rb:507
-msgid "&Select Users to Read"
-msgstr "Velg brukere som skal le&ses"
-
-#. check box label
-#. check box label
-#: src/clients/inst_auth.rb:434 src/clients/inst_user_first.rb:515
-msgid "Select or Deselect &All"
-msgstr "Velg eller velg bort &alle"
-
-#. Title for root-password dialogue
-#. Title for root-password dialogue
-#: src/clients/inst_root.rb:88 src/clients/inst_root_first.rb:57
-msgid "Password for the System Administrator \"root\""
-msgstr "Passord for systemadministratoren \"root\","
-
-#. 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 "Ikke glem hva du skriver inn her."
-
-#. Label: get password for user root
-#. Label: get password for user root
-#: src/clients/inst_root.rb:101 src/clients/inst_root_first.rb:73
-msgid "&Password for root User"
-msgstr "&Passord for rotbruker"
-
-#. Label: get same password again for verification
-#. Label: get same password again for verification
-#: src/clients/inst_root.rb:109 src/clients/inst_root_first.rb:81
-msgid "Con&firm Password"
-msgstr "B&ekreft passord"
-
-#. text entry label
-#. text entry label
-#: src/clients/inst_root.rb:114 src/clients/inst_root_first.rb:86
-msgid "&Test Keyboard Layout"
-msgstr "&Test tastaturoppsett"
-
-#. push button
-#: src/clients/inst_root.rb:119
-msgid "E&xpert Options..."
-msgstr "A&vanserte alternativer..."
-
-#. help text ( explain what the user "root" is and does ) 1/5
-#. help text ( explain what the user "root" is and does ) 1/5
-#: src/clients/inst_root.rb:124 src/clients/inst_root_first.rb:93
-msgid ""
-"<p>\n"
-"Unlike normal users of the system, who write texts, create\n"
-"graphics, or browse the Internet, the user \"root\" exists on\n"
-"every system and is called into action whenever\n"
-"administrative tasks need to be performed. Only log in as root\n"
-"when you need to be the system administrator.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Til forskjell fra vanlige brukere, som for eksempel jobber med tekst og\n"
-"grafikk eller surfer på nettet, finnes brukeren \"root\" i\n"
-"alle systemer, og må aktiveres hver gang en administrativ\n"
-"oppgave skal utføres. Logg inn som rot når\n"
-"du har behov for å være systemadministrator, aldri ellers.\n"
-"</p>\n"
-
-#. help text, continued 2/5
-#. help text, continued 2/5
-#: src/clients/inst_root.rb:137 src/clients/inst_root_first.rb:106
-msgid ""
-"<p>\n"
-"Because the root user is equipped with extensive permissions, the password\n"
-"for \"root\" should be chosen carefully. A combination of letters and numbers\n"
-"is recommended. To ensure that the password was entered correctly,\n"
-"reenter it in a second field.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Fordi rotbrukeren har omfattende rettigheter, bør passordet \n"
-"for \"root\" velges med omhu. En kombinasjon av bokstaver og tall\n"
-"anbefales. For å sikre at passordet ble skrevet riktig, må det skrives inn\n"
-"på nytt i det andre feltet.\n"
-"</p>\n"
-
-#. help text, continued 3/5
-#. help text, continued 3/5
-#: src/clients/inst_root.rb:150 src/clients/inst_root_first.rb:119
-msgid ""
-"<p>\n"
-"All the rules for user passwords apply to the \"root\" password:\n"
-"Distinguish between uppercase and lowercase. A password should have at\n"
-"least 5 characters and, as a rule, not contain any accented letters or umlauts.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Alle regler for brukerpassord gjelder for rotpassordet også:\n"
-"Skill mellom store og små bokstaver. Et passord bør bestå av minst 5 tegn,\n"
-"og bør normalt ikke inneholde bokstaver med aksenter eller tødler.\n"
-"</p>\n"
-
-#. help text, continued 5/5
-#. help text, continued 5/5
-#: src/clients/inst_root.rb:164 src/clients/inst_root_first.rb:133
-msgid ""
-"<p>\n"
-"Do not forget this \"root\" password.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"Ikke glem dette rotpassordet\n"
-"</p>"
-
-#. additional help text about password
-#. additional help text about password
-#: src/clients/inst_root.rb:176 src/clients/inst_root_first.rb:145
-msgid ""
-"<p>If you intend to use this password for creating certificates,\n"
-"it has to be at least %1 characters long.</p>"
-msgstr ""
-"<p>Hvis du har til hensikt å bruke dette passordet til å opprette sertifikater,\n"
-"må det har en lengde på minst %1 tegn.</p>"
-
-#. help text for 'test keyboard layout' entry'
-#: src/clients/inst_root.rb:187
-msgid "<p>To check whether your current keyboard layout is correct, try entering text into the <b>Test Keyboard Layout</b> field.</p>"
-msgstr "<p>Kontroller om gjeldende tastaturoppsett er riktig ved å skrive inn tekst i feltet <b>Test tastaturoppsett</b>.</p>"
-
-#. report misspellings of the password
-#. report misspellings of the password
-#. The two group password information do not match
-#. error popup
-#. The two user password information do not match
-#. error popup
-#. The two group password information do not match
-#. error popup
-#: src/clients/inst_root.rb:233 src/clients/inst_root_first.rb:185
-#: src/clients/inst_user_first.rb:688 src/include/users/dialogs.rb:146
-#: src/include/users/dialogs.rb:1247 src/include/users/dialogs.rb:2364
-msgid ""
-"The passwords do not match.\n"
-"Try again."
-msgstr ""
-"Passordene er ikke identiske.\n"
-"Prøv igjen."
-
-#. #-#-#-#-#  users.rxgettext.pot (PACKAGE VERSION)  #-#-#-#-#
-#. report if user forgot to enter a password
-#. #-#-#-#-#  users.xgettext.pot  #-#-#-#-#
-#. error popup
-#: src/clients/inst_root.rb:243 src/clients/inst_root_first.rb:191
-#: src/modules/UsersSimple.pm:749
-msgid ""
-"No password entered.\n"
-"Try again."
-msgstr ""
-"Passord ble ikke angitt.\n"
-"Prøv igjen."
-
-#. yes/no popup question, %1 is a number
-#. yes/no popup question, %1 is a number
-#: src/clients/inst_root.rb:270 src/clients/inst_root_first.rb:224
-msgid ""
-"If you intend to create certificates,\n"
-"the password should have at least %1 characters."
-msgstr ""
-"Hvis du har til hensikt å opprette sertifikater,\n"
-"bør passordet ha minst %1 tegn."
-
-#. last part of message popup
-#. last part of message popup
-#. last part of message popup
-#. last part of message popup
-#: src/clients/inst_root.rb:285 src/clients/inst_root_first.rb:239
-#: src/clients/inst_user_first.rb:714 src/include/users/dialogs.rb:1269
-#: src/include/users/dialogs.rb:2391
-msgid "Really use this password?"
-msgstr "Vil du virkelig bruke dette passordet?"
-
-#. Error msg (yes/no)
-#: src/clients/inst_root.rb:301
-msgid ""
-"The root password could not be set.\n"
-"You might not be able to log in.\n"
-"Try setting it again?\n"
-msgstr ""
-"Et rotpassord kunne ikke defineres.\n"
-"Du vil kanskje ikke kunne logge inn.\n"
-"Vil du forsøke igjen?\n"
-
-#. help text (shown in the 'busy' situation)
-#: src/clients/inst_user.rb:144
-msgid "Initialization of module for configuration of authentication..."
-msgstr "Initialisering av modul for konfigurasjon av autentisering..."
-
-#. popup label (%1 is package to install)
-#. popup label (%1 is package to install)
-#. popup label (%1 is package to install)
-#: src/clients/inst_user.rb:171 src/clients/inst_user.rb:195
-#: src/include/users/widgets.rb:2450
-msgid ""
-"Package %1 is not installed.\n"
-"Install it now?\n"
-msgstr ""
-"Pakken %1 er ikke installert.\n"
-"Vil du installere den nå?\n"
-
-#. encryption type
-#. encryption type
-#. encryption type
-#. encryption type
-#: src/clients/inst_user_first.rb:89 src/clients/users_proposal.rb:53
-#: src/include/users/helps.rb:52 src/include/users/helps.rb:54
-msgid "DES"
-msgstr "DES"
-
-#. encryption type
-#. encryption type
-#. encryption type
-#: src/clients/inst_user_first.rb:91 src/clients/users_proposal.rb:55
-#: src/include/users/helps.rb:56
-msgid "MD5"
-msgstr "MD5"
-
-#. encryption type
-#. encryption type
-#: src/clients/inst_user_first.rb:93 src/clients/users_proposal.rb:57
-msgid "SHA-256"
-msgstr "SHA-256"
-
-#. encryption type
-#. encryption type
-#: src/clients/inst_user_first.rb:95 src/clients/users_proposal.rb:59
-msgid "SHA-512"
-msgstr "SHA-512"
-
-#. frame label
-#: src/clients/inst_user_first.rb:143
-msgid "Password Encryption Type"
-msgstr "Passordkrypteringstype"
-
-#. Radio button label: password encryption type
-#. Radio buttons for password encryption: DES-crypt
-#: src/clients/inst_user_first.rb:149 src/include/users/widgets.rb:513
-msgid "&DES"
-msgstr "&DES"
-
-#. Radio button label: password encryption type
-#. Radio buttons for password encryption: MD5-crypt
-#: src/clients/inst_user_first.rb:151 src/include/users/widgets.rb:515
-msgid "&MD5"
-msgstr "&MD5"
-
-#. Radio button label: password encryption type
-#. Radio buttons for password encryption: sha256 crypt
-#: src/clients/inst_user_first.rb:153 src/include/users/widgets.rb:520
-msgid "SHA-&256"
-msgstr "SHA-&256"
-
-#. Radio button label: password encryption type
-#. Radio buttons for password encryption: sha512 crypt
-#: src/clients/inst_user_first.rb:155 src/include/users/widgets.rb:528
-msgid "SHA-&512"
-msgstr "SHA-&512"
-
-#. help text for dialog "User Authentication Method" 1/2
-#: src/clients/inst_user_first.rb:162
-#, fuzzy
-#| msgid "<p><b>Login Settings</b></p>"
-msgid "<p><b>Authentication</b><br></p>"
-msgstr "<p><b>Innloggingsinnstillinger</b></p>"
-
-#. Help text for password expert dialog
-#: src/clients/inst_user_first.rb:168
-#, fuzzy
-#| msgid "The password encryption method is %1."
-msgid "<p>Choose a password encryption method for local and system users.</p>"
-msgstr "Krypteringsmetode for passord er %1."
-
-#. Help text for password expert dialog
-#. Help text for password expert dialog 4/5
-#: src/clients/inst_user_first.rb:170 src/include/users/widgets.rb:491
-msgid "<p><b>SHA-512</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>"
-msgstr "<p><b>SHA-512</b> er standard hash-metode. Det anbefales ikke å bruke andre algoritmer dersom det ikke er nødvendig av kompatibilitetshensyn.</p>"
-
-#. text entry
-#. text entry
-#: src/clients/inst_user_first.rb:223 src/include/users/dialogs.rb:403
-msgid "User's &Full Name"
-msgstr "Brukerens &fulle navn"
-
-#. input field for login name
-#. input field for login name
-#: src/clients/inst_user_first.rb:230 src/include/users/dialogs.rb:433
-msgid "&Username"
-msgstr "&Brukernavn"
-
-#. checkbox label
-#. checkbox label
-#: src/clients/inst_user_first.rb:252 src/include/users/dialogs.rb:470
-msgid "U&se this password for system administrator"
-msgstr "Bru&k dette passordet for systemadministrator"
-
-#. checkbox label
-#. checkbox label
-#: src/clients/inst_user_first.rb:258 src/include/users/dialogs.rb:446
-msgid "Receive S&ystem Mail"
-msgstr "Motta s&ystemmeldinger"
-
-#. checkbox label
-#: src/clients/inst_user_first.rb:261
-msgid "&Automatic Login"
-msgstr "&Automatisk innlogging"
-
-#. dialog caption
-#: src/clients/inst_user_first.rb:283
-msgid "Create New User"
-msgstr "Opprett ny bruker"
-
-#. yes-no popup headline
-#. The user login field is empty, this is allowed if the
-#. system is part of a network with (e.g.) NIS user management.
-#. yes-no popup headline
-#: src/clients/inst_user_first.rb:342 src/include/users/dialogs.rb:1112
-msgid "Empty User Login"
-msgstr "Brukernavn ikke angitt"
-
-#. yes-no popup contents
-#. yes-no popup contents
-#: src/clients/inst_user_first.rb:344 src/include/users/dialogs.rb:1114
-msgid ""
-"Leaving the user name empty only makes sense\n"
-"in a network environment with an authentication server.\n"
-"Leave it empty?"
-msgstr ""
-"Å la brukernavnfeltet være tomt er bare hensiktsmessig\n"
-"i nettverksmiljøer som bruker en autentiseringsserver.\n"
-"Skal feltet være tomt?"
-
-#. help text for main add user dialog
-#. alternative help text 1/7
-#: src/clients/inst_user_first.rb:450 src/include/users/helps.rb:212
-msgid ""
-"<p>\n"
-"Enter the <b>User's Full Name</b>, <b>Username</b>, and <b>Password</b> to\n"
-"assign to this user account.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Angi <b>Brukerens fulle navn</b>, <b>Brukernavn</b> og <b>Passord</b> for\n"
-"denne brukerkontoen.\n"
-"</p>\n"
-
-#. help text for main add user dialog
-#: src/clients/inst_user_first.rb:453
-msgid ""
-"<p>\n"
-"When entering a password, distinguish between uppercase and\n"
-"lowercase. Passwords should not contain any accented characters or umlauts.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Skill mellom store og små bokstaver når du velger passord.\n"
-"Passord må ikke inneholde bokstaver med aksenter eller tødler.\n"
-"</p>\n"
-
-#. help text %1 is encryption type, %2,%3 numbers
-#. help text 2/4 %1 is encryption type, %2,%3 numbers
-#: src/clients/inst_user_first.rb:457 src/include/users/helps.rb:73
-msgid ""
-"<p>\n"
-"With the current password encryption (%1), the password length should be between\n"
-" %2 and %3 characters.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"Med gjeldende passordkryptering (%1) må passordets lengde være mellom\n"
-"%2 og %3 tegn.\n"
-"</p>"
-
-#. additional help text about password
-#: src/clients/inst_user_first.rb:467
-#, fuzzy
-#| msgid ""
-#| "<p>If you intend to use this password for creating certificates,\n"
-#| "it has to be at least %1 characters long.</p>"
-msgid ""
-"<p>If you intend to use this password for creating certificates,\n"
-"it has to be at least %s characters long.</p>"
-msgstr ""
-"<p>Hvis du har til hensikt å bruke dette passordet til å opprette sertifikater,\n"
-"må det har en lengde på minst %1 tegn.</p>"
-
-#. help text for main add user dialog
-#. help text 4/4
-#: src/clients/inst_user_first.rb:472 src/include/users/helps.rb:90
-msgid ""
-"<p>\n"
-"To ensure that the password was entered correctly,\n"
-"repeat it exactly in a second field. Do not forget your password.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"For å sikre at passordet ble skrevet riktig inn\n"
-"må det skrives inn en gang til i det andre feltet. Ikke glem passordet.\n"
-"</p>\n"
-
-#. help text for main add user dialog
-#: src/clients/inst_user_first.rb:476
-msgid ""
-"<p>\n"
-"For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n"
-"Do not use uppercase letters in this entry unless you know what you are doing.\n"
-"Usernames have stricter restrictions than passwords. You can redefine the\n"
-"restrictions in the /etc/login.defs file. Read its man page for information.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"For <b>Brukernavn</b> må bare bokstaver (ingen tegn med aksenter), tall og tegnet <tt>._-</tt> benyttes.\n"
-"Ikke bruk store bokstaver her hvis du ikke vet nøyaktig hva du gjør.\n"
-"Brukernavn har flere begrensninger enn passord. Du kan omdefinere\n"
-"begrensningene i filen /etc/login.defs. Du finner mer informasjon på manualsiden for filen.\n"
-"</p>\n"
-
-#. help text for main add user dialog
-#: src/clients/inst_user_first.rb:482
-msgid "<p>Check <b>Use this password for system administrator</b> if the same password as entered for the first user should be used for root.</p>"
-msgstr "   Kryss av for    Bruk dette passordet                             hvis samme passord som ble angitt for første bruker, skal benyttes for rotbrukeren"
-
-#. help text for main add user dialog
-#. these are used only during installation time
-#. help text 4/7 (only during installation)
-#: src/clients/inst_user_first.rb:485 src/include/users/helps.rb:259
-msgid ""
-"<p>\n"
-"The username and password created here are needed to log in and work with your Linux system. With <b>Automatic Login</b> enabled, the login procedure is skipped. This user is logged in automatically.</p>\n"
-msgstr ""
-"<p>\n"
-"Brukernavnet og passordet som opprettes her, kreves for å logge på og arbeide med Linux-systemet. Hvis <b>Automatisk innlogging</b> aktiveres, blir Innloggingsprosedyren sløyfet, og denne brukeren blir logget inn automatisk.</p>\n"
-
-#. help text for main add user dialog
-#. help text 5/7 (only during installation)
-#: src/clients/inst_user_first.rb:489 src/include/users/helps.rb:264
-msgid ""
-"<p>\n"
-"Have mail for root forwarded to this user by checking <b>Receive System Mail</b>.</p>\n"
-msgstr ""
-"<p>\n"
-"E-post til rotbrukeren vil bli videresendt til denne brukeren hvis du krysser av for <b>Motta systemmeldinger</b>.</p>\n"
-
-#. Dialog for expert user settings: authentication method as well
-#. as password encryption (see fate 302980)
-#. @return true if user accepted expert settings
-#: src/clients/inst_user_first.rb:573
-msgid "Expert Settings"
-msgstr "Avanserte innstillinger"
-
-#. summary label
-#: src/clients/inst_user_first.rb:625
-msgid "The authentication method is local /etc/passwd."
-msgstr "Autentiseringsmetoden er lokal"
-
-#. summary label
-#: src/clients/inst_user_first.rb:628
-#, fuzzy
-#| msgid "The password encryption method is %1."
-msgid "The password encryption method is %s."
-msgstr "Krypteringsmetode for passord er %1."
-
-#. summary label, %s is a single user name or multiple usernames (comma separated)
-#: src/clients/inst_user_first.rb:635
-#, fuzzy
-#| msgid "User %1 will be imported."
-msgid "User %s will be imported."
-msgid_plural "Users %s will be imported."
-msgstr[0] "Brukeren %1 vil bli importert."
-msgstr[1] "Brukeren %1 vil bli importert."
-
-#. pushbutton label
-#: src/clients/inst_user_first.rb:650
-msgid "&Change..."
-msgstr "&Endre..."
-
-#. frame label
-#: src/clients/inst_user_first.rb:657
-msgid "Summary"
-msgstr "Sammendrag"
-
-#. yes/no popup question, %s is a number
-#: src/clients/inst_user_first.rb:709
-#, fuzzy
-#| msgid ""
-#| "If you intend to create certificates,\n"
-#| "the password should have at least %1 characters."
-msgid ""
-"If you intend to create certificates,\n"
-"the password should have at least %s characters."
-msgstr ""
-"Hvis du har til hensikt å opprette sertifikater,\n"
-"bør passordet ha minst %1 tegn."
-
 #. translators: command line help text for Users module
 #: src/clients/users.rb:102
 msgid "User configuration module"
@@ -886,11 +255,6 @@
 msgid "New UID of the user"
 msgstr "Ny UID for brukeren"
 
-#. progress step title
-#: src/clients/users_finish.rb:63
-msgid "Writing Users Configuration..."
-msgstr "Lagrer brukeroppsett..."
-
 #. helptext 1/3
 #: src/clients/users_plugin_ldap_all.rb:105
 msgid ""
@@ -1145,93 +509,6 @@
 msgid "Seconds"
 msgstr "Sekunder"
 
-#. authentication type
-#. type of user/group
-#. (item of list with the headline 'Choose the type of user to add')
-#: src/clients/users_proposal.rb:42 src/include/users/widgets.rb:1365
-msgid "LDAP"
-msgstr "LDAP"
-
-#. authentication type
-#. richtext label
-#: src/clients/users_proposal.rb:44 src/include/users/widgets.rb:136
-msgid "NIS"
-msgstr "NIS"
-
-#. authentication type
-#: src/clients/users_proposal.rb:46
-msgid "Samba (Windows Domain)"
-msgstr "              -domene"
-
-#. summary label <%1>-<%2> are HTML tags, leave untouched
-#: src/clients/users_proposal.rb:69
-msgid "<%1>Root Password<%2> set"
-msgstr "<%1>Rotpassord<%2> definert"
-
-#: src/clients/users_proposal.rb:74
-msgid "<%1>Root Password<%2> not set"
-msgstr "<%1>Rotpassord<%2> ikke definert"
-
-#. summary label <%1>-<%2> are HTML tags, leave untouched
-#: src/clients/users_proposal.rb:81
-msgid "No <%1>user<%2> configured"
-msgstr "Ingen <%1>bruker<%2> satt opp"
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. % is LDAP/NIS etc.
-#: src/clients/users_proposal.rb:93
-msgid "<%1>Authentication method<%2>: %3"
-msgstr "<%1>Autentiseringsmetode<%2>: %3"
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. % is LDAP/NIS etc.
-#: src/clients/users_proposal.rb:102
-msgid "<%1>Authentication method<%2>: %3 and Kerberos."
-msgstr "<%1>Autentiseringsmetode<<%2>: %3 og Kerberos."
-
-#. summary line, %3 are user names (comma separated)
-#. <%1>,<%2> are HTML tags, leave untouched,
-#: src/clients/users_proposal.rb:116
-msgid "<%1>Users<%2> %3 selected for import"
-msgstr "<%1>Brukerne<%2> %3 valgt for import"
-
-#. summary line,  <%1>,<%2> are HTML tags, %3 user name
-#: src/clients/users_proposal.rb:124
-msgid "<%1>User<%2> %3 will be imported."
-msgstr "<%1>Brukeren<%2> %3 vil bli importert."
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. %3 is login name
-#: src/clients/users_proposal.rb:134
-msgid "<%1>User<%2> %3 configured"
-msgstr "<%1>Brukeren<%2> %3 definert"
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. %3 is full name, %4 login name
-#: src/clients/users_proposal.rb:143
-msgid "<%1>User<%2> %3 (%4) configured"
-msgstr "<%1>Brukeren<%2> %3 (%4) definert"
-
-#. summary line
-#: src/clients/users_proposal.rb:156
-msgid "Password Encryption Method: %1"
-msgstr "Passordkrypteringsmetode: %1"
-
-#. rich text label
-#: src/clients/users_proposal.rb:170
-msgid "User Settings"
-msgstr "Brukerinnstillinger"
-
-#. menu button label
-#: src/clients/users_proposal.rb:173
-msgid "&User"
-msgstr "&Bruker"
-
-#. menu button label
-#: src/clients/users_proposal.rb:175
-msgid "&Root Password"
-msgstr "&Rotpassord"
-
 #. password entering label
 #: src/include/users/cmdline.rb:55
 msgid "LDAP Server Password:"
@@ -1394,6 +671,24 @@
 "krypteringsinnstillingene for denne brukeren,\n"
 "må du skrive inn brukerens gjeldende passord."
 
+#. The two user password information do not match
+#. error popup
+#. The two group password information do not match
+#. error popup
+#. report misspellings of the password
+#. The two group password information do not match
+#. error popup
+#: src/include/users/dialogs.rb:146 src/include/users/dialogs.rb:1247
+#: src/include/users/dialogs.rb:2364
+#: src/lib/users/dialogs/inst_root_first.rb:193
+#: src/lib/users/dialogs/inst_user_first.rb:471
+msgid ""
+"The passwords do not match.\n"
+"Try again."
+msgstr ""
+"Passordene er ikke identiske.\n"
+"Prøv igjen."
+
 #. yes/no popup label, %1,%2 are file paths
 #: src/include/users/dialogs.rb:344
 msgid ""
@@ -1424,6 +719,13 @@
 msgstr "&Endre hjemmekatalogeier"
 
 #. text entry
+#. text entry
+#: src/include/users/dialogs.rb:403
+#: src/lib/users/dialogs/inst_user_first.rb:583
+msgid "User's &Full Name"
+msgstr "Brukerens &fulle navn"
+
+#. text entry
 #: src/include/users/dialogs.rb:411
 msgid "&First Name"
 msgstr "&Fornavn"
@@ -1438,11 +740,30 @@
 msgid "For remote users, only additional group memberships can be changed."
 msgstr "Bare medlemskap i tilleggsgrupper kan endres for eksterne brukere."
 
+#. input field for login name
+#. input field for login name
+#: src/include/users/dialogs.rb:433
+#: src/lib/users/dialogs/inst_user_first.rb:590
+msgid "&Username"
+msgstr "&Brukernavn"
+
 #. checkbox label
+#: src/include/users/dialogs.rb:446
+msgid "Receive S&ystem Mail"
+msgstr "Motta s&ystemmeldinger"
+
+#. checkbox label
 #: src/include/users/dialogs.rb:456
 msgid "A&utomatic Login"
 msgstr "A&utomatisk innlogging"
 
+#. checkbox label
+#. checkbox label
+#: src/include/users/dialogs.rb:470
+#: src/lib/users/dialogs/inst_user_first.rb:614
+msgid "U&se this password for system administrator"
+msgstr "Bru&k dette passordet for systemadministrator"
+
 #. check box label
 #: src/include/users/dialogs.rb:480
 msgid "D&isable User Login"
@@ -1612,6 +933,33 @@
 msgid "Plu&g-Ins"
 msgstr "Pro&gramtillegg"
 
+#. The user login field is empty, this is allowed if the
+#. system is part of a network with (e.g.) NIS user management.
+#. yes-no popup headline
+#: src/include/users/dialogs.rb:1112
+msgid "Empty User Login"
+msgstr "Brukernavn ikke angitt"
+
+#. yes-no popup contents
+#: src/include/users/dialogs.rb:1114
+msgid ""
+"Leaving the user name empty only makes sense\n"
+"in a network environment with an authentication server.\n"
+"Leave it empty?"
+msgstr ""
+"Å la brukernavnfeltet være tomt er bare hensiktsmessig\n"
+"i nettverksmiljøer som bruker en autentiseringsserver.\n"
+"Skal feltet være tomt?"
+
+#. last part of message popup
+#. last part of message popup
+#. User can confirm using "invalid" password confirming all the errors
+#: src/include/users/dialogs.rb:1269 src/include/users/dialogs.rb:2391
+#: src/lib/users/dialogs/inst_root_first.rb:212
+#: src/lib/users/dialogs/inst_user_first.rb:483
+msgid "Really use this password?"
+msgstr "Vil du virkelig bruke dette passordet?"
+
 #. popup question
 #: src/include/users/dialogs.rb:1308
 msgid "Change home directory to %1?"
@@ -1703,6 +1051,20 @@
 msgid "Group &Data"
 msgstr "Gruppe&informasjon"
 
+#. encryption type
+#. encryption type
+#. TRANSLATORS: encryption type
+#: src/include/users/helps.rb:52 src/include/users/helps.rb:54
+#: src/lib/users/encryption_method.rb:51
+msgid "DES"
+msgstr "DES"
+
+#. encryption type
+#. TRANSLATORS: encryption type
+#: src/include/users/helps.rb:56 src/lib/users/encryption_method.rb:53
+msgid "MD5"
+msgstr "MD5"
+
 #. help text 1/4
 #: src/include/users/helps.rb:62
 msgid ""
@@ -1716,6 +1078,32 @@
 "Passord må ikke inneholde bokstaver med aksenter eller tødler.\n"
 "</p>\n"
 
+#. help text 2/4 %1 is encryption type, %2,%3 numbers
+#: src/include/users/helps.rb:73
+msgid ""
+"<p>\n"
+"With the current password encryption (%1), the password length should be between\n"
+" %2 and %3 characters.\n"
+"</p>"
+msgstr ""
+"<p>\n"
+"Med gjeldende passordkryptering (%1) må passordets lengde være mellom\n"
+"%2 og %3 tegn.\n"
+"</p>"
+
+#. help text 4/4
+#: src/include/users/helps.rb:90 src/lib/users/dialogs/inst_user_first.rb:160
+msgid ""
+"<p>\n"
+"To ensure that the password was entered correctly,\n"
+"repeat it exactly in a second field. Do not forget your password.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"For å sikre at passordet ble skrevet riktig inn\n"
+"må det skrives inn en gang til i det andre feltet. Ikke glem passordet.\n"
+"</p>\n"
+
 #. Help text 0/6
 #: src/include/users/helps.rb:103
 msgid ""
@@ -1881,6 +1269,19 @@
 "<b>Passord</b> for brukeren.\n"
 "</p>\n"
 
+#. alternative help text 1/7
+#: src/include/users/helps.rb:212 src/lib/users/dialogs/inst_user_first.rb:139
+msgid ""
+"<p>\n"
+"Enter the <b>User's Full Name</b>, <b>Username</b>, and <b>Password</b> to\n"
+"assign to this user account.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Angi <b>Brukerens fulle navn</b>, <b>Brukernavn</b> og <b>Passord</b> for\n"
+"denne brukerkontoen.\n"
+"</p>\n"
+
 #. help text 2/7
 #: src/include/users/helps.rb:226
 msgid ""
@@ -1921,6 +1322,25 @@
 "begrensningene i filen /etc/login.defs. Du finner mer informasjon på manualsiden for filen.\n"
 "</p>\n"
 
+#. these are used only during installation time
+#. help text 4/7 (only during installation)
+#: src/include/users/helps.rb:259 src/lib/users/dialogs/inst_user_first.rb:176
+msgid ""
+"<p>\n"
+"The username and password created here are needed to log in and work with your Linux system. With <b>Automatic Login</b> enabled, the login procedure is skipped. This user is logged in automatically.</p>\n"
+msgstr ""
+"<p>\n"
+"Brukernavnet og passordet som opprettes her, kreves for å logge på og arbeide med Linux-systemet. Hvis <b>Automatisk innlogging</b> aktiveres, blir Innloggingsprosedyren sløyfet, og denne brukeren blir logget inn automatisk.</p>\n"
+
+#. help text 5/7 (only during installation)
+#: src/include/users/helps.rb:264
+msgid ""
+"<p>\n"
+"Have mail for root forwarded to this user by checking <b>Receive System Mail</b>.</p>\n"
+msgstr ""
+"<p>\n"
+"E-post til rotbrukeren vil bli videresendt til denne brukeren hvis du krysser av for <b>Motta systemmeldinger</b>.</p>\n"
+
 #. help text 6/7 (only during installation)
 #: src/include/users/helps.rb:269
 msgid "<p>Press <b>User Management</b> to add more users or groups to your system.</p>"
@@ -2675,7 +2095,8 @@
 msgstr "Systembrukere"
 
 #. the type of user set
-#: src/include/users/widgets.rb:79
+#. New user is the default option
+#: src/include/users/widgets.rb:79 src/lib/users/dialogs/inst_user_first.rb:275
 msgid "Local Users"
 msgstr "Lokale brukere"
 
@@ -2751,6 +2172,11 @@
 msgstr "Samba-grupper"
 
 #. richtext label
+#: src/include/users/widgets.rb:136
+msgid "NIS"
+msgstr "NIS"
+
+#. richtext label
 #: src/include/users/widgets.rb:138
 msgid "SSSD"
 msgstr ""
@@ -2770,6 +2196,11 @@
 msgid "&SSSD"
 msgstr ""
 
+#. menubutton label
+#: src/include/users/widgets.rb:159
+msgid "&Samba"
+msgstr "&Samba"
+
 #. tab header
 #: src/include/users/widgets.rb:168
 msgid "&Users"
@@ -2897,6 +2328,11 @@
 "nettverksprotokoller støtter ikke dette, og det kan oppstå problemer i forbindelse med NIS.\n"
 "</p>"
 
+#. Help text for password expert dialog 4/5
+#: src/include/users/widgets.rb:491
+msgid "<p><b>SHA-512</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>"
+msgstr "<p><b>SHA-512</b> er standard hash-metode. Det anbefales ikke å bruke andre algoritmer dersom det ikke er nødvendig av kompatibilitetshensyn.</p>"
+
 #. Label
 #: src/include/users/widgets.rb:499
 msgid "Password Encryption"
@@ -2907,6 +2343,26 @@
 msgid "Encryption Type"
 msgstr "Krypteringstype"
 
+#. Radio buttons for password encryption: DES-crypt
+#: src/include/users/widgets.rb:513
+msgid "&DES"
+msgstr "&DES"
+
+#. Radio buttons for password encryption: MD5-crypt
+#: src/include/users/widgets.rb:515
+msgid "&MD5"
+msgstr "&MD5"
+
+#. Radio buttons for password encryption: sha256 crypt
+#: src/include/users/widgets.rb:520
+msgid "SHA-&256"
+msgstr "SHA-&256"
+
+#. Radio buttons for password encryption: sha512 crypt
+#: src/include/users/widgets.rb:528
+msgid "SHA-&512"
+msgstr "SHA-&512"
+
 #. help text 1/3
 #: src/include/users/widgets.rb:582
 msgid ""
@@ -3201,6 +2657,12 @@
 
 #. type of user/group
 #. (item of list with the headline 'Choose the type of user to add')
+#: src/include/users/widgets.rb:1365
+msgid "LDAP"
+msgstr "LDAP"
+
+#. type of user/group
+#. (item of list with the headline 'Choose the type of user to add')
 #: src/include/users/widgets.rb:1370
 msgid "System"
 msgstr "System"
@@ -3538,6 +3000,15 @@
 msgid "Package %1 is not available for installation."
 msgstr "Pakken %1 er ikke tilgjengelig for installasjon."
 
+#. popup label (%1 is package to install)
+#: src/include/users/widgets.rb:2450
+msgid ""
+"Package %1 is not installed.\n"
+"Install it now?\n"
+msgstr ""
+"Pakken %1 er ikke installert.\n"
+"Vil du installere den nå?\n"
+
 #. dialog caption
 #: src/include/users/wizards.rb:102
 msgid "User and Group Administration"
@@ -3555,6 +3026,431 @@
 msgid "Initializing..."
 msgstr "Initialiserer ..."
 
+#. List of errors found for a given password
+#.
+#. The errors are localized and ready to be displayed to the user
+#.
+#. @param passwd [String] password to check
+#. @return [Array<String>] errors or empty array if no errors are found or
+#. validation is disabled
+#: src/lib/users/ca_password_validator.rb:56
+#, fuzzy
+#| msgid ""
+#| "If you intend to create certificates,\n"
+#| "the password should have at least %1 characters."
+msgid ""
+"If you intend to create certificates,\n"
+"the password should have at least %s characters."
+msgstr ""
+"Hvis du har til hensikt å opprette sertifikater,\n"
+"bør passordet ha minst %1 tegn."
+
+#. Localized help text about CA constraints
+#.
+#. @return [String] html text or empty string if validation is disabled
+#: src/lib/users/ca_password_validator.rb:69
+#, fuzzy
+#| msgid ""
+#| "<p>If you intend to use this password for creating certificates,\n"
+#| "it has to be at least %1 characters long.</p>"
+msgid ""
+"<p>If you intend to use this password for creating certificates,\n"
+"it has to be at least %s characters long.</p>"
+msgstr ""
+"<p>Hvis du har til hensikt å bruke dette passordet til å opprette sertifikater,\n"
+"må det har en lengde på minst %1 tegn.</p>"
+
+#. @see Implements ::Installation::FinishClient#title
+#: src/lib/users/clients/users_finish.rb:55
+msgid "Writing Users Configuration..."
+msgstr "Lagrer brukeroppsett..."
+
+#. Copyright (c) 2016 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 SUSE about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/users/dialogs/encryption_method.rb:39
+#, fuzzy
+#| msgid "The password encryption method is %1."
+msgid "<p>Choose a password encryption method for local and system users.</p>"
+msgstr "Krypteringsmetode for passord er %1."
+
+#. TRANSLATORS: %s is the name of the recommended encryption method
+#: src/lib/users/dialogs/encryption_method.rb:41
+#, fuzzy
+#| msgid "<p><b>SHA-512</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>"
+msgid "<p><b>%s</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>"
+msgstr "<p><b>SHA-512</b> er standard hash-metode. Det anbefales ikke å bruke andre algoritmer dersom det ikke er nødvendig av kompatibilitetshensyn.</p>"
+
+#. Let's add some vertical space after each widget
+#. TRANSLATORS: rich text label
+#: src/lib/users/dialogs/encryption_method.rb:72
+#: src/lib/users/encryption_proposal.rb:63
+msgid "Password Encryption Type"
+msgstr "Passordkrypteringstype"
+
+#. advise users to remember their new password
+#: src/lib/users/dialogs/inst_root_first.rb:70
+msgid "Do not forget what you enter here."
+msgstr "Ikke glem hva du skriver inn her."
+
+#. Label: get password for user root
+#: src/lib/users/dialogs/inst_root_first.rb:76
+msgid "&Password for root User"
+msgstr "&Passord for rotbruker"
+
+#. Label: get same password again for verification
+#: src/lib/users/dialogs/inst_root_first.rb:84
+msgid "Con&firm Password"
+msgstr "B&ekreft passord"
+
+#. text entry label
+#: src/lib/users/dialogs/inst_root_first.rb:89
+msgid "&Test Keyboard Layout"
+msgstr "&Test tastaturoppsett"
+
+#. help text ( explain what the user "root" is and does ) 1
+#: src/lib/users/dialogs/inst_root_first.rb:99
+msgid ""
+"<p>\n"
+"Unlike normal users of the system, who write texts, create\n"
+"graphics, or browse the Internet, the user \"root\" exists on\n"
+"every system and is called into action whenever\n"
+"administrative tasks need to be performed. Only log in as root\n"
+"when you need to be the system administrator.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Til forskjell fra vanlige brukere, som for eksempel jobber med tekst og\n"
+"grafikk eller surfer på nettet, finnes brukeren \"root\" i\n"
+"alle systemer, og må aktiveres hver gang en administrativ\n"
+"oppgave skal utføres. Logg inn som rot når\n"
+"du har behov for å være systemadministrator, aldri ellers.\n"
+"</p>\n"
+
+#. help text, continued 2
+#: src/lib/users/dialogs/inst_root_first.rb:110
+msgid ""
+"<p>\n"
+"Because the root user is equipped with extensive permissions, the password\n"
+"for \"root\" should be chosen carefully. A combination of letters and numbers\n"
+"is recommended. To ensure that the password was entered correctly,\n"
+"reenter it in a second field.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Fordi rotbrukeren har omfattende rettigheter, bør passordet \n"
+"for \"root\" velges med omhu. En kombinasjon av bokstaver og tall\n"
+"anbefales. For å sikre at passordet ble skrevet riktig, må det skrives inn\n"
+"på nytt i det andre feltet.\n"
+"</p>\n"
+
+#. help text, continued 3
+#: src/lib/users/dialogs/inst_root_first.rb:120
+msgid ""
+"<p>\n"
+"All the rules for user passwords apply to the \"root\" password:\n"
+"Distinguish between uppercase and lowercase. A password should have at\n"
+"least 5 characters and, as a rule, not contain any accented letters or umlauts.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Alle regler for brukerpassord gjelder for rotpassordet også:\n"
+"Skill mellom store og små bokstaver. Et passord bør bestå av minst 5 tegn,\n"
+"og bør normalt ikke inneholde bokstaver med aksenter eller tødler.\n"
+"</p>\n"
+
+#. help text, continued 4
+#: src/lib/users/dialogs/inst_root_first.rb:131
+msgid ""
+"<p>\n"
+"Do not forget this \"root\" password.\n"
+"</p>"
+msgstr ""
+"<p>\n"
+"Ikke glem dette rotpassordet\n"
+"</p>"
+
+#. Title for root-password dialogue
+#: src/lib/users/dialogs/inst_root_first.rb:148
+msgid "Password for the System Administrator \"root\""
+msgstr "Passord for systemadministratoren \"root\","
+
+#. #-#-#-#-#  users.xgettext.pot  #-#-#-#-#
+#. error popup
+#: src/lib/users/dialogs/inst_root_first.rb:198 src/modules/UsersSimple.pm:623
+msgid ""
+"No password entered.\n"
+"Try again."
+msgstr ""
+"Passord ble ikke angitt.\n"
+"Prøv igjen."
+
+#. reenable suggestion
+#: src/lib/users/dialogs/inst_user_first.rb:134
+#, fuzzy
+#| msgid "<p>Select <b>Local</b> to authenticate users only by using the local files <i>/etc/passwd</i> and <i>/etc/shadow</i>.</p>"
+msgid ""
+"<p>\n"
+"Use one of the available options to add local users to the system.\n"
+"Local users are stored in <i>/etc/passwd</i> and <i>/etc/shadow</i>.\n"
+"</p>\n"
+msgstr "<p>Velg <b>Lokal</b> hvis du vil autentisere brukere bare ved hjelp av lokale filer <i>/etc/passwd</i> og <i>/etc/shadow</i>.</p>"
+
+#: src/lib/users/dialogs/inst_user_first.rb:138
+#, fuzzy
+#| msgid "Create New User"
+msgid "Create new user"
+msgstr "Opprett ny bruker"
+
+#: src/lib/users/dialogs/inst_user_first.rb:142
+msgid ""
+"<p>\n"
+"When entering a password, distinguish between uppercase and\n"
+"lowercase. Passwords should not contain any accented characters or umlauts.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Skill mellom store og små bokstaver når du velger passord.\n"
+"Passord må ikke inneholde bokstaver med aksenter eller tødler.\n"
+"</p>\n"
+
+#. TRANSLATORS: %{min} and %{max} will be replaced by numbers
+#: src/lib/users/dialogs/inst_user_first.rb:149
+#, fuzzy
+#| msgid ""
+#| "<p>\n"
+#| "With the current password encryption (%1), the password length should be between\n"
+#| " %2 and %3 characters.\n"
+#| "</p>"
+msgid ""
+"<p>\n"
+"The password length should be between %{min}\n"
+" and %{max} characters.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Med gjeldende passordkryptering (%1) må passordets lengde være mellom\n"
+"%2 og %3 tegn.\n"
+"</p>"
+
+#: src/lib/users/dialogs/inst_user_first.rb:165
+msgid ""
+"<p>\n"
+"For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n"
+"Do not use uppercase letters in this entry unless you know what you are doing.\n"
+"Usernames have stricter restrictions than passwords. You can redefine the\n"
+"restrictions in the /etc/login.defs file. Read its man page for information.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"For <b>Brukernavn</b> må bare bokstaver (ingen tegn med aksenter), tall og tegnet <tt>._-</tt> benyttes.\n"
+"Ikke bruk store bokstaver her hvis du ikke vet nøyaktig hva du gjør.\n"
+"Brukernavn har flere begrensninger enn passord. Du kan omdefinere\n"
+"begrensningene i filen /etc/login.defs. Du finner mer informasjon på manualsiden for filen.\n"
+"</p>\n"
+
+#: src/lib/users/dialogs/inst_user_first.rb:172
+msgid "<p>Check <b>Use this password for system administrator</b> if the same password as entered for the first user should be used for root.</p>"
+msgstr "   Kryss av for    Bruk dette passordet                             hvis samme passord som ble angitt for første bruker, skal benyttes for rotbrukeren"
+
+#: src/lib/users/dialogs/inst_user_first.rb:183
+#, fuzzy
+#| msgid "&Read User Data from a Previous Installation"
+msgid "Import User Data from a Previous Installation"
+msgstr "Les b&rukerinformasjon fra en tidligere installasjon"
+
+#: src/lib/users/dialogs/inst_user_first.rb:184
+msgid ""
+"<p>\n"
+"A previous Linux installation with local users has been detected.\n"
+"The information there can be used to create users in the system being installed.\n"
+"Use the <b>Choose Users</b> button to select some users. Their basic information will\n"
+"be imported.\n"
+"</p>\n"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:192
+msgid "Skip User Creation"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:193
+msgid ""
+"<p>\n"
+"Sometimes root is the only needed local user, like in network environments\n"
+"with an authentication server. Select this option to proceed without creating\n"
+"a local user.\n"
+"</p>\n"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:275
+#, fuzzy
+#| msgid "Local Users"
+msgid "Local User"
+msgstr "Lokale brukere"
+
+#. TRANSLATORS: Error popup
+#: src/lib/users/dialogs/inst_user_first.rb:330
+msgid ""
+"The new username cannot be blank.\n"
+"If you don't want to create a user now, select\n"
+"'Skip User Creation'."
+msgstr ""
+
+#. TRANSLATORS: error popup
+#: src/lib/users/dialogs/inst_user_first.rb:387
+msgid ""
+"No users from the previous installation were choosen.\n"
+"If you don't want to create a user now, select\n"
+"'Skip User Creation'."
+msgstr ""
+
+#. TRANSLATORS: radio button
+#: src/lib/users/dialogs/inst_user_first.rb:514
+#, fuzzy
+#| msgid "Create New User"
+msgid "&Create New User"
+msgstr "Opprett ny bruker"
+
+#. TRANSLATORS: radio button
+#: src/lib/users/dialogs/inst_user_first.rb:537
+#, fuzzy
+#| msgid "&Read User Data from a Previous Installation"
+msgid "&Import User Data from a Previous Installation"
+msgstr "Les b&rukerinformasjon fra en tidligere installasjon"
+
+#: src/lib/users/dialogs/inst_user_first.rb:547
+#, fuzzy
+#| msgid "System Users"
+msgid "Choose Users"
+msgstr "Systembrukere"
+
+#. TRANSLATORS: radio button
+#: src/lib/users/dialogs/inst_user_first.rb:563
+msgid "&Skip User Creation"
+msgstr ""
+
+#. checkbox label
+#: src/lib/users/dialogs/inst_user_first.rb:619
+msgid "&Automatic Login"
+msgstr "&Automatisk innlogging"
+
+#: src/lib/users/dialogs/inst_user_first.rb:626
+#, fuzzy
+#| msgid "No user was specified."
+msgid "No users selected"
+msgstr "Ingen bruker er spesifisert."
+
+#: src/lib/users/dialogs/inst_user_first.rb:628
+#, fuzzy
+#| msgid "User %1 will be imported."
+msgid "%d user will be imported"
+msgid_plural "%d users will be imported"
+msgstr[0] "Brukeren %1 vil bli importert."
+msgstr[1] "Brukeren %1 vil bli importert."
+
+#. selection box label
+#: src/lib/users/dialogs/users_to_import.rb:58
+msgid "&Select Users to Read"
+msgstr "Velg brukere som skal le&ses"
+
+#. check box label
+#: src/lib/users/dialogs/users_to_import.rb:66
+msgid "Select or Deselect &All"
+msgstr "Velg eller velg bort &alle"
+
+#. TRANSLATORS: encryption type
+#: src/lib/users/encryption_method.rb:55
+msgid "SHA-256"
+msgstr "SHA-256"
+
+#. TRANSLATORS: encryption type
+#: src/lib/users/encryption_method.rb:57
+msgid "SHA-512"
+msgstr "SHA-512"
+
+#. TRANSLATORS: summary line. Second %s is the name of the method
+#: src/lib/users/encryption_proposal.rb:35
+#, fuzzy
+#| msgid "Password Encryption Method: %1"
+msgid "Encryption Method: <a href=%s>%s</a>"
+msgstr "Passordkrypteringsmetode: %1"
+
+#. TRANSLATORS: menu button label
+#. menu button label
+#: src/lib/users/encryption_proposal.rb:66 src/lib/users/proposal.rb:82
+#, fuzzy
+#| msgid "Password Encryption Type"
+msgid "Password &Encryption Type"
+msgstr "Passordkrypteringstype"
+
+#. rich text label
+#: src/lib/users/proposal.rb:75
+msgid "User Settings"
+msgstr "Brukerinnstillinger"
+
+#. menu button label
+#: src/lib/users/proposal.rb:78
+msgid "&User"
+msgstr "&Bruker"
+
+#. menu button label
+#: src/lib/users/proposal.rb:80
+msgid "&Root Password"
+msgstr "&Rotpassord"
+
+#. TRANSLATORS: summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/lib/users/proposal.rb:92
+msgid "<%1>Root Password<%2> set"
+msgstr "<%1>Rotpassord<%2> definert"
+
+#. TRANSLATORS: summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/lib/users/proposal.rb:95
+msgid "<%1>Root Password<%2> not set"
+msgstr "<%1>Rotpassord<%2> ikke definert"
+
+#. summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/lib/users/proposal.rb:104
+msgid "No <%1>user<%2> configured"
+msgstr "Ingen <%1>bruker<%2> satt opp"
+
+#. TRANSLATORS: summary line, %d is the number of users
+#: src/lib/users/proposal.rb:110
+#, fuzzy
+#| msgid "<%1>User<%2> %3 will be imported."
+msgid "<a href=%s>%d user</a> will be imported"
+msgid_plural "<a href=%s>%d users</a> will be imported"
+msgstr[0] "<%1>Brukeren<%2> %3 vil bli importert."
+msgstr[1] "<%1>Brukeren<%2> %3 vil bli importert."
+
+#. TRANSLATORS: summary line: <%1>-<%2> are HTML tags, leave untouched,
+#. %3 is login name
+#: src/lib/users/proposal.rb:118
+msgid "<%1>User<%2> %3 configured"
+msgstr "<%1>Brukeren<%2> %3 definert"
+
+#. summary line: <%1>-<%2> are HTML tags, leave untouched,
+#. %3 is full name, %4 login name
+#: src/lib/users/proposal.rb:127
+msgid "<%1>User<%2> %3 (%4) configured"
+msgstr "<%1>Brukeren<%2> %3 (%4) definert"
+
+#. TRANSLATORS: summary line. Second %s is the name of the method
+#: src/lib/users/proposal.rb:141
+#, fuzzy
+#| msgid "Password Encryption Method: %1"
+msgid "Password Encryption Method: <a href=%s>%s</a>"
+msgstr "Passordkrypteringsmetode: %1"
+
 #. User name for user: "root"
 #: src/modules/UsersUI.rb:44
 msgid "root"
@@ -4012,7 +3908,7 @@
 
 #. Popup text: %1 is the file name (e.g. /etc/fstab),
 #. %2 is the directory (e.g. /home),
-#: src/modules/Users.pm:740
+#: src/modules/Users.pm:722
 msgid ""
 "In %1, there is a mount point for the directory\n"
 "%2, which is used as a default home directory for new\n"
@@ -4031,202 +3927,202 @@
 "etter at de er riktig montert. Vil du fortsette brukerkonfigurasjonen?"
 
 #. error message
-#: src/modules/Users.pm:988
+#: src/modules/Users.pm:970
 msgid "Multiple users satisfy the input conditions."
 msgstr "Flere brukere samsvarer med vilkårene."
 
 #. progress caption
-#: src/modules/Users.pm:1566
+#: src/modules/Users.pm:1548
 msgid "Initializing User and Group Configuration"
 msgstr "Initialiserer bruker- og gruppekonfigurasjon"
 
 #. progress stage label
-#: src/modules/Users.pm:1573
+#: src/modules/Users.pm:1555
 msgid "Read the default login settings"
 msgstr "Les standardinnstillinger for innlogging"
 
 #. progress stage label
-#: src/modules/Users.pm:1575
+#: src/modules/Users.pm:1557
 msgid "Read the default system settings"
 msgstr "Les standardinnstillinger for system"
 
 #. progress stage label
-#: src/modules/Users.pm:1577
+#: src/modules/Users.pm:1559
 msgid "Read the configuration type"
 msgstr "Les konfigurasjonstype"
 
 #. progress stage label
-#: src/modules/Users.pm:1579
+#: src/modules/Users.pm:1561
 msgid "Read the user custom settings"
 msgstr "Les spesialinnstillinger for bruker"
 
 #. progress stage label
-#: src/modules/Users.pm:1581
+#: src/modules/Users.pm:1563
 msgid "Read users and groups"
 msgstr "Les brukere og grupper"
 
 #. progress stage label
-#: src/modules/Users.pm:1583
+#: src/modules/Users.pm:1565
 msgid "Build the cache structures"
 msgstr "Opprett mellomlagerstrukturer"
 
 #. progress step label
-#: src/modules/Users.pm:1587
+#: src/modules/Users.pm:1569
 msgid "Reading the default login settings..."
 msgstr "Leser standardinnstillinger for innlogging..."
 
 #. progress step label
-#: src/modules/Users.pm:1589
+#: src/modules/Users.pm:1571
 msgid "Reading the default system settings..."
 msgstr "Leser standardinnstillinger for system..."
 
 #. progress step label
-#: src/modules/Users.pm:1591
+#: src/modules/Users.pm:1573
 msgid "Reading the configuration type..."
 msgstr "Leser konfigurasjonstype..."
 
 #. progress step label
-#: src/modules/Users.pm:1593
+#: src/modules/Users.pm:1575
 msgid "Reading custom settings..."
 msgstr "Leser spesialinnstillinger..."
 
 #. progress step label
-#: src/modules/Users.pm:1595
+#: src/modules/Users.pm:1577
 msgid "Reading users and groups..."
 msgstr "Leser brukere og grupper..."
 
 #. progress step label
-#: src/modules/Users.pm:1597
+#: src/modules/Users.pm:1579
 msgid "Building the cache structures..."
 msgstr "Oppretter mellomlagerstrukturer..."
 
 #. final progress step label
-#: src/modules/Users.pm:1599 src/modules/Users.pm:4314
+#: src/modules/Users.pm:1581 src/modules/Users.pm:4296
 msgid "Finished"
 msgstr "Fullført"
 
 #. error message
-#: src/modules/Users.pm:2155
+#: src/modules/Users.pm:2137
 msgid "User does not exist."
 msgstr "Brukeren finnes ikke."
 
 #. error message
-#: src/modules/Users.pm:2407
+#: src/modules/Users.pm:2389
 msgid "Group does not exist."
 msgstr "Gruppen finnes ikke."
 
 #. progress caption
-#: src/modules/Users.pm:4276
+#: src/modules/Users.pm:4258
 msgid "Writing User and Group Configuration"
 msgstr "Lagrer bruker- og gruppekonfigurasjon"
 
 #. progress stage label
-#: src/modules/Users.pm:4285
+#: src/modules/Users.pm:4267
 msgid "Write LDAP users and groups"
 msgstr "Lagre LDAP-brukere og -grupper"
 
 #. progress stage label
-#: src/modules/Users.pm:4287
+#: src/modules/Users.pm:4269
 msgid "Write groups"
 msgstr "Lagre grupper"
 
 #. progress stage label
-#: src/modules/Users.pm:4289
+#: src/modules/Users.pm:4271
 msgid "Check for deleted users"
 msgstr "Søk etter slettede brukere"
 
 #. progress stage label
-#: src/modules/Users.pm:4291
+#: src/modules/Users.pm:4273
 msgid "Write users"
 msgstr "Lagre brukere"
 
 #. progress stage label
-#: src/modules/Users.pm:4293
+#: src/modules/Users.pm:4275
 msgid "Write passwords"
 msgstr "Lagre passord"
 
 #. progress stage label
-#: src/modules/Users.pm:4295
+#: src/modules/Users.pm:4277
 msgid "Write the custom settings"
 msgstr "Lagre spesialinnstillinger"
 
 #. progress stage label
-#: src/modules/Users.pm:4297
+#: src/modules/Users.pm:4279
 msgid "Write the default login settings"
 msgstr "Les standardinnstillinger for innlogging"
 
 #. progress step label
-#: src/modules/Users.pm:4300
+#: src/modules/Users.pm:4282
 msgid "Writing LDAP users and groups..."
 msgstr "Lagrer LDAP-brukere og -grupper..."
 
 #. progress step label
-#: src/modules/Users.pm:4302
+#: src/modules/Users.pm:4284
 msgid "Writing groups..."
 msgstr "Lagrer grupper..."
 
 #. progress step label
-#: src/modules/Users.pm:4304
+#: src/modules/Users.pm:4286
 msgid "Checking deleted users..."
 msgstr "Søker etter slettede brukere..."
 
 #. progress step label
-#: src/modules/Users.pm:4306
+#: src/modules/Users.pm:4288
 msgid "Writing users..."
 msgstr "Lagrer brukere..."
 
 #. progress step label
-#: src/modules/Users.pm:4308
+#: src/modules/Users.pm:4290
 msgid "Writing passwords..."
 msgstr "Lagrer passord..."
 
 #. progress step label
-#: src/modules/Users.pm:4310
+#: src/modules/Users.pm:4292
 msgid "Writing the custom settings..."
 msgstr "Lagrer spesialinnstillinger..."
 
 #. progress step label
-#: src/modules/Users.pm:4312
+#: src/modules/Users.pm:4294
 msgid "Writing the default login settings..."
 msgstr "Lagrer standardinnstillinger for innlogging..."
 
 #. error popup (%s is a file name)
-#: src/modules/Users.pm:4397
+#: src/modules/Users.pm:4379
 #, perl-format
 msgid "File %s was not read correctly, so it will not be written."
 msgstr "Filen %s kunne ikke leses riktig og vil ikke ble lagret."
 
 #. error popup
-#: src/modules/Users.pm:4433 src/modules/Users.pm:4468
-#: src/modules/Users.pm:4744
+#: src/modules/Users.pm:4415 src/modules/Users.pm:4450
+#: src/modules/Users.pm:4726
 msgid "An error occurred while removing users."
 msgstr "Det oppstod en feil under sletting av brukere."
 
 #. error popup (%s is a file name)
-#: src/modules/Users.pm:4446 src/modules/Users.pm:4594
+#: src/modules/Users.pm:4428 src/modules/Users.pm:4576
 #, perl-format
 msgid "File %s was not correctly read, so it will not be written."
 msgstr "Filen %s kunne ikke leses riktig og vil ikke ble lagret."
 
 #. error message
-#: src/modules/Users.pm:4583
+#: src/modules/Users.pm:4565
 msgid ""
 "\n"
 "Encryption support is not installed, home directories will NOT be encrypted."
 msgstr ""
 
 #. error popup
-#: src/modules/Users.pm:4785 src/modules/YaPI/ADMINISTRATOR.pm:101
+#: src/modules/Users.pm:4767 src/modules/YaPI/ADMINISTRATOR.pm:101
 msgid "An error occurred while setting forwarding for root's mail."
 msgstr "Det oppstod en feil under konfigurasjon av videresending av rotbrukerens e-post."
 
 #. error popup
-#: src/modules/Users.pm:4861
+#: src/modules/Users.pm:4843
 msgid "No UID is available for this type of user."
 msgstr "Det finnes ingen tilgjengelig UID for denne brukertypen."
 
 #. error popup
-#: src/modules/Users.pm:4892
+#: src/modules/Users.pm:4874
 #, perl-format
 msgid ""
 "The selected user ID is not allowed.\n"
@@ -4236,7 +4132,7 @@
 "Velg et gyldig heltall mellom %i og %i."
 
 #. popup question
-#: src/modules/Users.pm:4923
+#: src/modules/Users.pm:4905
 msgid ""
 "The user ID entered is already in use.\n"
 "Really use it?"
@@ -4245,7 +4141,7 @@
 "Vil du bruke det likevel?"
 
 #. popup question, %i are numbers
-#: src/modules/Users.pm:4936
+#: src/modules/Users.pm:4918
 #, perl-format
 msgid ""
 "The selected user ID is not from a range\n"
@@ -4257,7 +4153,7 @@
 "Vil du virkelig bruke den?"
 
 #. popup question
-#: src/modules/Users.pm:4951
+#: src/modules/Users.pm:4933
 #, perl-format
 msgid ""
 "The selected user ID is a local ID,\n"
@@ -4269,7 +4165,7 @@
 "Er du sikker at du vil endre typen til 'local'?"
 
 #. popup question
-#: src/modules/Users.pm:4965
+#: src/modules/Users.pm:4947
 #, perl-format
 msgid ""
 "The selected user ID is a system ID,\n"
@@ -4280,7 +4176,7 @@
 "fordi verdien er mindre enn %i. \n"
 "Er du sikker at du vil endre typen til 'system'?"
 
-#: src/modules/Users.pm:4999
+#: src/modules/Users.pm:4981
 msgid ""
 "\n"
 "The existing username might belong to a NIS or LDAP user.\n"
@@ -4289,7 +4185,7 @@
 "Brukernavnet kan tilhøre en eksisterende NIS- eller LDAP-bruker.\n"
 
 #. error popup, %1 might be additional sentence ("The existing username...")
-#: src/modules/Users.pm:5003
+#: src/modules/Users.pm:4985
 msgid ""
 "There is a conflict between the entered\n"
 "username and an existing username. %1\n"
@@ -4300,7 +4196,7 @@
 "Prøv et annet brukernavn."
 
 #. error popup
-#: src/modules/Users.pm:5033
+#: src/modules/Users.pm:5015
 msgid ""
 "The \"Additional User Information\" entry cannot\n"
 "contain a colon (:).  Try again."
@@ -4309,7 +4205,7 @@
 "inneholde et kolon (:). Prøv igjen."
 
 #. error popup
-#: src/modules/Users.pm:5040
+#: src/modules/Users.pm:5022
 msgid ""
 "The \"Additional User Information\" entry can consist\n"
 "of up to three sections separated by commas.\n"
@@ -4320,7 +4216,7 @@
 "Rediger oppføringene."
 
 #. error popup
-#: src/modules/Users.pm:5103
+#: src/modules/Users.pm:5085
 msgid ""
 "The home directory may only contain the following characters:\n"
 "a-z, A-Z, 0-9, and _-/\n"
@@ -4331,7 +4227,7 @@
 "Prøv igjen."
 
 #. error popup
-#: src/modules/Users.pm:5126
+#: src/modules/Users.pm:5108
 #, perl-format
 msgid ""
 "The directory %s is not writable.\n"
@@ -4341,7 +4237,7 @@
 "Velg en annen sti for hjemmekatalogen."
 
 #. error message
-#: src/modules/Users.pm:5137
+#: src/modules/Users.pm:5119
 msgid ""
 "The home directory is used by another user.\n"
 "Try again."
@@ -4350,7 +4246,7 @@
 "Prøv igjen."
 
 #. yes/no popup: user seleceted something strange as a home directory
-#: src/modules/Users.pm:5179
+#: src/modules/Users.pm:5161
 msgid ""
 "The path for the selected home directory already exists,\n"
 "but it is not a directory.\n"
@@ -4361,7 +4257,7 @@
 "Vil du virkelig bruke denne stien?"
 
 #. yes/no popup
-#: src/modules/Users.pm:5190
+#: src/modules/Users.pm:5172
 msgid ""
 "The home directory selected already exists.\n"
 "Use it and change its owner?"
@@ -4371,7 +4267,7 @@
 
 #. chown is not needed (#25200)
 #. yes/no popup
-#: src/modules/Users.pm:5197
+#: src/modules/Users.pm:5179
 #, perl-format
 msgid ""
 "The selected home directory (%s)\n"
@@ -4383,7 +4279,7 @@
 "Vil du bruke denne katalogen?\n"
 
 #. yes/no popup
-#: src/modules/Users.pm:5206
+#: src/modules/Users.pm:5188
 #, perl-format
 msgid ""
 "The home directory selected (%s)\n"
@@ -4397,7 +4293,7 @@
 "Vil du bruke denne katalogen?"
 
 #. popup question
-#: src/modules/Users.pm:5234
+#: src/modules/Users.pm:5216
 msgid ""
 "If you select a nonexistent shell, the user may be unable to log in.\n"
 "Use this shell?"
@@ -4406,12 +4302,12 @@
 "Vil du bruke dette skallet?"
 
 #. error popup
-#: src/modules/Users.pm:5254
+#: src/modules/Users.pm:5236
 msgid "No GID is available for this type of group."
 msgstr "Ingen GID er tilgjengelig for denne gruppetypen."
 
 #. error popup
-#: src/modules/Users.pm:5287
+#: src/modules/Users.pm:5269
 #, perl-format
 msgid ""
 "The selected group ID is not allowed.\n"
@@ -4421,7 +4317,7 @@
 "Velg et gyldig heltall mellom %i og %i."
 
 #. popup question
-#: src/modules/Users.pm:5317
+#: src/modules/Users.pm:5299
 msgid ""
 "The group ID entered is already in use.\n"
 "Really use it?"
@@ -4430,7 +4326,7 @@
 "Vil du bruke det likevel?"
 
 #. popup question, %i are numbers
-#: src/modules/Users.pm:5329
+#: src/modules/Users.pm:5311
 #, perl-format
 msgid ""
 "The selected group ID is not from a range\n"
@@ -4442,7 +4338,7 @@
 "Vil du virkelig bruke den?"
 
 #. popup question
-#: src/modules/Users.pm:5344
+#: src/modules/Users.pm:5326
 #, perl-format
 msgid ""
 "The selected group ID is a local ID,\n"
@@ -4454,7 +4350,7 @@
 "Er du sikker på at du vil endre gruppetypen til 'local'?"
 
 #. popup question
-#: src/modules/Users.pm:5358
+#: src/modules/Users.pm:5340
 #, perl-format
 msgid ""
 "The selected group ID is a system ID,\n"
@@ -4466,7 +4362,7 @@
 "Er du sikker på at du vil endre gruppetypen til 'system'?"
 
 #. error popup
-#: src/modules/Users.pm:5377
+#: src/modules/Users.pm:5359
 msgid ""
 "No group name entered.\n"
 "Try again."
@@ -4475,7 +4371,7 @@
 "Prøv igjen."
 
 #. error popup
-#: src/modules/Users.pm:5394
+#: src/modules/Users.pm:5376
 #, perl-format
 msgid ""
 "The group name must be between %i and %i characters in length.\n"
@@ -4485,7 +4381,7 @@
 "Prøv igjen."
 
 #. error popup
-#: src/modules/Users.pm:5407
+#: src/modules/Users.pm:5389
 msgid ""
 "The group name may contain only\n"
 "letters, digits, \"-\", \".\", and \"_\"\n"
@@ -4498,7 +4394,7 @@
 "Prøv igjen."
 
 #. error popup
-#: src/modules/Users.pm:5415
+#: src/modules/Users.pm:5397
 msgid ""
 "There is a conflict between the entered\n"
 "group name and an existing group name.\n"
@@ -4508,13 +4404,13 @@
 "du skrev inn og et eksisterende gruppenavn.\n"
 "Prøv et annet navn."
 
-#: src/modules/Users.pm:5531
+#: src/modules/Users.pm:5513
 #, perl-format
 msgid "User %s does not exist."
 msgstr "Brukeren %s finnes ikke."
 
 #. error message: group cannot be deleted
-#: src/modules/Users.pm:5585
+#: src/modules/Users.pm:5567
 msgid ""
 "You cannot delete this group because\n"
 "there are users that use this group\n"
@@ -4525,7 +4421,7 @@
 "som standardgruppe."
 
 #. error message: group cannot be deleted
-#: src/modules/Users.pm:5592
+#: src/modules/Users.pm:5574
 msgid ""
 "You cannot delete this group because\n"
 "there are users in the group.\n"
@@ -4536,22 +4432,22 @@
 "Slett disse brukerne fra gruppen først."
 
 #. summary label
-#: src/modules/Users.pm:6603
+#: src/modules/Users.pm:6587
 msgid "<h3>Users</h3>"
 msgstr "<h3>Brukere</h3>"
 
 #. summary label
-#: src/modules/Users.pm:6613
+#: src/modules/Users.pm:6597
 msgid "<h3>Groups</h3>"
 msgstr "<h3>Grupper</h3>"
 
 #. summary label
-#: src/modules/Users.pm:6624
+#: src/modules/Users.pm:6608
 msgid "<h3>Login Settings</h3>"
 msgstr "<h3>Innstillinger for innlogging</h3>"
 
 #. summary item, %1 is user name
-#: src/modules/Users.pm:6626
+#: src/modules/Users.pm:6610
 msgid "User %1 configured for automatic login"
 msgstr "Brukeren %1 blir logget automatisk inn"
 
@@ -4571,23 +4467,23 @@
 "finnes på LDAP-serveren. Vil du opprette den nå?"
 
 #. plugin name
-#: src/modules/UsersPluginKerberos.pm:122
+#: src/modules/UsersPluginKerberos.pm:124
 #, fuzzy
 #| msgid "Quota Configuration"
 msgid "Kerberos Configuration"
 msgstr "Diskkvotekonfigurasjon"
 
 #. user plugin summary (table item)
-#: src/modules/UsersPluginKerberos.pm:133
+#: src/modules/UsersPluginKerberos.pm:135
 msgid "No Kerberos Management for Groups"
 msgstr ""
 
 #. user plugin summary (table item)
-#: src/modules/UsersPluginKerberos.pm:136
+#: src/modules/UsersPluginKerberos.pm:138
 msgid "Manage Kerberos Principials"
 msgstr ""
 
-#: src/modules/UsersPluginKerberos.pm:260
+#: src/modules/UsersPluginKerberos.pm:262
 msgid "Cannot execute kadmin.local."
 msgstr ""
 
@@ -4719,7 +4615,7 @@
 
 #. the ']' is or-ed...
 #. error popup	
-#: src/modules/UsersSimple.pm:505
+#: src/modules/UsersSimple.pm:379
 msgid ""
 "The password may only contain the following characters:\n"
 "0-9, a-z, A-Z, and any of \"`~!@#$%^&* ,.;:._-+/|?='{[(<>)]}\\\".\n"
@@ -4730,7 +4626,7 @@
 "Prøv igjen."
 
 #. help text (default part shown in more places)
-#: src/modules/UsersSimple.pm:540
+#: src/modules/UsersSimple.pm:414
 msgid ""
 "<p>\n"
 "For the password, use only characters that can be found on an English keyboard\n"
@@ -4745,7 +4641,7 @@
 "</p>"
 
 #. error popup
-#: src/modules/UsersSimple.pm:620
+#: src/modules/UsersSimple.pm:494
 msgid ""
 "The user's full name cannot contain\n"
 "\":\" or \",\" characters.\n"
@@ -4756,37 +4652,37 @@
 "Prøv igjen."
 
 #. popup question
-#: src/modules/UsersSimple.pm:647
+#: src/modules/UsersSimple.pm:521
 msgid "You have used the group name as a part of the password."
 msgstr "Du har brukt gruppenavnet som en del av passordet."
 
 #. popup question
-#: src/modules/UsersSimple.pm:650
+#: src/modules/UsersSimple.pm:524
 msgid "You have used the username as a part of the password."
 msgstr "Du har benyttet brukernavnet som en del av passordet."
 
 #. popup question
-#: src/modules/UsersSimple.pm:659
+#: src/modules/UsersSimple.pm:533
 msgid "You have used only lowercase letters for the password."
 msgstr "Du har brukt bare små bokstaver for passordet."
 
 #. popup question
-#: src/modules/UsersSimple.pm:667
+#: src/modules/UsersSimple.pm:541
 msgid "You have used only uppercase letters for the password."
 msgstr "Du har brukt bare store bokstaver for passordet."
 
 #. popup question
-#: src/modules/UsersSimple.pm:674
+#: src/modules/UsersSimple.pm:548
 msgid "You have used a palindrome for the password."
 msgstr "Du har brukt et palindrom som passord."
 
 #. popup question
-#: src/modules/UsersSimple.pm:682
+#: src/modules/UsersSimple.pm:556
 msgid "You have used only digits for the password."
 msgstr "Du har brukt bare tall for passordet."
 
 #. popup question
-#: src/modules/UsersSimple.pm:704
+#: src/modules/UsersSimple.pm:578
 #, perl-format
 msgid ""
 "The password is too long for the current encryption method.\n"
@@ -4796,7 +4692,7 @@
 "Det vil bli forkortet til %s tegn?"
 
 #. error message
-#: src/modules/UsersSimple.pm:791
+#: src/modules/UsersSimple.pm:665
 #, perl-format
 msgid ""
 "The password is too simple:\n"
@@ -4806,13 +4702,13 @@
 "%s."
 
 #. popup error, %i is number
-#: src/modules/UsersSimple.pm:805
+#: src/modules/UsersSimple.pm:679
 #, perl-format
 msgid "The password should have at least %i characters."
 msgstr "Passordet bør inneholde minst %i tegn."
 
 #. error popup
-#: src/modules/UsersSimple.pm:826
+#: src/modules/UsersSimple.pm:700
 msgid ""
 "No username entered.\n"
 "Try again."
@@ -4821,7 +4717,7 @@
 "Prøv igjen."
 
 #. error popup
-#: src/modules/UsersSimple.pm:836
+#: src/modules/UsersSimple.pm:710
 #, perl-format
 msgid ""
 "The username must be between %i and %i characters in length.\n"
@@ -4831,7 +4727,7 @@
 "Prøv igjen."
 
 #. error popup
-#: src/modules/UsersSimple.pm:865
+#: src/modules/UsersSimple.pm:739
 msgid ""
 "The username may contain only\n"
 "letters, digits, \"-\", \".\", and \"_\"\n"
@@ -4844,7 +4740,7 @@
 "Prøv igjen."
 
 #. error popup
-#: src/modules/UsersSimple.pm:886
+#: src/modules/UsersSimple.pm:760
 msgid ""
 "There is a conflict between the entered\n"
 "username and an existing username.\n"
@@ -4854,15 +4750,13 @@
 "skrev inn og et annet brukernavn.\n"
 "Prøv et annet brukernavn."
 
-#. busy popup message, %1 is package name
 #. busy popup message
-#: src/modules/UsersSimple.pm:1179 src/modules/UsersSimple.pm:1294
+#: src/modules/UsersSimple.pm:982
 msgid "Retrieving %1 extension..."
 msgstr "Henter %1-utvidelse..."
 
-#. busy popup message, %1 is package name
 #. busy popup message
-#: src/modules/UsersSimple.pm:1277 src/modules/UsersSimple.pm:1308
+#: src/modules/UsersSimple.pm:996
 msgid "Releasing %1 extension..."
 msgstr "Frigjør   -utvidelse"
 
@@ -4929,6 +4823,148 @@
 msgid "There are multiple users satisfying the input conditions."
 msgstr "Flere brukere samsvarer med vilkårene."
 
+#~ msgid "User Authentication Method"
+#~ msgstr "Metode for brukerautentisering"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "<b>Authentication</b><br>\n"
+#~ "Select the authentication method to use for users on your system.\n"
+#~ "</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "<b>Autentisering</b><br>\n"
+#~ "Her du kan du velge autentiseringsmetode for brukere i systemet.\n"
+#~ "</p>"
+
+#~ msgid "If you have a previous installation or alternative system, it is possible to create users based on this source. To do so, select <b>Read User Data from a Previous Installation</b>. This option uses an existing or creates a new home directory for each user in the location specified for this installation."
+#~ msgstr "Hvis du har en annen installasjon eller et annet system, kan du opprette brukere basert på denne kilden. Velg <b>Les brukerinformasjon fra tidligere installasjon</b> for å gjøre dette. Med dette valget kan du bruke en eksisterende eller opprette en ny hjemmekatalog for hver bruker på det spesifiserte stedet for denne installasjonen."
+
+#~ msgid "&LDAP"
+#~ msgstr "&LDAP"
+
+#~ msgid "N&IS"
+#~ msgstr "N&IS"
+
+#~ msgid "&Windows Domain"
+#~ msgstr "&Windows-domene"
+
+#~ msgid "L&ocal (/etc/passwd)"
+#~ msgstr "L&okal (/etc/passwd)"
+
+#~ msgid "eDirectory LDAP"
+#~ msgstr "eDirectory LDAP"
+
+#~ msgid ""
+#~ "<p>If you are using a NIS or LDAP server to store user data or if you want\n"
+#~ "to authenticate users against an NT server, choose the appropriate value. Then\n"
+#~ "press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>Hvis du bruker en NIS- eller LDAP-server til lagring av brukerdata eller hvis du vil\n"
+#~ "autentisere brukere mot en NT-server, velg den aktuelle verdien. Trykk deretter\n"
+#~ "<b>Neste</b>, og fortsett med klientkonfigurasjonen.</p>"
+
+#~ msgid ""
+#~ "<p>If you are using a NIS or LDAP server to store user data, choose the\n"
+#~ "appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>Hvis du bruker en NIS- eller LDAP-server til lagring av brukerdata, velg den\n"
+#~ "aktuelle verdien. Trykk deretter <b>Neste</b>, og fortsett med klientkonfigurasjonen.</p>"
+
+#~ msgid ""
+#~ "<p>If you are using an LDAP server to store user data or if you want to\n"
+#~ "authenticate users against an NT server, choose the appropriate value. Then\n"
+#~ "press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>Hvis du bruker en LDAP-server til lagring av brukerdata eller hvis du vil\n"
+#~ "autentisere brukere mot en NT-server, velg den aktuelle verdien. Trykk deretter\n"
+#~ "<b>Neste</b>, og fortsett med klientkonfigurasjonen.</p>"
+
+#~ msgid ""
+#~ "<p>If you are using an LDAP server to store user data, choose the\n"
+#~ "appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>Hvis du bruker en LDAP-server til lagring av brukerdata, velg den\n"
+#~ "aktuelle verdien. Trykk deretter <b>Neste</b>, og fortsett med klientkonfigurasjonen.</p>"
+
+#~ msgid "<p>Check <b>Set Up Kerberos Authentication</b> to configure Kerberos after configuring the user data source.</p>"
+#~ msgstr "<p>Kryss av for <b>Sett opp Kerberos-autentisering</b> for å konfigurere Kerberos etter at du har valgt brukerinformasjonskilde.</p>"
+
+#~ msgid "&Choose"
+#~ msgstr "&Velg"
+
+#~ msgid "Authentication Method"
+#~ msgstr "Metode for brukerautentisering"
+
+#~ msgid "Set Up &Kerberos Authentication"
+#~ msgstr "Sett opp &Kerberos-autentisering"
+
+#~ msgid "E&xpert Options..."
+#~ msgstr "A&vanserte alternativer..."
+
+#~ msgid ""
+#~ "<p>If you intend to use this password for creating certificates,\n"
+#~ "it has to be at least %1 characters long.</p>"
+#~ msgstr ""
+#~ "<p>Hvis du har til hensikt å bruke dette passordet til å opprette sertifikater,\n"
+#~ "må det har en lengde på minst %1 tegn.</p>"
+
+#~ msgid "<p>To check whether your current keyboard layout is correct, try entering text into the <b>Test Keyboard Layout</b> field.</p>"
+#~ msgstr "<p>Kontroller om gjeldende tastaturoppsett er riktig ved å skrive inn tekst i feltet <b>Test tastaturoppsett</b>.</p>"
+
+#~ msgid ""
+#~ "If you intend to create certificates,\n"
+#~ "the password should have at least %1 characters."
+#~ msgstr ""
+#~ "Hvis du har til hensikt å opprette sertifikater,\n"
+#~ "bør passordet ha minst %1 tegn."
+
+#~ msgid ""
+#~ "The root password could not be set.\n"
+#~ "You might not be able to log in.\n"
+#~ "Try setting it again?\n"
+#~ msgstr ""
+#~ "Et rotpassord kunne ikke defineres.\n"
+#~ "Du vil kanskje ikke kunne logge inn.\n"
+#~ "Vil du forsøke igjen?\n"
+
+#~ msgid "Initialization of module for configuration of authentication..."
+#~ msgstr "Initialisering av modul for konfigurasjon av autentisering..."
+
+#, fuzzy
+#~| msgid "<p><b>Login Settings</b></p>"
+#~ msgid "<p><b>Authentication</b><br></p>"
+#~ msgstr "<p><b>Innloggingsinnstillinger</b></p>"
+
+#~ msgid "Expert Settings"
+#~ msgstr "Avanserte innstillinger"
+
+#~ msgid "The authentication method is local /etc/passwd."
+#~ msgstr "Autentiseringsmetoden er lokal"
+
+#, fuzzy
+#~| msgid "The password encryption method is %1."
+#~ msgid "The password encryption method is %s."
+#~ msgstr "Krypteringsmetode for passord er %1."
+
+#~ msgid "&Change..."
+#~ msgstr "&Endre..."
+
+#~ msgid "Summary"
+#~ msgstr "Sammendrag"
+
+#~ msgid "Samba (Windows Domain)"
+#~ msgstr "              -domene"
+
+#~ msgid "<%1>Authentication method<%2>: %3"
+#~ msgstr "<%1>Autentiseringsmetode<%2>: %3"
+
+#~ msgid "<%1>Authentication method<%2>: %3 and Kerberos."
+#~ msgstr "<%1>Autentiseringsmetode<<%2>: %3 og Kerberos."
+
+#~ msgid "<%1>Users<%2> %3 selected for import"
+#~ msgstr "<%1>Brukerne<%2> %3 valgt for import"
+
 #~ msgid "No Password Entered"
 #~ msgstr "Passord er ikke angitt"
 

Modified: trunk/yast/nb/po/vm.nb.po
===================================================================
--- trunk/yast/nb/po/vm.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/vm.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: vm.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2008-10-31 01:17+0100\n"
 "Last-Translator: Olav P. \n"
 "Language-Team: Norwegian Bokmål <>\n"
@@ -34,12 +34,12 @@
 msgstr "Konfigurerer virtuell maskin..."
 
 #. check for kernel-bigsmp
-#: src/modules/VirtConfig.rb:158
+#: src/modules/VirtConfig.rb:157
 msgid "x86_64 is the only supported architecture for hosting virtual machines. Your architecture is "
 msgstr "x86_64 er den eneste arkitekturen som støttes som vert for virtuelle maskiner. Din arktitektur er "
 
 #. we are already in UML, nested virtual machine is not supported
-#: src/modules/VirtConfig.rb:177
+#: src/modules/VirtConfig.rb:176
 msgid ""
 "Virtual machine installation cannot be started inside the UML machine.\n"
 "Start installation in the host system.\n"
@@ -49,167 +49,167 @@
 
 #. progress stage 1/2
 #. Generate a pop dialog to allow user selection of Xen or KVM
-#: src/modules/VirtConfig.rb:194 src/modules/VirtConfig.rb:282
+#: src/modules/VirtConfig.rb:193 src/modules/VirtConfig.rb:281
 msgid "Verify Installed Packages"
 msgstr "Kontroller installerte pakker"
 
 #. progress stage 2/2
-#: src/modules/VirtConfig.rb:196
+#: src/modules/VirtConfig.rb:195
 msgid "Network Bridge Configuration"
 msgstr "Oppsett av nettverksbro"
 
 #. Headline for management domain installation
-#: src/modules/VirtConfig.rb:211
+#: src/modules/VirtConfig.rb:210
 msgid "Configuring the VM Server (domain 0)"
 msgstr "Konfigurerer VM-serveren (domene 0)"
 
 #. xen domain0 installation help text - 1/4
-#: src/modules/VirtConfig.rb:214
+#: src/modules/VirtConfig.rb:213
 msgid "<p><big><b>VM Server Configuration</b></big></p><p>Configuration of the VM Server (domain 0) has two parts.</p>"
 msgstr "<p><big><b>Konfigurasjon av VM-server</b></big></p><p>Konfigurasjon av VM-serveren (domene 0) foregår i to deler.</p>"
 
 #. xen domain0 installation help text - 2/4
-#: src/modules/VirtConfig.rb:218
+#: src/modules/VirtConfig.rb:217
 msgid "<p>The required packages are installed into the system first. Then the boot loader is switched to GRUB (if not already used) and the Xen section is added to the boot loader menu if it is missing.</p>"
 msgstr "<p>Nødvendige pakker installeres først. Deretter bytter systemet til oppstartslasteren GRUB (hvis denne ikke allerede brukes), og Xen-seksjonen legges til i oppstartslastermenyen hvis den mangler.</p>"
 
 #. xen domain0 installation help text - 3/4
-#: src/modules/VirtConfig.rb:222
+#: src/modules/VirtConfig.rb:221
 msgid "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and the Linux kernel.</p>"
 msgstr "<p>GRUB må brukes fordi den støtter multiboot-standarden  som kreves for å starte Xen- og Linux-kjernen.</p>"
 
 #. xen domain0 installation help text - 4/4
-#: src/modules/VirtConfig.rb:226
+#: src/modules/VirtConfig.rb:225
 msgid "<p>When the configuration has finished successfully, you can boot the VM Server from the boot loader menu.</p>"
 msgstr "<p>Når oppsettet er fullført, kan VM-serveren startes fra oppstartslastermenyen.</p>"
 
 #. error popup
-#: src/modules/VirtConfig.rb:231
+#: src/modules/VirtConfig.rb:230
 msgid "The installation will be aborted."
 msgstr "Installasjonen vil bli avbrutt."
 
-#: src/modules/VirtConfig.rb:234
+#: src/modules/VirtConfig.rb:233
 #, fuzzy
 #| msgid "Hypervisor and tools are installed."
 msgid "Choose Hypervisor(s) to install"
 msgstr "Hypervisor og verktøy er installert."
 
-#: src/modules/VirtConfig.rb:237
+#: src/modules/VirtConfig.rb:236
 msgid "Server: Minimal system to get a running Hypervisor"
 msgstr ""
 
-#: src/modules/VirtConfig.rb:238
+#: src/modules/VirtConfig.rb:237
 #, fuzzy
 #| msgid "Configuring the virtual machine..."
 msgid "Tools: Configure, manage and monitor virtual machines"
 msgstr "Konfigurerer virtuell maskin..."
 
-#: src/modules/VirtConfig.rb:251
+#: src/modules/VirtConfig.rb:250
 msgid "KVM Hypervisor"
 msgstr ""
 
-#: src/modules/VirtConfig.rb:253
+#: src/modules/VirtConfig.rb:252
 msgid "KVM server"
 msgstr ""
 
-#: src/modules/VirtConfig.rb:254
+#: src/modules/VirtConfig.rb:253
 #, fuzzy
 #| msgid "Admin tools"
 msgid "KVM tools"
 msgstr "Administrasjonsverktøy"
 
-#: src/modules/VirtConfig.rb:259
+#: src/modules/VirtConfig.rb:258
 msgid "libvirt LXC containers"
 msgstr ""
 
-#: src/modules/VirtConfig.rb:261
+#: src/modules/VirtConfig.rb:260
 msgid "libvirt LXC daemon"
 msgstr ""
 
-#: src/modules/VirtConfig.rb:289
+#: src/modules/VirtConfig.rb:288
 msgid "Software to connect to Virtualization server"
 msgstr ""
 
-#: src/modules/VirtConfig.rb:291
+#: src/modules/VirtConfig.rb:290
 #, fuzzy
 #| msgid "Hypervisor and tools are installed."
 msgid "Virtualization client tools"
 msgstr "Hypervisor og verktøy er installert."
 
-#: src/modules/VirtConfig.rb:307
+#: src/modules/VirtConfig.rb:306
 msgid "Xen Hypervisor"
 msgstr ""
 
-#: src/modules/VirtConfig.rb:309
+#: src/modules/VirtConfig.rb:308
 #, fuzzy
 #| msgid "Broken server"
 msgid "Xen server"
 msgstr "Deaktivert server"
 
-#: src/modules/VirtConfig.rb:310
+#: src/modules/VirtConfig.rb:309
 #, fuzzy
 #| msgid "Admin tools"
 msgid "Xen tools"
 msgstr "Administrasjonsverktøy"
 
 #. SLED doesn't have any installation capabilities (L3 support)
-#: src/modules/VirtConfig.rb:388
+#: src/modules/VirtConfig.rb:387
 #, fuzzy
 #| msgid "The installation will be aborted."
 msgid "Package installation failed\n"
 msgstr "Installasjonen vil bli avbrutt."
 
-#: src/modules/VirtConfig.rb:396
+#: src/modules/VirtConfig.rb:395
 #, fuzzy
 #| msgid "The installation will be aborted."
 msgid "Package installation failed for lxc\n"
 msgstr "Installasjonen vil bli avbrutt."
 
-#: src/modules/VirtConfig.rb:403
+#: src/modules/VirtConfig.rb:402
 msgid "Package installation failed for sled client pattern\n"
 msgstr ""
 
-#: src/modules/VirtConfig.rb:413
+#: src/modules/VirtConfig.rb:412
 msgid "Package installation failed for sles patterns\n"
 msgstr ""
 
 #. Assume python gtk is installed. If in text mode we don't care
-#: src/modules/VirtConfig.rb:426
+#: src/modules/VirtConfig.rb:425
 msgid "Running in text mode. Install graphical components anyway?"
 msgstr "Kjører i tekstmodus. Vil du likevel installere grafiske komponenter?"
 
 #. progressbar title - check whether Xen packages are installed
-#: src/modules/VirtConfig.rb:439
+#: src/modules/VirtConfig.rb:438
 msgid "Checking packages..."
 msgstr "Kontrollerer pakker..."
 
 #. progressbar title - install the required packages
-#: src/modules/VirtConfig.rb:442
+#: src/modules/VirtConfig.rb:441
 msgid "Installing packages..."
 msgstr "Installerer pakker..."
 
 #. error popup
 #. Now see if they really were installed (bnc#508347)
-#: src/modules/VirtConfig.rb:447 src/modules/VirtConfig.rb:454
+#: src/modules/VirtConfig.rb:446 src/modules/VirtConfig.rb:453
 msgid "Cannot install required packages."
 msgstr "Kan ikke installere nødvendige pakker."
 
 #. If grub2 is the bootloader and we succesfully installed Xen, update the grub2 files
-#: src/modules/VirtConfig.rb:464
+#: src/modules/VirtConfig.rb:463
 msgid "Updating grub2 configuration files..."
 msgstr "Oppdaterer konfigurasjonsfiler for grub2..."
 
 #. Default Bridge stage
-#: src/modules/VirtConfig.rb:484
+#: src/modules/VirtConfig.rb:477
 msgid "Configuring Default Network Bridge..."
 msgstr "Setter opp standard nettverksbro..."
 
 #. Popup yes/no dialog
-#: src/modules/VirtConfig.rb:505
+#: src/modules/VirtConfig.rb:498
 msgid "Network Bridge."
 msgstr "Nettverksbro."
 
-#: src/modules/VirtConfig.rb:506
+#: src/modules/VirtConfig.rb:499
 msgid "<p>For normal network configurations hosting virtual machines, a network bridge is recommended.</p><p>Configure a default network bridge?</p>"
 msgstr "<p>For vanlige nettverksoppsett med virtuelle maskiner anbefales det en nettverksbro.</p><p>Vil du sette opp en standard nettverksbro?</p>"
 
@@ -222,35 +222,35 @@
 #. Report::Error(_("Failed to configure the firewall to allow the Xen bridge") + "\n" + abortmsg);
 #. return false;
 #. }
-#: src/modules/VirtConfig.rb:567
+#: src/modules/VirtConfig.rb:568
 msgid "KVM components are installed. Your host is ready to install KVM guests."
 msgstr ""
 
-#: src/modules/VirtConfig.rb:570
+#: src/modules/VirtConfig.rb:571
 #, fuzzy
 #| msgid "For installing Xen guests, reboot the machine and select the Xen section in the boot loader menu.\n"
 msgid "KVM components are installed. Reboot the machine and select the native kernel in the boot loader menu to install KVM guests."
 msgstr "For å installere Xen-gjester, start maskinen på nytt og velg Xen-seksjonen i oppstartslastermenyen.\n"
 
-#: src/modules/VirtConfig.rb:573
+#: src/modules/VirtConfig.rb:574
 #, fuzzy
 #| msgid "For installing Xen guests, reboot the machine and select the Xen section in the boot loader menu.\n"
 msgid "For installing Xen guests, reboot the machine and select the Xen section in the boot loader menu."
 msgstr "For å installere Xen-gjester, start maskinen på nytt og velg Xen-seksjonen i oppstartslastermenyen.\n"
 
-#: src/modules/VirtConfig.rb:576
+#: src/modules/VirtConfig.rb:577
 #, fuzzy
 #| msgid "Hypervisor and tools are installed."
 msgid "Xen Hypervisor and tools are installed."
 msgstr "Hypervisor og verktøy er installert."
 
-#: src/modules/VirtConfig.rb:577
+#: src/modules/VirtConfig.rb:578
 #, fuzzy
 #| msgid "Hypervisor and tools are installed."
 msgid "Virtualization client tools are installed."
 msgstr "Hypervisor og verktøy er installert."
 
-#: src/modules/VirtConfig.rb:578
+#: src/modules/VirtConfig.rb:579
 #, fuzzy
 #| msgid "Hypervisor and tools are installed."
 msgid "Libvirt LXC components are installed."

Modified: trunk/yast/nb/po/vpn.nb.po
===================================================================
--- trunk/yast/nb/po/vpn.nb.po	2016-09-02 21:38:58 UTC (rev 96699)
+++ trunk/yast/nb/po/vpn.nb.po	2016-09-02 21:39:11 UTC (rev 96700)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:17+0200\n"
+"POT-Creation-Date: 2016-08-04 14:56+0200\n"
 "PO-Revision-Date: 2002-06-17 14:33+0200\n"
 "Last-Translator: www.linuxbutikken.no \n"
 "Language-Team: Norwegian \n"
@@ -237,14 +237,14 @@
 msgstr ""
 
 #. Create the user (:xauth or :eap). Return true if successful.
-#: src/lib/vpn/ipsec.rb:439
+#: src/lib/vpn/ipsec.rb:442
 #, fuzzy
 #| msgid "Specified queue name %1 is already used."
 msgid "The user name is already used."
 msgstr "Det spesifiserte kønavnet %1 er allerede i bruk."
 
 #. Set client certificate/key for a connection to remote gateway. Return true if successful, otherwise false.
-#: src/lib/vpn/ipsec.rb:503
+#: src/lib/vpn/ipsec.rb:506
 msgid "Cannot find a matching client connection."
 msgstr ""
 
@@ -345,122 +345,122 @@
 msgstr "Vil du forsøke en annen CD ?"
 
 #. Open dialog to edit VPN client passwords/certificates.
-#: src/lib/vpn/main_dialog.rb:285
+#: src/lib/vpn/main_dialog.rb:289
 msgid "Please enter gateway IP before editing credentials."
 msgstr ""
 
 #. Render a table of configured gateway and client connections.
-#: src/lib/vpn/main_dialog.rb:361
+#: src/lib/vpn/main_dialog.rb:365
 msgid "Name"
 msgstr "Navn"
 
-#: src/lib/vpn/main_dialog.rb:361
+#: src/lib/vpn/main_dialog.rb:365
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Render configuration controls for the chosen connection.
-#: src/lib/vpn/main_dialog.rb:376
+#: src/lib/vpn/main_dialog.rb:380
 msgid "Click 'New VPN' to create a gateway or client."
 msgstr ""
 
 #. Make widgets for connection configuration
-#: src/lib/vpn/main_dialog.rb:386
+#: src/lib/vpn/main_dialog.rb:390
 msgid "All IPv4 networks (0.0.0.0/0)"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:387
+#: src/lib/vpn/main_dialog.rb:391
 #, fuzzy
 #| msgid "All networks"
 msgid "All IPv6 networks (::/0)"
 msgstr "Alle nettverk"
 
-#: src/lib/vpn/main_dialog.rb:389
+#: src/lib/vpn/main_dialog.rb:393
 msgid "Limited CIDRs, comma separated:"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:395
+#: src/lib/vpn/main_dialog.rb:399
 #, fuzzy
 #| msgid "Connection Management"
 msgid "Connection name: "
 msgstr "Administrasjon av tilkoblinger"
 
-#: src/lib/vpn/main_dialog.rb:396
+#: src/lib/vpn/main_dialog.rb:400
 msgid "Type"
 msgstr "Type"
 
-#: src/lib/vpn/main_dialog.rb:398
+#: src/lib/vpn/main_dialog.rb:402
 #, fuzzy
 #| msgid "Master Server"
 msgid "Gateway (Server)"
 msgstr "Hovedserver"
 
-#: src/lib/vpn/main_dialog.rb:399
+#: src/lib/vpn/main_dialog.rb:403
 #, fuzzy
 #| msgid "Clients"
 msgid "Client"
 msgstr "Klienter"
 
-#: src/lib/vpn/main_dialog.rb:406
+#: src/lib/vpn/main_dialog.rb:410
 #, fuzzy
 #| msgid "Choose Scenario"
 msgid "The scenario is"
 msgstr "Velg scenario"
 
-#: src/lib/vpn/main_dialog.rb:408
+#: src/lib/vpn/main_dialog.rb:412
 msgid "Secure communication with a pre-shared key"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:409
+#: src/lib/vpn/main_dialog.rb:413
 #, fuzzy
 #| msgid "Choose the directory with certificates"
 msgid "Secure communication with a certificate"
 msgstr "Velg katalogen med sertifikater"
 
-#: src/lib/vpn/main_dialog.rb:410
+#: src/lib/vpn/main_dialog.rb:414
 msgid "Provide access to Android, iOS, MacOS X clients"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:411
+#: src/lib/vpn/main_dialog.rb:415
 msgid "Provide access to Windows 7, Windows 8 clients"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:413 src/lib/vpn/main_dialog.rb:427
+#: src/lib/vpn/main_dialog.rb:417 src/lib/vpn/main_dialog.rb:431
 #, fuzzy
 #| msgid "External credentials"
 msgid "Edit Credentials"
 msgstr "Eksterne sertifikater"
 
-#: src/lib/vpn/main_dialog.rb:416
+#: src/lib/vpn/main_dialog.rb:420
 msgid "Provide VPN clients access to"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:417
+#: src/lib/vpn/main_dialog.rb:421
 msgid "Clients' address pool (e.g. 192.168.100.0/24)"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:421
+#: src/lib/vpn/main_dialog.rb:425
 #, fuzzy
 #| msgid "Server Requires Authentication"
 msgid "The gateway requires authentication"
 msgstr "Serveren krever autentisering"
 
-#: src/lib/vpn/main_dialog.rb:423
+#: src/lib/vpn/main_dialog.rb:427
 msgid "By a pre-shared key"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:424
+#: src/lib/vpn/main_dialog.rb:428
 #, fuzzy
 #| msgid "Read certificates"
 msgid "By a certificate"
 msgstr "Les sertifikater"
 
-#: src/lib/vpn/main_dialog.rb:426
+#: src/lib/vpn/main_dialog.rb:430
 #, fuzzy
 #| msgid "Default &Gateway IP"
 msgid "VPN gateway IP"
 msgstr "Standard &systemport"
 
-#: src/lib/vpn/main_dialog.rb:430
+#: src/lib/vpn/main_dialog.rb:434
 msgid "Use the VPN tunnel to access"
 msgstr ""
 
@@ -579,40 +579,40 @@
 msgstr "Smart er ikke tilgjengelig for denne disken."
 
 #. Install packages
-#: src/modules/IPSecConf.rb:172
+#: src/modules/IPSecConf.rb:174
 #, fuzzy
 #| msgid "Failed to install required packages."
 msgid "Failed to install IPSec packages."
 msgstr "Nødvendige pakker kunne ikke installeres."
 
 #. Enable/disable daemon
-#: src/modules/IPSecConf.rb:180
+#: src/modules/IPSecConf.rb:182
 #, fuzzy
 #| msgid "Failed to start the CUPS daemon"
 msgid "Failed to start IPSec daemon."
 msgstr "Kunne ikke starte CUPS-nissen"
 
 #. Configure IP forwarding
-#: src/modules/IPSecConf.rb:210
+#: src/modules/IPSecConf.rb:212
 #, fuzzy
 #| msgid "Failed to apply the settings to the system."
 msgid "Failed to apply IP forwarding settings using sysctl:"
 msgstr "Kunne ikke bruke innstillingene i systemet."
 
 #. Configure/deconfigure firewall
-#: src/modules/IPSecConf.rb:225
+#: src/modules/IPSecConf.rb:228
 msgid ""
 "SuSE firewall is enabled but not activated.\n"
 "In order for VPN to function properly, SuSE firewall will now be activated."
 msgstr ""
 
-#: src/modules/IPSecConf.rb:229 src/modules/IPSecConf.rb:234
+#: src/modules/IPSecConf.rb:232 src/modules/IPSecConf.rb:237
 #, fuzzy
 #| msgid "Failed to create the new map."
 msgid "Failed to restart SuSE firewall."
 msgstr "Kunne ikke opprette nytt kart."
 
-#: src/modules/IPSecConf.rb:240
+#: src/modules/IPSecConf.rb:243
 msgid ""
 "Both VPN gateway and clients require special SuSE firewall configuration.\n"
 "SuSE firewall is not enabled, therefore you must manually run the configuration script on every reboot. The script will be run now.\n"
@@ -620,35 +620,35 @@
 msgstr ""
 
 #. AutoYaST: Return a rich text summary of the current configuration.
-#: src/modules/IPSecConf.rb:279
+#: src/modules/IPSecConf.rb:282
 #, fuzzy
 #| msgid "Global Settings"
 msgid "VPN Global Settings"
 msgstr "Generelle innstillinger"
 
-#: src/modules/IPSecConf.rb:280
+#: src/modules/IPSecConf.rb:283
 #, fuzzy
 #| msgid "Enable VPN Services"
 msgid "Enable VPN (IPSec) daemon: %s"
 msgstr "Aktiver VPN-tjenester"
 
-#: src/modules/IPSecConf.rb:281
-msgid "Reduce TCP MSS to 1024: %s"
+#: src/modules/IPSecConf.rb:284
+msgid "Reduce TCP MSS: %s"
 msgstr ""
 
-#: src/modules/IPSecConf.rb:282
+#: src/modules/IPSecConf.rb:285
 #, fuzzy
 #| msgid "Create Client Connection"
 msgid "Gateway and Connections"
 msgstr "Opprett klienttilkobling"
 
 #. Gateway summary
-#: src/modules/IPSecConf.rb:288
+#: src/modules/IPSecConf.rb:291
 msgid "A gateway serving clients in "
 msgstr ""
 
 #. Client summary
-#: src/modules/IPSecConf.rb:292
+#: src/modules/IPSecConf.rb:295
 #, fuzzy
 #| msgid "Read current connection setup"
 msgid "A client connecting to "

    

[opensuse-translation-commit] r96700 - trunk/yast/nb/po

minton＠svn2.opensuse.org