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

7 Oct 2014

Author: keichwa
Date: 2014-10-07 18:07:01 +0200 (Tue, 07 Oct 2014)
New Revision: 89813

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

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

--- trunk/yast/nb/po/add-on-creator.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/add-on-creator.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: add-on-creator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:55+0100\n"
+"POT-Creation-Date: 2014-07-04 15:51+0200\n"
 "PO-Revision-Date: 2013-10-04 17:40+0200\n"
 "Last-Translator: Olav Pettershagen <olpetter@bbnett.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"

Modified: trunk/yast/nb/po/add-on.nb.po
===================================================================
--- trunk/yast/nb/po/add-on.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/add-on.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: add-on\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:33+0200\n"
+"POT-Creation-Date: 2014-07-04 15:51+0200\n"
 "PO-Revision-Date: 2009-08-03 18:38+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: American English <opensuse-translation@opensuse.org>\n"
@@ -65,21 +65,21 @@
 #. this is a heading
 #. Cleanup UI - Prepare it for progress callbacks
 #: src/clients/add-on.rb:105 src/clients/add-on_proposal.rb:76
-#: src/include/add-on/add-on-workflow.rb:1871
+#: src/include/add-on/add-on-workflow.rb:1877
 msgid "Add-On Products"
 msgstr "Tilleggsprodukter"
 
 #. busy message (dialog)
 #. TRANSLATORS: dialog content - a very simple label
 #: src/clients/add-on.rb:107 src/clients/inst_language_add-on.rb:155
-#: src/include/add-on/add-on-workflow.rb:1872
+#: src/include/add-on/add-on-workflow.rb:1878
 msgid "Initializing..."
 msgstr "Initialiserer ..."
 
 #. help
 #. TRANSLATORS: help text
 #: src/clients/add-on.rb:109 src/clients/inst_language_add-on.rb:157
-#: src/include/add-on/add-on-workflow.rb:1873
+#: src/include/add-on/add-on-workflow.rb:1879
 msgid "<p>Initializing add-on products...</p>"
 msgstr "<p>Initialiserer tilleggsprodukter...</p>"
 
@@ -105,10 +105,10 @@
 #. placeholder for unknown path
 #. placeholder for unknown URL
 #: src/clients/add-on_proposal.rb:35 src/clients/add-on_proposal.rb:41
-#: src/include/add-on/add-on-workflow.rb:374
-#: src/include/add-on/add-on-workflow.rb:384
-#: src/include/add-on/add-on-workflow.rb:940
-#: src/include/add-on/add-on-workflow.rb:949
+#: src/include/add-on/add-on-workflow.rb:371
+#: src/include/add-on/add-on-workflow.rb:381
+#: src/include/add-on/add-on-workflow.rb:937
+#: src/include/add-on/add-on-workflow.rb:946
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -132,7 +132,7 @@
 #. main screen heading
 #: src/clients/inst_language_add-on.rb:153
 #: src/clients/inst_language_add-on.rb:212
-#: src/include/add-on/add-on-workflow.rb:912
+#: src/include/add-on/add-on-workflow.rb:909
 msgid "Add-On Product Installation"
 msgstr "Installer tilleggsprodukt"
 
@@ -247,33 +247,33 @@
 #. ...
 #. ]
 #: src/include/add-on/add-on-workflow.rb:163
-#: src/include/add-on/add-on-workflow.rb:585
-#: src/include/add-on/add-on-workflow.rb:1586
-#: src/include/add-on/add-on-workflow.rb:1598
+#: src/include/add-on/add-on-workflow.rb:582
+#: src/include/add-on/add-on-workflow.rb:1592
+#: src/include/add-on/add-on-workflow.rb:1604
 msgid "No product found in the repository."
 msgstr "Ingen produkter funnet i pakkebrønnen"
 
 #. error report
-#: src/include/add-on/add-on-workflow.rb:319
+#: src/include/add-on/add-on-workflow.rb:316
 msgid "No software repository found on medium."
 msgstr "Ingen pakkebrønn funnet på mediet."
 
 #. busy message
-#: src/include/add-on/add-on-workflow.rb:338
+#: src/include/add-on/add-on-workflow.rb:335
 msgid "Initializing new source..."
 msgstr "Initialiserer ny kilde..."
 
-#: src/include/add-on/add-on-workflow.rb:379
+#: src/include/add-on/add-on-workflow.rb:376
 msgid "URL: %1, Directory: %2"
 msgstr "Adresse: %1, katalog: %2"
 
 #. dialog caption
-#: src/include/add-on/add-on-workflow.rb:392
+#: src/include/add-on/add-on-workflow.rb:389
 msgid "Software Repository Selection"
 msgstr "Valg av pakkebrønn"
 
 #. help text
-#: src/include/add-on/add-on-workflow.rb:394
+#: src/include/add-on/add-on-workflow.rb:391
 msgid ""
 "<p><big><b>Software Repository Selection</b></big><br>\n"
 "Multiple repositories were found on the selected medium.\n"
@@ -283,7 +283,7 @@
 "Flere pakkebrønner ble funnet på det valgte mediet.\n"
 "Velg pakkebrønnen som skal brukes.</p>\n"
 
-#: src/include/add-on/add-on-workflow.rb:404
+#: src/include/add-on/add-on-workflow.rb:401
 msgid "Repositories &Found"
 msgstr "Pakkebrønner &funnet"
 
@@ -295,33 +295,33 @@
 #. else
 #. {
 #. yes-no popup
-#: src/include/add-on/add-on-workflow.rb:416
-#: src/include/add-on/add-on-workflow.rb:743
+#: src/include/add-on/add-on-workflow.rb:413
+#: src/include/add-on/add-on-workflow.rb:740
 msgid "Really abort add-on product installation?"
 msgstr "Er du sikker på at du vil avbryte installasjonen av tilleggsproduktet?"
 
 #. popup message
-#: src/include/add-on/add-on-workflow.rb:427
+#: src/include/add-on/add-on-workflow.rb:424
 msgid "Select a repository."
 msgstr "Velg en pakkebrønn."
 
 #. message popup
-#: src/include/add-on/add-on-workflow.rb:632
+#: src/include/add-on/add-on-workflow.rb:629
 msgid "Dependencies of the add-on product cannot be fulfilled."
 msgstr "Tilleggsproduktet medfører konflikter som ikke kan løses."
 
 #. dialog caption
-#: src/include/add-on/add-on-workflow.rb:713
+#: src/include/add-on/add-on-workflow.rb:710
 msgid "Product Selection"
 msgstr "Produktvalg"
 
 #. multi selection list
-#: src/include/add-on/add-on-workflow.rb:719
+#: src/include/add-on/add-on-workflow.rb:716
 msgid "Available Products"
 msgstr "Tilgjengelige produkter"
 
 #. help text
-#: src/include/add-on/add-on-workflow.rb:725
+#: src/include/add-on/add-on-workflow.rb:722
 msgid ""
 "<p><b><big>Product Selection</big></b><br/>\n"
 "Multiple products were found in the repository. Select the products\n"
@@ -332,12 +332,12 @@
 "som skal installeres.</p>\n"
 
 #. message popup
-#: src/include/add-on/add-on-workflow.rb:793
+#: src/include/add-on/add-on-workflow.rb:790
 msgid "Dependencies of the selected add-on products cannot be fulfilled."
 msgstr "De valgte tilleggsproduktene medfører konflikter som ikke kan løses."
 
 #. Help for add-on products
-#: src/include/add-on/add-on-workflow.rb:915
+#: src/include/add-on/add-on-workflow.rb:912
 msgid ""
 "<p><big><b>Add-On Product Installation</b></big><br/>\n"
 "Here see all add-on products that are selected for installation.\n"
@@ -350,102 +350,102 @@
 "velg produktet og klikk <b>Slett</b>.</p>"
 
 #. table cell, %1 is URL, %2 is directory name
-#: src/include/add-on/add-on-workflow.rb:944
+#: src/include/add-on/add-on-workflow.rb:941
 msgid "%1, Directory: %2"
 msgstr "%1, Katalog: %2"
 
 #. table header
-#: src/include/add-on/add-on-workflow.rb:970
+#: src/include/add-on/add-on-workflow.rb:967
 msgid "Product"
 msgstr "Produkt"
 
 #. table header
-#: src/include/add-on/add-on-workflow.rb:972
+#: src/include/add-on/add-on-workflow.rb:969
 msgid "Media"
 msgstr "Medium"
 
 #. message report
-#: src/include/add-on/add-on-workflow.rb:1127
+#: src/include/add-on/add-on-workflow.rb:1124
 msgid "Select a product to delete."
 msgstr "Velg et produkt som skal slettes."
 
 #. TRANSLATORS: busy message
-#: src/include/add-on/add-on-workflow.rb:1135
+#: src/include/add-on/add-on-workflow.rb:1132
 msgid "Removing selected add-on..."
 msgstr "Fjerner valgt tilleggsprodukt..."
 
 #. TRANSLATORS: dialog caption
-#: src/include/add-on/add-on-workflow.rb:1253
+#: src/include/add-on/add-on-workflow.rb:1259
 msgid "Installed Add-on Products"
 msgstr "Installerte tilleggsprodukter"
 
 #. TRANSLATORS: table header item
-#: src/include/add-on/add-on-workflow.rb:1260
+#: src/include/add-on/add-on-workflow.rb:1266
 msgid "Add-on Product"
 msgstr "Tilleggsprodukt"
 
 #. TRANSLATORS: table header item
-#: src/include/add-on/add-on-workflow.rb:1262
+#: src/include/add-on/add-on-workflow.rb:1268
 msgid "URL"
 msgstr "Nettadresse"
 
 #. TRANSLATORS: push button
-#: src/include/add-on/add-on-workflow.rb:1276
+#: src/include/add-on/add-on-workflow.rb:1282
 msgid "Run &Software Manager..."
 msgstr "Kjør pakkeadmini&strasjon..."
 
 #. TRANSLATORS: dialog help adp/1
-#: src/include/add-on/add-on-workflow.rb:1280
+#: src/include/add-on/add-on-workflow.rb:1286
 msgid "<p>All add-on products installed on your system are displayed.</p>"
 msgstr "<p>Alle installerte tilleggsprodukter vises.</p>"
 
 #. TRANSLATORS: dialog help adp/2
-#: src/include/add-on/add-on-workflow.rb:1282
+#: src/include/add-on/add-on-workflow.rb:1288
 msgid "<p>Click <b>Add</b> to add a new add-on product, or <b>Delete</b> to remove an add-on which is in use.</p>"
 msgstr "<p>Klikk <b>Legg til</b> for å legge til et tilleggsprodukt eller <b>Slett</b> for å fjerne et tilleggsprodukt som er i bruk.</p>"
 
 #. no items
-#: src/include/add-on/add-on-workflow.rb:1335
+#: src/include/add-on/add-on-workflow.rb:1341
 msgid "<b>Vendor:</b> %1<br>"
 msgstr "<b>Produsent:</b> %1<br>"
 
-#: src/include/add-on/add-on-workflow.rb:1336
+#: src/include/add-on/add-on-workflow.rb:1342
 msgid "Unknown vendor"
 msgstr "Ukjent produsent"
 
-#: src/include/add-on/add-on-workflow.rb:1339
+#: src/include/add-on/add-on-workflow.rb:1345
 msgid "<b>Version:</b> %1<br>"
 msgstr "<b>Versjon:</b> %1<br>"
 
-#: src/include/add-on/add-on-workflow.rb:1340
+#: src/include/add-on/add-on-workflow.rb:1346
 msgid "Unknown version"
 msgstr "Ukjent versjon"
 
-#: src/include/add-on/add-on-workflow.rb:1343
+#: src/include/add-on/add-on-workflow.rb:1349
 msgid "<b>Repository URL:</b> %1<br>"
 msgstr "<b>Pakkebrønnadresse:</b> %1<br>"
 
-#: src/include/add-on/add-on-workflow.rb:1349
+#: src/include/add-on/add-on-workflow.rb:1355
 msgid "Unknown repository URL"
 msgstr "Ukjent pakkebrønnadresse"
 
-#: src/include/add-on/add-on-workflow.rb:1356
+#: src/include/add-on/add-on-workflow.rb:1362
 msgid "<b>Repository Alias:</b> %1<br>"
 msgstr "<b>Pakkebrønnalias:</b> %1<br>"
 
 #. Removes the currently selected Add-On
 #.
 #. @return [Boolean] whether something has changed its state
-#: src/include/add-on/add-on-workflow.rb:1636
-#: src/include/add-on/add-on-workflow.rb:1689
+#: src/include/add-on/add-on-workflow.rb:1642
+#: src/include/add-on/add-on-workflow.rb:1695
 msgid "Unknown product"
 msgstr "Ukjent produkt"
 
-#: src/include/add-on/add-on-workflow.rb:1639
+#: src/include/add-on/add-on-workflow.rb:1645
 msgid "Unknown URL"
 msgstr "Ukjent adresse"
 
-#: src/include/add-on/add-on-workflow.rb:1695
+#: src/include/add-on/add-on-workflow.rb:1701
 msgid ""
 "Deleting the add-on product %1 may result in removing all the packages\n"
 "installed from this add-on.\n"
@@ -458,7 +458,7 @@
 "Vil du fjerne tilleggsproduktet?"
 
 #. TRANSLATORS: busy popup message
-#: src/include/add-on/add-on-workflow.rb:1712
+#: src/include/add-on/add-on-workflow.rb:1718
 msgid "Removing product dependencies..."
 msgstr "Fjerner pakker som avhenger av produktet..."
 

Modified: trunk/yast/nb/po/audit-laf.nb.po
===================================================================
--- trunk/yast/nb/po/audit-laf.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/audit-laf.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:37+0200\n"
+"POT-Creation-Date: 2014-07-04 15:51+0200\n"
 "PO-Revision-Date: 2009-09-25 13:46+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -883,36 +883,48 @@
 msgid "Cannot read audit.rules."
 msgstr "Kan ikke lese audit.rules."
 
-#. Error message
+#. question shown in a popup about start of audit daemon
+#: src/modules/AuditLaf.rb:463
+msgid "Do you want to start it and enable start at boot\n"
+msgstr ""
+
+#. question continues
+#: src/modules/AuditLaf.rb:467
+msgid "The daemon 'auditd' doesn't run.\n"
+msgstr ""
+
+#. message about loaded kernel module
 #: src/modules/AuditLaf.rb:471
-msgid ""
-"The audit daemon doesn't run.\n"
-"Do you want to start it now?"
+msgid "The 'apparmor' kernel module is loaded.\n"
 msgstr ""
-"audit-nissen kjører ikke.\n"
-"Vil du starte den nå?"
 
-#: src/modules/AuditLaf.rb:476
-msgid ""
-" The 'apparmor' kernel module is loaded.\n"
-"The kernel uses a running audit daemon to log audit\n"
-"events to /var/log/audit/audit.log (default). \n"
-"Do you want to start the daemon now?"
+#. Headline of a popup
+#: src/modules/AuditLaf.rb:480
+#, fuzzy
+#| msgid "Start daemon."
+msgid "Start of Audit Daemon"
+msgstr "Aktiver nisse."
+
+#. label of three buttons belonging to the popup
+#: src/modules/AuditLaf.rb:482
+msgid "Start and &Enable"
 msgstr ""
-" 'apparmor'-kjernemodulen er lastet.\n"
-"Den trenger audit-nissen for å logge hendelser i\n"
-"/var/log/audit/audit.log (standard). \n"
-"Vil du starte nissen nå?"
 
-#: src/modules/AuditLaf.rb:484
-msgid "Audit daemon not running."
-msgstr "Audit-nissen kjører ikke."
+#: src/modules/AuditLaf.rb:482
+msgid "&Start"
+msgstr "&Start"
 
-#: src/modules/AuditLaf.rb:489
+#: src/modules/AuditLaf.rb:482
+#, fuzzy
+#| msgid "Do not install"
+msgid "&Do not start"
+msgstr "Ikke installer"
+
+#: src/modules/AuditLaf.rb:491
 msgid "Cannot start the audit daemon."
 msgstr "Kan ikke starte audit-nissen."
 
-#: src/modules/AuditLaf.rb:490
+#: src/modules/AuditLaf.rb:492
 msgid ""
 "The rules may be locked.\n"
 "Continue to check the rules. You can change\n"
@@ -925,36 +937,36 @@
 "maskinen på nytt for å aktivere endringen.\n"
 
 #. Auditd read dialog caption
-#: src/modules/AuditLaf.rb:546
+#: src/modules/AuditLaf.rb:548
 msgid "Saving Audit Configuration"
 msgstr "Lagrer audit-oppsett"
 
 #. Progress stage 1/2
-#: src/modules/AuditLaf.rb:562
+#: src/modules/AuditLaf.rb:564
 msgid "Write the settings"
 msgstr "Lagre innstillingene"
 
 #. Progress stage 2/2
-#: src/modules/AuditLaf.rb:564
+#: src/modules/AuditLaf.rb:566
 msgid "Write the rules"
 msgstr "Lagre reglene"
 
 #. Progress step 1/2
-#: src/modules/AuditLaf.rb:568
+#: src/modules/AuditLaf.rb:570
 msgid "Writing the settings..."
 msgstr "Lagrer innstillingene..."
 
 #. Progress step 2/2
-#: src/modules/AuditLaf.rb:570
+#: src/modules/AuditLaf.rb:572
 msgid "Writing the rules..."
 msgstr "Lagrer reglene..."
 
 #. check first whether rules are already locked
-#: src/modules/AuditLaf.rb:586
+#: src/modules/AuditLaf.rb:588
 msgid "The rules are already locked."
 msgstr "Reglene er allerede låst."
 
-#: src/modules/AuditLaf.rb:587
+#: src/modules/AuditLaf.rb:589
 msgid ""
 "Do you want to change the 'Enabled Flag'?\n"
 "If yes, the new rules will be written to /etc/audit/audit.rules.\n"
@@ -965,30 +977,51 @@
 "Deretter må du starte maskinen på nytt.\n"
 
 #. Error message
-#: src/modules/AuditLaf.rb:612
+#: src/modules/AuditLaf.rb:614
 msgid "Restart of the audit daemon failed."
 msgstr "Audit-nissen kunne ikke startes på nytt."
 
 #. Error message
-#: src/modules/AuditLaf.rb:619
+#: src/modules/AuditLaf.rb:621
 msgid "Cannot write settings to auditd.conf."
 msgstr "Kan ikke lagre innstillingene i audit.conf."
 
 #. Error message, rules cannot be set
-#: src/modules/AuditLaf.rb:650
+#: src/modules/AuditLaf.rb:652
 msgid "Start yast2-audit-laf again and check the rules."
 msgstr "Start yast2-audit-laf på nytt og kontroller reglene."
 
-#: src/modules/AuditLaf.rb:656
+#: src/modules/AuditLaf.rb:658
 msgid "Cannot write settings to auditd.rules."
 msgstr "Kan ikke lagre innstillingene i audit.rules."
 
 #. Create a textual summary and a list of unconfigured cards
 #. @return summary of the current configuration
-#: src/modules/AuditLaf.rb:705
+#: src/modules/AuditLaf.rb:707
 msgid "Log file"
 msgstr "Loggfil"
 
+#~ msgid ""
+#~ "The audit daemon doesn't run.\n"
+#~ "Do you want to start it now?"
+#~ msgstr ""
+#~ "audit-nissen kjører ikke.\n"
+#~ "Vil du starte den nå?"
+
+#~ msgid ""
+#~ " The 'apparmor' kernel module is loaded.\n"
+#~ "The kernel uses a running audit daemon to log audit\n"
+#~ "events to /var/log/audit/audit.log (default). \n"
+#~ "Do you want to start the daemon now?"
+#~ msgstr ""
+#~ " 'apparmor'-kjernemodulen er lastet.\n"
+#~ "Den trenger audit-nissen for å logge hendelser i\n"
+#~ "/var/log/audit/audit.log (standard). \n"
+#~ "Vil du starte nissen nå?"
+
+#~ msgid "Audit daemon not running."
+#~ msgstr "Audit-nissen kjører ikke."
+
 #~ msgid "Log format (RAW, NOLOG)"
 #~ msgstr "Loggformat (RAW, NOLOG)"
 

Modified: trunk/yast/nb/po/auth-client.nb.po
===================================================================
--- trunk/yast/nb/po/auth-client.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/auth-client.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:51+0200\n"
 "PO-Revision-Date: 2014-05-19 09:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -57,12 +57,12 @@
 #: src/include/dialogs.rb:148 src/include/dialogs.rb:220
 #: src/include/dialogs.rb:310 src/include/dialogs.rb:371
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #: src/include/dialogs.rb:149 src/include/dialogs.rb:222
 #: src/include/dialogs.rb:313 src/include/dialogs.rb:373
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #. Waiting for response
 #. Waiting for response
@@ -86,7 +86,7 @@
 #: src/include/dialogs.rb:221 src/include/dialogs.rb:311
 #: src/include/dialogs.rb:372
 msgid "Help"
-msgstr ""
+msgstr "Hjelp"
 
 #. No we open the dialog
 #: src/include/dialogs.rb:306
@@ -95,7 +95,7 @@
 
 #: src/include/dialogs.rb:312
 msgid "New"
-msgstr ""
+msgstr "Ny"
 
 #: src/include/dialogs.rb:356
 msgid "Add New Domain"
@@ -129,7 +129,7 @@
 #. The default ldap schema rfc2307 is deprecated use rfc2307bis
 #: src/include/dialogs.rb:421
 msgid "Basic Settings:"
-msgstr ""
+msgstr "Grunninnstillinger:"
 
 #: src/include/dialogs.rb:423
 msgid "Services:"
@@ -170,7 +170,7 @@
 #. Main dialog contents
 #: src/include/dialogs.rb:512
 msgid "SPAM Prevention"
-msgstr ""
+msgstr "Søppelpostblokkering"
 
 #: src/include/dialogs.rb:526 src/include/dialogs.rb:580
 #: src/include/dialogs.rb:586
@@ -179,15 +179,15 @@
 
 #: src/include/dialogs.rb:538
 msgid "Add"
-msgstr ""
+msgstr "Legg til"
 
 #: src/include/dialogs.rb:539
 msgid "Edit"
-msgstr ""
+msgstr "Rediger"
 
 #: src/include/dialogs.rb:540
 msgid "Delete"
-msgstr ""
+msgstr "Slett"
 
 #. Inetd configure dialog caption
 #: src/include/dialogs.rb:547
@@ -391,23 +391,23 @@
 msgstr ""
 
 #: src/include/sssd-parameters.rb:263
-msgid "How many seconds nss_sss schould consider entries valid before asking the backend again."
+msgid "How many seconds nss_sss should consider entries valid before asking the backend again."
 msgstr ""
 
 #: src/include/sssd-parameters.rb:268
-msgid "How many seconds nss_sss schould consider user entries valid before asking the backend again."
+msgid "How many seconds nss_sss should consider user entries valid before asking the backend again."
 msgstr ""
 
 #: src/include/sssd-parameters.rb:273
-msgid "How many seconds nss_sss schould consider group entries valid before asking the backend again."
+msgid "How many seconds nss_sss should consider group entries valid before asking the backend again."
 msgstr ""
 
 #: src/include/sssd-parameters.rb:278
-msgid "How many seconds nss_sss schould consider netgroup entries valid before asking the backend again."
+msgid "How many seconds nss_sss should consider netgroup entries valid before asking the backend again."
 msgstr ""
 
 #: src/include/sssd-parameters.rb:283
-msgid "How many seconds nss_sss schould consider service entries valid before asking the backend again."
+msgid "How many seconds nss_sss should consider service entries valid before asking the backend again."
 msgstr ""
 
 #: src/include/sssd-parameters.rb:288

Modified: trunk/yast/nb/po/auth-server.nb.po
===================================================================
--- trunk/yast/nb/po/auth-server.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/auth-server.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:51+0200\n"
 "PO-Revision-Date: 2014-05-19 09:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -24,161 +24,161 @@
 
 #: src/clients/auth-server.rb:49
 msgid "Enable/Disable the service"
-msgstr ""
+msgstr "Aktiver/deaktiver tjenesten"
 
 #: src/clients/auth-server.rb:53
 msgid "Add a new database"
-msgstr ""
+msgstr "Legg til ny database"
 
 #: src/clients/auth-server.rb:60
 msgid "Show a list of currently available databases"
-msgstr ""
+msgstr "Vis en liste over tilgjengelige databaser"
 
 #: src/clients/auth-server.rb:64
 msgid "Show a list of currently configured schemas"
-msgstr ""
+msgstr "Vis en liste over valgte skjemaer"
 
 #: src/clients/auth-server.rb:68
 msgid "Add a schema to the list"
-msgstr ""
+msgstr "Legg til skjema i listen"
 
 #: src/clients/auth-server.rb:72
 msgid "Enable the service"
-msgstr ""
+msgstr "Aktiver tjenesten"
 
 #: src/clients/auth-server.rb:73
 msgid "Disable the service"
-msgstr ""
+msgstr "Deaktiver tjenesten"
 
 #: src/clients/auth-server.rb:75
 msgid "Database type (\"hdb\" or \"bdb\")"
-msgstr ""
+msgstr "                      eller"
 
 #: src/clients/auth-server.rb:79
 msgid "Base DN for the database"
-msgstr ""
+msgstr "Hoved-DN for database"
 
 #: src/clients/auth-server.rb:83
 msgid "DN for the administrator login"
-msgstr ""
+msgstr "DN for administratorpålogging"
 
 #: src/clients/auth-server.rb:87
 msgid "Administrator password"
-msgstr ""
+msgstr "Administratorpassord"
 
 #: src/clients/auth-server.rb:95
 msgid "Directory for the database"
-msgstr ""
+msgstr "Sti til databasekatalog"
 
 #: src/clients/auth-server.rb:98
 msgid "File"
-msgstr ""
+msgstr "Fil"
 
 #: src/clients/auth-server.rb:99
 msgid "Position"
-msgstr ""
+msgstr "Posisjon"
 
 #. map<string, any> edb = LdapServer::ReadDatabase();
 #. y2milestone("DBs: %1", edb);
 #.
 #: src/clients/auth-server.rb:192
 msgid "No base DN provided\n"
-msgstr ""
+msgstr "Ingen base-DN angitt\n"
 
 #: src/clients/auth-server.rb:209
 msgid "Database cannot be created when the service is not enabled"
-msgstr ""
+msgstr "        n kan ikke opprettes uten at tjenesten er aktivert"
 
 #. y2milestone("db-options : %1", db);
 #: src/clients/auth-server.rb:219
 msgid "Error while adding the database"
-msgstr ""
+msgstr "Feil under oppretting av database"
 
 #. error popup
 #. error popup
 #: src/clients/auth-server_proposal.rb:58
 #: src/clients/auth-server_proposal.rb:228
 msgid "The LDAP database has already been created. You can change the settings later in the installed system."
-msgstr ""
+msgstr "LDAP-database er allerede opprettet. Du kan endre innstillingene senere i det installerte systemet."
 
 #. y2error( "sysconfig var is '%1'", SCR::Read( .sysconfig.openldap.OPENLDAP_REGISTER_SLP ) );
 #: src/clients/auth-server_proposal.rb:101
 msgid "[root password]"
-msgstr ""
+msgstr "[rotpassord]"
 
 #: src/clients/auth-server_proposal.rb:103
 msgid "[manually set]"
-msgstr ""
+msgstr "[manuelt angitt]"
 
 #: src/clients/auth-server_proposal.rb:106
 msgid "Unable to retrieve the system root password.  Set an LDAP server password to continue."
-msgstr ""
+msgstr "Kan ikke hente systemets rotpassord.  Angi et LDAP-serverpassord for å fortsette."
 
 #: src/clients/auth-server_proposal.rb:112
 msgid "Setting up LDAP Master Server:"
-msgstr ""
+msgstr "Sette opp LDAP-masterserver:"
 
 #: src/clients/auth-server_proposal.rb:114
 msgid "Setting up standalone LDAP Server:"
-msgstr ""
+msgstr "Sette opp frittstående LDAP-server:"
 
 #: src/clients/auth-server_proposal.rb:121
 msgid "Base DN: "
-msgstr ""
+msgstr "Base-DN: "
 
 #: src/clients/auth-server_proposal.rb:125
 msgid "Root DN: "
-msgstr ""
+msgstr "Rot-DN: "
 
 #: src/clients/auth-server_proposal.rb:128
 msgid "LDAP Password: "
-msgstr ""
+msgstr "LDAP-passord: "
 
 #: src/clients/auth-server_proposal.rb:135
 msgid "Setting up LDAP Slave Server"
-msgstr ""
+msgstr "Sette opp LDAP-slaveserver"
 
 #: src/clients/auth-server_proposal.rb:143
 msgid "Provider: "
-msgstr ""
+msgstr "Leverandør:"
 
 #. all known interfaces for testing
 #: src/clients/auth-server_proposal.rb:185
 msgid "Open Port in Firewall"
-msgstr ""
+msgstr "Åpne port i brannmur"
 
 #: src/clients/auth-server_proposal.rb:188
 #: src/clients/auth-server_proposal.rb:203
 msgid "YES"
-msgstr ""
+msgstr "JA"
 
 #: src/clients/auth-server_proposal.rb:190
 #: src/clients/auth-server_proposal.rb:204
 #: src/clients/auth-server_proposal.rb:212
 msgid "NO"
-msgstr ""
+msgstr "NEI"
 
 #: src/clients/auth-server_proposal.rb:194
 msgid "Firewall is disabled"
-msgstr ""
+msgstr "Brannmur er deaktivert"
 
 #: src/clients/auth-server_proposal.rb:200
 msgid "Register at SLP Daemon: "
-msgstr ""
+msgstr "Registrer for SLP-nisse: "
 
 #: src/clients/auth-server_proposal.rb:212 src/modules/AuthServer.pm:2192
 msgid "Start LDAP Server: "
-msgstr ""
+msgstr "Start LDAP-serveren: "
 
 #. Rich text title for LdapServer in proposals
 #: src/clients/auth-server_proposal.rb:253
 msgid "OpenLDAP Server"
-msgstr ""
+msgstr "OpenLDAP-server"
 
 #. Menu title for LdapServer in proposals
 #: src/clients/auth-server_proposal.rb:257
 msgid "Open&LDAP Server"
-msgstr ""
+msgstr "Open&LDAP-server"
 
 #. translators: error popup before aborting the module
 #. translators: error popup before aborting the module
@@ -189,6 +189,9 @@
 "YaST2 cannot continue the configuration\n"
 "without installing the package."
 msgstr ""
+"Pakken '%1' er ikke tilgjengelig.\n"
+"YaST2 kan ikke fortsette konfigurasjonen\n"
+"uten at pakken installeres."
 
 #. translators: error popup before aborting the module
 #. translators: error popup before aborting the module
@@ -198,6 +201,8 @@
 "YaST2 cannot continue the configuration\n"
 "without installing the required packages."
 msgstr ""
+"YaST2 kan ikke fortsette oppsettet\n"
+"uten at alle nødvendige pakker er installert."
 
 #: src/clients/auth-server_proposal.rb:309
 msgid "OpenLDAP Replication Setup failed. Reconfigure after the installation has finished."
@@ -208,6 +213,8 @@
 "OpenLDAP Server: Common server certificate not available.\n"
 "StartTLS is disabled."
 msgstr ""
+"OpenLDAP-server: Generelt serversertifikat ikke tilgjengelig.\n"
+"StartTLS er deaktivert."
 
 #. Command line help text for the Xldap-server module
 #: src/clients/openldap-mirrormode.rb:36
@@ -217,7 +224,7 @@
 #. Start new config wizward
 #: src/include/auth-server/complex.rb:106
 msgid "Existing configuration detected."
-msgstr ""
+msgstr "Eksisterende oppsett funnet."
 
 #: src/include/auth-server/complex.rb:107
 msgid ""
@@ -225,18 +232,27 @@
 "Do you want to start the server now and re-read its configuration data or do you \n"
 "want to create a new configuration from scratch?"
 msgstr ""
+"Du har et eksisterende oppsett, men LDAP-serveren kjører ikke.\n"
+" Vil du starte serveren nå for å lese inn oppsettinformasjonen på nytt, eller vil du\n"
+" opprette et helt nytt oppsett?"
 
 #: src/include/auth-server/complex.rb:112
 #: src/include/auth-server/dialogs.rb:202
 msgid "Restart"
-msgstr ""
+msgstr "Start på nytt"
 
 #: src/include/auth-server/complex.rb:114
 #: src/include/auth-server/dialogs.rb:203
 msgid "New Configuration"
-msgstr ""
+msgstr "Nytt oppsett"
 
 #. Start new config wizward
+#: src/include/auth-server/complex.rb:134
+#, fuzzy
+#| msgid "Migrate existing configuration"
+msgid "Migrate existing Configuration"
+msgstr "Flytt eksisterende oppsett"
+
 #: src/include/auth-server/complex.rb:135
 msgid ""
 "Your system is currently configured to use the configuration file\n"
@@ -247,11 +263,11 @@
 
 #: src/include/auth-server/complex.rb:148
 msgid "Migrate existing configuration"
-msgstr ""
+msgstr "Flytt eksisterende oppsett"
 
 #: src/include/auth-server/complex.rb:151
 msgid "Create a new configuration from scratch"
-msgstr ""
+msgstr "Opprett et helt nytt oppsett"
 
 #. LdapServer summary dialog caption
 #: src/include/auth-server/complex.rb:231
@@ -275,41 +291,41 @@
 #. ********************
 #: src/include/auth-server/dialogs.rb:48
 msgid "General Settings"
-msgstr ""
+msgstr "Generelle innstillinger"
 
 #. list of valid encoding methods for password inputs, used by add database and edit database
 #. dialogs
 #: src/include/auth-server/dialogs.rb:52 src/include/auth-server/widgets.rb:40
 msgid "&Start LDAP Server"
-msgstr ""
+msgstr "&Start LDAP-serveren"
 
 #: src/include/auth-server/dialogs.rb:77 src/include/auth-server/widgets.rb:59
 msgid "Register at an &SLP Daemon"
-msgstr ""
+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
 msgid "Firewall Settings"
-msgstr ""
+msgstr "Brannmurinnstillinger"
 
 #. create new item
 #: src/include/auth-server/dialogs.rb:198
 msgid "The LDAP Server is not running."
-msgstr ""
+msgstr "LDAP-serveren kjører ikke."
 
 #: src/include/auth-server/dialogs.rb:199
 msgid "Do you want to start it now to re-read its configuration data or do you want to create a new configuration from scratch?"
-msgstr ""
+msgstr "Vil du starte den nå for å lese inn oppsettinformasjonen på nytt, eller vil du opprette et helt nytt oppsett?"
 
 #. get helps page
 #: src/include/auth-server/dialogs.rb:227
 msgid "help page for item <b>"
-msgstr ""
+msgstr "hjelpeside for element <b>"
 
 #: src/include/auth-server/dialogs.rb:228
 msgid "</b> not available"
-msgstr ""
+msgstr "</b> ikke tilgjengelig"
 
 #: src/include/auth-server/dialogs.rb:327
 msgid "Server Type"
@@ -344,7 +360,7 @@
 #. Button text
 #: src/include/auth-server/dialogs.rb:452
 msgid "&Advanced Configuration"
-msgstr ""
+msgstr "&Avansert konfigurasjon"
 
 #: src/include/auth-server/dialogs.rb:464
 msgid "Kerberos Authentication"
@@ -356,14 +372,14 @@
 
 #: src/include/auth-server/dialogs.rb:494
 msgid "Basic Kerberos Settings"
-msgstr ""
+msgstr "Grunninnstillinger for Kerberos"
 
 #. TextEntry label: "Realm" is a typical kerberos phrase.
 #. Please think twice please before you translate this,
 #. and check with kerberos.pot how it is translated there.
 #: src/include/auth-server/dialogs.rb:502
 msgid "R&ealm"
-msgstr ""
+msgstr "R&egion"
 
 #. abort?
 #: src/include/auth-server/dialogs.rb:563
@@ -376,49 +392,49 @@
 #. caption
 #: src/include/auth-server/dialogs.rb:595
 msgid "Advanced Kerberos Configuration"
-msgstr ""
+msgstr "Avansert konfigurasjon av Kerberos"
 
 #. tree widget label
 #: src/include/auth-server/dialogs.rb:623
 msgid "Advanced &Options"
-msgstr ""
+msgstr "Avanserte val&g"
 
 #. label widget
 #. header label
 #: src/include/auth-server/dialogs.rb:637
 #: src/include/auth-server/dialogs.rb:729
 msgid "Current Selection: "
-msgstr ""
+msgstr "Gjeldende valg: "
 
 #. tree widget headline
 #: src/include/auth-server/dialogs.rb:789
 msgid "Configuration:"
-msgstr ""
+msgstr "Konfigurasjon:"
 
 #. ############## input handler ################
 #: src/include/auth-server/dialogs.rb:913
 msgid "LDAP Authentication failed. Try again?\n"
-msgstr ""
+msgstr "LDAP-autentisering mislyktes. Vil du prøve igjen?\n"
 
 #: src/include/auth-server/dialogs.rb:914
 msgid "Error message: "
-msgstr ""
+msgstr "Feilmelding: "
 
 #: src/include/auth-server/dialogs.rb:946
 msgid "Create new account in the first database"
-msgstr ""
+msgstr "Opprett ny konto i første database"
 
 #: src/include/auth-server/dialogs.rb:960
 msgid "User Id"
-msgstr ""
+msgstr "Bruker-ID"
 
 #: src/include/auth-server/dialogs.rb:967
 msgid "Container Object"
-msgstr ""
+msgstr "Container-objekt"
 
 #: src/include/auth-server/dialogs.rb:973
 msgid "Browse"
-msgstr ""
+msgstr "Bla gjennom"
 
 #: src/include/auth-server/dialogs.rb:980
 msgid "Generate a Random Password"
@@ -430,20 +446,20 @@
 
 #: src/include/auth-server/dialogs.rb:1007
 msgid "Configure Account for Replication"
-msgstr ""
+msgstr "Sett opp konto for replikasjon"
 
 #: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:914
 #: src/modules/LdapDatabase.rb:1173
 msgid "is not a valid LDAP DN"
-msgstr ""
+msgstr "er ikke en gyldig DN for LDAP"
 
 #: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1679
 msgid "Password"
-msgstr ""
+msgstr "Passord"
 
 #: src/include/auth-server/dialogs.rb:1073
 msgid "Validate Password"
-msgstr ""
+msgstr "Valider passord"
 
 #: src/include/auth-server/dialogs.rb:1093
 #: src/include/auth-server/dialogs.rb:1565
@@ -466,35 +482,35 @@
 #: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1607
 #: src/modules/LdapDatabase.rb:1702
 msgid "Protocol"
-msgstr ""
+msgstr "Protokoll"
 
 #: src/include/auth-server/dialogs.rb:1146
 msgid "Provider Hostname"
-msgstr ""
+msgstr "Vertsnavn for leverandør"
 
 #: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1624
 msgid "Use StartTLS"
-msgstr ""
+msgstr "Bruk StartTLS"
 
 #: src/include/auth-server/dialogs.rb:1162
 msgid "Administration Password for the \"cn=config\" Database"
-msgstr ""
+msgstr "Administrasjonspassord for databasen «cn=config»"
 
 #: src/include/auth-server/dialogs.rb:1171
 #: src/include/auth-server/widgets.rb:261
 msgid "C&A Certificate File (PEM Format)"
-msgstr ""
+msgstr "C&A-sertifikatfil (PEM-format)"
 
 #: src/include/auth-server/dialogs.rb:1174
 #: src/include/auth-server/widgets.rb:264
 msgid "Bro&wse..."
-msgstr ""
+msgstr "Bla &gjennom..."
 
 #. file selection headline
 #: src/include/auth-server/dialogs.rb:1231
 #: src/include/auth-server/tree_structure.rb:567
 msgid "Select CA Certificate File"
-msgstr ""
+msgstr "Velg CA-sertifikatfil"
 
 #. ****************************
 #. * tls handlers
@@ -518,7 +534,7 @@
 
 #: src/include/auth-server/dialogs.rb:1287
 msgid "The following error messages were returned:"
-msgstr ""
+msgstr "Følgende feilmeldinger ble generert:"
 
 #: src/include/auth-server/dialogs.rb:1302
 msgid "An error occurred while verifying the TLS/SSL configuration."
@@ -526,7 +542,7 @@
 
 #: src/include/auth-server/dialogs.rb:1314
 msgid "Do you want to import a different CA/Server Certificate?"
-msgstr ""
+msgstr "Vil du importere et annet CA-/serversertifikat?"
 
 #. Check if the syncrepl config of cn=config makes sense
 #: src/include/auth-server/dialogs.rb:1325
@@ -535,7 +551,7 @@
 
 #: src/include/auth-server/dialogs.rb:1328
 msgid "Click Continue to create it now."
-msgstr ""
+msgstr "Klikk Fortsett for å opprette oppsettet nå."
 
 #. this test needs only be done in a non-MirrorMode setup
 #: src/include/auth-server/dialogs.rb:1380
@@ -556,7 +572,7 @@
 #: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1971
 #: src/modules/LdapDatabase.rb:1998
 msgid "The test returned the following error messages:"
-msgstr ""
+msgstr "Kontrollen genererte følgende feilmeldinger:"
 
 #: src/include/auth-server/dialogs.rb:1424
 msgid "Click \"Continue\" to correct this now."
@@ -566,7 +582,7 @@
 #. @return dialog result
 #: src/include/auth-server/dialogs.rb:1519
 msgid "Replication Master setup"
-msgstr ""
+msgstr "Oppsett av replikasjonsmaster"
 
 #: src/include/auth-server/dialogs.rb:1522
 msgid ""
@@ -583,14 +599,14 @@
 
 #: src/include/auth-server/dialogs.rb:1532
 msgid "Enter new &Password"
-msgstr ""
+msgstr "Angi et nytt &passord"
 
 #: src/include/auth-server/dialogs.rb:1537
 #: src/include/auth-server/tree_structure.rb:961
 #: src/include/auth-server/tree_structure.rb:1003
 #: src/include/auth-server/widgets.rb:405 src/modules/LdapDatabase.rb:219
 msgid "&Validate Password"
-msgstr ""
+msgstr "&Valider passord"
 
 #: src/include/auth-server/dialogs.rb:1543
 msgid "Prepare for MirrorMode replication (generates the serverId attribute)"
@@ -599,11 +615,11 @@
 #. The "Startup Configuration node for the main tree widget
 #: src/include/auth-server/helps.rb:17
 msgid "<h3>Startup Configuration</h3>"
-msgstr ""
+msgstr "<h3>Oppstartoppsett</h3>"
 
 #: src/include/auth-server/helps.rb:20
 msgid "<h4>Start LDAP Server</h4>"
-msgstr ""
+msgstr "<h4>Start LDAP-server</h4>"
 
 #: src/include/auth-server/helps.rb:21
 msgid ""
@@ -614,7 +630,7 @@
 
 #: src/include/auth-server/helps.rb:26
 msgid "<h4>Protocol Listeners</h4>"
-msgstr ""
+msgstr "<h4>erProtokoll-lyttere</h4>"
 
 #: src/include/auth-server/helps.rb:27
 msgid "<p>Enable and disable the various protocol listeners of OpenLDAP.</p>"
@@ -625,6 +641,8 @@
 "<p><b>LDAP</b> is the standard LDAP interface on Port 389. TLS/SSL secured communication\n"
 "is possible with the StartTLS operation when you have a server certificate configured.</p>"
 msgstr ""
+"<p><b>LDAP</b> er det vanlige LDAP-grensesnittet via port 389. TLS/SSL-beskyttet kommunikasjon\n"
+"er mulig ved hjelp av StartTLS hvis du har satt opp et serversertifikat.</p>"
 
 #: src/include/auth-server/helps.rb:33
 msgid ""
@@ -641,7 +659,7 @@
 
 #: src/include/auth-server/helps.rb:41
 msgid "<h4>Firewall Settings</h4>"
-msgstr ""
+msgstr "<h4>Brannmurinnstillinger</h4>"
 
 #: src/include/auth-server/helps.rb:42
 msgid ""
@@ -652,24 +670,40 @@
 #. First part of the Add Database Widget
 #: src/include/auth-server/helps.rb:46
 msgid "<h3>Basic Database Settings</h3>"
-msgstr ""
+msgstr "<h3>Grunninnstillinger for database</h3>"
 
 #: src/include/auth-server/helps.rb:49
+#, fuzzy
+#| msgid ""
+#| "<p>Choose the <b>Database</b> from <b>hdb</b> and <b>bdb</b>. <b>Hdb</b> is a \n"
+#| "variant of the <b>bdb</b> backend that uses a hierarchical database layout and \n"
+#| "supports subtree renames. It is otherwise identical to <b>bdb</b>. A <b>hdb</b>-Database\n"
+#| "needs a larger <b>idlcachesize</b> for good search performance than a <b>bdb</b>-Database.\n"
+#| "</p>"
 msgid ""
-"<p>Choose the <b>Database</b> from <b>hdb</b> and <b>bdb</b>. <b>Hdb</b> is a\n"
+"<p>Choose the <b>Database</b> from <b>hdb</b> <b>bdb</b> and <b>mdb</b>. <b>Hdb</b> is a\n"
 "variant of the <b>bdb</b> backend that uses a hierarchical database layout and\n"
 "supports subtree renames. Otherwise it is identical to <b>bdb</b>. A\n"
 "<b>hdb</b>-Database needs a larger <b>idlcachesize</b> than a\n"
-"<b>bdb</b>-Database for a good search performance.</p>\n"
+"<b>bdb</b>-Database for a good search performance.\n"
+"<b>mdb</b>-Database uses OpenLDAP's Lightning Memory-Mapped DB (LMDB) library to store data.\n"
+"It similar to the <b>hdb</b> backend but it is both more space-efficient and more execution-efficient.</p>\n"
 msgstr ""
+"<p>Velg <b>Database</b>, <b>hdb</b> eller <b>bdb</b>. <b>Hdb</b> er en \n"
+"variant av <b>bdb</b>-grunnsystemet. Den bruker en hierarkisk databasestruktur og \n"
+"støtter navneendringer i underfilstrukturen. Ellers er den identisk med <b>bdb</b>. En <b>hdb</b>-database\n"
+"trenger en større <b>idlcachesize</b> for at søkefunksjonen skal fungere effektivt, enn en <b>bdb</b>-database.\n"
+"</p>"
 
-#: src/include/auth-server/helps.rb:56
+#: src/include/auth-server/helps.rb:58
 msgid ""
 "<p>The <b>Base DN</b> option specifies the name of the root entry \n"
 "of the database being created.</p>"
 msgstr ""
+"<p>Valget <b>Hoved-DN</b> angir rotoppføringen\n"
+"til databasen som vil bli opprettet.</p>"
 
-#: src/include/auth-server/helps.rb:59
+#: src/include/auth-server/helps.rb:61
 msgid ""
 "<p>The <b>Administrator DN</b> along with a <b>LDAP Administrator Password</b> \n"
 "specifies a superuser identity for the database, surpassing all ACLs and other \n"
@@ -679,14 +713,17 @@
 "of <tt>c=Admin,dc=example,dc=com</tt>.</p> "
 msgstr ""
 
-#: src/include/auth-server/helps.rb:67
+#: src/include/auth-server/helps.rb:69
 msgid ""
 "<p>If this wizard was started during installation, the \n"
 "<b>LDAP Administrator Password</b> is initially set to the system's root password\n"
 "entered earlier in the installation process.</p> "
 msgstr ""
+"<p>Hvis denne veiviseren ble startet under installasjonen, vil \n"
+"<b>LDAP-administratorpassordet</b> først være identisk med systemets rotpassord,\n"
+"som ble angitt tidligere under installasjonen.</p> "
 
-#: src/include/auth-server/helps.rb:72
+#: src/include/auth-server/helps.rb:74
 msgid ""
 "<p>To use this database as default for the OpenLDAP client tools \n"
 "(e.g. ldapsearch), check <b>Use this database as the default for OpenLDAP\n"
@@ -696,13 +733,13 @@
 "when creating the first database on a server.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:80
+#: src/include/auth-server/helps.rb:82
 msgid ""
 "YaST currently does not support this database. You can not \n"
 "change any configuration settings here.\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:83
+#: src/include/auth-server/helps.rb:85
 msgid ""
 "<p>To enable or disable plaintext authentication (LDAP Simple Bind)\n"
 "for the configuration database, click the associated checkbox. Plaintext \n"
@@ -710,7 +747,7 @@
 "using sufficiently protected (e.g. SSL/TLS encrypted) connections.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:89
+#: src/include/auth-server/helps.rb:91
 msgid ""
 "<p>To change the administration password for the configuration database, \n"
 "click <b>Change Password</b>. \n"
@@ -720,28 +757,30 @@
 "set in the configuration.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:97
+#: src/include/auth-server/helps.rb:99
 msgid "<h3>Edit BDB Database</h3>"
-msgstr ""
+msgstr "<h3>Rediger BDB-database</h3>"
 
-#: src/include/auth-server/helps.rb:98
+#: src/include/auth-server/helps.rb:100
 msgid "<p>Change basic settings of BDB and HDB Databases.</p>"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:99
+#: src/include/auth-server/helps.rb:101
 msgid ""
 "<p>Enter the complete DN or only the first part and append the base DN automatically\n"
 "with <b>Append Base DN</b>.</p>"
 msgstr ""
+"<p>Angi hele DN eller bare første del, og legg til hoved-DN automatisk\n"
+"med <b>Legg til hoved-DN</b>.</p>"
 
-#: src/include/auth-server/helps.rb:102
+#: src/include/auth-server/helps.rb:104
 msgid ""
 "<p>To change the password for the administrator account, click <b>Change Password</b>.\n"
 "A Popup will prompt you to enter the new password and select the <b>Password Encryption</b>.\n"
 "The password fields are initially empty even if a password has already been set in the configuration.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:107
+#: src/include/auth-server/helps.rb:109
 msgid ""
 "<p>With the <b>Entry Cache</b> and <b>Index Cache (IDL cache)</b> you can adjust\n"
 "the sizes of OpenLDAP's internal caches. The <b>Entry Cache</b> defines the number of entries\n"
@@ -751,18 +790,27 @@
 "large IDL cache for good search performance (three times the size of the entry cache as a rule of\n"
 "thumbs).</p>"
 msgstr ""
+"<p>Med<b>Oppføringsmellomlager</b> og <b>Indeksmellomlager (IDL cache)</b> kan du justere\n"
+"størrelsen på OpenLDAPs interne mellomlagre. <b>Oppføringsmellomlager</b> angir antall oppføringer\n"
+"som lagres i OpenLDAPs interne oppføringsminne. Hvis mulig (nok RAM), bør dette antallet\n"
+"være høyt nok til å lagre hele databasen i minnet. <b>Indeksmellomlager (IDL cache)</b> \n"
+"brukes for å søke raskere etter indekserte attributter. Generelt krever særlig HDB-databaser\n"
+"storke indeksmellomlagre for å få raske søk (En tommelfingerregel er at det bør være tre ganger så stort som\n"
+"oppføringsmellomlageret).</p>"
 
-#: src/include/auth-server/helps.rb:116
+#: src/include/auth-server/helps.rb:118
 msgid "<h3>Password Policy Settings</h3>"
-msgstr ""
+msgstr "<h3>Passordregelinnstilliinger</h3>"
 
-#: src/include/auth-server/helps.rb:117
+#: src/include/auth-server/helps.rb:119
 msgid ""
 "<p>To make use of password policies for this database, enable \n"
 "<b>Enable Password Policies</b>.</p>"
 msgstr ""
+"<p>For å ta i bruk passordregler for denne databasen, velg \n"
+"<b>Aktiver passordregler</b>.<p>"
 
-#: src/include/auth-server/helps.rb:120
+#: src/include/auth-server/helps.rb:122
 msgid ""
 "<p>Check <b>Hash Clear Text Passwords</b> to specify that the OpenLDAP server\n"
 "should encrypt clear text passwords present in add and modify requests before storing them\n"
@@ -770,8 +818,13 @@
 "needed to compensate for LDAP clients that do not use the password modify extended operation \n"
 "to manage passwords.</p> "
 msgstr ""
+"<p>Kryss av for <b>Krypter klartekstpassord</b> for å angi at OpenLDAP-serveren\n"
+"skal kryptere klartekstpassord som legges till og endres før de lagres\n"
+"i databasen. Dette bryter med X.500/LDAP-informasjonsmodellen, men kan være\n"
+"ønskelig for LDAP-klienter som ikke benytter utvidede endringsfunksjoner i forbindelse med\n"
+"passord.</p>"
 
-#: src/include/auth-server/helps.rb:127
+#: src/include/auth-server/helps.rb:129
 msgid ""
 "<p>If <b>Disclose \"Account Locked\" Status</b> is enabled, users trying to\n"
 "authenticate to a locked account are notified that their account is\n"
@@ -780,30 +833,30 @@
 "option.</p> \n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:134
+#: src/include/auth-server/helps.rb:136
 msgid "<p>Enter the name of the default policy object in <b>Default Policy Object DN</b>.</p>"
-msgstr ""
+msgstr "<p>Angi navnet på standardregelobjektet i <b>Standard DN til regelobjekt</b>.</p>"
 
-#: src/include/auth-server/helps.rb:137
+#: src/include/auth-server/helps.rb:139
 msgid ""
 "<p>Create or change the default policy by clicking <b>Edit Policy</b>. You may\n"
 "be asked to enter the LDAP administrator password afterwards to allow the\n"
 "Policy Object being read from the server.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:142
+#: src/include/auth-server/helps.rb:144
 msgid "<h3>Index Configuration</h3>"
-msgstr ""
+msgstr "<h3>Indeksoppsett</h3>"
 
-#: src/include/auth-server/helps.rb:143
+#: src/include/auth-server/helps.rb:145
 msgid "<p>Change the indexing options of a hdb of bdb-Database.</p>"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:144
+#: src/include/auth-server/helps.rb:146
 msgid "<p>The table displays a list of attributes which currently have an index defined.</p>"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:147
+#: src/include/auth-server/helps.rb:149
 msgid ""
 "<p>Indexes are used by OpenLDAP to improve search performance on specific\n"
 "types of searches. Indexes should be configured corresponding to the most\n"
@@ -811,34 +864,34 @@
 "of indexes.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:153
+#: src/include/auth-server/helps.rb:155
 msgid ""
 "<p><b>Presence</b>: This index is used for searches with presence filters\n"
 "(i.e. <tt>(attributeType=*)</tt>). Presence indexes should only be configured\n"
 "for attributes that occur rarely in the database.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:158
+#: src/include/auth-server/helps.rb:160
 msgid ""
 "<p><b>Equality</b>: This index is used for searches with equality filters \n"
 "(i.e.(<tt>(attributeType=<exact values>)</tt>). An <b>Equality</b> index\n"
 "should always be configured with the <tt>objectclass</tt> attribute.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:163
+#: src/include/auth-server/helps.rb:165
 msgid ""
 "<p><b>Substring</b>: This index is used for searches with substring filters\n"
 "(i.e. <tt>(attributeType=<substring>*)</tt>)</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:166
+#: src/include/auth-server/helps.rb:168
 msgid ""
 "<p>Use <b>Add</b> to define indexing options for a new attribute,\n"
 "<b>Delete</b> to delete an existing index and <b>Edit</b> to change the\n"
 "indexing options of an already indexed attribute.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:171
+#: src/include/auth-server/helps.rb:173
 msgid ""
 "<p>Note: Depending on the database size it can take a while until newly added\n"
 "indexes will get active on a database. After the configuration has been\n"
@@ -846,30 +899,30 @@
 "information for the database.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:177
+#: src/include/auth-server/helps.rb:179
 msgid "<h3>Access Control Configuration</h3>"
-msgstr ""
+msgstr "<h3>Oppsett av tilgangskontroll</h3>"
 
-#: src/include/auth-server/helps.rb:180
+#: src/include/auth-server/helps.rb:182
 msgid ""
 "<p>This table gives you an overview of all Access Control rules that are\n"
 "currently configured for the selected database</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:183
+#: src/include/auth-server/helps.rb:185
 msgid ""
 "<p>For each rule, you can see which target objects it matches. To see a more\n"
 "detailed view of a rule or to change one, select the rule in the table and\n"
 "click <b>Edit</b>.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:188
+#: src/include/auth-server/helps.rb:190
 msgid ""
 "<p>Use <b>Add</b> to create new access control rules and <b>Delete</b> to\n"
 "delete an access control rule.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:191
+#: src/include/auth-server/helps.rb:193
 msgid ""
 "<p>OpenLDAP's access control evaluation stops at the first rule whose target\n"
 "definition (DN, filter and attributes) matches the entry being\n"
@@ -877,21 +930,23 @@
 "the <b>Up</b> and <b>Down</b> buttons.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:197
+#: src/include/auth-server/helps.rb:199
 msgid "<h3>Replication Provider Settings</h3>"
-msgstr ""
+msgstr "<h3>Innstilliinger for replikasjonsleverandør</h3>"
 
-#: src/include/auth-server/helps.rb:200
+#: src/include/auth-server/helps.rb:202
 msgid ""
 "<p>Select the \"<b>Enable ldapsync provider for this database</b>\" checkbox, if you want to \n"
 "be able to replicate the currently selected database to another server.</p>"
 msgstr ""
+"<p>Kryss av for «<b>Aktiver ldapsync-leverandør for denne databasen</b>», hvis du vil \n"
+"at den valgte databasen skal kunne repliseres til en annen server.</p>"
 
-#: src/include/auth-server/helps.rb:203
+#: src/include/auth-server/helps.rb:205
 msgid "<h4>Checkpoint Settings</h4>"
-msgstr ""
+msgstr "<h4>Kontrollpunktinnstillinger</h4>"
 
-#: src/include/auth-server/helps.rb:204
+#: src/include/auth-server/helps.rb:206
 msgid ""
 "<p>Here you can specify how often the synchronization state indicator (stored\n"
 "in the \"<i>contextCSN</i>\"-Attribute) is written to the database. It is synced\n"
@@ -903,33 +958,37 @@
 "performance hit in environments with many LDAP write operations.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:214
+#: src/include/auth-server/helps.rb:216
 msgid "<h4>Session log</h4>"
-msgstr ""
+msgstr "<h4>Øktlogg</h4>"
 
-#: src/include/auth-server/helps.rb:215
+#: src/include/auth-server/helps.rb:217
 msgid ""
 "<p>Configures an in-memory session log for recording information about write operations\n"
 "made on the database. Specify how many write operation should be recorded in the session log. \n"
 "Configuring a session log is only useful for \"<i>refreshOnly</i>\" replication. In \n"
 "such a case it can speed up replication and reduce the load on the master server.</p>"
 msgstr ""
+"<p>Setter opp en minnebasert øktlogg for registrering av informasjon om lagringshandlinger\n"
+"for databasen. Angi hvor mange lagringshandlinger som skal registreres i øktloggen. \n"
+"Å sette opp en øktlogg er bare nyttig for «<i>refreshOnly</i>»-replikasjon. I \n"
+"så fall kan det gjøre replikasjonen raskere og redusere belastningen på masterserveren.</p>"
 
-#: src/include/auth-server/helps.rb:221
+#: src/include/auth-server/helps.rb:223
 msgid "<h3>Replication Consumer Settings</h3>"
-msgstr ""
+msgstr "<h3>Innstilliinger for replikasjonskonsument</h3>"
 
-#: src/include/auth-server/helps.rb:224
+#: src/include/auth-server/helps.rb:226
 msgid ""
 "<p>Select \"<b>This database is a Replication Consumer</b>\" if you want the\n"
 "database to be a replica of a database on another server.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:227
+#: src/include/auth-server/helps.rb:229
 msgid "<h4>Provider</h4>"
-msgstr ""
+msgstr "<h4>Leverandør</h4>"
 
-#: src/include/auth-server/helps.rb:228
+#: src/include/auth-server/helps.rb:230
 msgid ""
 "Enter the connection details for the replication connection to the master\n"
 "server here. Select the protocol to use (<b>ldap</b> or <b>ldaps</b>) and\n"
@@ -939,15 +998,15 @@
 "ldap ports.\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:236
+#: src/include/auth-server/helps.rb:238
 msgid "<h4>Replication Type</h4>"
-msgstr ""
+msgstr "<h4>Replikasjonstype</h4>"
 
-#: src/include/auth-server/helps.rb:237
+#: src/include/auth-server/helps.rb:239
 msgid "<p>OpenLDAP supports different modes of replication:</p>"
-msgstr ""
+msgstr "<p>OpenLDAP støtter flere replikasjonsmoduser:</p>"
 
-#: src/include/auth-server/helps.rb:238
+#: src/include/auth-server/helps.rb:240
 msgid ""
 "<p><b>refreshOnly</b>: The slave server will periodically open a new\n"
 "connection, trigger a synchronization and close the connection again. The\n"
@@ -955,28 +1014,28 @@
 "<b>Replication Interval</b> setting.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:244
+#: src/include/auth-server/helps.rb:246
 msgid ""
 "<p><b>refreshAndPersist</b>: The slave server will open a persistent\n"
 "connection to the master server for synchronization. Updated entries on the\n"
 "master server are immediately sent to the slave via this connection.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:249
+#: src/include/auth-server/helps.rb:251
 msgid "<h4>Authentication</h4>"
-msgstr ""
+msgstr "<h4>Autentisering</h4>"
 
-#: src/include/auth-server/helps.rb:250
+#: src/include/auth-server/helps.rb:252
 msgid ""
 "<p>Specify a DN and password which the slave server should use to authenticate against the master.\n"
 "The specified DN needs to have read access to all entries in the replicated database on the master.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:253
+#: src/include/auth-server/helps.rb:255
 msgid "<h4>Update Referral</h4>"
-msgstr ""
+msgstr "<h4>Oppdateringshenvisning</h4>"
 
-#: src/include/auth-server/helps.rb:254
+#: src/include/auth-server/helps.rb:256
 msgid ""
 "<p>As the slave database is readonly, the slave server will answer write\n"
 "operations with an LDAP referral. \n"
@@ -986,22 +1045,24 @@
 msgstr ""
 
 #. Read dialog help
-#: src/include/auth-server/helps.rb:262
+#: src/include/auth-server/helps.rb:264
 msgid "<p><b><big>Initializing LDAP Server Configuration</big></b></p>"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:265
+#: src/include/auth-server/helps.rb:267
 msgid ""
 "<p><b><big>Aborting Initialization:</big></b><br>\n"
 "Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
 msgstr ""
+"<p><b><big>Avbryt initialisering:</big></b><br>\n"
+"Du kan trygt avbryte konfigurasjonsverktøyet ved å klikke <b>Avbryt</b> nå.</p>"
 
 #. Write dialog help
-#: src/include/auth-server/helps.rb:269
+#: src/include/auth-server/helps.rb:271
 msgid "<p><b><big>Saving LDAP Server Configuration</big></b></p> \n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:272
+#: src/include/auth-server/helps.rb:274
 msgid ""
 "<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>. An additional dialog\n"
@@ -1009,11 +1070,11 @@
 msgstr ""
 
 #. Summary dialog help 1/3
-#: src/include/auth-server/helps.rb:278
+#: src/include/auth-server/helps.rb:280
 msgid "<h3>LDAP Server Configuration Summary</h3>"
-msgstr ""
+msgstr "<h3>Oversikt over LDAP-serveroppsett</h3>"
 
-#: src/include/auth-server/helps.rb:281
+#: src/include/auth-server/helps.rb:283
 msgid ""
 "<p>This dialog provides a short summary about the configuration you have\n"
 "created. Click <b>Finish</b> to write the configuration and leave the LDAP\n"
@@ -1021,78 +1082,78 @@
 msgstr ""
 
 #. Configuration Wizard Step 1
-#: src/include/auth-server/helps.rb:287
+#: src/include/auth-server/helps.rb:289
 msgid "<p>With <b>Start LDAP Server Yes or No</b>, start or stop the LDAP server.</p> "
-msgstr ""
+msgstr "<p>Bruk <b>Start LDAP-server Ja eller Nei</b> for å starte eller stoppe LDAP-serveren.</p>"
 
-#: src/include/auth-server/helps.rb:290
+#: src/include/auth-server/helps.rb:292
 msgid "<p>If you select <b>Yes</b>, click <b>Next</b> to start the configuration wizard.</p>"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:293
+#: src/include/auth-server/helps.rb:295
 msgid ""
 "<p>If the Firewall is enabled, open the required network ports\n"
 "for OpenLDAP by checking the corresponding checkbox.</p>\n"
 msgstr ""
 
 #. Configuration Wizard Step 2
-#: src/include/auth-server/helps.rb:297
+#: src/include/auth-server/helps.rb:299
 msgid "<p>Select the type of LDAP server you want to setup. The following scenarios are available:</p>"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:300
+#: src/include/auth-server/helps.rb:302
 msgid ""
 "<p><b>Stand-alone server</b>: Setup a single stand-alone OpenLDAP server with\n"
 "no preparations for replication.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:303
+#: src/include/auth-server/helps.rb:305
 msgid ""
 "<p><b>Master server in a replication setup</b>: Create an OpenLDAP setup\n"
 "prepared to act as a master server (provider) in a replication setup.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:306
+#: src/include/auth-server/helps.rb:308
 msgid ""
 "<p><b>Replica slave server</b>: Setup an OpenLDAP slave server that replicates all its data,\n"
 "including configuration, from a master server.</p>"
 msgstr ""
 
 #. Configuration Wizard Step 3
-#: src/include/auth-server/helps.rb:310
+#: src/include/auth-server/helps.rb:312
 msgid "<h3>TLS Settings</h3>"
-msgstr ""
+msgstr "<h3>TLS-innstillinger</h3>"
 
-#: src/include/auth-server/helps.rb:313
+#: src/include/auth-server/helps.rb:315
 msgid "<h4>Basic Settings</h4>"
-msgstr ""
+msgstr "<h4>Grunninnstillinger</h4>"
 
-#: src/include/auth-server/helps.rb:314
+#: src/include/auth-server/helps.rb:316
 msgid ""
 "<p>To enable encryption via TLS/SSL, check the <b>Enabled TLS</b>\n"
 "checkbox. Additionally you need to configure a certificate for the Server \n"
 "to use.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:319
+#: src/include/auth-server/helps.rb:321
 msgid ""
 "<p>Check <b>Enable LDAP over SSL (ldaps) interface</b>, to enable the server\n"
 "to accept LDAPS connections on port 636. If not checked, OpenLDAP will only\n"
 "support TLS encrypted connections through the StartTLS extended operation.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:324
+#: src/include/auth-server/helps.rb:326
 msgid ""
 "<p>If you already have a common server certificate installed using the\n"
 "corresponding YaST Module, check <b>Use common Server Certificate</b> so that\n"
 "the OpenLDAP server uses this certificate.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:329
+#: src/include/auth-server/helps.rb:331
 msgid "<h4>Import Certificate</h4>"
-msgstr ""
+msgstr "<h4>Importer sertifikat</h4>"
 
-#: src/include/auth-server/helps.rb:330
+#: src/include/auth-server/helps.rb:332
 msgid ""
 "<p>If you have no common server certificate or you want OpenLDAP to use a\n"
 "different certificate, enter the file names of the <b>CA Certificate File</b>,\n"
@@ -1100,91 +1161,98 @@
 "textfields.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:336
+#: src/include/auth-server/helps.rb:338
 msgid ""
 "<p>To create a new CA or certificate, launch the CA management module by\n"
 "clicking <b>Launch CA Management Module</b>.</p>\n"
 msgstr ""
 
 #. Tree Item Dialog "global" 1/1
-#: src/include/auth-server/helps.rb:340
+#: src/include/auth-server/helps.rb:342
 msgid "<p>Below this item, configure some global parameters.</p>"
-msgstr ""
+msgstr "<p>Her kan du konfigurere noen globale parametere.</p>"
 
 #. Tree Item Dialog "schema" 1/
-#: src/include/auth-server/helps.rb:344
+#: src/include/auth-server/helps.rb:346
 msgid ""
 "<p>Add schema files in this dialog. Press <b>Add</b> to open a file dialog in which to choose\n"
 "a new schema. Note: OpenLDAP (when used with back-config) does currently not support the removal of \n"
 "Schema Data</p>"
 msgstr ""
+"<p>Legg til eller slett skjemafiler i denne dialogen. Klikk <b>Legg til</b> for å åpne en fildialog der du kan velge\n"
+"et nytt skjema. Merk: OpenLDAP (brukt med back-config) støtter foreløpig ikke sletting av \n"
+"skjemadata</p>"
 
 #. Tree Item Dialog "loglevel"
-#: src/include/auth-server/helps.rb:350
+#: src/include/auth-server/helps.rb:352
 msgid ""
 "<p>Select the subsystems that should log debugging statements and statistics\n"
 "to syslog.</p>"
 msgstr ""
 
 #. Tree Item Dialog "allow" 1/1
-#: src/include/auth-server/helps.rb:354
+#: src/include/auth-server/helps.rb:356
 msgid "<p>Select which special features the OpenLDAP Server should allow or disallow:</p>"
-msgstr ""
+msgstr "<p>Velg hvilke spesialfunksjoner OpenLDAP-serveren skal tillate eller ikke tillate:</p>"
 
-#: src/include/auth-server/helps.rb:357
+#: src/include/auth-server/helps.rb:359
 msgid "<h3>Select Allow Flags</h3>"
-msgstr ""
+msgstr "<h3>Tillatt-valg</h3>"
 
-#: src/include/auth-server/helps.rb:358
+#: src/include/auth-server/helps.rb:360
 msgid ""
 "<p><b>LDAPv2 Bind Requests</b>: To let the server accept LDAPv2 bind requests.\n"
 "Note that OpenLDAP does not truly implement LDAPv2.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:361
+#: src/include/auth-server/helps.rb:363
 msgid ""
 "<p><b>Anonymous Bind when credentials not empty</b>: To allow anonymous bind when \n"
 "credentials are not empty (i.e. password is present but bind DN is not present) </p>"
 msgstr ""
+"<p><b>Anonym tilgang når sertifikater ikke er tomme</b>: For å tillate anonym tilgang dersom \n"
+"sertifikater ikke er tomme (d.v.s. at passord finnes, men ikke bind-DN). </p>"
 
-#: src/include/auth-server/helps.rb:364
+#: src/include/auth-server/helps.rb:366
 msgid ""
 "<p><b>Unauthenticated Bind when DN not empty</b>: To allow unauthenticated \n"
 "(anonymous) binds when DN is not empty</p>"
 msgstr ""
+"<p><b>Uautentisert tilgang når DN ikke er tomt</b>: For å tillate uautentisert \n"
+"(anonym) tilgang når DN ikke er tomt.</p>"
 
-#: src/include/auth-server/helps.rb:367
+#: src/include/auth-server/helps.rb:369
 msgid ""
 "<p><b>Unauthenticated Update Operations to process</b>: To allow unauthenticated\n"
 "(anonymous) update operations to be processed. They are still subject to\n"
 "access controls and other administrative limits.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:372
+#: src/include/auth-server/helps.rb:374
 msgid "<h3>Select Disallow Flags</h3>"
-msgstr ""
+msgstr "<h3>Ikke tillatt-valg</h3>"
 
-#: src/include/auth-server/helps.rb:373
+#: src/include/auth-server/helps.rb:375
 msgid ""
 "<p><b>Disable acceptance of anonymous Bind Requests</b>: The Server will\n"
 "not accept anonymous bind requests. Note that this does not generally\n"
 "prohibit anonymous directory access.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:378
+#: src/include/auth-server/helps.rb:380
 msgid ""
 "<p><b>Disable Simple Bind authentication</b>: Completely disable Simple Bind\n"
 "authentication</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:381
+#: src/include/auth-server/helps.rb:383
 msgid ""
 "<p><b>Disable forcing session to anonymous status upon StartTLS operation\n"
 "receipt</b>: The server will no longer force an authenticated connection back\n"
 "to the anonymous state when receiving the StartTLS operation.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:386
+#: src/include/auth-server/helps.rb:388
 msgid ""
 "<p><b>Disallow the StartTLS operation if authenticated</b>:\n"
 "The server will not allow the StartTLS operation on already authenticated\n"
@@ -1192,7 +1260,7 @@
 msgstr ""
 
 #. Tree Item Dialog "databases"
-#: src/include/auth-server/helps.rb:392
+#: src/include/auth-server/helps.rb:394
 msgid ""
 "<p>This lists shows all configured databases. The databases with the type\n"
 "\"frontend\" and \"config\" represent special internal databases. The \"Frontend\"\n"
@@ -1202,264 +1270,269 @@
 msgstr ""
 
 #. Tree Item Dialog "databases" 2/2
-#: src/include/auth-server/helps.rb:400
+#: src/include/auth-server/helps.rb:402
 msgid "<p>To add a new database, press <b>Add Database...</b>.</p>"
-msgstr ""
+msgstr "<p>For å legge til en ny database, klikk <b>Legg til database...</b>.</p>"
 
-#: src/include/auth-server/helps.rb:401
+#: src/include/auth-server/helps.rb:403
 msgid ""
 "<p>To delete a database, select a database from the list and press <b>Delete Database...</b>.\n"
 "You cannot delete the \"config\" and \"frontend\" databases.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:404
+#: src/include/auth-server/helps.rb:406
 msgid ""
 "<p>Enter a password for the configuration database (\"<i>cn=config</i>\") here. This is required to make\n"
 "the configuration database accessible remotely.</p>"
 msgstr ""
+"<p>Her angir du et passord for oppsettdatabasen (<i>cn=config</i>). Dette kreves for å gjøre\n"
+"oppsettdatabasen eksternt tilgjengelig.</p>"
 
-#: src/include/auth-server/helps.rb:407
+#: src/include/auth-server/helps.rb:409
 msgid ""
 "<p>If the server is supposed to participate in a MirrorMode setup, select the \"<b>Prepare for MirrorMode replication</b>\"\n"
 "checkbox. This will ensure that the serverId attribute is generated as needed for MirrorMode replication.</p>\n"
 msgstr ""
 
-#: src/include/auth-server/helps.rb:410
+#: src/include/auth-server/helps.rb:412
 msgid ""
 "<p>To setup a slave server some details need to be queried from the master server. Please enter the master\n"
 "server's hostname, adjust the protocol (either \"<i>ldap</i>\" or \"<i>ldaps</i>\") and port number as needed and enter the password\n"
 "for the master's configuration database (\"<i>cn=config</i>\").</p>"
 msgstr ""
+"<p>For å sette opp en slaveserver kreves det noen opplysninger om masterserveren. Angi masterserverens\n"
+"vertsnavn, velg protokoll (enten <i>ldap</i> eller <i>ldaps</i>) og portnummer etter behov, og angi passordet\n"
+"for maserserverens oppsettdatabase (<i>cn=config</i>).</p>"
 
 #. ########## kerberos
 #. Help text: basic settings 1/2
-#: src/include/auth-server/helps.rb:417
+#: src/include/auth-server/helps.rb:419
 msgid "<p>Specify the <big>Realm</big> and the <big>Master Password</big> for your Kerberos server.</p>"
 msgstr ""
 
 #. Help text: basic settings 2/2
-#: src/include/auth-server/helps.rb:421
+#: src/include/auth-server/helps.rb:423
 msgid "<p>Although your Kerberos realm can be any ASCII string, the convention is to use upper-case letters as in your domain name.</p>\n"
-msgstr ""
+msgstr "<p>Selv om Kerberos-området kan være hvilken som helst ASCII-streng, er det vanlig å bruke store bokstaver som i domenenavnet.</p>\n"
 
 #. advanced item help: database_name
-#: src/include/auth-server/helps.rb:425
+#: src/include/auth-server/helps.rb:427
 msgid "<p>This string specifies the location of the Kerberos database for this realm.</p>"
-msgstr ""
+msgstr "<p>Denne strengen angir sti til Kerberos-databasen for dette området.</p>"
 
 #. advanced item help: acl_file
-#: src/include/auth-server/helps.rb:429
+#: src/include/auth-server/helps.rb:431
 msgid "<p>This string specifies the location of the access control list (ACL) file that kadmin uses to determine the principals' permissions on the database.</p>"
 msgstr ""
 
 #. advanced item help: admin_keytab
-#: src/include/auth-server/helps.rb:433
+#: src/include/auth-server/helps.rb:435
 msgid "<p>This string specifies the location of the keytab file that kadmin uses to authenticate to the database.</p>"
-msgstr ""
+msgstr "<p>Denne strengen angir plasseringen til nøkkelfilen som kadmin benytter til autentisering mot databasen.</p>"
 
 #. advanced item help: default_principal_expiration
-#: src/include/auth-server/helps.rb:437
+#: src/include/auth-server/helps.rb:439
 msgid "<p>This absolute time specifies the default expiration date of principals created in this realm.</p>"
-msgstr ""
+msgstr "<p>Denne absolutte tidsangivelsen angir utløpsdatoen for primærbrukere som er opprettet i dette området.</p>"
 
 #. advanced item help principal_flags 1/13
-#: src/include/auth-server/helps.rb:441
+#: src/include/auth-server/helps.rb:443
 msgid "<p>These flags specify the default attributes of the principal created in this realm.</p>"
-msgstr ""
+msgstr "<p>Disse valgene angir primærbrukerens attributter i dette området.</p>"
 
-#: src/include/auth-server/helps.rb:444
+#: src/include/auth-server/helps.rb:446
 msgid "Allow postdated"
-msgstr ""
+msgstr "Tillat fremdatering"
 
 #. advanced item help principal_flags 2/13 :Allow postdated
-#: src/include/auth-server/helps.rb:446
+#: src/include/auth-server/helps.rb:448
 msgid "Enabling this flag allows the principal to obtain postdateable tickets."
-msgstr ""
+msgstr "Når dette valget er aktivert, kan primærbrukeren hente etterdaterte billetter."
 
-#: src/include/auth-server/helps.rb:449
+#: src/include/auth-server/helps.rb:451
 msgid "Allow forwardable"
-msgstr ""
+msgstr "Tillat videresending"
 
 #. advanced item help principal_flags 3/13 :Allow forwardable
-#: src/include/auth-server/helps.rb:451
+#: src/include/auth-server/helps.rb:453
 msgid "Enabling this flag allows the principal to obtain forwardable tickets."
-msgstr ""
+msgstr "Når dette valget er aktivert, kan primærbrukeren hente billetter som kan videresendes."
 
-#: src/include/auth-server/helps.rb:454
+#: src/include/auth-server/helps.rb:456
 msgid "Allow renewable"
-msgstr ""
+msgstr "Tillat fornying"
 
 #. advanced item help principal_flags 4/13 :Allow renewable
-#: src/include/auth-server/helps.rb:456
+#: src/include/auth-server/helps.rb:458
 msgid "Enabling this flag allows the principal to obtain renewable tickets."
-msgstr ""
+msgstr "Når dette valget er aktivert, kan primærbrukeren hente fornybare billetter."
 
-#: src/include/auth-server/helps.rb:459
+#: src/include/auth-server/helps.rb:461
 msgid "Allow proxiable"
-msgstr ""
+msgstr "Tillat mellomlagring"
 
 #. advanced item help principal_flags 5/13 :Allow proxiable
-#: src/include/auth-server/helps.rb:461
+#: src/include/auth-server/helps.rb:463
 msgid "Enabling this flag allows the principal to obtain proxy tickets."
-msgstr ""
+msgstr "Når dette valget er aktivert, kan primærbrukeren hente overførbare billetter."
 
-#: src/include/auth-server/helps.rb:462
+#: src/include/auth-server/helps.rb:464
 msgid "Enable user-to-user authentication"
-msgstr ""
+msgstr "Aktiver bruker-til-bruker-autentisering"
 
 #. advanced item help principal_flags 6/13 :Enable user-to-user authentication
-#: src/include/auth-server/helps.rb:464
+#: src/include/auth-server/helps.rb:466
 msgid "Enabling this flag allows the principal to obtain a session key for another user, permitting user-to-user authentication for this  principal."
-msgstr ""
+msgstr "Når dette valget er aktivert, kan primærbrukeren hente en øktnøkkel for en annen bruker, noe som tillater bruker-til-bruker-autentisering for denne primærbrukeren."
 
-#: src/include/auth-server/helps.rb:467
+#: src/include/auth-server/helps.rb:469
 msgid "Requires preauth"
-msgstr ""
+msgstr "Krever forgodkjenning"
 
 #. advanced item help principal_flags 7/13 :Requires preauth
-#: src/include/auth-server/helps.rb:469
+#: src/include/auth-server/helps.rb:471
 msgid "If this flag is enabled on a client principal, that principal is required to preauthenticate to the KDC before receiving any tickets. If you enable this flag on a service principal, the service tickets for this principal will only be issued to clients with a TGT that has the preauthenticated ticket set."
-msgstr ""
+msgstr "Hvis dette valget er aktivert for en klientprimærbruker, må primærbrukeren forhåndsautentiseres via KDC før billetter kan mottas. Hvis valget er aktivert for en tjenesteprimærbruker, vil tjenestebilletter for denne primærbrukeren kun vil bli utstedt til klienter med TGT som har det forhåndsautentiserte billettsettet."
 
-#: src/include/auth-server/helps.rb:472
+#: src/include/auth-server/helps.rb:474
 msgid "Requires hwauth"
-msgstr ""
+msgstr "Krever HW-autentisering"
 
 #. advanced item help principal_flags 8/13 :Requires hwauth
-#: src/include/auth-server/helps.rb:474
+#: src/include/auth-server/helps.rb:476
 msgid "If this flag is enabled, the principal is required to preauthenticate using a hardware device before receiving any tickets."
-msgstr ""
+msgstr "Hvis dette valget er aktivert, må primærbrukeren forhåndsautentiseres via en maskinvareenhet før billetter kan mottas."
 
-#: src/include/auth-server/helps.rb:477
+#: src/include/auth-server/helps.rb:479
 msgid "Allow service"
-msgstr ""
+msgstr "Tillat vedlikehold"
 
 #. advanced item help principal_flags 9/13 :Allow service
-#: src/include/auth-server/helps.rb:479
+#: src/include/auth-server/helps.rb:481
 msgid "Enabling this flag allows the KDC to issue service tickets for this principal."
-msgstr ""
+msgstr "Når dette valget er aktivert, kan KDC utstede tjenestebilletter for denne primærbrukeren."
 
-#: src/include/auth-server/helps.rb:482
+#: src/include/auth-server/helps.rb:484
 msgid "Allow tgs request"
-msgstr ""
+msgstr "Tillat tgs-forespørsler"
 
 #. advanced item help principal_flags 10/13 :Allow tgs request
-#: src/include/auth-server/helps.rb:484
+#: src/include/auth-server/helps.rb:486
 msgid "Enabling this flag allows a principal to obtain tickets based on a ticket-granting-ticket, rather than repeating the authentication process that was used to obtain the TGT."
-msgstr ""
+msgstr "Når dette valget er aktivert, kan en primærbruker hente billetter basert på en 'billettutstedende billett' (TGT) i stedet for å gjenta autentiseringsprosessen som ble benyttet for å hente TGT."
 
-#: src/include/auth-server/helps.rb:487
+#: src/include/auth-server/helps.rb:489
 msgid "Allow tickets"
-msgstr ""
+msgstr "Tillat billetter"
 
 #. advanced item help principal_flags 11/13 :Allow tickets
-#: src/include/auth-server/helps.rb:489
+#: src/include/auth-server/helps.rb:491
 msgid "Enabling  this  flag  means  that the KDC will issue tickets for this principal. Disabling this flag essentially deactivates the principal within this realm."
-msgstr ""
+msgstr "Når dette valget er aktivert, vil KDC utstede billetter for denne primærbrukeren. Hvis valget er deaktivert, vil primærbrukeren være så godt som utestengt fra dette området."
 
-#: src/include/auth-server/helps.rb:492
+#: src/include/auth-server/helps.rb:494
 msgid "Need change"
-msgstr ""
+msgstr "Endring kreves"
 
 #. advanced item help principal_flags 12/13 :Needchange
-#: src/include/auth-server/helps.rb:494
+#: src/include/auth-server/helps.rb:496
 msgid "Enabling this flag forces a password change for this principal."
-msgstr ""
+msgstr "Når dette valget er aktivert, vil denne primærbrukeren være nødt til å endre passordet."
 
-#: src/include/auth-server/helps.rb:495
+#: src/include/auth-server/helps.rb:497
 msgid "Password changing service"
-msgstr ""
+msgstr "Tjeneste for passordendring"
 
 #. advanced item help principal_flags 13/13 :Password changing service
-#: src/include/auth-server/helps.rb:497
+#: src/include/auth-server/helps.rb:499
 msgid "If this flag is enabled, it marks this principal as a password change service.  This should only be used in special cases, for example,  if a  user's  password  has  expired,  the user has to get tickets for that principal to be able to change it without going through the normal password authentication."
-msgstr ""
+msgstr "Hvis dette valget er aktivert, vil primærbrukeren bli definert som en passordendringstjeneste. Dette bør kun benyttes i spesielle tilfeller. Hvis f.eks. en brukers passord har utløpt, må brukeren hente billetter for denne primærbrukeren for å kunne endre passord uten å benytte den normalt passordautentiseringen."
 
 #. advanced item help : dict_file
-#: src/include/auth-server/helps.rb:501
+#: src/include/auth-server/helps.rb:503
 msgid "<p>The string location of the dictionary file containing strings that are not allowed as passwords. If this tag is not set or if there is no policy assigned to the principal, no check will be done.</p>"
-msgstr ""
+msgstr "<p>Plasseringen til ordliste-filen som inneholder strenger som ikke er tillatt som passord. Hvis dette ikke er angitt, vil det ikke være tilordnet noen passordregler for primærbrukeren. Ingen kontroll vil bli utført.</p>"
 
 #. advanced item help : kadmind_port
 #. advanced item help : kpasswd_port
-#: src/include/auth-server/helps.rb:505 src/include/auth-server/helps.rb:509
+#: src/include/auth-server/helps.rb:507 src/include/auth-server/helps.rb:511
 msgid "<p>This port number specifies the port on which the kadmind daemon listens for this realm.</p>"
-msgstr ""
+msgstr "<p>Dette er portnummeret som kadmind-nissen vil lytte til for dette området.</p>"
 
 #. advanced item help : key_stash_file
-#: src/include/auth-server/helps.rb:513
+#: src/include/auth-server/helps.rb:515
 msgid "<p>This string specifies the location where the master key has been stored with kdb5_stash.</p>"
-msgstr ""
+msgstr "<p>Angir sti til fil hvor hovedpassordet er gjemt.</p>"
 
 #. advanced item help : kdc_ports
-#: src/include/auth-server/helps.rb:517
+#: src/include/auth-server/helps.rb:519
 msgid "<p>This string specifies the list of ports that the KDC listens to for this realm.</p>"
-msgstr ""
+msgstr "<p>Dette er portene som KDC vil lytte til for dette området.</p>"
 
 #. advanced item help : master_key_name
-#: src/include/auth-server/helps.rb:521
+#: src/include/auth-server/helps.rb:523
 msgid "<p>This string specifies the name of the principal associated with the master key. The default value is K/M.</p>"
-msgstr ""
+msgstr "<p>Angir navnet på primærbrukeren som er tilordnet hovednøkkelen. Standardverdi er K/M.</p>"
 
 #. advanced item help : master_key_type
-#: src/include/auth-server/helps.rb:525
+#: src/include/auth-server/helps.rb:527
 msgid "<p>This key type string represents the master keys key type.</p>"
-msgstr ""
+msgstr "<p>Denne nøkkeltypestrengen angir hovenøkkeltypen.</p>"
 
 #. advanced item help : max_life
-#: src/include/auth-server/helps.rb:529
+#: src/include/auth-server/helps.rb:531
 msgid "<p>This delta time specifies the maximum time period that a ticket may be valid for in this realm.</p>"
-msgstr ""
+msgstr "<p>Deltatiden angir den maksimale tiden en billett kan være gyldig i dette området.</p>"
 
 #. advanced item help : max_renew_life
-#: src/include/auth-server/helps.rb:533
+#: src/include/auth-server/helps.rb:535
 msgid "<p>This delta time specifies the maximum time period that a ticket may be renewed for in this realm.</p>"
-msgstr ""
+msgstr "<p>Angir maksimumsperiode for fornying av serifikater i dette området.</p>"
 
 #. advanced item help : supported_enctypes
-#: src/include/auth-server/helps.rb:537
+#: src/include/auth-server/helps.rb:539
 msgid "<p>A list of key/salt strings that specifies the default key/salt combinations of principals for this realm.</p>"
-msgstr ""
+msgstr "<p>En liste over nøkkel:salt-strenger som angir standardkombinasjonene av nøkkel/salt for primærbrukere i dette området.</p>"
 
 #. advanced item help : kdc_supported_enctypes
-#: src/include/auth-server/helps.rb:541
+#: src/include/auth-server/helps.rb:543
 msgid "<p>Specifies the permitted key/salt combinations of principals for this realm.</p>"
-msgstr ""
+msgstr "<p>Angir tillatte nøkkel/salt-kombinasjoner for primærbrukere i dette området.</p>"
 
 #. advanced item help : reject_bad_transit
-#: src/include/auth-server/helps.rb:545
+#: src/include/auth-server/helps.rb:547
 msgid "<p>Specifies whether or not the list of transited realms for cross-realm tickets should be checked against the transit path computed from the realm names and the [capaths] section of its krb5.conf file</p>"
-msgstr ""
+msgstr "<p>Angir om listen over transittområder for kryssområdebilletter skal kontrolleres mot transittveien som er beregnet ut fra områdenavnene og [capaths]-seksjonen i krb5.conf-filen.</p>"
 
 #. advanced item help : ldap_conns_per_server
-#: src/include/auth-server/helps.rb:549
+#: src/include/auth-server/helps.rb:551
 msgid "<p>This LDAP specific tag indicates the number of connections to be maintained via the LDAP server.</p>"
-msgstr ""
+msgstr "<p>Dette LDAP-spesifikke valget angir antall forbindelser per LDAP-server.</p>"
 
 #. advanced item help : ldap_service_password_file
-#: src/include/auth-server/helps.rb:553
+#: src/include/auth-server/helps.rb:555
 msgid "<p>This LDAP-specific tag indicates the file containing the stashed passwords for the objects used for starting the Kerberos servers.</p>"
 msgstr ""
 
 #. advanced item help : kdb_subtrees
-#: src/include/auth-server/helps.rb:557
+#: src/include/auth-server/helps.rb:559
 msgid "<p>Specifies the list of subtrees containing the principals of a realm. The list contains the DNs of the subtree objects separated by colon(:).</p><p>The search scope specifies the scope for searching the principals under the subtree.</p>"
-msgstr ""
+msgstr "<p>Angir en liste over understrukturer som innholder primærbrukerne for et område. Listen inneholder DN for understrukturene, adskilt av kolon (:).</p><p>Søkeområde angir hvor i understrukturen det skal søkes etter primærbrukere.</p>"
 
 #. advanced item help : kdb_containerref
-#: src/include/auth-server/helps.rb:561
+#: src/include/auth-server/helps.rb:563
 msgid "<p>Specifies the DN of the container object in which the principals of a realm will be created. If the container reference is not configured for a realm, the principals will be created in the realm container.</p>"
-msgstr ""
+msgstr "<p>Angir DN til containerobjektet, der primærbrukere for et område vil bli opprettet. Hvis denne container-referansen mangler for et område, vil primærbrukerne bli opprettet i områdecontaineren.</p>"
 
 #. advanced item help : kdb_maxtktlife
-#: src/include/auth-server/helps.rb:565
+#: src/include/auth-server/helps.rb:567
 msgid "<p>Specifies maximum ticket life for principals in this realm.</p>"
-msgstr ""
+msgstr "<p>Angir maksimal billettlevetid for primærbrukere i dette området.</p>"
 
 #. advanced item help : kdb_maxrenewlife
-#: src/include/auth-server/helps.rb:569
+#: src/include/auth-server/helps.rb:571
 msgid "<p>Specifies maximum renewable life of tickets for principals in this realm.</p>"
-msgstr ""
+msgstr "<p>Angir maksimal billettfornyelsestid for primærbrukere i dette området.</p>"
 
 #. #################################################################################
 #. #################################################################################
@@ -1472,39 +1545,39 @@
 #: src/include/auth-server/kerberos_advanced.rb:49
 #: src/include/auth-server/kerberos_advanced.rb:1974
 msgid "Advanced Settings"
-msgstr ""
+msgstr "Avanserte innstillinger"
 
 #. Treeview list item
 #: src/include/auth-server/kerberos_advanced.rb:53
 #: src/include/auth-server/kerberos_advanced.rb:1885
 msgid "Database Path"
-msgstr ""
+msgstr "Databasesti"
 
 #: src/include/auth-server/kerberos_advanced.rb:60
 msgid "&Database Path"
-msgstr ""
+msgstr "&Databasesti"
 
 #. Treeview list item
 #: src/include/auth-server/kerberos_advanced.rb:71
 #: src/include/auth-server/kerberos_advanced.rb:1889
 msgid "ACL File"
-msgstr ""
+msgstr "ACL-fil"
 
 #: src/include/auth-server/kerberos_advanced.rb:78
 msgid "ACL &File"
-msgstr ""
+msgstr "ACL-&fil"
 
 #. Treeview list item
 #: src/include/auth-server/kerberos_advanced.rb:89
 #: src/include/auth-server/kerberos_advanced.rb:1893
 msgid "Administrator Keytab"
-msgstr ""
+msgstr "Administratornøkkeltabell"
 
 #. Treeview list item
 #: src/include/auth-server/kerberos_advanced.rb:107
 #: src/include/auth-server/kerberos_advanced.rb:1900
 msgid "Default Principal Expiration"
-msgstr ""
+msgstr "Standard utløpstid for fulmakt"
 
 #. checkbox text
 #. checkbox text
@@ -1517,12 +1590,12 @@
 #: src/include/auth-server/kerberos_advanced.rb:615
 #: src/include/auth-server/kerberos_advanced.rb:648
 msgid "&Available"
-msgstr ""
+msgstr "&Tilgjengelig"
 
 #: src/include/auth-server/kerberos_advanced.rb:124
 #: src/include/auth-server/kerberos_advanced.rb:129
 msgid "&Date"
-msgstr ""
+msgstr "&Dato"
 
 #: src/include/auth-server/kerberos_advanced.rb:135
 #: src/include/auth-server/kerberos_advanced.rb:140
@@ -1535,7 +1608,7 @@
 #: src/include/auth-server/kerberos_advanced.rb:655
 #: src/include/auth-server/kerberos_advanced.rb:659
 msgid "&Time"
-msgstr ""
+msgstr "&Tidspunkt"
 
 #. `InputField(`opt(`hstretch),`id(`id_default_principal_expiration),"",
 #. KerberosServer::getDBvalue("default_principal_expiration")),
@@ -1546,133 +1619,133 @@
 #: src/include/auth-server/kerberos_advanced.rb:1906
 #: src/include/auth-server/kerberos_advanced.rb:2008
 msgid "Default Principal Flags"
-msgstr ""
+msgstr "Standardvalg for primærbruker"
 
 #. checkbox text in MultiSelectionBox
 #. checkbox text in MultiSelectionBox
 #: src/include/auth-server/kerberos_advanced.rb:166
 #: src/include/auth-server/kerberos_advanced.rb:680
 msgid "Allow p&ostdated"
-msgstr ""
+msgstr "Tillat etter&datering"
 
 #. checkbox text in MultiSelectionBox
 #. checkbox text in MultiSelectionBox
 #: src/include/auth-server/kerberos_advanced.rb:174
 #: src/include/auth-server/kerberos_advanced.rb:688
 msgid "Allow &forwardable"
-msgstr ""
+msgstr "Tillat &videresending"
 
 #. checkbox text in MultiSelectionBox
 #. checkbox text in MultiSelectionBox
 #: src/include/auth-server/kerberos_advanced.rb:182
 #: src/include/auth-server/kerberos_advanced.rb:696
 msgid "Allow rene&wable"
-msgstr ""
+msgstr "Tillat &fornying"
 
 #. checkbox text in MultiSelectionBox
 #. checkbox text in MultiSelectionBox
 #: src/include/auth-server/kerberos_advanced.rb:190
 #: src/include/auth-server/kerberos_advanced.rb:704
 msgid "Allow &proxiable"
-msgstr ""
+msgstr "Tillat &overføring"
 
 #. checkbox text in MultiSelectionBox
 #. checkbox text in MultiSelectionBox
 #: src/include/auth-server/kerberos_advanced.rb:198
 #: src/include/auth-server/kerberos_advanced.rb:712
 msgid "Enable &user-to-user authentication"
-msgstr ""
+msgstr "Aktiver bruker-til-bruker-autentisering"
 
 #. checkbox text in MultiSelectionBox
 #. checkbox text in MultiSelectionBox
 #: src/include/auth-server/kerberos_advanced.rb:206
 #: src/include/auth-server/kerberos_advanced.rb:720
 msgid "Requires pr&eauth"
-msgstr ""
+msgstr "Krever forhåndsgodkj&enning"
 
 #. checkbox text in MultiSelectionBox
 #. checkbox text in MultiSelectionBox
 #: src/include/auth-server/kerberos_advanced.rb:214
 #: src/include/auth-server/kerberos_advanced.rb:728
 msgid "Requires &hwauth"
-msgstr ""
+msgstr "Krever &maskinvareautentisering"
 
 #. checkbox text in MultiSelectionBox
 #. checkbox text in MultiSelectionBox
 #: src/include/auth-server/kerberos_advanced.rb:220
 #: src/include/auth-server/kerberos_advanced.rb:734
 msgid "Allow &service"
-msgstr ""
+msgstr "Tillat tjene&ste"
 
 #. checkbox text in MultiSelectionBox
 #. checkbox text in MultiSelectionBox
 #: src/include/auth-server/kerberos_advanced.rb:226
 #: src/include/auth-server/kerberos_advanced.rb:740
 msgid "Allow tgs re&quest"
-msgstr ""
+msgstr "Tillat tgs-fores&pørsel"
 
 #. checkbox text in MultiSelectionBox
 #. checkbox text in MultiSelectionBox
 #: src/include/auth-server/kerberos_advanced.rb:232
 #: src/include/auth-server/kerberos_advanced.rb:746
 msgid "Allow &tickets"
-msgstr ""
+msgstr "Tillat bille&tter"
 
 #. checkbox text in MultiSelectionBox
 #. checkbox text in MultiSelectionBox
 #: src/include/auth-server/kerberos_advanced.rb:238
 #: src/include/auth-server/kerberos_advanced.rb:752
 msgid "Need &change"
-msgstr ""
+msgstr "Endring &kreves"
 
 #. checkbox text in MultiSelectionBox
 #. checkbox text in MultiSelectionBox
 #: src/include/auth-server/kerberos_advanced.rb:246
 #: src/include/auth-server/kerberos_advanced.rb:760
 msgid "P&assword changing service"
-msgstr ""
+msgstr "Tjeneste for p&assordendring"
 
 #. Treeview list item
 #: src/include/auth-server/kerberos_advanced.rb:261
 #: src/include/auth-server/kerberos_advanced.rb:1911
 msgid "Dictionary File"
-msgstr ""
+msgstr "Ordliste-fil"
 
 #. Treeview list item
 #: src/include/auth-server/kerberos_advanced.rb:279
 #: src/include/auth-server/kerberos_advanced.rb:1916
 msgid "Kadmin Daemon Port"
-msgstr ""
+msgstr "Kadmin-nisseport"
 
 #. Treeview list item
 #: src/include/auth-server/kerberos_advanced.rb:297
 #: src/include/auth-server/kerberos_advanced.rb:1921
 msgid "Kpasswd Daemon Port"
-msgstr ""
+msgstr "Kpasswd-nisseport"
 
 #. Treeview list item
 #: src/include/auth-server/kerberos_advanced.rb:315
 #: src/include/auth-server/kerberos_advanced.rb:1926
 msgid "Key Stash File"
-msgstr ""
+msgstr "Nøkkelgjemmestedsfil"
 
 #. Treeview list item
 #: src/include/auth-server/kerberos_advanced.rb:333
 #: src/include/auth-server/kerberos_advanced.rb:1929
 msgid "KDC Port"
-msgstr ""
+msgstr "KDC-port"
 
 #. Treeview list item
 #: src/include/auth-server/kerberos_advanced.rb:351
 #: src/include/auth-server/kerberos_advanced.rb:1933
 msgid "Master Key Name"
-msgstr ""
+msgstr "Hovednøkkel"
 
 #. Treeview list item
 #: src/include/auth-server/kerberos_advanced.rb:369
 #: src/include/auth-server/kerberos_advanced.rb:1938
 msgid "Master Key Type"
-msgstr ""
+msgstr "Hovednøkkeltype"
 
 #. Treeview list item
 #. Treeview list item
@@ -1681,14 +1754,14 @@
 #: src/include/auth-server/kerberos_advanced.rb:1943
 #: src/include/auth-server/kerberos_advanced.rb:1998
 msgid "Maximum Ticket Life Time"
-msgstr ""
+msgstr "Maks levetid for billett"
 
 #: src/include/auth-server/kerberos_advanced.rb:401
 #: src/include/auth-server/kerberos_advanced.rb:434
 #: src/include/auth-server/kerberos_advanced.rb:620
 #: src/include/auth-server/kerberos_advanced.rb:653
 msgid "&Days"
-msgstr ""
+msgstr "&Dager"
 
 #. Treeview list item
 #. Treeview list item
@@ -1697,66 +1770,66 @@
 #: src/include/auth-server/kerberos_advanced.rb:1948
 #: src/include/auth-server/kerberos_advanced.rb:2003
 msgid "Maximum Ticket Renew Time"
-msgstr ""
+msgstr "Maksimal fornyelsestid for billett"
 
 #. Treeview list item
 #: src/include/auth-server/kerberos_advanced.rb:453
 #: src/include/auth-server/kerberos_advanced.rb:1953
 msgid "Default Encryption Types"
-msgstr ""
+msgstr "Standard krypteringstyper"
 
 #. Treeview list item
 #: src/include/auth-server/kerberos_advanced.rb:471
 #: src/include/auth-server/kerberos_advanced.rb:1958
 msgid "KDC Supported Encryption Types"
-msgstr ""
+msgstr "Krypteringstyper som støttes av KDC"
 
 #. Treeview list item
 #: src/include/auth-server/kerberos_advanced.rb:489
 #: src/include/auth-server/kerberos_advanced.rb:1963
 msgid "Reject Bad Transit"
-msgstr ""
+msgstr "Avvis feil gjennomtrafikk"
 
 #. Treeview list item
 #: src/include/auth-server/kerberos_advanced.rb:507
 #: src/include/auth-server/kerberos_advanced.rb:1983
 msgid "Number of LDAP connections"
-msgstr ""
+msgstr "Antall LDAP-forbindelsen"
 
 #: src/include/auth-server/kerberos_advanced.rb:525
 msgid "File for the LDAP password"
-msgstr ""
+msgstr "Fil for LDAP-passord"
 
 #. Treeview list item
 #: src/include/auth-server/kerberos_advanced.rb:545
 #: src/include/auth-server/kerberos_advanced.rb:1988
 msgid "Search Subtrees"
-msgstr ""
+msgstr "Søk i undertrær "
 
 #: src/include/auth-server/kerberos_advanced.rb:558
 msgid "Search Scope"
-msgstr ""
+msgstr "Søkeområde"
 
 #: src/include/auth-server/kerberos_advanced.rb:565
 msgid "&subtree search"
-msgstr ""
+msgstr "&søk i underkataloger"
 
 #: src/include/auth-server/kerberos_advanced.rb:572
 msgid "&one level"
-msgstr ""
+msgstr "&ett nivå"
 
 #. Treeview list item
 #: src/include/auth-server/kerberos_advanced.rb:588
 #: src/include/auth-server/kerberos_advanced.rb:1993
 msgid "Principal Container"
-msgstr ""
+msgstr "Container for primærbruker"
 
 #. ldapitems = add(ldapitems, );
 #. ldapitems = add(ldapitems, );
 #. ldapitems = add(ldapitems, );
 #: src/include/auth-server/kerberos_advanced.rb:2016
 msgid "Advanced LDAP Settings"
-msgstr ""
+msgstr "Avanserte LDAP-innstillinger"
 
 #. encoding: utf-8
 #. File:	include/ldap-server/mirrormode-wizard.ycp
@@ -1766,6 +1839,12 @@
 #. Ralf Haferkamp <rhafer@suse.de>
 #.
 #. $Id$
+#: src/include/auth-server/mirrormode-wizard.rb:25
+#, fuzzy
+#| msgid "LDAP Client Configuration"
+msgid "OpenLDAP MirrorMode Configuration"
+msgstr "Konfigurasjon av LDAP-klient"
+
 #: src/include/auth-server/mirrormode-wizard.rb:28
 msgid "MirrorMode Node List"
 msgstr ""
@@ -1812,7 +1891,7 @@
 #: src/include/auth-server/wizards.rb:204
 #: src/include/auth-server/wizards.rb:297
 msgid "Initializing..."
-msgstr ""
+msgstr "Initialiserer ..."
 
 #. #-#-#-#-#  auth-server.rxgettext.pot (PACKAGE VERSION)  #-#-#-#-#
 #. ****************************************
@@ -1820,67 +1899,67 @@
 #. ***************************************
 #: src/include/auth-server/tree_structure.rb:53 src/modules/AuthServer.pm:2191
 msgid "Startup Configuration"
-msgstr ""
+msgstr "Oppsett av oppstart"
 
 #. Tree item
 #: src/include/auth-server/tree_structure.rb:62
 msgid "Global Settings"
-msgstr ""
+msgstr "Generelle innstillinger"
 
 #. Tree item
 #: src/include/auth-server/tree_structure.rb:67
 msgid "Schema Files"
-msgstr ""
+msgstr "Skjemafiler"
 
 #. Tree item
 #: src/include/auth-server/tree_structure.rb:75
 msgid "Log Level Settings"
-msgstr ""
+msgstr "Innstillinger for logging"
 
 #. Tree item
 #: src/include/auth-server/tree_structure.rb:83
 msgid "Allow/Disallow Features"
-msgstr ""
+msgstr "Tillatte / Ikke tillatte funksjoner"
 
 #. Tree item
 #: src/include/auth-server/tree_structure.rb:91
 #: src/include/auth-server/widgets.rb:218
 msgid "TLS Settings"
-msgstr ""
+msgstr "TLS-innstillinger"
 
 #. Tree item
 #: src/include/auth-server/tree_structure.rb:100
 msgid "Databases"
-msgstr ""
+msgstr "Databaser"
 
 #: src/include/auth-server/tree_structure.rb:108
 msgid "Suffix DN"
-msgstr ""
+msgstr "Suffiks-DN"
 
 #: src/include/auth-server/tree_structure.rb:108
 #: src/modules/LdapDatabase.rb:173
 msgid "Database Type"
-msgstr ""
+msgstr "Databasetype"
 
 #. widget_map["g_schema","inclist"] = l;
 #: src/include/auth-server/tree_structure.rb:228
 msgid "Your TLS/SSL Configuration seems to be incomplete."
-msgstr ""
+msgstr "Det ser ut til at TLS/SSL-oppsettet er ufullstendig."
 
 #: src/include/auth-server/tree_structure.rb:229
 msgid "Do you really want to enable the \"ldaps\" protocol listener?"
-msgstr ""
+msgstr "Vil du virkelilg aktivere \"ldaps\"-protokoll-lytteren?"
 
 #. add a new file to the list
 #. file dialog heading
 #: src/include/auth-server/tree_structure.rb:265
 msgid "Select New Schema File"
-msgstr ""
+msgstr "Velg en ny skjemafil"
 
 #. error popup
 #: src/include/auth-server/tree_structure.rb:272
 msgid "The schema file is already in the list."
-msgstr ""
+msgstr "Skjemafilen er allerede i listen."
 
 #: src/include/auth-server/tree_structure.rb:462
 msgid "Select a valid Certificate File"
@@ -1897,12 +1976,12 @@
 #. file selection headline
 #: src/include/auth-server/tree_structure.rb:575
 msgid "Select Certificate File"
-msgstr ""
+msgstr "Velg sertifikatfil"
 
 #. file selection headline
 #: src/include/auth-server/tree_structure.rb:583
 msgid "Select Certificate Key File"
-msgstr ""
+msgstr "Velg sertifikatnøkkelfil"
 
 #. ****************************************
 #. * handlers for database parent widget
@@ -1917,36 +1996,36 @@
 
 #: src/include/auth-server/tree_structure.rb:721
 msgid "Do you really want to delete the database?"
-msgstr ""
+msgstr "Vil du virkelig slette databasen?"
 
 #. Error Popup
 #. Error Popup
 #: src/include/auth-server/tree_structure.rb:750
 #: src/include/auth-server/tree_structure.rb:884
 msgid "Unable to write settings for the current database."
-msgstr ""
+msgstr "Kan ikke lagre innstillinger for gjeldende database."
 
 #: src/include/auth-server/tree_structure.rb:804
 #: src/include/auth-server/tree_structure.rb:941
 msgid "Unable to read settings for the current database."
-msgstr ""
+msgstr "Kan ikke lese innstillinger for gjeldende database."
 
 #: src/include/auth-server/tree_structure.rb:959
 #: src/include/auth-server/tree_structure.rb:1001
 #: src/include/auth-server/widgets.rb:403
 msgid "New Administrator &Password"
-msgstr ""
+msgstr "Nytt administrator&passord"
 
 #: src/include/auth-server/tree_structure.rb:965
 #: src/include/auth-server/tree_structure.rb:1007
 #: src/include/auth-server/widgets.rb:407
 msgid "Password &Encryption"
-msgstr ""
+msgstr "Passord&kryptering"
 
 #: src/include/auth-server/tree_structure.rb:1015
 #: src/include/auth-server/widgets.rb:368
 msgid "Change Administration Password"
-msgstr ""
+msgstr "Endre administratorpassord"
 
 #: src/include/auth-server/tree_structure.rb:1038
 #: src/include/auth-server/tree_structure.rb:1039
@@ -1955,7 +2034,7 @@
 #: src/modules/AuthServer.pm:2193 src/modules/AuthServer.pm:2212
 #: src/modules/AuthServer.pm:2213 src/modules/AuthServer.pm:2214
 msgid "No"
-msgstr ""
+msgstr "Nei"
 
 #: src/include/auth-server/tree_structure.rb:1043
 #: src/include/auth-server/tree_structure.rb:1044
@@ -1963,7 +2042,7 @@
 #: src/modules/AuthServer.pm:2193 src/modules/AuthServer.pm:2212
 #: src/modules/AuthServer.pm:2213 src/modules/AuthServer.pm:2214
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
 #. skip attribute that already have an index defined
 #: src/include/auth-server/tree_structure.rb:1188
@@ -1975,23 +2054,23 @@
 #. ***************************************
 #: src/include/auth-server/tree_structure.rb:1290
 msgid "Index Configuration"
-msgstr ""
+msgstr "Indeksoppsett"
 
 #: src/include/auth-server/tree_structure.rb:1298
 msgid "Password Policy Configuration"
-msgstr ""
+msgstr "Oppsett av passordregler"
 
 #: src/include/auth-server/tree_structure.rb:1307
 msgid "Access Control Configuration"
-msgstr ""
+msgstr "Oppsett av tilgangskontroll"
 
 #: src/include/auth-server/tree_structure.rb:1316
 msgid "Replication Provider"
-msgstr ""
+msgstr "Replikasjonsleverandør"
 
 #: src/include/auth-server/tree_structure.rb:1325
 msgid "Replication Consumer"
-msgstr ""
+msgstr "Replikasjonskonsument"
 
 #: src/include/auth-server/widgets.rb:70
 msgid "&Start Kerberos Server"
@@ -1999,188 +2078,188 @@
 
 #: src/include/auth-server/widgets.rb:94
 msgid "Protocol Listeners"
-msgstr ""
+msgstr "Protokoll-lyttere"
 
 #: src/include/auth-server/widgets.rb:100
 msgid "LDAP"
-msgstr ""
+msgstr "LDAP"
 
 #. `HWeight(1, `PushButton( `id( `pb_interface_ldap), "Interfaces ...")),
 #: src/include/auth-server/widgets.rb:112
 msgid "LDAP over SSL (ldaps)"
-msgstr ""
+msgstr "LDAP over SSL (ldaps)"
 
 #: src/include/auth-server/widgets.rb:141
 msgid "Included &Schema Files"
-msgstr ""
+msgstr "Inkluderte &skjemafiler"
 
 #: src/include/auth-server/widgets.rb:152
 msgid "Select &Log Level Flags:"
-msgstr ""
+msgstr "Velg &loggnivå:"
 
 #: src/include/auth-server/widgets.rb:154
 msgid "Trace Function Calls"
-msgstr ""
+msgstr "Spor funksjonskommandoer"
 
 #: src/include/auth-server/widgets.rb:155
 msgid "Debug Packet Handling"
-msgstr ""
+msgstr "Feilsøk pakkebehandling"
 
 #: src/include/auth-server/widgets.rb:156
 msgid "Heavy Trace Debugging (function args)"
-msgstr ""
+msgstr "Grundig feilsøking (funksjonargumenter)"
 
 #: src/include/auth-server/widgets.rb:157
 msgid "Connection Management"
-msgstr ""
+msgstr "Administrasjon av tilkoblinger"
 
 #: src/include/auth-server/widgets.rb:158
 msgid "Print Packets Sent and Received"
-msgstr ""
+msgstr "Vis sendte og mottatte pakker"
 
 #: src/include/auth-server/widgets.rb:159
 msgid "Search Filter Processing"
-msgstr ""
+msgstr "Håndtering av søkefilter"
 
 #: src/include/auth-server/widgets.rb:160
 msgid "Configuration File Processing"
-msgstr ""
+msgstr "Håndtering av konfigurasjonsfil"
 
 #: src/include/auth-server/widgets.rb:161
 msgid "Access Control List Processing"
-msgstr ""
+msgstr "Håndtering av tilgangskontrollister"
 
 #: src/include/auth-server/widgets.rb:162
 msgid "Log Connections, Operations, and Result"
-msgstr ""
+msgstr "Loggtilkoblinger, handlinger og resultat"
 
 #: src/include/auth-server/widgets.rb:163
 msgid "Log Entries Sent"
-msgstr ""
+msgstr "Sendte loggoppføringer"
 
 #: src/include/auth-server/widgets.rb:164
 msgid "Print Communication with Shell Back-Ends"
-msgstr ""
+msgstr "Visningskommunikasjon med skallprogrammer"
 
 #: src/include/auth-server/widgets.rb:165
 msgid "Entry Parsing"
-msgstr ""
+msgstr "Analyse av oppføring"
 
 #: src/include/auth-server/widgets.rb:166
 msgid "LDAPSync Replication"
-msgstr ""
+msgstr "LDAPSync-replikasjon"
 
 #: src/include/auth-server/widgets.rb:167
 msgid "None"
-msgstr ""
+msgstr "Ingen"
 
 #: src/include/auth-server/widgets.rb:174
 msgid "Select &Allow Flags:"
-msgstr ""
+msgstr "Velg &tillattoppføringer:"
 
 #: src/include/auth-server/widgets.rb:176
 msgid "LDAPv2 Bind Requests"
-msgstr ""
+msgstr "Tilgangsforespørsler for LDAPv2"
 
 #: src/include/auth-server/widgets.rb:179
 msgid "Anonymous Bind when Credentials Not Empty"
-msgstr ""
+msgstr "Anonym tilgang når sertifikater ikke er tomme"
 
 #: src/include/auth-server/widgets.rb:183
 msgid "Unauthenticated Bind when DN Not Empty"
-msgstr ""
+msgstr "Uautentisert tilgang når DN ikke er tomt"
 
 #: src/include/auth-server/widgets.rb:187
 msgid "Unauthenticated Update Operations to Process"
-msgstr ""
+msgstr "Uautentiserte oppdateringshandlinger å behandle"
 
 #: src/include/auth-server/widgets.rb:193
 msgid "Select &Disallow Flags:"
-msgstr ""
+msgstr "Ikke &tillat-valg"
 
 #: src/include/auth-server/widgets.rb:197
 msgid "Disable acceptance of anonymous Bind Requests (does not prohibit anonymous directory access)"
-msgstr ""
+msgstr "Deaktiver godkjenning av anonyme tilgangsforespørsler (hindrer ikke anonym tilgang til katalog)"
 
 #: src/include/auth-server/widgets.rb:201
 msgid "Disable Simple Bind authentication"
-msgstr ""
+msgstr "Deaktiver enkel tilgangsautentisering"
 
 #: src/include/auth-server/widgets.rb:204
 msgid "Disable forcing session to anonymous status upon StartTLS operation receipt"
-msgstr ""
+msgstr "Deaktiver automatisk anonym økt etter kommandoen StartTLS"
 
 #: src/include/auth-server/widgets.rb:210
 msgid "Disallow the StartTLS operation if authenticated"
-msgstr ""
+msgstr "Ikke tillat StartTLS ved autentisering"
 
 #: src/include/auth-server/widgets.rb:221
 msgid "Basic Settings"
-msgstr ""
+msgstr "Grunninnstillinger"
 
 #: src/include/auth-server/widgets.rb:227
 msgid "Enable TLS"
-msgstr ""
+msgstr "Aktiver TLS"
 
 #: src/include/auth-server/widgets.rb:234
 msgid "Enable LDAP over SSL (ldaps) interface"
-msgstr ""
+msgstr "Aktiver LDAP over SSL (ldaps)"
 
 #: src/include/auth-server/widgets.rb:242
 msgid "Use common Server Certificate"
-msgstr ""
+msgstr "Bruk generelt serversertifikat"
 
 #: src/include/auth-server/widgets.rb:254
 msgid "Import Certificate"
-msgstr ""
+msgstr "Importerer sertifikat"
 
 #: src/include/auth-server/widgets.rb:273
 msgid "Certificate &File (PEM Format)"
-msgstr ""
+msgstr "Sertifikat&fil (PEM-format)"
 
 #: src/include/auth-server/widgets.rb:276 src/modules/LdapDatabase.rb:234
 msgid "&Browse..."
-msgstr ""
+msgstr "&Bla igjennom..."
 
 #: src/include/auth-server/widgets.rb:285
 msgid "Certificate &Key File (PEM Format - Unencrypted)"
-msgstr ""
+msgstr "Sertifikatnø&kkelfil (PEM-format - ukryptert)"
 
 #: src/include/auth-server/widgets.rb:288
 msgid "B&rowse..."
-msgstr ""
+msgstr "B&la gjennom..."
 
 #: src/include/auth-server/widgets.rb:295
 msgid "Launch CA Management Module"
-msgstr ""
+msgstr "Start CA-administrasjonsmmodul"
 
 #: src/include/auth-server/widgets.rb:301 src/modules/LdapDatabase.rb:178
 msgid "&Base DN"
-msgstr ""
+msgstr "&Hoved-DN"
 
 #: src/include/auth-server/widgets.rb:305
 msgid "Administrator DN"
-msgstr ""
+msgstr "Administrator-DN"
 
 #: src/include/auth-server/widgets.rb:307 src/modules/LdapDatabase.rb:81
 msgid "&Append Base DN"
-msgstr ""
+msgstr "Legg til h&oved-DN"
 
 #: src/include/auth-server/widgets.rb:309
 msgid "Change Password"
-msgstr ""
+msgstr "Endre passord"
 
 #: src/include/auth-server/widgets.rb:317
 msgid "Edit BDB Database"
-msgstr ""
+msgstr "Rediger BDB-database"
 
 #: src/include/auth-server/widgets.rb:324
 msgid "Entry Cache"
-msgstr ""
+msgstr "Oppføringsmellomlager"
 
 #: src/include/auth-server/widgets.rb:330
 msgid "Index Cache (IDL cache)"
-msgstr ""
+msgstr "Indeksmellomlager (IDL cache)"
 
 #: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2102
 msgid "Checkpoint Settings"
@@ -2188,91 +2267,91 @@
 
 #: src/include/auth-server/widgets.rb:344
 msgid "kilobytes"
-msgstr ""
+msgstr "kilobyte"
 
 #: src/include/auth-server/widgets.rb:346
 msgid "minutes"
-msgstr ""
+msgstr "minutter"
 
 #: src/include/auth-server/widgets.rb:354
 msgid "Change Configuration Database Settings"
-msgstr ""
+msgstr "Endre innstillinger for oppsettdatabase"
 
 #: src/include/auth-server/widgets.rb:359
 msgid "Allow Plaintext Authentication (Simple Bind) for this Database. "
-msgstr ""
+msgstr "Tillat klartekstautentisering (Simple Bind) for denne databasen. "
 
 #: src/include/auth-server/widgets.rb:362
 msgid "(Remote Connection needs to be encrypted)"
-msgstr ""
+msgstr "(ekstern forbindelse må være kryptert)"
 
 #: src/include/auth-server/widgets.rb:374
 msgid "Edit Database"
-msgstr ""
+msgstr "Rediger database"
 
 #: src/include/auth-server/widgets.rb:376
 msgid "Database type not currently supported."
-msgstr ""
+msgstr "Databasetypen støttes foreløpig ikke."
 
 #: src/include/auth-server/widgets.rb:381
 msgid "Indexing Configuration"
-msgstr ""
+msgstr "Indekseringsoppsett"
 
 #: src/include/auth-server/widgets.rb:384
 msgid "Attribute"
-msgstr ""
+msgstr "Attributt"
 
 #: src/include/auth-server/widgets.rb:384
 #: src/include/auth-server/widgets.rb:452
 msgid "Presence"
-msgstr ""
+msgstr "Forekomst"
 
 #: src/include/auth-server/widgets.rb:384
 #: src/include/auth-server/widgets.rb:453
 msgid "Equality"
-msgstr ""
+msgstr "Likhet"
 
 #: src/include/auth-server/widgets.rb:384
 #: src/include/auth-server/widgets.rb:454
 msgid "Substring"
-msgstr ""
+msgstr "Understreng"
 
 #: src/include/auth-server/widgets.rb:402
 msgid "Change Administrator Password"
-msgstr ""
+msgstr "Endre administratorpassord"
 
 #: src/include/auth-server/widgets.rb:447
 msgid "Add Index"
-msgstr ""
+msgstr "Legg til indeks"
 
 #. encoding: utf-8
 #: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2239
 msgid "Password Policy Settings"
-msgstr ""
+msgstr "Passordregelinnstillinger"
 
 #: src/modules/LdapDatabase.rb:47
 msgid "Enable Password Policies"
-msgstr ""
+msgstr "Aktiver passordregler"
 
 #: src/modules/LdapDatabase.rb:55
 msgid "Hash Clear Text Passwords"
-msgstr ""
+msgstr "Krypter klartekstpassord"
 
 #: src/modules/LdapDatabase.rb:63
 msgid "Disclose \"Account Locked\" Status"
-msgstr ""
+msgstr "Vis \"låst konto\"-status"
 
 #: src/modules/LdapDatabase.rb:73
 msgid "Default Policy Object DN"
-msgstr ""
+msgstr "Standard DN til regelobjekt"
 
 #: src/modules/LdapDatabase.rb:89
 msgid "Edit Policy"
-msgstr ""
+msgstr "Rediger regel"
 
 #: src/modules/LdapDatabase.rb:100
 msgid "All Entries"
-msgstr ""
+msgstr "Alle oppføringer"
 
 #: src/modules/LdapDatabase.rb:101
 msgid "All Entries in the Subtree"
@@ -2280,105 +2359,105 @@
 
 #: src/modules/LdapDatabase.rb:102
 msgid "The Entry with the DN"
-msgstr ""
+msgstr "Oppføringen med DN"
 
 #: src/modules/LdapDatabase.rb:106
 msgid "Everybody"
-msgstr ""
+msgstr "Alle"
 
 #: src/modules/LdapDatabase.rb:107
 msgid "Authenticated Clients"
-msgstr ""
+msgstr "Autentiserte klienter"
 
 #: src/modules/LdapDatabase.rb:108
 msgid "Anonymous Clients"
-msgstr ""
+msgstr "Anonyme klienter"
 
 #: src/modules/LdapDatabase.rb:109
 msgid "The accessed Entry (self)"
-msgstr ""
+msgstr "Oppføringen som er i bruk (selv)"
 
 #: src/modules/LdapDatabase.rb:110
 msgid "The user with the DN"
-msgstr ""
+msgstr "Brukeren med DN"
 
 #: src/modules/LdapDatabase.rb:111
 msgid "All entries in the subtree"
-msgstr ""
+msgstr "Alle oppføringer i underfilstrukturen"
 
 #: src/modules/LdapDatabase.rb:112
 msgid "All members of the group"
-msgstr ""
+msgstr "Alle medlemmer i gruppen"
 
 #: src/modules/LdapDatabase.rb:125
 msgid "<empty>"
-msgstr ""
+msgstr "<tom>"
 
 #: src/modules/LdapDatabase.rb:126
 msgid "No Access"
-msgstr ""
+msgstr "Ingen tilgang"
 
 #: src/modules/LdapDatabase.rb:128
 msgid "No Access (but disclose information on error)"
-msgstr ""
+msgstr "Ingen tilgang (med avdekkingsinformasjon ved feil)"
 
 #: src/modules/LdapDatabase.rb:131
 msgid "Authenticate"
-msgstr ""
+msgstr "Autentisere"
 
 #: src/modules/LdapDatabase.rb:132
 msgid "Compare"
-msgstr ""
+msgstr "Sammenligne"
 
 #: src/modules/LdapDatabase.rb:133
 msgid "Read"
-msgstr ""
+msgstr "Lese"
 
 #: src/modules/LdapDatabase.rb:134
 msgid "Write"
-msgstr ""
+msgstr "Skrive"
 
 #: src/modules/LdapDatabase.rb:135
 msgid "Manage (full access)"
-msgstr ""
+msgstr "Styre (full tilgang)"
 
 #. don't count frontend and Config DB
 #: src/modules/LdapDatabase.rb:167
 msgid "New Database"
-msgstr ""
+msgstr "Ny database"
 
 #: src/modules/LdapDatabase.rb:170
 msgid "Basic Database Settings"
-msgstr ""
+msgstr "Grunninnstillinger for database"
 
 #: src/modules/LdapDatabase.rb:189
 msgid "&Administrator DN"
-msgstr ""
+msgstr "&Administrator-DN"
 
 #: src/modules/LdapDatabase.rb:197
 msgid "A&ppend Base DN"
-msgstr ""
+msgstr "L&egg til base-DN"
 
 #: src/modules/LdapDatabase.rb:211
 msgid "LDAP Administrator &Password"
-msgstr ""
+msgstr "Administrasjons&passord for LDAP "
 
 #: src/modules/LdapDatabase.rb:230
 msgid "&Database Directory"
-msgstr ""
+msgstr "&Databasekatalog"
 
 #: src/modules/LdapDatabase.rb:240
 msgid "Use this database as the default for OpenLDAP clients"
-msgstr ""
+msgstr "Bruk denne databasen som standard for OpenLDAP-klienter"
 
 #: src/modules/LdapDatabase.rb:311
 msgid "Select Database Directory"
-msgstr ""
+msgstr "Velg databasekatalog"
 
 #. check values
 #: src/modules/LdapDatabase.rb:350
 msgid "Base DN must be set."
-msgstr ""
+msgstr "Hoved-DN må defineres."
 
 #: src/modules/LdapDatabase.rb:359
 msgid "A database with this Base DN already exists."
@@ -2386,11 +2465,11 @@
 
 #: src/modules/LdapDatabase.rb:399
 msgid "Root DN must be set if a password is given."
-msgstr ""
+msgstr "Rot-DN må være definert for å angi et passord."
 
 #: src/modules/LdapDatabase.rb:405
 msgid "Password validation failed."
-msgstr ""
+msgstr "Passordvalidering mislyktes."
 
 #: src/modules/LdapDatabase.rb:435
 msgid ""
@@ -2400,52 +2479,52 @@
 
 #: src/modules/LdapDatabase.rb:451
 msgid "A directory must be specified."
-msgstr ""
+msgstr "En katalog må spesifiseres."
 
 #: src/modules/LdapDatabase.rb:458
 msgid "The directory does not exist. Create it?"
-msgstr ""
+msgstr "Katalogen finnes ikke. Vil du opprette den?"
 
 #. try to read the ppolicy from the server
 #: src/modules/LdapDatabase.rb:637
 msgid "Authentication failed. The password is probably incorrect.\n"
-msgstr ""
+msgstr "Autentisering mislyktes. Passordet er sannsynligvis feil.\n"
 
 #: src/modules/LdapDatabase.rb:640
 msgid "The error message was: '"
-msgstr ""
+msgstr "Feilmeldingen er: '"
 
 #: src/modules/LdapDatabase.rb:645
 msgid "Try again?"
-msgstr ""
+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
 msgid "Available Attribute Types"
-msgstr ""
+msgstr "Tilgjengelige attributtyper"
 
 #: src/modules/LdapDatabase.rb:724
 msgid "Selected Attribute Types"
-msgstr ""
+msgstr "Valgte attributtyper"
 
 #. Popup to add/edit the acl "by" clauses
 #: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:985
 msgid "Who should this rule apply to"
-msgstr ""
+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
 msgid "Entry DN"
-msgstr ""
+msgstr "Oppføringens DN"
 
 #: src/modules/LdapDatabase.rb:820 src/modules/LdapDatabase.rb:990
 msgid "Select"
-msgstr ""
+msgstr "Velg"
 
 #: src/modules/LdapDatabase.rb:826
 msgid "Define the Access Level"
-msgstr ""
+msgstr "Definer tilgangsnivået"
 
 #: src/modules/LdapDatabase.rb:836
 msgid "Stop access control evaluation here (default)"
@@ -2457,7 +2536,7 @@
 
 #: src/modules/LdapDatabase.rb:849
 msgid "Continue evaluation of this rule (\"continue\")"
-msgstr ""
+msgstr "Fortsett evaluering av denne regelen (\"continue\")"
 
 #: src/modules/LdapDatabase.rb:904
 msgid "Please enter a DN in the textfield"
@@ -2466,27 +2545,27 @@
 #: src/modules/LdapDatabase.rb:948 src/modules/LdapDatabase.rb:1090
 #: src/modules/LdapDatabase.rb:1225
 msgid "Subtree DN"
-msgstr ""
+msgstr "Underfilstruktur-DN"
 
 #: src/modules/LdapDatabase.rb:950
 msgid "Group DN"
-msgstr ""
+msgstr "Gruppe-DN"
 
 #: src/modules/LdapDatabase.rb:973
 msgid "Edit Access Control Rule"
-msgstr ""
+msgstr "Rediger tilgangskontrollregel"
 
 #: src/modules/LdapDatabase.rb:978
 msgid "Target Objects"
-msgstr ""
+msgstr "Målobjekter"
 
 #: src/modules/LdapDatabase.rb:999
 msgid "Matching the filter:"
-msgstr ""
+msgstr "Samsvarer med filteret:"
 
 #: src/modules/LdapDatabase.rb:1006
 msgid "LDAP Filter"
-msgstr ""
+msgstr "LDAP-filter"
 
 #: src/modules/LdapDatabase.rb:1016
 msgid "Apply this rule only to the listed attribute"
@@ -2494,35 +2573,35 @@
 
 #: src/modules/LdapDatabase.rb:1021 src/modules/LdapDatabase.rb:1315
 msgid "Attributes"
-msgstr ""
+msgstr "Attributter"
 
 #: src/modules/LdapDatabase.rb:1023
 msgid "Edit"
-msgstr ""
+msgstr "Rediger"
 
 #: src/modules/LdapDatabase.rb:1029 src/modules/LdapDatabase.rb:1041
 msgid "Access Level"
-msgstr ""
+msgstr "Tilgangsnivå"
 
 #: src/modules/LdapDatabase.rb:1039
 msgid "Who"
-msgstr ""
+msgstr "Hvem"
 
 #: src/modules/LdapDatabase.rb:1040 src/modules/LdapDatabase.rb:1315
 msgid "DN"
-msgstr ""
+msgstr "DN"
 
 #: src/modules/LdapDatabase.rb:1042
 msgid "Flow Control"
-msgstr ""
+msgstr "Flytkontroll"
 
 #: src/modules/LdapDatabase.rb:1047 src/modules/LdapDatabase.rb:1319
 msgid "Up"
-msgstr ""
+msgstr "Opp"
 
 #: src/modules/LdapDatabase.rb:1048 src/modules/LdapDatabase.rb:1320
 msgid "Down"
-msgstr ""
+msgstr "Ned"
 
 #. FIXME: Validate attribute types
 #: src/modules/LdapDatabase.rb:1185
@@ -2539,11 +2618,11 @@
 
 #: src/modules/LdapDatabase.rb:1315
 msgid "Target"
-msgstr ""
+msgstr "Mål"
 
 #: src/modules/LdapDatabase.rb:1315
 msgid "Filter"
-msgstr ""
+msgstr "Filter"
 
 #: src/modules/LdapDatabase.rb:1347
 msgid ""
@@ -2557,47 +2636,47 @@
 
 #: src/modules/LdapDatabase.rb:1614
 msgid "Provider Name"
-msgstr ""
+msgstr "Leverandørnavn"
 
 #: src/modules/LdapDatabase.rb:1619 src/modules/LdapDatabase.rb:1716
 msgid "Port"
-msgstr ""
+msgstr "Port"
 
 #: src/modules/LdapDatabase.rb:1637
 msgid "Replication Type"
-msgstr ""
+msgstr "Replikasjonstype"
 
 #: src/modules/LdapDatabase.rb:1644
 msgid "Replication Interval"
-msgstr ""
+msgstr "Replikasjonsintervall"
 
 #: src/modules/LdapDatabase.rb:1647
 msgid "Days"
-msgstr ""
+msgstr "Dager"
 
 #: src/modules/LdapDatabase.rb:1651
 msgid "Hours"
-msgstr ""
+msgstr "Timer"
 
 #: src/modules/LdapDatabase.rb:1655 src/modules/LdapDatabase.rb:2118
 msgid "Minutes"
-msgstr ""
+msgstr "Minutter"
 
 #: src/modules/LdapDatabase.rb:1659
 msgid "Seconds"
-msgstr ""
+msgstr "Sekunder"
 
 #: src/modules/LdapDatabase.rb:1672
 msgid "Authentication DN"
-msgstr ""
+msgstr "Autentiserings-DN"
 
 #: src/modules/LdapDatabase.rb:1693
 msgid "Custom update referral"
-msgstr ""
+msgstr "Tilpasset oppdateringshenvisning"
 
 #: src/modules/LdapDatabase.rb:1709
 msgid "Target Host"
-msgstr ""
+msgstr "Målvertsmaskin"
 
 #. no updateref
 #: src/modules/LdapDatabase.rb:1929
@@ -2611,7 +2690,7 @@
 
 #: src/modules/LdapDatabase.rb:1980 src/modules/LdapDatabase.rb:2007
 msgid "Do you still want to continue?"
-msgstr ""
+msgstr "Vil du likevel forsøke på nytt?"
 
 #: src/modules/LdapDatabase.rb:1989
 msgid "Checking the LDAPsync capabilities of the provider failed."
@@ -2619,15 +2698,15 @@
 
 #: src/modules/LdapDatabase.rb:1995
 msgid "Please verify that the target server is enabled to be a LDAPsync provider"
-msgstr ""
+msgstr "Bekreft at målserveren er aktivert som LDAPsync-leverandør"
 
 #: src/modules/LdapDatabase.rb:2094
 msgid "Enable ldapsync provider for this database"
-msgstr ""
+msgstr "Aktiver ldapsync-leverandør for denne databasen"
 
 #: src/modules/LdapDatabase.rb:2108 src/modules/LdapDatabase.rb:2144
 msgid "Operations"
-msgstr ""
+msgstr "Handlinger"
 
 #: src/modules/LdapDatabase.rb:2131
 msgid "Session Log"
@@ -2643,15 +2722,15 @@
 
 #: src/modules/AuthServer.pm:352
 msgid "Reading Startup Configuration"
-msgstr ""
+msgstr "Leser oppstartsoppsett"
 
 #: src/modules/AuthServer.pm:353
 msgid "Reading Configuration Backend"
-msgstr ""
+msgstr "Leser oppsett for grunnsystem"
 
 #: src/modules/AuthServer.pm:354
 msgid "Reading Configuration Data"
-msgstr ""
+msgstr "Leser oppsettsdata"
 
 #: src/modules/AuthServer.pm:355
 msgid "Initializing Authentication Server Configuration"
@@ -2665,70 +2744,70 @@
 
 #: src/modules/AuthServer.pm:466 src/modules/AuthServer.pm:1033
 msgid "LDAP search failed."
-msgstr ""
+msgstr "LDAP-søk mislyktes."
 
 #: src/modules/AuthServer.pm:812
 msgid "Invalid LDAP URI scheme."
-msgstr ""
+msgstr "Ugyldig URI-skjema for LDAP."
 
 #: src/modules/AuthServer.pm:828
 msgid "LDAP initialization failed."
-msgstr ""
+msgstr "LDAP-initialisering mislyktes."
 
 #: src/modules/AuthServer.pm:854
 msgid "LDAP bind failed."
-msgstr ""
+msgstr "LDAP-binding mislyktes."
 
 #: src/modules/AuthServer.pm:877
 msgid "Initializing LDAP schema failed."
-msgstr ""
+msgstr "Initialisering av LDAP mislyktes."
 
 #: src/modules/AuthServer.pm:888
 msgid "Reading LDAP schema failed."
-msgstr ""
+msgstr "Lesing av LDAP-skjema mislyktes."
 
 #: src/modules/AuthServer.pm:898
 msgid "Kerberos Schema unknown by the LDAP server."
-msgstr ""
+msgstr "Kerberos-skjema ukjent for LDAP-serveren."
 
-#: src/modules/AuthServer.pm:975 src/modules/AuthServer.pm:3479
-#: src/modules/AuthServer.pm:3526 src/modules/AuthServer.pm:3572
+#: src/modules/AuthServer.pm:975 src/modules/AuthServer.pm:3482
+#: src/modules/AuthServer.pm:3529 src/modules/AuthServer.pm:3575
 msgid "Cannot execute kdb5_ldap_util."
 msgstr ""
 
 #: src/modules/AuthServer.pm:1005
 msgid "Modifying the kerberos database failed."
-msgstr ""
+msgstr "Lagring av Kerberos-database mislyktes."
 
 #: src/modules/AuthServer.pm:1046
 msgid "LDAP modify failed."
-msgstr ""
+msgstr "LDAP-endring mislyktes."
 
 #: src/modules/AuthServer.pm:1074
 msgid "Incomplete data."
-msgstr ""
+msgstr "Ufullstendig informasjon."
 
 #: src/modules/AuthServer.pm:1101
 msgid "Unsupported database type."
-msgstr ""
+msgstr "Databasetypen støttes ikke."
 
 #. service was disabled during this session, just disable the service
 #. in the system, stop it and ignore any configuration changes.
 #: src/modules/AuthServer.pm:1546
 msgid "Enabling LDAP Server"
-msgstr ""
+msgstr "Aktiverer LDAP-server"
 
 #: src/modules/AuthServer.pm:1547 src/modules/AuthServer.pm:1559
 msgid "Starting LDAP Server"
-msgstr ""
+msgstr "Starter LDAP-server"
 
 #: src/modules/AuthServer.pm:1549
 msgid "Activating OpenLDAP Server"
-msgstr ""
+msgstr "Aktiverer OpenLDAP-server"
 
 #: src/modules/AuthServer.pm:1560
 msgid "Restarting OpenLDAP Server"
-msgstr ""
+msgstr "Starter OpenLDAP-server på nytt"
 
 #: src/modules/AuthServer.pm:1569
 msgid "Enabling Kerberos Server"
@@ -2744,23 +2823,23 @@
 
 #: src/modules/AuthServer.pm:1602
 msgid "Writing Startup Configuration"
-msgstr ""
+msgstr "Lagrer oppstartsoppsett"
 
 #: src/modules/AuthServer.pm:1603
 msgid "Cleaning up config directory"
-msgstr ""
+msgstr "Rydder opp i oppsettkatalog"
 
 #: src/modules/AuthServer.pm:1604
 msgid "Creating Configuration"
-msgstr ""
+msgstr "Oppretter oppsett"
 
 #: src/modules/AuthServer.pm:1605
 msgid "Starting OpenLDAP Server"
-msgstr ""
+msgstr "Starter OpenLDAP-server"
 
 #: src/modules/AuthServer.pm:1606
 msgid "Creating Base Objects"
-msgstr ""
+msgstr "Oppretter hovedobjekter"
 
 #: src/modules/AuthServer.pm:1607
 msgid "Saving Kerberos Configuration"
@@ -2772,41 +2851,41 @@
 
 #: src/modules/AuthServer.pm:1616 src/modules/AuthServer.pm:2569
 msgid "Switch from slapd.conf to config backend failed."
-msgstr ""
+msgstr "Bytte fra slapd.conf til oppsettgrunnsystem mislyktes."
 
 #: src/modules/AuthServer.pm:1624
 msgid "Enabling the LDAPI Protocol listener failed."
-msgstr ""
+msgstr "Aktivering av LDAPI-lytting mislyktes."
 
 #: src/modules/AuthServer.pm:1648
 msgid "Config Directory cleanup failed."
-msgstr ""
+msgstr "Opprydding i oppsettkatalog mislyktes."
 
 #: src/modules/AuthServer.pm:1686
 msgid "Error while populating the configurations database with \"slapadd\"."
-msgstr ""
+msgstr "Feil under innmating i oppsettdatabase med \"slapadd\"."
 
 #: src/modules/AuthServer.pm:1706
 msgid "Enabling the LDAP Service failed."
-msgstr ""
+msgstr "Aktivering av LDAP-tjeneste mislyktes."
 
 #: src/modules/AuthServer.pm:1722 src/modules/AuthServer.pm:2600
 msgid "Starting the LDAP service failed."
-msgstr ""
+msgstr "Start av LDAP-tjeneste mislyktes."
 
 #. service was disabled during this session, just disable the service
 #. in the system, stop it and ignore any configuration changes.
 #: src/modules/AuthServer.pm:1784
 msgid "Stopping LDAP Server"
-msgstr ""
+msgstr "Stopper LDAP-server"
 
 #: src/modules/AuthServer.pm:1785
 msgid "Disabling LDAP Server"
-msgstr ""
+msgstr "Deaktiverer LDAP-server"
 
 #: src/modules/AuthServer.pm:1787
 msgid "De-activating OpenLDAP Server"
-msgstr ""
+msgstr "Deaktiverer OpenLDAP-server"
 
 #. service was disabled during this session, just disable the service
 #. in the system, stop it and ignore any configuration changes.
@@ -2824,31 +2903,31 @@
 
 #: src/modules/AuthServer.pm:1825
 msgid "Writing Sysconfig files"
-msgstr ""
+msgstr "Lagrer sysconfig-filer"
 
 #: src/modules/AuthServer.pm:1826
 msgid "Applying changes to Configuration Database"
-msgstr ""
+msgstr "Lagrer endringer for oppsettdatabase"
 
 #: src/modules/AuthServer.pm:1827
 msgid "Applying changes to /etc/openldap/ldap.conf"
-msgstr ""
+msgstr "Lagrer endringer i /etc/openldap/ldap.conf"
 
 #: src/modules/AuthServer.pm:1828
 msgid "Creating Base Objects for newly created databases"
-msgstr ""
+msgstr "Oppretter baseobjekter for nyopprettede databaser"
 
 #: src/modules/AuthServer.pm:1829
 msgid "Updating Default Password Policy Objects"
-msgstr ""
+msgstr "Oppdaterer standardobjekter for passordregler"
 
 #: src/modules/AuthServer.pm:1830
 msgid "Waiting for OpenLDAP background indexing tasks to complete (this might take some minutes)"
-msgstr ""
+msgstr "Venter på at bagrunnsindeksering for OpenLDAP skal fullføres (dette kan ta noen minutter)"
 
 #: src/modules/AuthServer.pm:1831
 msgid "Restarting OpenLDAP Server if required"
-msgstr ""
+msgstr "Starter om nødvendig OpenLDAP-serveren på nytt"
 
 #: src/modules/AuthServer.pm:1834
 msgid "Writing AuthServer Configuration"
@@ -2856,11 +2935,11 @@
 
 #: src/modules/AuthServer.pm:1931
 msgid "Creating base objects failed."
-msgstr ""
+msgstr "Oppretting av baseobjekter mislyktes."
 
 #: src/modules/AuthServer.pm:1940
 msgid "Creating Password Policy objects failed."
-msgstr ""
+msgstr "Oppretting av passordregelobjekter mislyktes."
 
 #: src/modules/AuthServer.pm:1953
 msgid "An error occurred while waiting for the OpenLDAP database indexer to finish.\n"
@@ -2872,7 +2951,7 @@
 
 #: src/modules/AuthServer.pm:2194 src/modules/AuthServer.pm:2214
 msgid "Register at SLP Service: "
-msgstr ""
+msgstr "Registrer for SLP-tjeneste: "
 
 #: src/modules/AuthServer.pm:2213
 msgid "Start Kerberos Server: "
@@ -2880,19 +2959,19 @@
 
 #: src/modules/AuthServer.pm:2215
 msgid "Create the following databases:"
-msgstr ""
+msgstr "Opprett følgende         r"
 
 #: src/modules/AuthServer.pm:2220
 msgid "Database Suffix: "
-msgstr ""
+msgstr "Databasesuffiks:"
 
 #: src/modules/AuthServer.pm:2221
 msgid "Database Type: "
-msgstr ""
+msgstr "Databasetype:"
 
 #: src/modules/AuthServer.pm:2227
 msgid "Not configured yet."
-msgstr ""
+msgstr "Ikke konfigurert ennå."
 
 #: src/modules/AuthServer.pm:2472
 msgid "CA Certificate file does not exist."
@@ -2900,12 +2979,12 @@
 
 #: src/modules/AuthServer.pm:2477
 msgid "Certificate File does not exist"
-msgstr ""
+msgstr "Sertifikatfilen finnes ikke"
 
 #. error message
 #: src/modules/AuthServer.pm:2482 src/modules/YaPI/LdapServer.pm:1752
 msgid "Certificate key file does not exist."
-msgstr ""
+msgstr "Sertifikatnøkkelfilen finnes ikke."
 
 #: src/modules/AuthServer.pm:2489 src/modules/AuthServer.pm:2523
 msgid "Can not set a filesystem ACL on the private key."
@@ -2917,45 +2996,45 @@
 
 #: src/modules/AuthServer.pm:2545
 msgid "Cleaning up directory for config database"
-msgstr ""
+msgstr "Rydder opp i katalog for oppsettdatabase"
 
 #: src/modules/AuthServer.pm:2546
 msgid "Converting slapd.conf to config database"
-msgstr ""
+msgstr "Konverterer slapd.conf til oppsettdatabase"
 
 #: src/modules/AuthServer.pm:2547
 msgid "Switching startup configuration to use config database"
-msgstr ""
+msgstr "Endrer oppstartoppsett til å bruke oppsettdatabase"
 
 #: src/modules/AuthServer.pm:2548
 msgid "Restarting LDAP Server"
-msgstr ""
+msgstr "Starter LDAP-server på nytt"
 
 #: src/modules/AuthServer.pm:2549
 msgid "Migrating LDAP Server Configuration"
-msgstr ""
+msgstr "Migrerer oppsett for LDAP-server"
 
 #: src/modules/AuthServer.pm:2559
 msgid "Output of \"slaptest\":\n"
-msgstr ""
+msgstr "Resultat av \"slaptest\":\n"
 
 #: src/modules/AuthServer.pm:2560
 msgid "Migration of existing configuration failed."
-msgstr ""
+msgstr "Flytting av eksisterende oppsett mislyktes."
 
 #: src/modules/AuthServer.pm:2579 src/modules/AuthServer.pm:2587
 msgid "Enabling LDAPI listener failed."
-msgstr ""
+msgstr "Aktivering av LDAPI-lytting mislyktes."
 
 #: src/modules/AuthServer.pm:2709
 msgid "Common server certificate not available. StartTLS is disabled."
-msgstr ""
+msgstr "Generelt serversertifikat ikke tilgjengelig. StartTLS er deaktivert."
 
 #: src/modules/AuthServer.pm:2803
 msgid "Could not create database directory."
 msgstr ""
 
-#: src/modules/AuthServer.pm:2810 src/modules/AuthServer.pm:4096
+#: src/modules/AuthServer.pm:2810 src/modules/AuthServer.pm:4101
 #: src/modules/YaPI/LdapServer.pm:498
 msgid "Could not adjust ownership of database directory."
 msgstr ""
@@ -2968,246 +3047,246 @@
 msgid "A master server for replication cannot work correctly without knowing its own fully qualified hostname."
 msgstr ""
 
-#: src/modules/AuthServer.pm:3373 src/modules/AuthServer.pm:3386
-#: src/modules/AuthServer.pm:3399 src/modules/AuthServer.pm:3412
-#: src/modules/AuthServer.pm:3425
+#: src/modules/AuthServer.pm:3376 src/modules/AuthServer.pm:3389
+#: src/modules/AuthServer.pm:3402 src/modules/AuthServer.pm:3415
+#: src/modules/AuthServer.pm:3428
 msgid "Cannot write krb5.conf."
-msgstr ""
+msgstr "Kan ikke lagre krb5.conf."
 
-#: src/modules/AuthServer.pm:3511
+#: src/modules/AuthServer.pm:3514
 msgid "Creating Kerberos database failed."
-msgstr ""
+msgstr "Oppretting av Kerberos-database mislyktes."
 
-#: src/modules/AuthServer.pm:3557 src/modules/AuthServer.pm:3603
+#: src/modules/AuthServer.pm:3560 src/modules/AuthServer.pm:3606
 msgid "Writing to password file failed."
-msgstr ""
+msgstr "Lagring av passordfil mislyktes."
 
-#: src/modules/AuthServer.pm:3969 src/modules/AuthServer.pm:3979
+#: src/modules/AuthServer.pm:3972 src/modules/AuthServer.pm:3982
 msgid "is not a valid LDAP DN."
-msgstr ""
+msgstr "er ikke en gyldig DN for LDAP."
 
-#: src/modules/AuthServer.pm:3974 src/modules/AuthServer.pm:3984
+#: src/modules/AuthServer.pm:3977 src/modules/AuthServer.pm:3987
 msgid "has multivalued RDNs."
 msgstr ""
 
-#: src/modules/AuthServer.pm:4016
+#: src/modules/AuthServer.pm:4019
 #, perl-format
 msgid "Invalid LDAP DN: \"%s\", cannot extract RDN values"
 msgstr ""
 
-#: src/modules/AuthServer.pm:4024
+#: src/modules/AuthServer.pm:4027
 msgid "The value of the \"c\" attribute must contain a valid ISO-3166 country 2-letter code."
 msgstr ""
 
 #. parameter check failed
-#: src/modules/AuthServer.pm:4031 src/modules/YaPI/LdapServer.pm:373
+#: src/modules/AuthServer.pm:4034 src/modules/YaPI/LdapServer.pm:373
 msgid "First part of suffix must be c=, st=, l=, o=, ou= or dc=."
-msgstr ""
+msgstr "Første del av suffikset må være c=, st=, l=, o=, ou= eller dc=."
 
-#: src/modules/AuthServer.pm:4043
+#: src/modules/AuthServer.pm:4046
 #, perl-format
 msgid "Base DN \"%s\" is not a valid LDAP DN."
 msgstr ""
 
-#: src/modules/AuthServer.pm:4048
+#: src/modules/AuthServer.pm:4051
 #, perl-format
 msgid "Base DN \"%s\" has multivalued RDNs (not supported by YaST)."
 msgstr ""
 
-#: src/modules/AuthServer.pm:4057
+#: src/modules/AuthServer.pm:4060
 #, perl-format
 msgid "Root DN \"%s\" is not a valid LDAP DN."
 msgstr ""
 
-#: src/modules/AuthServer.pm:4062
+#: src/modules/AuthServer.pm:4065
 #, perl-format
 msgid "Root DN \"%s\" has multivalued RDNs (not supported by YaST)."
 msgstr ""
 
-#: src/modules/AuthServer.pm:4069
+#: src/modules/AuthServer.pm:4072
 msgid "The Root DN must be a child object of the Base DN."
-msgstr ""
+msgstr "Rot-DN må være et objekt som er underordnet hoved-DN."
 
-#: src/modules/AuthServer.pm:4089 src/modules/YaPI/LdapServer.pm:484
+#: src/modules/AuthServer.pm:4094 src/modules/YaPI/LdapServer.pm:484
 msgid "Could not create directory."
-msgstr ""
+msgstr "Kan ikke opprette katalog."
 
-#: src/modules/AuthServer.pm:4863
+#: src/modules/AuthServer.pm:4871
 #, perl-format
 msgid "CA Certificate File: \"%s\" does not exist."
 msgstr ""
 
-#: src/modules/AuthServer.pm:4873
+#: src/modules/AuthServer.pm:4881
 msgid "Error while trying to verify the server certificate of the provider server.\n"
 msgstr ""
 
-#: src/modules/AuthServer.pm:4874
+#: src/modules/AuthServer.pm:4882
 #, perl-format
 msgid ""
 "Please make sure that \"%s\" contains the correct\n"
 "CA file to verify the remote Server Certificate."
 msgstr ""
 
-#: src/modules/AuthServer.pm:4882
+#: src/modules/AuthServer.pm:4890
 #, perl-format
 msgid "Certificate File: \"%s\" does not exist."
 msgstr ""
 
-#: src/modules/AuthServer.pm:4887
+#: src/modules/AuthServer.pm:4895
 #, perl-format
 msgid "Certificate Key File: \"%s\" does not exist."
 msgstr ""
 
-#: src/modules/AuthServer.pm:4968 src/modules/AuthServer.pm:4978
+#: src/modules/AuthServer.pm:4976 src/modules/AuthServer.pm:4986
 msgid "Writing to krb5.conf failed."
-msgstr ""
+msgstr "Lagring av krb5.conf mislyktes."
 
-#: src/modules/AuthServer.pm:5346 src/modules/AuthServer.pm:5355
+#: src/modules/AuthServer.pm:5354 src/modules/AuthServer.pm:5363
 msgid "Writing to kdc.conf failed."
-msgstr ""
+msgstr "Lagring av kdc.conf mislyktes."
 
 #. error at paramter check
 #: src/modules/YaPI/LdapServer.pm:301
 #, perl-format
 msgid "Database type '%s' is not supported. Allowed are 'bdb' and 'hdb'."
-msgstr ""
+msgstr "Databasetype '%s' støttes ikke. Type 'bdb' og 'hdb' er tillatt."
 
 #. parameter check failed
 #: src/modules/YaPI/LdapServer.pm:347
 msgid "The countryName must be an ISO-3166 country 2-letter code."
-msgstr ""
+msgstr "Landsnavnet må være en ISO-3166-landskode med to tegn."
 
 #. parameter check failed
 #: src/modules/YaPI/LdapServer.pm:391 src/modules/YaPI/LdapServer.pm:726
 msgid "Invalid 'rootdn'."
-msgstr ""
+msgstr "Ugyldig 'rootdn'."
 
 #. parameter check failed
 #: src/modules/YaPI/LdapServer.pm:400 src/modules/YaPI/LdapServer.pm:734
 msgid "'rootdn' must be below the 'suffix'."
-msgstr ""
+msgstr "'rootdn' må være under suffikset."
 
 #. parameter check failed
 #: src/modules/YaPI/LdapServer.pm:415
 msgid "To set a password, you must define 'rootdn'."
-msgstr ""
+msgstr "Du må definere 'rootdn' for å angi et passord."
 
 #. parameter check failed
 #: src/modules/YaPI/LdapServer.pm:422
 msgid "Define 'rootpw'."
-msgstr ""
+msgstr "Definer 'rootpw'."
 
 #. parameter check failed
 #: src/modules/YaPI/LdapServer.pm:435 src/modules/YaPI/LdapServer.pm:768
 #, perl-format
 msgid "'%s' is an unsupported crypt method."
-msgstr ""
+msgstr "%s er en krypteringsmetode som ikke støttes."
 
 #. parameter check failed
 #: src/modules/YaPI/LdapServer.pm:475
 msgid "Define 'directory'."
-msgstr ""
+msgstr "Definer 'katalog'."
 
 #: src/modules/YaPI/LdapServer.pm:489
 msgid "The directory does not exist."
-msgstr ""
+msgstr "Katalogen finnes ikke."
 
 #: src/modules/YaPI/LdapServer.pm:511 src/modules/YaPI/LdapServer.pm:526
 msgid "Invalid cache size value."
-msgstr ""
+msgstr "Ugyldig verdi for mellomlagerstørrelse."
 
 #: src/modules/YaPI/LdapServer.pm:547
 msgid "Invalid checkpoint value."
-msgstr ""
+msgstr "Ugyldig checkpoint-verdi."
 
 #. parameter check failed
 #: src/modules/YaPI/LdapServer.pm:753 src/modules/YaPI/LdapServer.pm:758
 msgid "Define 'passwd'."
-msgstr ""
+msgstr "Definer 'passord'."
 
 #: src/modules/YaPI/LdapServer.pm:805
 msgid "Database edit failed."
-msgstr ""
+msgstr "Databaseredigering mislyktes."
 
 #. error message at parameter check
 #: src/modules/YaPI/LdapServer.pm:865 src/modules/YaPI/LdapServer.pm:938
 #: src/modules/YaPI/LdapServer.pm:1086 src/modules/YaPI/LdapServer.pm:1129
 msgid "Missing parameter 'suffix'."
-msgstr ""
+msgstr "Parameteren 'suffix' mangler."
 
 #: src/modules/YaPI/LdapServer.pm:1533
 msgid "Cannot restart the service."
-msgstr ""
+msgstr "Kan ikke starte tjenesten på nytt."
 
 #: src/modules/YaPI/LdapServer.pm:1540
 msgid "Cannot stop the service."
-msgstr ""
+msgstr "Kan ikke deaktivere tjenesten."
 
 #. error message
 #: src/modules/YaPI/LdapServer.pm:1703
 msgid "CA certificate file does not exist."
-msgstr ""
+msgstr "CA-sertifikatfilen finnes ikke."
 
 #. error message
 #: src/modules/YaPI/LdapServer.pm:1719
 msgid "CA certificate path does not exist."
-msgstr ""
+msgstr "Stien til CA-sertifikatet finnes ikke."
 
 #. error message
 #: src/modules/YaPI/LdapServer.pm:1735
 msgid "Certificate file does not exist."
-msgstr ""
+msgstr "Sertifikatfilen finnes ikke."
 
 #. error message
 #: src/modules/YaPI/LdapServer.pm:1770
 msgid "Invalid value for 'TLSVerifyClient'."
-msgstr ""
+msgstr "Ugyldig verdi for 'TLSVerifyClient'."
 
 #: src/modules/YaPI/LdapServer.pm:1779
 msgid "Writing failed."
-msgstr ""
+msgstr "Lagring mislyktes."
 
 #: src/modules/YaPI/LdapServer.pm:1944
 msgid "Missing 'ServerCertificateFile' parameter."
-msgstr ""
+msgstr "Parameteren 'ServerCertificateFile' mangler."
 
 #: src/modules/YaPI/LdapServer.pm:1950
 msgid "Cannot read certificate file."
-msgstr ""
+msgstr "Kan ikke lese sertifikatfil."
 
 #: src/modules/YaPI/LdapServer.pm:1955
 msgid "Missing 'ServerCertificateData' parameter."
-msgstr ""
+msgstr "Parameteren 'ServerCertificateData' mangler."
 
 #: src/modules/YaPI/LdapServer.pm:1962 src/modules/YaPI/LdapServer.pm:1987
 #: src/modules/YaPI/LdapServer.pm:2003 src/modules/YaPI/LdapServer.pm:2012
 msgid "Corrupt PEM data."
-msgstr ""
+msgstr "Uleselige PEM-data."
 
 #: src/modules/YaPI/LdapServer.pm:1969
 msgid "Missing 'ServerKeyFile' parameter."
-msgstr ""
+msgstr "Parameteren 'ServerKeyFile' mangler."
 
 #: src/modules/YaPI/LdapServer.pm:1975
 msgid "Cannot read key file."
-msgstr ""
+msgstr "Kan ikke lese nøkkelfil."
 
 #: src/modules/YaPI/LdapServer.pm:1980
 msgid "Missing 'ServerKeyData' parameter."
-msgstr ""
+msgstr "Parameteren 'ServerKeyData' mangler."
 
 #: src/modules/YaPI/LdapServer.pm:1998
 msgid "Cannot read CA certificate file."
-msgstr ""
+msgstr "Kan ikke lese CA-sertifikatfil."
 
 #: src/modules/YaPI/LdapServer.pm:2021
 msgid "Cannot write certificate file."
-msgstr ""
+msgstr "Kan ikke lagre sertifikatfil."
 
 #: src/modules/YaPI/LdapServer.pm:2027
 msgid "Cannot write key file."
-msgstr ""
+msgstr "Kan ikke lagre nøkkelfil."
 
 #: src/modules/YaPI/LdapServer.pm:2046
 msgid "Cannot write CA certificate file."
-msgstr ""
+msgstr "Kan ikke lagre CA-sertifikatfil."

Modified: trunk/yast/nb/po/autoinst.nb.po
===================================================================
--- trunk/yast/nb/po/autoinst.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/autoinst.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: autoinst\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:51+0200\n"
 "PO-Revision-Date: 2009-10-08 12:43+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -64,7 +64,7 @@
 #. Now check if there any classes defined in theis pre final control file
 #: src/clients/autoyast.rb:114 src/clients/ayast_setup.rb:148
 #: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:374
-#: src/clients/inst_autosetup_upgrade.rb:422
+#: src/clients/inst_autosetup_upgrade.rb:423
 #: src/modules/AutoInstallRules.rb:1001
 msgid ""
 "Error while parsing the control file.\n"
@@ -117,8 +117,7 @@
 msgid "enable/disable all package handling"
 msgstr "aktiver/deaktiver all pakkebehandling"
 
-#. doClone();
-#: src/clients/ayast_setup.rb:87 src/clients/clone_system.rb:84
+#: src/clients/ayast_setup.rb:87 src/clients/clone_system.rb:82
 msgid "Empty parameter list"
 msgstr "Tom parameterliste"
 
@@ -128,33 +127,28 @@
 msgid "Path to AutoYaST profile must be set."
 msgstr "Stien til AutoYast-profilen må angis."
 
-#. encoding: utf-8
-#. File:        clients/clone_system.ycp
-#. Package:     Auto-installation
-#. Author:      Uwe Gansert <ug@suse.de>
-#. Summary:     This client is clones some settings of the
-#. system.
-#.
-#. Changes:     * initial - just do a simple clone
-#. $Id$
-#: src/clients/clone_system.rb:42
+#. if we get no argument or map of options we are not in command line
+#: src/clients/clone_system.rb:47
 msgid "Client for creating an AutoYaST profile based on the currently running system"
 msgstr "Klient for å opprette AutoYAST-profil basert systemet som kjører"
 
-#: src/clients/clone_system.rb:52
+#: src/clients/clone_system.rb:57
 msgid "known modules: %1"
 msgstr "kjente moduler: %1"
 
-#: src/clients/clone_system.rb:59
+#: src/clients/clone_system.rb:64
 msgid "comma separated list of modules to clone"
 msgstr "liste over moduler (adskilt av komma) som skal klones"
 
-#: src/clients/clone_system.rb:91
+#: src/clients/clone_system.rb:89
 msgid "Cloning the system..."
 msgstr "Kloner systemet..."
 
-#: src/clients/clone_system.rb:92
-msgid "The resulting autoyast profile can be found in /root/autoinst.xml."
+#. TRANSLATORS: %s is path where profile can be found
+#: src/clients/clone_system.rb:91
+#, fuzzy
+#| msgid "The resulting autoyast profile can be found in /root/autoinst.xml."
+msgid "The resulting autoyast profile can be found in %s."
 msgstr "Den nye autoyast-profilen er lagret i /root/autoinst.xml."
 
 #. help 1/2
@@ -301,21 +295,21 @@
 msgid "Executing Post-Scripts"
 msgstr "Kjører postskript"
 
-#: src/clients/inst_autoconfigure.rb:269
+#: src/clients/inst_autoconfigure.rb:268
 msgid "Restarting all running services"
 msgstr "Starter alle kjørende tjenester på nytt"
 
-#: src/clients/inst_autoconfigure.rb:289
+#: src/clients/inst_autoconfigure.rb:288
 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:302
+#: src/clients/inst_autoconfigure.rb:301
 msgid "Finishing Configuration"
 msgstr "Fullfører konfigurasjon"
 
 #. NetworkInterfaces::Write( ".*" );
-#: src/clients/inst_autoconfigure.rb:405
+#: src/clients/inst_autoconfigure.rb:404
 msgid "Processing resource %1"
 msgstr "Behandler ressursen %1"
 
@@ -2389,12 +2383,12 @@
 #. @param [Hash{String => Object}] drive to create node name for
 #.
 #. @return the newly created node name
-#: src/modules/AutoinstDrive.rb:128
+#: src/modules/AutoinstDrive.rb:129
 msgid " - Drive"
 msgstr " - Disk"
 
 #. volume group
-#: src/modules/AutoinstDrive.rb:132
+#: src/modules/AutoinstDrive.rb:133
 msgid " - Volume group"
 msgstr " - Volumgruppe"
 
@@ -2493,11 +2487,11 @@
 #. @return  [String] configuration summary dialog
 #. return Summary of configuration
 #. @return  [String] configuration summary dialog
-#: src/modules/AutoinstPartPlan.rb:681 src/modules/AutoinstStorage.rb:908
+#: src/modules/AutoinstPartPlan.rb:681 src/modules/AutoinstStorage.rb:912
 msgid "Drives"
 msgstr "Disker"
 
-#: src/modules/AutoinstPartPlan.rb:685 src/modules/AutoinstStorage.rb:912
+#: src/modules/AutoinstPartPlan.rb:685 src/modules/AutoinstStorage.rb:916
 msgid "Total of %1 drive"
 msgstr "Totalt av disken %1"
 
@@ -2685,28 +2679,28 @@
 msgstr "Kjøringen av pakkeløseren mislyktes. Kontroller programvareseksjonen i autoyast-profilen."
 
 #. 1 cyl buffer per partition
-#: src/modules/AutoinstStorage.rb:491
+#: src/modules/AutoinstStorage.rb:494
 msgid "The partition plan configured in your XML profile does not fit on the hard disk. %1MB missing"
 msgstr "Partisjonstabellen i XML-profilen får ikke plass på harddisken. Det mangler %1MB."
 
-#: src/modules/AutoinstStorage.rb:918
+#: src/modules/AutoinstStorage.rb:922
 msgid "No specific device configured"
 msgstr "Ingen spesifisert enhet er konfigurert"
 
 #. Handle /etc/fstab usage
 #. @return [Boolean]
-#: src/modules/AutoinstStorage.rb:1013
+#: src/modules/AutoinstStorage.rb:1017
 msgid "Evaluating root partition. One moment please..."
 msgstr "Kontrollerer rotpartisjonen. Et øyeblikk..."
 
 #. a popup
-#: src/modules/AutoinstStorage.rb:1021
+#: src/modules/AutoinstStorage.rb:1025
 msgid "No Linux root partition found."
 msgstr "Ingen Linux-rotpartisjon ble funnet."
 
 #. We must only change RootPart::selectedRootPartition if booting
 #. is inevitable.
-#: src/modules/AutoinstStorage.rb:1034
+#: src/modules/AutoinstStorage.rb:1038
 msgid ""
 "Multiple root partitions found, but you did not configure\n"
 "which root partition should be used.  Automatic installation not possible.\n"
@@ -2715,7 +2709,7 @@
 "hvilken rotpartisjon som skal brukes. Autoinstallasjon er ikke mulig.\n"
 
 #. return list of available devices
-#: src/modules/AutoinstStorage.rb:1116
+#: src/modules/AutoinstStorage.rb:1121
 msgid "device '%1' not found by storage backend"
 msgstr "enheten '%1' ikke funnet av lagringssystem"
 

Modified: trunk/yast/nb/po/base.nb.po
===================================================================
--- trunk/yast/nb/po/base.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/base.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: base\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-08-07 13:28+0200\n"
 "PO-Revision-Date: 2009-08-07 23:21+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -1291,7 +1291,7 @@
 #. this media (CD) so no packages from this media will be installed
 #. PushButton label
 #: library/general/src/modules/Label.rb:250
-#: library/packages/src/modules/PackageCallbacks.rb:877
+#: library/packages/src/modules/PackageCallbacks.rb:887
 #: library/wizard/src/modules/Confirm.rb:127
 msgid "&Skip"
 msgstr "&Hopp over"
@@ -1314,7 +1314,7 @@
 #. TextEntry Label
 #. textentry label
 #: library/general/src/modules/Label.rb:319
-#: library/packages/src/modules/PackageCallbacks.rb:2552
+#: library/packages/src/modules/PackageCallbacks.rb:2562
 msgid "&Password"
 msgstr "&Passord"
 
@@ -1513,6 +1513,31 @@
 msgid "Failed to install required packages."
 msgstr "Nødvendige pakker kunne ikke installeres."
 
+#. TRANSLATORS: Popup message
+#: library/general/src/modules/Message.rb:265
+#, fuzzy
+#| msgid "Updating configuration..."
+msgid "Updating system configuration..."
+msgstr "Oppdaterer konfigurasjon..."
+
+#: library/general/src/modules/Message.rb:269
+#, fuzzy
+#| msgid "This may take a while"
+msgid "This may take a while."
+msgstr "Dette kan ta en stund"
+
+#. Get information about the OS release
+#. Throws exception Yast::OSReleaseFileMissingError if release file
+#. is missing.
+#.
+#. @param [String] directory containing the installed system (/ in installed system)
+#. @return [String] the release information
+#: library/general/src/modules/OSRelease.rb:63
+#, fuzzy
+#| msgid "Kerberos schema file not found"
+msgid "Release file %{file} not found"
+msgstr "Kerberos-skjemafil ikke funnet"
+
 #. Confirm user request to abort installation
 #: library/general/src/modules/Popup.rb:833
 msgid "Really abort the installation?"
@@ -2149,15 +2174,15 @@
 #. pppN must be tried before pN, modem before netcard
 #. Device type label
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:401
-#: library/network/src/modules/NetworkInterfaces.rb:1202
-#: library/network/src/modules/NetworkInterfaces.rb:1213
+#: library/network/src/modules/NetworkInterfaces.rb:405
+#: library/network/src/modules/NetworkInterfaces.rb:1206
+#: library/network/src/modules/NetworkInterfaces.rb:1217
 #: library/system/src/include/hwinfo/classnames.rb:108
 #: library/system/src/include/hwinfo/classnames.rb:198
 msgid "Modem"
 msgstr "Modem"
 
-#: library/network/src/modules/NetworkInterfaces.rb:406
+#: library/network/src/modules/NetworkInterfaces.rb:410
 msgid "Network Card"
 msgstr "Nettverkskort"
 
@@ -2165,27 +2190,27 @@
 #. Device type label
 #. Device type label
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:411
-#: library/network/src/modules/NetworkInterfaces.rb:1147
-#: library/network/src/modules/NetworkInterfaces.rb:1185
-#: library/network/src/modules/NetworkInterfaces.rb:1191
-#: library/network/src/modules/NetworkInterfaces.rb:1206
+#: library/network/src/modules/NetworkInterfaces.rb:415
+#: library/network/src/modules/NetworkInterfaces.rb:1151
+#: library/network/src/modules/NetworkInterfaces.rb:1189
+#: library/network/src/modules/NetworkInterfaces.rb:1195
+#: library/network/src/modules/NetworkInterfaces.rb:1210
 msgid "ISDN"
 msgstr "ISDN"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:416
-#: library/network/src/modules/NetworkInterfaces.rb:1154
+#: library/network/src/modules/NetworkInterfaces.rb:420
+#: library/network/src/modules/NetworkInterfaces.rb:1158
 msgid "DSL"
 msgstr "DSL"
 
-#: library/network/src/modules/NetworkInterfaces.rb:418
+#: library/network/src/modules/NetworkInterfaces.rb:422
 #: library/packages/src/modules/SignatureCheckDialogs.rb:485
 #: library/packages/src/modules/SignatureCheckDialogs.rb:486
 #: library/packages/src/modules/SignatureCheckDialogs.rb:746
 #: library/packages/src/modules/SignatureCheckDialogs.rb:747
 #: library/packages/src/modules/SignatureCheckDialogs.rb:976
-#: library/packages/src/modules/SignatureCheckDialogs.rb:977
+#: library/packages/src/modules/SignatureCheckDialogs.rb:978
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -2195,326 +2220,326 @@
 #. are represented as its sub-interfaces.
 #. And also we frequently confuse "device" and "interface"
 #. :-(
-#: library/network/src/modules/NetworkInterfaces.rb:1123
+#: library/network/src/modules/NetworkInterfaces.rb:1127
 msgid "Additional Address"
 msgstr "Tilleggsadresse"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1128
+#: library/network/src/modules/NetworkInterfaces.rb:1132
 msgid "ARCnet"
 msgstr "ARCnet"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1128
+#: library/network/src/modules/NetworkInterfaces.rb:1132
 msgid "ARCnet Network Card"
 msgstr "ARCnet-nettverkskort"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1131
+#: library/network/src/modules/NetworkInterfaces.rb:1135
 msgid "ATM"
 msgstr "ATM"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1132
+#: library/network/src/modules/NetworkInterfaces.rb:1136
 msgid "Asynchronous Transfer Mode (ATM)"
 msgstr "ATM (Asynchronous Transfer Mode)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1136
+#: library/network/src/modules/NetworkInterfaces.rb:1140
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1137
+#: library/network/src/modules/NetworkInterfaces.rb:1141
 msgid "Bluetooth Connection"
 msgstr "Bluetooth-tilkobling"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1140
+#: library/network/src/modules/NetworkInterfaces.rb:1144
 msgid "Bond"
 msgstr "Bond"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1140
+#: library/network/src/modules/NetworkInterfaces.rb:1144
 msgid "Bond Network"
 msgstr "Bond-nettverk"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1143
+#: library/network/src/modules/NetworkInterfaces.rb:1147
 msgid "CLAW"
 msgstr "CLAW"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1144
+#: library/network/src/modules/NetworkInterfaces.rb:1148
 msgid "Common Link Access for Workstation (CLAW)"
 msgstr "CLAW (Common Link Access for Workstation)"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1147
+#: library/network/src/modules/NetworkInterfaces.rb:1151
 msgid "ISDN Card"
 msgstr "ISDN-kort"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1150
+#: library/network/src/modules/NetworkInterfaces.rb:1154
 #: library/system/src/include/hwinfo/classnames.rb:223
 msgid "CTC"
 msgstr "CTC"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1151
+#: library/network/src/modules/NetworkInterfaces.rb:1155
 msgid "Channel to Channel Interface (CTC)"
 msgstr "CTC-grensesnitt (Channel to Channel)"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1154
+#: library/network/src/modules/NetworkInterfaces.rb:1158
 msgid "DSL Connection"
 msgstr "DSL-forbindelse"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1156
+#: library/network/src/modules/NetworkInterfaces.rb:1160
 msgid "Dummy"
 msgstr "Prøve"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1156
+#: library/network/src/modules/NetworkInterfaces.rb:1160
 msgid "Dummy Network Device"
 msgstr "Dummy-nettverksenhet"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1159
+#: library/network/src/modules/NetworkInterfaces.rb:1163
 #: library/system/src/include/hwinfo/classnames.rb:227
 msgid "ESCON"
 msgstr "ESCON"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1160
+#: library/network/src/modules/NetworkInterfaces.rb:1164
 msgid "Enterprise System Connector (ESCON)"
 msgstr "ESCON (Enterprise System Connector)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1164
+#: library/network/src/modules/NetworkInterfaces.rb:1168
 #: library/system/src/include/hwinfo/classnames.rb:220
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1165
+#: library/network/src/modules/NetworkInterfaces.rb:1169
 msgid "Ethernet Network Card"
 msgstr "Ethernet-nettverkskort"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1168
+#: library/network/src/modules/NetworkInterfaces.rb:1172
 #: library/system/src/include/hwinfo/classnames.rb:222
 msgid "FDDI"
 msgstr "FDDI"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1168
+#: library/network/src/modules/NetworkInterfaces.rb:1172
 msgid "FDDI Network Card"
 msgstr "FDDI-nettverkskort"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1171
+#: library/network/src/modules/NetworkInterfaces.rb:1175
 msgid "FICON"
 msgstr "FICON"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1172
+#: library/network/src/modules/NetworkInterfaces.rb:1176
 msgid "Fiberchannel System Connector (FICON)"
 msgstr "Fiberkanaltilkobling (FICON)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1176
+#: library/network/src/modules/NetworkInterfaces.rb:1180
 msgid "HIPPI"
 msgstr "HIPPI"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1177
+#: library/network/src/modules/NetworkInterfaces.rb:1181
 msgid "HIgh Performance Parallel Interface (HIPPI)"
 msgstr "HIPPI (HIgh Performance Parallel Interface)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1181
+#: library/network/src/modules/NetworkInterfaces.rb:1185
 msgid "Hipersockets"
 msgstr "Hipersockets"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1182
+#: library/network/src/modules/NetworkInterfaces.rb:1186
 msgid "Hipersockets Interface (HSI)"
 msgstr "HSI (Hipersockets Interface)"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1185
-#: library/network/src/modules/NetworkInterfaces.rb:1191
-#: library/network/src/modules/NetworkInterfaces.rb:1206
+#: library/network/src/modules/NetworkInterfaces.rb:1189
+#: library/network/src/modules/NetworkInterfaces.rb:1195
+#: library/network/src/modules/NetworkInterfaces.rb:1210
 msgid "ISDN Connection"
 msgstr "ISDN-forbindelse"
 
 #. Device type label
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1187
-#: library/network/src/modules/NetworkInterfaces.rb:1189
+#: library/network/src/modules/NetworkInterfaces.rb:1191
+#: library/network/src/modules/NetworkInterfaces.rb:1193
 msgid "IrDA"
 msgstr "IrDA"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1187
+#: library/network/src/modules/NetworkInterfaces.rb:1191
 msgid "Infrared Network Device"
 msgstr "Infrarød nettverksenhet"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1189
+#: library/network/src/modules/NetworkInterfaces.rb:1193
 msgid "Infrared Device"
 msgstr "Infrarød enhet"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1194
+#: library/network/src/modules/NetworkInterfaces.rb:1198
 #: library/system/src/include/hwinfo/classnames.rb:224
 msgid "IUCV"
 msgstr "IUCV"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1195
+#: library/network/src/modules/NetworkInterfaces.rb:1199
 msgid "Inter User Communication Vehicle (IUCV)"
 msgstr "IUCV (Inter User Communication Vehicle)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1198
+#: library/network/src/modules/NetworkInterfaces.rb:1202
 msgid "OSA LCS"
 msgstr "OSA LCS"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1198
+#: library/network/src/modules/NetworkInterfaces.rb:1202
 msgid "OSA LCS Network Card"
 msgstr "OSA LCS-nettverkskort"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1200
+#: library/network/src/modules/NetworkInterfaces.rb:1204
 #: library/system/src/include/hwinfo/classnames.rb:219
 msgid "Loopback"
 msgstr "Loopback"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1200
+#: library/network/src/modules/NetworkInterfaces.rb:1204
 msgid "Loopback Device"
 msgstr "Loopback-enhet"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1204
+#: library/network/src/modules/NetworkInterfaces.rb:1208
 #: library/system/src/include/hwinfo/classnames.rb:228
 msgid "Myrinet"
 msgstr "Myrinet"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1204
+#: library/network/src/modules/NetworkInterfaces.rb:1208
 msgid "Myrinet Network Card"
 msgstr "Myrinet-nettverkskort"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1209
+#: library/network/src/modules/NetworkInterfaces.rb:1213
 msgid "Parallel Line"
 msgstr "Parallell linje"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1210
+#: library/network/src/modules/NetworkInterfaces.rb:1214
 msgid "Parallel Line Connection"
 msgstr "Parallell linjetilkobling"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1216
+#: library/network/src/modules/NetworkInterfaces.rb:1220
 #: library/system/src/include/hwinfo/classnames.rb:226
 msgid "QETH"
 msgstr "QETH"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1217
+#: library/network/src/modules/NetworkInterfaces.rb:1221
 msgid "OSA-Express or QDIO Device (QETH)"
 msgstr "OSA-Express- eller QDIO-enhet (QETH)"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1221
+#: library/network/src/modules/NetworkInterfaces.rb:1225
 msgid "IPv6-in-IPv4"
 msgstr "IPv6-in-IPv4"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1222
+#: library/network/src/modules/NetworkInterfaces.rb:1226
 msgid "IPv6-in-IPv4 Encapsulation Device"
 msgstr "IPv6-in-IPv4-innkapslingsenhet"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1226
+#: library/network/src/modules/NetworkInterfaces.rb:1230
 msgid "Serial Line"
 msgstr "Seriell linje"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1227
+#: library/network/src/modules/NetworkInterfaces.rb:1231
 msgid "Serial Line Connection"
 msgstr "Seriell linjetilkopling"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1231
+#: library/network/src/modules/NetworkInterfaces.rb:1235
 msgid "Token Ring"
 msgstr "Tokenring"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1232
+#: library/network/src/modules/NetworkInterfaces.rb:1236
 msgid "Token Ring Network Card"
 msgstr "Tokenring-nettverkskort"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1235
+#: library/network/src/modules/NetworkInterfaces.rb:1239
 msgid "USB"
 msgstr "USB"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1235
+#: library/network/src/modules/NetworkInterfaces.rb:1239
 msgid "USB Network Device"
 msgstr "USB-nettverksenhet"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1237
+#: library/network/src/modules/NetworkInterfaces.rb:1241
 msgid "VMWare"
 msgstr "VMWare"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1237
+#: library/network/src/modules/NetworkInterfaces.rb:1241
 msgid "VMWare Network Device"
 msgstr "VMWare-nettsverksenhet"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1240
+#: library/network/src/modules/NetworkInterfaces.rb:1244
 msgid "Wireless"
 msgstr "Trådløst"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1241
+#: library/network/src/modules/NetworkInterfaces.rb:1245
 msgid "Wireless Network Card"
 msgstr "Trådløst nettverkskort"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1244
+#: library/network/src/modules/NetworkInterfaces.rb:1248
 msgid "XPNET"
 msgstr "XPNET"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1244
+#: library/network/src/modules/NetworkInterfaces.rb:1248
 msgid "XP Network"
 msgstr "XP-nettverk"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1246
+#: library/network/src/modules/NetworkInterfaces.rb:1250
 msgid "VLAN"
 msgstr "VLAN"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1246
+#: library/network/src/modules/NetworkInterfaces.rb:1250
 msgid "Virtual LAN"
 msgstr "Virtuelt LAN"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1248
+#: library/network/src/modules/NetworkInterfaces.rb:1252
 #: library/system/src/include/hwinfo/classnames.rb:89
 #: library/system/src/include/hwinfo/classnames.rb:101
 msgid "Bridge"
 msgstr "Bro"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1248
+#: library/network/src/modules/NetworkInterfaces.rb:1252
 msgid "Network Bridge"
 msgstr "Nettverksbro"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1250
+#: library/network/src/modules/NetworkInterfaces.rb:1254
 msgid "TUN"
 msgstr "TUN"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1250
+#: library/network/src/modules/NetworkInterfaces.rb:1254
 msgid "Network TUNnel"
 msgstr "Nettverkstunnel"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1252
+#: library/network/src/modules/NetworkInterfaces.rb:1256
 msgid "TAP"
 msgstr "TAP"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1252
+#: library/network/src/modules/NetworkInterfaces.rb:1256
 msgid "Network TAP"
 msgstr "Nettverks-TAP"
 
 #. Device type label
-#: library/network/src/modules/NetworkInterfaces.rb:1254
+#: library/network/src/modules/NetworkInterfaces.rb:1258
 #: library/system/src/include/hwinfo/classnames.rb:152
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: library/network/src/modules/NetworkInterfaces.rb:1254
+#: library/network/src/modules/NetworkInterfaces.rb:1258
 msgid "InfiniBand Device"
 msgstr "InfiniBand-enhet"
 
@@ -2577,7 +2602,7 @@
 msgstr "&Eksporterte kataloger"
 
 #. TRANSLATORS: pop-up question when reading the service configuration
-#: library/network/src/modules/NetworkService.rb:288
+#: library/network/src/modules/NetworkService.rb:281
 msgid ""
 "Your network interfaces are currently controlled by NetworkManager\n"
 "but the service to configure might not work well with it.\n"
@@ -2590,28 +2615,31 @@
 "Vil du fortsette likevel?"
 
 #. If there is network running, return true.
-#. Otherwise show error popup depending on Mode and return false
+#. Otherwise show error popup depending on Stage and return false
 #. @return true if network running
-#: library/network/src/modules/NetworkService.rb:354
-msgid "No running network detected."
-msgstr "Ingen aktive nettverk funnet."
-
-#: library/network/src/modules/NetworkService.rb:356
-msgid "Restart installation and configure network in Linuxrc"
+#: library/network/src/modules/NetworkService.rb:349
+#, fuzzy
+#| msgid "Restart installation and configure network in Linuxrc"
+msgid ""
+"No running network detected.\n"
+"Restart installation and configure network in Linuxrc\n"
+"or continue without network."
 msgstr "Start intstallasjonen på nytt og sett opp nettverket i Linuxrc"
 
-#: library/network/src/modules/NetworkService.rb:357
+#: library/network/src/modules/NetworkService.rb:355
+#, fuzzy
+#| msgid ""
+#| "Configure network with YaST or Network Manager plug-in\n"
+#| "and start this module again"
 msgid ""
+"No running network detected.\n"
 "Configure network with YaST or Network Manager plug-in\n"
-"and start this module again"
+"and start this module again\n"
+"or continue without network."
 msgstr ""
 "Sett opp nettverket med YaST eller programtillegget Network Manager,\n"
 "og start denne modulen på nytt"
 
-#: library/network/src/modules/NetworkService.rb:360
-msgid "or continue without network."
-msgstr "eller fortsett uten nettverk."
-
 #. TRANSLATORS: popup informing message, allowed characters for port-names
 #: library/network/src/modules/PortAliases.rb:136
 msgid ""
@@ -2926,51 +2954,51 @@
 msgstr "&Avinstaller"
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:203
-#: library/packages/src/modules/PackageCallbacks.rb:1715
+#: library/packages/src/modules/PackageCallbacks.rb:205
+#: library/packages/src/modules/PackageCallbacks.rb:1725
 msgid "Package: "
 msgstr "Pakke: "
 
-#: library/packages/src/modules/PackageCallbacks.rb:204
+#: library/packages/src/modules/PackageCallbacks.rb:206
 msgid "Size: "
 msgstr "Størrelse: "
 
-#: library/packages/src/modules/PackageCallbacks.rb:227
+#: library/packages/src/modules/PackageCallbacks.rb:229
 msgid "Remaining time to automatic retry: %1"
 msgstr "Nytt forsøk blir automatisk utført om: %1"
 
 #. at start of file providal
-#: library/packages/src/modules/PackageCallbacks.rb:240
-#: library/packages/src/modules/PackageCallbacks.rb:248
+#: library/packages/src/modules/PackageCallbacks.rb:242
+#: library/packages/src/modules/PackageCallbacks.rb:250
 msgid "Downloading package %1 (%2)..."
 msgstr "Laster ned pakken %1 (%2)..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:252
+#: library/packages/src/modules/PackageCallbacks.rb:254
 msgid "Downloading Package"
 msgstr "Laster ned pakken"
 
 #. check box
-#: library/packages/src/modules/PackageCallbacks.rb:310
+#: library/packages/src/modules/PackageCallbacks.rb:312
 msgid "Show &details"
 msgstr "Vis &detaljer"
 
 #. error message, %1 is a package name
-#: library/packages/src/modules/PackageCallbacks.rb:376
+#: library/packages/src/modules/PackageCallbacks.rb:378
 msgid "Package %1 is broken, integrity check has failed."
 msgstr "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:389
-#: library/packages/src/modules/PackageCallbacks.rb:598
+#: library/packages/src/modules/PackageCallbacks.rb:391
+#: library/packages/src/modules/PackageCallbacks.rb:608
 msgid "Retry installation of the package?"
 msgstr "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:397
-#: library/packages/src/modules/PackageCallbacks.rb:606
+#: library/packages/src/modules/PackageCallbacks.rb:399
+#: library/packages/src/modules/PackageCallbacks.rb:616
 msgid "Abort the installation?"
 msgstr "Vil du avbryte installasjonen?"
 
@@ -2979,15 +3007,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:425
-#: library/packages/src/modules/PackageCallbacks.rb:459
-#: library/packages/src/modules/PackageCallbacks.rb:2481
+#: library/packages/src/modules/PackageCallbacks.rb:427
+#: library/packages/src/modules/PackageCallbacks.rb:461
+#: library/packages/src/modules/PackageCallbacks.rb:2491
 msgid "Error: %1:"
 msgstr "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:482
+#: library/packages/src/modules/PackageCallbacks.rb:484
 msgid ""
 "Ignoring a download failure may result in a broken system.\n"
 "Verify the system later by running the Software Management module.\n"
@@ -2996,35 +3024,35 @@
 "Kontroller systemet senere med modulen Legg til og fjern programmer.\n"
 
 #. At start of package install.
-#: library/packages/src/modules/PackageCallbacks.rb:522
+#: library/packages/src/modules/PackageCallbacks.rb:524
 msgid "Uninstalling package %1 (%2)..."
 msgstr "Avinstallerer pakken %1 (%2)..."
 
-#: library/packages/src/modules/PackageCallbacks.rb:523
+#: library/packages/src/modules/PackageCallbacks.rb:525
 msgid "Installing package %1 (%2)..."
 msgstr "Installerer pakken %1 (%2)..."
 
-#: library/packages/src/modules/PackageCallbacks.rb:530
+#: library/packages/src/modules/PackageCallbacks.rb:532
 msgid "Uninstalling Package"
 msgstr "Avinstallerer pakke"
 
-#: library/packages/src/modules/PackageCallbacks.rb:530
+#: library/packages/src/modules/PackageCallbacks.rb:532
 msgid "Installing Package"
 msgstr "Installerer pakke"
 
 #. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:583
+#: library/packages/src/modules/PackageCallbacks.rb:593
 msgid "Removal of package %1 failed."
 msgstr "Pakken %1 kunne ikke fjernes."
 
 #. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:585
+#: library/packages/src/modules/PackageCallbacks.rb:595
 msgid "Installation of package %1 failed."
 msgstr "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:657
+#: library/packages/src/modules/PackageCallbacks.rb:667
 msgid ""
 "Ignoring a package failure may result in a broken system.\n"
 "The system should be later verified by running the Software Management module."
@@ -3033,7 +3061,7 @@
 "Systemet bør kontrolleres senere ved å kjøre modulen Legg til og fjern programmer."
 
 #. error report
-#: library/packages/src/modules/PackageCallbacks.rb:780
+#: library/packages/src/modules/PackageCallbacks.rb:790
 msgid ""
 "<p>The repository at the specified URL now provides a different media ID.\n"
 "If the URL is correct, this indicates that the repository content has changed. To \n"
@@ -3048,27 +3076,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:795
+#: library/packages/src/modules/PackageCallbacks.rb:805
 msgid "Side A"
 msgstr "Side A"
 
 #. media is double sided, we want the user to insert the 'Side B' of the media
-#: library/packages/src/modules/PackageCallbacks.rb:798
+#: library/packages/src/modules/PackageCallbacks.rb:808
 msgid "Side B"
 msgstr "Side B"
 
 #. label for a repository - %1 product name (e.g. openSUSE 10.2), %2 medium number (e.g. 2)
-#: library/packages/src/modules/PackageCallbacks.rb:812
+#: library/packages/src/modules/PackageCallbacks.rb:822
 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:814
+#: library/packages/src/modules/PackageCallbacks.rb:824
 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:819
+#: library/packages/src/modules/PackageCallbacks.rb:829
 msgid ""
 "Insert\n"
 "'%1'"
@@ -3077,7 +3105,7 @@
 "'%1'"
 
 #. report error while accessing local directory with product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:824
+#: library/packages/src/modules/PackageCallbacks.rb:834
 msgid ""
 "Cannot access installation media\n"
 "%1\n"
@@ -3090,7 +3118,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:836
+#: library/packages/src/modules/PackageCallbacks.rb:846
 msgid ""
 "Cannot access installation media \n"
 "%1\n"
@@ -3103,89 +3131,89 @@
 "Kontroller at serveren er tilgjengelig."
 
 #. currently unused
-#: library/packages/src/modules/PackageCallbacks.rb:848
+#: library/packages/src/modules/PackageCallbacks.rb:858
 msgid "The correct repository medium could not be mounted."
 msgstr "Korrekt pakkebrønnmedium kunne ikke monteres."
 
 #. wrong media id, offer "Ignore"
 #. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:869
-#: library/packages/src/modules/PackageCallbacks.rb:2158
+#: library/packages/src/modules/PackageCallbacks.rb:879
+#: library/packages/src/modules/PackageCallbacks.rb:2168
 msgid "Skip Autorefresh"
 msgstr "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:892
-#: library/packages/src/modules/PackageCallbacks.rb:897
+#: library/packages/src/modules/PackageCallbacks.rb:902
+#: library/packages/src/modules/PackageCallbacks.rb:907
 msgid "&Eject"
 msgstr "&Løs ut"
 
-#: library/packages/src/modules/PackageCallbacks.rb:909
+#: library/packages/src/modules/PackageCallbacks.rb:919
 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:977
+#: library/packages/src/modules/PackageCallbacks.rb:987
 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:985
+#: library/packages/src/modules/PackageCallbacks.rb:995
 msgid "Skip the medium?"
 msgstr "Vil du hoppe over mediet?"
 
 #. otherwise ignore the medium
-#: library/packages/src/modules/PackageCallbacks.rb:992
+#: library/packages/src/modules/PackageCallbacks.rb:1002
 msgid "Ignoring the bad medium..."
 msgstr "Ignorerer ugyldig medium..."
 
 #. TextEntry label
 #. TextEntry label
-#: library/packages/src/modules/PackageCallbacks.rb:1013
-#: library/packages/src/modules/PackageCallbacks.rb:1074
+#: library/packages/src/modules/PackageCallbacks.rb:1023
+#: library/packages/src/modules/PackageCallbacks.rb:1084
 msgid "&URL"
 msgstr "&Nettadresse"
 
 #. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1321
+#: library/packages/src/modules/PackageCallbacks.rb:1331
 msgid "Creating Repository %1"
 msgstr "Oppretter pakkebrønnen %1"
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1354
+#: library/packages/src/modules/PackageCallbacks.rb:1364
 msgid "An error occurred while creating the repository."
 msgstr "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:1358
-#: library/packages/src/modules/PackageCallbacks.rb:1489
-#: library/packages/src/modules/PackageCallbacks.rb:1601
+#: library/packages/src/modules/PackageCallbacks.rb:1368
+#: library/packages/src/modules/PackageCallbacks.rb:1499
+#: library/packages/src/modules/PackageCallbacks.rb:1611
 msgid "Unable to retrieve the remote repository description."
 msgstr "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:1361
-#: library/packages/src/modules/PackageCallbacks.rb:1492
-#: library/packages/src/modules/PackageCallbacks.rb:1604
+#: library/packages/src/modules/PackageCallbacks.rb:1371
+#: library/packages/src/modules/PackageCallbacks.rb:1502
+#: library/packages/src/modules/PackageCallbacks.rb:1614
 msgid "An error occurred while retrieving the new metadata."
 msgstr "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:1364
-#: library/packages/src/modules/PackageCallbacks.rb:1495
-#: library/packages/src/modules/PackageCallbacks.rb:1607
+#: library/packages/src/modules/PackageCallbacks.rb:1374
+#: library/packages/src/modules/PackageCallbacks.rb:1505
+#: library/packages/src/modules/PackageCallbacks.rb:1617
 msgid "The repository is not valid."
 msgstr "Pakkebrønnen er ikke gyldig."
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1367
+#: library/packages/src/modules/PackageCallbacks.rb:1377
 msgid "The repository metadata is invalid."
 msgstr "Pakkebrønnen har ugyldige metadata."
 
@@ -3193,96 +3221,96 @@
 #. command line mode - ask user whether the repository refreshment should be retried
 #. command line mode - ask user whether the repository refreshment should be retried
 #. command line mode - ask user whether target initializatin can be restarted
-#: library/packages/src/modules/PackageCallbacks.rb:1380
-#: library/packages/src/modules/PackageCallbacks.rb:1514
-#: library/packages/src/modules/PackageCallbacks.rb:1620
-#: library/packages/src/modules/PackageCallbacks.rb:2435
+#: library/packages/src/modules/PackageCallbacks.rb:1390
+#: library/packages/src/modules/PackageCallbacks.rb:1524
+#: library/packages/src/modules/PackageCallbacks.rb:1630
+#: library/packages/src/modules/PackageCallbacks.rb:2445
 msgid "Retry?"
 msgstr "Vil du prøve på nytt?"
 
 #. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1428
-#: library/packages/src/modules/PackageCallbacks.rb:1436
+#: library/packages/src/modules/PackageCallbacks.rb:1438
+#: library/packages/src/modules/PackageCallbacks.rb:1446
 msgid "Probing Repository %1"
 msgstr "Undersøker pakkebrønnen %1"
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1485
+#: library/packages/src/modules/PackageCallbacks.rb:1495
 msgid "Error occurred while probing the repository."
 msgstr "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:1498
+#: library/packages/src/modules/PackageCallbacks.rb:1508
 msgid "Repository probing details."
 msgstr "Granskningsdetaljer."
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1501
+#: library/packages/src/modules/PackageCallbacks.rb:1511
 msgid "Repository metadata is invalid."
 msgstr "Pakkebrønn har ugyldige metadata."
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1597
+#: library/packages/src/modules/PackageCallbacks.rb:1607
 msgid "Repository %1"
 msgstr "Pakkebrønn %1"
 
 #. at start of delta providal
-#: library/packages/src/modules/PackageCallbacks.rb:1685
+#: library/packages/src/modules/PackageCallbacks.rb:1695
 msgid "Downloading delta RPM package %1 (%2)..."
 msgstr "Laster ned delta-RPM-pakken %1 (%2)..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1693
+#: library/packages/src/modules/PackageCallbacks.rb:1703
 msgid "Downloading Delta RPM package"
 msgstr "Laster ned delta-RPM-pakke"
 
 #. at start of delta application
-#: library/packages/src/modules/PackageCallbacks.rb:1706
+#: library/packages/src/modules/PackageCallbacks.rb:1716
 msgid "Applying delta RPM package %1..."
 msgstr "Bruker delta-RPM-pakken %1..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1713
+#: library/packages/src/modules/PackageCallbacks.rb:1723
 msgid "Applying delta RPM package"
 msgstr "Bruker delta-RPM-pakke"
 
 #. at start of patch providal
-#: library/packages/src/modules/PackageCallbacks.rb:1734
+#: library/packages/src/modules/PackageCallbacks.rb:1744
 msgid "Downloading patch RPM package %1 (%2)..."
 msgstr "Laster ned pakkeoppdaterings-RPM %1 (%2)..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1742
+#: library/packages/src/modules/PackageCallbacks.rb:1752
 msgid "Downloading Patch RPM Package"
 msgstr "Laster ned pakkeoppdaterings-RPM"
 
 #. close popup
-#: library/packages/src/modules/PackageCallbacks.rb:1812
+#: library/packages/src/modules/PackageCallbacks.rb:1822
 msgid "Starting script %1 (patch %2)..."
 msgstr "Starter skript %1 (pakkeoppdatering %2)..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1821
+#: library/packages/src/modules/PackageCallbacks.rb:1831
 msgid "Running Script"
 msgstr "Kjører skript"
 
 #. label, patch name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1826
+#: library/packages/src/modules/PackageCallbacks.rb:1836
 msgid "Patch: "
 msgstr "Pakkeoppdatering: "
 
 #. label, script name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1833
+#: library/packages/src/modules/PackageCallbacks.rb:1843
 msgid "Script: "
 msgstr "Skript: "
 
 #. label
-#: library/packages/src/modules/PackageCallbacks.rb:1839
+#: library/packages/src/modules/PackageCallbacks.rb:1849
 msgid "Output of the Script"
 msgstr "Resultat av skriptet"
 
 #. label, %1 is patch name with version and architecture
-#: library/packages/src/modules/PackageCallbacks.rb:1927
+#: library/packages/src/modules/PackageCallbacks.rb:1937
 msgid ""
 "Patch: %1\n"
 "\n"
@@ -3291,7 +3319,7 @@
 "\n"
 
 #. a popup question with "Continue", "Skip" and "Abort" buttons
-#: library/packages/src/modules/PackageCallbacks.rb:1944
+#: library/packages/src/modules/PackageCallbacks.rb:1954
 msgid ""
 "The repositories are being refreshed.\n"
 "Continue with refreshing?\n"
@@ -3306,44 +3334,44 @@
 "mangle eller være foreldet."
 
 #. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:1959
+#: library/packages/src/modules/PackageCallbacks.rb:1969
 msgid "&Skip Refresh"
 msgstr "&Hopp over oppdatering"
 
 #. heading of popup
 #. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1993
-#: library/packages/src/modules/PackageCallbacks.rb:2035
+#: library/packages/src/modules/PackageCallbacks.rb:2003
+#: library/packages/src/modules/PackageCallbacks.rb:2045
 msgid "Downloading"
 msgstr "Laster ned"
 
 #. message in a progress popup
 #. progress bar label, %1 is URL with optional download rate
-#: library/packages/src/modules/PackageCallbacks.rb:2043
-#: library/packages/src/modules/PackageCallbacks.rb:2091
+#: library/packages/src/modules/PackageCallbacks.rb:2053
+#: library/packages/src/modules/PackageCallbacks.rb:2101
 msgid "Downloading: %1"
 msgstr "Laster ned: %1"
 
 #. heading of popup
 #. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:2196
-#: library/packages/src/modules/PackageCallbacks.rb:2271
+#: library/packages/src/modules/PackageCallbacks.rb:2206
+#: library/packages/src/modules/PackageCallbacks.rb:2281
 msgid "Checking Package Database"
 msgstr "Søker i pakkedatabase"
 
 #. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:2199
+#: library/packages/src/modules/PackageCallbacks.rb:2209
 msgid "Rebuilding package database. This process can take some time."
 msgstr "Gjenoppretter pakkedatabasen. Denne prosessen kan ta en stund."
 
 #. progress bar label
-#: library/packages/src/modules/PackageCallbacks.rb:2204
-#: library/packages/src/modules/PackageCallbacks.rb:2287
+#: library/packages/src/modules/PackageCallbacks.rb:2214
+#: library/packages/src/modules/PackageCallbacks.rb:2297
 msgid "Status"
 msgstr "Status"
 
 #. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:2237
+#: library/packages/src/modules/PackageCallbacks.rb:2247
 msgid ""
 "Rebuilding of package database failed:\n"
 "%1"
@@ -3352,12 +3380,12 @@
 "%1"
 
 #. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:2274
+#: library/packages/src/modules/PackageCallbacks.rb:2284
 msgid "Converting package database. This process can take some time."
 msgstr "Konverterer pakkedatabase. Denne prosessen ta en stund."
 
 #. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:2313
+#: library/packages/src/modules/PackageCallbacks.rb:2323
 msgid ""
 "Conversion of package database failed:\n"
 "%1"
@@ -3366,12 +3394,12 @@
 "%1"
 
 #. progress message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2353
+#: library/packages/src/modules/PackageCallbacks.rb:2363
 msgid "Reading RPM database..."
 msgstr "Leser RPM-database..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:2363
+#: library/packages/src/modules/PackageCallbacks.rb:2373
 msgid "Reading Installed Packages"
 msgstr "Finner installerte pakker"
 
@@ -3382,27 +3410,27 @@
 #. `Label(""),
 #. `PushButton(`id(`abort), Label::AbortButton())
 #. )
-#: library/packages/src/modules/PackageCallbacks.rb:2369
-#: library/packages/src/modules/PackageCallbacks.rb:2385
+#: library/packages/src/modules/PackageCallbacks.rb:2379
+#: library/packages/src/modules/PackageCallbacks.rb:2395
 msgid "Scanning RPM database..."
 msgstr "Skanner RPM-database..."
 
 #. error message, could not read RPM database
-#: library/packages/src/modules/PackageCallbacks.rb:2424
+#: library/packages/src/modules/PackageCallbacks.rb:2434
 msgid "Initialization of the target failed."
 msgstr "Feil ved initialisering mål."
 
 #. status message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2515
+#: library/packages/src/modules/PackageCallbacks.rb:2525
 msgid "RPM database read"
 msgstr "RPM-database lest"
 
 #. heading in a popup window
-#: library/packages/src/modules/PackageCallbacks.rb:2534
+#: library/packages/src/modules/PackageCallbacks.rb:2544
 msgid "User Authentication"
 msgstr "Brukerautentisering"
 
-#: library/packages/src/modules/PackageCallbacks.rb:2540
+#: library/packages/src/modules/PackageCallbacks.rb:2550
 msgid ""
 "URL: %1\n"
 "\n"
@@ -3413,7 +3441,7 @@
 "%2"
 
 #. textentry label
-#: library/packages/src/modules/PackageCallbacks.rb:2549
+#: library/packages/src/modules/PackageCallbacks.rb:2559
 msgid "&User Name"
 msgstr "&Brukernavn"
 
@@ -3481,39 +3509,8 @@
 msgid "Do you accept this license agreement?"
 msgstr "Godkjenner du denne lisensavtalen?"
 
-#. display an error message and advice to manually fix the system
-#: library/packages/src/modules/PackageSystem.rb:236
-msgid ""
-"The current system is not consistent,\n"
-"some packages have unresolved dependencies."
-msgstr ""
-"Dette systemet er ikke konsistent.\n"
-"Noen pakker har uløste avhengigheter."
-
-#: library/packages/src/modules/PackageSystem.rb:243
-msgid "Automatic resolving failed, manual dependency resolving is needed."
-msgstr "Automatisk konfliktløsning mislyktes. Du må løse konfliktene manuelt."
-
-#: library/packages/src/modules/PackageSystem.rb:252
-msgid ""
-"Yast has automatically added or removed some packages,\n"
-"check the changes scheduled to fix the system\n"
-"in the software manager."
-msgstr ""
-"Yast har automatisk lagt til eller fjernet noen pakker.\n"
-"Kontroller endringene som er planlagt for å reparere systemet\n"
-"i pakkebehandleren."
-
-#: library/packages/src/modules/PackageSystem.rb:263
-msgid ""
-"Start the software manager and fix the problems\n"
-"or skip fixing and install the already confirmed packages only?"
-msgstr ""
-"Vil du starte pakkebehandleren og løse problemene, \n"
-"eller hoppe over problemløsing og kun installere pakkene som allerede er bekreftet?"
-
 #. error message, after pressing [OK] the package manager is displayed
-#: library/packages/src/modules/PackageSystem.rb:325
+#: library/packages/src/modules/PackageSystem.rb:223
 msgid ""
 "There are unresolved dependencies which need\n"
 "to be solved manually in the software manager."
@@ -3522,12 +3519,12 @@
 "løses manuelt i pakkebehandleren."
 
 #. error report
-#: library/packages/src/modules/PackageSystem.rb:520
+#: library/packages/src/modules/PackageSystem.rb:415
 msgid "Installing required packages failed."
 msgstr "Installasjon av nødvendige pakker mislyktes."
 
 #. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:524
+#: library/packages/src/modules/PackageSystem.rb:419
 msgid ""
 "Installing required packages failed. If you continue\n"
 "without installing required packages,\n"
@@ -3538,12 +3535,12 @@
 "kan det hende at YaST ikke fungerer riktig.\n"
 
 #. error report
-#: library/packages/src/modules/PackageSystem.rb:535
+#: library/packages/src/modules/PackageSystem.rb:430
 msgid "Cannot continue without installing required packages."
 msgstr "Kan ikke fortsette konfigurasjonen uten at alle nødvendige pakker er installert."
 
 #. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:540
+#: library/packages/src/modules/PackageSystem.rb:435
 msgid ""
 "If you continue without installing required \n"
 "packages, YaST may not work properly.\n"
@@ -3690,7 +3687,7 @@
 
 #. Table headings for CD statistics during installation
 #: library/packages/src/modules/PackagesUI.rb:552
-#: library/packages/src/modules/SlideShow.rb:548
+#: library/packages/src/modules/SlideShow.rb:545
 msgid "Packages"
 msgstr "Pakker"
 
@@ -4113,7 +4110,7 @@
 "(%2):"
 
 #. popup message - label, part 2
-#: library/packages/src/modules/SignatureCheckDialogs.rb:981
+#: library/packages/src/modules/SignatureCheckDialogs.rb:982
 msgid ""
 "You can choose to import it into your keyring of trusted\n"
 "public keys, meaning that you trust the owner of the key.\n"
@@ -4126,23 +4123,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:993
+#: library/packages/src/modules/SignatureCheckDialogs.rb:994
 msgid "WARNING: The key has expired!"
 msgstr "ADVARSEL: Nøkkelen er utløpt!"
 
 #. popup heading
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1019
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1020
 msgid "Import Untrusted GnuPG Key"
 msgstr "Importer ukjent GnuPG-nøkkel"
 
 #. push button
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1035
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1036
 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:1112
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1113
 msgid ""
 "The expected checksum of file %1\n"
 "is %2,\n"
@@ -4165,12 +4162,12 @@
 "Vil du bruke den likevel?\n"
 
 #. dialog heading - displayed in a big bold font
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1129
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1130
 msgid "Wrong Digest"
 msgstr "Feil sammendrag"
 
 #. popup question, %1 stands for the filename, %2 is expected digest, %3 is the current digest
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1148
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1149
 msgid ""
 "The checksum of file %1\n"
 "is %2,\n"
@@ -4191,85 +4188,93 @@
 "Vil du bruke den likevel?\n"
 
 #. dialog heading - displayed in a big bold font
-#: library/packages/src/modules/SignatureCheckDialogs.rb:1162
+#: library/packages/src/modules/SignatureCheckDialogs.rb:1163
 msgid "Unknown Digest"
 msgstr "Ukjent sammendrag"
 
 #. we need to remember the values for tab switching
+#. these are the initial values
 #. Return the description for the current stage.
 #. @return [String]	localized string description
 #. translators: default global progress bar label
-#: library/packages/src/modules/SlideShow.rb:145
-#: library/packages/src/modules/SlideShow.rb:146
-#: library/packages/src/modules/SlideShow.rb:319
-#: library/packages/src/modules/SlideShow.rb:340
+#: library/packages/src/modules/SlideShow.rb:151
+#: library/packages/src/modules/SlideShow.rb:152
+#: library/packages/src/modules/SlideShow.rb:326
+#: library/packages/src/modules/SlideShow.rb:347
 msgid "Installing..."
 msgstr "Installerer..."
 
 #. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:544
+#: library/packages/src/modules/SlideShow.rb:541
 msgid "Media"
 msgstr "Medium"
 
 #. Table headings for CD statistics during installation - keep as short as possible!
-#: library/packages/src/modules/SlideShow.rb:546
+#: library/packages/src/modules/SlideShow.rb:543
 #, fuzzy
 #| msgid "Remaining Packages"
 msgid "Remaining"
 msgstr "Beholdte pakker"
 
 #. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:550
+#: library/packages/src/modules/SlideShow.rb:547
 msgid "Time"
 msgstr "Tid"
 
 #. Construct widgets for the "details" page
 #.
 #. @return	A term describing the widgets
-#: library/packages/src/modules/SlideShow.rb:566
+#: library/packages/src/modules/SlideShow.rb:563
 msgid "Actions performed:"
 msgstr "Utførte handlinger:"
 
 #. Help text while software packages are being installed (displayed only in rare cases)
-#: library/packages/src/modules/SlideShow.rb:650
+#: library/packages/src/modules/SlideShow.rb:647
 msgid "<p>Packages are being installed.</p>"
 msgstr "<p>Pakkene installeres.</p>"
 
-#: library/packages/src/modules/SlideShow.rb:651
+#: library/packages/src/modules/SlideShow.rb:648
 msgid "<P><B>Aborting Installation</B> Package installation can be aborted using the <B>Abort</B> button. However, the system then can be in an inconsistent or unusable state or it may not boot if the basic system component is not installed.</P>"
 msgstr "<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:669
+#: library/packages/src/modules/SlideShow.rb:666
 #, fuzzy
 #| msgid "Release &Notes"
 msgid "%s Release Notes"
 msgstr "Versjonsmerk&nader"
 
 #. tab
-#: library/packages/src/modules/SlideShow.rb:681
+#: library/packages/src/modules/SlideShow.rb:678
 msgid "Slide Sho&w"
 msgstr "Lysbildepresentasjo&n"
 
 #. tab
-#: library/packages/src/modules/SlideShow.rb:683
+#: library/packages/src/modules/SlideShow.rb:680
 msgid "&Details"
 msgstr "&Detaljert"
 
-#. Dialog heading while software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:721
+#. Dialog heading - software packages are being upgraded
+#: library/packages/src/modules/SlideShow.rb:719
 #, fuzzy
+#| msgid "Perform Update"
+msgid "Performing Upgrade"
+msgstr "Utfør oppgradering"
+
+#. Dialog heading - software packages are being installed
+#: library/packages/src/modules/SlideShow.rb:722
+#, 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:757
+#: library/packages/src/modules/SlideShow.rb:759
 msgid "Package Installation"
 msgstr "Pakkeinstallasjon"
 
 #. popup yes-no
-#: library/packages/src/modules/SlideShow.rb:833
+#: library/packages/src/modules/SlideShow.rb:835
 msgid ""
 "Do you really want\n"
 "to quit the installation?"
@@ -4278,17 +4283,17 @@
 "avslutte installasjonen?"
 
 #. Mode::update (), Stage::cont ()
-#: library/packages/src/modules/SlideShow.rb:845
+#: library/packages/src/modules/SlideShow.rb:847
 msgid "Aborted"
 msgstr "Avbrutt"
 
 #. read file content
-#: library/system/src/clients/view_anymsg.rb:185
+#: library/system/src/clients/view_anymsg.rb:187
 msgid "File not found."
-msgstr ""
+msgstr "Fil ikke funnet."
 
 #. Fill the LogView with file content
-#: library/system/src/clients/view_anymsg.rb:191
+#: library/system/src/clients/view_anymsg.rb:199
 msgid "System Log (%1)"
 msgstr "Systemlogg (%1)"
 
@@ -4900,7 +4905,7 @@
 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:648
+#: library/system/src/modules/Kernel.rb:659
 msgid ""
 "Reboot your system\n"
 "to activate the new kernel.\n"
@@ -5001,7 +5006,7 @@
 #. KiloByte abbreviated
 #: library/types/src/modules/String.rb:146
 msgid "KiB"
-msgstr ""
+msgstr "KiB"
 
 #. MegaByte abbreviated
 #: library/types/src/modules/String.rb:148
@@ -5902,6 +5907,38 @@
 "Det er ikke noen baklengs sone for %1 som administreres av DNS-serveren.\n"
 "Vertsnavnet %2 kan ikke legges til."
 
+#~ msgid "No running network detected."
+#~ msgstr "Ingen aktive nettverk funnet."
+
+#~ msgid "or continue without network."
+#~ msgstr "eller fortsett uten nettverk."
+
+#~ msgid ""
+#~ "The current system is not consistent,\n"
+#~ "some packages have unresolved dependencies."
+#~ msgstr ""
+#~ "Dette systemet er ikke konsistent.\n"
+#~ "Noen pakker har uløste avhengigheter."
+
+#~ msgid "Automatic resolving failed, manual dependency resolving is needed."
+#~ msgstr "Automatisk konfliktløsning mislyktes. Du må løse konfliktene manuelt."
+
+#~ msgid ""
+#~ "Yast has automatically added or removed some packages,\n"
+#~ "check the changes scheduled to fix the system\n"
+#~ "in the software manager."
+#~ msgstr ""
+#~ "Yast har automatisk lagt til eller fjernet noen pakker.\n"
+#~ "Kontroller endringene som er planlagt for å reparere systemet\n"
+#~ "i pakkebehandleren."
+
+#~ msgid ""
+#~ "Start the software manager and fix the problems\n"
+#~ "or skip fixing and install the already confirmed packages only?"
+#~ msgstr ""
+#~ "Vil du starte pakkebehandleren og løse problemene, \n"
+#~ "eller hoppe over problemløsing og kun installere pakkene som allerede er bekreftet?"
+
 #~ msgid "Installed Size"
 #~ msgstr "Installert størrelse"
 

Modified: trunk/yast/nb/po/bootloader.nb.po
===================================================================
--- trunk/yast/nb/po/bootloader.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/bootloader.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: bootloader\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-30 10:10+0200\n"
 "PO-Revision-Date: 2009-09-25 13:51+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -142,22 +142,22 @@
 msgstr "Maskinen vil bli startet på nytt nå..."
 
 #. warning text in the summary richtext
-#: src/clients/bootloader_proposal.rb:108
+#: src/clients/bootloader_proposal.rb:116
 msgid "No boot loader is selected for installation. Your system might not be bootable."
 msgstr "Ingen oppstartslaster er valgt for installasjon. Systemet vil kanskje ikke kunne startes opp."
 
 #. error in the proposal
-#: src/clients/bootloader_proposal.rb:118
+#: src/clients/bootloader_proposal.rb:126
 msgid "Because of the partitioning, the bootloader cannot be installed properly"
 msgstr "Oppstartslasteren kan ikke installeres riktig med denne partisjoneringen"
 
 #. proposal part - bootloader label
-#: src/clients/bootloader_proposal.rb:217
+#: src/clients/bootloader_proposal.rb:225
 msgid "Booting"
 msgstr "Oppstart"
 
 #. menubutton entry
-#: src/clients/bootloader_proposal.rb:219
+#: src/clients/bootloader_proposal.rb:227
 msgid "&Booting"
 msgstr "&Oppstart"
 
@@ -166,12 +166,12 @@
 #. Run dialog to adjust installation on i386 and AMD64
 #. @return [Symbol] for wizard sequencer
 #: src/include/bootloader/grub/dialogs.rb:41
-#: src/include/bootloader/grub2/dialogs.rb:212
+#: src/include/bootloader/grub2/dialogs.rb:221
 msgid "Disk Order"
 msgstr "Diskrekkefølge"
 
 #: src/include/bootloader/grub/dialogs.rb:50
-#: src/include/bootloader/grub2/dialogs.rb:221
+#: src/include/bootloader/grub2/dialogs.rb:230
 msgid "Disk order settings"
 msgstr "Innstillinger fir diskrekkefølge"
 
@@ -182,10 +182,9 @@
 msgstr "Oppstartsmeny"
 
 #. `VSpacing(1),
-#. Run dialog for loader installation details for Grub2
-#. @return [Symbol] for wizard sequencer
+#. Window title
 #: src/include/bootloader/grub/dialogs.rb:106
-#: src/include/bootloader/grub2/dialogs.rb:134
+#: src/include/bootloader/grub2/dialogs.rb:143
 msgid "Boot Loader Options"
 msgstr "Alternativer for oppstartslaster"
 
@@ -302,11 +301,17 @@
 " 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/include/bootloader/grub/helps.rb:60
+#: src/include/bootloader/grub/helps.rb:59
+msgid ""
+"<p><b>Boot from Extended Partition</b> should be selected if your root partition is on \n"
+"logical partition and the /boot partition is missing</p>"
+msgstr ""
+
+#: src/include/bootloader/grub/helps.rb:62
 msgid "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"
 msgstr "<p>Med <b>Egendefinert oppstartspartisjon</b> kan du velge hvilken partisjon du vil starte fra.</p>"
 
-#: src/include/bootloader/grub/helps.rb:63
+#: src/include/bootloader/grub/helps.rb:65
 msgid ""
 "<p>MD array is build from 2 disks. <b>Enable Redundancy for MD Array</b>\n"
 "enable to write GRUB to MBR of both disks.</p>"
@@ -314,7 +319,7 @@
 "<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>"
 
-#: src/include/bootloader/grub/helps.rb:66
+#: src/include/bootloader/grub/helps.rb:68
 msgid ""
 "<p><b>Use Serial Console</b> lets you define the parameters to use\n"
 "for a serial console. Please see the grub documentation (<code>info grub</code>) for details.</p>"
@@ -322,7 +327,7 @@
 "<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>"
 
-#: src/include/bootloader/grub/helps.rb:69
+#: src/include/bootloader/grub/helps.rb:71
 msgid ""
 "<p><b>Terminal Definition</b></p><br>\n"
 "Defines the type of terminal you want to use. For a serial terminal (eg. a serial console),\n"
@@ -336,7 +341,7 @@
 " 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>"
 
-#: src/include/bootloader/grub/helps.rb:76
+#: src/include/bootloader/grub/helps.rb:78
 msgid ""
 "<p><b>Fallback Sections if default Fails</b> contains a list of section numbers\n"
 "that will be used for booting in case the default section is unbootable.</p>"
@@ -344,19 +349,19 @@
 "<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:79
+#: src/include/bootloader/grub/helps.rb:81
 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:82
+#: src/include/bootloader/grub/helps.rb:84
 msgid "<p><b>Graphical Menu File</b> defines the file to use for the graphical boot menu.</p>"
 msgstr "<p><b>Fil for grafisk meny</b> definerere filen som skal brukes til den grafiske oppstartsmenyen.</p>"
 
-#: src/include/bootloader/grub/helps.rb:85
+#: src/include/bootloader/grub/helps.rb:87
 msgid "<p><b>Enable Acoustic Signals</b> turn on/off acoustic signals.</p>"
 msgstr "<p><b>Aktiver lydsignaler</b> slå på/av lydsignaler.</p>"
 
-#: src/include/bootloader/grub/helps.rb:88
+#: src/include/bootloader/grub/helps.rb:90
 msgid ""
 "<p><b>Protect Boot Loader with Password</b><br>\n"
 "Define the password that will be required to access the boot menu. YaST will only accept the password if you repeat\n"
@@ -367,7 +372,7 @@
 " <b>Gjenta passordet</b>.</p>"
 
 #. help text 1/5
-#: src/include/bootloader/grub/helps.rb:95
+#: src/include/bootloader/grub/helps.rb:97
 msgid ""
 "<p><big><b>Disks Order</b></big><br>\n"
 "To specify the order of the disks according to the order in BIOS, use\n"
@@ -381,72 +386,72 @@
 "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:106
+#: src/include/bootloader/grub/helps.rb:108
 msgid "Boot Loader Locations"
 msgstr "Plassering av oppstartslaster"
 
-#: src/include/bootloader/grub/helps.rb:107
+#: src/include/bootloader/grub/helps.rb:109
 msgid "Set &active Flag in Partition Table for Boot Partition"
 msgstr "Angi oppstartspartisjonen som &aktiv i partisjonstabellen"
 
-#: src/include/bootloader/grub/helps.rb:110
+#: src/include/bootloader/grub/helps.rb:112
 #: src/include/bootloader/routines/common_helps.rb:29
 msgid "&Timeout in Seconds"
 msgstr "&Tidsavbrudd i sekunder"
 
-#: src/include/bootloader/grub/helps.rb:111
+#: src/include/bootloader/grub/helps.rb:113
 msgid "&Default Boot Section"
 msgstr "Standar&d oppstartsseksjon"
 
-#: src/include/bootloader/grub/helps.rb:112
+#: src/include/bootloader/grub/helps.rb:114
 msgid "Write &generic Boot Code to MBR"
 msgstr "Skriv &generisk oppstartskode til MBR"
 
-#: src/include/bootloader/grub/helps.rb:113
+#: src/include/bootloader/grub/helps.rb:115
 msgid "Use &Trusted Grub"
 msgstr "Bruk påli&telig Grub"
 
-#: src/include/bootloader/grub/helps.rb:114
+#: src/include/bootloader/grub/helps.rb:116
 msgid "Custom Boot Partition"
 msgstr "Egendefinert oppstartspartisjon"
 
-#: src/include/bootloader/grub/helps.rb:115
+#: src/include/bootloader/grub/helps.rb:117
 msgid "Boot from Master Boot Record"
 msgstr "Start fra hovedoppstartssektor"
 
-#: src/include/bootloader/grub/helps.rb:116
+#: src/include/bootloader/grub/helps.rb:118
 msgid "Boot from Root Partition"
 msgstr "Start fra rotpartisjon"
 
-#: src/include/bootloader/grub/helps.rb:117
+#: src/include/bootloader/grub/helps.rb:119
 msgid "Boot from Boot Partition"
 msgstr "Start fra oppstartspartisjon"
 
-#: src/include/bootloader/grub/helps.rb:118
+#: src/include/bootloader/grub/helps.rb:120
 msgid "Boot from Extended Partition"
 msgstr "Start fra utvidet partisjon"
 
-#: src/include/bootloader/grub/helps.rb:119
+#: src/include/bootloader/grub/helps.rb:121
 msgid "Serial Connection &Parameters"
 msgstr "&Parametere for seriell tilkobling"
 
-#: src/include/bootloader/grub/helps.rb:120
+#: src/include/bootloader/grub/helps.rb:122
 msgid "Fallback Sections if Default fails"
 msgstr "Reserveseksjoner hvis standard mislykkes"
 
-#: src/include/bootloader/grub/helps.rb:121
+#: src/include/bootloader/grub/helps.rb:123
 msgid "&Hide Menu on Boot"
 msgstr "&Skjul meny ved oppstart"
 
-#: src/include/bootloader/grub/helps.rb:122
+#: src/include/bootloader/grub/helps.rb:124
 msgid "Graphical &Menu File"
 msgstr "Fil for grafisk &meny"
 
-#: src/include/bootloader/grub/helps.rb:123
+#: src/include/bootloader/grub/helps.rb:125
 msgid "Pa&ssword for the Menu Interface"
 msgstr "Pa&ssord for menygrensesnitt"
 
-#: src/include/bootloader/grub/helps.rb:124
+#: src/include/bootloader/grub/helps.rb:126
 msgid "Debugg&ing Flag"
 msgstr "Feilsøk&ingsvalg"
 
@@ -498,118 +503,118 @@
 #. Common widget of a console
 #. @return [Hash{String => Object}] CWS widget
 #: src/include/bootloader/grub/options.rb:359
-#: src/include/bootloader/grub2/options.rb:269
+#: src/include/bootloader/grub2/options.rb:295
 msgid "Use &serial console"
 msgstr "Bruk &seriell konsoll"
 
 #: src/include/bootloader/grub/options.rb:366
-#: src/include/bootloader/grub2/options.rb:276
+#: src/include/bootloader/grub2/options.rb:302
 msgid "&Console arguments"
 msgstr "&Konsollargumenter"
 
 #. textentry header
-#: src/include/bootloader/grub/options.rb:453
+#: src/include/bootloader/grub/options.rb:455
 msgid "&Device"
 msgstr "&Enhet"
 
 #. disabling & enabling up/down
-#: src/include/bootloader/grub/options.rb:542
+#: src/include/bootloader/grub/options.rb:544
 msgid "Device map must contain at least one device"
 msgstr "Enhetskartet må inneholde minst én enhet"
 
-#: src/include/bootloader/grub/options.rb:551
+#: src/include/bootloader/grub/options.rb:553
 msgid "D&isks"
 msgstr "D&isker"
 
-#: src/include/bootloader/grub/options.rb:563
+#: src/include/bootloader/grub/options.rb:565
 msgid "&Up"
 msgstr "&Opp"
 
-#: src/include/bootloader/grub/options.rb:564
+#: src/include/bootloader/grub/options.rb:566
 msgid "&Down"
 msgstr "&Ned"
 
 #. Create Frame "Boot Loader Location"
 #.
 #. @return [Yast::Term] with widgets
-#: src/include/bootloader/grub/options.rb:739
-#: src/include/bootloader/grub/options.rb:768
-#: src/include/bootloader/grub/options.rb:803
-msgid "Boot Loader Location"
-msgstr "Oppstartslasterens plassering"
-
-#: src/include/bootloader/grub/options.rb:745
-#: src/include/bootloader/grub/options.rb:774
-#: src/include/bootloader/grub/options.rb:809
-msgid "Boot from &Master Boot Record"
-msgstr "Start fra &Master Boot Record"
-
-#: src/include/bootloader/grub/options.rb:748
+#: src/include/bootloader/grub/options.rb:740
 msgid "Boot from &Root Partition"
 msgstr "Start fra &rotpartisjon"
 
-#: src/include/bootloader/grub/options.rb:749
+#: src/include/bootloader/grub/options.rb:741
 msgid "Boo&t from Boot Partition"
 msgstr "Star&t fra oppstartspartisjon"
 
-#: src/include/bootloader/grub/options.rb:754
+#: src/include/bootloader/grub/options.rb:749
+#: src/include/bootloader/grub/options.rb:776
+#: src/include/bootloader/grub/options.rb:811
+msgid "Boot Loader Location"
+msgstr "Oppstartslasterens plassering"
+
+#: src/include/bootloader/grub/options.rb:755
+#: src/include/bootloader/grub/options.rb:782
+#: src/include/bootloader/grub/options.rb:817
+msgid "Boot from &Master Boot Record"
+msgstr "Start fra &Master Boot Record"
+
+#: src/include/bootloader/grub/options.rb:762
 msgid "Boot from &Extended Partition"
 msgstr "Start fra utvid&et partisjon"
 
-#: src/include/bootloader/grub/options.rb:780
-#: src/include/bootloader/grub/options.rb:821
+#: src/include/bootloader/grub/options.rb:788
+#: src/include/bootloader/grub/options.rb:829
 msgid "C&ustom Boot Partition"
 msgstr "E&gendefinert oppstartspartisjon"
 
-#: src/include/bootloader/grub/options.rb:814
+#: src/include/bootloader/grub/options.rb:822
 msgid "Enable Red&undancy for MD Array"
 msgstr "Aktiver red&undans for MD-tilordning"
 
 #. push button
 #. push button
-#: src/include/bootloader/grub/options.rb:873
+#: src/include/bootloader/grub/options.rb:881
 #: src/include/bootloader/routines/global_widgets.rb:831
 msgid "Boot Loader Installation &Details"
 msgstr "&Informasjon om oppstartslasterinstallasjon"
 
-#. Cache for genericWidgets function
-#: src/include/bootloader/grub2/dialogs.rb:52
+#. Title in tab
+#: src/include/bootloader/grub2/dialogs.rb:57
 #, fuzzy
 #| msgid "Boot Loader Options"
 msgid "Boot Code Options"
 msgstr "Alternativer for oppstartslaster"
 
-#. there is no graphic adapter on s390 (bnc#874010)
-#: src/include/bootloader/grub2/dialogs.rb:75
+#. Title in tab
+#: src/include/bootloader/grub2/dialogs.rb:82
 #, fuzzy
 #| msgid "Other Kernel &Parameters"
 msgid "Kernel Parameters"
 msgstr "Andre kjerne¶metere"
 
-#. there is no os prober on s390(bnc#868909)
-#: src/include/bootloader/grub2/dialogs.rb:94
+#. Title in tab
+#: src/include/bootloader/grub2/dialogs.rb:102
 #, fuzzy
 #| msgid "Boot Loader Options"
 msgid "Bootloader Options"
 msgstr "Alternativer for oppstartslaster"
 
-#: src/include/bootloader/grub2/dialogs.rb:174
+#: src/include/bootloader/grub2/dialogs.rb:183
 msgid "Secure Boot"
 msgstr "Sikker oppstart"
 
-#: src/include/bootloader/grub2/dialogs.rb:180
+#: src/include/bootloader/grub2/dialogs.rb:189
 msgid "Enable &Secure Boot Support"
 msgstr "Aktiver støtte for &sikker oppstart"
 
 #. TRANSLATORS: place where boot code is installed
-#: src/include/bootloader/grub2/dialogs.rb:253
+#: src/include/bootloader/grub2/dialogs.rb:262
 #, fuzzy
 #| msgid "Boot Loader Location"
 msgid "Boot &Loader Location"
 msgstr "Oppstartslasterens plassering"
 
 #. help text
-#: src/include/bootloader/grub2/dialogs.rb:272
+#: src/include/bootloader/grub2/dialogs.rb:281
 msgid "Choose partition where is boot sequence installed."
 msgstr ""
 
@@ -645,24 +650,42 @@
 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:35
+msgid "<p><b>Protective MBR flag</b> is expert only settings, that is needed only on exotic hardware. For details see Protective MBR in GPT disks. Do not touch if you are not sure.</p>"
+msgstr ""
+
 #: src/include/bootloader/grub2/helps.rb:38
+msgid "<p><b>Distributor</b> specifies name of distributor of kernel used to create boot entry name. </p>"
+msgstr ""
+
+#: src/include/bootloader/grub2/helps.rb:44
 #: src/include/bootloader/routines/section_helps.rb:99
 msgid "O&ptional Kernel Command Line Parameter"
 msgstr "Andre kommandolinje¶metere for kjernen"
 
-#: src/include/bootloader/grub2/helps.rb:39
+#: src/include/bootloader/grub2/helps.rb:45
+#, fuzzy
+#| msgid "Distribution:"
+msgid "D&istributor"
+msgstr "Distribusjon:"
+
+#: src/include/bootloader/grub2/helps.rb:46
 #: src/include/bootloader/routines/section_helps.rb:98
 msgid "&Vga Mode"
 msgstr "&VGA-modus"
 
-#: src/include/bootloader/grub2/helps.rb:40
+#: src/include/bootloader/grub2/helps.rb:47
 msgid "&Failsafe Kernel Command Line Parameter"
 msgstr "&Feilsikker kommandolinjeparameter for kjerne"
 
-#: src/include/bootloader/grub2/helps.rb:41
+#: src/include/bootloader/grub2/helps.rb:48
 msgid "Probe Foreign OS"
 msgstr "Søk etter andre OS"
 
+#: src/include/bootloader/grub2/helps.rb:49
+msgid "Protective MBR flag"
+msgstr ""
+
 #. combo box item
 #. %1 is X resolution (width) in pixels
 #. %2 is Y resolution (height) in pixels
@@ -695,30 +718,54 @@
 msgid "Unspecified"
 msgstr "Uspesifisert"
 
+#. TRANSLATORS: set flag on disk
+#: src/include/bootloader/grub2/options.rb:102
+#, fuzzy
+#| msgid "[set]"
+msgid "set"
+msgstr "[angitt]"
+
+#. TRANSLATORS: remove flag from disk
+#: src/include/bootloader/grub2/options.rb:104
+msgid "remove"
+msgstr "fjern"
+
+#. TRANSLATORS: do not change flag on disk
+#: src/include/bootloader/grub2/options.rb:106
+#, fuzzy
+#| msgid "Do not change name"
+msgid "do not change"
+msgstr "Ikke endre navnet"
+
 #. Init function for console
 #. @param [String] widget
-#: src/include/bootloader/grub2/options.rb:148
+#: src/include/bootloader/grub2/options.rb:174
 msgid "Autodetect by grub2"
 msgstr "Automatisk søk med grub2"
 
 #. FATE: #110038: Serial console
 #. add or remove console key with value for sections
-#: src/include/bootloader/grub2/options.rb:223
+#: src/include/bootloader/grub2/options.rb:249
 msgid "Choose new graphical theme file"
 msgstr "Velg ny fil for grafisk tema"
 
-#: src/include/bootloader/grub2/options.rb:235
+#: src/include/bootloader/grub2/options.rb:261
 msgid "Use &graphical console"
 msgstr "Bruk &grafisk konsoll"
 
-#: src/include/bootloader/grub2/options.rb:242
+#: src/include/bootloader/grub2/options.rb:268
 msgid "&Console resolution"
 msgstr "&Konsolloppløsning"
 
-#: src/include/bootloader/grub2/options.rb:250
+#: src/include/bootloader/grub2/options.rb:276
 msgid "&Console theme"
 msgstr "&Konsolltema"
 
+#. FIXME this should be better handled by exception and show it properly, but it require too big change now
+#: src/include/bootloader/routines/autoinstall.rb:169
+msgid "Unsupported bootloader '%s'. Adapt your AutoYaST profile accordingly."
+msgstr ""
+
 #. file open popup caption
 #. file open popup caption
 #. file open popup caption
@@ -732,7 +779,7 @@
 #. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
 #. F#300779 - Install diskless client (NFS-root)
 #. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
-#: src/include/bootloader/routines/dialogs.rb:90 src/modules/Bootloader.rb:269
+#: src/include/bootloader/routines/dialogs.rb:90 src/modules/Bootloader.rb:270
 msgid "The boot partition is of type NFS. Bootloader cannot be installed."
 msgstr "Oppstartspartisjonen er av typen NFS. Oppstartslasteren kan ikke installeres."
 
@@ -863,11 +910,7 @@
 msgid "Xen"
 msgstr "Xen"
 
-#. entry of bootloader menu - only a-z, A-Z, 0-9, _ and blank space
-#. are allowed, otherwise translartion won't be used
-#. try to keep short, may be shortened due to bootloader limitations
 #: src/include/bootloader/routines/global_widgets.rb:152
-#: src/modules/GfxMenu.rb:91
 msgid "Floppy"
 msgstr "Diskett"
 
@@ -1860,13 +1903,13 @@
 #.
 #.
 #. FIXME identical code in BootGRUB module
-#: src/modules/BootGRUB.rb:657 src/modules/BootGRUB2.rb:167
+#: src/modules/BootGRUB.rb:657 src/modules/BootGRUB2.rb:189
 #, fuzzy
 #| msgid "Boot from MBR is enabled (<a href=\"disable_boot_mbr\">disable</a>"
 msgid "Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not install</a>)"
 msgstr "Oppstart fra MBR er aktivert (<a href=\"disable_boot_mbr\">deaktiver</a>"
 
-#: src/modules/BootGRUB.rb:661 src/modules/BootGRUB2.rb:171
+#: src/modules/BootGRUB.rb:661 src/modules/BootGRUB2.rb:193
 #, fuzzy
 #| msgid "Boot from MBR is disabled (<a href=\"enable_boot_mbr\">enable</a>"
 msgid "Do not install bootcode into MBR (<a href=\"enable_boot_mbr\">install</a>)"
@@ -1874,31 +1917,32 @@
 
 #. check for separated boot partition, use root otherwise
 #. check for separated boot partition, use root otherwise
-#: src/modules/BootGRUB.rb:673 src/modules/BootGRUB2.rb:183
+#: src/modules/BootGRUB.rb:673 src/modules/BootGRUB2.rb:206
 #, fuzzy
 #| msgid "Boot from /boot partition is enabled (<a href=\"disable_boot_boot\">disable</a>"
 msgid "Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do not install</a>)"
 msgstr "Oppstart fra /boot-partisjon er aktivert (<a href=\"disable_boot_boot\">deaktiver</a>"
 
-#: src/modules/BootGRUB.rb:677 src/modules/BootGRUB2.rb:187
+#: src/modules/BootGRUB.rb:677 src/modules/BootGRUB2.rb:210
 #, fuzzy
 #| msgid "Boot from /boot partition is disabled (<a href=\"enable_boot_boot\">enable</a>"
 msgid "Do not install bootcode into /boot partition (<a href=\"enable_boot_boot\">install</a>)"
 msgstr "Oppstart fra /boot-partisjon er deaktivert (<a href=\"enable_boot_boot\">aktiver</a>"
 
-#: src/modules/BootGRUB.rb:683 src/modules/BootGRUB2.rb:193
+#: src/modules/BootGRUB.rb:683 src/modules/BootGRUB2.rb:216
 #, fuzzy
 #| msgid "Boot from \"/\" partition is enabled (<a href=\"disable_boot_root\">disable</a>"
 msgid "Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do not install</a>)"
 msgstr "Oppstart fra «/»-partisjon er aktivert (<a href=\"disable_boot_root\">deaktiver</a>"
 
-#: src/modules/BootGRUB.rb:687 src/modules/BootGRUB2.rb:197
+#: src/modules/BootGRUB.rb:687 src/modules/BootGRUB2.rb:220
 #, fuzzy
 #| msgid "Boot from \"/\" partition is disabled (<a href=\"enable_boot_root\">enable</a>"
 msgid "Do not install bootcode into \"/\" partition (<a href=\"enable_boot_root\">install</a>)"
 msgstr "Oppstart fra «/»-partisjon er deaktivert (<a href=\"enable_boot_root\">aktiver</a>"
 
-#: src/modules/BootGRUB.rb:695 src/modules/BootGRUB2.rb:205
+#. TRANSLATORS: title for list of location proposals
+#: src/modules/BootGRUB.rb:695 src/modules/BootGRUB2.rb:238
 #, fuzzy
 #| msgid "Change Location: %1"
 msgid "Change Location: %s"
@@ -1909,31 +1953,33 @@
 #. @return a list of summary lines
 #. Display bootloader summary
 #. @return a list of summary lines
-#: src/modules/BootGRUB.rb:708 src/modules/BootGRUB2.rb:215
-#: src/modules/BootGRUB2EFI.rb:68
+#: src/modules/BootGRUB.rb:708 src/modules/BootGRUB2.rb:248
+#: src/modules/BootGRUB2EFI.rb:94
 msgid "Boot Loader Type: %1"
 msgstr "Oppstartslastertype: %1"
 
 #. summary text, location is location description (eg. /dev/hda)
-#: src/modules/BootGRUB.rb:718 src/modules/BootGRUB2.rb:224
+#: src/modules/BootGRUB.rb:718
 msgid " (\"/boot\")"
 msgstr " («/boot»)"
 
-#: src/modules/BootGRUB.rb:724 src/modules/BootGRUB2.rb:230
+#. TRANSLATORS: extended is here for extended partition. Keep translation short.
+#: src/modules/BootGRUB.rb:724 src/modules/BootGRUB2.rb:259
 msgid " (extended)"
 msgstr " (utvidet)"
 
-#: src/modules/BootGRUB.rb:730 src/modules/BootGRUB2.rb:236
+#: src/modules/BootGRUB.rb:730
 msgid " (\"/\")"
 msgstr " (\"/\")"
 
-#: src/modules/BootGRUB.rb:736 src/modules/BootGRUB2.rb:242
+#. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific
+#. is used in your language, then keep it as it is.
+#: src/modules/BootGRUB.rb:736 src/modules/BootGRUB2.rb:267
 msgid " (MBR)"
 msgstr " (MBR)"
 
 #. FIXME: should we translate all devices to names and add MBR suffixes?
-#. FIXME: should we translate all devices to names and add MBR suffixes?
-#: src/modules/BootGRUB.rb:750 src/modules/BootGRUB2.rb:256
+#: src/modules/BootGRUB.rb:750 src/modules/BootGRUB2.rb:274
 msgid "Status Location: %1"
 msgstr "Status for plassering: %1"
 
@@ -1956,236 +2002,180 @@
 msgid "Propose and &Merge with Existing GRUB Menus"
 msgstr "Foreslå og &slå sammen med eksisterende GRUB-menyer"
 
-#: src/modules/BootGRUB2EFI.rb:76
+#. no location chosen, so warn user that it is problem unless he is sure
+#: src/modules/BootGRUB2.rb:230
+msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
+msgstr ""
+
+#: src/modules/BootGRUB2EFI.rb:102
 msgid "Enable Secure Boot: %1"
 msgstr "Aktiver sikker oppstart: %1"
 
 #. Check that bootloader is known and supported
-#: src/modules/BootSupportCheck.rb:68
+#: src/modules/BootSupportCheck.rb:70
 msgid "Unknown bootloader: %1"
 msgstr "Ukjent oppstartslaster: %1"
 
 #. grub2 is sooo cool...
-#: src/modules/BootSupportCheck.rb:99
+#: src/modules/BootSupportCheck.rb:101
 msgid "Unsupported combination of hardware platform %1 and bootloader %2"
 msgstr "En kombinasjon av maskinvareplattformen %1 og oppstartslasteren %2 støttes ikke"
 
 #. TODO add more devices
-#: src/modules/BootSupportCheck.rb:126
+#: src/modules/BootSupportCheck.rb:128
 msgid "Partition number > 3 is being used for booting with GPT partition table"
 msgstr "Partisjonsnummer > 3 brukes til oppstart med GPT-partisjonstabellen"
 
-#. if "iscsi" is true
-#: src/modules/BootSupportCheck.rb:166
-msgid "The boot device is on iSCSI disk: %1. System may not boot."
-msgstr "Oppstartsenheten er på iSCSI-disken: %1. Systemet vil kanskje ikke starte."
+#. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation.
+#: src/modules/BootSupportCheck.rb:153
+msgid "Boot from MBR does not work together with btrfs filesystem and GPT disk label without bios_grub partition.To fix this issue, create bios_grub partition or use any ext filesystem for boot partition or do not install stage 1 to MBR."
+msgstr ""
 
-#: src/modules/BootSupportCheck.rb:184
+#. check if boot device is on raid0
+#: src/modules/BootSupportCheck.rb:181
 msgid "The boot device is on raid type: %1. System will not boot."
 msgstr "Oppstartsenheten er på raid-typen: %1. Systemet vil ikke starte opp."
 
 #. bnc#501043 added check for valid configuration
-#: src/modules/BootSupportCheck.rb:204
+#: src/modules/BootSupportCheck.rb:201
 msgid "The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record"
 msgstr "Oppstartsenheten er plassert på programvarebasert RAID1. Velg en annen plassering for oppstartslasteren, f.eks. Master Boot Record."
 
 #. s390 do not have bios boot order (bnc#874106)
-#: src/modules/BootSupportCheck.rb:259
-msgid "It was not possible to determine the exact order of disks for device map. The order of disks can be changed in \"Boot Loader Installation Details\""
+#: src/modules/BootSupportCheck.rb:256
+#, fuzzy
+#| msgid "It was not possible to determine the exact order of disks for device map. The order of disks can be changed in \"Boot Loader Installation Details\""
+msgid "YaST could not determine the exact boot order of disks needed for the device map. Review and possibly adjust the boot order of disks in \"Boot Loader Installation Details\""
 msgstr "Det var ikke mulig å definere den nøyaktige diskrekkefølgen for enhetskartet. Diskrekkefølgen kan endres under «Informasjon om oppstartslasterinstallasjon»"
 
-#: src/modules/BootSupportCheck.rb:278
+#. if partitioning worked before upgrade, it will keep working (bnc#886604)
+#: src/modules/BootSupportCheck.rb:276
 msgid "Missing ext partition for booting. Cannot install boot code."
 msgstr ""
 
 #. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:169
+#: src/modules/Bootloader.rb:170
 msgid "Check boot loader"
 msgstr "Kontroller oppstartslaster"
 
 #. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:171
+#: src/modules/Bootloader.rb:172
 msgid "Read partitioning"
 msgstr "Les partisjonstabell"
 
 #. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:173
+#: src/modules/Bootloader.rb:174
 msgid "Load boot loader settings"
 msgstr "Last innstillinger for oppstartslaster"
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:177
+#: src/modules/Bootloader.rb:178
 msgid "Checking boot loader..."
 msgstr "Kontrollerer oppstartslaster..."
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:179
+#: src/modules/Bootloader.rb:180
 msgid "Reading partitioning..."
 msgstr "Leser partisjonstabell..."
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:181
+#: src/modules/Bootloader.rb:182
 msgid "Loading boot loader settings..."
 msgstr "Laster innstillinger for oppstartslaster..."
 
 #. dialog header
-#: src/modules/Bootloader.rb:185
+#: src/modules/Bootloader.rb:186
 msgid "Initializing Boot Loader Configuration"
 msgstr "Initialiserer konfigurasjon for oppstartslaster"
 
 #. part of summary, %1 is a part of kernel command line
-#: src/modules/Bootloader.rb:306
+#: src/modules/Bootloader.rb:307
 msgid "Added Kernel Parameters: %1"
 msgstr "Ekstra kjerneparametere: %1"
 
 #. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:366
+#: src/modules/Bootloader.rb:367
 msgid "Create initrd"
 msgstr "Opprett initrd"
 
 #. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:368
+#: src/modules/Bootloader.rb:369
 msgid "Save boot loader configuration files"
 msgstr "Lagre konfigurasjonsfiler for oppstartslaster"
 
 #. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:370
+#: src/modules/Bootloader.rb:371
 msgid "Install boot loader"
 msgstr "Installer oppstartslaster"
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:374
+#: src/modules/Bootloader.rb:375
 msgid "Creating initrd..."
 msgstr "Oppretter initrd..."
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:376
+#: src/modules/Bootloader.rb:377
 msgid "Saving boot loader configuration files..."
 msgstr "Lagrer konfigurasjonsfiler for oppstartslaster..."
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:378
+#: src/modules/Bootloader.rb:379
 msgid "Installing boot loader..."
 msgstr "Installerer oppstartslaster..."
 
 #. progress line
-#: src/modules/Bootloader.rb:384
+#: src/modules/Bootloader.rb:385
 msgid "Saving Boot Loader Configuration"
 msgstr "Lagrer konfigurasjon for oppstartslaster"
 
-#. entry of bootloader menu - only a-z, A-Z, 0-9, _ and blank space
-#. are allowed, otherwise translartion won't be used
-#. try to keep short, may be shortened due to bootloader limitations
-#: src/modules/GfxMenu.rb:79
-msgid "Linux"
-msgstr "Linux"
+#~ msgid "The boot device is on iSCSI disk: %1. System may not boot."
+#~ msgstr "Oppstartsenheten er på iSCSI-disken: %1. Systemet vil kanskje ikke starte."
 
-#. entry of bootloader menu - only a-z, A-Z, 0-9, _ and blank space
-#. are allowed, otherwise translartion won't be used
-#. try to keep short, may be shortened due to bootloader limitations
-#: src/modules/GfxMenu.rb:85
-msgid "Failsafe"
-msgstr "Sikker modus"
+#~ msgid "Linux"
+#~ msgstr "Linux"
 
-#. entry of bootloader menu - only a-z, A-Z, 0-9, _ and blank space
-#. are allowed, otherwise translartion won't be used
-#. try to keep short, may be shortened due to bootloader limitations
-#: src/modules/GfxMenu.rb:97
-msgid "Hard Disk"
-msgstr "Harddisk"
+#~ msgid "Failsafe"
+#~ msgstr "Sikker modus"
 
-#. entry of bootloader menu - only a-z, A-Z, 0-9, _ and blank space
-#. are allowed, otherwise translartion won't be used
-#. try to keep short, may be shortened due to bootloader limitations
-#: src/modules/GfxMenu.rb:103
-msgid "Memory Test"
-msgstr "Minnetest"
+#~ msgid "Hard Disk"
+#~ msgstr "Harddisk"
 
-#. entry of bootloader menu - only a-z, A-Z, 0-9, _ and blank space
-#. are allowed, otherwise translartion won't be used
-#. try to keep short, may be shortened due to bootloader limitations
-#: src/modules/GfxMenu.rb:109
-msgid "MBR before Installation"
-msgstr "MBR før installasjon"
+#~ msgid "Memory Test"
+#~ msgstr "Minnetest"
 
-#. entry of bootloader menu - only a-z, A-Z, 0-9, _ and blank space
-#. are allowed, otherwise translartion won't be used
-#. try to keep short, may be shortened due to bootloader limitations
-#: src/modules/GfxMenu.rb:115
-msgid "Previous Kernel"
-msgstr "Forrige kjerne"
+#~ msgid "MBR before Installation"
+#~ msgstr "MBR før installasjon"
 
-#. entry of bootloader menu - only a-z, A-Z, 0-9, _ and blank space
-#. are allowed, otherwise translartion won't be used
-#. try to keep short, may be shortened due to bootloader limitations
-#: src/modules/GfxMenu.rb:121
-msgid "Vendor Diagnostics"
-msgstr "Forhandlerdiagnose"
+#~ msgid "Previous Kernel"
+#~ msgstr "Forrige kjerne"
 
-#. entry of bootloader menu - only ISO 8859-1, -2 and -15 characters
-#. are allowed. Always remove the leading '_', its just to
-#. be able to have translations with and without diacritics
-#. please use diacritics here
-#: src/modules/GfxMenu.rb:230
-msgid "_Linux"
-msgstr "_Linux"
+#~ msgid "Vendor Diagnostics"
+#~ msgstr "Forhandlerdiagnose"
 
-#. entry of bootloader menu - only ISO 8859-1, -2 and -15 characters
-#. are allowed. Always remove the leading '_', its just to
-#. be able to have translations with and without diacritics
-#. please use diacritics here
-#: src/modules/GfxMenu.rb:237
-msgid "_Failsafe"
-msgstr "_Sikker modus"
+#~ msgid "_Linux"
+#~ msgstr "_Linux"
 
-#. entry of bootloader menu - only ISO 8859-1, -2 and -15 characters
-#. are allowed. Always remove the leading '_', its just to
-#. be able to have translations with and without diacritics
-#. please use diacritics here
-#: src/modules/GfxMenu.rb:244
-msgid "_Floppy"
-msgstr "_Diskett"
+#~ msgid "_Failsafe"
+#~ msgstr "_Sikker modus"
 
-#. entry of bootloader menu - only ISO 8859-1, -2 and -15 characters
-#. are allowed. Always remove the leading '_', its just to
-#. be able to have translations with and without diacritics
-#. please use diacritics here
-#: src/modules/GfxMenu.rb:251
-msgid "_Hard Disk"
-msgstr "_Harddisk"
+#~ msgid "_Floppy"
+#~ msgstr "_Diskett"
 
-#. entry of bootloader menu - only ISO 8859-1, -2 and -15 characters
-#. are allowed. Always remove the leading '_', its just to
-#. be able to have translations with and without diacritics
-#. please use diacritics here
-#: src/modules/GfxMenu.rb:258
-msgid "_Memory Test"
-msgstr "_Minnetest"
+#~ msgid "_Hard Disk"
+#~ msgstr "_Harddisk"
 
-#. entry of bootloader menu - only ISO 8859-1, -2 and -15 characters
-#. are allowed. Always remove the leading '_', its just to
-#. be able to have translations with and without diacritics
-#. please use diacritics here
-#: src/modules/GfxMenu.rb:265
-msgid "_MBR before Installation"
-msgstr "_MBR før installasjon"
+#~ msgid "_Memory Test"
+#~ msgstr "_Minnetest"
 
-#. entry of bootloader menu - only ISO 8859-1, -2 and -15 characters
-#. are allowed. Always remove the leading '_', its just to
-#. be able to have translations with and without diacritics
-#. please use diacritics here
-#: src/modules/GfxMenu.rb:272
-msgid "_Previous Kernel"
-msgstr "_Forrige kjerne"
+#~ msgid "_MBR before Installation"
+#~ msgstr "_MBR før installasjon"
 
-#. entry of bootloader menu - only ISO 8859-1, -2 and -15 characters
-#. are allowed. Always remove the leading '_', its just to
-#. be able to have translations with and without diacritics
-#. please use diacritics here
-#: src/modules/GfxMenu.rb:279
-msgid "_Vendor Diagnostics"
-msgstr "_Forhandlerdiagnose"
+#~ msgid "_Previous Kernel"
+#~ msgstr "_Forrige kjerne"
 
+#~ msgid "_Vendor Diagnostics"
+#~ msgstr "_Forhandlerdiagnose"
+
 #~ msgid "The bootloader is installed on a partition that does not lie entirely below %1 GB. The system might not boot if BIOS support only lba24 (result is error 18 during install grub MBR)."
 #~ msgstr "Oppstartslasteren er installert på en partisjon som ikke ligger helt innenfor %1 GB. Det er ikke sikkert at systemet kan startes dersom BIOS bare støtter lba24 (resultatet blir 'error 18' mår grub MBR installeres)."
 

Modified: trunk/yast/nb/po/ca-management.nb.po
===================================================================
--- trunk/yast/nb/po/ca-management.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/ca-management.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: ca-management.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2009-08-08 08:33+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -60,25 +60,25 @@
 msgstr "Organisasjonsenhet"
 
 #: src/clients/ca_mgm.rb:73 src/clients/ca_mgm_auto.rb:870
-#: src/include/ca-management/certificate.rb:442
+#: src/include/ca-management/certificate.rb:456
 #: src/include/ca-management/request.rb:321
 msgid "Organization"
 msgstr "Organisasjon"
 
 #: src/clients/ca_mgm.rb:74 src/clients/ca_mgm_auto.rb:884
-#: src/include/ca-management/certificate.rb:444
+#: src/include/ca-management/certificate.rb:458
 #: src/include/ca-management/request.rb:323
 msgid "Locality"
 msgstr "Lokalitet"
 
 #: src/clients/ca_mgm.rb:75 src/clients/ca_mgm_auto.rb:889
-#: src/include/ca-management/certificate.rb:445
+#: src/include/ca-management/certificate.rb:459
 #: src/include/ca-management/request.rb:324
 msgid "State"
 msgstr "Status"
 
 #: src/clients/ca_mgm.rb:76 src/clients/ca_mgm_auto.rb:865
-#: src/include/ca-management/certificate.rb:446
+#: src/include/ca-management/certificate.rb:460
 #: src/include/ca-management/request.rb:325
 msgid "Country"
 msgstr "Land"
@@ -270,7 +270,7 @@
 msgstr "Navn på sertifikatutsteder (CA)"
 
 #. To translators: table headers
-#: src/clients/ca_mgm_auto.rb:851 src/include/ca-management/certificate.rb:440
+#: src/clients/ca_mgm_auto.rb:851 src/include/ca-management/certificate.rb:454
 #: src/include/ca-management/request.rb:319
 msgid "Common Name"
 msgstr "Vanlig navn"
@@ -286,7 +286,7 @@
 msgid "Email"
 msgstr "E-post"
 
-#: src/clients/ca_mgm_auto.rb:875 src/include/ca-management/certificate.rb:443
+#: src/clients/ca_mgm_auto.rb:875 src/include/ca-management/certificate.rb:457
 #: src/include/ca-management/request.rb:322
 msgid "Organizational Unit"
 msgstr "Organisasjonsenhet"
@@ -597,7 +597,7 @@
 #. To translators: ContinueCancel Popup headline
 #. we need to fake a certificate name
 #: src/clients/ca_select_proposal.rb:364
-#: src/include/ca-management/certificate.rb:571
+#: src/include/ca-management/certificate.rb:585
 #: src/include/ca-management/new_cert_callbacks.rb:523
 #: src/include/ca-management/new_cert_callbacks.rb:958
 #: src/include/ca-management/request.rb:429
@@ -643,7 +643,7 @@
 #. The main ()
 #. To translators: dialog label
 #. To translators: ContinueCancel Popup headline
-#: src/clients/common_cert.rb:56 src/clients/common_cert.rb:174
+#: src/clients/common_cert.rb:56 src/clients/common_cert.rb:175
 #: src/include/ca-management/util.rb:1313
 msgid "Common Server Certificate"
 msgstr "Vanlig serversertifikat"
@@ -688,11 +688,20 @@
 msgid "<p>For more information, please read the manual.</p>"
 msgstr "<p>Du finner mer informasjon i veiledningen.</p>"
 
+#. popup text
+#: src/clients/common_cert.rb:154
+#, fuzzy
+#| msgid "<p>This certificate can be exchanged by importing a certificate from a file.</p>"
+msgid ""
+"<pre>Common Server Certificate not found.\n"
+"You can import a certificate from disk</pre>"
+msgstr "<p>Dette sertifikatet kan byttes ut ved å importere et sertifikat fra en fil.</p>"
+
 #. popup window header
 #. popup window header
 #. popup window header
 #. popup window header
-#: src/clients/common_cert.rb:159 src/include/ca-management/ca.rb:141
+#: src/clients/common_cert.rb:160 src/include/ca-management/ca.rb:141
 #: src/include/ca-management/certificate.rb:264
 #: src/include/ca-management/crl.rb:166
 #: src/include/ca-management/request.rb:238
@@ -700,22 +709,22 @@
 msgstr "Beskrivelse"
 
 #. push button label
-#: src/clients/common_cert.rb:166
+#: src/clients/common_cert.rb:167
 msgid "&Remove"
 msgstr "Fje&rn"
 
 #. push button label
-#: src/clients/common_cert.rb:168
+#: src/clients/common_cert.rb:169
 msgid "&Import/Replace"
 msgstr "&Importer/erstatt"
 
 #. To translators: warning popup yes/no question (1/3)
-#: src/clients/common_cert.rb:208
+#: src/clients/common_cert.rb:209
 msgid "The certificate is not yet expired.\n"
 msgstr "Sertifikatet er ikke utløpt ennå.\n"
 
 #. To translators: warning popup yes/no question (2/3)
-#: src/clients/common_cert.rb:210
+#: src/clients/common_cert.rb:211
 msgid ""
 "Please make sure, that no service use this certificate anymore.\n"
 "\n"
@@ -724,7 +733,7 @@
 "\n"
 
 #. To translators: warning popup yes/no question (3/3)
-#: src/clients/common_cert.rb:214
+#: src/clients/common_cert.rb:215
 msgid "Are you sure, that you want to remove the certificate?"
 msgstr "Er du sikker på at du vil fjerne sertifikatet? "
 
@@ -757,11 +766,69 @@
 msgid "<p><b>Issued For:</b></p>"
 msgstr "<p><b>Utstedt til:</b></p>"
 
-#: src/include/ca-management/ca.rb:214
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/ca.rb:187 src/include/ca-management/ca.rb:224
+#, fuzzy
+#| msgid "Common Name: "
+msgid ""
+"\n"
+"Common Name:  "
+msgstr "Vanlig navn: "
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/ca.rb:192 src/include/ca-management/ca.rb:229
+#, fuzzy
+#| msgid "O&rganization:"
+msgid ""
+"\n"
+"Organization: "
+msgstr "O&rganisasjon:"
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/ca.rb:197 src/include/ca-management/ca.rb:234
+#, fuzzy
+#| msgid "Location:"
+msgid ""
+"\n"
+"Location:     "
+msgstr "Plassering:"
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/ca.rb:202 src/include/ca-management/ca.rb:239
+#, fuzzy
+#| msgid "State:                    "
+msgid ""
+"\n"
+"State:        "
+msgstr "Region:                    "
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/ca.rb:207 src/include/ca-management/ca.rb:244
+#, fuzzy
+#| msgid "Country: "
+msgid ""
+"\n"
+"Country:      "
+msgstr "Land: "
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/ca.rb:212 src/include/ca-management/ca.rb:249
+msgid ""
+"\n"
+"EMAIL:        "
+msgstr ""
+
+#: src/include/ca-management/ca.rb:220
 msgid "<p><b>Issued By:</b></p>"
 msgstr "<p><b>Utstedt av:</b></p>"
 
-#: src/include/ca-management/ca.rb:244
+#: src/include/ca-management/ca.rb:256
 msgid ""
 "\n"
 "Valid from: "
@@ -769,7 +836,7 @@
 "\n"
 "Gyldig fra: "
 
-#: src/include/ca-management/ca.rb:248
+#: src/include/ca-management/ca.rb:260
 msgid ""
 "\n"
 "Valid to: "
@@ -778,34 +845,34 @@
 "Gyldig til: "
 
 #. To translators: pushbutton label
-#: src/include/ca-management/ca.rb:271
+#: src/include/ca-management/ca.rb:283
 msgid "&Advanced..."
 msgstr "&Avansert..."
 
-#: src/include/ca-management/ca.rb:273
-#: src/include/ca-management/certificate.rb:462
+#: src/include/ca-management/ca.rb:285
+#: src/include/ca-management/certificate.rb:476
 #: src/include/ca-management/crl.rb:261
 #: src/include/ca-management/request.rb:350
 msgid "&View"
 msgstr "&Vis"
 
-#: src/include/ca-management/ca.rb:274
+#: src/include/ca-management/ca.rb:286
 msgid "&Change CA Password"
 msgstr "&Endre CA-passord"
 
-#: src/include/ca-management/ca.rb:275
+#: src/include/ca-management/ca.rb:287
 msgid "C&reate SubCA"
 msgstr "O&pprett SubCA"
 
-#: src/include/ca-management/ca.rb:276
+#: src/include/ca-management/ca.rb:288
 msgid "Export to &File"
 msgstr "Eksporter til &fil"
 
-#: src/include/ca-management/ca.rb:277
+#: src/include/ca-management/ca.rb:289
 msgid "Export to &LDAP"
 msgstr "Eksporter til &LDAP"
 
-#: src/include/ca-management/ca.rb:278
+#: src/include/ca-management/ca.rb:290
 msgid "&Edit Default"
 msgstr "&Rediger standard"
 
@@ -859,7 +926,7 @@
 
 #: src/include/ca-management/certDefault.rb:145
 #: src/include/ca-management/new_cert.rb:731
-#: src/include/ca-management/signRequest.rb:774
+#: src/include/ca-management/signRequest.rb:786
 msgid "<p><b>Summary</b></p>"
 msgstr "<p><b>Sammendrag</b></p>"
 
@@ -891,18 +958,18 @@
 #: src/include/ca-management/new_cert.rb:1256
 #: src/include/ca-management/new_cert.rb:1265
 #: src/include/ca-management/new_cert.rb:1274
-#: src/include/ca-management/signRequest.rb:815
-#: src/include/ca-management/signRequest.rb:826
-#: src/include/ca-management/signRequest.rb:929
-#: src/include/ca-management/signRequest.rb:938
-#: src/include/ca-management/signRequest.rb:947
-#: src/include/ca-management/signRequest.rb:1036
-#: src/include/ca-management/signRequest.rb:1045
+#: src/include/ca-management/signRequest.rb:827
+#: src/include/ca-management/signRequest.rb:838
+#: src/include/ca-management/signRequest.rb:941
+#: src/include/ca-management/signRequest.rb:950
+#: src/include/ca-management/signRequest.rb:959
+#: src/include/ca-management/signRequest.rb:1048
 #: src/include/ca-management/signRequest.rb:1057
-#: src/include/ca-management/signRequest.rb:1184
-#: src/include/ca-management/signRequest.rb:1193
-#: src/include/ca-management/signRequest.rb:1202
-#: src/include/ca-management/signRequest.rb:1211
+#: src/include/ca-management/signRequest.rb:1069
+#: src/include/ca-management/signRequest.rb:1196
+#: src/include/ca-management/signRequest.rb:1205
+#: src/include/ca-management/signRequest.rb:1214
+#: src/include/ca-management/signRequest.rb:1223
 msgid " (critical)\n"
 msgstr " (kritisk)\n"
 
@@ -914,40 +981,40 @@
 #: src/include/ca-management/certDefault.rb:462
 #: src/include/ca-management/new_cert.rb:861
 #: src/include/ca-management/new_cert.rb:1147
-#: src/include/ca-management/signRequest.rb:954
-#: src/include/ca-management/signRequest.rb:994
+#: src/include/ca-management/signRequest.rb:966
+#: src/include/ca-management/signRequest.rb:1006
 msgid "(critical) "
 msgstr "(kritisk) "
 
 #: src/include/ca-management/certDefault.rb:182
 #: src/include/ca-management/new_cert.rb:866
 #: src/include/ca-management/new_cert_items.rb:266
-#: src/include/ca-management/signRequest.rb:999
+#: src/include/ca-management/signRequest.rb:1011
 msgid "Copy Subject Alt Name from CA"
 msgstr "Kopier SubjectAltName fra CA"
 
 #: src/include/ca-management/certDefault.rb:224
 #: src/include/ca-management/new_cert.rb:908
-#: src/include/ca-management/signRequest.rb:1070
+#: src/include/ca-management/signRequest.rb:1082
 msgid "(critical)\n"
 msgstr "(kritisk)\n"
 
 #: src/include/ca-management/certDefault.rb:336
 #: src/include/ca-management/new_cert.rb:1020
-#: src/include/ca-management/signRequest.rb:812
+#: src/include/ca-management/signRequest.rb:824
 msgid "nsComment:                "
 msgstr "nsComment:                "
 
 #: src/include/ca-management/certDefault.rb:350
 #: src/include/ca-management/new_cert.rb:1034
-#: src/include/ca-management/signRequest.rb:825
+#: src/include/ca-management/signRequest.rb:837
 msgid "nsCertType:               "
 msgstr "nsCertType:               "
 
 #: src/include/ca-management/certDefault.rb:467
 #: src/include/ca-management/new_cert.rb:1152
 #: src/include/ca-management/new_cert_items.rb:522
-#: src/include/ca-management/signRequest.rb:959
+#: src/include/ca-management/signRequest.rb:971
 msgid "Copy Standard E-Mail Address"
 msgstr "Kopier standard e-postadresse"
 
@@ -1023,83 +1090,227 @@
 "\n"
 "Sertifikat ikke funnet"
 
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:302
+#: src/include/ca-management/signRequest.rb:65
+#, fuzzy
+#| msgid "Common Name:              "
+msgid ""
+"\n"
+"Common Name:        "
+msgstr "Vanlig navn:              "
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:307
+#: src/include/ca-management/signRequest.rb:80
+#, fuzzy
+#| msgid "Organization:             "
+msgid ""
+"\n"
+"Organization:       "
+msgstr "Organisasjon:             "
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:312
+#: src/include/ca-management/signRequest.rb:85
+#, fuzzy
+#| msgid "Organization:             "
+msgid ""
+"\n"
+"Location:           "
+msgstr "Organisasjon:             "
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:317
+#: src/include/ca-management/signRequest.rb:90
+#, fuzzy
+#| msgid "State:                    "
+msgid ""
+"\n"
+"State:              "
+msgstr "Region:                    "
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:322
+#: src/include/ca-management/signRequest.rb:95
+#, fuzzy
+#| msgid "Country:                  "
+msgid ""
+"\n"
+"Country:            "
+msgstr "Land:                  "
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:327
+#: src/include/ca-management/signRequest.rb:100
+#, fuzzy
+#| msgid "        Type        "
+msgid ""
+"\n"
+"EMAIL:              "
+msgstr "        Type        "
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:333
+#: src/include/ca-management/signRequest.rb:107
+#, fuzzy
+#| msgid "        Type        "
+msgid ""
+"\n"
+"Is CA:              "
+msgstr "        Type        "
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:338
+#: src/include/ca-management/signRequest.rb:112
+#, fuzzy
+#| msgid "Key Length:               "
+msgid ""
+"\n"
+"Key Size:           "
+msgstr "Nøkkellengde:               "
+
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:343
+#, fuzzy
+#| msgid "Serial number of zone update"
+msgid ""
+"\n"
+"Serialnumber:       "
+msgstr "Serienummer for soneoppdatering"
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:348
+#: src/include/ca-management/signRequest.rb:117
+#, fuzzy
+#| msgid "Valid Period:             "
+msgid ""
+"\n"
+"Version:            "
+msgstr "Gyldighetsperiode:             "
+
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:353
+#, fuzzy
+#| msgid "Valid Period:             "
+msgid ""
+"\n"
+"Valid from:         "
+msgstr "Gyldighetsperiode:             "
+
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:358
+#, fuzzy
+#| msgid "Valid Period:             "
+msgid ""
+"\n"
+"Valid to:           "
+msgstr "Gyldighetsperiode:             "
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:363
+#: src/include/ca-management/signRequest.rb:122
+msgid ""
+"\n"
+"algo. of pub. Key : "
+msgstr ""
+
+#. Preformated Text: take care that all translations have the same length
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/certificate.rb:368
+#: src/include/ca-management/signRequest.rb:127
+msgid ""
+"\n"
+"algo. of signature: "
+msgstr ""
+
 #. Certificate status displayed in a table (Valid, Revoked, Expired)
 #. Initialize the tab of the dialog
-#: src/include/ca-management/certificate.rb:389
-#: src/include/ca-management/certificate.rb:518
+#: src/include/ca-management/certificate.rb:403
+#: src/include/ca-management/certificate.rb:532
 msgid "Valid"
 msgstr "Gyldig"
 
 #. Certificate status displayed in a table (Valid, Revoked, Expired)
-#: src/include/ca-management/certificate.rb:392
+#: src/include/ca-management/certificate.rb:406
 msgid "Revoked"
 msgstr "Inndratt"
 
 #. Certificate status displayed in a table (Valid, Revoked, Expired)
-#: src/include/ca-management/certificate.rb:396
+#: src/include/ca-management/certificate.rb:410
 msgid "Expired"
 msgstr "Utløpt"
 
 #. To translators: table headers
-#: src/include/ca-management/certificate.rb:439
+#: src/include/ca-management/certificate.rb:453
 msgid "Status"
 msgstr "Status"
 
-#: src/include/ca-management/certificate.rb:441
+#: src/include/ca-management/certificate.rb:455
 #: src/include/ca-management/request.rb:320
 msgid "E-Mail Address"
 msgstr "E-postadresse"
 
-#: src/include/ca-management/certificate.rb:456
+#: src/include/ca-management/certificate.rb:470
 #: src/include/ca-management/request.rb:338
 msgid "Add"
 msgstr "Legg til"
 
-#: src/include/ca-management/certificate.rb:458
+#: src/include/ca-management/certificate.rb:472
 msgid "Add Server Certificate"
 msgstr "Legg til serversertifikat"
 
-#: src/include/ca-management/certificate.rb:459
+#: src/include/ca-management/certificate.rb:473
 msgid "Add Client Certificate"
 msgstr "Legg til klientsertifikat"
 
-#: src/include/ca-management/certificate.rb:463
+#: src/include/ca-management/certificate.rb:477
 #: src/include/ca-management/request.rb:351
 msgid "&Change Password"
 msgstr "&Endre passord"
 
-#: src/include/ca-management/certificate.rb:464
+#: src/include/ca-management/certificate.rb:478
 msgid "&Revoke"
 msgstr "&Inndra"
 
-#: src/include/ca-management/certificate.rb:465
+#: src/include/ca-management/certificate.rb:479
 #: src/include/ca-management/request.rb:361
 msgid "&Delete"
 msgstr "&Slett"
 
 #. Fate (#2613)
-#: src/include/ca-management/certificate.rb:469
+#: src/include/ca-management/certificate.rb:483
 #: src/include/ca-management/crl.rb:265
 msgid "Export"
 msgstr "Eksporter"
 
-#: src/include/ca-management/certificate.rb:471
+#: src/include/ca-management/certificate.rb:485
 #: src/include/ca-management/request.rb:362
 msgid "Export to File"
 msgstr "Eksporter til fil"
 
 #. popup window header
-#: src/include/ca-management/certificate.rb:472
+#: src/include/ca-management/certificate.rb:486
 #: src/include/ca-management/crlExport.rb:507
 #: src/include/ca-management/util.rb:494
 msgid "Export to LDAP"
 msgstr "Eksporter til LDAP"
 
-#: src/include/ca-management/certificate.rb:473
+#: src/include/ca-management/certificate.rb:487
 msgid "Export as Common Server Certificate"
 msgstr "Eksporter som vanlig serversertifikat"
 
-#: src/include/ca-management/certificate.rb:572
+#: src/include/ca-management/certificate.rb:586
 msgid "Delete current certificate?"
 msgstr "Vil du slette gjeldende sertifikat?"
 
@@ -1197,7 +1408,7 @@
 
 #: src/include/ca-management/crlDefault.rb:164
 #: src/include/ca-management/new_cert.rb:602
-#: src/include/ca-management/signRequest.rb:712
+#: src/include/ca-management/signRequest.rb:724
 msgid "&Valid Period (days):"
 msgstr "&Gyldighetsperiode (dager):"
 
@@ -1625,7 +1836,7 @@
 msgstr " dager\n"
 
 #: src/include/ca-management/new_cert.rb:831
-#: src/include/ca-management/signRequest.rb:802
+#: src/include/ca-management/signRequest.rb:814
 msgid "Path Length "
 msgstr "Stilengde"
 
@@ -1831,6 +2042,15 @@
 "\n"
 "Forespørsel ble ikke funnet.\n"
 
+#. Preformated Text: take care that all translations have the same length
+#: src/include/ca-management/signRequest.rb:74
+#, fuzzy
+#| msgid "Generate Time"
+msgid ""
+"\n"
+"generation Time:    "
+msgstr "Generer tid"
+
 #. Reset an accpetation of a RequestExtention
 #. @param request extention
 #. @return [void]
@@ -1839,77 +2059,77 @@
 #. @param request extention
 #. @return [void]
 #. Filling up reqeust extentions
-#: src/include/ca-management/signRequest.rb:245
-#: src/include/ca-management/signRequest.rb:569
-#: src/include/ca-management/signRequest.rb:674
+#: src/include/ca-management/signRequest.rb:257
+#: src/include/ca-management/signRequest.rb:581
+#: src/include/ca-management/signRequest.rb:686
 msgid "Extension \"%1\" not found."
 msgstr "Filtype \"%1\" ble ikke funnet."
 
 #. IS CA ?
-#: src/include/ca-management/signRequest.rb:632
+#: src/include/ca-management/signRequest.rb:644
 msgid "This is a CA request. Really sign it as a %1?"
 msgstr "Dette er en CA-forespørsel. Vil du virkelig signere den som en %1?"
 
-#: src/include/ca-management/signRequest.rb:639
+#: src/include/ca-management/signRequest.rb:651
 msgid "This is not a CA request. Really sign it as a CA request?"
 msgstr "Dette er ikke en CA-forespørsel. Vil du virkelig signere den som en CA-forespørsel?"
 
 #. help text 1/3
-#: src/include/ca-management/signRequest.rb:691
+#: src/include/ca-management/signRequest.rb:703
 msgid "<p>This frame shows the signing request.</p>"
 msgstr "<p>Her vises signeringsforespørselen.</p>"
 
 #. help text 2/3
-#: src/include/ca-management/signRequest.rb:696
+#: src/include/ca-management/signRequest.rb:708
 msgid "<p>The request has special request extensions, which you can accept.</p>"
 msgstr "<p>Forespørselen har spesielle <b>forespørselsutvidelser</b> som du kan godkjenne.</p>"
 
 #. help text 3/3
-#: src/include/ca-management/signRequest.rb:703
+#: src/include/ca-management/signRequest.rb:715
 msgid "<p>If you reject these extensions, the default values are taken instead.</p>"
 msgstr "<p>Hvis du avviser disse utvidelsene, vil standardverdier bli brukt i stedet.</p>"
 
-#: src/include/ca-management/signRequest.rb:719
+#: src/include/ca-management/signRequest.rb:731
 msgid "Requested Extensions"
 msgstr "Forespurt utvidelse"
 
-#: src/include/ca-management/signRequest.rb:725
+#: src/include/ca-management/signRequest.rb:737
 msgid "Sign Request as a %1 (Step 1/2)"
 msgstr "Signer forespørselen som en %1 (trinn 1/2)"
 
 #. help text 1/2
-#: src/include/ca-management/signRequest.rb:765
+#: src/include/ca-management/signRequest.rb:777
 msgid "<p>This frame gives an overview of all settings for the request that will be signed.</p>"
 msgstr "<p>Dette vinduet viser en oversikt over alle innstillinger for forespørselen som vil bli signert.</p>"
 
 #. help text 2/2
-#: src/include/ca-management/signRequest.rb:771
+#: src/include/ca-management/signRequest.rb:783
 msgid "<p>Click <b>Sign Request</b> to go on.</p>"
 msgstr "<p>Klikk på <b>Signer forespørsel</b> for å fortsette.</p>"
 
-#: src/include/ca-management/signRequest.rb:789
+#: src/include/ca-management/signRequest.rb:801
 msgid " days"
 msgstr " dager"
 
-#: src/include/ca-management/signRequest.rb:795
+#: src/include/ca-management/signRequest.rb:807
 msgid " (critical)</p>"
 msgstr " (kritisk)</p>"
 
-#: src/include/ca-management/signRequest.rb:1221
+#: src/include/ca-management/signRequest.rb:1233
 msgid "&Edit Request"
 msgstr "&Rediger forespørsel"
 
 #. To translators: dialog label
-#: src/include/ca-management/signRequest.rb:1226
+#: src/include/ca-management/signRequest.rb:1238
 msgid "Sign Request as a %1 (Step 2/2)"
 msgstr "Signer forespørsel som en %1 (trinn 2/2)"
 
-#: src/include/ca-management/signRequest.rb:1232
+#: src/include/ca-management/signRequest.rb:1244
 msgid "Sign Request"
 msgstr "Signer forespørsel"
 
 #. signing request
-#: src/include/ca-management/signRequest.rb:1245
+#: src/include/ca-management/signRequest.rb:1257
 msgid "The request has been signed."
 msgstr "Forespørselen er signert."
 
@@ -2881,9 +3101,6 @@
 #~ msgid "<p>The <b>Common Server Certificate</b> will be used by other YaST modules.</p>"
 #~ msgstr "<p>Det<b>vanlige serversertifikatet</b> vil bli brukt av andre YaST-moduler.</p>"
 
-#~ msgid "<p>This certificate can be exchanged by importing a certificate from a file.</p>"
-#~ msgstr "<p>Dette sertifikatet kan byttes ut ved å importere et sertifikat fra en fil.</p>"
-
 #~ msgid "Invalid value'%s' for parameter '%s'."
 #~ msgstr "Ugyldig verdi '%s' for parameteren '%s'."
 

Added: trunk/yast/nb/po/cio.nb.po
===================================================================
--- trunk/yast/nb/po/cio.nb.po	                        (rev 0)
+++ trunk/yast/nb/po/cio.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -0,0 +1,108 @@
+# Norwegian message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 2002 SuSE GmbH.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"PO-Revision-Date: 2002-06-17 14:33+0200\n"
+"Last-Translator: www.linuxbutikken.no <roy@bytek.no>\n"
+"Language-Team: Norwegian <i18n@suse.de>\n"
+"Language: no\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 of the GNU General
+#. Public License as published by the Free Software Foundation.
+#. This program is distributed in the hope that it will be useful,
+#. but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.   See the
+#. GNU General Public License for more details.
+#. You should have received a copy of the GNU General Public License
+#. along with this program; if not, contact SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/iochannel/channels_dialog.rb:125
+#, fuzzy
+#| msgid "Available Interfaces"
+msgid "Available Input/Output Channels"
+msgstr "Tilgjengelige grensesnitt"
+
+#: src/lib/iochannel/channels_dialog.rb:132
+msgid "Device"
+msgstr "Enhet"
+
+#: src/lib/iochannel/channels_dialog.rb:132
+msgid "Used"
+msgstr "Brukt"
+
+#: src/lib/iochannel/channels_dialog.rb:142
+msgid "no"
+msgstr "nei"
+
+#: src/lib/iochannel/channels_dialog.rb:142
+msgid "yes"
+msgstr "ja"
+
+#. filter can be empty if dialog is not yet created
+#: src/lib/iochannel/channels_dialog.rb:160
+#, fuzzy
+#| msgid "Fiber channel"
+msgid "Filter channels"
+msgstr "Fiberkanal"
+
+#: src/lib/iochannel/channels_dialog.rb:162
+msgid "&Select All"
+msgstr "Velg &alle"
+
+#: src/lib/iochannel/channels_dialog.rb:163
+#, fuzzy
+#| msgid "&Detailed selection..."
+msgid "&Clear selection"
+msgstr "&Detaljert valg..."
+
+#: src/lib/iochannel/channels_dialog.rb:164
+#, fuzzy
+#| msgid "&All Selected Packages"
+msgid "&Blacklist Selected Channels"
+msgstr "&Alle valgte pakker"
+
+#: src/lib/iochannel/channels_dialog.rb:165
+#, fuzzy
+#| msgid "&Scan the Channels"
+msgid "&Unban Channels"
+msgstr "&Søk etter kanaler"
+
+#: src/lib/iochannel/channels_dialog.rb:170
+#, fuzzy
+#| msgid "Exit"
+msgid "&Exit"
+msgstr "Avslutt"
+
+#. TRANSLATORS: %s stands for the smallest snippet inside which we detect syntax error
+#: src/lib/iochannel/unban_dialog.rb:80
+msgid "Specified range is invalid. Wrong value is inside snippet '%s'"
+msgstr ""
+
+#: src/lib/iochannel/unban_dialog.rb:101
+msgid "Unban Input/Output Channels"
+msgstr ""
+
+#: src/lib/iochannel/unban_dialog.rb:106
+msgid ""
+"List of ranges of channels to unban separated by comma.\n"
+"Range can be channel, part of channel which will be filled to zero or range specified with dash.\n"
+"Example value: 0.0.0001, AA00, 0.1.0100-200"
+msgstr ""
+
+#: src/lib/iochannel/unban_dialog.rb:110
+msgid "Ranges to Unban."
+msgstr ""

Modified: trunk/yast/nb/po/cluster.nb.po
===================================================================
--- trunk/yast/nb/po/cluster.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/cluster.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2002-06-17 14:33+0200\n"
 "Last-Translator: www.linuxbutikken.no <roy@bytek.no>\n"
 "Language-Team: Norwegian <i18n@suse.de>\n"
@@ -80,201 +80,205 @@
 msgstr "Sett opp Csync2"
 
 #. return `cancel or a string
-#: src/include/cluster/dialogs.rb:83 src/include/cluster/dialogs.rb:118
+#: src/include/cluster/dialogs.rb:85 src/include/cluster/dialogs.rb:120
 msgid "OK"
 msgstr "OK"
 
-#: src/include/cluster/dialogs.rb:84 src/include/cluster/dialogs.rb:119
+#: src/include/cluster/dialogs.rb:86 src/include/cluster/dialogs.rb:121
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. BNC#871970, change member address struct
-#: src/include/cluster/dialogs.rb:109
+#: src/include/cluster/dialogs.rb:111
 #, fuzzy
 #| msgid "Member Address:"
 msgid "IP Address"
 msgstr "Medlemsadresse:"
 
-#: src/include/cluster/dialogs.rb:111
+#: src/include/cluster/dialogs.rb:113
 #, fuzzy
 #| msgid "Member Address:"
 msgid "Redundant IP Address"
 msgstr "Medlemsadresse:"
 
-#: src/include/cluster/dialogs.rb:113
+#: src/include/cluster/dialogs.rb:115
 msgid "nodeid"
 msgstr ""
 
 #. BNC#871970, change member address struct to memberaddr
-#: src/include/cluster/dialogs.rb:386
+#: src/include/cluster/dialogs.rb:439
 msgid "Transport:"
 msgstr "Transport:"
 
-#: src/include/cluster/dialogs.rb:391
+#: src/include/cluster/dialogs.rb:444
 msgid "Channel"
 msgstr "Kanal"
 
-#: src/include/cluster/dialogs.rb:396 src/include/cluster/dialogs.rb:417
+#: src/include/cluster/dialogs.rb:449 src/include/cluster/dialogs.rb:470
 msgid "Bind Network Address:"
 msgstr "Bind-nettverksadresse:"
 
-#: src/include/cluster/dialogs.rb:402 src/include/cluster/dialogs.rb:420
-#: src/include/cluster/dialogs.rb:1334
+#: src/include/cluster/dialogs.rb:455 src/include/cluster/dialogs.rb:473
+#: src/include/cluster/dialogs.rb:1396
 msgid "Multicast Address:"
 msgstr "Multikastadresse:"
 
-#: src/include/cluster/dialogs.rb:404 src/include/cluster/dialogs.rb:421
+#: src/include/cluster/dialogs.rb:457 src/include/cluster/dialogs.rb:474
 msgid "Multicast Port:"
 msgstr "Multikastport:"
 
-#: src/include/cluster/dialogs.rb:411
+#: src/include/cluster/dialogs.rb:464
 msgid "Redundant Channel"
 msgstr "Redundanskanal"
 
-#: src/include/cluster/dialogs.rb:427
+#: src/include/cluster/dialogs.rb:480
 #, fuzzy
 #| msgid "Cluster"
 msgid "Cluster Name:"
 msgstr "Klynge"
 
-#: src/include/cluster/dialogs.rb:428
-msgid "expected votes:"
-msgstr ""
+#: src/include/cluster/dialogs.rb:481
+#, fuzzy
+#| msgid "Expected MD5: %1"
+msgid "Expected Votes:"
+msgstr "Forventet MD5: %1"
 
-#: src/include/cluster/dialogs.rb:432
+#: src/include/cluster/dialogs.rb:485
 msgid "rrp mode:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:437
+#: src/include/cluster/dialogs.rb:490
 msgid "Auto Generate Node ID"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:442
+#: src/include/cluster/dialogs.rb:495
 msgid "Member Address:"
 msgstr "Medlemsadresse:"
 
-#. Changewidget items will change value to first one automatically
-#: src/include/cluster/dialogs.rb:671
+#. Notice, current could be "nil" if the list is empty.
+#: src/include/cluster/dialogs.rb:731
 msgid "Enable Security Auth"
 msgstr "Aktiver sikkerhetsautorisasjon"
 
-#: src/include/cluster/dialogs.rb:674
+#: src/include/cluster/dialogs.rb:734
 msgid "Threads:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:677
-msgid "For newly created cluster, push the button below to generate /etc/corosync/authkey."
+#: src/include/cluster/dialogs.rb:737
+#, 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:682
+#: src/include/cluster/dialogs.rb:742
 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:787 src/include/cluster/dialogs.rb:857
+#: src/include/cluster/dialogs.rb:847 src/include/cluster/dialogs.rb:917
 msgid "Running"
 msgstr "Kjører"
 
-#: src/include/cluster/dialogs.rb:789
+#: src/include/cluster/dialogs.rb:849
 msgid "Not running"
 msgstr "Kjører ikke"
 
 #. servie:cluster is the  name of /etc/sysconfig/SuSEfirewall2.d/services/cluster
-#: src/include/cluster/dialogs.rb:825
+#: src/include/cluster/dialogs.rb:885
 msgid "Booting"
 msgstr "Oppstart"
 
-#: src/include/cluster/dialogs.rb:835
+#: src/include/cluster/dialogs.rb:895
 #, fuzzy
 #| msgid "On -- Start openais at booting"
 msgid "On -- Start pacemaker at booting"
 msgstr "På -- Start openais ved oppstart"
 
-#: src/include/cluster/dialogs.rb:842
+#: src/include/cluster/dialogs.rb:902
 #, fuzzy
 #| msgid "Off -- Start openais manually only"
 msgid "Off -- Start pacemaker manually only"
 msgstr "Av -- Start openais manuelt"
 
-#: src/include/cluster/dialogs.rb:851
+#: src/include/cluster/dialogs.rb:911
 msgid "Switch On and Off"
 msgstr "Aktivere og deaktivere"
 
-#: src/include/cluster/dialogs.rb:856
+#: src/include/cluster/dialogs.rb:916
 msgid "Current Status: "
 msgstr "Gjeldende status: "
 
-#: src/include/cluster/dialogs.rb:865
+#: src/include/cluster/dialogs.rb:925
 #, fuzzy
 #| msgid "Start openais Now"
 msgid "Start pacemaker Now"
 msgstr "Start openais nå"
 
-#: src/include/cluster/dialogs.rb:866
+#: src/include/cluster/dialogs.rb:926
 #, 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:962
+#: src/include/cluster/dialogs.rb:1024
 msgid "Sync Host"
 msgstr "Synkroniseringsvert"
 
-#: src/include/cluster/dialogs.rb:966 src/include/cluster/dialogs.rb:978
+#: src/include/cluster/dialogs.rb:1028 src/include/cluster/dialogs.rb:1040
 msgid "Add"
 msgstr "Legg til"
 
-#: src/include/cluster/dialogs.rb:967 src/include/cluster/dialogs.rb:979
+#: src/include/cluster/dialogs.rb:1029 src/include/cluster/dialogs.rb:1041
 msgid "Del"
 msgstr "Slett"
 
-#: src/include/cluster/dialogs.rb:968 src/include/cluster/dialogs.rb:980
+#: src/include/cluster/dialogs.rb:1030 src/include/cluster/dialogs.rb:1042
 msgid "Edit"
 msgstr "Rediger"
 
-#: src/include/cluster/dialogs.rb:974
+#: src/include/cluster/dialogs.rb:1036
 msgid "Sync File"
 msgstr "Synkroniseringsfil"
 
-#: src/include/cluster/dialogs.rb:981
+#: src/include/cluster/dialogs.rb:1043
 msgid "Add Suggested Files"
 msgstr "Legg til foreslåtte filer"
 
-#: src/include/cluster/dialogs.rb:990
+#: src/include/cluster/dialogs.rb:1052
 msgid "Generate Pre-Shared-Keys"
 msgstr "Generer forhåndsdelte nøkler"
 
 #. remove duplicated elements
-#: src/include/cluster/dialogs.rb:1114
+#: src/include/cluster/dialogs.rb:1176
 msgid "Csync2 Status Unknown"
 msgstr "Ukjent Csync2-status"
 
-#: src/include/cluster/dialogs.rb:1117
+#: src/include/cluster/dialogs.rb:1179
 msgid "Turn csync2 ON"
 msgstr "Slå PÅ csync2"
 
-#: src/include/cluster/dialogs.rb:1120
+#: src/include/cluster/dialogs.rb:1182
 msgid "Turn csync2 OFF"
 msgstr "Slå AV csync2"
 
-#: src/include/cluster/dialogs.rb:1150
+#: src/include/cluster/dialogs.rb:1212
 msgid "Enter a hostname"
 msgstr "Angi et vertsnavn."
 
-#: src/include/cluster/dialogs.rb:1164
+#: src/include/cluster/dialogs.rb:1226
 msgid "Edit the hostname"
 msgstr "Endre vertsnavn"
 
-#: src/include/cluster/dialogs.rb:1178
+#: src/include/cluster/dialogs.rb:1240
 msgid "Enter a filename to synchronize"
 msgstr "Angi et navnet på en fil som skal synkroniseres"
 
-#: src/include/cluster/dialogs.rb:1193
+#: src/include/cluster/dialogs.rb:1255
 msgid "Edit the filename"
 msgstr "Endre filnavn"
 
 #. key file exist
-#: src/include/cluster/dialogs.rb:1225
+#: src/include/cluster/dialogs.rb:1287
 msgid ""
 "Key file %1 already exist.\n"
 "Do you want to overwrite it?"
@@ -283,12 +287,12 @@
 "Vil du overskrive den?"
 
 #. remove exist key file
-#: src/include/cluster/dialogs.rb:1235
+#: src/include/cluster/dialogs.rb:1297
 msgid "Delete key file %1 failed."
 msgstr "Nøkkelfilen %1 kunne ikke slettes."
 
 #. generate key file
-#: src/include/cluster/dialogs.rb:1249
+#: src/include/cluster/dialogs.rb:1311
 msgid ""
 "Key file %1 is generated.\n"
 "Clicking \"Add Suggested Files\" button adds it to sync list."
@@ -296,31 +300,31 @@
 "Nøkkelfilen %1 er generert.\n"
 "Klikk på «Legg til foreslåtte filer» for å legge den til i synkroniseringslisten."
 
-#: src/include/cluster/dialogs.rb:1256
+#: src/include/cluster/dialogs.rb:1318
 msgid "Key generation failed."
 msgstr "Nøkkelen ble ikke genererert."
 
 #. SaveCsync2();
-#: src/include/cluster/dialogs.rb:1318
+#: src/include/cluster/dialogs.rb:1380
 msgid ""
 "Conntrackd is a daemon which helps to duplicate firewall status between cluster nodes.\n"
 "YaST can help to configure some basic aspects of conntrackd.\n"
 "You need to start it with the ocf:heartbeat:conntrackd."
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1329
+#: src/include/cluster/dialogs.rb:1391
 msgid "Dedicated Interface:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1332
+#: src/include/cluster/dialogs.rb:1394
 msgid "IP:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1335
+#: src/include/cluster/dialogs.rb:1397
 msgid "Group Number:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1339
+#: src/include/cluster/dialogs.rb:1401
 msgid "Generate /etc/conntrackd/conntrackd.conf"
 msgstr ""
 
@@ -340,6 +344,8 @@
 "<p><b><big>Member Address</big></b><br>This list specifies all the nodes in the cluster by IP address. This could be configurable when using udpu <br></p>\n"
 "<p><b><big>Node ID</big></b><br>This  configuration  option  is  optional  when  using  IPv4 and required when using IPv6.  This is a 32 bit value specifying the node identifier delivered to the cluster membership service.  If this is not specified with IPv4, the node id will be  determined from  the  32  bit  IP address the system to which the system is bound with ring identifier of 0.  The node identifier  value  of zero is reserved and should not be used.<br></p>\n"
 "<p><b><big>rrp_mode</big></b><br>This specifies the mode of redundant ring, which  may  be  none, active,  or  passive.   Active replication offers slightly lower latency from transmit to delivery in faulty network environments but  with less performance.  Passive replication may nearly double the speed of the totem  protocol  if  the  protocol  doesn't become  cpu bound.  The final option is none, in which case only one network interface will be used to operate the  totem  protocol.  If  only one interface directive is specified, none is automatically chosen.  If multiple interface directives  are  specified, only active or passive may be chosen.<br></p>\n"
+"<p><b><big>Expected votes</big></b><br>Expect vote number for voting quorum.  Will be automatically calculated when the nodelist {} section is present in corosync.conf or can be specified in the quorum {} section.<br></p>\n"
+"<p><b><big>Auto Generate Node ID</big></b><br>Nodeid is required when using IPv6. Auto node ID enabled will generate nodeid automatically.<br></p>\n"
 msgstr ""
 "<p><b><big>Bind-nettverksadresse</big></b><br>Dette angir adressen som den kjørbare openais-filen skal binde. Denne adressen skal alltid slutte med en null.   Hvis totem-trafikken skal rutes over 192.168.5.92, skal bind-nettverksadressen settes til 192.168.5.0.<br>Dette kan også være en IPV6-addresse, og i så fall vil IPV6-bli brukt. Da må hele adressen angis her, og det vil ikke være noe automatisk valg av et nettverksgrensesnitt med et spesifikt undernettverk som med IPv4. Hvis IPv6 benyttes, må det angis en node-ID.<br></p>\n"
 "<p><b><big>Multikastadresse</big></b><br>Dette er multikastadressen som brukes av den kjørbare openais-filen. Standardinnstillingen bør fungere for de fleste nettverk, men spør likevel nettverksadministratoren hvilken multikastadresse som skal brukes.  Unngå 224.x.x.x fordi dette er en «config»-multikastaddresse.<br>Dette kan også være en IPV6-multikastaddresse, og i så fall vil IPV6 bli benyttet.  Hvis IPv6 benyttes, må det angis en node-ID.</p>\n"
@@ -347,7 +353,7 @@
 "<p><b><big>Node-ID</big></b><br>Dette oppsettvalget er valgfritt for IPv4, men obligatorisk for IPv6.  Dette er en 32 bit-verdi som som angir nodeidentifikasjonen som formidles til tjenesten for klyngemedlemskap. Hvis dette ikke er angitt i et IPv4-system, vil noden bli beregnet ut fra IP-addressen (32 bit) som systemet er bundet til med ring-ID-en 0. Node-ID-en 0 (null) er reserrvert og bør ikke brukes.<br></p>\n"
 "<p><b><big>rrp_mode</big></b><br>Dette angir redundansringens modus, og kan være ingen, aktiv  eller  passiv. Aktiv replikasjone gir litt mindre forsinkelse fra sending til levering i nettverksmiljøer med feil, men ytelsen er lavere. Passiv replikasjon kan omtrent fordoble hastigheten for totem-protokollen hvis protollen ikke begrenses av cpu.  Det siste valget er «ingen», som innebærer at ingen nettverksgrensesnitt vil bli brukt for  totem-protokollen. Hvis det bare er angitt én anvisning om grensesnitt, vil ingen grensesnitt bli automatisk valgt. Hvis det finnes flere anvisninger om grensesnitt, må «aktiv» eller «passisv» velges.<br></p>\n"
 
-#: src/include/cluster/helps.rb:43
+#: src/include/cluster/helps.rb:45
 msgid ""
 "\n"
 "<p><b><big>Threads</big></b><br>This directive controls how many threads are used to encrypt and send multicast messages.  If secauth is off, the  protocol  will never  use  threaded  sending.  If secauth is on, this directive allows systems to be  configured  to  use  multiple  threads  to encrypt and send multicast messages.  A  thread  directive of 0 indicates that no threaded send should be used.  This mode offers best performance for non-SMP systems.  The default is 0. <br></p>\n"
@@ -357,7 +363,7 @@
 "<p><b><big>Tråder</big></b><br>Denne anvisningen styrer hvor mange tråder som benyttes for å kryptere og sende multikastmeldinger. Hvis sikker autorisasjon er deaktivert, vil protokollen aldri bruke trådet sending. Hvis sikker autorisasjon er aktivert, vil denne anvisningen gjøre at systemer kan settes opp for å bruke flere tråder for å kryptere og sende multikastmeldinger. Verdien 0 innebærer at ingen trådet sending skal brukes. Denne modusen gir best ytelse for ikke-SMP-systemer. Standardverdoem er 0. <br></p>\n"
 "<p><b><big>Aktiver sikker autorisasjon</big></b><br>Dette angir at HMAC/SHA1-autorisasjon skal benyttes for å autorisere alle meldinger. Det angir også at alle  data skal krypteres med kryperingsalgoritmen sober128 for å beskytte dem mot innsyn. Å aktivere dette valget legger til et filhode på 36 byte i alle meldinger som sendes via totem, noe som reduserer den totale hastigheten. Kryptering og autorisasjon bruker 75 % av CPU-syklusene i aisexec, målt med gprof når dette valget er aktivert. For  100 mbit-nettverk som overfører 1500  MTU-blokker: En hastighet på 9 mb/sek er mulig med 100 % cpu-utnyttelse hvis dette valget er aktivert på 3 ghz cpu-er.  En hastighet på 10 mb/sek er mulig med 20 % cpu-utnyttelse når dette valget er deaktivert på 3 ghz cpu-er. For  gig-e-nettverk som overfører store datablokker: En hastighet på 20 mb/sek er mulig når dette valget er aktivert på  3 ghz cpu-er.  En hastighet på 60 mb/sek er mulig når valget er deaktivert på 3 ghz cpu-e
 r. Standardinnstillingen er «aktivert». <br></p>\n"
 
-#: src/include/cluster/helps.rb:48
+#: src/include/cluster/helps.rb:50
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -366,7 +372,8 @@
 #| "\t\t\t"
 msgid ""
 "\n"
-"\t\t\t<p><b><big>Booting</big></b><br>Starting openais service during boot or not</p>\n"
+"\t\t\t<p><b><big>Booting</big></b><br>Starting corosync service during boot or not</p>\n"
+"\t\t\t<p><b><big>Firewall Settings</big></b><br>Enable the port when Firewall is enabled</p>\n"
 "\t\t\t"
 msgstr ""
 "\n"
@@ -374,7 +381,7 @@
 "\t\t\t<p><b><big>Start mgmtd</big></b><br>Mgmtd-nissen er en separat tjenestenisse. Den er nødvendig for det grafiske grensesnittet</p>\n"
 "\t\t\t"
 
-#: src/include/cluster/helps.rb:53
+#: src/include/cluster/helps.rb:56
 msgid ""
 "\n"
 "\t\t<p><b><big>Sync Host</big></b><br>The hostnames used here must be the local hostnames of the cluster nodes. That means you must use exactly the same string as printed out by the hostname command.</p>\n"
@@ -388,7 +395,7 @@
 "\t\t<p><b><big>Forhåndsdelte nøkler</big></b><br>Autorisasjonen utføres ved å bruke IP-adressene og og de forhåndsdelte nøklene i Csync2. Nøkkelfilen genereres med csync2 -k /etc/csync2/key_hagroup. Filen key_hagroup skal kopieres manuelt til alle medlemmene i klyngen etter at den er opprettet.</p>\n"
 "\t"
 
-#: src/include/cluster/helps.rb:60
+#: src/include/cluster/helps.rb:63
 msgid ""
 "\n"
 "\t\t<p><b><big>Dedicated Interface</big></b><br>A dedicated network interface for syncing. The interface must support multicast, and is UP for using. You may have to have it pre-configured. </p>\n"
@@ -399,7 +406,7 @@
 msgstr ""
 
 #. Read dialog help 1/2
-#: src/include/cluster/helps.rb:69
+#: src/include/cluster/helps.rb:72
 #, fuzzy
 #| msgid ""
 #| "<p><b><big>Initializing Cluster Configuration</big></b><br>\n"
@@ -412,7 +419,7 @@
 "</p>\n"
 
 #. Read dialog help 2/2
-#: src/include/cluster/helps.rb:73
+#: src/include/cluster/helps.rb:76
 msgid ""
 "<p><b><big>Aborting Initialization:</big></b><br>\n"
 "Safely abort the configuration utility by pressing <b>Abort</b> now.</p>\n"
@@ -421,7 +428,7 @@
 "Du kan trygt avbryte oppsettverktøyet ved å klikke <b>Avbryt</b> nå.</p>\n"
 
 #. Write dialog help 1/2
-#: src/include/cluster/helps.rb:77
+#: src/include/cluster/helps.rb:80
 #, fuzzy
 #| msgid ""
 #| "<p><b><big>Saving cluster Configuration</big></b><br>\n"
@@ -434,7 +441,7 @@
 "</p>\n"
 
 #. Write dialog help 2/2
-#: src/include/cluster/helps.rb:81
+#: src/include/cluster/helps.rb:84
 msgid ""
 "<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.\n"
@@ -457,103 +464,103 @@
 msgstr "Initialiserer ..."
 
 #. Cluster read dialog caption
-#: src/modules/Cluster.rb:384
+#: src/modules/Cluster.rb:395
 #, fuzzy
 #| msgid "Initializing Cluster Configuration"
 msgid "Initializing cluster Configuration"
 msgstr "Initialiserer klyngeoppsett"
 
 #. Progress stage 1/3
-#: src/modules/Cluster.rb:400
+#: src/modules/Cluster.rb:411
 msgid "Read the database"
 msgstr "Les databasen"
 
 #. Progress stage 2/3
-#: src/modules/Cluster.rb:402
+#: src/modules/Cluster.rb:413
 msgid "Read the previous settings"
 msgstr "Les tidligere innstillinger"
 
 #. Progress stage 3/3
-#: src/modules/Cluster.rb:404
+#: src/modules/Cluster.rb:415
 msgid "Read SuSEFirewall Settings"
 msgstr "Les brannmurinnstillinger"
 
 #. Progress step 1/3
-#: src/modules/Cluster.rb:408
+#: src/modules/Cluster.rb:419
 msgid "Reading the database..."
 msgstr "Leser databasen..."
 
 #. Progress step 2/3
-#: src/modules/Cluster.rb:410
+#: src/modules/Cluster.rb:421
 msgid "Reading the previous settings..."
 msgstr "Leser tidligere innstillinger..."
 
 #. Progress step 3/3
-#: src/modules/Cluster.rb:412
+#: src/modules/Cluster.rb:423
 msgid "Reading SuSEFirewall settings..."
 msgstr "Leser brannmurinnstillinger..."
 
 #. Progress finished
 #. Progress finished
-#: src/modules/Cluster.rb:414 src/modules/Cluster.rb:516
+#: src/modules/Cluster.rb:425 src/modules/Cluster.rb:527
 msgid "Finished"
 msgstr "Fullført"
 
-#: src/modules/Cluster.rb:429
+#: src/modules/Cluster.rb:440
 msgid "Cannot install required package"
 msgstr "Kan ikke installere nødvendig pakke"
 
 #. read database
-#: src/modules/Cluster.rb:438
+#: src/modules/Cluster.rb:449
 #, fuzzy
 #| msgid "Cannot load existing configuration."
 msgid "Cannot load existing configuration"
 msgstr "Kan ikke laste gjeldende oppsett."
 
 #. Error message
-#: src/modules/Cluster.rb:449
+#: src/modules/Cluster.rb:460
 msgid "Cannot read database1."
 msgstr "Kan ikke lese database1."
 
 #. Error message
-#: src/modules/Cluster.rb:457
+#: src/modules/Cluster.rb:468
 msgid "Cannot read database2."
 msgstr "Kan ikke lese database2."
 
 #. Error message
-#: src/modules/Cluster.rb:473
+#: src/modules/Cluster.rb:484
 msgid "Cannot detect devices."
 msgstr "Finner ingen enheter."
 
 #. Cluster read dialog caption
-#: src/modules/Cluster.rb:490
+#: src/modules/Cluster.rb:502
 #, fuzzy
 #| msgid "Saving Cluster Configuration"
 msgid "Saving cluster Configuration"
 msgstr "Lagrer klyngeoppsett"
 
 #. Progress stage 1/2
-#: src/modules/Cluster.rb:506
+#: src/modules/Cluster.rb:517
 msgid "Write the settings"
 msgstr "Lagre innstillingene"
 
 #. Progress stage 2/2
-#: src/modules/Cluster.rb:508
+#: src/modules/Cluster.rb:519
 msgid "Save changes to SuSEFirewall"
 msgstr "Lagre endringer i brannmuroppsett"
 
 #. Progress step 1/2
-#: src/modules/Cluster.rb:512
+#: src/modules/Cluster.rb:523
 msgid "Writing the settings..."
 msgstr "Lagrer innstillingene..."
 
 #. Progress step 2/2
-#: src/modules/Cluster.rb:514
+#: src/modules/Cluster.rb:525
 msgid "Saving changes to SuSEFirewall..."
 msgstr "Lagrer endringer i brannmuroppsett..."
 
 #. Error message
-#: src/modules/Cluster.rb:526
+#: src/modules/Cluster.rb:537
 msgid "Cannot write settings."
 msgstr "Kan ikke lagre innstillingene."
 

Modified: trunk/yast/nb/po/control-center.nb.po
===================================================================
--- trunk/yast/nb/po/control-center.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/control-center.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: control-center.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 08:16+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2007-07-25 10:48+0200\n"
 "Last-Translator: Rune Nordbøe Skillingstad <rune@skillingstad.no>\n"
 "Language-Team: Norwegian\n"

Modified: trunk/yast/nb/po/control.nb.po
===================================================================
--- trunk/yast/nb/po/control.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/control.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: control\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:39+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2009-10-01 12:19+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -24,754 +24,427 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.0\n"
 
-#: control/add-on-template_installation.glade:7
-msgid "Add-On Product Installation"
-msgstr "Installer tilleggsprodukt"
-
-#: control/add-on-template_installation.glade:15
-msgid "Language Installation"
-msgstr "Installer språk"
-
-#: control/control.SLED.glade:355
+#: control/control.SLES.glade.translations.glade:3
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "<p>\n"
+#| "The installation has completed successfully.\n"
+#| "Your system is ready for use.\n"
+#| "Click Finish to log in to the system.\n"
+#| "</p>\n"
+#| "<p>\n"
+#| "Please visit us at http://www.suse.com/.\n"
+#| "</p>\n"
+#| "\t"
 msgid ""
 "\n"
 "<p>\n"
 "The installation has completed successfully.\n"
 "Your system is ready for use.\n"
-"Click <b>Finish</b> to log in to the system.\n"
+"Click Finish to log in to the system.\n"
 "</p>\n"
 "<p>\n"
 "Please visit us at http://www.suse.com/.\n"
 "</p>\n"
-"\t"
+"        "
 msgstr ""
 "\n"
 "<p>\n"
 "Installasjonen er fullført.\n"
 "Systemet er klart til bruk.\n"
-"Klikk <b>Fullfør</b> for å logge på systemet.\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.SLED.glade:371 control/control.openSUSE.glade:429
-msgid "Initialization..."
-msgstr "Initialisering..."
-
-#: control/control.SLED.glade:372 control/control.openSUSE.glade:430
-msgid "Configuring network..."
-msgstr "Setter opp nettverk..."
-
-#: control/control.SLED.glade:373 control/control.openSUSE.glade:431
-msgid "Configuring hardware..."
-msgstr "Setter opp maskinvare..."
-
-#: control/control.SLED.glade:374 control/control.openSUSE.glade:432
-msgid "Finishing configuration..."
-msgstr "Fullfører oppsett..."
-
-#: control/control.SLED.glade:377 control/control.SLES-for-VMware.glade:319
-#: control/control.SLES.glade:343
+#: control/control.SLES.glade.translations.glade:14
 msgid "CIM Server"
 msgstr "CIM-server"
 
-#: control/control.SLED.glade:382 control/control.SLED.glade:493
-#: control/control.SLED.glade:771 control/control.SLED.glade:775
-#: control/control.SLED.glade:956 control/control.SLED.glade:997
-#: control/control.SLES-for-VMware.glade:324
-#: control/control.SLES-for-VMware.glade:412
-#: control/control.SLES-for-VMware.glade:530
-#: control/control.SLES-for-VMware.glade:551
-#: control/control.SLES-for-VMware.glade:886
-#: control/control.SLES-for-VMware.glade:890
-#: control/control.SLES-for-VMware.glade:1077
-#: control/control.SLES-for-VMware.glade:1118 control/control.SLES.glade:348
-#: control/control.SLES.glade:436 control/control.SLES.glade:554
-#: control/control.SLES.glade:575 control/control.SLES.glade:910
-#: control/control.SLES.glade:914 control/control.SLES.glade:1101
-#: control/control.SLES.glade:1142 control/control.glade:72
-#: control/control.glade:132 control/control.glade:464
-#: control/control.glade:508 control/control.openSUSE.glade:463
-#: control/control.openSUSE.glade:583 control/control.openSUSE.glade:895
-#: control/control.openSUSE.glade:899 control/control.openSUSE.glade:1071
-#: control/control.openSUSE.glade:1116
+#: control/control.SLES.glade.translations.glade:15
+#: control/control.SLES.glade.translations.glade:16
+#: control/control.SLES.glade.translations.glade:17
+#: control/control.SLES.glade.translations.glade:22
+#: control/control.SLES.glade.translations.glade:23
+#: control/control.SLES.glade.translations.glade:58
+#: control/control.SLES.glade.translations.glade:59
 msgid "Installation Settings"
 msgstr "Installasjonsinnstillinger"
 
-#: control/control.SLED.glade:436 control/control.SLES-for-VMware.glade:382
-#: control/control.SLES-for-VMware.glade:470 control/control.SLES.glade:406
-#: control/control.SLES.glade:494 control/control.glade:92
+#: control/control.SLES.glade.translations.glade:18
 msgid "Overview"
 msgstr "Oversikt"
 
-#: control/control.SLED.glade:444 control/control.SLES-for-VMware.glade:392
-#: control/control.SLES-for-VMware.glade:478 control/control.SLES.glade:416
-#: control/control.SLES.glade:502 control/control.glade:100
+#: control/control.SLES.glade.translations.glade:19
 msgid "Expert"
 msgstr "Avansert"
 
-#: control/control.SLED.glade:461 control/control.SLES-for-VMware.glade:497
-#: control/control.SLES.glade:521 control/control.openSUSE.glade:550
+#: control/control.SLES.glade.translations.glade:20
 msgid "Live Installation Settings"
 msgstr "Live-installasjonsinnstillinger"
 
-#: control/control.SLED.glade:478 control/control.SLES-for-VMware.glade:515
-#: control/control.SLES.glade:539 control/control.glade:117
-#: control/control.openSUSE.glade:568 control/control.openSUSE.glade:984
-#: control/control.openSUSE.glade:989
+#: control/control.SLES.glade.translations.glade:21
 msgid "Update Settings"
 msgstr "Oppdater innstillinger"
 
-#: control/control.SLED.glade:512 control/control.SLES-for-VMware.glade:570
-#: control/control.SLES-for-VMware.glade:613 control/control.SLES.glade:594
-#: control/control.SLES.glade:637 control/control.glade:153
-#: control/control.openSUSE.glade:601
+#: control/control.SLES.glade.translations.glade:24
+#: control/control.SLES.glade.translations.glade:25
 msgid "Network Configuration"
 msgstr "Nettverkskonfigurasjon"
 
-#: control/control.SLED.glade:559 control/control.SLED.glade:1212
-#: control/control.SLED.glade:1218 control/control.SLES-for-VMware.glade:653
-#: control/control.SLES-for-VMware.glade:666
-#: control/control.SLES-for-VMware.glade:677
-#: control/control.SLES-for-VMware.glade:1350
-#: control/control.SLES-for-VMware.glade:1356
-#: control/control.SLES-for-VMware.glade:1362
-#: control/control.SLES-for-VMware.glade:1374 control/control.SLES.glade:677
-#: control/control.SLES.glade:690 control/control.SLES.glade:701
-#: control/control.SLES.glade:1374 control/control.SLES.glade:1380
-#: control/control.SLES.glade:1386 control/control.SLES.glade:1398
-#: control/control.glade:194 control/control.glade:692
-#: control/control.glade:697 control/control.glade:701
-#: control/control.openSUSE.glade:643 control/control.openSUSE.glade:1305
-#: control/control.openSUSE.glade:1311
+#: control/control.SLES.glade.translations.glade:26
+msgid "Network Services Configuration"
+msgstr "Oppsett av nettverkstjenester"
+
+#: control/control.SLES.glade.translations.glade:27
+#: control/control.SLES.glade.translations.glade:28
+#: control/control.SLES.glade.translations.glade:29
 msgid "Hardware Configuration"
 msgstr "Maskinvarekonfigurasjon"
 
-#: control/control.SLED.glade:579 control/control.SLED.glade:692
-#: control/control.SLED.glade:816 control/control.SLED.glade:926
-#: control/control.SLED.glade:1320 control/control.SLES-for-VMware.glade:695
-#: control/control.SLES-for-VMware.glade:807
-#: control/control.SLES-for-VMware.glade:931
-#: control/control.SLES-for-VMware.glade:1047
-#: control/control.SLES-for-VMware.glade:1486 control/control.SLES.glade:719
-#: control/control.SLES.glade:831 control/control.SLES.glade:955
-#: control/control.SLES.glade:1071 control/control.SLES.glade:1510
-#: control/control.glade:213 control/control.glade:313
-#: control/control.glade:416 control/control.openSUSE.glade:667
-#: control/control.openSUSE.glade:794 control/control.openSUSE.glade:937
-#: control/control.openSUSE.glade:1038 control/control.openSUSE.glade:1428
+#: control/control.SLES.glade.translations.glade:30
+#: control/control.SLES.glade.translations.glade:65
+#: control/control.SLES.glade.translations.glade:91
 msgid "Preparation"
 msgstr "Forberedelser"
 
-#: control/control.SLED.glade:585 control/control.SLED.glade:594
-#: control/control.SLED.glade:697 control/control.SLED.glade:739
-#: control/control.SLED.glade:822 control/control.SLED.glade:831
-#: control/control.SLES-for-VMware.glade:701
-#: control/control.SLES-for-VMware.glade:710
-#: control/control.SLES-for-VMware.glade:812
-#: control/control.SLES-for-VMware.glade:854
-#: control/control.SLES-for-VMware.glade:937
-#: control/control.SLES-for-VMware.glade:946 control/control.SLES.glade:725
-#: control/control.SLES.glade:734 control/control.SLES.glade:836
-#: control/control.SLES.glade:878 control/control.SLES.glade:961
-#: control/control.SLES.glade:970 control/control.glade:219
-#: control/control.glade:228 control/control.glade:237
-#: control/control.glade:319 control/control.glade:328
-#: control/control.glade:337 control/control.glade:449
-#: control/control.glade:493 control/control.openSUSE.glade:672
-#: control/control.openSUSE.glade:799 control/control.openSUSE.glade:841
-#: control/control.openSUSE.glade:943 control/control.openSUSE.glade:1066
-#: control/control.openSUSE.glade:1111
+#: control/control.SLES.glade.translations.glade:31
+#: control/control.SLES.glade.translations.glade:52
+#: control/control.SLES.glade.translations.glade:66
+#, fuzzy
+#| msgid "Saving Network Configuration"
+msgid "Load Linuxrc Network Configuration"
+msgstr "Lagrer nettverksoppsett"
+
+#: control/control.SLES.glade.translations.glade:32
+#: control/control.SLES.glade.translations.glade:53
+#: control/control.SLES.glade.translations.glade:67
+#, fuzzy
+#| msgid "Network Setup"
+msgid "Network Autosetup"
+msgstr "Nettverksinnstillinger"
+
+#: control/control.SLES.glade.translations.glade:33
+#: control/control.SLES.glade.translations.glade:54
+#: control/control.SLES.glade.translations.glade:68
 msgid "Welcome"
 msgstr "Velkommen"
 
-#: control/control.SLED.glade:600 control/control.SLES-for-VMware.glade:716
-#: control/control.SLES.glade:740 control/control.glade:343
-#: control/control.openSUSE.glade:682
+#: control/control.SLES.glade.translations.glade:34
+#: control/control.SLES.glade.translations.glade:55
+#: control/control.SLES.glade.translations.glade:69
 msgid "Network Activation"
 msgstr "Nettverksaktivering"
 
-#: control/control.SLED.glade:606 control/control.SLED.glade:707
-#: control/control.SLED.glade:837 control/control.SLES-for-VMware.glade:722
-#: control/control.SLES-for-VMware.glade:822
-#: control/control.SLES-for-VMware.glade:952 control/control.SLES.glade:746
-#: control/control.SLES.glade:846 control/control.SLES.glade:976
-#: control/control.glade:243 control/control.glade:349
-#: control/control.openSUSE.glade:686 control/control.openSUSE.glade:809
-#: control/control.openSUSE.glade:951
+#: control/control.SLES.glade.translations.glade:35
+#: control/control.SLES.glade.translations.glade:70
 msgid "Disk Activation"
 msgstr "Diskaktivering"
 
-#: control/control.SLED.glade:612 control/control.SLED.glade:618
-#: control/control.SLED.glade:711 control/control.SLED.glade:715
-#: control/control.SLED.glade:843 control/control.SLED.glade:849
-#: control/control.SLED.glade:1325 control/control.SLES-for-VMware.glade:728
-#: control/control.SLES-for-VMware.glade:734
-#: control/control.SLES-for-VMware.glade:826
-#: control/control.SLES-for-VMware.glade:830
-#: control/control.SLES-for-VMware.glade:958
-#: control/control.SLES-for-VMware.glade:964
-#: control/control.SLES-for-VMware.glade:1491 control/control.SLES.glade:752
-#: control/control.SLES.glade:758 control/control.SLES.glade:850
-#: control/control.SLES.glade:854 control/control.SLES.glade:982
-#: control/control.SLES.glade:988 control/control.SLES.glade:1515
-#: control/control.glade:249 control/control.glade:255
-#: control/control.glade:355 control/control.glade:361
-#: control/control.openSUSE.glade:690 control/control.openSUSE.glade:694
-#: control/control.openSUSE.glade:813 control/control.openSUSE.glade:817
-#: control/control.openSUSE.glade:955 control/control.openSUSE.glade:959
-#: control/control.openSUSE.glade:1433
+#: control/control.SLES.glade.translations.glade:36
+#: control/control.SLES.glade.translations.glade:37
+#: control/control.SLES.glade.translations.glade:71
+#: control/control.SLES.glade.translations.glade:92
 msgid "System Analysis"
 msgstr "Systemanalyse"
 
-#: control/control.SLED.glade:624 control/control.SLED.glade:865
-#: control/control.SLES-for-VMware.glade:740
-#: control/control.SLES-for-VMware.glade:980 control/control.SLES.glade:764
-#: control/control.SLES.glade:1004 control/control.glade:261
-#: control/control.glade:378 control/control.openSUSE.glade:704
-#: control/control.openSUSE.glade:975
+#: control/control.SLES.glade.translations.glade:38
+#: control/control.SLES.glade.translations.glade:73
 msgid "Add-On Products"
 msgstr "Tilleggsprodukter"
 
-#: control/control.SLED.glade:630 control/control.SLED.glade:749
-#: control/control.SLES-for-VMware.glade:746
-#: control/control.SLES-for-VMware.glade:864 control/control.SLES.glade:770
-#: control/control.SLES.glade:888 control/control.glade:267
-#: control/control.openSUSE.glade:709 control/control.openSUSE.glade:861
+#: control/control.SLES.glade.translations.glade:39
+#: control/control.SLES.glade.translations.glade:56
+msgid "Disk"
+msgstr "Disk"
+
+#: control/control.SLES.glade.translations.glade:40
+#: control/control.SLES.glade.translations.glade:57
 msgid "Time Zone"
 msgstr "Tidssone"
 
-#: control/control.SLED.glade:647 control/control.SLED.glade:651
-#: control/control.SLED.glade:763 control/control.SLED.glade:767
-#: control/control.SLES-for-VMware.glade:878
-#: control/control.SLES-for-VMware.glade:882 control/control.SLES.glade:902
-#: control/control.SLES.glade:906 control/control.openSUSE.glade:735
-#: control/control.openSUSE.glade:739 control/control.openSUSE.glade:875
-#: control/control.openSUSE.glade:879
-msgid "User Settings"
-msgstr "Brukerinnstillinger"
+#: control/control.SLES.glade.translations.glade:41
+#: control/control.SLES.glade.translations.glade:51
+msgid "Installation"
+msgstr "Installasjon"
 
-#: control/control.SLED.glade:655 control/control.openSUSE.glade:747
-msgid "Installation Overview"
-msgstr "Installasjonsoversikt"
+#: control/control.SLES.glade.translations.glade:42
+msgid "Installation Summary"
+msgstr "Installasjonssammendrag"
 
-#: control/control.SLED.glade:662 control/control.SLED.glade:666
-#: control/control.SLED.glade:670 control/control.SLED.glade:674
-#: control/control.SLED.glade:678 control/control.SLED.glade:781
-#: control/control.SLED.glade:785 control/control.SLED.glade:791
-#: control/control.SLED.glade:795 control/control.SLED.glade:799
-#: control/control.SLED.glade:805 control/control.SLED.glade:963
-#: control/control.SLED.glade:967 control/control.SLED.glade:971
-#: control/control.SLED.glade:975 control/control.SLED.glade:1004
-#: control/control.SLED.glade:1008 control/control.SLED.glade:1012
-#: control/control.SLED.glade:1016 control/control.SLED.glade:1290
-#: control/control.SLED.glade:1294 control/control.SLED.glade:1298
-#: control/control.SLED.glade:1302 control/control.SLED.glade:1306
-#: control/control.SLED.glade:1310 control/control.SLED.glade:1414
-#: control/control.SLED.glade:1418 control/control.SLED.glade:1422
-#: control/control.SLES-for-VMware.glade:772
-#: control/control.SLES-for-VMware.glade:776
-#: control/control.SLES-for-VMware.glade:780
-#: control/control.SLES-for-VMware.glade:784
-#: control/control.SLES-for-VMware.glade:789
-#: control/control.SLES-for-VMware.glade:794
-#: control/control.SLES-for-VMware.glade:896
-#: control/control.SLES-for-VMware.glade:900
-#: control/control.SLES-for-VMware.glade:906
-#: control/control.SLES-for-VMware.glade:910
-#: control/control.SLES-for-VMware.glade:914
-#: control/control.SLES-for-VMware.glade:920
-#: control/control.SLES-for-VMware.glade:1084
-#: control/control.SLES-for-VMware.glade:1088
-#: control/control.SLES-for-VMware.glade:1092
-#: control/control.SLES-for-VMware.glade:1096
-#: control/control.SLES-for-VMware.glade:1125
-#: control/control.SLES-for-VMware.glade:1129
-#: control/control.SLES-for-VMware.glade:1133
-#: control/control.SLES-for-VMware.glade:1137
-#: control/control.SLES-for-VMware.glade:1450
-#: control/control.SLES-for-VMware.glade:1454
-#: control/control.SLES-for-VMware.glade:1458
-#: control/control.SLES-for-VMware.glade:1462
-#: control/control.SLES-for-VMware.glade:1466
-#: control/control.SLES-for-VMware.glade:1471
-#: control/control.SLES-for-VMware.glade:1476
-#: control/control.SLES-for-VMware.glade:1580
-#: control/control.SLES-for-VMware.glade:1584
-#: control/control.SLES-for-VMware.glade:1588 control/control.SLES.glade:796
-#: control/control.SLES.glade:800 control/control.SLES.glade:804
-#: control/control.SLES.glade:808 control/control.SLES.glade:813
-#: control/control.SLES.glade:818 control/control.SLES.glade:920
-#: control/control.SLES.glade:924 control/control.SLES.glade:930
-#: control/control.SLES.glade:934 control/control.SLES.glade:938
-#: control/control.SLES.glade:944 control/control.SLES.glade:1108
-#: control/control.SLES.glade:1112 control/control.SLES.glade:1116
-#: control/control.SLES.glade:1120 control/control.SLES.glade:1149
-#: control/control.SLES.glade:1153 control/control.SLES.glade:1157
-#: control/control.SLES.glade:1161 control/control.SLES.glade:1474
-#: control/control.SLES.glade:1478 control/control.SLES.glade:1482
-#: control/control.SLES.glade:1486 control/control.SLES.glade:1490
-#: control/control.SLES.glade:1495 control/control.SLES.glade:1500
-#: control/control.SLES.glade:1604 control/control.SLES.glade:1608
-#: control/control.SLES.glade:1612 control/control.glade:291
-#: control/control.glade:295 control/control.glade:299
-#: control/control.glade:303 control/control.glade:469
-#: control/control.glade:473 control/control.glade:477
-#: control/control.glade:513 control/control.glade:517
-#: control/control.glade:521 control/control.glade:612
-#: control/control.glade:620 control/control.glade:624
-#: control/control.glade:744 control/control.glade:748
-#: control/control.glade:752 control/control.glade:756
-#: control/control.glade:760 control/control.glade:777
-#: control/control.glade:785 control/control.glade:789
-#: control/control.glade:793 control/control.openSUSE.glade:754
-#: control/control.openSUSE.glade:758 control/control.openSUSE.glade:763
-#: control/control.openSUSE.glade:770 control/control.openSUSE.glade:774
-#: control/control.openSUSE.glade:780 control/control.openSUSE.glade:905
-#: control/control.openSUSE.glade:909 control/control.openSUSE.glade:913
-#: control/control.openSUSE.glade:917 control/control.openSUSE.glade:923
-#: control/control.openSUSE.glade:1078 control/control.openSUSE.glade:1082
-#: control/control.openSUSE.glade:1086 control/control.openSUSE.glade:1090
-#: control/control.openSUSE.glade:1123 control/control.openSUSE.glade:1127
-#: control/control.openSUSE.glade:1131 control/control.openSUSE.glade:1135
-#: control/control.openSUSE.glade:1393 control/control.openSUSE.glade:1397
-#: control/control.openSUSE.glade:1401 control/control.openSUSE.glade:1405
-#: control/control.openSUSE.glade:1409 control/control.openSUSE.glade:1413
-#: control/control.openSUSE.glade:1417 control/control.openSUSE.glade:1522
-#: control/control.openSUSE.glade:1526 control/control.openSUSE.glade:1530
+#: control/control.SLES.glade.translations.glade:43
+#: control/control.SLES.glade.translations.glade:44
+#: control/control.SLES.glade.translations.glade:45
+#: control/control.SLES.glade.translations.glade:46
+#: control/control.SLES.glade.translations.glade:47
+#: control/control.SLES.glade.translations.glade:48
+#: control/control.SLES.glade.translations.glade:49
+#: control/control.SLES.glade.translations.glade:50
+#: control/control.SLES.glade.translations.glade:60
+#: control/control.SLES.glade.translations.glade:61
+#: control/control.SLES.glade.translations.glade:62
+#: control/control.SLES.glade.translations.glade:63
+#: control/control.SLES.glade.translations.glade:64
+#: control/control.SLES.glade.translations.glade:85
+#: control/control.SLES.glade.translations.glade:86
+#: control/control.SLES.glade.translations.glade:87
+#: control/control.SLES.glade.translations.glade:88
+#: control/control.SLES.glade.translations.glade:89
+#: control/control.SLES.glade.translations.glade:90
+#: control/control.SLES.glade.translations.glade:105
+#: control/control.SLES.glade.translations.glade:106
+#: control/control.SLES.glade.translations.glade:107
 msgid "Perform Installation"
 msgstr "Utfør installasjon"
 
-#: control/control.SLED.glade:720 control/control.SLES-for-VMware.glade:835
-#: control/control.SLES.glade:859 control/control.openSUSE.glade:822
-msgid "Repair"
-msgstr "Reparer"
-
-#: control/control.SLED.glade:734 control/control.SLES-for-VMware.glade:756
-#: control/control.SLES-for-VMware.glade:849 control/control.SLES.glade:780
-#: control/control.SLES.glade:873 control/control.glade:283
-#: control/control.openSUSE.glade:744 control/control.openSUSE.glade:836
-msgid "Installation"
-msgstr "Installasjon"
-
-#: control/control.SLED.glade:757 control/control.SLES-for-VMware.glade:872
-#: control/control.SLES.glade:896 control/control.openSUSE.glade:729
-#: control/control.openSUSE.glade:869
-msgid "Disk"
-msgstr "Disk"
-
-#: control/control.SLED.glade:855 control/control.SLED.glade:1331
-#: control/control.SLES-for-VMware.glade:970
-#: control/control.SLES-for-VMware.glade:1497 control/control.SLES.glade:994
-#: control/control.SLES.glade:1521 control/control.glade:367
-#: control/control.openSUSE.glade:963 control/control.openSUSE.glade:1439
+#: control/control.SLES.glade.translations.glade:72
+#: control/control.SLES.glade.translations.glade:93
 msgid "System for Update"
 msgstr "System som skal oppgraderes"
 
-#: control/control.SLED.glade:872 control/control.SLED.glade:1348
-#: control/control.SLES-for-VMware.glade:987
-#: control/control.SLES-for-VMware.glade:1514 control/control.SLES.glade:1011
-#: control/control.SLES.glade:1538 control/control.glade:385
-#: control/control.openSUSE.glade:981 control/control.openSUSE.glade:1456
+#: control/control.SLES.glade.translations.glade:74
+#: control/control.SLES.glade.translations.glade:96
 msgid "Update"
 msgstr "Oppgradering"
 
-#: control/control.SLED.glade:875 control/control.SLED.glade:880
-#: control/control.SLES-for-VMware.glade:990
-#: control/control.SLES-for-VMware.glade:995 control/control.SLES.glade:1014
-#: control/control.SLES.glade:1019 control/control.glade:388
+#: control/control.SLES.glade.translations.glade:75
 msgid "Update Summary"
 msgstr "Oppgraderingssammendrag"
 
-#. FATE #304940: s390 reIPL
-#: control/control.SLED.glade:890 control/control.SLED.glade:899
-#: control/control.SLED.glade:903 control/control.SLED.glade:907
-#: control/control.SLED.glade:911 control/control.SLED.glade:915
-#: control/control.SLED.glade:1032 control/control.SLED.glade:1359
-#: control/control.SLED.glade:1364 control/control.SLED.glade:1369
-#: control/control.SLED.glade:1375 control/control.SLED.glade:1379
-#: control/control.SLED.glade:1383 control/control.SLED.glade:1387
-#: control/control.SLED.glade:1392 control/control.SLED.glade:1397
-#: control/control.SLED.glade:1450 control/control.SLED.glade:1454
-#: control/control.SLES-for-VMware.glade:1005
-#: control/control.SLES-for-VMware.glade:1014
-#: control/control.SLES-for-VMware.glade:1018
-#: control/control.SLES-for-VMware.glade:1022
-#: control/control.SLES-for-VMware.glade:1026
-#: control/control.SLES-for-VMware.glade:1031
-#: control/control.SLES-for-VMware.glade:1036
-#: control/control.SLES-for-VMware.glade:1153
-#: control/control.SLES-for-VMware.glade:1525
-#: control/control.SLES-for-VMware.glade:1530
-#: control/control.SLES-for-VMware.glade:1535
-#: control/control.SLES-for-VMware.glade:1541
-#: control/control.SLES-for-VMware.glade:1545
-#: control/control.SLES-for-VMware.glade:1549
-#: control/control.SLES-for-VMware.glade:1553
-#: control/control.SLES-for-VMware.glade:1558
-#: control/control.SLES-for-VMware.glade:1563
-#: control/control.SLES-for-VMware.glade:1617
-#: control/control.SLES-for-VMware.glade:1621 control/control.SLES.glade:1029
-#: control/control.SLES.glade:1038 control/control.SLES.glade:1042
-#: control/control.SLES.glade:1046 control/control.SLES.glade:1050
-#: control/control.SLES.glade:1055 control/control.SLES.glade:1060
-#: control/control.SLES.glade:1177 control/control.SLES.glade:1549
-#: control/control.SLES.glade:1554 control/control.SLES.glade:1559
-#: control/control.SLES.glade:1565 control/control.SLES.glade:1569
-#: control/control.SLES.glade:1573 control/control.SLES.glade:1577
-#: control/control.SLES.glade:1582 control/control.SLES.glade:1587
-#: control/control.SLES.glade:1641 control/control.SLES.glade:1645
-#: control/control.glade:393 control/control.glade:397
-#: control/control.glade:401 control/control.glade:405
-#: control/control.glade:538 control/control.glade:546
-#: control/control.openSUSE.glade:999 control/control.openSUSE.glade:1008
-#: control/control.openSUSE.glade:1012 control/control.openSUSE.glade:1016
-#: control/control.openSUSE.glade:1020 control/control.openSUSE.glade:1026
-#: control/control.openSUSE.glade:1467 control/control.openSUSE.glade:1472
-#: control/control.openSUSE.glade:1477 control/control.openSUSE.glade:1483
-#: control/control.openSUSE.glade:1487 control/control.openSUSE.glade:1491
-#: control/control.openSUSE.glade:1495 control/control.openSUSE.glade:1500
-#: control/control.openSUSE.glade:1505 control/control.openSUSE.glade:1555
-#: control/control.openSUSE.glade:1559
+#: control/control.SLES.glade.translations.glade:76
+#: control/control.SLES.glade.translations.glade:77
+#: control/control.SLES.glade.translations.glade:78
+#: control/control.SLES.glade.translations.glade:79
+#: control/control.SLES.glade.translations.glade:80
+#: control/control.SLES.glade.translations.glade:98
+#: control/control.SLES.glade.translations.glade:99
+#: control/control.SLES.glade.translations.glade:100
+#: control/control.SLES.glade.translations.glade:101
+#: control/control.SLES.glade.translations.glade:102
+#: control/control.SLES.glade.translations.glade:103
+#: control/control.SLES.glade.translations.glade:104
+#: control/control.SLES.glade.translations.glade:110
+#: control/control.SLES.glade.translations.glade:111
 msgid "Perform Update"
 msgstr "Utfør oppgradering"
 
-#: control/control.SLED.glade:930 control/control.SLES-for-VMware.glade:1051
-#: control/control.SLES.glade:1075 control/control.glade:421
-#: control/control.glade:429 control/control.openSUSE.glade:1042
-msgid "System Information"
-msgstr "Systeminformasjon"
-
-#: control/control.SLED.glade:934 control/control.SLES-for-VMware.glade:1055
-#: control/control.SLES.glade:1079 control/control.glade:433
-#: control/control.openSUSE.glade:1046
-msgid "Perform Repair"
-msgstr "Utfør reparasjon"
-
-#: control/control.SLED.glade:945 control/control.SLED.glade:986
-#: control/control.SLED.glade:1262 control/control.SLES-for-VMware.glade:1066
-#: control/control.SLES-for-VMware.glade:1107
-#: control/control.SLES-for-VMware.glade:1422 control/control.SLES.glade:1090
-#: control/control.SLES.glade:1131 control/control.SLES.glade:1446
-#: control/control.glade:444 control/control.glade:488
-#: control/control.glade:709 control/control.openSUSE.glade:1060
-#: control/control.openSUSE.glade:1106 control/control.openSUSE.glade:1365
+#: control/control.SLES.glade.translations.glade:81
 msgid "Base Installation"
 msgstr "Grunninstallasjon"
 
-#: control/control.SLED.glade:951 control/control.SLED.glade:992
-#: control/control.SLES-for-VMware.glade:1072
-#: control/control.SLES-for-VMware.glade:1113 control/control.SLES.glade:1096
-#: control/control.SLES.glade:1137 control/control.glade:459
-#: control/control.glade:503
-msgid "Language"
-msgstr "Språk"
+#: control/control.SLES.glade.translations.glade:82
+#: control/control.SLES.glade.translations.glade:83
+#: control/control.SLES.glade.translations.glade:84
+#: control/control.SLES.glade.translations.glade:94
+#: control/control.SLES.glade.translations.glade:95
+#: control/control.SLES.glade.translations.glade:97
+msgid "AutoYaST Settings"
+msgstr "AutoYaST-innstillinger"
 
-#: control/control.SLED.glade:1038 control/control.SLED.glade:1107
-#: control/control.SLED.glade:1239 control/control.SLED.glade:1428
-#: control/control.SLED.glade:1460 control/control.SLES-for-VMware.glade:1159
-#: control/control.SLES-for-VMware.glade:1252
-#: control/control.SLES-for-VMware.glade:1399
-#: control/control.SLES-for-VMware.glade:1594
-#: control/control.SLES-for-VMware.glade:1627 control/control.SLES.glade:1183
-#: control/control.SLES.glade:1276 control/control.SLES.glade:1423
-#: control/control.SLES.glade:1618 control/control.SLES.glade:1651
-#: control/control.glade:551 control/control.glade:631
-#: control/control.glade:798 control/control.openSUSE.glade:1213
-#: control/control.openSUSE.glade:1332 control/control.openSUSE.glade:1536
-#: control/control.openSUSE.glade:1565
+#: control/control.SLES.glade.translations.glade:108
+#: control/control.SLES.glade.translations.glade:112
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#: control/control.SLED.glade:1041 control/control.SLED.glade:1048
-#: control/control.SLED.glade:1145 control/control.SLED.glade:1151
-#: control/control.SLED.glade:1155 control/control.SLES-for-VMware.glade:1162
-#: control/control.SLES-for-VMware.glade:1169
-#: control/control.SLES-for-VMware.glade:1284
-#: control/control.SLES-for-VMware.glade:1290
-#: control/control.SLES-for-VMware.glade:1294 control/control.SLES.glade:1186
-#: control/control.SLES.glade:1193 control/control.SLES.glade:1308
-#: control/control.SLES.glade:1314 control/control.SLES.glade:1318
-#: control/control.glade:554 control/control.glade:560
-#: control/control.glade:643 control/control.glade:648
-#: control/control.glade:652 control/control.openSUSE.glade:1254
-#: control/control.openSUSE.glade:1260 control/control.openSUSE.glade:1264
-msgid "Network"
-msgstr "Nettverk"
+#: control/control.SLES.glade.translations.glade:109
+#: control/control.SLES.glade.translations.glade:113
+msgid "System Configuration"
+msgstr "Systemkonfigurasjon"
 
-#: control/control.SLED.glade:1054 control/control.SLED.glade:1058
-#: control/control.SLED.glade:1159 control/control.SLED.glade:1163
-#: control/control.SLES-for-VMware.glade:1175
-#: control/control.SLES-for-VMware.glade:1179
-#: control/control.SLES-for-VMware.glade:1298
-#: control/control.SLES-for-VMware.glade:1302 control/control.SLES.glade:1199
-#: control/control.SLES.glade:1203 control/control.SLES.glade:1322
-#: control/control.SLES.glade:1326 control/control.glade:566
-#: control/control.glade:656
-msgid "Customer Center"
-msgstr "Kundesenter"
+#~ msgid "Add-On Product Installation"
+#~ msgstr "Installer tilleggsprodukt"
 
-#: control/control.SLED.glade:1064 control/control.SLED.glade:1070
-#: control/control.SLED.glade:1076 control/control.SLED.glade:1170
-#: control/control.SLED.glade:1176 control/control.SLED.glade:1180
-#: control/control.SLED.glade:1184 control/control.SLES-for-VMware.glade:1185
-#: control/control.SLES-for-VMware.glade:1191
-#: control/control.SLES-for-VMware.glade:1197
-#: control/control.SLES-for-VMware.glade:1308
-#: control/control.SLES-for-VMware.glade:1314
-#: control/control.SLES-for-VMware.glade:1318
-#: control/control.SLES-for-VMware.glade:1322 control/control.SLES.glade:1209
-#: control/control.SLES.glade:1215 control/control.SLES.glade:1221
-#: control/control.SLES.glade:1332 control/control.SLES.glade:1338
-#: control/control.SLES.glade:1342 control/control.SLES.glade:1346
-#: control/control.glade:572 control/control.glade:578
-#: control/control.glade:584 control/control.glade:662
-#: control/control.glade:668 control/control.glade:672
-#: control/control.glade:676 control/control.openSUSE.glade:1268
-#: control/control.openSUSE.glade:1272 control/control.openSUSE.glade:1276
-#: control/control.openSUSE.glade:1280 control/control.openSUSE.glade:1284
-msgid "Online Update"
-msgstr "Online-oppdatering"
+#~ msgid "Language Installation"
+#~ msgstr "Installer språk"
 
-#: control/control.SLED.glade:1083 control/control.SLED.glade:1208
-#: control/control.SLES-for-VMware.glade:1205
-#: control/control.SLES-for-VMware.glade:1346 control/control.SLES.glade:1229
-#: control/control.SLES.glade:1370 control/control.glade:588
-#: control/control.glade:688 control/control.openSUSE.glade:1301
-msgid "Release Notes"
-msgstr "Versjonsmerknader"
+#~ msgid ""
+#~ "\n"
+#~ "<p>\n"
+#~ "The installation has completed successfully.\n"
+#~ "Your system is ready for use.\n"
+#~ "Click <b>Finish</b> to log in to the system.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "Please visit us at http://www.suse.com/.\n"
+#~ "</p>\n"
+#~ "\t"
+#~ msgstr ""
+#~ "\n"
+#~ "<p>\n"
+#~ "Installasjonen er fullført.\n"
+#~ "Systemet er klart til bruk.\n"
+#~ "Klikk <b>Fullfør</b> for å logge på systemet.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "Besøk oss på http://www.suse.com/.\n"
+#~ "</p>\n"
+#~ "\t"
 
-#: control/control.SLED.glade:1110 control/control.SLED.glade:1242
-#: control/control.SLES-for-VMware.glade:1402 control/control.SLES.glade:1426
-#: control/control.openSUSE.glade:1221 control/control.openSUSE.glade:1335
-msgid "Automatic Configuration"
-msgstr "Automatisk oppsett"
+#~ msgid "Initialization..."
+#~ msgstr "Initialisering..."
 
-#: control/control.SLED.glade:1116 control/control.SLES-for-VMware.glade:1255
-#: control/control.SLES.glade:1279 control/control.openSUSE.glade:1227
-msgid "root Password"
-msgstr "Rotpassord"
+#~ msgid "Configuring network..."
+#~ msgstr "Setter opp nettverk..."
 
-#: control/control.SLED.glade:1121 control/control.SLED.glade:1127
-#: control/control.SLED.glade:1133 control/control.SLES-for-VMware.glade:1260
-#: control/control.SLES-for-VMware.glade:1266
-#: control/control.SLES-for-VMware.glade:1272 control/control.SLES.glade:1284
-#: control/control.SLES.glade:1290 control/control.SLES.glade:1296
-#: control/control.openSUSE.glade:1232 control/control.openSUSE.glade:1238
-#: control/control.openSUSE.glade:1244
-msgid "Check Installation"
-msgstr "Verifiser installasjon"
+#~ msgid "Configuring hardware..."
+#~ msgstr "Setter opp maskinvare..."
 
-#: control/control.SLED.glade:1139 control/control.SLES-for-VMware.glade:1278
-#: control/control.SLES.glade:1302 control/control.glade:639
-#: control/control.openSUSE.glade:1250
-msgid "Hostname"
-msgstr "Vertsnavn"
+#~ msgid "Finishing configuration..."
+#~ msgstr "Fullfører oppsett..."
 
-#: control/control.SLED.glade:1188 control/control.SLED.glade:1192
-#: control/control.SLES-for-VMware.glade:1332
-#: control/control.SLES-for-VMware.glade:1336 control/control.SLES.glade:1356
-#: control/control.SLES.glade:1360 control/control.glade:680
-#: control/control.glade:684 control/control.openSUSE.glade:1288
-#: control/control.openSUSE.glade:1292 control/control.openSUSE.glade:1342
-#: control/control.openSUSE.glade:1346
-msgid "Users"
-msgstr "Brukere"
+#~ msgid "User Settings"
+#~ msgstr "Brukerinnstillinger"
 
-#: control/control.SLED.glade:1271 control/control.SLED.glade:1277
-#: control/control.SLED.glade:1281 control/control.SLED.glade:1337
-#: control/control.SLED.glade:1343 control/control.SLED.glade:1351
-#: control/control.SLES-for-VMware.glade:1431
-#: control/control.SLES-for-VMware.glade:1437
-#: control/control.SLES-for-VMware.glade:1441
-#: control/control.SLES-for-VMware.glade:1503
-#: control/control.SLES-for-VMware.glade:1509
-#: control/control.SLES-for-VMware.glade:1517 control/control.SLES.glade:1455
-#: control/control.SLES.glade:1461 control/control.SLES.glade:1465
-#: control/control.SLES.glade:1527 control/control.SLES.glade:1533
-#: control/control.SLES.glade:1541 control/control.glade:719
-#: control/control.glade:727 control/control.glade:733
-#: control/control.glade:737 control/control.openSUSE.glade:1374
-#: control/control.openSUSE.glade:1380 control/control.openSUSE.glade:1384
-#: control/control.openSUSE.glade:1445 control/control.openSUSE.glade:1451
-#: control/control.openSUSE.glade:1459
-msgid "AutoYaST Settings"
-msgstr "AutoYaST-innstillinger"
+#~ msgid "Installation Overview"
+#~ msgstr "Installasjonsoversikt"
 
-#: control/control.SLED.glade:1431 control/control.SLED.glade:1463
-#: control/control.SLES-for-VMware.glade:1597
-#: control/control.SLES-for-VMware.glade:1630 control/control.SLES.glade:1621
-#: control/control.SLES.glade:1654 control/control.glade:801
-#: control/control.openSUSE.glade:1539 control/control.openSUSE.glade:1568
-msgid "System Configuration"
-msgstr "Systemkonfigurasjon"
+#~ msgid "Repair"
+#~ msgstr "Reparer"
 
-#: control/control.SLED.glade:1467 control/control.SLES-for-VMware.glade:1201
-#: control/control.SLES-for-VMware.glade:1340
-#: control/control.SLES-for-VMware.glade:1601
-#: control/control.SLES-for-VMware.glade:1634 control/control.SLES.glade:1225
-#: control/control.SLES.glade:1364 control/control.SLES.glade:1625
-#: control/control.SLES.glade:1658
-msgid "Clean Up"
-msgstr "Opprydding"
+#~ msgid "System Information"
+#~ msgstr "Systeminformasjon"
 
-#: control/control.SLES-for-VMware.glade:291 control/control.SLES.glade:314
-msgid ""
-"\n"
-"<p>\n"
-"The installation has completed successfully.\n"
-"Your system is ready for use.\n"
-"Click Finish to log in to the system.\n"
-"</p>\n"
-"<p>\n"
-"Please visit us at http://www.suse.com/.\n"
-"</p>\n"
-"\t"
-msgstr ""
-"\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 "Perform Repair"
+#~ msgstr "Utfør reparasjon"
 
-#: control/control.SLES-for-VMware.glade:307 control/control.SLES.glade:330
-msgid "Server Base Scenario"
-msgstr "Serverbase-scenario"
+#~ msgid "Language"
+#~ msgstr "Språk"
 
-#: control/control.SLES-for-VMware.glade:308 control/control.SLES.glade:331
-msgid ""
-"SUSE Linux Enterprise Server offers several base scenarios.\n"
-"Choose the one that matches your server the best."
-msgstr ""
-"SUSE Linux Enterprise Server tilbyr mange serverbase-scenarioer.\n"
-"Velg scenarioet som passer best for din server."
+#~ msgid "Network"
+#~ msgstr "Nettverk"
 
-#: control/control.SLES-for-VMware.glade:314 control/control.SLES.glade:337
-msgid "Physical Machine (Also for Fully Virtualized Guests)"
-msgstr "Fysisk maskin (også for helt virtualiserte gjester)"
+#~ msgid "Customer Center"
+#~ msgstr "Kundesenter"
 
-#: control/control.SLES-for-VMware.glade:315 control/control.SLES.glade:338
-msgid "Virtual Machine (For Paravirtualized Environments Like Xen)"
-msgstr "Virtuell maskin (for delvis virtualiserte miljøer som Xen)"
+#~ msgid "Online Update"
+#~ msgstr "Online-oppdatering"
 
-#: control/control.SLES-for-VMware.glade:316 control/control.SLES.glade:339
-msgid "Xen Virtualization Host (Local X11 Not Configured by Default)"
-msgstr "Xen-virtualiseringsvert (lokal X11 som ikke settes opp som standard)"
+#~ msgid "Release Notes"
+#~ msgstr "Versjonsmerknader"
 
-#: control/control.SLES-for-VMware.glade:639 control/control.SLES.glade:663
-msgid "Network Services Configuration"
-msgstr "Oppsett av nettverkstjenester"
+#~ msgid "Automatic Configuration"
+#~ msgstr "Automatisk oppsett"
 
-#: control/control.SLES-for-VMware.glade:760 control/control.SLES.glade:784
-msgid "Server Scenario"
-msgstr "Server-scenario"
+#~ msgid "root Password"
+#~ msgstr "Rotpassord"
 
-#: control/control.SLES-for-VMware.glade:765 control/control.SLES.glade:789
-#: control/control.glade:286
-msgid "Installation Summary"
-msgstr "Installasjonssammendrag"
+#~ msgid "Check Installation"
+#~ msgstr "Verifiser installasjon"
 
-#: control/control.SLES-for-VMware.glade:1326 control/control.SLES.glade:1350
-msgid "Service"
-msgstr "Tjeneste"
+#~ msgid "Hostname"
+#~ msgstr "Vertsnavn"
 
-#: control/control.SLES.glade:340
-msgid "KVM Virtualization Host (Local X11 Not Configured by Default)"
-msgstr "KVM-virtualiseringsvert (lokal X11 som ikke settes opp som standard)"
+#~ msgid "Users"
+#~ msgstr "Brukere"
 
-#: control/control.glade:276 control/control.openSUSE.glade:717
-msgid "Desktop Selection"
-msgstr "Skrivebordsvalg"
+#~ msgid "Clean Up"
+#~ msgstr "Opprydding"
 
-#: control/control.glade:634
-msgid "Root Password"
-msgstr "Rotpassord"
+#~ msgid "Server Base Scenario"
+#~ msgstr "Serverbase-scenario"
 
-#: control/control.openSUSE.glade:420
-msgid ""
-"\n"
-"<p><b>Congratulations!</b></p>\n"
-"<p>The installation of openSUSE on your machine is complete.\n"
-"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
-"<p>Visit us at %1.</p>\n"
-"<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
-"\t    "
-msgstr ""
-"\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"
+#~ msgid ""
+#~ "SUSE Linux Enterprise Server offers several base scenarios.\n"
+#~ "Choose the one that matches your server the best."
+#~ msgstr ""
+#~ "SUSE Linux Enterprise Server tilbyr mange serverbase-scenarioer.\n"
+#~ "Velg scenarioet som passer best for din server."
 
-#: control/control.openSUSE.glade:438
-msgid ""
-"The desktop environment on your computer provides the graphical user\n"
-"interface for your computer, as well as a suite of applications for\n"
-"email, Web browsing, office productivity, games, and utilities to\n"
-"manage your computer.\n"
-"\n"
-"openSUSE offers a choice of desktop environments.  The most widely\n"
-"used desktop environments are GNOME and KDE, and they are equally\n"
-"supported under openSUSE. Both desktop environments are easy to use,\n"
-"highly integrated, and have an attractive look and feel. Each desktop\n"
-"environment has a distinct style, so personal taste determines which\n"
-"is the most appropriate desktop for you."
-msgstr ""
-"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."
+#~ msgid "Physical Machine (Also for Fully Virtualized Guests)"
+#~ msgstr "Fysisk maskin (også for helt virtualiserte gjester)"
 
-#: control/control.openSUSE.glade:451
-msgid "GNOME Desktop"
-msgstr "GNOME-skrivebord"
+#~ msgid "Virtual Machine (For Paravirtualized Environments Like Xen)"
+#~ msgstr "Virtuell maskin (for delvis virtualiserte miljøer som Xen)"
 
-#: control/control.openSUSE.glade:452
-msgid "KDE Desktop"
-msgstr "KDE-skrivebord"
+#~ msgid "Xen Virtualization Host (Local X11 Not Configured by Default)"
+#~ msgstr "Xen-virtualiseringsvert (lokal X11 som ikke settes opp som standard)"
 
-#: control/control.openSUSE.glade:453
-msgid "XFCE Desktop"
-msgstr "XFCE-skrivebordet"
+#~ msgid "Server Scenario"
+#~ msgstr "Server-scenario"
 
-#: control/control.openSUSE.glade:454
-msgid "LXDE Desktop"
-msgstr "LXDE-skrivebord"
+#~ msgid "Service"
+#~ msgstr "Tjeneste"
 
-#: control/control.openSUSE.glade:455
-msgid "Minimal X Window"
-msgstr "Minimalt grafisk grensesnitt"
+#~ msgid "KVM Virtualization Host (Local X11 Not Configured by Default)"
+#~ msgstr "KVM-virtualiseringsvert (lokal X11 som ikke settes opp som standard)"
 
-#: control/control.openSUSE.glade:456
-msgid "Enlightenment Desktop"
-msgstr "Skrivebordsmiljøet Enlightenment"
+#~ msgid "Desktop Selection"
+#~ msgstr "Skrivebordsvalg"
 
-#: control/control.openSUSE.glade:457
-msgid "Minimal Server Selection (Text Mode)"
-msgstr "Server uten grafisk grensesnitt (tekstmodus)"
+#~ msgid "Root Password"
+#~ msgstr "Rotpassord"
 
-#: control/control.openSUSE.glade:699 control/control.openSUSE.glade:970
-msgid "Online Repositories"
-msgstr "online-pakkebrønner"
+#~ msgid ""
+#~ "\n"
+#~ "<p><b>Congratulations!</b></p>\n"
+#~ "<p>The installation of openSUSE on your machine is complete.\n"
+#~ "After clicking <b>Finish</b>, you can log in to the system.</p>\n"
+#~ "<p>Visit us at %1.</p>\n"
+#~ "<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
+#~ "\t    "
+#~ msgstr ""
+#~ "\n"
+#~ "<p><b>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"
 
 #~ 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."
+
+#~ msgid "GNOME Desktop"
+#~ msgstr "GNOME-skrivebord"
+
+#~ msgid "KDE Desktop"
+#~ msgstr "KDE-skrivebord"
+
+#~ msgid "XFCE Desktop"
+#~ msgstr "XFCE-skrivebordet"
+
+#~ msgid "LXDE Desktop"
+#~ msgstr "LXDE-skrivebord"
+
+#~ msgid "Minimal X Window"
+#~ msgstr "Minimalt grafisk grensesnitt"
+
+#~ msgid "Enlightenment Desktop"
+#~ msgstr "Skrivebordsmiljøet Enlightenment"
+
+#~ msgid "Minimal Server Selection (Text Mode)"
+#~ msgstr "Server uten grafisk grensesnitt (tekstmodus)"
+
+#~ msgid "Online Repositories"
+#~ msgstr "online-pakkebrønner"
+
+#~ msgid ""
+#~ "\n"
 #~ "<p><b>Congratulations!</b></p>\n"
 #~ "<p>The installation of &product; on your machine is complete.\n"
 #~ "After clicking <b>Finish</b>, you can log in to the system.</p>\n"

Modified: trunk/yast/nb/po/country.nb.po
===================================================================
--- trunk/yast/nb/po/country.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/country.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: country\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2009-10-08 12:44+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"

Modified: trunk/yast/nb/po/crowbar.nb.po
===================================================================
--- trunk/yast/nb/po/crowbar.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/crowbar.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:37+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2002-06-17 14:33+0200\n"
 "Last-Translator: www.linuxbutikken.no <roy@bytek.no>\n"
 "Language-Team: Norwegian <i18n@suse.de>\n"

Modified: trunk/yast/nb/po/dhcp-server.nb.po
===================================================================
--- trunk/yast/nb/po/dhcp-server.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/dhcp-server.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: dhcp-server.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:38+0200\n"
+"POT-Creation-Date: 2014-08-18 12:43+0000\n"
 "PO-Revision-Date: 2008-09-20 21:42+0200\n"
 "Last-Translator: Olav P. <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <>\n"
@@ -523,7 +523,7 @@
 #. TRANSLATORS: table header item
 #. Table header item - IP of the host
 #: src/include/dhcp-server/dialogs2.rb:455
-#: src/include/dhcp-server/dialogs2.rb:1651
+#: src/include/dhcp-server/dialogs2.rb:1650
 msgid "IP"
 msgstr "IP"
 
@@ -544,17 +544,21 @@
 
 #. TRANSLATORS: popup error, DHCP Server needs to run on one or more interfaces,
 #. currently no one is selected
-#: src/include/dhcp-server/dialogs2.rb:609
+#: src/include/dhcp-server/dialogs2.rb:608
 msgid "At least one network interface must be selected."
 msgstr "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:617
+#: src/include/dhcp-server/dialogs2.rb:616
+#, fuzzy
+#| msgid ""
+#| "The selected network interface is not configured (no assigned IP address \n"
+#| "and netmask). Using it in the DHCP server configuration may not work.\n"
+#| "Really use this interface?\n"
 msgid ""
-"The selected network interface is not configured (no assigned IP address \n"
-"and netmask). Using it in the DHCP server configuration may not work.\n"
-"Really use this interface?\n"
+"One or more selected network interfaces is not configured (no assigned IP address \n"
+"and netmask)."
 msgstr ""
 "Valgt nettverksgrensesnitt er ikke satt opp (ikke tilordnet IP-adresse \n"
 "og nettverksmaske). Det vil kanskje ikke kunne brukes i oppsettet for DHCP-serveren.\n"
@@ -562,60 +566,60 @@
 
 #. configuration will be saved in ldap?
 #. check box
-#: src/include/dhcp-server/dialogs2.rb:633
+#: src/include/dhcp-server/dialogs2.rb:632
 #: src/include/dhcp-server/widgets.rb:1079
 msgid "&LDAP Support"
 msgstr "&LDAP-støtte"
 
 #. FATE #227, comments #5 and #17
-#: src/include/dhcp-server/dialogs2.rb:640
+#: src/include/dhcp-server/dialogs2.rb:639
 msgid "DHCP Server &Name (optional)"
 msgstr "DHCP-server&navn (valgfritt)"
 
 #. Textentry with name of the domain
-#: src/include/dhcp-server/dialogs2.rb:653
+#: src/include/dhcp-server/dialogs2.rb:652
 msgid "&Domain Name"
 msgstr "&Domenenavn"
 
 #. Textentry with IP address of primary name server
-#: src/include/dhcp-server/dialogs2.rb:655
+#: src/include/dhcp-server/dialogs2.rb:654
 msgid "&Primary Name Server IP"
 msgstr "&Primær navneserver-IP"
 
 #. Textentry with IP address of secondary name server
-#: src/include/dhcp-server/dialogs2.rb:658
+#: src/include/dhcp-server/dialogs2.rb:657
 msgid "&Secondary Name Server IP"
 msgstr "&Sekundær navneserver-IP"
 
 #. Textentry with IP address of default router
-#: src/include/dhcp-server/dialogs2.rb:661
+#: src/include/dhcp-server/dialogs2.rb:660
 msgid "Default &Gateway (Router) "
 msgstr "Standard &systemport (ruter) "
 
 #. Textentry with IP address of time server
-#: src/include/dhcp-server/dialogs2.rb:666
+#: src/include/dhcp-server/dialogs2.rb:665
 msgid "NTP &Time Server"
 msgstr "NTP-&tidsserver"
 
 #. Textentry with IP address of print server
-#: src/include/dhcp-server/dialogs2.rb:668
+#: src/include/dhcp-server/dialogs2.rb:667
 msgid "&Print Server"
 msgstr "&Utskriftsserver"
 
 #. Textentry with IP address of WINS (Windows Internet Naming Service) server
-#: src/include/dhcp-server/dialogs2.rb:670
+#: src/include/dhcp-server/dialogs2.rb:669
 msgid "&WINS Server"
 msgstr "&WINS-server"
 
 #. Textentry with default lease time of IP address from dhcp server
-#: src/include/dhcp-server/dialogs2.rb:675
+#: src/include/dhcp-server/dialogs2.rb:674
 msgid "Default &Lease Time"
 msgstr "Standard tilde&lingstid"
 
 #. Units for defaultleasetime
 #. Combobox - type of units for lease time
-#: src/include/dhcp-server/dialogs2.rb:684
-#: src/include/dhcp-server/dialogs2.rb:1140
+#: src/include/dhcp-server/dialogs2.rb:683
+#: src/include/dhcp-server/dialogs2.rb:1139
 msgid "&Units"
 msgstr "&Enheter"
 
@@ -623,48 +627,48 @@
 #. error popup
 #. error popup
 #. error popup
-#: src/include/dhcp-server/dialogs2.rb:1018
-#: src/include/dhcp-server/dialogs2.rb:1030
-#: src/include/dhcp-server/dialogs2.rb:1042
-#: src/include/dhcp-server/dialogs2.rb:1054
+#: src/include/dhcp-server/dialogs2.rb:1017
+#: src/include/dhcp-server/dialogs2.rb:1029
+#: src/include/dhcp-server/dialogs2.rb:1041
+#: src/include/dhcp-server/dialogs2.rb:1053
 msgid "The specified value is not a valid hostname or IP address."
 msgstr "Den spesifiserte verdien er ikke et gyldig vertsnavn eller IP-adresse."
 
 #. frame
-#: src/include/dhcp-server/dialogs2.rb:1068
+#: src/include/dhcp-server/dialogs2.rb:1067
 msgid "Subnet Information"
 msgstr "Subnettkonfigurasjon"
 
 #. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1074
+#: src/include/dhcp-server/dialogs2.rb:1073
 msgid "Current &Network"
 msgstr "Gjeldende &nettverk"
 
 #. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1079
+#: src/include/dhcp-server/dialogs2.rb:1078
 msgid "Current Net&mask"
 msgstr "Gjeldende nettverks&maske"
 
 #. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1084
+#: src/include/dhcp-server/dialogs2.rb:1083
 msgid "Netmask Bi&ts"
 msgstr "Nettverksmaskebi&ts"
 
 #. text entry
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1091
+#: src/include/dhcp-server/dialogs2.rb:1090
 #: src/include/dhcp-server/dns-server-dialogs.rb:81
 msgid "Min&imum IP Address"
 msgstr "Laveste &IP-adresse"
 
 #. text entry
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1096
+#: src/include/dhcp-server/dialogs2.rb:1095
 #: src/include/dhcp-server/dns-server-dialogs.rb:83
 msgid "Ma&ximum IP Address"
 msgstr "Hø&yeste IP-adresse"
 
-#: src/include/dhcp-server/dialogs2.rb:1104
+#: src/include/dhcp-server/dialogs2.rb:1103
 msgid "IP Address Range"
 msgstr "IP-adresseområde"
 
@@ -672,7 +676,7 @@
 #. TRANSLATORS: text entry
 #. TRANSLATORS: text entry
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1110
+#: src/include/dhcp-server/dialogs2.rb:1109
 #: src/include/dhcp-server/dns-server-dialogs.rb:93
 #: src/include/dhcp-server/dns-server-management.rb:356
 #: src/include/dhcp-server/dns-server-management.rb:917
@@ -683,7 +687,7 @@
 #. TRANSLATORS: text entry
 #. TRANSLATORS: text entry
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1115
+#: src/include/dhcp-server/dialogs2.rb:1114
 #: src/include/dhcp-server/dns-server-dialogs.rb:95
 #: src/include/dhcp-server/dns-server-management.rb:358
 #: src/include/dhcp-server/dns-server-management.rb:919
@@ -691,53 +695,53 @@
 msgstr "&Siste IP-adresse"
 
 #. checkbox
-#: src/include/dhcp-server/dialogs2.rb:1119
+#: src/include/dhcp-server/dialogs2.rb:1118
 #: src/include/dhcp-server/options.rb:1094
 msgid "Allow Dynamic &BOOTP"
 msgstr "Tillat dynamisk &BOOTP"
 
 #. frame label
-#: src/include/dhcp-server/dialogs2.rb:1125
+#: src/include/dhcp-server/dialogs2.rb:1124
 msgid "Lease Time"
 msgstr "Tildelingstid"
 
 #. Textentry label - lease time for IPs in the range
-#: src/include/dhcp-server/dialogs2.rb:1131
+#: src/include/dhcp-server/dialogs2.rb:1130
 msgid "&Default"
 msgstr "&Standard"
 
 #. TextEntryLabel - max. time for leasing of IPs from the range
-#: src/include/dhcp-server/dialogs2.rb:1149
+#: src/include/dhcp-server/dialogs2.rb:1148
 msgid "&Maximum"
 msgstr "&Maks. tildelingstid"
 
 #. Combobox - type of units for max lease time
-#: src/include/dhcp-server/dialogs2.rb:1159
+#: src/include/dhcp-server/dialogs2.rb:1158
 msgid "Uni&ts"
 msgstr "Enhe&ter"
 
 #. zone is not maintained by the DNS server
 #. zone is maintained and it is a 'master'
-#: src/include/dhcp-server/dialogs2.rb:1361
-#: src/include/dhcp-server/dialogs2.rb:1370
+#: src/include/dhcp-server/dialogs2.rb:1360
+#: src/include/dhcp-server/dialogs2.rb:1369
 msgid "Create New DNS Zone from Scratch"
 msgstr "Opprett ny DNS-sone"
 
-#: src/include/dhcp-server/dialogs2.rb:1372
+#: src/include/dhcp-server/dialogs2.rb:1371
 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:1378
+#: src/include/dhcp-server/dialogs2.rb:1377
 msgid "Get Current Zone Information"
 msgstr "Hent informasjon om gjeldende sone"
 
-#: src/include/dhcp-server/dialogs2.rb:1386
+#: src/include/dhcp-server/dialogs2.rb:1385
 msgid "&Synchronize DNS Server..."
 msgstr "&Synkroniser DNS-server..."
 
 #. Show DNS Zone Information
-#: src/include/dhcp-server/dialogs2.rb:1415
+#: src/include/dhcp-server/dialogs2.rb:1414
 msgid ""
 "DNS zone %1 is not a master zone.\n"
 "Therefore, you cannot change it here.\n"
@@ -747,8 +751,8 @@
 
 #. A popup error text
 #. A popup error text
-#: src/include/dhcp-server/dialogs2.rb:1548
-#: src/include/dhcp-server/dialogs2.rb:1556
+#: src/include/dhcp-server/dialogs2.rb:1547
+#: src/include/dhcp-server/dialogs2.rb:1555
 msgid "Enter values for both ends of the IP address range."
 msgstr "Angi start- og sluttverdier for IP-adresseområdet."
 
@@ -756,8 +760,8 @@
 #. %1 is the tested IP which should match network %2 and netmask %3
 #. TRANSLATORS: popup error message
 #. %1 is the tested IP which should match network %2 and netmask %3
-#: src/include/dhcp-server/dialogs2.rb:1595
-#: src/include/dhcp-server/dialogs2.rb:1618
+#: src/include/dhcp-server/dialogs2.rb:1594
+#: src/include/dhcp-server/dialogs2.rb:1617
 msgid ""
 "The dynamic DHCP address range must be in the same network as the DHCP server.\n"
 "IP %1 does not match the network %2/%3."
@@ -766,127 +770,127 @@
 "IP '%1' samsvarer ikke med nettverket %2/%3."
 
 #. Label of the registered hosts table
-#: src/include/dhcp-server/dialogs2.rb:1643
+#: src/include/dhcp-server/dialogs2.rb:1642
 msgid "Registered Host"
 msgstr "Registrert vertsmaskin"
 
 #. Table header item - Name of the host
-#: src/include/dhcp-server/dialogs2.rb:1649
+#: src/include/dhcp-server/dialogs2.rb:1648
 msgid "Name"
 msgstr "Navn"
 
 #. MAC address of the host
-#: src/include/dhcp-server/dialogs2.rb:1653
+#: src/include/dhcp-server/dialogs2.rb:1652
 msgid "Hardware Address"
 msgstr "Maskinvareadresse"
 
 #. Network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1655
+#: src/include/dhcp-server/dialogs2.rb:1654
 msgid "Type"
 msgstr "Type"
 
 #. Frame label - configuration of particular host
-#: src/include/dhcp-server/dialogs2.rb:1662
+#: src/include/dhcp-server/dialogs2.rb:1661
 msgid "List Setup"
 msgstr "Oppsettliste"
 
 #. Textentry label - name of the host
-#: src/include/dhcp-server/dialogs2.rb:1670
+#: src/include/dhcp-server/dialogs2.rb:1669
 msgid "&Name"
 msgstr "&Navn"
 
 #. Textentry label - IP address of the host
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1675
+#: src/include/dhcp-server/dialogs2.rb:1674
 #: src/include/dhcp-server/dns-server-management.rb:229
 msgid "&IP Address"
 msgstr "&IP-Adresse"
 
 #. Textentry label - hardware (mac) address of the host
-#: src/include/dhcp-server/dialogs2.rb:1683
+#: src/include/dhcp-server/dialogs2.rb:1682
 msgid "&Hardware Address"
 msgstr "&Maskinvareadresse"
 
 #. Radiobutton label - network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1690
+#: src/include/dhcp-server/dialogs2.rb:1689
 msgid "&Ethernet"
 msgstr "&Ethernet"
 
-#: src/include/dhcp-server/dialogs2.rb:1692
+#: src/include/dhcp-server/dialogs2.rb:1691
 msgid "&Token Ring"
 msgstr "&Tokenring"
 
 #. Pushbutton label - change host in list
-#: src/include/dhcp-server/dialogs2.rb:1707
+#: src/include/dhcp-server/dialogs2.rb:1706
 msgid "C&hange in List"
 msgstr "E&ndre i liste"
 
 #. Pushbutton label - delete host from list
-#: src/include/dhcp-server/dialogs2.rb:1710
+#: src/include/dhcp-server/dialogs2.rb:1709
 msgid "Dele&te from List"
 msgstr "Slet&te fra liste"
 
 #. now, fill the dialog
 #. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1811
+#: src/include/dhcp-server/dialogs2.rb:1810
 #: src/include/dhcp-server/options.rb:1039
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1812
+#: src/include/dhcp-server/dialogs2.rb:1811
 #: src/include/dhcp-server/options.rb:1041
 msgid "Token Ring"
 msgstr "Tokenring"
 
 #. error popup
 #. error popup
-#: src/include/dhcp-server/dialogs2.rb:1886
+#: src/include/dhcp-server/dialogs2.rb:1885
 #: src/include/dhcp-server/options.rb:935
 msgid "The hardware address is invalid.\n"
 msgstr "Maskinvareadressen er ugyldig.\n"
 
 #. error popup
-#: src/include/dhcp-server/dialogs2.rb:1932
+#: src/include/dhcp-server/dialogs2.rb:1931
 msgid "The hardware address must be unique."
 msgstr "Maskinvareadressen må være unik."
 
 #. error popup
-#: src/include/dhcp-server/dialogs2.rb:1942
+#: src/include/dhcp-server/dialogs2.rb:1941
 msgid "The hostname cannot be empty."
 msgstr "Du må angi et vertsnavn."
 
 #. error popup, %1 is host name
-#: src/include/dhcp-server/dialogs2.rb:1952
+#: src/include/dhcp-server/dialogs2.rb:1951
 msgid "A host named %1 already exists."
 msgstr "En vertsmaskin med navnet %1 finnes allerede."
 
 #. error popup
 #. FIXME: text?
-#: src/include/dhcp-server/dialogs2.rb:1970
-#: src/include/dhcp-server/dialogs2.rb:2034
+#: src/include/dhcp-server/dialogs2.rb:1969
+#: src/include/dhcp-server/dialogs2.rb:2033
 msgid "Enter a host IP."
 msgstr "Angi IP for vertsmaskin."
 
 #. error popup
-#: src/include/dhcp-server/dialogs2.rb:1985
+#: src/include/dhcp-server/dialogs2.rb:1984
 msgid "The hardware address must be defined."
 msgstr "Maskinvareadressen må spesifiseres."
 
 #. error popup
 #. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:2006
-#: src/include/dhcp-server/dialogs2.rb:2021
+#: src/include/dhcp-server/dialogs2.rb:2005
+#: src/include/dhcp-server/dialogs2.rb:2020
 msgid "Select a host first."
 msgstr "Velg en vertsmaskin først."
 
 #. checking new MAC
-#: src/include/dhcp-server/dialogs2.rb:2048
+#: src/include/dhcp-server/dialogs2.rb:2047
 msgid "The input value must be defined."
 msgstr "Verdien må spesifiseres."
 
 #. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:2087
+#: src/include/dhcp-server/dialogs2.rb:2086
 msgid ""
 "If you enter the expert settings, you cannot return \n"
 "to this dialog. You may be able to display this dialog \n"
@@ -906,15 +910,15 @@
 "Vil du fortsette?"
 
 #. remove leading '-'
-#: src/include/dhcp-server/dialogs2.rb:2134
+#: src/include/dhcp-server/dialogs2.rb:2133
 msgid "\"-%1\" is not a valid DHCP server commandline option"
 msgstr "\"-%1\" er ikke et gyldig kommandolinjevalg for DHCP-serveren"
 
-#: src/include/dhcp-server/dialogs2.rb:2145
+#: src/include/dhcp-server/dialogs2.rb:2144
 msgid "DHCP server commandline option \"-%1\" requires an argument"
 msgstr "Kommandolinjevalget \"-%1\" for DHCP-serveren krever et argument"
 
-#: src/include/dhcp-server/dialogs2.rb:2156
+#: src/include/dhcp-server/dialogs2.rb:2155
 msgid ""
 "You have specified an alternate configuration file for the DHCP server.\n"
 "\n"
@@ -933,7 +937,7 @@
 "Vil du fortsette likevel?\n"
 
 #. dialog caption, %1 is step number
-#: src/include/dhcp-server/dialogs2.rb:2237
+#: src/include/dhcp-server/dialogs2.rb:2236
 msgid "DHCP Server Wizard (%1 of 4)"
 msgstr "Veiviser for DHCP-server (%1 av 4)"
 

Modified: trunk/yast/nb/po/dns-server.nb.po
===================================================================
--- trunk/yast/nb/po/dns-server.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/dns-server.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: dns-server.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2009-08-08 08:44+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"

Modified: trunk/yast/nb/po/drbd.nb.po
===================================================================
--- trunk/yast/nb/po/drbd.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/drbd.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:38+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2008-09-21 10:37+0200\n"
 "Last-Translator: Olav P. <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <>\n"
@@ -23,6 +23,16 @@
 msgid "Configuration of DRBD"
 msgstr "Oppsett av DRBD"
 
+#. Rich text title for Drbd in proposals
+#: src/clients/drbd_proposal.rb:86
+msgid "DRBD"
+msgstr ""
+
+#. Menu title for Drbd in proposals
+#: src/clients/drbd_proposal.rb:88
+msgid "&DRBD"
+msgstr ""
+
 #. encoding: utf-8
 #. ------------------------------------------------------------------------------
 #. Copyright (c) 2006 Novell, Inc. All Rights Reserved.
@@ -60,21 +70,85 @@
 msgid "Resource Configuration"
 msgstr "Ressursoppsett"
 
+#: src/include/drbd/common.rb:47
+#, fuzzy
+#| msgid "Resource Configuration"
+msgid "Resource Basic Configuration"
+msgstr "Ressursoppsett"
+
+#: src/include/drbd/common.rb:48
+#, fuzzy
+#| msgid "Resource Configuration"
+msgid "Resource Advanced Configuration"
+msgstr "Ressursoppsett"
+
+#. encoding: utf-8
+#. ------------------------------------------------------------------------------
+#. Copyright (c) 2006 Novell, Inc. All Rights Reserved.
+#.
+#.
+#. This program is free software; you can redistribute it and/or modify it under
+#. the terms of version 2 of the GNU General Public License as published by the
+#. Free Software Foundation.
+#.
+#. This program is distributed in the hope that it will be useful, but WITHOUT
+#. ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#. FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#.
+#. You should have received a copy of the GNU General Public License along with
+#. this program; if not, contact Novell, Inc.
+#.
+#. To contact Novell about this file by physical or electronic mail, you may find
+#. current contact information at www.novell.com.
+#. ------------------------------------------------------------------------------
+#. File:	include/drbd/dialogs.ycp
+#. Package:	Configuration of drbd
+#. Summary:	Dialogs definitions
+#. Authors:	xwhu <xwhu@novell.com>
+#.
+#. $Id: dialogs.ycp 27914 2006-02-13 14:32:08Z locilka $
+#: src/include/drbd/dialogs.rb:51
+msgid "Warning: YaST2 DRBD module will rename all\n"
+msgstr ""
+
+#: src/include/drbd/dialogs.rb:52
+msgid ""
+"included files for DRBD into a supported schema.\n"
+"\n"
+"Do you want to continue?"
+msgstr ""
+
+#: src/include/drbd/dialogs.rb:69
+#, fuzzy
+#| msgid "Cannot read configuration file."
+msgid "Failed to read DRBD configuration file:\n"
+msgstr "Kan ikke lese oppsettfil."
+
+#: src/include/drbd/dialogs.rb:86
+#, fuzzy
+#| msgid "Failed to delete configuration %1."
+msgid "Failed to write configuration to disk:\n"
+msgstr "Kunne ikke slette oppsettet %1."
+
 #. Drbd configure1 dialog caption
 #. Drbd configure2 dialog caption
-#: src/include/drbd/dialogs.rb:60 src/include/drbd/dialogs.rb:99
+#: src/include/drbd/dialogs.rb:99 src/include/drbd/dialogs.rb:138
 msgid "DRBD Configuration"
 msgstr "DRBD-oppsett"
 
 #. Drbd configure1 dialog contents
-#: src/include/drbd/dialogs.rb:63
-msgid "First part of DRBD configuration"
-msgstr "Første del av DRBD-oppsettet"
+#: src/include/drbd/dialogs.rb:102
+#, fuzzy
+#| msgid "First part of configuration of CASA"
+msgid "First part of configuration of DRBD"
+msgstr "Første del av CASA-oppsettet"
 
 #. Drbd configure2 dialog contents
-#: src/include/drbd/dialogs.rb:102
-msgid "Second part of DRBD configuration"
-msgstr "Andre del av DRBD-oppsettet"
+#: src/include/drbd/dialogs.rb:141
+#, fuzzy
+#| msgid "Second part of configuration of CASA"
+msgid "Second part of configuration of DRBD"
+msgstr "Andre del av CASA-oppsettet"
 
 #. encoding: utf-8
 #: src/include/drbd/global_conf.rb:36
@@ -95,12 +169,16 @@
 
 #. Read dialog help 1/2
 #: src/include/drbd/helps.rb:36
+#, fuzzy
+#| msgid ""
+#| "<p><b><big>Initializing Configuration</big></b><br>\n"
+#| "Please wait...<br></p>\n"
 msgid ""
 "<p><b><big>Initializing DRBD Configuration</big></b><br>\n"
-"</p>\n"
+"Please wait...<br></p>\n"
 msgstr ""
-"<p><b><big>Initialiserer DRBD-oppsett</big></b><br>\n"
-"</p>\n"
+"<p><b><big>Initialiserer oppsett</big></b><br>\n"
+"Vent...<br></p>\n"
 
 #. Read dialog help 2/2
 #: src/include/drbd/helps.rb:40
@@ -113,12 +191,16 @@
 
 #. Write dialog help 1/2
 #: src/include/drbd/helps.rb:44
+#, fuzzy
+#| msgid ""
+#| "<p><b><big>Saving Configuration</big></b><br>\n"
+#| "Please wait...<br></p>\n"
 msgid ""
 "<p><b><big>Saving DRBD Configuration</big></b><br>\n"
-"</p>\n"
+"Please wait...<br></p>\n"
 msgstr ""
-"<p><b><big>Lagrer DRBD-oppsett</big></b><br>\n"
-"</p>\n"
+"<p><b><big>Lagrer konfigurasjon</big></b><br>\n"
+"Vent...<br></p>\n"
 
 #. Write dialog help 2/2
 #: src/include/drbd/helps.rb:48
@@ -138,14 +220,81 @@
 msgstr "Start for å sette opp DRBD."
 
 #: src/include/drbd/helps.rb:55
+#, fuzzy
+#| msgid "<p><b><big>Global Configuration of DRBD</big></b></p>"
+msgid "<p><b><big>Startup Configuration of DRBD</big></b></p>"
+msgstr "<p><b><big>Globalt oppsett for DRBD</big></b></p>"
+
+#: src/include/drbd/helps.rb:58
+msgid ""
+"<p><b>Booting:</b></p>\n"
+"\t\t\t<p>checking \"On\" to start DRBD server Now and when booting</p>\n"
+"\t\t\t<p>checking \"Off\", DRBD server only starts manually</p>\n"
+"\t\t<p><b>Switch On and Off:</b></p>\n"
+"\t\t\t<p>Starting or Stopping DRBD Server right now</p>\n"
+"\t\t"
+msgstr ""
+
+#: src/include/drbd/helps.rb:66 src/include/drbd/helps.rb:72
+#: src/include/drbd/helps.rb:85
+#, fuzzy
+#| msgid "<p><b><big>Global Configuration of DRBD</big></b></p>"
+msgid "<p><b><big>Resource Configuration of DRBD</big></b></p>"
+msgstr "<p><b><big>Globalt oppsett for DRBD</big></b></p>"
+
+#: src/include/drbd/helps.rb:69
+msgid ""
+"<p>Clicking \"Add\", \"Edit\", \"Delete\" button to add, edit or delete a resource</p>\n"
+"\t\t"
+msgstr ""
+
+#: src/include/drbd/helps.rb:75
+msgid ""
+"\n"
+"\t\t<p>\"Name\" is mandatory and must match the Linux host name (uname -n) of one of the nodes</p>\n"
+"\t\t<p>\"Address:Port\": A resource needs one IP address per device, which is used to wait for incoming connections from the partner device to reach the device. Each DRBD resource needs a TCP port which is used to connect to the node's partner device.</p>\n"
+"\t\t<p>\"Device\": The  name of the block device node of the resource being described.  You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter,following its minor number.\n"
+"\t\tLike: '/dev/drbd_r0 minor 0'</p>\n"
+"\t\t<p>\"Disk\":  DRBD uses this block device to actually store and retrieve the data.  Never access such a device while DRBD is running on top of  it.</p>\n"
+"\t\t<p>\"Meta-disk\": internal. Internal means that the last part of the backing device is used to store the meta-data.</p>\n"
+"\t\t"
+msgstr ""
+
+#: src/include/drbd/helps.rb:88
+msgid ""
+"\n"
+"\t\t<p><b>Protocol</b></p>\n"
+"\t\t<p>Protocol A: write IO is reported as completed, if it has reached local disk and local TCP send buffer.</p>\n"
+"\t\t<p>Protocol B: write IO is reported as completed, if it has reached local disk and remote buffer cache.</p>\n"
+"\t\t<p>Protocol C: write IO is reported as completed, if it has reached both local and remote disk.</p>\n"
+"\t\t\t\t\t\t\t\t\t\t  \n"
+"\t\t<p><b>wfc-timeout</b>: Wait for connection timeout</p>\n"
+"\t\t<p><b>degr-wfc-timeout</b>: Wait for connection timeout, if this node was a degraded cluster</p>\n"
+"\n"
+"\t\t<p><b>on-io-error</b>: What to do when the lower level device reports io-error to the upper layers</p>\n"
+"\t\t<p><b>sndbuf-size</b>: The size of the TCP socket send buffer</p>\n"
+"\t\t<p><b>max-buffers</b>: Maximum number of requests to be allocated by DRBD</p>\n"
+"\n"
+"\t\t<p><b>timeout</b>: If the partner node fails to send an expected response packet within time 10ths of a second, the partner node is considered dead and therefore  the TCP/IP connection is abandoned. This must be lower than connect-int and ping-int. The default value is 60 = 6 seconds, the unit 0.1 seconds.</p>\n"
+"\t\t<p><b>connect-int</b>: The time the peer has time to answer to a keep-alive packet. In case the peer's reply is not received within this time period, it is considered as dead. The default value is 500ms, the default unit is 100ms</p>\n"
+"\t\t<p><b>ping-int</b>: The time the peer has time to answer to a keep-alive packet</p>\n"
+"\n"
+"\t\t<p><b>max-epoch-size</b>: The highest number of data blocks between two write barriers</p>\n"
+"\t\t<p><b>ko-count</b>: the secondary node fails to complete a single write request for count times the timeout, it is expelled from the cluster. The default value is 0, which disables this feature.</p>\n"
+"\t\t<p><b>rate</b>: To  ensure a smooth operation of the application on top of DRBD, it is possible to limit the bandwidth which may be used by background synchronizations. The default is 250 KB/sec, the default unit is KB/sec.</p>\n"
+"\t\t<p><b>al-extents</b>: parameter  you control how big the hot area (= active set) can get. The default number of extents is 127. (Minimum: 7, Maximum: 3843)</p>\n"
+"\t\t"
+msgstr ""
+
+#: src/include/drbd/helps.rb:112
 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:58
+#: src/include/drbd/helps.rb:115
 msgid "<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's sanity check</p>"
 msgstr "<p>Kryss av for <b>Deaktiver IP-verifisering\"</b> for å deaktivere en av gyldighetskontrollene i drbdadm</p>"
 
-#: src/include/drbd/helps.rb:61
+#: src/include/drbd/helps.rb:118
 msgid ""
 "<p><b>Dialog Refresh:</b> The user dialog counts and displays the seconds it waited so\n"
 "                far. You might want to disable this if you have the console\n"
@@ -161,42 +310,48 @@
 "                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:69
+#: src/include/drbd/helps.rb:126
 msgid ""
 "<p><b>Minor Count:</b>\n"
-"Use this option if you want to define more resources later without reloading the\n"
-"module. By default we load the module with exactly as many devices as\n"
-"configured in this file.</p>\n"
+"           use this if you want to define more resources later\n"
+"           without reloading the module.\n"
+"           by default we load the module with exactly as many devices\n"
+"           as configured mentioned in this file. </p>"
 msgstr ""
 "<p><b>Minste telleverdi:</b>\n"
-"Bruk dette valget hvis du vil definere flere ressurser senere uten å laste\n"
-"modulen på nytt. Som standard lastes modulen med nøyaktig så mange enheter\n"
-"som denne filen angir. </p>\n"
+"           Bruk dette valget hvis du vil definere flere ressurser senere\n"
+"           uten å laste modulen på nytt.\n"
+"           Som standard lastes modulen med nøyaktig så mange enheter\n"
+"           som denne filen angir. </p>"
 
 #. Summary dialog help 1/3
-#: src/include/drbd/helps.rb:76
+#: src/include/drbd/helps.rb:134
+#, fuzzy
+#| msgid ""
+#| "<p><b><big>Drbd Configuration</big></b><br>\n"
+#| "Configure drbd here.<br></p>\n"
 msgid ""
 "<p><b><big>DRBD Configuration</big></b><br>\n"
-"Configure DRBD here.<br></p>\n"
+"Configure drbd here.<br></p>\n"
 msgstr ""
-"<p><b><big>DRBD-oppsett</big></b><br>\n"
-"Sett opp DRBD her.<br></p>\n"
+"<p><b><big>Drbd-oppsett</big></b><br>\n"
+"Sett opp drbd her.<br></p>\n"
 
 #. Summary dialog help 2/3
-#: src/include/drbd/helps.rb:80
+#: src/include/drbd/helps.rb:138
 msgid ""
-"<p><b><big>Adding a DRBD:</big></b><br>\n"
-"Choose a DRBD from the list of detected DRBDs.\n"
-"If your DRBD was not detected, use <b>Other (not detected)</b>.\n"
+"<p><b><big>Adding a drbd:</big></b><br>\n"
+"Choose an drbd from the list of detected drbds.\n"
+"If your drbd was not detected, use <b>Other (not detected)</b>.\n"
 "Then press <b>Configure</b>.</p>\n"
 msgstr ""
-"<p><b><big>Legg til en DRBD:</big></b><br>\n"
-"Velg en DRBD fra listen over registrerte DRBD-er.\n"
-"Hvis en DRBD ikke ble registrert, bruk <b>Andre (ikke registrert)</b>.\n"
+"<p><b><big>Legg til en drbd:</big></b><br>\n"
+"Velg en drbd fra listen over registrerte drbd.\n"
+"Hvis en drbd ikke ble registrert, bruk <b>Andre (ikke registrert)</b>.\n"
 "Klikk deretter <b>Sett opp</b>.</p>\n"
 
 #. Summary dialog help 3/3
-#: src/include/drbd/helps.rb:87
+#: src/include/drbd/helps.rb:145
 msgid ""
 "<p><b><big>Editing or Deleting:</big></b><br>\n"
 "If you press <b>Edit</b>, an additional dialog in which to change\n"
@@ -207,38 +362,43 @@
 "du kan endre konfigurasjonen.</p>\n"
 
 #. Ovreview dialog help 1/3
-#: src/include/drbd/helps.rb:93
+#: src/include/drbd/helps.rb:151
+#, fuzzy
+#| msgid ""
+#| "<p><b><big>Drbd Configuration Overview</big></b><br>\n"
+#| "Obtain an overview of installed drbds. Additionally\n"
+#| "edit their configurations.<br></p>\n"
 msgid ""
 "<p><b><big>DRBD Configuration Overview</big></b><br>\n"
-"Obtain an overview of installed DRBDS. Additionally\n"
+"Obtain an overview of installed drbds. Additionally\n"
 "edit their configurations.<br></p>\n"
 msgstr ""
-"<p><b><big>Oversikt over DRBD-oppsett</big></b><br>\n"
-"Her finner du en oversikt over installerte DRBD-er. Du kan også\n"
+"<p><b><big>Oversikt over drbd-oppsett</big></b><br>\n"
+"Her finner du en oversikt over installerte drbd-er. Du kan også\n"
 "redigere oppsettene.<br></p>\n"
 
 #. Ovreview dialog help 2/3
-#: src/include/drbd/helps.rb:99
+#: src/include/drbd/helps.rb:157
 msgid ""
-"<p><b><big>Adding a DRBD:</big></b><br>\n"
-"Press <b>Add</b> to configure a DRBD.</p>\n"
+"<p><b><big>Adding a drbd:</big></b><br>\n"
+"Press <b>Add</b> to configure a drbd.</p>"
 msgstr ""
-"<p><b><big>Legg til en DRBD:</big></b><br>\n"
-"Klikk <b>Legg til</b> for å sette opp en DRBD.</p>\n"
+"<p><b><big>Legg til en drbd:</big></b><br>\n"
+"Klikk <b>Legg til</b> for å sette opp en drbd.</p>"
 
 #. Ovreview dialog help 3/3
-#: src/include/drbd/helps.rb:103
+#: src/include/drbd/helps.rb:161
 msgid ""
 "<p><b><big>Editing or Deleting:</big></b><br>\n"
-"Choose a DRBD to change or remove.\n"
+"Choose a drbd to change or remove.\n"
 "Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n"
 msgstr ""
 "<p><b><big>Rediger eller slett:</big></b><br>\n"
-"Velg en DRBD du vil endre eller slette.\n"
+"Velg en drbd du vil endre eller slette.\n"
 "Klikk deretter <b>Rediger</b> eller <b>Slett</b> etter ønske.</p>\n"
 
 #. Configure1 dialog help 1/2
-#: src/include/drbd/helps.rb:109
+#: src/include/drbd/helps.rb:167
 msgid ""
 "<p><b><big>Configuration Part One</big></b><br>\n"
 "Press <b>Next</b> to continue.\n"
@@ -250,7 +410,7 @@
 
 #. Configure1 dialog help 2/2
 #. Configure2 dialog help 2/2
-#: src/include/drbd/helps.rb:115 src/include/drbd/helps.rb:127
+#: src/include/drbd/helps.rb:173 src/include/drbd/helps.rb:185
 msgid ""
 "<p><b><big>Selecting Something</big></b><br>\n"
 "It is not possible. You must code it first. :-)\n"
@@ -261,7 +421,7 @@
 "</p>"
 
 #. Configure2 dialog help 1/2
-#: src/include/drbd/helps.rb:121
+#: src/include/drbd/helps.rb:179
 msgid ""
 "<p><b><big>Configuration Part Two</big></b><br>\n"
 "Press <b>Next</b> to continue.\n"
@@ -280,12 +440,15 @@
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/include/drbd/resource_conf.rb:545
+#. myHelp("basic_conf");
+#: src/include/drbd/resource_conf.rb:546
 msgid "Node names must be different."
 msgstr "Andre nodenavn må angis."
 
-#: src/include/drbd/resource_conf.rb:567
-msgid "Fill out all fields."
+#: src/include/drbd/resource_conf.rb:568
+#, fuzzy
+#| msgid "Fill out all fields."
+msgid "Please fill out all fields."
 msgstr "Fyll ut alle felter."
 
 #. encoding: utf-8
@@ -327,11 +490,11 @@
 
 #: src/include/drbd/startup_conf.rb:81
 msgid ""
-"To propagate this configuration,\n"
-"copy the configuration file '/etc/drbd.conf' to the rest of nodes manually.\n"
+"To propagate this configuration ,\n"
+"copy the configuration file '/etc/drbd.conf' to the rest of nodes manually."
 msgstr ""
 "Gjenbruk dette oppsettet ved å\n"
-"kopiere oppsettfilen '/etc/drbd.conf' til øvrige noder manuelt.\n"
+"kopiere oppsettfilen '/etc/drbd.conf' til øvrige noder manuelt."
 
 #. }
 #: src/include/drbd/startup_conf.rb:122
@@ -344,89 +507,241 @@
 
 #. Report::Error ( Service::Error());
 #: src/include/drbd/startup_conf.rb:142
-msgid "Starting DRBD service failed."
+#, fuzzy
+#| msgid "Starting DRBD service failed."
+msgid "Start DRBD service failed"
 msgstr "Start av DRBD-tjeneste mislyktes."
 
 #. Report::Error ( Service::Error() );
 #: src/include/drbd/startup_conf.rb:150
-msgid "Stopping DRBD service failed."
+#, fuzzy
+#| msgid "Stopping DRBD service failed."
+msgid "Stop DRBD service failed"
 msgstr "Deaktivering av DRBD-tjeneste mislyktes."
 
 #. Initialization dialog caption
-#: src/include/drbd/wizards.rb:136
+#: src/include/drbd/wizards.rb:137
 msgid "Heartbeat Configuration"
 msgstr "Oppsett av Heartbeat"
 
 #. Initialization dialog contents
-#: src/include/drbd/wizards.rb:138
+#: src/include/drbd/wizards.rb:139
 msgid "Initializing..."
 msgstr "Initialiserer ..."
 
+#. encoding: utf-8
+#. ------------------------------------------------------------------------------
+#. Copyright (c) 2006 Novell, Inc. All Rights Reserved.
+#.
+#.
+#. This program is free software; you can redistribute it and/or modify it under
+#. the terms of version 2 of the GNU General Public License as published by the
+#. Free Software Foundation.
+#.
+#. This program is distributed in the hope that it will be useful, but WITHOUT
+#. ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#. FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#.
+#. You should have received a copy of the GNU General Public License along with
+#. this program; if not, contact Novell, Inc.
+#.
+#. To contact Novell about this file by physical or electronic mail, you may find
+#. current contact information at www.novell.com.
+#. ------------------------------------------------------------------------------
+#. File:	modules/Drbd.ycp
+#. Package:	Configuration of drbd
+#. Summary:	Drbd settings, input and output functions
+#. Authors:	xwhu <xwhu@novell.com>
+#.
+#. $Id: Drbd.ycp 27914 2006-02-13 14:32:08Z locilka $
+#.
+#. Representation of the configuration of drbd.
+#. Input and output routines.
+#: src/modules/Drbd.rb:101
+msgid "Failed to merge separated DRBD conf files\n"
+msgstr ""
+
+#: src/modules/Drbd.rb:123
+#, fuzzy
+#| msgid "Unable to write to idmapd.conf."
+msgid "Failed to write drbd.conf.YaST2prepare"
+msgstr "Kan ikke skrive til idmapd.conf."
+
 #. DRBD read dialog caption
-#: src/modules/Drbd.rb:71
+#: src/modules/Drbd.rb:133
 msgid "Initializing DRBD Configuration"
 msgstr "Initialiserer DRBD-oppsett"
 
 #. We do not set help text here, because it was set outside
-#: src/modules/Drbd.rb:79
+#: src/modules/Drbd.rb:141
 msgid "Read global settings"
 msgstr "Les globale innstillinger"
 
-#: src/modules/Drbd.rb:80
+#: src/modules/Drbd.rb:142
 msgid "Read resources"
 msgstr "Les ressurser"
 
-#: src/modules/Drbd.rb:81
+#: src/modules/Drbd.rb:143
 msgid "Read daemon status"
 msgstr "Les nissestatus"
 
-#: src/modules/Drbd.rb:84
+#: src/modules/Drbd.rb:146
 msgid "Reading global settings..."
 msgstr "Leser globale innstillinger..."
 
-#: src/modules/Drbd.rb:85
+#: src/modules/Drbd.rb:147
 msgid "Reading resources..."
 msgstr "Leser ressurser..."
 
-#: src/modules/Drbd.rb:86
+#: src/modules/Drbd.rb:148
 msgid "Reading daemon status..."
 msgstr "Leser nissestatus..."
 
-#: src/modules/Drbd.rb:87 src/modules/Drbd.rb:293
+#: src/modules/Drbd.rb:149 src/modules/Drbd.rb:492
 msgid "Finished"
 msgstr "Fullført"
 
+#. new_map = remove(new_map, key);
+#: src/modules/Drbd.rb:412
+#, fuzzy
+#| msgid "Failed to save ipsec.conf:"
+msgid "Failed to backup drbd.conf"
+msgstr "Kunne ikke lagre ipsec.conf:"
+
+#: src/modules/Drbd.rb:421
+msgid "Failed to clean drbd.conf for drbdadm test"
+msgstr ""
+
+#: src/modules/Drbd.rb:445
+#, fuzzy
+#| msgid "Configuration of Resource Groups"
+msgid ""
+"Invalid configuration of resource %1\n"
+"%2"
+msgstr "Konfigurasjon av ressursgrupper"
+
+#: src/modules/Drbd.rb:464
+msgid "Failed to bring drbd.conf back"
+msgstr ""
+
 #. DRBD write dialog caption
-#: src/modules/Drbd.rb:275
+#: src/modules/Drbd.rb:474
 msgid "Writing DRBD Configuration"
 msgstr "Lagrer DRBD-oppsett"
 
 #. if (!modified) return true;
 #. We do not set help text here, because it was set outside
-#: src/modules/Drbd.rb:285
+#: src/modules/Drbd.rb:484
 msgid "Write global settings"
 msgstr "Lagre generelle innstillinger"
 
-#: src/modules/Drbd.rb:286
+#: src/modules/Drbd.rb:485
 msgid "Write resources"
 msgstr "Lagre ressursene"
 
-#: src/modules/Drbd.rb:287
+#: src/modules/Drbd.rb:486
 msgid "Set daemon status"
 msgstr "Definer nissestatus"
 
-#: src/modules/Drbd.rb:290
+#: src/modules/Drbd.rb:489
 msgid "Writing global settings..."
 msgstr "Lagrer generelle innstillinger..."
 
-#: src/modules/Drbd.rb:291
+#: src/modules/Drbd.rb:490
 msgid "Writing resources..."
 msgstr "Lagrer ressurser..."
 
-#: src/modules/Drbd.rb:292
+#: src/modules/Drbd.rb:491
 msgid "Setting daemon status..."
 msgstr "Definerer nissestatus..."
 
+#: src/modules/Drbd.rb:502
+#, fuzzy
+#| msgid "Unable to create directory '%1'."
+msgid "Failed to make directory /etc/drbd.d"
+msgstr "Kunne ikke opprette katalogen '%1'."
+
+#~ msgid "First part of DRBD configuration"
+#~ msgstr "Første del av DRBD-oppsettet"
+
+#~ msgid "Second part of DRBD configuration"
+#~ msgstr "Andre del av DRBD-oppsettet"
+
+#~ msgid ""
+#~ "<p><b><big>Initializing DRBD Configuration</big></b><br>\n"
+#~ "</p>\n"
+#~ msgstr ""
+#~ "<p><b><big>Initialiserer DRBD-oppsett</big></b><br>\n"
+#~ "</p>\n"
+
+#~ msgid ""
+#~ "<p><b><big>Saving DRBD Configuration</big></b><br>\n"
+#~ "</p>\n"
+#~ msgstr ""
+#~ "<p><b><big>Lagrer DRBD-oppsett</big></b><br>\n"
+#~ "</p>\n"
+
+#~ msgid ""
+#~ "<p><b>Minor Count:</b>\n"
+#~ "Use this option if you want to define more resources later without reloading the\n"
+#~ "module. By default we load the module with exactly as many devices as\n"
+#~ "configured in this file.</p>\n"
+#~ msgstr ""
+#~ "<p><b>Minste telleverdi:</b>\n"
+#~ "Bruk dette valget hvis du vil definere flere ressurser senere uten å laste\n"
+#~ "modulen på nytt. Som standard lastes modulen med nøyaktig så mange enheter\n"
+#~ "som denne filen angir. </p>\n"
+
+#~ msgid ""
+#~ "<p><b><big>DRBD Configuration</big></b><br>\n"
+#~ "Configure DRBD here.<br></p>\n"
+#~ msgstr ""
+#~ "<p><b><big>DRBD-oppsett</big></b><br>\n"
+#~ "Sett opp DRBD her.<br></p>\n"
+
+#~ msgid ""
+#~ "<p><b><big>Adding a DRBD:</big></b><br>\n"
+#~ "Choose a DRBD from the list of detected DRBDs.\n"
+#~ "If your DRBD was not detected, use <b>Other (not detected)</b>.\n"
+#~ "Then press <b>Configure</b>.</p>\n"
+#~ msgstr ""
+#~ "<p><b><big>Legg til en DRBD:</big></b><br>\n"
+#~ "Velg en DRBD fra listen over registrerte DRBD-er.\n"
+#~ "Hvis en DRBD ikke ble registrert, bruk <b>Andre (ikke registrert)</b>.\n"
+#~ "Klikk deretter <b>Sett opp</b>.</p>\n"
+
+#~ msgid ""
+#~ "<p><b><big>DRBD Configuration Overview</big></b><br>\n"
+#~ "Obtain an overview of installed DRBDS. Additionally\n"
+#~ "edit their configurations.<br></p>\n"
+#~ msgstr ""
+#~ "<p><b><big>Oversikt over DRBD-oppsett</big></b><br>\n"
+#~ "Her finner du en oversikt over installerte DRBD-er. Du kan også\n"
+#~ "redigere oppsettene.<br></p>\n"
+
+#~ msgid ""
+#~ "<p><b><big>Adding a DRBD:</big></b><br>\n"
+#~ "Press <b>Add</b> to configure a DRBD.</p>\n"
+#~ msgstr ""
+#~ "<p><b><big>Legg til en DRBD:</big></b><br>\n"
+#~ "Klikk <b>Legg til</b> for å sette opp en DRBD.</p>\n"
+
+#~ msgid ""
+#~ "<p><b><big>Editing or Deleting:</big></b><br>\n"
+#~ "Choose a DRBD to change or remove.\n"
+#~ "Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n"
+#~ msgstr ""
+#~ "<p><b><big>Rediger eller slett:</big></b><br>\n"
+#~ "Velg en DRBD du vil endre eller slette.\n"
+#~ "Klikk deretter <b>Rediger</b> eller <b>Slett</b> etter ønske.</p>\n"
+
+#~ msgid ""
+#~ "To propagate this configuration,\n"
+#~ "copy the configuration file '/etc/drbd.conf' to the rest of nodes manually.\n"
+#~ msgstr ""
+#~ "Gjenbruk dette oppsettet ved å\n"
+#~ "kopiere oppsettfilen '/etc/drbd.conf' til øvrige noder manuelt.\n"
+
 #~ msgid "Configuration of drbd"
 #~ msgstr "Oppsett av drbd"
 

Modified: trunk/yast/nb/po/fcoe-client.nb.po
===================================================================
--- trunk/yast/nb/po/fcoe-client.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/fcoe-client.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2002-06-17 14:33+0200\n"
 "Last-Translator: www.linuxbutikken.no <roy@bytek.no>\n"
 "Language-Team: Norwegian <i18n@suse.de>\n"
@@ -37,8 +37,18 @@
 msgid "&FcoeClient"
 msgstr "&FcoeClient"
 
+#. setting of config value is 'yes'
+#: src/include/fcoe-client/complex.rb:48
+msgid "yes"
+msgstr "ja"
+
+#. setting of config value is 'no'
+#: src/include/fcoe-client/complex.rb:50
+msgid "no"
+msgstr "nei"
+
 #. text of an error popup
-#: src/include/fcoe-client/complex.rb:92
+#: src/include/fcoe-client/complex.rb:102
 msgid ""
 "Cannot remove the FCoE interface.\n"
 "Command %1 failed."
@@ -46,13 +56,42 @@
 "Kan ikke fjerne FCoE-grensesnittet.\n"
 "Kommandoen %1 mislyktes."
 
+#. FCoE is not available on the interface
+#: src/include/fcoe-client/complex.rb:195
+#, fuzzy
+#| msgid "is not available"
+msgid "not available"
+msgstr "er ikke tilgjengelig"
+
+#. the interface is not configured for FCoE
+#: src/include/fcoe-client/complex.rb:197
+#, fuzzy
+#| msgid "Not configured"
+msgid "not configured"
+msgstr "Ikke satt opp"
+
+#. the flag is 'true'
+#: src/include/fcoe-client/complex.rb:203
+msgid "true"
+msgstr ""
+
+#. the flag is 'false'
+#: src/include/fcoe-client/complex.rb:205
+msgid "false"
+msgstr ""
+
+#. the flag is not set at all
+#: src/include/fcoe-client/complex.rb:207
+msgid "not set"
+msgstr "ikke angitt"
+
 #. headline of the edit dialog - configuration of values for a certain network interface
-#: src/include/fcoe-client/complex.rb:280
+#: src/include/fcoe-client/complex.rb:306
 msgid "Configuration of VLAN interface %1 on %2"
 msgstr "Oppsett av VLAN-grensesnittet %1 på %2"
 
 #. text of an error popup
-#: src/include/fcoe-client/complex.rb:342
+#: src/include/fcoe-client/complex.rb:368
 msgid ""
 "Cannot start FCoE on VLAN interface %1\n"
 "because FCoE is already configured on\n"
@@ -63,7 +102,7 @@
 "nettverksgrensesnitt %2."
 
 #. text of an error popup
-#: src/include/fcoe-client/complex.rb:357
+#: src/include/fcoe-client/complex.rb:383
 msgid ""
 "Cannot start FCoE on network interface %1 itself\n"
 "because FCoE is already configured on\n"
@@ -74,12 +113,12 @@
 "VLAN-grensesnitt(ene) %2."
 
 #. headline of a popup: creating and starting Fibre Channel over Ethernet
-#: src/include/fcoe-client/complex.rb:391
+#: src/include/fcoe-client/complex.rb:417
 msgid "Creating and Starting FCoE on Detected VLAN Device"
 msgstr "Oppretter og starter FCoE på registrert VLAN-enhet"
 
 #. question to the user: really create and start FCoE
-#: src/include/fcoe-client/complex.rb:394
+#: src/include/fcoe-client/complex.rb:420
 msgid ""
 "Do you really want to create a FCoE network\n"
 "interface for discovered VLAN interface %1\n"
@@ -90,16 +129,16 @@
 "på %2 og starte FCoE-initiatoren?"
 
 #. text of an error popup
-#: src/include/fcoe-client/complex.rb:417
+#: src/include/fcoe-client/complex.rb:443
 msgid "Cannot create and start FCoE on %1."
 msgstr "Kan ikke opprette og starte FCoE på %1."
 
 #. text of an error popup: command failed on the network interface
-#: src/include/fcoe-client/complex.rb:454
+#: src/include/fcoe-client/complex.rb:480
 msgid "Command \"%1\" on %2 failed."
 msgstr "Kommandoen «%1» på %2 mislyktes."
 
-#: src/include/fcoe-client/complex.rb:462
+#: src/include/fcoe-client/complex.rb:488
 msgid ""
 "Creating FCoE interface failed.\n"
 "Continue because running in test mode"
@@ -108,12 +147,12 @@
 "Fortsett å kjøre i testmodus."
 
 #. popup text: really remove FCoE VLAN interface
-#: src/include/fcoe-client/complex.rb:557
+#: src/include/fcoe-client/complex.rb:583
 msgid "Do you really want to remove the FCoE interface %1?"
 msgstr "Vil du virkelig fjerne FCoE-enheten %1?"
 
 #. popup text continues
-#: src/include/fcoe-client/complex.rb:565
+#: src/include/fcoe-client/complex.rb:591
 msgid ""
 "Attention:\n"
 "Make sure the interface is not essential for a used device.\n"
@@ -124,7 +163,7 @@
 "Hvis det fjernes, kan det hende at systemet blir ubrukelig."
 
 #. popup text continues
-#: src/include/fcoe-client/complex.rb:575
+#: src/include/fcoe-client/complex.rb:601
 msgid ""
 "Don't remove the interface if it's related\n"
 "to an already activated multipath device."
@@ -133,16 +172,16 @@
 "til en multipath-enhet som allerede er aktivert."
 
 #. replace values in table
-#: src/include/fcoe-client/complex.rb:724
+#: src/include/fcoe-client/complex.rb:750
 msgid "Removing of interface %1 failed."
 msgstr "Grensesnittet %1 kunne ikke fjernes."
 
-#: src/include/fcoe-client/complex.rb:736
+#: src/include/fcoe-client/complex.rb:762
 msgid "Destroying interface %1 failed."
 msgstr "Grensesnittet %1 kunne ikke slettes."
 
 #. text of a warning popup
-#: src/include/fcoe-client/complex.rb:768
+#: src/include/fcoe-client/complex.rb:794
 msgid ""
 "DCB Required is set to \"yes\" but the\n"
 "interface isn't DCB capable."
@@ -151,7 +190,7 @@
 "grensesnittet er ikke DCB-kompatibelt."
 
 #. text of an information (notify)  popup
-#: src/include/fcoe-client/complex.rb:805
+#: src/include/fcoe-client/complex.rb:831
 msgid ""
 "Service 'fcoe' requires enabled service 'lldpad'.\n"
 "Enabling start on boot of service 'lldpad'."
@@ -182,7 +221,7 @@
 #: src/include/fcoe-client/dialogs.rb:230
 #: src/include/fcoe-client/dialogs.rb:241
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
 #: src/include/fcoe-client/dialogs.rb:110
 #: src/include/fcoe-client/dialogs.rb:118
@@ -190,7 +229,7 @@
 #: src/include/fcoe-client/dialogs.rb:230
 #: src/include/fcoe-client/dialogs.rb:241
 msgid "No"
-msgstr ""
+msgstr "Nei"
 
 #. combo box label: require DCB (yes/no)
 #: src/include/fcoe-client/dialogs.rb:117
@@ -251,7 +290,7 @@
 
 #: src/include/fcoe-client/dialogs.rb:188
 msgid "Driver"
-msgstr ""
+msgstr "Driver"
 
 #: src/include/fcoe-client/dialogs.rb:189
 msgid "Flag FCoE"
@@ -559,27 +598,39 @@
 msgstr "<p>Vil du installere den nå?</p>"
 
 #. start service lldpad first
-#: src/modules/FcoeClient.rb:862
+#: src/modules/FcoeClient.rb:868
 msgid "Cannot start service 'lldpad'"
 msgstr ""
 
-#: src/modules/FcoeClient.rb:871
+#: src/modules/FcoeClient.rb:877
 #, fuzzy
 #| msgid "Cannot detect devices."
 msgid "Cannot start service 'fcoe'"
 msgstr "Finner ingen enheter."
 
 #. first start lldpad
-#: src/modules/FcoeClient.rb:891
+#: src/modules/FcoeClient.rb:897
 msgid "Cannot start lldpad systemd socket"
 msgstr ""
 
-#: src/modules/FcoeClient.rb:905
+#: src/modules/FcoeClient.rb:910
+#, fuzzy
+#| msgid "Cannot start winbind service."
+msgid "Cannot start lldpad service."
+msgstr "Kan ikke starte winbind-tjeneste."
+
+#: src/modules/FcoeClient.rb:922
 msgid "Cannot start fcoemon systemd socket."
 msgstr ""
 
+#: src/modules/FcoeClient.rb:935
+#, fuzzy
+#| msgid "Cannot restart the service."
+msgid "Cannot start fcoe service."
+msgstr "Kan ikke starte tjenesten på nytt."
+
 #. warning if no valid configuration found
-#: src/modules/FcoeClient.rb:1061
+#: src/modules/FcoeClient.rb:1101
 msgid ""
 "Cannot read config file for %1.\n"
 "You may edit the settings and recreate the FCoE\n"
@@ -589,130 +640,113 @@
 "du kan redigere innstillingene og opprette FCoE\n"
 "VLAN-grensesnittet på nytt for å lage et gyldig oppsett."
 
-#. it's about a flag which is not set at all
-#: src/modules/FcoeClient.rb:1099 src/modules/FcoeClient.rb:1105
-#: src/modules/FcoeClient.rb:1110
-msgid "not set"
-msgstr ""
-
-#. also about setting of a flag
-#: src/modules/FcoeClient.rb:1102 src/modules/FcoeClient.rb:1107
-#: src/modules/FcoeClient.rb:1112
-msgid "true"
-msgstr ""
-
-#: src/modules/FcoeClient.rb:1102 src/modules/FcoeClient.rb:1107
-#: src/modules/FcoeClient.rb:1112
-msgid "false"
-msgstr ""
-
 #. FcoeClient read dialog caption
-#: src/modules/FcoeClient.rb:1442
+#: src/modules/FcoeClient.rb:1466
 msgid "Initializing fcoe-client Configuration"
 msgstr "Initialiserer oppsett for fcoe-klient"
 
 #. Progress stage 1/3
-#: src/modules/FcoeClient.rb:1457
+#: src/modules/FcoeClient.rb:1481
 msgid "Check installed packages"
 msgstr "Kontroller installerte pakker"
 
 #. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1459
+#: src/modules/FcoeClient.rb:1483
 msgid "Check services"
 msgstr "Kontroller tjenester"
 
 #. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1461
+#: src/modules/FcoeClient.rb:1485
 msgid "Detect network cards"
 msgstr "Søk etter nettverkskort"
 
 #. Progress stage 4/4
-#: src/modules/FcoeClient.rb:1463
+#: src/modules/FcoeClient.rb:1487
 msgid "Read /etc/fcoe/config"
 msgstr "Les /etc/fcoe/config"
 
 #. Progress step 1/3
-#: src/modules/FcoeClient.rb:1467
+#: src/modules/FcoeClient.rb:1491
 msgid "Checking for installed packages..."
 msgstr "Søker etter installerte pakker..."
 
 #. Progress step 2/3
-#: src/modules/FcoeClient.rb:1469
+#: src/modules/FcoeClient.rb:1493
 msgid "Checking for services..."
 msgstr "Søker etter tjenester..."
 
 #. Progress step 3/3
-#: src/modules/FcoeClient.rb:1471
+#: src/modules/FcoeClient.rb:1495
 msgid "Detecting network cards..."
 msgstr "Søker etter nettverkskort..."
 
 #. Progress step 4/4
-#: src/modules/FcoeClient.rb:1473
+#: src/modules/FcoeClient.rb:1497
 msgid "Reading /etc/fcoe/config"
 msgstr "Leser /etc/fcoe/config"
 
 #. Progress finished
 #. Progress finished
-#: src/modules/FcoeClient.rb:1475 src/modules/FcoeClient.rb:1569
+#: src/modules/FcoeClient.rb:1499 src/modules/FcoeClient.rb:1593
 msgid "Finished"
 msgstr "Fullført"
 
 #. Error message
-#: src/modules/FcoeClient.rb:1501
+#: src/modules/FcoeClient.rb:1525
 msgid "Starting of services failed."
 msgstr "Start av tjenester mislyktes."
 
 #. Error message
-#: src/modules/FcoeClient.rb:1514
+#: src/modules/FcoeClient.rb:1538
 msgid "Cannot detect devices."
 msgstr "Finner ingen enheter."
 
 #. Error message
-#: src/modules/FcoeClient.rb:1524
+#: src/modules/FcoeClient.rb:1548
 msgid "Cannot read /etc/fcoe/config."
 msgstr "Kan ikke lese /etc/fcoe/config."
 
 #. FcoeClient read dialog caption
-#: src/modules/FcoeClient.rb:1540
+#: src/modules/FcoeClient.rb:1564
 msgid "Saving fcoe-client Configuration"
 msgstr "Lagrer oppsett for fcoe-klient"
 
 #. Progress stage 1/2
-#: src/modules/FcoeClient.rb:1555
+#: src/modules/FcoeClient.rb:1579
 msgid "Write the settings"
 msgstr "Lagre innstillingene"
 
 #. Progress stage 2/3
-#: src/modules/FcoeClient.rb:1557
+#: src/modules/FcoeClient.rb:1581
 msgid "Restart FCoE service"
 msgstr "Start FCoE-tjenestene på nytt"
 
 #. Progress stage 3/3
-#: src/modules/FcoeClient.rb:1559
+#: src/modules/FcoeClient.rb:1583
 msgid "Adjust start of services"
 msgstr "Tilpass start av tjenester"
 
 #. Progress step 1/2
-#: src/modules/FcoeClient.rb:1563
+#: src/modules/FcoeClient.rb:1587
 msgid "Writing the settings..."
 msgstr "Lagrer innstillingene..."
 
 #. Progress step 2/3
-#: src/modules/FcoeClient.rb:1565
+#: src/modules/FcoeClient.rb:1589
 msgid "Restarting FCoE service..."
 msgstr "Starter FCoE-tjenestene på nytt..."
 
 #. Progress sstep 3/3
-#: src/modules/FcoeClient.rb:1567
+#: src/modules/FcoeClient.rb:1591
 msgid "Adjusting start of services..."
 msgstr "Tilpasser start av tjenester..."
 
 #. Error message
-#: src/modules/FcoeClient.rb:1587
+#: src/modules/FcoeClient.rb:1611
 msgid "Cannot write settings to /etc/fcoe/config."
 msgstr "Kan ikke lagre innstillinger i /etc/fcoe/config."
 
-#: src/modules/FcoeClient.rb:1593
+#: src/modules/FcoeClient.rb:1617
 msgid ""
 "Cannot write settings for FCoE interfaces.\n"
 "For details, see /var/log/YaST2/y2log."
@@ -721,43 +755,43 @@
 "Du finner mer informasjon i /var/log/YaST2/y2log."
 
 #. Error message
-#: src/modules/FcoeClient.rb:1605
+#: src/modules/FcoeClient.rb:1629
 msgid "Restarting of service fcoe failed."
 msgstr "Kunne ikke starte fcoe-tjenesten på nytt."
 
 #. Error message
-#: src/modules/FcoeClient.rb:1612
+#: src/modules/FcoeClient.rb:1636
 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:1669
+#: src/modules/FcoeClient.rb:1693
 msgid "<b>General FCoE configuration</b>"
 msgstr "<b>Generelt FCoE-oppsett</b>"
 
 #. options from config file, not meant for translation
-#: src/modules/FcoeClient.rb:1683
+#: src/modules/FcoeClient.rb:1707
 msgid "<b>Interfaces</b>"
 msgstr "<b>Grensesnitt</b>"
 
 #. network card, e.g. eth0
-#: src/modules/FcoeClient.rb:1691
+#: src/modules/FcoeClient.rb:1715
 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:1701
+#: src/modules/FcoeClient.rb:1725
 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:1709 src/modules/FcoeClient.rb:1719
+#: src/modules/FcoeClient.rb:1733 src/modules/FcoeClient.rb:1743
 msgid "enabled"
 msgstr "aktivert"
 
-#: src/modules/FcoeClient.rb:1710 src/modules/FcoeClient.rb:1720
+#: src/modules/FcoeClient.rb:1734 src/modules/FcoeClient.rb:1744
 msgid "disabled"
 msgstr "deaktivert"
 

Modified: trunk/yast/nb/po/firewall-services.nb.po
===================================================================
--- trunk/yast/nb/po/firewall-services.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/firewall-services.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: firewall-services\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:32+0200\n"
+"POT-Creation-Date: 2014-07-04 15:54+0200\n"
 "PO-Revision-Date: 2008-10-31 00:11+0100\n"
 "Last-Translator: Olav P. <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <>\n"

Modified: trunk/yast/nb/po/firewall.nb.po
===================================================================
--- trunk/yast/nb/po/firewall.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/firewall.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: firewall\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:56+0100\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2009-08-08 08:45+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"

Modified: trunk/yast/nb/po/firstboot.nb.po
===================================================================
--- trunk/yast/nb/po/firstboot.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/firstboot.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: firstboot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:56+0100\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2009-10-01 12:23+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"

Modified: trunk/yast/nb/po/ftp-server.nb.po
===================================================================
--- trunk/yast/nb/po/ftp-server.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/ftp-server.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: base\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:38+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2010-05-19 21:34+0200\n"
 "Last-Translator: Olav Pettershagen <olpetter@bbnett.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"

Modified: trunk/yast/nb/po/geo-cluster.nb.po
===================================================================
--- trunk/yast/nb/po/geo-cluster.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/geo-cluster.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2014-05-19 09:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -36,8 +36,8 @@
 #. GeoCluster configure2 dialog caption
 #. Initialization dialog caption
 #: src/include/geo-cluster/complex.rb:83
-#: src/include/geo-cluster/dialogs.rb:310
-#: src/include/geo-cluster/wizards.rb:97
+#: src/include/geo-cluster/dialogs.rb:430
+#: src/include/geo-cluster/wizards.rb:140
 msgid "GeoCluster Configuration"
 msgstr ""
 
@@ -72,92 +72,299 @@
 #.
 #. $Id: dialogs.ycp 27914 2006-02-13 14:32:08Z locilka $
 #: src/include/geo-cluster/dialogs.rb:51
+#, fuzzy
+#| msgid "Read configuration file"
+msgid "configuration file"
+msgstr "Les oppsettfil"
+
+#: src/include/geo-cluster/dialogs.rb:59
 msgid "arbitrator ip"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:57
+#: src/include/geo-cluster/dialogs.rb:65
 msgid "transport"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:63
+#: src/include/geo-cluster/dialogs.rb:71
 msgid "port"
-msgstr ""
+msgstr "port"
 
-#: src/include/geo-cluster/dialogs.rb:68
+#: src/include/geo-cluster/dialogs.rb:76
 msgid "site"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:71 src/include/geo-cluster/dialogs.rb:81
+#: src/include/geo-cluster/dialogs.rb:79
+#: src/include/geo-cluster/dialogs.rb:653
 msgid "Add"
-msgstr ""
+msgstr "Legg til"
 
-#: src/include/geo-cluster/dialogs.rb:72 src/include/geo-cluster/dialogs.rb:82
+#: src/include/geo-cluster/dialogs.rb:80
+#: src/include/geo-cluster/dialogs.rb:654
 msgid "Edit"
-msgstr ""
+msgstr "Rediger"
 
-#: src/include/geo-cluster/dialogs.rb:73 src/include/geo-cluster/dialogs.rb:83
+#: src/include/geo-cluster/dialogs.rb:81
+#: src/include/geo-cluster/dialogs.rb:655
 msgid "Delete"
-msgstr ""
+msgstr "Slett"
 
-#: src/include/geo-cluster/dialogs.rb:78
-#: src/include/geo-cluster/dialogs.rb:144
+#: src/include/geo-cluster/dialogs.rb:87
+#: src/include/geo-cluster/dialogs.rb:178
 msgid "ticket"
 msgstr ""
 
 #. return `cacel or a string
-#: src/include/geo-cluster/dialogs.rb:104
-#: src/include/geo-cluster/dialogs.rb:150
+#: src/include/geo-cluster/dialogs.rb:98
+#: src/include/geo-cluster/dialogs.rb:120
+#: src/include/geo-cluster/dialogs.rb:197
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
-#: src/include/geo-cluster/dialogs.rb:105
-#: src/include/geo-cluster/dialogs.rb:151
+#: src/include/geo-cluster/dialogs.rb:99
+#: src/include/geo-cluster/dialogs.rb:121
+#: src/include/geo-cluster/dialogs.rb:198
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
-#. parser value first
-#: src/include/geo-cluster/dialogs.rb:142
+#: src/include/geo-cluster/dialogs.rb:135
+#, fuzzy
+#| msgid "Please enter a password"
+msgid "Please enter valid ip address"
+msgstr "Angi et passord"
+
+#: src/include/geo-cluster/dialogs.rb:176
 msgid "Enter ticket and timeout"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:145
+#: src/include/geo-cluster/dialogs.rb:182
 msgid "timeout"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:164
+#: src/include/geo-cluster/dialogs.rb:184
+#, fuzzy
+#| msgid "No entries."
+msgid "retries"
+msgstr "Ingen oppføringer."
+
+#: src/include/geo-cluster/dialogs.rb:186
+#, fuzzy
+#| msgid "Height"
+msgid "weights"
+msgstr "Høyde"
+
+#: src/include/geo-cluster/dialogs.rb:188
+#, fuzzy
+#| msgid "Expired"
+msgid "expire"
+msgstr "Utløpt"
+
+#: src/include/geo-cluster/dialogs.rb:190
+#, fuzzy
+#| msgid "Required patterns"
+msgid "acquire-after"
+msgstr "Nødvendige mønstre"
+
+#: src/include/geo-cluster/dialogs.rb:192
+msgid "before-acquire-handler"
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:229
 msgid "timeout is no valid"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:166
+#: src/include/geo-cluster/dialogs.rb:231
+#, fuzzy
+#| msgid "' is not valid."
+msgid "expire is no valid"
+msgstr "' er ikke gyldig."
+
+#
+#: src/include/geo-cluster/dialogs.rb:233
+#, fuzzy
+#| msgid "URL entered is not valid"
+msgid "acquireafter is no valid"
+msgstr "Den angitte nettadressen er ikke gyldig"
+
+#
+#: src/include/geo-cluster/dialogs.rb:235
+#, fuzzy
+#| msgid "URL entered is not valid"
+msgid "retries is no valid"
+msgstr "Den angitte nettadressen er ikke gyldig"
+
+#: src/include/geo-cluster/dialogs.rb:237
+msgid "retries values lower than 3 is illegal"
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:239
+#, fuzzy
+#| msgid "' is not valid."
+msgid "weights is no valid"
+msgstr "' er ikke gyldig."
+
+#: src/include/geo-cluster/dialogs.rb:241
 msgid "ticket can not be null"
 msgstr ""
 
+#. fill confs with global_files
+#: src/include/geo-cluster/dialogs.rb:332
+#, fuzzy
+#| msgid "Software to be installed:"
+msgid "site have to be filled"
+msgstr "Programvare som skal installeres:"
+
+#: src/include/geo-cluster/dialogs.rb:337
+#, fuzzy
+#| msgid "Software to be installed:"
+msgid "ticket have to be filled"
+msgstr "Programvare som skal installeres:"
+
+#: src/include/geo-cluster/dialogs.rb:344
+#: src/include/geo-cluster/dialogs.rb:582
+#, fuzzy
+#| msgid "Gateway IP address is invalid."
+msgid "arbitrator IP address is invalid!"
+msgstr "Systemportens IP-adresse er ugyldig."
+
 #. servie:geo-cluster is the  name of /etc/sysconfig/SuSEfirewall2.d/services/geo-cluster
-#: src/include/geo-cluster/dialogs.rb:278
+#: src/include/geo-cluster/dialogs.rb:389
 msgid "Geo Cluster(geo-cluster) firewall configure"
 msgstr ""
 
 #. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
 #. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:317
+#. FIXME ugly work. Better use alias and function, see yast2 drbd.
+#: src/include/geo-cluster/dialogs.rb:439
+#: src/include/geo-cluster/dialogs.rb:669
 msgid "Geo Cluster configure"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:330
+#: src/include/geo-cluster/dialogs.rb:494
 msgid "Enter an IP address of your site"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:343
+#: src/include/geo-cluster/dialogs.rb:505
 msgid "Edit IP address of your site"
 msgstr ""
 
+#: src/include/geo-cluster/dialogs.rb:527
+#, fuzzy
+#| msgid "Zone name %1 already exists."
+msgid "Ticket name already exist!"
+msgstr "Sonenavnet %1 finnes allerede."
+
+#. abort?
+#: src/include/geo-cluster/dialogs.rb:573
+#, fuzzy
+#| msgid "Configuration name cannot be empty."
+msgid "Configuration name can not be null"
+msgstr "Du må angi et navn på oppsettet."
+
+#: src/include/geo-cluster/dialogs.rb:576
+#, fuzzy
+#| msgid "Configuration name cannot be empty."
+msgid "Configuration name can not be duplicated."
+msgstr "Du må angi et navn på oppsettet."
+
+#: src/include/geo-cluster/dialogs.rb:589
+#, fuzzy
+#| msgid "Key is invalid."
+msgid "port is invalid!"
+msgstr "Nøkkelen er ugyldig."
+
+#: src/include/geo-cluster/dialogs.rb:595
+msgid "transport have to be filled!"
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:600
+#, fuzzy
+#| msgid "Software to be installed:"
+msgid "site have to be filled!"
+msgstr "Programvare som skal installeres:"
+
+#: src/include/geo-cluster/dialogs.rb:605
+#, fuzzy
+#| msgid "Software to be installed:"
+msgid "ticket have to be filled!"
+msgstr "Programvare som skal installeres:"
+
+#. GeoCluster choose configure dialog caption
+#: src/include/geo-cluster/dialogs.rb:644
+#, fuzzy
+#| msgid "Host Configuration Summary:"
+msgid "GeoCluster Configuration Select"
+msgstr "Vertsmaskiner, oppsettssammendrag:"
+
+#. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
+#. Label::BackButton(), Label::NextButton());
+#: src/include/geo-cluster/dialogs.rb:650
+#, fuzzy
+#| msgid "Read configuration file"
+msgid "Choose configuration file:"
+msgstr "Les oppsettfil"
+
+#. encoding: utf-8
+#. ------------------------------------------------------------------------------
+#. Copyright (c) 2006 Novell, Inc. All Rights Reserved.
+#.
+#.
+#. This program is free software; you can redistribute it and/or modify it under
+#. the terms of version 2 of the GNU General Public License as published by the
+#. Free Software Foundation.
+#.
+#. This program is distributed in the hope that it will be useful, but WITHOUT
+#. ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#. FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#.
+#. You should have received a copy of the GNU General Public License along with
+#. this program; if not, contact Novell, Inc.
+#.
+#. To contact Novell about this file by physical or electronic mail, you may find
+#. current contact information at www.novell.com.
+#. ------------------------------------------------------------------------------
+#. File:	include/geo-cluster/wizards.ycp
+#. Package:	Configuration of geo-cluster
+#. Summary:	Wizards definitions
+#. Authors:	Dongmao Zhang <dmzhang@suse.com>
+#.
+#. $Id: wizards.ycp 27914 2006-02-13 14:32:08Z locilka $
+#: src/include/geo-cluster/wizards.rb:46
+#, fuzzy
+#| msgid "Printer Configurations"
+msgid "GeoCluster Configurations"
+msgstr "Skriveroppsett"
+
+#: src/include/geo-cluster/wizards.rb:47
+msgid "Firewall Configuration"
+msgstr "Brannmurkonfigurasjon"
+
 #. Initialization dialog contents
-#: src/include/geo-cluster/wizards.rb:99
+#: src/include/geo-cluster/wizards.rb:142
 msgid "Initializing..."
+msgstr "Initialiserer ..."
+
+#. Not necessary to use remove_list_quote?
+#: src/modules/GeoCluster.rb:224
+#, fuzzy
+#| msgid "Cannot write general settings."
+msgid "Cannot write global conf settings."
+msgstr "Kan ikke lagre generelle innstillinger."
+
+#. List like site
+#: src/modules/GeoCluster.rb:242
+msgid "Cannot write global settings."
 msgstr ""
 
+#. Empty (all Int) ticket will be ignore by ag_booth
+#. Create a ticket item
+#: src/modules/GeoCluster.rb:266
+#, fuzzy
+#| msgid "Cannot write general settings."
+msgid "Cannot write global ticket settings."
+msgstr "Kan ikke lagre generelle innstillinger."
+
 #. GeoCluster read dialog caption
-#: src/modules/GeoCluster.rb:168 src/modules/GeoCluster2.pm:129
+#: src/modules/GeoCluster.rb:273 src/modules/GeoCluster2.pm:129
 msgid "Initializing geo-cluster Configuration"
 msgstr ""
 
@@ -166,120 +373,108 @@
 #. We do not set help text here, because it was set outside
 #. #-#-#-#-#  geo-cluster.xgettext.pot  #-#-#-#-#
 #. Progress stage 2/3
-#: src/modules/GeoCluster.rb:182 src/modules/GeoCluster2.pm:143
+#: src/modules/GeoCluster.rb:286 src/modules/GeoCluster2.pm:143
 msgid "Read the previous settings"
-msgstr ""
+msgstr "Les tidligere innstillinger"
 
-#: src/modules/GeoCluster.rb:182 src/modules/GeoCluster.rb:185
+#: src/modules/GeoCluster.rb:286 src/modules/GeoCluster.rb:289
 msgid "Read SuSEFirewall Settings"
 msgstr ""
 
 #. #-#-#-#-#  geo-cluster.xgettext.pot  #-#-#-#-#
 #. Progress step 2/3
-#: src/modules/GeoCluster.rb:184 src/modules/GeoCluster2.pm:150
+#: src/modules/GeoCluster.rb:288 src/modules/GeoCluster2.pm:150
 msgid "Reading the previous settings..."
-msgstr ""
+msgstr "Leser tidligere innstillinger..."
 
 #. Progress finished
-#: src/modules/GeoCluster.rb:186 src/modules/GeoCluster.rb:282
+#: src/modules/GeoCluster.rb:290 src/modules/GeoCluster.rb:358
 #: src/modules/GeoCluster2.pm:154 src/modules/GeoCluster2.pm:232
 msgid "Finished"
-msgstr ""
+msgstr "Fullført"
 
+#. #-#-#-#-#  geo-cluster.rxgettext.pot (PACKAGE VERSION)  #-#-#-#-#
+#. GeoCluster write dialog caption
+#. #-#-#-#-#  geo-cluster.xgettext.pot  #-#-#-#-#
 #. GeoCluster read dialog caption
-#: src/modules/GeoCluster.rb:255 src/modules/GeoCluster2.pm:211
+#: src/modules/GeoCluster.rb:332 src/modules/GeoCluster2.pm:211
 msgid "Saving geo-cluster Configuration"
 msgstr ""
 
 #. Progress stage 1/2
-#: src/modules/GeoCluster.rb:272 src/modules/GeoCluster2.pm:223
+#: src/modules/GeoCluster.rb:348 src/modules/GeoCluster2.pm:223
 msgid "Write the settings"
-msgstr ""
+msgstr "Lagre innstillingene"
 
 #. Progress stage 2/2
-#: src/modules/GeoCluster.rb:274
+#: src/modules/GeoCluster.rb:350
 msgid "Write the SuSEfirewall settings"
 msgstr ""
 
 #. Progress step 1/2
-#: src/modules/GeoCluster.rb:278 src/modules/GeoCluster2.pm:228
+#: src/modules/GeoCluster.rb:354 src/modules/GeoCluster2.pm:228
 msgid "Writing the settings..."
-msgstr ""
+msgstr "Lagrer innstillingene..."
 
 #. Progress step 2/2
-#: src/modules/GeoCluster.rb:280
+#: src/modules/GeoCluster.rb:356
 msgid "Writing the SuSEFirewall settings"
 msgstr ""
 
-#. read sites
-#: src/modules/GeoCluster.rb:311
-msgid "Cannot write global settings."
-msgstr ""
-
-#. write site
-#: src/modules/GeoCluster.rb:315
-msgid "Cannot write sites settings."
-msgstr ""
-
-#. write ticket
-#: src/modules/GeoCluster.rb:318
-msgid "Cannot write ticket settings."
-msgstr ""
-
 #. #-#-#-#-#  geo-cluster.rxgettext.pot (PACKAGE VERSION)  #-#-#-#-#
 #. Error message
-#: src/modules/GeoCluster.rb:324 src/modules/GeoCluster2.pm:242
+#: src/modules/GeoCluster.rb:379 src/modules/GeoCluster2.pm:242
 msgid "Cannot write settings."
-msgstr ""
+msgstr "Kan ikke lagre innstillingene."
 
 #. TODO FIXME: your code here...
 #. Configuration summary text for autoyast
-#: src/modules/GeoCluster.rb:372
+#: src/modules/GeoCluster.rb:440
 msgid "Configuration summary..."
-msgstr ""
+msgstr "Konfigurasjonssammendrag..."
 
 #. Progress stage 1/3
 #: src/modules/GeoCluster2.pm:141
 msgid "Read the database"
-msgstr ""
+msgstr "Les databasen"
 
 #. Progress stage 3/3
 #: src/modules/GeoCluster2.pm:145
 msgid "Detect the devices"
-msgstr ""
+msgstr "Søk etter enheter"
 
 #. Progress step 1/3
 #: src/modules/GeoCluster2.pm:148
 msgid "Reading the database..."
-msgstr ""
+msgstr "Leser databasen..."
 
 #. Progress step 3/3
 #: src/modules/GeoCluster2.pm:152
 msgid "Detecting the devices..."
-msgstr ""
+msgstr "Søker etter enheter..."
 
 #: src/modules/GeoCluster2.pm:164
 msgid "Cannot read the database1."
-msgstr ""
+msgstr "Kan ikke lese database1."
 
 #: src/modules/GeoCluster2.pm:173
 msgid "Cannot read the database2."
-msgstr ""
+msgstr "Kan ikke lese database2."
 
 #: src/modules/GeoCluster2.pm:191
 msgid "Cannot detect devices."
-msgstr ""
+msgstr "Finner ingen enheter."
 
 #. Progress stage 2/2
 #: src/modules/GeoCluster2.pm:225
 msgid "Run SuSEconfig"
-msgstr ""
+msgstr "Kjør SuSEconfig"
 
 #. Progress step 2/2
 #: src/modules/GeoCluster2.pm:230
 msgid "Running SuSEconfig..."
-msgstr ""
+msgstr "Kjører SuSEconfig..."
 
 #: src/modules/GeoCluster2.pm:295
 msgid "Configuration summary ..."
-msgstr ""
+msgstr "Konfigurasjonssammendrag..."

Modified: trunk/yast/nb/po/gtk.nb.po
===================================================================
--- trunk/yast/nb/po/gtk.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/gtk.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: yast2-gtk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2010-06-09 11:15+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -189,11 +189,11 @@
 
 #: src/YGUtils.cc:643
 msgid "Back"
-msgstr ""
+msgstr "Tilbake"
 
 #: src/YGUtils.cc:644
 msgid "Next"
-msgstr ""
+msgstr "Neste"
 
 #: src/ygtksteps.c:75
 msgid "Current step"

Modified: trunk/yast/nb/po/http-server.nb.po
===================================================================
--- trunk/yast/nb/po/http-server.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/http-server.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: http-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:38+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2009-08-11 18:45+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"

Modified: trunk/yast/nb/po/inetd.nb.po
===================================================================
--- trunk/yast/nb/po/inetd.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/inetd.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: inetd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2008-12-11 08:27+0100\n"
 "Last-Translator: Olav P. <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <>\n"

Modified: trunk/yast/nb/po/installation.nb.po
===================================================================
--- trunk/yast/nb/po/installation.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/installation.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: installation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-09-03 16:45+0200\n"
 "PO-Revision-Date: 2011-01-13 22:52+0100\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -75,22 +75,22 @@
 
 #. TRANSLATORS: Installation overview
 #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
-#: src/clients/clone_proposal.rb:96
+#: src/clients/clone_proposal.rb:98
 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)."
 msgstr ""
 
 #. TRANSLATORS: Installation overview
 #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
-#: src/clients/clone_proposal.rb:105
+#: src/clients/clone_proposal.rb:107
 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)."
 msgstr ""
 
-#: src/clients/clone_proposal.rb:117
+#: src/clients/clone_proposal.rb:119
 msgid "Write AutoYaST profile to /root/autoinst.xml"
 msgstr ""
 
 #. progress step title
-#: src/clients/copy_files_finish.rb:78
+#: src/clients/copy_files_finish.rb:81
 msgid "Copying files to installed system..."
 msgstr "Kopierer filer til installert system..."
 
@@ -254,7 +254,7 @@
 msgstr "Installasjon fra diskbilder er deaktivert (<a href=\"%1\">aktiver</a>)."
 
 #. progress step title
-#: src/clients/desktop_finish.rb:73
+#: src/clients/desktop_finish.rb:70
 msgid "Initializing default window manager..."
 msgstr "Initialiserer standard vindushåndterer..."
 
@@ -289,6 +289,7 @@
 msgstr "Oppdateringer for %1 %2"
 
 #: src/clients/inst_addon_update_sources.rb:173
+#: src/clients/inst_system_analysis.rb:301
 msgid "Unknown Product"
 msgstr "Ukjent produkt"
 
@@ -347,7 +348,7 @@
 #. this type of contents will be shown only for initial installation dialog
 #. TRANSLATORS: dialog caption
 #: src/clients/inst_complex_welcome.rb:137
-#: src/clients/inst_complex_welcome.rb:312
+#: src/clients/inst_complex_welcome.rb:318
 msgid "License Agreement"
 msgstr "Lisensavtale"
 
@@ -420,10 +421,24 @@
 "installasjonen når som helst.\n"
 "</p>\n"
 
-#: src/clients/inst_complex_welcome.rb:336
-msgid "License needs to be accepted"
-msgstr "Lisensen må godkjennes"
+#. In case of going back, Release Notes button may be shown, retranslate it (bnc#886660)
+#. Assure that relnotes have been downloaded first
+#. exit codes (see "man curl"):
+#. 7 = Failed to connect to host.
+#. 28 = Operation timeout.
+#. push button
+#: src/clients/inst_complex_welcome.rb:230
+#: src/clients/inst_download_release_notes.rb:139
+#: src/clients/inst_system_analysis.rb:299
+#, fuzzy
+#| msgid "Release Notes"
+msgid "Re&lease Notes..."
+msgstr "Versjonsmerknader"
 
+#: src/clients/inst_complex_welcome.rb:342
+msgid "You must accept the license to install this product"
+msgstr ""
+
 #. TRANSLATORS: check box, see #ZMD
 #: src/clients/inst_congratulate.rb:107
 msgid "&Disable ZMD Service"
@@ -535,7 +550,7 @@
 #. OEM image if target disk is defined
 #: src/clients/inst_deploy_image.rb:46
 msgid "The system will reboot now..."
-msgstr ""
+msgstr "Maskinen vil bli startet på nytt nå..."
 
 #. bnc #395030
 #. Use less memory
@@ -628,11 +643,11 @@
 msgid "Configure &FCoE Interfaces"
 msgstr "Sett opp &FCoE-grensesnitt"
 
-#: src/clients/inst_disks_activate.rb:112
+#: src/clients/inst_disks_activate.rb:111
 msgid "Configure &iSCSI Disks"
 msgstr "Konfigurer &iSCSI-disker"
 
-#: src/clients/inst_disks_activate.rb:113
+#: src/clients/inst_disks_activate.rb:112
 #, fuzzy
 #| msgid "Saving network configuration..."
 msgid "Change Net&work Configuration"
@@ -655,15 +670,22 @@
 msgid "<p>Installation is just about to start!</p>"
 msgstr "<p>Installasjonen begynner straks!</p>"
 
-#. download release notes now
-#. push button
-#: src/clients/inst_download_release_notes.rb:135
-#: src/clients/inst_system_analysis.rb:356
-#, fuzzy
-#| msgid "Release Notes"
-msgid "Re&lease Notes..."
-msgstr "Versjonsmerknader"
+#. Set the UI content to show some progress.
+#. TODO FIXME: use a better title (reused existing texts because of text freeze)
+#. TRANSLATORS: dialog caption
+#. bug #302384
+#: src/clients/inst_download_release_notes.rb:147
+#: src/clients/inst_initialization.rb:56
+#: src/clients/inst_installation_options.rb:151
+msgid "Initializing"
+msgstr "Initialiserer"
 
+#. TRANSLATORS: dialog progress message
+#: src/clients/inst_download_release_notes.rb:147
+#: src/clients/inst_initialization.rb:44
+msgid "Initializing the installation..."
+msgstr "Initialiserer installasjonen..."
+
 #. popup message, list of repositores is appended to the text
 #: src/clients/inst_extrasources.rb:150
 msgid "Package updates have been found in these additional repositories:"
@@ -682,64 +704,64 @@
 #. Adjust a SlideShow dialog if not configured
 #. kilobytes
 #. just make it longer than inst_finish, TODO: better value later
-#: src/clients/inst_finish.rb:85 src/clients/inst_prepareprogress.rb:139
+#: src/clients/inst_finish.rb:88 src/clients/inst_prepareprogress.rb:139
 #: src/clients/inst_prepareprogress.rb:157
 msgid "Finishing Basic Installation"
 msgstr "Fullfører grunninstallasjon"
 
 #. Might be left from the previous stage
-#: src/clients/inst_finish.rb:111
+#: src/clients/inst_finish.rb:114
 msgid "Creating list of finish scripts to call..."
 msgstr "Oppretter liste over fullføringsskript som skal kjøres..."
 
 #. progress stage
-#: src/clients/inst_finish.rb:127
+#: src/clients/inst_finish.rb:213
 msgid "Copy files to installed system"
 msgstr "Kopier filer til installert system"
 
 #. progress stage
-#: src/clients/inst_finish.rb:142
+#: src/clients/inst_finish.rb:220
 msgid "Save configuration"
 msgstr "Lagre konfigurasjon"
 
 #. progress stage
-#: src/clients/inst_finish.rb:169
+#: src/clients/inst_finish.rb:227
 msgid "Save installation settings"
 msgstr "Lagre installasjonsinnstillinger"
 
 #. progress stage
-#: src/clients/inst_finish.rb:188
+#: src/clients/inst_finish.rb:236
 msgid "Install boot manager"
 msgstr "Installer oppstartslaster"
 
 #. progress stage
-#: src/clients/inst_finish.rb:200
+#: src/clients/inst_finish.rb:243
 msgid "Prepare system for initial boot"
 msgstr "Klargjør systemet for første oppstart"
 
 #. merge steps from add-on products
 #. bnc #438678
-#: src/clients/inst_finish.rb:305
+#: src/clients/inst_finish.rb:348
 msgid "Checking stage: %1..."
 msgstr "Kontrollerer trinn: %1..."
 
 #. a fallback busy message
-#: src/clients/inst_finish.rb:394
+#: src/clients/inst_finish.rb:437
 msgid "Calling step %1..."
 msgstr "Kjører trinn %1..."
 
 #. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log
-#: src/clients/inst_finish.rb:414
+#: src/clients/inst_finish.rb:457
 msgid " * %1"
 msgstr " * %1"
 
 #. Anything else
-#: src/clients/inst_finish.rb:451
+#: src/clients/inst_finish.rb:494
 msgid "Finished"
 msgstr "Fullført"
 
 #. get the latest errors
-#: src/clients/inst_finish.rb:582
+#: src/clients/inst_finish.rb:625
 msgid "Installation Error"
 msgstr "Installasjonsfeil"
 
@@ -758,11 +780,6 @@
 msgid "Installation is being initialized."
 msgstr "Installasjonen initialiseres."
 
-#. TRANSLATORS: dialog progress message
-#: src/clients/inst_initialization.rb:44
-msgid "Initializing the installation..."
-msgstr "Initialiserer installasjonen..."
-
 #. TRANSLATORS: dialog help
 #. help for the dialog - busy message
 #: src/clients/inst_initialization.rb:48
@@ -775,13 +792,6 @@
 msgid "Preparing the initial system configuration..."
 msgstr "Klargjør første systemkonfigurasjon..."
 
-#. TRANSLATORS: dialog caption
-#. bug #302384
-#: src/clients/inst_initialization.rb:56
-#: src/clients/inst_installation_options.rb:151
-msgid "Initializing"
-msgstr "Initialiserer"
-
 #. dialog caption
 #: src/clients/inst_installation_options.rb:83
 #, fuzzy
@@ -994,12 +1004,12 @@
 msgstr ""
 
 #. message show when user has disabled the configuration
-#: src/clients/inst_proposal.rb:240
+#: src/clients/inst_proposal.rb:238
 msgid "Skipping configuration upon user request"
 msgstr "Hopper over konfigurasjon etter ønske fra bruker"
 
 #. error message is a popup
-#: src/clients/inst_proposal.rb:257
+#: src/clients/inst_proposal.rb:255
 msgid ""
 "The proposal contains an error that must be\n"
 "resolved before continuing.\n"
@@ -1010,31 +1020,31 @@
 #. not using tabs
 #. heading in proposal, in case the module doesn't create one
 #. heading in proposal, in case the module doesn't create one
-#: src/clients/inst_proposal.rb:498 src/clients/inst_proposal.rb:500
-#: src/clients/inst_proposal.rb:514 src/clients/inst_proposal.rb:557
-#: src/clients/inst_proposal.rb:559 src/clients/inst_proposal.rb:569
+#: src/clients/inst_proposal.rb:496 src/clients/inst_proposal.rb:498
+#: src/clients/inst_proposal.rb:512 src/clients/inst_proposal.rb:555
+#: src/clients/inst_proposal.rb:557 src/clients/inst_proposal.rb:567
 msgid "ERROR: Missing Title"
 msgstr "FEIL: Tittel mangler"
 
 #. busy message
-#: src/clients/inst_proposal.rb:525
+#: src/clients/inst_proposal.rb:523
 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/clients/inst_proposal.rb:529 src/clients/inst_proposal.rb:1031
+#: src/clients/inst_proposal.rb:527 src/clients/inst_proposal.rb:1029
 msgid "Analyzing your system..."
 msgstr "Analyserer systemet..."
 
 #. fallback proposal, means usually an internal error
-#: src/clients/inst_proposal.rb:700
+#: src/clients/inst_proposal.rb:698
 msgid "ERROR: No proposal"
 msgstr "FEIL: Ingen forslag"
 
 #. Submodules handle their own error reporting
 #. text for a message box
-#: src/clients/inst_proposal.rb:745
+#: src/clients/inst_proposal.rb:743
 msgid ""
 "Configuration saved.\n"
 "There were errors."
@@ -1043,7 +1053,7 @@
 "Feil ble registrert."
 
 #. dialog headline
-#: src/clients/inst_proposal.rb:949
+#: src/clients/inst_proposal.rb:947
 msgid "Installation Overview"
 msgstr "Oversikt over installasjonen"
 
@@ -1052,25 +1062,25 @@
 #. Translators: About 40 characters max,
 #. use newlines for longer translations.
 #. radio button
-#: src/clients/inst_proposal.rb:973
+#: src/clients/inst_proposal.rb:971
 msgid "&Skip Configuration"
 msgstr "&Hopp over konfigurasjon"
 
 #. radio button
-#: src/clients/inst_proposal.rb:982
+#: src/clients/inst_proposal.rb:980
 msgid "&Use Following Configuration"
 msgstr "&Bruk følgende konfigurasjon"
 
 #. menu button
 #. menu button
 #. TRANSLATORS: Push button
-#: src/clients/inst_proposal.rb:994 src/clients/inst_proposal.rb:1178
-#: src/clients/inst_upgrade_urls.rb:226
+#: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176
+#: src/clients/inst_upgrade_urls.rb:236
 msgid "&Change..."
 msgstr "&Endre..."
 
 #. menu button
-#: src/clients/inst_proposal.rb:1000 src/clients/inst_proposal.rb:1173
+#: src/clients/inst_proposal.rb:998 src/clients/inst_proposal.rb:1171
 #, fuzzy
 #| msgid "&Skip Configuration"
 msgid "&Export Configuration"
@@ -1078,23 +1088,23 @@
 
 #. Help message between headline and installation proposal / settings summary.
 #. May contain newlines, but don't make it very much longer than the original.
-#: src/clients/inst_proposal.rb:1071
+#: src/clients/inst_proposal.rb:1069
 msgid "Click a headline to make changes or use the \"Change...\" menu below."
 msgstr "Klikk på en overskrift for å endre, eller bruk menyen \"Endre...\" nedenfor."
 
-#: src/clients/inst_proposal.rb:1075
+#: src/clients/inst_proposal.rb:1073
 #, 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/clients/inst_proposal.rb:1172
+#: src/clients/inst_proposal.rb:1170
 msgid "&Reset to defaults"
 msgstr "&Tilbakestill til standardinnstillinger"
 
 #. General part of the help text for all types of proposals
-#: src/clients/inst_proposal.rb:1208
+#: src/clients/inst_proposal.rb:1206
 msgid ""
 "<p>\n"
 "Change the values by clicking on the respective headline\n"
@@ -1108,7 +1118,7 @@
 
 #. Help text for installation proposal
 #. General part ("You can change values...") is added as the next paragraph.
-#: src/clients/inst_proposal.rb:1219
+#: src/clients/inst_proposal.rb:1217
 msgid ""
 "<p>\n"
 "Select <b>Install</b> to perform a new installation with the values displayed.\n"
@@ -1139,7 +1149,7 @@
 #. - sh@suse.de 2002-02-26
 #.
 #. Help text for installation proposal, continued
-#: src/clients/inst_proposal.rb:1245 src/clients/inst_proposal.rb:1272
+#: src/clients/inst_proposal.rb:1243 src/clients/inst_proposal.rb:1270
 msgid ""
 "<p>\n"
 "Your hard disk has not been modified yet. You can still safely abort.\n"
@@ -1151,7 +1161,7 @@
 
 #. Help text for update proposal
 #. General part ("You can change values...") is added as the next paragraph.
-#: src/clients/inst_proposal.rb:1255
+#: src/clients/inst_proposal.rb:1253
 msgid ""
 "<p>\n"
 "Select <b>Update</b> to perform an update with the values displayed.\n"
@@ -1163,7 +1173,7 @@
 
 #. Help text for network configuration proposal
 #. General part ("You can change values...") is added as the next paragraph.
-#: src/clients/inst_proposal.rb:1282
+#: src/clients/inst_proposal.rb:1280
 msgid ""
 "<p>\n"
 "Put the network settings into effect by pressing <b>Next</b>.\n"
@@ -1175,7 +1185,7 @@
 
 #. Help text for service configuration proposal
 #. General part ("You can change values...") is added as the next paragraph.
-#: src/clients/inst_proposal.rb:1293
+#: src/clients/inst_proposal.rb:1291
 msgid ""
 "<p>\n"
 "Put the service settings into effect by pressing <b>Next</b>.\n"
@@ -1187,7 +1197,7 @@
 
 #. Help text for hardware configuration proposal
 #. General part ("You can change values...") is added as the next paragraph.
-#: src/clients/inst_proposal.rb:1304
+#: src/clients/inst_proposal.rb:1302
 msgid ""
 "<p>\n"
 "Put the hardware settings into effect by pressing <b>Next</b>.\n"
@@ -1198,12 +1208,12 @@
 "</p>\n"
 
 #. Proposal in uml module
-#: src/clients/inst_proposal.rb:1313
+#: src/clients/inst_proposal.rb:1311
 msgid "<P><B>UML Installation Proposal</B></P>"
 msgstr "<P><B>Forslag til UML-installasjon</B></P>"
 
 #. help text
-#: src/clients/inst_proposal.rb:1315
+#: src/clients/inst_proposal.rb:1313
 msgid ""
 "<P>UML (User Mode Linux) installation allows you to start independent\n"
 "Linux virtual machines in the host system.</P>"
@@ -1214,7 +1224,7 @@
 #. Generic help text for other proposals (not basic installation or
 #. hardhware configuration.
 #. General part ("You can change values...") is added as the next paragraph.
-#: src/clients/inst_proposal.rb:1332
+#: src/clients/inst_proposal.rb:1330
 msgid ""
 "<p>\n"
 "To use the settings as displayed, press <b>Next</b>.\n"
@@ -1225,7 +1235,7 @@
 "</p>\n"
 
 #. help text
-#: src/clients/inst_proposal.rb:1345
+#: src/clients/inst_proposal.rb:1343
 msgid ""
 "<p>Some proposals might be\n"
 "locked by the system administrator and therefore cannot be changed. If a\n"
@@ -1236,11 +1246,11 @@
 "systemadministratoren hvis du ønsker å endre et låst forslag.</p>\n"
 
 #. FATE #120373
-#: src/clients/inst_proposal.rb:1371
+#: src/clients/inst_proposal.rb:1369
 msgid "&Update"
 msgstr "&Oppgradering"
 
-#: src/clients/inst_proposal.rb:1372
+#: src/clients/inst_proposal.rb:1370
 msgid "&Install"
 msgstr "&Installer"
 
@@ -1359,51 +1369,35 @@
 msgid "Probing hard disks..."
 msgstr "Søker etter harddisker..."
 
-#: src/clients/inst_system_analysis.rb:127
-msgid "Search for Linux partitions"
-msgstr "Søk etter Linux-partisjoner"
-
+#. FATE #302980: Simplified user config during installation
 #: src/clients/inst_system_analysis.rb:128
-msgid "Searching for Linux partitions..."
-msgstr "Søker etter Linux-partisjoner..."
-
-#. FATE #302980: Simplified user config during installation
-#: src/clients/inst_system_analysis.rb:132
 msgid "Search for system files"
 msgstr "Søk etter systemfiler"
 
-#: src/clients/inst_system_analysis.rb:133
+#: src/clients/inst_system_analysis.rb:129
 msgid "Searching for system files..."
 msgstr "Søker etter systemfiler"
 
-#: src/clients/inst_system_analysis.rb:136
+#: src/clients/inst_system_analysis.rb:132
 msgid "Initialize software manager"
 msgstr "Initialiser pakkebehandleren"
 
-#: src/clients/inst_system_analysis.rb:137
+#: src/clients/inst_system_analysis.rb:133
 msgid "Initializing software manager..."
 msgstr "Initialiserer pakkebehandleren..."
 
-#: src/clients/inst_system_analysis.rb:140
-msgid "Evaluate update possibility"
-msgstr "Vurder mulighet for oppgradering"
-
-#: src/clients/inst_system_analysis.rb:141
-msgid "Evaluating update possibility..."
-msgstr "Vurderer mulighet for oppgradering..."
-
 #. TRANSLATORS: dialog caption
-#: src/clients/inst_system_analysis.rb:146
+#: src/clients/inst_system_analysis.rb:138
 msgid "System Probing"
 msgstr "Systemsøk"
 
 #. TRANSLATORS: dialog help
-#: src/clients/inst_system_analysis.rb:152
+#: src/clients/inst_system_analysis.rb:144
 msgid "YaST is probing computer hardware and installed systems now."
 msgstr "YaST søker etter maskinvare og installerte systemer."
 
 #. additonal error when HW was not found
-#: src/clients/inst_system_analysis.rb:255
+#: src/clients/inst_system_analysis.rb:241
 msgid ""
 "\n"
 "Check 'drivers.suse.com' if you need specific hardware drivers for installation."
@@ -1412,7 +1406,7 @@
 "Se «drivers.suse.com» hvis du trenger spesielle maskinvaredrivere for å installere."
 
 #. pop-up error report
-#: src/clients/inst_system_analysis.rb:269
+#: src/clients/inst_system_analysis.rb:255
 msgid ""
 "No hard disks were found for the installation.\n"
 "Please check your hardware!\n"
@@ -1422,7 +1416,7 @@
 "Kontroller maskinvaren!\n"
 "%1\n"
 
-#: src/clients/inst_system_analysis.rb:279
+#: src/clients/inst_system_analysis.rb:265
 msgid ""
 "No hard disks were found for the installation.\n"
 "During an automatic installation, they might be detected later.\n"
@@ -1433,7 +1427,7 @@
 "(spesielt på S/390- eller iSCSI-systemer).\n"
 
 #. pop-up error report
-#: src/clients/inst_system_analysis.rb:290
+#: src/clients/inst_system_analysis.rb:276
 msgid ""
 "No hard disks and no hard disk controllers were\n"
 "found for the installation.\n"
@@ -1446,7 +1440,7 @@
 "%1\n"
 
 #. popup message
-#: src/clients/inst_system_analysis.rb:343
+#: src/clients/inst_system_analysis.rb:318
 msgid ""
 "Failed to initialize the software repositories.\n"
 "Aborting the installation."
@@ -1455,31 +1449,31 @@
 "Avbryter installasjonen."
 
 #. TRANSLATORS: Table item status (repository)
-#: src/clients/inst_upgrade_urls.rb:96
+#: src/clients/inst_upgrade_urls.rb:104
 msgid "Removed"
 msgstr "Fjernet"
 
 #. TRANSLATORS: Table item status (repository)
-#: src/clients/inst_upgrade_urls.rb:100
+#: src/clients/inst_upgrade_urls.rb:108
 msgid "Enabled"
 msgstr "Aktivert"
 
 #. TRANSLATORS: Table item status (repository)
-#: src/clients/inst_upgrade_urls.rb:104
+#: src/clients/inst_upgrade_urls.rb:112
 msgid "Disabled"
 msgstr "Deaktivert"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: dialog caption
-#: src/clients/inst_upgrade_urls.rb:199 src/clients/inst_upgrade_urls.rb:667
-#: src/clients/inst_upgrade_urls.rb:726
+#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677
+#: src/clients/inst_upgrade_urls.rb:736
 msgid "Previously Used Repositories"
 msgstr "Tidligere brukte pakkebrønner"
 
 #. TRANSLATORS: dialog text, possibly multiline,
 #. Please, do not use more than 50 characters per line.
-#: src/clients/inst_upgrade_urls.rb:205
+#: src/clients/inst_upgrade_urls.rb:215
 msgid ""
 "These repositories were found on the system\n"
 "you are upgrading:"
@@ -1488,27 +1482,27 @@
 "du oppgraderer nå:"
 
 #. TRANSLATORS: Table header item
-#: src/clients/inst_upgrade_urls.rb:215
+#: src/clients/inst_upgrade_urls.rb:225
 msgid "Current Status"
 msgstr "Gjeldende status"
 
 #. TRANSLATORS: Table header item
-#: src/clients/inst_upgrade_urls.rb:217
+#: src/clients/inst_upgrade_urls.rb:227
 msgid "Repository"
 msgstr "Pakkebrønn"
 
 #. TRANSLATORS: Table header item
-#: src/clients/inst_upgrade_urls.rb:219
+#: src/clients/inst_upgrade_urls.rb:229
 msgid "URL"
 msgstr "Nettadresse"
 
 #. TRANSLATORS: Push button
-#: src/clients/inst_upgrade_urls.rb:229
+#: src/clients/inst_upgrade_urls.rb:239
 msgid "&Toggle Status"
 msgstr "&Endre status"
 
 #. TRANSLATORS: help text 1/3
-#: src/clients/inst_upgrade_urls.rb:235
+#: src/clients/inst_upgrade_urls.rb:245
 msgid ""
 "<p>Here you see all software repositories found\n"
 "on the system you are upgrading. Enable the ones you want to include in the upgrade process.</p>"
@@ -1517,7 +1511,7 @@
 "på systemet du oppgraderer nå. Aktiver pakkebrønnene du vil bruke under oppgraderingsprosessen.</p>"
 
 #. TRANSLATORS: help text 2/3
-#: src/clients/inst_upgrade_urls.rb:239
+#: src/clients/inst_upgrade_urls.rb:249
 msgid ""
 "<p>To enable, remove or disable an URL, click on the\n"
 "<b>Toggle Status</b> button or double-click on the respective table item.</p>"
@@ -1526,30 +1520,30 @@
 "<b>Endre status</b>-knappen eller ved å dobbeltklikke på et element i tabellen.</p>"
 
 #. TRANSLATORS: help text 3/3
-#: src/clients/inst_upgrade_urls.rb:243
+#: src/clients/inst_upgrade_urls.rb:253
 msgid "<p>To change the URL, click on the <b>Change...</b> button.</p>"
 msgstr "<p>Klikk på <b>Endre...</b>-knappen for å endre nettadressen.</p>"
 
 #. one_url already has "id" and some items might be deleted
 #. looking to id_to_name is done via the original key
 #. TRANSLATORS: Fallback name for a repository
-#: src/clients/inst_upgrade_urls.rb:265 src/clients/inst_upgrade_urls.rb:272
-#: src/clients/inst_upgrade_urls.rb:278
+#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282
+#: src/clients/inst_upgrade_urls.rb:288
 msgid "Unknown"
 msgstr "Ukjent"
 
 #. TRANSLATORS: textentry
-#: src/clients/inst_upgrade_urls.rb:373
+#: src/clients/inst_upgrade_urls.rb:383
 msgid "&Repository URL"
 msgstr "Nettad&resse for pakkebrønn"
 
 #. TRANSLATORS: popup header
-#: src/clients/inst_upgrade_urls.rb:637
+#: src/clients/inst_upgrade_urls.rb:647
 msgid "Network is not Configured"
 msgstr "Nettverket er ikke satt opp"
 
 #. TRANSLATORS: popup question
-#: src/clients/inst_upgrade_urls.rb:639
+#: src/clients/inst_upgrade_urls.rb:649
 msgid ""
 "Remote repositories require an Internet connection.\n"
 "Configure it?"
@@ -1558,49 +1552,49 @@
 "Vil du sette opp dette?"
 
 #. TRANSLATORS: Progress text
-#: src/clients/inst_upgrade_urls.rb:670 src/clients/inst_upgrade_urls.rb:727
+#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737
 msgid "Adding and removing repositories..."
 msgstr "Legger til og fjerne pakkebrønner..."
 
 #. TRANSLATORS: help text
 #. TRANSLATORS: help text
-#: src/clients/inst_upgrade_urls.rb:673 src/clients/inst_upgrade_urls.rb:732
+#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742
 msgid "<p>Repositories are being added and removed.</p>"
 msgstr "<p>Pakkebrønner legges til og fjernes.</p>"
 
-#: src/clients/inst_upgrade_urls.rb:692
+#: src/clients/inst_upgrade_urls.rb:702
 msgid "Remove unused repositories"
 msgstr "Fjern ubrukte pakkebrønner"
 
-#. Removes selected repositories
-#: src/clients/inst_upgrade_urls.rb:696 src/clients/inst_upgrade_urls.rb:813
+#. force reloading the libzypp repomanager to notice the removed files
+#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859
 msgid "Removing unused repositories..."
 msgstr "Fjerner ubrukte pakkebrønner..."
 
-#: src/clients/inst_upgrade_urls.rb:703
+#: src/clients/inst_upgrade_urls.rb:713
 msgid "Add enabled repositories"
 msgstr "Legg til aktiverte pakkebrønner"
 
 #. Adds selected repositories as <tt>enabled</tt>
-#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:867
+#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925
 msgid "Adding enabled repositories..."
 msgstr "Legger til aktiverte pakkebrønner..."
 
-#: src/clients/inst_upgrade_urls.rb:715
+#: src/clients/inst_upgrade_urls.rb:725
 msgid "Add disabled repositories"
 msgstr "Legg til deaktiverte pakkebrønner"
 
 #. Adds selected repositories as <tt>disabled</tt>
-#: src/clients/inst_upgrade_urls.rb:719 src/clients/inst_upgrade_urls.rb:1024
+#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082
 msgid "Adding disabled repositories..."
 msgstr "Legger til deaktiverte pakkebrønner..."
 
 #. true - OK, continue
-#: src/clients/inst_upgrade_urls.rb:841
+#: src/clients/inst_upgrade_urls.rb:899
 msgid "Correct Media Requested"
 msgstr "Bruk riktig medium"
 
-#: src/clients/inst_upgrade_urls.rb:843
+#: src/clients/inst_upgrade_urls.rb:901
 msgid ""
 "Make sure that media with label %1\n"
 "is in the CD/DVD drive.\n"
@@ -1614,7 +1608,7 @@
 
 #. Adding repositories in a disabled state, then enable them
 #. for the system upgrade
-#: src/clients/inst_upgrade_urls.rb:906
+#: src/clients/inst_upgrade_urls.rb:964
 msgid ""
 "Cannot add repository %1\n"
 "URL: %2\n"
@@ -1629,7 +1623,7 @@
 "Pakkebrønnen vil bli lagt til med deaktivert status."
 
 #. bnc #543468, do not check aliases of repositories stored in Installation::destdir
-#: src/clients/inst_upgrade_urls.rb:943
+#: src/clients/inst_upgrade_urls.rb:1001
 msgid ""
 "Cannot add enabled repository\n"
 "Name: %1\n"
@@ -1641,7 +1635,7 @@
 
 #. TRANSLATORS: error report
 #. %1 is replaced with repo-name, %2 with repo-URL
-#: src/clients/inst_upgrade_urls.rb:963
+#: src/clients/inst_upgrade_urls.rb:1021
 msgid ""
 "An error occurred while refreshing repository\n"
 "Name: %1\n"
@@ -1653,7 +1647,7 @@
 
 #. TRANSLATORS: error report
 #. %1 is replaced with repo-name, %2 with repo-URL
-#: src/clients/inst_upgrade_urls.rb:983
+#: src/clients/inst_upgrade_urls.rb:1041
 msgid ""
 "An error occurred while enabling repository\n"
 "Name: %1\n"
@@ -1664,7 +1658,7 @@
 "Adresse: %2\n"
 
 #. do not probe! adding as disabled!
-#: src/clients/inst_upgrade_urls.rb:1064
+#: src/clients/inst_upgrade_urls.rb:1122
 msgid ""
 "Cannot add disabled repository\n"
 "Name: %1\n"
@@ -1742,52 +1736,47 @@
 msgstr "Lagrer mellomserverkonfigurasjon..."
 
 #. progress step title
-#: src/clients/random_finish.rb:62
-msgid "Enabling random number generator..."
-msgstr "Aktiverer generator for vilkårlige tall..."
-
-#. progress step title
-#: src/clients/save_config_finish.rb:134
+#: src/clients/save_config_finish.rb:136
 msgid "Saving time zone..."
 msgstr "Lagrer tidssone..."
 
 #. progress step title
-#: src/clients/save_config_finish.rb:143
+#: src/clients/save_config_finish.rb:145
 msgid "Saving language..."
 msgstr "Lagrer språk..."
 
 #. progress step title
-#: src/clients/save_config_finish.rb:148
+#: src/clients/save_config_finish.rb:150
 msgid "Saving console configuration..."
 msgstr "Lagrer konsollkonfigurasjon..."
 
 #. progress step title
-#: src/clients/save_config_finish.rb:167
+#: src/clients/save_config_finish.rb:169
 msgid "Saving keyboard configuration..."
 msgstr "Lagrer tastaturoppsett..."
 
 #. progress step title
-#: src/clients/save_config_finish.rb:172
+#: src/clients/save_config_finish.rb:174
 msgid "Saving product information..."
 msgstr "Lagrer produktinformasjon..."
 
 #. progress step title
-#: src/clients/save_config_finish.rb:177
+#: src/clients/save_config_finish.rb:179
 msgid "Saving automatic installation settings..."
 msgstr "Lagrer innstillinger for automatisk installasjon..."
 
 #. progress step title
-#: src/clients/save_config_finish.rb:183
+#: src/clients/save_config_finish.rb:185
 msgid "Saving security settings..."
 msgstr "Lagrer sikkerhetsinnstillinger..."
 
 #. progress step title
-#: src/clients/save_config_finish.rb:192
+#: src/clients/save_config_finish.rb:208
 msgid "Saving boot scripts settings..."
 msgstr "Lagrer innstillinger for oppstartsskript..."
 
 #. progress step title
-#: src/clients/save_hw_status_finish.rb:70
+#: src/clients/save_hw_status_finish.rb:67
 msgid "Saving hardware configuration..."
 msgstr "Lagrer maskinvarekonfigurasjon..."
 
@@ -1819,7 +1808,7 @@
 msgstr "Lagrer YaST-oppsett..."
 
 #. call command
-#: src/clients/yast_inf_finish.rb:111
+#: src/clients/yast_inf_finish.rb:109
 msgid ""
 "\n"
 "**************************************************************\n"
@@ -2066,6 +2055,69 @@
 msgid "Shrinking PREP partition..."
 msgstr "Søker etter Linux-partisjoner..."
 
+#. Text to display
+#.
+#. @return String
+#: src/lib/installation/remote_finish_client.rb:68
+#, fuzzy
+#| msgid "Remote Administration"
+msgid "Enabling remote administration..."
+msgstr "Ekstern administrasjon"
+
+#. checking whether images are supported
+#. BNC #409927
+#. Checking files for signatures
+#: src/modules/ImageInstallation.rb:845
+msgid "Failed to read information about installation images"
+msgstr "Kunne ikke lese informasjon om installasjonsdiskbilder"
+
+#. sleep in order not to kill -USR1 to dd too early, otherwise it finishes
+#: src/modules/ImageInstallation.rb:1193
+msgid "Deploying..."
+msgstr "Bruker..."
+
+#. Function stores all new/requested states of all handled/supported types.
+#.
+#. @see #all_supported_types
+#. @see #objects_state
+#: src/modules/ImageInstallation.rb:1216
+msgid "Storing user preferences..."
+msgstr "Lagrer brukerinnstillinger..."
+
+#. Restores packages statuses from 'objects_state': Selects packages for removal, installation, upgrade.
+#.
+#. @return [Boolean] if successful
+#: src/modules/ImageInstallation.rb:1348
+msgid "Restoring user preferences..."
+msgstr "Gjenoppretter brukerinnstillinger..."
+
+#. Error message
+#: src/modules/ImageInstallation.rb:1446
+msgid ""
+"Installation was unable to solve package dependencies automatically.\n"
+"Software manager will be opened for you to solve them manually."
+msgstr ""
+"Installasjonsprogrammet kunne ikke løse pakkekonfliktene automatisk.\n"
+"Pakkebehandleren vil bli åpnet, slik at du kan løse dem manuelt."
+
+#~ msgid "License needs to be accepted"
+#~ msgstr "Lisensen må godkjennes"
+
+#~ msgid "Search for Linux partitions"
+#~ msgstr "Søk etter Linux-partisjoner"
+
+#~ msgid "Searching for Linux partitions..."
+#~ msgstr "Søker etter Linux-partisjoner..."
+
+#~ msgid "Evaluate update possibility"
+#~ msgstr "Vurder mulighet for oppgradering"
+
+#~ msgid "Evaluating update possibility..."
+#~ msgstr "Vurderer mulighet for oppgradering..."
+
+#~ msgid "Enabling random number generator..."
+#~ msgstr "Aktiverer generator for vilkårlige tall..."
+
 #~ msgid "Network Device: %1"
 #~ msgstr "Nettverksenhet: %1"
 
@@ -2629,26 +2681,7 @@
 #~ "\n"
 #~ "Se «drivers.suse.com» hvis du trenger spesielle maskinvaredrivere for å installere.\n"
 
-#~ msgid "Failed to read information about installation images"
-#~ msgstr "Kunne ikke lese informasjon om installasjonsdiskbilder"
-
-#~ msgid "Deploying..."
-#~ msgstr "Bruker..."
-
-#~ msgid "Storing user preferences..."
-#~ msgstr "Lagrer brukerinnstillinger..."
-
-#~ msgid "Restoring user preferences..."
-#~ msgstr "Gjenoppretter brukerinnstillinger..."
-
 #~ msgid ""
-#~ "Installation was unable to solve package dependencies automatically.\n"
-#~ "Software manager will be opened for you to solve them manually."
-#~ msgstr ""
-#~ "Installasjonsprogrammet kunne ikke løse pakkekonfliktene automatisk.\n"
-#~ "Pakkebehandleren vil bli åpnet, slik at du kan løse dem manuelt."
-
-#~ msgid ""
 #~ "No system type was selected.\n"
 #~ "Select the default type."
 #~ msgstr ""

Modified: trunk/yast/nb/po/instserver.nb.po
===================================================================
--- trunk/yast/nb/po/instserver.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/instserver.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: instserver\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:36+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2009-10-01 12:30+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"

Modified: trunk/yast/nb/po/iplb.nb.po
===================================================================
--- trunk/yast/nb/po/iplb.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/iplb.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2014-05-19 09:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -61,7 +61,7 @@
 #. Main file for iplb configuration. Uses all other files.
 #: src/include/iplb/common.rb:44
 msgid "Global Configuration"
-msgstr ""
+msgstr "Generell konfigurasjon"
 
 #: src/include/iplb/common.rb:45
 msgid "Virtual Servers Configuration"
@@ -92,6 +92,26 @@
 msgstr ""
 
 #. ids of widget of global dialog
+#: src/include/iplb/global_conf.rb:61
+msgid "yes"
+msgstr "ja"
+
+#: src/include/iplb/global_conf.rb:61
+msgid "no"
+msgstr "nei"
+
+#: src/include/iplb/global_conf.rb:68 src/include/iplb/vserver_conf.rb:226
+#, fuzzy
+#| msgid "Global Configuration"
+msgid "&Global Configuration"
+msgstr "Generell konfigurasjon"
+
+#: src/include/iplb/global_conf.rb:69 src/include/iplb/vserver_conf.rb:227
+#, fuzzy
+#| msgid "Mail Server Configuration"
+msgid "&Virtual Server Configuration"
+msgstr "Konfigurasjon av e-postserver"
+
 #: src/include/iplb/global_conf.rb:75
 msgid "Check Interval"
 msgstr ""
@@ -118,7 +138,7 @@
 
 #: src/include/iplb/global_conf.rb:87
 msgid "Execute"
-msgstr ""
+msgstr "Kjør"
 
 #: src/include/iplb/global_conf.rb:91 src/include/iplb/vserver_conf.rb:186
 msgid "Email Alert"
@@ -201,7 +221,7 @@
 "\n"
 "</p><p><b><big>email alert status</big> = all</b>|<b>none</b>|<b>starting</b>|<b>running</b>|<b>stopping</b>|<b>reloading</b>,...\n"
 "</p><p>Comma delimited list of server states in which email alerts should be sent. <b>all</b> is a short-hand for\n"
-"\"<b>starting</b>,<b>running</b>,<b>stopping</b>,<b>reloading</b>\". If <b>none</b> is specified, no other option may be specified, otherwise options are ored\n"
+"\"<b>starting</b>,<b>running</b>,<b>stopping</b>,<b>reloading</b>\". If <b>none</b> is specified, no other option may be specified, otherwise options are ORed\n"
 "with each other.\n"
 "</p><p>If defined in a virtual server section then the global value is overridden.\n"
 "</p><p>Default: all\n"
@@ -441,7 +461,7 @@
 "\n"
 "</p><p><b><big>email alert status</big> = all</b>|<b>none</b>|<b>starting</b>|<b>running</b>|<b>stopping</b>|<b>reloading</b>,...\n"
 "</p><p>Comma delimited list of server states in which email alerts should be sent. <b>all</b> is a short-hand for\n"
-"\"<b>starting</b>,<b>running</b>,<b>stopping</b>,<b>reloading</b>\". If <b>none</b> is specified, no other option may be specified, otherwise options are ored\n"
+"\"<b>starting</b>,<b>running</b>,<b>stopping</b>,<b>reloading</b>\". If <b>none</b> is specified, no other option may be specified, otherwise options are ORed\n"
 "with each other.\n"
 "</p><p>If defined in a virtual server section then the global value is overridden.\n"
 "</p><p>Default: all\n"
@@ -478,7 +498,7 @@
 
 #: src/include/iplb/vserver_conf.rb:151
 msgid "Service"
-msgstr ""
+msgstr "Tjeneste"
 
 #: src/include/iplb/vserver_conf.rb:152
 msgid "Check Command"
@@ -488,9 +508,10 @@
 msgid "Http Method"
 msgstr ""
 
+#
 #: src/include/iplb/vserver_conf.rb:160
 msgid "Request"
-msgstr ""
+msgstr "Forespørsel"
 
 #: src/include/iplb/vserver_conf.rb:162
 msgid "Receive"
@@ -502,11 +523,11 @@
 
 #: src/include/iplb/vserver_conf.rb:177
 msgid "Login"
-msgstr ""
+msgstr "Innlogging"
 
 #: src/include/iplb/vserver_conf.rb:178
 msgid "Password"
-msgstr ""
+msgstr "Passord"
 
 #: src/include/iplb/vserver_conf.rb:180
 msgid "Database Name"
@@ -522,7 +543,7 @@
 
 #: src/include/iplb/vserver_conf.rb:200
 msgid "Netmask"
-msgstr ""
+msgstr "Nettverksmaske"
 
 #: src/include/iplb/vserver_conf.rb:202
 msgid "Scheduler"
@@ -530,7 +551,7 @@
 
 #: src/include/iplb/vserver_conf.rb:211
 msgid "Protocol"
-msgstr ""
+msgstr "Protokoll"
 
 #: src/include/iplb/vserver_conf.rb:231
 msgid "Virtual Servers"
@@ -538,15 +559,15 @@
 
 #: src/include/iplb/vserver_conf.rb:234 src/include/iplb/vserver_conf.rb:301
 msgid "Add"
-msgstr ""
+msgstr "Legg til"
 
 #: src/include/iplb/vserver_conf.rb:235 src/include/iplb/vserver_conf.rb:303
 msgid "Edit"
-msgstr ""
+msgstr "Rediger"
 
 #: src/include/iplb/vserver_conf.rb:236 src/include/iplb/vserver_conf.rb:302
 msgid "Delete"
-msgstr ""
+msgstr "Slett"
 
 #. disable the delete & edit button if vserver box is empty
 #: src/include/iplb/vserver_conf.rb:296
@@ -572,13 +593,19 @@
 #. return `cacel or a string
 #: src/include/iplb/vserver_conf.rb:342 src/include/iplb/vserver_conf.rb:427
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: src/include/iplb/vserver_conf.rb:343 src/include/iplb/vserver_conf.rb:428
 msgid "Cancel"
+msgstr "Avbryt"
+
+#. split the real server ip value;
+#: src/include/iplb/vserver_conf.rb:411
+msgid ""
+"If using IPv6,the format should like this\n"
+"[fe80::5054:ff:fe00:2]"
 msgstr ""
 
-#. split the real server ip value;
 #: src/include/iplb/vserver_conf.rb:413
 msgid "Real Server's IP Address"
 msgstr ""
@@ -591,10 +618,30 @@
 msgid "weight"
 msgstr ""
 
+#. find next ]
+#: src/include/iplb/vserver_conf.rb:456
+#, fuzzy
+#| msgid "The IP address is invalid."
+msgid "IP address is not Valid"
+msgstr "IP-adressen er ugyldig."
+
+#. tab switch events end
+#: src/include/iplb/vserver_conf.rb:547
+#, fuzzy
+#| msgid "Add a new share"
+msgid "Add a new real server:"
+msgstr "Legg til en ny delt ressurs"
+
+#: src/include/iplb/vserver_conf.rb:564
+#, fuzzy
+#| msgid "Set the role of the server"
+msgid "Edit the real server:"
+msgstr "Definer en rolle for serveren"
+
 #. Initialization dialog contents
 #: src/include/iplb/wizards.rb:142
 msgid "Initializing..."
-msgstr ""
+msgstr "Initialiserer ..."
 
 #. Read all iplb settings
 #. @return true on success
@@ -621,7 +668,7 @@
 
 #: src/modules/Iplb.rb:225 src/modules/Iplb.rb:330
 msgid "Finished"
-msgstr ""
+msgstr "Fullført"
 
 #. Write all iplb settings
 #. @return true on success
@@ -631,19 +678,19 @@
 
 #: src/modules/Iplb.rb:326
 msgid "Write the settings"
-msgstr ""
+msgstr "Lagre innstillingene"
 
 #: src/modules/Iplb.rb:326
 msgid "Run SuSEconfig"
-msgstr ""
+msgstr "Kjør SuSEconfig"
 
 #: src/modules/Iplb.rb:328
 msgid "Writing the settings..."
-msgstr ""
+msgstr "Lagrer innstillingene..."
 
 #: src/modules/Iplb.rb:329
 msgid "Running SuSEconfig..."
-msgstr ""
+msgstr "Kjører SuSEconfig..."
 
 #. write global conf
 #. check for ipv6 address to decide whether to add "6=" or "="
@@ -653,10 +700,10 @@
 #. to check whether it is an ipv6 address;
 #: src/modules/Iplb.rb:355 src/modules/Iplb.rb:392 src/modules/Iplb.rb:405
 msgid "Cannot write settings."
-msgstr ""
+msgstr "Kan ikke lagre innstillingene."
 
 #. TODO FIXME: your code here...
 #. Configuration summary text for autoyast
 #: src/modules/Iplb.rb:441
 msgid "Configuration summary..."
-msgstr ""
+msgstr "Konfigurasjonssammendrag..."

Modified: trunk/yast/nb/po/iscsi-client.nb.po
===================================================================
--- trunk/yast/nb/po/iscsi-client.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/iscsi-client.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: iscsi-client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2009-08-11 22:34+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -70,146 +70,154 @@
 msgid "iSNS Port"
 msgstr "iSNS-port"
 
-#: src/include/iscsi-client/dialogs.rb:109
-msgid "Initiator Name"
+#. name of iscsi client (/etc/iscsi/initiatorname.iscsi)
+#: src/include/iscsi-client/dialogs.rb:110
+#, fuzzy
+#| msgid "Initiator Name"
+msgid "&Initiator Name"
 msgstr "Initiatornavn"
 
-#: src/include/iscsi-client/dialogs.rb:115
-msgid "Offloa&d Card"
+#. prefer to not translate 'Offload' unless there is a well
+#. known word for this technology (it's special hardware
+#. shifting load from processor to card)
+#: src/include/iscsi-client/dialogs.rb:119
+#, fuzzy
+#| msgid "Offloa&d Card"
+msgid "Offload Car&d"
 msgstr "Deaktiver &kort"
 
 #. table of connected targets
 #. table of discovered targets
 #. dialog for all targets from portal (connected/disconnected)
-#: src/include/iscsi-client/dialogs.rb:146
-#: src/include/iscsi-client/dialogs.rb:179
-#: src/include/iscsi-client/dialogs.rb:212
+#: src/include/iscsi-client/dialogs.rb:150
+#: src/include/iscsi-client/dialogs.rb:183
+#: src/include/iscsi-client/dialogs.rb:216
 msgid "Interface"
 msgstr "Grensesnitt"
 
-#: src/include/iscsi-client/dialogs.rb:147
-#: src/include/iscsi-client/dialogs.rb:180
-#: src/include/iscsi-client/dialogs.rb:213
+#: src/include/iscsi-client/dialogs.rb:151
+#: src/include/iscsi-client/dialogs.rb:184
+#: src/include/iscsi-client/dialogs.rb:217
 msgid "Portal Address"
 msgstr "Portaladresse"
 
-#: src/include/iscsi-client/dialogs.rb:148
-#: src/include/iscsi-client/dialogs.rb:181
-#: src/include/iscsi-client/dialogs.rb:214
+#: src/include/iscsi-client/dialogs.rb:152
+#: src/include/iscsi-client/dialogs.rb:185
+#: src/include/iscsi-client/dialogs.rb:218
 msgid "Target Name"
 msgstr "Målnavn"
 
-#: src/include/iscsi-client/dialogs.rb:149
-#: src/include/iscsi-client/dialogs.rb:215
+#: src/include/iscsi-client/dialogs.rb:153
+#: src/include/iscsi-client/dialogs.rb:219
 msgid "Start-Up"
 msgstr "Oppstart"
 
-#: src/include/iscsi-client/dialogs.rb:155
+#: src/include/iscsi-client/dialogs.rb:159
 msgid "Add"
 msgstr "Legg til"
 
 #. `PushButton(`id(`toggle), _("Toggle Start-Up"))
-#: src/include/iscsi-client/dialogs.rb:156
+#: src/include/iscsi-client/dialogs.rb:160
 msgid "Edit"
 msgstr "Rediger"
 
-#: src/include/iscsi-client/dialogs.rb:157
+#: src/include/iscsi-client/dialogs.rb:161
 msgid "Log Out"
 msgstr "Logg ut"
 
-#: src/include/iscsi-client/dialogs.rb:182
+#: src/include/iscsi-client/dialogs.rb:186
 msgid "Connected"
 msgstr "Tilkoblet"
 
-#: src/include/iscsi-client/dialogs.rb:188
+#: src/include/iscsi-client/dialogs.rb:192
 msgid "Discovery"
 msgstr "Søk"
 
-#: src/include/iscsi-client/dialogs.rb:189
+#: src/include/iscsi-client/dialogs.rb:193
 msgid "Log In"
 msgstr "Logg inn"
 
-#: src/include/iscsi-client/dialogs.rb:219
+#: src/include/iscsi-client/dialogs.rb:223
 msgid "Connect"
 msgstr "Koble til"
 
 #. authentification dialog for add/discovery target
 #. authentication dialog for add target
-#: src/include/iscsi-client/dialogs.rb:234
-#: src/include/iscsi-client/dialogs.rb:268
+#: src/include/iscsi-client/dialogs.rb:238
+#: src/include/iscsi-client/dialogs.rb:272
 msgid "No Authentication"
 msgstr "Ingen autentisering"
 
-#: src/include/iscsi-client/dialogs.rb:237
-#: src/include/iscsi-client/dialogs.rb:271
+#: src/include/iscsi-client/dialogs.rb:241
+#: src/include/iscsi-client/dialogs.rb:275
 msgid "Incoming Authentication"
 msgstr "Innkommende autentisering"
 
-#: src/include/iscsi-client/dialogs.rb:239
-#: src/include/iscsi-client/dialogs.rb:245
-#: src/include/iscsi-client/dialogs.rb:273
-#: src/include/iscsi-client/dialogs.rb:279
+#: src/include/iscsi-client/dialogs.rb:243
+#: src/include/iscsi-client/dialogs.rb:249
+#: src/include/iscsi-client/dialogs.rb:277
+#: src/include/iscsi-client/dialogs.rb:283
 msgid "Username"
 msgstr "Brukernavn"
 
-#: src/include/iscsi-client/dialogs.rb:240
-#: src/include/iscsi-client/dialogs.rb:246
-#: src/include/iscsi-client/dialogs.rb:274
-#: src/include/iscsi-client/dialogs.rb:280
+#: src/include/iscsi-client/dialogs.rb:244
+#: src/include/iscsi-client/dialogs.rb:250
+#: src/include/iscsi-client/dialogs.rb:278
+#: src/include/iscsi-client/dialogs.rb:284
 msgid "Password"
 msgstr "Passord"
 
-#: src/include/iscsi-client/dialogs.rb:243
-#: src/include/iscsi-client/dialogs.rb:277
+#: src/include/iscsi-client/dialogs.rb:247
+#: src/include/iscsi-client/dialogs.rb:281
 msgid "Outgoing Authentication"
 msgstr "Utgående autentisering"
 
 #. "handle" : handleDiscAuth,
-#: src/include/iscsi-client/dialogs.rb:297
+#: src/include/iscsi-client/dialogs.rb:301
 msgid "Startup"
 msgstr "Oppstart"
 
 #. widget for portal address
-#: src/include/iscsi-client/dialogs.rb:308
+#: src/include/iscsi-client/dialogs.rb:312
 msgid "IP Address"
 msgstr "IP-adresse"
 
-#: src/include/iscsi-client/dialogs.rb:309
+#: src/include/iscsi-client/dialogs.rb:313
 msgid "Port"
 msgstr "Port"
 
-#: src/include/iscsi-client/dialogs.rb:324
+#: src/include/iscsi-client/dialogs.rb:328
 msgid "Key"
 msgstr "Nøkkel"
 
-#: src/include/iscsi-client/dialogs.rb:324
+#: src/include/iscsi-client/dialogs.rb:328
 msgid "Value"
 msgstr "Verdi"
 
 #. service status dialog
-#: src/include/iscsi-client/dialogs.rb:335
+#: src/include/iscsi-client/dialogs.rb:339
 msgid "Service"
 msgstr "Tjeneste"
 
 #. list og connected targets
-#: src/include/iscsi-client/dialogs.rb:358
+#: src/include/iscsi-client/dialogs.rb:362
 msgid "Connected Targets"
 msgstr "Tilkoblede mål"
 
 #. list of discovered targets
-#: src/include/iscsi-client/dialogs.rb:366
+#: src/include/iscsi-client/dialogs.rb:370
 msgid "Discovered Targets"
 msgstr "Mål som ble funnet"
 
 #. main tabbed dialog
-#: src/include/iscsi-client/dialogs.rb:385
+#: src/include/iscsi-client/dialogs.rb:389
 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:400
+#: src/include/iscsi-client/dialogs.rb:404
 #: src/include/iscsi-client/helps.rb:107 src/include/iscsi-client/helps.rb:119
 #: src/include/iscsi-client/helps.rb:126
 msgid "<h1>iSCSI Initiator</h1>"
@@ -218,9 +226,9 @@
 #. authentication dialog for add new target
 #. list of connected targets
 #. authentication for connect to portal
-#: src/include/iscsi-client/dialogs.rb:435
-#: src/include/iscsi-client/dialogs.rb:474
-#: src/include/iscsi-client/dialogs.rb:500
+#: src/include/iscsi-client/dialogs.rb:439
+#: src/include/iscsi-client/dialogs.rb:478
+#: src/include/iscsi-client/dialogs.rb:504
 msgid "iSCSI Initiator Discovery"
 msgstr "Søk etter iSCSI-initiator"
 
@@ -472,12 +480,12 @@
 "iqn.2007-04.no.server:storage.disk.sdb\n"
 
 #. brackets needed around IPv6
-#: src/include/iscsi-client/widgets.rb:626
+#: src/include/iscsi-client/widgets.rb:625
 msgid "Insert the IP address."
 msgstr "Angi IP-adressen."
 
 #. validate port number
-#: src/include/iscsi-client/widgets.rb:632
+#: src/include/iscsi-client/widgets.rb:631
 msgid "Insert the port."
 msgstr "Angi porten."
 
@@ -485,37 +493,37 @@
 #. ******************* target table *************************
 #. initialize dialog for all targets from portal (connected/disconnected)
 #. enable/disable connect button according target is or not already connected
-#: src/include/iscsi-client/widgets.rb:734
-#: src/include/iscsi-client/widgets.rb:839
-#: src/include/iscsi-client/widgets.rb:867
+#: src/include/iscsi-client/widgets.rb:733
+#: src/include/iscsi-client/widgets.rb:838
+#: src/include/iscsi-client/widgets.rb:866
 msgid "True"
 msgstr "Sann"
 
-#: src/include/iscsi-client/widgets.rb:734
-#: src/include/iscsi-client/widgets.rb:839
+#: src/include/iscsi-client/widgets.rb:733
+#: src/include/iscsi-client/widgets.rb:838
 msgid "False"
 msgstr "Usann"
 
 #. check if not already connected
 #. check if not already connected
-#: src/include/iscsi-client/widgets.rb:772
-#: src/include/iscsi-client/widgets.rb:892
+#: src/include/iscsi-client/widgets.rb:771
+#: src/include/iscsi-client/widgets.rb:891
 msgid "The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption."
 msgstr "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:775
-#: src/include/iscsi-client/widgets.rb:895
+#: src/include/iscsi-client/widgets.rb:774
+#: src/include/iscsi-client/widgets.rb:894
 msgid "Continue"
 msgstr "Fortsett"
 
-#: src/include/iscsi-client/widgets.rb:776
-#: src/include/iscsi-client/widgets.rb:896
+#: src/include/iscsi-client/widgets.rb:775
+#: src/include/iscsi-client/widgets.rb:895
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. check if is not already connected
-#: src/include/iscsi-client/widgets.rb:886
+#: src/include/iscsi-client/widgets.rb:885
 msgid "The target is already connected."
 msgstr "Målet er allerede tilkoblet."
 
@@ -595,12 +603,19 @@
 msgstr "Sett opp tjenestestatus"
 
 #. interface type for hardware offloading
-#: src/modules/IscsiClientLib.rb:70
-msgid "(Software)"
-msgstr "(programvare)"
+#: src/modules/IscsiClientLib.rb:72
+#, fuzzy
+#| msgid "Select Software"
+msgid "default (Software)"
+msgstr "Velg programvare"
 
+#
+#: src/modules/IscsiClientLib.rb:73
+msgid "all"
+msgstr "alle"
+
 #. }
-#: src/modules/IscsiClientLib.rb:672
+#: src/modules/IscsiClientLib.rb:694
 msgid ""
 "InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt>\n"
 "differ. The old initiator name will be replaced by the value of iBFT and a \n"
@@ -612,10 +627,13 @@
 "Hvis du vil bruke et annet initiatornavn, kan du endre det i BIOS.\n"
 
 #. do discovery first
-#: src/modules/IscsiClientLib.rb:1112
+#: src/modules/IscsiClientLib.rb:1147
 msgid "Configuration summary..."
 msgstr "Oppsettsammendrag..."
 
+#~ msgid "(Software)"
+#~ msgstr "(programvare)"
+
 #~ msgid "Toggle Start-Up"
 #~ msgstr "Bytt oppstartsvalg"
 

Modified: trunk/yast/nb/po/iscsi-lio-server.nb.po
===================================================================
--- trunk/yast/nb/po/iscsi-lio-server.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/iscsi-lio-server.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2002-06-17 14:33+0200\n"
 "Last-Translator: www.linuxbutikken.no <roy@bytek.no>\n"
 "Language-Team: Norwegian <i18n@suse.de>\n"

Modified: trunk/yast/nb/po/iscsi-server.nb.po
===================================================================
--- trunk/yast/nb/po/iscsi-server.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/iscsi-server.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: iscsi-server.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:39+0200\n"
+"POT-Creation-Date: 2014-03-27 15:58+0100\n"
 "PO-Revision-Date: 2009-08-11 22:35+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"

Modified: trunk/yast/nb/po/isns.nb.po
===================================================================
--- trunk/yast/nb/po/isns.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/isns.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2009-08-11 22:37+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -293,82 +293,82 @@
 msgstr "Initialiserer ..."
 
 #. test if required package ("open-isns") is installed
-#: src/modules/IsnsServer.rb:106
+#: src/modules/IsnsServer.rb:172
 msgid "<p>To configure the isns service, the <b>%1</b> package must be installed.</p>"
 msgstr "<p>Før du kan sette opp ISNS-tjenesten, må <b>%1</b> pakken være installert.</p>"
 
-#: src/modules/IsnsServer.rb:109
+#: src/modules/IsnsServer.rb:175
 msgid "<p>Install it now?</p>"
 msgstr "<p>Vil du installere den nå?</p>"
 
 #. IsnsServer read dialog caption
-#: src/modules/IsnsServer.rb:486
+#: src/modules/IsnsServer.rb:569
 msgid "Initializing isns daemon configuration"
 msgstr "Initialisere konfigurasjonen av ISNS-nissen"
 
 #. Progress stage 1/3
-#: src/modules/IsnsServer.rb:502
+#: src/modules/IsnsServer.rb:585
 msgid "Read the database"
 msgstr "Les databasen"
 
 #. Progress stage 2/3
-#: src/modules/IsnsServer.rb:504
+#: src/modules/IsnsServer.rb:587
 msgid "Read the previous settings"
 msgstr "Les tidligere innstillinger"
 
 #. Progress stage 3/3
-#: src/modules/IsnsServer.rb:506
+#: src/modules/IsnsServer.rb:589
 msgid "Detect the devices"
 msgstr "Søk etter enheter"
 
 #. Progress step 1/3
-#: src/modules/IsnsServer.rb:510
+#: src/modules/IsnsServer.rb:593
 msgid "Reading the database..."
 msgstr "Leser databasen..."
 
 #. Progress step 2/3
-#: src/modules/IsnsServer.rb:512
+#: src/modules/IsnsServer.rb:595
 msgid "Reading the previous settings..."
 msgstr "Leser tidligere innstillinger..."
 
 #. Progress step 3/3
-#: src/modules/IsnsServer.rb:514
+#: src/modules/IsnsServer.rb:597
 msgid "Detecting the devices..."
 msgstr "Søker etter enheter..."
 
 #. Progress finished
 #. Progress finished
-#: src/modules/IsnsServer.rb:516 src/modules/IsnsServer.rb:594
+#: src/modules/IsnsServer.rb:599 src/modules/IsnsServer.rb:677
 msgid "Finished"
 msgstr "Fullført"
 
 #. IsnsServer write dialog caption
-#: src/modules/IsnsServer.rb:568
+#: src/modules/IsnsServer.rb:651
 msgid "Saving isns Configuration"
 msgstr "Lagrer ISNS-konfigurasjon"
 
 #. Progress stage 1/2
-#: src/modules/IsnsServer.rb:584
+#: src/modules/IsnsServer.rb:667
 msgid "Write the settings"
 msgstr "Lagre innstillingene"
 
 #. Progress stage 2/2
-#: src/modules/IsnsServer.rb:586
+#: src/modules/IsnsServer.rb:669
 msgid "Run SuSEconfig"
 msgstr "Kjør SuSEconfig"
 
 #. Progress step 1/2
-#: src/modules/IsnsServer.rb:590
+#: src/modules/IsnsServer.rb:673
 msgid "Writing the settings..."
 msgstr "Lagrer innstillingene..."
 
 #. Progress step 2/2
-#: src/modules/IsnsServer.rb:592
+#: src/modules/IsnsServer.rb:675
 msgid "Running SuSEconfig..."
 msgstr "Kjører SuSEconfig..."
 
 #. write configuration (/etc/isns.conf)
-#: src/modules/IsnsServer.rb:606
+#: src/modules/IsnsServer.rb:689
 msgid "Cannot write settings."
 msgstr "Kan ikke lagre innstillingene."
 

Modified: trunk/yast/nb/po/kdump.nb.po
===================================================================
--- trunk/yast/nb/po/kdump.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/kdump.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: kdump\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2009-08-12 10:04+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -375,8 +375,8 @@
 #. TRANSLATORS: CommandLine printed text
 #. Popup::Message(crash_value);
 #. delete crashkernel paramter from bootloader
-#: src/clients/kdump.rb:751 src/clients/kdump.rb:756 src/modules/Kdump.rb:558
-#: src/modules/Kdump.rb:577
+#: src/clients/kdump.rb:751 src/clients/kdump.rb:756 src/modules/Kdump.rb:559
+#: src/modules/Kdump.rb:578
 msgid "To apply changes a reboot is necessary."
 msgstr "Maskinen må startes på nytt for å aktivere endringer."
 
@@ -508,15 +508,6 @@
 msgid "&Kdump"
 msgstr "&Kdump"
 
-#. checking if packages are available
-#: src/include/kdump/complex.rb:101 src/include/kdump/complex.rb:103
-msgid "Package for kexec-tools is not available."
-msgstr "Pakken for kexec-tools er ikke tilgjengelig."
-
-#: src/include/kdump/complex.rb:113 src/include/kdump/complex.rb:115
-msgid "Package for kdump is not available."
-msgstr "Ingen kdump-pakke er tilgjengelig."
-
 #. TRANSLATORS: RadioButtonGroup Label
 #: src/include/kdump/dialogs.rb:53
 msgid "Enable/Disable Kdump"
@@ -1192,131 +1183,137 @@
 #. See FATE#315780
 #. See https://www.suse.com/support/kb/doc.php?id=7012786
 #. FIXME what about dracut?
-#: src/modules/Kdump.rb:483
+#: src/modules/Kdump.rb:484
 msgid ""
 "Error updating initrd while calling '%{cmd}'.\n"
 "See %{log} for details."
 msgstr ""
 
 #. Kdump read dialog caption
-#: src/modules/Kdump.rb:593
+#: src/modules/Kdump.rb:594
 msgid "Initializing kdump Configuration"
 msgstr "Initialiserer kdump-oppsett"
 
 #. Progress stage 1/4
 #. Progress step 1/4
-#: src/modules/Kdump.rb:602 src/modules/Kdump.rb:610
+#: src/modules/Kdump.rb:603 src/modules/Kdump.rb:611
 msgid "Reading the config file..."
 msgstr "Leser oppsettsfil..."
 
 #. Progress stage 3/4
-#: src/modules/Kdump.rb:604
+#: src/modules/Kdump.rb:605
 msgid "Reading kernel boot options..."
 msgstr "Leser oppstartsvalg for kjernen..."
 
 #. Progress stage 4/4
 #. Progress finished 3/4
-#: src/modules/Kdump.rb:606 src/modules/Kdump.rb:614
+#: src/modules/Kdump.rb:607 src/modules/Kdump.rb:615
 msgid "Reading available memory..."
 msgstr "Leser tilgjengelig minne..."
 
 #. Progress step 2/4
-#: src/modules/Kdump.rb:612
+#: src/modules/Kdump.rb:613
 msgid "Reading partitions of disks..."
 msgstr "Leser diskenes partisjoner..."
 
 #. Error message
-#: src/modules/Kdump.rb:626
+#: src/modules/Kdump.rb:627
 msgid "Cannot read config file /etc/sysconfig/kdump"
 msgstr "Kan ikke lese oppsettsfilen /etc/sysconfig/kdump"
 
 #. Error message
-#: src/modules/Kdump.rb:634
+#: src/modules/Kdump.rb:635
 msgid "Cannot read kernel boot options."
 msgstr "Kan ikke lese oppstartsvalg for kjerne."
 
 #. Error message
-#: src/modules/Kdump.rb:641
+#: src/modules/Kdump.rb:642
 msgid "Cannot read available memory."
 msgstr "Kan ikke lese tilgjengelig minne."
 
 #. Kdump read dialog caption
-#: src/modules/Kdump.rb:667
+#: src/modules/Kdump.rb:668
 msgid "Saving kdump Configuration"
 msgstr "Lagrer kdump-oppsett"
 
 #. Progress stage 1/2
-#: src/modules/Kdump.rb:696
+#: src/modules/Kdump.rb:697
 msgid "Write the settings"
 msgstr "Lagre innstillingene"
 
 #. Progress stage 2/2
-#: src/modules/Kdump.rb:698
+#: src/modules/Kdump.rb:699
 msgid "Update boot options"
 msgstr "Oppdater oppstartsvalg"
 
 #. Progress step 1/2
-#: src/modules/Kdump.rb:702
+#: src/modules/Kdump.rb:703
 msgid "Writing the settings..."
 msgstr "Lagrer innstillingene..."
 
 #. Progress step 2/2
-#: src/modules/Kdump.rb:704
+#: src/modules/Kdump.rb:705
 msgid "Updating boot options..."
 msgstr "Oppdaterer oppstartsvalg..."
 
 #. Progress finished
-#: src/modules/Kdump.rb:706
+#: src/modules/Kdump.rb:707
 msgid "Finished"
 msgstr "Fullført"
 
 #. Error message
-#: src/modules/Kdump.rb:716
+#: src/modules/Kdump.rb:717
 msgid "Cannot write settings."
 msgstr "Kan ikke lagre innstillingene."
 
 #. Error message
-#: src/modules/Kdump.rb:725
+#: src/modules/Kdump.rb:726
 msgid "Adding crashkernel parameter to bootloader fault."
 msgstr "Legger til crashkernel-parameter for oppstartslasterfeil."
 
 #. Create a textual summary and a list of unconfigured cards
 #. @return summary of the current configuration
-#: src/modules/Kdump.rb:844
+#: src/modules/Kdump.rb:833
 msgid "Kdump status: %1"
 msgstr "Kdump-status: %1"
 
-#: src/modules/Kdump.rb:845
+#: src/modules/Kdump.rb:834
 msgid "enabled"
 msgstr "aktivert"
 
-#: src/modules/Kdump.rb:845
+#: src/modules/Kdump.rb:834
 msgid "disabled"
 msgstr "deaktivert"
 
-#: src/modules/Kdump.rb:852
+#: src/modules/Kdump.rb:841
 msgid "Value of crashkernel option: %1"
 msgstr "Verdi for crashkernel-valg: %1"
 
-#: src/modules/Kdump.rb:859
+#: src/modules/Kdump.rb:848
 msgid "Dump format: %1"
 msgstr "Dump-format: %1"
 
-#: src/modules/Kdump.rb:866
+#: src/modules/Kdump.rb:855
 msgid "Target of dumps: %1"
 msgstr "Dump-mål: %1"
 
-#: src/modules/Kdump.rb:873
+#: src/modules/Kdump.rb:862
 msgid "Number of dumps: %1"
 msgstr "Antall dumper: %1"
 
 #. Trying to use fadump on unsupported hardware
-#: src/modules/Kdump.rb:961
+#: src/modules/Kdump.rb:950
 msgid ""
 "Cannot use Firmware-assisted dump.\n"
 "It is not supported on this hardware."
 msgstr ""
 
+#~ msgid "Package for kexec-tools is not available."
+#~ msgstr "Pakken for kexec-tools er ikke tilgjengelig."
+
+#~ msgid "Package for kdump is not available."
+#~ msgstr "Ingen kdump-pakke er tilgjengelig."
+
 #~ msgid "ENABLED"
 #~ msgstr "AKTIVERT"
 

Modified: trunk/yast/nb/po/kerberos-server.nb.po
===================================================================
--- trunk/yast/nb/po/kerberos-server.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/kerberos-server.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: kerberos-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:39+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2008-09-22 15:15+0200\n"
 "Last-Translator: Olav P. <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <>\n"

Modified: trunk/yast/nb/po/kerberos.nb.po
===================================================================
--- trunk/yast/nb/po/kerberos.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/kerberos.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: kerberos.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:56+0100\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2009-08-12 10:06+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"

Modified: trunk/yast/nb/po/languages_db.nb.po
===================================================================
--- trunk/yast/nb/po/languages_db.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/languages_db.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: languages_db\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:32+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2008-10-11 00:37+0200\n"
 "Last-Translator: Olav P. <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <>\n"

Modified: trunk/yast/nb/po/ldap-client.nb.po
===================================================================
--- trunk/yast/nb/po/ldap-client.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/ldap-client.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: ldap-client.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:56+0100\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2009-08-12 10:19+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"

Modified: trunk/yast/nb/po/ldap-server.nb.po
===================================================================
--- trunk/yast/nb/po/ldap-server.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/ldap-server.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: ldap-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2010-04-09 16:20+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"

Modified: trunk/yast/nb/po/ldap.nb.po
===================================================================
--- trunk/yast/nb/po/ldap.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/ldap.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2014-05-19 09:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -42,6 +42,8 @@
 "\n"
 "The server could be down or unreachable.\n"
 msgstr ""
+"\n"
+"Serveren kan være nede eller er ikke tilgjengelig.\n"
 
 #. error message:
 #: src/Ldap.rb:534
@@ -49,6 +51,8 @@
 "\n"
 "The value of DN is missing or invalid.\n"
 msgstr ""
+"\n"
+"Verdien for unikt navn (DN) mangler eller er ugyldig.\n"
 
 #. error message:
 #: src/Ldap.rb:538
@@ -56,6 +60,8 @@
 "\n"
 "Attribute type not found.\n"
 msgstr ""
+"\n"
+"Attributtype ikke funnet.\n"
 
 #. error message:
 #: src/Ldap.rb:540
@@ -63,23 +69,25 @@
 "\n"
 "Object class not found.\n"
 msgstr ""
+"\n"
+"Objektklasse ikke funnet.\n"
 
 #. error message, more specific description follows
 #. error message
 #. error message
 #: src/Ldap.rb:545 src/Ldap.rb:782 src/Ldap.rb:848
 msgid "Connection to the LDAP server cannot be established."
-msgstr ""
+msgstr "Kan ikke opprette tilkobling til til LDAP-serveren."
 
 #. error message, more specific description follows
 #: src/Ldap.rb:549
 msgid "A problem occurred while connecting to the LDAP server."
-msgstr ""
+msgstr "Det oppstod et problem under tilkobling til LDAP-serveren."
 
 #. error message, more specific description follows
 #: src/Ldap.rb:553
 msgid "A problem occurred while reading data from the LDAP server."
-msgstr ""
+msgstr "Det oppstod et problem under lesing av data fra LDAP-serveren."
 
 #. error message, more specific description follows
 #: src/Ldap.rb:557
@@ -99,26 +107,26 @@
 #. error message, more specific description follows
 #: src/Ldap.rb:569
 msgid "A problem occurred while reading schema from the LDAP server."
-msgstr ""
+msgstr "Det oppstod et problem under lesing av skjema fra LDAP-serveren."
 
 #. default error message
 #: src/Ldap.rb:594
 msgid "An unknown LDAP error occurred."
-msgstr ""
+msgstr "Det har oppstått en ukjent LDAP-feil."
 
 #. checkbox label
 #. checkbox label
 #. checkbox label
 #: src/Ldap.rb:604 src/Ldap.rb:791 src/Ldap.rb:857
 msgid "&Show Details"
-msgstr ""
+msgstr "&Vis detaljer"
 
 #. error message
 #. error message
 #. error message
 #: src/Ldap.rb:722 src/Ldap.rb:742 src/Ldap.rb:912
 msgid "Unknown error. Perhaps 'yast2-ldap' is not available."
-msgstr ""
+msgstr "Ukjent feil. 'yast2-ldap' er kanskje ikke tilgjengelig."
 
 #. question following error message (yes/no buttons follow)
 #: src/Ldap.rb:800
@@ -133,6 +141,10 @@
 "\n"
 "Retry connection without TLS/SSL?\n"
 msgstr ""
+"Tilkoblingsproblemet kan skyldes at klienten er satt opp for\n"
+"TLS/SS, og at serveren ikke støtter dette.\n"
+"\n"
+"Vil du forsøke på nytt uten TLS/SSL?\n"
 
 #. Asks user for bind_dn and password to LDAP server
 #. @param anonymous if anonymous access could be allowed
@@ -145,17 +157,17 @@
 #. password entering label
 #: src/Ldap.rb:975 src/ldap_browser.rb:155
 msgid "&LDAP Server Password"
-msgstr ""
+msgstr "Passord for &LDAP-server"
 
 #. label
 #: src/Ldap.rb:979
 msgid "Server: %1:%2"
-msgstr ""
+msgstr "Server: %1:%2"
 
 #. button label
 #: src/Ldap.rb:988
 msgid "&Anonymous Access"
-msgstr ""
+msgstr "&Anonym tilgang"
 
 #. error message, %1 is DN
 #: src/Ldap.rb:1330
@@ -164,6 +176,9 @@
 "does not exist in the LDAP directory.\n"
 "The object with the selected DN cannot be created.\n"
 msgstr ""
+"Det finnes ingen direkte overordnet enhet for DN '%1' \n"
+"i LDAP-katalogen.\n"
+"Det kan ikke opprettes noe objekt med valgt DN.\n"
 
 #. yes/no popup, %1 is value of DN
 #: src/Ldap.rb:1634
@@ -171,17 +186,19 @@
 "No entry with DN '%1'\n"
 "exists on the LDAP server. Create it now?\n"
 msgstr ""
+"Ingen oppføring med DN '%1'\n"
+"finnes på LDAP-serveren. Vil du opprette den nå?\n"
 
 #. button label
 #. button label
 #: src/LdapPopup.rb:75 src/ldap_browser.rb:547
 msgid "&Open"
-msgstr ""
+msgstr "&Åpne"
 
 #. help text 1/3
 #: src/LdapPopup.rb:262
 msgid "<p>Set the new value for the current attribute.</p>"
-msgstr ""
+msgstr "<p>Definer den nye verdien for gjeldende attributt.</p>"
 
 #. help text 2/3
 #: src/LdapPopup.rb:264
@@ -193,6 +210,12 @@
 "it is possible to choose it from the LDAP tree using <b>Browse</b>.\n"
 "</p>\n"
 msgstr ""
+"<p>Hvis attributtet kan ha flere verdier, legger du til nye oppføringer\n"
+" med <b>Legg til verdi</b>. Iblant inneholder knappen listen over\n"
+" mulige verdier som kan brukes for gjeldende attributt.\n"
+" Hvis verdien av det redigerte attributtet skulle være et unikt navn (DN),\n"
+" er det mulig å velge det fra LDAP-treet ved hjelp av <b>Bla gjennom</b>.\n"
+" </p>\n"
 
 #. help text 3/3, %1 is attribute name, description follows.
 #. The description will be not translated: maybe add a note
@@ -203,79 +226,86 @@
 #. "<p>The description (only in english) of attribute \"%1\":<br></p>"
 #: src/LdapPopup.rb:287
 msgid "<p>The description of attribute \"%1\":<br></p>"
-msgstr ""
+msgstr "<p>Beskrivelse av attributtet \"%1\":<br></p>"
 
 #. textentry label
 #: src/LdapPopup.rb:311
 msgid "&Value of \"%1\" Attribute"
-msgstr ""
+msgstr "&Verdi for \"%1\"-attributt"
 
 #. textentry label
 #: src/LdapPopup.rb:322
 msgid "&Values of \"%1\" Attribute"
-msgstr ""
+msgstr "&Verdier for \"%1\"-attributt"
 
 #. button label
 #. button label
 #: src/LdapPopup.rb:346 src/LdapPopup.rb:356
 msgid "&Add Value"
-msgstr ""
+msgstr "&Legg til verdi"
 
 #. menubutton item (default value)
 #: src/LdapPopup.rb:350
 msgid "&Empty Entry"
-msgstr ""
+msgstr "&Tom oppføring"
 
 #: src/LdapPopup.rb:351
 msgid "Bro&wse"
-msgstr ""
+msgstr "&Bla igjennom"
 
 #. error popup
-#: src/LdapPopup.rb:437
+#: src/LdapPopup.rb:439
 msgid ""
 "The value '%1' already exists.\n"
 "Please select another one."
 msgstr ""
+"Verdien '%1' finnes allerede.\n"
+"Velg en annen verdi."
 
 #. description of configuration object
-#: src/LdapPopup.rb:465
+#: src/LdapPopup.rb:467
 msgid "Configuration of user management tools"
-msgstr ""
+msgstr "Konfigurasjon av brukeradministrasjonsverktøy"
 
 #. description of configuration object
-#: src/LdapPopup.rb:469
+#: src/LdapPopup.rb:471
 msgid "Configuration of group management tools"
-msgstr ""
+msgstr "Konfigurasjon av gruppeadministrasjonsverktøy"
 
 #. label
-#: src/LdapPopup.rb:474
+#: src/LdapPopup.rb:476
 msgid "Object Class of New Module"
-msgstr ""
+msgstr "Objektklasse for ny modul"
 
 #. textentry label, do not translate "cn"
-#: src/LdapPopup.rb:502
+#: src/LdapPopup.rb:504
 msgid "&Name of New Module (\"cn\" Value)"
-msgstr ""
+msgstr "&Navn på ny modul (cn-verdi)"
 
 #. error popup
-#: src/LdapPopup.rb:528
+#: src/LdapPopup.rb:530
 msgid ""
 "The entered value already exists.\n"
 "Select another one.\n"
 msgstr ""
+"Denne verdien finnes allerede.\n"
+"Velg en annen.\n"
 
 #. error popup
-#: src/LdapPopup.rb:534
+#: src/LdapPopup.rb:536
 msgid "Enter the module name."
-msgstr ""
+msgstr "Angi modulnavnet."
 
 #. help text 1/3
-#: src/LdapPopup.rb:553
+#: src/LdapPopup.rb:555
 msgid ""
 "<p>Here, set the values of attributes belonging\n"
 "to an object using the current template. Such values are used as defaults when\n"
 "the new object is created.</p>\n"
 msgstr ""
+"<p>Her kan du definere verdier for attributter for\n"
+"et objekt som bruker gjeldende mal. Slike verdier brukes som standardinnstillinger når\n"
+"det nye objektet opprettes.</p>\n"
 
 #. // help text 2/3 do not translate "defaultObjectClass"
 #. _("<p>The list of attributes provided in <b>Attribute Name</b> is the
@@ -283,33 +313,37 @@
 #. entry of the current template.</p>
 #. ") +
 #. help text 3/3 do not translate "homedirectory"
-#: src/LdapPopup.rb:565
+#: src/LdapPopup.rb:567
 msgid ""
 "<p>You can use special syntax to create attribute\n"
 "values from existing ones. The expression <i>%attr_name</i> will be replaced\n"
 "with the value of attribute \"attr_name\" (for example, use \"/home/%uid\"\n"
 "as a value of \"homeDirectory\").</p>\n"
 msgstr ""
+"<p>Du kan bruke en spesiell syntaks for å opprette\n"
+"attributtverdier fra eksisterende verdier. Uttrykket <i>%attr_name</i> vil bli erstattet\n"
+"av verdien for attributtet \"attr_name\" (bruk for eksempel \"/home/%uid\"\n"
+"som verdi for \"homeDirectory\").</p>\n"
 
 #. combobox label
-#: src/LdapPopup.rb:588
+#: src/LdapPopup.rb:590
 msgid "Attribute &Name"
-msgstr ""
+msgstr "Attributt&navn"
 
 #. textentry label
-#: src/LdapPopup.rb:594
+#: src/LdapPopup.rb:596
 msgid "Attribute &Value"
-msgstr ""
+msgstr "Attributt&verdi"
 
 #. general help text for LDAP browser
 #: src/ldap_browser.rb:62
 msgid "<p>Browse the LDAP tree in the left part of the dialog.</p>"
-msgstr ""
+msgstr "<p>Naviger i LDAP-filstrukturen til venstre i dialogen.</p>"
 
 #. help text for LDAP browser
 #: src/ldap_browser.rb:64
 msgid "<p>Once the LDAP object is selected in the tree, the table shows the object data. Use <b>Edit</b> to change the value of the selected attribute. Use <b>Save</b> to save your changes to LDAP.</p>"
-msgstr ""
+msgstr "<p>Når et LDAP-objekt er valgt i filstrukturen, vises informasjon om objektet i tabellen. Bruk <b>Rediger</b> for å endre verdi for valgt attributt. Bruk <b>Lagre</b> for å lagre endringene for LDAP.</p>"
 
 #. popup question (Continue/Cancel follows)
 #: src/ldap_browser.rb:69
@@ -317,47 +351,49 @@
 "There are unsaved changes in the current entry.\n"
 "Discard these changes?\n"
 msgstr ""
+"Det er ulagrede endringer i denne oppføringen.\n"
+"Vil du forkaste endringene?\n"
 
 #. dialog caption
 #: src/ldap_browser.rb:85
 msgid "LDAP Browser"
-msgstr ""
+msgstr "LDAP-navigasjon"
 
 #. combobox item
 #: src/ldap_browser.rb:101
 msgid "Current LDAP Client settings"
-msgstr ""
+msgstr "Gjeldende innstillinger for LDAP-klient"
 
 #. combo box label
 #. combo box label
 #: src/ldap_browser.rb:135 src/ldap_browser.rb:747
 msgid "LDAP Connections"
-msgstr ""
+msgstr "LDAP-forbindelser"
 
 #. textentry label
 #: src/ldap_browser.rb:146
 msgid "LDAP Server"
-msgstr ""
+msgstr "LDAP-server"
 
 #. textentry label
 #: src/ldap_browser.rb:152
 msgid "Administrator DN"
-msgstr ""
+msgstr "Administrator-DN"
 
 #. check box label
 #: src/ldap_browser.rb:162
 msgid "L&DAP TLS"
-msgstr ""
+msgstr "TLS for L&DAP"
 
 #. button label
 #: src/ldap_browser.rb:168
 msgid "A&nonymous Access"
-msgstr ""
+msgstr "A&nonym tilgang"
 
 #. InputField label
 #: src/ldap_browser.rb:230
 msgid "Enter the name of the new LDAP connection"
-msgstr ""
+msgstr "Angi et navn for den nye LDAP-forbindelsen"
 
 #. error popup, %1 is attribute name
 #: src/ldap_browser.rb:452
@@ -365,18 +401,20 @@
 "The \"%1\" attribute is mandatory.\n"
 "Enter a value."
 msgstr ""
+"Attributtet \"%1\" er obligatorisk.\n"
+"Angi en verdi."
 
 #. button label
 #: src/ldap_browser.rb:550
 msgid "&Reload"
-msgstr ""
+msgstr "&Last på nytt"
 
 #. table header 1/2
 #: src/ldap_browser.rb:691
 msgid "Attribute"
-msgstr ""
+msgstr "Attributt"
 
 #. table header 2/2
 #: src/ldap_browser.rb:693
 msgid "Value"
-msgstr ""
+msgstr "Verdi"

Modified: trunk/yast/nb/po/live-installer.nb.po
===================================================================
--- trunk/yast/nb/po/live-installer.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/live-installer.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: live-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:39+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2009-10-01 12:31+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"

Modified: trunk/yast/nb/po/lxc.nb.po
===================================================================
--- trunk/yast/nb/po/lxc.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/lxc.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:39+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2002-06-17 14:33+0200\n"
 "Last-Translator: www.linuxbutikken.no <roy@bytek.no>\n"
 "Language-Team: Norwegian <i18n@suse.de>\n"

Modified: trunk/yast/nb/po/mail.nb.po
===================================================================
--- trunk/yast/nb/po/mail.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/mail.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: mail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:56+0100\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2009-10-08 12:48+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"

Modified: trunk/yast/nb/po/multipath.nb.po
===================================================================
--- trunk/yast/nb/po/multipath.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/multipath.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:40+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2009-08-12 12:28+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"

Modified: trunk/yast/nb/po/ncurses-pkg.nb.po
===================================================================
--- trunk/yast/nb/po/ncurses-pkg.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/ncurses-pkg.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: ncurses-pkg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2009-08-12 12:37+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"

Modified: trunk/yast/nb/po/ncurses.nb.po
===================================================================
--- trunk/yast/nb/po/ncurses.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/ncurses.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2008-09-23 07:12+0200\n"
 "Last-Translator: Olav P. <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <>\n"

Modified: trunk/yast/nb/po/network.nb.po
===================================================================
--- trunk/yast/nb/po/network.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/network.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: network\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-08-18 11:54+0000\n"
 "PO-Revision-Date: 2009-10-08 12:56+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -92,104 +92,54 @@
 msgstr "Intern feil"
 
 #. progress step title
-#: src/clients/firewall_stage1_finish.rb:67
+#: src/clients/firewall_stage1_finish.rb:63
 msgid "Writing Firewall Configuration..."
 msgstr "Lagrer brannmurkonfigurasjon..."
 
-#. Summary is visible only if installing over VNC
-#. and if firewall is enabled - otherwise port could not be blocked
-#: src/clients/firewall_stage1_proposal.rb:102
-#, fuzzy
-#| msgid "VNC ports will be open (<a href=\"%1\">close</a>)"
-msgid "VNC ports will be open (<a href=\"%s\">close</a>)"
-msgstr "VNC-porter vil være åpne (<a href=«%1»>lukk</a>)"
-
-#: src/clients/firewall_stage1_proposal.rb:104
-#, fuzzy
-#| msgid "VNC ports will be blocked (<a href=\"%1\">open</a>)"
-msgid "VNC ports will be blocked (<a href=\"%s\">open</a>)"
-msgstr "VNC-porter vil være blokkert (<a href=«%1»>åpne</a>)"
-
-#: src/clients/firewall_stage1_proposal.rb:110
-#, fuzzy
-#| msgid "Firewall will be enabled (<a href=\"%1\">disable</a>)"
-msgid "Firewall will be enabled (<a href=\"%s\">disable</a>)"
-msgstr "Brannmuren vil være aktivert (<a href=«%1»>deaktiver</a>)"
-
-#: src/clients/firewall_stage1_proposal.rb:114
-#, fuzzy
-#| msgid "Firewall will be disabled (<a href=\"%1\">enable</a>)"
-msgid "Firewall will be disabled (<a href=\"%s\">enable</a>)"
-msgstr "Brannmuren vil være deaktivert (<a href=«%1»>aktiver</a>)"
-
-#: src/clients/firewall_stage1_proposal.rb:119
-#, fuzzy
-#| msgid "VNC ports will be open (<a href=\"%1\">close</a>)"
-msgid "SSH port will be open (<a href=\"%s\">block</a>)"
-msgstr "VNC-porter vil være åpne (<a href=«%1»>lukk</a>)"
-
-#: src/clients/firewall_stage1_proposal.rb:123
-#, fuzzy
-#| msgid "VNC ports will be blocked (<a href=\"%1\">open</a>)"
-msgid "SSH port will be blocked (<a href=\"%s\">open</a>)"
-msgstr "VNC-porter vil være blokkert (<a href=«%1»>åpne</a>)"
-
-#: src/clients/firewall_stage1_proposal.rb:128
-#, fuzzy
-#| msgid "Firewall will be enabled (<a href=\"%1\">disable</a>)"
-msgid "SSH service will be enabled (<a href=\"%s\">disable</a>)"
-msgstr "Brannmuren vil være aktivert (<a href=«%1»>deaktiver</a>)"
-
-#: src/clients/firewall_stage1_proposal.rb:132
-#, fuzzy
-#| msgid "Firewall will be disabled (<a href=\"%1\">enable</a>)"
-msgid "SSH service will be disabled (<a href=\"%s\">enable</a>)"
-msgstr "Brannmuren vil være deaktivert (<a href=«%1»>aktiver</a>)"
-
 #. Proposal title
-#: src/clients/firewall_stage1_proposal.rb:218
+#: src/clients/firewall_stage1_proposal.rb:133
 msgid "Firewall and SSH"
 msgstr "Brannmur og SSH"
 
 #. Menu entry label
-#: src/clients/firewall_stage1_proposal.rb:220
+#: src/clients/firewall_stage1_proposal.rb:135
 msgid "&Firewall and SSH"
 msgstr "&Brannmur og SSH"
 
-#: src/clients/firewall_stage1_proposal.rb:231
+#: src/clients/firewall_stage1_proposal.rb:146
 msgid "Basic Firewall and SSH Configuration"
 msgstr "Grunnleggende brannmur- og SSH-oppsett"
 
 #. TRANSLATORS: check-box label
-#: src/clients/firewall_stage1_proposal.rb:237
+#: src/clients/firewall_stage1_proposal.rb:152
 msgid "Open &VNC Ports"
 msgstr "Åpne &VNC-porter"
 
 #. frame label
-#: src/clients/firewall_stage1_proposal.rb:245
+#: src/clients/firewall_stage1_proposal.rb:160
 msgid "Firewall and SSH service"
 msgstr "Brannmur- og SSH-tjeneste"
 
 #. TRANSLATORS: check-box label
-#: src/clients/firewall_stage1_proposal.rb:256
+#: src/clients/firewall_stage1_proposal.rb:171
 msgid "Enable Firewall"
 msgstr "Aktiver brannmur"
 
 #. TRANSLATORS: check-box label
-#: src/clients/firewall_stage1_proposal.rb:264
+#: src/clients/firewall_stage1_proposal.rb:179
 #, fuzzy
 #| msgid "Open &VNC Ports"
 msgid "Open SSH Port"
 msgstr "Åpne &VNC-porter"
 
 #. TRANSLATORS: check-box label
-#: src/clients/firewall_stage1_proposal.rb:272
+#: src/clients/firewall_stage1_proposal.rb:187
 #, fuzzy
 #| msgid "Open SSH Port and Enable SSH Service"
 msgid "Enable SSH Service"
 msgstr "Åpne SSH-port og aktiver SSH-tjeneste"
 
-#: src/clients/firewall_stage1_proposal.rb:284
+#: src/clients/firewall_stage1_proposal.rb:199
 msgid ""
 "<p><b><big>Firewall and SSH</big></b><br>\n"
 "Firewall is a defensive mechanism that protects your computer from network attacks.\n"
@@ -201,7 +151,7 @@
 "SSH er en tjeneste som tillater innlogging på denne datamaskinen via en spesiell\n"
 "SSH-klient</p>"
 
-#: src/clients/firewall_stage1_proposal.rb:290
+#: src/clients/firewall_stage1_proposal.rb:205
 msgid ""
 "<p>Here you can choose whether the firewall will be enabled or disabled after\n"
 "the installation. It is recommended to keep it enabled.</p>"
@@ -209,7 +159,7 @@
 "<p>Her kan du velge om brannmuren skal aktiveres eller deaktiveres etter\n"
 "installasjonen. Det anbefales å aktivere den.</p>"
 
-#: src/clients/firewall_stage1_proposal.rb:293
+#: src/clients/firewall_stage1_proposal.rb:208
 #, fuzzy
 #| msgid ""
 #| "<p>With enabled firewall, you can decide whether to open firewall port for SSH\n"
@@ -225,7 +175,7 @@
 "at den vil bli startet ved oppstart av maskinen).</p>"
 
 #. TRANSLATORS: help text
-#: src/clients/firewall_stage1_proposal.rb:300
+#: src/clients/firewall_stage1_proposal.rb:215
 msgid ""
 "<p>You can also open VNC ports in firewall. It will not enable\n"
 "the remote administration service on a running system but it is\n"
@@ -235,6 +185,57 @@
 "den eksterne administrasjonstjenesten på et kjørende system, men den\n"
 "vil bli automatisk startet av administrasjonsprogrammet ved behov.</p>"
 
+#. anything but enabling the firewall closes this dialog
+#. (VNC and SSH checkboxes do nothing)
+#: src/clients/firewall_stage1_proposal.rb:292
+#, fuzzy
+#| msgid "Firewall will be enabled (<a href=\"%1\">disable</a>)"
+msgid "Firewall will be enabled (<a href=\"%s\">disable</a>)"
+msgstr "Brannmuren vil være aktivert (<a href=«%1»>deaktiver</a>)"
+
+#: src/clients/firewall_stage1_proposal.rb:296
+#, fuzzy
+#| msgid "Firewall will be disabled (<a href=\"%1\">enable</a>)"
+msgid "Firewall will be disabled (<a href=\"%s\">enable</a>)"
+msgstr "Brannmuren vil være deaktivert (<a href=«%1»>aktiver</a>)"
+
+#: src/clients/firewall_stage1_proposal.rb:301
+#, fuzzy
+#| msgid "Firewall will be enabled (<a href=\"%1\">disable</a>)"
+msgid "SSH service will be enabled (<a href=\"%s\">disable</a>)"
+msgstr "Brannmuren vil være aktivert (<a href=«%1»>deaktiver</a>)"
+
+#: src/clients/firewall_stage1_proposal.rb:305
+#, fuzzy
+#| msgid "Firewall will be disabled (<a href=\"%1\">enable</a>)"
+msgid "SSH service will be disabled (<a href=\"%s\">enable</a>)"
+msgstr "Brannmuren vil være deaktivert (<a href=«%1»>aktiver</a>)"
+
+#. Display vnc port only if installing over VNC
+#: src/clients/firewall_stage1_proposal.rb:317
+#, fuzzy
+#| msgid "VNC ports will be open (<a href=\"%1\">close</a>)"
+msgid "VNC ports will be open (<a href=\"%s\">close</a>)"
+msgstr "VNC-porter vil være åpne (<a href=«%1»>lukk</a>)"
+
+#: src/clients/firewall_stage1_proposal.rb:319
+#, fuzzy
+#| msgid "VNC ports will be blocked (<a href=\"%1\">open</a>)"
+msgid "VNC ports will be blocked (<a href=\"%s\">open</a>)"
+msgstr "VNC-porter vil være blokkert (<a href=«%1»>åpne</a>)"
+
+#: src/clients/firewall_stage1_proposal.rb:324
+#, fuzzy
+#| msgid "VNC ports will be open (<a href=\"%1\">close</a>)"
+msgid "SSH port will be open (<a href=\"%s\">block</a>)"
+msgstr "VNC-porter vil være åpne (<a href=«%1»>lukk</a>)"
+
+#: src/clients/firewall_stage1_proposal.rb:328
+#, fuzzy
+#| msgid "VNC ports will be blocked (<a href=\"%1\">open</a>)"
+msgid "SSH port will be blocked (<a href=\"%s\">open</a>)"
+msgstr "VNC-porter vil være blokkert (<a href=«%1»>åpne</a>)"
+
 #. Commandline help title
 #. configuration of hosts
 #. Hosts dialog caption
@@ -517,9 +518,18 @@
 msgid "Interfaces for Bridging"
 msgstr "Grensesnitt nettverksbro"
 
-#. Lan::PrepareForAutoinst();
-#. Lan::Autoinstall();
-#: src/clients/lan_auto.rb:173
+#. copy the keys/values that are not existing in the XML
+#. so we merge the inst-sys settings with the XML while XML
+#. has higher priority
+#.
+#. bnc#796580 The problem with this is that due to compatibility with
+#. older profiles, a missing element may have a different meaning than
+#. "use what the filesystem/kernel currently uses".
+#. In particular, a missing write_hostname [1] means
+#. "use the product default from DVD1/control.xml".
+#. Other elements may have similar problems,
+#. to be fixed post-PTF for maintenance.
+#: src/clients/lan_auto.rb:171
 msgid "Configuration Error: uninitialized interface."
 msgstr "Oppsettfeil: Grensesnitt er ikke initialisert."
 
@@ -608,7 +618,7 @@
 #. Commandline help title
 #. Main routing dialog
 #. @return dialog result
-#: src/clients/routing.rb:57 src/include/network/services/routing.rb:476
+#: src/clients/routing.rb:57 src/include/network/services/routing.rb:479
 msgid "Routing Configuration"
 msgstr "Rutingoppsett"
 
@@ -712,7 +722,7 @@
 msgid "Device"
 msgstr "Enhet"
 
-#: src/clients/routing.rb:212 src/include/network/lan/hardware.rb:414
+#: src/clients/routing.rb:212 src/include/network/lan/hardware.rb:416
 msgid "Options"
 msgstr "Alternativer"
 
@@ -795,13 +805,13 @@
 
 #. interface summary: WiFi without encryption
 #. interface summary: WiFi without encryption
-#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1300
+#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1361
 msgid "Warning: no encryption is used."
 msgstr "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:1302
+#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1363
 msgid "Change."
 msgstr "Endre."
 
@@ -1174,14 +1184,14 @@
 #. ComboBox label
 #. ComboBox label
 #: src/include/network/lan/address.rb:155
-#: src/include/network/lan/hardware.rb:365
+#: src/include/network/lan/hardware.rb:367
 msgid "&Device Type"
 msgstr "&Enhetstype"
 
 #. ComboBox label
 #. TextEntry label
 #: src/include/network/lan/address.rb:174
-#: src/include/network/lan/hardware.rb:351
+#: src/include/network/lan/hardware.rb:353
 msgid "&Configuration Name"
 msgstr "&Oppsettsnavn"
 
@@ -1194,7 +1204,7 @@
 msgstr "Tunnelgruppe"
 
 #: src/include/network/lan/address.rb:193
-#: src/include/network/lan/address.rb:1312
+#: src/include/network/lan/address.rb:1316
 msgid "Bridged Devices"
 msgstr "Bro-enheter"
 
@@ -1394,29 +1404,29 @@
 
 #. FIXME: here it does not complain about missing
 #. shortcuts
-#: src/include/network/lan/address.rb:1289
+#: src/include/network/lan/address.rb:1293
 msgid "&Address"
 msgstr "&Adresse"
 
 #. Address tab help
-#: src/include/network/lan/address.rb:1292
+#: src/include/network/lan/address.rb:1296
 msgid "<p>Configure your IP address.</p>"
 msgstr "<p>Sett opp IP-adressen din.</p>"
 
-#: src/include/network/lan/address.rb:1298
+#: src/include/network/lan/address.rb:1302
 msgid "&Hardware"
 msgstr "&Maskinvare"
 
-#: src/include/network/lan/address.rb:1305
+#: src/include/network/lan/address.rb:1309
 msgid "&Bond Slaves"
 msgstr "&Bond-slaver"
 
-#: src/include/network/lan/address.rb:1319
+#: src/include/network/lan/address.rb:1323
 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:1404
+#: src/include/network/lan/address.rb:1408
 #, fuzzy
 #| msgid "Ifplugd priority"
 msgid "Ifplugd Priority"
@@ -1424,7 +1434,7 @@
 
 #. Device activation main help. The individual parts will be
 #. substituted as %1
-#: src/include/network/lan/address.rb:1410
+#: src/include/network/lan/address.rb:1414
 msgid ""
 "<p><b><big>IFPLUGD PRIORITY</big></b></p> \n"
 "<p> All interfaces configured with <b>On Cable Connection</b> and with IFPLUGD_PRIORITY != 0 will be\n"
@@ -1443,14 +1453,18 @@
 msgid "Network Card Setup"
 msgstr "Nettverkskortoppsett"
 
-#. allow to add bonding device into bridge and also device with mask /32(bnc#405343)
-#: src/include/network/lan/bridge.rb:131
+#. remove all aliases (bnc#590167)
+#: src/include/network/lan/bridge.rb:103
+#, fuzzy
+#| msgid ""
+#| "At least one selected device is already configured.\n"
+#| "Adapt the configuration for bridge (IP addess 0.0.0.0/32)?\n"
 msgid ""
 "At least one selected device is already configured.\n"
-"Adapt the configuration for bridge (IP address 0.0.0.0/32)?\n"
+"Adapt the configuration for bridge?\n"
 msgstr ""
 "Minst én av de valgte enhetene er allerede satt opp.\n"
-"Vil du tilpasse oppsettet for nettverksbro (IP-adresse 0.0.0.0/32)?\n"
+"Tilpass oppsettet for nettverksbro (IP-adesse 0.0.0.0/32)?\n"
 
 #. Network card name (wireless)
 #: src/include/network/lan/cards.rb:55
@@ -1660,7 +1674,7 @@
 msgid "The device was deleted."
 msgstr "Enheten er slettet."
 
-#. encoding: utf-8
+#. , :gw6dev encoding: utf-8
 #. ***************************************************************************
 #.
 #. Copyright (c) 2012 Novell, Inc.
@@ -1760,7 +1774,7 @@
 msgstr "Det oppstod en feil under installasjon av fastvare."
 
 #. Continue-Cancel popup
-#: src/include/network/lan/complex.rb:404
+#: src/include/network/lan/complex.rb:403
 msgid ""
 "The interface is currently set to be managed\n"
 "by the NetworkManager applet.\n"
@@ -1775,13 +1789,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:458
+#: src/include/network/lan/complex.rb:457
 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
-#. radio button group label, method of setup
-#: src/include/network/lan/complex.rb:494 src/include/network/widgets.rb:352
+#: src/include/network/lan/complex.rb:493 src/include/network/widgets.rb:376
 msgid "Network Setup Method"
 msgstr "Oppsettsmetode for nettverk"
 
@@ -1790,7 +1803,7 @@
 #. it is basically useful if user aborts dialog and he has done some
 #. changes already. Calling this function may results in confirmation
 #. popup.
-#: src/include/network/lan/complex.rb:524
+#: src/include/network/lan/complex.rb:523
 msgid "Network Settings"
 msgstr "Nettverksinnstillinger"
 
@@ -1817,7 +1830,7 @@
 msgstr "Endre standardrute via DHCP"
 
 #. Manual network card setup help 1/4
-#: src/include/network/lan/hardware.rb:82
+#: src/include/network/lan/hardware.rb:81
 msgid ""
 "<p>Set up hardware-specific options for \n"
 "your network device here.</p>\n"
@@ -1827,7 +1840,7 @@
 
 #. Manual network card setup help 2/4
 #. translators: do not translated udev, MAC, BusID
-#: src/include/network/lan/hardware.rb:91
+#: src/include/network/lan/hardware.rb:90
 msgid ""
 "<p><b>Device Type</b>. Various device types are available, select \n"
 "one according your needs.</p>"
@@ -1835,7 +1848,7 @@
 "<p><b>Enhetsype</b>. Det finnes ulike enhetstyper. Velg \n"
 "en type etter behov</p>"
 
-#: src/include/network/lan/hardware.rb:99
+#: src/include/network/lan/hardware.rb:98
 msgid ""
 "<p><b>Udev Rules</b> are rules for the kernel device manager that allow\n"
 "associating the MAC address or BusID of the network device with its name (for\n"
@@ -1845,7 +1858,7 @@
 "tilordne nettverksenhetens MAC-adresse eller BusID til navnet (for eksempel\n"
 "eth1, wlan0 ), og som sikrer at enhetsnavnet beholdes ved omstart av maskinen.\n"
 
-#: src/include/network/lan/hardware.rb:105
+#: src/include/network/lan/hardware.rb:104
 msgid ""
 "<p><b>Show visible port identification</b> allows you to physically identify now configured NIC. \n"
 "Set appropriate time, click <b>Blink</b> and LED diodes on you NIC will start blinking for selected time.\n"
@@ -1856,7 +1869,7 @@
 "</p>"
 
 #. Manual network card setup help 2/4
-#: src/include/network/lan/hardware.rb:118
+#: src/include/network/lan/hardware.rb:117
 msgid ""
 "<p><b>Kernel Module</b>. Enter the kernel module (driver) name \n"
 "for your network device here. If the device is already configured, see if there is more than one driver available for\n"
@@ -1867,7 +1880,7 @@
 "enheten i nedtrekkslisten. Du kan om nødvendig velge en driver fra listen, men normalt fungerer standardverdien bra.</p>\n"
 
 #. Manual networ card setup help 3/4
-#: src/include/network/lan/hardware.rb:125
+#: src/include/network/lan/hardware.rb:124
 msgid ""
 "<p>Additionally, specify <b>Options</b> for the kernel module. Use this\n"
 "format: <i>option</i>=<i>value</i>. Each entry should be space-separated, for example: <i>io=0x300 irq=5</i>. <b>Note:</b> If two cards are \n"
@@ -1877,12 +1890,12 @@
 "av mellomrom, for eksempel, <i>io=0x300 irq=5</i>. <b>Merk:</b> Hvis  to kort er satt opp\n"
 "med samme modulnavn, vil valgene bli slått sammen ved lagring.</p>\n"
 
-#: src/include/network/lan/hardware.rb:131
+#: src/include/network/lan/hardware.rb:130
 msgid "<p>If you specify options via <b>Ethtool options</b>, ifup will call ethtool with these options.</p>\n"
 msgstr "<p>Hvis du skriver inn noe under <b>Ethtool-valg</b>, vil ifup sende en kommando med disse valgene til ethtool.</p>\n"
 
 #. Manual dialog help 4/4
-#: src/include/network/lan/hardware.rb:140
+#: src/include/network/lan/hardware.rb:139
 msgid ""
 "<p>If you have a <b>PCMCIA</b> network card, select PCMCIA.\n"
 "If you have a <b>USB</b> network card, select USB.</p>\n"
@@ -1892,7 +1905,7 @@
 
 #. overwrite help
 #. Manual dialog help 5/4
-#: src/include/network/lan/hardware.rb:149
+#: src/include/network/lan/hardware.rb:148
 msgid ""
 "<p>Here, set up your networking device. The values will be\n"
 "written to <i>/etc/modprobe.conf</i> or <i>/etc/chandev.conf</i>.</p>\n"
@@ -1901,7 +1914,7 @@
 "lagret i <i>/etc/modprobe.conf</i> eller <i>/etc/chandev.conf</i>.</p>\n"
 
 #. Manual dialog help 6/4
-#: src/include/network/lan/hardware.rb:153
+#: src/include/network/lan/hardware.rb:152
 msgid ""
 "<p>Options for the module should be written in the format specified\n"
 "in the <b>IBM Device Drivers and Installation Commands</b> manual.</p>"
@@ -1910,78 +1923,84 @@
 "i veiledningen <b>IBM Device Drivers and Installation Commands</b>.</p>"
 
 #. Manual dialog caption
-#: src/include/network/lan/hardware.rb:271
+#: src/include/network/lan/hardware.rb:269
 msgid "Manual Network Card Configuration"
 msgstr "Manuelt oppsett av nettverkskort"
 
 #. CheckBox label
-#: src/include/network/lan/hardware.rb:281
+#: src/include/network/lan/hardware.rb:282
 msgid "&PCMCIA"
 msgstr "&PCMCIA"
 
 #. CheckBox label
-#: src/include/network/lan/hardware.rb:289
+#: src/include/network/lan/hardware.rb:291
 msgid "&USB"
 msgstr "&USB"
 
 #. ComboBox label
-#: src/include/network/lan/hardware.rb:298
+#: src/include/network/lan/hardware.rb:300
 msgid "&Hotplug Type"
 msgstr "&Hotplugtype"
 
 #. CheckBox label
-#: src/include/network/lan/hardware.rb:303
+#: src/include/network/lan/hardware.rb:305
 msgid "P&CI"
 msgstr "P&CI"
 
 #. #116211 - allow user to change modules from list
 #. Frame label
-#: src/include/network/lan/hardware.rb:315
+#: src/include/network/lan/hardware.rb:317
 msgid "&Kernel Module"
 msgstr "&Kjernemodul"
 
 #. Text entry label
-#: src/include/network/lan/hardware.rb:325
+#: src/include/network/lan/hardware.rb:327
 msgid "&Module Name"
 msgstr "&Modulnavn"
 
 #. TODO: Ud ... Rules
-#: src/include/network/lan/hardware.rb:380
-msgid "Udev rules"
+#: src/include/network/lan/hardware.rb:382
+#, fuzzy
+#| msgid "Udev rules"
+msgid "Udev Rules"
 msgstr "Udev-regler"
 
-#: src/include/network/lan/hardware.rb:382
+#: src/include/network/lan/hardware.rb:384
 msgid "Device Name"
 msgstr "Enhetsnavn"
 
-#: src/include/network/lan/hardware.rb:383
+#: src/include/network/lan/hardware.rb:385
 msgid "Change"
 msgstr "Endre"
 
-#: src/include/network/lan/hardware.rb:394
-msgid "Show visible port identification"
+#: src/include/network/lan/hardware.rb:396
+#, fuzzy
+#| msgid "Show visible port identification"
+msgid "Show Visible Port Identification"
 msgstr "Vis synlig portidentifikasjon"
 
 #. translators: how many seconds will card be blinking
-#: src/include/network/lan/hardware.rb:399
+#: src/include/network/lan/hardware.rb:401
 msgid "Seconds"
 msgstr "Sekunder"
 
-#: src/include/network/lan/hardware.rb:404
+#: src/include/network/lan/hardware.rb:406
 msgid "Blink"
 msgstr "Blink"
 
-#: src/include/network/lan/hardware.rb:409
-msgid "Ethtool options"
+#: src/include/network/lan/hardware.rb:411
+#, fuzzy
+#| msgid "Ethtool options"
+msgid "Ethtool Options"
 msgstr "Ethtool-valg"
 
 #. Manual selection caption
-#: src/include/network/lan/hardware.rb:495
+#: src/include/network/lan/hardware.rb:491
 msgid "Manual Network Card Selection"
 msgstr "Manuelt valg av nettverkskort"
 
 #. Manual selection help
-#: src/include/network/lan/hardware.rb:498
+#: src/include/network/lan/hardware.rb:494
 msgid ""
 "<p>Select the network card to configure. Search\n"
 "for a particular network card by entering the name in the search entry.</p>"
@@ -1991,19 +2010,19 @@
 
 #. Selection box label
 #. Selection box title
-#: src/include/network/lan/hardware.rb:508
-#: src/include/network/lan/hardware.rb:564
+#: src/include/network/lan/hardware.rb:504
+#: src/include/network/lan/hardware.rb:559
 msgid "&Network Card"
 msgstr "&Nettverkskort"
 
 #. Text entry field
-#: src/include/network/lan/hardware.rb:512
+#: src/include/network/lan/hardware.rb:508
 msgid "&Search"
 msgstr "&Søk"
 
 #. Remember current device number (#308763)
 #. see also bnc#391802
-#: src/include/network/lan/hardware.rb:833
+#: src/include/network/lan/hardware.rb:824
 msgid ""
 "Configuration name %1 already exists.\n"
 "Choose a different one."
@@ -2012,7 +2031,7 @@
 "Velg et annet navn."
 
 #. S/390 dialog caption
-#: src/include/network/lan/hardware.rb:877
+#: src/include/network/lan/hardware.rb:868
 msgid "S/390 Network Card Configuration"
 msgstr "Oppsett av S/390-nettverkskort"
 
@@ -2020,131 +2039,131 @@
 #. Frame label
 #. Frame label
 #. Frame label
-#: src/include/network/lan/hardware.rb:897
-#: src/include/network/lan/hardware.rb:999
-#: src/include/network/lan/hardware.rb:1066
-#: src/include/network/lan/hardware.rb:1103
+#: src/include/network/lan/hardware.rb:888
+#: src/include/network/lan/hardware.rb:990
+#: src/include/network/lan/hardware.rb:1057
+#: src/include/network/lan/hardware.rb:1094
 msgid "S/390 Device Settings"
 msgstr "Innstillinger for S/390-enhet"
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:907
+#: src/include/network/lan/hardware.rb:898
 msgid "&Port Name"
 msgstr "&Portnavn"
 
-#: src/include/network/lan/hardware.rb:912
+#: src/include/network/lan/hardware.rb:903
 msgid "Port Number"
 msgstr "Portnummer"
 
 #. CheckBox label
-#: src/include/network/lan/hardware.rb:926
+#: src/include/network/lan/hardware.rb:917
 msgid "&Enable IPA Takeover"
 msgstr "&Aktiver IPA-overtakelse"
 
 #. CheckBox label
-#: src/include/network/lan/hardware.rb:933
+#: src/include/network/lan/hardware.rb:924
 msgid "Enable &Layer 2 Support"
 msgstr "Vil du aktivere &Layer 2-støtte"
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:940
+#: src/include/network/lan/hardware.rb:931
 msgid "Layer2 &MAC Address"
 msgstr "&MAC-adresse for Layer2"
 
-#: src/include/network/lan/hardware.rb:948
-#: src/include/network/lan/hardware.rb:1024
-#: src/include/network/lan/hardware.rb:1078
+#: src/include/network/lan/hardware.rb:939
+#: src/include/network/lan/hardware.rb:1015
+#: src/include/network/lan/hardware.rb:1069
 msgid "Read Channel"
 msgstr "Lesekanal"
 
-#: src/include/network/lan/hardware.rb:954
-#: src/include/network/lan/hardware.rb:1030
-#: src/include/network/lan/hardware.rb:1084
+#: src/include/network/lan/hardware.rb:945
+#: src/include/network/lan/hardware.rb:1021
+#: src/include/network/lan/hardware.rb:1075
 msgid "Write Channel"
 msgstr "Skrivekanal"
 
-#: src/include/network/lan/hardware.rb:960
+#: src/include/network/lan/hardware.rb:951
 msgid "Control Channel"
 msgstr "Kontrollkanal"
 
 #. S/390 dialog help: QETH Port name
-#: src/include/network/lan/hardware.rb:971
+#: src/include/network/lan/hardware.rb:962
 msgid "<p>Enter the <b>Port Name</b> for this interface (case-sensitive).</p>"
 msgstr "<p>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:975
+#: src/include/network/lan/hardware.rb:966
 msgid "<p>Enter any additional <b>Options</b> for this interface (separated by spaces).</p>"
 msgstr "<p>Angi eventuelle ekstra <b>Alternativer</b> for dette grensesnittet (adskilt av mellomrom).</p>"
 
-#: src/include/network/lan/hardware.rb:978
+#: src/include/network/lan/hardware.rb:969
 msgid "<p>Select <b>Enable IPA Takeover</b> if IP address takeover should be enabled for this interface.</p>"
 msgstr "<p>Velg <b>Aktiver IPA-overtakelse</b> hvis overtakelse av IP-adresse skal aktiveres for dette grensesnittet.</p>"
 
-#: src/include/network/lan/hardware.rb:981
+#: src/include/network/lan/hardware.rb:972
 msgid "<p>Select <b>Enable Layer 2 Support</b> if this card has been configured with layer 2 support.</p>"
 msgstr "<p>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:984
+#: src/include/network/lan/hardware.rb:975
 msgid "<p>Enter the <b>Layer 2 MAC Address</b> if this card has been configured with layer 2 support.</p>"
 msgstr "<p>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:1008
+#: src/include/network/lan/hardware.rb:999
 msgid "&Port Number"
 msgstr "&Portnummer"
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:1016
+#: src/include/network/lan/hardware.rb:1007
 msgid "&LANCMD Time-Out"
 msgstr "&LANCMD-tidsavbrudd"
 
 #. S/390 dialog help: LCS
-#: src/include/network/lan/hardware.rb:1041
+#: src/include/network/lan/hardware.rb:1032
 msgid "<p>Choose the <b>Port Number</b> for this interface.</p>"
 msgstr "<p>Velg <b>portnummeret</b> for dette grensesnittet.</p>"
 
-#: src/include/network/lan/hardware.rb:1042
+#: src/include/network/lan/hardware.rb:1033
 msgid "<p>Specify the <b>LANCMD Time-Out</b> for this interface.</p>"
 msgstr "<p>Angi <b>LANCMD-tidsavbrudd</b> for dette grensesnittet.</p>"
 
 #. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1047
+#: src/include/network/lan/hardware.rb:1038
 msgid "Compatibility Mode"
 msgstr "Kompatibilitetsmodus"
 
 #. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1049
+#: src/include/network/lan/hardware.rb:1040
 msgid "Extended Mode"
 msgstr "Utvidet modus"
 
 #. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1051
+#: src/include/network/lan/hardware.rb:1042
 msgid "CTC-Based tty (Linux to Linux Connections)"
 msgstr "CTC-basert tty (Linux til Linux-forbindelser)"
 
 #. ComboBox item: CTC device protocol
-#: src/include/network/lan/hardware.rb:1053
+#: src/include/network/lan/hardware.rb:1044
 msgid "Compatibility Mode with OS/390 and z/OS"
 msgstr "Kompatibilitetsmodus med OS/390 og z/OS"
 
 #. TextEntry label
-#: src/include/network/lan/hardware.rb:1072
+#: src/include/network/lan/hardware.rb:1063
 msgid "&Protocol"
 msgstr "&Protokoll"
 
 #. S/390 dialog help: CTC
-#: src/include/network/lan/hardware.rb:1095
+#: src/include/network/lan/hardware.rb:1086
 msgid "<p>Choose the <b>Protocol</b> for this interface.</p>"
 msgstr "<p>Velg <b>protokollen</b> for dette grenssnittet.</p>"
 
 #. TextEntry label, #42789
-#: src/include/network/lan/hardware.rb:1112
+#: src/include/network/lan/hardware.rb:1103
 msgid "&Peer Name"
 msgstr "Navn på &annen maskin"
 
 #. S/390 dialog help: IUCV, #42789
-#: src/include/network/lan/hardware.rb:1123
+#: src/include/network/lan/hardware.rb:1114
 msgid ""
 "<p>Enter the name of the IUCV peer,\n"
 "for example, the z/VM user name with which to connect (case-sensitive).</p>\n"
@@ -2153,7 +2172,7 @@
 "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:1250
+#: src/include/network/lan/hardware.rb:1238
 msgid ""
 "An error occurred while creating device.\n"
 "See YaST log for details."
@@ -2163,7 +2182,7 @@
 
 #. Manual network card configuration dialog
 #. @return dialog result
-#: src/include/network/lan/hardware.rb:1272
+#: src/include/network/lan/hardware.rb:1260
 msgid "Hardware Dialog"
 msgstr "Maskinvaredialog"
 
@@ -2218,18 +2237,22 @@
 "for å bytte mellom kabelnettverk og ulike trådløse nettverk.</p>\n"
 
 #. Network setup method help
-#. NetworkManager and ifup are programs
+#. NetworkManager and wicked are programs
 #: src/include/network/lan/help.rb:59
+#, fuzzy
+#| msgid ""
+#| "<p>Use the <b>Traditional Method with <tt>ifup</tt></b>\n"
+#| "if you do not run a desktop environment (GNOME or KDE)\n"
+#| "or need to use multiple interfaces at the same time.</p>\n"
 msgid ""
-"<p>Use the <b>Traditional Method with <tt>ifup</tt></b>\n"
-"if you do not run a desktop environment (GNOME or KDE)\n"
+"<p>Use <b>wicked</b> if you do not run a desktop environment\n"
 "or need to use multiple interfaces at the same time.</p>\n"
 msgstr ""
 "<p>Bruk <b>Tradisjonell metode med <tt>ifup</tt></b>\n"
 "hvis du ikke kjører et grafisk skrivebordsmiljø (GNOME eller KDE),\n"
 "eller hvis du har behov for å bruke flere grensesnitt samtidig.</p>\n"
 
-#: src/include/network/lan/help.rb:64
+#: src/include/network/lan/help.rb:63
 msgid ""
 "<p><b><big>Network Card Overview</big></b><br>\n"
 "Obtain an overview of installed network cards. Additionally,\n"
@@ -2239,7 +2262,7 @@
 "Her finner du en oversikt over installerte nettverkskort. Du kan også\n"
 "redigere oppsettet.<br></p>\n"
 
-#: src/include/network/lan/help.rb:69
+#: src/include/network/lan/help.rb:68
 msgid ""
 "<p><b><big>Adding a Network Card:</big></b><br>\n"
 "Press <b>Add</b> to configure a new network card manually.</p>\n"
@@ -2247,7 +2270,7 @@
 "<p><b><big>Legg til et nettverkskort:</big></b><br>\n"
 "Klikk <b>Legg til</b> for å sette opp et nytt nettverkskort manuelt.</p>\n"
 
-#: src/include/network/lan/help.rb:72
+#: src/include/network/lan/help.rb:71
 msgid ""
 "<p><b><big>Configuring or Deleting:</big></b><br>\n"
 "Choose a network card to change or remove.\n"
@@ -2258,7 +2281,7 @@
 "Klikk deretter <b>Rediger</b> eller <b>Slett</b>.</p>\n"
 
 #. IPv6 help
-#: src/include/network/lan/help.rb:79
+#: src/include/network/lan/help.rb:78
 msgid ""
 "<p><b><big>IPv6 Protocol Settings</big></b></p>\n"
 "<p>Check <b>Enable IPv6</b> to enable the ipv6 module in the kernel.\n"
@@ -2274,12 +2297,12 @@
 "for ipv6). Responstiden kan bli raskere hvis du\n"
 "ikke bruker IPv6 i nettverket.\n"
 
-#: src/include/network/lan/help.rb:87
+#: src/include/network/lan/help.rb:86
 msgid "<p>All changes will be applied after reboot.</p>"
 msgstr "<p>Endringene vil bli aktivert etter omstart.</p>"
 
 #. Routing dialog help 1/2
-#: src/include/network/lan/help.rb:90
+#: src/include/network/lan/help.rb:89
 msgid ""
 "<p>The routing can be set up in this dialog.\n"
 "The <b>Default Gateway</b> matches every possible destination, but poorly. \n"
@@ -2293,7 +2316,7 @@
 "brukt i stedet for standardruten. Prinsippet bak standardruten er ganske enkelt\n"
 "å gi beskjed om at \"alt annet skal sendes hit\".</p>\n"
 
-#: src/include/network/lan/help.rb:97
+#: src/include/network/lan/help.rb:96
 msgid ""
 "<p>For each route, enter destination network IP address, gateway address,\n"
 "and netmask. To omit any of these values, use a dash sign \"-\". Select\n"
@@ -2304,13 +2327,13 @@
 "også enheten som trafikken til det angitte nettverket skal rutes gjennom. Bruk \"-\" som alias for hvilket som helst nettverk.</p>\n"
 
 #. Routing dialog help 2/2
-#: src/include/network/lan/help.rb:103
+#: src/include/network/lan/help.rb:102
 msgid ""
 "<p>Enable <b>IPv4 Forwarding</b> (forwarding packets from external networks\n"
 "to the internal one) if this system is a router.\n"
 msgstr ""
 
-#: src/include/network/lan/help.rb:107
+#: src/include/network/lan/help.rb:106
 msgid ""
 "<p>Enable <b>IPv6 Forwarding</b> (forwarding packets from external networks\n"
 "to the internal one) if this system is a router.\n"
@@ -2318,7 +2341,7 @@
 "autoconfiguration (SLAAC)."
 msgstr ""
 
-#: src/include/network/lan/help.rb:113
+#: src/include/network/lan/help.rb:112
 #, fuzzy
 #| msgid ""
 #| "<p>Enable <b>IP Forwarding</b> (forwarding packets from external networks\n"
@@ -2339,7 +2362,7 @@
 "Du må aktivere maskering og/eller angi minst én omdirigeringsregel for brannmuren. Du kan\n"
 "bruke brannmurmodulen i YaST for å gjøre dette.</p>\n"
 
-#: src/include/network/lan/help.rb:118
+#: src/include/network/lan/help.rb:117
 msgid ""
 "<p>If you are using DHCP to get an IP address, check whether you get\n"
 "also a hostname via DHCP.  The hostname will be set automatically by the DHCP client.\n"
@@ -2353,7 +2376,7 @@
 "Derfor bør du fjerne denne avkryssingen hvis du kobler til ulike nettverks som tilordner \n"
 "ulike vertsnavn.</p> "
 
-#: src/include/network/lan/help.rb:125
+#: src/include/network/lan/help.rb:124
 msgid ""
 "<p><b>Assign Hostname to Loopback IP</b> associates your hostname with \n"
 "the IP address <tt>127.0.0.2</tt> (loopback) in <tt>/etc/hosts</tt>. This is a \n"
@@ -2367,7 +2390,7 @@
 "uten at nettverket er aktivert. Hvis ikke, bør du være forsiktig med dette valget, spesielt \n"
 "hvis denne datamaskinen tilbyr nettverkstjenester.</p>\n"
 
-#: src/include/network/lan/help.rb:132
+#: src/include/network/lan/help.rb:131
 msgid ""
 "<p>Enter the name servers and domain search list for resolving \n"
 "hostnames. Usually they can be obtained by DHCP.</p>\n"
@@ -2376,7 +2399,7 @@
 "vertsnavn. Disse kan vanligvis hentes via DHCP.</p>\n"
 
 #. resolver dialog help
-#: src/include/network/lan/help.rb:136
+#: src/include/network/lan/help.rb:135
 msgid ""
 "<p>A name server is a computer that translates hostnames into\n"
 "IP addresses. This value must be entered as an <b>IP address</b>\n"
@@ -2387,7 +2410,7 @@
 "(f.eks. 192.168.0.42), ikke som et vertsnavn.</p>\n"
 
 #. resolver dialog help
-#: src/include/network/lan/help.rb:142
+#: src/include/network/lan/help.rb:141
 msgid ""
 "<p>Search domain is the domain name where hostname searching starts.\n"
 "The primary search domain is usually the same as the domain name of\n"
@@ -2399,7 +2422,7 @@
 "datamaskinen din (f.eks. suse.de). Det kan være flere søkedomener\n"
 "(f.eks. suse.com). Domener skal være adskilt av komma eller mellomrom.</p>\n"
 
-#: src/include/network/lan/help.rb:148
+#: src/include/network/lan/help.rb:147
 msgid ""
 "<p>Enter the short name for this computer (e.g. <i>mymachine</i>) and the DNS domain\n"
 "(e.g. <i>example.com</i>) that it belongs to. The domain is especially important if this \n"
@@ -2412,7 +2435,7 @@
 "kommandoen\n"
 "<i>hostname</i>.</p>"
 
-#: src/include/network/lan/help.rb:154
+#: src/include/network/lan/help.rb:153
 msgid ""
 "<p>Select the way how the DNS configuration will be modified (name servers,\n"
 "search list, the content of <i>/etc/resolv.conf</i>). Normally, it is handled\n"
@@ -2427,7 +2450,7 @@
 "DHCP-klienten, NetworkManager osv.). Dette er standardvalget <b>Bruk standardpraksis</b>, noe\n"
 "som er tilstrekkelig for de fleste oppsett.</p>\n"
 
-#: src/include/network/lan/help.rb:162
+#: src/include/network/lan/help.rb:161
 msgid ""
 "<p>By choosing <b>Only Manually</b>, <i>netconfig</i> will no longer be\n"
 "allowed to modify <i>/etc/resolv.conf</i>. You can however edit the file\n"
@@ -2447,7 +2470,7 @@
 
 #. Address dialog help 1-6/8: dynamic address preferred
 #. Address dialog help 1/8
-#: src/include/network/lan/help.rb:175
+#: src/include/network/lan/help.rb:174
 msgid ""
 "<p><b><big>Address Setup</big></b></p>\n"
 "<p>Select <b>No Address Setup</b> if you do not want to assign an IP address to this device.\n"
@@ -2457,12 +2480,12 @@
 "<p>Velg <b>Ikke adresseoppsett</b> hvis du ikke ønsker noen IP-adresse for denne enheten.\n"
 "Dette er spesielt nyttig for bond-nettverkskort.</p>\n"
 
-#: src/include/network/lan/help.rb:180
+#: src/include/network/lan/help.rb:179
 msgid "<p>Check <b>iBFT</b> if you want to keep the network configured in your BIOS.</p>\n"
 msgstr "<p>Kryss av for <b>iBFT</b> hvis du vil at nettverket skal være satt opp i BIOS.</p>\n"
 
 #. Address dialog help 2/8
-#: src/include/network/lan/help.rb:184
+#: src/include/network/lan/help.rb:183
 msgid ""
 "<p>Select <b>Dynamic Address</b> if you do not have a static IP address \n"
 "assigned by the system administrator or your Internet provider.</p>\n"
@@ -2471,7 +2494,7 @@
 "fra systemadministroren eller internettleverandøren.</p>\n"
 
 #. Address dialog help 3/8
-#: src/include/network/lan/help.rb:188
+#: src/include/network/lan/help.rb:187
 msgid ""
 "<p>Choose one of the dynamic address assignment methods. Select <b>DHCP</b>\n"
 "if you have a DHCP server running on your local network. Network addresses \n"
@@ -2482,7 +2505,7 @@
 "hentet automatisk fra den serveren.</p>\n"
 
 #. Address dialog help 4/8
-#: src/include/network/lan/help.rb:194
+#: src/include/network/lan/help.rb:193
 msgid ""
 "<p>To search for an IP address and assign it statically, select \n"
 "<b>Zeroconf</b>. To use DHCP and fall back to zeroconf, select <b>DHCP + Zeroconf\n"
@@ -2493,7 +2516,7 @@
 "Hvis ikke, må adressen tildeles <b>statisk</b>.</p>\n"
 
 #. Address dialog help 5/8
-#: src/include/network/lan/help.rb:200
+#: src/include/network/lan/help.rb:199
 msgid ""
 "<p>Enter the <b>IP Address</b> (for example: <tt>192.168.100.99</tt>) for your computer, and the \n"
 " <b>Remote IP Address</b> (for example: <tt>192.168.100.254</tt>)\n"
@@ -2503,7 +2526,7 @@
 "for en annen maskin.</p>\n"
 
 #. Address dialog help 6/8
-#: src/include/network/lan/help.rb:206
+#: src/include/network/lan/help.rb:205
 msgid ""
 "<p>For <b>Static Address Setup</b> enter the static IP address for your computer (for example: <tt>192.168.100.99</tt>) and\n"
 "the network mask (usually <tt>255.255.255.0</tt> or just length of prefix <tt>/24</tt>).Optionally, you can enter\n"
@@ -2514,7 +2537,7 @@
 "et vertsnavn for denne IP-adressen. Vertsnavnet vil bli lagret i <tt>/etc/hosts</tt>.</p>\n"
 
 #. Address dialog help 8/8
-#: src/include/network/lan/help.rb:212
+#: src/include/network/lan/help.rb:211
 msgid ""
 "<p>Contact your <b>network administrator</b> for more information about\n"
 "the network configuration.</p>"
@@ -2522,7 +2545,7 @@
 "<p>Spør <b>nettverksadministratoren </b> hvis du trenger mer informasjon om\n"
 "nettverksoppsettet.</p>"
 
-#: src/include/network/lan/help.rb:215
+#: src/include/network/lan/help.rb:214
 msgid ""
 "<p>DHCP configuration is not recommended for this product.\n"
 "Components of this product might not work with DHCP.</p>"
@@ -2530,7 +2553,7 @@
 "<p>DHCP-oppsett anbefales ikke for dette produktet.\n"
 "Komponentene i dette produktet vil kanskje ikke fungere med DHCP.</p>"
 
-#: src/include/network/lan/help.rb:218
+#: src/include/network/lan/help.rb:217
 msgid ""
 "<p><b><big>Firewall Zone</big></b></p>\n"
 "<p>Select the firewall zone to put the interface into. If you\n"
@@ -2548,11 +2571,11 @@
 "grensesnittet. Hvis ingen andre grensesnitt finnes, vil \n"
 "brannmuren bli deaktivert.</p>"
 
-#: src/include/network/lan/help.rb:227
+#: src/include/network/lan/help.rb:226
 msgid "<p><b>Mandatory Interface</b> specifies whether the network service reports failure if the interface fails to start at boot time.</p>"
 msgstr "<p><b>Obligatorisk grensesnitt</b> angir om nettverkstjenesten skal gi en feilmelding hvis grensesnittet ikke aktiveres ved oppstart.</p>"
 
-#: src/include/network/lan/help.rb:230
+#: src/include/network/lan/help.rb:229
 msgid ""
 "<p><b><big>Maximum Transfer Unit</big></b></p>\n"
 "<p>Maximum transfer unit (<b>MTU</b>) is the maximum size of the packet,\n"
@@ -2568,7 +2591,7 @@
 "spesielt ved trege oppringte forbindelser. Velg en av de anbefalte verdiene, eller\n"
 "angi en egendefinert verdi.</p>\n"
 
-#: src/include/network/lan/help.rb:238
+#: src/include/network/lan/help.rb:237
 msgid ""
 "<p>Select the slave devices for the bond device.\n"
 "Only devices with the device activation set to <b>Never</b> and with <b>No Address Setup</b> are available.</p>"
@@ -2577,12 +2600,12 @@
 "Bare enheter med verdien <b>Aldri</b> for enhetsakivering og som ikke har noe adresseoppsett er tilgjengelige.</p>"
 
 #. DHCP dialog help 1/7
-#: src/include/network/lan/help.rb:243
+#: src/include/network/lan/help.rb:242
 msgid "<p><b><big>DHCP Client Options</big></b></p>"
 msgstr "<p><b><big>Valg for DHCP-klient</big></b></p>"
 
 #. DHCP dialog help 2/7
-#: src/include/network/lan/help.rb:245
+#: src/include/network/lan/help.rb:244
 msgid ""
 "<p>The <b>DHCP Client Identifier</b>, if left empty, defaults to\n"
 "the hardware address of the network interface. It must be different for each\n"
@@ -2597,7 +2620,7 @@
 "nettverksgrensesnitt og dermed samme maskinvareadresse.</p>"
 
 #. DHCP dialog help 3/7
-#: src/include/network/lan/help.rb:253
+#: src/include/network/lan/help.rb:252
 #, fuzzy
 #| msgid ""
 #| "<p>The <b>Hostname to Send</b> specifies a string used for the\n"
@@ -2628,7 +2651,7 @@
 "La feltet stå tomt hvis vertsnavn ikke skal sendes.</p>\n"
 
 #. Aliases dialog help 1/4
-#: src/include/network/lan/help.rb:265
+#: src/include/network/lan/help.rb:264
 #, fuzzy
 #| msgid ""
 #| "<p><b><big>Additional Addresses</big></b></p>\n"
@@ -2641,7 +2664,7 @@
 "<p>Sett opp tilleggsadresser for et grensesnitt (aliaser) i denne tabellen.</p>\n"
 
 #. Aliases dialog help 2/4
-#: src/include/network/lan/help.rb:269
+#: src/include/network/lan/help.rb:268
 #, fuzzy
 #| msgid ""
 #| "<p>Enter an <b>Alias Name</b>, an <b>IP Address</b>, and\n"
@@ -2654,7 +2677,7 @@
 "<b>nettverksmaske</b>.</p>"
 
 #. Aliases dialog help 3/4
-#: src/include/network/lan/help.rb:273
+#: src/include/network/lan/help.rb:272
 #, fuzzy
 #| msgid ""
 #| "<p><b>Alias Name</b> is optional and legacy.The total\n"
@@ -2670,14 +2693,14 @@
 "              overstige 15 tegn, og det tidligere ifconfig-verktøyet vil kutte navnet etter 9 tegn.</p>"
 
 #. Aliases dialog help 3/4, #83766
-#: src/include/network/lan/help.rb:279
+#: src/include/network/lan/help.rb:278
 msgid "<p>Do not include the interface name in the alias name. For example, enter <b>foo</b> instead of <b>eth0:foo</b>.</p>"
 msgstr "<p>Ikke bruk grensesnittets navn i aliasnavnet. Bruk for eksempel <b>foo</b> i stedet for <b>eth0:foo</b>.</p>"
 
 #. shared between WirelessDialog and WirelessKeyPopup
 #. this is suited to the button-switched key typing
 #. Translators: dialog help
-#: src/include/network/lan/help.rb:285
+#: src/include/network/lan/help.rb:284
 msgid ""
 "<p>Choose between three <b>Key Input Types</b> for your key.\n"
 "<br><b>Passphrase</b>: The key is generated from the phrase entered.\n"
@@ -2705,7 +2728,7 @@
 "</p>\n"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:300
+#: src/include/network/lan/help.rb:299
 msgid ""
 "<p>Here, set the most important settings\n"
 "for wireless networking.</p>"
@@ -2714,7 +2737,7 @@
 "for trådløse nettverk.</p>"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:304
+#: src/include/network/lan/help.rb:303
 msgid ""
 "<p>The <b>Operating Mode</b> depends on the network topology. The mode\n"
 "can be <b>Ad-Hoc</b> (peer-to-peer network without an access point),\n"
@@ -2729,7 +2752,7 @@
 "fungerer som aksesspunkt).</p>\n"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:312
+#: src/include/network/lan/help.rb:311
 msgid ""
 "<p>Set the <b>Network Name (ESSID)</b> used to identify\n"
 "cells that are part of the same virtual network. All stations in a\n"
@@ -2748,7 +2771,7 @@
 "sterkeste signalene.</p>\n"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:322
+#: src/include/network/lan/help.rb:321
 msgid ""
 "<p>In some networks, you need to set an <b>Authentication Mode</b>.\n"
 "It depends on the protection technology used, WEP or WPA. <b>WEP</b>\n"
@@ -2784,7 +2807,7 @@
 "<b>Styrt</b>.</p>\n"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:341
+#: src/include/network/lan/help.rb:340
 msgid ""
 "<p>To use WEP, enter the\n"
 "WEP encryption key to use. It can have a key\n"
@@ -2798,7 +2821,7 @@
 "så du trenger bare å angi 40 til 232 bits).</p>\n"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:349
+#: src/include/network/lan/help.rb:348
 msgid ""
 "<p>To use WPA-PSK (sometimes referred to as WPA Home),\n"
 "enter the preshared key. This\n"
@@ -2815,7 +2838,7 @@
 "enkle å gjette som passfrase.</p>\n"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:358
+#: src/include/network/lan/help.rb:357
 msgid ""
 "<p>To use WPA-EAP (sometimes referred to as WPA Enterprise),\n"
 "enter some additional parameters in the next dialog.</p>\n"
@@ -2824,7 +2847,7 @@
 "må du angi noen tilleggsparametere i neste dialog.</p>\n"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:362
+#: src/include/network/lan/help.rb:361
 msgid ""
 "<p>These values will be written to the interface configuration file\n"
 "'ifcfg-*' in '/etc/sysconfig/network'. If you need additional settings,\n"
@@ -3428,23 +3451,23 @@
 msgstr "Initialiserer ..."
 
 #. Ramote Administration dialog caption
-#: src/include/network/remote/dialogs.rb:57
+#: src/include/network/remote/dialogs.rb:56
 msgid "Remote Administration"
 msgstr "Ekstern administrasjon"
 
 #. RadioButton label
-#: src/include/network/remote/dialogs.rb:65
+#: src/include/network/remote/dialogs.rb:64
 msgid "&Allow Remote Administration"
 msgstr "&Tillat ekstern administrasjon"
 
 #. RadioButton label
-#: src/include/network/remote/dialogs.rb:73
+#: src/include/network/remote/dialogs.rb:72
 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:90
+#: src/include/network/remote/dialogs.rb:89
 msgid ""
 "<p><b><big>Remote Administration Settings</big></b></p>\n"
 "<p>If this feature is enabled, you can\n"
@@ -3461,17 +3484,17 @@
 "Denne typen ekstern administrasjon er mindre sikker enn SSH.</p>\n"
 
 #. Dialog frame title
-#: src/include/network/remote/dialogs.rb:110
+#: src/include/network/remote/dialogs.rb:109
 msgid "Remote Administration Settings"
 msgstr "Innstillinger for ekstern administrasjon"
 
 #. Popup text
-#: src/include/network/routines.rb:143
+#: src/include/network/routines.rb:144
 msgid "These packages need to be installed:"
 msgstr "Følgende pakker må installeres:"
 
 #. Popup text
-#: src/include/network/routines.rb:161
+#: src/include/network/routines.rb:162
 msgid ""
 "The required packages are not installed.\n"
 "The configuration will be aborted.\n"
@@ -3486,117 +3509,111 @@
 #. Translators: Appended after a network card name to indicate that
 #. there is no carrier, no link to the network, the cable is not
 #. plugged in. Preferably a short string.
-#: src/include/network/routines.rb:253
+#: src/include/network/routines.rb:254
 msgid "unplugged"
 msgstr "ikke tilkoblet"
 
 #. Table field (Unknown device)
-#: src/include/network/routines.rb:259
+#: src/include/network/routines.rb:260
 msgid "Unknown"
 msgstr "Ukjent"
 
 #. Popup headline
-#: src/include/network/routines.rb:287
+#: src/include/network/routines.rb:288
 msgid "Configuration Successfully Saved"
 msgstr "Oppsettet er lagret"
 
 #. Popup headline
-#: src/include/network/routines.rb:292
+#: src/include/network/routines.rb:293
 msgid "DNS Configuration Successfully Saved"
 msgstr "DNS-oppsettet er lagret"
 
 #. Popup headline
-#: src/include/network/routines.rb:294
+#: src/include/network/routines.rb:295
 msgid "DSL Configuration Successfully Saved"
 msgstr "DSL-oppsettet er lagret"
 
 #. Popup headline
-#: src/include/network/routines.rb:296
+#: src/include/network/routines.rb:297
 msgid "Hosts Configuration Successfully Saved"
 msgstr "Vertsmaskinoppsettet er lagret"
 
 #. Popup headline
-#: src/include/network/routines.rb:300
+#: src/include/network/routines.rb:301
 msgid "ISDN Configuration Successfully Saved"
 msgstr "ISDN-oppsettet er lagret"
 
 #. Popup headline
-#: src/include/network/routines.rb:304
+#: src/include/network/routines.rb:305
 msgid "Network Card Configuration Successfully Saved"
 msgstr "Oppsettet for nettverkskort er lagret"
 
 #. Popup headline
-#: src/include/network/routines.rb:308
+#: src/include/network/routines.rb:309
 msgid "Modem Configuration Successfully Saved"
 msgstr "Modemoppsettet er lagret"
 
 #. Popup headline
-#: src/include/network/routines.rb:312
+#: src/include/network/routines.rb:313
 msgid "Proxy Configuration Successfully Saved"
 msgstr "Mellomserveroppsettet er lagret"
 
 #. Popup headline
-#: src/include/network/routines.rb:316
+#: src/include/network/routines.rb:317
 msgid "Provider Configuration Successfully Saved"
 msgstr "Leverandøroppsettet er lagret"
 
 #. Popup headline
-#: src/include/network/routines.rb:320
+#: src/include/network/routines.rb:321
 msgid "Routing Configuration Successfully Saved"
 msgstr "Rutingoppsettet er lagret"
 
 #. Popup text
-#: src/include/network/routines.rb:329
+#: src/include/network/routines.rb:330
 msgid "Configure mail now?"
 msgstr "Vil du sette opp e-postsystemet nå?"
 
 #. Popup text
-#: src/include/network/routines.rb:334
+#: src/include/network/routines.rb:335
 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:1008
+msgid ""
+"Network is currently handled by NetworkManager\n"
+"or completely disabled. YaST is unable to configure some options."
+msgstr ""
+
 #. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:682
+#: src/include/network/routines.rb:1067
 msgid "Network Cards"
 msgstr "Nettverkskort"
 
 #. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:686
+#: src/include/network/routines.rb:1071
 msgid "Modems"
 msgstr "Modemer"
 
 #. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:690
+#: src/include/network/routines.rb:1075
 msgid "ISDN Cards"
 msgstr "ISDN-kort"
 
 #. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:694
+#: src/include/network/routines.rb:1079
 msgid "DSL Devices"
 msgstr "DSL-enheter"
 
-#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:700
+#: src/include/network/routines.rb:1084
 msgid "All Network Devices"
 msgstr "Alle nettverksenheter"
 
-#. Check if we're running in "normal" stage with NM
-#. see bnc#433084
-#. if listed any items, disable them, if show_popup, show warning popup
-#: src/include/network/routines.rb:1100
-msgid ""
-"Network is currently controlled by NetworkManager and its settings \n"
-"cannot be edited by YaST.\n"
-"\n"
-"To edit the settings, use the NetworkManager connection editor or\n"
-"switch the network setup method to Traditional with ifup.\n"
-msgstr ""
-"Nettverket kontrolleres nå av NetworkManager, og innstillingene \n"
-"kan ikke endres via YaST.\n"
-"\n"
-"Bruk oppsettet for NetworkManager for å endre disse innstillingene, eller\n"
-"bytt til den tradisjonelle metode ifup-metoden for oppsett av nettverk.\n"
-
 #. validation error popup
 #. Popup::Error text
 #: src/include/network/services/dns.rb:93
@@ -3849,7 +3866,7 @@
 
 #. #178538 - disable routing dialog when NetworkManager is used
 #. but instead of default route (#299448) - NM reads it
-#: src/include/network/services/routing.rb:417
+#: src/include/network/services/routing.rb:420
 msgid "The default gateway is invalid."
 msgstr "Standard systemport er ugyldig."
 
@@ -4072,14 +4089,43 @@
 msgid "Set &MTU"
 msgstr "Angi &MTU"
 
+#. the user can control the network with the NetworkManager program
+#: src/include/network/widgets.rb:300
+#, fuzzy
+#| msgid "Network Services"
+msgid "NetworkManager Service"
+msgstr "Nettverkstjenester"
+
+#. ifup is a program name
+#: src/include/network/widgets.rb:308
+#, fuzzy
+#| msgid "Traditional Chinese"
+msgid "Traditional ifup"
+msgstr "Tradisjonelt kinesisk"
+
+#
+#. wicked is network configuration backend like netconfig
+#: src/include/network/widgets.rb:316
+#, fuzzy
+#| msgid "Web Services"
+msgid "Wicked Service"
+msgstr "Webtjenester"
+
+#. used when no network service is active or to disable network service
+#: src/include/network/widgets.rb:324
+#, fuzzy
+#| msgid "Network Services"
+msgid "Network Services Disabled"
+msgstr "Nettverkstjenester"
+
 #. Store the NetworkManager widget
 #. @param [String] key	id of the widget
 #. @param [Hash] event	the event being handled
-#: src/include/network/widgets.rb:336
+#: src/include/network/widgets.rb:355
 msgid "Applet needed"
 msgstr "Panelprogram kreves"
 
-#: src/include/network/widgets.rb:337
+#: src/include/network/widgets.rb:356
 msgid ""
 "NetworkManager is controlled by desktop applet\n"
 "(KDE plasma widget and nm-applet for GNOME).\n"
@@ -4089,50 +4135,35 @@
 "(plasmaskjermelement for KDE og nm-applet for GNOME).\n"
 "Hvis den ikke allerede kjører, start den manuelt."
 
-#. radio button label
-#. the user can control the network with the NetworkManager
-#. program
-#: src/include/network/widgets.rb:359
-msgid "&User Controlled with NetworkManager"
-msgstr "Br&ukerstyrt med NetworkManager"
-
-#. radio button label
-#. ifup is a program name
-#: src/include/network/widgets.rb:365
-msgid "&Traditional Method with ifup"
-msgstr "&Tradisjonell metode med ifup"
-
-#. radio button label
-#. wicked is network configuration backend like netconfig
 #: src/include/network/widgets.rb:371
-msgid "Controlled by &wicked"
-msgstr ""
+msgid "General Network Settings"
+msgstr "Generelt nettverksoppsett"
 
-#: src/include/network/widgets.rb:410
+#: src/include/network/widgets.rb:417
 msgid "IPv6 Protocol Settings"
 msgstr "IPv6-protokollinnstillinger"
 
 #. enable ipv6 support
-#: src/include/network/widgets.rb:411 src/modules/Lan.rb:825
+#: src/include/network/widgets.rb:418 src/modules/Lan.rb:820
 msgid "Enable IPv6"
 msgstr "Aktiver IPv6"
 
 #. TRANSLATORS: Informs that device name is not known
-#: src/include/network/widgets.rb:428
+#: src/include/network/widgets.rb:435
 msgid "Unknown device"
 msgstr "Ukjent enhet"
 
 #. TRANSLATORS: Part of label, device with IP address assigned by DHCP
-#: src/include/network/widgets.rb:440
+#: src/include/network/widgets.rb:447
 msgid "DHCP address"
 msgstr "DHCP-adresse"
 
 #. TRANSLATORS: Informs that no IP has been assigned to the device
-#: src/include/network/widgets.rb:445
+#: src/include/network/widgets.rb:452
 msgid "No IP address assigned"
 msgstr "Ingen IP-adresse tilordnet"
 
-#: src/include/network/widgets.rb:448
+#: src/include/network/widgets.rb:455
 msgid ""
 "%1 \n"
 "%2 - %3"
@@ -4141,12 +4172,12 @@
 "%2 - %3"
 
 #. #186102
-#: src/include/network/widgets.rb:503
+#: src/include/network/widgets.rb:510
 msgid "&Change Device"
 msgstr "&Endre enhet"
 
 #. popup dialog title
-#: src/include/network/widgets.rb:537
+#: src/include/network/widgets.rb:544
 msgid "Network Device Select"
 msgstr "Valg av nettverksenhet"
 
@@ -4162,102 +4193,101 @@
 msgstr "På grunn av nettverksbroen må YaST2 starte nettverket på nytt for å aktivere innstillingene."
 
 #. Opens dialog for editing NIC name
-#: src/lib/network/edit_nic_name.rb:97
+#: src/lib/network/edit_nic_name.rb:95
 #, fuzzy
 #| msgid "Device Name"
-msgid "Device name:"
+msgid "Device Name:"
 msgstr "Enhetsnavn"
 
-#: src/lib/network/edit_nic_name.rb:103
-msgid "Base udev rule on"
-msgstr ""
+#
+#: src/lib/network/edit_nic_name.rb:101
+#, fuzzy
+#| msgid "Base New Profile On"
+msgid "Base Udev Rule On"
+msgstr "Baser ny profil på"
 
 #. make sure there is enough space (#367239)
-#: src/lib/network/edit_nic_name.rb:112
+#: src/lib/network/edit_nic_name.rb:110
 #, fuzzy
 #| msgid "IP address: %1/%2"
 msgid "MAC address: %s"
 msgstr "IP-adresse: %1/%2"
 
-#: src/lib/network/edit_nic_name.rb:118
+#: src/lib/network/edit_nic_name.rb:116
 msgid "BusID: %s"
 msgstr ""
 
-#. Checks if given name can be accepted as nic's new one.
-#.
-#. Pops up an explanation if the name is invalid
-#.
-#. @return [boolean] false if name is invalid
-#: src/lib/network/edit_nic_name.rb:154
+#. check if the name is assigned to another device already
+#: src/lib/network/edit_nic_name.rb:153
 msgid "Configuration name already exists."
 msgstr "Oppsettnavnet finnes allerede."
 
-#: src/lib/network/edit_nic_name.rb:158
+#: src/lib/network/edit_nic_name.rb:157
 msgid "Invalid configuration name."
 msgstr "Ugyldig navn på oppsettfil."
 
 #. Progress stage 1
-#: src/modules/DNS.rb:398
+#: src/modules/DNS.rb:371
 msgid "Write hostname"
 msgstr "Skriv vertsnavn"
 
 #. Progress stage 2
 #. Progress stage 10
-#: src/modules/DNS.rb:400 src/modules/Lan.rb:538
+#: src/modules/DNS.rb:373 src/modules/Lan.rb:535
 msgid "Update configuration"
 msgstr "Oppdater konfigurasjon"
 
 #. Progress stage 3
-#: src/modules/DNS.rb:402
+#: src/modules/DNS.rb:375
 msgid "Update /etc/resolv.conf"
 msgstr "Oppdater /etc/resolve.conf"
 
 #. Write dialog caption
-#: src/modules/DNS.rb:406
+#: src/modules/DNS.rb:379
 msgid "Saving Hostname and DNS Configuration"
 msgstr "Skriver vertsnavn og DNS-oppsett"
 
 #. Allow to set hostname even if it's modified by DHCP (#13427)
 #. if(NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"]:false != true) {
 #. Progress step 1/3
-#: src/modules/DNS.rb:415
+#: src/modules/DNS.rb:388
 msgid "Writing hostname..."
 msgstr "Lagrer vertsnavn..."
 
 #. Progress step 2/3
 #. Progress step 10
-#: src/modules/DNS.rb:429 src/modules/Lan.rb:640
+#: src/modules/DNS.rb:405 src/modules/Lan.rb:630
 msgid "Updating configuration..."
 msgstr "Oppdaterer konfigurasjon..."
 
 #. if(SCR::Read(.target.size, resolv_conf) < 0)
 #. SCR::Write(.target.string, resolv_conf, "");
 #. Progress step 3/3
-#: src/modules/DNS.rb:440
+#: src/modules/DNS.rb:416
 msgid "Updating /etc/resolv.conf ..."
 msgstr "Oppdaterer /etc/resolve.conf..."
 
 #. Summary text
-#: src/modules/DNS.rb:557
+#: src/modules/DNS.rb:533
 msgid "Hostname: Set by DHCP"
 msgstr "Vertsnavn: Definert av DHCP"
 
 #. Summary text
-#: src/modules/DNS.rb:563
+#: src/modules/DNS.rb:539
 msgid "Hostname: %1"
 msgstr "Vertsnavn: %1"
 
-#: src/modules/DNS.rb:571
+#: src/modules/DNS.rb:547
 msgid "Hostname will not be written to /etc/hosts"
 msgstr "Vertsnavnet vil ikke bli lagret i /etc/hosts"
 
 #. Summary text
-#: src/modules/DNS.rb:593
+#: src/modules/DNS.rb:569
 msgid "Name Servers: %1"
 msgstr "Navneservere: %1"
 
 #. Summary text
-#: src/modules/DNS.rb:603
+#: src/modules/DNS.rb:579
 msgid "Search List: %1"
 msgstr "Søkeliste: %1"
 
@@ -4276,62 +4306,62 @@
 msgstr "Oppdaterer /etc/hosts..."
 
 #. Read dialog caption
-#: src/modules/Lan.rb:275
+#: src/modules/Lan.rb:272
 msgid "Initializing Network Configuration"
 msgstr "Initialiserer nettverksoppsett"
 
 #. Progress stage 1/9
-#: src/modules/Lan.rb:288
+#: src/modules/Lan.rb:285
 msgid "Detect network devices"
 msgstr "Søk etter nettverksenheter"
 
 #. Progress stage 2/9
-#: src/modules/Lan.rb:290
+#: src/modules/Lan.rb:287
 msgid "Read driver information"
 msgstr "Les driverinformasjon"
 
 #. Progress stage 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:292
+#: src/modules/Lan.rb:289
 msgid "Read device configuration"
 msgstr "Les enhetsoppsett"
 
 #. Progress stage 4/9
-#: src/modules/Lan.rb:294
+#: src/modules/Lan.rb:291
 msgid "Read network configuration"
 msgstr "Les nettverksoppsett"
 
 #. Progress stage 5/9
-#: src/modules/Lan.rb:296
+#: src/modules/Lan.rb:293
 msgid "Read firewall settings"
 msgstr "Les brannmurinnstillinger"
 
 #. Progress stage 6/9
-#: src/modules/Lan.rb:298
+#: src/modules/Lan.rb:295
 msgid "Read hostname and DNS configuration"
 msgstr "Les vertsnavn og DNS-oppsett"
 
 #. Progress stage 7/9
-#: src/modules/Lan.rb:300
+#: src/modules/Lan.rb:297
 msgid "Read installation information"
 msgstr "Les installasjonsinformasjon"
 
 #. Progress stage 8/9
-#: src/modules/Lan.rb:302
+#: src/modules/Lan.rb:299
 msgid "Read routing configuration"
 msgstr "Les rutingoppsett"
 
 #. Progress stage 9/9
-#: src/modules/Lan.rb:304
+#: src/modules/Lan.rb:301
 msgid "Detect current status"
 msgstr "Søk etter gjeldende status"
 
 #. Progress step 1/9
-#: src/modules/Lan.rb:318
+#: src/modules/Lan.rb:315
 msgid "Detecting ndiswrapper..."
 msgstr "Søker etter ndiswrapper..."
 
 #. modprobe ndiswrapper before hwinfo when needed (#343893)
-#: src/modules/Lan.rb:337
+#: src/modules/Lan.rb:334
 msgid ""
 "Detected a ndiswrapper configuration,\n"
 "but the kernel module was not modprobed.\n"
@@ -4341,7 +4371,7 @@
 "men det ble ikke kjørt modprobe for kjernemodulen.\n"
 "Vil du kjøre modprobe for ndiswrapper?\n"
 
-#: src/modules/Lan.rb:345
+#: src/modules/Lan.rb:342
 msgid ""
 "ndiswrapper kernel module has not been loaded.\n"
 "Check configuration manually.\n"
@@ -4350,241 +4380,247 @@
 "Kontroller oppsettet manuelt.\n"
 
 #. Progress step 2/9
-#: src/modules/Lan.rb:359
+#: src/modules/Lan.rb:356
 msgid "Detecting network devices..."
 msgstr "Søker etter nettverksenheter..."
 
 #. Progress step 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:367
+#: src/modules/Lan.rb:364
 msgid "Reading device configuration..."
 msgstr "Leser enhetsoppsett..."
 
 #. Progress step 4/9
-#: src/modules/Lan.rb:373
+#: src/modules/Lan.rb:370
 msgid "Reading network configuration..."
 msgstr "Leser nettverksoppsett..."
 
 #. Progress step 5/9
-#: src/modules/Lan.rb:382
+#: src/modules/Lan.rb:379
 msgid "Reading firewall settings..."
 msgstr "Leser brannmurinnstillinger..."
 
 #. Progress step 6/9
-#: src/modules/Lan.rb:390
+#: src/modules/Lan.rb:387
 msgid "Reading hostname and DNS configuration..."
 msgstr "Leser vertsnavn og DNS-oppsett..."
 
 #. Progress step 7/9
-#: src/modules/Lan.rb:397
+#: src/modules/Lan.rb:394
 msgid "Reading installation information..."
 msgstr "Leser installasjonsinformasjon..."
 
 #. Progress step 8/9
-#: src/modules/Lan.rb:403
+#: src/modules/Lan.rb:400
 msgid "Reading routing configuration..."
 msgstr "Leser rutinginformasjon..."
 
 #. Progress step 9/9
-#: src/modules/Lan.rb:409
+#: src/modules/Lan.rb:406
 msgid "Detecting current status..."
 msgstr "Søker etter gjeldende status..."
 
 #. Final progress step
 #. Final progress step
-#: src/modules/Lan.rb:415 src/modules/Lan.rb:661
+#: src/modules/Lan.rb:412 src/modules/Lan.rb:651
 msgid "Finished"
 msgstr "Fullført"
 
 #. (a specialization used when a parameterless function is needed)
 #. @return Read(`cache)
-#: src/modules/Lan.rb:441
+#: src/modules/Lan.rb:438
 msgid "To apply this change, a reboot is needed."
 msgstr "Start maskinen på nytt for å aktivere denne endringen."
 
 #. Write dialog caption
-#: src/modules/Lan.rb:510
+#: src/modules/Lan.rb:507
 msgid "Saving Network Configuration"
 msgstr "Lagrer nettverksoppsett"
 
 #. Progress stage 2
-#: src/modules/Lan.rb:517
+#: src/modules/Lan.rb:514
 msgid "Write drivers information"
 msgstr "Lagre driverinformasjon"
 
 #. Progress stage 3 - multiple devices may be present,really plural
-#: src/modules/Lan.rb:519
+#: src/modules/Lan.rb:516
 msgid "Write device configuration"
 msgstr "Lagre enhetsoppsett"
 
 #. Progress stage 4
-#: src/modules/Lan.rb:521
+#: src/modules/Lan.rb:518
 msgid "Write network configuration"
 msgstr "Lagre nettverksoppsett"
 
 #. Progress stage 5
-#: src/modules/Lan.rb:523
+#: src/modules/Lan.rb:520
 msgid "Write routing configuration"
 msgstr "Lagre rutingoppsett"
 
 #. Progress stage 6
-#: src/modules/Lan.rb:525
+#: src/modules/Lan.rb:522
 msgid "Write hostname and DNS configuration"
 msgstr "Lagre vertsnavn og DNS-oppsett"
 
 #. Progress stage 7
-#: src/modules/Lan.rb:527
+#: src/modules/Lan.rb:524
 msgid "Set up network services"
 msgstr "Sett opp nettverkstjenester"
 
 #. Progress stage 8
 #. Progress stage 1
-#: src/modules/Lan.rb:531 src/modules/Remote.rb:286
+#: src/modules/Lan.rb:528 src/modules/Remote.rb:289
 msgid "Write firewall settings"
 msgstr "Lagre brannmurinnstillinger"
 
 #. Progress stage 9
-#: src/modules/Lan.rb:535
+#: src/modules/Lan.rb:532
 msgid "Activate network services"
 msgstr "Aktiver nettverkstjenester"
 
 #. Progress step 2
-#: src/modules/Lan.rb:552
+#: src/modules/Lan.rb:549
 msgid "Writing /etc/modprobe.conf..."
 msgstr "Lagrer /etc/modprobe.conf..."
 
 #. Progress step 3 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:557
+#: src/modules/Lan.rb:554
 msgid "Writing device configuration..."
 msgstr "Lagrer enhetsoppsett..."
 
 #. Progress step 4
-#: src/modules/Lan.rb:573
+#: src/modules/Lan.rb:560
 msgid "Writing network configuration..."
 msgstr "Lagrer nettverksoppsett..."
 
 #. Progress step 5
-#: src/modules/Lan.rb:579
+#: src/modules/Lan.rb:566
 msgid "Writing routing configuration..."
 msgstr "Lagrer rutinginformasjon..."
 
 #. Progress step 6
-#: src/modules/Lan.rb:587
+#: src/modules/Lan.rb:574
 msgid "Writing hostname and DNS configuration..."
 msgstr "Lagrer vertsnavn og DNS-oppsett..."
 
 #. Progress step 7
-#: src/modules/Lan.rb:600
+#: src/modules/Lan.rb:587
 msgid "Setting up network services..."
 msgstr "Setter opp nettverkstjenester..."
 
 #. Progress step 8
-#. 100; //for testing
-#: src/modules/Lan.rb:608 src/modules/Remote.rb:301
+#: src/modules/Lan.rb:595 src/modules/Remote.rb:303
 msgid "Writing firewall settings..."
 msgstr "Lagrer brannmurinnstillinger..."
 
 #. Progress step 9
-#: src/modules/Lan.rb:618
+#: src/modules/Lan.rb:605
 msgid "Activating network services..."
 msgstr "Aktiverer nettverkstjenester..."
 
-#: src/modules/Lan.rb:657
+#: src/modules/Lan.rb:647
 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:706
+msgid "AutoYaST setting networking/managed: NetworkManager is not available, Wicked will be used."
+msgstr ""
+
 #. Create a textual summary for the general network settings
 #. proposal (NetworkManager + ipv6)
 #. @return [rich text, links]
-#: src/modules/Lan.rb:797
+#: src/modules/Lan.rb:792
 msgid "Network Mode"
 msgstr "Nettverksmodus"
 
 #. network mode: the interfaces are controlled by the user
-#: src/modules/Lan.rb:802
+#: src/modules/Lan.rb:797
 msgid "Interfaces controlled by NetworkManager"
 msgstr "Grensesnitt som kontrolleres av NetworkManager"
 
 #. disable NetworkManager applet
-#: src/modules/Lan.rb:804
+#: src/modules/Lan.rb:799
 msgid "Disable NetworkManager"
 msgstr "Deaktiver NetworkManager"
 
 #. network mode
-#: src/modules/Lan.rb:808
+#: src/modules/Lan.rb:803
 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:811
+#: src/modules/Lan.rb:806
 msgid "Enable NetworkManager"
 msgstr "Aktiver NetworkManager"
 
 #. ipv6 support is enabled
-#: src/modules/Lan.rb:817
+#: src/modules/Lan.rb:812
 msgid "Support for IPv6 protocol is enabled"
 msgstr "Støtte for IPv6-protokollen er aktivert"
 
 #. disable ipv6 support
-#: src/modules/Lan.rb:819
+#: src/modules/Lan.rb:814
 msgid "Disable IPv6"
 msgstr "Deaktiver IPv6"
 
 #. ipv6 support is disabled
-#: src/modules/Lan.rb:823
+#: src/modules/Lan.rb:818
 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:181
+#: src/modules/LanItems.rb:195
 #, fuzzy
 #| msgid "Not connected"
 msgid "connected"
 msgstr "Ikke tilkoblet"
 
-#: src/modules/LanItems.rb:182
+#: src/modules/LanItems.rb:196
 msgid "datagram"
 msgstr ""
 
 #. summary description of STARTMODE=auto
 #. summary description of STARTMODE=auto
 #. summary description of STARTMODE=hotplug
-#: src/modules/LanItems.rb:1190 src/modules/LanItems.rb:1194
-#: src/modules/LanItems.rb:1198
+#: src/modules/LanItems.rb:1251 src/modules/LanItems.rb:1255
+#: src/modules/LanItems.rb:1259
 msgid "Started automatically at boot"
 msgstr "Startet automatisk ved oppstart"
 
 #. summary description of STARTMODE=ifplugd
-#: src/modules/LanItems.rb:1202
+#: src/modules/LanItems.rb:1263
 msgid "Started automatically on cable connection"
 msgstr "Startet automatisk via kabelforbindelse"
 
 #. summary description of STARTMODE=managed
-#: src/modules/LanItems.rb:1206
+#: src/modules/LanItems.rb:1267
 msgid "Managed by NetworkManager"
 msgstr "Bruk NetworkManager"
 
 #. summary description of STARTMODE=off
-#: src/modules/LanItems.rb:1210
+#: src/modules/LanItems.rb:1271
 msgid "Will not be started at all"
 msgstr "Vil ikke bli startet i det hele tatt"
 
-#: src/modules/LanItems.rb:1215
+#: src/modules/LanItems.rb:1276
 msgid "Started manually"
 msgstr "Startet manuelt"
 
 #. do nothing
-#: src/modules/LanItems.rb:1227
+#: src/modules/LanItems.rb:1288
 msgid "IP address assigned using"
 msgstr "IP-adresse tildelt via"
 
-#: src/modules/LanItems.rb:1231
+#: src/modules/LanItems.rb:1292
 #, fuzzy
 #| msgid "IP address: %1/%2"
 msgid "IP address: %s/%s"
 msgstr "IP-adresse: %1/%2"
 
-#: src/modules/LanItems.rb:1234
+#: src/modules/LanItems.rb:1295
 #, fuzzy
 #| msgid "IP address: %1, subnet mask %2"
 msgid "IP address: %s, subnet mask %s"
@@ -4593,46 +4629,46 @@
 #. FIXME:
 #. - side effect: sets @type. No reason for that. It should only build item
 #. overview. Check and remove.
-#: src/modules/LanItems.rb:1265
+#: src/modules/LanItems.rb:1326
 msgid "Not configured"
 msgstr "Ikke satt opp"
 
 #. display it only if we need it, don't duplicate "ifcfg_name" above
-#: src/modules/LanItems.rb:1288 src/modules/LanItems.rb:1350
+#: src/modules/LanItems.rb:1349 src/modules/LanItems.rb:1415
 #, fuzzy
 #| msgid "Device Name: %1"
 msgid "Device Name: %s"
 msgstr "Enhetsnavn: %1"
 
-#: src/modules/LanItems.rb:1308
+#: src/modules/LanItems.rb:1369
 msgid "Bonding slaves"
 msgstr "Bonding-slaver"
 
-#: src/modules/LanItems.rb:1322
+#: src/modules/LanItems.rb:1383
 #, fuzzy
 #| msgid "enslaved in %1"
 msgid "enslaved in %s"
 msgstr "slave i %1"
 
-#: src/modules/LanItems.rb:1323
+#: src/modules/LanItems.rb:1384
 msgid "Bonding master"
 msgstr "Bonding-master"
 
-#: src/modules/LanItems.rb:1333
+#: src/modules/LanItems.rb:1398
 msgid "Not connected"
 msgstr "Ikke tilkoblet"
 
-#: src/modules/LanItems.rb:1336
+#: src/modules/LanItems.rb:1401
 msgid "No hwinfo"
 msgstr "Ingen maskinvareinfo"
 
-#: src/modules/LanItems.rb:1356
+#: src/modules/LanItems.rb:1421
 #, 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:1362
+#: src/modules/LanItems.rb:1427
 #, fuzzy
 #| msgid ""
 #| "<p>The device is not configured. Press <b>Edit</b>\n"
@@ -4644,44 +4680,61 @@
 "<p>Enheten er ikke satt opp. Klikk <b>Rediger</b>\n"
 "for å gå til oppsett.</p>\n"
 
-#: src/modules/LanItems.rb:1369
+#: src/modules/LanItems.rb:1434
 msgid "Needed firmware"
 msgstr "Nødvendig fastvare"
 
-#: src/modules/LanItems.rb:1369
+#: src/modules/LanItems.rb:1434
 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:239
+#, fuzzy
+#| msgid "SuSEfirewall2 package is not installed, firewall will be disabled."
+msgid ""
+"Package %{package} is not installed\n"
+"firewall settings will be disabled."
+msgstr "SuSEfirewall2-pakken er ikke installert, brannveggsfunksjonalitet vil bli deaktivert."
+
 #. Progress stage 2
-#: src/modules/Remote.rb:288
+#: src/modules/Remote.rb:291
 msgid "Configure display manager"
 msgstr "Sett opp vindusbehandler"
 
 #. Progress stage 3
-#: src/modules/Remote.rb:293
+#: src/modules/Remote.rb:296
 msgid "Restart the services"
 msgstr "Start tjenesten på nytt"
 
-#: src/modules/Remote.rb:296
+#: src/modules/Remote.rb:299
 msgid "Saving Remote Administration Configuration"
 msgstr "Lagrer oppsett av ekstern administrasjon"
 
-#: src/modules/Remote.rb:307
+#: src/modules/Remote.rb:308
 msgid "Configuring display manager..."
 msgstr "Setter opp vindusbehandler..."
 
+#. Enable xinetd
+#. Enable XDM
+#: src/modules/Remote.rb:327 src/modules/Remote.rb:335
+#, fuzzy
+#| msgid "Enabling service 'uml' failed."
+msgid "Enabling service %{service} has failed"
+msgstr "Aktivering av tjenesten'uml' mislyktes."
+
 #. Do this only if package xinetd is installed (#256385)
-#: src/modules/Remote.rb:364
+#: src/modules/Remote.rb:359
 msgid "Restarting the service..."
 msgstr "Starter tjenesten på nytt..."
 
-#. Label in proposal text
-#: src/modules/Remote.rb:415
+#. description in proposal
+#: src/modules/Remote.rb:393
 msgid "Remote administration is enabled."
 msgstr "Ekstern administrasjon er aktivert."
 
-#. Label in proposal text
-#: src/modules/Remote.rb:418
+#: src/modules/Remote.rb:393
 msgid "Remote administration is disabled."
 msgstr "Ekstern administrasjon is deaktivert."
 
@@ -4735,29 +4788,57 @@
 msgstr "IP-overføring:"
 
 #. item in combo box Firewall Zone
-#: src/modules/SuSEFirewall4Network.rb:82
+#: src/modules/SuSEFirewall4Network.rb:121
 msgid "Automatically Assigned Zone"
 msgstr "Automatisk tilordnet sone"
 
 #. item in combo box Firewall Zone
-#: src/modules/SuSEFirewall4Network.rb:84
+#: src/modules/SuSEFirewall4Network.rb:123
 msgid "Firewall Disabled"
 msgstr "Brannmur er deaktivert"
 
 #. TRANSLATORS: Part of combo box item -> "Internal Zone (Unprotected)"
-#: src/modules/SuSEFirewall4Network.rb:96
+#: src/modules/SuSEFirewall4Network.rb:135
 msgid "(Unprotected)"
 msgstr "(ubeskyttet"
 
+#~ msgid ""
+#~ "At least one selected device is already configured.\n"
+#~ "Adapt the configuration for bridge (IP address 0.0.0.0/32)?\n"
+#~ msgstr ""
+#~ "Minst én av de valgte enhetene er allerede satt opp.\n"
+#~ "Vil du tilpasse oppsettet for nettverksbro (IP-adresse 0.0.0.0/32)?\n"
+
+#~ msgid ""
+#~ "Network is currently controlled by NetworkManager and its settings \n"
+#~ "cannot be edited by YaST.\n"
+#~ "\n"
+#~ "To edit the settings, use the NetworkManager connection editor or\n"
+#~ "switch the network setup method to Traditional with ifup.\n"
+#~ msgstr ""
+#~ "Nettverket kontrolleres nå av NetworkManager, og innstillingene \n"
+#~ "kan ikke endres via YaST.\n"
+#~ "\n"
+#~ "Bruk oppsettet for NetworkManager for å endre disse innstillingene, eller\n"
+#~ "bytt til den tradisjonelle metode ifup-metoden for oppsett av nettverk.\n"
+
+#~ msgid "&User Controlled with NetworkManager"
+#~ msgstr "Br&ukerstyrt med NetworkManager"
+
+#~ msgid "&Traditional Method with ifup"
+#~ msgstr "&Tradisjonell metode med ifup"
+
+#, fuzzy
+#~| msgid "Device Name"
+#~ msgid "Device name:"
+#~ msgstr "Enhetsnavn"
+
 #~ msgid "SSH service will be enabled, SSH port will be open (<a href=\"%1\">disable and close</a>)"
 #~ msgstr "SSH-tjenesten vil være aktivert, og SSH-porten vil være åpen (<a href=«%1»>deaktiver og lukk</a>)"
 
 #~ msgid "SSH service will be disabled, SSH port will be blocked (<a href=\"%1\">enable and open</a>)"
 #~ msgstr "SSH-tjenesten vil være deaktivert, og SSH-porten vil være blokkert (<a href=«%1»>aktiver og åpne</a>)"
 
-#~ msgid "General Network Settings"
-#~ msgstr "Generelt nettverksoppsett"
-
 #~ msgid "General &Network Settings"
 #~ msgstr "Generelt &nettverksoppsett"
 
@@ -5268,9 +5349,6 @@
 #~ msgid "Add &Provider to Existing Interface"
 #~ msgstr "Legg til &tjenesteleverandør for eksisterende grensesnitt"
 
-#~ msgid "Network Services"
-#~ msgstr "Nettverkstjenester"
-
 #~ msgid "S&kip"
 #~ msgstr "H&opp over"
 

Modified: trunk/yast/nb/po/nfs.nb.po
===================================================================
--- trunk/yast/nb/po/nfs.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/nfs.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: nfs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2009-08-12 12:50+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"

Modified: trunk/yast/nb/po/nfs_server.nb.po
===================================================================
--- trunk/yast/nb/po/nfs_server.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/nfs_server.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: nfs_server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2009-08-12 12:54+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -81,27 +81,27 @@
 msgstr "Ja/Nei-valg for aktivering/deaktivering av sikker NFS."
 
 #. summary text
-#: src/clients/nfs_server.rb:202
+#: src/clients/nfs_server.rb:196
 msgid "NFS server is enabled"
 msgstr "NFS-serveren er aktivert"
 
 #. summary text
-#: src/clients/nfs_server.rb:205
+#: src/clients/nfs_server.rb:199
 msgid "NFS server is disabled"
 msgstr "NFS-serveren er deaktivert"
 
 #. error message
-#: src/clients/nfs_server.rb:221
+#: src/clients/nfs_server.rb:215
 msgid "Required packages (%1) are not installed."
 msgstr "Nødvendige pakker (%1) er ikke installert."
 
 #. error
 #. error
-#: src/clients/nfs_server.rb:261 src/clients/nfs_server.rb:291
+#: src/clients/nfs_server.rb:255 src/clients/nfs_server.rb:285
 msgid "No mount point specified."
 msgstr "Monteringspunkt er ikke spesifisert."
 
-#: src/clients/nfs_server.rb:266
+#: src/clients/nfs_server.rb:260
 msgid ""
 "The exports table already\n"
 "contains this directory."
@@ -112,11 +112,11 @@
 #. CLI action handler.
 #. @param [Hash] options command options
 #. @return whether successful
-#: src/clients/nfs_server.rb:325
+#: src/clients/nfs_server.rb:319
 msgid "Domain cannot be set without enabling NFSv4. Use the 'set enablev4' command."
 msgstr "Domene kan ikke angis uten å aktivere NFSv4. Bruk 'set enablev4'-kommandoen."
 
-#: src/clients/nfs_server.rb:336
+#: src/clients/nfs_server.rb:330
 msgid "Command 'set' must be used in the form 'set option=value'. Use 'set help' to get information about available options."
 msgstr "Kommandoen må angis i formatet 'set valg=verdi'. Bruk 'set help' for å få informasjon om valgene."
 
@@ -177,59 +177,48 @@
 "Det mangler sannsynligvis informasjon i oppsettfilen.\n"
 
 #. text entry label
-#: src/include/nfs_server/ui.rb:68
+#: src/include/nfs_server/ui.rb:58
 msgid "&Directory to Export"
 msgstr "&Katalog som skal eksporteres"
 
 #. button label
-#: src/include/nfs_server/ui.rb:74
+#: src/include/nfs_server/ui.rb:64
 msgid "&Browse..."
 msgstr "&Bla igjennom..."
 
-#: src/include/nfs_server/ui.rb:97
+#: src/include/nfs_server/ui.rb:87
 msgid "Enter a non-empty export path. For example, /exports."
 msgstr "Angi en eksporteringssti, f.eks /exports."
 
 #. error popup message
-#: src/include/nfs_server/ui.rb:105
+#: src/include/nfs_server/ui.rb:95
 msgid "The exports table already contains this directory."
 msgstr "Eksporttabellen inneholder allerede denne katalogen."
 
-#. message popup; %1, %2 are package names
-#: src/include/nfs_server/ui.rb:113
-msgid ""
-"The user mode NFS server (%1) cannot export directories\n"
-"with spaces in their names.\n"
-"Use the kernel-based server (%2) to do that."
-msgstr ""
-"Brukermodus-NFS-serveren (%1) kan ikke eksportere kataloger\n"
-"med mellomrom i navnet.\n"
-"Bruk den kjernebaserte serveren (%2) for å gjøre dette."
-
 #. the dir does not exist
-#: src/include/nfs_server/ui.rb:126
+#: src/include/nfs_server/ui.rb:101
 msgid "The directory does not exist. Create it?"
 msgstr "Katalogen finnes ikke. Vil du opprette den?"
 
 #. title in the file selection dialog
-#: src/include/nfs_server/ui.rb:136
+#: src/include/nfs_server/ui.rb:111
 msgid "Select the Directory to Export"
 msgstr "Velg katalog som skal eksporteres"
 
 #. text entry label
-#: src/include/nfs_server/ui.rb:193
+#: src/include/nfs_server/ui.rb:168
 msgid "&Host Wild Card"
 msgstr "&Jokertegn for vertsmaskin"
 
 #. text entry label
-#: src/include/nfs_server/ui.rb:195
+#: src/include/nfs_server/ui.rb:170
 msgid "O&ptions"
 msgstr "A<ernativer"
 
 #. check to see if user has changed options entry in the dialogue
 #. thrown due to a "Add Hosts" (as opposed to editing existing ones).
 #. If yes, suggest the user with a suitable default option set.
-#: src/include/nfs_server/ui.rb:250
+#: src/include/nfs_server/ui.rb:222
 msgid ""
 "'fsid=0' is not a valid option unless \n"
 "NFSv4 is enabled (previous page).\n"
@@ -238,7 +227,7 @@
 "ikke NFSv4 er aktivert (forrige side).\n"
 
 #. error popup message
-#: src/include/nfs_server/ui.rb:268
+#: src/include/nfs_server/ui.rb:240
 msgid ""
 "Options for this wild card\n"
 "are already set."
@@ -248,12 +237,12 @@
 
 #. Opening NFS server dialog
 #. @return `back, `abort, `next `or finish
-#: src/include/nfs_server/ui.rb:300
+#: src/include/nfs_server/ui.rb:272
 msgid "Unable to read the /etc/idmapd.conf file. Setting the default setting for the domain to 'localdomain'."
 msgstr "Kan ikke lese /etc/idmapd.conf-filen. Bruker standardinnstillingen 'localdomain' for domene."
 
 #. Help, part 1 of 2
-#: src/include/nfs_server/ui.rb:323
+#: src/include/nfs_server/ui.rb:295
 msgid ""
 "<P>Here, choose whether to start an NFS server on your computer\n"
 "and export some of your directories to others.</P>"
@@ -262,7 +251,7 @@
 "og eksportere noen av katalogene dine til andre.</P>"
 
 #. Help, part 2 of 2
-#: src/include/nfs_server/ui.rb:330
+#: src/include/nfs_server/ui.rb:302
 msgid ""
 "<P>If you choose <B>Start NFS Server</B>, clicking <B>Next</B> opens\n"
 "a configuration dialog in which to specify the directories to export.</P>"
@@ -270,7 +259,7 @@
 "<P>Velg <B>Start NFS-server</B> og klikk <B>Neste</B> for å åpne\n"
 "en konfigurasjonsdialog der kan du velge hvilke kataloger du vil eksportere.</P>"
 
-#: src/include/nfs_server/ui.rb:339
+#: src/include/nfs_server/ui.rb:311
 msgid ""
 "<P>If the server needs to handle NFSv4 clients, check <B>Enable NFSv4</B>\n"
 "and fill in the NFSv4 domain name you want the ID mapping daemon to use. Leave\n"
@@ -281,7 +270,7 @@
 "'localdomain' eller se manualsiden for 'idmapd' og 'idmapd.conf' hvis du er usikker.</p>\n"
 
 #. FIXME: use %1 as nfs-utils.src.rpm produces nfs-kernel-server.rpm
-#: src/include/nfs_server/ui.rb:349
+#: src/include/nfs_server/ui.rb:321
 msgid ""
 "<P>If the server and client must authenticate using GSS library, check the\n"
 "<B>Enable GSS Security</B> box. To use GSS API, you currently need to have Kerberos and gssapi (nfs-utils > 1.0.7) on your system.</P>\n"
@@ -290,44 +279,44 @@
 "Kerberos og gssapi (nfs-utils > 1.0.7) er kreves for å benytte GSS API.</p>\n"
 
 #. frame label
-#: src/include/nfs_server/ui.rb:359
+#: src/include/nfs_server/ui.rb:331
 msgid "NFS Server"
 msgstr "NFS-server"
 
 #. radio button label
-#: src/include/nfs_server/ui.rb:370
+#: src/include/nfs_server/ui.rb:342
 msgid "&Start"
 msgstr "&Start"
 
 #. radio button label
-#: src/include/nfs_server/ui.rb:379
+#: src/include/nfs_server/ui.rb:351
 msgid "Do &Not Start"
 msgstr "&Ikke start"
 
 #. frame label
-#: src/include/nfs_server/ui.rb:397
+#: src/include/nfs_server/ui.rb:369
 msgid "Enable NFSv4"
 msgstr "Aktiver NFSv4"
 
-#: src/include/nfs_server/ui.rb:404
+#: src/include/nfs_server/ui.rb:376
 msgid "Enable NFS&v4"
 msgstr "Aktiver NFS&v4"
 
-#: src/include/nfs_server/ui.rb:409
+#: src/include/nfs_server/ui.rb:381
 msgid "Enter NFSv4 do&main name:"
 msgstr "Fyll inn NFSv4-do&menenavn:"
 
-#: src/include/nfs_server/ui.rb:419
+#: src/include/nfs_server/ui.rb:391
 msgid "Enable &GSS Security"
 msgstr "Aktiver &GSS-sikkerhet"
 
 #. dialog title
-#: src/include/nfs_server/ui.rb:439
+#: src/include/nfs_server/ui.rb:411
 msgid "NFS Server Configuration"
 msgstr "Konfigurasjon av NFS-server"
 
 #. Help, part 1 of 4
-#: src/include/nfs_server/ui.rb:515
+#: src/include/nfs_server/ui.rb:487
 msgid ""
 "<P>The upper box contains all the directories to export.\n"
 "If a directory is selected, the lower box shows the hosts allowed to\n"
@@ -338,7 +327,7 @@
 "å montere denne katalogen.</P>\n"
 
 #. Help, part 2 of 4
-#: src/include/nfs_server/ui.rb:524
+#: src/include/nfs_server/ui.rb:495
 msgid ""
 "<P><b>Host Wild Card</b> sets which hosts can access the selected directory.\n"
 "It can be a single host, groups, wild cards, or\n"
@@ -348,68 +337,63 @@
 "Det kan være enkle vertsmaskiner, grupper, jokertegn eller\n"
 "IP-nettverk.</P>\n"
 
-#. Help, part 3 of 4, variant for kernel space server
-#: src/include/nfs_server/ui.rb:536
+#. Help, part 3 of 4
+#: src/include/nfs_server/ui.rb:503
 msgid "<p>Enter an asterisk (<tt>*</tt>) instead of a name to specify all hosts.</p>"
 msgstr "<p>Bruk en stjerne (<tt>*</tt>) i stedet for et navn for å velge alle vertsmaskiner.</p>"
 
-#. Help, part 3 of 4, variant for user space server
-#: src/include/nfs_server/ui.rb:544
-msgid "<p>Leave the field empty to specify all hosts.</p>"
-msgstr "<p>La feltet være tomt for å velge alle vertsmaskiner.</p>"
-
 #. Help, part 4 of 4
-#: src/include/nfs_server/ui.rb:551
+#: src/include/nfs_server/ui.rb:509
 msgid "<P>Refer to <tt>man exports</tt> for more information.</P>\n"
 msgstr "<P>Skriv <tt>man exports</tt> i en terminal for å lese mer informasjon.</P>\n"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:567
+#: src/include/nfs_server/ui.rb:524
 msgid "Add &Directory"
 msgstr "Legg til &katalog"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:569
+#: src/include/nfs_server/ui.rb:526
 msgid "&Edit"
 msgstr "&Rediger"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:571
+#: src/include/nfs_server/ui.rb:528
 msgid "De&lete"
 msgstr "&Slett"
 
 #. table header
-#: src/include/nfs_server/ui.rb:584
+#: src/include/nfs_server/ui.rb:541
 msgid "Host Wild Card"
 msgstr "Jokertegn for vertsmaskin"
 
 #. table header
-#: src/include/nfs_server/ui.rb:586
+#: src/include/nfs_server/ui.rb:543
 msgid "Options"
 msgstr "Alternativer"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:597
+#: src/include/nfs_server/ui.rb:554
 msgid "Add &Host"
 msgstr "Legg til &vertsmaskin"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:599
+#: src/include/nfs_server/ui.rb:556
 msgid "Ed&it"
 msgstr "&Rediger"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:601
+#: src/include/nfs_server/ui.rb:558
 msgid "Dele&te"
 msgstr "S&lett"
 
 #. dialog title
-#: src/include/nfs_server/ui.rb:608
+#: src/include/nfs_server/ui.rb:565
 msgid "Directories to Export"
 msgstr "Kataloger som skal eksporteres"
 
 #. not fatal - write other dirs.
-#: src/modules/NfsServer.rb:182
+#: src/modules/NfsServer.rb:158
 msgid ""
 "Unable to create a missing directory:\n"
 "%1"
@@ -418,7 +402,7 @@
 "%1"
 
 #. error popup message
-#: src/modules/NfsServer.rb:194
+#: src/modules/NfsServer.rb:170
 msgid ""
 "Unable to write to /etc/exports.\n"
 "No changes will be made to the\n"
@@ -429,74 +413,62 @@
 "eksporterte katalogene.\n"
 
 #. dialog label
-#: src/modules/NfsServer.rb:216
+#: src/modules/NfsServer.rb:192
 msgid "Writing NFS Server Configuration"
 msgstr "Lagrer konfigurasjon for NFS-server"
 
 #. progress stage label
-#: src/modules/NfsServer.rb:221
+#: src/modules/NfsServer.rb:197
 msgid "Save /etc/exports"
 msgstr "Lagre /etc/exports"
 
 #. progress stage label
-#: src/modules/NfsServer.rb:223
+#: src/modules/NfsServer.rb:199
 msgid "Restart services"
 msgstr "Start tjenester på nytt"
 
 #. progress step label
-#: src/modules/NfsServer.rb:227
+#: src/modules/NfsServer.rb:203
 msgid "Saving /etc/exports..."
 msgstr "Lagrer /etc/exports..."
 
 #. progress step label
-#: src/modules/NfsServer.rb:229
+#: src/modules/NfsServer.rb:205
 msgid "Restarting services..."
 msgstr "Starter tjenester på nytt..."
 
 #. final progress step label
-#: src/modules/NfsServer.rb:231
+#: src/modules/NfsServer.rb:207
 msgid "Finished"
 msgstr "Fullført"
 
 #. help text
-#: src/modules/NfsServer.rb:239
+#: src/modules/NfsServer.rb:215
 msgid "Writing NFS server settings. Please wait..."
 msgstr "Lagrer innstillinger for NFS-server. Vent..."
 
 #. Independent of @ref start because of Heartbeat (#27001).
-#: src/modules/NfsServer.rb:253
+#: src/modules/NfsServer.rb:229
 msgid "Unable to write to idmapd.conf."
 msgstr "Kan ikke skrive til idmapd.conf."
 
-#: src/modules/NfsServer.rb:302
-msgid "Unable to start idmapd. Check your domain setting."
-msgstr "Feil ved start av idmapd. Sjekk domeneinstillingen."
-
-#: src/modules/NfsServer.rb:308
-msgid "Unable to restart idmapd."
-msgstr "Kan ikke starte idmapd på nytt."
-
-#: src/modules/NfsServer.rb:315
-msgid "Unable to stop idmapd."
-msgstr "Kan ikke stoppe idmapd."
-
 #. FIXME svcgssd is gone! (only nfsserver is left)
-#: src/modules/NfsServer.rb:326
+#: src/modules/NfsServer.rb:266
 msgid "Unable to start svcgssd. Ensure your kerberos and gssapi (nfs-utils) setup is correct."
 msgstr "Kan ikke starte svcgssd. Kontroller at kerberos og gssapi (nfs-utils) er riktig satt opp."
 
-#: src/modules/NfsServer.rb:335
+#: src/modules/NfsServer.rb:275
 #, fuzzy
 #| msgid "Unable to restart idmapd."
 msgid "Unable to restart 'svcgssd' service."
 msgstr "Kan ikke starte idmapd på nytt."
 
-#: src/modules/NfsServer.rb:343
+#: src/modules/NfsServer.rb:283
 msgid "'svcgssd' is running. Unable to stop it."
 msgstr "'svcgssd' kjører allerede. Feil ved stop."
 
 #. error popup message
-#: src/modules/NfsServer.rb:361
+#: src/modules/NfsServer.rb:299
 msgid ""
 "Unable to restart the NFS server.\n"
 "Your changes will be active after reboot.\n"
@@ -505,15 +477,36 @@
 "Endringene vil bli aktivert etter omstart av maskinen.\n"
 
 #. summary header; directories exported by NFS
-#: src/modules/NfsServer.rb:384
+#: src/modules/NfsServer.rb:322
 msgid "NFS Exports"
 msgstr "NFS-eksporter"
 
 #. add information reg NFSv4 support, domain and security
-#: src/modules/NfsServer.rb:402
+#: src/modules/NfsServer.rb:340
 msgid "The NFSv4 domain for idmapping is %1."
 msgstr "NFSv4-domene for idmapping er %1."
 
+#~ msgid ""
+#~ "The user mode NFS server (%1) cannot export directories\n"
+#~ "with spaces in their names.\n"
+#~ "Use the kernel-based server (%2) to do that."
+#~ msgstr ""
+#~ "Brukermodus-NFS-serveren (%1) kan ikke eksportere kataloger\n"
+#~ "med mellomrom i navnet.\n"
+#~ "Bruk den kjernebaserte serveren (%2) for å gjøre dette."
+
+#~ msgid "<p>Leave the field empty to specify all hosts.</p>"
+#~ msgstr "<p>La feltet være tomt for å velge alle vertsmaskiner.</p>"
+
+#~ msgid "Unable to start idmapd. Check your domain setting."
+#~ msgstr "Feil ved start av idmapd. Sjekk domeneinstillingen."
+
+#~ msgid "Unable to restart idmapd."
+#~ msgstr "Kan ikke starte idmapd på nytt."
+
+#~ msgid "Unable to stop idmapd."
+#~ msgstr "Kan ikke stoppe idmapd."
+
 #~ msgid "'svcgssd' is already running. Unable to restart it."
 #~ msgstr "'svcgssd' kjører allerede. Feil ved omstart."
 

Modified: trunk/yast/nb/po/nis.nb.po
===================================================================
--- trunk/yast/nb/po/nis.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/nis.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: nis\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:56+0100\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2008-09-25 07:30+0200\n"
 "Last-Translator: Olav P. <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <>\n"

Modified: trunk/yast/nb/po/nis_server.nb.po
===================================================================
--- trunk/yast/nb/po/nis_server.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/nis_server.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: nis_server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:40+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2009-08-12 12:55+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -279,7 +279,7 @@
 
 #. To translators: checkbox label
 #. checkbox label
-#: src/include/nis_server/master.rb:150 src/include/nis_server/slave.rb:100
+#: src/include/nis_server/master.rb:150 src/include/nis_server/slave.rb:98
 msgid "This host is also a NIS &client"
 msgstr "Denne vertsmaskinen er også en NIS-&klient"
 
@@ -412,22 +412,31 @@
 msgstr "Oppsett av  vertsmaskinkommunikasjon for NIS-server"
 
 #. help text 1/2
-#: src/include/nis_server/slave.rb:64
+#: src/include/nis_server/slave.rb:62
 msgid "<p>Enter the NIS <b>domain</b> and the IP <b>address</b> or host name of the master NIS server.</p>"
 msgstr "<p>Angi NIS-<b>domene</b> og IP-<b>adresse</b> eller vertsmaskinnavn for NIS-hovedserveren.</p>"
 
 #. help text 2/2
-#: src/include/nis_server/slave.rb:71
+#: src/include/nis_server/slave.rb:69
 msgid "<p>If this host is also a NIS client using this machine as a server, check the corresponding option.</p>"
 msgstr "<p>Kryss av her dersom vertsmaskinen også er en NIS-klient som bruker denne maskinen som server.</p>"
 
 #. textentry label
-#: src/include/nis_server/slave.rb:84
-msgid "N&IS domain name:"
-msgstr "N&IS-domenenavn:"
+#: src/include/nis_server/slave.rb:82
+#, fuzzy
+#| msgid "NIS &Domain Name"
+msgid "N&IS Domain Name:"
+msgstr "NIS-&domenenavn"
 
+#. text entry label
+#: src/include/nis_server/slave.rb:90
+#, fuzzy
+#| msgid "NIS Master Server: "
+msgid "NIS &Master Server:"
+msgstr "NIS-hovedserver: "
+
 #. To translators: dialog label
-#: src/include/nis_server/slave.rb:111
+#: src/include/nis_server/slave.rb:109
 msgid "Slave Server Setup"
 msgstr "Slaveserveroppsett"
 
@@ -898,6 +907,9 @@
 msgid "Stopping NIS client."
 msgstr "Deaktiverer NIS-klient."
 
+#~ msgid "N&IS domain name:"
+#~ msgstr "N&IS-domenenavn:"
+
 #~ msgid "NIS &master server:"
 #~ msgstr "NIS-&hovedserver:"
 

Modified: trunk/yast/nb/po/ntp-client.nb.po
===================================================================
--- trunk/yast/nb/po/ntp-client.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/ntp-client.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: ntp-client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-09-03 16:51+0200\n"
 "PO-Revision-Date: 2009-08-12 12:57+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -54,21 +54,20 @@
 msgstr "Vertsnavnet %1 for NTP-serveren er ugyldig"
 
 #. combo box label
-#: src/clients/ntp-client_proposal.rb:239
+#: src/clients/ntp-client_proposal.rb:240
 msgid "&NTP Server Address"
 msgstr "&NTP-serveradresse"
 
 #. check box label
-#: src/clients/ntp-client_proposal.rb:249
+#: src/clients/ntp-client_proposal.rb:250
 msgid "&Run NTP as daemon"
 msgstr "Kjø&r NTP som nisse"
 
 #. check box label
-#: src/clients/ntp-client_proposal.rb:258
+#: src/clients/ntp-client_proposal.rb:259
 msgid "&Save NTP Configuration"
 msgstr "Lagre NTP-opp&sett"
 
-#. try to line up the widgets horizontally
 #. push button label
 #: src/clients/ntp-client_proposal.rb:269
 msgid "S&ynchronize now"
@@ -81,7 +80,7 @@
 msgstr "&Konfigurer..."
 
 #. Otherwise, prompt user for confirming pkg installation
-#: src/clients/ntp-client_proposal.rb:388
+#: src/clients/ntp-client_proposal.rb:386
 msgid ""
 "Synchronization with NTP server is not possible\n"
 "without package %1 installed."
@@ -90,14 +89,26 @@
 "uten at pakken %1 er installert."
 
 #. Only if network is running try to synchronize the ntp server
-#: src/clients/ntp-client_proposal.rb:399
+#: src/clients/ntp-client_proposal.rb:398
 msgid "Synchronizing with NTP server..."
 msgstr "Synkroniserer med NTP-server..."
 
+#. update time widgets
+#: src/clients/ntp-client_proposal.rb:443
+#, fuzzy
+#| msgid "Connection to the LDAP server cannot be established."
+msgid "Connection to selected NTP server failed."
+msgstr "Kan ikke opprette tilkobling til til LDAP-serveren."
+
 #. Translators: yes-no popup,
 #. ntpdate is a command, %1 is the server address
-#: src/clients/ntp-client_proposal.rb:481
-msgid "'Test query to server '%1' failed. If server is not yet accessible or network is not configured click 'No' to ignore. Revisit NTP server configuration?"
+#: src/clients/ntp-client_proposal.rb:474
+#, 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 ""
+"Test query to server '%1' failed.\n"
+"If server is not yet accessible or network is not configured\n"
+"click 'No' to ignore. Revisit NTP server configuration?"
 msgstr "Testforespørsel til serveren '%1' mislyktes. Hvis serveren ikke er tilgjengelig ennå eller nettverket ikke er satt opp, velg «Nei» for å ignorere. Vil du gå tilbake til NTP-serveroppsettet?"
 
 #. local clock type name
@@ -603,11 +614,20 @@
 
 #. help text 1/5
 #: src/include/ntp-client/helps.rb:35
+#, fuzzy
+#| 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"
 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."
 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"
@@ -615,7 +635,7 @@
 "Nettverksforbindelsen må aktiveres før NTP-nissen starter.</p>\n"
 
 #. help text 2/5
-#: src/include/ntp-client/helps.rb:42
+#: src/include/ntp-client/helps.rb:45
 msgid ""
 "<p><b><big>Chroot Jail</big></b><br>\n"
 "To run the NTP daemon in chroot jail, set\n"
@@ -627,7 +647,7 @@
 "<b>Kjør NTP-nisse i chroot-varetekt</b>. Det øker sikkerheten å starte alle nisser i chroot-varetekt,\n"
 "og dette anbefales sterkt.</p>"
 
-#: src/include/ntp-client/helps.rb:48
+#: src/include/ntp-client/helps.rb:51
 msgid ""
 "<p><b><big>Secure NTP Configuration</big></b><br>\n"
 "By selecting <b>Restrict NTP Service to Configured Servers Only</b>, remote hosts will not be able to view and modify NTP settings on your \n"
@@ -640,7 +660,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:55
+#: src/include/ntp-client/helps.rb:58
 msgid ""
 "<p><b><big>Configuring via DHCP</big></b><br>\n"
 "To retrieve the information about NTP servers via the DHCP protocol from\n"
@@ -655,7 +675,7 @@
 "informasjon om NTP-servere er tilgjengelig via DHCP-serveren.</p>"
 
 #. help text 4/5
-#: src/include/ntp-client/helps.rb:63
+#: src/include/ntp-client/helps.rb:66
 msgid ""
 "<p><b><big>Configured Servers</big></b><br>\n"
 "To adjust NTP servers, peers, local clocks, and NTP broadcasting,\n"
@@ -670,7 +690,7 @@
 "og klikk <b>Slett</b> for å slette den.</p>"
 
 #. help text 5/5
-#: src/include/ntp-client/helps.rb:71
+#: src/include/ntp-client/helps.rb:74
 msgid ""
 "<p><b><big>Display Log</big></b></p>\n"
 "<p>To view the logs of the NTP daemon, click <b>Display Log</b>.</p>\n"
@@ -679,7 +699,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:75
+#: src/include/ntp-client/helps.rb:78
 msgid ""
 "<p><b><big>Advanced configuration</big></b><br>\n"
 "To configure this host to synchronize against multiple remote hosts or against\n"
@@ -690,7 +710,7 @@
 "en lokalt tilkoblet klokke, velg <b>Avansert konfigurasjon</b>."
 
 #. help text 1/4
-#: src/include/ntp-client/helps.rb:81
+#: src/include/ntp-client/helps.rb:84
 msgid ""
 "<p><b><big>Clock Type</big></b><br>\n"
 "Select the driver for the clock to configure.</p>"
@@ -699,7 +719,7 @@
 "Velg driveren for klokken som skal konfigureres.</p>"
 
 #. help text 2/4
-#: src/include/ntp-client/helps.rb:85
+#: src/include/ntp-client/helps.rb:88
 msgid ""
 "<p><b><big>Unit Number</big></b><br>\n"
 "If you have multiple clocks of the same type, you must set\n"
@@ -710,7 +730,7 @@
 "<b>Enhetsnummer</b>.</p>"
 
 #. help text 3/4
-#: src/include/ntp-client/helps.rb:91
+#: src/include/ntp-client/helps.rb:94
 msgid ""
 "<p><b><big>Device</big></b><br>\n"
 "To make the clock work, it may be necessary to create a special symbolic link to \n"
@@ -728,7 +748,7 @@
 "den må opprettes manuelt.</p>"
 
 #. help text 4/4
-#: src/include/ntp-client/helps.rb:101
+#: src/include/ntp-client/helps.rb:104
 msgid ""
 "<p><b><big>Driver Calibration</big></b><br>\n"
 "To calibrate the clock driver, click <b>Driver Calibration</b>.</p>"
@@ -737,7 +757,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:105
+#: src/include/ntp-client/helps.rb:108
 msgid ""
 "<p><b><big>Address of the NTP Server</big></b><br>\n"
 "To set the address of the NTP server, use the <b>Address</b> entry.\n"
@@ -750,7 +770,7 @@
 "nettverksadministratoren.</p>"
 
 #. help text 1/1, alt. 1 part 2/3
-#: src/include/ntp-client/helps.rb:112
+#: src/include/ntp-client/helps.rb:115
 msgid ""
 "<p><b><big>Selecting a Server</big></b><br>\n"
 "To select an NTP server from those found in the local network\n"
@@ -763,7 +783,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:119
+#: src/include/ntp-client/helps.rb:122
 msgid ""
 "<p><b><big>Testing Server Accessibility</big></b><br>\n"
 "To test if the selected server is up and responds properly,\n"
@@ -774,7 +794,7 @@
 "klikk <b>Test</b>.</p>"
 
 #. help text 1/1, alt. 2
-#: src/include/ntp-client/helps.rb:125
+#: src/include/ntp-client/helps.rb:128
 msgid ""
 "<p><b><big>Address</big></b><br>\n"
 "To set the address of the host with which to synchronize mutually,\n"
@@ -785,7 +805,7 @@
 "under <b>Adresse</b>.</p>"
 
 #. help text 1/1, alt. 3
-#: src/include/ntp-client/helps.rb:131
+#: src/include/ntp-client/helps.rb:134
 msgid ""
 "<p><b><big>Address</big></b><br>\n"
 "To set the address to which to broadcast, use the <b>Address</b>\n"
@@ -796,7 +816,7 @@
 "kringkastingsadressen.</p>"
 
 #. help text 1/1, alt. 4
-#: src/include/ntp-client/helps.rb:137
+#: src/include/ntp-client/helps.rb:140
 msgid ""
 "<p><b><big>Address</big></b><br>\n"
 "To set the address from which to accept broadcast packets, use \n"
@@ -808,7 +828,7 @@
 
 #. help text 2/4, was removed
 #. help text 3/4, optional
-#: src/include/ntp-client/helps.rb:145
+#: src/include/ntp-client/helps.rb:148
 msgid ""
 "<p><b><big>Options</big></b><br>\n"
 "To fine-tune the synchronization source, enter the respective options in the\n"
@@ -820,7 +840,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:151
+#: src/include/ntp-client/helps.rb:154
 msgid ""
 "<p><b><big>Access Control Options</big></b><br>\n"
 "Define the access control flags (<b><tt>restrict</tt></b> directive in\n"
@@ -839,7 +859,7 @@
 "<b>Sikkerhetsinnstillinger</b>.</p>\n"
 
 #. help text 1/6
-#: src/include/ntp-client/helps.rb:161
+#: src/include/ntp-client/helps.rb:164
 msgid ""
 "<p><b><big>Synchronization Peer Type</big></b><br>\n"
 "Select the kind of synchronization peer to add here.</p>"
@@ -848,7 +868,7 @@
 "Her velger du en direkte synkroniseringsforbindelse som skal legges til.</p>"
 
 #. help text 2/6
-#: src/include/ntp-client/helps.rb:165
+#: src/include/ntp-client/helps.rb:168
 msgid ""
 "<p>To add an NTP server to which to synchronize,\n"
 "select <b>Server</b>.</p>"
@@ -857,7 +877,7 @@
 "under <b>Server</b>.</p>"
 
 #. help text 3/6
-#: src/include/ntp-client/helps.rb:169
+#: src/include/ntp-client/helps.rb:172
 msgid ""
 "<p>To add an NTP peer to synchronize mutually, select\n"
 "<b>Peer</b>.</p>"
@@ -866,7 +886,7 @@
 "<b>Direkteforbindelse</b>.</p>"
 
 #. help text 4/6
-#: src/include/ntp-client/helps.rb:173
+#: src/include/ntp-client/helps.rb:176
 msgid ""
 "<p>To configure a local clock connected directly to your computer,\n"
 "select <b>Radio Clock</b>.</p>"
@@ -875,7 +895,7 @@
 "velger du <b>Radioklokke</b>.</p>"
 
 #. help text 5/6
-#: src/include/ntp-client/helps.rb:177
+#: src/include/ntp-client/helps.rb:180
 msgid ""
 "<p>To broadcast time information through your network, select\n"
 "<b>Outgoing Broadcast</b>.</p>"
@@ -884,7 +904,7 @@
 "<b>Utgående kringkasting</b>.</p>"
 
 #. help text 6/6
-#: src/include/ntp-client/helps.rb:181
+#: src/include/ntp-client/helps.rb:184
 msgid ""
 "<p>To accept NTP packets broadcasted by other hosts on the network\n"
 "and use them for setting local time, select <b>Incoming Broadcast<b>.</p>"
@@ -893,7 +913,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:185
+#: src/include/ntp-client/helps.rb:188
 msgid ""
 "<p><big><b>Server Location</b></big>\n"
 "Select if you want to find the NTP server in the local network or select\n"
@@ -904,7 +924,7 @@
 "velge den fra en liste over kjente NTP-servere.</p>"
 
 #. help text 2/5
-#: src/include/ntp-client/helps.rb:191
+#: src/include/ntp-client/helps.rb:194
 msgid ""
 "<p><big><b>Finding Server in the Local\n"
 "Network</b></big><br>\n"
@@ -919,7 +939,7 @@
 "Velg deretter en server i listen over servere som ble funnet.</p>"
 
 #. help text 3/5
-#: src/include/ntp-client/helps.rb:199
+#: src/include/ntp-client/helps.rb:202
 msgid ""
 "<p><big><b>Selecting a Public NTP Server</b></big><br>\n"
 "Select the NTP server to use from the <b>Public NTP Servers</b> list. To display\n"
@@ -930,7 +950,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:205
+#: src/include/ntp-client/helps.rb:208
 msgid ""
 "<p><big><b>Note</b></big><br>\n"
 "The listed NTP servers may not be available from any country, but only\n"
@@ -951,7 +971,7 @@
 "for å finne en NTP-server i nærheten.</p>"
 
 #. help text 5/5
-#: src/include/ntp-client/helps.rb:216
+#: src/include/ntp-client/helps.rb:219
 msgid ""
 "<p><big><b>Testing Server Accessibility</b></big><br>\n"
 "To test if the selected server responds properly, click <b>Test</b>.</p>"
@@ -961,7 +981,7 @@
 
 #. help text connected with checkbox: "Use Random Server from pool.ntp.org"
 #. rwalter, please, correct it ;)
-#: src/include/ntp-client/helps.rb:221
+#: src/include/ntp-client/helps.rb:224
 msgid ""
 "<p><big><b>Use Random Servers</b></big><br>\n"
 "This service is offered by pool.ntp.org. If you select this option,\n"
@@ -976,7 +996,7 @@
 "NTP-klienten synkroniseres med ulike servere hver time.</p>\n"
 
 #. help text 1/2
-#: src/include/ntp-client/helps.rb:235
+#: src/include/ntp-client/helps.rb:238
 msgid ""
 "<p><big><b>Clock Driver Calibration</b></big><br>\n"
 "The clock driver may need to be calibrated. In this dialog, various calibration\n"
@@ -989,7 +1009,7 @@
 "driveren. Noen drivere benytter ikke alle alternativene.</p>"
 
 #. help text 2/2
-#: src/include/ntp-client/helps.rb:242
+#: src/include/ntp-client/helps.rb:245
 msgid ""
 "To learn more about available options, install the package\n"
 "<i>ntp-doc</i> and see <i>/usr/share/doc/packages/ntp-doc/html/refclock.htm</i>.</p>\n"
@@ -1341,117 +1361,120 @@
 msgstr "Leser NTP-innstillinger..."
 
 #. progress step
-#. error report
+#. While calling "yast clone_system" it is possible that
+#. the ntp server has not already been installed at that time.
+#. (This would be done if yast2-ntp-client will be called in the UI)
+#. In that case the error popup will not be shown. (bnc#889557)
 #. progress step
-#: src/modules/NtpClient.rb:502 src/modules/NtpClient.rb:594
-#: src/modules/NtpClient.rb:755 src/modules/NtpClient.rb:906
+#: src/modules/NtpClient.rb:502 src/modules/NtpClient.rb:597
+#: src/modules/NtpClient.rb:758 src/modules/NtpClient.rb:909
 msgid "Finished"
 msgstr "Fullført"
 
 #. boolean update_dhcp = original_config_dhcp != config_dhcp;
 #. NtpClient read dialog caption
-#: src/modules/NtpClient.rb:728
+#: src/modules/NtpClient.rb:731
 msgid "Saving NTP Client Configuration"
 msgstr "Lagrer konfigurasjon for NTP-klient"
 
 #. progress stage
-#: src/modules/NtpClient.rb:745
+#: src/modules/NtpClient.rb:748
 msgid "Write NTP settings"
 msgstr "Lagre NTP-innstillinger"
 
 #. progress stage
-#: src/modules/NtpClient.rb:747
+#: src/modules/NtpClient.rb:750
 msgid "Restart NTP daemon"
 msgstr "Start NTP-nissen på nytt"
 
 #. progress step
-#: src/modules/NtpClient.rb:751
+#: src/modules/NtpClient.rb:754
 msgid "Writing the settings..."
 msgstr "Lagrer innstillingene..."
 
 #. progress step
-#: src/modules/NtpClient.rb:753
+#: src/modules/NtpClient.rb:756
 msgid "Restarting NTP daemon..."
 msgstr "Starter NTP-nissen på nytt..."
 
 #. error message
-#: src/modules/NtpClient.rb:838
+#: src/modules/NtpClient.rb:841
 msgid "Cannot update the dynamic configuration policy."
 msgstr "Kan ikke oppdatere dynamisk oppsett."
 
 #. error report
-#: src/modules/NtpClient.rb:876
+#: src/modules/NtpClient.rb:879
 msgid "Cannot restart the NTP daemon."
 msgstr "Kan ikke starte NTP-nissen på nytt."
 
 #. summary string
-#: src/modules/NtpClient.rb:970
+#: src/modules/NtpClient.rb:973
 msgid "The NTP daemon starts when starting the system."
 msgstr "NTP-nissen aktiveres når systemet starter opp."
 
 #. summary string
-#: src/modules/NtpClient.rb:976
+#: src/modules/NtpClient.rb:979
 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:982
+#: src/modules/NtpClient.rb:985
 msgid "Servers: %1"
 msgstr "Servere: %1"
 
 #. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:986
+#: src/modules/NtpClient.rb:989
 msgid "Radio Clocks: %1"
 msgstr "Radioklokker: %1"
 
 #. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:990
+#: src/modules/NtpClient.rb:993
 msgid "Peers: %1"
 msgstr "Direkteforbindelser: %1"
 
 #. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:994
+#: src/modules/NtpClient.rb:997
 msgid "Broadcast time information to: %1"
 msgstr "Kringkast tidsinformasjon til: %1"
 
 #. summary string, %1 is list of addresses
-#: src/modules/NtpClient.rb:998
+#: src/modules/NtpClient.rb:1001
 msgid "Accept broadcasted time information from: %1"
 msgstr "Godta kringkastet tidsinformasjon fra: %1"
 
 #. summary string, FIXME
-#: src/modules/NtpClient.rb:1014
+#: src/modules/NtpClient.rb:1017
 msgid "Combine static and DHCP configuration."
 msgstr "Kombiner statisk oppsett og DHCP-oppsett."
 
 #. summary string, FIXME
-#: src/modules/NtpClient.rb:1018
+#: src/modules/NtpClient.rb:1021
 msgid "Static configuration only."
 msgstr "Kun statisk oppsett."
 
 #. summary string, FIXME
-#: src/modules/NtpClient.rb:1021
+#: src/modules/NtpClient.rb:1024
 msgid "Custom configuration policy."
 msgstr "Egendefinert oppsett."
 
 #. An informative popup label diring the NTP server testings
-#: src/modules/NtpClient.rb:1054
+#: src/modules/NtpClient.rb:1057
 msgid "Testing the NTP server..."
 msgstr "Kontrollerer NTP-server..."
 
 #. message report - result of test of connection to NTP server
-#: src/modules/NtpClient.rb:1084
+#: src/modules/NtpClient.rb:1087
 msgid "Server is reachable and responds properly."
 msgstr "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:1088
+#: src/modules/NtpClient.rb:1091
 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:1106
+#: src/modules/NtpClient.rb:1109
 msgid ""
 "Cannot search for NTP server in local network\n"
 "without package %1 installed.\n"

Modified: trunk/yast/nb/po/oneclickinstall.nb.po
===================================================================
--- trunk/yast/nb/po/oneclickinstall.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/oneclickinstall.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2002-06-17 14:33+0200\n"
 "Last-Translator: www.linuxbutikken.no <roy@bytek.no>\n"
 "Language-Team: Norwegian <i18n@suse.de>\n"

Modified: trunk/yast/nb/po/online-update-configuration.nb.po
===================================================================
--- trunk/yast/nb/po/online-update-configuration.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/online-update-configuration.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:56+0100\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2002-06-17 14:33+0200\n"
 "Last-Translator: www.linuxbutikken.no <roy@bytek.no>\n"
 "Language-Team: Norwegian <i18n@suse.de>\n"

Modified: trunk/yast/nb/po/online-update.nb.po
===================================================================
--- trunk/yast/nb/po/online-update.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/online-update.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: online-update\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2009-10-01 12:35+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -119,8 +119,8 @@
 msgid "Initializing Online Update"
 msgstr "Initialiserer online-oppdatering"
 
-#. yes/no message
-#: src/clients/online_update.rb:204
+#. yes/no question
+#: src/clients/online_update.rb:209
 msgid ""
 "No update repository\n"
 "configured yet. Run configuration workflow now?"
@@ -128,6 +128,13 @@
 "Ingen oppdateringspakkebrønner\n"
 "er satt opp. Vil du sette opp pakkebrønner nå?"
 
+#. error message
+#: src/clients/online_update.rb:222
+#, fuzzy
+#| msgid "Not configured yet."
+msgid "No update repository configured yet."
+msgstr "Ikke konfigurert ennå."
+
 #. progress window label
 #: src/clients/online_update_install.rb:49
 msgid "Progress Log"

Added: trunk/yast/nb/po/opensuse_mirror.nb.po
===================================================================
--- trunk/yast/nb/po/opensuse_mirror.nb.po	                        (rev 0)
+++ trunk/yast/nb/po/opensuse_mirror.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -0,0 +1,71 @@
+# Norwegian message file for YaST2 (@memory@).
+# Copyright (C) 2005 SUSE Linux Products GmbH.
+# Copyright (C) 2002 SuSE Linux AG.
+# Copyright (C) 2002 SuSE GmbH.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: YaST (@memory@)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
+"PO-Revision-Date: 2002-06-17 14:33+0200\n"
+"Last-Translator: www.linuxbutikken.no <roy@bytek.no>\n"
+"Language-Team: Norwegian <i18n@suse.de>\n"
+"Language: no\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Copyright (c) 2014 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 of the GNU General
+#. Public License as published by the Free Software Foundation.
+#. This program is distributed in the hope that it will be useful,
+#. but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.   See the
+#. GNU General Public License for more details.
+#. You should have received a copy of the GNU General Public License
+#. along with this program; if not, contact SUSE LLC.
+#. To contact Novell about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/opensuse_mirror/main_dialog.rb:119
+msgid "Directory"
+msgstr "Katalog"
+
+#: src/lib/opensuse_mirror/main_dialog.rb:119
+#, fuzzy
+#| msgid "Error"
+msgid "Mirrored"
+msgstr "Feil"
+
+#: src/lib/opensuse_mirror/main_dialog.rb:129
+msgid "yes"
+msgstr "ja"
+
+#: src/lib/opensuse_mirror/main_dialog.rb:129
+msgid "no"
+msgstr "nei"
+
+#: src/lib/opensuse_mirror/main_dialog.rb:139
+#, fuzzy
+#| msgid "Exit"
+msgid "&Exit"
+msgstr "Avslutt"
+
+#: src/lib/opensuse_mirror/main_dialog.rb:144
+#, fuzzy
+#| msgid "Error"
+msgid "&Mirror"
+msgstr "Feil"
+
+#: src/lib/opensuse_mirror/main_dialog.rb:145
+msgid "&Do not Mirror"
+msgstr ""
+
+#: src/lib/opensuse_mirror/main_dialog.rb:146
+#, fuzzy
+#| msgid "Select or Deselect &All"
+msgid "Select/Deselect &All"
+msgstr "Velg eller velg bort &alle"

Modified: trunk/yast/nb/po/packager.nb.po
===================================================================
--- trunk/yast/nb/po/packager.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/packager.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: packager.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-08-15 15:57+0200\n"
 "PO-Revision-Date: 2009-10-01 12:36+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -172,6 +172,15 @@
 msgid "&Text Mode"
 msgstr "&Tekstmodus"
 
+#. an error popup
+#. an error popup
+#. an error popup
+#. an error popup
+#: src/clients/inst_kickoff.rb:490 src/clients/inst_kickoff.rb:573
+#: src/clients/inst_kickoff.rb:649 src/clients/inst_kickoff.rb:706
+msgid "Backup of %1 failed. See %2 for details."
+msgstr "Sikkerhetskopiering av %1 mislyktes. Se %2 for for mer informasjon."
+
 #. dialog heading
 #: src/clients/inst_mediacopy.rb:49
 msgid "Copy Installation Media"
@@ -518,7 +527,7 @@
 #. dialog caption
 #. dialog caption
 #: src/clients/key_manager.rb:70 src/clients/repositories.rb:1809
-#: src/modules/AddOnProduct.rb:668
+#: src/modules/AddOnProduct.rb:683
 msgid "Initializing..."
 msgstr "Initialiserer ..."
 
@@ -581,7 +590,7 @@
 
 #. label to be used instead of URL if not found
 #: src/clients/repositories.rb:328 src/clients/repositories.rb:361
-#: src/modules/AddOnProduct.rb:1308
+#: src/modules/AddOnProduct.rb:1325
 msgid "URL: %1"
 msgstr "Nettadresse: %1"
 
@@ -832,7 +841,7 @@
 
 #. popup message part 2 followed by other info
 #. popup message, after message header, header of details
-#: src/clients/repositories.rb:1011 src/modules/Packages.rb:1200
+#: src/clients/repositories.rb:1011 src/modules/Packages.rb:1326
 #: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310
 msgid "Details:"
 msgstr "Detaljer:"
@@ -840,7 +849,7 @@
 #. popup message part 3
 #. end of popup message, question
 #. end of popup message, question
-#: src/clients/repositories.rb:1013 src/modules/Packages.rb:1208
+#: src/clients/repositories.rb:1013 src/modules/Packages.rb:1334
 #: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312
 msgid "Try again?"
 msgstr "Vil du prøve igjen?"
@@ -1207,7 +1216,7 @@
 msgid "&Start Check"
 msgstr "&Start kontroll"
 
-#: src/include/checkmedia/ui.rb:361 src/modules/SourceManager.rb:694
+#: src/include/checkmedia/ui.rb:361 src/modules/SourceManager.rb:684
 msgid "&Eject"
 msgstr "&Løs ut"
 
@@ -1460,7 +1469,7 @@
 #. popup message part 1
 #. Import GPG keys found in the inst-sys
 #: src/include/packager/repositories_include.rb:319
-#: src/modules/Packages.rb:1195 src/modules/SourceManager.rb:306
+#: src/modules/Packages.rb:1321 src/modules/SourceManager.rb:306
 msgid ""
 "Unable to create repository\n"
 "from URL '%1'."
@@ -1498,38 +1507,38 @@
 #. error report
 #. popup error
 #. popup error
-#: src/modules/AddOnProduct.rb:502 src/modules/AddOnProduct.rb:604
-#: src/modules/ProductLicense.rb:582 src/modules/ProductLicense.rb:773
+#: src/modules/AddOnProduct.rb:517 src/modules/AddOnProduct.rb:619
+#: src/modules/ProductLicense.rb:538 src/modules/ProductLicense.rb:729
 msgid "An error occurred while preparing the installation system."
 msgstr "Det oppstod en feil under klargjøring av installasjonssystemet."
 
 #. error report
-#: src/modules/AddOnProduct.rb:639
+#: src/modules/AddOnProduct.rb:654
 msgid "Control file %1 not found on media."
 msgstr "Kontrollfilen %1 ble ikke funnet på mediet."
 
 #. TRANSLATORS: error report
 #. TRANSLATORS: error report
-#: src/modules/AddOnProduct.rb:1235 src/modules/AddOnProduct.rb:1399
+#: src/modules/AddOnProduct.rb:1252 src/modules/AddOnProduct.rb:1416
 msgid "Unable to use additional products."
 msgstr "Kan ikke bruke tilleggsprodukter."
 
 #. fill up internal map (used later when item selected)
-#: src/modules/AddOnProduct.rb:1286 src/modules/AddOnProduct.rb:1292
+#: src/modules/AddOnProduct.rb:1303 src/modules/AddOnProduct.rb:1309
 msgid "%1, URL: %2"
 msgstr "%1, adresse: %2"
 
-#: src/modules/AddOnProduct.rb:1302
+#: src/modules/AddOnProduct.rb:1319
 msgid "URL: %1, Path: %2"
 msgstr "Adresse: %1, Sti: %2"
 
 #. TRANSLATORS: popup heading
-#: src/modules/AddOnProduct.rb:1333
+#: src/modules/AddOnProduct.rb:1350
 msgid "Additional Products"
 msgstr "Tilleggsprodukter"
 
 #. TRANSLATORS: additional dialog information
-#: src/modules/AddOnProduct.rb:1339
+#: src/modules/AddOnProduct.rb:1356
 msgid ""
 "The installation repository also contains the listed additional repositories.\n"
 "Select the ones you want to use.\n"
@@ -1537,34 +1546,34 @@
 "Installasjsonspakkebrønnen inneholder også de angitte tilleggspakkebrønnene.\n"
 "Velg dem du vil bruke.\n"
 
-#: src/modules/AddOnProduct.rb:1350
+#: src/modules/AddOnProduct.rb:1367
 msgid "Additional Products to Select"
 msgstr "Tilleggsprodukter som kan velges"
 
 #. push button label
-#: src/modules/AddOnProduct.rb:1357
+#: src/modules/AddOnProduct.rb:1374
 msgid "Add Selected &Products"
 msgstr "Legg til valgte &produkter"
 
 #. %1 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1488
+#: src/modules/AddOnProduct.rb:1505
 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:1493
+#: src/modules/AddOnProduct.rb:1510
 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:1545
+#: src/modules/AddOnProduct.rb:1562
 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:1737 src/modules/AddOnProduct.rb:1743
-#: src/modules/Packages.rb:459
+#: src/modules/AddOnProduct.rb:1754 src/modules/AddOnProduct.rb:1760
+#: src/modules/Packages.rb:463
 msgid "Unknown Product"
 msgstr "Ukjent produkt"
 
@@ -1614,7 +1623,7 @@
 msgstr "Installasjon avbrutt av bruker."
 
 #. the string is follwed by a media number, e.g. "Medium 1"
-#: src/modules/PackageSlideShow.rb:35
+#: src/modules/PackageSlideShow.rb:50
 msgid "Medium %1"
 msgstr "Medium %1"
 
@@ -1622,13 +1631,13 @@
 #. When data throughput goes downhill (stalled network connection etc.),
 #. cut off the predicted time at a reasonable maximum.
 #. "%1" is a predefined maximum time.
-#: src/modules/PackageSlideShow.rb:237
+#: src/modules/PackageSlideShow.rb:204
 msgid ">%1"
 msgstr ">%1"
 
 #. Nothing more to install from this CD (very concise - little space!!)
 #. Nothing more to install from this CD (very concise - little space!!)
-#: src/modules/PackageSlideShow.rb:255 src/modules/PackageSlideShow.rb:270
+#: src/modules/PackageSlideShow.rb:222 src/modules/PackageSlideShow.rb:237
 msgid "Done."
 msgstr "Fullført."
 
@@ -1636,21 +1645,21 @@
 #. %1: Media type ("CD" / "DVD", ???)
 #. %2: Media name ("SuSE Linux Professional CD 2" )
 #. %3: Time remaining until this media will be needed
-#: src/modules/PackageSlideShow.rb:295
+#: src/modules/PackageSlideShow.rb:262
 msgid "Next: %1 -- %2"
 msgstr "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:312
+#: src/modules/PackageSlideShow.rb:279
 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:1042
+#: src/modules/PackageSlideShow.rb:924
 msgid "Total"
 msgstr "Totalt"
 
@@ -1659,62 +1668,62 @@
 #.
 #. message in the installatino log, %1 is package name,
 #. %2 is package size
-#: src/modules/PackageSlideShow.rb:1168 src/modules/PackageSlideShow.rb:1421
-#: src/modules/PackageSlideShow.rb:1473
+#: src/modules/PackageSlideShow.rb:1051 src/modules/PackageSlideShow.rb:1303
+#: src/modules/PackageSlideShow.rb:1355
 msgid "Downloading %1 (download size %2)"
 msgstr "Laster ned %1 (nedlastingsstørrelse %2)"
 
-#: src/modules/PackageSlideShow.rb:1198
+#: src/modules/PackageSlideShow.rb:1081
 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:1231
+#: src/modules/PackageSlideShow.rb:1114
 msgid "Downloading Packages..."
 msgstr "Laster ned pakker..."
 
 #. progress message (part2)
-#: src/modules/PackageSlideShow.rb:1234
+#: src/modules/PackageSlideShow.rb:1117
 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:1371
+#: src/modules/PackageSlideShow.rb:1253
 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:1378
+#: src/modules/PackageSlideShow.rb:1260
 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:1456
+#: src/modules/PackageSlideShow.rb:1338
 msgid "Applying delta RPM: %1"
 msgstr "Bruker delta-RPM: %1"
 
 #. warning text
-#: src/modules/Packages.rb:299
+#: src/modules/Packages.rb:303
 msgid "Your computer is a 64-bit x86-64 system, but you are trying to install a 32-bit distribution."
 msgstr "Datamaskinen er et 64-bit x86-64-system, men du forsøker å installere en 32-bit-distribusjon."
 
 #. help text for software proposal
-#: src/modules/Packages.rb:315
+#: src/modules/Packages.rb:319
 msgid "<P>The pattern list states which functionality will be available after installing the system.</P>"
 msgstr "<P>Mønsterlisten viser hvilke funksjoner som vil være tilgjengelige etter at systemet er installert.</P>"
 
 #. (see bnc#178357 why these numbers)
 #. translators: help text for software proposal
-#: src/modules/Packages.rb:327
+#: src/modules/Packages.rb:331
 msgid "<P>The proposal reports the total size of files which will be installed to the system. However, the system will contain some other files (temporary and working files) so the used space will be slightly larger than the proposed value. Therefore it is a good idea to have at least 25% (or about 300MB) free space before starting the installation.</P>"
 msgstr "<P>Forslaget angir den samlede størrelsen på filene som vil bli installert på systemet. Men systemet vil også inneholde noen flere filer (midlertidige filer og arbeidsfiler), slik at plassen som kreves, er litt større enn forslaget viser. Det er derfor lurt å ha minst 25 % (eller 300 MB) ledig plass før du starter installasjonen.</P>"
 
 #. help text for software proposal
-#: src/modules/Packages.rb:332
+#: src/modules/Packages.rb:336
 msgid ""
 "<P>The total 'size to download' is the size of the packages which will be\n"
 "downloaded from remote (network) repositories. This value is important if the connection is slow or if there is a data limit for downloading.</P>\n"
@@ -1723,82 +1732,133 @@
 "Denne verdien er viktig hvis du har en langsom forbindelse, eller hvis det er begrensninger på mengden nedlastede data.</P>\n"
 
 #. help text for software proposal - header
-#: src/modules/Packages.rb:341
+#: src/modules/Packages.rb:345
 msgid "<P><B>Software Proposal</B></P>"
 msgstr "<P><B>Programvareforslag</B></P>"
 
 #. installation proposal - SW summary, %1 is name of the installed product
 #. (e.g. openSUSE 10.3, SUSE Linux Enterprise ...)
-#: src/modules/Packages.rb:358
+#: src/modules/Packages.rb:362
 msgid "Product: %1"
 msgstr "Produkt: %1"
 
 #. installation proposal - SW summary, %1 is name of the selected desktop or system type (e.g. KDE)
-#: src/modules/Packages.rb:372
+#: src/modules/Packages.rb:376
 msgid "System Type: %1"
 msgstr "Systemtype: %1"
 
-#: src/modules/Packages.rb:383
+#: src/modules/Packages.rb:387
 msgid "Patterns:<br>"
 msgstr "Mønstre:<br>"
 
 #. installation proposal - SW summary, %1 is size of the selected packages (in MB or GB)
-#: src/modules/Packages.rb:393
+#: src/modules/Packages.rb:397
 msgid "Size of Packages to Install: %1"
 msgstr "Størrelse på pakker som skal installeres: %1"
 
 #. installation proposal - SW summary, %1 is download size of the selected packages
 #. which will be installed from an ftp or http repository (in MB or GB)
-#: src/modules/Packages.rb:406
+#: src/modules/Packages.rb:410
 msgid "Downloading from Remote Repositories: %1"
 msgstr "Laster ned liste over eksterne pakkebrønner: %1"
 
-#: src/modules/Packages.rb:468
+#: src/modules/Packages.rb:472
 msgid "These add-on products have been marked for auto-removal: %1"
 msgstr "Disse tilleggsproduktene er merket for automatisk fjerning: %1"
 
 #. Warning message when some add-ons are marked to be removed automatically
-#: src/modules/Packages.rb:492
+#: src/modules/Packages.rb:496
 msgid "Contact the vendors of these add-ons to provide you with new installation media."
 msgstr "Be produsenten av disse tilleggsproduktene om nye installasjonsmedier."
 
 #. Warning message when some add-ons are marked to be removed automatically
-#: src/modules/Packages.rb:496
+#: src/modules/Packages.rb:500
 msgid "Contact the vendor of the add-on to provide you with a new installation media."
 msgstr "Be produsenten av tilleggsproduktet om et nytt installasjonsmedium."
 
 #. error message: %1: e.g. "/usr", %2: "/dev/sda2"
-#: src/modules/Packages.rb:537
+#: src/modules/Packages.rb:541
 msgid "Error: Cannot check free space in basic directory %1 (device %2), cannot start installation."
 msgstr "Feil: Kan ikke kontrollere ledig plass på grunnkatalog %1 (enhet %2), kan ikke starte installasjon."
 
 #. error message: %1: e.g. "/local", %2: "/dev/sda2"
-#: src/modules/Packages.rb:557
+#: src/modules/Packages.rb:561
 msgid "Warning: Cannot check free space in directory %1 (device %2)."
 msgstr "Advarsel: Kan ikke kontrollere ledig plass katalog %1 (enhet %2)."
 
 #. summary warning
-#: src/modules/Packages.rb:600
+#: src/modules/Packages.rb:604
 msgid "Not enough disk space."
 msgstr "Ikke nok diskplass."
 
 #. summary warning
-#: src/modules/Packages.rb:602
+#: src/modules/Packages.rb:606
 msgid "Not enough disk space. Remove some packages in the single selection."
 msgstr "Ikke nok diskplass. Fjern noen pakker fra utvalget."
 
 #. add a backslash if it's missing
-#: src/modules/Packages.rb:623
+#: src/modules/Packages.rb:627
 msgid "Only %1 (%2%%) free space available on partition %3.<BR>"
 msgstr "Det er bare %1 (%2%%) ledig plass på partisjonen %3.<BR>"
 
+#. newly installed products
+#: src/modules/Packages.rb:696
+#, fuzzy
+#| msgid "New product <b>%1</b> will be installed"
+msgid "New product <b>%s</b> will be installed"
+msgstr "Det nye produktet <b>%1</b> vil bli installert"
+
+#. product update: %s is a product name
+#: src/modules/Packages.rb:706
+#, fuzzy
+#| msgid "Product <b>%1</b> will be upgraded"
+msgid "Product <b>%s</b> will be updated"
+msgstr "Produktet <b>%1</b> vil bli oppgradert"
+
+#. product update: %{old_product} is an old product, %{new_product} is the new one
+#: src/modules/Packages.rb:708
+msgid "Product <b>%{old_product}</b> will be updated to <b>%{new_product}</b>"
+msgstr ""
+
+#: src/modules/Packages.rb:715
+#, fuzzy
+#| msgid "Product <b>%1</b> will keep installed"
+msgid "Product <b>%s</b> will stay installed"
+msgstr "Produktet <b>%1</b> vil fortsatt være installert"
+
+#. Removing another product might be an issue
+#. (just warn if removed by user or by YaST)
+#: src/modules/Packages.rb:725
+#, fuzzy
+#| msgid "<font color='red'><b>Warning:</b> Product <b>%1</b> will be removed</font>"
+msgid "<b>Warning:</b> Product <b>%s</b> will be removed."
+msgstr "<font color='red'><b>Advarsel:</b> Produktet <b>%1</b> vil bli fjernet</font>"
+
+#: src/modules/Packages.rb:726
+#, 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>"
+msgstr "<font color='red'><b>Feil:</b> Produktet <b>%1</b> vil bli automatisk fjernet</font>"
+
+#. TRANSLATORS: update proposal warning, do NOT translate "-release",
+#. it is part of a package name (like "sles-release")
+#: src/modules/Packages.rb:752
+msgid ""
+"<ul><li><b>Some products are marked for automatic removal.</b></li>\n"
+"<ul><li>Contact the vendor of the removed add-on to provide you with a new\n"
+"installation media</li><li>Or select the appropriate online extension or module\n"
+"in the registration step</li><li>Or to continue with product upgrade go to the\n"
+"software selection and mark the product (the -release package) for removal.\n"
+"</li></ul></li></ul>"
+msgstr ""
+
 #. error in proposal, %1 is URL
-#: src/modules/Packages.rb:1216
+#: src/modules/Packages.rb:1342
 msgid "No repository found at '%1'."
 msgstr "Ingen pakkebrønner funnet på '%1'."
 
 #. TRANSLATORS: beginning of the rich text with the release notes
-#: src/modules/Packages.rb:1489
+#: src/modules/Packages.rb:1615
 msgid ""
 "<p><b>The release notes for the initial release are part of the installation\n"
 "media. If an Internet connection is available during configuration, you can\n"
@@ -1810,31 +1870,31 @@
 "fra SUSE Linux-serveren på nettet.</b></p>\n"
 
 #. popup - information label
-#: src/modules/Packages.rb:1516
+#: src/modules/Packages.rb:1642
 msgid "Integrating booted media..."
 msgstr "Integrerer medium..."
 
 #. close the popup in order to be able to ask about the license
-#: src/modules/Packages.rb:1538
+#: src/modules/Packages.rb:1664
 msgid "Failed to integrate the service pack repository."
 msgstr "Kunne ikke integrere pakkebrønnen med oppdateringspakker."
 
 #. popup - information label
-#: src/modules/Packages.rb:1571
+#: src/modules/Packages.rb:1697
 msgid "Initializing repositories..."
 msgstr "Initialiserer pakkebrønner..."
 
 #. message popup, %1 is product name
-#: src/modules/Packages.rb:1803
+#: src/modules/Packages.rb:1929
 msgid "Insert %1 CD 1"
 msgstr "Sett inn %1 CD 1"
 
-#: src/modules/Packages.rb:1805
+#: src/modules/Packages.rb:1931
 msgid "%1 CD 1 not found"
 msgstr "%1 CD 1 ikke funnet"
 
 #. an error message
-#: src/modules/Packages.rb:1915
+#: src/modules/Packages.rb:2041
 msgid ""
 "Error while initializing package descriptions.\n"
 "Check the log file %1 for more details."
@@ -1843,7 +1903,7 @@
 "Du finner mer informasjon i loggfilen %1."
 
 #. bnc #436925
-#: src/modules/Packages.rb:2176
+#: src/modules/Packages.rb:2302
 msgid ""
 "The software selection has been changed externally.\n"
 "Software proposal will be called again."
@@ -1852,12 +1912,12 @@
 " Programvareforslaget vil bli behandlet på nytt."
 
 #. popup label
-#: src/modules/Packages.rb:2194
+#: src/modules/Packages.rb:2320
 msgid "Evaluating package selection..."
 msgstr "Vurderer pakkeutvalg..."
 
 #. Error message, %{pattern_name} is replaced with the missing pattern name in runtime
-#: src/modules/Packages.rb:2469
+#: src/modules/Packages.rb:2595
 msgid ""
 "Failed to select default product pattern %{pattern_name}.\n"
 "Pattern has not been found."
@@ -1866,32 +1926,40 @@
 #. Sets that the license (file) has been already accepted
 #.
 #. @param string filename
-#: src/modules/ProductLicense.rb:191 src/modules/ProductLicense.rb:198
+#: src/modules/ProductLicense.rb:148 src/modules/ProductLicense.rb:155
 msgid "Cannot read license file %1"
 msgstr "Kan ikke lese lisensfilen %1"
 
-#: src/modules/ProductLicense.rb:192
+#: src/modules/ProductLicense.rb:149
 msgid "To show the product license properly, put the license.tar.gz file to the root of the live media when building the image."
 msgstr "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:334
+#: src/modules/ProductLicense.rb:293
 msgid "&Language"
 msgstr "&Språk"
 
-#. radio button
-#: src/modules/ProductLicense.rb:391
-msgid "&Yes, I Agree to the License Agreement"
-msgstr "&Ja, jeg godkjenner lisensavtalen"
+#. check box label
+#: src/modules/ProductLicense.rb:345
+msgid "I &Agree to the License Terms."
+msgstr "Jeg godkjenner lisens&avtalen."
 
-#. radio button
-#: src/modules/ProductLicense.rb:399
-msgid "N&o, I Do not Agree"
-msgstr "Nei, jeg g&odkjenner ikke avtalen"
+#. %{license_url} is an URL where the displayed license can be found
+#: src/modules/ProductLicense.rb:385
+#, 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 download it from\n"
+"%{license_url}"
+msgstr ""
+"Hvis du vil skrive ut lisensavtalen, finner du den\n"
+"i filen filen %1 på det første mediet"
 
 #. TRANSLATORS: addition license information
 #. %1 is replaced with the filename
-#: src/modules/ProductLicense.rb:439
+#: src/modules/ProductLicense.rb:391
 msgid ""
 "If you want to print this EULA, you can find it\n"
 "on the first media in the file %1"
@@ -1900,7 +1968,7 @@
 "i filen filen %1 på det første mediet"
 
 #. help text
-#: src/modules/ProductLicense.rb:455
+#: src/modules/ProductLicense.rb:407
 msgid ""
 "<p>Read the license agreement carefully and select\n"
 "one of the available options. If you do not agree to the license agreement,\n"
@@ -1910,19 +1978,19 @@
 "ett av alternativene. Hvis du ikke godkjenner lisensavtalen,\n"
 "vil konfigurasjonen bli avbrutt.</p>\n"
 
+#. dialog title
 #. dialog caption
-#. dialog caption
-#: src/modules/ProductLicense.rb:467 src/modules/ProductLicense.rb:1303
+#: src/modules/ProductLicense.rb:417 src/modules/ProductLicense.rb:1212
 msgid "License Agreement"
 msgstr "Lisensavtale"
 
 #. popup question
-#: src/modules/ProductLicense.rb:1096
+#: 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:1116
+#: src/modules/ProductLicense.rb:1041
 msgid ""
 "Refusing the license agreement cancels the installation.\n"
 "Really refuse the agreement?"
@@ -1931,7 +1999,7 @@
 "Ønsker du å avbryte?"
 
 #. text asking whether to refuse a license (Yes-No popup)
-#: src/modules/ProductLicense.rb:1120
+#: src/modules/ProductLicense.rb:1044
 msgid ""
 "Refusing the license agreement cancels the add-on\n"
 "product installation. Really refuse the agreement?"
@@ -1940,7 +2008,7 @@
 "av tilleggsprodukt. Ønsker du å avbryte?"
 
 #. timed ok/cancel popup
-#: src/modules/ProductLicense.rb:1137
+#: src/modules/ProductLicense.rb:1054
 msgid "The system is shutting down..."
 msgstr "Systemet avsluttes..."
 
@@ -2027,72 +2095,79 @@
 
 #. radio button
 #: src/modules/SourceDialogs.rb:34
+#, fuzzy
+#| msgid "Custom Registration Server"
+msgid "&Extensions and Modules from Registration Server..."
+msgstr "Egendefinert registreringsserver"
+
+#. radio button
+#: src/modules/SourceDialogs.rb:36
 msgid "Specify &URL..."
 msgstr "Angi &nettadresse..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:36
+#: src/modules/SourceDialogs.rb:38
 msgid "&FTP..."
 msgstr "&FTP..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:38
+#: src/modules/SourceDialogs.rb:40
 msgid "&HTTP..."
 msgstr "&HTTP..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:40
+#: src/modules/SourceDialogs.rb:42
 msgid "HTT&PS..."
 msgstr "HTT&PS..."
 
 #. radio button
 #. radio button
-#: src/modules/SourceDialogs.rb:42 src/modules/SourceDialogs.rb:1711
+#: src/modules/SourceDialogs.rb:44 src/modules/SourceDialogs.rb:1719
 msgid "&SMB/CIFS"
 msgstr "&SMB/CIFS"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:44
+#: src/modules/SourceDialogs.rb:46
 msgid "&NFS..."
 msgstr "&NFS..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:46
+#: src/modules/SourceDialogs.rb:48
 msgid "&CD..."
 msgstr "&CD..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:48
+#: src/modules/SourceDialogs.rb:50
 msgid "&DVD..."
 msgstr "&DVD..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:50
+#: src/modules/SourceDialogs.rb:52
 msgid "&Hard Disk..."
 msgstr "&Harddisk..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:52
+#: src/modules/SourceDialogs.rb:54
 msgid "&USB Mass Storage (USB Stick, Disk)..."
 msgstr "&USB-masselagring (USB-pinne, disk)..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:54
+#: src/modules/SourceDialogs.rb:56
 msgid "&Local Directory..."
 msgstr "&Lokal katalog..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:56
+#: src/modules/SourceDialogs.rb:58
 msgid "&Local ISO Image..."
 msgstr "&Lokalt ISO-bilde..."
 
 #. check box
-#: src/modules/SourceDialogs.rb:58
+#: src/modules/SourceDialogs.rb:60
 msgid "&Download repository description files"
 msgstr "Last ne&d beskrivelsesfiler for pakkebrønnen"
 
 #. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:106
+#: src/modules/SourceDialogs.rb:109
 msgid ""
 "<p>If the location is a file holding an ISO image\n"
 "of the media, set <b>ISO Image</b>.</p>"
@@ -2101,7 +2176,7 @@
 "av mediet, velg <b>ISO-bilde</b>.</p>"
 
 #. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:111
+#: src/modules/SourceDialogs.rb:114
 msgid ""
 "<p>If the repository is on multiple media,\n"
 "set the location of the first media of the set.</p>\n"
@@ -2110,86 +2185,86 @@
 "hvis pakkebrønnen er fordelt på flere medier.</p>\n"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:120
+#: src/modules/SourceDialogs.rb:128
 msgid "&Server Name"
 msgstr "&Servernavn"
 
 #. text entry
 #. text entry
-#: src/modules/SourceDialogs.rb:128 src/modules/SourceDialogs.rb:1575
+#: src/modules/SourceDialogs.rb:136 src/modules/SourceDialogs.rb:1583
 msgid "&Path to Directory or ISO Image"
 msgstr "&Sti til katalog eller ISO-bilde"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:136
+#: src/modules/SourceDialogs.rb:144
 msgid "&ISO Image"
 msgstr "&ISO-bilde"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:138
+#: src/modules/SourceDialogs.rb:146
 msgid "N&FS v4 Protocol"
 msgstr "N&FS v4-protokoll"
 
-#: src/modules/SourceDialogs.rb:144
+#: src/modules/SourceDialogs.rb:152
 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:148
+#: src/modules/SourceDialogs.rb:156
 msgid "(default)"
 msgstr "(standard)"
 
-#: src/modules/SourceDialogs.rb:159
+#: src/modules/SourceDialogs.rb:167
 msgid "URL of the Repository"
 msgstr "Pakkebrønnadresse"
 
 #. frame
-#: src/modules/SourceDialogs.rb:168
+#: src/modules/SourceDialogs.rb:176
 msgid "P&rotocol"
 msgstr "P&rotokoll"
 
 #. input field label
-#: src/modules/SourceDialogs.rb:178
+#: src/modules/SourceDialogs.rb:186
 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:193 src/modules/SourceManagerSLP.rb:323
+#: src/modules/SourceDialogs.rb:201 src/modules/SourceManagerSLP.rb:323
 msgid "Repository URL"
 msgstr "Pakkebrønnadresse"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:195
+#: src/modules/SourceDialogs.rb:203
 msgid "NFS Server"
 msgstr "NFS-server"
 
 #. label / dialog caption
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:197 src/modules/SourceDialogs.rb:199
+#: src/modules/SourceDialogs.rb:205 src/modules/SourceDialogs.rb:207
 msgid "CD or DVD Media"
 msgstr "CD- eller DVD-medium"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:201
+#: src/modules/SourceDialogs.rb:209
 msgid "Hard Disk"
 msgstr "Harddisk"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:203
+#: src/modules/SourceDialogs.rb:211
 msgid "USB Stick or Disk"
 msgstr "USB-pinne eller disk"
 
 #. label / dialog caption
 #. dialog caption
-#: src/modules/SourceDialogs.rb:205 src/modules/SourceDialogs.rb:880
+#: src/modules/SourceDialogs.rb:213 src/modules/SourceDialogs.rb:888
 msgid "Local Directory"
 msgstr "Lokal katalog"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:207
+#: src/modules/SourceDialogs.rb:215
 msgid "Local ISO Image"
 msgstr "Lokalt ISO-bilde"
 
@@ -2198,24 +2273,24 @@
 #. label / dialog caption
 #. label / dialog caption
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:209 src/modules/SourceDialogs.rb:211
-#: src/modules/SourceDialogs.rb:213 src/modules/SourceDialogs.rb:215
-#: src/modules/SourceDialogs.rb:217
+#: src/modules/SourceDialogs.rb:217 src/modules/SourceDialogs.rb:219
+#: src/modules/SourceDialogs.rb:221 src/modules/SourceDialogs.rb:223
+#: src/modules/SourceDialogs.rb:225
 msgid "Server and Directory"
 msgstr "Server og katalog"
 
 #. popup message
-#: src/modules/SourceDialogs.rb:432
+#: src/modules/SourceDialogs.rb:440
 msgid "The name of the repository cannot be empty."
 msgstr "Et pakkebrønnnavn må angis."
 
 #. text entry
-#: src/modules/SourceDialogs.rb:444
+#: src/modules/SourceDialogs.rb:452
 msgid "&Repository Name"
 msgstr "Pakkeb&rønnavn"
 
 #. help text
-#: src/modules/SourceDialogs.rb:459
+#: src/modules/SourceDialogs.rb:467
 msgid ""
 "<p><big><b>Repository Name</b></big><br>\n"
 "Use <b>Repository Name</b> to specify the name of the repository. If it is empty, YaST will use the product name (if available) or the URL as the name.</p>\n"
@@ -2224,12 +2299,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:473
+#: src/modules/SourceDialogs.rb:481
 msgid "&Service Name"
 msgstr "Navn på tjene&ste"
 
 #. help text
-#: src/modules/SourceDialogs.rb:481
+#: src/modules/SourceDialogs.rb:489
 msgid ""
 "<p><big><b>Service Name</b></big><br>\n"
 "Use <b>Service Name</b> to specify the name of the service. If it is empty, YaST will use part of the service URL as the name.</p>\n"
@@ -2238,17 +2313,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:516
+#: src/modules/SourceDialogs.rb:524
 msgid "URL cannot be empty."
 msgstr "Du må angi en nettadresse."
 
 #. text entry
-#: src/modules/SourceDialogs.rb:529
+#: src/modules/SourceDialogs.rb:537
 msgid "&URL"
 msgstr "&Nettadresse"
 
 #. help text
-#: src/modules/SourceDialogs.rb:543
+#: src/modules/SourceDialogs.rb:551
 msgid ""
 "<p><big><b>Repository URL</b></big><br>\n"
 "Use <b>URL</b> to specify the URL of the repository.</p>"
@@ -2260,16 +2335,16 @@
 #. @return widget description map
 #. Get widget description map
 #. @return widget description map
-#: src/modules/SourceDialogs.rb:716 src/modules/SourceDialogs.rb:1843
+#: src/modules/SourceDialogs.rb:724 src/modules/SourceDialogs.rb:1851
 msgid "Edit Parts of the URL"
 msgstr "Rediger deler av adressen"
 
-#: src/modules/SourceDialogs.rb:723 src/modules/SourceDialogs.rb:1850
+#: src/modules/SourceDialogs.rb:731 src/modules/SourceDialogs.rb:1858
 msgid "Edit Complete URL"
 msgstr "Rediger hele adressen"
 
 #. help text
-#: src/modules/SourceDialogs.rb:735
+#: src/modules/SourceDialogs.rb:743
 msgid ""
 "<p><big><b>NFS Server</b></big><br>\n"
 "Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n"
@@ -2279,7 +2354,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:742
+#: src/modules/SourceDialogs.rb:750
 msgid ""
 "<p><big><b>Mount Options</b></big><br>\n"
 "You can specify extra options used for mounting the NFS volume.\n"
@@ -2292,16 +2367,16 @@
 "for mer informasjon og en liste over gyldige valg."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:797
+#: src/modules/SourceDialogs.rb:805
 msgid "&CD-ROM"
 msgstr "&CD-ROM"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:799
+#: src/modules/SourceDialogs.rb:807
 msgid "&DVD-ROM"
 msgstr "&DVD-ROM"
 
-#: src/modules/SourceDialogs.rb:804
+#: src/modules/SourceDialogs.rb:812
 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>"
@@ -2310,12 +2385,12 @@
 "Velg <b>CD-ROM</b> eller <b>DVD-ROM</b> for å angi medietypen.</p>"
 
 #. dialog caption
-#: src/modules/SourceDialogs.rb:895
+#: src/modules/SourceDialogs.rb:903
 msgid "ISO Image File"
 msgstr "ISO-bildefil"
 
 #. error popup - the entered path is not a directory
-#: src/modules/SourceDialogs.rb:918
+#: src/modules/SourceDialogs.rb:926
 msgid ""
 "The entered path is not a directory\n"
 "or the directory does not exist.\n"
@@ -2324,7 +2399,7 @@
 "eller katalogen finnes ikke.\n"
 
 #. error popup - the entered path is not a regular file
-#: src/modules/SourceDialogs.rb:948
+#: src/modules/SourceDialogs.rb:956
 msgid ""
 "The entered path is not a file\n"
 "or the file does not exist.\n"
@@ -2333,7 +2408,7 @@
 "eller filen finnes ikke.\n"
 
 #. continue/cancel popup, %1 is a file name
-#: src/modules/SourceDialogs.rb:972
+#: src/modules/SourceDialogs.rb:980
 msgid ""
 "File '%1'\n"
 "does not seem to be an ISO image.\n"
@@ -2344,17 +2419,17 @@
 "Vil du bruke den likevel?\n"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:993
+#: src/modules/SourceDialogs.rb:1001
 msgid "&Path to Directory"
 msgstr "&Sti til katalog"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:1001 src/modules/SourceDialogs.rb:1259
-#: src/modules/SourceDialogs.rb:1326
+#: src/modules/SourceDialogs.rb:1009 src/modules/SourceDialogs.rb:1267
+#: src/modules/SourceDialogs.rb:1334
 msgid "&Plain RPM Directory"
 msgstr "&Ren RPM-katalog"
 
-#: src/modules/SourceDialogs.rb:1016
+#: src/modules/SourceDialogs.rb:1024
 msgid ""
 "<p><big><b>Local Directory</b></big><br>\n"
 "Use <b>Path to Directory</b> to specify the path to the\n"
@@ -2369,20 +2444,20 @@
 "<b>Ren RPM-katalog</b> velges.</p>\n"
 
 #. `opt(`hstretch),
-#: src/modules/SourceDialogs.rb:1252
+#: src/modules/SourceDialogs.rb:1260
 msgid "&USB Mass Storage Device"
 msgstr "&USB masselagringsenhet"
 
 #. the spacing is added to make the widget wider
-#: src/modules/SourceDialogs.rb:1257 src/modules/SourceDialogs.rb:1324
+#: src/modules/SourceDialogs.rb:1265 src/modules/SourceDialogs.rb:1332
 msgid "&File System"
 msgstr "&Filsystem"
 
-#: src/modules/SourceDialogs.rb:1258 src/modules/SourceDialogs.rb:1325
+#: src/modules/SourceDialogs.rb:1266 src/modules/SourceDialogs.rb:1333
 msgid "Dire&ctory"
 msgstr "&Katalog"
 
-#: src/modules/SourceDialogs.rb:1263
+#: src/modules/SourceDialogs.rb:1271
 msgid ""
 "<p><big><b>USB Stick or Disk</b></big><br>\n"
 "Select the USB device on which the repository is located.\n"
@@ -2402,7 +2477,7 @@
 
 #. 'auto' is a value in the combo box widget, do not translate it!
 #. 'auto' is a value in the combo box widget, do not translate it!
-#: src/modules/SourceDialogs.rb:1273 src/modules/SourceDialogs.rb:1340
+#: src/modules/SourceDialogs.rb:1281 src/modules/SourceDialogs.rb:1348
 msgid ""
 "<p>The file system used on the device will be detected automatically\n"
 "if you select file system 'auto'. If the detection fails or you\n"
@@ -2413,11 +2488,11 @@
 "eller hvis du vil bruke et spesielt filsystem, velger du dette fra listen.</p>\n"
 
 #. combobox title
-#: src/modules/SourceDialogs.rb:1323
+#: src/modules/SourceDialogs.rb:1331
 msgid "&Disk Device"
 msgstr "&Diskenhet"
 
-#: src/modules/SourceDialogs.rb:1330
+#: src/modules/SourceDialogs.rb:1338
 msgid ""
 "<p><big><b>Disk</b></big><br>\n"
 "Select the disk on which the repository is located.\n"
@@ -2436,12 +2511,12 @@
 "<b>Ren RPM-katalog</b>.</p>\n"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1356
+#: src/modules/SourceDialogs.rb:1364
 msgid "&Path to ISO Image"
 msgstr "&Sti til ISO-bilde"
 
 #. push button
-#: src/modules/SourceDialogs.rb:1376
+#: src/modules/SourceDialogs.rb:1384
 msgid ""
 "<p><big><b>Local ISO Image</b></big><br>\n"
 "Use <b>Path to ISO Image</b> to specify the path to the\n"
@@ -2452,71 +2527,71 @@
 "filen som inneholder ISO-bildet av installasjonsmediet.</p>"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1557
+#: src/modules/SourceDialogs.rb:1565
 msgid "Server &Name"
 msgstr "Server&navn"
 
-#: src/modules/SourceDialogs.rb:1561
+#: src/modules/SourceDialogs.rb:1569
 msgid "&Port"
 msgstr "&Port"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1566
+#: src/modules/SourceDialogs.rb:1574
 msgid "&Share"
 msgstr "&Delt ressurs"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:1579
+#: src/modules/SourceDialogs.rb:1587
 msgid "ISO &Image"
 msgstr "&ISO-bilde"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1582
+#: src/modules/SourceDialogs.rb:1590
 msgid "&Directory on Server"
 msgstr "&Katalog på server"
 
 #. frame
-#: src/modules/SourceDialogs.rb:1587
+#: src/modules/SourceDialogs.rb:1595
 msgid "Au&thentication"
 msgstr "Au&tentisering"
 
 #. check box
-#: src/modules/SourceDialogs.rb:1594
+#: src/modules/SourceDialogs.rb:1602
 msgid "&Anonymous"
 msgstr "&Anonym"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1603
+#: src/modules/SourceDialogs.rb:1611
 msgid "&Workgroup or Domain"
 msgstr "&Arbeidsgruppe eller domene"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1612
+#: src/modules/SourceDialogs.rb:1620
 msgid "&User Name"
 msgstr "&Brukernavn"
 
 #. password entry
-#: src/modules/SourceDialogs.rb:1619
+#: src/modules/SourceDialogs.rb:1627
 msgid "&Password"
 msgstr "&Passord"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1694
+#: src/modules/SourceDialogs.rb:1702
 msgid "&FTP"
 msgstr "&FTP"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1697
+#: src/modules/SourceDialogs.rb:1705
 msgid "H&TTP"
 msgstr "H&TTP"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1704
+#: src/modules/SourceDialogs.rb:1712
 msgid "HTT&PS"
 msgstr "HTT&PS"
 
 #. help text - server dialog
-#: src/modules/SourceDialogs.rb:1874
+#: src/modules/SourceDialogs.rb:1882
 msgid ""
 "<p><big><b>Server and Directory</b></big><br>\n"
 "Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n"
@@ -2541,7 +2616,7 @@
 "av mediet, velg <b>ISO-diskbilde</b>.</p>\n"
 
 #. help text - server dialog, there is a "Port" widget
-#: src/modules/SourceDialogs.rb:1887
+#: src/modules/SourceDialogs.rb:1895
 msgid ""
 "<p>It is possible to set the <b>Port</b> number for a HTTP/HTTPS repository.\n"
 "Leave it empty to use the default port.</p>\n"
@@ -2552,12 +2627,12 @@
 #. Returns whether Community Repositories are defined in the control file.
 #.
 #. @return [Boolean] whether defined
-#: src/modules/SourceDialogs.rb:1949
-msgid "I would like to install an Add On Product"
+#: src/modules/SourceDialogs.rb:1957
+msgid "I would like to install an additional Add On Product"
 msgstr ""
 
 #. help text
-#: src/modules/SourceDialogs.rb:2067
+#: src/modules/SourceDialogs.rb:2076
 msgid ""
 "<p><big><b>Media Type</b></big><br>\n"
 "The software repository can be located on CD, on a network server,\n"
@@ -2568,7 +2643,7 @@
 "eller på harddisken.</p>"
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2076
+#: src/modules/SourceDialogs.rb:2085
 msgid ""
 "<p>\n"
 "To add  <b>CD</b> or <b>DVD</b>,\n"
@@ -2579,7 +2654,7 @@
 "må du ha en CD  eller DVD med produktet tilgjengelig.</p>"
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2086
+#: src/modules/SourceDialogs.rb:2095
 msgid ""
 "<p>\n"
 "The product CDs can be copied to the hard disk.\n"
@@ -2595,7 +2670,7 @@
 "til samme katalog.</p>\n"
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2098
+#: src/modules/SourceDialogs.rb:2107
 msgid ""
 "<p>\n"
 "Network installation requires a working network connection.\n"
@@ -2608,25 +2683,25 @@
 "første CD er plassert, for eksempel /data1/CD1.</p>\n"
 
 #. error popup
-#: src/modules/SourceDialogs.rb:2113
+#: src/modules/SourceDialogs.rb:2122
 msgid "Select the media type"
 msgstr "Velg medietype"
 
-#: src/modules/SourceDialogs.rb:2119
+#: src/modules/SourceDialogs.rb:2128
 msgid "Insert the add-on product CD"
 msgstr "Sett inn CD-en med tilleggsproduktet"
 
-#: src/modules/SourceDialogs.rb:2120
+#: src/modules/SourceDialogs.rb:2129
 msgid "Insert the add-on product DVD"
 msgstr "Sett inn DVD-en med tilleggsproduktet"
 
 #. ask for a medium
-#: src/modules/SourceDialogs.rb:2138
+#: src/modules/SourceDialogs.rb:2147
 msgid "No USB disk was detected."
 msgstr "Ingen USB-disk ble funnet."
 
 #. TODO: disable "download" option when CD or DVD source is selected
-#: src/modules/SourceDialogs.rb:2332
+#: src/modules/SourceDialogs.rb:2344
 msgid ""
 "<p><b>Download Files</b><br>\n"
 "Each repository has description files which describe the content of the\n"
@@ -2641,11 +2716,17 @@
 "automatisk laste ned filene når det er behov for dem senere. </p>\n"
 
 #. dialog caption
-#. dialog caption
-#: src/modules/SourceDialogs.rb:2551 src/modules/SourceDialogs.rb:2575
+#: src/modules/SourceDialogs.rb:2563
 msgid "Media Type"
 msgstr "Medietype"
 
+#. dialog caption
+#: src/modules/SourceDialogs.rb:2587
+#, fuzzy
+#| msgid "Add-On Product"
+msgid "Add On Product"
+msgstr "Tilleggsprodukt"
+
 #. SourceManager read dialog caption
 #: src/modules/SourceManager.rb:100
 msgid "Initializing Available Repositories"
@@ -2737,7 +2818,9 @@
 msgid "Configured Repositories"
 msgstr "Valgte pakkebrønner"
 
-#: src/modules/SourceManager.rb:680
+#. To adjust the width of the dialog, look for the more lengthy device label
+#. (and add some extra space for the frame)
+#: src/modules/SourceManager.rb:670
 msgid "&Drive to eject"
 msgstr "&Stasjon som skal løses ut"
 
@@ -2811,12 +2894,12 @@
 "Den valgte pakkebrønnen har ingen nettadresse."
 
 #. progress information, %1 stands for number of services
-#: src/modules/SourceManagerSLP.rb:520
+#: src/modules/SourceManagerSLP.rb:493
 msgid "Collecting information of %1 services found..."
 msgstr "Henter informasjon om %1 tjenester som ble funnet..."
 
 #. error popup
-#: src/modules/SourceManagerSLP.rb:618
+#: src/modules/SourceManagerSLP.rb:591
 msgid ""
 "No SLP repositories have been found on your network.\n"
 "This could be caused by a running SuSEfirewall2,\n"
@@ -2827,7 +2910,7 @@
 "og sannsynligvis blokkerer nettverkssøk."
 
 #. error popup
-#: src/modules/SourceManagerSLP.rb:627
+#: src/modules/SourceManagerSLP.rb:600
 msgid "No SLP repositories have been found on your network."
 msgstr "Ingen SLP-pakkebrønner ble funnet på nettverket."
 
@@ -2850,6 +2933,12 @@
 msgid "Deselect some packages."
 msgstr "Fjern noen pakker fra utvalget."
 
+#~ msgid "&Yes, I Agree to the License Agreement"
+#~ msgstr "&Ja, jeg godkjenner lisensavtalen"
+
+#~ msgid "N&o, I Do not Agree"
+#~ msgstr "Nei, jeg g&odkjenner ikke avtalen"
+
 #~ msgid "&USB Stick or Disk..."
 #~ msgstr "&USB-minnepinne eller disk..."
 

Modified: trunk/yast/nb/po/pam.nb.po
===================================================================
--- trunk/yast/nb/po/pam.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/pam.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: pam\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:33+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2006-01-03 15:43+0100\n"
 "Last-Translator: Olav Pettershagen <olav.pet@online.no>\n"
 "Language-Team:  <nb@li.org>\n"

Modified: trunk/yast/nb/po/pkg-bindings.nb.po
===================================================================
--- trunk/yast/nb/po/pkg-bindings.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/pkg-bindings.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: pkg-bindings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2009-08-12 17:54+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -153,7 +153,7 @@
 
 #. 3 steps per repository (download, cache rebuild, load resolvables)
 #: src/Source_Load.cc:161 src/Source_Load.cc:483 src/Source_Set.cc:83
-#: src/Target_Load.cc:74 src/Target_Load.cc:187
+#: src/Target_Load.cc:74 src/Target_Load.cc:204
 msgid "Loading the Package Manager..."
 msgstr "Laster pakkebehandleren..."
 
@@ -184,6 +184,6 @@
 msgid "Initialize the Target System"
 msgstr "Initialiser målsystem"
 
-#: src/Target_Load.cc:71 src/Target_Load.cc:183
+#: src/Target_Load.cc:71 src/Target_Load.cc:200
 msgid "Read Installed Packages"
 msgstr "Les installerte pakker"

Modified: trunk/yast/nb/po/printer.nb.po
===================================================================
--- trunk/yast/nb/po/printer.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/printer.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: printer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:40+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2009-08-12 23:45+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"

Modified: trunk/yast/nb/po/product-creator.nb.po
===================================================================
--- trunk/yast/nb/po/product-creator.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/product-creator.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: product-creator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2009-10-01 12:41+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"

Modified: trunk/yast/nb/po/proxy.nb.po
===================================================================
--- trunk/yast/nb/po/proxy.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/proxy.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2002-06-17 14:33+0200\n"
 "Last-Translator: www.linuxbutikken.no <roy@bytek.no>\n"
 "Language-Team: Norwegian <i18n@suse.de>\n"

Modified: trunk/yast/nb/po/qt-pkg.nb.po
===================================================================
--- trunk/yast/nb/po/qt-pkg.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/qt-pkg.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: qt-pkg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2010-07-27 11:04+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -49,47 +49,47 @@
 msgid "&Repositories"
 msgstr "Pakkeb&rønner"
 
-#: src/YQPackageSelector.cc:418
+#: src/YQPackageSelector.cc:419
 msgid "S&earch"
 msgstr "&Søk"
 
 #. DEBUG
-#: src/YQPackageSelector.cc:425 src/YQPkgSearchFilterView.cc:113
+#: src/YQPackageSelector.cc:426 src/YQPkgSearchFilterView.cc:113
 msgid "&Keywords"
 msgstr "Sø&keord"
 
-#: src/YQPackageSelector.cc:434
+#: src/YQPackageSelector.cc:435
 msgid "&Installation Summary"
 msgstr "&Installasjonssammendrag"
 
-#: src/YQPackageSelector.cc:519
+#: src/YQPackageSelector.cc:520
 msgid "D&escription"
 msgstr "B&eskrivelse"
 
-#: src/YQPackageSelector.cc:532
+#: src/YQPackageSelector.cc:533
 msgid "&Technical Data"
 msgstr "&Tekniske data"
 
-#: src/YQPackageSelector.cc:545 src/YQPkgProductDialog.cc:115
+#: src/YQPackageSelector.cc:546 src/YQPkgProductDialog.cc:115
 msgid "Dependencies"
 msgstr "Avhengigheter"
 
-#: src/YQPackageSelector.cc:561
+#: src/YQPackageSelector.cc:562
 msgid "&Versions"
 msgstr "&Versjoner"
 
-#: src/YQPackageSelector.cc:579
+#: src/YQPackageSelector.cc:580
 msgid "File List"
 msgstr "Filliste"
 
-#: src/YQPackageSelector.cc:596
+#: src/YQPackageSelector.cc:597
 msgid "Change Log"
 msgstr "Endringslogg"
 
 #. "Cancel" button
 #. button #0
 #. text
-#: src/YQPackageSelector.cc:623 src/YQPackageSelectorBase.cc:194
+#: src/YQPackageSelector.cc:624 src/YQPackageSelectorBase.cc:194
 #: src/YQPackageSelectorBase.cc:249 src/YQPackageSelectorBase.cc:305
 #: src/YQPackageSelectorBase.cc:326 src/YQPatternSelector.cc:259
 #: src/YQPkgConflictDialog.cc:163 src/YQPkgConflictDialog.cc:398
@@ -99,175 +99,175 @@
 msgstr "&Avbryt"
 
 #. Translators: "Accept" here refers to licenses or similar
-#: src/YQPackageSelector.cc:633 src/YQPatternSelector.cc:268
+#: src/YQPackageSelector.cc:634 src/YQPatternSelector.cc:268
 #: src/YQPkgTextDialog.cc:258 src/YQSimplePatchSelector.cc:228
 msgid "&Accept"
 msgstr "&Bekreft"
 
-#: src/YQPackageSelector.cc:676
+#: src/YQPackageSelector.cc:677
 msgid "&File"
 msgstr "&Fil"
 
-#: src/YQPackageSelector.cc:678
+#: src/YQPackageSelector.cc:679
 msgid "&Import..."
 msgstr "&Importer..."
 
-#: src/YQPackageSelector.cc:679
+#: src/YQPackageSelector.cc:680
 msgid "&Export..."
 msgstr "&Eksporter..."
 
-#: src/YQPackageSelector.cc:683
+#: src/YQPackageSelector.cc:684
 msgid "E&xit -- Discard Changes"
 msgstr "A&vslutt -- forkast endringer"
 
-#: src/YQPackageSelector.cc:684
+#: src/YQPackageSelector.cc:685
 msgid "&Quit -- Save Changes"
 msgstr "&Avslutt -- lagre endringer"
 
-#: src/YQPackageSelector.cc:696
+#: src/YQPackageSelector.cc:697
 msgid "&Package"
 msgstr "&Pakke"
 
-#: src/YQPackageSelector.cc:736 src/YQPkgPackageKitGroupsFilterView.cc:92
+#: src/YQPackageSelector.cc:737 src/YQPkgPackageKitGroupsFilterView.cc:92
 #: src/YQPkgRepoFilterView.cc:149
 msgid "All Packages"
 msgstr "Alle pakker"
 
-#: src/YQPackageSelector.cc:738 src/YQPkgObjList.cc:430
+#: src/YQPackageSelector.cc:739 src/YQPkgObjList.cc:430
 msgid "Update if newer version available"
 msgstr "Oppgrader hvis nyere versjon er tilgjengelig"
 
-#: src/YQPackageSelector.cc:741 src/YQPkgObjList.cc:415
+#: src/YQPackageSelector.cc:742 src/YQPkgObjList.cc:415
 #: src/YQPkgObjList.cc:436
 msgid "Update unconditionally"
 msgstr "Oppgrader uansett"
 
-#: src/YQPackageSelector.cc:755
+#: src/YQPackageSelector.cc:756
 msgid "&Patch"
 msgstr "&Oppgradering"
 
-#: src/YQPackageSelector.cc:782
+#: src/YQPackageSelector.cc:783
 msgid "Confi&guration"
 msgstr "&Oppsett"
 
-#: src/YQPackageSelector.cc:783
+#: src/YQPackageSelector.cc:784
 msgid "&Repositories..."
 msgstr "Pakkeb&rønner..."
 
-#: src/YQPackageSelector.cc:784
+#: src/YQPackageSelector.cc:785
 msgid "&Online Update..."
 msgstr "&Online-oppdatering..."
 
-#: src/YQPackageSelector.cc:794
+#: src/YQPackageSelector.cc:795
 msgid "&Dependencies"
 msgstr "&Avhengigheter"
 
-#: src/YQPackageSelector.cc:796
+#: src/YQPackageSelector.cc:797
 msgid "&Check Now"
 msgstr "&Kontroller nå"
 
-#: src/YQPackageSelector.cc:797
+#: src/YQPackageSelector.cc:798
 msgid "&Autocheck"
 msgstr "&Autokontroller"
 
 #. Translators: Menu for view options (Use a noun, not a verb!)
-#: src/YQPackageSelector.cc:810
+#: src/YQPackageSelector.cc:811
 msgid "&Options"
 msgstr "&Alternativer"
 
 #. Translators: This is about packages ending in "-devel", so don't translate that "-devel"!
-#: src/YQPackageSelector.cc:813
+#: src/YQPackageSelector.cc:814
 msgid "Show -de&vel Packages"
 msgstr "Vis ut&viklingspakker"
 
 #. Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"!
-#: src/YQPackageSelector.cc:822
+#: src/YQPackageSelector.cc:823
 msgid "Show -&debuginfo/-debugsource Packages"
 msgstr "Vis -&debuginfo/-debugsource-pakker"
 
-#: src/YQPackageSelector.cc:830
+#: src/YQPackageSelector.cc:831
 msgid "&System Verification Mode"
 msgstr "&Systemverifiseringsmodus"
 
-#: src/YQPackageSelector.cc:835
+#: src/YQPackageSelector.cc:836
 msgid "&Ignore Recommended Packages for Already Installed Packages"
 msgstr "&Ignorer anbefalte pakker for allerede installerte pakker"
 
-#: src/YQPackageSelector.cc:841
+#: src/YQPackageSelector.cc:842
 msgid "&Cleanup when deleting packages"
 msgstr "&Rydd opp når pakker fjernes"
 
-#: src/YQPackageSelector.cc:845
+#: src/YQPackageSelector.cc:846
 msgid "&Allow vendor change"
 msgstr "Till&at bytte av leverandør"
 
-#: src/YQPackageSelector.cc:858
+#: src/YQPackageSelector.cc:859
 msgid "E&xtras"
 msgstr "&Tillegg"
 
-#: src/YQPackageSelector.cc:860
+#: src/YQPackageSelector.cc:861
 msgid "Show &Products"
 msgstr "Vis &produkter"
 
-#: src/YQPackageSelector.cc:861
+#: src/YQPackageSelector.cc:862
 msgid "Show P&ackage Changes"
 msgstr "Vis p&akkeendringer"
 
-#: src/YQPackageSelector.cc:862
+#: src/YQPackageSelector.cc:863
 msgid "Show &History"
 msgstr "Vis &historie"
 
 #. Translators: This is about packages ending in "-devel", so don't translate that "-devel"!
-#: src/YQPackageSelector.cc:870
+#: src/YQPackageSelector.cc:871
 msgid "Install All Matching -&devel Packages"
 msgstr "Installer alle tilhørende -&devel-pakker"
 
 #. Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"!
-#: src/YQPackageSelector.cc:874
+#: src/YQPackageSelector.cc:875
 msgid "Install All Matching -de&buginfo Packages"
 msgstr "Installer alle tilhørende -de&buginfo-pakker"
 
 #. Translators: This is about packages ending in "-debugsource", so don't translate that "-debugsource"!
-#: src/YQPackageSelector.cc:877
+#: src/YQPackageSelector.cc:878
 msgid "Install All Matching -debug&source Packages"
 msgstr "Installer alle tilhørende -de&bugsource-pakker"
 
-#: src/YQPackageSelector.cc:882
+#: src/YQPackageSelector.cc:883
 msgid "Generate Dependency Resolver &Test Case"
 msgstr "Generer &testkasus for konfliktløsning"
 
-#: src/YQPackageSelector.cc:902
+#: src/YQPackageSelector.cc:903
 msgid "&Help"
 msgstr "&Hjelp"
 
 #. Note: The help functions and their texts are moved out
 #. to a separate source file YQPackageSelectorHelp.cc
 #. Menu entry for help overview
-#: src/YQPackageSelector.cc:908
+#: src/YQPackageSelector.cc:909
 msgid "&Overview"
 msgstr "&Oversikt"
 
 #. Menu entry for help about used symbols ( icons )
-#: src/YQPackageSelector.cc:911
+#: src/YQPackageSelector.cc:912
 msgid "&Symbols"
 msgstr "&Symboler"
 
 #. Menu entry for keyboard help
-#: src/YQPackageSelector.cc:914
+#: src/YQPackageSelector.cc:915
 msgid "&Keys"
 msgstr "&Taster"
 
-#: src/YQPackageSelector.cc:1100
+#: src/YQPackageSelector.cc:1101
 msgid "All package dependencies are OK."
 msgstr "Alle pakkeavhengigheter er OK."
 
-#: src/YQPackageSelector.cc:1116
+#: src/YQPackageSelector.cc:1117
 msgid "P&atches"
 msgstr "P&akkeoppdateringer"
 
 #. startsWith
 #. filter
-#: src/YQPackageSelector.cc:1178
+#: src/YQPackageSelector.cc:1179
 msgid "Save Package List"
 msgstr "Lagre pakkeliste"
 
@@ -275,56 +275,56 @@
 #. parent
 #. Post error popup.
 #. parent
-#: src/YQPackageSelector.cc:1217 src/YQPackageSelector.cc:1311
+#: src/YQPackageSelector.cc:1218 src/YQPackageSelector.cc:1312
 #: src/YQPkgConflictDialog.cc:425 src/YQPkgConflictList.cc:201
 #: src/YQPkgList.cc:605
 msgid "Error"
 msgstr "Feil"
 
 #. caption
-#: src/YQPackageSelector.cc:1218
+#: src/YQPackageSelector.cc:1219
 msgid "Error exporting package list to %1"
 msgstr "Feil under eksport av pakkeliste til %1"
 
-#: src/YQPackageSelector.cc:1230
+#: src/YQPackageSelector.cc:1231
 msgid "Load Package List"
 msgstr "Last pakkeliste"
 
 #. caption
-#: src/YQPackageSelector.cc:1312
+#: src/YQPackageSelector.cc:1313
 msgid "Error loading package list from %1"
 msgstr "Feil under lasting av pakkeliste fra %1"
 
 #. caption
 #. Translators: %1 is the number of affected packages
-#: src/YQPackageSelector.cc:1414
+#: src/YQPackageSelector.cc:1415
 msgid "%1 packages will be updated"
 msgstr "%1 pakker vil bli oppdatert"
 
-#: src/YQPackageSelector.cc:1415
+#: src/YQPackageSelector.cc:1416
 msgid "&Continue"
 msgstr "&Fortsett"
 
-#: src/YQPackageSelector.cc:1415
+#: src/YQPackageSelector.cc:1416
 msgid "C&ancel"
 msgstr "&Avbryt"
 
-#: src/YQPackageSelector.cc:1454
+#: src/YQPackageSelector.cc:1455
 msgid "<p><small><a href=\"repoupgraderemove:///%1\">Cancel switching</a> system packages to versions in repository %2</small></p>"
 msgstr "<p><small><a href=\"repoupgraderemove:///%1\">Avbryt bytte av</a> systempakker til versjonene i pakkebrønnen %2</small></p>"
 
-#: src/YQPackageSelector.cc:1473
+#: src/YQPackageSelector.cc:1474
 msgid "<p><a href=\"repoupgradeadd:///%1\">Switch system packages</a> to the versions in this repository (%2)</p>"
 msgstr "<p><a href=\"repoupgradeadd:///%1\">Bytt systempakker</a> til versjonene i denne pakkebrønnen (%2)</p>"
 
-#: src/YQPackageSelector.cc:1696
+#: src/YQPackageSelector.cc:1697
 msgid "Added Subpackages:"
 msgstr "Tilhørende pakker lagt til:"
 
 #. "OK" button
 #. addHStretch( hbox );
 #. "OK" button
-#: src/YQPackageSelector.cc:1698 src/YQPackageSelectorBase.cc:214
+#: src/YQPackageSelector.cc:1699 src/YQPackageSelectorBase.cc:214
 #: src/YQPkgDescriptionDialog.cc:120 src/YQPkgDiskUsageList.cc:156
 #: src/YQPkgDiskUsageList.cc:165 src/YQPkgProductDialog.cc:135
 #: src/YQPkgTextDialog.cc:71

Modified: trunk/yast/nb/po/qt.nb.po
===================================================================
--- trunk/yast/nb/po/qt.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/qt.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: packages-qt.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2009-10-08 12:57+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -68,7 +68,7 @@
 msgid "Stylesheet Editor"
 msgstr "Rediger stilark"
 
-#: src/YQApplication.cc:640
+#: src/YQApplication.cc:643
 msgid ""
 "You clicked the right mouse button where a left-click was expected.\n"
 "Switch left and right mouse buttons?"
@@ -77,7 +77,7 @@
 "Vil du bytte om venstre og høyre museknapp?"
 
 #. Popup dialog caption
-#: src/YQApplication.cc:653
+#: src/YQApplication.cc:656
 msgid "Unexpected Click"
 msgstr "Uventet klikk"
 

Modified: trunk/yast/nb/po/rdp.nb.po
===================================================================
--- trunk/yast/nb/po/rdp.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/rdp.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:41+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2002-06-17 14:33+0200\n"
 "Last-Translator: www.linuxbutikken.no <roy@bytek.no>\n"
 "Language-Team: Norwegian <i18n@suse.de>\n"

Modified: trunk/yast/nb/po/rear.nb.po
===================================================================
--- trunk/yast/nb/po/rear.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/rear.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:57+0100\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2002-06-17 14:33+0200\n"
 "Last-Translator: www.linuxbutikken.no <roy@bytek.no>\n"
 "Language-Team: Norwegian <i18n@suse.de>\n"

Modified: trunk/yast/nb/po/registration.nb.po
===================================================================
--- trunk/yast/nb/po/registration.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/registration.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: registration\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-08-15 15:56+0200\n"
 "PO-Revision-Date: 2009-10-10 09:51+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -24,53 +24,102 @@
 "X-Generator: Lokalize 1.0\n"
 
 #. popup heading (in bold)
-#: src/clients/discover_registration_services.rb:34
+#: src/clients/discover_registration_services.rb:35
 #, fuzzy
 #| msgid "Local Registration Server"
 msgid "Local Registration Servers"
 msgstr "Lokal registreringsserver"
 
-#: src/clients/discover_registration_services.rb:36
+#: src/clients/discover_registration_services.rb:37
 msgid ""
-"Select a server from the list or press Cancel\n"
-"to use the default SUSE registration server."
+"Select a detected registration server from the list\n"
+"or the default SUSE registration server."
 msgstr ""
 
 #. error popup
-#: src/clients/discover_registration_services.rb:64
+#: src/clients/discover_registration_services.rb:65
 #, fuzzy
 #| msgid "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:100
+#, fuzzy
+#| msgid "Novell Customer Center Configuration"
+msgid "SUSE Customer Center (%s)"
+msgstr "Oppsett for Novell kundesenter"
+
 #. popup message
-#: src/clients/inst_scc.rb:52
+#. popup message
+#: src/clients/inst_scc.rb:52 src/clients/scc_auto.rb:48
 #, fuzzy
 #| msgid "Local Registration Server"
 msgid "Contacting the Registration Server"
 msgstr "Lokal registreringsserver"
 
 #. reset the user input in case an exception is raised
-#. register the system
-#: src/clients/inst_scc.rb:134 src/clients/scc_auto.rb:164
+#. nil = use the default URL
+#: src/clients/inst_scc.rb:147 src/clients/scc_auto.rb:169
 msgid "Registering the System..."
 msgstr ""
 
 #. then register the product(s)
 #. %s is name of given product
-#: src/clients/inst_scc.rb:144 src/clients/inst_scc.rb:549
+#. register the base product
+#. %s is name of given product
+#: src/clients/inst_scc.rb:156 src/clients/inst_scc.rb:427
+#: src/clients/scc_auto.rb:177 src/clients/scc_auto.rb:192
 #, fuzzy
 #| msgid "Registration Code"
 msgid "Registering %s ..."
 msgstr "Registreringskode"
 
-#. TODO FIXME: still not the final text
+#. updating base product registration, %s is a new base product name
+#. updating registered addon/extension, %s is an extension name
+#: src/clients/inst_scc.rb:206 src/clients/inst_scc.rb:236
+#, fuzzy
+#| msgid "Updating /etc/hosts ..."
+msgid "Updating to %s ..."
+msgstr "Oppdaterer /etc/hosts..."
+
+#. display the registration update dialog
+#. dialog title
+#. dialog title
+#. Translators: Text for UI Label - capitalized
+#: src/clients/inst_scc.rb:260 src/clients/inst_scc.rb:352
+#: src/clients/inst_scc.rb:504 src/clients/inst_scc.rb:552
+#: src/lib/registration/ui/autoyast_config_dialog.rb:92
+#, fuzzy
+#| msgid "Registration Code"
+msgid "Registration"
+msgstr "Registreringskode"
+
+#: src/clients/inst_scc.rb:261
+#, fuzzy
+#| msgid "Registration code is missing."
+msgid "Registration is being updated..."
+msgstr "Registreringskode mangler."
+
+#: src/clients/inst_scc.rb:262
+#, fuzzy
+#| msgid "The software repositories have been updated."
+msgid "The previous registration is being updated."
+msgstr "Pakkebrønner er oppdatert."
+
+#. automatic registration refresh during system upgrade failed, register from scratch
+#: src/clients/inst_scc.rb:275
+msgid ""
+"Automatic registration upgrade failed.\n"
+"You can manually register the system from scratch."
+msgstr ""
+
 #. label text describing the registration (1/2)
 #. use \n to split to more lines if needed (use max. 76 chars/line)
-#: src/clients/inst_scc.rb:177
+#: src/clients/inst_scc.rb:289
 msgid ""
 "Please enter a registration or evaluation code for this product and your\n"
-"User Name/EMail from the SUSE Customer Center in the fields below.\n"
+"User Name/E-mail address from the SUSE Customer Center in the fields below.\n"
 "Access to security and general software updates is only possible on\n"
 "a registered system."
 msgstr ""
@@ -78,55 +127,59 @@
 #. label text describing the registration (2/2),
 #. not displayed in installed system
 #. use \n to split to more lines if needed (use max. 76 chars/line)
-#: src/clients/inst_scc.rb:189
-msgid "If you skip the registration now be sure to do so in the installed system."
+#: src/clients/inst_scc.rb:301
+msgid ""
+"If you skip product registration now, remember to register after\n"
+"installation has completed."
 msgstr ""
 
-#: src/clients/inst_scc.rb:196
+#: src/clients/inst_scc.rb:309
 #, fuzzy
 #| msgid "Novell Customer Center Configuration"
 msgid "Network Configuration..."
 msgstr "Oppsett for Novell kundesenter"
 
-#. make sure to revert the change if something goes wrong
-#: src/clients/inst_scc.rb:205 src/clients/inst_scc.rb:633
+#: src/clients/inst_scc.rb:318 src/clients/inst_scc.rb:491
 msgid "The system is already registered."
 msgstr ""
 
-#: src/clients/inst_scc.rb:212 src/clients/scc_auto.rb:373
-msgid "&Email"
-msgstr ""
+#: src/clients/inst_scc.rb:325
+#: src/lib/registration/ui/autoyast_config_dialog.rb:94
+#, fuzzy
+#| msgid "Email Address"
+msgid "&E-mail Address"
+msgstr "E-postadresse"
 
-#: src/clients/inst_scc.rb:214 src/clients/scc_auto.rb:239
-#: src/clients/scc_auto.rb:375
+#. handle nil specifically, it cannot be stored in XML profile
+#: src/clients/inst_scc.rb:327
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:167
+#: src/lib/registration/ui/autoyast_config_dialog.rb:96
 #, fuzzy
 #| msgid "Registration Code"
 msgid "Registration &Code"
 msgstr "Registreringskode"
 
-#: src/clients/inst_scc.rb:218
+#. button label
+#: src/clients/inst_scc.rb:332
 #, fuzzy
+#| msgid "Local Registration Server"
+msgid "&Local Registration Server..."
+msgstr "Lokal registreringsserver"
+
+#. button label
+#: src/clients/inst_scc.rb:335
+#, fuzzy
 #| msgid "Registration"
 msgid "&Skip Registration"
 msgstr "Registrering"
 
-#. TODO: improve the help text
-#: src/clients/inst_scc.rb:226
-msgid "Enter SUSE Customer Center credentials here to register the system to get updates and add-on products."
+#. help text
+#: src/clients/inst_scc.rb:343
+msgid "Enter SUSE Customer Center credentials here to register the system to get updates and extensions."
 msgstr ""
 
-#. dialog title
-#. dialog title
-#. Translators: Text for UI Label - capitalized
-#: src/clients/inst_scc.rb:234 src/clients/inst_scc.rb:646
-#: src/clients/scc_auto.rb:371
-#, fuzzy
-#| msgid "Registration Code"
-msgid "Registration"
-msgstr "Registreringskode"
-
 #. not set yet?
-#: src/clients/inst_scc.rb:259
+#: src/clients/inst_scc.rb:377
 msgid ""
 "Registration added some update repositories.\n"
 "\n"
@@ -134,59 +187,31 @@
 "on-line updates during installation?"
 msgstr ""
 
-#. use two column layout if needed
-#: src/clients/inst_scc.rb:312
-msgid "Available Extensions and Modules"
-msgstr ""
-
-#: src/clients/inst_scc.rb:317
+#. cache the available addons
+#. create a new dialog for accepting and importing a SSL certificate and run it
+#: src/clients/inst_scc.rb:406
+#: src/lib/registration/ui/autoyast_config_workflow.rb:101
 #, fuzzy
-#| msgid "Details..."
-msgid "Details"
-msgstr "Detaljer..."
+#| msgid "Registration Module Help"
+msgid "Loading Available Extensions and Modules..."
+msgstr "Hjelp for registreringsmodul"
 
-#: src/clients/inst_scc.rb:320
-msgid "Select an extension or a module to show details here"
-msgstr ""
-
-#. popup message, %s are product names
-#: src/clients/inst_scc.rb:343
-msgid ""
-"Automatically selecting '%s'\n"
-"dependencies:\n"
-"\n"
-"%s"
-msgstr ""
-
-#. check the addons requiring a reg. code
-#: src/clients/inst_scc.rb:358
-msgid "YaST allows to select at most %s addons."
-msgstr ""
-
 #. dialog title
-#: src/clients/inst_scc.rb:411
-msgid "Extension Selection"
-msgstr ""
-
-#. cache the available addons
-#: src/clients/inst_scc.rb:485
-msgid "Loading Available Add-on Products and Extensions..."
-msgstr ""
-
-#. dialog title
-#: src/clients/inst_scc.rb:582
+#: src/clients/inst_scc.rb:458
 #, fuzzy
 #| msgid "Registration Module Help"
 msgid "Register Extensions and Modules"
 msgstr "Hjelp for registreringsmodul"
 
-#. dialog title
-#: src/clients/inst_scc.rb:595
-msgid "Extension and Module Registration Codes"
-msgstr ""
+#. help text
+#: src/clients/inst_scc.rb:462
+#, fuzzy
+#| msgid "<p>Please wait, while volumes are being detected.</p>"
+msgid "<p>Extensions and Modules are being registered.</p>"
+msgstr "<p>Vent mens volumene registreres.</p>"
 
 #. Popup question: confirm skipping the registration
-#: src/clients/inst_scc.rb:610
+#: src/clients/inst_scc.rb:480
 msgid ""
 "If you do not register your system we will not be able\n"
 "to grant you access to the update repositories.\n"
@@ -198,323 +223,425 @@
 msgstr ""
 
 #. button label
-#: src/clients/inst_scc.rb:636
+#: src/clients/inst_scc.rb:494
 #, fuzzy
 #| msgid "Register Later"
 msgid "Register Again"
 msgstr "Registrer deg senere"
 
 #. button label
-#: src/clients/inst_scc.rb:639
+#: src/clients/inst_scc.rb:497
 msgid "Select Extensions"
 msgstr ""
 
+#. help text
+#: src/clients/inst_scc.rb:507
+#, fuzzy
+#| msgid "<p>Your system is ready for use.</p>"
+msgid "<p>The system is already registered.</p>"
+msgstr "<p>Systemet er klart til bruk.</p>"
+
+#: src/clients/inst_scc.rb:508
+msgid "<p>You can re-register it again or you can register additional extension or modules to enhance the functionality of the system.</p>"
+msgstr ""
+
+#: src/clients/inst_scc.rb:510
+msgid "<p>If you want to deregister your system you need to log into the SUSE Customer Center and remove the system manually there.</p>"
+msgstr ""
+
 #. error message
-#: src/clients/inst_scc.rb:672
+#: src/clients/inst_scc.rb:534
 msgid ""
 "The base product was not found,\n"
 "check your system."
 msgstr ""
 
-#. Command line help text for the repository module, %1 is "SUSEconnect"
-#: src/clients/scc.rb:42
-msgid "Use '%s' instead of this YaST module."
+#. TRANSLATORS: %s = bugzilla URL
+#: src/clients/inst_scc.rb:538
+msgid ""
+"The installation medium or the installer itself is seriously broken.\n"
+"Report a bug at %s."
 msgstr ""
 
-#: src/clients/scc_auto.rb:165 src/clients/scc_auto.rb:174
-#: src/clients/scc_auto.rb:194
-msgid "Contacting the SUSE Customer Center server"
+#: src/clients/inst_scc.rb:541
+msgid ""
+"Make sure a product is installed and /etc/products.d/baseproduct\n"
+"is a symlink pointing to the base product .prod file."
 msgstr ""
 
-#. register the base product
-#. register addons
-#: src/clients/scc_auto.rb:173 src/clients/scc_auto.rb:193
-#, fuzzy
-#| msgid "Registration Code"
-msgid "Registering Product..."
-msgid_plural "Registering Products..."
-msgstr[0] "Registreringskode"
-msgstr[1] "Registreringskode"
+#. Command line help text for the repository module, %1 is "SUSEconnect"
+#: src/clients/scc.rb:44
+msgid "Use '%s' instead of this YaST module."
+msgstr ""
 
 #. popup message: registration finished properly
-#: src/clients/scc_auto.rb:213
+#: src/clients/scc_auto.rb:208
 #, fuzzy
 #| msgid "Registration was successful."
 msgid "Registration was successfull."
 msgstr "Registreringen er fullført."
 
-#. ---------------------------------------------------------
-#: src/clients/scc_auto.rb:238
-msgid "Add-on &Name"
+#. remove possible duplicates
+#: src/clients/scc_auto.rb:243
+msgid "SLP discovery failed, no server found"
 msgstr ""
 
-#: src/clients/scc_auto.rb:267
-msgid "Really delete add-on '%s'?"
-msgstr ""
-
-#: src/clients/scc_auto.rb:301
-msgid "Name"
-msgstr ""
-
-#: src/clients/scc_auto.rb:301
+#. more than one server found: let the user select, we cannot automatically
+#. decide which one to use, asking user in AutoYast mode is not nice
+#. but better than aborting the installation...
+#: src/clients/scc_auto.rb:259
 #, fuzzy
-#| msgid "Registration Code"
-msgid "Registration Code"
-msgstr "Registreringskode"
+#| msgid "Download CA Certificate"
+msgid "Downloading SSL Certificate"
+msgstr "Last ned CA-sertifikat"
 
-#. TODO FIXME: add a help text
-#: src/clients/scc_auto.rb:312
+#: src/clients/scc_auto.rb:263
 #, fuzzy
-#| msgid "Registration failed."
-msgid "Register Optional Add-ons"
-msgstr "Registreringen mislyktes."
+#| msgid "Import Certificate"
+msgid "Importing SSL Certificate"
+msgstr "Importerer sertifikat"
 
-#: src/clients/scc_auto.rb:349
+#. display the extension selection dialog and wait for a button click
+#. @return [Symbol] user input (:import, :cancel)
+#: src/data/registration/autoyast_summary.erb:5
+#: src/lib/registration/ui/autoyast_config_dialog.rb:49
 msgid "Product Registration"
 msgstr "Produktregistrering"
 
-#: src/clients/scc_auto.rb:351
+#: src/data/registration/autoyast_summary.erb:9
 #, fuzzy
-#| msgid "<p>Product registration includes your product in Novell's database, enabling you to get online updates and technical support. To register while installing automatically, select <b>Run Product Registration</b>. To simplify the procedure, include information from your system with <b>Hardware Profile</b> and <b>Optional Information</b>.</p>"
-msgid ""
-"<p>Product registration includes your product in SUSE Customer Center database,\n"
-"enabling you to get online updates and technical support.\n"
-"To register while installing automatically, select <b>Run Product Registration</b>.</p>"
-msgstr "<p>Produktregistreringen legger til ditt produkt i Novells database, slik at du har tilgang til online-oppdateringer og teknisk støtte. Velg <b>Kjør produktregistrering</b> for å registrere produktet automatisk under installasjonen. For å forenkle prosessen kan du ta med informasjon om systemet med <b>Maskinvareprofil</b> og <b>Tilleggsnformasjon</b>.</p>"
+#| msgid "Run during autoinstallation"
+msgid "Run registration during autoinstallation"
+msgstr "Kjør under autoinstallasjon"
 
-#: src/clients/scc_auto.rb:356
+#: src/data/registration/autoyast_summary.erb:10
 #, fuzzy
-#| msgid ""
-#| "<p>If your network deploys a custom SMT server, set the URL of the SMT Server\n"
-#| "and the location of the SMT certificate in <b>SMT Server Settings</b>. Refer\n"
-#| "to your SMT manual for further assistance.</p>"
-msgid ""
-"<p>If your network deploys a custom registration server, set the correct URL of the server\n"
-"and the location of the SMT certificate in <b>SMT Server Settings</b>. Refer\n"
-"to your SMT manual for further assistance.</p>"
+#| msgid "Do not run during autoinstallation"
+msgid "Skip registration during autoinstallation"
+msgstr "Ikke kjør under autoinstallasjon"
+
+#: src/data/registration/autoyast_summary.erb:15
+#, fuzzy
+#| msgid "Registration Status"
+msgid "Registration Settings"
+msgstr "Registreringsstatus"
+
+#: src/data/registration/autoyast_summary.erb:17
+#, fuzzy
+#| msgid "Email Address"
+msgid "E-mail Address: %s"
+msgstr "E-postadresse"
+
+#: src/data/registration/autoyast_summary.erb:19
+#, fuzzy
+#| msgid "Registration code is missing."
+msgid "Registration Code is Configured"
+msgstr "Registreringskode mangler."
+
+#: src/data/registration/autoyast_summary.erb:23
+#, fuzzy
+#| msgid "Installed (Available)"
+msgid "Install Available Updates"
+msgstr "Installert (tilgjengelig)"
+
+#: src/data/registration/autoyast_summary.erb:27
+#, fuzzy
+#| msgid "Registration server:"
+msgid "Registration Server"
+msgstr "Registreringsserver:"
+
+#: src/data/registration/autoyast_summary.erb:30
+#: src/data/registration/autoyast_summary.erb:32
+#, fuzzy
+#| msgid "Server URL: "
+msgid "Server URL: %s"
+msgstr "Tjeneradresse: "
+
+#: src/data/registration/autoyast_summary.erb:32
+#, fuzzy
+#| msgid "Discovery"
+msgid "Use SLP discovery"
+msgstr "Søk"
+
+#: src/data/registration/autoyast_summary.erb:36
+#, fuzzy
+#| msgid "As Server Certificate"
+msgid "SSL Server Certificate URL: %s"
+msgstr "Som serversertifikat"
+
+#: src/data/registration/autoyast_summary.erb:40
+#, fuzzy
+#| msgid "Certificate File: \""
+msgid "SSL Certificate Fingerprint: %s"
+msgstr "Sertifikatfil: \""
+
+#: src/data/registration/autoyast_summary.erb:48
+#, fuzzy
+#| msgid "Registration Module Help"
+msgid "Extensions and Modules"
+msgstr "Hjelp for registreringsmodul"
+
+#: src/data/registration/certificate_error.erb:6
+#, fuzzy
+#| msgid "Secure Connection"
+msgid "Secure Connection Error"
+msgstr "Sikker forbindelse"
+
+#: src/data/registration/certificate_error.erb:10
+msgid "Details:"
+msgstr "Detaljer:"
+
+#: src/data/registration/certificate_error.erb:14
+#, fuzzy
+#| msgid "Select Certificate File"
+msgid "Failed Certificate Details"
+msgstr "Velg sertifikatfil"
+
+#: src/data/registration/certificate_summary.erb:4
+#: src/lib/registration/ssl_certificate_details.rb:35
+msgid "Issued To"
 msgstr ""
-"<p>Hvis det finnes en egen SMT server på nettverket, angi adressen til SMT-serveren\n"
-"og plasseringen til SMT-sertifikatet under <b>Innstillinger for SMT-server</b>.\n"
-"SMT-veiledningen inneholder mer informasjon.</p>"
 
-#: src/clients/scc_auto.rb:364
+#. label followed by the SSL certificate identification
+#: src/data/registration/certificate_summary.erb:7
+#: src/data/registration/certificate_summary.erb:16
+#: src/lib/registration/ssl_certificate_details.rb:61
+msgid "Common Name (CN): "
+msgstr ""
+
+#. label followed by the SSL certificate identification
+#: src/data/registration/certificate_summary.erb:8
+#: src/data/registration/certificate_summary.erb:17
+#: src/lib/registration/ssl_certificate_details.rb:63
+msgid "Organization (O): "
+msgstr ""
+
+#. label followed by the SSL certificate identification
+#: src/data/registration/certificate_summary.erb:9
+#: src/data/registration/certificate_summary.erb:18
+#: src/lib/registration/ssl_certificate_details.rb:65
+msgid "Organization Unit (OU): "
+msgstr ""
+
+#: src/data/registration/certificate_summary.erb:13
+#: src/lib/registration/ssl_certificate_details.rb:36
+msgid "Issued By"
+msgstr ""
+
+#: src/data/registration/certificate_summary.erb:22
 #, fuzzy
-#| msgid "Registration Code"
-msgid "Register the Product"
-msgstr "Registreringskode"
+#| msgid "Valid"
+msgid "Validity"
+msgstr "Gyldig"
 
-#: src/clients/scc_auto.rb:379
-msgid "Install Available Patches from Update Repositories"
+#: src/data/registration/certificate_summary.erb:26
+msgid "Issued On: "
 msgstr ""
 
-#. Translators: Text for UI Label - capitalized
-#: src/clients/scc_auto.rb:387
+#: src/data/registration/certificate_summary.erb:29
 #, fuzzy
-#| msgid "SMT Server Settings"
-msgid "Server Settings"
-msgstr "Innstillinger for SMT-server"
+#| msgid "The certificate is not yet expired.\n"
+msgid "WARNING: The certificate is not valid yet!"
+msgstr "Sertifikatet er ikke utløpt ennå.\n"
 
-#: src/clients/scc_auto.rb:391
+#: src/data/registration/certificate_summary.erb:32
 #, fuzzy
-#| msgid "Local Registration Server"
-msgid "Find Registration Server Using SLP Discovery"
-msgstr "Lokal registreringsserver"
+#| msgid "Expires: "
+msgid "Expires On: "
+msgstr "Utløper:"
 
-#. Translators: Text for UI Label - capitalized
-#: src/clients/scc_auto.rb:396
-msgid "Use Specific Server URL Instead of the Default"
-msgstr ""
+#: src/data/registration/certificate_summary.erb:35
+#, fuzzy
+#| msgid "The certificate is not yet expired.\n"
+msgid "WARNING: The certificate has expired!"
+msgstr "Sertifikatet er ikke utløpt ennå.\n"
 
-#. Translators: Text for UI Label - capitalized
-#: src/clients/scc_auto.rb:403
+#: src/data/registration/certificate_summary.erb:43
 #, fuzzy
-#| msgid "Server CA certificate:"
-msgid "Optional Server Certificate"
-msgstr "Serverens CA-sertifikat:"
+#| msgid "If &Serial Number is Known"
+msgid "Serial Number: "
+msgstr "Hvis &serienummeret er kjent"
 
-#: src/clients/scc_auto.rb:421
+#: src/data/registration/certificate_summary.erb:44
+#: src/lib/registration/ssl_certificate_details.rb:36
 #, fuzzy
-#| msgid "Registration Code"
-msgid "Register Add-ons..."
-msgstr "Registreringskode"
+#| msgid "Fingerprint: "
+msgid "SHA1 Fingerprint: "
+msgstr "Fingeravtrykk:"
 
-#. remove possible duplicates
-#: src/clients/scc_auto.rb:478
-msgid "SLP discovery failed, no server found"
-msgstr ""
+#: src/data/registration/certificate_summary.erb:46
+#: src/lib/registration/ssl_certificate_details.rb:38
+#, fuzzy
+#| msgid "Fingerprint: "
+msgid "SHA256 Fingerprint: "
+msgstr "Fingeravtrykk:"
 
 #. Error popup
-#: src/lib/registration/connect_helpers.rb:65
+#: src/lib/registration/connect_helpers.rb:71
 msgid ""
 "Network is not configured, the registration server cannot be reached.\n"
 "Do you want to configure the network now?"
 msgstr ""
 
-#: src/lib/registration/connect_helpers.rb:71
+#: src/lib/registration/connect_helpers.rb:77
 msgid "Network error, check the network configuration."
 msgstr ""
 
 #. Error popup
-#: src/lib/registration/connect_helpers.rb:76
+#: src/lib/registration/connect_helpers.rb:82
 msgid "Connection time out."
 msgstr ""
 
-#. Error popup
-#: src/lib/registration/connect_helpers.rb:83
+#. TRANSLATORS: additional hint for an error message
+#: src/lib/registration/connect_helpers.rb:90
 #, fuzzy
 #| msgid "Registration code is invalid."
-msgid ""
-"The email address is not known or\n"
-"the registration code is not valid."
+msgid "Check that this system is known to the registration server."
 msgstr "Registreringskoden er ugyldig."
 
-#: src/lib/registration/connect_helpers.rb:85
+#. TRANSLATORS: additional hint for an error message
+#: src/lib/registration/connect_helpers.rb:96
+msgid ""
+"If you are upgrading from SLE11 make sure the SCC server\n"
+"knows the old NCC registration. Synchronization from NCC to SCC\n"
+"might take very long time.\n"
+"\n"
+"If the SLE11 system was installed recently you could log into\n"
+"%s to speed up the synchronization process.\n"
+"Just wait several minutes after logging in and then retry \n"
+"the upgrade again."
+msgstr ""
+
+#. add the hint to the error details
+#. Error popup
+#: src/lib/registration/connect_helpers.rb:110
+#: src/lib/registration/connect_helpers.rb:113
+#: src/lib/registration/connect_helpers.rb:119
+#: src/lib/registration/connect_helpers.rb:167
+msgid "Registration failed."
+msgstr "Registreringen mislyktes."
+
+#: src/lib/registration/connect_helpers.rb:115
 #, fuzzy
 #| msgid "Registration can not be performed."
 msgid "Registration client error."
 msgstr "Registreringen kan ikke utføres."
 
-#: src/lib/registration/connect_helpers.rb:87
+#: src/lib/registration/connect_helpers.rb:117
 msgid ""
 "Registration server error.\n"
 "Retry registration later."
 msgstr ""
 
-#: src/lib/registration/connect_helpers.rb:89
-#: src/lib/registration/connect_helpers.rb:125
-msgid "Registration failed."
-msgstr "Registreringen mislyktes."
-
-#. try to use a translatable message first, if not found then use
-#. the original error message from openSSL
-#: src/lib/registration/connect_helpers.rb:118
-msgid "Secure connection error: %s"
+#. error message
+#: src/lib/registration/connect_helpers.rb:158
+msgid "Received SSL Certificate does not match the expected certificate."
 msgstr ""
 
 #. %s are error details
-#: src/lib/registration/connect_helpers.rb:142
+#: src/lib/registration/connect_helpers.rb:184
 #, fuzzy
 #| msgid "Details..."
 msgid "Details: %s"
 msgstr "Detaljer..."
 
-#. label follwed by a certificate description
-#: src/lib/registration/connect_helpers.rb:147
-#, fuzzy
-#| msgid "SMT Certificate"
-msgid "Certificate:"
-msgstr "SMT-sertifikat"
+#. progress label
+#: src/lib/registration/connect_helpers.rb:209
+msgid "Importing the SSL certificate"
+msgstr ""
 
-#: src/lib/registration/connect_helpers.rb:151
-msgid "Issued To"
+#: src/lib/registration/connect_helpers.rb:210
+msgid "Importing '%s' certificate..."
 msgstr ""
 
-#: src/lib/registration/connect_helpers.rb:154
-msgid "Issued By"
+#. try to use a translatable message first, if not found then use
+#. the original error message from openSSL
+#: src/lib/registration/connect_helpers.rb:228
+msgid "Secure connection error: %s"
 msgstr ""
 
-#: src/lib/registration/connect_helpers.rb:157
+#. progress step title
+#: src/lib/registration/finish_dialog.rb:34
 #, fuzzy
-#| msgid "Fingerprint: "
-msgid "SHA1 Fingerprint: "
-msgstr "Fingeravtrykk:"
+#| msgid "Saving Remote Administration Configuration"
+msgid "Storing Registration Configuration..."
+msgstr "Lagrer oppsett av ekstern administrasjon"
 
-#: src/lib/registration/connect_helpers.rb:159
+#. this is just a placeholder for texts which will/might be needed after the text freeze
+#. TODO FIXME: remove this file before GM!
+#: src/lib/registration/new_messages.rb:8
 #, fuzzy
-#| msgid "Fingerprint: "
-msgid "SHA256 Fingerprint: "
-msgstr "Fingeravtrykk:"
+#| msgid "SMT Certificate"
+msgid "SSL Certificate"
+msgstr "SMT-sertifikat"
 
-#. label followed by the SSL certificate identification
-#: src/lib/registration/connect_helpers.rb:176
-msgid "Common Name (CN): "
+#. checkbox: use SLP discovery later again in the installed system
+#: src/lib/registration/new_messages.rb:10
+msgid "Use SLP Discovery Also Later in Installed System"
 msgstr ""
 
-#. label followed by the SSL certificate identification
-#: src/lib/registration/connect_helpers.rb:178
-msgid "Organization (O): "
-msgstr ""
-
-#. label followed by the SSL certificate identification
-#: src/lib/registration/connect_helpers.rb:180
-msgid "Organization Unit (OU): "
-msgstr ""
-
-#. progress label
-#: src/lib/registration/connect_helpers.rb:194
-msgid "Importing the SSL certificate"
-msgstr ""
-
-#: src/lib/registration/connect_helpers.rb:195
-msgid "Importing '%s' certificate..."
-msgstr ""
-
-#. return the boot command line parameter
-#: src/lib/registration/helpers.rb:218
+#. indent size used in summary text
+#: src/lib/registration/ssl_certificate_details.rb:35
 #, fuzzy
-#| msgid "Checking..."
-msgid "Searching..."
-msgstr "Kontrollerer..."
+#| msgid "SMT Certificate"
+msgid "Certificate:"
+msgstr "SMT-sertifikat"
 
-#: src/lib/registration/helpers.rb:218
-#, fuzzy
-#| msgid "Use local registration server"
-msgid "Looking up local registration servers..."
-msgstr "Bruk lokal registreringsserver"
-
 #. create UI label for a base product
 #. @param [Hash] Product (hash from pkg-bindings)
 #. @return [String] UI Label
-#: src/lib/registration/sw_mgmt.rb:108
+#: src/lib/registration/sw_mgmt.rb:119
 #, fuzzy
 #| msgid "Unknown error"
 msgid "Unknown product"
 msgstr "Ukjent feil"
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:139
+#: src/lib/registration/sw_mgmt.rb:152
 #, fuzzy
 #| msgid "Starting registration..."
 msgid "Saving repository configuration failed."
 msgstr "Starter registrering..."
 
 #. # error message
-#: src/lib/registration/sw_mgmt.rb:176
+#. error message
+#: src/lib/registration/sw_mgmt.rb:190 src/lib/registration/sw_mgmt.rb:201
 msgid "Updating service '%s' failed."
 msgstr ""
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:182
+#: src/lib/registration/sw_mgmt.rb:196
 msgid "Adding service '%s' failed."
 msgstr ""
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:189
+#: src/lib/registration/sw_mgmt.rb:208
 msgid "Saving service '%s' failed."
 msgstr ""
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:194
+#: src/lib/registration/sw_mgmt.rb:213
 msgid "Refreshing service '%s' failed."
 msgstr ""
 
 #. dialog title
-#: src/lib/registration/ui/addon_eula_dialog.rb:37
+#: src/lib/registration/ui/addon_eula_dialog.rb:40
 msgid "License Agreement"
-msgstr ""
+msgstr "Lisensavtale"
 
-#: src/lib/registration/ui/addon_eula_dialog.rb:38
+#: src/lib/registration/ui/addon_eula_dialog.rb:41
 msgid "Downloading Licenses..."
 msgstr ""
 
-#. go back if any EULA has not been accepted, let the user deselect the
-#. not accepted extension
-#: src/lib/registration/ui/addon_eula_dialog.rb:65
+#. ask user to accept an addon EULA
+#. @param addon [SUSE::Connect::Product] the addon
+#. @return [Symbol] :accepted, :back, :abort, :halt
+#: src/lib/registration/ui/addon_eula_dialog.rb:73
 msgid "Downloading License Agreement..."
 msgstr ""
 
 #. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit"
-#: src/lib/registration/ui/addon_eula_dialog.rb:77
+#: src/lib/registration/ui/addon_eula_dialog.rb:85
 #, fuzzy
 #| msgid "Downloading SMT certificate file failed"
 msgid ""
@@ -523,64 +650,340 @@
 "failed."
 msgstr "Nedlasting av SMT-sertifikatfilen mislyktes"
 
+#. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit"
+#: src/lib/registration/ui/addon_eula_dialog.rb:94
+msgid "%s License Agreement"
+msgstr ""
+
 #. dialog title
-#: src/lib/registration/ui/addon_eula_dialog.rb:93
-msgid "Extension and Module License Agreement"
+#: src/lib/registration/ui/addon_reg_codes_dialog.rb:37
+msgid "Extension and Module Registration Codes"
 msgstr ""
 
-#. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit"
-#: src/lib/registration/ui/addon_eula_dialog.rb:95
-msgid "%s License Agreement"
+#. help text
+#: src/lib/registration/ui/addon_reg_codes_dialog.rb:41
+msgid ""
+"<p>Enter registration codes for the requested extensions or modules.</p>\n"
+"<p>Registration codes are required for successfull registration.If you cannot provide a registration code then go back and deselect the respective extension or module.</p>"
 msgstr ""
 
+#. round the half up (more items in the first column for odd number of items)
+#: src/lib/registration/ui/addon_reg_codes_dialog.rb:87
+msgid "The extension you selected needs a separate registration code."
+msgid_plural "The extensions you selected need separate registration codes."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/lib/registration/ui/addon_reg_codes_dialog.rb:92
+#, fuzzy
+#| msgid "Enter the registration data."
+msgid "Enter the registration code into the field below."
+msgid_plural "Enter the registration codes into the fields below."
+msgstr[0] "Legg inn registreringsinformasjon."
+msgstr[1] "Legg inn registreringsinformasjon."
+
+#. dialog title
+#: src/lib/registration/ui/addon_selection_dialog.rb:39
+#, fuzzy
+#| msgid "Registration Module Help"
+msgid "Extension and Module Selection"
+msgstr "Hjelp for registreringsmodul"
+
+#. help text (1/3)
+#: src/lib/registration/ui/addon_selection_dialog.rb:42
+#, fuzzy
+#| msgid "<p>Here you can see all of the add-on products which are installed on your system.</p>"
+msgid "<p>Here you can select available extensions and modules for yoursystem.</p>"
+msgstr "<p>Her kan du vise alle tilleggsprodukter som er installert på systemet.</p>"
+
+#. help text (2/3)
+#: src/lib/registration/ui/addon_selection_dialog.rb:45
+msgid "<p>Please note, that some extensions or modules might need specific registration code.</p>"
+msgstr ""
+
+#. help text (3/3)
+#: src/lib/registration/ui/addon_selection_dialog.rb:48
+msgid "<p>If you want to remove any extension or module you need to loginto the SUSE Customer Center and remove them manually there.</p>"
+msgstr ""
+
+#. always enable Back/Next, the dialog cannot be the first in workflow
+#: src/lib/registration/ui/addon_selection_dialog.rb:67
+msgid "Available Extensions and Modules"
+msgstr ""
+
+#: src/lib/registration/ui/addon_selection_dialog.rb:69
+#, fuzzy
+#| msgid "Details..."
+msgid "Details"
+msgstr "Detaljer..."
+
+#: src/lib/registration/ui/addon_selection_dialog.rb:72
+msgid "Select an extension or a module to show details here"
+msgstr ""
+
+#. checkbox label for an unavailable extension
+#. (%s is an extension name)
+#: src/lib/registration/ui/addon_selection_dialog.rb:131
+#, fuzzy
+#| msgid "is not available"
+msgid "%s (not available)"
+msgstr "er ikke tilgjengelig"
+
+#. check the addons requiring a reg. code
+#: src/lib/registration/ui/addon_selection_dialog.rb:212
+msgid "YaST allows to select at most %s extensions or modules."
+msgstr ""
+
+#. help text
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:33
+msgid "<p>Here you can select which extensions or moduleswill be registered together with the base product.</p>"
+msgstr ""
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:36
+#, fuzzy
+#| msgid "Registration Module Help"
+msgid "Register Optional Extensions or Modules"
+msgstr "Hjelp for registreringsmodul"
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:50
+msgid "Identifier"
+msgstr "Identifikator"
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:51
+msgid "Version"
+msgstr "Versjon"
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:52
+msgid "Architecture"
+msgstr "Arkitektur"
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:53
+#, fuzzy
+#| msgid "Rule Type"
+msgid "Release Type"
+msgstr "Regeltype"
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:54
+#, fuzzy
+#| msgid "Registration Code"
+msgid "Registration Code"
+msgstr "Registreringskode"
+
+#. button label
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:65
+#, fuzzy
+#| msgid "Downloading %1 extension..."
+msgid "Download Available Extensions..."
+msgstr "Laster ned %1-utvidelse..."
+
+#. disable download on a non-registered system
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:119
+#, fuzzy
+#| msgid "Really delete '%1'?"
+msgid "Really delete '%s'?"
+msgstr "Vil du virkelig slette '%1'?"
+
+#. replace the content
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:161
+#, fuzzy
+#| msgid "Vendor Identifier"
+msgid "Extension or Module &Identifier"
+msgstr "Produsentidentifikasjon"
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:162
+msgid "&Version"
+msgstr "&Versjon"
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:163
+msgid "&Architecture"
+msgstr "&Arkitektur"
+
+#: src/lib/registration/ui/autoyast_addon_dialog.rb:164
+#, fuzzy
+#| msgid "&Release"
+msgid "&Release Type"
+msgstr "Ve&rsjon"
+
+#: src/lib/registration/ui/autoyast_config_dialog.rb:51
+#, fuzzy
+#| msgid "<p>Product registration includes your product in Novell's database, enabling you to get online updates and technical support. To register while installing automatically, select <b>Run Product Registration</b>. To simplify the procedure, include information from your system with <b>Hardware Profile</b> and <b>Optional Information</b>.</p>"
+msgid ""
+"<p>Product registration includes your product in SUSE Customer Center database,\n"
+"enabling you to get online updates and technical support.\n"
+"To register while installing automatically, select <b>Run Product Registration</b>.</p>"
+msgstr "<p>Produktregistreringen legger til ditt produkt i Novells database, slik at du har tilgang til online-oppdateringer og teknisk støtte. Velg <b>Kjør produktregistrering</b> for å registrere produktet automatisk under installasjonen. For å forenkle prosessen kan du ta med informasjon om systemet med <b>Maskinvareprofil</b> og <b>Tilleggsnformasjon</b>.</p>"
+
+#: src/lib/registration/ui/autoyast_config_dialog.rb:56
+#, fuzzy
+#| msgid ""
+#| "<p>If your network deploys a custom SMT server, set the URL of the SMT Server\n"
+#| "and the location of the SMT certificate in <b>SMT Server Settings</b>. Refer\n"
+#| "to your SMT manual for further assistance.</p>"
+msgid ""
+"<p>If your network deploys a custom registration server, set the correct URL of the server\n"
+"and the location of the SMT certificate in <b>SMT Server Settings</b>. Refer\n"
+"to your SMT manual for further assistance.</p>"
+msgstr ""
+"<p>Hvis det finnes en egen SMT server på nettverket, angi adressen til SMT-serveren\n"
+"og plasseringen til SMT-sertifikatet under <b>Innstillinger for SMT-server</b>.\n"
+"SMT-veiledningen inneholder mer informasjon.</p>"
+
+#. FIXME the dialog should be created by external code before calling this
+#: src/lib/registration/ui/autoyast_config_dialog.rb:83
+#, fuzzy
+#| msgid "Registration Code"
+msgid "Register the Product"
+msgstr "Registreringskode"
+
+#: src/lib/registration/ui/autoyast_config_dialog.rb:100
+#, fuzzy
+#| msgid "Initializing Available Repositories"
+msgid "Install Available Updates from Update Repositories"
+msgstr "Initialiserer tilgjengelige pakkebrønner"
+
+#. Translators: Text for UI Label - capitalized
+#: src/lib/registration/ui/autoyast_config_dialog.rb:114
+#, fuzzy
+#| msgid "SMT Server Settings"
+msgid "Server Settings"
+msgstr "Innstillinger for SMT-server"
+
+#: src/lib/registration/ui/autoyast_config_dialog.rb:118
+#, 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:123
+msgid "Use Specific Server URL Instead of the Default"
+msgstr ""
+
+#. Translators: Text for UI Label - capitalized
+#: src/lib/registration/ui/autoyast_config_dialog.rb:130
+#, fuzzy
+#| msgid "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:139
+#, fuzzy
+#| msgid "Server CA certificate:"
+msgid "Optional SSL Server Certificate Fingerprint"
+msgstr "Serverens CA-sertifikat:"
+
+#: src/lib/registration/ui/autoyast_config_dialog.rb:141
+msgid "none"
+msgstr "ingen"
+
+#. Translators: Text for UI Label - capitalized
+#: src/lib/registration/ui/autoyast_config_dialog.rb:152
+#, fuzzy
+#| msgid "CA Certificate File"
+msgid "SSL Certificate Fingerprint"
+msgstr "CA-sertifikatfil"
+
+#: src/lib/registration/ui/autoyast_config_dialog.rb:173
+#, fuzzy
+#| msgid "Registration Module Help"
+msgid "Register Extensions or Modules..."
+msgstr "Hjelp for registreringsmodul"
+
 #. SSL error message
-#: src/lib/registration/ui/import_certificate_dialog.rb:26
+#: src/lib/registration/ui/import_certificate_dialog.rb:25
 #, fuzzy
+#| msgid "Certificate has been imported."
+msgid "Certificate has expired"
+msgstr "Sertifikatet er importert."
+
+#. SSL error message
+#: src/lib/registration/ui/import_certificate_dialog.rb:27
+#, fuzzy
 #| msgid "Server CA certificate:"
 msgid "Self signed certificate"
 msgstr "Serverens CA-sertifikat:"
 
 #. SSL error message
-#: src/lib/registration/ui/import_certificate_dialog.rb:28
+#: src/lib/registration/ui/import_certificate_dialog.rb:29
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
 #. push button
-#: src/lib/registration/ui/import_certificate_dialog.rb:95
+#: src/lib/registration/ui/import_certificate_dialog.rb:90
 msgid "&Trust and Import"
 msgstr ""
 
 #. help text (RichText) for importing a SSL certificate (1/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:124
+#: src/lib/registration/ui/import_certificate_dialog.rb:118
 msgid "<p>Secure connection (HTTPS) uses SSL certificates for verifying the authenticity of the server and for encrypting the transferred data.</p>"
 msgstr ""
 
 #. help text (RichText) for importing a SSL certificate (2/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:128
+#: src/lib/registration/ui/import_certificate_dialog.rb:122
 msgid "<p>You can choose to import the certificate it into the list of known certificate autohorities (CA), meaning that you trust the subject and the issuer of the unknown certificate.</p>"
 msgstr ""
 
 #. help text (RichText) for importing a SSL certificate (3/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:133
+#: src/lib/registration/ui/import_certificate_dialog.rb:127
 msgid "<p>Importing a certificate will allow to use for example a self-signed certificate.</p>"
 msgstr ""
 
 #. help text (RichText) for importing a SSL certificate (4/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:137
+#: src/lib/registration/ui/import_certificate_dialog.rb:131
 msgid "<p><b>Important:</b> You should verify the fingerprint of the certificate to be sure you import the genuine certificate from the requested server.</p>"
 msgstr ""
 
 #. help text (RichText) for importing a SSL certificate (5/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:142
+#: src/lib/registration/ui/import_certificate_dialog.rb:136
 msgid "<p><b>Importing an unknown certificate without verification is a big security risk.</b></p>"
 msgstr ""
 
+#. error message, the entered URL is not valid
+#: src/lib/registration/ui/local_server_dialog.rb:51
 #, fuzzy
-#~| msgid "Novell Customer Center Configuration"
-#~ msgid "SUSE Customer Center Credentials"
-#~ msgstr "Oppsett for Novell kundesenter"
+#| msgid "Invalid value."
+msgid "Invalid URL."
+msgstr "Ugyldig verdi."
 
+#. input field label
+#: src/lib/registration/ui/local_server_dialog.rb:78
 #, fuzzy
+#| msgid "Local Registration Server"
+msgid "&Local Registration Server URL"
+msgstr "Lokal registreringsserver"
+
+#. return the boot command line parameter
+#: src/lib/registration/url_helpers.rb:205
+#, fuzzy
+#| msgid "Checking..."
+msgid "Searching..."
+msgstr "Kontrollerer..."
+
+#: src/lib/registration/url_helpers.rb:205
+#, fuzzy
+#| msgid "Use local registration server"
+msgid "Looking up local registration servers..."
+msgstr "Bruk lokal registreringsserver"
+
+#, fuzzy
+#~| msgid "Registration Code"
+#~ msgid "Registering Product..."
+#~ msgid_plural "Registering Products..."
+#~ msgstr[0] "Registreringskode"
+#~ msgstr[1] "Registreringskode"
+
+#, fuzzy
+#~| msgid "Registration failed."
+#~ msgid "Register Optional Add-ons"
+#~ msgstr "Registreringen mislyktes."
+
+#, fuzzy
+#~| msgid "Registration Code"
+#~ msgid "Register Add-ons..."
+#~ msgstr "Registreringskode"
+
+#, fuzzy
 #~| msgid "Novell Customer Center Configuration"
 #~ msgid "SUSE Customer Center Registration"
 #~ msgstr "Oppsett for Novell kundesenter"
@@ -630,9 +1033,6 @@
 #~ msgid "Hardware Profile"
 #~ msgstr "Maskinvareprofil"
 
-#~ msgid "Registration Status"
-#~ msgstr "Registreringsstatus"
-
 #~ msgid "Optional Information"
 #~ msgstr "Mer informasjon"
 
@@ -956,9 +1356,6 @@
 #~ msgid "Subscription is expired."
 #~ msgstr "Abonnementet er utløpt."
 
-#~ msgid "Registration code is missing."
-#~ msgstr "Registreringskode mangler."
-
 #~ msgid "Registration code does not match mail address."
 #~ msgstr "Registreringskoden samsvarer ikke med e-postadressen."
 
@@ -1022,12 +1419,6 @@
 #~ msgid "unknown status"
 #~ msgstr "ukjent status"
 
-#~ msgid "Run during autoinstallation"
-#~ msgstr "Kjør under autoinstallasjon"
-
-#~ msgid "Do not run during autoinstallation"
-#~ msgstr "Ikke kjør under autoinstallasjon"
-
 #~ msgid "%1 item of registration data"
 #~ msgstr "%1 element med registreringsdata"
 
@@ -1126,9 +1517,6 @@
 #~ "Pakkebrønner er oppdatert.\n"
 #~ "Du finner informasjon om dette i modulen 'Pakkebrønner'."
 
-#~ msgid "The software repositories have been updated."
-#~ msgstr "Pakkebrønner er oppdatert."
-
 #~ msgid "Find details in the Software Repositories module."
 #~ msgstr "Du finner informasjon i modulen Pakkebrønner."
 
@@ -1154,9 +1542,6 @@
 #~ msgid "You can register for installation support."
 #~ msgstr "Du kan registrere deg for installasjonsstøtte."
 
-#~ msgid "Registration server:"
-#~ msgstr "Registreringsserver:"
-
 #~ msgid "Server CA certificate location:"
 #~ msgstr "Plasseringen til serverens CA-sertifikat:"
 

Modified: trunk/yast/nb/po/reipl.nb.po
===================================================================
--- trunk/yast/nb/po/reipl.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/reipl.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2009-08-13 16:41+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -27,7 +27,7 @@
 #. TRANSLATORS: part of a shutdown message
 #. %1 is replaced with a device name
 #. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:68
+#: src/clients/reipl_bootloader_finish.rb:64
 msgid ""
 "\n"
 "After shutdown, reload the system\n"
@@ -42,7 +42,7 @@
 #. %2 is replaced with a WWPN name
 #. %3 is replaced with a LUN name
 #. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:91
+#: src/clients/reipl_bootloader_finish.rb:83
 msgid ""
 "\n"
 "After shutdown, reload the system\n"
@@ -56,7 +56,7 @@
 "med WWPN '%2'\n"
 "og LUN '%3'.\n"
 
-#: src/clients/reipl_bootloader_finish.rb:105
+#: src/clients/reipl_bootloader_finish.rb:97
 msgid ""
 "\n"
 "After shutdown, reload the system \n"
@@ -141,7 +141,7 @@
 
 #: src/include/reipl/dialogs.rb:155
 msgid "&Name"
-msgstr ""
+msgstr "&Navn"
 
 #: src/include/reipl/dialogs.rb:175
 msgid "reipl configuration"
@@ -289,31 +289,31 @@
 
 #. Create a textual summary and a list of unconfigured cards
 #. @return summary of the current configuration
-#: src/modules/Reipl.rb:342
+#: src/modules/Reipl.rb:329
 msgid "Configured reipl methods"
 msgstr "Valgte reipl-metoder"
 
-#: src/modules/Reipl.rb:349
+#: src/modules/Reipl.rb:336
 msgid "The method ccw is configured and being used."
 msgstr "Metoden ccw er valgt og vil bli brukt."
 
-#: src/modules/Reipl.rb:351
+#: src/modules/Reipl.rb:338
 msgid "The method ccw is configured."
 msgstr "Metoden ccw er valgt."
 
-#: src/modules/Reipl.rb:354
+#: src/modules/Reipl.rb:341
 msgid "The method ccw is not supported."
 msgstr "Metoden ccw støttes ikke."
 
-#: src/modules/Reipl.rb:362
+#: src/modules/Reipl.rb:349
 msgid "The method fcp is configured and being used."
 msgstr "Metoden fcp er valgt og vil bli brukt."
 
-#: src/modules/Reipl.rb:364
+#: src/modules/Reipl.rb:351
 msgid "The method fcp is configured."
 msgstr "Metoden fcp er valgt."
 
-#: src/modules/Reipl.rb:367
+#: src/modules/Reipl.rb:354
 msgid "The method fcp is not supported."
 msgstr "Metoden fcp støttes ikke."
 

Modified: trunk/yast/nb/po/relocation-server.nb.po
===================================================================
--- trunk/yast/nb/po/relocation-server.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/relocation-server.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:57+0100\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2002-06-17 14:33+0200\n"
 "Last-Translator: www.linuxbutikken.no <roy@bytek.no>\n"
 "Language-Team: Norwegian <i18n@suse.de>\n"

Modified: trunk/yast/nb/po/s390.nb.po
===================================================================
--- trunk/yast/nb/po/s390.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/s390.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: s390.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2009-08-13 16:43+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -281,7 +281,7 @@
 
 #: src/include/s390/dasd/dialogs.rb:472
 msgid "&Deselect All"
-msgstr ""
+msgstr "&Velg bort alle"
 
 #. error popup
 #. error popup

Modified: trunk/yast/nb/po/samba-client.nb.po
===================================================================
--- trunk/yast/nb/po/samba-client.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/samba-client.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: samba-client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2008-10-18 12:34+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: norsk bokmål\n"
@@ -202,6 +202,19 @@
 msgid "M&aximum"
 msgstr "&Maksimum"
 
+#. require_groups
+#: src/include/samba-client/dialogs.rb:256
+#, fuzzy
+#| msgid "Allowed Services"
+msgid "Allowed Group(s)"
+msgstr "Tillatte tjenester"
+
+#: src/include/samba-client/dialogs.rb:261
+#, fuzzy
+#| msgid "Group Name"
+msgid "Group Name(s) or SID(s)"
+msgstr "Gruppenavn"
+
 #. combobox label
 #: src/include/samba-client/dialogs.rb:271
 msgid "&Kerberos Method"
@@ -847,59 +860,62 @@
 msgstr "Lagrer innstillingene..."
 
 #. final progress step label
-#: src/modules/Kerberos.rb:669
+#. translators: progress finished
+#. translators: write progress finished
+#: src/modules/Kerberos.rb:669 src/modules/Samba.rb:642
+#: src/modules/Samba.rb:761
 msgid "Finished"
 msgstr "Fullført"
 
 #. progress stage label
 #: src/modules/Kerberos.rb:673
 msgid "Install required packages"
-msgstr ""
+msgstr "Installer nødvendige pakker"
 
 #. progress step label
 #: src/modules/Kerberos.rb:675
 msgid "Installing required packages..."
-msgstr ""
+msgstr "Installerer nødvendige pakker..."
 
 #. summary header
 #: src/modules/Kerberos.rb:947
 msgid "PAM Login"
-msgstr ""
+msgstr "PAM-innlogging"
 
 #. summary item
 #: src/modules/Kerberos.rb:953
 msgid "Use Kerberos"
-msgstr ""
+msgstr "Bruk Kerberos"
 
 #. summary item
 #: src/modules/Kerberos.rb:955
 msgid "Do Not Use Kerberos"
-msgstr ""
+msgstr "Ikke bruk Kerberos"
 
 #. summary header
 #: src/modules/Kerberos.rb:959
 msgid "Default Realm"
-msgstr ""
+msgstr "Standardområde"
 
 #. summary header
 #: src/modules/Kerberos.rb:966
 msgid "Default Domain"
-msgstr ""
+msgstr "Standard domene"
 
 #. summary header
 #: src/modules/Kerberos.rb:973
 msgid "KDC Server Address"
-msgstr ""
+msgstr "KDC-serveradresse"
 
 #. summary header
 #: src/modules/Kerberos.rb:977
 msgid "Clock Skew"
-msgstr ""
+msgstr "Tidsavvik"
 
 #. summary text, %1 is value
 #: src/modules/Kerberos.rb:993
 msgid "<b>KDC Server</b>: %1<br>"
-msgstr ""
+msgstr "<b>KDC-server</b>: %1<br>"
 
 #. summary text, %1 is value
 #: src/modules/Kerberos.rb:998
@@ -911,7 +927,7 @@
 #. summary text, %1 is value
 #: src/modules/Kerberos.rb:1004
 msgid "<b>Default Realm</b>: %1<br>"
-msgstr ""
+msgstr "<b>Standardområde</b>: %1<br>"
 
 #. summary text (yes/no follows)
 #: src/modules/Kerberos.rb:1010
@@ -921,19 +937,21 @@
 msgstr "Frakoblet autentisering aktivert"
 
 #. summary value
-#: src/modules/Kerberos.rb:1013
+#. translators: winbind status in summary
+#: src/modules/Kerberos.rb:1013 src/modules/Samba.rb:1104
 msgid "Yes"
 msgstr "Ja"
 
 #. summary value
-#: src/modules/Kerberos.rb:1015
+#. translators: winbind status in summary
+#: src/modules/Kerberos.rb:1015 src/modules/Samba.rb:1106
 msgid "No"
 msgstr "Nei"
 
 #. summary line
 #: src/modules/Kerberos.rb:1022
 msgid "Configuration Acquired via DNS"
-msgstr ""
+msgstr "Oppsett hentet via DNS"
 
 #. error popup (wrong format of entered value)
 #: src/modules/Kerberos.rb:1050
@@ -941,6 +959,8 @@
 "Clock skew is invalid.\n"
 "Try again.\n"
 msgstr ""
+"Tidsavviket er ugyldig.\n"
+"Forsøk igjen.\n"
 
 #. error popup (wrong format of entered value)
 #: src/modules/Kerberos.rb:1053
@@ -948,67 +968,146 @@
 "Lifetime is invalid.\n"
 "Try again."
 msgstr ""
+"Levetiden er ugyldig.\n"
+"Forsøk igjen."
 
-#: src/modules/SambaNetJoin.pm:328
-msgid "Unable to proceed with join: Inconsistent cluster state"
-msgstr "Kan ikke fortsette med join: inkonsistent klyngestatus"
+#. Samba-client read dialog caption
+#: src/modules/Samba.rb:621
+msgid "Initializing Samba Client Configuration"
+msgstr "Initialiserer oppsett av Samba-klient"
 
-#~ msgid "Initializing Samba Client Configuration"
-#~ msgstr "Initialiserer oppsett av Samba-klient"
+#. translators: progress stage 1/2
+#: src/modules/Samba.rb:632
+msgid "Read the global Samba settings"
+msgstr "Les generelle Samba-innstillinger"
 
-#~ msgid "Read the global Samba settings"
-#~ msgstr "Les generelle Samba-innstillinger"
+#. translators: progress stage 2/2
+#: src/modules/Samba.rb:634
+msgid "Read the winbind status"
+msgstr "Les windbind-status"
 
-#~ msgid "Read the winbind status"
-#~ msgstr "Les windbind-status"
+#. translators: progress step 1/2
+#: src/modules/Samba.rb:638
+msgid "Reading the global Samba settings..."
+msgstr "Leser generelle Samba-innstillinger..."
 
-#~ msgid "Reading the global Samba settings..."
-#~ msgstr "Leser generelle Samba-innstillinger..."
+#. translators: progress step 2/2
+#: src/modules/Samba.rb:640
+msgid "Reading the winbind status..."
+msgstr "Leser winbind-status..."
 
-#~ msgid "Reading the winbind status..."
-#~ msgstr "Leser winbind-status..."
+#. Samba-client read dialog caption
+#: src/modules/Samba.rb:741
+msgid "Saving Samba Client Configuration"
+msgstr "Lagrer konfigurasjon for Samba-klient"
 
-#~ msgid "Disable Samba services"
-#~ msgstr "Deaktiver Samba-tjenester"
+#. translators: write progress stage
+#: src/modules/Samba.rb:745
+msgid "Write the settings"
+msgstr "Lagre innstillingene"
 
-#~ msgid "Enable Samba services"
-#~ msgstr "Aktiver Samba-tjenester"
+#. translators: write progress stage
+#: src/modules/Samba.rb:748
+msgid "Disable Samba services"
+msgstr "Deaktiver Samba-tjenester"
 
-#~ msgid "Disabling Samba services..."
-#~ msgstr "Deaktiverer Samba-tjenester..."
+#. translators: write progress stage
+#: src/modules/Samba.rb:750
+msgid "Enable Samba services"
+msgstr "Aktiver Samba-tjenester"
 
-#~ msgid "Enabling Samba services..."
-#~ msgstr "Aktiverer Samba-tjenester..."
+#. translators: write progress step
+#: src/modules/Samba.rb:754
+msgid "Writing the settings..."
+msgstr "Lagrer innstillingene..."
 
-#~ msgid "Cannot write settings to %1."
-#~ msgstr "Kan ikke lagre innstillingene til %1."
+#. translators: write progress step
+#: src/modules/Samba.rb:757
+msgid "Disabling Samba services..."
+msgstr "Deaktiverer Samba-tjenester..."
 
-#~ msgid "Cannot start winbind service."
-#~ msgstr "Kan ikke starte winbind-tjeneste."
+#. translators: write progress step
+#: src/modules/Samba.rb:759
+msgid "Enabling Samba services..."
+msgstr "Aktiverer Samba-tjenester..."
 
-#~ msgid "Cannot start winbind daemon."
-#~ msgstr "Kan ikke starte winbind-nisse."
+#. write progress stage
+#: src/modules/Samba.rb:769
+msgid "Write Kerberos configuration"
+msgstr "Lagre Kerberos-konfigurasjon"
 
-#~ msgid "Cannot stop winbind service."
-#~ msgstr "Kan ikke stoppe winbind-tjeneste."
+#. write progress step
+#: src/modules/Samba.rb:771
+msgid "Writing Kerberos configuration..."
+msgstr "Lagrer Kerberos-konfigurasjon..."
 
-#~ msgid "Cannot stop winbind daemon."
-#~ msgstr "Kan ikke stanse winbind-nisse."
+#. translators: error message, %1 is filename
+#. translators: error message, %1 is filename
+#. translators: error message, %1 is filename
+#: src/modules/Samba.rb:825 src/modules/Samba.rb:862 src/modules/Samba.rb:879
+msgid "Cannot write settings to %1."
+msgstr "Kan ikke lagre innstillingene til %1."
 
-#~ msgid "Cannot write PAM settings."
-#~ msgstr "Kan ikke lagre PAM-innstillinger."
+#. translators: error message, do not change winbind
+#: src/modules/Samba.rb:838
+msgid "Cannot start winbind service."
+msgstr "Kan ikke starte winbind-tjeneste."
 
-#~ msgid "Global Configuration"
-#~ msgstr "Generell konfigurasjon"
+#. translators: error message, do not change winbind
+#: src/modules/Samba.rb:843
+msgid "Cannot start winbind daemon."
+msgstr "Kan ikke starte winbind-nisse."
 
-#~ msgid "Workgroup or Domain: %1"
-#~ msgstr "Arbeidsgruppe eller domene: %1"
+#. translators: error message, do not change winbind
+#: src/modules/Samba.rb:849
+msgid "Cannot stop winbind service."
+msgstr "Kan ikke stoppe winbind-tjeneste."
 
-#~ msgid "Create Home Directory on Login"
-#~ msgstr "Opprett hjemmekatalog ved innlogging"
+#. translators: error message, do not change winbind
+#: src/modules/Samba.rb:854
+msgid "Cannot stop winbind daemon."
+msgstr "Kan ikke stanse winbind-nisse."
 
-#~ msgid "Maximum Number of Shares: %1"
-#~ msgstr "Maksimalt antall delte ressurser: %1"
+#. translators: error message
+#: src/modules/Samba.rb:870
+msgid "Cannot write PAM settings."
+msgstr "Kan ikke lagre PAM-innstillinger."
 
-#~ msgid "<p><b>Authentication with SMB</b>: %1</p>"
-#~ msgstr "<p><b>Autentisering med SMB</b>: %1</p>"
+#. summary header
+#: src/modules/Samba.rb:1044
+msgid "Global Configuration"
+msgstr "Generell konfigurasjon"
+
+#. autoyast summary item: configured workgroup
+#: src/modules/Samba.rb:1051
+msgid "Workgroup or Domain: %1"
+msgstr "Arbeidsgruppe eller domene: %1"
+
+#. autoyast summary item
+#: src/modules/Samba.rb:1060
+msgid "Create Home Directory on Login"
+msgstr "Opprett hjemmekatalog ved innlogging"
+
+#. autoyast summary item
+#: src/modules/Samba.rb:1067
+msgid "Offline Authentication Enabled"
+msgstr "Frakoblet autentisering aktivert"
+
+#. autoyast summary item
+#: src/modules/Samba.rb:1075
+msgid "Maximum Number of Shares: %1"
+msgstr "Maksimalt antall delte ressurser: %1"
+
+#. summary item: configured workgroup
+#: src/modules/Samba.rb:1096
+msgid "<p><b>Workgroup or Domain</b>: %1</p>"
+msgstr "<p><b>Arbeidsgruppe eller domene</b>: %1</p>"
+
+#. summary item: authentication using winbind
+#: src/modules/Samba.rb:1101
+msgid "<p><b>Authentication with SMB</b>: %1</p>"
+msgstr "<p><b>Autentisering med SMB</b>: %1</p>"
+
+#: src/modules/SambaNetJoin.pm:328
+msgid "Unable to proceed with join: Inconsistent cluster state"
+msgstr "Kan ikke fortsette med join: inkonsistent klyngestatus"

Modified: trunk/yast/nb/po/samba-server.nb.po
===================================================================
--- trunk/yast/nb/po/samba-server.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/samba-server.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: samba-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2008-10-31 00:45+0100\n"
 "Last-Translator: Olav P. <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <>\n"

Modified: trunk/yast/nb/po/samba-users.nb.po
===================================================================
--- trunk/yast/nb/po/samba-users.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/samba-users.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: samba-users.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:41+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2008-09-29 12:07+0200\n"
 "Last-Translator: Olav P. <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <>\n"

Modified: trunk/yast/nb/po/scanner.nb.po
===================================================================
--- trunk/yast/nb/po/scanner.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/scanner.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: scanner\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:41+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2009-08-13 16:44+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"

Modified: trunk/yast/nb/po/security.nb.po
===================================================================
--- trunk/yast/nb/po/security.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/security.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: security\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:57+0100\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2009-08-13 16:46+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"

Modified: trunk/yast/nb/po/services-manager.nb.po
===================================================================
--- trunk/yast/nb/po/services-manager.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/services-manager.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-08-18 16:19+0200\n"
 "PO-Revision-Date: 2014-05-19 09:35+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,20 +17,234 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/clients/default_target_finish.rb:33
+#, fuzzy
+#| msgid "Reading the default system settings..."
+msgid "Saving default systemd target..."
+msgstr "Leser standardinnstillinger for system..."
+
+#: src/clients/default_target_proposal.rb:26
+msgid "VNC needs graphical system to be available"
+msgstr ""
+
 #. TODO implement behaviour if force_reset parameter provided
+#: src/clients/default_target_proposal.rb:51
+#, fuzzy
+#| msgid "Default system settings"
+msgid "&Default systemd target"
+msgstr "Standard systeminnstillinger"
+
+#: src/clients/default_target_proposal.rb:52
+#, fuzzy
+#| msgid "Default system settings"
+msgid "Default systemd target"
+msgstr "Standard systeminnstillinger"
+
+#. create the proposal dialog and get the sequence symbol from block
+#: src/clients/default_target_proposal.rb:116
+#, fuzzy
+#| msgid "Default system settings"
+msgid "Set Default Systemd Target"
+msgstr "Standard systeminnstillinger"
+
+#: src/clients/default_target_proposal.rb:134
+#, fuzzy
+#| msgid "Reading the default system settings..."
+msgid "Selecting the Default Systemd Target"
+msgstr "Leser standardinnstillinger for system..."
+
+#: src/clients/default_target_proposal.rb:136
+msgid "Systemd is a system and service manager for Linux. It consists of units whose job is to activate services and other units."
+msgstr ""
+
+#: src/clients/default_target_proposal.rb:139
+msgid "Default target unit is activated on boot by default. Usually it is a symlink located in path/etc/systemd/system/default.target . See more on systemd man page."
+msgstr ""
+
+#: src/clients/default_target_proposal.rb:143
+msgid "Multi-User target is for setting up a non-graphical multi-user system with network suitable for server (similar to runlevel 3)."
+msgstr ""
+
+#: src/clients/default_target_proposal.rb:146
+msgid "Graphical target for setting up a graphical login screen with network which is typical for workstations (similar to runlevel 5)."
+msgstr ""
+
+#: src/clients/default_target_proposal.rb:149
+msgid "When you are not sure what would be the best option for you then go with graphical target."
+msgstr ""
+
+#: src/clients/default_target_proposal.rb:160
+#, fuzzy
+#| msgid "Available Shares"
+msgid "Available Targets"
+msgstr "Tilgjengelige delte ressurser"
+
+#. Check if the user forced a particular target before; if he did and the
+#. autodetection recommends a different one now, warn the user about this
+#. and keep the default target unchanged.
+#: src/clients/default_target_proposal.rb:219
+#, fuzzy
+#| msgid "The software proposal is reset to the default values."
+msgid "The installer is recommending you the default target '%s' "
+msgstr "Programvareforslaget er tilbakestilt til standardverdier."
+
+#: src/clients/default_target_proposal.rb:231
+#, fuzzy
+#| msgid "No package has been selected for installation."
+msgid "X11 packages have been selected for installation"
+msgstr "Ingen pakker er valgt for installasjon."
+
+#: src/clients/default_target_proposal.rb:234
+msgid "Live Installation is typically used for full GUI in target system"
+msgstr ""
+
+#: src/clients/default_target_proposal.rb:237
+msgid "Serial connection does typically not support GUI"
+msgstr ""
+
+#: src/clients/default_target_proposal.rb:241
+msgid "Text mode installation assumes no GUI on the target system"
+msgstr ""
+
+#: src/clients/default_target_proposal.rb:244
+#: src/clients/default_target_proposal.rb:248
+msgid "Using VNC assumes a GUI on the target system"
+msgstr ""
+
+#: src/clients/default_target_proposal.rb:251
+msgid "SSH installation mode assumes no GUI on the target system"
+msgstr ""
+
+#: src/clients/default_target_proposal.rb:254
+#, fuzzy
+#| msgid "No package has been selected for installation."
+msgid "X11 packages have not been selected for installation"
+msgstr "Ingen pakker er valgt for installasjon."
+
+#: src/clients/default_target_proposal.rb:257
+msgid "This recommendation is based on the analysis of other installation settings"
+msgstr ""
+
+#. Default for double-click in the table
+#. Default for double-click in the table
+#: src/clients/services-manager.rb:71 src/clients/services.rb:71
+msgid "Writing configuration..."
+msgstr "Lagrer oppsett..."
+
+#: src/clients/services-manager.rb:76 src/clients/services.rb:76
+#, fuzzy
+#| msgid "Writing the system configuration"
+msgid "Writing the configuration failed:\n"
+msgstr "Lagrer systemkonfigurasjonen"
+
+#. Fills the dialog contents
+#. Fills the dialog contents
+#: src/clients/services-manager.rb:91 src/clients/services.rb:91
+#, fuzzy
+#| msgid "Default system settings"
+msgid "Default System &Target"
+msgstr "Standard systeminnstillinger"
+
+#: src/clients/services-manager.rb:99 src/clients/services.rb:99
+msgid "Service"
+msgstr "Tjeneste"
+
+#: src/clients/services-manager.rb:100 src/clients/services-manager.rb:130
+#: src/clients/services-manager.rb:146 src/clients/services.rb:100
+#: src/clients/services.rb:130 src/clients/services.rb:146
+#: src/data/services-manager/autoyast_summary.erb:16
+msgid "Enabled"
+msgstr "Aktivert"
+
+#. The current state matches the futural state
+#. The current state matches the futural state
+#: src/clients/services-manager.rb:101 src/clients/services-manager.rb:131
+#: src/clients/services-manager.rb:156 src/clients/services.rb:101
+#: src/clients/services.rb:131 src/clients/services.rb:156
+msgid "Active"
+msgstr "Aktiv"
+
+#: src/clients/services-manager.rb:102 src/clients/services.rb:102
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: src/clients/services-manager.rb:107 src/clients/services.rb:107
+#, fuzzy
+#| msgid "&Start"
+msgid "&Start/Stop"
+msgstr "&Start"
+
+#: src/clients/services-manager.rb:109 src/clients/services.rb:109
+#, fuzzy
+#| msgid "Enable/Disable Kdump"
+msgid "&Enable/Disable"
+msgstr "Aktiver/deaktiver Kdump"
+
+#: src/clients/services-manager.rb:111 src/clients/services.rb:111
+msgid "Show &Details"
+msgstr "Vis &detaljer"
+
+#: src/clients/services-manager.rb:114 src/clients/services.rb:114
+#: src/data/services-manager/autoyast_summary.erb:5
+#, fuzzy
+#| msgid "Software Manager"
+msgid "Services Manager"
+msgstr "Programvarebehandler"
+
+#. Redraws the services dialog
+#. Redraws the services dialog
+#: src/clients/services-manager.rb:126 src/clients/services.rb:126
+#, fuzzy
+#| msgid "Reading the service status..."
+msgid "Reading services status..."
+msgstr "Leser tjenestestatus..."
+
+#: src/clients/services-manager.rb:130 src/clients/services-manager.rb:146
+#: src/clients/services.rb:130 src/clients/services.rb:146
+#: src/data/services-manager/autoyast_summary.erb:23
+msgid "Disabled"
+msgstr "Deaktivert"
+
+#: src/clients/services-manager.rb:131 src/clients/services-manager.rb:156
+#: src/clients/services.rb:131 src/clients/services.rb:156
+#, fuzzy
+#| msgid "active"
+msgid "Inactive"
+msgstr "aktiv"
+
+#. The current state differs the the futural state
+#. The current state differs the the futural state
+#: src/clients/services-manager.rb:163 src/clients/services.rb:163
+msgid "Active (will start)"
+msgstr ""
+
+#: src/clients/services-manager.rb:163 src/clients/services.rb:163
+msgid "Inactive (will stop)"
+msgstr ""
+
+#. Opens up a popup with details about the currently selected service
+#. Opens up a popup with details about the currently selected service
+#: src/clients/services-manager.rb:190 src/clients/services.rb:190
+msgid "Service %{service} Full Info"
+msgstr ""
+
+#. TODO implement behaviour if force_reset parameter provided
 #: src/clients/services_proposal.rb:52
 msgid "&Services"
-msgstr ""
+msgstr "Tjene&ster"
 
 #: src/clients/services_proposal.rb:53
+#: src/data/services-manager/autoyast_summary.erb:15
 msgid "Services"
-msgstr ""
+msgstr "Tjenester"
 
 #: src/clients/services_proposal.rb:116
 msgid ""
 "<p><big><b>Services</b></big><br>\n"
 "The current setup does not provide any functionality now.</p>"
 msgstr ""
+"<p><big><b>Tjenester</b></big><br>\n"
+"Gjeldende oppsett har ikke noen funksjonalitet nå.</p>"
 
 #: src/clients/services_proposal.rb:121
 msgid ""
@@ -61,4 +275,84 @@
 
 #: src/clients/services_proposal.rb:283
 msgid "Cannot enable service %1"
+msgstr "Kan ikke aktivere tjenesten %1"
+
+#: src/data/services-manager/autoyast_summary.erb:6
+#, fuzzy
+#| msgid "Default Hat"
+msgid "Default Target"
+msgstr "Standard paraply"
+
+#. Name of the systemd default target unit. Suffix '.target' is optional.
+#. @return [String] if the target has been specified in the profile. Can be nil.
+#: src/lib/services-manager/services_manager_profile.rb:104
+msgid "Unknown autoyast services profile schema for 'services-manager'"
 msgstr ""
+
+#. AutoYast summary
+#: src/modules/services_manager.rb:29
+msgid "Not configured yet."
+msgstr "Ikke konfigurert ennå."
+
+#. Do not start or stop services that are already in the desired state
+#. they might be coming from AutoYast import and thus they are :modified.
+#: src/modules/services_manager_service.rb:407
+msgid "Could not %{change} %{service} which is currently %{status}. "
+msgstr ""
+
+#: src/modules/services_manager_service.rb:426
+#, fuzzy
+#| msgid "%1: Could not change state of the device"
+msgid "Could not %{change} %{service}. "
+msgstr "%1: Kunne ikke endre status på enheten"
+
+#. Default systemd target (previously: runlevel 5) option #1
+#: src/modules/services_manager_target.rb:22
+#, fuzzy
+#| msgid "Dial mode"
+msgid "Graphical mode"
+msgstr "Ringemodus"
+
+#. Default systemd target (previously: runlevel 3) option #2
+#: src/modules/services_manager_target.rb:24
+#, fuzzy
+#| msgid "Text Mode"
+msgid "Text mode"
+msgstr "Tekstmodus"
+
+#. Systemd targets
+#: src/modules/services_manager_target.rb:27
+#, fuzzy
+#| msgid "&Graphical interface"
+msgid "Graphical Interface"
+msgstr "&Grafisk grensesnitt"
+
+#: src/modules/services_manager_target.rb:28
+#, fuzzy
+#| msgid "Select Mode"
+msgid "Emergency Mode"
+msgstr "Velg modus"
+
+#: src/modules/services_manager_target.rb:29
+#, fuzzy
+#| msgid "Switch Mode"
+msgid "Switch Root"
+msgstr "Bytt modus"
+
+#: src/modules/services_manager_target.rb:30
+#, fuzzy
+#| msgid "Default Hat"
+msgid "Initrd Default Target"
+msgstr "Standard paraply"
+
+#: src/modules/services_manager_target.rb:31
+#, fuzzy
+#| msgid "Other System"
+msgid "Multi-User System"
+msgstr "Annet system"
+
+#: src/modules/services_manager_target.rb:32
+#, fuzzy
+#| msgid "Rescue System"
+msgid "Rescue Mode"
+msgstr "Redningssystem"

Modified: trunk/yast/nb/po/slp-server.nb.po
===================================================================
--- trunk/yast/nb/po/slp-server.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/slp-server.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: slp-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:57+0100\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2008-09-30 15:29+0200\n"
 "Last-Translator: Olav P. <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <>\n"

Modified: trunk/yast/nb/po/snapper.nb.po
===================================================================
--- trunk/yast/nb/po/snapper.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/snapper.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2002-06-17 14:33+0200\n"
 "Last-Translator: www.linuxbutikken.no <roy@bytek.no>\n"
 "Language-Team: Norwegian <i18n@suse.de>\n"
@@ -24,127 +24,127 @@
 
 #. text entry label
 #. text entry label
-#: src/include/snapper/dialogs.rb:124 src/include/snapper/dialogs.rb:245
-#: src/include/snapper/dialogs.rb:492
+#: src/include/snapper/dialogs.rb:130 src/include/snapper/dialogs.rb:251
+#: src/include/snapper/dialogs.rb:490
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. text entry label
 #. text entry label
-#: src/include/snapper/dialogs.rb:130 src/include/snapper/dialogs.rb:291
+#: src/include/snapper/dialogs.rb:136 src/include/snapper/dialogs.rb:297
 msgid "User data"
 msgstr "Brukerdata"
 
 #. combo box label
 #. text entry label
-#: src/include/snapper/dialogs.rb:138 src/include/snapper/dialogs.rb:296
+#: src/include/snapper/dialogs.rb:144 src/include/snapper/dialogs.rb:302
 msgid "Cleanup algorithm"
 msgstr "Opprryddingsalgoritme"
 
 #. popup label, %1 is number
-#: src/include/snapper/dialogs.rb:152
+#: src/include/snapper/dialogs.rb:158
 msgid "Modify Snapshot %1"
 msgstr "Endre øyeblikksbilde %1"
 
 #. popup label, %1, %2 are numbers (range)
-#: src/include/snapper/dialogs.rb:160
+#: src/include/snapper/dialogs.rb:166
 msgid "Modify Snapshots %1 - %2"
 msgstr "Endre øyeblikksbilder %1 - %2"
 
 #. label
-#: src/include/snapper/dialogs.rb:163
+#: src/include/snapper/dialogs.rb:169
 msgid "Pre (%1)"
 msgstr "Før (%1)"
 
 #. label
-#: src/include/snapper/dialogs.rb:167
+#: src/include/snapper/dialogs.rb:173
 msgid "Post (%1)"
 msgstr "Etter (%1)"
 
 #. popup label
-#: src/include/snapper/dialogs.rb:243
+#: src/include/snapper/dialogs.rb:249
 msgid "Create New Snapshot"
 msgstr "Opprett nytt øyeblikksbilde"
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:256
+#: src/include/snapper/dialogs.rb:262
 msgid "Single snapshot"
 msgstr "Enkelt øyeblikksbilde"
 
 #. radio button label
 #. 0 means there's no post
-#: src/include/snapper/dialogs.rb:265 src/include/snapper/dialogs.rb:437
+#: src/include/snapper/dialogs.rb:271 src/include/snapper/dialogs.rb:435
 msgid "Pre"
 msgstr "Før"
 
 #. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:275
+#: src/include/snapper/dialogs.rb:281
 msgid "Post, paired with:"
 msgstr "Etter, i par med:"
 
 #. yes/no popup question
-#: src/include/snapper/dialogs.rb:346
+#: src/include/snapper/dialogs.rb:352
 msgid "Really delete snapshot '%1'?"
 msgstr "Vil du virkelig slette  øyeblikksbildet '%1'?"
 
 #. summary dialog caption
-#: src/include/snapper/dialogs.rb:359
+#: src/include/snapper/dialogs.rb:365
 msgid "Snapshots"
 msgstr "Øyeblikksbilder"
 
 #. generate list of snapshot table items
-#: src/include/snapper/dialogs.rb:392
+#: src/include/snapper/dialogs.rb:394
 msgid "Single"
 msgstr "Enkelt"
 
 #. pre canot be 0
-#: src/include/snapper/dialogs.rb:421
+#: src/include/snapper/dialogs.rb:419
 msgid "Pre & Post"
 msgstr "Før og Etter"
 
 #. busy popup message
-#: src/include/snapper/dialogs.rb:456
+#: src/include/snapper/dialogs.rb:454
 msgid "Reading list of snapshots..."
 msgstr "Leser listen over øyeblikksbilder..."
 
 #. combo box label
-#: src/include/snapper/dialogs.rb:477
+#: src/include/snapper/dialogs.rb:475
 msgid "Current Configuration"
 msgstr "Gjeldende oppsett"
 
 #. table header
-#: src/include/snapper/dialogs.rb:488
+#: src/include/snapper/dialogs.rb:486
 msgid "ID"
 msgstr "ID"
 
-#: src/include/snapper/dialogs.rb:489
+#: src/include/snapper/dialogs.rb:487
 msgid "Type"
 msgstr "Type"
 
-#: src/include/snapper/dialogs.rb:490
+#: src/include/snapper/dialogs.rb:488
 msgid "Start Date"
 msgstr "Startdato"
 
-#: src/include/snapper/dialogs.rb:491
+#: src/include/snapper/dialogs.rb:489
 msgid "End Date"
 msgstr "Sluttdato"
 
-#: src/include/snapper/dialogs.rb:493
+#: src/include/snapper/dialogs.rb:491
 msgid "User Data"
 msgstr "Brukerinformasjon"
 
 #. button label
-#: src/include/snapper/dialogs.rb:499
+#: src/include/snapper/dialogs.rb:497
 msgid "Show Changes"
 msgstr "Vis endringer"
 
 #. button label
-#: src/include/snapper/dialogs.rb:502
+#: src/include/snapper/dialogs.rb:500
 msgid "Modify"
 msgstr "Endre"
 
 #. popup message
-#: src/include/snapper/dialogs.rb:544
+#: src/include/snapper/dialogs.rb:542
 msgid ""
 "This 'Pre' snapshot is not paired with any 'Post' one yet.\n"
 "Showing differences is not possible."
@@ -153,131 +153,131 @@
 "Det er ikke mulig å vise avvik."
 
 #. dialog caption
-#: src/include/snapper/dialogs.rb:590
+#: src/include/snapper/dialogs.rb:588
 msgid "Selected Snapshot Overview"
 msgstr "Valgt oversikt over øyeblikksbilder"
 
 #. '%1: %2' means 'ID: description', adapt the order if necessary
-#: src/include/snapper/dialogs.rb:636
+#: src/include/snapper/dialogs.rb:626
 msgid "%1: %2"
 msgstr "%1: %2"
 
 #. busy popup message
-#: src/include/snapper/dialogs.rb:655
+#: src/include/snapper/dialogs.rb:645
 msgid "Calculating changed files..."
 msgstr "Beregner endrede filer..."
 
 #. busy popup message
-#: src/include/snapper/dialogs.rb:752
+#: src/include/snapper/dialogs.rb:742
 msgid "Calculating file modifications..."
 msgstr "Beregner endringer i filer..."
 
 #. label
-#: src/include/snapper/dialogs.rb:760
+#: src/include/snapper/dialogs.rb:750
 msgid "New file was created."
 msgstr "En ny fil er opprettet."
 
 #. label
-#: src/include/snapper/dialogs.rb:764
+#: src/include/snapper/dialogs.rb:754
 msgid "File was removed."
 msgstr "Filen er slettet."
 
 #. label
-#: src/include/snapper/dialogs.rb:769
+#: src/include/snapper/dialogs.rb:759
 msgid "File content was not changed."
 msgstr "Filinnholdet er ikke endret."
 
 #. label
-#: src/include/snapper/dialogs.rb:775
+#: src/include/snapper/dialogs.rb:765
 msgid "File does not exist in either snapshot."
 msgstr "Filen finnes ikke i noen av øyeblikksbildene."
 
 #. label
-#: src/include/snapper/dialogs.rb:781
+#: src/include/snapper/dialogs.rb:771
 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:791
+#: src/include/snapper/dialogs.rb:781
 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:806
+#: src/include/snapper/dialogs.rb:796
 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:822
+#: src/include/snapper/dialogs.rb:812
 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:857
+#: src/include/snapper/dialogs.rb:847
 msgid "R&estore from First"
 msgstr "Gj&enopprett fra første"
 
 #. button label
-#: src/include/snapper/dialogs.rb:859
+#: src/include/snapper/dialogs.rb:849
 msgid "Restore"
 msgstr "Gjenopprett"
 
-#: src/include/snapper/dialogs.rb:882
+#: src/include/snapper/dialogs.rb:872
 msgid "Res&tore from Second"
 msgstr "Gjenoppre&tt fra andre"
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:919
+#: src/include/snapper/dialogs.rb:909
 msgid "Show the difference between snapshot and current system"
 msgstr "Vis forskjellen mellom øyeblikksbilde og gjeldende system"
 
 #. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:931
+#: src/include/snapper/dialogs.rb:921
 msgid "Show the difference between current and selected snapshot:"
 msgstr "Vis forskjellen mellom gjeldende og valgt øyeblikksbilde:"
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:978
+#: src/include/snapper/dialogs.rb:968
 msgid "Show the difference between first and second snapshot"
 msgstr "Vis forskjellen mellom første og andre øyeblikksbilde"
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:989
+#: src/include/snapper/dialogs.rb:979
 msgid "Show the difference between first snapshot and current system"
 msgstr "Vis forskjellen mellom første øyeblikksbilde og gjeldende system"
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:1000
+#: src/include/snapper/dialogs.rb:990
 msgid "Show the difference between second snapshot and current system"
 msgstr "Vis forskjellen mellom andre øyeblikksbilde og gjeldende system"
 
 #. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:1041
+#: src/include/snapper/dialogs.rb:1031
 msgid "Time of taking the first snapshot:"
 msgstr "Tid for å opprette første øyeblikksbilde:"
 
 #. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:1046
+#: src/include/snapper/dialogs.rb:1036
 msgid "Time of taking the second snapshot:"
 msgstr "Tid for å opprette andre øyeblikksbilde:"
 
 #. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:1054
+#: src/include/snapper/dialogs.rb:1044
 msgid "Time of taking the snapshot:"
 msgstr "Tid for å opprette øyeblikksbildet:"
 
 #. button label
-#: src/include/snapper/dialogs.rb:1076
+#: src/include/snapper/dialogs.rb:1066
 msgid "&Open"
 msgstr "&Åpne"
 
 #. button label
-#: src/include/snapper/dialogs.rb:1122
+#: src/include/snapper/dialogs.rb:1112
 msgid "Restore Selected"
 msgstr "Oppdater valgte"
 
 #. yes/no question, %1 is file name, %2 is number
-#: src/include/snapper/dialogs.rb:1196
+#: src/include/snapper/dialogs.rb:1186
 msgid ""
 "Do you want to delete the file\n"
 "\n"
@@ -293,7 +293,7 @@
 
 #. yes/no question, %1 is file name, %2 is number
 #. yes/no question, %1 is file name, %2 is number
-#: src/include/snapper/dialogs.rb:1216 src/include/snapper/dialogs.rb:1234
+#: src/include/snapper/dialogs.rb:1206 src/include/snapper/dialogs.rb:1224
 msgid ""
 "Do you want to copy the file\n"
 "\n"
@@ -308,17 +308,17 @@
 "fra øyeblikksbilde '%2' til gjeldende system?"
 
 #. popup message
-#: src/include/snapper/dialogs.rb:1269
+#: src/include/snapper/dialogs.rb:1259
 msgid "No file was selected for restoring"
 msgstr "Ingen fil er valgt for gjenoppretting"
 
 #. popup headline
-#: src/include/snapper/dialogs.rb:1274
+#: src/include/snapper/dialogs.rb:1264
 msgid "Restoring files"
 msgstr "Gjenoppretter filer"
 
 #. popup message, %1 is snapshot number, %2 list of files
-#: src/include/snapper/dialogs.rb:1277
+#: src/include/snapper/dialogs.rb:1267
 msgid ""
 "<p>These files will be restored from snapshot '%1':</p>\n"
 "<p>\n"

Modified: trunk/yast/nb/po/sound.nb.po
===================================================================
--- trunk/yast/nb/po/sound.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/sound.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: sound\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:57+0100\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2009-08-13 16:49+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"

Modified: trunk/yast/nb/po/squid.nb.po
===================================================================
--- trunk/yast/nb/po/squid.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/squid.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2009-08-13 16:51+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -1445,11 +1445,11 @@
 #. TRANSLATORS: language name - combo box entry
 #: src/modules/SquidErrorMessages.rb:53
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikansk"
 
 #: src/modules/SquidErrorMessages.rb:54
 msgid "Arabic"
-msgstr ""
+msgstr "Arabisk"
 
 # AM
 # fuzzy
@@ -1499,7 +1499,7 @@
 
 #: src/modules/SquidErrorMessages.rb:66
 msgid "Persian"
-msgstr ""
+msgstr "Persisk"
 
 #: src/modules/SquidErrorMessages.rb:67
 msgid "Finnish"
@@ -1519,7 +1519,7 @@
 
 #: src/modules/SquidErrorMessages.rb:71
 msgid "Indonesian"
-msgstr ""
+msgstr "Indonesisk"
 
 #: src/modules/SquidErrorMessages.rb:72
 msgid "Italian"
@@ -1535,7 +1535,7 @@
 
 #: src/modules/SquidErrorMessages.rb:75
 msgid "Latvian"
-msgstr ""
+msgstr "Latvisk"
 
 #: src/modules/SquidErrorMessages.rb:76
 msgid "Lithuanian"
@@ -1543,7 +1543,7 @@
 
 #: src/modules/SquidErrorMessages.rb:77
 msgid "Malay"
-msgstr ""
+msgstr "Malayisk"
 
 #: src/modules/SquidErrorMessages.rb:78
 msgid "Dutch"
@@ -1551,7 +1551,7 @@
 
 #: src/modules/SquidErrorMessages.rb:79
 msgid "Occitan"
-msgstr ""
+msgstr "Occitan"
 
 #: src/modules/SquidErrorMessages.rb:80
 msgid "Polish"
@@ -1605,7 +1605,7 @@
 
 #: src/modules/SquidErrorMessages.rb:90
 msgid "Thai"
-msgstr ""
+msgstr "Thai"
 
 #: src/modules/SquidErrorMessages.rb:91
 msgid "Turkish"
@@ -1619,11 +1619,11 @@
 
 #: src/modules/SquidErrorMessages.rb:93
 msgid "Uzbek"
-msgstr ""
+msgstr "Usbekistansk"
 
 #: src/modules/SquidErrorMessages.rb:94
 msgid "Vietnamese"
-msgstr ""
+msgstr "Vietnamesisk"
 
 #: src/modules/SquidErrorMessages.rb:95
 msgid "Simplified Chinese"

Modified: trunk/yast/nb/po/sshd.nb.po
===================================================================
--- trunk/yast/nb/po/sshd.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/sshd.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: sshd.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:56+0100\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2009-08-13 17:00+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -282,7 +282,7 @@
 #. Table header
 #: tutorials/tutorial-includes/sshd/t1-start-complex.ycp:63
 msgid "Number"
-msgstr ""
+msgstr "Nummer"
 
 #: tutorials/tutorial-includes/sshd/t1-start-complex.ycp:63
 msgid "Sshd"

Modified: trunk/yast/nb/po/storage.nb.po
===================================================================
--- trunk/yast/nb/po/storage.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/storage.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: storage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-09-29 18:07+0200\n"
 "PO-Revision-Date: 2009-10-08 13:00+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -100,7 +100,7 @@
 msgstr "&Opprett partisjonsoppsett..."
 
 #. popup text
-#: src/clients/inst_disk_proposal.rb:117
+#: src/clients/inst_disk_proposal.rb:123
 #: src/clients/partitions_proposal.rb:105
 msgid ""
 "No automatic proposal possible.\n"
@@ -113,7 +113,7 @@
 #. this is the resize case
 #.
 #. this is the normal case
-#: src/clients/inst_disk_proposal.rb:129 src/clients/inst_target_part.rb:164
+#: src/clients/inst_disk_proposal.rb:135 src/clients/inst_target_part.rb:164
 #: src/clients/inst_target_part.rb:178 src/clients/inst_target_part.rb:185
 #, fuzzy
 #| msgid "Proposal settings"
@@ -121,7 +121,7 @@
 msgstr "Forslag til innstillinger"
 
 #. help on suggested partitioning
-#: src/clients/inst_disk_proposal.rb:159
+#: src/clients/inst_disk_proposal.rb:165
 msgid ""
 "<p>\n"
 "Your hard disks have been checked. The partition setup\n"
@@ -133,7 +133,7 @@
 
 #. help text continued
 #. %1 is replaced by button text
-#: src/clients/inst_disk_proposal.rb:169
+#: src/clients/inst_disk_proposal.rb:175
 msgid ""
 "<p>\n"
 "To make only small adjustments to the proposed\n"
@@ -148,7 +148,7 @@
 "avansert partisjonering.</p>\n"
 
 #. help text continued
-#: src/clients/inst_disk_proposal.rb:182
+#: src/clients/inst_disk_proposal.rb:188
 msgid ""
 "<p>\n"
 "If the suggestion does not fit your needs, create\n"
@@ -168,15 +168,23 @@
 
 #. Attention! besides the testsuite, AutoYaST is using this to turn off
 #. the proposal screen too. See inst_autosetup.ycp
-#: src/clients/inst_disk_proposal.rb:226
+#: src/clients/inst_disk_proposal.rb:232
 msgid "Impossible to create the requested proposal."
 msgstr "Dette forslaget kunne ikke opprettes."
 
-#: src/clients/inst_disk_proposal.rb:230 src/clients/inst_target_part.rb:449
+#. TRANSLATORS: popup error message
+#: src/clients/inst_disk_proposal.rb:238
+#, fuzzy
+#| msgid "Not enough space available to propose separate /home."
+msgid "Not enough space available to propose snapshots for root volume."
+msgstr "Det er ikke nok ledig plass til å foreslå en separat partisjon for /home."
+
+#. TRANSLATORS: popup error message
+#: src/clients/inst_disk_proposal.rb:244 src/clients/inst_target_part.rb:449
 msgid "Not enough space available to propose separate /home."
 msgstr "Det er ikke nok ledig plass til å foreslå en separat partisjon for /home."
 
-#: src/clients/inst_disk_proposal.rb:314
+#: src/clients/inst_disk_proposal.rb:295
 msgid ""
 "Computing this proposal will overwrite manual changes \n"
 "done so far. Continue with computing proposal?"
@@ -964,7 +972,7 @@
 #. Label text
 #. TRANSLATORS: checkbox text
 #: src/include/partitioning/auto_part_ui.rb:341
-#: src/modules/StorageProposal.rb:6209
+#: src/modules/StorageProposal.rb:6230
 msgid "Propose Separate &Home Partition"
 msgstr "Foreslå separat partisjon for &hjemmekatalog"
 
@@ -982,7 +990,7 @@
 msgstr "Forslagstype"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:253
+#: src/include/partitioning/custom_part_check_generated.rb:246
 msgid ""
 "You have not assigned a root partition for\n"
 "installation. This does not work. Assign the root mount point \"/\" to a\n"
@@ -997,7 +1005,7 @@
 "Vil du virkelig bruke dette oppsettet?\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:266
+#: src/include/partitioning/custom_part_check_generated.rb:259
 msgid ""
 "You tried to mount a FAT partition to one of the following mount\n"
 "points: /, /usr, /home, /opt or /var. This will very likely cause problems.\n"
@@ -1013,7 +1021,7 @@
 "Vil du virkelig bruke dette oppsettet?\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:279
+#: src/include/partitioning/custom_part_check_generated.rb:272
 msgid ""
 "You tried to mount a FAT partition to the\n"
 "mount point /boot. This will very likely cause problems. Use a Linux file\n"
@@ -1028,7 +1036,7 @@
 "Vil du virkelig bruke dette oppsettet?\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:293
+#: src/include/partitioning/custom_part_check_generated.rb:286
 msgid ""
 "You have mounted a partition with Btrfs to the\n"
 "mount point /boot. This will very likely cause problems. Use a Linux file\n"
@@ -1043,7 +1051,7 @@
 "Vil du virkelig bruke dette oppsettet?\n"
 
 #. popup text, %1 is a number
-#: src/include/partitioning/custom_part_check_generated.rb:308
+#: src/include/partitioning/custom_part_check_generated.rb:301
 msgid ""
 "Warning:\n"
 "Your boot partition ends above cylinder %1.\n"
@@ -1064,7 +1072,7 @@
 "Vil du bruke dette oppsettet?\n"
 
 #. popup text, %1 is a size
-#: src/include/partitioning/custom_part_check_generated.rb:328
+#: src/include/partitioning/custom_part_check_generated.rb:321
 msgid ""
 "Warning:\n"
 "Your boot partition is smaller than %1.\n"
@@ -1079,7 +1087,7 @@
 "Vil du virkelig bruke denne størrelsen på oppstartspartisjonen?\n"
 
 #. /////////////////////////// NO BOOT ///////////////////////////
-#: src/include/partitioning/custom_part_check_generated.rb:345
+#: src/include/partitioning/custom_part_check_generated.rb:338
 msgid ""
 "Warning: There is no partition of type bios_grub present.\n"
 "To boot from a GPT disk using grub2 such a partition is needed.\n"
@@ -1090,7 +1098,7 @@
 #. popup text
 #. If the user chooses 'no' here, the system will not be able to
 #. boot from the hard drive!
-#: src/include/partitioning/custom_part_check_generated.rb:365
+#: src/include/partitioning/custom_part_check_generated.rb:358
 msgid ""
 "Warning: There is no partition mounted as /boot.\n"
 "To boot from your hard disk, a small /boot partition\n"
@@ -1109,7 +1117,7 @@
 "Vil du virkelig bruke dette oppsettet uten en /boot-partisjon?\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:385
+#: src/include/partitioning/custom_part_check_generated.rb:378
 msgid ""
 "Warning: According to your setup, you intend to\n"
 "boot your machine from the root partition (/), which, unfortunately,\n"
@@ -1128,7 +1136,7 @@
 "\n"
 "Vil du virkelig bruke dette oppsettet?\n"
 
-#: src/include/partitioning/custom_part_check_generated.rb:403
+#: src/include/partitioning/custom_part_check_generated.rb:398
 msgid ""
 "Warning: Some subvolumes of the root filesystem are shadowed by\n"
 "mount points of other filesystem. This could lead to problems.\n"
@@ -1137,7 +1145,7 @@
 msgstr ""
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:422
+#: src/include/partitioning/custom_part_check_generated.rb:415
 msgid ""
 "Warning: With your current setup, your %1\n"
 "installation might not be directly bootable, because\n"
@@ -1154,31 +1162,8 @@
 "Vil du virkelig bruke dette oppsettet?\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:443
+#: src/include/partitioning/custom_part_check_generated.rb:433
 msgid ""
-"Warning: With your current setup, your %1 installation\n"
-"will encounter problems when booting, because you have no \"boot\"\n"
-"partition and your \"root\" partition is an LVM logical volume.\n"
-"This does not work.\n"
-"\n"
-"If you do not know exactly what you are doing, use a normal\n"
-"partition for your files below /boot.\n"
-"\n"
-"Really use this setup?\n"
-msgstr ""
-"Advarsel: Med dette oppsettet vil det oppstå\n"
-"problemer under oppstart av %1 fordi du ikke\n"
-"har noen boot-partisjon og fordi root-partisjonen er et logisk LVM-volum.\n"
-"Dette vil ikke fungere.\n"
-"\n"
-"Hvis du vet nøyaktig hva du gjør, kan du bruke en vanlig partisjon\n"
-"for filene under /boot.\n"
-"\n"
-"Vil du virkelig bruke dette oppsettet?\n"
-
-#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:464
-msgid ""
 "Warning: With your current setup, your %2 installation\n"
 "will encounter problems when booting, because you have no\n"
 "FAT partition mounted on %1.\n"
@@ -1202,7 +1187,7 @@
 "Vil du virkelig bruke dette oppsettet?\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:486
+#: src/include/partitioning/custom_part_check_generated.rb:455
 msgid ""
 "Warning: With your current setup, your %2 installation will\n"
 "encounter problems when booting, because you have no \n"
@@ -1227,12 +1212,12 @@
 "Vil du virkelig bruke dette oppsettet?\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:509
+#: src/include/partitioning/custom_part_check_generated.rb:478
 msgid "Really use this setup?"
 msgstr "Vil du virkelig bruke dette oppsettet?"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:517
+#: src/include/partitioning/custom_part_check_generated.rb:486
 msgid ""
 "\n"
 "You have not assigned a swap partition. In most cases, we highly recommend \n"
@@ -1253,7 +1238,7 @@
 "Vil du virkelig bruke dette oppsettet uten en veksleminnepartisjon?\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:533
+#: src/include/partitioning/custom_part_check_generated.rb:502
 msgid ""
 "\n"
 "You chose to install onto an existing partition that will not be\n"
@@ -1266,7 +1251,7 @@
 "vellykket, spesielt i følgende tilfeller:\n"
 
 #. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:540
+#: src/include/partitioning/custom_part_check_generated.rb:509
 msgid ""
 "- if this is an existing ReiserFS partition\n"
 "- if this partition already contains a Linux distribution that will be\n"
@@ -1279,7 +1264,7 @@
 "- dersom denne partisjonen ikke inneholder noe filsystem ennå\n"
 
 #. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:547
+#: src/include/partitioning/custom_part_check_generated.rb:516
 msgid ""
 "If in doubt, better go back and mark this partition for\n"
 "formatting, especially if it is assigned to one of the standard mount points\n"
@@ -1290,7 +1275,7 @@
 "som f.eks. /, /boot,/usr, /opt eller /var.\n"
 
 #. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:553
+#: src/include/partitioning/custom_part_check_generated.rb:522
 msgid ""
 "If you decide to format the partition, all data on it will be lost.\n"
 "\n"
@@ -1301,7 +1286,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:608
+#: src/include/partitioning/custom_part_check_generated.rb:577
 msgid ""
 "The selected device belongs to the RAID (%1).\n"
 "Remove it from the RAID before editing it.\n"
@@ -1310,7 +1295,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:619
+#: src/include/partitioning/custom_part_check_generated.rb:588
 msgid ""
 "The selected device belongs to a volume group (%1).\n"
 "Remove it from the volume group before editing it.\n"
@@ -1319,7 +1304,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:629
+#: src/include/partitioning/custom_part_check_generated.rb:598
 msgid ""
 "The selected device is used by volume (%1).\n"
 "Remove the volume before editing it.\n"
@@ -1328,7 +1313,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:662
+#: src/include/partitioning/custom_part_check_generated.rb:631
 msgid ""
 "The device (%2) belongs to the RAID (%1).\n"
 "Remove it from the RAID before deleting it.\n"
@@ -1337,7 +1322,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:673
+#: src/include/partitioning/custom_part_check_generated.rb:642
 msgid ""
 "The device (%2) is used by %1.\n"
 "Remove %1 before deleting it.\n"
@@ -1345,12 +1330,12 @@
 "Enheten (%2) benyttes av %1.\n"
 "Fjern %1 før du sletter den.\n"
 
-#: src/include/partitioning/custom_part_check_generated.rb:685
+#: src/include/partitioning/custom_part_check_generated.rb:654
 msgid "It cannot be deleted while mounted."
 msgstr "Kan ikke slettes mens den er montert."
 
 #. popup text, %1 is a device name
-#: src/include/partitioning/custom_part_check_generated.rb:721
+#: src/include/partitioning/custom_part_check_generated.rb:690
 msgid ""
 "The device (%1) cannot be removed since it is a logical partition and \n"
 "another logical partition with a higher number is in use.\n"
@@ -1359,7 +1344,7 @@
 "en annen logisk partisjon med høyere nummer er i bruk.\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:797
+#: src/include/partitioning/custom_part_check_generated.rb:766
 msgid ""
 "The selected extended partition contains partitions which are currently mounted:\n"
 "%1\n"
@@ -1372,7 +1357,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:815
+#: src/include/partitioning/custom_part_check_generated.rb:784
 msgid ""
 "\n"
 "The selected extended partition contains at least one LVM partition\n"
@@ -1387,7 +1372,7 @@
 "før du sletter den utvidede partisjonen.\n"
 
 #. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_check_generated.rb:826
+#: src/include/partitioning/custom_part_check_generated.rb:795
 msgid ""
 "\n"
 "The selected extended partition contains at least one partition\n"
@@ -1402,7 +1387,7 @@
 "den utvidede partisjonen.\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:837
+#: src/include/partitioning/custom_part_check_generated.rb:806
 msgid ""
 "\n"
 "The selected extended partition contains at least one partition\n"
@@ -1421,13 +1406,13 @@
 
 #. label text
 #: src/include/partitioning/custom_part_dialogs.rb:75
-#: src/include/partitioning/ep-dialogs.rb:672
-#: src/modules/StorageProposal.rb:6336
+#: src/include/partitioning/ep-dialogs.rb:768
+#: src/modules/StorageProposal.rb:6357
 msgid "Do not forget what you enter here!"
 msgstr "Ikke glem hva du skriver inn her!"
 
 #: src/include/partitioning/custom_part_dialogs.rb:79
-#: src/include/partitioning/ep-dialogs.rb:675
+#: src/include/partitioning/ep-dialogs.rb:771
 msgid "Empty password allowed."
 msgstr "Passord er ikke nødvendig."
 
@@ -1456,7 +1441,7 @@
 #. Label: get password for user root
 #. Please use newline if label is longer than 40 characters
 #: src/include/partitioning/custom_part_dialogs.rb:137
-#: src/include/partitioning/ep-dialogs.rb:700
+#: src/include/partitioning/ep-dialogs.rb:796
 msgid "&Enter a Password for your File System:"
 msgstr "Skriv inn &et passord for filsystemet:"
 
@@ -1467,7 +1452,7 @@
 #. Label: get same password again for verification
 #. Please use newline if label is longer than 40 characters
 #: src/include/partitioning/custom_part_dialogs.rb:148
-#: src/include/partitioning/ep-dialogs.rb:684 src/modules/Storage.rb:3995
+#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:3998
 msgid "Reenter the Password for &Verification:"
 msgstr "&Gjenta passordet:"
 
@@ -1490,7 +1475,7 @@
 #. popup text
 #. popup text
 #: src/include/partitioning/custom_part_dialogs.rb:197
-#: src/modules/Storage.rb:3951
+#: src/modules/Storage.rb:3954
 msgid ""
 "You did not enter a password.\n"
 "Try again.\n"
@@ -1501,7 +1486,7 @@
 #. popup text
 #. popup text
 #: src/include/partitioning/custom_part_dialogs.rb:204
-#: src/modules/Storage.rb:3959
+#: src/modules/Storage.rb:3962
 msgid ""
 "The password must have at least %1 characters.\n"
 "Try again.\n"
@@ -1882,7 +1867,7 @@
 #. TRANSLATOR: checkbox text
 #. TRANSLATORS: checkbox text
 #: src/include/partitioning/custom_part_dialogs.rb:1650
-#: src/modules/StorageProposal.rb:6190
+#: src/modules/StorageProposal.rb:6211
 msgid "Enable Snapshots"
 msgstr ""
 
@@ -1893,11 +1878,11 @@
 msgid "Subvolume Handling"
 msgstr "Behandling av undervolumer"
 
-#: src/include/partitioning/custom_part_dialogs.rb:1721
+#: src/include/partitioning/custom_part_dialogs.rb:1724
 msgid "Empty subvolume name not allowed."
 msgstr "Du må angi et navn på undervolumet."
 
-#: src/include/partitioning/custom_part_dialogs.rb:1725
+#: src/include/partitioning/custom_part_dialogs.rb:1728
 msgid ""
 "Only subvolume names starting with \"%1\" currently allowed!\n"
 "Automatically prepending \"%1\" to name of subvolume."
@@ -1905,11 +1890,11 @@
 "Bare undervolumnavn som begynner med \"%1\" er tillat!\n"
 "Legger automatisk til \"%1\" foran undervolumnavnet."
 
-#: src/include/partitioning/custom_part_dialogs.rb:1734
+#: src/include/partitioning/custom_part_dialogs.rb:1738
 msgid "Subvolume name %1 already exists."
 msgstr "Undervolumnavnet %1 finnes allerede."
 
-#: src/include/partitioning/custom_part_dialogs.rb:1765
+#: src/include/partitioning/custom_part_dialogs.rb:1767
 msgid "Modifications done so far in this dialog will be lost."
 msgstr "Alle tidligere endringer i dialogen vil gå tapt."
 
@@ -1952,7 +1937,7 @@
 
 #. helptext
 #: src/include/partitioning/custom_part_helptexts.rb:87
-#: src/include/partitioning/ep-dialogs.rb:612
+#: src/include/partitioning/ep-dialogs.rb:708
 msgid ""
 "<p>\n"
 "This mount point corresponds to a temporary filesystem like /tmp or /var/tmp.\n"
@@ -1971,7 +1956,7 @@
 #. help text, continued
 #. helptext
 #: src/include/partitioning/custom_part_helptexts.rb:100
-#: src/include/partitioning/ep-dialogs.rb:627
+#: src/include/partitioning/ep-dialogs.rb:723
 msgid ""
 "<p>\n"
 "If you forget your password, you will lose access to the data on your file system.\n"
@@ -1990,7 +1975,7 @@
 #. help text, continued
 #. helptext, %1 is replaced by integer
 #: src/include/partitioning/custom_part_helptexts.rb:114
-#: src/include/partitioning/ep-dialogs.rb:641
+#: src/include/partitioning/ep-dialogs.rb:737
 msgid ""
 "<p>\n"
 "You must distinguish between uppercase and lowercase. A password should have at\n"
@@ -2022,7 +2007,7 @@
 #. help text, continued
 #. helptext
 #: src/include/partitioning/custom_part_helptexts.rb:142
-#: src/include/partitioning/ep-dialogs.rb:653
+#: src/include/partitioning/ep-dialogs.rb:749
 msgid ""
 "<p>\n"
 "Do not forget this password!\n"
@@ -2266,12 +2251,12 @@
 
 #. //////////////////////////////////////////////
 #. modify map new
-#: src/include/partitioning/custom_part_lib.rb:947
-#: src/include/partitioning/custom_part_lib.rb:974
+#: src/include/partitioning/custom_part_lib.rb:954
+#: src/include/partitioning/custom_part_lib.rb:981
 msgid "The file system is currently mounted on %1."
 msgstr "Filsystemet er montert på %1."
 
-#: src/include/partitioning/custom_part_lib.rb:952
+#: src/include/partitioning/custom_part_lib.rb:959
 msgid ""
 "You can try to unmount it now, continue without unmounting or cancel.\n"
 "Click Cancel unless you know exactly what you are doing."
@@ -2281,12 +2266,12 @@
 
 #. button text
 #. button text
-#: src/include/partitioning/custom_part_lib.rb:963
-#: src/include/partitioning/custom_part_lib.rb:988
+#: src/include/partitioning/custom_part_lib.rb:970
+#: src/include/partitioning/custom_part_lib.rb:995
 msgid "Unmount"
 msgstr "Avmonter"
 
-#: src/include/partitioning/custom_part_lib.rb:979
+#: src/include/partitioning/custom_part_lib.rb:986
 msgid ""
 "You can try to unmount it now or cancel.\n"
 "Click Cancel unless you know exactly what you are doing."
@@ -2294,20 +2279,20 @@
 "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:1025
+#: src/include/partitioning/custom_part_lib.rb:1032
 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:1038
+#: src/include/partitioning/custom_part_lib.rb:1045
 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:1049
+#: src/include/partitioning/custom_part_lib.rb:1056
 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."
 
 #. push button text
-#: src/include/partitioning/ep-all.rb:78
+#: src/include/partitioning/ep-all.rb:80
 msgid "Rescan Devices"
 msgstr "Søk etter enheter på nytt"
 
@@ -2317,47 +2302,54 @@
 msgstr "Importer monteringspunkter..."
 
 #. menu entry text
-#: src/include/partitioning/ep-all.rb:100
+#: src/include/partitioning/ep-all.rb:94
 msgid "Provide Crypt &Passwords..."
 msgstr "Angi krypterings&passord..."
 
 #. menu entry text
-#: src/include/partitioning/ep-all.rb:112
+#: src/include/partitioning/ep-all.rb:99
 msgid "Configure &iSCSI..."
 msgstr "Sett opp &iSCSI..."
 
 #. menu entry text
-#: src/include/partitioning/ep-all.rb:124
+#: src/include/partitioning/ep-all.rb:104
+#, fuzzy
+#| msgid "Configure &zFCP..."
+msgid "Configure &FCoE..."
+msgstr "Sett opp &zFCP..."
+
+#. menu entry text
+#: src/include/partitioning/ep-all.rb:109
 msgid "Configure &Multipath..."
 msgstr "Sett opp &Multipath..."
 
 #. menu entry text
-#: src/include/partitioning/ep-all.rb:133
+#: src/include/partitioning/ep-all.rb:114
 msgid "Configure &DASD..."
 msgstr "Sett opp &DASD..."
 
 #. menu entry text
-#: src/include/partitioning/ep-all.rb:141
+#: src/include/partitioning/ep-all.rb:119
 msgid "Configure &zFCP..."
 msgstr "Sett opp &zFCP..."
 
 #. menu entry text
-#: src/include/partitioning/ep-all.rb:149
+#: src/include/partitioning/ep-all.rb:124
 msgid "Configure &XPRAM..."
 msgstr "Sett opp &XPRAM..."
 
 #. menu button text
-#: src/include/partitioning/ep-all.rb:157
+#: src/include/partitioning/ep-all.rb:129
 msgid "Configure..."
 msgstr "Konfigurer..."
 
 #. dialog heading, %1 is replaced with hostname
-#: src/include/partitioning/ep-all.rb:169
+#: src/include/partitioning/ep-all.rb:140
 msgid "Available Storage on %1"
 msgstr "Tilgjengelig plass på %1"
 
 #. helptext
-#: src/include/partitioning/ep-all.rb:184
+#: src/include/partitioning/ep-all.rb:155
 msgid ""
 "<p>This view shows all storage devices\n"
 "available.</p>"
@@ -2366,7 +2358,7 @@
 "lagringsenheter.</p>"
 
 #. helptext
-#: src/include/partitioning/ep-all.rb:192
+#: src/include/partitioning/ep-all.rb:163
 msgid ""
 "<p>By double clicking a table entry,\n"
 "you navigate to the view with detailed information about the\n"
@@ -2377,7 +2369,7 @@
 "enheten.</p>\n"
 
 #. helptext
-#: src/include/partitioning/ep-all.rb:202
+#: src/include/partitioning/ep-all.rb:173
 msgid ""
 "<p>By selecting a table entry you can\n"
 "navigate to the view with detailed information about the device.</p>"
@@ -2386,7 +2378,7 @@
 "for å gå til et vindu med detaljert informasjon om den aktuelle enheten.</p>"
 
 #. popup text
-#: src/include/partitioning/ep-all.rb:262
+#: src/include/partitioning/ep-all.rb:233
 msgid ""
 "Rescaning disks cancels all current changes.\n"
 "Really rescan disks?"
@@ -2395,7 +2387,7 @@
 "Vil du virkelig skanne diskene på nytt?"
 
 #. popup text
-#: src/include/partitioning/ep-all.rb:280
+#: src/include/partitioning/ep-all.rb:251
 msgid ""
 "Calling iSCSI configuration cancels all current changes.\n"
 "Really call iSCSI configuration?"
@@ -2404,9 +2396,22 @@
 "Vil du virkelig kjøre iSCSI-oppsettet?"
 
 #. popup text
+#: src/include/partitioning/ep-all.rb:260
+#, fuzzy
+#| msgid ""
+#| "Calling zFCP configuration cancels all current changes.\n"
+#| "Really call zFCP configuration?"
+msgid ""
+"Calling FCoE configuration cancels all current changes.\n"
+"Really call FCoE configuration?"
+msgstr ""
+"Kjøring av zFCP-oppsettet annullerer alle endringer.\n"
+"Vil du virkelig kjøre zFCP-oppsettet?"
+
 #. popup text
-#: src/include/partitioning/ep-all.rb:294
-#: src/include/partitioning/ep-all.rb:303
+#. popup text
+#: src/include/partitioning/ep-all.rb:274
+#: src/include/partitioning/ep-all.rb:283
 msgid ""
 "Calling multipath configuration cancels all current changes.\n"
 "Really call multipath configuration?\n"
@@ -2415,7 +2420,7 @@
 "Vil du virkelig kjøre multipath-oppsettet?\n"
 
 #. popup text
-#: src/include/partitioning/ep-all.rb:320
+#: src/include/partitioning/ep-all.rb:300
 msgid ""
 "Calling DASD configuration cancels all current changes.\n"
 "Really call DASD configuration?"
@@ -2424,7 +2429,7 @@
 "Vil du virkelig kjøre DASD-oppsettet?"
 
 #. popup text
-#: src/include/partitioning/ep-all.rb:329
+#: src/include/partitioning/ep-all.rb:309
 msgid ""
 "Calling zFCP configuration cancels all current changes.\n"
 "Really call zFCP configuration?"
@@ -2433,7 +2438,7 @@
 "Vil du virkelig kjøre zFCP-oppsettet?"
 
 #. popup text
-#: src/include/partitioning/ep-all.rb:338
+#: src/include/partitioning/ep-all.rb:318
 msgid ""
 "Calling XPRAM configuration cancels all current changes.\n"
 "Really call XPRAM configuration?"
@@ -2706,7 +2711,43 @@
 msgstr "Br&ukt enhet"
 
 #. helptext
-#: src/include/partitioning/ep-dialogs.rb:38
+#: src/include/partitioning/ep-dialogs.rb:39
+#, fuzzy
+#| msgid "<p>Choose the size for the new partition.</p>"
+msgid "<p>Choose the role of the device.</p>"
+msgstr "<p>Velg størrelsen på den nye partisjonen.</p>"
+
+#. radio button text
+#: src/include/partitioning/ep-dialogs.rb:55
+msgid "Operating System"
+msgstr "Operativsystem"
+
+#. radio button text
+#: src/include/partitioning/ep-dialogs.rb:60
+#, 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
+msgid "Swap"
+msgstr ""
+
+#. radio button text
+#: src/include/partitioning/ep-dialogs.rb:70
+msgid "Raw Volume (unformatted)"
+msgstr ""
+
+#. heading for a frame in a dialog
+#: src/include/partitioning/ep-dialogs.rb:78
+#, fuzzy
+#| msgid "Role: %s"
+msgid "Role"
+msgstr "Rolle: %s"
+
+#. helptext
+#: src/include/partitioning/ep-dialogs.rb:107
 msgid ""
 "<p>First, choose whether the partition should be\n"
 "formatted and the desired file system type.</p>"
@@ -2715,7 +2756,7 @@
 "og ønsket filsystemtype.</p>"
 
 #. helptext
-#: src/include/partitioning/ep-dialogs.rb:45
+#: src/include/partitioning/ep-dialogs.rb:114
 msgid ""
 "<p>If you want to encrypt all data on the\n"
 "volume, select <b>Encrypt Device</b>. Changing the encryption on an existing\n"
@@ -2726,7 +2767,7 @@
 "volum, vil alle data på volumet bli slettet.</p>\n"
 
 #. helptext
-#: src/include/partitioning/ep-dialogs.rb:55
+#: src/include/partitioning/ep-dialogs.rb:124
 msgid ""
 "<p>Then, choose whether the partition should\n"
 "be mounted and enter the mount point (/, /boot, /home, /var, etc.).</p>"
@@ -2735,47 +2776,47 @@
 " og monteringspunktet ( /, /boot, /usr, /var osv.).</p>"
 
 #. set globals
-#: src/include/partitioning/ep-dialogs.rb:213
+#: src/include/partitioning/ep-dialogs.rb:309
 msgid "Formatting Options"
 msgstr "Formateringsvalg"
 
-#: src/include/partitioning/ep-dialogs.rb:221
+#: src/include/partitioning/ep-dialogs.rb:317
 msgid "Format partition"
 msgstr "Formater partisjon"
 
-#: src/include/partitioning/ep-dialogs.rb:232
+#: src/include/partitioning/ep-dialogs.rb:328
 msgid "Do not format partition"
 msgstr "Ikke formater partisjon"
 
-#: src/include/partitioning/ep-dialogs.rb:248
+#: src/include/partitioning/ep-dialogs.rb:344
 msgid "Do not mount partition"
 msgstr "Ikke monter partisjonen"
 
-#: src/include/partitioning/ep-dialogs.rb:267
+#: src/include/partitioning/ep-dialogs.rb:363
 msgid "Mounting Options"
 msgstr "Monteringsvalg"
 
-#: src/include/partitioning/ep-dialogs.rb:275
+#: src/include/partitioning/ep-dialogs.rb:371
 msgid "Mount partition"
 msgstr "Monter partisjonen"
 
 #. Column header
-#: src/include/partitioning/ep-dialogs.rb:281 src/modules/StorageFields.rb:144
+#: src/include/partitioning/ep-dialogs.rb:377 src/modules/StorageFields.rb:144
 msgid "Mount Point"
 msgstr "Monteringspunkt"
 
 #. button text
-#: src/include/partitioning/ep-dialogs.rb:288
+#: src/include/partitioning/ep-dialogs.rb:384
 msgid "Fs&tab Options..."
 msgstr "Fs&tab-valg..."
 
 #. error popup
-#: src/include/partitioning/ep-dialogs.rb:462
+#: src/include/partitioning/ep-dialogs.rb:558
 msgid "Crypt files must be encrypted."
 msgstr "Kryptofiler må være kryptert."
 
 #. error popup
-#: src/include/partitioning/ep-dialogs.rb:473
+#: src/include/partitioning/ep-dialogs.rb:569
 msgid ""
 "You chose to create the crypt file, but did not specify\n"
 "that it should be formatted. This does not make sense.\n"
@@ -2788,17 +2829,17 @@
 "Kryss av for formatering også.\n"
 
 #. error popup
-#: src/include/partitioning/ep-dialogs.rb:489
+#: src/include/partitioning/ep-dialogs.rb:585
 msgid "Crypt files require a mount point."
 msgstr "Krypteringsfiler må ha et monteringspunkt."
 
 #. error popup
-#: src/include/partitioning/ep-dialogs.rb:503
+#: src/include/partitioning/ep-dialogs.rb:599
 msgid "Tmpfs requires a mount point."
 msgstr "Tmpfs må ha et monteringspunkt."
 
 #. helptext
-#: src/include/partitioning/ep-dialogs.rb:587
+#: src/include/partitioning/ep-dialogs.rb:683
 msgid ""
 "<p>\n"
 "Keep in mind that this file system is only protected when it is not\n"
@@ -2813,7 +2854,7 @@
 "</p>"
 
 #. helptext
-#: src/include/partitioning/ep-dialogs.rb:600
+#: src/include/partitioning/ep-dialogs.rb:696
 msgid ""
 "<p>\n"
 "The file system used for this volume is swap. You can leave the encryption \n"
@@ -2827,21 +2868,21 @@
 "(diskdvale).\n"
 "</p>\n"
 
-#: src/include/partitioning/ep-dialogs.rb:670
+#: src/include/partitioning/ep-dialogs.rb:766
 msgid "All data stored on the volume will be lost!"
 msgstr "Alle data som er lagret på volumet, vil gåt tapt!"
 
-#: src/include/partitioning/ep-dialogs.rb:693
+#: src/include/partitioning/ep-dialogs.rb:789
 msgid "Password"
 msgstr "Passord"
 
 #. popup text
-#: src/include/partitioning/ep-dialogs.rb:790
+#: src/include/partitioning/ep-dialogs.rb:886
 msgid "Resize not supported by underlying device."
 msgstr "Enheten støtter ikke endring av størrelse."
 
 #. popup text
-#: src/include/partitioning/ep-dialogs.rb:795
+#: src/include/partitioning/ep-dialogs.rb:891
 msgid ""
 "\n"
 "You cannot resize the selected partition because the file system\n"
@@ -2851,7 +2892,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:819
+#: src/include/partitioning/ep-dialogs.rb:915
 msgid ""
 "It is not possible to check whether a NTFS\n"
 "can be resized while it is mounted."
@@ -2860,7 +2901,7 @@
 "-størrelsen mens filsystemet er montert."
 
 #. FIXME: Really?
-#: src/include/partitioning/ep-dialogs.rb:838
+#: src/include/partitioning/ep-dialogs.rb:934
 msgid ""
 "Partition %1 cannot be resized\n"
 "because the filesystem seems to be inconsistent.\n"
@@ -2869,21 +2910,21 @@
 "fordi filsystemet ser ut til å være inkonsistent.\n"
 
 #. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:865
+#: src/include/partitioning/ep-dialogs.rb:961
 msgid "Resize Partition %1"
 msgstr "Endre størrelse på partisjon %1"
 
 #. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:886
+#: src/include/partitioning/ep-dialogs.rb:982
 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:918
+#: src/include/partitioning/ep-dialogs.rb:1014
 msgid "Current size: %1"
 msgstr "Gjeldende størrelse: %1"
 
-#: src/include/partitioning/ep-dialogs.rb:930
+#: src/include/partitioning/ep-dialogs.rb:1026
 msgid "Currently used: %1"
 msgstr "Brukt størrelse: %1"
 
@@ -2891,8 +2932,8 @@
 #. input field label
 #. combo box label
 #. Column header
-#: src/include/partitioning/ep-dialogs.rb:943
-#: src/include/partitioning/ep-dialogs.rb:980
+#: src/include/partitioning/ep-dialogs.rb:1039
+#: src/include/partitioning/ep-dialogs.rb:1076
 #: src/include/partitioning/ep-hd-dialogs.rb:256
 #: src/include/partitioning/ep-loop-dialogs.rb:118
 #: src/include/partitioning/ep-lvm-dialogs.rb:559
@@ -2904,33 +2945,33 @@
 
 #. radio button text, %1 is replaced by size
 #. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:953
+#: src/include/partitioning/ep-dialogs.rb:1049
 #: src/include/partitioning/ep-hd-dialogs.rb:242
 #: src/include/partitioning/ep-lvm-dialogs.rb:535
 msgid "Maximum Size (%1)"
 msgstr "Maksimal størrelse (%1)"
 
 #. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:963
+#: src/include/partitioning/ep-dialogs.rb:1059
 msgid "Minimum Size (%1)"
 msgstr "Minimum størrelse (%1)"
 
 #. radio button text
 #. radio button text
-#: src/include/partitioning/ep-dialogs.rb:972
+#: src/include/partitioning/ep-dialogs.rb:1068
 #: src/include/partitioning/ep-hd-dialogs.rb:251
 #: src/include/partitioning/ep-lvm-dialogs.rb:568
 msgid "Custom Size"
 msgstr "Egendefinert størrelse"
 
 #. help text
-#: src/include/partitioning/ep-dialogs.rb:1006
+#: src/include/partitioning/ep-dialogs.rb:1102
 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:1057
+#: src/include/partitioning/ep-dialogs.rb:1153
 #: src/include/partitioning/ep-hd-dialogs.rb:359
 #: src/include/partitioning/ep-lvm-dialogs.rb:692
 msgid "The size entered is invalid. Enter a size between %1 and %2."
@@ -2940,7 +2981,7 @@
 #. after user tries to do that is stupid - in some cases
 #. we can tell beforehand, thus user should never get to this
 #. point (e.g. when the partition is mounted)
-#: src/include/partitioning/ep-dialogs.rb:1100
+#: src/include/partitioning/ep-dialogs.rb:1196
 msgid ""
 "You are extending a mounted filesystem by %1 Gigabyte. \n"
 "This may be quite slow and can take hours. You might possibly want \n"
@@ -2953,12 +2994,12 @@
 "endre størrelsen."
 
 #. label for log view
-#: src/include/partitioning/ep-dialogs.rb:1176
+#: src/include/partitioning/ep-dialogs.rb:1272
 msgid "Output of %1"
 msgstr "Resultat fra %1"
 
 #. popup text
-#: src/include/partitioning/ep-dialogs.rb:1203
+#: src/include/partitioning/ep-dialogs.rb:1299
 msgid "Rescanning disks..."
 msgstr "Skanner disker på nytt..."
 
@@ -3150,50 +3191,50 @@
 msgstr "Det angitte området er ugyldig."
 
 #. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:537
+#: src/include/partitioning/ep-hd-dialogs.rb:548
 msgid "Add Partition on %1"
 msgstr "Legg til partisjon på %1"
 
 #. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:583
+#: src/include/partitioning/ep-hd-dialogs.rb:594
 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:616
+#: src/include/partitioning/ep-hd-dialogs.rb:627
 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:626
+#: src/include/partitioning/ep-hd-dialogs.rb:637
 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:635
+#: src/include/partitioning/ep-hd-dialogs.rb:646
 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:654
+#: src/include/partitioning/ep-hd-dialogs.rb:665
 msgid "Move partition %1?"
 msgstr "Vil du flytte partisjonen %1?"
 
 #. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:656
+#: src/include/partitioning/ep-hd-dialogs.rb:667
 msgid "Forward"
 msgstr "Forover"
 
 #. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:658
+#: src/include/partitioning/ep-hd-dialogs.rb:669
 msgid "Backward"
 msgstr "Bakover"
 
-#: src/include/partitioning/ep-hd-dialogs.rb:714
+#: src/include/partitioning/ep-hd-dialogs.rb:725
 msgid "Confirm Deleting of All Partitions"
 msgstr "Bekreft sletting av alle partisjoner"
 
-#: src/include/partitioning/ep-hd-dialogs.rb:716
+#: src/include/partitioning/ep-hd-dialogs.rb:727
 msgid ""
 "The disk \"%1\" contains at least one partition.\n"
 "If you proceed, the following partitions will be deleted:"
@@ -3201,7 +3242,7 @@
 "Disken «%1» inneholder minst én partisjon.\n"
 "Hvis du fortsetter, vil følgende partisjoner bli slettet:"
 
-#: src/include/partitioning/ep-hd-dialogs.rb:721
+#: src/include/partitioning/ep-hd-dialogs.rb:732
 msgid "Really delete all partitions on \"%1\"?"
 msgstr "Vil du virkelig slette alle partisjoner på «%1»?"
 
@@ -3214,7 +3255,7 @@
 
 #. error popup
 #. TRANSLATORS: error popup
-#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5161
+#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5164
 msgid "The disk is in use and cannot be modified."
 msgstr "Disken er i bruk, og kan ikke endres."
 
@@ -4177,12 +4218,12 @@
 msgstr "Brukt pool"
 
 #. dialog title, %1 is a volume group
-#: src/include/partitioning/ep-lvm-dialogs.rb:1017
+#: src/include/partitioning/ep-lvm-dialogs.rb:1028
 msgid "Add Logical Volume on %1"
 msgstr "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:1064
+#: src/include/partitioning/ep-lvm-dialogs.rb:1075
 msgid "Edit Logical Volume %1 on %2"
 msgstr "Rediger det logiske volumet %1 på %2"
 
@@ -4396,7 +4437,7 @@
 #. tree node label
 #. dialog heading
 #: src/include/partitioning/ep-main.rb:491
-#: src/include/partitioning/ep-settings.rb:107
+#: src/include/partitioning/ep-settings.rb:130
 msgid "Settings"
 msgstr "Innstillinger"
 
@@ -4620,17 +4661,17 @@
 msgstr "<p>Endre enhetene som brukes for RAID.</p>"
 
 #. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:631
+#: src/include/partitioning/ep-raid-dialogs.rb:642
 msgid "Add RAID %1"
 msgstr "Legg til RAID %1"
 
 #. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:665
+#: src/include/partitioning/ep-raid-dialogs.rb:676
 msgid "Resize RAID %1"
 msgstr "Endre størrelse på RAID %1"
 
 #. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:711
+#: src/include/partitioning/ep-raid-dialogs.rb:722
 msgid "Edit RAID %1"
 msgstr "Rediger RAID %1"
 
@@ -4745,108 +4786,120 @@
 
 #. list entry
 #. Column header
-#: src/include/partitioning/ep-settings.rb:34 src/modules/StorageFields.rb:165
+#: src/include/partitioning/ep-settings.rb:36 src/modules/StorageFields.rb:165
 msgid "Label"
 msgstr "Betegnelse"
 
 #. list entry
 #. combo box entry
 #. Column header
-#: src/include/partitioning/ep-settings.rb:36
-#: src/include/partitioning/ep-settings.rb:63 src/modules/StorageFields.rb:162
+#: src/include/partitioning/ep-settings.rb:38
+#: src/include/partitioning/ep-settings.rb:65 src/modules/StorageFields.rb:162
 msgid "UUID"
 msgstr "UUID"
 
 #. list entry
 #. Column header
-#: src/include/partitioning/ep-settings.rb:38 src/modules/StorageFields.rb:147
+#: src/include/partitioning/ep-settings.rb:40 src/modules/StorageFields.rb:147
 msgid "Mount by"
 msgstr "Monter med"
 
 #. list entry
 #. Column header
-#: src/include/partitioning/ep-settings.rb:40 src/modules/StorageFields.rb:150
+#: src/include/partitioning/ep-settings.rb:42 src/modules/StorageFields.rb:150
 msgid "Used by"
 msgstr "Brukes av"
 
 #. list entry
 #. Column header
-#: src/include/partitioning/ep-settings.rb:42 src/modules/StorageFields.rb:174
+#: src/include/partitioning/ep-settings.rb:44 src/modules/StorageFields.rb:174
 msgid "BIOS ID"
 msgstr "BIOS-id"
 
 #. list entry
-#: src/include/partitioning/ep-settings.rb:45
+#: src/include/partitioning/ep-settings.rb:47
 msgid "Cylinder information"
 msgstr "Sylinderinformasjon"
 
 #. list entry
-#: src/include/partitioning/ep-settings.rb:50
+#: src/include/partitioning/ep-settings.rb:52
 msgid "Fibre Channel information"
 msgstr "Fiberkanalinformasjon"
 
 #. list entry
-#: src/include/partitioning/ep-settings.rb:54
+#: src/include/partitioning/ep-settings.rb:56
 msgid "Encryption"
 msgstr "Kryptering"
 
 #. combo box entry
 #. combo box entry
-#: src/include/partitioning/ep-settings.rb:59
-#: src/include/partitioning/ep-settings.rb:152
+#: src/include/partitioning/ep-settings.rb:61
+#: src/include/partitioning/ep-settings.rb:81
 msgid "Device Name"
 msgstr "Enhetsnavn"
 
 #. combo box entry
-#: src/include/partitioning/ep-settings.rb:61
+#: src/include/partitioning/ep-settings.rb:63
 msgid "Volume Label"
 msgstr "Volumbetegnelse"
 
 #. combo box entry
 #. combo box entry
 #. Column header
-#: src/include/partitioning/ep-settings.rb:65
-#: src/include/partitioning/ep-settings.rb:154
-#: src/modules/StorageFields.rb:171
+#: src/include/partitioning/ep-settings.rb:67
+#: src/include/partitioning/ep-settings.rb:83 src/modules/StorageFields.rb:171
 msgid "Device ID"
 msgstr "Enhets-ID"
 
 #. combo box entry
 #. combo box entry
 #. Column header
-#: src/include/partitioning/ep-settings.rb:67
-#: src/include/partitioning/ep-settings.rb:156
-#: src/modules/StorageFields.rb:168
+#: src/include/partitioning/ep-settings.rb:69
+#: src/include/partitioning/ep-settings.rb:85 src/modules/StorageFields.rb:168
 msgid "Device Path"
 msgstr "Enhetsfilsti"
 
+#. combo box entry
+#: src/include/partitioning/ep-settings.rb:74
+#, fuzzy
+#| msgid "Optional"
+msgid "Optimal"
+msgstr "Valgfritt"
+
+#. combo box entry
+#: src/include/partitioning/ep-settings.rb:76
+#, fuzzy
+#| msgid "End Cylinder"
+msgid "Cylinder"
+msgstr "Sluttsylinder"
+
 #. combo box label
-#: src/include/partitioning/ep-settings.rb:115
+#: src/include/partitioning/ep-settings.rb:136
 msgid "Default Mount by"
 msgstr "Standardmontering med"
 
 #. combo box label
-#: src/include/partitioning/ep-settings.rb:126
+#: src/include/partitioning/ep-settings.rb:145
 msgid "Default File System"
 msgstr "Standard filsystem"
 
 #. combo box label
-#: src/include/partitioning/ep-settings.rb:137
+#: src/include/partitioning/ep-settings.rb:154
 msgid "Alignment of Newly Created Partitions"
 msgstr "Tilpassing av nyopprettede partisjoner"
 
 #. combo box label
-#: src/include/partitioning/ep-settings.rb:149
+#: src/include/partitioning/ep-settings.rb:164
 msgid "Show Storage Devices by"
 msgstr "Vis lagringsenheter etter"
 
 #. multi selection box label
-#: src/include/partitioning/ep-settings.rb:169
+#: src/include/partitioning/ep-settings.rb:177
 msgid "Visible Information on Storage Devices"
 msgstr "Synlig informasjon om lagringsenheter"
 
 #. helptext
-#: src/include/partitioning/ep-settings.rb:183
+#: src/include/partitioning/ep-settings.rb:191
 msgid ""
 "<p>This view shows general storage\n"
 "settings:</p>"
@@ -4855,7 +4908,7 @@
 "lagringsenheter:</p>"
 
 #. helptext
-#: src/include/partitioning/ep-settings.rb:188
+#: src/include/partitioning/ep-settings.rb:196
 msgid ""
 "<p><b>Default Mount by</b> gives the mount by\n"
 "method for newly created file systems. <i>Device Name</i> uses the kernel\n"
@@ -4872,7 +4925,7 @@
 "<i>Volumbetegnelse</i> bruker filsystemets UUID og betegnelse.</p>\n"
 
 #. helptext
-#: src/include/partitioning/ep-settings.rb:201
+#: src/include/partitioning/ep-settings.rb:209
 msgid ""
 "<p><b>Default File System</b> gives the file\n"
 "system type for newly created file systems.</p>\n"
@@ -4881,7 +4934,7 @@
 "filsystemtypen for nyopprettede filsystemer.</p>\n"
 
 #. helptext
-#: src/include/partitioning/ep-settings.rb:209
+#: src/include/partitioning/ep-settings.rb:217
 msgid ""
 "<p><b>Alignment of Newly Created Partitions</b>\n"
 "determines how created partitions are aligned. <b>cylinder</b> is the traditional alignment at cylinder boundaries of the disk. <b>optimal</b> aligns the \n"
@@ -4894,7 +4947,7 @@
 "eller forsøker å være kompatibelt med Windows Vista og Win 7.</p>\n"
 
 #. helptext
-#: src/include/partitioning/ep-settings.rb:220
+#: src/include/partitioning/ep-settings.rb:228
 msgid ""
 "<p><b>Show Storage Devices by</b> controls\n"
 "the name displayed for hard disks in the navigation tree.</p>"
@@ -4903,7 +4956,7 @@
 "navnet som vises for harddisker i navigasjonstreet.</p>"
 
 #. helptext
-#: src/include/partitioning/ep-settings.rb:228
+#: src/include/partitioning/ep-settings.rb:236
 msgid ""
 "<p><b>Visible Information On Storage\n"
 "Devices</b> allows to hide information in the tables and overview.</p>"
@@ -5254,12 +5307,12 @@
 msgstr "Mønsterfil"
 
 #. label text
-#: src/modules/FileSystems.rb:275
+#: src/modules/FileSystems.rb:276
 msgid "Tmpfs &Size"
 msgstr "Tmpfs-&størrelse"
 
 #. popup text
-#: src/modules/FileSystems.rb:284
+#: src/modules/FileSystems.rb:285
 msgid ""
 "Invalid Size specified. Use number followed by K, M, G or %.\n"
 "Value must be above 100k or between 1% and 200%. Try again."
@@ -5267,12 +5320,12 @@
 "Ugyldig størrelse angitt. Bruk et tall etterfulgt av K, M, G eller %.\n"
 "Verdien må være over 100k eller mellom 1% og 200%. Forsøk igjen."
 
-#: src/modules/FileSystems.rb:287
+#: src/modules/FileSystems.rb:288
 msgid "Value must be between 1% and 200%. Try again."
 msgstr "Verdien må være mellom 1% og 200%. Forsøk igjen."
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:294
+#: src/modules/FileSystems.rb:295
 msgid ""
 "<p><b>Tmpfs Size:</b>\n"
 "Size may be either entered as a number followed by K,M,G for Kilo-, Mega- or Gigabyte or\n"
@@ -5283,17 +5336,17 @@
 "som ett tall etterfulgt av et prosenttegn som angir prosentandelen av minnet.</p>"
 
 #. label text
-#: src/modules/FileSystems.rb:308
+#: src/modules/FileSystems.rb:309
 msgid "Swap &Priority"
 msgstr "Veksleminne&prioritet"
 
 #. popup text
-#: src/modules/FileSystems.rb:316
+#: src/modules/FileSystems.rb:317
 msgid "Value must be between 0 and 32767. Try again."
 msgstr "Verdien må være mellom 0 and 32767. Prøv igjen."
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:323
+#: src/modules/FileSystems.rb:324
 msgid ""
 "<p><b>Swap Priority:</b>\n"
 "Enter the swap priority. Higher numbers mean higher priority.</p>\n"
@@ -5302,12 +5355,12 @@
 "Angi veksleminneprioriteten. Et høyere tall gir høyere prioritet.</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:470
+#: src/modules/FileSystems.rb:479
 msgid "Mount &Read-Only"
 msgstr "Monte&r som skrivebeskyttet"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:474
+#: src/modules/FileSystems.rb:483
 msgid ""
 "<p><b>Mount Read-Only:</b>\n"
 "Writing to the file system is not possible. Default is false. During installation\n"
@@ -5318,12 +5371,12 @@
 "er filsystemet alltid montert med skrivetilgang.</p>"
 
 #. button text
-#: src/modules/FileSystems.rb:486
+#: src/modules/FileSystems.rb:495
 msgid "No &Access Time"
 msgstr "Ingen tilg&angstid"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:490
+#: src/modules/FileSystems.rb:499
 msgid ""
 "<p><b>No Access Time:</b>\n"
 "Access times are not updated when a file is read. Default is false.</p>\n"
@@ -5332,12 +5385,12 @@
 "Tilgangstidene oppdateres ikke når en fil leses. Standardverdien er \"nei\".</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:500
+#: src/modules/FileSystems.rb:509
 msgid "Mountable by &User"
 msgstr "Kan monteres av br&uker"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:504
+#: src/modules/FileSystems.rb:513
 msgid ""
 "<p><b>Mountable by User:</b>\n"
 "The file system may be mounted by an ordinary user. Default is false.</p>\n"
@@ -5346,12 +5399,12 @@
 "Filsystemet kan monteres av vanlig bruker. Standardverdien er \"Nei\".</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:517
+#: src/modules/FileSystems.rb:526
 msgid "Do Not Mount at System &Start-up"
 msgstr "Ikke monter ved &oppstart"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:523
+#: src/modules/FileSystems.rb:532
 msgid ""
 "<p><b>Do Not Mount at System Start-up:</b>\n"
 "The file system is not automatically mounted when the system starts.\n"
@@ -5367,12 +5420,12 @@
 "Standardverdien er 'nei'.</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:540
+#: src/modules/FileSystems.rb:549
 msgid "Enable &Quota Support"
 msgstr "Aktiver disk&kvoter"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:546
+#: src/modules/FileSystems.rb:555
 msgid ""
 "<p><b>Enable Quota Support:</b>\n"
 "The file system is mounted with user quotas enabled.\n"
@@ -5383,12 +5436,12 @@
 "Standard er deaktivert.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:565
+#: src/modules/FileSystems.rb:574
 msgid "Data &Journaling Mode"
 msgstr "Data&indekseringsmodus"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:574
+#: src/modules/FileSystems.rb:583
 msgid ""
 "<p><b>Data Journaling Mode:</b>\n"
 "Specifies the journaling mode for file data.\n"
@@ -5407,12 +5460,12 @@
 "<tt>writeback</tt> -- Datarekkefølgen opprettholdes ikke. Påvirker ikke ytelsen.</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:595
+#: src/modules/FileSystems.rb:604
 msgid "&Access Control Lists (ACL)"
 msgstr "&Tilgangskontrollister (ACL)"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:599
+#: src/modules/FileSystems.rb:608
 msgid ""
 "<p><b>Access Control Lists (ACL):</b>\n"
 "Enable access control lists on the file system.</p>\n"
@@ -5421,12 +5474,12 @@
 "Aktiver tilgangskontrollister for filsystemet.</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:610
+#: src/modules/FileSystems.rb:619
 msgid "&Extended User Attributes"
 msgstr "&Utvidede brukerattributter"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:614
+#: src/modules/FileSystems.rb:623
 msgid ""
 "<p><b>Extended User Attributes:</b>\n"
 "Allow extended user attributes on the file system.</p>\n"
@@ -5435,16 +5488,16 @@
 "Tillat utvidede brukerattributter for filsystemet.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:631
+#: src/modules/FileSystems.rb:640
 msgid "Arbitrary Option &Value"
 msgstr "Tilfeldig valg&verdi"
 
-#: src/modules/FileSystems.rb:636
+#: src/modules/FileSystems.rb:645
 msgid "Invalid characters in arbitrary option value. Do not use spaces or tabs. Try again."
 msgstr "Ugyldige tegn i tilfeldig valgverdi. Ikke bruk mellomrom eller tab. Forsøk igjen."
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:640
+#: src/modules/FileSystems.rb:649
 msgid ""
 "<p><b>Arbitrary Option Value:</b>\n"
 "In this field, type any legal mount option allowed in the fourth field of /etc/fstab.\n"
@@ -5455,12 +5508,12 @@
 "Ulike valg må være adskilt av komma.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:657
+#: src/modules/FileSystems.rb:666
 msgid "Char&set for file names"
 msgstr "Tegn&sett for filnavn"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:678
+#: src/modules/FileSystems.rb:687
 msgid ""
 "<p><b>Charset for File Names:</b>\n"
 "Set the charset used for display of file names in Windows partitions.</p>\n"
@@ -5469,12 +5522,12 @@
 "Velg hvilket tegnsett som skal brukes ved visning av filnavn på Windows-partisjoner.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:689
+#: src/modules/FileSystems.rb:698
 msgid "Code&page for short FAT names"
 msgstr "Tegn&sett for korte FAT-navn"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:695
+#: src/modules/FileSystems.rb:704
 msgid ""
 "<p><b>Codepage for Short FAT Names:</b>\n"
 "This codepage is used for converting to shortname characters on FAT file systems.</p>\n"
@@ -5483,12 +5536,12 @@
 "Dette tegnsettes brukes ved konvertering til korte filnavn i FAT-filsystemer.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:709
+#: src/modules/FileSystems.rb:718
 msgid "Number of &FATs"
 msgstr "Antall &FAT-tabeller"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:715
+#: src/modules/FileSystems.rb:724
 msgid ""
 "<p><b>Number of FATs:</b>\n"
 "Specify the number of file allocation tables in the file system. The default is 2.</p>"
@@ -5497,12 +5550,12 @@
 "Spesifiser antall filallokeringstabeller i filsystemet. Standardverdien er 2.</p>"
 
 #. label text
-#: src/modules/FileSystems.rb:724
+#: src/modules/FileSystems.rb:733
 msgid "FAT &Size"
 msgstr "FAT-&størrelse"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:735
+#: src/modules/FileSystems.rb:744
 msgid ""
 "<p><b>FAT Size:</b>\n"
 "Specifies the type of file allocation tables used (12, 16, or 32-bit). If auto is specified, YaST will automatically select the value most suitable for the file system size.</p>\n"
@@ -5511,17 +5564,17 @@
 "Angir hvilken type allokeringstabeller som benyttes (12-, 16-, eller  32-bit). Hvis auto velges, vil YaST automatisk velge den verdien som passer best til størrelsen på filsystemet.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:744
+#: src/modules/FileSystems.rb:753
 msgid "Root &Dir Entries"
 msgstr "Un&derkat. i rot"
 
 #. popup text
-#: src/modules/FileSystems.rb:752
+#: src/modules/FileSystems.rb:761
 msgid "The minimum size for \"Root Dir Entries\" is 112. Try again."
 msgstr "Minste verdi for \"Underkat. i rot\" er 112. Prøv igjen."
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:756
+#: src/modules/FileSystems.rb:765
 msgid ""
 "<p><b>Root Dir Entries:</b>\n"
 "Select the number of entries available in the root directory.</p>\n"
@@ -5530,12 +5583,12 @@
 "Velg maksimalt antall underkataloger i rot-katalogen.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:769
+#: src/modules/FileSystems.rb:778
 msgid "Hash &Function"
 msgstr "Sorterings&funksjon"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:776
+#: src/modules/FileSystems.rb:785
 msgid ""
 "<p><b>Hash Function:</b>\n"
 "This specifies the name of the hash function to use to sort the file names in directories.</p>\n"
@@ -5544,12 +5597,12 @@
 "Spesifiser navnet på sorteringsfunksjonen som skal brukes for å sortere filnavn i kataloger. Velg et alternativ ovenfor.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:785
+#: src/modules/FileSystems.rb:794
 msgid "FS &Revision"
 msgstr "FS-&revisjon"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:792
+#: src/modules/FileSystems.rb:801
 msgid ""
 "<p><b>FS Revision:</b>\n"
 "This option defines the reiserfs format revision to use. '3.5' is for backwards compatibility with kernels of the 2.2.x series. '3.6' is more recent, but can only be used with kernel versions greater than or equal to 2.4.</p>\n"
@@ -5559,12 +5612,12 @@
 
 #. label text
 #. label text
-#: src/modules/FileSystems.rb:805 src/modules/FileSystems.rb:969
+#: src/modules/FileSystems.rb:814 src/modules/FileSystems.rb:978
 msgid "Block &Size in Bytes"
 msgstr "Blokk&størrelse i byte"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:812
+#: src/modules/FileSystems.rb:821
 msgid ""
 "<p><b>Block Size:</b>\n"
 "Specify the size of blocks in bytes. Valid block size values are 512, 1024, 2048 and 4096 bytes per block. If auto is selected, the standard block size of 4096 is used.</p>\n"
@@ -5574,13 +5627,13 @@
 
 #. label text
 #. label text
-#: src/modules/FileSystems.rb:821 src/modules/FileSystems.rb:1051
+#: src/modules/FileSystems.rb:830 src/modules/FileSystems.rb:1060
 msgid "&Inode Size"
 msgstr "&Inode-størrelse"
 
 #. help text, richtext format
 #. help text, richtext format
-#: src/modules/FileSystems.rb:827 src/modules/FileSystems.rb:1057
+#: src/modules/FileSystems.rb:836 src/modules/FileSystems.rb:1066
 msgid ""
 "<p><b>Inode Size:</b>\n"
 "This option specifies the inode size of the file system.</p>\n"
@@ -5589,12 +5642,12 @@
 "Spesifiser inode størrelsen for filsystemet.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:836
+#: src/modules/FileSystems.rb:845
 msgid "&Percentage of Inode Space"
 msgstr "&Prosentandel for inode-størrelse"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:864
+#: src/modules/FileSystems.rb:873
 msgid ""
 "<p><b>Percentage of Inode Space:</b>\n"
 "The option \"Percentage of Inode Space\" specifies the maximum percentage of space in the file system that can be allocated to inodes.</p>\n"
@@ -5603,12 +5656,12 @@
 "\"Prosentandel for inode-størrelse\" spesifiserer den maksimale prosentandelen av filsystemet som kan tilordnes inoder.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:873
+#: src/modules/FileSystems.rb:882
 msgid "Inode &Aligned"
 msgstr "Inode-&justert"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:879
+#: src/modules/FileSystems.rb:888
 msgid ""
 "<p><b>Inode Aligned:</b>\n"
 "The option \"Inode Aligned\" is used to specify whether inode allocation is or\n"
@@ -5621,12 +5674,12 @@
 "er vanligvis mer effektivt enn ujustert tilgang.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:909
+#: src/modules/FileSystems.rb:918
 msgid "&Log Size in Megabytes"
 msgstr "&Loggstørrelse i megabyte"
 
 #. popup text
-#: src/modules/FileSystems.rb:918
+#: src/modules/FileSystems.rb:927
 msgid ""
 "The \"Log Size\" value is incorrect.\n"
 "Enter a value greater than zero.\n"
@@ -5636,7 +5689,7 @@
 
 #. xgettext: no-c-format
 #. help text, richtext format
-#: src/modules/FileSystems.rb:923
+#: src/modules/FileSystems.rb:932
 msgid ""
 "<p><b>Log Size</b>\n"
 "Set the log size (in megabytes). If auto, the default is 40% of the aggregate size.</p>\n"
@@ -5645,17 +5698,17 @@
 "Definer loggstørrelsen (i megabyte). Hvis auto er valgt, vil standardverdien være 40 % av samlet størrelse.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:931
+#: src/modules/FileSystems.rb:940
 msgid "Invoke Bad Blocks List &Utility"
 msgstr "&Verktøy for å hente liste over skadde blokker"
 
 #. label text
-#: src/modules/FileSystems.rb:945
+#: src/modules/FileSystems.rb:954
 msgid "Stride &Length in Blocks"
 msgstr "Stride-&lengde i blokker"
 
 #. popup text
-#: src/modules/FileSystems.rb:953
+#: src/modules/FileSystems.rb:962
 msgid ""
 "The \"Stride Length in Blocks\" value is invalid.\n"
 "Select a value greater than 1.\n"
@@ -5664,7 +5717,7 @@
 "Velg en verdi større enn 1.\n"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:957
+#: src/modules/FileSystems.rb:966
 msgid ""
 "<p><b>Stride Length in Blocks:</b>\n"
 "Set RAID-related options for the file system. Currently, the only supported\n"
@@ -5677,7 +5730,7 @@
 "argument.</p>\n"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:976
+#: src/modules/FileSystems.rb:985
 msgid ""
 "<p><b>Block Size:</b>\n"
 "Specify the size of blocks in bytes. Valid block size values are 1024, 2048, and 4096 bytes per block. If auto is selected, the block size is determined by the file system size and the expected use of the file system.</p>\n"
@@ -5686,12 +5739,12 @@
 "Spesifiser blokkstørrelsen i byte. Gyldige verdier er 1024, 2048 og 4096 byte per blokk. Dersom auto er valgt, vil blokkstørrelsen bli bestemt av filsystemstørrelsen og hva filsystemet forventes å bli brukt til.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:985
+#: src/modules/FileSystems.rb:994
 msgid "Bytes per &Inode"
 msgstr "Byte per &inode"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:991
+#: src/modules/FileSystems.rb:1000
 msgid ""
 "<p><b>Bytes per Inode:</b> \n"
 "Specify the bytes to inode ratio. YaST creates an inode for every\n"
@@ -5708,12 +5761,12 @@
 "antall inoder etter at filsystemet er laget, så det er viktig å velge en fornuftig verdi her.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:1007
+#: src/modules/FileSystems.rb:1016
 msgid "Percentage of Blocks &Reserved for root"
 msgstr "Prosentandel av blokker &reservert for rot"
 
 #. popup text
-#: src/modules/FileSystems.rb:1017
+#: src/modules/FileSystems.rb:1026
 msgid ""
 "The \"Percentage of Blocks Reserved for root\" value is incorrect.\n"
 "Allowed are float numbers no larger than 99 (e.g. 0.5).\n"
@@ -5723,17 +5776,17 @@
 
 #. xgettext: no-c-format
 #. help text, richtext format
-#: src/modules/FileSystems.rb:1022
+#: src/modules/FileSystems.rb:1031
 msgid "<p><b>Percentage of Blocks Reserved for root:</b> Specify the percentage of blocks reserved for the super user. The default is computed so that normally 1 Gig is reserved. Upper limit for reserved default is 5.0, lowest reserved default is 0.1.</p>"
 msgstr "<p><b>Prosentandel av blokker reservert for rot:</b> Spesifiser hvor mange prosent av blokkene som er reservert for superbrukeren. Standardverdien beregnes slik at 1 gigabyte normalt reserveres. Øvre grense for reservert minne er 5.0, og laveste grense for reservert minne er 0.1.</p>"
 
 #. checkbox text
-#: src/modules/FileSystems.rb:1031
+#: src/modules/FileSystems.rb:1040
 msgid "Disable Regular Checks"
 msgstr "Deaktiver regelmessige kontroller"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:1039
+#: src/modules/FileSystems.rb:1048
 msgid ""
 "<p><b>Disable Regular Checks:</b>\n"
 "Disable regular file system check at booting.</p>\n"
@@ -5742,12 +5795,12 @@
 "Deaktiver regelmessig kontroll av filsystemet ved oppstart.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:1066
+#: src/modules/FileSystems.rb:1075
 msgid "&Directory Index Feature"
 msgstr "&Katalogindeksfunksjon"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:1073
+#: src/modules/FileSystems.rb:1082
 msgid ""
 "<p><b>Directory Index:</b>\n"
 "Enables use of hashed b-trees to speed up lookups in large directories.</p>\n"
@@ -5756,12 +5809,12 @@
 "Her kan du bruke hash-b-strukturer for raskere søk i store kataloger.</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:1085
+#: src/modules/FileSystems.rb:1094
 msgid "&No Journal"
 msgstr "I&ngen journal"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:1092
+#: src/modules/FileSystems.rb:1101
 msgid ""
 "<p><b>No Journal:</b>\n"
 "Suppressed use of journaling on filesystem. Only activate this when you really\n"
@@ -5772,12 +5825,12 @@
 "du vet hva du gjør.</p>\n"
 
 #. this version makes some problems with interpreter, above lookup/add is OK
-#: src/modules/Partitions.rb:922
+#: src/modules/Partitions.rb:930
 msgid "Operation not permitted on disk %1.\n"
 msgstr "Hanlingen er ikke tillatt for disken %1.\n"
 
 #. popup text %1 is replaced by disk name e.g. /dev/hda
-#: src/modules/Partitions.rb:932
+#: src/modules/Partitions.rb:940
 msgid ""
 "\n"
 "The partitioning on your disk %1 is either not readable or not \n"
@@ -5799,7 +5852,7 @@
 "disken her.\n"
 
 #. popup text %1 is replaced by disk name e.g. /dev/dasda
-#: src/modules/Partitions.rb:950
+#: src/modules/Partitions.rb:958
 msgid ""
 "\n"
 "The disk %1 does not contain a partition table but for\n"
@@ -5820,7 +5873,7 @@
 "eller slette partisjonen fra den disken her.\n"
 
 #. popup text
-#: src/modules/Partitions.rb:969
+#: src/modules/Partitions.rb:977
 msgid ""
 "\n"
 "\n"
@@ -5835,7 +5888,7 @@
 "disken.\n"
 
 #. popup text
-#: src/modules/Partitions.rb:981
+#: src/modules/Partitions.rb:989
 msgid ""
 "\n"
 "\n"
@@ -5853,7 +5906,7 @@
 #. @param integer testsize
 #. @param [Symbol] used_fs
 #. @param [Boolean] verbose
-#: src/modules/Storage.rb:975
+#: src/modules/Storage.rb:976
 msgid "Resize Not Possible:"
 msgstr "Størrelsen kunne ikke endres:"
 
@@ -5866,7 +5919,7 @@
 #. mark swap-partitions with pseudo Mountpoint swap in targetMap
 #. @param [Hash{String => map}] target Disk map
 #. @return [Hash{String => map}] modified target
-#: src/modules/Storage.rb:2703 src/modules/Storage.rb:3908
+#: src/modules/Storage.rb:2706 src/modules/Storage.rb:3911
 msgid ""
 "Could not set encryption.\n"
 "System error code is %1.\n"
@@ -5879,7 +5932,7 @@
 "Et ugyldig krypteringspassord er kanskje angitt.\n"
 
 #. popup text
-#: src/modules/Storage.rb:3939
+#: src/modules/Storage.rb:3942
 msgid ""
 "The first and the second version\n"
 "of the password do not match.\n"
@@ -5890,7 +5943,7 @@
 "Prøv igjen."
 
 #. popup text
-#: src/modules/Storage.rb:3970
+#: src/modules/Storage.rb:3973
 msgid ""
 "The password may only contain the following characters:\n"
 "0..9, a..z, A..Z, and any of \"@#* ,.;:._-+=!$%&/|?{[()]}^\\<>\".\n"
@@ -5902,24 +5955,24 @@
 
 #. Label: get password for encrypted volume
 #. Please use newline if label is longer than 40 characters
-#: src/modules/Storage.rb:4024
+#: src/modules/Storage.rb:4027
 msgid "&Enter Encryption Password:"
 msgstr "Angi krypt&eringspassord"
 
 #. Clear password fields on every round.
-#: src/modules/Storage.rb:4083
+#: src/modules/Storage.rb:4086
 msgid "Provide Password"
 msgstr "Angi et passord"
 
-#: src/modules/Storage.rb:4102
+#: src/modules/Storage.rb:4105
 msgid "The following encrypted volumes are already available."
 msgstr "Følgende krypterte volumer er allerede tilgjengelige."
 
-#: src/modules/Storage.rb:4117
+#: src/modules/Storage.rb:4120
 msgid "Encrypted Volume Activation"
 msgstr "Aktivering av krypterte volumer"
 
-#: src/modules/Storage.rb:4121
+#: src/modules/Storage.rb:4124
 msgid ""
 "The following volumes contain an encryption signature but the \n"
 "passwords are not yet known.\n"
@@ -5931,12 +5984,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:4133
+#: src/modules/Storage.rb:4136
 msgid "Do you want to provide encryption passwords?"
 msgstr "Vil du ang krypteringspassord?"
 
 #. text in help field
-#: src/modules/Storage.rb:4190
+#: src/modules/Storage.rb:4193
 msgid ""
 "Enter encryption password for any of the\n"
 "devices in the locked devices list.\n"
@@ -5947,54 +6000,54 @@
 "Passordet vil bli forsøkt for alle enhetene."
 
 #. header text
-#: src/modules/Storage.rb:4196
+#: src/modules/Storage.rb:4199
 msgid "Enter Encryption Password"
 msgstr "Angi krypteringspassord"
 
-#: src/modules/Storage.rb:4199
+#: src/modules/Storage.rb:4202
 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:4212
+#: src/modules/Storage.rb:4215
 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:4215
+#: src/modules/Storage.rb:4218
 msgid "Provide password for the following device:"
 msgstr "Angi passordet for følgende enhet:"
 
-#: src/modules/Storage.rb:4228
+#: src/modules/Storage.rb:4231
 msgid "Trying to unlock encrypted volumes..."
 msgstr "Forsøker å låse opp krypterte volumer..."
 
-#: src/modules/Storage.rb:4252
+#: src/modules/Storage.rb:4255
 msgid "Password did not unlock any volume."
 msgstr "Passordet låste ikke opp noe volum."
 
-#: src/modules/Storage.rb:4338
+#: src/modules/Storage.rb:4341
 msgid "IDE Disk"
 msgstr "IDE-disk"
 
-#: src/modules/Storage.rb:4344
+#: src/modules/Storage.rb:4347
 msgid "SCSI Disk"
 msgstr "SCSI-disk"
 
-#: src/modules/Storage.rb:4350
+#: src/modules/Storage.rb:4353
 msgid "Disk"
 msgstr "Disk"
 
-#: src/modules/Storage.rb:4378
+#: src/modules/Storage.rb:4381
 msgid "DM RAID"
 msgstr "DM RAID"
 
-#: src/modules/Storage.rb:4391
+#: src/modules/Storage.rb:4394
 msgid "MD RAID"
 msgstr "MD RAID"
 
 #. TRANSLATORS: error popup
-#: src/modules/Storage.rb:5173
+#: src/modules/Storage.rb:5176
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -6006,7 +6059,7 @@
 "Partisjonen %1 kan ikke fjernes fordi andre partisjoner på\n"
 "disken %2 er i bruk.\n"
 
-#: src/modules/Storage.rb:5199
+#: src/modules/Storage.rb:5202
 msgid ""
 "\n"
 "Device %1 cannot be modified because it contains activated swap\n"
@@ -6016,7 +6069,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:5213
+#: src/modules/Storage.rb:5216
 msgid ""
 "\n"
 "Device %1 cannot be modified because it contains the installation\n"
@@ -6026,7 +6079,7 @@
 "Enheten %1 kan ikke endres fordi den inneholder installasjonsdata\n"
 "som er nødvendig for installasjonen.\n"
 
-#: src/modules/Storage.rb:5242
+#: src/modules/Storage.rb:5245
 msgid ""
 "\n"
 "Device %1 cannot be removed because it contains activated swap\n"
@@ -6036,7 +6089,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:5251
+#: src/modules/Storage.rb:5254
 msgid ""
 "\n"
 "Device %1 cannot be removed because it contains the installation\n"
@@ -6046,7 +6099,7 @@
 "Enheten %1 kan ikke fjernes fordi den inneholder installasjonsdata\n"
 "som er nødvendig for installasjonen.\n"
 
-#: src/modules/Storage.rb:5280
+#: src/modules/Storage.rb:5283
 msgid ""
 "\n"
 "Device %1 cannot be removed because this would indirectly change\n"
@@ -6058,7 +6111,7 @@
 "%2, som benyttes som vekselminne, og er nødvendig for å kjøre\n"
 "installasjonen.\n"
 
-#: src/modules/Storage.rb:5291
+#: src/modules/Storage.rb:5294
 msgid ""
 "\n"
 "Device %1 cannot be removed because this would indirectly change\n"
@@ -6070,7 +6123,7 @@
 "installasjonen.\n"
 
 #. the check for verbose is needed for calls from StorageProposal (see bnc#871779)
-#: src/modules/Storage.rb:5313
+#: src/modules/Storage.rb:5316
 msgid ""
 "\n"
 "Partition %1 cannot be removed since other partitions on the\n"
@@ -6081,18 +6134,18 @@
 "disken %2 er i bruk.\n"
 
 #. FIXME: please, add description of the list that is returned by this function.
-#: src/modules/Storage.rb:5402
+#: src/modules/Storage.rb:5405
 msgid "Nothing assigned as root filesystem!"
 msgstr "Det er ikke tilordnet noe rotfilsystem!"
 
-#: src/modules/Storage.rb:5403
+#: src/modules/Storage.rb:5406
 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:6005
+#: src/modules/Storage.rb:6008
 msgid "Adding the following resolvables failed: %1"
 msgstr "Følgende kunn ikke legges til for å løse konflikter: %1"
 
@@ -6748,49 +6801,49 @@
 
 #. enable snapshots for root volume if desired
 #. penalty for not having separate /home
-#: src/modules/StorageProposal.rb:4545 src/modules/StorageProposal.rb:5675
+#: src/modules/StorageProposal.rb:4552 src/modules/StorageProposal.rb:5675
 msgid "Resize impossible due to inconsistent file system. Try checking file system under Windows."
 msgstr "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:6143
+#: src/modules/StorageProposal.rb:6164
 #, fuzzy
 #| msgid "Create &LVM Based Proposal"
 msgid "Create &LVM-based Proposal"
 msgstr "Opprett &LVM-basert forslag"
 
 #. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6158
+#: src/modules/StorageProposal.rb:6179
 msgid "Encr&ypt Volume Group"
 msgstr "Kr&ypter volumgruppen"
 
 #. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6176
+#: src/modules/StorageProposal.rb:6197
 #, fuzzy
 #| msgid "File system options:"
 msgid "File System for Root Partition"
 msgstr "Alternativer for filsystem:"
 
 #. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6223
+#: src/modules/StorageProposal.rb:6244
 #, fuzzy
 #| msgid "Propose Separate &Home Partition"
 msgid "File System for Home Partition"
 msgstr "Foreslå separat partisjon for &hjemmekatalog"
 
 #. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6241
+#: src/modules/StorageProposal.rb:6262
 msgid "Enlarge &Swap for Suspend"
 msgstr "Utvid &bytt for dvale"
 
-#: src/modules/StorageProposal.rb:6251
+#: src/modules/StorageProposal.rb:6272
 #, fuzzy
 #| msgid "Proposal settings"
 msgid "Proposal Settings"
 msgstr "Forslag til innstillinger"
 
 #. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6266
+#: src/modules/StorageProposal.rb:6287
 #, fuzzy
 #| msgid ""
 #| "<p>\n"
@@ -6803,7 +6856,7 @@
 "For å opprette ett LVM-basert forslag, velg den aktuelle knappen.</p>\n"
 
 #. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6273
+#: src/modules/StorageProposal.rb:6294
 msgid ""
 "<p>The filesystem for the root partition can be selected with the\n"
 "corresponding combo box. With the filesystem BtrFS the proposal can\n"
@@ -6812,32 +6865,32 @@
 msgstr ""
 
 #. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6282
+#: src/modules/StorageProposal.rb:6303
 msgid ""
 "<p>The proposal can create a separate home partition. The filesystem for\n"
 "the home partition can be selected with the corresponding combo box.</p>"
 msgstr ""
 
 #. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6289
+#: src/modules/StorageProposal.rb:6310
 msgid ""
 "<p>The swap partition can be made large enough to be used to suspend\n"
 "the system to disk in most cases.</p>"
 msgstr ""
 
-#: src/modules/StorageProposal.rb:6314
+#: src/modules/StorageProposal.rb:6335
 msgid "Enter your password for the proposal encryption."
 msgstr "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:6321
+#: src/modules/StorageProposal.rb:6342
 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:6332
+#: src/modules/StorageProposal.rb:6353
 msgid "Reenter the password for verification:"
 msgstr "Gjenta passordet for å bekrefte:"
 
@@ -6864,26 +6917,47 @@
 #. Package:	yast2-storage
 #. Summary:	Expert Partitioner
 #. Authors:	Arvin Schnell <aschnell@suse.de>
-#: src/modules/StorageSettings.rb:177
+#: src/modules/StorageSettings.rb:179
 msgid "Default Mount-by:"
 msgstr "Standardmontering med:"
 
-#: src/modules/StorageSettings.rb:178
+#: src/modules/StorageSettings.rb:180
 msgid "Default File System:"
 msgstr "Standard filsystem:"
 
-#: src/modules/StorageSettings.rb:179
+#: src/modules/StorageSettings.rb:181
 msgid "Show Storage Devices by:"
 msgstr "Vis lagringsenheter etter:"
 
-#: src/modules/StorageSettings.rb:180
+#: src/modules/StorageSettings.rb:182
 msgid "Partition Alignment:"
 msgstr "Tilpassing av partisjoner:"
 
-#: src/modules/StorageSettings.rb:181
+#: src/modules/StorageSettings.rb:183
 msgid "Visible Information on Storage Devices:"
 msgstr "Synlig informasjon om lagringsenheter:"
 
+#~ msgid ""
+#~ "Warning: With your current setup, your %1 installation\n"
+#~ "will encounter problems when booting, because you have no \"boot\"\n"
+#~ "partition and your \"root\" partition is an LVM logical volume.\n"
+#~ "This does not work.\n"
+#~ "\n"
+#~ "If you do not know exactly what you are doing, use a normal\n"
+#~ "partition for your files below /boot.\n"
+#~ "\n"
+#~ "Really use this setup?\n"
+#~ msgstr ""
+#~ "Advarsel: Med dette oppsettet vil det oppstå\n"
+#~ "problemer under oppstart av %1 fordi du ikke\n"
+#~ "har noen boot-partisjon og fordi root-partisjonen er et logisk LVM-volum.\n"
+#~ "Dette vil ikke fungere.\n"
+#~ "\n"
+#~ "Hvis du vet nøyaktig hva du gjør, kan du bruke en vanlig partisjon\n"
+#~ "for filene under /boot.\n"
+#~ "\n"
+#~ "Vil du virkelig bruke dette oppsettet?\n"
+
 #~ msgid "&Edit Partition Setup..."
 #~ msgstr "R&ediger partisjonsoppsett..."
 

Modified: trunk/yast/nb/po/sudo.nb.po
===================================================================
--- trunk/yast/nb/po/sudo.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/sudo.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: sudo.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:42+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2009-08-13 20:12+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"

Modified: trunk/yast/nb/po/support.nb.po
===================================================================
--- trunk/yast/nb/po/support.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/support.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2014-05-19 09:35+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -20,39 +20,41 @@
 #. Command line help text for the Xsupport module
 #: src/clients/support.rb:56
 msgid "Configuration of support"
-msgstr ""
+msgstr "Oppsett av brukerstøtte"
 
 #. Rich text title for Support in proposals
 #: src/clients/support_proposal.rb:83
 msgid "Support"
-msgstr ""
+msgstr "Brukerstøtte"
 
 #. Menu title for Support in proposals
 #: src/clients/support_proposal.rb:87
 msgid "&Support"
-msgstr ""
+msgstr "Bruker&støtte"
 
 #. Command line parameters dialog caption
 #: src/include/support/dialogs.rb:46
 msgid "Supportconfig Overview Dialog"
-msgstr ""
+msgstr "Oversikt over brukerstøtteoppsett"
 
 #. Support configure1 dialog contents
 #: src/include/support/dialogs.rb:53
-msgid "Open Novell Support Center"
-msgstr ""
+#, fuzzy
+#| msgid "Open Novell Support Center"
+msgid "Open SUSE Support Center"
+msgstr "            brukerstøttesenter"
 
 #: src/include/support/dialogs.rb:58
-msgid "This will start a browser connecting to the Novell Support Center Portal."
+msgid "This will start a browser connecting to the SUSE Support Center Portal."
 msgstr ""
 
 #: src/include/support/dialogs.rb:68
 msgid "Open"
-msgstr ""
+msgstr "Åpne"
 
 #: src/include/support/dialogs.rb:79
 msgid "Collect Data"
-msgstr ""
+msgstr "Hent informasjon"
 
 #: src/include/support/dialogs.rb:84
 msgid "This will create a tarball containing the collected log files."
@@ -60,11 +62,11 @@
 
 #: src/include/support/dialogs.rb:96
 msgid "Create report tarball"
-msgstr ""
+msgstr "Opprett rapportarkiv"
 
 #: src/include/support/dialogs.rb:108
 msgid "Upload Data"
-msgstr ""
+msgstr "Last opp data"
 
 #: src/include/support/dialogs.rb:112
 msgid "This will upload the collected logs to the specified URL."
@@ -72,7 +74,7 @@
 
 #: src/include/support/dialogs.rb:119
 msgid "Upload"
-msgstr ""
+msgstr "Last opp"
 
 #: src/include/support/dialogs.rb:149
 msgid "Could not find any installed browser."
@@ -88,12 +90,12 @@
 
 #: src/include/support/dialogs.rb:201
 msgid "Supportconfig Upload Dialog"
-msgstr ""
+msgstr "Opplastingsdialog for brukerstøtte"
 
 #. Support configure1 dialog contents
 #: src/include/support/dialogs.rb:226
 msgid "Save as"
-msgstr ""
+msgstr "Lagre som"
 
 #: src/include/support/dialogs.rb:229
 msgid "Directory to Save"
@@ -101,7 +103,7 @@
 
 #: src/include/support/dialogs.rb:239
 msgid "Package with log files"
-msgstr ""
+msgstr "Pakke med loggfiler"
 
 #: src/include/support/dialogs.rb:253
 msgid "Upload log files tarball to URL"
@@ -109,50 +111,50 @@
 
 #: src/include/support/dialogs.rb:255 src/include/support/dialogs.rb:756
 msgid "Upload Target"
-msgstr ""
+msgstr "Last opp mål"
 
 #. }
 #: src/include/support/dialogs.rb:327
 msgid "Cannot write settings"
-msgstr ""
+msgstr "Kan ikke lagre innstillingene"
 
 #: src/include/support/dialogs.rb:343
 msgid "Cannot write settings."
-msgstr ""
+msgstr "Kan ikke lagre innstillingene."
 
 #: src/include/support/dialogs.rb:389
 msgid "Choose Directory Where to Save Tarball"
-msgstr ""
+msgstr "Velg katalogen der arkivet skal lagres"
 
 #. Support::log_files["tmp_dir"]=save_dir;
 #: src/include/support/dialogs.rb:401
 msgid "Choose Log Files Tarball File"
-msgstr ""
+msgstr "Velg filen med loggfilarkivet"
 
 #. Command line parameters dialog caption
 #: src/include/support/dialogs.rb:421
 msgid "Supportconfig Parameters Configuration"
-msgstr ""
+msgstr "Parameteroppsett for brukerstøtte"
 
 #: src/include/support/dialogs.rb:426
 msgid "Create a full file listing from '/'"
-msgstr ""
+msgstr "Opprett en full filoversikt fra '/'"
 
 #: src/include/support/dialogs.rb:431
 msgid "Exclude detailed disk info and scans"
-msgstr ""
+msgstr "Ikke ta med detaljert diskinformasjon og skanninger"
 
 #: src/include/support/dialogs.rb:436
 msgid "Search root filesystem for eDirectory instances"
-msgstr ""
+msgstr "Søker etter rotfilsystem for eDirectory"
 
 #: src/include/support/dialogs.rb:441
 msgid "Include full SLP service lists"
-msgstr ""
+msgstr "Ta med full SLP-tjenesteliste"
 
 #: src/include/support/dialogs.rb:446
 msgid "Performs an rpm -V for each installed rpm"
-msgstr ""
+msgstr "Kjører en rpm -V for hver installert rpm"
 
 #: src/include/support/dialogs.rb:451
 msgid "Include all log file lines, gather additional rotated logs"
@@ -165,38 +167,38 @@
 
 #: src/include/support/dialogs.rb:472
 msgid "Activates all support functions"
-msgstr ""
+msgstr "Aktiverer alle brukerstøttefunksjoner"
 
 #: src/include/support/dialogs.rb:479
 msgid "Only gather a minimum amount of info"
-msgstr ""
+msgstr "Samler bare et minimum av informasjon"
 
 #: src/include/support/dialogs.rb:487
 msgid "Use Custom (Expert) Settings"
-msgstr ""
+msgstr "Bruke egendefinerte (avanserte) innstillinger"
 
 #: src/include/support/dialogs.rb:489
 msgid "Expert Settings"
-msgstr ""
+msgstr "Avanserte innstillinger"
 
 #: src/include/support/dialogs.rb:495
 msgid "Options"
-msgstr ""
+msgstr "Valg"
 
 #. Support overview dialog caption
 #: src/include/support/dialogs.rb:584
 msgid "Supportconfig Expert Configuration"
-msgstr ""
+msgstr "Avansert brukerstøtteoppsett"
 
 #. FIXME table header
 #: src/include/support/dialogs.rb:614
 msgid "Default Options"
-msgstr ""
+msgstr "Standardinnstillinger"
 
 #. Support configure2 dialog caption
 #: src/include/support/dialogs.rb:680
 msgid "Supportconfig Contact Configuration"
-msgstr ""
+msgstr "Kontaktoppsett for brukerstøtte"
 
 #. Support configure2 dialog contents
 #: src/include/support/dialogs.rb:685
@@ -205,27 +207,27 @@
 
 #: src/include/support/dialogs.rb:690
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 #: src/include/support/dialogs.rb:701
 msgid "Email Address"
-msgstr ""
+msgstr "E-postadresse"
 
 #: src/include/support/dialogs.rb:708
 msgid "Name"
-msgstr ""
+msgstr "Navn"
 
 #: src/include/support/dialogs.rb:715
 msgid "Phone Number"
-msgstr ""
+msgstr "Telefonnummer"
 
 #: src/include/support/dialogs.rb:722
 msgid "Store ID"
-msgstr ""
+msgstr "Lagre ID"
 
 #: src/include/support/dialogs.rb:733
 msgid "Terminal ID"
-msgstr ""
+msgstr "Terminal-ID"
 
 #: src/include/support/dialogs.rb:744
 msgid "GPG UID"
@@ -236,8 +238,10 @@
 msgstr ""
 
 #: src/include/support/dialogs.rb:770
-msgid "Novell 11-digit service request number"
-msgstr ""
+#, fuzzy
+#| msgid "Novell 11 digit service request number"
+msgid "11-digit service request number"
+msgstr "Telefonnummer til Novell-brukerstøtte (11 siffer)"
 
 #. abort?
 #: src/include/support/dialogs.rb:847
@@ -246,25 +250,25 @@
 
 #: src/include/support/dialogs.rb:865
 msgid "Collecting Data"
-msgstr ""
+msgstr "Samler informasjon"
 
 #: src/include/support/dialogs.rb:866
 msgid "Progress"
-msgstr ""
+msgstr "Fremdrift"
 
 #: src/include/support/dialogs.rb:931
 msgid "Collected Data Review"
-msgstr ""
+msgstr "Oversikt over samlet informasjon"
 
 #. FIXME use list of generated files, as well as directory prefix
 #. `MultiLineEdit (`id (`file), `opt (`read_only), _("File Contents"))
 #: src/include/support/dialogs.rb:978 src/include/support/dialogs.rb:1026
 msgid "File Name"
-msgstr ""
+msgstr "Filnavn"
 
 #: src/include/support/dialogs.rb:984
 msgid "Remove from Data"
-msgstr ""
+msgstr "Fjern fra informasjon"
 
 #. Read dialog help 1/2
 #: src/include/support/helps.rb:36
@@ -279,6 +283,8 @@
 "<p><b><big>Aborting Initialization:</big></b><br>\n"
 "Safely abort the configuration utility by pressing <b>Abort</b> now.</p>\n"
 msgstr ""
+"<p><b><big>Avbryt initialisering:</big></b><br>\n"
+"Du kan trygt avbryte oppsettverktøyet ved å klikke <b>Avbryt</b> nå.</p>\n"
 
 #. Write dialog help 1/2
 #: src/include/support/helps.rb:44
@@ -295,6 +301,10 @@
 "An additional dialog informs whether it is safe to do so.\n"
 "</p>\n"
 msgstr ""
+"<p><b><big>Avbryt lagring:</big></b><br>\n"
+"Avbryt lagringen ved å klikke <b>Avbryt</b>.\n"
+"En ny dialog forteller deg om det er trygt å gjøre dette.\n"
+"</p>\n"
 
 #. Summary dialog help 1/3
 #: src/include/support/helps.rb:55
@@ -302,6 +312,8 @@
 "<p><b><big>Support Configuration</big></b><br>\n"
 "Configure support here.<br></p>\n"
 msgstr ""
+"<p><b><big>Oppsett av brukerstøtte</big></b><br>\n"
+"Sett opp brukerstøtte her.<br></p>\n"
 
 #. Summary dialog help 2/3
 #: src/include/support/helps.rb:59
@@ -319,13 +331,16 @@
 "If you press <b>Edit</b>, an additional dialog in which to change\n"
 "the configuration opens.</p>\n"
 msgstr ""
+"<p><b><big>Redigere eller slette:</big></b><br>\n"
+"Hvis du klikker <b>Rediger</b>, får du opp en ny dialog der\n"
+"du kan endre konfigurasjonen.</p>\n"
 
 #. Ovreview dialog help 1/3
 #: src/include/support/helps.rb:72
 msgid ""
 "\n"
-"<p><b><big>Opening Novell Support Center</big></b><br>\n"
-"To start a Web browser that opens the Novell Support Center Portal, use <b>Open Novell Support Center</b>.\n"
+"<p><b><big>Opening SUSE Support Center</big></b><br>\n"
+"To start a Web browser that opens the SUSE Support Center Portal, use <b>Open SUSE Support Center</b>.\n"
 "You can then open a Service Request with Global Technical Support. Make sure you write down\n"
 "the Service Request number to include in the supportconfig data upload.</p>\n"
 msgstr ""
@@ -407,7 +422,7 @@
 #: src/include/support/helps.rb:133
 msgid ""
 "<p><b>Note:</b> If you are uploading a supportconfig tarball to Global Technical Support,\n"
-"make sure you include the Novell 11-digit service request number from your open service request.\n"
+"make sure you include the 11-digit service request number from your open service request.\n"
 msgstr ""
 
 #. Collecting data dialkog help 1/1
@@ -450,7 +465,7 @@
 #: src/include/support/helps.rb:164 src/include/support/helps.rb:189
 msgid ""
 "<p><b><big>Privacy Policy</big></b><br>\n"
-"Find Novell's privacy policy at\n"
+"Find SUSE's privacy policy at\n"
 "<i>%1</i>.</p>\n"
 msgstr ""
 
@@ -469,6 +484,9 @@
 "Press <b>Next</b> to continue.\n"
 "<br></p>\n"
 msgstr ""
+"<p><b><big>Konfigurasjon, andre del</big></b><br>\n"
+"Trykk <b>Neste</b> for å fortsette.\n"
+"<br></p>\n"
 
 #. Configure2 dialog help 2/2
 #: src/include/support/helps.rb:204
@@ -477,6 +495,9 @@
 "It is not possible. You must code it first. :-)\n"
 "</p>"
 msgstr ""
+"<p><b><big>Velge noe:</big></b><br>\n"
+"Du må hacke litt før du kan velge noe :-)\n"
+"</p>"
 
 #. encoding: utf-8
 #. ***************************************************************************
@@ -502,47 +523,47 @@
 #. ***************************************************************************
 #: src/include/support/supportconfig_conf.rb:30
 msgid "AppArmor information. security-apparmor.txt"
-msgstr ""
+msgstr "AppArmor-informasjon. security-apparmor.txt"
 
 #: src/include/support/supportconfig_conf.rb:33
 msgid "autofs information. fs-autofs.txt"
-msgstr ""
+msgstr "autofs-informasjon. fs-autofs.txt"
 
 #: src/include/support/supportconfig_conf.rb:36
 msgid "Information related to booting and the kernel. boot.txt"
-msgstr ""
+msgstr "Informasjon om oppstart og kjernen. boot.txt"
 
 #: src/include/support/supportconfig_conf.rb:39
 msgid "Current system service states. chkconfig.txt"
-msgstr ""
+msgstr "Gjeldende status for systemtjenester. chkconfig.txt"
 
 #: src/include/support/supportconfig_conf.rb:42
 msgid "Information related to capturing a system core dump. crash.txt"
-msgstr ""
+msgstr "Informasjon i fobindelse med en systemkjernedump. crash.txt"
 
 #: src/include/support/supportconfig_conf.rb:45
 msgid "Information related to cron and at. cron.txt"
-msgstr ""
+msgstr "Informasjon om cron og at. cron.txt"
 
 #: src/include/support/supportconfig_conf.rb:48
 msgid "Disk, file system mounts and partition information. fs-diskio.txt"
-msgstr ""
+msgstr "Informasjon om disker, monterte filsystemter og partisjoner. fs-diskio.txt"
 
 #: src/include/support/supportconfig_conf.rb:51
 msgid "Domain Name Service information. dns.txt"
-msgstr ""
+msgstr "Informasjon om domenenavnetjenesten. dns.txt"
 
 #: src/include/support/supportconfig_conf.rb:54
 msgid "Novell eDirectory health check information. novell-edir.txt"
-msgstr ""
+msgstr "Informasjon om Novell eDirectory helsekontroll. novell-edir.txt"
 
 #: src/include/support/supportconfig_conf.rb:57
 msgid "System environment information, including sysctl and root's environment. env.txt"
-msgstr ""
+msgstr "Informasjon om systemmiljøet, inkludert sysctl- og rotbrukermiljøet. env.txt"
 
 #: src/include/support/supportconfig_conf.rb:60
 msgid "Recursively gets *.conf files, along with various other configuration files in /etc. etc.txt"
-msgstr ""
+msgstr "Hent *.conf filer og andre oppsettfiler i /etc-katalogen rekursivt. etc.txt"
 
 #: src/include/support/supportconfig_conf.rb:63
 msgid "Enterprise Volume Management System-related information. evms.txt"
@@ -550,15 +571,15 @@
 
 #: src/include/support/supportconfig_conf.rb:66
 msgid "Heartbeat/high availabilty cluster information. ha.txt"
-msgstr ""
+msgstr "Informasjon om Heartbeat / klynger for høy tilgjengelighet. ha.txt"
 
 #: src/include/support/supportconfig_conf.rb:69
 msgid "iSCSI target and initiator information. fs-iscsi.txt"
-msgstr ""
+msgstr "Informajson om iSCSI-mål og initiator. fs-iscsi.txt"
 
 #: src/include/support/supportconfig_conf.rb:72
 msgid "LDAP related information, including a root DSE search. ldap.txt"
-msgstr ""
+msgstr "LDAP-relatert informasjon, inkludert root DSE-søk. ldap.txt"
 
 #: src/include/support/supportconfig_conf.rb:75
 msgid "Novell Linux User Management-related information, including a root DSE, UNIX Config and workstation object searches. novell-lum.txt"
@@ -574,11 +595,11 @@
 
 #: src/include/support/supportconfig_conf.rb:84
 msgid "System kernel module information. modules.txt"
-msgstr ""
+msgstr "Informasjon om systemkjernemoduler. modules.txt"
 
 #: src/include/support/supportconfig_conf.rb:87
 msgid "Native device mapper multipathing information. mpio.txt"
-msgstr ""
+msgstr "Informasjon om lokal enhetstilordning og multipath. mpio.txt"
 
 #: src/include/support/supportconfig_conf.rb:90
 msgid "Novell Core Protocol-related information. novell-ncp.txt"
@@ -610,7 +631,7 @@
 
 #: src/include/support/supportconfig_conf.rb:111
 msgid "List of all open files using lsof. open-files.txt"
-msgstr ""
+msgstr "Vis alle åpne filer som bruker lsof. open-files.txt"
 
 #: src/include/support/supportconfig_conf.rb:114
 msgid "OpenWBEM-related information. openwbem.txt"
@@ -626,7 +647,7 @@
 
 #: src/include/support/supportconfig_conf.rb:123
 msgid "Includes key /proc file content. proc.txt"
-msgstr ""
+msgstr "Inkludert innholde i key-/proc-filen. proc.txt"
 
 #: src/include/support/supportconfig_conf.rb:126
 msgid "Update daemon-related information. updates-daemon.txt"
@@ -634,7 +655,7 @@
 
 #: src/include/support/supportconfig_conf.rb:129
 msgid "Update client related information. updates.txt"
-msgstr ""
+msgstr "Oppdater klientrelatert informasjon. updates.txt"
 
 #: src/include/support/supportconfig_conf.rb:132
 msgid "System Activity Reporting-related information, including copies of the SAR data files. sar.txt"
@@ -646,7 +667,7 @@
 
 #: src/include/support/supportconfig_conf.rb:138
 msgid "Service Location Protocol related information. slp.txt"
-msgstr ""
+msgstr "SLP-informasjon (Service Location Protocol). slp.txt"
 
 #: src/include/support/supportconfig_conf.rb:141
 msgid ""
@@ -665,11 +686,11 @@
 
 #: src/include/support/supportconfig_conf.rb:152
 msgid "Secure Shell server information. ssh.txt"
-msgstr ""
+msgstr "Informasjon om SSH-serveren (Secure Shell). ssh.txt"
 
 #: src/include/support/supportconfig_conf.rb:155
 msgid "Configuration files found in /etc/sysconfig. sysconfig.txt"
-msgstr ""
+msgstr "Oppsettfiler i /etc/sysconfig. sysconfig.txt"
 
 #: src/include/support/supportconfig_conf.rb:158
 msgid "UDEV device manager-related information. udev.txt"
@@ -689,15 +710,15 @@
 
 #: src/include/support/supportconfig_conf.rb:170
 msgid "A full file list using find from the root of the filesytem. -L, fs-files.txt"
-msgstr ""
+msgstr "En fullstendig filoversikt ved å bruke find-kommandoen fra rotfilsystemet -L, fs-files.txt"
 
 #: src/include/support/supportconfig_conf.rb:173
 msgid "Includes the entire log file, including comments, instead of just VAR_OPTION_LINE_COUNT lines of it. Additional rotated logs are included if available. -l"
-msgstr ""
+msgstr "Inneholder hele loggfilen inkludert kommentarer i stedet for bare linjene VAR_OPTION_LINE_COUNT. Eventulle roterte logger blir også tatt med. -l"
 
 #: src/include/support/supportconfig_conf.rb:176
 msgid "Minimizes the amount of disk information and detailed scanning. -d"
-msgstr ""
+msgstr "Minimerer mengden diskinformasjon og detaljert skanning -d"
 
 #: src/include/support/supportconfig_conf.rb:179
 msgid "Normally all of the /var/log/YaST2/* logs are included. This option minimizes the amount of each file retrieved."
@@ -705,31 +726,31 @@
 
 #: src/include/support/supportconfig_conf.rb:182
 msgid "Runs an rpm -V on every installed RPM package. This takes some time to complete. -v, rpm-verify.txt"
-msgstr ""
+msgstr "Kjører en rpm -V for hver installert RPM-pakke. Dette tar en stund å gjennomføre. -v, rpm-verify.txt"
 
 #: src/include/support/supportconfig_conf.rb:185
 msgid "Normally only the base SLP service types are listed. This option allows you to query each of the discovered service types individually. -s, slp.txt"
-msgstr ""
+msgstr "Normalt vises bare grunnleggende SLP-tjenestetyper. Med dette valget kan du søke i hver enkelt av tjenestetypene som blir funnet. -s, slp.txt"
 
 #: src/include/support/supportconfig_conf.rb:188
 msgid "Company name to include in the basic-environment.txt"
-msgstr ""
+msgstr "Firmanavn som skal være med i basic-environment.txt"
 
 #: src/include/support/supportconfig_conf.rb:191
 msgid "Contact's email address to include in the basic-environment.txt"
-msgstr ""
+msgstr "E-postadresse som skal være med i basic-environment.txt"
 
 #: src/include/support/supportconfig_conf.rb:194
 msgid "Contact's name to include in the basic-environment.txt"
-msgstr ""
+msgstr "Navn som skal være med i basic-environment.txt"
 
 #: src/include/support/supportconfig_conf.rb:197
 msgid "Contact's phone number to include in the basic-environment.txt"
-msgstr ""
+msgstr "Telefonnummer som skal være med i basic-environment.txt"
 
 #: src/include/support/supportconfig_conf.rb:200
 msgid "The number of lines to include when getting a log file. Zero means get the entire file."
-msgstr ""
+msgstr "Antall linjer som skal tas med når en loggfil hentes. Null betyr hele filen."
 
 #: src/include/support/supportconfig_conf.rb:203
 msgid "The supportconfig tarball location. The first valid location in the list is always used."
@@ -737,7 +758,7 @@
 
 #: src/include/support/supportconfig_conf.rb:206
 msgid "The maximum number of /var/log/messages lines to get. Zero means get the entire file."
-msgstr ""
+msgstr "Maksimalt antall /var/log/messages-linjer som skal hentes. Null betyr hele filen."
 
 #: src/include/support/supportconfig_conf.rb:209
 msgid "The maximum number of heartbeat policy engine log files to include in the supportconfig tarball."
@@ -754,31 +775,33 @@
 msgstr ""
 
 #: src/include/support/supportconfig_conf.rb:218
-msgid "Used to specify where the supportconfig tarball will be uploaded, when using the -u srnum startup option. You can specify any FTP server that supports anonymous uploads. The default is Novell's public ftp server."
-msgstr ""
+#, fuzzy
+#| msgid "Used  to  specify  where the supportconfig tar ball will be uploaded, when using the -u srnum startup option. You can specify any FTP server that supports anonymous uploads. The default is Novell's public ftp server."
+msgid "Used to specify where the supportconfig tarball will be uploaded, when using the -u srnum startup option. You can specify any FTP server that supports anonymous uploads. The default is SUSE's public ftp server."
+msgstr "Brukes for å angi hvor supportconfig-arkivet skal lastes opp når oppstartsvalget -u srnum startup brukes. Du kan angi en hvilken som helst FTP-server som støtter anonym opplasting. Standard er Novells offentlige ftp-server."
 
 #. Initialization dialog caption
 #: src/include/support/wizards.rb:147
 msgid "Support Configuration"
-msgstr ""
+msgstr "Oppsett av brukerstøtte"
 
 #. Initialization dialog contents
 #: src/include/support/wizards.rb:149
 msgid "Initializing..."
-msgstr ""
+msgstr "Initialiserer ..."
 
 #. global string created_directory="";
 #: src/modules/Support.rb:143
 msgid "To continue, enter root password"
-msgstr ""
+msgstr "Angi rotpassordet for å fortsette"
 
 #: src/modules/Support.rb:144
 msgid "root Password"
-msgstr ""
+msgstr "Rotpassord"
 
 #: src/modules/Support.rb:163
 msgid "Password incorrect"
-msgstr ""
+msgstr "Passordet er feil"
 
 #. Support read dialog caption
 #: src/modules/Support.rb:267
@@ -793,30 +816,30 @@
 #. Progress stage 1/2
 #: src/modules/Support.rb:329
 msgid "Write the settings"
-msgstr ""
+msgstr "Lagre innstillingene"
 
 #. Progress stage 2/2
 #: src/modules/Support.rb:331
 msgid "Run SuSEconfig"
-msgstr ""
+msgstr "Kjør SuSEconfig"
 
 #. Progress step 1/2
 #: src/modules/Support.rb:335
 msgid "Writing the settings..."
-msgstr ""
+msgstr "Lagrer innstillingene..."
 
 #. Progress step 2/2
 #: src/modules/Support.rb:337
 msgid "Running SuSEconfig..."
-msgstr ""
+msgstr "Kjører SuSEconfig..."
 
 #. Progress finished
 #: src/modules/Support.rb:339
 msgid "Finished"
-msgstr ""
+msgstr "Fullført"
 
 #. TODO FIXME: your code here...
 #. Configuration summary text for autoyast
 #: src/modules/Support.rb:438
 msgid "Configuration summary..."
-msgstr ""
+msgstr "Konfigurasjonssammendrag..."

Modified: trunk/yast/nb/po/sysconfig.nb.po
===================================================================
--- trunk/yast/nb/po/sysconfig.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/sysconfig.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: sysconfig.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2007-07-25 10:51+0200\n"
 "Last-Translator: Rune Nordbøe Skillingstad <rune@skillingstad.no>\n"
 "Language-Team: Norwegian\n"
@@ -491,51 +491,111 @@
 "Vent...<br></p>\n"
 "\n"
 
-#~ msgid ""
-#~ "<p> SuSEconfig saves a checksum of each configuration file, so it can detect if\n"
-#~ " you have manually changed any of them. If you have changed a configuration file manually,\n"
-#~ " it will not touch it.</p>\n"
-#~ msgstr ""
-#~ "<p> SuSEconfig lagrer en kontrollsum for hver konfigurasjonsfil for å kunne se om \n"
-#~ "du har endret noen av dem manuelt.  Hvis du har endret en konfigurasjonsfil manuelt,\n"
-#~ "vil den ikke bli endret.</p>\n"
+#. Translation: Progress bar label
+#: src/modules/Sysconfig.rb:159
+msgid "Searching..."
+msgstr "Søker..."
 
-#~ msgid "Searching..."
-#~ msgstr "Søker..."
+#. Display confirmation dialog
+#. @param [String] message Confirmation message
+#. @param [String] command Command to confirm
+#. @return [Symbol] `cont - start command, `skip - skip this command, `abort - skip all remaining commands
+#: src/modules/Sysconfig.rb:883
+msgid "Command: "
+msgstr "Kommando: "
 
-#~ msgid "Command: "
-#~ msgstr "Kommando: "
+#. button label
+#: src/modules/Sysconfig.rb:889
+msgid "S&kip"
+msgstr "H&opp over"
 
-#~ msgid "S&kip"
-#~ msgstr "H&opp over"
+#. get activation map for variable
+#. start generic commands
+#: src/modules/Sysconfig.rb:967 src/modules/Sysconfig.rb:1171
+msgid "A command will be executed"
+msgstr "En kommando vil bli kjørt"
 
-#~ msgid "A command will be executed"
-#~ msgstr "En kommando vil bli kjørt"
+#: src/modules/Sysconfig.rb:968 src/modules/Sysconfig.rb:1172
+msgid "Starting command: %1..."
+msgstr "Starter kommando: %1..."
 
-#~ msgid "Starting command: %1..."
-#~ msgstr "Starter kommando: %1..."
+#: src/modules/Sysconfig.rb:969 src/modules/Sysconfig.rb:1173
+msgid "Command %1 failed"
+msgstr "Kommandoen %1 mislyktes"
 
-#~ msgid "Command %1 failed"
-#~ msgstr "Kommandoen %1 mislyktes"
+#. write dialog caption
+#: src/modules/Sysconfig.rb:1009
+msgid "Saving sysconfig Configuration"
+msgstr "Lagrer sysconfig-konfigurasjon"
 
-#~ msgid "Saving sysconfig Configuration"
-#~ msgstr "Lagrer sysconfig-konfigurasjon"
+#. progress bar item
+#: src/modules/Sysconfig.rb:1036
+msgid "Write the new settings"
+msgstr "Lagre de nye innstillingene"
 
-#~ msgid "Write the new settings"
-#~ msgstr "Lagre de nye innstillingene"
+#: src/modules/Sysconfig.rb:1037
+msgid "Activate the changes"
+msgstr "Aktiver endringene"
 
-#~ msgid "Activate the changes"
-#~ msgstr "Aktiver endringene"
+#. error popup: %1 - variable name (e.g. DISPLAYMANAGER), %2 - file name (/etc/sysconfig/displaymanager)
+#: src/modules/Sysconfig.rb:1060
+msgid "Saving variable %1 to the file %2 failed."
+msgstr "Lagring av variabelen %1 i filen %2 mislyktes."
 
-#~ msgid "Saving variable %1 to the file %2 failed."
-#~ msgstr "Lagring av variabelen %1 i filen %2 mislyktes."
+#. progress bar label, %1 is variable name (e.g. DISPLAYMANAGER)
+#: src/modules/Sysconfig.rb:1068
+msgid "Saving variable %1..."
+msgstr "Lagrer variabelen %1..."
 
-#~ msgid "Saving variable %1..."
-#~ msgstr "Lagrer variabelen %1..."
+#: src/modules/Sysconfig.rb:1073
+msgid "Saving changes to the files..."
+msgstr "Lagrer endringer i filer..."
 
-#~ msgid "Saving changes to the files..."
-#~ msgstr "Lagrer endringer i filer..."
+#. service is running, reload it
+#: src/modules/Sysconfig.rb:1100
+msgid "Service %1 will be reloaded"
+msgstr "Tjenesten %1 %1 vil bli lastet på nytt"
 
+#: src/modules/Sysconfig.rb:1103
+msgid "Reloading service %1..."
+msgstr "Laster tjenesten %1 på nytt..."
+
+#: src/modules/Sysconfig.rb:1105
+msgid "Reload of the service %1 failed"
+msgstr "Tjenesten %1 kunne ikke lastes på nytt"
+
+#. service is running, restart it
+#: src/modules/Sysconfig.rb:1143
+msgid "Service %1 will be restarted"
+msgstr "Tjenesten %1 vil bli startet på nytt"
+
+#: src/modules/Sysconfig.rb:1146
+msgid "Restarting service %1..."
+msgstr "Starter tjenesten %1 på nytt..."
+
+#: src/modules/Sysconfig.rb:1148
+msgid "Restart of the service %1 failed"
+msgstr "Tjenesten %1 kunne ikke startes på nytt"
+
+#. set 100% in progress bar
+#: src/modules/Sysconfig.rb:1186
+msgid "Finished"
+msgstr "Fullført"
+
+#. configuration summary headline
+#: src/modules/Sysconfig.rb:1269
+msgid "Configuration Summary"
+msgstr "Konfigurasjonssammendrag"
+
+#~ msgid ""
+#~ "<p> SuSEconfig saves a checksum of each configuration file, so it can detect if\n"
+#~ " you have manually changed any of them. If you have changed a configuration file manually,\n"
+#~ " it will not touch it.</p>\n"
+#~ msgstr ""
+#~ "<p> SuSEconfig lagrer en kontrollsum for hver konfigurasjonsfil for å kunne se om \n"
+#~ "du har endret noen av dem manuelt.  Hvis du har endret en konfigurasjonsfil manuelt,\n"
+#~ "vil den ikke bli endret.</p>\n"
+
 #~ msgid "All configuration scripts will be started."
 #~ msgstr "Alle konfigurasjonsskript vil bli startet."
 
@@ -554,30 +614,6 @@
 #~ msgid "Configuration module %1 failed."
 #~ msgstr "Konfigurasjonsmodulen %1 kunne ikke startes."
 
-#~ msgid "Service %1 will be reloaded"
-#~ msgstr "Tjenesten %1 %1 vil bli lastet på nytt"
-
-#~ msgid "Reloading service %1..."
-#~ msgstr "Laster tjenesten %1 på nytt..."
-
-#~ msgid "Reload of the service %1 failed"
-#~ msgstr "Tjenesten %1 kunne ikke lastes på nytt"
-
-#~ msgid "Service %1 will be restarted"
-#~ msgstr "Tjenesten %1 vil bli startet på nytt"
-
-#~ msgid "Restarting service %1..."
-#~ msgstr "Starter tjenesten %1 på nytt..."
-
-#~ msgid "Restart of the service %1 failed"
-#~ msgstr "Tjenesten %1 kunne ikke startes på nytt"
-
-#~ msgid "Finished"
-#~ msgstr "Fullført"
-
-#~ msgid "Configuration Summary"
-#~ msgstr "Konfigurasjonssammendrag"
-
 #~ msgid ""
 #~ "Here, see the values YaST2 will change.\n"
 #~ "Choose \"OK\" for YaST2 to save these changes.\n"

Modified: trunk/yast/nb/po/tftp-server.nb.po
===================================================================
--- trunk/yast/nb/po/tftp-server.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/tftp-server.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: tftp-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2008-10-02 14:30+0200\n"
 "Last-Translator: Olav P. <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <>\n"

Modified: trunk/yast/nb/po/timezone_db.nb.po
===================================================================
--- trunk/yast/nb/po/timezone_db.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/timezone_db.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: timezone_db.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:32+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2008-10-02 14:52+0200\n"
 "Last-Translator: Olav P. <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <>\n"

Modified: trunk/yast/nb/po/tune.nb.po
===================================================================
--- trunk/yast/nb/po/tune.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/tune.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: tune\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:57+0100\n"
+"POT-Creation-Date: 2014-08-04 16:02+0200\n"
 "PO-Revision-Date: 2009-08-14 09:55+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -26,36 +26,36 @@
 "X-Generator: Lokalize 1.0\n"
 
 #. Command line help text for the hardware detection module, %1 is "hwinfo"
-#: src/clients/hwinfo.rb:47
+#: src/clients/hwinfo.rb:49
 msgid "Hardware Detection - this module does not support the command line interface, use '%1' instead."
 msgstr "Maskinvareinformasjon - denne modulen støtter ikke kommandolinjemodus, bruk %1 i stedet."
 
 #. translators: popup heading
-#: src/clients/hwinfo.rb:71
+#: src/clients/hwinfo.rb:73
 msgid "Probing Hardware..."
 msgstr "Søker etter maskinvare..."
 
 #. progress bar label
-#: src/clients/hwinfo.rb:74
+#: src/clients/hwinfo.rb:76
 msgid "Progress"
 msgstr "Fremdrift"
 
 #. title label
-#: src/clients/hwinfo.rb:292
+#: src/clients/hwinfo.rb:311
 msgid "&All Entries"
 msgstr "&Alle oppføringer"
 
-#: src/clients/hwinfo.rb:304
+#: src/clients/hwinfo.rb:323
 msgid "&Save to File..."
 msgstr "&Lagre til fil..."
 
 #. dialog header
-#: src/clients/hwinfo.rb:313
+#: src/clients/hwinfo.rb:332
 msgid "Hardware Information"
 msgstr "Maskinvareinformasjon"
 
 #. help text
-#: src/clients/hwinfo.rb:316
+#: src/clients/hwinfo.rb:335
 msgid ""
 "<P>The <B>Hardware Information</B> module displays the hardware\n"
 "details of your computer. Click any node for more information.</p>\n"
@@ -63,18 +63,25 @@
 "<P>Modulen <B>Maskinvareinformasjon</B> viser informasjon om \n"
 "maskinvaren i systemet. Klikk på en oppføring for å få mer informasjon.</p>\n"
 
-#: src/clients/hwinfo.rb:319
+#: src/clients/hwinfo.rb:338
 msgid "<P>You can save hardware information to a file. Click <B>Save to File</B> and enter the filename.</P>"
 msgstr "<P>Du kan lagre maskinvareinformasjonen i en fil. Klikk <B>Lagre i fil</B> og angi et filnavn.</P>"
 
+#. installation proposal header
+#: src/clients/hwinfo_proposal.rb:31
+#, fuzzy
+#| msgid "System Settings"
+msgid "System and Hardware Settings"
+msgstr "Systeminnstillinger"
+
 #. this is a heading
 #. tree node string
-#: src/clients/hwinfo_proposal.rb:48 src/include/hwinfo/routines.rb:471
+#: src/clients/hwinfo_proposal.rb:50 src/include/hwinfo/routines.rb:471
 msgid "System"
 msgstr "System"
 
 #. this is a menu entry
-#: src/clients/hwinfo_proposal.rb:50
+#: src/clients/hwinfo_proposal.rb:52
 msgid "S&ystem"
 msgstr "S&ystem"
 

Modified: trunk/yast/nb/po/update.nb.po
===================================================================
--- trunk/yast/nb/po/update.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/update.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: update.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-13 13:22+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2009-08-14 10:04+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -148,7 +148,7 @@
 
 #. screen title for update options
 #. this is a heading
-#: src/clients/inst_update.rb:48 src/clients/update_proposal.rb:298
+#: src/clients/inst_update.rb:48 src/clients/update_proposal.rb:278
 msgid "Update Options"
 msgstr "Oppgraderingsalternativer"
 
@@ -173,18 +173,18 @@
 #. Table item (unknown file system)
 #. label - name of sustem to update
 #. starts with >`<
-#. label for an unknown installed system
+#. Get installed release name
+#. TRANSLATORS: label for an unknown installed system
 #: src/clients/inst_update.rb:69 src/clients/inst_update.rb:74
-#: src/include/update/rootpart.rb:95 src/include/update/rootpart.rb:101
-#: src/include/update/rootpart.rb:121 src/modules/RootPart.rb:156
-#: src/modules/RootPart.rb:1435 src/modules/RootPart.rb:1441
-#: src/modules/RootPart.rb:1969
+#: src/include/update/rootpart.rb:100 src/include/update/rootpart.rb:106
+#: src/include/update/rootpart.rb:126 src/modules/RootPart.rb:155
+#: src/modules/RootPart.rb:1434 src/modules/RootPart.rb:1440
+#: src/modules/RootPart.rb:1981
 msgid "Unknown"
 msgstr "Ukjent"
 
 #. label showing to which version we are updating
-#. TRANSLATORS: proposal summary item, %1 is a product name
-#: src/clients/inst_update.rb:80 src/clients/update_proposal.rb:198
+#: src/clients/inst_update.rb:80
 msgid "Update to %1"
 msgstr "Oppgrader til %1"
 
@@ -257,9 +257,19 @@
 "ikke fungerer lenger. Velg <b>Slett pakker som ikke vedlikeholdes</b> for å slette slike\n"
 "pakker under oppgraderingen.</p>\n"
 
-#. yes/no question
+#. warning / question
 #: src/clients/inst_update.rb:231
 msgid ""
+"Changing the update method to 'Update packages only' might\n"
+"lead into non-bootable or non-working system if you do not\n"
+"adjust the list of packages yourself.\n"
+"\n"
+"Really continue?"
+msgstr ""
+
+#. yes/no question
+#: src/clients/inst_update.rb:243
+msgid ""
 "Do you really want\n"
 "to reset your detailed selection?"
 msgstr ""
@@ -269,13 +279,13 @@
 #. error report
 #. inform user in the proposal about the failed mount
 #. error report
-#: src/clients/inst_update_partition_auto.rb:70
-#: src/clients/rootpart_proposal.rb:110 src/include/update/rootpart.rb:379
+#: src/clients/inst_update_partition_auto.rb:79
+#: src/clients/rootpart_proposal.rb:110 src/include/update/rootpart.rb:385
 msgid "Failed to mount target system"
 msgstr "Målsystemet kunne ikke monteres"
 
 #. Correctly mounted but incomplete installation found
-#: src/clients/inst_update_partition_auto.rb:75
+#: src/clients/inst_update_partition_auto.rb:84
 msgid "A possibly incomplete installation has been detected."
 msgstr "En mulig ufullstendig installasjon ble registrert."
 
@@ -346,12 +356,12 @@
 
 #. error message in proposal
 #. part of error popup message
-#: src/clients/update_proposal.rb:83 src/clients/update_proposal.rb:404
+#: src/clients/update_proposal.rb:85 src/clients/update_proposal.rb:384
 msgid "Cannot read the current RPM Database."
 msgstr "Kan ikke lese gjeldende RPM-database."
 
 #. error message in proposal
-#: src/clients/update_proposal.rb:99
+#: src/clients/update_proposal.rb:101
 msgid "The installed product is not compatible with the product on the installation media."
 msgstr "Det installerte produktet er ikke kompatibelt med produktet på installasjonsmediet."
 
@@ -359,14 +369,14 @@
 #. TRANSLATORS: unknown product (label)
 #. TRANSLATORS: unknown product name
 #. TRANSLATORS: unknown product name
-#: src/clients/update_proposal.rb:108 src/clients/update_proposal.rb:126
-#: src/clients/update_proposal.rb:169 src/clients/update_proposal.rb:175
+#: src/clients/update_proposal.rb:110 src/clients/update_proposal.rb:128
+#: src/clients/update_proposal.rb:171 src/clients/update_proposal.rb:177
 msgid "Unknown product"
 msgstr "Ukjent produkt"
 
 #. TRANSLATORS: proposal error, %1 is the version of installed system
 #. %2 is the version being installed
-#: src/clients/update_proposal.rb:141
+#: src/clients/update_proposal.rb:143
 msgid ""
 "Updating system to another version (%1 -> %2) is not supported on the running system.<br>\n"
 "Boot from the installation media and use a normal upgrade\n"
@@ -377,22 +387,22 @@
 "eller deaktiver pakkebrønner for produkter med andre versjoner.\n"
 
 #. TRANSLATORS: proposal warning, both %1 and %2 are replaced with product names
-#: src/clients/update_proposal.rb:162
+#: src/clients/update_proposal.rb:164
 msgid "Warning: Updating from '%1' to '%2', products do not exactly match."
 msgstr "Advarsel: Oppgradering av produktet fra '%1' til '%2' er ikke spesifikt støttet."
 
 #. Proposal for backup during update
-#: src/clients/update_proposal.rb:214
+#: src/clients/update_proposal.rb:191
 msgid "Only update installed packages"
 msgstr "Oppgrader bare installerte pakker"
 
 #. proposal string
-#: src/clients/update_proposal.rb:229
+#: src/clients/update_proposal.rb:206
 msgid "Update based on patterns"
 msgstr "Oppgradering basert på mønstre"
 
 #. TRANSLATORS: proposal dialog help
-#: src/clients/update_proposal.rb:255
+#: src/clients/update_proposal.rb:232
 msgid ""
 "<p><b><big>Update Options</big></b> Select how your system will be updated.\n"
 "Choose if only installed packages should be updated or new ones should be\n"
@@ -405,17 +415,17 @@
 "(standardutvalget), og om pakker som ikke vedlikeholdes skal slettes·</p>\n"
 
 #. this is a menu entry
-#: src/clients/update_proposal.rb:300
+#: src/clients/update_proposal.rb:280
 msgid "&Update Options"
 msgstr "&Oppgraderingsalternativer"
 
 #. part of error popup message, %1 stands for newline-separated list of files
-#: src/clients/update_proposal.rb:407
+#: src/clients/update_proposal.rb:387
 msgid "None of these files exist:%1"
 msgstr "Ingen av disse filene finnes:%1"
 
 #. continue-cancel popup
-#: src/clients/update_proposal.rb:541
+#: src/clients/update_proposal.rb:517
 msgid ""
 "The installed product is not compatible with the product\n"
 "on the installation media. If you try to update using the\n"
@@ -428,27 +438,27 @@
 "eller enkelte programmer vil kanskje ikke fungere som de skal."
 
 #. Table item (unknown system)
-#: src/include/update/rootpart.rb:88
+#: src/include/update/rootpart.rb:93
 msgid "Unknown Linux"
 msgstr "Ukjent Linux"
 
 #. Table item (unknown system)
-#: src/include/update/rootpart.rb:91
+#: src/include/update/rootpart.rb:96
 msgid "Unknown or Non-Linux"
 msgstr "Ukjent eller ikke Linux"
 
 #. is a linux fs, can be a root fs, has a fs name
-#: src/include/update/rootpart.rb:113
+#: src/include/update/rootpart.rb:118
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
 #. label for selection of root partition (for boot)
-#: src/include/update/rootpart.rb:181
+#: src/include/update/rootpart.rb:186
 msgid "Partition or System to Boot:"
 msgstr "Partisjon eller system som skal startes:"
 
 #. help text for root partition dialog (for boot)
-#: src/include/update/rootpart.rb:184
+#: src/include/update/rootpart.rb:189
 msgid ""
 "<p>\n"
 "Select the partition or system to boot.\n"
@@ -459,12 +469,12 @@
 "</p>\n"
 
 #. label for selection of root partition (for update)
-#: src/include/update/rootpart.rb:191
+#: src/include/update/rootpart.rb:196
 msgid "Partition or System to Update:"
 msgstr "Partisjon eller system som skal oppgraderes:"
 
 #. help text for root partition dialog (for update)
-#: src/include/update/rootpart.rb:194
+#: src/include/update/rootpart.rb:199
 msgid ""
 "<p>\n"
 "Select the partition or system to update.\n"
@@ -475,12 +485,12 @@
 "</p>\n"
 
 #. headline for dialog "Select for update"
-#: src/include/update/rootpart.rb:202
+#: src/include/update/rootpart.rb:207
 msgid "Select for Update"
 msgstr "Velg for oppgradering"
 
 #. help text for root partition dialog (general part)
-#: src/include/update/rootpart.rb:209
+#: src/include/update/rootpart.rb:214
 msgid ""
 "<p>\n"
 "<b>Show All Partitions</b> expands the list to a\n"
@@ -493,42 +503,42 @@
 "</p>\n"
 
 #. table header
-#: src/include/update/rootpart.rb:229
+#: src/include/update/rootpart.rb:234
 msgid "System"
 msgstr "System"
 
 #. table header item
-#: src/include/update/rootpart.rb:231
+#: src/include/update/rootpart.rb:236
 msgid "Partition"
 msgstr "Partisjon"
 
 #. table header item
-#: src/include/update/rootpart.rb:233
+#: src/include/update/rootpart.rb:238
 msgid "Architecture"
 msgstr "Arkitektur"
 
 #. table header item
-#: src/include/update/rootpart.rb:235
+#: src/include/update/rootpart.rb:240
 msgid "File System"
 msgstr "Filsystem"
 
 #. table header item
-#: src/include/update/rootpart.rb:237
+#: src/include/update/rootpart.rb:242
 msgid "Label"
 msgstr "Betegnelse"
 
 #. check box
-#: src/include/update/rootpart.rb:247
+#: src/include/update/rootpart.rb:252
 msgid "&Show All Partitions"
 msgstr "Vi&s alle partisjoner"
 
 #. pushbutton to (rightaway) boot the system selected above
-#: src/include/update/rootpart.rb:278
+#: src/include/update/rootpart.rb:283
 msgid "&Boot"
 msgstr "&Oppstart"
 
-#. continue-cancel popup
-#: src/include/update/rootpart.rb:348
+#. error popup
+#: src/include/update/rootpart.rb:354
 msgid ""
 "No installed system that can be upgraded with this product was found\n"
 "on the selected partition."
@@ -537,7 +547,7 @@
 "på den valgte partisjonen."
 
 #. continue-cancel popup
-#: src/include/update/rootpart.rb:358
+#: src/include/update/rootpart.rb:364
 msgid ""
 "The architecture of the system installed in the selected partition\n"
 "is different from the one of this product.\n"
@@ -546,7 +556,7 @@
 "arkitektur enn dette produktet.\n"
 
 #. pop-up question
-#: src/include/update/rootpart.rb:388
+#: src/include/update/rootpart.rb:394
 msgid ""
 "A possibly incomplete installation has been detected on the selected partition.\n"
 "Are sure you want to use it anyway?"
@@ -555,13 +565,13 @@
 "Vil du bruke den likevel?"
 
 #. button label
-#: src/include/update/rootpart.rb:392
+#: src/include/update/rootpart.rb:398
 msgid "&Yes, Use It"
 msgstr "&Ja, bruk"
 
 #. Target load failed, #466803
 #. Target load failed, #466803
-#: src/include/update/rootpart.rb:426 src/include/update/rootpart.rb:451
+#: src/include/update/rootpart.rb:436 src/include/update/rootpart.rb:461
 msgid ""
 "Initializing the system for upgrade has failed for unknown reason.\n"
 "It is highly recommended not to continue the upgrade process.\n"
@@ -573,12 +583,12 @@
 "\n"
 "Vil du virkelig fortsette?"
 
-#: src/include/update/rootpart.rb:432 src/include/update/rootpart.rb:457
+#: src/include/update/rootpart.rb:442 src/include/update/rootpart.rb:467
 msgid "&Yes, Continue"
 msgstr "&Ja, fortsett"
 
 #. Link to SDB article concerning renaming of devices.
-#: src/modules/RootPart.rb:109
+#: src/modules/RootPart.rb:108
 msgid ""
 "See the SDB article at %1 for details\n"
 "about how to solve this problem."
@@ -587,17 +597,17 @@
 "informasjon om hvordan du kan løse dette problemet."
 
 #. label - name of sustem to update
-#: src/modules/RootPart.rb:147
+#: src/modules/RootPart.rb:146
 msgid "Unknown Linux System"
 msgstr "Ukjent Linux-system"
 
 #. label - name of sustem to update
-#: src/modules/RootPart.rb:152
+#: src/modules/RootPart.rb:151
 msgid "Non-Linux System"
 msgstr "Ikke Linux-system"
 
 #. error report, %1 is device (eg. /dev/hda1)
-#: src/modules/RootPart.rb:308
+#: src/modules/RootPart.rb:307
 msgid ""
 "Cannot unmount partition %1.\n"
 "\n"
@@ -612,7 +622,7 @@
 "eller start datamaskinen på nytt.\n"
 
 #. label, %1 is partition
-#: src/modules/RootPart.rb:379
+#: src/modules/RootPart.rb:378
 msgid "Checking partition %1"
 msgstr "Kontrollerer partisjonen %1"
 
@@ -621,23 +631,23 @@
 #. @param string button (true)
 #. @param string button (false)
 #. @param [String] details (hidden under [Details] button; optional; to disable, use "")
-#: src/modules/RootPart.rb:416
+#: src/modules/RootPart.rb:415
 msgid "Show &Details"
 msgstr "Vis &detaljer"
 
 #. #176292, run fsck before jfs is mounted
-#: src/modules/RootPart.rb:498
+#: src/modules/RootPart.rb:497
 msgid "Checking file system on %1..."
 msgstr "Kontrollerer filsystem på %1..."
 
 #. popup headline
-#: src/modules/RootPart.rb:530
+#: src/modules/RootPart.rb:529
 msgid "File System Check Failed"
 msgstr "Filsystemkontroll mislyktes"
 
 #. popup question (continue/cancel dialog)
 #. %1 is a device name such as /dev/hda5
-#: src/modules/RootPart.rb:534
+#: src/modules/RootPart.rb:533
 msgid ""
 "The file system check of device %1 has failed.\n"
 "\n"
@@ -648,24 +658,24 @@
 "Vil du montere enheten likevel?\n"
 
 #. button
-#: src/modules/RootPart.rb:543
+#: src/modules/RootPart.rb:542
 msgid "&Skip Mounting"
 msgstr "&Hopp over montering"
 
 #. yes-no popup
-#: src/modules/RootPart.rb:1059
+#: src/modules/RootPart.rb:1058
 msgid "Incorrect password. Try again?"
 msgstr "Feil passord. Vil du forsøke igjen?"
 
 #. TRANSLATORS: a popup headline
-#: src/modules/RootPart.rb:1162
+#: src/modules/RootPart.rb:1161
 msgid "Warning"
 msgstr "Advarsel"
 
 #. TRANSLATORS: error message,
 #. %1 is replaced with the current /boot partition size
 #. %2 with the recommended size
-#: src/modules/RootPart.rb:1167
+#: src/modules/RootPart.rb:1166
 msgid ""
 "Your /boot partition is too small (%1 MB).\n"
 "We recommend a size of no less than %2 MB or else the new Kernel may not fit.\n"
@@ -682,7 +692,7 @@
 "Vil du fortsette å oppgradere systemet?\n"
 
 #. label in a popup, %1 is device (eg. /dev/hda1), %2 is output of the 'mount' command
-#: src/modules/RootPart.rb:1259
+#: src/modules/RootPart.rb:1258
 msgid ""
 "The partition %1 could not be mounted.\n"
 "\n"
@@ -702,27 +712,27 @@
 "Klikk på Avbryt for å avbryte oppgraderingen.\n"
 
 #. push button
-#: src/modules/RootPart.rb:1277
+#: src/modules/RootPart.rb:1276
 msgid "&Specify Mount Options"
 msgstr "&Spesifiser monteringsalternativer"
 
 #. popup heading
-#: src/modules/RootPart.rb:1293
+#: src/modules/RootPart.rb:1292
 msgid "Mount Options"
 msgstr "Monteringsalternativer"
 
 #. text entry label
-#: src/modules/RootPart.rb:1296
+#: src/modules/RootPart.rb:1295
 msgid "&Mount Point"
 msgstr "&Monteringspunkt"
 
 #. tex entry label
-#: src/modules/RootPart.rb:1299
+#: src/modules/RootPart.rb:1298
 msgid "&Device"
 msgstr "&Enhet"
 
 #. text entry label
-#: src/modules/RootPart.rb:1304
+#: src/modules/RootPart.rb:1303
 msgid ""
 "&File System\n"
 "(empty for autodetection)"
@@ -731,12 +741,12 @@
 "(tomt for automatisk søk)"
 
 #. error message
-#: src/modules/RootPart.rb:1381
+#: src/modules/RootPart.rb:1380
 msgid "The /var partition %1 could not be mounted.\n"
 msgstr "/var-partisjonen %1 kunne ikke monteres.\n"
 
 #. Informational text about selected partition, %x are replaced with values later
-#: src/modules/RootPart.rb:1422
+#: src/modules/RootPart.rb:1421
 msgid ""
 "<b>File system:</b> %1, <b>Type:</b> %2,<br>\n"
 "<b>Label:</b> %3, <b>Size:</b> %4,<br>\n"
@@ -748,17 +758,17 @@
 "<b>udev-ID-er:</b> %5,<br>\n"
 "<b>udev-filsti:</b> %6"
 
-#: src/modules/RootPart.rb:1436
+#: src/modules/RootPart.rb:1435
 msgid "None"
 msgstr "Ingen"
 
 #. a popup caption
-#: src/modules/RootPart.rb:1459
+#: src/modules/RootPart.rb:1458
 msgid "Unable to find the /var partition automatically"
 msgstr "Kunne ikke finne /var-partisjonen automatisk"
 
 #. a popup message
-#: src/modules/RootPart.rb:1464
+#: src/modules/RootPart.rb:1463
 msgid ""
 "Your system uses a separate /var partition which is required for the upgrade\n"
 "process to detect the disk-naming changes. Select the /var partition manually\n"
@@ -769,22 +779,22 @@
 "for å fortsette oppgraderingsprosessen."
 
 #. a combo-box label
-#: src/modules/RootPart.rb:1477
+#: src/modules/RootPart.rb:1476
 msgid "&Select /var Partition Device"
 msgstr "Velg en /var-parti&sjonsenhet"
 
 #. an informational rich-text widget label
-#: src/modules/RootPart.rb:1483
+#: src/modules/RootPart.rb:1482
 msgid "Device Info"
 msgstr "Enhetsinfo"
 
 #. error message
-#: src/modules/RootPart.rb:1624
+#: src/modules/RootPart.rb:1623
 msgid "Unable to mount /var partition with this disk configuration.\n"
 msgstr "Kunne ikke montere /var-partisjonen med denne diskkonfigurasjonen.\n"
 
 #. popup message, %1 will be replace with the name of the logfile
-#: src/modules/RootPart.rb:1655
+#: src/modules/RootPart.rb:1654
 msgid ""
 "Partitions could not be mounted.\n"
 "\n"
@@ -797,7 +807,7 @@
 #. read the keyboard settings now, so that it used when
 #. typing passwords for encrypted partitions
 #. Calling a script because otherwise this module would depend on yast2-country
-#: src/modules/RootPart.rb:1699
+#: src/modules/RootPart.rb:1698
 msgid ""
 "Some partitions in the system on %1 are mounted by kernel-device name. This is\n"
 "not reliable for the update since kernel-device names are unfortunately not\n"
@@ -810,17 +820,17 @@
 "«Monter med»-valget til en annen metode for alle partisjoner."
 
 #. error message
-#: src/modules/RootPart.rb:1717
+#: src/modules/RootPart.rb:1716
 msgid "No fstab found."
 msgstr "Ingen fstab funnet."
 
 #. message part 1
-#: src/modules/RootPart.rb:1742
+#: src/modules/RootPart.rb:1741
 msgid "The root partition in /etc/fstab has an invalid root device.\n"
 msgstr "Rotpartisjonen i /etc/fstab har en ugyldig rotenhet.\n"
 
 #. message part 2
-#: src/modules/RootPart.rb:1747
+#: src/modules/RootPart.rb:1746
 msgid "It is currently mounted as %1 but listed as %2.\n"
 msgstr "Den er nå montert som %1, men er oppført som %2.\n"
 
@@ -839,38 +849,73 @@
 msgid "Searching for Available Systems"
 msgstr "Søker etter tilgjengelige systemer"
 
+#. Returns product name as found in SuSE-release file.
+#. Compatible with OSRelease.ReleaseInformation.
+#. Returns SUSEReleaseFileMissingError if SuSE-release file is missing.
+#. Returns IOError is SuSE-release could not be open.
+#.
+#. @param [String] system base-directory, default is "/"
+#. @return [String] product name
+#: src/modules/SUSERelease.rb:65
+#, fuzzy
+#| msgid "Kerberos schema file not found"
+msgid "Release file %{file} not found"
+msgstr "Kerberos-skjemafil ikke funnet"
+
+#: src/modules/SUSERelease.rb:74
+#, fuzzy
+#| msgid "Cannot read license file %1"
+msgid "Cannot read release file %{file}"
+msgstr "Kan ikke lese lisensfilen %1"
+
 #. -----------------------------------------------------------------------
 #. GLOBAL FUNCTIONS
 #. -----------------------------------------------------------------------
-#: src/modules/Update.rb:304
+#: src/modules/Update.rb:309
 msgid "Unknown Product"
 msgstr "Ukjent produkt"
 
-#. TRANSLATORS: check-box, it might happen that we need to downgrade some packages during update
-#: src/modules/Update.rb:817
-msgid "Allow Package Downgrade"
-msgstr "Tillat nedgradering av pakker"
+#. If the current default desktop is not installed, it's a valid use case
+#. and we don't continue further
+#: src/modules/Update.rb:791
+msgid ""
+"Cannot select these patterns required for installation:\n"
+"%{patterns}"
+msgstr ""
 
-#: control/update.glade:18 control/update.glade:42
+#: src/modules/Update.rb:796
+#, fuzzy
+#| msgid "Failed to select %1 packages for installation"
+msgid ""
+"Cannot select these packages required for installation:\n"
+"%{packages}"
+msgstr "%1 pakker ble ikke valgt for installasjon"
+
+#: control/update.glade.translations.glade:3
+#: control/update.glade.translations.glade:5
 msgid "Update Settings"
 msgstr "Oppgraderingsinnstillinger"
 
-#: control/update.glade:34
+#: control/update.glade.translations.glade:4
 msgid "Update"
 msgstr "Oppgradering"
 
-#: control/update.glade:48 control/update.glade:52
+#: control/update.glade.translations.glade:6
+#: control/update.glade.translations.glade:7
 msgid "Perform Update"
 msgstr "Utfør oppgradering"
 
-#: control/update.glade:63
+#: control/update.glade.translations.glade:8
 msgid "Update System Configuration"
 msgstr "Oppgrader systemkonfigurasjon"
 
-#: control/update.glade:71
+#: control/update.glade.translations.glade:9
 msgid "Update Configuration"
 msgstr "Oppgrader konfigurasjon"
 
+#~ msgid "Allow Package Downgrade"
+#~ msgstr "Tillat nedgradering av pakker"
+
 #~ msgid "Clean Up"
 #~ msgstr "Opprydding"
 

Modified: trunk/yast/nb/po/users.nb.po
===================================================================
--- trunk/yast/nb/po/users.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/users.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: users\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2009-10-01 12:44+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -283,7 +283,7 @@
 msgstr "Passord for systemadministratoren \"root\","
 
 #. advise user to remember his new password
-#. advise user to remember his new password
+#. advise users to remember their new password
 #: src/clients/inst_root.rb:95 src/clients/inst_root_first.rb:67
 msgid "Do not forget what you enter here."
 msgstr "Ikke glem hva du skriver inn her."
@@ -4536,22 +4536,22 @@
 "Slett disse brukerne fra gruppen først."
 
 #. summary label
-#: src/modules/Users.pm:6596
+#: src/modules/Users.pm:6601
 msgid "<h3>Users</h3>"
 msgstr "<h3>Brukere</h3>"
 
 #. summary label
-#: src/modules/Users.pm:6606
+#: src/modules/Users.pm:6611
 msgid "<h3>Groups</h3>"
 msgstr "<h3>Grupper</h3>"
 
 #. summary label
-#: src/modules/Users.pm:6617
+#: src/modules/Users.pm:6622
 msgid "<h3>Login Settings</h3>"
 msgstr "<h3>Innstillinger for innlogging</h3>"
 
 #. summary item, %1 is user name
-#: src/modules/Users.pm:6619
+#: src/modules/Users.pm:6624
 msgid "User %1 configured for automatic login"
 msgstr "Brukeren %1 blir logget automatisk inn"
 

Modified: trunk/yast/nb/po/vm.nb.po
===================================================================
--- trunk/yast/nb/po/vm.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/vm.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: vm.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:35+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2008-10-31 01:17+0100\n"
 "Last-Translator: Olav P. <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <>\n"
@@ -34,12 +34,12 @@
 msgstr "Installer hypervisor og verktøy"
 
 #. check for kernel-bigsmp
-#: src/modules/VM_XEN.rb:148
+#: src/modules/VM_XEN.rb:157
 msgid "x86_64 is the only supported architecture for hosting virtual machines. Your architecture is "
 msgstr "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/VM_XEN.rb:167
+#: src/modules/VM_XEN.rb:176
 msgid ""
 "Virtual machine installation cannot be started inside the UML machine.\n"
 "Start installation in the host system.\n"
@@ -48,126 +48,168 @@
 "Start installasjonen fra vertsmaskinsystemet.\n"
 
 #. progress stage 1/2
-#: src/modules/VM_XEN.rb:184
+#. Generate a pop dialog to allow user selection of Xen or KVM
+#: src/modules/VM_XEN.rb:193 src/modules/VM_XEN.rb:281
 msgid "Verify Installed Packages"
 msgstr "Kontroller installerte pakker"
 
 #. progress stage 2/2
-#: src/modules/VM_XEN.rb:186
+#: src/modules/VM_XEN.rb:195
 msgid "Network Bridge Configuration"
 msgstr "Oppsett av nettverksbro"
 
 #. Headline for management domain installation
-#: src/modules/VM_XEN.rb:201
+#: src/modules/VM_XEN.rb:210
 msgid "Configuring the VM Server (domain 0)"
 msgstr "Konfigurerer VM-serveren (domene 0)"
 
 #. xen domain0 installation help text - 1/4
-#: src/modules/VM_XEN.rb:204
+#: src/modules/VM_XEN.rb:213
 msgid "<p><big><b>VM Server Configuration</b></big></p><p>Configuration of the VM Server (domain 0) has two parts.</p>"
 msgstr "<p><big><b>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/VM_XEN.rb:208
+#: src/modules/VM_XEN.rb:217
 msgid "<p>The required packages are installed into the system first. Then the boot loader is switched to GRUB (if not already used) and the Xen section is added to the boot loader menu if it is missing.</p>"
 msgstr "<p>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/VM_XEN.rb:212
+#: src/modules/VM_XEN.rb:221
 msgid "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and the Linux kernel.</p>"
 msgstr "<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/VM_XEN.rb:216
+#: src/modules/VM_XEN.rb:225
 msgid "<p>When the configuration has finished successfully, you can boot the VM Server from the boot loader menu.</p>"
 msgstr "<p>Når oppsettet er fullført, kan VM-serveren startes fra oppstartslastermenyen.</p>"
 
 #. error popup
-#: src/modules/VM_XEN.rb:221
+#: src/modules/VM_XEN.rb:230
 msgid "The installation will be aborted."
 msgstr "Installasjonen vil bli avbrutt."
 
-#: src/modules/VM_XEN.rb:224
+#: src/modules/VM_XEN.rb:233
 #, fuzzy
 #| msgid "Hypervisor and tools are installed."
 msgid "Choose Hypervisor(s) to install"
 msgstr "Hypervisor og verktøy er installert."
 
-#: src/modules/VM_XEN.rb:241
+#: src/modules/VM_XEN.rb:236
+msgid "Server: Minimal system to get a running Hypervisor"
+msgstr ""
+
+#: src/modules/VM_XEN.rb:237
+#, fuzzy
+#| msgid "Configuring the virtual machine..."
+msgid "Tools: Configure, manage and monitor virtual machines"
+msgstr "Konfigurerer virtuell maskin..."
+
+#: src/modules/VM_XEN.rb:250
 msgid "KVM Hypervisor"
 msgstr ""
 
-#: src/modules/VM_XEN.rb:249
+#: src/modules/VM_XEN.rb:252
+msgid "KVM server"
+msgstr ""
+
+#: src/modules/VM_XEN.rb:253
+#, fuzzy
+#| msgid "Admin tools"
+msgid "KVM tools"
+msgstr "Administrasjonsverktøy"
+
+#: src/modules/VM_XEN.rb:258
 msgid "libvirt LXC containers"
 msgstr ""
 
-#. Generate a pop dialog to allow user selection of Xen or KVM
-#: src/modules/VM_XEN.rb:276
+#: src/modules/VM_XEN.rb:260
+msgid "libvirt LXC daemon"
+msgstr ""
+
+#: src/modules/VM_XEN.rb:288
 msgid "Software to connect to Virtualization server"
 msgstr ""
 
-#: src/modules/VM_XEN.rb:294
+#: src/modules/VM_XEN.rb:290
+#, fuzzy
+#| msgid "Hypervisor and tools are installed."
+msgid "Virtualization client tools"
+msgstr "Hypervisor og verktøy er installert."
+
+#: src/modules/VM_XEN.rb:306
 msgid "Xen Hypervisor"
 msgstr ""
 
+#: src/modules/VM_XEN.rb:308
+#, fuzzy
+#| msgid "Broken server"
+msgid "Xen server"
+msgstr "Deaktivert server"
+
+#: src/modules/VM_XEN.rb:309
+#, fuzzy
+#| msgid "Admin tools"
+msgid "Xen tools"
+msgstr "Administrasjonsverktøy"
+
 #. SLED doesn't have any installation capabilities (L3 support)
-#: src/modules/VM_XEN.rb:372
+#: src/modules/VM_XEN.rb:384
 #, fuzzy
 #| msgid "The installation will be aborted."
 msgid "Package installation failed\n"
 msgstr "Installasjonen vil bli avbrutt."
 
-#: src/modules/VM_XEN.rb:380
+#: src/modules/VM_XEN.rb:392
 #, fuzzy
 #| msgid "The installation will be aborted."
 msgid "Package installation failed for lxc\n"
 msgstr "Installasjonen vil bli avbrutt."
 
-#: src/modules/VM_XEN.rb:387
+#: src/modules/VM_XEN.rb:399
 msgid "Package installation failed for sled client pattern\n"
 msgstr ""
 
-#: src/modules/VM_XEN.rb:398
+#: src/modules/VM_XEN.rb:410
 msgid "Package installation failed for sles patterns\n"
 msgstr ""
 
 #. Assume python gtk is installed. If in text mode we don't care
-#: src/modules/VM_XEN.rb:411
+#: src/modules/VM_XEN.rb:423
 msgid "Running in text mode. Install graphical components anyway?"
 msgstr "Kjører i tekstmodus. Vil du likevel installere grafiske komponenter?"
 
 #. progressbar title - check whether Xen packages are installed
-#: src/modules/VM_XEN.rb:424
+#: src/modules/VM_XEN.rb:436
 msgid "Checking packages..."
 msgstr "Kontrollerer pakker..."
 
 #. progressbar title - install the required packages
-#: src/modules/VM_XEN.rb:427
+#: src/modules/VM_XEN.rb:439
 msgid "Installing packages..."
 msgstr "Installerer pakker..."
 
 #. error popup
 #. Now see if they really were installed (bnc#508347)
-#: src/modules/VM_XEN.rb:432 src/modules/VM_XEN.rb:439
+#: src/modules/VM_XEN.rb:444 src/modules/VM_XEN.rb:451
 msgid "Cannot install required packages."
 msgstr "Kan ikke installere nødvendige pakker."
 
 #. If grub2 is the bootloader and we succesfully installed Xen, update the grub2 files
-#: src/modules/VM_XEN.rb:449
+#: src/modules/VM_XEN.rb:461
 msgid "Updating grub2 configuration files..."
 msgstr "Oppdaterer konfigurasjonsfiler for grub2..."
 
 #. Default Bridge stage
-#: src/modules/VM_XEN.rb:460
+#: src/modules/VM_XEN.rb:474
 msgid "Configuring Default Network Bridge..."
 msgstr "Setter opp standard nettverksbro..."
 
 #. Popup yes/no dialog
-#: src/modules/VM_XEN.rb:481
+#: src/modules/VM_XEN.rb:495
 msgid "Network Bridge."
 msgstr "Nettverksbro."
 
-#: src/modules/VM_XEN.rb:482
+#: src/modules/VM_XEN.rb:496
 msgid "<p>For normal network configurations hosting virtual machines, a network bridge is recommended.</p><p>Configure a default network bridge?</p>"
 msgstr "<p>For vanlige nettverksoppsett med virtuelle maskiner anbefales det en nettverksbro.</p><p>Vil du sette opp en standard nettverksbro?</p>"
 
@@ -180,35 +222,35 @@
 #. Report::Error(_("Failed to configure the firewall to allow the Xen bridge") + "\n" + abortmsg);
 #. return false;
 #. }
-#: src/modules/VM_XEN.rb:540
+#: src/modules/VM_XEN.rb:557
 msgid "KVM components are installed. Your host is ready to install KVM guests."
 msgstr ""
 
-#: src/modules/VM_XEN.rb:543
+#: src/modules/VM_XEN.rb:560
 #, fuzzy
 #| msgid "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/VM_XEN.rb:546
+#: src/modules/VM_XEN.rb:563
 #, 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/VM_XEN.rb:549
+#: src/modules/VM_XEN.rb:566
 #, fuzzy
 #| msgid "Hypervisor and tools are installed."
 msgid "Xen Hypervisor and tools are installed."
 msgstr "Hypervisor og verktøy er installert."
 
-#: src/modules/VM_XEN.rb:550
+#: src/modules/VM_XEN.rb:567
 #, fuzzy
 #| msgid "Hypervisor and tools are installed."
 msgid "Virtualization client tools are installed."
 msgstr "Hypervisor og verktøy er installert."
 
-#: src/modules/VM_XEN.rb:551
+#: src/modules/VM_XEN.rb:568
 #, fuzzy
 #| msgid "Hypervisor and tools are installed."
 msgid "Libvirt LXC components are installed."

Modified: trunk/yast/nb/po/wagon.nb.po
===================================================================
--- trunk/yast/nb/po/wagon.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/wagon.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: YaST (@memory@)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-24 10:57+0100\n"
+"POT-Creation-Date: 2014-03-27 16:00+0100\n"
 "PO-Revision-Date: 2008-12-11 08:43+0100\n"
 "Last-Translator: Olav P. <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <>\n"

Modified: trunk/yast/nb/po/wol.nb.po
===================================================================
--- trunk/yast/nb/po/wol.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/wol.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: wol\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:37+0200\n"
+"POT-Creation-Date: 2014-07-04 15:52+0200\n"
 "PO-Revision-Date: 2006-03-22 16:01+0100\n"
 "Last-Translator: Olav Pettershagen <olav.pet@online.no>\n"
 "Language-Team:  <nb@li.org>\n"

Modified: trunk/yast/nb/po/xpram.nb.po
===================================================================
--- trunk/yast/nb/po/xpram.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/xpram.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xpram.nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-10 10:32+0200\n"
+"POT-Creation-Date: 2014-07-04 15:53+0200\n"
 "PO-Revision-Date: 2008-10-03 09:49+0200\n"
 "Last-Translator: Olav P. <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <>\n"

Modified: trunk/yast/nb/po/yast2-apparmor.nb.po
===================================================================
--- trunk/yast/nb/po/yast2-apparmor.nb.po	2014-10-07 16:05:59 UTC (rev 89812)
+++ trunk/yast/nb/po/yast2-apparmor.nb.po	2014-10-07 16:07:01 UTC (rev 89813)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: yast2-apparmor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 09:34+0200\n"
+"POT-Creation-Date: 2014-07-04 15:51+0200\n"
 "PO-Revision-Date: 2009-08-14 14:49+0200\n"
 "Last-Translator: Olav Pettershagen <olav.pet@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <opensuse-translation@opensuse.org>\n"
@@ -315,11 +315,11 @@
 
 #. May want to replace Wizard() with UI()
 #: src/include/apparmor/aa-config.rb:518
-#: src/include/apparmor/config_complain.rb:181
-#: src/include/apparmor/config_complain.rb:229
-#: src/include/apparmor/config_complain.rb:239
-#: src/include/apparmor/config_complain.rb:268
-#: src/include/apparmor/config_complain.rb:287
+#: src/include/apparmor/config_complain.rb:187
+#: src/include/apparmor/config_complain.rb:235
+#: src/include/apparmor/config_complain.rb:245
+#: src/include/apparmor/config_complain.rb:274
+#: src/include/apparmor/config_complain.rb:293
 #: src/include/apparmor/profile_dialogs.rb:1112
 msgid "&Done"
 msgstr "&Fullført"
@@ -1188,61 +1188,71 @@
 msgid "Could not recognize mode: "
 msgstr "Ukjent modus: "
 
-#. restarts ag_complain agent if necessary
-#: src/include/apparmor/config_complain.rb:128
+#. translators: string is value in table for mode of apparmor
+#: src/include/apparmor/config_complain.rb:117
+#, fuzzy
+#| msgid "Enforce"
+msgid "enforce"
+msgstr "Bruk alltid"
+
+#: src/include/apparmor/config_complain.rb:118
+msgid "complain"
+msgstr ""
+
+#: src/include/apparmor/config_complain.rb:134
 msgid "Show All Profiles"
 msgstr "Vis alle profiler"
 
-#: src/include/apparmor/config_complain.rb:129
+#: src/include/apparmor/config_complain.rb:135
 msgid "Configure Mode for Active Profiles"
 msgstr "Konfigurer modus for aktive profiler"
 
-#: src/include/apparmor/config_complain.rb:132
+#: src/include/apparmor/config_complain.rb:138
 msgid "Show Active Profiles"
 msgstr "Vis aktive profiler"
 
-#: src/include/apparmor/config_complain.rb:133
+#: src/include/apparmor/config_complain.rb:139
 msgid "Configure Mode for All Profiles"
 msgstr "Konfigurer modus for alle profiler"
 
 #. `Frame( `id(`changeMode), _("Configure Profile Mode"),
 #. TODO switch to variable in a module
 #. TODO plain reread does not work here
-#: src/include/apparmor/config_complain.rb:147
+#: src/include/apparmor/config_complain.rb:153
 #: src/include/apparmor/profile_dialogs.rb:1439
 msgid "Profile Name"
 msgstr "Profilnavn"
 
-#: src/include/apparmor/config_complain.rb:147
+#: src/include/apparmor/config_complain.rb:153
 msgid "Mode"
 msgstr "Modus"
 
-#: src/include/apparmor/config_complain.rb:154
+#: src/include/apparmor/config_complain.rb:160
 msgid "Toggle Mode"
 msgstr "Bytt modus"
 
-#: src/include/apparmor/config_complain.rb:155
+#: src/include/apparmor/config_complain.rb:161
 msgid "Set All to Enforce"
 msgstr "Bruk automatisk for alle"
 
-#: src/include/apparmor/config_complain.rb:156
+#: src/include/apparmor/config_complain.rb:162
 msgid "Set All to Complain"
 msgstr "Bruk klagemodus for alle"
 
 #. Profile Mode Configuration -- Sets Complain and Enforce Behavior
-#: src/include/apparmor/config_complain.rb:177
+#: src/include/apparmor/config_complain.rb:183
 msgid "Profile Mode Configuration"
 msgstr "Moduskonfigurasjon for profiler"
 
 #. We'll need this often - cache it
-#: src/include/apparmor/config_complain.rb:225
-#: src/include/apparmor/config_complain.rb:235
-#: src/include/apparmor/config_complain.rb:264
-#: src/include/apparmor/config_complain.rb:283
+#: src/include/apparmor/config_complain.rb:231
+#: src/include/apparmor/config_complain.rb:241
+#: src/include/apparmor/config_complain.rb:270
+#: src/include/apparmor/config_complain.rb:289
 msgid "Configure Profile Mode"
 msgstr "Konfigurer profilmodus"
 
-#: src/include/apparmor/config_complain.rb:291
+#: src/include/apparmor/config_complain.rb:297
 msgid "Select an action to perform."
 msgstr "Velg en handling."
 

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

    

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

keichwa＠svn2.opensuse.org